diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt
index 51e9574f86..dba3511bf4 100644
--- a/.github/workflows/apt-deps.txt
+++ b/.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 
+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
\ No newline at end of file
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
new file mode 100644
index 0000000000..604a3dd703
--- /dev/null
+++ b/.github/workflows/clang-format.yml
@@ -0,0 +1,21 @@
+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@v4
+        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
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
index 64c908a37a..d68092d998 100644
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@@ -6,42 +6,44 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+
   generate-soh-otr:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - name: Git Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.14
+    - name: Configure ccache
+      uses: hendrikmuhs/ccache-action@v1.2
       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: Cache build folders
-      uses: actions/cache@v4
+    - name: Restore Cached deps folder
+      uses: actions/cache/restore@v4
       with:
-        key: ${{ runner.os }}-otr-build-${{ github.ref }}-${{ github.sha }}
+        key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-otr-build-${{ github.ref }}
-          ${{ runner.os }}-otr-build-
-        path: |
-          build-cmake
-          SDL2-2.30.3
-          tinyxml2-10.0.0
+          ${{ runner.os }}-deps-${{ github.ref }}-
+          ${{ runner.os }}-deps-
+        path: deps
+    - name: Create deps folder
+      run: mkdir -p deps
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "SDL2-2.30.3" ]; then
-          wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz
+        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
         fi
-        cd SDL2-2.30.3
+        cd deps/SDL2-2.30.3
         ./configure --enable-hidapi-libusb
         make -j 10
         sudo make install
@@ -50,77 +52,86 @@ jobs:
       run: |
         sudo apt-get remove libtinyxml2-dev
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "tinyxml2-10.0.0" ]; then
+        if [ ! -d "deps/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
+          tar -xzf 10.0.0.tar.gz -C deps
         fi
-        cd tinyxml2-10.0.0
+        cd deps/tinyxml2-10.0.0
         mkdir -p build
         cd build
         cmake ..
         make
         sudo make install
-    - name: Generate soh.otr
+    - name: Generate soh.o2r
       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
-    - uses: actions/upload-artifact@v4
+        cmake --build build-cmake --config Release --target GenerateSohOtr -j3
+    - name: Upload soh.o2r
+      uses: actions/upload-artifact@v4
       with:
-        name: soh.otr
-        path: soh.otr
-        retention-days: 1
+        name: soh.o2r
+        path: soh.o2r
+        retention-days: 3
+
   build-macos:
     needs: generate-soh-otr
     runs-on: macos-14
     steps:
-    - uses: actions/checkout@v4
+    - name: Git Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.14
+    - name: Configure ccache
+      uses: hendrikmuhs/ccache-action@v1.2
       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-
+          ${{ runner.os }}-14-ccache
+    # Needed to apply sudo for macports cache restore
     - 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: Cache MacPorts
-      id: cache-macports
-      uses: actions/cache@v4
+    - name: Restore Cached MacPorts
+      id: restore-cache-macports
+      uses: actions/cache/restore@v4
       with:
-        path: /opt/local/
-        key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}
+        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
     - name: Install MacPorts (if necessary)
       run: |
-        if [ -d /opt/local/ ]; then
+        if command -v /opt/local/bin/port 2>&1 >/dev/null; then
           echo "MacPorts already installed"
         else
+          echo "Installing MacPorts"
           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.otr
+    - name: Download soh.o2r
       uses: actions/download-artifact@v4
       with:
-        name: soh.otr
+        name: soh.o2r
+        path: build-cmake/soh
     - 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
@@ -132,44 +143,52 @@ jobs:
         path: |
           SoH.dmg
           readme.txt
+    - name: Save Cache MacPorts
+      if: ${{ github.ref_name == github.event.repository.default_branch }}
+      uses: actions/cache/save@v4
+      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:
-    - uses: actions/checkout@v4
+    - name: Git Checkout
+      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: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.14
+    - name: Configure ccache
+      uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: linux-ccache-${{ github.ref }}-${{ github.sha }}
+        save: ${{ github.ref_name == github.event.repository.default_branch }}
+        key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          linux-ccache-${{ github.ref }}
-          linux-ccache-
-    - name: Cache build folders
-      uses: actions/cache@v4
+          ${{ runner.os }}-ccache-${{ github.ref }}
+          ${{ runner.os }}-ccache
+    - name: Restore Cached deps folder
+      id: restore-cache-deps
+      uses: actions/cache/restore@v4
       with:
-        key: linux-build-${{ github.ref }}-${{ github.sha }}
+        key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          linux-build-${{ github.ref }}
-          linux-build-
-        path: |
-          SDL2-2.30.3
-          SDL2_net-2.2.0
-          tinyxml2-10.0.0
-          libzip-1.10.1
+          ${{ runner.os }}-deps-${{ github.ref }}-
+          ${{ runner.os }}-deps-
+        path: deps
+    - name: Create deps folder
+      run: mkdir -p deps
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "SDL2-2.30.3" ]; then
-          wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz
+        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
         fi
-        cd SDL2-2.30.3
+        cd deps/SDL2-2.30.3
         ./configure --enable-hidapi-libusb
         make -j 10
         sudo make install
@@ -177,11 +196,11 @@ jobs:
     - name: Install latest SDL_net
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "SDL2_net-2.2.0" ]; then
+        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
+          tar -xzf SDL2_net-2.2.0.tar.gz -C deps
         fi
-        cd SDL2_net-2.2.0
+        cd deps/SDL2_net-2.2.0
         ./configure
         make -j 10
         sudo make install
@@ -190,11 +209,11 @@ jobs:
       run: |
         sudo apt-get remove libtinyxml2-dev
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "tinyxml2-10.0.0" ]; then
+        if [ ! -d "deps/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
+          tar -xzf 10.0.0.tar.gz -C deps
         fi
-        cd tinyxml2-10.0.0
+        cd deps/tinyxml2-10.0.0
         mkdir -p build
         cd build
         cmake ..
@@ -203,21 +222,22 @@ jobs:
     - name: Install libzip without crypto
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "libzip-1.10.1" ]; then
+        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
+          tar -xzf libzip-1.10.1.tar.gz -C deps
         fi
-        cd libzip-1.10.1
+        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
         sudo make install
         sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/
-    - name: Download soh.otr
+    - name: Download soh.o2r
       uses: actions/download-artifact@v4
       with:
-        name: soh.otr
+        name: soh.o2r
+        path: build-cmake/soh
     - name: Build SoH
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -237,63 +257,73 @@ jobs:
         path: |
           soh.appimage
           readme.txt
+    - name: Save Cache deps folder
+      if: ${{ github.ref_name == github.event.repository.default_branch }}
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ steps.restore-cache-deps.outputs.cache-primary-key }}
+        path: deps
+
   build-windows:
     needs: generate-soh-otr
-    runs-on: ${{ (vars.WINDOWS_RUNNER && fromJSON(vars.WINDOWS_RUNNER)) || 'windows-latest' }}
+    runs-on: windows-latest
     steps:
     - name: Install dependencies
-      if: ${{ !vars.WINDOWS_RUNNER }}
       run: |
-        choco install ninja
+        choco install ninja -y
         Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-    - uses: actions/checkout@v4
+    - name: Git Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.14
+    - name: Configure sccache
+      uses: hendrikmuhs/ccache-action@v1.2
       with:
         variant: sccache
-        max-size: "1G"
+        max-size: "2G"
+        evict-old-files: job
+        save: ${{ github.ref_name == github.event.repository.default_branch }}
         key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-ccache-${{ github.ref }}
-          ${{ runner.os }}-ccache-
-    - name: Cache build folder
-      uses: actions/cache@v4
+          ${{ runner.os }}-ccache
+    - name: Restore Cached VCPKG folder
+      id: restore-cache-vcpkg
+      uses: actions/cache/restore@v4
       with:
-        key: ${{ runner.os }}-build-${{ github.ref }}-${{ github.sha }}
+        key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-build-${{ github.ref }}
-          ${{ runner.os }}-build-
-        path: |
-          build-windows
-          vcpkg
+          ${{ runner.os }}-vcpkg-${{ github.ref }}-
+          ${{ runner.os }}-vcpkg-
+        path: vcpkg
     - name: Configure Developer Command Prompt
       uses: ilammy/msvc-dev-cmd@v1
+    - name: Download soh.o2r
+      uses: actions/download-artifact@v4
+      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
 
-        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
+        (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
     - name: Upload build
       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@v4
+      with:
+        key: ${{ steps.restore-cache-vcpkg.outputs.cache-primary-key }}
+        path: vcpkg
diff --git a/.github/workflows/macports-deps.txt b/.github/workflows/macports-deps.txt
index d150390781..fd97d0c306 100644
--- a/.github/workflows/macports-deps.txt
+++ b/.github/workflows/macports-deps.txt
@@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal
\ No newline at end of file
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal libogg +universal libopus +universal opusfile +universal libvorbis +universal
\ No newline at end of file
diff --git a/.github/workflows/pr-artifacts.yml b/.github/workflows/pr-artifacts.yml
index 85db7de598..5b20030af0 100644
--- a/.github/workflows/pr-artifacts.yml
+++ b/.github/workflows/pr-artifacts.yml
@@ -48,7 +48,7 @@ jobs:
             });
 
             return allArtifacts.data.artifacts.reduce((acc, item) => {
-              if (item.name === "soh.otr") return acc;
+              if (item.name === "soh.o2r") return acc;
               acc += `
               - [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip)`;
               return acc;
diff --git a/.github/workflows/test-builds-on-distros.yml b/.github/workflows/test-builds-on-distros.yml
index 476bdf2f33..8b6ded6d62 100644
--- a/.github/workflows/test-builds-on-distros.yml
+++ b/.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 boost
+        echo pacman -S ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
         pacman -Syu --noconfirm
-        pacman -S --noconfirm ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
+        pacman -S --noconfirm ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
     - 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 boost-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
         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 boost-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
     - 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 libboost-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 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 libboost-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 libopengl-dev
     - name: Install dependencies (zypper)
       if: ${{ matrix.image == 'opensuse/tumbleweed:latest' }}
       run: |
diff --git a/.gitignore b/.gitignore
index ec5401c385..3aa34d9c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -412,6 +412,7 @@ ReleaseObj/*
 .tags
 tags
 *.otr
+*.o2r
 *.sav
 shipofharkinian.ini
 shipofharkinian.json
@@ -452,3 +453,7 @@ _packages
 
 soh/src/boot/build.c
 soh/properties.h
+
+# Tools
+/clang-format
+/clang-format.exe
diff --git a/CMake/FindOgg.cmake b/CMake/FindOgg.cmake
new file mode 100644
index 0000000000..9cf5ce4309
--- /dev/null
+++ b/CMake/FindOgg.cmake
@@ -0,0 +1,61 @@
+# - 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)
diff --git a/CMake/FindOpus.cmake b/CMake/FindOpus.cmake
new file mode 100644
index 0000000000..1e6e30d680
--- /dev/null
+++ b/CMake/FindOpus.cmake
@@ -0,0 +1,44 @@
+# - 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)
diff --git a/CMake/FindOpusFile.cmake b/CMake/FindOpusFile.cmake
new file mode 100644
index 0000000000..ed3b4b7ba3
--- /dev/null
+++ b/CMake/FindOpusFile.cmake
@@ -0,0 +1,55 @@
+# 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)
+
+# Search for the OpusFile header
+find_path(OPUSFILE_INCLUDE_DIR
+    NAMES opusfile.h
+    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
+    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()
diff --git a/CMake/FindVorbis.cmake b/CMake/FindVorbis.cmake
new file mode 100644
index 0000000000..57e60557f7
--- /dev/null
+++ b/CMake/FindVorbis.cmake
@@ -0,0 +1,210 @@
+#[=======================================================================[.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)
diff --git a/CMake/Packaging-2.cmake b/CMake/Packaging-2.cmake
index a29635eacc..dc5da1b7ee 100644
--- a/CMake/Packaging-2.cmake
+++ b/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" "extractor" "appimage")
+set(CPACK_COMPONENTS_ALL "ship")
 
-if (NOT CPACK_GENERATOR STREQUAL "External")
-  list(REMOVE_ITEM CPACK_COMPONENTS_ALL "appimage")
+if (CPACK_GENERATOR STREQUAL "External")
+  list(APPEND CPACK_COMPONENTS_ALL "extractor" "appimage")
 endif()
 
 if (CPACK_GENERATOR MATCHES "DEB|RPM")
diff --git a/CMake/lus-cvars.cmake b/CMake/lus-cvars.cmake
index f6a036479c..c64782e75e 100644
--- a/CMake/lus-cvars.cmake
+++ b/CMake/lus-cvars.cmake
@@ -1,7 +1,5 @@
 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 "")
diff --git a/CMake/soh-cvars.cmake b/CMake/soh-cvars.cmake
index e5ff8a3841..227cfb2bb5 100644
--- a/CMake/soh-cvars.cmake
+++ b/CMake/soh-cvars.cmake
@@ -10,6 +10,8 @@ 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}"
@@ -23,4 +25,6 @@ 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}"
 )
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3437ef3fd5..7333da8d81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 3.26.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 8.0.6 LANGUAGES C CXX)
+project(Ship VERSION 9.0.2 LANGUAGES C CXX)
 include(CMake/soh-cvars.cmake)
 include(CMake/lus-cvars.cmake)
 
@@ -34,7 +35,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 "MacReady ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE)
+set(PROJECT_BUILD_NAME "Blair ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE)
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE)
 
 execute_process(
@@ -53,7 +54,10 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(CMAKE_PROJECT_GIT_COMMIT_HASH "${GIT_COMMIT_HASH}" CACHE STRING "Git commit hash" FORCE)
+# 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)
 
 execute_process(
     COMMAND git describe --tags --abbrev=0 --exact-match HEAD
@@ -79,8 +83,7 @@ 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)
-
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog libogg libvorbis opus opusfile)
     if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
         set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
     endif()
@@ -150,6 +153,7 @@ 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")
 
 ################################################################################
 # Set CONTROLLERBUTTONS_T
@@ -170,24 +174,15 @@ 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(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage)
-install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship)
+install(FILES "${CMAKE_BINARY_DIR}/soh/soh.o2r" DESTINATION . COMPONENT ship)
 install(TARGETS ZAPD DESTINATION ./assets/extractor 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)
+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)
 endif()
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-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)
+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)
 endif()
 
 find_package(Python3 COMPONENTS Interpreter)
@@ -195,32 +190,42 @@ find_package(Python3 COMPONENTS Interpreter)
 # Target to generate OTRs
 add_custom_target(
     ExtractAssets
-    COMMAND ${CMAKE_COMMAND} -E 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} -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/graphic/Fast3D/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}"
     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}/OTRExporter
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/soh
     COMMENT "Running asset extraction..."
     DEPENDS ZAPD
-    BYPRODUCTS oot.otr ${CMAKE_SOURCE_DIR}/oot.otr oot-mq.otr ${CMAKE_SOURCE_DIR}/oot-mq.otr ${CMAKE_SOURCE_DIR}/soh.otr
+    BYPRODUCTS oot.o2r ${CMAKE_SOURCE_DIR}/oot.o2r oot-mq.o2r ${CMAKE_SOURCE_DIR}/oot-mq.o2r ${CMAKE_SOURCE_DIR}/soh.o2r
 )
 
 # 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 ../soh/assets/xml --gen-headers
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
+    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
     COMMENT "Generating asset headers..."
     DEPENDS ZAPD
 )
 
-# Target to generate only soh.otr
+# Target to generate only soh.o2r
 add_custom_target(
     GenerateSohOtr
-    COMMAND ${CMAKE_COMMAND} -E 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} -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/graphic/Fast3D/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}"
     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}/OTRExporter
-    COMMENT "Generating soh.otr..."
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/soh
+    COMMENT "Generating soh.o2r..."
     DEPENDS ZAPD
 )
 
@@ -228,7 +233,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(ImageMagick COMPONENTS convert)
     if (ImageMagick_FOUND)
         execute_process (
-            COMMAND ${ImageMagick_convert_EXECUTABLE} soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
+            COMMAND ${ImageMagick_convert_EXECUTABLE} ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
             OUTPUT_VARIABLE outVar
         )
     endif()
@@ -237,38 +242,28 @@ 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     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 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 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/extractor)
+install(TARGETS ZAPD DESTINATION ${CMAKE_BINARY_DIR}/assets)
 
 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/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)
-
-install(DIRECTORY ${CMAKE_BINARY_DIR}/assets
-        DESTINATION .
-        PATTERN ZAPD.out
-        PERMISSIONS ${PROGRAM_PERMISSIONS_EXECUTE}
-        )
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/xml)
 
 # 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)")
diff --git a/OTRExporter b/OTRExporter
index 8f71672901..461ab19a36 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 8f71672901987bc3dbf6256e64e228db36a686f5
+Subproject commit 461ab19a36cde807591543397e136cae19aa6e7c
diff --git a/README.md b/README.md
index e7f929bad5..ea1ad76a23 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,8 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 ### Other shortcuts
 | Keys | Action |
 | - | - |
-| F1 | Toggle menubar |
+| ESC | Toggle menu |
+| F2 | Toggle capture mouse input |
 | F5 | Save state |
 | F6 | Change state |
 | F7 | Load state |
diff --git a/ZAPDTR b/ZAPDTR
index 04d42249d2..684f21a475 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit 04d42249d2c15c3b442a0282a90bc8b7bda25b03
+Subproject commit 684f21a475dcfeee89938ae1f4afc42768a3e7ef
diff --git a/copy-existing-otrs.cmake b/copy-existing-otrs.cmake
index f5226510c7..d5a5f89957 100644
--- a/copy-existing-otrs.cmake
+++ b/copy-existing-otrs.cmake
@@ -1,37 +1,37 @@
 message(STATUS "Copying otr files...")
 
-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")
+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")
 endif()
-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")
+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")
 endif()
-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")
+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")
 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}/OTRExporter/oot.otr)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${TARGET_DIR})
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot.o2r)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.o2r ${TARGET_DIR})
     endif()
-    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${TARGET_DIR})
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot-mq.o2r)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.o2r ${TARGET_DIR})
     endif()
-    if(EXISTS ${SOURCE_DIR}/OTRExporter/soh.otr)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.otr ${TARGET_DIR})
+    if(EXISTS ${SOURCE_DIR}/soh/soh.o2r)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.o2r ${TARGET_DIR})
     endif()
 endif()
 
-if(NOT ONLYSOHOTR AND (NOT EXISTS ${SOURCE_DIR}/oot.otr AND NOT EXISTS ${SOURCE_DIR}/oot-mq.otr))
+if(NOT ONLYSOHOTR AND (NOT EXISTS ${SOURCE_DIR}/oot.o2r AND NOT EXISTS ${SOURCE_DIR}/oot-mq.o2r))
     message(FATAL_ERROR "Failed to copy. No OTR files found.")
 endif()
-if(NOT EXISTS ${SOURCE_DIR}/soh.otr)
+if(NOT EXISTS ${SOURCE_DIR}/soh.o2r)
     message(FATAL_ERROR "Failed to copy. No soh OTR found.")
 endif()
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 4e37a27e91..f8347b9b6a 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -90,26 +90,26 @@ 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 libboost-dev libopengl-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 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 libboost-dev libopengl-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 libopengl-dev
 ```
 #### Arch
 ```sh
 # using gcc
-pacman -S gcc git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
+pacman -S gcc git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
 
 # or using clang
-pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
+pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
 ```
 #### 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 boost-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
 
 # 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 boost-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
 ```
 #### openSUSE
 ```sh
diff --git a/docs/MODDING.md b/docs/MODDING.md
index 1f4f4b6074..d410a0d064 100644
--- a/docs/MODDING.md
+++ b/docs/MODDING.md
@@ -41,15 +41,28 @@ 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 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:
+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:
 
 ```cpp
-const uint16_t dayTimeMin = 0;
-const uint16_t dayTimeMax = 0xFFFF;
-ImGui::SliderScalar("Time", ImGuiDataType_U16, &gSaveContext.dayTime, &dayTimeMin, &dayTimeMax);
+    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;
+    }
 ```
 
-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:
+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:
 
 ```cpp
 if (IS_DAY || gTimeIncrement >= 0x190) {
@@ -71,16 +84,19 @@ 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/SohMenuBar.cpp` around line 1120:
+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:
 
 ```cpp
-UIWidgets::EnhancementSliderFloat("Hookshot Reach Multiplier: %.1fx", "##gCheatHookshotReachMultiplier", "gCheatHookshotReachMultiplier", 1.0f, 5.0f, "", 1.0f, false);
+    AddWidget(path, "Hookshot Reach Multiplier: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_CHEAT("HookshotReachMultiplier"))
+        .Options(FloatSliderOptions().Format("%.2f").Min(1.0f).Max(5.0f));
 ```
-
-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:
+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:
 
 ```cpp
-UIWidgets::EnhancementSliderFloat("Time Multiplier: %.1fx", "##gCheatTimeMultiplier", "gCheatTimeMultiplier", 0.2f, 5.0f, "", 1.0f, false);
+    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));
 ```
 
 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
@@ -88,10 +104,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("gCheatTimeMultiplier", 1.0f);
++    gSaveContext.dayTime += gTimeIncrement * CVarGetFloat(CVAR_CHEAT("TimeOfDayMultiplier"),1.0f);
 } else {
 -    gSaveContext.dayTime += gTimeIncrement * 2 * 10;
-+    gSaveContext.dayTime += gTimeIncrement * 2 * CVarGetFloat("gCheatTimeMultiplier", 1.0f);
++   gSaveContext.dayTime += gTimeIncrement * 2 * CVarGetFloat(CVAR_CHEAT("TimeOfDayMultiplier"),1.0f);
 }
 ```
 
diff --git a/docs/supportedHashes.json b/docs/supportedHashes.json
index 587a64a55d..c5b3d5b2fe 100644
--- a/docs/supportedHashes.json
+++ b/docs/supportedHashes.json
@@ -30,5 +30,49 @@
     {
         "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"
     }
 ]
diff --git a/libultraship b/libultraship
index 02bb77ef25..6a3f6cd327 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 02bb77ef253e2de0969fd2cb36ad2e870677d18d
+Subproject commit 6a3f6cd327b99f617b623e5b9a3afeae460aac2b
diff --git a/run-clang-format.ps1 b/run-clang-format.ps1
new file mode 100644
index 0000000000..063cec7af3
--- /dev/null
+++ b/run-clang-format.ps1
@@ -0,0 +1,49 @@
+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, $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
+}
diff --git a/run-clang-format.sh b/run-clang-format.sh
new file mode 100755
index 0000000000..20129e63d2
--- /dev/null
+++ b/run-clang-format.sh
@@ -0,0 +1,29 @@
+# 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
diff --git a/scripts/linux/appimage/soh.desktop b/scripts/linux/appimage/soh.desktop
index 93e4bbdce8..5e517c597a 100644
--- a/scripts/linux/appimage/soh.desktop
+++ b/scripts/linux/appimage/soh.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=SOH
-Exec=soh.sh
+Exec=soh.elf
 Terminal=false
 Icon=sohIcon
 Type=Application
diff --git a/scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh.in
deleted file mode 100644
index 71121a5fff..0000000000
--- a/scripts/linux/appimage/soh.sh.in
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/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
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index b4ee6ed7f3..e74c14f4c1 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -4,6 +4,7 @@ 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)
@@ -137,20 +138,27 @@ 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).*")
+    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")
 endif()
 
 # soh/Extractor {{{
@@ -176,12 +184,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")
@@ -275,34 +283,17 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
 endif()
 ################################################################################
-# Find/download Boost
+# Find/download Dr Libs (For custom audio)
 ################################################################################
 include(FetchContent)
+
 FetchContent_Declare(
-    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
+        dr_libs
+        GIT_REPOSITORY https://github.com/mackron/dr_libs.git
+        GIT_TAG da35f9d6c7374a95353fd1df1d394d44ab66cf01
 )
+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})
 
@@ -317,6 +308,14 @@ 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/
@@ -348,8 +347,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE assets
     ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
 	${SDL2-INCLUDE}
     ${SDL2-NET-INCLUDE}
-    ${BOOST-INCLUDE}
 	${CMAKE_CURRENT_SOURCE_DIR}/assets/
+	${dr_libs_SOURCE_DIR}
 	.
 )
 
@@ -440,6 +439,7 @@ if(MSVC)
                 /Gy;
                 /W3
             >
+            /bigobj;
             /sdl-;
             /permissive-;
             /MP;
@@ -510,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>:
@@ -586,11 +586,11 @@ 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>
@@ -600,6 +600,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
 
         target_link_options(${PROJECT_NAME} PRIVATE
             -pthread
+				#-fsanitize=address
             -Wl,-export-dynamic
         )
     endif()
@@ -608,21 +609,22 @@ endif()
 # Pre build events
 ################################################################################
 if (CMAKE_GENERATOR MATCHES "Visual Studio")
-	set(VS_COPY_ASSETS_CMD ${CMAKE_COMMAND} -E copy_directory_if_different $<TARGET_FILE_DIR:soh>/assets ${CMAKE_BINARY_DIR}/soh/assets)
+	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
+    )
 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/extractor
-		COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $<TARGET_FILE_DIR:soh>/assets/extractor/xmls
-        COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${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_if_different ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
-	    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
-		COMMAND ${VS_COPY_ASSETS_CMD}
+        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}
     )
 endif()
 ################################################################################
@@ -639,6 +641,15 @@ 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;"
@@ -652,6 +663,12 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			"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
@@ -692,10 +709,21 @@ else()
     find_package(SDL2)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
+	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"
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>"
 		${CMAKE_DL_LIBS}
 		Threads::Threads
@@ -708,11 +736,7 @@ endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug 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)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.o2r DESTINATION . COMPONENT ship)
 endif()
 
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
@@ -722,7 +746,7 @@ 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)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION ../MacOS COMPONENT ship)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION ../Resources COMPONENT ship)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.o2r DESTINATION ../Resources COMPONENT ship)
 elseif(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "NintendoSwitch|CafeOS")
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION . COMPONENT ship)
 endif()
diff --git a/soh/assets/.gitignore b/soh/assets/.gitignore
index d75078bf1c..7a844a7273 100644
--- a/soh/assets/.gitignore
+++ b/soh/assets/.gitignore
@@ -5,3 +5,4 @@
 *.vtx.inc
 *.dlist.inc
 !*.png
+custom/shaders
diff --git a/soh/assets/custom/fonts/Inconsolata-Regular.ttf b/soh/assets/custom/fonts/Inconsolata-Regular.ttf
new file mode 100644
index 0000000000..d1241516bc
Binary files /dev/null and b/soh/assets/custom/fonts/Inconsolata-Regular.ttf differ
diff --git a/soh/assets/custom/fonts/Montserrat-Regular.ttf b/soh/assets/custom/fonts/Montserrat-Regular.ttf
new file mode 100644
index 0000000000..f4a266dd37
Binary files /dev/null and b/soh/assets/custom/fonts/Montserrat-Regular.ttf differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/BushTex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/BushTex.rgba16
new file mode 100644
index 0000000000..99a0fd4bde
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/BushTex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/LeafTex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/LeafTex.rgba16
new file mode 100644
index 0000000000..1d4f2db39e
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/LeafTex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_bosskey_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_bosskey_tex.rgba16
new file mode 100644
index 0000000000..54bdc9fa78
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_bosskey_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_bronze_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_bronze_tex.rgba16
new file mode 100644
index 0000000000..9d561d1ae1
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_bronze_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_fairy_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_fairy_tex.rgba16
new file mode 100644
index 0000000000..b9d1f74e36
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_fairy_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_gold_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_gold_tex.rgba16
new file mode 100644
index 0000000000..8ec68d3aa1
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_gold_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_heart_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_heart_tex.rgba16
new file mode 100644
index 0000000000..2822f18fda
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_heart_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_mask_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_mask_tex.rgba16
new file mode 100644
index 0000000000..bf90c64fcc
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_mask_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_random_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_random_tex.rgba16
new file mode 100644
index 0000000000..52f4848b37
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_random_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_silver_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_silver_tex.rgba16
new file mode 100644
index 0000000000..9d14059c05
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_silver_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/flower_token_tex.rgba16 b/soh/assets/custom/objects/gameplay_field_keep/flower_token_tex.rgba16
new file mode 100644
index 0000000000..436b870714
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_field_keep/flower_token_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL
new file mode 100644
index 0000000000..c0a32b3b03
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL
@@ -0,0 +1,14 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_0
new file mode 100644
index 0000000000..bdb256c872
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_0
@@ -0,0 +1,8 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_1
new file mode 100644
index 0000000000..eab49e30d0
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_1
@@ -0,0 +1,134 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_2
new file mode 100644
index 0000000000..2fea2e4dba
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_2
@@ -0,0 +1,134 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL
new file mode 100644
index 0000000000..70e8240a44
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL
@@ -0,0 +1,14 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_0
new file mode 100644
index 0000000000..926fed8797
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_0
@@ -0,0 +1,8 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_1
new file mode 100644
index 0000000000..74ccefada0
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_1
@@ -0,0 +1,134 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_2
new file mode 100644
index 0000000000..08fdc08b97
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_2
@@ -0,0 +1,134 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL
new file mode 100644
index 0000000000..046e04d332
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL
@@ -0,0 +1,14 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_0
new file mode 100644
index 0000000000..dcc1da33a6
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_0
@@ -0,0 +1,8 @@
+<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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_1
new file mode 100644
index 0000000000..8475ba0071
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_2
new file mode 100644
index 0000000000..c20f0dc4d2
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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/gFieldBushHeartDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL
new file mode 100644
index 0000000000..a27f05f477
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL
@@ -0,0 +1,10 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushJunkDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushJunkDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushJunkDL_tri_0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_tri_0
new file mode 100644
index 0000000000..be06a23a7a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushJunkDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushJunkDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL
new file mode 100644
index 0000000000..af43aa60cd
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMajorDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMajorDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMajorDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_flower_gold"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMajorDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_0
new file mode 100644
index 0000000000..dd226cbc5b
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMajorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_1
new file mode 100644
index 0000000000..e00033c0fa
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_2
new file mode 100644
index 0000000000..95c382ca0a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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/gFieldBushMajorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMajorDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL
new file mode 100644
index 0000000000..b9e25ae70f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMaskDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMaskDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMaskDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_flower_mask"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMaskDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_0
new file mode 100644
index 0000000000..874e7ffb83
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMaskDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_1
new file mode 100644
index 0000000000..90b3902185
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_2
new file mode 100644
index 0000000000..b2c011f941
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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/gFieldBushMaskDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMaskDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL
new file mode 100644
index 0000000000..35d99afcdd
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMinorDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMinorDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMinorDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_flower_bronze"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushMinorDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_0
new file mode 100644
index 0000000000..6f519fbc8d
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMinorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_1
new file mode 100644
index 0000000000..6d7a07c984
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_2
new file mode 100644
index 0000000000..f85ac723f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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/gFieldBushMinorDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushMinorDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL
new file mode 100644
index 0000000000..c04d7156e9
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushRandomDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushRandomDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushRandomDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_flower_random"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushRandomDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_0
new file mode 100644
index 0000000000..cb19e7c48f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushRandomDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_1
new file mode 100644
index 0000000000..8cf916c225
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_2
new file mode 100644
index 0000000000..cb5550f613
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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/gFieldBushRandomDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushRandomDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL
new file mode 100644
index 0000000000..29371b448c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_flower_silver"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_0
new file mode 100644
index 0000000000..a25ca5b55b
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_1
new file mode 100644
index 0000000000..cb9c707a8d
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_2
new file mode 100644
index 0000000000..96023e0eb3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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/gFieldBushSmallKeyDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushSmallKeyDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL
new file mode 100644
index 0000000000..c8a98c94eb
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushTokenDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_shrubbery"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushTokenDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushTokenDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_flower_token"/>
+	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushTokenDL_tri_2"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_0
new file mode 100644
index 0000000000..e60691715a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_0
@@ -0,0 +1,8 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushTokenDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_1
new file mode 100644
index 0000000000..d20545643d
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_1
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_2
new file mode 100644
index 0000000000..72993605d1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_tri_2
@@ -0,0 +1,134 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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/gFieldBushTokenDL_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>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_0 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_0
new file mode 100644
index 0000000000..ff0b01fdf3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_0
@@ -0,0 +1,16 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_1 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_1
new file mode 100644
index 0000000000..af2f51461f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_1
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_2 b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_2
new file mode 100644
index 0000000000..5f25570283
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_2
@@ -0,0 +1,268 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_cull b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_cull
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/gFieldBushTokenDL_vtx_cull
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_flower_bosskey b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_flower_bosskey
new file mode 100644
index 0000000000..0cad964b8f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_flower_bosskey
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_bosskey_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_flower_fairy b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_flower_fairy
new file mode 100644
index 0000000000..740ca2da35
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_flower_fairy
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_fairy_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_flower_heart b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_flower_heart
new file mode 100644
index 0000000000..e074ff2790
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_flower_heart
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_heart_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushJunkDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushJunkDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushJunkDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_flower_gold b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_flower_gold
new file mode 100644
index 0000000000..42f481571f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_flower_gold
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_gold_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMajorDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_flower_mask b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_flower_mask
new file mode 100644
index 0000000000..f19b26e563
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_flower_mask
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_mask_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMaskDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_flower_bronze b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_flower_bronze
new file mode 100644
index 0000000000..de5aecac6d
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_flower_bronze
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_bronze_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushMinorDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_flower_random b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_flower_random
new file mode 100644
index 0000000000..36895a84bd
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_flower_random
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_random_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushRandomDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_flower_silver b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_flower_silver
new file mode 100644
index 0000000000..2272949117
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_flower_silver
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_silver_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushSmallKeyDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_flower_token b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_flower_token
new file mode 100644
index 0000000000..6725b33e6a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_flower_token
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/flower_token_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_leaf
new file mode 100644
index 0000000000..72bfec180e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_leaf
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="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/gameplay_field_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_shrubbery b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_shrubbery
new file mode 100644
index 0000000000..0fdd83a9ee
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/mat_gFieldBushTokenDL_f3dlite_shrubbery
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_field_keep/BushTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="128" Lrt="128"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_field_keep/model.xml b/soh/assets/custom/objects/gameplay_field_keep/model.xml
new file mode 100644
index 0000000000..9c003b4012
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_field_keep/model.xml
@@ -0,0 +1,10 @@
+<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>
diff --git a/soh/assets/custom/objects/gameplay_keep/LeafTex.rgba16 b/soh/assets/custom/objects/gameplay_keep/LeafTex.rgba16
new file mode 100644
index 0000000000..1d4f2db39e
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/LeafTex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/StemTex.rgba16 b/soh/assets/custom/objects/gameplay_keep/StemTex.rgba16
new file mode 100644
index 0000000000..fa00a5606f
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/StemTex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_bosskey_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_bosskey_tex.rgba16
new file mode 100644
index 0000000000..54bdc9fa78
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_bosskey_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_bronze_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_bronze_tex.rgba16
new file mode 100644
index 0000000000..9d561d1ae1
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_bronze_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_fairy_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_fairy_tex.rgba16
new file mode 100644
index 0000000000..b9d1f74e36
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_fairy_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_gold_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_gold_tex.rgba16
new file mode 100644
index 0000000000..8ec68d3aa1
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_gold_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_heart_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_heart_tex.rgba16
new file mode 100644
index 0000000000..2822f18fda
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_heart_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_mask_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_mask_tex.rgba16
new file mode 100644
index 0000000000..bf90c64fcc
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_mask_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_random_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_random_tex.rgba16
new file mode 100644
index 0000000000..52f4848b37
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_random_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_silver_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_silver_tex.rgba16
new file mode 100644
index 0000000000..9d14059c05
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_silver_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/flower_token_tex.rgba16 b/soh/assets/custom/objects/gameplay_keep/flower_token_tex.rgba16
new file mode 100644
index 0000000000..436b870714
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/flower_token_tex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/gGrassBunchTex.rgba16 b/soh/assets/custom/objects/gameplay_keep/gGrassBunchTex.rgba16
new file mode 100644
index 0000000000..c59757c1d4
Binary files /dev/null and b/soh/assets/custom/objects/gameplay_keep/gGrassBunchTex.rgba16 differ
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL
new file mode 100644
index 0000000000..4c7b1ab356
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_0
new file mode 100644
index 0000000000..061362cd69
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_1
new file mode 100644
index 0000000000..16c026e42b
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_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_keep/gRandoCuttableGrassBossKeyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_2
new file mode 100644
index 0000000000..0d0968586f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_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_keep/gRandoCuttableGrassBossKeyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_3
new file mode 100644
index 0000000000..d8fcf1fe13
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassBossKeyDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL
new file mode 100644
index 0000000000..875f809dd8
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_0
new file mode 100644
index 0000000000..951dd58bbb
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_1
new file mode 100644
index 0000000000..97fe8599cf
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_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_keep/gRandoCuttableGrassFairyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_2
new file mode 100644
index 0000000000..0d7b67f3c3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_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_keep/gRandoCuttableGrassFairyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_3
new file mode 100644
index 0000000000..22c8ba3d84
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassFairyDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL
new file mode 100644
index 0000000000..235dfdcf3e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_0
new file mode 100644
index 0000000000..273e96ed43
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_1
new file mode 100644
index 0000000000..1b8a08eec7
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_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_keep/gRandoCuttableGrassHeartDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_2
new file mode 100644
index 0000000000..8899886115
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_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_keep/gRandoCuttableGrassHeartDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_3
new file mode 100644
index 0000000000..45a3b48e13
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassHeartDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL
new file mode 100644
index 0000000000..d4ab27bdb8
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL
@@ -0,0 +1,10 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassJunkDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassJunkDL_tri_0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_tri_0
new file mode 100644
index 0000000000..bcf6f69e62
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_cull
new file mode 100644
index 0000000000..6444457b7a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassJunkDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="61" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="61" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="61" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="61" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL
new file mode 100644
index 0000000000..7ded8214ff
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_0
new file mode 100644
index 0000000000..f8278cc0c3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_1
new file mode 100644
index 0000000000..64c020a987
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_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_keep/gRandoCuttableGrassMajorDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_2
new file mode 100644
index 0000000000..13938b6d9f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_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_keep/gRandoCuttableGrassMajorDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_3
new file mode 100644
index 0000000000..da60e69d22
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMajorDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL
new file mode 100644
index 0000000000..94c93e4531
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_0
new file mode 100644
index 0000000000..d981594a9c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_1
new file mode 100644
index 0000000000..ee5852695e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_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_keep/gRandoCuttableGrassMaskDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_2
new file mode 100644
index 0000000000..1ed45fdcbe
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_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_keep/gRandoCuttableGrassMaskDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_3
new file mode 100644
index 0000000000..94910ceb32
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMaskDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL
new file mode 100644
index 0000000000..e0ae6e48a8
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_0
new file mode 100644
index 0000000000..7a5d4e3de2
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_1
new file mode 100644
index 0000000000..a24c28fa45
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_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_keep/gRandoCuttableGrassMinorDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_2
new file mode 100644
index 0000000000..5ef0b99cb5
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_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_keep/gRandoCuttableGrassMinorDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_3
new file mode 100644
index 0000000000..d49e9b1867
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassMinorDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL
new file mode 100644
index 0000000000..7ec87e807a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_0
new file mode 100644
index 0000000000..94ccbe795e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_1
new file mode 100644
index 0000000000..96e84046ec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_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_keep/gRandoCuttableGrassRandomDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_2
new file mode 100644
index 0000000000..db7142847f
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_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_keep/gRandoCuttableGrassRandomDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_3
new file mode 100644
index 0000000000..b1b8cb8c13
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassRandomDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL
new file mode 100644
index 0000000000..f22094ebac
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_0
new file mode 100644
index 0000000000..2235b57ae3
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_1
new file mode 100644
index 0000000000..93b101a860
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_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_keep/gRandoCuttableGrassSmallKeyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_2
new file mode 100644
index 0000000000..2cf0ed524a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_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_keep/gRandoCuttableGrassSmallKeyDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_3
new file mode 100644
index 0000000000..653b2b7cbc
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL
new file mode 100644
index 0000000000..d1dff70953
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_Grass"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_leaf"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_material"/>
+	<CallDisplayList Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_3"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_0
new file mode 100644
index 0000000000..dc2309657b
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_0
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_0" VertexBufferIndex="0" VertexOffset="30" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="16" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="20" Flag0="0" V10="21" V11="22" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="28" V12="29" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_1
new file mode 100644
index 0000000000..f784441881
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_1
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_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_keep/gRandoCuttableGrassTokenDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_2
new file mode 100644
index 0000000000..7de2d79430
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_2
@@ -0,0 +1,48 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_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_keep/gRandoCuttableGrassTokenDL_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="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="15" 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="20" V02="17" Flag0="0" V10="15" V11="17" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="24" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="0" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
+	<Triangles2 V00="0" V01="4" V02="7" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="11" V01="8" V02="10" Flag0="0" V10="11" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="12" Flag0="0" V10="13" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="11" V01="13" V02="15" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
+	<Triangles2 V00="19" V01="16" V02="18" Flag0="0" V10="19" V11="18" V12="20" Flag1="0"/>
+	<Triangles2 V00="21" V01="19" V02="20" Flag0="0" V10="21" V11="20" V12="22" Flag1="0"/>
+	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
+	<Triangle1 V00="19" V01="21" V02="23"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_3
new file mode 100644
index 0000000000..e5c1fbd152
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_tri_3
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="30"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="20" V01="16" V02="19" Flag0="0" V10="20" V11="19" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="22" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="26" V11="28" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_3" VertexBufferIndex="0" VertexOffset="30" Count="10"/>
+	<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="4" V11="5" V12="3" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_0 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_0
new file mode 100644
index 0000000000..7f094d39f1
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_0
@@ -0,0 +1,62 @@
+<Vertex Version="0">
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="221" G="116" B="217" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="28" G="124" B="252" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="84" G="88" B="36" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="28" G="124" B="252" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="16" G="119" B="41" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="18" G="122" B="226" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="14" G="80" B="159" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="18" G="122" B="226" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="10" G="125" B="234" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="65" G="101" B="215" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="108" G="44" B="206" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="65" G="101" B="215" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="213" G="77" B="92" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="232" G="123" B="18" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="232" G="123" B="18" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="3" G="113" B="199" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="164" G="87" B="244" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="239" G="125" B="239" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="239" G="125" B="239" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="61" G="111" B="241" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-42" Y="23" Z="-30" S="-144" T="476" R="35" G="140" B="39" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-28" Y="41" Z="-5" S="496" T="1182" R="228" G="132" B="4" A="255"/>
+	<Vtx X="-11" Y="34" Z="-34" S="496" T="-190" R="228" G="132" B="4" A="255"/>
+	<Vtx X="6" Y="-12" Z="4" S="1008" T="476" R="172" G="168" B="220" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="6" Y="25" Z="55" S="-144" T="476" R="240" G="137" B="215" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="17" Y="39" Z="24" S="496" T="1182" R="238" G="134" B="30" A="255"/>
+	<Vtx X="-14" Y="45" Z="23" S="496" T="-190" R="238" G="134" B="30" A="255"/>
+	<Vtx X="0" Y="-11" Z="-7" S="1008" T="476" R="242" G="176" B="97" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-41" Y="61" Z="19" S="-144" T="476" R="246" G="131" B="22" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-6" Y="57" Z="20" S="496" T="1182" R="191" G="155" B="41" A="255"/>
+	<Vtx X="-17" Y="51" Z="-9" S="496" T="-190" R="191" G="155" B="41" A="255"/>
+	<Vtx X="4" Y="-17" Z="-2" S="1008" T="476" R="148" G="212" B="50" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="-1" Y="-11" Z="7" S="1008" T="476" R="43" G="179" B="164" A="255"/>
+	<Vtx X="-11" Y="48" Z="-32" S="496" T="1182" R="24" G="133" B="238" A="255"/>
+	<Vtx X="18" Y="32" Z="-51" S="-144" T="476" R="253" G="143" B="57" A="255"/>
+	<Vtx X="24" Y="55" Z="-20" S="496" T="-190" R="24" G="133" B="238" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+	<Vtx X="-8" Y="-11" Z="0" S="1008" T="476" R="92" G="169" B="12" A="255"/>
+	<Vtx X="23" Y="34" Z="-15" S="496" T="1182" R="17" G="131" B="17" A="255"/>
+	<Vtx X="48" Y="18" Z="0" S="-144" T="476" R="195" G="145" B="15" A="255"/>
+	<Vtx X="23" Y="40" Z="16" S="496" T="-190" R="17" G="131" B="17" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_1 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_1
new file mode 100644
index 0000000000..18d3d3c64c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_1
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="138" G="211" B="13" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="138" G="211" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="159" G="243" B="81" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="135" G="217" B="250" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="144" G="195" B="1" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="143" G="202" B="235" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="146" G="193" B="245" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="137" G="214" B="239" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="144" G="197" B="248" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="144" G="197" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="195" G="156" B="206" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="141" G="202" B="11" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="136" G="215" B="248" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="133" G="226" B="14" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="138" G="213" B="16" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="134" G="219" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="134" G="219" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="136" G="41" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="141" G="204" B="244" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="141" G="205" B="12" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="149" G="187" B="1" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="145" G="195" B="12" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="146" G="193" B="245" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="144" G="197" B="8" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="144" G="197" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="195" G="156" B="50" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="136" G="215" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="137" G="214" B="239" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="133" G="223" B="1" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="133" G="226" B="243" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="141" G="203" B="245" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="138" G="211" B="243" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="138" G="211" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="159" G="243" B="175" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="144" G="195" B="255" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="135" G="217" B="6" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="143" G="202" B="23" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="138" G="213" B="16" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="145" G="195" B="12" A="255"/>
+	<Vtx X="17" Y="49" Z="-17" S="304" T="432" R="118" G="45" B="243" A="255"/>
+	<Vtx X="14" Y="49" Z="-21" S="496" T="496" R="97" G="13" B="175" A="255"/>
+	<Vtx X="15" Y="53" Z="-18" S="432" T="304" R="118" G="45" B="243" A="255"/>
+	<Vtx X="16" Y="48" Z="-10" S="112" T="304" R="121" G="39" B="6" A="255"/>
+	<Vtx X="12" Y="56" Z="-13" S="304" T="112" R="112" G="61" B="255" A="255"/>
+	<Vtx X="15" Y="54" Z="-7" S="112" T="112" R="113" G="54" B="21" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="176" T="-16" R="119" G="42" B="17" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="-16" T="176" R="110" G="63" B="11" A="255"/>
+	<Vtx X="8" Y="70" Z="7" S="304" T="432" R="112" G="59" B="8" A="255"/>
+	<Vtx X="5" Y="70" Z="11" S="496" T="496" R="61" G="100" B="50" A="255"/>
+	<Vtx X="9" Y="68" Z="11" S="432" T="304" R="112" G="59" B="8" A="255"/>
+	<Vtx X="8" Y="66" Z="2" S="112" T="304" R="115" G="54" B="245" A="255"/>
+	<Vtx X="10" Y="61" Z="9" S="304" T="112" R="120" G="41" B="8" A="255"/>
+	<Vtx X="12" Y="61" Z="2" S="112" T="112" R="123" G="30" B="242" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="176" T="-16" R="118" G="43" B="240" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="-16" T="176" R="123" G="33" B="255" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="19" Y="36" Z="-1" S="496" T="496" R="120" G="215" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="3" S="112" T="304" R="115" G="52" B="12" A="255"/>
+	<Vtx X="21" Y="40" Z="1" S="304" T="432" R="122" G="37" B="0" A="255"/>
+	<Vtx X="21" Y="40" Z="-3" S="432" T="304" R="122" G="37" B="0" A="255"/>
+	<Vtx X="17" Y="45" Z="-5" S="304" T="112" R="115" G="51" B="244" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="112" T="112" R="107" G="69" B="255" A="255"/>
+	<Vtx X="14" Y="51" Z="-4" S="176" T="-16" R="110" G="63" B="11" A="255"/>
+	<Vtx X="10" Y="54" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="-16" T="176" R="111" G="61" B="244" A="255"/>
+	<Vtx X="9" Y="68" Z="-13" S="304" T="432" R="112" G="59" B="248" A="255"/>
+	<Vtx X="5" Y="70" Z="-13" S="496" T="496" R="61" G="100" B="206" A="255"/>
+	<Vtx X="8" Y="70" Z="-9" S="432" T="304" R="112" G="59" B="248" A="255"/>
+	<Vtx X="10" Y="61" Z="-11" S="112" T="304" R="120" G="41" B="248" A="255"/>
+	<Vtx X="8" Y="66" Z="-4" S="304" T="112" R="115" G="53" B="11" A="255"/>
+	<Vtx X="12" Y="61" Z="-5" S="112" T="112" R="123" G="30" B="13" A="255"/>
+	<Vtx X="10" Y="61" Z="-1" S="176" T="-16" R="123" G="33" B="255" A="255"/>
+	<Vtx X="12" Y="57" Z="-6" S="-16" T="176" R="119" G="42" B="17" A="255"/>
+	<Vtx X="15" Y="53" Z="16" S="304" T="432" R="118" G="45" B="13" A="255"/>
+	<Vtx X="14" Y="49" Z="19" S="496" T="496" R="97" G="13" B="81" A="255"/>
+	<Vtx X="17" Y="49" Z="15" S="432" T="304" R="118" G="45" B="13" A="255"/>
+	<Vtx X="12" Y="56" Z="11" S="112" T="304" R="112" G="61" B="1" A="255"/>
+	<Vtx X="16" Y="48" Z="8" S="304" T="112" R="121" G="39" B="250" A="255"/>
+	<Vtx X="15" Y="54" Z="5" S="112" T="112" R="113" G="54" B="233" A="255"/>
+	<Vtx X="14" Y="51" Z="2" S="176" T="-16" R="111" G="61" B="244" A="255"/>
+	<Vtx X="12" Y="57" Z="4" S="-16" T="176" R="118" G="43" B="240" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_2 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_2
new file mode 100644
index 0000000000..205b9a0057
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_2
@@ -0,0 +1,90 @@
+<Vertex Version="0">
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="141" G="202" B="252" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="141" G="202" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="133" G="231" B="18" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="152" G="184" B="251" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="146" G="196" B="233" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="149" G="188" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="166" G="167" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="153" G="196" B="212" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="137" G="212" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="137" G="212" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="154" G="180" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="132" G="230" B="245" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="132" G="230" B="11" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="131" G="232" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="133" G="244" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="141" G="202" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="133" G="231" B="238" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="146" G="196" B="23" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="152" G="184" B="5" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="149" G="188" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="153" G="196" B="44" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="166" G="167" B="0" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="138" G="208" B="250" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="138" G="208" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="146" G="199" B="29" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="143" G="205" B="230" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="153" G="196" B="212" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="139" G="207" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="133" G="244" B="228" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="139" G="213" B="231" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="135" G="224" B="237" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="138" G="208" B="6" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="138" G="208" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="146" G="199" B="227" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="135" G="224" B="19" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="143" G="205" B="26" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="139" G="213" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="133" G="244" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="153" G="196" B="44" A="255"/>
+	<Vtx X="24" Y="41" Z="-10" S="304" T="432" R="115" G="54" B="4" A="255"/>
+	<Vtx X="24" Y="36" Z="-17" S="496" T="496" R="123" G="25" B="238" A="255"/>
+	<Vtx X="23" Y="44" Z="-15" S="432" T="304" R="115" G="54" B="4" A="255"/>
+	<Vtx X="20" Y="45" Z="-3" S="112" T="304" R="104" G="72" B="5" A="255"/>
+	<Vtx X="17" Y="51" Z="-12" S="304" T="112" R="110" G="60" B="23" A="255"/>
+	<Vtx X="15" Y="51" Z="-5" S="112" T="112" R="107" G="68" B="14" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="176" T="-16" R="103" G="60" B="44" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="-16" T="176" R="90" G="89" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="-4" S="304" T="432" R="119" G="44" B="0" A="255"/>
+	<Vtx X="4" Y="82" Z="-1" S="496" T="496" R="102" G="76" B="0" A="255"/>
+	<Vtx X="9" Y="75" Z="2" S="432" T="304" R="119" G="44" B="0" A="255"/>
+	<Vtx X="11" Y="67" Z="-7" S="112" T="304" R="124" G="26" B="11" A="255"/>
+	<Vtx X="11" Y="67" Z="5" S="304" T="112" R="124" G="26" B="245" A="255"/>
+	<Vtx X="11" Y="61" Z="-1" S="112" T="112" R="125" G="24" B="0" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="176" T="-16" R="123" G="12" B="228" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="-16" T="176" R="123" G="12" B="28" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="36" Z="15" S="496" T="496" R="123" G="25" B="18" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="17" Y="51" Z="10" S="112" T="304" R="110" G="60" B="233" A="255"/>
+	<Vtx X="23" Y="44" Z="13" S="304" T="432" R="115" G="54" B="252" A="255"/>
+	<Vtx X="24" Y="41" Z="8" S="432" T="304" R="115" G="54" B="252" A="255"/>
+	<Vtx X="20" Y="45" Z="1" S="304" T="112" R="104" G="72" B="251" A="255"/>
+	<Vtx X="15" Y="51" Z="3" S="112" T="112" R="107" G="68" B="242" A="255"/>
+	<Vtx X="17" Y="51" Z="-1" S="176" T="-16" R="90" G="89" B="0" A="255"/>
+	<Vtx X="11" Y="55" Z="-1" S="-16" T="-16" R="117" G="49" B="0" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="-16" T="176" R="103" G="60" B="212" A="255"/>
+	<Vtx X="16" Y="60" Z="-21" S="304" T="432" R="118" G="48" B="6" A="255"/>
+	<Vtx X="12" Y="65" Z="-28" S="496" T="496" R="110" G="57" B="227" A="255"/>
+	<Vtx X="14" Y="65" Z="-19" S="432" T="304" R="118" G="48" B="6" A="255"/>
+	<Vtx X="16" Y="55" Z="-13" S="112" T="304" R="113" G="51" B="26" A="255"/>
+	<Vtx X="12" Y="65" Z="-10" S="304" T="112" R="121" G="32" B="19" A="255"/>
+	<Vtx X="13" Y="57" Z="-7" S="112" T="112" R="117" G="43" B="25" A="255"/>
+	<Vtx X="13" Y="61" Z="-4" S="176" T="-16" R="123" G="12" B="28" A="255"/>
+	<Vtx X="16" Y="55" Z="-6" S="-16" T="176" R="103" G="60" B="44" A="255"/>
+	<Vtx X="14" Y="65" Z="17" S="304" T="432" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="26" S="496" T="496" R="110" G="57" B="29" A="255"/>
+	<Vtx X="16" Y="60" Z="19" S="432" T="304" R="118" G="48" B="250" A="255"/>
+	<Vtx X="12" Y="65" Z="8" S="112" T="304" R="121" G="32" B="237" A="255"/>
+	<Vtx X="16" Y="55" Z="11" S="304" T="112" R="113" G="51" B="230" A="255"/>
+	<Vtx X="13" Y="57" Z="5" S="112" T="112" R="117" G="43" B="231" A="255"/>
+	<Vtx X="16" Y="55" Z="4" S="176" T="-16" R="103" G="60" B="212" A="255"/>
+	<Vtx X="13" Y="61" Z="2" S="-16" T="176" R="123" G="12" B="228" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_3 b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_3
new file mode 100644
index 0000000000..56e99d5ede
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_3
@@ -0,0 +1,42 @@
+<Vertex Version="0">
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="245" G="245" B="130" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="245" G="245" B="130" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="57" G="143" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="57" G="143" B="0" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="11" G="11" B="126" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="240" R="11" G="11" B="126" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="13" Y="56" Z="-1" S="112" T="-16" R="199" G="113" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="240" R="199" G="113" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="127" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="127" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="129" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="129" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="118" G="208" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="118" G="208" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="-2" S="240" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="0" Y="-10" Z="2" S="-16" T="240" R="129" G="0" B="0" A="255"/>
+	<Vtx X="2" Y="39" Z="0" S="-16" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="-10" Z="0" S="240" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="2" Y="-10" Z="0" S="-16" T="240" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-2" Y="39" Z="0" S="240" T="112" R="0" G="0" B="127" A="255"/>
+	<Vtx X="7" Y="51" Z="0" S="-16" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="4" Y="54" Z="0" S="240" T="-16" R="0" G="0" B="127" A="255"/>
+	<Vtx X="6" Y="52" Z="2" S="-16" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="6" Y="52" Z="-2" S="240" T="-16" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="-2" S="240" T="112" R="138" G="48" B="0" A="255"/>
+	<Vtx X="0" Y="39" Z="2" S="-16" T="112" R="138" G="48" B="0" A="255"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_cull b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_cull
new file mode 100644
index 0000000000..2f795b083e
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/gRandoCuttableGrassTokenDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="82" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey
new file mode 100644
index 0000000000..ee25715ae0
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey
@@ -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/gameplay_keep/flower_bosskey_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassBossKeyDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy
new file mode 100644
index 0000000000..d3c0c44ecc
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy
@@ -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/gameplay_keep/flower_fairy_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassFairyDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart
new file mode 100644
index 0000000000..2864988e38
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart
@@ -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/gameplay_keep/flower_heart_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassHeartDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassJunkDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassJunkDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassJunkDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold
new file mode 100644
index 0000000000..6f451d12ad
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold
@@ -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/gameplay_keep/flower_gold_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMajorDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask
new file mode 100644
index 0000000000..a5bb3b8a4a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask
@@ -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/gameplay_keep/flower_mask_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMaskDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze
new file mode 100644
index 0000000000..0102b9a5e4
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze
@@ -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/gameplay_keep/flower_bronze_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassMinorDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random
new file mode 100644
index 0000000000..f23e81a036
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random
@@ -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/gameplay_keep/flower_random_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassRandomDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver
new file mode 100644
index 0000000000..98dcfacb11
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver
@@ -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/gameplay_keep/flower_silver_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_Grass b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_Grass
new file mode 100644
index 0000000000..34034f0594
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_Grass
@@ -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_TEXEL0" 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_TEX_EDGE2="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/gameplay_keep/gGrassBunchTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" 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>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token
new file mode 100644
index 0000000000..63a739c305
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token
@@ -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/gameplay_keep/flower_token_tex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_leaf b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_leaf
new file mode 100644
index 0000000000..574f63139c
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_leaf
@@ -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/gameplay_keep/LeafTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_material b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_material
new file mode 100644
index 0000000000..04270bbaec
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/mat_gRandoCuttableGrassTokenDL_f3dlite_material
@@ -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/gameplay_keep/StemTex.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<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_NOMIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/gameplay_keep/model.xml b/soh/assets/custom/objects/gameplay_keep/model.xml
new file mode 100644
index 0000000000..6444457b7a
--- /dev/null
+++ b/soh/assets/custom/objects/gameplay_keep/model.xml
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-42" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="61" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-42" Y="61" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="-17" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="61" Z="55" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="48" Y="61" Z="-51" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_keyring/Hilite_new.rgba16 b/soh/assets/custom/objects/object_keyring/Hilite_new.rgba16
new file mode 100644
index 0000000000..5438695fae
Binary files /dev/null and b/soh/assets/custom/objects/object_keyring/Hilite_new.rgba16 differ
diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL
index 3552eef1b7..7cb17d8891 100644
--- a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL
+++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL
@@ -1,11 +1,10 @@
 <DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
 	<CallDisplayList Path="objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress"/>
 	<CallDisplayList Path="objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0"/>
-	<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>
 
diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0
index 791defa81a..c7b29e9c7c 100644
--- a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0
+++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_tri_0
@@ -1,213 +1,110 @@
 <DisplayList Version="0">
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="6" V01="2" V02="4"/>
-	<Triangle1 V00="7" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="12" V01="14" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_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="3" V02="5"/>
-	<Triangle1 V00="6" V01="5" V02="7"/>
-	<Triangle1 V00="8" V01="6" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="9"/>
-	<Triangle1 V00="10" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="12" V01="10" V02="11"/>
-	<Triangle1 V00="12" V01="11" V02="13"/>
-	<Triangle1 V00="14" V01="12" V02="13"/>
-	<Triangle1 V00="14" V01="13" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="4" V01="3" V02="0"/>
-	<Triangle1 V00="4" V01="5" V02="3"/>
-	<Triangle1 V00="5" V01="6" V02="3"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="7" V01="8" V02="6"/>
-	<Triangle1 V00="7" V01="9" V02="8"/>
-	<Triangle1 V00="9" V01="10" V02="8"/>
-	<Triangle1 V00="9" V01="11" V02="10"/>
-	<Triangle1 V00="11" V01="12" V02="10"/>
-	<Triangle1 V00="11" V01="13" V02="12"/>
-	<Triangle1 V00="10" V01="12" V02="14"/>
-	<Triangle1 V00="10" V01="14" V02="15"/>
-	<Triangle1 V00="8" V01="10" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="5" V01="3" V02="4"/>
-	<Triangle1 V00="5" V01="4" V02="6"/>
-	<Triangle1 V00="7" V01="8" V02="9"/>
-	<Triangle1 V00="7" V01="9" V02="10"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="12" V01="11" V02="13"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="15" V01="12" V02="14"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="4"/>
-	<Triangle1 V00="5" V01="0" V02="3"/>
-	<Triangle1 V00="5" V01="6" V02="0"/>
-	<Triangle1 V00="7" V01="6" V02="5"/>
-	<Triangle1 V00="7" V01="8" V02="6"/>
-	<Triangle1 V00="8" V01="9" V02="6"/>
-	<Triangle1 V00="8" V01="10" V02="9"/>
-	<Triangle1 V00="6" V01="9" V02="11"/>
-	<Triangle1 V00="6" V01="11" V02="0"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="15" V01="12" V02="14"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="80" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="4" V02="5"/>
-	<Triangle1 V00="3" V01="6" V02="4"/>
-	<Triangle1 V00="3" V01="7" V02="6"/>
-	<Triangle1 V00="3" V01="8" V02="7"/>
-	<Triangle1 V00="9" V01="6" V02="7"/>
-	<Triangle1 V00="6" V01="9" V02="10"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="12" V01="11" V02="9"/>
-	<Triangle1 V00="9" V01="13" V02="12"/>
-	<Triangle1 V00="13" V01="9" V02="7"/>
-	<Triangle1 V00="13" V01="7" V02="14"/>
-	<Triangle1 V00="15" V01="12" V02="13"/>
-	<Triangle1 V00="12" V01="15" V02="11"/>
-	<Triangle1 V00="10" V01="11" V02="15"/>
-	<Triangle1 V00="6" V01="10" V02="15"/>
-	<Triangle1 V00="15" V01="4" V02="6"/>
-	<Triangle1 V00="13" V01="4" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="1" V02="0"/>
-	<Triangle1 V00="3" V01="0" V02="4"/>
-	<Triangle1 V00="5" V01="6" V02="7"/>
-	<Triangle1 V00="5" V01="7" V02="8"/>
-	<Triangle1 V00="9" V01="8" V02="7"/>
-	<Triangle1 V00="9" V01="7" V02="10"/>
-	<Triangle1 V00="11" V01="8" V02="9"/>
-	<Triangle1 V00="11" V01="5" V02="8"/>
-	<Triangle1 V00="11" V01="12" V02="5"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="11" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="11"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="112" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="1" V01="3" V02="2"/>
-	<Triangle1 V00="2" V01="3" V02="4"/>
-	<Triangle1 V00="2" 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="6" V02="9"/>
-	<Triangle1 V00="10" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="12" V01="8" V02="10"/>
-	<Triangle1 V00="13" V01="8" V02="12"/>
-	<Triangle1 V00="13" V01="7" V02="8"/>
-	<Triangle1 V00="13" V01="5" V02="7"/>
-	<Triangle1 V00="13" V01="14" V02="5"/>
-	<Triangle1 V00="14" V01="2" V02="5"/>
-	<Triangle1 V00="14" V01="0" V02="2"/>
-	<Triangle1 V00="12" V01="10" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<Triangle1 V00="4" V01="5" V02="6"/>
-	<Triangle1 V00="7" V01="5" V02="4"/>
-	<Triangle1 V00="8" V01="5" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="9"/>
-	<Triangle1 V00="7" V01="10" V02="9"/>
-	<Triangle1 V00="10" V01="6" V02="9"/>
-	<Triangle1 V00="8" V01="9" V02="11"/>
-	<Triangle1 V00="5" V01="8" V02="11"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<Triangle1 V00="14" V01="13" V02="15"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="144" 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="5" V01="4" V02="7"/>
-	<Triangle1 V00="5" V01="7" V02="8"/>
-	<Triangle1 V00="8" V01="7" V02="9"/>
-	<Triangle1 V00="9" V01="7" V02="10"/>
-	<Triangle1 V00="9" V01="10" V02="11"/>
-	<Triangle1 V00="9" V01="12" V02="8"/>
-	<Triangle1 V00="9" V01="13" V02="12"/>
-	<Triangle1 V00="13" V01="9" V02="14"/>
-	<Triangle1 V00="15" V01="14" V02="9"/>
-	<Triangle1 V00="5" V01="13" V02="14"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="160" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="2" V02="1"/>
-	<Triangle1 V00="2" V01="3" V02="4"/>
-	<Triangle1 V00="5" V01="4" V02="3"/>
-	<Triangle1 V00="5" V01="0" V02="4"/>
-	<Triangle1 V00="2" V01="4" V02="0"/>
-	<Triangle1 V00="1" V01="6" V02="7"/>
-	<Triangle1 V00="8" V01="7" V02="6"/>
-	<Triangle1 V00="1" V01="7" 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/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="176" Count="16"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="0" V01="4" V02="3"/>
-	<Triangle1 V00="5" V01="4" V02="0"/>
-	<Triangle1 V00="5" V01="0" V02="6"/>
-	<Triangle1 V00="7" V01="6" V02="0"/>
-	<Triangle1 V00="7" V01="0" V02="8"/>
-	<Triangle1 V00="0" V01="2" V02="8"/>
-	<Triangle1 V00="8" V01="2" V02="9"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="10" V01="9" V02="11"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<Triangle1 V00="13" V01="11" V02="14"/>
-	<Triangle1 V00="4" V01="13" V02="14"/>
-	<Triangle1 V00="4" V01="14" V02="3"/>
-	<Triangle1 V00="15" V01="13" V02="4"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="192" Count="14"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="0" V01="3" V02="1"/>
-	<Triangle1 V00="0" V01="4" V02="3"/>
-	<Triangle1 V00="0" V01="5" V02="4"/>
-	<Triangle1 V00="5" V01="6" V02="4"/>
-	<Triangle1 V00="5" V01="7" V02="6"/>
-	<Triangle1 V00="2" V01="8" V02="9"/>
-	<Triangle1 V00="10" V01="11" V02="12"/>
-	<Triangle1 V00="13" V01="12" V02="11"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="206" Count="15"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="3" V01="0" V02="2"/>
-	<Triangle1 V00="3" V01="4" V02="0"/>
-	<Triangle1 V00="3" V01="5" V02="4"/>
-	<Triangle1 V00="3" V01="6" V02="5"/>
-	<Triangle1 V00="5" V01="6" V02="1"/>
-	<Triangle1 V00="4" V01="5" V02="7"/>
-	<Triangle1 V00="4" V01="7" V02="0"/>
-	<Triangle1 V00="8" V01="9" V02="10"/>
-	<Triangle1 V00="8" V01="10" V02="11"/>
-	<Triangle1 V00="12" V01="10" V02="13"/>
-	<Triangle1 V00="12" V01="13" V02="14"/>
-	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="221" Count="10"/>
-	<Triangle1 V00="0" V01="1" V02="2"/>
-	<Triangle1 V00="1" V01="0" V02="3"/>
-	<Triangle1 V00="1" V01="3" V02="4"/>
-	<Triangle1 V00="4" V01="2" V02="1"/>
-	<Triangle1 V00="5" V01="6" V02="7"/>
-	<Triangle1 V00="6" V01="5" V02="8"/>
-	<Triangle1 V00="6" V01="8" V02="9"/>
-	<Triangle1 V00="9" V01="7" V02="6"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="2" V02="4" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="9" V02="11" Flag0="0" V10="12" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="12" V01="14" V02="15" Flag0="0" V10="15" V11="14" V12="16" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="17" Flag0="0" V10="17" V11="16" V12="18" 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="23" V02="25" Flag0="0" V10="26" V11="24" V12="25" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="27" Flag0="0" V10="28" V11="26" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="30" V11="26" V12="28" Flag1="0"/>
+	<Triangle1 V00="30" V01="31" V02="26"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="3" V11="5" V12="4" Flag1="0"/>
+	<Triangles2 V00="5" V01="6" V02="4" Flag0="0" V10="5" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="7" V01="8" V02="6" Flag0="0" V10="7" V11="9" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="10" V02="8" Flag0="0" V10="9" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="12" Flag0="0" V10="8" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="6" V01="8" V02="13" Flag0="0" V10="6" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="14" Flag0="0" V10="4" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="15" Flag0="0" V10="1" V11="15" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="17" V11="19" V12="20" Flag1="0"/>
+	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="20" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="22" V11="23" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="22" V02="24" Flag0="0" V10="25" V11="24" V12="26" Flag1="0"/>
+	<Triangles2 V00="27" V01="25" V02="26" Flag0="0" V10="27" V11="26" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="25" V02="27" Flag0="0" V10="29" V11="30" V12="25" Flag1="0"/>
+	<Triangle1 V00="31" V01="30" V02="29"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="1" V11="3" V12="2" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="2" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="2" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="7" V02="9" Flag0="0" V10="10" V11="11" V12="7" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="12" V01="16" V02="15" Flag0="0" V10="12" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="18" V01="15" V02="16" Flag0="0" V10="15" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="20" V12="18" Flag1="0"/>
+	<Triangles2 V00="18" V01="22" V02="21" Flag0="0" V10="22" V11="18" V12="16" Flag1="0"/>
+	<Triangles2 V00="22" V01="16" V02="23" Flag0="0" V10="24" V11="21" V12="22" Flag1="0"/>
+	<Triangles2 V00="21" V01="24" V02="20" Flag0="0" V10="19" V11="20" V12="24" Flag1="0"/>
+	<Triangles2 V00="15" V01="19" V02="24" Flag0="0" V10="24" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="22" V01="13" V02="24" Flag0="0" V10="22" V11="25" V12="13" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="22" Flag0="0" V10="26" V11="22" V12="27" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="28" V11="30" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="1" V02="0" Flag0="0" V10="4" V11="5" V12="1" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="7" V11="6" V12="4" Flag1="0"/>
+	<Triangles2 V00="7" V01="4" V02="8" Flag0="0" V10="9" V11="8" V12="4" Flag1="0"/>
+	<Triangles2 V00="9" V01="4" V02="10" Flag0="0" V10="4" V11="0" V12="10" Flag1="0"/>
+	<Triangles2 V00="10" V01="0" V02="11" Flag0="0" V10="10" V11="11" V12="12" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="12" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="13" Flag0="0" V10="15" V11="13" V12="16" Flag1="0"/>
+	<Triangles2 V00="6" V01="15" V02="16" Flag0="0" V10="6" V11="16" V12="5" Flag1="0"/>
+	<Triangles2 V00="17" V01="15" V02="6" Flag0="0" V10="18" V11="15" V12="17" Flag1="0"/>
+	<Triangles2 V00="18" V01="14" V02="15" Flag0="0" V10="18" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="18" V01="19" V02="12" Flag0="0" V10="19" V11="10" V12="12" Flag1="0"/>
+	<Triangles2 V00="19" V01="9" V02="10" Flag0="0" V10="17" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="22" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="25" V12="24" Flag1="0"/>
+	<Triangles2 V00="28" V01="25" V02="27" Flag0="0" V10="28" V11="27" V12="29" Flag1="0"/>
+	<Triangles2 V00="27" V01="30" V02="29" Flag0="0" V10="30" V11="26" V12="29" Flag1="0"/>
+	<Triangles2 V00="28" V01="29" V02="31" Flag0="0" V10="25" V11="28" V12="31" Flag1="0"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="128" 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="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="9" V11="8" V12="11" Flag1="0"/>
+	<Triangles2 V00="9" V01="11" V02="12" Flag0="0" V10="12" V11="11" V12="13" Flag1="0"/>
+	<Triangles2 V00="13" V01="11" V02="14" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="13" V01="16" V02="12" Flag0="0" V10="13" V11="17" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="13" V02="18" Flag0="0" V10="19" V11="18" V12="13" Flag1="0"/>
+	<Triangles2 V00="9" V01="17" V02="18" Flag0="0" V10="17" V11="9" V12="20" Flag1="0"/>
+	<Triangles2 V00="12" V01="20" V02="9" Flag0="0" V10="20" V11="12" V12="21" Flag1="0"/>
+	<Triangles2 V00="16" V01="21" V02="12" Flag0="0" V10="16" V11="17" V12="21" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="17" Flag0="0" V10="9" V11="18" V12="22" Flag1="0"/>
+	<Triangles2 V00="23" V01="22" V02="18" Flag0="0" V10="9" V11="22" V12="24" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="25" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="27" Flag0="0" V10="29" V11="27" V12="30" Flag1="0"/>
+	<Triangles2 V00="31" V01="28" V02="29" Flag0="0" V10="31" V11="25" V12="28" Flag1="0"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
+	<Triangles2 V00="3" V01="0" V02="4" Flag0="0" V10="5" V11="4" V12="0" Flag1="0"/>
+	<Triangles2 V00="5" V01="0" V02="6" Flag0="0" V10="0" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="6" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="9" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="10" Flag0="0" V10="12" V11="10" V12="13" Flag1="0"/>
+	<Triangles2 V00="1" V01="12" V02="13" Flag0="0" V10="1" V11="13" V12="2" Flag1="0"/>
+	<Triangles2 V00="14" V01="12" V02="1" Flag0="0" V10="15" V11="12" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="11" V02="12" Flag0="0" V10="15" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="9" Flag0="0" V10="16" V11="6" V12="9" Flag1="0"/>
+	<Triangles2 V00="16" V01="5" V02="6" Flag0="0" V10="14" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="19" V12="18" Flag1="0"/>
+	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="25" V02="21" Flag0="0" V10="24" V11="26" V12="25" Flag1="0"/>
+	<Triangles2 V00="24" V01="27" V02="26" Flag0="0" V10="26" V11="27" V12="22" Flag1="0"/>
+	<Triangles2 V00="25" V01="26" V02="28" Flag0="0" V10="25" V11="28" V12="21" Flag1="0"/>
+	<Triangle1 V00="29" V01="30" V02="31"/>
+	<LoadVertices Path="objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0" VertexBufferIndex="0" VertexOffset="192" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="4" Flag1="0"/>
+	<Triangles2 V00="3" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="8" Flag1="0"/>
+	<Triangles2 V00="7" V01="6" V02="9" Flag0="0" V10="7" V11="9" V12="10" Flag1="0"/>
+	<Triangles2 V00="10" V01="8" V02="7" Flag0="0" V10="11" V11="12" V12="13" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<Triangle1 V00="15" V01="13" V02="12"/>
 	<EndDisplayList/>
 </DisplayList>
 
diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0 b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0
index 1dd0cbb61e..5ab0f76ecc 100644
--- a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0
+++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_0
@@ -1,233 +1,210 @@
 <Vertex Version="0">
-	<Vtx X="-21" Y="-11" Z="13" S="-175" T="-1122" R="234" G="7" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="13" S="-175" T="-1122" R="233" G="7" B="125" A="254"/>
 	<Vtx X="-28" Y="-10" Z="11" S="-161" T="-1207" R="227" G="123" B="244" A="254"/>
-	<Vtx X="-29" Y="-12" Z="12" S="-70" T="-1316" R="235" G="11" B="125" A="254"/>
-	<Vtx X="-21" Y="-11" Z="13" S="-184" T="-1036" R="234" G="7" B="125" A="254"/>
-	<Vtx X="-28" Y="-14" Z="11" S="-5" T="-1276" R="2" G="129" B="8" A="254"/>
-	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="246" G="130" B="6" A="254"/>
-	<Vtx X="-21" Y="-11" Z="13" S="-215" T="-994" R="234" G="7" B="125" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="21" G="245" B="131" A="254"/>
-	<Vtx X="-15" Y="-16" Z="13" S="-70" T="-1316" R="22" G="249" B="131" A="254"/>
+	<Vtx X="-29" Y="-12" Z="12" S="-70" T="-1316" R="234" G="11" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="13" S="-184" T="-1036" R="233" G="7" B="125" A="254"/>
+	<Vtx X="-28" Y="-14" Z="11" S="-5" T="-1276" R="2" G="129" B="9" A="254"/>
+	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="245" G="130" B="7" A="254"/>
+	<Vtx X="-21" Y="-11" Z="13" S="-215" T="-994" R="233" G="7" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="21" G="244" B="131" A="254"/>
+	<Vtx X="-15" Y="-16" Z="13" S="-70" T="-1316" R="23" G="248" B="131" A="254"/>
 	<Vtx X="-16" Y="-18" Z="13" S="-5" T="-1276" R="191" G="147" B="254" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-184" T="-1036" R="21" G="245" B="131" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-184" T="-1036" R="21" G="244" B="131" A="254"/>
 	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="202" G="141" B="0" A="254"/>
-	<Vtx X="-14" Y="16" Z="15" S="-666" T="-580" R="231" G="237" B="123" A="255"/>
+	<Vtx X="-14" Y="16" Z="15" S="-666" T="-580" R="231" G="236" B="123" A="255"/>
 	<Vtx X="-36" Y="10" Z="12" S="-580" T="-580" R="2" G="244" B="126" A="255"/>
 	<Vtx X="-35" Y="10" Z="6" S="-580" T="-751" R="38" G="228" B="138" A="255"/>
-	<Vtx X="-13" Y="16" Z="8" S="-666" T="-751" R="10" G="220" B="135" A="255"/>
-	<Vtx X="-13" Y="16" Z="8" S="-666" T="-751" R="10" G="220" B="135" A="255"/>
-	<Vtx X="-35" Y="10" Z="6" S="-580" T="-751" R="38" G="228" B="138" A="255"/>
+	<Vtx X="-13" Y="16" Z="8" S="-666" T="-751" R="11" G="220" B="135" A="255"/>
 	<Vtx X="-39" Y="14" Z="8" S="-580" T="-922" R="167" G="89" B="237" A="255"/>
 	<Vtx X="-12" Y="21" Z="11" S="-666" T="-922" R="33" G="123" B="253" A="255"/>
 	<Vtx X="-36" Y="10" Z="12" S="-580" T="-1092" R="2" G="244" B="126" A="255"/>
-	<Vtx X="-14" Y="16" Z="15" S="-666" T="-1092" R="231" G="237" B="123" A="255"/>
-	<Vtx X="8" Y="1" Z="16" S="-751" T="-922" R="122" G="33" B="15" A="255"/>
-	<Vtx X="2" Y="0" Z="18" S="-751" T="-1092" R="211" G="0" B="119" A="255"/>
+	<Vtx X="-14" Y="16" Z="15" S="-666" T="-1092" R="231" G="236" B="123" A="255"/>
+	<Vtx X="8" Y="1" Z="16" S="-751" T="-922" R="121" G="34" B="16" A="255"/>
+	<Vtx X="2" Y="0" Z="18" S="-751" T="-1092" R="210" G="1" B="119" A="255"/>
 	<Vtx X="0" Y="-26" Z="16" S="-836" T="-922" R="89" G="167" B="19" A="255"/>
 	<Vtx X="-4" Y="-22" Z="19" S="-836" T="-1092" R="218" G="28" B="118" A="255"/>
 	<Vtx X="-27" Y="-34" Z="13" S="-922" T="-922" R="223" G="133" B="3" A="255"/>
-	<Vtx X="-26" Y="-29" Z="16" S="-922" T="-1092" R="246" G="36" B="121" A="255"/>
-	<Vtx X="-47" Y="-14" Z="9" S="-1007" T="-922" R="134" G="223" B="241" A="255"/>
-	<Vtx X="-42" Y="-12" Z="12" S="-1007" T="-1092" R="9" G="15" B="126" A="255"/>
+	<Vtx X="-26" Y="-29" Z="16" S="-922" T="-1092" R="245" G="36" B="121" A="255"/>
+	<Vtx X="-47" Y="-14" Z="9" S="-1007" T="-922" R="135" G="222" B="240" A="255"/>
+	<Vtx X="-42" Y="-12" Z="12" S="-1007" T="-1092" R="10" G="16" B="126" A="255"/>
 	<Vtx X="-39" Y="14" Z="8" S="-1092" T="-922" R="167" G="89" B="237" A="255"/>
 	<Vtx X="-36" Y="10" Z="12" S="-1092" T="-1092" R="2" G="244" B="126" A="255"/>
 	<Vtx X="-35" Y="10" Z="6" S="-1092" T="-751" R="38" G="228" B="138" A="255"/>
-	<Vtx X="-47" Y="-14" Z="9" S="-1007" T="-922" R="134" G="223" B="241" A="255"/>
-	<Vtx X="-39" Y="14" Z="8" S="-1092" T="-922" R="167" G="89" B="237" A="255"/>
-	<Vtx X="-41" Y="-13" Z="6" S="-1007" T="-751" R="45" G="0" B="137" A="255"/>
+	<Vtx X="-41" Y="-13" Z="6" S="-1007" T="-751" R="46" G="255" B="137" A="255"/>
 	<Vtx X="-36" Y="10" Z="12" S="-1092" T="-580" R="2" G="244" B="126" A="255"/>
-	<Vtx X="-42" Y="-12" Z="12" S="-1007" T="-580" R="9" G="15" B="126" A="255"/>
-	<Vtx X="-25" Y="-29" Z="10" S="-922" T="-751" R="25" G="19" B="133" A="255"/>
-	<Vtx X="-26" Y="-29" Z="16" S="-922" T="-580" R="246" G="36" B="121" A="255"/>
+	<Vtx X="-41" Y="-13" Z="6" S="-1007" T="-751" R="46" G="255" B="137" A="255"/>
+	<Vtx X="-35" Y="10" Z="6" S="-1092" T="-751" R="38" G="228" B="138" A="255"/>
+	<Vtx X="-42" Y="-12" Z="12" S="-1007" T="-580" R="10" G="16" B="126" A="255"/>
+	<Vtx X="-25" Y="-29" Z="10" S="-922" T="-751" R="25" G="20" B="133" A="255"/>
+	<Vtx X="-26" Y="-29" Z="16" S="-922" T="-580" R="245" G="36" B="121" A="255"/>
 	<Vtx X="-3" Y="-23" Z="13" S="-836" T="-751" R="254" G="12" B="130" A="255"/>
 	<Vtx X="-4" Y="-22" Z="19" S="-836" T="-580" R="218" G="28" B="118" A="255"/>
-	<Vtx X="3" Y="0" Z="12" S="-751" T="-751" R="247" G="241" B="130" A="255"/>
-	<Vtx X="2" Y="0" Z="18" S="-751" T="-580" R="211" G="0" B="119" A="255"/>
-	<Vtx X="-13" Y="16" Z="8" S="-666" T="-751" R="10" G="220" B="135" A="255"/>
-	<Vtx X="-14" Y="16" Z="15" S="-666" T="-580" R="231" G="237" B="123" A="255"/>
+	<Vtx X="3" Y="0" Z="12" S="-751" T="-751" R="246" G="240" B="130" A="255"/>
+	<Vtx X="2" Y="0" Z="18" S="-751" T="-580" R="210" G="1" B="119" A="255"/>
+	<Vtx X="-13" Y="16" Z="8" S="-666" T="-751" R="11" G="220" B="135" A="255"/>
+	<Vtx X="-14" Y="16" Z="15" S="-666" T="-580" R="231" G="236" B="123" A="255"/>
 	<Vtx X="-12" Y="21" Z="11" S="-666" T="-922" R="33" G="123" B="253" A="255"/>
-	<Vtx X="8" Y="1" Z="16" S="-751" T="-922" R="122" G="33" B="15" A="255"/>
-	<Vtx X="-3" Y="-23" Z="13" S="-836" T="-751" R="254" G="12" B="130" A="255"/>
-	<Vtx X="8" Y="1" Z="16" S="-751" T="-922" R="122" G="33" B="15" A="255"/>
+	<Vtx X="8" Y="1" Z="16" S="-751" T="-922" R="121" G="34" B="16" A="255"/>
 	<Vtx X="0" Y="-26" Z="16" S="-836" T="-922" R="89" G="167" B="19" A="255"/>
-	<Vtx X="-25" Y="-29" Z="10" S="-922" T="-751" R="25" G="19" B="133" A="255"/>
 	<Vtx X="-27" Y="-34" Z="13" S="-922" T="-922" R="223" G="133" B="3" A="255"/>
-	<Vtx X="-41" Y="-13" Z="6" S="-1007" T="-751" R="45" G="0" B="137" A="255"/>
-	<Vtx X="-47" Y="-14" Z="9" S="-1007" T="-922" R="134" G="223" B="241" A="255"/>
+	<Vtx X="-47" Y="-14" Z="9" S="-1007" T="-922" R="135" G="222" B="240" A="255"/>
 	<Vtx X="-15" Y="27" Z="12" S="-708" T="-580" R="242" G="1" B="126" A="255"/>
-	<Vtx X="-18" Y="17" Z="12" S="-580" T="-580" R="255" G="3" B="127" A="255"/>
-	<Vtx X="-17" Y="17" Z="9" S="-580" T="-751" R="35" G="244" B="134" A="255"/>
-	<Vtx X="-15" Y="27" Z="9" S="-708" T="-751" R="22" G="241" B="132" A="255"/>
+	<Vtx X="-18" Y="17" Z="12" S="-580" T="-580" R="255" G="4" B="127" A="255"/>
+	<Vtx X="-17" Y="17" Z="9" S="-580" T="-751" R="35" G="243" B="135" A="255"/>
+	<Vtx X="-15" Y="27" Z="9" S="-708" T="-751" R="23" G="241" B="132" A="255"/>
 	<Vtx X="-20" Y="16" Z="11" S="-580" T="-922" R="135" G="32" B="236" A="255"/>
-	<Vtx X="-16" Y="29" Z="10" S="-708" T="-922" R="194" G="110" B="240" A="255"/>
-	<Vtx X="-18" Y="17" Z="12" S="-580" T="-1092" R="255" G="3" B="127" A="255"/>
+	<Vtx X="-16" Y="29" Z="10" S="-708" T="-922" R="194" G="109" B="240" A="255"/>
+	<Vtx X="-18" Y="17" Z="12" S="-580" T="-1092" R="255" G="4" B="127" A="255"/>
 	<Vtx X="-15" Y="27" Z="12" S="-708" T="-1092" R="242" G="1" B="126" A="255"/>
-	<Vtx X="-5" Y="26" Z="12" S="-836" T="-922" R="109" G="64" B="11" A="255"/>
-	<Vtx X="-5" Y="26" Z="12" S="-836" T="-922" R="109" G="64" B="11" A="255"/>
-	<Vtx X="-15" Y="27" Z="12" S="-708" T="-1092" R="242" G="1" B="126" A="255"/>
-	<Vtx X="-7" Y="25" Z="13" S="-836" T="-1092" R="231" G="4" B="124" A="255"/>
+	<Vtx X="-5" Y="26" Z="12" S="-836" T="-922" R="109" G="64" B="12" A="255"/>
+	<Vtx X="-7" Y="25" Z="13" S="-836" T="-1092" R="230" G="4" B="124" A="255"/>
 	<Vtx X="-8" Y="13" Z="12" S="-964" T="-922" R="121" G="224" B="20" A="255"/>
-	<Vtx X="-10" Y="15" Z="14" S="-964" T="-1092" R="221" G="12" B="122" A="255"/>
-	<Vtx X="-9" Y="15" Z="11" S="-964" T="-751" R="1" G="253" B="129" A="255"/>
-	<Vtx X="-7" Y="25" Z="10" S="-836" T="-751" R="11" G="244" B="130" A="255"/>
-	<Vtx X="-10" Y="15" Z="14" S="-964" T="-580" R="221" G="12" B="122" A="255"/>
-	<Vtx X="-7" Y="25" Z="13" S="-836" T="-580" R="231" G="4" B="124" A="255"/>
-	<Vtx X="-15" Y="27" Z="9" S="-708" T="-751" R="22" G="241" B="132" A="255"/>
+	<Vtx X="-10" Y="15" Z="14" S="-964" T="-1092" R="221" G="13" B="121" A="255"/>
+	<Vtx X="-9" Y="15" Z="11" S="-964" T="-751" R="1" G="252" B="129" A="255"/>
+	<Vtx X="-7" Y="25" Z="10" S="-836" T="-751" R="11" G="243" B="130" A="255"/>
+	<Vtx X="-10" Y="15" Z="14" S="-964" T="-580" R="221" G="13" B="121" A="255"/>
+	<Vtx X="-10" Y="15" Z="14" S="-964" T="-580" R="221" G="13" B="121" A="255"/>
+	<Vtx X="-7" Y="25" Z="13" S="-836" T="-580" R="230" G="4" B="124" A="255"/>
+	<Vtx X="-7" Y="25" Z="10" S="-836" T="-751" R="11" G="243" B="130" A="255"/>
+	<Vtx X="-15" Y="27" Z="9" S="-708" T="-751" R="23" G="241" B="132" A="255"/>
 	<Vtx X="-15" Y="27" Z="12" S="-708" T="-580" R="242" G="1" B="126" A="255"/>
-	<Vtx X="-16" Y="29" Z="10" S="-708" T="-922" R="194" G="110" B="240" A="255"/>
-	<Vtx X="-29" Y="-11" Z="11" S="-130" T="-1349" R="229" G="124" B="245" A="254"/>
-	<Vtx X="-29" Y="-12" Z="12" S="-70" T="-1316" R="235" G="11" B="125" A="254"/>
+	<Vtx X="-16" Y="29" Z="10" S="-708" T="-922" R="194" G="109" B="240" A="255"/>
+	<Vtx X="-5" Y="26" Z="12" S="-836" T="-922" R="109" G="64" B="12" A="255"/>
+	<Vtx X="-29" Y="-11" Z="11" S="-130" T="-1349" R="229" G="123" B="244" A="254"/>
+	<Vtx X="-29" Y="-12" Z="12" S="-70" T="-1316" R="234" G="11" B="125" A="254"/>
 	<Vtx X="-28" Y="-10" Z="11" S="-155" T="-1302" R="227" G="123" B="244" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-1207" R="14" G="247" B="130" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-1207" R="14" G="247" B="130" A="254"/>
-	<Vtx X="-29" Y="-13" Z="11" S="-70" T="-1316" R="15" G="251" B="130" A="254"/>
-	<Vtx X="-29" Y="-11" Z="11" S="-130" T="-1349" R="229" G="124" B="245" A="254"/>
-	<Vtx X="-14" Y="-14" Z="13" S="-159" T="-765" R="46" G="138" B="14" A="254"/>
-	<Vtx X="-12" Y="-7" Z="14" S="-454" T="-732" R="236" G="12" B="125" A="254"/>
-	<Vtx X="-21" Y="-11" Z="13" S="-159" T="-765" R="234" G="7" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-1207" R="14" G="246" B="130" A="254"/>
+	<Vtx X="-29" Y="-13" Z="11" S="-70" T="-1316" R="15" G="250" B="130" A="254"/>
+	<Vtx X="-14" Y="-14" Z="13" S="-159" T="-765" R="46" G="138" B="15" A="254"/>
+	<Vtx X="-12" Y="-7" Z="14" S="-454" T="-732" R="236" G="13" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="13" S="-159" T="-765" R="233" G="7" B="125" A="254"/>
 	<Vtx X="-8" Y="-11" Z="14" S="-349" T="-544" R="88" G="166" B="19" A="254"/>
-	<Vtx X="-11" Y="-7" Z="13" S="-454" T="-732" R="16" G="253" B="130" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-824" R="14" G="247" B="130" A="254"/>
-	<Vtx X="-8" Y="-2" Z="13" S="-679" T="-646" R="16" G="0" B="130" A="254"/>
-	<Vtx X="-4" Y="-3" Z="14" S="-681" T="-493" R="124" G="239" B="19" A="254"/>
+	<Vtx X="-11" Y="-7" Z="13" S="-454" T="-732" R="16" G="252" B="130" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-824" R="14" G="246" B="130" A="254"/>
+	<Vtx X="-8" Y="-2" Z="13" S="-679" T="-646" R="17" G="255" B="130" A="254"/>
+	<Vtx X="-4" Y="-3" Z="14" S="-681" T="-493" R="124" G="238" B="19" A="254"/>
 	<Vtx X="-5" Y="7" Z="13" S="-1012" T="-643" R="26" G="124" B="252" A="254"/>
-	<Vtx X="-10" Y="-1" Z="13" S="-688" T="-724" R="157" G="77" B="237" A="254"/>
-	<Vtx X="-13" Y="-5" Z="13" S="-510" T="-819" R="182" G="102" B="239" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="14" G="247" B="130" A="254"/>
+	<Vtx X="-10" Y="-1" Z="13" S="-688" T="-724" R="157" G="77" B="236" A="254"/>
+	<Vtx X="-13" Y="-5" Z="13" S="-510" T="-819" R="182" G="102" B="238" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="14" G="246" B="130" A="254"/>
 	<Vtx X="-8" Y="-2" Z="14" S="-679" T="-646" R="236" G="16" B="124" A="254"/>
-	<Vtx X="-13" Y="-5" Z="13" S="-510" T="-819" R="182" G="102" B="239" A="254"/>
-	<Vtx X="-21" Y="-11" Z="13" S="-215" T="-994" R="234" G="7" B="125" A="254"/>
-	<Vtx X="-12" Y="-7" Z="14" S="-454" T="-732" R="236" G="12" B="125" A="254"/>
+	<Vtx X="-21" Y="-11" Z="13" S="-215" T="-994" R="233" G="7" B="125" A="254"/>
 	<Vtx X="-20" Y="-8" Z="12" S="-310" T="-1033" R="198" G="112" B="240" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-245" T="-1035" R="14" G="247" B="130" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-245" T="-1035" R="14" G="246" B="130" A="254"/>
 	<Vtx X="-37" Y="-14" Z="10" S="-772" T="-836" R="180" G="206" B="89" A="255"/>
 	<Vtx X="-37" Y="-14" Z="10" S="-644" T="-836" R="164" G="17" B="86" A="255"/>
-	<Vtx X="-37" Y="-13" Z="10" S="-644" T="-964" R="142" G="53" B="236" A="255"/>
-	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-964" R="171" G="161" B="250" A="255"/>
-	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-836" R="208" G="193" B="156" A="255"/>
+	<Vtx X="-37" Y="-13" Z="10" S="-644" T="-964" R="143" G="53" B="236" A="255"/>
+	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-964" R="171" G="162" B="250" A="255"/>
+	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-836" R="208" G="193" B="157" A="255"/>
+	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-964" R="171" G="162" B="250" A="255"/>
+	<Vtx X="-37" Y="-13" Z="10" S="-644" T="-964" R="143" G="53" B="236" A="255"/>
 	<Vtx X="-37" Y="-14" Z="10" S="-644" T="-836" R="193" G="4" B="146" A="255"/>
 	<Vtx X="-36" Y="-15" Z="10" S="-772" T="-964" R="0" G="129" B="8" A="255"/>
-	<Vtx X="-36" Y="-14" Z="11" S="-772" T="-836" R="231" G="206" B="114" A="255"/>
+	<Vtx X="-37" Y="-14" Z="10" S="-772" T="-836" R="180" G="206" B="89" A="255"/>
+	<Vtx X="-36" Y="-14" Z="11" S="-772" T="-836" R="230" G="206" B="114" A="255"/>
 	<Vtx X="-30" Y="-13" Z="12" S="-900" T="-836" R="249" G="213" B="119" A="255"/>
-	<Vtx X="-30" Y="-14" Z="11" S="-900" T="-964" R="24" G="132" B="11" A="255"/>
-	<Vtx X="-30" Y="-13" Z="10" S="-900" T="-836" R="26" G="198" B="146" A="255"/>
-	<Vtx X="-30" Y="-13" Z="10" S="-900" T="-836" R="26" G="198" B="146" A="255"/>
-	<Vtx X="-36" Y="-15" Z="10" S="-772" T="-964" R="0" G="129" B="8" A="255"/>
+	<Vtx X="-30" Y="-14" Z="11" S="-900" T="-964" R="24" G="132" B="12" A="255"/>
+	<Vtx X="-30" Y="-13" Z="10" S="-900" T="-836" R="27" G="198" B="146" A="255"/>
 	<Vtx X="-36" Y="-15" Z="10" S="-772" T="-836" R="7" G="191" B="147" A="255"/>
-	<Vtx X="-37" Y="-15" Z="10" S="-772" T="-836" R="208" G="193" B="156" A="255"/>
 	<Vtx X="-37" Y="-14" Z="10" S="-772" T="-708" R="193" G="4" B="146" A="255"/>
-	<Vtx X="-36" Y="-13" Z="9" S="-772" T="-708" R="244" G="38" B="135" A="255"/>
-	<Vtx X="-37" Y="-13" Z="10" S="-772" T="-580" R="142" G="53" B="236" A="255"/>
-	<Vtx X="-36" Y="-13" Z="10" S="-772" T="-580" R="208" G="117" B="242" A="255"/>
+	<Vtx X="-36" Y="-13" Z="9" S="-772" T="-708" R="244" G="39" B="136" A="255"/>
+	<Vtx X="-37" Y="-13" Z="10" S="-772" T="-580" R="143" G="53" B="236" A="255"/>
+	<Vtx X="-36" Y="-13" Z="10" S="-772" T="-580" R="208" G="117" B="241" A="255"/>
 	<Vtx X="-36" Y="-13" Z="11" S="-772" T="-708" R="211" G="54" B="106" A="255"/>
 	<Vtx X="-37" Y="-14" Z="10" S="-772" T="-708" R="164" G="17" B="86" A="255"/>
-	<Vtx X="-36" Y="-14" Z="11" S="-772" T="-836" R="231" G="206" B="114" A="255"/>
-	<Vtx X="-37" Y="-14" Z="10" S="-772" T="-836" R="180" G="206" B="89" A="255"/>
 	<Vtx X="-30" Y="-12" Z="12" S="-900" T="-708" R="229" G="61" B="108" A="255"/>
-	<Vtx X="-30" Y="-11" Z="11" S="-900" T="-580" R="232" G="124" B="245" A="255"/>
-	<Vtx X="-30" Y="-12" Z="10" S="-900" T="-708" R="6" G="45" B="137" A="255"/>
-	<Vtx X="-30" Y="-13" Z="12" S="-900" T="-836" R="249" G="213" B="119" A="255"/>
-	<Vtx X="-31" Y="-13" Z="12" S="21" T="-445" R="206" G="35" B="111" A="254"/>
-	<Vtx X="-32" Y="-20" Z="11" S="-730" T="-1234" R="23" G="132" B="11" A="254"/>
+	<Vtx X="-30" Y="-11" Z="11" S="-900" T="-580" R="232" G="124" B="244" A="255"/>
+	<Vtx X="-30" Y="-12" Z="10" S="-900" T="-708" R="6" G="46" B="138" A="255"/>
+	<Vtx X="-31" Y="-13" Z="12" S="21" T="-445" R="206" G="36" B="111" A="254"/>
+	<Vtx X="-32" Y="-20" Z="11" S="-730" T="-1234" R="23" G="132" B="12" A="254"/>
 	<Vtx X="-28" Y="-14" Z="11" S="-843" T="-464" R="113" G="201" B="20" A="254"/>
-	<Vtx X="-31" Y="-13" Z="9" S="21" T="-445" R="241" G="20" B="131" A="254"/>
+	<Vtx X="-31" Y="-13" Z="9" S="21" T="-445" R="240" G="20" B="132" A="254"/>
 	<Vtx X="-29" Y="-12" Z="12" S="-926" T="-640" R="35" G="21" B="120" A="254"/>
-	<Vtx X="-31" Y="-13" Z="12" S="-621" T="-564" R="206" G="35" B="111" A="254"/>
+	<Vtx X="-31" Y="-13" Z="12" S="-621" T="-564" R="206" G="36" B="111" A="254"/>
 	<Vtx X="-28" Y="-14" Z="11" S="-986" T="-592" R="113" G="201" B="20" A="254"/>
-	<Vtx X="-29" Y="-11" Z="11" S="-912" T="-702" R="97" G="82" B="8" A="254"/>
-	<Vtx X="-32" Y="-8" Z="10" S="-768" T="-807" R="217" G="120" B="243" A="254"/>
-	<Vtx X="-31" Y="-13" Z="9" S="-621" T="-564" R="241" G="20" B="131" A="254"/>
+	<Vtx X="-29" Y="-11" Z="11" S="-912" T="-702" R="97" G="82" B="9" A="254"/>
+	<Vtx X="-32" Y="-8" Z="10" S="-768" T="-807" R="217" G="120" B="242" A="254"/>
+	<Vtx X="-31" Y="-13" Z="9" S="-621" T="-564" R="240" G="20" B="132" A="254"/>
 	<Vtx X="-29" Y="-13" Z="11" S="-926" T="-640" R="68" G="6" B="149" A="254"/>
 	<Vtx X="-31" Y="-13" Z="11" S="-621" T="-564" R="139" G="46" B="236" A="254"/>
-	<Vtx X="-29" Y="-13" Z="11" S="-70" T="-1316" R="15" G="251" B="130" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-184" T="-1036" R="14" G="247" B="130" A="254"/>
-	<Vtx X="-28" Y="-14" Z="11" S="-5" T="-1276" R="2" G="129" B="8" A="254"/>
-	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="246" G="130" B="6" A="254"/>
-	<Vtx X="-14" Y="-14" Z="13" S="-155" T="-1302" R="87" G="92" B="6" A="254"/>
-	<Vtx X="-13" Y="-15" Z="14" S="-130" T="-1349" R="87" G="92" B="6" A="254"/>
-	<Vtx X="-15" Y="-16" Z="13" S="-70" T="-1316" R="22" G="249" B="131" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-158" T="-1244" R="21" G="245" B="131" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="21" G="245" B="131" A="254"/>
-	<Vtx X="-24" Y="-2" Z="11" S="-510" T="-819" R="115" G="52" B="13" A="254"/>
+	<Vtx X="-29" Y="-13" Z="11" S="-70" T="-1316" R="15" G="250" B="130" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-184" T="-1036" R="14" G="246" B="130" A="254"/>
+	<Vtx X="-28" Y="-14" Z="11" S="-5" T="-1276" R="2" G="129" B="9" A="254"/>
+	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="245" G="130" B="7" A="254"/>
+	<Vtx X="-14" Y="-14" Z="13" S="-155" T="-1302" R="87" G="92" B="7" A="254"/>
+	<Vtx X="-13" Y="-15" Z="14" S="-130" T="-1349" R="87" G="92" B="7" A="254"/>
+	<Vtx X="-15" Y="-16" Z="13" S="-70" T="-1316" R="23" G="248" B="131" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-158" T="-1244" R="21" G="244" B="131" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-215" T="-994" R="21" G="244" B="131" A="254"/>
+	<Vtx X="-24" Y="-2" Z="11" S="-510" T="-819" R="115" G="52" B="14" A="254"/>
 	<Vtx X="-20" Y="-8" Z="12" S="-310" T="-1033" R="106" G="69" B="11" A="254"/>
-	<Vtx X="-27" Y="-3" Z="10" S="-454" T="-732" R="22" G="251" B="131" A="254"/>
-	<Vtx X="-27" Y="3" Z="10" S="-679" T="-646" R="24" G="254" B="131" A="254"/>
-	<Vtx X="-32" Y="-4" Z="10" S="-349" T="-544" R="134" G="223" B="240" A="254"/>
-	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-824" R="21" G="245" B="131" A="254"/>
-	<Vtx X="-28" Y="-10" Z="11" S="-159" T="-765" R="157" G="176" B="247" A="254"/>
+	<Vtx X="-27" Y="-3" Z="10" S="-454" T="-732" R="22" G="250" B="131" A="254"/>
+	<Vtx X="-27" Y="3" Z="10" S="-679" T="-646" R="24" G="253" B="131" A="254"/>
+	<Vtx X="-32" Y="-4" Z="10" S="-349" T="-544" R="135" G="223" B="240" A="254"/>
+	<Vtx X="-21" Y="-11" Z="12" S="-161" T="-824" R="21" G="244" B="131" A="254"/>
+	<Vtx X="-28" Y="-10" Z="11" S="-159" T="-765" R="158" G="176" B="247" A="254"/>
 	<Vtx X="-31" Y="4" Z="10" S="-681" T="-493" R="139" G="46" B="236" A="254"/>
 	<Vtx X="-28" Y="3" Z="11" S="-679" T="-646" R="243" G="14" B="126" A="254"/>
-	<Vtx X="-27" Y="-3" Z="12" S="-454" T="-732" R="242" G="11" B="126" A="254"/>
-	<Vtx X="-28" Y="-10" Z="11" S="-161" T="-824" R="157" G="176" B="247" A="254"/>
-	<Vtx X="-28" Y="3" Z="11" S="-679" T="-646" R="243" G="14" B="126" A="254"/>
-	<Vtx X="-24" Y="-2" Z="11" S="-510" T="-819" R="115" G="52" B="13" A="254"/>
-	<Vtx X="-25" Y="3" Z="11" S="-688" T="-724" R="125" G="17" B="17" A="254"/>
-	<Vtx X="-27" Y="3" Z="10" S="-679" T="-646" R="24" G="254" B="131" A="254"/>
+	<Vtx X="-27" Y="-3" Z="12" S="-454" T="-732" R="241" G="11" B="126" A="254"/>
+	<Vtx X="-28" Y="-10" Z="11" S="-161" T="-824" R="158" G="176" B="247" A="254"/>
+	<Vtx X="-25" Y="3" Z="11" S="-688" T="-724" R="125" G="18" B="17" A="254"/>
 	<Vtx X="-25" Y="12" Z="10" S="-1012" T="-643" R="40" G="121" B="254" A="254"/>
-	<Vtx X="-31" Y="4" Z="10" S="-681" T="-493" R="139" G="46" B="236" A="254"/>
-	<Vtx X="-27" Y="-3" Z="12" S="-454" T="-732" R="242" G="11" B="126" A="254"/>
 	<Vtx X="-21" Y="-11" Z="13" S="-215" T="-994" R="241" G="5" B="126" A="254"/>
-	<Vtx X="-28" Y="-10" Z="11" S="-164" T="-862" R="157" G="176" B="247" A="254"/>
+	<Vtx X="-28" Y="-10" Z="11" S="-164" T="-862" R="158" G="176" B="247" A="254"/>
 	<Vtx X="-20" Y="-8" Z="12" S="-310" T="-1033" R="106" G="69" B="11" A="254"/>
 	<Vtx X="-9" Y="-22" Z="14" S="-772" T="-836" R="39" G="170" B="171" A="255"/>
 	<Vtx X="-8" Y="-21" Z="14" S="-644" T="-836" R="87" G="221" B="171" A="255"/>
-	<Vtx X="-7" Y="-21" Z="15" S="-644" T="-964" R="125" G="247" B="19" A="255"/>
+	<Vtx X="-7" Y="-21" Z="15" S="-644" T="-964" R="125" G="246" B="19" A="255"/>
 	<Vtx X="-9" Y="-22" Z="15" S="-772" T="-964" R="26" G="132" B="12" A="255"/>
 	<Vtx X="-9" Y="-22" Z="15" S="-772" T="-836" R="11" G="183" B="103" A="255"/>
-	<Vtx X="-8" Y="-21" Z="15" S="-644" T="-836" R="58" G="234" B="111" A="255"/>
+	<Vtx X="-8" Y="-21" Z="15" S="-644" T="-836" R="58" G="234" B="110" A="255"/>
+	<Vtx X="-10" Y="-22" Z="15" S="-772" T="-964" R="193" G="146" B="254" A="255"/>
 	<Vtx X="-10" Y="-22" Z="15" S="-772" T="-964" R="193" G="146" B="254" A="255"/>
-	<Vtx X="-9" Y="-22" Z="15" S="-772" T="-964" R="26" G="132" B="12" A="255"/>
-	<Vtx X="-9" Y="-22" Z="15" S="-772" T="-836" R="11" G="183" B="103" A="255"/>
-	<Vtx X="-9" Y="-22" Z="14" S="-772" T="-836" R="39" G="170" B="171" A="255"/>
 	<Vtx X="-9" Y="-22" Z="14" S="-772" T="-836" R="252" G="194" B="145" A="255"/>
-	<Vtx X="-14" Y="-17" Z="13" S="-900" T="-836" R="240" G="210" B="139" A="255"/>
-	<Vtx X="-14" Y="-18" Z="14" S="-900" T="-964" R="173" G="160" B="251" A="255"/>
-	<Vtx X="-14" Y="-17" Z="14" S="-900" T="-836" R="206" G="225" B="113" A="255"/>
+	<Vtx X="-9" Y="-22" Z="14" S="-772" T="-836" R="39" G="170" B="171" A="255"/>
+	<Vtx X="-14" Y="-17" Z="13" S="-900" T="-836" R="239" G="209" B="139" A="255"/>
+	<Vtx X="-14" Y="-18" Z="14" S="-900" T="-964" R="173" G="160" B="250" A="255"/>
+	<Vtx X="-14" Y="-17" Z="14" S="-900" T="-836" R="205" G="225" B="112" A="255"/>
 	<Vtx X="-10" Y="-21" Z="15" S="-772" T="-836" R="219" G="209" B="112" A="255"/>
-	<Vtx X="-8" Y="-21" Z="15" S="-772" T="-708" R="58" G="234" B="111" A="255"/>
-	<Vtx X="-9" Y="-20" Z="15" S="-772" T="-708" R="31" G="33" B="119" A="255"/>
-	<Vtx X="-7" Y="-21" Z="15" S="-772" T="-580" R="125" G="247" B="19" A="255"/>
-	<Vtx X="-8" Y="-20" Z="15" S="-772" T="-580" R="101" G="77" B="9" A="255"/>
+	<Vtx X="-9" Y="-22" Z="15" S="-772" T="-836" R="11" G="183" B="103" A="255"/>
+	<Vtx X="-8" Y="-21" Z="15" S="-772" T="-708" R="58" G="234" B="110" A="255"/>
+	<Vtx X="-9" Y="-20" Z="15" S="-772" T="-708" R="32" G="33" B="118" A="255"/>
+	<Vtx X="-7" Y="-21" Z="15" S="-772" T="-580" R="125" G="246" B="19" A="255"/>
+	<Vtx X="-8" Y="-20" Z="15" S="-772" T="-580" R="100" G="77" B="10" A="255"/>
 	<Vtx X="-8" Y="-20" Z="14" S="-772" T="-708" R="65" G="18" B="148" A="255"/>
 	<Vtx X="-8" Y="-21" Z="14" S="-772" T="-708" R="87" G="221" B="171" A="255"/>
 	<Vtx X="-13" Y="-16" Z="13" S="-900" T="-708" R="52" G="33" B="145" A="255"/>
-	<Vtx X="-13" Y="-16" Z="14" S="-900" T="-580" R="83" G="96" B="5" A="255"/>
-	<Vtx X="-8" Y="-20" Z="14" S="-772" T="-708" R="65" G="18" B="148" A="255"/>
-	<Vtx X="-13" Y="-16" Z="13" S="-900" T="-708" R="52" G="33" B="145" A="255"/>
-	<Vtx X="-8" Y="-20" Z="15" S="-772" T="-580" R="101" G="77" B="9" A="255"/>
-	<Vtx X="-9" Y="-20" Z="15" S="-772" T="-708" R="31" G="33" B="119" A="255"/>
-	<Vtx X="-13" Y="-16" Z="14" S="-900" T="-708" R="18" G="48" B="116" A="255"/>
-	<Vtx X="-10" Y="-21" Z="15" S="-772" T="-836" R="219" G="209" B="112" A="255"/>
-	<Vtx X="-14" Y="-17" Z="14" S="-900" T="-836" R="206" G="225" B="113" A="255"/>
-	<Vtx X="-9" Y="-22" Z="14" S="-772" T="-836" R="252" G="194" B="145" A="255"/>
-	<Vtx X="-14" Y="-17" Z="13" S="-900" T="-836" R="240" G="210" B="139" A="255"/>
+	<Vtx X="-13" Y="-16" Z="14" S="-900" T="-580" R="83" G="96" B="6" A="255"/>
+	<Vtx X="-13" Y="-16" Z="14" S="-900" T="-708" R="19" G="49" B="116" A="255"/>
 	<Vtx X="-13" Y="-18" Z="12" S="21" T="-445" R="60" G="0" B="144" A="254"/>
-	<Vtx X="-16" Y="-24" Z="14" S="-730" T="-1234" R="173" G="160" B="251" A="254"/>
+	<Vtx X="-16" Y="-24" Z="14" S="-730" T="-1234" R="173" G="160" B="250" A="254"/>
 	<Vtx X="-16" Y="-18" Z="13" S="-843" T="-464" R="131" G="8" B="237" A="254"/>
-	<Vtx X="-13" Y="-18" Z="15" S="21" T="-445" R="25" G="15" B="124" A="254"/>
+	<Vtx X="-13" Y="-18" Z="15" S="21" T="-445" R="25" G="16" B="123" A="254"/>
 	<Vtx X="-13" Y="-18" Z="12" S="-621" T="-564" R="60" G="0" B="144" A="254"/>
 	<Vtx X="-16" Y="-18" Z="13" S="-986" T="-592" R="131" G="8" B="237" A="254"/>
 	<Vtx X="-15" Y="-16" Z="13" S="-926" T="-640" R="235" G="30" B="134" A="254"/>
 	<Vtx X="-13" Y="-15" Z="14" S="-912" T="-702" R="213" G="119" B="242" A="254"/>
 	<Vtx X="-10" Y="-13" Z="14" S="-768" T="-807" R="94" G="85" B="8" A="254"/>
-	<Vtx X="-13" Y="-18" Z="15" S="-621" T="-564" R="25" G="15" B="124" A="254"/>
+	<Vtx X="-13" Y="-18" Z="15" S="-621" T="-564" R="25" G="16" B="123" A="254"/>
 	<Vtx X="-15" Y="-16" Z="14" S="-926" T="-640" R="201" G="45" B="105" A="254"/>
 	<Vtx X="-13" Y="-18" Z="14" S="-621" T="-564" R="124" G="239" B="19" A="254"/>
-	<Vtx X="-14" Y="-14" Z="13" S="-158" T="-1244" R="87" G="92" B="6" A="254"/>
+	<Vtx X="-14" Y="-14" Z="13" S="-158" T="-1244" R="87" G="92" B="7" A="254"/>
 	<Vtx X="-21" Y="-11" Z="13" S="-161" T="-1207" R="241" G="5" B="126" A="254"/>
 	<Vtx X="-15" Y="-16" Z="14" S="-70" T="-1316" R="242" G="9" B="126" A="254"/>
-	<Vtx X="-13" Y="-15" Z="14" S="-130" T="-1349" R="87" G="92" B="6" A="254"/>
+	<Vtx X="-14" Y="-14" Z="13" S="-158" T="-1244" R="87" G="92" B="7" A="254"/>
+	<Vtx X="-15" Y="-16" Z="14" S="-70" T="-1316" R="242" G="9" B="126" A="254"/>
+	<Vtx X="-13" Y="-15" Z="14" S="-130" T="-1349" R="87" G="92" B="7" A="254"/>
 	<Vtx X="-16" Y="-18" Z="13" S="-5" T="-1276" R="191" G="147" B="254" A="254"/>
 	<Vtx X="-21" Y="-11" Z="13" S="-184" T="-1036" R="241" G="5" B="126" A="254"/>
 	<Vtx X="-22" Y="-15" Z="12" S="-52" T="-1033" R="202" G="141" B="0" A="254"/>
-	<Vtx X="-31" Y="-13" Z="12" S="-1985" T="-486" R="206" G="35" B="111" A="254"/>
+	<Vtx X="-31" Y="-13" Z="12" S="-1985" T="-486" R="206" G="36" B="111" A="254"/>
 	<Vtx X="-37" Y="-18" Z="10" S="20" T="-600" R="136" G="218" B="241" A="254"/>
-	<Vtx X="-32" Y="-20" Z="11" S="-430" T="-1143" R="23" G="132" B="11" A="254"/>
+	<Vtx X="-32" Y="-20" Z="11" S="-430" T="-1143" R="23" G="132" B="12" A="254"/>
 	<Vtx X="-31" Y="-13" Z="11" S="-1985" T="-486" R="139" G="46" B="236" A="254"/>
-	<Vtx X="-31" Y="-13" Z="9" S="-1985" T="-486" R="241" G="20" B="131" A="254"/>
+	<Vtx X="-31" Y="-13" Z="9" S="-1985" T="-486" R="240" G="20" B="132" A="254"/>
 	<Vtx X="-13" Y="-18" Z="12" S="-1985" T="-486" R="60" G="0" B="144" A="254"/>
-	<Vtx X="-10" Y="-24" Z="15" S="20" T="-600" R="86" G="164" B="18" A="254"/>
-	<Vtx X="-16" Y="-24" Z="14" S="-430" T="-1143" R="173" G="160" B="251" A="254"/>
+	<Vtx X="-10" Y="-24" Z="15" S="20" T="-600" R="85" G="164" B="19" A="254"/>
+	<Vtx X="-16" Y="-24" Z="14" S="-430" T="-1143" R="173" G="160" B="250" A="254"/>
 	<Vtx X="-13" Y="-18" Z="14" S="-1985" T="-486" R="124" G="239" B="19" A="254"/>
-	<Vtx X="-13" Y="-18" Z="15" S="-1985" T="-486" R="25" G="15" B="124" A="254"/>
+	<Vtx X="-13" Y="-18" Z="15" S="-1985" T="-486" R="25" G="16" B="123" A="254"/>
 </Vertex>
diff --git a/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_cull b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_cull
new file mode 100644
index 0000000000..6ef0139b8c
--- /dev/null
+++ b/soh/assets/custom/objects/object_keyring/gKeyringIconGerudoFortressDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-47" Y="-34" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="-34" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="29" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="29" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="-34" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="-34" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="29" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="29" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress
index b5755b4a82..f926de784a 100644
--- a/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress
+++ b/soh/assets/custom/objects/object_keyring/mat_gKeyringIconGerudoFortressDL_f3dlite_IconMetal_GerudoFortress
@@ -1,21 +1,15 @@
 <DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="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_ENVIRONMENT" 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_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
-	<ClearGeometryMode G_CULL_FRONT="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_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="960" T="960" Level="0" Tile="0" On="1"/>
-	<SetTextureLUT Mode="G_TT_NONE"/>
-	<TileSync/>
-	<SetTextureImage Path="objects/object_keyring/Hilite_new" 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_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
-	<LoadSync/>
+	<SetTextureImage Path="objects/object_keyring/Hilite_new.rgba16" 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_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
 	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="255" Dxt="512"/>
-	<PipeSync/>
 	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="4" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="4" ShiftS="0" MaskT="4" ShiftT="0"/>
 	<SetTileSize T="0" Uls="0" Ult="0" Lrs="60" Lrt="60"/>
-	<SetEnvColor R="255" G="255" B="204" A="255"/>
 	<EndDisplayList/>
 </DisplayList>
 
diff --git a/soh/assets/custom/objects/object_keyring/model.xml b/soh/assets/custom/objects/object_keyring/model.xml
new file mode 100644
index 0000000000..6ef0139b8c
--- /dev/null
+++ b/soh/assets/custom/objects/object_keyring/model.xml
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-47" Y="-34" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="-34" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="29" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-47" Y="29" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="-34" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="-34" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="29" Z="19" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="8" Y="29" Z="6" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/bosskey_crate_top b/soh/assets/custom/objects/object_kibako/bosskey_crate_top
new file mode 100644
index 0000000000..4b055671e4
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/bosskey_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL
new file mode 100644
index 0000000000..c42484ebe6
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallBossKeyCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallBossKeyCrateDL_f3dlite_smallcrate_bosskey"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallBossKeyCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_tri_0
new file mode 100644
index 0000000000..96b7903de9
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallBossKeyCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallBossKeyCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL
new file mode 100644
index 0000000000..1fd3a1f8b7
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallHeartCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallHeartCrateDL_f3dlite_smallcrate_heart"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallHeartCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_tri_0
new file mode 100644
index 0000000000..bbcb5c4c97
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallHeartCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallHeartCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL
new file mode 100644
index 0000000000..e0d09ffa48
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallJunkCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallJunkCrateDL_f3dlite_smallcrate_junk"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallJunkCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_tri_0
new file mode 100644
index 0000000000..a0af63d7fb
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallJunkCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallJunkCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL
new file mode 100644
index 0000000000..9999462e6f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallMajorCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallMajorCrateDL_f3dlite_smallcrate_major"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallMajorCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_tri_0
new file mode 100644
index 0000000000..6eea14d8ca
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallMajorCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMajorCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL
new file mode 100644
index 0000000000..8237aa0e73
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallMinorCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallMinorCrateDL_f3dlite_smallcrate_minor"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallMinorCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_tri_0
new file mode 100644
index 0000000000..c1c8d6cfc8
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallMinorCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallMinorCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL
new file mode 100644
index 0000000000..17467a73bc
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallRandoCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallRandoCrateDL_f3dlite_smallcrate_rando"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallRandoCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_tri_0
new file mode 100644
index 0000000000..6df8755b2f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallRandoCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallRandoCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL
new file mode 100644
index 0000000000..e3cc0ebe1d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallSmallKeyCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallSmallKeyCrateDL_f3dlite_smallcrate_smallkey"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallSmallKeyCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_tri_0
new file mode 100644
index 0000000000..692fd7ec32
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallSmallKeyCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallSmallKeyCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL
new file mode 100644
index 0000000000..dc73b60898
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL
@@ -0,0 +1,14 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako/gSmallTokenCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako/mat_gSmallTokenCrateDL_f3dlite_smallcrate_token"/>
+	<CallDisplayList Path="objects/object_kibako/gSmallTokenCrateDL_tri_0"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_tri_0
new file mode 100644
index 0000000000..88a23f0e7f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_tri_0
@@ -0,0 +1,11 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako/gSmallTokenCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="24"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="7" V12="5" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="11" V12="9" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="15" V12="13" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="16" V11="19" V12="17" Flag1="0"/>
+	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="20" V11="22" V12="23" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_0
new file mode 100644
index 0000000000..1a288d2131
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_0
@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="2032" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="127" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="2032" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="2032" T="-16" R="0" G="0" B="127" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="2032" R="127" G="0" B="0" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="2032" T="-16" R="127" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="2032" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="2032" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="2032" T="-16" R="0" G="0" B="129" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="2032" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="200" Z="100" S="2032" T="-16" R="129" G="0" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="-100" S="2032" T="2032" R="0" G="129" B="0" A="254"/>
+	<Vtx X="100" Y="0" Z="100" S="2032" T="-16" R="0" G="129" B="0" A="254"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="129" B="0" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_cull
new file mode 100644
index 0000000000..9b63c4a72d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/gSmallTokenCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="0" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="100" Y="200" Z="-100" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako/heart_crate_top b/soh/assets/custom/objects/object_kibako/heart_crate_top
new file mode 100644
index 0000000000..f5b47bd092
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/heart_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/junk_crate_top b/soh/assets/custom/objects/object_kibako/junk_crate_top
new file mode 100644
index 0000000000..ef303867cc
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/junk_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/major_crate_top b/soh/assets/custom/objects/object_kibako/major_crate_top
new file mode 100644
index 0000000000..874104cf60
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/major_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallBossKeyCrateDL_f3dlite_smallcrate_bosskey b/soh/assets/custom/objects/object_kibako/mat_gSmallBossKeyCrateDL_f3dlite_smallcrate_bosskey
new file mode 100644
index 0000000000..4996f10548
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallBossKeyCrateDL_f3dlite_smallcrate_bosskey
@@ -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"  />
+
+	<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/object_kibako/bosskey_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallHeartCrateDL_f3dlite_smallcrate_heart b/soh/assets/custom/objects/object_kibako/mat_gSmallHeartCrateDL_f3dlite_smallcrate_heart
new file mode 100644
index 0000000000..f1df8a15cd
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallHeartCrateDL_f3dlite_smallcrate_heart
@@ -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"  />
+
+	<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/object_kibako/heart_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallJunkCrateDL_f3dlite_smallcrate_junk b/soh/assets/custom/objects/object_kibako/mat_gSmallJunkCrateDL_f3dlite_smallcrate_junk
new file mode 100644
index 0000000000..85a1aef61a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallJunkCrateDL_f3dlite_smallcrate_junk
@@ -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"  />
+
+	<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/object_kibako/junk_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallMajorCrateDL_f3dlite_smallcrate_major b/soh/assets/custom/objects/object_kibako/mat_gSmallMajorCrateDL_f3dlite_smallcrate_major
new file mode 100644
index 0000000000..ea7b5edf0b
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallMajorCrateDL_f3dlite_smallcrate_major
@@ -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"  />
+
+	<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/object_kibako/major_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallMinorCrateDL_f3dlite_smallcrate_minor b/soh/assets/custom/objects/object_kibako/mat_gSmallMinorCrateDL_f3dlite_smallcrate_minor
new file mode 100644
index 0000000000..7a6580630e
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallMinorCrateDL_f3dlite_smallcrate_minor
@@ -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"  />
+
+	<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/object_kibako/minor_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallRandoCrateDL_f3dlite_smallcrate_rando b/soh/assets/custom/objects/object_kibako/mat_gSmallRandoCrateDL_f3dlite_smallcrate_rando
new file mode 100644
index 0000000000..e8ff9db185
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallRandoCrateDL_f3dlite_smallcrate_rando
@@ -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"  />
+
+	<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/object_kibako/rando_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallSmallKeyCrateDL_f3dlite_smallcrate_smallkey b/soh/assets/custom/objects/object_kibako/mat_gSmallSmallKeyCrateDL_f3dlite_smallcrate_smallkey
new file mode 100644
index 0000000000..593bf9e548
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallSmallKeyCrateDL_f3dlite_smallcrate_smallkey
@@ -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"  />
+
+	<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/object_kibako/smallkey_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/mat_gSmallTokenCrateDL_f3dlite_smallcrate_token b/soh/assets/custom/objects/object_kibako/mat_gSmallTokenCrateDL_f3dlite_smallcrate_token
new file mode 100644
index 0000000000..f58840a2bc
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako/mat_gSmallTokenCrateDL_f3dlite_smallcrate_token
@@ -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"  />
+
+	<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/object_kibako/token_crate_top" 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_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_MIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako/minor_crate_top b/soh/assets/custom/objects/object_kibako/minor_crate_top
new file mode 100644
index 0000000000..830d8ff65b
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/minor_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/rando_crate_top b/soh/assets/custom/objects/object_kibako/rando_crate_top
new file mode 100644
index 0000000000..2d211d6125
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/rando_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/smallkey_crate_top b/soh/assets/custom/objects/object_kibako/smallkey_crate_top
new file mode 100644
index 0000000000..542dfb837d
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/smallkey_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako/token_crate_top b/soh/assets/custom/objects/object_kibako/token_crate_top
new file mode 100644
index 0000000000..d4d5442860
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako/token_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/bosskey_crate_side b/soh/assets/custom/objects/object_kibako2/bosskey_crate_side
new file mode 100644
index 0000000000..d5ec9241ab
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/bosskey_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/bosskey_crate_top b/soh/assets/custom/objects/object_kibako2/bosskey_crate_top
new file mode 100644
index 0000000000..4b055671e4
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/bosskey_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL
new file mode 100644
index 0000000000..c596748844
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeBossKeyCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_top_bosskey"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeBossKeyCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_side_bosskey"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeBossKeyCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_0
new file mode 100644
index 0000000000..f43cacd886
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeBossKeyCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_1
new file mode 100644
index 0000000000..d877460d44
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeBossKeyCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeBossKeyCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL
new file mode 100644
index 0000000000..ce8bcb69fc
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeHeartCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_top_heart"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeHeartCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_side_heart"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeHeartCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_0
new file mode 100644
index 0000000000..64c96a3a34
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeHeartCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_1
new file mode 100644
index 0000000000..ee780d50d5
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeHeartCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeHeartCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL
new file mode 100644
index 0000000000..2d9c5974c1
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeJunkCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_top_junk"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeJunkCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_side_junk"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeJunkCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_0
new file mode 100644
index 0000000000..a3a46e621f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeJunkCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_1
new file mode 100644
index 0000000000..041d794d9f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeJunkCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeJunkCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL
new file mode 100644
index 0000000000..190005d99e
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeMajorCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_top_major"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeMajorCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_side_major"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeMajorCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_0
new file mode 100644
index 0000000000..867e166d7f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeMajorCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_1
new file mode 100644
index 0000000000..5ab5bf39b9
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeMajorCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMajorCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL
new file mode 100644
index 0000000000..d093960d59
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeMinorCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_top_minor"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeMinorCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_side_minor"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeMinorCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_0
new file mode 100644
index 0000000000..9ab4cdf9ae
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeMinorCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_1
new file mode 100644
index 0000000000..8a22d508b5
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeMinorCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeMinorCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL
new file mode 100644
index 0000000000..b1c1ffd1fa
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeRandoCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_top_rando"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeRandoCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_side_rando"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeRandoCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_0
new file mode 100644
index 0000000000..3e87c23b19
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeRandoCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_1
new file mode 100644
index 0000000000..296988ca1b
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeRandoCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeRandoCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL
new file mode 100644
index 0000000000..c4d711d10a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_top_smallkey"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeSmallKeyCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_side_smallkey"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeSmallKeyCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_0
new file mode 100644
index 0000000000..126e0bde7c
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_1
new file mode 100644
index 0000000000..908b646bb7
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeSmallKeyCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL
new file mode 100644
index 0000000000..b1b1269b91
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL
@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/object_kibako2/gLargeTokenCrateDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_top_token"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeTokenCrateDL_tri_0"/>
+	<CallDisplayList Path="objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_side_token"/>
+	<CallDisplayList Path="objects/object_kibako2/gLargeTokenCrateDL_tri_1"/>
+	<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>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_0 b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_0
new file mode 100644
index 0000000000..c02cd056d2
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_0
@@ -0,0 +1,6 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeTokenCrateDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_1 b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_1
new file mode 100644
index 0000000000..dd2c07c524
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_tri_1
@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/object_kibako2/gLargeTokenCrateDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="2" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="4" V11="6" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="9" V02="10" Flag0="0" V10="8" V11="10" V12="11" Flag1="0"/>
+	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="12" V11="14" V12="15" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_0 b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_0
new file mode 100644
index 0000000000..e769465866
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_0
@@ -0,0 +1,6 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="2032" R="73" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="2032" R="183" G="73" B="183" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_1 b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_1
new file mode 100644
index 0000000000..1c6430bd42
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_1
@@ -0,0 +1,18 @@
+<Vertex Version="0">
+	<Vtx X="300" Y="0" Z="240" S="2032" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="2032" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="2032" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="2032" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="73" G="73" B="73" A="254"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="2032" R="90" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="2032" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="2032" T="-16" R="183" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="73" G="73" B="183" A="254"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="2032" R="90" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="2032" R="166" G="0" B="166" A="254"/>
+	<Vtx X="-300" Y="0" Z="240" S="2032" T="2032" R="166" G="0" B="90" A="254"/>
+	<Vtx X="-300" Y="480" Z="240" S="2032" T="-16" R="183" G="73" B="73" A="254"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="183" G="73" B="183" A="254"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_cull b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_cull
new file mode 100644
index 0000000000..42422b027a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/gLargeTokenCrateDL_vtx_cull
@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="0" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+	<Vtx X="300" Y="480" Z="-240" S="-16" T="-16" R="0" G="0" B="0" A="0"/>
+</Vertex>
diff --git a/soh/assets/custom/objects/object_kibako2/heart_crate_side b/soh/assets/custom/objects/object_kibako2/heart_crate_side
new file mode 100644
index 0000000000..d0d916c078
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/heart_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/heart_crate_top b/soh/assets/custom/objects/object_kibako2/heart_crate_top
new file mode 100644
index 0000000000..f5b47bd092
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/heart_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/junk_crate_side b/soh/assets/custom/objects/object_kibako2/junk_crate_side
new file mode 100644
index 0000000000..08b491eb47
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/junk_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/junk_crate_top b/soh/assets/custom/objects/object_kibako2/junk_crate_top
new file mode 100644
index 0000000000..ef303867cc
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/junk_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/major_crate_side b/soh/assets/custom/objects/object_kibako2/major_crate_side
new file mode 100644
index 0000000000..a1fe6d8196
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/major_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/major_crate_top b/soh/assets/custom/objects/object_kibako2/major_crate_top
new file mode 100644
index 0000000000..874104cf60
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/major_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/mask_crate_side b/soh/assets/custom/objects/object_kibako2/mask_crate_side
new file mode 100644
index 0000000000..634969f2ad
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/mask_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/mask_crate_top b/soh/assets/custom/objects/object_kibako2/mask_crate_top
new file mode 100644
index 0000000000..d8292e33fe
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/mask_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_side_bosskey b/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_side_bosskey
new file mode 100644
index 0000000000..381376f7e7
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_side_bosskey
@@ -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"  />
+
+	<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/object_kibako2/bosskey_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_top_bosskey b/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_top_bosskey
new file mode 100644
index 0000000000..6bbbe04089
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeBossKeyCrateDL_f3dlite_crate_top_bosskey
@@ -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"  />
+
+	<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/object_kibako2/bosskey_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_side_heart b/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_side_heart
new file mode 100644
index 0000000000..e79a71e401
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_side_heart
@@ -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"  />
+
+	<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/object_kibako2/heart_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_top_heart b/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_top_heart
new file mode 100644
index 0000000000..2e20008c7e
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeHeartCrateDL_f3dlite_crate_top_heart
@@ -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"  />
+
+	<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/object_kibako2/heart_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_side_junk b/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_side_junk
new file mode 100644
index 0000000000..b7eee4eb11
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_side_junk
@@ -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"  />
+
+	<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/object_kibako2/junk_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_top_junk b/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_top_junk
new file mode 100644
index 0000000000..d59ca15f8a
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeJunkCrateDL_f3dlite_crate_top_junk
@@ -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"  />
+
+	<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/object_kibako2/junk_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_side_major b/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_side_major
new file mode 100644
index 0000000000..e930dced0f
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_side_major
@@ -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"  />
+
+	<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/object_kibako2/major_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_top_major b/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_top_major
new file mode 100644
index 0000000000..ee053858d8
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeMajorCrateDL_f3dlite_crate_top_major
@@ -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"  />
+
+	<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/object_kibako2/major_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_side_minor b/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_side_minor
new file mode 100644
index 0000000000..c9b542226e
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_side_minor
@@ -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"  />
+
+	<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/object_kibako2/minor_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_top_minor b/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_top_minor
new file mode 100644
index 0000000000..619787be2e
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeMinorCrateDL_f3dlite_crate_top_minor
@@ -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"  />
+
+	<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/object_kibako2/minor_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_side_rando b/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_side_rando
new file mode 100644
index 0000000000..8e2e6bb460
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_side_rando
@@ -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"  />
+
+	<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/object_kibako2/rando_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_top_rando b/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_top_rando
new file mode 100644
index 0000000000..ca00e4780d
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeRandoCrateDL_f3dlite_crate_top_rando
@@ -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"  />
+
+	<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/object_kibako2/rando_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_side_smallkey b/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_side_smallkey
new file mode 100644
index 0000000000..b4cb8d6724
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_side_smallkey
@@ -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"  />
+
+	<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/object_kibako2/smallkey_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_top_smallkey b/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_top_smallkey
new file mode 100644
index 0000000000..a0ea434990
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeSmallKeyCrateDL_f3dlite_crate_top_smallkey
@@ -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"  />
+
+	<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/object_kibako2/smallkey_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_side_token b/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_side_token
new file mode 100644
index 0000000000..d87ec41480
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_side_token
@@ -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"  />
+
+	<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/object_kibako2/token_crate_side" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_top_token b/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_top_token
new file mode 100644
index 0000000000..369b6a05ae
--- /dev/null
+++ b/soh/assets/custom/objects/object_kibako2/mat_gLargeTokenCrateDL_f3dlite_crate_top_token
@@ -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"  />
+
+	<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/object_kibako2/token_crate_top" 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_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="4095" Dxt="128"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="16" TMem="0" Tile="0" Palette="0" Cms0="G_TX_CLAMP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_CLAMP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
+	<SetPrimColor M="0" L="0" R="215" G="215" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+
diff --git a/soh/assets/custom/objects/object_kibako2/minor_crate_side b/soh/assets/custom/objects/object_kibako2/minor_crate_side
new file mode 100644
index 0000000000..27a62c8c4d
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/minor_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/minor_crate_top b/soh/assets/custom/objects/object_kibako2/minor_crate_top
new file mode 100644
index 0000000000..830d8ff65b
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/minor_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/rando_crate_side b/soh/assets/custom/objects/object_kibako2/rando_crate_side
new file mode 100644
index 0000000000..ea7c9e3b65
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/rando_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/rando_crate_top b/soh/assets/custom/objects/object_kibako2/rando_crate_top
new file mode 100644
index 0000000000..2d211d6125
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/rando_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/smallkey_crate_side b/soh/assets/custom/objects/object_kibako2/smallkey_crate_side
new file mode 100644
index 0000000000..23ada846e9
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/smallkey_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/smallkey_crate_top b/soh/assets/custom/objects/object_kibako2/smallkey_crate_top
new file mode 100644
index 0000000000..542dfb837d
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/smallkey_crate_top differ
diff --git a/soh/assets/custom/objects/object_kibako2/token_crate_side b/soh/assets/custom/objects/object_kibako2/token_crate_side
new file mode 100644
index 0000000000..6de4f580f8
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/token_crate_side differ
diff --git a/soh/assets/custom/objects/object_kibako2/token_crate_top b/soh/assets/custom/objects/object_kibako2/token_crate_top
new file mode 100644
index 0000000000..d4d5442860
Binary files /dev/null and b/soh/assets/custom/objects/object_kibako2/token_crate_top differ
diff --git a/soh/assets/custom/presets/Main Default.json b/soh/assets/custom/presets/Main Default.json
new file mode 100644
index 0000000000..7d87c3d956
--- /dev/null
+++ b/soh/assets/custom/presets/Main Default.json	
@@ -0,0 +1,11 @@
+{
+    "blocks": {
+        "enhancements": {
+            "gCheats": null,
+            "gEnhancements": null,
+            "gRandoEnhancements": null
+        }
+    },
+    "presetName": "Main Default",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Main Enhanced.json b/soh/assets/custom/presets/Main Enhanced.json
new file mode 100644
index 0000000000..026a78de75
--- /dev/null
+++ b/soh/assets/custom/presets/Main Enhanced.json	
@@ -0,0 +1,56 @@
+{
+    "blocks": {
+        "enhancements": {
+            "gCheats": null,
+            "gEnhancements": {
+                "AssignableTunicsAndBoots": 1,
+                "Autosave": 1,
+                "BetterOwl": 1,
+                "CreditsFix": 1,
+                "CustomizeFrogsOcarinaGame": 1,
+                "DekuNutUpgradeFix": 1,
+                "DisableLOD": 1,
+                "DpadEquips": 1,
+                "DpadNoDropOcarinaInput": 1,
+                "DynamicWalletIcon": 1,
+                "EnemySpawnsOverWaterboxes": 1,
+                "FasterRupeeAccumulator": 1,
+                "FixBrokenGiantsKnife": 1,
+                "FixDaruniaDanceSpeed": 1,
+                "FixDungeonMinimapIcon": 1,
+                "FixEyesOpenWhileSleeping": 1,
+                "FixFloorSwitches": 1,
+                "FixHammerHand": 1,
+                "FixMenuLR": 1,
+                "FixSawSoftlock": 1,
+                "FixTexturesOOB": 1,
+                "FixVineFall": 1,
+                "FixZoraHintDialogue": 1,
+                "FrogsModifyFailTime": 2,
+                "GerudoWarriorClothingFix": 1,
+                "GravediggingTourFix": 1,
+                "InjectItemCounts": {
+                    "GoldSkulltula": 1,
+                    "HeartContainer": 1,
+                    "HeartPiece": 1
+                },
+                "NaviTextFix": 1,
+                "PulsateBossIcon": 1,
+                "RedGanonBlood": 1,
+                "RememberMapToggleState": 1,
+                "SceneSpecificDirtPathFix": 1,
+                "SilverRupeeJingleExtend": 1,
+                "SkipSaveConfirmation": 1,
+                "SkipText": 1,
+                "TextSpeed": 5,
+                "TimeFlowFileSelect": 1,
+                "TwoHandedIdle": 1,
+                "VisualAgony": 1,
+                "WidescreenActorCulling": 1
+            },
+            "gRandoEnhancements": null
+        }
+    },
+    "presetName": "Main Enhanced",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Main Randomizer.json b/soh/assets/custom/presets/Main Randomizer.json
new file mode 100644
index 0000000000..59c24e9821
--- /dev/null
+++ b/soh/assets/custom/presets/Main Randomizer.json	
@@ -0,0 +1,135 @@
+{
+    "blocks": {
+        "enhancements": {
+            "gCheats": {
+                "EasyFrameAdvance": 1
+            },
+            "gEnhancements": {
+                "AdultMasks": 1,
+                "AssignableTunicsAndBoots": 1,
+                "Autosave": 1,
+                "BetterAmmoRendering": 1,
+                "BetterBombchuShopping": 1,
+                "BetterFarore": 1,
+                "BetterOwl": 1,
+                "BombchusOOB": 1,
+                "ClimbSpeed": 3,
+                "CrawlSpeed": 2,
+                "CreditsFix": 1,
+                "CustomizeFishing": 1,
+                "CustomizeFrogsOcarinaGame": 1,
+                "CustomizeOcarinaGame": 1,
+                "DampeAllNight": 1,
+                "DampeWin": 1,
+                "DayGravePull": 1,
+                "DekuNutUpgradeFix": 1,
+                "DisableCritWiggle": 1,
+                "DisableFirstPersonChus": 1,
+                "DisableLOD": 1,
+                "DpadEquips": 1,
+                "DpadNoDropOcarinaInput": 1,
+                "DynamicWalletIcon": 1,
+                "EarlyEyeballFrog": 1,
+                "EnemySpawnsOverWaterboxes": 1,
+                "EquipmentCanBeRemoved": 1,
+                "ExtendedCullingExcludeGlitchActors": 1,
+                "FastBoomerang": 1,
+                "FastChests": 1,
+                "FastDrops": 1,
+                "FastFarores": 1,
+                "FastOcarinaPlayback": 1,
+                "FasterBlockPush": 5,
+                "FasterHeavyBlockLift": 1,
+                "FasterRupeeAccumulator": 1,
+                "FileSelectMoreInfo": 1,
+                "FishNeverEscape": 1,
+                "FixBrokenGiantsKnife": 1,
+                "FixDaruniaDanceSpeed": 1,
+                "FixDungeonMinimapIcon": 1,
+                "FixFloorSwitches": 1,
+                "FixHammerHand": 1,
+                "FixMenuLR": 1,
+                "FixSawSoftlock": 1,
+                "FixTexturesOOB": 1,
+                "FixVineFall": 1,
+                "FixZoraHintDialogue": 1,
+                "ForgeTime": 0,
+                "FrogsModifyFailTime": 2,
+                "GerudoWarriorClothingFix": 1,
+                "GoronPot": 1,
+                "GravediggingTourFix": 1,
+                "GuaranteeFishingBite": 1,
+                "HoverFishing": 1,
+                "IncludeHeldInputsBufferWindow": 1,
+                "InjectItemCounts": {
+                    "GoldSkulltula": 1,
+                    "HeartContainer": 1,
+                    "HeartPiece": 1
+                },
+                "InstantPutaway": 1,
+                "InstantScarecrow": 1,
+                "MMBunnyHood": 1,
+                "MarketSneak": 1,
+                "MaskSelect": 1,
+                "MinimumFishWeightAdult": 6,
+                "MinimumFishWeightChild": 3,
+                "MweepSpeed": 5.0,
+                "N64WeirdFrames": 1,
+                "NaviTextFix": 1,
+                "NewDrops": 1,
+                "NoInputForCredits": 1,
+                "NutsExplodeBombs": 1,
+                "OcarinaGame": {
+                    "StartingNotes": 5
+                },
+                "PauseMenuAnimatedLink": 1,
+                "PauseWarp": 1,
+                "PersistentMasks": 1,
+                "PulsateBossIcon": 1,
+                "QuickBongoKill": 1,
+                "QuickPutaway": 1,
+                "QuitFishingAtDoor": 1,
+                "RedGanonBlood": 1,
+                "RememberMapToggleState": 1,
+                "SceneSpecificDirtPathFix": 1,
+                "SeparateArrows": 1,
+                "ShowDoorLocksOnBothSides": 1,
+                "SilverRupeeJingleExtend": 1,
+                "SkipArrowAnimation": 1,
+                "SkipSaveConfirmation": 1,
+                "SkipSwimDeepEndAnim": 1,
+                "SkipText": 1,
+                "SlowTextSpeed": 5,
+                "SwordToggle": 1,
+                "TextSpeed": 5,
+                "TimeFlowFileSelect": 1,
+                "TimeSavers": {
+                    "DisableTitleCard": 1,
+                    "SkipChildStealth": 1,
+                    "SkipCutscene": {
+                        "BossIntro": 1,
+                        "Entrances": 1,
+                        "Intro": 1,
+                        "LearnSong": 1,
+                        "OnePoint": 1,
+                        "QuickBossDeaths": 1,
+                        "Story": 1
+                    },
+                    "SkipForcedDialog": 3,
+                    "SkipMiscInteractions": 1,
+                    "SkipOwlInteractions": 1,
+                    "SkipTowerEscape": 1,
+                    "SleepingWaterfall": 1
+                },
+                "ToTMedallionsColors": 1,
+                "ToggleStrength": 1,
+                "TwoHandedIdle": 1,
+                "VisualAgony": 1,
+                "WidescreenActorCulling": 1
+            },
+            "gRandoEnhancements": null
+        }
+    },
+    "presetName": "Main Randomizer",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Main Vanilla+.json b/soh/assets/custom/presets/Main Vanilla+.json
new file mode 100644
index 0000000000..0f6c1741ad
--- /dev/null
+++ b/soh/assets/custom/presets/Main Vanilla+.json	
@@ -0,0 +1,56 @@
+{
+    "blocks": {
+        "enhancements": {
+            "gCheats": null,
+            "gEnhancements": {
+                "AssignableTunicsAndBoots": 1,
+                "Autosave": 1,
+                "BetterOwl": 1,
+                "CreditsFix": 1,
+                "CustomizeFrogsOcarinaGame": 1,
+                "DekuNutUpgradeFix": 1,
+                "DisableLOD": 1,
+                "DpadEquips": 1,
+                "DpadNoDropOcarinaInput": 1,
+                "DynamicWalletIcon": 1,
+                "EnemySpawnsOverWaterboxes": 1,
+                "FasterRupeeAccumulator": 1,
+                "FixBrokenGiantsKnife": 1,
+                "FixDaruniaDanceSpeed": 1,
+                "FixDungeonMinimapIcon": 1,
+                "FixEyesOpenWhileSleeping": 1,
+                "FixFloorSwitches": 1,
+                "FixHammerHand": 1,
+                "FixMenuLR": 1,
+                "FixSawSoftlock": 1,
+                "FixTexturesOOB": 1,
+                "FixVineFall": 1,
+                "FixZoraHintDialogue": 1,
+                "FrogsModifyFailTime": 2,
+                "GerudoWarriorClothingFix": 1,
+                "GravediggingTourFix": 1,
+                "InjectItemCounts": {
+                    "GoldSkulltula": 1,
+                    "HeartContainer": 1,
+                    "HeartPiece": 1
+                },
+                "NaviTextFix": 1,
+                "PulsateBossIcon": 1,
+                "RedGanonBlood": 1,
+                "RememberMapToggleState": 1,
+                "SceneSpecificDirtPathFix": 1,
+                "SilverRupeeJingleExtend": 1,
+                "SkipSaveConfirmation": 1,
+                "SkipText": 1,
+                "TextSpeed": 5,
+                "TimeFlowFileSelect": 1,
+                "TwoHandedIdle": 1,
+                "VisualAgony": 1,
+                "WidescreenActorCulling": 1
+            },
+            "gRandoEnhancements": null
+        }
+    },
+    "presetName": "Main Vanilla+",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Rando Advanced.json b/soh/assets/custom/presets/Rando Advanced.json
new file mode 100644
index 0000000000..4042c0688c
--- /dev/null
+++ b/soh/assets/custom/presets/Rando Advanced.json	
@@ -0,0 +1,69 @@
+{
+    "blocks": {
+        "rando": {
+            "gRandoSettings": {
+                "40GSHint": 1,
+                "50GSHint": 1,
+                "BigPoeTargetCount": 1,
+                "BlueFireArrows": 1,
+                "BombchuBag": 1,
+                "BossKeysanity": 5,
+                "ClosedForest": 2,
+                "CompleteMaskQuest": 1,
+                "CuccosToReturn": 1,
+                "DampeHint": 1,
+                "DoorOfTime": 2,
+                "EnableBombchuDrops": 1,
+                "FortressCarpenters": 1,
+                "FrogsHint": 1,
+                "FullWallets": 1,
+                "GanonTrial": 0,
+                "GerudoKeys": 3,
+                "GregHint": 1,
+                "HBAHint": 1,
+                "IncludeTycoonWallet": 1,
+                "KakarikoGate": 1,
+                "Keysanity": 5,
+                "LacsRewardCount": 8,
+                "MalonHint": 1,
+                "MerchantText": 1,
+                "RainbowBridge": 7,
+                "SariaHint": 1,
+                "ScrubsFixedPrice": 2,
+                "ScrubsPrices": 3,
+                "SheikLAHint": 0,
+                "Shopsanity": 1,
+                "ShopsanityCount": 7,
+                "ShopsanityPrices": 2,
+                "ShuffleAdultTrade": 1,
+                "ShuffleBossEntrances": 2,
+                "ShuffleCows": 1,
+                "ShuffleDekuNutBag": 1,
+                "ShuffleDekuStickBag": 1,
+                "ShuffleDungeonsEntrances": 2,
+                "ShuffleFrogSongRupees": 1,
+                "ShuffleGanonBossKey": 9,
+                "ShuffleGerudoToken": 1,
+                "ShuffleKeyRings": 2,
+                "ShuffleKeyRingsRandomCount": 4,
+                "ShuffleKokiriSword": 1,
+                "ShuffleMasterSword": 1,
+                "ShuffleMerchants": 3,
+                "ShuffleOcarinas": 1,
+                "ShuffleOverworldSpawns": 1,
+                "ShuffleScrubs": 2,
+                "ShuffleSongs": 2,
+                "ShuffleSwim": 1,
+                "ShuffleTokens": 3,
+                "SkipChildZelda": 1,
+                "SkipEponaRace": 1,
+                "SkipScarecrowsSong": 1,
+                "StartingAge": 2,
+                "StartingMapsCompasses": 0,
+                "SunlightArrows": 1
+            }
+        }
+    },
+    "presetName": "Rando Advanced",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Rando Beginner.json b/soh/assets/custom/presets/Rando Beginner.json
new file mode 100644
index 0000000000..595734fe04
--- /dev/null
+++ b/soh/assets/custom/presets/Rando Beginner.json	
@@ -0,0 +1,51 @@
+{
+    "blocks": {
+        "rando": {
+            "gRandoSettings": {
+                "10GSHint": 1,
+                "20GSHint": 1,
+                "30GSHint": 1,
+                "40GSHint": 1,
+                "50GSHint": 1,
+                "BigPoeTargetCount": 1,
+                "BiggoronHint": 1,
+                "BlueFireArrows": 1,
+                "BossKeysanity": 2,
+                "ClosedForest": 2,
+                "CompleteMaskQuest": 1,
+                "CuccosToReturn": 1,
+                "DampeHint": 1,
+                "DoorOfTime": 2,
+                "EnableBombchuDrops": 1,
+                "ExcludedLocations": "147,148,233,323,",
+                "FortressCarpenters": 1,
+                "FrogsHint": 1,
+                "FullWallets": 1,
+                "GanonTrial": 0,
+                "GregHint": 1,
+                "HBAHint": 1,
+                "IncludeTycoonWallet": 1,
+                "KakarikoGate": 1,
+                "Keysanity": 2,
+                "LacsRewardCount": 6,
+                "MalonHint": 1,
+                "MerchantText": 1,
+                "RainbowBridge": 7,
+                "SariaHint": 1,
+                "SheikLAHint": 0,
+                "ShuffleGanonBossKey": 9,
+                "ShuffleOcarinas": 1,
+                "SkipChildZelda": 1,
+                "SkipEponaRace": 1,
+                "SkipScarecrowsSong": 1,
+                "StartingKokiriSword": 1,
+                "StartingMapsCompasses": 0,
+                "StartingOcarina": 1,
+                "SunlightArrows": 1,
+                "ZorasFountain": 1
+            }
+        }
+    },
+    "presetName": "Rando Beginner",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Rando Default.json b/soh/assets/custom/presets/Rando Default.json
new file mode 100644
index 0000000000..f5c5818e94
--- /dev/null
+++ b/soh/assets/custom/presets/Rando Default.json	
@@ -0,0 +1,9 @@
+{
+    "blocks": {
+        "rando": {
+            "gRandoSettings": null
+        }
+    },
+    "presetName": "Rando Default",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Rando Hell Mode.json b/soh/assets/custom/presets/Rando Hell Mode.json
new file mode 100644
index 0000000000..d427271270
--- /dev/null
+++ b/soh/assets/custom/presets/Rando Hell Mode.json	
@@ -0,0 +1,80 @@
+{
+    "blocks": {
+        "rando": {
+            "gRandoSettings": {
+                "BigPoeTargetCount": 1,
+                "BlueFireArrows": 1,
+                "BombchuBag": 1,
+                "BossKeysanity": 5,
+                "ClosedForest": 2,
+                "CuccosToReturn": 1,
+                "DecoupleEntrances": 1,
+                "DoorOfTime": 2,
+                "EnableBombchuDrops": 1,
+                "Fishsanity": 4,
+                "FishsanityAgeSplit": 1,
+                "FishsanityPondCount": 17,
+                "GerudoKeys": 3,
+                "IncludeTycoonWallet": 1,
+                "KakarikoGate": 1,
+                "Keysanity": 5,
+                "LacsRewardCount": 10,
+                "LacsRewardOptions": 1,
+                "LockOverworldDoors": 1,
+                "MixBosses": 1,
+                "MixDungeons": 1,
+                "MixGrottos": 1,
+                "MixInteriors": 1,
+                "MixOverworld": 1,
+                "MixedEntrances": 1,
+                "RainbowBridge": 7,
+                "ScrubsPrices": 2,
+                "Shopsanity": 1,
+                "ShopsanityCount": 7,
+                "ShopsanityPrices": 2,
+                "Shuffle100GSReward": 1,
+                "ShuffleAdultTrade": 1,
+                "ShuffleBeehives": 1,
+                "ShuffleBossEntrances": 2,
+                "ShuffleBossSouls": 2,
+                "ShuffleChildWallet": 1,
+                "ShuffleCows": 1,
+                "ShuffleCrates": 3,
+                "ShuffleDekuNutBag": 1,
+                "ShuffleDekuStickBag": 1,
+                "ShuffleDungeonsEntrances": 2,
+                "ShuffleFairies": 1,
+                "ShuffleFishingPole": 1,
+                "ShuffleFreestanding": 3,
+                "ShuffleFrogSongRupees": 1,
+                "ShuffleGanonBossKey": 9,
+                "ShuffleGerudoToken": 1,
+                "ShuffleGrass": 3,
+                "ShuffleGrottosEntrances": 1,
+                "ShuffleInteriorsEntrances": 2,
+                "ShuffleKokiriSword": 1,
+                "ShuffleMasterSword": 1,
+                "ShuffleMerchants": 3,
+                "ShuffleOcarinaButtons": 1,
+                "ShuffleOcarinas": 1,
+                "ShuffleOverworldEntrances": 1,
+                "ShuffleOverworldSpawns": 1,
+                "ShuffleOwlDrops": 1,
+                "ShufflePots": 3,
+                "ShuffleScrubs": 2,
+                "ShuffleSongs": 2,
+                "ShuffleSwim": 1,
+                "ShuffleTokens": 3,
+                "ShuffleWarpSongs": 1,
+                "ShuffleWeirdEgg": 1,
+                "SkipEponaRace": 1,
+                "StartingAge": 2,
+                "StartingHearts": 0,
+                "StartingMapsCompasses": 5,
+                "SunlightArrows": 1
+            }
+        }
+    },
+    "presetName": "Rando Hell Mode",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/presets/Rando Standard.json b/soh/assets/custom/presets/Rando Standard.json
new file mode 100644
index 0000000000..ad91912de8
--- /dev/null
+++ b/soh/assets/custom/presets/Rando Standard.json	
@@ -0,0 +1,63 @@
+{
+    "blocks": {
+        "rando": {
+            "gRandoSettings": {
+                "10GSHint": 1,
+                "20GSHint": 1,
+                "30GSHint": 1,
+                "40GSHint": 1,
+                "50GSHint": 1,
+                "BigPoeTargetCount": 1,
+                "BiggoronHint": 1,
+                "BlueFireArrows": 1,
+                "BombchuBag": 1,
+                "BossKeysanity": 2,
+                "ClosedForest": 2,
+                "CompleteMaskQuest": 1,
+                "CuccosToReturn": 1,
+                "DampeHint": 1,
+                "DoorOfTime": 2,
+                "EnableBombchuDrops": 1,
+                "FortressCarpenters": 1,
+                "FrogsHint": 1,
+                "FullWallets": 1,
+                "GanonTrial": 0,
+                "GregHint": 1,
+                "HBAHint": 1,
+                "IncludeTycoonWallet": 1,
+                "KakarikoGate": 1,
+                "Keysanity": 5,
+                "LacsRewardCount": 7,
+                "MalonHint": 1,
+                "MerchantText": 1,
+                "RainbowBridge": 7,
+                "SariaHint": 1,
+                "ScrubsFixedPrice": 2,
+                "ScrubsPrices": 3,
+                "SheikLAHint": 0,
+                "Shopsanity": 1,
+                "ShopsanityCount": 4,
+                "ShopsanityPrices": 2,
+                "ShuffleGanonBossKey": 9,
+                "ShuffleGerudoToken": 1,
+                "ShuffleKeyRings": 2,
+                "ShuffleKeyRingsRandomCount": 8,
+                "ShuffleKokiriSword": 1,
+                "ShuffleMerchants": 1,
+                "ShuffleOcarinas": 1,
+                "ShuffleScrubs": 2,
+                "ShuffleSongs": 2,
+                "ShuffleTokens": 3,
+                "SkipChildZelda": 1,
+                "SkipEponaRace": 1,
+                "SkipScarecrowsSong": 1,
+                "StartingMapsCompasses": 0,
+                "StartingOcarina": 1,
+                "SunlightArrows": 1,
+                "ZorasFountain": 1
+            }
+        }
+    },
+    "presetName": "Rando Standard",
+	"isBuiltIn": true
+}
\ No newline at end of file
diff --git a/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsJPNTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsJPNTex.ia8.png
new file mode 100644
index 0000000000..445111458b
Binary files /dev/null and b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsJPNTex.ia8.png differ
diff --git a/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestJPNTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestJPNTex.ia8.png
new file mode 100644
index 0000000000..08e42e476b
Binary files /dev/null and b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestJPNTex.ia8.png differ
diff --git a/soh/assets/extractor/Config_GC_MQ_D.xml b/soh/assets/extractor/Config_GC_MQ_D.xml
index 51e5362922..9607bf02a5 100644
--- a/soh/assets/extractor/Config_GC_MQ_D.xml
+++ b/soh/assets/extractor/Config_GC_MQ_D.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_MQ_D/"/>
+    <ExternalXMLFolder Path="assets/xml/GC_MQ_D/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/Config_GC_MQ_NTSC_J.xml b/soh/assets/extractor/Config_GC_MQ_NTSC_J.xml
new file mode 100644
index 0000000000..f476c161fc
--- /dev/null
+++ b/soh/assets/extractor/Config_GC_MQ_NTSC_J.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/GC_MQ_NTSC_J/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_GC_MQ_NTSC_U.xml b/soh/assets/extractor/Config_GC_MQ_NTSC_U.xml
new file mode 100644
index 0000000000..aa89e2d0f8
--- /dev/null
+++ b/soh/assets/extractor/Config_GC_MQ_NTSC_U.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/GC_MQ_NTSC_U/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_GC_MQ_PAL_F.xml b/soh/assets/extractor/Config_GC_MQ_PAL_F.xml
index 7c53369954..5c5cf66178 100644
--- a/soh/assets/extractor/Config_GC_MQ_PAL_F.xml
+++ b/soh/assets/extractor/Config_GC_MQ_PAL_F.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_MQ_PAL_F/"/>
+    <ExternalXMLFolder Path="assets/xml/GC_MQ_PAL_F/"/>
     <TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/Config_GC_NMQ_D.xml b/soh/assets/extractor/Config_GC_NMQ_D.xml
index 7cc11ac18a..3ea47f975d 100644
--- a/soh/assets/extractor/Config_GC_NMQ_D.xml
+++ b/soh/assets/extractor/Config_GC_NMQ_D.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_D/"/>
+    <ExternalXMLFolder Path="assets/xml/GC_NMQ_D/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/Config_GC_NMQ_NTSC_J.xml b/soh/assets/extractor/Config_GC_NMQ_NTSC_J.xml
new file mode 100644
index 0000000000..72b9258186
--- /dev/null
+++ b/soh/assets/extractor/Config_GC_NMQ_NTSC_J.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/GC_NMQ_NTSC_J/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_GC_NMQ_NTSC_J_CE.xml b/soh/assets/extractor/Config_GC_NMQ_NTSC_J_CE.xml
new file mode 100644
index 0000000000..b188b11629
--- /dev/null
+++ b/soh/assets/extractor/Config_GC_NMQ_NTSC_J_CE.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/GC_NMQ_NTSC_J_CE/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_GC_NMQ_NTSC_U.xml b/soh/assets/extractor/Config_GC_NMQ_NTSC_U.xml
new file mode 100644
index 0000000000..9bfb54700a
--- /dev/null
+++ b/soh/assets/extractor/Config_GC_NMQ_NTSC_U.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/GC_NMQ_NTSC_U/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_GC_NMQ_PAL_F.xml b/soh/assets/extractor/Config_GC_NMQ_PAL_F.xml
index b98acfb00d..066ac144cd 100644
--- a/soh/assets/extractor/Config_GC_NMQ_PAL_F.xml
+++ b/soh/assets/extractor/Config_GC_NMQ_PAL_F.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_PAL_F/"/>
+    <ExternalXMLFolder Path="assets/xml/GC_NMQ_PAL_F/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/Config_N64_NTSC_10.xml b/soh/assets/extractor/Config_N64_NTSC_10.xml
new file mode 100644
index 0000000000..8beed9fecb
--- /dev/null
+++ b/soh/assets/extractor/Config_N64_NTSC_10.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/N64_NTSC_10/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_N64_NTSC_11.xml b/soh/assets/extractor/Config_N64_NTSC_11.xml
new file mode 100644
index 0000000000..6f7391649b
--- /dev/null
+++ b/soh/assets/extractor/Config_N64_NTSC_11.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/N64_NTSC_11/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_N64_NTSC_12.xml b/soh/assets/extractor/Config_N64_NTSC_12.xml
new file mode 100644
index 0000000000..650bf75732
--- /dev/null
+++ b/soh/assets/extractor/Config_N64_NTSC_12.xml
@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/xml/N64_NTSC_12/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
diff --git a/soh/assets/extractor/Config_N64_PAL_10.xml b/soh/assets/extractor/Config_N64_PAL_10.xml
index e4f85e362e..1b8ba4af58 100644
--- a/soh/assets/extractor/Config_N64_PAL_10.xml
+++ b/soh/assets/extractor/Config_N64_PAL_10.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/N64_PAL_10/"/>
+    <ExternalXMLFolder Path="assets/xml/N64_PAL_10/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/Config_N64_PAL_11.xml b/soh/assets/extractor/Config_N64_PAL_11.xml
index ddc5f21d8e..10463e3e6f 100644
--- a/soh/assets/extractor/Config_N64_PAL_11.xml
+++ b/soh/assets/extractor/Config_N64_PAL_11.xml
@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/N64_PAL_11/"/>
+    <ExternalXMLFolder Path="assets/xml/N64_PAL_11/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
diff --git a/soh/assets/extractor/filelists/dbg.txt b/soh/assets/extractor/filelists/dbg.txt
new file mode 100644
index 0000000000..68af5e5579
--- /dev/null
+++ b/soh/assets/extractor/filelists/dbg.txt
@@ -0,0 +1,1532 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_nes_static
+icon_item_ger_static
+icon_item_fra_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+message_texture_static
+nes_font_static
+nes_message_data_static
+ger_message_data_static
+fra_message_data_static
+staff_message_data_static
+map_grand_static
+map_i_static
+map_48x85_static
+code
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_Arms_Hook
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Bg_Bdan_Objects
+ovl_Bg_Bdan_Switch
+ovl_Bg_Bom_Guard
+ovl_Bg_Bombwall
+ovl_Bg_Bowl_Wall
+ovl_Bg_Breakwall
+ovl_Bg_Ddan_Jd
+ovl_Bg_Ddan_Kd
+ovl_Bg_Dodoago
+ovl_Bg_Dy_Yoseizo
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Gate_Shutter
+ovl_Bg_Gjyo_Bridge
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Haka
+ovl_Bg_Haka_Gate
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Sgami
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Water
+ovl_Bg_Haka_Zou
+ovl_Bg_Heavy_Block
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Hidan_Fslift
+ovl_Bg_Hidan_Fwbig
+ovl_Bg_Hidan_Hamstep
+ovl_Bg_Hidan_Hrock
+ovl_Bg_Hidan_Kousi
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_Bg_Ice_Objects
+ovl_Bg_Ice_Shelter
+ovl_Bg_Ice_Shutter
+ovl_Bg_Ice_Turara
+ovl_Bg_Ingate
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Block
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Jya_Ironobj
+ovl_Bg_Jya_Kanaami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Menkuri_Eye
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Nisekabe
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Shutter
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Mizu_Water
+ovl_Bg_Mjin
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Hineri
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_Bg_Po_Event
+ovl_Bg_Po_Syokudai
+ovl_Bg_Pushbox
+ovl_Bg_Relay_Objects
+ovl_Bg_Spot00_Break
+ovl_Bg_Spot00_Hanebasi
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Spot01_Idosoko
+ovl_Bg_Spot01_Objects2
+ovl_Bg_Spot02_Objects
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot05_Soko
+ovl_Bg_Spot06_Objects
+ovl_Bg_Spot07_Taki
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot08_Iceblock
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot11_Bakudankabe
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Spot15_Saku
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Spot17_Bakudankabe
+ovl_Bg_Spot17_Funen
+ovl_Bg_Spot18_Basket
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Obj
+ovl_Bg_Spot18_Shutter
+ovl_Bg_Sst_Floor
+ovl_Bg_Toki_Hikari
+ovl_Bg_Toki_Swd
+ovl_Bg_Treemouth
+ovl_Bg_Umajump
+ovl_Bg_Vb_Sima
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Bg_Ydan_Sp
+ovl_Bg_Zg
+ovl_Boss_Dodongo
+ovl_Boss_Fd
+ovl_Boss_Fd2
+ovl_Boss_Ganon
+ovl_Boss_Ganon2
+ovl_Boss_Ganondrof
+ovl_Boss_Goma
+ovl_Boss_Mo
+ovl_Boss_Sst
+ovl_Boss_Tw
+ovl_Boss_Va
+ovl_Demo_6K
+ovl_Demo_Du
+ovl_Demo_Ec
+ovl_Demo_Effect
+ovl_Demo_Ext
+ovl_Demo_Geff
+ovl_Demo_Gj
+ovl_Demo_Go
+ovl_Demo_Gt
+ovl_Demo_Ik
+ovl_Demo_Im
+ovl_Demo_Kankyo
+ovl_Demo_Kekkai
+ovl_Demo_Sa
+ovl_Demo_Shd
+ovl_Demo_Tre_Lgt
+ovl_Door_Ana
+ovl_Door_Gerudo
+ovl_Door_Killer
+ovl_Door_Shutter
+ovl_Door_Toki
+ovl_Door_Warp1
+ovl_Efc_Erupc
+ovl_Eff_Dust
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_Ice_Smoke
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Stone1
+ovl_Elf_Msg
+ovl_Elf_Msg2
+ovl_En_Am
+ovl_En_Ani
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_En_Anubice_Tag
+ovl_En_Arow_Trap
+ovl_En_Arrow
+ovl_En_Attack_Niw
+ovl_En_Ba
+ovl_En_Bb
+ovl_En_Bdfire
+ovl_En_Bigokuta
+ovl_En_Bili
+ovl_En_Bird
+ovl_En_Blkobj
+ovl_En_Bom
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Bom_Chu
+ovl_En_Bombf
+ovl_En_Boom
+ovl_En_Box
+ovl_En_Brob
+ovl_En_Bubble
+ovl_En_Butte
+ovl_En_Bw
+ovl_En_Bx
+ovl_En_Changer
+ovl_En_Clear_Tag
+ovl_En_Cow
+ovl_En_Crow
+ovl_En_Cs
+ovl_En_Daiku
+ovl_En_Daiku_Kakariko
+ovl_En_Dekubaba
+ovl_En_Dekunuts
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Diving_Game
+ovl_En_Dns
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Dodojr
+ovl_En_Dodongo
+ovl_En_Dog
+ovl_En_Door
+ovl_En_Ds
+ovl_En_Du
+ovl_En_Dy_Extra
+ovl_En_Eg
+ovl_En_Eiyer
+ovl_En_Elf
+ovl_En_Encount1
+ovl_En_Encount2
+ovl_En_Ex_Item
+ovl_En_Ex_Ruppy
+ovl_En_Fd
+ovl_En_Fd_Fire
+ovl_En_Fhg_Fire
+ovl_En_Fire_Rock
+ovl_En_Firefly
+ovl_En_Fish
+ovl_En_Floormas
+ovl_En_Fr
+ovl_En_Fu
+ovl_En_Fw
+ovl_En_Fz
+ovl_En_G_Switch
+ovl_En_Ganon_Mant
+ovl_En_Ganon_Organ
+ovl_En_Gb
+ovl_En_Ge1
+ovl_En_Ge2
+ovl_En_Ge3
+ovl_En_GeldB
+ovl_En_GirlA
+ovl_En_Gm
+ovl_En_Go
+ovl_En_Go2
+ovl_En_Goma
+ovl_En_Goroiwa
+ovl_En_Gs
+ovl_En_Guest
+ovl_En_Hata
+ovl_En_Heishi1
+ovl_En_Heishi2
+ovl_En_Heishi3
+ovl_En_Heishi4
+ovl_En_Hintnuts
+ovl_En_Holl
+ovl_En_Honotrap
+ovl_En_Horse
+ovl_En_Horse_Game_Check
+ovl_En_Horse_Ganon
+ovl_En_Horse_Link_Child
+ovl_En_Horse_Normal
+ovl_En_Horse_Zelda
+ovl_En_Hs
+ovl_En_Hs2
+ovl_En_Hy
+ovl_En_Ice_Hono
+ovl_En_Ik
+ovl_En_In
+ovl_En_Insect
+ovl_En_Ishi
+ovl_En_It
+ovl_En_Jj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Kakasi
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_En_Kanban
+ovl_En_Karebaba
+ovl_En_Ko
+ovl_En_Kusa
+ovl_En_Kz
+ovl_En_Light
+ovl_En_Lightbox
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_En_Ma1
+ovl_En_Ma2
+ovl_En_Ma3
+ovl_En_Mag
+ovl_En_Mb
+ovl_En_Md
+ovl_En_Mk
+ovl_En_Mm
+ovl_En_Mm2
+ovl_En_Ms
+ovl_En_Mu
+ovl_En_Nb
+ovl_En_Niw
+ovl_En_Niw_Girl
+ovl_En_Niw_Lady
+ovl_En_Nutsball
+ovl_En_Nwc
+ovl_En_Ny
+ovl_En_OE2
+ovl_En_Okarina_Effect
+ovl_En_Okarina_Tag
+ovl_En_Okuta
+ovl_En_Ossan
+ovl_En_Owl
+ovl_En_Part
+ovl_En_Peehat
+ovl_En_Po_Desert
+ovl_En_Po_Field
+ovl_En_Po_Relay
+ovl_En_Po_Sisters
+ovl_En_Poh
+ovl_En_Pu_box
+ovl_En_Rd
+ovl_En_Reeba
+ovl_En_River_Sound
+ovl_En_Rl
+ovl_En_Rr
+ovl_En_Ru1
+ovl_En_Ru2
+ovl_En_Sa
+ovl_En_Sb
+ovl_En_Scene_Change
+ovl_En_Sda
+ovl_En_Shopnuts
+ovl_En_Si
+ovl_En_Siofuki
+ovl_En_Skb
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_Ssh
+ovl_En_St
+ovl_En_Sth
+ovl_En_Stream
+ovl_En_Sw
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Syateki_Niw
+ovl_En_Ta
+ovl_En_Takara_Man
+ovl_En_Tana
+ovl_En_Tg
+ovl_En_Tite
+ovl_En_Tk
+ovl_En_Torch
+ovl_En_Torch2
+ovl_En_Toryo
+ovl_En_Tp
+ovl_En_Tr
+ovl_En_Trap
+ovl_En_Tubo_Trap
+ovl_En_Vali
+ovl_En_Vase
+ovl_En_Vb_Ball
+ovl_En_Viewer
+ovl_En_Vm
+ovl_En_Wall_Tubo
+ovl_En_Wallmas
+ovl_En_Weather_Tag
+ovl_En_Weiyer
+ovl_En_Wf
+ovl_En_Wonder_Item
+ovl_En_Wonder_Talk
+ovl_En_Wonder_Talk2
+ovl_En_Wood02
+ovl_En_Xc
+ovl_En_Yabusame_Mark
+ovl_En_Yukabyun
+ovl_En_Zf
+ovl_En_Zl1
+ovl_En_Zl2
+ovl_En_Zl3
+ovl_En_Zl4
+ovl_En_Zo
+ovl_En_fHG
+ovl_End_Title
+ovl_Fishing
+ovl_Item_B_Heart
+ovl_Item_Etcetera
+ovl_Item_Inbox
+ovl_Item_Ocarina
+ovl_Item_Shield
+ovl_Magic_Dark
+ovl_Magic_Fire
+ovl_Magic_Wind
+ovl_Mir_Ray
+ovl_Obj_Bean
+ovl_Obj_Blockstop
+ovl_Obj_Bombiwa
+ovl_Obj_Comb
+ovl_Obj_Dekujr
+ovl_Obj_Elevator
+ovl_Obj_Hamishi
+ovl_Obj_Hana
+ovl_Obj_Hsblock
+ovl_Obj_Ice_Poly
+ovl_Obj_Kibako
+ovl_Obj_Kibako2
+ovl_Obj_Lift
+ovl_Obj_Lightswitch
+ovl_Obj_Makekinsuta
+ovl_Obj_Makeoshihiki
+ovl_Obj_Mure
+ovl_Obj_Mure2
+ovl_Obj_Mure3
+ovl_Obj_Oshihiki
+ovl_Obj_Roomtimer
+ovl_Obj_Switch
+ovl_Obj_Syokudai
+ovl_Obj_Timeblock
+ovl_Obj_Tsubo
+ovl_Obj_Warp2block
+ovl_Object_Kankyo
+ovl_Oceff_Spot
+ovl_Oceff_Storm
+ovl_Oceff_Wipe
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_Oceff_Wipe4
+ovl_Shot_Sun
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+syotes_scene
+syotes_room_0
+syotes2_scene
+syotes2_room_0
+depth_test_scene
+depth_test_room_0
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+testroom_scene
+testroom_room_0
+testroom_room_1
+testroom_room_2
+testroom_room_3
+testroom_room_4
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+sutaru_scene
+sutaru_room_0
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+sasatest_scene
+sasatest_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hairal_niwa2_scene
+hairal_niwa2_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+besitu_scene
+besitu_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+test01_scene
+test01_room_0
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
\ No newline at end of file
diff --git a/soh/assets/extractor/filelists/gamecube.txt b/soh/assets/extractor/filelists/gamecube.txt
new file mode 100644
index 0000000000..23794e1f65
--- /dev/null
+++ b/soh/assets/extractor/filelists/gamecube.txt
@@ -0,0 +1,1509 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+kanji
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_jpn_static
+icon_item_nes_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+message_texture_static
+nes_font_static
+jpn_message_data_static
+nes_message_data_static
+staff_message_data_static
+map_grand_static
+map_48x85_static
+map_i_static
+code
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_Arms_Hook
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Bg_Bdan_Objects
+ovl_Bg_Bdan_Switch
+ovl_Bg_Bom_Guard
+ovl_Bg_Bombwall
+ovl_Bg_Bowl_Wall
+ovl_Bg_Breakwall
+ovl_Bg_Ddan_Jd
+ovl_Bg_Ddan_Kd
+ovl_Bg_Dodoago
+ovl_Bg_Dy_Yoseizo
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Gate_Shutter
+ovl_Bg_Gjyo_Bridge
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Haka
+ovl_Bg_Haka_Gate
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Sgami
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Water
+ovl_Bg_Haka_Zou
+ovl_Bg_Heavy_Block
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Hidan_Fslift
+ovl_Bg_Hidan_Fwbig
+ovl_Bg_Hidan_Hamstep
+ovl_Bg_Hidan_Hrock
+ovl_Bg_Hidan_Kousi
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_Bg_Ice_Objects
+ovl_Bg_Ice_Shelter
+ovl_Bg_Ice_Shutter
+ovl_Bg_Ice_Turara
+ovl_Bg_Ingate
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Block
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Jya_Ironobj
+ovl_Bg_Jya_Kanaami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Menkuri_Eye
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Nisekabe
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Shutter
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Mizu_Water
+ovl_Bg_Mjin
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Hineri
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_Bg_Po_Event
+ovl_Bg_Po_Syokudai
+ovl_Bg_Pushbox
+ovl_Bg_Relay_Objects
+ovl_Bg_Spot00_Break
+ovl_Bg_Spot00_Hanebasi
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Spot01_Idosoko
+ovl_Bg_Spot01_Objects2
+ovl_Bg_Spot02_Objects
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot05_Soko
+ovl_Bg_Spot06_Objects
+ovl_Bg_Spot07_Taki
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot08_Iceblock
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot11_Bakudankabe
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Spot15_Saku
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Spot17_Bakudankabe
+ovl_Bg_Spot17_Funen
+ovl_Bg_Spot18_Basket
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Obj
+ovl_Bg_Spot18_Shutter
+ovl_Bg_Sst_Floor
+ovl_Bg_Toki_Hikari
+ovl_Bg_Toki_Swd
+ovl_Bg_Treemouth
+ovl_Bg_Umajump
+ovl_Bg_Vb_Sima
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Bg_Ydan_Sp
+ovl_Bg_Zg
+ovl_Boss_Dodongo
+ovl_Boss_Fd
+ovl_Boss_Fd2
+ovl_Boss_Ganon
+ovl_Boss_Ganon2
+ovl_Boss_Ganondrof
+ovl_Boss_Goma
+ovl_Boss_Mo
+ovl_Boss_Sst
+ovl_Boss_Tw
+ovl_Boss_Va
+ovl_Demo_6K
+ovl_Demo_Du
+ovl_Demo_Ec
+ovl_Demo_Effect
+ovl_Demo_Ext
+ovl_Demo_Geff
+ovl_Demo_Gj
+ovl_Demo_Go
+ovl_Demo_Gt
+ovl_Demo_Ik
+ovl_Demo_Im
+ovl_Demo_Kankyo
+ovl_Demo_Kekkai
+ovl_Demo_Sa
+ovl_Demo_Shd
+ovl_Demo_Tre_Lgt
+ovl_Door_Ana
+ovl_Door_Gerudo
+ovl_Door_Killer
+ovl_Door_Shutter
+ovl_Door_Toki
+ovl_Door_Warp1
+ovl_Efc_Erupc
+ovl_Eff_Dust
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_Ice_Smoke
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Stone1
+ovl_Elf_Msg
+ovl_Elf_Msg2
+ovl_En_Am
+ovl_En_Ani
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_En_Anubice_Tag
+ovl_En_Arow_Trap
+ovl_En_Arrow
+ovl_En_Attack_Niw
+ovl_En_Ba
+ovl_En_Bb
+ovl_En_Bdfire
+ovl_En_Bigokuta
+ovl_En_Bili
+ovl_En_Bird
+ovl_En_Blkobj
+ovl_En_Bom
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Bom_Chu
+ovl_En_Bombf
+ovl_En_Boom
+ovl_En_Box
+ovl_En_Brob
+ovl_En_Bubble
+ovl_En_Butte
+ovl_En_Bw
+ovl_En_Bx
+ovl_En_Changer
+ovl_En_Clear_Tag
+ovl_En_Cow
+ovl_En_Crow
+ovl_En_Cs
+ovl_En_Daiku
+ovl_En_Daiku_Kakariko
+ovl_En_Dekubaba
+ovl_En_Dekunuts
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Diving_Game
+ovl_En_Dns
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Dodojr
+ovl_En_Dodongo
+ovl_En_Dog
+ovl_En_Door
+ovl_En_Ds
+ovl_En_Du
+ovl_En_Dy_Extra
+ovl_En_Eg
+ovl_En_Eiyer
+ovl_En_Elf
+ovl_En_Encount1
+ovl_En_Encount2
+ovl_En_Ex_Item
+ovl_En_Ex_Ruppy
+ovl_En_Fd
+ovl_En_Fd_Fire
+ovl_En_Fhg_Fire
+ovl_En_Fire_Rock
+ovl_En_Firefly
+ovl_En_Fish
+ovl_En_Floormas
+ovl_En_Fr
+ovl_En_Fu
+ovl_En_Fw
+ovl_En_Fz
+ovl_En_G_Switch
+ovl_En_Ganon_Mant
+ovl_En_Ganon_Organ
+ovl_En_Gb
+ovl_En_Ge1
+ovl_En_Ge2
+ovl_En_Ge3
+ovl_En_GeldB
+ovl_En_GirlA
+ovl_En_Gm
+ovl_En_Go
+ovl_En_Go2
+ovl_En_Goma
+ovl_En_Goroiwa
+ovl_En_Gs
+ovl_En_Guest
+ovl_En_Hata
+ovl_En_Heishi1
+ovl_En_Heishi2
+ovl_En_Heishi3
+ovl_En_Heishi4
+ovl_En_Hintnuts
+ovl_En_Holl
+ovl_En_Honotrap
+ovl_En_Horse
+ovl_En_Horse_Game_Check
+ovl_En_Horse_Ganon
+ovl_En_Horse_Link_Child
+ovl_En_Horse_Normal
+ovl_En_Horse_Zelda
+ovl_En_Hs
+ovl_En_Hs2
+ovl_En_Hy
+ovl_En_Ice_Hono
+ovl_En_Ik
+ovl_En_In
+ovl_En_Insect
+ovl_En_Ishi
+ovl_En_It
+ovl_En_Jj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Kakasi
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_En_Kanban
+ovl_En_Karebaba
+ovl_En_Ko
+ovl_En_Kusa
+ovl_En_Kz
+ovl_En_Light
+ovl_En_Lightbox
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_En_Ma1
+ovl_En_Ma2
+ovl_En_Ma3
+ovl_En_Mag
+ovl_En_Mb
+ovl_En_Md
+ovl_En_Mk
+ovl_En_Mm
+ovl_En_Mm2
+ovl_En_Ms
+ovl_En_Mu
+ovl_En_Nb
+ovl_En_Niw
+ovl_En_Niw_Girl
+ovl_En_Niw_Lady
+ovl_En_Nutsball
+ovl_En_Nwc
+ovl_En_Ny
+ovl_En_OE2
+ovl_En_Okarina_Effect
+ovl_En_Okarina_Tag
+ovl_En_Okuta
+ovl_En_Ossan
+ovl_En_Owl
+ovl_En_Part
+ovl_En_Peehat
+ovl_En_Po_Desert
+ovl_En_Po_Field
+ovl_En_Po_Relay
+ovl_En_Po_Sisters
+ovl_En_Poh
+ovl_En_Pu_box
+ovl_En_Rd
+ovl_En_Reeba
+ovl_En_River_Sound
+ovl_En_Rl
+ovl_En_Rr
+ovl_En_Ru1
+ovl_En_Ru2
+ovl_En_Sa
+ovl_En_Sb
+ovl_En_Scene_Change
+ovl_En_Sda
+ovl_En_Shopnuts
+ovl_En_Si
+ovl_En_Siofuki
+ovl_En_Skb
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_Ssh
+ovl_En_St
+ovl_En_Sth
+ovl_En_Stream
+ovl_En_Sw
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Syateki_Niw
+ovl_En_Ta
+ovl_En_Takara_Man
+ovl_En_Tana
+ovl_En_Tg
+ovl_En_Tite
+ovl_En_Tk
+ovl_En_Torch
+ovl_En_Torch2
+ovl_En_Toryo
+ovl_En_Tp
+ovl_En_Tr
+ovl_En_Trap
+ovl_En_Tubo_Trap
+ovl_En_Vali
+ovl_En_Vase
+ovl_En_Vb_Ball
+ovl_En_Viewer
+ovl_En_Vm
+ovl_En_Wall_Tubo
+ovl_En_Wallmas
+ovl_En_Weather_Tag
+ovl_En_Weiyer
+ovl_En_Wf
+ovl_En_Wonder_Item
+ovl_En_Wonder_Talk
+ovl_En_Wonder_Talk2
+ovl_En_Wood02
+ovl_En_Xc
+ovl_En_Yabusame_Mark
+ovl_En_Yukabyun
+ovl_En_Zf
+ovl_En_Zl1
+ovl_En_Zl2
+ovl_En_Zl3
+ovl_En_Zl4
+ovl_En_Zo
+ovl_En_fHG
+ovl_End_Title
+ovl_Fishing
+ovl_Item_B_Heart
+ovl_Item_Etcetera
+ovl_Item_Inbox
+ovl_Item_Ocarina
+ovl_Item_Shield
+ovl_Magic_Dark
+ovl_Magic_Fire
+ovl_Magic_Wind
+ovl_Mir_Ray
+ovl_Obj_Bean
+ovl_Obj_Blockstop
+ovl_Obj_Bombiwa
+ovl_Obj_Comb
+ovl_Obj_Dekujr
+ovl_Obj_Elevator
+ovl_Obj_Hamishi
+ovl_Obj_Hana
+ovl_Obj_Hsblock
+ovl_Obj_Ice_Poly
+ovl_Obj_Kibako
+ovl_Obj_Kibako2
+ovl_Obj_Lift
+ovl_Obj_Lightswitch
+ovl_Obj_Makekinsuta
+ovl_Obj_Makeoshihiki
+ovl_Obj_Mure
+ovl_Obj_Mure2
+ovl_Obj_Mure3
+ovl_Obj_Oshihiki
+ovl_Obj_Roomtimer
+ovl_Obj_Switch
+ovl_Obj_Syokudai
+ovl_Obj_Timeblock
+ovl_Obj_Tsubo
+ovl_Obj_Warp2block
+ovl_Object_Kankyo
+ovl_Oceff_Spot
+ovl_Oceff_Storm
+ovl_Oceff_Wipe
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_Oceff_Wipe4
+ovl_Shot_Sun
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
\ No newline at end of file
diff --git a/soh/assets/extractor/filelists/gamecube_pal.txt b/soh/assets/extractor/filelists/gamecube_pal.txt
new file mode 100644
index 0000000000..c9746c1da9
--- /dev/null
+++ b/soh/assets/extractor/filelists/gamecube_pal.txt
@@ -0,0 +1,1510 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_nes_static
+icon_item_ger_static
+icon_item_fra_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+message_texture_static
+nes_font_static
+nes_message_data_static
+ger_message_data_static
+fra_message_data_static
+staff_message_data_static
+map_grand_static
+map_48x85_static
+map_i_static
+code
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_Arms_Hook
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Bg_Bdan_Objects
+ovl_Bg_Bdan_Switch
+ovl_Bg_Bom_Guard
+ovl_Bg_Bombwall
+ovl_Bg_Bowl_Wall
+ovl_Bg_Breakwall
+ovl_Bg_Ddan_Jd
+ovl_Bg_Ddan_Kd
+ovl_Bg_Dodoago
+ovl_Bg_Dy_Yoseizo
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Gate_Shutter
+ovl_Bg_Gjyo_Bridge
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Haka
+ovl_Bg_Haka_Gate
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Sgami
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Water
+ovl_Bg_Haka_Zou
+ovl_Bg_Heavy_Block
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Hidan_Fslift
+ovl_Bg_Hidan_Fwbig
+ovl_Bg_Hidan_Hamstep
+ovl_Bg_Hidan_Hrock
+ovl_Bg_Hidan_Kousi
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_Bg_Ice_Objects
+ovl_Bg_Ice_Shelter
+ovl_Bg_Ice_Shutter
+ovl_Bg_Ice_Turara
+ovl_Bg_Ingate
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Block
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Jya_Ironobj
+ovl_Bg_Jya_Kanaami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Menkuri_Eye
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Nisekabe
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Shutter
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Mizu_Water
+ovl_Bg_Mjin
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Hineri
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_Bg_Po_Event
+ovl_Bg_Po_Syokudai
+ovl_Bg_Pushbox
+ovl_Bg_Relay_Objects
+ovl_Bg_Spot00_Break
+ovl_Bg_Spot00_Hanebasi
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Spot01_Idosoko
+ovl_Bg_Spot01_Objects2
+ovl_Bg_Spot02_Objects
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot05_Soko
+ovl_Bg_Spot06_Objects
+ovl_Bg_Spot07_Taki
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot08_Iceblock
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot11_Bakudankabe
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Spot15_Saku
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Spot17_Bakudankabe
+ovl_Bg_Spot17_Funen
+ovl_Bg_Spot18_Basket
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Obj
+ovl_Bg_Spot18_Shutter
+ovl_Bg_Sst_Floor
+ovl_Bg_Toki_Hikari
+ovl_Bg_Toki_Swd
+ovl_Bg_Treemouth
+ovl_Bg_Umajump
+ovl_Bg_Vb_Sima
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Bg_Ydan_Sp
+ovl_Bg_Zg
+ovl_Boss_Dodongo
+ovl_Boss_Fd
+ovl_Boss_Fd2
+ovl_Boss_Ganon
+ovl_Boss_Ganon2
+ovl_Boss_Ganondrof
+ovl_Boss_Goma
+ovl_Boss_Mo
+ovl_Boss_Sst
+ovl_Boss_Tw
+ovl_Boss_Va
+ovl_Demo_6K
+ovl_Demo_Du
+ovl_Demo_Ec
+ovl_Demo_Effect
+ovl_Demo_Ext
+ovl_Demo_Geff
+ovl_Demo_Gj
+ovl_Demo_Go
+ovl_Demo_Gt
+ovl_Demo_Ik
+ovl_Demo_Im
+ovl_Demo_Kankyo
+ovl_Demo_Kekkai
+ovl_Demo_Sa
+ovl_Demo_Shd
+ovl_Demo_Tre_Lgt
+ovl_Door_Ana
+ovl_Door_Gerudo
+ovl_Door_Killer
+ovl_Door_Shutter
+ovl_Door_Toki
+ovl_Door_Warp1
+ovl_Efc_Erupc
+ovl_Eff_Dust
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_Ice_Smoke
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Stone1
+ovl_Elf_Msg
+ovl_Elf_Msg2
+ovl_En_Am
+ovl_En_Ani
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_En_Anubice_Tag
+ovl_En_Arow_Trap
+ovl_En_Arrow
+ovl_En_Attack_Niw
+ovl_En_Ba
+ovl_En_Bb
+ovl_En_Bdfire
+ovl_En_Bigokuta
+ovl_En_Bili
+ovl_En_Bird
+ovl_En_Blkobj
+ovl_En_Bom
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Bom_Chu
+ovl_En_Bombf
+ovl_En_Boom
+ovl_En_Box
+ovl_En_Brob
+ovl_En_Bubble
+ovl_En_Butte
+ovl_En_Bw
+ovl_En_Bx
+ovl_En_Changer
+ovl_En_Clear_Tag
+ovl_En_Cow
+ovl_En_Crow
+ovl_En_Cs
+ovl_En_Daiku
+ovl_En_Daiku_Kakariko
+ovl_En_Dekubaba
+ovl_En_Dekunuts
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Diving_Game
+ovl_En_Dns
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Dodojr
+ovl_En_Dodongo
+ovl_En_Dog
+ovl_En_Door
+ovl_En_Ds
+ovl_En_Du
+ovl_En_Dy_Extra
+ovl_En_Eg
+ovl_En_Eiyer
+ovl_En_Elf
+ovl_En_Encount1
+ovl_En_Encount2
+ovl_En_Ex_Item
+ovl_En_Ex_Ruppy
+ovl_En_Fd
+ovl_En_Fd_Fire
+ovl_En_Fhg_Fire
+ovl_En_Fire_Rock
+ovl_En_Firefly
+ovl_En_Fish
+ovl_En_Floormas
+ovl_En_Fr
+ovl_En_Fu
+ovl_En_Fw
+ovl_En_Fz
+ovl_En_G_Switch
+ovl_En_Ganon_Mant
+ovl_En_Ganon_Organ
+ovl_En_Gb
+ovl_En_Ge1
+ovl_En_Ge2
+ovl_En_Ge3
+ovl_En_GeldB
+ovl_En_GirlA
+ovl_En_Gm
+ovl_En_Go
+ovl_En_Go2
+ovl_En_Goma
+ovl_En_Goroiwa
+ovl_En_Gs
+ovl_En_Guest
+ovl_En_Hata
+ovl_En_Heishi1
+ovl_En_Heishi2
+ovl_En_Heishi3
+ovl_En_Heishi4
+ovl_En_Hintnuts
+ovl_En_Holl
+ovl_En_Honotrap
+ovl_En_Horse
+ovl_En_Horse_Game_Check
+ovl_En_Horse_Ganon
+ovl_En_Horse_Link_Child
+ovl_En_Horse_Normal
+ovl_En_Horse_Zelda
+ovl_En_Hs
+ovl_En_Hs2
+ovl_En_Hy
+ovl_En_Ice_Hono
+ovl_En_Ik
+ovl_En_In
+ovl_En_Insect
+ovl_En_Ishi
+ovl_En_It
+ovl_En_Jj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Kakasi
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_En_Kanban
+ovl_En_Karebaba
+ovl_En_Ko
+ovl_En_Kusa
+ovl_En_Kz
+ovl_En_Light
+ovl_En_Lightbox
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_En_Ma1
+ovl_En_Ma2
+ovl_En_Ma3
+ovl_En_Mag
+ovl_En_Mb
+ovl_En_Md
+ovl_En_Mk
+ovl_En_Mm
+ovl_En_Mm2
+ovl_En_Ms
+ovl_En_Mu
+ovl_En_Nb
+ovl_En_Niw
+ovl_En_Niw_Girl
+ovl_En_Niw_Lady
+ovl_En_Nutsball
+ovl_En_Nwc
+ovl_En_Ny
+ovl_En_OE2
+ovl_En_Okarina_Effect
+ovl_En_Okarina_Tag
+ovl_En_Okuta
+ovl_En_Ossan
+ovl_En_Owl
+ovl_En_Part
+ovl_En_Peehat
+ovl_En_Po_Desert
+ovl_En_Po_Field
+ovl_En_Po_Relay
+ovl_En_Po_Sisters
+ovl_En_Poh
+ovl_En_Pu_box
+ovl_En_Rd
+ovl_En_Reeba
+ovl_En_River_Sound
+ovl_En_Rl
+ovl_En_Rr
+ovl_En_Ru1
+ovl_En_Ru2
+ovl_En_Sa
+ovl_En_Sb
+ovl_En_Scene_Change
+ovl_En_Sda
+ovl_En_Shopnuts
+ovl_En_Si
+ovl_En_Siofuki
+ovl_En_Skb
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_Ssh
+ovl_En_St
+ovl_En_Sth
+ovl_En_Stream
+ovl_En_Sw
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Syateki_Niw
+ovl_En_Ta
+ovl_En_Takara_Man
+ovl_En_Tana
+ovl_En_Tg
+ovl_En_Tite
+ovl_En_Tk
+ovl_En_Torch
+ovl_En_Torch2
+ovl_En_Toryo
+ovl_En_Tp
+ovl_En_Tr
+ovl_En_Trap
+ovl_En_Tubo_Trap
+ovl_En_Vali
+ovl_En_Vase
+ovl_En_Vb_Ball
+ovl_En_Viewer
+ovl_En_Vm
+ovl_En_Wall_Tubo
+ovl_En_Wallmas
+ovl_En_Weather_Tag
+ovl_En_Weiyer
+ovl_En_Wf
+ovl_En_Wonder_Item
+ovl_En_Wonder_Talk
+ovl_En_Wonder_Talk2
+ovl_En_Wood02
+ovl_En_Xc
+ovl_En_Yabusame_Mark
+ovl_En_Yukabyun
+ovl_En_Zf
+ovl_En_Zl1
+ovl_En_Zl2
+ovl_En_Zl3
+ovl_En_Zl4
+ovl_En_Zo
+ovl_En_fHG
+ovl_End_Title
+ovl_Fishing
+ovl_Item_B_Heart
+ovl_Item_Etcetera
+ovl_Item_Inbox
+ovl_Item_Ocarina
+ovl_Item_Shield
+ovl_Magic_Dark
+ovl_Magic_Fire
+ovl_Magic_Wind
+ovl_Mir_Ray
+ovl_Obj_Bean
+ovl_Obj_Blockstop
+ovl_Obj_Bombiwa
+ovl_Obj_Comb
+ovl_Obj_Dekujr
+ovl_Obj_Elevator
+ovl_Obj_Hamishi
+ovl_Obj_Hana
+ovl_Obj_Hsblock
+ovl_Obj_Ice_Poly
+ovl_Obj_Kibako
+ovl_Obj_Kibako2
+ovl_Obj_Lift
+ovl_Obj_Lightswitch
+ovl_Obj_Makekinsuta
+ovl_Obj_Makeoshihiki
+ovl_Obj_Mure
+ovl_Obj_Mure2
+ovl_Obj_Mure3
+ovl_Obj_Oshihiki
+ovl_Obj_Roomtimer
+ovl_Obj_Switch
+ovl_Obj_Syokudai
+ovl_Obj_Timeblock
+ovl_Obj_Tsubo
+ovl_Obj_Warp2block
+ovl_Object_Kankyo
+ovl_Oceff_Spot
+ovl_Oceff_Storm
+ovl_Oceff_Wipe
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_Oceff_Wipe4
+ovl_Shot_Sun
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
\ No newline at end of file
diff --git a/soh/assets/extractor/filelists/ntsc_12_oot.txt b/soh/assets/extractor/filelists/ntsc_12_oot.txt
new file mode 100644
index 0000000000..0cf6ab9063
--- /dev/null
+++ b/soh/assets/extractor/filelists/ntsc_12_oot.txt
@@ -0,0 +1,1510 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+kanji
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_jpn_static
+icon_item_nes_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+message_texture_static
+nes_font_static
+jpn_message_data_static
+nes_message_data_static
+staff_message_data_static
+map_grand_static
+map_i_static
+map_48x85_static
+code
+n64dd
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_En_GirlA
+ovl_En_Part
+ovl_En_Light
+ovl_En_Door
+ovl_En_Box
+ovl_En_Poh
+ovl_En_Okuta
+ovl_En_Bom
+ovl_En_Wallmas
+ovl_En_Dodongo
+ovl_En_Firefly
+ovl_En_Horse
+ovl_En_Arrow
+ovl_En_Elf
+ovl_En_Niw
+ovl_En_Tite
+ovl_En_Reeba
+ovl_En_Peehat
+ovl_En_Holl
+ovl_En_Scene_Change
+ovl_En_Zf
+ovl_En_Hata
+ovl_Boss_Dodongo
+ovl_Boss_Goma
+ovl_En_Zl1
+ovl_En_Viewer
+ovl_En_Goma
+ovl_Bg_Pushbox
+ovl_En_Bubble
+ovl_Door_Shutter
+ovl_En_Dodojr
+ovl_En_Bdfire
+ovl_En_Boom
+ovl_En_Torch2
+ovl_En_Bili
+ovl_En_Tp
+ovl_En_St
+ovl_En_Bw
+ovl_En_Eiyer
+ovl_En_River_Sound
+ovl_En_Horse_Normal
+ovl_En_Ossan
+ovl_Bg_Treemouth
+ovl_Bg_Dodoago
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Hrock
+ovl_En_Horse_Ganon
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_En_Xc
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Spot00_Hanebasi
+ovl_En_Mb
+ovl_En_Bombf
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Dy_Yoseizo
+ovl_En_Zl2
+ovl_Bg_Hidan_Fslift
+ovl_En_OE2
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Boss_Ganondrof
+ovl_En_Am
+ovl_En_Dekubaba
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_Bg_Ddan_Jd
+ovl_Bg_Breakwall
+ovl_En_Jj
+ovl_En_Horse_Zelda
+ovl_Bg_Ddan_Kd
+ovl_Door_Warp1
+ovl_Obj_Syokudai
+ovl_Item_B_Heart
+ovl_En_Dekunuts
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Eye
+ovl_En_Vali
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Water
+ovl_Arms_Hook
+ovl_En_fHG
+ovl_Bg_Mori_Hineri
+ovl_En_Bb
+ovl_Bg_Toki_Hikari
+ovl_En_Yukabyun
+ovl_Bg_Toki_Swd
+ovl_En_Fhg_Fire
+ovl_Bg_Mjin
+ovl_Bg_Hidan_Kousi
+ovl_Door_Toki
+ovl_Bg_Hidan_Hamstep
+ovl_En_Bird
+ovl_En_Wood02
+ovl_En_Lightbox
+ovl_En_Pu_box
+ovl_En_Trap
+ovl_En_Arow_Trap
+ovl_En_Vase
+ovl_En_Ta
+ovl_En_Tk
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_En_Vm
+ovl_Demo_Effect
+ovl_Demo_Kankyo
+ovl_Bg_Hidan_Fwbig
+ovl_En_Floormas
+ovl_En_Heishi1
+ovl_En_Rd
+ovl_En_Po_Sisters
+ovl_Bg_Heavy_Block
+ovl_Bg_Po_Event
+ovl_Obj_Mure
+ovl_En_Sw
+ovl_Boss_Fd
+ovl_Object_Kankyo
+ovl_En_Du
+ovl_En_Fd
+ovl_En_Horse_Link_Child
+ovl_Door_Ana
+ovl_Bg_Spot02_Objects
+ovl_Bg_Haka
+ovl_Magic_Wind
+ovl_Magic_Fire
+ovl_En_Ru1
+ovl_Boss_Fd2
+ovl_En_Fd_Fire
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Rl
+ovl_En_Encount1
+ovl_Demo_Du
+ovl_Demo_Im
+ovl_Demo_Tre_Lgt
+ovl_En_Fw
+ovl_Bg_Vb_Sima
+ovl_En_Vb_Ball
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Sgami
+ovl_En_Heishi2
+ovl_En_Encount2
+ovl_En_Fire_Rock
+ovl_En_Brob
+ovl_Mir_Ray
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot18_Obj
+ovl_Boss_Va
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Zou
+ovl_Bg_Spot17_Funen
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Tana
+ovl_En_Nb
+ovl_Boss_Mo
+ovl_En_Sb
+ovl_En_Bigokuta
+ovl_En_Karebaba
+ovl_Bg_Bdan_Objects
+ovl_Demo_Sa
+ovl_Demo_Go
+ovl_En_In
+ovl_En_Tr
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Bombwall
+ovl_En_Ru2
+ovl_Obj_Dekujr
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Spot06_Objects
+ovl_Bg_Ice_Objects
+ovl_Bg_Haka_Water
+ovl_En_Ma2
+ovl_En_Bom_Chu
+ovl_En_Horse_Game_Check
+ovl_Boss_Tw
+ovl_En_Rr
+ovl_En_Ba
+ovl_En_Bx
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Bdan_Switch
+ovl_En_Ma1
+ovl_Boss_Ganon
+ovl_Boss_Sst
+ovl_En_Ny
+ovl_En_Fr
+ovl_Item_Shield
+ovl_Bg_Ice_Shelter
+ovl_En_Ice_Hono
+ovl_Item_Ocarina
+ovl_Magic_Dark
+ovl_Demo_6K
+ovl_En_Anubice_Tag
+ovl_Bg_Haka_Gate
+ovl_Bg_Spot15_Saku
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Kanaami
+ovl_Fishing
+ovl_Obj_Oshihiki
+ovl_Bg_Gate_Shutter
+ovl_Eff_Dust
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Po_Syokudai
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Umajump
+ovl_En_Insect
+ovl_En_Butte
+ovl_En_Fish
+ovl_Bg_Spot08_Iceblock
+ovl_Item_Etcetera
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Obj_Kibako
+ovl_Obj_Tsubo
+ovl_En_Wonder_Item
+ovl_En_Ik
+ovl_Demo_Ik
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_G_Switch
+ovl_Demo_Ext
+ovl_Demo_Shd
+ovl_En_Dns
+ovl_Elf_Msg
+ovl_En_Honotrap
+ovl_En_Tubo_Trap
+ovl_Obj_Ice_Poly
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot07_Taki
+ovl_En_Fz
+ovl_En_Po_Relay
+ovl_Bg_Relay_Objects
+ovl_En_Diving_Game
+ovl_En_Kusa
+ovl_Obj_Bean
+ovl_Obj_Bombiwa
+ovl_Obj_Switch
+ovl_Obj_Elevator
+ovl_Obj_Lift
+ovl_Obj_Hsblock
+ovl_En_Okarina_Tag
+ovl_En_Yabusame_Mark
+ovl_En_Goroiwa
+ovl_En_Ex_Ruppy
+ovl_En_Toryo
+ovl_En_Daiku
+ovl_En_Nwc
+ovl_En_Blkobj
+ovl_Item_Inbox
+ovl_En_Ge1
+ovl_Obj_Blockstop
+ovl_En_Sda
+ovl_En_Clear_Tag
+ovl_En_Niw_Lady
+ovl_En_Gm
+ovl_En_Ms
+ovl_En_Hs
+ovl_Bg_Ingate
+ovl_En_Kanban
+ovl_En_Heishi3
+ovl_En_Syateki_Niw
+ovl_En_Attack_Niw
+ovl_Bg_Spot01_Idosoko
+ovl_En_Sa
+ovl_En_Wonder_Talk
+ovl_Bg_Gjyo_Bridge
+ovl_En_Ds
+ovl_En_Mk
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Owl
+ovl_En_Ishi
+ovl_Obj_Hana
+ovl_Obj_Lightswitch
+ovl_Obj_Mure2
+ovl_En_Go
+ovl_En_Fu
+ovl_En_Changer
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Spot18_Basket
+ovl_En_Ganon_Organ
+ovl_En_Siofuki
+ovl_En_Stream
+ovl_En_Mm
+ovl_En_Ko
+ovl_En_Kz
+ovl_En_Weather_Tag
+ovl_Bg_Sst_Floor
+ovl_En_Ani
+ovl_En_Ex_Item
+ovl_Bg_Jya_Ironobj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Cs
+ovl_En_Md
+ovl_En_Hy
+ovl_En_Ganon_Mant
+ovl_En_Okarina_Effect
+ovl_En_Mag
+ovl_Door_Gerudo
+ovl_Elf_Msg2
+ovl_Demo_Gt
+ovl_En_Po_Field
+ovl_Efc_Erupc
+ovl_Bg_Zg
+ovl_En_Heishi4
+ovl_En_Zl3
+ovl_Boss_Ganon2
+ovl_En_Kakasi
+ovl_En_Takara_Man
+ovl_Obj_Makeoshihiki
+ovl_Oceff_Spot
+ovl_End_Title
+ovl_En_Torch
+ovl_Demo_Ec
+ovl_Shot_Sun
+ovl_En_Dy_Extra
+ovl_En_Wonder_Talk2
+ovl_En_Ge2
+ovl_Obj_Roomtimer
+ovl_En_Ssh
+ovl_En_Sth
+ovl_Oceff_Wipe
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_Stone1
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Oceff_Storm
+ovl_En_Weiyer
+ovl_Bg_Spot05_Soko
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_En_Hintnuts
+ovl_En_Nutsball
+ovl_Bg_Spot00_Break
+ovl_En_Shopnuts
+ovl_En_It
+ovl_En_GeldB
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_En_Niw_Girl
+ovl_En_Dog
+ovl_En_Si
+ovl_Bg_Spot01_Objects2
+ovl_Obj_Comb
+ovl_Bg_Spot11_Bakudankabe
+ovl_Obj_Kibako2
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Guest
+ovl_Bg_Bom_Guard
+ovl_En_Hs2
+ovl_Demo_Kekkai
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot17_Bakudankabe
+ovl_Obj_Mure3
+ovl_En_Tg
+ovl_En_Mu
+ovl_En_Go2
+ovl_En_Wf
+ovl_En_Skb
+ovl_Demo_Gj
+ovl_Demo_Geff
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Ydan_Sp
+ovl_En_Gb
+ovl_En_Gs
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Shutter
+ovl_En_Daiku_Kakariko
+ovl_Bg_Bowl_Wall
+ovl_En_Wall_Tubo
+ovl_En_Po_Desert
+ovl_En_Crow
+ovl_Door_Killer
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Shutter
+ovl_En_Ma3
+ovl_En_Cow
+ovl_Bg_Ice_Turara
+ovl_Bg_Ice_Shutter
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_Oceff_Wipe4
+ovl_En_Eg
+ovl_Bg_Menkuri_Nisekabe
+ovl_En_Zo
+ovl_Effect_Ss_Ice_Smoke
+ovl_Obj_Makekinsuta
+ovl_En_Ge3
+ovl_Obj_Timeblock
+ovl_Obj_Hamishi
+ovl_En_Zl4
+ovl_En_Mm2
+ovl_Bg_Jya_Block
+ovl_Obj_Warp2block
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
diff --git a/soh/assets/extractor/filelists/ntsc_oot.txt b/soh/assets/extractor/filelists/ntsc_oot.txt
new file mode 100644
index 0000000000..21cebcbf2e
--- /dev/null
+++ b/soh/assets/extractor/filelists/ntsc_oot.txt
@@ -0,0 +1,1510 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+kanji
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_jpn_static
+icon_item_nes_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+jpn_message_data_static
+message_texture_static
+nes_font_static
+nes_message_data_static
+staff_message_data_static
+map_grand_static
+map_i_static
+map_48x85_static
+code
+n64dd
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_En_GirlA
+ovl_En_Part
+ovl_En_Light
+ovl_En_Door
+ovl_En_Box
+ovl_En_Poh
+ovl_En_Okuta
+ovl_En_Bom
+ovl_En_Wallmas
+ovl_En_Dodongo
+ovl_En_Firefly
+ovl_En_Horse
+ovl_En_Arrow
+ovl_En_Elf
+ovl_En_Niw
+ovl_En_Tite
+ovl_En_Reeba
+ovl_En_Peehat
+ovl_En_Holl
+ovl_En_Scene_Change
+ovl_En_Zf
+ovl_En_Hata
+ovl_Boss_Dodongo
+ovl_Boss_Goma
+ovl_En_Zl1
+ovl_En_Viewer
+ovl_En_Goma
+ovl_Bg_Pushbox
+ovl_En_Bubble
+ovl_Door_Shutter
+ovl_En_Dodojr
+ovl_En_Bdfire
+ovl_En_Boom
+ovl_En_Torch2
+ovl_En_Bili
+ovl_En_Tp
+ovl_En_St
+ovl_En_Bw
+ovl_En_Eiyer
+ovl_En_River_Sound
+ovl_En_Horse_Normal
+ovl_En_Ossan
+ovl_Bg_Treemouth
+ovl_Bg_Dodoago
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Hrock
+ovl_En_Horse_Ganon
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_En_Xc
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Spot00_Hanebasi
+ovl_En_Mb
+ovl_En_Bombf
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Dy_Yoseizo
+ovl_En_Zl2
+ovl_Bg_Hidan_Fslift
+ovl_En_OE2
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Boss_Ganondrof
+ovl_En_Am
+ovl_En_Dekubaba
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_Bg_Ddan_Jd
+ovl_Bg_Breakwall
+ovl_En_Jj
+ovl_En_Horse_Zelda
+ovl_Bg_Ddan_Kd
+ovl_Door_Warp1
+ovl_Obj_Syokudai
+ovl_Item_B_Heart
+ovl_En_Dekunuts
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Eye
+ovl_En_Vali
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Water
+ovl_Arms_Hook
+ovl_En_fHG
+ovl_Bg_Mori_Hineri
+ovl_En_Bb
+ovl_Bg_Toki_Hikari
+ovl_En_Yukabyun
+ovl_Bg_Toki_Swd
+ovl_En_Fhg_Fire
+ovl_Bg_Mjin
+ovl_Bg_Hidan_Kousi
+ovl_Door_Toki
+ovl_Bg_Hidan_Hamstep
+ovl_En_Bird
+ovl_En_Wood02
+ovl_En_Lightbox
+ovl_En_Pu_box
+ovl_En_Trap
+ovl_En_Arow_Trap
+ovl_En_Vase
+ovl_En_Ta
+ovl_En_Tk
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_En_Vm
+ovl_Demo_Effect
+ovl_Demo_Kankyo
+ovl_Bg_Hidan_Fwbig
+ovl_En_Floormas
+ovl_En_Heishi1
+ovl_En_Rd
+ovl_En_Po_Sisters
+ovl_Bg_Heavy_Block
+ovl_Bg_Po_Event
+ovl_Obj_Mure
+ovl_En_Sw
+ovl_Boss_Fd
+ovl_Object_Kankyo
+ovl_En_Du
+ovl_En_Fd
+ovl_En_Horse_Link_Child
+ovl_Door_Ana
+ovl_Bg_Spot02_Objects
+ovl_Bg_Haka
+ovl_Magic_Wind
+ovl_Magic_Fire
+ovl_En_Ru1
+ovl_Boss_Fd2
+ovl_En_Fd_Fire
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Rl
+ovl_En_Encount1
+ovl_Demo_Du
+ovl_Demo_Im
+ovl_Demo_Tre_Lgt
+ovl_En_Fw
+ovl_Bg_Vb_Sima
+ovl_En_Vb_Ball
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Sgami
+ovl_En_Heishi2
+ovl_En_Encount2
+ovl_En_Fire_Rock
+ovl_En_Brob
+ovl_Mir_Ray
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot18_Obj
+ovl_Boss_Va
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Zou
+ovl_Bg_Spot17_Funen
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Tana
+ovl_En_Nb
+ovl_Boss_Mo
+ovl_En_Sb
+ovl_En_Bigokuta
+ovl_En_Karebaba
+ovl_Bg_Bdan_Objects
+ovl_Demo_Sa
+ovl_Demo_Go
+ovl_En_In
+ovl_En_Tr
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Bombwall
+ovl_En_Ru2
+ovl_Obj_Dekujr
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Spot06_Objects
+ovl_Bg_Ice_Objects
+ovl_Bg_Haka_Water
+ovl_En_Ma2
+ovl_En_Bom_Chu
+ovl_En_Horse_Game_Check
+ovl_Boss_Tw
+ovl_En_Rr
+ovl_En_Ba
+ovl_En_Bx
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Bdan_Switch
+ovl_En_Ma1
+ovl_Boss_Ganon
+ovl_Boss_Sst
+ovl_En_Ny
+ovl_En_Fr
+ovl_Item_Shield
+ovl_Bg_Ice_Shelter
+ovl_En_Ice_Hono
+ovl_Item_Ocarina
+ovl_Magic_Dark
+ovl_Demo_6K
+ovl_En_Anubice_Tag
+ovl_Bg_Haka_Gate
+ovl_Bg_Spot15_Saku
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Kanaami
+ovl_Fishing
+ovl_Obj_Oshihiki
+ovl_Bg_Gate_Shutter
+ovl_Eff_Dust
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Po_Syokudai
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Umajump
+ovl_En_Insect
+ovl_En_Butte
+ovl_En_Fish
+ovl_Bg_Spot08_Iceblock
+ovl_Item_Etcetera
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Obj_Kibako
+ovl_Obj_Tsubo
+ovl_En_Wonder_Item
+ovl_En_Ik
+ovl_Demo_Ik
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_G_Switch
+ovl_Demo_Ext
+ovl_Demo_Shd
+ovl_En_Dns
+ovl_Elf_Msg
+ovl_En_Honotrap
+ovl_En_Tubo_Trap
+ovl_Obj_Ice_Poly
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot07_Taki
+ovl_En_Fz
+ovl_En_Po_Relay
+ovl_Bg_Relay_Objects
+ovl_En_Diving_Game
+ovl_En_Kusa
+ovl_Obj_Bean
+ovl_Obj_Bombiwa
+ovl_Obj_Switch
+ovl_Obj_Elevator
+ovl_Obj_Lift
+ovl_Obj_Hsblock
+ovl_En_Okarina_Tag
+ovl_En_Yabusame_Mark
+ovl_En_Goroiwa
+ovl_En_Ex_Ruppy
+ovl_En_Toryo
+ovl_En_Daiku
+ovl_En_Nwc
+ovl_En_Blkobj
+ovl_Item_Inbox
+ovl_En_Ge1
+ovl_Obj_Blockstop
+ovl_En_Sda
+ovl_En_Clear_Tag
+ovl_En_Niw_Lady
+ovl_En_Gm
+ovl_En_Ms
+ovl_En_Hs
+ovl_Bg_Ingate
+ovl_En_Kanban
+ovl_En_Heishi3
+ovl_En_Syateki_Niw
+ovl_En_Attack_Niw
+ovl_Bg_Spot01_Idosoko
+ovl_En_Sa
+ovl_En_Wonder_Talk
+ovl_Bg_Gjyo_Bridge
+ovl_En_Ds
+ovl_En_Mk
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Owl
+ovl_En_Ishi
+ovl_Obj_Hana
+ovl_Obj_Lightswitch
+ovl_Obj_Mure2
+ovl_En_Go
+ovl_En_Fu
+ovl_En_Changer
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Spot18_Basket
+ovl_En_Ganon_Organ
+ovl_En_Siofuki
+ovl_En_Stream
+ovl_En_Mm
+ovl_En_Ko
+ovl_En_Kz
+ovl_En_Weather_Tag
+ovl_Bg_Sst_Floor
+ovl_En_Ani
+ovl_En_Ex_Item
+ovl_Bg_Jya_Ironobj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Cs
+ovl_En_Md
+ovl_En_Hy
+ovl_En_Ganon_Mant
+ovl_En_Okarina_Effect
+ovl_En_Mag
+ovl_Door_Gerudo
+ovl_Elf_Msg2
+ovl_Demo_Gt
+ovl_En_Po_Field
+ovl_Efc_Erupc
+ovl_Bg_Zg
+ovl_En_Heishi4
+ovl_En_Zl3
+ovl_Boss_Ganon2
+ovl_En_Kakasi
+ovl_En_Takara_Man
+ovl_Obj_Makeoshihiki
+ovl_Oceff_Spot
+ovl_End_Title
+ovl_En_Torch
+ovl_Demo_Ec
+ovl_Shot_Sun
+ovl_En_Dy_Extra
+ovl_En_Wonder_Talk2
+ovl_En_Ge2
+ovl_Obj_Roomtimer
+ovl_En_Ssh
+ovl_En_Sth
+ovl_Oceff_Wipe
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_Stone1
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Oceff_Storm
+ovl_En_Weiyer
+ovl_Bg_Spot05_Soko
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_En_Hintnuts
+ovl_En_Nutsball
+ovl_Bg_Spot00_Break
+ovl_En_Shopnuts
+ovl_En_It
+ovl_En_GeldB
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_En_Niw_Girl
+ovl_En_Dog
+ovl_En_Si
+ovl_Bg_Spot01_Objects2
+ovl_Obj_Comb
+ovl_Bg_Spot11_Bakudankabe
+ovl_Obj_Kibako2
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Guest
+ovl_Bg_Bom_Guard
+ovl_En_Hs2
+ovl_Demo_Kekkai
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot17_Bakudankabe
+ovl_Obj_Mure3
+ovl_En_Tg
+ovl_En_Mu
+ovl_En_Go2
+ovl_En_Wf
+ovl_En_Skb
+ovl_Demo_Gj
+ovl_Demo_Geff
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Ydan_Sp
+ovl_En_Gb
+ovl_En_Gs
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Shutter
+ovl_En_Daiku_Kakariko
+ovl_Bg_Bowl_Wall
+ovl_En_Wall_Tubo
+ovl_En_Po_Desert
+ovl_En_Crow
+ovl_Door_Killer
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Shutter
+ovl_En_Ma3
+ovl_En_Cow
+ovl_Bg_Ice_Turara
+ovl_Bg_Ice_Shutter
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_Oceff_Wipe4
+ovl_En_Eg
+ovl_Bg_Menkuri_Nisekabe
+ovl_En_Zo
+ovl_Effect_Ss_Ice_Smoke
+ovl_Obj_Makekinsuta
+ovl_En_Ge3
+ovl_Obj_Timeblock
+ovl_Obj_Hamishi
+ovl_En_Zl4
+ovl_En_Mm2
+ovl_Bg_Jya_Block
+ovl_Obj_Warp2block
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
diff --git a/soh/assets/extractor/filelists/pal_oot.txt b/soh/assets/extractor/filelists/pal_oot.txt
new file mode 100644
index 0000000000..812d3ebdd7
--- /dev/null
+++ b/soh/assets/extractor/filelists/pal_oot.txt
@@ -0,0 +1,1511 @@
+makerom
+boot
+dmadata
+Audiobank
+Audioseq
+Audiotable
+link_animetion
+icon_item_static
+icon_item_24_static
+icon_item_field_static
+icon_item_dungeon_static
+icon_item_gameover_static
+icon_item_nes_static
+icon_item_ger_static
+icon_item_fra_static
+item_name_static
+map_name_static
+do_action_static
+message_static
+message_texture_static
+nes_font_static
+nes_message_data_static
+ger_message_data_static
+fra_message_data_static
+staff_message_data_static
+map_grand_static
+map_i_static
+map_48x85_static
+code
+n64dd
+ovl_title
+ovl_select
+ovl_opening
+ovl_file_choose
+ovl_kaleido_scope
+ovl_player_actor
+ovl_map_mark_data
+ovl_En_Test
+ovl_En_GirlA
+ovl_En_Part
+ovl_En_Light
+ovl_En_Door
+ovl_En_Box
+ovl_En_Poh
+ovl_En_Okuta
+ovl_En_Bom
+ovl_En_Wallmas
+ovl_En_Dodongo
+ovl_En_Firefly
+ovl_En_Horse
+ovl_En_Arrow
+ovl_En_Elf
+ovl_En_Niw
+ovl_En_Tite
+ovl_En_Reeba
+ovl_En_Peehat
+ovl_En_Holl
+ovl_En_Scene_Change
+ovl_En_Zf
+ovl_En_Hata
+ovl_Boss_Dodongo
+ovl_Boss_Goma
+ovl_En_Zl1
+ovl_En_Viewer
+ovl_En_Goma
+ovl_Bg_Pushbox
+ovl_En_Bubble
+ovl_Door_Shutter
+ovl_En_Dodojr
+ovl_En_Bdfire
+ovl_En_Boom
+ovl_En_Torch2
+ovl_En_Bili
+ovl_En_Tp
+ovl_En_St
+ovl_En_Bw
+ovl_En_Eiyer
+ovl_En_River_Sound
+ovl_En_Horse_Normal
+ovl_En_Ossan
+ovl_Bg_Treemouth
+ovl_Bg_Dodoago
+ovl_Bg_Hidan_Dalm
+ovl_Bg_Hidan_Hrock
+ovl_En_Horse_Ganon
+ovl_Bg_Hidan_Rock
+ovl_Bg_Hidan_Rsekizou
+ovl_Bg_Hidan_Sekizou
+ovl_Bg_Hidan_Sima
+ovl_Bg_Hidan_Syoku
+ovl_En_Xc
+ovl_Bg_Hidan_Curtain
+ovl_Bg_Spot00_Hanebasi
+ovl_En_Mb
+ovl_En_Bombf
+ovl_Bg_Hidan_Firewall
+ovl_Bg_Dy_Yoseizo
+ovl_En_Zl2
+ovl_Bg_Hidan_Fslift
+ovl_En_OE2
+ovl_Bg_Ydan_Hasi
+ovl_Bg_Ydan_Maruta
+ovl_Boss_Ganondrof
+ovl_En_Am
+ovl_En_Dekubaba
+ovl_En_M_Fire1
+ovl_En_M_Thunder
+ovl_Bg_Ddan_Jd
+ovl_Bg_Breakwall
+ovl_En_Jj
+ovl_En_Horse_Zelda
+ovl_Bg_Ddan_Kd
+ovl_Door_Warp1
+ovl_Obj_Syokudai
+ovl_Item_B_Heart
+ovl_En_Dekunuts
+ovl_Bg_Menkuri_Kaiten
+ovl_Bg_Menkuri_Eye
+ovl_En_Vali
+ovl_Bg_Mizu_Movebg
+ovl_Bg_Mizu_Water
+ovl_Arms_Hook
+ovl_En_fHG
+ovl_Bg_Mori_Hineri
+ovl_En_Bb
+ovl_Bg_Toki_Hikari
+ovl_En_Yukabyun
+ovl_Bg_Toki_Swd
+ovl_En_Fhg_Fire
+ovl_Bg_Mjin
+ovl_Bg_Hidan_Kousi
+ovl_Door_Toki
+ovl_Bg_Hidan_Hamstep
+ovl_En_Bird
+ovl_En_Wood02
+ovl_En_Lightbox
+ovl_En_Pu_box
+ovl_En_Trap
+ovl_En_Arow_Trap
+ovl_En_Vase
+ovl_En_Ta
+ovl_En_Tk
+ovl_Bg_Mori_Bigst
+ovl_Bg_Mori_Elevator
+ovl_Bg_Mori_Kaitenkabe
+ovl_Bg_Mori_Rakkatenjo
+ovl_En_Vm
+ovl_Demo_Effect
+ovl_Demo_Kankyo
+ovl_Bg_Hidan_Fwbig
+ovl_En_Floormas
+ovl_En_Heishi1
+ovl_En_Rd
+ovl_En_Po_Sisters
+ovl_Bg_Heavy_Block
+ovl_Bg_Po_Event
+ovl_Obj_Mure
+ovl_En_Sw
+ovl_Boss_Fd
+ovl_Object_Kankyo
+ovl_En_Du
+ovl_En_Fd
+ovl_En_Horse_Link_Child
+ovl_Door_Ana
+ovl_Bg_Spot02_Objects
+ovl_Bg_Haka
+ovl_Magic_Wind
+ovl_Magic_Fire
+ovl_En_Ru1
+ovl_Boss_Fd2
+ovl_En_Fd_Fire
+ovl_En_Dh
+ovl_En_Dha
+ovl_En_Rl
+ovl_En_Encount1
+ovl_Demo_Du
+ovl_Demo_Im
+ovl_Demo_Tre_Lgt
+ovl_En_Fw
+ovl_Bg_Vb_Sima
+ovl_En_Vb_Ball
+ovl_Bg_Haka_Megane
+ovl_Bg_Haka_MeganeBG
+ovl_Bg_Haka_Ship
+ovl_Bg_Haka_Sgami
+ovl_En_Heishi2
+ovl_En_Encount2
+ovl_En_Fire_Rock
+ovl_En_Brob
+ovl_Mir_Ray
+ovl_Bg_Spot09_Obj
+ovl_Bg_Spot18_Obj
+ovl_Boss_Va
+ovl_Bg_Haka_Tubo
+ovl_Bg_Haka_Trap
+ovl_Bg_Haka_Huta
+ovl_Bg_Haka_Zou
+ovl_Bg_Spot17_Funen
+ovl_En_Syateki_Itm
+ovl_En_Syateki_Man
+ovl_En_Tana
+ovl_En_Nb
+ovl_Boss_Mo
+ovl_En_Sb
+ovl_En_Bigokuta
+ovl_En_Karebaba
+ovl_Bg_Bdan_Objects
+ovl_Demo_Sa
+ovl_Demo_Go
+ovl_En_In
+ovl_En_Tr
+ovl_Bg_Spot16_Bombstone
+ovl_Bg_Hidan_Kowarerukabe
+ovl_Bg_Bombwall
+ovl_En_Ru2
+ovl_Obj_Dekujr
+ovl_Bg_Mizu_Uzu
+ovl_Bg_Spot06_Objects
+ovl_Bg_Ice_Objects
+ovl_Bg_Haka_Water
+ovl_En_Ma2
+ovl_En_Bom_Chu
+ovl_En_Horse_Game_Check
+ovl_Boss_Tw
+ovl_En_Rr
+ovl_En_Ba
+ovl_En_Bx
+ovl_En_Anubice
+ovl_En_Anubice_Fire
+ovl_Bg_Mori_Hashigo
+ovl_Bg_Mori_Hashira4
+ovl_Bg_Mori_Idomizu
+ovl_Bg_Spot16_Doughnut
+ovl_Bg_Bdan_Switch
+ovl_En_Ma1
+ovl_Boss_Ganon
+ovl_Boss_Sst
+ovl_En_Ny
+ovl_En_Fr
+ovl_Item_Shield
+ovl_Bg_Ice_Shelter
+ovl_En_Ice_Hono
+ovl_Item_Ocarina
+ovl_Magic_Dark
+ovl_Demo_6K
+ovl_En_Anubice_Tag
+ovl_Bg_Haka_Gate
+ovl_Bg_Spot15_Saku
+ovl_Bg_Jya_Goroiwa
+ovl_Bg_Jya_Zurerukabe
+ovl_Bg_Jya_Cobra
+ovl_Bg_Jya_Kanaami
+ovl_Fishing
+ovl_Obj_Oshihiki
+ovl_Bg_Gate_Shutter
+ovl_Eff_Dust
+ovl_Bg_Spot01_Fusya
+ovl_Bg_Spot01_Idohashira
+ovl_Bg_Spot01_Idomizu
+ovl_Bg_Po_Syokudai
+ovl_Bg_Ganon_Otyuka
+ovl_Bg_Spot15_Rrbox
+ovl_Bg_Umajump
+ovl_En_Insect
+ovl_En_Butte
+ovl_En_Fish
+ovl_Bg_Spot08_Iceblock
+ovl_Item_Etcetera
+ovl_Arrow_Fire
+ovl_Arrow_Ice
+ovl_Arrow_Light
+ovl_Obj_Kibako
+ovl_Obj_Tsubo
+ovl_En_Wonder_Item
+ovl_En_Ik
+ovl_Demo_Ik
+ovl_En_Skj
+ovl_En_Skjneedle
+ovl_En_G_Switch
+ovl_Demo_Ext
+ovl_Demo_Shd
+ovl_En_Dns
+ovl_Elf_Msg
+ovl_En_Honotrap
+ovl_En_Tubo_Trap
+ovl_Obj_Ice_Poly
+ovl_Bg_Spot03_Taki
+ovl_Bg_Spot07_Taki
+ovl_En_Fz
+ovl_En_Po_Relay
+ovl_Bg_Relay_Objects
+ovl_En_Diving_Game
+ovl_En_Kusa
+ovl_Obj_Bean
+ovl_Obj_Bombiwa
+ovl_Obj_Switch
+ovl_Obj_Elevator
+ovl_Obj_Lift
+ovl_Obj_Hsblock
+ovl_En_Okarina_Tag
+ovl_En_Yabusame_Mark
+ovl_En_Goroiwa
+ovl_En_Ex_Ruppy
+ovl_En_Toryo
+ovl_En_Daiku
+ovl_En_Nwc
+ovl_En_Blkobj
+ovl_Item_Inbox
+ovl_En_Ge1
+ovl_Obj_Blockstop
+ovl_En_Sda
+ovl_En_Clear_Tag
+ovl_En_Niw_Lady
+ovl_En_Gm
+ovl_En_Ms
+ovl_En_Hs
+ovl_Bg_Ingate
+ovl_En_Kanban
+ovl_En_Heishi3
+ovl_En_Syateki_Niw
+ovl_En_Attack_Niw
+ovl_Bg_Spot01_Idosoko
+ovl_En_Sa
+ovl_En_Wonder_Talk
+ovl_Bg_Gjyo_Bridge
+ovl_En_Ds
+ovl_En_Mk
+ovl_En_Bom_Bowl_Man
+ovl_En_Bom_Bowl_Pit
+ovl_En_Owl
+ovl_En_Ishi
+ovl_Obj_Hana
+ovl_Obj_Lightswitch
+ovl_Obj_Mure2
+ovl_En_Go
+ovl_En_Fu
+ovl_En_Changer
+ovl_Bg_Jya_Megami
+ovl_Bg_Jya_Lift
+ovl_Bg_Jya_Bigmirror
+ovl_Bg_Jya_Bombchuiwa
+ovl_Bg_Jya_Amishutter
+ovl_Bg_Jya_Bombiwa
+ovl_Bg_Spot18_Basket
+ovl_En_Ganon_Organ
+ovl_En_Siofuki
+ovl_En_Stream
+ovl_En_Mm
+ovl_En_Ko
+ovl_En_Kz
+ovl_En_Weather_Tag
+ovl_Bg_Sst_Floor
+ovl_En_Ani
+ovl_En_Ex_Item
+ovl_Bg_Jya_Ironobj
+ovl_En_Js
+ovl_En_Jsjutan
+ovl_En_Cs
+ovl_En_Md
+ovl_En_Hy
+ovl_En_Ganon_Mant
+ovl_En_Okarina_Effect
+ovl_En_Mag
+ovl_Door_Gerudo
+ovl_Elf_Msg2
+ovl_Demo_Gt
+ovl_En_Po_Field
+ovl_Efc_Erupc
+ovl_Bg_Zg
+ovl_En_Heishi4
+ovl_En_Zl3
+ovl_Boss_Ganon2
+ovl_En_Kakasi
+ovl_En_Takara_Man
+ovl_Obj_Makeoshihiki
+ovl_Oceff_Spot
+ovl_End_Title
+ovl_En_Torch
+ovl_Demo_Ec
+ovl_Shot_Sun
+ovl_En_Dy_Extra
+ovl_En_Wonder_Talk2
+ovl_En_Ge2
+ovl_Obj_Roomtimer
+ovl_En_Ssh
+ovl_En_Sth
+ovl_Oceff_Wipe
+ovl_Effect_Ss_Dust
+ovl_Effect_Ss_KiraKira
+ovl_Effect_Ss_Bomb
+ovl_Effect_Ss_Bomb2
+ovl_Effect_Ss_Blast
+ovl_Effect_Ss_G_Spk
+ovl_Effect_Ss_D_Fire
+ovl_Effect_Ss_Bubble
+ovl_Effect_Ss_G_Ripple
+ovl_Effect_Ss_G_Splash
+ovl_Effect_Ss_G_Magma
+ovl_Effect_Ss_G_Fire
+ovl_Effect_Ss_Lightning
+ovl_Effect_Ss_Dt_Bubble
+ovl_Effect_Ss_Hahen
+ovl_Effect_Ss_Stick
+ovl_Effect_Ss_Sibuki
+ovl_Effect_Ss_Sibuki2
+ovl_Effect_Ss_G_Magma2
+ovl_Effect_Ss_Stone1
+ovl_Effect_Ss_HitMark
+ovl_Effect_Ss_Fhg_Flash
+ovl_Effect_Ss_K_Fire
+ovl_Effect_Ss_Solder_Srch_Ball
+ovl_Effect_Ss_Kakera
+ovl_Effect_Ss_Ice_Piece
+ovl_Effect_Ss_En_Ice
+ovl_Effect_Ss_Fire_Tail
+ovl_Effect_Ss_En_Fire
+ovl_Effect_Ss_Extra
+ovl_Effect_Ss_Fcircle
+ovl_Effect_Ss_Dead_Db
+ovl_Effect_Ss_Dead_Dd
+ovl_Effect_Ss_Dead_Ds
+ovl_Effect_Ss_Dead_Sound
+ovl_Oceff_Storm
+ovl_En_Weiyer
+ovl_Bg_Spot05_Soko
+ovl_Bg_Jya_1flift
+ovl_Bg_Jya_Haheniron
+ovl_Bg_Spot12_Gate
+ovl_Bg_Spot12_Saku
+ovl_En_Hintnuts
+ovl_En_Nutsball
+ovl_Bg_Spot00_Break
+ovl_En_Shopnuts
+ovl_En_It
+ovl_En_GeldB
+ovl_Oceff_Wipe2
+ovl_Oceff_Wipe3
+ovl_En_Niw_Girl
+ovl_En_Dog
+ovl_En_Si
+ovl_Bg_Spot01_Objects2
+ovl_Obj_Comb
+ovl_Bg_Spot11_Bakudankabe
+ovl_Obj_Kibako2
+ovl_En_Dnt_Demo
+ovl_En_Dnt_Jiji
+ovl_En_Dnt_Nomal
+ovl_En_Guest
+ovl_Bg_Bom_Guard
+ovl_En_Hs2
+ovl_Demo_Kekkai
+ovl_Bg_Spot08_Bakudankabe
+ovl_Bg_Spot17_Bakudankabe
+ovl_Obj_Mure3
+ovl_En_Tg
+ovl_En_Mu
+ovl_En_Go2
+ovl_En_Wf
+ovl_En_Skb
+ovl_Demo_Gj
+ovl_Demo_Geff
+ovl_Bg_Gnd_Firemeiro
+ovl_Bg_Gnd_Darkmeiro
+ovl_Bg_Gnd_Soulmeiro
+ovl_Bg_Gnd_Nisekabe
+ovl_Bg_Gnd_Iceblock
+ovl_Bg_Ydan_Sp
+ovl_En_Gb
+ovl_En_Gs
+ovl_Bg_Mizu_Bwall
+ovl_Bg_Mizu_Shutter
+ovl_En_Daiku_Kakariko
+ovl_Bg_Bowl_Wall
+ovl_En_Wall_Tubo
+ovl_En_Po_Desert
+ovl_En_Crow
+ovl_Door_Killer
+ovl_Bg_Spot11_Oasis
+ovl_Bg_Spot18_Futa
+ovl_Bg_Spot18_Shutter
+ovl_En_Ma3
+ovl_En_Cow
+ovl_Bg_Ice_Turara
+ovl_Bg_Ice_Shutter
+ovl_En_Kakasi2
+ovl_En_Kakasi3
+ovl_Oceff_Wipe4
+ovl_En_Eg
+ovl_Bg_Menkuri_Nisekabe
+ovl_En_Zo
+ovl_Effect_Ss_Ice_Smoke
+ovl_Obj_Makekinsuta
+ovl_En_Ge3
+ovl_Obj_Timeblock
+ovl_Obj_Hamishi
+ovl_En_Zl4
+ovl_En_Mm2
+ovl_Bg_Jya_Block
+ovl_Obj_Warp2block
+gameplay_keep
+gameplay_field_keep
+gameplay_dangeon_keep
+gameplay_object_exchange_static
+object_link_boy
+object_link_child
+object_box
+object_human
+object_okuta
+object_poh
+object_wallmaster
+object_dy_obj
+object_firefly
+object_dodongo
+object_fire
+object_niw
+object_tite
+object_reeba
+object_peehat
+object_kingdodongo
+object_horse
+object_zf
+object_goma
+object_zl1
+object_gol
+object_bubble
+object_dodojr
+object_torch2
+object_bl
+object_tp
+object_oA1
+object_st
+object_bw
+object_ei
+object_horse_normal
+object_oB1
+object_o_anime
+object_spot04_objects
+object_ddan_objects
+object_hidan_objects
+object_horse_ganon
+object_oA2
+object_spot00_objects
+object_mb
+object_bombf
+object_sk2
+object_oE1
+object_oE_anime
+object_oE2
+object_ydan_objects
+object_gnd
+object_am
+object_dekubaba
+object_oA3
+object_oA4
+object_oA5
+object_oA6
+object_oA7
+object_jj
+object_oA8
+object_oA9
+object_oB2
+object_oB3
+object_oB4
+object_horse_zelda
+object_opening_demo1
+object_warp1
+object_b_heart
+object_dekunuts
+object_oE3
+object_oE4
+object_menkuri_objects
+object_oE5
+object_oE6
+object_oE7
+object_oE8
+object_oE9
+object_oE10
+object_oE11
+object_oE12
+object_vali
+object_oA10
+object_oA11
+object_mizu_objects
+object_fhg
+object_ossan
+object_mori_hineri1
+object_Bb
+object_toki_objects
+object_yukabyun
+object_zl2
+object_mjin
+object_mjin_flash
+object_mjin_dark
+object_mjin_flame
+object_mjin_ice
+object_mjin_soul
+object_mjin_wind
+object_mjin_oka
+object_haka_objects
+object_spot06_objects
+object_ice_objects
+object_relay_objects
+object_mori_hineri1a
+object_mori_hineri2
+object_mori_hineri2a
+object_mori_objects
+object_mori_tex
+object_spot08_obj
+object_warp2
+object_hata
+object_bird
+object_wood02
+object_lightbox
+object_pu_box
+object_trap
+object_vase
+object_im
+object_ta
+object_tk
+object_xc
+object_vm
+object_bv
+object_hakach_objects
+object_efc_crystal_light
+object_efc_fire_ball
+object_efc_flash
+object_efc_lgt_shower
+object_efc_star_field
+object_god_lgt
+object_light_ring
+object_triforce_spot
+object_medal
+object_bdan_objects
+object_sd
+object_rd
+object_po_sisters
+object_heavy_object
+object_gndd
+object_fd
+object_du
+object_fw
+object_horse_link_child
+object_spot02_objects
+object_haka
+object_ru1
+object_syokudai
+object_fd2
+object_dh
+object_rl
+object_efc_tw
+object_demo_tre_lgt
+object_gi_key
+object_mir_ray
+object_brob
+object_gi_jewel
+object_spot09_obj
+object_spot18_obj
+object_bdoor
+object_spot17_obj
+object_shop_dungen
+object_nb
+object_mo
+object_sb
+object_gi_melody
+object_gi_heart
+object_gi_compass
+object_gi_bosskey
+object_gi_medal
+object_gi_nuts
+object_sa
+object_gi_hearts
+object_gi_arrowcase
+object_gi_bombpouch
+object_in
+object_tr
+object_spot16_obj
+object_oE1s
+object_oE4s
+object_os_anime
+object_gi_bottle
+object_gi_stick
+object_gi_map
+object_oF1d_map
+object_ru2
+object_gi_shield_1
+object_dekujr
+object_gi_magicpot
+object_gi_bomb_1
+object_oF1s
+object_ma2
+object_gi_purse
+object_hni
+object_tw
+object_rr
+object_bxa
+object_anubice
+object_gi_gerudo
+object_gi_arrow
+object_gi_bomb_2
+object_gi_egg
+object_gi_scale
+object_gi_shield_2
+object_gi_hookshot
+object_gi_ocarina
+object_gi_milk
+object_ma1
+object_ganon
+object_sst
+object_ny
+object_fr
+object_gi_pachinko
+object_gi_boomerang
+object_gi_bow
+object_gi_glasses
+object_gi_liquid
+object_ani
+object_demo_6k
+object_gi_shield_3
+object_gi_letter
+object_spot15_obj
+object_jya_obj
+object_gi_clothes
+object_gi_bean
+object_gi_fish
+object_gi_saw
+object_gi_hammer
+object_gi_grass
+object_gi_longsword
+object_spot01_objects
+object_md
+object_km1
+object_kw1
+object_zo
+object_kz
+object_umajump
+object_masterkokiri
+object_masterkokirihead
+object_mastergolon
+object_masterzoora
+object_aob
+object_ik
+object_ahg
+object_cne
+object_gi_niwatori
+object_skj
+object_gi_bottle_letter
+object_bji
+object_bba
+object_gi_ocarina_0
+object_ds
+object_ane
+object_boj
+object_spot03_object
+object_spot07_object
+object_fz
+object_bob
+object_ge1
+object_yabusame_point
+object_gi_boots_2
+object_gi_seed
+object_gnd_magic
+object_d_elevator
+object_d_hsblock
+object_d_lift
+object_mamenoki
+object_goroiwa
+object_toryo
+object_daiku
+object_nwc
+object_blkobj
+object_gm
+object_ms
+object_hs
+object_ingate
+object_lightswitch
+object_kusa
+object_tsubo
+object_gi_gloves
+object_gi_coin
+object_kanban
+object_gjyo_objects
+object_owl
+object_mk
+object_fu
+object_gi_ki_tan_mask
+object_gi_redead_mask
+object_gi_skj_mask
+object_gi_rabit_mask
+object_gi_truth_mask
+object_ganon_objects
+object_siofuki
+object_stream
+object_mm
+object_fa
+object_os
+object_gi_eye_lotion
+object_gi_powder
+object_gi_mushroom
+object_gi_ticketstone
+object_gi_brokensword
+object_js
+object_cs
+object_gi_prescription
+object_gi_bracelet
+object_gi_soldout
+object_gi_frog
+object_mag
+object_door_gerudo
+object_gt
+object_efc_erupc
+object_zl2_anime1
+object_zl2_anime2
+object_gi_golonmask
+object_gi_zoramask
+object_gi_gerudomask
+object_ganon2
+object_ka
+object_ts
+object_zg
+object_gi_hoverboots
+object_gi_m_arrow
+object_ds2
+object_ec
+object_fish
+object_gi_sutaru
+object_gi_goddess
+object_ssh
+object_bigokuta
+object_bg
+object_spot05_objects
+object_spot12_obj
+object_bombiwa
+object_hintnuts
+object_rs
+object_spot00_break
+object_gla
+object_shopnuts
+object_geldb
+object_gr
+object_dog
+object_jya_iron
+object_jya_door
+object_spot01_objects2
+object_spot11_obj
+object_kibako2
+object_dns
+object_dnk
+object_gi_fire
+object_gi_insect
+object_gi_butterfly
+object_gi_ghost
+object_gi_soul
+object_bowl
+object_po_field
+object_demo_kekkai
+object_efc_doughnut
+object_gi_dekupouch
+object_ganon_anime1
+object_ganon_anime2
+object_ganon_anime3
+object_gi_rupy
+object_spot01_matoya
+object_spot01_matoyab
+object_po_composer
+object_mu
+object_wf
+object_skb
+object_gj
+object_geff
+object_haka_door
+object_gs
+object_ps
+object_bwall
+object_crow
+object_cow
+object_cob
+object_gi_sword_1
+object_door_killer
+object_ouke_haka
+object_timeblock
+object_zl4
+g_pn_01
+g_pn_02
+g_pn_03
+g_pn_04
+g_pn_05
+g_pn_06
+g_pn_07
+g_pn_08
+g_pn_09
+g_pn_10
+g_pn_11
+g_pn_12
+g_pn_13
+g_pn_14
+g_pn_15
+g_pn_16
+g_pn_17
+g_pn_18
+g_pn_19
+g_pn_20
+g_pn_21
+g_pn_22
+g_pn_23
+g_pn_24
+g_pn_25
+g_pn_26
+g_pn_27
+g_pn_28
+g_pn_29
+g_pn_30
+g_pn_31
+g_pn_32
+g_pn_33
+g_pn_34
+g_pn_35
+g_pn_36
+g_pn_37
+g_pn_38
+g_pn_39
+g_pn_40
+g_pn_41
+g_pn_42
+g_pn_43
+g_pn_44
+g_pn_45
+g_pn_46
+g_pn_47
+g_pn_48
+g_pn_49
+g_pn_50
+g_pn_51
+g_pn_52
+g_pn_53
+g_pn_54
+g_pn_55
+g_pn_56
+g_pn_57
+z_select_static
+nintendo_rogo_static
+title_static
+parameter_static
+vr_fine0_static
+vr_fine0_pal_static
+vr_fine1_static
+vr_fine1_pal_static
+vr_fine2_static
+vr_fine2_pal_static
+vr_fine3_static
+vr_fine3_pal_static
+vr_cloud0_static
+vr_cloud0_pal_static
+vr_cloud1_static
+vr_cloud1_pal_static
+vr_cloud2_static
+vr_cloud2_pal_static
+vr_cloud3_static
+vr_cloud3_pal_static
+vr_holy0_static
+vr_holy0_pal_static
+vr_holy1_static
+vr_holy1_pal_static
+vr_MDVR_static
+vr_MDVR_pal_static
+vr_MNVR_static
+vr_MNVR_pal_static
+vr_RUVR_static
+vr_RUVR_pal_static
+vr_LHVR_static
+vr_LHVR_pal_static
+vr_KHVR_static
+vr_KHVR_pal_static
+vr_K3VR_static
+vr_K3VR_pal_static
+vr_K4VR_static
+vr_K4VR_pal_static
+vr_K5VR_static
+vr_K5VR_pal_static
+vr_SP1a_static
+vr_SP1a_pal_static
+vr_MLVR_static
+vr_MLVR_pal_static
+vr_KKRVR_static
+vr_KKRVR_pal_static
+vr_KR3VR_static
+vr_KR3VR_pal_static
+vr_IPVR_static
+vr_IPVR_pal_static
+vr_KSVR_static
+vr_KSVR_pal_static
+vr_GLVR_static
+vr_GLVR_pal_static
+vr_ZRVR_static
+vr_ZRVR_pal_static
+vr_DGVR_static
+vr_DGVR_pal_static
+vr_ALVR_static
+vr_ALVR_pal_static
+vr_NSVR_static
+vr_NSVR_pal_static
+vr_LBVR_static
+vr_LBVR_pal_static
+vr_TTVR_static
+vr_TTVR_pal_static
+vr_FCVR_static
+vr_FCVR_pal_static
+elf_message_field
+elf_message_ydan
+ddan_scene
+ddan_room_0
+ddan_room_1
+ddan_room_2
+ddan_room_3
+ddan_room_4
+ddan_room_5
+ddan_room_6
+ddan_room_7
+ddan_room_8
+ddan_room_9
+ddan_room_10
+ddan_room_11
+ddan_room_12
+ddan_room_13
+ddan_room_14
+ddan_room_15
+ddan_room_16
+spot00_scene
+spot00_room_0
+spot01_scene
+spot01_room_0
+spot02_scene
+spot02_room_0
+spot02_room_1
+spot03_scene
+spot03_room_0
+spot03_room_1
+spot04_scene
+spot04_room_0
+spot04_room_1
+spot04_room_2
+spot05_scene
+spot05_room_0
+spot06_scene
+spot06_room_0
+spot07_scene
+spot07_room_0
+spot07_room_1
+spot08_scene
+spot08_room_0
+spot09_scene
+spot09_room_0
+spot10_scene
+spot10_room_0
+spot10_room_1
+spot10_room_2
+spot10_room_3
+spot10_room_4
+spot10_room_5
+spot10_room_6
+spot10_room_7
+spot10_room_8
+spot10_room_9
+spot11_scene
+spot11_room_0
+spot12_scene
+spot12_room_0
+spot12_room_1
+spot13_scene
+spot13_room_0
+spot13_room_1
+spot15_scene
+spot15_room_0
+spot16_scene
+spot16_room_0
+spot17_scene
+spot17_room_0
+spot17_room_1
+spot18_scene
+spot18_room_0
+spot18_room_1
+spot18_room_2
+spot18_room_3
+market_day_scene
+market_day_room_0
+market_night_scene
+market_night_room_0
+HIDAN_scene
+HIDAN_room_0
+HIDAN_room_1
+HIDAN_room_2
+HIDAN_room_3
+HIDAN_room_4
+HIDAN_room_5
+HIDAN_room_6
+HIDAN_room_7
+HIDAN_room_8
+HIDAN_room_9
+HIDAN_room_10
+HIDAN_room_11
+HIDAN_room_12
+HIDAN_room_13
+HIDAN_room_14
+HIDAN_room_15
+HIDAN_room_16
+HIDAN_room_17
+HIDAN_room_18
+HIDAN_room_19
+HIDAN_room_20
+HIDAN_room_21
+HIDAN_room_22
+HIDAN_room_23
+HIDAN_room_24
+HIDAN_room_25
+HIDAN_room_26
+Bmori1_scene
+Bmori1_room_0
+Bmori1_room_1
+Bmori1_room_2
+Bmori1_room_3
+Bmori1_room_4
+Bmori1_room_5
+Bmori1_room_6
+Bmori1_room_7
+Bmori1_room_8
+Bmori1_room_9
+Bmori1_room_10
+Bmori1_room_11
+Bmori1_room_12
+Bmori1_room_13
+Bmori1_room_14
+Bmori1_room_15
+Bmori1_room_16
+Bmori1_room_17
+Bmori1_room_18
+Bmori1_room_19
+Bmori1_room_20
+Bmori1_room_21
+Bmori1_room_22
+ydan_scene
+ydan_room_0
+ydan_room_1
+ydan_room_2
+ydan_room_3
+ydan_room_4
+ydan_room_5
+ydan_room_6
+ydan_room_7
+ydan_room_8
+ydan_room_9
+ydan_room_10
+ydan_room_11
+kenjyanoma_scene
+kenjyanoma_room_0
+tokinoma_scene
+tokinoma_room_0
+tokinoma_room_1
+link_home_scene
+link_home_room_0
+kokiri_shop_scene
+kokiri_shop_room_0
+MIZUsin_scene
+MIZUsin_room_0
+MIZUsin_room_1
+MIZUsin_room_2
+MIZUsin_room_3
+MIZUsin_room_4
+MIZUsin_room_5
+MIZUsin_room_6
+MIZUsin_room_7
+MIZUsin_room_8
+MIZUsin_room_9
+MIZUsin_room_10
+MIZUsin_room_11
+MIZUsin_room_12
+MIZUsin_room_13
+MIZUsin_room_14
+MIZUsin_room_15
+MIZUsin_room_16
+MIZUsin_room_17
+MIZUsin_room_18
+MIZUsin_room_19
+MIZUsin_room_20
+MIZUsin_room_21
+MIZUsin_room_22
+kokiri_home_scene
+kokiri_home_room_0
+kakusiana_scene
+kakusiana_room_0
+kakusiana_room_1
+kakusiana_room_2
+kakusiana_room_3
+kakusiana_room_4
+kakusiana_room_5
+kakusiana_room_6
+kakusiana_room_7
+kakusiana_room_8
+kakusiana_room_9
+kakusiana_room_10
+kakusiana_room_11
+kakusiana_room_12
+kakusiana_room_13
+entra_scene
+entra_room_0
+bdan_scene
+bdan_room_0
+bdan_room_1
+bdan_room_2
+bdan_room_3
+bdan_room_4
+bdan_room_5
+bdan_room_6
+bdan_room_7
+bdan_room_8
+bdan_room_9
+bdan_room_10
+bdan_room_11
+bdan_room_12
+bdan_room_13
+bdan_room_14
+bdan_room_15
+HAKAdan_scene
+HAKAdan_room_0
+HAKAdan_room_1
+HAKAdan_room_2
+HAKAdan_room_3
+HAKAdan_room_4
+HAKAdan_room_5
+HAKAdan_room_6
+HAKAdan_room_7
+HAKAdan_room_8
+HAKAdan_room_9
+HAKAdan_room_10
+HAKAdan_room_11
+HAKAdan_room_12
+HAKAdan_room_13
+HAKAdan_room_14
+HAKAdan_room_15
+HAKAdan_room_16
+HAKAdan_room_17
+HAKAdan_room_18
+HAKAdan_room_19
+HAKAdan_room_20
+HAKAdan_room_21
+HAKAdan_room_22
+moribossroom_scene
+moribossroom_room_0
+moribossroom_room_1
+syatekijyou_scene
+syatekijyou_room_0
+men_scene
+men_room_0
+men_room_1
+men_room_2
+men_room_3
+men_room_4
+men_room_5
+men_room_6
+men_room_7
+men_room_8
+men_room_9
+men_room_10
+shop1_scene
+shop1_room_0
+hairal_niwa_scene
+hairal_niwa_room_0
+ganon_tou_scene
+ganon_tou_room_0
+market_alley_scene
+market_alley_room_0
+spot20_scene
+spot20_room_0
+market_ruins_scene
+market_ruins_room_0
+entra_n_scene
+entra_n_room_0
+enrui_scene
+enrui_room_0
+market_alley_n_scene
+market_alley_n_room_0
+hiral_demo_scene
+hiral_demo_room_0
+kokiri_home3_scene
+kokiri_home3_room_0
+jyasinzou_scene
+jyasinzou_room_0
+jyasinzou_room_1
+jyasinzou_room_2
+jyasinzou_room_3
+jyasinzou_room_4
+jyasinzou_room_5
+jyasinzou_room_6
+jyasinzou_room_7
+jyasinzou_room_8
+jyasinzou_room_9
+jyasinzou_room_10
+jyasinzou_room_11
+jyasinzou_room_12
+jyasinzou_room_13
+jyasinzou_room_14
+jyasinzou_room_15
+jyasinzou_room_16
+jyasinzou_room_17
+jyasinzou_room_18
+jyasinzou_room_19
+jyasinzou_room_20
+jyasinzou_room_21
+jyasinzou_room_22
+jyasinzou_room_23
+jyasinzou_room_24
+jyasinzou_room_25
+jyasinzou_room_26
+jyasinzou_room_27
+jyasinzou_room_28
+ice_doukutu_scene
+ice_doukutu_room_0
+ice_doukutu_room_1
+ice_doukutu_room_2
+ice_doukutu_room_3
+ice_doukutu_room_4
+ice_doukutu_room_5
+ice_doukutu_room_6
+ice_doukutu_room_7
+ice_doukutu_room_8
+ice_doukutu_room_9
+ice_doukutu_room_10
+ice_doukutu_room_11
+malon_stable_scene
+malon_stable_room_0
+kakariko_scene
+kakariko_room_0
+bdan_boss_scene
+bdan_boss_room_0
+bdan_boss_room_1
+FIRE_bs_scene
+FIRE_bs_room_0
+FIRE_bs_room_1
+hut_scene
+hut_room_0
+daiyousei_izumi_scene
+daiyousei_izumi_room_0
+hakaana_scene
+hakaana_room_0
+yousei_izumi_tate_scene
+yousei_izumi_tate_room_0
+yousei_izumi_yoko_scene
+yousei_izumi_yoko_room_0
+golon_scene
+golon_room_0
+zoora_scene
+zoora_room_0
+drag_scene
+drag_room_0
+alley_shop_scene
+alley_shop_room_0
+night_shop_scene
+night_shop_room_0
+impa_scene
+impa_room_0
+labo_scene
+labo_room_0
+tent_scene
+tent_room_0
+nakaniwa_scene
+nakaniwa_room_0
+ddan_boss_scene
+ddan_boss_room_0
+ddan_boss_room_1
+ydan_boss_scene
+ydan_boss_room_0
+ydan_boss_room_1
+HAKAdan_bs_scene
+HAKAdan_bs_room_0
+HAKAdan_bs_room_1
+MIZUsin_bs_scene
+MIZUsin_bs_room_0
+MIZUsin_bs_room_1
+ganon_scene
+ganon_room_0
+ganon_room_1
+ganon_room_2
+ganon_room_3
+ganon_room_4
+ganon_room_5
+ganon_room_6
+ganon_room_7
+ganon_room_8
+ganon_room_9
+ganon_boss_scene
+ganon_boss_room_0
+jyasinboss_scene
+jyasinboss_room_0
+jyasinboss_room_1
+jyasinboss_room_2
+jyasinboss_room_3
+kokiri_home4_scene
+kokiri_home4_room_0
+kokiri_home5_scene
+kokiri_home5_room_0
+ganon_final_scene
+ganon_final_room_0
+kakariko3_scene
+kakariko3_room_0
+hakasitarelay_scene
+hakasitarelay_room_0
+hakasitarelay_room_1
+hakasitarelay_room_2
+hakasitarelay_room_3
+hakasitarelay_room_4
+hakasitarelay_room_5
+hakasitarelay_room_6
+shrine_scene
+shrine_room_0
+turibori_scene
+turibori_room_0
+shrine_n_scene
+shrine_n_room_0
+shrine_r_scene
+shrine_r_room_0
+ganontika_scene
+ganontika_room_0
+ganontika_room_1
+ganontika_room_2
+ganontika_room_3
+ganontika_room_4
+ganontika_room_5
+ganontika_room_6
+ganontika_room_7
+ganontika_room_8
+ganontika_room_9
+ganontika_room_10
+ganontika_room_11
+ganontika_room_12
+ganontika_room_13
+ganontika_room_14
+ganontika_room_15
+ganontika_room_16
+ganontika_room_17
+ganontika_room_18
+ganontika_room_19
+hakaana2_scene
+hakaana2_room_0
+gerudoway_scene
+gerudoway_room_0
+gerudoway_room_1
+gerudoway_room_2
+gerudoway_room_3
+gerudoway_room_4
+gerudoway_room_5
+HAKAdanCH_scene
+HAKAdanCH_room_0
+HAKAdanCH_room_1
+HAKAdanCH_room_2
+HAKAdanCH_room_3
+HAKAdanCH_room_4
+HAKAdanCH_room_5
+HAKAdanCH_room_6
+hairal_niwa_n_scene
+hairal_niwa_n_room_0
+bowling_scene
+bowling_room_0
+hakaana_ouke_scene
+hakaana_ouke_room_0
+hakaana_ouke_room_1
+hakaana_ouke_room_2
+hylia_labo_scene
+hylia_labo_room_0
+souko_scene
+souko_room_0
+souko_room_1
+souko_room_2
+miharigoya_scene
+miharigoya_room_0
+mahouya_scene
+mahouya_room_0
+takaraya_scene
+takaraya_room_0
+takaraya_room_1
+takaraya_room_2
+takaraya_room_3
+takaraya_room_4
+takaraya_room_5
+takaraya_room_6
+ganon_sonogo_scene
+ganon_sonogo_room_0
+ganon_sonogo_room_1
+ganon_sonogo_room_2
+ganon_sonogo_room_3
+ganon_sonogo_room_4
+ganon_demo_scene
+ganon_demo_room_0
+face_shop_scene
+face_shop_room_0
+kinsuta_scene
+kinsuta_room_0
+ganontikasonogo_scene
+ganontikasonogo_room_0
+ganontikasonogo_room_1
+bump_texture_static
+anime_model_1_static
+anime_model_2_static
+anime_model_3_static
+anime_model_4_static
+anime_model_5_static
+anime_model_6_static
+anime_texture_1_static
+anime_texture_2_static
+anime_texture_3_static
+anime_texture_4_static
+anime_texture_5_static
+anime_texture_6_static
+softsprite_matrix_static
\ No newline at end of file
diff --git a/soh/assets/extractor/symbols/ActorList_OoTMqDbg.txt b/soh/assets/extractor/symbols/ActorList_OoTMqDbg.txt
new file mode 100644
index 0000000000..a0395eb277
--- /dev/null
+++ b/soh/assets/extractor/symbols/ActorList_OoTMqDbg.txt
@@ -0,0 +1,472 @@
+ACTOR_PLAYER
+ACTOR_UNSET_1
+ACTOR_EN_TEST
+ACTOR_UNSET_3
+ACTOR_EN_GIRLA
+ACTOR_UNSET_5
+ACTOR_UNSET_6
+ACTOR_EN_PART
+ACTOR_EN_LIGHT
+ACTOR_EN_DOOR
+ACTOR_EN_BOX
+ACTOR_BG_DY_YOSEIZO
+ACTOR_BG_HIDAN_FIREWALL
+ACTOR_EN_POH
+ACTOR_EN_OKUTA
+ACTOR_BG_YDAN_SP
+ACTOR_EN_BOM
+ACTOR_EN_WALLMAS
+ACTOR_EN_DODONGO
+ACTOR_EN_FIREFLY
+ACTOR_EN_HORSE
+ACTOR_EN_ITEM00
+ACTOR_EN_ARROW
+ACTOR_UNSET_17
+ACTOR_EN_ELF
+ACTOR_EN_NIW
+ACTOR_UNSET_1A
+ACTOR_EN_TITE
+ACTOR_EN_REEBA
+ACTOR_EN_PEEHAT
+ACTOR_EN_BUTTE
+ACTOR_UNSET_1F
+ACTOR_EN_INSECT
+ACTOR_EN_FISH
+ACTOR_UNSET_22
+ACTOR_EN_HOLL
+ACTOR_EN_SCENE_CHANGE
+ACTOR_EN_ZF
+ACTOR_EN_HATA
+ACTOR_BOSS_DODONGO
+ACTOR_BOSS_GOMA
+ACTOR_EN_ZL1
+ACTOR_EN_VIEWER
+ACTOR_EN_GOMA
+ACTOR_BG_PUSHBOX
+ACTOR_EN_BUBBLE
+ACTOR_DOOR_SHUTTER
+ACTOR_EN_DODOJR
+ACTOR_EN_BDFIRE
+ACTOR_UNSET_31
+ACTOR_EN_BOOM
+ACTOR_EN_TORCH2
+ACTOR_EN_BILI
+ACTOR_EN_TP
+ACTOR_UNSET_36
+ACTOR_EN_ST
+ACTOR_EN_BW
+ACTOR_EN_A_OBJ
+ACTOR_EN_EIYER
+ACTOR_EN_RIVER_SOUND
+ACTOR_EN_HORSE_NORMAL
+ACTOR_EN_OSSAN
+ACTOR_BG_TREEMOUTH
+ACTOR_BG_DODOAGO
+ACTOR_BG_HIDAN_DALM
+ACTOR_BG_HIDAN_HROCK
+ACTOR_EN_HORSE_GANON
+ACTOR_BG_HIDAN_ROCK
+ACTOR_BG_HIDAN_RSEKIZOU
+ACTOR_BG_HIDAN_SEKIZOU
+ACTOR_BG_HIDAN_SIMA
+ACTOR_BG_HIDAN_SYOKU
+ACTOR_EN_XC
+ACTOR_BG_HIDAN_CURTAIN
+ACTOR_BG_SPOT00_HANEBASI
+ACTOR_EN_MB
+ACTOR_EN_BOMBF
+ACTOR_EN_ZL2
+ACTOR_BG_HIDAN_FSLIFT
+ACTOR_EN_OE2
+ACTOR_BG_YDAN_HASI
+ACTOR_BG_YDAN_MARUTA
+ACTOR_BOSS_GANONDROF
+ACTOR_UNSET_53
+ACTOR_EN_AM
+ACTOR_EN_DEKUBABA
+ACTOR_EN_M_FIRE1
+ACTOR_EN_M_THUNDER
+ACTOR_BG_DDAN_JD
+ACTOR_BG_BREAKWALL
+ACTOR_EN_JJ
+ACTOR_EN_HORSE_ZELDA
+ACTOR_BG_DDAN_KD
+ACTOR_DOOR_WARP1
+ACTOR_OBJ_SYOKUDAI
+ACTOR_ITEM_B_HEART
+ACTOR_EN_DEKUNUTS
+ACTOR_BG_MENKURI_KAITEN
+ACTOR_BG_MENKURI_EYE
+ACTOR_EN_VALI
+ACTOR_BG_MIZU_MOVEBG
+ACTOR_BG_MIZU_WATER
+ACTOR_ARMS_HOOK
+ACTOR_EN_FHG
+ACTOR_BG_MORI_HINERI
+ACTOR_EN_BB
+ACTOR_BG_TOKI_HIKARI
+ACTOR_EN_YUKABYUN
+ACTOR_BG_TOKI_SWD
+ACTOR_EN_FHG_FIRE
+ACTOR_BG_MJIN
+ACTOR_BG_HIDAN_KOUSI
+ACTOR_DOOR_TOKI
+ACTOR_BG_HIDAN_HAMSTEP
+ACTOR_EN_BIRD
+ACTOR_UNSET_73
+ACTOR_UNSET_74
+ACTOR_UNSET_75
+ACTOR_UNSET_76
+ACTOR_EN_WOOD02
+ACTOR_UNSET_78
+ACTOR_UNSET_79
+ACTOR_UNSET_7A
+ACTOR_UNSET_7B
+ACTOR_EN_LIGHTBOX
+ACTOR_EN_PU_BOX
+ACTOR_UNSET_7E
+ACTOR_UNSET_7F
+ACTOR_EN_TRAP
+ACTOR_EN_AROW_TRAP
+ACTOR_EN_VASE
+ACTOR_UNSET_83
+ACTOR_EN_TA
+ACTOR_EN_TK
+ACTOR_BG_MORI_BIGST
+ACTOR_BG_MORI_ELEVATOR
+ACTOR_BG_MORI_KAITENKABE
+ACTOR_BG_MORI_RAKKATENJO
+ACTOR_EN_VM
+ACTOR_DEMO_EFFECT
+ACTOR_DEMO_KANKYO
+ACTOR_BG_HIDAN_FWBIG
+ACTOR_EN_FLOORMAS
+ACTOR_EN_HEISHI1
+ACTOR_EN_RD
+ACTOR_EN_PO_SISTERS
+ACTOR_BG_HEAVY_BLOCK
+ACTOR_BG_PO_EVENT
+ACTOR_OBJ_MURE
+ACTOR_EN_SW
+ACTOR_BOSS_FD
+ACTOR_OBJECT_KANKYO
+ACTOR_EN_DU
+ACTOR_EN_FD
+ACTOR_EN_HORSE_LINK_CHILD
+ACTOR_DOOR_ANA
+ACTOR_BG_SPOT02_OBJECTS
+ACTOR_BG_HAKA
+ACTOR_MAGIC_WIND
+ACTOR_MAGIC_FIRE
+ACTOR_UNSET_A0
+ACTOR_EN_RU1
+ACTOR_BOSS_FD2
+ACTOR_EN_FD_FIRE
+ACTOR_EN_DH
+ACTOR_EN_DHA
+ACTOR_EN_RL
+ACTOR_EN_ENCOUNT1
+ACTOR_DEMO_DU
+ACTOR_DEMO_IM
+ACTOR_DEMO_TRE_LGT
+ACTOR_EN_FW
+ACTOR_BG_VB_SIMA
+ACTOR_EN_VB_BALL
+ACTOR_BG_HAKA_MEGANE
+ACTOR_BG_HAKA_MEGANEBG
+ACTOR_BG_HAKA_SHIP
+ACTOR_BG_HAKA_SGAMI
+ACTOR_UNSET_B2
+ACTOR_EN_HEISHI2
+ACTOR_EN_ENCOUNT2
+ACTOR_EN_FIRE_ROCK
+ACTOR_EN_BROB
+ACTOR_MIR_RAY
+ACTOR_BG_SPOT09_OBJ
+ACTOR_BG_SPOT18_OBJ
+ACTOR_BOSS_VA
+ACTOR_BG_HAKA_TUBO
+ACTOR_BG_HAKA_TRAP
+ACTOR_BG_HAKA_HUTA
+ACTOR_BG_HAKA_ZOU
+ACTOR_BG_SPOT17_FUNEN
+ACTOR_EN_SYATEKI_ITM
+ACTOR_EN_SYATEKI_MAN
+ACTOR_EN_TANA
+ACTOR_EN_NB
+ACTOR_BOSS_MO
+ACTOR_EN_SB
+ACTOR_EN_BIGOKUTA
+ACTOR_EN_KAREBABA
+ACTOR_BG_BDAN_OBJECTS
+ACTOR_DEMO_SA
+ACTOR_DEMO_GO
+ACTOR_EN_IN
+ACTOR_EN_TR
+ACTOR_BG_SPOT16_BOMBSTONE
+ACTOR_UNSET_CE
+ACTOR_BG_HIDAN_KOWARERUKABE
+ACTOR_BG_BOMBWALL
+ACTOR_BG_SPOT08_ICEBLOCK
+ACTOR_EN_RU2
+ACTOR_OBJ_DEKUJR
+ACTOR_BG_MIZU_UZU
+ACTOR_BG_SPOT06_OBJECTS
+ACTOR_BG_ICE_OBJECTS
+ACTOR_BG_HAKA_WATER
+ACTOR_UNSET_D8
+ACTOR_EN_MA2
+ACTOR_EN_BOM_CHU
+ACTOR_EN_HORSE_GAME_CHECK
+ACTOR_BOSS_TW
+ACTOR_EN_RR
+ACTOR_EN_BA
+ACTOR_EN_BX
+ACTOR_EN_ANUBICE
+ACTOR_EN_ANUBICE_FIRE
+ACTOR_BG_MORI_HASHIGO
+ACTOR_BG_MORI_HASHIRA4
+ACTOR_BG_MORI_IDOMIZU
+ACTOR_BG_SPOT16_DOUGHNUT
+ACTOR_BG_BDAN_SWITCH
+ACTOR_EN_MA1
+ACTOR_BOSS_GANON
+ACTOR_BOSS_SST
+ACTOR_UNSET_EA
+ACTOR_UNSET_EB
+ACTOR_EN_NY
+ACTOR_EN_FR
+ACTOR_ITEM_SHIELD
+ACTOR_BG_ICE_SHELTER
+ACTOR_EN_ICE_HONO
+ACTOR_ITEM_OCARINA
+ACTOR_UNSET_F2
+ACTOR_UNSET_F3
+ACTOR_MAGIC_DARK
+ACTOR_DEMO_6K
+ACTOR_EN_ANUBICE_TAG
+ACTOR_BG_HAKA_GATE
+ACTOR_BG_SPOT15_SAKU
+ACTOR_BG_JYA_GOROIWA
+ACTOR_BG_JYA_ZURERUKABE
+ACTOR_UNSET_FB
+ACTOR_BG_JYA_COBRA
+ACTOR_BG_JYA_KANAAMI
+ACTOR_FISHING
+ACTOR_OBJ_OSHIHIKI
+ACTOR_BG_GATE_SHUTTER
+ACTOR_EFF_DUST
+ACTOR_BG_SPOT01_FUSYA
+ACTOR_BG_SPOT01_IDOHASHIRA
+ACTOR_BG_SPOT01_IDOMIZU
+ACTOR_BG_PO_SYOKUDAI
+ACTOR_BG_GANON_OTYUKA
+ACTOR_BG_SPOT15_RRBOX
+ACTOR_BG_UMAJUMP
+ACTOR_UNSET_109
+ACTOR_ARROW_FIRE
+ACTOR_ARROW_ICE
+ACTOR_ARROW_LIGHT
+ACTOR_UNSET_10D
+ACTOR_UNSET_10E
+ACTOR_ITEM_ETCETERA
+ACTOR_OBJ_KIBAKO
+ACTOR_OBJ_TSUBO
+ACTOR_EN_WONDER_ITEM
+ACTOR_EN_IK
+ACTOR_DEMO_IK
+ACTOR_EN_SKJ
+ACTOR_EN_SKJNEEDLE
+ACTOR_EN_G_SWITCH
+ACTOR_DEMO_EXT
+ACTOR_DEMO_SHD
+ACTOR_EN_DNS
+ACTOR_ELF_MSG
+ACTOR_EN_HONOTRAP
+ACTOR_EN_TUBO_TRAP
+ACTOR_OBJ_ICE_POLY
+ACTOR_BG_SPOT03_TAKI
+ACTOR_BG_SPOT07_TAKI
+ACTOR_EN_FZ
+ACTOR_EN_PO_RELAY
+ACTOR_BG_RELAY_OBJECTS
+ACTOR_EN_DIVING_GAME
+ACTOR_EN_KUSA
+ACTOR_OBJ_BEAN
+ACTOR_OBJ_BOMBIWA
+ACTOR_UNSET_128
+ACTOR_UNSET_129
+ACTOR_OBJ_SWITCH
+ACTOR_OBJ_ELEVATOR
+ACTOR_OBJ_LIFT
+ACTOR_OBJ_HSBLOCK
+ACTOR_EN_OKARINA_TAG
+ACTOR_EN_YABUSAME_MARK
+ACTOR_EN_GOROIWA
+ACTOR_EN_EX_RUPPY
+ACTOR_EN_TORYO
+ACTOR_EN_DAIKU
+ACTOR_UNSET_134
+ACTOR_EN_NWC
+ACTOR_EN_BLKOBJ
+ACTOR_ITEM_INBOX
+ACTOR_EN_GE1
+ACTOR_OBJ_BLOCKSTOP
+ACTOR_EN_SDA
+ACTOR_EN_CLEAR_TAG
+ACTOR_EN_NIW_LADY
+ACTOR_EN_GM
+ACTOR_EN_MS
+ACTOR_EN_HS
+ACTOR_BG_INGATE
+ACTOR_EN_KANBAN
+ACTOR_EN_HEISHI3
+ACTOR_EN_SYATEKI_NIW
+ACTOR_EN_ATTACK_NIW
+ACTOR_BG_SPOT01_IDOSOKO
+ACTOR_EN_SA
+ACTOR_EN_WONDER_TALK
+ACTOR_BG_GJYO_BRIDGE
+ACTOR_EN_DS
+ACTOR_EN_MK
+ACTOR_EN_BOM_BOWL_MAN
+ACTOR_EN_BOM_BOWL_PIT
+ACTOR_EN_OWL
+ACTOR_EN_ISHI
+ACTOR_OBJ_HANA
+ACTOR_OBJ_LIGHTSWITCH
+ACTOR_OBJ_MURE2
+ACTOR_EN_GO
+ACTOR_EN_FU
+ACTOR_UNSET_154
+ACTOR_EN_CHANGER
+ACTOR_BG_JYA_MEGAMI
+ACTOR_BG_JYA_LIFT
+ACTOR_BG_JYA_BIGMIRROR
+ACTOR_BG_JYA_BOMBCHUIWA
+ACTOR_BG_JYA_AMISHUTTER
+ACTOR_BG_JYA_BOMBIWA
+ACTOR_BG_SPOT18_BASKET
+ACTOR_UNSET_15D
+ACTOR_EN_GANON_ORGAN
+ACTOR_EN_SIOFUKI
+ACTOR_EN_STREAM
+ACTOR_UNSET_161
+ACTOR_EN_MM
+ACTOR_EN_KO
+ACTOR_EN_KZ
+ACTOR_EN_WEATHER_TAG
+ACTOR_BG_SST_FLOOR
+ACTOR_EN_ANI
+ACTOR_EN_EX_ITEM
+ACTOR_BG_JYA_IRONOBJ
+ACTOR_EN_JS
+ACTOR_EN_JSJUTAN
+ACTOR_EN_CS
+ACTOR_EN_MD
+ACTOR_EN_HY
+ACTOR_EN_GANON_MANT
+ACTOR_EN_OKARINA_EFFECT
+ACTOR_EN_MAG
+ACTOR_DOOR_GERUDO
+ACTOR_ELF_MSG2
+ACTOR_DEMO_GT
+ACTOR_EN_PO_FIELD
+ACTOR_EFC_ERUPC
+ACTOR_BG_ZG
+ACTOR_EN_HEISHI4
+ACTOR_EN_ZL3
+ACTOR_BOSS_GANON2
+ACTOR_EN_KAKASI
+ACTOR_EN_TAKARA_MAN
+ACTOR_OBJ_MAKEOSHIHIKI
+ACTOR_OCEFF_SPOT
+ACTOR_END_TITLE
+ACTOR_UNSET_180
+ACTOR_EN_TORCH
+ACTOR_DEMO_EC
+ACTOR_SHOT_SUN
+ACTOR_EN_DY_EXTRA
+ACTOR_EN_WONDER_TALK2
+ACTOR_EN_GE2
+ACTOR_OBJ_ROOMTIMER
+ACTOR_EN_SSH
+ACTOR_EN_STH
+ACTOR_OCEFF_WIPE
+ACTOR_OCEFF_STORM
+ACTOR_EN_WEIYER
+ACTOR_BG_SPOT05_SOKO
+ACTOR_BG_JYA_1FLIFT
+ACTOR_BG_JYA_HAHENIRON
+ACTOR_BG_SPOT12_GATE
+ACTOR_BG_SPOT12_SAKU
+ACTOR_EN_HINTNUTS
+ACTOR_EN_NUTSBALL
+ACTOR_BG_SPOT00_BREAK
+ACTOR_EN_SHOPNUTS
+ACTOR_EN_IT
+ACTOR_EN_GELDB
+ACTOR_OCEFF_WIPE2
+ACTOR_OCEFF_WIPE3
+ACTOR_EN_NIW_GIRL
+ACTOR_EN_DOG
+ACTOR_EN_SI
+ACTOR_BG_SPOT01_OBJECTS2
+ACTOR_OBJ_COMB
+ACTOR_BG_SPOT11_BAKUDANKABE
+ACTOR_OBJ_KIBAKO2
+ACTOR_EN_DNT_DEMO
+ACTOR_EN_DNT_JIJI
+ACTOR_EN_DNT_NOMAL
+ACTOR_EN_GUEST
+ACTOR_BG_BOM_GUARD
+ACTOR_EN_HS2
+ACTOR_DEMO_KEKKAI
+ACTOR_BG_SPOT08_BAKUDANKABE
+ACTOR_BG_SPOT17_BAKUDANKABE
+ACTOR_UNSET_1AA
+ACTOR_OBJ_MURE3
+ACTOR_EN_TG
+ACTOR_EN_MU
+ACTOR_EN_GO2
+ACTOR_EN_WF
+ACTOR_EN_SKB
+ACTOR_DEMO_GJ
+ACTOR_DEMO_GEFF
+ACTOR_BG_GND_FIREMEIRO
+ACTOR_BG_GND_DARKMEIRO
+ACTOR_BG_GND_SOULMEIRO
+ACTOR_BG_GND_NISEKABE
+ACTOR_BG_GND_ICEBLOCK
+ACTOR_EN_GB
+ACTOR_EN_GS
+ACTOR_BG_MIZU_BWALL
+ACTOR_BG_MIZU_SHUTTER
+ACTOR_EN_DAIKU_KAKARIKO
+ACTOR_BG_BOWL_WALL
+ACTOR_EN_WALL_TUBO
+ACTOR_EN_PO_DESERT
+ACTOR_EN_CROW
+ACTOR_DOOR_KILLER
+ACTOR_BG_SPOT11_OASIS
+ACTOR_BG_SPOT18_FUTA
+ACTOR_BG_SPOT18_SHUTTER
+ACTOR_EN_MA3
+ACTOR_EN_COW
+ACTOR_BG_ICE_TURARA
+ACTOR_BG_ICE_SHUTTER
+ACTOR_EN_KAKASI2
+ACTOR_EN_KAKASI3
+ACTOR_OCEFF_WIPE4
+ACTOR_EN_EG
+ACTOR_BG_MENKURI_NISEKABE
+ACTOR_EN_ZO
+ACTOR_OBJ_MAKEKINSUTA
+ACTOR_EN_GE3
+ACTOR_OBJ_TIMEBLOCK
+ACTOR_OBJ_HAMISHI
+ACTOR_EN_ZL4
+ACTOR_EN_MM2
+ACTOR_BG_JYA_BLOCK
+ACTOR_OBJ_WARP2BLOCK
+ACTOR_ID_MAX
\ No newline at end of file
diff --git a/soh/assets/extractor/symbols/ObjectList_OoTMqDbg.txt b/soh/assets/extractor/symbols/ObjectList_OoTMqDbg.txt
new file mode 100644
index 0000000000..1ecc3441bb
--- /dev/null
+++ b/soh/assets/extractor/symbols/ObjectList_OoTMqDbg.txt
@@ -0,0 +1,402 @@
+OBJECT_INVALID
+OBJECT_GAMEPLAY_KEEP
+OBJECT_GAMEPLAY_FIELD_KEEP
+OBJECT_GAMEPLAY_DANGEON_KEEP
+OBJECT_UNSET_4
+OBJECT_UNSET_5
+OBJECT_HUMAN
+OBJECT_OKUTA
+OBJECT_CROW
+OBJECT_POH
+OBJECT_DY_OBJ
+OBJECT_WALLMASTER
+OBJECT_DODONGO
+OBJECT_FIREFLY
+OBJECT_BOX
+OBJECT_FIRE
+OBJECT_UNSET_10
+OBJECT_UNSET_11
+OBJECT_BUBBLE
+OBJECT_NIW
+OBJECT_LINK_BOY
+OBJECT_LINK_CHILD
+OBJECT_TITE
+OBJECT_REEBA
+OBJECT_PEEHAT
+OBJECT_KINGDODONGO
+OBJECT_HORSE
+OBJECT_ZF
+OBJECT_GOMA
+OBJECT_ZL1
+OBJECT_GOL
+OBJECT_DODOJR
+OBJECT_TORCH2
+OBJECT_BL
+OBJECT_TP
+OBJECT_OA1
+OBJECT_ST
+OBJECT_BW
+OBJECT_EI
+OBJECT_HORSE_NORMAL
+OBJECT_OB1
+OBJECT_O_ANIME
+OBJECT_SPOT04_OBJECTS
+OBJECT_DDAN_OBJECTS
+OBJECT_HIDAN_OBJECTS
+OBJECT_HORSE_GANON
+OBJECT_OA2
+OBJECT_SPOT00_OBJECTS
+OBJECT_MB
+OBJECT_BOMBF
+OBJECT_SK2
+OBJECT_OE1
+OBJECT_OE_ANIME
+OBJECT_OE2
+OBJECT_YDAN_OBJECTS
+OBJECT_GND
+OBJECT_AM
+OBJECT_DEKUBABA
+OBJECT_UNSET_3A
+OBJECT_OA3
+OBJECT_OA4
+OBJECT_OA5
+OBJECT_OA6
+OBJECT_OA7
+OBJECT_JJ
+OBJECT_OA8
+OBJECT_OA9
+OBJECT_OB2
+OBJECT_OB3
+OBJECT_OB4
+OBJECT_HORSE_ZELDA
+OBJECT_OPENING_DEMO1
+OBJECT_WARP1
+OBJECT_B_HEART
+OBJECT_DEKUNUTS
+OBJECT_OE3
+OBJECT_OE4
+OBJECT_MENKURI_OBJECTS
+OBJECT_OE5
+OBJECT_OE6
+OBJECT_OE7
+OBJECT_OE8
+OBJECT_OE9
+OBJECT_OE10
+OBJECT_OE11
+OBJECT_OE12
+OBJECT_VALI
+OBJECT_OA10
+OBJECT_OA11
+OBJECT_MIZU_OBJECTS
+OBJECT_FHG
+OBJECT_OSSAN
+OBJECT_MORI_HINERI1
+OBJECT_BB
+OBJECT_TOKI_OBJECTS
+OBJECT_YUKABYUN
+OBJECT_ZL2
+OBJECT_MJIN
+OBJECT_MJIN_FLASH
+OBJECT_MJIN_DARK
+OBJECT_MJIN_FLAME
+OBJECT_MJIN_ICE
+OBJECT_MJIN_SOUL
+OBJECT_MJIN_WIND
+OBJECT_MJIN_OKA
+OBJECT_HAKA_OBJECTS
+OBJECT_SPOT06_OBJECTS
+OBJECT_ICE_OBJECTS
+OBJECT_RELAY_OBJECTS
+OBJECT_PO_FIELD
+OBJECT_PO_COMPOSER
+OBJECT_MORI_HINERI1A
+OBJECT_MORI_HINERI2
+OBJECT_MORI_HINERI2A
+OBJECT_MORI_OBJECTS
+OBJECT_MORI_TEX
+OBJECT_SPOT08_OBJ
+OBJECT_WARP2
+OBJECT_HATA
+OBJECT_BIRD
+OBJECT_UNSET_78
+OBJECT_UNSET_79
+OBJECT_UNSET_7A
+OBJECT_UNSET_7B
+OBJECT_WOOD02
+OBJECT_UNSET_7D
+OBJECT_UNSET_7E
+OBJECT_UNSET_7F
+OBJECT_UNSET_80
+OBJECT_LIGHTBOX
+OBJECT_PU_BOX
+OBJECT_UNSET_83
+OBJECT_UNSET_84
+OBJECT_TRAP
+OBJECT_VASE
+OBJECT_IM
+OBJECT_TA
+OBJECT_TK
+OBJECT_XC
+OBJECT_VM
+OBJECT_BV
+OBJECT_HAKACH_OBJECTS
+OBJECT_EFC_CRYSTAL_LIGHT
+OBJECT_EFC_FIRE_BALL
+OBJECT_EFC_FLASH
+OBJECT_EFC_LGT_SHOWER
+OBJECT_EFC_STAR_FIELD
+OBJECT_GOD_LGT
+OBJECT_LIGHT_RING
+OBJECT_TRIFORCE_SPOT
+OBJECT_BDAN_OBJECTS
+OBJECT_SD
+OBJECT_RD
+OBJECT_PO_SISTERS
+OBJECT_HEAVY_OBJECT
+OBJECT_GNDD
+OBJECT_FD
+OBJECT_DU
+OBJECT_FW
+OBJECT_MEDAL
+OBJECT_HORSE_LINK_CHILD
+OBJECT_SPOT02_OBJECTS
+OBJECT_HAKA
+OBJECT_RU1
+OBJECT_SYOKUDAI
+OBJECT_FD2
+OBJECT_DH
+OBJECT_RL
+OBJECT_EFC_TW
+OBJECT_DEMO_TRE_LGT
+OBJECT_GI_KEY
+OBJECT_MIR_RAY
+OBJECT_BROB
+OBJECT_GI_JEWEL
+OBJECT_SPOT09_OBJ
+OBJECT_SPOT18_OBJ
+OBJECT_BDOOR
+OBJECT_SPOT17_OBJ
+OBJECT_SHOP_DUNGEN
+OBJECT_NB
+OBJECT_MO
+OBJECT_SB
+OBJECT_GI_MELODY
+OBJECT_GI_HEART
+OBJECT_GI_COMPASS
+OBJECT_GI_BOSSKEY
+OBJECT_GI_MEDAL
+OBJECT_GI_NUTS
+OBJECT_SA
+OBJECT_GI_HEARTS
+OBJECT_GI_ARROWCASE
+OBJECT_GI_BOMBPOUCH
+OBJECT_IN
+OBJECT_TR
+OBJECT_SPOT16_OBJ
+OBJECT_OE1S
+OBJECT_OE4S
+OBJECT_OS_ANIME
+OBJECT_GI_BOTTLE
+OBJECT_GI_STICK
+OBJECT_GI_MAP
+OBJECT_OF1D_MAP
+OBJECT_RU2
+OBJECT_GI_SHIELD_1
+OBJECT_DEKUJR
+OBJECT_GI_MAGICPOT
+OBJECT_GI_BOMB_1
+OBJECT_OF1S
+OBJECT_MA2
+OBJECT_GI_PURSE
+OBJECT_HNI
+OBJECT_TW
+OBJECT_RR
+OBJECT_BXA
+OBJECT_ANUBICE
+OBJECT_GI_GERUDO
+OBJECT_GI_ARROW
+OBJECT_GI_BOMB_2
+OBJECT_GI_EGG
+OBJECT_GI_SCALE
+OBJECT_GI_SHIELD_2
+OBJECT_GI_HOOKSHOT
+OBJECT_GI_OCARINA
+OBJECT_GI_MILK
+OBJECT_MA1
+OBJECT_GANON
+OBJECT_SST
+OBJECT_NY_UNUSED
+OBJECT_UNSET_E4
+OBJECT_NY
+OBJECT_FR
+OBJECT_GI_PACHINKO
+OBJECT_GI_BOOMERANG
+OBJECT_GI_BOW
+OBJECT_GI_GLASSES
+OBJECT_GI_LIQUID
+OBJECT_ANI
+OBJECT_DEMO_6K
+OBJECT_GI_SHIELD_3
+OBJECT_GI_LETTER
+OBJECT_SPOT15_OBJ
+OBJECT_JYA_OBJ
+OBJECT_GI_CLOTHES
+OBJECT_GI_BEAN
+OBJECT_GI_FISH
+OBJECT_GI_SAW
+OBJECT_GI_HAMMER
+OBJECT_GI_GRASS
+OBJECT_GI_LONGSWORD
+OBJECT_SPOT01_OBJECTS
+OBJECT_MD_UNUSED
+OBJECT_MD
+OBJECT_KM1
+OBJECT_KW1
+OBJECT_ZO
+OBJECT_KZ
+OBJECT_UMAJUMP
+OBJECT_MASTERKOKIRI
+OBJECT_MASTERKOKIRIHEAD
+OBJECT_MASTERGOLON
+OBJECT_MASTERZOORA
+OBJECT_AOB
+OBJECT_IK
+OBJECT_AHG
+OBJECT_CNE
+OBJECT_GI_NIWATORI
+OBJECT_SKJ
+OBJECT_GI_BOTTLE_LETTER
+OBJECT_BJI
+OBJECT_BBA
+OBJECT_GI_OCARINA_0
+OBJECT_DS
+OBJECT_ANE
+OBJECT_BOJ
+OBJECT_SPOT03_OBJECT
+OBJECT_SPOT07_OBJECT
+OBJECT_FZ
+OBJECT_BOB
+OBJECT_GE1
+OBJECT_YABUSAME_POINT
+OBJECT_GI_BOOTS_2
+OBJECT_GI_SEED
+OBJECT_GND_MAGIC
+OBJECT_D_ELEVATOR
+OBJECT_D_HSBLOCK
+OBJECT_D_LIFT
+OBJECT_MAMENOKI
+OBJECT_GOROIWA
+OBJECT_UNSET_120
+OBJECT_TORYO
+OBJECT_DAIKU
+OBJECT_UNSET_123
+OBJECT_NWC
+OBJECT_BLKOBJ
+OBJECT_GM
+OBJECT_MS
+OBJECT_HS
+OBJECT_INGATE
+OBJECT_LIGHTSWITCH
+OBJECT_KUSA
+OBJECT_TSUBO
+OBJECT_GI_GLOVES
+OBJECT_GI_COIN
+OBJECT_KANBAN
+OBJECT_GJYO_OBJECTS
+OBJECT_OWL
+OBJECT_MK
+OBJECT_FU
+OBJECT_GI_KI_TAN_MASK
+OBJECT_GI_REDEAD_MASK
+OBJECT_GI_SKJ_MASK
+OBJECT_GI_RABIT_MASK
+OBJECT_GI_TRUTH_MASK
+OBJECT_GANON_OBJECTS
+OBJECT_SIOFUKI
+OBJECT_STREAM
+OBJECT_MM
+OBJECT_FA
+OBJECT_OS
+OBJECT_GI_EYE_LOTION
+OBJECT_GI_POWDER
+OBJECT_GI_MUSHROOM
+OBJECT_GI_TICKETSTONE
+OBJECT_GI_BROKENSWORD
+OBJECT_JS
+OBJECT_CS
+OBJECT_GI_PRESCRIPTION
+OBJECT_GI_BRACELET
+OBJECT_GI_SOLDOUT
+OBJECT_GI_FROG
+OBJECT_MAG
+OBJECT_DOOR_GERUDO
+OBJECT_GT
+OBJECT_EFC_ERUPC
+OBJECT_ZL2_ANIME1
+OBJECT_ZL2_ANIME2
+OBJECT_GI_GOLONMASK
+OBJECT_GI_ZORAMASK
+OBJECT_GI_GERUDOMASK
+OBJECT_GANON2
+OBJECT_KA
+OBJECT_TS
+OBJECT_ZG
+OBJECT_GI_HOVERBOOTS
+OBJECT_GI_M_ARROW
+OBJECT_DS2
+OBJECT_EC
+OBJECT_FISH
+OBJECT_GI_SUTARU
+OBJECT_GI_GODDESS
+OBJECT_SSH
+OBJECT_BIGOKUTA
+OBJECT_BG
+OBJECT_SPOT05_OBJECTS
+OBJECT_SPOT12_OBJ
+OBJECT_BOMBIWA
+OBJECT_HINTNUTS
+OBJECT_RS
+OBJECT_SPOT00_BREAK
+OBJECT_GLA
+OBJECT_SHOPNUTS
+OBJECT_GELDB
+OBJECT_GR
+OBJECT_DOG
+OBJECT_JYA_IRON
+OBJECT_JYA_DOOR
+OBJECT_UNSET_16E
+OBJECT_SPOT11_OBJ
+OBJECT_KIBAKO2
+OBJECT_DNS
+OBJECT_DNK
+OBJECT_GI_FIRE
+OBJECT_GI_INSECT
+OBJECT_GI_BUTTERFLY
+OBJECT_GI_GHOST
+OBJECT_GI_SOUL
+OBJECT_BOWL
+OBJECT_DEMO_KEKKAI
+OBJECT_EFC_DOUGHNUT
+OBJECT_GI_DEKUPOUCH
+OBJECT_GANON_ANIME1
+OBJECT_GANON_ANIME2
+OBJECT_GANON_ANIME3
+OBJECT_GI_RUPY
+OBJECT_SPOT01_MATOYA
+OBJECT_SPOT01_MATOYAB
+OBJECT_MU
+OBJECT_WF
+OBJECT_SKB
+OBJECT_GJ
+OBJECT_GEFF
+OBJECT_HAKA_DOOR
+OBJECT_GS
+OBJECT_PS
+OBJECT_BWALL
+OBJECT_COW
+OBJECT_COB
+OBJECT_GI_SWORD_1
+OBJECT_DOOR_KILLER
+OBJECT_OUKE_HAKA
+OBJECT_TIMEBLOCK
+OBJECT_ZL4
\ No newline at end of file
diff --git a/soh/assets/extractor/symbols/SymbolMap_OoTMqDbg.txt b/soh/assets/extractor/symbols/SymbolMap_OoTMqDbg.txt
new file mode 100644
index 0000000000..015e7e88a3
--- /dev/null
+++ b/soh/assets/extractor/symbols/SymbolMap_OoTMqDbg.txt
@@ -0,0 +1 @@
+8012DB20 gMtxClear
\ No newline at end of file
diff --git a/soh/assets/objects/gameplay_keep/gameplay_keep.h b/soh/assets/objects/gameplay_keep/gameplay_keep.h
index 6377e165dd..afd7b7495d 100644
--- a/soh/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/soh/assets/objects/gameplay_keep/gameplay_keep.h
@@ -21,6 +21,9 @@ static const ALIGN_ASSET(2) char gHilite1Tex[] = dgHilite1Tex;
 #define dgHilite2Tex "__OTR__objects/gameplay_keep/gHilite2Tex"
 static const ALIGN_ASSET(2) char gHilite2Tex[] = dgHilite2Tex;
 
+#define dgHilite2Tex_Overflow "__OTR__objects/gameplay_keep/gHilite2Tex_Overflow"
+static const ALIGN_ASSET(2) char gHilite2Tex_Overflow[] = dgHilite2Tex_Overflow;
+
 #define dgHylianShieldDesignTex "__OTR__objects/gameplay_keep/gHylianShieldDesignTex"
 static const ALIGN_ASSET(2) char gHylianShieldDesignTex[] = dgHylianShieldDesignTex;
 
@@ -2847,5 +2850,62 @@ static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FB0DL_018950[] = dgFishSk
 #define dgFishSkelLimbsLimb_018FBCDL_0188B0 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018FBCDL_0188B0"
 static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018FBCDL_0188B0[] = dgFishSkelLimbsLimb_018FBCDL_0188B0;
 
+// #region NTSC
+
+#define dgameplay_keep_DL_0C8B0 "__OTR__objects/gameplay_keep/gameplay_keep_DL_0C8B0"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_0C8B0[] = dgameplay_keep_DL_0C8B0;
+
+#define dgameplay_keep_Tex_0CE60 "__OTR__objects/gameplay_keep/gameplay_keep_Tex_0CE60"
+static const ALIGN_ASSET(2) char gameplay_keep_Tex_0CE60[] = dgameplay_keep_Tex_0CE60;
+
+#define dgameplay_keep_DL_39890 "__OTR__objects/gameplay_keep/gameplay_keep_DL_39890"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_39890[] = dgameplay_keep_DL_39890;
+
+#define dgameplay_keep_DL_399B0 "__OTR__objects/gameplay_keep/gameplay_keep_DL_399B0"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_399B0[] = dgameplay_keep_DL_399B0;
+
+#define dgameplay_keep_DL_39A80 "__OTR__objects/gameplay_keep/gameplay_keep_DL_39A80"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_39A80[] = dgameplay_keep_DL_39A80;
+
+#define dgameplay_keep_DL_39B50 "__OTR__objects/gameplay_keep/gameplay_keep_DL_39B50"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_39B50[] = dgameplay_keep_DL_39B50;
+
+#define dgameplay_keep_DL_3CFD0 "__OTR__objects/gameplay_keep/gameplay_keep_DL_3CFD0"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_3CFD0[] = dgameplay_keep_DL_3CFD0;
+
+#define dgameplay_keep_DL_3D108 "__OTR__objects/gameplay_keep/gameplay_keep_DL_3D108"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_3D108[] = dgameplay_keep_DL_3D108;
+
+#define dgameplay_keep_DL_3D260 "__OTR__objects/gameplay_keep/gameplay_keep_DL_3D260"
+static const ALIGN_ASSET(2) char gameplay_keep_DL_3D260[] = dgameplay_keep_DL_3D260;
+
+#define dgUnusedDropBombchuTex "__OTR__objects/gameplay_keep/gUnusedDropBombchuTex"
+static const ALIGN_ASSET(2) char gUnusedDropBombchuTex[] = dgUnusedDropBombchuTex;
+
+#define dgUnusedWalletTex "__OTR__objects/gameplay_keep/gUnusedWalletTex"
+static const ALIGN_ASSET(2) char gUnusedWalletTex[] = dgUnusedWalletTex;
+
+#define dgUnusedHeartPieceTex "__OTR__objects/gameplay_keep/gUnusedHeartPieceTex"
+static const ALIGN_ASSET(2) char gUnusedHeartPieceTex[] = dgUnusedHeartPieceTex;
+
+#define dgUnusedDropRecoveryHeartTex "__OTR__objects/gameplay_keep/gUnusedDropRecoveryHeartTex"
+static const ALIGN_ASSET(2) char gUnusedDropRecoveryHeartTex[] = dgUnusedDropRecoveryHeartTex;
+
+#define dgUnusedDropBombTex "__OTR__objects/gameplay_keep/gUnusedDropBombTex"
+static const ALIGN_ASSET(2) char gUnusedDropBombTex[] = dgUnusedDropBombTex;
+
+#define dgUnusedDropArrows1Tex "__OTR__objects/gameplay_keep/gUnusedDropArrows1Tex"
+static const ALIGN_ASSET(2) char gUnusedDropArrows1Tex[] = dgUnusedDropArrows1Tex;
+
+#define dgUnusedRupeeLightBlueTex "__OTR__objects/gameplay_keep/gUnusedRupeeLightBlueTex"
+static const ALIGN_ASSET(2) char gUnusedRupeeLightBlueTex[] = dgUnusedRupeeLightBlueTex;
+
+#define dgUnusedHeartContainerTex "__OTR__objects/gameplay_keep/gUnusedHeartContainerTex"
+static const ALIGN_ASSET(2) char gUnusedHeartContainerTex[] = dgUnusedHeartContainerTex;
+
+#define dgUnusedTreeBarkTex "__OTR__objects/gameplay_keep/gUnusedTreeBarkTex"
+static const ALIGN_ASSET(2) char gUnusedTreeBarkTex[] = dgUnusedTreeBarkTex;
+
+
 
 #endif // OBJECTS_GAMEPLAY_KEEP_H
diff --git a/soh/assets/objects/object_mag/object_mag.h b/soh/assets/objects/object_mag/object_mag.h
index 07ccd88db5..720d0cbe59 100644
--- a/soh/assets/objects/object_mag/object_mag.h
+++ b/soh/assets/objects/object_mag/object_mag.h
@@ -9,12 +9,21 @@ static const ALIGN_ASSET(2) char gTitleZeldaShieldLogoMQTex[] = dgTitleZeldaShie
 #define dgTitleZeldaShieldLogoTex "__OTR__objects/object_mag/gTitleZeldaShieldLogoTex"
 static const ALIGN_ASSET(2) char gTitleZeldaShieldLogoTex[] = dgTitleZeldaShieldLogoTex;
 
+#define dgTitleCopyright1998Tex "__OTR__objects/object_mag/gTitleCopyright1998Tex"
+static const ALIGN_ASSET(2) char gTitleCopyright1998Tex[] = dgTitleCopyright1998Tex;
+
 #define dgTitleCopyright19982002Tex "__OTR__objects/object_mag/gTitleCopyright19982002Tex"
 static const ALIGN_ASSET(2) char gTitleCopyright19982002Tex[] = dgTitleCopyright19982002Tex;
 
 #define dgTitleCopyright19982003Tex "__OTR__objects/object_mag/gTitleCopyright19982003Tex"
 static const ALIGN_ASSET(2) char gTitleCopyright19982003Tex[] = dgTitleCopyright19982003Tex;
 
+#define dgTitleCopyright19982004EngTex "__OTR__objects/object_mag/gTitleCopyright19982004EngTex"
+static const ALIGN_ASSET(2) char gTitleCopyright19982004EngTex[] = dgTitleCopyright19982004EngTex;
+
+#define dgTitleCopyright19982004JpnTex "__OTR__objects/object_mag/gTitleCopyright19982004JpnTex"
+static const ALIGN_ASSET(2) char gTitleCopyright19982004JpnTex[] = dgTitleCopyright19982004JpnTex;
+
 #define dgTitleMasterQuestSubtitleTex "__OTR__objects/object_mag/gTitleMasterQuestSubtitleTex"
 static const ALIGN_ASSET(2) char gTitleMasterQuestSubtitleTex[] = dgTitleMasterQuestSubtitleTex;
 
diff --git a/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h b/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h
index 9077b1ac5a..46342f7366 100644
--- a/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h
+++ b/soh/assets/overlays/ovl_File_Choose/ovl_file_choose.h
@@ -27,4 +27,13 @@ static const ALIGN_ASSET(2) char gOptionsDividerMiddleVtx[] = dgOptionsDividerMi
 #define dgOptionsDividerBottomVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerBottomVtx"
 static const ALIGN_ASSET(2) char gOptionsDividerBottomVtx[] = dgOptionsDividerBottomVtx;
 
+#define dD_80811BB0_NTSC "__OTR__overlays/ovl_file_choose/D_80811BB0_NTSC"
+static const ALIGN_ASSET(2) char D_80811BB0_NTSC[] = dD_80811BB0_NTSC;
+
+#define dD_80811D30_NTSC "__OTR__overlays/ovl_file_choose/D_80811D30_NTSC"
+static const ALIGN_ASSET(2) char D_80811D30_NTSC[] = dD_80811D30_NTSC;
+
+#define dD_80811F30_NTSC "__OTR__overlays/ovl_file_choose/D_80811F30_NTSC"
+static const ALIGN_ASSET(2) char D_80811F30_NTSC[] = dD_80811F30_NTSC;
+
 #endif // OVERLAYS_OVL_FILE_CHOOSE_H
diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h
index ace1588542..3c3ddcf5a7 100644
--- a/soh/assets/soh_assets.h
+++ b/soh/assets/soh_assets.h
@@ -77,6 +77,66 @@ static const ALIGN_ASSET(2) char gBossSoulSkullDL[] = dgBossSoulSkullDL;
 #define dgRandoPotDL "__OTR__objects/gameplay_dangeon_keep/gRandoPotDL"
 static const ALIGN_ASSET(2) char gRandoPotDL[] = dgRandoPotDL;
 
+#define dgRandoBushDL "__OTR__objects/gameplay_field_keep/gFieldBushRandomDL"
+static const ALIGN_ASSET(2) char gRandoBushDL[] = dgRandoBushDL;
+
+#define dgRandoBushMinorDL "__OTR__objects/gameplay_field_keep/gFieldBushMinorDL"
+static const ALIGN_ASSET(2) char gRandoBushMinorDL[] = dgRandoBushMinorDL;
+
+#define dgRandoBushMajorDL "__OTR__objects/gameplay_field_keep/gFieldBushMajorDL"
+static const ALIGN_ASSET(2) char gRandoBushMajorDL[] = dgRandoBushMajorDL;
+
+#define dgRandoBushSmallKeyDL "__OTR__objects/gameplay_field_keep/gFieldBushSmallKeyDL"
+static const ALIGN_ASSET(2) char gRandoBushSmallKeyDL[] = dgRandoBushSmallKeyDL;
+
+#define dgRandoBushBossKeyDL "__OTR__objects/gameplay_field_keep/gFieldBushBossKeyDL"
+static const ALIGN_ASSET(2) char gRandoBushBossKeyDL[] = dgRandoBushBossKeyDL;
+
+#define dgRandoBushTokenDL "__OTR__objects/gameplay_field_keep/gFieldBushTokenDL"
+static const ALIGN_ASSET(2) char gRandoBushTokenDL[] = dgRandoBushTokenDL;
+
+#define dgRandoBushMaskDL "__OTR__objects/gameplay_field_keep/gFieldBushMaskDL"
+static const ALIGN_ASSET(2) char gRandoBushMaskDL[] = dgRandoBushMaskDL;
+
+#define dgRandoBushFairyDL "__OTR__objects/gameplay_field_keep/gFieldBushFairyDL"
+static const ALIGN_ASSET(2) char gRandoBushFairyDL[] = dgRandoBushFairyDL;
+
+#define dgRandoBushHeartDL "__OTR__objects/gameplay_field_keep/gFieldBushHeartDL"
+static const ALIGN_ASSET(2) char gRandoBushHeartDL[] = dgRandoBushHeartDL;
+
+#define dgRandoBushJunkDL "__OTR__objects/gameplay_field_keep/gFieldBushJunkDL"
+static const ALIGN_ASSET(2) char gRandoBushJunkDL[] = dgRandoBushJunkDL;
+
+#define dgRandoCuttableGrassRandomDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassRandomDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassDL[] = dgRandoCuttableGrassRandomDL;
+
+#define dgRandoCuttableGrassMinorDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassMinorDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassMinorDL[] = dgRandoCuttableGrassMinorDL;
+
+#define dgRandoCuttableGrassMajorDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassMajorDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassMajorDL[] = dgRandoCuttableGrassMajorDL;
+
+#define dgRandoCuttableGrassSmallKeyDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassSmallKeyDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassSmallKeyDL[] = dgRandoCuttableGrassSmallKeyDL;
+
+#define dgRandoCuttableGrassBossKeyDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassBossKeyDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassBossKeyDL[] = dgRandoCuttableGrassBossKeyDL;
+
+#define dgRandoCuttableGrassTokenDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassTokenDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassTokenDL[] = dgRandoCuttableGrassTokenDL;
+
+#define dgRandoCuttableGrassMaskDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassMaskDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassMaskDL[] = dgRandoCuttableGrassMaskDL;
+
+#define dgRandoCuttableGrassFairyDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassFairyDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassFairyDL[] = dgRandoCuttableGrassFairyDL;
+
+#define dgRandoCuttableGrassHeartDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassHeartDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassHeartDL[] = dgRandoCuttableGrassHeartDL;
+
+#define dgRandoCuttableGrassJunkDL "__OTR__objects/gameplay_keep/gRandoCuttableGrassJunkDL"
+static const ALIGN_ASSET(2) char gRandoCuttableGrassJunkDL[] = dgRandoCuttableGrassJunkDL;
+
 #define dgFishingPoleGiDL "__OTR__objects/object_gi_fishing_pole/gFishingPoleGiDL"
 static const ALIGN_ASSET(2) char gFishingPoleGiDL[] = dgFishingPoleGiDL;
 
@@ -89,6 +149,54 @@ static const ALIGN_ASSET(2) char gBombchuBagBodyDL[] = dgBombchuBagBodyDL;
 #define dgBombchuBagMaskDL "__OTR__objects/object_bombchubag/gBombchuBagMaskDL"
 static const ALIGN_ASSET(2) char gBombchuBagMaskDL[] = dgBombchuBagMaskDL;
 
+#define dgLargeMajorCrateDL "__OTR__objects/object_kibako2/gLargeMajorCrateDL"
+static const ALIGN_ASSET(2) char gLargeMajorCrateDL[] = dgLargeMajorCrateDL;
+
+#define dgLargeMinorCrateDL "__OTR__objects/object_kibako2/gLargeMinorCrateDL"
+static const ALIGN_ASSET(2) char gLargeMinorCrateDL[] = dgLargeMinorCrateDL;
+
+#define dgLargeRandoCrateDL "__OTR__objects/object_kibako2/gLargeRandoCrateDL"
+static const ALIGN_ASSET(2) char gLargeRandoCrateDL[] = dgLargeRandoCrateDL;
+
+#define dgLargeSmallKeyCrateDL "__OTR__objects/object_kibako2/gLargeSmallKeyCrateDL"
+static const ALIGN_ASSET(2) char gLargeSmallKeyCrateDL[] = dgLargeSmallKeyCrateDL;
+
+#define dgLargeTokenCrateDL "__OTR__objects/object_kibako2/gLargeTokenCrateDL"
+static const ALIGN_ASSET(2) char gLargeTokenCrateDL[] = dgLargeTokenCrateDL;
+
+#define dgLargeBossKeyCrateDL "__OTR__objects/object_kibako2/gLargeBossKeyCrateDL"
+static const ALIGN_ASSET(2) char gLargeBossKeyCrateDL[] = dgLargeBossKeyCrateDL;
+
+#define dgLargeHeartCrateDL "__OTR__objects/object_kibako2/gLargeHeartCrateDL"
+static const ALIGN_ASSET(2) char gLargeHeartCrateDL[] = dgLargeHeartCrateDL;
+
+#define dgLargeJunkCrateDL "__OTR__objects/object_kibako2/gLargeJunkCrateDL"
+static const ALIGN_ASSET(2) char gLargeJunkCrateDL[] = dgLargeJunkCrateDL;
+
+#define dgSmallMajorCrateDL "__OTR__objects/object_kibako/gSmallMajorCrateDL"
+static const ALIGN_ASSET(2) char gSmallMajorCrateDL[] = dgSmallMajorCrateDL;
+
+#define dgSmallMinorCrateDL "__OTR__objects/object_kibako/gSmallMinorCrateDL"
+static const ALIGN_ASSET(2) char gSmallMinorCrateDL[] = dgSmallMinorCrateDL;
+
+#define dgSmallRandoCrateDL "__OTR__objects/object_kibako/gSmallRandoCrateDL"
+static const ALIGN_ASSET(2) char gSmallRandoCrateDL[] = dgSmallRandoCrateDL;
+
+#define dgSmallSmallKeyCrateDL "__OTR__objects/object_kibako/gSmallSmallKeyCrateDL"
+static const ALIGN_ASSET(2) char gSmallSmallKeyCrateDL[] = dgSmallSmallKeyCrateDL;
+
+#define dgSmallTokenCrateDL "__OTR__objects/object_kibako/gSmallTokenCrateDL"
+static const ALIGN_ASSET(2) char gSmallTokenCrateDL[] = dgSmallTokenCrateDL;
+
+#define dgSmallBossKeyCrateDL "__OTR__objects/object_kibako/gSmallBossKeyCrateDL"
+static const ALIGN_ASSET(2) char gSmallBossKeyCrateDL[] = dgSmallBossKeyCrateDL;
+
+#define dgSmallHeartCrateDL "__OTR__objects/object_kibako/gSmallHeartCrateDL"
+static const ALIGN_ASSET(2) char gSmallHeartCrateDL[] = dgSmallHeartCrateDL;
+
+#define dgSmallJunkCrateDL "__OTR__objects/object_kibako/gSmallJunkCrateDL"
+static const ALIGN_ASSET(2) char gSmallJunkCrateDL[] = dgSmallJunkCrateDL;
+
 //boss keys
 #define dgBossKeyCustomDL "__OTR__objects/object_bosskey/gBossKeyCustomDL"
 static const ALIGN_ASSET(2) char gBossKeyCustomDL[] = dgBossKeyCustomDL;
@@ -287,6 +395,9 @@ static const ALIGN_ASSET(2) char gFileSelPleaseChooseAQuestFRATex[] = dgFileSelP
 #define dgFileSelPleaseChooseAQuestGERTex "__OTR__textures/title_static/gFileSelPleaseChooseAQuestGERTex"
 static const ALIGN_ASSET(2) char gFileSelPleaseChooseAQuestGERTex[] = dgFileSelPleaseChooseAQuestGERTex;
 
+#define dgFileSelPleaseChooseAQuestJPNTex "__OTR__textures/title_static/gFileSelPleaseChooseAQuestJPNTex"
+static const ALIGN_ASSET(2) char gFileSelPleaseChooseAQuestJPNTex[] = dgFileSelPleaseChooseAQuestJPNTex;
+
 #define dgFileSelBossRushSettingsENGTex "__OTR__textures/title_static/gFileSelBossRushSettingsENGTex"
 static const ALIGN_ASSET(2) char gFileSelBossRushSettingsENGText[] = dgFileSelBossRushSettingsENGTex;
 
@@ -296,6 +407,9 @@ static const ALIGN_ASSET(2) char gFileSelBossRushSettingsFRAText[] = dgFileSelBo
 #define dgFileSelBossRushSettingsGERTex "__OTR__textures/title_static/gFileSelBossRushSettingsGERTex"
 static const ALIGN_ASSET(2) char gFileSelBossRushSettingsGERText[] = dgFileSelBossRushSettingsGERTex;
 
+#define dgFileSelBossRushSettingsJPNTex "__OTR__textures/title_static/gFileSelBossRushSettingsJPNTex"
+static const ALIGN_ASSET(2) char gFileSelBossRushSettingsJPNText[] = dgFileSelBossRushSettingsJPNTex;
+
 #define dgFileSelRANDButtonTex "__OTR__textures/title_static/gFileSelRANDButtonTex"
 static const ALIGN_ASSET(2) char gFileSelRANDButtonTex[] = dgFileSelRANDButtonTex;
 
diff --git a/soh/assets/textures/boss_title_cards/object_bv.h b/soh/assets/textures/boss_title_cards/object_bv.h
index 60a4d30748..3c4b7c0905 100644
--- a/soh/assets/textures/boss_title_cards/object_bv.h
+++ b/soh/assets/textures/boss_title_cards/object_bv.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gBarinadeTitleCardGERTex[] = dgBarinadeTitleCar
 #define dgBarinadeTitleCardFRATex "__OTR__textures/object_bv/gBarinadeTitleCardFRATex"
 static const ALIGN_ASSET(2) char gBarinadeTitleCardFRATex[] = dgBarinadeTitleCardFRATex;
 
+#define dgBarinadeTitleCardJPNTex "__OTR__textures/object_bv/gBarinadeTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gBarinadeTitleCardJPNTex[] = dgBarinadeTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_BV_H
diff --git a/soh/assets/textures/boss_title_cards/object_fd.h b/soh/assets/textures/boss_title_cards/object_fd.h
index 56d765a86c..01fa7a534f 100644
--- a/soh/assets/textures/boss_title_cards/object_fd.h
+++ b/soh/assets/textures/boss_title_cards/object_fd.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardGERTex[] = dgVolvagiaBoss
 #define dgVolvagiaBossTitleCardFRATex "__OTR__textures/object_fd/gVolvagiaBossTitleCardFRATex"
 static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardFRATex[] = dgVolvagiaBossTitleCardFRATex;
 
+#define dgVolvagiaBossTitleCardJPNTex "__OTR__textures/object_fd/gVolvagiaBossTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gVolvagiaBossTitleCardJPNTex[] = dgVolvagiaBossTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_FD_H
diff --git a/soh/assets/textures/boss_title_cards/object_fhg.h b/soh/assets/textures/boss_title_cards/object_fhg.h
index 68d09d0839..81a26cd4d5 100644
--- a/soh/assets/textures/boss_title_cards/object_fhg.h
+++ b/soh/assets/textures/boss_title_cards/object_fhg.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gPhantomGanonTitleCardGERTex[] = dgPhantomGanon
 #define dgPhantomGanonTitleCardFRATex "__OTR__textures/object_fhg/gPhantomGanonTitleCardFRATex"
 static const ALIGN_ASSET(2) char gPhantomGanonTitleCardFRATex[] = dgPhantomGanonTitleCardFRATex;
 
+#define dgPhantomGanonTitleCardJPNTex "__OTR__textures/object_fhg/gPhantomGanonTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gPhantomGanonTitleCardJPNTex[] = dgPhantomGanonTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_FHG_H
diff --git a/soh/assets/textures/boss_title_cards/object_ganon.h b/soh/assets/textures/boss_title_cards/object_ganon.h
index 0b855ac806..41db9df963 100644
--- a/soh/assets/textures/boss_title_cards/object_ganon.h
+++ b/soh/assets/textures/boss_title_cards/object_ganon.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gGanondorfTitleCardGERTex[] = dgGanondorfTitleC
 #define dgGanondorfTitleCardFRATex "__OTR__textures/object_ganon/gGanondorfTitleCardFRATex"
 static const ALIGN_ASSET(2) char gGanondorfTitleCardFRATex[] = dgGanondorfTitleCardFRATex;
 
+#define dgGanondorfTitleCardJPNTex "__OTR__textures/object_ganon/gGanondorfTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gGanondorfTitleCardJPNTex[] = dgGanondorfTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_GANON_H
diff --git a/soh/assets/textures/boss_title_cards/object_ganon2.h b/soh/assets/textures/boss_title_cards/object_ganon2.h
index d9eb76cc14..30241aa970 100644
--- a/soh/assets/textures/boss_title_cards/object_ganon2.h
+++ b/soh/assets/textures/boss_title_cards/object_ganon2.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gGanonTitleCardGERTex[] = dgGanonTitleCardGERTe
 #define dgGanonTitleCardFRATex "__OTR__textures/object_ganon2/gGanonTitleCardFRATex"
 static const ALIGN_ASSET(2) char gGanonTitleCardFRATex[] = dgGanonTitleCardFRATex;
 
+#define dgGanonTitleCardJPNTex "__OTR__textures/object_ganon2/gGanonTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gGanonTitleCardJPNTex[] = dgGanonTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_GANON2_H
diff --git a/soh/assets/textures/boss_title_cards/object_goma.h b/soh/assets/textures/boss_title_cards/object_goma.h
index 96243178b1..81a962691a 100644
--- a/soh/assets/textures/boss_title_cards/object_goma.h
+++ b/soh/assets/textures/boss_title_cards/object_goma.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gGohmaTitleCardGERTex[] = dgGohmaTitleCardGERTe
 #define dgGohmaTitleCardFRATex "__OTR__textures/object_goma/gGohmaTitleCardFRATex"
 static const ALIGN_ASSET(2) char gGohmaTitleCardFRATex[] = dgGohmaTitleCardFRATex;
 
+#define dgGohmaTitleCardJPNTex "__OTR__textures/object_goma/gGohmaTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gGohmaTitleCardJPNTex[] = dgGohmaTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_GOMA_H
diff --git a/soh/assets/textures/boss_title_cards/object_kingdodongo.h b/soh/assets/textures/boss_title_cards/object_kingdodongo.h
index d03784a28f..cc8ce47aab 100644
--- a/soh/assets/textures/boss_title_cards/object_kingdodongo.h
+++ b/soh/assets/textures/boss_title_cards/object_kingdodongo.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gKingDodongoTitleCardGERTex[] = dgKingDodongoTi
 #define dgKingDodongoTitleCardFRATex "__OTR__textures/object_kingdodongo/gKingDodongoTitleCardFRATex"
 static const ALIGN_ASSET(2) char gKingDodongoTitleCardFRATex[] = dgKingDodongoTitleCardFRATex;
 
+#define dgKingDodongoTitleCardJPNTex "__OTR__textures/object_kingdodongo/gKingDodongoTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gKingDodongoTitleCardJPNTex[] = dgKingDodongoTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_KINGDODONGO_H
diff --git a/soh/assets/textures/boss_title_cards/object_mo.h b/soh/assets/textures/boss_title_cards/object_mo.h
index 1d2d1489ad..312b8be85f 100644
--- a/soh/assets/textures/boss_title_cards/object_mo.h
+++ b/soh/assets/textures/boss_title_cards/object_mo.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gMorphaTitleCardGERTex[] = dgMorphaTitleCardGER
 #define dgMorphaTitleCardFRATex "__OTR__textures/object_mo/gMorphaTitleCardFRATex"
 static const ALIGN_ASSET(2) char gMorphaTitleCardFRATex[] = dgMorphaTitleCardFRATex;
 
+#define dgMorphaTitleCardJPNTex "__OTR__textures/object_mo/gMorphaTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gMorphaTitleCardJPNTex[] = dgMorphaTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_MO_H
diff --git a/soh/assets/textures/boss_title_cards/object_sst.h b/soh/assets/textures/boss_title_cards/object_sst.h
index f986705670..d9148df6ca 100644
--- a/soh/assets/textures/boss_title_cards/object_sst.h
+++ b/soh/assets/textures/boss_title_cards/object_sst.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gBongoTitleCardGERTex[] = dgBongoTitleCardGERTe
 #define dgBongoTitleCardFRATex "__OTR__textures/object_sst/gBongoTitleCardFRATex"
 static const ALIGN_ASSET(2) char gBongoTitleCardFRATex[] = dgBongoTitleCardFRATex;
 
+#define dgBongoTitleCardJPNTex "__OTR__textures/object_sst/gBongoTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gBongoTitleCardJPNTex[] = dgBongoTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_SST_H
diff --git a/soh/assets/textures/boss_title_cards/object_tw.h b/soh/assets/textures/boss_title_cards/object_tw.h
index d3a4b22fc0..fa6d4fcaad 100644
--- a/soh/assets/textures/boss_title_cards/object_tw.h
+++ b/soh/assets/textures/boss_title_cards/object_tw.h
@@ -12,4 +12,7 @@ static const ALIGN_ASSET(2) char gTwinrovaTitleCardGERTex[] = dgTwinrovaTitleCar
 #define dgTwinrovaTitleCardFRATex "__OTR__textures/object_tw/gTwinrovaTitleCardFRATex"
 static const ALIGN_ASSET(2) char gTwinrovaTitleCardFRATex[] = dgTwinrovaTitleCardFRATex;
 
+#define dgTwinrovaTitleCardJPNTex "__OTR__textures/object_tw/gTwinrovaTitleCardJPNTex"
+static const ALIGN_ASSET(2) char gTwinrovaTitleCardJPNTex[] = dgTwinrovaTitleCardJPNTex;
+
 #endif // TEXTURES_OBJECT_TW_H
diff --git a/soh/assets/textures/do_action_static/do_action_static.h b/soh/assets/textures/do_action_static/do_action_static.h
index 9b721d7119..84553ba661 100644
--- a/soh/assets/textures/do_action_static/do_action_static.h
+++ b/soh/assets/textures/do_action_static/do_action_static.h
@@ -264,4 +264,92 @@ static const ALIGN_ASSET(2) char gNum7DoActionFRATex[] = dgNum7DoActionFRATex;
 #define dgNum8DoActionFRATex "__OTR__textures/do_action_static/gNum8DoActionFRATex"
 static const ALIGN_ASSET(2) char gNum8DoActionFRATex[] = dgNum8DoActionFRATex;
 
+#define dgAttackDoActionJPNTex "__OTR__textures/do_action_static/gAttackDoActionJPNTex"
+static const ALIGN_ASSET(2) char gAttackDoActionJPNTex[] = dgAttackDoActionJPNTex;
+
+#define dgCheckDoActionJPNTex "__OTR__textures/do_action_static/gCheckDoActionJPNTex"
+static const ALIGN_ASSET(2) char gCheckDoActionJPNTex[] = dgCheckDoActionJPNTex;
+
+#define dgEnterDoActionJPNTex "__OTR__textures/do_action_static/gEnterDoActionJPNTex"
+static const ALIGN_ASSET(2) char gEnterDoActionJPNTex[] = dgEnterDoActionJPNTex;
+
+#define dgReturnDoActionJPNTex "__OTR__textures/do_action_static/gReturnDoActionJPNTex"
+static const ALIGN_ASSET(2) char gReturnDoActionJPNTex[] = dgReturnDoActionJPNTex;
+
+#define dgOpenDoActionJPNTex "__OTR__textures/do_action_static/gOpenDoActionJPNTex"
+static const ALIGN_ASSET(2) char gOpenDoActionJPNTex[] = dgOpenDoActionJPNTex;
+
+#define dgJumpDoActionJPNTex "__OTR__textures/do_action_static/gJumpDoActionJPNTex"
+static const ALIGN_ASSET(2) char gJumpDoActionJPNTex[] = dgJumpDoActionJPNTex;
+
+#define dgDecideDoActionJPNTex "__OTR__textures/do_action_static/gDecideDoActionJPNTex"
+static const ALIGN_ASSET(2) char gDecideDoActionJPNTex[] = dgDecideDoActionJPNTex;
+
+#define dgDiveDoActionJPNTex "__OTR__textures/do_action_static/gDiveDoActionJPNTex"
+static const ALIGN_ASSET(2) char gDiveDoActionJPNTex[] = dgDiveDoActionJPNTex;
+
+#define dgFasterDoActionJPNTex "__OTR__textures/do_action_static/gFasterDoActionJPNTex"
+static const ALIGN_ASSET(2) char gFasterDoActionJPNTex[] = dgFasterDoActionJPNTex;
+
+#define dgThrowDoActionJPNTex "__OTR__textures/do_action_static/gThrowDoActionJPNTex"
+static const ALIGN_ASSET(2) char gThrowDoActionJPNTex[] = dgThrowDoActionJPNTex;
+
+#define dgUnusedNaviDoActionJPNTex "__OTR__textures/do_action_static/gUnusedNaviDoActionJPNTex"
+static const ALIGN_ASSET(2) char gUnusedNaviDoActionJPNTex[] = dgUnusedNaviDoActionJPNTex;
+
+#define dgClimbDoActionJPNTex "__OTR__textures/do_action_static/gClimbDoActionJPNTex"
+static const ALIGN_ASSET(2) char gClimbDoActionJPNTex[] = dgClimbDoActionJPNTex;
+
+#define dgDropDoActionJPNTex "__OTR__textures/do_action_static/gDropDoActionJPNTex"
+static const ALIGN_ASSET(2) char gDropDoActionJPNTex[] = dgDropDoActionJPNTex;
+
+#define dgDownDoActionJPNTex "__OTR__textures/do_action_static/gDownDoActionJPNTex"
+static const ALIGN_ASSET(2) char gDownDoActionJPNTex[] = dgDownDoActionJPNTex;
+
+#define dgSaveDoActionJPNTex "__OTR__textures/do_action_static/gSaveDoActionJPNTex"
+static const ALIGN_ASSET(2) char gSaveDoActionJPNTex[] = dgSaveDoActionJPNTex;
+
+#define dgSpeakDoActionJPNTex "__OTR__textures/do_action_static/gSpeakDoActionJPNTex"
+static const ALIGN_ASSET(2) char gSpeakDoActionJPNTex[] = dgSpeakDoActionJPNTex;
+
+#define dgNextDoActionJPNTex "__OTR__textures/do_action_static/gNextDoActionJPNTex"
+static const ALIGN_ASSET(2) char gNextDoActionJPNTex[] = dgNextDoActionJPNTex;
+
+#define dgGrabDoActionJPNTex "__OTR__textures/do_action_static/gGrabDoActionJPNTex"
+static const ALIGN_ASSET(2) char gGrabDoActionJPNTex[] = dgGrabDoActionJPNTex;
+
+#define dgStopDoActionJPNTex "__OTR__textures/do_action_static/gStopDoActionJPNTex"
+static const ALIGN_ASSET(2) char gStopDoActionJPNTex[] = dgStopDoActionJPNTex;
+
+#define dgPutAwayDoActionJPNTex "__OTR__textures/do_action_static/gPutAwayDoActionJPNTex"
+static const ALIGN_ASSET(2) char gPutAwayDoActionJPNTex[] = dgPutAwayDoActionJPNTex;
+
+#define dgReelDoActionJPNTex "__OTR__textures/do_action_static/gReelDoActionJPNTex"
+static const ALIGN_ASSET(2) char gReelDoActionJPNTex[] = dgReelDoActionJPNTex;
+
+#define dgNum1DoActionJPNTex "__OTR__textures/do_action_static/gNum1DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum1DoActionJPNTex[] = dgNum1DoActionJPNTex;
+
+#define dgNum2DoActionJPNTex "__OTR__textures/do_action_static/gNum2DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum2DoActionJPNTex[] = dgNum2DoActionJPNTex;
+
+#define dgNum3DoActionJPNTex "__OTR__textures/do_action_static/gNum3DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum3DoActionJPNTex[] = dgNum3DoActionJPNTex;
+
+#define dgNum4DoActionJPNTex "__OTR__textures/do_action_static/gNum4DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum4DoActionJPNTex[] = dgNum4DoActionJPNTex;
+
+#define dgNum5DoActionJPNTex "__OTR__textures/do_action_static/gNum5DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum5DoActionJPNTex[] = dgNum5DoActionJPNTex;
+
+#define dgNum6DoActionJPNTex "__OTR__textures/do_action_static/gNum6DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum6DoActionJPNTex[] = dgNum6DoActionJPNTex;
+
+#define dgNum7DoActionJPNTex "__OTR__textures/do_action_static/gNum7DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum7DoActionJPNTex[] = dgNum7DoActionJPNTex;
+
+#define dgNum8DoActionJPNTex "__OTR__textures/do_action_static/gNum8DoActionJPNTex"
+static const ALIGN_ASSET(2) char gNum8DoActionJPNTex[] = dgNum8DoActionJPNTex;
+
+
 #endif // TEXTURES_DO_ACTION_STATIC_H
diff --git a/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h b/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h
index 2afcd89871..5f04c8faaf 100644
--- a/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h
+++ b/soh/assets/textures/icon_item_gameover_static/icon_item_gameover_static.h
@@ -24,4 +24,7 @@ static const ALIGN_ASSET(2) char gContinuePlayingGERTex[] = dgContinuePlayingGER
 #define dgContinuePlayingFRATex "__OTR__textures/icon_item_gameover_static/gContinuePlayingFRATex"
 static const ALIGN_ASSET(2) char gContinuePlayingFRATex[] = dgContinuePlayingFRATex;
 
+#define dgContinuePlayingJPNTex "__OTR__textures/icon_item_gameover_static/gContinuePlayingJPNTex"
+static const ALIGN_ASSET(2) char gContinuePlayingJPNTex[] = dgContinuePlayingJPNTex;
+
 #endif // TEXTURES_ICON_ITEM_GAMEOVER_STATIC_H
diff --git a/soh/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h b/soh/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h
new file mode 100644
index 0000000000..615e7259e5
--- /dev/null
+++ b/soh/assets/textures/icon_item_jpn_static/icon_item_jpn_static.h
@@ -0,0 +1,100 @@
+#ifndef TEXTURES_ICON_ITEM_JPN_STATIC_H
+#define TEXTURES_ICON_ITEM_JPN_STATIC_H 1
+
+#include "align_asset_macro.h"
+
+#define dgPauseDekuTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseDekuTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseDekuTitleJPNTex[] = dgPauseDekuTitleJPNTex;
+
+#define dgPauseDodongoTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseDodongoTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseDodongoTitleJPNTex[] = dgPauseDodongoTitleJPNTex;
+
+#define dgPauseJabuTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseJabuTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseJabuTitleJPNTex[] = dgPauseJabuTitleJPNTex;
+
+#define dgPauseForestTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseForestTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseForestTitleJPNTex[] = dgPauseForestTitleJPNTex;
+
+#define dgPauseFireTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseFireTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseFireTitleJPNTex[] = dgPauseFireTitleJPNTex;
+
+#define dgPauseWaterTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseWaterTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseWaterTitleJPNTex[] = dgPauseWaterTitleJPNTex;
+
+#define dgPauseSpiritTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseSpiritTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseSpiritTitleJPNTex[] = dgPauseSpiritTitleJPNTex;
+
+#define dgPauseShadowTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseShadowTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseShadowTitleJPNTex[] = dgPauseShadowTitleJPNTex;
+
+#define dgPauseBotWTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseBotWTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseBotWTitleJPNTex[] = dgPauseBotWTitleJPNTex;
+
+#define dgPauseIceCavernTitleJPNTex "__OTR__textures/icon_item_jpn_static/gPauseIceCavernTitleJPNTex"
+static const ALIGN_ASSET(2) char gPauseIceCavernTitleJPNTex[] = dgPauseIceCavernTitleJPNTex;
+
+#define dgPauseToEquipJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToEquipJPNTex"
+static const ALIGN_ASSET(2) char gPauseToEquipJPNTex[] = dgPauseToEquipJPNTex;
+
+#define dgPauseToDecideJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToDecideJPNTex"
+static const ALIGN_ASSET(2) char gPauseToDecideJPNTex[] = dgPauseToDecideJPNTex;
+
+#define dgPauseToPlayMelodyJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToPlayMelodyJPNTex"
+static const ALIGN_ASSET(2) char gPauseToPlayMelodyJPNTex[] = dgPauseToPlayMelodyJPNTex;
+
+#define dgPauseToSelectItemJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToSelectItemJPNTex"
+static const ALIGN_ASSET(2) char gPauseToSelectItemJPNTex[] = dgPauseToSelectItemJPNTex;
+
+#define dgPauseToMapJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToMapJPNTex"
+static const ALIGN_ASSET(2) char gPauseToMapJPNTex[] = dgPauseToMapJPNTex;
+
+#define dgPauseToQuestStatusJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToQuestStatusJPNTex"
+static const ALIGN_ASSET(2) char gPauseToQuestStatusJPNTex[] = dgPauseToQuestStatusJPNTex;
+
+#define dgPauseToEquipmentJPNTex "__OTR__textures/icon_item_jpn_static/gPauseToEquipmentJPNTex"
+static const ALIGN_ASSET(2) char gPauseToEquipmentJPNTex[] = dgPauseToEquipmentJPNTex;
+
+#define dgPauseSavePromptJPNTex "__OTR__textures/icon_item_jpn_static/gPauseSavePromptJPNTex"
+static const ALIGN_ASSET(2) char gPauseSavePromptJPNTex[] = dgPauseSavePromptJPNTex;
+
+#define dgPauseSaveConfirmationJPNTex "__OTR__textures/icon_item_jpn_static/gPauseSaveConfirmationJPNTex"
+static const ALIGN_ASSET(2) char gPauseSaveConfirmationJPNTex[] = dgPauseSaveConfirmationJPNTex;
+
+#define dgPauseYesJPNTex "__OTR__textures/icon_item_jpn_static/gPauseYesJPNTex"
+static const ALIGN_ASSET(2) char gPauseYesJPNTex[] = dgPauseYesJPNTex;
+
+#define dgPauseNoJPNTex "__OTR__textures/icon_item_jpn_static/gPauseNoJPNTex"
+static const ALIGN_ASSET(2) char gPauseNoJPNTex[] = dgPauseNoJPNTex;
+
+#define dgPauseCurrentPositionJPNTex "__OTR__textures/icon_item_jpn_static/gPauseCurrentPositionJPNTex"
+static const ALIGN_ASSET(2) char gPauseCurrentPositionJPNTex[] = dgPauseCurrentPositionJPNTex;
+
+#define dgPauseEquipment10JPNTex "__OTR__textures/icon_item_jpn_static/gPauseEquipment10JPNTex"
+static const ALIGN_ASSET(2) char gPauseEquipment10JPNTex[] = dgPauseEquipment10JPNTex;
+
+#define dgPauseSelectItem00JPNTex "__OTR__textures/icon_item_jpn_static/gPauseSelectItem00JPNTex"
+static const ALIGN_ASSET(2) char gPauseSelectItem00JPNTex[] = dgPauseSelectItem00JPNTex;
+
+#define dgPauseSelectItem10JPNTex "__OTR__textures/icon_item_jpn_static/gPauseSelectItem10JPNTex"
+static const ALIGN_ASSET(2) char gPauseSelectItem10JPNTex[] = dgPauseSelectItem10JPNTex;
+
+#define dgPauseSelectItem20JPNTex "__OTR__textures/icon_item_jpn_static/gPauseSelectItem20JPNTex"
+static const ALIGN_ASSET(2) char gPauseSelectItem20JPNTex[] = dgPauseSelectItem20JPNTex;
+
+#define dgPauseMap10JPNTex "__OTR__textures/icon_item_jpn_static/gPauseMap10JPNTex"
+static const ALIGN_ASSET(2) char gPauseMap10JPNTex[] = dgPauseMap10JPNTex;
+
+#define dgPauseQuestStatus00JPNTex "__OTR__textures/icon_item_jpn_static/gPauseQuestStatus00JPNTex"
+static const ALIGN_ASSET(2) char gPauseQuestStatus00JPNTex[] = dgPauseQuestStatus00JPNTex;
+
+#define dgPauseQuestStatus10JPNTex "__OTR__textures/icon_item_jpn_static/gPauseQuestStatus10JPNTex"
+static const ALIGN_ASSET(2) char gPauseQuestStatus10JPNTex[] = dgPauseQuestStatus10JPNTex;
+
+#define dgPauseQuestStatus20JPNTex "__OTR__textures/icon_item_jpn_static/gPauseQuestStatus20JPNTex"
+static const ALIGN_ASSET(2) char gPauseQuestStatus20JPNTex[] = dgPauseQuestStatus20JPNTex;
+
+#define dgPauseSave10JPNTex "__OTR__textures/icon_item_jpn_static/gPauseSave10JPNTex"
+static const ALIGN_ASSET(2) char gPauseSave10JPNTex[] = dgPauseSave10JPNTex;
+
+
+#endif // TEXTURES_ICON_ITEM_JPN_STATIC_H
\ No newline at end of file
diff --git a/soh/assets/textures/item_name_static/item_name_static.h b/soh/assets/textures/item_name_static/item_name_static.h
index 86af0cab01..0f97677a6a 100644
--- a/soh/assets/textures/item_name_static/item_name_static.h
+++ b/soh/assets/textures/item_name_static/item_name_static.h
@@ -1110,4 +1110,340 @@ static const ALIGN_ASSET(2) char gUnusedBossKeyItemName21JPNTex[] = dgUnusedBoss
 #define dgBiggoronsSwordItemNameFRATex "__OTR__textures/item_name_static/gBiggoronsSwordItemNameFRATex"
 static const ALIGN_ASSET(2) char gBiggoronsSwordItemNameFRATex[] = dgBiggoronsSwordItemNameFRATex;
 
+#define dgDekuStickItemNameJPNTex "__OTR__textures/item_name_static/gDekuStickItemNameJPNTex"
+static const ALIGN_ASSET(2) char gDekuStickItemNameJPNTex[] = dgDekuStickItemNameJPNTex;
+
+#define dgDekuNutItemNameJPNTex "__OTR__textures/item_name_static/gDekuNutItemNameJPNTex"
+static const ALIGN_ASSET(2) char gDekuNutItemNameJPNTex[] = dgDekuNutItemNameJPNTex;
+
+#define dgBombItemNameJPNTex "__OTR__textures/item_name_static/gBombItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBombItemNameJPNTex[] = dgBombItemNameJPNTex;
+
+#define dgFairyBowItemNameJPNTex "__OTR__textures/item_name_static/gFairyBowItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFairyBowItemNameJPNTex[] = dgFairyBowItemNameJPNTex;
+
+#define dgFireArrowItemNameJPNTex "__OTR__textures/item_name_static/gFireArrowItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFireArrowItemNameJPNTex[] = dgFireArrowItemNameJPNTex;
+
+#define dgDinsFireItemNameJPNTex "__OTR__textures/item_name_static/gDinsFireItemNameJPNTex"
+static const ALIGN_ASSET(2) char gDinsFireItemNameJPNTex[] = dgDinsFireItemNameJPNTex;
+
+#define dgFairySlingshotItemNameJPNTex "__OTR__textures/item_name_static/gFairySlingshotItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFairySlingshotItemNameJPNTex[] = dgFairySlingshotItemNameJPNTex;
+
+#define dgFairyOcarinaItemNameJPNTex "__OTR__textures/item_name_static/gFairyOcarinaItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFairyOcarinaItemNameJPNTex[] = dgFairyOcarinaItemNameJPNTex;
+
+#define dgOcarinaOfTimeItemNameJPNTex "__OTR__textures/item_name_static/gOcarinaOfTimeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gOcarinaOfTimeItemNameJPNTex[] = dgOcarinaOfTimeItemNameJPNTex;
+
+#define dgBombchuItemNameJPNTex "__OTR__textures/item_name_static/gBombchuItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBombchuItemNameJPNTex[] = dgBombchuItemNameJPNTex;
+
+#define dgHookshotItemNameJPNTex "__OTR__textures/item_name_static/gHookshotItemNameJPNTex"
+static const ALIGN_ASSET(2) char gHookshotItemNameJPNTex[] = dgHookshotItemNameJPNTex;
+
+#define dgLongshotItemNameJPNTex "__OTR__textures/item_name_static/gLongshotItemNameJPNTex"
+static const ALIGN_ASSET(2) char gLongshotItemNameJPNTex[] = dgLongshotItemNameJPNTex;
+
+#define dgIceArrowItemNameJPNTex "__OTR__textures/item_name_static/gIceArrowItemNameJPNTex"
+static const ALIGN_ASSET(2) char gIceArrowItemNameJPNTex[] = dgIceArrowItemNameJPNTex;
+
+#define dgFaroresWindItemNameJPNTex "__OTR__textures/item_name_static/gFaroresWindItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFaroresWindItemNameJPNTex[] = dgFaroresWindItemNameJPNTex;
+
+#define dgBoomerangItemNameJPNTex "__OTR__textures/item_name_static/gBoomerangItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBoomerangItemNameJPNTex[] = dgBoomerangItemNameJPNTex;
+
+#define dgLensItemNameJPNTex "__OTR__textures/item_name_static/gLensItemNameJPNTex"
+static const ALIGN_ASSET(2) char gLensItemNameJPNTex[] = dgLensItemNameJPNTex;
+
+#define dgMagicBeansItemNameJPNTex "__OTR__textures/item_name_static/gMagicBeansItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMagicBeansItemNameJPNTex[] = dgMagicBeansItemNameJPNTex;
+
+#define dgMegatonHammerItemNameJPNTex "__OTR__textures/item_name_static/gMegatonHammerItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMegatonHammerItemNameJPNTex[] = dgMegatonHammerItemNameJPNTex;
+
+#define dgLightArrowItemNameJPNTex "__OTR__textures/item_name_static/gLightArrowItemNameJPNTex"
+static const ALIGN_ASSET(2) char gLightArrowItemNameJPNTex[] = dgLightArrowItemNameJPNTex;
+
+#define dgNayrusLoveItemNameJPNTex "__OTR__textures/item_name_static/gNayrusLoveItemNameJPNTex"
+static const ALIGN_ASSET(2) char gNayrusLoveItemNameJPNTex[] = dgNayrusLoveItemNameJPNTex;
+
+#define dgEmptyBottleItemNameJPNTex "__OTR__textures/item_name_static/gEmptyBottleItemNameJPNTex"
+static const ALIGN_ASSET(2) char gEmptyBottleItemNameJPNTex[] = dgEmptyBottleItemNameJPNTex;
+
+#define dgRedPotionItemNameJPNTex "__OTR__textures/item_name_static/gRedPotionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gRedPotionItemNameJPNTex[] = dgRedPotionItemNameJPNTex;
+
+#define dgGreenPotionItemNameJPNTex "__OTR__textures/item_name_static/gGreenPotionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGreenPotionItemNameJPNTex[] = dgGreenPotionItemNameJPNTex;
+
+#define dgBluePotionItemNameJPNTex "__OTR__textures/item_name_static/gBluePotionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBluePotionItemNameJPNTex[] = dgBluePotionItemNameJPNTex;
+
+#define dgBottledFairyItemNameJPNTex "__OTR__textures/item_name_static/gBottledFairyItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBottledFairyItemNameJPNTex[] = dgBottledFairyItemNameJPNTex;
+
+#define dgFishItemNameJPNTex "__OTR__textures/item_name_static/gFishItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFishItemNameJPNTex[] = dgFishItemNameJPNTex;
+
+#define dgFullMilkItemNameJPNTex "__OTR__textures/item_name_static/gFullMilkItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFullMilkItemNameJPNTex[] = dgFullMilkItemNameJPNTex;
+
+#define dgRutosLetterItemNameJPNTex "__OTR__textures/item_name_static/gRutosLetterItemNameJPNTex"
+static const ALIGN_ASSET(2) char gRutosLetterItemNameJPNTex[] = dgRutosLetterItemNameJPNTex;
+
+#define dgBlueFireItemNameJPNTex "__OTR__textures/item_name_static/gBlueFireItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBlueFireItemNameJPNTex[] = dgBlueFireItemNameJPNTex;
+
+#define dgBugItemNameJPNTex "__OTR__textures/item_name_static/gBugItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBugItemNameJPNTex[] = dgBugItemNameJPNTex;
+
+#define dgBigPoeItemNameJPNTex "__OTR__textures/item_name_static/gBigPoeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBigPoeItemNameJPNTex[] = dgBigPoeItemNameJPNTex;
+
+#define dgHalfMilkItemNameJPNTex "__OTR__textures/item_name_static/gHalfMilkItemNameJPNTex"
+static const ALIGN_ASSET(2) char gHalfMilkItemNameJPNTex[] = dgHalfMilkItemNameJPNTex;
+
+#define dgPoeItemNameJPNTex "__OTR__textures/item_name_static/gPoeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPoeItemNameJPNTex[] = dgPoeItemNameJPNTex;
+
+#define dgWeirdEggItemNameJPNTex "__OTR__textures/item_name_static/gWeirdEggItemNameJPNTex"
+static const ALIGN_ASSET(2) char gWeirdEggItemNameJPNTex[] = dgWeirdEggItemNameJPNTex;
+
+#define dgCuccoItemNameJPNTex "__OTR__textures/item_name_static/gCuccoItemNameJPNTex"
+static const ALIGN_ASSET(2) char gCuccoItemNameJPNTex[] = dgCuccoItemNameJPNTex;
+
+#define dgZeldasLetterItemNameJPNTex "__OTR__textures/item_name_static/gZeldasLetterItemNameJPNTex"
+static const ALIGN_ASSET(2) char gZeldasLetterItemNameJPNTex[] = dgZeldasLetterItemNameJPNTex;
+
+#define dgKeatonMaskItemNameJPNTex "__OTR__textures/item_name_static/gKeatonMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gKeatonMaskItemNameJPNTex[] = dgKeatonMaskItemNameJPNTex;
+
+#define dgSkullMaskItemNameJPNTex "__OTR__textures/item_name_static/gSkullMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSkullMaskItemNameJPNTex[] = dgSkullMaskItemNameJPNTex;
+
+#define dgSpookyMaskItemNameJPNTex "__OTR__textures/item_name_static/gSpookyMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSpookyMaskItemNameJPNTex[] = dgSpookyMaskItemNameJPNTex;
+
+#define dgBunnyHoodItemNameJPNTex "__OTR__textures/item_name_static/gBunnyHoodItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBunnyHoodItemNameJPNTex[] = dgBunnyHoodItemNameJPNTex;
+
+#define dgGoronMaskItemNameJPNTex "__OTR__textures/item_name_static/gGoronMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoronMaskItemNameJPNTex[] = dgGoronMaskItemNameJPNTex;
+
+#define dgZoraMaskItemNameJPNTex "__OTR__textures/item_name_static/gZoraMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gZoraMaskItemNameJPNTex[] = dgZoraMaskItemNameJPNTex;
+
+#define dgGerudoMaskItemNameJPNTex "__OTR__textures/item_name_static/gGerudoMaskItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudoMaskItemNameJPNTex[] = dgGerudoMaskItemNameJPNTex;
+
+#define dgMaskofTruthItemNameJPNTex "__OTR__textures/item_name_static/gMaskofTruthItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMaskofTruthItemNameJPNTex[] = dgMaskofTruthItemNameJPNTex;
+
+#define dgSOLDOUTItemNameJPNTex "__OTR__textures/item_name_static/gSOLDOUTItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSOLDOUTItemNameJPNTex[] = dgSOLDOUTItemNameJPNTex;
+
+#define dgPocketEggItemNameJPNTex "__OTR__textures/item_name_static/gPocketEggItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPocketEggItemNameJPNTex[] = dgPocketEggItemNameJPNTex;
+
+#define dgPocketCuccoItemNameJPNTex "__OTR__textures/item_name_static/gPocketCuccoItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPocketCuccoItemNameJPNTex[] = dgPocketCuccoItemNameJPNTex;
+
+#define dgCojiroItemNameJPNTex "__OTR__textures/item_name_static/gCojiroItemNameJPNTex"
+static const ALIGN_ASSET(2) char gCojiroItemNameJPNTex[] = dgCojiroItemNameJPNTex;
+
+#define dgOddMushroomItemNameJPNTex "__OTR__textures/item_name_static/gOddMushroomItemNameJPNTex"
+static const ALIGN_ASSET(2) char gOddMushroomItemNameJPNTex[] = dgOddMushroomItemNameJPNTex;
+
+#define dgOddPotionItemNameJPNTex "__OTR__textures/item_name_static/gOddPotionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gOddPotionItemNameJPNTex[] = dgOddPotionItemNameJPNTex;
+
+#define dgPoachersSawItemNameJPNTex "__OTR__textures/item_name_static/gPoachersSawItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPoachersSawItemNameJPNTex[] = dgPoachersSawItemNameJPNTex;
+
+#define dgBrokenGoronsSwordItemNameJPNTex "__OTR__textures/item_name_static/gBrokenGoronsSwordItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBrokenGoronsSwordItemNameJPNTex[] = dgBrokenGoronsSwordItemNameJPNTex;
+
+#define dgPrescriptionItemNameJPNTex "__OTR__textures/item_name_static/gPrescriptionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPrescriptionItemNameJPNTex[] = dgPrescriptionItemNameJPNTex;
+
+#define dgEyeBallFrogItemNameJPNTex "__OTR__textures/item_name_static/gEyeBallFrogItemNameJPNTex"
+static const ALIGN_ASSET(2) char gEyeBallFrogItemNameJPNTex[] = dgEyeBallFrogItemNameJPNTex;
+
+#define dgEyeDropsItemNameJPNTex "__OTR__textures/item_name_static/gEyeDropsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gEyeDropsItemNameJPNTex[] = dgEyeDropsItemNameJPNTex;
+
+#define dgClaimCheckItemNameJPNTex "__OTR__textures/item_name_static/gClaimCheckItemNameJPNTex"
+static const ALIGN_ASSET(2) char gClaimCheckItemNameJPNTex[] = dgClaimCheckItemNameJPNTex;
+
+#define dgKokiriSwordItemNameJPNTex "__OTR__textures/item_name_static/gKokiriSwordItemNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriSwordItemNameJPNTex[] = dgKokiriSwordItemNameJPNTex;
+
+#define dgMasterSwordItemNameJPNTex "__OTR__textures/item_name_static/gMasterSwordItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMasterSwordItemNameJPNTex[] = dgMasterSwordItemNameJPNTex;
+
+#define dgGiantsKnifeItemNameJPNTex "__OTR__textures/item_name_static/gGiantsKnifeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGiantsKnifeItemNameJPNTex[] = dgGiantsKnifeItemNameJPNTex;
+
+#define dgDekuShieldItemNameJPNTex "__OTR__textures/item_name_static/gDekuShieldItemNameJPNTex"
+static const ALIGN_ASSET(2) char gDekuShieldItemNameJPNTex[] = dgDekuShieldItemNameJPNTex;
+
+#define dgHylianShieldItemNameJPNTex "__OTR__textures/item_name_static/gHylianShieldItemNameJPNTex"
+static const ALIGN_ASSET(2) char gHylianShieldItemNameJPNTex[] = dgHylianShieldItemNameJPNTex;
+
+#define dgMirrorShieldItemNameJPNTex "__OTR__textures/item_name_static/gMirrorShieldItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMirrorShieldItemNameJPNTex[] = dgMirrorShieldItemNameJPNTex;
+
+#define dgKokiriTunicItemNameJPNTex "__OTR__textures/item_name_static/gKokiriTunicItemNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriTunicItemNameJPNTex[] = dgKokiriTunicItemNameJPNTex;
+
+#define dgGoronTunicItemNameJPNTex "__OTR__textures/item_name_static/gGoronTunicItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoronTunicItemNameJPNTex[] = dgGoronTunicItemNameJPNTex;
+
+#define dgZoraTunicItemNameJPNTex "__OTR__textures/item_name_static/gZoraTunicItemNameJPNTex"
+static const ALIGN_ASSET(2) char gZoraTunicItemNameJPNTex[] = dgZoraTunicItemNameJPNTex;
+
+#define dgKokiriBootsItemNameJPNTex "__OTR__textures/item_name_static/gKokiriBootsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriBootsItemNameJPNTex[] = dgKokiriBootsItemNameJPNTex;
+
+#define dgIronBootsItemNameJPNTex "__OTR__textures/item_name_static/gIronBootsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gIronBootsItemNameJPNTex[] = dgIronBootsItemNameJPNTex;
+
+#define dgHoverBootsItemNameJPNTex "__OTR__textures/item_name_static/gHoverBootsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gHoverBootsItemNameJPNTex[] = dgHoverBootsItemNameJPNTex;
+
+#define dgBulletBag30ItemNameJPNTex "__OTR__textures/item_name_static/gBulletBag30ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBulletBag30ItemNameJPNTex[] = dgBulletBag30ItemNameJPNTex;
+
+#define dgBulletBag40ItemNameJPNTex "__OTR__textures/item_name_static/gBulletBag40ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBulletBag40ItemNameJPNTex[] = dgBulletBag40ItemNameJPNTex;
+
+#define dgBulletBag50ItemNameJPNTex "__OTR__textures/item_name_static/gBulletBag50ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBulletBag50ItemNameJPNTex[] = dgBulletBag50ItemNameJPNTex;
+
+#define dgQuiver30ItemNameJPNTex "__OTR__textures/item_name_static/gQuiver30ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gQuiver30ItemNameJPNTex[] = dgQuiver30ItemNameJPNTex;
+
+#define dgQuiver40ItemNameJPNTex "__OTR__textures/item_name_static/gQuiver40ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gQuiver40ItemNameJPNTex[] = dgQuiver40ItemNameJPNTex;
+
+#define dgQuiver50ItemNameJPNTex "__OTR__textures/item_name_static/gQuiver50ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gQuiver50ItemNameJPNTex[] = dgQuiver50ItemNameJPNTex;
+
+#define dgBombBag20ItemNameJPNTex "__OTR__textures/item_name_static/gBombBag20ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBombBag20ItemNameJPNTex[] = dgBombBag20ItemNameJPNTex;
+
+#define dgBombBag30ItemNameJPNTex "__OTR__textures/item_name_static/gBombBag30ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBombBag30ItemNameJPNTex[] = dgBombBag30ItemNameJPNTex;
+
+#define dgBombBag40ItemNameJPNTex "__OTR__textures/item_name_static/gBombBag40ItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBombBag40ItemNameJPNTex[] = dgBombBag40ItemNameJPNTex;
+
+#define dgGoronsBraceletItemNameJPNTex "__OTR__textures/item_name_static/gGoronsBraceletItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoronsBraceletItemNameJPNTex[] = dgGoronsBraceletItemNameJPNTex;
+
+#define dgSilverGauntletsItemNameJPNTex "__OTR__textures/item_name_static/gSilverGauntletsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSilverGauntletsItemNameJPNTex[] = dgSilverGauntletsItemNameJPNTex;
+
+#define dgGoldenGauntletsItemNameJPNTex "__OTR__textures/item_name_static/gGoldenGauntletsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoldenGauntletsItemNameJPNTex[] = dgGoldenGauntletsItemNameJPNTex;
+
+#define dgSilverScaleItemNameJPNTex "__OTR__textures/item_name_static/gSilverScaleItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSilverScaleItemNameJPNTex[] = dgSilverScaleItemNameJPNTex;
+
+#define dgGoldenScaleItemNameJPNTex "__OTR__textures/item_name_static/gGoldenScaleItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoldenScaleItemNameJPNTex[] = dgGoldenScaleItemNameJPNTex;
+
+#define dgBrokenGiantsKnifeItemNameJPNTex "__OTR__textures/item_name_static/gBrokenGiantsKnifeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBrokenGiantsKnifeItemNameJPNTex[] = dgBrokenGiantsKnifeItemNameJPNTex;
+
+#define dgMinuetOfForestItemNameJPNTex "__OTR__textures/item_name_static/gMinuetOfForestItemNameJPNTex"
+static const ALIGN_ASSET(2) char gMinuetOfForestItemNameJPNTex[] = dgMinuetOfForestItemNameJPNTex;
+
+#define dgBoleroOfFireItemNameJPNTex "__OTR__textures/item_name_static/gBoleroOfFireItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBoleroOfFireItemNameJPNTex[] = dgBoleroOfFireItemNameJPNTex;
+
+#define dgSerenadeOfWaterItemNameJPNTex "__OTR__textures/item_name_static/gSerenadeOfWaterItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSerenadeOfWaterItemNameJPNTex[] = dgSerenadeOfWaterItemNameJPNTex;
+
+#define dgRequiemOfSpiritItemNameJPNTex "__OTR__textures/item_name_static/gRequiemOfSpiritItemNameJPNTex"
+static const ALIGN_ASSET(2) char gRequiemOfSpiritItemNameJPNTex[] = dgRequiemOfSpiritItemNameJPNTex;
+
+#define dgNocturneOfShadowItemNameJPNTex "__OTR__textures/item_name_static/gNocturneOfShadowItemNameJPNTex"
+static const ALIGN_ASSET(2) char gNocturneOfShadowItemNameJPNTex[] = dgNocturneOfShadowItemNameJPNTex;
+
+#define dgPreludeOfLightItemNameJPNTex "__OTR__textures/item_name_static/gPreludeOfLightItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPreludeOfLightItemNameJPNTex[] = dgPreludeOfLightItemNameJPNTex;
+
+#define dgZeldasLullabyItemNameJPNTex "__OTR__textures/item_name_static/gZeldasLullabyItemNameJPNTex"
+static const ALIGN_ASSET(2) char gZeldasLullabyItemNameJPNTex[] = dgZeldasLullabyItemNameJPNTex;
+
+#define dgEponasSongItemNameJPNTex "__OTR__textures/item_name_static/gEponasSongItemNameJPNTex"
+static const ALIGN_ASSET(2) char gEponasSongItemNameJPNTex[] = dgEponasSongItemNameJPNTex;
+
+#define dgSariasSongItemNameJPNTex "__OTR__textures/item_name_static/gSariasSongItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSariasSongItemNameJPNTex[] = dgSariasSongItemNameJPNTex;
+
+#define dgSunsSongItemNameJPNTex "__OTR__textures/item_name_static/gSunsSongItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSunsSongItemNameJPNTex[] = dgSunsSongItemNameJPNTex;
+
+#define dgSongOfTimeItemNameJPNTex "__OTR__textures/item_name_static/gSongOfTimeItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSongOfTimeItemNameJPNTex[] = dgSongOfTimeItemNameJPNTex;
+
+#define dgSongOfStormsItemNameJPNTex "__OTR__textures/item_name_static/gSongOfStormsItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSongOfStormsItemNameJPNTex[] = dgSongOfStormsItemNameJPNTex;
+
+#define dgForestMedallionItemNameJPNTex "__OTR__textures/item_name_static/gForestMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gForestMedallionItemNameJPNTex[] = dgForestMedallionItemNameJPNTex;
+
+#define dgFireMedallionItemNameJPNTex "__OTR__textures/item_name_static/gFireMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gFireMedallionItemNameJPNTex[] = dgFireMedallionItemNameJPNTex;
+
+#define dgWaterMedallionItemNameJPNTex "__OTR__textures/item_name_static/gWaterMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gWaterMedallionItemNameJPNTex[] = dgWaterMedallionItemNameJPNTex;
+
+#define dgSpiritMedallionItemNameJPNTex "__OTR__textures/item_name_static/gSpiritMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gSpiritMedallionItemNameJPNTex[] = dgSpiritMedallionItemNameJPNTex;
+
+#define dgShadowMedallionItemNameJPNTex "__OTR__textures/item_name_static/gShadowMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gShadowMedallionItemNameJPNTex[] = dgShadowMedallionItemNameJPNTex;
+
+#define dgLightMedallionItemNameJPNTex "__OTR__textures/item_name_static/gLightMedallionItemNameJPNTex"
+static const ALIGN_ASSET(2) char gLightMedallionItemNameJPNTex[] = dgLightMedallionItemNameJPNTex;
+
+#define dgKokiriEmeraldItemNameJPNTex "__OTR__textures/item_name_static/gKokiriEmeraldItemNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriEmeraldItemNameJPNTex[] = dgKokiriEmeraldItemNameJPNTex;
+
+#define dgGoronsRubyItemNameJPNTex "__OTR__textures/item_name_static/gGoronsRubyItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoronsRubyItemNameJPNTex[] = dgGoronsRubyItemNameJPNTex;
+
+#define dgZorasSapphireItemNameJPNTex "__OTR__textures/item_name_static/gZorasSapphireItemNameJPNTex"
+static const ALIGN_ASSET(2) char gZorasSapphireItemNameJPNTex[] = dgZorasSapphireItemNameJPNTex;
+
+#define dgStoneofAgonyItemNameJPNTex "__OTR__textures/item_name_static/gStoneofAgonyItemNameJPNTex"
+static const ALIGN_ASSET(2) char gStoneofAgonyItemNameJPNTex[] = dgStoneofAgonyItemNameJPNTex;
+
+#define dgGerudosCardItemNameJPNTex "__OTR__textures/item_name_static/gGerudosCardItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudosCardItemNameJPNTex[] = dgGerudosCardItemNameJPNTex;
+
+#define dgGoldSkulltulaItemNameJPNTex "__OTR__textures/item_name_static/gGoldSkulltulaItemNameJPNTex"
+static const ALIGN_ASSET(2) char gGoldSkulltulaItemNameJPNTex[] = dgGoldSkulltulaItemNameJPNTex;
+
+#define dgPieceOfHeartItemNameJPNTex "__OTR__textures/item_name_static/gPieceOfHeartItemNameJPNTex"
+static const ALIGN_ASSET(2) char gPieceOfHeartItemNameJPNTex[] = dgPieceOfHeartItemNameJPNTex;
+
+#define dgUnusedBigKeyItemNameJPNTex "__OTR__textures/item_name_static/gUnusedBigKeyItemNameJPNTex"
+static const ALIGN_ASSET(2) char gUnusedBigKeyItemNameJPNTex[] = dgUnusedBigKeyItemNameJPNTex;
+
+#define dgCompassItemNameJPNTex "__OTR__textures/item_name_static/gCompassItemNameJPNTex"
+static const ALIGN_ASSET(2) char gCompassItemNameJPNTex[] = dgCompassItemNameJPNTex;
+
+#define dgDungeonMapItemNameJPNTex "__OTR__textures/item_name_static/gDungeonMapItemNameJPNTex"
+static const ALIGN_ASSET(2) char gDungeonMapItemNameJPNTex[] = dgDungeonMapItemNameJPNTex;
+
+#define dgBiggoronsSwordItemNameJPNTex "__OTR__textures/item_name_static/gBiggoronsSwordItemNameJPNTex"
+static const ALIGN_ASSET(2) char gBiggoronsSwordItemNameJPNTex[] = dgBiggoronsSwordItemNameJPNTex;
+
 #endif // TEXTURES_ITEM_NAME_STATIC_H
diff --git a/soh/assets/textures/kanji/kanji.h b/soh/assets/textures/kanji/kanji.h
new file mode 100644
index 0000000000..4f961601ec
--- /dev/null
+++ b/soh/assets/textures/kanji/kanji.h
@@ -0,0 +1,11927 @@
+#ifndef INTERFACE_KANJI_H
+#define INTERFACE_KANJI_H 1
+
+#include "align_asset_macro.h"
+
+#define dgMsgKanji8140SpaceTex "__OTR__textures/kanji/gMsgKanji8140SpaceTex"
+static const ALIGN_ASSET(2) char gMsgKanji8140SpaceTex[] = dgMsgKanji8140SpaceTex;
+
+#define dgMsgKanji8141ToutenTex "__OTR__textures/kanji/gMsgKanji8141ToutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8141ToutenTex[] = dgMsgKanji8141ToutenTex;
+
+#define dgMsgKanji8142KutenTex "__OTR__textures/kanji/gMsgKanji8142KutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8142KutenTex[] = dgMsgKanji8142KutenTex;
+
+#define dgMsgKanji8143CommaTex "__OTR__textures/kanji/gMsgKanji8143CommaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8143CommaTex[] = dgMsgKanji8143CommaTex;
+
+#define dgMsgKanji8144PeriodTex "__OTR__textures/kanji/gMsgKanji8144PeriodTex"
+static const ALIGN_ASSET(2) char gMsgKanji8144PeriodTex[] = dgMsgKanji8144PeriodTex;
+
+#define dgMsgKanji8145NakatenTex "__OTR__textures/kanji/gMsgKanji8145NakatenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8145NakatenTex[] = dgMsgKanji8145NakatenTex;
+
+#define dgMsgKanji8146ColonTex "__OTR__textures/kanji/gMsgKanji8146ColonTex"
+static const ALIGN_ASSET(2) char gMsgKanji8146ColonTex[] = dgMsgKanji8146ColonTex;
+
+#define dgMsgKanji8147SemicolonTex "__OTR__textures/kanji/gMsgKanji8147SemicolonTex"
+static const ALIGN_ASSET(2) char gMsgKanji8147SemicolonTex[] = dgMsgKanji8147SemicolonTex;
+
+#define dgMsgKanji8148QuestionMarkTex "__OTR__textures/kanji/gMsgKanji8148QuestionMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji8148QuestionMarkTex[] = dgMsgKanji8148QuestionMarkTex;
+
+#define dgMsgKanji8149ExclamationMarkTex "__OTR__textures/kanji/gMsgKanji8149ExclamationMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji8149ExclamationMarkTex[] = dgMsgKanji8149ExclamationMarkTex;
+
+#define dgMsgKanji814ADakutenTex "__OTR__textures/kanji/gMsgKanji814ADakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji814ADakutenTex[] = dgMsgKanji814ADakutenTex;
+
+#define dgMsgKanji814BHandakutenTex "__OTR__textures/kanji/gMsgKanji814BHandakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji814BHandakutenTex[] = dgMsgKanji814BHandakutenTex;
+
+#define dgMsgKanji814CAcuteAccentTex "__OTR__textures/kanji/gMsgKanji814CAcuteAccentTex"
+static const ALIGN_ASSET(2) char gMsgKanji814CAcuteAccentTex[] = dgMsgKanji814CAcuteAccentTex;
+
+#define dgMsgKanji814DGraveAccentTex "__OTR__textures/kanji/gMsgKanji814DGraveAccentTex"
+static const ALIGN_ASSET(2) char gMsgKanji814DGraveAccentTex[] = dgMsgKanji814DGraveAccentTex;
+
+#define dgMsgKanji814EDiaeresisTex "__OTR__textures/kanji/gMsgKanji814EDiaeresisTex"
+static const ALIGN_ASSET(2) char gMsgKanji814EDiaeresisTex[] = dgMsgKanji814EDiaeresisTex;
+
+#define dgMsgKanji814FCircumflexAccentTex "__OTR__textures/kanji/gMsgKanji814FCircumflexAccentTex"
+static const ALIGN_ASSET(2) char gMsgKanji814FCircumflexAccentTex[] = dgMsgKanji814FCircumflexAccentTex;
+
+#define dgMsgKanji8150EmptyTex "__OTR__textures/kanji/gMsgKanji8150EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8150EmptyTex[] = dgMsgKanji8150EmptyTex;
+
+#define dgMsgKanji8151EmptyTex "__OTR__textures/kanji/gMsgKanji8151EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8151EmptyTex[] = dgMsgKanji8151EmptyTex;
+
+#define dgMsgKanji8152IchinojitenKatakanaTex "__OTR__textures/kanji/gMsgKanji8152IchinojitenKatakanaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8152IchinojitenKatakanaTex[] = dgMsgKanji8152IchinojitenKatakanaTex;
+
+#define dgMsgKanji8153IchinojitenKatakanaDakutenTex "__OTR__textures/kanji/gMsgKanji8153IchinojitenKatakanaDakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8153IchinojitenKatakanaDakutenTex[] = dgMsgKanji8153IchinojitenKatakanaDakutenTex;
+
+#define dgMsgKanji8154IchinojitenHiraganaTex "__OTR__textures/kanji/gMsgKanji8154IchinojitenHiraganaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8154IchinojitenHiraganaTex[] = dgMsgKanji8154IchinojitenHiraganaTex;
+
+#define dgMsgKanji8155IchinojitenHiraganaDakutenTex "__OTR__textures/kanji/gMsgKanji8155IchinojitenHiraganaDakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8155IchinojitenHiraganaDakutenTex[] = dgMsgKanji8155IchinojitenHiraganaDakutenTex;
+
+#define dgMsgKanji8156NonojitenTex "__OTR__textures/kanji/gMsgKanji8156NonojitenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8156NonojitenTex[] = dgMsgKanji8156NonojitenTex;
+
+#define dgMsgKanji8157Tex "__OTR__textures/kanji/gMsgKanji8157Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8157Tex[] = dgMsgKanji8157Tex;
+
+#define dgMsgKanji8158DounojitenTex "__OTR__textures/kanji/gMsgKanji8158DounojitenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8158DounojitenTex[] = dgMsgKanji8158DounojitenTex;
+
+#define dgMsgKanji8159ShimeTex "__OTR__textures/kanji/gMsgKanji8159ShimeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8159ShimeTex[] = dgMsgKanji8159ShimeTex;
+
+#define dgMsgKanji815AZeroTex "__OTR__textures/kanji/gMsgKanji815AZeroTex"
+static const ALIGN_ASSET(2) char gMsgKanji815AZeroTex[] = dgMsgKanji815AZeroTex;
+
+#define dgMsgKanji815BChouonpuTex "__OTR__textures/kanji/gMsgKanji815BChouonpuTex"
+static const ALIGN_ASSET(2) char gMsgKanji815BChouonpuTex[] = dgMsgKanji815BChouonpuTex;
+
+#define dgMsgKanji815CDashTex "__OTR__textures/kanji/gMsgKanji815CDashTex"
+static const ALIGN_ASSET(2) char gMsgKanji815CDashTex[] = dgMsgKanji815CDashTex;
+
+#define dgMsgKanji815DHyphenTex "__OTR__textures/kanji/gMsgKanji815DHyphenTex"
+static const ALIGN_ASSET(2) char gMsgKanji815DHyphenTex[] = dgMsgKanji815DHyphenTex;
+
+#define dgMsgKanji815ESlashTex "__OTR__textures/kanji/gMsgKanji815ESlashTex"
+static const ALIGN_ASSET(2) char gMsgKanji815ESlashTex[] = dgMsgKanji815ESlashTex;
+
+#define dgMsgKanji815FBackSlashTex "__OTR__textures/kanji/gMsgKanji815FBackSlashTex"
+static const ALIGN_ASSET(2) char gMsgKanji815FBackSlashTex[] = dgMsgKanji815FBackSlashTex;
+
+#define dgMsgKanji8160WaveDashTex "__OTR__textures/kanji/gMsgKanji8160WaveDashTex"
+static const ALIGN_ASSET(2) char gMsgKanji8160WaveDashTex[] = dgMsgKanji8160WaveDashTex;
+
+#define dgMsgKanji8161DoubleVerticalLineTex "__OTR__textures/kanji/gMsgKanji8161DoubleVerticalLineTex"
+static const ALIGN_ASSET(2) char gMsgKanji8161DoubleVerticalLineTex[] = dgMsgKanji8161DoubleVerticalLineTex;
+
+#define dgMsgKanji8162VerticalLineTex "__OTR__textures/kanji/gMsgKanji8162VerticalLineTex"
+static const ALIGN_ASSET(2) char gMsgKanji8162VerticalLineTex[] = dgMsgKanji8162VerticalLineTex;
+
+#define dgMsgKanji8163SantenLeaderTex "__OTR__textures/kanji/gMsgKanji8163SantenLeaderTex"
+static const ALIGN_ASSET(2) char gMsgKanji8163SantenLeaderTex[] = dgMsgKanji8163SantenLeaderTex;
+
+#define dgMsgKanji8164NitenLeaderTex "__OTR__textures/kanji/gMsgKanji8164NitenLeaderTex"
+static const ALIGN_ASSET(2) char gMsgKanji8164NitenLeaderTex[] = dgMsgKanji8164NitenLeaderTex;
+
+#define dgMsgKanji8165SingleQuotationMarkLeftTex "__OTR__textures/kanji/gMsgKanji8165SingleQuotationMarkLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8165SingleQuotationMarkLeftTex[] = dgMsgKanji8165SingleQuotationMarkLeftTex;
+
+#define dgMsgKanji8166SingleQuotationMarkRightTex "__OTR__textures/kanji/gMsgKanji8166SingleQuotationMarkRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8166SingleQuotationMarkRightTex[] = dgMsgKanji8166SingleQuotationMarkRightTex;
+
+#define dgMsgKanji8167DoubleQuotationMarkLeftTex "__OTR__textures/kanji/gMsgKanji8167DoubleQuotationMarkLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8167DoubleQuotationMarkLeftTex[] = dgMsgKanji8167DoubleQuotationMarkLeftTex;
+
+#define dgMsgKanji8168DoubleQuotationMarkRightTex "__OTR__textures/kanji/gMsgKanji8168DoubleQuotationMarkRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8168DoubleQuotationMarkRightTex[] = dgMsgKanji8168DoubleQuotationMarkRightTex;
+
+#define dgMsgKanji8169ParenthesesLeftTex "__OTR__textures/kanji/gMsgKanji8169ParenthesesLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8169ParenthesesLeftTex[] = dgMsgKanji8169ParenthesesLeftTex;
+
+#define dgMsgKanji816AParenthesesRightTex "__OTR__textures/kanji/gMsgKanji816AParenthesesRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji816AParenthesesRightTex[] = dgMsgKanji816AParenthesesRightTex;
+
+#define dgMsgKanji816BKikkoukakkoLeftTex "__OTR__textures/kanji/gMsgKanji816BKikkoukakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji816BKikkoukakkoLeftTex[] = dgMsgKanji816BKikkoukakkoLeftTex;
+
+#define dgMsgKanji816CKikkoukakkoRightTex "__OTR__textures/kanji/gMsgKanji816CKikkoukakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji816CKikkoukakkoRightTex[] = dgMsgKanji816CKikkoukakkoRightTex;
+
+#define dgMsgKanji816DSquareBracketLeftTex "__OTR__textures/kanji/gMsgKanji816DSquareBracketLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji816DSquareBracketLeftTex[] = dgMsgKanji816DSquareBracketLeftTex;
+
+#define dgMsgKanji816ESquareBracketRightTex "__OTR__textures/kanji/gMsgKanji816ESquareBracketRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji816ESquareBracketRightTex[] = dgMsgKanji816ESquareBracketRightTex;
+
+#define dgMsgKanji816FCurlyBracketLeftTex "__OTR__textures/kanji/gMsgKanji816FCurlyBracketLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji816FCurlyBracketLeftTex[] = dgMsgKanji816FCurlyBracketLeftTex;
+
+#define dgMsgKanji8170CurlyBracketRightTex "__OTR__textures/kanji/gMsgKanji8170CurlyBracketRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8170CurlyBracketRightTex[] = dgMsgKanji8170CurlyBracketRightTex;
+
+#define dgMsgKanji8171YamakakkoLeftTex "__OTR__textures/kanji/gMsgKanji8171YamakakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8171YamakakkoLeftTex[] = dgMsgKanji8171YamakakkoLeftTex;
+
+#define dgMsgKanji8172YamakakkoRightTex "__OTR__textures/kanji/gMsgKanji8172YamakakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8172YamakakkoRightTex[] = dgMsgKanji8172YamakakkoRightTex;
+
+#define dgMsgKanji8173NijyuuyamakakkoLeftTex "__OTR__textures/kanji/gMsgKanji8173NijyuuyamakakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8173NijyuuyamakakkoLeftTex[] = dgMsgKanji8173NijyuuyamakakkoLeftTex;
+
+#define dgMsgKanji8174NijyuuyamakakkoRightTex "__OTR__textures/kanji/gMsgKanji8174NijyuuyamakakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8174NijyuuyamakakkoRightTex[] = dgMsgKanji8174NijyuuyamakakkoRightTex;
+
+#define dgMsgKanji8175KagikakkoLeftTex "__OTR__textures/kanji/gMsgKanji8175KagikakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8175KagikakkoLeftTex[] = dgMsgKanji8175KagikakkoLeftTex;
+
+#define dgMsgKanji8176KagikakkoRightTex "__OTR__textures/kanji/gMsgKanji8176KagikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8176KagikakkoRightTex[] = dgMsgKanji8176KagikakkoRightTex;
+
+#define dgMsgKanji8177NijyuukagikakkoLeftTex "__OTR__textures/kanji/gMsgKanji8177NijyuukagikakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8177NijyuukagikakkoLeftTex[] = dgMsgKanji8177NijyuukagikakkoLeftTex;
+
+#define dgMsgKanji8178NijyuukagikakkoRightTex "__OTR__textures/kanji/gMsgKanji8178NijyuukagikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8178NijyuukagikakkoRightTex[] = dgMsgKanji8178NijyuukagikakkoRightTex;
+
+#define dgMsgKanji8179SumitsukikakkoLeftTex "__OTR__textures/kanji/gMsgKanji8179SumitsukikakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8179SumitsukikakkoLeftTex[] = dgMsgKanji8179SumitsukikakkoLeftTex;
+
+#define dgMsgKanji817ASumitsukikakkoRightTex "__OTR__textures/kanji/gMsgKanji817ASumitsukikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji817ASumitsukikakkoRightTex[] = dgMsgKanji817ASumitsukikakkoRightTex;
+
+#define dgMsgKanji817BPlusSignTex "__OTR__textures/kanji/gMsgKanji817BPlusSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji817BPlusSignTex[] = dgMsgKanji817BPlusSignTex;
+
+#define dgMsgKanji817CMinusSignTex "__OTR__textures/kanji/gMsgKanji817CMinusSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji817CMinusSignTex[] = dgMsgKanji817CMinusSignTex;
+
+#define dgMsgKanji817DPlusMinusSignTex "__OTR__textures/kanji/gMsgKanji817DPlusMinusSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji817DPlusMinusSignTex[] = dgMsgKanji817DPlusMinusSignTex;
+
+#define dgMsgKanji817EMultiplicationSignTex "__OTR__textures/kanji/gMsgKanji817EMultiplicationSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji817EMultiplicationSignTex[] = dgMsgKanji817EMultiplicationSignTex;
+
+#define dgMsgKanji8180DivisionSignTex "__OTR__textures/kanji/gMsgKanji8180DivisionSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8180DivisionSignTex[] = dgMsgKanji8180DivisionSignTex;
+
+#define dgMsgKanji8181EqualsSignTex "__OTR__textures/kanji/gMsgKanji8181EqualsSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8181EqualsSignTex[] = dgMsgKanji8181EqualsSignTex;
+
+#define dgMsgKanji8182NotEqualSignTex "__OTR__textures/kanji/gMsgKanji8182NotEqualSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8182NotEqualSignTex[] = dgMsgKanji8182NotEqualSignTex;
+
+#define dgMsgKanji8183LessThanSignTex "__OTR__textures/kanji/gMsgKanji8183LessThanSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8183LessThanSignTex[] = dgMsgKanji8183LessThanSignTex;
+
+#define dgMsgKanji8184GreaterThanSignTex "__OTR__textures/kanji/gMsgKanji8184GreaterThanSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8184GreaterThanSignTex[] = dgMsgKanji8184GreaterThanSignTex;
+
+#define dgMsgKanji8185LessThanOrEqualToTex "__OTR__textures/kanji/gMsgKanji8185LessThanOrEqualToTex"
+static const ALIGN_ASSET(2) char gMsgKanji8185LessThanOrEqualToTex[] = dgMsgKanji8185LessThanOrEqualToTex;
+
+#define dgMsgKanji8186GreaterThanOrEqualToTex "__OTR__textures/kanji/gMsgKanji8186GreaterThanOrEqualToTex"
+static const ALIGN_ASSET(2) char gMsgKanji8186GreaterThanOrEqualToTex[] = dgMsgKanji8186GreaterThanOrEqualToTex;
+
+#define dgMsgKanji8187InfinityTex "__OTR__textures/kanji/gMsgKanji8187InfinityTex"
+static const ALIGN_ASSET(2) char gMsgKanji8187InfinityTex[] = dgMsgKanji8187InfinityTex;
+
+#define dgMsgKanji8188ThereforeTex "__OTR__textures/kanji/gMsgKanji8188ThereforeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8188ThereforeTex[] = dgMsgKanji8188ThereforeTex;
+
+#define dgMsgKanji8189MaleTex "__OTR__textures/kanji/gMsgKanji8189MaleTex"
+static const ALIGN_ASSET(2) char gMsgKanji8189MaleTex[] = dgMsgKanji8189MaleTex;
+
+#define dgMsgKanji818AFemaleTex "__OTR__textures/kanji/gMsgKanji818AFemaleTex"
+static const ALIGN_ASSET(2) char gMsgKanji818AFemaleTex[] = dgMsgKanji818AFemaleTex;
+
+#define dgMsgKanji818BDegreeSignTex "__OTR__textures/kanji/gMsgKanji818BDegreeSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji818BDegreeSignTex[] = dgMsgKanji818BDegreeSignTex;
+
+#define dgMsgKanji818CPrimeTex "__OTR__textures/kanji/gMsgKanji818CPrimeTex"
+static const ALIGN_ASSET(2) char gMsgKanji818CPrimeTex[] = dgMsgKanji818CPrimeTex;
+
+#define dgMsgKanji818DDoublePrimeTex "__OTR__textures/kanji/gMsgKanji818DDoublePrimeTex"
+static const ALIGN_ASSET(2) char gMsgKanji818DDoublePrimeTex[] = dgMsgKanji818DDoublePrimeTex;
+
+#define dgMsgKanji818ECelciusTex "__OTR__textures/kanji/gMsgKanji818ECelciusTex"
+static const ALIGN_ASSET(2) char gMsgKanji818ECelciusTex[] = dgMsgKanji818ECelciusTex;
+
+#define dgMsgKanji818FYenSignTex "__OTR__textures/kanji/gMsgKanji818FYenSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji818FYenSignTex[] = dgMsgKanji818FYenSignTex;
+
+#define dgMsgKanji8190DollarSignTex "__OTR__textures/kanji/gMsgKanji8190DollarSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8190DollarSignTex[] = dgMsgKanji8190DollarSignTex;
+
+#define dgMsgKanji8191CentSignTex "__OTR__textures/kanji/gMsgKanji8191CentSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8191CentSignTex[] = dgMsgKanji8191CentSignTex;
+
+#define dgMsgKanji8192PoundSignTex "__OTR__textures/kanji/gMsgKanji8192PoundSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8192PoundSignTex[] = dgMsgKanji8192PoundSignTex;
+
+#define dgMsgKanji8193PercentSignTex "__OTR__textures/kanji/gMsgKanji8193PercentSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8193PercentSignTex[] = dgMsgKanji8193PercentSignTex;
+
+#define dgMsgKanji8194NumberSignTex "__OTR__textures/kanji/gMsgKanji8194NumberSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8194NumberSignTex[] = dgMsgKanji8194NumberSignTex;
+
+#define dgMsgKanji8195AmpersandTex "__OTR__textures/kanji/gMsgKanji8195AmpersandTex"
+static const ALIGN_ASSET(2) char gMsgKanji8195AmpersandTex[] = dgMsgKanji8195AmpersandTex;
+
+#define dgMsgKanji8196AsteriskTex "__OTR__textures/kanji/gMsgKanji8196AsteriskTex"
+static const ALIGN_ASSET(2) char gMsgKanji8196AsteriskTex[] = dgMsgKanji8196AsteriskTex;
+
+#define dgMsgKanji8197AtSignTex "__OTR__textures/kanji/gMsgKanji8197AtSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8197AtSignTex[] = dgMsgKanji8197AtSignTex;
+
+#define dgMsgKanji8198SectionSignTex "__OTR__textures/kanji/gMsgKanji8198SectionSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8198SectionSignTex[] = dgMsgKanji8198SectionSignTex;
+
+#define dgMsgKanji8199WhiteStarTex "__OTR__textures/kanji/gMsgKanji8199WhiteStarTex"
+static const ALIGN_ASSET(2) char gMsgKanji8199WhiteStarTex[] = dgMsgKanji8199WhiteStarTex;
+
+#define dgMsgKanji819ABlackStarTex "__OTR__textures/kanji/gMsgKanji819ABlackStarTex"
+static const ALIGN_ASSET(2) char gMsgKanji819ABlackStarTex[] = dgMsgKanji819ABlackStarTex;
+
+#define dgMsgKanji819BWhiteCircleTex "__OTR__textures/kanji/gMsgKanji819BWhiteCircleTex"
+static const ALIGN_ASSET(2) char gMsgKanji819BWhiteCircleTex[] = dgMsgKanji819BWhiteCircleTex;
+
+#define dgMsgKanji819CBlackCircleTex "__OTR__textures/kanji/gMsgKanji819CBlackCircleTex"
+static const ALIGN_ASSET(2) char gMsgKanji819CBlackCircleTex[] = dgMsgKanji819CBlackCircleTex;
+
+#define dgMsgKanji819DDoubleCircleTex "__OTR__textures/kanji/gMsgKanji819DDoubleCircleTex"
+static const ALIGN_ASSET(2) char gMsgKanji819DDoubleCircleTex[] = dgMsgKanji819DDoubleCircleTex;
+
+#define dgMsgKanji819EWhiteDiamondTex "__OTR__textures/kanji/gMsgKanji819EWhiteDiamondTex"
+static const ALIGN_ASSET(2) char gMsgKanji819EWhiteDiamondTex[] = dgMsgKanji819EWhiteDiamondTex;
+
+#define dgMsgKanji819FBlackDiamondTex "__OTR__textures/kanji/gMsgKanji819FBlackDiamondTex"
+static const ALIGN_ASSET(2) char gMsgKanji819FBlackDiamondTex[] = dgMsgKanji819FBlackDiamondTex;
+
+#define dgMsgKanji81A0WhiteSquareTex "__OTR__textures/kanji/gMsgKanji81A0WhiteSquareTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A0WhiteSquareTex[] = dgMsgKanji81A0WhiteSquareTex;
+
+#define dgMsgKanji81A1BlackSquareTex "__OTR__textures/kanji/gMsgKanji81A1BlackSquareTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A1BlackSquareTex[] = dgMsgKanji81A1BlackSquareTex;
+
+#define dgMsgKanji81A2WhiteTriangleTex "__OTR__textures/kanji/gMsgKanji81A2WhiteTriangleTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A2WhiteTriangleTex[] = dgMsgKanji81A2WhiteTriangleTex;
+
+#define dgMsgKanji81A3BlackTriangleTex "__OTR__textures/kanji/gMsgKanji81A3BlackTriangleTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A3BlackTriangleTex[] = dgMsgKanji81A3BlackTriangleTex;
+
+#define dgMsgKanji81A4WhiteInvertedTriangleTex "__OTR__textures/kanji/gMsgKanji81A4WhiteInvertedTriangleTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A4WhiteInvertedTriangleTex[] = dgMsgKanji81A4WhiteInvertedTriangleTex;
+
+#define dgMsgKanji81A5BlackInvertedTriangleTex "__OTR__textures/kanji/gMsgKanji81A5BlackInvertedTriangleTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A5BlackInvertedTriangleTex[] = dgMsgKanji81A5BlackInvertedTriangleTex;
+
+#define dgMsgKanji81A6KomejirushiTex "__OTR__textures/kanji/gMsgKanji81A6KomejirushiTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A6KomejirushiTex[] = dgMsgKanji81A6KomejirushiTex;
+
+#define dgMsgKanji81A7PostalMarkTex "__OTR__textures/kanji/gMsgKanji81A7PostalMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A7PostalMarkTex[] = dgMsgKanji81A7PostalMarkTex;
+
+#define dgMsgKanji81A8ArrowRightTex "__OTR__textures/kanji/gMsgKanji81A8ArrowRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A8ArrowRightTex[] = dgMsgKanji81A8ArrowRightTex;
+
+#define dgMsgKanji81A9ArrowLeftTex "__OTR__textures/kanji/gMsgKanji81A9ArrowLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji81A9ArrowLeftTex[] = dgMsgKanji81A9ArrowLeftTex;
+
+#define dgMsgKanji81AAArrowUpTex "__OTR__textures/kanji/gMsgKanji81AAArrowUpTex"
+static const ALIGN_ASSET(2) char gMsgKanji81AAArrowUpTex[] = dgMsgKanji81AAArrowUpTex;
+
+#define dgMsgKanji81ABArrowDownTex "__OTR__textures/kanji/gMsgKanji81ABArrowDownTex"
+static const ALIGN_ASSET(2) char gMsgKanji81ABArrowDownTex[] = dgMsgKanji81ABArrowDownTex;
+
+#define dgMsgKanji81ACGetaTex "__OTR__textures/kanji/gMsgKanji81ACGetaTex"
+static const ALIGN_ASSET(2) char gMsgKanji81ACGetaTex[] = dgMsgKanji81ACGetaTex;
+
+#define dgMsgKanji81B8EmptyTex "__OTR__textures/kanji/gMsgKanji81B8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81B8EmptyTex[] = dgMsgKanji81B8EmptyTex;
+
+#define dgMsgKanji81B9EmptyTex "__OTR__textures/kanji/gMsgKanji81B9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81B9EmptyTex[] = dgMsgKanji81B9EmptyTex;
+
+#define dgMsgKanji81BAEmptyTex "__OTR__textures/kanji/gMsgKanji81BAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BAEmptyTex[] = dgMsgKanji81BAEmptyTex;
+
+#define dgMsgKanji81BBEmptyTex "__OTR__textures/kanji/gMsgKanji81BBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BBEmptyTex[] = dgMsgKanji81BBEmptyTex;
+
+#define dgMsgKanji81BCEmptyTex "__OTR__textures/kanji/gMsgKanji81BCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BCEmptyTex[] = dgMsgKanji81BCEmptyTex;
+
+#define dgMsgKanji81BDEmptyTex "__OTR__textures/kanji/gMsgKanji81BDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BDEmptyTex[] = dgMsgKanji81BDEmptyTex;
+
+#define dgMsgKanji81BEEmptyTex "__OTR__textures/kanji/gMsgKanji81BEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BEEmptyTex[] = dgMsgKanji81BEEmptyTex;
+
+#define dgMsgKanji81BFIntersectionTex "__OTR__textures/kanji/gMsgKanji81BFIntersectionTex"
+static const ALIGN_ASSET(2) char gMsgKanji81BFIntersectionTex[] = dgMsgKanji81BFIntersectionTex;
+
+#define dgMsgKanji81C8EmptyTex "__OTR__textures/kanji/gMsgKanji81C8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81C8EmptyTex[] = dgMsgKanji81C8EmptyTex;
+
+#define dgMsgKanji81C9EmptyTex "__OTR__textures/kanji/gMsgKanji81C9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81C9EmptyTex[] = dgMsgKanji81C9EmptyTex;
+
+#define dgMsgKanji81CAEmptyTex "__OTR__textures/kanji/gMsgKanji81CAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81CAEmptyTex[] = dgMsgKanji81CAEmptyTex;
+
+#define dgMsgKanji81CBEmptyTex "__OTR__textures/kanji/gMsgKanji81CBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81CBEmptyTex[] = dgMsgKanji81CBEmptyTex;
+
+#define dgMsgKanji81CCEmptyTex "__OTR__textures/kanji/gMsgKanji81CCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81CCEmptyTex[] = dgMsgKanji81CCEmptyTex;
+
+#define dgMsgKanji81CDEmptyTex "__OTR__textures/kanji/gMsgKanji81CDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81CDEmptyTex[] = dgMsgKanji81CDEmptyTex;
+
+#define dgMsgKanji81CEEmptyTex "__OTR__textures/kanji/gMsgKanji81CEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81CEEmptyTex[] = dgMsgKanji81CEEmptyTex;
+
+#define dgMsgKanji81DBEmptyTex "__OTR__textures/kanji/gMsgKanji81DBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81DBEmptyTex[] = dgMsgKanji81DBEmptyTex;
+
+#define dgMsgKanji81DCEmptyTex "__OTR__textures/kanji/gMsgKanji81DCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81DCEmptyTex[] = dgMsgKanji81DCEmptyTex;
+
+#define dgMsgKanji81DDEmptyTex "__OTR__textures/kanji/gMsgKanji81DDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81DDEmptyTex[] = dgMsgKanji81DDEmptyTex;
+
+#define dgMsgKanji81DEEmptyTex "__OTR__textures/kanji/gMsgKanji81DEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81DEEmptyTex[] = dgMsgKanji81DEEmptyTex;
+
+#define dgMsgKanji81DFEmptyTex "__OTR__textures/kanji/gMsgKanji81DFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81DFEmptyTex[] = dgMsgKanji81DFEmptyTex;
+
+#define dgMsgKanji81E0ApproximatelyEqualToTex "__OTR__textures/kanji/gMsgKanji81E0ApproximatelyEqualToTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E0ApproximatelyEqualToTex[] = dgMsgKanji81E0ApproximatelyEqualToTex;
+
+#define dgMsgKanji81E1MuchLessThanTex "__OTR__textures/kanji/gMsgKanji81E1MuchLessThanTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E1MuchLessThanTex[] = dgMsgKanji81E1MuchLessThanTex;
+
+#define dgMsgKanji81E2MuchGreaterThanTex "__OTR__textures/kanji/gMsgKanji81E2MuchGreaterThanTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E2MuchGreaterThanTex[] = dgMsgKanji81E2MuchGreaterThanTex;
+
+#define dgMsgKanji81E3SquareRootTex "__OTR__textures/kanji/gMsgKanji81E3SquareRootTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E3SquareRootTex[] = dgMsgKanji81E3SquareRootTex;
+
+#define dgMsgKanji81E4SimilarTex "__OTR__textures/kanji/gMsgKanji81E4SimilarTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E4SimilarTex[] = dgMsgKanji81E4SimilarTex;
+
+#define dgMsgKanji81E5ProportionalTex "__OTR__textures/kanji/gMsgKanji81E5ProportionalTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E5ProportionalTex[] = dgMsgKanji81E5ProportionalTex;
+
+#define dgMsgKanji81E6BecauseTex "__OTR__textures/kanji/gMsgKanji81E6BecauseTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E6BecauseTex[] = dgMsgKanji81E6BecauseTex;
+
+#define dgMsgKanji81E7IntegralTex "__OTR__textures/kanji/gMsgKanji81E7IntegralTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E7IntegralTex[] = dgMsgKanji81E7IntegralTex;
+
+#define dgMsgKanji81E8DoubleIntegralTex "__OTR__textures/kanji/gMsgKanji81E8DoubleIntegralTex"
+static const ALIGN_ASSET(2) char gMsgKanji81E8DoubleIntegralTex[] = dgMsgKanji81E8DoubleIntegralTex;
+
+#define dgMsgKanji81F0EmptyTex "__OTR__textures/kanji/gMsgKanji81F0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F0EmptyTex[] = dgMsgKanji81F0EmptyTex;
+
+#define dgMsgKanji81F1EmptyTex "__OTR__textures/kanji/gMsgKanji81F1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F1EmptyTex[] = dgMsgKanji81F1EmptyTex;
+
+#define dgMsgKanji81F2EmptyTex "__OTR__textures/kanji/gMsgKanji81F2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F2EmptyTex[] = dgMsgKanji81F2EmptyTex;
+
+#define dgMsgKanji81F3EmptyTex "__OTR__textures/kanji/gMsgKanji81F3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F3EmptyTex[] = dgMsgKanji81F3EmptyTex;
+
+#define dgMsgKanji81F4EmptyTex "__OTR__textures/kanji/gMsgKanji81F4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F4EmptyTex[] = dgMsgKanji81F4EmptyTex;
+
+#define dgMsgKanji81F5EmptyTex "__OTR__textures/kanji/gMsgKanji81F5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F5EmptyTex[] = dgMsgKanji81F5EmptyTex;
+
+#define dgMsgKanji81F6EmptyTex "__OTR__textures/kanji/gMsgKanji81F6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F6EmptyTex[] = dgMsgKanji81F6EmptyTex;
+
+#define dgMsgKanji81F7EmptyTex "__OTR__textures/kanji/gMsgKanji81F7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81F7EmptyTex[] = dgMsgKanji81F7EmptyTex;
+
+#define dgMsgKanji81FCEmptyTex "__OTR__textures/kanji/gMsgKanji81FCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji81FCEmptyTex[] = dgMsgKanji81FCEmptyTex;
+
+#define dgMsgKanji824FZeroTex "__OTR__textures/kanji/gMsgKanji824FZeroTex"
+static const ALIGN_ASSET(2) char gMsgKanji824FZeroTex[] = dgMsgKanji824FZeroTex;
+
+#define dgMsgKanji8250OneTex "__OTR__textures/kanji/gMsgKanji8250OneTex"
+static const ALIGN_ASSET(2) char gMsgKanji8250OneTex[] = dgMsgKanji8250OneTex;
+
+#define dgMsgKanji8251TwoTex "__OTR__textures/kanji/gMsgKanji8251TwoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8251TwoTex[] = dgMsgKanji8251TwoTex;
+
+#define dgMsgKanji8252ThreeTex "__OTR__textures/kanji/gMsgKanji8252ThreeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8252ThreeTex[] = dgMsgKanji8252ThreeTex;
+
+#define dgMsgKanji8253FourTex "__OTR__textures/kanji/gMsgKanji8253FourTex"
+static const ALIGN_ASSET(2) char gMsgKanji8253FourTex[] = dgMsgKanji8253FourTex;
+
+#define dgMsgKanji8254FiveTex "__OTR__textures/kanji/gMsgKanji8254FiveTex"
+static const ALIGN_ASSET(2) char gMsgKanji8254FiveTex[] = dgMsgKanji8254FiveTex;
+
+#define dgMsgKanji8255SixTex "__OTR__textures/kanji/gMsgKanji8255SixTex"
+static const ALIGN_ASSET(2) char gMsgKanji8255SixTex[] = dgMsgKanji8255SixTex;
+
+#define dgMsgKanji8256SevenTex "__OTR__textures/kanji/gMsgKanji8256SevenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8256SevenTex[] = dgMsgKanji8256SevenTex;
+
+#define dgMsgKanji8257EightTex "__OTR__textures/kanji/gMsgKanji8257EightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8257EightTex[] = dgMsgKanji8257EightTex;
+
+#define dgMsgKanji8258NineTex "__OTR__textures/kanji/gMsgKanji8258NineTex"
+static const ALIGN_ASSET(2) char gMsgKanji8258NineTex[] = dgMsgKanji8258NineTex;
+
+#define dgMsgKanji8260CapitalATex "__OTR__textures/kanji/gMsgKanji8260CapitalATex"
+static const ALIGN_ASSET(2) char gMsgKanji8260CapitalATex[] = dgMsgKanji8260CapitalATex;
+
+#define dgMsgKanji8261CapitalBTex "__OTR__textures/kanji/gMsgKanji8261CapitalBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8261CapitalBTex[] = dgMsgKanji8261CapitalBTex;
+
+#define dgMsgKanji8262CapitalCTex "__OTR__textures/kanji/gMsgKanji8262CapitalCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8262CapitalCTex[] = dgMsgKanji8262CapitalCTex;
+
+#define dgMsgKanji8263CapitalDTex "__OTR__textures/kanji/gMsgKanji8263CapitalDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8263CapitalDTex[] = dgMsgKanji8263CapitalDTex;
+
+#define dgMsgKanji8264CapitalETex "__OTR__textures/kanji/gMsgKanji8264CapitalETex"
+static const ALIGN_ASSET(2) char gMsgKanji8264CapitalETex[] = dgMsgKanji8264CapitalETex;
+
+#define dgMsgKanji8265CapitalFTex "__OTR__textures/kanji/gMsgKanji8265CapitalFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8265CapitalFTex[] = dgMsgKanji8265CapitalFTex;
+
+#define dgMsgKanji8266CapitalGTex "__OTR__textures/kanji/gMsgKanji8266CapitalGTex"
+static const ALIGN_ASSET(2) char gMsgKanji8266CapitalGTex[] = dgMsgKanji8266CapitalGTex;
+
+#define dgMsgKanji8267CapitalHTex "__OTR__textures/kanji/gMsgKanji8267CapitalHTex"
+static const ALIGN_ASSET(2) char gMsgKanji8267CapitalHTex[] = dgMsgKanji8267CapitalHTex;
+
+#define dgMsgKanji8268CapitalITex "__OTR__textures/kanji/gMsgKanji8268CapitalITex"
+static const ALIGN_ASSET(2) char gMsgKanji8268CapitalITex[] = dgMsgKanji8268CapitalITex;
+
+#define dgMsgKanji8269CapitalJTex "__OTR__textures/kanji/gMsgKanji8269CapitalJTex"
+static const ALIGN_ASSET(2) char gMsgKanji8269CapitalJTex[] = dgMsgKanji8269CapitalJTex;
+
+#define dgMsgKanji826ACapitalKTex "__OTR__textures/kanji/gMsgKanji826ACapitalKTex"
+static const ALIGN_ASSET(2) char gMsgKanji826ACapitalKTex[] = dgMsgKanji826ACapitalKTex;
+
+#define dgMsgKanji826BCapitalLTex "__OTR__textures/kanji/gMsgKanji826BCapitalLTex"
+static const ALIGN_ASSET(2) char gMsgKanji826BCapitalLTex[] = dgMsgKanji826BCapitalLTex;
+
+#define dgMsgKanji826CCapitalMTex "__OTR__textures/kanji/gMsgKanji826CCapitalMTex"
+static const ALIGN_ASSET(2) char gMsgKanji826CCapitalMTex[] = dgMsgKanji826CCapitalMTex;
+
+#define dgMsgKanji826DCapitalNTex "__OTR__textures/kanji/gMsgKanji826DCapitalNTex"
+static const ALIGN_ASSET(2) char gMsgKanji826DCapitalNTex[] = dgMsgKanji826DCapitalNTex;
+
+#define dgMsgKanji826ECapitalOTex "__OTR__textures/kanji/gMsgKanji826ECapitalOTex"
+static const ALIGN_ASSET(2) char gMsgKanji826ECapitalOTex[] = dgMsgKanji826ECapitalOTex;
+
+#define dgMsgKanji826FCapitalPTex "__OTR__textures/kanji/gMsgKanji826FCapitalPTex"
+static const ALIGN_ASSET(2) char gMsgKanji826FCapitalPTex[] = dgMsgKanji826FCapitalPTex;
+
+#define dgMsgKanji8270CapitalQTex "__OTR__textures/kanji/gMsgKanji8270CapitalQTex"
+static const ALIGN_ASSET(2) char gMsgKanji8270CapitalQTex[] = dgMsgKanji8270CapitalQTex;
+
+#define dgMsgKanji8271CapitalRTex "__OTR__textures/kanji/gMsgKanji8271CapitalRTex"
+static const ALIGN_ASSET(2) char gMsgKanji8271CapitalRTex[] = dgMsgKanji8271CapitalRTex;
+
+#define dgMsgKanji8272CapitalSTex "__OTR__textures/kanji/gMsgKanji8272CapitalSTex"
+static const ALIGN_ASSET(2) char gMsgKanji8272CapitalSTex[] = dgMsgKanji8272CapitalSTex;
+
+#define dgMsgKanji8273CapitalTTex "__OTR__textures/kanji/gMsgKanji8273CapitalTTex"
+static const ALIGN_ASSET(2) char gMsgKanji8273CapitalTTex[] = dgMsgKanji8273CapitalTTex;
+
+#define dgMsgKanji8274CapitalUTex "__OTR__textures/kanji/gMsgKanji8274CapitalUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8274CapitalUTex[] = dgMsgKanji8274CapitalUTex;
+
+#define dgMsgKanji8275CapitalVTex "__OTR__textures/kanji/gMsgKanji8275CapitalVTex"
+static const ALIGN_ASSET(2) char gMsgKanji8275CapitalVTex[] = dgMsgKanji8275CapitalVTex;
+
+#define dgMsgKanji8276CapitalWTex "__OTR__textures/kanji/gMsgKanji8276CapitalWTex"
+static const ALIGN_ASSET(2) char gMsgKanji8276CapitalWTex[] = dgMsgKanji8276CapitalWTex;
+
+#define dgMsgKanji8277CapitalXTex "__OTR__textures/kanji/gMsgKanji8277CapitalXTex"
+static const ALIGN_ASSET(2) char gMsgKanji8277CapitalXTex[] = dgMsgKanji8277CapitalXTex;
+
+#define dgMsgKanji8278CapitalYTex "__OTR__textures/kanji/gMsgKanji8278CapitalYTex"
+static const ALIGN_ASSET(2) char gMsgKanji8278CapitalYTex[] = dgMsgKanji8278CapitalYTex;
+
+#define dgMsgKanji8279CapitalZTex "__OTR__textures/kanji/gMsgKanji8279CapitalZTex"
+static const ALIGN_ASSET(2) char gMsgKanji8279CapitalZTex[] = dgMsgKanji8279CapitalZTex;
+
+#define dgMsgKanji8281LowercaseATex "__OTR__textures/kanji/gMsgKanji8281LowercaseATex"
+static const ALIGN_ASSET(2) char gMsgKanji8281LowercaseATex[] = dgMsgKanji8281LowercaseATex;
+
+#define dgMsgKanji8282LowercaseBTex "__OTR__textures/kanji/gMsgKanji8282LowercaseBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8282LowercaseBTex[] = dgMsgKanji8282LowercaseBTex;
+
+#define dgMsgKanji8283LowercaseCTex "__OTR__textures/kanji/gMsgKanji8283LowercaseCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8283LowercaseCTex[] = dgMsgKanji8283LowercaseCTex;
+
+#define dgMsgKanji8284LowercaseDTex "__OTR__textures/kanji/gMsgKanji8284LowercaseDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8284LowercaseDTex[] = dgMsgKanji8284LowercaseDTex;
+
+#define dgMsgKanji8285LowercaseETex "__OTR__textures/kanji/gMsgKanji8285LowercaseETex"
+static const ALIGN_ASSET(2) char gMsgKanji8285LowercaseETex[] = dgMsgKanji8285LowercaseETex;
+
+#define dgMsgKanji8286LowercaseFTex "__OTR__textures/kanji/gMsgKanji8286LowercaseFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8286LowercaseFTex[] = dgMsgKanji8286LowercaseFTex;
+
+#define dgMsgKanji8287LowercaseGTex "__OTR__textures/kanji/gMsgKanji8287LowercaseGTex"
+static const ALIGN_ASSET(2) char gMsgKanji8287LowercaseGTex[] = dgMsgKanji8287LowercaseGTex;
+
+#define dgMsgKanji8288LowercaseHTex "__OTR__textures/kanji/gMsgKanji8288LowercaseHTex"
+static const ALIGN_ASSET(2) char gMsgKanji8288LowercaseHTex[] = dgMsgKanji8288LowercaseHTex;
+
+#define dgMsgKanji8289LowercaseITex "__OTR__textures/kanji/gMsgKanji8289LowercaseITex"
+static const ALIGN_ASSET(2) char gMsgKanji8289LowercaseITex[] = dgMsgKanji8289LowercaseITex;
+
+#define dgMsgKanji828ALowercaseJTex "__OTR__textures/kanji/gMsgKanji828ALowercaseJTex"
+static const ALIGN_ASSET(2) char gMsgKanji828ALowercaseJTex[] = dgMsgKanji828ALowercaseJTex;
+
+#define dgMsgKanji828BLowercaseKTex "__OTR__textures/kanji/gMsgKanji828BLowercaseKTex"
+static const ALIGN_ASSET(2) char gMsgKanji828BLowercaseKTex[] = dgMsgKanji828BLowercaseKTex;
+
+#define dgMsgKanji828CLowercaseLTex "__OTR__textures/kanji/gMsgKanji828CLowercaseLTex"
+static const ALIGN_ASSET(2) char gMsgKanji828CLowercaseLTex[] = dgMsgKanji828CLowercaseLTex;
+
+#define dgMsgKanji828DLowercaseMTex "__OTR__textures/kanji/gMsgKanji828DLowercaseMTex"
+static const ALIGN_ASSET(2) char gMsgKanji828DLowercaseMTex[] = dgMsgKanji828DLowercaseMTex;
+
+#define dgMsgKanji828ELowercaseNTex "__OTR__textures/kanji/gMsgKanji828ELowercaseNTex"
+static const ALIGN_ASSET(2) char gMsgKanji828ELowercaseNTex[] = dgMsgKanji828ELowercaseNTex;
+
+#define dgMsgKanji828FLowercaseOTex "__OTR__textures/kanji/gMsgKanji828FLowercaseOTex"
+static const ALIGN_ASSET(2) char gMsgKanji828FLowercaseOTex[] = dgMsgKanji828FLowercaseOTex;
+
+#define dgMsgKanji8290LowercasePTex "__OTR__textures/kanji/gMsgKanji8290LowercasePTex"
+static const ALIGN_ASSET(2) char gMsgKanji8290LowercasePTex[] = dgMsgKanji8290LowercasePTex;
+
+#define dgMsgKanji8291LowercaseQTex "__OTR__textures/kanji/gMsgKanji8291LowercaseQTex"
+static const ALIGN_ASSET(2) char gMsgKanji8291LowercaseQTex[] = dgMsgKanji8291LowercaseQTex;
+
+#define dgMsgKanji8292LowercaseRTex "__OTR__textures/kanji/gMsgKanji8292LowercaseRTex"
+static const ALIGN_ASSET(2) char gMsgKanji8292LowercaseRTex[] = dgMsgKanji8292LowercaseRTex;
+
+#define dgMsgKanji8293LowercaseSTex "__OTR__textures/kanji/gMsgKanji8293LowercaseSTex"
+static const ALIGN_ASSET(2) char gMsgKanji8293LowercaseSTex[] = dgMsgKanji8293LowercaseSTex;
+
+#define dgMsgKanji8294LowercaseTTex "__OTR__textures/kanji/gMsgKanji8294LowercaseTTex"
+static const ALIGN_ASSET(2) char gMsgKanji8294LowercaseTTex[] = dgMsgKanji8294LowercaseTTex;
+
+#define dgMsgKanji8295LowercaseUTex "__OTR__textures/kanji/gMsgKanji8295LowercaseUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8295LowercaseUTex[] = dgMsgKanji8295LowercaseUTex;
+
+#define dgMsgKanji8296LowercaseVTex "__OTR__textures/kanji/gMsgKanji8296LowercaseVTex"
+static const ALIGN_ASSET(2) char gMsgKanji8296LowercaseVTex[] = dgMsgKanji8296LowercaseVTex;
+
+#define dgMsgKanji8297LowercaseWTex "__OTR__textures/kanji/gMsgKanji8297LowercaseWTex"
+static const ALIGN_ASSET(2) char gMsgKanji8297LowercaseWTex[] = dgMsgKanji8297LowercaseWTex;
+
+#define dgMsgKanji8298LowercaseXTex "__OTR__textures/kanji/gMsgKanji8298LowercaseXTex"
+static const ALIGN_ASSET(2) char gMsgKanji8298LowercaseXTex[] = dgMsgKanji8298LowercaseXTex;
+
+#define dgMsgKanji8299LowercaseYTex "__OTR__textures/kanji/gMsgKanji8299LowercaseYTex"
+static const ALIGN_ASSET(2) char gMsgKanji8299LowercaseYTex[] = dgMsgKanji8299LowercaseYTex;
+
+#define dgMsgKanji829ALowercaseZTex "__OTR__textures/kanji/gMsgKanji829ALowercaseZTex"
+static const ALIGN_ASSET(2) char gMsgKanji829ALowercaseZTex[] = dgMsgKanji829ALowercaseZTex;
+
+#define dgMsgKanji829FHiraganaSmallATex "__OTR__textures/kanji/gMsgKanji829FHiraganaSmallATex"
+static const ALIGN_ASSET(2) char gMsgKanji829FHiraganaSmallATex[] = dgMsgKanji829FHiraganaSmallATex;
+
+#define dgMsgKanji82A0HiraganaATex "__OTR__textures/kanji/gMsgKanji82A0HiraganaATex"
+static const ALIGN_ASSET(2) char gMsgKanji82A0HiraganaATex[] = dgMsgKanji82A0HiraganaATex;
+
+#define dgMsgKanji82A1HiraganaSmallITex "__OTR__textures/kanji/gMsgKanji82A1HiraganaSmallITex"
+static const ALIGN_ASSET(2) char gMsgKanji82A1HiraganaSmallITex[] = dgMsgKanji82A1HiraganaSmallITex;
+
+#define dgMsgKanji82A2HiraganaITex "__OTR__textures/kanji/gMsgKanji82A2HiraganaITex"
+static const ALIGN_ASSET(2) char gMsgKanji82A2HiraganaITex[] = dgMsgKanji82A2HiraganaITex;
+
+#define dgMsgKanji82A3HiraganaSmallUTex "__OTR__textures/kanji/gMsgKanji82A3HiraganaSmallUTex"
+static const ALIGN_ASSET(2) char gMsgKanji82A3HiraganaSmallUTex[] = dgMsgKanji82A3HiraganaSmallUTex;
+
+#define dgMsgKanji82A4HiraganaUTex "__OTR__textures/kanji/gMsgKanji82A4HiraganaUTex"
+static const ALIGN_ASSET(2) char gMsgKanji82A4HiraganaUTex[] = dgMsgKanji82A4HiraganaUTex;
+
+#define dgMsgKanji82A5HiraganaSmallETex "__OTR__textures/kanji/gMsgKanji82A5HiraganaSmallETex"
+static const ALIGN_ASSET(2) char gMsgKanji82A5HiraganaSmallETex[] = dgMsgKanji82A5HiraganaSmallETex;
+
+#define dgMsgKanji82A6HiraganaETex "__OTR__textures/kanji/gMsgKanji82A6HiraganaETex"
+static const ALIGN_ASSET(2) char gMsgKanji82A6HiraganaETex[] = dgMsgKanji82A6HiraganaETex;
+
+#define dgMsgKanji82A7HiraganaSmallOTex "__OTR__textures/kanji/gMsgKanji82A7HiraganaSmallOTex"
+static const ALIGN_ASSET(2) char gMsgKanji82A7HiraganaSmallOTex[] = dgMsgKanji82A7HiraganaSmallOTex;
+
+#define dgMsgKanji82A8HiraganaOTex "__OTR__textures/kanji/gMsgKanji82A8HiraganaOTex"
+static const ALIGN_ASSET(2) char gMsgKanji82A8HiraganaOTex[] = dgMsgKanji82A8HiraganaOTex;
+
+#define dgMsgKanji82A9HiraganaKaTex "__OTR__textures/kanji/gMsgKanji82A9HiraganaKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82A9HiraganaKaTex[] = dgMsgKanji82A9HiraganaKaTex;
+
+#define dgMsgKanji82AAHiraganaGaTex "__OTR__textures/kanji/gMsgKanji82AAHiraganaGaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82AAHiraganaGaTex[] = dgMsgKanji82AAHiraganaGaTex;
+
+#define dgMsgKanji82ABHiraganaKiTex "__OTR__textures/kanji/gMsgKanji82ABHiraganaKiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82ABHiraganaKiTex[] = dgMsgKanji82ABHiraganaKiTex;
+
+#define dgMsgKanji82ACHiraganaGiTex "__OTR__textures/kanji/gMsgKanji82ACHiraganaGiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82ACHiraganaGiTex[] = dgMsgKanji82ACHiraganaGiTex;
+
+#define dgMsgKanji82ADHiraganaKuTex "__OTR__textures/kanji/gMsgKanji82ADHiraganaKuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82ADHiraganaKuTex[] = dgMsgKanji82ADHiraganaKuTex;
+
+#define dgMsgKanji82AEHiraganaGuTex "__OTR__textures/kanji/gMsgKanji82AEHiraganaGuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82AEHiraganaGuTex[] = dgMsgKanji82AEHiraganaGuTex;
+
+#define dgMsgKanji82AFHiraganaKeTex "__OTR__textures/kanji/gMsgKanji82AFHiraganaKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82AFHiraganaKeTex[] = dgMsgKanji82AFHiraganaKeTex;
+
+#define dgMsgKanji82B0HiraganaGeTex "__OTR__textures/kanji/gMsgKanji82B0HiraganaGeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B0HiraganaGeTex[] = dgMsgKanji82B0HiraganaGeTex;
+
+#define dgMsgKanji82B1HiraganaKoTex "__OTR__textures/kanji/gMsgKanji82B1HiraganaKoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B1HiraganaKoTex[] = dgMsgKanji82B1HiraganaKoTex;
+
+#define dgMsgKanji82B2HiraganaGoTex "__OTR__textures/kanji/gMsgKanji82B2HiraganaGoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B2HiraganaGoTex[] = dgMsgKanji82B2HiraganaGoTex;
+
+#define dgMsgKanji82B3HiraganaSaTex "__OTR__textures/kanji/gMsgKanji82B3HiraganaSaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B3HiraganaSaTex[] = dgMsgKanji82B3HiraganaSaTex;
+
+#define dgMsgKanji82B4HiraganaZaTex "__OTR__textures/kanji/gMsgKanji82B4HiraganaZaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B4HiraganaZaTex[] = dgMsgKanji82B4HiraganaZaTex;
+
+#define dgMsgKanji82B5HiraganaShiTex "__OTR__textures/kanji/gMsgKanji82B5HiraganaShiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B5HiraganaShiTex[] = dgMsgKanji82B5HiraganaShiTex;
+
+#define dgMsgKanji82B6HiraganaJiTex "__OTR__textures/kanji/gMsgKanji82B6HiraganaJiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B6HiraganaJiTex[] = dgMsgKanji82B6HiraganaJiTex;
+
+#define dgMsgKanji82B7HiraganaSuTex "__OTR__textures/kanji/gMsgKanji82B7HiraganaSuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B7HiraganaSuTex[] = dgMsgKanji82B7HiraganaSuTex;
+
+#define dgMsgKanji82B8HiraganaZuTex "__OTR__textures/kanji/gMsgKanji82B8HiraganaZuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B8HiraganaZuTex[] = dgMsgKanji82B8HiraganaZuTex;
+
+#define dgMsgKanji82B9HiraganaSeTex "__OTR__textures/kanji/gMsgKanji82B9HiraganaSeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82B9HiraganaSeTex[] = dgMsgKanji82B9HiraganaSeTex;
+
+#define dgMsgKanji82BAHiraganaZeTex "__OTR__textures/kanji/gMsgKanji82BAHiraganaZeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BAHiraganaZeTex[] = dgMsgKanji82BAHiraganaZeTex;
+
+#define dgMsgKanji82BBHiraganaSoTex "__OTR__textures/kanji/gMsgKanji82BBHiraganaSoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BBHiraganaSoTex[] = dgMsgKanji82BBHiraganaSoTex;
+
+#define dgMsgKanji82BCHiraganaZoTex "__OTR__textures/kanji/gMsgKanji82BCHiraganaZoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BCHiraganaZoTex[] = dgMsgKanji82BCHiraganaZoTex;
+
+#define dgMsgKanji82BDHiraganaTaTex "__OTR__textures/kanji/gMsgKanji82BDHiraganaTaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BDHiraganaTaTex[] = dgMsgKanji82BDHiraganaTaTex;
+
+#define dgMsgKanji82BEHiraganaDaTex "__OTR__textures/kanji/gMsgKanji82BEHiraganaDaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BEHiraganaDaTex[] = dgMsgKanji82BEHiraganaDaTex;
+
+#define dgMsgKanji82BFHiraganaChiTex "__OTR__textures/kanji/gMsgKanji82BFHiraganaChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82BFHiraganaChiTex[] = dgMsgKanji82BFHiraganaChiTex;
+
+#define dgMsgKanji82C0HiraganaDiTex "__OTR__textures/kanji/gMsgKanji82C0HiraganaDiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C0HiraganaDiTex[] = dgMsgKanji82C0HiraganaDiTex;
+
+#define dgMsgKanji82C1HiraganaSmallTsuTex "__OTR__textures/kanji/gMsgKanji82C1HiraganaSmallTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C1HiraganaSmallTsuTex[] = dgMsgKanji82C1HiraganaSmallTsuTex;
+
+#define dgMsgKanji82C2HiraganaTsuTex "__OTR__textures/kanji/gMsgKanji82C2HiraganaTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C2HiraganaTsuTex[] = dgMsgKanji82C2HiraganaTsuTex;
+
+#define dgMsgKanji82C3HiraganaDuTex "__OTR__textures/kanji/gMsgKanji82C3HiraganaDuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C3HiraganaDuTex[] = dgMsgKanji82C3HiraganaDuTex;
+
+#define dgMsgKanji82C4HiraganaTeTex "__OTR__textures/kanji/gMsgKanji82C4HiraganaTeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C4HiraganaTeTex[] = dgMsgKanji82C4HiraganaTeTex;
+
+#define dgMsgKanji82C5HiraganaDeTex "__OTR__textures/kanji/gMsgKanji82C5HiraganaDeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C5HiraganaDeTex[] = dgMsgKanji82C5HiraganaDeTex;
+
+#define dgMsgKanji82C6HiraganaToTex "__OTR__textures/kanji/gMsgKanji82C6HiraganaToTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C6HiraganaToTex[] = dgMsgKanji82C6HiraganaToTex;
+
+#define dgMsgKanji82C7HiraganaDoTex "__OTR__textures/kanji/gMsgKanji82C7HiraganaDoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C7HiraganaDoTex[] = dgMsgKanji82C7HiraganaDoTex;
+
+#define dgMsgKanji82C8HiraganaNaTex "__OTR__textures/kanji/gMsgKanji82C8HiraganaNaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C8HiraganaNaTex[] = dgMsgKanji82C8HiraganaNaTex;
+
+#define dgMsgKanji82C9HiraganaNiTex "__OTR__textures/kanji/gMsgKanji82C9HiraganaNiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82C9HiraganaNiTex[] = dgMsgKanji82C9HiraganaNiTex;
+
+#define dgMsgKanji82CAHiraganaNuTex "__OTR__textures/kanji/gMsgKanji82CAHiraganaNuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CAHiraganaNuTex[] = dgMsgKanji82CAHiraganaNuTex;
+
+#define dgMsgKanji82CBHiraganaNeTex "__OTR__textures/kanji/gMsgKanji82CBHiraganaNeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CBHiraganaNeTex[] = dgMsgKanji82CBHiraganaNeTex;
+
+#define dgMsgKanji82CCHiraganaNoTex "__OTR__textures/kanji/gMsgKanji82CCHiraganaNoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CCHiraganaNoTex[] = dgMsgKanji82CCHiraganaNoTex;
+
+#define dgMsgKanji82CDHiraganaHaTex "__OTR__textures/kanji/gMsgKanji82CDHiraganaHaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CDHiraganaHaTex[] = dgMsgKanji82CDHiraganaHaTex;
+
+#define dgMsgKanji82CEHiraganaBaTex "__OTR__textures/kanji/gMsgKanji82CEHiraganaBaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CEHiraganaBaTex[] = dgMsgKanji82CEHiraganaBaTex;
+
+#define dgMsgKanji82CFHiraganaPaTex "__OTR__textures/kanji/gMsgKanji82CFHiraganaPaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82CFHiraganaPaTex[] = dgMsgKanji82CFHiraganaPaTex;
+
+#define dgMsgKanji82D0HiraganaHiTex "__OTR__textures/kanji/gMsgKanji82D0HiraganaHiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D0HiraganaHiTex[] = dgMsgKanji82D0HiraganaHiTex;
+
+#define dgMsgKanji82D1HiraganaBiTex "__OTR__textures/kanji/gMsgKanji82D1HiraganaBiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D1HiraganaBiTex[] = dgMsgKanji82D1HiraganaBiTex;
+
+#define dgMsgKanji82D2HiraganaPiTex "__OTR__textures/kanji/gMsgKanji82D2HiraganaPiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D2HiraganaPiTex[] = dgMsgKanji82D2HiraganaPiTex;
+
+#define dgMsgKanji82D3HiraganaFuTex "__OTR__textures/kanji/gMsgKanji82D3HiraganaFuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D3HiraganaFuTex[] = dgMsgKanji82D3HiraganaFuTex;
+
+#define dgMsgKanji82D4HiraganaBuTex "__OTR__textures/kanji/gMsgKanji82D4HiraganaBuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D4HiraganaBuTex[] = dgMsgKanji82D4HiraganaBuTex;
+
+#define dgMsgKanji82D5HiraganaPuTex "__OTR__textures/kanji/gMsgKanji82D5HiraganaPuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D5HiraganaPuTex[] = dgMsgKanji82D5HiraganaPuTex;
+
+#define dgMsgKanji82D6HiraganaHeTex "__OTR__textures/kanji/gMsgKanji82D6HiraganaHeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D6HiraganaHeTex[] = dgMsgKanji82D6HiraganaHeTex;
+
+#define dgMsgKanji82D7HiraganaBeTex "__OTR__textures/kanji/gMsgKanji82D7HiraganaBeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D7HiraganaBeTex[] = dgMsgKanji82D7HiraganaBeTex;
+
+#define dgMsgKanji82D8HiraganaPeTex "__OTR__textures/kanji/gMsgKanji82D8HiraganaPeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D8HiraganaPeTex[] = dgMsgKanji82D8HiraganaPeTex;
+
+#define dgMsgKanji82D9HiraganaHoTex "__OTR__textures/kanji/gMsgKanji82D9HiraganaHoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82D9HiraganaHoTex[] = dgMsgKanji82D9HiraganaHoTex;
+
+#define dgMsgKanji82DAHiraganaBoTex "__OTR__textures/kanji/gMsgKanji82DAHiraganaBoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DAHiraganaBoTex[] = dgMsgKanji82DAHiraganaBoTex;
+
+#define dgMsgKanji82DBHiraganaPoTex "__OTR__textures/kanji/gMsgKanji82DBHiraganaPoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DBHiraganaPoTex[] = dgMsgKanji82DBHiraganaPoTex;
+
+#define dgMsgKanji82DCHiraganaMaTex "__OTR__textures/kanji/gMsgKanji82DCHiraganaMaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DCHiraganaMaTex[] = dgMsgKanji82DCHiraganaMaTex;
+
+#define dgMsgKanji82DDHiraganaMiTex "__OTR__textures/kanji/gMsgKanji82DDHiraganaMiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DDHiraganaMiTex[] = dgMsgKanji82DDHiraganaMiTex;
+
+#define dgMsgKanji82DEHiraganaMuTex "__OTR__textures/kanji/gMsgKanji82DEHiraganaMuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DEHiraganaMuTex[] = dgMsgKanji82DEHiraganaMuTex;
+
+#define dgMsgKanji82DFHiraganaMeTex "__OTR__textures/kanji/gMsgKanji82DFHiraganaMeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82DFHiraganaMeTex[] = dgMsgKanji82DFHiraganaMeTex;
+
+#define dgMsgKanji82E0HiraganaMoTex "__OTR__textures/kanji/gMsgKanji82E0HiraganaMoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E0HiraganaMoTex[] = dgMsgKanji82E0HiraganaMoTex;
+
+#define dgMsgKanji82E1HiraganaSmallYaTex "__OTR__textures/kanji/gMsgKanji82E1HiraganaSmallYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E1HiraganaSmallYaTex[] = dgMsgKanji82E1HiraganaSmallYaTex;
+
+#define dgMsgKanji82E2HiraganaYaTex "__OTR__textures/kanji/gMsgKanji82E2HiraganaYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E2HiraganaYaTex[] = dgMsgKanji82E2HiraganaYaTex;
+
+#define dgMsgKanji82E3HiraganaSmallYuTex "__OTR__textures/kanji/gMsgKanji82E3HiraganaSmallYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E3HiraganaSmallYuTex[] = dgMsgKanji82E3HiraganaSmallYuTex;
+
+#define dgMsgKanji82E4HiraganaYuTex "__OTR__textures/kanji/gMsgKanji82E4HiraganaYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E4HiraganaYuTex[] = dgMsgKanji82E4HiraganaYuTex;
+
+#define dgMsgKanji82E5HiraganaSmallYoTex "__OTR__textures/kanji/gMsgKanji82E5HiraganaSmallYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E5HiraganaSmallYoTex[] = dgMsgKanji82E5HiraganaSmallYoTex;
+
+#define dgMsgKanji82E6HiraganaYoTex "__OTR__textures/kanji/gMsgKanji82E6HiraganaYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E6HiraganaYoTex[] = dgMsgKanji82E6HiraganaYoTex;
+
+#define dgMsgKanji82E7HiraganaRaTex "__OTR__textures/kanji/gMsgKanji82E7HiraganaRaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E7HiraganaRaTex[] = dgMsgKanji82E7HiraganaRaTex;
+
+#define dgMsgKanji82E8HiraganaRiTex "__OTR__textures/kanji/gMsgKanji82E8HiraganaRiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E8HiraganaRiTex[] = dgMsgKanji82E8HiraganaRiTex;
+
+#define dgMsgKanji82E9HiraganaRuTex "__OTR__textures/kanji/gMsgKanji82E9HiraganaRuTex"
+static const ALIGN_ASSET(2) char gMsgKanji82E9HiraganaRuTex[] = dgMsgKanji82E9HiraganaRuTex;
+
+#define dgMsgKanji82EAHiraganaReTex "__OTR__textures/kanji/gMsgKanji82EAHiraganaReTex"
+static const ALIGN_ASSET(2) char gMsgKanji82EAHiraganaReTex[] = dgMsgKanji82EAHiraganaReTex;
+
+#define dgMsgKanji82EBHiraganaRoTex "__OTR__textures/kanji/gMsgKanji82EBHiraganaRoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82EBHiraganaRoTex[] = dgMsgKanji82EBHiraganaRoTex;
+
+#define dgMsgKanji82ECHiraganaSmallWaTex "__OTR__textures/kanji/gMsgKanji82ECHiraganaSmallWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82ECHiraganaSmallWaTex[] = dgMsgKanji82ECHiraganaSmallWaTex;
+
+#define dgMsgKanji82EDHiraganaWaTex "__OTR__textures/kanji/gMsgKanji82EDHiraganaWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji82EDHiraganaWaTex[] = dgMsgKanji82EDHiraganaWaTex;
+
+#define dgMsgKanji82EEHiraganaWiTex "__OTR__textures/kanji/gMsgKanji82EEHiraganaWiTex"
+static const ALIGN_ASSET(2) char gMsgKanji82EEHiraganaWiTex[] = dgMsgKanji82EEHiraganaWiTex;
+
+#define dgMsgKanji82EFHiraganaWeTex "__OTR__textures/kanji/gMsgKanji82EFHiraganaWeTex"
+static const ALIGN_ASSET(2) char gMsgKanji82EFHiraganaWeTex[] = dgMsgKanji82EFHiraganaWeTex;
+
+#define dgMsgKanji82F0HiraganaWoTex "__OTR__textures/kanji/gMsgKanji82F0HiraganaWoTex"
+static const ALIGN_ASSET(2) char gMsgKanji82F0HiraganaWoTex[] = dgMsgKanji82F0HiraganaWoTex;
+
+#define dgMsgKanji82F1HiraganaNTex "__OTR__textures/kanji/gMsgKanji82F1HiraganaNTex"
+static const ALIGN_ASSET(2) char gMsgKanji82F1HiraganaNTex[] = dgMsgKanji82F1HiraganaNTex;
+
+#define dgMsgKanji82F2EmptyTex "__OTR__textures/kanji/gMsgKanji82F2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji82F2EmptyTex[] = dgMsgKanji82F2EmptyTex;
+
+#define dgMsgKanji8340KatakanaSmallATex "__OTR__textures/kanji/gMsgKanji8340KatakanaSmallATex"
+static const ALIGN_ASSET(2) char gMsgKanji8340KatakanaSmallATex[] = dgMsgKanji8340KatakanaSmallATex;
+
+#define dgMsgKanji8341KatakanaATex "__OTR__textures/kanji/gMsgKanji8341KatakanaATex"
+static const ALIGN_ASSET(2) char gMsgKanji8341KatakanaATex[] = dgMsgKanji8341KatakanaATex;
+
+#define dgMsgKanji8342KatakanaSmallITex "__OTR__textures/kanji/gMsgKanji8342KatakanaSmallITex"
+static const ALIGN_ASSET(2) char gMsgKanji8342KatakanaSmallITex[] = dgMsgKanji8342KatakanaSmallITex;
+
+#define dgMsgKanji8343KatakanaITex "__OTR__textures/kanji/gMsgKanji8343KatakanaITex"
+static const ALIGN_ASSET(2) char gMsgKanji8343KatakanaITex[] = dgMsgKanji8343KatakanaITex;
+
+#define dgMsgKanji8344KatakanaSmallUTex "__OTR__textures/kanji/gMsgKanji8344KatakanaSmallUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8344KatakanaSmallUTex[] = dgMsgKanji8344KatakanaSmallUTex;
+
+#define dgMsgKanji8345KatakanaUTex "__OTR__textures/kanji/gMsgKanji8345KatakanaUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8345KatakanaUTex[] = dgMsgKanji8345KatakanaUTex;
+
+#define dgMsgKanji8346KatakanaSmallETex "__OTR__textures/kanji/gMsgKanji8346KatakanaSmallETex"
+static const ALIGN_ASSET(2) char gMsgKanji8346KatakanaSmallETex[] = dgMsgKanji8346KatakanaSmallETex;
+
+#define dgMsgKanji8347KatakanaETex "__OTR__textures/kanji/gMsgKanji8347KatakanaETex"
+static const ALIGN_ASSET(2) char gMsgKanji8347KatakanaETex[] = dgMsgKanji8347KatakanaETex;
+
+#define dgMsgKanji8348KatakanaSmallOTex "__OTR__textures/kanji/gMsgKanji8348KatakanaSmallOTex"
+static const ALIGN_ASSET(2) char gMsgKanji8348KatakanaSmallOTex[] = dgMsgKanji8348KatakanaSmallOTex;
+
+#define dgMsgKanji8349KatakanaOTex "__OTR__textures/kanji/gMsgKanji8349KatakanaOTex"
+static const ALIGN_ASSET(2) char gMsgKanji8349KatakanaOTex[] = dgMsgKanji8349KatakanaOTex;
+
+#define dgMsgKanji834AKatakanaKaTex "__OTR__textures/kanji/gMsgKanji834AKatakanaKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji834AKatakanaKaTex[] = dgMsgKanji834AKatakanaKaTex;
+
+#define dgMsgKanji834BKatakanaGaTex "__OTR__textures/kanji/gMsgKanji834BKatakanaGaTex"
+static const ALIGN_ASSET(2) char gMsgKanji834BKatakanaGaTex[] = dgMsgKanji834BKatakanaGaTex;
+
+#define dgMsgKanji834CKatakanaKiTex "__OTR__textures/kanji/gMsgKanji834CKatakanaKiTex"
+static const ALIGN_ASSET(2) char gMsgKanji834CKatakanaKiTex[] = dgMsgKanji834CKatakanaKiTex;
+
+#define dgMsgKanji834DKatakanaGiTex "__OTR__textures/kanji/gMsgKanji834DKatakanaGiTex"
+static const ALIGN_ASSET(2) char gMsgKanji834DKatakanaGiTex[] = dgMsgKanji834DKatakanaGiTex;
+
+#define dgMsgKanji834EKatakanaKuTex "__OTR__textures/kanji/gMsgKanji834EKatakanaKuTex"
+static const ALIGN_ASSET(2) char gMsgKanji834EKatakanaKuTex[] = dgMsgKanji834EKatakanaKuTex;
+
+#define dgMsgKanji834FKatakanaGuTex "__OTR__textures/kanji/gMsgKanji834FKatakanaGuTex"
+static const ALIGN_ASSET(2) char gMsgKanji834FKatakanaGuTex[] = dgMsgKanji834FKatakanaGuTex;
+
+#define dgMsgKanji8350KatakanaKeTex "__OTR__textures/kanji/gMsgKanji8350KatakanaKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8350KatakanaKeTex[] = dgMsgKanji8350KatakanaKeTex;
+
+#define dgMsgKanji8351KatakanaGeTex "__OTR__textures/kanji/gMsgKanji8351KatakanaGeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8351KatakanaGeTex[] = dgMsgKanji8351KatakanaGeTex;
+
+#define dgMsgKanji8352KatakanaKoTex "__OTR__textures/kanji/gMsgKanji8352KatakanaKoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8352KatakanaKoTex[] = dgMsgKanji8352KatakanaKoTex;
+
+#define dgMsgKanji8353KatakanaGoTex "__OTR__textures/kanji/gMsgKanji8353KatakanaGoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8353KatakanaGoTex[] = dgMsgKanji8353KatakanaGoTex;
+
+#define dgMsgKanji8354KatakanaSaTex "__OTR__textures/kanji/gMsgKanji8354KatakanaSaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8354KatakanaSaTex[] = dgMsgKanji8354KatakanaSaTex;
+
+#define dgMsgKanji8355KatakanaZaTex "__OTR__textures/kanji/gMsgKanji8355KatakanaZaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8355KatakanaZaTex[] = dgMsgKanji8355KatakanaZaTex;
+
+#define dgMsgKanji8356KatakanaShiTex "__OTR__textures/kanji/gMsgKanji8356KatakanaShiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8356KatakanaShiTex[] = dgMsgKanji8356KatakanaShiTex;
+
+#define dgMsgKanji8357KatakanaJiTex "__OTR__textures/kanji/gMsgKanji8357KatakanaJiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8357KatakanaJiTex[] = dgMsgKanji8357KatakanaJiTex;
+
+#define dgMsgKanji8358KatakanaSuTex "__OTR__textures/kanji/gMsgKanji8358KatakanaSuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8358KatakanaSuTex[] = dgMsgKanji8358KatakanaSuTex;
+
+#define dgMsgKanji8359KatakanaZuTex "__OTR__textures/kanji/gMsgKanji8359KatakanaZuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8359KatakanaZuTex[] = dgMsgKanji8359KatakanaZuTex;
+
+#define dgMsgKanji835AKatakanaSeTex "__OTR__textures/kanji/gMsgKanji835AKatakanaSeTex"
+static const ALIGN_ASSET(2) char gMsgKanji835AKatakanaSeTex[] = dgMsgKanji835AKatakanaSeTex;
+
+#define dgMsgKanji835BKatakanaZeTex "__OTR__textures/kanji/gMsgKanji835BKatakanaZeTex"
+static const ALIGN_ASSET(2) char gMsgKanji835BKatakanaZeTex[] = dgMsgKanji835BKatakanaZeTex;
+
+#define dgMsgKanji835CKatakanaSoTex "__OTR__textures/kanji/gMsgKanji835CKatakanaSoTex"
+static const ALIGN_ASSET(2) char gMsgKanji835CKatakanaSoTex[] = dgMsgKanji835CKatakanaSoTex;
+
+#define dgMsgKanji835DKatakanaZoTex "__OTR__textures/kanji/gMsgKanji835DKatakanaZoTex"
+static const ALIGN_ASSET(2) char gMsgKanji835DKatakanaZoTex[] = dgMsgKanji835DKatakanaZoTex;
+
+#define dgMsgKanji835EKatakanaTaTex "__OTR__textures/kanji/gMsgKanji835EKatakanaTaTex"
+static const ALIGN_ASSET(2) char gMsgKanji835EKatakanaTaTex[] = dgMsgKanji835EKatakanaTaTex;
+
+#define dgMsgKanji835FKatakanaDaTex "__OTR__textures/kanji/gMsgKanji835FKatakanaDaTex"
+static const ALIGN_ASSET(2) char gMsgKanji835FKatakanaDaTex[] = dgMsgKanji835FKatakanaDaTex;
+
+#define dgMsgKanji8360KatakanaChiTex "__OTR__textures/kanji/gMsgKanji8360KatakanaChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8360KatakanaChiTex[] = dgMsgKanji8360KatakanaChiTex;
+
+#define dgMsgKanji8361KatakanaDiTex "__OTR__textures/kanji/gMsgKanji8361KatakanaDiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8361KatakanaDiTex[] = dgMsgKanji8361KatakanaDiTex;
+
+#define dgMsgKanji8362KatakanaSmallTsuTex "__OTR__textures/kanji/gMsgKanji8362KatakanaSmallTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8362KatakanaSmallTsuTex[] = dgMsgKanji8362KatakanaSmallTsuTex;
+
+#define dgMsgKanji8363KatakanaTsuTex "__OTR__textures/kanji/gMsgKanji8363KatakanaTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8363KatakanaTsuTex[] = dgMsgKanji8363KatakanaTsuTex;
+
+#define dgMsgKanji8364KatakanaDuTex "__OTR__textures/kanji/gMsgKanji8364KatakanaDuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8364KatakanaDuTex[] = dgMsgKanji8364KatakanaDuTex;
+
+#define dgMsgKanji8365KatakanaTeTex "__OTR__textures/kanji/gMsgKanji8365KatakanaTeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8365KatakanaTeTex[] = dgMsgKanji8365KatakanaTeTex;
+
+#define dgMsgKanji8366KatakanaDeTex "__OTR__textures/kanji/gMsgKanji8366KatakanaDeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8366KatakanaDeTex[] = dgMsgKanji8366KatakanaDeTex;
+
+#define dgMsgKanji8367KatakanaToTex "__OTR__textures/kanji/gMsgKanji8367KatakanaToTex"
+static const ALIGN_ASSET(2) char gMsgKanji8367KatakanaToTex[] = dgMsgKanji8367KatakanaToTex;
+
+#define dgMsgKanji8368KatakanaDoTex "__OTR__textures/kanji/gMsgKanji8368KatakanaDoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8368KatakanaDoTex[] = dgMsgKanji8368KatakanaDoTex;
+
+#define dgMsgKanji8369KatakanaNaTex "__OTR__textures/kanji/gMsgKanji8369KatakanaNaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8369KatakanaNaTex[] = dgMsgKanji8369KatakanaNaTex;
+
+#define dgMsgKanji836AKatakanaNiTex "__OTR__textures/kanji/gMsgKanji836AKatakanaNiTex"
+static const ALIGN_ASSET(2) char gMsgKanji836AKatakanaNiTex[] = dgMsgKanji836AKatakanaNiTex;
+
+#define dgMsgKanji836BKatakanaNuTex "__OTR__textures/kanji/gMsgKanji836BKatakanaNuTex"
+static const ALIGN_ASSET(2) char gMsgKanji836BKatakanaNuTex[] = dgMsgKanji836BKatakanaNuTex;
+
+#define dgMsgKanji836CKatakanaNeTex "__OTR__textures/kanji/gMsgKanji836CKatakanaNeTex"
+static const ALIGN_ASSET(2) char gMsgKanji836CKatakanaNeTex[] = dgMsgKanji836CKatakanaNeTex;
+
+#define dgMsgKanji836DKatakanaNoTex "__OTR__textures/kanji/gMsgKanji836DKatakanaNoTex"
+static const ALIGN_ASSET(2) char gMsgKanji836DKatakanaNoTex[] = dgMsgKanji836DKatakanaNoTex;
+
+#define dgMsgKanji836EKatakanaHaTex "__OTR__textures/kanji/gMsgKanji836EKatakanaHaTex"
+static const ALIGN_ASSET(2) char gMsgKanji836EKatakanaHaTex[] = dgMsgKanji836EKatakanaHaTex;
+
+#define dgMsgKanji836FKatakanaBaTex "__OTR__textures/kanji/gMsgKanji836FKatakanaBaTex"
+static const ALIGN_ASSET(2) char gMsgKanji836FKatakanaBaTex[] = dgMsgKanji836FKatakanaBaTex;
+
+#define dgMsgKanji8370KatakanaPaTex "__OTR__textures/kanji/gMsgKanji8370KatakanaPaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8370KatakanaPaTex[] = dgMsgKanji8370KatakanaPaTex;
+
+#define dgMsgKanji8371KatakanaHiTex "__OTR__textures/kanji/gMsgKanji8371KatakanaHiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8371KatakanaHiTex[] = dgMsgKanji8371KatakanaHiTex;
+
+#define dgMsgKanji8372KatakanaBiTex "__OTR__textures/kanji/gMsgKanji8372KatakanaBiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8372KatakanaBiTex[] = dgMsgKanji8372KatakanaBiTex;
+
+#define dgMsgKanji8373KatakanaPiTex "__OTR__textures/kanji/gMsgKanji8373KatakanaPiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8373KatakanaPiTex[] = dgMsgKanji8373KatakanaPiTex;
+
+#define dgMsgKanji8374KatakanaFuTex "__OTR__textures/kanji/gMsgKanji8374KatakanaFuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8374KatakanaFuTex[] = dgMsgKanji8374KatakanaFuTex;
+
+#define dgMsgKanji8375KatakanaBuTex "__OTR__textures/kanji/gMsgKanji8375KatakanaBuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8375KatakanaBuTex[] = dgMsgKanji8375KatakanaBuTex;
+
+#define dgMsgKanji8376KatakanaPuTex "__OTR__textures/kanji/gMsgKanji8376KatakanaPuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8376KatakanaPuTex[] = dgMsgKanji8376KatakanaPuTex;
+
+#define dgMsgKanji8377KatakanaHeTex "__OTR__textures/kanji/gMsgKanji8377KatakanaHeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8377KatakanaHeTex[] = dgMsgKanji8377KatakanaHeTex;
+
+#define dgMsgKanji8378KatakanaBeTex "__OTR__textures/kanji/gMsgKanji8378KatakanaBeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8378KatakanaBeTex[] = dgMsgKanji8378KatakanaBeTex;
+
+#define dgMsgKanji8379KatakanaPeTex "__OTR__textures/kanji/gMsgKanji8379KatakanaPeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8379KatakanaPeTex[] = dgMsgKanji8379KatakanaPeTex;
+
+#define dgMsgKanji837AKatakanaHoTex "__OTR__textures/kanji/gMsgKanji837AKatakanaHoTex"
+static const ALIGN_ASSET(2) char gMsgKanji837AKatakanaHoTex[] = dgMsgKanji837AKatakanaHoTex;
+
+#define dgMsgKanji837BKatakanaBoTex "__OTR__textures/kanji/gMsgKanji837BKatakanaBoTex"
+static const ALIGN_ASSET(2) char gMsgKanji837BKatakanaBoTex[] = dgMsgKanji837BKatakanaBoTex;
+
+#define dgMsgKanji837CKatakanaPoTex "__OTR__textures/kanji/gMsgKanji837CKatakanaPoTex"
+static const ALIGN_ASSET(2) char gMsgKanji837CKatakanaPoTex[] = dgMsgKanji837CKatakanaPoTex;
+
+#define dgMsgKanji837DKatakanaMaTex "__OTR__textures/kanji/gMsgKanji837DKatakanaMaTex"
+static const ALIGN_ASSET(2) char gMsgKanji837DKatakanaMaTex[] = dgMsgKanji837DKatakanaMaTex;
+
+#define dgMsgKanji837EKatakanaMiTex "__OTR__textures/kanji/gMsgKanji837EKatakanaMiTex"
+static const ALIGN_ASSET(2) char gMsgKanji837EKatakanaMiTex[] = dgMsgKanji837EKatakanaMiTex;
+
+#define dgMsgKanji8380KatakanaMuTex "__OTR__textures/kanji/gMsgKanji8380KatakanaMuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8380KatakanaMuTex[] = dgMsgKanji8380KatakanaMuTex;
+
+#define dgMsgKanji8381KatakanaMeTex "__OTR__textures/kanji/gMsgKanji8381KatakanaMeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8381KatakanaMeTex[] = dgMsgKanji8381KatakanaMeTex;
+
+#define dgMsgKanji8382KatakanaMoTex "__OTR__textures/kanji/gMsgKanji8382KatakanaMoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8382KatakanaMoTex[] = dgMsgKanji8382KatakanaMoTex;
+
+#define dgMsgKanji8383KatakanaSmallYaTex "__OTR__textures/kanji/gMsgKanji8383KatakanaSmallYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8383KatakanaSmallYaTex[] = dgMsgKanji8383KatakanaSmallYaTex;
+
+#define dgMsgKanji8384KatakanaYaTex "__OTR__textures/kanji/gMsgKanji8384KatakanaYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8384KatakanaYaTex[] = dgMsgKanji8384KatakanaYaTex;
+
+#define dgMsgKanji8385KatakanaSmallYuTex "__OTR__textures/kanji/gMsgKanji8385KatakanaSmallYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8385KatakanaSmallYuTex[] = dgMsgKanji8385KatakanaSmallYuTex;
+
+#define dgMsgKanji8386KatakanaYuTex "__OTR__textures/kanji/gMsgKanji8386KatakanaYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8386KatakanaYuTex[] = dgMsgKanji8386KatakanaYuTex;
+
+#define dgMsgKanji8387KatakanaSmallYoTex "__OTR__textures/kanji/gMsgKanji8387KatakanaSmallYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8387KatakanaSmallYoTex[] = dgMsgKanji8387KatakanaSmallYoTex;
+
+#define dgMsgKanji8388KatakanaYoTex "__OTR__textures/kanji/gMsgKanji8388KatakanaYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8388KatakanaYoTex[] = dgMsgKanji8388KatakanaYoTex;
+
+#define dgMsgKanji8389KatakanaRaTex "__OTR__textures/kanji/gMsgKanji8389KatakanaRaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8389KatakanaRaTex[] = dgMsgKanji8389KatakanaRaTex;
+
+#define dgMsgKanji838AKatakanaRiTex "__OTR__textures/kanji/gMsgKanji838AKatakanaRiTex"
+static const ALIGN_ASSET(2) char gMsgKanji838AKatakanaRiTex[] = dgMsgKanji838AKatakanaRiTex;
+
+#define dgMsgKanji838BKatakanaRuTex "__OTR__textures/kanji/gMsgKanji838BKatakanaRuTex"
+static const ALIGN_ASSET(2) char gMsgKanji838BKatakanaRuTex[] = dgMsgKanji838BKatakanaRuTex;
+
+#define dgMsgKanji838CKatakanaReTex "__OTR__textures/kanji/gMsgKanji838CKatakanaReTex"
+static const ALIGN_ASSET(2) char gMsgKanji838CKatakanaReTex[] = dgMsgKanji838CKatakanaReTex;
+
+#define dgMsgKanji838DKatakanaRoTex "__OTR__textures/kanji/gMsgKanji838DKatakanaRoTex"
+static const ALIGN_ASSET(2) char gMsgKanji838DKatakanaRoTex[] = dgMsgKanji838DKatakanaRoTex;
+
+#define dgMsgKanji838EKatakanaSmallWaTex "__OTR__textures/kanji/gMsgKanji838EKatakanaSmallWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji838EKatakanaSmallWaTex[] = dgMsgKanji838EKatakanaSmallWaTex;
+
+#define dgMsgKanji838FKatakanaWaTex "__OTR__textures/kanji/gMsgKanji838FKatakanaWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji838FKatakanaWaTex[] = dgMsgKanji838FKatakanaWaTex;
+
+#define dgMsgKanji8390KatakanaWiTex "__OTR__textures/kanji/gMsgKanji8390KatakanaWiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8390KatakanaWiTex[] = dgMsgKanji8390KatakanaWiTex;
+
+#define dgMsgKanji8391KatakanaWeTex "__OTR__textures/kanji/gMsgKanji8391KatakanaWeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8391KatakanaWeTex[] = dgMsgKanji8391KatakanaWeTex;
+
+#define dgMsgKanji8392KatakanaWoTex "__OTR__textures/kanji/gMsgKanji8392KatakanaWoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8392KatakanaWoTex[] = dgMsgKanji8392KatakanaWoTex;
+
+#define dgMsgKanji8393KatakanaNTex "__OTR__textures/kanji/gMsgKanji8393KatakanaNTex"
+static const ALIGN_ASSET(2) char gMsgKanji8393KatakanaNTex[] = dgMsgKanji8393KatakanaNTex;
+
+#define dgMsgKanji8394KatakanaVuTex "__OTR__textures/kanji/gMsgKanji8394KatakanaVuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8394KatakanaVuTex[] = dgMsgKanji8394KatakanaVuTex;
+
+#define dgMsgKanji8395KatakanaSmallKaTex "__OTR__textures/kanji/gMsgKanji8395KatakanaSmallKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8395KatakanaSmallKaTex[] = dgMsgKanji8395KatakanaSmallKaTex;
+
+#define dgMsgKanji8396KatakanaSmallKeTex "__OTR__textures/kanji/gMsgKanji8396KatakanaSmallKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8396KatakanaSmallKeTex[] = dgMsgKanji8396KatakanaSmallKeTex;
+
+#define dgMsgKanji839FButtonATex "__OTR__textures/kanji/gMsgKanji839FButtonATex"
+static const ALIGN_ASSET(2) char gMsgKanji839FButtonATex[] = dgMsgKanji839FButtonATex;
+
+#define dgMsgKanji83A0ButtonBTex "__OTR__textures/kanji/gMsgKanji83A0ButtonBTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A0ButtonBTex[] = dgMsgKanji83A0ButtonBTex;
+
+#define dgMsgKanji83A1ButtonCTex "__OTR__textures/kanji/gMsgKanji83A1ButtonCTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A1ButtonCTex[] = dgMsgKanji83A1ButtonCTex;
+
+#define dgMsgKanji83A2ButtonLTex "__OTR__textures/kanji/gMsgKanji83A2ButtonLTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A2ButtonLTex[] = dgMsgKanji83A2ButtonLTex;
+
+#define dgMsgKanji83A3ButtonRTex "__OTR__textures/kanji/gMsgKanji83A3ButtonRTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A3ButtonRTex[] = dgMsgKanji83A3ButtonRTex;
+
+#define dgMsgKanji83A4ButtonZTex "__OTR__textures/kanji/gMsgKanji83A4ButtonZTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A4ButtonZTex[] = dgMsgKanji83A4ButtonZTex;
+
+#define dgMsgKanji83A5ButtonCUpTex "__OTR__textures/kanji/gMsgKanji83A5ButtonCUpTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A5ButtonCUpTex[] = dgMsgKanji83A5ButtonCUpTex;
+
+#define dgMsgKanji83A6ButtonCDownTex "__OTR__textures/kanji/gMsgKanji83A6ButtonCDownTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A6ButtonCDownTex[] = dgMsgKanji83A6ButtonCDownTex;
+
+#define dgMsgKanji83A7ButtonCLeftTex "__OTR__textures/kanji/gMsgKanji83A7ButtonCLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A7ButtonCLeftTex[] = dgMsgKanji83A7ButtonCLeftTex;
+
+#define dgMsgKanji83A8ButtonCRightTex "__OTR__textures/kanji/gMsgKanji83A8ButtonCRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A8ButtonCRightTex[] = dgMsgKanji83A8ButtonCRightTex;
+
+#define dgMsgKanji83A9ZTargetSignTex "__OTR__textures/kanji/gMsgKanji83A9ZTargetSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji83A9ZTargetSignTex[] = dgMsgKanji83A9ZTargetSignTex;
+
+#define dgMsgKanji83AAControlStickTex "__OTR__textures/kanji/gMsgKanji83AAControlStickTex"
+static const ALIGN_ASSET(2) char gMsgKanji83AAControlStickTex[] = dgMsgKanji83AAControlStickTex;
+
+#define dgMsgKanji83ABGreekCapitalNuTex "__OTR__textures/kanji/gMsgKanji83ABGreekCapitalNuTex"
+static const ALIGN_ASSET(2) char gMsgKanji83ABGreekCapitalNuTex[] = dgMsgKanji83ABGreekCapitalNuTex;
+
+#define dgMsgKanji83ACGreekCapitalXiTex "__OTR__textures/kanji/gMsgKanji83ACGreekCapitalXiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83ACGreekCapitalXiTex[] = dgMsgKanji83ACGreekCapitalXiTex;
+
+#define dgMsgKanji83ADGreekCapitalOmicronTex "__OTR__textures/kanji/gMsgKanji83ADGreekCapitalOmicronTex"
+static const ALIGN_ASSET(2) char gMsgKanji83ADGreekCapitalOmicronTex[] = dgMsgKanji83ADGreekCapitalOmicronTex;
+
+#define dgMsgKanji83AEGreekCapitalPiTex "__OTR__textures/kanji/gMsgKanji83AEGreekCapitalPiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83AEGreekCapitalPiTex[] = dgMsgKanji83AEGreekCapitalPiTex;
+
+#define dgMsgKanji83AFGreekCapitalRhoTex "__OTR__textures/kanji/gMsgKanji83AFGreekCapitalRhoTex"
+static const ALIGN_ASSET(2) char gMsgKanji83AFGreekCapitalRhoTex[] = dgMsgKanji83AFGreekCapitalRhoTex;
+
+#define dgMsgKanji83B0GreekCapitalSigmaTex "__OTR__textures/kanji/gMsgKanji83B0GreekCapitalSigmaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B0GreekCapitalSigmaTex[] = dgMsgKanji83B0GreekCapitalSigmaTex;
+
+#define dgMsgKanji83B1GreekCapitalTauTex "__OTR__textures/kanji/gMsgKanji83B1GreekCapitalTauTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B1GreekCapitalTauTex[] = dgMsgKanji83B1GreekCapitalTauTex;
+
+#define dgMsgKanji83B2GreekCapitalUpsilonTex "__OTR__textures/kanji/gMsgKanji83B2GreekCapitalUpsilonTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B2GreekCapitalUpsilonTex[] = dgMsgKanji83B2GreekCapitalUpsilonTex;
+
+#define dgMsgKanji83B3GreekCapitalPhiTex "__OTR__textures/kanji/gMsgKanji83B3GreekCapitalPhiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B3GreekCapitalPhiTex[] = dgMsgKanji83B3GreekCapitalPhiTex;
+
+#define dgMsgKanji83B4GreekCapitalChiTex "__OTR__textures/kanji/gMsgKanji83B4GreekCapitalChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B4GreekCapitalChiTex[] = dgMsgKanji83B4GreekCapitalChiTex;
+
+#define dgMsgKanji83B5GreekCapitalPsiTex "__OTR__textures/kanji/gMsgKanji83B5GreekCapitalPsiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B5GreekCapitalPsiTex[] = dgMsgKanji83B5GreekCapitalPsiTex;
+
+#define dgMsgKanji83B6GreekCapitalOmegaTex "__OTR__textures/kanji/gMsgKanji83B6GreekCapitalOmegaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83B6GreekCapitalOmegaTex[] = dgMsgKanji83B6GreekCapitalOmegaTex;
+
+#define dgMsgKanji83BFGreekLowercaseAlphaTex "__OTR__textures/kanji/gMsgKanji83BFGreekLowercaseAlphaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83BFGreekLowercaseAlphaTex[] = dgMsgKanji83BFGreekLowercaseAlphaTex;
+
+#define dgMsgKanji83C0GreekLowercaseBetaTex "__OTR__textures/kanji/gMsgKanji83C0GreekLowercaseBetaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C0GreekLowercaseBetaTex[] = dgMsgKanji83C0GreekLowercaseBetaTex;
+
+#define dgMsgKanji83C1GreekLowercaseGammaTex "__OTR__textures/kanji/gMsgKanji83C1GreekLowercaseGammaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C1GreekLowercaseGammaTex[] = dgMsgKanji83C1GreekLowercaseGammaTex;
+
+#define dgMsgKanji83C2GreekLowercaseDeltaTex "__OTR__textures/kanji/gMsgKanji83C2GreekLowercaseDeltaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C2GreekLowercaseDeltaTex[] = dgMsgKanji83C2GreekLowercaseDeltaTex;
+
+#define dgMsgKanji83C3GreekLowercaseEpsilonTex "__OTR__textures/kanji/gMsgKanji83C3GreekLowercaseEpsilonTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C3GreekLowercaseEpsilonTex[] = dgMsgKanji83C3GreekLowercaseEpsilonTex;
+
+#define dgMsgKanji83C4GreekLowercaseZetaTex "__OTR__textures/kanji/gMsgKanji83C4GreekLowercaseZetaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C4GreekLowercaseZetaTex[] = dgMsgKanji83C4GreekLowercaseZetaTex;
+
+#define dgMsgKanji83C5GreekLowercaseEtaTex "__OTR__textures/kanji/gMsgKanji83C5GreekLowercaseEtaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C5GreekLowercaseEtaTex[] = dgMsgKanji83C5GreekLowercaseEtaTex;
+
+#define dgMsgKanji83C6GreekLowercaseThetaTex "__OTR__textures/kanji/gMsgKanji83C6GreekLowercaseThetaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C6GreekLowercaseThetaTex[] = dgMsgKanji83C6GreekLowercaseThetaTex;
+
+#define dgMsgKanji83C7GreekLowercaseIotaTex "__OTR__textures/kanji/gMsgKanji83C7GreekLowercaseIotaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C7GreekLowercaseIotaTex[] = dgMsgKanji83C7GreekLowercaseIotaTex;
+
+#define dgMsgKanji83C8GreekLowercaseKappaTex "__OTR__textures/kanji/gMsgKanji83C8GreekLowercaseKappaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C8GreekLowercaseKappaTex[] = dgMsgKanji83C8GreekLowercaseKappaTex;
+
+#define dgMsgKanji83C9GreekLowercaseLamdaTex "__OTR__textures/kanji/gMsgKanji83C9GreekLowercaseLamdaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83C9GreekLowercaseLamdaTex[] = dgMsgKanji83C9GreekLowercaseLamdaTex;
+
+#define dgMsgKanji83CAGreekLowercaseMuTex "__OTR__textures/kanji/gMsgKanji83CAGreekLowercaseMuTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CAGreekLowercaseMuTex[] = dgMsgKanji83CAGreekLowercaseMuTex;
+
+#define dgMsgKanji83CBGreekLowercaseNuTex "__OTR__textures/kanji/gMsgKanji83CBGreekLowercaseNuTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CBGreekLowercaseNuTex[] = dgMsgKanji83CBGreekLowercaseNuTex;
+
+#define dgMsgKanji83CCGreekLowercaseXiTex "__OTR__textures/kanji/gMsgKanji83CCGreekLowercaseXiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CCGreekLowercaseXiTex[] = dgMsgKanji83CCGreekLowercaseXiTex;
+
+#define dgMsgKanji83CDGreekLowercaseOmicronTex "__OTR__textures/kanji/gMsgKanji83CDGreekLowercaseOmicronTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CDGreekLowercaseOmicronTex[] = dgMsgKanji83CDGreekLowercaseOmicronTex;
+
+#define dgMsgKanji83CEGreekLowercasePiTex "__OTR__textures/kanji/gMsgKanji83CEGreekLowercasePiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CEGreekLowercasePiTex[] = dgMsgKanji83CEGreekLowercasePiTex;
+
+#define dgMsgKanji83CFGreekLowercaseRhoTex "__OTR__textures/kanji/gMsgKanji83CFGreekLowercaseRhoTex"
+static const ALIGN_ASSET(2) char gMsgKanji83CFGreekLowercaseRhoTex[] = dgMsgKanji83CFGreekLowercaseRhoTex;
+
+#define dgMsgKanji83D0GreekLowercaseSigmaTex "__OTR__textures/kanji/gMsgKanji83D0GreekLowercaseSigmaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D0GreekLowercaseSigmaTex[] = dgMsgKanji83D0GreekLowercaseSigmaTex;
+
+#define dgMsgKanji83D1GreekLowercaseTauTex "__OTR__textures/kanji/gMsgKanji83D1GreekLowercaseTauTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D1GreekLowercaseTauTex[] = dgMsgKanji83D1GreekLowercaseTauTex;
+
+#define dgMsgKanji83D2GreekLowercaseUpsilonTex "__OTR__textures/kanji/gMsgKanji83D2GreekLowercaseUpsilonTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D2GreekLowercaseUpsilonTex[] = dgMsgKanji83D2GreekLowercaseUpsilonTex;
+
+#define dgMsgKanji83D3GreekLowercasePhiTex "__OTR__textures/kanji/gMsgKanji83D3GreekLowercasePhiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D3GreekLowercasePhiTex[] = dgMsgKanji83D3GreekLowercasePhiTex;
+
+#define dgMsgKanji83D4GreekLowercaseChiTex "__OTR__textures/kanji/gMsgKanji83D4GreekLowercaseChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D4GreekLowercaseChiTex[] = dgMsgKanji83D4GreekLowercaseChiTex;
+
+#define dgMsgKanji83D5GreekLowercasePsiTex "__OTR__textures/kanji/gMsgKanji83D5GreekLowercasePsiTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D5GreekLowercasePsiTex[] = dgMsgKanji83D5GreekLowercasePsiTex;
+
+#define dgMsgKanji83D6GreekLowercaseOmegaTex "__OTR__textures/kanji/gMsgKanji83D6GreekLowercaseOmegaTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D6GreekLowercaseOmegaTex[] = dgMsgKanji83D6GreekLowercaseOmegaTex;
+
+#define dgMsgKanji83D7EmptyTex "__OTR__textures/kanji/gMsgKanji83D7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji83D7EmptyTex[] = dgMsgKanji83D7EmptyTex;
+
+#define dgMsgKanji8440HylianATex "__OTR__textures/kanji/gMsgKanji8440HylianATex"
+static const ALIGN_ASSET(2) char gMsgKanji8440HylianATex[] = dgMsgKanji8440HylianATex;
+
+#define dgMsgKanji8441HylianITex "__OTR__textures/kanji/gMsgKanji8441HylianITex"
+static const ALIGN_ASSET(2) char gMsgKanji8441HylianITex[] = dgMsgKanji8441HylianITex;
+
+#define dgMsgKanji8442HylianUTex "__OTR__textures/kanji/gMsgKanji8442HylianUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8442HylianUTex[] = dgMsgKanji8442HylianUTex;
+
+#define dgMsgKanji8443HylianETex "__OTR__textures/kanji/gMsgKanji8443HylianETex"
+static const ALIGN_ASSET(2) char gMsgKanji8443HylianETex[] = dgMsgKanji8443HylianETex;
+
+#define dgMsgKanji8444HylianOTex "__OTR__textures/kanji/gMsgKanji8444HylianOTex"
+static const ALIGN_ASSET(2) char gMsgKanji8444HylianOTex[] = dgMsgKanji8444HylianOTex;
+
+#define dgMsgKanji8445HylianKaTex "__OTR__textures/kanji/gMsgKanji8445HylianKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8445HylianKaTex[] = dgMsgKanji8445HylianKaTex;
+
+#define dgMsgKanji8446HylianKiTex "__OTR__textures/kanji/gMsgKanji8446HylianKiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8446HylianKiTex[] = dgMsgKanji8446HylianKiTex;
+
+#define dgMsgKanji8447HylianKuTex "__OTR__textures/kanji/gMsgKanji8447HylianKuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8447HylianKuTex[] = dgMsgKanji8447HylianKuTex;
+
+#define dgMsgKanji8448HylianKeTex "__OTR__textures/kanji/gMsgKanji8448HylianKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8448HylianKeTex[] = dgMsgKanji8448HylianKeTex;
+
+#define dgMsgKanji8449HylianKoTex "__OTR__textures/kanji/gMsgKanji8449HylianKoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8449HylianKoTex[] = dgMsgKanji8449HylianKoTex;
+
+#define dgMsgKanji844AHylianSaTex "__OTR__textures/kanji/gMsgKanji844AHylianSaTex"
+static const ALIGN_ASSET(2) char gMsgKanji844AHylianSaTex[] = dgMsgKanji844AHylianSaTex;
+
+#define dgMsgKanji844BHylianShiTex "__OTR__textures/kanji/gMsgKanji844BHylianShiTex"
+static const ALIGN_ASSET(2) char gMsgKanji844BHylianShiTex[] = dgMsgKanji844BHylianShiTex;
+
+#define dgMsgKanji844CHylianSuTex "__OTR__textures/kanji/gMsgKanji844CHylianSuTex"
+static const ALIGN_ASSET(2) char gMsgKanji844CHylianSuTex[] = dgMsgKanji844CHylianSuTex;
+
+#define dgMsgKanji844DHylianSeTex "__OTR__textures/kanji/gMsgKanji844DHylianSeTex"
+static const ALIGN_ASSET(2) char gMsgKanji844DHylianSeTex[] = dgMsgKanji844DHylianSeTex;
+
+#define dgMsgKanji844EHylianSoTex "__OTR__textures/kanji/gMsgKanji844EHylianSoTex"
+static const ALIGN_ASSET(2) char gMsgKanji844EHylianSoTex[] = dgMsgKanji844EHylianSoTex;
+
+#define dgMsgKanji844FHylianTaTex "__OTR__textures/kanji/gMsgKanji844FHylianTaTex"
+static const ALIGN_ASSET(2) char gMsgKanji844FHylianTaTex[] = dgMsgKanji844FHylianTaTex;
+
+#define dgMsgKanji8450HylianChiTex "__OTR__textures/kanji/gMsgKanji8450HylianChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8450HylianChiTex[] = dgMsgKanji8450HylianChiTex;
+
+#define dgMsgKanji8451HylianTsuTex "__OTR__textures/kanji/gMsgKanji8451HylianTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8451HylianTsuTex[] = dgMsgKanji8451HylianTsuTex;
+
+#define dgMsgKanji8452HylianTeTex "__OTR__textures/kanji/gMsgKanji8452HylianTeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8452HylianTeTex[] = dgMsgKanji8452HylianTeTex;
+
+#define dgMsgKanji8453HylianToTex "__OTR__textures/kanji/gMsgKanji8453HylianToTex"
+static const ALIGN_ASSET(2) char gMsgKanji8453HylianToTex[] = dgMsgKanji8453HylianToTex;
+
+#define dgMsgKanji8454HylianNaTex "__OTR__textures/kanji/gMsgKanji8454HylianNaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8454HylianNaTex[] = dgMsgKanji8454HylianNaTex;
+
+#define dgMsgKanji8455HylianNiTex "__OTR__textures/kanji/gMsgKanji8455HylianNiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8455HylianNiTex[] = dgMsgKanji8455HylianNiTex;
+
+#define dgMsgKanji8456HylianNuTex "__OTR__textures/kanji/gMsgKanji8456HylianNuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8456HylianNuTex[] = dgMsgKanji8456HylianNuTex;
+
+#define dgMsgKanji8457HylianNeTex "__OTR__textures/kanji/gMsgKanji8457HylianNeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8457HylianNeTex[] = dgMsgKanji8457HylianNeTex;
+
+#define dgMsgKanji8458HylianNoTex "__OTR__textures/kanji/gMsgKanji8458HylianNoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8458HylianNoTex[] = dgMsgKanji8458HylianNoTex;
+
+#define dgMsgKanji8459HylianHaTex "__OTR__textures/kanji/gMsgKanji8459HylianHaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8459HylianHaTex[] = dgMsgKanji8459HylianHaTex;
+
+#define dgMsgKanji845AHylianHiTex "__OTR__textures/kanji/gMsgKanji845AHylianHiTex"
+static const ALIGN_ASSET(2) char gMsgKanji845AHylianHiTex[] = dgMsgKanji845AHylianHiTex;
+
+#define dgMsgKanji845BHylianFuTex "__OTR__textures/kanji/gMsgKanji845BHylianFuTex"
+static const ALIGN_ASSET(2) char gMsgKanji845BHylianFuTex[] = dgMsgKanji845BHylianFuTex;
+
+#define dgMsgKanji845CHylianHeTex "__OTR__textures/kanji/gMsgKanji845CHylianHeTex"
+static const ALIGN_ASSET(2) char gMsgKanji845CHylianHeTex[] = dgMsgKanji845CHylianHeTex;
+
+#define dgMsgKanji845DHylianHoTex "__OTR__textures/kanji/gMsgKanji845DHylianHoTex"
+static const ALIGN_ASSET(2) char gMsgKanji845DHylianHoTex[] = dgMsgKanji845DHylianHoTex;
+
+#define dgMsgKanji845EHylianMaTex "__OTR__textures/kanji/gMsgKanji845EHylianMaTex"
+static const ALIGN_ASSET(2) char gMsgKanji845EHylianMaTex[] = dgMsgKanji845EHylianMaTex;
+
+#define dgMsgKanji845FHylianMiTex "__OTR__textures/kanji/gMsgKanji845FHylianMiTex"
+static const ALIGN_ASSET(2) char gMsgKanji845FHylianMiTex[] = dgMsgKanji845FHylianMiTex;
+
+#define dgMsgKanji8460HylianMuTex "__OTR__textures/kanji/gMsgKanji8460HylianMuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8460HylianMuTex[] = dgMsgKanji8460HylianMuTex;
+
+#define dgMsgKanji8470HylianMeTex "__OTR__textures/kanji/gMsgKanji8470HylianMeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8470HylianMeTex[] = dgMsgKanji8470HylianMeTex;
+
+#define dgMsgKanji8471HylianMoTex "__OTR__textures/kanji/gMsgKanji8471HylianMoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8471HylianMoTex[] = dgMsgKanji8471HylianMoTex;
+
+#define dgMsgKanji8472HylianYaTex "__OTR__textures/kanji/gMsgKanji8472HylianYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8472HylianYaTex[] = dgMsgKanji8472HylianYaTex;
+
+#define dgMsgKanji8473HylianYuTex "__OTR__textures/kanji/gMsgKanji8473HylianYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8473HylianYuTex[] = dgMsgKanji8473HylianYuTex;
+
+#define dgMsgKanji8474HylianYoTex "__OTR__textures/kanji/gMsgKanji8474HylianYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8474HylianYoTex[] = dgMsgKanji8474HylianYoTex;
+
+#define dgMsgKanji8475HylianRaTex "__OTR__textures/kanji/gMsgKanji8475HylianRaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8475HylianRaTex[] = dgMsgKanji8475HylianRaTex;
+
+#define dgMsgKanji8476HylianRiTex "__OTR__textures/kanji/gMsgKanji8476HylianRiTex"
+static const ALIGN_ASSET(2) char gMsgKanji8476HylianRiTex[] = dgMsgKanji8476HylianRiTex;
+
+#define dgMsgKanji8477HylianRuTex "__OTR__textures/kanji/gMsgKanji8477HylianRuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8477HylianRuTex[] = dgMsgKanji8477HylianRuTex;
+
+#define dgMsgKanji8478HylianReTex "__OTR__textures/kanji/gMsgKanji8478HylianReTex"
+static const ALIGN_ASSET(2) char gMsgKanji8478HylianReTex[] = dgMsgKanji8478HylianReTex;
+
+#define dgMsgKanji8479HylianRoTex "__OTR__textures/kanji/gMsgKanji8479HylianRoTex"
+static const ALIGN_ASSET(2) char gMsgKanji8479HylianRoTex[] = dgMsgKanji8479HylianRoTex;
+
+#define dgMsgKanji847AHylianWaTex "__OTR__textures/kanji/gMsgKanji847AHylianWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji847AHylianWaTex[] = dgMsgKanji847AHylianWaTex;
+
+#define dgMsgKanji847BHylianWoTex "__OTR__textures/kanji/gMsgKanji847BHylianWoTex"
+static const ALIGN_ASSET(2) char gMsgKanji847BHylianWoTex[] = dgMsgKanji847BHylianWoTex;
+
+#define dgMsgKanji847CHylianNTex "__OTR__textures/kanji/gMsgKanji847CHylianNTex"
+static const ALIGN_ASSET(2) char gMsgKanji847CHylianNTex[] = dgMsgKanji847CHylianNTex;
+
+#define dgMsgKanji847DHylianToutenTex "__OTR__textures/kanji/gMsgKanji847DHylianToutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji847DHylianToutenTex[] = dgMsgKanji847DHylianToutenTex;
+
+#define dgMsgKanji847EHylianKutenTex "__OTR__textures/kanji/gMsgKanji847EHylianKutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji847EHylianKutenTex[] = dgMsgKanji847EHylianKutenTex;
+
+#define dgMsgKanji8480CyrillicLowercaseOTex "__OTR__textures/kanji/gMsgKanji8480CyrillicLowercaseOTex"
+static const ALIGN_ASSET(2) char gMsgKanji8480CyrillicLowercaseOTex[] = dgMsgKanji8480CyrillicLowercaseOTex;
+
+#define dgMsgKanji8481CyrillicLowercasePeTex "__OTR__textures/kanji/gMsgKanji8481CyrillicLowercasePeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8481CyrillicLowercasePeTex[] = dgMsgKanji8481CyrillicLowercasePeTex;
+
+#define dgMsgKanji8482CyrillicLowercaseErTex "__OTR__textures/kanji/gMsgKanji8482CyrillicLowercaseErTex"
+static const ALIGN_ASSET(2) char gMsgKanji8482CyrillicLowercaseErTex[] = dgMsgKanji8482CyrillicLowercaseErTex;
+
+#define dgMsgKanji8483CyrillicLowercaseEsTex "__OTR__textures/kanji/gMsgKanji8483CyrillicLowercaseEsTex"
+static const ALIGN_ASSET(2) char gMsgKanji8483CyrillicLowercaseEsTex[] = dgMsgKanji8483CyrillicLowercaseEsTex;
+
+#define dgMsgKanji8484CyrillicLowercaseTeTex "__OTR__textures/kanji/gMsgKanji8484CyrillicLowercaseTeTex"
+static const ALIGN_ASSET(2) char gMsgKanji8484CyrillicLowercaseTeTex[] = dgMsgKanji8484CyrillicLowercaseTeTex;
+
+#define dgMsgKanji8485CyrillicLowercaseUTex "__OTR__textures/kanji/gMsgKanji8485CyrillicLowercaseUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8485CyrillicLowercaseUTex[] = dgMsgKanji8485CyrillicLowercaseUTex;
+
+#define dgMsgKanji8486CyrillicLowercaseEfTex "__OTR__textures/kanji/gMsgKanji8486CyrillicLowercaseEfTex"
+static const ALIGN_ASSET(2) char gMsgKanji8486CyrillicLowercaseEfTex[] = dgMsgKanji8486CyrillicLowercaseEfTex;
+
+#define dgMsgKanji8487CyrillicLowercaseHaTex "__OTR__textures/kanji/gMsgKanji8487CyrillicLowercaseHaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8487CyrillicLowercaseHaTex[] = dgMsgKanji8487CyrillicLowercaseHaTex;
+
+#define dgMsgKanji8488CyrillicLowercaseTseTex "__OTR__textures/kanji/gMsgKanji8488CyrillicLowercaseTseTex"
+static const ALIGN_ASSET(2) char gMsgKanji8488CyrillicLowercaseTseTex[] = dgMsgKanji8488CyrillicLowercaseTseTex;
+
+#define dgMsgKanji8489CyrillicLowercaseCheTex "__OTR__textures/kanji/gMsgKanji8489CyrillicLowercaseCheTex"
+static const ALIGN_ASSET(2) char gMsgKanji8489CyrillicLowercaseCheTex[] = dgMsgKanji8489CyrillicLowercaseCheTex;
+
+#define dgMsgKanji848ACyrillicLowercaseShaTex "__OTR__textures/kanji/gMsgKanji848ACyrillicLowercaseShaTex"
+static const ALIGN_ASSET(2) char gMsgKanji848ACyrillicLowercaseShaTex[] = dgMsgKanji848ACyrillicLowercaseShaTex;
+
+#define dgMsgKanji848BCyrillicLowercaseShchaTex "__OTR__textures/kanji/gMsgKanji848BCyrillicLowercaseShchaTex"
+static const ALIGN_ASSET(2) char gMsgKanji848BCyrillicLowercaseShchaTex[] = dgMsgKanji848BCyrillicLowercaseShchaTex;
+
+#define dgMsgKanji848CCyrillicLowercaseHardSignTex "__OTR__textures/kanji/gMsgKanji848CCyrillicLowercaseHardSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji848CCyrillicLowercaseHardSignTex[] = dgMsgKanji848CCyrillicLowercaseHardSignTex;
+
+#define dgMsgKanji848DCyrillicLowercaseYeruTex "__OTR__textures/kanji/gMsgKanji848DCyrillicLowercaseYeruTex"
+static const ALIGN_ASSET(2) char gMsgKanji848DCyrillicLowercaseYeruTex[] = dgMsgKanji848DCyrillicLowercaseYeruTex;
+
+#define dgMsgKanji848ECyrillicLowercaseSoftSignTex "__OTR__textures/kanji/gMsgKanji848ECyrillicLowercaseSoftSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji848ECyrillicLowercaseSoftSignTex[] = dgMsgKanji848ECyrillicLowercaseSoftSignTex;
+
+#define dgMsgKanji848FCyrillicLowercaseETex "__OTR__textures/kanji/gMsgKanji848FCyrillicLowercaseETex"
+static const ALIGN_ASSET(2) char gMsgKanji848FCyrillicLowercaseETex[] = dgMsgKanji848FCyrillicLowercaseETex;
+
+#define dgMsgKanji8490CyrillicLowercaseYuTex "__OTR__textures/kanji/gMsgKanji8490CyrillicLowercaseYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji8490CyrillicLowercaseYuTex[] = dgMsgKanji8490CyrillicLowercaseYuTex;
+
+#define dgMsgKanji8491CyrillicLowercaseYaTex "__OTR__textures/kanji/gMsgKanji8491CyrillicLowercaseYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji8491CyrillicLowercaseYaTex[] = dgMsgKanji8491CyrillicLowercaseYaTex;
+
+#define dgMsgKanji849FBoxThinHorizontalTex "__OTR__textures/kanji/gMsgKanji849FBoxThinHorizontalTex"
+static const ALIGN_ASSET(2) char gMsgKanji849FBoxThinHorizontalTex[] = dgMsgKanji849FBoxThinHorizontalTex;
+
+#define dgMsgKanji84A0BoxThinVerticalTex "__OTR__textures/kanji/gMsgKanji84A0BoxThinVerticalTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A0BoxThinVerticalTex[] = dgMsgKanji84A0BoxThinVerticalTex;
+
+#define dgMsgKanji84A1BoxThinTopLeftTex "__OTR__textures/kanji/gMsgKanji84A1BoxThinTopLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A1BoxThinTopLeftTex[] = dgMsgKanji84A1BoxThinTopLeftTex;
+
+#define dgMsgKanji84A2BoxThinTopRightTex "__OTR__textures/kanji/gMsgKanji84A2BoxThinTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A2BoxThinTopRightTex[] = dgMsgKanji84A2BoxThinTopRightTex;
+
+#define dgMsgKanji84A3BoxThinBottomRightTex "__OTR__textures/kanji/gMsgKanji84A3BoxThinBottomRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A3BoxThinBottomRightTex[] = dgMsgKanji84A3BoxThinBottomRightTex;
+
+#define dgMsgKanji84A4BoxThinBottomLeftTex "__OTR__textures/kanji/gMsgKanji84A4BoxThinBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A4BoxThinBottomLeftTex[] = dgMsgKanji84A4BoxThinBottomLeftTex;
+
+#define dgMsgKanji84A5BoxThinLeftTex "__OTR__textures/kanji/gMsgKanji84A5BoxThinLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A5BoxThinLeftTex[] = dgMsgKanji84A5BoxThinLeftTex;
+
+#define dgMsgKanji84A6BoxThinTopTex "__OTR__textures/kanji/gMsgKanji84A6BoxThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A6BoxThinTopTex[] = dgMsgKanji84A6BoxThinTopTex;
+
+#define dgMsgKanji84A7BoxThinRightTex "__OTR__textures/kanji/gMsgKanji84A7BoxThinRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A7BoxThinRightTex[] = dgMsgKanji84A7BoxThinRightTex;
+
+#define dgMsgKanji84A8BoxThinBottomTex "__OTR__textures/kanji/gMsgKanji84A8BoxThinBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A8BoxThinBottomTex[] = dgMsgKanji84A8BoxThinBottomTex;
+
+#define dgMsgKanji84A9BoxThinCenterTex "__OTR__textures/kanji/gMsgKanji84A9BoxThinCenterTex"
+static const ALIGN_ASSET(2) char gMsgKanji84A9BoxThinCenterTex[] = dgMsgKanji84A9BoxThinCenterTex;
+
+#define dgMsgKanji84AABoxThickHorizontalTex "__OTR__textures/kanji/gMsgKanji84AABoxThickHorizontalTex"
+static const ALIGN_ASSET(2) char gMsgKanji84AABoxThickHorizontalTex[] = dgMsgKanji84AABoxThickHorizontalTex;
+
+#define dgMsgKanji84ABBoxThickVerticalTex "__OTR__textures/kanji/gMsgKanji84ABBoxThickVerticalTex"
+static const ALIGN_ASSET(2) char gMsgKanji84ABBoxThickVerticalTex[] = dgMsgKanji84ABBoxThickVerticalTex;
+
+#define dgMsgKanji84ACBoxThickTopLeftTex "__OTR__textures/kanji/gMsgKanji84ACBoxThickTopLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84ACBoxThickTopLeftTex[] = dgMsgKanji84ACBoxThickTopLeftTex;
+
+#define dgMsgKanji84ADBoxThickTopRightTex "__OTR__textures/kanji/gMsgKanji84ADBoxThickTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84ADBoxThickTopRightTex[] = dgMsgKanji84ADBoxThickTopRightTex;
+
+#define dgMsgKanji84AEBoxThickBottomRightTex "__OTR__textures/kanji/gMsgKanji84AEBoxThickBottomRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84AEBoxThickBottomRightTex[] = dgMsgKanji84AEBoxThickBottomRightTex;
+
+#define dgMsgKanji84AFBoxThickBottomLeftTex "__OTR__textures/kanji/gMsgKanji84AFBoxThickBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84AFBoxThickBottomLeftTex[] = dgMsgKanji84AFBoxThickBottomLeftTex;
+
+#define dgMsgKanji84B0BoxThickLeftTex "__OTR__textures/kanji/gMsgKanji84B0BoxThickLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B0BoxThickLeftTex[] = dgMsgKanji84B0BoxThickLeftTex;
+
+#define dgMsgKanji84B1BoxThickTopTex "__OTR__textures/kanji/gMsgKanji84B1BoxThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B1BoxThickTopTex[] = dgMsgKanji84B1BoxThickTopTex;
+
+#define dgMsgKanji84B2BoxThickRightTex "__OTR__textures/kanji/gMsgKanji84B2BoxThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B2BoxThickRightTex[] = dgMsgKanji84B2BoxThickRightTex;
+
+#define dgMsgKanji84B3BoxThickBottomTex "__OTR__textures/kanji/gMsgKanji84B3BoxThickBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B3BoxThickBottomTex[] = dgMsgKanji84B3BoxThickBottomTex;
+
+#define dgMsgKanji84B4BoxThickCenterTex "__OTR__textures/kanji/gMsgKanji84B4BoxThickCenterTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B4BoxThickCenterTex[] = dgMsgKanji84B4BoxThickCenterTex;
+
+#define dgMsgKanji84B5BoxVertThickHorizThinLeftTex "__OTR__textures/kanji/gMsgKanji84B5BoxVertThickHorizThinLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B5BoxVertThickHorizThinLeftTex[] = dgMsgKanji84B5BoxVertThickHorizThinLeftTex;
+
+#define dgMsgKanji84B6BoxVertThinHorizThickTopTex "__OTR__textures/kanji/gMsgKanji84B6BoxVertThinHorizThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B6BoxVertThinHorizThickTopTex[] = dgMsgKanji84B6BoxVertThinHorizThickTopTex;
+
+#define dgMsgKanji84B7BoxVertThickHorizThinRightTex "__OTR__textures/kanji/gMsgKanji84B7BoxVertThickHorizThinRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B7BoxVertThickHorizThinRightTex[] = dgMsgKanji84B7BoxVertThickHorizThinRightTex;
+
+#define dgMsgKanji84B8BoxVertThinHorizThickBottomTex "__OTR__textures/kanji/gMsgKanji84B8BoxVertThinHorizThickBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B8BoxVertThinHorizThickBottomTex[] = dgMsgKanji84B8BoxVertThinHorizThickBottomTex;
+
+#define dgMsgKanji84B9BoxVertThinHorizThickCenterTex "__OTR__textures/kanji/gMsgKanji84B9BoxVertThinHorizThickCenterTex"
+static const ALIGN_ASSET(2) char gMsgKanji84B9BoxVertThinHorizThickCenterTex[] = dgMsgKanji84B9BoxVertThinHorizThickCenterTex;
+
+#define dgMsgKanji84BABoxVertThinHorizThickLeftTex "__OTR__textures/kanji/gMsgKanji84BABoxVertThinHorizThickLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BABoxVertThinHorizThickLeftTex[] = dgMsgKanji84BABoxVertThinHorizThickLeftTex;
+
+#define dgMsgKanji84BBBoxVertThickHorizThinTopTex "__OTR__textures/kanji/gMsgKanji84BBBoxVertThickHorizThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BBBoxVertThickHorizThinTopTex[] = dgMsgKanji84BBBoxVertThickHorizThinTopTex;
+
+#define dgMsgKanji84BCBoxVertThinHorizThickRightTex "__OTR__textures/kanji/gMsgKanji84BCBoxVertThinHorizThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BCBoxVertThinHorizThickRightTex[] = dgMsgKanji84BCBoxVertThinHorizThickRightTex;
+
+#define dgMsgKanji84BDBoxVertThickHorizThinBottomTex "__OTR__textures/kanji/gMsgKanji84BDBoxVertThickHorizThinBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BDBoxVertThickHorizThinBottomTex[] = dgMsgKanji84BDBoxVertThickHorizThinBottomTex;
+
+#define dgMsgKanji84BEBoxVertThickHorizThinCenterTex "__OTR__textures/kanji/gMsgKanji84BEBoxVertThickHorizThinCenterTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BEBoxVertThickHorizThinCenterTex[] = dgMsgKanji84BEBoxVertThickHorizThinCenterTex;
+
+#define dgMsgKanji84BFEmptyTex "__OTR__textures/kanji/gMsgKanji84BFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji84BFEmptyTex[] = dgMsgKanji84BFEmptyTex;
+
+#define dgMsgKanji8540HalfwidthExclamationMarkTex "__OTR__textures/kanji/gMsgKanji8540HalfwidthExclamationMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji8540HalfwidthExclamationMarkTex[] = dgMsgKanji8540HalfwidthExclamationMarkTex;
+
+#define dgMsgKanji8541HalfwidthQuotationMarkTex "__OTR__textures/kanji/gMsgKanji8541HalfwidthQuotationMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji8541HalfwidthQuotationMarkTex[] = dgMsgKanji8541HalfwidthQuotationMarkTex;
+
+#define dgMsgKanji8542HalfwidthNumberSignTex "__OTR__textures/kanji/gMsgKanji8542HalfwidthNumberSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8542HalfwidthNumberSignTex[] = dgMsgKanji8542HalfwidthNumberSignTex;
+
+#define dgMsgKanji8543HalfwidthDollarSignTex "__OTR__textures/kanji/gMsgKanji8543HalfwidthDollarSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8543HalfwidthDollarSignTex[] = dgMsgKanji8543HalfwidthDollarSignTex;
+
+#define dgMsgKanji8544HalfwidthPercentSignTex "__OTR__textures/kanji/gMsgKanji8544HalfwidthPercentSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji8544HalfwidthPercentSignTex[] = dgMsgKanji8544HalfwidthPercentSignTex;
+
+#define dgMsgKanji8545HalfwidthAmpersandTex "__OTR__textures/kanji/gMsgKanji8545HalfwidthAmpersandTex"
+static const ALIGN_ASSET(2) char gMsgKanji8545HalfwidthAmpersandTex[] = dgMsgKanji8545HalfwidthAmpersandTex;
+
+#define dgMsgKanji8546HalfwidthApostropheTex "__OTR__textures/kanji/gMsgKanji8546HalfwidthApostropheTex"
+static const ALIGN_ASSET(2) char gMsgKanji8546HalfwidthApostropheTex[] = dgMsgKanji8546HalfwidthApostropheTex;
+
+#define dgMsgKanji8547HalfwidthParenthesesLeftTex "__OTR__textures/kanji/gMsgKanji8547HalfwidthParenthesesLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8547HalfwidthParenthesesLeftTex[] = dgMsgKanji8547HalfwidthParenthesesLeftTex;
+
+#define dgMsgKanji8548HalfwidthParenthesesRightTex "__OTR__textures/kanji/gMsgKanji8548HalfwidthParenthesesRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8548HalfwidthParenthesesRightTex[] = dgMsgKanji8548HalfwidthParenthesesRightTex;
+
+#define dgMsgKanji8549HalfwidthAsteriskTex "__OTR__textures/kanji/gMsgKanji8549HalfwidthAsteriskTex"
+static const ALIGN_ASSET(2) char gMsgKanji8549HalfwidthAsteriskTex[] = dgMsgKanji8549HalfwidthAsteriskTex;
+
+#define dgMsgKanji854AHalfwidthPlusSignTex "__OTR__textures/kanji/gMsgKanji854AHalfwidthPlusSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji854AHalfwidthPlusSignTex[] = dgMsgKanji854AHalfwidthPlusSignTex;
+
+#define dgMsgKanji854BHalfwidthCommaTex "__OTR__textures/kanji/gMsgKanji854BHalfwidthCommaTex"
+static const ALIGN_ASSET(2) char gMsgKanji854BHalfwidthCommaTex[] = dgMsgKanji854BHalfwidthCommaTex;
+
+#define dgMsgKanji854CHalfwidthHyphenMinusTex "__OTR__textures/kanji/gMsgKanji854CHalfwidthHyphenMinusTex"
+static const ALIGN_ASSET(2) char gMsgKanji854CHalfwidthHyphenMinusTex[] = dgMsgKanji854CHalfwidthHyphenMinusTex;
+
+#define dgMsgKanji854DHalfwidthPeriodTex "__OTR__textures/kanji/gMsgKanji854DHalfwidthPeriodTex"
+static const ALIGN_ASSET(2) char gMsgKanji854DHalfwidthPeriodTex[] = dgMsgKanji854DHalfwidthPeriodTex;
+
+#define dgMsgKanji854EHalfwidthSlashTex "__OTR__textures/kanji/gMsgKanji854EHalfwidthSlashTex"
+static const ALIGN_ASSET(2) char gMsgKanji854EHalfwidthSlashTex[] = dgMsgKanji854EHalfwidthSlashTex;
+
+#define dgMsgKanji854FHalfwidth0Tex "__OTR__textures/kanji/gMsgKanji854FHalfwidth0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji854FHalfwidth0Tex[] = dgMsgKanji854FHalfwidth0Tex;
+
+#define dgMsgKanji8550Halfwidth1Tex "__OTR__textures/kanji/gMsgKanji8550Halfwidth1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8550Halfwidth1Tex[] = dgMsgKanji8550Halfwidth1Tex;
+
+#define dgMsgKanji8551Halfwidth2Tex "__OTR__textures/kanji/gMsgKanji8551Halfwidth2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8551Halfwidth2Tex[] = dgMsgKanji8551Halfwidth2Tex;
+
+#define dgMsgKanji8552Halfwidth3Tex "__OTR__textures/kanji/gMsgKanji8552Halfwidth3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8552Halfwidth3Tex[] = dgMsgKanji8552Halfwidth3Tex;
+
+#define dgMsgKanji8553Halfwidth4Tex "__OTR__textures/kanji/gMsgKanji8553Halfwidth4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8553Halfwidth4Tex[] = dgMsgKanji8553Halfwidth4Tex;
+
+#define dgMsgKanji855EHalfwidthQuestionMarkTex "__OTR__textures/kanji/gMsgKanji855EHalfwidthQuestionMarkTex"
+static const ALIGN_ASSET(2) char gMsgKanji855EHalfwidthQuestionMarkTex[] = dgMsgKanji855EHalfwidthQuestionMarkTex;
+
+#define dgMsgKanji855FHalfwidthAtSignTex "__OTR__textures/kanji/gMsgKanji855FHalfwidthAtSignTex"
+static const ALIGN_ASSET(2) char gMsgKanji855FHalfwidthAtSignTex[] = dgMsgKanji855FHalfwidthAtSignTex;
+
+#define dgMsgKanji8560HalfwidthCapitalATex "__OTR__textures/kanji/gMsgKanji8560HalfwidthCapitalATex"
+static const ALIGN_ASSET(2) char gMsgKanji8560HalfwidthCapitalATex[] = dgMsgKanji8560HalfwidthCapitalATex;
+
+#define dgMsgKanji8561HalfwidthCapitalBTex "__OTR__textures/kanji/gMsgKanji8561HalfwidthCapitalBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8561HalfwidthCapitalBTex[] = dgMsgKanji8561HalfwidthCapitalBTex;
+
+#define dgMsgKanji8562HalfwidthCapitalCTex "__OTR__textures/kanji/gMsgKanji8562HalfwidthCapitalCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8562HalfwidthCapitalCTex[] = dgMsgKanji8562HalfwidthCapitalCTex;
+
+#define dgMsgKanji8563HalfwidthCapitalDTex "__OTR__textures/kanji/gMsgKanji8563HalfwidthCapitalDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8563HalfwidthCapitalDTex[] = dgMsgKanji8563HalfwidthCapitalDTex;
+
+#define dgMsgKanji8564HalfwidthCapitalETex "__OTR__textures/kanji/gMsgKanji8564HalfwidthCapitalETex"
+static const ALIGN_ASSET(2) char gMsgKanji8564HalfwidthCapitalETex[] = dgMsgKanji8564HalfwidthCapitalETex;
+
+#define dgMsgKanji8565HalfwidthCapitalFTex "__OTR__textures/kanji/gMsgKanji8565HalfwidthCapitalFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8565HalfwidthCapitalFTex[] = dgMsgKanji8565HalfwidthCapitalFTex;
+
+#define dgMsgKanji8566HalfwidthCapitalGTex "__OTR__textures/kanji/gMsgKanji8566HalfwidthCapitalGTex"
+static const ALIGN_ASSET(2) char gMsgKanji8566HalfwidthCapitalGTex[] = dgMsgKanji8566HalfwidthCapitalGTex;
+
+#define dgMsgKanji8567HalfwidthCapitalHTex "__OTR__textures/kanji/gMsgKanji8567HalfwidthCapitalHTex"
+static const ALIGN_ASSET(2) char gMsgKanji8567HalfwidthCapitalHTex[] = dgMsgKanji8567HalfwidthCapitalHTex;
+
+#define dgMsgKanji8568HalfwidthCapitalITex "__OTR__textures/kanji/gMsgKanji8568HalfwidthCapitalITex"
+static const ALIGN_ASSET(2) char gMsgKanji8568HalfwidthCapitalITex[] = dgMsgKanji8568HalfwidthCapitalITex;
+
+#define dgMsgKanji8569HalfwidthCapitalJTex "__OTR__textures/kanji/gMsgKanji8569HalfwidthCapitalJTex"
+static const ALIGN_ASSET(2) char gMsgKanji8569HalfwidthCapitalJTex[] = dgMsgKanji8569HalfwidthCapitalJTex;
+
+#define dgMsgKanji856AHalfwidthCapitalKTex "__OTR__textures/kanji/gMsgKanji856AHalfwidthCapitalKTex"
+static const ALIGN_ASSET(2) char gMsgKanji856AHalfwidthCapitalKTex[] = dgMsgKanji856AHalfwidthCapitalKTex;
+
+#define dgMsgKanji856BHalfwidthCapitalLTex "__OTR__textures/kanji/gMsgKanji856BHalfwidthCapitalLTex"
+static const ALIGN_ASSET(2) char gMsgKanji856BHalfwidthCapitalLTex[] = dgMsgKanji856BHalfwidthCapitalLTex;
+
+#define dgMsgKanji856CHalfwidthCapitalMTex "__OTR__textures/kanji/gMsgKanji856CHalfwidthCapitalMTex"
+static const ALIGN_ASSET(2) char gMsgKanji856CHalfwidthCapitalMTex[] = dgMsgKanji856CHalfwidthCapitalMTex;
+
+#define dgMsgKanji856DHalfwidthCapitalNTex "__OTR__textures/kanji/gMsgKanji856DHalfwidthCapitalNTex"
+static const ALIGN_ASSET(2) char gMsgKanji856DHalfwidthCapitalNTex[] = dgMsgKanji856DHalfwidthCapitalNTex;
+
+#define dgMsgKanji856EHalfwidthCapitalOTex "__OTR__textures/kanji/gMsgKanji856EHalfwidthCapitalOTex"
+static const ALIGN_ASSET(2) char gMsgKanji856EHalfwidthCapitalOTex[] = dgMsgKanji856EHalfwidthCapitalOTex;
+
+#define dgMsgKanji856FHalfwidthCapitalPTex "__OTR__textures/kanji/gMsgKanji856FHalfwidthCapitalPTex"
+static const ALIGN_ASSET(2) char gMsgKanji856FHalfwidthCapitalPTex[] = dgMsgKanji856FHalfwidthCapitalPTex;
+
+#define dgMsgKanji8570HalfwidthCapitalQTex "__OTR__textures/kanji/gMsgKanji8570HalfwidthCapitalQTex"
+static const ALIGN_ASSET(2) char gMsgKanji8570HalfwidthCapitalQTex[] = dgMsgKanji8570HalfwidthCapitalQTex;
+
+#define dgMsgKanji8571HalfwidthCapitalRTex "__OTR__textures/kanji/gMsgKanji8571HalfwidthCapitalRTex"
+static const ALIGN_ASSET(2) char gMsgKanji8571HalfwidthCapitalRTex[] = dgMsgKanji8571HalfwidthCapitalRTex;
+
+#define dgMsgKanji857CHalfwidthSquareBracketRightTex "__OTR__textures/kanji/gMsgKanji857CHalfwidthSquareBracketRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji857CHalfwidthSquareBracketRightTex[] = dgMsgKanji857CHalfwidthSquareBracketRightTex;
+
+#define dgMsgKanji857DHalfwidthCircumflexAccentTex "__OTR__textures/kanji/gMsgKanji857DHalfwidthCircumflexAccentTex"
+static const ALIGN_ASSET(2) char gMsgKanji857DHalfwidthCircumflexAccentTex[] = dgMsgKanji857DHalfwidthCircumflexAccentTex;
+
+#define dgMsgKanji857EEmptyTex "__OTR__textures/kanji/gMsgKanji857EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji857EEmptyTex[] = dgMsgKanji857EEmptyTex;
+
+#define dgMsgKanji8580HalfwidthGraveAccentTex "__OTR__textures/kanji/gMsgKanji8580HalfwidthGraveAccentTex"
+static const ALIGN_ASSET(2) char gMsgKanji8580HalfwidthGraveAccentTex[] = dgMsgKanji8580HalfwidthGraveAccentTex;
+
+#define dgMsgKanji8581HalfwidthLowercaseATex "__OTR__textures/kanji/gMsgKanji8581HalfwidthLowercaseATex"
+static const ALIGN_ASSET(2) char gMsgKanji8581HalfwidthLowercaseATex[] = dgMsgKanji8581HalfwidthLowercaseATex;
+
+#define dgMsgKanji8582HalfwidthLowercaseBTex "__OTR__textures/kanji/gMsgKanji8582HalfwidthLowercaseBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8582HalfwidthLowercaseBTex[] = dgMsgKanji8582HalfwidthLowercaseBTex;
+
+#define dgMsgKanji8583HalfwidthLowercaseCTex "__OTR__textures/kanji/gMsgKanji8583HalfwidthLowercaseCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8583HalfwidthLowercaseCTex[] = dgMsgKanji8583HalfwidthLowercaseCTex;
+
+#define dgMsgKanji8584HalfwidthLowercaseDTex "__OTR__textures/kanji/gMsgKanji8584HalfwidthLowercaseDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8584HalfwidthLowercaseDTex[] = dgMsgKanji8584HalfwidthLowercaseDTex;
+
+#define dgMsgKanji8585HalfwidthLowercaseETex "__OTR__textures/kanji/gMsgKanji8585HalfwidthLowercaseETex"
+static const ALIGN_ASSET(2) char gMsgKanji8585HalfwidthLowercaseETex[] = dgMsgKanji8585HalfwidthLowercaseETex;
+
+#define dgMsgKanji8591HalfwidthLowercaseQTex "__OTR__textures/kanji/gMsgKanji8591HalfwidthLowercaseQTex"
+static const ALIGN_ASSET(2) char gMsgKanji8591HalfwidthLowercaseQTex[] = dgMsgKanji8591HalfwidthLowercaseQTex;
+
+#define dgMsgKanji8592HalfwidthLowercaseRTex "__OTR__textures/kanji/gMsgKanji8592HalfwidthLowercaseRTex"
+static const ALIGN_ASSET(2) char gMsgKanji8592HalfwidthLowercaseRTex[] = dgMsgKanji8592HalfwidthLowercaseRTex;
+
+#define dgMsgKanji8593HalfwidthLowercaseSTex "__OTR__textures/kanji/gMsgKanji8593HalfwidthLowercaseSTex"
+static const ALIGN_ASSET(2) char gMsgKanji8593HalfwidthLowercaseSTex[] = dgMsgKanji8593HalfwidthLowercaseSTex;
+
+#define dgMsgKanji8594HalfwidthLowercaseTTex "__OTR__textures/kanji/gMsgKanji8594HalfwidthLowercaseTTex"
+static const ALIGN_ASSET(2) char gMsgKanji8594HalfwidthLowercaseTTex[] = dgMsgKanji8594HalfwidthLowercaseTTex;
+
+#define dgMsgKanji8595HalfwidthLowercaseUTex "__OTR__textures/kanji/gMsgKanji8595HalfwidthLowercaseUTex"
+static const ALIGN_ASSET(2) char gMsgKanji8595HalfwidthLowercaseUTex[] = dgMsgKanji8595HalfwidthLowercaseUTex;
+
+#define dgMsgKanji8596HalfwidthLowercaseVTex "__OTR__textures/kanji/gMsgKanji8596HalfwidthLowercaseVTex"
+static const ALIGN_ASSET(2) char gMsgKanji8596HalfwidthLowercaseVTex[] = dgMsgKanji8596HalfwidthLowercaseVTex;
+
+#define dgMsgKanji8597HalfwidthLowercaseWTex "__OTR__textures/kanji/gMsgKanji8597HalfwidthLowercaseWTex"
+static const ALIGN_ASSET(2) char gMsgKanji8597HalfwidthLowercaseWTex[] = dgMsgKanji8597HalfwidthLowercaseWTex;
+
+#define dgMsgKanji8598HalfwidthLowercaseXTex "__OTR__textures/kanji/gMsgKanji8598HalfwidthLowercaseXTex"
+static const ALIGN_ASSET(2) char gMsgKanji8598HalfwidthLowercaseXTex[] = dgMsgKanji8598HalfwidthLowercaseXTex;
+
+#define dgMsgKanji8599HalfwidthLowercaseYTex "__OTR__textures/kanji/gMsgKanji8599HalfwidthLowercaseYTex"
+static const ALIGN_ASSET(2) char gMsgKanji8599HalfwidthLowercaseYTex[] = dgMsgKanji8599HalfwidthLowercaseYTex;
+
+#define dgMsgKanji859AHalfwidthLowercaseZTex "__OTR__textures/kanji/gMsgKanji859AHalfwidthLowercaseZTex"
+static const ALIGN_ASSET(2) char gMsgKanji859AHalfwidthLowercaseZTex[] = dgMsgKanji859AHalfwidthLowercaseZTex;
+
+#define dgMsgKanji859FHalfwidthKutenTex "__OTR__textures/kanji/gMsgKanji859FHalfwidthKutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji859FHalfwidthKutenTex[] = dgMsgKanji859FHalfwidthKutenTex;
+
+#define dgMsgKanji85A0HalfwidthKagikakkoLeftTex "__OTR__textures/kanji/gMsgKanji85A0HalfwidthKagikakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A0HalfwidthKagikakkoLeftTex[] = dgMsgKanji85A0HalfwidthKagikakkoLeftTex;
+
+#define dgMsgKanji85A1HalfwidthKagikakkoRightTex "__OTR__textures/kanji/gMsgKanji85A1HalfwidthKagikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A1HalfwidthKagikakkoRightTex[] = dgMsgKanji85A1HalfwidthKagikakkoRightTex;
+
+#define dgMsgKanji85A2HalfwidthToutenTex "__OTR__textures/kanji/gMsgKanji85A2HalfwidthToutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A2HalfwidthToutenTex[] = dgMsgKanji85A2HalfwidthToutenTex;
+
+#define dgMsgKanji85A3HalfwidthNakatenTex "__OTR__textures/kanji/gMsgKanji85A3HalfwidthNakatenTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A3HalfwidthNakatenTex[] = dgMsgKanji85A3HalfwidthNakatenTex;
+
+#define dgMsgKanji85A4HalfwidthKatakanaWoTex "__OTR__textures/kanji/gMsgKanji85A4HalfwidthKatakanaWoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A4HalfwidthKatakanaWoTex[] = dgMsgKanji85A4HalfwidthKatakanaWoTex;
+
+#define dgMsgKanji85A5HalfwidthKatakanaSmallATex "__OTR__textures/kanji/gMsgKanji85A5HalfwidthKatakanaSmallATex"
+static const ALIGN_ASSET(2) char gMsgKanji85A5HalfwidthKatakanaSmallATex[] = dgMsgKanji85A5HalfwidthKatakanaSmallATex;
+
+#define dgMsgKanji85A6HalfwidthKatakanaSmallITex "__OTR__textures/kanji/gMsgKanji85A6HalfwidthKatakanaSmallITex"
+static const ALIGN_ASSET(2) char gMsgKanji85A6HalfwidthKatakanaSmallITex[] = dgMsgKanji85A6HalfwidthKatakanaSmallITex;
+
+#define dgMsgKanji85A7HalfwidthKatakanaSmallUTex "__OTR__textures/kanji/gMsgKanji85A7HalfwidthKatakanaSmallUTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A7HalfwidthKatakanaSmallUTex[] = dgMsgKanji85A7HalfwidthKatakanaSmallUTex;
+
+#define dgMsgKanji85A8HalfwidthKatakanaSmallETex "__OTR__textures/kanji/gMsgKanji85A8HalfwidthKatakanaSmallETex"
+static const ALIGN_ASSET(2) char gMsgKanji85A8HalfwidthKatakanaSmallETex[] = dgMsgKanji85A8HalfwidthKatakanaSmallETex;
+
+#define dgMsgKanji85A9HalfwidthKatakanaSmallOTex "__OTR__textures/kanji/gMsgKanji85A9HalfwidthKatakanaSmallOTex"
+static const ALIGN_ASSET(2) char gMsgKanji85A9HalfwidthKatakanaSmallOTex[] = dgMsgKanji85A9HalfwidthKatakanaSmallOTex;
+
+#define dgMsgKanji85AAHalfwidthKatakanaSmallYaTex "__OTR__textures/kanji/gMsgKanji85AAHalfwidthKatakanaSmallYaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85AAHalfwidthKatakanaSmallYaTex[] = dgMsgKanji85AAHalfwidthKatakanaSmallYaTex;
+
+#define dgMsgKanji85ABHalfwidthKatakanaSmallYuTex "__OTR__textures/kanji/gMsgKanji85ABHalfwidthKatakanaSmallYuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85ABHalfwidthKatakanaSmallYuTex[] = dgMsgKanji85ABHalfwidthKatakanaSmallYuTex;
+
+#define dgMsgKanji85ACHalfwidthKatakanaSmallYoTex "__OTR__textures/kanji/gMsgKanji85ACHalfwidthKatakanaSmallYoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85ACHalfwidthKatakanaSmallYoTex[] = dgMsgKanji85ACHalfwidthKatakanaSmallYoTex;
+
+#define dgMsgKanji85ADHalfwidthKatakanaSmallTsuTex "__OTR__textures/kanji/gMsgKanji85ADHalfwidthKatakanaSmallTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85ADHalfwidthKatakanaSmallTsuTex[] = dgMsgKanji85ADHalfwidthKatakanaSmallTsuTex;
+
+#define dgMsgKanji85B3HalfwidthKatakanaOTex "__OTR__textures/kanji/gMsgKanji85B3HalfwidthKatakanaOTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B3HalfwidthKatakanaOTex[] = dgMsgKanji85B3HalfwidthKatakanaOTex;
+
+#define dgMsgKanji85B4HalfwidthKatakanaKaTex "__OTR__textures/kanji/gMsgKanji85B4HalfwidthKatakanaKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B4HalfwidthKatakanaKaTex[] = dgMsgKanji85B4HalfwidthKatakanaKaTex;
+
+#define dgMsgKanji85B5HalfwidthKatakanaKiTex "__OTR__textures/kanji/gMsgKanji85B5HalfwidthKatakanaKiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B5HalfwidthKatakanaKiTex[] = dgMsgKanji85B5HalfwidthKatakanaKiTex;
+
+#define dgMsgKanji85B6HalfwidthKatakanaKuTex "__OTR__textures/kanji/gMsgKanji85B6HalfwidthKatakanaKuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B6HalfwidthKatakanaKuTex[] = dgMsgKanji85B6HalfwidthKatakanaKuTex;
+
+#define dgMsgKanji85B7HalfwidthKatakanaKeTex "__OTR__textures/kanji/gMsgKanji85B7HalfwidthKatakanaKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B7HalfwidthKatakanaKeTex[] = dgMsgKanji85B7HalfwidthKatakanaKeTex;
+
+#define dgMsgKanji85B8HalfwidthKatakanaKoTex "__OTR__textures/kanji/gMsgKanji85B8HalfwidthKatakanaKoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B8HalfwidthKatakanaKoTex[] = dgMsgKanji85B8HalfwidthKatakanaKoTex;
+
+#define dgMsgKanji85B9HalfwidthKatakanaSaTex "__OTR__textures/kanji/gMsgKanji85B9HalfwidthKatakanaSaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85B9HalfwidthKatakanaSaTex[] = dgMsgKanji85B9HalfwidthKatakanaSaTex;
+
+#define dgMsgKanji85BAHalfwidthKatakanaShiTex "__OTR__textures/kanji/gMsgKanji85BAHalfwidthKatakanaShiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BAHalfwidthKatakanaShiTex[] = dgMsgKanji85BAHalfwidthKatakanaShiTex;
+
+#define dgMsgKanji85BBHalfwidthKatakanaSuTex "__OTR__textures/kanji/gMsgKanji85BBHalfwidthKatakanaSuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BBHalfwidthKatakanaSuTex[] = dgMsgKanji85BBHalfwidthKatakanaSuTex;
+
+#define dgMsgKanji85BCHalfwidthKatakanaSeTex "__OTR__textures/kanji/gMsgKanji85BCHalfwidthKatakanaSeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BCHalfwidthKatakanaSeTex[] = dgMsgKanji85BCHalfwidthKatakanaSeTex;
+
+#define dgMsgKanji85BDHalfwidthKatakanaSoTex "__OTR__textures/kanji/gMsgKanji85BDHalfwidthKatakanaSoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BDHalfwidthKatakanaSoTex[] = dgMsgKanji85BDHalfwidthKatakanaSoTex;
+
+#define dgMsgKanji85BEHalfwidthKatakanaTaTex "__OTR__textures/kanji/gMsgKanji85BEHalfwidthKatakanaTaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BEHalfwidthKatakanaTaTex[] = dgMsgKanji85BEHalfwidthKatakanaTaTex;
+
+#define dgMsgKanji85BFHalfwidthKatakanaChiTex "__OTR__textures/kanji/gMsgKanji85BFHalfwidthKatakanaChiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85BFHalfwidthKatakanaChiTex[] = dgMsgKanji85BFHalfwidthKatakanaChiTex;
+
+#define dgMsgKanji85C0HalfwidthKatakanaTsuTex "__OTR__textures/kanji/gMsgKanji85C0HalfwidthKatakanaTsuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85C0HalfwidthKatakanaTsuTex[] = dgMsgKanji85C0HalfwidthKatakanaTsuTex;
+
+#define dgMsgKanji85C1HalfwidthKatakanaTeTex "__OTR__textures/kanji/gMsgKanji85C1HalfwidthKatakanaTeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85C1HalfwidthKatakanaTeTex[] = dgMsgKanji85C1HalfwidthKatakanaTeTex;
+
+#define dgMsgKanji85DBHalfwidthKatakanaNTex "__OTR__textures/kanji/gMsgKanji85DBHalfwidthKatakanaNTex"
+static const ALIGN_ASSET(2) char gMsgKanji85DBHalfwidthKatakanaNTex[] = dgMsgKanji85DBHalfwidthKatakanaNTex;
+
+#define dgMsgKanji85DCHalfwidthDakutenTex "__OTR__textures/kanji/gMsgKanji85DCHalfwidthDakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji85DCHalfwidthDakutenTex[] = dgMsgKanji85DCHalfwidthDakutenTex;
+
+#define dgMsgKanji85DDHalfwidthHandakutenTex "__OTR__textures/kanji/gMsgKanji85DDHalfwidthHandakutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji85DDHalfwidthHandakutenTex[] = dgMsgKanji85DDHalfwidthHandakutenTex;
+
+#define dgMsgKanji85DEHalfwidthKatakanaWiTex "__OTR__textures/kanji/gMsgKanji85DEHalfwidthKatakanaWiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85DEHalfwidthKatakanaWiTex[] = dgMsgKanji85DEHalfwidthKatakanaWiTex;
+
+#define dgMsgKanji85DFHalfwidthKatakanaWeTex "__OTR__textures/kanji/gMsgKanji85DFHalfwidthKatakanaWeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85DFHalfwidthKatakanaWeTex[] = dgMsgKanji85DFHalfwidthKatakanaWeTex;
+
+#define dgMsgKanji85E0HalfwidthKatakanaSmallWaTex "__OTR__textures/kanji/gMsgKanji85E0HalfwidthKatakanaSmallWaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E0HalfwidthKatakanaSmallWaTex[] = dgMsgKanji85E0HalfwidthKatakanaSmallWaTex;
+
+#define dgMsgKanji85E1HalfwidthKatakanaSmallKaTex "__OTR__textures/kanji/gMsgKanji85E1HalfwidthKatakanaSmallKaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E1HalfwidthKatakanaSmallKaTex[] = dgMsgKanji85E1HalfwidthKatakanaSmallKaTex;
+
+#define dgMsgKanji85E2HalfwidthKatakanaSmallKeTex "__OTR__textures/kanji/gMsgKanji85E2HalfwidthKatakanaSmallKeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E2HalfwidthKatakanaSmallKeTex[] = dgMsgKanji85E2HalfwidthKatakanaSmallKeTex;
+
+#define dgMsgKanji85E3HalfwidthKatakanaVuTex "__OTR__textures/kanji/gMsgKanji85E3HalfwidthKatakanaVuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E3HalfwidthKatakanaVuTex[] = dgMsgKanji85E3HalfwidthKatakanaVuTex;
+
+#define dgMsgKanji85E4HalfwidthKatakanaGaTex "__OTR__textures/kanji/gMsgKanji85E4HalfwidthKatakanaGaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E4HalfwidthKatakanaGaTex[] = dgMsgKanji85E4HalfwidthKatakanaGaTex;
+
+#define dgMsgKanji85E5HalfwidthKatakanaGiTex "__OTR__textures/kanji/gMsgKanji85E5HalfwidthKatakanaGiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E5HalfwidthKatakanaGiTex[] = dgMsgKanji85E5HalfwidthKatakanaGiTex;
+
+#define dgMsgKanji85E6HalfwidthKatakanaGuTex "__OTR__textures/kanji/gMsgKanji85E6HalfwidthKatakanaGuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E6HalfwidthKatakanaGuTex[] = dgMsgKanji85E6HalfwidthKatakanaGuTex;
+
+#define dgMsgKanji85E7HalfwidthKatakanaGeTex "__OTR__textures/kanji/gMsgKanji85E7HalfwidthKatakanaGeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E7HalfwidthKatakanaGeTex[] = dgMsgKanji85E7HalfwidthKatakanaGeTex;
+
+#define dgMsgKanji85E8HalfwidthKatakanaGoTex "__OTR__textures/kanji/gMsgKanji85E8HalfwidthKatakanaGoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E8HalfwidthKatakanaGoTex[] = dgMsgKanji85E8HalfwidthKatakanaGoTex;
+
+#define dgMsgKanji85E9HalfwidthKatakanaZaTex "__OTR__textures/kanji/gMsgKanji85E9HalfwidthKatakanaZaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85E9HalfwidthKatakanaZaTex[] = dgMsgKanji85E9HalfwidthKatakanaZaTex;
+
+#define dgMsgKanji85EAHalfwidthKatakanaJiTex "__OTR__textures/kanji/gMsgKanji85EAHalfwidthKatakanaJiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85EAHalfwidthKatakanaJiTex[] = dgMsgKanji85EAHalfwidthKatakanaJiTex;
+
+#define dgMsgKanji85EBHalfwidthKatakanaZuTex "__OTR__textures/kanji/gMsgKanji85EBHalfwidthKatakanaZuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85EBHalfwidthKatakanaZuTex[] = dgMsgKanji85EBHalfwidthKatakanaZuTex;
+
+#define dgMsgKanji85ECHalfwidthKatakanaZeTex "__OTR__textures/kanji/gMsgKanji85ECHalfwidthKatakanaZeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85ECHalfwidthKatakanaZeTex[] = dgMsgKanji85ECHalfwidthKatakanaZeTex;
+
+#define dgMsgKanji85EDHalfwidthKatakanaZoTex "__OTR__textures/kanji/gMsgKanji85EDHalfwidthKatakanaZoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85EDHalfwidthKatakanaZoTex[] = dgMsgKanji85EDHalfwidthKatakanaZoTex;
+
+#define dgMsgKanji85EEHalfwidthKatakanaDaTex "__OTR__textures/kanji/gMsgKanji85EEHalfwidthKatakanaDaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85EEHalfwidthKatakanaDaTex[] = dgMsgKanji85EEHalfwidthKatakanaDaTex;
+
+#define dgMsgKanji85EFHalfwidthKatakanaDiTex "__OTR__textures/kanji/gMsgKanji85EFHalfwidthKatakanaDiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85EFHalfwidthKatakanaDiTex[] = dgMsgKanji85EFHalfwidthKatakanaDiTex;
+
+#define dgMsgKanji85F0HalfwidthKatakanaDuTex "__OTR__textures/kanji/gMsgKanji85F0HalfwidthKatakanaDuTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F0HalfwidthKatakanaDuTex[] = dgMsgKanji85F0HalfwidthKatakanaDuTex;
+
+#define dgMsgKanji85F1HalfwidthKatakanaDeTex "__OTR__textures/kanji/gMsgKanji85F1HalfwidthKatakanaDeTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F1HalfwidthKatakanaDeTex[] = dgMsgKanji85F1HalfwidthKatakanaDeTex;
+
+#define dgMsgKanji85F2HalfwidthKatakanaDoTex "__OTR__textures/kanji/gMsgKanji85F2HalfwidthKatakanaDoTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F2HalfwidthKatakanaDoTex[] = dgMsgKanji85F2HalfwidthKatakanaDoTex;
+
+#define dgMsgKanji85F3HalfwidthKatakanaBaTex "__OTR__textures/kanji/gMsgKanji85F3HalfwidthKatakanaBaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F3HalfwidthKatakanaBaTex[] = dgMsgKanji85F3HalfwidthKatakanaBaTex;
+
+#define dgMsgKanji85F4HalfwidthKatakanaPaTex "__OTR__textures/kanji/gMsgKanji85F4HalfwidthKatakanaPaTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F4HalfwidthKatakanaPaTex[] = dgMsgKanji85F4HalfwidthKatakanaPaTex;
+
+#define dgMsgKanji85F5HalfwidthKatakanaBiTex "__OTR__textures/kanji/gMsgKanji85F5HalfwidthKatakanaBiTex"
+static const ALIGN_ASSET(2) char gMsgKanji85F5HalfwidthKatakanaBiTex[] = dgMsgKanji85F5HalfwidthKatakanaBiTex;
+
+#define dgMsgKanji8640EmptyTex "__OTR__textures/kanji/gMsgKanji8640EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8640EmptyTex[] = dgMsgKanji8640EmptyTex;
+
+#define dgMsgKanji8641TategakiToutenTex "__OTR__textures/kanji/gMsgKanji8641TategakiToutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8641TategakiToutenTex[] = dgMsgKanji8641TategakiToutenTex;
+
+#define dgMsgKanji8642TategakiKutenTex "__OTR__textures/kanji/gMsgKanji8642TategakiKutenTex"
+static const ALIGN_ASSET(2) char gMsgKanji8642TategakiKutenTex[] = dgMsgKanji8642TategakiKutenTex;
+
+#define dgMsgKanji8643HalfwidthHorizontalThinTex "__OTR__textures/kanji/gMsgKanji8643HalfwidthHorizontalThinTex"
+static const ALIGN_ASSET(2) char gMsgKanji8643HalfwidthHorizontalThinTex[] = dgMsgKanji8643HalfwidthHorizontalThinTex;
+
+#define dgMsgKanji8644HalfwidthHorizontalThickTex "__OTR__textures/kanji/gMsgKanji8644HalfwidthHorizontalThickTex"
+static const ALIGN_ASSET(2) char gMsgKanji8644HalfwidthHorizontalThickTex[] = dgMsgKanji8644HalfwidthHorizontalThickTex;
+
+#define dgMsgKanji8645HalfwidthVerticalThinTex "__OTR__textures/kanji/gMsgKanji8645HalfwidthVerticalThinTex"
+static const ALIGN_ASSET(2) char gMsgKanji8645HalfwidthVerticalThinTex[] = dgMsgKanji8645HalfwidthVerticalThinTex;
+
+#define dgMsgKanji8646HalfwidthVerticalThickTex "__OTR__textures/kanji/gMsgKanji8646HalfwidthVerticalThickTex"
+static const ALIGN_ASSET(2) char gMsgKanji8646HalfwidthVerticalThickTex[] = dgMsgKanji8646HalfwidthVerticalThickTex;
+
+#define dgMsgKanji8647HalfwidthHorizontalThinDottedTex "__OTR__textures/kanji/gMsgKanji8647HalfwidthHorizontalThinDottedTex"
+static const ALIGN_ASSET(2) char gMsgKanji8647HalfwidthHorizontalThinDottedTex[] = dgMsgKanji8647HalfwidthHorizontalThinDottedTex;
+
+#define dgMsgKanji8648HalfwidthHorizontalThickDottedTex "__OTR__textures/kanji/gMsgKanji8648HalfwidthHorizontalThickDottedTex"
+static const ALIGN_ASSET(2) char gMsgKanji8648HalfwidthHorizontalThickDottedTex[] = dgMsgKanji8648HalfwidthHorizontalThickDottedTex;
+
+#define dgMsgKanji8649HalfwidthVerticalThinDottedTex "__OTR__textures/kanji/gMsgKanji8649HalfwidthVerticalThinDottedTex"
+static const ALIGN_ASSET(2) char gMsgKanji8649HalfwidthVerticalThinDottedTex[] = dgMsgKanji8649HalfwidthVerticalThinDottedTex;
+
+#define dgMsgKanji864AHalfwidthVerticalThickDottedTex "__OTR__textures/kanji/gMsgKanji864AHalfwidthVerticalThickDottedTex"
+static const ALIGN_ASSET(2) char gMsgKanji864AHalfwidthVerticalThickDottedTex[] = dgMsgKanji864AHalfwidthVerticalThickDottedTex;
+
+#define dgMsgKanji864BHalfwidthHorizontalThinDotted2Tex "__OTR__textures/kanji/gMsgKanji864BHalfwidthHorizontalThinDotted2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji864BHalfwidthHorizontalThinDotted2Tex[] = dgMsgKanji864BHalfwidthHorizontalThinDotted2Tex;
+
+#define dgMsgKanji864CHalfwidthHorizontalThickDotted2Tex "__OTR__textures/kanji/gMsgKanji864CHalfwidthHorizontalThickDotted2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji864CHalfwidthHorizontalThickDotted2Tex[] = dgMsgKanji864CHalfwidthHorizontalThickDotted2Tex;
+
+#define dgMsgKanji864DHalfwidthVerticalThinDotted2Tex "__OTR__textures/kanji/gMsgKanji864DHalfwidthVerticalThinDotted2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji864DHalfwidthVerticalThinDotted2Tex[] = dgMsgKanji864DHalfwidthVerticalThinDotted2Tex;
+
+#define dgMsgKanji864EHalfwidthVerticalThickDotted2Tex "__OTR__textures/kanji/gMsgKanji864EHalfwidthVerticalThickDotted2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji864EHalfwidthVerticalThickDotted2Tex[] = dgMsgKanji864EHalfwidthVerticalThickDotted2Tex;
+
+#define dgMsgKanji864FHalfwidthBoxThinTopLeftTex "__OTR__textures/kanji/gMsgKanji864FHalfwidthBoxThinTopLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji864FHalfwidthBoxThinTopLeftTex[] = dgMsgKanji864FHalfwidthBoxThinTopLeftTex;
+
+#define dgMsgKanji8650VerticalFarRightTex "__OTR__textures/kanji/gMsgKanji8650VerticalFarRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8650VerticalFarRightTex[] = dgMsgKanji8650VerticalFarRightTex;
+
+#define dgMsgKanji8651VerticalFarLeftTex "__OTR__textures/kanji/gMsgKanji8651VerticalFarLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8651VerticalFarLeftTex[] = dgMsgKanji8651VerticalFarLeftTex;
+
+#define dgMsgKanji8652HalfwidthBoxThickTopLeftTex "__OTR__textures/kanji/gMsgKanji8652HalfwidthBoxThickTopLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8652HalfwidthBoxThickTopLeftTex[] = dgMsgKanji8652HalfwidthBoxThickTopLeftTex;
+
+#define dgMsgKanji8653HalfwidthBoxThinTopRightTex "__OTR__textures/kanji/gMsgKanji8653HalfwidthBoxThinTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8653HalfwidthBoxThinTopRightTex[] = dgMsgKanji8653HalfwidthBoxThinTopRightTex;
+
+#define dgMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex "__OTR__textures/kanji/gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex[] = dgMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex;
+
+#define dgMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex "__OTR__textures/kanji/gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex[] = dgMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex;
+
+#define dgMsgKanji8656HalfwidthBoxThickTopRightTex "__OTR__textures/kanji/gMsgKanji8656HalfwidthBoxThickTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji8656HalfwidthBoxThickTopRightTex[] = dgMsgKanji8656HalfwidthBoxThickTopRightTex;
+
+#define dgMsgKanji8657HalfwidthBoxThinBottomLeftTex "__OTR__textures/kanji/gMsgKanji8657HalfwidthBoxThinBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8657HalfwidthBoxThinBottomLeftTex[] = dgMsgKanji8657HalfwidthBoxThinBottomLeftTex;
+
+#define dgMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex "__OTR__textures/kanji/gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex[] = dgMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex;
+
+#define dgMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex "__OTR__textures/kanji/gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex[] = dgMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex;
+
+#define dgMsgKanji865AHalfwidthBoxThickBottomLeftTex "__OTR__textures/kanji/gMsgKanji865AHalfwidthBoxThickBottomLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji865AHalfwidthBoxThickBottomLeftTex[] = dgMsgKanji865AHalfwidthBoxThickBottomLeftTex;
+
+#define dgMsgKanji865BTategakiChouonpuTex "__OTR__textures/kanji/gMsgKanji865BTategakiChouonpuTex"
+static const ALIGN_ASSET(2) char gMsgKanji865BTategakiChouonpuTex[] = dgMsgKanji865BTategakiChouonpuTex;
+
+#define dgMsgKanji865CTategakiDashTex "__OTR__textures/kanji/gMsgKanji865CTategakiDashTex"
+static const ALIGN_ASSET(2) char gMsgKanji865CTategakiDashTex[] = dgMsgKanji865CTategakiDashTex;
+
+#define dgMsgKanji865DTategakiHyphenTex "__OTR__textures/kanji/gMsgKanji865DTategakiHyphenTex"
+static const ALIGN_ASSET(2) char gMsgKanji865DTategakiHyphenTex[] = dgMsgKanji865DTategakiHyphenTex;
+
+#define dgMsgKanji869BHalfwidthNijyuukagikakkoRightTex "__OTR__textures/kanji/gMsgKanji869BHalfwidthNijyuukagikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji869BHalfwidthNijyuukagikakkoRightTex[] = dgMsgKanji869BHalfwidthNijyuukagikakkoRightTex;
+
+#define dgMsgKanji869CHalfwidthSumitsukikakkoLeftTex "__OTR__textures/kanji/gMsgKanji869CHalfwidthSumitsukikakkoLeftTex"
+static const ALIGN_ASSET(2) char gMsgKanji869CHalfwidthSumitsukikakkoLeftTex[] = dgMsgKanji869CHalfwidthSumitsukikakkoLeftTex;
+
+#define dgMsgKanji869DHalfwidthSumitsukikakkoRightTex "__OTR__textures/kanji/gMsgKanji869DHalfwidthSumitsukikakkoRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji869DHalfwidthSumitsukikakkoRightTex[] = dgMsgKanji869DHalfwidthSumitsukikakkoRightTex;
+
+#define dgMsgKanji869EHalfwidthHyphenTex "__OTR__textures/kanji/gMsgKanji869EHalfwidthHyphenTex"
+static const ALIGN_ASSET(2) char gMsgKanji869EHalfwidthHyphenTex[] = dgMsgKanji869EHalfwidthHyphenTex;
+
+#define dgMsgKanji869FEmptyTex "__OTR__textures/kanji/gMsgKanji869FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji869FEmptyTex[] = dgMsgKanji869FEmptyTex;
+
+#define dgMsgKanji86A0EmptyTex "__OTR__textures/kanji/gMsgKanji86A0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A0EmptyTex[] = dgMsgKanji86A0EmptyTex;
+
+#define dgMsgKanji86A1EmptyTex "__OTR__textures/kanji/gMsgKanji86A1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A1EmptyTex[] = dgMsgKanji86A1EmptyTex;
+
+#define dgMsgKanji86A2EmptyTex "__OTR__textures/kanji/gMsgKanji86A2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A2EmptyTex[] = dgMsgKanji86A2EmptyTex;
+
+#define dgMsgKanji86A3EmptyTex "__OTR__textures/kanji/gMsgKanji86A3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A3EmptyTex[] = dgMsgKanji86A3EmptyTex;
+
+#define dgMsgKanji86A4EmptyTex "__OTR__textures/kanji/gMsgKanji86A4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A4EmptyTex[] = dgMsgKanji86A4EmptyTex;
+
+#define dgMsgKanji86A5EmptyTex "__OTR__textures/kanji/gMsgKanji86A5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A5EmptyTex[] = dgMsgKanji86A5EmptyTex;
+
+#define dgMsgKanji86A6EmptyTex "__OTR__textures/kanji/gMsgKanji86A6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji86A6EmptyTex[] = dgMsgKanji86A6EmptyTex;
+
+#define dgMsgKanji86B3BoxVertThinHorizThickTopRightTex "__OTR__textures/kanji/gMsgKanji86B3BoxVertThinHorizThickTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86B3BoxVertThinHorizThickTopRightTex[] = dgMsgKanji86B3BoxVertThinHorizThickTopRightTex;
+
+#define dgMsgKanji86B4BoxVertThickHorizThinTopRightTex "__OTR__textures/kanji/gMsgKanji86B4BoxVertThickHorizThinTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86B4BoxVertThickHorizThinTopRightTex[] = dgMsgKanji86B4BoxVertThickHorizThinTopRightTex;
+
+#define dgMsgKanji86B5BoxThickTopRightTex "__OTR__textures/kanji/gMsgKanji86B5BoxThickTopRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86B5BoxThickTopRightTex[] = dgMsgKanji86B5BoxThickTopRightTex;
+
+#define dgMsgKanji86C7BoxVertThinHorizThickRightTex "__OTR__textures/kanji/gMsgKanji86C7BoxVertThinHorizThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86C7BoxVertThinHorizThickRightTex[] = dgMsgKanji86C7BoxVertThinHorizThickRightTex;
+
+#define dgMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex "__OTR__textures/kanji/gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex[] = dgMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex;
+
+#define dgMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex "__OTR__textures/kanji/gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex[] = dgMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex;
+
+#define dgMsgKanji86CABoxVertThickHorizThinRightTex "__OTR__textures/kanji/gMsgKanji86CABoxVertThickHorizThinRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CABoxVertThickHorizThinRightTex[] = dgMsgKanji86CABoxVertThickHorizThinRightTex;
+
+#define dgMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex "__OTR__textures/kanji/gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex[] = dgMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex;
+
+#define dgMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex "__OTR__textures/kanji/gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex[] = dgMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex;
+
+#define dgMsgKanji86CDBoxThickRightTex "__OTR__textures/kanji/gMsgKanji86CDBoxThickRightTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CDBoxThickRightTex[] = dgMsgKanji86CDBoxThickRightTex;
+
+#define dgMsgKanji86CEBoxThinTopTex "__OTR__textures/kanji/gMsgKanji86CEBoxThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CEBoxThinTopTex[] = dgMsgKanji86CEBoxThinTopTex;
+
+#define dgMsgKanji86CFBoxVertThinLeftThickRightThinTopTex "__OTR__textures/kanji/gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex[] = dgMsgKanji86CFBoxVertThinLeftThickRightThinTopTex;
+
+#define dgMsgKanji86D0BoxVertThinLeftThinRightThickTopTex "__OTR__textures/kanji/gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex[] = dgMsgKanji86D0BoxVertThinLeftThinRightThickTopTex;
+
+#define dgMsgKanji86D1BoxVertThinHorizThickTopTex "__OTR__textures/kanji/gMsgKanji86D1BoxVertThinHorizThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D1BoxVertThinHorizThickTopTex[] = dgMsgKanji86D1BoxVertThinHorizThickTopTex;
+
+#define dgMsgKanji86D2BoxVertThickHorizThinTopTex "__OTR__textures/kanji/gMsgKanji86D2BoxVertThickHorizThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D2BoxVertThickHorizThinTopTex[] = dgMsgKanji86D2BoxVertThickHorizThinTopTex;
+
+#define dgMsgKanji86D3BoxVertThickLeftThickRightThinTopTex "__OTR__textures/kanji/gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex[] = dgMsgKanji86D3BoxVertThickLeftThickRightThinTopTex;
+
+#define dgMsgKanji86D4BoxVertThickLeftThinRightThickTopTex "__OTR__textures/kanji/gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex[] = dgMsgKanji86D4BoxVertThickLeftThinRightThickTopTex;
+
+#define dgMsgKanji86D5BoxThickTopTex "__OTR__textures/kanji/gMsgKanji86D5BoxThickTopTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D5BoxThickTopTex[] = dgMsgKanji86D5BoxThickTopTex;
+
+#define dgMsgKanji86D6BoxThinBottomTex "__OTR__textures/kanji/gMsgKanji86D6BoxThinBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D6BoxThinBottomTex[] = dgMsgKanji86D6BoxThinBottomTex;
+
+#define dgMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex "__OTR__textures/kanji/gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex"
+static const ALIGN_ASSET(2) char gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex[] = dgMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex;
+
+#define dgMsgKanji8740Circled1Tex "__OTR__textures/kanji/gMsgKanji8740Circled1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8740Circled1Tex[] = dgMsgKanji8740Circled1Tex;
+
+#define dgMsgKanji8741Circled2Tex "__OTR__textures/kanji/gMsgKanji8741Circled2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8741Circled2Tex[] = dgMsgKanji8741Circled2Tex;
+
+#define dgMsgKanji8742Circled3Tex "__OTR__textures/kanji/gMsgKanji8742Circled3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8742Circled3Tex[] = dgMsgKanji8742Circled3Tex;
+
+#define dgMsgKanji8743Circled4Tex "__OTR__textures/kanji/gMsgKanji8743Circled4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8743Circled4Tex[] = dgMsgKanji8743Circled4Tex;
+
+#define dgMsgKanji8744Circled5Tex "__OTR__textures/kanji/gMsgKanji8744Circled5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8744Circled5Tex[] = dgMsgKanji8744Circled5Tex;
+
+#define dgMsgKanji8745Circled6Tex "__OTR__textures/kanji/gMsgKanji8745Circled6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8745Circled6Tex[] = dgMsgKanji8745Circled6Tex;
+
+#define dgMsgKanji8746Circled7Tex "__OTR__textures/kanji/gMsgKanji8746Circled7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8746Circled7Tex[] = dgMsgKanji8746Circled7Tex;
+
+#define dgMsgKanji8747Circled8Tex "__OTR__textures/kanji/gMsgKanji8747Circled8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8747Circled8Tex[] = dgMsgKanji8747Circled8Tex;
+
+#define dgMsgKanji8748Circled9Tex "__OTR__textures/kanji/gMsgKanji8748Circled9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8748Circled9Tex[] = dgMsgKanji8748Circled9Tex;
+
+#define dgMsgKanji8749Circled10Tex "__OTR__textures/kanji/gMsgKanji8749Circled10Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8749Circled10Tex[] = dgMsgKanji8749Circled10Tex;
+
+#define dgMsgKanji874ACircled11Tex "__OTR__textures/kanji/gMsgKanji874ACircled11Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874ACircled11Tex[] = dgMsgKanji874ACircled11Tex;
+
+#define dgMsgKanji874BCircled12Tex "__OTR__textures/kanji/gMsgKanji874BCircled12Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874BCircled12Tex[] = dgMsgKanji874BCircled12Tex;
+
+#define dgMsgKanji874CCircled13Tex "__OTR__textures/kanji/gMsgKanji874CCircled13Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874CCircled13Tex[] = dgMsgKanji874CCircled13Tex;
+
+#define dgMsgKanji874DCircled14Tex "__OTR__textures/kanji/gMsgKanji874DCircled14Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874DCircled14Tex[] = dgMsgKanji874DCircled14Tex;
+
+#define dgMsgKanji874ECircled15Tex "__OTR__textures/kanji/gMsgKanji874ECircled15Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874ECircled15Tex[] = dgMsgKanji874ECircled15Tex;
+
+#define dgMsgKanji874FCircled16Tex "__OTR__textures/kanji/gMsgKanji874FCircled16Tex"
+static const ALIGN_ASSET(2) char gMsgKanji874FCircled16Tex[] = dgMsgKanji874FCircled16Tex;
+
+#define dgMsgKanji8750Circled17Tex "__OTR__textures/kanji/gMsgKanji8750Circled17Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8750Circled17Tex[] = dgMsgKanji8750Circled17Tex;
+
+#define dgMsgKanji8751Circled18Tex "__OTR__textures/kanji/gMsgKanji8751Circled18Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8751Circled18Tex[] = dgMsgKanji8751Circled18Tex;
+
+#define dgMsgKanji8752Circled19Tex "__OTR__textures/kanji/gMsgKanji8752Circled19Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8752Circled19Tex[] = dgMsgKanji8752Circled19Tex;
+
+#define dgMsgKanji8753Circled20Tex "__OTR__textures/kanji/gMsgKanji8753Circled20Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8753Circled20Tex[] = dgMsgKanji8753Circled20Tex;
+
+#define dgMsgKanji8754RomanNumeral1Tex "__OTR__textures/kanji/gMsgKanji8754RomanNumeral1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8754RomanNumeral1Tex[] = dgMsgKanji8754RomanNumeral1Tex;
+
+#define dgMsgKanji8755RomanNumeral2Tex "__OTR__textures/kanji/gMsgKanji8755RomanNumeral2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8755RomanNumeral2Tex[] = dgMsgKanji8755RomanNumeral2Tex;
+
+#define dgMsgKanji8756RomanNumeral3Tex "__OTR__textures/kanji/gMsgKanji8756RomanNumeral3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8756RomanNumeral3Tex[] = dgMsgKanji8756RomanNumeral3Tex;
+
+#define dgMsgKanji8757RomanNumeral4Tex "__OTR__textures/kanji/gMsgKanji8757RomanNumeral4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8757RomanNumeral4Tex[] = dgMsgKanji8757RomanNumeral4Tex;
+
+#define dgMsgKanji8758RomanNumeral5Tex "__OTR__textures/kanji/gMsgKanji8758RomanNumeral5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8758RomanNumeral5Tex[] = dgMsgKanji8758RomanNumeral5Tex;
+
+#define dgMsgKanji8791IdenticalToTex "__OTR__textures/kanji/gMsgKanji8791IdenticalToTex"
+static const ALIGN_ASSET(2) char gMsgKanji8791IdenticalToTex[] = dgMsgKanji8791IdenticalToTex;
+
+#define dgMsgKanji8792IntegralTex "__OTR__textures/kanji/gMsgKanji8792IntegralTex"
+static const ALIGN_ASSET(2) char gMsgKanji8792IntegralTex[] = dgMsgKanji8792IntegralTex;
+
+#define dgMsgKanji8793CountourIntegralTex "__OTR__textures/kanji/gMsgKanji8793CountourIntegralTex"
+static const ALIGN_ASSET(2) char gMsgKanji8793CountourIntegralTex[] = dgMsgKanji8793CountourIntegralTex;
+
+#define dgMsgKanji8794SummationTex "__OTR__textures/kanji/gMsgKanji8794SummationTex"
+static const ALIGN_ASSET(2) char gMsgKanji8794SummationTex[] = dgMsgKanji8794SummationTex;
+
+#define dgMsgKanji8795SquareRootTex "__OTR__textures/kanji/gMsgKanji8795SquareRootTex"
+static const ALIGN_ASSET(2) char gMsgKanji8795SquareRootTex[] = dgMsgKanji8795SquareRootTex;
+
+#define dgMsgKanji8796PerpendicularSymbolTex "__OTR__textures/kanji/gMsgKanji8796PerpendicularSymbolTex"
+static const ALIGN_ASSET(2) char gMsgKanji8796PerpendicularSymbolTex[] = dgMsgKanji8796PerpendicularSymbolTex;
+
+#define dgMsgKanji8797AngleTex "__OTR__textures/kanji/gMsgKanji8797AngleTex"
+static const ALIGN_ASSET(2) char gMsgKanji8797AngleTex[] = dgMsgKanji8797AngleTex;
+
+#define dgMsgKanji8798RightAngleTex "__OTR__textures/kanji/gMsgKanji8798RightAngleTex"
+static const ALIGN_ASSET(2) char gMsgKanji8798RightAngleTex[] = dgMsgKanji8798RightAngleTex;
+
+#define dgMsgKanji8799RightTriangleTex "__OTR__textures/kanji/gMsgKanji8799RightTriangleTex"
+static const ALIGN_ASSET(2) char gMsgKanji8799RightTriangleTex[] = dgMsgKanji8799RightTriangleTex;
+
+#define dgMsgKanji879ABecauseTex "__OTR__textures/kanji/gMsgKanji879ABecauseTex"
+static const ALIGN_ASSET(2) char gMsgKanji879ABecauseTex[] = dgMsgKanji879ABecauseTex;
+
+#define dgMsgKanji879BIntersectionTex "__OTR__textures/kanji/gMsgKanji879BIntersectionTex"
+static const ALIGN_ASSET(2) char gMsgKanji879BIntersectionTex[] = dgMsgKanji879BIntersectionTex;
+
+#define dgMsgKanji879CUnionTex "__OTR__textures/kanji/gMsgKanji879CUnionTex"
+static const ALIGN_ASSET(2) char gMsgKanji879CUnionTex[] = dgMsgKanji879CUnionTex;
+
+#define dgMsgKanji879DEmptyTex "__OTR__textures/kanji/gMsgKanji879DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji879DEmptyTex[] = dgMsgKanji879DEmptyTex;
+
+#define dgMsgKanji879EEmptyTex "__OTR__textures/kanji/gMsgKanji879EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji879EEmptyTex[] = dgMsgKanji879EEmptyTex;
+
+#define dgMsgKanji879FHiraganaSmallATex "__OTR__textures/kanji/gMsgKanji879FHiraganaSmallATex"
+static const ALIGN_ASSET(2) char gMsgKanji879FHiraganaSmallATex[] = dgMsgKanji879FHiraganaSmallATex;
+
+#define dgMsgKanji87A0EmptyTex "__OTR__textures/kanji/gMsgKanji87A0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A0EmptyTex[] = dgMsgKanji87A0EmptyTex;
+
+#define dgMsgKanji87A1EmptyTex "__OTR__textures/kanji/gMsgKanji87A1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A1EmptyTex[] = dgMsgKanji87A1EmptyTex;
+
+#define dgMsgKanji87A2EmptyTex "__OTR__textures/kanji/gMsgKanji87A2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A2EmptyTex[] = dgMsgKanji87A2EmptyTex;
+
+#define dgMsgKanji87A3EmptyTex "__OTR__textures/kanji/gMsgKanji87A3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A3EmptyTex[] = dgMsgKanji87A3EmptyTex;
+
+#define dgMsgKanji87A4EmptyTex "__OTR__textures/kanji/gMsgKanji87A4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A4EmptyTex[] = dgMsgKanji87A4EmptyTex;
+
+#define dgMsgKanji87A5EmptyTex "__OTR__textures/kanji/gMsgKanji87A5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A5EmptyTex[] = dgMsgKanji87A5EmptyTex;
+
+#define dgMsgKanji87A6EmptyTex "__OTR__textures/kanji/gMsgKanji87A6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A6EmptyTex[] = dgMsgKanji87A6EmptyTex;
+
+#define dgMsgKanji87A7EmptyTex "__OTR__textures/kanji/gMsgKanji87A7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A7EmptyTex[] = dgMsgKanji87A7EmptyTex;
+
+#define dgMsgKanji87A8EmptyTex "__OTR__textures/kanji/gMsgKanji87A8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A8EmptyTex[] = dgMsgKanji87A8EmptyTex;
+
+#define dgMsgKanji87A9EmptyTex "__OTR__textures/kanji/gMsgKanji87A9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87A9EmptyTex[] = dgMsgKanji87A9EmptyTex;
+
+#define dgMsgKanji87AAEmptyTex "__OTR__textures/kanji/gMsgKanji87AAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87AAEmptyTex[] = dgMsgKanji87AAEmptyTex;
+
+#define dgMsgKanji87ABEmptyTex "__OTR__textures/kanji/gMsgKanji87ABEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87ABEmptyTex[] = dgMsgKanji87ABEmptyTex;
+
+#define dgMsgKanji87ACEmptyTex "__OTR__textures/kanji/gMsgKanji87ACEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87ACEmptyTex[] = dgMsgKanji87ACEmptyTex;
+
+#define dgMsgKanji87ADEmptyTex "__OTR__textures/kanji/gMsgKanji87ADEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87ADEmptyTex[] = dgMsgKanji87ADEmptyTex;
+
+#define dgMsgKanji87AEEmptyTex "__OTR__textures/kanji/gMsgKanji87AEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87AEEmptyTex[] = dgMsgKanji87AEEmptyTex;
+
+#define dgMsgKanji87AFEmptyTex "__OTR__textures/kanji/gMsgKanji87AFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87AFEmptyTex[] = dgMsgKanji87AFEmptyTex;
+
+#define dgMsgKanji87B0EmptyTex "__OTR__textures/kanji/gMsgKanji87B0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B0EmptyTex[] = dgMsgKanji87B0EmptyTex;
+
+#define dgMsgKanji87B1EmptyTex "__OTR__textures/kanji/gMsgKanji87B1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B1EmptyTex[] = dgMsgKanji87B1EmptyTex;
+
+#define dgMsgKanji87B2EmptyTex "__OTR__textures/kanji/gMsgKanji87B2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B2EmptyTex[] = dgMsgKanji87B2EmptyTex;
+
+#define dgMsgKanji87B3EmptyTex "__OTR__textures/kanji/gMsgKanji87B3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B3EmptyTex[] = dgMsgKanji87B3EmptyTex;
+
+#define dgMsgKanji87B4EmptyTex "__OTR__textures/kanji/gMsgKanji87B4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B4EmptyTex[] = dgMsgKanji87B4EmptyTex;
+
+#define dgMsgKanji87B5EmptyTex "__OTR__textures/kanji/gMsgKanji87B5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87B5EmptyTex[] = dgMsgKanji87B5EmptyTex;
+
+#define dgMsgKanji87BDEmptyTex "__OTR__textures/kanji/gMsgKanji87BDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87BDEmptyTex[] = dgMsgKanji87BDEmptyTex;
+
+#define dgMsgKanji87BEEmptyTex "__OTR__textures/kanji/gMsgKanji87BEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87BEEmptyTex[] = dgMsgKanji87BEEmptyTex;
+
+#define dgMsgKanji87BFEmptyTex "__OTR__textures/kanji/gMsgKanji87BFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87BFEmptyTex[] = dgMsgKanji87BFEmptyTex;
+
+#define dgMsgKanji87C0EmptyTex "__OTR__textures/kanji/gMsgKanji87C0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87C0EmptyTex[] = dgMsgKanji87C0EmptyTex;
+
+#define dgMsgKanji87C1EmptyTex "__OTR__textures/kanji/gMsgKanji87C1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87C1EmptyTex[] = dgMsgKanji87C1EmptyTex;
+
+#define dgMsgKanji87E5EmptyTex "__OTR__textures/kanji/gMsgKanji87E5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87E5EmptyTex[] = dgMsgKanji87E5EmptyTex;
+
+#define dgMsgKanji87E6EmptyTex "__OTR__textures/kanji/gMsgKanji87E6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87E6EmptyTex[] = dgMsgKanji87E6EmptyTex;
+
+#define dgMsgKanji87E7EmptyTex "__OTR__textures/kanji/gMsgKanji87E7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87E7EmptyTex[] = dgMsgKanji87E7EmptyTex;
+
+#define dgMsgKanji87E8EmptyTex "__OTR__textures/kanji/gMsgKanji87E8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87E8EmptyTex[] = dgMsgKanji87E8EmptyTex;
+
+#define dgMsgKanji87FAEmptyTex "__OTR__textures/kanji/gMsgKanji87FAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87FAEmptyTex[] = dgMsgKanji87FAEmptyTex;
+
+#define dgMsgKanji87FBEmptyTex "__OTR__textures/kanji/gMsgKanji87FBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87FBEmptyTex[] = dgMsgKanji87FBEmptyTex;
+
+#define dgMsgKanji87FCEmptyTex "__OTR__textures/kanji/gMsgKanji87FCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji87FCEmptyTex[] = dgMsgKanji87FCEmptyTex;
+
+#define dgMsgKanji8840KatakanaSmallATex "__OTR__textures/kanji/gMsgKanji8840KatakanaSmallATex"
+static const ALIGN_ASSET(2) char gMsgKanji8840KatakanaSmallATex[] = dgMsgKanji8840KatakanaSmallATex;
+
+#define dgMsgKanji8841EmptyTex "__OTR__textures/kanji/gMsgKanji8841EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8841EmptyTex[] = dgMsgKanji8841EmptyTex;
+
+#define dgMsgKanji8842EmptyTex "__OTR__textures/kanji/gMsgKanji8842EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8842EmptyTex[] = dgMsgKanji8842EmptyTex;
+
+#define dgMsgKanji8843EmptyTex "__OTR__textures/kanji/gMsgKanji8843EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8843EmptyTex[] = dgMsgKanji8843EmptyTex;
+
+#define dgMsgKanji8844EmptyTex "__OTR__textures/kanji/gMsgKanji8844EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8844EmptyTex[] = dgMsgKanji8844EmptyTex;
+
+#define dgMsgKanji8845EmptyTex "__OTR__textures/kanji/gMsgKanji8845EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8845EmptyTex[] = dgMsgKanji8845EmptyTex;
+
+#define dgMsgKanji8846EmptyTex "__OTR__textures/kanji/gMsgKanji8846EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8846EmptyTex[] = dgMsgKanji8846EmptyTex;
+
+#define dgMsgKanji8847EmptyTex "__OTR__textures/kanji/gMsgKanji8847EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8847EmptyTex[] = dgMsgKanji8847EmptyTex;
+
+#define dgMsgKanji8848EmptyTex "__OTR__textures/kanji/gMsgKanji8848EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8848EmptyTex[] = dgMsgKanji8848EmptyTex;
+
+#define dgMsgKanji8849EmptyTex "__OTR__textures/kanji/gMsgKanji8849EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8849EmptyTex[] = dgMsgKanji8849EmptyTex;
+
+#define dgMsgKanji884AEmptyTex "__OTR__textures/kanji/gMsgKanji884AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884AEmptyTex[] = dgMsgKanji884AEmptyTex;
+
+#define dgMsgKanji884BEmptyTex "__OTR__textures/kanji/gMsgKanji884BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884BEmptyTex[] = dgMsgKanji884BEmptyTex;
+
+#define dgMsgKanji884CEmptyTex "__OTR__textures/kanji/gMsgKanji884CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884CEmptyTex[] = dgMsgKanji884CEmptyTex;
+
+#define dgMsgKanji884DEmptyTex "__OTR__textures/kanji/gMsgKanji884DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884DEmptyTex[] = dgMsgKanji884DEmptyTex;
+
+#define dgMsgKanji884EEmptyTex "__OTR__textures/kanji/gMsgKanji884EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884EEmptyTex[] = dgMsgKanji884EEmptyTex;
+
+#define dgMsgKanji884FEmptyTex "__OTR__textures/kanji/gMsgKanji884FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji884FEmptyTex[] = dgMsgKanji884FEmptyTex;
+
+#define dgMsgKanji8850EmptyTex "__OTR__textures/kanji/gMsgKanji8850EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8850EmptyTex[] = dgMsgKanji8850EmptyTex;
+
+#define dgMsgKanji8851EmptyTex "__OTR__textures/kanji/gMsgKanji8851EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8851EmptyTex[] = dgMsgKanji8851EmptyTex;
+
+#define dgMsgKanji8852EmptyTex "__OTR__textures/kanji/gMsgKanji8852EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8852EmptyTex[] = dgMsgKanji8852EmptyTex;
+
+#define dgMsgKanji8853EmptyTex "__OTR__textures/kanji/gMsgKanji8853EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8853EmptyTex[] = dgMsgKanji8853EmptyTex;
+
+#define dgMsgKanji8854EmptyTex "__OTR__textures/kanji/gMsgKanji8854EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8854EmptyTex[] = dgMsgKanji8854EmptyTex;
+
+#define dgMsgKanji8855EmptyTex "__OTR__textures/kanji/gMsgKanji8855EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8855EmptyTex[] = dgMsgKanji8855EmptyTex;
+
+#define dgMsgKanji8856EmptyTex "__OTR__textures/kanji/gMsgKanji8856EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8856EmptyTex[] = dgMsgKanji8856EmptyTex;
+
+#define dgMsgKanji8857EmptyTex "__OTR__textures/kanji/gMsgKanji8857EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8857EmptyTex[] = dgMsgKanji8857EmptyTex;
+
+#define dgMsgKanji8858EmptyTex "__OTR__textures/kanji/gMsgKanji8858EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8858EmptyTex[] = dgMsgKanji8858EmptyTex;
+
+#define dgMsgKanji8859EmptyTex "__OTR__textures/kanji/gMsgKanji8859EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8859EmptyTex[] = dgMsgKanji8859EmptyTex;
+
+#define dgMsgKanji885AEmptyTex "__OTR__textures/kanji/gMsgKanji885AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885AEmptyTex[] = dgMsgKanji885AEmptyTex;
+
+#define dgMsgKanji885BEmptyTex "__OTR__textures/kanji/gMsgKanji885BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885BEmptyTex[] = dgMsgKanji885BEmptyTex;
+
+#define dgMsgKanji885CEmptyTex "__OTR__textures/kanji/gMsgKanji885CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885CEmptyTex[] = dgMsgKanji885CEmptyTex;
+
+#define dgMsgKanji885DEmptyTex "__OTR__textures/kanji/gMsgKanji885DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885DEmptyTex[] = dgMsgKanji885DEmptyTex;
+
+#define dgMsgKanji885EEmptyTex "__OTR__textures/kanji/gMsgKanji885EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885EEmptyTex[] = dgMsgKanji885EEmptyTex;
+
+#define dgMsgKanji885FEmptyTex "__OTR__textures/kanji/gMsgKanji885FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji885FEmptyTex[] = dgMsgKanji885FEmptyTex;
+
+#define dgMsgKanji8860EmptyTex "__OTR__textures/kanji/gMsgKanji8860EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8860EmptyTex[] = dgMsgKanji8860EmptyTex;
+
+#define dgMsgKanji8861EmptyTex "__OTR__textures/kanji/gMsgKanji8861EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8861EmptyTex[] = dgMsgKanji8861EmptyTex;
+
+#define dgMsgKanji8862EmptyTex "__OTR__textures/kanji/gMsgKanji8862EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8862EmptyTex[] = dgMsgKanji8862EmptyTex;
+
+#define dgMsgKanji8863EmptyTex "__OTR__textures/kanji/gMsgKanji8863EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8863EmptyTex[] = dgMsgKanji8863EmptyTex;
+
+#define dgMsgKanji8864EmptyTex "__OTR__textures/kanji/gMsgKanji8864EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8864EmptyTex[] = dgMsgKanji8864EmptyTex;
+
+#define dgMsgKanji8865EmptyTex "__OTR__textures/kanji/gMsgKanji8865EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8865EmptyTex[] = dgMsgKanji8865EmptyTex;
+
+#define dgMsgKanji8866EmptyTex "__OTR__textures/kanji/gMsgKanji8866EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8866EmptyTex[] = dgMsgKanji8866EmptyTex;
+
+#define dgMsgKanji8867EmptyTex "__OTR__textures/kanji/gMsgKanji8867EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8867EmptyTex[] = dgMsgKanji8867EmptyTex;
+
+#define dgMsgKanji8868EmptyTex "__OTR__textures/kanji/gMsgKanji8868EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8868EmptyTex[] = dgMsgKanji8868EmptyTex;
+
+#define dgMsgKanji8869EmptyTex "__OTR__textures/kanji/gMsgKanji8869EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8869EmptyTex[] = dgMsgKanji8869EmptyTex;
+
+#define dgMsgKanji886AEmptyTex "__OTR__textures/kanji/gMsgKanji886AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886AEmptyTex[] = dgMsgKanji886AEmptyTex;
+
+#define dgMsgKanji886BEmptyTex "__OTR__textures/kanji/gMsgKanji886BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886BEmptyTex[] = dgMsgKanji886BEmptyTex;
+
+#define dgMsgKanji886CEmptyTex "__OTR__textures/kanji/gMsgKanji886CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886CEmptyTex[] = dgMsgKanji886CEmptyTex;
+
+#define dgMsgKanji886DEmptyTex "__OTR__textures/kanji/gMsgKanji886DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886DEmptyTex[] = dgMsgKanji886DEmptyTex;
+
+#define dgMsgKanji886EEmptyTex "__OTR__textures/kanji/gMsgKanji886EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886EEmptyTex[] = dgMsgKanji886EEmptyTex;
+
+#define dgMsgKanji886FEmptyTex "__OTR__textures/kanji/gMsgKanji886FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji886FEmptyTex[] = dgMsgKanji886FEmptyTex;
+
+#define dgMsgKanji8870EmptyTex "__OTR__textures/kanji/gMsgKanji8870EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8870EmptyTex[] = dgMsgKanji8870EmptyTex;
+
+#define dgMsgKanji8871EmptyTex "__OTR__textures/kanji/gMsgKanji8871EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8871EmptyTex[] = dgMsgKanji8871EmptyTex;
+
+#define dgMsgKanji8872EmptyTex "__OTR__textures/kanji/gMsgKanji8872EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8872EmptyTex[] = dgMsgKanji8872EmptyTex;
+
+#define dgMsgKanji8873EmptyTex "__OTR__textures/kanji/gMsgKanji8873EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8873EmptyTex[] = dgMsgKanji8873EmptyTex;
+
+#define dgMsgKanji8874EmptyTex "__OTR__textures/kanji/gMsgKanji8874EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8874EmptyTex[] = dgMsgKanji8874EmptyTex;
+
+#define dgMsgKanji8875EmptyTex "__OTR__textures/kanji/gMsgKanji8875EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8875EmptyTex[] = dgMsgKanji8875EmptyTex;
+
+#define dgMsgKanji8876EmptyTex "__OTR__textures/kanji/gMsgKanji8876EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8876EmptyTex[] = dgMsgKanji8876EmptyTex;
+
+#define dgMsgKanji8877EmptyTex "__OTR__textures/kanji/gMsgKanji8877EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8877EmptyTex[] = dgMsgKanji8877EmptyTex;
+
+#define dgMsgKanji8878EmptyTex "__OTR__textures/kanji/gMsgKanji8878EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8878EmptyTex[] = dgMsgKanji8878EmptyTex;
+
+#define dgMsgKanji8879EmptyTex "__OTR__textures/kanji/gMsgKanji8879EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8879EmptyTex[] = dgMsgKanji8879EmptyTex;
+
+#define dgMsgKanji887AEmptyTex "__OTR__textures/kanji/gMsgKanji887AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji887AEmptyTex[] = dgMsgKanji887AEmptyTex;
+
+#define dgMsgKanji887BEmptyTex "__OTR__textures/kanji/gMsgKanji887BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji887BEmptyTex[] = dgMsgKanji887BEmptyTex;
+
+#define dgMsgKanji887CEmptyTex "__OTR__textures/kanji/gMsgKanji887CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji887CEmptyTex[] = dgMsgKanji887CEmptyTex;
+
+#define dgMsgKanji887DEmptyTex "__OTR__textures/kanji/gMsgKanji887DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji887DEmptyTex[] = dgMsgKanji887DEmptyTex;
+
+#define dgMsgKanji887EEmptyTex "__OTR__textures/kanji/gMsgKanji887EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji887EEmptyTex[] = dgMsgKanji887EEmptyTex;
+
+#define dgMsgKanji8880EmptyTex "__OTR__textures/kanji/gMsgKanji8880EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8880EmptyTex[] = dgMsgKanji8880EmptyTex;
+
+#define dgMsgKanji8881EmptyTex "__OTR__textures/kanji/gMsgKanji8881EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8881EmptyTex[] = dgMsgKanji8881EmptyTex;
+
+#define dgMsgKanji8882EmptyTex "__OTR__textures/kanji/gMsgKanji8882EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8882EmptyTex[] = dgMsgKanji8882EmptyTex;
+
+#define dgMsgKanji8883EmptyTex "__OTR__textures/kanji/gMsgKanji8883EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8883EmptyTex[] = dgMsgKanji8883EmptyTex;
+
+#define dgMsgKanji8884EmptyTex "__OTR__textures/kanji/gMsgKanji8884EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8884EmptyTex[] = dgMsgKanji8884EmptyTex;
+
+#define dgMsgKanji8885EmptyTex "__OTR__textures/kanji/gMsgKanji8885EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8885EmptyTex[] = dgMsgKanji8885EmptyTex;
+
+#define dgMsgKanji8886EmptyTex "__OTR__textures/kanji/gMsgKanji8886EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8886EmptyTex[] = dgMsgKanji8886EmptyTex;
+
+#define dgMsgKanji8887EmptyTex "__OTR__textures/kanji/gMsgKanji8887EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8887EmptyTex[] = dgMsgKanji8887EmptyTex;
+
+#define dgMsgKanji8888EmptyTex "__OTR__textures/kanji/gMsgKanji8888EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8888EmptyTex[] = dgMsgKanji8888EmptyTex;
+
+#define dgMsgKanji8889EmptyTex "__OTR__textures/kanji/gMsgKanji8889EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8889EmptyTex[] = dgMsgKanji8889EmptyTex;
+
+#define dgMsgKanji888AEmptyTex "__OTR__textures/kanji/gMsgKanji888AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888AEmptyTex[] = dgMsgKanji888AEmptyTex;
+
+#define dgMsgKanji888BEmptyTex "__OTR__textures/kanji/gMsgKanji888BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888BEmptyTex[] = dgMsgKanji888BEmptyTex;
+
+#define dgMsgKanji888CEmptyTex "__OTR__textures/kanji/gMsgKanji888CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888CEmptyTex[] = dgMsgKanji888CEmptyTex;
+
+#define dgMsgKanji888DEmptyTex "__OTR__textures/kanji/gMsgKanji888DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888DEmptyTex[] = dgMsgKanji888DEmptyTex;
+
+#define dgMsgKanji888EEmptyTex "__OTR__textures/kanji/gMsgKanji888EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888EEmptyTex[] = dgMsgKanji888EEmptyTex;
+
+#define dgMsgKanji888FEmptyTex "__OTR__textures/kanji/gMsgKanji888FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji888FEmptyTex[] = dgMsgKanji888FEmptyTex;
+
+#define dgMsgKanji8890EmptyTex "__OTR__textures/kanji/gMsgKanji8890EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8890EmptyTex[] = dgMsgKanji8890EmptyTex;
+
+#define dgMsgKanji8891EmptyTex "__OTR__textures/kanji/gMsgKanji8891EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8891EmptyTex[] = dgMsgKanji8891EmptyTex;
+
+#define dgMsgKanji8892EmptyTex "__OTR__textures/kanji/gMsgKanji8892EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8892EmptyTex[] = dgMsgKanji8892EmptyTex;
+
+#define dgMsgKanji8893EmptyTex "__OTR__textures/kanji/gMsgKanji8893EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8893EmptyTex[] = dgMsgKanji8893EmptyTex;
+
+#define dgMsgKanji8894EmptyTex "__OTR__textures/kanji/gMsgKanji8894EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8894EmptyTex[] = dgMsgKanji8894EmptyTex;
+
+#define dgMsgKanji8895EmptyTex "__OTR__textures/kanji/gMsgKanji8895EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8895EmptyTex[] = dgMsgKanji8895EmptyTex;
+
+#define dgMsgKanji8896EmptyTex "__OTR__textures/kanji/gMsgKanji8896EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8896EmptyTex[] = dgMsgKanji8896EmptyTex;
+
+#define dgMsgKanji8897EmptyTex "__OTR__textures/kanji/gMsgKanji8897EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8897EmptyTex[] = dgMsgKanji8897EmptyTex;
+
+#define dgMsgKanji8898EmptyTex "__OTR__textures/kanji/gMsgKanji8898EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8898EmptyTex[] = dgMsgKanji8898EmptyTex;
+
+#define dgMsgKanji8899EmptyTex "__OTR__textures/kanji/gMsgKanji8899EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji8899EmptyTex[] = dgMsgKanji8899EmptyTex;
+
+#define dgMsgKanji889AEmptyTex "__OTR__textures/kanji/gMsgKanji889AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji889AEmptyTex[] = dgMsgKanji889AEmptyTex;
+
+#define dgMsgKanji889BEmptyTex "__OTR__textures/kanji/gMsgKanji889BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji889BEmptyTex[] = dgMsgKanji889BEmptyTex;
+
+#define dgMsgKanji889CEmptyTex "__OTR__textures/kanji/gMsgKanji889CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji889CEmptyTex[] = dgMsgKanji889CEmptyTex;
+
+#define dgMsgKanji889DEmptyTex "__OTR__textures/kanji/gMsgKanji889DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji889DEmptyTex[] = dgMsgKanji889DEmptyTex;
+
+#define dgMsgKanji889EEmptyTex "__OTR__textures/kanji/gMsgKanji889EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji889EEmptyTex[] = dgMsgKanji889EEmptyTex;
+
+#define dgMsgKanji889FTex "__OTR__textures/kanji/gMsgKanji889FTex"
+static const ALIGN_ASSET(2) char gMsgKanji889FTex[] = dgMsgKanji889FTex;
+
+#define dgMsgKanji88A0Tex "__OTR__textures/kanji/gMsgKanji88A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A0Tex[] = dgMsgKanji88A0Tex;
+
+#define dgMsgKanji88A1Tex "__OTR__textures/kanji/gMsgKanji88A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A1Tex[] = dgMsgKanji88A1Tex;
+
+#define dgMsgKanji88A2Tex "__OTR__textures/kanji/gMsgKanji88A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A2Tex[] = dgMsgKanji88A2Tex;
+
+#define dgMsgKanji88A3Tex "__OTR__textures/kanji/gMsgKanji88A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A3Tex[] = dgMsgKanji88A3Tex;
+
+#define dgMsgKanji88A4Tex "__OTR__textures/kanji/gMsgKanji88A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A4Tex[] = dgMsgKanji88A4Tex;
+
+#define dgMsgKanji88A5Tex "__OTR__textures/kanji/gMsgKanji88A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A5Tex[] = dgMsgKanji88A5Tex;
+
+#define dgMsgKanji88A6Tex "__OTR__textures/kanji/gMsgKanji88A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A6Tex[] = dgMsgKanji88A6Tex;
+
+#define dgMsgKanji88A7Tex "__OTR__textures/kanji/gMsgKanji88A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A7Tex[] = dgMsgKanji88A7Tex;
+
+#define dgMsgKanji88A8Tex "__OTR__textures/kanji/gMsgKanji88A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A8Tex[] = dgMsgKanji88A8Tex;
+
+#define dgMsgKanji88A9Tex "__OTR__textures/kanji/gMsgKanji88A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88A9Tex[] = dgMsgKanji88A9Tex;
+
+#define dgMsgKanji88AATex "__OTR__textures/kanji/gMsgKanji88AATex"
+static const ALIGN_ASSET(2) char gMsgKanji88AATex[] = dgMsgKanji88AATex;
+
+#define dgMsgKanji88ABTex "__OTR__textures/kanji/gMsgKanji88ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji88ABTex[] = dgMsgKanji88ABTex;
+
+#define dgMsgKanji88ACTex "__OTR__textures/kanji/gMsgKanji88ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji88ACTex[] = dgMsgKanji88ACTex;
+
+#define dgMsgKanji88ADTex "__OTR__textures/kanji/gMsgKanji88ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji88ADTex[] = dgMsgKanji88ADTex;
+
+#define dgMsgKanji88AETex "__OTR__textures/kanji/gMsgKanji88AETex"
+static const ALIGN_ASSET(2) char gMsgKanji88AETex[] = dgMsgKanji88AETex;
+
+#define dgMsgKanji88AFTex "__OTR__textures/kanji/gMsgKanji88AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji88AFTex[] = dgMsgKanji88AFTex;
+
+#define dgMsgKanji88B0Tex "__OTR__textures/kanji/gMsgKanji88B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B0Tex[] = dgMsgKanji88B0Tex;
+
+#define dgMsgKanji88B1Tex "__OTR__textures/kanji/gMsgKanji88B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B1Tex[] = dgMsgKanji88B1Tex;
+
+#define dgMsgKanji88B2Tex "__OTR__textures/kanji/gMsgKanji88B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B2Tex[] = dgMsgKanji88B2Tex;
+
+#define dgMsgKanji88B3Tex "__OTR__textures/kanji/gMsgKanji88B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B3Tex[] = dgMsgKanji88B3Tex;
+
+#define dgMsgKanji88B4Tex "__OTR__textures/kanji/gMsgKanji88B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B4Tex[] = dgMsgKanji88B4Tex;
+
+#define dgMsgKanji88B5Tex "__OTR__textures/kanji/gMsgKanji88B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B5Tex[] = dgMsgKanji88B5Tex;
+
+#define dgMsgKanji88B6Tex "__OTR__textures/kanji/gMsgKanji88B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B6Tex[] = dgMsgKanji88B6Tex;
+
+#define dgMsgKanji88B7Tex "__OTR__textures/kanji/gMsgKanji88B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B7Tex[] = dgMsgKanji88B7Tex;
+
+#define dgMsgKanji88B8Tex "__OTR__textures/kanji/gMsgKanji88B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B8Tex[] = dgMsgKanji88B8Tex;
+
+#define dgMsgKanji88B9Tex "__OTR__textures/kanji/gMsgKanji88B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88B9Tex[] = dgMsgKanji88B9Tex;
+
+#define dgMsgKanji88BATex "__OTR__textures/kanji/gMsgKanji88BATex"
+static const ALIGN_ASSET(2) char gMsgKanji88BATex[] = dgMsgKanji88BATex;
+
+#define dgMsgKanji88BBTex "__OTR__textures/kanji/gMsgKanji88BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji88BBTex[] = dgMsgKanji88BBTex;
+
+#define dgMsgKanji88BCTex "__OTR__textures/kanji/gMsgKanji88BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji88BCTex[] = dgMsgKanji88BCTex;
+
+#define dgMsgKanji88BDTex "__OTR__textures/kanji/gMsgKanji88BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji88BDTex[] = dgMsgKanji88BDTex;
+
+#define dgMsgKanji88BETex "__OTR__textures/kanji/gMsgKanji88BETex"
+static const ALIGN_ASSET(2) char gMsgKanji88BETex[] = dgMsgKanji88BETex;
+
+#define dgMsgKanji88BFTex "__OTR__textures/kanji/gMsgKanji88BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji88BFTex[] = dgMsgKanji88BFTex;
+
+#define dgMsgKanji88C0Tex "__OTR__textures/kanji/gMsgKanji88C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C0Tex[] = dgMsgKanji88C0Tex;
+
+#define dgMsgKanji88C1Tex "__OTR__textures/kanji/gMsgKanji88C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C1Tex[] = dgMsgKanji88C1Tex;
+
+#define dgMsgKanji88C2Tex "__OTR__textures/kanji/gMsgKanji88C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C2Tex[] = dgMsgKanji88C2Tex;
+
+#define dgMsgKanji88C3Tex "__OTR__textures/kanji/gMsgKanji88C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C3Tex[] = dgMsgKanji88C3Tex;
+
+#define dgMsgKanji88C4Tex "__OTR__textures/kanji/gMsgKanji88C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C4Tex[] = dgMsgKanji88C4Tex;
+
+#define dgMsgKanji88C5Tex "__OTR__textures/kanji/gMsgKanji88C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C5Tex[] = dgMsgKanji88C5Tex;
+
+#define dgMsgKanji88C6Tex "__OTR__textures/kanji/gMsgKanji88C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C6Tex[] = dgMsgKanji88C6Tex;
+
+#define dgMsgKanji88C7Tex "__OTR__textures/kanji/gMsgKanji88C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C7Tex[] = dgMsgKanji88C7Tex;
+
+#define dgMsgKanji88C8Tex "__OTR__textures/kanji/gMsgKanji88C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C8Tex[] = dgMsgKanji88C8Tex;
+
+#define dgMsgKanji88C9Tex "__OTR__textures/kanji/gMsgKanji88C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88C9Tex[] = dgMsgKanji88C9Tex;
+
+#define dgMsgKanji88CATex "__OTR__textures/kanji/gMsgKanji88CATex"
+static const ALIGN_ASSET(2) char gMsgKanji88CATex[] = dgMsgKanji88CATex;
+
+#define dgMsgKanji88CBTex "__OTR__textures/kanji/gMsgKanji88CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji88CBTex[] = dgMsgKanji88CBTex;
+
+#define dgMsgKanji88CCTex "__OTR__textures/kanji/gMsgKanji88CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji88CCTex[] = dgMsgKanji88CCTex;
+
+#define dgMsgKanji88CDTex "__OTR__textures/kanji/gMsgKanji88CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji88CDTex[] = dgMsgKanji88CDTex;
+
+#define dgMsgKanji88CETex "__OTR__textures/kanji/gMsgKanji88CETex"
+static const ALIGN_ASSET(2) char gMsgKanji88CETex[] = dgMsgKanji88CETex;
+
+#define dgMsgKanji88CFTex "__OTR__textures/kanji/gMsgKanji88CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji88CFTex[] = dgMsgKanji88CFTex;
+
+#define dgMsgKanji88D0Tex "__OTR__textures/kanji/gMsgKanji88D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D0Tex[] = dgMsgKanji88D0Tex;
+
+#define dgMsgKanji88D1Tex "__OTR__textures/kanji/gMsgKanji88D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D1Tex[] = dgMsgKanji88D1Tex;
+
+#define dgMsgKanji88D2Tex "__OTR__textures/kanji/gMsgKanji88D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D2Tex[] = dgMsgKanji88D2Tex;
+
+#define dgMsgKanji88D3Tex "__OTR__textures/kanji/gMsgKanji88D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D3Tex[] = dgMsgKanji88D3Tex;
+
+#define dgMsgKanji88D4Tex "__OTR__textures/kanji/gMsgKanji88D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D4Tex[] = dgMsgKanji88D4Tex;
+
+#define dgMsgKanji88D5Tex "__OTR__textures/kanji/gMsgKanji88D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D5Tex[] = dgMsgKanji88D5Tex;
+
+#define dgMsgKanji88D6Tex "__OTR__textures/kanji/gMsgKanji88D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D6Tex[] = dgMsgKanji88D6Tex;
+
+#define dgMsgKanji88D7Tex "__OTR__textures/kanji/gMsgKanji88D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D7Tex[] = dgMsgKanji88D7Tex;
+
+#define dgMsgKanji88D8Tex "__OTR__textures/kanji/gMsgKanji88D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D8Tex[] = dgMsgKanji88D8Tex;
+
+#define dgMsgKanji88D9Tex "__OTR__textures/kanji/gMsgKanji88D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88D9Tex[] = dgMsgKanji88D9Tex;
+
+#define dgMsgKanji88DATex "__OTR__textures/kanji/gMsgKanji88DATex"
+static const ALIGN_ASSET(2) char gMsgKanji88DATex[] = dgMsgKanji88DATex;
+
+#define dgMsgKanji88DBTex "__OTR__textures/kanji/gMsgKanji88DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji88DBTex[] = dgMsgKanji88DBTex;
+
+#define dgMsgKanji88DCTex "__OTR__textures/kanji/gMsgKanji88DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji88DCTex[] = dgMsgKanji88DCTex;
+
+#define dgMsgKanji88DDTex "__OTR__textures/kanji/gMsgKanji88DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji88DDTex[] = dgMsgKanji88DDTex;
+
+#define dgMsgKanji88DETex "__OTR__textures/kanji/gMsgKanji88DETex"
+static const ALIGN_ASSET(2) char gMsgKanji88DETex[] = dgMsgKanji88DETex;
+
+#define dgMsgKanji88DFTex "__OTR__textures/kanji/gMsgKanji88DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji88DFTex[] = dgMsgKanji88DFTex;
+
+#define dgMsgKanji88E0Tex "__OTR__textures/kanji/gMsgKanji88E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E0Tex[] = dgMsgKanji88E0Tex;
+
+#define dgMsgKanji88E1Tex "__OTR__textures/kanji/gMsgKanji88E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E1Tex[] = dgMsgKanji88E1Tex;
+
+#define dgMsgKanji88E2Tex "__OTR__textures/kanji/gMsgKanji88E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E2Tex[] = dgMsgKanji88E2Tex;
+
+#define dgMsgKanji88E3Tex "__OTR__textures/kanji/gMsgKanji88E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E3Tex[] = dgMsgKanji88E3Tex;
+
+#define dgMsgKanji88E4Tex "__OTR__textures/kanji/gMsgKanji88E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E4Tex[] = dgMsgKanji88E4Tex;
+
+#define dgMsgKanji88E5Tex "__OTR__textures/kanji/gMsgKanji88E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E5Tex[] = dgMsgKanji88E5Tex;
+
+#define dgMsgKanji88E6Tex "__OTR__textures/kanji/gMsgKanji88E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E6Tex[] = dgMsgKanji88E6Tex;
+
+#define dgMsgKanji88E7Tex "__OTR__textures/kanji/gMsgKanji88E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E7Tex[] = dgMsgKanji88E7Tex;
+
+#define dgMsgKanji88E8Tex "__OTR__textures/kanji/gMsgKanji88E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E8Tex[] = dgMsgKanji88E8Tex;
+
+#define dgMsgKanji88E9Tex "__OTR__textures/kanji/gMsgKanji88E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88E9Tex[] = dgMsgKanji88E9Tex;
+
+#define dgMsgKanji88EATex "__OTR__textures/kanji/gMsgKanji88EATex"
+static const ALIGN_ASSET(2) char gMsgKanji88EATex[] = dgMsgKanji88EATex;
+
+#define dgMsgKanji88EBTex "__OTR__textures/kanji/gMsgKanji88EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji88EBTex[] = dgMsgKanji88EBTex;
+
+#define dgMsgKanji88ECTex "__OTR__textures/kanji/gMsgKanji88ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji88ECTex[] = dgMsgKanji88ECTex;
+
+#define dgMsgKanji88EDTex "__OTR__textures/kanji/gMsgKanji88EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji88EDTex[] = dgMsgKanji88EDTex;
+
+#define dgMsgKanji88EETex "__OTR__textures/kanji/gMsgKanji88EETex"
+static const ALIGN_ASSET(2) char gMsgKanji88EETex[] = dgMsgKanji88EETex;
+
+#define dgMsgKanji88EFTex "__OTR__textures/kanji/gMsgKanji88EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji88EFTex[] = dgMsgKanji88EFTex;
+
+#define dgMsgKanji88F0Tex "__OTR__textures/kanji/gMsgKanji88F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F0Tex[] = dgMsgKanji88F0Tex;
+
+#define dgMsgKanji88F1Tex "__OTR__textures/kanji/gMsgKanji88F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F1Tex[] = dgMsgKanji88F1Tex;
+
+#define dgMsgKanji88F2Tex "__OTR__textures/kanji/gMsgKanji88F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F2Tex[] = dgMsgKanji88F2Tex;
+
+#define dgMsgKanji88F3Tex "__OTR__textures/kanji/gMsgKanji88F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F3Tex[] = dgMsgKanji88F3Tex;
+
+#define dgMsgKanji88F4Tex "__OTR__textures/kanji/gMsgKanji88F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F4Tex[] = dgMsgKanji88F4Tex;
+
+#define dgMsgKanji88F5Tex "__OTR__textures/kanji/gMsgKanji88F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F5Tex[] = dgMsgKanji88F5Tex;
+
+#define dgMsgKanji88F6Tex "__OTR__textures/kanji/gMsgKanji88F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F6Tex[] = dgMsgKanji88F6Tex;
+
+#define dgMsgKanji88F7Tex "__OTR__textures/kanji/gMsgKanji88F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F7Tex[] = dgMsgKanji88F7Tex;
+
+#define dgMsgKanji88F8Tex "__OTR__textures/kanji/gMsgKanji88F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F8Tex[] = dgMsgKanji88F8Tex;
+
+#define dgMsgKanji88F9Tex "__OTR__textures/kanji/gMsgKanji88F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji88F9Tex[] = dgMsgKanji88F9Tex;
+
+#define dgMsgKanji88FATex "__OTR__textures/kanji/gMsgKanji88FATex"
+static const ALIGN_ASSET(2) char gMsgKanji88FATex[] = dgMsgKanji88FATex;
+
+#define dgMsgKanji88FBTex "__OTR__textures/kanji/gMsgKanji88FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji88FBTex[] = dgMsgKanji88FBTex;
+
+#define dgMsgKanji88FCTex "__OTR__textures/kanji/gMsgKanji88FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji88FCTex[] = dgMsgKanji88FCTex;
+
+#define dgMsgKanji8940Tex "__OTR__textures/kanji/gMsgKanji8940Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8940Tex[] = dgMsgKanji8940Tex;
+
+#define dgMsgKanji8941Tex "__OTR__textures/kanji/gMsgKanji8941Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8941Tex[] = dgMsgKanji8941Tex;
+
+#define dgMsgKanji8942Tex "__OTR__textures/kanji/gMsgKanji8942Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8942Tex[] = dgMsgKanji8942Tex;
+
+#define dgMsgKanji8943Tex "__OTR__textures/kanji/gMsgKanji8943Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8943Tex[] = dgMsgKanji8943Tex;
+
+#define dgMsgKanji8944Tex "__OTR__textures/kanji/gMsgKanji8944Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8944Tex[] = dgMsgKanji8944Tex;
+
+#define dgMsgKanji8945Tex "__OTR__textures/kanji/gMsgKanji8945Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8945Tex[] = dgMsgKanji8945Tex;
+
+#define dgMsgKanji8946Tex "__OTR__textures/kanji/gMsgKanji8946Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8946Tex[] = dgMsgKanji8946Tex;
+
+#define dgMsgKanji8947Tex "__OTR__textures/kanji/gMsgKanji8947Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8947Tex[] = dgMsgKanji8947Tex;
+
+#define dgMsgKanji8948Tex "__OTR__textures/kanji/gMsgKanji8948Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8948Tex[] = dgMsgKanji8948Tex;
+
+#define dgMsgKanji8949Tex "__OTR__textures/kanji/gMsgKanji8949Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8949Tex[] = dgMsgKanji8949Tex;
+
+#define dgMsgKanji894ATex "__OTR__textures/kanji/gMsgKanji894ATex"
+static const ALIGN_ASSET(2) char gMsgKanji894ATex[] = dgMsgKanji894ATex;
+
+#define dgMsgKanji894BTex "__OTR__textures/kanji/gMsgKanji894BTex"
+static const ALIGN_ASSET(2) char gMsgKanji894BTex[] = dgMsgKanji894BTex;
+
+#define dgMsgKanji894CTex "__OTR__textures/kanji/gMsgKanji894CTex"
+static const ALIGN_ASSET(2) char gMsgKanji894CTex[] = dgMsgKanji894CTex;
+
+#define dgMsgKanji894DTex "__OTR__textures/kanji/gMsgKanji894DTex"
+static const ALIGN_ASSET(2) char gMsgKanji894DTex[] = dgMsgKanji894DTex;
+
+#define dgMsgKanji894ETex "__OTR__textures/kanji/gMsgKanji894ETex"
+static const ALIGN_ASSET(2) char gMsgKanji894ETex[] = dgMsgKanji894ETex;
+
+#define dgMsgKanji894FTex "__OTR__textures/kanji/gMsgKanji894FTex"
+static const ALIGN_ASSET(2) char gMsgKanji894FTex[] = dgMsgKanji894FTex;
+
+#define dgMsgKanji8950Tex "__OTR__textures/kanji/gMsgKanji8950Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8950Tex[] = dgMsgKanji8950Tex;
+
+#define dgMsgKanji8951Tex "__OTR__textures/kanji/gMsgKanji8951Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8951Tex[] = dgMsgKanji8951Tex;
+
+#define dgMsgKanji8952Tex "__OTR__textures/kanji/gMsgKanji8952Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8952Tex[] = dgMsgKanji8952Tex;
+
+#define dgMsgKanji8953Tex "__OTR__textures/kanji/gMsgKanji8953Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8953Tex[] = dgMsgKanji8953Tex;
+
+#define dgMsgKanji8954Tex "__OTR__textures/kanji/gMsgKanji8954Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8954Tex[] = dgMsgKanji8954Tex;
+
+#define dgMsgKanji8955Tex "__OTR__textures/kanji/gMsgKanji8955Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8955Tex[] = dgMsgKanji8955Tex;
+
+#define dgMsgKanji8956Tex "__OTR__textures/kanji/gMsgKanji8956Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8956Tex[] = dgMsgKanji8956Tex;
+
+#define dgMsgKanji8957Tex "__OTR__textures/kanji/gMsgKanji8957Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8957Tex[] = dgMsgKanji8957Tex;
+
+#define dgMsgKanji8958Tex "__OTR__textures/kanji/gMsgKanji8958Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8958Tex[] = dgMsgKanji8958Tex;
+
+#define dgMsgKanji8959Tex "__OTR__textures/kanji/gMsgKanji8959Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8959Tex[] = dgMsgKanji8959Tex;
+
+#define dgMsgKanji895ATex "__OTR__textures/kanji/gMsgKanji895ATex"
+static const ALIGN_ASSET(2) char gMsgKanji895ATex[] = dgMsgKanji895ATex;
+
+#define dgMsgKanji895BTex "__OTR__textures/kanji/gMsgKanji895BTex"
+static const ALIGN_ASSET(2) char gMsgKanji895BTex[] = dgMsgKanji895BTex;
+
+#define dgMsgKanji895CTex "__OTR__textures/kanji/gMsgKanji895CTex"
+static const ALIGN_ASSET(2) char gMsgKanji895CTex[] = dgMsgKanji895CTex;
+
+#define dgMsgKanji895DTex "__OTR__textures/kanji/gMsgKanji895DTex"
+static const ALIGN_ASSET(2) char gMsgKanji895DTex[] = dgMsgKanji895DTex;
+
+#define dgMsgKanji895ETex "__OTR__textures/kanji/gMsgKanji895ETex"
+static const ALIGN_ASSET(2) char gMsgKanji895ETex[] = dgMsgKanji895ETex;
+
+#define dgMsgKanji895FTex "__OTR__textures/kanji/gMsgKanji895FTex"
+static const ALIGN_ASSET(2) char gMsgKanji895FTex[] = dgMsgKanji895FTex;
+
+#define dgMsgKanji8960Tex "__OTR__textures/kanji/gMsgKanji8960Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8960Tex[] = dgMsgKanji8960Tex;
+
+#define dgMsgKanji8961Tex "__OTR__textures/kanji/gMsgKanji8961Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8961Tex[] = dgMsgKanji8961Tex;
+
+#define dgMsgKanji8962Tex "__OTR__textures/kanji/gMsgKanji8962Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8962Tex[] = dgMsgKanji8962Tex;
+
+#define dgMsgKanji8963Tex "__OTR__textures/kanji/gMsgKanji8963Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8963Tex[] = dgMsgKanji8963Tex;
+
+#define dgMsgKanji8964Tex "__OTR__textures/kanji/gMsgKanji8964Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8964Tex[] = dgMsgKanji8964Tex;
+
+#define dgMsgKanji8965Tex "__OTR__textures/kanji/gMsgKanji8965Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8965Tex[] = dgMsgKanji8965Tex;
+
+#define dgMsgKanji8966Tex "__OTR__textures/kanji/gMsgKanji8966Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8966Tex[] = dgMsgKanji8966Tex;
+
+#define dgMsgKanji8967Tex "__OTR__textures/kanji/gMsgKanji8967Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8967Tex[] = dgMsgKanji8967Tex;
+
+#define dgMsgKanji8968Tex "__OTR__textures/kanji/gMsgKanji8968Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8968Tex[] = dgMsgKanji8968Tex;
+
+#define dgMsgKanji8969Tex "__OTR__textures/kanji/gMsgKanji8969Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8969Tex[] = dgMsgKanji8969Tex;
+
+#define dgMsgKanji896ATex "__OTR__textures/kanji/gMsgKanji896ATex"
+static const ALIGN_ASSET(2) char gMsgKanji896ATex[] = dgMsgKanji896ATex;
+
+#define dgMsgKanji896BTex "__OTR__textures/kanji/gMsgKanji896BTex"
+static const ALIGN_ASSET(2) char gMsgKanji896BTex[] = dgMsgKanji896BTex;
+
+#define dgMsgKanji896CTex "__OTR__textures/kanji/gMsgKanji896CTex"
+static const ALIGN_ASSET(2) char gMsgKanji896CTex[] = dgMsgKanji896CTex;
+
+#define dgMsgKanji896DTex "__OTR__textures/kanji/gMsgKanji896DTex"
+static const ALIGN_ASSET(2) char gMsgKanji896DTex[] = dgMsgKanji896DTex;
+
+#define dgMsgKanji896ETex "__OTR__textures/kanji/gMsgKanji896ETex"
+static const ALIGN_ASSET(2) char gMsgKanji896ETex[] = dgMsgKanji896ETex;
+
+#define dgMsgKanji896FTex "__OTR__textures/kanji/gMsgKanji896FTex"
+static const ALIGN_ASSET(2) char gMsgKanji896FTex[] = dgMsgKanji896FTex;
+
+#define dgMsgKanji8970Tex "__OTR__textures/kanji/gMsgKanji8970Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8970Tex[] = dgMsgKanji8970Tex;
+
+#define dgMsgKanji8971Tex "__OTR__textures/kanji/gMsgKanji8971Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8971Tex[] = dgMsgKanji8971Tex;
+
+#define dgMsgKanji8972Tex "__OTR__textures/kanji/gMsgKanji8972Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8972Tex[] = dgMsgKanji8972Tex;
+
+#define dgMsgKanji8973Tex "__OTR__textures/kanji/gMsgKanji8973Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8973Tex[] = dgMsgKanji8973Tex;
+
+#define dgMsgKanji8974Tex "__OTR__textures/kanji/gMsgKanji8974Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8974Tex[] = dgMsgKanji8974Tex;
+
+#define dgMsgKanji8975Tex "__OTR__textures/kanji/gMsgKanji8975Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8975Tex[] = dgMsgKanji8975Tex;
+
+#define dgMsgKanji8976Tex "__OTR__textures/kanji/gMsgKanji8976Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8976Tex[] = dgMsgKanji8976Tex;
+
+#define dgMsgKanji8977Tex "__OTR__textures/kanji/gMsgKanji8977Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8977Tex[] = dgMsgKanji8977Tex;
+
+#define dgMsgKanji8978Tex "__OTR__textures/kanji/gMsgKanji8978Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8978Tex[] = dgMsgKanji8978Tex;
+
+#define dgMsgKanji8979Tex "__OTR__textures/kanji/gMsgKanji8979Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8979Tex[] = dgMsgKanji8979Tex;
+
+#define dgMsgKanji897ATex "__OTR__textures/kanji/gMsgKanji897ATex"
+static const ALIGN_ASSET(2) char gMsgKanji897ATex[] = dgMsgKanji897ATex;
+
+#define dgMsgKanji897BTex "__OTR__textures/kanji/gMsgKanji897BTex"
+static const ALIGN_ASSET(2) char gMsgKanji897BTex[] = dgMsgKanji897BTex;
+
+#define dgMsgKanji897CTex "__OTR__textures/kanji/gMsgKanji897CTex"
+static const ALIGN_ASSET(2) char gMsgKanji897CTex[] = dgMsgKanji897CTex;
+
+#define dgMsgKanji897DTex "__OTR__textures/kanji/gMsgKanji897DTex"
+static const ALIGN_ASSET(2) char gMsgKanji897DTex[] = dgMsgKanji897DTex;
+
+#define dgMsgKanji897ETex "__OTR__textures/kanji/gMsgKanji897ETex"
+static const ALIGN_ASSET(2) char gMsgKanji897ETex[] = dgMsgKanji897ETex;
+
+#define dgMsgKanji8980Tex "__OTR__textures/kanji/gMsgKanji8980Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8980Tex[] = dgMsgKanji8980Tex;
+
+#define dgMsgKanji8981Tex "__OTR__textures/kanji/gMsgKanji8981Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8981Tex[] = dgMsgKanji8981Tex;
+
+#define dgMsgKanji8982Tex "__OTR__textures/kanji/gMsgKanji8982Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8982Tex[] = dgMsgKanji8982Tex;
+
+#define dgMsgKanji8983Tex "__OTR__textures/kanji/gMsgKanji8983Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8983Tex[] = dgMsgKanji8983Tex;
+
+#define dgMsgKanji8984Tex "__OTR__textures/kanji/gMsgKanji8984Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8984Tex[] = dgMsgKanji8984Tex;
+
+#define dgMsgKanji8985Tex "__OTR__textures/kanji/gMsgKanji8985Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8985Tex[] = dgMsgKanji8985Tex;
+
+#define dgMsgKanji8986Tex "__OTR__textures/kanji/gMsgKanji8986Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8986Tex[] = dgMsgKanji8986Tex;
+
+#define dgMsgKanji8987Tex "__OTR__textures/kanji/gMsgKanji8987Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8987Tex[] = dgMsgKanji8987Tex;
+
+#define dgMsgKanji8988Tex "__OTR__textures/kanji/gMsgKanji8988Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8988Tex[] = dgMsgKanji8988Tex;
+
+#define dgMsgKanji8989Tex "__OTR__textures/kanji/gMsgKanji8989Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8989Tex[] = dgMsgKanji8989Tex;
+
+#define dgMsgKanji898ATex "__OTR__textures/kanji/gMsgKanji898ATex"
+static const ALIGN_ASSET(2) char gMsgKanji898ATex[] = dgMsgKanji898ATex;
+
+#define dgMsgKanji898BTex "__OTR__textures/kanji/gMsgKanji898BTex"
+static const ALIGN_ASSET(2) char gMsgKanji898BTex[] = dgMsgKanji898BTex;
+
+#define dgMsgKanji898CTex "__OTR__textures/kanji/gMsgKanji898CTex"
+static const ALIGN_ASSET(2) char gMsgKanji898CTex[] = dgMsgKanji898CTex;
+
+#define dgMsgKanji898DTex "__OTR__textures/kanji/gMsgKanji898DTex"
+static const ALIGN_ASSET(2) char gMsgKanji898DTex[] = dgMsgKanji898DTex;
+
+#define dgMsgKanji898ETex "__OTR__textures/kanji/gMsgKanji898ETex"
+static const ALIGN_ASSET(2) char gMsgKanji898ETex[] = dgMsgKanji898ETex;
+
+#define dgMsgKanji898FTex "__OTR__textures/kanji/gMsgKanji898FTex"
+static const ALIGN_ASSET(2) char gMsgKanji898FTex[] = dgMsgKanji898FTex;
+
+#define dgMsgKanji8990Tex "__OTR__textures/kanji/gMsgKanji8990Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8990Tex[] = dgMsgKanji8990Tex;
+
+#define dgMsgKanji8991Tex "__OTR__textures/kanji/gMsgKanji8991Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8991Tex[] = dgMsgKanji8991Tex;
+
+#define dgMsgKanji8992Tex "__OTR__textures/kanji/gMsgKanji8992Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8992Tex[] = dgMsgKanji8992Tex;
+
+#define dgMsgKanji8993Tex "__OTR__textures/kanji/gMsgKanji8993Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8993Tex[] = dgMsgKanji8993Tex;
+
+#define dgMsgKanji8994Tex "__OTR__textures/kanji/gMsgKanji8994Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8994Tex[] = dgMsgKanji8994Tex;
+
+#define dgMsgKanji8995Tex "__OTR__textures/kanji/gMsgKanji8995Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8995Tex[] = dgMsgKanji8995Tex;
+
+#define dgMsgKanji8996Tex "__OTR__textures/kanji/gMsgKanji8996Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8996Tex[] = dgMsgKanji8996Tex;
+
+#define dgMsgKanji8997Tex "__OTR__textures/kanji/gMsgKanji8997Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8997Tex[] = dgMsgKanji8997Tex;
+
+#define dgMsgKanji8998Tex "__OTR__textures/kanji/gMsgKanji8998Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8998Tex[] = dgMsgKanji8998Tex;
+
+#define dgMsgKanji8999Tex "__OTR__textures/kanji/gMsgKanji8999Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8999Tex[] = dgMsgKanji8999Tex;
+
+#define dgMsgKanji899ATex "__OTR__textures/kanji/gMsgKanji899ATex"
+static const ALIGN_ASSET(2) char gMsgKanji899ATex[] = dgMsgKanji899ATex;
+
+#define dgMsgKanji899BTex "__OTR__textures/kanji/gMsgKanji899BTex"
+static const ALIGN_ASSET(2) char gMsgKanji899BTex[] = dgMsgKanji899BTex;
+
+#define dgMsgKanji899CTex "__OTR__textures/kanji/gMsgKanji899CTex"
+static const ALIGN_ASSET(2) char gMsgKanji899CTex[] = dgMsgKanji899CTex;
+
+#define dgMsgKanji899DTex "__OTR__textures/kanji/gMsgKanji899DTex"
+static const ALIGN_ASSET(2) char gMsgKanji899DTex[] = dgMsgKanji899DTex;
+
+#define dgMsgKanji899ETex "__OTR__textures/kanji/gMsgKanji899ETex"
+static const ALIGN_ASSET(2) char gMsgKanji899ETex[] = dgMsgKanji899ETex;
+
+#define dgMsgKanji899FTex "__OTR__textures/kanji/gMsgKanji899FTex"
+static const ALIGN_ASSET(2) char gMsgKanji899FTex[] = dgMsgKanji899FTex;
+
+#define dgMsgKanji89A0Tex "__OTR__textures/kanji/gMsgKanji89A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A0Tex[] = dgMsgKanji89A0Tex;
+
+#define dgMsgKanji89A1Tex "__OTR__textures/kanji/gMsgKanji89A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A1Tex[] = dgMsgKanji89A1Tex;
+
+#define dgMsgKanji89A2Tex "__OTR__textures/kanji/gMsgKanji89A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A2Tex[] = dgMsgKanji89A2Tex;
+
+#define dgMsgKanji89A3Tex "__OTR__textures/kanji/gMsgKanji89A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A3Tex[] = dgMsgKanji89A3Tex;
+
+#define dgMsgKanji89A4Tex "__OTR__textures/kanji/gMsgKanji89A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A4Tex[] = dgMsgKanji89A4Tex;
+
+#define dgMsgKanji89A5Tex "__OTR__textures/kanji/gMsgKanji89A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A5Tex[] = dgMsgKanji89A5Tex;
+
+#define dgMsgKanji89A6Tex "__OTR__textures/kanji/gMsgKanji89A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A6Tex[] = dgMsgKanji89A6Tex;
+
+#define dgMsgKanji89A7Tex "__OTR__textures/kanji/gMsgKanji89A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A7Tex[] = dgMsgKanji89A7Tex;
+
+#define dgMsgKanji89A8Tex "__OTR__textures/kanji/gMsgKanji89A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A8Tex[] = dgMsgKanji89A8Tex;
+
+#define dgMsgKanji89A9Tex "__OTR__textures/kanji/gMsgKanji89A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89A9Tex[] = dgMsgKanji89A9Tex;
+
+#define dgMsgKanji89AATex "__OTR__textures/kanji/gMsgKanji89AATex"
+static const ALIGN_ASSET(2) char gMsgKanji89AATex[] = dgMsgKanji89AATex;
+
+#define dgMsgKanji89ABTex "__OTR__textures/kanji/gMsgKanji89ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji89ABTex[] = dgMsgKanji89ABTex;
+
+#define dgMsgKanji89ACTex "__OTR__textures/kanji/gMsgKanji89ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji89ACTex[] = dgMsgKanji89ACTex;
+
+#define dgMsgKanji89ADTex "__OTR__textures/kanji/gMsgKanji89ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji89ADTex[] = dgMsgKanji89ADTex;
+
+#define dgMsgKanji89AETex "__OTR__textures/kanji/gMsgKanji89AETex"
+static const ALIGN_ASSET(2) char gMsgKanji89AETex[] = dgMsgKanji89AETex;
+
+#define dgMsgKanji89AFTex "__OTR__textures/kanji/gMsgKanji89AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji89AFTex[] = dgMsgKanji89AFTex;
+
+#define dgMsgKanji89B0Tex "__OTR__textures/kanji/gMsgKanji89B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B0Tex[] = dgMsgKanji89B0Tex;
+
+#define dgMsgKanji89B1Tex "__OTR__textures/kanji/gMsgKanji89B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B1Tex[] = dgMsgKanji89B1Tex;
+
+#define dgMsgKanji89B2Tex "__OTR__textures/kanji/gMsgKanji89B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B2Tex[] = dgMsgKanji89B2Tex;
+
+#define dgMsgKanji89B3Tex "__OTR__textures/kanji/gMsgKanji89B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B3Tex[] = dgMsgKanji89B3Tex;
+
+#define dgMsgKanji89B4Tex "__OTR__textures/kanji/gMsgKanji89B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B4Tex[] = dgMsgKanji89B4Tex;
+
+#define dgMsgKanji89B5Tex "__OTR__textures/kanji/gMsgKanji89B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B5Tex[] = dgMsgKanji89B5Tex;
+
+#define dgMsgKanji89B6Tex "__OTR__textures/kanji/gMsgKanji89B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B6Tex[] = dgMsgKanji89B6Tex;
+
+#define dgMsgKanji89B7Tex "__OTR__textures/kanji/gMsgKanji89B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B7Tex[] = dgMsgKanji89B7Tex;
+
+#define dgMsgKanji89B8Tex "__OTR__textures/kanji/gMsgKanji89B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B8Tex[] = dgMsgKanji89B8Tex;
+
+#define dgMsgKanji89B9Tex "__OTR__textures/kanji/gMsgKanji89B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89B9Tex[] = dgMsgKanji89B9Tex;
+
+#define dgMsgKanji89BATex "__OTR__textures/kanji/gMsgKanji89BATex"
+static const ALIGN_ASSET(2) char gMsgKanji89BATex[] = dgMsgKanji89BATex;
+
+#define dgMsgKanji89BBTex "__OTR__textures/kanji/gMsgKanji89BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji89BBTex[] = dgMsgKanji89BBTex;
+
+#define dgMsgKanji89BCTex "__OTR__textures/kanji/gMsgKanji89BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji89BCTex[] = dgMsgKanji89BCTex;
+
+#define dgMsgKanji89BDTex "__OTR__textures/kanji/gMsgKanji89BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji89BDTex[] = dgMsgKanji89BDTex;
+
+#define dgMsgKanji89BETex "__OTR__textures/kanji/gMsgKanji89BETex"
+static const ALIGN_ASSET(2) char gMsgKanji89BETex[] = dgMsgKanji89BETex;
+
+#define dgMsgKanji89BFTex "__OTR__textures/kanji/gMsgKanji89BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji89BFTex[] = dgMsgKanji89BFTex;
+
+#define dgMsgKanji89C0Tex "__OTR__textures/kanji/gMsgKanji89C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C0Tex[] = dgMsgKanji89C0Tex;
+
+#define dgMsgKanji89C1Tex "__OTR__textures/kanji/gMsgKanji89C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C1Tex[] = dgMsgKanji89C1Tex;
+
+#define dgMsgKanji89C2Tex "__OTR__textures/kanji/gMsgKanji89C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C2Tex[] = dgMsgKanji89C2Tex;
+
+#define dgMsgKanji89C3Tex "__OTR__textures/kanji/gMsgKanji89C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C3Tex[] = dgMsgKanji89C3Tex;
+
+#define dgMsgKanji89C4Tex "__OTR__textures/kanji/gMsgKanji89C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C4Tex[] = dgMsgKanji89C4Tex;
+
+#define dgMsgKanji89C5Tex "__OTR__textures/kanji/gMsgKanji89C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C5Tex[] = dgMsgKanji89C5Tex;
+
+#define dgMsgKanji89C6Tex "__OTR__textures/kanji/gMsgKanji89C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C6Tex[] = dgMsgKanji89C6Tex;
+
+#define dgMsgKanji89C7Tex "__OTR__textures/kanji/gMsgKanji89C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C7Tex[] = dgMsgKanji89C7Tex;
+
+#define dgMsgKanji89C8Tex "__OTR__textures/kanji/gMsgKanji89C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C8Tex[] = dgMsgKanji89C8Tex;
+
+#define dgMsgKanji89C9Tex "__OTR__textures/kanji/gMsgKanji89C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89C9Tex[] = dgMsgKanji89C9Tex;
+
+#define dgMsgKanji89CATex "__OTR__textures/kanji/gMsgKanji89CATex"
+static const ALIGN_ASSET(2) char gMsgKanji89CATex[] = dgMsgKanji89CATex;
+
+#define dgMsgKanji89CBTex "__OTR__textures/kanji/gMsgKanji89CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji89CBTex[] = dgMsgKanji89CBTex;
+
+#define dgMsgKanji89CCTex "__OTR__textures/kanji/gMsgKanji89CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji89CCTex[] = dgMsgKanji89CCTex;
+
+#define dgMsgKanji89CDTex "__OTR__textures/kanji/gMsgKanji89CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji89CDTex[] = dgMsgKanji89CDTex;
+
+#define dgMsgKanji89CETex "__OTR__textures/kanji/gMsgKanji89CETex"
+static const ALIGN_ASSET(2) char gMsgKanji89CETex[] = dgMsgKanji89CETex;
+
+#define dgMsgKanji89CFTex "__OTR__textures/kanji/gMsgKanji89CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji89CFTex[] = dgMsgKanji89CFTex;
+
+#define dgMsgKanji89D0Tex "__OTR__textures/kanji/gMsgKanji89D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D0Tex[] = dgMsgKanji89D0Tex;
+
+#define dgMsgKanji89D1Tex "__OTR__textures/kanji/gMsgKanji89D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D1Tex[] = dgMsgKanji89D1Tex;
+
+#define dgMsgKanji89D2Tex "__OTR__textures/kanji/gMsgKanji89D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D2Tex[] = dgMsgKanji89D2Tex;
+
+#define dgMsgKanji89D3Tex "__OTR__textures/kanji/gMsgKanji89D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D3Tex[] = dgMsgKanji89D3Tex;
+
+#define dgMsgKanji89D4Tex "__OTR__textures/kanji/gMsgKanji89D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D4Tex[] = dgMsgKanji89D4Tex;
+
+#define dgMsgKanji89D5Tex "__OTR__textures/kanji/gMsgKanji89D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D5Tex[] = dgMsgKanji89D5Tex;
+
+#define dgMsgKanji89D6Tex "__OTR__textures/kanji/gMsgKanji89D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D6Tex[] = dgMsgKanji89D6Tex;
+
+#define dgMsgKanji89D7Tex "__OTR__textures/kanji/gMsgKanji89D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D7Tex[] = dgMsgKanji89D7Tex;
+
+#define dgMsgKanji89D8Tex "__OTR__textures/kanji/gMsgKanji89D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D8Tex[] = dgMsgKanji89D8Tex;
+
+#define dgMsgKanji89D9Tex "__OTR__textures/kanji/gMsgKanji89D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89D9Tex[] = dgMsgKanji89D9Tex;
+
+#define dgMsgKanji89DATex "__OTR__textures/kanji/gMsgKanji89DATex"
+static const ALIGN_ASSET(2) char gMsgKanji89DATex[] = dgMsgKanji89DATex;
+
+#define dgMsgKanji89DBTex "__OTR__textures/kanji/gMsgKanji89DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji89DBTex[] = dgMsgKanji89DBTex;
+
+#define dgMsgKanji89DCTex "__OTR__textures/kanji/gMsgKanji89DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji89DCTex[] = dgMsgKanji89DCTex;
+
+#define dgMsgKanji89DDTex "__OTR__textures/kanji/gMsgKanji89DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji89DDTex[] = dgMsgKanji89DDTex;
+
+#define dgMsgKanji89DETex "__OTR__textures/kanji/gMsgKanji89DETex"
+static const ALIGN_ASSET(2) char gMsgKanji89DETex[] = dgMsgKanji89DETex;
+
+#define dgMsgKanji89DFTex "__OTR__textures/kanji/gMsgKanji89DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji89DFTex[] = dgMsgKanji89DFTex;
+
+#define dgMsgKanji89E0Tex "__OTR__textures/kanji/gMsgKanji89E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E0Tex[] = dgMsgKanji89E0Tex;
+
+#define dgMsgKanji89E1Tex "__OTR__textures/kanji/gMsgKanji89E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E1Tex[] = dgMsgKanji89E1Tex;
+
+#define dgMsgKanji89E2Tex "__OTR__textures/kanji/gMsgKanji89E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E2Tex[] = dgMsgKanji89E2Tex;
+
+#define dgMsgKanji89E3Tex "__OTR__textures/kanji/gMsgKanji89E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E3Tex[] = dgMsgKanji89E3Tex;
+
+#define dgMsgKanji89E4Tex "__OTR__textures/kanji/gMsgKanji89E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E4Tex[] = dgMsgKanji89E4Tex;
+
+#define dgMsgKanji89E5Tex "__OTR__textures/kanji/gMsgKanji89E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E5Tex[] = dgMsgKanji89E5Tex;
+
+#define dgMsgKanji89E6Tex "__OTR__textures/kanji/gMsgKanji89E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E6Tex[] = dgMsgKanji89E6Tex;
+
+#define dgMsgKanji89E7Tex "__OTR__textures/kanji/gMsgKanji89E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E7Tex[] = dgMsgKanji89E7Tex;
+
+#define dgMsgKanji89E8Tex "__OTR__textures/kanji/gMsgKanji89E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E8Tex[] = dgMsgKanji89E8Tex;
+
+#define dgMsgKanji89E9Tex "__OTR__textures/kanji/gMsgKanji89E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89E9Tex[] = dgMsgKanji89E9Tex;
+
+#define dgMsgKanji89EATex "__OTR__textures/kanji/gMsgKanji89EATex"
+static const ALIGN_ASSET(2) char gMsgKanji89EATex[] = dgMsgKanji89EATex;
+
+#define dgMsgKanji89EBTex "__OTR__textures/kanji/gMsgKanji89EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji89EBTex[] = dgMsgKanji89EBTex;
+
+#define dgMsgKanji89ECTex "__OTR__textures/kanji/gMsgKanji89ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji89ECTex[] = dgMsgKanji89ECTex;
+
+#define dgMsgKanji89EDTex "__OTR__textures/kanji/gMsgKanji89EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji89EDTex[] = dgMsgKanji89EDTex;
+
+#define dgMsgKanji89EETex "__OTR__textures/kanji/gMsgKanji89EETex"
+static const ALIGN_ASSET(2) char gMsgKanji89EETex[] = dgMsgKanji89EETex;
+
+#define dgMsgKanji89EFTex "__OTR__textures/kanji/gMsgKanji89EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji89EFTex[] = dgMsgKanji89EFTex;
+
+#define dgMsgKanji89F0Tex "__OTR__textures/kanji/gMsgKanji89F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F0Tex[] = dgMsgKanji89F0Tex;
+
+#define dgMsgKanji89F1Tex "__OTR__textures/kanji/gMsgKanji89F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F1Tex[] = dgMsgKanji89F1Tex;
+
+#define dgMsgKanji89F2Tex "__OTR__textures/kanji/gMsgKanji89F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F2Tex[] = dgMsgKanji89F2Tex;
+
+#define dgMsgKanji89F3Tex "__OTR__textures/kanji/gMsgKanji89F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F3Tex[] = dgMsgKanji89F3Tex;
+
+#define dgMsgKanji89F4Tex "__OTR__textures/kanji/gMsgKanji89F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F4Tex[] = dgMsgKanji89F4Tex;
+
+#define dgMsgKanji89F5Tex "__OTR__textures/kanji/gMsgKanji89F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F5Tex[] = dgMsgKanji89F5Tex;
+
+#define dgMsgKanji89F6Tex "__OTR__textures/kanji/gMsgKanji89F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F6Tex[] = dgMsgKanji89F6Tex;
+
+#define dgMsgKanji89F7Tex "__OTR__textures/kanji/gMsgKanji89F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F7Tex[] = dgMsgKanji89F7Tex;
+
+#define dgMsgKanji89F8Tex "__OTR__textures/kanji/gMsgKanji89F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F8Tex[] = dgMsgKanji89F8Tex;
+
+#define dgMsgKanji89F9Tex "__OTR__textures/kanji/gMsgKanji89F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji89F9Tex[] = dgMsgKanji89F9Tex;
+
+#define dgMsgKanji89FATex "__OTR__textures/kanji/gMsgKanji89FATex"
+static const ALIGN_ASSET(2) char gMsgKanji89FATex[] = dgMsgKanji89FATex;
+
+#define dgMsgKanji89FBTex "__OTR__textures/kanji/gMsgKanji89FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji89FBTex[] = dgMsgKanji89FBTex;
+
+#define dgMsgKanji89FCTex "__OTR__textures/kanji/gMsgKanji89FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji89FCTex[] = dgMsgKanji89FCTex;
+
+#define dgMsgKanji8A40Tex "__OTR__textures/kanji/gMsgKanji8A40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A40Tex[] = dgMsgKanji8A40Tex;
+
+#define dgMsgKanji8A41Tex "__OTR__textures/kanji/gMsgKanji8A41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A41Tex[] = dgMsgKanji8A41Tex;
+
+#define dgMsgKanji8A42Tex "__OTR__textures/kanji/gMsgKanji8A42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A42Tex[] = dgMsgKanji8A42Tex;
+
+#define dgMsgKanji8A43Tex "__OTR__textures/kanji/gMsgKanji8A43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A43Tex[] = dgMsgKanji8A43Tex;
+
+#define dgMsgKanji8A44Tex "__OTR__textures/kanji/gMsgKanji8A44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A44Tex[] = dgMsgKanji8A44Tex;
+
+#define dgMsgKanji8A45Tex "__OTR__textures/kanji/gMsgKanji8A45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A45Tex[] = dgMsgKanji8A45Tex;
+
+#define dgMsgKanji8A46Tex "__OTR__textures/kanji/gMsgKanji8A46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A46Tex[] = dgMsgKanji8A46Tex;
+
+#define dgMsgKanji8A47Tex "__OTR__textures/kanji/gMsgKanji8A47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A47Tex[] = dgMsgKanji8A47Tex;
+
+#define dgMsgKanji8A48Tex "__OTR__textures/kanji/gMsgKanji8A48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A48Tex[] = dgMsgKanji8A48Tex;
+
+#define dgMsgKanji8A49Tex "__OTR__textures/kanji/gMsgKanji8A49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A49Tex[] = dgMsgKanji8A49Tex;
+
+#define dgMsgKanji8A4ATex "__OTR__textures/kanji/gMsgKanji8A4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4ATex[] = dgMsgKanji8A4ATex;
+
+#define dgMsgKanji8A4BTex "__OTR__textures/kanji/gMsgKanji8A4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4BTex[] = dgMsgKanji8A4BTex;
+
+#define dgMsgKanji8A4CTex "__OTR__textures/kanji/gMsgKanji8A4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4CTex[] = dgMsgKanji8A4CTex;
+
+#define dgMsgKanji8A4DTex "__OTR__textures/kanji/gMsgKanji8A4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4DTex[] = dgMsgKanji8A4DTex;
+
+#define dgMsgKanji8A4ETex "__OTR__textures/kanji/gMsgKanji8A4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4ETex[] = dgMsgKanji8A4ETex;
+
+#define dgMsgKanji8A4FTex "__OTR__textures/kanji/gMsgKanji8A4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A4FTex[] = dgMsgKanji8A4FTex;
+
+#define dgMsgKanji8A50Tex "__OTR__textures/kanji/gMsgKanji8A50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A50Tex[] = dgMsgKanji8A50Tex;
+
+#define dgMsgKanji8A51Tex "__OTR__textures/kanji/gMsgKanji8A51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A51Tex[] = dgMsgKanji8A51Tex;
+
+#define dgMsgKanji8A52Tex "__OTR__textures/kanji/gMsgKanji8A52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A52Tex[] = dgMsgKanji8A52Tex;
+
+#define dgMsgKanji8A53Tex "__OTR__textures/kanji/gMsgKanji8A53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A53Tex[] = dgMsgKanji8A53Tex;
+
+#define dgMsgKanji8A54Tex "__OTR__textures/kanji/gMsgKanji8A54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A54Tex[] = dgMsgKanji8A54Tex;
+
+#define dgMsgKanji8A55Tex "__OTR__textures/kanji/gMsgKanji8A55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A55Tex[] = dgMsgKanji8A55Tex;
+
+#define dgMsgKanji8A56Tex "__OTR__textures/kanji/gMsgKanji8A56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A56Tex[] = dgMsgKanji8A56Tex;
+
+#define dgMsgKanji8A57Tex "__OTR__textures/kanji/gMsgKanji8A57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A57Tex[] = dgMsgKanji8A57Tex;
+
+#define dgMsgKanji8A58Tex "__OTR__textures/kanji/gMsgKanji8A58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A58Tex[] = dgMsgKanji8A58Tex;
+
+#define dgMsgKanji8A59Tex "__OTR__textures/kanji/gMsgKanji8A59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A59Tex[] = dgMsgKanji8A59Tex;
+
+#define dgMsgKanji8A5ATex "__OTR__textures/kanji/gMsgKanji8A5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5ATex[] = dgMsgKanji8A5ATex;
+
+#define dgMsgKanji8A5BTex "__OTR__textures/kanji/gMsgKanji8A5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5BTex[] = dgMsgKanji8A5BTex;
+
+#define dgMsgKanji8A5CTex "__OTR__textures/kanji/gMsgKanji8A5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5CTex[] = dgMsgKanji8A5CTex;
+
+#define dgMsgKanji8A5DTex "__OTR__textures/kanji/gMsgKanji8A5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5DTex[] = dgMsgKanji8A5DTex;
+
+#define dgMsgKanji8A5ETex "__OTR__textures/kanji/gMsgKanji8A5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5ETex[] = dgMsgKanji8A5ETex;
+
+#define dgMsgKanji8A5FTex "__OTR__textures/kanji/gMsgKanji8A5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A5FTex[] = dgMsgKanji8A5FTex;
+
+#define dgMsgKanji8A60Tex "__OTR__textures/kanji/gMsgKanji8A60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A60Tex[] = dgMsgKanji8A60Tex;
+
+#define dgMsgKanji8A61Tex "__OTR__textures/kanji/gMsgKanji8A61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A61Tex[] = dgMsgKanji8A61Tex;
+
+#define dgMsgKanji8A62Tex "__OTR__textures/kanji/gMsgKanji8A62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A62Tex[] = dgMsgKanji8A62Tex;
+
+#define dgMsgKanji8A63Tex "__OTR__textures/kanji/gMsgKanji8A63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A63Tex[] = dgMsgKanji8A63Tex;
+
+#define dgMsgKanji8A64Tex "__OTR__textures/kanji/gMsgKanji8A64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A64Tex[] = dgMsgKanji8A64Tex;
+
+#define dgMsgKanji8A65Tex "__OTR__textures/kanji/gMsgKanji8A65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A65Tex[] = dgMsgKanji8A65Tex;
+
+#define dgMsgKanji8A66Tex "__OTR__textures/kanji/gMsgKanji8A66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A66Tex[] = dgMsgKanji8A66Tex;
+
+#define dgMsgKanji8A67Tex "__OTR__textures/kanji/gMsgKanji8A67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A67Tex[] = dgMsgKanji8A67Tex;
+
+#define dgMsgKanji8A68Tex "__OTR__textures/kanji/gMsgKanji8A68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A68Tex[] = dgMsgKanji8A68Tex;
+
+#define dgMsgKanji8A69Tex "__OTR__textures/kanji/gMsgKanji8A69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A69Tex[] = dgMsgKanji8A69Tex;
+
+#define dgMsgKanji8A6ATex "__OTR__textures/kanji/gMsgKanji8A6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6ATex[] = dgMsgKanji8A6ATex;
+
+#define dgMsgKanji8A6BTex "__OTR__textures/kanji/gMsgKanji8A6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6BTex[] = dgMsgKanji8A6BTex;
+
+#define dgMsgKanji8A6CTex "__OTR__textures/kanji/gMsgKanji8A6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6CTex[] = dgMsgKanji8A6CTex;
+
+#define dgMsgKanji8A6DTex "__OTR__textures/kanji/gMsgKanji8A6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6DTex[] = dgMsgKanji8A6DTex;
+
+#define dgMsgKanji8A6ETex "__OTR__textures/kanji/gMsgKanji8A6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6ETex[] = dgMsgKanji8A6ETex;
+
+#define dgMsgKanji8A6FTex "__OTR__textures/kanji/gMsgKanji8A6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A6FTex[] = dgMsgKanji8A6FTex;
+
+#define dgMsgKanji8A70Tex "__OTR__textures/kanji/gMsgKanji8A70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A70Tex[] = dgMsgKanji8A70Tex;
+
+#define dgMsgKanji8A71Tex "__OTR__textures/kanji/gMsgKanji8A71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A71Tex[] = dgMsgKanji8A71Tex;
+
+#define dgMsgKanji8A72Tex "__OTR__textures/kanji/gMsgKanji8A72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A72Tex[] = dgMsgKanji8A72Tex;
+
+#define dgMsgKanji8A73Tex "__OTR__textures/kanji/gMsgKanji8A73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A73Tex[] = dgMsgKanji8A73Tex;
+
+#define dgMsgKanji8A74Tex "__OTR__textures/kanji/gMsgKanji8A74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A74Tex[] = dgMsgKanji8A74Tex;
+
+#define dgMsgKanji8A75Tex "__OTR__textures/kanji/gMsgKanji8A75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A75Tex[] = dgMsgKanji8A75Tex;
+
+#define dgMsgKanji8A76Tex "__OTR__textures/kanji/gMsgKanji8A76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A76Tex[] = dgMsgKanji8A76Tex;
+
+#define dgMsgKanji8A77Tex "__OTR__textures/kanji/gMsgKanji8A77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A77Tex[] = dgMsgKanji8A77Tex;
+
+#define dgMsgKanji8A78Tex "__OTR__textures/kanji/gMsgKanji8A78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A78Tex[] = dgMsgKanji8A78Tex;
+
+#define dgMsgKanji8A79Tex "__OTR__textures/kanji/gMsgKanji8A79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A79Tex[] = dgMsgKanji8A79Tex;
+
+#define dgMsgKanji8A7ATex "__OTR__textures/kanji/gMsgKanji8A7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A7ATex[] = dgMsgKanji8A7ATex;
+
+#define dgMsgKanji8A7BTex "__OTR__textures/kanji/gMsgKanji8A7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A7BTex[] = dgMsgKanji8A7BTex;
+
+#define dgMsgKanji8A7CTex "__OTR__textures/kanji/gMsgKanji8A7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A7CTex[] = dgMsgKanji8A7CTex;
+
+#define dgMsgKanji8A7DTex "__OTR__textures/kanji/gMsgKanji8A7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A7DTex[] = dgMsgKanji8A7DTex;
+
+#define dgMsgKanji8A7ETex "__OTR__textures/kanji/gMsgKanji8A7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A7ETex[] = dgMsgKanji8A7ETex;
+
+#define dgMsgKanji8A80Tex "__OTR__textures/kanji/gMsgKanji8A80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A80Tex[] = dgMsgKanji8A80Tex;
+
+#define dgMsgKanji8A81Tex "__OTR__textures/kanji/gMsgKanji8A81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A81Tex[] = dgMsgKanji8A81Tex;
+
+#define dgMsgKanji8A82Tex "__OTR__textures/kanji/gMsgKanji8A82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A82Tex[] = dgMsgKanji8A82Tex;
+
+#define dgMsgKanji8A83Tex "__OTR__textures/kanji/gMsgKanji8A83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A83Tex[] = dgMsgKanji8A83Tex;
+
+#define dgMsgKanji8A84Tex "__OTR__textures/kanji/gMsgKanji8A84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A84Tex[] = dgMsgKanji8A84Tex;
+
+#define dgMsgKanji8A85Tex "__OTR__textures/kanji/gMsgKanji8A85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A85Tex[] = dgMsgKanji8A85Tex;
+
+#define dgMsgKanji8A86Tex "__OTR__textures/kanji/gMsgKanji8A86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A86Tex[] = dgMsgKanji8A86Tex;
+
+#define dgMsgKanji8A87Tex "__OTR__textures/kanji/gMsgKanji8A87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A87Tex[] = dgMsgKanji8A87Tex;
+
+#define dgMsgKanji8A88Tex "__OTR__textures/kanji/gMsgKanji8A88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A88Tex[] = dgMsgKanji8A88Tex;
+
+#define dgMsgKanji8A89Tex "__OTR__textures/kanji/gMsgKanji8A89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A89Tex[] = dgMsgKanji8A89Tex;
+
+#define dgMsgKanji8A8ATex "__OTR__textures/kanji/gMsgKanji8A8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8ATex[] = dgMsgKanji8A8ATex;
+
+#define dgMsgKanji8A8BTex "__OTR__textures/kanji/gMsgKanji8A8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8BTex[] = dgMsgKanji8A8BTex;
+
+#define dgMsgKanji8A8CTex "__OTR__textures/kanji/gMsgKanji8A8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8CTex[] = dgMsgKanji8A8CTex;
+
+#define dgMsgKanji8A8DTex "__OTR__textures/kanji/gMsgKanji8A8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8DTex[] = dgMsgKanji8A8DTex;
+
+#define dgMsgKanji8A8ETex "__OTR__textures/kanji/gMsgKanji8A8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8ETex[] = dgMsgKanji8A8ETex;
+
+#define dgMsgKanji8A8FTex "__OTR__textures/kanji/gMsgKanji8A8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A8FTex[] = dgMsgKanji8A8FTex;
+
+#define dgMsgKanji8A90Tex "__OTR__textures/kanji/gMsgKanji8A90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A90Tex[] = dgMsgKanji8A90Tex;
+
+#define dgMsgKanji8A91Tex "__OTR__textures/kanji/gMsgKanji8A91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A91Tex[] = dgMsgKanji8A91Tex;
+
+#define dgMsgKanji8A92Tex "__OTR__textures/kanji/gMsgKanji8A92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A92Tex[] = dgMsgKanji8A92Tex;
+
+#define dgMsgKanji8A93Tex "__OTR__textures/kanji/gMsgKanji8A93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A93Tex[] = dgMsgKanji8A93Tex;
+
+#define dgMsgKanji8A94Tex "__OTR__textures/kanji/gMsgKanji8A94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A94Tex[] = dgMsgKanji8A94Tex;
+
+#define dgMsgKanji8A95Tex "__OTR__textures/kanji/gMsgKanji8A95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A95Tex[] = dgMsgKanji8A95Tex;
+
+#define dgMsgKanji8A96Tex "__OTR__textures/kanji/gMsgKanji8A96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A96Tex[] = dgMsgKanji8A96Tex;
+
+#define dgMsgKanji8A97Tex "__OTR__textures/kanji/gMsgKanji8A97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A97Tex[] = dgMsgKanji8A97Tex;
+
+#define dgMsgKanji8A98Tex "__OTR__textures/kanji/gMsgKanji8A98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A98Tex[] = dgMsgKanji8A98Tex;
+
+#define dgMsgKanji8A99Tex "__OTR__textures/kanji/gMsgKanji8A99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8A99Tex[] = dgMsgKanji8A99Tex;
+
+#define dgMsgKanji8A9ATex "__OTR__textures/kanji/gMsgKanji8A9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9ATex[] = dgMsgKanji8A9ATex;
+
+#define dgMsgKanji8A9BTex "__OTR__textures/kanji/gMsgKanji8A9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9BTex[] = dgMsgKanji8A9BTex;
+
+#define dgMsgKanji8A9CTex "__OTR__textures/kanji/gMsgKanji8A9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9CTex[] = dgMsgKanji8A9CTex;
+
+#define dgMsgKanji8A9DTex "__OTR__textures/kanji/gMsgKanji8A9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9DTex[] = dgMsgKanji8A9DTex;
+
+#define dgMsgKanji8A9ETex "__OTR__textures/kanji/gMsgKanji8A9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9ETex[] = dgMsgKanji8A9ETex;
+
+#define dgMsgKanji8A9FTex "__OTR__textures/kanji/gMsgKanji8A9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8A9FTex[] = dgMsgKanji8A9FTex;
+
+#define dgMsgKanji8AA0Tex "__OTR__textures/kanji/gMsgKanji8AA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA0Tex[] = dgMsgKanji8AA0Tex;
+
+#define dgMsgKanji8AA1Tex "__OTR__textures/kanji/gMsgKanji8AA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA1Tex[] = dgMsgKanji8AA1Tex;
+
+#define dgMsgKanji8AA2Tex "__OTR__textures/kanji/gMsgKanji8AA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA2Tex[] = dgMsgKanji8AA2Tex;
+
+#define dgMsgKanji8AA3Tex "__OTR__textures/kanji/gMsgKanji8AA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA3Tex[] = dgMsgKanji8AA3Tex;
+
+#define dgMsgKanji8AA4Tex "__OTR__textures/kanji/gMsgKanji8AA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA4Tex[] = dgMsgKanji8AA4Tex;
+
+#define dgMsgKanji8AA5Tex "__OTR__textures/kanji/gMsgKanji8AA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA5Tex[] = dgMsgKanji8AA5Tex;
+
+#define dgMsgKanji8AA6Tex "__OTR__textures/kanji/gMsgKanji8AA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA6Tex[] = dgMsgKanji8AA6Tex;
+
+#define dgMsgKanji8AA7Tex "__OTR__textures/kanji/gMsgKanji8AA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA7Tex[] = dgMsgKanji8AA7Tex;
+
+#define dgMsgKanji8AA8Tex "__OTR__textures/kanji/gMsgKanji8AA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA8Tex[] = dgMsgKanji8AA8Tex;
+
+#define dgMsgKanji8AA9Tex "__OTR__textures/kanji/gMsgKanji8AA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AA9Tex[] = dgMsgKanji8AA9Tex;
+
+#define dgMsgKanji8AAATex "__OTR__textures/kanji/gMsgKanji8AAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8AAATex[] = dgMsgKanji8AAATex;
+
+#define dgMsgKanji8AABTex "__OTR__textures/kanji/gMsgKanji8AABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AABTex[] = dgMsgKanji8AABTex;
+
+#define dgMsgKanji8AACTex "__OTR__textures/kanji/gMsgKanji8AACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AACTex[] = dgMsgKanji8AACTex;
+
+#define dgMsgKanji8AADTex "__OTR__textures/kanji/gMsgKanji8AADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AADTex[] = dgMsgKanji8AADTex;
+
+#define dgMsgKanji8AAETex "__OTR__textures/kanji/gMsgKanji8AAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8AAETex[] = dgMsgKanji8AAETex;
+
+#define dgMsgKanji8AAFTex "__OTR__textures/kanji/gMsgKanji8AAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AAFTex[] = dgMsgKanji8AAFTex;
+
+#define dgMsgKanji8AB0Tex "__OTR__textures/kanji/gMsgKanji8AB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB0Tex[] = dgMsgKanji8AB0Tex;
+
+#define dgMsgKanji8AB1Tex "__OTR__textures/kanji/gMsgKanji8AB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB1Tex[] = dgMsgKanji8AB1Tex;
+
+#define dgMsgKanji8AB2Tex "__OTR__textures/kanji/gMsgKanji8AB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB2Tex[] = dgMsgKanji8AB2Tex;
+
+#define dgMsgKanji8AB3Tex "__OTR__textures/kanji/gMsgKanji8AB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB3Tex[] = dgMsgKanji8AB3Tex;
+
+#define dgMsgKanji8AB4Tex "__OTR__textures/kanji/gMsgKanji8AB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB4Tex[] = dgMsgKanji8AB4Tex;
+
+#define dgMsgKanji8AB5Tex "__OTR__textures/kanji/gMsgKanji8AB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB5Tex[] = dgMsgKanji8AB5Tex;
+
+#define dgMsgKanji8AB6Tex "__OTR__textures/kanji/gMsgKanji8AB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB6Tex[] = dgMsgKanji8AB6Tex;
+
+#define dgMsgKanji8AB7Tex "__OTR__textures/kanji/gMsgKanji8AB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB7Tex[] = dgMsgKanji8AB7Tex;
+
+#define dgMsgKanji8AB8Tex "__OTR__textures/kanji/gMsgKanji8AB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB8Tex[] = dgMsgKanji8AB8Tex;
+
+#define dgMsgKanji8AB9Tex "__OTR__textures/kanji/gMsgKanji8AB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AB9Tex[] = dgMsgKanji8AB9Tex;
+
+#define dgMsgKanji8ABATex "__OTR__textures/kanji/gMsgKanji8ABATex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABATex[] = dgMsgKanji8ABATex;
+
+#define dgMsgKanji8ABBTex "__OTR__textures/kanji/gMsgKanji8ABBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABBTex[] = dgMsgKanji8ABBTex;
+
+#define dgMsgKanji8ABCTex "__OTR__textures/kanji/gMsgKanji8ABCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABCTex[] = dgMsgKanji8ABCTex;
+
+#define dgMsgKanji8ABDTex "__OTR__textures/kanji/gMsgKanji8ABDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABDTex[] = dgMsgKanji8ABDTex;
+
+#define dgMsgKanji8ABETex "__OTR__textures/kanji/gMsgKanji8ABETex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABETex[] = dgMsgKanji8ABETex;
+
+#define dgMsgKanji8ABFTex "__OTR__textures/kanji/gMsgKanji8ABFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ABFTex[] = dgMsgKanji8ABFTex;
+
+#define dgMsgKanji8AC0Tex "__OTR__textures/kanji/gMsgKanji8AC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC0Tex[] = dgMsgKanji8AC0Tex;
+
+#define dgMsgKanji8AC1Tex "__OTR__textures/kanji/gMsgKanji8AC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC1Tex[] = dgMsgKanji8AC1Tex;
+
+#define dgMsgKanji8AC2Tex "__OTR__textures/kanji/gMsgKanji8AC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC2Tex[] = dgMsgKanji8AC2Tex;
+
+#define dgMsgKanji8AC3Tex "__OTR__textures/kanji/gMsgKanji8AC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC3Tex[] = dgMsgKanji8AC3Tex;
+
+#define dgMsgKanji8AC4Tex "__OTR__textures/kanji/gMsgKanji8AC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC4Tex[] = dgMsgKanji8AC4Tex;
+
+#define dgMsgKanji8AC5Tex "__OTR__textures/kanji/gMsgKanji8AC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC5Tex[] = dgMsgKanji8AC5Tex;
+
+#define dgMsgKanji8AC6Tex "__OTR__textures/kanji/gMsgKanji8AC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC6Tex[] = dgMsgKanji8AC6Tex;
+
+#define dgMsgKanji8AC7Tex "__OTR__textures/kanji/gMsgKanji8AC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC7Tex[] = dgMsgKanji8AC7Tex;
+
+#define dgMsgKanji8AC8Tex "__OTR__textures/kanji/gMsgKanji8AC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC8Tex[] = dgMsgKanji8AC8Tex;
+
+#define dgMsgKanji8AC9Tex "__OTR__textures/kanji/gMsgKanji8AC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AC9Tex[] = dgMsgKanji8AC9Tex;
+
+#define dgMsgKanji8ACATex "__OTR__textures/kanji/gMsgKanji8ACATex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACATex[] = dgMsgKanji8ACATex;
+
+#define dgMsgKanji8ACBTex "__OTR__textures/kanji/gMsgKanji8ACBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACBTex[] = dgMsgKanji8ACBTex;
+
+#define dgMsgKanji8ACCTex "__OTR__textures/kanji/gMsgKanji8ACCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACCTex[] = dgMsgKanji8ACCTex;
+
+#define dgMsgKanji8ACDTex "__OTR__textures/kanji/gMsgKanji8ACDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACDTex[] = dgMsgKanji8ACDTex;
+
+#define dgMsgKanji8ACETex "__OTR__textures/kanji/gMsgKanji8ACETex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACETex[] = dgMsgKanji8ACETex;
+
+#define dgMsgKanji8ACFTex "__OTR__textures/kanji/gMsgKanji8ACFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ACFTex[] = dgMsgKanji8ACFTex;
+
+#define dgMsgKanji8AD0Tex "__OTR__textures/kanji/gMsgKanji8AD0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD0Tex[] = dgMsgKanji8AD0Tex;
+
+#define dgMsgKanji8AD1Tex "__OTR__textures/kanji/gMsgKanji8AD1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD1Tex[] = dgMsgKanji8AD1Tex;
+
+#define dgMsgKanji8AD2Tex "__OTR__textures/kanji/gMsgKanji8AD2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD2Tex[] = dgMsgKanji8AD2Tex;
+
+#define dgMsgKanji8AD3Tex "__OTR__textures/kanji/gMsgKanji8AD3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD3Tex[] = dgMsgKanji8AD3Tex;
+
+#define dgMsgKanji8AD4Tex "__OTR__textures/kanji/gMsgKanji8AD4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD4Tex[] = dgMsgKanji8AD4Tex;
+
+#define dgMsgKanji8AD5Tex "__OTR__textures/kanji/gMsgKanji8AD5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD5Tex[] = dgMsgKanji8AD5Tex;
+
+#define dgMsgKanji8AD6Tex "__OTR__textures/kanji/gMsgKanji8AD6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD6Tex[] = dgMsgKanji8AD6Tex;
+
+#define dgMsgKanji8AD7Tex "__OTR__textures/kanji/gMsgKanji8AD7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD7Tex[] = dgMsgKanji8AD7Tex;
+
+#define dgMsgKanji8AD8Tex "__OTR__textures/kanji/gMsgKanji8AD8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD8Tex[] = dgMsgKanji8AD8Tex;
+
+#define dgMsgKanji8AD9Tex "__OTR__textures/kanji/gMsgKanji8AD9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AD9Tex[] = dgMsgKanji8AD9Tex;
+
+#define dgMsgKanji8ADATex "__OTR__textures/kanji/gMsgKanji8ADATex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADATex[] = dgMsgKanji8ADATex;
+
+#define dgMsgKanji8ADBTex "__OTR__textures/kanji/gMsgKanji8ADBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADBTex[] = dgMsgKanji8ADBTex;
+
+#define dgMsgKanji8ADCTex "__OTR__textures/kanji/gMsgKanji8ADCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADCTex[] = dgMsgKanji8ADCTex;
+
+#define dgMsgKanji8ADDTex "__OTR__textures/kanji/gMsgKanji8ADDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADDTex[] = dgMsgKanji8ADDTex;
+
+#define dgMsgKanji8ADETex "__OTR__textures/kanji/gMsgKanji8ADETex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADETex[] = dgMsgKanji8ADETex;
+
+#define dgMsgKanji8ADFTex "__OTR__textures/kanji/gMsgKanji8ADFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ADFTex[] = dgMsgKanji8ADFTex;
+
+#define dgMsgKanji8AE0Tex "__OTR__textures/kanji/gMsgKanji8AE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE0Tex[] = dgMsgKanji8AE0Tex;
+
+#define dgMsgKanji8AE1Tex "__OTR__textures/kanji/gMsgKanji8AE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE1Tex[] = dgMsgKanji8AE1Tex;
+
+#define dgMsgKanji8AE2Tex "__OTR__textures/kanji/gMsgKanji8AE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE2Tex[] = dgMsgKanji8AE2Tex;
+
+#define dgMsgKanji8AE3Tex "__OTR__textures/kanji/gMsgKanji8AE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE3Tex[] = dgMsgKanji8AE3Tex;
+
+#define dgMsgKanji8AE4Tex "__OTR__textures/kanji/gMsgKanji8AE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE4Tex[] = dgMsgKanji8AE4Tex;
+
+#define dgMsgKanji8AE5Tex "__OTR__textures/kanji/gMsgKanji8AE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE5Tex[] = dgMsgKanji8AE5Tex;
+
+#define dgMsgKanji8AE6Tex "__OTR__textures/kanji/gMsgKanji8AE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE6Tex[] = dgMsgKanji8AE6Tex;
+
+#define dgMsgKanji8AE7Tex "__OTR__textures/kanji/gMsgKanji8AE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE7Tex[] = dgMsgKanji8AE7Tex;
+
+#define dgMsgKanji8AE8Tex "__OTR__textures/kanji/gMsgKanji8AE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE8Tex[] = dgMsgKanji8AE8Tex;
+
+#define dgMsgKanji8AE9Tex "__OTR__textures/kanji/gMsgKanji8AE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AE9Tex[] = dgMsgKanji8AE9Tex;
+
+#define dgMsgKanji8AEATex "__OTR__textures/kanji/gMsgKanji8AEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8AEATex[] = dgMsgKanji8AEATex;
+
+#define dgMsgKanji8AEBTex "__OTR__textures/kanji/gMsgKanji8AEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AEBTex[] = dgMsgKanji8AEBTex;
+
+#define dgMsgKanji8AECTex "__OTR__textures/kanji/gMsgKanji8AECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AECTex[] = dgMsgKanji8AECTex;
+
+#define dgMsgKanji8AEDTex "__OTR__textures/kanji/gMsgKanji8AEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AEDTex[] = dgMsgKanji8AEDTex;
+
+#define dgMsgKanji8AEETex "__OTR__textures/kanji/gMsgKanji8AEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8AEETex[] = dgMsgKanji8AEETex;
+
+#define dgMsgKanji8AEFTex "__OTR__textures/kanji/gMsgKanji8AEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AEFTex[] = dgMsgKanji8AEFTex;
+
+#define dgMsgKanji8AF0Tex "__OTR__textures/kanji/gMsgKanji8AF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF0Tex[] = dgMsgKanji8AF0Tex;
+
+#define dgMsgKanji8AF1Tex "__OTR__textures/kanji/gMsgKanji8AF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF1Tex[] = dgMsgKanji8AF1Tex;
+
+#define dgMsgKanji8AF2Tex "__OTR__textures/kanji/gMsgKanji8AF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF2Tex[] = dgMsgKanji8AF2Tex;
+
+#define dgMsgKanji8AF3Tex "__OTR__textures/kanji/gMsgKanji8AF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF3Tex[] = dgMsgKanji8AF3Tex;
+
+#define dgMsgKanji8AF4Tex "__OTR__textures/kanji/gMsgKanji8AF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF4Tex[] = dgMsgKanji8AF4Tex;
+
+#define dgMsgKanji8AF5Tex "__OTR__textures/kanji/gMsgKanji8AF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF5Tex[] = dgMsgKanji8AF5Tex;
+
+#define dgMsgKanji8AF6Tex "__OTR__textures/kanji/gMsgKanji8AF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF6Tex[] = dgMsgKanji8AF6Tex;
+
+#define dgMsgKanji8AF7Tex "__OTR__textures/kanji/gMsgKanji8AF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF7Tex[] = dgMsgKanji8AF7Tex;
+
+#define dgMsgKanji8AF8Tex "__OTR__textures/kanji/gMsgKanji8AF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF8Tex[] = dgMsgKanji8AF8Tex;
+
+#define dgMsgKanji8AF9Tex "__OTR__textures/kanji/gMsgKanji8AF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8AF9Tex[] = dgMsgKanji8AF9Tex;
+
+#define dgMsgKanji8AFATex "__OTR__textures/kanji/gMsgKanji8AFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8AFATex[] = dgMsgKanji8AFATex;
+
+#define dgMsgKanji8AFBTex "__OTR__textures/kanji/gMsgKanji8AFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AFBTex[] = dgMsgKanji8AFBTex;
+
+#define dgMsgKanji8AFCTex "__OTR__textures/kanji/gMsgKanji8AFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8AFCTex[] = dgMsgKanji8AFCTex;
+
+#define dgMsgKanji8B40Tex "__OTR__textures/kanji/gMsgKanji8B40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B40Tex[] = dgMsgKanji8B40Tex;
+
+#define dgMsgKanji8B41Tex "__OTR__textures/kanji/gMsgKanji8B41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B41Tex[] = dgMsgKanji8B41Tex;
+
+#define dgMsgKanji8B42Tex "__OTR__textures/kanji/gMsgKanji8B42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B42Tex[] = dgMsgKanji8B42Tex;
+
+#define dgMsgKanji8B43Tex "__OTR__textures/kanji/gMsgKanji8B43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B43Tex[] = dgMsgKanji8B43Tex;
+
+#define dgMsgKanji8B44Tex "__OTR__textures/kanji/gMsgKanji8B44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B44Tex[] = dgMsgKanji8B44Tex;
+
+#define dgMsgKanji8B45Tex "__OTR__textures/kanji/gMsgKanji8B45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B45Tex[] = dgMsgKanji8B45Tex;
+
+#define dgMsgKanji8B46Tex "__OTR__textures/kanji/gMsgKanji8B46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B46Tex[] = dgMsgKanji8B46Tex;
+
+#define dgMsgKanji8B47Tex "__OTR__textures/kanji/gMsgKanji8B47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B47Tex[] = dgMsgKanji8B47Tex;
+
+#define dgMsgKanji8B48Tex "__OTR__textures/kanji/gMsgKanji8B48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B48Tex[] = dgMsgKanji8B48Tex;
+
+#define dgMsgKanji8B49Tex "__OTR__textures/kanji/gMsgKanji8B49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B49Tex[] = dgMsgKanji8B49Tex;
+
+#define dgMsgKanji8B4ATex "__OTR__textures/kanji/gMsgKanji8B4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4ATex[] = dgMsgKanji8B4ATex;
+
+#define dgMsgKanji8B4BTex "__OTR__textures/kanji/gMsgKanji8B4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4BTex[] = dgMsgKanji8B4BTex;
+
+#define dgMsgKanji8B4CTex "__OTR__textures/kanji/gMsgKanji8B4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4CTex[] = dgMsgKanji8B4CTex;
+
+#define dgMsgKanji8B4DTex "__OTR__textures/kanji/gMsgKanji8B4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4DTex[] = dgMsgKanji8B4DTex;
+
+#define dgMsgKanji8B4ETex "__OTR__textures/kanji/gMsgKanji8B4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4ETex[] = dgMsgKanji8B4ETex;
+
+#define dgMsgKanji8B4FTex "__OTR__textures/kanji/gMsgKanji8B4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B4FTex[] = dgMsgKanji8B4FTex;
+
+#define dgMsgKanji8B50Tex "__OTR__textures/kanji/gMsgKanji8B50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B50Tex[] = dgMsgKanji8B50Tex;
+
+#define dgMsgKanji8B51Tex "__OTR__textures/kanji/gMsgKanji8B51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B51Tex[] = dgMsgKanji8B51Tex;
+
+#define dgMsgKanji8B52Tex "__OTR__textures/kanji/gMsgKanji8B52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B52Tex[] = dgMsgKanji8B52Tex;
+
+#define dgMsgKanji8B53Tex "__OTR__textures/kanji/gMsgKanji8B53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B53Tex[] = dgMsgKanji8B53Tex;
+
+#define dgMsgKanji8B54Tex "__OTR__textures/kanji/gMsgKanji8B54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B54Tex[] = dgMsgKanji8B54Tex;
+
+#define dgMsgKanji8B55Tex "__OTR__textures/kanji/gMsgKanji8B55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B55Tex[] = dgMsgKanji8B55Tex;
+
+#define dgMsgKanji8B56Tex "__OTR__textures/kanji/gMsgKanji8B56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B56Tex[] = dgMsgKanji8B56Tex;
+
+#define dgMsgKanji8B57Tex "__OTR__textures/kanji/gMsgKanji8B57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B57Tex[] = dgMsgKanji8B57Tex;
+
+#define dgMsgKanji8B58Tex "__OTR__textures/kanji/gMsgKanji8B58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B58Tex[] = dgMsgKanji8B58Tex;
+
+#define dgMsgKanji8B59Tex "__OTR__textures/kanji/gMsgKanji8B59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B59Tex[] = dgMsgKanji8B59Tex;
+
+#define dgMsgKanji8B5ATex "__OTR__textures/kanji/gMsgKanji8B5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5ATex[] = dgMsgKanji8B5ATex;
+
+#define dgMsgKanji8B5BTex "__OTR__textures/kanji/gMsgKanji8B5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5BTex[] = dgMsgKanji8B5BTex;
+
+#define dgMsgKanji8B5CTex "__OTR__textures/kanji/gMsgKanji8B5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5CTex[] = dgMsgKanji8B5CTex;
+
+#define dgMsgKanji8B5DTex "__OTR__textures/kanji/gMsgKanji8B5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5DTex[] = dgMsgKanji8B5DTex;
+
+#define dgMsgKanji8B5ETex "__OTR__textures/kanji/gMsgKanji8B5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5ETex[] = dgMsgKanji8B5ETex;
+
+#define dgMsgKanji8B5FTex "__OTR__textures/kanji/gMsgKanji8B5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B5FTex[] = dgMsgKanji8B5FTex;
+
+#define dgMsgKanji8B60Tex "__OTR__textures/kanji/gMsgKanji8B60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B60Tex[] = dgMsgKanji8B60Tex;
+
+#define dgMsgKanji8B61Tex "__OTR__textures/kanji/gMsgKanji8B61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B61Tex[] = dgMsgKanji8B61Tex;
+
+#define dgMsgKanji8B62Tex "__OTR__textures/kanji/gMsgKanji8B62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B62Tex[] = dgMsgKanji8B62Tex;
+
+#define dgMsgKanji8B63Tex "__OTR__textures/kanji/gMsgKanji8B63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B63Tex[] = dgMsgKanji8B63Tex;
+
+#define dgMsgKanji8B64Tex "__OTR__textures/kanji/gMsgKanji8B64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B64Tex[] = dgMsgKanji8B64Tex;
+
+#define dgMsgKanji8B65Tex "__OTR__textures/kanji/gMsgKanji8B65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B65Tex[] = dgMsgKanji8B65Tex;
+
+#define dgMsgKanji8B66Tex "__OTR__textures/kanji/gMsgKanji8B66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B66Tex[] = dgMsgKanji8B66Tex;
+
+#define dgMsgKanji8B67Tex "__OTR__textures/kanji/gMsgKanji8B67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B67Tex[] = dgMsgKanji8B67Tex;
+
+#define dgMsgKanji8B68Tex "__OTR__textures/kanji/gMsgKanji8B68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B68Tex[] = dgMsgKanji8B68Tex;
+
+#define dgMsgKanji8B69Tex "__OTR__textures/kanji/gMsgKanji8B69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B69Tex[] = dgMsgKanji8B69Tex;
+
+#define dgMsgKanji8B6ATex "__OTR__textures/kanji/gMsgKanji8B6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6ATex[] = dgMsgKanji8B6ATex;
+
+#define dgMsgKanji8B6BTex "__OTR__textures/kanji/gMsgKanji8B6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6BTex[] = dgMsgKanji8B6BTex;
+
+#define dgMsgKanji8B6CTex "__OTR__textures/kanji/gMsgKanji8B6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6CTex[] = dgMsgKanji8B6CTex;
+
+#define dgMsgKanji8B6DTex "__OTR__textures/kanji/gMsgKanji8B6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6DTex[] = dgMsgKanji8B6DTex;
+
+#define dgMsgKanji8B6ETex "__OTR__textures/kanji/gMsgKanji8B6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6ETex[] = dgMsgKanji8B6ETex;
+
+#define dgMsgKanji8B6FTex "__OTR__textures/kanji/gMsgKanji8B6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B6FTex[] = dgMsgKanji8B6FTex;
+
+#define dgMsgKanji8B70Tex "__OTR__textures/kanji/gMsgKanji8B70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B70Tex[] = dgMsgKanji8B70Tex;
+
+#define dgMsgKanji8B71Tex "__OTR__textures/kanji/gMsgKanji8B71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B71Tex[] = dgMsgKanji8B71Tex;
+
+#define dgMsgKanji8B72Tex "__OTR__textures/kanji/gMsgKanji8B72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B72Tex[] = dgMsgKanji8B72Tex;
+
+#define dgMsgKanji8B73Tex "__OTR__textures/kanji/gMsgKanji8B73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B73Tex[] = dgMsgKanji8B73Tex;
+
+#define dgMsgKanji8B74Tex "__OTR__textures/kanji/gMsgKanji8B74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B74Tex[] = dgMsgKanji8B74Tex;
+
+#define dgMsgKanji8B75Tex "__OTR__textures/kanji/gMsgKanji8B75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B75Tex[] = dgMsgKanji8B75Tex;
+
+#define dgMsgKanji8B76Tex "__OTR__textures/kanji/gMsgKanji8B76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B76Tex[] = dgMsgKanji8B76Tex;
+
+#define dgMsgKanji8B77Tex "__OTR__textures/kanji/gMsgKanji8B77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B77Tex[] = dgMsgKanji8B77Tex;
+
+#define dgMsgKanji8B78Tex "__OTR__textures/kanji/gMsgKanji8B78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B78Tex[] = dgMsgKanji8B78Tex;
+
+#define dgMsgKanji8B79Tex "__OTR__textures/kanji/gMsgKanji8B79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B79Tex[] = dgMsgKanji8B79Tex;
+
+#define dgMsgKanji8B7ATex "__OTR__textures/kanji/gMsgKanji8B7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B7ATex[] = dgMsgKanji8B7ATex;
+
+#define dgMsgKanji8B7BTex "__OTR__textures/kanji/gMsgKanji8B7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B7BTex[] = dgMsgKanji8B7BTex;
+
+#define dgMsgKanji8B7CTex "__OTR__textures/kanji/gMsgKanji8B7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B7CTex[] = dgMsgKanji8B7CTex;
+
+#define dgMsgKanji8B7DTex "__OTR__textures/kanji/gMsgKanji8B7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B7DTex[] = dgMsgKanji8B7DTex;
+
+#define dgMsgKanji8B7ETex "__OTR__textures/kanji/gMsgKanji8B7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B7ETex[] = dgMsgKanji8B7ETex;
+
+#define dgMsgKanji8B80Tex "__OTR__textures/kanji/gMsgKanji8B80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B80Tex[] = dgMsgKanji8B80Tex;
+
+#define dgMsgKanji8B81Tex "__OTR__textures/kanji/gMsgKanji8B81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B81Tex[] = dgMsgKanji8B81Tex;
+
+#define dgMsgKanji8B82Tex "__OTR__textures/kanji/gMsgKanji8B82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B82Tex[] = dgMsgKanji8B82Tex;
+
+#define dgMsgKanji8B83Tex "__OTR__textures/kanji/gMsgKanji8B83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B83Tex[] = dgMsgKanji8B83Tex;
+
+#define dgMsgKanji8B84Tex "__OTR__textures/kanji/gMsgKanji8B84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B84Tex[] = dgMsgKanji8B84Tex;
+
+#define dgMsgKanji8B85Tex "__OTR__textures/kanji/gMsgKanji8B85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B85Tex[] = dgMsgKanji8B85Tex;
+
+#define dgMsgKanji8B86Tex "__OTR__textures/kanji/gMsgKanji8B86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B86Tex[] = dgMsgKanji8B86Tex;
+
+#define dgMsgKanji8B87Tex "__OTR__textures/kanji/gMsgKanji8B87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B87Tex[] = dgMsgKanji8B87Tex;
+
+#define dgMsgKanji8B88Tex "__OTR__textures/kanji/gMsgKanji8B88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B88Tex[] = dgMsgKanji8B88Tex;
+
+#define dgMsgKanji8B89Tex "__OTR__textures/kanji/gMsgKanji8B89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B89Tex[] = dgMsgKanji8B89Tex;
+
+#define dgMsgKanji8B8ATex "__OTR__textures/kanji/gMsgKanji8B8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8ATex[] = dgMsgKanji8B8ATex;
+
+#define dgMsgKanji8B8BTex "__OTR__textures/kanji/gMsgKanji8B8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8BTex[] = dgMsgKanji8B8BTex;
+
+#define dgMsgKanji8B8CTex "__OTR__textures/kanji/gMsgKanji8B8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8CTex[] = dgMsgKanji8B8CTex;
+
+#define dgMsgKanji8B8DTex "__OTR__textures/kanji/gMsgKanji8B8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8DTex[] = dgMsgKanji8B8DTex;
+
+#define dgMsgKanji8B8ETex "__OTR__textures/kanji/gMsgKanji8B8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8ETex[] = dgMsgKanji8B8ETex;
+
+#define dgMsgKanji8B8FTex "__OTR__textures/kanji/gMsgKanji8B8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B8FTex[] = dgMsgKanji8B8FTex;
+
+#define dgMsgKanji8B90Tex "__OTR__textures/kanji/gMsgKanji8B90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B90Tex[] = dgMsgKanji8B90Tex;
+
+#define dgMsgKanji8B91Tex "__OTR__textures/kanji/gMsgKanji8B91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B91Tex[] = dgMsgKanji8B91Tex;
+
+#define dgMsgKanji8B92Tex "__OTR__textures/kanji/gMsgKanji8B92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B92Tex[] = dgMsgKanji8B92Tex;
+
+#define dgMsgKanji8B93Tex "__OTR__textures/kanji/gMsgKanji8B93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B93Tex[] = dgMsgKanji8B93Tex;
+
+#define dgMsgKanji8B94Tex "__OTR__textures/kanji/gMsgKanji8B94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B94Tex[] = dgMsgKanji8B94Tex;
+
+#define dgMsgKanji8B95Tex "__OTR__textures/kanji/gMsgKanji8B95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B95Tex[] = dgMsgKanji8B95Tex;
+
+#define dgMsgKanji8B96Tex "__OTR__textures/kanji/gMsgKanji8B96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B96Tex[] = dgMsgKanji8B96Tex;
+
+#define dgMsgKanji8B97Tex "__OTR__textures/kanji/gMsgKanji8B97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B97Tex[] = dgMsgKanji8B97Tex;
+
+#define dgMsgKanji8B98Tex "__OTR__textures/kanji/gMsgKanji8B98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B98Tex[] = dgMsgKanji8B98Tex;
+
+#define dgMsgKanji8B99Tex "__OTR__textures/kanji/gMsgKanji8B99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8B99Tex[] = dgMsgKanji8B99Tex;
+
+#define dgMsgKanji8B9ATex "__OTR__textures/kanji/gMsgKanji8B9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9ATex[] = dgMsgKanji8B9ATex;
+
+#define dgMsgKanji8B9BTex "__OTR__textures/kanji/gMsgKanji8B9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9BTex[] = dgMsgKanji8B9BTex;
+
+#define dgMsgKanji8B9CTex "__OTR__textures/kanji/gMsgKanji8B9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9CTex[] = dgMsgKanji8B9CTex;
+
+#define dgMsgKanji8B9DTex "__OTR__textures/kanji/gMsgKanji8B9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9DTex[] = dgMsgKanji8B9DTex;
+
+#define dgMsgKanji8B9ETex "__OTR__textures/kanji/gMsgKanji8B9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9ETex[] = dgMsgKanji8B9ETex;
+
+#define dgMsgKanji8B9FTex "__OTR__textures/kanji/gMsgKanji8B9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8B9FTex[] = dgMsgKanji8B9FTex;
+
+#define dgMsgKanji8BA0Tex "__OTR__textures/kanji/gMsgKanji8BA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA0Tex[] = dgMsgKanji8BA0Tex;
+
+#define dgMsgKanji8BA1Tex "__OTR__textures/kanji/gMsgKanji8BA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA1Tex[] = dgMsgKanji8BA1Tex;
+
+#define dgMsgKanji8BA2Tex "__OTR__textures/kanji/gMsgKanji8BA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA2Tex[] = dgMsgKanji8BA2Tex;
+
+#define dgMsgKanji8BA3Tex "__OTR__textures/kanji/gMsgKanji8BA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA3Tex[] = dgMsgKanji8BA3Tex;
+
+#define dgMsgKanji8BA4Tex "__OTR__textures/kanji/gMsgKanji8BA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA4Tex[] = dgMsgKanji8BA4Tex;
+
+#define dgMsgKanji8BA5Tex "__OTR__textures/kanji/gMsgKanji8BA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA5Tex[] = dgMsgKanji8BA5Tex;
+
+#define dgMsgKanji8BA6Tex "__OTR__textures/kanji/gMsgKanji8BA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA6Tex[] = dgMsgKanji8BA6Tex;
+
+#define dgMsgKanji8BA7Tex "__OTR__textures/kanji/gMsgKanji8BA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA7Tex[] = dgMsgKanji8BA7Tex;
+
+#define dgMsgKanji8BA8Tex "__OTR__textures/kanji/gMsgKanji8BA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA8Tex[] = dgMsgKanji8BA8Tex;
+
+#define dgMsgKanji8BA9Tex "__OTR__textures/kanji/gMsgKanji8BA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BA9Tex[] = dgMsgKanji8BA9Tex;
+
+#define dgMsgKanji8BAATex "__OTR__textures/kanji/gMsgKanji8BAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BAATex[] = dgMsgKanji8BAATex;
+
+#define dgMsgKanji8BABTex "__OTR__textures/kanji/gMsgKanji8BABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BABTex[] = dgMsgKanji8BABTex;
+
+#define dgMsgKanji8BACTex "__OTR__textures/kanji/gMsgKanji8BACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BACTex[] = dgMsgKanji8BACTex;
+
+#define dgMsgKanji8BADTex "__OTR__textures/kanji/gMsgKanji8BADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BADTex[] = dgMsgKanji8BADTex;
+
+#define dgMsgKanji8BAETex "__OTR__textures/kanji/gMsgKanji8BAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8BAETex[] = dgMsgKanji8BAETex;
+
+#define dgMsgKanji8BAFTex "__OTR__textures/kanji/gMsgKanji8BAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BAFTex[] = dgMsgKanji8BAFTex;
+
+#define dgMsgKanji8BB0Tex "__OTR__textures/kanji/gMsgKanji8BB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB0Tex[] = dgMsgKanji8BB0Tex;
+
+#define dgMsgKanji8BB1Tex "__OTR__textures/kanji/gMsgKanji8BB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB1Tex[] = dgMsgKanji8BB1Tex;
+
+#define dgMsgKanji8BB2Tex "__OTR__textures/kanji/gMsgKanji8BB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB2Tex[] = dgMsgKanji8BB2Tex;
+
+#define dgMsgKanji8BB3Tex "__OTR__textures/kanji/gMsgKanji8BB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB3Tex[] = dgMsgKanji8BB3Tex;
+
+#define dgMsgKanji8BB4Tex "__OTR__textures/kanji/gMsgKanji8BB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB4Tex[] = dgMsgKanji8BB4Tex;
+
+#define dgMsgKanji8BB5Tex "__OTR__textures/kanji/gMsgKanji8BB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB5Tex[] = dgMsgKanji8BB5Tex;
+
+#define dgMsgKanji8BB6Tex "__OTR__textures/kanji/gMsgKanji8BB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB6Tex[] = dgMsgKanji8BB6Tex;
+
+#define dgMsgKanji8BB7Tex "__OTR__textures/kanji/gMsgKanji8BB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB7Tex[] = dgMsgKanji8BB7Tex;
+
+#define dgMsgKanji8BB8Tex "__OTR__textures/kanji/gMsgKanji8BB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB8Tex[] = dgMsgKanji8BB8Tex;
+
+#define dgMsgKanji8BB9Tex "__OTR__textures/kanji/gMsgKanji8BB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BB9Tex[] = dgMsgKanji8BB9Tex;
+
+#define dgMsgKanji8BBATex "__OTR__textures/kanji/gMsgKanji8BBATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBATex[] = dgMsgKanji8BBATex;
+
+#define dgMsgKanji8BBBTex "__OTR__textures/kanji/gMsgKanji8BBBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBBTex[] = dgMsgKanji8BBBTex;
+
+#define dgMsgKanji8BBCTex "__OTR__textures/kanji/gMsgKanji8BBCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBCTex[] = dgMsgKanji8BBCTex;
+
+#define dgMsgKanji8BBDTex "__OTR__textures/kanji/gMsgKanji8BBDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBDTex[] = dgMsgKanji8BBDTex;
+
+#define dgMsgKanji8BBETex "__OTR__textures/kanji/gMsgKanji8BBETex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBETex[] = dgMsgKanji8BBETex;
+
+#define dgMsgKanji8BBFTex "__OTR__textures/kanji/gMsgKanji8BBFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BBFTex[] = dgMsgKanji8BBFTex;
+
+#define dgMsgKanji8BC0Tex "__OTR__textures/kanji/gMsgKanji8BC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC0Tex[] = dgMsgKanji8BC0Tex;
+
+#define dgMsgKanji8BC1Tex "__OTR__textures/kanji/gMsgKanji8BC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC1Tex[] = dgMsgKanji8BC1Tex;
+
+#define dgMsgKanji8BC2Tex "__OTR__textures/kanji/gMsgKanji8BC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC2Tex[] = dgMsgKanji8BC2Tex;
+
+#define dgMsgKanji8BC3Tex "__OTR__textures/kanji/gMsgKanji8BC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC3Tex[] = dgMsgKanji8BC3Tex;
+
+#define dgMsgKanji8BC4Tex "__OTR__textures/kanji/gMsgKanji8BC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC4Tex[] = dgMsgKanji8BC4Tex;
+
+#define dgMsgKanji8BC5Tex "__OTR__textures/kanji/gMsgKanji8BC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC5Tex[] = dgMsgKanji8BC5Tex;
+
+#define dgMsgKanji8BC6Tex "__OTR__textures/kanji/gMsgKanji8BC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC6Tex[] = dgMsgKanji8BC6Tex;
+
+#define dgMsgKanji8BC7Tex "__OTR__textures/kanji/gMsgKanji8BC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC7Tex[] = dgMsgKanji8BC7Tex;
+
+#define dgMsgKanji8BC8Tex "__OTR__textures/kanji/gMsgKanji8BC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC8Tex[] = dgMsgKanji8BC8Tex;
+
+#define dgMsgKanji8BC9Tex "__OTR__textures/kanji/gMsgKanji8BC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BC9Tex[] = dgMsgKanji8BC9Tex;
+
+#define dgMsgKanji8BCATex "__OTR__textures/kanji/gMsgKanji8BCATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCATex[] = dgMsgKanji8BCATex;
+
+#define dgMsgKanji8BCBTex "__OTR__textures/kanji/gMsgKanji8BCBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCBTex[] = dgMsgKanji8BCBTex;
+
+#define dgMsgKanji8BCCTex "__OTR__textures/kanji/gMsgKanji8BCCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCCTex[] = dgMsgKanji8BCCTex;
+
+#define dgMsgKanji8BCDTex "__OTR__textures/kanji/gMsgKanji8BCDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCDTex[] = dgMsgKanji8BCDTex;
+
+#define dgMsgKanji8BCETex "__OTR__textures/kanji/gMsgKanji8BCETex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCETex[] = dgMsgKanji8BCETex;
+
+#define dgMsgKanji8BCFTex "__OTR__textures/kanji/gMsgKanji8BCFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BCFTex[] = dgMsgKanji8BCFTex;
+
+#define dgMsgKanji8BD0Tex "__OTR__textures/kanji/gMsgKanji8BD0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD0Tex[] = dgMsgKanji8BD0Tex;
+
+#define dgMsgKanji8BD1Tex "__OTR__textures/kanji/gMsgKanji8BD1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD1Tex[] = dgMsgKanji8BD1Tex;
+
+#define dgMsgKanji8BD2Tex "__OTR__textures/kanji/gMsgKanji8BD2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD2Tex[] = dgMsgKanji8BD2Tex;
+
+#define dgMsgKanji8BD3Tex "__OTR__textures/kanji/gMsgKanji8BD3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD3Tex[] = dgMsgKanji8BD3Tex;
+
+#define dgMsgKanji8BD4Tex "__OTR__textures/kanji/gMsgKanji8BD4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD4Tex[] = dgMsgKanji8BD4Tex;
+
+#define dgMsgKanji8BD5Tex "__OTR__textures/kanji/gMsgKanji8BD5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD5Tex[] = dgMsgKanji8BD5Tex;
+
+#define dgMsgKanji8BD6Tex "__OTR__textures/kanji/gMsgKanji8BD6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD6Tex[] = dgMsgKanji8BD6Tex;
+
+#define dgMsgKanji8BD7Tex "__OTR__textures/kanji/gMsgKanji8BD7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD7Tex[] = dgMsgKanji8BD7Tex;
+
+#define dgMsgKanji8BD8Tex "__OTR__textures/kanji/gMsgKanji8BD8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD8Tex[] = dgMsgKanji8BD8Tex;
+
+#define dgMsgKanji8BD9Tex "__OTR__textures/kanji/gMsgKanji8BD9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BD9Tex[] = dgMsgKanji8BD9Tex;
+
+#define dgMsgKanji8BDATex "__OTR__textures/kanji/gMsgKanji8BDATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDATex[] = dgMsgKanji8BDATex;
+
+#define dgMsgKanji8BDBTex "__OTR__textures/kanji/gMsgKanji8BDBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDBTex[] = dgMsgKanji8BDBTex;
+
+#define dgMsgKanji8BDCTex "__OTR__textures/kanji/gMsgKanji8BDCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDCTex[] = dgMsgKanji8BDCTex;
+
+#define dgMsgKanji8BDDTex "__OTR__textures/kanji/gMsgKanji8BDDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDDTex[] = dgMsgKanji8BDDTex;
+
+#define dgMsgKanji8BDETex "__OTR__textures/kanji/gMsgKanji8BDETex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDETex[] = dgMsgKanji8BDETex;
+
+#define dgMsgKanji8BDFTex "__OTR__textures/kanji/gMsgKanji8BDFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BDFTex[] = dgMsgKanji8BDFTex;
+
+#define dgMsgKanji8BE0Tex "__OTR__textures/kanji/gMsgKanji8BE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE0Tex[] = dgMsgKanji8BE0Tex;
+
+#define dgMsgKanji8BE1Tex "__OTR__textures/kanji/gMsgKanji8BE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE1Tex[] = dgMsgKanji8BE1Tex;
+
+#define dgMsgKanji8BE2Tex "__OTR__textures/kanji/gMsgKanji8BE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE2Tex[] = dgMsgKanji8BE2Tex;
+
+#define dgMsgKanji8BE3Tex "__OTR__textures/kanji/gMsgKanji8BE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE3Tex[] = dgMsgKanji8BE3Tex;
+
+#define dgMsgKanji8BE4Tex "__OTR__textures/kanji/gMsgKanji8BE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE4Tex[] = dgMsgKanji8BE4Tex;
+
+#define dgMsgKanji8BE5Tex "__OTR__textures/kanji/gMsgKanji8BE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE5Tex[] = dgMsgKanji8BE5Tex;
+
+#define dgMsgKanji8BE6Tex "__OTR__textures/kanji/gMsgKanji8BE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE6Tex[] = dgMsgKanji8BE6Tex;
+
+#define dgMsgKanji8BE7Tex "__OTR__textures/kanji/gMsgKanji8BE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE7Tex[] = dgMsgKanji8BE7Tex;
+
+#define dgMsgKanji8BE8Tex "__OTR__textures/kanji/gMsgKanji8BE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE8Tex[] = dgMsgKanji8BE8Tex;
+
+#define dgMsgKanji8BE9Tex "__OTR__textures/kanji/gMsgKanji8BE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BE9Tex[] = dgMsgKanji8BE9Tex;
+
+#define dgMsgKanji8BEATex "__OTR__textures/kanji/gMsgKanji8BEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BEATex[] = dgMsgKanji8BEATex;
+
+#define dgMsgKanji8BEBTex "__OTR__textures/kanji/gMsgKanji8BEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BEBTex[] = dgMsgKanji8BEBTex;
+
+#define dgMsgKanji8BECTex "__OTR__textures/kanji/gMsgKanji8BECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BECTex[] = dgMsgKanji8BECTex;
+
+#define dgMsgKanji8BEDTex "__OTR__textures/kanji/gMsgKanji8BEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BEDTex[] = dgMsgKanji8BEDTex;
+
+#define dgMsgKanji8BEETex "__OTR__textures/kanji/gMsgKanji8BEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8BEETex[] = dgMsgKanji8BEETex;
+
+#define dgMsgKanji8BEFTex "__OTR__textures/kanji/gMsgKanji8BEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BEFTex[] = dgMsgKanji8BEFTex;
+
+#define dgMsgKanji8BF0Tex "__OTR__textures/kanji/gMsgKanji8BF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF0Tex[] = dgMsgKanji8BF0Tex;
+
+#define dgMsgKanji8BF1Tex "__OTR__textures/kanji/gMsgKanji8BF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF1Tex[] = dgMsgKanji8BF1Tex;
+
+#define dgMsgKanji8BF2Tex "__OTR__textures/kanji/gMsgKanji8BF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF2Tex[] = dgMsgKanji8BF2Tex;
+
+#define dgMsgKanji8BF3Tex "__OTR__textures/kanji/gMsgKanji8BF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF3Tex[] = dgMsgKanji8BF3Tex;
+
+#define dgMsgKanji8BF4Tex "__OTR__textures/kanji/gMsgKanji8BF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF4Tex[] = dgMsgKanji8BF4Tex;
+
+#define dgMsgKanji8BF5Tex "__OTR__textures/kanji/gMsgKanji8BF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF5Tex[] = dgMsgKanji8BF5Tex;
+
+#define dgMsgKanji8BF6Tex "__OTR__textures/kanji/gMsgKanji8BF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF6Tex[] = dgMsgKanji8BF6Tex;
+
+#define dgMsgKanji8BF7Tex "__OTR__textures/kanji/gMsgKanji8BF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF7Tex[] = dgMsgKanji8BF7Tex;
+
+#define dgMsgKanji8BF8Tex "__OTR__textures/kanji/gMsgKanji8BF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF8Tex[] = dgMsgKanji8BF8Tex;
+
+#define dgMsgKanji8BF9Tex "__OTR__textures/kanji/gMsgKanji8BF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8BF9Tex[] = dgMsgKanji8BF9Tex;
+
+#define dgMsgKanji8BFATex "__OTR__textures/kanji/gMsgKanji8BFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8BFATex[] = dgMsgKanji8BFATex;
+
+#define dgMsgKanji8BFBTex "__OTR__textures/kanji/gMsgKanji8BFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BFBTex[] = dgMsgKanji8BFBTex;
+
+#define dgMsgKanji8BFCTex "__OTR__textures/kanji/gMsgKanji8BFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8BFCTex[] = dgMsgKanji8BFCTex;
+
+#define dgMsgKanji8C40Tex "__OTR__textures/kanji/gMsgKanji8C40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C40Tex[] = dgMsgKanji8C40Tex;
+
+#define dgMsgKanji8C41Tex "__OTR__textures/kanji/gMsgKanji8C41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C41Tex[] = dgMsgKanji8C41Tex;
+
+#define dgMsgKanji8C42Tex "__OTR__textures/kanji/gMsgKanji8C42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C42Tex[] = dgMsgKanji8C42Tex;
+
+#define dgMsgKanji8C43Tex "__OTR__textures/kanji/gMsgKanji8C43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C43Tex[] = dgMsgKanji8C43Tex;
+
+#define dgMsgKanji8C44Tex "__OTR__textures/kanji/gMsgKanji8C44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C44Tex[] = dgMsgKanji8C44Tex;
+
+#define dgMsgKanji8C45Tex "__OTR__textures/kanji/gMsgKanji8C45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C45Tex[] = dgMsgKanji8C45Tex;
+
+#define dgMsgKanji8C46Tex "__OTR__textures/kanji/gMsgKanji8C46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C46Tex[] = dgMsgKanji8C46Tex;
+
+#define dgMsgKanji8C47Tex "__OTR__textures/kanji/gMsgKanji8C47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C47Tex[] = dgMsgKanji8C47Tex;
+
+#define dgMsgKanji8C48Tex "__OTR__textures/kanji/gMsgKanji8C48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C48Tex[] = dgMsgKanji8C48Tex;
+
+#define dgMsgKanji8C49Tex "__OTR__textures/kanji/gMsgKanji8C49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C49Tex[] = dgMsgKanji8C49Tex;
+
+#define dgMsgKanji8C4ATex "__OTR__textures/kanji/gMsgKanji8C4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4ATex[] = dgMsgKanji8C4ATex;
+
+#define dgMsgKanji8C4BTex "__OTR__textures/kanji/gMsgKanji8C4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4BTex[] = dgMsgKanji8C4BTex;
+
+#define dgMsgKanji8C4CTex "__OTR__textures/kanji/gMsgKanji8C4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4CTex[] = dgMsgKanji8C4CTex;
+
+#define dgMsgKanji8C4DTex "__OTR__textures/kanji/gMsgKanji8C4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4DTex[] = dgMsgKanji8C4DTex;
+
+#define dgMsgKanji8C4ETex "__OTR__textures/kanji/gMsgKanji8C4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4ETex[] = dgMsgKanji8C4ETex;
+
+#define dgMsgKanji8C4FTex "__OTR__textures/kanji/gMsgKanji8C4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C4FTex[] = dgMsgKanji8C4FTex;
+
+#define dgMsgKanji8C50Tex "__OTR__textures/kanji/gMsgKanji8C50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C50Tex[] = dgMsgKanji8C50Tex;
+
+#define dgMsgKanji8C51Tex "__OTR__textures/kanji/gMsgKanji8C51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C51Tex[] = dgMsgKanji8C51Tex;
+
+#define dgMsgKanji8C52Tex "__OTR__textures/kanji/gMsgKanji8C52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C52Tex[] = dgMsgKanji8C52Tex;
+
+#define dgMsgKanji8C53Tex "__OTR__textures/kanji/gMsgKanji8C53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C53Tex[] = dgMsgKanji8C53Tex;
+
+#define dgMsgKanji8C54Tex "__OTR__textures/kanji/gMsgKanji8C54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C54Tex[] = dgMsgKanji8C54Tex;
+
+#define dgMsgKanji8C55Tex "__OTR__textures/kanji/gMsgKanji8C55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C55Tex[] = dgMsgKanji8C55Tex;
+
+#define dgMsgKanji8C56Tex "__OTR__textures/kanji/gMsgKanji8C56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C56Tex[] = dgMsgKanji8C56Tex;
+
+#define dgMsgKanji8C57Tex "__OTR__textures/kanji/gMsgKanji8C57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C57Tex[] = dgMsgKanji8C57Tex;
+
+#define dgMsgKanji8C58Tex "__OTR__textures/kanji/gMsgKanji8C58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C58Tex[] = dgMsgKanji8C58Tex;
+
+#define dgMsgKanji8C59Tex "__OTR__textures/kanji/gMsgKanji8C59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C59Tex[] = dgMsgKanji8C59Tex;
+
+#define dgMsgKanji8C5ATex "__OTR__textures/kanji/gMsgKanji8C5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5ATex[] = dgMsgKanji8C5ATex;
+
+#define dgMsgKanji8C5BTex "__OTR__textures/kanji/gMsgKanji8C5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5BTex[] = dgMsgKanji8C5BTex;
+
+#define dgMsgKanji8C5CTex "__OTR__textures/kanji/gMsgKanji8C5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5CTex[] = dgMsgKanji8C5CTex;
+
+#define dgMsgKanji8C5DTex "__OTR__textures/kanji/gMsgKanji8C5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5DTex[] = dgMsgKanji8C5DTex;
+
+#define dgMsgKanji8C5ETex "__OTR__textures/kanji/gMsgKanji8C5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5ETex[] = dgMsgKanji8C5ETex;
+
+#define dgMsgKanji8C5FTex "__OTR__textures/kanji/gMsgKanji8C5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C5FTex[] = dgMsgKanji8C5FTex;
+
+#define dgMsgKanji8C60Tex "__OTR__textures/kanji/gMsgKanji8C60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C60Tex[] = dgMsgKanji8C60Tex;
+
+#define dgMsgKanji8C61Tex "__OTR__textures/kanji/gMsgKanji8C61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C61Tex[] = dgMsgKanji8C61Tex;
+
+#define dgMsgKanji8C62Tex "__OTR__textures/kanji/gMsgKanji8C62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C62Tex[] = dgMsgKanji8C62Tex;
+
+#define dgMsgKanji8C63Tex "__OTR__textures/kanji/gMsgKanji8C63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C63Tex[] = dgMsgKanji8C63Tex;
+
+#define dgMsgKanji8C64Tex "__OTR__textures/kanji/gMsgKanji8C64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C64Tex[] = dgMsgKanji8C64Tex;
+
+#define dgMsgKanji8C65Tex "__OTR__textures/kanji/gMsgKanji8C65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C65Tex[] = dgMsgKanji8C65Tex;
+
+#define dgMsgKanji8C66Tex "__OTR__textures/kanji/gMsgKanji8C66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C66Tex[] = dgMsgKanji8C66Tex;
+
+#define dgMsgKanji8C67Tex "__OTR__textures/kanji/gMsgKanji8C67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C67Tex[] = dgMsgKanji8C67Tex;
+
+#define dgMsgKanji8C68Tex "__OTR__textures/kanji/gMsgKanji8C68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C68Tex[] = dgMsgKanji8C68Tex;
+
+#define dgMsgKanji8C69Tex "__OTR__textures/kanji/gMsgKanji8C69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C69Tex[] = dgMsgKanji8C69Tex;
+
+#define dgMsgKanji8C6ATex "__OTR__textures/kanji/gMsgKanji8C6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6ATex[] = dgMsgKanji8C6ATex;
+
+#define dgMsgKanji8C6BTex "__OTR__textures/kanji/gMsgKanji8C6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6BTex[] = dgMsgKanji8C6BTex;
+
+#define dgMsgKanji8C6CTex "__OTR__textures/kanji/gMsgKanji8C6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6CTex[] = dgMsgKanji8C6CTex;
+
+#define dgMsgKanji8C6DTex "__OTR__textures/kanji/gMsgKanji8C6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6DTex[] = dgMsgKanji8C6DTex;
+
+#define dgMsgKanji8C6ETex "__OTR__textures/kanji/gMsgKanji8C6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6ETex[] = dgMsgKanji8C6ETex;
+
+#define dgMsgKanji8C6FTex "__OTR__textures/kanji/gMsgKanji8C6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C6FTex[] = dgMsgKanji8C6FTex;
+
+#define dgMsgKanji8C70Tex "__OTR__textures/kanji/gMsgKanji8C70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C70Tex[] = dgMsgKanji8C70Tex;
+
+#define dgMsgKanji8C71Tex "__OTR__textures/kanji/gMsgKanji8C71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C71Tex[] = dgMsgKanji8C71Tex;
+
+#define dgMsgKanji8C72Tex "__OTR__textures/kanji/gMsgKanji8C72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C72Tex[] = dgMsgKanji8C72Tex;
+
+#define dgMsgKanji8C73Tex "__OTR__textures/kanji/gMsgKanji8C73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C73Tex[] = dgMsgKanji8C73Tex;
+
+#define dgMsgKanji8C74Tex "__OTR__textures/kanji/gMsgKanji8C74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C74Tex[] = dgMsgKanji8C74Tex;
+
+#define dgMsgKanji8C75Tex "__OTR__textures/kanji/gMsgKanji8C75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C75Tex[] = dgMsgKanji8C75Tex;
+
+#define dgMsgKanji8C76Tex "__OTR__textures/kanji/gMsgKanji8C76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C76Tex[] = dgMsgKanji8C76Tex;
+
+#define dgMsgKanji8C77Tex "__OTR__textures/kanji/gMsgKanji8C77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C77Tex[] = dgMsgKanji8C77Tex;
+
+#define dgMsgKanji8C78Tex "__OTR__textures/kanji/gMsgKanji8C78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C78Tex[] = dgMsgKanji8C78Tex;
+
+#define dgMsgKanji8C79Tex "__OTR__textures/kanji/gMsgKanji8C79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C79Tex[] = dgMsgKanji8C79Tex;
+
+#define dgMsgKanji8C7ATex "__OTR__textures/kanji/gMsgKanji8C7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C7ATex[] = dgMsgKanji8C7ATex;
+
+#define dgMsgKanji8C7BTex "__OTR__textures/kanji/gMsgKanji8C7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C7BTex[] = dgMsgKanji8C7BTex;
+
+#define dgMsgKanji8C7CTex "__OTR__textures/kanji/gMsgKanji8C7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C7CTex[] = dgMsgKanji8C7CTex;
+
+#define dgMsgKanji8C7DTex "__OTR__textures/kanji/gMsgKanji8C7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C7DTex[] = dgMsgKanji8C7DTex;
+
+#define dgMsgKanji8C7ETex "__OTR__textures/kanji/gMsgKanji8C7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C7ETex[] = dgMsgKanji8C7ETex;
+
+#define dgMsgKanji8C80Tex "__OTR__textures/kanji/gMsgKanji8C80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C80Tex[] = dgMsgKanji8C80Tex;
+
+#define dgMsgKanji8C81Tex "__OTR__textures/kanji/gMsgKanji8C81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C81Tex[] = dgMsgKanji8C81Tex;
+
+#define dgMsgKanji8C82Tex "__OTR__textures/kanji/gMsgKanji8C82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C82Tex[] = dgMsgKanji8C82Tex;
+
+#define dgMsgKanji8C83Tex "__OTR__textures/kanji/gMsgKanji8C83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C83Tex[] = dgMsgKanji8C83Tex;
+
+#define dgMsgKanji8C84Tex "__OTR__textures/kanji/gMsgKanji8C84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C84Tex[] = dgMsgKanji8C84Tex;
+
+#define dgMsgKanji8C85Tex "__OTR__textures/kanji/gMsgKanji8C85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C85Tex[] = dgMsgKanji8C85Tex;
+
+#define dgMsgKanji8C86Tex "__OTR__textures/kanji/gMsgKanji8C86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C86Tex[] = dgMsgKanji8C86Tex;
+
+#define dgMsgKanji8C87Tex "__OTR__textures/kanji/gMsgKanji8C87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C87Tex[] = dgMsgKanji8C87Tex;
+
+#define dgMsgKanji8C88Tex "__OTR__textures/kanji/gMsgKanji8C88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C88Tex[] = dgMsgKanji8C88Tex;
+
+#define dgMsgKanji8C89Tex "__OTR__textures/kanji/gMsgKanji8C89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C89Tex[] = dgMsgKanji8C89Tex;
+
+#define dgMsgKanji8C8ATex "__OTR__textures/kanji/gMsgKanji8C8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8ATex[] = dgMsgKanji8C8ATex;
+
+#define dgMsgKanji8C8BTex "__OTR__textures/kanji/gMsgKanji8C8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8BTex[] = dgMsgKanji8C8BTex;
+
+#define dgMsgKanji8C8CTex "__OTR__textures/kanji/gMsgKanji8C8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8CTex[] = dgMsgKanji8C8CTex;
+
+#define dgMsgKanji8C8DTex "__OTR__textures/kanji/gMsgKanji8C8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8DTex[] = dgMsgKanji8C8DTex;
+
+#define dgMsgKanji8C8ETex "__OTR__textures/kanji/gMsgKanji8C8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8ETex[] = dgMsgKanji8C8ETex;
+
+#define dgMsgKanji8C8FTex "__OTR__textures/kanji/gMsgKanji8C8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C8FTex[] = dgMsgKanji8C8FTex;
+
+#define dgMsgKanji8C90Tex "__OTR__textures/kanji/gMsgKanji8C90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C90Tex[] = dgMsgKanji8C90Tex;
+
+#define dgMsgKanji8C91Tex "__OTR__textures/kanji/gMsgKanji8C91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C91Tex[] = dgMsgKanji8C91Tex;
+
+#define dgMsgKanji8C92Tex "__OTR__textures/kanji/gMsgKanji8C92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C92Tex[] = dgMsgKanji8C92Tex;
+
+#define dgMsgKanji8C93Tex "__OTR__textures/kanji/gMsgKanji8C93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C93Tex[] = dgMsgKanji8C93Tex;
+
+#define dgMsgKanji8C94Tex "__OTR__textures/kanji/gMsgKanji8C94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C94Tex[] = dgMsgKanji8C94Tex;
+
+#define dgMsgKanji8C95Tex "__OTR__textures/kanji/gMsgKanji8C95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C95Tex[] = dgMsgKanji8C95Tex;
+
+#define dgMsgKanji8C96Tex "__OTR__textures/kanji/gMsgKanji8C96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C96Tex[] = dgMsgKanji8C96Tex;
+
+#define dgMsgKanji8C97Tex "__OTR__textures/kanji/gMsgKanji8C97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C97Tex[] = dgMsgKanji8C97Tex;
+
+#define dgMsgKanji8C98Tex "__OTR__textures/kanji/gMsgKanji8C98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C98Tex[] = dgMsgKanji8C98Tex;
+
+#define dgMsgKanji8C99Tex "__OTR__textures/kanji/gMsgKanji8C99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8C99Tex[] = dgMsgKanji8C99Tex;
+
+#define dgMsgKanji8C9ATex "__OTR__textures/kanji/gMsgKanji8C9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9ATex[] = dgMsgKanji8C9ATex;
+
+#define dgMsgKanji8C9BTex "__OTR__textures/kanji/gMsgKanji8C9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9BTex[] = dgMsgKanji8C9BTex;
+
+#define dgMsgKanji8C9CTex "__OTR__textures/kanji/gMsgKanji8C9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9CTex[] = dgMsgKanji8C9CTex;
+
+#define dgMsgKanji8C9DTex "__OTR__textures/kanji/gMsgKanji8C9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9DTex[] = dgMsgKanji8C9DTex;
+
+#define dgMsgKanji8C9ETex "__OTR__textures/kanji/gMsgKanji8C9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9ETex[] = dgMsgKanji8C9ETex;
+
+#define dgMsgKanji8C9FTex "__OTR__textures/kanji/gMsgKanji8C9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8C9FTex[] = dgMsgKanji8C9FTex;
+
+#define dgMsgKanji8CA0Tex "__OTR__textures/kanji/gMsgKanji8CA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA0Tex[] = dgMsgKanji8CA0Tex;
+
+#define dgMsgKanji8CA1Tex "__OTR__textures/kanji/gMsgKanji8CA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA1Tex[] = dgMsgKanji8CA1Tex;
+
+#define dgMsgKanji8CA2Tex "__OTR__textures/kanji/gMsgKanji8CA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA2Tex[] = dgMsgKanji8CA2Tex;
+
+#define dgMsgKanji8CA3Tex "__OTR__textures/kanji/gMsgKanji8CA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA3Tex[] = dgMsgKanji8CA3Tex;
+
+#define dgMsgKanji8CA4Tex "__OTR__textures/kanji/gMsgKanji8CA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA4Tex[] = dgMsgKanji8CA4Tex;
+
+#define dgMsgKanji8CA5Tex "__OTR__textures/kanji/gMsgKanji8CA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA5Tex[] = dgMsgKanji8CA5Tex;
+
+#define dgMsgKanji8CA6Tex "__OTR__textures/kanji/gMsgKanji8CA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA6Tex[] = dgMsgKanji8CA6Tex;
+
+#define dgMsgKanji8CA7Tex "__OTR__textures/kanji/gMsgKanji8CA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA7Tex[] = dgMsgKanji8CA7Tex;
+
+#define dgMsgKanji8CA8Tex "__OTR__textures/kanji/gMsgKanji8CA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA8Tex[] = dgMsgKanji8CA8Tex;
+
+#define dgMsgKanji8CA9Tex "__OTR__textures/kanji/gMsgKanji8CA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CA9Tex[] = dgMsgKanji8CA9Tex;
+
+#define dgMsgKanji8CAATex "__OTR__textures/kanji/gMsgKanji8CAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CAATex[] = dgMsgKanji8CAATex;
+
+#define dgMsgKanji8CABTex "__OTR__textures/kanji/gMsgKanji8CABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CABTex[] = dgMsgKanji8CABTex;
+
+#define dgMsgKanji8CACTex "__OTR__textures/kanji/gMsgKanji8CACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CACTex[] = dgMsgKanji8CACTex;
+
+#define dgMsgKanji8CADTex "__OTR__textures/kanji/gMsgKanji8CADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CADTex[] = dgMsgKanji8CADTex;
+
+#define dgMsgKanji8CAETex "__OTR__textures/kanji/gMsgKanji8CAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8CAETex[] = dgMsgKanji8CAETex;
+
+#define dgMsgKanji8CAFTex "__OTR__textures/kanji/gMsgKanji8CAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CAFTex[] = dgMsgKanji8CAFTex;
+
+#define dgMsgKanji8CB0Tex "__OTR__textures/kanji/gMsgKanji8CB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB0Tex[] = dgMsgKanji8CB0Tex;
+
+#define dgMsgKanji8CB1Tex "__OTR__textures/kanji/gMsgKanji8CB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB1Tex[] = dgMsgKanji8CB1Tex;
+
+#define dgMsgKanji8CB2Tex "__OTR__textures/kanji/gMsgKanji8CB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB2Tex[] = dgMsgKanji8CB2Tex;
+
+#define dgMsgKanji8CB3Tex "__OTR__textures/kanji/gMsgKanji8CB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB3Tex[] = dgMsgKanji8CB3Tex;
+
+#define dgMsgKanji8CB4Tex "__OTR__textures/kanji/gMsgKanji8CB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB4Tex[] = dgMsgKanji8CB4Tex;
+
+#define dgMsgKanji8CB5Tex "__OTR__textures/kanji/gMsgKanji8CB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB5Tex[] = dgMsgKanji8CB5Tex;
+
+#define dgMsgKanji8CB6Tex "__OTR__textures/kanji/gMsgKanji8CB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB6Tex[] = dgMsgKanji8CB6Tex;
+
+#define dgMsgKanji8CB7Tex "__OTR__textures/kanji/gMsgKanji8CB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB7Tex[] = dgMsgKanji8CB7Tex;
+
+#define dgMsgKanji8CB8Tex "__OTR__textures/kanji/gMsgKanji8CB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB8Tex[] = dgMsgKanji8CB8Tex;
+
+#define dgMsgKanji8CB9Tex "__OTR__textures/kanji/gMsgKanji8CB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CB9Tex[] = dgMsgKanji8CB9Tex;
+
+#define dgMsgKanji8CBATex "__OTR__textures/kanji/gMsgKanji8CBATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBATex[] = dgMsgKanji8CBATex;
+
+#define dgMsgKanji8CBBTex "__OTR__textures/kanji/gMsgKanji8CBBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBBTex[] = dgMsgKanji8CBBTex;
+
+#define dgMsgKanji8CBCTex "__OTR__textures/kanji/gMsgKanji8CBCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBCTex[] = dgMsgKanji8CBCTex;
+
+#define dgMsgKanji8CBDTex "__OTR__textures/kanji/gMsgKanji8CBDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBDTex[] = dgMsgKanji8CBDTex;
+
+#define dgMsgKanji8CBETex "__OTR__textures/kanji/gMsgKanji8CBETex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBETex[] = dgMsgKanji8CBETex;
+
+#define dgMsgKanji8CBFTex "__OTR__textures/kanji/gMsgKanji8CBFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CBFTex[] = dgMsgKanji8CBFTex;
+
+#define dgMsgKanji8CC0Tex "__OTR__textures/kanji/gMsgKanji8CC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC0Tex[] = dgMsgKanji8CC0Tex;
+
+#define dgMsgKanji8CC1Tex "__OTR__textures/kanji/gMsgKanji8CC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC1Tex[] = dgMsgKanji8CC1Tex;
+
+#define dgMsgKanji8CC2Tex "__OTR__textures/kanji/gMsgKanji8CC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC2Tex[] = dgMsgKanji8CC2Tex;
+
+#define dgMsgKanji8CC3Tex "__OTR__textures/kanji/gMsgKanji8CC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC3Tex[] = dgMsgKanji8CC3Tex;
+
+#define dgMsgKanji8CC4Tex "__OTR__textures/kanji/gMsgKanji8CC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC4Tex[] = dgMsgKanji8CC4Tex;
+
+#define dgMsgKanji8CC5Tex "__OTR__textures/kanji/gMsgKanji8CC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC5Tex[] = dgMsgKanji8CC5Tex;
+
+#define dgMsgKanji8CC6Tex "__OTR__textures/kanji/gMsgKanji8CC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC6Tex[] = dgMsgKanji8CC6Tex;
+
+#define dgMsgKanji8CC7Tex "__OTR__textures/kanji/gMsgKanji8CC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC7Tex[] = dgMsgKanji8CC7Tex;
+
+#define dgMsgKanji8CC8Tex "__OTR__textures/kanji/gMsgKanji8CC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC8Tex[] = dgMsgKanji8CC8Tex;
+
+#define dgMsgKanji8CC9Tex "__OTR__textures/kanji/gMsgKanji8CC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CC9Tex[] = dgMsgKanji8CC9Tex;
+
+#define dgMsgKanji8CCATex "__OTR__textures/kanji/gMsgKanji8CCATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCATex[] = dgMsgKanji8CCATex;
+
+#define dgMsgKanji8CCBTex "__OTR__textures/kanji/gMsgKanji8CCBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCBTex[] = dgMsgKanji8CCBTex;
+
+#define dgMsgKanji8CCCTex "__OTR__textures/kanji/gMsgKanji8CCCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCCTex[] = dgMsgKanji8CCCTex;
+
+#define dgMsgKanji8CCDTex "__OTR__textures/kanji/gMsgKanji8CCDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCDTex[] = dgMsgKanji8CCDTex;
+
+#define dgMsgKanji8CCETex "__OTR__textures/kanji/gMsgKanji8CCETex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCETex[] = dgMsgKanji8CCETex;
+
+#define dgMsgKanji8CCFTex "__OTR__textures/kanji/gMsgKanji8CCFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CCFTex[] = dgMsgKanji8CCFTex;
+
+#define dgMsgKanji8CD0Tex "__OTR__textures/kanji/gMsgKanji8CD0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD0Tex[] = dgMsgKanji8CD0Tex;
+
+#define dgMsgKanji8CD1Tex "__OTR__textures/kanji/gMsgKanji8CD1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD1Tex[] = dgMsgKanji8CD1Tex;
+
+#define dgMsgKanji8CD2Tex "__OTR__textures/kanji/gMsgKanji8CD2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD2Tex[] = dgMsgKanji8CD2Tex;
+
+#define dgMsgKanji8CD3Tex "__OTR__textures/kanji/gMsgKanji8CD3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD3Tex[] = dgMsgKanji8CD3Tex;
+
+#define dgMsgKanji8CD4Tex "__OTR__textures/kanji/gMsgKanji8CD4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD4Tex[] = dgMsgKanji8CD4Tex;
+
+#define dgMsgKanji8CD5Tex "__OTR__textures/kanji/gMsgKanji8CD5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD5Tex[] = dgMsgKanji8CD5Tex;
+
+#define dgMsgKanji8CD6Tex "__OTR__textures/kanji/gMsgKanji8CD6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD6Tex[] = dgMsgKanji8CD6Tex;
+
+#define dgMsgKanji8CD7Tex "__OTR__textures/kanji/gMsgKanji8CD7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD7Tex[] = dgMsgKanji8CD7Tex;
+
+#define dgMsgKanji8CD8Tex "__OTR__textures/kanji/gMsgKanji8CD8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD8Tex[] = dgMsgKanji8CD8Tex;
+
+#define dgMsgKanji8CD9Tex "__OTR__textures/kanji/gMsgKanji8CD9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CD9Tex[] = dgMsgKanji8CD9Tex;
+
+#define dgMsgKanji8CDATex "__OTR__textures/kanji/gMsgKanji8CDATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDATex[] = dgMsgKanji8CDATex;
+
+#define dgMsgKanji8CDBTex "__OTR__textures/kanji/gMsgKanji8CDBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDBTex[] = dgMsgKanji8CDBTex;
+
+#define dgMsgKanji8CDCTex "__OTR__textures/kanji/gMsgKanji8CDCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDCTex[] = dgMsgKanji8CDCTex;
+
+#define dgMsgKanji8CDDTex "__OTR__textures/kanji/gMsgKanji8CDDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDDTex[] = dgMsgKanji8CDDTex;
+
+#define dgMsgKanji8CDETex "__OTR__textures/kanji/gMsgKanji8CDETex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDETex[] = dgMsgKanji8CDETex;
+
+#define dgMsgKanji8CDFTex "__OTR__textures/kanji/gMsgKanji8CDFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CDFTex[] = dgMsgKanji8CDFTex;
+
+#define dgMsgKanji8CE0Tex "__OTR__textures/kanji/gMsgKanji8CE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE0Tex[] = dgMsgKanji8CE0Tex;
+
+#define dgMsgKanji8CE1Tex "__OTR__textures/kanji/gMsgKanji8CE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE1Tex[] = dgMsgKanji8CE1Tex;
+
+#define dgMsgKanji8CE2Tex "__OTR__textures/kanji/gMsgKanji8CE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE2Tex[] = dgMsgKanji8CE2Tex;
+
+#define dgMsgKanji8CE3Tex "__OTR__textures/kanji/gMsgKanji8CE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE3Tex[] = dgMsgKanji8CE3Tex;
+
+#define dgMsgKanji8CE4Tex "__OTR__textures/kanji/gMsgKanji8CE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE4Tex[] = dgMsgKanji8CE4Tex;
+
+#define dgMsgKanji8CE5Tex "__OTR__textures/kanji/gMsgKanji8CE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE5Tex[] = dgMsgKanji8CE5Tex;
+
+#define dgMsgKanji8CE6Tex "__OTR__textures/kanji/gMsgKanji8CE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE6Tex[] = dgMsgKanji8CE6Tex;
+
+#define dgMsgKanji8CE7Tex "__OTR__textures/kanji/gMsgKanji8CE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE7Tex[] = dgMsgKanji8CE7Tex;
+
+#define dgMsgKanji8CE8Tex "__OTR__textures/kanji/gMsgKanji8CE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE8Tex[] = dgMsgKanji8CE8Tex;
+
+#define dgMsgKanji8CE9Tex "__OTR__textures/kanji/gMsgKanji8CE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CE9Tex[] = dgMsgKanji8CE9Tex;
+
+#define dgMsgKanji8CEATex "__OTR__textures/kanji/gMsgKanji8CEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CEATex[] = dgMsgKanji8CEATex;
+
+#define dgMsgKanji8CEBTex "__OTR__textures/kanji/gMsgKanji8CEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CEBTex[] = dgMsgKanji8CEBTex;
+
+#define dgMsgKanji8CECTex "__OTR__textures/kanji/gMsgKanji8CECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CECTex[] = dgMsgKanji8CECTex;
+
+#define dgMsgKanji8CEDTex "__OTR__textures/kanji/gMsgKanji8CEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CEDTex[] = dgMsgKanji8CEDTex;
+
+#define dgMsgKanji8CEETex "__OTR__textures/kanji/gMsgKanji8CEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8CEETex[] = dgMsgKanji8CEETex;
+
+#define dgMsgKanji8CEFTex "__OTR__textures/kanji/gMsgKanji8CEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CEFTex[] = dgMsgKanji8CEFTex;
+
+#define dgMsgKanji8CF0Tex "__OTR__textures/kanji/gMsgKanji8CF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF0Tex[] = dgMsgKanji8CF0Tex;
+
+#define dgMsgKanji8CF1Tex "__OTR__textures/kanji/gMsgKanji8CF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF1Tex[] = dgMsgKanji8CF1Tex;
+
+#define dgMsgKanji8CF2Tex "__OTR__textures/kanji/gMsgKanji8CF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF2Tex[] = dgMsgKanji8CF2Tex;
+
+#define dgMsgKanji8CF3Tex "__OTR__textures/kanji/gMsgKanji8CF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF3Tex[] = dgMsgKanji8CF3Tex;
+
+#define dgMsgKanji8CF4Tex "__OTR__textures/kanji/gMsgKanji8CF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF4Tex[] = dgMsgKanji8CF4Tex;
+
+#define dgMsgKanji8CF5Tex "__OTR__textures/kanji/gMsgKanji8CF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF5Tex[] = dgMsgKanji8CF5Tex;
+
+#define dgMsgKanji8CF6Tex "__OTR__textures/kanji/gMsgKanji8CF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF6Tex[] = dgMsgKanji8CF6Tex;
+
+#define dgMsgKanji8CF7Tex "__OTR__textures/kanji/gMsgKanji8CF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF7Tex[] = dgMsgKanji8CF7Tex;
+
+#define dgMsgKanji8CF8Tex "__OTR__textures/kanji/gMsgKanji8CF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF8Tex[] = dgMsgKanji8CF8Tex;
+
+#define dgMsgKanji8CF9Tex "__OTR__textures/kanji/gMsgKanji8CF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8CF9Tex[] = dgMsgKanji8CF9Tex;
+
+#define dgMsgKanji8CFATex "__OTR__textures/kanji/gMsgKanji8CFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8CFATex[] = dgMsgKanji8CFATex;
+
+#define dgMsgKanji8CFBTex "__OTR__textures/kanji/gMsgKanji8CFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CFBTex[] = dgMsgKanji8CFBTex;
+
+#define dgMsgKanji8CFCTex "__OTR__textures/kanji/gMsgKanji8CFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8CFCTex[] = dgMsgKanji8CFCTex;
+
+#define dgMsgKanji8D40Tex "__OTR__textures/kanji/gMsgKanji8D40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D40Tex[] = dgMsgKanji8D40Tex;
+
+#define dgMsgKanji8D41Tex "__OTR__textures/kanji/gMsgKanji8D41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D41Tex[] = dgMsgKanji8D41Tex;
+
+#define dgMsgKanji8D42Tex "__OTR__textures/kanji/gMsgKanji8D42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D42Tex[] = dgMsgKanji8D42Tex;
+
+#define dgMsgKanji8D43Tex "__OTR__textures/kanji/gMsgKanji8D43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D43Tex[] = dgMsgKanji8D43Tex;
+
+#define dgMsgKanji8D44Tex "__OTR__textures/kanji/gMsgKanji8D44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D44Tex[] = dgMsgKanji8D44Tex;
+
+#define dgMsgKanji8D45Tex "__OTR__textures/kanji/gMsgKanji8D45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D45Tex[] = dgMsgKanji8D45Tex;
+
+#define dgMsgKanji8D46Tex "__OTR__textures/kanji/gMsgKanji8D46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D46Tex[] = dgMsgKanji8D46Tex;
+
+#define dgMsgKanji8D47Tex "__OTR__textures/kanji/gMsgKanji8D47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D47Tex[] = dgMsgKanji8D47Tex;
+
+#define dgMsgKanji8D48Tex "__OTR__textures/kanji/gMsgKanji8D48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D48Tex[] = dgMsgKanji8D48Tex;
+
+#define dgMsgKanji8D49Tex "__OTR__textures/kanji/gMsgKanji8D49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D49Tex[] = dgMsgKanji8D49Tex;
+
+#define dgMsgKanji8D4ATex "__OTR__textures/kanji/gMsgKanji8D4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4ATex[] = dgMsgKanji8D4ATex;
+
+#define dgMsgKanji8D4BTex "__OTR__textures/kanji/gMsgKanji8D4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4BTex[] = dgMsgKanji8D4BTex;
+
+#define dgMsgKanji8D4CTex "__OTR__textures/kanji/gMsgKanji8D4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4CTex[] = dgMsgKanji8D4CTex;
+
+#define dgMsgKanji8D4DTex "__OTR__textures/kanji/gMsgKanji8D4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4DTex[] = dgMsgKanji8D4DTex;
+
+#define dgMsgKanji8D4ETex "__OTR__textures/kanji/gMsgKanji8D4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4ETex[] = dgMsgKanji8D4ETex;
+
+#define dgMsgKanji8D4FTex "__OTR__textures/kanji/gMsgKanji8D4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D4FTex[] = dgMsgKanji8D4FTex;
+
+#define dgMsgKanji8D50Tex "__OTR__textures/kanji/gMsgKanji8D50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D50Tex[] = dgMsgKanji8D50Tex;
+
+#define dgMsgKanji8D51Tex "__OTR__textures/kanji/gMsgKanji8D51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D51Tex[] = dgMsgKanji8D51Tex;
+
+#define dgMsgKanji8D52Tex "__OTR__textures/kanji/gMsgKanji8D52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D52Tex[] = dgMsgKanji8D52Tex;
+
+#define dgMsgKanji8D53Tex "__OTR__textures/kanji/gMsgKanji8D53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D53Tex[] = dgMsgKanji8D53Tex;
+
+#define dgMsgKanji8D54Tex "__OTR__textures/kanji/gMsgKanji8D54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D54Tex[] = dgMsgKanji8D54Tex;
+
+#define dgMsgKanji8D55Tex "__OTR__textures/kanji/gMsgKanji8D55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D55Tex[] = dgMsgKanji8D55Tex;
+
+#define dgMsgKanji8D56Tex "__OTR__textures/kanji/gMsgKanji8D56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D56Tex[] = dgMsgKanji8D56Tex;
+
+#define dgMsgKanji8D57Tex "__OTR__textures/kanji/gMsgKanji8D57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D57Tex[] = dgMsgKanji8D57Tex;
+
+#define dgMsgKanji8D58Tex "__OTR__textures/kanji/gMsgKanji8D58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D58Tex[] = dgMsgKanji8D58Tex;
+
+#define dgMsgKanji8D59Tex "__OTR__textures/kanji/gMsgKanji8D59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D59Tex[] = dgMsgKanji8D59Tex;
+
+#define dgMsgKanji8D5ATex "__OTR__textures/kanji/gMsgKanji8D5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5ATex[] = dgMsgKanji8D5ATex;
+
+#define dgMsgKanji8D5BTex "__OTR__textures/kanji/gMsgKanji8D5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5BTex[] = dgMsgKanji8D5BTex;
+
+#define dgMsgKanji8D5CTex "__OTR__textures/kanji/gMsgKanji8D5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5CTex[] = dgMsgKanji8D5CTex;
+
+#define dgMsgKanji8D5DTex "__OTR__textures/kanji/gMsgKanji8D5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5DTex[] = dgMsgKanji8D5DTex;
+
+#define dgMsgKanji8D5ETex "__OTR__textures/kanji/gMsgKanji8D5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5ETex[] = dgMsgKanji8D5ETex;
+
+#define dgMsgKanji8D5FTex "__OTR__textures/kanji/gMsgKanji8D5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D5FTex[] = dgMsgKanji8D5FTex;
+
+#define dgMsgKanji8D60Tex "__OTR__textures/kanji/gMsgKanji8D60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D60Tex[] = dgMsgKanji8D60Tex;
+
+#define dgMsgKanji8D61Tex "__OTR__textures/kanji/gMsgKanji8D61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D61Tex[] = dgMsgKanji8D61Tex;
+
+#define dgMsgKanji8D62Tex "__OTR__textures/kanji/gMsgKanji8D62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D62Tex[] = dgMsgKanji8D62Tex;
+
+#define dgMsgKanji8D63Tex "__OTR__textures/kanji/gMsgKanji8D63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D63Tex[] = dgMsgKanji8D63Tex;
+
+#define dgMsgKanji8D64Tex "__OTR__textures/kanji/gMsgKanji8D64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D64Tex[] = dgMsgKanji8D64Tex;
+
+#define dgMsgKanji8D65Tex "__OTR__textures/kanji/gMsgKanji8D65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D65Tex[] = dgMsgKanji8D65Tex;
+
+#define dgMsgKanji8D66Tex "__OTR__textures/kanji/gMsgKanji8D66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D66Tex[] = dgMsgKanji8D66Tex;
+
+#define dgMsgKanji8D67Tex "__OTR__textures/kanji/gMsgKanji8D67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D67Tex[] = dgMsgKanji8D67Tex;
+
+#define dgMsgKanji8D68Tex "__OTR__textures/kanji/gMsgKanji8D68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D68Tex[] = dgMsgKanji8D68Tex;
+
+#define dgMsgKanji8D69Tex "__OTR__textures/kanji/gMsgKanji8D69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D69Tex[] = dgMsgKanji8D69Tex;
+
+#define dgMsgKanji8D6ATex "__OTR__textures/kanji/gMsgKanji8D6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6ATex[] = dgMsgKanji8D6ATex;
+
+#define dgMsgKanji8D6BTex "__OTR__textures/kanji/gMsgKanji8D6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6BTex[] = dgMsgKanji8D6BTex;
+
+#define dgMsgKanji8D6CTex "__OTR__textures/kanji/gMsgKanji8D6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6CTex[] = dgMsgKanji8D6CTex;
+
+#define dgMsgKanji8D6DTex "__OTR__textures/kanji/gMsgKanji8D6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6DTex[] = dgMsgKanji8D6DTex;
+
+#define dgMsgKanji8D6ETex "__OTR__textures/kanji/gMsgKanji8D6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6ETex[] = dgMsgKanji8D6ETex;
+
+#define dgMsgKanji8D6FTex "__OTR__textures/kanji/gMsgKanji8D6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D6FTex[] = dgMsgKanji8D6FTex;
+
+#define dgMsgKanji8D70Tex "__OTR__textures/kanji/gMsgKanji8D70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D70Tex[] = dgMsgKanji8D70Tex;
+
+#define dgMsgKanji8D71Tex "__OTR__textures/kanji/gMsgKanji8D71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D71Tex[] = dgMsgKanji8D71Tex;
+
+#define dgMsgKanji8D72Tex "__OTR__textures/kanji/gMsgKanji8D72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D72Tex[] = dgMsgKanji8D72Tex;
+
+#define dgMsgKanji8D73Tex "__OTR__textures/kanji/gMsgKanji8D73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D73Tex[] = dgMsgKanji8D73Tex;
+
+#define dgMsgKanji8D74Tex "__OTR__textures/kanji/gMsgKanji8D74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D74Tex[] = dgMsgKanji8D74Tex;
+
+#define dgMsgKanji8D75Tex "__OTR__textures/kanji/gMsgKanji8D75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D75Tex[] = dgMsgKanji8D75Tex;
+
+#define dgMsgKanji8D76Tex "__OTR__textures/kanji/gMsgKanji8D76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D76Tex[] = dgMsgKanji8D76Tex;
+
+#define dgMsgKanji8D77Tex "__OTR__textures/kanji/gMsgKanji8D77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D77Tex[] = dgMsgKanji8D77Tex;
+
+#define dgMsgKanji8D78Tex "__OTR__textures/kanji/gMsgKanji8D78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D78Tex[] = dgMsgKanji8D78Tex;
+
+#define dgMsgKanji8D79Tex "__OTR__textures/kanji/gMsgKanji8D79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D79Tex[] = dgMsgKanji8D79Tex;
+
+#define dgMsgKanji8D7ATex "__OTR__textures/kanji/gMsgKanji8D7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D7ATex[] = dgMsgKanji8D7ATex;
+
+#define dgMsgKanji8D7BTex "__OTR__textures/kanji/gMsgKanji8D7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D7BTex[] = dgMsgKanji8D7BTex;
+
+#define dgMsgKanji8D7CTex "__OTR__textures/kanji/gMsgKanji8D7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D7CTex[] = dgMsgKanji8D7CTex;
+
+#define dgMsgKanji8D7DTex "__OTR__textures/kanji/gMsgKanji8D7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D7DTex[] = dgMsgKanji8D7DTex;
+
+#define dgMsgKanji8D7ETex "__OTR__textures/kanji/gMsgKanji8D7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D7ETex[] = dgMsgKanji8D7ETex;
+
+#define dgMsgKanji8D80Tex "__OTR__textures/kanji/gMsgKanji8D80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D80Tex[] = dgMsgKanji8D80Tex;
+
+#define dgMsgKanji8D81Tex "__OTR__textures/kanji/gMsgKanji8D81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D81Tex[] = dgMsgKanji8D81Tex;
+
+#define dgMsgKanji8D82Tex "__OTR__textures/kanji/gMsgKanji8D82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D82Tex[] = dgMsgKanji8D82Tex;
+
+#define dgMsgKanji8D83Tex "__OTR__textures/kanji/gMsgKanji8D83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D83Tex[] = dgMsgKanji8D83Tex;
+
+#define dgMsgKanji8D84Tex "__OTR__textures/kanji/gMsgKanji8D84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D84Tex[] = dgMsgKanji8D84Tex;
+
+#define dgMsgKanji8D85Tex "__OTR__textures/kanji/gMsgKanji8D85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D85Tex[] = dgMsgKanji8D85Tex;
+
+#define dgMsgKanji8D86Tex "__OTR__textures/kanji/gMsgKanji8D86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D86Tex[] = dgMsgKanji8D86Tex;
+
+#define dgMsgKanji8D87Tex "__OTR__textures/kanji/gMsgKanji8D87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D87Tex[] = dgMsgKanji8D87Tex;
+
+#define dgMsgKanji8D88Tex "__OTR__textures/kanji/gMsgKanji8D88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D88Tex[] = dgMsgKanji8D88Tex;
+
+#define dgMsgKanji8D89Tex "__OTR__textures/kanji/gMsgKanji8D89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D89Tex[] = dgMsgKanji8D89Tex;
+
+#define dgMsgKanji8D8ATex "__OTR__textures/kanji/gMsgKanji8D8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8ATex[] = dgMsgKanji8D8ATex;
+
+#define dgMsgKanji8D8BTex "__OTR__textures/kanji/gMsgKanji8D8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8BTex[] = dgMsgKanji8D8BTex;
+
+#define dgMsgKanji8D8CTex "__OTR__textures/kanji/gMsgKanji8D8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8CTex[] = dgMsgKanji8D8CTex;
+
+#define dgMsgKanji8D8DTex "__OTR__textures/kanji/gMsgKanji8D8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8DTex[] = dgMsgKanji8D8DTex;
+
+#define dgMsgKanji8D8ETex "__OTR__textures/kanji/gMsgKanji8D8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8ETex[] = dgMsgKanji8D8ETex;
+
+#define dgMsgKanji8D8FTex "__OTR__textures/kanji/gMsgKanji8D8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D8FTex[] = dgMsgKanji8D8FTex;
+
+#define dgMsgKanji8D90Tex "__OTR__textures/kanji/gMsgKanji8D90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D90Tex[] = dgMsgKanji8D90Tex;
+
+#define dgMsgKanji8D91Tex "__OTR__textures/kanji/gMsgKanji8D91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D91Tex[] = dgMsgKanji8D91Tex;
+
+#define dgMsgKanji8D92Tex "__OTR__textures/kanji/gMsgKanji8D92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D92Tex[] = dgMsgKanji8D92Tex;
+
+#define dgMsgKanji8D93Tex "__OTR__textures/kanji/gMsgKanji8D93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D93Tex[] = dgMsgKanji8D93Tex;
+
+#define dgMsgKanji8D94Tex "__OTR__textures/kanji/gMsgKanji8D94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D94Tex[] = dgMsgKanji8D94Tex;
+
+#define dgMsgKanji8D95Tex "__OTR__textures/kanji/gMsgKanji8D95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D95Tex[] = dgMsgKanji8D95Tex;
+
+#define dgMsgKanji8D96Tex "__OTR__textures/kanji/gMsgKanji8D96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D96Tex[] = dgMsgKanji8D96Tex;
+
+#define dgMsgKanji8D97Tex "__OTR__textures/kanji/gMsgKanji8D97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D97Tex[] = dgMsgKanji8D97Tex;
+
+#define dgMsgKanji8D98Tex "__OTR__textures/kanji/gMsgKanji8D98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D98Tex[] = dgMsgKanji8D98Tex;
+
+#define dgMsgKanji8D99Tex "__OTR__textures/kanji/gMsgKanji8D99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8D99Tex[] = dgMsgKanji8D99Tex;
+
+#define dgMsgKanji8D9ATex "__OTR__textures/kanji/gMsgKanji8D9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9ATex[] = dgMsgKanji8D9ATex;
+
+#define dgMsgKanji8D9BTex "__OTR__textures/kanji/gMsgKanji8D9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9BTex[] = dgMsgKanji8D9BTex;
+
+#define dgMsgKanji8D9CTex "__OTR__textures/kanji/gMsgKanji8D9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9CTex[] = dgMsgKanji8D9CTex;
+
+#define dgMsgKanji8D9DTex "__OTR__textures/kanji/gMsgKanji8D9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9DTex[] = dgMsgKanji8D9DTex;
+
+#define dgMsgKanji8D9ETex "__OTR__textures/kanji/gMsgKanji8D9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9ETex[] = dgMsgKanji8D9ETex;
+
+#define dgMsgKanji8D9FTex "__OTR__textures/kanji/gMsgKanji8D9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8D9FTex[] = dgMsgKanji8D9FTex;
+
+#define dgMsgKanji8DA0Tex "__OTR__textures/kanji/gMsgKanji8DA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA0Tex[] = dgMsgKanji8DA0Tex;
+
+#define dgMsgKanji8DA1Tex "__OTR__textures/kanji/gMsgKanji8DA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA1Tex[] = dgMsgKanji8DA1Tex;
+
+#define dgMsgKanji8DA2Tex "__OTR__textures/kanji/gMsgKanji8DA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA2Tex[] = dgMsgKanji8DA2Tex;
+
+#define dgMsgKanji8DA3Tex "__OTR__textures/kanji/gMsgKanji8DA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA3Tex[] = dgMsgKanji8DA3Tex;
+
+#define dgMsgKanji8DA4Tex "__OTR__textures/kanji/gMsgKanji8DA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA4Tex[] = dgMsgKanji8DA4Tex;
+
+#define dgMsgKanji8DA5Tex "__OTR__textures/kanji/gMsgKanji8DA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA5Tex[] = dgMsgKanji8DA5Tex;
+
+#define dgMsgKanji8DA6Tex "__OTR__textures/kanji/gMsgKanji8DA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA6Tex[] = dgMsgKanji8DA6Tex;
+
+#define dgMsgKanji8DA7Tex "__OTR__textures/kanji/gMsgKanji8DA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA7Tex[] = dgMsgKanji8DA7Tex;
+
+#define dgMsgKanji8DA8Tex "__OTR__textures/kanji/gMsgKanji8DA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA8Tex[] = dgMsgKanji8DA8Tex;
+
+#define dgMsgKanji8DA9Tex "__OTR__textures/kanji/gMsgKanji8DA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DA9Tex[] = dgMsgKanji8DA9Tex;
+
+#define dgMsgKanji8DAATex "__OTR__textures/kanji/gMsgKanji8DAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DAATex[] = dgMsgKanji8DAATex;
+
+#define dgMsgKanji8DABTex "__OTR__textures/kanji/gMsgKanji8DABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DABTex[] = dgMsgKanji8DABTex;
+
+#define dgMsgKanji8DACTex "__OTR__textures/kanji/gMsgKanji8DACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DACTex[] = dgMsgKanji8DACTex;
+
+#define dgMsgKanji8DADTex "__OTR__textures/kanji/gMsgKanji8DADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DADTex[] = dgMsgKanji8DADTex;
+
+#define dgMsgKanji8DAETex "__OTR__textures/kanji/gMsgKanji8DAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8DAETex[] = dgMsgKanji8DAETex;
+
+#define dgMsgKanji8DAFTex "__OTR__textures/kanji/gMsgKanji8DAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DAFTex[] = dgMsgKanji8DAFTex;
+
+#define dgMsgKanji8DB0Tex "__OTR__textures/kanji/gMsgKanji8DB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB0Tex[] = dgMsgKanji8DB0Tex;
+
+#define dgMsgKanji8DB1Tex "__OTR__textures/kanji/gMsgKanji8DB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB1Tex[] = dgMsgKanji8DB1Tex;
+
+#define dgMsgKanji8DB2Tex "__OTR__textures/kanji/gMsgKanji8DB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB2Tex[] = dgMsgKanji8DB2Tex;
+
+#define dgMsgKanji8DB3Tex "__OTR__textures/kanji/gMsgKanji8DB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB3Tex[] = dgMsgKanji8DB3Tex;
+
+#define dgMsgKanji8DB4Tex "__OTR__textures/kanji/gMsgKanji8DB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB4Tex[] = dgMsgKanji8DB4Tex;
+
+#define dgMsgKanji8DB5Tex "__OTR__textures/kanji/gMsgKanji8DB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB5Tex[] = dgMsgKanji8DB5Tex;
+
+#define dgMsgKanji8DB6Tex "__OTR__textures/kanji/gMsgKanji8DB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB6Tex[] = dgMsgKanji8DB6Tex;
+
+#define dgMsgKanji8DB7Tex "__OTR__textures/kanji/gMsgKanji8DB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB7Tex[] = dgMsgKanji8DB7Tex;
+
+#define dgMsgKanji8DB8Tex "__OTR__textures/kanji/gMsgKanji8DB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB8Tex[] = dgMsgKanji8DB8Tex;
+
+#define dgMsgKanji8DB9Tex "__OTR__textures/kanji/gMsgKanji8DB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DB9Tex[] = dgMsgKanji8DB9Tex;
+
+#define dgMsgKanji8DBATex "__OTR__textures/kanji/gMsgKanji8DBATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBATex[] = dgMsgKanji8DBATex;
+
+#define dgMsgKanji8DBBTex "__OTR__textures/kanji/gMsgKanji8DBBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBBTex[] = dgMsgKanji8DBBTex;
+
+#define dgMsgKanji8DBCTex "__OTR__textures/kanji/gMsgKanji8DBCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBCTex[] = dgMsgKanji8DBCTex;
+
+#define dgMsgKanji8DBDTex "__OTR__textures/kanji/gMsgKanji8DBDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBDTex[] = dgMsgKanji8DBDTex;
+
+#define dgMsgKanji8DBETex "__OTR__textures/kanji/gMsgKanji8DBETex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBETex[] = dgMsgKanji8DBETex;
+
+#define dgMsgKanji8DBFTex "__OTR__textures/kanji/gMsgKanji8DBFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DBFTex[] = dgMsgKanji8DBFTex;
+
+#define dgMsgKanji8DC0Tex "__OTR__textures/kanji/gMsgKanji8DC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC0Tex[] = dgMsgKanji8DC0Tex;
+
+#define dgMsgKanji8DC1Tex "__OTR__textures/kanji/gMsgKanji8DC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC1Tex[] = dgMsgKanji8DC1Tex;
+
+#define dgMsgKanji8DC2Tex "__OTR__textures/kanji/gMsgKanji8DC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC2Tex[] = dgMsgKanji8DC2Tex;
+
+#define dgMsgKanji8DC3Tex "__OTR__textures/kanji/gMsgKanji8DC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC3Tex[] = dgMsgKanji8DC3Tex;
+
+#define dgMsgKanji8DC4Tex "__OTR__textures/kanji/gMsgKanji8DC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC4Tex[] = dgMsgKanji8DC4Tex;
+
+#define dgMsgKanji8DC5Tex "__OTR__textures/kanji/gMsgKanji8DC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC5Tex[] = dgMsgKanji8DC5Tex;
+
+#define dgMsgKanji8DC6Tex "__OTR__textures/kanji/gMsgKanji8DC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC6Tex[] = dgMsgKanji8DC6Tex;
+
+#define dgMsgKanji8DC7Tex "__OTR__textures/kanji/gMsgKanji8DC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC7Tex[] = dgMsgKanji8DC7Tex;
+
+#define dgMsgKanji8DC8Tex "__OTR__textures/kanji/gMsgKanji8DC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC8Tex[] = dgMsgKanji8DC8Tex;
+
+#define dgMsgKanji8DC9Tex "__OTR__textures/kanji/gMsgKanji8DC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DC9Tex[] = dgMsgKanji8DC9Tex;
+
+#define dgMsgKanji8DCATex "__OTR__textures/kanji/gMsgKanji8DCATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCATex[] = dgMsgKanji8DCATex;
+
+#define dgMsgKanji8DCBTex "__OTR__textures/kanji/gMsgKanji8DCBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCBTex[] = dgMsgKanji8DCBTex;
+
+#define dgMsgKanji8DCCTex "__OTR__textures/kanji/gMsgKanji8DCCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCCTex[] = dgMsgKanji8DCCTex;
+
+#define dgMsgKanji8DCDTex "__OTR__textures/kanji/gMsgKanji8DCDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCDTex[] = dgMsgKanji8DCDTex;
+
+#define dgMsgKanji8DCETex "__OTR__textures/kanji/gMsgKanji8DCETex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCETex[] = dgMsgKanji8DCETex;
+
+#define dgMsgKanji8DCFTex "__OTR__textures/kanji/gMsgKanji8DCFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DCFTex[] = dgMsgKanji8DCFTex;
+
+#define dgMsgKanji8DD0Tex "__OTR__textures/kanji/gMsgKanji8DD0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD0Tex[] = dgMsgKanji8DD0Tex;
+
+#define dgMsgKanji8DD1Tex "__OTR__textures/kanji/gMsgKanji8DD1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD1Tex[] = dgMsgKanji8DD1Tex;
+
+#define dgMsgKanji8DD2Tex "__OTR__textures/kanji/gMsgKanji8DD2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD2Tex[] = dgMsgKanji8DD2Tex;
+
+#define dgMsgKanji8DD3Tex "__OTR__textures/kanji/gMsgKanji8DD3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD3Tex[] = dgMsgKanji8DD3Tex;
+
+#define dgMsgKanji8DD4Tex "__OTR__textures/kanji/gMsgKanji8DD4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD4Tex[] = dgMsgKanji8DD4Tex;
+
+#define dgMsgKanji8DD5Tex "__OTR__textures/kanji/gMsgKanji8DD5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD5Tex[] = dgMsgKanji8DD5Tex;
+
+#define dgMsgKanji8DD6Tex "__OTR__textures/kanji/gMsgKanji8DD6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD6Tex[] = dgMsgKanji8DD6Tex;
+
+#define dgMsgKanji8DD7Tex "__OTR__textures/kanji/gMsgKanji8DD7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD7Tex[] = dgMsgKanji8DD7Tex;
+
+#define dgMsgKanji8DD8Tex "__OTR__textures/kanji/gMsgKanji8DD8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD8Tex[] = dgMsgKanji8DD8Tex;
+
+#define dgMsgKanji8DD9Tex "__OTR__textures/kanji/gMsgKanji8DD9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DD9Tex[] = dgMsgKanji8DD9Tex;
+
+#define dgMsgKanji8DDATex "__OTR__textures/kanji/gMsgKanji8DDATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDATex[] = dgMsgKanji8DDATex;
+
+#define dgMsgKanji8DDBTex "__OTR__textures/kanji/gMsgKanji8DDBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDBTex[] = dgMsgKanji8DDBTex;
+
+#define dgMsgKanji8DDCTex "__OTR__textures/kanji/gMsgKanji8DDCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDCTex[] = dgMsgKanji8DDCTex;
+
+#define dgMsgKanji8DDDTex "__OTR__textures/kanji/gMsgKanji8DDDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDDTex[] = dgMsgKanji8DDDTex;
+
+#define dgMsgKanji8DDETex "__OTR__textures/kanji/gMsgKanji8DDETex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDETex[] = dgMsgKanji8DDETex;
+
+#define dgMsgKanji8DDFTex "__OTR__textures/kanji/gMsgKanji8DDFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DDFTex[] = dgMsgKanji8DDFTex;
+
+#define dgMsgKanji8DE0Tex "__OTR__textures/kanji/gMsgKanji8DE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE0Tex[] = dgMsgKanji8DE0Tex;
+
+#define dgMsgKanji8DE1Tex "__OTR__textures/kanji/gMsgKanji8DE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE1Tex[] = dgMsgKanji8DE1Tex;
+
+#define dgMsgKanji8DE2Tex "__OTR__textures/kanji/gMsgKanji8DE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE2Tex[] = dgMsgKanji8DE2Tex;
+
+#define dgMsgKanji8DE3Tex "__OTR__textures/kanji/gMsgKanji8DE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE3Tex[] = dgMsgKanji8DE3Tex;
+
+#define dgMsgKanji8DE4Tex "__OTR__textures/kanji/gMsgKanji8DE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE4Tex[] = dgMsgKanji8DE4Tex;
+
+#define dgMsgKanji8DE5Tex "__OTR__textures/kanji/gMsgKanji8DE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE5Tex[] = dgMsgKanji8DE5Tex;
+
+#define dgMsgKanji8DE6Tex "__OTR__textures/kanji/gMsgKanji8DE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE6Tex[] = dgMsgKanji8DE6Tex;
+
+#define dgMsgKanji8DE7Tex "__OTR__textures/kanji/gMsgKanji8DE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE7Tex[] = dgMsgKanji8DE7Tex;
+
+#define dgMsgKanji8DE8Tex "__OTR__textures/kanji/gMsgKanji8DE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE8Tex[] = dgMsgKanji8DE8Tex;
+
+#define dgMsgKanji8DE9Tex "__OTR__textures/kanji/gMsgKanji8DE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DE9Tex[] = dgMsgKanji8DE9Tex;
+
+#define dgMsgKanji8DEATex "__OTR__textures/kanji/gMsgKanji8DEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DEATex[] = dgMsgKanji8DEATex;
+
+#define dgMsgKanji8DEBTex "__OTR__textures/kanji/gMsgKanji8DEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DEBTex[] = dgMsgKanji8DEBTex;
+
+#define dgMsgKanji8DECTex "__OTR__textures/kanji/gMsgKanji8DECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DECTex[] = dgMsgKanji8DECTex;
+
+#define dgMsgKanji8DEDTex "__OTR__textures/kanji/gMsgKanji8DEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DEDTex[] = dgMsgKanji8DEDTex;
+
+#define dgMsgKanji8DEETex "__OTR__textures/kanji/gMsgKanji8DEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8DEETex[] = dgMsgKanji8DEETex;
+
+#define dgMsgKanji8DEFTex "__OTR__textures/kanji/gMsgKanji8DEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DEFTex[] = dgMsgKanji8DEFTex;
+
+#define dgMsgKanji8DF0Tex "__OTR__textures/kanji/gMsgKanji8DF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF0Tex[] = dgMsgKanji8DF0Tex;
+
+#define dgMsgKanji8DF1Tex "__OTR__textures/kanji/gMsgKanji8DF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF1Tex[] = dgMsgKanji8DF1Tex;
+
+#define dgMsgKanji8DF2Tex "__OTR__textures/kanji/gMsgKanji8DF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF2Tex[] = dgMsgKanji8DF2Tex;
+
+#define dgMsgKanji8DF3Tex "__OTR__textures/kanji/gMsgKanji8DF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF3Tex[] = dgMsgKanji8DF3Tex;
+
+#define dgMsgKanji8DF4Tex "__OTR__textures/kanji/gMsgKanji8DF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF4Tex[] = dgMsgKanji8DF4Tex;
+
+#define dgMsgKanji8DF5Tex "__OTR__textures/kanji/gMsgKanji8DF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF5Tex[] = dgMsgKanji8DF5Tex;
+
+#define dgMsgKanji8DF6Tex "__OTR__textures/kanji/gMsgKanji8DF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF6Tex[] = dgMsgKanji8DF6Tex;
+
+#define dgMsgKanji8DF7Tex "__OTR__textures/kanji/gMsgKanji8DF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF7Tex[] = dgMsgKanji8DF7Tex;
+
+#define dgMsgKanji8DF8Tex "__OTR__textures/kanji/gMsgKanji8DF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF8Tex[] = dgMsgKanji8DF8Tex;
+
+#define dgMsgKanji8DF9Tex "__OTR__textures/kanji/gMsgKanji8DF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8DF9Tex[] = dgMsgKanji8DF9Tex;
+
+#define dgMsgKanji8DFATex "__OTR__textures/kanji/gMsgKanji8DFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8DFATex[] = dgMsgKanji8DFATex;
+
+#define dgMsgKanji8DFBTex "__OTR__textures/kanji/gMsgKanji8DFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DFBTex[] = dgMsgKanji8DFBTex;
+
+#define dgMsgKanji8DFCTex "__OTR__textures/kanji/gMsgKanji8DFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8DFCTex[] = dgMsgKanji8DFCTex;
+
+#define dgMsgKanji8E40Tex "__OTR__textures/kanji/gMsgKanji8E40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E40Tex[] = dgMsgKanji8E40Tex;
+
+#define dgMsgKanji8E41Tex "__OTR__textures/kanji/gMsgKanji8E41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E41Tex[] = dgMsgKanji8E41Tex;
+
+#define dgMsgKanji8E42Tex "__OTR__textures/kanji/gMsgKanji8E42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E42Tex[] = dgMsgKanji8E42Tex;
+
+#define dgMsgKanji8E43Tex "__OTR__textures/kanji/gMsgKanji8E43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E43Tex[] = dgMsgKanji8E43Tex;
+
+#define dgMsgKanji8E44Tex "__OTR__textures/kanji/gMsgKanji8E44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E44Tex[] = dgMsgKanji8E44Tex;
+
+#define dgMsgKanji8E45Tex "__OTR__textures/kanji/gMsgKanji8E45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E45Tex[] = dgMsgKanji8E45Tex;
+
+#define dgMsgKanji8E46Tex "__OTR__textures/kanji/gMsgKanji8E46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E46Tex[] = dgMsgKanji8E46Tex;
+
+#define dgMsgKanji8E47Tex "__OTR__textures/kanji/gMsgKanji8E47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E47Tex[] = dgMsgKanji8E47Tex;
+
+#define dgMsgKanji8E48Tex "__OTR__textures/kanji/gMsgKanji8E48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E48Tex[] = dgMsgKanji8E48Tex;
+
+#define dgMsgKanji8E49Tex "__OTR__textures/kanji/gMsgKanji8E49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E49Tex[] = dgMsgKanji8E49Tex;
+
+#define dgMsgKanji8E4ATex "__OTR__textures/kanji/gMsgKanji8E4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4ATex[] = dgMsgKanji8E4ATex;
+
+#define dgMsgKanji8E4BTex "__OTR__textures/kanji/gMsgKanji8E4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4BTex[] = dgMsgKanji8E4BTex;
+
+#define dgMsgKanji8E4CTex "__OTR__textures/kanji/gMsgKanji8E4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4CTex[] = dgMsgKanji8E4CTex;
+
+#define dgMsgKanji8E4DTex "__OTR__textures/kanji/gMsgKanji8E4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4DTex[] = dgMsgKanji8E4DTex;
+
+#define dgMsgKanji8E4ETex "__OTR__textures/kanji/gMsgKanji8E4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4ETex[] = dgMsgKanji8E4ETex;
+
+#define dgMsgKanji8E4FTex "__OTR__textures/kanji/gMsgKanji8E4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E4FTex[] = dgMsgKanji8E4FTex;
+
+#define dgMsgKanji8E50Tex "__OTR__textures/kanji/gMsgKanji8E50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E50Tex[] = dgMsgKanji8E50Tex;
+
+#define dgMsgKanji8E51Tex "__OTR__textures/kanji/gMsgKanji8E51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E51Tex[] = dgMsgKanji8E51Tex;
+
+#define dgMsgKanji8E52Tex "__OTR__textures/kanji/gMsgKanji8E52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E52Tex[] = dgMsgKanji8E52Tex;
+
+#define dgMsgKanji8E53Tex "__OTR__textures/kanji/gMsgKanji8E53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E53Tex[] = dgMsgKanji8E53Tex;
+
+#define dgMsgKanji8E54Tex "__OTR__textures/kanji/gMsgKanji8E54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E54Tex[] = dgMsgKanji8E54Tex;
+
+#define dgMsgKanji8E55Tex "__OTR__textures/kanji/gMsgKanji8E55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E55Tex[] = dgMsgKanji8E55Tex;
+
+#define dgMsgKanji8E56Tex "__OTR__textures/kanji/gMsgKanji8E56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E56Tex[] = dgMsgKanji8E56Tex;
+
+#define dgMsgKanji8E57Tex "__OTR__textures/kanji/gMsgKanji8E57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E57Tex[] = dgMsgKanji8E57Tex;
+
+#define dgMsgKanji8E58Tex "__OTR__textures/kanji/gMsgKanji8E58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E58Tex[] = dgMsgKanji8E58Tex;
+
+#define dgMsgKanji8E59Tex "__OTR__textures/kanji/gMsgKanji8E59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E59Tex[] = dgMsgKanji8E59Tex;
+
+#define dgMsgKanji8E5ATex "__OTR__textures/kanji/gMsgKanji8E5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5ATex[] = dgMsgKanji8E5ATex;
+
+#define dgMsgKanji8E5BTex "__OTR__textures/kanji/gMsgKanji8E5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5BTex[] = dgMsgKanji8E5BTex;
+
+#define dgMsgKanji8E5CTex "__OTR__textures/kanji/gMsgKanji8E5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5CTex[] = dgMsgKanji8E5CTex;
+
+#define dgMsgKanji8E5DTex "__OTR__textures/kanji/gMsgKanji8E5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5DTex[] = dgMsgKanji8E5DTex;
+
+#define dgMsgKanji8E5ETex "__OTR__textures/kanji/gMsgKanji8E5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5ETex[] = dgMsgKanji8E5ETex;
+
+#define dgMsgKanji8E5FTex "__OTR__textures/kanji/gMsgKanji8E5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E5FTex[] = dgMsgKanji8E5FTex;
+
+#define dgMsgKanji8E60Tex "__OTR__textures/kanji/gMsgKanji8E60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E60Tex[] = dgMsgKanji8E60Tex;
+
+#define dgMsgKanji8E61Tex "__OTR__textures/kanji/gMsgKanji8E61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E61Tex[] = dgMsgKanji8E61Tex;
+
+#define dgMsgKanji8E62Tex "__OTR__textures/kanji/gMsgKanji8E62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E62Tex[] = dgMsgKanji8E62Tex;
+
+#define dgMsgKanji8E63Tex "__OTR__textures/kanji/gMsgKanji8E63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E63Tex[] = dgMsgKanji8E63Tex;
+
+#define dgMsgKanji8E64Tex "__OTR__textures/kanji/gMsgKanji8E64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E64Tex[] = dgMsgKanji8E64Tex;
+
+#define dgMsgKanji8E65Tex "__OTR__textures/kanji/gMsgKanji8E65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E65Tex[] = dgMsgKanji8E65Tex;
+
+#define dgMsgKanji8E66Tex "__OTR__textures/kanji/gMsgKanji8E66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E66Tex[] = dgMsgKanji8E66Tex;
+
+#define dgMsgKanji8E67Tex "__OTR__textures/kanji/gMsgKanji8E67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E67Tex[] = dgMsgKanji8E67Tex;
+
+#define dgMsgKanji8E68Tex "__OTR__textures/kanji/gMsgKanji8E68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E68Tex[] = dgMsgKanji8E68Tex;
+
+#define dgMsgKanji8E69Tex "__OTR__textures/kanji/gMsgKanji8E69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E69Tex[] = dgMsgKanji8E69Tex;
+
+#define dgMsgKanji8E6ATex "__OTR__textures/kanji/gMsgKanji8E6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6ATex[] = dgMsgKanji8E6ATex;
+
+#define dgMsgKanji8E6BTex "__OTR__textures/kanji/gMsgKanji8E6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6BTex[] = dgMsgKanji8E6BTex;
+
+#define dgMsgKanji8E6CTex "__OTR__textures/kanji/gMsgKanji8E6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6CTex[] = dgMsgKanji8E6CTex;
+
+#define dgMsgKanji8E6DTex "__OTR__textures/kanji/gMsgKanji8E6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6DTex[] = dgMsgKanji8E6DTex;
+
+#define dgMsgKanji8E6ETex "__OTR__textures/kanji/gMsgKanji8E6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6ETex[] = dgMsgKanji8E6ETex;
+
+#define dgMsgKanji8E6FTex "__OTR__textures/kanji/gMsgKanji8E6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E6FTex[] = dgMsgKanji8E6FTex;
+
+#define dgMsgKanji8E70Tex "__OTR__textures/kanji/gMsgKanji8E70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E70Tex[] = dgMsgKanji8E70Tex;
+
+#define dgMsgKanji8E71Tex "__OTR__textures/kanji/gMsgKanji8E71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E71Tex[] = dgMsgKanji8E71Tex;
+
+#define dgMsgKanji8E72Tex "__OTR__textures/kanji/gMsgKanji8E72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E72Tex[] = dgMsgKanji8E72Tex;
+
+#define dgMsgKanji8E73Tex "__OTR__textures/kanji/gMsgKanji8E73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E73Tex[] = dgMsgKanji8E73Tex;
+
+#define dgMsgKanji8E74Tex "__OTR__textures/kanji/gMsgKanji8E74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E74Tex[] = dgMsgKanji8E74Tex;
+
+#define dgMsgKanji8E75Tex "__OTR__textures/kanji/gMsgKanji8E75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E75Tex[] = dgMsgKanji8E75Tex;
+
+#define dgMsgKanji8E76Tex "__OTR__textures/kanji/gMsgKanji8E76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E76Tex[] = dgMsgKanji8E76Tex;
+
+#define dgMsgKanji8E77Tex "__OTR__textures/kanji/gMsgKanji8E77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E77Tex[] = dgMsgKanji8E77Tex;
+
+#define dgMsgKanji8E78Tex "__OTR__textures/kanji/gMsgKanji8E78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E78Tex[] = dgMsgKanji8E78Tex;
+
+#define dgMsgKanji8E79Tex "__OTR__textures/kanji/gMsgKanji8E79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E79Tex[] = dgMsgKanji8E79Tex;
+
+#define dgMsgKanji8E7ATex "__OTR__textures/kanji/gMsgKanji8E7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E7ATex[] = dgMsgKanji8E7ATex;
+
+#define dgMsgKanji8E7BTex "__OTR__textures/kanji/gMsgKanji8E7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E7BTex[] = dgMsgKanji8E7BTex;
+
+#define dgMsgKanji8E7CTex "__OTR__textures/kanji/gMsgKanji8E7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E7CTex[] = dgMsgKanji8E7CTex;
+
+#define dgMsgKanji8E7DTex "__OTR__textures/kanji/gMsgKanji8E7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E7DTex[] = dgMsgKanji8E7DTex;
+
+#define dgMsgKanji8E7ETex "__OTR__textures/kanji/gMsgKanji8E7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E7ETex[] = dgMsgKanji8E7ETex;
+
+#define dgMsgKanji8E80Tex "__OTR__textures/kanji/gMsgKanji8E80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E80Tex[] = dgMsgKanji8E80Tex;
+
+#define dgMsgKanji8E81Tex "__OTR__textures/kanji/gMsgKanji8E81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E81Tex[] = dgMsgKanji8E81Tex;
+
+#define dgMsgKanji8E82Tex "__OTR__textures/kanji/gMsgKanji8E82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E82Tex[] = dgMsgKanji8E82Tex;
+
+#define dgMsgKanji8E83Tex "__OTR__textures/kanji/gMsgKanji8E83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E83Tex[] = dgMsgKanji8E83Tex;
+
+#define dgMsgKanji8E84Tex "__OTR__textures/kanji/gMsgKanji8E84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E84Tex[] = dgMsgKanji8E84Tex;
+
+#define dgMsgKanji8E85Tex "__OTR__textures/kanji/gMsgKanji8E85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E85Tex[] = dgMsgKanji8E85Tex;
+
+#define dgMsgKanji8E86Tex "__OTR__textures/kanji/gMsgKanji8E86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E86Tex[] = dgMsgKanji8E86Tex;
+
+#define dgMsgKanji8E87Tex "__OTR__textures/kanji/gMsgKanji8E87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E87Tex[] = dgMsgKanji8E87Tex;
+
+#define dgMsgKanji8E88Tex "__OTR__textures/kanji/gMsgKanji8E88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E88Tex[] = dgMsgKanji8E88Tex;
+
+#define dgMsgKanji8E89Tex "__OTR__textures/kanji/gMsgKanji8E89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E89Tex[] = dgMsgKanji8E89Tex;
+
+#define dgMsgKanji8E8ATex "__OTR__textures/kanji/gMsgKanji8E8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8ATex[] = dgMsgKanji8E8ATex;
+
+#define dgMsgKanji8E8BTex "__OTR__textures/kanji/gMsgKanji8E8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8BTex[] = dgMsgKanji8E8BTex;
+
+#define dgMsgKanji8E8CTex "__OTR__textures/kanji/gMsgKanji8E8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8CTex[] = dgMsgKanji8E8CTex;
+
+#define dgMsgKanji8E8DTex "__OTR__textures/kanji/gMsgKanji8E8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8DTex[] = dgMsgKanji8E8DTex;
+
+#define dgMsgKanji8E8ETex "__OTR__textures/kanji/gMsgKanji8E8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8ETex[] = dgMsgKanji8E8ETex;
+
+#define dgMsgKanji8E8FTex "__OTR__textures/kanji/gMsgKanji8E8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E8FTex[] = dgMsgKanji8E8FTex;
+
+#define dgMsgKanji8E90Tex "__OTR__textures/kanji/gMsgKanji8E90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E90Tex[] = dgMsgKanji8E90Tex;
+
+#define dgMsgKanji8E91Tex "__OTR__textures/kanji/gMsgKanji8E91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E91Tex[] = dgMsgKanji8E91Tex;
+
+#define dgMsgKanji8E92Tex "__OTR__textures/kanji/gMsgKanji8E92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E92Tex[] = dgMsgKanji8E92Tex;
+
+#define dgMsgKanji8E93Tex "__OTR__textures/kanji/gMsgKanji8E93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E93Tex[] = dgMsgKanji8E93Tex;
+
+#define dgMsgKanji8E94Tex "__OTR__textures/kanji/gMsgKanji8E94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E94Tex[] = dgMsgKanji8E94Tex;
+
+#define dgMsgKanji8E95Tex "__OTR__textures/kanji/gMsgKanji8E95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E95Tex[] = dgMsgKanji8E95Tex;
+
+#define dgMsgKanji8E96Tex "__OTR__textures/kanji/gMsgKanji8E96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E96Tex[] = dgMsgKanji8E96Tex;
+
+#define dgMsgKanji8E97Tex "__OTR__textures/kanji/gMsgKanji8E97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E97Tex[] = dgMsgKanji8E97Tex;
+
+#define dgMsgKanji8E98Tex "__OTR__textures/kanji/gMsgKanji8E98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E98Tex[] = dgMsgKanji8E98Tex;
+
+#define dgMsgKanji8E99Tex "__OTR__textures/kanji/gMsgKanji8E99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8E99Tex[] = dgMsgKanji8E99Tex;
+
+#define dgMsgKanji8E9ATex "__OTR__textures/kanji/gMsgKanji8E9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9ATex[] = dgMsgKanji8E9ATex;
+
+#define dgMsgKanji8E9BTex "__OTR__textures/kanji/gMsgKanji8E9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9BTex[] = dgMsgKanji8E9BTex;
+
+#define dgMsgKanji8E9CTex "__OTR__textures/kanji/gMsgKanji8E9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9CTex[] = dgMsgKanji8E9CTex;
+
+#define dgMsgKanji8E9DTex "__OTR__textures/kanji/gMsgKanji8E9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9DTex[] = dgMsgKanji8E9DTex;
+
+#define dgMsgKanji8E9ETex "__OTR__textures/kanji/gMsgKanji8E9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9ETex[] = dgMsgKanji8E9ETex;
+
+#define dgMsgKanji8E9FTex "__OTR__textures/kanji/gMsgKanji8E9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8E9FTex[] = dgMsgKanji8E9FTex;
+
+#define dgMsgKanji8EA0Tex "__OTR__textures/kanji/gMsgKanji8EA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA0Tex[] = dgMsgKanji8EA0Tex;
+
+#define dgMsgKanji8EA1Tex "__OTR__textures/kanji/gMsgKanji8EA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA1Tex[] = dgMsgKanji8EA1Tex;
+
+#define dgMsgKanji8EA2Tex "__OTR__textures/kanji/gMsgKanji8EA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA2Tex[] = dgMsgKanji8EA2Tex;
+
+#define dgMsgKanji8EA3Tex "__OTR__textures/kanji/gMsgKanji8EA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA3Tex[] = dgMsgKanji8EA3Tex;
+
+#define dgMsgKanji8EA4Tex "__OTR__textures/kanji/gMsgKanji8EA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA4Tex[] = dgMsgKanji8EA4Tex;
+
+#define dgMsgKanji8EA5Tex "__OTR__textures/kanji/gMsgKanji8EA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA5Tex[] = dgMsgKanji8EA5Tex;
+
+#define dgMsgKanji8EA6Tex "__OTR__textures/kanji/gMsgKanji8EA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA6Tex[] = dgMsgKanji8EA6Tex;
+
+#define dgMsgKanji8EA7Tex "__OTR__textures/kanji/gMsgKanji8EA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA7Tex[] = dgMsgKanji8EA7Tex;
+
+#define dgMsgKanji8EA8Tex "__OTR__textures/kanji/gMsgKanji8EA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA8Tex[] = dgMsgKanji8EA8Tex;
+
+#define dgMsgKanji8EA9Tex "__OTR__textures/kanji/gMsgKanji8EA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EA9Tex[] = dgMsgKanji8EA9Tex;
+
+#define dgMsgKanji8EAATex "__OTR__textures/kanji/gMsgKanji8EAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8EAATex[] = dgMsgKanji8EAATex;
+
+#define dgMsgKanji8EABTex "__OTR__textures/kanji/gMsgKanji8EABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EABTex[] = dgMsgKanji8EABTex;
+
+#define dgMsgKanji8EACTex "__OTR__textures/kanji/gMsgKanji8EACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EACTex[] = dgMsgKanji8EACTex;
+
+#define dgMsgKanji8EADTex "__OTR__textures/kanji/gMsgKanji8EADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EADTex[] = dgMsgKanji8EADTex;
+
+#define dgMsgKanji8EAETex "__OTR__textures/kanji/gMsgKanji8EAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8EAETex[] = dgMsgKanji8EAETex;
+
+#define dgMsgKanji8EAFTex "__OTR__textures/kanji/gMsgKanji8EAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EAFTex[] = dgMsgKanji8EAFTex;
+
+#define dgMsgKanji8EB0Tex "__OTR__textures/kanji/gMsgKanji8EB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB0Tex[] = dgMsgKanji8EB0Tex;
+
+#define dgMsgKanji8EB1Tex "__OTR__textures/kanji/gMsgKanji8EB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB1Tex[] = dgMsgKanji8EB1Tex;
+
+#define dgMsgKanji8EB2Tex "__OTR__textures/kanji/gMsgKanji8EB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB2Tex[] = dgMsgKanji8EB2Tex;
+
+#define dgMsgKanji8EB3Tex "__OTR__textures/kanji/gMsgKanji8EB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB3Tex[] = dgMsgKanji8EB3Tex;
+
+#define dgMsgKanji8EB4Tex "__OTR__textures/kanji/gMsgKanji8EB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB4Tex[] = dgMsgKanji8EB4Tex;
+
+#define dgMsgKanji8EB5Tex "__OTR__textures/kanji/gMsgKanji8EB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB5Tex[] = dgMsgKanji8EB5Tex;
+
+#define dgMsgKanji8EB6Tex "__OTR__textures/kanji/gMsgKanji8EB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB6Tex[] = dgMsgKanji8EB6Tex;
+
+#define dgMsgKanji8EB7Tex "__OTR__textures/kanji/gMsgKanji8EB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB7Tex[] = dgMsgKanji8EB7Tex;
+
+#define dgMsgKanji8EB8Tex "__OTR__textures/kanji/gMsgKanji8EB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB8Tex[] = dgMsgKanji8EB8Tex;
+
+#define dgMsgKanji8EB9Tex "__OTR__textures/kanji/gMsgKanji8EB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EB9Tex[] = dgMsgKanji8EB9Tex;
+
+#define dgMsgKanji8EBATex "__OTR__textures/kanji/gMsgKanji8EBATex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBATex[] = dgMsgKanji8EBATex;
+
+#define dgMsgKanji8EBBTex "__OTR__textures/kanji/gMsgKanji8EBBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBBTex[] = dgMsgKanji8EBBTex;
+
+#define dgMsgKanji8EBCTex "__OTR__textures/kanji/gMsgKanji8EBCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBCTex[] = dgMsgKanji8EBCTex;
+
+#define dgMsgKanji8EBDTex "__OTR__textures/kanji/gMsgKanji8EBDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBDTex[] = dgMsgKanji8EBDTex;
+
+#define dgMsgKanji8EBETex "__OTR__textures/kanji/gMsgKanji8EBETex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBETex[] = dgMsgKanji8EBETex;
+
+#define dgMsgKanji8EBFTex "__OTR__textures/kanji/gMsgKanji8EBFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EBFTex[] = dgMsgKanji8EBFTex;
+
+#define dgMsgKanji8EC0Tex "__OTR__textures/kanji/gMsgKanji8EC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC0Tex[] = dgMsgKanji8EC0Tex;
+
+#define dgMsgKanji8EC1Tex "__OTR__textures/kanji/gMsgKanji8EC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC1Tex[] = dgMsgKanji8EC1Tex;
+
+#define dgMsgKanji8EC2Tex "__OTR__textures/kanji/gMsgKanji8EC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC2Tex[] = dgMsgKanji8EC2Tex;
+
+#define dgMsgKanji8EC3Tex "__OTR__textures/kanji/gMsgKanji8EC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC3Tex[] = dgMsgKanji8EC3Tex;
+
+#define dgMsgKanji8EC4Tex "__OTR__textures/kanji/gMsgKanji8EC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC4Tex[] = dgMsgKanji8EC4Tex;
+
+#define dgMsgKanji8EC5Tex "__OTR__textures/kanji/gMsgKanji8EC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC5Tex[] = dgMsgKanji8EC5Tex;
+
+#define dgMsgKanji8EC6Tex "__OTR__textures/kanji/gMsgKanji8EC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC6Tex[] = dgMsgKanji8EC6Tex;
+
+#define dgMsgKanji8EC7Tex "__OTR__textures/kanji/gMsgKanji8EC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC7Tex[] = dgMsgKanji8EC7Tex;
+
+#define dgMsgKanji8EC8Tex "__OTR__textures/kanji/gMsgKanji8EC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC8Tex[] = dgMsgKanji8EC8Tex;
+
+#define dgMsgKanji8EC9Tex "__OTR__textures/kanji/gMsgKanji8EC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EC9Tex[] = dgMsgKanji8EC9Tex;
+
+#define dgMsgKanji8ECATex "__OTR__textures/kanji/gMsgKanji8ECATex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECATex[] = dgMsgKanji8ECATex;
+
+#define dgMsgKanji8ECBTex "__OTR__textures/kanji/gMsgKanji8ECBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECBTex[] = dgMsgKanji8ECBTex;
+
+#define dgMsgKanji8ECCTex "__OTR__textures/kanji/gMsgKanji8ECCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECCTex[] = dgMsgKanji8ECCTex;
+
+#define dgMsgKanji8ECDTex "__OTR__textures/kanji/gMsgKanji8ECDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECDTex[] = dgMsgKanji8ECDTex;
+
+#define dgMsgKanji8ECETex "__OTR__textures/kanji/gMsgKanji8ECETex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECETex[] = dgMsgKanji8ECETex;
+
+#define dgMsgKanji8ECFTex "__OTR__textures/kanji/gMsgKanji8ECFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8ECFTex[] = dgMsgKanji8ECFTex;
+
+#define dgMsgKanji8ED0Tex "__OTR__textures/kanji/gMsgKanji8ED0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED0Tex[] = dgMsgKanji8ED0Tex;
+
+#define dgMsgKanji8ED1Tex "__OTR__textures/kanji/gMsgKanji8ED1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED1Tex[] = dgMsgKanji8ED1Tex;
+
+#define dgMsgKanji8ED2Tex "__OTR__textures/kanji/gMsgKanji8ED2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED2Tex[] = dgMsgKanji8ED2Tex;
+
+#define dgMsgKanji8ED3Tex "__OTR__textures/kanji/gMsgKanji8ED3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED3Tex[] = dgMsgKanji8ED3Tex;
+
+#define dgMsgKanji8ED4Tex "__OTR__textures/kanji/gMsgKanji8ED4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED4Tex[] = dgMsgKanji8ED4Tex;
+
+#define dgMsgKanji8ED5Tex "__OTR__textures/kanji/gMsgKanji8ED5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED5Tex[] = dgMsgKanji8ED5Tex;
+
+#define dgMsgKanji8ED6Tex "__OTR__textures/kanji/gMsgKanji8ED6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED6Tex[] = dgMsgKanji8ED6Tex;
+
+#define dgMsgKanji8ED7Tex "__OTR__textures/kanji/gMsgKanji8ED7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED7Tex[] = dgMsgKanji8ED7Tex;
+
+#define dgMsgKanji8ED8Tex "__OTR__textures/kanji/gMsgKanji8ED8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED8Tex[] = dgMsgKanji8ED8Tex;
+
+#define dgMsgKanji8ED9Tex "__OTR__textures/kanji/gMsgKanji8ED9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8ED9Tex[] = dgMsgKanji8ED9Tex;
+
+#define dgMsgKanji8EDATex "__OTR__textures/kanji/gMsgKanji8EDATex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDATex[] = dgMsgKanji8EDATex;
+
+#define dgMsgKanji8EDBTex "__OTR__textures/kanji/gMsgKanji8EDBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDBTex[] = dgMsgKanji8EDBTex;
+
+#define dgMsgKanji8EDCTex "__OTR__textures/kanji/gMsgKanji8EDCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDCTex[] = dgMsgKanji8EDCTex;
+
+#define dgMsgKanji8EDDTex "__OTR__textures/kanji/gMsgKanji8EDDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDDTex[] = dgMsgKanji8EDDTex;
+
+#define dgMsgKanji8EDETex "__OTR__textures/kanji/gMsgKanji8EDETex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDETex[] = dgMsgKanji8EDETex;
+
+#define dgMsgKanji8EDFTex "__OTR__textures/kanji/gMsgKanji8EDFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EDFTex[] = dgMsgKanji8EDFTex;
+
+#define dgMsgKanji8EE0Tex "__OTR__textures/kanji/gMsgKanji8EE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE0Tex[] = dgMsgKanji8EE0Tex;
+
+#define dgMsgKanji8EE1Tex "__OTR__textures/kanji/gMsgKanji8EE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE1Tex[] = dgMsgKanji8EE1Tex;
+
+#define dgMsgKanji8EE2Tex "__OTR__textures/kanji/gMsgKanji8EE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE2Tex[] = dgMsgKanji8EE2Tex;
+
+#define dgMsgKanji8EE3Tex "__OTR__textures/kanji/gMsgKanji8EE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE3Tex[] = dgMsgKanji8EE3Tex;
+
+#define dgMsgKanji8EE4Tex "__OTR__textures/kanji/gMsgKanji8EE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE4Tex[] = dgMsgKanji8EE4Tex;
+
+#define dgMsgKanji8EE5Tex "__OTR__textures/kanji/gMsgKanji8EE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE5Tex[] = dgMsgKanji8EE5Tex;
+
+#define dgMsgKanji8EE6Tex "__OTR__textures/kanji/gMsgKanji8EE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE6Tex[] = dgMsgKanji8EE6Tex;
+
+#define dgMsgKanji8EE7Tex "__OTR__textures/kanji/gMsgKanji8EE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE7Tex[] = dgMsgKanji8EE7Tex;
+
+#define dgMsgKanji8EE8Tex "__OTR__textures/kanji/gMsgKanji8EE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE8Tex[] = dgMsgKanji8EE8Tex;
+
+#define dgMsgKanji8EE9Tex "__OTR__textures/kanji/gMsgKanji8EE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EE9Tex[] = dgMsgKanji8EE9Tex;
+
+#define dgMsgKanji8EEATex "__OTR__textures/kanji/gMsgKanji8EEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8EEATex[] = dgMsgKanji8EEATex;
+
+#define dgMsgKanji8EEBTex "__OTR__textures/kanji/gMsgKanji8EEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EEBTex[] = dgMsgKanji8EEBTex;
+
+#define dgMsgKanji8EECTex "__OTR__textures/kanji/gMsgKanji8EECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EECTex[] = dgMsgKanji8EECTex;
+
+#define dgMsgKanji8EEDTex "__OTR__textures/kanji/gMsgKanji8EEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EEDTex[] = dgMsgKanji8EEDTex;
+
+#define dgMsgKanji8EEETex "__OTR__textures/kanji/gMsgKanji8EEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8EEETex[] = dgMsgKanji8EEETex;
+
+#define dgMsgKanji8EEFTex "__OTR__textures/kanji/gMsgKanji8EEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EEFTex[] = dgMsgKanji8EEFTex;
+
+#define dgMsgKanji8EF0Tex "__OTR__textures/kanji/gMsgKanji8EF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF0Tex[] = dgMsgKanji8EF0Tex;
+
+#define dgMsgKanji8EF1Tex "__OTR__textures/kanji/gMsgKanji8EF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF1Tex[] = dgMsgKanji8EF1Tex;
+
+#define dgMsgKanji8EF2Tex "__OTR__textures/kanji/gMsgKanji8EF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF2Tex[] = dgMsgKanji8EF2Tex;
+
+#define dgMsgKanji8EF3Tex "__OTR__textures/kanji/gMsgKanji8EF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF3Tex[] = dgMsgKanji8EF3Tex;
+
+#define dgMsgKanji8EF4Tex "__OTR__textures/kanji/gMsgKanji8EF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF4Tex[] = dgMsgKanji8EF4Tex;
+
+#define dgMsgKanji8EF5Tex "__OTR__textures/kanji/gMsgKanji8EF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF5Tex[] = dgMsgKanji8EF5Tex;
+
+#define dgMsgKanji8EF6Tex "__OTR__textures/kanji/gMsgKanji8EF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF6Tex[] = dgMsgKanji8EF6Tex;
+
+#define dgMsgKanji8EF7Tex "__OTR__textures/kanji/gMsgKanji8EF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF7Tex[] = dgMsgKanji8EF7Tex;
+
+#define dgMsgKanji8EF8Tex "__OTR__textures/kanji/gMsgKanji8EF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF8Tex[] = dgMsgKanji8EF8Tex;
+
+#define dgMsgKanji8EF9Tex "__OTR__textures/kanji/gMsgKanji8EF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8EF9Tex[] = dgMsgKanji8EF9Tex;
+
+#define dgMsgKanji8EFATex "__OTR__textures/kanji/gMsgKanji8EFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8EFATex[] = dgMsgKanji8EFATex;
+
+#define dgMsgKanji8EFBTex "__OTR__textures/kanji/gMsgKanji8EFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EFBTex[] = dgMsgKanji8EFBTex;
+
+#define dgMsgKanji8EFCTex "__OTR__textures/kanji/gMsgKanji8EFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8EFCTex[] = dgMsgKanji8EFCTex;
+
+#define dgMsgKanji8F40Tex "__OTR__textures/kanji/gMsgKanji8F40Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F40Tex[] = dgMsgKanji8F40Tex;
+
+#define dgMsgKanji8F41Tex "__OTR__textures/kanji/gMsgKanji8F41Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F41Tex[] = dgMsgKanji8F41Tex;
+
+#define dgMsgKanji8F42Tex "__OTR__textures/kanji/gMsgKanji8F42Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F42Tex[] = dgMsgKanji8F42Tex;
+
+#define dgMsgKanji8F43Tex "__OTR__textures/kanji/gMsgKanji8F43Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F43Tex[] = dgMsgKanji8F43Tex;
+
+#define dgMsgKanji8F44Tex "__OTR__textures/kanji/gMsgKanji8F44Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F44Tex[] = dgMsgKanji8F44Tex;
+
+#define dgMsgKanji8F45Tex "__OTR__textures/kanji/gMsgKanji8F45Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F45Tex[] = dgMsgKanji8F45Tex;
+
+#define dgMsgKanji8F46Tex "__OTR__textures/kanji/gMsgKanji8F46Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F46Tex[] = dgMsgKanji8F46Tex;
+
+#define dgMsgKanji8F47Tex "__OTR__textures/kanji/gMsgKanji8F47Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F47Tex[] = dgMsgKanji8F47Tex;
+
+#define dgMsgKanji8F48Tex "__OTR__textures/kanji/gMsgKanji8F48Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F48Tex[] = dgMsgKanji8F48Tex;
+
+#define dgMsgKanji8F49Tex "__OTR__textures/kanji/gMsgKanji8F49Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F49Tex[] = dgMsgKanji8F49Tex;
+
+#define dgMsgKanji8F4ATex "__OTR__textures/kanji/gMsgKanji8F4ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4ATex[] = dgMsgKanji8F4ATex;
+
+#define dgMsgKanji8F4BTex "__OTR__textures/kanji/gMsgKanji8F4BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4BTex[] = dgMsgKanji8F4BTex;
+
+#define dgMsgKanji8F4CTex "__OTR__textures/kanji/gMsgKanji8F4CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4CTex[] = dgMsgKanji8F4CTex;
+
+#define dgMsgKanji8F4DTex "__OTR__textures/kanji/gMsgKanji8F4DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4DTex[] = dgMsgKanji8F4DTex;
+
+#define dgMsgKanji8F4ETex "__OTR__textures/kanji/gMsgKanji8F4ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4ETex[] = dgMsgKanji8F4ETex;
+
+#define dgMsgKanji8F4FTex "__OTR__textures/kanji/gMsgKanji8F4FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F4FTex[] = dgMsgKanji8F4FTex;
+
+#define dgMsgKanji8F50Tex "__OTR__textures/kanji/gMsgKanji8F50Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F50Tex[] = dgMsgKanji8F50Tex;
+
+#define dgMsgKanji8F51Tex "__OTR__textures/kanji/gMsgKanji8F51Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F51Tex[] = dgMsgKanji8F51Tex;
+
+#define dgMsgKanji8F52Tex "__OTR__textures/kanji/gMsgKanji8F52Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F52Tex[] = dgMsgKanji8F52Tex;
+
+#define dgMsgKanji8F53Tex "__OTR__textures/kanji/gMsgKanji8F53Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F53Tex[] = dgMsgKanji8F53Tex;
+
+#define dgMsgKanji8F54Tex "__OTR__textures/kanji/gMsgKanji8F54Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F54Tex[] = dgMsgKanji8F54Tex;
+
+#define dgMsgKanji8F55Tex "__OTR__textures/kanji/gMsgKanji8F55Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F55Tex[] = dgMsgKanji8F55Tex;
+
+#define dgMsgKanji8F56Tex "__OTR__textures/kanji/gMsgKanji8F56Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F56Tex[] = dgMsgKanji8F56Tex;
+
+#define dgMsgKanji8F57Tex "__OTR__textures/kanji/gMsgKanji8F57Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F57Tex[] = dgMsgKanji8F57Tex;
+
+#define dgMsgKanji8F58Tex "__OTR__textures/kanji/gMsgKanji8F58Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F58Tex[] = dgMsgKanji8F58Tex;
+
+#define dgMsgKanji8F59Tex "__OTR__textures/kanji/gMsgKanji8F59Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F59Tex[] = dgMsgKanji8F59Tex;
+
+#define dgMsgKanji8F5ATex "__OTR__textures/kanji/gMsgKanji8F5ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5ATex[] = dgMsgKanji8F5ATex;
+
+#define dgMsgKanji8F5BTex "__OTR__textures/kanji/gMsgKanji8F5BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5BTex[] = dgMsgKanji8F5BTex;
+
+#define dgMsgKanji8F5CTex "__OTR__textures/kanji/gMsgKanji8F5CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5CTex[] = dgMsgKanji8F5CTex;
+
+#define dgMsgKanji8F5DTex "__OTR__textures/kanji/gMsgKanji8F5DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5DTex[] = dgMsgKanji8F5DTex;
+
+#define dgMsgKanji8F5ETex "__OTR__textures/kanji/gMsgKanji8F5ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5ETex[] = dgMsgKanji8F5ETex;
+
+#define dgMsgKanji8F5FTex "__OTR__textures/kanji/gMsgKanji8F5FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F5FTex[] = dgMsgKanji8F5FTex;
+
+#define dgMsgKanji8F60Tex "__OTR__textures/kanji/gMsgKanji8F60Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F60Tex[] = dgMsgKanji8F60Tex;
+
+#define dgMsgKanji8F61Tex "__OTR__textures/kanji/gMsgKanji8F61Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F61Tex[] = dgMsgKanji8F61Tex;
+
+#define dgMsgKanji8F62Tex "__OTR__textures/kanji/gMsgKanji8F62Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F62Tex[] = dgMsgKanji8F62Tex;
+
+#define dgMsgKanji8F63Tex "__OTR__textures/kanji/gMsgKanji8F63Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F63Tex[] = dgMsgKanji8F63Tex;
+
+#define dgMsgKanji8F64Tex "__OTR__textures/kanji/gMsgKanji8F64Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F64Tex[] = dgMsgKanji8F64Tex;
+
+#define dgMsgKanji8F65Tex "__OTR__textures/kanji/gMsgKanji8F65Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F65Tex[] = dgMsgKanji8F65Tex;
+
+#define dgMsgKanji8F66Tex "__OTR__textures/kanji/gMsgKanji8F66Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F66Tex[] = dgMsgKanji8F66Tex;
+
+#define dgMsgKanji8F67Tex "__OTR__textures/kanji/gMsgKanji8F67Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F67Tex[] = dgMsgKanji8F67Tex;
+
+#define dgMsgKanji8F68Tex "__OTR__textures/kanji/gMsgKanji8F68Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F68Tex[] = dgMsgKanji8F68Tex;
+
+#define dgMsgKanji8F69Tex "__OTR__textures/kanji/gMsgKanji8F69Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F69Tex[] = dgMsgKanji8F69Tex;
+
+#define dgMsgKanji8F6ATex "__OTR__textures/kanji/gMsgKanji8F6ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6ATex[] = dgMsgKanji8F6ATex;
+
+#define dgMsgKanji8F6BTex "__OTR__textures/kanji/gMsgKanji8F6BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6BTex[] = dgMsgKanji8F6BTex;
+
+#define dgMsgKanji8F6CTex "__OTR__textures/kanji/gMsgKanji8F6CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6CTex[] = dgMsgKanji8F6CTex;
+
+#define dgMsgKanji8F6DTex "__OTR__textures/kanji/gMsgKanji8F6DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6DTex[] = dgMsgKanji8F6DTex;
+
+#define dgMsgKanji8F6ETex "__OTR__textures/kanji/gMsgKanji8F6ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6ETex[] = dgMsgKanji8F6ETex;
+
+#define dgMsgKanji8F6FTex "__OTR__textures/kanji/gMsgKanji8F6FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F6FTex[] = dgMsgKanji8F6FTex;
+
+#define dgMsgKanji8F70Tex "__OTR__textures/kanji/gMsgKanji8F70Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F70Tex[] = dgMsgKanji8F70Tex;
+
+#define dgMsgKanji8F71Tex "__OTR__textures/kanji/gMsgKanji8F71Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F71Tex[] = dgMsgKanji8F71Tex;
+
+#define dgMsgKanji8F72Tex "__OTR__textures/kanji/gMsgKanji8F72Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F72Tex[] = dgMsgKanji8F72Tex;
+
+#define dgMsgKanji8F73Tex "__OTR__textures/kanji/gMsgKanji8F73Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F73Tex[] = dgMsgKanji8F73Tex;
+
+#define dgMsgKanji8F74Tex "__OTR__textures/kanji/gMsgKanji8F74Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F74Tex[] = dgMsgKanji8F74Tex;
+
+#define dgMsgKanji8F75Tex "__OTR__textures/kanji/gMsgKanji8F75Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F75Tex[] = dgMsgKanji8F75Tex;
+
+#define dgMsgKanji8F76Tex "__OTR__textures/kanji/gMsgKanji8F76Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F76Tex[] = dgMsgKanji8F76Tex;
+
+#define dgMsgKanji8F77Tex "__OTR__textures/kanji/gMsgKanji8F77Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F77Tex[] = dgMsgKanji8F77Tex;
+
+#define dgMsgKanji8F78Tex "__OTR__textures/kanji/gMsgKanji8F78Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F78Tex[] = dgMsgKanji8F78Tex;
+
+#define dgMsgKanji8F79Tex "__OTR__textures/kanji/gMsgKanji8F79Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F79Tex[] = dgMsgKanji8F79Tex;
+
+#define dgMsgKanji8F7ATex "__OTR__textures/kanji/gMsgKanji8F7ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F7ATex[] = dgMsgKanji8F7ATex;
+
+#define dgMsgKanji8F7BTex "__OTR__textures/kanji/gMsgKanji8F7BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F7BTex[] = dgMsgKanji8F7BTex;
+
+#define dgMsgKanji8F7CTex "__OTR__textures/kanji/gMsgKanji8F7CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F7CTex[] = dgMsgKanji8F7CTex;
+
+#define dgMsgKanji8F7DTex "__OTR__textures/kanji/gMsgKanji8F7DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F7DTex[] = dgMsgKanji8F7DTex;
+
+#define dgMsgKanji8F7ETex "__OTR__textures/kanji/gMsgKanji8F7ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F7ETex[] = dgMsgKanji8F7ETex;
+
+#define dgMsgKanji8F80Tex "__OTR__textures/kanji/gMsgKanji8F80Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F80Tex[] = dgMsgKanji8F80Tex;
+
+#define dgMsgKanji8F81Tex "__OTR__textures/kanji/gMsgKanji8F81Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F81Tex[] = dgMsgKanji8F81Tex;
+
+#define dgMsgKanji8F82Tex "__OTR__textures/kanji/gMsgKanji8F82Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F82Tex[] = dgMsgKanji8F82Tex;
+
+#define dgMsgKanji8F83Tex "__OTR__textures/kanji/gMsgKanji8F83Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F83Tex[] = dgMsgKanji8F83Tex;
+
+#define dgMsgKanji8F84Tex "__OTR__textures/kanji/gMsgKanji8F84Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F84Tex[] = dgMsgKanji8F84Tex;
+
+#define dgMsgKanji8F85Tex "__OTR__textures/kanji/gMsgKanji8F85Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F85Tex[] = dgMsgKanji8F85Tex;
+
+#define dgMsgKanji8F86Tex "__OTR__textures/kanji/gMsgKanji8F86Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F86Tex[] = dgMsgKanji8F86Tex;
+
+#define dgMsgKanji8F87Tex "__OTR__textures/kanji/gMsgKanji8F87Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F87Tex[] = dgMsgKanji8F87Tex;
+
+#define dgMsgKanji8F88Tex "__OTR__textures/kanji/gMsgKanji8F88Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F88Tex[] = dgMsgKanji8F88Tex;
+
+#define dgMsgKanji8F89Tex "__OTR__textures/kanji/gMsgKanji8F89Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F89Tex[] = dgMsgKanji8F89Tex;
+
+#define dgMsgKanji8F8ATex "__OTR__textures/kanji/gMsgKanji8F8ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8ATex[] = dgMsgKanji8F8ATex;
+
+#define dgMsgKanji8F8BTex "__OTR__textures/kanji/gMsgKanji8F8BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8BTex[] = dgMsgKanji8F8BTex;
+
+#define dgMsgKanji8F8CTex "__OTR__textures/kanji/gMsgKanji8F8CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8CTex[] = dgMsgKanji8F8CTex;
+
+#define dgMsgKanji8F8DTex "__OTR__textures/kanji/gMsgKanji8F8DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8DTex[] = dgMsgKanji8F8DTex;
+
+#define dgMsgKanji8F8ETex "__OTR__textures/kanji/gMsgKanji8F8ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8ETex[] = dgMsgKanji8F8ETex;
+
+#define dgMsgKanji8F8FTex "__OTR__textures/kanji/gMsgKanji8F8FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F8FTex[] = dgMsgKanji8F8FTex;
+
+#define dgMsgKanji8F90Tex "__OTR__textures/kanji/gMsgKanji8F90Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F90Tex[] = dgMsgKanji8F90Tex;
+
+#define dgMsgKanji8F91Tex "__OTR__textures/kanji/gMsgKanji8F91Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F91Tex[] = dgMsgKanji8F91Tex;
+
+#define dgMsgKanji8F92Tex "__OTR__textures/kanji/gMsgKanji8F92Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F92Tex[] = dgMsgKanji8F92Tex;
+
+#define dgMsgKanji8F93Tex "__OTR__textures/kanji/gMsgKanji8F93Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F93Tex[] = dgMsgKanji8F93Tex;
+
+#define dgMsgKanji8F94Tex "__OTR__textures/kanji/gMsgKanji8F94Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F94Tex[] = dgMsgKanji8F94Tex;
+
+#define dgMsgKanji8F95Tex "__OTR__textures/kanji/gMsgKanji8F95Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F95Tex[] = dgMsgKanji8F95Tex;
+
+#define dgMsgKanji8F96Tex "__OTR__textures/kanji/gMsgKanji8F96Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F96Tex[] = dgMsgKanji8F96Tex;
+
+#define dgMsgKanji8F97Tex "__OTR__textures/kanji/gMsgKanji8F97Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F97Tex[] = dgMsgKanji8F97Tex;
+
+#define dgMsgKanji8F98Tex "__OTR__textures/kanji/gMsgKanji8F98Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F98Tex[] = dgMsgKanji8F98Tex;
+
+#define dgMsgKanji8F99Tex "__OTR__textures/kanji/gMsgKanji8F99Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8F99Tex[] = dgMsgKanji8F99Tex;
+
+#define dgMsgKanji8F9ATex "__OTR__textures/kanji/gMsgKanji8F9ATex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9ATex[] = dgMsgKanji8F9ATex;
+
+#define dgMsgKanji8F9BTex "__OTR__textures/kanji/gMsgKanji8F9BTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9BTex[] = dgMsgKanji8F9BTex;
+
+#define dgMsgKanji8F9CTex "__OTR__textures/kanji/gMsgKanji8F9CTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9CTex[] = dgMsgKanji8F9CTex;
+
+#define dgMsgKanji8F9DTex "__OTR__textures/kanji/gMsgKanji8F9DTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9DTex[] = dgMsgKanji8F9DTex;
+
+#define dgMsgKanji8F9ETex "__OTR__textures/kanji/gMsgKanji8F9ETex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9ETex[] = dgMsgKanji8F9ETex;
+
+#define dgMsgKanji8F9FTex "__OTR__textures/kanji/gMsgKanji8F9FTex"
+static const ALIGN_ASSET(2) char gMsgKanji8F9FTex[] = dgMsgKanji8F9FTex;
+
+#define dgMsgKanji8FA0Tex "__OTR__textures/kanji/gMsgKanji8FA0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA0Tex[] = dgMsgKanji8FA0Tex;
+
+#define dgMsgKanji8FA1Tex "__OTR__textures/kanji/gMsgKanji8FA1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA1Tex[] = dgMsgKanji8FA1Tex;
+
+#define dgMsgKanji8FA2Tex "__OTR__textures/kanji/gMsgKanji8FA2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA2Tex[] = dgMsgKanji8FA2Tex;
+
+#define dgMsgKanji8FA3Tex "__OTR__textures/kanji/gMsgKanji8FA3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA3Tex[] = dgMsgKanji8FA3Tex;
+
+#define dgMsgKanji8FA4Tex "__OTR__textures/kanji/gMsgKanji8FA4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA4Tex[] = dgMsgKanji8FA4Tex;
+
+#define dgMsgKanji8FA5Tex "__OTR__textures/kanji/gMsgKanji8FA5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA5Tex[] = dgMsgKanji8FA5Tex;
+
+#define dgMsgKanji8FA6Tex "__OTR__textures/kanji/gMsgKanji8FA6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA6Tex[] = dgMsgKanji8FA6Tex;
+
+#define dgMsgKanji8FA7Tex "__OTR__textures/kanji/gMsgKanji8FA7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA7Tex[] = dgMsgKanji8FA7Tex;
+
+#define dgMsgKanji8FA8Tex "__OTR__textures/kanji/gMsgKanji8FA8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA8Tex[] = dgMsgKanji8FA8Tex;
+
+#define dgMsgKanji8FA9Tex "__OTR__textures/kanji/gMsgKanji8FA9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FA9Tex[] = dgMsgKanji8FA9Tex;
+
+#define dgMsgKanji8FAATex "__OTR__textures/kanji/gMsgKanji8FAATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FAATex[] = dgMsgKanji8FAATex;
+
+#define dgMsgKanji8FABTex "__OTR__textures/kanji/gMsgKanji8FABTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FABTex[] = dgMsgKanji8FABTex;
+
+#define dgMsgKanji8FACTex "__OTR__textures/kanji/gMsgKanji8FACTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FACTex[] = dgMsgKanji8FACTex;
+
+#define dgMsgKanji8FADTex "__OTR__textures/kanji/gMsgKanji8FADTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FADTex[] = dgMsgKanji8FADTex;
+
+#define dgMsgKanji8FAETex "__OTR__textures/kanji/gMsgKanji8FAETex"
+static const ALIGN_ASSET(2) char gMsgKanji8FAETex[] = dgMsgKanji8FAETex;
+
+#define dgMsgKanji8FAFTex "__OTR__textures/kanji/gMsgKanji8FAFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FAFTex[] = dgMsgKanji8FAFTex;
+
+#define dgMsgKanji8FB0Tex "__OTR__textures/kanji/gMsgKanji8FB0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB0Tex[] = dgMsgKanji8FB0Tex;
+
+#define dgMsgKanji8FB1Tex "__OTR__textures/kanji/gMsgKanji8FB1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB1Tex[] = dgMsgKanji8FB1Tex;
+
+#define dgMsgKanji8FB2Tex "__OTR__textures/kanji/gMsgKanji8FB2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB2Tex[] = dgMsgKanji8FB2Tex;
+
+#define dgMsgKanji8FB3Tex "__OTR__textures/kanji/gMsgKanji8FB3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB3Tex[] = dgMsgKanji8FB3Tex;
+
+#define dgMsgKanji8FB4Tex "__OTR__textures/kanji/gMsgKanji8FB4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB4Tex[] = dgMsgKanji8FB4Tex;
+
+#define dgMsgKanji8FB5Tex "__OTR__textures/kanji/gMsgKanji8FB5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB5Tex[] = dgMsgKanji8FB5Tex;
+
+#define dgMsgKanji8FB6Tex "__OTR__textures/kanji/gMsgKanji8FB6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB6Tex[] = dgMsgKanji8FB6Tex;
+
+#define dgMsgKanji8FB7Tex "__OTR__textures/kanji/gMsgKanji8FB7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB7Tex[] = dgMsgKanji8FB7Tex;
+
+#define dgMsgKanji8FB8Tex "__OTR__textures/kanji/gMsgKanji8FB8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB8Tex[] = dgMsgKanji8FB8Tex;
+
+#define dgMsgKanji8FB9Tex "__OTR__textures/kanji/gMsgKanji8FB9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FB9Tex[] = dgMsgKanji8FB9Tex;
+
+#define dgMsgKanji8FBATex "__OTR__textures/kanji/gMsgKanji8FBATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBATex[] = dgMsgKanji8FBATex;
+
+#define dgMsgKanji8FBBTex "__OTR__textures/kanji/gMsgKanji8FBBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBBTex[] = dgMsgKanji8FBBTex;
+
+#define dgMsgKanji8FBCTex "__OTR__textures/kanji/gMsgKanji8FBCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBCTex[] = dgMsgKanji8FBCTex;
+
+#define dgMsgKanji8FBDTex "__OTR__textures/kanji/gMsgKanji8FBDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBDTex[] = dgMsgKanji8FBDTex;
+
+#define dgMsgKanji8FBETex "__OTR__textures/kanji/gMsgKanji8FBETex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBETex[] = dgMsgKanji8FBETex;
+
+#define dgMsgKanji8FBFTex "__OTR__textures/kanji/gMsgKanji8FBFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FBFTex[] = dgMsgKanji8FBFTex;
+
+#define dgMsgKanji8FC0Tex "__OTR__textures/kanji/gMsgKanji8FC0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC0Tex[] = dgMsgKanji8FC0Tex;
+
+#define dgMsgKanji8FC1Tex "__OTR__textures/kanji/gMsgKanji8FC1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC1Tex[] = dgMsgKanji8FC1Tex;
+
+#define dgMsgKanji8FC2Tex "__OTR__textures/kanji/gMsgKanji8FC2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC2Tex[] = dgMsgKanji8FC2Tex;
+
+#define dgMsgKanji8FC3Tex "__OTR__textures/kanji/gMsgKanji8FC3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC3Tex[] = dgMsgKanji8FC3Tex;
+
+#define dgMsgKanji8FC4Tex "__OTR__textures/kanji/gMsgKanji8FC4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC4Tex[] = dgMsgKanji8FC4Tex;
+
+#define dgMsgKanji8FC5Tex "__OTR__textures/kanji/gMsgKanji8FC5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC5Tex[] = dgMsgKanji8FC5Tex;
+
+#define dgMsgKanji8FC6Tex "__OTR__textures/kanji/gMsgKanji8FC6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC6Tex[] = dgMsgKanji8FC6Tex;
+
+#define dgMsgKanji8FC7Tex "__OTR__textures/kanji/gMsgKanji8FC7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC7Tex[] = dgMsgKanji8FC7Tex;
+
+#define dgMsgKanji8FC8Tex "__OTR__textures/kanji/gMsgKanji8FC8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC8Tex[] = dgMsgKanji8FC8Tex;
+
+#define dgMsgKanji8FC9Tex "__OTR__textures/kanji/gMsgKanji8FC9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FC9Tex[] = dgMsgKanji8FC9Tex;
+
+#define dgMsgKanji8FCATex "__OTR__textures/kanji/gMsgKanji8FCATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCATex[] = dgMsgKanji8FCATex;
+
+#define dgMsgKanji8FCBTex "__OTR__textures/kanji/gMsgKanji8FCBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCBTex[] = dgMsgKanji8FCBTex;
+
+#define dgMsgKanji8FCCTex "__OTR__textures/kanji/gMsgKanji8FCCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCCTex[] = dgMsgKanji8FCCTex;
+
+#define dgMsgKanji8FCDTex "__OTR__textures/kanji/gMsgKanji8FCDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCDTex[] = dgMsgKanji8FCDTex;
+
+#define dgMsgKanji8FCETex "__OTR__textures/kanji/gMsgKanji8FCETex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCETex[] = dgMsgKanji8FCETex;
+
+#define dgMsgKanji8FCFTex "__OTR__textures/kanji/gMsgKanji8FCFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FCFTex[] = dgMsgKanji8FCFTex;
+
+#define dgMsgKanji8FD0Tex "__OTR__textures/kanji/gMsgKanji8FD0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD0Tex[] = dgMsgKanji8FD0Tex;
+
+#define dgMsgKanji8FD1Tex "__OTR__textures/kanji/gMsgKanji8FD1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD1Tex[] = dgMsgKanji8FD1Tex;
+
+#define dgMsgKanji8FD2Tex "__OTR__textures/kanji/gMsgKanji8FD2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD2Tex[] = dgMsgKanji8FD2Tex;
+
+#define dgMsgKanji8FD3Tex "__OTR__textures/kanji/gMsgKanji8FD3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD3Tex[] = dgMsgKanji8FD3Tex;
+
+#define dgMsgKanji8FD4Tex "__OTR__textures/kanji/gMsgKanji8FD4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD4Tex[] = dgMsgKanji8FD4Tex;
+
+#define dgMsgKanji8FD5Tex "__OTR__textures/kanji/gMsgKanji8FD5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD5Tex[] = dgMsgKanji8FD5Tex;
+
+#define dgMsgKanji8FD6Tex "__OTR__textures/kanji/gMsgKanji8FD6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD6Tex[] = dgMsgKanji8FD6Tex;
+
+#define dgMsgKanji8FD7Tex "__OTR__textures/kanji/gMsgKanji8FD7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD7Tex[] = dgMsgKanji8FD7Tex;
+
+#define dgMsgKanji8FD8Tex "__OTR__textures/kanji/gMsgKanji8FD8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD8Tex[] = dgMsgKanji8FD8Tex;
+
+#define dgMsgKanji8FD9Tex "__OTR__textures/kanji/gMsgKanji8FD9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FD9Tex[] = dgMsgKanji8FD9Tex;
+
+#define dgMsgKanji8FDATex "__OTR__textures/kanji/gMsgKanji8FDATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDATex[] = dgMsgKanji8FDATex;
+
+#define dgMsgKanji8FDBTex "__OTR__textures/kanji/gMsgKanji8FDBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDBTex[] = dgMsgKanji8FDBTex;
+
+#define dgMsgKanji8FDCTex "__OTR__textures/kanji/gMsgKanji8FDCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDCTex[] = dgMsgKanji8FDCTex;
+
+#define dgMsgKanji8FDDTex "__OTR__textures/kanji/gMsgKanji8FDDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDDTex[] = dgMsgKanji8FDDTex;
+
+#define dgMsgKanji8FDETex "__OTR__textures/kanji/gMsgKanji8FDETex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDETex[] = dgMsgKanji8FDETex;
+
+#define dgMsgKanji8FDFTex "__OTR__textures/kanji/gMsgKanji8FDFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FDFTex[] = dgMsgKanji8FDFTex;
+
+#define dgMsgKanji8FE0Tex "__OTR__textures/kanji/gMsgKanji8FE0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE0Tex[] = dgMsgKanji8FE0Tex;
+
+#define dgMsgKanji8FE1Tex "__OTR__textures/kanji/gMsgKanji8FE1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE1Tex[] = dgMsgKanji8FE1Tex;
+
+#define dgMsgKanji8FE2Tex "__OTR__textures/kanji/gMsgKanji8FE2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE2Tex[] = dgMsgKanji8FE2Tex;
+
+#define dgMsgKanji8FE3Tex "__OTR__textures/kanji/gMsgKanji8FE3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE3Tex[] = dgMsgKanji8FE3Tex;
+
+#define dgMsgKanji8FE4Tex "__OTR__textures/kanji/gMsgKanji8FE4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE4Tex[] = dgMsgKanji8FE4Tex;
+
+#define dgMsgKanji8FE5Tex "__OTR__textures/kanji/gMsgKanji8FE5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE5Tex[] = dgMsgKanji8FE5Tex;
+
+#define dgMsgKanji8FE6Tex "__OTR__textures/kanji/gMsgKanji8FE6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE6Tex[] = dgMsgKanji8FE6Tex;
+
+#define dgMsgKanji8FE7Tex "__OTR__textures/kanji/gMsgKanji8FE7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE7Tex[] = dgMsgKanji8FE7Tex;
+
+#define dgMsgKanji8FE8Tex "__OTR__textures/kanji/gMsgKanji8FE8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE8Tex[] = dgMsgKanji8FE8Tex;
+
+#define dgMsgKanji8FE9Tex "__OTR__textures/kanji/gMsgKanji8FE9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FE9Tex[] = dgMsgKanji8FE9Tex;
+
+#define dgMsgKanji8FEATex "__OTR__textures/kanji/gMsgKanji8FEATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FEATex[] = dgMsgKanji8FEATex;
+
+#define dgMsgKanji8FEBTex "__OTR__textures/kanji/gMsgKanji8FEBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FEBTex[] = dgMsgKanji8FEBTex;
+
+#define dgMsgKanji8FECTex "__OTR__textures/kanji/gMsgKanji8FECTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FECTex[] = dgMsgKanji8FECTex;
+
+#define dgMsgKanji8FEDTex "__OTR__textures/kanji/gMsgKanji8FEDTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FEDTex[] = dgMsgKanji8FEDTex;
+
+#define dgMsgKanji8FEETex "__OTR__textures/kanji/gMsgKanji8FEETex"
+static const ALIGN_ASSET(2) char gMsgKanji8FEETex[] = dgMsgKanji8FEETex;
+
+#define dgMsgKanji8FEFTex "__OTR__textures/kanji/gMsgKanji8FEFTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FEFTex[] = dgMsgKanji8FEFTex;
+
+#define dgMsgKanji8FF0Tex "__OTR__textures/kanji/gMsgKanji8FF0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF0Tex[] = dgMsgKanji8FF0Tex;
+
+#define dgMsgKanji8FF1Tex "__OTR__textures/kanji/gMsgKanji8FF1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF1Tex[] = dgMsgKanji8FF1Tex;
+
+#define dgMsgKanji8FF2Tex "__OTR__textures/kanji/gMsgKanji8FF2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF2Tex[] = dgMsgKanji8FF2Tex;
+
+#define dgMsgKanji8FF3Tex "__OTR__textures/kanji/gMsgKanji8FF3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF3Tex[] = dgMsgKanji8FF3Tex;
+
+#define dgMsgKanji8FF4Tex "__OTR__textures/kanji/gMsgKanji8FF4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF4Tex[] = dgMsgKanji8FF4Tex;
+
+#define dgMsgKanji8FF5Tex "__OTR__textures/kanji/gMsgKanji8FF5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF5Tex[] = dgMsgKanji8FF5Tex;
+
+#define dgMsgKanji8FF6Tex "__OTR__textures/kanji/gMsgKanji8FF6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF6Tex[] = dgMsgKanji8FF6Tex;
+
+#define dgMsgKanji8FF7Tex "__OTR__textures/kanji/gMsgKanji8FF7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF7Tex[] = dgMsgKanji8FF7Tex;
+
+#define dgMsgKanji8FF8Tex "__OTR__textures/kanji/gMsgKanji8FF8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF8Tex[] = dgMsgKanji8FF8Tex;
+
+#define dgMsgKanji8FF9Tex "__OTR__textures/kanji/gMsgKanji8FF9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji8FF9Tex[] = dgMsgKanji8FF9Tex;
+
+#define dgMsgKanji8FFATex "__OTR__textures/kanji/gMsgKanji8FFATex"
+static const ALIGN_ASSET(2) char gMsgKanji8FFATex[] = dgMsgKanji8FFATex;
+
+#define dgMsgKanji8FFBTex "__OTR__textures/kanji/gMsgKanji8FFBTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FFBTex[] = dgMsgKanji8FFBTex;
+
+#define dgMsgKanji8FFCTex "__OTR__textures/kanji/gMsgKanji8FFCTex"
+static const ALIGN_ASSET(2) char gMsgKanji8FFCTex[] = dgMsgKanji8FFCTex;
+
+#define dgMsgKanji9040Tex "__OTR__textures/kanji/gMsgKanji9040Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9040Tex[] = dgMsgKanji9040Tex;
+
+#define dgMsgKanji9041Tex "__OTR__textures/kanji/gMsgKanji9041Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9041Tex[] = dgMsgKanji9041Tex;
+
+#define dgMsgKanji9042Tex "__OTR__textures/kanji/gMsgKanji9042Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9042Tex[] = dgMsgKanji9042Tex;
+
+#define dgMsgKanji9043Tex "__OTR__textures/kanji/gMsgKanji9043Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9043Tex[] = dgMsgKanji9043Tex;
+
+#define dgMsgKanji9044Tex "__OTR__textures/kanji/gMsgKanji9044Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9044Tex[] = dgMsgKanji9044Tex;
+
+#define dgMsgKanji9045Tex "__OTR__textures/kanji/gMsgKanji9045Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9045Tex[] = dgMsgKanji9045Tex;
+
+#define dgMsgKanji9046Tex "__OTR__textures/kanji/gMsgKanji9046Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9046Tex[] = dgMsgKanji9046Tex;
+
+#define dgMsgKanji9047Tex "__OTR__textures/kanji/gMsgKanji9047Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9047Tex[] = dgMsgKanji9047Tex;
+
+#define dgMsgKanji9048Tex "__OTR__textures/kanji/gMsgKanji9048Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9048Tex[] = dgMsgKanji9048Tex;
+
+#define dgMsgKanji9049Tex "__OTR__textures/kanji/gMsgKanji9049Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9049Tex[] = dgMsgKanji9049Tex;
+
+#define dgMsgKanji904ATex "__OTR__textures/kanji/gMsgKanji904ATex"
+static const ALIGN_ASSET(2) char gMsgKanji904ATex[] = dgMsgKanji904ATex;
+
+#define dgMsgKanji904BTex "__OTR__textures/kanji/gMsgKanji904BTex"
+static const ALIGN_ASSET(2) char gMsgKanji904BTex[] = dgMsgKanji904BTex;
+
+#define dgMsgKanji904CTex "__OTR__textures/kanji/gMsgKanji904CTex"
+static const ALIGN_ASSET(2) char gMsgKanji904CTex[] = dgMsgKanji904CTex;
+
+#define dgMsgKanji904DTex "__OTR__textures/kanji/gMsgKanji904DTex"
+static const ALIGN_ASSET(2) char gMsgKanji904DTex[] = dgMsgKanji904DTex;
+
+#define dgMsgKanji904ETex "__OTR__textures/kanji/gMsgKanji904ETex"
+static const ALIGN_ASSET(2) char gMsgKanji904ETex[] = dgMsgKanji904ETex;
+
+#define dgMsgKanji904FTex "__OTR__textures/kanji/gMsgKanji904FTex"
+static const ALIGN_ASSET(2) char gMsgKanji904FTex[] = dgMsgKanji904FTex;
+
+#define dgMsgKanji9050Tex "__OTR__textures/kanji/gMsgKanji9050Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9050Tex[] = dgMsgKanji9050Tex;
+
+#define dgMsgKanji9051Tex "__OTR__textures/kanji/gMsgKanji9051Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9051Tex[] = dgMsgKanji9051Tex;
+
+#define dgMsgKanji9052Tex "__OTR__textures/kanji/gMsgKanji9052Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9052Tex[] = dgMsgKanji9052Tex;
+
+#define dgMsgKanji9053Tex "__OTR__textures/kanji/gMsgKanji9053Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9053Tex[] = dgMsgKanji9053Tex;
+
+#define dgMsgKanji9054Tex "__OTR__textures/kanji/gMsgKanji9054Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9054Tex[] = dgMsgKanji9054Tex;
+
+#define dgMsgKanji9055Tex "__OTR__textures/kanji/gMsgKanji9055Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9055Tex[] = dgMsgKanji9055Tex;
+
+#define dgMsgKanji9056Tex "__OTR__textures/kanji/gMsgKanji9056Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9056Tex[] = dgMsgKanji9056Tex;
+
+#define dgMsgKanji9057Tex "__OTR__textures/kanji/gMsgKanji9057Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9057Tex[] = dgMsgKanji9057Tex;
+
+#define dgMsgKanji9058Tex "__OTR__textures/kanji/gMsgKanji9058Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9058Tex[] = dgMsgKanji9058Tex;
+
+#define dgMsgKanji9059Tex "__OTR__textures/kanji/gMsgKanji9059Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9059Tex[] = dgMsgKanji9059Tex;
+
+#define dgMsgKanji905ATex "__OTR__textures/kanji/gMsgKanji905ATex"
+static const ALIGN_ASSET(2) char gMsgKanji905ATex[] = dgMsgKanji905ATex;
+
+#define dgMsgKanji905BTex "__OTR__textures/kanji/gMsgKanji905BTex"
+static const ALIGN_ASSET(2) char gMsgKanji905BTex[] = dgMsgKanji905BTex;
+
+#define dgMsgKanji905CTex "__OTR__textures/kanji/gMsgKanji905CTex"
+static const ALIGN_ASSET(2) char gMsgKanji905CTex[] = dgMsgKanji905CTex;
+
+#define dgMsgKanji905DTex "__OTR__textures/kanji/gMsgKanji905DTex"
+static const ALIGN_ASSET(2) char gMsgKanji905DTex[] = dgMsgKanji905DTex;
+
+#define dgMsgKanji905ETex "__OTR__textures/kanji/gMsgKanji905ETex"
+static const ALIGN_ASSET(2) char gMsgKanji905ETex[] = dgMsgKanji905ETex;
+
+#define dgMsgKanji905FTex "__OTR__textures/kanji/gMsgKanji905FTex"
+static const ALIGN_ASSET(2) char gMsgKanji905FTex[] = dgMsgKanji905FTex;
+
+#define dgMsgKanji9060Tex "__OTR__textures/kanji/gMsgKanji9060Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9060Tex[] = dgMsgKanji9060Tex;
+
+#define dgMsgKanji9061Tex "__OTR__textures/kanji/gMsgKanji9061Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9061Tex[] = dgMsgKanji9061Tex;
+
+#define dgMsgKanji9062Tex "__OTR__textures/kanji/gMsgKanji9062Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9062Tex[] = dgMsgKanji9062Tex;
+
+#define dgMsgKanji9063Tex "__OTR__textures/kanji/gMsgKanji9063Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9063Tex[] = dgMsgKanji9063Tex;
+
+#define dgMsgKanji9064Tex "__OTR__textures/kanji/gMsgKanji9064Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9064Tex[] = dgMsgKanji9064Tex;
+
+#define dgMsgKanji9065Tex "__OTR__textures/kanji/gMsgKanji9065Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9065Tex[] = dgMsgKanji9065Tex;
+
+#define dgMsgKanji9066Tex "__OTR__textures/kanji/gMsgKanji9066Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9066Tex[] = dgMsgKanji9066Tex;
+
+#define dgMsgKanji9067Tex "__OTR__textures/kanji/gMsgKanji9067Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9067Tex[] = dgMsgKanji9067Tex;
+
+#define dgMsgKanji9068Tex "__OTR__textures/kanji/gMsgKanji9068Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9068Tex[] = dgMsgKanji9068Tex;
+
+#define dgMsgKanji9069Tex "__OTR__textures/kanji/gMsgKanji9069Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9069Tex[] = dgMsgKanji9069Tex;
+
+#define dgMsgKanji906ATex "__OTR__textures/kanji/gMsgKanji906ATex"
+static const ALIGN_ASSET(2) char gMsgKanji906ATex[] = dgMsgKanji906ATex;
+
+#define dgMsgKanji906BTex "__OTR__textures/kanji/gMsgKanji906BTex"
+static const ALIGN_ASSET(2) char gMsgKanji906BTex[] = dgMsgKanji906BTex;
+
+#define dgMsgKanji906CTex "__OTR__textures/kanji/gMsgKanji906CTex"
+static const ALIGN_ASSET(2) char gMsgKanji906CTex[] = dgMsgKanji906CTex;
+
+#define dgMsgKanji906DTex "__OTR__textures/kanji/gMsgKanji906DTex"
+static const ALIGN_ASSET(2) char gMsgKanji906DTex[] = dgMsgKanji906DTex;
+
+#define dgMsgKanji906ETex "__OTR__textures/kanji/gMsgKanji906ETex"
+static const ALIGN_ASSET(2) char gMsgKanji906ETex[] = dgMsgKanji906ETex;
+
+#define dgMsgKanji906FTex "__OTR__textures/kanji/gMsgKanji906FTex"
+static const ALIGN_ASSET(2) char gMsgKanji906FTex[] = dgMsgKanji906FTex;
+
+#define dgMsgKanji9070Tex "__OTR__textures/kanji/gMsgKanji9070Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9070Tex[] = dgMsgKanji9070Tex;
+
+#define dgMsgKanji9071Tex "__OTR__textures/kanji/gMsgKanji9071Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9071Tex[] = dgMsgKanji9071Tex;
+
+#define dgMsgKanji9072Tex "__OTR__textures/kanji/gMsgKanji9072Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9072Tex[] = dgMsgKanji9072Tex;
+
+#define dgMsgKanji9073Tex "__OTR__textures/kanji/gMsgKanji9073Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9073Tex[] = dgMsgKanji9073Tex;
+
+#define dgMsgKanji9074Tex "__OTR__textures/kanji/gMsgKanji9074Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9074Tex[] = dgMsgKanji9074Tex;
+
+#define dgMsgKanji9075Tex "__OTR__textures/kanji/gMsgKanji9075Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9075Tex[] = dgMsgKanji9075Tex;
+
+#define dgMsgKanji9076Tex "__OTR__textures/kanji/gMsgKanji9076Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9076Tex[] = dgMsgKanji9076Tex;
+
+#define dgMsgKanji9077Tex "__OTR__textures/kanji/gMsgKanji9077Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9077Tex[] = dgMsgKanji9077Tex;
+
+#define dgMsgKanji9078Tex "__OTR__textures/kanji/gMsgKanji9078Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9078Tex[] = dgMsgKanji9078Tex;
+
+#define dgMsgKanji9079Tex "__OTR__textures/kanji/gMsgKanji9079Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9079Tex[] = dgMsgKanji9079Tex;
+
+#define dgMsgKanji907ATex "__OTR__textures/kanji/gMsgKanji907ATex"
+static const ALIGN_ASSET(2) char gMsgKanji907ATex[] = dgMsgKanji907ATex;
+
+#define dgMsgKanji907BTex "__OTR__textures/kanji/gMsgKanji907BTex"
+static const ALIGN_ASSET(2) char gMsgKanji907BTex[] = dgMsgKanji907BTex;
+
+#define dgMsgKanji907CTex "__OTR__textures/kanji/gMsgKanji907CTex"
+static const ALIGN_ASSET(2) char gMsgKanji907CTex[] = dgMsgKanji907CTex;
+
+#define dgMsgKanji907DTex "__OTR__textures/kanji/gMsgKanji907DTex"
+static const ALIGN_ASSET(2) char gMsgKanji907DTex[] = dgMsgKanji907DTex;
+
+#define dgMsgKanji907ETex "__OTR__textures/kanji/gMsgKanji907ETex"
+static const ALIGN_ASSET(2) char gMsgKanji907ETex[] = dgMsgKanji907ETex;
+
+#define dgMsgKanji9080Tex "__OTR__textures/kanji/gMsgKanji9080Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9080Tex[] = dgMsgKanji9080Tex;
+
+#define dgMsgKanji9081Tex "__OTR__textures/kanji/gMsgKanji9081Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9081Tex[] = dgMsgKanji9081Tex;
+
+#define dgMsgKanji9082Tex "__OTR__textures/kanji/gMsgKanji9082Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9082Tex[] = dgMsgKanji9082Tex;
+
+#define dgMsgKanji9083Tex "__OTR__textures/kanji/gMsgKanji9083Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9083Tex[] = dgMsgKanji9083Tex;
+
+#define dgMsgKanji9084Tex "__OTR__textures/kanji/gMsgKanji9084Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9084Tex[] = dgMsgKanji9084Tex;
+
+#define dgMsgKanji9085Tex "__OTR__textures/kanji/gMsgKanji9085Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9085Tex[] = dgMsgKanji9085Tex;
+
+#define dgMsgKanji9086Tex "__OTR__textures/kanji/gMsgKanji9086Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9086Tex[] = dgMsgKanji9086Tex;
+
+#define dgMsgKanji9087Tex "__OTR__textures/kanji/gMsgKanji9087Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9087Tex[] = dgMsgKanji9087Tex;
+
+#define dgMsgKanji9088Tex "__OTR__textures/kanji/gMsgKanji9088Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9088Tex[] = dgMsgKanji9088Tex;
+
+#define dgMsgKanji9089Tex "__OTR__textures/kanji/gMsgKanji9089Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9089Tex[] = dgMsgKanji9089Tex;
+
+#define dgMsgKanji908ATex "__OTR__textures/kanji/gMsgKanji908ATex"
+static const ALIGN_ASSET(2) char gMsgKanji908ATex[] = dgMsgKanji908ATex;
+
+#define dgMsgKanji908BTex "__OTR__textures/kanji/gMsgKanji908BTex"
+static const ALIGN_ASSET(2) char gMsgKanji908BTex[] = dgMsgKanji908BTex;
+
+#define dgMsgKanji908CTex "__OTR__textures/kanji/gMsgKanji908CTex"
+static const ALIGN_ASSET(2) char gMsgKanji908CTex[] = dgMsgKanji908CTex;
+
+#define dgMsgKanji908DTex "__OTR__textures/kanji/gMsgKanji908DTex"
+static const ALIGN_ASSET(2) char gMsgKanji908DTex[] = dgMsgKanji908DTex;
+
+#define dgMsgKanji908ETex "__OTR__textures/kanji/gMsgKanji908ETex"
+static const ALIGN_ASSET(2) char gMsgKanji908ETex[] = dgMsgKanji908ETex;
+
+#define dgMsgKanji908FTex "__OTR__textures/kanji/gMsgKanji908FTex"
+static const ALIGN_ASSET(2) char gMsgKanji908FTex[] = dgMsgKanji908FTex;
+
+#define dgMsgKanji9090Tex "__OTR__textures/kanji/gMsgKanji9090Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9090Tex[] = dgMsgKanji9090Tex;
+
+#define dgMsgKanji9091Tex "__OTR__textures/kanji/gMsgKanji9091Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9091Tex[] = dgMsgKanji9091Tex;
+
+#define dgMsgKanji9092Tex "__OTR__textures/kanji/gMsgKanji9092Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9092Tex[] = dgMsgKanji9092Tex;
+
+#define dgMsgKanji9093Tex "__OTR__textures/kanji/gMsgKanji9093Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9093Tex[] = dgMsgKanji9093Tex;
+
+#define dgMsgKanji9094Tex "__OTR__textures/kanji/gMsgKanji9094Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9094Tex[] = dgMsgKanji9094Tex;
+
+#define dgMsgKanji9095Tex "__OTR__textures/kanji/gMsgKanji9095Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9095Tex[] = dgMsgKanji9095Tex;
+
+#define dgMsgKanji9096Tex "__OTR__textures/kanji/gMsgKanji9096Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9096Tex[] = dgMsgKanji9096Tex;
+
+#define dgMsgKanji9097Tex "__OTR__textures/kanji/gMsgKanji9097Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9097Tex[] = dgMsgKanji9097Tex;
+
+#define dgMsgKanji9098Tex "__OTR__textures/kanji/gMsgKanji9098Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9098Tex[] = dgMsgKanji9098Tex;
+
+#define dgMsgKanji9099Tex "__OTR__textures/kanji/gMsgKanji9099Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9099Tex[] = dgMsgKanji9099Tex;
+
+#define dgMsgKanji909ATex "__OTR__textures/kanji/gMsgKanji909ATex"
+static const ALIGN_ASSET(2) char gMsgKanji909ATex[] = dgMsgKanji909ATex;
+
+#define dgMsgKanji909BTex "__OTR__textures/kanji/gMsgKanji909BTex"
+static const ALIGN_ASSET(2) char gMsgKanji909BTex[] = dgMsgKanji909BTex;
+
+#define dgMsgKanji909CTex "__OTR__textures/kanji/gMsgKanji909CTex"
+static const ALIGN_ASSET(2) char gMsgKanji909CTex[] = dgMsgKanji909CTex;
+
+#define dgMsgKanji909DTex "__OTR__textures/kanji/gMsgKanji909DTex"
+static const ALIGN_ASSET(2) char gMsgKanji909DTex[] = dgMsgKanji909DTex;
+
+#define dgMsgKanji909ETex "__OTR__textures/kanji/gMsgKanji909ETex"
+static const ALIGN_ASSET(2) char gMsgKanji909ETex[] = dgMsgKanji909ETex;
+
+#define dgMsgKanji909FTex "__OTR__textures/kanji/gMsgKanji909FTex"
+static const ALIGN_ASSET(2) char gMsgKanji909FTex[] = dgMsgKanji909FTex;
+
+#define dgMsgKanji90A0Tex "__OTR__textures/kanji/gMsgKanji90A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A0Tex[] = dgMsgKanji90A0Tex;
+
+#define dgMsgKanji90A1Tex "__OTR__textures/kanji/gMsgKanji90A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A1Tex[] = dgMsgKanji90A1Tex;
+
+#define dgMsgKanji90A2Tex "__OTR__textures/kanji/gMsgKanji90A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A2Tex[] = dgMsgKanji90A2Tex;
+
+#define dgMsgKanji90A3Tex "__OTR__textures/kanji/gMsgKanji90A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A3Tex[] = dgMsgKanji90A3Tex;
+
+#define dgMsgKanji90A4Tex "__OTR__textures/kanji/gMsgKanji90A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A4Tex[] = dgMsgKanji90A4Tex;
+
+#define dgMsgKanji90A5Tex "__OTR__textures/kanji/gMsgKanji90A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A5Tex[] = dgMsgKanji90A5Tex;
+
+#define dgMsgKanji90A6Tex "__OTR__textures/kanji/gMsgKanji90A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A6Tex[] = dgMsgKanji90A6Tex;
+
+#define dgMsgKanji90A7Tex "__OTR__textures/kanji/gMsgKanji90A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A7Tex[] = dgMsgKanji90A7Tex;
+
+#define dgMsgKanji90A8Tex "__OTR__textures/kanji/gMsgKanji90A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A8Tex[] = dgMsgKanji90A8Tex;
+
+#define dgMsgKanji90A9Tex "__OTR__textures/kanji/gMsgKanji90A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90A9Tex[] = dgMsgKanji90A9Tex;
+
+#define dgMsgKanji90AATex "__OTR__textures/kanji/gMsgKanji90AATex"
+static const ALIGN_ASSET(2) char gMsgKanji90AATex[] = dgMsgKanji90AATex;
+
+#define dgMsgKanji90ABTex "__OTR__textures/kanji/gMsgKanji90ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji90ABTex[] = dgMsgKanji90ABTex;
+
+#define dgMsgKanji90ACTex "__OTR__textures/kanji/gMsgKanji90ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji90ACTex[] = dgMsgKanji90ACTex;
+
+#define dgMsgKanji90ADTex "__OTR__textures/kanji/gMsgKanji90ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji90ADTex[] = dgMsgKanji90ADTex;
+
+#define dgMsgKanji90AETex "__OTR__textures/kanji/gMsgKanji90AETex"
+static const ALIGN_ASSET(2) char gMsgKanji90AETex[] = dgMsgKanji90AETex;
+
+#define dgMsgKanji90AFTex "__OTR__textures/kanji/gMsgKanji90AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji90AFTex[] = dgMsgKanji90AFTex;
+
+#define dgMsgKanji90B0Tex "__OTR__textures/kanji/gMsgKanji90B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B0Tex[] = dgMsgKanji90B0Tex;
+
+#define dgMsgKanji90B1Tex "__OTR__textures/kanji/gMsgKanji90B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B1Tex[] = dgMsgKanji90B1Tex;
+
+#define dgMsgKanji90B2Tex "__OTR__textures/kanji/gMsgKanji90B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B2Tex[] = dgMsgKanji90B2Tex;
+
+#define dgMsgKanji90B3Tex "__OTR__textures/kanji/gMsgKanji90B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B3Tex[] = dgMsgKanji90B3Tex;
+
+#define dgMsgKanji90B4Tex "__OTR__textures/kanji/gMsgKanji90B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B4Tex[] = dgMsgKanji90B4Tex;
+
+#define dgMsgKanji90B5Tex "__OTR__textures/kanji/gMsgKanji90B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B5Tex[] = dgMsgKanji90B5Tex;
+
+#define dgMsgKanji90B6Tex "__OTR__textures/kanji/gMsgKanji90B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B6Tex[] = dgMsgKanji90B6Tex;
+
+#define dgMsgKanji90B7Tex "__OTR__textures/kanji/gMsgKanji90B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B7Tex[] = dgMsgKanji90B7Tex;
+
+#define dgMsgKanji90B8Tex "__OTR__textures/kanji/gMsgKanji90B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B8Tex[] = dgMsgKanji90B8Tex;
+
+#define dgMsgKanji90B9Tex "__OTR__textures/kanji/gMsgKanji90B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90B9Tex[] = dgMsgKanji90B9Tex;
+
+#define dgMsgKanji90BATex "__OTR__textures/kanji/gMsgKanji90BATex"
+static const ALIGN_ASSET(2) char gMsgKanji90BATex[] = dgMsgKanji90BATex;
+
+#define dgMsgKanji90BBTex "__OTR__textures/kanji/gMsgKanji90BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji90BBTex[] = dgMsgKanji90BBTex;
+
+#define dgMsgKanji90BCTex "__OTR__textures/kanji/gMsgKanji90BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji90BCTex[] = dgMsgKanji90BCTex;
+
+#define dgMsgKanji90BDTex "__OTR__textures/kanji/gMsgKanji90BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji90BDTex[] = dgMsgKanji90BDTex;
+
+#define dgMsgKanji90BETex "__OTR__textures/kanji/gMsgKanji90BETex"
+static const ALIGN_ASSET(2) char gMsgKanji90BETex[] = dgMsgKanji90BETex;
+
+#define dgMsgKanji90BFTex "__OTR__textures/kanji/gMsgKanji90BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji90BFTex[] = dgMsgKanji90BFTex;
+
+#define dgMsgKanji90C0Tex "__OTR__textures/kanji/gMsgKanji90C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C0Tex[] = dgMsgKanji90C0Tex;
+
+#define dgMsgKanji90C1Tex "__OTR__textures/kanji/gMsgKanji90C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C1Tex[] = dgMsgKanji90C1Tex;
+
+#define dgMsgKanji90C2Tex "__OTR__textures/kanji/gMsgKanji90C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C2Tex[] = dgMsgKanji90C2Tex;
+
+#define dgMsgKanji90C3Tex "__OTR__textures/kanji/gMsgKanji90C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C3Tex[] = dgMsgKanji90C3Tex;
+
+#define dgMsgKanji90C4Tex "__OTR__textures/kanji/gMsgKanji90C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C4Tex[] = dgMsgKanji90C4Tex;
+
+#define dgMsgKanji90C5Tex "__OTR__textures/kanji/gMsgKanji90C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C5Tex[] = dgMsgKanji90C5Tex;
+
+#define dgMsgKanji90C6Tex "__OTR__textures/kanji/gMsgKanji90C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C6Tex[] = dgMsgKanji90C6Tex;
+
+#define dgMsgKanji90C7Tex "__OTR__textures/kanji/gMsgKanji90C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C7Tex[] = dgMsgKanji90C7Tex;
+
+#define dgMsgKanji90C8Tex "__OTR__textures/kanji/gMsgKanji90C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C8Tex[] = dgMsgKanji90C8Tex;
+
+#define dgMsgKanji90C9Tex "__OTR__textures/kanji/gMsgKanji90C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90C9Tex[] = dgMsgKanji90C9Tex;
+
+#define dgMsgKanji90CATex "__OTR__textures/kanji/gMsgKanji90CATex"
+static const ALIGN_ASSET(2) char gMsgKanji90CATex[] = dgMsgKanji90CATex;
+
+#define dgMsgKanji90CBTex "__OTR__textures/kanji/gMsgKanji90CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji90CBTex[] = dgMsgKanji90CBTex;
+
+#define dgMsgKanji90CCTex "__OTR__textures/kanji/gMsgKanji90CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji90CCTex[] = dgMsgKanji90CCTex;
+
+#define dgMsgKanji90CDTex "__OTR__textures/kanji/gMsgKanji90CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji90CDTex[] = dgMsgKanji90CDTex;
+
+#define dgMsgKanji90CETex "__OTR__textures/kanji/gMsgKanji90CETex"
+static const ALIGN_ASSET(2) char gMsgKanji90CETex[] = dgMsgKanji90CETex;
+
+#define dgMsgKanji90CFTex "__OTR__textures/kanji/gMsgKanji90CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji90CFTex[] = dgMsgKanji90CFTex;
+
+#define dgMsgKanji90D0Tex "__OTR__textures/kanji/gMsgKanji90D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D0Tex[] = dgMsgKanji90D0Tex;
+
+#define dgMsgKanji90D1Tex "__OTR__textures/kanji/gMsgKanji90D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D1Tex[] = dgMsgKanji90D1Tex;
+
+#define dgMsgKanji90D2Tex "__OTR__textures/kanji/gMsgKanji90D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D2Tex[] = dgMsgKanji90D2Tex;
+
+#define dgMsgKanji90D3Tex "__OTR__textures/kanji/gMsgKanji90D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D3Tex[] = dgMsgKanji90D3Tex;
+
+#define dgMsgKanji90D4Tex "__OTR__textures/kanji/gMsgKanji90D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D4Tex[] = dgMsgKanji90D4Tex;
+
+#define dgMsgKanji90D5Tex "__OTR__textures/kanji/gMsgKanji90D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D5Tex[] = dgMsgKanji90D5Tex;
+
+#define dgMsgKanji90D6Tex "__OTR__textures/kanji/gMsgKanji90D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D6Tex[] = dgMsgKanji90D6Tex;
+
+#define dgMsgKanji90D7Tex "__OTR__textures/kanji/gMsgKanji90D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D7Tex[] = dgMsgKanji90D7Tex;
+
+#define dgMsgKanji90D8Tex "__OTR__textures/kanji/gMsgKanji90D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D8Tex[] = dgMsgKanji90D8Tex;
+
+#define dgMsgKanji90D9Tex "__OTR__textures/kanji/gMsgKanji90D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90D9Tex[] = dgMsgKanji90D9Tex;
+
+#define dgMsgKanji90DATex "__OTR__textures/kanji/gMsgKanji90DATex"
+static const ALIGN_ASSET(2) char gMsgKanji90DATex[] = dgMsgKanji90DATex;
+
+#define dgMsgKanji90DBTex "__OTR__textures/kanji/gMsgKanji90DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji90DBTex[] = dgMsgKanji90DBTex;
+
+#define dgMsgKanji90DCTex "__OTR__textures/kanji/gMsgKanji90DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji90DCTex[] = dgMsgKanji90DCTex;
+
+#define dgMsgKanji90DDTex "__OTR__textures/kanji/gMsgKanji90DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji90DDTex[] = dgMsgKanji90DDTex;
+
+#define dgMsgKanji90DETex "__OTR__textures/kanji/gMsgKanji90DETex"
+static const ALIGN_ASSET(2) char gMsgKanji90DETex[] = dgMsgKanji90DETex;
+
+#define dgMsgKanji90DFTex "__OTR__textures/kanji/gMsgKanji90DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji90DFTex[] = dgMsgKanji90DFTex;
+
+#define dgMsgKanji90E0Tex "__OTR__textures/kanji/gMsgKanji90E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E0Tex[] = dgMsgKanji90E0Tex;
+
+#define dgMsgKanji90E1Tex "__OTR__textures/kanji/gMsgKanji90E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E1Tex[] = dgMsgKanji90E1Tex;
+
+#define dgMsgKanji90E2Tex "__OTR__textures/kanji/gMsgKanji90E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E2Tex[] = dgMsgKanji90E2Tex;
+
+#define dgMsgKanji90E3Tex "__OTR__textures/kanji/gMsgKanji90E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E3Tex[] = dgMsgKanji90E3Tex;
+
+#define dgMsgKanji90E4Tex "__OTR__textures/kanji/gMsgKanji90E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E4Tex[] = dgMsgKanji90E4Tex;
+
+#define dgMsgKanji90E5Tex "__OTR__textures/kanji/gMsgKanji90E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E5Tex[] = dgMsgKanji90E5Tex;
+
+#define dgMsgKanji90E6Tex "__OTR__textures/kanji/gMsgKanji90E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E6Tex[] = dgMsgKanji90E6Tex;
+
+#define dgMsgKanji90E7Tex "__OTR__textures/kanji/gMsgKanji90E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E7Tex[] = dgMsgKanji90E7Tex;
+
+#define dgMsgKanji90E8Tex "__OTR__textures/kanji/gMsgKanji90E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E8Tex[] = dgMsgKanji90E8Tex;
+
+#define dgMsgKanji90E9Tex "__OTR__textures/kanji/gMsgKanji90E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90E9Tex[] = dgMsgKanji90E9Tex;
+
+#define dgMsgKanji90EATex "__OTR__textures/kanji/gMsgKanji90EATex"
+static const ALIGN_ASSET(2) char gMsgKanji90EATex[] = dgMsgKanji90EATex;
+
+#define dgMsgKanji90EBTex "__OTR__textures/kanji/gMsgKanji90EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji90EBTex[] = dgMsgKanji90EBTex;
+
+#define dgMsgKanji90ECTex "__OTR__textures/kanji/gMsgKanji90ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji90ECTex[] = dgMsgKanji90ECTex;
+
+#define dgMsgKanji90EDTex "__OTR__textures/kanji/gMsgKanji90EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji90EDTex[] = dgMsgKanji90EDTex;
+
+#define dgMsgKanji90EETex "__OTR__textures/kanji/gMsgKanji90EETex"
+static const ALIGN_ASSET(2) char gMsgKanji90EETex[] = dgMsgKanji90EETex;
+
+#define dgMsgKanji90EFTex "__OTR__textures/kanji/gMsgKanji90EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji90EFTex[] = dgMsgKanji90EFTex;
+
+#define dgMsgKanji90F0Tex "__OTR__textures/kanji/gMsgKanji90F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F0Tex[] = dgMsgKanji90F0Tex;
+
+#define dgMsgKanji90F1Tex "__OTR__textures/kanji/gMsgKanji90F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F1Tex[] = dgMsgKanji90F1Tex;
+
+#define dgMsgKanji90F2Tex "__OTR__textures/kanji/gMsgKanji90F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F2Tex[] = dgMsgKanji90F2Tex;
+
+#define dgMsgKanji90F3Tex "__OTR__textures/kanji/gMsgKanji90F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F3Tex[] = dgMsgKanji90F3Tex;
+
+#define dgMsgKanji90F4Tex "__OTR__textures/kanji/gMsgKanji90F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F4Tex[] = dgMsgKanji90F4Tex;
+
+#define dgMsgKanji90F5Tex "__OTR__textures/kanji/gMsgKanji90F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F5Tex[] = dgMsgKanji90F5Tex;
+
+#define dgMsgKanji90F6Tex "__OTR__textures/kanji/gMsgKanji90F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F6Tex[] = dgMsgKanji90F6Tex;
+
+#define dgMsgKanji90F7Tex "__OTR__textures/kanji/gMsgKanji90F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F7Tex[] = dgMsgKanji90F7Tex;
+
+#define dgMsgKanji90F8Tex "__OTR__textures/kanji/gMsgKanji90F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F8Tex[] = dgMsgKanji90F8Tex;
+
+#define dgMsgKanji90F9Tex "__OTR__textures/kanji/gMsgKanji90F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji90F9Tex[] = dgMsgKanji90F9Tex;
+
+#define dgMsgKanji90FATex "__OTR__textures/kanji/gMsgKanji90FATex"
+static const ALIGN_ASSET(2) char gMsgKanji90FATex[] = dgMsgKanji90FATex;
+
+#define dgMsgKanji90FBTex "__OTR__textures/kanji/gMsgKanji90FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji90FBTex[] = dgMsgKanji90FBTex;
+
+#define dgMsgKanji90FCTex "__OTR__textures/kanji/gMsgKanji90FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji90FCTex[] = dgMsgKanji90FCTex;
+
+#define dgMsgKanji9140Tex "__OTR__textures/kanji/gMsgKanji9140Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9140Tex[] = dgMsgKanji9140Tex;
+
+#define dgMsgKanji9141Tex "__OTR__textures/kanji/gMsgKanji9141Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9141Tex[] = dgMsgKanji9141Tex;
+
+#define dgMsgKanji9142Tex "__OTR__textures/kanji/gMsgKanji9142Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9142Tex[] = dgMsgKanji9142Tex;
+
+#define dgMsgKanji9143Tex "__OTR__textures/kanji/gMsgKanji9143Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9143Tex[] = dgMsgKanji9143Tex;
+
+#define dgMsgKanji9144Tex "__OTR__textures/kanji/gMsgKanji9144Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9144Tex[] = dgMsgKanji9144Tex;
+
+#define dgMsgKanji9145Tex "__OTR__textures/kanji/gMsgKanji9145Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9145Tex[] = dgMsgKanji9145Tex;
+
+#define dgMsgKanji9146Tex "__OTR__textures/kanji/gMsgKanji9146Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9146Tex[] = dgMsgKanji9146Tex;
+
+#define dgMsgKanji9147Tex "__OTR__textures/kanji/gMsgKanji9147Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9147Tex[] = dgMsgKanji9147Tex;
+
+#define dgMsgKanji9148Tex "__OTR__textures/kanji/gMsgKanji9148Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9148Tex[] = dgMsgKanji9148Tex;
+
+#define dgMsgKanji9149Tex "__OTR__textures/kanji/gMsgKanji9149Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9149Tex[] = dgMsgKanji9149Tex;
+
+#define dgMsgKanji914ATex "__OTR__textures/kanji/gMsgKanji914ATex"
+static const ALIGN_ASSET(2) char gMsgKanji914ATex[] = dgMsgKanji914ATex;
+
+#define dgMsgKanji914BTex "__OTR__textures/kanji/gMsgKanji914BTex"
+static const ALIGN_ASSET(2) char gMsgKanji914BTex[] = dgMsgKanji914BTex;
+
+#define dgMsgKanji914CTex "__OTR__textures/kanji/gMsgKanji914CTex"
+static const ALIGN_ASSET(2) char gMsgKanji914CTex[] = dgMsgKanji914CTex;
+
+#define dgMsgKanji914DTex "__OTR__textures/kanji/gMsgKanji914DTex"
+static const ALIGN_ASSET(2) char gMsgKanji914DTex[] = dgMsgKanji914DTex;
+
+#define dgMsgKanji914ETex "__OTR__textures/kanji/gMsgKanji914ETex"
+static const ALIGN_ASSET(2) char gMsgKanji914ETex[] = dgMsgKanji914ETex;
+
+#define dgMsgKanji914FTex "__OTR__textures/kanji/gMsgKanji914FTex"
+static const ALIGN_ASSET(2) char gMsgKanji914FTex[] = dgMsgKanji914FTex;
+
+#define dgMsgKanji9150Tex "__OTR__textures/kanji/gMsgKanji9150Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9150Tex[] = dgMsgKanji9150Tex;
+
+#define dgMsgKanji9151Tex "__OTR__textures/kanji/gMsgKanji9151Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9151Tex[] = dgMsgKanji9151Tex;
+
+#define dgMsgKanji9152Tex "__OTR__textures/kanji/gMsgKanji9152Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9152Tex[] = dgMsgKanji9152Tex;
+
+#define dgMsgKanji9153Tex "__OTR__textures/kanji/gMsgKanji9153Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9153Tex[] = dgMsgKanji9153Tex;
+
+#define dgMsgKanji9154Tex "__OTR__textures/kanji/gMsgKanji9154Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9154Tex[] = dgMsgKanji9154Tex;
+
+#define dgMsgKanji9155Tex "__OTR__textures/kanji/gMsgKanji9155Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9155Tex[] = dgMsgKanji9155Tex;
+
+#define dgMsgKanji9156Tex "__OTR__textures/kanji/gMsgKanji9156Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9156Tex[] = dgMsgKanji9156Tex;
+
+#define dgMsgKanji9157Tex "__OTR__textures/kanji/gMsgKanji9157Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9157Tex[] = dgMsgKanji9157Tex;
+
+#define dgMsgKanji9158Tex "__OTR__textures/kanji/gMsgKanji9158Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9158Tex[] = dgMsgKanji9158Tex;
+
+#define dgMsgKanji9159Tex "__OTR__textures/kanji/gMsgKanji9159Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9159Tex[] = dgMsgKanji9159Tex;
+
+#define dgMsgKanji915ATex "__OTR__textures/kanji/gMsgKanji915ATex"
+static const ALIGN_ASSET(2) char gMsgKanji915ATex[] = dgMsgKanji915ATex;
+
+#define dgMsgKanji915BTex "__OTR__textures/kanji/gMsgKanji915BTex"
+static const ALIGN_ASSET(2) char gMsgKanji915BTex[] = dgMsgKanji915BTex;
+
+#define dgMsgKanji915CTex "__OTR__textures/kanji/gMsgKanji915CTex"
+static const ALIGN_ASSET(2) char gMsgKanji915CTex[] = dgMsgKanji915CTex;
+
+#define dgMsgKanji915DTex "__OTR__textures/kanji/gMsgKanji915DTex"
+static const ALIGN_ASSET(2) char gMsgKanji915DTex[] = dgMsgKanji915DTex;
+
+#define dgMsgKanji915ETex "__OTR__textures/kanji/gMsgKanji915ETex"
+static const ALIGN_ASSET(2) char gMsgKanji915ETex[] = dgMsgKanji915ETex;
+
+#define dgMsgKanji915FTex "__OTR__textures/kanji/gMsgKanji915FTex"
+static const ALIGN_ASSET(2) char gMsgKanji915FTex[] = dgMsgKanji915FTex;
+
+#define dgMsgKanji9160Tex "__OTR__textures/kanji/gMsgKanji9160Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9160Tex[] = dgMsgKanji9160Tex;
+
+#define dgMsgKanji9161Tex "__OTR__textures/kanji/gMsgKanji9161Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9161Tex[] = dgMsgKanji9161Tex;
+
+#define dgMsgKanji9162Tex "__OTR__textures/kanji/gMsgKanji9162Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9162Tex[] = dgMsgKanji9162Tex;
+
+#define dgMsgKanji9163Tex "__OTR__textures/kanji/gMsgKanji9163Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9163Tex[] = dgMsgKanji9163Tex;
+
+#define dgMsgKanji9164Tex "__OTR__textures/kanji/gMsgKanji9164Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9164Tex[] = dgMsgKanji9164Tex;
+
+#define dgMsgKanji9165Tex "__OTR__textures/kanji/gMsgKanji9165Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9165Tex[] = dgMsgKanji9165Tex;
+
+#define dgMsgKanji9166Tex "__OTR__textures/kanji/gMsgKanji9166Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9166Tex[] = dgMsgKanji9166Tex;
+
+#define dgMsgKanji9167Tex "__OTR__textures/kanji/gMsgKanji9167Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9167Tex[] = dgMsgKanji9167Tex;
+
+#define dgMsgKanji9168Tex "__OTR__textures/kanji/gMsgKanji9168Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9168Tex[] = dgMsgKanji9168Tex;
+
+#define dgMsgKanji9169Tex "__OTR__textures/kanji/gMsgKanji9169Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9169Tex[] = dgMsgKanji9169Tex;
+
+#define dgMsgKanji916ATex "__OTR__textures/kanji/gMsgKanji916ATex"
+static const ALIGN_ASSET(2) char gMsgKanji916ATex[] = dgMsgKanji916ATex;
+
+#define dgMsgKanji916BTex "__OTR__textures/kanji/gMsgKanji916BTex"
+static const ALIGN_ASSET(2) char gMsgKanji916BTex[] = dgMsgKanji916BTex;
+
+#define dgMsgKanji916CTex "__OTR__textures/kanji/gMsgKanji916CTex"
+static const ALIGN_ASSET(2) char gMsgKanji916CTex[] = dgMsgKanji916CTex;
+
+#define dgMsgKanji916DTex "__OTR__textures/kanji/gMsgKanji916DTex"
+static const ALIGN_ASSET(2) char gMsgKanji916DTex[] = dgMsgKanji916DTex;
+
+#define dgMsgKanji916ETex "__OTR__textures/kanji/gMsgKanji916ETex"
+static const ALIGN_ASSET(2) char gMsgKanji916ETex[] = dgMsgKanji916ETex;
+
+#define dgMsgKanji916FTex "__OTR__textures/kanji/gMsgKanji916FTex"
+static const ALIGN_ASSET(2) char gMsgKanji916FTex[] = dgMsgKanji916FTex;
+
+#define dgMsgKanji9170Tex "__OTR__textures/kanji/gMsgKanji9170Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9170Tex[] = dgMsgKanji9170Tex;
+
+#define dgMsgKanji9171Tex "__OTR__textures/kanji/gMsgKanji9171Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9171Tex[] = dgMsgKanji9171Tex;
+
+#define dgMsgKanji9172Tex "__OTR__textures/kanji/gMsgKanji9172Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9172Tex[] = dgMsgKanji9172Tex;
+
+#define dgMsgKanji9173Tex "__OTR__textures/kanji/gMsgKanji9173Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9173Tex[] = dgMsgKanji9173Tex;
+
+#define dgMsgKanji9174Tex "__OTR__textures/kanji/gMsgKanji9174Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9174Tex[] = dgMsgKanji9174Tex;
+
+#define dgMsgKanji9175Tex "__OTR__textures/kanji/gMsgKanji9175Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9175Tex[] = dgMsgKanji9175Tex;
+
+#define dgMsgKanji9176Tex "__OTR__textures/kanji/gMsgKanji9176Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9176Tex[] = dgMsgKanji9176Tex;
+
+#define dgMsgKanji9177Tex "__OTR__textures/kanji/gMsgKanji9177Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9177Tex[] = dgMsgKanji9177Tex;
+
+#define dgMsgKanji9178Tex "__OTR__textures/kanji/gMsgKanji9178Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9178Tex[] = dgMsgKanji9178Tex;
+
+#define dgMsgKanji9179Tex "__OTR__textures/kanji/gMsgKanji9179Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9179Tex[] = dgMsgKanji9179Tex;
+
+#define dgMsgKanji917ATex "__OTR__textures/kanji/gMsgKanji917ATex"
+static const ALIGN_ASSET(2) char gMsgKanji917ATex[] = dgMsgKanji917ATex;
+
+#define dgMsgKanji917BTex "__OTR__textures/kanji/gMsgKanji917BTex"
+static const ALIGN_ASSET(2) char gMsgKanji917BTex[] = dgMsgKanji917BTex;
+
+#define dgMsgKanji917CTex "__OTR__textures/kanji/gMsgKanji917CTex"
+static const ALIGN_ASSET(2) char gMsgKanji917CTex[] = dgMsgKanji917CTex;
+
+#define dgMsgKanji917DTex "__OTR__textures/kanji/gMsgKanji917DTex"
+static const ALIGN_ASSET(2) char gMsgKanji917DTex[] = dgMsgKanji917DTex;
+
+#define dgMsgKanji917ETex "__OTR__textures/kanji/gMsgKanji917ETex"
+static const ALIGN_ASSET(2) char gMsgKanji917ETex[] = dgMsgKanji917ETex;
+
+#define dgMsgKanji9180Tex "__OTR__textures/kanji/gMsgKanji9180Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9180Tex[] = dgMsgKanji9180Tex;
+
+#define dgMsgKanji9181Tex "__OTR__textures/kanji/gMsgKanji9181Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9181Tex[] = dgMsgKanji9181Tex;
+
+#define dgMsgKanji9182Tex "__OTR__textures/kanji/gMsgKanji9182Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9182Tex[] = dgMsgKanji9182Tex;
+
+#define dgMsgKanji9183Tex "__OTR__textures/kanji/gMsgKanji9183Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9183Tex[] = dgMsgKanji9183Tex;
+
+#define dgMsgKanji9184Tex "__OTR__textures/kanji/gMsgKanji9184Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9184Tex[] = dgMsgKanji9184Tex;
+
+#define dgMsgKanji9185Tex "__OTR__textures/kanji/gMsgKanji9185Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9185Tex[] = dgMsgKanji9185Tex;
+
+#define dgMsgKanji9186Tex "__OTR__textures/kanji/gMsgKanji9186Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9186Tex[] = dgMsgKanji9186Tex;
+
+#define dgMsgKanji9187Tex "__OTR__textures/kanji/gMsgKanji9187Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9187Tex[] = dgMsgKanji9187Tex;
+
+#define dgMsgKanji9188Tex "__OTR__textures/kanji/gMsgKanji9188Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9188Tex[] = dgMsgKanji9188Tex;
+
+#define dgMsgKanji9189Tex "__OTR__textures/kanji/gMsgKanji9189Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9189Tex[] = dgMsgKanji9189Tex;
+
+#define dgMsgKanji918ATex "__OTR__textures/kanji/gMsgKanji918ATex"
+static const ALIGN_ASSET(2) char gMsgKanji918ATex[] = dgMsgKanji918ATex;
+
+#define dgMsgKanji918BTex "__OTR__textures/kanji/gMsgKanji918BTex"
+static const ALIGN_ASSET(2) char gMsgKanji918BTex[] = dgMsgKanji918BTex;
+
+#define dgMsgKanji918CTex "__OTR__textures/kanji/gMsgKanji918CTex"
+static const ALIGN_ASSET(2) char gMsgKanji918CTex[] = dgMsgKanji918CTex;
+
+#define dgMsgKanji918DTex "__OTR__textures/kanji/gMsgKanji918DTex"
+static const ALIGN_ASSET(2) char gMsgKanji918DTex[] = dgMsgKanji918DTex;
+
+#define dgMsgKanji918ETex "__OTR__textures/kanji/gMsgKanji918ETex"
+static const ALIGN_ASSET(2) char gMsgKanji918ETex[] = dgMsgKanji918ETex;
+
+#define dgMsgKanji918FTex "__OTR__textures/kanji/gMsgKanji918FTex"
+static const ALIGN_ASSET(2) char gMsgKanji918FTex[] = dgMsgKanji918FTex;
+
+#define dgMsgKanji9190Tex "__OTR__textures/kanji/gMsgKanji9190Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9190Tex[] = dgMsgKanji9190Tex;
+
+#define dgMsgKanji9191Tex "__OTR__textures/kanji/gMsgKanji9191Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9191Tex[] = dgMsgKanji9191Tex;
+
+#define dgMsgKanji9192Tex "__OTR__textures/kanji/gMsgKanji9192Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9192Tex[] = dgMsgKanji9192Tex;
+
+#define dgMsgKanji9193Tex "__OTR__textures/kanji/gMsgKanji9193Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9193Tex[] = dgMsgKanji9193Tex;
+
+#define dgMsgKanji9194Tex "__OTR__textures/kanji/gMsgKanji9194Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9194Tex[] = dgMsgKanji9194Tex;
+
+#define dgMsgKanji9195Tex "__OTR__textures/kanji/gMsgKanji9195Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9195Tex[] = dgMsgKanji9195Tex;
+
+#define dgMsgKanji9196Tex "__OTR__textures/kanji/gMsgKanji9196Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9196Tex[] = dgMsgKanji9196Tex;
+
+#define dgMsgKanji9197Tex "__OTR__textures/kanji/gMsgKanji9197Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9197Tex[] = dgMsgKanji9197Tex;
+
+#define dgMsgKanji9198Tex "__OTR__textures/kanji/gMsgKanji9198Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9198Tex[] = dgMsgKanji9198Tex;
+
+#define dgMsgKanji9199Tex "__OTR__textures/kanji/gMsgKanji9199Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9199Tex[] = dgMsgKanji9199Tex;
+
+#define dgMsgKanji919ATex "__OTR__textures/kanji/gMsgKanji919ATex"
+static const ALIGN_ASSET(2) char gMsgKanji919ATex[] = dgMsgKanji919ATex;
+
+#define dgMsgKanji919BTex "__OTR__textures/kanji/gMsgKanji919BTex"
+static const ALIGN_ASSET(2) char gMsgKanji919BTex[] = dgMsgKanji919BTex;
+
+#define dgMsgKanji919CTex "__OTR__textures/kanji/gMsgKanji919CTex"
+static const ALIGN_ASSET(2) char gMsgKanji919CTex[] = dgMsgKanji919CTex;
+
+#define dgMsgKanji919DTex "__OTR__textures/kanji/gMsgKanji919DTex"
+static const ALIGN_ASSET(2) char gMsgKanji919DTex[] = dgMsgKanji919DTex;
+
+#define dgMsgKanji919ETex "__OTR__textures/kanji/gMsgKanji919ETex"
+static const ALIGN_ASSET(2) char gMsgKanji919ETex[] = dgMsgKanji919ETex;
+
+#define dgMsgKanji919FTex "__OTR__textures/kanji/gMsgKanji919FTex"
+static const ALIGN_ASSET(2) char gMsgKanji919FTex[] = dgMsgKanji919FTex;
+
+#define dgMsgKanji91A0Tex "__OTR__textures/kanji/gMsgKanji91A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A0Tex[] = dgMsgKanji91A0Tex;
+
+#define dgMsgKanji91A1Tex "__OTR__textures/kanji/gMsgKanji91A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A1Tex[] = dgMsgKanji91A1Tex;
+
+#define dgMsgKanji91A2Tex "__OTR__textures/kanji/gMsgKanji91A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A2Tex[] = dgMsgKanji91A2Tex;
+
+#define dgMsgKanji91A3Tex "__OTR__textures/kanji/gMsgKanji91A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A3Tex[] = dgMsgKanji91A3Tex;
+
+#define dgMsgKanji91A4Tex "__OTR__textures/kanji/gMsgKanji91A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A4Tex[] = dgMsgKanji91A4Tex;
+
+#define dgMsgKanji91A5Tex "__OTR__textures/kanji/gMsgKanji91A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A5Tex[] = dgMsgKanji91A5Tex;
+
+#define dgMsgKanji91A6Tex "__OTR__textures/kanji/gMsgKanji91A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A6Tex[] = dgMsgKanji91A6Tex;
+
+#define dgMsgKanji91A7Tex "__OTR__textures/kanji/gMsgKanji91A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A7Tex[] = dgMsgKanji91A7Tex;
+
+#define dgMsgKanji91A8Tex "__OTR__textures/kanji/gMsgKanji91A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A8Tex[] = dgMsgKanji91A8Tex;
+
+#define dgMsgKanji91A9Tex "__OTR__textures/kanji/gMsgKanji91A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91A9Tex[] = dgMsgKanji91A9Tex;
+
+#define dgMsgKanji91AATex "__OTR__textures/kanji/gMsgKanji91AATex"
+static const ALIGN_ASSET(2) char gMsgKanji91AATex[] = dgMsgKanji91AATex;
+
+#define dgMsgKanji91ABTex "__OTR__textures/kanji/gMsgKanji91ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji91ABTex[] = dgMsgKanji91ABTex;
+
+#define dgMsgKanji91ACTex "__OTR__textures/kanji/gMsgKanji91ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji91ACTex[] = dgMsgKanji91ACTex;
+
+#define dgMsgKanji91ADTex "__OTR__textures/kanji/gMsgKanji91ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji91ADTex[] = dgMsgKanji91ADTex;
+
+#define dgMsgKanji91AETex "__OTR__textures/kanji/gMsgKanji91AETex"
+static const ALIGN_ASSET(2) char gMsgKanji91AETex[] = dgMsgKanji91AETex;
+
+#define dgMsgKanji91AFTex "__OTR__textures/kanji/gMsgKanji91AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji91AFTex[] = dgMsgKanji91AFTex;
+
+#define dgMsgKanji91B0Tex "__OTR__textures/kanji/gMsgKanji91B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B0Tex[] = dgMsgKanji91B0Tex;
+
+#define dgMsgKanji91B1Tex "__OTR__textures/kanji/gMsgKanji91B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B1Tex[] = dgMsgKanji91B1Tex;
+
+#define dgMsgKanji91B2Tex "__OTR__textures/kanji/gMsgKanji91B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B2Tex[] = dgMsgKanji91B2Tex;
+
+#define dgMsgKanji91B3Tex "__OTR__textures/kanji/gMsgKanji91B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B3Tex[] = dgMsgKanji91B3Tex;
+
+#define dgMsgKanji91B4Tex "__OTR__textures/kanji/gMsgKanji91B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B4Tex[] = dgMsgKanji91B4Tex;
+
+#define dgMsgKanji91B5Tex "__OTR__textures/kanji/gMsgKanji91B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B5Tex[] = dgMsgKanji91B5Tex;
+
+#define dgMsgKanji91B6Tex "__OTR__textures/kanji/gMsgKanji91B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B6Tex[] = dgMsgKanji91B6Tex;
+
+#define dgMsgKanji91B7Tex "__OTR__textures/kanji/gMsgKanji91B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B7Tex[] = dgMsgKanji91B7Tex;
+
+#define dgMsgKanji91B8Tex "__OTR__textures/kanji/gMsgKanji91B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B8Tex[] = dgMsgKanji91B8Tex;
+
+#define dgMsgKanji91B9Tex "__OTR__textures/kanji/gMsgKanji91B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91B9Tex[] = dgMsgKanji91B9Tex;
+
+#define dgMsgKanji91BATex "__OTR__textures/kanji/gMsgKanji91BATex"
+static const ALIGN_ASSET(2) char gMsgKanji91BATex[] = dgMsgKanji91BATex;
+
+#define dgMsgKanji91BBTex "__OTR__textures/kanji/gMsgKanji91BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji91BBTex[] = dgMsgKanji91BBTex;
+
+#define dgMsgKanji91BCTex "__OTR__textures/kanji/gMsgKanji91BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji91BCTex[] = dgMsgKanji91BCTex;
+
+#define dgMsgKanji91BDTex "__OTR__textures/kanji/gMsgKanji91BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji91BDTex[] = dgMsgKanji91BDTex;
+
+#define dgMsgKanji91BETex "__OTR__textures/kanji/gMsgKanji91BETex"
+static const ALIGN_ASSET(2) char gMsgKanji91BETex[] = dgMsgKanji91BETex;
+
+#define dgMsgKanji91BFTex "__OTR__textures/kanji/gMsgKanji91BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji91BFTex[] = dgMsgKanji91BFTex;
+
+#define dgMsgKanji91C0Tex "__OTR__textures/kanji/gMsgKanji91C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C0Tex[] = dgMsgKanji91C0Tex;
+
+#define dgMsgKanji91C1Tex "__OTR__textures/kanji/gMsgKanji91C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C1Tex[] = dgMsgKanji91C1Tex;
+
+#define dgMsgKanji91C2Tex "__OTR__textures/kanji/gMsgKanji91C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C2Tex[] = dgMsgKanji91C2Tex;
+
+#define dgMsgKanji91C3Tex "__OTR__textures/kanji/gMsgKanji91C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C3Tex[] = dgMsgKanji91C3Tex;
+
+#define dgMsgKanji91C4Tex "__OTR__textures/kanji/gMsgKanji91C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C4Tex[] = dgMsgKanji91C4Tex;
+
+#define dgMsgKanji91C5Tex "__OTR__textures/kanji/gMsgKanji91C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C5Tex[] = dgMsgKanji91C5Tex;
+
+#define dgMsgKanji91C6Tex "__OTR__textures/kanji/gMsgKanji91C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C6Tex[] = dgMsgKanji91C6Tex;
+
+#define dgMsgKanji91C7Tex "__OTR__textures/kanji/gMsgKanji91C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C7Tex[] = dgMsgKanji91C7Tex;
+
+#define dgMsgKanji91C8Tex "__OTR__textures/kanji/gMsgKanji91C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C8Tex[] = dgMsgKanji91C8Tex;
+
+#define dgMsgKanji91C9Tex "__OTR__textures/kanji/gMsgKanji91C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91C9Tex[] = dgMsgKanji91C9Tex;
+
+#define dgMsgKanji91CATex "__OTR__textures/kanji/gMsgKanji91CATex"
+static const ALIGN_ASSET(2) char gMsgKanji91CATex[] = dgMsgKanji91CATex;
+
+#define dgMsgKanji91CBTex "__OTR__textures/kanji/gMsgKanji91CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji91CBTex[] = dgMsgKanji91CBTex;
+
+#define dgMsgKanji91CCTex "__OTR__textures/kanji/gMsgKanji91CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji91CCTex[] = dgMsgKanji91CCTex;
+
+#define dgMsgKanji91CDTex "__OTR__textures/kanji/gMsgKanji91CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji91CDTex[] = dgMsgKanji91CDTex;
+
+#define dgMsgKanji91CETex "__OTR__textures/kanji/gMsgKanji91CETex"
+static const ALIGN_ASSET(2) char gMsgKanji91CETex[] = dgMsgKanji91CETex;
+
+#define dgMsgKanji91CFTex "__OTR__textures/kanji/gMsgKanji91CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji91CFTex[] = dgMsgKanji91CFTex;
+
+#define dgMsgKanji91D0Tex "__OTR__textures/kanji/gMsgKanji91D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D0Tex[] = dgMsgKanji91D0Tex;
+
+#define dgMsgKanji91D1Tex "__OTR__textures/kanji/gMsgKanji91D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D1Tex[] = dgMsgKanji91D1Tex;
+
+#define dgMsgKanji91D2Tex "__OTR__textures/kanji/gMsgKanji91D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D2Tex[] = dgMsgKanji91D2Tex;
+
+#define dgMsgKanji91D3Tex "__OTR__textures/kanji/gMsgKanji91D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D3Tex[] = dgMsgKanji91D3Tex;
+
+#define dgMsgKanji91D4Tex "__OTR__textures/kanji/gMsgKanji91D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D4Tex[] = dgMsgKanji91D4Tex;
+
+#define dgMsgKanji91D5Tex "__OTR__textures/kanji/gMsgKanji91D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D5Tex[] = dgMsgKanji91D5Tex;
+
+#define dgMsgKanji91D6Tex "__OTR__textures/kanji/gMsgKanji91D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D6Tex[] = dgMsgKanji91D6Tex;
+
+#define dgMsgKanji91D7Tex "__OTR__textures/kanji/gMsgKanji91D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D7Tex[] = dgMsgKanji91D7Tex;
+
+#define dgMsgKanji91D8Tex "__OTR__textures/kanji/gMsgKanji91D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D8Tex[] = dgMsgKanji91D8Tex;
+
+#define dgMsgKanji91D9Tex "__OTR__textures/kanji/gMsgKanji91D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91D9Tex[] = dgMsgKanji91D9Tex;
+
+#define dgMsgKanji91DATex "__OTR__textures/kanji/gMsgKanji91DATex"
+static const ALIGN_ASSET(2) char gMsgKanji91DATex[] = dgMsgKanji91DATex;
+
+#define dgMsgKanji91DBTex "__OTR__textures/kanji/gMsgKanji91DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji91DBTex[] = dgMsgKanji91DBTex;
+
+#define dgMsgKanji91DCTex "__OTR__textures/kanji/gMsgKanji91DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji91DCTex[] = dgMsgKanji91DCTex;
+
+#define dgMsgKanji91DDTex "__OTR__textures/kanji/gMsgKanji91DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji91DDTex[] = dgMsgKanji91DDTex;
+
+#define dgMsgKanji91DETex "__OTR__textures/kanji/gMsgKanji91DETex"
+static const ALIGN_ASSET(2) char gMsgKanji91DETex[] = dgMsgKanji91DETex;
+
+#define dgMsgKanji91DFTex "__OTR__textures/kanji/gMsgKanji91DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji91DFTex[] = dgMsgKanji91DFTex;
+
+#define dgMsgKanji91E0Tex "__OTR__textures/kanji/gMsgKanji91E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E0Tex[] = dgMsgKanji91E0Tex;
+
+#define dgMsgKanji91E1Tex "__OTR__textures/kanji/gMsgKanji91E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E1Tex[] = dgMsgKanji91E1Tex;
+
+#define dgMsgKanji91E2Tex "__OTR__textures/kanji/gMsgKanji91E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E2Tex[] = dgMsgKanji91E2Tex;
+
+#define dgMsgKanji91E3Tex "__OTR__textures/kanji/gMsgKanji91E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E3Tex[] = dgMsgKanji91E3Tex;
+
+#define dgMsgKanji91E4Tex "__OTR__textures/kanji/gMsgKanji91E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E4Tex[] = dgMsgKanji91E4Tex;
+
+#define dgMsgKanji91E5Tex "__OTR__textures/kanji/gMsgKanji91E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E5Tex[] = dgMsgKanji91E5Tex;
+
+#define dgMsgKanji91E6Tex "__OTR__textures/kanji/gMsgKanji91E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E6Tex[] = dgMsgKanji91E6Tex;
+
+#define dgMsgKanji91E7Tex "__OTR__textures/kanji/gMsgKanji91E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E7Tex[] = dgMsgKanji91E7Tex;
+
+#define dgMsgKanji91E8Tex "__OTR__textures/kanji/gMsgKanji91E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E8Tex[] = dgMsgKanji91E8Tex;
+
+#define dgMsgKanji91E9Tex "__OTR__textures/kanji/gMsgKanji91E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91E9Tex[] = dgMsgKanji91E9Tex;
+
+#define dgMsgKanji91EATex "__OTR__textures/kanji/gMsgKanji91EATex"
+static const ALIGN_ASSET(2) char gMsgKanji91EATex[] = dgMsgKanji91EATex;
+
+#define dgMsgKanji91EBTex "__OTR__textures/kanji/gMsgKanji91EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji91EBTex[] = dgMsgKanji91EBTex;
+
+#define dgMsgKanji91ECTex "__OTR__textures/kanji/gMsgKanji91ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji91ECTex[] = dgMsgKanji91ECTex;
+
+#define dgMsgKanji91EDTex "__OTR__textures/kanji/gMsgKanji91EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji91EDTex[] = dgMsgKanji91EDTex;
+
+#define dgMsgKanji91EETex "__OTR__textures/kanji/gMsgKanji91EETex"
+static const ALIGN_ASSET(2) char gMsgKanji91EETex[] = dgMsgKanji91EETex;
+
+#define dgMsgKanji91EFTex "__OTR__textures/kanji/gMsgKanji91EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji91EFTex[] = dgMsgKanji91EFTex;
+
+#define dgMsgKanji91F0Tex "__OTR__textures/kanji/gMsgKanji91F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F0Tex[] = dgMsgKanji91F0Tex;
+
+#define dgMsgKanji91F1Tex "__OTR__textures/kanji/gMsgKanji91F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F1Tex[] = dgMsgKanji91F1Tex;
+
+#define dgMsgKanji91F2Tex "__OTR__textures/kanji/gMsgKanji91F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F2Tex[] = dgMsgKanji91F2Tex;
+
+#define dgMsgKanji91F3Tex "__OTR__textures/kanji/gMsgKanji91F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F3Tex[] = dgMsgKanji91F3Tex;
+
+#define dgMsgKanji91F4Tex "__OTR__textures/kanji/gMsgKanji91F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F4Tex[] = dgMsgKanji91F4Tex;
+
+#define dgMsgKanji91F5Tex "__OTR__textures/kanji/gMsgKanji91F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F5Tex[] = dgMsgKanji91F5Tex;
+
+#define dgMsgKanji91F6Tex "__OTR__textures/kanji/gMsgKanji91F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F6Tex[] = dgMsgKanji91F6Tex;
+
+#define dgMsgKanji91F7Tex "__OTR__textures/kanji/gMsgKanji91F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F7Tex[] = dgMsgKanji91F7Tex;
+
+#define dgMsgKanji91F8Tex "__OTR__textures/kanji/gMsgKanji91F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F8Tex[] = dgMsgKanji91F8Tex;
+
+#define dgMsgKanji91F9Tex "__OTR__textures/kanji/gMsgKanji91F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji91F9Tex[] = dgMsgKanji91F9Tex;
+
+#define dgMsgKanji91FATex "__OTR__textures/kanji/gMsgKanji91FATex"
+static const ALIGN_ASSET(2) char gMsgKanji91FATex[] = dgMsgKanji91FATex;
+
+#define dgMsgKanji91FBTex "__OTR__textures/kanji/gMsgKanji91FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji91FBTex[] = dgMsgKanji91FBTex;
+
+#define dgMsgKanji91FCTex "__OTR__textures/kanji/gMsgKanji91FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji91FCTex[] = dgMsgKanji91FCTex;
+
+#define dgMsgKanji9240Tex "__OTR__textures/kanji/gMsgKanji9240Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9240Tex[] = dgMsgKanji9240Tex;
+
+#define dgMsgKanji9241Tex "__OTR__textures/kanji/gMsgKanji9241Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9241Tex[] = dgMsgKanji9241Tex;
+
+#define dgMsgKanji9242Tex "__OTR__textures/kanji/gMsgKanji9242Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9242Tex[] = dgMsgKanji9242Tex;
+
+#define dgMsgKanji9243Tex "__OTR__textures/kanji/gMsgKanji9243Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9243Tex[] = dgMsgKanji9243Tex;
+
+#define dgMsgKanji9244Tex "__OTR__textures/kanji/gMsgKanji9244Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9244Tex[] = dgMsgKanji9244Tex;
+
+#define dgMsgKanji9245Tex "__OTR__textures/kanji/gMsgKanji9245Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9245Tex[] = dgMsgKanji9245Tex;
+
+#define dgMsgKanji9246Tex "__OTR__textures/kanji/gMsgKanji9246Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9246Tex[] = dgMsgKanji9246Tex;
+
+#define dgMsgKanji9247Tex "__OTR__textures/kanji/gMsgKanji9247Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9247Tex[] = dgMsgKanji9247Tex;
+
+#define dgMsgKanji9248Tex "__OTR__textures/kanji/gMsgKanji9248Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9248Tex[] = dgMsgKanji9248Tex;
+
+#define dgMsgKanji9249Tex "__OTR__textures/kanji/gMsgKanji9249Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9249Tex[] = dgMsgKanji9249Tex;
+
+#define dgMsgKanji924ATex "__OTR__textures/kanji/gMsgKanji924ATex"
+static const ALIGN_ASSET(2) char gMsgKanji924ATex[] = dgMsgKanji924ATex;
+
+#define dgMsgKanji924BTex "__OTR__textures/kanji/gMsgKanji924BTex"
+static const ALIGN_ASSET(2) char gMsgKanji924BTex[] = dgMsgKanji924BTex;
+
+#define dgMsgKanji924CTex "__OTR__textures/kanji/gMsgKanji924CTex"
+static const ALIGN_ASSET(2) char gMsgKanji924CTex[] = dgMsgKanji924CTex;
+
+#define dgMsgKanji924DTex "__OTR__textures/kanji/gMsgKanji924DTex"
+static const ALIGN_ASSET(2) char gMsgKanji924DTex[] = dgMsgKanji924DTex;
+
+#define dgMsgKanji924ETex "__OTR__textures/kanji/gMsgKanji924ETex"
+static const ALIGN_ASSET(2) char gMsgKanji924ETex[] = dgMsgKanji924ETex;
+
+#define dgMsgKanji924FTex "__OTR__textures/kanji/gMsgKanji924FTex"
+static const ALIGN_ASSET(2) char gMsgKanji924FTex[] = dgMsgKanji924FTex;
+
+#define dgMsgKanji9250Tex "__OTR__textures/kanji/gMsgKanji9250Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9250Tex[] = dgMsgKanji9250Tex;
+
+#define dgMsgKanji9251Tex "__OTR__textures/kanji/gMsgKanji9251Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9251Tex[] = dgMsgKanji9251Tex;
+
+#define dgMsgKanji9252Tex "__OTR__textures/kanji/gMsgKanji9252Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9252Tex[] = dgMsgKanji9252Tex;
+
+#define dgMsgKanji9253Tex "__OTR__textures/kanji/gMsgKanji9253Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9253Tex[] = dgMsgKanji9253Tex;
+
+#define dgMsgKanji9254Tex "__OTR__textures/kanji/gMsgKanji9254Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9254Tex[] = dgMsgKanji9254Tex;
+
+#define dgMsgKanji9255Tex "__OTR__textures/kanji/gMsgKanji9255Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9255Tex[] = dgMsgKanji9255Tex;
+
+#define dgMsgKanji9256Tex "__OTR__textures/kanji/gMsgKanji9256Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9256Tex[] = dgMsgKanji9256Tex;
+
+#define dgMsgKanji9257Tex "__OTR__textures/kanji/gMsgKanji9257Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9257Tex[] = dgMsgKanji9257Tex;
+
+#define dgMsgKanji9258Tex "__OTR__textures/kanji/gMsgKanji9258Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9258Tex[] = dgMsgKanji9258Tex;
+
+#define dgMsgKanji9259Tex "__OTR__textures/kanji/gMsgKanji9259Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9259Tex[] = dgMsgKanji9259Tex;
+
+#define dgMsgKanji925ATex "__OTR__textures/kanji/gMsgKanji925ATex"
+static const ALIGN_ASSET(2) char gMsgKanji925ATex[] = dgMsgKanji925ATex;
+
+#define dgMsgKanji925BTex "__OTR__textures/kanji/gMsgKanji925BTex"
+static const ALIGN_ASSET(2) char gMsgKanji925BTex[] = dgMsgKanji925BTex;
+
+#define dgMsgKanji925CTex "__OTR__textures/kanji/gMsgKanji925CTex"
+static const ALIGN_ASSET(2) char gMsgKanji925CTex[] = dgMsgKanji925CTex;
+
+#define dgMsgKanji925DTex "__OTR__textures/kanji/gMsgKanji925DTex"
+static const ALIGN_ASSET(2) char gMsgKanji925DTex[] = dgMsgKanji925DTex;
+
+#define dgMsgKanji925ETex "__OTR__textures/kanji/gMsgKanji925ETex"
+static const ALIGN_ASSET(2) char gMsgKanji925ETex[] = dgMsgKanji925ETex;
+
+#define dgMsgKanji925FTex "__OTR__textures/kanji/gMsgKanji925FTex"
+static const ALIGN_ASSET(2) char gMsgKanji925FTex[] = dgMsgKanji925FTex;
+
+#define dgMsgKanji9260Tex "__OTR__textures/kanji/gMsgKanji9260Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9260Tex[] = dgMsgKanji9260Tex;
+
+#define dgMsgKanji9261Tex "__OTR__textures/kanji/gMsgKanji9261Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9261Tex[] = dgMsgKanji9261Tex;
+
+#define dgMsgKanji9262Tex "__OTR__textures/kanji/gMsgKanji9262Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9262Tex[] = dgMsgKanji9262Tex;
+
+#define dgMsgKanji9263Tex "__OTR__textures/kanji/gMsgKanji9263Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9263Tex[] = dgMsgKanji9263Tex;
+
+#define dgMsgKanji9264Tex "__OTR__textures/kanji/gMsgKanji9264Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9264Tex[] = dgMsgKanji9264Tex;
+
+#define dgMsgKanji9265Tex "__OTR__textures/kanji/gMsgKanji9265Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9265Tex[] = dgMsgKanji9265Tex;
+
+#define dgMsgKanji9266Tex "__OTR__textures/kanji/gMsgKanji9266Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9266Tex[] = dgMsgKanji9266Tex;
+
+#define dgMsgKanji9267Tex "__OTR__textures/kanji/gMsgKanji9267Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9267Tex[] = dgMsgKanji9267Tex;
+
+#define dgMsgKanji9268Tex "__OTR__textures/kanji/gMsgKanji9268Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9268Tex[] = dgMsgKanji9268Tex;
+
+#define dgMsgKanji9269Tex "__OTR__textures/kanji/gMsgKanji9269Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9269Tex[] = dgMsgKanji9269Tex;
+
+#define dgMsgKanji926ATex "__OTR__textures/kanji/gMsgKanji926ATex"
+static const ALIGN_ASSET(2) char gMsgKanji926ATex[] = dgMsgKanji926ATex;
+
+#define dgMsgKanji926BTex "__OTR__textures/kanji/gMsgKanji926BTex"
+static const ALIGN_ASSET(2) char gMsgKanji926BTex[] = dgMsgKanji926BTex;
+
+#define dgMsgKanji926CTex "__OTR__textures/kanji/gMsgKanji926CTex"
+static const ALIGN_ASSET(2) char gMsgKanji926CTex[] = dgMsgKanji926CTex;
+
+#define dgMsgKanji926DTex "__OTR__textures/kanji/gMsgKanji926DTex"
+static const ALIGN_ASSET(2) char gMsgKanji926DTex[] = dgMsgKanji926DTex;
+
+#define dgMsgKanji926ETex "__OTR__textures/kanji/gMsgKanji926ETex"
+static const ALIGN_ASSET(2) char gMsgKanji926ETex[] = dgMsgKanji926ETex;
+
+#define dgMsgKanji926FTex "__OTR__textures/kanji/gMsgKanji926FTex"
+static const ALIGN_ASSET(2) char gMsgKanji926FTex[] = dgMsgKanji926FTex;
+
+#define dgMsgKanji9270Tex "__OTR__textures/kanji/gMsgKanji9270Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9270Tex[] = dgMsgKanji9270Tex;
+
+#define dgMsgKanji9271Tex "__OTR__textures/kanji/gMsgKanji9271Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9271Tex[] = dgMsgKanji9271Tex;
+
+#define dgMsgKanji9272Tex "__OTR__textures/kanji/gMsgKanji9272Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9272Tex[] = dgMsgKanji9272Tex;
+
+#define dgMsgKanji9273Tex "__OTR__textures/kanji/gMsgKanji9273Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9273Tex[] = dgMsgKanji9273Tex;
+
+#define dgMsgKanji9274Tex "__OTR__textures/kanji/gMsgKanji9274Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9274Tex[] = dgMsgKanji9274Tex;
+
+#define dgMsgKanji9275Tex "__OTR__textures/kanji/gMsgKanji9275Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9275Tex[] = dgMsgKanji9275Tex;
+
+#define dgMsgKanji9276Tex "__OTR__textures/kanji/gMsgKanji9276Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9276Tex[] = dgMsgKanji9276Tex;
+
+#define dgMsgKanji9277Tex "__OTR__textures/kanji/gMsgKanji9277Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9277Tex[] = dgMsgKanji9277Tex;
+
+#define dgMsgKanji9278Tex "__OTR__textures/kanji/gMsgKanji9278Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9278Tex[] = dgMsgKanji9278Tex;
+
+#define dgMsgKanji9279Tex "__OTR__textures/kanji/gMsgKanji9279Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9279Tex[] = dgMsgKanji9279Tex;
+
+#define dgMsgKanji927ATex "__OTR__textures/kanji/gMsgKanji927ATex"
+static const ALIGN_ASSET(2) char gMsgKanji927ATex[] = dgMsgKanji927ATex;
+
+#define dgMsgKanji927BTex "__OTR__textures/kanji/gMsgKanji927BTex"
+static const ALIGN_ASSET(2) char gMsgKanji927BTex[] = dgMsgKanji927BTex;
+
+#define dgMsgKanji927CTex "__OTR__textures/kanji/gMsgKanji927CTex"
+static const ALIGN_ASSET(2) char gMsgKanji927CTex[] = dgMsgKanji927CTex;
+
+#define dgMsgKanji927DTex "__OTR__textures/kanji/gMsgKanji927DTex"
+static const ALIGN_ASSET(2) char gMsgKanji927DTex[] = dgMsgKanji927DTex;
+
+#define dgMsgKanji927ETex "__OTR__textures/kanji/gMsgKanji927ETex"
+static const ALIGN_ASSET(2) char gMsgKanji927ETex[] = dgMsgKanji927ETex;
+
+#define dgMsgKanji9280Tex "__OTR__textures/kanji/gMsgKanji9280Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9280Tex[] = dgMsgKanji9280Tex;
+
+#define dgMsgKanji9281Tex "__OTR__textures/kanji/gMsgKanji9281Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9281Tex[] = dgMsgKanji9281Tex;
+
+#define dgMsgKanji9282Tex "__OTR__textures/kanji/gMsgKanji9282Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9282Tex[] = dgMsgKanji9282Tex;
+
+#define dgMsgKanji9283Tex "__OTR__textures/kanji/gMsgKanji9283Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9283Tex[] = dgMsgKanji9283Tex;
+
+#define dgMsgKanji9284Tex "__OTR__textures/kanji/gMsgKanji9284Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9284Tex[] = dgMsgKanji9284Tex;
+
+#define dgMsgKanji9285Tex "__OTR__textures/kanji/gMsgKanji9285Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9285Tex[] = dgMsgKanji9285Tex;
+
+#define dgMsgKanji9286Tex "__OTR__textures/kanji/gMsgKanji9286Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9286Tex[] = dgMsgKanji9286Tex;
+
+#define dgMsgKanji9287Tex "__OTR__textures/kanji/gMsgKanji9287Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9287Tex[] = dgMsgKanji9287Tex;
+
+#define dgMsgKanji9288Tex "__OTR__textures/kanji/gMsgKanji9288Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9288Tex[] = dgMsgKanji9288Tex;
+
+#define dgMsgKanji9289Tex "__OTR__textures/kanji/gMsgKanji9289Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9289Tex[] = dgMsgKanji9289Tex;
+
+#define dgMsgKanji928ATex "__OTR__textures/kanji/gMsgKanji928ATex"
+static const ALIGN_ASSET(2) char gMsgKanji928ATex[] = dgMsgKanji928ATex;
+
+#define dgMsgKanji928BTex "__OTR__textures/kanji/gMsgKanji928BTex"
+static const ALIGN_ASSET(2) char gMsgKanji928BTex[] = dgMsgKanji928BTex;
+
+#define dgMsgKanji928CTex "__OTR__textures/kanji/gMsgKanji928CTex"
+static const ALIGN_ASSET(2) char gMsgKanji928CTex[] = dgMsgKanji928CTex;
+
+#define dgMsgKanji928DTex "__OTR__textures/kanji/gMsgKanji928DTex"
+static const ALIGN_ASSET(2) char gMsgKanji928DTex[] = dgMsgKanji928DTex;
+
+#define dgMsgKanji928ETex "__OTR__textures/kanji/gMsgKanji928ETex"
+static const ALIGN_ASSET(2) char gMsgKanji928ETex[] = dgMsgKanji928ETex;
+
+#define dgMsgKanji928FTex "__OTR__textures/kanji/gMsgKanji928FTex"
+static const ALIGN_ASSET(2) char gMsgKanji928FTex[] = dgMsgKanji928FTex;
+
+#define dgMsgKanji9290Tex "__OTR__textures/kanji/gMsgKanji9290Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9290Tex[] = dgMsgKanji9290Tex;
+
+#define dgMsgKanji9291Tex "__OTR__textures/kanji/gMsgKanji9291Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9291Tex[] = dgMsgKanji9291Tex;
+
+#define dgMsgKanji9292Tex "__OTR__textures/kanji/gMsgKanji9292Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9292Tex[] = dgMsgKanji9292Tex;
+
+#define dgMsgKanji9293Tex "__OTR__textures/kanji/gMsgKanji9293Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9293Tex[] = dgMsgKanji9293Tex;
+
+#define dgMsgKanji9294Tex "__OTR__textures/kanji/gMsgKanji9294Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9294Tex[] = dgMsgKanji9294Tex;
+
+#define dgMsgKanji9295Tex "__OTR__textures/kanji/gMsgKanji9295Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9295Tex[] = dgMsgKanji9295Tex;
+
+#define dgMsgKanji9296Tex "__OTR__textures/kanji/gMsgKanji9296Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9296Tex[] = dgMsgKanji9296Tex;
+
+#define dgMsgKanji9297Tex "__OTR__textures/kanji/gMsgKanji9297Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9297Tex[] = dgMsgKanji9297Tex;
+
+#define dgMsgKanji9298Tex "__OTR__textures/kanji/gMsgKanji9298Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9298Tex[] = dgMsgKanji9298Tex;
+
+#define dgMsgKanji9299Tex "__OTR__textures/kanji/gMsgKanji9299Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9299Tex[] = dgMsgKanji9299Tex;
+
+#define dgMsgKanji929ATex "__OTR__textures/kanji/gMsgKanji929ATex"
+static const ALIGN_ASSET(2) char gMsgKanji929ATex[] = dgMsgKanji929ATex;
+
+#define dgMsgKanji929BTex "__OTR__textures/kanji/gMsgKanji929BTex"
+static const ALIGN_ASSET(2) char gMsgKanji929BTex[] = dgMsgKanji929BTex;
+
+#define dgMsgKanji929CTex "__OTR__textures/kanji/gMsgKanji929CTex"
+static const ALIGN_ASSET(2) char gMsgKanji929CTex[] = dgMsgKanji929CTex;
+
+#define dgMsgKanji929DTex "__OTR__textures/kanji/gMsgKanji929DTex"
+static const ALIGN_ASSET(2) char gMsgKanji929DTex[] = dgMsgKanji929DTex;
+
+#define dgMsgKanji929ETex "__OTR__textures/kanji/gMsgKanji929ETex"
+static const ALIGN_ASSET(2) char gMsgKanji929ETex[] = dgMsgKanji929ETex;
+
+#define dgMsgKanji929FTex "__OTR__textures/kanji/gMsgKanji929FTex"
+static const ALIGN_ASSET(2) char gMsgKanji929FTex[] = dgMsgKanji929FTex;
+
+#define dgMsgKanji92A0Tex "__OTR__textures/kanji/gMsgKanji92A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A0Tex[] = dgMsgKanji92A0Tex;
+
+#define dgMsgKanji92A1Tex "__OTR__textures/kanji/gMsgKanji92A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A1Tex[] = dgMsgKanji92A1Tex;
+
+#define dgMsgKanji92A2Tex "__OTR__textures/kanji/gMsgKanji92A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A2Tex[] = dgMsgKanji92A2Tex;
+
+#define dgMsgKanji92A3Tex "__OTR__textures/kanji/gMsgKanji92A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A3Tex[] = dgMsgKanji92A3Tex;
+
+#define dgMsgKanji92A4Tex "__OTR__textures/kanji/gMsgKanji92A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A4Tex[] = dgMsgKanji92A4Tex;
+
+#define dgMsgKanji92A5Tex "__OTR__textures/kanji/gMsgKanji92A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A5Tex[] = dgMsgKanji92A5Tex;
+
+#define dgMsgKanji92A6Tex "__OTR__textures/kanji/gMsgKanji92A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A6Tex[] = dgMsgKanji92A6Tex;
+
+#define dgMsgKanji92A7Tex "__OTR__textures/kanji/gMsgKanji92A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A7Tex[] = dgMsgKanji92A7Tex;
+
+#define dgMsgKanji92A8Tex "__OTR__textures/kanji/gMsgKanji92A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A8Tex[] = dgMsgKanji92A8Tex;
+
+#define dgMsgKanji92A9Tex "__OTR__textures/kanji/gMsgKanji92A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92A9Tex[] = dgMsgKanji92A9Tex;
+
+#define dgMsgKanji92AATex "__OTR__textures/kanji/gMsgKanji92AATex"
+static const ALIGN_ASSET(2) char gMsgKanji92AATex[] = dgMsgKanji92AATex;
+
+#define dgMsgKanji92ABTex "__OTR__textures/kanji/gMsgKanji92ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji92ABTex[] = dgMsgKanji92ABTex;
+
+#define dgMsgKanji92ACTex "__OTR__textures/kanji/gMsgKanji92ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji92ACTex[] = dgMsgKanji92ACTex;
+
+#define dgMsgKanji92ADTex "__OTR__textures/kanji/gMsgKanji92ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji92ADTex[] = dgMsgKanji92ADTex;
+
+#define dgMsgKanji92AETex "__OTR__textures/kanji/gMsgKanji92AETex"
+static const ALIGN_ASSET(2) char gMsgKanji92AETex[] = dgMsgKanji92AETex;
+
+#define dgMsgKanji92AFTex "__OTR__textures/kanji/gMsgKanji92AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji92AFTex[] = dgMsgKanji92AFTex;
+
+#define dgMsgKanji92B0Tex "__OTR__textures/kanji/gMsgKanji92B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B0Tex[] = dgMsgKanji92B0Tex;
+
+#define dgMsgKanji92B1Tex "__OTR__textures/kanji/gMsgKanji92B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B1Tex[] = dgMsgKanji92B1Tex;
+
+#define dgMsgKanji92B2Tex "__OTR__textures/kanji/gMsgKanji92B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B2Tex[] = dgMsgKanji92B2Tex;
+
+#define dgMsgKanji92B3Tex "__OTR__textures/kanji/gMsgKanji92B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B3Tex[] = dgMsgKanji92B3Tex;
+
+#define dgMsgKanji92B4Tex "__OTR__textures/kanji/gMsgKanji92B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B4Tex[] = dgMsgKanji92B4Tex;
+
+#define dgMsgKanji92B5Tex "__OTR__textures/kanji/gMsgKanji92B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B5Tex[] = dgMsgKanji92B5Tex;
+
+#define dgMsgKanji92B6Tex "__OTR__textures/kanji/gMsgKanji92B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B6Tex[] = dgMsgKanji92B6Tex;
+
+#define dgMsgKanji92B7Tex "__OTR__textures/kanji/gMsgKanji92B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B7Tex[] = dgMsgKanji92B7Tex;
+
+#define dgMsgKanji92B8Tex "__OTR__textures/kanji/gMsgKanji92B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B8Tex[] = dgMsgKanji92B8Tex;
+
+#define dgMsgKanji92B9Tex "__OTR__textures/kanji/gMsgKanji92B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92B9Tex[] = dgMsgKanji92B9Tex;
+
+#define dgMsgKanji92BATex "__OTR__textures/kanji/gMsgKanji92BATex"
+static const ALIGN_ASSET(2) char gMsgKanji92BATex[] = dgMsgKanji92BATex;
+
+#define dgMsgKanji92BBTex "__OTR__textures/kanji/gMsgKanji92BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji92BBTex[] = dgMsgKanji92BBTex;
+
+#define dgMsgKanji92BCTex "__OTR__textures/kanji/gMsgKanji92BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji92BCTex[] = dgMsgKanji92BCTex;
+
+#define dgMsgKanji92BDTex "__OTR__textures/kanji/gMsgKanji92BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji92BDTex[] = dgMsgKanji92BDTex;
+
+#define dgMsgKanji92BETex "__OTR__textures/kanji/gMsgKanji92BETex"
+static const ALIGN_ASSET(2) char gMsgKanji92BETex[] = dgMsgKanji92BETex;
+
+#define dgMsgKanji92BFTex "__OTR__textures/kanji/gMsgKanji92BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji92BFTex[] = dgMsgKanji92BFTex;
+
+#define dgMsgKanji92C0Tex "__OTR__textures/kanji/gMsgKanji92C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C0Tex[] = dgMsgKanji92C0Tex;
+
+#define dgMsgKanji92C1Tex "__OTR__textures/kanji/gMsgKanji92C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C1Tex[] = dgMsgKanji92C1Tex;
+
+#define dgMsgKanji92C2Tex "__OTR__textures/kanji/gMsgKanji92C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C2Tex[] = dgMsgKanji92C2Tex;
+
+#define dgMsgKanji92C3Tex "__OTR__textures/kanji/gMsgKanji92C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C3Tex[] = dgMsgKanji92C3Tex;
+
+#define dgMsgKanji92C4Tex "__OTR__textures/kanji/gMsgKanji92C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C4Tex[] = dgMsgKanji92C4Tex;
+
+#define dgMsgKanji92C5Tex "__OTR__textures/kanji/gMsgKanji92C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C5Tex[] = dgMsgKanji92C5Tex;
+
+#define dgMsgKanji92C6Tex "__OTR__textures/kanji/gMsgKanji92C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C6Tex[] = dgMsgKanji92C6Tex;
+
+#define dgMsgKanji92C7Tex "__OTR__textures/kanji/gMsgKanji92C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C7Tex[] = dgMsgKanji92C7Tex;
+
+#define dgMsgKanji92C8Tex "__OTR__textures/kanji/gMsgKanji92C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C8Tex[] = dgMsgKanji92C8Tex;
+
+#define dgMsgKanji92C9Tex "__OTR__textures/kanji/gMsgKanji92C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92C9Tex[] = dgMsgKanji92C9Tex;
+
+#define dgMsgKanji92CATex "__OTR__textures/kanji/gMsgKanji92CATex"
+static const ALIGN_ASSET(2) char gMsgKanji92CATex[] = dgMsgKanji92CATex;
+
+#define dgMsgKanji92CBTex "__OTR__textures/kanji/gMsgKanji92CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji92CBTex[] = dgMsgKanji92CBTex;
+
+#define dgMsgKanji92CCTex "__OTR__textures/kanji/gMsgKanji92CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji92CCTex[] = dgMsgKanji92CCTex;
+
+#define dgMsgKanji92CDTex "__OTR__textures/kanji/gMsgKanji92CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji92CDTex[] = dgMsgKanji92CDTex;
+
+#define dgMsgKanji92CETex "__OTR__textures/kanji/gMsgKanji92CETex"
+static const ALIGN_ASSET(2) char gMsgKanji92CETex[] = dgMsgKanji92CETex;
+
+#define dgMsgKanji92CFTex "__OTR__textures/kanji/gMsgKanji92CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji92CFTex[] = dgMsgKanji92CFTex;
+
+#define dgMsgKanji92D0Tex "__OTR__textures/kanji/gMsgKanji92D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D0Tex[] = dgMsgKanji92D0Tex;
+
+#define dgMsgKanji92D1Tex "__OTR__textures/kanji/gMsgKanji92D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D1Tex[] = dgMsgKanji92D1Tex;
+
+#define dgMsgKanji92D2Tex "__OTR__textures/kanji/gMsgKanji92D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D2Tex[] = dgMsgKanji92D2Tex;
+
+#define dgMsgKanji92D3Tex "__OTR__textures/kanji/gMsgKanji92D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D3Tex[] = dgMsgKanji92D3Tex;
+
+#define dgMsgKanji92D4Tex "__OTR__textures/kanji/gMsgKanji92D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D4Tex[] = dgMsgKanji92D4Tex;
+
+#define dgMsgKanji92D5Tex "__OTR__textures/kanji/gMsgKanji92D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D5Tex[] = dgMsgKanji92D5Tex;
+
+#define dgMsgKanji92D6Tex "__OTR__textures/kanji/gMsgKanji92D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D6Tex[] = dgMsgKanji92D6Tex;
+
+#define dgMsgKanji92D7Tex "__OTR__textures/kanji/gMsgKanji92D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D7Tex[] = dgMsgKanji92D7Tex;
+
+#define dgMsgKanji92D8Tex "__OTR__textures/kanji/gMsgKanji92D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D8Tex[] = dgMsgKanji92D8Tex;
+
+#define dgMsgKanji92D9Tex "__OTR__textures/kanji/gMsgKanji92D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92D9Tex[] = dgMsgKanji92D9Tex;
+
+#define dgMsgKanji92DATex "__OTR__textures/kanji/gMsgKanji92DATex"
+static const ALIGN_ASSET(2) char gMsgKanji92DATex[] = dgMsgKanji92DATex;
+
+#define dgMsgKanji92DBTex "__OTR__textures/kanji/gMsgKanji92DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji92DBTex[] = dgMsgKanji92DBTex;
+
+#define dgMsgKanji92DCTex "__OTR__textures/kanji/gMsgKanji92DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji92DCTex[] = dgMsgKanji92DCTex;
+
+#define dgMsgKanji92DDTex "__OTR__textures/kanji/gMsgKanji92DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji92DDTex[] = dgMsgKanji92DDTex;
+
+#define dgMsgKanji92DETex "__OTR__textures/kanji/gMsgKanji92DETex"
+static const ALIGN_ASSET(2) char gMsgKanji92DETex[] = dgMsgKanji92DETex;
+
+#define dgMsgKanji92DFTex "__OTR__textures/kanji/gMsgKanji92DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji92DFTex[] = dgMsgKanji92DFTex;
+
+#define dgMsgKanji92E0Tex "__OTR__textures/kanji/gMsgKanji92E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E0Tex[] = dgMsgKanji92E0Tex;
+
+#define dgMsgKanji92E1Tex "__OTR__textures/kanji/gMsgKanji92E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E1Tex[] = dgMsgKanji92E1Tex;
+
+#define dgMsgKanji92E2Tex "__OTR__textures/kanji/gMsgKanji92E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E2Tex[] = dgMsgKanji92E2Tex;
+
+#define dgMsgKanji92E3Tex "__OTR__textures/kanji/gMsgKanji92E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E3Tex[] = dgMsgKanji92E3Tex;
+
+#define dgMsgKanji92E4Tex "__OTR__textures/kanji/gMsgKanji92E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E4Tex[] = dgMsgKanji92E4Tex;
+
+#define dgMsgKanji92E5Tex "__OTR__textures/kanji/gMsgKanji92E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E5Tex[] = dgMsgKanji92E5Tex;
+
+#define dgMsgKanji92E6Tex "__OTR__textures/kanji/gMsgKanji92E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E6Tex[] = dgMsgKanji92E6Tex;
+
+#define dgMsgKanji92E7Tex "__OTR__textures/kanji/gMsgKanji92E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E7Tex[] = dgMsgKanji92E7Tex;
+
+#define dgMsgKanji92E8Tex "__OTR__textures/kanji/gMsgKanji92E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E8Tex[] = dgMsgKanji92E8Tex;
+
+#define dgMsgKanji92E9Tex "__OTR__textures/kanji/gMsgKanji92E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92E9Tex[] = dgMsgKanji92E9Tex;
+
+#define dgMsgKanji92EATex "__OTR__textures/kanji/gMsgKanji92EATex"
+static const ALIGN_ASSET(2) char gMsgKanji92EATex[] = dgMsgKanji92EATex;
+
+#define dgMsgKanji92EBTex "__OTR__textures/kanji/gMsgKanji92EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji92EBTex[] = dgMsgKanji92EBTex;
+
+#define dgMsgKanji92ECTex "__OTR__textures/kanji/gMsgKanji92ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji92ECTex[] = dgMsgKanji92ECTex;
+
+#define dgMsgKanji92EDTex "__OTR__textures/kanji/gMsgKanji92EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji92EDTex[] = dgMsgKanji92EDTex;
+
+#define dgMsgKanji92EETex "__OTR__textures/kanji/gMsgKanji92EETex"
+static const ALIGN_ASSET(2) char gMsgKanji92EETex[] = dgMsgKanji92EETex;
+
+#define dgMsgKanji92EFTex "__OTR__textures/kanji/gMsgKanji92EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji92EFTex[] = dgMsgKanji92EFTex;
+
+#define dgMsgKanji92F0Tex "__OTR__textures/kanji/gMsgKanji92F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F0Tex[] = dgMsgKanji92F0Tex;
+
+#define dgMsgKanji92F1Tex "__OTR__textures/kanji/gMsgKanji92F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F1Tex[] = dgMsgKanji92F1Tex;
+
+#define dgMsgKanji92F2Tex "__OTR__textures/kanji/gMsgKanji92F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F2Tex[] = dgMsgKanji92F2Tex;
+
+#define dgMsgKanji92F3Tex "__OTR__textures/kanji/gMsgKanji92F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F3Tex[] = dgMsgKanji92F3Tex;
+
+#define dgMsgKanji92F4Tex "__OTR__textures/kanji/gMsgKanji92F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F4Tex[] = dgMsgKanji92F4Tex;
+
+#define dgMsgKanji92F5Tex "__OTR__textures/kanji/gMsgKanji92F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F5Tex[] = dgMsgKanji92F5Tex;
+
+#define dgMsgKanji92F6Tex "__OTR__textures/kanji/gMsgKanji92F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F6Tex[] = dgMsgKanji92F6Tex;
+
+#define dgMsgKanji92F7Tex "__OTR__textures/kanji/gMsgKanji92F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F7Tex[] = dgMsgKanji92F7Tex;
+
+#define dgMsgKanji92F8Tex "__OTR__textures/kanji/gMsgKanji92F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F8Tex[] = dgMsgKanji92F8Tex;
+
+#define dgMsgKanji92F9Tex "__OTR__textures/kanji/gMsgKanji92F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji92F9Tex[] = dgMsgKanji92F9Tex;
+
+#define dgMsgKanji92FATex "__OTR__textures/kanji/gMsgKanji92FATex"
+static const ALIGN_ASSET(2) char gMsgKanji92FATex[] = dgMsgKanji92FATex;
+
+#define dgMsgKanji92FBTex "__OTR__textures/kanji/gMsgKanji92FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji92FBTex[] = dgMsgKanji92FBTex;
+
+#define dgMsgKanji92FCTex "__OTR__textures/kanji/gMsgKanji92FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji92FCTex[] = dgMsgKanji92FCTex;
+
+#define dgMsgKanji9340Tex "__OTR__textures/kanji/gMsgKanji9340Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9340Tex[] = dgMsgKanji9340Tex;
+
+#define dgMsgKanji9341Tex "__OTR__textures/kanji/gMsgKanji9341Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9341Tex[] = dgMsgKanji9341Tex;
+
+#define dgMsgKanji9342Tex "__OTR__textures/kanji/gMsgKanji9342Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9342Tex[] = dgMsgKanji9342Tex;
+
+#define dgMsgKanji9343Tex "__OTR__textures/kanji/gMsgKanji9343Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9343Tex[] = dgMsgKanji9343Tex;
+
+#define dgMsgKanji9344Tex "__OTR__textures/kanji/gMsgKanji9344Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9344Tex[] = dgMsgKanji9344Tex;
+
+#define dgMsgKanji9345Tex "__OTR__textures/kanji/gMsgKanji9345Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9345Tex[] = dgMsgKanji9345Tex;
+
+#define dgMsgKanji9346Tex "__OTR__textures/kanji/gMsgKanji9346Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9346Tex[] = dgMsgKanji9346Tex;
+
+#define dgMsgKanji9347Tex "__OTR__textures/kanji/gMsgKanji9347Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9347Tex[] = dgMsgKanji9347Tex;
+
+#define dgMsgKanji9348Tex "__OTR__textures/kanji/gMsgKanji9348Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9348Tex[] = dgMsgKanji9348Tex;
+
+#define dgMsgKanji9349Tex "__OTR__textures/kanji/gMsgKanji9349Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9349Tex[] = dgMsgKanji9349Tex;
+
+#define dgMsgKanji934ATex "__OTR__textures/kanji/gMsgKanji934ATex"
+static const ALIGN_ASSET(2) char gMsgKanji934ATex[] = dgMsgKanji934ATex;
+
+#define dgMsgKanji934BTex "__OTR__textures/kanji/gMsgKanji934BTex"
+static const ALIGN_ASSET(2) char gMsgKanji934BTex[] = dgMsgKanji934BTex;
+
+#define dgMsgKanji934CTex "__OTR__textures/kanji/gMsgKanji934CTex"
+static const ALIGN_ASSET(2) char gMsgKanji934CTex[] = dgMsgKanji934CTex;
+
+#define dgMsgKanji934DTex "__OTR__textures/kanji/gMsgKanji934DTex"
+static const ALIGN_ASSET(2) char gMsgKanji934DTex[] = dgMsgKanji934DTex;
+
+#define dgMsgKanji934ETex "__OTR__textures/kanji/gMsgKanji934ETex"
+static const ALIGN_ASSET(2) char gMsgKanji934ETex[] = dgMsgKanji934ETex;
+
+#define dgMsgKanji934FTex "__OTR__textures/kanji/gMsgKanji934FTex"
+static const ALIGN_ASSET(2) char gMsgKanji934FTex[] = dgMsgKanji934FTex;
+
+#define dgMsgKanji9350Tex "__OTR__textures/kanji/gMsgKanji9350Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9350Tex[] = dgMsgKanji9350Tex;
+
+#define dgMsgKanji9351Tex "__OTR__textures/kanji/gMsgKanji9351Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9351Tex[] = dgMsgKanji9351Tex;
+
+#define dgMsgKanji9352Tex "__OTR__textures/kanji/gMsgKanji9352Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9352Tex[] = dgMsgKanji9352Tex;
+
+#define dgMsgKanji9353Tex "__OTR__textures/kanji/gMsgKanji9353Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9353Tex[] = dgMsgKanji9353Tex;
+
+#define dgMsgKanji9354Tex "__OTR__textures/kanji/gMsgKanji9354Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9354Tex[] = dgMsgKanji9354Tex;
+
+#define dgMsgKanji9355Tex "__OTR__textures/kanji/gMsgKanji9355Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9355Tex[] = dgMsgKanji9355Tex;
+
+#define dgMsgKanji9356Tex "__OTR__textures/kanji/gMsgKanji9356Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9356Tex[] = dgMsgKanji9356Tex;
+
+#define dgMsgKanji9357Tex "__OTR__textures/kanji/gMsgKanji9357Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9357Tex[] = dgMsgKanji9357Tex;
+
+#define dgMsgKanji9358Tex "__OTR__textures/kanji/gMsgKanji9358Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9358Tex[] = dgMsgKanji9358Tex;
+
+#define dgMsgKanji9359Tex "__OTR__textures/kanji/gMsgKanji9359Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9359Tex[] = dgMsgKanji9359Tex;
+
+#define dgMsgKanji935ATex "__OTR__textures/kanji/gMsgKanji935ATex"
+static const ALIGN_ASSET(2) char gMsgKanji935ATex[] = dgMsgKanji935ATex;
+
+#define dgMsgKanji935BTex "__OTR__textures/kanji/gMsgKanji935BTex"
+static const ALIGN_ASSET(2) char gMsgKanji935BTex[] = dgMsgKanji935BTex;
+
+#define dgMsgKanji935CTex "__OTR__textures/kanji/gMsgKanji935CTex"
+static const ALIGN_ASSET(2) char gMsgKanji935CTex[] = dgMsgKanji935CTex;
+
+#define dgMsgKanji935DTex "__OTR__textures/kanji/gMsgKanji935DTex"
+static const ALIGN_ASSET(2) char gMsgKanji935DTex[] = dgMsgKanji935DTex;
+
+#define dgMsgKanji935ETex "__OTR__textures/kanji/gMsgKanji935ETex"
+static const ALIGN_ASSET(2) char gMsgKanji935ETex[] = dgMsgKanji935ETex;
+
+#define dgMsgKanji935FTex "__OTR__textures/kanji/gMsgKanji935FTex"
+static const ALIGN_ASSET(2) char gMsgKanji935FTex[] = dgMsgKanji935FTex;
+
+#define dgMsgKanji9360Tex "__OTR__textures/kanji/gMsgKanji9360Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9360Tex[] = dgMsgKanji9360Tex;
+
+#define dgMsgKanji9361Tex "__OTR__textures/kanji/gMsgKanji9361Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9361Tex[] = dgMsgKanji9361Tex;
+
+#define dgMsgKanji9362Tex "__OTR__textures/kanji/gMsgKanji9362Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9362Tex[] = dgMsgKanji9362Tex;
+
+#define dgMsgKanji9363Tex "__OTR__textures/kanji/gMsgKanji9363Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9363Tex[] = dgMsgKanji9363Tex;
+
+#define dgMsgKanji9364Tex "__OTR__textures/kanji/gMsgKanji9364Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9364Tex[] = dgMsgKanji9364Tex;
+
+#define dgMsgKanji9365Tex "__OTR__textures/kanji/gMsgKanji9365Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9365Tex[] = dgMsgKanji9365Tex;
+
+#define dgMsgKanji9366Tex "__OTR__textures/kanji/gMsgKanji9366Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9366Tex[] = dgMsgKanji9366Tex;
+
+#define dgMsgKanji9367Tex "__OTR__textures/kanji/gMsgKanji9367Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9367Tex[] = dgMsgKanji9367Tex;
+
+#define dgMsgKanji9368Tex "__OTR__textures/kanji/gMsgKanji9368Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9368Tex[] = dgMsgKanji9368Tex;
+
+#define dgMsgKanji9369Tex "__OTR__textures/kanji/gMsgKanji9369Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9369Tex[] = dgMsgKanji9369Tex;
+
+#define dgMsgKanji936ATex "__OTR__textures/kanji/gMsgKanji936ATex"
+static const ALIGN_ASSET(2) char gMsgKanji936ATex[] = dgMsgKanji936ATex;
+
+#define dgMsgKanji936BTex "__OTR__textures/kanji/gMsgKanji936BTex"
+static const ALIGN_ASSET(2) char gMsgKanji936BTex[] = dgMsgKanji936BTex;
+
+#define dgMsgKanji936CTex "__OTR__textures/kanji/gMsgKanji936CTex"
+static const ALIGN_ASSET(2) char gMsgKanji936CTex[] = dgMsgKanji936CTex;
+
+#define dgMsgKanji936DTex "__OTR__textures/kanji/gMsgKanji936DTex"
+static const ALIGN_ASSET(2) char gMsgKanji936DTex[] = dgMsgKanji936DTex;
+
+#define dgMsgKanji936ETex "__OTR__textures/kanji/gMsgKanji936ETex"
+static const ALIGN_ASSET(2) char gMsgKanji936ETex[] = dgMsgKanji936ETex;
+
+#define dgMsgKanji936FTex "__OTR__textures/kanji/gMsgKanji936FTex"
+static const ALIGN_ASSET(2) char gMsgKanji936FTex[] = dgMsgKanji936FTex;
+
+#define dgMsgKanji9370Tex "__OTR__textures/kanji/gMsgKanji9370Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9370Tex[] = dgMsgKanji9370Tex;
+
+#define dgMsgKanji9371Tex "__OTR__textures/kanji/gMsgKanji9371Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9371Tex[] = dgMsgKanji9371Tex;
+
+#define dgMsgKanji9372Tex "__OTR__textures/kanji/gMsgKanji9372Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9372Tex[] = dgMsgKanji9372Tex;
+
+#define dgMsgKanji9373Tex "__OTR__textures/kanji/gMsgKanji9373Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9373Tex[] = dgMsgKanji9373Tex;
+
+#define dgMsgKanji9374Tex "__OTR__textures/kanji/gMsgKanji9374Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9374Tex[] = dgMsgKanji9374Tex;
+
+#define dgMsgKanji9375Tex "__OTR__textures/kanji/gMsgKanji9375Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9375Tex[] = dgMsgKanji9375Tex;
+
+#define dgMsgKanji9376Tex "__OTR__textures/kanji/gMsgKanji9376Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9376Tex[] = dgMsgKanji9376Tex;
+
+#define dgMsgKanji9377Tex "__OTR__textures/kanji/gMsgKanji9377Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9377Tex[] = dgMsgKanji9377Tex;
+
+#define dgMsgKanji9378Tex "__OTR__textures/kanji/gMsgKanji9378Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9378Tex[] = dgMsgKanji9378Tex;
+
+#define dgMsgKanji9379Tex "__OTR__textures/kanji/gMsgKanji9379Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9379Tex[] = dgMsgKanji9379Tex;
+
+#define dgMsgKanji937ATex "__OTR__textures/kanji/gMsgKanji937ATex"
+static const ALIGN_ASSET(2) char gMsgKanji937ATex[] = dgMsgKanji937ATex;
+
+#define dgMsgKanji937BTex "__OTR__textures/kanji/gMsgKanji937BTex"
+static const ALIGN_ASSET(2) char gMsgKanji937BTex[] = dgMsgKanji937BTex;
+
+#define dgMsgKanji937CTex "__OTR__textures/kanji/gMsgKanji937CTex"
+static const ALIGN_ASSET(2) char gMsgKanji937CTex[] = dgMsgKanji937CTex;
+
+#define dgMsgKanji937DTex "__OTR__textures/kanji/gMsgKanji937DTex"
+static const ALIGN_ASSET(2) char gMsgKanji937DTex[] = dgMsgKanji937DTex;
+
+#define dgMsgKanji937ETex "__OTR__textures/kanji/gMsgKanji937ETex"
+static const ALIGN_ASSET(2) char gMsgKanji937ETex[] = dgMsgKanji937ETex;
+
+#define dgMsgKanji9380Tex "__OTR__textures/kanji/gMsgKanji9380Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9380Tex[] = dgMsgKanji9380Tex;
+
+#define dgMsgKanji9381Tex "__OTR__textures/kanji/gMsgKanji9381Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9381Tex[] = dgMsgKanji9381Tex;
+
+#define dgMsgKanji9382Tex "__OTR__textures/kanji/gMsgKanji9382Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9382Tex[] = dgMsgKanji9382Tex;
+
+#define dgMsgKanji9383Tex "__OTR__textures/kanji/gMsgKanji9383Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9383Tex[] = dgMsgKanji9383Tex;
+
+#define dgMsgKanji9384Tex "__OTR__textures/kanji/gMsgKanji9384Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9384Tex[] = dgMsgKanji9384Tex;
+
+#define dgMsgKanji9385Tex "__OTR__textures/kanji/gMsgKanji9385Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9385Tex[] = dgMsgKanji9385Tex;
+
+#define dgMsgKanji9386Tex "__OTR__textures/kanji/gMsgKanji9386Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9386Tex[] = dgMsgKanji9386Tex;
+
+#define dgMsgKanji9387Tex "__OTR__textures/kanji/gMsgKanji9387Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9387Tex[] = dgMsgKanji9387Tex;
+
+#define dgMsgKanji9388Tex "__OTR__textures/kanji/gMsgKanji9388Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9388Tex[] = dgMsgKanji9388Tex;
+
+#define dgMsgKanji9389Tex "__OTR__textures/kanji/gMsgKanji9389Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9389Tex[] = dgMsgKanji9389Tex;
+
+#define dgMsgKanji938ATex "__OTR__textures/kanji/gMsgKanji938ATex"
+static const ALIGN_ASSET(2) char gMsgKanji938ATex[] = dgMsgKanji938ATex;
+
+#define dgMsgKanji938BTex "__OTR__textures/kanji/gMsgKanji938BTex"
+static const ALIGN_ASSET(2) char gMsgKanji938BTex[] = dgMsgKanji938BTex;
+
+#define dgMsgKanji938CTex "__OTR__textures/kanji/gMsgKanji938CTex"
+static const ALIGN_ASSET(2) char gMsgKanji938CTex[] = dgMsgKanji938CTex;
+
+#define dgMsgKanji938DTex "__OTR__textures/kanji/gMsgKanji938DTex"
+static const ALIGN_ASSET(2) char gMsgKanji938DTex[] = dgMsgKanji938DTex;
+
+#define dgMsgKanji938ETex "__OTR__textures/kanji/gMsgKanji938ETex"
+static const ALIGN_ASSET(2) char gMsgKanji938ETex[] = dgMsgKanji938ETex;
+
+#define dgMsgKanji938FTex "__OTR__textures/kanji/gMsgKanji938FTex"
+static const ALIGN_ASSET(2) char gMsgKanji938FTex[] = dgMsgKanji938FTex;
+
+#define dgMsgKanji9390Tex "__OTR__textures/kanji/gMsgKanji9390Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9390Tex[] = dgMsgKanji9390Tex;
+
+#define dgMsgKanji9391Tex "__OTR__textures/kanji/gMsgKanji9391Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9391Tex[] = dgMsgKanji9391Tex;
+
+#define dgMsgKanji9392Tex "__OTR__textures/kanji/gMsgKanji9392Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9392Tex[] = dgMsgKanji9392Tex;
+
+#define dgMsgKanji9393Tex "__OTR__textures/kanji/gMsgKanji9393Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9393Tex[] = dgMsgKanji9393Tex;
+
+#define dgMsgKanji9394Tex "__OTR__textures/kanji/gMsgKanji9394Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9394Tex[] = dgMsgKanji9394Tex;
+
+#define dgMsgKanji9395Tex "__OTR__textures/kanji/gMsgKanji9395Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9395Tex[] = dgMsgKanji9395Tex;
+
+#define dgMsgKanji9396Tex "__OTR__textures/kanji/gMsgKanji9396Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9396Tex[] = dgMsgKanji9396Tex;
+
+#define dgMsgKanji9397Tex "__OTR__textures/kanji/gMsgKanji9397Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9397Tex[] = dgMsgKanji9397Tex;
+
+#define dgMsgKanji9398Tex "__OTR__textures/kanji/gMsgKanji9398Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9398Tex[] = dgMsgKanji9398Tex;
+
+#define dgMsgKanji9399Tex "__OTR__textures/kanji/gMsgKanji9399Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9399Tex[] = dgMsgKanji9399Tex;
+
+#define dgMsgKanji939ATex "__OTR__textures/kanji/gMsgKanji939ATex"
+static const ALIGN_ASSET(2) char gMsgKanji939ATex[] = dgMsgKanji939ATex;
+
+#define dgMsgKanji939BTex "__OTR__textures/kanji/gMsgKanji939BTex"
+static const ALIGN_ASSET(2) char gMsgKanji939BTex[] = dgMsgKanji939BTex;
+
+#define dgMsgKanji939CTex "__OTR__textures/kanji/gMsgKanji939CTex"
+static const ALIGN_ASSET(2) char gMsgKanji939CTex[] = dgMsgKanji939CTex;
+
+#define dgMsgKanji939DTex "__OTR__textures/kanji/gMsgKanji939DTex"
+static const ALIGN_ASSET(2) char gMsgKanji939DTex[] = dgMsgKanji939DTex;
+
+#define dgMsgKanji939ETex "__OTR__textures/kanji/gMsgKanji939ETex"
+static const ALIGN_ASSET(2) char gMsgKanji939ETex[] = dgMsgKanji939ETex;
+
+#define dgMsgKanji939FTex "__OTR__textures/kanji/gMsgKanji939FTex"
+static const ALIGN_ASSET(2) char gMsgKanji939FTex[] = dgMsgKanji939FTex;
+
+#define dgMsgKanji93A0Tex "__OTR__textures/kanji/gMsgKanji93A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A0Tex[] = dgMsgKanji93A0Tex;
+
+#define dgMsgKanji93A1Tex "__OTR__textures/kanji/gMsgKanji93A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A1Tex[] = dgMsgKanji93A1Tex;
+
+#define dgMsgKanji93A2Tex "__OTR__textures/kanji/gMsgKanji93A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A2Tex[] = dgMsgKanji93A2Tex;
+
+#define dgMsgKanji93A3Tex "__OTR__textures/kanji/gMsgKanji93A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A3Tex[] = dgMsgKanji93A3Tex;
+
+#define dgMsgKanji93A4Tex "__OTR__textures/kanji/gMsgKanji93A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A4Tex[] = dgMsgKanji93A4Tex;
+
+#define dgMsgKanji93A5Tex "__OTR__textures/kanji/gMsgKanji93A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A5Tex[] = dgMsgKanji93A5Tex;
+
+#define dgMsgKanji93A6Tex "__OTR__textures/kanji/gMsgKanji93A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A6Tex[] = dgMsgKanji93A6Tex;
+
+#define dgMsgKanji93A7Tex "__OTR__textures/kanji/gMsgKanji93A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A7Tex[] = dgMsgKanji93A7Tex;
+
+#define dgMsgKanji93A8Tex "__OTR__textures/kanji/gMsgKanji93A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A8Tex[] = dgMsgKanji93A8Tex;
+
+#define dgMsgKanji93A9Tex "__OTR__textures/kanji/gMsgKanji93A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93A9Tex[] = dgMsgKanji93A9Tex;
+
+#define dgMsgKanji93AATex "__OTR__textures/kanji/gMsgKanji93AATex"
+static const ALIGN_ASSET(2) char gMsgKanji93AATex[] = dgMsgKanji93AATex;
+
+#define dgMsgKanji93ABTex "__OTR__textures/kanji/gMsgKanji93ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji93ABTex[] = dgMsgKanji93ABTex;
+
+#define dgMsgKanji93ACTex "__OTR__textures/kanji/gMsgKanji93ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji93ACTex[] = dgMsgKanji93ACTex;
+
+#define dgMsgKanji93ADTex "__OTR__textures/kanji/gMsgKanji93ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji93ADTex[] = dgMsgKanji93ADTex;
+
+#define dgMsgKanji93AETex "__OTR__textures/kanji/gMsgKanji93AETex"
+static const ALIGN_ASSET(2) char gMsgKanji93AETex[] = dgMsgKanji93AETex;
+
+#define dgMsgKanji93AFTex "__OTR__textures/kanji/gMsgKanji93AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji93AFTex[] = dgMsgKanji93AFTex;
+
+#define dgMsgKanji93B0Tex "__OTR__textures/kanji/gMsgKanji93B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B0Tex[] = dgMsgKanji93B0Tex;
+
+#define dgMsgKanji93B1Tex "__OTR__textures/kanji/gMsgKanji93B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B1Tex[] = dgMsgKanji93B1Tex;
+
+#define dgMsgKanji93B2Tex "__OTR__textures/kanji/gMsgKanji93B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B2Tex[] = dgMsgKanji93B2Tex;
+
+#define dgMsgKanji93B3Tex "__OTR__textures/kanji/gMsgKanji93B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B3Tex[] = dgMsgKanji93B3Tex;
+
+#define dgMsgKanji93B4Tex "__OTR__textures/kanji/gMsgKanji93B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B4Tex[] = dgMsgKanji93B4Tex;
+
+#define dgMsgKanji93B5Tex "__OTR__textures/kanji/gMsgKanji93B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B5Tex[] = dgMsgKanji93B5Tex;
+
+#define dgMsgKanji93B6Tex "__OTR__textures/kanji/gMsgKanji93B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B6Tex[] = dgMsgKanji93B6Tex;
+
+#define dgMsgKanji93B7Tex "__OTR__textures/kanji/gMsgKanji93B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B7Tex[] = dgMsgKanji93B7Tex;
+
+#define dgMsgKanji93B8Tex "__OTR__textures/kanji/gMsgKanji93B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B8Tex[] = dgMsgKanji93B8Tex;
+
+#define dgMsgKanji93B9Tex "__OTR__textures/kanji/gMsgKanji93B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93B9Tex[] = dgMsgKanji93B9Tex;
+
+#define dgMsgKanji93BATex "__OTR__textures/kanji/gMsgKanji93BATex"
+static const ALIGN_ASSET(2) char gMsgKanji93BATex[] = dgMsgKanji93BATex;
+
+#define dgMsgKanji93BBTex "__OTR__textures/kanji/gMsgKanji93BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji93BBTex[] = dgMsgKanji93BBTex;
+
+#define dgMsgKanji93BCTex "__OTR__textures/kanji/gMsgKanji93BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji93BCTex[] = dgMsgKanji93BCTex;
+
+#define dgMsgKanji93BDTex "__OTR__textures/kanji/gMsgKanji93BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji93BDTex[] = dgMsgKanji93BDTex;
+
+#define dgMsgKanji93BETex "__OTR__textures/kanji/gMsgKanji93BETex"
+static const ALIGN_ASSET(2) char gMsgKanji93BETex[] = dgMsgKanji93BETex;
+
+#define dgMsgKanji93BFTex "__OTR__textures/kanji/gMsgKanji93BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji93BFTex[] = dgMsgKanji93BFTex;
+
+#define dgMsgKanji93C0Tex "__OTR__textures/kanji/gMsgKanji93C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C0Tex[] = dgMsgKanji93C0Tex;
+
+#define dgMsgKanji93C1Tex "__OTR__textures/kanji/gMsgKanji93C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C1Tex[] = dgMsgKanji93C1Tex;
+
+#define dgMsgKanji93C2Tex "__OTR__textures/kanji/gMsgKanji93C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C2Tex[] = dgMsgKanji93C2Tex;
+
+#define dgMsgKanji93C3Tex "__OTR__textures/kanji/gMsgKanji93C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C3Tex[] = dgMsgKanji93C3Tex;
+
+#define dgMsgKanji93C4Tex "__OTR__textures/kanji/gMsgKanji93C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C4Tex[] = dgMsgKanji93C4Tex;
+
+#define dgMsgKanji93C5Tex "__OTR__textures/kanji/gMsgKanji93C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C5Tex[] = dgMsgKanji93C5Tex;
+
+#define dgMsgKanji93C6Tex "__OTR__textures/kanji/gMsgKanji93C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C6Tex[] = dgMsgKanji93C6Tex;
+
+#define dgMsgKanji93C7Tex "__OTR__textures/kanji/gMsgKanji93C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C7Tex[] = dgMsgKanji93C7Tex;
+
+#define dgMsgKanji93C8Tex "__OTR__textures/kanji/gMsgKanji93C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C8Tex[] = dgMsgKanji93C8Tex;
+
+#define dgMsgKanji93C9Tex "__OTR__textures/kanji/gMsgKanji93C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93C9Tex[] = dgMsgKanji93C9Tex;
+
+#define dgMsgKanji93CATex "__OTR__textures/kanji/gMsgKanji93CATex"
+static const ALIGN_ASSET(2) char gMsgKanji93CATex[] = dgMsgKanji93CATex;
+
+#define dgMsgKanji93CBTex "__OTR__textures/kanji/gMsgKanji93CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji93CBTex[] = dgMsgKanji93CBTex;
+
+#define dgMsgKanji93CCTex "__OTR__textures/kanji/gMsgKanji93CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji93CCTex[] = dgMsgKanji93CCTex;
+
+#define dgMsgKanji93CDTex "__OTR__textures/kanji/gMsgKanji93CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji93CDTex[] = dgMsgKanji93CDTex;
+
+#define dgMsgKanji93CETex "__OTR__textures/kanji/gMsgKanji93CETex"
+static const ALIGN_ASSET(2) char gMsgKanji93CETex[] = dgMsgKanji93CETex;
+
+#define dgMsgKanji93CFTex "__OTR__textures/kanji/gMsgKanji93CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji93CFTex[] = dgMsgKanji93CFTex;
+
+#define dgMsgKanji93D0Tex "__OTR__textures/kanji/gMsgKanji93D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D0Tex[] = dgMsgKanji93D0Tex;
+
+#define dgMsgKanji93D1Tex "__OTR__textures/kanji/gMsgKanji93D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D1Tex[] = dgMsgKanji93D1Tex;
+
+#define dgMsgKanji93D2Tex "__OTR__textures/kanji/gMsgKanji93D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D2Tex[] = dgMsgKanji93D2Tex;
+
+#define dgMsgKanji93D3Tex "__OTR__textures/kanji/gMsgKanji93D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D3Tex[] = dgMsgKanji93D3Tex;
+
+#define dgMsgKanji93D4Tex "__OTR__textures/kanji/gMsgKanji93D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D4Tex[] = dgMsgKanji93D4Tex;
+
+#define dgMsgKanji93D5Tex "__OTR__textures/kanji/gMsgKanji93D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D5Tex[] = dgMsgKanji93D5Tex;
+
+#define dgMsgKanji93D6Tex "__OTR__textures/kanji/gMsgKanji93D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D6Tex[] = dgMsgKanji93D6Tex;
+
+#define dgMsgKanji93D7Tex "__OTR__textures/kanji/gMsgKanji93D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D7Tex[] = dgMsgKanji93D7Tex;
+
+#define dgMsgKanji93D8Tex "__OTR__textures/kanji/gMsgKanji93D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D8Tex[] = dgMsgKanji93D8Tex;
+
+#define dgMsgKanji93D9Tex "__OTR__textures/kanji/gMsgKanji93D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93D9Tex[] = dgMsgKanji93D9Tex;
+
+#define dgMsgKanji93DATex "__OTR__textures/kanji/gMsgKanji93DATex"
+static const ALIGN_ASSET(2) char gMsgKanji93DATex[] = dgMsgKanji93DATex;
+
+#define dgMsgKanji93DBTex "__OTR__textures/kanji/gMsgKanji93DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji93DBTex[] = dgMsgKanji93DBTex;
+
+#define dgMsgKanji93DCTex "__OTR__textures/kanji/gMsgKanji93DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji93DCTex[] = dgMsgKanji93DCTex;
+
+#define dgMsgKanji93DDTex "__OTR__textures/kanji/gMsgKanji93DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji93DDTex[] = dgMsgKanji93DDTex;
+
+#define dgMsgKanji93DETex "__OTR__textures/kanji/gMsgKanji93DETex"
+static const ALIGN_ASSET(2) char gMsgKanji93DETex[] = dgMsgKanji93DETex;
+
+#define dgMsgKanji93DFTex "__OTR__textures/kanji/gMsgKanji93DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji93DFTex[] = dgMsgKanji93DFTex;
+
+#define dgMsgKanji93E0Tex "__OTR__textures/kanji/gMsgKanji93E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E0Tex[] = dgMsgKanji93E0Tex;
+
+#define dgMsgKanji93E1Tex "__OTR__textures/kanji/gMsgKanji93E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E1Tex[] = dgMsgKanji93E1Tex;
+
+#define dgMsgKanji93E2Tex "__OTR__textures/kanji/gMsgKanji93E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E2Tex[] = dgMsgKanji93E2Tex;
+
+#define dgMsgKanji93E3Tex "__OTR__textures/kanji/gMsgKanji93E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E3Tex[] = dgMsgKanji93E3Tex;
+
+#define dgMsgKanji93E4Tex "__OTR__textures/kanji/gMsgKanji93E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E4Tex[] = dgMsgKanji93E4Tex;
+
+#define dgMsgKanji93E5Tex "__OTR__textures/kanji/gMsgKanji93E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E5Tex[] = dgMsgKanji93E5Tex;
+
+#define dgMsgKanji93E6Tex "__OTR__textures/kanji/gMsgKanji93E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E6Tex[] = dgMsgKanji93E6Tex;
+
+#define dgMsgKanji93E7Tex "__OTR__textures/kanji/gMsgKanji93E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E7Tex[] = dgMsgKanji93E7Tex;
+
+#define dgMsgKanji93E8Tex "__OTR__textures/kanji/gMsgKanji93E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E8Tex[] = dgMsgKanji93E8Tex;
+
+#define dgMsgKanji93E9Tex "__OTR__textures/kanji/gMsgKanji93E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93E9Tex[] = dgMsgKanji93E9Tex;
+
+#define dgMsgKanji93EATex "__OTR__textures/kanji/gMsgKanji93EATex"
+static const ALIGN_ASSET(2) char gMsgKanji93EATex[] = dgMsgKanji93EATex;
+
+#define dgMsgKanji93EBTex "__OTR__textures/kanji/gMsgKanji93EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji93EBTex[] = dgMsgKanji93EBTex;
+
+#define dgMsgKanji93ECTex "__OTR__textures/kanji/gMsgKanji93ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji93ECTex[] = dgMsgKanji93ECTex;
+
+#define dgMsgKanji93EDTex "__OTR__textures/kanji/gMsgKanji93EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji93EDTex[] = dgMsgKanji93EDTex;
+
+#define dgMsgKanji93EETex "__OTR__textures/kanji/gMsgKanji93EETex"
+static const ALIGN_ASSET(2) char gMsgKanji93EETex[] = dgMsgKanji93EETex;
+
+#define dgMsgKanji93EFTex "__OTR__textures/kanji/gMsgKanji93EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji93EFTex[] = dgMsgKanji93EFTex;
+
+#define dgMsgKanji93F0Tex "__OTR__textures/kanji/gMsgKanji93F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F0Tex[] = dgMsgKanji93F0Tex;
+
+#define dgMsgKanji93F1Tex "__OTR__textures/kanji/gMsgKanji93F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F1Tex[] = dgMsgKanji93F1Tex;
+
+#define dgMsgKanji93F2Tex "__OTR__textures/kanji/gMsgKanji93F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F2Tex[] = dgMsgKanji93F2Tex;
+
+#define dgMsgKanji93F3Tex "__OTR__textures/kanji/gMsgKanji93F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F3Tex[] = dgMsgKanji93F3Tex;
+
+#define dgMsgKanji93F4Tex "__OTR__textures/kanji/gMsgKanji93F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F4Tex[] = dgMsgKanji93F4Tex;
+
+#define dgMsgKanji93F5Tex "__OTR__textures/kanji/gMsgKanji93F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F5Tex[] = dgMsgKanji93F5Tex;
+
+#define dgMsgKanji93F6Tex "__OTR__textures/kanji/gMsgKanji93F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F6Tex[] = dgMsgKanji93F6Tex;
+
+#define dgMsgKanji93F7Tex "__OTR__textures/kanji/gMsgKanji93F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F7Tex[] = dgMsgKanji93F7Tex;
+
+#define dgMsgKanji93F8Tex "__OTR__textures/kanji/gMsgKanji93F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F8Tex[] = dgMsgKanji93F8Tex;
+
+#define dgMsgKanji93F9Tex "__OTR__textures/kanji/gMsgKanji93F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji93F9Tex[] = dgMsgKanji93F9Tex;
+
+#define dgMsgKanji93FATex "__OTR__textures/kanji/gMsgKanji93FATex"
+static const ALIGN_ASSET(2) char gMsgKanji93FATex[] = dgMsgKanji93FATex;
+
+#define dgMsgKanji93FBTex "__OTR__textures/kanji/gMsgKanji93FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji93FBTex[] = dgMsgKanji93FBTex;
+
+#define dgMsgKanji93FCTex "__OTR__textures/kanji/gMsgKanji93FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji93FCTex[] = dgMsgKanji93FCTex;
+
+#define dgMsgKanji9440Tex "__OTR__textures/kanji/gMsgKanji9440Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9440Tex[] = dgMsgKanji9440Tex;
+
+#define dgMsgKanji9441Tex "__OTR__textures/kanji/gMsgKanji9441Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9441Tex[] = dgMsgKanji9441Tex;
+
+#define dgMsgKanji9442Tex "__OTR__textures/kanji/gMsgKanji9442Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9442Tex[] = dgMsgKanji9442Tex;
+
+#define dgMsgKanji9443Tex "__OTR__textures/kanji/gMsgKanji9443Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9443Tex[] = dgMsgKanji9443Tex;
+
+#define dgMsgKanji9444Tex "__OTR__textures/kanji/gMsgKanji9444Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9444Tex[] = dgMsgKanji9444Tex;
+
+#define dgMsgKanji9445Tex "__OTR__textures/kanji/gMsgKanji9445Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9445Tex[] = dgMsgKanji9445Tex;
+
+#define dgMsgKanji9446Tex "__OTR__textures/kanji/gMsgKanji9446Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9446Tex[] = dgMsgKanji9446Tex;
+
+#define dgMsgKanji9447Tex "__OTR__textures/kanji/gMsgKanji9447Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9447Tex[] = dgMsgKanji9447Tex;
+
+#define dgMsgKanji9448Tex "__OTR__textures/kanji/gMsgKanji9448Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9448Tex[] = dgMsgKanji9448Tex;
+
+#define dgMsgKanji9449Tex "__OTR__textures/kanji/gMsgKanji9449Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9449Tex[] = dgMsgKanji9449Tex;
+
+#define dgMsgKanji944ATex "__OTR__textures/kanji/gMsgKanji944ATex"
+static const ALIGN_ASSET(2) char gMsgKanji944ATex[] = dgMsgKanji944ATex;
+
+#define dgMsgKanji944BTex "__OTR__textures/kanji/gMsgKanji944BTex"
+static const ALIGN_ASSET(2) char gMsgKanji944BTex[] = dgMsgKanji944BTex;
+
+#define dgMsgKanji944CTex "__OTR__textures/kanji/gMsgKanji944CTex"
+static const ALIGN_ASSET(2) char gMsgKanji944CTex[] = dgMsgKanji944CTex;
+
+#define dgMsgKanji944DTex "__OTR__textures/kanji/gMsgKanji944DTex"
+static const ALIGN_ASSET(2) char gMsgKanji944DTex[] = dgMsgKanji944DTex;
+
+#define dgMsgKanji944ETex "__OTR__textures/kanji/gMsgKanji944ETex"
+static const ALIGN_ASSET(2) char gMsgKanji944ETex[] = dgMsgKanji944ETex;
+
+#define dgMsgKanji944FTex "__OTR__textures/kanji/gMsgKanji944FTex"
+static const ALIGN_ASSET(2) char gMsgKanji944FTex[] = dgMsgKanji944FTex;
+
+#define dgMsgKanji9450Tex "__OTR__textures/kanji/gMsgKanji9450Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9450Tex[] = dgMsgKanji9450Tex;
+
+#define dgMsgKanji9451Tex "__OTR__textures/kanji/gMsgKanji9451Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9451Tex[] = dgMsgKanji9451Tex;
+
+#define dgMsgKanji9452Tex "__OTR__textures/kanji/gMsgKanji9452Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9452Tex[] = dgMsgKanji9452Tex;
+
+#define dgMsgKanji9453Tex "__OTR__textures/kanji/gMsgKanji9453Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9453Tex[] = dgMsgKanji9453Tex;
+
+#define dgMsgKanji9454Tex "__OTR__textures/kanji/gMsgKanji9454Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9454Tex[] = dgMsgKanji9454Tex;
+
+#define dgMsgKanji9455Tex "__OTR__textures/kanji/gMsgKanji9455Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9455Tex[] = dgMsgKanji9455Tex;
+
+#define dgMsgKanji9456Tex "__OTR__textures/kanji/gMsgKanji9456Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9456Tex[] = dgMsgKanji9456Tex;
+
+#define dgMsgKanji9457Tex "__OTR__textures/kanji/gMsgKanji9457Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9457Tex[] = dgMsgKanji9457Tex;
+
+#define dgMsgKanji9458Tex "__OTR__textures/kanji/gMsgKanji9458Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9458Tex[] = dgMsgKanji9458Tex;
+
+#define dgMsgKanji9459Tex "__OTR__textures/kanji/gMsgKanji9459Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9459Tex[] = dgMsgKanji9459Tex;
+
+#define dgMsgKanji945ATex "__OTR__textures/kanji/gMsgKanji945ATex"
+static const ALIGN_ASSET(2) char gMsgKanji945ATex[] = dgMsgKanji945ATex;
+
+#define dgMsgKanji945BTex "__OTR__textures/kanji/gMsgKanji945BTex"
+static const ALIGN_ASSET(2) char gMsgKanji945BTex[] = dgMsgKanji945BTex;
+
+#define dgMsgKanji945CTex "__OTR__textures/kanji/gMsgKanji945CTex"
+static const ALIGN_ASSET(2) char gMsgKanji945CTex[] = dgMsgKanji945CTex;
+
+#define dgMsgKanji945DTex "__OTR__textures/kanji/gMsgKanji945DTex"
+static const ALIGN_ASSET(2) char gMsgKanji945DTex[] = dgMsgKanji945DTex;
+
+#define dgMsgKanji945ETex "__OTR__textures/kanji/gMsgKanji945ETex"
+static const ALIGN_ASSET(2) char gMsgKanji945ETex[] = dgMsgKanji945ETex;
+
+#define dgMsgKanji945FTex "__OTR__textures/kanji/gMsgKanji945FTex"
+static const ALIGN_ASSET(2) char gMsgKanji945FTex[] = dgMsgKanji945FTex;
+
+#define dgMsgKanji9460Tex "__OTR__textures/kanji/gMsgKanji9460Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9460Tex[] = dgMsgKanji9460Tex;
+
+#define dgMsgKanji9461Tex "__OTR__textures/kanji/gMsgKanji9461Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9461Tex[] = dgMsgKanji9461Tex;
+
+#define dgMsgKanji9462Tex "__OTR__textures/kanji/gMsgKanji9462Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9462Tex[] = dgMsgKanji9462Tex;
+
+#define dgMsgKanji9463Tex "__OTR__textures/kanji/gMsgKanji9463Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9463Tex[] = dgMsgKanji9463Tex;
+
+#define dgMsgKanji9464Tex "__OTR__textures/kanji/gMsgKanji9464Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9464Tex[] = dgMsgKanji9464Tex;
+
+#define dgMsgKanji9465Tex "__OTR__textures/kanji/gMsgKanji9465Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9465Tex[] = dgMsgKanji9465Tex;
+
+#define dgMsgKanji9466Tex "__OTR__textures/kanji/gMsgKanji9466Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9466Tex[] = dgMsgKanji9466Tex;
+
+#define dgMsgKanji9467Tex "__OTR__textures/kanji/gMsgKanji9467Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9467Tex[] = dgMsgKanji9467Tex;
+
+#define dgMsgKanji9468Tex "__OTR__textures/kanji/gMsgKanji9468Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9468Tex[] = dgMsgKanji9468Tex;
+
+#define dgMsgKanji9469Tex "__OTR__textures/kanji/gMsgKanji9469Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9469Tex[] = dgMsgKanji9469Tex;
+
+#define dgMsgKanji946ATex "__OTR__textures/kanji/gMsgKanji946ATex"
+static const ALIGN_ASSET(2) char gMsgKanji946ATex[] = dgMsgKanji946ATex;
+
+#define dgMsgKanji946BTex "__OTR__textures/kanji/gMsgKanji946BTex"
+static const ALIGN_ASSET(2) char gMsgKanji946BTex[] = dgMsgKanji946BTex;
+
+#define dgMsgKanji946CTex "__OTR__textures/kanji/gMsgKanji946CTex"
+static const ALIGN_ASSET(2) char gMsgKanji946CTex[] = dgMsgKanji946CTex;
+
+#define dgMsgKanji946DTex "__OTR__textures/kanji/gMsgKanji946DTex"
+static const ALIGN_ASSET(2) char gMsgKanji946DTex[] = dgMsgKanji946DTex;
+
+#define dgMsgKanji946ETex "__OTR__textures/kanji/gMsgKanji946ETex"
+static const ALIGN_ASSET(2) char gMsgKanji946ETex[] = dgMsgKanji946ETex;
+
+#define dgMsgKanji946FTex "__OTR__textures/kanji/gMsgKanji946FTex"
+static const ALIGN_ASSET(2) char gMsgKanji946FTex[] = dgMsgKanji946FTex;
+
+#define dgMsgKanji9470Tex "__OTR__textures/kanji/gMsgKanji9470Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9470Tex[] = dgMsgKanji9470Tex;
+
+#define dgMsgKanji9471Tex "__OTR__textures/kanji/gMsgKanji9471Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9471Tex[] = dgMsgKanji9471Tex;
+
+#define dgMsgKanji9472Tex "__OTR__textures/kanji/gMsgKanji9472Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9472Tex[] = dgMsgKanji9472Tex;
+
+#define dgMsgKanji9473Tex "__OTR__textures/kanji/gMsgKanji9473Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9473Tex[] = dgMsgKanji9473Tex;
+
+#define dgMsgKanji9474Tex "__OTR__textures/kanji/gMsgKanji9474Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9474Tex[] = dgMsgKanji9474Tex;
+
+#define dgMsgKanji9475Tex "__OTR__textures/kanji/gMsgKanji9475Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9475Tex[] = dgMsgKanji9475Tex;
+
+#define dgMsgKanji9476Tex "__OTR__textures/kanji/gMsgKanji9476Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9476Tex[] = dgMsgKanji9476Tex;
+
+#define dgMsgKanji9477Tex "__OTR__textures/kanji/gMsgKanji9477Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9477Tex[] = dgMsgKanji9477Tex;
+
+#define dgMsgKanji9478Tex "__OTR__textures/kanji/gMsgKanji9478Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9478Tex[] = dgMsgKanji9478Tex;
+
+#define dgMsgKanji9479Tex "__OTR__textures/kanji/gMsgKanji9479Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9479Tex[] = dgMsgKanji9479Tex;
+
+#define dgMsgKanji947ATex "__OTR__textures/kanji/gMsgKanji947ATex"
+static const ALIGN_ASSET(2) char gMsgKanji947ATex[] = dgMsgKanji947ATex;
+
+#define dgMsgKanji947BTex "__OTR__textures/kanji/gMsgKanji947BTex"
+static const ALIGN_ASSET(2) char gMsgKanji947BTex[] = dgMsgKanji947BTex;
+
+#define dgMsgKanji947CTex "__OTR__textures/kanji/gMsgKanji947CTex"
+static const ALIGN_ASSET(2) char gMsgKanji947CTex[] = dgMsgKanji947CTex;
+
+#define dgMsgKanji947DTex "__OTR__textures/kanji/gMsgKanji947DTex"
+static const ALIGN_ASSET(2) char gMsgKanji947DTex[] = dgMsgKanji947DTex;
+
+#define dgMsgKanji947ETex "__OTR__textures/kanji/gMsgKanji947ETex"
+static const ALIGN_ASSET(2) char gMsgKanji947ETex[] = dgMsgKanji947ETex;
+
+#define dgMsgKanji9480Tex "__OTR__textures/kanji/gMsgKanji9480Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9480Tex[] = dgMsgKanji9480Tex;
+
+#define dgMsgKanji9481Tex "__OTR__textures/kanji/gMsgKanji9481Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9481Tex[] = dgMsgKanji9481Tex;
+
+#define dgMsgKanji9482Tex "__OTR__textures/kanji/gMsgKanji9482Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9482Tex[] = dgMsgKanji9482Tex;
+
+#define dgMsgKanji9483Tex "__OTR__textures/kanji/gMsgKanji9483Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9483Tex[] = dgMsgKanji9483Tex;
+
+#define dgMsgKanji9484Tex "__OTR__textures/kanji/gMsgKanji9484Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9484Tex[] = dgMsgKanji9484Tex;
+
+#define dgMsgKanji9485Tex "__OTR__textures/kanji/gMsgKanji9485Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9485Tex[] = dgMsgKanji9485Tex;
+
+#define dgMsgKanji9486Tex "__OTR__textures/kanji/gMsgKanji9486Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9486Tex[] = dgMsgKanji9486Tex;
+
+#define dgMsgKanji9487Tex "__OTR__textures/kanji/gMsgKanji9487Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9487Tex[] = dgMsgKanji9487Tex;
+
+#define dgMsgKanji9488Tex "__OTR__textures/kanji/gMsgKanji9488Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9488Tex[] = dgMsgKanji9488Tex;
+
+#define dgMsgKanji9489Tex "__OTR__textures/kanji/gMsgKanji9489Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9489Tex[] = dgMsgKanji9489Tex;
+
+#define dgMsgKanji948ATex "__OTR__textures/kanji/gMsgKanji948ATex"
+static const ALIGN_ASSET(2) char gMsgKanji948ATex[] = dgMsgKanji948ATex;
+
+#define dgMsgKanji948BTex "__OTR__textures/kanji/gMsgKanji948BTex"
+static const ALIGN_ASSET(2) char gMsgKanji948BTex[] = dgMsgKanji948BTex;
+
+#define dgMsgKanji948CTex "__OTR__textures/kanji/gMsgKanji948CTex"
+static const ALIGN_ASSET(2) char gMsgKanji948CTex[] = dgMsgKanji948CTex;
+
+#define dgMsgKanji948DTex "__OTR__textures/kanji/gMsgKanji948DTex"
+static const ALIGN_ASSET(2) char gMsgKanji948DTex[] = dgMsgKanji948DTex;
+
+#define dgMsgKanji948ETex "__OTR__textures/kanji/gMsgKanji948ETex"
+static const ALIGN_ASSET(2) char gMsgKanji948ETex[] = dgMsgKanji948ETex;
+
+#define dgMsgKanji948FTex "__OTR__textures/kanji/gMsgKanji948FTex"
+static const ALIGN_ASSET(2) char gMsgKanji948FTex[] = dgMsgKanji948FTex;
+
+#define dgMsgKanji9490Tex "__OTR__textures/kanji/gMsgKanji9490Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9490Tex[] = dgMsgKanji9490Tex;
+
+#define dgMsgKanji9491Tex "__OTR__textures/kanji/gMsgKanji9491Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9491Tex[] = dgMsgKanji9491Tex;
+
+#define dgMsgKanji9492Tex "__OTR__textures/kanji/gMsgKanji9492Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9492Tex[] = dgMsgKanji9492Tex;
+
+#define dgMsgKanji9493Tex "__OTR__textures/kanji/gMsgKanji9493Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9493Tex[] = dgMsgKanji9493Tex;
+
+#define dgMsgKanji9494Tex "__OTR__textures/kanji/gMsgKanji9494Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9494Tex[] = dgMsgKanji9494Tex;
+
+#define dgMsgKanji9495Tex "__OTR__textures/kanji/gMsgKanji9495Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9495Tex[] = dgMsgKanji9495Tex;
+
+#define dgMsgKanji9496Tex "__OTR__textures/kanji/gMsgKanji9496Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9496Tex[] = dgMsgKanji9496Tex;
+
+#define dgMsgKanji9497Tex "__OTR__textures/kanji/gMsgKanji9497Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9497Tex[] = dgMsgKanji9497Tex;
+
+#define dgMsgKanji9498Tex "__OTR__textures/kanji/gMsgKanji9498Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9498Tex[] = dgMsgKanji9498Tex;
+
+#define dgMsgKanji9499Tex "__OTR__textures/kanji/gMsgKanji9499Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9499Tex[] = dgMsgKanji9499Tex;
+
+#define dgMsgKanji949ATex "__OTR__textures/kanji/gMsgKanji949ATex"
+static const ALIGN_ASSET(2) char gMsgKanji949ATex[] = dgMsgKanji949ATex;
+
+#define dgMsgKanji949BTex "__OTR__textures/kanji/gMsgKanji949BTex"
+static const ALIGN_ASSET(2) char gMsgKanji949BTex[] = dgMsgKanji949BTex;
+
+#define dgMsgKanji949CTex "__OTR__textures/kanji/gMsgKanji949CTex"
+static const ALIGN_ASSET(2) char gMsgKanji949CTex[] = dgMsgKanji949CTex;
+
+#define dgMsgKanji949DTex "__OTR__textures/kanji/gMsgKanji949DTex"
+static const ALIGN_ASSET(2) char gMsgKanji949DTex[] = dgMsgKanji949DTex;
+
+#define dgMsgKanji949ETex "__OTR__textures/kanji/gMsgKanji949ETex"
+static const ALIGN_ASSET(2) char gMsgKanji949ETex[] = dgMsgKanji949ETex;
+
+#define dgMsgKanji949FTex "__OTR__textures/kanji/gMsgKanji949FTex"
+static const ALIGN_ASSET(2) char gMsgKanji949FTex[] = dgMsgKanji949FTex;
+
+#define dgMsgKanji94A0Tex "__OTR__textures/kanji/gMsgKanji94A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A0Tex[] = dgMsgKanji94A0Tex;
+
+#define dgMsgKanji94A1Tex "__OTR__textures/kanji/gMsgKanji94A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A1Tex[] = dgMsgKanji94A1Tex;
+
+#define dgMsgKanji94A2Tex "__OTR__textures/kanji/gMsgKanji94A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A2Tex[] = dgMsgKanji94A2Tex;
+
+#define dgMsgKanji94A3Tex "__OTR__textures/kanji/gMsgKanji94A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A3Tex[] = dgMsgKanji94A3Tex;
+
+#define dgMsgKanji94A4Tex "__OTR__textures/kanji/gMsgKanji94A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A4Tex[] = dgMsgKanji94A4Tex;
+
+#define dgMsgKanji94A5Tex "__OTR__textures/kanji/gMsgKanji94A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A5Tex[] = dgMsgKanji94A5Tex;
+
+#define dgMsgKanji94A6Tex "__OTR__textures/kanji/gMsgKanji94A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A6Tex[] = dgMsgKanji94A6Tex;
+
+#define dgMsgKanji94A7Tex "__OTR__textures/kanji/gMsgKanji94A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A7Tex[] = dgMsgKanji94A7Tex;
+
+#define dgMsgKanji94A8Tex "__OTR__textures/kanji/gMsgKanji94A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A8Tex[] = dgMsgKanji94A8Tex;
+
+#define dgMsgKanji94A9Tex "__OTR__textures/kanji/gMsgKanji94A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94A9Tex[] = dgMsgKanji94A9Tex;
+
+#define dgMsgKanji94AATex "__OTR__textures/kanji/gMsgKanji94AATex"
+static const ALIGN_ASSET(2) char gMsgKanji94AATex[] = dgMsgKanji94AATex;
+
+#define dgMsgKanji94ABTex "__OTR__textures/kanji/gMsgKanji94ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji94ABTex[] = dgMsgKanji94ABTex;
+
+#define dgMsgKanji94ACTex "__OTR__textures/kanji/gMsgKanji94ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji94ACTex[] = dgMsgKanji94ACTex;
+
+#define dgMsgKanji94ADTex "__OTR__textures/kanji/gMsgKanji94ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji94ADTex[] = dgMsgKanji94ADTex;
+
+#define dgMsgKanji94AETex "__OTR__textures/kanji/gMsgKanji94AETex"
+static const ALIGN_ASSET(2) char gMsgKanji94AETex[] = dgMsgKanji94AETex;
+
+#define dgMsgKanji94AFTex "__OTR__textures/kanji/gMsgKanji94AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji94AFTex[] = dgMsgKanji94AFTex;
+
+#define dgMsgKanji94B0Tex "__OTR__textures/kanji/gMsgKanji94B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B0Tex[] = dgMsgKanji94B0Tex;
+
+#define dgMsgKanji94B1Tex "__OTR__textures/kanji/gMsgKanji94B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B1Tex[] = dgMsgKanji94B1Tex;
+
+#define dgMsgKanji94B2Tex "__OTR__textures/kanji/gMsgKanji94B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B2Tex[] = dgMsgKanji94B2Tex;
+
+#define dgMsgKanji94B3Tex "__OTR__textures/kanji/gMsgKanji94B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B3Tex[] = dgMsgKanji94B3Tex;
+
+#define dgMsgKanji94B4Tex "__OTR__textures/kanji/gMsgKanji94B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B4Tex[] = dgMsgKanji94B4Tex;
+
+#define dgMsgKanji94B5Tex "__OTR__textures/kanji/gMsgKanji94B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B5Tex[] = dgMsgKanji94B5Tex;
+
+#define dgMsgKanji94B6Tex "__OTR__textures/kanji/gMsgKanji94B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B6Tex[] = dgMsgKanji94B6Tex;
+
+#define dgMsgKanji94B7Tex "__OTR__textures/kanji/gMsgKanji94B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B7Tex[] = dgMsgKanji94B7Tex;
+
+#define dgMsgKanji94B8Tex "__OTR__textures/kanji/gMsgKanji94B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B8Tex[] = dgMsgKanji94B8Tex;
+
+#define dgMsgKanji94B9Tex "__OTR__textures/kanji/gMsgKanji94B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94B9Tex[] = dgMsgKanji94B9Tex;
+
+#define dgMsgKanji94BATex "__OTR__textures/kanji/gMsgKanji94BATex"
+static const ALIGN_ASSET(2) char gMsgKanji94BATex[] = dgMsgKanji94BATex;
+
+#define dgMsgKanji94BBTex "__OTR__textures/kanji/gMsgKanji94BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji94BBTex[] = dgMsgKanji94BBTex;
+
+#define dgMsgKanji94BCTex "__OTR__textures/kanji/gMsgKanji94BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji94BCTex[] = dgMsgKanji94BCTex;
+
+#define dgMsgKanji94BDTex "__OTR__textures/kanji/gMsgKanji94BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji94BDTex[] = dgMsgKanji94BDTex;
+
+#define dgMsgKanji94BETex "__OTR__textures/kanji/gMsgKanji94BETex"
+static const ALIGN_ASSET(2) char gMsgKanji94BETex[] = dgMsgKanji94BETex;
+
+#define dgMsgKanji94BFTex "__OTR__textures/kanji/gMsgKanji94BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji94BFTex[] = dgMsgKanji94BFTex;
+
+#define dgMsgKanji94C0Tex "__OTR__textures/kanji/gMsgKanji94C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C0Tex[] = dgMsgKanji94C0Tex;
+
+#define dgMsgKanji94C1Tex "__OTR__textures/kanji/gMsgKanji94C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C1Tex[] = dgMsgKanji94C1Tex;
+
+#define dgMsgKanji94C2Tex "__OTR__textures/kanji/gMsgKanji94C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C2Tex[] = dgMsgKanji94C2Tex;
+
+#define dgMsgKanji94C3Tex "__OTR__textures/kanji/gMsgKanji94C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C3Tex[] = dgMsgKanji94C3Tex;
+
+#define dgMsgKanji94C4Tex "__OTR__textures/kanji/gMsgKanji94C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C4Tex[] = dgMsgKanji94C4Tex;
+
+#define dgMsgKanji94C5Tex "__OTR__textures/kanji/gMsgKanji94C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C5Tex[] = dgMsgKanji94C5Tex;
+
+#define dgMsgKanji94C6Tex "__OTR__textures/kanji/gMsgKanji94C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C6Tex[] = dgMsgKanji94C6Tex;
+
+#define dgMsgKanji94C7Tex "__OTR__textures/kanji/gMsgKanji94C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C7Tex[] = dgMsgKanji94C7Tex;
+
+#define dgMsgKanji94C8Tex "__OTR__textures/kanji/gMsgKanji94C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C8Tex[] = dgMsgKanji94C8Tex;
+
+#define dgMsgKanji94C9Tex "__OTR__textures/kanji/gMsgKanji94C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94C9Tex[] = dgMsgKanji94C9Tex;
+
+#define dgMsgKanji94CATex "__OTR__textures/kanji/gMsgKanji94CATex"
+static const ALIGN_ASSET(2) char gMsgKanji94CATex[] = dgMsgKanji94CATex;
+
+#define dgMsgKanji94CBTex "__OTR__textures/kanji/gMsgKanji94CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji94CBTex[] = dgMsgKanji94CBTex;
+
+#define dgMsgKanji94CCTex "__OTR__textures/kanji/gMsgKanji94CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji94CCTex[] = dgMsgKanji94CCTex;
+
+#define dgMsgKanji94CDTex "__OTR__textures/kanji/gMsgKanji94CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji94CDTex[] = dgMsgKanji94CDTex;
+
+#define dgMsgKanji94CETex "__OTR__textures/kanji/gMsgKanji94CETex"
+static const ALIGN_ASSET(2) char gMsgKanji94CETex[] = dgMsgKanji94CETex;
+
+#define dgMsgKanji94CFTex "__OTR__textures/kanji/gMsgKanji94CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji94CFTex[] = dgMsgKanji94CFTex;
+
+#define dgMsgKanji94D0Tex "__OTR__textures/kanji/gMsgKanji94D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D0Tex[] = dgMsgKanji94D0Tex;
+
+#define dgMsgKanji94D1Tex "__OTR__textures/kanji/gMsgKanji94D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D1Tex[] = dgMsgKanji94D1Tex;
+
+#define dgMsgKanji94D2Tex "__OTR__textures/kanji/gMsgKanji94D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D2Tex[] = dgMsgKanji94D2Tex;
+
+#define dgMsgKanji94D3Tex "__OTR__textures/kanji/gMsgKanji94D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D3Tex[] = dgMsgKanji94D3Tex;
+
+#define dgMsgKanji94D4Tex "__OTR__textures/kanji/gMsgKanji94D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D4Tex[] = dgMsgKanji94D4Tex;
+
+#define dgMsgKanji94D5Tex "__OTR__textures/kanji/gMsgKanji94D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D5Tex[] = dgMsgKanji94D5Tex;
+
+#define dgMsgKanji94D6Tex "__OTR__textures/kanji/gMsgKanji94D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D6Tex[] = dgMsgKanji94D6Tex;
+
+#define dgMsgKanji94D7Tex "__OTR__textures/kanji/gMsgKanji94D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D7Tex[] = dgMsgKanji94D7Tex;
+
+#define dgMsgKanji94D8Tex "__OTR__textures/kanji/gMsgKanji94D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D8Tex[] = dgMsgKanji94D8Tex;
+
+#define dgMsgKanji94D9Tex "__OTR__textures/kanji/gMsgKanji94D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94D9Tex[] = dgMsgKanji94D9Tex;
+
+#define dgMsgKanji94DATex "__OTR__textures/kanji/gMsgKanji94DATex"
+static const ALIGN_ASSET(2) char gMsgKanji94DATex[] = dgMsgKanji94DATex;
+
+#define dgMsgKanji94DBTex "__OTR__textures/kanji/gMsgKanji94DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji94DBTex[] = dgMsgKanji94DBTex;
+
+#define dgMsgKanji94DCTex "__OTR__textures/kanji/gMsgKanji94DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji94DCTex[] = dgMsgKanji94DCTex;
+
+#define dgMsgKanji94DDTex "__OTR__textures/kanji/gMsgKanji94DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji94DDTex[] = dgMsgKanji94DDTex;
+
+#define dgMsgKanji94DETex "__OTR__textures/kanji/gMsgKanji94DETex"
+static const ALIGN_ASSET(2) char gMsgKanji94DETex[] = dgMsgKanji94DETex;
+
+#define dgMsgKanji94DFTex "__OTR__textures/kanji/gMsgKanji94DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji94DFTex[] = dgMsgKanji94DFTex;
+
+#define dgMsgKanji94E0Tex "__OTR__textures/kanji/gMsgKanji94E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E0Tex[] = dgMsgKanji94E0Tex;
+
+#define dgMsgKanji94E1Tex "__OTR__textures/kanji/gMsgKanji94E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E1Tex[] = dgMsgKanji94E1Tex;
+
+#define dgMsgKanji94E2Tex "__OTR__textures/kanji/gMsgKanji94E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E2Tex[] = dgMsgKanji94E2Tex;
+
+#define dgMsgKanji94E3Tex "__OTR__textures/kanji/gMsgKanji94E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E3Tex[] = dgMsgKanji94E3Tex;
+
+#define dgMsgKanji94E4Tex "__OTR__textures/kanji/gMsgKanji94E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E4Tex[] = dgMsgKanji94E4Tex;
+
+#define dgMsgKanji94E5Tex "__OTR__textures/kanji/gMsgKanji94E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E5Tex[] = dgMsgKanji94E5Tex;
+
+#define dgMsgKanji94E6Tex "__OTR__textures/kanji/gMsgKanji94E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E6Tex[] = dgMsgKanji94E6Tex;
+
+#define dgMsgKanji94E7Tex "__OTR__textures/kanji/gMsgKanji94E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E7Tex[] = dgMsgKanji94E7Tex;
+
+#define dgMsgKanji94E8Tex "__OTR__textures/kanji/gMsgKanji94E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E8Tex[] = dgMsgKanji94E8Tex;
+
+#define dgMsgKanji94E9Tex "__OTR__textures/kanji/gMsgKanji94E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94E9Tex[] = dgMsgKanji94E9Tex;
+
+#define dgMsgKanji94EATex "__OTR__textures/kanji/gMsgKanji94EATex"
+static const ALIGN_ASSET(2) char gMsgKanji94EATex[] = dgMsgKanji94EATex;
+
+#define dgMsgKanji94EBTex "__OTR__textures/kanji/gMsgKanji94EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji94EBTex[] = dgMsgKanji94EBTex;
+
+#define dgMsgKanji94ECTex "__OTR__textures/kanji/gMsgKanji94ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji94ECTex[] = dgMsgKanji94ECTex;
+
+#define dgMsgKanji94EDTex "__OTR__textures/kanji/gMsgKanji94EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji94EDTex[] = dgMsgKanji94EDTex;
+
+#define dgMsgKanji94EETex "__OTR__textures/kanji/gMsgKanji94EETex"
+static const ALIGN_ASSET(2) char gMsgKanji94EETex[] = dgMsgKanji94EETex;
+
+#define dgMsgKanji94EFTex "__OTR__textures/kanji/gMsgKanji94EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji94EFTex[] = dgMsgKanji94EFTex;
+
+#define dgMsgKanji94F0Tex "__OTR__textures/kanji/gMsgKanji94F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F0Tex[] = dgMsgKanji94F0Tex;
+
+#define dgMsgKanji94F1Tex "__OTR__textures/kanji/gMsgKanji94F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F1Tex[] = dgMsgKanji94F1Tex;
+
+#define dgMsgKanji94F2Tex "__OTR__textures/kanji/gMsgKanji94F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F2Tex[] = dgMsgKanji94F2Tex;
+
+#define dgMsgKanji94F3Tex "__OTR__textures/kanji/gMsgKanji94F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F3Tex[] = dgMsgKanji94F3Tex;
+
+#define dgMsgKanji94F4Tex "__OTR__textures/kanji/gMsgKanji94F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F4Tex[] = dgMsgKanji94F4Tex;
+
+#define dgMsgKanji94F5Tex "__OTR__textures/kanji/gMsgKanji94F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F5Tex[] = dgMsgKanji94F5Tex;
+
+#define dgMsgKanji94F6Tex "__OTR__textures/kanji/gMsgKanji94F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F6Tex[] = dgMsgKanji94F6Tex;
+
+#define dgMsgKanji94F7Tex "__OTR__textures/kanji/gMsgKanji94F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F7Tex[] = dgMsgKanji94F7Tex;
+
+#define dgMsgKanji94F8Tex "__OTR__textures/kanji/gMsgKanji94F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F8Tex[] = dgMsgKanji94F8Tex;
+
+#define dgMsgKanji94F9Tex "__OTR__textures/kanji/gMsgKanji94F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji94F9Tex[] = dgMsgKanji94F9Tex;
+
+#define dgMsgKanji94FATex "__OTR__textures/kanji/gMsgKanji94FATex"
+static const ALIGN_ASSET(2) char gMsgKanji94FATex[] = dgMsgKanji94FATex;
+
+#define dgMsgKanji94FBTex "__OTR__textures/kanji/gMsgKanji94FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji94FBTex[] = dgMsgKanji94FBTex;
+
+#define dgMsgKanji94FCTex "__OTR__textures/kanji/gMsgKanji94FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji94FCTex[] = dgMsgKanji94FCTex;
+
+#define dgMsgKanji9540Tex "__OTR__textures/kanji/gMsgKanji9540Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9540Tex[] = dgMsgKanji9540Tex;
+
+#define dgMsgKanji9541Tex "__OTR__textures/kanji/gMsgKanji9541Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9541Tex[] = dgMsgKanji9541Tex;
+
+#define dgMsgKanji9542Tex "__OTR__textures/kanji/gMsgKanji9542Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9542Tex[] = dgMsgKanji9542Tex;
+
+#define dgMsgKanji9543Tex "__OTR__textures/kanji/gMsgKanji9543Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9543Tex[] = dgMsgKanji9543Tex;
+
+#define dgMsgKanji9544Tex "__OTR__textures/kanji/gMsgKanji9544Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9544Tex[] = dgMsgKanji9544Tex;
+
+#define dgMsgKanji9545Tex "__OTR__textures/kanji/gMsgKanji9545Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9545Tex[] = dgMsgKanji9545Tex;
+
+#define dgMsgKanji9546Tex "__OTR__textures/kanji/gMsgKanji9546Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9546Tex[] = dgMsgKanji9546Tex;
+
+#define dgMsgKanji9547Tex "__OTR__textures/kanji/gMsgKanji9547Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9547Tex[] = dgMsgKanji9547Tex;
+
+#define dgMsgKanji9548Tex "__OTR__textures/kanji/gMsgKanji9548Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9548Tex[] = dgMsgKanji9548Tex;
+
+#define dgMsgKanji9549Tex "__OTR__textures/kanji/gMsgKanji9549Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9549Tex[] = dgMsgKanji9549Tex;
+
+#define dgMsgKanji954ATex "__OTR__textures/kanji/gMsgKanji954ATex"
+static const ALIGN_ASSET(2) char gMsgKanji954ATex[] = dgMsgKanji954ATex;
+
+#define dgMsgKanji954BTex "__OTR__textures/kanji/gMsgKanji954BTex"
+static const ALIGN_ASSET(2) char gMsgKanji954BTex[] = dgMsgKanji954BTex;
+
+#define dgMsgKanji954CTex "__OTR__textures/kanji/gMsgKanji954CTex"
+static const ALIGN_ASSET(2) char gMsgKanji954CTex[] = dgMsgKanji954CTex;
+
+#define dgMsgKanji954DTex "__OTR__textures/kanji/gMsgKanji954DTex"
+static const ALIGN_ASSET(2) char gMsgKanji954DTex[] = dgMsgKanji954DTex;
+
+#define dgMsgKanji954ETex "__OTR__textures/kanji/gMsgKanji954ETex"
+static const ALIGN_ASSET(2) char gMsgKanji954ETex[] = dgMsgKanji954ETex;
+
+#define dgMsgKanji954FTex "__OTR__textures/kanji/gMsgKanji954FTex"
+static const ALIGN_ASSET(2) char gMsgKanji954FTex[] = dgMsgKanji954FTex;
+
+#define dgMsgKanji9550Tex "__OTR__textures/kanji/gMsgKanji9550Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9550Tex[] = dgMsgKanji9550Tex;
+
+#define dgMsgKanji9551Tex "__OTR__textures/kanji/gMsgKanji9551Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9551Tex[] = dgMsgKanji9551Tex;
+
+#define dgMsgKanji9552Tex "__OTR__textures/kanji/gMsgKanji9552Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9552Tex[] = dgMsgKanji9552Tex;
+
+#define dgMsgKanji9553Tex "__OTR__textures/kanji/gMsgKanji9553Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9553Tex[] = dgMsgKanji9553Tex;
+
+#define dgMsgKanji9554Tex "__OTR__textures/kanji/gMsgKanji9554Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9554Tex[] = dgMsgKanji9554Tex;
+
+#define dgMsgKanji9555Tex "__OTR__textures/kanji/gMsgKanji9555Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9555Tex[] = dgMsgKanji9555Tex;
+
+#define dgMsgKanji9556Tex "__OTR__textures/kanji/gMsgKanji9556Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9556Tex[] = dgMsgKanji9556Tex;
+
+#define dgMsgKanji9557Tex "__OTR__textures/kanji/gMsgKanji9557Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9557Tex[] = dgMsgKanji9557Tex;
+
+#define dgMsgKanji9558Tex "__OTR__textures/kanji/gMsgKanji9558Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9558Tex[] = dgMsgKanji9558Tex;
+
+#define dgMsgKanji9559Tex "__OTR__textures/kanji/gMsgKanji9559Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9559Tex[] = dgMsgKanji9559Tex;
+
+#define dgMsgKanji955ATex "__OTR__textures/kanji/gMsgKanji955ATex"
+static const ALIGN_ASSET(2) char gMsgKanji955ATex[] = dgMsgKanji955ATex;
+
+#define dgMsgKanji955BTex "__OTR__textures/kanji/gMsgKanji955BTex"
+static const ALIGN_ASSET(2) char gMsgKanji955BTex[] = dgMsgKanji955BTex;
+
+#define dgMsgKanji955CTex "__OTR__textures/kanji/gMsgKanji955CTex"
+static const ALIGN_ASSET(2) char gMsgKanji955CTex[] = dgMsgKanji955CTex;
+
+#define dgMsgKanji955DTex "__OTR__textures/kanji/gMsgKanji955DTex"
+static const ALIGN_ASSET(2) char gMsgKanji955DTex[] = dgMsgKanji955DTex;
+
+#define dgMsgKanji955ETex "__OTR__textures/kanji/gMsgKanji955ETex"
+static const ALIGN_ASSET(2) char gMsgKanji955ETex[] = dgMsgKanji955ETex;
+
+#define dgMsgKanji955FTex "__OTR__textures/kanji/gMsgKanji955FTex"
+static const ALIGN_ASSET(2) char gMsgKanji955FTex[] = dgMsgKanji955FTex;
+
+#define dgMsgKanji9560Tex "__OTR__textures/kanji/gMsgKanji9560Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9560Tex[] = dgMsgKanji9560Tex;
+
+#define dgMsgKanji9561Tex "__OTR__textures/kanji/gMsgKanji9561Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9561Tex[] = dgMsgKanji9561Tex;
+
+#define dgMsgKanji9562Tex "__OTR__textures/kanji/gMsgKanji9562Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9562Tex[] = dgMsgKanji9562Tex;
+
+#define dgMsgKanji9563Tex "__OTR__textures/kanji/gMsgKanji9563Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9563Tex[] = dgMsgKanji9563Tex;
+
+#define dgMsgKanji9564Tex "__OTR__textures/kanji/gMsgKanji9564Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9564Tex[] = dgMsgKanji9564Tex;
+
+#define dgMsgKanji9565Tex "__OTR__textures/kanji/gMsgKanji9565Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9565Tex[] = dgMsgKanji9565Tex;
+
+#define dgMsgKanji9566Tex "__OTR__textures/kanji/gMsgKanji9566Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9566Tex[] = dgMsgKanji9566Tex;
+
+#define dgMsgKanji9567Tex "__OTR__textures/kanji/gMsgKanji9567Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9567Tex[] = dgMsgKanji9567Tex;
+
+#define dgMsgKanji9568Tex "__OTR__textures/kanji/gMsgKanji9568Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9568Tex[] = dgMsgKanji9568Tex;
+
+#define dgMsgKanji9569Tex "__OTR__textures/kanji/gMsgKanji9569Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9569Tex[] = dgMsgKanji9569Tex;
+
+#define dgMsgKanji956ATex "__OTR__textures/kanji/gMsgKanji956ATex"
+static const ALIGN_ASSET(2) char gMsgKanji956ATex[] = dgMsgKanji956ATex;
+
+#define dgMsgKanji956BTex "__OTR__textures/kanji/gMsgKanji956BTex"
+static const ALIGN_ASSET(2) char gMsgKanji956BTex[] = dgMsgKanji956BTex;
+
+#define dgMsgKanji956CTex "__OTR__textures/kanji/gMsgKanji956CTex"
+static const ALIGN_ASSET(2) char gMsgKanji956CTex[] = dgMsgKanji956CTex;
+
+#define dgMsgKanji956DTex "__OTR__textures/kanji/gMsgKanji956DTex"
+static const ALIGN_ASSET(2) char gMsgKanji956DTex[] = dgMsgKanji956DTex;
+
+#define dgMsgKanji956ETex "__OTR__textures/kanji/gMsgKanji956ETex"
+static const ALIGN_ASSET(2) char gMsgKanji956ETex[] = dgMsgKanji956ETex;
+
+#define dgMsgKanji956FTex "__OTR__textures/kanji/gMsgKanji956FTex"
+static const ALIGN_ASSET(2) char gMsgKanji956FTex[] = dgMsgKanji956FTex;
+
+#define dgMsgKanji9570Tex "__OTR__textures/kanji/gMsgKanji9570Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9570Tex[] = dgMsgKanji9570Tex;
+
+#define dgMsgKanji9571Tex "__OTR__textures/kanji/gMsgKanji9571Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9571Tex[] = dgMsgKanji9571Tex;
+
+#define dgMsgKanji9572Tex "__OTR__textures/kanji/gMsgKanji9572Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9572Tex[] = dgMsgKanji9572Tex;
+
+#define dgMsgKanji9573Tex "__OTR__textures/kanji/gMsgKanji9573Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9573Tex[] = dgMsgKanji9573Tex;
+
+#define dgMsgKanji9574Tex "__OTR__textures/kanji/gMsgKanji9574Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9574Tex[] = dgMsgKanji9574Tex;
+
+#define dgMsgKanji9575Tex "__OTR__textures/kanji/gMsgKanji9575Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9575Tex[] = dgMsgKanji9575Tex;
+
+#define dgMsgKanji9576Tex "__OTR__textures/kanji/gMsgKanji9576Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9576Tex[] = dgMsgKanji9576Tex;
+
+#define dgMsgKanji9577Tex "__OTR__textures/kanji/gMsgKanji9577Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9577Tex[] = dgMsgKanji9577Tex;
+
+#define dgMsgKanji9578Tex "__OTR__textures/kanji/gMsgKanji9578Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9578Tex[] = dgMsgKanji9578Tex;
+
+#define dgMsgKanji9579Tex "__OTR__textures/kanji/gMsgKanji9579Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9579Tex[] = dgMsgKanji9579Tex;
+
+#define dgMsgKanji957ATex "__OTR__textures/kanji/gMsgKanji957ATex"
+static const ALIGN_ASSET(2) char gMsgKanji957ATex[] = dgMsgKanji957ATex;
+
+#define dgMsgKanji957BTex "__OTR__textures/kanji/gMsgKanji957BTex"
+static const ALIGN_ASSET(2) char gMsgKanji957BTex[] = dgMsgKanji957BTex;
+
+#define dgMsgKanji957CTex "__OTR__textures/kanji/gMsgKanji957CTex"
+static const ALIGN_ASSET(2) char gMsgKanji957CTex[] = dgMsgKanji957CTex;
+
+#define dgMsgKanji957DTex "__OTR__textures/kanji/gMsgKanji957DTex"
+static const ALIGN_ASSET(2) char gMsgKanji957DTex[] = dgMsgKanji957DTex;
+
+#define dgMsgKanji957ETex "__OTR__textures/kanji/gMsgKanji957ETex"
+static const ALIGN_ASSET(2) char gMsgKanji957ETex[] = dgMsgKanji957ETex;
+
+#define dgMsgKanji9580Tex "__OTR__textures/kanji/gMsgKanji9580Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9580Tex[] = dgMsgKanji9580Tex;
+
+#define dgMsgKanji9581Tex "__OTR__textures/kanji/gMsgKanji9581Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9581Tex[] = dgMsgKanji9581Tex;
+
+#define dgMsgKanji9582Tex "__OTR__textures/kanji/gMsgKanji9582Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9582Tex[] = dgMsgKanji9582Tex;
+
+#define dgMsgKanji9583Tex "__OTR__textures/kanji/gMsgKanji9583Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9583Tex[] = dgMsgKanji9583Tex;
+
+#define dgMsgKanji9584Tex "__OTR__textures/kanji/gMsgKanji9584Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9584Tex[] = dgMsgKanji9584Tex;
+
+#define dgMsgKanji9585Tex "__OTR__textures/kanji/gMsgKanji9585Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9585Tex[] = dgMsgKanji9585Tex;
+
+#define dgMsgKanji9586Tex "__OTR__textures/kanji/gMsgKanji9586Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9586Tex[] = dgMsgKanji9586Tex;
+
+#define dgMsgKanji9587Tex "__OTR__textures/kanji/gMsgKanji9587Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9587Tex[] = dgMsgKanji9587Tex;
+
+#define dgMsgKanji9588Tex "__OTR__textures/kanji/gMsgKanji9588Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9588Tex[] = dgMsgKanji9588Tex;
+
+#define dgMsgKanji9589Tex "__OTR__textures/kanji/gMsgKanji9589Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9589Tex[] = dgMsgKanji9589Tex;
+
+#define dgMsgKanji958ATex "__OTR__textures/kanji/gMsgKanji958ATex"
+static const ALIGN_ASSET(2) char gMsgKanji958ATex[] = dgMsgKanji958ATex;
+
+#define dgMsgKanji958BTex "__OTR__textures/kanji/gMsgKanji958BTex"
+static const ALIGN_ASSET(2) char gMsgKanji958BTex[] = dgMsgKanji958BTex;
+
+#define dgMsgKanji958CTex "__OTR__textures/kanji/gMsgKanji958CTex"
+static const ALIGN_ASSET(2) char gMsgKanji958CTex[] = dgMsgKanji958CTex;
+
+#define dgMsgKanji958DTex "__OTR__textures/kanji/gMsgKanji958DTex"
+static const ALIGN_ASSET(2) char gMsgKanji958DTex[] = dgMsgKanji958DTex;
+
+#define dgMsgKanji958ETex "__OTR__textures/kanji/gMsgKanji958ETex"
+static const ALIGN_ASSET(2) char gMsgKanji958ETex[] = dgMsgKanji958ETex;
+
+#define dgMsgKanji958FTex "__OTR__textures/kanji/gMsgKanji958FTex"
+static const ALIGN_ASSET(2) char gMsgKanji958FTex[] = dgMsgKanji958FTex;
+
+#define dgMsgKanji9590Tex "__OTR__textures/kanji/gMsgKanji9590Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9590Tex[] = dgMsgKanji9590Tex;
+
+#define dgMsgKanji9591Tex "__OTR__textures/kanji/gMsgKanji9591Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9591Tex[] = dgMsgKanji9591Tex;
+
+#define dgMsgKanji9592Tex "__OTR__textures/kanji/gMsgKanji9592Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9592Tex[] = dgMsgKanji9592Tex;
+
+#define dgMsgKanji9593Tex "__OTR__textures/kanji/gMsgKanji9593Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9593Tex[] = dgMsgKanji9593Tex;
+
+#define dgMsgKanji9594Tex "__OTR__textures/kanji/gMsgKanji9594Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9594Tex[] = dgMsgKanji9594Tex;
+
+#define dgMsgKanji9595Tex "__OTR__textures/kanji/gMsgKanji9595Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9595Tex[] = dgMsgKanji9595Tex;
+
+#define dgMsgKanji9596Tex "__OTR__textures/kanji/gMsgKanji9596Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9596Tex[] = dgMsgKanji9596Tex;
+
+#define dgMsgKanji9597Tex "__OTR__textures/kanji/gMsgKanji9597Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9597Tex[] = dgMsgKanji9597Tex;
+
+#define dgMsgKanji9598Tex "__OTR__textures/kanji/gMsgKanji9598Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9598Tex[] = dgMsgKanji9598Tex;
+
+#define dgMsgKanji9599Tex "__OTR__textures/kanji/gMsgKanji9599Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9599Tex[] = dgMsgKanji9599Tex;
+
+#define dgMsgKanji959ATex "__OTR__textures/kanji/gMsgKanji959ATex"
+static const ALIGN_ASSET(2) char gMsgKanji959ATex[] = dgMsgKanji959ATex;
+
+#define dgMsgKanji959BTex "__OTR__textures/kanji/gMsgKanji959BTex"
+static const ALIGN_ASSET(2) char gMsgKanji959BTex[] = dgMsgKanji959BTex;
+
+#define dgMsgKanji959CTex "__OTR__textures/kanji/gMsgKanji959CTex"
+static const ALIGN_ASSET(2) char gMsgKanji959CTex[] = dgMsgKanji959CTex;
+
+#define dgMsgKanji959DTex "__OTR__textures/kanji/gMsgKanji959DTex"
+static const ALIGN_ASSET(2) char gMsgKanji959DTex[] = dgMsgKanji959DTex;
+
+#define dgMsgKanji959ETex "__OTR__textures/kanji/gMsgKanji959ETex"
+static const ALIGN_ASSET(2) char gMsgKanji959ETex[] = dgMsgKanji959ETex;
+
+#define dgMsgKanji959FTex "__OTR__textures/kanji/gMsgKanji959FTex"
+static const ALIGN_ASSET(2) char gMsgKanji959FTex[] = dgMsgKanji959FTex;
+
+#define dgMsgKanji95A0Tex "__OTR__textures/kanji/gMsgKanji95A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A0Tex[] = dgMsgKanji95A0Tex;
+
+#define dgMsgKanji95A1Tex "__OTR__textures/kanji/gMsgKanji95A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A1Tex[] = dgMsgKanji95A1Tex;
+
+#define dgMsgKanji95A2Tex "__OTR__textures/kanji/gMsgKanji95A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A2Tex[] = dgMsgKanji95A2Tex;
+
+#define dgMsgKanji95A3Tex "__OTR__textures/kanji/gMsgKanji95A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A3Tex[] = dgMsgKanji95A3Tex;
+
+#define dgMsgKanji95A4Tex "__OTR__textures/kanji/gMsgKanji95A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A4Tex[] = dgMsgKanji95A4Tex;
+
+#define dgMsgKanji95A5Tex "__OTR__textures/kanji/gMsgKanji95A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A5Tex[] = dgMsgKanji95A5Tex;
+
+#define dgMsgKanji95A6Tex "__OTR__textures/kanji/gMsgKanji95A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A6Tex[] = dgMsgKanji95A6Tex;
+
+#define dgMsgKanji95A7Tex "__OTR__textures/kanji/gMsgKanji95A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A7Tex[] = dgMsgKanji95A7Tex;
+
+#define dgMsgKanji95A8Tex "__OTR__textures/kanji/gMsgKanji95A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A8Tex[] = dgMsgKanji95A8Tex;
+
+#define dgMsgKanji95A9Tex "__OTR__textures/kanji/gMsgKanji95A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95A9Tex[] = dgMsgKanji95A9Tex;
+
+#define dgMsgKanji95AATex "__OTR__textures/kanji/gMsgKanji95AATex"
+static const ALIGN_ASSET(2) char gMsgKanji95AATex[] = dgMsgKanji95AATex;
+
+#define dgMsgKanji95ABTex "__OTR__textures/kanji/gMsgKanji95ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji95ABTex[] = dgMsgKanji95ABTex;
+
+#define dgMsgKanji95ACTex "__OTR__textures/kanji/gMsgKanji95ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji95ACTex[] = dgMsgKanji95ACTex;
+
+#define dgMsgKanji95ADTex "__OTR__textures/kanji/gMsgKanji95ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji95ADTex[] = dgMsgKanji95ADTex;
+
+#define dgMsgKanji95AETex "__OTR__textures/kanji/gMsgKanji95AETex"
+static const ALIGN_ASSET(2) char gMsgKanji95AETex[] = dgMsgKanji95AETex;
+
+#define dgMsgKanji95AFTex "__OTR__textures/kanji/gMsgKanji95AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji95AFTex[] = dgMsgKanji95AFTex;
+
+#define dgMsgKanji95B0Tex "__OTR__textures/kanji/gMsgKanji95B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B0Tex[] = dgMsgKanji95B0Tex;
+
+#define dgMsgKanji95B1Tex "__OTR__textures/kanji/gMsgKanji95B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B1Tex[] = dgMsgKanji95B1Tex;
+
+#define dgMsgKanji95B2Tex "__OTR__textures/kanji/gMsgKanji95B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B2Tex[] = dgMsgKanji95B2Tex;
+
+#define dgMsgKanji95B3Tex "__OTR__textures/kanji/gMsgKanji95B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B3Tex[] = dgMsgKanji95B3Tex;
+
+#define dgMsgKanji95B4Tex "__OTR__textures/kanji/gMsgKanji95B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B4Tex[] = dgMsgKanji95B4Tex;
+
+#define dgMsgKanji95B5Tex "__OTR__textures/kanji/gMsgKanji95B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B5Tex[] = dgMsgKanji95B5Tex;
+
+#define dgMsgKanji95B6Tex "__OTR__textures/kanji/gMsgKanji95B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B6Tex[] = dgMsgKanji95B6Tex;
+
+#define dgMsgKanji95B7Tex "__OTR__textures/kanji/gMsgKanji95B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B7Tex[] = dgMsgKanji95B7Tex;
+
+#define dgMsgKanji95B8Tex "__OTR__textures/kanji/gMsgKanji95B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B8Tex[] = dgMsgKanji95B8Tex;
+
+#define dgMsgKanji95B9Tex "__OTR__textures/kanji/gMsgKanji95B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95B9Tex[] = dgMsgKanji95B9Tex;
+
+#define dgMsgKanji95BATex "__OTR__textures/kanji/gMsgKanji95BATex"
+static const ALIGN_ASSET(2) char gMsgKanji95BATex[] = dgMsgKanji95BATex;
+
+#define dgMsgKanji95BBTex "__OTR__textures/kanji/gMsgKanji95BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji95BBTex[] = dgMsgKanji95BBTex;
+
+#define dgMsgKanji95BCTex "__OTR__textures/kanji/gMsgKanji95BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji95BCTex[] = dgMsgKanji95BCTex;
+
+#define dgMsgKanji95BDTex "__OTR__textures/kanji/gMsgKanji95BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji95BDTex[] = dgMsgKanji95BDTex;
+
+#define dgMsgKanji95BETex "__OTR__textures/kanji/gMsgKanji95BETex"
+static const ALIGN_ASSET(2) char gMsgKanji95BETex[] = dgMsgKanji95BETex;
+
+#define dgMsgKanji95BFTex "__OTR__textures/kanji/gMsgKanji95BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji95BFTex[] = dgMsgKanji95BFTex;
+
+#define dgMsgKanji95C0Tex "__OTR__textures/kanji/gMsgKanji95C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C0Tex[] = dgMsgKanji95C0Tex;
+
+#define dgMsgKanji95C1Tex "__OTR__textures/kanji/gMsgKanji95C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C1Tex[] = dgMsgKanji95C1Tex;
+
+#define dgMsgKanji95C2Tex "__OTR__textures/kanji/gMsgKanji95C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C2Tex[] = dgMsgKanji95C2Tex;
+
+#define dgMsgKanji95C3Tex "__OTR__textures/kanji/gMsgKanji95C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C3Tex[] = dgMsgKanji95C3Tex;
+
+#define dgMsgKanji95C4Tex "__OTR__textures/kanji/gMsgKanji95C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C4Tex[] = dgMsgKanji95C4Tex;
+
+#define dgMsgKanji95C5Tex "__OTR__textures/kanji/gMsgKanji95C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C5Tex[] = dgMsgKanji95C5Tex;
+
+#define dgMsgKanji95C6Tex "__OTR__textures/kanji/gMsgKanji95C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C6Tex[] = dgMsgKanji95C6Tex;
+
+#define dgMsgKanji95C7Tex "__OTR__textures/kanji/gMsgKanji95C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C7Tex[] = dgMsgKanji95C7Tex;
+
+#define dgMsgKanji95C8Tex "__OTR__textures/kanji/gMsgKanji95C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C8Tex[] = dgMsgKanji95C8Tex;
+
+#define dgMsgKanji95C9Tex "__OTR__textures/kanji/gMsgKanji95C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95C9Tex[] = dgMsgKanji95C9Tex;
+
+#define dgMsgKanji95CATex "__OTR__textures/kanji/gMsgKanji95CATex"
+static const ALIGN_ASSET(2) char gMsgKanji95CATex[] = dgMsgKanji95CATex;
+
+#define dgMsgKanji95CBTex "__OTR__textures/kanji/gMsgKanji95CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji95CBTex[] = dgMsgKanji95CBTex;
+
+#define dgMsgKanji95CCTex "__OTR__textures/kanji/gMsgKanji95CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji95CCTex[] = dgMsgKanji95CCTex;
+
+#define dgMsgKanji95CDTex "__OTR__textures/kanji/gMsgKanji95CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji95CDTex[] = dgMsgKanji95CDTex;
+
+#define dgMsgKanji95CETex "__OTR__textures/kanji/gMsgKanji95CETex"
+static const ALIGN_ASSET(2) char gMsgKanji95CETex[] = dgMsgKanji95CETex;
+
+#define dgMsgKanji95CFTex "__OTR__textures/kanji/gMsgKanji95CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji95CFTex[] = dgMsgKanji95CFTex;
+
+#define dgMsgKanji95D0Tex "__OTR__textures/kanji/gMsgKanji95D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D0Tex[] = dgMsgKanji95D0Tex;
+
+#define dgMsgKanji95D1Tex "__OTR__textures/kanji/gMsgKanji95D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D1Tex[] = dgMsgKanji95D1Tex;
+
+#define dgMsgKanji95D2Tex "__OTR__textures/kanji/gMsgKanji95D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D2Tex[] = dgMsgKanji95D2Tex;
+
+#define dgMsgKanji95D3Tex "__OTR__textures/kanji/gMsgKanji95D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D3Tex[] = dgMsgKanji95D3Tex;
+
+#define dgMsgKanji95D4Tex "__OTR__textures/kanji/gMsgKanji95D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D4Tex[] = dgMsgKanji95D4Tex;
+
+#define dgMsgKanji95D5Tex "__OTR__textures/kanji/gMsgKanji95D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D5Tex[] = dgMsgKanji95D5Tex;
+
+#define dgMsgKanji95D6Tex "__OTR__textures/kanji/gMsgKanji95D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D6Tex[] = dgMsgKanji95D6Tex;
+
+#define dgMsgKanji95D7Tex "__OTR__textures/kanji/gMsgKanji95D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D7Tex[] = dgMsgKanji95D7Tex;
+
+#define dgMsgKanji95D8Tex "__OTR__textures/kanji/gMsgKanji95D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D8Tex[] = dgMsgKanji95D8Tex;
+
+#define dgMsgKanji95D9Tex "__OTR__textures/kanji/gMsgKanji95D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95D9Tex[] = dgMsgKanji95D9Tex;
+
+#define dgMsgKanji95DATex "__OTR__textures/kanji/gMsgKanji95DATex"
+static const ALIGN_ASSET(2) char gMsgKanji95DATex[] = dgMsgKanji95DATex;
+
+#define dgMsgKanji95DBTex "__OTR__textures/kanji/gMsgKanji95DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji95DBTex[] = dgMsgKanji95DBTex;
+
+#define dgMsgKanji95DCTex "__OTR__textures/kanji/gMsgKanji95DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji95DCTex[] = dgMsgKanji95DCTex;
+
+#define dgMsgKanji95DDTex "__OTR__textures/kanji/gMsgKanji95DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji95DDTex[] = dgMsgKanji95DDTex;
+
+#define dgMsgKanji95DETex "__OTR__textures/kanji/gMsgKanji95DETex"
+static const ALIGN_ASSET(2) char gMsgKanji95DETex[] = dgMsgKanji95DETex;
+
+#define dgMsgKanji95DFTex "__OTR__textures/kanji/gMsgKanji95DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji95DFTex[] = dgMsgKanji95DFTex;
+
+#define dgMsgKanji95E0Tex "__OTR__textures/kanji/gMsgKanji95E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E0Tex[] = dgMsgKanji95E0Tex;
+
+#define dgMsgKanji95E1Tex "__OTR__textures/kanji/gMsgKanji95E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E1Tex[] = dgMsgKanji95E1Tex;
+
+#define dgMsgKanji95E2Tex "__OTR__textures/kanji/gMsgKanji95E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E2Tex[] = dgMsgKanji95E2Tex;
+
+#define dgMsgKanji95E3Tex "__OTR__textures/kanji/gMsgKanji95E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E3Tex[] = dgMsgKanji95E3Tex;
+
+#define dgMsgKanji95E4Tex "__OTR__textures/kanji/gMsgKanji95E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E4Tex[] = dgMsgKanji95E4Tex;
+
+#define dgMsgKanji95E5Tex "__OTR__textures/kanji/gMsgKanji95E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E5Tex[] = dgMsgKanji95E5Tex;
+
+#define dgMsgKanji95E6Tex "__OTR__textures/kanji/gMsgKanji95E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E6Tex[] = dgMsgKanji95E6Tex;
+
+#define dgMsgKanji95E7Tex "__OTR__textures/kanji/gMsgKanji95E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E7Tex[] = dgMsgKanji95E7Tex;
+
+#define dgMsgKanji95E8Tex "__OTR__textures/kanji/gMsgKanji95E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E8Tex[] = dgMsgKanji95E8Tex;
+
+#define dgMsgKanji95E9Tex "__OTR__textures/kanji/gMsgKanji95E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95E9Tex[] = dgMsgKanji95E9Tex;
+
+#define dgMsgKanji95EATex "__OTR__textures/kanji/gMsgKanji95EATex"
+static const ALIGN_ASSET(2) char gMsgKanji95EATex[] = dgMsgKanji95EATex;
+
+#define dgMsgKanji95EBTex "__OTR__textures/kanji/gMsgKanji95EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji95EBTex[] = dgMsgKanji95EBTex;
+
+#define dgMsgKanji95ECTex "__OTR__textures/kanji/gMsgKanji95ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji95ECTex[] = dgMsgKanji95ECTex;
+
+#define dgMsgKanji95EDTex "__OTR__textures/kanji/gMsgKanji95EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji95EDTex[] = dgMsgKanji95EDTex;
+
+#define dgMsgKanji95EETex "__OTR__textures/kanji/gMsgKanji95EETex"
+static const ALIGN_ASSET(2) char gMsgKanji95EETex[] = dgMsgKanji95EETex;
+
+#define dgMsgKanji95EFTex "__OTR__textures/kanji/gMsgKanji95EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji95EFTex[] = dgMsgKanji95EFTex;
+
+#define dgMsgKanji95F0Tex "__OTR__textures/kanji/gMsgKanji95F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F0Tex[] = dgMsgKanji95F0Tex;
+
+#define dgMsgKanji95F1Tex "__OTR__textures/kanji/gMsgKanji95F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F1Tex[] = dgMsgKanji95F1Tex;
+
+#define dgMsgKanji95F2Tex "__OTR__textures/kanji/gMsgKanji95F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F2Tex[] = dgMsgKanji95F2Tex;
+
+#define dgMsgKanji95F3Tex "__OTR__textures/kanji/gMsgKanji95F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F3Tex[] = dgMsgKanji95F3Tex;
+
+#define dgMsgKanji95F4Tex "__OTR__textures/kanji/gMsgKanji95F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F4Tex[] = dgMsgKanji95F4Tex;
+
+#define dgMsgKanji95F5Tex "__OTR__textures/kanji/gMsgKanji95F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F5Tex[] = dgMsgKanji95F5Tex;
+
+#define dgMsgKanji95F6Tex "__OTR__textures/kanji/gMsgKanji95F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F6Tex[] = dgMsgKanji95F6Tex;
+
+#define dgMsgKanji95F7Tex "__OTR__textures/kanji/gMsgKanji95F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F7Tex[] = dgMsgKanji95F7Tex;
+
+#define dgMsgKanji95F8Tex "__OTR__textures/kanji/gMsgKanji95F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F8Tex[] = dgMsgKanji95F8Tex;
+
+#define dgMsgKanji95F9Tex "__OTR__textures/kanji/gMsgKanji95F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji95F9Tex[] = dgMsgKanji95F9Tex;
+
+#define dgMsgKanji95FATex "__OTR__textures/kanji/gMsgKanji95FATex"
+static const ALIGN_ASSET(2) char gMsgKanji95FATex[] = dgMsgKanji95FATex;
+
+#define dgMsgKanji95FBTex "__OTR__textures/kanji/gMsgKanji95FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji95FBTex[] = dgMsgKanji95FBTex;
+
+#define dgMsgKanji95FCTex "__OTR__textures/kanji/gMsgKanji95FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji95FCTex[] = dgMsgKanji95FCTex;
+
+#define dgMsgKanji9640Tex "__OTR__textures/kanji/gMsgKanji9640Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9640Tex[] = dgMsgKanji9640Tex;
+
+#define dgMsgKanji9641Tex "__OTR__textures/kanji/gMsgKanji9641Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9641Tex[] = dgMsgKanji9641Tex;
+
+#define dgMsgKanji9642Tex "__OTR__textures/kanji/gMsgKanji9642Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9642Tex[] = dgMsgKanji9642Tex;
+
+#define dgMsgKanji9643Tex "__OTR__textures/kanji/gMsgKanji9643Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9643Tex[] = dgMsgKanji9643Tex;
+
+#define dgMsgKanji9644Tex "__OTR__textures/kanji/gMsgKanji9644Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9644Tex[] = dgMsgKanji9644Tex;
+
+#define dgMsgKanji9645Tex "__OTR__textures/kanji/gMsgKanji9645Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9645Tex[] = dgMsgKanji9645Tex;
+
+#define dgMsgKanji9646Tex "__OTR__textures/kanji/gMsgKanji9646Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9646Tex[] = dgMsgKanji9646Tex;
+
+#define dgMsgKanji9647Tex "__OTR__textures/kanji/gMsgKanji9647Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9647Tex[] = dgMsgKanji9647Tex;
+
+#define dgMsgKanji9648Tex "__OTR__textures/kanji/gMsgKanji9648Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9648Tex[] = dgMsgKanji9648Tex;
+
+#define dgMsgKanji9649Tex "__OTR__textures/kanji/gMsgKanji9649Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9649Tex[] = dgMsgKanji9649Tex;
+
+#define dgMsgKanji964ATex "__OTR__textures/kanji/gMsgKanji964ATex"
+static const ALIGN_ASSET(2) char gMsgKanji964ATex[] = dgMsgKanji964ATex;
+
+#define dgMsgKanji964BTex "__OTR__textures/kanji/gMsgKanji964BTex"
+static const ALIGN_ASSET(2) char gMsgKanji964BTex[] = dgMsgKanji964BTex;
+
+#define dgMsgKanji964CTex "__OTR__textures/kanji/gMsgKanji964CTex"
+static const ALIGN_ASSET(2) char gMsgKanji964CTex[] = dgMsgKanji964CTex;
+
+#define dgMsgKanji964DTex "__OTR__textures/kanji/gMsgKanji964DTex"
+static const ALIGN_ASSET(2) char gMsgKanji964DTex[] = dgMsgKanji964DTex;
+
+#define dgMsgKanji964ETex "__OTR__textures/kanji/gMsgKanji964ETex"
+static const ALIGN_ASSET(2) char gMsgKanji964ETex[] = dgMsgKanji964ETex;
+
+#define dgMsgKanji964FTex "__OTR__textures/kanji/gMsgKanji964FTex"
+static const ALIGN_ASSET(2) char gMsgKanji964FTex[] = dgMsgKanji964FTex;
+
+#define dgMsgKanji9650Tex "__OTR__textures/kanji/gMsgKanji9650Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9650Tex[] = dgMsgKanji9650Tex;
+
+#define dgMsgKanji9651Tex "__OTR__textures/kanji/gMsgKanji9651Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9651Tex[] = dgMsgKanji9651Tex;
+
+#define dgMsgKanji9652Tex "__OTR__textures/kanji/gMsgKanji9652Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9652Tex[] = dgMsgKanji9652Tex;
+
+#define dgMsgKanji9653Tex "__OTR__textures/kanji/gMsgKanji9653Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9653Tex[] = dgMsgKanji9653Tex;
+
+#define dgMsgKanji9654Tex "__OTR__textures/kanji/gMsgKanji9654Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9654Tex[] = dgMsgKanji9654Tex;
+
+#define dgMsgKanji9655Tex "__OTR__textures/kanji/gMsgKanji9655Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9655Tex[] = dgMsgKanji9655Tex;
+
+#define dgMsgKanji9656Tex "__OTR__textures/kanji/gMsgKanji9656Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9656Tex[] = dgMsgKanji9656Tex;
+
+#define dgMsgKanji9657Tex "__OTR__textures/kanji/gMsgKanji9657Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9657Tex[] = dgMsgKanji9657Tex;
+
+#define dgMsgKanji9658Tex "__OTR__textures/kanji/gMsgKanji9658Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9658Tex[] = dgMsgKanji9658Tex;
+
+#define dgMsgKanji9659Tex "__OTR__textures/kanji/gMsgKanji9659Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9659Tex[] = dgMsgKanji9659Tex;
+
+#define dgMsgKanji965ATex "__OTR__textures/kanji/gMsgKanji965ATex"
+static const ALIGN_ASSET(2) char gMsgKanji965ATex[] = dgMsgKanji965ATex;
+
+#define dgMsgKanji965BTex "__OTR__textures/kanji/gMsgKanji965BTex"
+static const ALIGN_ASSET(2) char gMsgKanji965BTex[] = dgMsgKanji965BTex;
+
+#define dgMsgKanji965CTex "__OTR__textures/kanji/gMsgKanji965CTex"
+static const ALIGN_ASSET(2) char gMsgKanji965CTex[] = dgMsgKanji965CTex;
+
+#define dgMsgKanji965DTex "__OTR__textures/kanji/gMsgKanji965DTex"
+static const ALIGN_ASSET(2) char gMsgKanji965DTex[] = dgMsgKanji965DTex;
+
+#define dgMsgKanji965ETex "__OTR__textures/kanji/gMsgKanji965ETex"
+static const ALIGN_ASSET(2) char gMsgKanji965ETex[] = dgMsgKanji965ETex;
+
+#define dgMsgKanji965FTex "__OTR__textures/kanji/gMsgKanji965FTex"
+static const ALIGN_ASSET(2) char gMsgKanji965FTex[] = dgMsgKanji965FTex;
+
+#define dgMsgKanji9660Tex "__OTR__textures/kanji/gMsgKanji9660Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9660Tex[] = dgMsgKanji9660Tex;
+
+#define dgMsgKanji9661Tex "__OTR__textures/kanji/gMsgKanji9661Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9661Tex[] = dgMsgKanji9661Tex;
+
+#define dgMsgKanji9662Tex "__OTR__textures/kanji/gMsgKanji9662Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9662Tex[] = dgMsgKanji9662Tex;
+
+#define dgMsgKanji9663Tex "__OTR__textures/kanji/gMsgKanji9663Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9663Tex[] = dgMsgKanji9663Tex;
+
+#define dgMsgKanji9664Tex "__OTR__textures/kanji/gMsgKanji9664Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9664Tex[] = dgMsgKanji9664Tex;
+
+#define dgMsgKanji9665Tex "__OTR__textures/kanji/gMsgKanji9665Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9665Tex[] = dgMsgKanji9665Tex;
+
+#define dgMsgKanji9666Tex "__OTR__textures/kanji/gMsgKanji9666Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9666Tex[] = dgMsgKanji9666Tex;
+
+#define dgMsgKanji9667Tex "__OTR__textures/kanji/gMsgKanji9667Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9667Tex[] = dgMsgKanji9667Tex;
+
+#define dgMsgKanji9668Tex "__OTR__textures/kanji/gMsgKanji9668Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9668Tex[] = dgMsgKanji9668Tex;
+
+#define dgMsgKanji9669Tex "__OTR__textures/kanji/gMsgKanji9669Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9669Tex[] = dgMsgKanji9669Tex;
+
+#define dgMsgKanji966ATex "__OTR__textures/kanji/gMsgKanji966ATex"
+static const ALIGN_ASSET(2) char gMsgKanji966ATex[] = dgMsgKanji966ATex;
+
+#define dgMsgKanji966BTex "__OTR__textures/kanji/gMsgKanji966BTex"
+static const ALIGN_ASSET(2) char gMsgKanji966BTex[] = dgMsgKanji966BTex;
+
+#define dgMsgKanji966CTex "__OTR__textures/kanji/gMsgKanji966CTex"
+static const ALIGN_ASSET(2) char gMsgKanji966CTex[] = dgMsgKanji966CTex;
+
+#define dgMsgKanji966DTex "__OTR__textures/kanji/gMsgKanji966DTex"
+static const ALIGN_ASSET(2) char gMsgKanji966DTex[] = dgMsgKanji966DTex;
+
+#define dgMsgKanji966ETex "__OTR__textures/kanji/gMsgKanji966ETex"
+static const ALIGN_ASSET(2) char gMsgKanji966ETex[] = dgMsgKanji966ETex;
+
+#define dgMsgKanji966FTex "__OTR__textures/kanji/gMsgKanji966FTex"
+static const ALIGN_ASSET(2) char gMsgKanji966FTex[] = dgMsgKanji966FTex;
+
+#define dgMsgKanji9670Tex "__OTR__textures/kanji/gMsgKanji9670Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9670Tex[] = dgMsgKanji9670Tex;
+
+#define dgMsgKanji9671Tex "__OTR__textures/kanji/gMsgKanji9671Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9671Tex[] = dgMsgKanji9671Tex;
+
+#define dgMsgKanji9672Tex "__OTR__textures/kanji/gMsgKanji9672Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9672Tex[] = dgMsgKanji9672Tex;
+
+#define dgMsgKanji9673Tex "__OTR__textures/kanji/gMsgKanji9673Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9673Tex[] = dgMsgKanji9673Tex;
+
+#define dgMsgKanji9674Tex "__OTR__textures/kanji/gMsgKanji9674Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9674Tex[] = dgMsgKanji9674Tex;
+
+#define dgMsgKanji9675Tex "__OTR__textures/kanji/gMsgKanji9675Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9675Tex[] = dgMsgKanji9675Tex;
+
+#define dgMsgKanji9676Tex "__OTR__textures/kanji/gMsgKanji9676Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9676Tex[] = dgMsgKanji9676Tex;
+
+#define dgMsgKanji9677Tex "__OTR__textures/kanji/gMsgKanji9677Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9677Tex[] = dgMsgKanji9677Tex;
+
+#define dgMsgKanji9678Tex "__OTR__textures/kanji/gMsgKanji9678Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9678Tex[] = dgMsgKanji9678Tex;
+
+#define dgMsgKanji9679Tex "__OTR__textures/kanji/gMsgKanji9679Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9679Tex[] = dgMsgKanji9679Tex;
+
+#define dgMsgKanji967ATex "__OTR__textures/kanji/gMsgKanji967ATex"
+static const ALIGN_ASSET(2) char gMsgKanji967ATex[] = dgMsgKanji967ATex;
+
+#define dgMsgKanji967BTex "__OTR__textures/kanji/gMsgKanji967BTex"
+static const ALIGN_ASSET(2) char gMsgKanji967BTex[] = dgMsgKanji967BTex;
+
+#define dgMsgKanji967CTex "__OTR__textures/kanji/gMsgKanji967CTex"
+static const ALIGN_ASSET(2) char gMsgKanji967CTex[] = dgMsgKanji967CTex;
+
+#define dgMsgKanji967DTex "__OTR__textures/kanji/gMsgKanji967DTex"
+static const ALIGN_ASSET(2) char gMsgKanji967DTex[] = dgMsgKanji967DTex;
+
+#define dgMsgKanji967ETex "__OTR__textures/kanji/gMsgKanji967ETex"
+static const ALIGN_ASSET(2) char gMsgKanji967ETex[] = dgMsgKanji967ETex;
+
+#define dgMsgKanji9680Tex "__OTR__textures/kanji/gMsgKanji9680Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9680Tex[] = dgMsgKanji9680Tex;
+
+#define dgMsgKanji9681Tex "__OTR__textures/kanji/gMsgKanji9681Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9681Tex[] = dgMsgKanji9681Tex;
+
+#define dgMsgKanji9682Tex "__OTR__textures/kanji/gMsgKanji9682Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9682Tex[] = dgMsgKanji9682Tex;
+
+#define dgMsgKanji9683Tex "__OTR__textures/kanji/gMsgKanji9683Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9683Tex[] = dgMsgKanji9683Tex;
+
+#define dgMsgKanji9684Tex "__OTR__textures/kanji/gMsgKanji9684Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9684Tex[] = dgMsgKanji9684Tex;
+
+#define dgMsgKanji9685Tex "__OTR__textures/kanji/gMsgKanji9685Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9685Tex[] = dgMsgKanji9685Tex;
+
+#define dgMsgKanji9686Tex "__OTR__textures/kanji/gMsgKanji9686Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9686Tex[] = dgMsgKanji9686Tex;
+
+#define dgMsgKanji9687Tex "__OTR__textures/kanji/gMsgKanji9687Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9687Tex[] = dgMsgKanji9687Tex;
+
+#define dgMsgKanji9688Tex "__OTR__textures/kanji/gMsgKanji9688Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9688Tex[] = dgMsgKanji9688Tex;
+
+#define dgMsgKanji9689Tex "__OTR__textures/kanji/gMsgKanji9689Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9689Tex[] = dgMsgKanji9689Tex;
+
+#define dgMsgKanji968ATex "__OTR__textures/kanji/gMsgKanji968ATex"
+static const ALIGN_ASSET(2) char gMsgKanji968ATex[] = dgMsgKanji968ATex;
+
+#define dgMsgKanji968BTex "__OTR__textures/kanji/gMsgKanji968BTex"
+static const ALIGN_ASSET(2) char gMsgKanji968BTex[] = dgMsgKanji968BTex;
+
+#define dgMsgKanji968CTex "__OTR__textures/kanji/gMsgKanji968CTex"
+static const ALIGN_ASSET(2) char gMsgKanji968CTex[] = dgMsgKanji968CTex;
+
+#define dgMsgKanji968DTex "__OTR__textures/kanji/gMsgKanji968DTex"
+static const ALIGN_ASSET(2) char gMsgKanji968DTex[] = dgMsgKanji968DTex;
+
+#define dgMsgKanji968ETex "__OTR__textures/kanji/gMsgKanji968ETex"
+static const ALIGN_ASSET(2) char gMsgKanji968ETex[] = dgMsgKanji968ETex;
+
+#define dgMsgKanji968FTex "__OTR__textures/kanji/gMsgKanji968FTex"
+static const ALIGN_ASSET(2) char gMsgKanji968FTex[] = dgMsgKanji968FTex;
+
+#define dgMsgKanji9690Tex "__OTR__textures/kanji/gMsgKanji9690Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9690Tex[] = dgMsgKanji9690Tex;
+
+#define dgMsgKanji9691Tex "__OTR__textures/kanji/gMsgKanji9691Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9691Tex[] = dgMsgKanji9691Tex;
+
+#define dgMsgKanji9692Tex "__OTR__textures/kanji/gMsgKanji9692Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9692Tex[] = dgMsgKanji9692Tex;
+
+#define dgMsgKanji9693Tex "__OTR__textures/kanji/gMsgKanji9693Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9693Tex[] = dgMsgKanji9693Tex;
+
+#define dgMsgKanji9694Tex "__OTR__textures/kanji/gMsgKanji9694Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9694Tex[] = dgMsgKanji9694Tex;
+
+#define dgMsgKanji9695Tex "__OTR__textures/kanji/gMsgKanji9695Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9695Tex[] = dgMsgKanji9695Tex;
+
+#define dgMsgKanji9696Tex "__OTR__textures/kanji/gMsgKanji9696Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9696Tex[] = dgMsgKanji9696Tex;
+
+#define dgMsgKanji9697Tex "__OTR__textures/kanji/gMsgKanji9697Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9697Tex[] = dgMsgKanji9697Tex;
+
+#define dgMsgKanji9698Tex "__OTR__textures/kanji/gMsgKanji9698Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9698Tex[] = dgMsgKanji9698Tex;
+
+#define dgMsgKanji9699Tex "__OTR__textures/kanji/gMsgKanji9699Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9699Tex[] = dgMsgKanji9699Tex;
+
+#define dgMsgKanji969ATex "__OTR__textures/kanji/gMsgKanji969ATex"
+static const ALIGN_ASSET(2) char gMsgKanji969ATex[] = dgMsgKanji969ATex;
+
+#define dgMsgKanji969BTex "__OTR__textures/kanji/gMsgKanji969BTex"
+static const ALIGN_ASSET(2) char gMsgKanji969BTex[] = dgMsgKanji969BTex;
+
+#define dgMsgKanji969CTex "__OTR__textures/kanji/gMsgKanji969CTex"
+static const ALIGN_ASSET(2) char gMsgKanji969CTex[] = dgMsgKanji969CTex;
+
+#define dgMsgKanji969DTex "__OTR__textures/kanji/gMsgKanji969DTex"
+static const ALIGN_ASSET(2) char gMsgKanji969DTex[] = dgMsgKanji969DTex;
+
+#define dgMsgKanji969ETex "__OTR__textures/kanji/gMsgKanji969ETex"
+static const ALIGN_ASSET(2) char gMsgKanji969ETex[] = dgMsgKanji969ETex;
+
+#define dgMsgKanji969FTex "__OTR__textures/kanji/gMsgKanji969FTex"
+static const ALIGN_ASSET(2) char gMsgKanji969FTex[] = dgMsgKanji969FTex;
+
+#define dgMsgKanji96A0Tex "__OTR__textures/kanji/gMsgKanji96A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A0Tex[] = dgMsgKanji96A0Tex;
+
+#define dgMsgKanji96A1Tex "__OTR__textures/kanji/gMsgKanji96A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A1Tex[] = dgMsgKanji96A1Tex;
+
+#define dgMsgKanji96A2Tex "__OTR__textures/kanji/gMsgKanji96A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A2Tex[] = dgMsgKanji96A2Tex;
+
+#define dgMsgKanji96A3Tex "__OTR__textures/kanji/gMsgKanji96A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A3Tex[] = dgMsgKanji96A3Tex;
+
+#define dgMsgKanji96A4Tex "__OTR__textures/kanji/gMsgKanji96A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A4Tex[] = dgMsgKanji96A4Tex;
+
+#define dgMsgKanji96A5Tex "__OTR__textures/kanji/gMsgKanji96A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A5Tex[] = dgMsgKanji96A5Tex;
+
+#define dgMsgKanji96A6Tex "__OTR__textures/kanji/gMsgKanji96A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A6Tex[] = dgMsgKanji96A6Tex;
+
+#define dgMsgKanji96A7Tex "__OTR__textures/kanji/gMsgKanji96A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A7Tex[] = dgMsgKanji96A7Tex;
+
+#define dgMsgKanji96A8Tex "__OTR__textures/kanji/gMsgKanji96A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A8Tex[] = dgMsgKanji96A8Tex;
+
+#define dgMsgKanji96A9Tex "__OTR__textures/kanji/gMsgKanji96A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96A9Tex[] = dgMsgKanji96A9Tex;
+
+#define dgMsgKanji96AATex "__OTR__textures/kanji/gMsgKanji96AATex"
+static const ALIGN_ASSET(2) char gMsgKanji96AATex[] = dgMsgKanji96AATex;
+
+#define dgMsgKanji96ABTex "__OTR__textures/kanji/gMsgKanji96ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji96ABTex[] = dgMsgKanji96ABTex;
+
+#define dgMsgKanji96ACTex "__OTR__textures/kanji/gMsgKanji96ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji96ACTex[] = dgMsgKanji96ACTex;
+
+#define dgMsgKanji96ADTex "__OTR__textures/kanji/gMsgKanji96ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji96ADTex[] = dgMsgKanji96ADTex;
+
+#define dgMsgKanji96AETex "__OTR__textures/kanji/gMsgKanji96AETex"
+static const ALIGN_ASSET(2) char gMsgKanji96AETex[] = dgMsgKanji96AETex;
+
+#define dgMsgKanji96AFTex "__OTR__textures/kanji/gMsgKanji96AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji96AFTex[] = dgMsgKanji96AFTex;
+
+#define dgMsgKanji96B0Tex "__OTR__textures/kanji/gMsgKanji96B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B0Tex[] = dgMsgKanji96B0Tex;
+
+#define dgMsgKanji96B1Tex "__OTR__textures/kanji/gMsgKanji96B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B1Tex[] = dgMsgKanji96B1Tex;
+
+#define dgMsgKanji96B2Tex "__OTR__textures/kanji/gMsgKanji96B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B2Tex[] = dgMsgKanji96B2Tex;
+
+#define dgMsgKanji96B3Tex "__OTR__textures/kanji/gMsgKanji96B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B3Tex[] = dgMsgKanji96B3Tex;
+
+#define dgMsgKanji96B4Tex "__OTR__textures/kanji/gMsgKanji96B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B4Tex[] = dgMsgKanji96B4Tex;
+
+#define dgMsgKanji96B5Tex "__OTR__textures/kanji/gMsgKanji96B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B5Tex[] = dgMsgKanji96B5Tex;
+
+#define dgMsgKanji96B6Tex "__OTR__textures/kanji/gMsgKanji96B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B6Tex[] = dgMsgKanji96B6Tex;
+
+#define dgMsgKanji96B7Tex "__OTR__textures/kanji/gMsgKanji96B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B7Tex[] = dgMsgKanji96B7Tex;
+
+#define dgMsgKanji96B8Tex "__OTR__textures/kanji/gMsgKanji96B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B8Tex[] = dgMsgKanji96B8Tex;
+
+#define dgMsgKanji96B9Tex "__OTR__textures/kanji/gMsgKanji96B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96B9Tex[] = dgMsgKanji96B9Tex;
+
+#define dgMsgKanji96BATex "__OTR__textures/kanji/gMsgKanji96BATex"
+static const ALIGN_ASSET(2) char gMsgKanji96BATex[] = dgMsgKanji96BATex;
+
+#define dgMsgKanji96BBTex "__OTR__textures/kanji/gMsgKanji96BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji96BBTex[] = dgMsgKanji96BBTex;
+
+#define dgMsgKanji96BCTex "__OTR__textures/kanji/gMsgKanji96BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji96BCTex[] = dgMsgKanji96BCTex;
+
+#define dgMsgKanji96BDTex "__OTR__textures/kanji/gMsgKanji96BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji96BDTex[] = dgMsgKanji96BDTex;
+
+#define dgMsgKanji96BETex "__OTR__textures/kanji/gMsgKanji96BETex"
+static const ALIGN_ASSET(2) char gMsgKanji96BETex[] = dgMsgKanji96BETex;
+
+#define dgMsgKanji96BFTex "__OTR__textures/kanji/gMsgKanji96BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji96BFTex[] = dgMsgKanji96BFTex;
+
+#define dgMsgKanji96C0Tex "__OTR__textures/kanji/gMsgKanji96C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C0Tex[] = dgMsgKanji96C0Tex;
+
+#define dgMsgKanji96C1Tex "__OTR__textures/kanji/gMsgKanji96C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C1Tex[] = dgMsgKanji96C1Tex;
+
+#define dgMsgKanji96C2Tex "__OTR__textures/kanji/gMsgKanji96C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C2Tex[] = dgMsgKanji96C2Tex;
+
+#define dgMsgKanji96C3Tex "__OTR__textures/kanji/gMsgKanji96C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C3Tex[] = dgMsgKanji96C3Tex;
+
+#define dgMsgKanji96C4Tex "__OTR__textures/kanji/gMsgKanji96C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C4Tex[] = dgMsgKanji96C4Tex;
+
+#define dgMsgKanji96C5Tex "__OTR__textures/kanji/gMsgKanji96C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C5Tex[] = dgMsgKanji96C5Tex;
+
+#define dgMsgKanji96C6Tex "__OTR__textures/kanji/gMsgKanji96C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C6Tex[] = dgMsgKanji96C6Tex;
+
+#define dgMsgKanji96C7Tex "__OTR__textures/kanji/gMsgKanji96C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C7Tex[] = dgMsgKanji96C7Tex;
+
+#define dgMsgKanji96C8Tex "__OTR__textures/kanji/gMsgKanji96C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C8Tex[] = dgMsgKanji96C8Tex;
+
+#define dgMsgKanji96C9Tex "__OTR__textures/kanji/gMsgKanji96C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96C9Tex[] = dgMsgKanji96C9Tex;
+
+#define dgMsgKanji96CATex "__OTR__textures/kanji/gMsgKanji96CATex"
+static const ALIGN_ASSET(2) char gMsgKanji96CATex[] = dgMsgKanji96CATex;
+
+#define dgMsgKanji96CBTex "__OTR__textures/kanji/gMsgKanji96CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji96CBTex[] = dgMsgKanji96CBTex;
+
+#define dgMsgKanji96CCTex "__OTR__textures/kanji/gMsgKanji96CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji96CCTex[] = dgMsgKanji96CCTex;
+
+#define dgMsgKanji96CDTex "__OTR__textures/kanji/gMsgKanji96CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji96CDTex[] = dgMsgKanji96CDTex;
+
+#define dgMsgKanji96CETex "__OTR__textures/kanji/gMsgKanji96CETex"
+static const ALIGN_ASSET(2) char gMsgKanji96CETex[] = dgMsgKanji96CETex;
+
+#define dgMsgKanji96CFTex "__OTR__textures/kanji/gMsgKanji96CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji96CFTex[] = dgMsgKanji96CFTex;
+
+#define dgMsgKanji96D0Tex "__OTR__textures/kanji/gMsgKanji96D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D0Tex[] = dgMsgKanji96D0Tex;
+
+#define dgMsgKanji96D1Tex "__OTR__textures/kanji/gMsgKanji96D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D1Tex[] = dgMsgKanji96D1Tex;
+
+#define dgMsgKanji96D2Tex "__OTR__textures/kanji/gMsgKanji96D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D2Tex[] = dgMsgKanji96D2Tex;
+
+#define dgMsgKanji96D3Tex "__OTR__textures/kanji/gMsgKanji96D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D3Tex[] = dgMsgKanji96D3Tex;
+
+#define dgMsgKanji96D4Tex "__OTR__textures/kanji/gMsgKanji96D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D4Tex[] = dgMsgKanji96D4Tex;
+
+#define dgMsgKanji96D5Tex "__OTR__textures/kanji/gMsgKanji96D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D5Tex[] = dgMsgKanji96D5Tex;
+
+#define dgMsgKanji96D6Tex "__OTR__textures/kanji/gMsgKanji96D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D6Tex[] = dgMsgKanji96D6Tex;
+
+#define dgMsgKanji96D7Tex "__OTR__textures/kanji/gMsgKanji96D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D7Tex[] = dgMsgKanji96D7Tex;
+
+#define dgMsgKanji96D8Tex "__OTR__textures/kanji/gMsgKanji96D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D8Tex[] = dgMsgKanji96D8Tex;
+
+#define dgMsgKanji96D9Tex "__OTR__textures/kanji/gMsgKanji96D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96D9Tex[] = dgMsgKanji96D9Tex;
+
+#define dgMsgKanji96DATex "__OTR__textures/kanji/gMsgKanji96DATex"
+static const ALIGN_ASSET(2) char gMsgKanji96DATex[] = dgMsgKanji96DATex;
+
+#define dgMsgKanji96DBTex "__OTR__textures/kanji/gMsgKanji96DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji96DBTex[] = dgMsgKanji96DBTex;
+
+#define dgMsgKanji96DCTex "__OTR__textures/kanji/gMsgKanji96DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji96DCTex[] = dgMsgKanji96DCTex;
+
+#define dgMsgKanji96DDTex "__OTR__textures/kanji/gMsgKanji96DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji96DDTex[] = dgMsgKanji96DDTex;
+
+#define dgMsgKanji96DETex "__OTR__textures/kanji/gMsgKanji96DETex"
+static const ALIGN_ASSET(2) char gMsgKanji96DETex[] = dgMsgKanji96DETex;
+
+#define dgMsgKanji96DFTex "__OTR__textures/kanji/gMsgKanji96DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji96DFTex[] = dgMsgKanji96DFTex;
+
+#define dgMsgKanji96E0Tex "__OTR__textures/kanji/gMsgKanji96E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E0Tex[] = dgMsgKanji96E0Tex;
+
+#define dgMsgKanji96E1Tex "__OTR__textures/kanji/gMsgKanji96E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E1Tex[] = dgMsgKanji96E1Tex;
+
+#define dgMsgKanji96E2Tex "__OTR__textures/kanji/gMsgKanji96E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E2Tex[] = dgMsgKanji96E2Tex;
+
+#define dgMsgKanji96E3Tex "__OTR__textures/kanji/gMsgKanji96E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E3Tex[] = dgMsgKanji96E3Tex;
+
+#define dgMsgKanji96E4Tex "__OTR__textures/kanji/gMsgKanji96E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E4Tex[] = dgMsgKanji96E4Tex;
+
+#define dgMsgKanji96E5Tex "__OTR__textures/kanji/gMsgKanji96E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E5Tex[] = dgMsgKanji96E5Tex;
+
+#define dgMsgKanji96E6Tex "__OTR__textures/kanji/gMsgKanji96E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E6Tex[] = dgMsgKanji96E6Tex;
+
+#define dgMsgKanji96E7Tex "__OTR__textures/kanji/gMsgKanji96E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E7Tex[] = dgMsgKanji96E7Tex;
+
+#define dgMsgKanji96E8Tex "__OTR__textures/kanji/gMsgKanji96E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E8Tex[] = dgMsgKanji96E8Tex;
+
+#define dgMsgKanji96E9Tex "__OTR__textures/kanji/gMsgKanji96E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96E9Tex[] = dgMsgKanji96E9Tex;
+
+#define dgMsgKanji96EATex "__OTR__textures/kanji/gMsgKanji96EATex"
+static const ALIGN_ASSET(2) char gMsgKanji96EATex[] = dgMsgKanji96EATex;
+
+#define dgMsgKanji96EBTex "__OTR__textures/kanji/gMsgKanji96EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji96EBTex[] = dgMsgKanji96EBTex;
+
+#define dgMsgKanji96ECTex "__OTR__textures/kanji/gMsgKanji96ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji96ECTex[] = dgMsgKanji96ECTex;
+
+#define dgMsgKanji96EDTex "__OTR__textures/kanji/gMsgKanji96EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji96EDTex[] = dgMsgKanji96EDTex;
+
+#define dgMsgKanji96EETex "__OTR__textures/kanji/gMsgKanji96EETex"
+static const ALIGN_ASSET(2) char gMsgKanji96EETex[] = dgMsgKanji96EETex;
+
+#define dgMsgKanji96EFTex "__OTR__textures/kanji/gMsgKanji96EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji96EFTex[] = dgMsgKanji96EFTex;
+
+#define dgMsgKanji96F0Tex "__OTR__textures/kanji/gMsgKanji96F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F0Tex[] = dgMsgKanji96F0Tex;
+
+#define dgMsgKanji96F1Tex "__OTR__textures/kanji/gMsgKanji96F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F1Tex[] = dgMsgKanji96F1Tex;
+
+#define dgMsgKanji96F2Tex "__OTR__textures/kanji/gMsgKanji96F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F2Tex[] = dgMsgKanji96F2Tex;
+
+#define dgMsgKanji96F3Tex "__OTR__textures/kanji/gMsgKanji96F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F3Tex[] = dgMsgKanji96F3Tex;
+
+#define dgMsgKanji96F4Tex "__OTR__textures/kanji/gMsgKanji96F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F4Tex[] = dgMsgKanji96F4Tex;
+
+#define dgMsgKanji96F5Tex "__OTR__textures/kanji/gMsgKanji96F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F5Tex[] = dgMsgKanji96F5Tex;
+
+#define dgMsgKanji96F6Tex "__OTR__textures/kanji/gMsgKanji96F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F6Tex[] = dgMsgKanji96F6Tex;
+
+#define dgMsgKanji96F7Tex "__OTR__textures/kanji/gMsgKanji96F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F7Tex[] = dgMsgKanji96F7Tex;
+
+#define dgMsgKanji96F8Tex "__OTR__textures/kanji/gMsgKanji96F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F8Tex[] = dgMsgKanji96F8Tex;
+
+#define dgMsgKanji96F9Tex "__OTR__textures/kanji/gMsgKanji96F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji96F9Tex[] = dgMsgKanji96F9Tex;
+
+#define dgMsgKanji96FATex "__OTR__textures/kanji/gMsgKanji96FATex"
+static const ALIGN_ASSET(2) char gMsgKanji96FATex[] = dgMsgKanji96FATex;
+
+#define dgMsgKanji96FBTex "__OTR__textures/kanji/gMsgKanji96FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji96FBTex[] = dgMsgKanji96FBTex;
+
+#define dgMsgKanji96FCTex "__OTR__textures/kanji/gMsgKanji96FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji96FCTex[] = dgMsgKanji96FCTex;
+
+#define dgMsgKanji9740Tex "__OTR__textures/kanji/gMsgKanji9740Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9740Tex[] = dgMsgKanji9740Tex;
+
+#define dgMsgKanji9741Tex "__OTR__textures/kanji/gMsgKanji9741Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9741Tex[] = dgMsgKanji9741Tex;
+
+#define dgMsgKanji9742Tex "__OTR__textures/kanji/gMsgKanji9742Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9742Tex[] = dgMsgKanji9742Tex;
+
+#define dgMsgKanji9743Tex "__OTR__textures/kanji/gMsgKanji9743Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9743Tex[] = dgMsgKanji9743Tex;
+
+#define dgMsgKanji9744Tex "__OTR__textures/kanji/gMsgKanji9744Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9744Tex[] = dgMsgKanji9744Tex;
+
+#define dgMsgKanji9745Tex "__OTR__textures/kanji/gMsgKanji9745Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9745Tex[] = dgMsgKanji9745Tex;
+
+#define dgMsgKanji9746Tex "__OTR__textures/kanji/gMsgKanji9746Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9746Tex[] = dgMsgKanji9746Tex;
+
+#define dgMsgKanji9747Tex "__OTR__textures/kanji/gMsgKanji9747Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9747Tex[] = dgMsgKanji9747Tex;
+
+#define dgMsgKanji9748Tex "__OTR__textures/kanji/gMsgKanji9748Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9748Tex[] = dgMsgKanji9748Tex;
+
+#define dgMsgKanji9749Tex "__OTR__textures/kanji/gMsgKanji9749Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9749Tex[] = dgMsgKanji9749Tex;
+
+#define dgMsgKanji974ATex "__OTR__textures/kanji/gMsgKanji974ATex"
+static const ALIGN_ASSET(2) char gMsgKanji974ATex[] = dgMsgKanji974ATex;
+
+#define dgMsgKanji974BTex "__OTR__textures/kanji/gMsgKanji974BTex"
+static const ALIGN_ASSET(2) char gMsgKanji974BTex[] = dgMsgKanji974BTex;
+
+#define dgMsgKanji974CTex "__OTR__textures/kanji/gMsgKanji974CTex"
+static const ALIGN_ASSET(2) char gMsgKanji974CTex[] = dgMsgKanji974CTex;
+
+#define dgMsgKanji974DTex "__OTR__textures/kanji/gMsgKanji974DTex"
+static const ALIGN_ASSET(2) char gMsgKanji974DTex[] = dgMsgKanji974DTex;
+
+#define dgMsgKanji974ETex "__OTR__textures/kanji/gMsgKanji974ETex"
+static const ALIGN_ASSET(2) char gMsgKanji974ETex[] = dgMsgKanji974ETex;
+
+#define dgMsgKanji974FTex "__OTR__textures/kanji/gMsgKanji974FTex"
+static const ALIGN_ASSET(2) char gMsgKanji974FTex[] = dgMsgKanji974FTex;
+
+#define dgMsgKanji9750Tex "__OTR__textures/kanji/gMsgKanji9750Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9750Tex[] = dgMsgKanji9750Tex;
+
+#define dgMsgKanji9751Tex "__OTR__textures/kanji/gMsgKanji9751Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9751Tex[] = dgMsgKanji9751Tex;
+
+#define dgMsgKanji9752Tex "__OTR__textures/kanji/gMsgKanji9752Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9752Tex[] = dgMsgKanji9752Tex;
+
+#define dgMsgKanji9753Tex "__OTR__textures/kanji/gMsgKanji9753Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9753Tex[] = dgMsgKanji9753Tex;
+
+#define dgMsgKanji9754Tex "__OTR__textures/kanji/gMsgKanji9754Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9754Tex[] = dgMsgKanji9754Tex;
+
+#define dgMsgKanji9755Tex "__OTR__textures/kanji/gMsgKanji9755Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9755Tex[] = dgMsgKanji9755Tex;
+
+#define dgMsgKanji9756Tex "__OTR__textures/kanji/gMsgKanji9756Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9756Tex[] = dgMsgKanji9756Tex;
+
+#define dgMsgKanji9757Tex "__OTR__textures/kanji/gMsgKanji9757Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9757Tex[] = dgMsgKanji9757Tex;
+
+#define dgMsgKanji9758Tex "__OTR__textures/kanji/gMsgKanji9758Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9758Tex[] = dgMsgKanji9758Tex;
+
+#define dgMsgKanji9759Tex "__OTR__textures/kanji/gMsgKanji9759Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9759Tex[] = dgMsgKanji9759Tex;
+
+#define dgMsgKanji975ATex "__OTR__textures/kanji/gMsgKanji975ATex"
+static const ALIGN_ASSET(2) char gMsgKanji975ATex[] = dgMsgKanji975ATex;
+
+#define dgMsgKanji975BTex "__OTR__textures/kanji/gMsgKanji975BTex"
+static const ALIGN_ASSET(2) char gMsgKanji975BTex[] = dgMsgKanji975BTex;
+
+#define dgMsgKanji975CTex "__OTR__textures/kanji/gMsgKanji975CTex"
+static const ALIGN_ASSET(2) char gMsgKanji975CTex[] = dgMsgKanji975CTex;
+
+#define dgMsgKanji975DTex "__OTR__textures/kanji/gMsgKanji975DTex"
+static const ALIGN_ASSET(2) char gMsgKanji975DTex[] = dgMsgKanji975DTex;
+
+#define dgMsgKanji975ETex "__OTR__textures/kanji/gMsgKanji975ETex"
+static const ALIGN_ASSET(2) char gMsgKanji975ETex[] = dgMsgKanji975ETex;
+
+#define dgMsgKanji975FTex "__OTR__textures/kanji/gMsgKanji975FTex"
+static const ALIGN_ASSET(2) char gMsgKanji975FTex[] = dgMsgKanji975FTex;
+
+#define dgMsgKanji9760Tex "__OTR__textures/kanji/gMsgKanji9760Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9760Tex[] = dgMsgKanji9760Tex;
+
+#define dgMsgKanji9761Tex "__OTR__textures/kanji/gMsgKanji9761Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9761Tex[] = dgMsgKanji9761Tex;
+
+#define dgMsgKanji9762Tex "__OTR__textures/kanji/gMsgKanji9762Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9762Tex[] = dgMsgKanji9762Tex;
+
+#define dgMsgKanji9763Tex "__OTR__textures/kanji/gMsgKanji9763Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9763Tex[] = dgMsgKanji9763Tex;
+
+#define dgMsgKanji9764Tex "__OTR__textures/kanji/gMsgKanji9764Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9764Tex[] = dgMsgKanji9764Tex;
+
+#define dgMsgKanji9765Tex "__OTR__textures/kanji/gMsgKanji9765Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9765Tex[] = dgMsgKanji9765Tex;
+
+#define dgMsgKanji9766Tex "__OTR__textures/kanji/gMsgKanji9766Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9766Tex[] = dgMsgKanji9766Tex;
+
+#define dgMsgKanji9767Tex "__OTR__textures/kanji/gMsgKanji9767Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9767Tex[] = dgMsgKanji9767Tex;
+
+#define dgMsgKanji9768Tex "__OTR__textures/kanji/gMsgKanji9768Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9768Tex[] = dgMsgKanji9768Tex;
+
+#define dgMsgKanji9769Tex "__OTR__textures/kanji/gMsgKanji9769Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9769Tex[] = dgMsgKanji9769Tex;
+
+#define dgMsgKanji976ATex "__OTR__textures/kanji/gMsgKanji976ATex"
+static const ALIGN_ASSET(2) char gMsgKanji976ATex[] = dgMsgKanji976ATex;
+
+#define dgMsgKanji976BTex "__OTR__textures/kanji/gMsgKanji976BTex"
+static const ALIGN_ASSET(2) char gMsgKanji976BTex[] = dgMsgKanji976BTex;
+
+#define dgMsgKanji976CTex "__OTR__textures/kanji/gMsgKanji976CTex"
+static const ALIGN_ASSET(2) char gMsgKanji976CTex[] = dgMsgKanji976CTex;
+
+#define dgMsgKanji976DTex "__OTR__textures/kanji/gMsgKanji976DTex"
+static const ALIGN_ASSET(2) char gMsgKanji976DTex[] = dgMsgKanji976DTex;
+
+#define dgMsgKanji976ETex "__OTR__textures/kanji/gMsgKanji976ETex"
+static const ALIGN_ASSET(2) char gMsgKanji976ETex[] = dgMsgKanji976ETex;
+
+#define dgMsgKanji976FTex "__OTR__textures/kanji/gMsgKanji976FTex"
+static const ALIGN_ASSET(2) char gMsgKanji976FTex[] = dgMsgKanji976FTex;
+
+#define dgMsgKanji9770Tex "__OTR__textures/kanji/gMsgKanji9770Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9770Tex[] = dgMsgKanji9770Tex;
+
+#define dgMsgKanji9771Tex "__OTR__textures/kanji/gMsgKanji9771Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9771Tex[] = dgMsgKanji9771Tex;
+
+#define dgMsgKanji9772Tex "__OTR__textures/kanji/gMsgKanji9772Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9772Tex[] = dgMsgKanji9772Tex;
+
+#define dgMsgKanji9773Tex "__OTR__textures/kanji/gMsgKanji9773Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9773Tex[] = dgMsgKanji9773Tex;
+
+#define dgMsgKanji9774Tex "__OTR__textures/kanji/gMsgKanji9774Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9774Tex[] = dgMsgKanji9774Tex;
+
+#define dgMsgKanji9775Tex "__OTR__textures/kanji/gMsgKanji9775Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9775Tex[] = dgMsgKanji9775Tex;
+
+#define dgMsgKanji9776Tex "__OTR__textures/kanji/gMsgKanji9776Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9776Tex[] = dgMsgKanji9776Tex;
+
+#define dgMsgKanji9777Tex "__OTR__textures/kanji/gMsgKanji9777Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9777Tex[] = dgMsgKanji9777Tex;
+
+#define dgMsgKanji9778Tex "__OTR__textures/kanji/gMsgKanji9778Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9778Tex[] = dgMsgKanji9778Tex;
+
+#define dgMsgKanji9779Tex "__OTR__textures/kanji/gMsgKanji9779Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9779Tex[] = dgMsgKanji9779Tex;
+
+#define dgMsgKanji977ATex "__OTR__textures/kanji/gMsgKanji977ATex"
+static const ALIGN_ASSET(2) char gMsgKanji977ATex[] = dgMsgKanji977ATex;
+
+#define dgMsgKanji977BTex "__OTR__textures/kanji/gMsgKanji977BTex"
+static const ALIGN_ASSET(2) char gMsgKanji977BTex[] = dgMsgKanji977BTex;
+
+#define dgMsgKanji977CTex "__OTR__textures/kanji/gMsgKanji977CTex"
+static const ALIGN_ASSET(2) char gMsgKanji977CTex[] = dgMsgKanji977CTex;
+
+#define dgMsgKanji977DTex "__OTR__textures/kanji/gMsgKanji977DTex"
+static const ALIGN_ASSET(2) char gMsgKanji977DTex[] = dgMsgKanji977DTex;
+
+#define dgMsgKanji977ETex "__OTR__textures/kanji/gMsgKanji977ETex"
+static const ALIGN_ASSET(2) char gMsgKanji977ETex[] = dgMsgKanji977ETex;
+
+#define dgMsgKanji9780Tex "__OTR__textures/kanji/gMsgKanji9780Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9780Tex[] = dgMsgKanji9780Tex;
+
+#define dgMsgKanji9781Tex "__OTR__textures/kanji/gMsgKanji9781Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9781Tex[] = dgMsgKanji9781Tex;
+
+#define dgMsgKanji9782Tex "__OTR__textures/kanji/gMsgKanji9782Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9782Tex[] = dgMsgKanji9782Tex;
+
+#define dgMsgKanji9783Tex "__OTR__textures/kanji/gMsgKanji9783Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9783Tex[] = dgMsgKanji9783Tex;
+
+#define dgMsgKanji9784Tex "__OTR__textures/kanji/gMsgKanji9784Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9784Tex[] = dgMsgKanji9784Tex;
+
+#define dgMsgKanji9785Tex "__OTR__textures/kanji/gMsgKanji9785Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9785Tex[] = dgMsgKanji9785Tex;
+
+#define dgMsgKanji9786Tex "__OTR__textures/kanji/gMsgKanji9786Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9786Tex[] = dgMsgKanji9786Tex;
+
+#define dgMsgKanji9787Tex "__OTR__textures/kanji/gMsgKanji9787Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9787Tex[] = dgMsgKanji9787Tex;
+
+#define dgMsgKanji9788Tex "__OTR__textures/kanji/gMsgKanji9788Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9788Tex[] = dgMsgKanji9788Tex;
+
+#define dgMsgKanji9789Tex "__OTR__textures/kanji/gMsgKanji9789Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9789Tex[] = dgMsgKanji9789Tex;
+
+#define dgMsgKanji978ATex "__OTR__textures/kanji/gMsgKanji978ATex"
+static const ALIGN_ASSET(2) char gMsgKanji978ATex[] = dgMsgKanji978ATex;
+
+#define dgMsgKanji978BTex "__OTR__textures/kanji/gMsgKanji978BTex"
+static const ALIGN_ASSET(2) char gMsgKanji978BTex[] = dgMsgKanji978BTex;
+
+#define dgMsgKanji978CTex "__OTR__textures/kanji/gMsgKanji978CTex"
+static const ALIGN_ASSET(2) char gMsgKanji978CTex[] = dgMsgKanji978CTex;
+
+#define dgMsgKanji978DTex "__OTR__textures/kanji/gMsgKanji978DTex"
+static const ALIGN_ASSET(2) char gMsgKanji978DTex[] = dgMsgKanji978DTex;
+
+#define dgMsgKanji978ETex "__OTR__textures/kanji/gMsgKanji978ETex"
+static const ALIGN_ASSET(2) char gMsgKanji978ETex[] = dgMsgKanji978ETex;
+
+#define dgMsgKanji978FTex "__OTR__textures/kanji/gMsgKanji978FTex"
+static const ALIGN_ASSET(2) char gMsgKanji978FTex[] = dgMsgKanji978FTex;
+
+#define dgMsgKanji9790Tex "__OTR__textures/kanji/gMsgKanji9790Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9790Tex[] = dgMsgKanji9790Tex;
+
+#define dgMsgKanji9791Tex "__OTR__textures/kanji/gMsgKanji9791Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9791Tex[] = dgMsgKanji9791Tex;
+
+#define dgMsgKanji9792Tex "__OTR__textures/kanji/gMsgKanji9792Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9792Tex[] = dgMsgKanji9792Tex;
+
+#define dgMsgKanji9793Tex "__OTR__textures/kanji/gMsgKanji9793Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9793Tex[] = dgMsgKanji9793Tex;
+
+#define dgMsgKanji9794Tex "__OTR__textures/kanji/gMsgKanji9794Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9794Tex[] = dgMsgKanji9794Tex;
+
+#define dgMsgKanji9795Tex "__OTR__textures/kanji/gMsgKanji9795Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9795Tex[] = dgMsgKanji9795Tex;
+
+#define dgMsgKanji9796Tex "__OTR__textures/kanji/gMsgKanji9796Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9796Tex[] = dgMsgKanji9796Tex;
+
+#define dgMsgKanji9797Tex "__OTR__textures/kanji/gMsgKanji9797Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9797Tex[] = dgMsgKanji9797Tex;
+
+#define dgMsgKanji9798Tex "__OTR__textures/kanji/gMsgKanji9798Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9798Tex[] = dgMsgKanji9798Tex;
+
+#define dgMsgKanji9799Tex "__OTR__textures/kanji/gMsgKanji9799Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9799Tex[] = dgMsgKanji9799Tex;
+
+#define dgMsgKanji979ATex "__OTR__textures/kanji/gMsgKanji979ATex"
+static const ALIGN_ASSET(2) char gMsgKanji979ATex[] = dgMsgKanji979ATex;
+
+#define dgMsgKanji979BTex "__OTR__textures/kanji/gMsgKanji979BTex"
+static const ALIGN_ASSET(2) char gMsgKanji979BTex[] = dgMsgKanji979BTex;
+
+#define dgMsgKanji979CTex "__OTR__textures/kanji/gMsgKanji979CTex"
+static const ALIGN_ASSET(2) char gMsgKanji979CTex[] = dgMsgKanji979CTex;
+
+#define dgMsgKanji979DTex "__OTR__textures/kanji/gMsgKanji979DTex"
+static const ALIGN_ASSET(2) char gMsgKanji979DTex[] = dgMsgKanji979DTex;
+
+#define dgMsgKanji979ETex "__OTR__textures/kanji/gMsgKanji979ETex"
+static const ALIGN_ASSET(2) char gMsgKanji979ETex[] = dgMsgKanji979ETex;
+
+#define dgMsgKanji979FTex "__OTR__textures/kanji/gMsgKanji979FTex"
+static const ALIGN_ASSET(2) char gMsgKanji979FTex[] = dgMsgKanji979FTex;
+
+#define dgMsgKanji97A0Tex "__OTR__textures/kanji/gMsgKanji97A0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A0Tex[] = dgMsgKanji97A0Tex;
+
+#define dgMsgKanji97A1Tex "__OTR__textures/kanji/gMsgKanji97A1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A1Tex[] = dgMsgKanji97A1Tex;
+
+#define dgMsgKanji97A2Tex "__OTR__textures/kanji/gMsgKanji97A2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A2Tex[] = dgMsgKanji97A2Tex;
+
+#define dgMsgKanji97A3Tex "__OTR__textures/kanji/gMsgKanji97A3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A3Tex[] = dgMsgKanji97A3Tex;
+
+#define dgMsgKanji97A4Tex "__OTR__textures/kanji/gMsgKanji97A4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A4Tex[] = dgMsgKanji97A4Tex;
+
+#define dgMsgKanji97A5Tex "__OTR__textures/kanji/gMsgKanji97A5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A5Tex[] = dgMsgKanji97A5Tex;
+
+#define dgMsgKanji97A6Tex "__OTR__textures/kanji/gMsgKanji97A6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A6Tex[] = dgMsgKanji97A6Tex;
+
+#define dgMsgKanji97A7Tex "__OTR__textures/kanji/gMsgKanji97A7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A7Tex[] = dgMsgKanji97A7Tex;
+
+#define dgMsgKanji97A8Tex "__OTR__textures/kanji/gMsgKanji97A8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A8Tex[] = dgMsgKanji97A8Tex;
+
+#define dgMsgKanji97A9Tex "__OTR__textures/kanji/gMsgKanji97A9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97A9Tex[] = dgMsgKanji97A9Tex;
+
+#define dgMsgKanji97AATex "__OTR__textures/kanji/gMsgKanji97AATex"
+static const ALIGN_ASSET(2) char gMsgKanji97AATex[] = dgMsgKanji97AATex;
+
+#define dgMsgKanji97ABTex "__OTR__textures/kanji/gMsgKanji97ABTex"
+static const ALIGN_ASSET(2) char gMsgKanji97ABTex[] = dgMsgKanji97ABTex;
+
+#define dgMsgKanji97ACTex "__OTR__textures/kanji/gMsgKanji97ACTex"
+static const ALIGN_ASSET(2) char gMsgKanji97ACTex[] = dgMsgKanji97ACTex;
+
+#define dgMsgKanji97ADTex "__OTR__textures/kanji/gMsgKanji97ADTex"
+static const ALIGN_ASSET(2) char gMsgKanji97ADTex[] = dgMsgKanji97ADTex;
+
+#define dgMsgKanji97AETex "__OTR__textures/kanji/gMsgKanji97AETex"
+static const ALIGN_ASSET(2) char gMsgKanji97AETex[] = dgMsgKanji97AETex;
+
+#define dgMsgKanji97AFTex "__OTR__textures/kanji/gMsgKanji97AFTex"
+static const ALIGN_ASSET(2) char gMsgKanji97AFTex[] = dgMsgKanji97AFTex;
+
+#define dgMsgKanji97B0Tex "__OTR__textures/kanji/gMsgKanji97B0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B0Tex[] = dgMsgKanji97B0Tex;
+
+#define dgMsgKanji97B1Tex "__OTR__textures/kanji/gMsgKanji97B1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B1Tex[] = dgMsgKanji97B1Tex;
+
+#define dgMsgKanji97B2Tex "__OTR__textures/kanji/gMsgKanji97B2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B2Tex[] = dgMsgKanji97B2Tex;
+
+#define dgMsgKanji97B3Tex "__OTR__textures/kanji/gMsgKanji97B3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B3Tex[] = dgMsgKanji97B3Tex;
+
+#define dgMsgKanji97B4Tex "__OTR__textures/kanji/gMsgKanji97B4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B4Tex[] = dgMsgKanji97B4Tex;
+
+#define dgMsgKanji97B5Tex "__OTR__textures/kanji/gMsgKanji97B5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B5Tex[] = dgMsgKanji97B5Tex;
+
+#define dgMsgKanji97B6Tex "__OTR__textures/kanji/gMsgKanji97B6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B6Tex[] = dgMsgKanji97B6Tex;
+
+#define dgMsgKanji97B7Tex "__OTR__textures/kanji/gMsgKanji97B7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B7Tex[] = dgMsgKanji97B7Tex;
+
+#define dgMsgKanji97B8Tex "__OTR__textures/kanji/gMsgKanji97B8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B8Tex[] = dgMsgKanji97B8Tex;
+
+#define dgMsgKanji97B9Tex "__OTR__textures/kanji/gMsgKanji97B9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97B9Tex[] = dgMsgKanji97B9Tex;
+
+#define dgMsgKanji97BATex "__OTR__textures/kanji/gMsgKanji97BATex"
+static const ALIGN_ASSET(2) char gMsgKanji97BATex[] = dgMsgKanji97BATex;
+
+#define dgMsgKanji97BBTex "__OTR__textures/kanji/gMsgKanji97BBTex"
+static const ALIGN_ASSET(2) char gMsgKanji97BBTex[] = dgMsgKanji97BBTex;
+
+#define dgMsgKanji97BCTex "__OTR__textures/kanji/gMsgKanji97BCTex"
+static const ALIGN_ASSET(2) char gMsgKanji97BCTex[] = dgMsgKanji97BCTex;
+
+#define dgMsgKanji97BDTex "__OTR__textures/kanji/gMsgKanji97BDTex"
+static const ALIGN_ASSET(2) char gMsgKanji97BDTex[] = dgMsgKanji97BDTex;
+
+#define dgMsgKanji97BETex "__OTR__textures/kanji/gMsgKanji97BETex"
+static const ALIGN_ASSET(2) char gMsgKanji97BETex[] = dgMsgKanji97BETex;
+
+#define dgMsgKanji97BFTex "__OTR__textures/kanji/gMsgKanji97BFTex"
+static const ALIGN_ASSET(2) char gMsgKanji97BFTex[] = dgMsgKanji97BFTex;
+
+#define dgMsgKanji97C0Tex "__OTR__textures/kanji/gMsgKanji97C0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C0Tex[] = dgMsgKanji97C0Tex;
+
+#define dgMsgKanji97C1Tex "__OTR__textures/kanji/gMsgKanji97C1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C1Tex[] = dgMsgKanji97C1Tex;
+
+#define dgMsgKanji97C2Tex "__OTR__textures/kanji/gMsgKanji97C2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C2Tex[] = dgMsgKanji97C2Tex;
+
+#define dgMsgKanji97C3Tex "__OTR__textures/kanji/gMsgKanji97C3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C3Tex[] = dgMsgKanji97C3Tex;
+
+#define dgMsgKanji97C4Tex "__OTR__textures/kanji/gMsgKanji97C4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C4Tex[] = dgMsgKanji97C4Tex;
+
+#define dgMsgKanji97C5Tex "__OTR__textures/kanji/gMsgKanji97C5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C5Tex[] = dgMsgKanji97C5Tex;
+
+#define dgMsgKanji97C6Tex "__OTR__textures/kanji/gMsgKanji97C6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C6Tex[] = dgMsgKanji97C6Tex;
+
+#define dgMsgKanji97C7Tex "__OTR__textures/kanji/gMsgKanji97C7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C7Tex[] = dgMsgKanji97C7Tex;
+
+#define dgMsgKanji97C8Tex "__OTR__textures/kanji/gMsgKanji97C8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C8Tex[] = dgMsgKanji97C8Tex;
+
+#define dgMsgKanji97C9Tex "__OTR__textures/kanji/gMsgKanji97C9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97C9Tex[] = dgMsgKanji97C9Tex;
+
+#define dgMsgKanji97CATex "__OTR__textures/kanji/gMsgKanji97CATex"
+static const ALIGN_ASSET(2) char gMsgKanji97CATex[] = dgMsgKanji97CATex;
+
+#define dgMsgKanji97CBTex "__OTR__textures/kanji/gMsgKanji97CBTex"
+static const ALIGN_ASSET(2) char gMsgKanji97CBTex[] = dgMsgKanji97CBTex;
+
+#define dgMsgKanji97CCTex "__OTR__textures/kanji/gMsgKanji97CCTex"
+static const ALIGN_ASSET(2) char gMsgKanji97CCTex[] = dgMsgKanji97CCTex;
+
+#define dgMsgKanji97CDTex "__OTR__textures/kanji/gMsgKanji97CDTex"
+static const ALIGN_ASSET(2) char gMsgKanji97CDTex[] = dgMsgKanji97CDTex;
+
+#define dgMsgKanji97CETex "__OTR__textures/kanji/gMsgKanji97CETex"
+static const ALIGN_ASSET(2) char gMsgKanji97CETex[] = dgMsgKanji97CETex;
+
+#define dgMsgKanji97CFTex "__OTR__textures/kanji/gMsgKanji97CFTex"
+static const ALIGN_ASSET(2) char gMsgKanji97CFTex[] = dgMsgKanji97CFTex;
+
+#define dgMsgKanji97D0Tex "__OTR__textures/kanji/gMsgKanji97D0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D0Tex[] = dgMsgKanji97D0Tex;
+
+#define dgMsgKanji97D1Tex "__OTR__textures/kanji/gMsgKanji97D1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D1Tex[] = dgMsgKanji97D1Tex;
+
+#define dgMsgKanji97D2Tex "__OTR__textures/kanji/gMsgKanji97D2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D2Tex[] = dgMsgKanji97D2Tex;
+
+#define dgMsgKanji97D3Tex "__OTR__textures/kanji/gMsgKanji97D3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D3Tex[] = dgMsgKanji97D3Tex;
+
+#define dgMsgKanji97D4Tex "__OTR__textures/kanji/gMsgKanji97D4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D4Tex[] = dgMsgKanji97D4Tex;
+
+#define dgMsgKanji97D5Tex "__OTR__textures/kanji/gMsgKanji97D5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D5Tex[] = dgMsgKanji97D5Tex;
+
+#define dgMsgKanji97D6Tex "__OTR__textures/kanji/gMsgKanji97D6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D6Tex[] = dgMsgKanji97D6Tex;
+
+#define dgMsgKanji97D7Tex "__OTR__textures/kanji/gMsgKanji97D7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D7Tex[] = dgMsgKanji97D7Tex;
+
+#define dgMsgKanji97D8Tex "__OTR__textures/kanji/gMsgKanji97D8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D8Tex[] = dgMsgKanji97D8Tex;
+
+#define dgMsgKanji97D9Tex "__OTR__textures/kanji/gMsgKanji97D9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97D9Tex[] = dgMsgKanji97D9Tex;
+
+#define dgMsgKanji97DATex "__OTR__textures/kanji/gMsgKanji97DATex"
+static const ALIGN_ASSET(2) char gMsgKanji97DATex[] = dgMsgKanji97DATex;
+
+#define dgMsgKanji97DBTex "__OTR__textures/kanji/gMsgKanji97DBTex"
+static const ALIGN_ASSET(2) char gMsgKanji97DBTex[] = dgMsgKanji97DBTex;
+
+#define dgMsgKanji97DCTex "__OTR__textures/kanji/gMsgKanji97DCTex"
+static const ALIGN_ASSET(2) char gMsgKanji97DCTex[] = dgMsgKanji97DCTex;
+
+#define dgMsgKanji97DDTex "__OTR__textures/kanji/gMsgKanji97DDTex"
+static const ALIGN_ASSET(2) char gMsgKanji97DDTex[] = dgMsgKanji97DDTex;
+
+#define dgMsgKanji97DETex "__OTR__textures/kanji/gMsgKanji97DETex"
+static const ALIGN_ASSET(2) char gMsgKanji97DETex[] = dgMsgKanji97DETex;
+
+#define dgMsgKanji97DFTex "__OTR__textures/kanji/gMsgKanji97DFTex"
+static const ALIGN_ASSET(2) char gMsgKanji97DFTex[] = dgMsgKanji97DFTex;
+
+#define dgMsgKanji97E0Tex "__OTR__textures/kanji/gMsgKanji97E0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E0Tex[] = dgMsgKanji97E0Tex;
+
+#define dgMsgKanji97E1Tex "__OTR__textures/kanji/gMsgKanji97E1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E1Tex[] = dgMsgKanji97E1Tex;
+
+#define dgMsgKanji97E2Tex "__OTR__textures/kanji/gMsgKanji97E2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E2Tex[] = dgMsgKanji97E2Tex;
+
+#define dgMsgKanji97E3Tex "__OTR__textures/kanji/gMsgKanji97E3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E3Tex[] = dgMsgKanji97E3Tex;
+
+#define dgMsgKanji97E4Tex "__OTR__textures/kanji/gMsgKanji97E4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E4Tex[] = dgMsgKanji97E4Tex;
+
+#define dgMsgKanji97E5Tex "__OTR__textures/kanji/gMsgKanji97E5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E5Tex[] = dgMsgKanji97E5Tex;
+
+#define dgMsgKanji97E6Tex "__OTR__textures/kanji/gMsgKanji97E6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E6Tex[] = dgMsgKanji97E6Tex;
+
+#define dgMsgKanji97E7Tex "__OTR__textures/kanji/gMsgKanji97E7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E7Tex[] = dgMsgKanji97E7Tex;
+
+#define dgMsgKanji97E8Tex "__OTR__textures/kanji/gMsgKanji97E8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E8Tex[] = dgMsgKanji97E8Tex;
+
+#define dgMsgKanji97E9Tex "__OTR__textures/kanji/gMsgKanji97E9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97E9Tex[] = dgMsgKanji97E9Tex;
+
+#define dgMsgKanji97EATex "__OTR__textures/kanji/gMsgKanji97EATex"
+static const ALIGN_ASSET(2) char gMsgKanji97EATex[] = dgMsgKanji97EATex;
+
+#define dgMsgKanji97EBTex "__OTR__textures/kanji/gMsgKanji97EBTex"
+static const ALIGN_ASSET(2) char gMsgKanji97EBTex[] = dgMsgKanji97EBTex;
+
+#define dgMsgKanji97ECTex "__OTR__textures/kanji/gMsgKanji97ECTex"
+static const ALIGN_ASSET(2) char gMsgKanji97ECTex[] = dgMsgKanji97ECTex;
+
+#define dgMsgKanji97EDTex "__OTR__textures/kanji/gMsgKanji97EDTex"
+static const ALIGN_ASSET(2) char gMsgKanji97EDTex[] = dgMsgKanji97EDTex;
+
+#define dgMsgKanji97EETex "__OTR__textures/kanji/gMsgKanji97EETex"
+static const ALIGN_ASSET(2) char gMsgKanji97EETex[] = dgMsgKanji97EETex;
+
+#define dgMsgKanji97EFTex "__OTR__textures/kanji/gMsgKanji97EFTex"
+static const ALIGN_ASSET(2) char gMsgKanji97EFTex[] = dgMsgKanji97EFTex;
+
+#define dgMsgKanji97F0Tex "__OTR__textures/kanji/gMsgKanji97F0Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F0Tex[] = dgMsgKanji97F0Tex;
+
+#define dgMsgKanji97F1Tex "__OTR__textures/kanji/gMsgKanji97F1Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F1Tex[] = dgMsgKanji97F1Tex;
+
+#define dgMsgKanji97F2Tex "__OTR__textures/kanji/gMsgKanji97F2Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F2Tex[] = dgMsgKanji97F2Tex;
+
+#define dgMsgKanji97F3Tex "__OTR__textures/kanji/gMsgKanji97F3Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F3Tex[] = dgMsgKanji97F3Tex;
+
+#define dgMsgKanji97F4Tex "__OTR__textures/kanji/gMsgKanji97F4Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F4Tex[] = dgMsgKanji97F4Tex;
+
+#define dgMsgKanji97F5Tex "__OTR__textures/kanji/gMsgKanji97F5Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F5Tex[] = dgMsgKanji97F5Tex;
+
+#define dgMsgKanji97F6Tex "__OTR__textures/kanji/gMsgKanji97F6Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F6Tex[] = dgMsgKanji97F6Tex;
+
+#define dgMsgKanji97F7Tex "__OTR__textures/kanji/gMsgKanji97F7Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F7Tex[] = dgMsgKanji97F7Tex;
+
+#define dgMsgKanji97F8Tex "__OTR__textures/kanji/gMsgKanji97F8Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F8Tex[] = dgMsgKanji97F8Tex;
+
+#define dgMsgKanji97F9Tex "__OTR__textures/kanji/gMsgKanji97F9Tex"
+static const ALIGN_ASSET(2) char gMsgKanji97F9Tex[] = dgMsgKanji97F9Tex;
+
+#define dgMsgKanji97FATex "__OTR__textures/kanji/gMsgKanji97FATex"
+static const ALIGN_ASSET(2) char gMsgKanji97FATex[] = dgMsgKanji97FATex;
+
+#define dgMsgKanji97FBTex "__OTR__textures/kanji/gMsgKanji97FBTex"
+static const ALIGN_ASSET(2) char gMsgKanji97FBTex[] = dgMsgKanji97FBTex;
+
+#define dgMsgKanji97FCTex "__OTR__textures/kanji/gMsgKanji97FCTex"
+static const ALIGN_ASSET(2) char gMsgKanji97FCTex[] = dgMsgKanji97FCTex;
+
+#define dgMsgKanji9840Tex "__OTR__textures/kanji/gMsgKanji9840Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9840Tex[] = dgMsgKanji9840Tex;
+
+#define dgMsgKanji9841Tex "__OTR__textures/kanji/gMsgKanji9841Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9841Tex[] = dgMsgKanji9841Tex;
+
+#define dgMsgKanji9842Tex "__OTR__textures/kanji/gMsgKanji9842Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9842Tex[] = dgMsgKanji9842Tex;
+
+#define dgMsgKanji9843Tex "__OTR__textures/kanji/gMsgKanji9843Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9843Tex[] = dgMsgKanji9843Tex;
+
+#define dgMsgKanji9844Tex "__OTR__textures/kanji/gMsgKanji9844Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9844Tex[] = dgMsgKanji9844Tex;
+
+#define dgMsgKanji9845Tex "__OTR__textures/kanji/gMsgKanji9845Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9845Tex[] = dgMsgKanji9845Tex;
+
+#define dgMsgKanji9846Tex "__OTR__textures/kanji/gMsgKanji9846Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9846Tex[] = dgMsgKanji9846Tex;
+
+#define dgMsgKanji9847Tex "__OTR__textures/kanji/gMsgKanji9847Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9847Tex[] = dgMsgKanji9847Tex;
+
+#define dgMsgKanji9848Tex "__OTR__textures/kanji/gMsgKanji9848Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9848Tex[] = dgMsgKanji9848Tex;
+
+#define dgMsgKanji9849Tex "__OTR__textures/kanji/gMsgKanji9849Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9849Tex[] = dgMsgKanji9849Tex;
+
+#define dgMsgKanji984ATex "__OTR__textures/kanji/gMsgKanji984ATex"
+static const ALIGN_ASSET(2) char gMsgKanji984ATex[] = dgMsgKanji984ATex;
+
+#define dgMsgKanji984BTex "__OTR__textures/kanji/gMsgKanji984BTex"
+static const ALIGN_ASSET(2) char gMsgKanji984BTex[] = dgMsgKanji984BTex;
+
+#define dgMsgKanji984CTex "__OTR__textures/kanji/gMsgKanji984CTex"
+static const ALIGN_ASSET(2) char gMsgKanji984CTex[] = dgMsgKanji984CTex;
+
+#define dgMsgKanji984DTex "__OTR__textures/kanji/gMsgKanji984DTex"
+static const ALIGN_ASSET(2) char gMsgKanji984DTex[] = dgMsgKanji984DTex;
+
+#define dgMsgKanji984ETex "__OTR__textures/kanji/gMsgKanji984ETex"
+static const ALIGN_ASSET(2) char gMsgKanji984ETex[] = dgMsgKanji984ETex;
+
+#define dgMsgKanji984FTex "__OTR__textures/kanji/gMsgKanji984FTex"
+static const ALIGN_ASSET(2) char gMsgKanji984FTex[] = dgMsgKanji984FTex;
+
+#define dgMsgKanji9850Tex "__OTR__textures/kanji/gMsgKanji9850Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9850Tex[] = dgMsgKanji9850Tex;
+
+#define dgMsgKanji9851Tex "__OTR__textures/kanji/gMsgKanji9851Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9851Tex[] = dgMsgKanji9851Tex;
+
+#define dgMsgKanji9852Tex "__OTR__textures/kanji/gMsgKanji9852Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9852Tex[] = dgMsgKanji9852Tex;
+
+#define dgMsgKanji9853Tex "__OTR__textures/kanji/gMsgKanji9853Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9853Tex[] = dgMsgKanji9853Tex;
+
+#define dgMsgKanji9854Tex "__OTR__textures/kanji/gMsgKanji9854Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9854Tex[] = dgMsgKanji9854Tex;
+
+#define dgMsgKanji9855Tex "__OTR__textures/kanji/gMsgKanji9855Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9855Tex[] = dgMsgKanji9855Tex;
+
+#define dgMsgKanji9856Tex "__OTR__textures/kanji/gMsgKanji9856Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9856Tex[] = dgMsgKanji9856Tex;
+
+#define dgMsgKanji9857Tex "__OTR__textures/kanji/gMsgKanji9857Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9857Tex[] = dgMsgKanji9857Tex;
+
+#define dgMsgKanji9858Tex "__OTR__textures/kanji/gMsgKanji9858Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9858Tex[] = dgMsgKanji9858Tex;
+
+#define dgMsgKanji9859Tex "__OTR__textures/kanji/gMsgKanji9859Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9859Tex[] = dgMsgKanji9859Tex;
+
+#define dgMsgKanji985ATex "__OTR__textures/kanji/gMsgKanji985ATex"
+static const ALIGN_ASSET(2) char gMsgKanji985ATex[] = dgMsgKanji985ATex;
+
+#define dgMsgKanji985BTex "__OTR__textures/kanji/gMsgKanji985BTex"
+static const ALIGN_ASSET(2) char gMsgKanji985BTex[] = dgMsgKanji985BTex;
+
+#define dgMsgKanji985CTex "__OTR__textures/kanji/gMsgKanji985CTex"
+static const ALIGN_ASSET(2) char gMsgKanji985CTex[] = dgMsgKanji985CTex;
+
+#define dgMsgKanji985DTex "__OTR__textures/kanji/gMsgKanji985DTex"
+static const ALIGN_ASSET(2) char gMsgKanji985DTex[] = dgMsgKanji985DTex;
+
+#define dgMsgKanji985ETex "__OTR__textures/kanji/gMsgKanji985ETex"
+static const ALIGN_ASSET(2) char gMsgKanji985ETex[] = dgMsgKanji985ETex;
+
+#define dgMsgKanji985FTex "__OTR__textures/kanji/gMsgKanji985FTex"
+static const ALIGN_ASSET(2) char gMsgKanji985FTex[] = dgMsgKanji985FTex;
+
+#define dgMsgKanji9860Tex "__OTR__textures/kanji/gMsgKanji9860Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9860Tex[] = dgMsgKanji9860Tex;
+
+#define dgMsgKanji9861Tex "__OTR__textures/kanji/gMsgKanji9861Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9861Tex[] = dgMsgKanji9861Tex;
+
+#define dgMsgKanji9862Tex "__OTR__textures/kanji/gMsgKanji9862Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9862Tex[] = dgMsgKanji9862Tex;
+
+#define dgMsgKanji9863Tex "__OTR__textures/kanji/gMsgKanji9863Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9863Tex[] = dgMsgKanji9863Tex;
+
+#define dgMsgKanji9864Tex "__OTR__textures/kanji/gMsgKanji9864Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9864Tex[] = dgMsgKanji9864Tex;
+
+#define dgMsgKanji9865Tex "__OTR__textures/kanji/gMsgKanji9865Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9865Tex[] = dgMsgKanji9865Tex;
+
+#define dgMsgKanji9866Tex "__OTR__textures/kanji/gMsgKanji9866Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9866Tex[] = dgMsgKanji9866Tex;
+
+#define dgMsgKanji9867Tex "__OTR__textures/kanji/gMsgKanji9867Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9867Tex[] = dgMsgKanji9867Tex;
+
+#define dgMsgKanji9868Tex "__OTR__textures/kanji/gMsgKanji9868Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9868Tex[] = dgMsgKanji9868Tex;
+
+#define dgMsgKanji9869Tex "__OTR__textures/kanji/gMsgKanji9869Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9869Tex[] = dgMsgKanji9869Tex;
+
+#define dgMsgKanji986ATex "__OTR__textures/kanji/gMsgKanji986ATex"
+static const ALIGN_ASSET(2) char gMsgKanji986ATex[] = dgMsgKanji986ATex;
+
+#define dgMsgKanji986BTex "__OTR__textures/kanji/gMsgKanji986BTex"
+static const ALIGN_ASSET(2) char gMsgKanji986BTex[] = dgMsgKanji986BTex;
+
+#define dgMsgKanji986CTex "__OTR__textures/kanji/gMsgKanji986CTex"
+static const ALIGN_ASSET(2) char gMsgKanji986CTex[] = dgMsgKanji986CTex;
+
+#define dgMsgKanji986DTex "__OTR__textures/kanji/gMsgKanji986DTex"
+static const ALIGN_ASSET(2) char gMsgKanji986DTex[] = dgMsgKanji986DTex;
+
+#define dgMsgKanji986ETex "__OTR__textures/kanji/gMsgKanji986ETex"
+static const ALIGN_ASSET(2) char gMsgKanji986ETex[] = dgMsgKanji986ETex;
+
+#define dgMsgKanji986FTex "__OTR__textures/kanji/gMsgKanji986FTex"
+static const ALIGN_ASSET(2) char gMsgKanji986FTex[] = dgMsgKanji986FTex;
+
+#define dgMsgKanji9870Tex "__OTR__textures/kanji/gMsgKanji9870Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9870Tex[] = dgMsgKanji9870Tex;
+
+#define dgMsgKanji9871Tex "__OTR__textures/kanji/gMsgKanji9871Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9871Tex[] = dgMsgKanji9871Tex;
+
+#define dgMsgKanji9872Tex "__OTR__textures/kanji/gMsgKanji9872Tex"
+static const ALIGN_ASSET(2) char gMsgKanji9872Tex[] = dgMsgKanji9872Tex;
+
+#define dgMsgKanji9873EmptyTex "__OTR__textures/kanji/gMsgKanji9873EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9873EmptyTex[] = dgMsgKanji9873EmptyTex;
+
+#define dgMsgKanji9874EmptyTex "__OTR__textures/kanji/gMsgKanji9874EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9874EmptyTex[] = dgMsgKanji9874EmptyTex;
+
+#define dgMsgKanji9875EmptyTex "__OTR__textures/kanji/gMsgKanji9875EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9875EmptyTex[] = dgMsgKanji9875EmptyTex;
+
+#define dgMsgKanji9876EmptyTex "__OTR__textures/kanji/gMsgKanji9876EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9876EmptyTex[] = dgMsgKanji9876EmptyTex;
+
+#define dgMsgKanji9877EmptyTex "__OTR__textures/kanji/gMsgKanji9877EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9877EmptyTex[] = dgMsgKanji9877EmptyTex;
+
+#define dgMsgKanji9878EmptyTex "__OTR__textures/kanji/gMsgKanji9878EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9878EmptyTex[] = dgMsgKanji9878EmptyTex;
+
+#define dgMsgKanji9879EmptyTex "__OTR__textures/kanji/gMsgKanji9879EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9879EmptyTex[] = dgMsgKanji9879EmptyTex;
+
+#define dgMsgKanji987AEmptyTex "__OTR__textures/kanji/gMsgKanji987AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji987AEmptyTex[] = dgMsgKanji987AEmptyTex;
+
+#define dgMsgKanji987BEmptyTex "__OTR__textures/kanji/gMsgKanji987BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji987BEmptyTex[] = dgMsgKanji987BEmptyTex;
+
+#define dgMsgKanji987CEmptyTex "__OTR__textures/kanji/gMsgKanji987CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji987CEmptyTex[] = dgMsgKanji987CEmptyTex;
+
+#define dgMsgKanji987DEmptyTex "__OTR__textures/kanji/gMsgKanji987DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji987DEmptyTex[] = dgMsgKanji987DEmptyTex;
+
+#define dgMsgKanji987EEmptyTex "__OTR__textures/kanji/gMsgKanji987EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji987EEmptyTex[] = dgMsgKanji987EEmptyTex;
+
+#define dgMsgKanji9880EmptyTex "__OTR__textures/kanji/gMsgKanji9880EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9880EmptyTex[] = dgMsgKanji9880EmptyTex;
+
+#define dgMsgKanji9881EmptyTex "__OTR__textures/kanji/gMsgKanji9881EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9881EmptyTex[] = dgMsgKanji9881EmptyTex;
+
+#define dgMsgKanji9882EmptyTex "__OTR__textures/kanji/gMsgKanji9882EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9882EmptyTex[] = dgMsgKanji9882EmptyTex;
+
+#define dgMsgKanji9883EmptyTex "__OTR__textures/kanji/gMsgKanji9883EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9883EmptyTex[] = dgMsgKanji9883EmptyTex;
+
+#define dgMsgKanji9884EmptyTex "__OTR__textures/kanji/gMsgKanji9884EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9884EmptyTex[] = dgMsgKanji9884EmptyTex;
+
+#define dgMsgKanji9885EmptyTex "__OTR__textures/kanji/gMsgKanji9885EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9885EmptyTex[] = dgMsgKanji9885EmptyTex;
+
+#define dgMsgKanji9886EmptyTex "__OTR__textures/kanji/gMsgKanji9886EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9886EmptyTex[] = dgMsgKanji9886EmptyTex;
+
+#define dgMsgKanji9887EmptyTex "__OTR__textures/kanji/gMsgKanji9887EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9887EmptyTex[] = dgMsgKanji9887EmptyTex;
+
+#define dgMsgKanji9888EmptyTex "__OTR__textures/kanji/gMsgKanji9888EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9888EmptyTex[] = dgMsgKanji9888EmptyTex;
+
+#define dgMsgKanji9889EmptyTex "__OTR__textures/kanji/gMsgKanji9889EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9889EmptyTex[] = dgMsgKanji9889EmptyTex;
+
+#define dgMsgKanji988AEmptyTex "__OTR__textures/kanji/gMsgKanji988AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988AEmptyTex[] = dgMsgKanji988AEmptyTex;
+
+#define dgMsgKanji988BEmptyTex "__OTR__textures/kanji/gMsgKanji988BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988BEmptyTex[] = dgMsgKanji988BEmptyTex;
+
+#define dgMsgKanji988CEmptyTex "__OTR__textures/kanji/gMsgKanji988CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988CEmptyTex[] = dgMsgKanji988CEmptyTex;
+
+#define dgMsgKanji988DEmptyTex "__OTR__textures/kanji/gMsgKanji988DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988DEmptyTex[] = dgMsgKanji988DEmptyTex;
+
+#define dgMsgKanji988EEmptyTex "__OTR__textures/kanji/gMsgKanji988EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988EEmptyTex[] = dgMsgKanji988EEmptyTex;
+
+#define dgMsgKanji988FEmptyTex "__OTR__textures/kanji/gMsgKanji988FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji988FEmptyTex[] = dgMsgKanji988FEmptyTex;
+
+#define dgMsgKanji9890EmptyTex "__OTR__textures/kanji/gMsgKanji9890EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9890EmptyTex[] = dgMsgKanji9890EmptyTex;
+
+#define dgMsgKanji9891EmptyTex "__OTR__textures/kanji/gMsgKanji9891EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9891EmptyTex[] = dgMsgKanji9891EmptyTex;
+
+#define dgMsgKanji9892EmptyTex "__OTR__textures/kanji/gMsgKanji9892EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9892EmptyTex[] = dgMsgKanji9892EmptyTex;
+
+#define dgMsgKanji9893EmptyTex "__OTR__textures/kanji/gMsgKanji9893EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9893EmptyTex[] = dgMsgKanji9893EmptyTex;
+
+#define dgMsgKanji9894EmptyTex "__OTR__textures/kanji/gMsgKanji9894EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9894EmptyTex[] = dgMsgKanji9894EmptyTex;
+
+#define dgMsgKanji9895EmptyTex "__OTR__textures/kanji/gMsgKanji9895EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9895EmptyTex[] = dgMsgKanji9895EmptyTex;
+
+#define dgMsgKanji9896EmptyTex "__OTR__textures/kanji/gMsgKanji9896EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9896EmptyTex[] = dgMsgKanji9896EmptyTex;
+
+#define dgMsgKanji9897EmptyTex "__OTR__textures/kanji/gMsgKanji9897EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9897EmptyTex[] = dgMsgKanji9897EmptyTex;
+
+#define dgMsgKanji9898EmptyTex "__OTR__textures/kanji/gMsgKanji9898EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9898EmptyTex[] = dgMsgKanji9898EmptyTex;
+
+#define dgMsgKanji9899EmptyTex "__OTR__textures/kanji/gMsgKanji9899EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji9899EmptyTex[] = dgMsgKanji9899EmptyTex;
+
+#define dgMsgKanji989AEmptyTex "__OTR__textures/kanji/gMsgKanji989AEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989AEmptyTex[] = dgMsgKanji989AEmptyTex;
+
+#define dgMsgKanji989BEmptyTex "__OTR__textures/kanji/gMsgKanji989BEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989BEmptyTex[] = dgMsgKanji989BEmptyTex;
+
+#define dgMsgKanji989CEmptyTex "__OTR__textures/kanji/gMsgKanji989CEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989CEmptyTex[] = dgMsgKanji989CEmptyTex;
+
+#define dgMsgKanji989DEmptyTex "__OTR__textures/kanji/gMsgKanji989DEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989DEmptyTex[] = dgMsgKanji989DEmptyTex;
+
+#define dgMsgKanji989EEmptyTex "__OTR__textures/kanji/gMsgKanji989EEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989EEmptyTex[] = dgMsgKanji989EEmptyTex;
+
+#define dgMsgKanji989FEmptyTex "__OTR__textures/kanji/gMsgKanji989FEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji989FEmptyTex[] = dgMsgKanji989FEmptyTex;
+
+#define dgMsgKanji98A0EmptyTex "__OTR__textures/kanji/gMsgKanji98A0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A0EmptyTex[] = dgMsgKanji98A0EmptyTex;
+
+#define dgMsgKanji98A1EmptyTex "__OTR__textures/kanji/gMsgKanji98A1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A1EmptyTex[] = dgMsgKanji98A1EmptyTex;
+
+#define dgMsgKanji98A2EmptyTex "__OTR__textures/kanji/gMsgKanji98A2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A2EmptyTex[] = dgMsgKanji98A2EmptyTex;
+
+#define dgMsgKanji98A3EmptyTex "__OTR__textures/kanji/gMsgKanji98A3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A3EmptyTex[] = dgMsgKanji98A3EmptyTex;
+
+#define dgMsgKanji98A4EmptyTex "__OTR__textures/kanji/gMsgKanji98A4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A4EmptyTex[] = dgMsgKanji98A4EmptyTex;
+
+#define dgMsgKanji98A5EmptyTex "__OTR__textures/kanji/gMsgKanji98A5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A5EmptyTex[] = dgMsgKanji98A5EmptyTex;
+
+#define dgMsgKanji98A6EmptyTex "__OTR__textures/kanji/gMsgKanji98A6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A6EmptyTex[] = dgMsgKanji98A6EmptyTex;
+
+#define dgMsgKanji98A7EmptyTex "__OTR__textures/kanji/gMsgKanji98A7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A7EmptyTex[] = dgMsgKanji98A7EmptyTex;
+
+#define dgMsgKanji98A8EmptyTex "__OTR__textures/kanji/gMsgKanji98A8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A8EmptyTex[] = dgMsgKanji98A8EmptyTex;
+
+#define dgMsgKanji98A9EmptyTex "__OTR__textures/kanji/gMsgKanji98A9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98A9EmptyTex[] = dgMsgKanji98A9EmptyTex;
+
+#define dgMsgKanji98AAEmptyTex "__OTR__textures/kanji/gMsgKanji98AAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98AAEmptyTex[] = dgMsgKanji98AAEmptyTex;
+
+#define dgMsgKanji98ABEmptyTex "__OTR__textures/kanji/gMsgKanji98ABEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98ABEmptyTex[] = dgMsgKanji98ABEmptyTex;
+
+#define dgMsgKanji98ACEmptyTex "__OTR__textures/kanji/gMsgKanji98ACEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98ACEmptyTex[] = dgMsgKanji98ACEmptyTex;
+
+#define dgMsgKanji98ADEmptyTex "__OTR__textures/kanji/gMsgKanji98ADEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98ADEmptyTex[] = dgMsgKanji98ADEmptyTex;
+
+#define dgMsgKanji98AEEmptyTex "__OTR__textures/kanji/gMsgKanji98AEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98AEEmptyTex[] = dgMsgKanji98AEEmptyTex;
+
+#define dgMsgKanji98AFEmptyTex "__OTR__textures/kanji/gMsgKanji98AFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98AFEmptyTex[] = dgMsgKanji98AFEmptyTex;
+
+#define dgMsgKanji98B0EmptyTex "__OTR__textures/kanji/gMsgKanji98B0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B0EmptyTex[] = dgMsgKanji98B0EmptyTex;
+
+#define dgMsgKanji98B1EmptyTex "__OTR__textures/kanji/gMsgKanji98B1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B1EmptyTex[] = dgMsgKanji98B1EmptyTex;
+
+#define dgMsgKanji98B2EmptyTex "__OTR__textures/kanji/gMsgKanji98B2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B2EmptyTex[] = dgMsgKanji98B2EmptyTex;
+
+#define dgMsgKanji98B3EmptyTex "__OTR__textures/kanji/gMsgKanji98B3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B3EmptyTex[] = dgMsgKanji98B3EmptyTex;
+
+#define dgMsgKanji98B4EmptyTex "__OTR__textures/kanji/gMsgKanji98B4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B4EmptyTex[] = dgMsgKanji98B4EmptyTex;
+
+#define dgMsgKanji98B5EmptyTex "__OTR__textures/kanji/gMsgKanji98B5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B5EmptyTex[] = dgMsgKanji98B5EmptyTex;
+
+#define dgMsgKanji98B6EmptyTex "__OTR__textures/kanji/gMsgKanji98B6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B6EmptyTex[] = dgMsgKanji98B6EmptyTex;
+
+#define dgMsgKanji98B7EmptyTex "__OTR__textures/kanji/gMsgKanji98B7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B7EmptyTex[] = dgMsgKanji98B7EmptyTex;
+
+#define dgMsgKanji98B8EmptyTex "__OTR__textures/kanji/gMsgKanji98B8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B8EmptyTex[] = dgMsgKanji98B8EmptyTex;
+
+#define dgMsgKanji98B9EmptyTex "__OTR__textures/kanji/gMsgKanji98B9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98B9EmptyTex[] = dgMsgKanji98B9EmptyTex;
+
+#define dgMsgKanji98BAEmptyTex "__OTR__textures/kanji/gMsgKanji98BAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BAEmptyTex[] = dgMsgKanji98BAEmptyTex;
+
+#define dgMsgKanji98BBEmptyTex "__OTR__textures/kanji/gMsgKanji98BBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BBEmptyTex[] = dgMsgKanji98BBEmptyTex;
+
+#define dgMsgKanji98BCEmptyTex "__OTR__textures/kanji/gMsgKanji98BCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BCEmptyTex[] = dgMsgKanji98BCEmptyTex;
+
+#define dgMsgKanji98BDEmptyTex "__OTR__textures/kanji/gMsgKanji98BDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BDEmptyTex[] = dgMsgKanji98BDEmptyTex;
+
+#define dgMsgKanji98BEEmptyTex "__OTR__textures/kanji/gMsgKanji98BEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BEEmptyTex[] = dgMsgKanji98BEEmptyTex;
+
+#define dgMsgKanji98BFEmptyTex "__OTR__textures/kanji/gMsgKanji98BFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98BFEmptyTex[] = dgMsgKanji98BFEmptyTex;
+
+#define dgMsgKanji98C0EmptyTex "__OTR__textures/kanji/gMsgKanji98C0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C0EmptyTex[] = dgMsgKanji98C0EmptyTex;
+
+#define dgMsgKanji98C1EmptyTex "__OTR__textures/kanji/gMsgKanji98C1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C1EmptyTex[] = dgMsgKanji98C1EmptyTex;
+
+#define dgMsgKanji98C2EmptyTex "__OTR__textures/kanji/gMsgKanji98C2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C2EmptyTex[] = dgMsgKanji98C2EmptyTex;
+
+#define dgMsgKanji98C3EmptyTex "__OTR__textures/kanji/gMsgKanji98C3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C3EmptyTex[] = dgMsgKanji98C3EmptyTex;
+
+#define dgMsgKanji98C4EmptyTex "__OTR__textures/kanji/gMsgKanji98C4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C4EmptyTex[] = dgMsgKanji98C4EmptyTex;
+
+#define dgMsgKanji98C5EmptyTex "__OTR__textures/kanji/gMsgKanji98C5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C5EmptyTex[] = dgMsgKanji98C5EmptyTex;
+
+#define dgMsgKanji98C6EmptyTex "__OTR__textures/kanji/gMsgKanji98C6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C6EmptyTex[] = dgMsgKanji98C6EmptyTex;
+
+#define dgMsgKanji98C7EmptyTex "__OTR__textures/kanji/gMsgKanji98C7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C7EmptyTex[] = dgMsgKanji98C7EmptyTex;
+
+#define dgMsgKanji98C8EmptyTex "__OTR__textures/kanji/gMsgKanji98C8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C8EmptyTex[] = dgMsgKanji98C8EmptyTex;
+
+#define dgMsgKanji98C9EmptyTex "__OTR__textures/kanji/gMsgKanji98C9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98C9EmptyTex[] = dgMsgKanji98C9EmptyTex;
+
+#define dgMsgKanji98CAEmptyTex "__OTR__textures/kanji/gMsgKanji98CAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CAEmptyTex[] = dgMsgKanji98CAEmptyTex;
+
+#define dgMsgKanji98CBEmptyTex "__OTR__textures/kanji/gMsgKanji98CBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CBEmptyTex[] = dgMsgKanji98CBEmptyTex;
+
+#define dgMsgKanji98CCEmptyTex "__OTR__textures/kanji/gMsgKanji98CCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CCEmptyTex[] = dgMsgKanji98CCEmptyTex;
+
+#define dgMsgKanji98CDEmptyTex "__OTR__textures/kanji/gMsgKanji98CDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CDEmptyTex[] = dgMsgKanji98CDEmptyTex;
+
+#define dgMsgKanji98CEEmptyTex "__OTR__textures/kanji/gMsgKanji98CEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CEEmptyTex[] = dgMsgKanji98CEEmptyTex;
+
+#define dgMsgKanji98CFEmptyTex "__OTR__textures/kanji/gMsgKanji98CFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98CFEmptyTex[] = dgMsgKanji98CFEmptyTex;
+
+#define dgMsgKanji98D0EmptyTex "__OTR__textures/kanji/gMsgKanji98D0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D0EmptyTex[] = dgMsgKanji98D0EmptyTex;
+
+#define dgMsgKanji98D1EmptyTex "__OTR__textures/kanji/gMsgKanji98D1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D1EmptyTex[] = dgMsgKanji98D1EmptyTex;
+
+#define dgMsgKanji98D2EmptyTex "__OTR__textures/kanji/gMsgKanji98D2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D2EmptyTex[] = dgMsgKanji98D2EmptyTex;
+
+#define dgMsgKanji98D3EmptyTex "__OTR__textures/kanji/gMsgKanji98D3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D3EmptyTex[] = dgMsgKanji98D3EmptyTex;
+
+#define dgMsgKanji98D4EmptyTex "__OTR__textures/kanji/gMsgKanji98D4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D4EmptyTex[] = dgMsgKanji98D4EmptyTex;
+
+#define dgMsgKanji98D5EmptyTex "__OTR__textures/kanji/gMsgKanji98D5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D5EmptyTex[] = dgMsgKanji98D5EmptyTex;
+
+#define dgMsgKanji98D6EmptyTex "__OTR__textures/kanji/gMsgKanji98D6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D6EmptyTex[] = dgMsgKanji98D6EmptyTex;
+
+#define dgMsgKanji98D7EmptyTex "__OTR__textures/kanji/gMsgKanji98D7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D7EmptyTex[] = dgMsgKanji98D7EmptyTex;
+
+#define dgMsgKanji98D8EmptyTex "__OTR__textures/kanji/gMsgKanji98D8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D8EmptyTex[] = dgMsgKanji98D8EmptyTex;
+
+#define dgMsgKanji98D9EmptyTex "__OTR__textures/kanji/gMsgKanji98D9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98D9EmptyTex[] = dgMsgKanji98D9EmptyTex;
+
+#define dgMsgKanji98DAEmptyTex "__OTR__textures/kanji/gMsgKanji98DAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DAEmptyTex[] = dgMsgKanji98DAEmptyTex;
+
+#define dgMsgKanji98DBEmptyTex "__OTR__textures/kanji/gMsgKanji98DBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DBEmptyTex[] = dgMsgKanji98DBEmptyTex;
+
+#define dgMsgKanji98DCEmptyTex "__OTR__textures/kanji/gMsgKanji98DCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DCEmptyTex[] = dgMsgKanji98DCEmptyTex;
+
+#define dgMsgKanji98DDEmptyTex "__OTR__textures/kanji/gMsgKanji98DDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DDEmptyTex[] = dgMsgKanji98DDEmptyTex;
+
+#define dgMsgKanji98DEEmptyTex "__OTR__textures/kanji/gMsgKanji98DEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DEEmptyTex[] = dgMsgKanji98DEEmptyTex;
+
+#define dgMsgKanji98DFEmptyTex "__OTR__textures/kanji/gMsgKanji98DFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98DFEmptyTex[] = dgMsgKanji98DFEmptyTex;
+
+#define dgMsgKanji98E0EmptyTex "__OTR__textures/kanji/gMsgKanji98E0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E0EmptyTex[] = dgMsgKanji98E0EmptyTex;
+
+#define dgMsgKanji98E1EmptyTex "__OTR__textures/kanji/gMsgKanji98E1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E1EmptyTex[] = dgMsgKanji98E1EmptyTex;
+
+#define dgMsgKanji98E2EmptyTex "__OTR__textures/kanji/gMsgKanji98E2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E2EmptyTex[] = dgMsgKanji98E2EmptyTex;
+
+#define dgMsgKanji98E3EmptyTex "__OTR__textures/kanji/gMsgKanji98E3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E3EmptyTex[] = dgMsgKanji98E3EmptyTex;
+
+#define dgMsgKanji98E4EmptyTex "__OTR__textures/kanji/gMsgKanji98E4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E4EmptyTex[] = dgMsgKanji98E4EmptyTex;
+
+#define dgMsgKanji98E5EmptyTex "__OTR__textures/kanji/gMsgKanji98E5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E5EmptyTex[] = dgMsgKanji98E5EmptyTex;
+
+#define dgMsgKanji98E6EmptyTex "__OTR__textures/kanji/gMsgKanji98E6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E6EmptyTex[] = dgMsgKanji98E6EmptyTex;
+
+#define dgMsgKanji98E7EmptyTex "__OTR__textures/kanji/gMsgKanji98E7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E7EmptyTex[] = dgMsgKanji98E7EmptyTex;
+
+#define dgMsgKanji98E8EmptyTex "__OTR__textures/kanji/gMsgKanji98E8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E8EmptyTex[] = dgMsgKanji98E8EmptyTex;
+
+#define dgMsgKanji98E9EmptyTex "__OTR__textures/kanji/gMsgKanji98E9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98E9EmptyTex[] = dgMsgKanji98E9EmptyTex;
+
+#define dgMsgKanji98EAEmptyTex "__OTR__textures/kanji/gMsgKanji98EAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98EAEmptyTex[] = dgMsgKanji98EAEmptyTex;
+
+#define dgMsgKanji98EBEmptyTex "__OTR__textures/kanji/gMsgKanji98EBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98EBEmptyTex[] = dgMsgKanji98EBEmptyTex;
+
+#define dgMsgKanji98ECEmptyTex "__OTR__textures/kanji/gMsgKanji98ECEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98ECEmptyTex[] = dgMsgKanji98ECEmptyTex;
+
+#define dgMsgKanji98EDEmptyTex "__OTR__textures/kanji/gMsgKanji98EDEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98EDEmptyTex[] = dgMsgKanji98EDEmptyTex;
+
+#define dgMsgKanji98EEEmptyTex "__OTR__textures/kanji/gMsgKanji98EEEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98EEEmptyTex[] = dgMsgKanji98EEEmptyTex;
+
+#define dgMsgKanji98EFEmptyTex "__OTR__textures/kanji/gMsgKanji98EFEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98EFEmptyTex[] = dgMsgKanji98EFEmptyTex;
+
+#define dgMsgKanji98F0EmptyTex "__OTR__textures/kanji/gMsgKanji98F0EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F0EmptyTex[] = dgMsgKanji98F0EmptyTex;
+
+#define dgMsgKanji98F1EmptyTex "__OTR__textures/kanji/gMsgKanji98F1EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F1EmptyTex[] = dgMsgKanji98F1EmptyTex;
+
+#define dgMsgKanji98F2EmptyTex "__OTR__textures/kanji/gMsgKanji98F2EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F2EmptyTex[] = dgMsgKanji98F2EmptyTex;
+
+#define dgMsgKanji98F3EmptyTex "__OTR__textures/kanji/gMsgKanji98F3EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F3EmptyTex[] = dgMsgKanji98F3EmptyTex;
+
+#define dgMsgKanji98F4EmptyTex "__OTR__textures/kanji/gMsgKanji98F4EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F4EmptyTex[] = dgMsgKanji98F4EmptyTex;
+
+#define dgMsgKanji98F5EmptyTex "__OTR__textures/kanji/gMsgKanji98F5EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F5EmptyTex[] = dgMsgKanji98F5EmptyTex;
+
+#define dgMsgKanji98F6EmptyTex "__OTR__textures/kanji/gMsgKanji98F6EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F6EmptyTex[] = dgMsgKanji98F6EmptyTex;
+
+#define dgMsgKanji98F7EmptyTex "__OTR__textures/kanji/gMsgKanji98F7EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F7EmptyTex[] = dgMsgKanji98F7EmptyTex;
+
+#define dgMsgKanji98F8EmptyTex "__OTR__textures/kanji/gMsgKanji98F8EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F8EmptyTex[] = dgMsgKanji98F8EmptyTex;
+
+#define dgMsgKanji98F9EmptyTex "__OTR__textures/kanji/gMsgKanji98F9EmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98F9EmptyTex[] = dgMsgKanji98F9EmptyTex;
+
+#define dgMsgKanji98FAEmptyTex "__OTR__textures/kanji/gMsgKanji98FAEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98FAEmptyTex[] = dgMsgKanji98FAEmptyTex;
+
+#define dgMsgKanji98FBEmptyTex "__OTR__textures/kanji/gMsgKanji98FBEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98FBEmptyTex[] = dgMsgKanji98FBEmptyTex;
+
+#define dgMsgKanji98FCEmptyTex "__OTR__textures/kanji/gMsgKanji98FCEmptyTex"
+static const ALIGN_ASSET(2) char gMsgKanji98FCEmptyTex[] = dgMsgKanji98FCEmptyTex;
+#endif // INTERFACE_KANJI_H
\ No newline at end of file
diff --git a/soh/assets/textures/map_name_static/map_name_static.h b/soh/assets/textures/map_name_static/map_name_static.h
index dcec5afcb9..b165356dba 100644
--- a/soh/assets/textures/map_name_static/map_name_static.h
+++ b/soh/assets/textures/map_name_static/map_name_static.h
@@ -309,4 +309,107 @@ static const ALIGN_ASSET(2) char gQuestionMarkPositionNameFRATex[] = dgQuestionM
 #define dgGanonsCastlePositionNameFRATex "__OTR__textures/map_name_static/gGanonsCastlePositionNameFRATex"
 static const ALIGN_ASSET(2) char gGanonsCastlePositionNameFRATex[] = dgGanonsCastlePositionNameFRATex;
 
+#define dgHauntedWastelandPointNameJPNTex "__OTR__textures/map_name_static/gHauntedWastelandPointNameJPNTex"
+static const ALIGN_ASSET(2) char gHauntedWastelandPointNameJPNTex[] = dgHauntedWastelandPointNameJPNTex;
+
+#define dgGerudosFortressPointNameJPNTex "__OTR__textures/map_name_static/gGerudosFortressPointNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudosFortressPointNameJPNTex[] = dgGerudosFortressPointNameJPNTex;
+
+#define dgGerudoValleyPointNameJPNTex "__OTR__textures/map_name_static/gGerudoValleyPointNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudoValleyPointNameJPNTex[] = dgGerudoValleyPointNameJPNTex;
+
+#define dgHyliaLakesidePointNameJPNTex "__OTR__textures/map_name_static/gHyliaLakesidePointNameJPNTex"
+static const ALIGN_ASSET(2) char gHyliaLakesidePointNameJPNTex[] = dgHyliaLakesidePointNameJPNTex;
+
+#define dgLonLonRanchPointNameJPNTex "__OTR__textures/map_name_static/gLonLonRanchPointNameJPNTex"
+static const ALIGN_ASSET(2) char gLonLonRanchPointNameJPNTex[] = dgLonLonRanchPointNameJPNTex;
+
+#define dgMarketPointNameJPNTex "__OTR__textures/map_name_static/gMarketPointNameJPNTex"
+static const ALIGN_ASSET(2) char gMarketPointNameJPNTex[] = dgMarketPointNameJPNTex;
+
+#define dgHyruleFieldPointNameJPNTex "__OTR__textures/map_name_static/gHyruleFieldPointNameJPNTex"
+static const ALIGN_ASSET(2) char gHyruleFieldPointNameJPNTex[] = dgHyruleFieldPointNameJPNTex;
+
+#define dgDeathMountainPointNameJPNTex "__OTR__textures/map_name_static/gDeathMountainPointNameJPNTex"
+static const ALIGN_ASSET(2) char gDeathMountainPointNameJPNTex[] = dgDeathMountainPointNameJPNTex;
+
+#define dgKakarikoVillagePointNameJPNTex "__OTR__textures/map_name_static/gKakarikoVillagePointNameJPNTex"
+static const ALIGN_ASSET(2) char gKakarikoVillagePointNameJPNTex[] = dgKakarikoVillagePointNameJPNTex;
+
+#define dgLostWoodsPointNameJPNTex "__OTR__textures/map_name_static/gLostWoodsPointNameJPNTex"
+static const ALIGN_ASSET(2) char gLostWoodsPointNameJPNTex[] = dgLostWoodsPointNameJPNTex;
+
+#define dgKokiriForestPointNameJPNTex "__OTR__textures/map_name_static/gKokiriForestPointNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriForestPointNameJPNTex[] = dgKokiriForestPointNameJPNTex;
+
+#define dgZorasDomainPointNameJPNTex "__OTR__textures/map_name_static/gZorasDomainPointNameJPNTex"
+static const ALIGN_ASSET(2) char gZorasDomainPointNameJPNTex[] = dgZorasDomainPointNameJPNTex;
+
+#define dgHyruleFieldPositionNameJPNTex "__OTR__textures/map_name_static/gHyruleFieldPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gHyruleFieldPositionNameJPNTex[] = dgHyruleFieldPositionNameJPNTex;
+
+#define dgKakarikoVillagePositionNameJPNTex "__OTR__textures/map_name_static/gKakarikoVillagePositionNameJPNTex"
+static const ALIGN_ASSET(2) char gKakarikoVillagePositionNameJPNTex[] = dgKakarikoVillagePositionNameJPNTex;
+
+#define dgGraveyardPositionNameJPNTex "__OTR__textures/map_name_static/gGraveyardPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gGraveyardPositionNameJPNTex[] = dgGraveyardPositionNameJPNTex;
+
+#define dgZorasRiverPositionNameJPNTex "__OTR__textures/map_name_static/gZorasRiverPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gZorasRiverPositionNameJPNTex[] = dgZorasRiverPositionNameJPNTex;
+
+#define dgKokiriForestPositionNameJPNTex "__OTR__textures/map_name_static/gKokiriForestPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gKokiriForestPositionNameJPNTex[] = dgKokiriForestPositionNameJPNTex;
+
+#define dgSacredForestMeadowPositionNameJPNTex "__OTR__textures/map_name_static/gSacredForestMeadowPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gSacredForestMeadowPositionNameJPNTex[] = dgSacredForestMeadowPositionNameJPNTex;
+
+#define dgLakeHyliaPositionNameJPNTex "__OTR__textures/map_name_static/gLakeHyliaPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gLakeHyliaPositionNameJPNTex[] = dgLakeHyliaPositionNameJPNTex;
+
+#define dgZorasDomainPositionNameJPNTex "__OTR__textures/map_name_static/gZorasDomainPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gZorasDomainPositionNameJPNTex[] = dgZorasDomainPositionNameJPNTex;
+
+#define dgZorasFountainPositionNameJPNTex "__OTR__textures/map_name_static/gZorasFountainPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gZorasFountainPositionNameJPNTex[] = dgZorasFountainPositionNameJPNTex;
+
+#define dgGerudoValleyPositionNameJPNTex "__OTR__textures/map_name_static/gGerudoValleyPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudoValleyPositionNameJPNTex[] = dgGerudoValleyPositionNameJPNTex;
+
+#define dgLostWoodsPositionNameJPNTex "__OTR__textures/map_name_static/gLostWoodsPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gLostWoodsPositionNameJPNTex[] = dgLostWoodsPositionNameJPNTex;
+
+#define dgDesertColossusPositionNameJPNTex "__OTR__textures/map_name_static/gDesertColossusPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gDesertColossusPositionNameJPNTex[] = dgDesertColossusPositionNameJPNTex;
+
+#define dgGerudosFortressPositionNameJPNTex "__OTR__textures/map_name_static/gGerudosFortressPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gGerudosFortressPositionNameJPNTex[] = dgGerudosFortressPositionNameJPNTex;
+
+#define dgHauntedWastelandPositionNameJPNTex "__OTR__textures/map_name_static/gHauntedWastelandPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gHauntedWastelandPositionNameJPNTex[] = dgHauntedWastelandPositionNameJPNTex;
+
+#define dgMarketPositionNameJPNTex "__OTR__textures/map_name_static/gMarketPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gMarketPositionNameJPNTex[] = dgMarketPositionNameJPNTex;
+
+#define dgHyruleCastlePositionNameJPNTex "__OTR__textures/map_name_static/gHyruleCastlePositionNameJPNTex"
+static const ALIGN_ASSET(2) char gHyruleCastlePositionNameJPNTex[] = dgHyruleCastlePositionNameJPNTex;
+
+#define dgDeathMountainTrailPositionNameJPNTex "__OTR__textures/map_name_static/gDeathMountainTrailPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gDeathMountainTrailPositionNameJPNTex[] = dgDeathMountainTrailPositionNameJPNTex;
+
+#define dgDeathMountainCraterPositionNameJPNTex "__OTR__textures/map_name_static/gDeathMountainCraterPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gDeathMountainCraterPositionNameJPNTex[] = dgDeathMountainCraterPositionNameJPNTex;
+
+#define dgGoronCityPositionNameJPNTex "__OTR__textures/map_name_static/gGoronCityPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gGoronCityPositionNameJPNTex[] = dgGoronCityPositionNameJPNTex;
+
+#define dgLonLonRanchPositionNameJPNTex "__OTR__textures/map_name_static/gLonLonRanchPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gLonLonRanchPositionNameJPNTex[] = dgLonLonRanchPositionNameJPNTex;
+
+#define dgQuestionMarkPositionNameJPNTex "__OTR__textures/map_name_static/gQuestionMarkPositionNameJPNTex"
+static const ALIGN_ASSET(2) char gQuestionMarkPositionNameJPNTex[] = dgQuestionMarkPositionNameJPNTex;
+
+#define dgGanonsCastlePositionNameJPNTex "__OTR__textures/map_name_static/gGanonsCastlePositionNameJPNTex"
+static const ALIGN_ASSET(2) char gGanonsCastlePositionNameJPNTex[] = dgGanonsCastlePositionNameJPNTex;
+
+
 #endif // TEXTURES_MAP_NAME_STATIC_H
diff --git a/soh/assets/textures/title_static/title_static.h b/soh/assets/textures/title_static/title_static.h
index 88ea9a5553..b3baf985f3 100644
--- a/soh/assets/textures/title_static/title_static.h
+++ b/soh/assets/textures/title_static/title_static.h
@@ -423,6 +423,9 @@ static const ALIGN_ASSET(2) char gFileSelHoldFRATex[] = dgFileSelHoldFRATex;
 #define dgFileSelCheckBrightnessENGTex "__OTR__textures/title_static/gFileSelCheckBrightnessENGTex"
 static const ALIGN_ASSET(2) char gFileSelCheckBrightnessENGTex[] = dgFileSelCheckBrightnessENGTex;
 
+#define dgFileSelCheckBrightnessENGNTSCTex "__OTR__textures/title_static/gFileSelCheckBrightnessENGNTSCTex"
+static const ALIGN_ASSET(2) char gFileSelCheckBrightnessENGNTSCTex[] = dgFileSelCheckBrightnessENGNTSCTex;
+
 #define dgFileSelCheckBrightnessGERTex "__OTR__textures/title_static/gFileSelCheckBrightnessGERTex"
 static const ALIGN_ASSET(2) char gFileSelCheckBrightnessGERTex[] = dgFileSelCheckBrightnessGERTex;
 
@@ -447,4 +450,110 @@ static const ALIGN_ASSET(2) char gFileSelWindow2DL[] = dgFileSelWindow2DL;
 #define dgFileSelWindow3DL "__OTR__textures/title_static/gFileSelWindow3DL"
 static const ALIGN_ASSET(2) char gFileSelWindow3DL[] = dgFileSelWindow3DL;
 
+#define dgFileSelNoFileToCopyJPNTex "__OTR__textures/title_static/gFileSelNoFileToCopyJPNTex"
+static const ALIGN_ASSET(2) char gFileSelNoFileToCopyJPNTex[] = dgFileSelNoFileToCopyJPNTex;
+
+#define dgFileSelNoFileToEraseJPNTex "__OTR__textures/title_static/gFileSelNoFileToEraseJPNTex"
+static const ALIGN_ASSET(2) char gFileSelNoFileToEraseJPNTex[] = dgFileSelNoFileToEraseJPNTex;
+
+#define dgFileSelNoEmptyFileJPNTex "__OTR__textures/title_static/gFileSelNoEmptyFileJPNTex"
+static const ALIGN_ASSET(2) char gFileSelNoEmptyFileJPNTex[] = dgFileSelNoEmptyFileJPNTex;
+
+#define dgFileSelFileEmptyJPNTex "__OTR__textures/title_static/gFileSelFileEmptyJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFileEmptyJPNTex[] = dgFileSelFileEmptyJPNTex;
+
+#define dgFileSelFileInUseJPNTex "__OTR__textures/title_static/gFileSelFileInUseJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFileInUseJPNTex[] = dgFileSelFileInUseJPNTex;
+
+#define dgFileSelWhichFile1JPNTex "__OTR__textures/title_static/gFileSelWhichFile1JPNTex"
+static const ALIGN_ASSET(2) char gFileSelWhichFile1JPNTex[] = dgFileSelWhichFile1JPNTex;
+
+#define dgFileSelCopyToWhichFileJPNTex "__OTR__textures/title_static/gFileSelCopyToWhichFileJPNTex"
+static const ALIGN_ASSET(2) char gFileSelCopyToWhichFileJPNTex[] = dgFileSelCopyToWhichFileJPNTex;
+
+#define dgFileSelAreYouSureJPNTex "__OTR__textures/title_static/gFileSelAreYouSureJPNTex"
+static const ALIGN_ASSET(2) char gFileSelAreYouSureJPNTex[] = dgFileSelAreYouSureJPNTex;
+
+#define dgFileSelFileCopiedJPNTex "__OTR__textures/title_static/gFileSelFileCopiedJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFileCopiedJPNTex[] = dgFileSelFileCopiedJPNTex;
+
+#define dgFileSelPleaseSelectAFileJPNTex "__OTR__textures/title_static/gFileSelPleaseSelectAFileJPNTex"
+static const ALIGN_ASSET(2) char gFileSelPleaseSelectAFileJPNTex[] = dgFileSelPleaseSelectAFileJPNTex;
+
+#define dgFileSelOpenThisFileJPNTex "__OTR__textures/title_static/gFileSelOpenThisFileJPNTex"
+static const ALIGN_ASSET(2) char gFileSelOpenThisFileJPNTex[] = dgFileSelOpenThisFileJPNTex;
+
+#define dgFileSelEraseWhichFileJPNTex "__OTR__textures/title_static/gFileSelEraseWhichFileJPNTex"
+static const ALIGN_ASSET(2) char gFileSelEraseWhichFileJPNTex[] = dgFileSelEraseWhichFileJPNTex;
+
+#define dgFileSelAreYouSure2JPNTex "__OTR__textures/title_static/gFileSelAreYouSure2JPNTex"
+static const ALIGN_ASSET(2) char gFileSelAreYouSure2JPNTex[] = dgFileSelAreYouSure2JPNTex;
+
+#define dgFileSelFileErasedJPNTex "__OTR__textures/title_static/gFileSelFileErasedJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFileErasedJPNTex[] = dgFileSelFileErasedJPNTex;
+
+#define dgFileSelOptionsJPNTex "__OTR__textures/title_static/gFileSelOptionsJPNTex"
+static const ALIGN_ASSET(2) char gFileSelOptionsJPNTex[] = dgFileSelOptionsJPNTex;
+
+#define dgFileSelNameJPNTex "__OTR__textures/title_static/gFileSelNameJPNTex"
+static const ALIGN_ASSET(2) char gFileSelNameJPNTex[] = dgFileSelNameJPNTex;
+
+#define dgFileSelSurroundJPNTex "__OTR__textures/title_static/gFileSelSurroundJPNTex"
+static const ALIGN_ASSET(2) char gFileSelSurroundJPNTex[] = dgFileSelSurroundJPNTex;
+
+#define dgFileSelHeadsetJPNTex "__OTR__textures/title_static/gFileSelHeadsetJPNTex"
+static const ALIGN_ASSET(2) char gFileSelHeadsetJPNTex[] = dgFileSelHeadsetJPNTex;
+
+#define dgFileSelMonoJPNTex "__OTR__textures/title_static/gFileSelMonoJPNTex"
+static const ALIGN_ASSET(2) char gFileSelMonoJPNTex[] = dgFileSelMonoJPNTex;
+
+#define dgFileSelStereoJPNTex "__OTR__textures/title_static/gFileSelStereoJPNTex"
+static const ALIGN_ASSET(2) char gFileSelStereoJPNTex[] = dgFileSelStereoJPNTex;
+
+#define dgFileSelLTargetingJPNTex "__OTR__textures/title_static/gFileSelLTargetingJPNTex"
+static const ALIGN_ASSET(2) char gFileSelLTargetingJPNTex[] = dgFileSelLTargetingJPNTex;
+
+#define dgFileSelSwitchJPNTex "__OTR__textures/title_static/gFileSelSwitchJPNTex"
+static const ALIGN_ASSET(2) char gFileSelSwitchJPNTex[] = dgFileSelSwitchJPNTex;
+
+#define dgFileSelHoldJPNTex "__OTR__textures/title_static/gFileSelHoldJPNTex"
+static const ALIGN_ASSET(2) char gFileSelHoldJPNTex[] = dgFileSelHoldJPNTex;
+
+#define dgFileSelControlsJPNTex "__OTR__textures/title_static/gFileSelControlsJPNTex"
+static const ALIGN_ASSET(2) char gFileSelControlsJPNTex[] = dgFileSelControlsJPNTex;
+
+#define dgFileSelCheckBrightnessJPNTex "__OTR__textures/title_static/gFileSelCheckBrightnessJPNTex"
+static const ALIGN_ASSET(2) char gFileSelCheckBrightnessJPNTex[] = dgFileSelCheckBrightnessJPNTex;
+
+#define dgFileSelCopyButtonJPNTex "__OTR__textures/title_static/gFileSelCopyButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelCopyButtonJPNTex[] = dgFileSelCopyButtonJPNTex;
+
+#define dgFileSelFile1ButtonJPNTex "__OTR__textures/title_static/gFileSelFile1ButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFile1ButtonJPNTex[] = dgFileSelFile1ButtonJPNTex;
+
+#define dgFileSelFile2ButtonJPNTex "__OTR__textures/title_static/gFileSelFile2ButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFile2ButtonJPNTex[] = dgFileSelFile2ButtonJPNTex;
+
+#define dgFileSelFile3ButtonJPNTex "__OTR__textures/title_static/gFileSelFile3ButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelFile3ButtonJPNTex[] = dgFileSelFile3ButtonJPNTex;
+
+#define dgFileSelYesButtonJPNTex "__OTR__textures/title_static/gFileSelYesButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelYesButtonJPNTex[] = dgFileSelYesButtonJPNTex;
+
+#define dgFileSelEraseButtonJPNTex "__OTR__textures/title_static/gFileSelEraseButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelEraseButtonJPNTex[] = dgFileSelEraseButtonJPNTex;
+
+#define dgFileSelOptionsButtonJPNTex "__OTR__textures/title_static/gFileSelOptionsButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelOptionsButtonJPNTex[] = dgFileSelOptionsButtonJPNTex;
+
+#define dgFileSelQuitButtonJPNTex "__OTR__textures/title_static/gFileSelQuitButtonJPNTex"
+static const ALIGN_ASSET(2) char gFileSelQuitButtonJPNTex[] = dgFileSelQuitButtonJPNTex;
+
+#define dgFileSelSaveXJPNTex "__OTR__textures/title_static/gFileSelSaveXJPNTex"
+static const ALIGN_ASSET(2) char gFileSelSaveXJPNTex[] = dgFileSelSaveXJPNTex;
+
+#define dgFileSelSaveXENGTex "__OTR__textures/title_static/gFileSelSaveXENGTex"
+static const ALIGN_ASSET(2) char gFileSelSaveXENGTex[] = dgFileSelSaveXENGTex;
+
+
 #endif // TEXTURES_TITLE_STATIC_H
diff --git a/soh/assets/xml/GC_MQ_D/audio/Audio.xml b/soh/assets/xml/GC_MQ_D/audio/Audio.xml
index 3cd3d42bab..e649d1f0a4 100644
--- a/soh/assets/xml/GC_MQ_D/audio/Audio.xml
+++ b/soh/assets/xml/GC_MQ_D/audio/Audio.xml
@@ -116,1402 +116,484 @@
 		
 		
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+				<!--<Sample Name="Ocarina_NoLooped">
 					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				</Sample>-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
index 28a2adc4c6..3895030566 100644
--- a/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x1CE60" RangeStart="0x110CC0" RangeEnd="0x110D00">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x8001CE60" RangeStart="0x110CC0" RangeEnd="0x110D00">
         <Mtx Name="gMtxClear" Offset="0x110CC0"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml b/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml
index 9925251147..4a071ef985 100644
--- a/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_MQ_D/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/audio/Audio.xml b/soh/assets/xml/GC_MQ_NTSC_J/audio/Audio.xml
new file mode 100644
index 0000000000..e9f385ca87
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12C240">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x101DA0" SequenceTableOffset="0x1021D0" SampleBankTableOffset="0x1028C0" SequenceFontTableOffset="0x102010">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_circle.xml b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..e6b4bba124
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEB768" RangeEnd="0xEC988">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEB768"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEBB68"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEBF68"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEC368"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEC768">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xEC988"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_triforce.xml b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..bbc709a4fd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEABF0" RangeEnd="0xEACC0">
+        <DList Name="sTransTriforceDL" Offset="0xEABF0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEAC20">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..9d2e12231a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEACC0" RangeEnd="0xEB650" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEACC0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEAE50"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEB650"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_NTSC_J/code/sys_matrix.xml
new file mode 100644
index 0000000000..1521be9f1e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010EE0" RangeStart="0xED3C0" RangeEnd="0xED400">
+        <Mtx Name="gMtxClear"  Offset="0xED3C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/misc/link_animetion.xml b/soh/assets/xml/GC_MQ_NTSC_J/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_keep.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_Bb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ahg.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_am.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ane.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ani.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_anubice.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_aob.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_b_heart.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bba.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdoor.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bg.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bigokuta.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bird.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bji.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bl.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_blkobj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bob.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_boj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombf.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombiwa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bowl.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_box.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_brob.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bubble.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bv.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bwall.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bxa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cne.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cob.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cow.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_crow.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cs.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_elevator.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_hsblock.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_lift.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_daiku.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ddan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekubaba.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekujr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekunuts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_6k.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_tre_lgt.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dh.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dnk.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dns.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodojr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodongo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dog.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_gerudo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_killer.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_du.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dy_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ec.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_crystal_light.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_doughnut.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_erupc.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_fire_ball.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_flash.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_lgt_shower.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_star_field.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_tw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ei.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fhg.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fire.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_firefly.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fish.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fu.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fz.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ge1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geff.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geldb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrow.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrowcase.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bean.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bombpouch.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boomerang.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bosskey.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle_letter.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bow.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bracelet.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_brokensword.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_clothes.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_coin.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_compass.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_egg.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_eye_lotion.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fire.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fish.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_frog.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ghost.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_glasses.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gloves.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_goddess.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_grass.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hammer.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_heart.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hearts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hookshot.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_insect.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_jewel.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_key.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_letter.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_liquid.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_longsword.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_m_arrow.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_magicpot.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_map.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_medal.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_melody.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_milk.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_mushroom.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_nuts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_pachinko.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_powder.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_prescription.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_purse.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_redead_mask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rupy.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_saw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_scale.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_seed.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_skj_mask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soldout.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soul.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_stick.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sutaru.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sword_1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gjyo_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gla.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gm.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd_magic.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gndd.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_god_lgt.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gol.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goma.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goroiwa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gs.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gt.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_door.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hakach_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hata.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_heavy_object.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hidan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hintnuts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hni.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_ganon.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_link_child.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_normal.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_zelda.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hs.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_human.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ice_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ik.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_im.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_in.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ingate.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_js.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_door.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_iron.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ka.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kanban.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kibako2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kingdodongo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_km1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kusa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kw1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kz.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_light_ring.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightbox.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightswitch.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_child.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mag.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mag.xml
new file mode 100644
index 0000000000..6e07fa2cdb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mag.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1B600"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1BE00"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1C600"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1CE00"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1D600"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1DE00"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1E600"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1EE00"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1F600"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1FE00"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x20200"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x20440"/>
+        <Texture Name="gTitleUraLogoTex" OutName="title_ura_logo" Format="rgba32" Width="40" Height="40" Offset="0x19A00"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1B300"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x20740"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mamenoki.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mastergolon.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokiri.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterzoora.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_md.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_medal.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_menkuri_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mir_ray.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mizu_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_dark.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flame.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flash.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_ice.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_oka.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_soul.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_wind.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mk.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mm.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1a.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2a.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_tex.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ms.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mu.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_niw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nwc.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ny.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA10.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA11.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA3.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA4.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA5.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA6.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA7.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA8.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA9.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB3.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB4.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE10.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE11.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE12.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1s.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE3.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4s.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE5.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE6.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE7.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE8.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE9.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE_anime.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1d_map.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1s.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_o_anime.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_okuta.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_opening_demo1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os_anime.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ossan.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ouke_haka.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_owl.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_peehat.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_composer.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_field.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_sisters.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_poh.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ps.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_pu_box.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rd.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_reeba.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_relay_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rl.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rs.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sa.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sd.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shop_dungen.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shopnuts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_siofuki.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sk2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skb.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_break.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoya.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoyab.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot02_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot03_object.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot04_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot05_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot06_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot07_object.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot08_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot09_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot11_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot12_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot15_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot16_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot17_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot18_obj.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ssh.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sst.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_st.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_stream.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_syokudai.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ta.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_timeblock.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tite.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tk.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toki_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_torch2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toryo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tp.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tr.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_trap.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_triforce_spot.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ts.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tsubo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tw.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_umajump.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vali.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vase.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vm.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wallmaster.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wf.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wood02.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_xc.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yabusame_point.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ydan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yukabyun.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zf.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zg.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime1.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime2.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl4.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zo.xml b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..c4e829f1c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x808636A0" RangeStart="0x980" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..bfb83104f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80865580" RangeStart="0x9A0" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D00" Static="On"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..d7348bd6c3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80867480" RangeStart="0x9B0" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D10" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..5e7096391e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80872840" RangeStart="0x1100" RangeEnd="0x259C">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1948"/>
+        <DList Name="sPlatformTopDL" Offset="0x19D0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A28"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A80"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2318"/>
+        
+        <Collision Name="sCol" Offset="0x24B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..0798a1de0d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80890950" RangeStart="0x1850" RangeEnd="0x19F8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1850">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1890"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..25396b7f90
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B84A0" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..d85ebbea2f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x808CD030" RangeStart="0xE3C8" RangeEnd="0x211D8">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE458" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF558" TlutOffset="0xF518" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10248" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1ACC0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C130" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CBC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D3C8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1ECA0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FD08" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20080" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF518" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE408" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE428" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF498" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112F8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A350" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A400" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C068" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x20000" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DE0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..d70769842c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F2E60" RangeStart="0x9F88" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010068"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..51ded47f4e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80920FE0" RangeStart="0xA380" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3F8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8B0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA380"/>
+        <DList Name="sHandTrailDList" Offset="0xA398"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7F8"/>
+        <DList Name="sShadowDList" Offset="0xACB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..3f6d5243c2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80981E50" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Bili.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..ed0ebdec35
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x809AD7C0" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..f4022c46ee
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x809C04E0" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..fea6529a61
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0CD70" RangeStart="0x11F8" RangeEnd="0x40F8">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11F8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21F8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29F8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32F8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3350"/>
+
+        <DList Name="gMantDL" Offset="0x33A8"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37F8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..7b3b037324
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A10FA0" RangeStart="0x368" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
+        <DList Name="sRoomStatuesDL" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Holl.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..9a6be61828
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80A3F5C0" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..95e53a79ba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80A6F300" RangeStart="0x12C8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E48"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EB8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Kanban.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..1c470beaad
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80A77170" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sda.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..ae9ea715fd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80ADBF70" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x1498">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14D8"/>
+        <DList Name="D_80AFA3F8" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ssh.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..8dd8e396db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80AE4D70" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_St.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..2b959296f4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x80AE7360" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sth.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..75dc7ea35d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80AE9FD0" RangeStart="0xE70" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
+        <DList Name="D_80B0A050" Offset="0x2A90"/>
+        <DList Name="D_80B0A3C0" Offset="0x2E00"/>
+        <Animation Name="sChildDanceAnim" Offset="0x35A0"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E34"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_End_Title.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..c9dbe33846
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B431C0" RangeStart="0x6E0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F00"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_File_Choose.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..6b0b7848de
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_File_Choose.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803650" RangeStart="0xEC40" RangeEnd="0xF320">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC40" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF60" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF060" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF260" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2A0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2E0" Static="Off">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..c5153a78e4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80B63EA0" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..e5a353ba36
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x80B656F0" RangeStart="0x600" RangeEnd="0x21E0">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB50"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x2010"/>
+        <DList Name="sModelDL" Offset="0x2038"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..053730eea8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x80B679F0" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..5f83c9b1a6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B80690" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..0eecf03879
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B815C0" RangeStart="0x750" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
+        <DList Name="sMaterialDL" Offset="0x1750"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..5af20cff63
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B83170" RangeStart="0x520" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x920">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xBA0"/>
+        <DList Name="sFrustumDL" Offset="0xC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..a79d02b74d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B83EF0" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..f55d57ca46
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B85660" RangeStart="0x430" RangeEnd="0x1678">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..d6cfddde80
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B86DB0" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..a39e5ccd1a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5CF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x84F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x88F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x98F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB0F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB4F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB8F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC0F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC2F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCB88" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3368" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B68" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4368" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5368" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA380" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xAB80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xAF80" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xBF80" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xCF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD380" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDB80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDD80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE580" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xE980" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x23D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2BD8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x33D8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x38D8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34D0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x6630" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6E30" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x7630" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7A30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x8230" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8A30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8C30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7DD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x85D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8DD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x91D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x95D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9DD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA5D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xADD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB5D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEFD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFFD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10FD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x117D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11FD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xAC10" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCC10" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xD010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD410" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xE010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xF010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF810" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x10810" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x11810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11C10" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x12410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x152B0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16AB0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x48B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x50B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x54B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x64B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8958" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9158" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1260" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2260" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9198" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9598" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA598" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x4A00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x5600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x6600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x7200" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x3560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x3960" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x4160" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x4960" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x5770" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x12E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1AE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1EE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x64E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x80E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x88E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF70" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..a2c20d6920
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x8230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x9230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xAD48" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12E8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6BD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x73D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7FD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x99D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA5D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1458" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3CC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x40C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x48C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x53F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x55F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x65F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x71F0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3098" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4298" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C98" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA290" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB290" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xBA90" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBE90" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC690" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73F0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1E60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2660" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3C60" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3348" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3548" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3748" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5548" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x818" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5700" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x58C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5EC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x60C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x70C0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1930" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1248" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x2048" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x25D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBB08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCF08" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2578" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1640" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6E00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7600" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xAA00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xADA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xFA8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x11A8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x21A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..ea300b96c3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA590" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD90" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB590" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD90" AddedByScript="true"/>
+        <Path Name="HAKAdanCH_scenePathList_000248" Offset="0x0248" NumPaths="2"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDF20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xE120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xF120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0x10120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x11120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x11920" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11D20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x12720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x13120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x13320" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x13720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x14B20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14F20" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x8F58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x9158" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x9358" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x9758" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0x9F58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA158" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAD58" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2958" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F58" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x14C0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1498" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C98" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1190" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2190" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xEA0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x16A0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x26A0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..502dcd839c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x189D0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18BD0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18DD0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x195D0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19DD0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x19FD0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x189B0" AddedByScript="true"/>
+        <Path Name="HIDAN_scenePathList_000440" Offset="0x0440" NumPaths="4"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62F0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x8730" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x8930" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x9930" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA130" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA530" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB530" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBD30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC130" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x9628" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x9828" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0xA028" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA828" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xAC28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBC28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCC28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCE28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDE28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xE028" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE428" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEC28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xF028" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF828" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1EC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x52F0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5AF0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x62F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x66F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x68F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6CF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7EE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x80E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x88E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8CE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x94E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x96E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9AE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9EE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x3990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x6390" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x6790" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1E48" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x2648" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x2A48" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11818" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12218" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13218" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13418" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14418" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15418" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15818" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17018" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17818" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C18" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2768" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA788" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAF88" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB388" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB788" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBB88" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC388" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x19F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1DF8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xD88" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6FE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x77E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7FE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x83E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x85E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8DE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x91E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x95E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9DE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA5E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA9E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8968" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x27F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2FF8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x33F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x37F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x39F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x3628" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x3A28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3E28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x4028" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x4478" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x4678" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4E78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x5678" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5E78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x6678" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6A78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x7278" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x7478" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7C78" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62E8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..f8b5d8b6c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13C30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x14430" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x15030" AddedByScript="true"/>
+        <Path Name="MIZUsin_scenePathList_000384" Offset="0x0384" NumPaths="2"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14C30"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x15830"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x105F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x115F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x125F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x135F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x145F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15428" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x59D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x61D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x69D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x71D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x79D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x81D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x91D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x99D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x2AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x32B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x3AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x42B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5488" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x37B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x47B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4FB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x57B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5FB8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x2820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x3020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x3820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x4820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x5020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x5820" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x3A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x4248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x4A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x5248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x5A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x6248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x6A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x7248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x7A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x8248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x9248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x5100" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x6900" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x8300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x9300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAB00" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D60" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5F98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x6198" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x6998" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x7198" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x7398" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x7598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x8598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD578" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x36D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x46D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x66D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x78A8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x3870" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x4070" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x4870" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x5070" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x2220" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x3220" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x4220" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x39C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x41C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x49C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x51C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6680" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C68" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x1330" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x2330" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2B30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x3330" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x62A8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x3040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x4040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x5040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x6040" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..9eb1ee61aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13E00" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x14600" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x14A00" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x15200" TlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BF8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x15600"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2DB8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x31B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x39B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x5600" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6E38" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7E38" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x8638" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8E38" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4888" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5888" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x6088" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6488" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6C88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2B30" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2F30" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3730" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x24A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x28A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x30A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x30D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3828" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38E0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x15B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1DB8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x21B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..c46e8ad279
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- These textures are used in room 0 with a TLUT at 0x11290 in room 0, and in room 3 with a TLUT at 0x008630 in room 3 (those two TLUTs are identical, but duplicated) -->
+        <Texture Name="gDCLavaFloor1Tex" OutName="lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6EB8" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8C38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0xA038" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xB038" TlutOffset="0x8630" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBC38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCC38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xD038" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD668" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8630" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7158" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7558" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9158" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6B50" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AB8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AB8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xCA8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x14A8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1CA8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x20A8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x49A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4DA0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x59A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x61A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x69A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x71A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x79A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x81A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x89A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x91A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D28" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D28" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2F10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3710" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4310" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4710" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4F10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5310" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7310" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1430" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5780" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6780" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xCC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1CC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x20C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xCC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1CC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x20C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xD28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2158" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3958" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4958" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..1c9bf84b45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="ganon_final_scenePathList_0001F4" Offset="0x01F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..7d5f5a1235
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="ganon_sonogo_scenePathList_000254" Offset="0x0254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..ba5542faa2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F580" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F780" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF80" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20380" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B80" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F380" AddedByScript="true"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19EE0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8E0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2B0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC80"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6B0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D080"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA50"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF90"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3E0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E790"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB40"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF70"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21380"/>
+
+        <Path Name="ganontika_scenePathList_000668" Offset="0x0668" NumPaths="6"/>
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7F48" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x8A10" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DE0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x46D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x66D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6ED8" TlutOffset="0x3EB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3EB8" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB500" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB900" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC100" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC900" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCB00" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCD00" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCF00" TlutOffset="0xB4E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD700" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD900" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEC58" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB4E0" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x34B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5CB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6CB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x74B8" TlutOffset="0x3498" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x3498" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x5488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7C88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7E88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x8688" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8E88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x9688" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA818" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x41B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x51B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5BB8" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5960" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6160" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6960" TlutOffset="0x5140" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8160" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8560" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9270" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA270" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5140" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4FB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5FB8" TlutOffset="0x4F98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x67B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x77B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7BB8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x89C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x99C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F98" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2630" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5380" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F80" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F80" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9180" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9980" TlutOffset="0x4360" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA180" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB6E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x4360" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..a441206b07
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="ganontikasonogo_scenePathList_000184" Offset="0x0184" NumPaths="2"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..f2d07a2881
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gerudoway_scenePathList_0002AC" Offset="0x02AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..7ad60c2a0f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFCC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0x100C0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x108C0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x10AC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10EC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF8A0" AddedByScript="true"/>
+        <Path Name="ice_doukutu_scenePathList_000304" Offset="0x0304" NumPaths="5"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x330"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF8C0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFAC0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4750" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5750" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD30" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2730" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AF8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x3208" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x3A08" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x28E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x30E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x38E0" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4650" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5650" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7478" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7878" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x54A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5CA0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x64A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7690" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x2928" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x3128" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x4848" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..166244e29b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18820" TlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19120" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19320" TlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Path Name="jyasinzou_scenePathList_00049C" Offset="0x049C" NumPaths="5"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18920"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18020"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD5D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDDD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x107E8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x5748" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x6748" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x7348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x8348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x23B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x33B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3BB0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x47B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4BB0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x53B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1FC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x23C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2BC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x33C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCBC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCFC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD7C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDBC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDFC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE7C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF3C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF7C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFFC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0x100C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x108C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10CC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x110C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x114C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x118C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11CC8" TlutOffset="0xCBA8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x124C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x134C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x138C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x140C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x148C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x150C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x158C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16808" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x17008" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCBA8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x10D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x18D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x28A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x30A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x38A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3CA8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x44A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4CA8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x50A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1CA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x24A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x28A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x30A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x34A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x44A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C98" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x39B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x45B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4DB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x59B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34F0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CF0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54E0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1660" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2660" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E60" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3260" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3660" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E60" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x1468" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1C68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x2468" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x2868" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x4438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4C38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x5438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x5838" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x6038" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x6438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6C38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x7438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7C38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x8038" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x8838" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3338" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4338" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54D0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF298" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF698" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10398" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10798" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC2F8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x4310" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4B10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4F10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6530" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7530" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A30" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E30" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8630" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/men.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..679436de0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/men.xml
@@ -0,0 +1,126 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x108C0" TlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10CC0" TlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF8C0"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x100C0"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4270" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5270" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6270" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A70" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7270" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A70" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4050" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5050" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C50" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6450" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7450" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x61E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x71E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x81E0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x99E0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x2418" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x3018" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x3818" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x4018" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x4818" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4778" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5378" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6378" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7378" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7778" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x36B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x42B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4AB8" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x52B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x72B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D30" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6530" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D30" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7530" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7630" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E30" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1AB0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x22B0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x26B0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x3070" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..377c7a6824
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB810" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB650"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA18"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA18"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x71C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x81C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x91C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x99C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xADC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBDC0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCDC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD9C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE9C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x109C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12F48" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13F48" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x14348" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xF98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x1798" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1F98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x2798" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3200" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4F28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DB0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131B0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x1920" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x2920" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x3120" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3C28" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6388" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7388" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x2700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x3700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x4700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5898" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x6098" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6898" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x7098" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7A98" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x988" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1BE0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x23E0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2BE0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x33E0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3DF8" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/bowling.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hut.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/impa.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kakariko.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/labo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/link_home.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/malon_stable.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tent.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/enrui.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/entra_n.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hiral_demo.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakariko3.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley_n.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_day.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_night.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_ruins.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_n.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_r.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/turibori.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/entra.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/souko.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot00.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot01.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot02.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot03.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot04.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot05.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot06.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot07.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot08.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot09.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot10.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot11.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot12.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot13.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot15.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot16.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot17.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot18.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot20.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/alley_shop.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/drag.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/face_shop.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/golon.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/kokiri_shop.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/night_shop.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/shop1.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/zoora.xml b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_field.xml b/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_ydan.xml b/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/text/message_data_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/text/message_data_static.xml
new file mode 100644
index 0000000000..94948fa8e7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF8FAC" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD0EC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x10130C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/backgrounds.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/boss_title_cards.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/do_action_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_24_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_dungeon_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_field_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_gameover_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_jpn_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_nes_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/item_name_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/kanji.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/map_48x85_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/map_grand_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/map_i_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/map_name_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/message_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/message_texture_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/nes_font_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/nes_font_static.xml
new file mode 100644
index 0000000000..f1b80ee045
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/nes_font_static.xml
@@ -0,0 +1,144 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/parameter_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/place_title_cards.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/skyboxes.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_J/textures/title_static.xml b/soh/assets/xml/GC_MQ_NTSC_J/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_J/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/audio/Audio.xml b/soh/assets/xml/GC_MQ_NTSC_U/audio/Audio.xml
new file mode 100644
index 0000000000..a9ee07d8ae
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12C220">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x101D80" SequenceTableOffset="0x1021B0" SampleBankTableOffset="0x1028A0" SequenceFontTableOffset="0x101FF0">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_circle.xml b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..a117b43ae2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEB748" RangeEnd="0xEC968">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEB748"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEBB48"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEBF48"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEC348"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEC748">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xEC968"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_triforce.xml b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..2353ae220d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEABD0" RangeEnd="0xEACA0">
+        <DList Name="sTransTriforceDL" Offset="0xEABD0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEAC00">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..f2de3afce0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEACA0" RangeEnd="0xEB630" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEACA0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEAE30"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEB630"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_NTSC_U/code/sys_matrix.xml
new file mode 100644
index 0000000000..7d1e905d37
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010EE0" RangeStart="0xED3A0" RangeEnd="0xED3E0">
+        <Mtx Name="gMtxClear"  Offset="0xED3A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/misc/link_animetion.xml b/soh/assets/xml/GC_MQ_NTSC_U/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_keep.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_Bb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ahg.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_am.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ane.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ani.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_anubice.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_aob.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_b_heart.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bba.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdoor.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bg.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bigokuta.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bird.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bji.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bl.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_blkobj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bob.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_boj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombf.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombiwa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bowl.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_box.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_brob.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bubble.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bv.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bwall.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bxa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cne.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cob.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cow.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_crow.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cs.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_elevator.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_hsblock.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_lift.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_daiku.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ddan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekubaba.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekujr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekunuts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_6k.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_tre_lgt.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dh.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dnk.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dns.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodojr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodongo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dog.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_gerudo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_killer.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_du.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dy_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ec.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_crystal_light.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_doughnut.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_erupc.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_fire_ball.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_flash.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_lgt_shower.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_star_field.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_tw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ei.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fhg.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fire.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_firefly.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fish.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fu.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fz.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ge1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geff.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geldb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrow.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrowcase.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bean.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bombpouch.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boomerang.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bosskey.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle_letter.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bow.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bracelet.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_brokensword.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_clothes.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_coin.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_compass.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_egg.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_eye_lotion.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fire.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fish.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_frog.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ghost.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_glasses.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gloves.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_goddess.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_grass.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hammer.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_heart.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hearts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hookshot.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_insect.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_jewel.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_key.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_letter.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_liquid.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_longsword.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_m_arrow.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_magicpot.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_map.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_medal.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_melody.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_milk.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_mushroom.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_nuts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_pachinko.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_powder.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_prescription.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_purse.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_redead_mask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rupy.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_saw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_scale.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_seed.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_skj_mask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soldout.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soul.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_stick.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sutaru.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sword_1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gjyo_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gla.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gm.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd_magic.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gndd.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_god_lgt.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gol.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goma.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goroiwa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gs.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gt.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_door.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hakach_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hata.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_heavy_object.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hidan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hintnuts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hni.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_ganon.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_link_child.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_normal.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_zelda.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hs.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_human.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ice_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ik.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_im.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_in.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ingate.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_js.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_door.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_iron.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ka.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kanban.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kibako2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kingdodongo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_km1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kusa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kw1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kz.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_light_ring.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightbox.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightswitch.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_child.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mag.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mag.xml
new file mode 100644
index 0000000000..dfe25df276
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mag.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleMasterQuestSubtitleTex" OutName="title_master_quest_subtitle" Format="rgba32" Width="128" Height="32" Offset="0x1A400"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x20000"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x20800"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x21000"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x21800"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x22000"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x22800"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x23000"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x23800"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x24000"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x24800"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x24C00"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x24E40"/>
+        <Texture Name="gTitleUraLogoTex" OutName="title_ura_logo" Format="rgba32" Width="40" Height="40" Offset="0x1E400"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x25140"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mamenoki.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mastergolon.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokiri.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterzoora.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_md.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_medal.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_menkuri_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mir_ray.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mizu_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_dark.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flame.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flash.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_ice.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_oka.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_soul.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_wind.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mk.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mm.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1a.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2a.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_tex.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ms.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mu.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_niw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nwc.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ny.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA10.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA11.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA3.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA4.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA5.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA6.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA7.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA8.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA9.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB3.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB4.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE10.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE11.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE12.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1s.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE3.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4s.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE5.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE6.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE7.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE8.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE9.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE_anime.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1d_map.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1s.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_o_anime.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_okuta.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_opening_demo1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os_anime.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ossan.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ouke_haka.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_owl.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_peehat.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_composer.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_field.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_sisters.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_poh.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ps.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_pu_box.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rd.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_reeba.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_relay_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rl.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rs.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sa.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sd.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shop_dungen.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shopnuts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_siofuki.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sk2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skb.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_break.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoya.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoyab.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot02_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot03_object.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot04_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot05_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot06_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot07_object.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot08_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot09_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot11_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot12_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot15_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot16_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot17_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot18_obj.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ssh.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sst.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_st.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_stream.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_syokudai.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ta.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_timeblock.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tite.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tk.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toki_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_torch2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toryo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tp.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tr.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_trap.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_triforce_spot.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ts.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tsubo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tw.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_umajump.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vali.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vase.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vm.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wallmaster.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wf.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wood02.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_xc.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yabusame_point.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ydan_objects.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yukabyun.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zf.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zg.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime1.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime2.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl4.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zo.xml b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..dce4da772b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80863680" RangeStart="0x980" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..76d82579ea
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80865560" RangeStart="0x9A0" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D00" Static="On"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..8bee2c8ddd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80867460" RangeStart="0x9B0" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D10" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..f7795146c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80872820" RangeStart="0x1100" RangeEnd="0x259C">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1948"/>
+        <DList Name="sPlatformTopDL" Offset="0x19D0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A28"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A80"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2318"/>
+        
+        <Collision Name="sCol" Offset="0x24B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..84910e5f05
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80890930" RangeStart="0x1850" RangeEnd="0x19F8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1850">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1890"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..a19dbed0fe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B8480" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..4ecda60209
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x808CD010" RangeStart="0xE3C8" RangeEnd="0x211D8">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE458" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF558" TlutOffset="0xF518" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10248" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1ACC0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C130" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CBC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D3C8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1ECA0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FD08" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20080" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF518" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE408" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE428" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF498" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112F8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A350" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A400" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C068" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x20000" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DE0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..89e10b5b4b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F2E40" RangeStart="0x9F88" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010068"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..14195ccf84
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80920FC0" RangeStart="0xA380" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3F8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8B0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA380"/>
+        <DList Name="sHandTrailDList" Offset="0xA398"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7F8"/>
+        <DList Name="sShadowDList" Offset="0xACB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..b286b96124
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80981E30" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Bili.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..f5d5f17089
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x809AD7A0" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..9dd01857a3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x809C04C0" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..b69dbff0ec
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0CD50" RangeStart="0x11F8" RangeEnd="0x40F8">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11F8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21F8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29F8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32F8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3350"/>
+
+        <DList Name="gMantDL" Offset="0x33A8"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37F8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..37953cff5e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A10F80" RangeStart="0x368" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
+        <DList Name="sRoomStatuesDL" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Holl.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..193e86796a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80A3F5A0" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..64d24dd76a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80A6F2E0" RangeStart="0x12C8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E48"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EB8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Kanban.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..20230c5ce0
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80A77150" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sda.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..ece03e8ff5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80AD9D10" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x1498">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14D8"/>
+        <DList Name="D_80AFA3F8" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ssh.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..5d05b4faf8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80AE2B10" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_St.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..4b87f9a6f2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x80AE5100" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sth.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..263813cce5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80AE7D70" RangeStart="0xE70" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
+        <DList Name="D_80B0A050" Offset="0x2A90"/>
+        <DList Name="D_80B0A3C0" Offset="0x2E00"/>
+        <Animation Name="sChildDanceAnim" Offset="0x35A0"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E34"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_End_Title.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..539e97f482
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B40F60" RangeStart="0x6E0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F00"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_File_Choose.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..5fa7563685
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_File_Choose.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803630" RangeStart="0xEC40" RangeEnd="0xF320">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC40" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF60" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF060" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF260" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2A0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2E0" Static="Off">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..8e77b2ead8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80B61C40" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..d7b3b32933
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x80B63490" RangeStart="0x600" RangeEnd="0x21E0">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB50"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x2010"/>
+        <DList Name="sModelDL" Offset="0x2038"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..0229a15875
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x80B65790" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..556c166a9f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B7E430" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..fab89b3aa5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B7F360" RangeStart="0x750" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
+        <DList Name="sMaterialDL" Offset="0x1750"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..3d813da57e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B80F10" RangeStart="0x520" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x920">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xBA0"/>
+        <DList Name="sFrustumDL" Offset="0xC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..88eb306531
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B81C90" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..7604e81ff6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B83400" RangeStart="0x430" RangeEnd="0x1678">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..7fa56605f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B84B50" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..a39e5ccd1a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5CF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x84F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x88F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x98F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB0F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB4F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB8F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC0F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC2F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCB88" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3368" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B68" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4368" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5368" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA380" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xAB80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xAF80" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xBF80" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xCF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD380" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDB80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDD80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE580" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xE980" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x23D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2BD8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x33D8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x38D8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34D0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x6630" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6E30" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x7630" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7A30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x8230" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8A30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8C30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7DD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x85D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8DD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x91D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x95D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9DD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA5D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xADD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB5D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDDD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEFD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFFD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10FD8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x117D8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11FD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xAC10" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCC10" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xD010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD410" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xE010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xF010" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF810" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x10810" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x11810" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11C10" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x12410" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x152B0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15AB0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16AB0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x48B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x50B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x54B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x64B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8958" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9158" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1260" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2260" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9198" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9598" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA598" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x4A00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x5600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x6600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x7200" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x3560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x3960" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x4160" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x4960" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x5770" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x12E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1AE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1EE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x64E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x80E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x88E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF70" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..a2c20d6920
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x8230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x9230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA230" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xAD48" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12E8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6BD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x73D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7FD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x99D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA5D8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1458" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3CC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x40C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x48C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x53F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x55F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x65F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x71F0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3098" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4298" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C98" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA290" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB290" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xBA90" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBE90" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC690" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73F0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1E60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2660" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3C60" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3348" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3548" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3748" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5548" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x818" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5700" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x58C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5EC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x60C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x70C0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1930" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1248" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x2048" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x25D8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBB08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCF08" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1578" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2578" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1640" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6E00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7600" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xAA00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xADA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xFA8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x11A8" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x21A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..ea300b96c3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA590" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD90" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB590" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD90" AddedByScript="true"/>
+        <Path Name="HAKAdanCH_scenePathList_000248" Offset="0x0248" NumPaths="2"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDF20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xE120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xF120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0x10120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x11120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x11920" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11D20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x12720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x13120" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x13320" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x13720" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13F20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x14B20" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14F20" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x8F58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x9158" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x9358" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x9758" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0x9F58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA158" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAD58" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2958" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D58" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F58" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x14C0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1498" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C98" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1190" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2190" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xEA0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x16A0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x26A0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..502dcd839c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x189D0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18BD0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18DD0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x195D0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19DD0" TlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x19FD0" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x189B0" AddedByScript="true"/>
+        <Path Name="HIDAN_scenePathList_000440" Offset="0x0440" NumPaths="4"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62F0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x8730" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x8930" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x9930" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA130" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA530" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB530" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBD30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC130" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x9628" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x9828" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0xA028" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA828" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xAC28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBC28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCC28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCE28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDE28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xE028" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE428" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEC28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xF028" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF828" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1EC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x52F0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5AF0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x62F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x66F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x68F0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6CF0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7EE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x80E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x88E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8CE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x94E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x96E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9AE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9EE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x3990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x6390" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x6790" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1E48" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x2648" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x2A48" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11818" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12218" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13218" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13418" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14418" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15418" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15818" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C18" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17018" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17818" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C18" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2768" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA788" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAF88" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB388" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB788" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBB88" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC388" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x19F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1DF8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xD88" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6FE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x77E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7FE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x83E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x85E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8DE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x91E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x95E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9DE0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA5E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA9E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7968" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8168" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8968" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x27F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2FF8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x33F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x37F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x39F8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x3628" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x3A28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3E28" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x4028" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x4478" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x4678" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4E78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x5678" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5E78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x6678" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6A78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x7278" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x7478" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7C78" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52E8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AE8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62E8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x189B0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18990" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..f8b5d8b6c1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13C30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x14430" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x15030" AddedByScript="true"/>
+        <Path Name="MIZUsin_scenePathList_000384" Offset="0x0384" NumPaths="2"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14C30"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x15830"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF5F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFDF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x105F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x115F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x125F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x135F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13DF8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x145F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15428" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x59D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x61D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x69D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x71D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x79D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x81D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x91D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x99D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x2AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x32B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x3AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x42B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4AB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5488" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x37B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x47B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4FB8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x57B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5FB8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x2820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x3020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x3820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x4820" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x5020" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x5820" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x3A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x4248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x4A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x5248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x5A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x6248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x6A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x7248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x7A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x8248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x9248" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x5100" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x6900" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x8300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x9300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9B00" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA300" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAB00" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4560" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D60" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5F98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x6198" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x6998" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x7198" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x7398" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x7598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x8598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC598" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD578" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x36D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x46D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x66D8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6ED8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x78A8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x3870" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x4070" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x4870" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x5070" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x2220" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x3220" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x4220" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x39C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x41C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x49C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x51C8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5680" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E80" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6680" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C68" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6468" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C68" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x1330" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x2330" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2B30" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x3330" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x62A8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7AA8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x3040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x4040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x5040" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5840" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x6040" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..9eb1ee61aa
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13E00" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x14600" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x14A00" TlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x15200" TlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BF8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x15600"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2DB8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x31B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x39B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x5600" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6E38" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7E38" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x8638" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8E38" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4888" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5888" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x6088" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6488" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6C88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2B30" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2F30" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3730" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x24A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x28A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x30A8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x30D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139F0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3828" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38E0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x15B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1DB8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x21B8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BF8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..c46e8ad279
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- These textures are used in room 0 with a TLUT at 0x11290 in room 0, and in room 3 with a TLUT at 0x008630 in room 3 (those two TLUTs are identical, but duplicated) -->
+        <Texture Name="gDCLavaFloor1Tex" OutName="lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
+
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F70" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9770" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6EB8" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8C38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0xA038" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xB038" TlutOffset="0x8630" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB838" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBC38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC438" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCC38" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xD038" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD668" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8630" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7158" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7558" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8D58" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9158" TlutOffset="0x6B50" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6B50" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AB8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AB8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xCA8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x14A8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1CA8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x20A8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x49A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4DA0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x59A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x61A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x69A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x71A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x79A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x81A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x89A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x91A0" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D28" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D28" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA928" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB128" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2F10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3710" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4310" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4710" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4F10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5310" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7310" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7B10" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1430" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5780" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6780" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7780" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8380" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xCC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1CC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x20C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xCC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1CC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x20C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xD28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1D28" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2528" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2158" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3958" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4958" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5158" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..1c9bf84b45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="ganon_final_scenePathList_0001F4" Offset="0x01F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..7d5f5a1235
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="ganon_sonogo_scenePathList_000254" Offset="0x0254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..ba5542faa2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F580" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F780" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF80" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20380" TlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B80" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F380" AddedByScript="true"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19EE0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8E0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2B0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC80"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6B0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D080"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA50"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF90"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3E0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E790"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB40"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF70"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21380"/>
+
+        <Path Name="ganontika_scenePathList_000668" Offset="0x0668" NumPaths="6"/>
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7F48" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x8A10" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181E0" TlutOffset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199E0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DE0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x46D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5ED8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x66D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6ED8" TlutOffset="0x3EB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3EB8" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB500" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB900" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC100" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC900" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCB00" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCD00" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCF00" TlutOffset="0xB4E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD700" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD900" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEC58" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB4E0" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x34B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5CB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6CB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x74B8" TlutOffset="0x3498" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x3498" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x5488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7C88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7E88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x8688" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8E88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x9688" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA818" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x41B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x51B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5BB8" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5960" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6160" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6960" TlutOffset="0x5140" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8160" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8560" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9270" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA270" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5140" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4FB8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5FB8" TlutOffset="0x4F98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x67B8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x77B8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7BB8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x89C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x99C8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F98" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2630" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E18" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E18" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5380" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7780" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F80" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F80" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9180" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9980" TlutOffset="0x4360" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA180" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB6E0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x4360" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F380" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..a441206b07
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="ganontikasonogo_scenePathList_000184" Offset="0x0184" NumPaths="2"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..f2d07a2881
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gerudoway_scenePathList_0002AC" Offset="0x02AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..7ad60c2a0f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFCC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0x100C0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x108C0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x10AC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10EC0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF8A0" AddedByScript="true"/>
+        <Path Name="ice_doukutu_scenePathList_000304" Offset="0x0304" NumPaths="5"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x330"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF8C0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFAC0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4750" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5750" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F50" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD30" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2730" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AF8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x3208" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x3A08" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x28E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x30E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x38E0" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4650" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5650" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6648" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7478" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7878" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x54A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5CA0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x64A0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7690" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x2928" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x3128" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x4848" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..166244e29b
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18820" TlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19120" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19320" TlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Path Name="jyasinzou_scenePathList_00049C" Offset="0x049C" NumPaths="5"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18920"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18020"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD5D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDDD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF1D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF9D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x107E8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x5748" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x6748" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x7348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x8348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x23B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x33B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3BB0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x47B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4BB0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x53B0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1FC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x23C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2BC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x33C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCBC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCFC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD7C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDBC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDFC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE7C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF3C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF7C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFFC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0x100C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x108C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10CC8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x110C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x114C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x118C8" TlutOffset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11CC8" TlutOffset="0xCBA8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x124C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x134C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x138C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x140C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x148C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x150C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x158C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16808" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x17008" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC9B0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCBA8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x10D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x18D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x28A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x30A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x38A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3CA8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x44A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4CA8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x50A8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1CA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x24A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x28A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x30A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x34A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x44A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C98" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x39B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x45B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4DB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x59B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34F0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CF0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48F0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54E0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1660" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2660" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E60" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3260" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3660" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E60" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x1468" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1C68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x2468" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x2868" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x4438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4C38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x5438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x5838" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x6038" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x6438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6C38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x7438" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7C38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x8038" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x8838" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3338" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4338" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B38" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54D0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE698" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE98" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF298" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF698" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10398" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10798" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F98" TlutOffset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14798" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F98" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15398" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80C8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CC8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC2F8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x4310" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4B10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4F10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17BE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6130" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6530" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7530" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7930" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A30" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E30" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17FE0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8630" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17DE0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/men.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..679436de0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/men.xml
@@ -0,0 +1,126 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x108C0" TlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10CC0" TlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF8C0"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x100C0"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4270" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5270" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6270" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A70" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7270" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A70" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A70" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4050" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5050" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5850" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C50" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6450" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7450" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x61E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x71E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x81E0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x99E0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x2418" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x3018" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x3818" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x4018" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x4818" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4778" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5378" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6378" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7378" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7778" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x36B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x42B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4AB8" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x52B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x72B8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7AB8" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D30" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6530" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D30" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7530" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7630" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E30" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1AB0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x22B0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x26B0" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x3070" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C48" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5448" ExternalTlut="men_scene" ExternalTlutOffset="0xF6C0" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..377c7a6824
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB810" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB650"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA18"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA18"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x71C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x81C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x91C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x99C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xADC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBDC0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCDC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD5C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD9C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE9C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF1C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x109C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12F48" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13F48" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x14348" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xF98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x1798" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1F98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x2798" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3200" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3D08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4508" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4F28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8C0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DB0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131B0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x1920" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x2920" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x3120" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3C28" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6388" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7388" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7788" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B88" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x2700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x3700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3F00" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x4700" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5898" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x6098" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6898" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6C98" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x7098" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7A98" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x988" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1BE0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x23E0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2BE0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x33E0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3DF8" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB810" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/bowling.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hut.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/impa.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kakariko.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/labo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/link_home.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/malon_stable.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tent.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/enrui.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/entra_n.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hiral_demo.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakariko3.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley_n.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_day.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_night.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_ruins.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_n.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_r.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/turibori.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/entra.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/souko.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot00.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot01.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot02.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot03.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot04.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot05.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot06.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot07.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot08.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot09.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot10.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot11.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot12.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot13.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot15.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot16.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot17.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot18.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot20.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/alley_shop.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/drag.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/face_shop.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/golon.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/kokiri_shop.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/night_shop.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/shop1.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/zoora.xml b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_field.xml b/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_ydan.xml b/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/text/message_data_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/text/message_data_static.xml
new file mode 100644
index 0000000000..ff37dac658
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF8F8C" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD0CC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x1012EC"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/backgrounds.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/boss_title_cards.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/do_action_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_24_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_dungeon_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_field_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_gameover_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_jpn_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_nes_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/item_name_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/kanji.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/map_48x85_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/map_grand_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/map_i_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/map_name_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/message_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/message_texture_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/nes_font_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/nes_font_static.xml
new file mode 100644
index 0000000000..b01646cb54
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/nes_font_static.xml
@@ -0,0 +1,145 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgCharABControlPadTex" OutName="msg_char_ab_control_pad" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/parameter_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/place_title_cards.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/skyboxes.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_NTSC_U/textures/title_static.xml b/soh/assets/xml/GC_MQ_NTSC_U/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/GC_MQ_NTSC_U/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_PAL_F/audio/Audio.xml b/soh/assets/xml/GC_MQ_PAL_F/audio/Audio.xml
index 91521bf945..f2155154ba 100644
--- a/soh/assets/xml/GC_MQ_PAL_F/audio/Audio.xml
+++ b/soh/assets/xml/GC_MQ_PAL_F/audio/Audio.xml
@@ -114,1402 +114,483 @@
 				<Sequence Name="109_Cutscene_Effects"/>
 			</Sequences>
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 			
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
index 52e78bcb11..580fead4ae 100644
--- a/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x10F00" RangeStart="0xEAD00" RangeEnd="0xEAD40">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010F00" RangeStart="0xEAD00" RangeEnd="0xEAD40">
         <Mtx Name="gMtxClear" Offset="0xEAD00"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/gameplay_keep.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/gameplay_keep.xml
index 5ffc52f655..8824228847 100644
--- a/soh/assets/xml/GC_MQ_PAL_F/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_MQ_PAL_F/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/assets/xml/GC_NMQ_D/audio/Audio.xml b/soh/assets/xml/GC_NMQ_D/audio/Audio.xml
index 47bed74199..347ac75232 100644
--- a/soh/assets/xml/GC_NMQ_D/audio/Audio.xml
+++ b/soh/assets/xml/GC_NMQ_D/audio/Audio.xml
@@ -116,1402 +116,483 @@
 		
 		
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
index 3811322d38..99b5dbafd4 100644
--- a/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x1CE60" RangeStart="0x110CE0" RangeEnd="0x110D20">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x8001CE60" RangeStart="0x110CE0" RangeEnd="0x110D20">
         <Mtx Name="gMtxClear" Offset="0x110CE0"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml
index 5ffc52f655..905f5d2724 100644
--- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+         <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/audio/Audio.xml b/soh/assets/xml/GC_NMQ_NTSC_J/audio/Audio.xml
new file mode 100644
index 0000000000..4ed6c08232
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12C260">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x101DC0" SequenceTableOffset="0x1021F0" SampleBankTableOffset="0x1028E0" SequenceFontTableOffset="0x102030">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..0c552b70e6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEB788" RangeEnd="0xEC9A8">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEB788"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEBB88"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEBF88"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEC388"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEC788">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xEC9A8"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..ee0922d815
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEAC10" RangeEnd="0xEACE0">
+        <DList Name="sTransTriforceDL" Offset="0xEAC10"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEAC40">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..f45e585361
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEACE0" RangeEnd="0xEB670" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEACE0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEAE70"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEB670"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_NTSC_J/code/sys_matrix.xml
new file mode 100644
index 0000000000..9088e3a63f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010EE0" RangeStart="0xED3E0" RangeEnd="0xED420">
+        <Mtx Name="gMtxClear"  Offset="0xED3E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/misc/link_animetion.xml b/soh/assets/xml/GC_NMQ_NTSC_J/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_Bb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ahg.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_am.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ane.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_anubice.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_aob.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_b_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bba.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdoor.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bg.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bigokuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bird.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bji.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bl.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_blkobj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bob.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_boj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombf.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bowl.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_box.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_brob.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bubble.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bv.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bwall.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bxa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cne.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cob.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cow.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_crow.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_elevator.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_hsblock.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_lift.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_daiku.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ddan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekubaba.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekujr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekunuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_6k.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_tre_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dh.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dnk.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dns.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodojr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dog.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_killer.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_du.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dy_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ec.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_crystal_light.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_doughnut.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_erupc.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_fire_ball.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_lgt_shower.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_star_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ei.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fhg.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_firefly.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fu.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fz.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ge1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geff.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geldb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrowcase.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bean.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bombpouch.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boomerang.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bosskey.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bow.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bracelet.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_brokensword.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_clothes.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_coin.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_compass.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_egg.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_eye_lotion.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_frog.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ghost.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_glasses.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gloves.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_goddess.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_grass.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hammer.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hearts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hookshot.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_insect.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_jewel.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_key.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_liquid.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_longsword.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_m_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_magicpot.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_map.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_melody.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_milk.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_mushroom.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_nuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_pachinko.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_powder.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_prescription.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_purse.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_redead_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rupy.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_saw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_scale.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_seed.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_skj_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soldout.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_stick.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sutaru.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sword_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gjyo_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gla.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gm.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd_magic.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gndd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_god_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gol.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goma.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goroiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gt.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_door.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hakach_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hata.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_heavy_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hintnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hni.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_normal.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_zelda.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_human.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ice_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ik.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_im.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_in.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ingate.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_js.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_door.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_iron.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ka.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kibako2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kingdodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_km1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kusa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kw1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kz.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_light_ring.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightbox.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightswitch.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mag.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mag.xml
new file mode 100644
index 0000000000..063d801a3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mag.xml
@@ -0,0 +1,20 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19D00"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A500"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1AD00"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1B500"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1BD00"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1C500"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1CD00"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1D500"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1DD00"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1E500"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1E900"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1EB40"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mamenoki.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mastergolon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokiri.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterzoora.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_md.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_menkuri_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mir_ray.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mizu_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_dark.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flame.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_ice.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_oka.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_wind.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mk.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mm.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1a.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2a.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_tex.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ms.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mu.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_niw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nwc.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ny.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA10.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA11.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA5.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA6.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA7.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA8.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA9.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE10.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE11.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE12.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1s.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4s.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE5.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE6.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE7.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE8.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE9.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1s.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_o_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_okuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_opening_demo1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ossan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ouke_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_owl.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_peehat.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_composer.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_sisters.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_poh.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ps.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_pu_box.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_reeba.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_relay_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rl.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shop_dungen.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shopnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_siofuki.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sk2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skb.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_break.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoya.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoyab.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot02_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot03_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot04_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot05_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot06_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot07_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot08_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot09_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot11_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot12_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot15_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot16_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot17_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot18_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sst.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_st.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_stream.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_syokudai.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ta.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_timeblock.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tite.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tk.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toki_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_torch2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toryo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tp.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tr.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_trap.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_triforce_spot.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ts.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tsubo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_umajump.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vali.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vase.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vm.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wallmaster.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wf.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wood02.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_xc.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yabusame_point.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ydan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yukabyun.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zf.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zg.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..ef34ff91e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80863720" RangeStart="0x980" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..13bb1b610e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80865600" RangeStart="0x9A0" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D00" Static="On"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..6f985a0b1e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80867500" RangeStart="0x9B0" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D10" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..c3c809065a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x808728C0" RangeStart="0x1100" RangeEnd="0x259C">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1948"/>
+        <DList Name="sPlatformTopDL" Offset="0x19D0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A28"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A80"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2318"/>
+        
+        <Collision Name="sCol" Offset="0x24B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..3106fdab5e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x808909D0" RangeStart="0x1850" RangeEnd="0x19F8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1850">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1890"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..ddc03690ed
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B8520" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..72b81e798d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x808CD0B0" RangeStart="0xE3C8" RangeEnd="0x211D8">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE458" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF558" TlutOffset="0xF518" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10248" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1ACC0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C130" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CBC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D3C8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1ECA0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FD08" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20080" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF518" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE408" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE428" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF498" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112F8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A350" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A400" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C068" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x20000" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DE0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..802a42bd25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F2EE0" RangeStart="0x9F88" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010068"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..23093c9f14
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80921060" RangeStart="0xA380" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3F8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8B0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA380"/>
+        <DList Name="sHandTrailDList" Offset="0xA398"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7F8"/>
+        <DList Name="sShadowDList" Offset="0xACB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..e9d9ba2228
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80981ED0" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Bili.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..5db330f6ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x809AD840" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..ddbf1bb91d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x809C0560" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..cab7d3ce43
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0CDF0" RangeStart="0x11F8" RangeEnd="0x40F8">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11F8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21F8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29F8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32F8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3350"/>
+
+        <DList Name="gMantDL" Offset="0x33A8"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37F8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..a4cea2ff90
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A11020" RangeStart="0x368" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
+        <DList Name="sRoomStatuesDL" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Holl.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..0a02bddb1c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80A3F640" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..de46f6ed32
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80A6F380" RangeStart="0x12C8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E48"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EB8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..e181840b80
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80A771F0" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sda.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..cd24cb8d7b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80ADBF10" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x1498">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14D8"/>
+        <DList Name="D_80AFA3F8" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..2e419c8c4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80AE4D10" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_St.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..fecbf6f1ed
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x80AE7300" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sth.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..22f1e683ec
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80AE9F70" RangeStart="0xE70" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
+        <DList Name="D_80B0A050" Offset="0x2A90"/>
+        <DList Name="D_80B0A3C0" Offset="0x2E00"/>
+        <Animation Name="sChildDanceAnim" Offset="0x35A0"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E34"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_End_Title.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..7b083bdd20
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B43160" RangeStart="0x6E0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F00"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_File_Choose.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..6b0b7848de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_File_Choose.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803650" RangeStart="0xEC40" RangeEnd="0xF320">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC40" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF60" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF060" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF260" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2A0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2E0" Static="Off">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..a037bbdf6a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80B63E40" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..1f42916e2a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x80B65690" RangeStart="0x600" RangeEnd="0x21E0">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB50"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x2010"/>
+        <DList Name="sModelDL" Offset="0x2038"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..19bdd2f32e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x80B67990" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..ff49072ab3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B80630" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..8e0c6beaca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B81560" RangeStart="0x750" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
+        <DList Name="sMaterialDL" Offset="0x1750"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..c35e96db14
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B83110" RangeStart="0x520" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x920">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xBA0"/>
+        <DList Name="sFrustumDL" Offset="0xC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..a56c505ad5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B83E90" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..7d0f5ddc5d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B85600" RangeStart="0x430" RangeEnd="0x1678">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..c7513e94c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B86D50" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..373f360303
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5CC8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x74C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7CC8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x84C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x88C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x98C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA0C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB4C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB8C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC2C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCB58" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5348" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xABA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xAFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xBFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xCFA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDBA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDDA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE5A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xE9A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF1A0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2BE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x33E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x37E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x38E8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34C0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x6620" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6E20" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x7620" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x8220" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8C20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x8560" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x9160" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x9560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10F68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x11768" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11F68" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xABF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCBF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xCFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD3F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xDFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xEFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x117F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11BF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x123F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15290" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16A90" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x4888" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x5088" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x5488" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9128" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1250" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A50" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2250" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8118" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9118" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9518" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D18" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA518" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x55F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x65F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x71F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x8298" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x3530" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x3930" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x4930" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4D30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x64B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CB8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x80B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x88B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..0f1bc3b285
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFBF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x109F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10DF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7D0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF7F0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xF9F0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/men.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/bowling.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hut.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/impa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kakariko.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/labo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/link_home.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/malon_stable.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tent.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/enrui.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/entra_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hiral_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakariko3.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_day.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_night.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_ruins.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_r.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/turibori.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/entra.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/souko.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot00.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot01.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot02.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot03.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot04.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot05.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot06.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot07.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot08.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot09.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot10.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot11.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot12.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot13.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot15.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot16.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot17.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot18.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot20.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/alley_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/drag.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/face_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/golon.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/kokiri_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/night_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/shop1.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/zoora.xml b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/text/message_data_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/text/message_data_static.xml
new file mode 100644
index 0000000000..fc181170ac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF8FCC" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD10C"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x10132C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/backgrounds.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/boss_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_24_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_dungeon_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_field_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_gameover_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_jpn_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_nes_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/item_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/kanji.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_48x85_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_grand_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_i_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_texture_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/nes_font_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/nes_font_static.xml
new file mode 100644
index 0000000000..f1b80ee045
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/nes_font_static.xml
@@ -0,0 +1,144 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/place_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/skyboxes.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J/textures/title_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/audio/Audio.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/audio/Audio.xml
new file mode 100644
index 0000000000..e9f385ca87
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12C240">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x101DA0" SequenceTableOffset="0x1021D0" SampleBankTableOffset="0x1028C0" SequenceFontTableOffset="0x102010">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..e6b4bba124
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEB768" RangeEnd="0xEC988">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEB768"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEBB68"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEBF68"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEC368"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEC768">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xEC988"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..bbc709a4fd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEABF0" RangeEnd="0xEACC0">
+        <DList Name="sTransTriforceDL" Offset="0xEABF0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEAC20">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..9d2e12231a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEACC0" RangeEnd="0xEB650" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEACC0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEAE50"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEB650"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/sys_matrix.xml
new file mode 100644
index 0000000000..1521be9f1e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010EE0" RangeStart="0xED3C0" RangeEnd="0xED400">
+        <Mtx Name="gMtxClear"  Offset="0xED3C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/misc/link_animetion.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_Bb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ahg.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_am.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ane.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_anubice.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_aob.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_b_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bba.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdoor.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bg.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bigokuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bird.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bji.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bl.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_blkobj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bob.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_boj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombf.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bowl.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_box.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_brob.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bubble.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bv.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bwall.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bxa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cne.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cob.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cow.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_crow.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_elevator.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_hsblock.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_lift.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_daiku.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ddan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekubaba.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekujr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekunuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_6k.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_tre_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dh.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dnk.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dns.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodojr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dog.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_killer.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_du.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dy_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ec.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_crystal_light.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_doughnut.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_erupc.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_fire_ball.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_lgt_shower.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_star_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ei.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fhg.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_firefly.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fu.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fz.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ge1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geff.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geldb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrowcase.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bean.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bombpouch.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boomerang.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bosskey.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bow.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bracelet.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_brokensword.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_clothes.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_coin.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_compass.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_egg.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_eye_lotion.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_frog.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ghost.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_glasses.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gloves.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_goddess.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_grass.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hammer.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hearts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hookshot.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_insect.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_jewel.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_key.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_liquid.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_longsword.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_m_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_magicpot.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_map.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_melody.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_milk.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_mushroom.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_nuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_pachinko.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_powder.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_prescription.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_purse.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_redead_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rupy.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_saw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_scale.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_seed.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_skj_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soldout.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_stick.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sutaru.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sword_1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gjyo_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gla.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gm.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd_magic.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gndd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_god_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gol.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goma.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goroiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gt.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_door.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hakach_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hata.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_heavy_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hintnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hni.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_normal.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_zelda.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_human.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ice_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ik.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_im.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_in.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ingate.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_js.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_door.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_iron.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ka.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kibako2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kingdodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_km1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kusa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kw1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kz.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_light_ring.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightbox.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightswitch.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mag.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mag.xml
new file mode 100644
index 0000000000..6276dee1da
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mag.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982004JpnTex" OutName="title_copyright_19982004_jpn" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982004EngTex" OutName="title_copyright_19982004_eng" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A700"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AF00"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1B700"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1BF00"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1C700"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1CF00"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1D700"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1DF00"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1E700"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1EF00"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1F300"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F540"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1F840"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mamenoki.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mastergolon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokiri.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterzoora.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_md.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_menkuri_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mir_ray.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mizu_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_dark.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flame.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_ice.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_oka.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_wind.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mk.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mm.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1a.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2a.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_tex.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ms.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mu.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_niw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nwc.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ny.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA10.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA11.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA5.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA6.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA7.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA8.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA9.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE10.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE11.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE12.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1s.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4s.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE5.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE6.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE7.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE8.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE9.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1s.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_o_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_okuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_opening_demo1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ossan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ouke_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_owl.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_peehat.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_composer.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_sisters.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_poh.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ps.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_pu_box.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_reeba.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_relay_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rl.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shop_dungen.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shopnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_siofuki.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sk2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skb.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_break.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoya.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoyab.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot02_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot03_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot04_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot05_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot06_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot07_object.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot08_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot09_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot11_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot12_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot15_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot16_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot17_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot18_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sst.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_st.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_stream.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_syokudai.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ta.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_timeblock.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tite.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tk.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toki_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_torch2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toryo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tp.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tr.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_trap.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_triforce_spot.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ts.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tsubo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_umajump.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vali.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vase.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vm.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wallmaster.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wf.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wood02.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_xc.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yabusame_point.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ydan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yukabyun.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zf.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zg.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..b894516ebd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x808636F0" RangeStart="0x980" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..9337a2fc04
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x808655D0" RangeStart="0x9A0" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D00" Static="On"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..0d5ce829ac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x808674D0" RangeStart="0x9B0" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D10" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..0f38621388
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80872890" RangeStart="0x1100" RangeEnd="0x259C">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1948"/>
+        <DList Name="sPlatformTopDL" Offset="0x19D0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A28"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A80"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2318"/>
+        
+        <Collision Name="sCol" Offset="0x24B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..a3fdd07b75
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x808909A0" RangeStart="0x1850" RangeEnd="0x19F8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1850">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1890"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..9e2db033b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B84F0" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..0d2f367206
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x808CD080" RangeStart="0xE3C8" RangeEnd="0x211D8">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE458" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF558" TlutOffset="0xF518" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10248" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1ACC0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C130" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CBC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D3C8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1ECA0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FD08" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20080" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF518" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE408" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE428" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF498" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112F8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A350" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A400" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C068" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x20000" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DE0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..d14798ac3c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F2EB0" RangeStart="0x9F88" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010068"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..49909db293
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80921030" RangeStart="0xA380" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3F8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8B0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA380"/>
+        <DList Name="sHandTrailDList" Offset="0xA398"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7F8"/>
+        <DList Name="sShadowDList" Offset="0xACB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..b48f36ba0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80981EA0" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Bili.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..7501319f0d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x809AD810" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..fb53e62242
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x809C0530" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..c00e7c5b07
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0CDC0" RangeStart="0x11F8" RangeEnd="0x40F8">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11F8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21F8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29F8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32F8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3350"/>
+
+        <DList Name="gMantDL" Offset="0x33A8"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37F8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..0aa7e71dff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A10FF0" RangeStart="0x368" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
+        <DList Name="sRoomStatuesDL" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Holl.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..62f8a3375d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80A3F610" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..ed9f58adc6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80A6F350" RangeStart="0x12C8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E48"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EB8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..20bea0c8ec
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80A771C0" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sda.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..f9d5e322c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80AD9C60" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x1498">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14D8"/>
+        <DList Name="D_80AFA3F8" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..6d85ff6205
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80AE2A60" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_St.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..a41477d9e5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x80AE5050" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sth.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..187e5ae766
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80AE7CC0" RangeStart="0xE70" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
+        <DList Name="D_80B0A050" Offset="0x2A90"/>
+        <DList Name="D_80B0A3C0" Offset="0x2E00"/>
+        <Animation Name="sChildDanceAnim" Offset="0x35A0"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E34"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_End_Title.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..f307aa4466
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B40EB0" RangeStart="0x6E0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F00"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_File_Choose.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..5fa7563685
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_File_Choose.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803630" RangeStart="0xEC40" RangeEnd="0xF320">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC40" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF60" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF060" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF260" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2A0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2E0" Static="Off">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..7e1315d50f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80B61B90" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..22a94dcce2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x80B633E0" RangeStart="0x600" RangeEnd="0x21E0">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB50"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x2010"/>
+        <DList Name="sModelDL" Offset="0x2038"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..229cb9eae5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x80B656E0" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..e5aa927a75
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B7E380" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..f927d1db2c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B7F2B0" RangeStart="0x750" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
+        <DList Name="sMaterialDL" Offset="0x1750"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..d822d5238f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B80E60" RangeStart="0x520" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x920">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xBA0"/>
+        <DList Name="sFrustumDL" Offset="0xC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..9213b354f3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B81BE0" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..e7ed30c0bf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B83350" RangeStart="0x430" RangeEnd="0x1678">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..796db3ee1f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B84AA0" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..373f360303
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5CC8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x74C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7CC8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x84C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x88C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x98C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA0C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB4C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB8C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC2C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCB58" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5348" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xABA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xAFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xBFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xCFA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDBA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDDA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE5A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xE9A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF1A0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2BE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x33E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x37E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x38E8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34C0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x6620" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6E20" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x7620" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x8220" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8C20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x8560" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x9160" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x9560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10F68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x11768" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11F68" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xABF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCBF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xCFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD3F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xDFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xEFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x117F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11BF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x123F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15290" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16A90" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x4888" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x5088" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x5488" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9128" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1250" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A50" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2250" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8118" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9118" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9518" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D18" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA518" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x55F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x65F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x71F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x8298" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x3530" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x3930" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x4930" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4D30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x64B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CB8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x80B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x88B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..0f1bc3b285
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFBF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x109F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10DF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7D0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF7F0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xF9F0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/men.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/bowling.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hut.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/impa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kakariko.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/labo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/link_home.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/malon_stable.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tent.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/enrui.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/entra_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hiral_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakariko3.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_day.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_night.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_ruins.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_n.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_r.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/turibori.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/entra.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/souko.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot00.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot01.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot02.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot03.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot04.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot05.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot06.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot07.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot08.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot09.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot10.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot11.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot12.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot13.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot15.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot16.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot17.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot18.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot20.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/alley_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/drag.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/face_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/golon.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/kokiri_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/night_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/shop1.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/zoora.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_field.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/message_data_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/message_data_static.xml
new file mode 100644
index 0000000000..94948fa8e7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF8FAC" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD0EC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x10130C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/backgrounds.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/boss_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_24_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_dungeon_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_field_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_gameover_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_jpn_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_nes_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/item_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/kanji.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_48x85_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_grand_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_i_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_texture_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nes_font_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nes_font_static.xml
new file mode 100644
index 0000000000..b01646cb54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nes_font_static.xml
@@ -0,0 +1,145 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgCharABControlPadTex" OutName="msg_char_ab_control_pad" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/place_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/skyboxes.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/title_static.xml b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_J_CE/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/audio/Audio.xml b/soh/assets/xml/GC_NMQ_NTSC_U/audio/Audio.xml
new file mode 100644
index 0000000000..e9f385ca87
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12C240">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x101DA0" SequenceTableOffset="0x1021D0" SampleBankTableOffset="0x1028C0" SequenceFontTableOffset="0x102010">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..e6b4bba124
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEB768" RangeEnd="0xEC988">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEB768"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEBB68"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEBF68"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xEC368"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xEC768">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xEC988"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..bbc709a4fd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEABF0" RangeEnd="0xEACC0">
+        <DList Name="sTransTriforceDL" Offset="0xEABF0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEAC20">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_wipe1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..9d2e12231a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEACC0" RangeEnd="0xEB650" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEACC0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEAE50"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEB650"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_NTSC_U/code/sys_matrix.xml
new file mode 100644
index 0000000000..1521be9f1e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010EE0" RangeStart="0xED3C0" RangeEnd="0xED400">
+        <Mtx Name="gMtxClear"  Offset="0xED3C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/misc/link_animetion.xml b/soh/assets/xml/GC_NMQ_NTSC_U/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_Bb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ahg.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_am.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ane.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_anubice.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_aob.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_b_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bba.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdoor.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bg.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bigokuta.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bird.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bji.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bl.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_blkobj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bob.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_boj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombf.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bowl.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_box.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_brob.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bubble.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bv.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bwall.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bxa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cne.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cob.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cow.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_crow.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_elevator.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_hsblock.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_lift.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_daiku.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ddan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekubaba.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekujr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekunuts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_6k.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_kekkai.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_tre_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dh.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dnk.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dns.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodojr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dog.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_killer.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_du.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dy_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ec.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_crystal_light.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_doughnut.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_erupc.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_fire_ball.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_lgt_shower.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_star_field.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ei.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fhg.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_firefly.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fu.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fz.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ge1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geff.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geldb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrowcase.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bean.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bombpouch.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boomerang.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boots_2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bosskey.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bow.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bracelet.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_brokensword.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_butterfly.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_clothes.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_coin.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_compass.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_dekupouch.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_egg.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_eye_lotion.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fire.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fish.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_frog.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudomask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ghost.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_glasses.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gloves.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_goddess.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_golonmask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_grass.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hammer.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_heart.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hearts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hookshot.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hoverboots.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_insect.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_jewel.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_key.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_letter.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_liquid.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_longsword.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_m_arrow.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_magicpot.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_map.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_melody.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_milk.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_mushroom.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_niwatori.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_nuts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina_0.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_pachinko.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_powder.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_prescription.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_purse.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rabit_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_redead_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rupy.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_saw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_scale.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_seed.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_skj_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soldout.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_stick.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sutaru.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sword_1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ticketstone.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_truth_mask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_zoramask.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gjyo_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gla.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gm.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd_magic.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gndd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_god_lgt.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gol.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goma.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goroiwa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gt.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_door.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hakach_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hata.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_heavy_object.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hintnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hni.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_normal.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_zelda.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_human.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ice_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ik.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_im.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_in.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ingate.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_js.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_door.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_iron.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ka.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kibako2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kingdodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_km1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kusa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kw1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kz.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_light_ring.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightbox.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightswitch.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_child.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mag.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mag.xml
new file mode 100644
index 0000000000..84467d76d5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mag.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A700"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AF00"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1B700"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1BF00"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1C700"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1CF00"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1D700"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1DF00"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1E700"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1EF00"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1F300"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F540"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1F840"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mamenoki.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mastergolon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokiri.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokirihead.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterzoora.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_md.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_medal.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_menkuri_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mir_ray.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mizu_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_dark.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flame.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flash.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_ice.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_oka.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_soul.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_wind.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mk.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mm.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1a.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2a.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_tex.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ms.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mu.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_niw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nwc.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ny.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA10.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA11.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA5.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA6.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA7.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA8.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA9.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE10.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE11.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE12.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1s.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4s.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE5.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE6.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE7.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE8.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE9.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1s.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_o_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_okuta.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_opening_demo1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os_anime.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ossan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ouke_haka.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_owl.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_peehat.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_composer.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_field.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_sisters.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_poh.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ps.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_pu_box.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_reeba.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_relay_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rl.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shop_dungen.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shopnuts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_siofuki.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sk2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skb.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_break.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoya.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoyab.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot02_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot03_object.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot04_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot05_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot06_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot07_object.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot08_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot09_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot11_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot12_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot15_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot16_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot17_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot18_obj.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sst.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_st.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_stream.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_syokudai.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ta.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_timeblock.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tite.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tk.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toki_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_torch2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toryo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tp.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tr.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_trap.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_triforce_spot.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ts.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tsubo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tw.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_umajump.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vali.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vase.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vm.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wallmaster.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wf.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wood02.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_xc.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yabusame_point.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ydan_objects.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yukabyun.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zf.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zg.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..4c562a20d6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80863700" RangeStart="0x980" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..9a5798ff0d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x808655E0" RangeStart="0x9A0" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D00" Static="On"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..4f183e0408
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x808674E0" RangeStart="0x9B0" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1D10" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..745a1974fe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x808728A0" RangeStart="0x1100" RangeEnd="0x259C">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1948"/>
+        <DList Name="sPlatformTopDL" Offset="0x19D0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A28"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A80"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x2298">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2318"/>
+        
+        <Collision Name="sCol" Offset="0x24B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..752a28b0a3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x808909B0" RangeStart="0x1850" RangeEnd="0x19F8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1850">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1890"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..5dba82099f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B8500" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..d69b3d4736
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x808CD090" RangeStart="0xE3C8" RangeEnd="0x211D8">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE458" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF558" TlutOffset="0xF518" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10248" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1ACC0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B4C0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C130" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CBC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D3C8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1ECA0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FD08" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20080" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF518" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE408" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE428" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF498" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112F8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A350" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A400" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C068" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x20000" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DE0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..da1dba0c21
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808F2EC0" RangeStart="0x9F88" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AFC8"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00B038"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B090"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B0B0"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B6E0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B840"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C998"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D458"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE80"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E900"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EE48"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010068"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..83576e0ceb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80921040" RangeStart="0xA380" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3F8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8B0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA380"/>
+        <DList Name="sHandTrailDList" Offset="0xA398"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7F8"/>
+        <DList Name="sShadowDList" Offset="0xACB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..d898616a71
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80981EB0" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Bili.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..1e806241eb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x809AD820" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..e5394879fd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x809C0540" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..9b59ab5641
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0CDD0" RangeStart="0x11F8" RangeEnd="0x40F8">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11F8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21F8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29F8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32F8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3350"/>
+
+        <DList Name="gMantDL" Offset="0x33A8"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37F8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..109aa0056a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A11000" RangeStart="0x368" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
+        <DList Name="sRoomStatuesDL" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Holl.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..5118d7a03a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80A3F620" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..7d25a40152
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80A6F360" RangeStart="0x12C8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E48"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EB8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Kanban.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..00ef7e06dc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80A771D0" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sda.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..13a75e568c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80AD9C70" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x1498">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14D8"/>
+        <DList Name="D_80AFA3F8" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ssh.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..3028aa3f6e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80AE2A70" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_St.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..0bbe47ce05
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x80AE5060" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sth.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..517a476301
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80AE7CD0" RangeStart="0xE70" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
+        <DList Name="D_80B0A050" Offset="0x2A90"/>
+        <DList Name="D_80B0A3C0" Offset="0x2E00"/>
+        <Animation Name="sChildDanceAnim" Offset="0x35A0"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E34"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_End_Title.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..5fa2fa107f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B40EC0" RangeStart="0x6E0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F00"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_File_Choose.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..9fe7266acb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_File_Choose.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803880" RangeStart="0xEC40" RangeEnd="0xF320">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC40" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF60" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF060" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF260" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2A0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2E0" Static="Off">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..d5579801bc
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80B61BA0" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..87a8d3258b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x80B633F0" RangeStart="0x600" RangeEnd="0x21E0">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB50"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B50">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x2010"/>
+        <DList Name="sModelDL" Offset="0x2038"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..261606e525
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x80B656F0" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..dfc63dca12
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B7E390" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..131239ad9a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B7F2C0" RangeStart="0x750" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
+        <DList Name="sMaterialDL" Offset="0x1750"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..e32e56a4e5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B80E70" RangeStart="0x520" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x920">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xBA0"/>
+        <DList Name="sFrustumDL" Offset="0xC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..f31b1201d6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B81BF0" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..a9bb006578
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B83360" RangeStart="0x430" RangeEnd="0x1678">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..1cfceb7a56
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B84AB0" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/Bmori1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..373f360303
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5CC8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x74C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7CC8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x84C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x88C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x98C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA0C8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB4C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB8C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC0C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC2C8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCB58" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4348" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5348" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xABA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xAFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xBFA0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xCFA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD3A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDBA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDDA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE5A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xE9A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF1A0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2BE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x33E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x37E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x38E8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34C0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x6620" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6E20" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x7620" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x8220" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8A20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8C20" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x8560" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x9160" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x9560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9D60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB560" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDD60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFF68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10F68" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x11768" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11F68" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xABF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC3F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCBF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xCFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD3F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xDFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE7F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xEFF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x117F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11BF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x123F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15290" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15A90" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16A90" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x4888" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x5088" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x5488" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6C88" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9128" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1250" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A50" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2250" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A50" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8118" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9118" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9518" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D18" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA518" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x55F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x65F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x71F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BC8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x8298" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x3530" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x3930" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x4930" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4D30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x64B8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CB8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7CB8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x80B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x88B8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HIDAN.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_final.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontika.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/gerudoway.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..0f1bc3b285
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFBF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x109F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10DF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7D0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF7F0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xF9F0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/men.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/moribossroom.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/bowling.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hut.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hylia_labo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/impa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kakariko.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/labo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/link_home.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/mahouya.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/malon_stable.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/miharigoya.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/nakaniwa.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/syatekijyou.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/takaraya.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tent.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tokinoma.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/enrui.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/entra_n.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana2.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hiral_demo.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakariko3.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakusiana.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kinsuta.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley_n.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_day.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_night.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_ruins.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_n.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_r.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/turibori.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/entra.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/souko.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot00.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot01.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot02.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot03.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot04.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot05.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot06.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot07.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot08.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot09.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot10.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot11.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot12.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot13.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot15.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot16.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot17.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot18.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot20.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/alley_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/drag.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/face_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/golon.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/kokiri_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/night_shop.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/shop1.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/zoora.xml b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_field.xml b/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_ydan.xml b/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/text/message_data_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/text/message_data_static.xml
new file mode 100644
index 0000000000..94948fa8e7
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF8FAC" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD0EC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x10130C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/backgrounds.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/boss_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_24_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_dungeon_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_field_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_gameover_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_jpn_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_nes_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/item_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/kanji.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_48x85_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_grand_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_i_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_name_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_texture_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/nes_font_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/nes_font_static.xml
new file mode 100644
index 0000000000..b01646cb54
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/nes_font_static.xml
@@ -0,0 +1,145 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgCharABControlPadTex" OutName="msg_char_ab_control_pad" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/nintendo_rogo_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/place_title_cards.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/skyboxes.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_NTSC_U/textures/title_static.xml b/soh/assets/xml/GC_NMQ_NTSC_U/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/GC_NMQ_NTSC_U/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_PAL_F/audio/Audio.xml b/soh/assets/xml/GC_NMQ_PAL_F/audio/Audio.xml
index 082ead4439..2c3a6a02a5 100644
--- a/soh/assets/xml/GC_NMQ_PAL_F/audio/Audio.xml
+++ b/soh/assets/xml/GC_NMQ_PAL_F/audio/Audio.xml
@@ -114,1402 +114,483 @@
 				<Sequence Name="109_Cutscene_Effects"/>
 			</Sequences>
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 			
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
index 486cb244d8..045ad0c76a 100644
--- a/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x10F00" RangeStart="0xEAD20" RangeEnd="0xEAD60">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x80010F00" RangeStart="0xEAD20" RangeEnd="0xEAD60">
         <Mtx Name="gMtxClear" Offset="0xEAD20"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml
index 5ffc52f655..8824228847 100644
--- a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml
+++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/assets/xml/N64_NTSC_10/audio/Audio.xml b/soh/assets/xml/N64_NTSC_10/audio/Audio.xml
new file mode 100644
index 0000000000..7b00aa9750
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/audio/Audio.xml
@@ -0,0 +1,647 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12CBB0">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x1026A0" SequenceTableOffset="0x102AD0" SampleBankTableOffset="0x1031C0" SequenceFontTableOffset="0x102910">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<!-- ntsc start -->
+				<!-- todo: document sample names -->
+				<Sample Name="Sample_590" Offset="0x35D100"/>
+				<Sample Name="Sample_591" Offset="0x365DB0"/>
+				<Sample Name="Islamic Chant" Offset="0x36C840"/>
+				<!-- ntsc end -->
+				<Sample Name="Resonant Bass Marimba" Offset="0x37A4B0" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x381930"/>
+				<Sample Name="Off Hi-Hat" Offset="0x38D230" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x391FD0" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x395710" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x397A60"/>
+				<Sample Name="Harpsichord (High)" Offset="0x398650" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x39FBE0" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x3A2280" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x3A4410" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x3AC3B0" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3AFA80" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x3B4330" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x3B5350" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x3B6B40" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x3B7A60" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3C1F90"/>
+				<Sample Name="Goron Drum" Offset="0x3C7A90"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3C9FD0" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3CB570"/>
+				<Sample Name="Flute and Voice" Offset="0x3D1980" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3D2840" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3D37A0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3D45A0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3D6860" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3D9030" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3DBB00"/>
+				<Sample Name="Cowbell" Offset="0x3DCA50" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3DD710" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3DFEF0"/>
+				<Sample Name="Guitar (High)" Offset="0x3E20B0" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3E3F80" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3E8000"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3ECC50"/>
+				<Sample Name="Goron Oh" Offset="0x3ED4F0"/>
+				<Sample Name="Banjo (Low)" Offset="0x3EDFB0" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3F0DF0" SampleRate="38054"/>
+				<!-- ntsc start -->
+				<!-- Islamic Chant offset moved to earlier block in ntsc -->
+				<!-- ntsc end -->
+				<Sample Name="Steel Drum" Offset="0x3F3690"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3F82F0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/code/fbdemo_circle.xml b/soh/assets/xml/N64_NTSC_10/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..9217b2f278
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEC0A8" RangeEnd="0xED2C8">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEC0A8"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEC4A8"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEC8A8"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xECCA8"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xED0A8">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xED2C8"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/code/fbdemo_triforce.xml b/soh/assets/xml/N64_NTSC_10/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..ac32212346
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEB530" RangeEnd="0xEB600">
+        <DList Name="sTransTriforceDL" Offset="0xEB530"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEB560">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_NTSC_10/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..aeb78987d5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEB600" RangeEnd="0xEBF90" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEB600">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEB790"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEBF90"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/code/sys_matrix.xml b/soh/assets/xml/N64_NTSC_10/code/sys_matrix.xml
new file mode 100644
index 0000000000..66bd15b596
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x800110A0" RangeStart="0xEDD10" RangeEnd="0xEDD50">
+        <Mtx Name="gMtxClear"  Offset="0xEDD10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/misc/link_animetion.xml b/soh/assets/xml/N64_NTSC_10/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_NTSC_10/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/gameplay_field_keep.xml b/soh/assets/xml/N64_NTSC_10/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/gameplay_keep.xml b/soh/assets/xml/N64_NTSC_10/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_Bb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ahg.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_am.xml b/soh/assets/xml/N64_NTSC_10/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ane.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ani.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_anubice.xml b/soh/assets/xml/N64_NTSC_10/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_aob.xml b/soh/assets/xml/N64_NTSC_10/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_b_heart.xml b/soh/assets/xml/N64_NTSC_10/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bba.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bdan_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bdoor.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bg.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bigokuta.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bird.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bji.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bl.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_blkobj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bob.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_boj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bombf.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bombiwa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bowl.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_box.xml b/soh/assets/xml/N64_NTSC_10/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_brob.xml b/soh/assets/xml/N64_NTSC_10/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bubble.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bv.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bwall.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_bxa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_cne.xml b/soh/assets/xml/N64_NTSC_10/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_cob.xml b/soh/assets/xml/N64_NTSC_10/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_cow.xml b/soh/assets/xml/N64_NTSC_10/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_crow.xml b/soh/assets/xml/N64_NTSC_10/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_cs.xml b/soh/assets/xml/N64_NTSC_10/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_d_elevator.xml b/soh/assets/xml/N64_NTSC_10/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_d_hsblock.xml b/soh/assets/xml/N64_NTSC_10/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_d_lift.xml b/soh/assets/xml/N64_NTSC_10/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_daiku.xml b/soh/assets/xml/N64_NTSC_10/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ddan_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dekubaba.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dekujr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dekunuts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_demo_6k.xml b/soh/assets/xml/N64_NTSC_10/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_NTSC_10/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_demo_tre_lgt.xml b/soh/assets/xml/N64_NTSC_10/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dh.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dnk.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dns.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dodojr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dodongo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dog.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_door_gerudo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_door_killer.xml b/soh/assets/xml/N64_NTSC_10/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ds.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ds2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_du.xml b/soh/assets/xml/N64_NTSC_10/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_dy_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ec.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_crystal_light.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_doughnut.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_erupc.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_fire_ball.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_flash.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_lgt_shower.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_star_field.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_efc_tw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ei.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fd.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fd2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fhg.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fire.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_firefly.xml b/soh/assets/xml/N64_NTSC_10/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fish.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fu.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_fz.xml b/soh/assets/xml/N64_NTSC_10/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime3.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ganon_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ge1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_geff.xml b/soh/assets/xml/N64_NTSC_10/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_geldb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrow.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrowcase.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bean.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bombpouch.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_boomerang.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bosskey.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle_letter.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bow.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_bracelet.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_brokensword.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_clothes.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_coin.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_compass.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_egg.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_eye_lotion.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_fire.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_fish.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_frog.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_ghost.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_glasses.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_gloves.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_goddess.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_grass.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_hammer.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_heart.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_hearts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_hookshot.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_insect.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_jewel.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_key.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_letter.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_liquid.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_longsword.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_m_arrow.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_magicpot.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_map.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_medal.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_melody.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_milk.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_mushroom.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_nuts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_pachinko.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_powder.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_prescription.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_purse.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_redead_mask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_rupy.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_saw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_scale.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_seed.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_skj_mask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_soldout.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_soul.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_stick.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_sutaru.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_sword_1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gjyo_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gla.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gm.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gnd.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gnd_magic.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gndd.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_god_lgt.xml b/soh/assets/xml/N64_NTSC_10/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gol.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_goma.xml b/soh/assets/xml/N64_NTSC_10/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_goroiwa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gs.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_gt.xml b/soh/assets/xml/N64_NTSC_10/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_haka.xml b/soh/assets/xml/N64_NTSC_10/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_haka_door.xml b/soh/assets/xml/N64_NTSC_10/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_haka_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hakach_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hata.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_heavy_object.xml b/soh/assets/xml/N64_NTSC_10/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hidan_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hintnuts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hni.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_horse.xml b/soh/assets/xml/N64_NTSC_10/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_horse_ganon.xml b/soh/assets/xml/N64_NTSC_10/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_horse_link_child.xml b/soh/assets/xml/N64_NTSC_10/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_horse_normal.xml b/soh/assets/xml/N64_NTSC_10/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_horse_zelda.xml b/soh/assets/xml/N64_NTSC_10/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_hs.xml b/soh/assets/xml/N64_NTSC_10/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_human.xml b/soh/assets/xml/N64_NTSC_10/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ice_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ik.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_im.xml b/soh/assets/xml/N64_NTSC_10/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_in.xml b/soh/assets/xml/N64_NTSC_10/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ingate.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_jj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_js.xml b/soh/assets/xml/N64_NTSC_10/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_jya_door.xml b/soh/assets/xml/N64_NTSC_10/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_jya_iron.xml b/soh/assets/xml/N64_NTSC_10/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_jya_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ka.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kanban.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kibako2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kingdodongo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_km1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kusa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kw1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_kz.xml b/soh/assets/xml/N64_NTSC_10/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_light_ring.xml b/soh/assets/xml/N64_NTSC_10/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_lightbox.xml b/soh/assets/xml/N64_NTSC_10/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_lightswitch.xml b/soh/assets/xml/N64_NTSC_10/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_link_boy.xml b/soh/assets/xml/N64_NTSC_10/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_link_child.xml b/soh/assets/xml/N64_NTSC_10/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ma1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ma2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mag.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mag.xml
new file mode 100644
index 0000000000..257f723635
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mag.xml
@@ -0,0 +1,20 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" Format="rgba32" Width="160" Height="160" Offset="0x300"/>
+        <Texture Name="gTitleCopyright1998Tex" OutName="title_copyright_1998" Format="ia8" Width="128" Height="16" Offset="0x19300"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19B00"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A300"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1AB00"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1B300"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1BB00"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1C300"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1CB00"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1D300"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1DB00"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1E300"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1E700"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1E940"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EC40"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mamenoki.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mastergolon.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_masterkokiri.xml b/soh/assets/xml/N64_NTSC_10/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_NTSC_10/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_masterzoora.xml b/soh/assets/xml/N64_NTSC_10/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_md.xml b/soh/assets/xml/N64_NTSC_10/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_medal.xml b/soh/assets/xml/N64_NTSC_10/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_menkuri_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mir_ray.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mizu_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_dark.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flame.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flash.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_ice.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_oka.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_soul.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mjin_wind.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mk.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mm.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1a.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2a.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mori_tex.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ms.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_mu.xml b/soh/assets/xml/N64_NTSC_10/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_nb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_niw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_nwc.xml b/soh/assets/xml/N64_NTSC_10/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ny.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA10.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA11.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA3.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA4.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA5.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA6.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA7.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA8.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oA9.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oB1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oB2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oB3.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oB4.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE10.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE11.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE12.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE1s.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE3.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE4.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE4s.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE5.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE6.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE7.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE8.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE9.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oE_anime.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oF1d_map.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_oF1s.xml b/soh/assets/xml/N64_NTSC_10/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_o_anime.xml b/soh/assets/xml/N64_NTSC_10/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_okuta.xml b/soh/assets/xml/N64_NTSC_10/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_opening_demo1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_os.xml b/soh/assets/xml/N64_NTSC_10/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_os_anime.xml b/soh/assets/xml/N64_NTSC_10/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ossan.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ouke_haka.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_owl.xml b/soh/assets/xml/N64_NTSC_10/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_peehat.xml b/soh/assets/xml/N64_NTSC_10/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_po_composer.xml b/soh/assets/xml/N64_NTSC_10/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_po_field.xml b/soh/assets/xml/N64_NTSC_10/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_po_sisters.xml b/soh/assets/xml/N64_NTSC_10/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_poh.xml b/soh/assets/xml/N64_NTSC_10/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ps.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_pu_box.xml b/soh/assets/xml/N64_NTSC_10/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_rd.xml b/soh/assets/xml/N64_NTSC_10/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_reeba.xml b/soh/assets/xml/N64_NTSC_10/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_relay_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_rl.xml b/soh/assets/xml/N64_NTSC_10/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_rr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_rs.xml b/soh/assets/xml/N64_NTSC_10/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ru1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ru2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_sa.xml b/soh/assets/xml/N64_NTSC_10/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_sb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_sd.xml b/soh/assets/xml/N64_NTSC_10/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_shop_dungen.xml b/soh/assets/xml/N64_NTSC_10/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_shopnuts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_siofuki.xml b/soh/assets/xml/N64_NTSC_10/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_sk2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_skb.xml b/soh/assets/xml/N64_NTSC_10/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_skj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot00_break.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot00_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoya.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoyab.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot02_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot03_object.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot04_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot05_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot06_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot07_object.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot08_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot09_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot11_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot12_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot15_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot16_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot17_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_spot18_obj.xml b/soh/assets/xml/N64_NTSC_10/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ssh.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_sst.xml b/soh/assets/xml/N64_NTSC_10/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_st.xml b/soh/assets/xml/N64_NTSC_10/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_stream.xml b/soh/assets/xml/N64_NTSC_10/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_syokudai.xml b/soh/assets/xml/N64_NTSC_10/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ta.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_timeblock.xml b/soh/assets/xml/N64_NTSC_10/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tite.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tk.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_toki_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_torch2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_toryo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tp.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tr.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_trap.xml b/soh/assets/xml/N64_NTSC_10/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_triforce_spot.xml b/soh/assets/xml/N64_NTSC_10/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ts.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tsubo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_tw.xml b/soh/assets/xml/N64_NTSC_10/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_umajump.xml b/soh/assets/xml/N64_NTSC_10/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_vali.xml b/soh/assets/xml/N64_NTSC_10/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_vase.xml b/soh/assets/xml/N64_NTSC_10/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_vm.xml b/soh/assets/xml/N64_NTSC_10/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_wallmaster.xml b/soh/assets/xml/N64_NTSC_10/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_warp1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_warp2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_wf.xml b/soh/assets/xml/N64_NTSC_10/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_wood02.xml b/soh/assets/xml/N64_NTSC_10/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_xc.xml b/soh/assets/xml/N64_NTSC_10/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_yabusame_point.xml b/soh/assets/xml/N64_NTSC_10/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_ydan_objects.xml b/soh/assets/xml/N64_NTSC_10/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_yukabyun.xml b/soh/assets/xml/N64_NTSC_10/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zf.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zg.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zl1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zl2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime1.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime2.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zl4.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/objects/object_zo.xml b/soh/assets/xml/N64_NTSC_10/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..a92c788b11
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80A5E890" RangeStart="0x960" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x960" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1160" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1960" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C10" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CC0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..1b6bdb3ea7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80A60750" RangeStart="0x980" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..eb21fa1998
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80A62630" RangeStart="0x990" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x990" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1190" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1990" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C40" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CF0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..2bb0ffa27f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80A53DD0" RangeStart="0x1110" RangeEnd="0x24EC">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1110"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1918">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1958"/>
+        <DList Name="sPlatformTopDL" Offset="0x19E0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A38"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A50">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A90"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1AA8"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x22A8">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2328"/>
+        
+        <Collision Name="sCol" Offset="0x24C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..c853b0050d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80A32440" RangeStart="0x1830" RangeEnd="0x19C8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1830">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1870"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..8c90332402
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x8089D890" RangeStart="0x61C8" RangeEnd="0x91C8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..4e799c180c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x809F1D00" RangeStart="0xE398" RangeEnd="0x20EB4">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE428" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF528" TlutOffset="0xF4E8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10218" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B490" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C100" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB68" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E368" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1EC70" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FCD8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20050" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20450" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF4E8" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x112E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x136E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x142E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x166E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x172E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x196E0" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA18" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1F9D0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA08" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA40" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FA78" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAB0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FAE8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB20" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB58" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FB90" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBC8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC38" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE3D8" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE3F8" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF468" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF958" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA00" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11258" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112C8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A320" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A3D0" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A448" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BEA0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BF90" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C038" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAA0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D938" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA50" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBA8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF08" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x1FFD0" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DB0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..86a2ec4967
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x80B05470" RangeStart="0x9F48" RangeEnd="0x10788">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x9F48"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0xAF48">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0xAF88"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0xAFF8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0xB010">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0xB050"/>
+        <DList Name="gGanonShadowModelDL" Offset="0xB070"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0xB4A0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0xB6A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0xB800"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0xB918"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0xC918">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0xC958"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0xC9D8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0xD3D8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0xD418"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0xD4A0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0xDCA0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0xDE40"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0xDF60"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0xE760">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0xE8C0"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0xE9C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0xEDC8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0xEE08"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0xEE88"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0xF088"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0xF888">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0xF8B8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0xFAB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0xFBA8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0xFC58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFD78">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE18">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF18">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x10028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..c966abf2a8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80A17AF0" RangeStart="0xA330" RangeEnd="0xACE0">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3A8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA860" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA330"/>
+        <DList Name="sHandTrailDList" Offset="0xA348"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7A8"/>
+        <DList Name="sShadowDList" Offset="0xAC60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..ed1893f485
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80A72850" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Bili.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..841bacb54e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x808C0080" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..422eab05ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x80A929D0" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..e3e231614f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80AE8820" RangeStart="0x11E8" RangeEnd="0x4118">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11E8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21E8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29E8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32E8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3340"/>
+
+        <DList Name="gMantDL" Offset="0x3398"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37E8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..dbb80db7fa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80AC82C0" RangeStart="0x328" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x328"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB28"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD28"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDA8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFA8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11A8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1228"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1428"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1628"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1728"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1928"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x1968"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4BE8"/>
+        <DList Name="sRoomStatuesDL" Offset="0x69F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Holl.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..d2e1411f52
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80895700" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..47435e670b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80ADBD20" RangeStart="0x12B8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12B8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22B8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BB8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34B8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E30"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DB8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E38"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EA8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42D8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Kanban.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..3b327d96fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80AA1BA0" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sda.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..755bbb834f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80A912D0" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x14A8">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14E8"/>
+        <DList Name="D_80AFA3F8" Offset="0x1508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ssh.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..0c0c21667d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80B25590" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_St.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..07e49caf00
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x808C41A0" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sth.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..4d22847a4e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80B27B80" RangeStart="0xE60" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE60"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEE0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFE0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1060"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1860"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C60"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CE0"/>
+        <DList Name="D_80B0A050" Offset="0x2A80"/>
+        <DList Name="D_80B0A3C0" Offset="0x2DF0"/>
+        <Animation Name="sChildDanceAnim" Offset="0x3590"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E24"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_End_Title.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..6bead07a59
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B1AC40" RangeStart="0x6F0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6F0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1230"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1930"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20B0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CB0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38B0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EB0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F10"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..dba3fe1bb0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_File_Choose.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803880" RangeStart="0xEC50" RangeEnd="0xF330">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC50" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German headers vertices are combined into one array -->
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF70" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German options vertices are combined into one array -->
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF070" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- Not used for NTSC N64, instead these vertices are apart of D_80811F30 -->
+        <!-- <Array Name="D_80812130" Count="12" Offset="0xF6A0" Static="Off">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF270" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2B0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2F0" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- PAL N64 only -->
+        <!-- <Array Name="gOptionsDividerChangeLangVtx" Count="4" Offset="0xF8E0" Static="Off">
+            <Vtx/>
+        </Array> -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..f62ff8f764
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80A2BA10" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..3cd0cf1270
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x8095D790" RangeStart="0xB20" RangeEnd="0x2170">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB20"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B20">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1FE0"/>
+        <DList Name="sModelDL" Offset="0x2008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..612714ddba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x8095BA90" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..74ee6fb575
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B19D10" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..96b2a24df4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B38E70" RangeStart="0x740" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x740"/>
+        <DList Name="sMaterialDL" Offset="0x1740"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x1998"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..f2ba83827f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B2BC30" RangeStart="0x4F0" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x4F0"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x8F0">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xB70"/>
+        <DList Name="sFrustumDL" Offset="0xBF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..d5ef928e81
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B464C0" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..5ff3cebac7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B47C30" RangeStart="0x430" RangeEnd="0x16C8">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..f6c728a49b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B7AE70" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..ad43114260
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5D28" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x6528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x7528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7D28" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x8528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x9928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC328" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCBB8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B58" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5358" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xAC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xB030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xC030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xD030" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDE30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE630" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xEA30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF230" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x2408" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2C08" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x3408" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x3808" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x3908" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34E0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6EC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x76C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x82C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x85F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x91F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x95F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xADF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10FF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x117F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11FF8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xACD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCCD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xD0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD4D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xE0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xF0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF8D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x108D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x118D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x124D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15370" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16B70" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x50E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x54E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x64E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9188" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1260" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2260" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8188" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9188" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9588" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D88" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA588" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x4A00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x5600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x6600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x7200" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x35A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x49A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4DA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x6548" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x7548" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x7948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7D48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x8148" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x8948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..6b22223cd5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31C8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE40" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39C8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE40" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21C8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..b279628898
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFC10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0x10010" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x10810" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x10A10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10E10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7F0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF810"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFA10"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/men.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/bowling.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/hut.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/impa.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kakariko.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/labo.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/link_home.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/malon_stable.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/tent.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/enrui.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/entra_n.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/hiral_demo.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/kakariko3.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley_n.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/market_day.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/market_night.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/market_ruins.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_n.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_r.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/misc/turibori.xml b/soh/assets/xml/N64_NTSC_10/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/entra.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/souko.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot00.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot01.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..dcee38761f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E78"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot02.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..54a8ea321f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x2650"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8DD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x95D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x97D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xAFD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xBFD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC3D8" TlutOffset="0x8D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDBD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xDFD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x109D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10BD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x113D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x123D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12BD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x133D8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x143D8" TlutOffset="0x8DB0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14BD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15BD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16BD8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16C58" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17458" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17858" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18858" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B560" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BD60" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C160" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C560" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C660" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D660" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8DB0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot03.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot04.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..ccff0d05bf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBDF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC5F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xC9F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCDF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD1F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD2F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD3F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD7F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xDFF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE7F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xEFF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF3F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFBF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11DF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x12FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x131F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x135F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x141F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x149F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x151F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x159F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x15FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x163F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x167F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x16FF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18980" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19180" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19980" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A180" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A380" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AB80" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AD80" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1AF80" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4E88" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x5288" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x5688" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x6688" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6E88" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B58" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D58" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2B98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2D98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2F98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x3398" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3B98" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x4398" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x4598" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2B58"/>
+        <DList Name="gSpot04DL_005058" Offset="0x4FF8"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot05.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot06.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot07.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot08.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot09.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..58f1f75020
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x6F18"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8590"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot10.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot11.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot12.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot13.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot15.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot16.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..6c059858be
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xA9C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot17.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..c50cacdb36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBC8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7C8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4C8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11248" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A48" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12248" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot18.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot20.xml b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/alley_shop.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/drag.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/face_shop.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/golon.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/kokiri_shop.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/night_shop.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/shop1.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/scenes/shops/zoora.xml b/soh/assets/xml/N64_NTSC_10/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/text/elf_message_field.xml b/soh/assets/xml/N64_NTSC_10/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/text/elf_message_ydan.xml b/soh/assets/xml/N64_NTSC_10/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/text/message_data_static.xml b/soh/assets/xml/N64_NTSC_10/text/message_data_static.xml
new file mode 100644
index 0000000000..dc08d4e023
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF98AC" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFD9EC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x101C0C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/backgrounds.xml b/soh/assets/xml/N64_NTSC_10/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/boss_title_cards.xml b/soh/assets/xml/N64_NTSC_10/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/textures/do_action_static.xml b/soh/assets/xml/N64_NTSC_10/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_24_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_dungeon_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_field_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_gameover_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_jpn_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_nes_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/icon_item_static.xml b/soh/assets/xml/N64_NTSC_10/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/item_name_static.xml b/soh/assets/xml/N64_NTSC_10/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/kanji.xml b/soh/assets/xml/N64_NTSC_10/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/textures/map_48x85_static.xml b/soh/assets/xml/N64_NTSC_10/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_10/textures/map_grand_static.xml b/soh/assets/xml/N64_NTSC_10/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/map_i_static.xml b/soh/assets/xml/N64_NTSC_10/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/map_name_static.xml b/soh/assets/xml/N64_NTSC_10/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/message_static.xml b/soh/assets/xml/N64_NTSC_10/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/message_texture_static.xml b/soh/assets/xml/N64_NTSC_10/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/nes_font_static.xml b/soh/assets/xml/N64_NTSC_10/textures/nes_font_static.xml
new file mode 100644
index 0000000000..f1b80ee045
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/nes_font_static.xml
@@ -0,0 +1,144 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_NTSC_10/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..aa5c7c9ea6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x2A50" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x27A0"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/parameter_static.xml b/soh/assets/xml/N64_NTSC_10/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/place_title_cards.xml b/soh/assets/xml/N64_NTSC_10/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/skyboxes.xml b/soh/assets/xml/N64_NTSC_10/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_10/textures/title_static.xml b/soh/assets/xml/N64_NTSC_10/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_10/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/audio/Audio.xml b/soh/assets/xml/N64_NTSC_11/audio/Audio.xml
new file mode 100644
index 0000000000..c2794f3616
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/audio/Audio.xml
@@ -0,0 +1,647 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12CBB0">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x102860" SequenceTableOffset="0x102C90" SampleBankTableOffset="0x103380" SequenceFontTableOffset="0x102AD0">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<!-- ntsc start -->
+				<!-- todo: document sample names -->
+				<Sample Name="Sample_590" Offset="0x35D100"/>
+				<Sample Name="Sample_591" Offset="0x365DB0"/>
+				<Sample Name="Islamic Chant" Offset="0x36C840"/>
+				<!-- ntsc end -->
+				<Sample Name="Resonant Bass Marimba" Offset="0x37A4B0" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x381930"/>
+				<Sample Name="Off Hi-Hat" Offset="0x38D230" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x391FD0" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x395710" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x397A60"/>
+				<Sample Name="Harpsichord (High)" Offset="0x398650" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x39FBE0" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x3A2280" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x3A4410" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x3AC3B0" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3AFA80" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x3B4330" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x3B5350" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x3B6B40" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x3B7A60" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3C1F90"/>
+				<Sample Name="Goron Drum" Offset="0x3C7A90"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3C9FD0" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3CB570"/>
+				<Sample Name="Flute and Voice" Offset="0x3D1980" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3D2840" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3D37A0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3D45A0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3D6860" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3D9030" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3DBB00"/>
+				<Sample Name="Cowbell" Offset="0x3DCA50" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3DD710" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3DFEF0"/>
+				<Sample Name="Guitar (High)" Offset="0x3E20B0" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3E3F80" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3E8000"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3ECC50"/>
+				<Sample Name="Goron Oh" Offset="0x3ED4F0"/>
+				<Sample Name="Banjo (Low)" Offset="0x3EDFB0" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3F0DF0" SampleRate="38054"/>
+				<!-- ntsc start -->
+				<!-- Islamic Chant offset moved to earlier block in ntsc -->
+				<!-- ntsc end -->
+				<Sample Name="Steel Drum" Offset="0x3F3690"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3F82F0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/code/fbdemo_circle.xml b/soh/assets/xml/N64_NTSC_11/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..0d4f5766fa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEC268" RangeEnd="0xED488">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEC268"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEC668"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xECA68"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xECE68"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xED268">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xED488"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/code/fbdemo_triforce.xml b/soh/assets/xml/N64_NTSC_11/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..f7d695946c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEB6F0" RangeEnd="0xEB7C0">
+        <DList Name="sTransTriforceDL" Offset="0xEB6F0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEB720">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_NTSC_11/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..61a6da3858
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEB7C0" RangeEnd="0xEC150" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEB7C0">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEB950"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEC150"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/code/sys_matrix.xml b/soh/assets/xml/N64_NTSC_11/code/sys_matrix.xml
new file mode 100644
index 0000000000..3760c930cd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x800110A0" RangeStart="0xEDED0" RangeEnd="0xEDF10">
+        <Mtx Name="gMtxClear"  Offset="0xEDED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/misc/link_animetion.xml b/soh/assets/xml/N64_NTSC_11/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_NTSC_11/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/gameplay_field_keep.xml b/soh/assets/xml/N64_NTSC_11/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/gameplay_keep.xml b/soh/assets/xml/N64_NTSC_11/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_Bb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ahg.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_am.xml b/soh/assets/xml/N64_NTSC_11/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ane.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ani.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_anubice.xml b/soh/assets/xml/N64_NTSC_11/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_aob.xml b/soh/assets/xml/N64_NTSC_11/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_b_heart.xml b/soh/assets/xml/N64_NTSC_11/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bba.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bdan_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bdoor.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bg.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bigokuta.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bird.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bji.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bl.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_blkobj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bob.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_boj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bombf.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bombiwa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bowl.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_box.xml b/soh/assets/xml/N64_NTSC_11/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_brob.xml b/soh/assets/xml/N64_NTSC_11/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bubble.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bv.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bwall.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_bxa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_cne.xml b/soh/assets/xml/N64_NTSC_11/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_cob.xml b/soh/assets/xml/N64_NTSC_11/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_cow.xml b/soh/assets/xml/N64_NTSC_11/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_crow.xml b/soh/assets/xml/N64_NTSC_11/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_cs.xml b/soh/assets/xml/N64_NTSC_11/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_d_elevator.xml b/soh/assets/xml/N64_NTSC_11/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_d_hsblock.xml b/soh/assets/xml/N64_NTSC_11/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_d_lift.xml b/soh/assets/xml/N64_NTSC_11/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_daiku.xml b/soh/assets/xml/N64_NTSC_11/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ddan_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dekubaba.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dekujr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dekunuts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_demo_6k.xml b/soh/assets/xml/N64_NTSC_11/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_NTSC_11/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_demo_tre_lgt.xml b/soh/assets/xml/N64_NTSC_11/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dh.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dnk.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dns.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dodojr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dodongo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dog.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_door_gerudo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_door_killer.xml b/soh/assets/xml/N64_NTSC_11/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ds.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ds2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_du.xml b/soh/assets/xml/N64_NTSC_11/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_dy_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ec.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_crystal_light.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_doughnut.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_erupc.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_fire_ball.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_flash.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_lgt_shower.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_star_field.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_efc_tw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ei.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fd.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fd2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fhg.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fire.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_firefly.xml b/soh/assets/xml/N64_NTSC_11/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fish.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fu.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_fz.xml b/soh/assets/xml/N64_NTSC_11/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime3.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ganon_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ge1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_geff.xml b/soh/assets/xml/N64_NTSC_11/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_geldb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrow.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrowcase.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bean.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bombpouch.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_boomerang.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bosskey.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle_letter.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bow.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_bracelet.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_brokensword.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_clothes.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_coin.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_compass.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_egg.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_eye_lotion.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_fire.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_fish.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_frog.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_ghost.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_glasses.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_gloves.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_goddess.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_grass.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_hammer.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_heart.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_hearts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_hookshot.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_insect.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_jewel.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_key.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_letter.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_liquid.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_longsword.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_m_arrow.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_magicpot.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_map.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_medal.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_melody.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_milk.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_mushroom.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_nuts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_pachinko.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_powder.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_prescription.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_purse.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_redead_mask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_rupy.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_saw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_scale.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_seed.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_skj_mask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_soldout.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_soul.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_stick.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_sutaru.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_sword_1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gjyo_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gla.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gm.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gnd.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gnd_magic.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gndd.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_god_lgt.xml b/soh/assets/xml/N64_NTSC_11/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gol.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_goma.xml b/soh/assets/xml/N64_NTSC_11/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_goroiwa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gs.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_gt.xml b/soh/assets/xml/N64_NTSC_11/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_haka.xml b/soh/assets/xml/N64_NTSC_11/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_haka_door.xml b/soh/assets/xml/N64_NTSC_11/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_haka_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hakach_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hata.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_heavy_object.xml b/soh/assets/xml/N64_NTSC_11/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hidan_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hintnuts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hni.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_horse.xml b/soh/assets/xml/N64_NTSC_11/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_horse_ganon.xml b/soh/assets/xml/N64_NTSC_11/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_horse_link_child.xml b/soh/assets/xml/N64_NTSC_11/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_horse_normal.xml b/soh/assets/xml/N64_NTSC_11/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_horse_zelda.xml b/soh/assets/xml/N64_NTSC_11/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_hs.xml b/soh/assets/xml/N64_NTSC_11/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_human.xml b/soh/assets/xml/N64_NTSC_11/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ice_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ik.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_im.xml b/soh/assets/xml/N64_NTSC_11/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_in.xml b/soh/assets/xml/N64_NTSC_11/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ingate.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_jj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_js.xml b/soh/assets/xml/N64_NTSC_11/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_jya_door.xml b/soh/assets/xml/N64_NTSC_11/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_jya_iron.xml b/soh/assets/xml/N64_NTSC_11/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_jya_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ka.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kanban.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kibako2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kingdodongo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_km1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kusa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kw1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_kz.xml b/soh/assets/xml/N64_NTSC_11/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_light_ring.xml b/soh/assets/xml/N64_NTSC_11/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_lightbox.xml b/soh/assets/xml/N64_NTSC_11/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_lightswitch.xml b/soh/assets/xml/N64_NTSC_11/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_link_boy.xml b/soh/assets/xml/N64_NTSC_11/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_link_child.xml b/soh/assets/xml/N64_NTSC_11/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ma1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ma2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mag.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mag.xml
new file mode 100644
index 0000000000..257f723635
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mag.xml
@@ -0,0 +1,20 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" Format="rgba32" Width="160" Height="160" Offset="0x300"/>
+        <Texture Name="gTitleCopyright1998Tex" OutName="title_copyright_1998" Format="ia8" Width="128" Height="16" Offset="0x19300"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19B00"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A300"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1AB00"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1B300"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1BB00"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1C300"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1CB00"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1D300"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1DB00"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1E300"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1E700"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1E940"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EC40"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mamenoki.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mastergolon.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_masterkokiri.xml b/soh/assets/xml/N64_NTSC_11/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_NTSC_11/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_masterzoora.xml b/soh/assets/xml/N64_NTSC_11/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_md.xml b/soh/assets/xml/N64_NTSC_11/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_medal.xml b/soh/assets/xml/N64_NTSC_11/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_menkuri_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mir_ray.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mizu_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_dark.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flame.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flash.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_ice.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_oka.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_soul.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mjin_wind.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mk.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mm.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1a.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2a.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mori_tex.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ms.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_mu.xml b/soh/assets/xml/N64_NTSC_11/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_nb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_niw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_nwc.xml b/soh/assets/xml/N64_NTSC_11/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ny.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA10.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA11.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA3.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA4.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA5.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA6.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA7.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA8.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oA9.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oB1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oB2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oB3.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oB4.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE10.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE11.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE12.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE1s.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE3.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE4.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE4s.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE5.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE6.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE7.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE8.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE9.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oE_anime.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oF1d_map.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_oF1s.xml b/soh/assets/xml/N64_NTSC_11/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_o_anime.xml b/soh/assets/xml/N64_NTSC_11/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_okuta.xml b/soh/assets/xml/N64_NTSC_11/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_opening_demo1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_os.xml b/soh/assets/xml/N64_NTSC_11/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_os_anime.xml b/soh/assets/xml/N64_NTSC_11/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ossan.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ouke_haka.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_owl.xml b/soh/assets/xml/N64_NTSC_11/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_peehat.xml b/soh/assets/xml/N64_NTSC_11/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_po_composer.xml b/soh/assets/xml/N64_NTSC_11/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_po_field.xml b/soh/assets/xml/N64_NTSC_11/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_po_sisters.xml b/soh/assets/xml/N64_NTSC_11/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_poh.xml b/soh/assets/xml/N64_NTSC_11/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ps.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_pu_box.xml b/soh/assets/xml/N64_NTSC_11/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_rd.xml b/soh/assets/xml/N64_NTSC_11/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_reeba.xml b/soh/assets/xml/N64_NTSC_11/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_relay_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_rl.xml b/soh/assets/xml/N64_NTSC_11/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_rr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_rs.xml b/soh/assets/xml/N64_NTSC_11/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ru1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ru2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_sa.xml b/soh/assets/xml/N64_NTSC_11/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_sb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_sd.xml b/soh/assets/xml/N64_NTSC_11/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_shop_dungen.xml b/soh/assets/xml/N64_NTSC_11/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_shopnuts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_siofuki.xml b/soh/assets/xml/N64_NTSC_11/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_sk2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_skb.xml b/soh/assets/xml/N64_NTSC_11/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_skj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot00_break.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot00_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoya.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoyab.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot02_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot03_object.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot04_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot05_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot06_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot07_object.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot08_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot09_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot11_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot12_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot15_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot16_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot17_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_spot18_obj.xml b/soh/assets/xml/N64_NTSC_11/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ssh.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_sst.xml b/soh/assets/xml/N64_NTSC_11/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_st.xml b/soh/assets/xml/N64_NTSC_11/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_stream.xml b/soh/assets/xml/N64_NTSC_11/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_syokudai.xml b/soh/assets/xml/N64_NTSC_11/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ta.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_timeblock.xml b/soh/assets/xml/N64_NTSC_11/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tite.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tk.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_toki_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_torch2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_toryo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tp.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tr.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_trap.xml b/soh/assets/xml/N64_NTSC_11/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_triforce_spot.xml b/soh/assets/xml/N64_NTSC_11/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ts.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tsubo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_tw.xml b/soh/assets/xml/N64_NTSC_11/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_umajump.xml b/soh/assets/xml/N64_NTSC_11/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_vali.xml b/soh/assets/xml/N64_NTSC_11/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_vase.xml b/soh/assets/xml/N64_NTSC_11/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_vm.xml b/soh/assets/xml/N64_NTSC_11/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_wallmaster.xml b/soh/assets/xml/N64_NTSC_11/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_warp1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_warp2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_wf.xml b/soh/assets/xml/N64_NTSC_11/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_wood02.xml b/soh/assets/xml/N64_NTSC_11/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_xc.xml b/soh/assets/xml/N64_NTSC_11/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_yabusame_point.xml b/soh/assets/xml/N64_NTSC_11/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_ydan_objects.xml b/soh/assets/xml/N64_NTSC_11/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_yukabyun.xml b/soh/assets/xml/N64_NTSC_11/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zf.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zg.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zl1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zl2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime1.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime2.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zl4.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/objects/object_zo.xml b/soh/assets/xml/N64_NTSC_11/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..73ca01696d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80A5E9F0" RangeStart="0x960" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x960" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1160" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1960" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C10" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CC0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..fb7e2e0784
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80A608B0" RangeStart="0x980" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..93ffad996e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80A62790" RangeStart="0x990" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x990" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1190" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1990" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C40" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CF0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..2d32a87728
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80A53F30" RangeStart="0x1110" RangeEnd="0x24EC">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1110"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1918">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1958"/>
+        <DList Name="sPlatformTopDL" Offset="0x19E0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A38"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A50">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A90"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1AA8"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x22A8">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2328"/>
+        
+        <Collision Name="sCol" Offset="0x24C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..8182ca3da8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80A325A0" RangeStart="0x1830" RangeEnd="0x19C8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1830">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1870"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..605d6a73e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x8089D8C0" RangeStart="0x61C8" RangeEnd="0x91C8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..e6fcdab9eb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x809F1E60" RangeStart="0xE398" RangeEnd="0x20EB4">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE428" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF528" TlutOffset="0xF4E8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10218" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B490" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C100" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CB98" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D398" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB68" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E368" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1EC70" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FCD8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20050" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20450" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF4E8" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x112E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x136E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x142E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x166E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x172E0" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17EE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18AE0" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x196E0" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA18" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1F9D0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FA08" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA40" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FA78" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAB0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FAE8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB20" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB58" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FB90" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBC8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FC00" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC38" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE3D8" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE3F8" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF468" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF958" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFA00" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11258" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112C8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A320" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A3D0" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A448" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BEA0" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BF90" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C038" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CAA0" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D938" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA50" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EBA8" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FF08" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x1FFD0" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DB0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..2c5dd60e8d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x80B05610" RangeStart="0x9F48" RangeEnd="0x10788">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x9F48"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0xAF48">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0xAF88"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0xAFF8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0xB010">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0xB050"/>
+        <DList Name="gGanonShadowModelDL" Offset="0xB070"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0xB4A0"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0xB6A0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0xB800"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0xB918"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0xC918">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0xC958"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0xC9D8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0xD3D8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0xD418"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0xD4A0"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0xDCA0">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0xDE40"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0xDF60"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0xE760">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0xE8C0"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0xE9C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0xEDC8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0xEE08"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0xEE88"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0xF088"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0xF888">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0xF8B8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0xFAB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0xFBA8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0xFC58">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCB8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFD78">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE18">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF18">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x10028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..a18a449dcd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80A17C50" RangeStart="0xA330" RangeEnd="0xACE0">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3A8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA860" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA330"/>
+        <DList Name="sHandTrailDList" Offset="0xA348"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7A8"/>
+        <DList Name="sShadowDList" Offset="0xAC60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..6df7aff6d7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80A729B0" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Bili.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..bd4f305f76
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x808C00B0" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..79feadafc2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x80A92B50" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..8c8bcc3299
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80AE89C0" RangeStart="0x11E8" RangeEnd="0x4118">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11E8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21E8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29E8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32E8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3340"/>
+
+        <DList Name="gMantDL" Offset="0x3398"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37E8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..96ae1b093d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80AC8460" RangeStart="0x328" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x328"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB28"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD28"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDA8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFA8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11A8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1228"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1428"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1628"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1728"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1928"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x1968"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4BE8"/>
+        <DList Name="sRoomStatuesDL" Offset="0x69F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Holl.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..9f2042ae52
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80895730" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..f6fb08be67
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80ADBEC0" RangeStart="0x12B8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12B8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22B8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BB8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34B8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E30"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DB8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E38"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EA8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42D8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Kanban.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..ce21430e1f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80AA1D40" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sda.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..d3aeb19589
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80A91450" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x14A8">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14E8"/>
+        <DList Name="D_80AFA3F8" Offset="0x1508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ssh.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..9dc8c7814f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80B25730" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_St.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..5f76146ccc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x808C41D0" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sth.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..ad65bc77d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80B27D20" RangeStart="0xE60" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE60"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEE0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFE0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1060"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1860"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C60"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CE0"/>
+        <DList Name="D_80B0A050" Offset="0x2A80"/>
+        <DList Name="D_80B0A3C0" Offset="0x2DF0"/>
+        <Animation Name="sChildDanceAnim" Offset="0x3590"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E24"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_End_Title.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..4fd2822e9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B1ADE0" RangeStart="0x6F0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6F0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1230"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1930"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20B0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CB0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38B0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EB0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F10"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..dba3fe1bb0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_File_Choose.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803880" RangeStart="0xEC50" RangeEnd="0xF330">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC50" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German headers vertices are combined into one array -->
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF70" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German options vertices are combined into one array -->
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF070" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- Not used for NTSC N64, instead these vertices are apart of D_80811F30 -->
+        <!-- <Array Name="D_80812130" Count="12" Offset="0xF6A0" Static="Off">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF270" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2B0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2F0" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- PAL N64 only -->
+        <!-- <Array Name="gOptionsDividerChangeLangVtx" Count="4" Offset="0xF8E0" Static="Off">
+            <Vtx/>
+        </Array> -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..f3b41cbfff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80A2BB70" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..06dc7a0489
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x8095D8C0" RangeStart="0xB20" RangeEnd="0x2170">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB20"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B20">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1FE0"/>
+        <DList Name="sModelDL" Offset="0x2008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..e7cd35c2c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x8095BBC0" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..8755d12b8d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B19EB0" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..8aeb6aef91
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B390C0" RangeStart="0x740" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x740"/>
+        <DList Name="sMaterialDL" Offset="0x1740"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x1998"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..56e3a9ea4a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B2BDD0" RangeStart="0x4F0" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x4F0"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x8F0">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xB70"/>
+        <DList Name="sFrustumDL" Offset="0xBF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..2b68cc893c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B46710" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..5515d4585c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B47E80" RangeStart="0x430" RangeEnd="0x16C8">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..24902b2a87
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B7B0C0" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..ad43114260
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5D28" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x6528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x7528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7D28" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x8528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x9928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC328" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCBB8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B58" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5358" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xAC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xB030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xC030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xD030" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDE30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE630" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xEA30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF230" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x2408" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2C08" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x3408" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x3808" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x3908" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34E0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6EC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x76C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x82C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x85F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x91F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x95F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xADF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10FF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x117F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11FF8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xACD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCCD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xD0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD4D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xE0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xF0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF8D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x108D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x118D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x124D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15370" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16B70" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x50E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x54E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x64E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9188" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1260" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2260" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8188" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9188" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9588" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D88" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA588" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x4A00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x5600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x6600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x7200" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x35A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x49A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4DA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x6548" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x7548" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x7948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7D48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x8148" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x8948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..6b22223cd5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31C8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE40" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39C8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE40" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21C8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..b279628898
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFC10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0x10010" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x10810" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x10A10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10E10" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7F0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF810"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFA10"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/men.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/bowling.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/hut.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/impa.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kakariko.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/labo.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/link_home.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/malon_stable.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/tent.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/enrui.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/entra_n.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/hiral_demo.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/kakariko3.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley_n.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/market_day.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/market_night.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/market_ruins.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_n.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_r.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/misc/turibori.xml b/soh/assets/xml/N64_NTSC_11/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/entra.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/souko.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot00.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot01.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..dcee38761f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E78"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot02.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot03.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot04.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..ccff0d05bf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBDF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC5F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xC9F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCDF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD1F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD2F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD3F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD7F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xDFF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE7F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xEFF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF3F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFBF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11DF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x12FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x131F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x135F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x141F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x149F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x151F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x159F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x15FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x163F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x167F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDF30" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x16FF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18980" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19180" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19980" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A180" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A380" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AB80" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AD80" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1AF80" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4E88" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x5288" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x5688" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x6688" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6E88" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B58" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D58" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2B98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2D98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2F98" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x3398" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3B98" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x4398" ExternalTlut="spot04_scene" ExternalTlutOffset="0xDFE0" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x4598" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2B58"/>
+        <DList Name="gSpot04DL_005058" Offset="0x4FF8"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot05.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot06.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot07.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot08.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot09.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..58f1f75020
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x6F18"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8590"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot10.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot11.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot12.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot13.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot15.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot16.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..6c059858be
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xA9C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot17.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..c50cacdb36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBC8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7C8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0C8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4C8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCC8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11248" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A48" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12248" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot18.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot20.xml b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/alley_shop.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/drag.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/face_shop.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/golon.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/kokiri_shop.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/night_shop.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/shop1.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/scenes/shops/zoora.xml b/soh/assets/xml/N64_NTSC_11/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/text/elf_message_field.xml b/soh/assets/xml/N64_NTSC_11/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/text/elf_message_ydan.xml b/soh/assets/xml/N64_NTSC_11/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/text/message_data_static.xml b/soh/assets/xml/N64_NTSC_11/text/message_data_static.xml
new file mode 100644
index 0000000000..ca67ce4a07
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF9A6C" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFDBAC"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x101DCC"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/backgrounds.xml b/soh/assets/xml/N64_NTSC_11/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/boss_title_cards.xml b/soh/assets/xml/N64_NTSC_11/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/textures/do_action_static.xml b/soh/assets/xml/N64_NTSC_11/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_24_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_dungeon_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_field_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_gameover_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_jpn_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_nes_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/icon_item_static.xml b/soh/assets/xml/N64_NTSC_11/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/item_name_static.xml b/soh/assets/xml/N64_NTSC_11/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/kanji.xml b/soh/assets/xml/N64_NTSC_11/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/textures/map_48x85_static.xml b/soh/assets/xml/N64_NTSC_11/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_11/textures/map_grand_static.xml b/soh/assets/xml/N64_NTSC_11/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/map_i_static.xml b/soh/assets/xml/N64_NTSC_11/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/map_name_static.xml b/soh/assets/xml/N64_NTSC_11/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/message_static.xml b/soh/assets/xml/N64_NTSC_11/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/message_texture_static.xml b/soh/assets/xml/N64_NTSC_11/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/nes_font_static.xml b/soh/assets/xml/N64_NTSC_11/textures/nes_font_static.xml
new file mode 100644
index 0000000000..f1b80ee045
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/nes_font_static.xml
@@ -0,0 +1,144 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_NTSC_11/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/parameter_static.xml b/soh/assets/xml/N64_NTSC_11/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/place_title_cards.xml b/soh/assets/xml/N64_NTSC_11/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/skyboxes.xml b/soh/assets/xml/N64_NTSC_11/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_11/textures/title_static.xml b/soh/assets/xml/N64_NTSC_11/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_11/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/audio/Audio.xml b/soh/assets/xml/N64_NTSC_12/audio/Audio.xml
new file mode 100644
index 0000000000..d66d3cf925
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/audio/Audio.xml
@@ -0,0 +1,639 @@
+<Root>
+	<File Name="code" OutName="audio" RangeStart="0x0" RangeEnd="0x12CBB0">
+		<Audio Name="audio" Offset="0x00" SoundFontTableOffset="0x102710" SequenceTableOffset="0x102B40" SampleBankTableOffset="0x103230" SequenceFontTableOffset="0x102980">
+		<Sequences>
+				<Sequence Name="000_Sound_Effects"/>
+				<Sequence Name="001_Ambient_Effects"/>
+				<Sequence Name="002_Hyrule_Field_Program"/>
+				<Sequence Name="003_Hyrule_Field_Intro"/>
+				<Sequence Name="004_Hyrule_Field_Segment_1"/>
+				<Sequence Name="005_Hyrule_Field_Segment_2"/>
+				<Sequence Name="006_Hyrule_Field_Segment_3"/>
+				<Sequence Name="007_Hyrule_Field_Segment_4"/>
+				<Sequence Name="008_Hyrule_Field_Segment_5"/>
+				<Sequence Name="009_Hyrule_Field_Segment_6"/>
+				<Sequence Name="010_Hyrule_Field_Segment_7"/>
+				<Sequence Name="011_Hyrule_Field_Segment_8"/>
+				<Sequence Name="012_Hyrule_Field_Segment_9"/>
+				<Sequence Name="013_Hyrule_Field_Segment_10"/>
+				<Sequence Name="014_Hyrule_Field_Segment_11"/>
+				<Sequence Name="015_Hyrule_Field_Enemy_Intro"/>
+				<Sequence Name="016_Hyrule_Field_Enemy_1"/>
+				<Sequence Name="017_Hyrule_Field_Enemy_2"/>
+				<Sequence Name="018_Hyrule_Field_Enemy_3"/>
+				<Sequence Name="019_Hyrule_Field_Enemy_4"/>
+				<Sequence Name="020_Hyrule_Field_Idle_1"/>
+				<Sequence Name="021_Hyrule_Field_Idle_2"/>
+				<Sequence Name="022_Hyrule_Field_Idle_3"/>
+				<Sequence Name="023_Hyrule_Field_Idle_4"/>
+				<Sequence Name="024_Dodongos_Cavern"/>
+				<Sequence Name="025_Kakariko_Village_Adult"/>
+				<Sequence Name="026_Battle"/>
+				<Sequence Name="027_Boss_Battle"/>
+				<Sequence Name="028_Inside_the_Deku_Tree"/>
+				<Sequence Name="029_Market"/>
+				<Sequence Name="030_Title_Theme"/>
+				<Sequence Name="031_House"/>
+				<Sequence Name="032_Game_Over"/>
+				<Sequence Name="033_Boss_Defeated"/>
+				<Sequence Name="034_Got_Key_Item"/>
+				<Sequence Name="035_Ganondorf_Sting"/>
+				<Sequence Name="036_Got_Heart_Container"/>
+				<Sequence Name="037_Prelude_of_Light"/>
+				<Sequence Name="038_Inside_Jabu_Jabus_Belly"/>
+				<Sequence Name="039_Kakariko_Village_Child"/>
+				<Sequence Name="040_Fairy_Fountain"/>
+				<Sequence Name="041_Zeldas_Theme"/>
+				<Sequence Name="042_Fire_Temple"/>
+				<Sequence Name="043_Anticipating_Treasure"/>
+				<Sequence Name="044_Forest_Temple"/>
+				<Sequence Name="045_Hyrule_Castle_Courtyard"/>
+				<Sequence Name="046_Ganondorf_Theme_Organ"/>
+				<Sequence Name="047_Lon_Lon_Ranch"/>
+				<Sequence Name="048_Goron_City"/>
+				<Sequence Name="049_Hyrule_Field_Morning"/>
+				<Sequence Name="050_Got_Spiritual_Stone"/>
+				<Sequence Name="051_Bolero_of_Fire"/>
+				<Sequence Name="052_Minuet_of_Forest"/>
+				<Sequence Name="053_Serenade_of_Water"/>
+				<Sequence Name="054_Requiem_of_Spirit"/>
+				<Sequence Name="055_Nocturne_of_Shadow"/>
+				<Sequence Name="056_Mini_Boss_Battle"/>
+				<Sequence Name="057_Got_Item"/>
+				<Sequence Name="058_Temple_of_Time"/>
+				<Sequence Name="059_Rescued_Epona"/>
+				<Sequence Name="060_Kokiri_Forest"/>
+				<Sequence Name="061_Got_Fairy_Ocarina"/>
+				<Sequence Name="062_Lost_Woods"/>
+				<Sequence Name="063_Spirit_Temple"/>
+				<Sequence Name="064_Horse_Minigame"/>
+				<Sequence Name="065_Horse_Minigame_Goal"/>
+				<Sequence Name="066_Ingos_Theme"/>
+				<Sequence Name="067_Got_Medallion"/>
+				<Sequence Name="068_Sarias_Song"/>
+				<Sequence Name="069_Eponas_Song"/>
+				<Sequence Name="070_Zeldas_Lullaby"/>
+				<Sequence Name="071_Suns_Song"/>
+				<Sequence Name="072_Song_of_Time"/>
+				<Sequence Name="073_Song_of_Storms"/>
+				<Sequence Name="074_Navi_in_Flight"/>
+				<Sequence Name="075_Deku_Tree_Theme"/>
+				<Sequence Name="076_Windmill"/>
+				<Sequence Name="077_Legends_of_Hyrule"/>
+				<Sequence Name="078_Game_Shops"/>
+				<Sequence Name="079_Sheiks_Theme"/>
+				<Sequence Name="080_Zoras_Domain"/>
+				<Sequence Name="081_Zelda_Sting"/>
+				<Sequence Name="082_Zeldas_Theme_Ending"/>
+				<Sequence Name="083_Got_Master_Sword"/>
+				<Sequence Name="084_Ganondorfs_Theme"/>
+				<Sequence Name="085_Shop"/>
+				<Sequence Name="086_Chamber_of_Sages"/>
+				<Sequence Name="087_File_Select" Extract="false"/> <!-- The data in the sequence table just uses a reference pointer to the Fairy Fountain sequence. -->
+				<Sequence Name="088_Ice_Cavern"/>
+				<Sequence Name="089_Opening_the_Door_of_Time"/>
+				<Sequence Name="090_Kaepora_Gaeboras_Theme"/>
+				<Sequence Name="091_Shadow_Temple"/>
+				<Sequence Name="092_Water_Temple"/>
+				<Sequence Name="093_The_Sages_Bridge"/>
+				<Sequence Name="094_Seal_of_the_Six_Sages"/>
+				<Sequence Name="095_Gerudo_Valley"/>
+				<Sequence Name="096_Potion_Shop"/>
+				<Sequence Name="097_Koume_and_Kotakes_Theme"/>
+				<Sequence Name="098_Escape_from_Ganons_Castle"/>
+				<Sequence Name="099_Ganondorfs_Castle"/>
+				<Sequence Name="100_Ganondorf_Battle"/>
+				<Sequence Name="101_Ganon_Battle"/>
+				<Sequence Name="102_Ending_Credits_1"/>
+				<Sequence Name="103_Ending_Credits_2"/>
+				<Sequence Name="104_Ending_Credits_3"/>
+				<Sequence Name="105_Ending_Credits_4"/>
+				<Sequence Name="106_Ending_Credits_5"/>
+				<Sequence Name="107_Dodongo_and_Volvagia_Battle"/>
+				<Sequence Name="108_Timed_Minigame"/>
+				<Sequence Name="109_Cutscene_Effects"/>
+			</Sequences>
+			<Samples Bank="0">
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
+			</Samples>
+			<Samples Bank="1">
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
+			</Samples>
+
+			<Samples Bank="2">
+				<Sample Name="Warm Pad" Offset="0"/>
+			</Samples>
+			
+			<Samples Bank="3">
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
+		</Samples>
+		<Samples Bank="4">
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
+	</Samples>
+
+	<Samples Bank="5">
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
+	</Samples>
+
+	<Samples Bank="6">
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
+	</Samples>
+		
+
+		   <Soundfont Name="02_Ambient_Sounds" Index="2"/>
+		   <Soundfont Name="37_Unused_Deku_Tree" Index="37" OverrideSampleBank="2"/>
+		   <Soundfont Name="04_Deku_Tree" Index="4"/>
+			<Soundfont Name="11_Dodongos_Cavern" Index="11"/>
+			<Soundfont Name="33_Ending_1" Index="33"/>
+			<Soundfont Name="34_Ending_2" Index="34"/>
+			<Soundfont Name="09_Fairy_Fountain" Index="9"/>
+			<Soundfont Name="10_Fire_Temple" Index="10"/>
+			<Soundfont Name="12_Forest_Temple" Index="12"/>
+			<Soundfont Name="35_Game_Over" Index="35"/>
+			<Soundfont Name="30_Ganons_Castle_Organ" Index="30"/>
+			<Soundfont Name="31_Ganons_Castle" Index="31"/>
+			<Soundfont Name="32_Ganondorfs_Battle" Index="32"/>
+			<Soundfont Name="27_Gerudo_Valley" Index="27"/>
+			<Soundfont Name="14_Goron_City" Index="14"/>
+			<Soundfont Name="17_Horse_Race" Index="17"/>
+			<Soundfont Name="23_Ice_Cavern" Index="23"/>
+			<Soundfont Name="07_Jabu_Jabu" Index="7"/>
+			<Soundfont Name="36_Kaepora_Gaeboras_Theme" Index="36"/>
+			<Soundfont Name="08_Child_Kakariko_Village" Index="8"/>
+			<Soundfont Name="15_Kokiri_Forest" Index="15"/>
+			<Soundfont Name="29_Kotake_and_Koumes_Theme" Index="29"/>
+			<Soundfont Name="28_Lakeside_Laboratory" Index="28"/>
+			<Soundfont Name="19_Legends_of_Hyrule" Index="19"/>
+			<Soundfont Name="13_Lon_Lon_Ranch" Index="13"/>
+			<Soundfont Name="05_Market" Index="5"/>
+			<Soundfont Name="20_Minigames" Index="20"/>
+			<Soundfont Name="03_Orchestra" Index="3"/>
+			<Soundfont Name="24_Shadow_Temple" Index="24"/>
+			<Soundfont Name="22_Shops" Index="22"/>
+			<Soundfont Name="00_Sound_Effects_1" Index="0" Symbol="gSoundEffectsFont1"/>
+			<Soundfont Name="01_Sound_Effects_2" Index="1" Symbol="gSoundEffectsFont2"/>
+			<Soundfont Name="16_Spirit_Temple" Index="16"/>
+			<Soundfont Name="06_Title_Theme" Index="6"/>
+			<Soundfont Name="26_Unused" Index="26"/>
+			<Soundfont Name="18_Warp_Songs" Index="18"/>
+			<Soundfont Name="25_Water_Temple" Index="25"/>
+			<Soundfont Name="21_Zoras_Domain" Index="21"/>
+		
+		
+		</Audio>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/code/fbdemo_circle.xml b/soh/assets/xml/N64_NTSC_12/code/fbdemo_circle.xml
new file mode 100644
index 0000000000..b7e54845ad
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/code/fbdemo_circle.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xEC0B8" RangeEnd="0xED2D8">
+        <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xEC0B8"/>
+        <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xEC4B8"/>
+        <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xEC8B8"/>
+        <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xECCB8"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0xED0B8">
+            <Vtx/>
+        </Array>
+        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
+        <!--<DList Name="sCircleWipeDL" Offset="0xED2D8"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/code/fbdemo_triforce.xml b/soh/assets/xml/N64_NTSC_12/code/fbdemo_triforce.xml
new file mode 100644
index 0000000000..a0886ab521
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/code/fbdemo_triforce.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xEB540" RangeEnd="0xEB610">
+        <DList Name="sTransTriforceDL" Offset="0xEB540"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0xEB570">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_NTSC_12/code/fbdemo_wipe1.xml
new file mode 100644
index 0000000000..7c5aad68e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/code/fbdemo_wipe1.xml
@@ -0,0 +1,10 @@
+<Root>
+    <!-- ZAPD isn't finding sTransWipeVtx and sTransWipeTex properly for sWipe1DL, instead finding symbols much later in `code`-->
+    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xEB610" RangeEnd="0xEBFA0" Segment="0">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0xEB610">
+            <Vtx/>
+        </Array>
+        <Texture Name="sTransWipeTex" Format="i4" Width="64" Height="64" Offset="0xEB7A0"/>
+       <!-- <DList Name="sWipe1DL" Offset="0xEBFA0"/>-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/code/sys_matrix.xml b/soh/assets/xml/N64_NTSC_12/code/sys_matrix.xml
new file mode 100644
index 0000000000..25d8331f34
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x800116E0" RangeStart="0xEDD10" RangeEnd="0xEDD50">
+        <Mtx Name="gMtxClear"  Offset="0xEDD10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/misc/link_animetion.xml b/soh/assets/xml/N64_NTSC_12/misc/link_animetion.xml
new file mode 100644
index 0000000000..9de1e92d36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/misc/link_animetion.xml
@@ -0,0 +1,577 @@
+<Root>
+    <File Name="link_animetion" Segment="7">
+        <PlayerAnimationData Name="gPlayerAnimData_000000" FrameCount="20" Offset="0x0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_000A80" FrameCount="20" Offset="0xA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001500" FrameCount="15" Offset="0x1500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_001CE0" FrameCount="24" Offset="0x1CE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_002970" FrameCount="15" Offset="0x2970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003150" FrameCount="26" Offset="0x3150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_003EF0" FrameCount="20" Offset="0x3EF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_004970" FrameCount="20" Offset="0x4970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0053F0" FrameCount="10" Offset="0x53F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_005930" FrameCount="30" Offset="0x5930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0068F0" FrameCount="30" Offset="0x68F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0078B0" FrameCount="35" Offset="0x78B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_008B10" FrameCount="40" Offset="0x8B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00A000" FrameCount="20" Offset="0xA000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00AA80" FrameCount="25" Offset="0xAA80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00B7A0" FrameCount="20" Offset="0xB7A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00C220" FrameCount="40" Offset="0xC220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00D710" FrameCount="51" Offset="0xD710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_00F1D0" FrameCount="133" Offset="0xF1D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_013770" FrameCount="33" Offset="0x13770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0148C0" FrameCount="55" Offset="0x148C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_016590" FrameCount="100" Offset="0x16590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0199F0" FrameCount="100" Offset="0x199F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01CE50" FrameCount="40" Offset="0x1CE50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01E340" FrameCount="40" Offset="0x1E340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_01F830" FrameCount="20" Offset="0x1F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0202B0" FrameCount="20" Offset="0x202B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_020D30" FrameCount="110" Offset="0x20D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0246D0" FrameCount="35" Offset="0x246D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_025930" FrameCount="25" Offset="0x25930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_026650" FrameCount="20" Offset="0x26650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0270D0" FrameCount="15" Offset="0x270D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0278B0" FrameCount="55" Offset="0x278B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_029580" FrameCount="30" Offset="0x29580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02A540" FrameCount="30" Offset="0x2A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02B500" FrameCount="30" Offset="0x2B500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02C4C0" FrameCount="51" Offset="0x2C4C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_02DF80" FrameCount="78" Offset="0x2DF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_030860" FrameCount="30" Offset="0x30860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_031820" FrameCount="35" Offset="0x31820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_032A80" FrameCount="36" Offset="0x32A80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_033D60" FrameCount="35" Offset="0x33D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_034FC0" FrameCount="36" Offset="0x34FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0362A0" FrameCount="30" Offset="0x362A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_037260" FrameCount="50" Offset="0x37260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_038C90" FrameCount="21" Offset="0x38C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_039790" FrameCount="21" Offset="0x39790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A290" FrameCount="5" Offset="0x3A290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03A530" FrameCount="55" Offset="0x3A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_03C200" FrameCount="365" Offset="0x3C200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_048110" FrameCount="110" Offset="0x48110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04BAB0" FrameCount="80" Offset="0x4BAB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04E490" FrameCount="30" Offset="0x4E490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_04F450" FrameCount="30" Offset="0x4F450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050410" FrameCount="20" Offset="0x50410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_050E90" FrameCount="60" Offset="0x50E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_052E00" FrameCount="45" Offset="0x52E00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_054590" FrameCount="45" Offset="0x54590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_055D20" FrameCount="90" Offset="0x55D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_058C40" FrameCount="90" Offset="0x58C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05BB60" FrameCount="45" Offset="0x5BB60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05D2F0" FrameCount="60" Offset="0x5D2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F260" FrameCount="11" Offset="0x5F260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_05F830" FrameCount="16" Offset="0x5F830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060090" FrameCount="11" Offset="0x60090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060660" FrameCount="18" Offset="0x60660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_060FD0" FrameCount="10" Offset="0x60FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061510" FrameCount="11" Offset="0x61510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061AE0" FrameCount="9" Offset="0x61AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_061FA0" FrameCount="13" Offset="0x61FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062670" FrameCount="12" Offset="0x62670"/>
+        <PlayerAnimationData Name="gPlayerAnimData_062CC0" FrameCount="8" Offset="0x62CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0630F0" FrameCount="15" Offset="0x630F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0638D0" FrameCount="18" Offset="0x638D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064240" FrameCount="19" Offset="0x64240"/>
+        <PlayerAnimationData Name="gPlayerAnimData_064C40" FrameCount="34" Offset="0x64C40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_065E10" FrameCount="18" Offset="0x65E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066780" FrameCount="16" Offset="0x66780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_066FE0" FrameCount="16" Offset="0x66FE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_067840" FrameCount="16" Offset="0x67840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0680A0" FrameCount="16" Offset="0x680A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068900" FrameCount="8" Offset="0x68900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_068D30" FrameCount="8" Offset="0x68D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069160" FrameCount="7" Offset="0x69160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069510" FrameCount="16" Offset="0x69510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_069D70" FrameCount="13" Offset="0x69D70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06A440" FrameCount="21" Offset="0x6A440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06AF40" FrameCount="19" Offset="0x6AF40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06B940" FrameCount="9" Offset="0x6B940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06BE00" FrameCount="32" Offset="0x6BE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06CEC0" FrameCount="15" Offset="0x6CEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06D6A0" FrameCount="14" Offset="0x6D6A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06DE00" FrameCount="16" Offset="0x6DE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06E660" FrameCount="16" Offset="0x6E660"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06EEC0" FrameCount="29" Offset="0x6EEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FDF0" FrameCount="3" Offset="0x6FDF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_06FF90" FrameCount="3" Offset="0x6FF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070130" FrameCount="3" Offset="0x70130"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0702D0" FrameCount="5" Offset="0x702D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_070570" FrameCount="31" Offset="0x70570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0715B0" FrameCount="16" Offset="0x715B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_071E10" FrameCount="9" Offset="0x71E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0722D0" FrameCount="29" Offset="0x722D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073200" FrameCount="3" Offset="0x73200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0733A0" FrameCount="3" Offset="0x733A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073540" FrameCount="3" Offset="0x73540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0736E0" FrameCount="5" Offset="0x736E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_073980" FrameCount="31" Offset="0x73980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0749C0" FrameCount="16" Offset="0x749C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_075220" FrameCount="9" Offset="0x75220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0756E0" FrameCount="20" Offset="0x756E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076160" FrameCount="18" Offset="0x76160"/>
+        <PlayerAnimationData Name="gPlayerAnimData_076AD0" FrameCount="20" Offset="0x76AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077550" FrameCount="20" Offset="0x77550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_077FD0" FrameCount="16" Offset="0x77FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_078830" FrameCount="16" Offset="0x78830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_079090" FrameCount="6" Offset="0x79090"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0793C0" FrameCount="29" Offset="0x793C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07A2F0" FrameCount="29" Offset="0x7A2F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07B220" FrameCount="44" Offset="0x7B220"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07C930" FrameCount="13" Offset="0x7C930"/>
+        <PlayerAnimationData Name="gPlayerAnimData_07D000" FrameCount="131" Offset="0x7D000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0814A0" FrameCount="126" Offset="0x814A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0856A0" FrameCount="50" Offset="0x856A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0870D0" FrameCount="47" Offset="0x870D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088970" FrameCount="9" Offset="0x88970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_088E30" FrameCount="44" Offset="0x88E30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08A540" FrameCount="21" Offset="0x8A540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08B040" FrameCount="120" Offset="0x8B040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_08EF10" FrameCount="100" Offset="0x8EF10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092370" FrameCount="20" Offset="0x92370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_092DF0" FrameCount="9" Offset="0x92DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0932B0" FrameCount="3" Offset="0x932B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093450" FrameCount="16" Offset="0x93450"/>
+        <PlayerAnimationData Name="gPlayerAnimData_093CB0" FrameCount="8" Offset="0x93CB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0940E0" FrameCount="66" Offset="0x940E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096370" FrameCount="5" Offset="0x96370"/>
+        <PlayerAnimationData Name="gPlayerAnimData_096610" FrameCount="31" Offset="0x96610"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097650" FrameCount="18" Offset="0x97650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_097FC0" FrameCount="19" Offset="0x97FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0989C0" FrameCount="24" Offset="0x989C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099650" FrameCount="9" Offset="0x99650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_099B10" FrameCount="100" Offset="0x99B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09CF70" FrameCount="71" Offset="0x9CF70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_09F4A0" FrameCount="80" Offset="0x9F4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A1E80" FrameCount="51" Offset="0xA1E80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A3940" FrameCount="133" Offset="0xA3940"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0A7EE0" FrameCount="90" Offset="0xA7EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AAE00" FrameCount="35" Offset="0xAAE00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AC060" FrameCount="40" Offset="0xAC060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AD550" FrameCount="25" Offset="0xAD550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AE270" FrameCount="20" Offset="0xAE270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0AECF0" FrameCount="100" Offset="0xAECF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B2150" FrameCount="100" Offset="0xB2150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B55B0" FrameCount="100" Offset="0xB55B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0B8A10" FrameCount="100" Offset="0xB8A10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BBE70" FrameCount="80" Offset="0xBBE70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BE850" FrameCount="45" Offset="0xBE850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0BFFE0" FrameCount="30" Offset="0xBFFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C0FA0" FrameCount="22" Offset="0xC0FA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C1B30" FrameCount="22" Offset="0xC1B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C26C0" FrameCount="46" Offset="0xC26C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C3EE0" FrameCount="20" Offset="0xC3EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4960" FrameCount="10" Offset="0xC4960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C4EA0" FrameCount="100" Offset="0xC4EA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8300" FrameCount="20" Offset="0xC8300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0C8D80" FrameCount="85" Offset="0xC8D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CBA00" FrameCount="25" Offset="0xCBA00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CC720" FrameCount="20" Offset="0xCC720"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CD1A0" FrameCount="20" Offset="0xCD1A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CDC20" FrameCount="15" Offset="0xCDC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CE400" FrameCount="20" Offset="0xCE400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CEE80" FrameCount="10" Offset="0xCEE80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CF3C0" FrameCount="20" Offset="0xCF3C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0CFE40" FrameCount="35" Offset="0xCFE40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D10A0" FrameCount="15" Offset="0xD10A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D1880" FrameCount="20" Offset="0xD1880"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D2300" FrameCount="28" Offset="0xD2300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D31B0" FrameCount="35" Offset="0xD31B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4410" FrameCount="20" Offset="0xD4410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D4E90" FrameCount="70" Offset="0xD4E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D7340" FrameCount="35" Offset="0xD7340"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0D85A0" FrameCount="80" Offset="0xD85A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DAF80" FrameCount="11" Offset="0xDAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DB550" FrameCount="30" Offset="0xDB550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DC510" FrameCount="10" Offset="0xDC510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DCA50" FrameCount="30" Offset="0xDCA50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DDA10" FrameCount="70" Offset="0xDDA10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0DFEC0" FrameCount="15" Offset="0xDFEC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E06A0" FrameCount="25" Offset="0xE06A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E13C0" FrameCount="230" Offset="0xE13C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8C30" FrameCount="6" Offset="0xE8C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E8F60" FrameCount="13" Offset="0xE8F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9630" FrameCount="9" Offset="0xE9630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0E9AF0" FrameCount="16" Offset="0xE9AF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA350" FrameCount="6" Offset="0xEA350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EA680" FrameCount="11" Offset="0xEA680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAC50" FrameCount="6" Offset="0xEAC50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EAF80" FrameCount="17" Offset="0xEAF80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EB870" FrameCount="5" Offset="0xEB870"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBB10" FrameCount="9" Offset="0xEBB10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EBFD0" FrameCount="8" Offset="0xEBFD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC400" FrameCount="11" Offset="0xEC400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EC9D0" FrameCount="3" Offset="0xEC9D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ECB70" FrameCount="10" Offset="0xECB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED0B0" FrameCount="9" Offset="0xED0B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0ED570" FrameCount="13" Offset="0xED570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EDC40" FrameCount="10" Offset="0xEDC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EE180" FrameCount="19" Offset="0xEE180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EEB80" FrameCount="9" Offset="0xEEB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EF040" FrameCount="21" Offset="0xEF040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0EFB40" FrameCount="16" Offset="0xEFB40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F03A0" FrameCount="35" Offset="0xF03A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1600" FrameCount="15" Offset="0xF1600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F1DE0" FrameCount="21" Offset="0xF1DE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F28E0" FrameCount="16" Offset="0xF28E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3140" FrameCount="12" Offset="0xF3140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3790" FrameCount="7" Offset="0xF3790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3B40" FrameCount="8" Offset="0xF3B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F3F70" FrameCount="8" Offset="0xF3F70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F43A0" FrameCount="5" Offset="0xF43A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4640" FrameCount="9" Offset="0xF4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4B00" FrameCount="9" Offset="0xF4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F4FC0" FrameCount="15" Offset="0xF4FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F57A0" FrameCount="7" Offset="0xF57A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5B50" FrameCount="8" Offset="0xF5B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F5F80" FrameCount="8" Offset="0xF5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F63B0" FrameCount="5" Offset="0xF63B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6650" FrameCount="12" Offset="0xF6650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F6CA0" FrameCount="7" Offset="0xF6CA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F7050" FrameCount="18" Offset="0xF7050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F79C0" FrameCount="17" Offset="0xF79C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F82B0" FrameCount="12" Offset="0xF82B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F8900" FrameCount="15" Offset="0xF8900"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F90E0" FrameCount="7" Offset="0xF90E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9490" FrameCount="12" Offset="0xF9490"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0F9AE0" FrameCount="20" Offset="0xF9AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FA560" FrameCount="20" Offset="0xFA560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FAFE0" FrameCount="3" Offset="0xFAFE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB180" FrameCount="5" Offset="0xFB180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB420" FrameCount="9" Offset="0xFB420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FB8E0" FrameCount="31" Offset="0xFB8E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FC920" FrameCount="31" Offset="0xFC920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FD960" FrameCount="20" Offset="0xFD960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE3E0" FrameCount="10" Offset="0xFE3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FE920" FrameCount="21" Offset="0xFE920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FF420" FrameCount="21" Offset="0xFF420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_0FFF20" FrameCount="20" Offset="0xFFF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1009A0" FrameCount="10" Offset="0x1009A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_100EE0" FrameCount="10" Offset="0x100EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101420" FrameCount="12" Offset="0x101420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_101A70" FrameCount="11" Offset="0x101A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_102040" FrameCount="32" Offset="0x102040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103100" FrameCount="20" Offset="0x103100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_103B80" FrameCount="20" Offset="0x103B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104600" FrameCount="5" Offset="0x104600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1048A0" FrameCount="8" Offset="0x1048A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_104CD0" FrameCount="9" Offset="0x104CD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105190" FrameCount="6" Offset="0x105190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1054C0" FrameCount="19" Offset="0x1054C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_105EC0" FrameCount="4" Offset="0x105EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1060E0" FrameCount="9" Offset="0x1060E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1065A0" FrameCount="10" Offset="0x1065A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_106AE0" FrameCount="19" Offset="0x106AE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1074E0" FrameCount="20" Offset="0x1074E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_107F60" FrameCount="39" Offset="0x107F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1093D0" FrameCount="21" Offset="0x1093D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_109ED0" FrameCount="11" Offset="0x109ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10A4A0" FrameCount="11" Offset="0x10A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10AA70" FrameCount="34" Offset="0x10AA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10BC40" FrameCount="15" Offset="0x10BC40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10C420" FrameCount="21" Offset="0x10C420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10CF20" FrameCount="11" Offset="0x10CF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10D4F0" FrameCount="11" Offset="0x10D4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10DAC0" FrameCount="13" Offset="0x10DAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E190" FrameCount="13" Offset="0x10E190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10E860" FrameCount="13" Offset="0x10E860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10EF30" FrameCount="16" Offset="0x10EF30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_10F790" FrameCount="20" Offset="0x10F790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110210" FrameCount="20" Offset="0x110210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_110C90" FrameCount="20" Offset="0x110C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_111710" FrameCount="20" Offset="0x111710"/>
+        <PlayerAnimationData Name="gPlayerAnimData_112190" FrameCount="16" Offset="0x112190"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1129F0" FrameCount="16" Offset="0x1129F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_113250" FrameCount="29" Offset="0x113250"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114180" FrameCount="5" Offset="0x114180"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114420" FrameCount="16" Offset="0x114420"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114C80" FrameCount="6" Offset="0x114C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_114FB0" FrameCount="16" Offset="0x114FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_115810" FrameCount="22" Offset="0x115810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1163A0" FrameCount="5" Offset="0x1163A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116640" FrameCount="14" Offset="0x116640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_116DA0" FrameCount="6" Offset="0x116DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1170D0" FrameCount="6" Offset="0x1170D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117400" FrameCount="13" Offset="0x117400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_117AD0" FrameCount="29" Offset="0x117AD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_118A00" FrameCount="13" Offset="0x118A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1190D0" FrameCount="29" Offset="0x1190D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11A000" FrameCount="22" Offset="0x11A000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11AB90" FrameCount="89" Offset="0x11AB90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11DA30" FrameCount="11" Offset="0x11DA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E000" FrameCount="11" Offset="0x11E000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11E5D0" FrameCount="29" Offset="0x11E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_11F500" FrameCount="51" Offset="0x11F500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_120FC0" FrameCount="10" Offset="0x120FC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121500" FrameCount="6" Offset="0x121500"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121830" FrameCount="6" Offset="0x121830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121B60" FrameCount="6" Offset="0x121B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_121E90" FrameCount="6" Offset="0x121E90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1221C0" FrameCount="50" Offset="0x1221C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_123BF0" FrameCount="41" Offset="0x123BF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125170" FrameCount="11" Offset="0x125170"/>
+        <PlayerAnimationData Name="gPlayerAnimData_125740" FrameCount="23" Offset="0x125740"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126350" FrameCount="23" Offset="0x126350"/>
+        <PlayerAnimationData Name="gPlayerAnimData_126F60" FrameCount="20" Offset="0x126F60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1279E0" FrameCount="20" Offset="0x1279E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128460" FrameCount="20" Offset="0x128460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_128EE0" FrameCount="12" Offset="0x128EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_129530" FrameCount="23" Offset="0x129530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12A140" FrameCount="23" Offset="0x12A140"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12AD50" FrameCount="72" Offset="0x12AD50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D300" FrameCount="9" Offset="0x12D300"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12D7C0" FrameCount="21" Offset="0x12D7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E2C0" FrameCount="9" Offset="0x12E2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12E780" FrameCount="18" Offset="0x12E780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12F0F0" FrameCount="18" Offset="0x12F0F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_12FA60" FrameCount="24" Offset="0x12FA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1306F0" FrameCount="69" Offset="0x1306F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132B10" FrameCount="9" Offset="0x132B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_132FD0" FrameCount="82" Offset="0x132FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_135AC0" FrameCount="28" Offset="0x135AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_136970" FrameCount="60" Offset="0x136970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1388E0" FrameCount="25" Offset="0x1388E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_139600" FrameCount="60" Offset="0x139600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13B570" FrameCount="56" Offset="0x13B570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D2C0" FrameCount="9" Offset="0x13D2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13D780" FrameCount="32" Offset="0x13D780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_13E840" FrameCount="52" Offset="0x13E840"/>
+        <PlayerAnimationData Name="gPlayerAnimData_140380" FrameCount="29" Offset="0x140380"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1412B0" FrameCount="49" Offset="0x1412B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_142C60" FrameCount="43" Offset="0x142C60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1442F0" FrameCount="44" Offset="0x1442F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_145A00" FrameCount="28" Offset="0x145A00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1468B0" FrameCount="45" Offset="0x1468B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148040" FrameCount="10" Offset="0x148040"/>
+        <PlayerAnimationData Name="gPlayerAnimData_148580" FrameCount="50" Offset="0x148580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_149FB0" FrameCount="10" Offset="0x149FB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14A4F0" FrameCount="10" Offset="0x14A4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14AA30" FrameCount="30" Offset="0x14AA30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14B9F0" FrameCount="21" Offset="0x14B9F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14C4F0" FrameCount="21" Offset="0x14C4F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14CFF0" FrameCount="30" Offset="0x14CFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14DFB0" FrameCount="15" Offset="0x14DFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14E790" FrameCount="21" Offset="0x14E790"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14F290" FrameCount="21" Offset="0x14F290"/>
+        <PlayerAnimationData Name="gPlayerAnimData_14FD90" FrameCount="12" Offset="0x14FD90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1503E0" FrameCount="12" Offset="0x1503E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150A30" FrameCount="6" Offset="0x150A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_150D60" FrameCount="14" Offset="0x150D60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1514C0" FrameCount="36" Offset="0x1514C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1527A0" FrameCount="16" Offset="0x1527A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153000" FrameCount="16" Offset="0x153000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153860" FrameCount="8" Offset="0x153860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_153C90" FrameCount="8" Offset="0x153C90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1540C0" FrameCount="29" Offset="0x1540C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_154FF0" FrameCount="13" Offset="0x154FF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1556C0" FrameCount="50" Offset="0x1556C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1570F0" FrameCount="36" Offset="0x1570F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1583D0" FrameCount="17" Offset="0x1583D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_158CC0" FrameCount="55" Offset="0x158CC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15A990" FrameCount="20" Offset="0x15A990"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B410" FrameCount="10" Offset="0x15B410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15B950" FrameCount="10" Offset="0x15B950"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15BE90" FrameCount="20" Offset="0x15BE90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15C910" FrameCount="54" Offset="0x15C910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_15E560" FrameCount="54" Offset="0x15E560"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1601B0" FrameCount="29" Offset="0x1601B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1610E0" FrameCount="27" Offset="0x1610E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_161F10" FrameCount="28" Offset="0x161F10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_162DC0" FrameCount="56" Offset="0x162DC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_164B10" FrameCount="56" Offset="0x164B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_166860" FrameCount="30" Offset="0x166860"/>
+        <PlayerAnimationData Name="gPlayerAnimData_167820" FrameCount="56" Offset="0x167820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_169570" FrameCount="29" Offset="0x169570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16A4A0" FrameCount="21" Offset="0x16A4A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16AFA0" FrameCount="21" Offset="0x16AFA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16BAA0" FrameCount="20" Offset="0x16BAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C520" FrameCount="2" Offset="0x16C520"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C630" FrameCount="5" Offset="0x16C630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16C8D0" FrameCount="5" Offset="0x16C8D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CB70" FrameCount="5" Offset="0x16CB70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16CE10" FrameCount="9" Offset="0x16CE10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D2D0" FrameCount="5" Offset="0x16D2D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16D570" FrameCount="20" Offset="0x16D570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16DFF0" FrameCount="20" Offset="0x16DFF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EA70" FrameCount="10" Offset="0x16EA70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16EFB0" FrameCount="19" Offset="0x16EFB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_16F9B0" FrameCount="19" Offset="0x16F9B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1703B0" FrameCount="19" Offset="0x1703B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_170DB0" FrameCount="26" Offset="0x170DB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_171B50" FrameCount="113" Offset="0x171B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_175680" FrameCount="37" Offset="0x175680"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1769E0" FrameCount="86" Offset="0x1769E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1796F0" FrameCount="61" Offset="0x1796F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17B6E0" FrameCount="61" Offset="0x17B6E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17D6D0" FrameCount="20" Offset="0x17D6D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17E150" FrameCount="20" Offset="0x17E150"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17EBD0" FrameCount="20" Offset="0x17EBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_17F650" FrameCount="20" Offset="0x17F650"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1800D0" FrameCount="20" Offset="0x1800D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180B50" FrameCount="5" Offset="0x180B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_180DF0" FrameCount="12" Offset="0x180DF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_181440" FrameCount="39" Offset="0x181440"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1828B0" FrameCount="16" Offset="0x1828B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183110" FrameCount="8" Offset="0x183110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183540" FrameCount="8" Offset="0x183540"/>
+        <PlayerAnimationData Name="gPlayerAnimData_183970" FrameCount="47" Offset="0x183970"/>
+        <PlayerAnimationData Name="gPlayerAnimData_185210" FrameCount="11" Offset="0x185210"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1857E0" FrameCount="252" Offset="0x1857E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18DBD0" FrameCount="19" Offset="0x18DBD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18E5D0" FrameCount="20" Offset="0x18E5D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18F050" FrameCount="20" Offset="0x18F050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_18FAD0" FrameCount="28" Offset="0x18FAD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_190980" FrameCount="28" Offset="0x190980"/>
+        <PlayerAnimationData Name="gPlayerAnimData_191830" FrameCount="28" Offset="0x191830"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1926E0" FrameCount="16" Offset="0x1926E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_192F40" FrameCount="9" Offset="0x192F40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193400" FrameCount="12" Offset="0x193400"/>
+        <PlayerAnimationData Name="gPlayerAnimData_193A50" FrameCount="18" Offset="0x193A50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1943C0" FrameCount="18" Offset="0x1943C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_194D30" FrameCount="38" Offset="0x194D30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_196120" FrameCount="38" Offset="0x196120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_197510" FrameCount="73" Offset="0x197510"/>
+        <PlayerAnimationData Name="gPlayerAnimData_199B50" FrameCount="72" Offset="0x199B50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19C100" FrameCount="36" Offset="0x19C100"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19D3E0" FrameCount="21" Offset="0x19D3E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19DEE0" FrameCount="21" Offset="0x19DEE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19E9E0" FrameCount="32" Offset="0x19E9E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_19FAA0" FrameCount="32" Offset="0x19FAA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A0B60" FrameCount="20" Offset="0x1A0B60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A15E0" FrameCount="12" Offset="0x1A15E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A1C30" FrameCount="19" Offset="0x1A1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A2630" FrameCount="20" Offset="0x1A2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A30B0" FrameCount="9" Offset="0x1A30B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3570" FrameCount="7" Offset="0x1A3570"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3920" FrameCount="5" Offset="0x1A3920"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A3BC0" FrameCount="20" Offset="0x1A3BC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A4640" FrameCount="20" Offset="0x1A4640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A50C0" FrameCount="20" Offset="0x1A50C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A5B40" FrameCount="20" Offset="0x1A5B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A65C0" FrameCount="12" Offset="0x1A65C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A6C10" FrameCount="12" Offset="0x1A6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A7260" FrameCount="68" Offset="0x1A7260"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9600" FrameCount="16" Offset="0x1A9600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1A9E60" FrameCount="16" Offset="0x1A9E60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AA6C0" FrameCount="16" Offset="0x1AA6C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AAF20" FrameCount="16" Offset="0x1AAF20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AB780" FrameCount="31" Offset="0x1AB780"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AC7C0" FrameCount="31" Offset="0x1AC7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AD800" FrameCount="16" Offset="0x1AD800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AE060" FrameCount="19" Offset="0x1AE060"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AEA60" FrameCount="16" Offset="0x1AEA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF2C0" FrameCount="10" Offset="0x1AF2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AF800" FrameCount="11" Offset="0x1AF800"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1AFDD0" FrameCount="31" Offset="0x1AFDD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B0E10" FrameCount="21" Offset="0x1B0E10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B1910" FrameCount="15" Offset="0x1B1910"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B20F0" FrameCount="9" Offset="0x1B20F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B25B0" FrameCount="11" Offset="0x1B25B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B2B80" FrameCount="20" Offset="0x1B2B80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B3600" FrameCount="20" Offset="0x1B3600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4080" FrameCount="20" Offset="0x1B4080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B4B00" FrameCount="13" Offset="0x1B4B00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B51D0" FrameCount="19" Offset="0x1B51D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B5BD0" FrameCount="31" Offset="0x1B5BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B6C10" FrameCount="13" Offset="0x1B6C10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B72E0" FrameCount="16" Offset="0x1B72E0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B7B40" FrameCount="16" Offset="0x1B7B40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B83A0" FrameCount="29" Offset="0x1B83A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B92D0" FrameCount="16" Offset="0x1B92D0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1B9B30" FrameCount="16" Offset="0x1B9B30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BA390" FrameCount="29" Offset="0x1BA390"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BB2C0" FrameCount="38" Offset="0x1BB2C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BC6B0" FrameCount="7" Offset="0x1BC6B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BCA60" FrameCount="34" Offset="0x1BCA60"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BDC30" FrameCount="15" Offset="0x1BDC30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BE410" FrameCount="36" Offset="0x1BE410"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1BF6F0" FrameCount="21" Offset="0x1BF6F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C01F0" FrameCount="21" Offset="0x1C01F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C0CF0" FrameCount="10" Offset="0x1C0CF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1230" FrameCount="19" Offset="0x1C1230"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C1C30" FrameCount="19" Offset="0x1C1C30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C2630" FrameCount="19" Offset="0x1C2630"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C3030" FrameCount="89" Offset="0x1C3030"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C5ED0" FrameCount="6" Offset="0x1C5ED0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6200" FrameCount="6" Offset="0x1C6200"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1C6530" FrameCount="184" Offset="0x1C6530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1CC580" FrameCount="187" Offset="0x1CC580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D2770" FrameCount="200" Offset="0x1D2770"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D9020" FrameCount="13" Offset="0x1D9020"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1D96F0" FrameCount="29" Offset="0x1D96F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DA620" FrameCount="13" Offset="0x1DA620"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DACF0" FrameCount="29" Offset="0x1DACF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DBC20" FrameCount="89" Offset="0x1DBC20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1DEAC0" FrameCount="184" Offset="0x1DEAC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1E4B10" FrameCount="187" Offset="0x1E4B10"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1EAD00" FrameCount="200" Offset="0x1EAD00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F15B0" FrameCount="112" Offset="0x1F15B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5050" FrameCount="29" Offset="0x1F5050"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F5F80" FrameCount="11" Offset="0x1F5F80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6550" FrameCount="11" Offset="0x1F6550"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F6B20" FrameCount="11" Offset="0x1F6B20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F70F0" FrameCount="11" Offset="0x1F70F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F76C0" FrameCount="29" Offset="0x1F76C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F85F0" FrameCount="45" Offset="0x1F85F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1F9D80" FrameCount="80" Offset="0x1F9D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FC760" FrameCount="13" Offset="0x1FC760"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FCE30" FrameCount="80" Offset="0x1FCE30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_1FF810" FrameCount="31" Offset="0x1FF810"/>
+        <PlayerAnimationData Name="gPlayerAnimData_200850" FrameCount="71" Offset="0x200850"/>
+        <PlayerAnimationData Name="gPlayerAnimData_202D80" FrameCount="34" Offset="0x202D80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_203F50" FrameCount="34" Offset="0x203F50"/>
+        <PlayerAnimationData Name="gPlayerAnimData_205120" FrameCount="39" Offset="0x205120"/>
+        <PlayerAnimationData Name="gPlayerAnimData_206590" FrameCount="27" Offset="0x206590"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2073C0" FrameCount="29" Offset="0x2073C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2082F0" FrameCount="66" Offset="0x2082F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20A580" FrameCount="20" Offset="0x20A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20B000" FrameCount="32" Offset="0x20B000"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20C0C0" FrameCount="50" Offset="0x20C0C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_20DAF0" FrameCount="178" Offset="0x20DAF0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213820" FrameCount="12" Offset="0x213820"/>
+        <PlayerAnimationData Name="gPlayerAnimData_213E70" FrameCount="10" Offset="0x213E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2143B0" FrameCount="46" Offset="0x2143B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_215BD0" FrameCount="10" Offset="0x215BD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216110" FrameCount="24" Offset="0x216110"/>
+        <PlayerAnimationData Name="gPlayerAnimData_216DA0" FrameCount="24" Offset="0x216DA0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_217A30" FrameCount="23" Offset="0x217A30"/>
+        <PlayerAnimationData Name="gPlayerAnimData_218640" FrameCount="30" Offset="0x218640"/>
+        <PlayerAnimationData Name="gPlayerAnimData_219600" FrameCount="29" Offset="0x219600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21A530" FrameCount="29" Offset="0x21A530"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21B460" FrameCount="33" Offset="0x21B460"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21C5B0" FrameCount="65" Offset="0x21C5B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21E7C0" FrameCount="35" Offset="0x21E7C0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_21FA20" FrameCount="35" Offset="0x21FA20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_220C80" FrameCount="35" Offset="0x220C80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_221EE0" FrameCount="65" Offset="0x221EE0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2240F0" FrameCount="70" Offset="0x2240F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2265A0" FrameCount="48" Offset="0x2265A0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_227EC0" FrameCount="74" Offset="0x227EC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22A580" FrameCount="75" Offset="0x22A580"/>
+        <PlayerAnimationData Name="gPlayerAnimData_22CCD0" FrameCount="208" Offset="0x22CCD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2339B0" FrameCount="195" Offset="0x2339B0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_239FD0" FrameCount="30" Offset="0x239FD0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23AF90" FrameCount="36" Offset="0x23AF90"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23C270" FrameCount="24" Offset="0x23C270"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23CF00" FrameCount="90" Offset="0x23CF00"/>
+        <PlayerAnimationData Name="gPlayerAnimData_23FE20" FrameCount="100" Offset="0x23FE20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_243280" FrameCount="138" Offset="0x243280"/>
+        <PlayerAnimationData Name="gPlayerAnimData_247AC0" FrameCount="35" Offset="0x247AC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_248D20" FrameCount="25" Offset="0x248D20"/>
+        <PlayerAnimationData Name="gPlayerAnimData_249A40" FrameCount="90" Offset="0x249A40"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24C960" FrameCount="100" Offset="0x24C960"/>
+        <PlayerAnimationData Name="gPlayerAnimData_24FDC0" FrameCount="93" Offset="0x24FDC0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_252E70" FrameCount="70" Offset="0x252E70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_255320" FrameCount="108" Offset="0x255320"/>
+        <PlayerAnimationData Name="gPlayerAnimData_258BB0" FrameCount="138" Offset="0x258BB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25D3F0" FrameCount="45" Offset="0x25D3F0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25EB80" FrameCount="20" Offset="0x25EB80"/>
+        <PlayerAnimationData Name="gPlayerAnimData_25F600" FrameCount="20" Offset="0x25F600"/>
+        <PlayerAnimationData Name="gPlayerAnimData_260080" FrameCount="50" Offset="0x260080"/>
+        <PlayerAnimationData Name="gPlayerAnimData_261AB0" FrameCount="30" Offset="0x261AB0"/>
+        <PlayerAnimationData Name="gPlayerAnimData_262A70" FrameCount="50" Offset="0x262A70"/>
+        <PlayerAnimationData Name="gPlayerAnimData_2644A0" FrameCount="45" Offset="0x2644A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_NTSC_12/objects/gameplay_dangeon_keep.xml
new file mode 100644
index 0000000000..5b1a9050d9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/gameplay_dangeon_keep.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keepTex_000000" OutName="gameplay_dangeon_keepTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_000200" OutName="gameplay_dangeon_keepTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0005C0" OutName="gameplay_dangeon_keepTex_0005C0" Format="rgba16" Width="16" Height="16" Offset="0x5C0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_001280" OutName="gameplay_dangeon_keepTex_001280" Format="rgba16" Width="32" Height="32" Offset="0x1280" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0078A0" OutName="gameplay_dangeon_keepTex_0078A0" Format="i8" Width="32" Height="32" Offset="0x78A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_007CA0" OutName="gameplay_dangeon_keepTex_007CA0" Format="i8" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0080A0" OutName="gameplay_dangeon_keepTex_0080A0" Format="rgba16" Width="32" Height="32" Offset="0x80A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0088A0" OutName="gameplay_dangeon_keepTex_0088A0" Format="rgba16" Width="32" Height="32" Offset="0x88A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00D8A0" OutName="gameplay_dangeon_keepTex_00D8A0" Format="rgba16" Width="32" Height="32" Offset="0xD8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00E0A0" OutName="gameplay_dangeon_keepTex_00E0A0" Format="rgba16" Width="32" Height="32" Offset="0xE0A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_00F8A0" OutName="gameplay_dangeon_keepTex_00F8A0" Format="rgba16" Width="64" Height="32" Offset="0xF8A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0108A0" OutName="gameplay_dangeon_keepTex_0108A0" Format="rgba16" Width="32" Height="64" Offset="0x108A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0118A0" OutName="gameplay_dangeon_keepTex_0118A0" Format="rgba16" Width="16" Height="16" Offset="0x118A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011AA0" OutName="gameplay_dangeon_keepTex_011AA0" Format="rgba16" Width="16" Height="16" Offset="0x11AA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_011CA0" OutName="gameplay_dangeon_keepTex_011CA0" Format="rgba16" Width="32" Height="64" Offset="0x11CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_012CA0" OutName="gameplay_dangeon_keepTex_012CA0" Format="rgba16" Width="64" Height="16" Offset="0x12CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0134A0" OutName="gameplay_dangeon_keepTex_0134A0" Format="rgba16" Width="32" Height="32" Offset="0x134A0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CA0" OutName="gameplay_dangeon_keepTex_013CA0" Format="ia8" Width="4" Height="4" Offset="0x13CA0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_013CB0" OutName="gameplay_dangeon_keepTex_013CB0" Format="i4" Width="64" Height="64" Offset="0x13CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0154B0" OutName="gameplay_dangeon_keepTex_0154B0" Format="rgba16" Width="32" Height="32" Offset="0x154B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_015CB0" OutName="gameplay_dangeon_keepTex_015CB0" Format="rgba16" Width="32" Height="32" Offset="0x15CB0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_0164B0" OutName="gameplay_dangeon_keepTex_0164B0" Format="rgba16" Width="32" Height="32" Offset="0x164B0" AddedByScript="true"/>
+        <Texture Name="gameplay_dangeon_keepTex_016CB0" OutName="gameplay_dangeon_keepTex_016CB0" Format="rgba16" Width="32" Height="32" Offset="0x16CB0" AddedByScript="true"/>
+        <DList Name="gUnusedCandleDL" Offset="0x440"/>
+        <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
+        <DList Name="gDoorLockDL" Offset="0x1100"/>
+        <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
+        <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
+        <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
+        <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
+        <Texture Name="gPushBlockGrayTex" OutName="block_gray" Format="i4" Width="64" Height="64" Offset="0x4350"/>
+        <DList Name="gPushBlockDL" Offset="0x4CD0"/>
+        <Collision Name="gPushBlockCol" Offset="0x4E98"/>
+        <DList Name="gWoodenPlatofrmDL" Offset="0x5050"/>
+        <DList Name="gSmallWoodenBoxDL" Offset="0x5290"/>
+        <DList Name="gSmallWoodenBoxFragmentDL" Offset="0x5380"/>
+        <DList Name="gBetaKokiriSwordSpriteDL" Offset="0x5450"/>
+        <DList Name="gMagicJarSpriteDL" Offset="0x5520"/>
+        <DList Name="gBetaSlingshotSpriteDL" Offset="0x55F0"/>
+        <DList Name="gFloorSwitch1DL" Offset="0x5800"/>
+        <DList Name="gRustyFloorSwitchDL" Offset="0x5AD0"/>
+        <DList Name="gFloorSwitch2DL" Offset="0x5D50"/>
+        <Collision Name="gFloorSwitchCol" Offset="0x5FB8"/>
+        <DList Name="gFloorSwitch3DL" Offset="0x6170"/>
+        <DList Name="gBetaFloorSwitchDL" Offset="0x63F0"/>
+        <DList Name="gEyeSwitch1DL" Offset="0x6610"/>
+        <DList Name="gEyeSwitch2DL" Offset="0x6810"/>
+        <DList Name="gCrystalSwitchCoreOpaDL" Offset="0x6D10"/>
+        <DList Name="gCrystalSwitchCoreXluDL" Offset="0x6E60"/>
+        <DList Name="gCrystalSwitchDiamondOpaDL" Offset="0x7340"/>
+        <DList Name="gCrystalSwitchDiamondXluDL" Offset="0x7488"/>
+        <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
+        <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
+        <Texture Name="gEyeSwitchGoldOpenTex" OutName="eye_gold_open" Format="rgba16" Width="32" Height="32" Offset="0xA8A0"/>
+        <Texture Name="gEyeSwitchSilverOpenTex" OutName="eye_silver_open" Format="rgba16" Width="32" Height="32" Offset="0xB0A0"/>
+        <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
+        <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
+        <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
+        <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
+        <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
+        <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <DList Name="gPotDL" Offset="0x17870"/>
+        <DList Name="gPotFragmentDL" Offset="0x17A60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/gameplay_field_keep.xml b/soh/assets/xml/N64_NTSC_12/objects/gameplay_field_keep.xml
new file mode 100644
index 0000000000..011e8f7fc7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/gameplay_field_keep.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="gameplay_field_keep" Segment="5">
+        <DList Name="gHanaFlower1DL" Offset="0x000"/>
+        <DList Name="gHanaFlower2DL" Offset="0x0A0"/>
+        <DList Name="gHanaFlower3DL" Offset="0x0140"/>
+        <DList Name="gHanaLeaf1DL" Offset="0x01E0"/>
+        <DList Name="gHanaLeaf2DL" Offset="0x0280"/>
+        <DList Name="gHanaLeaf3DL" Offset="0x0320"/>
+        <DList Name="gHanaLeaf4DL" Offset="0x03C0"/>
+        <DList Name="gHanaLeaf5DL" Offset="0x0460"/>
+        <Texture Name="gHanaFlowerTex" OutName="hana_flower" Format="rgba16" Width="16" Height="32" Offset="0x750"/>
+        <Texture Name="gHanaLeafTex" OutName="hana_leaf" Format="rgba16" Width="32" Height="32" Offset="0xB50"/>
+        <DList Name="gHanaDL" Offset="0x500"/>
+        <Collision Name="gBgBombwallCol" Offset="0x41B0"/>
+        <DList Name="gBgBombwallNormalDL" Offset="0x3FC0"/>
+        <DList Name="gBgBombwallBrokenDL" Offset="0x4088"/>
+        <DList Name="gGrottoDL" Offset="0x1390"/>
+        <Texture Name="gGrottoTex" OutName="grotto_tex" Format="ia16" Width="32" Height="64" Offset="0x1420"/>
+        <DList Name="gButterflyDL_002480" Offset="0x2480"/>
+        <DList Name="gButterflyDL_002520" Offset="0x2520"/>
+        <DList Name="gButterflyDL_002580" Offset="0x2580"/>
+        <DList Name="gButterflyDL_002620" Offset="0x2620"/>
+        <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
+        <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
+        <Animation Name="gButterflyAnim" Offset="0x2470"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
+        <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
+        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
+        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
+        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
+        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
+        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
+        <Animation Name="gFieldUnusedFishAnim" Offset="0x5FF0"/>
+        <DList Name="gFieldUnusedFishDL" Offset="0x6000"/>
+        <DList Name="gFieldSkelUnusedFishDL_0061E8" Offset="0x61E8"/>
+        <DList Name="gFieldSkelUnusedFishDL_0063A8" Offset="0x63A8"/>
+        <DList Name="gFieldSkelUnusedFishDL_006448" Offset="0x6448"/>
+        <Texture Name="gFieldUnusedFishTex" OutName="unused_fish" Format="rgba16" Width="64" Height="32" Offset="0x64A8"/>
+        <Texture Name="gFieldUnusedFishBottomTex" OutName="unused_fish_bottom" Format="rgba16" Width="64" Height="32" Offset="0x074A8"/>
+        <Texture Name="gFieldUnusedFishFinTex" OutName="unused_fish_fin" Format="rgba16" Width="32" Height="16" Offset="0x84A8"/>
+        <DList Name="gSilverRockDL" Offset="0xA3B8"/>
+        <DList Name="gFieldKakeraDL" Offset="0xA880"/>
+        <Texture Name="gFieldKakeraTex" OutName="kakera" Format="rgba16" Width="32" Height="32" Offset="0xA940"/>
+        <DList Name="gSilverRockFragmentsDL" Offset="0xA5E8"/>
+        <DList Name="gFieldBushDL" Offset="0xB9D0"/>
+        <Texture Name="gFieldBushTex" OutName="bush" Format="rgba16" Width="32" Height="32" Offset="0xB140"/>
+        <DList Name="gFieldBeehiveDL" Offset="0x95B0"/>
+        <DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
+        <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
+        <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
+        <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/gameplay_keep.xml b/soh/assets/xml/N64_NTSC_12/objects/gameplay_keep.xml
new file mode 100644
index 0000000000..94eee8845e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/gameplay_keep.xml
@@ -0,0 +1,1011 @@
+<Root>
+    <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="misc/link_animetion/"/>
+    <File Name="gameplay_keep" Segment="4">
+        <Texture Name="gameplay_keepTex_04C540" OutName="gameplay_keepTex_04C540" Format="i8" Width="64" Height="17" Offset="0x4C540" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04C740" OutName="gameplay_keepTex_04C740" Format="i8" Width="64" Height="17" Offset="0x4C740" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CD40" OutName="gameplay_keepTex_04CD40" Format="i8" Width="64" Height="17" Offset="0x4CD40" AddedByScript="true"/>
+        <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
+        <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="16" Height="16" Offset="0x1A00"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gDekuStickOverflowTex" OutName="deku_stick_overflow" Format="i8" Width="16" Height="16" Offset="0x19FF"/>
+        <Texture Name="gLinkHairTex" OutName="link_hair" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/>
+        <Texture Name="gLinkTunic1Tex" OutName="link_tunic_1" Format="i8" Width="16" Height="16" Offset="0x1C40"/>
+        <Texture Name="gLinkTunic2Tex" OutName="link_tunic_2" Format="i8" Width="16" Height="32" Offset="0x1D40"/>
+        <Texture Name="gLinkTunic3Tex" OutName="link_tunic_3" Format="i8" Width="16" Height="16" Offset="0x1F40"/>
+        <Array Name="gLinkPauseChildJointTable" Count="24" Offset="0x2040">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseChildDekuShieldJointTable" Count="24" Offset="0x20D0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultBgsJointTable" Count="24" Offset="0x2160">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultJointTable" Count="24" Offset="0x21F0">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+        <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
+            <Vector Type="s16" Dimensions="3"/>
+        </Array>
+
+
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_bashi" Offset="0x2328"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorA_link" Offset="0x2330"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_doorB_link" Offset="0x2338"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_futtobi" Offset="0x2340"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get1" Offset="0x2348"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get2" Offset="0x2350"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_get3" Offset="0x2358"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_goto_future" Offset="0x2360"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai" Offset="0x2368"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_kennuki" Offset="0x2370"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_koutai_wait" Offset="0x2378"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi" Offset="0x2380"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_mimawasi_wait" Offset="0x2388"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri" Offset="0x2390"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_miokuri_wait" Offset="0x2398"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_nozoki" Offset="0x23A0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_return_to_future" Offset="0x23A8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup" Offset="0x23B0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_demo_standup_wait" Offset="0x23B8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAL" Offset="0x23C0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endAR" Offset="0x23C8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBL" Offset="0x23D0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_endBR" Offset="0x23D8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startA" Offset="0x23E0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_startB" Offset="0x23E8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upL" Offset="0x23F0"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_climb_upR" Offset="0x23F8"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_normal_defense_ALL" Offset="0x2400"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_negaeri" Offset="0x2408"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_okiagari" Offset="0x2410"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_tatiagari" Offset="0x2418"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait1" Offset="0x2420"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait2" Offset="0x2428"/>
+        <PlayerAnimation Name="gPlayerAnim_clink_op3_wait3" Offset="0x2430"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_imanodare" Offset="0x2438"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orooro" Offset="0x2440"/>
+        <PlayerAnimation Name="gPlayerAnim_d_link_orowait" Offset="0x2448"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_nwait" Offset="0x2450"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_orosuu" Offset="0x2458"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_tewatashi" Offset="0x2460"/>
+        <PlayerAnimation Name="gPlayerAnim_demo_link_twait" Offset="0x2468"/>
+        <PlayerAnimation Name="gPlayerAnim_kolink_odoroki_demo" Offset="0x2470"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_endL" Offset="0x2478"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LLside_kiru_finsh_endR" Offset="0x2480"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_endR" Offset="0x2488"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_LRside_kiru_finsh_endL" Offset="0x2490"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_endR" Offset="0x2498"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR" Offset="0x24A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_endL" Offset="0x24A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR" Offset="0x24B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lrolling_kiru_endR" Offset="0x24B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_endR" Offset="0x24C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Lside_kiru_finsh_endR" Offset="0x24C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_endR" Offset="0x24D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_Rside_kiru_finsh_endR" Offset="0x24D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_anchor2fighter" Offset="0x24E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_brake" Offset="0x24E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_hitR" Offset="0x24F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_back_walk" Offset="0x24F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkL" Offset="0x2500"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_bom_side_walkR" Offset="0x2508"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_hit" Offset="0x2510"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitL" Offset="0x2518"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_defense_long_hitR" Offset="0x2520"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_front_hitR" Offset="0x2528"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_jump_kiru_finsh_endR" Offset="0x2530"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_landingR" Offset="0x2538"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_normal_kiru_finsh_endR" Offset="0x2540"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_endR" Offset="0x2548"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_pierce_kiru_finsh_endR" Offset="0x2550"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_power_kiru_wait_endR" Offset="0x2558"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_rolling_kiru_endR" Offset="0x2560"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkL" Offset="0x2568"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_side_walkR" Offset="0x2570"/>
+        <PlayerAnimation Name="gPlayerAnim_002578" Offset="0x2578"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense" Offset="0x2580"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL2defense_long" Offset="0x2588"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL" Offset="0x2590"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense" Offset="0x2598"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_defense_wait" Offset="0x25A0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025A8" Offset="0x25A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitL_pierce_kiru" Offset="0x25B0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025B8" Offset="0x25B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense" Offset="0x25C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR2defense_long" Offset="0x25C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR" Offset="0x25D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense" Offset="0x25D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_defense_wait" Offset="0x25E0"/>
+        <PlayerAnimation Name="gPlayerAnim_0025E8" Offset="0x25E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_anchor_waitR_pierce_kiru" Offset="0x25F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_catch" Offset="0x25F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwL" Offset="0x2600"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throwR" Offset="0x2608"/>
+        <PlayerAnimation Name="gPlayerAnim_002610" Offset="0x2610"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkL" Offset="0x2618"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_side_walkR" Offset="0x2620"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_wait2waitR" Offset="0x2628"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitL" Offset="0x2630"/>
+        <PlayerAnimation Name="gPlayerAnim_link_boom_throw_waitR" Offset="0x2638"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_in" Offset="0x2640"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_miss" Offset="0x2648"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_bug_out" Offset="0x2650"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo" Offset="0x2658"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_end" Offset="0x2660"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_start" Offset="0x2668"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_drink_demo_wait" Offset="0x2670"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_in" Offset="0x2678"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_miss" Offset="0x2680"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_fish_out" Offset="0x2688"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read" Offset="0x2690"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bottle_read_end" Offset="0x2698"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_ready" Offset="0x26A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot" Offset="0x26A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_end" Offset="0x26B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_shoot_next" Offset="0x26B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_bow_wait" Offset="0x26C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense" Offset="0x26C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_defense_wait" Offset="0x26D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runL" Offset="0x26D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_runR" Offset="0x26E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_side_walk" Offset="0x26E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_bow_walk2ready" Offset="0x26F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_door" Offset="0x26F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_end" Offset="0x2700"/>
+        <PlayerAnimation Name="gPlayerAnim_link_child_tunnel_start" Offset="0x2708"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_DDbox_open" Offset="0x2710"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_Tbox_open" Offset="0x2718"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_back_to_past" Offset="0x2720"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op1" Offset="0x2728"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op2" Offset="0x2730"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_baru_op3" Offset="0x2738"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_bikkuri" Offset="0x2740"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link" Offset="0x2748"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorA_link_free" Offset="0x2750"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link" Offset="0x2758"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_doorB_link_free" Offset="0x2760"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2" Offset="0x2768"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki2_wait" Offset="0x2770"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_furimuki" Offset="0x2778"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemA" Offset="0x2780"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_get_itemB" Offset="0x2788"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_goma_furimuki" Offset="0x2790"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad" Offset="0x2798"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_gurad_wait" Offset="0x27A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_jibunmiru" Offset="0x27A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori" Offset="0x27B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_mimawasi" Offset="0x27B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri" Offset="0x27C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_miokuri_wait" Offset="0x27C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kakeyori_wait" Offset="0x27D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage" Offset="0x27D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kaoage_wait" Offset="0x27E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1" Offset="0x27E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru1_wait" Offset="0x27F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2" Offset="0x27F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_modori" Offset="0x2800"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kenmiru2_wait" Offset="0x2808"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_kousan" Offset="0x2810"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand" Offset="0x2818"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_look_hand_wait" Offset="0x2820"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi" Offset="0x2828"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_nozokikomi_wait" Offset="0x2830"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_return_to_past" Offset="0x2838"/>
+        <PlayerAnimation Name="gPlayerAnim_002840" Offset="0x2840"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_sita_wait" Offset="0x2848"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue" Offset="0x2850"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_ue_wait" Offset="0x2858"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_warp" Offset="0x2860"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru" Offset="0x2868"/>
+        <PlayerAnimation Name="gPlayerAnim_link_demo_zeldamiru_wait" Offset="0x2870"/>
+        <PlayerAnimation Name="gPlayerAnim_link_derth_rebirth" Offset="0x2878"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru" Offset="0x2880"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_end" Offset="0x2888"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh" Offset="0x2890"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LLside_kiru_finsh_end" Offset="0x2898"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru" Offset="0x28A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_end" Offset="0x28A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh" Offset="0x28B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_LRside_kiru_finsh_end" Offset="0x28B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru" Offset="0x28C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_end" Offset="0x28C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh" Offset="0x28D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end" Offset="0x28D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru" Offset="0x28E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_end" Offset="0x28E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh" Offset="0x28F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end" Offset="0x28F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru" Offset="0x2900"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_end" Offset="0x2908"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_jump_kiru_hit" Offset="0x2910"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_side_walk" Offset="0x2918"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_start" Offset="0x2920"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait" Offset="0x2928"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_wait_end" Offset="0x2930"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lpower_kiru_walk" Offset="0x2938"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru" Offset="0x2940"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lrolling_kiru_end" Offset="0x2948"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump" Offset="0x2950"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_endL" Offset="0x2958"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_jump_end" Offset="0x2960"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru" Offset="0x2968"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_end" Offset="0x2970"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh" Offset="0x2978"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Lside_kiru_finsh_end" Offset="0x2980"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump" Offset="0x2988"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_endR" Offset="0x2990"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_jump_end" Offset="0x2998"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru" Offset="0x29A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_end" Offset="0x29A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh" Offset="0x29B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Rside_kiru_finsh_end" Offset="0x29B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru" Offset="0x29C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_Wrolling_kiru_end" Offset="0x29C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump" Offset="0x29D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_endR" Offset="0x29D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_backturn_jump_end" Offset="0x29E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run" Offset="0x29E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_damage_run_long" Offset="0x29F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense" Offset="0x29F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long" Offset="0x2A00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_hit" Offset="0x2A08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_long_wait" Offset="0x2A10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_defense_wait" Offset="0x2A18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_fighter2long" Offset="0x2A20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump" Offset="0x2A28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_endR" Offset="0x2A30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_front_jump_end" Offset="0x2A38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_heavy_run_long" Offset="0x2A40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru" Offset="0x2A48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh" Offset="0x2A50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_kiru_finsh_end" Offset="0x2A58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_jump_rollkiru" Offset="0x2A60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_landing_roll_long" Offset="0x2A68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal2fighter" Offset="0x2A70"/>
+        <PlayerAnimation Name="gPlayerAnim_002A78" Offset="0x2A78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru" Offset="0x2A80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_endR" Offset="0x2A88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_end" Offset="0x2A90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh" Offset="0x2A98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_normal_kiru_finsh_end" Offset="0x2AA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru" Offset="0x2AA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_end" Offset="0x2AB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh" Offset="0x2AB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_pierce_kiru_finsh_end" Offset="0x2AC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_jump_kiru_end" Offset="0x2AC8"/>
+        <PlayerAnimation Name="gPlayerAnim_002AD0" Offset="0x2AD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_side_walk" Offset="0x2AD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_startL" Offset="0x2AE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_start" Offset="0x2AE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait" Offset="0x2AF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_wait_end" Offset="0x2AF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_power_kiru_walk" Offset="0x2B00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_reboundR" Offset="0x2B08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound" Offset="0x2B10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_longR" Offset="0x2B18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rebound_long" Offset="0x2B20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru" Offset="0x2B28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_rolling_kiru_end" Offset="0x2B30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run" Offset="0x2B38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_run_long" Offset="0x2B40"/>
+        <PlayerAnimation Name="gPlayerAnim_002B48" Offset="0x2B48"/>
+        <PlayerAnimation Name="gPlayerAnim_002B50" Offset="0x2B50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkL_long" Offset="0x2B58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walkR_long" Offset="0x2B60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_side_walk_long" Offset="0x2B68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL" Offset="0x2B70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruL_end" Offset="0x2B78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR" Offset="0x2B80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_turn_kiruR_end" Offset="0x2B88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_kiruR" Offset="0x2B90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru" Offset="0x2B98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_upper_pierce_kiru_end" Offset="0x2BA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitL_long" Offset="0x2BA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait2waitR_long" Offset="0x2BB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL2wait_long" Offset="0x2BB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitL_long" Offset="0x2BC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR2wait_long" Offset="0x2BC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_waitR_long" Offset="0x2BD0"/>
+        <PlayerAnimation Name="gPlayerAnim_002BD8" Offset="0x2BD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_wait_long" Offset="0x2BE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endL_long" Offset="0x2BE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_endR_long" Offset="0x2BF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fighter_walk_long" Offset="0x2BF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch" Offset="0x2C00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_fish_catch_end" Offset="0x2C08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_down" Offset="0x2C10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_left" Offset="0x2C18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_right" Offset="0x2C20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_reel_up" Offset="0x2C28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_throw" Offset="0x2C30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_fishing_wait" Offset="0x2C38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit" Offset="0x2C40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_endR" Offset="0x2C48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_hit_end" Offset="0x2C50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2free" Offset="0x2C58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_long2long" Offset="0x2C60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_normal2long" Offset="0x2C68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit" Offset="0x2C70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_endR" Offset="0x2C78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hammer_side_hit_end" Offset="0x2C80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hatto_demo" Offset="0x2C88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_start" Offset="0x2C90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_fly_wait" Offset="0x2C98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_shot_ready" Offset="0x2CA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runL" Offset="0x2CA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_runR" Offset="0x2CB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_side_walk" Offset="0x2CB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_wait" Offset="0x2CC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_hook_walk2ready" Offset="0x2CC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion1" Offset="0x2CD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_last_hit_motion2" Offset="0x2CD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo1" Offset="0x2CE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo2" Offset="0x2CE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_honoo3" Offset="0x2CF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze1" Offset="0x2CF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze2" Offset="0x2D00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_kaze3" Offset="0x2D08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii1" Offset="0x2D10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii2" Offset="0x2D18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tamashii3" Offset="0x2D20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame" Offset="0x2D28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_magic_tame_kaijyo" Offset="0x2D30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_100step_up" Offset="0x2D38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_150step_up" Offset="0x2D40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_250jump_start" Offset="0x2D48"/>
+        <PlayerAnimation Name="gPlayerAnim_002D50" Offset="0x2D50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn" Offset="0x2D58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_45_turn_free" Offset="0x2D60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_hold2upL" Offset="0x2D68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideL" Offset="0x2D70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_sideR" Offset="0x2D78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startA" Offset="0x2D80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_startB" Offset="0x2D88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upL" Offset="0x2D90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_Fclimb_upR" Offset="0x2D98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake" Offset="0x2DA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_brake_end" Offset="0x2DA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downA" Offset="0x2DB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_downB" Offset="0x2DB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_down_wake" Offset="0x2DC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_hit" Offset="0x2DC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_run" Offset="0x2DD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shitR" Offset="0x2DD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_shit" Offset="0x2DE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_back_walk" Offset="0x2DE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_backspace" Offset="0x2DF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_box_kick" Offset="0x2DF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB" Offset="0x2E00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_free" Offset="0x2E08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_carryB_wait" Offset="0x2E10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check" Offset="0x2E18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end" Offset="0x2E20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_end_free" Offset="0x2E28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_free" Offset="0x2E30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait" Offset="0x2E38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_check_wait_free" Offset="0x2E40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_down" Offset="0x2E48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAL" Offset="0x2E50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endAR" Offset="0x2E58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBL" Offset="0x2E60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_endBR" Offset="0x2E68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startA" Offset="0x2E70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_startB" Offset="0x2E78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upL" Offset="0x2E80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_upR" Offset="0x2E88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_climb_up" Offset="0x2E90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_damage_run_free" Offset="0x2E98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense" Offset="0x2EA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end" Offset="0x2EA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_end_free" Offset="0x2EB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_free" Offset="0x2EB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_hit" Offset="0x2EC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_kiru" Offset="0x2EC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait" Offset="0x2ED0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_defense_wait_free" Offset="0x2ED8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip" Offset="0x2EE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end" Offset="0x2EE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_free" Offset="0x2EF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_down_slope_slip_end_long" Offset="0x2EF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock" Offset="0x2F00"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_electric_shock_end" Offset="0x2F08"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall" Offset="0x2F10"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up" Offset="0x2F18"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_up_free" Offset="0x2F20"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fall_wait" Offset="0x2F28"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_fighter2free" Offset="0x2F30"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2bom" Offset="0x2F38"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2fighter_free" Offset="0x2F40"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2freeB" Offset="0x2F48"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_free2free" Offset="0x2F50"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downA" Offset="0x2F58"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_downB" Offset="0x2F60"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_down_wake" Offset="0x2F68"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_hit" Offset="0x2F70"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shitR" Offset="0x2F78"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_front_shit" Offset="0x2F80"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_give_other" Offset="0x2F88"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hang_up_down" Offset="0x2F90"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry" Offset="0x2F98"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_carry_end" Offset="0x2FA0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run" Offset="0x2FA8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_heavy_run_free" Offset="0x2FB0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down" Offset="0x2FB8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_free" Offset="0x2FC0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_hip_down_long" Offset="0x2FC8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_ice_down" Offset="0x2FD0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump2landing" Offset="0x2FD8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump" Offset="0x2FE0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold" Offset="0x2FE8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_hold_free" Offset="0x2FF0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up" Offset="0x2FF8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_up_free" Offset="0x3000"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait" Offset="0x3008"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_climb_wait_free" Offset="0x3010"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_jump_up" Offset="0x3018"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing" Offset="0x3020"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_free" Offset="0x3028"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll" Offset="0x3030"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_roll_free" Offset="0x3038"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_landing_wait" Offset="0x3040"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom" Offset="0x3048"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_light_bom_end" Offset="0x3050"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_long2bom" Offset="0x3058"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free" Offset="0x3060"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_end" Offset="0x3068"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_nocarry_free_wait" Offset="0x3070"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2bom" Offset="0x3078"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter" Offset="0x3080"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2fighter_free" Offset="0x3088"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_normal2free" Offset="0x3090"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_end" Offset="0x3098"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_start" Offset="0x30A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_okarina_swing" Offset="0x30A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end" Offset="0x30B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_end_free" Offset="0x30B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start" Offset="0x30C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pull_start_free" Offset="0x30C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling" Offset="0x30D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pulling_free" Offset="0x30D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_end" Offset="0x30E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_fall" Offset="0x30E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_start" Offset="0x30F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait" Offset="0x30F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_push_wait_end" Offset="0x3100"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_pushing" Offset="0x3108"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put" Offset="0x3110"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_put_free" Offset="0x3118"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack" Offset="0x3120"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_re_dead_attack_wait" Offset="0x3128"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_rebound" Offset="0x3130"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run" Offset="0x3138"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_free" Offset="0x3140"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump" Offset="0x3148"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_end" Offset="0x3150"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall" Offset="0x3158"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_run_jump_water_fall_wait" Offset="0x3160"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing" Offset="0x3168"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_short_landing_free" Offset="0x3170"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkL_free" Offset="0x3178"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walkR_free" Offset="0x3180"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk" Offset="0x3188"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_side_walk_free" Offset="0x3190"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_take_out" Offset="0x3198"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free" Offset="0x31A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_free_wait" Offset="0x31A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi" Offset="0x31B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_talk_navi_wait" Offset="0x31B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw" Offset="0x31C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_throw_free" Offset="0x31C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip" Offset="0x31D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end" Offset="0x31D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_free" Offset="0x31E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_up_slope_slip_end_long" Offset="0x31E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitL" Offset="0x31F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait2waitR" Offset="0x31F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeA_20f" Offset="0x3200"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeB_20f" Offset="0x3208"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitF_typeC_20f" Offset="0x3210"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL2wait" Offset="0x3218"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitL_free" Offset="0x3220"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR2wait" Offset="0x3228"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_waitR_free" Offset="0x3230"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait" Offset="0x3238"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_free" Offset="0x3240"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeA_20f" Offset="0x3248"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeB_20f" Offset="0x3250"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wait_typeC_20f" Offset="0x3258"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_wakeup" Offset="0x3260"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk" Offset="0x3268"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL" Offset="0x3270"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endL_free" Offset="0x3278"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR" Offset="0x3280"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_endR_free" Offset="0x3288"/>
+        <PlayerAnimation Name="gPlayerAnim_link_normal_walk_free" Offset="0x3290"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okarina_warp_goal" Offset="0x3298"/>
+        <PlayerAnimation Name="gPlayerAnim_link_okiru_demo" Offset="0x32A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_shagamu_demo" Offset="0x32A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_carry" Offset="0x32B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_throw" Offset="0x32B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_silver_wait" Offset="0x32C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Lside_swim" Offset="0x32C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_Rside_swim" Offset="0x32D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_back_swim" Offset="0x32D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_land2swim_wait" Offset="0x32E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_15step_up" Offset="0x32E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim" Offset="0x32F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_dead" Offset="0x32F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_end" Offset="0x3300"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_deep_start" Offset="0x3308"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_down" Offset="0x3310"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_get" Offset="0x3318"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_hit" Offset="0x3320"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_swim_wait" Offset="0x3328"/>
+        <PlayerAnimation Name="gPlayerAnim_link_swimer_wait2swim_wait" Offset="0x3330"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun" Offset="0x3338"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_fastrun_muti" Offset="0x3340"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump100" Offset="0x3348"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_jump200" Offset="0x3350"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun" Offset="0x3358"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_slowrun_muti" Offset="0x3360"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stand" Offset="0x3368"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_stop" Offset="0x3370"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk2" Offset="0x3378"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk" Offset="0x3380"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_anim_walk_muti" Offset="0x3388"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_down" Offset="0x3390"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_left_up" Offset="0x3398"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_down" Offset="0x33A0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_right_up" Offset="0x33A8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_stop_muti" Offset="0x33B0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_1" Offset="0x33B8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_2" Offset="0x33C0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_uma_wait_3" Offset="0x33C8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat1_20f" Offset="0x33D0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_heat2_20f" Offset="0x33D8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemA_20f" Offset="0x33E0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_itemB_20f" Offset="0x33E8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_waitF_typeD_20f" Offset="0x33F0"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat1_20f" Offset="0x33F8"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_heat2_20f" Offset="0x3400"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemA_20f" Offset="0x3408"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemB_20f" Offset="0x3410"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemC_20f" Offset="0x3418"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD1_20f" Offset="0x3420"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_itemD2_20f" Offset="0x3428"/>
+        <PlayerAnimation Name="gPlayerAnim_link_wait_typeD_20f" Offset="0x3430"/>
+        <PlayerAnimation Name="gPlayerAnim_lkt_nwait" Offset="0x3438"/>
+        <PlayerAnimation Name="gPlayerAnim_nw_modoru" Offset="0x3440"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_ato" Offset="0x3448"/>
+        <PlayerAnimation Name="gPlayerAnim_o_get_mae" Offset="0x3450"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get" Offset="0x3458"/>
+        <PlayerAnimation Name="gPlayerAnim_om_get_mae" Offset="0x3460"/>
+        <PlayerAnimation Name="gPlayerAnim_sude_nwait" Offset="0x3468"/>
+        <PlayerAnimation Name="gPlayerAnim_L_1kyoro" Offset="0x3470"/>
+        <PlayerAnimation Name="gPlayerAnim_L_2kyoro" Offset="0x3478"/>
+        <PlayerAnimation Name="gPlayerAnim_L_bouzen" Offset="0x3480"/>
+        <PlayerAnimation Name="gPlayerAnim_L_hajikareru" Offset="0x3488"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kamaeru" Offset="0x3490"/>
+        <PlayerAnimation Name="gPlayerAnim_L_ken_miru" Offset="0x3498"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kennasi_w" Offset="0x34A0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_kw" Offset="0x34A8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_mukinaoru" Offset="0x34B0"/>
+        <PlayerAnimation Name="gPlayerAnim_L_okarina_get" Offset="0x34B8"/>
+        <PlayerAnimation Name="gPlayerAnim_L_sagaru" Offset="0x34C0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ha" Offset="0x34C8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_m_wait" Offset="0x34D0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_miageru" Offset="0x34D8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0x34E0"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0x34E8"/>
+        <PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0x34F0"/>
+
+        <!-- Probably a file boundary here. -->
+
+        <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
+        <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
+        <Texture Name="gDebugCursorTex" OutName="debug_cursor" Format="i8" Width="16" Height="16" Offset="0x37F0"/>
+        <Texture Name="gDebugCrossTex" OutName="debug_cross" Format="i8" Width="16" Height="16" Offset="0x38F0"/>
+        <DList Name="gDebugArrowDL" Offset="0x39F0"/>
+        <DList Name="gDebugCameraDL" Offset="0x3C90"/>
+        <DList Name="gDebugCheckeredFloorDL" Offset="0x3FC8"/>
+        <Texture Name="gDebugCheckeredFloorTex" OutName="debug_checkered_floor" Format="ia4" Width="32" Height="32" Offset="0x4058"/>
+        <DList Name="gDebugSpriteDL" Offset="0x4298"/>
+        <Animation Name="gArrow1Anim" Offset="0x4310"/>
+        <Animation Name="gArrow2Anim" Offset="0x436C"/>
+        <Texture Name="gArrowShaftTex" OutName="arrow_shaft" Format="rgba16" Width="16" Height="128" Offset="0x4380"/>
+        <Texture Name="gArrowFletchingTex" OutName="arrow_fletching" Format="rgba16" Width="32" Height="16" Offset="0x5380"/>
+        <DList Name="gArrowNearDL" Offset="0x5AA0"/>
+        <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
+        <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
+        <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
+        <DList Name="gBombBodyDL" Offset="0x7860"/>
+        <Texture Name="gBombCapTex" OutName="bomb_cap" Format="rgba16" Width="8" Height="8" Offset="0x78F0"/>
+        <DList Name="gBombCapDL" Offset="0x7A50"/>
+        <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x7B10"/>
+        <DList Name="gBombchuDL" Offset="0x7E10"/>
+        <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x7F80"/>
+        <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x8780"/>
+        <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x8F80"/>
+        <Texture Name="gEffBombExplosion4Tex" OutName="eff_bomb_explosion_4" Format="ia16" Width="32" Height="32" Offset="0x9780"/>
+        <Texture Name="gEffBombExplosion5Tex" OutName="eff_bomb_explosion_5" Format="ia16" Width="32" Height="32" Offset="0x9F80"/>
+        <Texture Name="gEffBombExplosion6Tex" OutName="eff_bomb_explosion_6" Format="ia16" Width="32" Height="32" Offset="0xA780"/>
+        <Texture Name="gEffBombExplosion7Tex" OutName="eff_bomb_explosion_7" Format="ia16" Width="32" Height="32" Offset="0xAF80"/>
+        <Texture Name="gEffBombExplosion8Tex" OutName="eff_bomb_explosion_8" Format="ia16" Width="32" Height="32" Offset="0xB780"/>
+        <DList Name="gEffBombExplosion1DL" Offset="0xBF80"/>
+        <DList Name="gEffBombExplosion2DL" Offset="0xBFE8"/>
+        <DList Name="gEffBombExplosion3DL" Offset="0xC040"/>
+        <DList Name="gEffFragments1DL" Offset="0xC0D0"/>
+        <Texture Name="gWitheredLeafTex" OutName="withered_leaf" Format="rgba16" Width="16" Height="16" Offset="0xC160"/>
+        <DList Name="gUnknownBlankDL" Offset="0xC690"/>
+        <DList Name="gBoomerangDL" Offset="0xC698"/>
+        <DList Name="gBoomerangRefDL" Offset="0xC808"/>
+        <DList Name="gCompassArrowDL" Offset="0xC820"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_0C8B0" Offset="0xC8B0"/>
+        <!-- ntsc end -->
+        <DList Name="gZTargetArrowDL" Offset="0xCC10"/>
+        <Texture Name="gHilite3Tex" OutName="hilite_3" Format="i8" Width="8" Height="8" Offset="0xCD20"/>
+        <DList Name="gEffFragments2DL" Offset="0xCE20"/>
+        <!-- todo: figure out name (name also undocumented in mm) -->
+        <!-- ntsc start -->
+        <Texture Name="gameplay_keep_Tex_0CE60" OutName="tex_0CE60" Format="ia8" Width="32" Height="32" Offset="0xCE60"/>
+        <!-- ntsc end -->
+        <Texture Name="gSelectionCursorTex" OutName="selection_cursor" Format="ia4" Width="16" Height="16" Offset="0xD260"/>
+        <Texture Name="gControlStickTex" OutName="control_stick" Format="ia8" Width="16" Height="16" Offset="0xD2E0"/>
+        <Texture Name="gArrowCursorTex" OutName="arrow_cursor" Format="ia8" Width="16" Height="24" Offset="0xD3E0"/>
+        <DList Name="gUnusedRockFragmentDL" Offset="0xD6E0"/>
+        <DList Name="gBoulderFragmentsDL" Offset="0xD7E0"/>
+        <Texture Name="gRockFragment1Tex" OutName="rock_fragment_1" Format="rgba16" Width="32" Height="32" Offset="0xD980"/>
+        <Texture Name="gRockFragment2Tex" OutName="rock_fragment_2" Format="rgba16" Width="32" Height="32" Offset="0xE180"/>
+        <Animation Name="gDoorChildOpeningLeftAnim" Offset="0xEA54"/>
+        <Animation Name="gDoorChildOpeningRightAnim" Offset="0xEB40"/>
+        <Animation Name="gDoorAdultOpeningLeftAnim" Offset="0xEBF8"/>
+        <DList Name="gDoorFrameDL" Offset="0xF0D0"/>
+        <DList Name="gDoorLeftDL" Offset="0xF158"/>
+        <DList Name="gDoorRightDL" Offset="0xF2A0"/>
+        <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
+        <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
+        <DList Name="gEffDustDL" Offset="0x104F0"/>
+        <DList Name="gEffFlash1DL" Offset="0x105D0"/>
+        <DList Name="gEffFlash2DL" Offset="0x10648"/>
+        <Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
+        <Texture Name="gTorchFlameTex" OutName="torch_flame" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
+        <Texture Name="gEffUnknown1Tex" OutName="eff_unknown_1" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
+        <DList Name="gSpinAttack1DL" Offset="0x12A10"/>
+        <DList Name="gSpinAttack2DL" Offset="0x12B30"/>
+        <DList Name="gSpinAttack3DL" Offset="0x12F90"/>
+        <DList Name="gSpinAttack4DL" Offset="0x130B0"/>
+        <Texture Name="gFlameWall1Tex" OutName="flame_wall_1" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
+        <Texture Name="gFlameWall2Tex" OutName="flame_wall_2" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
+        <DList Name="gSpinAttackChargingDL" Offset="0x13AB0"/>
+        <Texture Name="gEffUnknown2Tex" OutName="eff_unknown_2" Format="i8" Width="32" Height="64" Offset="0x13BA0"/>
+        <Texture Name="gEffUnknown3Tex" OutName="eff_unknown_3" Format="i8" Width="32" Height="64" Offset="0x143A0"/>
+        <DList Name="gUnusedBeamBladeDL" Offset="0x14E60"/>
+        <Animation Name="gFairyAnim" Offset="0x15044"/>
+        <Texture Name="gFairyWingTex" OutName="fairy_wing" Format="i8" Width="32" Height="64" Offset="0x15060"/>
+        <DList Name="gFairyWing1DL" Offset="0x158A0"/>
+        <DList Name="gFairyWing2DL" Offset="0x15968"/>
+        <DList Name="gFairyWing3DL" Offset="0x15A30"/>
+        <DList Name="gFairyWing4DL" Offset="0x15AF8"/>
+        <DList Name="gGlowCircleTextureLoadDL" Offset="0x15BC0"/>
+        <DList Name="gGlowCircleDL" Offset="0x15C00"/>
+        <DList Name="gGlowCircleSmallDL" Offset="0x15C20"/>
+        <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
+        <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
+        <Texture Name="gHilite4Tex" OutName="hilite_4" Format="rgba16" Width="32" Height="32" Offset="0x17070"/>
+        <Texture Name="gEffUnknown4Tex" OutName="eff_unknown_4" Format="i8" Width="32" Height="64" Offset="0x17870"/>
+        <Texture Name="gEffUnknown5Tex" OutName="eff_unknown_5" Format="i8" Width="32" Height="64" Offset="0x18070"/>
+        <DList Name="gEffFireCircleDL" Offset="0x18950"/>
+        <Animation Name="gFishOutOfWaterAnim" Offset="0x18A9C"/>
+        <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
+        <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
+        <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
+        <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
+        <DList Name="gEffShockwaveDL" Offset="0x1A550"/>
+        <DList Name="gEffBubbleDL" Offset="0x1A600"/>
+        <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A6C0"/>
+        <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1AAC0"/>
+        <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AEC0"/>
+        <Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x1B2C0"/>
+        <Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x1B6C0"/>
+        <Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x1BAC0"/>
+        <Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x1BEC0"/>
+        <Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x1C2C0"/>
+        <DList Name="gEffFireFootprintDL" Offset="0x1C6C0"/>
+        <Texture Name="gEffUnusedBubbles1Tex" OutName="eff_unused_bubbles_1" Format="ia8" Width="32" Height="32" Offset="0x1C760"/>
+        <Texture Name="gEffUnusedBubbles2Tex" OutName="eff_unused_bubbles_2" Format="ia8" Width="32" Height="32" Offset="0x1CB60"/>
+        <Texture Name="gEffUnusedBubbles3Tex" OutName="eff_unused_bubbles_3" Format="ia8" Width="32" Height="32" Offset="0x1CF60"/>
+        <Texture Name="gEffUnusedBubbles4Tex" OutName="eff_unused_bubbles_4" Format="ia8" Width="32" Height="32" Offset="0x1D360"/>
+        <Texture Name="gEffUnusedBubbles5Tex" OutName="eff_unused_bubbles_5" Format="ia8" Width="32" Height="32" Offset="0x1D760"/>
+        <Texture Name="gEffUnusedBubbles6Tex" OutName="eff_unused_bubbles_6" Format="ia8" Width="32" Height="32" Offset="0x1DB60"/>
+        <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DF60"/>
+        <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1E360"/>
+        <DList Name="gEffUnusedBubblesDL" Offset="0x1E760"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E810"/>
+        <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F810"/>
+        <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F990"/>
+        <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1FB10"/>
+        <Texture Name="gEffHitMark4Tex" OutName="eff_hit_mark_4" Format="i4" Width="32" Height="24" Offset="0x1FC90"/>
+        <Texture Name="gEffHitMark5Tex" OutName="eff_hit_mark_5" Format="i4" Width="32" Height="24" Offset="0x1FE10"/>
+        <Texture Name="gEffHitMark6Tex" OutName="eff_hit_mark_6" Format="i4" Width="32" Height="24" Offset="0x1FF90"/>
+        <Texture Name="gEffHitMark7Tex" OutName="eff_hit_mark_7" Format="i4" Width="32" Height="24" Offset="0x20110"/>
+        <Texture Name="gEffHitMark8Tex" OutName="eff_hit_mark_8" Format="i4" Width="32" Height="24" Offset="0x20290"/>
+        <Texture Name="gEffHitMark9Tex" OutName="eff_hit_mark_9" Format="i4" Width="32" Height="24" Offset="0x20410"/>
+        <Texture Name="gEffHitMark10Tex" OutName="eff_hit_mark_10" Format="i4" Width="32" Height="24" Offset="0x20590"/>
+        <Texture Name="gEffHitMark11Tex" OutName="eff_hit_mark_11" Format="i4" Width="32" Height="24" Offset="0x20710"/>
+        <Texture Name="gEffHitMark12Tex" OutName="eff_hit_mark_12" Format="i4" Width="32" Height="24" Offset="0x20890"/>
+        <Texture Name="gEffHitMark13Tex" OutName="eff_hit_mark_13" Format="i4" Width="32" Height="24" Offset="0x20A10"/>
+        <Texture Name="gEffHitMark14Tex" OutName="eff_hit_mark_14" Format="i4" Width="32" Height="24" Offset="0x20B90"/>
+        <Texture Name="gEffHitMark15Tex" OutName="eff_hit_mark_15" Format="i4" Width="32" Height="24" Offset="0x20D10"/>
+        <Texture Name="gEffHitMark16Tex" OutName="eff_hit_mark_16" Format="i4" Width="32" Height="24" Offset="0x20E90"/>
+        <Texture Name="gEffHitMark17Tex" OutName="eff_hit_mark_17" Format="i4" Width="32" Height="24" Offset="0x21010"/>
+        <Texture Name="gEffHitMark18Tex" OutName="eff_hit_mark_18" Format="i4" Width="32" Height="24" Offset="0x21190"/>
+        <Texture Name="gEffHitMark19Tex" OutName="eff_hit_mark_19" Format="i4" Width="32" Height="24" Offset="0x21310"/>
+        <Texture Name="gEffHitMark20Tex" OutName="eff_hit_mark_20" Format="i4" Width="32" Height="24" Offset="0x21490"/>
+        <Texture Name="gEffHitMark21Tex" OutName="eff_hit_mark_21" Format="i4" Width="32" Height="24" Offset="0x21610"/>
+        <Texture Name="gEffHitMark22Tex" OutName="eff_hit_mark_22" Format="i4" Width="32" Height="24" Offset="0x21790"/>
+        <Texture Name="gEffHitMark23Tex" OutName="eff_hit_mark_23" Format="i4" Width="32" Height="24" Offset="0x21910"/>
+        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
+        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
+        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
+        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
+        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
+        <Texture Name="gEffMagmaBubble3Tex" OutName="eff_magma_bubbles_3" Format="ia8" Width="16" Height="24" Offset="0x23FB0"/>
+        <Texture Name="gEffMagmaBubble4Tex" OutName="eff_magma_bubbles_4" Format="ia8" Width="16" Height="24" Offset="0x24130"/>
+        <Texture Name="gEffMagmaBubble5Tex" OutName="eff_magma_bubbles_5" Format="ia8" Width="16" Height="24" Offset="0x242B0"/>
+        <Texture Name="gEffMagmaBubble6Tex" OutName="eff_magma_bubbles_6" Format="ia8" Width="16" Height="24" Offset="0x24430"/>
+        <Texture Name="gEffMagmaBubble7Tex" OutName="eff_magma_bubbles_7" Format="ia8" Width="16" Height="24" Offset="0x245B0"/>
+        <Texture Name="gEffMagmaBubble8Tex" OutName="eff_magma_bubbles_8" Format="ia8" Width="16" Height="24" Offset="0x24730"/>
+        <DList Name="gEffMagmaBubbleDL" Offset="0x248B0"/>
+        <Texture Name="gEffWaterRippleTex" OutName="eff_ss_g_ripple" Format="i8" Width="64" Height="64" Offset="0x24950"/>
+        <DList Name="gEffWaterRippleDL" Offset="0x25950"/>
+        <DList Name="gEffSparkDL" Offset="0x259F0"/>
+        <Texture Name="gEffWaterSplash1Tex" OutName="eff_water_splash_1" Format="i8" Width="32" Height="40" Offset="0x25A90"/>
+        <Texture Name="gEffWaterSplash2Tex" OutName="eff_water_splash_2" Format="i8" Width="32" Height="40" Offset="0x25F90"/>
+        <Texture Name="gEffWaterSplash3Tex" OutName="eff_water_splash_3" Format="i8" Width="32" Height="40" Offset="0x26490"/>
+        <Texture Name="gEffWaterSplash4Tex" OutName="eff_water_splash_4" Format="i8" Width="32" Height="40" Offset="0x26990"/>
+        <Texture Name="gEffWaterSplash5Tex" OutName="eff_water_splash_5" Format="i8" Width="32" Height="40" Offset="0x26E90"/>
+        <Texture Name="gEffWaterSplash6Tex" OutName="eff_water_splash_6" Format="i8" Width="32" Height="40" Offset="0x27390"/>
+        <Texture Name="gEffWaterSplash7Tex" OutName="eff_water_splash_7" Format="i8" Width="32" Height="40" Offset="0x27890"/>
+        <Texture Name="gEffWaterSplash8Tex" OutName="eff_water_splash_8" Format="i8" Width="32" Height="40" Offset="0x27D90"/>
+        <DList Name="gEffWaterSplashDL" Offset="0x28290"/>
+        <Texture Name="gUnknownEffStone1Tex" OutName="unknown_eff_stone_1" Format="ia8" Width="32" Height="32" Offset="0x28330"/>
+        <Texture Name="gUnknownEffStone2Tex" OutName="unknown_eff_stone_2" Format="ia8" Width="32" Height="32" Offset="0x28730"/>
+        <Texture Name="gUnknownEffStone3Tex" OutName="unknown_eff_stone_3" Format="ia8" Width="32" Height="32" Offset="0x28B30"/>
+        <Texture Name="gUnknownEffStone4Tex" OutName="unknown_eff_stone_4" Format="ia8" Width="32" Height="32" Offset="0x28F30"/>
+        <Texture Name="gUnknownEffStone5Tex" OutName="unknown_eff_stone_5" Format="ia8" Width="32" Height="32" Offset="0x29330"/>
+        <Texture Name="gUnknownEffStone6Tex" OutName="unknown_eff_stone_6" Format="ia8" Width="32" Height="32" Offset="0x29730"/>
+        <Texture Name="gUnknownEffStone7Tex" OutName="unknown_eff_stone_7" Format="ia8" Width="32" Height="32" Offset="0x29B30"/>
+        <Texture Name="gUnknownEffStone8Tex" OutName="unknown_eff_stone_8" Format="ia8" Width="32" Height="32" Offset="0x29F30"/>
+        <DList Name="gUnknownEffStoneDL" Offset="0x2A330"/>
+        <Texture Name="gEffLightning1Tex" OutName="eff_lightning_1" Format="i8" Width="16" Height="96" Offset="0x2A3D0"/>
+        <Texture Name="gEffLightning2Tex" OutName="eff_lightning_2" Format="i8" Width="16" Height="96" Offset="0x2A9D0"/>
+        <Texture Name="gEffLightning3Tex" OutName="eff_lightning_3" Format="i8" Width="16" Height="96" Offset="0x2AFD0"/>
+        <Texture Name="gEffLightning4Tex" OutName="eff_lightning_4" Format="i8" Width="16" Height="96" Offset="0x2B5D0"/>
+        <Texture Name="gEffLightning5Tex" OutName="eff_lightning_5" Format="i8" Width="16" Height="96" Offset="0x2BBD0"/>
+        <Texture Name="gEffLightning6Tex" OutName="eff_lightning_6" Format="i8" Width="16" Height="96" Offset="0x2C1D0"/>
+        <Texture Name="gEffLightning7Tex" OutName="eff_lightning_7" Format="i8" Width="16" Height="96" Offset="0x2C7D0"/>
+        <Texture Name="gEffLightning8Tex" OutName="eff_lightning_8" Format="i8" Width="16" Height="96" Offset="0x2CDD0"/>
+        <DList Name="gEffLightningDL" Offset="0x2D3D0"/>
+        <Texture Name="gEffEnemyDeathFlame1Tex" OutName="eff_enemy_death_flame_1" Format="i8" Width="32" Height="64" Offset="0x2D480"/>
+        <Texture Name="gEffEnemyDeathFlame2Tex" OutName="eff_enemy_death_flame_2" Format="i8" Width="32" Height="64" Offset="0x2DC80"/>
+        <Texture Name="gEffEnemyDeathFlame3Tex" OutName="eff_enemy_death_flame_3" Format="i8" Width="32" Height="64" Offset="0x2E480"/>
+        <Texture Name="gEffEnemyDeathFlame4Tex" OutName="eff_enemy_death_flame_4" Format="i8" Width="32" Height="64" Offset="0x2EC80"/>
+        <Texture Name="gEffEnemyDeathFlame5Tex" OutName="eff_enemy_death_flame_5" Format="i8" Width="32" Height="64" Offset="0x2F480"/>
+        <Texture Name="gEffEnemyDeathFlame6Tex" OutName="eff_enemy_death_flame_6" Format="i8" Width="32" Height="64" Offset="0x2FC80"/>
+        <Texture Name="gEffEnemyDeathFlame7Tex" OutName="eff_enemy_death_flame_7" Format="i8" Width="32" Height="64" Offset="0x30480"/>
+        <Texture Name="gEffEnemyDeathFlame8Tex" OutName="eff_enemy_death_flame_8" Format="i8" Width="32" Height="64" Offset="0x30C80"/>
+        <Texture Name="gEffEnemyDeathFlame9Tex" OutName="eff_enemy_death_flame_9" Format="i8" Width="32" Height="64" Offset="0x31480"/>
+        <Texture Name="gEffEnemyDeathFlame10Tex" OutName="eff_enemy_death_flame_10" Format="i8" Width="32" Height="64" Offset="0x31C80"/>
+        <DList Name="gEffEnemyDeathFlameDL" Offset="0x32480"/>
+        <Texture Name="gEffUnknown9Tex" OutName="eff_unknown_9" Format="i8" Width="32" Height="32" Offset="0x32530"/>
+        <Texture Name="gEffUnknown10Tex" OutName="eff_unknown_10" Format="i8" Width="32" Height="32" Offset="0x32930"/>
+        <Texture Name="gEffUnknown11Tex" OutName="eff_unknown_11" Format="i8" Width="32" Height="32" Offset="0x32D30"/>
+        <Texture Name="gEffUnknown12Tex" OutName="eff_unknown_12" Format="i8" Width="32" Height="32" Offset="0x33130"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -2 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gEffUnknown12OverflowTex" OutName="eff_unknown_12_overflow" Format="ia16" Width="32" Height="32" Offset="0x3312E"/>
+        <Texture Name="gUnknownWoodBoardTex" OutName="unknown_wood_board" Format="i8" Width="32" Height="32" Offset="0x33530"/>
+        <DList Name="gEffIceFragment1DL" Offset="0x33BC0"/>
+        <DList Name="gEffIceFragment2DL" Offset="0x33CB8"/>
+        <DList Name="gEffIceFragment3DL" Offset="0x34380"/>
+        <Animation Name="gBugCrawlAnim" Offset="0x3469C"/>
+        <DList Name="gBugLimb1DL" Offset="0x346B0"/>
+        <DList Name="gBugLimb1WrapperDL" Offset="0x34750"/>
+        <DList Name="gBugLimb1WrapperWrapperDL" Offset="0x34760"/>
+        <DList Name="gBugLimb2DL" Offset="0x347A0"/>
+        <DList Name="gBugLimb2WrapperDL" Offset="0x34840"/>
+        <DList Name="gBugLimb2WrapperWrapperDL" Offset="0x34850"/>
+        <DList Name="gBugLimb3DL" Offset="0x34890"/>
+        <DList Name="gBugLimb3WrapperDL" Offset="0x34930"/>
+        <DList Name="gBugLimb3WrapperWrapperDL" Offset="0x34940"/>
+        <DList Name="gBugLimb4DL" Offset="0x34980"/>
+        <DList Name="gBugLimb4WrapperDL" Offset="0x34A20"/>
+        <DList Name="gBugLimb4WrapperWrapperDL" Offset="0x34A30"/>
+        <DList Name="gBugLimb5DL" Offset="0x34A70"/>
+        <DList Name="gBugLimb5WrapperDL" Offset="0x34B10"/>
+        <DList Name="gBugLimb5WrapperWrapperDL" Offset="0x34B20"/>
+        <DList Name="gBugLimb6DL" Offset="0x34B60"/>
+        <DList Name="gBugLimb6WrapperDL" Offset="0x34C00"/>
+        <DList Name="gBugLimb6WrapperWrapperDL" Offset="0x34C10"/>
+        <DList Name="gBugLimb7DL" Offset="0x34C50"/>
+        <DList Name="gBugLimb7WrapperDL" Offset="0x34CF0"/>
+        <DList Name="gBugLimb7WrapperWrapperDL" Offset="0x34D00"/>
+        <DList Name="gBugLimb8DL" Offset="0x34D40"/>
+        <DList Name="gBugLimb8WrapperDL" Offset="0x34DE0"/>
+        <DList Name="gBugLimb8WrapperWrapperDL" Offset="0x34DF0"/>
+        <DList Name="gBugLimb9DL" Offset="0x34E30"/>
+        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
+        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
+        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
+        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
+        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
+        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35BD0"/>
+        <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x363D0"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36BD0"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x373D0"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37BD0"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37C38"/>
+        <DList Name="gEffSparklesDL" Offset="0x37D20"/>
+        <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37E00"/>
+        <Texture Name="gEffUnknown14Tex" OutName="eff_unknown_tex_14" Format="i8" Width="16" Height="32" Offset="0x38000"/>
+        <DList Name="gHoverBootsCircleDL" Offset="0x382D0"/>
+        <Texture Name="gMoonTex" OutName="moon" Format="ia8" Width="64" Height="64" Offset="0x383A0"/>
+        <DList Name="gMoonDL" Offset="0x393A0"/>
+        <Texture Name="gUnknownCircle6Tex" OutName="unknown_circle_6" Format="i8" Width="32" Height="32" Offset="0x39450"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_39890" Offset="0x39890"/>
+        <DList Name="gameplay_keep_DL_399B0" Offset="0x399B0"/>
+        <DList Name="gameplay_keep_DL_39A80" Offset="0x39A80"/>
+        <DList Name="gameplay_keep_DL_39B50" Offset="0x39B50"/>
+        <!-- ntsc end -->
+        <Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
+        <DList Name="gLiftableRockDL" Offset="0x39E90"/>
+
+        <!-- unused in game -->
+        <DList Name="gUnusedRockRectangularPrism1DL" Offset="0x3A0C0"/>
+        <Collision Name="gWideTallBlockCol" Offset="0x3A278"/>
+        <DList Name="gFlatBlockDL" Offset="0x3A430"/>
+        <Collision Name="gTallBlockCol" Offset="0x3A5F0"/>
+        <DList Name="gUnusedRockRectangularPrism3DL" Offset="0x3A7A0"/>
+        <Collision Name="gSmallerFlatBlockCol" Offset="0x3A950"/>
+        <DList Name="gFlatRotBlockDL" Offset="0x3AB00"/>
+        <Collision Name="gLargerFlatBlockCol" Offset="0x3ACB0"/>
+        <DList Name="gSmallCubeDL" Offset="0x3AE60"/>
+        <Collision Name="gSmallerCubeCol" Offset="0x3B020"/>
+        <DList Name="gTreeStumpDL" Offset="0x3B1E0"/>
+        <DList Name="gGrassBladesDL" Offset="0x3B3B0"/>
+
+        <Texture Name="gHeartShapeTex" OutName="heart_shape" Format="i8" Width="16" Height="16" Offset="0x3B460"/>
+        <DList Name="gHeartPieceInteriorDL" Offset="0x3B860"/>
+        <DList Name="gHeartPieceExteriorDL" Offset="0x3C3D0"/>
+        <DList Name="gHeartContainerInteriorDL" Offset="0x3C508"/>
+        <!-- todo: figure out names -->
+        <!-- ntsc start -->
+        <DList Name="gameplay_keep_DL_3CFD0" Offset="0x3CFD0"/>
+        <DList Name="gameplay_keep_DL_3D108" Offset="0x3D108"/>
+        <DList Name="gameplay_keep_DL_3D260" Offset="0x3D260"/>
+        <!-- ntsc end -->
+        <DList Name="gSignRectangularDL" Offset="0x3D560"/>
+        <DList Name="gSignDirectionalDL" Offset="0x3DAC0"/>
+        <Texture Name="gDropArrows2Tex" OutName="drop_arrows_2" Format="rgba16" Width="32" Height="32" Offset="0x3DD80"/>
+        <Texture Name="gDropArrows1Tex" OutName="drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x3E580"/>
+        <Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
+        <Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropBombchuTex" OutName="unused_drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
+        <Texture Name="gUnusedWalletTex" OutName="unused_wallet" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
+        <!-- ntsc end -->
+        <Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedHeartPieceTex" OutName="unused_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
+        <!-- ntsc end -->
+        <DList Name="gItemDropDL" Offset="0x41D80"/>
+        <Texture Name="gDropKeySmallTex" OutName="drop_key_small" Format="rgba16" Width="32" Height="32" Offset="0x41E50"/>
+        <Texture Name="gDropMagicSmallTex" OutName="drop_magic_small" Format="rgba16" Width="32" Height="32" Offset="0x42650"/>
+        <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x42E50"/>
+        <Texture Name="gDropDekuSeedsTex" OutName="drop_deku_seeds" Format="rgba16" Width="32" Height="32" Offset="0x43650"/>
+        <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x43E50"/>
+        <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x44650"/>
+        <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x44E50"/>
+        <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x44E70"/>
+        <Texture Name="gRupeeRedTex" OutName="rupee_red" Format="rgba16" Width="4" Height="4" Offset="0x44E90"/>
+        <Texture Name="gRupeePinkTex" OutName="rupee_pink" Format="rgba16" Width="4" Height="4" Offset="0x44ED0"/>
+        <Texture Name="gRupeeOrangeTex" OutName="rupee_orange" Format="rgba16" Width="4" Height="4" Offset="0x44EB0"/>
+        <Texture Name="gRupeeSilverTex" OutName="rupee_silver" Format="rgba16" Width="4" Height="4" Offset="0x44EF0"/>
+        <DList Name="gRupeeDL" Offset="0x45150"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedDropRecoveryHeartTex" OutName="unused_drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
+        <Texture Name="gUnusedDropBombTex" OutName="unused_drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
+        <Texture Name="gUnusedDropArrows1Tex" OutName="unused_drop_arrows_1" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
+        <!-- ntsc end -->
+        <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
+        <!-- ntsc start -->
+        <Texture Name="gUnusedRupeeLightBlueTex" OutName="unused_rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
+        <Texture Name="gUnusedHeartContainerTex" OutName="unused_heart_container" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
+        <Texture Name="gUnusedTreeBarkTex" OutName="unused_tree_bark" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
+        <!-- ntsc end -->
+        <Texture Name="gUnknownStone1Tex" OutName="unknown_stone_1" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
+        <Texture Name="gUnknownStone2Tex" OutName="unknown_stone_2" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>
+        <Texture Name="gUnusedTreeStumpTopTex" OutName="unused_tree_stump_top" Format="rgba16" Width="32" Height="32" Offset="0x48A60"/>
+        <Texture Name="gUnusedTreeStumpBarkTex" OutName="unused_tree_stump_bark" Format="rgba16" Width="32" Height="32" Offset="0x49260"/>
+        <Texture Name="gUnusedGrassBladesTex" OutName="unused_grass_blades" Format="rgba16" Width="64" Height="32" Offset="0x49A60"/>
+        <Texture Name="gUnusedStoneHookshotTargetTex" OutName="unused_stone_hookshot_target" Format="rgba16" Width="32" Height="32" Offset="0x4AA60"/>
+        <Texture Name="gUnknownStone3Tex" OutName="unknown_stone_3" Format="rgba16" Width="32" Height="32" Offset="0x4B260"/>
+        <Texture Name="gSignRectangularSideTex" OutName="sign_rectangular_side" Format="rgba16" Width="32" Height="16" Offset="0x4BA60"/>
+        <Texture Name="gSignRectangularFrontTex" OutName="sign_rectangular_front" Format="rgba16" Width="32" Height="16" Offset="0x4BE60"/>
+        <Texture Name="gSignPostWoodTex" OutName="sign_post_wood" Format="rgba16" Width="64" Height="8" Offset="0x4C260"/>
+        <Texture Name="gSignLetteringTex" OutName="sign_lettering" Format="rgba16" Width="64" Height="32" Offset="0x4C660"/>
+        <DList Name="gRaindropDL" Offset="0x4D690"/>
+        <DList Name="gFootShadowDL" Offset="0x4D6B0"/>
+        <Texture Name="gFootShadowTex" OutName="footprint_shadow" Format="ia16" Width="32" Height="64" Offset="0x4D740"/>
+        <DList Name="gCircleShadowDL" Offset="0x4E740"/>
+        <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x4E7C0"/>
+        <DList Name="gHorseShadowDL" Offset="0x4F000"/>
+        <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x4F050"/>
+        <DList Name="gDungeonDoorDL" Offset="0x4F510"/>
+        <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4F5C0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x50600"/>
+        <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgba16" Width="32" Height="64" Offset="0x50690"/>
+        <Texture Name="gSun1Tex" OutName="sun" Format="i4" Width="64" Height="64" Offset="0x51690"/>
+        <Texture Name="gSunEvening1Tex" OutName="sun_evening" Format="i4" Width="64" Height="64" Offset="0x51E90"/>
+        <DList Name="gKokiriDustMoteMaterialDL" Offset="0x52690"/>
+        <DList Name="gKokiriDustMoteModelDL" Offset="0x526D8"/>
+        <DList Name="gSunDL" Offset="0x526F0"/>
+        <DList Name="gZTargetLockOnTriangleDL" Offset="0x52980"/>
+        <DList Name="gEffFire1DL" Offset="0x52A10"/>
+        <DList Name="gEffFire2DL" Offset="0x52AD0"/>
+        <Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x52B90"/>
+        <Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x53390"/>
+        <DList Name="gUnusedUnknownShape1DL" Offset="0x547E0"/>
+        <DList Name="gUnusedUnknownShape1RefDL" Offset="0x54B60"/>
+        <DList Name="gUnusedUnknownShape2DL" Offset="0x55810"/>
+        <DList Name="gUnusedUnknownShape2RefDL" Offset="0x55B30"/>
+        <DList Name="gUnusedUnknownShape3DL" Offset="0x567B0"/>
+        <DList Name="gUnusedUnknownShape3RefDL" Offset="0x56AC8"/>
+        <Texture Name="gUnusedUpsideDownZeldaTex" OutName="upside_down_zelda" Format="i8" Width="64" Height="32" Offset="0x56AE0"/>
+        <Texture Name="gDust1Tex" OutName="dust_1" Format="i8" Width="32" Height="32" Offset="0x572E0"/>
+        <Texture Name="gDust2Tex" OutName="dust_2" Format="i8" Width="32" Height="32" Offset="0x576E0"/>
+        <Texture Name="gDust3Tex" OutName="dust_3" Format="i8" Width="32" Height="32" Offset="0x57AE0"/>
+        <Texture Name="gDust4Tex" OutName="dust_4" Format="i8" Width="32" Height="32" Offset="0x57EE0"/>
+        <Texture Name="gDust5Tex" OutName="dust_5" Format="i8" Width="32" Height="32" Offset="0x582E0"/>
+        <Texture Name="gDust6Tex" OutName="dust_6" Format="i8" Width="32" Height="32" Offset="0x586E0"/>
+        <Texture Name="gDust7Tex" OutName="dust_7" Format="i8" Width="32" Height="32" Offset="0x58AE0"/>
+        <Texture Name="gDust8Tex" OutName="dust_8" Format="i8" Width="32" Height="32" Offset="0x58EE0"/>
+        <Texture Name="gCircleGlowLTex" OutName="circle_glow_l" Format="i8" Width="32" Height="64" Offset="0x592E0"/>
+        <Texture Name="gCircleGlowRTex" OutName="circle_glow_r" Format="i8" Width="32" Height="64" Offset="0x59AE0"/>
+        <Texture Name="gCircleGlowSLTex" OutName="circle_glow_sl" Format="i8" Width="32" Height="64" Offset="0x5A2E0"/>
+        <Texture Name="gCircleGlowSRTex" OutName="circle_glow_sr" Format="i8" Width="32" Height="64" Offset="0x5AAE0"/>
+        <Texture Name="gEffBubble1Tex" OutName="eff_bubble_1" Format="i8" Width="16" Height="16" Offset="0x5B2E0"/>
+        <Texture Name="gEffBubble2Tex" OutName="eff_bubble_2" Format="i8" Width="16" Height="16" Offset="0x5B3E0"/>
+        <Texture Name="gEffSpark1Tex" OutName="eff_spark_1" Format="i4" Width="32" Height="32" Offset="0x5B4E0"/>
+        <Texture Name="gEffSpark2Tex" OutName="eff_spark_2" Format="i4" Width="32" Height="32" Offset="0x5B6E0"/>
+        <Texture Name="gEffSpark3Tex" OutName="eff_spark_3" Format="i4" Width="32" Height="32" Offset="0x5B8E0"/>
+        <Texture Name="gEffSpark4Tex" OutName="eff_spark_4" Format="i4" Width="32" Height="32" Offset="0x5BAE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_Bb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_Bb.xml
new file mode 100644
index 0000000000..5d04bde451
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_Bb.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_Bb" Segment="6">
+        <Animation Name="object_Bb_Anim_000184" Offset="0x184"/>
+        <Animation Name="object_Bb_Anim_0002AC" Offset="0x2AC"/>
+        <Animation Name="object_Bb_Anim_000444" Offset="0x444"/>
+        <DList Name="object_Bb_DL_000C20" Offset="0xC20"/>
+        <DList Name="object_Bb_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_Bb_DL_000D40" Offset="0xD40"/>
+        <DList Name="object_Bb_DL_000E08" Offset="0xE08"/>
+        <DList Name="object_Bb_DL_001100" Offset="0x1100"/>
+        <DList Name="object_Bb_DL_001190" Offset="0x1190"/>
+        <Texture Name="object_Bb_Tex_001220" OutName="tex_00001220" Format="rgba16" Width="16" Height="16" Offset="0x1220"/>
+        <Texture Name="object_Bb_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="8" Height="8" Offset="0x1420"/>
+        <Texture Name="object_Bb_Tex_0014A0" OutName="tex_000014A0" Format="rgba16" Width="4" Height="4" Offset="0x14A0"/>
+        <Texture Name="object_Bb_Tex_0014C0" OutName="tex_000014C0" Format="rgba16" Width="8" Height="8" Offset="0x14C0"/>
+        <Texture Name="object_Bb_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+        <Texture Name="object_Bb_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="object_Bb_Tex_001640" OutName="tex_00001640" Format="rgba16" Width="16" Height="8" Offset="0x1640"/>
+        <Texture Name="object_Bb_Tex_001740" OutName="tex_00001740" Format="rgba16" Width="16" Height="16" Offset="0x1740"/>
+        <Limb Name="object_Bb_Limb_001940" LimbType="Standard" Offset="0x1940"/>
+        <Limb Name="object_Bb_Limb_00194C" LimbType="Standard" Offset="0x194C"/>
+        <Limb Name="object_Bb_Limb_001958" LimbType="Standard" Offset="0x1958"/>
+        <Limb Name="object_Bb_Limb_001964" LimbType="Standard" Offset="0x1964"/>
+        <Limb Name="object_Bb_Limb_001970" LimbType="Standard" Offset="0x1970"/>
+        <Limb Name="object_Bb_Limb_00197C" LimbType="Standard" Offset="0x197C"/>
+        <Limb Name="object_Bb_Limb_001988" LimbType="Standard" Offset="0x1988"/>
+        <Limb Name="object_Bb_Limb_001994" LimbType="Standard" Offset="0x1994"/>
+        <Limb Name="object_Bb_Limb_0019A0" LimbType="Standard" Offset="0x19A0"/>
+        <Limb Name="object_Bb_Limb_0019AC" LimbType="Standard" Offset="0x19AC"/>
+        <Limb Name="object_Bb_Limb_0019B8" LimbType="Standard" Offset="0x19B8"/>
+        <Limb Name="object_Bb_Limb_0019C4" LimbType="Standard" Offset="0x19C4"/>
+        <Limb Name="object_Bb_Limb_0019D0" LimbType="Standard" Offset="0x19D0"/>
+        <Limb Name="object_Bb_Limb_0019DC" LimbType="Standard" Offset="0x19DC"/>
+        <Limb Name="object_Bb_Limb_0019E8" LimbType="Standard" Offset="0x19E8"/>
+        <Skeleton Name="object_Bb_Skel_001A30" Type="Normal" LimbType="Standard" Offset="0x1A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ahg.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ahg.xml
new file mode 100644
index 0000000000..4d37b1b110
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ahg.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ahg" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" TlutOffset="0xFC"/>
+
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
+
+        <Texture Name="object_ahg_TLUT_0047C8" OutName="tlut_000047C8" Format="rgba16" Width="16" Height="12" Offset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" TlutOffset="0x47C8"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" TlutOffset="0x47C8"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_am.xml b/soh/assets/xml/N64_NTSC_12/objects/object_am.xml
new file mode 100644
index 0000000000..b70c70d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_am.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="object_am" Segment="6">
+        <Texture Name="object_amTex_002638" OutName="object_amTex_002638" Format="i4" Width="32" Height="32" Offset="0x2638" AddedByScript="true"/>
+        <Texture Name="object_amTex_002838" OutName="object_amTex_002838" Format="i4" Width="16" Height="32" Offset="0x2838" AddedByScript="true"/>
+        <Texture Name="object_amTex_002938" OutName="object_amTex_002938" Format="rgba16" Width="16" Height="32" Offset="0x2938" AddedByScript="true"/>
+        <Texture Name="object_amTex_002D38" OutName="object_amTex_002D38" Format="i4" Width="16" Height="32" Offset="0x2D38" AddedByScript="true"/>
+        <Texture Name="object_amTex_002E38" OutName="object_amTex_002E38" Format="i4" Width="32" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003038" OutName="object_amTex_003038" Format="i4" Width="32" Height="32" Offset="0x3038" AddedByScript="true"/>
+        <Texture Name="object_amTex_003238" OutName="object_amTex_003238" Format="rgba16" Width="32" Height="32" Offset="0x3238" AddedByScript="true"/>
+        <Texture Name="object_amTex_003A38" OutName="object_amTex_003A38" Format="rgba16" Width="16" Height="16" Offset="0x3A38" AddedByScript="true"/>
+        <Texture Name="object_amTex_003C38" OutName="object_amTex_003C38" Format="rgba16" Width="32" Height="32" Offset="0x3C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_004438" OutName="object_amTex_004438" Format="rgba16" Width="32" Height="32" Offset="0x4438" AddedByScript="true"/>
+        <Texture Name="object_amTex_004C38" OutName="object_amTex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" AddedByScript="true"/>
+        <Texture Name="object_amTex_005438" OutName="object_amTex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" AddedByScript="true"/>
+        <Texture Name="object_amTex_005478" OutName="object_amTex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" AddedByScript="true"/>
+        <Skeleton Name="gArmosSkel" Type="Normal" LimbType="Standard" Offset="0x5948"/>
+        <Animation Name="gArmosRicochetAnim" Offset="0x33C"/>
+        <Animation Name="gArmosHopAnim" Offset="0x238"/>
+        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
+        <Collision Name="gArmosCol" Offset="0x118"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ane.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ane.xml
new file mode 100644
index 0000000000..1e29b351e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ane.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_ane" Segment="6">
+        <!-- Cucco Lady Skeleton -->
+        <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Cucco Lady Skeleton Limbs -->
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        <!-- Cucco Lady Limb DisplayLists -->
+        <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
+        <DList Name="gCuccoLadyDL_6D20" Offset="0x6D20"/>
+        <DList Name="gCuccoLadyDL_6C38" Offset="0x6C38"/>
+        <DList Name="gCuccoLadyShoe1DL" Offset="0x69B0"/>
+        <DList Name="gCuccoLadyDL_68E0" Offset="0x68E0"/>
+        <DList Name="gCuccoLadyDL_67F8" Offset="0x67F8"/>
+        <DList Name="gCuccoLadyShoe2DL" Offset="0x6570"/>
+        <DList Name="gCuccoLadyTorsoDL" Offset="0x6280"/>
+        <DList Name="gCuccoLadyDL_6148" Offset="0x6148"/>
+        <DList Name="gCuccoLadyDL_6018" Offset="0x6018"/>
+        <DList Name="gCuccoLadyDL_5E28" Offset="0x5E28"/>
+        <DList Name="gCuccoLadyDL_5CF0" Offset="0x5CF0"/>
+        <DList Name="gCuccoLadyDL_5BC0" Offset="0x5BC0"/>
+        <DList Name="gCuccoLadyDL_59D0" Offset="0x59D0"/>
+        <DList Name="gCuccoLadyHeadDL" Offset="0x54D8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gCuccoLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gCuccoLadyHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyTex_0388" OutName="tex_0388" Format="ci8" Width="8" Height="8" Offset="0x0388" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x03C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x04C8"/>
+        <Texture Name="gCuccoLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x21C8" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyShirtButtonTex" OutName="shirt_button" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadyWaistTex" OutName="waist" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x0108"/>
+        <Texture Name="gCuccoLadySkirtTex" OutName="skirt" Format="ci8" Width="32" Height="32" Offset="0x2388" TlutOffset="0x0108"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gCuccoLadyEyeOpenTex" OutName="cucco_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x8C8"/>
+        <Texture Name="gCuccoLadyEyeHalfTex" OutName="cucco_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x10C8"/>
+        <Texture Name="gCuccoLadyEyeClosedTex" OutName="cucco_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ani.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ani.xml
new file mode 100644
index 0000000000..c70621c6f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ani.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ani" Segment="6">
+        <Texture Name="object_aniTex_0011D8" OutName="object_aniTex_0011D8" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088" AddedByScript="true"/>
+        <!-- Kakariko Roof Man Skeleton -->
+        <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Kakariko Roof Man Limbs -->
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <!-- Kakariko Roof Man Limb DisplayLists -->
+        <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
+        <DList Name="gRoofManLeftThighDL" Offset="0x60A0"/>
+        <DList Name="gRoofManLeftLegDL" Offset="0x5D58"/>
+        <DList Name="gRoofManLeftFootDL" Offset="0x5B80"/>
+        <DList Name="gRoofManRightThighDL" Offset="0x5A58"/>
+        <DList Name="gRoofManRightLegDL" Offset="0x57F0"/>
+        <DList Name="gRoofManRightFootDL" Offset="0x5610"/>
+        <DList Name="gRoofManTorsoDL" Offset="0x5318"/>
+        <DList Name="gRoofManLeftUpperArmDL" Offset="0x51C8"/>
+        <DList Name="gRoofManLeftForearmDL" Offset="0x5058"/>
+        <DList Name="gRoofManLeftHandDL" Offset="0x4EC0"/>
+        <DList Name="gRoofManRightUpperArmDL" Offset="0x4D70"/>
+        <DList Name="gRoofManRightForearmDL" Offset="0x4C00"/>
+        <DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
+        <DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
+
+        <!-- Kakariko Roof Man Palettes -->
+        <Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
+        <Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
+
+        <!-- Roof Man DisplayList Textures -->
+        <Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManForearmGradientTex" OutName="roof_man_forearm_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D08" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
+        <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
+        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
+
+
+        <!-- Kakariko Roof Man Eye Textures -->
+        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
+        <Texture Name="gRoofManEyeHalfTex" OutName="roof_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1518"/>
+        <Texture Name="gRoofManEyeClosedTex" OutName="roof_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1D18"/>
+
+        <!-- Kakariko Roof Man Animations -->
+        <Animation Name="gRoofManKnockbackAnim" Offset="0x67B8"/>
+        <Animation Name="gRoofManGettingUpAfterKnockbackAnim" Offset="0x70F0"/>
+        <Animation Name="gRoofManIdleAnim" Offset="0x76EC"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_anubice.xml b/soh/assets/xml/N64_NTSC_12/objects/object_anubice.xml
new file mode 100644
index 0000000000..fb029586ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_anubice.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_anubice" Segment="6">
+        <Texture Name="object_anubiceTex_000F90" OutName="object_anubiceTex_000F90" Format="rgba16" Width="8" Height="16" Offset="0xF90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001090" OutName="object_anubiceTex_001090" Format="rgba16" Width="4" Height="16" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001110" OutName="object_anubiceTex_001110" Format="rgba16" Width="16" Height="32" Offset="0x1110" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001510" OutName="object_anubiceTex_001510" Format="rgba16" Width="8" Height="8" Offset="0x1510" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001590" OutName="object_anubiceTex_001590" Format="rgba16" Width="8" Height="8" Offset="0x1590" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001610" OutName="object_anubiceTex_001610" Format="rgba16" Width="4" Height="16" Offset="0x1610" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001690" OutName="object_anubiceTex_001690" Format="ia16" Width="32" Height="16" Offset="0x1690" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_001A90" OutName="object_anubiceTex_001A90" Format="rgba16" Width="8" Height="8" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="object_anubiceTex_0036A0" OutName="object_anubiceTex_0036A0" Format="i4" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Skeleton Name="gAnubiceSkel" Type="Normal" LimbType="Standard" Offset="0x3990"/>
+
+        <Animation Name="gAnubiceFallDownAnim" Offset="0x348"/>
+        <Animation Name="gAnubiceAttackingAnim" Offset="0x78C"/>
+        <Animation Name="gAnubiceIdleAnim" Offset="0xF74"/>
+        <DList Name="gAnubiceEyesDL" Offset="0x3468"/>
+        <DList Name="gAnubiceFireAttackDL" Offset="0x3510"/>
+
+        <!-- The following are unused -->
+        <Animation Name="gAnubiceLaughingAnim" Offset="0x144"/>
+        <Animation Name="gAnubiceStandUpAnim" Offset="0x930"/>
+        <DList Name="gAnubiceUnusedParticleMaterialDL" Offset="0x3610"/>
+        <DList Name="gAnubiceUnusedParticleModelDL" Offset="0x3688"/>
+        <!-- I think those might be for taking damage or something -->
+        <Animation Name="gAnubiceAnim_000A48" Offset="0xA48"/>
+        <Animation Name="gAnubiceAnim_000BAC" Offset="0xBAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_aob.xml b/soh/assets/xml/N64_NTSC_12/objects/object_aob.xml
new file mode 100644
index 0000000000..e6202d0cf9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_aob.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_aob" Segment="6">
+        <!-- Dog Lady Skeleton -->
+        <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- Dog Lady Limbs -->
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
+
+        
+        <!-- Dog Lady Limb DisplayLists -->
+        <DList Name="gDogLadyDressDL" Offset="0x5588"/>
+        <DList Name="gDogLadyDL_54B8" Offset="0x54B8"/>
+        <DList Name="gDogLadyDL_53E8" Offset="0x53E8"/>
+        <DList Name="gDogLadyDL_5318" Offset="0x5318"/>
+        <DList Name="gDogLadyDL_5248" Offset="0x5248"/>
+        <DList Name="gDogLadyDL_5178" Offset="0x5178"/>
+        <DList Name="gDogLadyDL_50A8" Offset="0x50A8"/>
+        <DList Name="gDogLadyTorsoDL" Offset="0x4E08"/>
+        <DList Name="gDogLadyDL_4C60" Offset="0x4C60"/>
+        <DList Name="gDogLadyDL_4B30" Offset="0x4B30"/>
+        <DList Name="gDogLadyDL_4928" Offset="0x4928"/>
+        <DList Name="gDogLadyDL_4780" Offset="0x4780"/>
+        <DList Name="gDogLadyDL_4650" Offset="0x4650"/>
+        <DList Name="gDogLadyDL_4448" Offset="0x4448"/>
+        <DList Name="gDogLadyHeadDL" Offset="0x3C88"/>
+
+        <!-- Palettes -->
+        <Texture Name="gDogLadyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0108"/>
+
+        <!-- Textures -->
+        <Texture Name="gDogLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x0308" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0408" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x0448" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyLipGradientTex" OutName="lip_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyNostrilTex" OutName="nostril" Format="ci8" Width="8" Height="8" Offset="0x0588" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1DC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressShoulderPatternTex" OutName="dress_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1EC8" TlutOffset="0x0108"/>
+        <Texture Name="gDogLadyDressTex" OutName="dress" Format="ci8" Width="8" Height="8" Offset="0x1F08" TlutOffset="0x0108"/>
+
+        <!-- Dog Lady Eye Textures -->
+        <Texture Name="gDogLadyEyeOpenTex" OutName="dog_lady_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x05C8"/>
+        <Texture Name="gDogLadyEyeHalfTex" OutName="dog_lady_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0DC8"/>
+        <Texture Name="gDogLadyEyeClosedTex" OutName="dog_lady_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x15C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_b_heart.xml b/soh/assets/xml/N64_NTSC_12/objects/object_b_heart.xml
new file mode 100644
index 0000000000..00f7cd6773
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_b_heart.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_b_heart" Segment="6">
+        <DList Name="object_b_heart_DL_000240" Offset="0x240"/>
+        <DList Name="object_b_heart_DL_000348" Offset="0x348"/>
+        <Texture Name="object_b_heart_Tex_0003C0" OutName="tex_000003C0" Format="i4" Width="32" Height="32" Offset="0x3C0"/>
+        <Texture Name="object_b_heart_Tex_0005C0" OutName="tex_000005C0" Format="i4" Width="16" Height="16" Offset="0x5C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bba.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bba.xml
new file mode 100644
index 0000000000..ccc5c21365
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bba.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_bba" Segment="6">
+        <Limb Name="object_bba_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bba_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bba_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bba_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bba_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bba_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bba_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bba_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bba_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bba_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bba_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bba_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bba_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bba_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
+        <Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
+        <Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
+        <DList Name="object_bba_DL_002948" Offset="0x2948"/>
+        <DList Name="object_bba_DL_003298" Offset="0x3298"/>
+        <DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>
+        <DList Name="object_bba_DL_0034C8" Offset="0x34C8"/>
+        <DList Name="object_bba_DL_0035F0" Offset="0x35F0"/>
+        <DList Name="object_bba_DL_003700" Offset="0x3700"/>
+        <DList Name="object_bba_DL_003820" Offset="0x3820"/>
+        <DList Name="object_bba_DL_003948" Offset="0x3948"/>
+        <DList Name="object_bba_DL_003C80" Offset="0x3C80"/>
+        <DList Name="object_bba_DL_003D50" Offset="0x3D50"/>
+        <DList Name="object_bba_DL_003E20" Offset="0x3E20"/>
+        <DList Name="object_bba_DL_003EF0" Offset="0x3EF0"/>
+        <DList Name="object_bba_DL_003FC0" Offset="0x3FC0"/>
+        <DList Name="object_bba_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bba_DL_004160" Offset="0x4160"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bdan_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bdan_objects.xml
new file mode 100644
index 0000000000..dcd56d3856
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bdan_objects.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_bdan_objects" Segment="6">
+        <!-- Textures -->
+        <Texture Name="gJabuObjectsTex_00140" OutName="jabu_objects_tex_00000140" Format="ci8" Width="32" Height="32" Offset="0x0140" TlutOffset="0x0000"/>
+        <Texture Name="gJabuObjectsTex_007A0" OutName="jabu_objects_tex_000007A0" Format="ci8" Width="32" Height="32" Offset="0x07A0" TlutOffset="0x0660"/>
+        <Texture Name="gJabuObjectsTex_00E00" OutName="jabu_objects_tex_00000E00" Format="ci8" Width="32" Height="32" Offset="0x0E00" TlutOffset="0x0CC0"/>
+        <Texture Name="gJabuObjectsTex_01460" OutName="jabu_objects_tex_00001460" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x1320"/>
+        <Texture Name="gJabuObjectsTex_01AC0" OutName="jabu_objects_tex_00001AC0" Format="ci8" Width="32" Height="32" Offset="0x1AC0" TlutOffset="0x1980"/>
+        <Texture Name="gJabuObjectsTex_02120" OutName="jabu_objects_tex_00002120" Format="ci8" Width="32" Height="32" Offset="0x2120" TlutOffset="0x1FE0"/>
+        <Texture Name="gJabuObjectsTex_02780" OutName="jabu_objects_tex_00002780" Format="ci8" Width="32" Height="32" Offset="0x2780" TlutOffset="0x2640"/>
+        <Texture Name="gJabuObjectsTex_02DE0" OutName="jabu_objects_tex_00002DE0" Format="ci8" Width="32" Height="32" Offset="0x2DE0" TlutOffset="0x2CA0"/>
+        <Texture Name="gJabuObjectsTex_03498" OutName="jabu_objects_tex_00003498" Format="ci8" Width="32" Height="32" Offset="0x3498" TlutOffset="0x3300"/>
+        <Texture Name="gJabuObjectsTex_03BB8" OutName="jabu_objects_tex_00003BB8" Format="ci8" Width="32" Height="64" Offset="0x3BB8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_043B8" OutName="jabu_objects_tex_000043B8" Format="ci8" Width="32" Height="32" Offset="0x43B8" TlutOffset="0x39B0"/>
+        <Texture Name="gJabuObjectsTex_06748" OutName="jabu_objects_tex_00006748" Format="ci8" Width="32" Height="32" Offset="0x6748" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_06B48" OutName="jabu_objects_tex_00006B48" Format="ci8" Width="32" Height="64" Offset="0x6B48" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_07348" OutName="jabu_objects_tex_00007348" Format="ci8" Width="32" Height="64" Offset="0x7348" TlutOffset="0x6540"/>
+        <Texture Name="gJabuObjectsTex_08D10" OutName="jabu_objects_tex_00008D10" Format="rgba16" Width="32" Height="64" Offset="0x8D10"/>
+        <Texture Name="gJabuObjectsTex_09D10" OutName="jabu_objects_tex_00009D10" Format="rgba16" Width="32" Height="32" Offset="0x9D10"/>
+        <Texture Name="gJabuObjectsTex_0A510" OutName="jabu_objects_tex_0000A510" Format="rgba16" Width="32" Height="64" Offset="0xA510"/>
+        <Texture Name="gJabuObjectsTex_0B510" OutName="jabu_objects_tex_0000B510" Format="rgba16" Width="32" Height="32" Offset="0xB510"/>
+        <Texture Name="gJabuObjectsTex_0BD10" OutName="jabu_objects_tex_0000BD10" Format="rgba16" Width="32" Height="32" Offset="0xBD10"/>
+        <Texture Name="gJabuObjectsTex_0C510" OutName="jabu_objects_tex_0000C510" Format="rgba16" Width="32" Height="32" Offset="0xC510"/>
+
+        <!-- Palettes -->
+        <Texture Name="gJabuObjects1TLUT" OutName="jabu_objects_1_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0000"/>
+        <Texture Name="gJabuObjects2TLUT" OutName="jabu_objects_2_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0660"/>
+        <Texture Name="gJabuObjects3TLUT" OutName="jabu_objects_3_tlut" Format="rgba16" Width="160" Height="1" Offset="0x0CC0"/>
+        <Texture Name="gJabuObjects4TLUT" OutName="jabu_objects_4_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1320"/>
+        <Texture Name="gJabuObjects5TLUT" OutName="jabu_objects_5_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1980"/>
+        <Texture Name="gJabuObjects6TLUT" OutName="jabu_objects_6_tlut" Format="rgba16" Width="160" Height="1" Offset="0x1FE0"/>
+        <Texture Name="gJabuObjects7TLUT" OutName="jabu_objects_7_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2640"/>
+        <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
+        <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
+        <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+
+        <!-- DLists -->
+        <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
+        <DList Name="gJabuDoorSection2DL" Offset="0x0BF0"/>
+        <DList Name="gJabuDoorSection3DL" Offset="0x1250"/>
+        <DList Name="gJabuDoorSection4DL" Offset="0x18B0"/>
+        <DList Name="gJabuDoorSection5DL" Offset="0x1F10"/>
+        <DList Name="gJabuDoorSection6DL" Offset="0x2570"/>
+        <DList Name="gJabuDoorSection7DL" Offset="0x2BD0"/>
+        <DList Name="gJabuDoorSection8DL" Offset="0x3230"/>
+        <DList Name="gJabuWaterDL" Offset="0x38E8"/>
+        <DList Name="gJabuElevatorPlatformDL" Offset="0x4BE8"/>
+        <DList Name="gJabuFallingPlatformDL" Offset="0x5200"/>
+        <DList Name="gJabuBlueFloorSwitchDL" Offset="0x5A20"/>
+        <DList Name="gJabuYellowFloorSwitchDL" Offset="0x61A0"/>
+        <DList Name="gJabuWebDoorDL" Offset="0x6460"/>
+        <DList Name="gJabuObjectsLargeRotatingSpikePlatformDL" Offset="0x8618"/>
+
+        <!-- Collision -->
+        <Collision Name="gJabuElevatorCol" Offset="0x5048"/>
+        <Collision Name="gJabuLoweringPlatformCol" Offset="0x5580"/>
+        <Collision Name="gJabuFloorSwitchCol" Offset="0x5CF8"/>
+        <Collision Name="gJabuBigOctoPlatformCol" Offset="0x8CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bdoor.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bdoor.xml
new file mode 100644
index 0000000000..a092f0c23b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bdoor.xml
@@ -0,0 +1,15 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_bdoor" Segment="6">
+        <Texture Name="gBossDoorGanonsCastleTex" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gBossDoorDL" Offset="0x10C0"/>
+        <DList Name="gBossDoorLockDL" Offset="0x1400"/>
+        <DList Name="gBossDoorChainDL" Offset="0x1530"/>
+        <Texture Name="gBossDoorSpiritTex" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="gBossDoorForestTex" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="gBossDoorFireTex" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="gBossDoorShadowTex" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="gBossDoorWaterTex" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="gBossDoorDefaultTex" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bg.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bg.xml
new file mode 100644
index 0000000000..791226b71d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bg.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_bg" Segment="6">
+
+        <!-- Bombchu Bowling Girl skeleton -->
+        <Skeleton Name="gChuGirlSkel" Type="Flex" LimbType="Standard" Offset="0x6EB0"/>
+
+        <!-- Bombchu Bowling Girl animations -->
+        <Animation Name="gChuGirlWakeUpAnim" Offset="0x80"/>
+        <Animation Name="gChuGirlNoddingOffAnim" Offset="0x710"/>
+        <Animation Name="gChuGirlLeanOverCounterAnim" Offset="0x72AC"/>
+
+        <!-- Bombchu Bowling Girl limb displaylists -->
+        <DList Name="gChuGirlWaistDL" Offset="0x4038"/>
+        <DList Name="gChuGirlTorsoDL" Offset="0x3DB0"/>
+        <DList Name="gChuGirlNeckDL" Offset="0x33C8"/>
+        <DList Name="gChuGirlHeadDL" Offset="0x2EE0"/>
+        <DList Name="gChuGirlLeftUpperArmDL" Offset="0x3780"/>
+        <DList Name="gChuGirlLeftForearmDL" Offset="0x3670"/>
+        <DList Name="gChuGirlLeftHandDL" Offset="0x3520"/>
+        <DList Name="gChuGirlRightUpperArmDL" Offset="0x3BC8"/>
+        <DList Name="gChuGirlRightForearmDL" Offset="0x3AB8"/>
+        <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
+
+        <!-- Bombchu Bowling Girl limbs -->
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
+
+        <!-- Bombchu Bowling Girl limb textures -->
+        <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>
+        <Texture Name="gChuGirlSkinGradientTex" OutName="chu_girl_skin_gradient" Format="rgba16" Width="16" Height="16" Offset="0x6110"/>
+        <Texture Name="gChuGirlSweaterTex" OutName="chu_girl_sweater" Format="rgba16" Width="32" Height="32" Offset="0x6510"/>
+        <Texture Name="gChuGirlUmbEarLicusTex" OutName="chu_girl_umb_ear_licus" Format="rgba16" Width="16" Height="16" Offset="0x6310"/>
+        <Texture Name="gChuGirlHairTex" OutName="chu_girl_hair" Format="rgba16" Width="8" Height="16" Offset="0x6D10"/>
+
+        <!-- Bombchu Bowling Girl eye textures -->
+        <Texture Name="gChuGirlEyeOpenTex" OutName="chu_girl_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4110"/>
+        <Texture Name="gChuGirlEyeHalfTex" OutName="chu_girl_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4910"/>
+        <Texture Name="gChuGirlEyeClosedTex" OutName="chu_girl_eye_closed" Format="rgba16" Width="32" Height="32"  Offset="0x5110"/>
+
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bigokuta.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bigokuta.xml
new file mode 100644
index 0000000000..1c7d39e319
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bigokuta.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_bigokuta" Segment="6">
+        <Animation Name="object_bigokuta_Anim_000444" Offset="0x444"/>
+        <Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74"/>
+        <Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C"/>
+        <Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8"/>
+        <Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4"/>
+        <DList Name="object_bigokuta_DL_004090" Offset="0x4090"/>
+        <DList Name="object_bigokuta_DL_004158" Offset="0x4158"/>
+        <DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8"/>
+        <DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0"/>
+        <DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8"/>
+        <DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0"/>
+        <DList Name="object_bigokuta_DL_004E10" Offset="0x4E10"/>
+        <DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8"/>
+        <DList Name="object_bigokuta_DL_004F90" Offset="0x4F90"/>
+        <DList Name="object_bigokuta_DL_005038" Offset="0x5038"/>
+        <DList Name="object_bigokuta_DL_005110" Offset="0x5110"/>
+        <DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0"/>
+        <DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0"/>
+        <DList Name="object_bigokuta_DL_005470" Offset="0x5470"/>
+        <DList Name="object_bigokuta_DL_005650" Offset="0x5650"/>
+        <DList Name="object_bigokuta_DL_005710" Offset="0x5710"/>
+        <DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0"/>
+        <DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0"/>
+        <Texture Name="object_bigokuta_Tex_005B90" OutName="tex_00005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90"/>
+        <Texture Name="object_bigokuta_Tex_005D90" OutName="tex_00005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90"/>
+        <Texture Name="object_bigokuta_Tex_005E90" OutName="tex_00005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90"/>
+        <Texture Name="object_bigokuta_Tex_006090" OutName="tex_00006090" Format="rgba16" Width="16" Height="16" Offset="0x6090"/>
+        <Texture Name="object_bigokuta_Tex_006290" OutName="tex_00006290" Format="rgba16" Width="8" Height="8" Offset="0x6290"/>
+        <Texture Name="object_bigokuta_Tex_006310" OutName="tex_00006310" Format="rgba16" Width="8" Height="8" Offset="0x6310"/>
+        <Texture Name="object_bigokuta_Tex_006390" OutName="tex_00006390" Format="rgba16" Width="16" Height="16" Offset="0x6390"/>
+        <Texture Name="object_bigokuta_Tex_006590" OutName="tex_00006590" Format="rgba16" Width="16" Height="16" Offset="0x6590"/>
+        <Texture Name="object_bigokuta_Tex_006790" OutName="tex_00006790" Format="rgba16" Width="8" Height="16" Offset="0x6790"/>
+        <Texture Name="object_bigokuta_Tex_006890" OutName="tex_00006890" Format="rgba16" Width="16" Height="16" Offset="0x6890"/>
+        <Limb Name="object_bigokuta_Limb_006A90" LimbType="Standard" Offset="0x6A90"/>
+        <Limb Name="object_bigokuta_Limb_006A9C" LimbType="Standard" Offset="0x6A9C"/>
+        <Limb Name="object_bigokuta_Limb_006AA8" LimbType="Standard" Offset="0x6AA8"/>
+        <Limb Name="object_bigokuta_Limb_006AB4" LimbType="Standard" Offset="0x6AB4"/>
+        <Limb Name="object_bigokuta_Limb_006AC0" LimbType="Standard" Offset="0x6AC0"/>
+        <Limb Name="object_bigokuta_Limb_006ACC" LimbType="Standard" Offset="0x6ACC"/>
+        <Limb Name="object_bigokuta_Limb_006AD8" LimbType="Standard" Offset="0x6AD8"/>
+        <Limb Name="object_bigokuta_Limb_006AE4" LimbType="Standard" Offset="0x6AE4"/>
+        <Limb Name="object_bigokuta_Limb_006AF0" LimbType="Standard" Offset="0x6AF0"/>
+        <Limb Name="object_bigokuta_Limb_006AFC" LimbType="Standard" Offset="0x6AFC"/>
+        <Limb Name="object_bigokuta_Limb_006B08" LimbType="Standard" Offset="0x6B08"/>
+        <Limb Name="object_bigokuta_Limb_006B14" LimbType="Standard" Offset="0x6B14"/>
+        <Limb Name="object_bigokuta_Limb_006B20" LimbType="Standard" Offset="0x6B20"/>
+        <Limb Name="object_bigokuta_Limb_006B2C" LimbType="Standard" Offset="0x6B2C"/>
+        <Limb Name="object_bigokuta_Limb_006B38" LimbType="Standard" Offset="0x6B38"/>
+        <Limb Name="object_bigokuta_Limb_006B44" LimbType="Standard" Offset="0x6B44"/>
+        <Limb Name="object_bigokuta_Limb_006B50" LimbType="Standard" Offset="0x6B50"/>
+        <Limb Name="object_bigokuta_Limb_006B5C" LimbType="Standard" Offset="0x6B5C"/>
+        <Limb Name="object_bigokuta_Limb_006B68" LimbType="Standard" Offset="0x6B68"/>
+        <Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bird.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bird.xml
new file mode 100644
index 0000000000..167a5022dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bird.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_bird" Segment="6">
+        <Animation Name="gBirdFlyAnim" Offset="0x6C"/>
+        <DList Name="gBirdLeftWingDL" Offset="0x80"/>
+        <DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
+        <DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
+
+        <DList Name="gBirdRightWingDL" Offset="0x180"/>
+        <DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
+        <DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
+        
+        <DList Name="gBirdBodyDL" Offset="0x280"/>
+        <DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
+        <DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
+
+        <Texture Name="gBirdFaceTex" OutName="face" Format="rgba16" Width="32" Height="32" Offset="0x500"/>
+        <Texture Name="gBirdTailTex" OutName="tail" Format="rgba16" Width="16" Height="32" Offset="0xD00"/>
+        <Texture Name="gBirdWingTex" OutName="wing" Format="rgba16" Width="64" Height="32" Offset="0x1100"/>
+        <Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
+        <Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
+        <Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
+        <Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
+        <Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
+        <Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
+        <Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
+        <Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
+        <Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
+        <Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bji.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bji.xml
new file mode 100644
index 0000000000..c665b6b001
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bji.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_bji" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
+
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
+
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bl.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bl.xml
new file mode 100644
index 0000000000..1c2ef4ec63
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bl.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_bl" Segment="6">
+        <!-- Biri Animations -->
+        <Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
+        <Animation Name="gBiriClimbAnim" Offset="0x64"/>
+        <Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
+
+        <!-- Biri DLists -->
+        <DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
+        <DList Name="gBiriInnerHoodDL" Offset="0x448"/>
+        <DList Name="gBiriOuterHoodDL" Offset="0x530"/>
+
+        <!-- Biri Textures -->
+        <Texture Name="gBiriOuterHoodTex" OutName="biri_outer_hood" Format="ia16" Width="16" Height="64" Offset="0x608"/>
+        <Texture Name="gBiriTentacles0Tex" OutName="biri_tentacles_0" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
+        <Texture Name="gBiriTentacles1Tex" OutName="biri_tentacles_1" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
+        <Texture Name="gBiriTentacles2Tex" OutName="biri_tentacles_2" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
+        <Texture Name="gBiriTentacles3Tex" OutName="biri_tentacles_3" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
+        <Texture Name="gBiriTentacles4Tex" OutName="biri_tentacles_4" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
+        <Texture Name="gBiriTentacles5Tex" OutName="biri_tentacles_5" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
+        <Texture Name="gBiriTentacles6Tex" OutName="biri_tentacles_6" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
+        <Texture Name="gBiriTentacles7Tex" OutName="biri_tentacles_7" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
+        <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
+
+        <!-- Biri Limbs and Skeleton -->
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
+        <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_blkobj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_blkobj.xml
new file mode 100644
index 0000000000..345a8ebd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_blkobj.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="object_blkobj" Segment="6">
+        <Texture Name="object_blkobjTex_008090" OutName="object_blkobjTex_008090" Format="rgba16" Width="32" Height="32" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_008890" OutName="object_blkobjTex_008890" Format="rgba16" Width="32" Height="32" Offset="0x8890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009090" OutName="object_blkobjTex_009090" Format="rgba16" Width="32" Height="32" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_009890" OutName="object_blkobjTex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A090" OutName="object_blkobjTex_00A090" Format="ia16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00A890" OutName="object_blkobjTex_00A890" Format="rgba16" Width="32" Height="32" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B090" OutName="object_blkobjTex_00B090" Format="rgba16" Width="32" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00B890" OutName="object_blkobjTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C090" OutName="object_blkobjTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00C890" OutName="object_blkobjTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D090" OutName="object_blkobjTex_00D090" Format="rgba16" Width="32" Height="32" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00D890" OutName="object_blkobjTex_00D890" Format="rgba16" Width="32" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E090" OutName="object_blkobjTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00E890" OutName="object_blkobjTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_00F890" OutName="object_blkobjTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010090" OutName="object_blkobjTex_010090" Format="rgba16" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_010890" OutName="object_blkobjTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011090" OutName="object_blkobjTex_011090" Format="rgba16" Width="32" Height="32" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_011890" OutName="object_blkobjTex_011890" Format="rgba16" Width="32" Height="32" Offset="0x11890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012090" OutName="object_blkobjTex_012090" Format="rgba16" Width="32" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_012890" OutName="object_blkobjTex_012890" Format="rgba16" Width="32" Height="32" Offset="0x12890" AddedByScript="true"/>
+        <Texture Name="object_blkobjTex_013090" OutName="object_blkobjTex_013090" Format="rgba16" Width="32" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <!-- Illusion Room Collision -->
+        <Collision Name="gIllusionRoomCol" Offset="0x7564"/>
+
+        <!-- Illusion Room DLists -->
+        <DList Name="gIllusionRoomNormalDL" Offset="0x14E0"/>
+        <DList Name="gIllusionRoomIllusionDL" Offset="0x53D0"/>
+        
+        <!-- Unused Content -->
+
+        <!-- Illusion room DLists -->
+        <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bob.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bob.xml
new file mode 100644
index 0000000000..289e994e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bob.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_bob" Segment="6">
+        <Limb Name="object_bob_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bob_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bob_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bob_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bob_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bob_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bob_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bob_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bob_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bob_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bob_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bob_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bob_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bob_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+        <Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
+        <Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
+        <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
+        <Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
+        <DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>
+        <DList Name="object_bob_DL_0041E0" Offset="0x41E0"/>
+        <DList Name="object_bob_DL_004310" Offset="0x4310"/>
+        <DList Name="object_bob_DL_004458" Offset="0x4458"/>
+        <DList Name="object_bob_DL_004588" Offset="0x4588"/>
+        <DList Name="object_bob_DL_0046B8" Offset="0x46B8"/>
+        <DList Name="object_bob_DL_004A48" Offset="0x4A48"/>
+        <DList Name="object_bob_DL_004B18" Offset="0x4B18"/>
+        <DList Name="object_bob_DL_004BE8" Offset="0x4BE8"/>
+        <DList Name="object_bob_DL_004C38" Offset="0x4C38"/>
+        <DList Name="object_bob_DL_004D08" Offset="0x4D08"/>
+        <DList Name="object_bob_DL_004DD8" Offset="0x4DD8"/>
+        <DList Name="object_bob_DL_004E28" Offset="0x4E28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_boj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_boj.xml
new file mode 100644
index 0000000000..4be4764ab5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_boj.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_boj" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
+
+        <Texture Name="object_boj_TLUT_003B98" OutName="tlut_00003B98" Format="rgba16" Width="63" Height="4" Offset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" TlutOffset="0x3B98"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3B98"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bombf.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bombf.xml
new file mode 100644
index 0000000000..83e60248d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bombf.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_bombf" Segment="6">
+        <!-- Bomb Flower DisplayList Textures -->
+        <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x05D8"/>
+        <Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0x0DD8"/>
+        <Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x011D8"/>
+        <Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x019D8"/>
+
+        <!-- Bomb Flower DisplayLists -->
+        <DList Name="gBombFlowerLeavesDL" Offset="0x340"/>
+        <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/>
+        <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bombiwa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bombiwa.xml
new file mode 100644
index 0000000000..26ab6b4f33
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bombiwa.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bombiwa" Segment="6">
+        <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bowl.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bowl.xml
new file mode 100644
index 0000000000..ffe6d43db7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bowl.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_bowl" Segment="6">
+        <!-- Bombchu Bowling DisplayList Textures -->
+        <Texture Name="gBowlingWoodPanelTex" OutName="bowling_wood_panel" Format="rgba16" Width="64" Height="32" Offset="0x1C70"/>
+        <Texture Name="gBowlingStoneWallTex" OutName="bowling_stone_wall" Format="rgba16" Width="32" Height="32" Offset="0x2C70"/>
+        <Texture Name="gBowlingStripesTex" OutName="bowling_stripes" Format="i4" Width="16" Height="16" Offset="0x3470"/>
+
+        <!-- Bombchu Bowling DisplayLists -->
+        <DList Name="gBowlingRound1WallDL" Offset="0x610"/>
+        <DList Name="gBowlingRound2WallDL" Offset="0x1390"/>
+        <DList Name="gBowlingDL_1B80" Offset="0x1B80"/>
+
+        <!-- Bombchu Bowling Collision -->
+        <Collision Name="gBowlingFirstAndFinalRoundCol" Offset="0xCB8"/>
+        <Collision Name="gBowlingSecondRoundCol" Offset="0x1B00"/>
+        <Collision Name="gBowlingDefaultCol" Offset="0x1C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_box.xml b/soh/assets/xml/N64_NTSC_12/objects/object_box.xml
new file mode 100644
index 0000000000..106d2d3356
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_box.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_box" Segment="6">
+        <Texture Name="object_boxTex_004F80" OutName="object_boxTex_004F80" Format="i8" Width="64" Height="32" Offset="0x4F80" AddedByScript="true"/>
+        <Skeleton Name="gTreasureChestCurveSkel" Type="Curve" LimbType="Curve" Offset="0x5EB8"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4B60" SkelOffset="0x5EB8" Offset="0x4B60"/>
+        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
+        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
+        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+
+        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
+        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
+
+        <DList Name="gTreasureChestBossKeyChestFrontDL" Offset="0xAE8"/>
+        <Texture Name="gTreasureChestBossKeyFrontTex" OutName="boss_key_front_tex" Format="rgba16" Width="32" Height="64" Offset="0x3798"/>
+        
+        <DList Name="gTreasureChestChestSideAndLidDL" Offset="0x10C0"/>
+        <Texture Name="gTreasureChestSideAndTopTex" OutName="side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2798"/>
+
+        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
+        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>
+
+        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
+
+        <!--Large Unaccounted-->
+        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
+        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_brob.xml b/soh/assets/xml/N64_NTSC_12/objects/object_brob.xml
new file mode 100644
index 0000000000..718dcd5617
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_brob.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_brob" Segment="6">
+        <Animation Name="object_brob_Anim_000290" Offset="0x290"/>
+        <DList Name="object_brob_DL_0007E0" Offset="0x7E0"/>
+        <DList Name="object_brob_DL_000898" Offset="0x898"/>
+        <DList Name="object_brob_DL_0009D0" Offset="0x9D0"/>
+        <DList Name="object_brob_DL_000AE8" Offset="0xAE8"/>
+        <DList Name="object_brob_DL_000C00" Offset="0xC00"/>
+        <Texture Name="object_brob_Tex_000D48" OutName="tex_00000D48" Format="rgba16" Width="32" Height="32" Offset="0xD48"/>
+        <Limb Name="object_brob_Limb_001548" LimbType="Standard" Offset="0x1548"/>
+        <Limb Name="object_brob_Limb_001554" LimbType="Standard" Offset="0x1554"/>
+        <Limb Name="object_brob_Limb_001560" LimbType="Standard" Offset="0x1560"/>
+        <Limb Name="object_brob_Limb_00156C" LimbType="Standard" Offset="0x156C"/>
+        <Limb Name="object_brob_Limb_001578" LimbType="Standard" Offset="0x1578"/>
+        <Limb Name="object_brob_Limb_001584" LimbType="Standard" Offset="0x1584"/>
+        <Limb Name="object_brob_Limb_001590" LimbType="Standard" Offset="0x1590"/>
+        <Limb Name="object_brob_Limb_00159C" LimbType="Standard" Offset="0x159C"/>
+        <Limb Name="object_brob_Limb_0015A8" LimbType="Standard" Offset="0x15A8"/>
+        <Skeleton Name="object_brob_Skel_0015D8" Type="Flex" LimbType="Standard" Offset="0x15D8"/>
+        <Animation Name="object_brob_Anim_001678" Offset="0x1678"/>
+        <Animation Name="object_brob_Anim_001750" Offset="0x1750"/>
+        <Animation Name="object_brob_Anim_001958" Offset="0x1958"/>
+        <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bubble.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bubble.xml
new file mode 100644
index 0000000000..f5de186920
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bubble.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_bubble" Segment="6">
+        <Texture Name="gBubbleTex" OutName="bubble" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gBubbleDL" Offset="0x1000"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bv.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bv.xml
new file mode 100644
index 0000000000..d2ebf275ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bv.xml
@@ -0,0 +1,116 @@
+<Root>
+    <File Name="object_bv" Segment="6">
+        <Texture Name="object_bvTex_000040" OutName="object_bvTex_000040" Format="ia16" Width="16" Height="64" Offset="0x40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000840" OutName="object_bvTex_000840" Format="ia16" Width="16" Height="16" Offset="0x840" AddedByScript="true"/>
+        <Texture Name="object_bvTex_000A40" OutName="object_bvTex_000A40" Format="i8" Width="16" Height="32" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0051A0" OutName="object_bvTex_0051A0" Format="rgba16" Width="8" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0052A0" OutName="object_bvTex_0052A0" Format="rgba16" Width="8" Height="16" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0053A0" OutName="object_bvTex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0055A0" OutName="object_bvTex_0055A0" Format="ia16" Width="16" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0059A0" OutName="object_bvTex_0059A0" Format="ia16" Width="16" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_005DA0" OutName="object_bvTex_005DA0" Format="ia16" Width="16" Height="64" Offset="0x49A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0065A0" OutName="object_bvTex_0065A0" Format="i8" Width="16" Height="32" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_008F88" OutName="object_bvTex_008F88" Format="i8" Width="32" Height="32" Offset="0x7B88" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0117B8" OutName="object_bvTex_0117B8" Format="rgba16" Width="16" Height="16" Offset="0x103B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0119B8" OutName="object_bvTex_0119B8" Format="rgba16" Width="16" Height="16" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_011BB8" OutName="object_bvTex_011BB8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_012CE0" OutName="object_bvTex_012CE0" Format="i8" Width="64" Height="32" Offset="0x118E0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_013660" OutName="object_bvTex_013660" Format="ia16" Width="64" Height="64" Offset="0x12260" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0170D8" OutName="object_bvTex_0170D8" Format="rgba16" Width="16" Height="8" Offset="0x15CD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_0171D8" OutName="object_bvTex_0171D8" Format="rgba16" Width="16" Height="16" Offset="0x15DD8" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018770" OutName="object_bvTex_018770" Format="rgba16" Width="8" Height="8" Offset="0x17370" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018D30" OutName="object_bvTex_018D30" Format="rgba16" Width="16" Height="8" Offset="0x17930" AddedByScript="true"/>
+        <Texture Name="object_bvTex_018E30" OutName="object_bvTex_018E30" Format="rgba16" Width="16" Height="16" Offset="0x17A30" AddedByScript="true"/>
+        <Texture Name="object_bvTex_019BB8" OutName="object_bvTex_019BB8" Format="ci8" Width="32" Height="64" Offset="0x187B8" TlutOffset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01A6B8" OutName="object_bvTex_01A6B8" Format="ci8" Width="32" Height="64" Offset="0x192B8" TlutOffset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01B1B8" OutName="object_bvTex_01B1B8" Format="ci8" Width="32" Height="64" Offset="0x19DB8" TlutOffset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01BCB8" OutName="object_bvTex_01BCB8" Format="ci8" Width="32" Height="64" Offset="0x1A8B8" TlutOffset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01C7B8" OutName="object_bvTex_01C7B8" Format="ci8" Width="32" Height="64" Offset="0x1B3B8" TlutOffset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01D2B8" OutName="object_bvTex_01D2B8" Format="ci8" Width="32" Height="64" Offset="0x1BEB8" TlutOffset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01DDB8" OutName="object_bvTex_01DDB8" Format="ci8" Width="32" Height="64" Offset="0x1C9B8" TlutOffset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTex_01E8B8" OutName="object_bvTex_01E8B8" Format="ci8" Width="32" Height="64" Offset="0x1D4B8" TlutOffset="0x1D2B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_0199B0" OutName="object_bvTLUT_0199B0" Format="rgba16" Width="16" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01A4B0" OutName="object_bvTLUT_01A4B0" Format="rgba16" Width="16" Height="16" Offset="0x190B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01AFB0" OutName="object_bvTLUT_01AFB0" Format="rgba16" Width="16" Height="16" Offset="0x19BB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01BAB0" OutName="object_bvTLUT_01BAB0" Format="rgba16" Width="16" Height="16" Offset="0x1A6B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01C5B0" OutName="object_bvTLUT_01C5B0" Format="rgba16" Width="16" Height="16" Offset="0x1B1B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01D0B0" OutName="object_bvTLUT_01D0B0" Format="rgba16" Width="16" Height="16" Offset="0x1BCB0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
+        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>
+
+        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
+        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
+        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
+        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
+        
+        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
+        <Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
+        <Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
+        <Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
+        <Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
+        <Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
+        <Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
+        <Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
+        <Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
+        <Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
+        <Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
+
+        <!-- body overrides -->
+        <DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
+        <DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
+        <!-- Bari something -->
+        <DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
+        <!-- large spark -->
+        <DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
+        <DList Name="gBarinadeDL_015710" Offset="0x14310"/>
+        <!-- spark ball -->
+        <DList Name="gBarinadeDL_011738" Offset="0x10338"/>
+        <DList Name="gBarinadeDL_011768" Offset="0x10368"/>
+        <!-- blood -->
+        <DList Name="gBarinadeDL_009430" Offset="0x8030"/>
+        <DList Name="gBarinadeDL_009468" Offset="0x8068"/>
+        <!-- tumor -->
+        <DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
+        <DList Name="gBarinadeDL_012948" Offset="0x11548"/>
+        <!-- gore -->
+        <DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
+        <DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
+        <!-- zapper charge -->
+        <DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
+        <DList Name="gBarinadeDL_013638" Offset="0x12238"/>
+        <!-- small spark -->
+        <DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
+        <DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
+        
+        <Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
+        <Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
+        <Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
+        <Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
+        <Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
+        <Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
+        <Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
+        <Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
+        <DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
+        <DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
+        <DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
+        <DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
+        <DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
+        <DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
+        <DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
+        <DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
+
+        <Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
+        <Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
+        <Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
+        <DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
+        <DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
+        <DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
+        <DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
+        <DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
+        <DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bw.xml
new file mode 100644
index 0000000000..6fd39fbb1c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bw.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_bw" Segment="6">
+        <Animation Name="gTorchSlugEyestalkWaveAnim" Offset="0x228"/>
+        <DList Name="gTorchSlugLeftLowerEyestalkDL" Offset="0x2C0"/>
+        <DList Name="gTorchSlugLeftUpperEyestalkDL" Offset="0x3E8"/>
+        <DList Name="gTorchSlugRightLowerEyestalkDL" Offset="0x558"/>
+        <DList Name="gTorchSlugRightUpperEyestalkDL" Offset="0x680"/>
+        <DList Name="gTorchSlugBodyDL" Offset="0x1050"/>
+        <Texture Name="gTorchSlugEyestalkTex" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
+        <Texture Name="gTorchSlugEyeTex" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
+        <Texture Name="gTorchSlugBodyTLUT" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
+        <Texture Name="gTorchSlugBody1Tex" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
+        <Texture Name="gTorchSlugBody2Tex" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
+        <Limb Name="gTorchSlugBodyLimb" LimbType="Standard" Offset="0x2040"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootRootLimb" LimbType="Standard" Offset="0x204C"/>
+        <Limb Name="gTorchSlugLeftEyestalkRootLimb" LimbType="Standard" Offset="0x2058"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkRootLimb" LimbType="Standard" Offset="0x2064"/>
+        <Limb Name="gTorchSlugLeftUpperEyestalkLimb" LimbType="Standard" Offset="0x2070"/>
+        <Limb Name="gTorchSlugLeftLowerEyestalkLimb" LimbType="Standard" Offset="0x207C"/>
+        <Limb Name="gTorchSlugRightEyestalkRootRootLimb" LimbType="Standard" Offset="0x2088"/>
+        <Limb Name="gTorchSlugRightEyestalkRootLimb" LimbType="Standard" Offset="0x2094"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkRootLimb" LimbType="Standard" Offset="0x20A0"/>
+        <Limb Name="gTorchSlugRightUpperEyestalkLimb" LimbType="Standard" Offset="0x20AC"/>
+        <Limb Name="gTorchSlugRightLowerEyestalkLimb" LimbType="Standard" Offset="0x20B8"/>
+        <Skeleton Name="gTorchSlugSkel" Type="Normal" LimbType="Standard" Offset="0x20F0"/>
+        <Animation Name="gTorchSlugEyestalkRaiseAnim" Offset="0x21A0"/>
+        <Animation Name="gTorchSlugEyestalkFlailAnim" Offset="0x2250"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bwall.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bwall.xml
new file mode 100644
index 0000000000..d4f43ddc14
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bwall.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_bwall" Segment="6">
+        <DList Name="object_bwall_DL_000040" Offset="0x40"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
+        <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_bxa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_bxa.xml
new file mode 100644
index 0000000000..fb78c117e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_bxa.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_bxa" Segment="6">
+        <DList Name="object_bxa_DL_000890" Offset="0x890"/>
+        <Texture Name="object_bxa_Tex_000C40" OutName="tex_00000C40" Format="rgba16" Width="32" Height="32" Offset="0xC40"/>
+        <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
+        <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
+        <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_cne.xml b/soh/assets/xml/N64_NTSC_12/objects/object_cne.xml
new file mode 100644
index 0000000000..0c14d0bc54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_cne.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_cne" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/>
+        <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/>
+
+        <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
+        <DList Name="gCneRightHandDL" Offset="0x1608"/>
+        <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
+        <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
+        <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
+        <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
+        <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
+        <DList Name="gCneTorsoDL" Offset="0x1B88"/>
+        <DList Name="gCneRightFootDL" Offset="0x1E50"/>
+        <DList Name="gCneRightShinDL" Offset="0x1F18"/>
+        <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
+        <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
+        <DList Name="gCneLeftShinDL" Offset="0x2170"/>
+        <DList Name="gCneLeftThighDL" Offset="0x2238"/>
+        <DList Name="gCnePelvisDL" Offset="0x2300"/>
+
+        <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
+
+        <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_cob.xml b/soh/assets/xml/N64_NTSC_12/objects/object_cob.xml
new file mode 100644
index 0000000000..ba051cfa74
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_cob.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_cob" Segment="6">
+        <Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
+        <Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
+        <DList Name="object_cob_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cob_DL_001678" Offset="0x1678"/>
+        <DList Name="object_cob_DL_001780" Offset="0x1780"/>
+        <DList Name="object_cob_DL_001898" Offset="0x1898"/>
+        <DList Name="object_cob_DL_0019B0" Offset="0x19B0"/>
+        <DList Name="object_cob_DL_001AB8" Offset="0x1AB8"/>
+        <DList Name="object_cob_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_cob_DL_001CE8" Offset="0x1CE8"/>
+        <DList Name="object_cob_DL_001E40" Offset="0x1E40"/>
+        <DList Name="object_cob_DL_001E90" Offset="0x1E90"/>
+        <DList Name="object_cob_DL_001EE0" Offset="0x1EE0"/>
+        <DList Name="object_cob_DL_001F30" Offset="0x1F30"/>
+        <DList Name="object_cob_DL_001F80" Offset="0x1F80"/>
+        <DList Name="object_cob_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_cob_DL_002020" Offset="0x2020"/>
+        <Limb Name="object_cob_Limb_002108" LimbType="Standard" Offset="0x2108"/>
+        <Limb Name="object_cob_Limb_002114" LimbType="Standard" Offset="0x2114"/>
+        <Limb Name="object_cob_Limb_002120" LimbType="Standard" Offset="0x2120"/>
+        <Limb Name="object_cob_Limb_00212C" LimbType="Standard" Offset="0x212C"/>
+        <Limb Name="object_cob_Limb_002138" LimbType="Standard" Offset="0x2138"/>
+        <Limb Name="object_cob_Limb_002144" LimbType="Standard" Offset="0x2144"/>
+        <Limb Name="object_cob_Limb_002150" LimbType="Standard" Offset="0x2150"/>
+        <Limb Name="object_cob_Limb_00215C" LimbType="Standard" Offset="0x215C"/>
+        <Limb Name="object_cob_Limb_002168" LimbType="Standard" Offset="0x2168"/>
+        <Limb Name="object_cob_Limb_002174" LimbType="Standard" Offset="0x2174"/>
+        <Limb Name="object_cob_Limb_002180" LimbType="Standard" Offset="0x2180"/>
+        <Limb Name="object_cob_Limb_00218C" LimbType="Standard" Offset="0x218C"/>
+        <Limb Name="object_cob_Limb_002198" LimbType="Standard" Offset="0x2198"/>
+        <Limb Name="object_cob_Limb_0021A4" LimbType="Standard" Offset="0x21A4"/>
+        <Limb Name="object_cob_Limb_0021B0" LimbType="Standard" Offset="0x21B0"/>
+        <Skeleton Name="object_cob_Skel_0021F8" Type="Flex" LimbType="Standard" Offset="0x21F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_cow.xml b/soh/assets/xml/N64_NTSC_12/objects/object_cow.xml
new file mode 100644
index 0000000000..5d067c329f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_cow.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_cow" Segment="6">
+        <!-- Cow Body Skeleton -->
+        <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
+
+        <!-- Cow Body Limbs -->
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
+
+        <!-- Cow Body Limb DisplayLists -->
+        <DList Name="gCowTorsoDL" Offset="0x1A80"/>
+        <DList Name="gCowHeadDL" Offset="0x1FE8"/>
+        <DList Name="gCowJawDL" Offset="0x2760"/>
+        <DList Name="gCowNoseDL" Offset="0x2368"/>
+        <DList Name="gCowNoseRingDL" Offset="0x2628"/>
+
+        <!-- Cow Tail Skeleton -->
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
+
+        <!-- Cow Tail Limbs -->
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
+
+        <!-- Cow Tail Limb DisplayLists -->
+        <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
+        <DList Name="gCowTailUpperDL" Offset="0x47D0"/>
+        <DList Name="gCowTailMiddleDL" Offset="0x48D0"/>
+        <DList Name="gCowTailLowerDL" Offset="0x49D0"/>
+        <DList Name="gCowTailEndDL" Offset="0x4AD0"/>
+
+        <!-- Cow Animations -->
+        <Animation Name="gCowBodyChewAnim" Offset="0x01CC"/>
+        <Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264"/>
+        <Animation Name="gCowTailIdleAnim" Offset="0x4348"/>
+        <Animation Name="gCowTailSwishAnim" Offset="0x4E98"/>
+
+        <!-- Cow Palettes -->
+        <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880"/>
+
+        <!-- Cow DisplayList Textures -->
+        <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/>
+        <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowSpottedPatternTex" OutName="cow_spotted_pattern" Format="i8" Width="64" Height="64" Offset="0x2CC0"/>
+        <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/>
+        <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40"/>
+        <Texture Name="gCowTailTex" OutName="cow_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_crow.xml b/soh/assets/xml/N64_NTSC_12/objects/object_crow.xml
new file mode 100644
index 0000000000..77337c6445
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_crow.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_crow" Segment="6">
+        <Animation Name="gGuayFlyAnim" Offset="0xF0"/>
+    
+        <Texture Name="gGuayEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0xC40"/>
+        <Texture Name="gGuayBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0xA40"/>
+        <Texture Name="gGuayTailTex" OutName="tail" Format="rgba16" Width="16" Height="16" Offset="0xE40"/>
+
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" Offset="0x10C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_cs.xml b/soh/assets/xml/N64_NTSC_12/objects/object_cs.xml
new file mode 100644
index 0000000000..83804ccaf4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_cs.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_cs" Segment="6">
+        <Skeleton Name="gGraveyardKidSkel" Type="Flex" LimbType="Standard" Offset="0x8540"/>
+        <Limb Name="gGraveyardKidTorsoLimb" LimbType="Standard" Offset="0x8450"/>
+        <Limb Name="gGraveyardKidLeftThighLimb" LimbType="Standard" Offset="0x845C"/>
+        <Limb Name="gGraveyardKidLeftShinLimb" LimbType="Standard" Offset="0x8468"/>
+        <Limb Name="gGraveyardKidLeftFootLimb" LimbType="Standard" Offset="0x8474"/>
+        <Limb Name="gGraveyardKidRightThighLimb" LimbType="Standard" Offset="0x8480"/>
+        <Limb Name="gGraveyardKidRightShinLimb" LimbType="Standard" Offset="0x848C"/>
+        <Limb Name="gGraveyardKidRightFootLimb" LimbType="Standard" Offset="0x8498"/>
+        <Limb Name="gGraveyardKidChestLimb" LimbType="Standard" Offset="0x84A4"/>
+        <Limb Name="gGraveyardKidLeftShoulderLimb" LimbType="Standard" Offset="0x84B0"/>
+        <Limb Name="gGraveyardKidLeftArmLimb" LimbType="Standard" Offset="0x84BC"/>
+        <Limb Name="gGraveyardKidLeftHandLimb" LimbType="Standard" Offset="0x84C8"/>
+        <Limb Name="gGraveyardKidRightShoulderLimb" LimbType="Standard" Offset="0x84D4"/>
+        <Limb Name="gGraveyardKidRightArmLimb" LimbType="Standard" Offset="0x84E0"/>
+        <Limb Name="gGraveyardKidRightHandLimb" LimbType="Standard" Offset="0x84EC"/>
+        <Limb Name="gGraveyardKidHeadLimb" LimbType="Standard" Offset="0x84F8"/>
+
+        <DList Name="gGraveyardKidTorsoDL" Offset="0x7910"/>
+        <DList Name="gGraveyardKidLeftThighDL" Offset="0x7F00"/>
+        <DList Name="gGraveyardKidLeftShinDL" Offset="0x8050"/>
+        <DList Name="gGraveyardKidLeftFootDL" Offset="0x81E8"/>
+        <DList Name="gGraveyardKidRightThighDL" Offset="0x7A30"/>
+        <DList Name="gGraveyardKidRightShinDL" Offset="0x7B80"/>
+        <DList Name="gGraveyardKidRightFootDL" Offset="0x7D18"/>
+        <DList Name="gGraveyardKidChestDL" Offset="0x65B0"/>
+        <DList Name="gGraveyardKidLeftUpperArmDL" Offset="0x7388"/>
+        <DList Name="gGraveyardKidLeftArmDL" Offset="0x7540"/>
+        <DList Name="gGraveyardKidLeftHandDL" Offset="0x7788"/>
+        <DList Name="gGraveyardKidRightUpperArmDL" Offset="0x6CA8"/>
+        <DList Name="gGraveyardKidRightArmDL" Offset="0x6E60"/>
+        <DList Name="gGraveyardKidRightHandDL" Offset="0x70A8"/>
+        <DList Name="gGraveyardKidHeadDL" Offset="0x6808"/>
+
+        <Animation Name="gGraveyardKidWalkAnim" Offset="0x0700"/>
+        <Animation Name="gGraveyardKidSwingStickUpAnim" Offset="0x0E10"/>
+        <Animation Name="gGraveyardKidGrabStickTwoHandsAnim" Offset="0x1588"/>
+        <Animation Name="gGraveyardKidIdleAnim" Offset="0x195C"/>
+
+
+        <Texture Name="gGraveyardKidEyesOpenTex" OutName="eyes_open" Format="rgba16" Width="64" Height="16" Offset="0x2130"/>
+        <Texture Name="gGraveyardKidEyesHalfTex" OutName="eyes_half" Format="rgba16" Width="64" Height="16" Offset="0x2930"/>
+        <Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
+
+        <Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
+        <Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
+        <Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
+        <Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
+   </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_d_elevator.xml b/soh/assets/xml/N64_NTSC_12/objects/object_d_elevator.xml
new file mode 100644
index 0000000000..6be59c154b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_d_elevator.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_d_elevator" Segment="6">
+        <DList Name="object_d_elevator_DL_000180" Offset="0x180"/>
+        <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/>
+        <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_d_hsblock.xml b/soh/assets/xml/N64_NTSC_12/objects/object_d_hsblock.xml
new file mode 100644
index 0000000000..4bb50c2b4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_d_hsblock.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_d_hsblock" Segment="6">
+        <Collision Name="gHookshotTargetCol" Offset="0x578"/>
+        <Collision Name="gHookshotPostCol" Offset="0x730"/>
+        <DList Name="gHookshotPostDL" Offset="0x210"/>
+        <DList Name="gHookshotTargetDL" Offset="0x470"/>
+        <Texture Name="gHookshotTargetTex" OutName="hookshot_target" Format="i4" Width="64" Height="64" Offset="0x760"/>
+        <Texture Name="gHookshotPostTex" OutName="hookshot_post" Format="i8" Width="32" Height="64" Offset="0xF60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_d_lift.xml b/soh/assets/xml/N64_NTSC_12/objects/object_d_lift.xml
new file mode 100644
index 0000000000..2912385190
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_d_lift.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_d_lift" Segment="6">
+        <DList Name="gCollapsingPlatformDL" Offset="0x140"/>
+        <Collision Name="gCollapsingPlatformCol" Offset="0x3D0"/>
+        <Texture Name="gCollapsingPlatformSideTex" OutName="collapsing_platform_side" Format="i8" Width="64" Height="16" Offset="0x400"/>
+        <Texture Name="gCollapsingPlatformTopTex" OutName="collapsing_platform_top" Format="i8" Width="64" Height="64" Offset="0x800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_daiku.xml b/soh/assets/xml/N64_NTSC_12/objects/object_daiku.xml
new file mode 100644
index 0000000000..1524c7a26c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_daiku.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_daiku" Segment="6">
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600"/>
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
+        <Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
+        <Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
+        <Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
+        <Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
+        <Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
+        <DList Name="object_daiku_DL_005490" Offset="0x5490"/>
+        <DList Name="object_daiku_DL_005880" Offset="0x5880"/>
+        <DList Name="object_daiku_DL_005990" Offset="0x5990"/>
+        <DList Name="object_daiku_DL_005AC0" Offset="0x5AC0"/>
+        <DList Name="object_daiku_DL_005BD0" Offset="0x5BD0"/>
+        <DList Name="object_daiku_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_daiku_DL_006210" Offset="0x6210"/>
+        <DList Name="object_daiku_DL_006520" Offset="0x6520"/>
+        <DList Name="object_daiku_DL_006650" Offset="0x6650"/>
+        <DList Name="object_daiku_DL_006780" Offset="0x6780"/>
+        <DList Name="object_daiku_DL_0068F0" Offset="0x68F0"/>
+        <DList Name="object_daiku_DL_006A20" Offset="0x6A20"/>
+        <DList Name="object_daiku_DL_006B50" Offset="0x6B50"/>
+        <DList Name="object_daiku_DL_006CC0" Offset="0x6CC0"/>
+        <DList Name="object_daiku_DL_006EB0" Offset="0x6EB0"/>
+        <DList Name="object_daiku_DL_007158" Offset="0x7158"/>
+        <DList Name="object_daiku_DL_007268" Offset="0x7268"/>
+        <DList Name="object_daiku_DL_007380" Offset="0x7380"/>
+        <DList Name="object_daiku_DL_007630" Offset="0x7630"/>
+        <DList Name="object_daiku_DL_007740" Offset="0x7740"/>
+        <Limb Name="object_daiku_Limb_007858" LimbType="Standard" Offset="0x7858"/>
+        <Limb Name="object_daiku_Limb_007864" LimbType="Standard" Offset="0x7864"/>
+        <Limb Name="object_daiku_Limb_007870" LimbType="Standard" Offset="0x7870"/>
+        <Limb Name="object_daiku_Limb_00787C" LimbType="Standard" Offset="0x787C"/>
+        <Limb Name="object_daiku_Limb_007888" LimbType="Standard" Offset="0x7888"/>
+        <Limb Name="object_daiku_Limb_007894" LimbType="Standard" Offset="0x7894"/>
+        <Limb Name="object_daiku_Limb_0078A0" LimbType="Standard" Offset="0x78A0"/>
+        <Limb Name="object_daiku_Limb_0078AC" LimbType="Standard" Offset="0x78AC"/>
+        <Limb Name="object_daiku_Limb_0078B8" LimbType="Standard" Offset="0x78B8"/>
+        <Limb Name="object_daiku_Limb_0078C4" LimbType="Standard" Offset="0x78C4"/>
+        <Limb Name="object_daiku_Limb_0078D0" LimbType="Standard" Offset="0x78D0"/>
+        <Limb Name="object_daiku_Limb_0078DC" LimbType="Standard" Offset="0x78DC"/>
+        <Limb Name="object_daiku_Limb_0078E8" LimbType="Standard" Offset="0x78E8"/>
+        <Limb Name="object_daiku_Limb_0078F4" LimbType="Standard" Offset="0x78F4"/>
+        <Limb Name="object_daiku_Limb_007900" LimbType="Standard" Offset="0x7900"/>
+        <Limb Name="object_daiku_Limb_00790C" LimbType="Standard" Offset="0x790C"/>
+        <Skeleton Name="object_daiku_Skel_007958" Type="Flex" LimbType="Standard" Offset="0x7958"/>
+        <Animation Name="object_daiku_Anim_007DE0" Offset="0x7DE0"/>
+        <Animation Name="object_daiku_Anim_008164" Offset="0x8164"/>
+        <Animation Name="object_daiku_Anim_00885C" Offset="0x885C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ddan_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ddan_objects.xml
new file mode 100644
index 0000000000..3fc563b96f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ddan_objects.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_ddan_objects" Segment="6">
+        <!-- Dodongo's Cavern DisplayList Textures -->
+        <Texture Name="gDodongoTex_0410" OutName="tex_0410" Format="ci8" Width="32" Height="64" Offset="0x0410" TlutOffset="0x02D0"/>
+        <Texture Name="gDodongoRisingPlatformSide1Tex" OutName="rising_platform_side_1" Format="ci8" Width="32" Height="64" Offset="0x2018" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformTopTex" OutName="rising_platform_top" Format="ci8" Width="32" Height="32" Offset="0x2818" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoRisingPlatformSide2Tex" OutName="rising_platform_side_2" Format="ci8" Width="32" Height="64" Offset="0x2C18" TlutOffset="0x1E10"/>
+        <Texture Name="gDodongoFallingStairsTex" OutName="falling_stairs" Format="ci8" Width="32" Height="32" Offset="0x3F18" TlutOffset="0x3D10"/>
+        <Texture Name="gDodongoDoorLeftSideTex" OutName="door_left_side" Format="rgba16" Width="32" Height="64" Offset="0x4F60"/>
+        <Texture Name="gDodongoBarsTex" OutName="door_bars" Format="rgba16" Width="32" Height="32" Offset="0x5F60"/>
+        <Texture Name="gDodongoBarsBottomTex" OutName="door_bars_bottom" Format="rgba16" Width="32" Height="32" Offset="0x6760"/>
+        <Texture Name="gDodongoTex_6F60" OutName="tex_6F60" Format="rgba16" Width="32" Height="32" Offset="0x6F60"/>
+        <Texture Name="gDodongoFallingStairsVinesTex" OutName="falling_stairs_vines" Format="rgba16" Width="32" Height="64" Offset="0x7760"/>
+        
+        <!-- Palettes -->
+        <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
+        <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        
+        <!-- Dodongo's Cavern DisplayLists -->
+        <DList Name="gDodongoDoorDL" Offset="0xC0"/>
+        <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
+        <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
+        <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
+
+        <!-- Dodongo's Cavern Collision -->
+        <Collision Name="gDodongoLowerJawCol" Offset="0x1DDC"/>
+        <Collision Name="gDodongoRisingPlatformCol" Offset="0x3CE0"/>
+        <Collision Name="gDodongoFallingStairsCol" Offset="0x4F30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dekubaba.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dekubaba.xml
new file mode 100644
index 0000000000..7202a833fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dekubaba.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_dekubaba" Segment="6">
+        <!-- Deku Baba animations -->
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+
+        <!-- Deku Baba body DLists (not all are limb DLists) -->
+        <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
+        <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+
+        <!-- Deku Baba body textures -->
+        <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
+        <Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
+        <Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
+        <Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
+        <Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
+
+        <!-- Deku Baba limbs -->
+        <Limb Name="object_dekubaba_Limb_0029D0" LimbType="Standard" Offset="0x29D0"/>
+        <Limb Name="object_dekubaba_Limb_0029DC" LimbType="Standard" Offset="0x29DC"/>
+        <Limb Name="object_dekubaba_Limb_0029E8" LimbType="Standard" Offset="0x29E8"/>
+        <Limb Name="object_dekubaba_Limb_0029F4" LimbType="Standard" Offset="0x29F4"/>
+        <Limb Name="object_dekubaba_Limb_002A00" LimbType="Standard" Offset="0x2A00"/>
+        <Limb Name="object_dekubaba_Limb_002A0C" LimbType="Standard" Offset="0x2A0C"/>
+        <Limb Name="object_dekubaba_Limb_002A18" LimbType="Standard" Offset="0x2A18"/>
+
+        <!-- Deku Baba skeleton -->
+        <Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" Offset="0x2A40"/>
+
+        <!-- Deku Baba stick drop -->
+        <DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
+        <Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dekujr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dekujr.xml
new file mode 100644
index 0000000000..e906bf61c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dekujr.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_dekujr" Segment="6">
+        <Texture Name="object_dekujr_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_dekujr_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <Texture Name="object_dekujr_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+        <Texture Name="object_dekujr_Tex_001400" OutName="tex_00001400" Format="ia8" Width="32" Height="16" Offset="0x1400"/>
+        <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/>
+        <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/>
+        <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body -->
+        <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dekunuts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dekunuts.xml
new file mode 100644
index 0000000000..5fceef4165
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dekunuts.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_dekunuts" Segment="6">
+        <!-- Deku Scrub skeleton -->
+        <Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
+        <Animation Name="gDekuNutsDamageAnim" Offset="0x368"/>
+        <Animation Name="gDekuNutsBurrowAnim" Offset="0x4D8"/>
+        <Animation Name="gDekuNutsDieAnim" Offset="0x6B0"/>
+        <Animation Name="gDekuNutsUnburrowAnim" Offset="0x8C4"/>
+        <Animation Name="gDekuNutsLookAroundAnim" Offset="0xAF0"/>
+        <Animation Name="gDekuNutsUpAnim" Offset="0xD1C"/>
+        <Animation Name="gDekuNutsStandAnim" Offset="0xE6C"/>
+        <Animation Name="gDekuNutsGaspAnim" Offset="0x1024"/>
+        <Animation Name="gDekuNutsRunAnim" Offset="0x3650"/>
+
+        <!-- Deku Scrub textures -->
+        <Texture Name="gDekuNutsLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2368"/>
+        <Texture Name="gDekuNutsBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x2B68"/>
+        <Texture Name="gDekuNutsEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x2D68"/>
+        <Texture Name="gDekuNutsSnoutTex" OutName="snout" Format="rgba16" Width="8" Height="8" Offset="0x2DE8"/>
+        <Texture Name="gDekuNutsMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="8" Offset="0x2E68"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gDekuNutsFlowerDL" Offset="0x2298"/>
+
+        <!-- Deku Nut -->
+        <DList Name="gDekuNutsDekuNutDL" Offset="0x2028"/>
+        <Texture Name="gDekuNutsDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_demo_6k.xml b/soh/assets/xml/N64_NTSC_12/objects/object_demo_6k.xml
new file mode 100644
index 0000000000..73058d5e46
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_demo_6k.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_demo_6k" Segment="6">
+        <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
+        <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/>
+        <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/>
+        <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0">
+            <Vtx/>
+        </Array>
+        <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_NTSC_12/objects/object_demo_kekkai.xml
new file mode 100644
index 0000000000..aa54bc2eef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_demo_kekkai.xml
@@ -0,0 +1,57 @@
+<Root>
+    <File Name="object_demo_kekkai" Segment="6">
+        <Texture Name="object_demo_kekkaiTex_000000" OutName="object_demo_kekkaiTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_000800" OutName="object_demo_kekkaiTex_000800" Format="i8" Width="32" Height="64" Offset="0x800" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_001000" OutName="object_demo_kekkaiTex_001000" Format="rgba16" Width="32" Height="64" Offset="0x1000" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_002450" OutName="object_demo_kekkaiTex_002450" Format="rgba16" Width="32" Height="64" Offset="0x2450" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0036A0" OutName="object_demo_kekkaiTex_0036A0" Format="rgba16" Width="32" Height="32" Offset="0x36A0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_003EA0" OutName="object_demo_kekkaiTex_003EA0" Format="i8" Width="32" Height="32" Offset="0x3EA0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_004AC0" OutName="object_demo_kekkaiTex_004AC0" Format="i8" Width="32" Height="32" Offset="0x4AC0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006140" OutName="object_demo_kekkaiTex_006140" Format="ia16" Width="8" Height="128" Offset="0x6140" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_006940" OutName="object_demo_kekkaiTex_006940" Format="ia8" Width="64" Height="64" Offset="0x6940" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_007DB0" OutName="object_demo_kekkaiTex_007DB0" Format="rgba16" Width="32" Height="32" Offset="0x7DB0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0089D0" OutName="object_demo_kekkaiTex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x89D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_0092D0" OutName="object_demo_kekkaiTex_0092D0" Format="rgba16" Width="32" Height="64" Offset="0x92D0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00A440" OutName="object_demo_kekkaiTex_00A440" Format="rgba16" Width="64" Height="32" Offset="0xA440" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00B540" OutName="object_demo_kekkaiTex_00B540" Format="ia16" Width="32" Height="32" Offset="0xB540" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C0B0" OutName="object_demo_kekkaiTex_00C0B0" Format="rgba16" Width="32" Height="32" Offset="0xC0B0" AddedByScript="true"/>
+        <Texture Name="object_demo_kekkaiTex_00C8B0" OutName="object_demo_kekkaiTex_00C8B0" Format="rgba16" Width="32" Height="64" Offset="0xC8B0" AddedByScript="true"/>
+        <!-- Demo_Kekkai -->
+        <DList Name="gTowerBarrierDL" Offset="0x4930"/>
+        <DList Name="gTrialBarrierFloorDL" Offset="0x4F00"/>
+        <Array Name="gTrialBarrierEnergyVtx" Count="102" Offset="0x4FD0">
+            <Vtx/>
+        </Array>
+        <DList Name="gTrialBarrierEnergyDL" Offset="0x5A30"/>
+        <DList Name="gTrialBarrierOrbDL" Offset="0x5CB0"/>
+
+        <!-- Bg_Gnd_Darkmeiro -->
+        <DList Name="gShadowTrialPathDL" Offset="0x88B0"/>
+        <DList Name="gClearBlockDL" Offset="0xBEC0"/>
+        <Collision Name="gClearBlockCol" Offset="0xC080"/>
+
+        <!-- Bg_Gnd_Firemeiro -->
+        <DList Name="gFireTrialPlatformDL" Offset="0xE210"/>
+        <Collision Name="gFireTrialPlatformCol" Offset="0xECD8"/>
+
+        <!-- Bg_Gnd_Iceblock -->
+        <DList Name="gWaterTrialIceBlockDL" Offset="0x4420"/>
+        <Collision Name="gWaterTrialIceBlockCol" Offset="0x4618"/>
+
+        <!-- Bg_Gnd_Nisekabe -->
+        <DList Name="gLightTrialFakeWallDL" Offset="0x9230"/>
+        <DList Name="gGanonsCastleUnusedFakeWallDL" Offset="0xA390"/>
+        <DList Name="gGanonsCastleScrubsFakeWallDL" Offset="0xB4A0"/>
+
+        <!-- Bg_Gnd_Soulmeiro -->
+        <DList Name="gSpiritTrialWebDL" Offset="0x7C00"/>
+        <DList Name="gSpiritTrialLightSourceDL" Offset="0x2320"/>
+        <DList Name="gSpiritTrialLightFloorDL" Offset="0x35A0"/>
+
+        <!-- Object_Kankyo -->
+        <DList Name="gDemoKekkaiDL_005FF0" Offset="0x5FF0"/>
+
+        <!-- Door_Shutter -->
+        <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_demo_tre_lgt.xml b/soh/assets/xml/N64_NTSC_12/objects/object_demo_tre_lgt.xml
new file mode 100644
index 0000000000..9ea19012b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_demo_tre_lgt.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_demo_tre_lgt" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarpDemoTreLgtBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dh.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dh.xml
new file mode 100644
index 0000000000..7a52d7dbe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dh.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_dh" Segment="6">
+        <DList Name="object_dh_DL_000760" Offset="0x760"/>
+        <DList Name="object_dh_DL_000808" Offset="0x808"/>
+        <DList Name="object_dh_DL_000910" Offset="0x910"/>
+        <Limb Name="object_dh_Limb_000BA8" LimbType="Standard" Offset="0xBA8"/>
+        <Limb Name="object_dh_Limb_000BB4" LimbType="Standard" Offset="0xBB4"/>
+        <Limb Name="object_dh_Limb_000BC0" LimbType="Standard" Offset="0xBC0"/>
+        <Skeleton Name="object_dh_Skel_000BD8" Type="Flex" LimbType="Standard" Offset="0xBD8"/>
+        <Texture Name="object_dh_Tex_000BF0" OutName="tex_00000BF0" Format="rgba16" Width="16" Height="32" Offset="0xBF0"/>
+        <Texture Name="object_dh_Tex_000FF0" OutName="tex_00000FF0" Format="rgba16" Width="32" Height="16" Offset="0xFF0"/>
+        <Animation Name="object_dh_Anim_0015B0" Offset="0x15B0"/>
+        <Animation Name="object_dh_Anim_001A3C" Offset="0x1A3C"/>
+        <Animation Name="object_dh_Anim_002148" Offset="0x2148"/>
+        <Animation Name="object_dh_Anim_0032BC" Offset="0x32BC"/>
+        <Animation Name="object_dh_Anim_00375C" Offset="0x375C"/>
+        <Animation Name="object_dh_Anim_003A8C" Offset="0x3A8C"/>
+        <Animation Name="object_dh_Anim_003D6C" Offset="0x3D6C"/>
+        <Animation Name="object_dh_Anim_004658" Offset="0x4658"/>
+        <Texture Name="object_dh_Tex_004670" OutName="tex_00004670" Format="rgba16" Width="16" Height="32" Offset="0x4670"/>
+        <Texture Name="object_dh_Tex_004A70" OutName="tex_00004A70" Format="rgba16" Width="16" Height="32" Offset="0x4A70"/>
+        <Texture Name="object_dh_Tex_004E70" OutName="tex_00004E70" Format="rgba16" Width="16" Height="16" Offset="0x4E70"/>
+        <Texture Name="object_dh_Tex_005070" OutName="tex_00005070" Format="rgba16" Width="16" Height="16" Offset="0x5070"/>
+        <Animation Name="object_dh_Anim_005880" Offset="0x5880"/>
+        <DList Name="object_dh_DL_006D10" Offset="0x6D10"/>
+        <DList Name="object_dh_DL_006DD8" Offset="0x6DD8"/>
+        <DList Name="object_dh_DL_006EF8" Offset="0x6EF8"/>
+        <DList Name="object_dh_DL_006FE0" Offset="0x6FE0"/>
+        <DList Name="object_dh_DL_007108" Offset="0x7108"/>
+        <DList Name="object_dh_DL_007228" Offset="0x7228"/>
+        <DList Name="object_dh_DL_007338" Offset="0x7338"/>
+        <DList Name="object_dh_DL_007420" Offset="0x7420"/>
+        <DList Name="object_dh_DL_007540" Offset="0x7540"/>
+        <DList Name="object_dh_DL_007650" Offset="0x7650"/>
+        <DList Name="object_dh_DL_007738" Offset="0x7738"/>
+        <DList Name="object_dh_DL_007818" Offset="0x7818"/>
+        <DList Name="object_dh_DL_0078F8" Offset="0x78F8"/>
+        <DList Name="object_dh_DL_007BA8" Offset="0x7BA8"/>
+        <Limb Name="object_dh_Limb_007D98" LimbType="Standard" Offset="0x7D98"/>
+        <Limb Name="object_dh_Limb_007DA4" LimbType="Standard" Offset="0x7DA4"/>
+        <Limb Name="object_dh_Limb_007DB0" LimbType="Standard" Offset="0x7DB0"/>
+        <Limb Name="object_dh_Limb_007DBC" LimbType="Standard" Offset="0x7DBC"/>
+        <Limb Name="object_dh_Limb_007DC8" LimbType="Standard" Offset="0x7DC8"/>
+        <Limb Name="object_dh_Limb_007DD4" LimbType="Standard" Offset="0x7DD4"/>
+        <Limb Name="object_dh_Limb_007DE0" LimbType="Standard" Offset="0x7DE0"/>
+        <Limb Name="object_dh_Limb_007DEC" LimbType="Standard" Offset="0x7DEC"/>
+        <Limb Name="object_dh_Limb_007DF8" LimbType="Standard" Offset="0x7DF8"/>
+        <Limb Name="object_dh_Limb_007E04" LimbType="Standard" Offset="0x7E04"/>
+        <Limb Name="object_dh_Limb_007E10" LimbType="Standard" Offset="0x7E10"/>
+        <Limb Name="object_dh_Limb_007E1C" LimbType="Standard" Offset="0x7E1C"/>
+        <Limb Name="object_dh_Limb_007E28" LimbType="Standard" Offset="0x7E28"/>
+        <Limb Name="object_dh_Limb_007E34" LimbType="Standard" Offset="0x7E34"/>
+        <Limb Name="object_dh_Limb_007E40" LimbType="Standard" Offset="0x7E40"/>
+        <Skeleton Name="object_dh_Skel_007E88" Type="Flex" LimbType="Standard" Offset="0x7E88"/>
+        <DList Name="object_dh_DL_007FC0" Offset="0x7FC0"/>
+        <Texture Name="object_dh_Tex_0080C0" OutName="tex_000080C0" Format="i8" Width="32" Height="64" Offset="0x80C0"/>
+        <Texture Name="object_dh_Tex_0088C0" OutName="tex_000088C0" Format="i8" Width="32" Height="64" Offset="0x88C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dnk.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dnk.xml
new file mode 100644
index 0000000000..3bce343048
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dnk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_dnk" Segment="6">
+        <Texture Name="object_dnkTex_001BD0" OutName="object_dnkTex_001BD0" Format="rgba16" Width="32" Height="32" Offset="0x1BD0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0023D0" OutName="object_dnkTex_0023D0" Format="rgba16" Width="16" Height="16" Offset="0x23D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002650" OutName="object_dnkTex_002650" Format="rgba16" Width="8" Height="8" Offset="0x2650" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_0026D0" OutName="object_dnkTex_0026D0" Format="rgba16" Width="8" Height="8" Offset="0x26D0" AddedByScript="true"/>
+        <Texture Name="object_dnkTex_002850" OutName="object_dnkTex_002850" Format="rgba16" Width="16" Height="16" Offset="0x2850" AddedByScript="true"/>
+        <!-- Forest Stage scrub skeleton -->
+        <Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
+        
+        <!-- Forest Stage scrub animations -->
+        <Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
+        <Animation Name="gDntStageHideAnim" Offset="0x430"/>
+        <Animation Name="gDntStageDanceAnim" Offset="0x6CC"/>
+        <Animation Name="gDntStageUnburrowAnim" Offset="0x894"/>
+        <Animation Name="gDntStageUpAnim" Offset="0xB70"/>
+        <Animation Name="gDntStageWalkAnim" Offset="0x2E1C"/>
+
+        <!-- Forest Stage scrub eye textures -->
+        <Texture Name="gDntStageEyeOpenTex" OutName="dnt_stage_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x27D0"/>
+        <Texture Name="gDntStageEyeHalfTex" OutName="dnt_stage_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x25D0"/>
+        <Texture Name="gDntStageEyeShutTex" OutName="dnt_stage_eye_shut" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+
+        <!-- Forest Stage scrub flower -->
+        <DList Name="gDntStageFlowerDL" Offset="0x1B00"/>
+
+        <!-- Forest Stage scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gDntStageNutDL" Offset="0x1890"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage scrub animation -->
+        <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dns.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dns.xml
new file mode 100644
index 0000000000..8b78ffcf20
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dns.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_dns" Segment="6">
+        <Texture Name="object_dnsTex_0024A0" OutName="object_dnsTex_0024A0" Format="rgba16" Width="32" Height="32" Offset="0x24A0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002CA0" OutName="object_dnsTex_002CA0" Format="rgba16" Width="16" Height="16" Offset="0x2CA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002F20" OutName="object_dnsTex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_002FA0" OutName="object_dnsTex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" AddedByScript="true"/>
+        <Texture Name="object_dnsTex_003120" OutName="object_dnsTex_003120" Format="rgba16" Width="16" Height="16" Offset="0x3120" AddedByScript="true"/>
+        <!-- Forest Stage leader skeleton -->
+        <Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
+
+        <!-- Forest Stage leader animations -->
+        <Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
+        <Animation Name="gDntJijiCowerAnim" Offset="0x944"/>
+        <Animation Name="gDntJijiHideAnim" Offset="0xA70"/>
+        <Animation Name="gDntJijiTalkAnim" Offset="0xBD0"/>
+        <Animation Name="gDntJijiUnburrowAnim" Offset="0xDF8"/>
+        <Animation Name="gDntJijiUpAnim" Offset="0x12B0"/>
+        <Animation Name="gDntJijiWalkAnim" Offset="0x37C0"/>
+
+        <!-- Forest Stage leader eye textures -->
+        <Texture Name="gDntJijiEyeOpenTex" Format="rgba16" Width="8" Height="8" Offset="0x30A0"/>
+        <Texture Name="gDntJijiEyeHalfTex" Format="rgba16" Width="8" Height="8" Offset="0x2EA0"/>
+        <Texture Name="gDntJijiEyeShutTex" Format="rgba16" Width="8" Height="8" Offset="0x3020"/>
+        
+        <!-- Forest Stage leader flower -->
+        <DList Name="gDntJijiFlowerDL" Offset="0x2310"/>
+
+        <!-- Forest Stage leader deku nut (used by NutsBall) -->
+        <DList Name="gDntJijiNutDL" Offset="0x2410"/>
+
+        <!-- Unused Content -->
+
+        <!-- Forest Stage leader unused animations -->
+        <Animation Name="gDntJijiSpitAnim" Offset="0x400"/>
+        <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
+        <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
+        <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dodojr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dodojr.xml
new file mode 100644
index 0000000000..4dfd7d6e45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dodojr.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_dodojr" Segment="6">
+        <Animation Name="object_dodojr_Anim_0004A0" Offset="0x4A0"/>
+        <Animation Name="object_dodojr_Anim_0005F0" Offset="0x5F0"/>
+        <Animation Name="object_dodojr_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_dodojr_Anim_000860" Offset="0x860"/>
+        <Animation Name="object_dodojr_Anim_0009D4" Offset="0x9D4"/>
+        <DList Name="object_dodojr_DL_001180" Offset="0x1180"/>
+        <DList Name="object_dodojr_DL_0012E0" Offset="0x12E0"/>
+        <DList Name="object_dodojr_DL_0013E8" Offset="0x13E8"/>
+        <DList Name="object_dodojr_DL_001508" Offset="0x1508"/>
+        <DList Name="object_dodojr_DL_001618" Offset="0x1618"/>
+        <Texture Name="object_dodojr_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_dodojr_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_dodojr_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="32" Height="8" Offset="0x1A00"/>
+        <Texture Name="object_dodojr_Tex_001C00" OutName="tex_00001C00" Format="rgba16" Width="16" Height="32" Offset="0x1C00"/>
+        <Limb Name="object_dodojr_Limb_002000" LimbType="Standard" Offset="0x2000"/>
+        <Limb Name="object_dodojr_Limb_00200C" LimbType="Standard" Offset="0x200C"/>
+        <Limb Name="object_dodojr_Limb_002018" LimbType="Standard" Offset="0x2018"/>
+        <Limb Name="object_dodojr_Limb_002024" LimbType="Standard" Offset="0x2024"/>
+        <Limb Name="object_dodojr_Limb_002030" LimbType="Standard" Offset="0x2030"/>
+        <Limb Name="object_dodojr_Limb_00203C" LimbType="Standard" Offset="0x203C"/>
+        <Limb Name="object_dodojr_Limb_002048" LimbType="Standard" Offset="0x2048"/>
+        <Limb Name="object_dodojr_Limb_002054" LimbType="Standard" Offset="0x2054"/>
+        <Limb Name="object_dodojr_Limb_002060" LimbType="Standard" Offset="0x2060"/>
+        <Limb Name="object_dodojr_Limb_00206C" LimbType="Standard" Offset="0x206C"/>
+        <Limb Name="object_dodojr_Limb_002078" LimbType="Standard" Offset="0x2078"/>
+        <Limb Name="object_dodojr_Limb_002084" LimbType="Standard" Offset="0x2084"/>
+        <Limb Name="object_dodojr_Limb_002090" LimbType="Standard" Offset="0x2090"/>
+        <Limb Name="object_dodojr_Limb_00209C" LimbType="Standard" Offset="0x209C"/>
+        <Skeleton Name="object_dodojr_Skel_0020E0" Type="Normal" LimbType="Standard" Offset="0x20E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dodongo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dodongo.xml
new file mode 100644
index 0000000000..779e20e9dc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dodongo.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dodongo" Segment="6">
+        <!-- Dodongo Animations -->
+        <Animation Name="gDodongoDieAnim" Offset="0x13C4"/>
+        <Animation Name="gDodongoDamageAnim" Offset="0x1A44"/>
+        <!-- Breathe Fire Animation also used for swallowing bomb and stunned -->
+        <Animation Name="gDodongoBreatheFireAnim" Offset="0x28F0"/>
+        <Animation Name="gDodongoAfterBreatheFireAnim" Offset="0x3088"/>
+        <Animation Name="gDodongoSweepTailRightAnim" Offset="0x3B14"/>
+        <Animation Name="gDodongoSweepTailLeftAnim" Offset="0x42C4"/>
+        <Animation Name="gDodongoWaitAnim" Offset="0x4C20"/>
+        <Animation Name="gDodongoWalkAnim" Offset="0x8B1C"/>
+
+        <!-- Unused Dodongo Animations -->
+        <Animation Name="gDodongoTwitchAnim" Offset="0x15F4"/>
+        <Animation Name="gDodongoGetUpAnim" Offset="0x1F44"/>
+        <Animation Name="gDodongoLowerTailAnim" Offset="0x3368"/>
+        <Animation Name="gDodongoRightStepAnim" Offset="0x8DE0"/>
+        <Animation Name="gDodongoLeftStepAnim" Offset="0x9088"/>
+
+        <!-- Dodongo Textures -->
+        <Texture Name="gDodongoSpikeTex" OutName="spike" Format="rgba16" Width="16" Height="16" Offset="0x74B8"/>
+        <Texture Name="gDodongoRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="8" Height="16" Offset="0x76B8"/>
+        <Texture Name="gDodongoSkinTex" OutName="skin" Format="rgba16" Width="8" Height="16" Offset="0x77B8"/>
+        <Texture Name="gDodongoFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x78B8"/>
+        <Texture Name="gDodongoInsideMouthTex" OutName="inside_mouth" Format="rgba16" Width="16" Height="32" Offset="0x7CB8"/>
+        <Texture Name="gDodongoToothTex" OutName="tooth" Format="rgba16" Width="8" Height="8" Offset="0x80B8"/>
+
+        <!-- Dodongo Skeleton -->
+        <Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
+
+        <!-- Fire Effect Textures -->
+        <Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
+        <Texture Name="gDodongoFire1Tex" OutName="fire_1" Format="i4" Width="32" Height="32" Offset="0x92A0"/>
+        <Texture Name="gDodongoFire2Tex" OutName="fire_2" Format="i4" Width="32" Height="32" Offset="0x94A0"/>
+        <Texture Name="gDodongoFire3Tex" OutName="fire_3" Format="i4" Width="32" Height="32" Offset="0x96A0"/>
+
+        <!-- Fire Effect -->
+        <DList Name="gDodongoFireDL" Offset="0x98A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dog.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dog.xml
new file mode 100644
index 0000000000..ef00442b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dog.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_dog" Segment="6">
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_door_gerudo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_door_gerudo.xml
new file mode 100644
index 0000000000..2f17262041
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_door_gerudo.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_door_gerudo" Segment="6">
+        <Texture Name="gGerudoCellDoorTex" OutName="cell_door" Format="rgba16" Width="16" Height="64" Offset="0x1A0"/>
+        <DList Name="gGerudoCellDoorDL" Offset="0x40"/>
+        <Collision Name="gGerudoCellDoorCol" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_door_killer.xml b/soh/assets/xml/N64_NTSC_12/objects/object_door_killer.xml
new file mode 100644
index 0000000000..a37f590d60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_door_killer.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_door_killer" Segment="6">
+        <DList Name="object_door_killer_DL_000A20" Offset="0xA20"/>
+        <DList Name="object_door_killer_DL_000AD8" Offset="0xAD8"/>
+        <DList Name="object_door_killer_DL_000BB0" Offset="0xBB0"/>
+        <DList Name="object_door_killer_DL_000C88" Offset="0xC88"/>
+        <DList Name="object_door_killer_DL_000D60" Offset="0xD60"/>
+        <DList Name="object_door_killer_DL_000E38" Offset="0xE38"/>
+        <DList Name="object_door_killer_DL_000F10" Offset="0xF10"/>
+        <DList Name="object_door_killer_DL_000FE8" Offset="0xFE8"/>
+        <DList Name="object_door_killer_DL_001250" Offset="0x1250"/>
+        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
+        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
+        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ds.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ds.xml
new file mode 100644
index 0000000000..0413a9e2e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ds.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_ds" Segment="6">
+        <!-- Potion Shop Lady Skeleton -->
+        <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
+
+        <!-- Potion Shop Lady Limbs -->
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
+
+        <!-- Potion Shop Lady Limb DisplayLists -->
+        <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
+        <DList Name="gPotionShopLadyTorsoDL" Offset="0x2A40"/>
+        <DList Name="gPotionShopLadyArmDL" Offset="0x3440"/>
+        <DList Name="gPotionShopLadyHeadDL" Offset="0x2C00"/>
+
+        <!-- Potion Shop Lady Palettes -->
+        <Texture Name="gPotionShopLadyTLUT" OutName="potion_shop_lady_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3918"/>
+
+        <!-- Potion Shop Lady DisplayList Textures -->
+        <Texture Name="gPotionShopLadySkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x3B18" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashBottomTex" OutName="eyelash_bottom" Format="ci8" Width="16" Height="8" Offset="0x3B58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyelashTopTex" OutName="eyelash_top" Format="ci8" Width="16" Height="8" Offset="0x3BD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar1Tex" OutName="ear_1" Format="ci8" Width="16" Height="16" Offset="0x3C58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyHairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x3D58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEyeTex" OutName="eye" Format="ci8" Width="16" Height="8" Offset="0x3F58" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyEar2Tex" OutName="ear_2" Format="ci8" Width="16" Height="16" Offset="0x3FD8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyArmGradientTex" OutName="arm_gradient" Format="ci8" Width="8" Height="8" Offset="0x40D8" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyShirtPatternTex" OutName="shirt_pattern" Format="ci8" Width="16" Height="16" Offset="0x4118" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern1Tex" OutName="cat_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x4218" TlutOffset="0x3918"/>
+        <Texture Name="gPotionShopLadyCatPattern2Tex" OutName="cat_pattern_2" Format="ci8" Width="16" Height="16" Offset="0x4618" TlutOffset="0x3918"/>
+        
+        <!-- Potion Shop Lady Animations-->
+        <Animation Name="gPotionShopLadyAnim" Offset="0x39C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ds2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ds2.xml
new file mode 100644
index 0000000000..683bcc68d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ds2.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ds2" Segment="6">
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4"/>
+        <DList Name="object_ds2_DL_001990" Offset="0x1990"/>
+        <DList Name="object_ds2_DL_001C98" Offset="0x1C98"/>
+        <DList Name="object_ds2_DL_002188" Offset="0x2188"/>
+        <DList Name="object_ds2_DL_0022B0" Offset="0x22B0"/>
+        <DList Name="object_ds2_DL_002480" Offset="0x2480"/>
+        <DList Name="object_ds2_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ds2_DL_002738" Offset="0x2738"/>
+        <DList Name="object_ds2_DL_002908" Offset="0x2908"/>
+        <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
+        <Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
+        <Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
+        <Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
+        <Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
+        <Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>
+        <Limb Name="object_ds2_Limb_0041FC" LimbType="Standard" Offset="0x41FC"/>
+        <Limb Name="object_ds2_Limb_004208" LimbType="Standard" Offset="0x4208"/>
+        <Limb Name="object_ds2_Limb_004214" LimbType="Standard" Offset="0x4214"/>
+        <Limb Name="object_ds2_Limb_004220" LimbType="Standard" Offset="0x4220"/>
+        <Limb Name="object_ds2_Limb_00422C" LimbType="Standard" Offset="0x422C"/>
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" Offset="0x4258"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_du.xml b/soh/assets/xml/N64_NTSC_12/objects/object_du.xml
new file mode 100644
index 0000000000..0babd962b9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_du.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="object_du" Segment="6">
+        <!-- Darunia's skeleton -->
+        <Skeleton Name="gDaruniaSkel" Type="Flex" LimbType="Standard" Offset="0x122A8"/>
+
+        <Animation Name="gDaruniaIdleAnim" Offset="0x74B0"/>
+
+        <Animation Name="gDaruniaItemGiveAnim" Offset="0x800"/>
+        <Animation Name="gDaruniaItemGiveIdleAnim" Offset="0xD00"/>
+
+        <!-- Used in the Goron's Ruby Cutscene -->
+        <Animation Name="gDaruniaHitLinkAnim" Offset="0x1D70"/>
+        <Animation Name="gDaruniaHitBreastAnim" Offset="0x2374"/>
+        <Animation Name="gDaruniaStandUpAfterFallingAnim" Offset="0x288C"/>
+
+        <!-- Animations of Darunia dancing the Saria's Song -->
+
+        <!-- He opens and closes his arms -->
+        <Animation Name="gDaruniaDancingLoop1Anim" Offset="0x2E8C"/>
+        <!-- I don't understand this one -->
+        <Animation Name="gDaruniaDancingLoop2Anim" Offset="0x40FC"/>
+        <!-- Dances side to side -->
+        <Animation Name="gDaruniaDancingLoop3Anim" Offset="0x516C"/>
+        <!-- I don't know. He thinks he is a chicken maybe (?) -->
+        <Animation Name="gDaruniaDancingLoop4Anim" Offset="0x54DC"/>
+        <!-- Seems to go from from dancing to idle -->
+        <Animation Name="gDaruniaDancingEndAnim" Offset="0x45A4"/>
+
+        <!-- Link played a song which isn't the Saria's Song -->
+        <Animation Name="gDaruniaWrongSongAnim" Offset="0x3D88"/>
+        <Animation Name="gDaruniaWrongSongEndAnim" Offset="0x4B6C"/>
+
+        <!-- Cutscene in the Chamber of Sages, after killing Ganon -->
+        <Animation Name="gDaruniaSageFormationAnim" Offset="0x12614"/>
+
+        <!-- Cutscene in credits. Saria is in Darunia's shoulders -->
+        <Animation Name="gDaruniaLookingUpToSariaAnim" Offset="0x5A58"/>
+        <Animation Name="gDaruniaCreditsHitBreastAnim" Offset="0x6704"/>
+        <Animation Name="gDaruniaCreditsIdleAnim" Offset="0x6DCC"/>
+
+
+        <!-- Darunia's eyes textures -->
+        <Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8680" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8A80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="0x80F8"/>
+        <Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xAB40" TlutOffset="0x80F8"/>
+
+        <!-- Darunia's mouth textures -->
+        <Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x9280" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0xA340" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xAF40" TlutOffset="0x82C8"/>
+        <Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB780" TlutOffset="0x82C8"/>
+
+        <!-- Darunia's nose textures -->
+        <Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x85C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB740" TlutOffset="0x7F80"/>
+
+
+        <!-- Palettes -->
+        <Texture Name="gDaruniaTLUT_6EC0" OutName="darunia_tlut_6EC0" Format="rgba16" Width="16" Height="16" Offset="0x74C0"/>
+        <Texture Name="gDaruniaTLUT_7AF8" OutName="darunia_tlut_7AF8" Format="rgba16" Width="29" Height="8" Offset="0x80F8"/>
+        <Texture Name="gDaruniaTLUT_7CC8" OutName="darunia_tlut_7CC8" Format="rgba16" Width="21" Height="12" Offset="0x82C8"/>
+        <Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7F80"/>
+
+        <!-- Palette: gDaruniaPalette_6EC0 -->
+        <Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x76C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x78C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x79C0" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7A40" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7A80" TlutOffset="0x74C0"/>
+        <Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7B80" TlutOffset="0x74C0"/>
+
+        <!-- Palette: gDaruniaPalette_7980 -->
+        <Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x84C0" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x8540" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8600" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9A80" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9B00" TlutOffset="0x7F80"/>
+        <Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0xA300" TlutOffset="0x7F80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_dy_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_dy_obj.xml
new file mode 100644
index 0000000000..5e792edb50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_dy_obj.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="object_dy_obj" Segment="6">
+
+        <!-- Great Fairy Skeleton -->
+        <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
+
+        <!-- Great Fairy Limbs -->
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
+
+        <!-- Great Fairy Limb DisplayLists -->
+        <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
+        <DList Name="gGreatFairyLeftThighDL" Offset="0x160D8"/>
+        <DList Name="gGreatFairyLeftLegDL" Offset="0x16358"/>
+        <DList Name="gGreatFairyLeftFootDL" Offset="0x164C8"/>
+        <DList Name="gGreatFairyRightThighDL" Offset="0x15A58"/>
+        <DList Name="gGreatFairyRightLegDL" Offset="0x15E40"/>
+        <DList Name="gGreatFairyRightFootDL" Offset="0x15FB0"/>
+        <DList Name="gGreatFairyTorsoDL" Offset="0x137F8"/>
+        <DList Name="gGreatFairyLeftUpperArmDL" Offset="0x154F0"/>
+        <DList Name="gGreatFairyLeftForearmDL" Offset="0x15628"/>
+        <DList Name="gGreatFairyLeftHandDL" Offset="0x15860"/>
+        <DList Name="gGreatFairyRightUpperArmDL" Offset="0x15018"/>
+        <DList Name="gGreatFairyRightForearmDL" Offset="0x15150"/>
+        <DList Name="gGreatFairyRightHandDL" Offset="0x152F8"/>
+        <DList Name="gGreatFairyHeadDL" Offset="0x13BE8"/>
+        <DList Name="gGreatFairyMiddleHairLowerPartDL" Offset="0x14B80"/>
+        <DList Name="gGreatFairyMiddleHairMiddlePartDL" Offset="0x14D10"/>
+        <DList Name="gGreatFairyMiddleHairUpperPartDL" Offset="0x14E18"/>
+        <DList Name="gGreatFairyMiddleHairTipDL" Offset="0x14F20"/>
+        <DList Name="gGreatFairyLeftHairLowerPartDL" Offset="0x14680"/>
+        <DList Name="gGreatFairyLeftHairMiddlePartDL" Offset="0x14810"/>
+        <DList Name="gGreatFairyLeftHairUpperPartDL" Offset="0x14910"/>
+        <DList Name="gGreatFairyLeftHairTipDL" Offset="0x14A88"/>
+        <DList Name="gGreatFairyRightHairLowerPartDL" Offset="0x14200"/>
+        <DList Name="gGreatFairyRightHairMiddlePartDL" Offset="0x14310"/>
+        <DList Name="gGreatFairyRightHairUpperPartDL" Offset="0x14488"/>
+        <DList Name="gGreatFairyRightHairTipDL" Offset="0x14588"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gGreatFairyBetaDL" Offset="0xD1B0"/>
+        <DList Name="gGreatFairyFlowerDL" Offset="0xDC68"/>
+        <DList Name="gGreatFairyParticleMaterialDL" Offset="0x5860"/>
+        <DList Name="gGreatFairyParticleModelDL" Offset="0x58D8"/>
+        <DList Name="gGreatFairySpiralBeamDL" Offset="0x1C160"/>
+
+        <!-- Great Fairy Palettes -->
+        <Texture Name="gGreatFairyTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x165F0"/>
+
+        <!-- Great Fairy DisplayList Textures -->
+        <Texture Name="gGreatFairyParticleTex" OutName="particle" Format="i4" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gGreatFairyBetaGradient1Tex" OutName="beta_gradient_1" Format="rgba16" Width="32" Height="32" Offset="0x86B0"/>
+        <Texture Name="gGreatFairyBetaGradient2Tex" OutName="beta_gradient_2" Format="rgba16" Width="32" Height="32" Offset="0x8EB0"/>
+        <Texture Name="gGreatFairyBetaClothesTex" OutName="beta_clothes" Format="rgba16" Width="16" Height="16" Offset="0x96B0"/>
+        <Texture Name="gGreatFairyFlowerTex" OutName="flower" Format="ia16" Width="32" Height="32" Offset="0x98B0"/>
+        <Texture Name="gGreatFairyBootPatternTex" OutName="boot_pattern" Format="ci8" Width="32" Height="64" Offset="0x167F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern1Tex" OutName="leaves_pattern_1" Format="ci8" Width="32" Height="32" Offset="0x16FF0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySkinGradient" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x173F0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern2Tex" OutName="leaves_pattern_2" Format="rgba16" Width="32" Height="16" Offset="0x17430"/>
+        <Texture Name="gGreatFairyHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x17830" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar1Tex" OutName="ear_1" Format="ci8" Width="8" Height="8" Offset="0x1B130" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyEar2Tex" OutName="ear_2" Format="ci8" Width="8" Height="8" Offset="0x1B170" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x1B1B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairyLeavesPattern3Tex" OutName="leaves_pattern_3" Format="ci8" Width="32" Height="32" Offset="0x1B2B0" TlutOffset="0x165F0"/>
+        <Texture Name="gGreatFairySpiralBeamPatternTex" OutName="spiral_beam_pattern" Format="i8" Width="16" Height="16" Offset="0x1B6B0"/>
+        <Texture Name="gGreatFairySpiralBeamGradientTex" OutName="spiral_beam_gradient" Format="i8" Width="32" Height="64" Offset="0x1B7B0"/>
+
+        <!-- Great Fairy Eye Textures -->
+        <Texture Name="gGreatFairyEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x17930"/>
+        <Texture Name="gGreatFairyEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x18130"/>
+        <Texture Name="gGreatFairyEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x18930"/>
+
+        <!-- Great Fairy Mouth Textures -->
+        <Texture Name="gGreatFairyMouthClosedTex" OutName="mouth_closed" Format="rgba16" Width="64" Height="32" Offset="0x19130"/>
+        <Texture Name="gGreatFairyMouthOpenTex" OutName="mouth_open" Format="rgba16" Width="64" Height="32" Offset="0x1A130"/>
+        
+        <!-- Great Fairy Animations -->
+        <Animation Name="gGreatFairyAnim_000108" Offset="0x108"/>
+        <Animation Name="gGreatFairySpellFountainSpinShrinkAnim" Offset="0x92C"/>
+        <Animation Name="gGreatFairyLayingSidewaysAnim" Offset="0x1DF0"/>
+        <Animation Name="gGreatFairyLayingDownTransitionAnim" Offset="0x31C0"/>
+        <Animation Name="gGreatFairyAfterSpellAnim" Offset="0x4344"/>
+        <Animation Name="gGreatFairyAnim_005810" Offset="0x5810"/>
+        <Animation Name="gGreatFairyJewelFountainSpinShrinkAnim" Offset="0x5E60"/>
+        <Animation Name="gGreatFairyGivingUpgradeAnim" Offset="0x69E8"/>
+        <Animation Name="gGreatFairyAfterUpgradeAnim" Offset="0x7CA8"/>
+        <Animation Name="gGreatFairySittingTransitionAnim" Offset="0x8698"/>
+        <Animation Name="gGreatFairySittingAnim" Offset="0x1D514"/>
+
+        <!-- Spiral Beam Vertices -->
+        <Array Name="gGreatFairySpiralBeamVtx" Count="27" Offset="0x1BFB0">
+            <Vtx/>
+        </Array>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ec.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ec.xml
new file mode 100644
index 0000000000..7ec83e284d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ec.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ec" Segment="6">
+        <Animation Name="gDemoEcCuccoLadyAnim" Offset="0xCD8"/>
+        <Animation Name="gDemoEcCarpenterAnim" Offset="0x164C"/>
+        <Animation Name="gDemoEcWindmillManAnim" Offset="0x196C"/>        
+        <Animation Name="gDemoEcGerudoAnim" Offset="0x2254"/>
+        <Animation Name="gDemoEcGoronAnim" Offset="0x2FA0"/>
+        <Animation Name="gDemoEcGoron2Anim" Offset="0x3A98"/>
+        <Animation Name="gDemoEcIngoAnim" Offset="0x48F4"/>
+        <Animation Name="gDemoEcDancingKokiriAnim" Offset="0x513C"/>
+        <Animation Name="gDemoEcKokiriAnim" Offset="0x5670"/>
+        <Animation Name="gDemoEcOldManAnim" Offset="0x5EA8"/>
+        <Animation Name="gDemoEcAnim_006220" Offset="0x6220"/>
+        <Animation Name="gDemoEcAnim_006930" Offset="0x6930"/>
+        <Animation Name="gDemoEcKingZoraAnim" Offset="0x6C40"/>
+        <Animation Name="gDemoEcAnim_008D1C" Offset="0x8D1C"/>
+        <Animation Name="gDemoEcAnim_009234" Offset="0x9234"/>
+        <Animation Name="gDemoEcMidoAnim" Offset="0x95DC"/>
+        <Animation Name="gDemoEcJumpingCuccoAnim" Offset="0x9BB4"/>
+        <Animation Name="gDemoEcJumpingCucco2Anim" Offset="0xA07C"/>
+        <Animation Name="gDemoEcWalkingCuccoAnim" Offset="0xA474"/>
+        <Animation Name="gDemoEcPotionShopOwnerAnim" Offset="0xAFE0"/>
+        <Animation Name="gDemoEcTalonAnim" Offset="0xBD38"/>
+        <Animation Name="gDemoEcDancingZoraAnim" Offset="0xC918"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_crystal_light.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_crystal_light.xml
new file mode 100644
index 0000000000..9215b6a394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_crystal_light.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_crystal_light" Segment="6">
+        <Texture Name="gCrystalLightTex" OutName="crystal_light" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_doughnut.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_doughnut.xml
new file mode 100644
index 0000000000..7f12c56f53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_doughnut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_doughnut" Segment="6">
+        <Texture Name="gDeathMountainCloudFireTex" OutName="cloud_fire" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gDeathMountainCloudNormalTex" OutName="cloud_normal" Format="ia16" Width="32" Height="32" Offset="0x780"/>
+        <DList Name="gDeathMountainCloudCircleFieryDL" Offset="0x660"/>
+        <DList Name="gDeathMountainCloudCircleNormalDL" Offset="0xFC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_erupc.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_erupc.xml
new file mode 100644
index 0000000000..800d9535f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_erupc.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_efc_erupc" Segment="6">
+        <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>
+        <DList Name="object_efc_erupc_DL_001720" Offset="0x1720"/>
+        <Texture Name="object_efc_erupc_Tex_001A30" OutName="tex_00001A30" Format="i8" Width="16" Height="128" Offset="0x1A30"/>
+        <DList Name="object_efc_erupc_DL_002570" Offset="0x2570"/>
+        <DList Name="object_efc_erupc_DL_002760" Offset="0x2760"/>
+        <DList Name="object_efc_erupc_DL_0027D8" Offset="0x27D8"/>
+        <Texture Name="object_efc_erupc_Tex_0027F0" OutName="tex_000027F0" Format="i8" Width="16" Height="16" Offset="0x27F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_fire_ball.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_fire_ball.xml
new file mode 100644
index 0000000000..2fc65b16ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_fire_ball.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_efc_fire_ball" Segment="6">
+        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
+        <Texture Name="gCreationFireBallMaskTex" OutName="fire_ball_mask" Format="i8" Width="32" Height="32" Offset="0x0100"/>
+        <Texture Name="gCreationFireBallFlameEffectTex" OutName="fire_ball_flame_effect" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_flash.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_flash.xml
new file mode 100644
index 0000000000..5f962f162b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_flash.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_flash" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gEfcFlashBlob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_lgt_shower.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_lgt_shower.xml
new file mode 100644
index 0000000000..67ef5ce7e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_lgt_shower.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_efc_lgt_shower" Segment="6">
+        <Texture Name="gEnliveningLightTex" OutName="enlivening_light" Format="i8" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_star_field.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_star_field.xml
new file mode 100644
index 0000000000..00b47c460f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_star_field.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_efc_star_field" Segment="6">
+        <DList Name="object_efc_star_field_DL_000080" Offset="0x80"/> <!-- rain -->
+        <Texture Name="object_efc_star_field_Tex_000108" OutName="tex_00000108" Format="i8" Width="16" Height="64" Offset="0x108"/>
+        <DList Name="object_efc_star_field_DL_000DE0" Offset="0xDE0"/> <!-- rocks -->
+        <Texture Name="object_efc_star_field_Tex_000FD0" OutName="tex_00000FD0" Format="i4" Width="64" Height="64" Offset="0xFD0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_efc_tw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_efc_tw.xml
new file mode 100644
index 0000000000..de53765696
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_efc_tw.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_efc_tw" Segment="6">
+
+        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
+        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
+
+        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+            <Vtx/>
+        </Array>
+        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
+        <Texture Name="gTimeWarpTex" OutName="time_warp" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ei.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ei.xml
new file mode 100644
index 0000000000..e4132491f4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ei.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_ei" Segment="6">
+        <!-- Stinger Skeleton -->
+        <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
+
+        <!-- Stinger Limbs -->
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
+
+        <!-- Stinger Limb DisplayLists -->
+        <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
+        <DList Name="gStingerTailRootDL" Offset="0x2D00"/>
+        <DList Name="gStingerTailUpperDL" Offset="0x2EB0"/>
+        <DList Name="gStingerTailLowerDL" Offset="0x2F70"/>
+        <DList Name="gStingerFinUpperDL" Offset="0x3178"/>
+        <DList Name="gStingerFinLowerDL" Offset="0x3238"/>
+        <DList Name="gStingerHeadDL" Offset="0x3018"/>
+        <DList Name="gStingerLeftWingBaseDL" Offset="0x2470"/>
+        <DList Name="gStingerLeftWingEndDL" Offset="0x2648"/>
+        <DList Name="gStingerRightWingBaseDL" Offset="0x2820"/>
+        <DList Name="gStingerRightWingEndDL" Offset="0x29F8"/>
+
+        <!-- Stinger DisplayList Textures -->
+        <Texture Name="gStingerWingTex" OutName="wing" Format="rgba16" Width="16" Height="8" Offset="0x12C0"/>
+        <Texture Name="gStingerBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x13C0"/>
+        <Texture Name="gStingerWingEndTex" OutName="wing_end" Format="rgba16" Width="8" Height="8" Offset="0x1440"/>
+        <Texture Name="gStingerEyeTex" OutName="eye" Format="rgba16" Width="8" Height="16" Offset="0x14C0"/>
+        <Texture Name="gStingerUndersideTex" OutName="underside" Format="rgba16" Width="8" Height="8" Offset="0x15C0"/>
+        <Texture Name="gStingerFinTex" OutName="fin" Format="rgba16" Width="8" Height="8" Offset="0x1640"/>
+        <Texture Name="gStingerTailGradientTex" OutName="tail_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16C0"/>
+        <Texture Name="gStingerTailConnectionGradientTex" OutName="tail_connection_gradient" Format="rgba16" Width="4" Height="4" Offset="0x16E0"/>
+    
+        <!-- Stinger Animations -->
+        <Animation Name="gStingerPopOutAnim" Offset="0x288"/>
+        <Animation Name="gStingerDiveAnim" Offset="0x4C4"/>
+        <Animation Name="gStingerBackflipAnim" Offset="0x704"/>
+        <Animation Name="gStingerHitAnim" Offset="0xFC0"/>
+        <Animation Name="gStingerIdleAnim" Offset="0x12AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fa.xml
new file mode 100644
index 0000000000..2f1bf9a5e8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fa.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_fa" Segment="6">
+        <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
+        <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
+        <DList Name="gFaDL" Offset="0x2940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fd.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fd.xml
new file mode 100644
index 0000000000..2609579670
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fd.xml
@@ -0,0 +1,103 @@
+<Root>
+    <File Name="object_fd" Segment="6">
+        <Texture Name="object_fdTex_000458" OutName="object_fdTex_000458" Format="ci4" Width="32" Height="32" Offset="0x458" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000658" OutName="object_fdTex_000658" Format="ci4" Width="32" Height="64" Offset="0x658" TlutOffset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTex_000A78" OutName="object_fdTex_000A78" Format="ci4" Width="32" Height="32" Offset="0xA78" TlutOffset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0040A8" OutName="object_fdTex_0040A8" Format="rgba16" Width="32" Height="32" Offset="0x40A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0048A8" OutName="object_fdTex_0048A8" Format="rgba16" Width="32" Height="32" Offset="0x48A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0050A8" OutName="object_fdTex_0050A8" Format="rgba16" Width="16" Height="16" Offset="0x50A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0052A8" OutName="object_fdTex_0052A8" Format="rgba16" Width="16" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0054A8" OutName="object_fdTex_0054A8" Format="rgba16" Width="16" Height="16" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_0056A8" OutName="object_fdTex_0056A8" Format="rgba16" Width="16" Height="16" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005B60" OutName="object_fdTex_005B60" Format="rgba16" Width="16" Height="16" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005D60" OutName="object_fdTex_005D60" Format="rgba16" Width="16" Height="16" Offset="0x5D60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_005F60" OutName="object_fdTex_005F60" Format="rgba16" Width="16" Height="16" Offset="0x5F60" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009208" OutName="object_fdTex_009208" Format="i8" Width="16" Height="16" Offset="0x9208" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009780" OutName="object_fdTex_009780" Format="rgba16" Width="16" Height="16" Offset="0x9780" AddedByScript="true"/>
+        <Texture Name="object_fdTex_009980" OutName="object_fdTex_009980" Format="rgba16" Width="16" Height="16" Offset="0x9980" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A050" OutName="object_fdTex_00A050" Format="rgba16" Width="32" Height="32" Offset="0xA050" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00A918" OutName="object_fdTex_00A918" Format="i8" Width="16" Height="16" Offset="0xA918" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00AA18" OutName="object_fdTex_00AA18" Format="rgba16" Width="32" Height="32" Offset="0xAA18" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00B458" OutName="object_fdTex_00B458" Format="rgba16" Width="32" Height="32" Offset="0xB458" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BC58" OutName="object_fdTex_00BC58" Format="rgba16" Width="16" Height="16" Offset="0xBC58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00BE58" OutName="object_fdTex_00BE58" Format="rgba16" Width="16" Height="16" Offset="0xBE58" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00C058" OutName="object_fdTex_00C058" Format="rgba16" Width="16" Height="16" Offset="0xC058" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D170" OutName="object_fdTex_00D170" Format="rgba16" Width="16" Height="16" Offset="0xD170" AddedByScript="true"/>
+        <Texture Name="object_fdTex_00D438" OutName="object_fdTex_00D438" Format="rgba16" Width="16" Height="16" Offset="0xD438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000438" OutName="object_fdTLUT_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
+        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
+        <!-- Boss title card -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->
+
+        <!-- Skeletons -->
+        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
+        <Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x101A0"/>
+        <Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x10260"/>
+
+        <!-- Animations -->
+        <Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x10064"/>
+        <Animation Name="gVolvagiaRightArmEmergeAnim" Offset="0x10124"/>
+        <Animation Name="gVolvagiaHeadEmergeAnim" Offset="0x101E4"/>
+
+        <!-- Head display lists -->
+        <DList Name="gVolvagiaBrokenFaceDL" Offset="0x59F8"/>
+        <DList Name="gVolvagiaManeMaterialDL" Offset="0x9168"/>
+        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+
+        <!-- Death display lists -->
+        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
+        <DList Name="gVolvagiaSkullDL" Offset="0xCBC8"/>
+        <DList Name="gVolvagiaJawboneDL" Offset="0xD0A0"/>
+
+        <!-- Body segment display lists -->
+        <DList Name="gVolvagiaBodySeg1DL" Offset="0x79A0"/>
+        <DList Name="gVolvagiaBodySeg2DL" Offset="0x7AC0"/>
+        <DList Name="gVolvagiaBodySeg3DL" Offset="0x7B70"/>
+        <DList Name="gVolvagiaBodySeg4DL" Offset="0x7BD0"/>
+        <DList Name="gVolvagiaBodySeg5DL" Offset="0x7C30"/>
+        <DList Name="gVolvagiaBodySeg6DL" Offset="0x7C90"/>
+        <DList Name="gVolvagiaBodySeg7DL" Offset="0x7CF0"/>
+        <DList Name="gVolvagiaBodySeg8DL" Offset="0x7D50"/>
+        <DList Name="gVolvagiaBodySeg9DL" Offset="0x7DB0"/>
+        <DList Name="gVolvagiaBodySeg10DL" Offset="0x7E10"/>
+        <DList Name="gVolvagiaBodySeg11DL" Offset="0x7E70"/>
+        <DList Name="gVolvagiaBodySeg12DL" Offset="0x7ED0"/>
+        <DList Name="gVolvagiaBodySeg13DL" Offset="0x7F30"/>
+        <DList Name="gVolvagiaBodySeg14DL" Offset="0x7F90"/>
+        <DList Name="gVolvagiaBodySeg15DL" Offset="0x7FF0"/>
+        <DList Name="gVolvagiaBodySeg16DL" Offset="0x8038"/>
+        <DList Name="gVolvagiaBodySeg17DL" Offset="0x8080"/>
+        <DList Name="gVolvagiaBodySeg18DL" Offset="0x80D8"/>
+        
+        <!-- Particle display lists -->
+        <DList Name="gVolvagiaEmberMaterialDL" Offset="0xA880"/>
+        <DList Name="gVolvagiaEmberModelDL" Offset="0xA900"/>
+        <DList Name="gVolvagiaDustMaterialDL" Offset="0xB3A8"/>
+        <DList Name="gVolvagiaDustModelDL" Offset="0xB3C8"/>
+        <DList Name="gVolvagiaDebrisMaterialDL" Offset="0xD3A0"/>
+        <DList Name="gVolvagiaDebrisModelDL" Offset="0xD420"/>
+        <DList Name="gVolvagiaSkullPieceMaterialDL" Offset="0xD668"/>
+        <DList Name="gVolvagiaSkullPieceModelDL" Offset="0xD6E8"/>
+
+        <!-- Unused body skeleton assets -->
+        <Skeleton Name="gVolvagiaBodySkel" Type="Flex" LimbType="Standard" Offset="0x10020"/>
+        <Animation Name="gVolvagiaBodyStaticAnim" Offset="0x61D8"/>
+        <Texture Name="gVolvagiaBodyTex" OutName="volvagia_body" Format="rgba16" Width="32" Height="64" Offset="0x8128"/>
+
+        <!-- Unused, purpose unknown -->
+        <DList Name="gVolvagiaDL_009668" Offset="0x9668"/>
+
+        <!-- Platform assets -->
+        <Collision Name="gVolvagiaPlatformCol" Offset="0xD68"/>
+        <DList Name="gVolvagiaPlatformDL" Offset="0x240"/>
+
+        <!-- Boulder assets -->
+        <DList Name="gVolvagiaRockDL" Offset="0x9F20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fd2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fd2.xml
new file mode 100644
index 0000000000..44b5f5f9c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fd2.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_fd2" Segment="6">
+        <Texture Name="object_fd2Tex_003308" OutName="object_fd2Tex_003308" Format="rgba16" Width="32" Height="32" Offset="0x3308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_003B08" OutName="object_fd2Tex_003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004308" OutName="object_fd2Tex_004308" Format="rgba16" Width="16" Height="16" Offset="0x4308" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004508" OutName="object_fd2Tex_004508" Format="rgba16" Width="16" Height="16" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004708" OutName="object_fd2Tex_004708" Format="rgba16" Width="16" Height="16" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004908" OutName="object_fd2Tex_004908" Format="rgba16" Width="16" Height="16" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004BE8" OutName="object_fd2Tex_004BE8" Format="i8" Width="16" Height="16" Offset="0x4BE8" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_004FA0" OutName="object_fd2Tex_004FA0" Format="rgba16" Width="16" Height="16" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0051A0" OutName="object_fd2Tex_0051A0" Format="rgba16" Width="16" Height="16" Offset="0x51A0" AddedByScript="true"/>
+        <Texture Name="object_fd2Tex_0053A0" OutName="object_fd2Tex_0053A0" Format="rgba16" Width="16" Height="16" Offset="0x53A0" AddedByScript="true"/>
+        <Texture Name="object_fd2TLUT_002508" OutName="object_fd2TLUT_002508" Format="rgba16" Width="16" Height="16" Offset="0x2508" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gHoleVolvagiaSkel" Type="Flex" LimbType="Standard" Offset="0x11A78"/>
+
+        <!-- Display lists -->
+        <DList Name="gHoleVolvagiaManeMaterialDL" Offset="0x4B48"/>
+        <DList Name="gHoleVolvagiaManeModelDL" Offset="0x4BC8"/>
+        <DList Name="gHoleVolvagiaBrokenFaceDL" Offset="0x4E38"/>
+
+        <!-- Animations -->
+        <Animation Name="gHoleVolvagiaBreatheFireAnim" Offset="0x73CC"/>
+        <Animation Name="gHoleVolvagiaHitAnim" Offset="0x7850"/>
+        <Animation Name="gHoleVolvagiaDamagedAnim" Offset="0x89DC"/>
+        <Animation Name="gHoleVolvagiaBurrowAnim" Offset="0x9194"/>
+        <Animation Name="gHoleVolvagiaKnockoutAnim" Offset="0xA31C"/>
+        <Animation Name="gHoleVolvagiaVulnerableAnim" Offset="0xA86C"/>
+        <Animation Name="gHoleVolvagiaTurnAnim" Offset="0xAE90"/>
+        <Animation Name="gHoleVolvagiaClawSwipeAnim" Offset="0xB7A4"/>
+        <Animation Name="gHoleVolvagiaEmergeAnim" Offset="0xC1D0"/>
+        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        
+        <!-- Unused animation -->
+        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
+
+        <!-- <Array Name="gHoleVolvagiaSkelVtx" Count="795" Offset="0xCDC0">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gHoleVolvagiaVtx_00DD80" Count="154" Offset="0xDD80">
+            <Vtx/>
+        </Array>
+        <Array Name="gHoleVolvagiaVtx_00D000" Count="150" Offset="0xD000">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fhg.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fhg.xml
new file mode 100644
index 0000000000..669875aaf8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fhg.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_fhg" Segment="6">
+
+        <Texture Name="object_fhgTex_003320" OutName="object_fhgTex_003320" Format="rgba16" Width="16" Height="16" Offset="0x3320" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003520" OutName="object_fhgTex_003520" Format="rgba16" Width="16" Height="16" Offset="0x3520" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003720" OutName="object_fhgTex_003720" Format="rgba16" Width="16" Height="16" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003920" OutName="object_fhgTex_003920" Format="rgba16" Width="16" Height="16" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003B20" OutName="object_fhgTex_003B20" Format="rgba16" Width="8" Height="8" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003BA0" OutName="object_fhgTex_003BA0" Format="rgba16" Width="16" Height="16" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003DA0" OutName="object_fhgTex_003DA0" Format="rgba16" Width="16" Height="16" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_003FA0" OutName="object_fhgTex_003FA0" Format="rgba16" Width="16" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0043A0" OutName="object_fhgTex_0043A0" Format="rgba16" Width="16" Height="8" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_0044A0" OutName="object_fhgTex_0044A0" Format="rgba16" Width="32" Height="32" Offset="0x44A0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004CA0" OutName="object_fhgTex_004CA0" Format="rgba16" Width="8" Height="16" Offset="0x4CA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_004DA0" OutName="object_fhgTex_004DA0" Format="rgba16" Width="8" Height="8" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D040" OutName="object_fhgTex_00D040" Format="rgba16" Width="4" Height="4" Offset="0xBC40" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00D060" OutName="object_fhgTex_00D060" Format="rgba16" Width="16" Height="16" Offset="0xBC60" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00E8B0" OutName="object_fhgTex_00E8B0" Format="i4" Width="64" Height="64" Offset="0xD4B0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00F0B0" OutName="object_fhgTex_00F0B0" Format="i4" Width="64" Height="64" Offset="0xDCB0" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_00FD98" OutName="object_fhgTex_00FD98" Format="i8" Width="64" Height="32" Offset="0xE998" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010660" OutName="object_fhgTex_010660" Format="i4" Width="32" Height="96" Offset="0xF260" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_010D20" OutName="object_fhgTex_010D20" Format="i8" Width="32" Height="32" Offset="0xF920" AddedByScript="true"/>
+        <Texture Name="object_fhgTex_011120" OutName="object_fhgTex_011120" Format="i8" Width="64" Height="64" Offset="0xFD20" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomHorseSkel" Type="Normal" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Animations -->
+        <Animation Name="gPhantomHorseRunningAnim" Offset="0xA0C8"/>
+        <Animation Name="gPhantomHorseAirAnim" Offset="0xA5D0"/>
+        <Animation Name="gPhantomHorseLeapAnim" Offset="0xB25C"/>
+        <Animation Name="gPhantomHorseLandAnim" Offset="0xB71C"/>
+        <Animation Name="gPhantomHorseRearingAnim" Offset="0xC9B8"/>
+        <Animation Name="gPhantomHorseIdleAnim" Offset="0xD4A0"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gPhantomHorseUnusedRearingAnim" Offset="0x5804"/>
+        <Animation Name="gPhantomHorseStillAnim" Offset="0x5990"/>
+        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
+        
+        <!-- Boss title card -->
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
+    
+        <!-- Energy attack DLists -->
+        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
+        <DList Name="gPhantomLightningBlastDL" Offset="0xE8F8"/>
+        <DList Name="gPhantomLightningDL" Offset="0xF1E0"/>
+        <DList Name="gPhantomEnergyBallDL" Offset="0x10D60"/>
+
+        <!-- Unused DLists -->
+        <DList Name="gPhantomUnkDL_FCA0" Offset="0xE8A0"/>
+        <DList Name="gPhantomUnkDL_10CA0" Offset="0xF8A0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fire.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fire.xml
new file mode 100644
index 0000000000..49bf620cb8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fire.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_fire" Segment="6">
+        <DList Name="gFireDL" Offset="0x40"/>
+
+        <Texture Name="gFire0Tex" OutName="fire_0" Format="ia8" Width="32" Height="64" Offset="0x00A0"/>
+        <Texture Name="gFire1Tex" OutName="fire_1" Format="ia8" Width="32" Height="64" Offset="0x08A0"/>
+        <Texture Name="gFire2Tex" OutName="fire_2" Format="ia8" Width="32" Height="64" Offset="0x10A0"/>
+        <Texture Name="gFire3Tex" OutName="fire_3" Format="ia8" Width="32" Height="64" Offset="0x18A0"/>
+        <Texture Name="gFire4Tex" OutName="fire_4" Format="ia8" Width="32" Height="64" Offset="0x20A0"/>
+        <Texture Name="gFire5Tex" OutName="fire_5" Format="ia8" Width="32" Height="64" Offset="0x28A0"/>
+        <Texture Name="gFire6Tex" OutName="fire_6" Format="ia8" Width="32" Height="64" Offset="0x30A0"/>
+        <Texture Name="gFire7Tex" OutName="fire_7" Format="ia8" Width="32" Height="64" Offset="0x38A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_firefly.xml b/soh/assets/xml/N64_NTSC_12/objects/object_firefly.xml
new file mode 100644
index 0000000000..8c26a43418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_firefly.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_firefly" Segment="6">
+        <Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
+
+        <Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
+
+        <DList Name="gKeeseEyesDL" Offset="0x1678"/>
+
+        <Texture Name="gKeeseEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x190"/>
+        <Texture Name="gKeeseBodyTex" OutName="body" Format="rgba16" Width="8" Height="8" Offset="0x590"/>
+        <Texture Name="gKeeseTalonTex" OutName="talon" Format="rgba16" Width="8" Height="16" Offset="0x610"/>
+        <Texture Name="gKeeseWingTex" OutName="wing" Format="rgba16" Width="4" Height="16" Offset="0x710"/>
+        <Texture Name="gKeeseEarTex" OutName="ear" Format="rgba16" Width="16" Height="8" Offset="0x790"/>
+
+        <Texture Name="gFireKeeseBodyTex" OutName="fire_body" Format="rgba16" Width="8" Height="8" Offset="0x210"/>
+        <Texture Name="gFireKeeseEyeTex" OutName="fire_eye" Format="rgba16" Width="8" Height="8" Offset="0x290"/>
+        <Texture Name="gFireKeeseEarTex" OutName="fire_ear" Format="rgba16" Width="16" Height="8" Offset="0x310"/>
+        <Texture Name="gFireKeeseTalonTex" OutName="fire_talon" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
+        <Texture Name="gFireKeeseWingTex" OutName="fire_wing" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fish.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fish.xml
new file mode 100644
index 0000000000..f5ad4f6da0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fish.xml
@@ -0,0 +1,180 @@
+<Root>
+    <File Name="object_fish" Segment="6">
+        <Animation Name="gFishingFishAnim" Offset="0x7C"/>
+        <DList Name="gFishingFishDL_000940" Offset="0x940"/>
+        <DList Name="gFishingFishDL_0009E8" Offset="0x9E8"/>
+        <DList Name="gFishingFishDL_000B00" Offset="0xB00"/>
+        <DList Name="gFishingFishDL_000BA0" Offset="0xBA0"/>
+        <DList Name="gFishingFishDL_000C40" Offset="0xC40"/>
+        <DList Name="gFishingFishDL_000E30" Offset="0xE30"/>
+        <DList Name="gFishingFishDL_000ED0" Offset="0xED0"/>
+        <DList Name="gFishingFishDL_000F70" Offset="0xF70"/>
+        <DList Name="gFishingFishDL_0010A0" Offset="0x10A0"/>
+        <DList Name="gFishingFishDL_001260" Offset="0x1260"/>
+        <DList Name="gFishingFishDL_001300" Offset="0x1300"/>
+        <DList Name="gFishingFishDL_0013A0" Offset="0x13A0"/>
+        <Texture Name="gFishingFishTex_0014D0" OutName="fishing_fish_0014D0" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gFishingFishTex_0016D0" OutName="fishing_fish_0016D0" Format="rgba16" Width="16" Height="16" Offset="0x16D0"/>
+        <Texture Name="gFishingFishTex_0018D0" OutName="fishing_fish_0018D0" Format="rgba16" Width="16" Height="16" Offset="0x18D0"/>
+        <Texture Name="gFishingFishTex_001AD0" OutName="fishing_fish_001AD0" Format="rgba16" Width="32" Height="32" Offset="0x1AD0"/>
+        <Texture Name="gFishingFishTex_0022D0" OutName="fishing_fish_0022D0" Format="rgba16" Width="16" Height="16" Offset="0x22D0"/>
+        <Texture Name="gFishingFishTex_0024D0" OutName="fishing_fish_0024D0" Format="rgba16" Width="16" Height="16" Offset="0x24D0"/>
+        <Texture Name="gFishingFishTex_0026D0" OutName="fishing_fish_0026D0" Format="rgba16" Width="16" Height="16" Offset="0x26D0"/>
+        <Limb Name="gFishingFishLimb_0028D0" LimbType="Standard" Offset="0x28D0"/>
+        <Limb Name="gFishingFishLimb_0028DC" LimbType="Standard" Offset="0x28DC"/>
+        <Limb Name="gFishingFishLimb_0028E8" LimbType="Standard" Offset="0x28E8"/>
+        <Limb Name="gFishingFishLimb_0028F4" LimbType="Standard" Offset="0x28F4"/>
+        <Limb Name="gFishingFishLimb_002900" LimbType="Standard" Offset="0x2900"/>
+        <Limb Name="gFishingFishLimb_00290C" LimbType="Standard" Offset="0x290C"/>
+        <Limb Name="gFishingFishLimb_002918" LimbType="Standard" Offset="0x2918"/>
+        <Limb Name="gFishingFishLimb_002924" LimbType="Standard" Offset="0x2924"/>
+        <Limb Name="gFishingFishLimb_002930" LimbType="Standard" Offset="0x2930"/>
+        <Limb Name="gFishingFishLimb_00293C" LimbType="Standard" Offset="0x293C"/>
+        <Limb Name="gFishingFishLimb_002948" LimbType="Standard" Offset="0x2948"/>
+        <Limb Name="gFishingFishLimb_002954" LimbType="Standard" Offset="0x2954"/>
+        <Limb Name="gFishingFishLimb_002960" LimbType="Standard" Offset="0x2960"/>
+        <Limb Name="gFishingFishLimb_00296C" LimbType="Standard" Offset="0x296C"/>
+        <Limb Name="gFishingFishLimb_002978" LimbType="Standard" Offset="0x2978"/>
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0"/>
+
+        <Texture Name="gFishingOldLureHookTex" OutName="fishing_old_lure_hook" Format="rgba16" Width="8" Height="16" Offset="0x29D0"/>
+        <Texture Name="gFishingOldLureFloatTex" OutName="fishing_old_lure_float" Format="rgba16" Width="8" Height="8" Offset="0x2AD0"/>
+        <DList Name="gFishingOldLureDL" Offset="0x2BD0"/>
+
+        <Texture Name="gFishingStreamSplashTile1Tex" OutName="fishing_stream_splash_tile_1" Format="i4" Width="32" Height="64" Offset="0x2CE0"/>
+        <Texture Name="gFishingStreamSplashTile2Tex" OutName="fishing_stream_splash_tile_2" Format="i4" Width="16" Height="16" Offset="0x30E0"/>
+        <DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
+
+        <Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
+        <DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
+        <DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
+
+        <Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
+        <DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
+        <DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
+
+        <DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
+        <DList Name="gFishingLineModelDL" Offset="0x3710"/>
+
+        <DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
+
+        <Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
+        <DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
+        <DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
+
+        <Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
+        <DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
+        <DList Name="gFishingOwnerHairDL" Offset="0x7350"/>
+        <DList Name="gFishingOwnerHatDL" Offset="0x74C8"/>
+        <DList Name="gFishingOwnerDL_0076B8" Offset="0x76B8"/>
+        <DList Name="gFishingOwnerDL_007CF8" Offset="0x7CF8"/>
+        <DList Name="gFishingOwnerDL_007E48" Offset="0x7E48"/>
+        <DList Name="gFishingOwnerDL_007F78" Offset="0x7F78"/>
+        <DList Name="gFishingOwnerDL_008138" Offset="0x8138"/>
+        <DList Name="gFishingOwnerDL_008288" Offset="0x8288"/>
+        <DList Name="gFishingOwnerDL_0083B8" Offset="0x83B8"/>
+        <Limb Name="gFishingOwnerLimb_008578" LimbType="Standard" Offset="0x8578"/>
+        <Limb Name="gFishingOwnerLimb_008584" LimbType="Standard" Offset="0x8584"/>
+        <Limb Name="gFishingOwnerLimb_008590" LimbType="Standard" Offset="0x8590"/>
+        <Limb Name="gFishingOwnerLimb_00859C" LimbType="Standard" Offset="0x859C"/>
+        <Limb Name="gFishingOwnerLimb_0085A8" LimbType="Standard" Offset="0x85A8"/>
+        <Limb Name="gFishingOwnerLimb_0085B4" LimbType="Standard" Offset="0x85B4"/>
+        <Limb Name="gFishingOwnerLimb_0085C0" LimbType="Standard" Offset="0x85C0"/>
+        <Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
+
+        <DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
+        <DList Name="gFishingRippleModelDL" Offset="0x8678"/>
+
+        <Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
+        <DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
+        <DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
+
+        <Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
+        <Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
+        <Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
+
+        <Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
+        <DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
+        <DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
+
+        <Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
+        <DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
+        <DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
+
+        <DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
+        <Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
+
+        <Animation Name="gFishingLoachAnim" Offset="0xCFE0"/>
+        <DList Name="gFishingLoachDL_00DED0" Offset="0xDED0"/>
+        <DList Name="gFishingLoachDL_00DFA8" Offset="0xDFA8"/>
+        <DList Name="gFishingLoachDL_00E048" Offset="0xE048"/>
+        <DList Name="gFishingLoachDL_00E168" Offset="0xE168"/>
+        <DList Name="gFishingLoachDL_00E460" Offset="0xE460"/>
+        <DList Name="gFishingLoachDL_00E500" Offset="0xE500"/>
+        <DList Name="gFishingLoachDL_00E808" Offset="0xE808"/>
+        <DList Name="gFishingLoachDL_00E8B0" Offset="0xE8B0"/>
+        <DList Name="gFishingLoachDL_00EB28" Offset="0xEB28"/>
+        <DList Name="gFishingLoachDL_00EBC8" Offset="0xEBC8"/>
+        <DList Name="gFishingLoachDL_00EC68" Offset="0xEC68"/>
+        <Texture Name="gFishingLoachTex_00ED28" OutName="fishing_loach_00ED28" Format="rgba16" Width="32" Height="32" Offset="0xED28"/>
+        <Texture Name="gFishingLoachTex_00F528" OutName="fishing_loach_00F528" Format="rgba16" Width="32" Height="32" Offset="0xF528"/>
+        <Texture Name="gFishingLoachTex_00FD28" OutName="fishing_loach_00FD28" Format="rgba16" Width="32" Height="32" Offset="0xFD28"/>
+        <Texture Name="gFishingLoachTex_010528" OutName="fishing_loach_010528" Format="rgba16" Width="32" Height="32" Offset="0x10528"/>
+        <Texture Name="gFishingLoachTex_010D28" OutName="fishing_loach_010D28" Format="rgba16" Width="8" Height="8" Offset="0x10D28"/>
+        <Texture Name="gFishingLoachTex_010DA8" OutName="fishing_loach_010DA8" Format="rgba16" Width="16" Height="16" Offset="0x10DA8"/>
+        <Limb Name="gFishingLoachLimb_010FA8" LimbType="Standard" Offset="0x10FA8"/>
+        <Limb Name="gFishingLoachLimb_010FB4" LimbType="Standard" Offset="0x10FB4"/>
+        <Limb Name="gFishingLoachLimb_010FC0" LimbType="Standard" Offset="0x10FC0"/>
+        <Limb Name="gFishingLoachLimb_010FCC" LimbType="Standard" Offset="0x10FCC"/>
+        <Limb Name="gFishingLoachLimb_010FD8" LimbType="Standard" Offset="0x10FD8"/>
+        <Limb Name="gFishingLoachLimb_010FE4" LimbType="Standard" Offset="0x10FE4"/>
+        <Limb Name="gFishingLoachLimb_010FF0" LimbType="Standard" Offset="0x10FF0"/>
+        <Limb Name="gFishingLoachLimb_010FFC" LimbType="Standard" Offset="0x10FFC"/>
+        <Limb Name="gFishingLoachLimb_011008" LimbType="Standard" Offset="0x11008"/>
+        <Limb Name="gFishingLoachLimb_011014" LimbType="Standard" Offset="0x11014"/>
+        <Limb Name="gFishingLoachLimb_011020" LimbType="Standard" Offset="0x11020"/>
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058"/>
+
+        <Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
+        <Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
+        <Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
+        <DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
+        <DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
+
+        <Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
+        <Texture Name="gFishingLureFloatTex" OutName="fishing_lure_float" Format="rgba16" Width="32" Height="16" Offset="0x11C40"/>
+        <DList Name="gFishingLureHookDL" Offset="0x12160"/>
+        <DList Name="gFishingLureFloatDL" Offset="0x121F0"/>
+
+        <Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
+        <Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
+        <DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
+        <DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
+        <DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
+        <DList Name="gFishingRockModelDL" Offset="0x13610"/>
+        <Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
+        <DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
+        <DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
+        <DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
+        <DList Name="gFishingReedModelDL" Offset="0x140B0"/>
+
+        <Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
+        <Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
+        <Texture Name="gFishingAquariumGlassTex" OutName="fishing_aquarium_glass" Format="i8" Width="32" Height="32" Offset="0x14AD0"/>
+        <DList Name="gFishingAquariumBottomDL" Offset="0x153D0"/>
+        <DList Name="gFishingAquariumContainerDL" Offset="0x15470"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fr.xml
new file mode 100644
index 0000000000..25ee2ad42e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fr.xml
@@ -0,0 +1,65 @@
+<Root>
+    <File Name="object_fr" Segment="6">
+        <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping -->
+        <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing -->
+        <Animation Name="object_fr_Anim_001534" Offset="0x1534"/>
+        <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/>
+        <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/>
+        <Texture Name="object_fr_Tex_003AA0" OutName="tex_00003AA0" Format="i8" Width="16" Height="16" Offset="0x3AA0"/>
+        <Texture Name="object_fr_Tex_003BA0" OutName="tex_00003BA0" Format="rgba16" Width="32" Height="32" Offset="0x3BA0"/>
+        <Texture Name="object_fr_Tex_0043A0" OutName="tex_000043A0" Format="rgba16" Width="32" Height="32" Offset="0x43A0"/>
+        <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
+        <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
+        <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
+        <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
+        <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
+        <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>
+        <DList Name="object_fr_DL_008F60" Offset="0x8F60"/>
+        <DList Name="object_fr_DL_009000" Offset="0x9000"/>
+        <DList Name="object_fr_DL_009328" Offset="0x9328"/>
+        <DList Name="object_fr_DL_0093C8" Offset="0x93C8"/>
+        <DList Name="object_fr_DL_009468" Offset="0x9468"/>
+        <DList Name="object_fr_DL_0095A0" Offset="0x95A0"/>
+        <DList Name="object_fr_DL_0098B8" Offset="0x98B8"/>
+        <DList Name="object_fr_DL_009AE0" Offset="0x9AE0"/>
+        <DList Name="object_fr_DL_009B80" Offset="0x9B80"/>
+        <DList Name="object_fr_DL_009D88" Offset="0x9D88"/>
+        <DList Name="object_fr_DL_009FB0" Offset="0x9FB0"/>
+        <DList Name="object_fr_DL_00A050" Offset="0xA050"/>
+        <DList Name="object_fr_DL_00A258" Offset="0xA258"/>
+        <DList Name="object_fr_DL_00A428" Offset="0xA428"/>
+        <DList Name="object_fr_DL_00A6B8" Offset="0xA6B8"/>
+        <DList Name="object_fr_DL_00A758" Offset="0xA758"/>
+        <DList Name="object_fr_DL_00A978" Offset="0xA978"/>
+        <DList Name="object_fr_DL_00ABA8" Offset="0xABA8"/>
+        <DList Name="object_fr_DL_00AE38" Offset="0xAE38"/>
+        <DList Name="object_fr_DL_00AED8" Offset="0xAED8"/>
+        <DList Name="object_fr_DL_00B0F8" Offset="0xB0F8"/>
+        <Limb Name="object_fr_Limb_00B328" LimbType="Standard" Offset="0xB328"/>
+        <Limb Name="object_fr_Limb_00B334" LimbType="Standard" Offset="0xB334"/>
+        <Limb Name="object_fr_Limb_00B340" LimbType="Standard" Offset="0xB340"/>
+        <Limb Name="object_fr_Limb_00B34C" LimbType="Standard" Offset="0xB34C"/>
+        <Limb Name="object_fr_Limb_00B358" LimbType="Standard" Offset="0xB358"/>
+        <Limb Name="object_fr_Limb_00B364" LimbType="Standard" Offset="0xB364"/>
+        <Limb Name="object_fr_Limb_00B370" LimbType="Standard" Offset="0xB370"/>
+        <Limb Name="object_fr_Limb_00B37C" LimbType="Standard" Offset="0xB37C"/>
+        <Limb Name="object_fr_Limb_00B388" LimbType="Standard" Offset="0xB388"/>
+        <Limb Name="object_fr_Limb_00B394" LimbType="Standard" Offset="0xB394"/>
+        <Limb Name="object_fr_Limb_00B3A0" LimbType="Standard" Offset="0xB3A0"/>
+        <Limb Name="object_fr_Limb_00B3AC" LimbType="Standard" Offset="0xB3AC"/>
+        <Limb Name="object_fr_Limb_00B3B8" LimbType="Standard" Offset="0xB3B8"/>
+        <Limb Name="object_fr_Limb_00B3C4" LimbType="Standard" Offset="0xB3C4"/>
+        <Limb Name="object_fr_Limb_00B3D0" LimbType="Standard" Offset="0xB3D0"/>
+        <Limb Name="object_fr_Limb_00B3DC" LimbType="Standard" Offset="0xB3DC"/>
+        <Limb Name="object_fr_Limb_00B3E8" LimbType="Standard" Offset="0xB3E8"/>
+        <Limb Name="object_fr_Limb_00B3F4" LimbType="Standard" Offset="0xB3F4"/>
+        <Limb Name="object_fr_Limb_00B400" LimbType="Standard" Offset="0xB400"/>
+        <Limb Name="object_fr_Limb_00B40C" LimbType="Standard" Offset="0xB40C"/>
+        <Limb Name="object_fr_Limb_00B418" LimbType="Standard" Offset="0xB418"/>
+        <Limb Name="object_fr_Limb_00B424" LimbType="Standard" Offset="0xB424"/>
+        <Limb Name="object_fr_Limb_00B430" LimbType="Standard" Offset="0xB430"/>
+        <Skeleton Name="object_fr_Skel_00B498" Type="Flex" LimbType="Standard" Offset="0xB498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fu.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fu.xml
new file mode 100644
index 0000000000..82c449e3de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fu.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_fu" Segment="6">
+        <Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
+        <Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
+        <DList Name="gWindmillManHornDL" Offset="0x3130"/>
+        <DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
+        <DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
+        <DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
+        <DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
+        <DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
+        <DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
+        <DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
+        <DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
+        <DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
+        <DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
+        <DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
+        <DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
+        <DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
+        <DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
+        <Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
+        <Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
+        <Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
+        <Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
+        
+        <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
+
+        <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
+        <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
+        
+        <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
+        <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
+        <Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
+        <Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
+        <Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
+        <Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
+        <Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
+        <Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
+        <Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
+        <Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
+        <Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
+        <Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
+        <Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
+        <Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
+        <Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
+        <Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
+        <Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fw.xml
new file mode 100644
index 0000000000..ee9821d263
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fw.xml
@@ -0,0 +1,106 @@
+<Root>
+    <File Name="object_fw" Segment="6">
+        <Texture Name="object_fwTex_007A90" OutName="object_fwTex_007A90" Format="i8" Width="16" Height="16" Offset="0x7A90" AddedByScript="true"/>
+        <!-- Flare Dancer Enflamed Skeleton -->
+        <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
+
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
+
+        <!-- Flare Dancer Enflamed DisplayLists -->
+        <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
+        <DList Name="gFlareDancerRightStiltDL" Offset="0x41B8"/>
+        <DList Name="gFlareDancerLowerRightLegDL" Offset="0x40C8"/>
+        <DList Name="gFlareDancerUpperLeftLegDL" Offset="0x4260"/>
+        <DList Name="gFlareDancerLeftStiltDL" Offset="0x4498"/>
+        <DList Name="gFlareDancerLowerLeftLegDL" Offset="0x4368"/>
+        <DList Name="gFlareDancerDressDL" Offset="0x4640"/>
+        <DList Name="gFlareDancerFuseDL" Offset="0x47B8"/>
+        <DList Name="gFlareDancerRightUpperArmDL" Offset="0x48C0"/>
+        <DList Name="gFlareDancerRightForearmDL" Offset="0x4A00"/>
+        <DList Name="gFlareDancerRightSwordDL" Offset="0x4B38"/>
+        <DList Name="gFlareDancerLeftUpperArmDL" Offset="0x4C98"/>
+        <DList Name="gFlareDancerLeftForearmDL" Offset="0x4DD8"/>
+        <DList Name="gFlareDancerLeftSwordDL" Offset="0x4F08"/>
+        <DList Name="gFlareDancerHeadDL" Offset="0x5058"/>
+        <DList Name="gFlareDancerTorsoDL" Offset="0x4540"/>
+        <DList Name="gFlareDancerUpperFireHairDL" Offset="0x5160"/>
+        <DList Name="gFlareDancerMiddleFireHair1DL" Offset="0x5248"/>
+        <DList Name="gFlareDancerMiddleFireHair2DL" Offset="0x5348"/>
+        <DList Name="gFlareDancerMiddleFireHair3DL" Offset="0x5448"/>
+        <DList Name="gFlareDancerLowerFireHairDL" Offset="0x5548"/>
+
+        <!-- Flare Dancer Core Skeleton -->
+        <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
+
+        <!-- Flare Dancer Core Limbs -->
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
+
+        <!-- Flare Dancer Core DisplayLists -->
+        <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
+        <DList Name="gFlareDancerCoreFuseDL" Offset="0x7510"/>
+        <DList Name="gFlareDancerCoreUpperRightLegDL" Offset="0x7618"/>
+        <DList Name="gFlareDancerCoreLowerRightLegDL" Offset="0x7680"/>
+        <DList Name="gFlareDancerCoreRightFootDL" Offset="0x7708"/>
+        <DList Name="gFlareDancerCoreUpperLeftLegDL" Offset="0x7790"/>
+        <DList Name="gFlareDancerCoreLowerLeftLegDL" Offset="0x77F8"/>
+        <DList Name="gFlareDancerCoreLeftFootDL" Offset="0x7880"/>
+
+        <!-- Particle DisplayLists -->
+        <DList Name="gFlareDancerDL_7928" Offset="0x7928"/>
+        <DList Name="gFlareDancerSquareParticleDL" Offset="0x7938"/>
+        <DList Name="gFlareDancerDL_79F8" Offset="0x79F8"/>
+        <DList Name="gFlareDancerTriangleParticleDL" Offset="0x7A78"/>
+
+        <!-- Flare Dancer DisplayList Textures -->
+        <Texture Name="gFlareDancerBlueFlameTex" OutName="blue_flame" Format="rgba16" Width="4" Height="4" Offset="0x10D0"/>
+        <Texture Name="gFlareDancerFireTex" OutName="fire" Format="i8" Width="32" Height="64" Offset="0x10F0"/>
+        <Texture Name="gFlareDancerFirePatternTex" OutName="fire_pattern" Format="i8" Width="32" Height="64" Offset="0x18F0"/>
+        <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
+        <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        
+        <!-- Flare Dancer Animations -->
+        <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
+        <Animation Name="gFlareDancerBackflipAnim" Offset="0x5C64"/>
+        <Animation Name="gFlareDancerGettingUpAnim" Offset="0x6044"/>
+        <Animation Name="gFlareDancerChasingAnim" Offset="0x6A18"/>
+        <Animation Name="gFlareDancerTwirlAnim" Offset="0x6B64"/>
+        <Animation Name="gFlareDancerCoreInitRunCycleAnim" Offset="0x6CF8"/>
+        <Animation Name="gFlareDancerCoreRunCycleAnim" Offset="0x7CD0"/>
+        <Animation Name="gFlareDancerCoreEndRunCycleAnim" Offset="0x7DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_fz.xml b/soh/assets/xml/N64_NTSC_12/objects/object_fz.xml
new file mode 100644
index 0000000000..dad6fec5ce
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_fz.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_fz" Segment="6">
+        <DList Name="gFreezardIntactDL" Offset="0x1130"/>
+        <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>
+        <DList Name="gFreezardHeadChippedDL" Offset="0x2CA0"/>
+        <DList Name="gFreezardSteamStartDL" Offset="0x30A0"/>
+        <DList Name="gFreezardSteamDL" Offset="0x3158"/>
+        <DList Name="gFreezardIceTriangleDL" Offset="0x3260"/>
+        <DList Name="gFreezardIceRockDL" Offset="0x33F0"/>
+        <Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon.xml
new file mode 100644
index 0000000000..c654c7fec9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for Ganondorf -->
+    <File Name="object_ganon" Segment="6">
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
+        <DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
+        <DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
+        <DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
+        <DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
+        <DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
+        <DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
+        <DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
+        <DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
+        <DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
+        <DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
+        <DList Name="gGanondorfJawDL" Offset="0x6460"/>
+        <DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
+        <DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
+        <DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
+        <DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
+        <DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
+        <DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
+        <DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
+        <DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
+        <DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
+
+        <!-- Ganondorf Textures -->
+        <Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
+        <Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
+        <Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
+        <Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
+        <Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
+        <Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
+        <Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
+        <Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
+        <Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
+        <Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
+        <Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
+        <Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
+        <Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
+        <Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
+        <Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
+        <Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
+        <Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
+        <Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
+        <Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
+        <Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
+        <Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
+        <Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
+        <Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
+        <Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
+
+        <!-- DisplayList for Ganondorf's eyes -->
+        <DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
+
+        <!-- Ganondorf Limb DisplayLists -->
+        <DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
+        <DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
+        <DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
+        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
+
+        <!-- Ganondorf Title Card Texture -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->
+
+        <!-- Ganondorf Animation -->
+        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
+
+        <!-- Ganondorf Limbs -->
+        <Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
+        <Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
+        <Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
+        <Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
+        <Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
+        <Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
+        <Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
+        <Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
+        <Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
+        <Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
+        <Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
+        <Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
+        <Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
+        <Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
+        <Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
+        <Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
+        <Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
+        <Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
+        <Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
+        <Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
+        <Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
+        <Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
+        <Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
+        <Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
+        <Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
+
+        <!-- Ganondorf Skeleton -->
+        <Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon2.xml
new file mode 100644
index 0000000000..7e715dd414
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon2.xml
@@ -0,0 +1,174 @@
+<Root>
+    <!-- Assets for Ganon -->
+    <File Name="object_ganon2" Segment="6">
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonFinalBlowAnim" Offset="0x3B1C"/> <!-- Original name is "Last_hit_motion1" -->
+        <Animation Name="gGanonDeadStartAnim" Offset="0x7288"/> <!-- Original name is "Last_hit_motion2" -->
+        <Animation Name="gGanonDeadLoopAnim" Offset="0x8EB8"/> <!-- Original name is "Last_mogaki" ("writhing") -->
+        <Animation Name="gGanonGuardToWalk" Offset="0x9654"/> <!-- Unused. Original name is "gn2_K_to_walk" -->
+        <Animation Name="gGanonLeftSwordSwingAnim" Offset="0xADD0"/> <!-- Original name is "gn2_Katack01L" -->
+        <Animation Name="gGanonRightSwordSwingAnim" Offset="0xCAF8"/> <!-- Original name is "gn2_Katack01R" -->
+        <Animation Name="gGanonDamageAnim" Offset="0xDFF0"/> <!-- Original name is "gn2_Kdamage" -->
+        <Animation Name="gGanonGuardWalkAnim" Offset="0xE8EC"/> <!-- Original name is "gn2_Kfrontwalk" -->
+        <Animation Name="gGanonGuardSidestepAnim" Offset="0xF1D0"/> <!-- Unused. Original name is "gn2_Ksidewalk" -->
+        <Animation Name="gGanonGuardIdleAnim" Offset="0xFFE4"/> <!-- Original name is "gn2_Kwait" -->
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonPelvisDL" Offset="0x163F0"/>
+        <DList Name="gGanonTail1DL" Offset="0x16630"/>
+        <DList Name="gGanonTail2DL" Offset="0x16740"/>
+        <DList Name="gGanonTail3DL" Offset="0x168E0"/>
+        <DList Name="gGanonTail4DL" Offset="0x16AA8"/>
+        <DList Name="gGanonTail5DL" Offset="0x16BE8"/>
+        <DList Name="gGanonRightShinDL" Offset="0x16D10"/>
+        <DList Name="gGanonRightFootDL" Offset="0x16F80"/>
+        <DList Name="gGanonRightThighDL" Offset="0x17160"/>
+        <DList Name="gGanonLeftShinDL" Offset="0x17620"/>
+        <DList Name="gGanonLeftFootDL" Offset="0x17910"/>
+        <DList Name="gGanonLeftThighDL" Offset="0x17AF0"/>
+        <DList Name="gGanonNeckDL" Offset="0x17FB0"/>
+        <DList Name="gGanonHeadDL" Offset="0x180E0"/>
+        <DList Name="gGanonRightHair3DL" Offset="0x18650"/>
+        <DList Name="gGanonRightHair2DL" Offset="0x18740"/>
+        <DList Name="gGanonRightHair1DL" Offset="0x18828"/>
+        <DList Name="gGanonLeftHair3DL" Offset="0x188D8"/>
+        <DList Name="gGanonLeftHair2DL" Offset="0x189C8"/>
+        <DList Name="gGanonLeftHair1DL" Offset="0x18AB0"/>
+        <DList Name="gGanonJawDL" Offset="0x18B60"/>
+        <DList Name="gGanonMouthDL" Offset="0x18EA0"/>
+        <DList Name="gGanonSnoutDL" Offset="0x19210"/>
+        <DList Name="gGanonMiddleHair3DL" Offset="0x19330"/>
+        <DList Name="gGanonMiddleHair2DL" Offset="0x19420"/>
+        <DList Name="gGanonMiddleHair1DL" Offset="0x19510"/>
+        <DList Name="gGanonTorsoDL" Offset="0x195C0"/>
+        <DList Name="gGanonRightShoulderDL" Offset="0x19A40"/>
+        <DList Name="gGanonRightForearmDL" Offset="0x19C68"/>
+        <DList Name="gGanonRightWristDL" Offset="0x19F48"/>
+        <DList Name="gGanonRightUpperArmDL" Offset="0x1A050"/>
+        <DList Name="gGanonLeftShoulderDL" Offset="0x1A4E0"/>
+        <DList Name="gGanonLeftForearmDL" Offset="0x1A708"/>
+        <DList Name="gGanonLeftWristDL" Offset="0x1A9E8"/>
+        <DList Name="gGanonLeftUpperArmDL" Offset="0x1AAF0"/>
+
+        <!-- Ganon Textures -->
+        <Texture Name="gGanonBodyTLUT" OutName="ganon_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gGanonHairFringeTLUT" OutName="ganon_hair_fringe_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gGanonUnusedTLUT" OutName="ganon_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B380"/>
+        <Texture Name="gGanonGerudoFabricTLUT" OutName="ganon_gerudo_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gGanonRedFabricTLUT" OutName="ganon_red_fabric_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherAndPauldronTLUT" OutName="ganon_black_metal_and_pauldron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gGanonLeatherTLUT" OutName="ganon_leather_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gGanonHoofTLUT" OutName="ganon_hoof_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gGanonTailTLUT" OutName="ganon_tail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gGanonHairTex" OutName="ganon_hair" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
+        <Texture Name="gGanonMouthTex" OutName="ganon_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
+        <Texture Name="gGanonFacialHairTex" OutName="ganon_facial_hair" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
+        <Texture Name="gGanonBodyTex" OutName="ganon_body" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
+        <Texture Name="gGanonSnoutFrontTex" OutName="ganon_snout_front" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
+        <Texture Name="gGanonSnoutSideTex" OutName="ganon_snout_side" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
+        <Texture Name="gGanonHairFringeTex" OutName="ganon_hair_fringe" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
+        <Texture Name="gGanonGerudoFabricTex" OutName="ganon_gerudo_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
+        <Texture Name="gGanonFurTuftTex" OutName="ganon_fur_tuft" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gGanonRedFabricTex" OutName="ganon_red_fabric" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonPauldronTex" OutName="ganon_pauldron" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonCapeFasteningTex" OutName="ganon_cape_fastening" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
+        <Texture Name="gGanonBlackLeatherTex" OutName="ganon_black_leather" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
+        <Texture Name="gGanonLeatherTex" OutName="ganon_leather" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
+        <Texture Name="gGanonHoofTex" OutName="ganon_hoof" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
+        <Texture Name="gGanonUnderSkirtTex" OutName="ganon_under_skirt" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
+        <Texture Name="gGanonTailTex" OutName="ganon_tail" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
+        <Texture Name="gGanonEyesTLUT" OutName="ganon_eyes_tlut" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
+        <Texture Name="gGanonHandTLUT" OutName="ganon_hand_tlut" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
+        <Texture Name="gGanonHandTex" OutName="ganon_hand" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
+        <Texture Name="gGanonJewelTex" OutName="ganon_jewel" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
+        <Texture Name="gGanonClawAndTeethTex" OutName="ganon_claw_and_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
+        <Texture Name="gGanonEyeOpenTex" OutName="ganon_eye_open" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonLipsTex" OutName="ganon_lips" Format="rgba16" Width="8" Height="8" Offset="0x1E208"/>
+        <Texture Name="gGanonHornBaseTex" OutName="ganon_horn_base" Format="rgba16" Width="16" Height="16" Offset="0x1E288"/>
+        <Texture Name="gGanonHornTex" OutName="ganon_horn" Format="rgba16" Width="16" Height="8" Offset="0x1E488"/>
+        <Texture Name="gGanonSwordBladeTex" OutName="ganon_sword_blade" Format="i4" Width="32" Height="32" Offset="0x1E588"/>
+        <Texture Name="gGanonSwordGuardTex" OutName="ganon_sword_guard" Format="rgba16" Width="8" Height="16" Offset="0x1E788"/>
+        <Texture Name="gGanonSwordGripTex" OutName="ganon_sword_grip" Format="rgba16" Width="8" Height="16" Offset="0x1E888"/>
+        <Texture Name="gGanonEyeHalfTex" OutName="ganon_eye_half" Format="ci4" Width="16" Height="16" Offset="0x1E988" TlutOffset="0x1D780"/>
+        <Texture Name="gGanonEyeClosedTex" OutName="ganon_eye_closed" Format="ci4" Width="16" Height="16" Offset="0x1EA08" TlutOffset="0x1D780"/>
+
+        <!-- Ganon Limb DisplayLists -->
+        <DList Name="gGanonEyesDL" Offset="0x20B18"/>
+        <DList Name="gGanonJewelDL" Offset="0x20BE0"/>
+        <DList Name="gGanonRightHornDL" Offset="0x20C80"/>
+        <DList Name="gGanonLeftHornDL" Offset="0x20DE8"/>
+        <DList Name="gGanonRightHandDL" Offset="0x20F50"/>
+        <DList Name="gGanonLeftHandDL" Offset="0x21120"/>
+        <DList Name="gGanonRightSwordDL" Offset="0x212F0"/>
+        <DList Name="gGanonLeftSwordDL" Offset="0x215D0"/>
+        <DList Name="gGanonOuterTeethDL" Offset="0x218B8"/>
+        <DList Name="gGanonInnerTeethDL" Offset="0x219D8"/>
+
+        <!-- Ganon Title Card Texture -->
+        <Texture Name="gGanonTitleCardTex" OutName="ganon_title_card" Format="ia8" Width="128" Height="120" Offset="0x21A90"/>
+
+        <!-- Ganon Limbs -->
+        <Limb Name="gGanonRootLimb" LimbType="Standard" Offset="0x24290"/>
+        <Limb Name="gGanonTorsoLimb" LimbType="Standard" Offset="0x2429C"/>
+        <Limb Name="gGanonLeftShoulderLimb" LimbType="Standard" Offset="0x242A8"/>
+        <Limb Name="gGanonLeftUpperArmLimb" LimbType="Standard" Offset="0x242B4"/>
+        <Limb Name="gGanonLeftForearmLimb" LimbType="Standard" Offset="0x242C0"/>
+        <Limb Name="gGanonLeftWristLimb" LimbType="Standard" Offset="0x242CC"/>
+        <Limb Name="gGanonLeftSwordLimb" LimbType="Standard" Offset="0x242D8"/>
+        <Limb Name="gGanonLeftHandLimb" LimbType="Standard" Offset="0x242E4"/>
+        <Limb Name="gGanonRightShoulderLimb" LimbType="Standard" Offset="0x242F0"/>
+        <Limb Name="gGanonRightUpperArmLimb" LimbType="Standard" Offset="0x242FC"/>
+        <Limb Name="gGanonRightForearmLimb" LimbType="Standard" Offset="0x24308"/>
+        <Limb Name="gGanonRightWristLimb" LimbType="Standard" Offset="0x24314"/>
+        <Limb Name="gGanonRightSwordLimb" LimbType="Standard" Offset="0x24320"/>
+        <Limb Name="gGanonRightHandLimb" LimbType="Standard" Offset="0x2432C"/>
+        <Limb Name="gGanonNeckLimb" LimbType="Standard" Offset="0x24338"/>
+        <Limb Name="gGanonJewelLimb" LimbType="Standard" Offset="0x24344"/>
+        <Limb Name="gGanonSnoutLimb" LimbType="Standard" Offset="0x24350"/>
+        <Limb Name="gGanonOuterTeethLimb" LimbType="Standard" Offset="0x2435C"/>
+        <Limb Name="gGanonMouthLimb" LimbType="Standard" Offset="0x24368"/>
+        <Limb Name="gGanonInnerTeethLimb" LimbType="Standard" Offset="0x24374"/>
+        <Limb Name="gGanonJawLimb" LimbType="Standard" Offset="0x24380"/>
+        <Limb Name="gGanonMiddleHair1Limb" LimbType="Standard" Offset="0x2438C"/>
+        <Limb Name="gGanonMiddleHair2Limb" LimbType="Standard" Offset="0x24398"/>
+        <Limb Name="gGanonMiddleHair3Limb" LimbType="Standard" Offset="0x243A4"/>
+        <Limb Name="gGanonLeftHair1Limb" LimbType="Standard" Offset="0x243B0"/>
+        <Limb Name="gGanonLeftHair2Limb" LimbType="Standard" Offset="0x243BC"/>
+        <Limb Name="gGanonLeftHair3Limb" LimbType="Standard" Offset="0x243C8"/>
+        <Limb Name="gGanonRightHair1Limb" LimbType="Standard" Offset="0x243D4"/>
+        <Limb Name="gGanonRightHair2Limb" LimbType="Standard" Offset="0x243E0"/>
+        <Limb Name="gGanonRightHair3Limb" LimbType="Standard" Offset="0x243EC"/>
+        <Limb Name="gGanonEyesLimb" LimbType="Standard" Offset="0x243F8"/>
+        <Limb Name="gGanonHeadLimb" LimbType="Standard" Offset="0x24404"/>
+        <Limb Name="gGanonLeftHornLimb" LimbType="Standard" Offset="0x24410"/>
+        <Limb Name="gGanonRightHornLimb" LimbType="Standard" Offset="0x2441C"/>
+        <Limb Name="gGanonPelvisLimb" LimbType="Standard" Offset="0x24428"/>
+        <Limb Name="gGanonLeftThighLimb" LimbType="Standard" Offset="0x24434"/>
+        <Limb Name="gGanonLeftShinLimb" LimbType="Standard" Offset="0x24440"/>
+        <Limb Name="gGanonLeftFootLimb" LimbType="Standard" Offset="0x2444C"/>
+        <Limb Name="gGanonRightThighLimb" LimbType="Standard" Offset="0x24458"/>
+        <Limb Name="gGanonRightShinLimb" LimbType="Standard" Offset="0x24464"/>
+        <Limb Name="gGanonRightFootLimb" LimbType="Standard" Offset="0x24470"/>
+        <Limb Name="gGanonTail1Limb" LimbType="Standard" Offset="0x2447C"/>
+        <Limb Name="gGanonTail2Limb" LimbType="Standard" Offset="0x24488"/>
+        <Limb Name="gGanonTail3Limb" LimbType="Standard" Offset="0x24494"/>
+        <Limb Name="gGanonTail4Limb" LimbType="Standard" Offset="0x244A0"/>
+        <Limb Name="gGanonTail5Limb" LimbType="Standard" Offset="0x244AC"/>
+
+        <!-- Ganon Skeleton -->
+        <Skeleton Name="gGanonSkel" Type="Flex" LimbType="Standard" Offset="0x24570"/>
+
+        <!-- Ganon Animations -->
+        <Animation Name="gGanonStunStartAnim" Offset="0x25110"/> <!-- Original name is "gn2_Lhit" -->
+        <Animation Name="gGanonStunLoopAnim" Offset="0x256F4"/> <!-- Original name is "gn2_Lmahi" ("paralysis, stupor") -->
+        <Animation Name="gGanonStunEndAnim" Offset="0x26424"/> <!-- Original name is "gn2_Lmahi_to_K" -->
+        <Animation Name="gGanonDownedStartAnim" Offset="0x29448"/> <!-- Original name is "gn2_downDEMO" -->
+        <Animation Name="gGanonStunEndToWalkAnim" Offset="0x2A128"/> <!-- Unused, similar to gGanonStunEndAnim. Transitions into walk instead of guard. -->
+        <Animation Name="gGanonDuplicateStunStartAnim" Offset="0x2ACD0"/> <!-- Unused duplicate of gGanonStunStartAnim -->
+        <Animation Name="gGanonDuplicateStunLoopAnim" Offset="0x2B2B4"/> <!-- Unused duplicate of gGanonStunLoopAnim -->
+        <Animation Name="gGanonGetUpAnim" Offset="0x320F8"/> <!-- Original name is "gn2_hukkiDEMO" ("return, comeback") -->
+        <Animation Name="gGanonDownedLoopAnim" Offset="0x32E78"/> <!-- Original name is "gn2_mahiDEMO" -->
+        <Animation Name="gGanonWalkAnim" Offset="0x33FC0"/> <!-- Original name is "gn2_walk" -->
+        <Animation Name="gGanonWalkToGuardAnim" Offset="0x347DC"/> <!-- Unused. Original name is "gn2_walk_to_K" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime1.xml
new file mode 100644
index 0000000000..b1016299bc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime1.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_ganon_anime1" Segment="6">
+        <Animation Name="gGanondorfBigMagicWindupAnim" Offset="0x0540"/>
+        <Animation Name="gGanondorfBigMagicThrowAnim" Offset="0x0FE8"/>
+        <Animation Name="gGanondorfBigMagicThrowEndAnim" Offset="0x1440"/>
+        <Animation Name="gGanondorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
+        <Animation Name="gGanondorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
+        <Animation Name="gGanondorfPoundAnim" Offset="0x2D2C"/>
+        <Animation Name="gGanondorfPoundEndAnim" Offset="0x343C"/>
+        <Animation Name="gGanondorfDownedAnim" Offset="0x3D40"/>
+        <Animation Name="gGanondorfLightArrowHitAnim" Offset="0x4884"/>
+        <Animation Name="gGanondorfLightEnergyHitAnim" Offset="0x4DA8"/>
+        <Animation Name="gGanondorfGetUp1Anim" Offset="0x58C4"/>
+        <Animation Name="gGanondorfGetUp2Anim" Offset="0x6028"/>
+        <Animation Name="gGanondorfLandAnim" Offset="0x63CC"/>
+        <Animation Name="gGanondorfVulnerableAnim" Offset="0x69A0"/>
+        <Animation Name="gGanondorfThrowAnim" Offset="0x738C"/>
+        <Animation Name="gGanondorfBigMagicHitAnim" Offset="0x8128"/>
+        <Animation Name="gGanondorfGetUp3Anim" Offset="0x8A88"/>
+        <Animation Name="gGanondorfLightArrowWaitAnim" Offset="0x8F44"/>
+        <Animation Name="gGanondorfDamageAnim" Offset="0x96B0"/>
+        <Animation Name="gGanondorfFloatAnim" Offset="0x9A14"/>
+        <Animation Name="gGanondorfBlockAnim" Offset="0x9D5C"/>
+        <Animation Name="gGanondorfBlockReleaseAnim" Offset="0xA598"/>
+        <Animation Name="gGanondorfChargeLightBallAnim" Offset="0xAA24"/>
+        <Animation Name="gGanondorfVolleyLeftAnim" Offset="0xB4AC"/>
+        <Animation Name="gGanondorfVolleyRightAnim" Offset="0xBC28"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime2.xml
new file mode 100644
index 0000000000..180e5995c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime2.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="object_ganon_anime2" Segment="6">
+        <Animation Name="gGanondorfTurnAroundAnim" Offset="0x1F58"/>
+        <Animation Name="gGanondorfStandIdleAnim" Offset="0x3018"/>
+        <Animation Name="gGanondorfStandUpFromOrganAnim" Offset="0x4304"/>
+        <Animation Name="gGanondorfStopPlayingOrganAnim" Offset="0x4F64"/>
+        <Animation Name="gGanondorfPlayOrganAnim" Offset="0x5FFC"/>
+        <Animation Name="gGanondorfLeanOnOrganAnim" Offset="0x6AF4"/>
+        <Animation Name="gGanondorfRaiseHandStartAnim" Offset="0x7268"/>
+        <Animation Name="gGanondorfRaiseHandLoopAnim" Offset="0x7A64"/>
+        <Animation Name="gGanondorfStandBackwardsAnim" Offset="0x89F8"/>
+        <Animation Name="gGanondorfLaughWhileLeaningAnim" Offset="0x9AE0"/>
+        <Animation Name="gGanondorfCollapseAnim" Offset="0xADDC"/>
+        <Animation Name="gGanondorfVomitStartAnim" Offset="0xB668"/>
+        <Animation Name="gGanondorfVomitLoopAnim" Offset="0xBE38"/>
+        <Animation Name="gGanondorfDefeatedStartAnim" Offset="0xEA00"/>
+        <Animation Name="gGanondorfDefeatedLoopAnim" Offset="0xF19C"/>
+        <Animation Name="gGanondorfYellStartAnim" Offset="0x10298"/>
+        <Animation Name="gGanondorfYellLoopAnim" Offset="0x10514"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime3.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime3.xml
new file mode 100644
index 0000000000..be4c4dcb15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_anime3.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_ganon_anime3" Segment="6">
+        <Animation Name="gGanondorfShowTriforceStartAnim" Offset="0xBFC"/>
+        <Animation Name="gGanondorfBurstOutAnim" Offset="0x2168"/>
+        <Animation Name="gGanondorfTransformEndAnim" Offset="0x28A8"/>
+        <Animation Name="gGanondorfFloatingHeavyBreathingAnim" Offset="0x2E6C"/>
+        <Animation Name="gGanondorfTransformStartAnim" Offset="0x3754"/>
+        <Animation Name="gGanondorfTransformLoopAnim" Offset="0x3884"/>
+        <Animation Name="gGanondorfShowTriforceLoopAnim" Offset="0x3F38"/>
+        <Animation Name="gGanonUncurlAndFlailAnim" Offset="0x10380"/>
+        <Animation Name="gGanonRoarAnim" Offset="0x147E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ganon_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_objects.xml
new file mode 100644
index 0000000000..5e32610ffc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ganon_objects.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ganon_objects" Segment="6">
+        <DList Name="object_ganon_objects_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ganon_objects_Tex_000170" OutName="tex_00000170" Format="rgba16" Width="32" Height="64" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ge1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ge1.xml
new file mode 100644
index 0000000000..79e0768b81
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ge1.xml
@@ -0,0 +1,78 @@
+<Root>
+    <File Name="object_ge1" Segment="6">
+
+        <!-- White-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
+
+        <!-- White-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
+
+        <!-- White-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
+        <DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
+        <DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
+        <DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
+        <DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
+        <DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
+        <DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
+        <DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
+        <DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
+        <DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
+        <DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
+        <DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
+        <DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
+        <DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
+        <DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>
+
+        <!-- White-clothed Gerudo palettes -->
+        <Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0348"/>
+        <Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
+
+        <!-- White-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
+        <Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
+
+        <!-- White-clothed Gerudo Hairstyle DisplayLists -->
+        <DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
+        <DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
+        <DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
+
+        <!-- White-clothed Gerudo Hair textures -->
+        <Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
+        
+        <!-- White-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>
+        <Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x0F08"/>
+        <Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1708"/>
+
+        <!-- White-clothed Gerudo Animations -->
+        <Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
+        <Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
+        <Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
+        <Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_geff.xml b/soh/assets/xml/N64_NTSC_12/objects/object_geff.xml
new file mode 100644
index 0000000000..f0667743b0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_geff.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_geff" Segment="6">
+        <Texture Name="gGanonRubbleInsideTex" OutName="inside" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGanonRubbleOutsideTex" OutName="outside" Format="i8" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gGanonRubbleDL" Offset="0xEA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_geldb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_geldb.xml
new file mode 100644
index 0000000000..49b12ef2e5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_geldb.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_geldb" Segment="6">
+        <Texture Name="object_geldbTex_002700" OutName="object_geldbTex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002740" OutName="object_geldbTex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002780" OutName="object_geldbTex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002880" OutName="object_geldbTex_002880" Format="i8" Width="16" Height="16" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002980" OutName="object_geldbTex_002980" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002A80" OutName="object_geldbTex_002A80" Format="i8" Width="16" Height="16" Offset="0x2A80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_002B80" OutName="object_geldbTex_002B80" Format="i8" Width="8" Height="16" Offset="0x2B80" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_005F68" OutName="object_geldbTex_005F68" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0063E8" OutName="object_geldbTex_0063E8" Format="i8" Width="16" Height="16" Offset="0x63E8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0064E8" OutName="object_geldbTex_0064E8" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006568" OutName="object_geldbTex_006568" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_0069A8" OutName="object_geldbTex_0069A8" Format="i8" Width="8" Height="16" Offset="0x69A8" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006A28" OutName="object_geldbTex_006A28" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006B28" OutName="object_geldbTex_006B28" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTex_006C28" OutName="object_geldbTex_006C28" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30" AddedByScript="true"/>
+        <Texture Name="object_geldbTLUT_002500" OutName="object_geldbTLUT_002500" Format="rgba16" Width="16" Height="16" Offset="0x2500" AddedByScript="true"/>
+        <!-- Red-clothed Gerudo skeleton -->
+        <Skeleton Name="gGerudoRedSkel" Type="Flex" LimbType="Standard" Offset="0xA458"/>
+
+        <!-- Red-clothed Gerudo animations -->
+        <Animation Name="gGerudoRedJumpAnim" Offset="0xADF8"/>
+        <Animation Name="gGerudoRedNeutralAnim" Offset="0xB6D4"/>
+        <Animation Name="gGerudoRedSidestepAnim" Offset="0xA814"/>
+        <Animation Name="gGerudoRedFlipAnim" Offset="0x1390"/>
+        <Animation Name="gGerudoRedWalkAnim" Offset="0x24E8"/>
+        <Animation Name="gGerudoRedSlashAnim" Offset="0x03CC"/>
+        <Animation Name="gGerudoRedSpinAttackAnim" Offset="0x0F5C"/>
+        <Animation Name="gGerudoRedDamageAnim" Offset="0x2280"/>
+        <Animation Name="gGerudoRedDefeatAnim" Offset="0x1E10"/>
+        <Animation Name="gGerudoRedBlockAnim" Offset="0x1578"/>
+        <Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
+
+        <!-- Red-clothed Gerudo eye textures -->
+        <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
+        <Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
+
+        <!-- These hints are currently needed for ZAPD to extract the textures properly. -->
+        <Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
+        <Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrow.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrow.xml
new file mode 100644
index 0000000000..4b58787a9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrow.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_arrow" Segment="6">
+        <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
+        <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>
+        <DList Name="gGiArrowLargeDL" Offset="0x1830"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrowcase.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrowcase.xml
new file mode 100644
index 0000000000..267b0a734d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_arrowcase.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_arrowcase" Segment="6">
+        <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
+        <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>
+        <DList Name="gGiQuiver50InnerColorDL" Offset="0x0910"/>
+        <DList Name="gGiQuiver30OuterColorDL" Offset="0x0930"/>
+        <DList Name="gGiQuiver40OuterColorDL" Offset="0x0950"/>
+        <DList Name="gGiQuiver50OuterColorDL" Offset="0x0970"/>
+        <DList Name="gGiQuiverInnerDL" Offset="0x0990"/>
+        <DList Name="gGiQuiverOuterDL" Offset="0x0A80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bean.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bean.xml
new file mode 100644
index 0000000000..e74247816f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bean.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bean" Segment="6">
+        <DList Name="gGiBeanDL" Offset="0x0580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_1.xml
new file mode 100644
index 0000000000..bae86c11d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_1" Segment="6">
+        <DList Name="gGiBombDL" Offset="0x09A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_2.xml
new file mode 100644
index 0000000000..1400c4a4d4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bomb_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bomb_2" Segment="6">
+        <DList Name="gGiBombchuDL" Offset="0x04B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bombpouch.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bombpouch.xml
new file mode 100644
index 0000000000..07134748c3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bombpouch.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_gi_bombpouch" Segment="6">
+        <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBombBag40BagColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBombBag20RingColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBombBag30RingColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBombBag40RingColorDL" Offset="0x0B70"/>
+        <DList Name="gGiBombBagDL" Offset="0x0B90"/>
+        <DList Name="gGiBombBagRingDL" Offset="0x0D98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_boomerang.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_boomerang.xml
new file mode 100644
index 0000000000..3c1a0fe7fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_boomerang.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_boomerang" Segment="6">
+        <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_boots_2.xml
new file mode 100644
index 0000000000..3bcb6a47ae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_boots_2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2Tex_000000" OutName="object_gi_boots_2Tex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiIronBootsDL" Offset="0x1630"/>
+        <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bosskey.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bosskey.xml
new file mode 100644
index 0000000000..e5e4bc86c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bosskey.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bosskey" Segment="6">
+        <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
+        <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle.xml
new file mode 100644
index 0000000000..3b0884a03f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle" Segment="6">
+        <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
+        <DList Name="gGiBottleDL" Offset="0x0750"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle_letter.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle_letter.xml
new file mode 100644
index 0000000000..443219caf5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bottle_letter.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_bottle_letter" Segment="6">
+        <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
+        <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bow.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bow.xml
new file mode 100644
index 0000000000..946e9c4965
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bow.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bow" Segment="6">
+        <DList Name="gGiBowDL" Offset="0x0990"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_bracelet.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bracelet.xml
new file mode 100644
index 0000000000..5a0b62a60a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_bracelet.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_bracelet" Segment="6">
+        <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_brokensword.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_brokensword.xml
new file mode 100644
index 0000000000..408741ac54
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_brokensword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_brokensword" Segment="6">
+        <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_butterfly.xml
new file mode 100644
index 0000000000..7b60a77247
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_butterfly.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterflyTex_000000" OutName="object_gi_butterflyTex_000000" Format="ia4" Width="24" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
+        <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_clothes.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_clothes.xml
new file mode 100644
index 0000000000..3f897b6d13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_clothes.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothesTex_000000" OutName="object_gi_clothesTex_000000" Format="i4" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronCollarColorDL" Offset="0x14E0"/>
+        <DList Name="gGiZoraCollarColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoronTunicColorDL" Offset="0x1520"/>
+        <DList Name="gGiZoraTunicColorDL" Offset="0x1540"/>
+        <DList Name="gGiTunicCollarDL" Offset="0x1560"/>
+        <DList Name="gGiTunicDL" Offset="0x1608"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_coin.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_coin.xml
new file mode 100644
index 0000000000..22e29f255f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_coin.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_coin" Segment="6">
+        <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>
+        <DList Name="gGiGreenCoinColorDL" Offset="0x05A0"/>
+        <DList Name="gGiBlueCoinColorDL" Offset="0x05C0"/>
+        <DList Name="gGiCoinDL" Offset="0x05E0"/>
+        <DList Name="gGiNDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_compass.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_compass.xml
new file mode 100644
index 0000000000..076229b11e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_compass.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_compass" Segment="6">
+        <DList Name="gGiCompassDL" Offset="0x0960"/>
+        <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_dekupouch.xml
new file mode 100644
index 0000000000..8925e6fa5f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_dekupouch.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouchTex_000000" OutName="object_gi_dekupouchTex_000000" Format="i4" Width="32" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_dekupouchTex_000100" OutName="object_gi_dekupouchTex_000100" Format="i4" Width="32" Height="32" Offset="0x100" AddedByScript="true"/>
+        <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
+        <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>
+        <DList Name="gGiBulletBagStringColorDL" Offset="0x0B30"/>
+        <DList Name="gGiBulletBag50StringColorDL" Offset="0x0B50"/>
+        <DList Name="gGiBulletBagDL" Offset="0x0B70"/>
+        <DList Name="gGiBulletBagStringDL" Offset="0x0F48"/>
+        <DList Name="gGiBulletBagWritingDL" Offset="0x0FF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_egg.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_egg.xml
new file mode 100644
index 0000000000..2b2e2847db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_egg.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_egg" Segment="6">
+        <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
+        <DList Name="gGiEggDL" Offset="0x1008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_eye_lotion.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_eye_lotion.xml
new file mode 100644
index 0000000000..5128c5f6ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_eye_lotion.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_eye_lotion" Segment="6">
+        <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
+        <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_fire.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_fire.xml
new file mode 100644
index 0000000000..4bfd76a7c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_fire.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fireTex_000000" OutName="object_gi_fireTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_fireTex_000200" OutName="object_gi_fireTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
+        <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_fish.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_fish.xml
new file mode 100644
index 0000000000..edb39dc297
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_fish.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_fish" Segment="6">
+        <DList Name="gGiFishDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_frog.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_frog.xml
new file mode 100644
index 0000000000..a656c306bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_frog.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frogTex_000000" OutName="object_gi_frogTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFrogDL" Offset="0x0D60"/>
+        <DList Name="gGiFrogEyesDL" Offset="0x1060"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudo.xml
new file mode 100644
index 0000000000..d65daee8e0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudoTex_000000" OutName="object_gi_gerudoTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudomask.xml
new file mode 100644
index 0000000000..cfcb878d9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gerudomask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomaskTex_000208" OutName="object_gi_gerudomaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000248" OutName="object_gi_gerudomaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000348" OutName="object_gi_gerudomaskTex_000348" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTex_000448" OutName="object_gi_gerudomaskTex_000448" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_gerudomaskTLUT_000000" OutName="object_gi_gerudomaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_ghost.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ghost.xml
new file mode 100644
index 0000000000..795f0cfd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ghost.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghostTex_000000" OutName="object_gi_ghostTex_000000" Format="i8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ghostTex_000200" OutName="object_gi_ghostTex_000200" Format="i8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <DList Name="gGiPoeColorDL" Offset="0x0950"/>
+        <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>
+        <DList Name="gGiGhostContainerLidDL" Offset="0x0990"/>
+        <DList Name="gGiGhostContainerGlassDL" Offset="0x0BE0"/>
+        <DList Name="gGiGhostContainerContentsDL" Offset="0x0CF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_glasses.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_glasses.xml
new file mode 100644
index 0000000000..63d32ab5ac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_glasses.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_glasses" Segment="6">
+        <DList Name="gGiLensDL" Offset="0x0D80"/>
+        <DList Name="gGiLensGlassDL" Offset="0x1010"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_gloves.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gloves.xml
new file mode 100644
index 0000000000..0e1c4259d5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_gloves.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_glovesTex_000000" OutName="object_gi_glovesTex_000000" Format="i8" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
+        <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>
+        <DList Name="gGiSilverGauntletsPlateColorDL" Offset="0x1500"/>
+        <DList Name="gGiGoldenGauntletsPlateColorDL" Offset="0x1520"/>
+        <DList Name="gGiGauntletsDL" Offset="0x1540"/>
+        <DList Name="gGiGauntletsPlateDL" Offset="0x1860"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_goddess.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_goddess.xml
new file mode 100644
index 0000000000..50cbdd8918
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_goddess.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_goddess" Segment="6">
+        <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
+        <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>
+        <DList Name="gGiFaroresWindColorDL" Offset="0x0A00"/>
+        <DList Name="gGiNayrusLoveColorDL" Offset="0x0A20"/>
+        <DList Name="gGiMagicSpellOrbDL" Offset="0x0A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_golonmask.xml
new file mode 100644
index 0000000000..844d90e714
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_golonmask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmaskTex_000208" OutName="object_gi_golonmaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000248" OutName="object_gi_golonmaskTex_000248" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000348" OutName="object_gi_golonmaskTex_000348" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTex_000748" OutName="object_gi_golonmaskTex_000748" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_golonmaskTLUT_000000" OutName="object_gi_golonmaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiGoronMaskDL" Offset="0x14F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_grass.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_grass.xml
new file mode 100644
index 0000000000..ae7834201a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_grass.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_grass" Segment="6">
+        <DList Name="gGiGrassDL" Offset="0x08E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_hammer.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hammer.xml
new file mode 100644
index 0000000000..feb5c8659d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hammer.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_hammer" Segment="6">
+        <DList Name="gGiHammerDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_heart.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_heart.xml
new file mode 100644
index 0000000000..48e78b1b5c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_heart.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_heart" Segment="6">
+        <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_hearts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hearts.xml
new file mode 100644
index 0000000000..d2e763e631
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hearts.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hearts" Segment="6">
+        <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
+        <DList Name="gGiHeartContainerDL" Offset="0x1470"/>
+        <DList Name="gGiHeartPieceDL" Offset="0x1590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_hookshot.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hookshot.xml
new file mode 100644
index 0000000000..a6b3b0fdac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hookshot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_hookshot" Segment="6">
+        <DList Name="gGiHookshotDL" Offset="0x0750"/>
+        <DList Name="gGiLongshotDL" Offset="0x1240"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hoverboots.xml
new file mode 100644
index 0000000000..6d41df8fd0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_hoverboots.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverbootsTex_000000" OutName="object_gi_hoverbootsTex_000000" Format="ia4" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_hoverbootsTex_000300" OutName="object_gi_hoverbootsTex_000300" Format="i4" Width="16" Height="32" Offset="0x300" AddedByScript="true"/>
+        <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_insect.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_insect.xml
new file mode 100644
index 0000000000..7af5b5b3b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_insect.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_insect" Segment="6">
+        <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
+        <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_jewel.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_jewel.xml
new file mode 100644
index 0000000000..e83c651164
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_jewel.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_gi_jewel" Segment="6">
+        <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>
+        <DList Name="gGiKokiriEmeraldGemDL" Offset="0x1240"/>
+
+        <Texture Name="gGiGoronRubyScintillationTex" OutName="goron_ruby_scintillation" Format="i8" Width="32" Height="64" Offset="0x13E0"/>
+        <DList Name="gGiGoronRubySettingDL" Offset="0x1FB0"/>
+        <DList Name="gGiGoronRubyGemDL" Offset="0x20A0"/>
+
+        <Texture Name="gGiZoraSapphireScintillationTex" OutName="zora_sapphire_scintillation" Format="i4" Width="64" Height="64" Offset="0x21F0"/>
+        <DList Name="gGiZoraSapphireSettingDL" Offset="0x3370"/>
+        <DList Name="gGiZoraSapphireGemDL" Offset="0x3530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_key.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_key.xml
new file mode 100644
index 0000000000..a37d45a71c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_key.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_key" Segment="6">
+        <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ki_tan_mask.xml
new file mode 100644
index 0000000000..46eff7d3e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ki_tan_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_maskTex_000000" OutName="object_gi_ki_tan_maskTex_000000" Format="ia8" Width="8" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
+        <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_letter.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_letter.xml
new file mode 100644
index 0000000000..bea8683390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_letter.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letterTex_000000" OutName="object_gi_letterTex_000000" Format="i8" Width="48" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_letterTex_000600" OutName="object_gi_letterTex_000600" Format="ia8" Width="48" Height="32" Offset="0x600" AddedByScript="true"/>
+        <DList Name="gGiLetterDL" Offset="0x0CC0"/>
+        <DList Name="gGiLetterWritingDL" Offset="0x0D60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_liquid.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_liquid.xml
new file mode 100644
index 0000000000..18a5c3d7a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_liquid.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquidTex_000000" OutName="object_gi_liquidTex_000000" Format="ia8" Width="16" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000200" OutName="object_gi_liquidTex_000200" Format="ia8" Width="16" Height="32" Offset="0x200" AddedByScript="true"/>
+        <Texture Name="object_gi_liquidTex_000400" OutName="object_gi_liquidTex_000400" Format="ia8" Width="16" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
+        <DList Name="gGiRedPotColorDL" Offset="0x1290"/>
+        <DList Name="gGiBluePotColorDL" Offset="0x12B0"/>
+        <DList Name="gGiGreenLiquidColorDL" Offset="0x12D0"/>
+        <DList Name="gGiRedLiquidColorDL" Offset="0x12F0"/>
+        <DList Name="gGiBlueLiquidColorDL" Offset="0x1310"/>
+        <DList Name="gGiGreenPatternColorDL" Offset="0x1330"/>
+        <DList Name="gGiRedPatternColorDL" Offset="0x1388"/>
+        <DList Name="gGiBluePatternColorDL" Offset="0x13E0"/>
+        <DList Name="gGiPotionPotDL" Offset="0x1438"/>
+        <DList Name="gGiPotionLiquidDL" Offset="0x1790"/>
+        <DList Name="gGiPotionPatternDL" Offset="0x1848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_longsword.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_longsword.xml
new file mode 100644
index 0000000000..7161e42e38
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_longsword.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_longsword" Segment="6">
+        <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_m_arrow.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_m_arrow.xml
new file mode 100644
index 0000000000..0fd659ae95
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_m_arrow.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_gi_m_arrow" Segment="6">
+        <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
+        <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>
+        <DList Name="gGiIceArrowColorDL" Offset="0x0CC0"/>
+        <DList Name="gGiLightArrowColorDL" Offset="0x0CE0"/>
+        <DList Name="gGiArrowMagicDL" Offset="0x0D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_magicpot.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_magicpot.xml
new file mode 100644
index 0000000000..7623e6353e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_magicpot.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_magicpot" Segment="6">
+        <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
+        <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_map.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_map.xml
new file mode 100644
index 0000000000..471c1dab97
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_map.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_map" Segment="6">
+        <Texture Name="object_gi_mapTex_000D60" OutName="object_gi_mapTex_000D60" Format="i8" Width="32" Height="32" Offset="0xD60" AddedByScript="true"/>
+        <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
+        <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_medal.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_medal.xml
new file mode 100644
index 0000000000..28e5b1e683
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_medal.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_medal" Segment="6">
+        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
+        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_melody.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_melody.xml
new file mode 100644
index 0000000000..b01fca9538
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_melody.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_gi_melody" Segment="6">
+        <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
+        <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>
+        <DList Name="gGiSerenadeColorDL" Offset="0x0AA0"/>
+        <DList Name="gGiRequiemColorDL" Offset="0x0AB0"/>
+        <DList Name="gGiNocturneColorDL" Offset="0x0AC0"/>
+        <DList Name="gGiPreludeColorDL" Offset="0x0AD0"/>
+        <DList Name="gGiSongNoteDL" Offset="0x0AE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_milk.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_milk.xml
new file mode 100644
index 0000000000..a3e223b3e6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_milk.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milkTex_000000" OutName="object_gi_milkTex_000000" Format="i8" Width="72" Height="24" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
+        <DList Name="gGiMilkBottleDL" Offset="0x1288"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_mushroom.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_mushroom.xml
new file mode 100644
index 0000000000..5b19bca743
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_mushroom.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_mushroom" Segment="6">
+        <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_niwatori.xml
new file mode 100644
index 0000000000..c8389f62c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_niwatori.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatoriTex_000000" OutName="object_gi_niwatoriTex_000000" Format="i8" Width="32" Height="64" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_niwatoriTex_000800" OutName="object_gi_niwatoriTex_000800" Format="ia8" Width="32" Height="32" Offset="0x800" AddedByScript="true"/>
+        <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
+        <DList Name="gGiCojiroColorDL" Offset="0x1610"/>
+        <DList Name="gGiChickenDL" Offset="0x1630"/>
+        <DList Name="gGiChickenEyesDL" Offset="0x1948"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_nuts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_nuts.xml
new file mode 100644
index 0000000000..c59903c43d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_nuts.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nutsTex_000000" OutName="object_gi_nutsTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiNutDL" Offset="0x0E90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina.xml
new file mode 100644
index 0000000000..82607677d3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarinaTex_000000" OutName="object_gi_ocarinaTex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
+        <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina_0.xml
new file mode 100644
index 0000000000..2c5f70d984
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ocarina_0.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0Tex_000000" OutName="object_gi_ocarina_0Tex_000000" Format="i8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
+        <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_pachinko.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_pachinko.xml
new file mode 100644
index 0000000000..5f808baf92
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_pachinko.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_pachinko" Segment="6">
+        <DList Name="gGiSlingshotDL" Offset="0x0940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_powder.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_powder.xml
new file mode 100644
index 0000000000..fb7dc0155d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_powder.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_powder" Segment="6">
+        <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_prescription.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_prescription.xml
new file mode 100644
index 0000000000..75ae7eb2b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_prescription.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescriptionTex_000000" OutName="object_gi_prescriptionTex_000000" Format="ia8" Width="32" Height="48" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
+        <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_purse.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_purse.xml
new file mode 100644
index 0000000000..054731dec7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_purse.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purseTex_000000" OutName="object_gi_purseTex_000000" Format="i8" Width="64" Height="64" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiAdultWalletColorDL" Offset="0x1750"/>
+        <DList Name="gGiGiantsWalletColorDL" Offset="0x1770"/>
+        <DList Name="gGiAdultWalletRupeeOuterColorDL" Offset="0x1790"/>
+        <DList Name="gGiAdultWalletStringColorDL" Offset="0x17B0"/>
+        <DList Name="gGiAdultWalletRupeeInnerColorDL" Offset="0x17D0"/>
+        <DList Name="gGiGiantsWalletRupeeOuterColorDL" Offset="0x17F0"/>
+        <DList Name="gGiGiantsWalletStringColorDL" Offset="0x1810"/>
+        <DList Name="gGiGiantsWalletRupeeInnerColorDL" Offset="0x1830"/>
+        <DList Name="gGiWalletDL" Offset="0x1850"/>
+        <DList Name="gGiWalletRupeeOuterDL" Offset="0x19A0"/>
+        <DList Name="gGiWalletStringDL" Offset="0x1A28"/>
+        <DList Name="gGiWalletRupeeInnerDL" Offset="0x1AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_rabit_mask.xml
new file mode 100644
index 0000000000..9d4eb9487f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_rabit_mask.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_maskTex_000000" OutName="object_gi_rabit_maskTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
+        <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_redead_mask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_redead_mask.xml
new file mode 100644
index 0000000000..7de08487f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_redead_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_redead_mask" Segment="6">
+        <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_rupy.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_rupy.xml
new file mode 100644
index 0000000000..0a1af96d0f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_rupy.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_gi_rupy" Segment="6">
+        <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
+        <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>
+        <DList Name="gGiRedRupeeInnerColorDL" Offset="0x04E0"/>
+        <DList Name="gGiPurpleRupeeInnerColorDL" Offset="0x0500"/>
+        <DList Name="gGiGoldRupeeInnerColorDL" Offset="0x0520"/>
+        <DList Name="gGiGreenRupeeOuterColorDL" Offset="0x0540"/>
+        <DList Name="gGiBlueRupeeOuterColorDL" Offset="0x0560"/>
+        <DList Name="gGiRedRupeeOuterColorDL" Offset="0x0580"/>
+        <DList Name="gGiPurpleRupeeOuterColorDL" Offset="0x05A0"/>
+        <DList Name="gGiGoldRupeeOuterColorDL" Offset="0x05C0"/>
+        <DList Name="gGiRupeeInnerDL" Offset="0x05E0"/>
+        <DList Name="gGiRupeeOuterDL" Offset="0x06F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_saw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_saw.xml
new file mode 100644
index 0000000000..dcc038b7c1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_saw.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_saw" Segment="6">
+        <DList Name="gGiSawDL" Offset="0x07E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_scale.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_scale.xml
new file mode 100644
index 0000000000..1cf5de5b99
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_scale.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_scale" Segment="6">
+        <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
+        <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>
+        <DList Name="gGiSilverScaleColorDL" Offset="0x0A60"/>
+        <DList Name="gGiGoldenScaleColorDL" Offset="0x0A80"/>
+        <DList Name="gGiScaleWaterDL" Offset="0x0AA0"/>
+        <DList Name="gGiScaleDL" Offset="0x0CC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_seed.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_seed.xml
new file mode 100644
index 0000000000..82c15c82d2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_seed.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_seed" Segment="6">
+        <DList Name="gGiSeedDL" Offset="0x0810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_1.xml
new file mode 100644
index 0000000000..2f11e3f6d8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_1.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1Tex_000000" OutName="object_gi_shield_1Tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_2.xml
new file mode 100644
index 0000000000..176ae025fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_2.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_shield_2" Segment="6">
+        <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_3.xml
new file mode 100644
index 0000000000..8d1e5dafd4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_shield_3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3Tex_000000" OutName="object_gi_shield_3Tex_000000" Format="i4" Width="64" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_shield_3Tex_000400" OutName="object_gi_shield_3Tex_000400" Format="i4" Width="64" Height="64" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
+        <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_skj_mask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_skj_mask.xml
new file mode 100644
index 0000000000..e6c90f76f1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_skj_mask.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_skj_mask" Segment="6">
+        <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_soldout.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_soldout.xml
new file mode 100644
index 0000000000..a15b1253e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_soldout.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldoutTex_000000" OutName="object_gi_soldoutTex_000000" Format="ia8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiSoldOutDL" Offset="0x0440"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_soul.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_soul.xml
new file mode 100644
index 0000000000..a68178eba5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_soul.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soulTex_000000" OutName="object_gi_soulTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
+        <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>
+        <DList Name="gGiFairyContainerContentsDL" Offset="0x0EF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_stick.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_stick.xml
new file mode 100644
index 0000000000..fed89f4659
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_stick.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_stick" Segment="6">
+        <DList Name="gGiStickDL" Offset="0x04D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_sutaru.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_sutaru.xml
new file mode 100644
index 0000000000..a2606afbe3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_sutaru.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_gi_sutaru" Segment="6">
+        <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
+        <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_sword_1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_sword_1.xml
new file mode 100644
index 0000000000..e1119abca0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_sword_1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gi_sword_1" Segment="6">
+        <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ticketstone.xml
new file mode 100644
index 0000000000..73bf888d10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_ticketstone.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstoneTex_000000" OutName="object_gi_ticketstoneTex_000000" Format="i4" Width="48" Height="24" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_ticketstoneTex_000240" OutName="object_gi_ticketstoneTex_000240" Format="i8" Width="32" Height="24" Offset="0x240" AddedByScript="true"/>
+        <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
+        <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_truth_mask.xml
new file mode 100644
index 0000000000..3b4edf3dee
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_truth_mask.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_maskTex_000000" OutName="object_gi_truth_maskTex_000000" Format="i8" Width="32" Height="32" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_truth_maskTex_000400" OutName="object_gi_truth_maskTex_000400" Format="i8" Width="32" Height="32" Offset="0x400" AddedByScript="true"/>
+        <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
+        <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gi_zoramask.xml
new file mode 100644
index 0000000000..e3b1ab10ec
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gi_zoramask.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramaskTex_000208" OutName="object_gi_zoramaskTex_000208" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000248" OutName="object_gi_zoramaskTex_000248" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000648" OutName="object_gi_zoramaskTex_000648" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTex_000A48" OutName="object_gi_zoramaskTex_000A48" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_gi_zoramaskTLUT_000000" OutName="object_gi_zoramaskTLUT_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <DList Name="gGiZoraMaskDL" Offset="0x1398"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gj.xml
new file mode 100644
index 0000000000..ee6dab74f8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gj.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_gj" Segment="6">
+        <Texture Name="object_gjTex_003B20" OutName="object_gjTex_003B20" Format="ia8" Width="16" Height="16" Offset="0x3B20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003C20" OutName="object_gjTex_003C20" Format="i4" Width="16" Height="32" Offset="0x3C20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003D20" OutName="object_gjTex_003D20" Format="rgba16" Width="16" Height="16" Offset="0x3D20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_003F20" OutName="object_gjTex_003F20" Format="i8" Width="64" Height="64" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_004F20" OutName="object_gjTex_004F20" Format="i8" Width="64" Height="64" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_005F20" OutName="object_gjTex_005F20" Format="i8" Width="64" Height="64" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_006F20" OutName="object_gjTex_006F20" Format="i4" Width="32" Height="64" Offset="0x6F20" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007320" OutName="object_gjTex_007320" Format="i8" Width="64" Height="16" Offset="0x7320" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007720" OutName="object_gjTex_007720" Format="ia8" Width="32" Height="32" Offset="0x7720" AddedByScript="true"/>
+        <Texture Name="object_gjTex_007B20" OutName="object_gjTex_007B20" Format="i8" Width="128" Height="32" Offset="0x7B20" AddedByScript="true"/>
+        <!-- This is the decorative rubble around the fight arena -->
+        <DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
+        <Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
+
+        <!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
+        <DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
+        <Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
+
+        <DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
+        <Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
+
+        <DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
+        <Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
+
+        <DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
+        <Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
+
+        <!-- This three rubbles are the ones that Ganon can destroy during the fight -->
+        <DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
+        <Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
+
+        <DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
+        <Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
+
+        <DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
+        <Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
+
+        <!-- The following are unused -->
+        <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
+        <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gjyo_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gjyo_objects.xml
new file mode 100644
index 0000000000..ea4f8444fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gjyo_objects.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gjyo_objects" Segment="6">
+        <Texture Name="gRainbowBridgeTex" OutName="rainbow_bridge" Format="rgba16" Width="32" Height="32" Offset="0xDF0"/>
+        <DList Name="gRainbowBridgeDL" Offset="0x600"/>
+        <Collision Name="gRainbowBridgeCol" Offset="0xDB8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gla.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gla.xml
new file mode 100644
index 0000000000..499a3720d1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gla.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_gla" Segment="6">
+        <!-- Purple-clothed Gerudo Skeleton -->
+        <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
+
+        <!-- Purple-clothed Gerudo Limbs -->
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
+
+        <!-- Purple-clothed Gerudo Limb DisplayLists -->
+        <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
+        <DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
+        <DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
+        <DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
+        <DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
+        <DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
+        <DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
+        <DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
+        <DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
+        <DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
+        <DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
+        <DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
+        <DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
+        <DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
+        <DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
+        <DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
+        <DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
+        <DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>
+
+        <!-- Purple-clothed Gerudo palettes -->
+        <Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4788"/>
+        <Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
+
+        <!-- Purple-clothed Gerudo Displaylist textures -->
+        <Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
+        <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
+        <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
+        <Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
+
+        <!-- Purple-clothed Gerudo Eye Textures -->
+        <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
+        <Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
+        
+        <!-- Purple-clothed Gerudo Animations -->
+        <Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
+        <Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
+        <Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
+        <Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
+        <Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
+        <Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
+        <Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
+        <Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gm.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gm.xml
new file mode 100644
index 0000000000..91b10cc428
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gm.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_gm" Segment="6">
+        <Animation Name="object_gm_Anim_0002B8" Offset="0x2B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gnd.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gnd.xml
new file mode 100644
index 0000000000..3ae3b57f3d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gnd.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_gnd" Segment="6">
+        
+        <Texture Name="object_gndTex_012B50" OutName="object_gndTex_012B50" Format="rgba16" Width="16" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <!-- Skeleton -->
+        <Skeleton Name="gPhantomGanonSkel" Type="Normal" LimbType="Standard" Offset="0xC710"/>
+        
+        <!-- Riding animations -->
+        <Animation Name="gPhantomGanonRideAnim" Offset="0x3CA4"/>
+        <Animation Name="gPhantomGanonMaskOnAnim" Offset="0x1144"/>
+        <Animation Name="gPhantomGanonRidePoseAnim" Offset="0x19A4"/>
+        <Animation Name="gPhantomGanonHorseRearingAnim" Offset="0x2684"/>
+        <Animation Name="gPhantomGanonRideSpearRaiseAnim" Offset="0xD99C"/>
+        <Animation Name="gPhantomGanonRideSpearStrikeAnim" Offset="0x3080"/>
+        <Animation Name="gPhantomGanonRideSpearResetAnim" Offset="0xDF80"/>
+
+        <!-- Fight animations -->
+        <Animation Name="gPhantomGanonNeutralAnim" Offset="0x10060"/>
+
+        <Animation Name="gPhantomGanonThrowAnim" Offset="0xEC94"/>
+        <Animation Name="gPhantomGanonThrowEndAnim" Offset="0xF48C"/>
+        
+        <Animation Name="gPhantomGanonReturn1Anim" Offset="0x10FD4"/>
+        <Animation Name="gPhantomGanonReturn2Anim" Offset="0x11800"/>
+        
+        <Animation Name="gPhantomGanonBlockAnim" Offset="0x10344"/>
+
+        <Animation Name="gPhantomGanonChargeWindupAnim" Offset="0x129E0"/>
+        <Animation Name="gPhantomGanonChargeStartAnim" Offset="0x11F44"/>
+        <Animation Name="gPhantomGanonChargeAnim" Offset="0x1267C"/>
+        
+        <Animation Name="gPhantomGanonAirDamageAnim" Offset="0x108D8"/>
+        <Animation Name="gPhantomGanonGroundDamageAnim" Offset="0xFAC8"/>
+        <Animation Name="gPhantomGanonStunnedAnim" Offset="0x11BCC"/>
+
+        <!-- Death animations -->
+        <Animation Name="gPhantomGanonDeathBlowAnim" Offset="0x90C"/>
+        <Animation Name="gPhantomGanonLimpAnim" Offset="0xD84"/>
+        <Animation Name="gPhantomGanonScreamAnim" Offset="0x189C"/>
+        <Animation Name="gPhantomGanonLastPoseAnim" Offset="0x1AB0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gPhantomGanonLimbTex_00B380" OutName="phantom_ganon_limb_tex_00B380" Format="rgba16" Width="16" Height="32" Offset="0xB380"/>
+        <Texture Name="gPhantomGanonLimbTex_00A800" OutName="phantom_ganon_limb_tex_00A800" Format="rgba16" Width="8" Height="8" Offset="0xA800"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/> 
+        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A200" OutName="phantom_ganon_limb_tex_00A200" Format="rgba16" Width="16" Height="16" Offset="0xA200"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A400" OutName="phantom_ganon_limb_tex_00A400" Format="rgba16" Width="16" Height="16" Offset="0xA400"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A600" OutName="phantom_ganon_limb_tex_00A600" Format="rgba16" Width="16" Height="16" Offset="0xA600"/> 
+        <Texture Name="gPhantomGanonLimbTex_00A880" OutName="phantom_ganon_limb_tex_00A880" Format="rgba16" Width="16" Height="16" Offset="0xA880"/> 
+        <Texture Name="gPhantomGanonLimbTex_00B780" OutName="phantom_ganon_limb_tex_00B780" Format="rgba16" Width="16" Height="16" Offset="0xB780"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BA80" OutName="phantom_ganon_limb_tex_00BA80" Format="rgba16" Width="16" Height="16" Offset="0xBA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00BE80" OutName="phantom_ganon_limb_tex_00BE80" Format="rgba16" Width="16" Height="16" Offset="0xBE80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AA80" OutName="phantom_ganon_limb_tex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80"/> 
+        <Texture Name="gPhantomGanonLimbTex_00AF80" OutName="phantom_ganon_limb_tex_00AF80" Format="rgba16" Width="32" Height="16" Offset="0xAF80"/> 
+
+        <!-- Face DList -->
+        <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
+
+        <!-- Face textures-->
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
+        <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/> 
+        <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
+
+        <!-- Unused Animations, seem to be corrupt -->
+        <Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>
+        <Animation Name="gPhantomGanonAnim_00D398" Offset="0xD398"/>
+        <Animation Name="gPhantomGanonAnim_00CC84" Offset="0xCC84"/>
+        <Animation Name="gPhantomGanonAnim_012320" Offset="0x12320"/>
+
+        <!-- Bars -->
+        <DList Name="gPhantomGanonBarsDL" Offset="0x12AB0"/>
+        <Collision Name="gPhantomGanonBarsCol" Offset="0x12FD0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gnd_magic.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gnd_magic.xml
new file mode 100644
index 0000000000..a88d419d7a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gnd_magic.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_gnd_magic" Segment="6">
+        <Texture Name="object_gnd_magic_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gnd_magic_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_gnd_magic_DL_001190" Offset="0x1190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gndd.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gndd.xml
new file mode 100644
index 0000000000..8bf5d770c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gndd.xml
@@ -0,0 +1,106 @@
+<Root>
+    <!-- Assets for the young version of Ganondorf (the one before the seven-year timeskip). -->
+    <File Name="object_gndd" Segment="6">
+        <!-- Young Ganondorf Animations -->
+        <Animation Name="gYoungGanondorfHorsebackRideAnim" Offset="0x5B4"/> <!-- Original name is "gnd_anim_fastrun" -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpStartAnim" Offset="0x8A0"/> <!-- Original name is "gnd_anim_mahou" ("magic, sorcery") -->
+        <Animation Name="gYoungGanondorfHorsebackMagicChargeUpLoopAnim" Offset="0xBC8"/> <!-- Original name is "gnd_anim_mahou_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysStartAnim" Offset="0xF54"/> <!-- Original name is "gnd_anim_nirami" ("glare, sharp look") -->
+        <Animation Name="gYoungGanondorfHorsebackLookSidewaysLoopAnim" Offset="0x14F4"/> <!-- Original name is "gnd_anim_nirami_wait" -->
+        <Animation Name="gYoungGanondorfHorsebackRearAnim" Offset="0x1D28"/> <!-- Original name is "gnd_anim_stand" -->
+        <Animation Name="gYoungGanondorfHorsebackIdleAnim" Offset="0x2928"/> <!-- Original name is "gnd_anim_wait" -->
+        <Animation Name="gYoungGanondorfKneelStartAnim" Offset="0x3284"/> <!-- Original name is "gnd_demo_ojigi" ("bowing") -->
+        <Animation Name="gYoungGanondorfKneelLookSidewaysAnim" Offset="0x3428"/> <!-- Original name is "gnd_demo_ojigi_furimuki" ("to turn one's face") -->
+        <Animation Name="gYoungGanondorfKneelLoopAnim" Offset="0x3D84"/> <!-- Original name is "gnd_demo_ojigi_wait" -->
+        <Animation Name="gYoungGanondorfArmsCrossedAnim" Offset="0x4260"/> <!-- Original name is "gnd_demo_ukabi_wait" ("to emerge (from obscurity)") -->
+        <Animation Name="gYoungGanondorfLaughStartAnim" Offset="0x4534"/> <!-- Original name is "gnd_demo_ukabi_warai" ("laughter") -->
+        <Animation Name="gYoungGanondorfLaughLoopAnim" Offset="0x48B0"/> <!-- Original name is "gnd_demo_ukabi_warai_wait" -->
+        <Animation Name="gYoungGanondorfWalkAnim" Offset="0x50A8"/> <!-- Original name is "gnd_walk" -->
+
+        <!-- Young Ganondorf Limb DisplayLists -->
+        <DList Name="gYoungGanondorfHeadDL" Offset="0x61C0"/>
+        <DList Name="gYoungGanondorfRightUpperLipDL" Offset="0x69F8"/>
+        <DList Name="gYoungGanondorfChinDL" Offset="0x6B78"/>
+        <DList Name="gYoungGanondorfJawDL" Offset="0x6D90"/>
+        <DList Name="gYoungGanondorfLeftUpperLipDL" Offset="0x6FC8"/>
+        <DList Name="gYoungGanondorfPelvisDL" Offset="0xA6A8"/>
+        <DList Name="gYoungGanondorfTorsoDL" Offset="0xAB10"/>
+        <DList Name="gYoungGanondorfJewelDL" Offset="0xB410"/>
+        <DList Name="gYoungGanondorfKnifeDL" Offset="0xB4B0"/>
+        <DList Name="gYoungGanondorfLeftUpperArmDL" Offset="0xB918"/>
+        <DList Name="gYoungGanondorfRightUpperArmDL" Offset="0xBA90"/>
+        <DList Name="gYoungGanondorfLeftForearmDL" Offset="0xBC08"/>
+        <DList Name="gYoungGanondorfRightForearmDL" Offset="0xBEA0"/>
+        <DList Name="gYoungGanondorfLeftHandDL" Offset="0xC138"/>
+        <DList Name="gYoungGanondorfRightHandDL" Offset="0xC550"/>
+        <DList Name="gYoungGanondorfLeftFootDL" Offset="0xC968"/>
+        <DList Name="gYoungGanondorfRightFootDL" Offset="0xCBF8"/>
+        <DList Name="gYoungGanondorfLeftThighDL" Offset="0xCE88"/>
+        <DList Name="gYoungGanondorfLeftShinDL" Offset="0xD080"/>
+        <DList Name="gYoungGanondorfRightThighDL" Offset="0xD278"/>
+        <DList Name="gYoungGanondorfRightShinDL" Offset="0xD470"/>
+        <DList Name="gYoungGanondorfTeethDL" Offset="0xD668"/>
+        <DList Name="gYoungGanondorfOpenLeftHandDL" Offset="0xE1A8"/>
+
+        <!-- Young Ganondorf Textures -->
+        <Texture Name="gYoungGanondorfEyeTLUT" OutName="young_ganondorf_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xECB8"/>
+        <Texture Name="gYoungGanondorfInnerMouthTex" OutName="young_ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0xEEB8"/>
+        <Texture Name="gYoungGanondorfSideburnTex" OutName="young_ganondorf_sideburn" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/>
+        <Texture Name="gYoungGanondorfOuterMouthTex" OutName="young_ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0xF138"/>
+        <Texture Name="gYoungGanondorfEyeOpenTex" OutName="young_ganondorf_eye_open" Format="ci8" Width="32" Height="16" Offset="0xF178" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeHalfTex" OutName="young_ganondorf_eye_half" Format="ci8" Width="32" Height="16" Offset="0xF378" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeClosedTex" OutName="young_ganondorf_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xF578" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfEyeLookingDownTex" OutName="young_ganondorf_eye_looking_down" Format="ci8" Width="32" Height="16" Offset="0xF778" TlutOffset="0xECB8"/>
+        <Texture Name="gYoungGanondorfUpperLipTex" OutName="young_ganondorf_upper_lip" Format="rgba16" Width="16" Height="16" Offset="0xF978"/>
+        <Texture Name="gYoungGanondorfEarTex" OutName="young_ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/>
+        <Texture Name="gYoungGanondorfNoseTex" OutName="young_ganondorf_nose" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/>
+        <Texture Name="gYoungGanondorfNoseBridgeTex" OutName="young_ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0xFCF8"/>
+        <Texture Name="gYoungGanondorfEyebrowTex" OutName="young_ganondorf_eyebrow" Format="rgba16" Width="16" Height="8" Offset="0xFD78"/>
+        <Texture Name="gYoungGanondorfJawTex" OutName="young_ganondorf_jaw" Format="rgba16" Width="16" Height="16" Offset="0xFE78"/>
+        <Texture Name="gYoungGanondorfBlackLeatherTex" OutName="young_ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0x10078"/>
+        <Texture Name="gYoungGanondorfGerudoFabricWithSunTex" OutName="young_ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x10278"/>
+        <Texture Name="gYoungGanondorfLeatherTex" OutName="young_ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x10678"/>
+        <Texture Name="gYoungGanondorfBodysuitTex" OutName="young_ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x10878"/>
+        <Texture Name="gYoungGanondorfNeckTex" OutName="young_ganondorf_neck" Format="rgba16" Width="8" Height="8" Offset="0x108F8"/>
+        <Texture Name="gYoungGanondorfChestAndKnifeJewelTex" OutName="young_ganondorf_chest_and_knife_jewel" Format="rgba16" Width="16" Height="16" Offset="0x10978"/>
+        <Texture Name="gYoungGanondorfGerudoFabricTex" OutName="young_ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x10B78"/>
+        <Texture Name="gYoungGanondorfHairFringeTex" OutName="young_ganondorf_hair_fringe" Format="rgba16" Width="16" Height="16" Offset="0x10D78"/>
+        <Texture Name="gYoungGanondorfJewelTex" OutName="young_ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x10F78"/>
+        <Texture Name="gYoungGanondorfPauldronTex" OutName="young_ganondorf_pauldron" Format="rgba16" Width="16" Height="16" Offset="0x11378"/> <!-- Also used for the sides of his gauntlets and knee guards. -->
+        <Texture Name="gYoungGanondorfThumbTex" OutName="young_ganondorf_thumb" Format="rgba16" Width="8" Height="8" Offset="0x11578"/>
+        <Texture Name="gYoungGanondorfHandSideTex" OutName="young_ganondorf_hand_side" Format="rgba16" Width="8" Height="8" Offset="0x115F8"/>
+        <Texture Name="gYoungGanondorfFingerTex" OutName="young_ganondorf_finger" Format="rgba16" Width="8" Height="8" Offset="0x11678"/>
+        <Texture Name="gYoungGanondorfTeethTex" OutName="young_ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x116F8"/>
+        <Texture Name="gYoungGanondorfPalmMaskTex" OutName="young_ganondorf_palm_mask" Format="i8" Width="16" Height="16" Offset="0x11718"/>
+        <Texture Name="gYoungGanondorfFingerUndersideTex" OutName="young_ganondorf_finger_underside" Format="rgba16" Width="4" Height="8" Offset="0x11818"/>
+        <Texture Name="gYoungGanondorfFingernailTex" OutName="young_ganondorf_fingernail" Format="rgba16" Width="4" Height="4" Offset="0x11858"/>
+
+        <!-- Young Ganondorf Limbs -->
+        <Limb Name="gYoungGanondorfRootLimb" LimbType="Standard" Offset="0x11878"/>
+        <Limb Name="gYoungGanondorfTorsoLimb" LimbType="Standard" Offset="0x11884"/>
+        <Limb Name="gYoungGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0x11890"/>
+        <Limb Name="gYoungGanondorfLeftForearmLimb" LimbType="Standard" Offset="0x1189C"/>
+        <Limb Name="gYoungGanondorfLeftHandLimb" LimbType="Standard" Offset="0x118A8"/>
+        <Limb Name="gYoungGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0x118B4"/>
+        <Limb Name="gYoungGanondorfRightForearmLimb" LimbType="Standard" Offset="0x118C0"/>
+        <Limb Name="gYoungGanondorfRightHandLimb" LimbType="Standard" Offset="0x118CC"/>
+        <Limb Name="gYoungGanondorfJewelLimb" LimbType="Standard" Offset="0x118D8"/>
+        <Limb Name="gYoungGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0x118E4"/>
+        <Limb Name="gYoungGanondorfJawLimb" LimbType="Standard" Offset="0x118F0"/>
+        <Limb Name="gYoungGanondorfChinLimb" LimbType="Standard" Offset="0x118FC"/>
+        <Limb Name="gYoungGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x11908"/>
+        <Limb Name="gYoungGanondorfTeethLimb" LimbType="Standard" Offset="0x11914"/>
+        <Limb Name="gYoungGanondorfHeadLimb" LimbType="Standard" Offset="0x11920"/>
+        <Limb Name="gYoungGanondorfPelvisLimb" LimbType="Standard" Offset="0x1192C"/>
+        <Limb Name="gYoungGanondorfLeftThighLimb" LimbType="Standard" Offset="0x11938"/>
+        <Limb Name="gYoungGanondorfLeftShinLimb" LimbType="Standard" Offset="0x11944"/>
+        <Limb Name="gYoungGanondorfLeftFootLimb" LimbType="Standard" Offset="0x11950"/>
+        <Limb Name="gYoungGanondorfKnifeLimb" LimbType="Standard" Offset="0x1195C"/>
+        <Limb Name="gYoungGanondorfRightThighLimb" LimbType="Standard" Offset="0x11968"/>
+        <Limb Name="gYoungGanondorfRightShinLimb" LimbType="Standard" Offset="0x11974"/>
+        <Limb Name="gYoungGanondorfRightFootLimb" LimbType="Standard" Offset="0x11980"/>
+
+        <!-- Young Ganondorf Skeleton -->
+        <Skeleton Name="gYoungGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x119E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_god_lgt.xml b/soh/assets/xml/N64_NTSC_12/objects/object_god_lgt.xml
new file mode 100644
index 0000000000..60df9e4693
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_god_lgt.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_god_lgt" Segment="6">
+        <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
+        <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>
+        <Texture Name="gGoldenGoddessAuraHeadTex" OutName="golden_goddess_aura_head" Format="i8" Width="64" Height="64" Offset="0x0930"/>
+        <Texture Name="gGoldenGoddessAuraMaskTex" OutName="golden_goddess_aura_mask" Format="i8" Width="16" Height="96" Offset="0x1930"/>
+        <DList Name="gGoldenGoddessBodyDL" Offset="0x3C50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gol.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gol.xml
new file mode 100644
index 0000000000..7e04508cb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gol.xml
@@ -0,0 +1,59 @@
+<Root>
+    <File Name="object_gol" Segment="6">
+        <Skeleton Name="gObjectGolSkel" Type="Normal" LimbType="Standard" Offset="0x3B40"/>
+
+        <Animation Name="gObjectGolLandFromJumpAnim" Offset="0x17C"/>
+        <Animation Name="gObjectGolDeadTwitchingAnim" Offset="0x334"/>
+        <Animation Name="gObjectGolJumpHeadbuttAnim" Offset="0x544"/>
+        <Animation Name="gObjectGolDamagedAnim" Offset="0x838"/>
+        <Animation Name="gObjectGolDeathAnim" Offset="0xB78"/>
+        <Animation Name="gObjectGolPrepareJumpAnim" Offset="0xE4C"/>
+        <Animation Name="gObjectGolWalkAnim" Offset="0x11B4"/> <!-- unused -->
+        <Animation Name="gObjectGolStandAnim" Offset="0x1548"/>
+        <Animation Name="gObjectGolRunningAnim" Offset="0x3D78"/>
+        <Animation Name="gObjectGolStopRunningAnim" Offset="0x3FF0"/>
+        <Animation Name="gObjectGolStartRunningAnim" Offset="0x4204"/>
+
+        <DList Name="gObjectGolLeftFootDL" Offset="0x1600"/>
+        <DList Name="gObjectGolLeftThighDL" Offset="0x1860"/>
+        <DList Name="gObjectGolLeftShinDL" Offset="0x19F8"/>
+        <DList Name="gObjectGolRightFootDL" Offset="0x1B28"/>
+        <DList Name="gObjectGolRightThighDL" Offset="0x1D78"/>
+        <DList Name="gObjectGolRightShinDL" Offset="0x1F10"/>
+        <DList Name="gObjectGolBodyDL" Offset="0x24E0"/>
+        <DList Name="gObjectGolEggDL" Offset="0x2A70"/>
+        <DList Name="gObjectGolEyeIrisDL" Offset="0x2C10"/>
+        <DList Name="gObjectGolAntennaDL" Offset="0x2EB8"/>
+
+        <Texture Name="gObjectGolShellTex" OutName="object_gol_shell" Format="rgba16" Width="16" Height="16" Offset="0x2FD0"/>
+        <Texture Name="gObjectGolSkinTex" OutName="object_gol_skin" Format="rgba16" Width="16" Height="16" Offset="0x31D0"/>
+        <!-- the white of the eye texture is also used for the antenna -->
+        <Texture Name="gObjectGolEyeWhiteTex" OutName="object_gol_eye_white" Format="rgba16" Width="16" Height="16" Offset="0x33D0"/>
+        <Texture Name="gObjectGolEyeIrisTex" OutName="object_gol_eye_iris" Format="rgba16" Width="16" Height="16" Offset="0x35D0"/>
+        <Texture Name="gObjectGolEggTex" OutName="object_gol_egg" Format="rgba16" Width="16" Height="16" Offset="0x37D0"/>
+
+        <Limb Name="gObjectGolRoot1Limb" LimbType="Standard" Offset="0x39D0"/>
+        <Limb Name="gObjectGolRoot2Limb" LimbType="Standard" Offset="0x39DC"/>
+        <Limb Name="gObjectGolBodyLimb" LimbType="Standard" Offset="0x39E8"/>
+        <Limb Name="gObjectGolAntennaRoot1Limb" LimbType="Standard" Offset="0x39F4"/>
+        <Limb Name="gObjectGolAntennaRoot2Limb" LimbType="Standard" Offset="0x3A00"/>
+        <Limb Name="gObjectGolAntennaLimb" LimbType="Standard" Offset="0x3A0C"/>
+        <Limb Name="gObjectGolEyeIrisRoot1Limb" LimbType="Standard" Offset="0x3A18"/>
+        <Limb Name="gObjectGolEyeIrisRoot2Limb" LimbType="Standard" Offset="0x3A24"/>
+        <Limb Name="gObjectGolEyeIrisLimb" LimbType="Standard" Offset="0x3A30"/>
+        <Limb Name="gObjectGolLeftLegRoot1Limb" LimbType="Standard" Offset="0x3A3C"/>
+        <Limb Name="gObjectGolLeftLegRoot2Limb" LimbType="Standard" Offset="0x3A48"/>
+        <Limb Name="gObjectGolLeftShinRootLimb" LimbType="Standard" Offset="0x3A54"/>
+        <Limb Name="gObjectGolLeftFootRootLimb" LimbType="Standard" Offset="0x3A60"/>
+        <Limb Name="gObjectGolLeftFootLimb" LimbType="Standard" Offset="0x3A6C"/>
+        <Limb Name="gObjectGolLeftShinLimb" LimbType="Standard" Offset="0x3A78"/>
+        <Limb Name="gObjectGolLeftThighLimb" LimbType="Standard" Offset="0x3A84"/>
+        <Limb Name="gObjectGolRightLegRoot1Limb" LimbType="Standard" Offset="0x3A90"/>
+        <Limb Name="gObjectGolRightLegRoot2Limb" LimbType="Standard" Offset="0x3A9C"/>
+        <Limb Name="gObjectGolRightShinRootLimb" LimbType="Standard" Offset="0x3AA8"/>
+        <Limb Name="gObjectGolRightFootRootLimb" LimbType="Standard" Offset="0x3AB4"/>
+        <Limb Name="gObjectGolRightFootLimb" LimbType="Standard" Offset="0x3AC0"/>
+        <Limb Name="gObjectGolRightShinLimb" LimbType="Standard" Offset="0x3ACC"/>
+        <Limb Name="gObjectGolRightThighLimb" LimbType="Standard" Offset="0x3AD8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_goma.xml b/soh/assets/xml/N64_NTSC_12/objects/object_goma.xml
new file mode 100644
index 0000000000..922678a3cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_goma.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="object_goma" Segment="6">
+        <!-- Skeleton -->
+        <Skeleton Name="gGohmaSkel" Type="Normal" LimbType="Standard" Offset="0x1C8F8"/>
+
+        <!-- Limbs -->
+        <Limb Name="gGohmaRoot1Limb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGohmaRoot2Limb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGohmaBodyLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGohmaBodyShellLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGohmaEyeLimb" LimbType="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGohmaTailRootLimb" LimbType="Standard" Offset="0x1C3E4"/>
+        <Limb Name="gGohmaTail1RootLimb" LimbType="Standard" Offset="0x1C3F0"/>
+        <Limb Name="gGohmaTail2RootLimb" LimbType="Standard" Offset="0x1C3FC"/>
+        <Limb Name="gGohmaTail3RootLimb" LimbType="Standard" Offset="0x1C408"/>
+        <Limb Name="gGohmaTail4RootLimb" LimbType="Standard" Offset="0x1C414"/>
+        <Limb Name="gGohmaTail4Limb" LimbType="Standard" Offset="0x1C420"/>
+        <Limb Name="gGohmaTail3Limb" LimbType="Standard" Offset="0x1C42C"/>
+        <Limb Name="gGohmaTail2Limb" LimbType="Standard" Offset="0x1C438"/>
+        <Limb Name="gGohmaTail1Limb" LimbType="Standard" Offset="0x1C444"/>
+        <Limb Name="gGohmaRightLegRootLimb" LimbType="Standard" Offset="0x1C450"/>
+        <Limb Name="gGohmaRightThighRootLimb" LimbType="Standard" Offset="0x1C45C"/>
+        <Limb Name="gGohmaRightLegLowerRootLimb" LimbType="Standard" Offset="0x1C468"/>
+        <Limb Name="gGohmaRightFeetRootLimb" LimbType="Standard" Offset="0x1C474"/>
+        <Limb Name="gGohmaRightFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C480"/>
+        <Limb Name="gGohmaRightFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C48C"/>
+        <Limb Name="gGohmaRightFeetBackLimb" LimbType="Standard" Offset="0x1C498"/>
+        <Limb Name="gGohmaRightFeetLimb" LimbType="Standard" Offset="0x1C4A4"/>
+        <Limb Name="gGohmaRightShinLimb" LimbType="Standard" Offset="0x1C4B0"/>
+        <Limb Name="gGohmaRightKneeRoot1Limb" LimbType="Standard" Offset="0x1C4BC"/>
+        <Limb Name="gGohmaRightKneeRoot2Limb" LimbType="Standard" Offset="0x1C4C8"/>
+        <Limb Name="gGohmaRightKneeLimb" LimbType="Standard" Offset="0x1C4D4"/>
+        <Limb Name="gGohmaRightThighShellRoot1Limb" LimbType="Standard" Offset="0x1C4E0"/>
+        <Limb Name="gGohmaRightThighShellRoot2Limb" LimbType="Standard" Offset="0x1C4EC"/>
+        <Limb Name="gGohmaRightThighShellLimb" LimbType="Standard" Offset="0x1C4F8"/>
+        <Limb Name="gGohmaRightThighLimb" LimbType="Standard" Offset="0x1C504"/>
+        <Limb Name="gGohmaEyeLidBottomRoot1Limb" LimbType="Standard" Offset="0x1C510"/>
+        <Limb Name="gGohmaEyeLidBottomRoot2Limb" LimbType="Standard" Offset="0x1C51C"/>
+        <Limb Name="gGohmaEyeLidBottomLimb" LimbType="Standard" Offset="0x1C528"/>
+        <Limb Name="gGohmaEyeLidTopRoot1Limb" LimbType="Standard" Offset="0x1C534"/>
+        <Limb Name="gGohmaEyeLidTopRoot2Limb" LimbType="Standard" Offset="0x1C540"/>
+        <Limb Name="gGohmaEyeLidTopLimb" LimbType="Standard" Offset="0x1C54C"/>
+        <Limb Name="gGohmaIrisRoot1Limb" LimbType="Standard" Offset="0x1C558"/>
+        <Limb Name="gGohmaIrisRoot2Limb" LimbType="Standard" Offset="0x1C564"/>
+        <Limb Name="gGohmaIrisLimb" LimbType="Standard" Offset="0x1C570"/>
+        <Limb Name="gGohmaMandiblesRoot1Limb" LimbType="Standard" Offset="0x1C57C"/>
+        <Limb Name="gGohmaMandiblesRoot2Limb" LimbType="Standard" Offset="0x1C588"/>
+        <Limb Name="gGohmaMandiblesBodyLimb" LimbType="Standard" Offset="0x1C594"/>
+        <Limb Name="gGohmaLeftMandiblesRootLimb" LimbType="Standard" Offset="0x1C5A0"/>
+        <Limb Name="gGohmaLeftMandibles1RootLimb" LimbType="Standard" Offset="0x1C5AC"/>
+        <Limb Name="gGohmaLeftMandibles2RootLimb" LimbType="Standard" Offset="0x1C5B8"/>
+        <Limb Name="gGohmaLeftMandibles2Limb" LimbType="Standard" Offset="0x1C5C4"/>
+        <Limb Name="gGohmaLeftMandibles1Limb" LimbType="Standard" Offset="0x1C5D0"/>
+        <Limb Name="gGohmaRightMandiblesRootLimb" LimbType="Standard" Offset="0x1C5DC"/>
+        <Limb Name="gGohmaRightMandibles1RootLimb" LimbType="Standard" Offset="0x1C5E8"/>
+        <Limb Name="gGohmaRightMandibles2RootLimb" LimbType="Standard" Offset="0x1C5F4"/>
+        <Limb Name="gGohmaRightMandibles2Limb" LimbType="Standard" Offset="0x1C600"/>
+        <Limb Name="gGohmaRightMandibles1Limb" LimbType="Standard" Offset="0x1C60C"/>
+        <Limb Name="gGohmaLeftAntennaRootLimb" LimbType="Standard" Offset="0x1C618"/>
+        <Limb Name="gGohmaLeftAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C624"/>
+        <Limb Name="gGohmaLeftAntennaShellRootLimb" LimbType="Standard" Offset="0x1C630"/>
+        <Limb Name="gGohmaLeftAntennaClawRootLimb" LimbType="Standard" Offset="0x1C63C"/>
+        <Limb Name="gGohmaLeftAntennaClawLimb" LimbType="Standard" Offset="0x1C648"/>
+        <Limb Name="gGohmaLeftAntennaShellLimb" LimbType="Standard" Offset="0x1C654"/>
+        <Limb Name="gGohmaLeftAntennaBodyLimb" LimbType="Standard" Offset="0x1C660"/>
+        <Limb Name="gGohmaRightAntennaRootLimb" LimbType="Standard" Offset="0x1C66C"/>
+        <Limb Name="gGohmaRightAntennaBodyRootLimb" LimbType="Standard" Offset="0x1C678"/>
+        <Limb Name="gGohmaRightAntennaShellRootLimb" LimbType="Standard" Offset="0x1C684"/>
+        <Limb Name="gGohmaRightAntennaClawRootLimb" LimbType="Standard" Offset="0x1C690"/>
+        <Limb Name="gGohmaRightAntennaClawLimb" LimbType="Standard" Offset="0x1C69C"/>
+        <Limb Name="gGohmaRightAntennaShellLimb" LimbType="Standard" Offset="0x1C6A8"/>
+        <Limb Name="gGohmaRightAntennaBodyLimb" LimbType="Standard" Offset="0x1C6B4"/>
+        <Limb Name="gGohmaLeftLegRootLimb" LimbType="Standard" Offset="0x1C6C0"/>
+        <Limb Name="gGohmaLeftThighRootLimb" LimbType="Standard" Offset="0x1C6CC"/>
+        <Limb Name="gGohmaLeftLegLowerRootLimb" LimbType="Standard" Offset="0x1C6D8"/>
+        <Limb Name="gGohmaLeftFeetRootLimb" LimbType="Standard" Offset="0x1C6E4"/>
+        <Limb Name="gGohmaLeftFeetBackRoot1Limb" LimbType="Standard" Offset="0x1C6F0"/>
+        <Limb Name="gGohmaLeftFeetBackRoot2Limb" LimbType="Standard" Offset="0x1C6FC"/>
+        <Limb Name="gGohmaLeftFeetBackLimb" LimbType="Standard" Offset="0x1C708"/>
+        <Limb Name="gGohmaLeftFeetLimb" LimbType="Standard" Offset="0x1C714"/>
+        <Limb Name="gGohmaLeftShinLimb" LimbType="Standard" Offset="0x1C720"/>
+        <Limb Name="gGohmaLeftKneeRoot1Limb" LimbType="Standard" Offset="0x1C72C"/>
+        <Limb Name="gGohmaLeftKneeRoot2Limb" LimbType="Standard" Offset="0x1C738"/>
+        <Limb Name="gGohmaLeftKneeLimb" LimbType="Standard" Offset="0x1C744"/>
+        <Limb Name="gGohmaLeftThighShellRoot1Limb" LimbType="Standard" Offset="0x1C750"/>
+        <Limb Name="gGohmaLeftThighShellRoot2Limb" LimbType="Standard" Offset="0x1C75C"/>
+        <Limb Name="gGohmaLeftThighShellLimb" LimbType="Standard" Offset="0x1C768"/>
+        <Limb Name="gGohmaLeftThighLimb" LimbType="Standard" Offset="0x1C774"/>
+        <Limb Name="gGohmaBodyShellBackRoot1Limb" LimbType="Standard" Offset="0x1C780"/>
+        <Limb Name="gGohmaBodyShellBackRoot2Limb" LimbType="Standard" Offset="0x1C78C"/>
+        <Limb Name="gGohmaBodyShellBackLimb" LimbType="Standard" Offset="0x1C798"/>
+
+        <!-- Display Lists-->
+        <DList Name="gGohmaBodyDL" Offset="0x13A60"/>
+        <DList Name="gGohmaBodyShellDL" Offset="0x14298"/>
+        <DList Name="gGohmaEyeDL" Offset="0x14A10"/>
+        <DList Name="gGohmaTail4DL" Offset="0x17D80"/>
+        <DList Name="gGohmaTail3DL" Offset="0x17B08"/>
+        <DList Name="gGohmaTail2DL" Offset="0x17960"/>
+        <DList Name="gGohmaTail1DL" Offset="0x17768"/>
+        <DList Name="gGohmaRightFeetBackDL" Offset="0x15F28"/>
+        <DList Name="gGohmaRightFeetDL" Offset="0x15168"/>
+        <DList Name="gGohmaRightShinDL" Offset="0x17500"/>
+        <DList Name="gGohmaRightKneeDL" Offset="0x15B28"/>
+        <DList Name="gGohmaRightThighShellDL" Offset="0x147D0"/>
+        <DList Name="gGohmaRightThighDL" Offset="0x167A0"/>
+        <DList Name="gGohmaEyeLidBottomDL" Offset="0x16DA0"/>
+        <DList Name="gGohmaEyeLidTopDL" Offset="0x16AB8"/>
+        <DList Name="gGohmaIrisDL" Offset="0x15338"/>
+        <DList Name="gGohmaMandiblesBodyDL" Offset="0x16FE8"/>
+        <DList Name="gGohmaLeftMandibles2DL" Offset="0x13750"/>
+        <DList Name="gGohmaLeftMandibles1DL" Offset="0x135F0"/>
+        <DList Name="gGohmaRightMandibles2DL" Offset="0x13480"/>
+        <DList Name="gGohmaRightMandibles1DL" Offset="0x13320"/>
+        <DList Name="gGohmaLeftAntennaClawDL" Offset="0x18008"/>
+        <DList Name="gGohmaLeftAntennaShellDL" Offset="0x12AF8"/>
+        <DList Name="gGohmaLeftAntennaBodyDL" Offset="0x12770"/>
+        <DList Name="gGohmaRightAntennaClawDL" Offset="0x18290"/>
+        <DList Name="gGohmaRightAntennaShellDL" Offset="0x13128"/>
+        <DList Name="gGohmaRightAntennaBodyDL" Offset="0x12D70"/>
+        <DList Name="gGohmaLeftFeetBackDL" Offset="0x15D48"/>
+        <DList Name="gGohmaLeftFeetDL" Offset="0x14DC0"/>
+        <DList Name="gGohmaLeftShinDL" Offset="0x17268"/>
+        <DList Name="gGohmaLeftKneeDL" Offset="0x156D8"/>
+        <DList Name="gGohmaLeftThighShellDL" Offset="0x14640"/>
+        <DList Name="gGohmaLeftThighDL" Offset="0x16348"/>
+        <DList Name="gGohmaBodyShellBackDL" Offset="0x144B0"/>
+
+        <!-- Animations  -->
+        <Animation Name="gGohmaStandAnim" Offset="0xAE8"/>
+        <Animation Name="gGohmaHangAnim" Offset="0x193C"/> <!-- hang from the ceiling -->
+        <Animation Name="gGohmaWalkAnim" Offset="0x2360"/>
+        <Animation Name="gGohmaPrepareEggsAnim" Offset="0x29F0"/> <!-- hanging, shaking -->
+        <Animation Name="gGohmaAttackAnim" Offset="0x4318"/>
+        <Animation Name="gGohmaRestAfterAttackAnim" Offset="0x4A20"/>
+        <Animation Name="gGohmaRecoverAfterAttackAnim" Offset="0x5330"/>
+        <Animation Name="gGohmaCrashAnim" Offset="0x58C0"/> <!-- when struck down from the ceiling -->
+        <Animation Name="gGohmaLandAnim" Offset="0x5F28"/> <!-- when jumping down from the ceiling -->
+        <Animation Name="gGohmaClimbAnim" Offset="0x66DC"/> <!-- when climbing a wall -->
+        <Animation Name="gGohmaDamageAnim" Offset="0x6E60"/>
+        <Animation Name="gGohmaDeathAnim" Offset="0xB2FC"/>
+        <Animation Name="gGohmaPrepareAttackAnim" Offset="0xC468"/>
+        <Animation Name="gGohmaStunnedAnim" Offset="0xCCD8"/>
+        <Animation Name="gGohmaInitialLandingAnim" Offset="0xF70C"/> <!-- when landing in the pre-fight cutscene -->
+        <Animation Name="gGohmaEyeRollAnim" Offset="0x10918"/>
+        <Animation Name="gGohmaLayEggsAnim" Offset="0x113BC"/>
+        <Animation Name="gGohmaIdleCrouchedAnim" Offset="0x12678"/>
+        <Animation Name="gGohmaWalkCrouchedAnim" Offset="0x1D74C"/>
+
+        <!-- Unused animations -->
+        <Animation Name="gGohmaViolentAttackAnim" Offset="0x39D0"/>
+
+        <!-- Limb textures -->
+        <Texture Name="gGohmaBodyTex" OutName="gohma_body" Format="rgba16" Width="16" Height="16" Offset="0x183A8"/>
+        <Texture Name="gGohmaShellUndersideTex" OutName="gohma_shell_underside" Format="rgba16" Width="16" Height="16" Offset="0x185A8"/>
+        <Texture Name="gGohmaDarkShellTex" OutName="gohma_dark_shell" Format="rgba16" Width="16" Height="16" Offset="0x187A8"/>
+        <Texture Name="gGohmaShellTex" OutName="gohma_shell" Format="rgba16" Width="32" Height="32" Offset="0x189A8"/>
+        <Texture Name="gGohmaEyeTex" OutName="gohma_eye" Format="rgba16" Width="16" Height="16" Offset="0x191A8"/>
+        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>
+
+        <!-- Boss title card -->
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>
+
+        <!-- Door -->
+        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
+        <Collision Name="gGohmaDoorCol" Offset="0x1D9D0"/>
+        <Texture Name="gGohmaDoorTex" OutName="door" Format="rgba16" Width="32" Height="32" Offset="0x1DA00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_goroiwa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_goroiwa.xml
new file mode 100644
index 0000000000..5d406e9578
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_goroiwa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_goroiwa" Segment="6">
+        <Texture Name="gRollingRockTex" OutName="rolling_rock" Format="rgba16" Width="32" Height="64" Offset="0x8A0"/>
+        <DList Name="gRollingRockDL" Offset="0x6B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gr.xml
new file mode 100644
index 0000000000..5f7360ae57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gr.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_gr" Segment="6">
+        <Texture Name="object_grTex_005D78" OutName="object_grTex_005D78" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005E78" OutName="object_grTex_005E78" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EB8" OutName="object_grTex_005EB8" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_005EF8" OutName="object_grTex_005EF8" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0077F8" OutName="object_grTex_0077F8" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007BF8" OutName="object_grTex_007BF8" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_007FF8" OutName="object_grTex_007FF8" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0083F8" OutName="object_grTex_0083F8" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_0097F8" OutName="object_grTex_0097F8" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTex_009808" OutName="object_grTex_009808" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78" AddedByScript="true"/>
+        <Texture Name="object_grTLUT_003F78" OutName="object_grTLUT_003F78" Format="rgba16" Width="16" Height="16" Offset="0x3F78" AddedByScript="true"/>
+        <Skeleton Name="gNiwGirlSkel" Type="Flex" LimbType="Standard" Offset="0x9948"/>
+        <Animation Name="gNiwGirlRunAnim" Offset="0x0378"/>
+        <Animation Name="gNiwGirlJumpAnim" Offset="0x9C78"/>
+        <Texture Name="gNiwGirlEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4178"/>
+        <Texture Name="gNiwGirlEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4978"/>
+        <Texture Name="gNiwGirlEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x5178"/>
+        <Texture Name="gNiwGirlMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x5978"/>
+        <Texture Name="gNiwGirlDress1Tex" OutName="dress_1" Format="rgba16" Width="32" Height="32" Offset="0x5FF8"/>
+        <Texture Name="gNiwGirlDress2Tex" OutName="dress_2" Format="rgba16" Width="32" Height="32" Offset="0x6FF8"/>
+        <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
+        <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
+        <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gs.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gs.xml
new file mode 100644
index 0000000000..145be16653
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gs.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_gs" Segment="6">
+        <Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="gGossipStoneMaterialDL" Offset="0x950"/>
+        <DList Name="gGossipStoneDL" Offset="0x9D0"/>
+        <DList Name="gGossipStoneSquishedDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_gt.xml b/soh/assets/xml/N64_NTSC_12/objects/object_gt.xml
new file mode 100644
index 0000000000..1d79d4e39e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_gt.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="object_gt" Segment="6">
+        <!-- Tower Collapse Textures -->
+        <Texture Name="gTowerCollapseCsFlameSmokeTex" OutName="flame_smoke" Format="i8" Width="16" Height="256" Offset="0x9C70"/>
+        <Texture Name="gTowerCollapseCsGrayStoneTex" OutName="gray_stone" Format="i8" Width="32" Height="32" Offset="0xAC70"/>
+        <Texture Name="gTowerCollapseCsExteriorBlackStoneTex" OutName="exterior_black_stone" Format="i4" Width="64" Height="64" Offset="0xB070"/>
+        <Texture Name="gTowerCollapseCsTex_B870" OutName="tex_B870" Format="i4" Width="32" Height="8" Offset="0xB870"/>
+        <Texture Name="gTowerCollapseCsRaftersTex" OutName="rafters" Format="ia8" Width="32" Height="32" Offset="0xB8F0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor1Tex" OutName="brown_paneled_floor_1" Format="rgba16" Width="32" Height="64" Offset="0xBCF0"/>
+        <Texture Name="gTowerCollapseCsBrownPaneledFloor2Tex" OutName="brown_paneled_floor_2" Format="rgba16" Width="32" Height="64" Offset="0xCCF0"/>
+        <Texture Name="gTowerCollapseCsExteriorPillarStoneTex" OutName="exterior_pillar_stone" Format="i4" Width="64" Height="128" Offset="0xDCF0"/>
+        <Texture Name="gTowerCollapseCsRailingTex" OutName="railing" Format="ia8" Width="32" Height="16" Offset="0xECF0"/>
+        <Texture Name="gTowerCollapseCsTex_EEF0" OutName="tex_EEF0" Format="i4" Width="32" Height="64" Offset="0xEEF0"/>
+        <Texture Name="gTowerCollapseCsTex_F2F0" OutName="tex_F2F0" Format="i8" Width="16" Height="32" Offset="0xF2F0"/>
+        <Texture Name="gTowerCollapseCsGrayFloorTex" OutName="gray_floor" Format="i8" Width="16" Height="32" Offset="0xF4F0"/>  
+        <Texture Name="gTowerCollapseCsTex_F6F0" OutName="tex_F6F0" Format="i4" Width="64" Height="64" Offset="0xF6F0"/>
+        <Texture Name="gTowerCollapseCsBoltedSidesTex" OutName="bolted_sides" Format="i8" Width="64" Height="64" Offset="0xFEF0"/>
+        <Texture Name="gTowerCollapseCsSpikeTex" OutName="spike" Format="ia8" Width="16" Height="16" Offset="0x10EF0"/>   
+        <Texture Name="gTowerCollapseCsCollapsedCastleEdgeTex" OutName="collapsed_castle_edge" Format="i8" Width="64" Height="64" Offset="0x10FF0"/>
+        <Texture Name="gTowerCollapseCsTex_11FF0" OutName="tex_11FF0" Format="i8" Width="32" Height="32" Offset="0x11FF0"/>
+        <Texture Name="gTowerCollapseCsTex_123F0" OutName="tex_123F0" Format="rgba16" Width="16" Height="16" Offset="0x123F0"/>
+        <Texture Name="gTowerCollapseCsTex_125F0" OutName="tex_125F0" Format="i8" Width="64" Height="64" Offset="0x125F0"/>
+        
+        <!-- Tower Collapse DisplayLists -->
+        <DList Name="gTowerCollapseCsExteriorStructureDL" Offset="0x2910"/>
+        <DList Name="gTowerCollapseCsFlameSmokeDL" Offset="0x41A0"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureInnerDL" Offset="0x4F90"/>
+        <DList Name="gTowerCollapseCsCollapsedStructureOuterDL" Offset="0x7630"/>
+        <DList Name="gTowerCollapseCsStandalonePillarDL" Offset="0x9610"/>
+        <DList Name="gTowerCollapseCsWalkwayDL" Offset="0x9970"/>
+        <DList Name="gTowerCollapseCsAlternativeWalkwayDL" Offset="0x9B80"/>
+
+        <!-- Tower Collapse Collision -->
+        <Collision Name="gTowerCollapseCsCollapsedStructureInnerCol" Offset="0x5CB8"/>
+        <Collision Name="gTowerCollapseCsCollapsedStructureOuterCol" Offset="0x91E4"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_haka.xml b/soh/assets/xml/N64_NTSC_12/objects/object_haka.xml
new file mode 100644
index 0000000000..f6b263c375
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_haka.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_haka" Segment="6">
+        <Texture Name="gGravestoneGrassTex" OutName="grass" Format="rgba16" Width="16" Height="32" Offset="0x460"/>
+        <Texture Name="gGravestoneEarthTex" OutName="earth" Format="ia8" Width="32" Height="32" Offset="0x860"/>
+        <Texture Name="gGravestoneTombTex" OutName="tomb" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <DList Name="gGravestoneStoneDL" Offset="0x1B0"/>
+        <DList Name="gGravestoneEarthDL" Offset="0x2A8"/>
+        <Collision Name="gGravestoneCol" Offset="0x428"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_haka_door.xml b/soh/assets/xml/N64_NTSC_12/objects/object_haka_door.xml
new file mode 100644
index 0000000000..1376d03569
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_haka_door.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_haka_door" Segment="6">
+        <Texture Name="object_haka_door_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_haka_door_DL_001310" Offset="0x1310"/>
+        <DList Name="gShadowDoorLeftDL" Offset="0x13B8"/>
+        <DList Name="gShadowDoorRightDL" Offset="0x1420"/>
+        <Texture Name="object_haka_door_Tex_001490" OutName="tex_00001490" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <DList Name="object_haka_door_DL_002620" Offset="0x2620"/>
+        <Texture Name="object_haka_door_Tex_002700" OutName="tex_00002700" Format="rgba16" Width="32" Height="64" Offset="0x2700"/>
+        <DList Name="object_haka_door_DL_003890" Offset="0x3890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_haka_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_haka_objects.xml
new file mode 100644
index 0000000000..3ca6d27c08
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_haka_objects.xml
@@ -0,0 +1,85 @@
+<Root>
+    <File Name="object_haka_objects" Segment="6">
+        <DList Name="object_haka_objects_DL_000040" Offset="0x40"/>
+        <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/>
+        <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/>
+        <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/>
+        <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
+        <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
+        <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
+        <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
+        <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
+        <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
+        <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
+        <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
+        <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
+        <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
+        <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
+        <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/>
+        <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/>
+        <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/>
+        <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/>
+        <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/>
+        <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/>
+        <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/>
+        <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/>
+        <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/>
+        <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/>
+        <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/>
+        <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/>
+        <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/>
+        <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/>
+        <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/>
+        <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/>
+        <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/>
+        <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/>
+        <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/>
+        <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/>
+        <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/>
+        <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/>
+        <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/>
+        <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/>
+        <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/>
+        <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/>
+        <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/>
+        <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/>
+        <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/>
+        <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/>
+        <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/>
+        <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/>
+        <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/>
+        <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/>
+        <Texture Name="object_haka_objects_Tex_0145F0" OutName="tex_000145F0" Format="rgba16" Width="32" Height="64" Offset="0x145F0"/>
+        <Texture Name="object_haka_objects_Tex_0155F0" OutName="tex_000155F0" Format="rgba16" Width="32" Height="64" Offset="0x155F0"/>
+        <Texture Name="object_haka_objects_Tex_0165F0" OutName="tex_000165F0" Format="rgba16" Width="32" Height="8" Offset="0x165F0"/>
+        <Texture Name="object_haka_objects_Tex_0167F0" OutName="tex_000167F0" Format="rgba16" Width="32" Height="16" Offset="0x167F0"/>
+        <Texture Name="object_haka_objects_Tex_016BF0" OutName="tex_00016BF0" Format="i4" Width="32" Height="32" Offset="0x16BF0"/>
+        <Texture Name="object_haka_objects_Tex_016DF0" OutName="tex_00016DF0" Format="i4" Width="32" Height="32" Offset="0x16DF0"/>
+        <Texture Name="object_haka_objects_Tex_016FF0" OutName="tex_00016FF0" Format="i4" Width="32" Height="32" Offset="0x16FF0"/>
+        <Texture Name="object_haka_objects_Tex_0171F0" OutName="tex_000171F0" Format="i4" Width="32" Height="32" Offset="0x171F0"/>
+        <Texture Name="object_haka_objects_Tex_0173F0" OutName="tex_000173F0" Format="i4" Width="32" Height="32" Offset="0x173F0"/>
+        <Texture Name="object_haka_objects_Tex_0175F0" OutName="tex_000175F0" Format="i4" Width="32" Height="32" Offset="0x175F0"/>
+        <Texture Name="object_haka_objects_Tex_0177F0" OutName="tex_000177F0" Format="rgba16" Width="32" Height="32" Offset="0x177F0"/>
+        <Texture Name="object_haka_objects_Tex_017FF0" OutName="tex_00017FF0" Format="rgba16" Width="32" Height="32" Offset="0x17FF0"/>
+        <Texture Name="object_haka_objects_Tex_0187F0" OutName="tex_000187F0" Format="rgba16" Width="16" Height="64" Offset="0x187F0"/>
+        <Texture Name="object_haka_objects_Tex_018FF0" OutName="tex_00018FF0" Format="rgba16" Width="32" Height="32" Offset="0x18FF0"/>
+        <Texture Name="object_haka_objects_Tex_0197F0" OutName="tex_000197F0" Format="i4" Width="16" Height="16" Offset="0x197F0"/>
+        <Texture Name="object_haka_objects_Tex_019870" OutName="tex_00019870" Format="rgba16" Width="32" Height="32" Offset="0x19870"/>
+        <Texture Name="object_haka_objects_Tex_01A070" OutName="tex_0001A070" Format="rgba16" Width="16" Height="32" Offset="0x1A070"/>
+        <Texture Name="object_haka_objects_Tex_01A470" OutName="tex_0001A470" Format="i4" Width="32" Height="32" Offset="0x1A470"/>
+        <Texture Name="object_haka_objects_Tex_01A670" OutName="tex_0001A670" Format="rgba16" Width="32" Height="32" Offset="0x1A670"/>
+        <Texture Name="object_haka_objects_Tex_01AE70" OutName="tex_0001AE70" Format="ia4" Width="64" Height="32" Offset="0x1AE70"/>
+        <Texture Name="object_haka_objects_Tex_01B270" OutName="tex_0001B270" Format="rgba16" Width="64" Height="16" Offset="0x1B270"/>
+        <Texture Name="object_haka_objects_Tex_01BA70" OutName="tex_0001BA70" Format="rgba16" Width="64" Height="16" Offset="0x1BA70"/>
+        <Texture Name="object_haka_objects_Tex_01C270" OutName="tex_0001C270" Format="i4" Width="32" Height="32" Offset="0x1C270"/>
+        <Texture Name="object_haka_objects_Tex_01C470" OutName="tex_0001C470" Format="i4" Width="32" Height="32" Offset="0x1C470"/>
+        <Texture Name="object_haka_objects_Tex_01C670" OutName="tex_0001C670" Format="rgba16" Width="32" Height="33" Offset="0x1C670"/>
+        <Texture Name="object_haka_objects_Tex_01CEB0" OutName="tex_0001CEB0" Format="i4" Width="64" Height="64" Offset="0x1CEB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hakach_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hakach_objects.xml
new file mode 100644
index 0000000000..0de02aaf15
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hakach_objects.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hakach_objects" Segment="6">
+        <Texture Name="object_hakach_objectsTex_0062F0" OutName="object_hakach_objectsTex_0062F0" Format="rgba16" Width="32" Height="32" Offset="0x62F0" AddedByScript="true"/>
+        <DList Name="gBotwHoleTrap1DL" Offset="0x01B0"/>
+        <DList Name="gBotwHoleTrap2DL" Offset="0x03F0"/>
+        <DList Name="gBotwCoffinLidDL" Offset="0x06B0"/>
+        <DList Name="gBotwBombSpotDL" Offset="0x0A10"/>
+        <DList Name="gBotwFakeWallsAndFloorsDL" Offset="0x1060"/>
+        <DList Name="gBotwBloodSplatterDL" Offset="0x1250"/>
+        <DList Name="gBotwThreeFakeFloorsDL" Offset="0x1920"/>
+        <DList Name="gBotwWaterRingDL" Offset="0x1E50"/>
+        <DList Name="gBotwWaterFallDL" Offset="0x2010"/>
+
+        <Collision Name="gBotwCoffinLidCol" Offset="0x0870"/>
+        <Collision Name="gBotwBombSpotCol" Offset="0x0C2C"/>
+        <Collision Name="gBotw1Col" Offset="0x1830"/>
+        <Collision Name="gBotw2Col" Offset="0x1AB8"/>
+
+        <Texture Name="gBotwWater1Tex" OutName="water_1" Format="ia16" Width="32" Height="32" Offset="0x028F0"/>
+        <Texture Name="gBotwWater2Tex" OutName="water_2" Format="rgba16" Width="32" Height="32" Offset="0x020F0"/>
+        <Texture Name="gBotwTex_0030F0" Format="rgba16" Width="32" Height="32" Offset="0x30F0"/>
+        <Texture Name="gBotwBloodSplatterTex" OutName="blood_splatter" Format="ia16" Width="32" Height="32" Offset="0x38F0"/>
+        <Texture Name="gBotwTex_0040F0" Format="rgba16" Width="32" Height="32" Offset="0x40F0"/>
+        <Texture Name="gBotwTex_0048F0" Format="rgba16" Width="32" Height="32" Offset="0x48F0"/>
+        <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
+        <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
+        <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hata.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hata.xml
new file mode 100644
index 0000000000..b0324c3be3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hata.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="object_hata" Segment="6">
+        <!-- Flagpole Collision -->
+        <Collision Name="gFlagpoleCol" Offset="0xC0"/>
+
+        <!-- Flagpole Animation -->
+        <Animation Name="gFlagpoleFlapAnim" Offset="0x444"/>
+
+        <!-- Flagpole Skeleton -->
+        <Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" Offset="0x2FD0"/>
+
+        <!-- Flagpole Limbs -->
+        <Limb Name="gFlagpolePoleBaseLimb" LimbType="Standard" Offset="0x2E90"/>
+        <Limb Name="gFlagpolePoleLimb" LimbType="Standard" Offset="0x2E9C"/>
+        <Limb Name="gFlagpoleFlag1BaseLimb" LimbType="Standard" Offset="0x2EA8"/>
+        <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" LimbType="Standard" Offset="0x2EB4"/>
+        <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" LimbType="Standard" Offset="0x2EC0"/>
+        <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" LimbType="Standard" Offset="0x2ECC"/>
+        <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" LimbType="Standard" Offset="0x2ED8"/>
+        <Limb Name="gFlagpoleFlag1FlyEndLimb" LimbType="Standard" Offset="0x2EE4"/>
+        <Limb Name="gFlagpoleFlag1FlyMidLimb" LimbType="Standard" Offset="0x2EF0"/>
+        <Limb Name="gFlagpoleFlag1HoistMidLimb" LimbType="Standard" Offset="0x2EFC"/>
+        <Limb Name="gFlagpoleFlag1HoistEndLimb" LimbType="Standard" Offset="0x2F08"/>
+        <Limb Name="gFlagpoleFlag2BaseLimb" LimbType="Standard" Offset="0x2F14"/>
+        <Limb Name="gFlagpoleFlag2HoistEndBaseLimb" LimbType="Standard" Offset="0x2F20"/>
+        <Limb Name="gFlagpoleFlag2HoistMidBaseLimb" LimbType="Standard" Offset="0x2F2C"/>
+        <Limb Name="gFlagpoleFlag2FlyMidBaseLimb" LimbType="Standard" Offset="0x2F38"/>
+        <Limb Name="gFlagpoleFlag2FlyEndBaseLimb" LimbType="Standard" Offset="0x2F44"/>
+        <Limb Name="gFlagpoleFlag2FlyEndLimb" LimbType="Standard" Offset="0x2F50"/>
+        <Limb Name="gFlagpoleFlag2FlyMidLimb" LimbType="Standard" Offset="0x2F5C"/>
+        <Limb Name="gFlagpoleFlag2HoistMidLimb" LimbType="Standard" Offset="0x2F68"/>
+        <Limb Name="gFlagpoleFlag2HoistEndLimb" LimbType="Standard" Offset="0x2F74"/>
+
+        <!-- Flagpole DLists -->
+        <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
+        <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
+        <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
+        <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
+        <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
+        <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
+        <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
+        <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
+        <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
+
+        <!-- Flagpole Textures -->
+        <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole_tex" Format="rgba16" Width="32" Height="32" Offset="0x460"/>
+        <Texture Name="gFlagpoleTopTex" OutName="flagpole_top_tex" Format="rgba16" Width="32" Height="32" Offset="0xC60"/>
+        <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag_tex" Format="ia8" Width="128" Height="32" Offset="0x1460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_heavy_object.xml b/soh/assets/xml/N64_NTSC_12/objects/object_heavy_object.xml
new file mode 100644
index 0000000000..ecc7953211
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_heavy_object.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_heavy_object" Segment="6">
+        <Texture Name="gHeavyBlockTex" OutName="block" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <DList Name="gHeavyBlockEntirePillarDL" Offset="0x13C0"/>
+        <DList Name="gHeavyBlockBigPieceDL" Offset="0x18A0"/>
+        <DList Name="gHeavyBlockSmallPieceDL" Offset="0x1A30"/>
+        <Collision Name="gHeavyBlockCol" Offset="0x169C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hidan_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hidan_objects.xml
new file mode 100644
index 0000000000..f41c0ee5ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hidan_objects.xml
@@ -0,0 +1,109 @@
+<Root>
+    <File Name="object_hidan_objects" Segment="6">
+        <Texture Name="object_hidan_objectsTex_000040" OutName="object_hidan_objectsTex_000040" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000240" OutName="object_hidan_objectsTex_000240" Format="rgba16" Width="32" Height="32" Offset="0x240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_000A40" OutName="object_hidan_objectsTex_000A40" Format="rgba16" Width="32" Height="64" Offset="0xA40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_001A40" OutName="object_hidan_objectsTex_001A40" Format="rgba16" Width="32" Height="64" Offset="0x1A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_002A40" OutName="object_hidan_objectsTex_002A40" Format="rgba16" Width="32" Height="64" Offset="0x2A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_003A40" OutName="object_hidan_objectsTex_003A40" Format="rgba16" Width="32" Height="32" Offset="0x3A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004240" OutName="object_hidan_objectsTex_004240" Format="rgba16" Width="16" Height="64" Offset="0x4240" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_004A40" OutName="object_hidan_objectsTex_004A40" Format="rgba16" Width="32" Height="32" Offset="0x4A40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005240" OutName="object_hidan_objectsTex_005240" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005640" OutName="object_hidan_objectsTex_005640" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005A40" OutName="object_hidan_objectsTex_005A40" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_005E40" OutName="object_hidan_objectsTex_005E40" Format="rgba16" Width="32" Height="32" Offset="0x5E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006640" OutName="object_hidan_objectsTex_006640" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006A40" OutName="object_hidan_objectsTex_006A40" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006C40" OutName="object_hidan_objectsTex_006C40" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_006E40" OutName="object_hidan_objectsTex_006E40" Format="rgba16" Width="32" Height="32" Offset="0x6E40" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_00FB20" OutName="object_hidan_objectsTex_00FB20" Format="rgba16" Width="32" Height="64" Offset="0xFB20" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTex_010D90" OutName="object_hidan_objectsTex_010D90" Format="rgba16" Width="32" Height="64" Offset="0x10D90" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000000" OutName="object_hidan_objectsTLUT_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_hidan_objectsTLUT_000020" OutName="object_hidan_objectsTLUT_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" AddedByScript="true"/>
+        <DList Name="gFireTempleHammerableTotemBodyDL" Offset="0xBBF0"/>
+        <DList Name="gFireTempleHammerableTotemHeadDL" Offset="0xBDF0"/>
+        <Collision Name="gFireTempleHammerableTotemCol" Offset="0xDA10"/>
+
+        <DList Name="gFireTempleHookshotElevatorDL" Offset="0xB630"/>
+        <Collision Name="gFireTempleHookshotElevatorCol" Offset="0xE1E8"/>
+
+        <DList Name="gFireTempleBigFireWallDL" Offset="0xDB20"/>
+
+        <DList Name="gFireTempleStoneStep1DL" Offset="0xA668"/>
+        <Collision Name="gFireTempleStoneStep1Col" Offset="0xDE44"/>
+        <DList Name="gFireTempleStoneStep2DL" Offset="0xA548"/>
+        <Collision Name="gFireTempleStoneStep2Col" Offset="0xDD1C"/>
+
+        <DList Name="gFireTempleMetalFenceWithSlantDL" Offset="0xC798"/>
+        <Collision Name="gFireTempleMetalFenceWithSlantCol" Offset="0xE2CC"/>
+        <DList Name="gFireTempleMetalFenceDL" Offset="0xBFA8"/>
+        <Collision Name="gFireTempleMetalFenceCol" Offset="0xE380"/>
+        <DList Name="gFireTempleMetalFence2DL" Offset="0xBB58"/>
+        <Collision Name="gFireTempleMetalFence2Col" Offset="0xE430"/>
+
+        <DList Name="gFireTempleCrackedStoneFloorDL" Offset="0xB9C0"/>
+        <Collision Name="gFireTempleCrackedStoneFloorCol" Offset="0xD800"/>
+        <DList Name="gFireTempleBombableWallDL" Offset="0xC038"/>
+        <Collision Name="gFireTempleBombableWallCol" Offset="0xD878"/>
+        <DList Name="gFireTempleLargeBombableWallDL" Offset="0xB900"/>
+        <Collision Name="gFireTempleLargeBombableWallCol" Offset="0xD8F8"/>
+
+        <DList Name="gFireTempleStoneBlock1DL" Offset="0xC100"/>
+        <Collision Name="gFireTempleStoneBlock1Col" Offset="0xCB80"/>
+        <DList Name="gFireTempleStoneBlock2DL" Offset="0xC1F0"/>
+        <Collision Name="gFireTempleStoneBlock2Col" Offset="0xDF78"/>
+
+        <DList Name="gFireTempleBigVerticalFlameDL" Offset="0xCA10"/>
+
+        <Texture Name="gFireTempleBigVerticalFlame0Tex" OutName="big_vertical_flame_0" Format="ia8" Width="24" Height="80" Offset="0x12120"/>
+        <Texture Name="gFireTempleBigVerticalFlame1Tex" OutName="big_vertical_flame_1" Format="ia8" Width="24" Height="80" Offset="0x128A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame2Tex" OutName="big_vertical_flame_2" Format="ia8" Width="24" Height="80" Offset="0x13020"/>
+        <Texture Name="gFireTempleBigVerticalFlame3Tex" OutName="big_vertical_flame_3" Format="ia8" Width="24" Height="80" Offset="0x137A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame4Tex" OutName="big_vertical_flame_4" Format="ia8" Width="24" Height="80" Offset="0x13F20"/>
+        <Texture Name="gFireTempleBigVerticalFlame5Tex" OutName="big_vertical_flame_5" Format="ia8" Width="24" Height="80" Offset="0x146A0"/>
+        <Texture Name="gFireTempleBigVerticalFlame6Tex" OutName="big_vertical_flame_6" Format="ia8" Width="24" Height="80" Offset="0x14E20"/>
+        <Texture Name="gFireTempleBigVerticalFlame7Tex" OutName="big_vertical_flame_7" Format="ia8" Width="24" Height="80" Offset="0x155A0"/>
+
+        <DList Name="gFireTempleFireballDL" Offset="0xDC30"/>
+        <DList Name="gFireTempleFireballUpperHalfDL" Offset="0xDA80"/>
+
+        <Texture Name="gFireTempleFireball0Tex" OutName="fireball_0" Format="ia8" Width="32" Height="32" Offset="0x15D20"/>
+        <Texture Name="gFireTempleFireball1Tex" OutName="fireball_1" Format="ia8" Width="32" Height="32" Offset="0x16120"/>
+        <Texture Name="gFireTempleFireball2Tex" OutName="fireball_2" Format="ia8" Width="32" Height="32" Offset="0x16520"/>
+        <Texture Name="gFireTempleFireball3Tex" OutName="fireball_3" Format="ia8" Width="32" Height="32" Offset="0x16920"/>
+        <Texture Name="gFireTempleFireball4Tex" OutName="fireball_4" Format="ia8" Width="32" Height="32" Offset="0x16D20"/>
+        <Texture Name="gFireTempleFireball5Tex" OutName="fireball_5" Format="ia8" Width="32" Height="32" Offset="0x17120"/>
+        <Texture Name="gFireTempleFireball6Tex" OutName="fireball_6" Format="ia8" Width="32" Height="32" Offset="0x17520"/>
+        <Texture Name="gFireTempleFireball7Tex" OutName="fireball_7" Format="ia8" Width="32" Height="32" Offset="0x17920"/>
+
+        <DList Name="gFireTempleSpinningFlamethrowerDL" Offset="0xAD00"/>
+        <Collision Name="gFireTempleSpinningFlamethrowerCol" Offset="0xD5C0"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerShortDL" Offset="0xB0F8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerShortCol" Offset="0xCC90"/>
+
+        <DList Name="gFireTempleStationaryFlamethrowerTallDL" Offset="0xABC8"/>
+        <Collision Name="gFireTempleStationaryFlamethrowerTallCol" Offset="0xCDA0"/>
+
+        <DList Name="gFireTempleStonePlatform1DL" Offset="0xC338"/>
+        <Collision Name="gFireTempleStonePlatform1Col" Offset="0x120E8"/>
+        <DList Name="gFireTempleStonePlatform2DL" Offset="0xC470"/>
+        <Collision Name="gFireTempleStonePlatform2Col" Offset="0xFAE8"/>
+
+        <DList Name="gFireTempleFlareDancerPlatformDL" Offset="0xA7E0"/>
+        <Collision Name="gFireTempleFlareDancerPlatformCol" Offset="0xE568"/>
+
+        <DList Name="gFireTempleTallestPillarAboveRoomBeforeBossDL" Offset="0xA240"/>
+        <Collision Name="gFireTempleTallestPillarAboveRoomBeforeBossCol" Offset="0xD054"/>
+        <DList Name="gFireTemplePillarInsertedInGroundDL" Offset="0xC838"/>
+        <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
+
+        <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
+        <DList Name="gFireTempleDoorWithHandleRightDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleLeftDL" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
+        <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
+
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hintnuts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hintnuts.xml
new file mode 100644
index 0000000000..a7290f3955
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hintnuts.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_hintnuts" Segment="6">
+        <Texture Name="object_hintnutsTex_0015A8" OutName="object_hintnutsTex_0015A8" Format="rgba16" Width="32" Height="32" Offset="0x15A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001DA8" OutName="object_hintnutsTex_001DA8" Format="rgba16" Width="16" Height="16" Offset="0x1DA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_001FA8" OutName="object_hintnutsTex_001FA8" Format="rgba16" Width="8" Height="8" Offset="0x1FA8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002028" OutName="object_hintnutsTex_002028" Format="rgba16" Width="8" Height="8" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_0020A8" OutName="object_hintnutsTex_0020A8" Format="rgba16" Width="8" Height="8" Offset="0x20A8" AddedByScript="true"/>
+        <Texture Name="object_hintnutsTex_002128" OutName="object_hintnutsTex_002128" Format="rgba16" Width="16" Height="16" Offset="0x2128" AddedByScript="true"/>
+        <!-- Deku scrub skeleton -->
+        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        
+        <!-- Deku Scrub animations -->
+        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
+        <Animation Name="gHintNutsBurrowAnim" Offset="0x24CC"/>
+        <Animation Name="gHintNutsUnburrowAnim" Offset="0x26C4"/>
+        <Animation Name="gHintNutsUpAnim" Offset="0x2B90"/>
+        <Animation Name="gHintNutsLookAroundAnim" Offset="0x2894"/>
+        <Animation Name="gHintNutsFreezeAnim" Offset="0x29BC"/>
+        <Animation Name="gHintNutsTalkAnim" Offset="0x2E84"/>
+        <Animation Name="gHintNutsStandAnim" Offset="0x2F7C"/>
+        <Animation Name="gHintNutsRunAnim" Offset="0x3128"/>
+
+        <!-- Deku Scrub flower -->
+        <DList Name="gHintNutsFlowerDL" Offset="0x14E0"/>
+
+        <!-- Deku Scrub Deku Nut (used by Nutsball) -->
+        <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hni.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hni.xml
new file mode 100644
index 0000000000..6b317eb7a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hni.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="object_hni" Segment="6">
+        <Skeleton Name="gHorseIngoSkel" Type="Normal" LimbType="Skin" Offset="0x4A24"/>
+
+        <Animation Name="gHorseIngoIdleAnim" Offset="0x9FC4"/>
+        <Animation Name="gHorseIngoWhinnyAnim" Offset="0xA6B4"/>
+        <Animation Name="gHorseIngoRefuseAnim" Offset="0x901C"/>
+        <Animation Name="gHorseIngoRearingAnim" Offset="0x85E0"/>
+        <Animation Name="gHorseIngoWalkingAnim" Offset="0xAF60"/>
+        <Animation Name="gHorseIngoTrottingAnim" Offset="0x7B54"/>
+        <Animation Name="gHorseIngoGallopingAnim" Offset="0x506C"/>
+        <Animation Name="gHorseIngoJumpingAnim" Offset="0x5684"/>
+        <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
+
+        <!-- Head -->
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
+
+        <!-- Body -->
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
+
+        <!-- Saddle -->
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
+
+        <!-- Hooves -->
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
+
+        <!-- Gerudo saddle -->
+        <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
+
+        <!-- Eye texture -->
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_horse.xml b/soh/assets/xml/N64_NTSC_12/objects/object_horse.xml
new file mode 100644
index 0000000000..74619e5977
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_horse.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_horse" Segment="6">
+        <Skeleton Name="gEponaSkel" Type="Normal" LimbType="Skin" Offset="0x9D74"/>
+
+        <Animation Name="gEponaIdleAnim" Offset="0x6D50"/>
+        <Animation Name="gEponaWhinnyAnim" Offset="0x5584"/>
+        <Animation Name="gEponaRefuseAnim" Offset="0x4DEC"/>
+        <Animation Name="gEponaRearingAnim" Offset="0x3CEC"/>
+        <Animation Name="gEponaWalkingAnim" Offset="0x75F0"/>
+        <Animation Name="gEponaTrottingAnim" Offset="0x32B0"/>
+        <Animation Name="gEponaGallopingAnim" Offset="0x1E2C"/>
+        <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
+        <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
+
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
+
+        <!-- Head -->
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
+
+        <!-- Body -->
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
+
+        <!-- Saddle -->
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
+
+        <!-- Cannons -->
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
+
+        <!-- Hooves -->
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
+        <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
+
+        <DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>
+        <DList Name="gEponaUnusedWhiteRectangle2DL" Offset="0x620"/>
+        <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
+        <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
+
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_horse_ganon.xml b/soh/assets/xml/N64_NTSC_12/objects/object_horse_ganon.xml
new file mode 100644
index 0000000000..0a55462e25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_horse_ganon.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="object_horse_ganon" Segment="6">
+        <Texture Name="object_horse_ganonTex_00A570" OutName="object_horse_ganonTex_00A570" Format="rgba16" Width="8" Height="8" Offset="0xA570" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A5F0" OutName="object_horse_ganonTex_00A5F0" Format="rgba16" Width="16" Height="16" Offset="0xA5F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A7F0" OutName="object_horse_ganonTex_00A7F0" Format="rgba16" Width="4" Height="4" Offset="0xA7F0" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00A810" OutName="object_horse_ganonTex_00A810" Format="rgba16" Width="16" Height="16" Offset="0xA810" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00AA10" OutName="object_horse_ganonTex_00AA10" Format="rgba16" Width="16" Height="16" Offset="0xAA10" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B010" OutName="object_horse_ganonTex_00B010" Format="rgba16" Width="8" Height="16" Offset="0xB010" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B110" OutName="object_horse_ganonTex_00B110" Format="rgba16" Width="16" Height="32" Offset="0xB110" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B510" OutName="object_horse_ganonTex_00B510" Format="rgba16" Width="16" Height="8" Offset="0xB510" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B610" OutName="object_horse_ganonTex_00B610" Format="rgba16" Width="8" Height="8" Offset="0xB610" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00B690" OutName="object_horse_ganonTex_00B690" Format="rgba16" Width="32" Height="32" Offset="0xB690" AddedByScript="true"/>
+        <Texture Name="object_horse_ganonTex_00BE90" OutName="object_horse_ganonTex_00BE90" Format="rgba16" Width="16" Height="16" Offset="0xBE90" AddedByScript="true"/>
+        <Skeleton Name="gHorseGanonSkel" Type="Normal" LimbType="Skin" Offset="0x8668"/>
+
+        <!-- Idle. Horse moving leg. -->
+        <Animation Name="gHorseGanonIdleAnim" Offset="0x4AA4"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseGanonWhinnyAnim" Offset="0x5264"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseGanonWalkingAnim" Offset="0x5B78"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseGanonTrottingAnim" Offset="0x2CE4"/>
+        <!-- Running. -->
+        <Animation Name="gHorseGanonGallopingAnim" Offset="0x2650"/>
+        <!-- Stand in two legs for a moment. -->
+        <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
+
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_horse_link_child.xml b/soh/assets/xml/N64_NTSC_12/objects/object_horse_link_child.xml
new file mode 100644
index 0000000000..146c564f55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_horse_link_child.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_horse_link_child" Segment="6">
+        <Texture Name="object_horse_link_childTex_001F28" OutName="object_horse_link_childTex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_001F68" OutName="object_horse_link_childTex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002168" OutName="object_horse_link_childTex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002368" OutName="object_horse_link_childTex_002368" Format="rgba16" Width="16" Height="16" Offset="0x2368" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002568" OutName="object_horse_link_childTex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002588" OutName="object_horse_link_childTex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_002788" OutName="object_horse_link_childTex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008120" OutName="object_horse_link_childTex_008120" Format="rgba16" Width="16" Height="16" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="object_horse_link_childTex_008320" OutName="object_horse_link_childTex_008320" Format="rgba16" Width="32" Height="32" Offset="0x8320" AddedByScript="true"/>
+        <Skeleton Name="gChildEponaSkel" Type="Normal" LimbType="Skin" Offset="0x7B20"/>
+
+        <!-- Idle animation. -->
+        <Animation Name="gChildEponaIdleAnim" Offset="0x43E4"/>
+        <!-- The animation that horses usually do. You know, that one... moving its head... -->
+        <Animation Name="gChildEponaWhinnyAnim" Offset="0x4B08"/>
+        <!-- Walking slow. -->
+        <Animation Name="gChildEponaWalkingAnim" Offset="0x53F0"/>
+        <!-- Walking fast. -->
+        <Animation Name="gChildEponaTrottingAnim" Offset="0x360C"/>
+        <!-- Running. -->
+        <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
+
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
+        <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_horse_normal.xml b/soh/assets/xml/N64_NTSC_12/objects/object_horse_normal.xml
new file mode 100644
index 0000000000..2facab39c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_horse_normal.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_horse_normal" Segment="6">
+        <Texture Name="object_horse_normalTex_0058D8" OutName="object_horse_normalTex_0058D8" Format="i8" Width="8" Height="8" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005918" OutName="object_horse_normalTex_005918" Format="rgba16" Width="16" Height="16" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B18" OutName="object_horse_normalTex_005B18" Format="rgba16" Width="8" Height="8" Offset="0x5B18" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005B98" OutName="object_horse_normalTex_005B98" Format="i8" Width="16" Height="16" Offset="0x5B98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_005C98" OutName="object_horse_normalTex_005C98" Format="i8" Width="16" Height="8" Offset="0x5C98" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_006F28" OutName="object_horse_normalTex_006F28" Format="i8" Width="16" Height="16" Offset="0x6F28" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007028" OutName="object_horse_normalTex_007028" Format="i8" Width="16" Height="16" Offset="0x7028" AddedByScript="true"/>
+        <Texture Name="object_horse_normalTex_007128" OutName="object_horse_normalTex_007128" Format="i8" Width="32" Height="32" Offset="0x7128" AddedByScript="true"/>
+        <Skeleton Name="gHorseNormalSkel" Type="Normal" LimbType="Skin" Offset="0x9FAC"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseNormalGallopingAnim" Offset="0x608"/>
+        <!-- Jumping. -->
+        <Animation Name="gHorseNormalJumpingAnim" Offset="0xC20"/>
+        <!-- JumpingHigh. -->
+        <Animation Name="gHorseNormalJumpingHighAnim" Offset="0x13A8"/>
+        <!-- Walking fast. -->
+        <Animation Name="gHorseNormalTrottingAnim" Offset="0x1A1C"/>
+        <!-- Stand in two legs for a moment? -->
+        <Animation Name="gHorseNormalRearingAnim" Offset="0x2458"/>
+        <!-- Refusing to jump / Slowing down. -->
+        <Animation Name="gHorseNormalRefuseAnim" Offset="0x35D4"/>
+        <!-- Idle1. Horse moving leg. -->
+        <Animation Name="gHorseNormalIdleAnim" Offset="0x4580"/>
+        <!-- Idle2. Moving head. -->
+        <Animation Name="gHorseNormalWhinnyAnim" Offset="0x4C20"/>
+        <!-- Walking slow. -->
+        <Animation Name="gHorseNormalWalkingAnim" Offset="0x54BC"/>
+
+        <Texture Name="gHorseNormalEyeTex" OutName="horse_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x54D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_horse_zelda.xml b/soh/assets/xml/N64_NTSC_12/objects/object_horse_zelda.xml
new file mode 100644
index 0000000000..af270c6585
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_horse_zelda.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_horse_zelda" Segment="6">
+        <Texture Name="object_horse_zeldaTex_000408" OutName="object_horse_zeldaTex_000408" Format="rgba16" Width="8" Height="8" Offset="0x408" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000888" OutName="object_horse_zeldaTex_000888" Format="rgba16" Width="8" Height="16" Offset="0x888" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_000988" OutName="object_horse_zeldaTex_000988" Format="rgba16" Width="4" Height="4" Offset="0x988" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002578" OutName="object_horse_zeldaTex_002578" Format="rgba16" Width="8" Height="16" Offset="0x2578" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002678" OutName="object_horse_zeldaTex_002678" Format="rgba16" Width="16" Height="8" Offset="0x2678" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002778" OutName="object_horse_zeldaTex_002778" Format="rgba16" Width="16" Height="16" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_002978" OutName="object_horse_zeldaTex_002978" Format="rgba16" Width="32" Height="32" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003178" OutName="object_horse_zeldaTex_003178" Format="rgba16" Width="16" Height="8" Offset="0x3178" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003278" OutName="object_horse_zeldaTex_003278" Format="rgba16" Width="8" Height="16" Offset="0x3278" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_003378" OutName="object_horse_zeldaTex_003378" Format="rgba16" Width="8" Height="8" Offset="0x3378" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0033F8" OutName="object_horse_zeldaTex_0033F8" Format="rgba16" Width="8" Height="16" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="object_horse_zeldaTex_0034F8" OutName="object_horse_zeldaTex_0034F8" Format="rgba16" Width="16" Height="16" Offset="0x34F8" AddedByScript="true"/>
+        <Skeleton Name="gHorseZeldaSkel" Type="Normal" LimbType="Skin" Offset="0x6B2C"/>
+
+        <!-- Running. -->
+        <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
+
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
+
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_hs.xml b/soh/assets/xml/N64_NTSC_12/objects/object_hs.xml
new file mode 100644
index 0000000000..cf5d06e1a2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_hs.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="object_hs" Segment="6">
+        <Animation Name="object_hs_Anim_000304" Offset="0x304"/>
+        <Animation Name="object_hs_Anim_000528" Offset="0x528"/>
+        <Animation Name="object_hs_Anim_0005C0" Offset="0x5C0"/>
+        <DList Name="object_hs_DL_003760" Offset="0x3760"/>
+        <DList Name="object_hs_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_hs_DL_004140" Offset="0x4140"/>
+        <DList Name="object_hs_DL_0042A0" Offset="0x42A0"/>
+        <DList Name="object_hs_DL_004380" Offset="0x4380"/>
+        <DList Name="object_hs_DL_004728" Offset="0x4728"/>
+        <DList Name="object_hs_DL_004860" Offset="0x4860"/>
+        <DList Name="object_hs_DL_004960" Offset="0x4960"/>
+        <DList Name="object_hs_DL_004AB8" Offset="0x4AB8"/>
+        <DList Name="object_hs_DL_004BF0" Offset="0x4BF0"/>
+        <DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
+        <DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
+        <Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
+        <Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
+        <Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
+        <Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
+        <Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
+        <Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
+        <Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>
+        <Limb Name="object_hs_Limb_006194" LimbType="Standard" Offset="0x6194"/>
+        <Limb Name="object_hs_Limb_0061A0" LimbType="Standard" Offset="0x61A0"/>
+        <Limb Name="object_hs_Limb_0061AC" LimbType="Standard" Offset="0x61AC"/>
+        <Limb Name="object_hs_Limb_0061B8" LimbType="Standard" Offset="0x61B8"/>
+        <Limb Name="object_hs_Limb_0061C4" LimbType="Standard" Offset="0x61C4"/>
+        <Limb Name="object_hs_Limb_0061D0" LimbType="Standard" Offset="0x61D0"/>
+        <Limb Name="object_hs_Limb_0061DC" LimbType="Standard" Offset="0x61DC"/>
+        <Limb Name="object_hs_Limb_0061E8" LimbType="Standard" Offset="0x61E8"/>
+        <Limb Name="object_hs_Limb_0061F4" LimbType="Standard" Offset="0x61F4"/>
+        <Limb Name="object_hs_Limb_006200" LimbType="Standard" Offset="0x6200"/>
+        <Limb Name="object_hs_Limb_00620C" LimbType="Standard" Offset="0x620C"/>
+        <Limb Name="object_hs_Limb_006218" LimbType="Standard" Offset="0x6218"/>
+        <Skeleton Name="object_hs_Skel_006260" Type="Flex" LimbType="Standard" Offset="0x6260"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_human.xml b/soh/assets/xml/N64_NTSC_12/objects/object_human.xml
new file mode 100644
index 0000000000..05795cb332
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_human.xml
@@ -0,0 +1,216 @@
+<Root>
+    <File Name="object_human" Segment="6">
+        <!-- Facial textures -->
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eye textures -->
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
+
+        <!-- Those are exactly the same as above eyebrow textures -->
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
+
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
+
+        <!-- Mouths -->
+        <Texture Name="gHumanMouthClosed1Tex" OutName="mouth_closed_1" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen1Tex" OutName="mouth_open_1" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen2Tex" OutName="mouth_open_2" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed2Tex" OutName="mouth_closed_2" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen3Tex" OutName="mouth_open_3" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen4Tex" OutName="mouth_open_4" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthClosed3Tex" OutName="mouth_closed_3" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen5Tex" OutName="mouth_open_5" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanMouthOpen6Tex" OutName="mouth_open_6" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
+
+        <!-- TLUT -->
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+
+        <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
+
+        <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>
+
+        <LegacyAnimation Name="gHumanTiltHeadAnim" Offset="0x8CE0"/>
+
+        <LegacyAnimation Name="gHumanLookingAroundAnim" Offset="0x990C"/>
+
+        <LegacyAnimation Name="gHumanLookingBackEndsAnim" Offset="0x9C2C"/>
+
+        <LegacyAnimation Name="gHumanThinkingEndAnim" Offset="0xA044"/>
+
+        <LegacyAnimation Name="gHumanThinkingStartsAnim" Offset="0xA8B4"/>
+
+        <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
+
+        <!-- Left arm -->
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
+
+        <!-- Left forearm -->
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
+
+        <!-- Left foot -->
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
+
+        <!-- Left hand -->
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
+
+        <!-- Left leg -->
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
+
+        <!-- Right arm -->
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
+
+        <!-- Right forearm -->
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
+
+        <!-- Right foot -->
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
+
+        <!-- Right hand -->
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
+
+        <!-- Right leg -->
+        <DList Name="gHumanLegRightDL" Offset="0xC450"/>
+        <DList Name="gHumanLegRightWrapperDL" Offset="0xC518"/>
+        <DList Name="gHumanLegRightWrapperWrapperDL" Offset="0xC528"/>
+
+        <!-- Torso -->
+        <DList Name="gHumanTorsoDL" Offset="0xC620"/>
+        <DList Name="gHumanTorsoWrapperDL" Offset="0xC8B0"/>
+        <DList Name="gHumanTorsoWrapperWrapperDL" Offset="0xC8C0"/>
+
+        <!-- Hair -->
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
+
+        <!-- Head -->
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
+
+        <!-- Waist -->
+        <DList Name="gHumanWaistDL" Offset="0xE0B8"/>
+        <DList Name="gHumanWaistWrapperDL" Offset="0xE218"/>
+        <DList Name="gHumanWaistWrapperWrapperDL" Offset="0xE228"/>
+
+        <!-- Lower half of the dress -->
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
+
+        <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
+
+        <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
+        <Texture Name="gHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="8" Offset="0xF1A8"/>
+
+        <Texture Name="gHumanFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="8" Offset="0xF228"/>
+        <Texture Name="gHumanNeckTex" OutName="neck" Format="rgba16" Width="16" Height="8" Offset="0xF328"/>
+        <Texture Name="gHumanHairSideTex" OutName="hair_side" Format="rgba16" Width="32" Height="32" Offset="0xF428"/>
+        <Texture Name="gHumanHairTex" OutName="hair" Format="rgba16" Width="64" Height="32" Offset="0xFC28"/>
+
+        <!-- Looks like skin -->
+        <Texture Name="object_human_Tex_010C28" OutName="object_human_Tex_010C28" Format="rgba16" Width="16" Height="16" Offset="0x10C28"/>
+
+        <Texture Name="gHumanSkinTex" OutName="skin" Format="rgba16" Width="16" Height="16" Offset="0x10E28"/>
+        <Texture Name="gHumanShoeTex" OutName="shoe" Format="rgba16" Width="16" Height="32" Offset="0x11028"/>
+
+        <LegacyAnimation Name="gHumanIdleAnim" Offset="0x11A9C"/>
+
+        <Limb Name="gHumanDressLowerLimb" LimbType="Legacy" Offset="0x11AA8"/>
+        <Limb Name="gHumanWaistLimb" LimbType="Legacy" Offset="0x11AC8"/>
+        <Limb Name="gHumanHairLimb" LimbType="Legacy" Offset="0x11AE8"/>
+        <Limb Name="gHumanHandRightLimb" LimbType="Legacy" Offset="0x11B08"/>
+        <Limb Name="gHumanForearmRightLimb" LimbType="Legacy" Offset="0x11B28"/>
+        <Limb Name="gHumanArmRightLimb" LimbType="Legacy" Offset="0x11B48"/>
+        <Limb Name="gHumanHandLeftLimb" LimbType="Legacy" Offset="0x11B68"/>
+        <Limb Name="gHumanForearmLeftLimb" LimbType="Legacy" Offset="0x11B88"/>
+        <Limb Name="gHumanArmLeftLimb" LimbType="Legacy" Offset="0x11BA8"/>
+        <Limb Name="gHumanFootLeftLimb" LimbType="Legacy" Offset="0x11BC8"/>
+        <Limb Name="gHumanLegLeftLimb" LimbType="Legacy" Offset="0x11BE8"/>
+        <Limb Name="gHumanFootRightLimb" LimbType="Legacy" Offset="0x11C08"/>
+        <Limb Name="gHumanLegRightLimb" LimbType="Legacy" Offset="0x11C28"/>
+        <Limb Name="object_human_Limb_011C48" LimbType="Legacy" Offset="0x11C48"/>
+        <Limb Name="object_human_Limb_011C68" LimbType="Legacy" Offset="0x11C68"/>
+        <Limb Name="object_human_Limb_011C88" LimbType="Legacy" Offset="0x11C88"/>
+        <Limb Name="object_human_Limb_011CA8" LimbType="Legacy" Offset="0x11CA8"/>
+        <Limb Name="object_human_Limb_011CC8" LimbType="Legacy" Offset="0x11CC8"/>
+        <Limb Name="object_human_Limb_011CE8" LimbType="Legacy" Offset="0x11CE8"/>
+        <Limb Name="object_human_Limb_011D08" LimbType="Legacy" Offset="0x11D08"/>
+        <Limb Name="object_human_Limb_011D28" LimbType="Legacy" Offset="0x11D28"/>
+        <Limb Name="object_human_Limb_011D48" LimbType="Legacy" Offset="0x11D48"/>
+        <Limb Name="object_human_Limb_011D68" LimbType="Legacy" Offset="0x11D68"/>
+        <Limb Name="object_human_Limb_011D88" LimbType="Legacy" Offset="0x11D88"/>
+        <Limb Name="object_human_Limb_011DA8" LimbType="Legacy" Offset="0x11DA8"/>
+        <Limb Name="object_human_Limb_011DC8" LimbType="Legacy" Offset="0x11DC8"/>
+        <Limb Name="gHumanHeadLimb" LimbType="Legacy" Offset="0x11DE8"/>
+        <Limb Name="object_human_Limb_011E08" LimbType="Legacy" Offset="0x11E08"/>
+        <Limb Name="object_human_Limb_011E28" LimbType="Legacy" Offset="0x11E28"/>
+        <Limb Name="object_human_Limb_011E48" LimbType="Legacy" Offset="0x11E48"/>
+        <Limb Name="object_human_Limb_011E68" LimbType="Legacy" Offset="0x11E68"/>
+        <Limb Name="object_human_Limb_011E88" LimbType="Legacy" Offset="0x11E88"/>
+        <Limb Name="object_human_Limb_011EA8" LimbType="Legacy" Offset="0x11EA8"/>
+        <Limb Name="object_human_Limb_011EC8" LimbType="Legacy" Offset="0x11EC8"/>
+        <Limb Name="object_human_Limb_011EE8" LimbType="Legacy" Offset="0x11EE8"/>
+        <Limb Name="gHumanTorsoLimb" LimbType="Legacy" Offset="0x11F08"/>
+        <Limb Name="object_human_Limb_011F28" LimbType="Legacy" Offset="0x11F28"/>
+        <Limb Name="object_human_Limb_011F48" LimbType="Legacy" Offset="0x11F48"/>
+        <Limb Name="object_human_Limb_011F68" LimbType="Legacy" Offset="0x11F68"/>
+        <Limb Name="object_human_Limb_011F88" LimbType="Legacy" Offset="0x11F88"/>
+        <Limb Name="gHumanRootLimb" LimbType="Legacy" Offset="0x11FA8"/>
+
+        <LimbTable Name="gHumanLimbTable" LimbType="Legacy" Count="41" Offset="0x11FC8"/>
+
+        <LegacyAnimation Name="gHumanWalkingAnim" Offset="0x1291C"/>
+
+        <LegacyAnimation Name="gHumanWalkingEndAnim" Offset="0x12D18"/>
+
+        <LegacyAnimation Name="gHumanWalkingStartAnim" Offset="0x1316C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ice_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ice_objects.xml
new file mode 100644
index 0000000000..c7d059d709
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ice_objects.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="object_ice_objects" Segment="6">
+        <DList Name="object_ice_objects_DL_000190" Offset="0x190"/>
+        <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/>
+        <DList Name="gRedIceBlockDL" Offset="0x6F0"/>
+        <DList Name="gRedIcePlatformDL" Offset="0x12A0"/>
+        <Collision Name="gRedIcePlatformCol" Offset="0x1C1C"/>
+        <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/>
+        <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/>
+        <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/>
+        <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/>
+        <DList Name="gRedIceWallDL" Offset="0x2640"/>
+        <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/>
+        <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/>
+        <Collision Name="gRedIceWallCol" Offset="0x2920"/>
+        <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/>
+        <Texture Name="gRedIceWallTex" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/>
+        <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/>
+        <Texture Name="object_ice_objects_Tex_004950" OutName="tex_00004950" Format="rgba16" Width="32" Height="32" Offset="0x4950"/>
+        <Texture Name="gRedIceBlockTex" OutName="tex_00005150" Format="i8" Width="32" Height="32" Offset="0x5150"/>
+        <Texture Name="gRedIcePlatformTex" OutName="tex_00005550" Format="i4" Width="64" Height="64" Offset="0x5550"/>
+        <Texture Name="object_ice_objects_Tex_005D50" OutName="tex_00005D50" Format="i8" Width="64" Height="64" Offset="0x5D50"/>
+        <Texture Name="object_ice_objects_Tex_006D50" OutName="tex_00006D50" Format="rgba16" Width="32" Height="64" Offset="0x6D50"/>
+        <Texture Name="object_ice_objects_Tex_007D50" OutName="tex_00007D50" Format="ia8" Width="64" Height="64" Offset="0x7D50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ik.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ik.xml
new file mode 100644
index 0000000000..8a6028f7c0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ik.xml
@@ -0,0 +1,108 @@
+<Root>
+    <File Name="object_ik" Segment="6">
+        <!--Blob Name="object_ik_zeroes_unk_00000000" Size="0xF630" Offset="0x0" /-->
+
+        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+
+        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
+        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
+        <Skeleton Name="object_ik_Skel_01EB40" Type="Flex" LimbType="Standard" Offset="0x1EB40"/>
+        <Skeleton Name="object_ik_Skel_01EE60" Type="Flex" LimbType="Standard" Offset="0x1EE60"/>
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" Offset="0x1E178"/>
+        <Skeleton Name="gIronKnuckleDefeatSkel" Type="Flex" LimbType="Standard" Offset="0x205C0"/>
+
+        <Animation Name="object_ik_Anim_00035C" Offset="0x35C"/>
+        <Animation Name="object_ik_Anim_000634" Offset="0x634"/>
+        <Animation Name="object_ik_Anim_0008DC" Offset="0x8DC"/>
+        <Animation Name="object_ik_Anim_000C6C" Offset="0xC6C"/>
+        <Animation Name="object_ik_Anim_000F0C" Offset="0xF0C"/>
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0x1C28"/>
+        <Animation Name="gIronKnuckleRecoverFromVerticalAttackAnim" Offset="0x2538"/>
+        <Animation Name="gIronKnuckleAxeStuckAnim" Offset="0x29FC"/>
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x33C4"/>
+        <Animation Name="gIronKnuckleRecoverFromHorizontalAttackAnim" Offset="0x3DBC"/>
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x45BC"/>
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x485C"/>
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x5944"/>
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x6194"/>
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x6734"/>
+        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
+        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
+        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
+        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
+        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
+
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="gIronKnuckleMetalTex" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <!-- This is a duplicate texture to accound for authentic texture overflowing -->
+        <!-- ZAPDTODO: It is set to an offset position -1 of the actual value as ZAPD does not permit
+             duplicate offset values -->
+        <Texture Name="gIronKnuckleMetalOverflowTex" OutName="iron_knuckle_metal_overflow_tex" Format="i8" Width="32" Height="64" Offset="0xF79F"/>
+        <Texture Name="gIronKnuckleBigRivetTex" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="gIronKnuckleBlockPatternTex" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="gIronKnuckleChainMailTex" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="gIronKnuckleGerudoEyeTex" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="gIronKnuckleNabooruLipTex" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
+        <Texture Name="gIronKnuckleJewelTex" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruForeheadJewelTex" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
+        <Texture Name="gIronKnuckleNabooruHair1Tex" OutName="tex_011660" Format="ci8" Width="16" Height="16" Offset="0x11660" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="gIronKnuckleNabooruHelmetDL" Offset="0x154E0"/>
+        <DList Name="gIronKnuckleAxeDL" Offset="0x15840"/>
+        <DList Name="gIronKnuckleShockedNabooruHeadDL" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="gIronKnuckleSplitHelmetLeftDL" Offset="0x16748"/>
+        <DList Name="gIronKnuckleSplitHelmetRightDL" Offset="0x169E8"/>
+        <DList Name="gIronKnuckleArmorRivetAndSymbolDL" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
+        <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
+        <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
+        <DList Name="gIronKnuckleHelmetDL" Offset="0x18E78"/>
+        <DList Name="gIronKnuckleGerudoHeadDL" Offset="0x19100"/>
+        <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0x19E08"/>
+        <DList Name="gIronKnuckleTorsoDL" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
+        <Texture Name="gIronKnuckleHair3Tex" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
+        <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_im.xml b/soh/assets/xml/N64_NTSC_12/objects/object_im.xml
new file mode 100644
index 0000000000..a628a113a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_im.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_im" Segment="6">
+        <Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
+        <Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
+        <Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
+        <Animation Name="gImpaIdleAnim" Offset="0x1868"/>
+        <Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
+        <Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
+        <Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
+        <Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
+        <Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
+        <Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
+        <Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
+        <DList Name="gImpaChestDL" Offset="0x5040"/>
+        <DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
+        <DList Name="gImpaRightArmDL" Offset="0x6048"/>
+        <DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
+        <DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
+        <DList Name="gImpaTorsoDL" Offset="0x6720"/>
+        <DList Name="gImpaRightThighDL" Offset="0x6880"/>
+        <DList Name="gImpaRightLegDL" Offset="0x69E8"/>
+        <DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
+        <DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
+        <Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
+        <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
+        <Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
+        <Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
+
+        <Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
+        <Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
+
+        <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
+        <Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
+        <Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
+        <Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
+        <Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
+        <Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
+        <DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
+        <DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
+        <DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
+        <DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
+        <DList Name="gImpaRightHandDL" Offset="0xE908"/>
+        <DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
+        <Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
+        <Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
+        <Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
+        <Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
+        <Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
+        <Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
+        <Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
+        <Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
+        <Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
+        <Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
+        <Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
+        <Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
+        <Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
+        <Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
+        <Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
+        <Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
+        <Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
+        <Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
+        <Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
+        <Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
+        <Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
+        <Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
+        <Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_in.xml b/soh/assets/xml/N64_NTSC_12/objects/object_in.xml
new file mode 100644
index 0000000000..84c1140475
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_in.xml
@@ -0,0 +1,142 @@
+<Root>
+    <File Name="object_in" Segment="6">
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
+        <Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
+        <Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
+        <Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
+        <Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
+        <Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
+        <Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
+        <Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
+        <Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
+        <Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
+        <Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
+        <Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
+        <Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
+        <Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
+        <Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
+        <Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
+        <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
+
+        <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
+        <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
+
+        <DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
+        <DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
+        <DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
+        <DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
+        <DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
+        <DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
+        <DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
+        <DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
+        <DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
+        <DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
+        <DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
+        <DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
+        <DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
+        <DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
+        <DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
+        <DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
+        <DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
+        <DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
+        <DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
+        <DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
+
+        <Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
+        <Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
+        <Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
+        <Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
+
+        <Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
+        <Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
+        <Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
+
+        <Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
+        <Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
+
+        <DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
+        <DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
+        <DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
+        <DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
+        <DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
+        <DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
+        <DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
+        <DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
+        <DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
+        <DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
+        <DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
+        <DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
+        <DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
+        <DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
+        <DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
+        <DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
+        <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
+        <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
+
+        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+
+        <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
+        <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
+        <Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
+        <Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
+        <Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
+        <Animation Name="object_in_Anim_015814" Offset="0x15814"/>
+        <Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
+        <Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
+        <Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
+        <Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
+        <Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
+        <Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
+
+        <!-- No idea what these are -->
+        <Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
+        <Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ingate.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ingate.xml
new file mode 100644
index 0000000000..e6be42bebf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ingate.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_ingate" Segment="6">
+        <Texture Name="gIngoGateTex" OutName="gate" Format="ia8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gIngoGateDL" Offset="0x1040"/>
+        <Collision Name="gIngoGateCol" Offset="0x11B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_jj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_jj.xml
new file mode 100644
index 0000000000..62bae8cb91
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_jj.xml
@@ -0,0 +1,77 @@
+<Root>
+    <File Name="object_jj" Segment="6">
+
+        <!-- Jabu Jabu animation (waggling fins etc.) -->
+        <Animation Name="gJabuJabuAnim" Offset="0x1F4C"/>
+            
+        <!-- Jabu Jabu eye textures -->
+        <Texture Name="gJabuJabuEyeOpenTex" OutName="jabu_jabu_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x7698"/>
+        <Texture Name="gJabuJabuEyeHalfTex" OutName="jabu_jabu_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x7A98"/>
+        <Texture Name="gJabuJabuEyeClosedTex" OutName="jabu_jabu_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x7E98"/>
+
+        <!-- Jabu Jabu skeleton -->
+        <Skeleton Name="gJabuJabuSkel" Type="Flex" LimbType="Standard" Offset="0xB9A8"/>
+
+        <!-- Jabu Jabu limb displaylists -->
+        <DList Name="gJabuJabuBodyDL" Offset="0x5690"/>
+        <DList Name="gJabuJabuLeftUpperFlipperDL" Offset="0x55B0"/>
+        <DList Name="gJabuJabuLeftMidFlipperDL" Offset="0x54D0"/>
+        <DList Name="gJabuJabuLeftLowerFlipperDL" Offset="0x5400"/>
+        <DList Name="gJabuJabuHeadDL" Offset="0x4920"/>
+        <DList Name="gJabuJabuLeftFrillDL" Offset="0x4880"/>
+        <DList Name="gJabuJabuRightFrillDL" Offset="0x47E0"/>
+        <DList Name="gJabuJabuRightUpperFlipperDL" Offset="0x4700"/>
+        <DList Name="gJabuJabuRightMidFlipperDL" Offset="0x4648"/>
+        <DList Name="gJabuJabuRightLowerFlipperDL" Offset="0x4578"/>
+        <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
+        
+        <!-- Jabu Jabu limbs -->
+        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
+
+
+
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
+
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
+
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
+
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
+
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
+
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
+
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
+
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+
+        <!-- Jabu Jabu Limb textures -->
+        <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
+        <Texture Name="gJabuJabuNostrilTex" OutName="jabu_jabu_nostril" Format="rgba16" Width="32" Height="16" Offset="0x6358"/>
+        <Texture Name="gJabuJabuNoseDecorationTex" OutName="jabu_jabu_nose_decoration" Format="rgba16" Width="8" Height="32" Offset="0x6758"/>
+        <Texture Name="gJabuJabuToothTex" OutName="jabu_jabu_tooth" Format="rgba16" Width="8" Height="16" Offset="0x6958"/>
+        <Texture Name="gJabuJabuLipTex" OutName="jabu_jabu_lip" Format="rgba16" Width="8" Height="16" Offset="0x6A58"/>
+        <Texture Name="gJabuJabuLipMouthCornerTex" OutName="jabu_jabu_lip_mouth_corner" Format="rgba16" Width="16" Height="16" Offset="0x6B58"/>
+        <Texture Name="gJabuJabuDiademSideTex" OutName="jabu_jabu_diadem_side" Format="rgba16" Width="8" Height="16" Offset="0x6D58"/>
+        <Texture Name="gJabuJabuLateralTex" OutName="jabu_jabu_lateral" Format="rgba16" Width="16" Height="64" Offset="0x6E58"/>
+        <Texture Name="gJabuJabuEyeOrbitTex" OutName="jabu_jabu_eye_orbit" Format="rgba16" Width="4" Height="8" Offset="0x7658"/>
+        <Texture Name="gJabuJabuDorsalTex" OutName="jabu_jabu_dorsal" Format="rgba16" Width="32" Height="64" Offset="0x8298"/>
+        <Texture Name="gJabuJabuCapOuterTex" OutName="jabu_jabu_cap_outer" Format="rgba16" Width="4" Height="8" Offset="0x9298"/>
+        <Texture Name="gJabuJabuCapInnerTex" OutName="jabu_jabu_cap_inner" Format="rgba16" Width="8" Height="8" Offset="0x92D8"/>
+        <Texture Name="gJabuJabuMouthRoofTex" OutName="jabu_jabu_mouth_roof" Format="rgba16" Width="32" Height="64" Offset="0x9358"/>
+        <Texture Name="gJabuJabuDiademCenterTex" OutName="jabu_jabu_diadem_center" Format="rgba16" Width="16" Height="32" Offset="0xA358"/>
+        <Texture Name="gJabuJabuFinTex" OutName="jabu_jabu_fin" Format="rgba16" Width="16" Height="8" Offset="0xA758"/>
+        <Texture Name="gJabuJabuMouthFloorTex" OutName="jabu_jabu_mouth_floor" Format="rgba16" Width="32" Height="64" Offset="0xA858"/>
+
+        <!-- Jabu Jabu collision -->
+        <Collision Name="gJabuJabuHeadCol" Offset="0x0A1C"/>
+        <Collision Name="gJabuJabuBodyCol" Offset="0x1830"/>
+        <Collision Name="gJabuJabuUnusedCol" Offset="0xBA8C"/>
+
+            
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_js.xml b/soh/assets/xml/N64_NTSC_12/objects/object_js.xml
new file mode 100644
index 0000000000..ff7bd3efa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_js.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_js" Segment="6">
+        <!-- Carpet Merchant Skeleton -->
+        <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
+
+        <!-- Carpet Merchant Limbs -->
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
+
+        <!-- Carpet Merchant Limb DisplayLists -->
+        <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
+        <DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
+        <DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
+        <DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
+        <DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
+        <DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
+        <DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
+        <DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
+        <DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
+        <DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
+        <DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
+
+        <!-- Carpet Merchant Palettes -->
+        <Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
+
+        <!-- Carpet Merchant DisplayList Textures -->
+        <Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
+        <Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
+
+        <!-- Carpet Merchant Animations -->
+        <Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
+        <Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
+
+        <!-- Carpet Merchant Collision -->
+        <Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_jya_door.xml b/soh/assets/xml/N64_NTSC_12/objects/object_jya_door.xml
new file mode 100644
index 0000000000..60a7b37886
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_jya_door.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_jya_door" Segment="6">
+        <DList Name="gSpiritDoorDL" Offset="0x0100"/>
+        <DList Name="gJyaDoorMetalBarsDL" Offset="0x01F0"/>
+        <Texture Name="gSpiritDoorTex" OutName="door" Format="rgba16" Width="64" Height="32" Offset="0x0280"/>
+        <Texture Name="gSpiritDoorMetalBarsTex" OutName="metal_bars" Format="rgba16" Width="32" Height="64" Offset="0x1280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_jya_iron.xml b/soh/assets/xml/N64_NTSC_12/objects/object_jya_iron.xml
new file mode 100644
index 0000000000..c6f6773c6a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_jya_iron.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_jya_iron" Segment="6">
+        <DList Name="gPillarDL" Offset="0x0240"/>
+        <DList Name="gObjectJyaIronDL_000600" Offset="0x0600"/>
+        <DList Name="gObjectJyaIronDL_000880" Offset="0x0880"/>
+        <DList Name="gObjectJyaIronDL_000AE0" Offset="0x0AE0"/>
+        <Collision Name="gPillarCol" Offset="0x0D48"/>
+        <DList Name="gThroneDL" Offset="0x1050"/>
+        <Collision Name="gThroneCol" Offset="0x1430"/>
+        <Texture Name="gPillarSideTex" OutName="pillar_side" Format="rgba16" Width="16" Height="128" Offset="0x1460"/>
+        <Texture Name="gPillarTopTex" OutName="pillar_top" Format="rgba16" Width="16" Height="16" Offset="0x2460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_jya_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_jya_obj.xml
new file mode 100644
index 0000000000..a1f19b8066
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_jya_obj.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_jya_obj" Segment="6">
+        <Texture Name="object_jya_objTex_00B4B8" OutName="object_jya_objTex_00B4B8" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_011A80" OutName="object_jya_objTex_011A80" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_016140" OutName="object_jya_objTex_016140" Format="rgba16" Width="64" Height="32" Offset="0x16140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_017140" OutName="object_jya_objTex_017140" Format="rgba16" Width="32" Height="16" Offset="0x17140" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B340" OutName="object_jya_objTex_01B340" Format="ia8" Width="32" Height="32" Offset="0x1B340" AddedByScript="true"/>
+        <Texture Name="object_jya_objTex_01B740" OutName="object_jya_objTex_01B740" Format="rgba16" Width="16" Height="16" Offset="0x1B740" AddedByScript="true"/>
+        <Texture Name="object_jya_objTLUT_011A60" OutName="object_jya_objTLUT_011A60" Format="rgba16" Width="4" Height="4" Offset="0x11A60" AddedByScript="true"/>
+        <DList Name="g1fliftDL" Offset="0x1F0"/>
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
+        <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
+        <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
+        <DList Name="gAmishutterDL" Offset="0xC0A0"/>
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
+        <DList Name="gBigMirror1DL" Offset="0xBC70"/>
+        <DList Name="gBigMirror2DL" Offset="0xBD80"/>
+        <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
+        <DList Name="gBigMirror4DL" Offset="0xE2D0"/>
+        <Texture Name="gBigMirrorGradientTex" OutName="mirror_gradient" Format="ia16" Width="8" Height="128" Offset="0x1AB40"/>
+        <DList Name="gBombchuiwaDL" Offset="0xE8D0"/>
+        <DList Name="gBombchuiwaLight1DL" Offset="0xDC40"/>
+        <DList Name="gBombchuiwaLight2DL" Offset="0xDB60"/>
+        <DList Name="gBombchuiwa2DL" Offset="0x119B0"/>
+        <DList Name="gBombiwaDL" Offset="0xE490"/>
+        <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
+        <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
+        <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
+        <DList Name="gCobra1DL" Offset="0x10790"/>
+        <DList Name="gCobra2DL" Offset="0x10C20"/>
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
+        <DList Name="gCobra3DL" Offset="0x117D0"/>
+        <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
+        <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
+        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
+        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
+        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <DList Name="gKanaamiDL" Offset="0xF000"/>
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
+        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
+        <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
+        <DList Name="gLiftDL" Offset="0xCCE0"/>
+        <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
+        <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
+        <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
+        <DList Name="gMegami1DL" Offset="0x5780"/>
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
+        <DList Name="gMegami2DL" Offset="0xB9F8"/>
+        <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
+        <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
+        <DList Name="gMegamiPiece3DL" Offset="0x9C80"/>
+        <DList Name="gMegamiPiece4DL" Offset="0x9DE8"/>
+        <DList Name="gMegamiPiece5DL" Offset="0x9F60"/>
+        <DList Name="gMegamiPiece6DL" Offset="0xA0A8"/>
+        <DList Name="gMegamiPiece7DL" Offset="0xA278"/>
+        <DList Name="gMegamiPiece8DL" Offset="0xA418"/>
+        <DList Name="gMegamiPiece9DL" Offset="0xA568"/>
+        <DList Name="gMegamiPiece10DL" Offset="0xA6A0"/>
+        <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
+        <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
+        <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
+        <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
+        <DList Name="gZurerukabeDL" Offset="0x12340"/>
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ka.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ka.xml
new file mode 100644
index 0000000000..eb952732b4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ka.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_ka" Segment="6">
+        <Animation Name="object_ka_Anim_000214" Offset="0x214"/>
+        <DList Name="object_ka_DL_001550" Offset="0x1550"/>
+        <DList Name="object_ka_DL_001600" Offset="0x1600"/>
+        <DList Name="object_ka_DL_0017D8" Offset="0x17D8"/>
+        <DList Name="object_ka_DL_001878" Offset="0x1878"/>
+        <DList Name="object_ka_DL_001918" Offset="0x1918"/>
+        <DList Name="object_ka_DL_0019B8" Offset="0x19B8"/>
+        <DList Name="object_ka_DL_001CD8" Offset="0x1CD8"/>
+        <DList Name="object_ka_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_ka_DL_002020" Offset="0x2020"/>
+        <DList Name="object_ka_DL_0020C0" Offset="0x20C0"/>
+        <DList Name="object_ka_DL_002160" Offset="0x2160"/>
+        <DList Name="object_ka_DL_002200" Offset="0x2200"/>
+        <DList Name="object_ka_DL_0022A0" Offset="0x22A0"/>
+        <DList Name="object_ka_DL_002340" Offset="0x2340"/>
+        <DList Name="object_ka_DL_002430" Offset="0x2430"/>
+        <DList Name="object_ka_DL_0024D0" Offset="0x24D0"/>
+        <DList Name="object_ka_DL_002570" Offset="0x2570"/>
+        <DList Name="object_ka_DL_002610" Offset="0x2610"/>
+        <DList Name="object_ka_DL_0027A0" Offset="0x27A0"/>
+        <DList Name="object_ka_DL_002890" Offset="0x2890"/>
+        <DList Name="object_ka_DL_002930" Offset="0x2930"/>
+        <DList Name="object_ka_DL_0029D0" Offset="0x29D0"/>
+        <DList Name="object_ka_DL_002A70" Offset="0x2A70"/>
+        <Texture Name="object_ka_Tex_002C00" OutName="tex_00002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00"/>
+        <Texture Name="object_ka_Tex_003400" OutName="tex_00003400" Format="rgba16" Width="32" Height="32" Offset="0x3400"/>
+        <Texture Name="object_ka_Tex_003C00" OutName="tex_00003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00"/>
+        <Texture Name="object_ka_Tex_004400" OutName="tex_00004400" Format="rgba16" Width="32" Height="32" Offset="0x4400"/>
+        <Texture Name="object_ka_Tex_004C00" OutName="tex_00004C00" Format="rgba16" Width="32" Height="32" Offset="0x4C00"/>
+        <Texture Name="object_ka_Tex_005400" OutName="tex_00005400" Format="rgba16" Width="32" Height="32" Offset="0x5400"/>
+        <Texture Name="object_ka_Tex_005C00" OutName="tex_00005C00" Format="rgba16" Width="32" Height="32" Offset="0x5C00"/>
+        <Limb Name="object_ka_Limb_006400" LimbType="Standard" Offset="0x6400"/>
+        <Limb Name="object_ka_Limb_00640C" LimbType="Standard" Offset="0x640C"/>
+        <Limb Name="object_ka_Limb_006418" LimbType="Standard" Offset="0x6418"/>
+        <Limb Name="object_ka_Limb_006424" LimbType="Standard" Offset="0x6424"/>
+        <Limb Name="object_ka_Limb_006430" LimbType="Standard" Offset="0x6430"/>
+        <Limb Name="object_ka_Limb_00643C" LimbType="Standard" Offset="0x643C"/>
+        <Limb Name="object_ka_Limb_006448" LimbType="Standard" Offset="0x6448"/>
+        <Limb Name="object_ka_Limb_006454" LimbType="Standard" Offset="0x6454"/>
+        <Limb Name="object_ka_Limb_006460" LimbType="Standard" Offset="0x6460"/>
+        <Limb Name="object_ka_Limb_00646C" LimbType="Standard" Offset="0x646C"/>
+        <Limb Name="object_ka_Limb_006478" LimbType="Standard" Offset="0x6478"/>
+        <Limb Name="object_ka_Limb_006484" LimbType="Standard" Offset="0x6484"/>
+        <Limb Name="object_ka_Limb_006490" LimbType="Standard" Offset="0x6490"/>
+        <Limb Name="object_ka_Limb_00649C" LimbType="Standard" Offset="0x649C"/>
+        <Limb Name="object_ka_Limb_0064A8" LimbType="Standard" Offset="0x64A8"/>
+        <Limb Name="object_ka_Limb_0064B4" LimbType="Standard" Offset="0x64B4"/>
+        <Limb Name="object_ka_Limb_0064C0" LimbType="Standard" Offset="0x64C0"/>
+        <Limb Name="object_ka_Limb_0064CC" LimbType="Standard" Offset="0x64CC"/>
+        <Limb Name="object_ka_Limb_0064D8" LimbType="Standard" Offset="0x64D8"/>
+        <Limb Name="object_ka_Limb_0064E4" LimbType="Standard" Offset="0x64E4"/>
+        <Limb Name="object_ka_Limb_0064F0" LimbType="Standard" Offset="0x64F0"/>
+        <Limb Name="object_ka_Limb_0064FC" LimbType="Standard" Offset="0x64FC"/>
+        <Limb Name="object_ka_Limb_006508" LimbType="Standard" Offset="0x6508"/>
+        <Limb Name="object_ka_Limb_006514" LimbType="Standard" Offset="0x6514"/>
+        <Limb Name="object_ka_Limb_006520" LimbType="Standard" Offset="0x6520"/>
+        <Limb Name="object_ka_Limb_00652C" LimbType="Standard" Offset="0x652C"/>
+        <Limb Name="object_ka_Limb_006538" LimbType="Standard" Offset="0x6538"/>
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" Offset="0x65B0"/>
+        <Animation Name="object_ka_Anim_0067AC" Offset="0x67AC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kanban.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kanban.xml
new file mode 100644
index 0000000000..9ffc7a2ceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kanban.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_kanban" Segment="6">
+        <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
+        <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>
+        <DList Name="object_kanban_DL_000DB8" Offset="0xDB8"/>
+        <DList Name="object_kanban_DL_000E78" Offset="0xE78"/>
+        <DList Name="object_kanban_DL_000F38" Offset="0xF38"/>
+        <DList Name="object_kanban_DL_000FF8" Offset="0xFF8"/>
+        <DList Name="object_kanban_DL_0010B8" Offset="0x10B8"/>
+        <DList Name="object_kanban_DL_0011C0" Offset="0x11C0"/>
+        <DList Name="object_kanban_DL_0012C8" Offset="0x12C8"/>
+        <DList Name="object_kanban_DL_0013D0" Offset="0x13D0"/>
+        <DList Name="object_kanban_DL_001488" Offset="0x1488"/>
+        <DList Name="object_kanban_DL_001540" Offset="0x1540"/>
+        <DList Name="object_kanban_DL_001630" Offset="0x1630"/>
+        <Texture Name="object_kanban_Tex_0016B0" OutName="tex_000016B0" Format="i8" Width="16" Height="16" Offset="0x16B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kibako2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kibako2.xml
new file mode 100644
index 0000000000..a701b294de
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kibako2.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_kibako2" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gLargeCrateDL" Offset="0x960"/>
+        <DList Name="gLargeCrateFragmentDL" Offset="0x1000"/>
+
+        <!-- Palettes -->
+        <Texture Name="gLargeCrate1TLUT" OutName="tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gLargeCrate2TLUT" OutName="tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xBA0"/>
+
+        <!-- Textures -->
+        <Texture Name="gLargeCrateTex" OutName="crate_tex" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment1Tex" OutName="fragment_1" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/>
+        <Texture Name="gLargeCrateFragment2Tex" OutName="fragment_2" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/>
+
+        <!-- Collision -->
+        <Collision Name="gLargeCrateCol" Offset="0xB70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kingdodongo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kingdodongo.xml
new file mode 100644
index 0000000000..5ef07a26f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kingdodongo.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_kingdodongo" Segment="6">
+        <Animation Name="object_kingdodongo_Anim_000690" Offset="0x690"/>
+        <Animation Name="object_kingdodongo_Anim_001074" Offset="0x1074"/>
+        <Animation Name="object_kingdodongo_Anim_002D0C" Offset="0x2D0C"/>
+        <Animation Name="object_kingdodongo_Anim_003CF8" Offset="0x3CF8"/>
+        <Animation Name="object_kingdodongo_Anim_0042A8" Offset="0x42A8"/>
+        <Animation Name="object_kingdodongo_Anim_004E0C" Offset="0x4E0C"/>
+        <Animation Name="object_kingdodongo_Anim_0061D4" Offset="0x61D4"/>
+        <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
+        <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
+        <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
+        <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
+        <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
+        <Animation Name="object_kingdodongo_Anim_00AA9C" Offset="0xAA9C"/>
+        <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
+        <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
+        <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
+        <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
+        <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
+        <Texture Name="object_kingdodongo_Tex_015D90" OutName="tex_00015D90" Format="rgba16" Width="16" Height="16" Offset="0x15D90"/>
+        <Texture Name="object_kingdodongo_Tex_015F90" OutName="tex_00015F90" Format="rgba16" Width="16" Height="32" Offset="0x15F90"/>
+        <Texture Name="object_kingdodongo_Tex_016390" OutName="tex_00016390" Format="rgba16" Width="16" Height="16" Offset="0x16390"/>
+        <Texture Name="object_kingdodongo_Tex_016590" OutName="tex_00016590" Format="rgba16" Width="16" Height="16" Offset="0x16590"/>
+        <Texture Name="object_kingdodongo_Tex_016790" OutName="tex_00016790" Format="rgba16" Width="16" Height="16" Offset="0x16790"/>
+        <Texture Name="object_kingdodongo_Tex_016990" OutName="tex_00016990" Format="rgba16" Width="32" Height="16" Offset="0x16990"/>
+        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
+        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
+        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
+        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
+        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
+        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
+        <Limb Name="object_kingdodongo_Limb_01B034" LimbType="Standard" Offset="0x19C34"/>
+        <Limb Name="object_kingdodongo_Limb_01B040" LimbType="Standard" Offset="0x19C40"/>
+        <Limb Name="object_kingdodongo_Limb_01B04C" LimbType="Standard" Offset="0x19C4C"/>
+        <Limb Name="object_kingdodongo_Limb_01B058" LimbType="Standard" Offset="0x19C58"/>
+        <Limb Name="object_kingdodongo_Limb_01B064" LimbType="Standard" Offset="0x19C64"/>
+        <Limb Name="object_kingdodongo_Limb_01B070" LimbType="Standard" Offset="0x19C70"/>
+        <Limb Name="object_kingdodongo_Limb_01B07C" LimbType="Standard" Offset="0x19C7C"/>
+        <Limb Name="object_kingdodongo_Limb_01B088" LimbType="Standard" Offset="0x19C88"/>
+        <Limb Name="object_kingdodongo_Limb_01B094" LimbType="Standard" Offset="0x19C94"/>
+        <Limb Name="object_kingdodongo_Limb_01B0A0" LimbType="Standard" Offset="0x19CA0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0AC" LimbType="Standard" Offset="0x19CAC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0B8" LimbType="Standard" Offset="0x19CB8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0C4" LimbType="Standard" Offset="0x19CC4"/>
+        <Limb Name="object_kingdodongo_Limb_01B0D0" LimbType="Standard" Offset="0x19CD0"/>
+        <Limb Name="object_kingdodongo_Limb_01B0DC" LimbType="Standard" Offset="0x19CDC"/>
+        <Limb Name="object_kingdodongo_Limb_01B0E8" LimbType="Standard" Offset="0x19CE8"/>
+        <Limb Name="object_kingdodongo_Limb_01B0F4" LimbType="Standard" Offset="0x19CF4"/>
+        <Limb Name="object_kingdodongo_Limb_01B100" LimbType="Standard" Offset="0x19D00"/>
+        <Limb Name="object_kingdodongo_Limb_01B10C" LimbType="Standard" Offset="0x19D0C"/>
+        <Limb Name="object_kingdodongo_Limb_01B118" LimbType="Standard" Offset="0x19D18"/>
+        <Limb Name="object_kingdodongo_Limb_01B124" LimbType="Standard" Offset="0x19D24"/>
+        <Limb Name="object_kingdodongo_Limb_01B130" LimbType="Standard" Offset="0x19D30"/>
+        <Limb Name="object_kingdodongo_Limb_01B13C" LimbType="Standard" Offset="0x19D3C"/>
+        <Limb Name="object_kingdodongo_Limb_01B148" LimbType="Standard" Offset="0x19D48"/>
+        <Limb Name="object_kingdodongo_Limb_01B154" LimbType="Standard" Offset="0x19D54"/>
+        <Limb Name="object_kingdodongo_Limb_01B160" LimbType="Standard" Offset="0x19D60"/>
+        <Limb Name="object_kingdodongo_Limb_01B16C" LimbType="Standard" Offset="0x19D6C"/>
+        <Limb Name="object_kingdodongo_Limb_01B178" LimbType="Standard" Offset="0x19D78"/>
+        <Limb Name="object_kingdodongo_Limb_01B184" LimbType="Standard" Offset="0x19D84"/>
+        <Limb Name="object_kingdodongo_Limb_01B190" LimbType="Standard" Offset="0x19D90"/>
+        <Limb Name="object_kingdodongo_Limb_01B19C" LimbType="Standard" Offset="0x19D9C"/>
+        <Limb Name="object_kingdodongo_Limb_01B1A8" LimbType="Standard" Offset="0x19DA8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1B4" LimbType="Standard" Offset="0x19DB4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1C0" LimbType="Standard" Offset="0x19DC0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1CC" LimbType="Standard" Offset="0x19DCC"/>
+        <Limb Name="object_kingdodongo_Limb_01B1D8" LimbType="Standard" Offset="0x19DD8"/>
+        <Limb Name="object_kingdodongo_Limb_01B1E4" LimbType="Standard" Offset="0x19DE4"/>
+        <Limb Name="object_kingdodongo_Limb_01B1F0" LimbType="Standard" Offset="0x19DF0"/>
+        <Limb Name="object_kingdodongo_Limb_01B1FC" LimbType="Standard" Offset="0x19DFC"/>
+        <Limb Name="object_kingdodongo_Limb_01B208" LimbType="Standard" Offset="0x19E08"/>
+        <Limb Name="object_kingdodongo_Limb_01B214" LimbType="Standard" Offset="0x19E14"/>
+        <Limb Name="object_kingdodongo_Limb_01B220" LimbType="Standard" Offset="0x19E20"/>
+        <Limb Name="object_kingdodongo_Limb_01B22C" LimbType="Standard" Offset="0x19E2C"/>
+        <Limb Name="object_kingdodongo_Limb_01B238" LimbType="Standard" Offset="0x19E38"/>
+        <Limb Name="object_kingdodongo_Limb_01B244" LimbType="Standard" Offset="0x19E44"/>
+        <Skeleton Name="object_kingdodongo_Skel_01B310" Type="Normal" LimbType="Standard" Offset="0x19F10"/>
+        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
+        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
+        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C550" /-->
+        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
+        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
+        <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
+        <Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x250E0"/>
+        <Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x260E0"/>
+        <Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x270E0"/>
+        <Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x280E0"/>
+        <Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x290E0"/>
+        <Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2A0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2B0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2C0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2D0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2D4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2D8E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2DCE0"/>
+        <Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2E0E0"/>
+        <Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
+        <Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
+        <Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
+        <Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
+        <Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_km1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_km1.xml
new file mode 100644
index 0000000000..0a918a798e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_km1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_km1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+      
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+      
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
+        
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kusa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kusa.xml
new file mode 100644
index 0000000000..67291a5543
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kusa.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_kusa" Segment="6">
+        <DList Name="object_kusa_DL_000140" Offset="0x140"/>
+        <DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kw1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kw1.xml
new file mode 100644
index 0000000000..eab561b1fb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kw1.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_kw1" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
+
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
+        <!-- Arm/neck texture-->
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
+        
+        <!-- Possibly a skin gradient texture -->
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
+        <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
+        
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
+        
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
+
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_kz.xml b/soh/assets/xml/N64_NTSC_12/objects/object_kz.xml
new file mode 100644
index 0000000000..4624fefdb6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_kz.xml
@@ -0,0 +1,45 @@
+<Root>
+    <File Name="object_kz" Segment="6">
+        <Animation Name="gKzMweepAnim" Offset="0x46C"/>
+        <Animation Name="gKzIdleAnim" Offset="0x75C"/>
+        <Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
+        <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
+        <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
+        <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/>
+
+        <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/>
+        <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/>
+        
+        <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/>
+        <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/>
+        <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/>
+        <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/>
+        <DList Name="gKzHeadDL" Offset="0x6420"/>
+        <DList Name="gKzRightHandDL" Offset="0x7298"/>
+        <DList Name="gKzLeftHandDL" Offset="0x74B0"/>
+        <DList Name="gKzPelvisDL" Offset="0x76C8"/>
+        <DList Name="gKzRightThighDL" Offset="0x79E0"/>
+        <DList Name="gKzRightLegDL" Offset="0x7C00"/>
+        <DList Name="gKzRightFootDL" Offset="0x7D40"/>
+        <DList Name="gKzLeftThighDL" Offset="0x8000"/>
+        <DList Name="gKzLeftLegDL" Offset="0x8220"/>
+        <DList Name="gKzLeftFootDL" Offset="0x8360"/>
+        <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_light_ring.xml b/soh/assets/xml/N64_NTSC_12/objects/object_light_ring.xml
new file mode 100644
index 0000000000..babe7d2aa7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_light_ring.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_light_ring" Segment="6">
+        <DList Name="gGoldenGoddessLightRingDL" Offset="0x0190"/>
+        <Texture Name="gGoldenGoddessLightRingTex" OutName="goddess_light_ring" Format="i8" Width="32" Height="128" Offset="0x0278"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_lightbox.xml b/soh/assets/xml/N64_NTSC_12/objects/object_lightbox.xml
new file mode 100644
index 0000000000..552a79d7c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_lightbox.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_lightbox" Segment="6">
+        <Blob Name="object_lightbox_Blob_000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_lightbox_DL_000008" Offset="0x8"/>
+        <Blob Name="object_lightbox_Blob_0002A0" Size="0x130" Offset="0x2A0"/>
+        <DList Name="object_lightbox_DL_0003D0" Offset="0x3D0"/>
+        <Blob Name="object_lightbox_Blob_000670" Size="0x130" Offset="0x670"/>
+        <DList Name="object_lightbox_DL_0007A0" Offset="0x7A0"/>
+        <Blob Name="object_lightbox_Blob_000A40" Size="0x130" Offset="0xA40"/>
+        <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/>
+        <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/>
+        <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/>
+        <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_lightswitch.xml b/soh/assets/xml/N64_NTSC_12/objects/object_lightswitch.xml
new file mode 100644
index 0000000000..cfd5dcfb40
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_lightswitch.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_lightswitch" Segment="6">
+        <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000260" Offset="0x260"/>
+        <!-- flame ring, branches to dlist 0x09000000, uses env color -->
+        <DList Name="object_lightswitch_DL_000398" Offset="0x398"/>
+        <!-- a square, geometry only -->
+        <DList Name="object_lightswitch_DL_000408" Offset="0x408"/>
+        <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open -->
+        <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed -->
+        <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling -->
+        <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_link_boy.xml b/soh/assets/xml/N64_NTSC_12/objects/object_link_boy.xml
new file mode 100644
index 0000000000..6351af5050
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_link_boy.xml
@@ -0,0 +1,282 @@
+<Root>
+    <File Name="object_link_boy" Segment="6">
+        <Texture Name="object_link_boyTLUT_005400" OutName="object_link_boyTLUT_005400" Format="rgba16" Width="16" Height="16" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005800" OutName="object_link_boyTLUT_005800" Format="rgba16" Width="16" Height="16" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_005A00" OutName="object_link_boyTLUT_005A00" Format="rgba16" Width="16" Height="16" Offset="0x5A00" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CB40" OutName="object_link_boyTLUT_00CB40" Format="rgba16" Width="16" Height="16" Offset="0xCB40" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CD48" OutName="object_link_boyTLUT_00CD48" Format="rgba16" Width="16" Height="16" Offset="0xCD48" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00CF50" OutName="object_link_boyTLUT_00CF50" Format="rgba16" Width="16" Height="16" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="object_link_boyTLUT_00D078" OutName="object_link_boyTLUT_00D078" Format="rgba16" Width="16" Height="16" Offset="0xD078" AddedByScript="true"/>
+        <Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
+
+        <!-- Far Limb DLists-->
+        <DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
+        
+        <DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
+        <DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
+        <DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
+        
+        <DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
+        <DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
+        <DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
+
+        <DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
+        <DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
+        <DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
+        <DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
+        
+        <DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
+        <DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
+        <DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
+        
+        <DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
+        <DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
+        <DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
+
+        <!-- Near Limb DLists-->
+        <DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
+
+        <DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
+        <DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
+        <DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
+
+        <DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
+        <DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
+        <DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
+
+        <DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
+        <DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
+        <DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
+        <DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
+        
+        <DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
+        <DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
+        <DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
+
+        <DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
+        <DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
+        <DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
+
+        <DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
+        <DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
+
+        <!-- Bodypart DLs not directly used in the skeleton -->
+        
+        <!-- TODO check left vs right-->
+        <DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
+        <DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
+        <DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
+        
+        <DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
+        <DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
+
+        <!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
+        <DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
+        <DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
+
+        <DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
+        <DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
+        
+        <!-- Limbs-->
+        <Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
+        <Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
+        <Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
+        <Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
+        <Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
+        <Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
+        <Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
+        <Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
+        <Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
+        <Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
+        <Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
+        <Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
+        <Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
+        <Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
+        <Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
+        <Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
+        <Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
+        <Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
+        <Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
+        <Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
+        <Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
+
+        <!-- Swords and shields -->
+        <DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
+        <DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
+
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
+        <DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
+
+        <DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
+        <DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
+
+        <DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
+        <DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
+
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
+        <DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
+
+        <DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
+        <DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
+
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
+        <DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
+
+        <DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
+        <DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
+
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
+        <DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
+
+        <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
+
+
+        <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
+        
+        <Texture Name="gLinkAdultMirrorShieldLowerDesignTex" OutName="mirror_shield_lower_design" Format="ia16" Width="32" Height="64" Offset="0xB280"/>
+        <Texture Name="gLinkAdultMirrorShieldUpperDesignTex" OutName="mirror_shield_upper_design" Format="ia8" Width="64" Height="32" Offset="0xC280"/>
+
+        <Texture Name="gLinkAdultDefaultGauntlet1Tex" OutName="default_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0xD2B8" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultDefaultGauntlet2Tex" OutName="default_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0xD538" TlutOffset="0xCD48"/>
+
+
+        <Texture Name="gLinkAdultHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xD738" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandThumbTex" OutName="closed_hand_thumb" Format="ci8" Width="16" Height="16" Offset="0xD838" TlutOffset="0xCF50"/>
+        <Texture Name="gLinkAdultClosedHandSideTex" OutName="closed_hand_side" Format="ci8" Width="16" Height="16" Offset="0xDB38" TlutOffset="0xCF50"/> <!-- TODO CHECK-->
+
+        <Texture Name="gLinkAdultBowBodyTex" OutName="bow_body" Format="i8" Width="8" Height="8" Offset="0xCB00"/> <!-- TODO get proper name for this-->
+        
+        <Texture Name="gLinkAdultSwordEmblemTex" OutName="sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xEA38" TlutOffset="0xCB40"/>
+
+        <Texture Name="gLinkAdultArmOutSleeveTex" OutName="arm_out_sleeve" Format="ci8" Width="16" Height="32" Offset="0xEDB8" TlutOffset="0xD078"/>
+        <Texture Name="gLinkAdultArmOutUpperGauntletTex" OutName="arm_out_upper_gauntlet" Format="ci8" Width="32" Height="32" Offset="0xE038" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultArmGauntletTex" OutName="arm_gauntlet" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x5800"/>
+
+        <Texture Name="gLinkAdultBoot2Tex" OutName="boot_2" Format="ci8" Width="16" Height="32" Offset="0x6300" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultBootBuckleTex" OutName="boot_buckle" Format="ci8" Width="32" Height="16" Offset="0x6500" TlutOffset="0x5800"/>
+        
+        <Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
+        <!-- Bow -->
+        <DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
+        <DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
+        <DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
+        
+        <DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
+        <DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
+
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
+        <DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
+
+        <!-- Ocarina -->
+        <DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
+        <DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
+
+        <!-- Hookshot -->
+        <DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
+        <DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
+        <DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
+        <DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
+        <Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
+        <Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
+        <Texture Name="gLinkAdultHookshotDesignTex" OutName="hookshot_design" Format="ci8" Width="16" Height="32" Offset="0xEBB8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultHookshotChainTex" OutName="hookshot_chain" Format="rgba16" Width="16" Height="32" Offset="0x2B338"/>
+        <Texture Name="gLinkAdultHookshotReticleTex" OutName="hookshot_dot" Format="i8" Width="64" Height="64" Offset="0x2BB18"/>
+
+        <Texture Name="gLinkAdultBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6F80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultSkirtAndHatTex" OutName="skirt_and_hat" Format="rgba16" Width="32" Height="32" Offset="0x6700"/>
+        <Texture Name="gLinkAdultBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6F00" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultLegTex" OutName="leg" Format="ci8" Width="16" Height="32" Offset="0x6100" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultBootFarTex" OutName="boot_far" Format="ci8" Width="16" Height="32" Offset="0x5600" TlutOffset="0x5400"/>
+        <Texture Name="gLinkAdultBootTex" OutName="boot" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultCollarTex" OutName="collar" Format="rgba16" Width="16" Height="32" Offset="0x9580"/>        
+        <Texture Name="gLinkAdultTunicTex" OutName="tunic" Format="ci8" Width="16" Height="32" Offset="0x9380" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNeckTex" OutName="neck" Format="ci8" Width="16" Height="32" Offset="0x7980" TlutOffset="0x5A00"/>
+        <Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
+
+        <!-- Gauntlets -->
+        <DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
+        <DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
+        <DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
+
+        <DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
+        <DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
+        <DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
+        
+        <Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
+        <Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
+
+        <Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
+
+        <!-- Boots -->
+        <DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
+        <DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
+        <Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
+
+        <DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
+        <DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
+        <Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
+        <Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>
+        <Texture Name="gLinkAdultHoverBootsFeatherTex" OutName="hover_boots_feather" Format="rgba16" Width="32" Height="16" Offset="0xAE80"/>
+        
+        <!-- Sword and sheath-->
+        <Texture Name="gLinkAdultSheathTex" OutName="sheath" Format="ci8" Width="32" Height="32" Offset="0xDC38" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordPommelTex" OutName="sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xD0B8" TlutOffset="0xCB40"/>
+        <Texture Name="gLinkAdultSwordGuardTex" OutName="sword_guard" Format="ci8" Width="32" Height="32" Offset="0xE438" TlutOffset="0xCB40"/>
+        
+        <!-- Eyes -->
+        <Texture Name="gLinkAdultEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/><!--Left from links perspective-->
+        <Texture Name="gLinkAdultEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/><!--Right from links perspective-->
+        <Texture Name="gLinkAdultEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5C00"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkAdultMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5C00"/>
+        
+        <Texture Name="gLinkAdultEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
+        
+        <!-- Tluts -->
+        <Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
+
+        <!-- Unused -->
+        <Texture Name="gLinkAdultUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5300" TlutOffset="0x5C00"/>
+        <Texture Name="gLinkAdultUnusedGauntlet1Tex" OutName="unused_gauntlet_1" Format="ci8" Width="16" Height="32" Offset="0x7B80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedGauntlet2Tex" OutName="unused_gauntlet_2" Format="ci8" Width="16" Height="32" Offset="0x7D80" TlutOffset="0x5800"/>
+        <Texture Name="gLinkAdultUnusedSheathTex" OutName="unused_sheath" Format="ci8" Width="32" Height="64" Offset="0x8380" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSheathBandTex" OutName="unused_sheat_band" Format="ci8" Width="32" Height="16" Offset="0x8B80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordPommelTex" OutName="unused_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0x8D80" TlutOffset="0x5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordGuardTex" OutName="unused_sword_guard" Format="ci8" Width="32" Height="32" Offset="0x8E80" TlutOffset="5E00"/>
+        <Texture Name="gLinkAdultUnusedSwordEmblemTex" OutName="unused_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0x9280" TlutOffset="0x5E00"/>
+
+        <Array Name="gLinkAdultVtx_02E120" Count="38" Offset="0x2E120" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkAdultVtx_033760" Count="54" Offset="0x33760" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_0340A0" Count="146" Offset="0x340A0" Static="On">
+            <Vtx/>
+        </Array>
+        <Array Name="gLinkAdultVtx_02E7E0" Count="114" Offset="0x2E7E0" Static="On">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_link_child.xml b/soh/assets/xml/N64_NTSC_12/objects/object_link_child.xml
new file mode 100644
index 0000000000..0de4003731
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_link_child.xml
@@ -0,0 +1,225 @@
+<Root>
+    <File Name="object_link_child" Segment="6">
+        <Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
+        
+        <!--Far Limb DLists--> 
+        <DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>   
+        <DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>  
+        <DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
+        <DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
+        <DList Name="gLinkChildRightThighFarDL" Offset="0x1B0F8"/>
+        <DList Name="gLinkChildRightShinFarDL" Offset="0x1B2B8"/>
+        <DList Name="gLinkChildRightFootFarDL" Offset="0x1B510"/>
+        <DList Name="gLinkChildLeftThighFarDL" Offset="0x1B638"/>
+        <DList Name="gLinkChildLeftShinFarDL" Offset="0x1B7F8"/>
+        <DList Name="gLinkChildLeftFootFarDL" Offset="0x1BA50"/>
+        <DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
+        <DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
+        <DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
+        <DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
+        <DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C398"/>
+        <DList Name="gLinkChildRightForearmFarDL" Offset="0x1C558"/>
+        <DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C688"/>
+        <DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C848"/>
+        
+        <!--Near Limb DLists-->
+        <DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
+        <DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
+        <DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
+        <DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
+        <DList Name="gLinkChildRightThighNearDL" Offset="0x204F0"/>
+        <DList Name="gLinkChildRightShinNearDL" Offset="0x206E8"/>
+        <DList Name="gLinkChildRightFootNearDL" Offset="0x20978"/>
+        <DList Name="gLinkChildLeftThighNearDL" Offset="0x20AD8"/>
+        <DList Name="gLinkChildLeftShinNearDL" Offset="0x20CD0"/>
+        <DList Name="gLinkChildLeftFootNearDL" Offset="0x20F60"/>
+        <DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
+        <DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
+        <DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
+        <DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
+        <DList Name="gLinkChildRightShoulderNearDL" Offset="0x21AE8"/>
+        <DList Name="gLinkChildRightForearmNearDL" Offset="0x21CB8"/>
+        <DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21E18"/>
+        <DList Name="gLinkChildLeftForearmNearDL" Offset="0x21FE8"/>
+        
+        <!--Limbs-->
+        <Limb Name="gLinkChildRootLimb" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLowerControlLimb" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildUpperControlLimb" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHeadLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildLeftshoulderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildRightshoulderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
+        
+        <!--General DLists-->
+        <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
+        <DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
+        <DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
+        
+        <!--Body Parts not used in Limbs-->
+        <DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
+        <DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
+        <DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
+        <DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
+        <DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
+        <DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
+        <DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
+        <DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
+        <DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
+        <DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
+        <DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
+        <DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
+        <DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
+        <DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
+        <DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
+        <DList Name="gLinkChildRightHandAndOotNearDL" Offset="0x15958"/>
+        <DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
+        <DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotNearDL" Offset="0x15DF0"/>
+        <DList Name="gLinkChildRightHandHoldingSlingshotFarDL" Offset="0x17D38"/>
+        <DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
+        <DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
+
+        <DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
+        <DList Name="gLinkChildBottleDL" Offset="0x18478"/>
+        <DList Name="gLinkChildDL_18580" Offset="0x18580"/>
+        <DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
+        <DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
+        <DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
+        <Mtx Name="gLinkChildDekuShieldMtx"  Offset="0x22648"/>
+        <DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
+        
+        <!--Masks-->
+        <DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
+        <DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
+        <DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
+        <DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
+        <DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
+        <DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
+        <DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
+        <DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
+        
+        <!--Textures-->
+        <Texture Name="gLinkChildNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
+      <!--<Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/>--> <!--Unused so hard to verify-->
+        <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildBeltClaspTex" OutName="belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldFrontTex" OutName="deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildSlingshotTex" OutName="slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
+        <Texture Name="gLinkChildSlingshotSeedTex" OutName="slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
+        <Texture Name="gLinkChildHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildSwordJewelTex" OutName="sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildGoronBraceletTex" OutName="goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
+        <Texture Name="gLinkChildGoronSymbolTex" OutName="goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
+
+        <Texture Name="gLinkChildSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
+        <Texture Name="gLinkChildSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
+        <Texture Name="gLinkChildSkullMaskEyeTex" OutName="skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
+        
+        <Texture Name="gLinkChildSpookyMaskTex" OutName="spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
+        <Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
+        <Texture Name="gLinkChildKeatonMaskEarTex" OutName="keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
+        <Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
+        <Texture Name="gLinkChildMaskOfTruthTex" OutName="mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
+        
+        <Texture Name="gLinkChildGoronMaskMouthTex" OutName="goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
+        <Texture Name="gLinkChildGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
+        <Texture Name="gLinkChildGoronMaskNoseTex" OutName="goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
+        <Texture Name="gLinkChildGoronMaskHairTex" OutName="goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
+        <Texture Name="gLinkChildGoronMaskEarTex" OutName="goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
+
+        <Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
+        <Texture Name="gLinkChildZoraMaskEarTex" OutName="zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
+        <Texture Name="gLinkChildZoraMaskEyeTex" OutName="zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
+        <Texture Name="gLinkChildZoraMaskMouthTex" OutName="zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
+
+        <Texture Name="gLinkChildGerudoMaskEyeTex" OutName="gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
+        <Texture Name="gLinkChildGerudoMaskMouthTex" OutName="gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
+        <Texture Name="gLinkChildGerudoMaskHairTex" OutName="gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
+        <Texture Name="gLinkChildGerudoMaskNoseTex" OutName="gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
+
+        <Texture Name="gLinkChildBunnyHoodEyeTex" OutName="bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
+        <Texture Name="gLinkChildBunnyHoodTex" OutName="bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
+        <Texture Name="gLinkChildBunnyHoodEarTex" OutName="bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
+        
+        <!--TLUTs-->
+        <Texture Name="gLinkChildSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gLinkChildHandTLUT" OutName="hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
+        <Texture Name="gLinkChildSwordsTLUT" OutName="swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
+        <Texture Name="gLinkChildSwordTLUT" OutName="sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
+        <Texture Name="gLinkChildBeltTLUT" OutName="belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        
+        <!--Eyes-->
+        <Texture Name="gLinkChildEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesClosedfTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesRollLeftTex" OutName="eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
+        <Texture Name="gLinkChildEyesRollRightTex" OutName="eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
+        <Texture Name="gLinkChildEyesShockTex" OutName="eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk1Tex" OutName="eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildEyesUnk2Tex" OutName="eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
+        
+        <!--Mouth-->
+        <Texture Name="gLinkChildMouth1Tex" OutName="mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth2Tex" OutName="mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth3Tex" OutName="mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
+        <Texture Name="gLinkChildMouth4Tex" OutName="mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
+
+        <!--Unused Vtx-->
+        <Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08" Static="On">
+            <Vtx/>
+        </Array>
+        
+        <Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8" Static="On">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28" Static="On">
+            <Vtx/>
+        </Array>
+    </File> 
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ma1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ma1.xml
new file mode 100644
index 0000000000..63eeb38950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ma1.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_ma1" Segment="6">
+        <Skeleton Name="gMalonChildSkel" Type="Flex" LimbType="Standard" Offset="0x8460"/>
+    
+        <Limb Name="gMalonChildRootLimb" LimbType="Standard" Offset="0x8340"/>
+        <Limb Name="gMalonChildLeftThighLimb" LimbType="Standard" Offset="0x834C"/>
+        <Limb Name="gMalonChildLeftShinLimb" LimbType="Standard" Offset="0x8358"/>
+        <Limb Name="gMalonChildLeftFootLimb" LimbType="Standard" Offset="0x8364"/>
+        <Limb Name="gMalonChildRightThighLimb" LimbType="Standard" Offset="0x8370"/>
+        <Limb Name="gMalonChildRightShinLimb" LimbType="Standard" Offset="0x837C"/>
+        <Limb Name="gMalonChildRightFootLimb" LimbType="Standard" Offset="0x8388"/>
+        <Limb Name="gMalonChildChestLimb" LimbType="Standard" Offset="0x8394"/>
+        <Limb Name="gMalonChildLeftShoulderLimb" LimbType="Standard" Offset="0x83A0"/>
+        <Limb Name="gMalonChildLeftArmLimb" LimbType="Standard" Offset="0x83AC"/>
+        <Limb Name="gMalonChildLeftHandLimb" LimbType="Standard" Offset="0x83B8"/>
+        <Limb Name="gMalonChildRightShoulderLimb" LimbType="Standard" Offset="0x83C4"/>
+        <Limb Name="gMalonChildRightArmLimb" LimbType="Standard" Offset="0x83D0"/>
+        <Limb Name="gMalonChildRightHandLimb" LimbType="Standard" Offset="0x83DC"/>
+        <Limb Name="gMalonChildHeadLimb" LimbType="Standard" Offset="0x83E8"/>
+        <Limb Name="gMalonChildLimb_0083F4" LimbType="Standard" Offset="0x83F4"/>
+        <Limb Name="gMalonChildDressMiddleLimb" LimbType="Standard" Offset="0x8400"/>
+        <Limb Name="gMalonChildDressLowerLimb" LimbType="Standard" Offset="0x840C"/>
+
+        <Animation Name="gMalonChildRaiseHandsAnim" Offset="0x244"/>
+        <Animation Name="gMalonChildIdleAnim" Offset="0x820"/>
+        <Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
+
+        <Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
+        <Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
+        <Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
+        <Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
+        <Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
+        <Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
+        <Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
+        <Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
+        <Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
+
+        <Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
+        <Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
+        <Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
+
+        <Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
+        <Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
+        <Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
+
+        <DList Name="gMalonChildHeadDL" Offset="0x4148"/>
+        <DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>
+        <DList Name="gMalonChildDressMiddleDL" Offset="0x6DD8"/>
+        <DList Name="gMalonChildChestDL" Offset="0x6F10"/>
+        <DList Name="gMalonChildRightShoulderDL" Offset="0x7360"/>
+        <DList Name="gMalonChildRightArmDL" Offset="0x7518"/>
+        <DList Name="gMalonChildRightHandDL" Offset="0x7628"/>
+        <DList Name="gMalonChildLeftShoulderDL" Offset="0x77D0"/>
+        <DList Name="gMalonChildLeftArmDL" Offset="0x7988"/>
+        <DList Name="gMalonChildLeftHandDL" Offset="0x7A98"/>
+        <DList Name="gMalonChildDressUpperDL" Offset="0x7C40"/>
+        <DList Name="gMalonChildRightThighDL" Offset="0x7D40"/>
+        <DList Name="gMalonChildRightShinDL" Offset="0x7D98"/>
+        <DList Name="gMalonChildRightFoorDL" Offset="0x7EF8"/>
+        <DList Name="gMalonChildLeftThighDL" Offset="0x8040"/>
+        <DList Name="gMalonChildLeftShinDL" Offset="0x8098"/>
+        <DList Name="gMalonChildLeftFootDL" Offset="0x81F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ma2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ma2.xml
new file mode 100644
index 0000000000..ce5910fb80
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ma2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_ma2" Segment="6">
+        <Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
+        <Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
+        <Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
+        <Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
+        <Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
+        <Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
+        <Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
+        <Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
+        <Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
+        <Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
+
+        <Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
+        
+        <Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
+        <Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
+
+        <Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
+        <Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
+
+        <DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
+        <DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
+        <DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
+        <DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
+        <DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
+        <DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
+        <DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
+        <DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
+        <DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
+        <DList Name="gMalonAdultDressDL" Offset="0x8300"/>
+        <DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
+        <DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
+        <DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
+        <DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
+        <DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
+        <DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
+        <DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
+
+        <Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
+        <Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
+        <Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
+        <Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
+        <Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
+        <Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
+        <Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
+        <Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
+        <Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
+        <Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
+        <Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
+        <Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
+        <Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
+        <Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
+        <Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
+        <Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
+        <Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
+        <Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
+        <Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
+        <Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
+        <Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
+        <Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
+        <Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mag.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mag.xml
new file mode 100644
index 0000000000..257f723635
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mag.xml
@@ -0,0 +1,20 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" Format="rgba32" Width="160" Height="160" Offset="0x300"/>
+        <Texture Name="gTitleCopyright1998Tex" OutName="title_copyright_1998" Format="ia8" Width="128" Height="16" Offset="0x19300"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19B00"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A300"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1AB00"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1B300"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1BB00"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1C300"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1CB00"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1D300"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1DB00"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1E300"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1E700"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1E940"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EC40"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mamenoki.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mamenoki.xml
new file mode 100644
index 0000000000..819d890225
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mamenoki.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_mamenoki" Segment="6">
+        <DList Name="gMagicBeanSeedlingDL" Offset="0x90"/>
+        <DList Name="gMagicBeanStemDL" Offset="0x1B0"/>
+        <DList Name="gMagicBeanPlatformDL" Offset="0x3F0"/>
+        <DList Name="gMagicBeanSoftSoilDL" Offset="0x650"/>
+        <Texture Name="gMagicBeanSoftSoilTex" OutName="soft_soil" Format="rgba16" Width="32" Height="32" Offset="0x6E0"/>
+        <Texture Name="gMagicBeanSeedlingTex" OutName="seedling" Format="rgba16" Width="16" Height="32" Offset="0xEE0"/>
+        <Texture Name="gMagicBeanPlatformTex" OutName="platform" Format="rgba16" Width="32" Height="32" Offset="0x12E0"/>
+        <Texture Name="gMagicBeanPlatformStemTex" OutName="platform_stem" Format="rgba16" Width="16" Height="32" Offset="0x1AE0"/>
+        <Texture Name="gMagicBeanPlatformRootsTex" OutName="platform_roots" Format="rgba16" Width="32" Height="16" Offset="0x1EE0"/>
+        <Texture Name="gMagicBeanStemTex" OutName="stem" Format="rgba16" Width="16" Height="32" Offset="0x22E0"/>
+        <Collision Name="gMagicBeanPlatformCol" Offset="0x5DC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mastergolon.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mastergolon.xml
new file mode 100644
index 0000000000..6dd9d16592
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mastergolon.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mastergolon" Segment="6">
+        <Animation Name="gGoronShopkeeperAnim" Offset="0xFC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_masterkokiri.xml b/soh/assets/xml/N64_NTSC_12/objects/object_masterkokiri.xml
new file mode 100644
index 0000000000..af5a9ec153
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_masterkokiri.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterkokiri" Segment="6">
+        <Animation Name="object_masterkokiri_Anim_0004A8" Offset="0x4A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_NTSC_12/objects/object_masterkokirihead.xml
new file mode 100644
index 0000000000..c64aa1c49e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_masterkokirihead.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_masterkokirihead" Segment="6">
+        <Texture Name="object_masterkokiriheadTex_0009F0" OutName="object_masterkokiriheadTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_masterkokiriheadTex_000A30" OutName="object_masterkokiriheadTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0" AddedByScript="true"/>
+        <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
+        <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
+        <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x1470" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperEyeDefaultTex" OutName="eye_default" Format="rgba16" Width="32" Height="32" Offset="0x1570"/>
+        <Texture Name="gKokiriShopkeeperHatTex" OutName="hat" Format="ci8" Width="8" Height="8" Offset="0x1D70" TlutOffset="0x0"/>
+        <Texture Name="gKokiriShopkeeperMouthAndNoseTex" OutName="mouth_and_nose" Format="ci8" Width="32" Height="32" Offset="0x1DB0" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_masterzoora.xml b/soh/assets/xml/N64_NTSC_12/objects/object_masterzoora.xml
new file mode 100644
index 0000000000..2c703274e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_masterzoora.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_masterzoora" Segment="6">
+        <Animation Name="gZoraShopkeeperAnim" Offset="0x78C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mb.xml
new file mode 100644
index 0000000000..23c0930c02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mb.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_mb" Segment="6">
+        <Texture Name="object_mbTex_008128" OutName="object_mbTex_008128" Format="rgba16" Width="16" Height="16" Offset="0x8128" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008328" OutName="object_mbTex_008328" Format="rgba16" Width="8" Height="32" Offset="0x8328" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008928" OutName="object_mbTex_008928" Format="rgba16" Width="8" Height="16" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A28" OutName="object_mbTex_008A28" Format="rgba16" Width="4" Height="4" Offset="0x8A28" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008A48" OutName="object_mbTex_008A48" Format="rgba16" Width="8" Height="24" Offset="0x8A48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008BC8" OutName="object_mbTex_008BC8" Format="rgba16" Width="4" Height="16" Offset="0x8BC8" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C48" OutName="object_mbTex_008C48" Format="rgba16" Width="4" Height="8" Offset="0x8C48" AddedByScript="true"/>
+        <Texture Name="object_mbTex_008C88" OutName="object_mbTex_008C88" Format="rgba16" Width="8" Height="16" Offset="0x8C88" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EC00" OutName="object_mbTex_00EC00" Format="rgba16" Width="16" Height="16" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EE00" OutName="object_mbTex_00EE00" Format="rgba16" Width="8" Height="16" Offset="0xEE00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00EF00" OutName="object_mbTex_00EF00" Format="rgba16" Width="8" Height="16" Offset="0xEF00" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F000" OutName="object_mbTex_00F000" Format="rgba16" Width="16" Height="16" Offset="0xF000" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F200" OutName="object_mbTex_00F200" Format="rgba16" Width="4" Height="16" Offset="0xF200" AddedByScript="true"/>
+        <Texture Name="object_mbTex_00F280" OutName="object_mbTex_00F280" Format="rgba16" Width="4" Height="16" Offset="0xF280" AddedByScript="true"/>
+        <Skeleton Name="gEnMbSpearSkel" Type="Flex" LimbType="Standard" Offset="0x8F38"/>
+        <Skeleton Name="gEnMbClubSkel" Type="Flex" LimbType="Standard" Offset="0x14190"/>
+        <Animation Name="gEnMbSpearFallFaceDownAnim" Offset="0x6A4"/><!--Unused-->
+        <Animation Name="gEnMbSpearDamagedFromBehindAnim" Offset="0x95C"/>
+        <Animation Name="gEnMbSpearDamagedUngrabSpearAnim" Offset="0x1000"/><!--Unused-->
+        <Animation Name="gEnMbSpearFallOnItsBackAnim" Offset="0x16B4"/>
+        <Animation Name="gEnMbSpearDamagedFromFrontAnim" Offset="0x1950"/>
+        <Animation Name="gEnMbSpearStandStillAnim" Offset="0x28E0"/>
+        <Animation Name="gEnMbSpearPrepareChargeAnim" Offset="0x2C10"/>
+        <Animation Name="gEnMbSpearChargeAnim" Offset="0x2F10"/>
+        <Animation Name="gEnMbSpearLookLeftAndRightAnim" Offset="0x41A8"/>
+        <Animation Name="gEnMbSpearSlowDownAnim" Offset="0x9280"/>
+        <Animation Name="gEnMbSpearLookLeftAnim" Offset="0x9450"/><!--Unused -->
+        <Animation Name="gEnMbSpearWalkAnim" Offset="0x9FC0"/>
+        <Animation Name="gEnMbSpearUngrabSpearAnim" Offset="0xA410"/><!--Unused -->
+        <Animation Name="gEnMbSpearGrabSpearAnim" Offset="0xA80C"/><!--Unused -->
+        <Animation Name="gEnMbClubStrikeDownAnim" Offset="0xABE0"/>
+        <Animation Name="gEnMbClubLiftClubAnim" Offset="0xB4BC"/>
+        <Animation Name="gEnMbClubFallOnItsBackAnim" Offset="0xBE58"/>
+        <Animation Name="gEnMbClubDamagedKneelAnim" Offset="0xC44C"/>
+        <Animation Name="gEnMbClubStandStillClubUpAnim" Offset="0xCF1C"/><!--Unused -->
+        <Animation Name="gEnMbClubKneelingAnim" Offset="0xD380"/><!--Unused -->
+        <Animation Name="gEnMbClubBeatenKneelingAnim" Offset="0xD5D4"/>
+        <Animation Name="gEnMbClubStandUpAnim" Offset="0xE18C"/>
+        <Animation Name="gEnMbClubStandStillClubDownAnim" Offset="0xEBE4"/>
+        <DList Name="gEnMbDL_006930" Offset="0x06930"/>
+        <DList Name="gEnMbDL_006A18" Offset="0x06A18"/>
+        <DList Name="gEnMbDL_006B20" Offset="0x06B20"/>
+        <DList Name="gEnMbDL_006CD0" Offset="0x06CD0"/>
+        <DList Name="gEnMbDL_006DD8" Offset="0x06DD8"/>
+        <DList Name="gEnMbDL_006EE0" Offset="0x06EE0"/>
+        <DList Name="gEnMbDL_007090" Offset="0x07090"/>
+        <DList Name="gEnMbDL_007198" Offset="0x07198"/><!--Spear-->
+        <DList Name="gEnMbDL_0073F0" Offset="0x073F0"/>
+        <DList Name="gEnMbDL_007500" Offset="0x07500"/>
+        <DList Name="gEnMbDL_0076C8" Offset="0x076C8"/>
+        <DList Name="gEnMbDL_0077F8" Offset="0x077F8"/>
+        <DList Name="gEnMbDL_007AD0" Offset="0x07AD0"/>
+        <DList Name="gEnMbDL_007E70" Offset="0x07E70"/>
+        <Texture Name="gEnMbFaceTex" OutName="face" Format="rgba16" Width="16" Height="32" Offset="0x8528"/>
+        <DList Name="gEnMbDL_012580" Offset="0x12580"/>
+        <DList Name="gEnMbDL_012698" Offset="0x12698"/>
+        <DList Name="gEnMbDL_012868" Offset="0x12868"/>
+        <DList Name="gEnMbDL_012A18" Offset="0x12A18"/>
+        <DList Name="gEnMbDL_012B20" Offset="0x12B20"/>
+        <DList Name="gEnMbDL_012CF0" Offset="0x12CF0"/>
+        <DList Name="gEnMbDL_012EA0" Offset="0x12EA0"/>
+        <DList Name="gEnMbDL_012FA8" Offset="0x12FA8"/>
+        <DList Name="gEnMbDL_0130D8" Offset="0x130D8"/>
+        <DList Name="gEnMbDL_013228" Offset="0x13228"/>
+        <DList Name="gEnMbDL_013440" Offset="0x13440"/>
+        <DList Name="gEnMbDL_0136C8" Offset="0x136C8"/>
+        <DList Name="gEnMbDL_013818" Offset="0x13818"/>
+        <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
+        <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_md.xml b/soh/assets/xml/N64_NTSC_12/objects/object_md.xml
new file mode 100644
index 0000000000..161c73dca1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_md.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_md" Segment="6">
+        <!-- Mido Skeleton -->
+        <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
+
+        <!-- Mido Limbs -->
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
+
+        <!-- Mido Limb DisplayLists -->
+        <DList Name="gMidoWaistDL" Offset="0x4218"/>
+        <DList Name="gMidoLeftThighDL" Offset="0x47D0"/>
+        <DList Name="gMidoLeftLegDL" Offset="0x4978"/>
+        <DList Name="gMidoLeftFootDL" Offset="0x4B10"/>
+        <DList Name="gMidoRightThighDL" Offset="0x4350"/>
+        <DList Name="gMidoRightLegDL" Offset="0x44F8"/>
+        <DList Name="gMidoRightFootDL" Offset="0x4698"/>
+        <DList Name="gMidoTorsoDL" Offset="0x32D0"/>
+        <DList Name="gMidoLeftUpperArmDL" Offset="0x3CA8"/>
+        <DList Name="gMidoLeftForearmDL" Offset="0x3DE0"/>
+        <DList Name="gMidoLeftHandDL" Offset="0x3F18"/>
+        <DList Name="gMidoRightUpperArmDL" Offset="0x3740"/>
+        <DList Name="gMidoRightForearmDL" Offset="0x3878"/>
+        <DList Name="gMidoRightHandDL" Offset="0x39B0"/>
+        <DList Name="gMidoHeadDL" Offset="0x7380"/>
+
+        <!-- Mido Palettes -->
+        <Texture Name="gMido1TLUT" OutName="tlut_1" Format="rgba16" Width="256" Height="1" Offset="0x02E0"/>
+        <Texture Name="gMido2TLUT" OutName="tlut_2" Format="rgba16" Width="188" Height="1" Offset="0x4C48"/>
+        <Texture Name="gMido3TLUT" OutName="tlut_3" Format="rgba16" Width="248" Height="1" Offset="0x4DC0"/>
+
+        <!-- Mido Eye Textures -->
+        <Texture Name="gMidoEyeOpenTex" OutName="mido_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4FF0" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeHalfTex" OutName="mido_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5930" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeClosedTex" OutName="mido_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5D30" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeAngryTex" OutName="mido_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6130" TlutOffset="0x4DC0"/>
+        <Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
+
+        <!-- Mido DisplayList Textures -->
+        <Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
+        <Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
+        <Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0"/>
+        <Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
+        <Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoClothesTex" OutName="clothes" Format="ci8" Width="8" Height="8" Offset="0x12E0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoUndershirtTex" OutName="undershirt" Format="i8" Width="8" Height="8" Offset="0x1320"/>
+        <Texture Name="gMidoShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x1360" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoAnkleTex" OutName="ankle" Format="ci8" Width="8" Height="8" Offset="0x13A0" TlutOffset="0x02E0"/>
+        <Texture Name="gMidoPantsTex" OutName="pants" Format="rgba16" Width="16" Height="16" Offset="0x13E0"/>
+        <Texture Name="gMidoTex_4FB0" OutName="tex_4FB0" Format="ci8" Width="8" Height="8" Offset="0x4FB0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_53F0" OutName="tex_53F0" Format="ci8" Width="8" Height="8" Offset="0x53F0" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5430" OutName="tex_5430" Format="ci8" Width="8" Height="8" Offset="0x5430" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoHairCurl2Tex" OutName="hair_curl_2" Format="ci8" Width="32" Height="32" Offset="0x5470" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_5870" OutName="tex_5870" Format="ci8" Width="8" Height="16" Offset="0x5870" TlutOffset="0x4C48"/>
+        <Texture Name="gMidoTex_58F0" OutName="tex_58F0" Format="ci8" Width="8" Height="8" Offset="0x58F0" TlutOffset="0x4C48"/>
+
+        <!-- Mido Animations -->
+        <Animation Name="gMidoHandsOnHipsIdleAnim" Offset="0x02C8"/>
+        <Animation Name="gMidoSlamAnim" Offset="0x8510"/>
+        <Animation Name="gMidoAngryHeadTurnAnim" Offset="0x8738"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle1Anim" Offset="0x8E84"/>
+        <Animation Name="gMidoHandsOnHipsTransitionAnim" Offset="0x8FC0"/>
+        <Animation Name="gMidoRaiseHand1Anim" Offset="0x917C"/>
+        <Animation Name="gMidoAnim_92B0" Offset="0x92B0"/>
+        <Animation Name="gMidoRaiseHand2Anim" Offset="0x95BC"/>
+        <Animation Name="gMidoAnnoyedPointedHeadIdle2Anim" Offset="0x97F0"/>
+        <Animation Name="gMidoPutHandDownAnim" Offset="0x9B1C"/>
+        <Animation Name="gMidoHaltAnim" Offset="0x9E68"/>
+        <Animation Name="gMidoWalkingAnim" Offset="0xA138"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_medal.xml b/soh/assets/xml/N64_NTSC_12/objects/object_medal.xml
new file mode 100644
index 0000000000..533872a551
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_medal.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_medal" Segment="6">
+        <DList Name="object_medal_DL_000360" Offset="0x360"/>
+        <DList Name="object_medal_DL_000840" Offset="0x840"/>
+        <DList Name="object_medal_DL_000D20" Offset="0xD20"/>
+        <DList Name="object_medal_DL_001200" Offset="0x1200"/>
+        <DList Name="object_medal_DL_0016E0" Offset="0x16E0"/>
+        <DList Name="object_medal_DL_001BC0" Offset="0x1BC0"/>
+        <Blob Name="object_medal_Blob_001D40" Size="0x400" Offset="0x1D40"/>
+        <Texture Name="object_medal_Tex_002140" OutName="tex_00002140" Format="rgba16" Width="32" Height="32" Offset="0x2140"/>
+        <Texture Name="object_medal_Tex_002940" OutName="tex_00002940" Format="rgba16" Width="32" Height="32" Offset="0x2940"/>
+        <Texture Name="object_medal_Tex_003140" OutName="tex_00003140" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Texture Name="object_medal_Tex_003940" OutName="tex_00003940" Format="rgba16" Width="32" Height="32" Offset="0x3940"/>
+        <Texture Name="object_medal_Tex_004140" OutName="tex_00004140" Format="rgba16" Width="32" Height="32" Offset="0x4140"/>
+        <Texture Name="object_medal_Tex_004940" OutName="tex_00004940" Format="rgba16" Width="32" Height="32" Offset="0x4940"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_menkuri_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_menkuri_objects.xml
new file mode 100644
index 0000000000..4c2b51df5b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_menkuri_objects.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_menkuri_objects" Segment="6">
+        <Texture Name="gGTGDoorTex" OutName="gtg_door" Format="i4" Width="64" Height="128" Offset="0x0"/>
+        <Texture Name="gGTGFakeWallTex" OutName="gtg_fake_wall" Format="rgba16" Width="64" Height="32" Offset="0x1180"/>
+        <Texture Name="gGTGFakeCeilingTex" OutName="gtg_fake_ceiling" Format="rgba16" Width="32" Height="32" Offset="0x2340"/>
+        <Texture Name="gGTGRotatingRingPlatformInnerCircleTex" OutName="gtg_rotating_ring_platform_inner_circle" Format="i4" Width="64" Height="128" Offset="0x4310"/>
+        <Texture Name="gGTGStatueTex" OutName="gtg_statue" Format="i4" Width="64" Height="128" Offset="0x5310"/>
+        <Texture Name="gGTGTex_6310" OutName="gtg_6310" Format="rgba16" Width="32" Height="32" Offset="0x6310"/>
+        <Texture Name="gGTGStatueEyeTex" OutName="gtg_statue_eye" Format="i4" Width="64" Height="128" Offset="0x6B10"/>
+        <Texture Name="gGTGRotatingRingPlatformOuterCircleTex" OutName="gtg_rotating_ring_platform_outer_circle" Format="i4" Width="128" Height="64" Offset="0x7B10"/>
+        <DList Name="gGTGDoorDL" Offset="0x10D0"/>
+        <DList Name="gGTGFakeWallDL" Offset="0x2280"/>
+        <DList Name="gGTGFakeCeilingDL" Offset="0x2BC0"/>
+        <DList Name="gGTGEyeStatueEyeDL" Offset="0x2D20"/>
+        <DList Name="gGTGRotatingRingPlatformDL" Offset="0x38D0"/>
+        <Collision Name="gGTGRotatingRingPlatformCol" Offset="0x42D8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mir_ray.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mir_ray.xml
new file mode 100644
index 0000000000..2acc9391ab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mir_ray.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_mir_ray" Segment="6">
+
+        <!-- Shield beam displaylists -->
+        <DList Name="gShieldBeamImageDL" Offset="0xB0"/>
+        <DList Name="gShieldBeamGlowDL" Offset="0xC50"/>
+
+        <!-- Shield beam textures -->
+        <Texture Name="gShieldBeamImageCircleTex" OutName="shield_beam_image_circle" Format="ia16" Width="16" Height="16" Offset="0x188"/>
+        <Texture Name="gShieldBeamImageGerudoSymbolNewTex" OutName="shield_beam_image_gerudo_symbol_new" Format="ia16" Width="32" Height="32" Offset="0x388"/>
+        <Texture Name="gShieldBeamGlowRayTex" OutName="shield_beam_glow_ray" Format="ia16" Width="8" Height="256" Offset="0xCF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mizu_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mizu_objects.xml
new file mode 100644
index 0000000000..5a18b95cfe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mizu_objects.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_mizu_objects" Segment="6">
+        <Texture Name="object_mizu_objectsTex_004C00" OutName="object_mizu_objectsTex_004C00" Format="rgba16" Width="32" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_005E70" OutName="object_mizu_objectsTex_005E70" Format="rgba16" Width="32" Height="64" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007520" OutName="object_mizu_objectsTex_007520" Format="ia16" Width="32" Height="32" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_007D20" OutName="object_mizu_objectsTex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008520" OutName="object_mizu_objectsTex_008520" Format="rgba16" Width="32" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_008D20" OutName="object_mizu_objectsTex_008D20" Format="rgba16" Width="32" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009520" OutName="object_mizu_objectsTex_009520" Format="i4" Width="32" Height="32" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009720" OutName="object_mizu_objectsTex_009720" Format="i4" Width="32" Height="32" Offset="0x9720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009920" OutName="object_mizu_objectsTex_009920" Format="i4" Width="32" Height="32" Offset="0x9920" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009B20" OutName="object_mizu_objectsTex_009B20" Format="i4" Width="32" Height="32" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009D20" OutName="object_mizu_objectsTex_009D20" Format="i4" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_009F20" OutName="object_mizu_objectsTex_009F20" Format="rgba16" Width="32" Height="32" Offset="0x9F20" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00A720" OutName="object_mizu_objectsTex_00A720" Format="rgba16" Width="16" Height="32" Offset="0xA720" AddedByScript="true"/>
+        <Texture Name="object_mizu_objectsTex_00AB20" OutName="object_mizu_objectsTex_00AB20" Format="i4" Width="64" Height="64" Offset="0xAB20" AddedByScript="true"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000190" Offset="0x0190"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0003F0" Offset="0x03F0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000680" Offset="0x0680"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000998" Offset="0x0998"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_000C20" Offset="0x0C20"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_000ED0" Offset="0x0ED0"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_0011F0" Offset="0x11F0"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_0015F8" Offset="0x15F8"/>
+        <DList Name="gObjectMizuObjectsMovebgDL_002E10" Offset="0x2E10"/>
+        <Collision Name="gObjectMizuObjectsMovebgCol_003590" Offset="0x3590"/>
+        
+        <DList Name="gObjectMizuObjectsBwallDL_001770" Offset="0x1770"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001A30" Offset="0x1A30"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001C58" Offset="0x1C58"/>
+        <DList Name="gObjectMizuObjectsBwallDL_001CD0" Offset="0x1CD0"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_001DE8" Offset="0x1DE8"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/>
+        <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
+        <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
+
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+
+        <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
+        <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
+        <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/>
+        
+        <DList Name="gObjectMizuObjectsWaterDL_004B20" Offset="0x4B20"/>
+        
+        <DList Name="gObjectMizuObjectsDoorShutterDL_005D90" Offset="0x5D90"/>
+        <DList Name="gObjectMizuObjectsDoorShutterDL_007000" Offset="0x7000"/>
+        
+        <DList Name="gObjectMizuObjectsShutterDL_007130" Offset="0x7130"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_007250" Offset="0x7250"/>
+        <DList Name="gObjectMizuObjectsShutterDL_0072D0" Offset="0x72D0"/>
+        <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
+        
+        <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin.xml
new file mode 100644
index 0000000000..daf9b05412
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin" Segment="6">
+        <DList Name="gWarpPadBaseDL" Offset="0x330"/>
+        <Collision Name="gWarpPadCol" Offset="0x658"/>
+        <Texture Name="gWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x690"/>
+        <Texture Name="gWarpPadTopTex" OutName="top" Format="i8" Width="32" Height="32" Offset="0xE90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_dark.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_dark.xml
new file mode 100644
index 0000000000..2fa0bdbe4c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_dark.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_dark" Segment="6">
+        <Texture Name="gShadowMedallionPlatformTex" OutName="shadow_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flame.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flame.xml
new file mode 100644
index 0000000000..6274feaee1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flame.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flame" Segment="6">
+        <Texture Name="gFireMedallionPlatformTex" OutName="fire_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flash.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flash.xml
new file mode 100644
index 0000000000..c1040ea118
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_flash.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_flash" Segment="6">
+        <Texture Name="gLightMedallionPlatformTex" OutName="light_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_ice.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_ice.xml
new file mode 100644
index 0000000000..1aaeea193d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_ice.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_ice" Segment="6">
+        <Texture Name="gWaterMedallionPlatformTex" OutName="water_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_oka.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_oka.xml
new file mode 100644
index 0000000000..0f823b9237
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_oka.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_mjin_oka" Segment="6">
+        <DList Name="gOcarinaWarpPadDL" Offset="0x140"/>
+        <Collision Name="gOcarinaWarpPadCol" Offset="0x330"/>
+        <Texture Name="gOcarinaWarpPadSideTex" OutName="side" Format="rgba16" Width="64" Height="16" Offset="0x360"/>
+        <Texture Name="gOcarinaWarpPadOcarinaTex" OutName="ocarina" Format="i8" Width="64" Height="64" Offset="0xB60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_soul.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_soul.xml
new file mode 100644
index 0000000000..6386f7f9ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_soul.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_soul" Segment="6">
+        <Texture Name="gSpiritMedallionPlatformTex" OutName="spirit_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mjin_wind.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_wind.xml
new file mode 100644
index 0000000000..8bba7eb91b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mjin_wind.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="object_mjin_wind" Segment="6">
+        <Texture Name="gForestMedallionPlatformTex" OutName="forest_medallion" Format="i8" Width="64" Height="64" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mk.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mk.xml
new file mode 100644
index 0000000000..0b4aaae8aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mk.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_mk" Segment="6">
+        <Animation Name="object_mk_Anim_000368" Offset="0x368"/>
+        <Animation Name="object_mk_Anim_000724" Offset="0x724"/>
+        <Animation Name="object_mk_Anim_000AC0" Offset="0xAC0"/>
+        <Animation Name="object_mk_Anim_000D88" Offset="0xD88"/>
+        <DList Name="object_mk_DL_003470" Offset="0x3470"/>
+        <DList Name="object_mk_DL_003760" Offset="0x3760"/>
+        <DList Name="object_mk_DL_003AB0" Offset="0x3AB0"/>
+        <DList Name="object_mk_DL_003BC8" Offset="0x3BC8"/>
+        <DList Name="object_mk_DL_0042D0" Offset="0x42D0"/>
+        <DList Name="object_mk_DL_004650" Offset="0x4650"/>
+        <DList Name="object_mk_DL_004780" Offset="0x4780"/>
+        <DList Name="object_mk_DL_0048B0" Offset="0x48B0"/>
+        <DList Name="object_mk_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_mk_DL_004B30" Offset="0x4B30"/>
+        <DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
+        <Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
+        <Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
+        <Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
+        <Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
+        <Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
+        <Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>
+        <Limb Name="object_mk_Limb_005D54" LimbType="Standard" Offset="0x5D54"/>
+        <Limb Name="object_mk_Limb_005D60" LimbType="Standard" Offset="0x5D60"/>
+        <Limb Name="object_mk_Limb_005D6C" LimbType="Standard" Offset="0x5D6C"/>
+        <Limb Name="object_mk_Limb_005D78" LimbType="Standard" Offset="0x5D78"/>
+        <Limb Name="object_mk_Limb_005D84" LimbType="Standard" Offset="0x5D84"/>
+        <Limb Name="object_mk_Limb_005D90" LimbType="Standard" Offset="0x5D90"/>
+        <Limb Name="object_mk_Limb_005D9C" LimbType="Standard" Offset="0x5D9C"/>
+        <Limb Name="object_mk_Limb_005DA8" LimbType="Standard" Offset="0x5DA8"/>
+        <Limb Name="object_mk_Limb_005DB4" LimbType="Standard" Offset="0x5DB4"/>
+        <Skeleton Name="object_mk_Skel_005DF0" Type="Flex" LimbType="Standard" Offset="0x5DF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mm.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mm.xml
new file mode 100644
index 0000000000..b27837e57e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mm.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_mm" Segment="6">
+        <Texture Name="object_mmTex_000930" OutName="object_mmTex_000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000970" OutName="object_mmTex_000970" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009B0" OutName="object_mmTex_0009B0" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_0009F0" OutName="object_mmTex_0009F0" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000A30" OutName="object_mmTex_000A30" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_000B30" OutName="object_mmTex_000B30" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001030" OutName="object_mmTex_001030" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001130" OutName="object_mmTex_001130" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730" AddedByScript="true"/>
+        <Texture Name="object_mmTex_001330" OutName="object_mmTex_001330" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730" AddedByScript="true"/>
+        <Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
+
+        <Animation Name="gRunningManRunAnim" Offset="0x0718"/>
+        <Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
+        <Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
+        <Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
+        <Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
+        <Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
+
+        <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
+        <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
+        <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mo.xml
new file mode 100644
index 0000000000..4c4be74c83
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mo.xml
@@ -0,0 +1,87 @@
+<Root>
+    <File Name="object_mo" Segment="6">
+        <Texture Name="object_moTex_000000" OutName="object_moTex_000000" Format="ia8" Width="16" Height="16" Offset="0x0" AddedByScript="true"/>
+        <Texture Name="object_moTex_000680" OutName="object_moTex_000680" Format="rgba16" Width="32" Height="32" Offset="0x680" AddedByScript="true"/>
+        <Texture Name="object_moTex_004D20" OutName="object_moTex_004D20" Format="ia16" Width="32" Height="32" Offset="0x3920" AddedByScript="true"/>
+        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
+        <!-- Morpha's Title Card -->
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
+        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>
+
+        <!-- DLists for Morpha's Core -->
+        <DList Name="gMorphaCoreMembraneDL" Offset="0x5300"/>
+        <DList Name="gMorphaCoreNucleusDL" Offset="0x5438"/>
+
+        <!-- DLists for Morpha's tentacle segments -->
+        <DList Name="gMorphaTentacleBaseDL" Offset="0x6800"/>
+        <DList Name="gMorphaTentaclePart0DL" Offset="0x6878"/>
+        <DList Name="gMorphaTentaclePart1DL" Offset="0x6938"/>
+        <DList Name="gMorphaTentaclePart2DL" Offset="0x6988"/>
+        <DList Name="gMorphaTentaclePart3DL" Offset="0x69D0"/>
+        <DList Name="gMorphaTentaclePart4DL" Offset="0x6A18"/>
+        <DList Name="gMorphaTentaclePart5DL" Offset="0x6A60"/>
+        <DList Name="gMorphaTentaclePart6DL" Offset="0x6AA8"/>
+        <DList Name="gMorphaTentaclePart7DL" Offset="0x6AF0"/>
+        <DList Name="gMorphaTentaclePart8DL" Offset="0x6B38"/>
+        <DList Name="gMorphaTentaclePart9DL" Offset="0x6B80"/>
+        <DList Name="gMorphaTentaclePart10DL" Offset="0x6BC8"/>
+        <DList Name="gMorphaTentaclePart11DL" Offset="0x6C10"/>
+        <DList Name="gMorphaTentaclePart12DL" Offset="0x6C58"/>
+        <DList Name="gMorphaTentaclePart13DL" Offset="0x6CA0"/>
+        <DList Name="gMorphaTentaclePart14DL" Offset="0x6CE8"/>
+        <DList Name="gMorphaTentaclePart15DL" Offset="0x6D30"/>
+        <DList Name="gMorphaTentaclePart16DL" Offset="0x6D78"/>
+        <DList Name="gMorphaTentaclePart17DL" Offset="0x6DC0"/>
+        <DList Name="gMorphaTentaclePart18DL" Offset="0x6E08"/>
+        <DList Name="gMorphaTentaclePart19DL" Offset="0x6E50"/>
+        <DList Name="gMorphaTentaclePart20DL" Offset="0x6E98"/>
+        <DList Name="gMorphaTentaclePart21DL" Offset="0x6EE0"/>
+        <DList Name="gMorphaTentaclePart22DL" Offset="0x6F28"/>
+        <DList Name="gMorphaTentaclePart23DL" Offset="0x6F70"/>
+        <DList Name="gMorphaTentaclePart24DL" Offset="0x6FB8"/>
+        <DList Name="gMorphaTentaclePart25DL" Offset="0x7000"/>
+        <DList Name="gMorphaTentaclePart26DL" Offset="0x7048"/>
+        <DList Name="gMorphaTentaclePart27DL" Offset="0x7090"/>
+        <DList Name="gMorphaTentaclePart28DL" Offset="0x70D8"/>
+        <DList Name="gMorphaTentaclePart29DL" Offset="0x7120"/>
+        <DList Name="gMorphaTentaclePart30DL" Offset="0x7168"/>
+        <DList Name="gMorphaTentaclePart31DL" Offset="0x71B0"/>
+        <DList Name="gMorphaTentaclePart32DL" Offset="0x71F8"/>
+        <DList Name="gMorphaTentaclePart33DL" Offset="0x7240"/>
+        <DList Name="gMorphaTentaclePart34DL" Offset="0x7288"/>
+        <DList Name="gMorphaTentaclePart35DL" Offset="0x72D0"/>
+        <DList Name="gMorphaTentaclePart36DL" Offset="0x7318"/>
+        <DList Name="gMorphaTentaclePart37DL" Offset="0x7360"/>
+        <DList Name="gMorphaTentaclePart38DL" Offset="0x73A8"/>
+        <DList Name="gMorphaTentaclePart39DL" Offset="0x73F0"/>
+        <DList Name="gMorphaTentaclePart40DL" Offset="0x7438"/>
+
+        <!-- DLists for Morpha's particles -->
+        <DList Name="gMorphaBubbleDL" Offset="0x140"/>
+        <DList Name="gMorphaDropletMaterialDL" Offset="0xF20"/>
+        <DList Name="gMorphaDropletModelDL" Offset="0xF70"/>
+        <DList Name="gMorphaWetSpotModelDL" Offset="0xFC8"/>
+
+        <!-- DList for the water in the room and in front of the camera -->
+        <DList Name="gMorphaWaterDL" Offset="0x3850"/>
+
+        <!-- Unused content -->
+
+        <!-- This is the dlist for EnVbBall for some reason. -->
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
+
+        <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
+        <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
+        <DList Name="gMorphaDL_007BF8" Offset="0x67F8"/>
+
+        <Array Name="gMorphaVtx_006938" Count="14" Offset="0x5538">
+            <Vtx/>
+        </Array>
+
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x5618">
+            <Vtx/>
+        </Array>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1.xml
new file mode 100644
index 0000000000..bb1b31e2fc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1" Segment="6">
+        <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
+        <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1a.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1a.xml
new file mode 100644
index 0000000000..c750ce20d0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri1a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri1a" Segment="6">
+        <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
+        <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2.xml
new file mode 100644
index 0000000000..785b858571
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2" Segment="6">
+        <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
+        <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2a.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2a.xml
new file mode 100644
index 0000000000..ad1bb4d5f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_hineri2a.xml
@@ -0,0 +1,7 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_hineri2a" Segment="6">
+        <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
+        <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_objects.xml
new file mode 100644
index 0000000000..58ea8c085c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="objects/object_mori_tex/"/>
+    <File Name="object_mori_objects" Segment="6">
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Collision Name="gMoriBigstCol" Offset="0x221C"/>
+        <DList Name="gMoriBigstDL" Offset="0x1E50"/>
+        <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
+        <DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
+        <Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
+        <DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
+        <DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
+        <Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
+        <Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
+        <DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
+        <DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
+        <DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
+        <Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
+        <DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
+        <Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
+        <DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mori_tex.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mori_tex.xml
new file mode 100644
index 0000000000..8ba4ff2d34
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mori_tex.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="16" Width="16" Offset="0x4A00"/>
+
+        <Texture Name="gMoriWaterTex" OutName="water_tex" Format="rgba16" Height="32" Width="32" Offset="0x4C00"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ms.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ms.xml
new file mode 100644
index 0000000000..a87d0e6b36
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ms.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="object_ms" Segment="6">
+        <!-- Bean Salesman Skeleton -->
+        <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
+        
+        <!-- Bean Salesman Limbs -->
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
+
+        <!-- Bean Salesman Limb DisplayLists -->
+        <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
+        <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
+        <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
+        <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
+        <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
+        <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
+        <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
+
+        <!-- Bean Salesman Palettes -->
+        <Texture Name="gBeanSalesmanTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
+
+        <!-- Bean Salesman DisplayList Textures -->
+        <Texture Name="gBeanSalesmanBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanMouthTex" OutName="mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanEyeTex" OutName="eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanShoeTex" OutName="shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
+        <Texture Name="gBeanSalesmanBeanbagTex" OutName="beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
+
+        <!-- Bean Salesman Animations -->
+        <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_mu.xml b/soh/assets/xml/N64_NTSC_12/objects/object_mu.xml
new file mode 100644
index 0000000000..7251ff7212
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_mu.xml
@@ -0,0 +1,96 @@
+<Root>
+    <File Name="object_mu" Segment="6">
+        <Animation Name="object_mu_Anim_0003F4" Offset="0x3F4"/>
+        <Texture Name="object_mu_TLUT_000410" OutName="tlut_00000410" Format="rgba16" Width="16" Height="16" Offset="0x410"/>
+        <Texture Name="object_mu_Tex_000610" OutName="tex_00000610" Format="i8" Width="8" Height="8" Offset="0x610"/>
+        <Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
+        <Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
+        <Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
+        <Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
+        <Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
+        <DList Name="object_mu_DL_003110" Offset="0x3110"/>
+        <DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
+        <DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_mu_DL_003B08" Offset="0x3B08"/>
+        <DList Name="object_mu_DL_003DB0" Offset="0x3DB0"/>
+        <DList Name="object_mu_DL_004108" Offset="0x4108"/>
+        <DList Name="object_mu_DL_0043E0" Offset="0x43E0"/>
+        <DList Name="object_mu_DL_0044C8" Offset="0x44C8"/>
+        <DList Name="object_mu_DL_0045F0" Offset="0x45F0"/>
+        <DList Name="object_mu_DL_004798" Offset="0x4798"/>
+        <DList Name="object_mu_DL_004958" Offset="0x4958"/>
+        <DList Name="object_mu_DL_004C68" Offset="0x4C68"/>
+        <DList Name="object_mu_DL_004D80" Offset="0x4D80"/>
+        <Limb Name="object_mu_Limb_004E80" LimbType="Standard" Offset="0x4E80"/>
+        <Limb Name="object_mu_Limb_004E8C" LimbType="Standard" Offset="0x4E8C"/>
+        <Limb Name="object_mu_Limb_004E98" LimbType="Standard" Offset="0x4E98"/>
+        <Limb Name="object_mu_Limb_004EA4" LimbType="Standard" Offset="0x4EA4"/>
+        <Limb Name="object_mu_Limb_004EB0" LimbType="Standard" Offset="0x4EB0"/>
+        <Limb Name="object_mu_Limb_004EBC" LimbType="Standard" Offset="0x4EBC"/>
+        <Limb Name="object_mu_Limb_004EC8" LimbType="Standard" Offset="0x4EC8"/>
+        <Limb Name="object_mu_Limb_004ED4" LimbType="Standard" Offset="0x4ED4"/>
+        <Limb Name="object_mu_Limb_004EE0" LimbType="Standard" Offset="0x4EE0"/>
+        <Limb Name="object_mu_Limb_004EEC" LimbType="Standard" Offset="0x4EEC"/>
+        <Limb Name="object_mu_Limb_004EF8" LimbType="Standard" Offset="0x4EF8"/>
+        <Limb Name="object_mu_Limb_004F04" LimbType="Standard" Offset="0x4F04"/>
+        <Limb Name="object_mu_Limb_004F10" LimbType="Standard" Offset="0x4F10"/>
+        <Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
+        <Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
+        <Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
+        <Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
+        <Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
+        <Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
+        <Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
+        <Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
+        <Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
+        <DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
+        <DList Name="object_mu_DL_009328" Offset="0x9328"/>
+        <DList Name="object_mu_DL_009828" Offset="0x9828"/>
+        <DList Name="object_mu_DL_009970" Offset="0x9970"/>
+        <DList Name="object_mu_DL_009A70" Offset="0x9A70"/>
+        <DList Name="object_mu_DL_009B70" Offset="0x9B70"/>
+        <DList Name="object_mu_DL_009CB8" Offset="0x9CB8"/>
+        <DList Name="object_mu_DL_009DB8" Offset="0x9DB8"/>
+        <DList Name="object_mu_DL_009EB8" Offset="0x9EB8"/>
+        <DList Name="object_mu_DL_00A028" Offset="0xA028"/>
+        <DList Name="object_mu_DL_00A170" Offset="0xA170"/>
+        <DList Name="object_mu_DL_00A670" Offset="0xA670"/>
+        <DList Name="object_mu_DL_00A770" Offset="0xA770"/>
+        <DList Name="object_mu_DL_00A870" Offset="0xA870"/>
+        <DList Name="object_mu_DL_00A9B8" Offset="0xA9B8"/>
+        <DList Name="object_mu_DL_00AAB8" Offset="0xAAB8"/>
+        <DList Name="object_mu_DL_00ABB8" Offset="0xABB8"/>
+        <Limb Name="object_mu_Limb_00AD00" LimbType="Standard" Offset="0xAD00"/>
+        <Limb Name="object_mu_Limb_00AD0C" LimbType="Standard" Offset="0xAD0C"/>
+        <Limb Name="object_mu_Limb_00AD18" LimbType="Standard" Offset="0xAD18"/>
+        <Limb Name="object_mu_Limb_00AD24" LimbType="Standard" Offset="0xAD24"/>
+        <Limb Name="object_mu_Limb_00AD30" LimbType="Standard" Offset="0xAD30"/>
+        <Limb Name="object_mu_Limb_00AD3C" LimbType="Standard" Offset="0xAD3C"/>
+        <Limb Name="object_mu_Limb_00AD48" LimbType="Standard" Offset="0xAD48"/>
+        <Limb Name="object_mu_Limb_00AD54" LimbType="Standard" Offset="0xAD54"/>
+        <Limb Name="object_mu_Limb_00AD60" LimbType="Standard" Offset="0xAD60"/>
+        <Limb Name="object_mu_Limb_00AD6C" LimbType="Standard" Offset="0xAD6C"/>
+        <Limb Name="object_mu_Limb_00AD78" LimbType="Standard" Offset="0xAD78"/>
+        <Limb Name="object_mu_Limb_00AD84" LimbType="Standard" Offset="0xAD84"/>
+        <Limb Name="object_mu_Limb_00AD90" LimbType="Standard" Offset="0xAD90"/>
+        <Limb Name="object_mu_Limb_00AD9C" LimbType="Standard" Offset="0xAD9C"/>
+        <Limb Name="object_mu_Limb_00ADA8" LimbType="Standard" Offset="0xADA8"/>
+        <Limb Name="object_mu_Limb_00ADB4" LimbType="Standard" Offset="0xADB4"/>
+        <Limb Name="object_mu_Limb_00ADC0" LimbType="Standard" Offset="0xADC0"/>
+        <Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
+        <Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
+        <Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
+        <Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_nb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_nb.xml
new file mode 100644
index 0000000000..74de9e2859
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_nb.xml
@@ -0,0 +1,118 @@
+<Root>
+    <File Name="object_nb" Segment="6">
+
+        <!-- Nabooru Skeleton -->
+        <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
+
+        <!-- Nabooru Limbs -->
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
+
+        <!-- Nabooru Limb DisplayLists -->
+        <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
+        <DList Name="gNabooruLeftThighDL" Offset="0x17B40"/>
+        <DList Name="gNabooruLeftShinDL" Offset="0x17D80"/>
+        <DList Name="gNabooruLeftFootDL" Offset="0x12F50"/>
+        <DList Name="gNabooruRightThighDL" Offset="0x17658"/>
+        <DList Name="gNabooruRightShinDL" Offset="0x17818"/>
+        <DList Name="gNabooruRightFootDL" Offset="0x12D48"/>
+        <DList Name="gNabooruTorsoDL" Offset="0x16848"/>
+        <DList Name="gNabooruLeftUpperArmDL" Offset="0x172D8"/>
+        <DList Name="gNabooruLeftForearmDL" Offset="0x174A0"/>
+        <DList Name="gNabooruLeftHandDL" Offset="0x126B8"/>
+        <DList Name="gNabooruRightUpperArmDL" Offset="0x16FE0"/>
+        <DList Name="gNabooruRightForearmDL" Offset="0x17120"/>
+        <DList Name="gNabooruRightHandDL" Offset="0x12A00"/>
+        <DList Name="gNabooruHeadMouthClosedDL" Offset="0x114A8"/>
+        <DList Name="gNabooruBlankDL" Offset="0x125A0"/>
+        <DList Name="gNabooruPonytailDL" Offset="0x125A8"/>
+        <DList Name="gNabooruWaistDL" Offset="0x16490"/>
+
+        <!-- Nabooru palettes -->
+        <Texture Name="gNabooru1TLUT" OutName="nabooru_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x096B0"/>
+        <Texture Name="gNabooru2TLUT" OutName="nabooru_2_tlut" Format="rgba16" Width="4" Height="59" Offset="0x0AE70"/>
+        <Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
+
+        <!-- Nabooru Displaylist Textures -->
+        <Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
+        <Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
+        <Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
+        <Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
+        <Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
+        <Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
+        <Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
+        <Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
+        <Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
+        <Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
+
+        <!-- Nabooru Eye Textures -->
+        <Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
+        <Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
+
+        <!-- Nabooru Animations -->
+        <Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>
+        <Animation Name="gNabooruSittingCrossLeggedAnim" Offset="0x00BC0"/>
+        <Animation Name="gNabooruTrappedInVortexRaisingArmAnim" Offset="0x01104"/>
+        <Animation Name="gNabooruSuckedByVortexAnim" Offset="0x01350"/>
+        <Animation Name="gNabooruTrappedInVortexPushingGroundAnim" Offset="0x01E7C"/>
+        <Animation Name="gNabooruRaisingArmsGivingMedallionAnim" Offset="0x0274C"/>
+        <Animation Name="gNabooruArmsRaisedGivingMedallionAnim" Offset="0x02B4C"/>
+        <Animation Name="gNabooruOnOneKneeTurningHeadRightToLeftTransitionAnim" Offset="0x02DBC"/>
+        <Animation Name="gNabooruOnOneKneeLookingLeftAnim" Offset="0x035A8"/>
+        <Animation Name="gNabooruOnAllFoursToOnOneKneeLookingRightTransitionAnim" Offset="0x03954"/>
+        <Animation Name="gNabooruOnOneKneeLookingRightAnim" Offset="0x04030"/>
+        <Animation Name="gNabooruOnAllFoursAnim" Offset="0x046A8"/>
+        <Animation Name="gNabooruStandingHandsOnHipsAnim" Offset="0x04BB4"/>
+        <Animation Name="gNabooruStandingToWalkingTransitionAnim" Offset="0x04E60"/>
+        <Animation Name="gNabooruSittingCrossLeggedLookingUpRightAnim" Offset="0x05614"/>
+        <Animation Name="gNabooruSittingCrossLeggedTurningToLookUpRightTransitionAnim" Offset="0x05CA4"/>
+        <Animation Name="gNabooruKneeingToRunningToHitAnim" Offset="0x06320"/>
+        <Animation Name="gNabooruUnusedKneelingAtCrawlspaceToStandingTransitionAnim" Offset="0x0676C"/>
+        <Animation Name="gNabooruKneeingAtCrawlspaceAnim" Offset="0x06E78"/>
+        <Animation Name="gNabooruCollapseFromStandingToKneelingTransitionAnim" Offset="0x08BD0"/>
+        <Animation Name="gNabooruWalkingAnim" Offset="0x09238"/>
+        <Animation Name="gNabooruStandingHandsOnHipsChamberOfSagesAnim" Offset="0x09694"/>
+
+        <!-- Nabooru unused vertices -->
+        <Array Name="gNabooruUnusedVtx_00EFF8" Count="31" Offset="0x0EFF8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_niw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_niw.xml
new file mode 100644
index 0000000000..4eafec9566
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_niw.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="object_niw" Segment="6">
+        <!-- Cucco Skeleton -->
+        <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
+
+        <!-- Cucco Limbs -->
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
+
+        <!-- Cucco Limb DisplayLists -->
+        <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
+        <DList Name="gCuccoLeftFootDL" Offset="0x11E0"/>
+        <DList Name="gCuccoLeftWingDL" Offset="0x1128"/>
+        <DList Name="gCuccoRightFootDL" Offset="0x1088"/>
+        <DList Name="gCuccoRightWingDL" Offset="0x0FD0"/>
+        <DList Name="gCuccoNeckDL" Offset="0x09C0"/>
+        <DList Name="gCuccoHeadDL" Offset="0x0A98"/>
+
+        <!-- Other Cucco DisplayLists -->
+        <DList Name="gCuccoEffectFeatherMaterialDL" Offset="0x23B0"/>
+        <DList Name="gCuccoEffectFeatherModelDL" Offset="0x2428"/>
+
+        <!-- Cucco DisplayList Textures -->
+        <Texture Name="gCuccoEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gCuccoHeadFeathersTex" OutName="head_feathers" Format="rgba16" Width="8" Height="16" Offset="0x1480"/>
+        <Texture Name="gCuccoBaseFeathersTex" OutName="base_feathers" Format="rgba16" Width="8" Height="8" Offset="0x1580"/>
+        <Texture Name="gCuccoBeakTex" OutName="beak" Format="rgba16" Width="8" Height="8" Offset="0x1600"/>
+        <Texture Name="gCuccoCombTex" OutName="comb" Format="rgba16" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gCuccoTailFeathersTex" OutName="tail_feathers" Format="rgba16" Width="32" Height="32" Offset="0x1880"/>
+        <Texture Name="gCuccoClawTex" OutName="claw" Format="rgba16" Width="8" Height="16" Offset="0x2080"/>
+        <Texture Name="gCuccoTex_2180" OutName="tex_2180" Format="rgba16" Width="16" Height="16" Offset="0x2180"/>
+
+        <!-- Cucco Animations -->
+        <Animation Name="gCuccoAnim" Offset="0xE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_nwc.xml b/soh/assets/xml/N64_NTSC_12/objects/object_nwc.xml
new file mode 100644
index 0000000000..96ffa32383
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_nwc.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_nwc" Segment="6">
+        <Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>
+        <Texture Name="gCuccoChickBeakTex" OutName="beak" Format="rgba16" Width="4" Height="4" Offset="0xAE0"/>
+        <DList Name="gCuccoChickSetupBodyDL" Offset="0x840"/>
+        <DList Name="gCuccoChickBodyDL" Offset="0x8B0"/>
+        <DList Name="gCuccoChickSetupEyeDL" Offset="0xBF0"/>
+        <DList Name="gCuccoChickEyesDL" Offset="0xC68"/>
+        <DList Name="gCuccoChickSetupBeakDL" Offset="0xC88"/>
+        <DList Name="gCuccoChickBeakDL" Offset="0xCE0"/>
+        <DList Name="gCuccoChickSetupShadowDL" Offset="0xD10"/>
+        <DList Name="gCuccoChickShadowDL" Offset="0xD50"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ny.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ny.xml
new file mode 100644
index 0000000000..e2e8187ff8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ny.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_ny" Segment="6">
+        <Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
+        <Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
+        <DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
+        <DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
+        <DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA1.xml
new file mode 100644
index 0000000000..1d665f1010
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oA1" Segment="6">
+        <Limb Name="object_oA1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA1_DL_00002228" Offset="0x2228"/>
+        <DList Name="object_oA1_DL_000024C8" Offset="0x24C8"/>
+        <DList Name="object_oA1_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oA1_DL_000029D8" Offset="0x29D8"/>
+        <DList Name="object_oA1_DL_00002AF0" Offset="0x2AF0"/>
+        <DList Name="object_oA1_DL_00002BE8" Offset="0x2BE8"/>
+        <DList Name="object_oA1_DL_00002D18" Offset="0x2D18"/>
+        <DList Name="object_oA1_DL_00002E50" Offset="0x2E50"/>
+        <DList Name="object_oA1_DL_00002FC0" Offset="0x2FC0"/>
+        <DList Name="object_oA1_DL_00003090" Offset="0x3090"/>
+        <DList Name="object_oA1_DL_000031A8" Offset="0x31A8"/>
+        <DList Name="object_oA1_DL_000032A0" Offset="0x32A0"/>
+        <DList Name="object_oA1_DL_000033D0" Offset="0x33D0"/>
+        <DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
+        <DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
+        <Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
+        <Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
+        <Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_oA1_Tex_00004508" OutName="tex_00004508" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA10.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA10.xml
new file mode 100644
index 0000000000..65d0808349
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA10.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA10" Segment="6">
+        <Limb Name="object_oA10_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA10_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA10_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA10_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA10_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA10_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA10_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA10_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA10_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA10_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA10_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA10_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA10_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA10_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA10_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA10_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA10_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA10_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA10_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA10_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA10_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA10_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA10_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA10_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA10_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA10_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA10_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA10_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA10_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA10_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA10_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA10_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA10_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA10_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA10_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA10_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA10_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA10_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA10_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA10_DL_00001878" Offset="0x1878"/>
+        <DList Name="object_oA10_DL_00001990" Offset="0x1990"/>
+        <DList Name="object_oA10_DL_00001AE0" Offset="0x1AE0"/>
+        <DList Name="object_oA10_DL_00001D48" Offset="0x1D48"/>
+        <DList Name="object_oA10_DL_00001E68" Offset="0x1E68"/>
+        <DList Name="object_oA10_DL_00001F50" Offset="0x1F50"/>
+        <DList Name="object_oA10_DL_00001FF8" Offset="0x1FF8"/>
+        <DList Name="object_oA10_DL_00002088" Offset="0x2088"/>
+        <DList Name="object_oA10_DL_00002170" Offset="0x2170"/>
+        <DList Name="object_oA10_DL_00002220" Offset="0x2220"/>
+        <DList Name="object_oA10_DL_000022B8" Offset="0x22B8"/>
+        <DList Name="object_oA10_DL_000023A0" Offset="0x23A0"/>
+        <DList Name="object_oA10_DL_00002448" Offset="0x2448"/>
+        <DList Name="object_oA10_DL_000024D8" Offset="0x24D8"/>
+        <DList Name="object_oA10_DL_000025C0" Offset="0x25C0"/>
+        <Texture Name="object_oA10_Tex_00002670" OutName="tex_00002670" Format="rgba16" Width="8" Height="16" Offset="0x2670"/>
+        <Texture Name="object_oA10_Tex_00002770" OutName="tex_00002770" Format="rgba16" Width="8" Height="8" Offset="0x2770"/>
+        <Texture Name="object_oA10_Tex_000027F0" OutName="tex_000027F0" Format="i4" Width="16" Height="8" Offset="0x27F0"/>
+        <Texture Name="object_oA10_Tex_00002830" OutName="tex_00002830" Format="rgba16" Width="16" Height="8" Offset="0x2830"/>
+        <Texture Name="object_oA10_Tex_00002930" OutName="tex_00002930" Format="rgba16" Width="16" Height="32" Offset="0x2930"/>
+        <Texture Name="object_oA10_Tex_00002D30" OutName="tex_00002D30" Format="rgba16" Width="8" Height="8" Offset="0x2D30"/>
+        <Texture Name="object_oA10_Tex_00002DB0" OutName="tex_00002DB0" Format="rgba16" Width="8" Height="8" Offset="0x2DB0"/>
+        <Texture Name="object_oA10_Tex_00002E30" OutName="tex_00002E30" Format="rgba16" Width="8" Height="8" Offset="0x2E30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA11.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA11.xml
new file mode 100644
index 0000000000..92ae474b60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA11.xml
@@ -0,0 +1,66 @@
+<Root>
+    <File Name="object_oA11" Segment="6">
+        <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <!--
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA2.xml
new file mode 100644
index 0000000000..ffdcd79896
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA2.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oA2" Segment="6">
+        <Limb Name="object_oA2_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA2_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA2_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA2_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA2_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA2_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA2_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA2_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA2_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA2_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA2_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA2_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA2_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA2_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA2_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA2_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA2_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA2_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA2_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA2_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA2_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA2_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA2_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA2_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA2_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA2_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA2_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA2_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA2_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA2_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA2_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA2_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA2_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA2_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA2_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA2_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA2_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA2_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA2_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA2_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA2_DL_00000818" Offset="0x818"/>
+        <DList Name="object_oA2_DL_00000C38" Offset="0xC38"/>
+        <DList Name="object_oA2_DL_00000ED8" Offset="0xED8"/>
+        <DList Name="object_oA2_DL_000012A8" Offset="0x12A8"/>
+        <DList Name="object_oA2_DL_000016C8" Offset="0x16C8"/>
+        <DList Name="object_oA2_DL_00001C08" Offset="0x1C08"/>
+        <DList Name="object_oA2_DL_00002A80" Offset="0x2A80"/>
+        <DList Name="object_oA2_DL_000032E8" Offset="0x32E8"/>
+        <DList Name="object_oA2_DL_00003718" Offset="0x3718"/>
+        <DList Name="object_oA2_DL_00003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oA2_DL_00004270" Offset="0x4270"/>
+        <DList Name="object_oA2_DL_000046A0" Offset="0x46A0"/>
+        <DList Name="object_oA2_DL_00004B70" Offset="0x4B70"/>
+        <DList Name="object_oA2_DL_000054F8" Offset="0x54F8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA3.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA3.xml
new file mode 100644
index 0000000000..a492bd8751
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA3.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_oA3" Segment="6">
+        <Blob Name="object_oA3_Blob_00000000" Size="0x8" Offset="0x0"/>
+        <DList Name="object_oA3_DL_00000008" Offset="0x8"/>
+        <Texture Name="object_oA3_Tex_000012F0" OutName="tex_000012F0" Format="rgba16" Width="32" Height="32" Offset="0x12F0"/>
+        <Texture Name="object_oA3_Tex_00001AF0" OutName="tex_00001AF0" Format="rgba16" Width="16" Height="16" Offset="0x1AF0"/>
+        <Texture Name="object_oA3_Tex_00001CF0" OutName="tex_00001CF0" Format="rgba16" Width="16" Height="16" Offset="0x1CF0"/>
+        <Texture Name="object_oA3_Tex_00001EF0" OutName="tex_00001EF0" Format="rgba16" Width="16" Height="16" Offset="0x1EF0"/>
+        <Texture Name="object_oA3_Tex_000020F0" OutName="tex_000020F0" Format="rgba16" Width="4" Height="8" Offset="0x20F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA4.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA4.xml
new file mode 100644
index 0000000000..dcdbbfff9b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA4" Segment="6">
+        <Limb Name="object_oA4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA4_DL_00000B28" Offset="0xB28"/>
+        <DList Name="object_oA4_DL_00000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA4_DL_00000C80" Offset="0xC80"/>
+        <DList Name="object_oA4_DL_00000E38" Offset="0xE38"/>
+        <DList Name="object_oA4_DL_00000F18" Offset="0xF18"/>
+        <DList Name="object_oA4_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA4_DL_00000FD0" Offset="0xFD0"/>
+        <DList Name="object_oA4_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA4_DL_00001088" Offset="0x1088"/>
+        <DList Name="object_oA4_DL_000010F0" Offset="0x10F0"/>
+        <DList Name="object_oA4_DL_000011D0" Offset="0x11D0"/>
+        <DList Name="object_oA4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oA4_DL_00001288" Offset="0x1288"/>
+        <DList Name="object_oA4_DL_000012E0" Offset="0x12E0"/>
+        <DList Name="object_oA4_DL_00001340" Offset="0x1340"/>
+        <Texture Name="object_oA4_Tex_000013A8" OutName="tex_000013A8" Format="rgba16" Width="8" Height="16" Offset="0x13A8"/>
+        <Texture Name="object_oA4_Tex_000014A8" OutName="tex_000014A8" Format="rgba16" Width="8" Height="8" Offset="0x14A8"/>
+        <Texture Name="object_oA4_Tex_00001528" OutName="tex_00001528" Format="rgba16" Width="8" Height="8" Offset="0x1528"/>
+        <Texture Name="object_oA4_Tex_000015A8" OutName="tex_000015A8" Format="rgba16" Width="8" Height="8" Offset="0x15A8"/>
+        <Texture Name="object_oA4_Tex_00001628" OutName="tex_00001628" Format="rgba16" Width="8" Height="8" Offset="0x1628"/>
+        <Texture Name="object_oA4_Tex_000016A8" OutName="tex_000016A8" Format="rgba16" Width="8" Height="8" Offset="0x16A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA5.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA5.xml
new file mode 100644
index 0000000000..55072176dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA5" Segment="6">
+        <Limb Name="object_oA5_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA5_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA5_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA5_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA5_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA5_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA5_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA5_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA5_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA5_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA5_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA5_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA5_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA5_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA5_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA5_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA5_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA5_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA5_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA5_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA5_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA5_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA5_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA5_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA5_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA5_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA5_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA5_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA5_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA5_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA5_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA5_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA5_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA5_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA5_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA5_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA5_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA5_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA5_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA5_DL_00000298" Offset="0x298"/>
+        <DList Name="object_oA5_DL_00000318" Offset="0x318"/>
+        <DList Name="object_oA5_DL_00000398" Offset="0x398"/>
+        <DList Name="object_oA5_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oA5_DL_00000518" Offset="0x518"/>
+        <DList Name="object_oA5_DL_000005F8" Offset="0x5F8"/>
+        <DList Name="object_oA5_DL_000006B8" Offset="0x6B8"/>
+        <DList Name="object_oA5_DL_00000738" Offset="0x738"/>
+        <DList Name="object_oA5_DL_000007B8" Offset="0x7B8"/>
+        <DList Name="object_oA5_DL_00000868" Offset="0x868"/>
+        <DList Name="object_oA5_DL_00000938" Offset="0x938"/>
+        <DList Name="object_oA5_DL_00000A18" Offset="0xA18"/>
+        <DList Name="object_oA5_DL_00000D28" Offset="0xD28"/>
+        <DList Name="object_oA5_DL_00000FF0" Offset="0xFF0"/>
+        <DList Name="object_oA5_DL_00001278" Offset="0x1278"/>
+        <Texture Name="object_oA5_Tex_00001330" OutName="tex_00001330" Format="rgba16" Width="8" Height="8" Offset="0x1330"/>
+        <Texture Name="object_oA5_Tex_000013B0" OutName="tex_000013B0" Format="rgba16" Width="8" Height="8" Offset="0x13B0"/>
+        <Texture Name="object_oA5_Tex_00001430" OutName="tex_00001430" Format="rgba16" Width="8" Height="16" Offset="0x1430"/>
+        <Texture Name="object_oA5_Tex_00001530" OutName="tex_00001530" Format="rgba16" Width="8" Height="8" Offset="0x1530"/>
+        <Texture Name="object_oA5_Tex_000015B0" OutName="tex_000015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_oA5_Tex_00001630" OutName="tex_00001630" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA6.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA6.xml
new file mode 100644
index 0000000000..c17a510881
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA6.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oA6" Segment="6">
+        <Limb Name="object_oA6_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA6_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA6_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA6_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA6_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA6_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA6_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA6_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA6_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA6_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA6_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA6_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA6_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA6_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA6_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA6_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA6_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA6_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA6_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA6_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA6_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA6_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA6_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA6_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA6_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA6_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA6_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA6_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA6_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA6_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA6_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA6_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA6_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA6_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA6_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA6_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA6_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA6_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA6_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA6_DL_00000C98" Offset="0xC98"/>
+        <DList Name="object_oA6_DL_00000D50" Offset="0xD50"/>
+        <DList Name="object_oA6_DL_00000DE8" Offset="0xDE8"/>
+        <DList Name="object_oA6_DL_00000F90" Offset="0xF90"/>
+        <DList Name="object_oA6_DL_00001028" Offset="0x1028"/>
+        <DList Name="object_oA6_DL_000010B8" Offset="0x10B8"/>
+        <DList Name="object_oA6_DL_00001150" Offset="0x1150"/>
+        <DList Name="object_oA6_DL_000011B8" Offset="0x11B8"/>
+        <DList Name="object_oA6_DL_00001210" Offset="0x1210"/>
+        <DList Name="object_oA6_DL_000012C8" Offset="0x12C8"/>
+        <DList Name="object_oA6_DL_00001360" Offset="0x1360"/>
+        <DList Name="object_oA6_DL_000013F0" Offset="0x13F0"/>
+        <DList Name="object_oA6_DL_00001488" Offset="0x1488"/>
+        <DList Name="object_oA6_DL_000014F0" Offset="0x14F0"/>
+        <DList Name="object_oA6_DL_00001548" Offset="0x1548"/>
+        <Texture Name="object_oA6_Tex_00001600" OutName="tex_00001600" Format="rgba16" Width="8" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oA6_Tex_00001700" OutName="tex_00001700" Format="rgba16" Width="8" Height="8" Offset="0x1700"/>
+        <Texture Name="object_oA6_Tex_00001780" OutName="tex_00001780" Format="rgba16" Width="8" Height="8" Offset="0x1780"/>
+        <Texture Name="object_oA6_Tex_00001800" OutName="tex_00001800" Format="rgba16" Width="8" Height="16" Offset="0x1800"/>
+        <Texture Name="object_oA6_Tex_00001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="8" Offset="0x1900"/>
+        <Texture Name="object_oA6_Tex_00001980" OutName="tex_00001980" Format="rgba16" Width="8" Height="8" Offset="0x1980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA7.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA7.xml
new file mode 100644
index 0000000000..52c68f6394
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA7.xml
@@ -0,0 +1,62 @@
+<Root>
+    <File Name="object_oA7" Segment="6">
+        <Limb Name="object_oA7_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA7_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA7_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA7_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA7_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA7_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA7_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA7_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA7_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA7_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA7_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA7_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA7_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA7_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA7_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA7_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA7_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA7_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA7_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA7_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA7_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA7_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA7_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA7_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA7_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA7_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA7_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA7_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA7_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA7_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA7_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA7_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA7_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA7_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA7_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA7_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA7_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA7_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA7_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA7_DL_000002C8" Offset="0x2C8"/>
+        <DList Name="object_oA7_DL_000003E8" Offset="0x3E8"/>
+        <DList Name="object_oA7_DL_000004B8" Offset="0x4B8"/>
+        <DList Name="object_oA7_DL_00000568" Offset="0x568"/>
+        <DList Name="object_oA7_DL_00000600" Offset="0x600"/>
+        <DList Name="object_oA7_DL_000006D8" Offset="0x6D8"/>
+        <DList Name="object_oA7_DL_000007C8" Offset="0x7C8"/>
+        <DList Name="object_oA7_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oA7_DL_000009B8" Offset="0x9B8"/>
+        <DList Name="object_oA7_DL_00000A68" Offset="0xA68"/>
+        <DList Name="object_oA7_DL_00000B00" Offset="0xB00"/>
+        <DList Name="object_oA7_DL_00000BD8" Offset="0xBD8"/>
+        <DList Name="object_oA7_DL_00000EE8" Offset="0xEE8"/>
+        <DList Name="object_oA7_DL_00001068" Offset="0x1068"/>
+        <DList Name="object_oA7_DL_00001218" Offset="0x1218"/>
+        <Texture Name="object_oA7_Tex_000012C8" OutName="tex_000012C8" Format="rgba16" Width="8" Height="8" Offset="0x12C8"/>
+        <Texture Name="object_oA7_Tex_00001348" OutName="tex_00001348" Format="rgba16" Width="8" Height="8" Offset="0x1348"/>
+        <Texture Name="object_oA7_Tex_000013C8" OutName="tex_000013C8" Format="rgba16" Width="8" Height="16" Offset="0x13C8"/>
+        <Texture Name="object_oA7_Tex_000014C8" OutName="tex_000014C8" Format="rgba16" Width="8" Height="8" Offset="0x14C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA8.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA8.xml
new file mode 100644
index 0000000000..8ed2d3df50
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA8.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_oA8" Segment="6">
+        <Limb Name="object_oA8_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA8_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA8_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA8_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA8_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA8_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA8_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA8_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oA8_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA8_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA8_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oA8_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA8_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA8_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA8_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oA8_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA8_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA8_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA8_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oA8_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA8_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA8_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oA8_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oA8_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA8_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA8_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA8_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA8_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA8_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA8_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA8_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA8_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA8_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA8_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA8_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA8_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA8_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA8_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oA8_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oA8_DL_00000CB8" Offset="0xCB8"/>
+        <DList Name="object_oA8_DL_00000D90" Offset="0xD90"/>
+        <DList Name="object_oA8_DL_00000E48" Offset="0xE48"/>
+        <DList Name="object_oA8_DL_00000F70" Offset="0xF70"/>
+        <DList Name="object_oA8_DL_00000FC8" Offset="0xFC8"/>
+        <DList Name="object_oA8_DL_00001080" Offset="0x1080"/>
+        <DList Name="object_oA8_DL_00001140" Offset="0x1140"/>
+        <DList Name="object_oA8_DL_00001198" Offset="0x1198"/>
+        <DList Name="object_oA8_DL_000011F0" Offset="0x11F0"/>
+        <DList Name="object_oA8_DL_00001248" Offset="0x1248"/>
+        <DList Name="object_oA8_DL_000012D8" Offset="0x12D8"/>
+        <DList Name="object_oA8_DL_00001390" Offset="0x1390"/>
+        <DList Name="object_oA8_DL_00001468" Offset="0x1468"/>
+        <DList Name="object_oA8_DL_000014C0" Offset="0x14C0"/>
+        <DList Name="object_oA8_DL_00001518" Offset="0x1518"/>
+        <Texture Name="object_oA8_Tex_00001570" OutName="tex_00001570" Format="rgba16" Width="8" Height="16" Offset="0x1570"/>
+        <Texture Name="object_oA8_Tex_00001670" OutName="tex_00001670" Format="rgba16" Width="8" Height="16" Offset="0x1670"/>
+        <Texture Name="object_oA8_Tex_00001770" OutName="tex_00001770" Format="i4" Width="16" Height="8" Offset="0x1770"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oA9.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oA9.xml
new file mode 100644
index 0000000000..d5c16abfcd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oA9.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_oA9" Segment="6">
+        <DList Name="object_oA9_DL_00000250" Offset="0x250"/>
+        <Texture Name="object_oA9_Tex_000003A0" OutName="tex_000003A0" Format="rgba16" Width="8" Height="16" Offset="0x3A0"/>
+        <Texture Name="object_oA9_Tex_000004A0" OutName="tex_000004A0" Format="rgba16" Width="8" Height="8" Offset="0x4A0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oB1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oB1.xml
new file mode 100644
index 0000000000..2f50c967b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oB1.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oB1" Segment="6">
+        <Limb Name="object_oB1_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB1_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB1_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB1_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB1_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB1_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB1_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB1_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB1_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB1_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB1_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB1_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB1_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB1_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB1_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB1_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB1_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB1_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB1_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB1_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB1_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB1_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB1_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB1_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB1_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB1_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB1_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB1_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB1_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB1_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB1_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB1_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB1_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB1_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB1_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB1_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB1_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB1_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB1_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB1_DL_00000448" Offset="0x448"/>
+        <DList Name="object_oB1_DL_00000750" Offset="0x750"/>
+        <DList Name="object_oB1_DL_000008E8" Offset="0x8E8"/>
+        <DList Name="object_oB1_DL_00000C08" Offset="0xC08"/>
+        <DList Name="object_oB1_DL_00000EF0" Offset="0xEF0"/>
+        <DList Name="object_oB1_DL_00001490" Offset="0x1490"/>
+        <DList Name="object_oB1_DL_00001920" Offset="0x1920"/>
+        <DList Name="object_oB1_DL_00001C28" Offset="0x1C28"/>
+        <DList Name="object_oB1_DL_00001DC0" Offset="0x1DC0"/>
+        <DList Name="object_oB1_DL_000020E0" Offset="0x20E0"/>
+        <DList Name="object_oB1_DL_000023C8" Offset="0x23C8"/>
+        <DList Name="object_oB1_DL_00002968" Offset="0x2968"/>
+        <DList Name="object_oB1_DL_000032F8" Offset="0x32F8"/>
+        <DList Name="object_oB1_DL_00003600" Offset="0x3600"/>
+        <DList Name="object_oB1_DL_00003CA8" Offset="0x3CA8"/>
+        <Texture Name="object_oB1_Tex_00003EB0" OutName="tex_00003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0"/>
+        <Texture Name="object_oB1_Tex_000040B0" OutName="tex_000040B0" Format="rgba16" Width="16" Height="16" Offset="0x40B0"/>
+        <Texture Name="object_oB1_Tex_000042B0" OutName="tex_000042B0" Format="rgba16" Width="32" Height="32" Offset="0x42B0"/>
+        <Texture Name="object_oB1_Tex_00004AB0" OutName="tex_00004AB0" Format="rgba16" Width="16" Height="16" Offset="0x4AB0"/>
+        <Texture Name="object_oB1_Tex_00004CB0" OutName="tex_00004CB0" Format="rgba16" Width="32" Height="32" Offset="0x4CB0"/>
+        <Texture Name="object_oB1_Tex_000054B0" OutName="tex_000054B0" Format="rgba16" Width="16" Height="16" Offset="0x54B0"/>
+        <Texture Name="object_oB1_Tex_000056B0" OutName="tex_000056B0" Format="rgba16" Width="32" Height="32" Offset="0x56B0"/>
+        <Texture Name="object_oB1_Tex_00005EB0" OutName="tex_00005EB0" Format="rgba16" Width="16" Height="16" Offset="0x5EB0"/>
+        <Texture Name="object_oB1_Tex_000060B0" OutName="tex_000060B0" Format="rgba16" Width="16" Height="16" Offset="0x60B0"/>
+        <Texture Name="object_oB1_Tex_000062B0" OutName="tex_000062B0" Format="rgba16" Width="16" Height="16" Offset="0x62B0"/>
+        <Texture Name="object_oB1_Tex_000064B0" OutName="tex_000064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oB2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oB2.xml
new file mode 100644
index 0000000000..230783ceae
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oB2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="object_oB2" Segment="6">
+        <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
+        <!-- This object is not used in-game. -->
+
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        -->
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <!--
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        -->
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        -->
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        -->
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <!--
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        -->
+        <!--
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        -->
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oB3.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oB3.xml
new file mode 100644
index 0000000000..1c42ddaccc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oB3.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oB3" Segment="6">
+        <Limb Name="object_oB3_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB3_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB3_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB3_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB3_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB3_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB3_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB3_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB3_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB3_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB3_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB3_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB3_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB3_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB3_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB3_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB3_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB3_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB3_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB3_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB3_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB3_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB3_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB3_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB3_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB3_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB3_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB3_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB3_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB3_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB3_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB3_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB3_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB3_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB3_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB3_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB3_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB3_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB3_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB3_DL_00001F28" Offset="0x1F28"/>
+        <DList Name="object_oB3_DL_00002118" Offset="0x2118"/>
+        <DList Name="object_oB3_DL_00002208" Offset="0x2208"/>
+        <DList Name="object_oB3_DL_00002528" Offset="0x2528"/>
+        <DList Name="object_oB3_DL_00002640" Offset="0x2640"/>
+        <DList Name="object_oB3_DL_00002748" Offset="0x2748"/>
+        <DList Name="object_oB3_DL_00002810" Offset="0x2810"/>
+        <DList Name="object_oB3_DL_00002868" Offset="0x2868"/>
+        <DList Name="object_oB3_DL_000028C0" Offset="0x28C0"/>
+        <DList Name="object_oB3_DL_00002918" Offset="0x2918"/>
+        <DList Name="object_oB3_DL_00002A30" Offset="0x2A30"/>
+        <DList Name="object_oB3_DL_00002B38" Offset="0x2B38"/>
+        <DList Name="object_oB3_DL_00002C00" Offset="0x2C00"/>
+        <DList Name="object_oB3_DL_00002C58" Offset="0x2C58"/>
+        <DList Name="object_oB3_DL_00002CB0" Offset="0x2CB0"/>
+        <Texture Name="object_oB3_Tex_00002D08" OutName="tex_00002D08" Format="rgba16" Width="32" Height="16" Offset="0x2D08"/>
+        <Texture Name="object_oB3_Tex_00003108" OutName="tex_00003108" Format="rgba16" Width="32" Height="16" Offset="0x3108"/>
+        <Texture Name="object_oB3_Tex_00003508" OutName="tex_00003508" Format="rgba16" Width="8" Height="8" Offset="0x3508"/>
+        <Texture Name="object_oB3_Tex_00003588" OutName="tex_00003588" Format="rgba16" Width="16" Height="16" Offset="0x3588"/>
+        <Texture Name="object_oB3_Tex_00003788" OutName="tex_00003788" Format="rgba16" Width="16" Height="16" Offset="0x3788"/>
+        <Texture Name="object_oB3_Tex_00003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_oB3_Tex_00003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <Texture Name="object_oB3_Tex_00003A88" OutName="tex_00003A88" Format="rgba16" Width="8" Height="8" Offset="0x3A88"/>
+        <Texture Name="object_oB3_Tex_00003B08" OutName="tex_00003B08" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_oB3_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="8" Height="8" Offset="0x4308"/>
+        <Texture Name="object_oB3_Tex_00004388" OutName="tex_00004388" Format="rgba16" Width="8" Height="8" Offset="0x4388"/>
+        <Texture Name="object_oB3_Tex_00004408" OutName="tex_00004408" Format="rgba16" Width="8" Height="8" Offset="0x4408"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oB4.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oB4.xml
new file mode 100644
index 0000000000..2924c9e753
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oB4.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oB4" Segment="6">
+        <Limb Name="object_oB4_Limb_00000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB4_Limb_0000000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB4_Limb_00000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB4_Limb_00000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB4_Limb_00000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB4_Limb_0000003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB4_Limb_00000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB4_Limb_00000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oB4_Limb_00000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB4_Limb_0000006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB4_Limb_00000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oB4_Limb_00000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB4_Limb_00000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB4_Limb_0000009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB4_Limb_000000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oB4_Limb_000000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB4_Limb_000000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB4_Limb_000000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB4_Limb_000000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oB4_Limb_000000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB4_Limb_000000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB4_Limb_000000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oB4_Limb_00000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oB4_Limb_00000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB4_Limb_00000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB4_Limb_0000012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB4_Limb_00000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oB4_Limb_00000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB4_Limb_00000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB4_Limb_0000015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oB4_Limb_00000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB4_Limb_00000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB4_Limb_00000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB4_Limb_0000018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oB4_Limb_00000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB4_Limb_000001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB4_Limb_000001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB4_Limb_000001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oB4_Skel_00000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oB4_DL_00000BE8" Offset="0xBE8"/>
+        <DList Name="object_oB4_DL_00000C90" Offset="0xC90"/>
+        <DList Name="object_oB4_DL_00000DF8" Offset="0xDF8"/>
+        <DList Name="object_oB4_DL_00000E98" Offset="0xE98"/>
+        <DList Name="object_oB4_DL_00000F58" Offset="0xF58"/>
+        <DList Name="object_oB4_DL_00000FC0" Offset="0xFC0"/>
+        <DList Name="object_oB4_DL_00001018" Offset="0x1018"/>
+        <DList Name="object_oB4_DL_00001070" Offset="0x1070"/>
+        <DList Name="object_oB4_DL_000010C8" Offset="0x10C8"/>
+        <DList Name="object_oB4_DL_00001168" Offset="0x1168"/>
+        <DList Name="object_oB4_DL_00001228" Offset="0x1228"/>
+        <DList Name="object_oB4_DL_00001290" Offset="0x1290"/>
+        <DList Name="object_oB4_DL_000012E8" Offset="0x12E8"/>
+        <DList Name="object_oB4_DL_00001340" Offset="0x1340"/>
+        <DList Name="object_oB4_DL_00001398" Offset="0x1398"/>
+        <Texture Name="object_oB4_Tex_00001468" OutName="tex_00001468" Format="rgba16" Width="8" Height="16" Offset="0x1468"/>
+        <Texture Name="object_oB4_Tex_00001568" OutName="tex_00001568" Format="rgba16" Width="8" Height="8" Offset="0x1568"/>
+        <Texture Name="object_oB4_Tex_000015E8" OutName="tex_000015E8" Format="rgba16" Width="8" Height="8" Offset="0x15E8"/>
+        <Texture Name="object_oB4_Tex_00001668" OutName="tex_00001668" Format="rgba16" Width="8" Height="16" Offset="0x1668"/>
+        <Texture Name="object_oB4_Tex_00001768" OutName="tex_00001768" Format="rgba16" Width="8" Height="8" Offset="0x1768"/>
+        <Texture Name="object_oB4_Tex_000017E8" OutName="tex_000017E8" Format="rgba16" Width="8" Height="8" Offset="0x17E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE1.xml
new file mode 100644
index 0000000000..4d5b1663fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE1.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_oE1" Segment="6">
+        <Limb Name="object_oE1_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE1_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE1_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE1_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE1_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE1_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE1_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE1_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE1_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE1_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE1_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE1_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE1_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE1_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE1_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE1_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE1_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE1_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE1_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE1_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE1_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE1_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE1_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE1_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE1_DL_002FE8" Offset="0x2FE8"/>
+        <DList Name="object_oE1_DL_003250" Offset="0x3250"/>
+        <DList Name="object_oE1_DL_003380" Offset="0x3380"/>
+        <DList Name="object_oE1_DL_003868" Offset="0x3868"/>
+        <DList Name="object_oE1_DL_003A80" Offset="0x3A80"/>
+        <DList Name="object_oE1_DL_003BE8" Offset="0x3BE8"/>
+        <DList Name="object_oE1_DL_003D60" Offset="0x3D60"/>
+        <DList Name="object_oE1_DL_003E18" Offset="0x3E18"/>
+        <DList Name="object_oE1_DL_003F68" Offset="0x3F68"/>
+        <DList Name="object_oE1_DL_004038" Offset="0x4038"/>
+        <DList Name="object_oE1_DL_004250" Offset="0x4250"/>
+        <DList Name="object_oE1_DL_0043B8" Offset="0x43B8"/>
+        <DList Name="object_oE1_DL_004530" Offset="0x4530"/>
+        <DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
+        <DList Name="object_oE1_DL_004738" Offset="0x4738"/>
+        <Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
+        <Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
+        <Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
+        <Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
+        <Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
+        <Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
+        <Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>
+        <Texture Name="object_oE1_Tex_006688" OutName="tex_00006688" Format="i4" Width="16" Height="16" Offset="0x6688"/>
+        <Texture Name="object_oE1_Tex_006708" OutName="tex_00006708" Format="rgba16" Width="16" Height="8" Offset="0x6708"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE10.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE10.xml
new file mode 100644
index 0000000000..04ce914372
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE10.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE10" Segment="6">
+        <DList Name="object_oE10_DL_000720" Offset="0x720"/>
+        <Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
+        <Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
+        <Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
+        <Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
+        <Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>
+        <Texture Name="object_oE10_Tex_0021D0" OutName="tex_000021D0" Format="rgba16" Width="32" Height="32" Offset="0x21D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE11.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE11.xml
new file mode 100644
index 0000000000..04f6f186da
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE11.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE11" Segment="6">
+        <DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
+        <Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
+        <Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
+        <Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
+        <Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
+        <Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
+        <Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
+        <Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>
+        <Texture Name="object_oE11_Tex_0031B0" OutName="tex_000031B0" Format="i4" Width="16" Height="8" Offset="0x31B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE12.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE12.xml
new file mode 100644
index 0000000000..a5fa39fd25
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE12.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE12" Segment="6">
+        <DList Name="object_oE12_DL_001020" Offset="0x1020"/>
+        <Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
+        <Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
+        <Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
+        <Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>
+        <Texture Name="object_oE12_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
+        <Texture Name="object_oE12_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="object_oE12_Tex_002B80" OutName="tex_00002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_oE12_Tex_003380" OutName="tex_00003380" Format="rgba16" Width="32" Height="16" Offset="0x3380"/>
+        <Texture Name="object_oE12_Tex_003780" OutName="tex_00003780" Format="i4" Width="16" Height="8" Offset="0x3780"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE1s.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE1s.xml
new file mode 100644
index 0000000000..d311e60104
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE1s.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_oE1s" Segment="6">
+        <Texture Name="object_oE1sTex_000478" OutName="object_oE1sTex_000478" Format="ci8" Width="32" Height="32" Offset="0x478" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE1sTLUT_0001A8" OutName="object_oE1sTLUT_0001A8" Format="rgba16" Width="16" Height="16" Offset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
+        <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
+        <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
+        <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
+        <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE2.xml
new file mode 100644
index 0000000000..af62ad6d11
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE2.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_oE2" Segment="6">
+        <Limb Name="object_oE2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE2_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE2_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE2_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE2_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE2_DL_0025A8" Offset="0x25A8"/>
+        <DList Name="object_oE2_DL_002718" Offset="0x2718"/>
+        <DList Name="object_oE2_DL_002C70" Offset="0x2C70"/>
+        <DList Name="object_oE2_DL_002DB0" Offset="0x2DB0"/>
+        <DList Name="object_oE2_DL_002F60" Offset="0x2F60"/>
+        <DList Name="object_oE2_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE2_DL_003150" Offset="0x3150"/>
+        <DList Name="object_oE2_DL_003210" Offset="0x3210"/>
+        <DList Name="object_oE2_DL_003350" Offset="0x3350"/>
+        <DList Name="object_oE2_DL_003510" Offset="0x3510"/>
+        <DList Name="object_oE2_DL_0036C0" Offset="0x36C0"/>
+        <DList Name="object_oE2_DL_0037B0" Offset="0x37B0"/>
+        <DList Name="object_oE2_DL_0038B0" Offset="0x38B0"/>
+        <DList Name="object_oE2_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
+        <Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
+        <Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
+        <Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
+        <Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
+        <Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
+        <Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
+        <Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>
+        <Texture Name="object_oE2_Tex_005970" OutName="tex_00005970" Format="i4" Width="16" Height="16" Offset="0x5970"/>
+        <Texture Name="object_oE2_Tex_0059F0" OutName="tex_000059F0" Format="i4" Width="16" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_oE2_Tex_005A30" OutName="tex_00005A30" Format="i4" Width="16" Height="8" Offset="0x5A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE3.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE3.xml
new file mode 100644
index 0000000000..95227da384
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE3.xml
@@ -0,0 +1,73 @@
+<Root>
+    <File Name="object_oE3" Segment="6">
+        <Limb Name="object_oE3_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE3_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE3_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE3_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE3_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE3_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE3_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE3_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE3_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE3_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE3_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE3_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE3_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE3_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE3_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE3_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE3_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE3_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE3_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE3_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE3_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE3_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE3_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE3_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE3_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE3_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE3_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE3_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE3_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE3_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE3_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE3_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE3_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE3_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE3_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE3_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE3_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE3_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE3_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE3_DL_003788" Offset="0x3788"/>
+        <DList Name="object_oE3_DL_003938" Offset="0x3938"/>
+        <DList Name="object_oE3_DL_003A30" Offset="0x3A30"/>
+        <DList Name="object_oE3_DL_004000" Offset="0x4000"/>
+        <DList Name="object_oE3_DL_0041B0" Offset="0x41B0"/>
+        <DList Name="object_oE3_DL_004270" Offset="0x4270"/>
+        <DList Name="object_oE3_DL_004348" Offset="0x4348"/>
+        <DList Name="object_oE3_DL_0044A0" Offset="0x44A0"/>
+        <DList Name="object_oE3_DL_0045E0" Offset="0x45E0"/>
+        <DList Name="object_oE3_DL_004790" Offset="0x4790"/>
+        <DList Name="object_oE3_DL_004940" Offset="0x4940"/>
+        <DList Name="object_oE3_DL_004A00" Offset="0x4A00"/>
+        <DList Name="object_oE3_DL_004AD8" Offset="0x4AD8"/>
+        <DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
+        <DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
+        <Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
+        <Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
+        <Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
+        <Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
+        <Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
+        <Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
+        <Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
+        <Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
+        <Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>
+        <Texture Name="object_oE3_Tex_006E60" OutName="tex_00006E60" Format="i4" Width="16" Height="8" Offset="0x6E60"/>
+        <Texture Name="object_oE3_Tex_006EA0" OutName="tex_00006EA0" Format="rgba16" Width="16" Height="16" Offset="0x6EA0"/>
+        <Texture Name="object_oE3_Tex_0070A0" OutName="tex_000070A0" Format="i4" Width="16" Height="8" Offset="0x70A0"/>
+        <Texture Name="object_oE3_Tex_0070E0" OutName="tex_000070E0" Format="i4" Width="16" Height="8" Offset="0x70E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE4.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE4.xml
new file mode 100644
index 0000000000..ae48d2adef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE4.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_oE4" Segment="6">
+        <Limb Name="object_oE4_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE4_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE4_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE4_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE4_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE4_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE4_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE4_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE4_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE4_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE4_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE4_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE4_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE4_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE4_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE4_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE4_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE4_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE4_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE4_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE4_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE4_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE4_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE4_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
+        <DList Name="object_oE4_DL_002CA8" Offset="0x2CA8"/>
+        <DList Name="object_oE4_DL_002E50" Offset="0x2E50"/>
+        <DList Name="object_oE4_DL_002F58" Offset="0x2F58"/>
+        <DList Name="object_oE4_DL_0035A0" Offset="0x35A0"/>
+        <DList Name="object_oE4_DL_003748" Offset="0x3748"/>
+        <DList Name="object_oE4_DL_003838" Offset="0x3838"/>
+        <DList Name="object_oE4_DL_003928" Offset="0x3928"/>
+        <DList Name="object_oE4_DL_0039E0" Offset="0x39E0"/>
+        <DList Name="object_oE4_DL_003A98" Offset="0x3A98"/>
+        <DList Name="object_oE4_DL_003BA0" Offset="0x3BA0"/>
+        <DList Name="object_oE4_DL_003D48" Offset="0x3D48"/>
+        <DList Name="object_oE4_DL_003E38" Offset="0x3E38"/>
+        <DList Name="object_oE4_DL_003F28" Offset="0x3F28"/>
+        <DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
+        <DList Name="object_oE4_DL_004098" Offset="0x4098"/>
+        <Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
+        <Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
+        <Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
+        <Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>
+        <Texture Name="object_oE4_Tex_004D48" OutName="tex_00004D48" Format="i4" Width="16" Height="16" Offset="0x4D48"/>
+        <Texture Name="object_oE4_Tex_004DC8" OutName="tex_00004DC8" Format="rgba16" Width="16" Height="16" Offset="0x4DC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE4s.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE4s.xml
new file mode 100644
index 0000000000..6037de52f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE4s.xml
@@ -0,0 +1,48 @@
+<Root>
+    <File Name="object_oE4s" Segment="6">
+        <Texture Name="object_oE4sTex_0002A0" OutName="object_oE4sTex_0002A0" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Texture Name="object_oE4sTex_0003A0" OutName="object_oE4sTex_0003A0" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8" AddedByScript="true"/>
+        <Animation Name="object_oE4s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE4s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE4s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE4s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE4s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE4s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE4s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE4s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE4s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE4s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE4s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE4s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE4s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE4s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE4s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE4s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
+        <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
+        <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
+        <Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
+        <Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
+        <Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
+        <DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
+        <DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>
+        <DList Name="object_oE4s_DL_003C40" Offset="0x3C40"/>
+        <DList Name="object_oE4s_DL_004230" Offset="0x4230"/>
+        <DList Name="object_oE4s_DL_0043A8" Offset="0x43A8"/>
+        <DList Name="object_oE4s_DL_004498" Offset="0x4498"/>
+        <DList Name="object_oE4s_DL_004598" Offset="0x4598"/>
+        <DList Name="object_oE4s_DL_004650" Offset="0x4650"/>
+        <DList Name="object_oE4s_DL_004708" Offset="0x4708"/>
+        <DList Name="object_oE4s_DL_004828" Offset="0x4828"/>
+        <DList Name="object_oE4s_DL_0049A0" Offset="0x49A0"/>
+        <DList Name="object_oE4s_DL_004A90" Offset="0x4A90"/>
+        <DList Name="object_oE4s_DL_004B90" Offset="0x4B90"/>
+        <DList Name="object_oE4s_DL_004C48" Offset="0x4C48"/>
+        <DList Name="object_oE4s_DL_004D00" Offset="0x4D00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE5.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE5.xml
new file mode 100644
index 0000000000..f5edf745aa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE5.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_oE5" Segment="6">
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE6.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE6.xml
new file mode 100644
index 0000000000..95bb602b6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE6.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE6" Segment="6">
+        <DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
+        <Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
+        <Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
+        <Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
+        <Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
+        <Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
+        <Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
+        <Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>
+        <Texture Name="object_oE6_Tex_002E10" OutName="tex_00002E10" Format="i4" Width="16" Height="8" Offset="0x2E10"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE7.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE7.xml
new file mode 100644
index 0000000000..b3e588d4c2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE7.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_oE7" Segment="6">
+        <DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
+        <Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
+        <Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
+        <Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
+        <Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
+        <Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
+        <Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
+        <Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE8.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE8.xml
new file mode 100644
index 0000000000..be5de24947
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE8.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE8" Segment="6">
+        <DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
+        <Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
+        <Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
+        <Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
+        <Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
+        <Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
+        <Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
+        <Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>
+        <Texture Name="object_oE8_Tex_002BC8" OutName="tex_00002BC8" Format="rgba16" Width="32" Height="32" Offset="0x2BC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE9.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE9.xml
new file mode 100644
index 0000000000..8ea7ee18c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE9.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="object_oE9" Segment="6">
+        <DList Name="object_oE9_DL_000800" Offset="0x800"/>
+        <Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
+        <Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
+        <Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
+        <Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
+        <Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
+        <Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
+        <Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>
+        <Texture Name="object_oE9_Tex_002ED0" OutName="tex_00002ED0" Format="i4" Width="16" Height="8" Offset="0x2ED0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oE_anime.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oE_anime.xml
new file mode 100644
index 0000000000..f6b4659e22
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oE_anime.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_oE_anime" Segment="6">
+        <Animation Name="object_oE_anime_Anim_00001034" Offset="0x1034"/>
+        <Animation Name="object_oE_anime_Anim_000019BC" Offset="0x19BC"/>
+        <Animation Name="object_oE_anime_Anim_0000242C" Offset="0x242C"/>
+        <Animation Name="object_oE_anime_Anim_00002DC8" Offset="0x2DC8"/>
+        <Animation Name="object_oE_anime_Anim_000047D4" Offset="0x47D4"/>
+        <Animation Name="object_oE_anime_Anim_00005044" Offset="0x5044"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oF1d_map.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oF1d_map.xml
new file mode 100644
index 0000000000..f14fecd825
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oF1d_map.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="object_oF1d_map" Segment="6">
+        <Texture Name="object_oF1d_mapTex_009270" OutName="object_oF1d_mapTex_009270" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092B0" OutName="object_oF1d_mapTex_0092B0" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_0092F0" OutName="object_oF1d_mapTex_0092F0" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009370" OutName="object_oF1d_mapTex_009370" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009B70" OutName="object_oF1d_mapTex_009B70" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_009C70" OutName="object_oF1d_mapTex_009C70" Format="rgba16" Width="64" Height="32" Offset="0x9C70" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C840" OutName="object_oF1d_mapTex_00C840" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00C880" OutName="object_oF1d_mapTex_00C880" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00CA80" OutName="object_oF1d_mapTex_00CA80" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00EE80" OutName="object_oF1d_mapTex_00EE80" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F680" OutName="object_oF1d_mapTex_00F680" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F6C0" OutName="object_oF1d_mapTex_00F6C0" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F7C0" OutName="object_oF1d_mapTex_00F7C0" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00F8C0" OutName="object_oF1d_mapTex_00F8C0" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTex_00FCC0" OutName="object_oF1d_mapTex_00FCC0" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_009130" OutName="object_oF1d_mapTLUT_009130" Format="rgba16" Width="16" Height="16" Offset="0x9130" AddedByScript="true"/>
+        <Texture Name="object_oF1d_mapTLUT_00C440" OutName="object_oF1d_mapTLUT_00C440" Format="rgba16" Width="16" Height="16" Offset="0xC440" AddedByScript="true"/>
+        <!-- animations -->
+        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
+        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
+        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
+        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
+        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
+        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
+        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
+        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
+        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
+        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
+        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
+
+        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
+        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
+
+        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
+        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
+
+        <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
+
+        <!-- Eye textures -->
+        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
+
+        <!-- Mouth textures -->
+        <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_oF1s.xml b/soh/assets/xml/N64_NTSC_12/objects/object_oF1s.xml
new file mode 100644
index 0000000000..fe41dde630
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_oF1s.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="object_oF1s" Segment="6">
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
+
+        <!-- 32-bit aligned textures. -->
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Texture Name="object_oF1s_TLUT_0002CC" OutName="tlut_000002CC" Format="rgba16" Width="31" Height="8" Offset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" TlutOffset="0x11C"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" TlutOffset="0x2CC"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" TlutOffset="0x2CC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" TlutOffset="0x2CC"/>
+
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_o_anime.xml b/soh/assets/xml/N64_NTSC_12/objects/object_o_anime.xml
new file mode 100644
index 0000000000..4ef4ac44c8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_o_anime.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_o_anime" Segment="6">
+        <Animation Name="object_o_anime_Anim_000A1C" Offset="0xA1C"/>
+        <Animation Name="object_o_anime_Anim_000E78" Offset="0xE78"/>
+        <Animation Name="object_o_anime_Anim_001300" Offset="0x1300"/>
+        <Animation Name="object_o_anime_Anim_0017B4" Offset="0x17B4"/>
+        <Animation Name="object_o_anime_Anim_0018F0" Offset="0x18F0"/>
+        <Animation Name="object_o_anime_Anim_001E80" Offset="0x1E80"/>
+        <Animation Name="object_o_anime_Anim_00213C" Offset="0x213C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_okuta.xml b/soh/assets/xml/N64_NTSC_12/objects/object_okuta.xml
new file mode 100644
index 0000000000..b4fccea6f3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_okuta.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="object_okuta" Segment="6">
+        <!-- Octorok Animations -->
+        <Animation Name="gOctorokShootAnim" Offset="0x344"/>
+        <Animation Name="gOctorokDieAnim" Offset="0x8FC"/>
+        <Animation Name="gOctorokHideAnim" Offset="0xAC0"/>
+        <Animation Name="gOctorokFloatAnim" Offset="0xDDC"/>
+        <Animation Name="gOctorokHitAnim" Offset="0x3910"/>
+        <Animation Name="gOctorokAppearAnim" Offset="0x3C64"/>
+
+        <!-- Octorok Textures -->
+        <Texture Name="gOctorokRoughSkinTex" OutName="rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x2250"/>
+        <Texture Name="gOctorokStripesTex" OutName="stripes" Format="rgba16" Width="8" Height="16" Offset="0x2450"/>
+        <Texture Name="gOctorokScalesTex" OutName="scales" Format="rgba16" Width="16" Height="16" Offset="0x2550"/>
+        <Texture Name="gOctorokSnoutConnectionTex" OutName="snout_connection" Format="rgba16" Width="8" Height="8" Offset="0x2750"/>
+        <Texture Name="gOctorokMouthTex" OutName="mouth" Format="rgba16" Width="8" Height="16" Offset="0x27D0"/>
+        <Texture Name="gOctorokArmTex" OutName="arm" Format="rgba16" Width="16" Height="32" Offset="0x28D0"/>
+        <Texture Name="gOctorokFinTex" OutName="fin" Format="rgba16" Width="16" Height="16" Offset="0x2CD0"/>
+        <Texture Name="gOctorokEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x2ED0"/>
+        <Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgba16" Width="8" Height="8" Offset="0x30D0"/>
+
+        <!-- Octorok Skeleton -->
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
+
+        <!-- Projectile -->
+        <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
+        <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_opening_demo1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_opening_demo1.xml
new file mode 100644
index 0000000000..fd03230279
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_opening_demo1.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_opening_demo1" Segment="6">
+        <Animation Name="object_opening_demo1_Anim_000450" Offset="0x450"/>
+        <Animation Name="object_opening_demo1_Anim_001410" Offset="0x1410"/>
+        <Animation Name="object_opening_demo1_Anim_002574" Offset="0x2574"/>
+        <Animation Name="object_opening_demo1_Anim_0029CC" Offset="0x29CC"/>
+        <Animation Name="object_opening_demo1_Anim_00420C" Offset="0x420C"/>
+        <Animation Name="object_opening_demo1_Anim_0048FC" Offset="0x48FC"/>
+        <Animation Name="object_opening_demo1_Anim_00504C" Offset="0x504C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_os.xml b/soh/assets/xml/N64_NTSC_12/objects/object_os.xml
new file mode 100644
index 0000000000..5880a92930
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_os.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_os" Segment="6">
+        <Animation Name="gHappyMaskSalesmanIdleAnim" Offset="0x2E4"/>
+        <DList Name="gHappyMaskSalesmanTorsoDL" Offset="0x1D80"/>
+        <DList Name="gHappyMaskSalesmanHeadDL" Offset="0x20A8"/>
+        <DList Name="gHappyMaskSalesmanRightUpperArmDL" Offset="0x25E8"/>
+        <DList Name="gHappyMaskSalesmanRightForearmDL" Offset="0x2718"/>
+        <DList Name="gHappyMaskSalesmanRightHandDL" Offset="0x2848"/>
+        <DList Name="gHappyMaskSalesmanLeftUpperArmDL" Offset="0x2A00"/>
+        <DList Name="gHappyMaskSalesmanLeftForearmDL" Offset="0x2B30"/>
+        <DList Name="gHappyMaskSalesmanLeftHandDL" Offset="0x2C60"/>
+        <Texture Name="gHappyMaskSalesmanTLUT" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEyeMouthTLUT" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanSkinTex" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanHairTex" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanEarTex" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanMouthTex" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
+        <Texture Name="gHappyMaskSalesmanFingersTex" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanSleeveTex" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanShirtTex" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricTex" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
+        <Texture Name="gHappyMaskSalesmanGoldFabricCenterTex" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
+        <Limb Name="gHappyMaskSalesmanTorsoLimb" LimbType="Standard" Offset="0x45D8"/>
+        <Limb Name="gHappyMaskSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x45E4"/>
+        <Limb Name="gHappyMaskSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x45F0"/>
+        <Limb Name="gHappyMaskSalesmanLeftHandLimb" LimbType="Standard" Offset="0x45FC"/>
+        <Limb Name="gHappyMaskSalesmanRightUpperArmLimb" LimbType="Standard" Offset="0x4608"/>
+        <Limb Name="gHappyMaskSalesmanRightForearmLimb" LimbType="Standard" Offset="0x4614"/>
+        <Limb Name="gHappyMaskSalesmanRightHandLimb" LimbType="Standard" Offset="0x4620"/>
+        <Limb Name="gHappyMaskSalesmanHeadLimb" LimbType="Standard" Offset="0x462C"/>
+        <Skeleton Name="gHappyMaskSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x4658"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_os_anime.xml b/soh/assets/xml/N64_NTSC_12/objects/object_os_anime.xml
new file mode 100644
index 0000000000..f23636343c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_os_anime.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="object_os_anime" Segment="6">
+        <Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
+        <Animation Name="gObjOsAnim_0170" Offset="0x170"/>
+        <Animation Name="gObjOsAnim_0228" Offset="0x228"/>
+        <Animation Name="gObjOsAnim_0718" Offset="0x718"/>
+        <Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
+        <Animation Name="gObjOsAnim_0894" Offset="0x894"/>
+        <Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
+        <Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
+        <Animation Name="gObjOsAnim_0FE4" Offset="0xFE4"/>
+        <Animation Name="gObjOsAnim_12E8" Offset="0x12E8"/>
+        <Animation Name="gObjOsAnim_14A0" Offset="0x14A0"/>
+        <Animation Name="gObjOsAnim_1650" Offset="0x1650"/>
+        <Animation Name="gObjOsAnim_16EC" Offset="0x16EC"/>
+        <Animation Name="gObjOsAnim_18A0" Offset="0x18A0"/>
+        <Animation Name="gObjOsAnim_1E7C" Offset="0x1E7C"/>
+        <Animation Name="gObjOsAnim_1F18" Offset="0x1F18"/>
+        <Animation Name="gObjOsAnim_2160" Offset="0x2160"/>
+        <Animation Name="gObjOsAnim_25D0" Offset="0x25D0"/>
+        <Animation Name="gObjOsAnim_265C" Offset="0x265C"/>
+        <Animation Name="gObjOsAnim_2850" Offset="0x2850"/>
+        <Animation Name="gObjOsAnim_28DC" Offset="0x28DC"/>
+        <Animation Name="gObjOsAnim_2D0C" Offset="0x2D0C"/>
+        <Animation Name="gObjOsAnim_2DC0" Offset="0x2DC0"/>
+        <Animation Name="gObjOsAnim_300C" Offset="0x300C"/>
+        <Animation Name="gObjOsAnim_31B0" Offset="0x31B0"/>
+        <Animation Name="gObjOsAnim_33B4" Offset="0x33B4"/>
+        <Animation Name="gObjOsAnim_3D84" Offset="0x3D84"/>
+        <Animation Name="gObjOsAnim_41F8" Offset="0x41F8"/>
+        <Animation Name="gObjOsAnim_42AC" Offset="0x42AC"/>
+        <Animation Name="gObjOsAnim_4408" Offset="0x4408"/>
+        <Animation Name="gObjOsAnim_4788" Offset="0x4788"/>
+        <Animation Name="gObjOsAnim_4C4C" Offset="0x4C4C"/>
+        <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
+        <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
+        <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
+        <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
+        <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
+        <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
+        <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
+        <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
+        <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
+        <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
+        <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
+        <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
+        <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
+        <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/>
+        <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
+        <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
+        <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
+        <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
+        <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
+        <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
+        <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
+        <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
+        <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
+        <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
+        <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
+        <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
+        <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
+        <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
+        <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/>
+        <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
+        <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
+        <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
+        <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ossan.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ossan.xml
new file mode 100644
index 0000000000..5788e3a20d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ossan.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_ossan" Segment="6">
+        <Texture Name="object_ossanTex_005078" OutName="object_ossanTex_005078" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005178" OutName="object_ossanTex_005178" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005278" OutName="object_ossanTex_005278" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_005AB8" OutName="object_ossanTex_005AB8" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008A38" OutName="object_ossanTex_008A38" Format="rgba16" Width="8" Height="8" Offset="0x8A38" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008AB8" OutName="object_ossanTex_008AB8" Format="rgba16" Width="16" Height="16" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008CB8" OutName="object_ossanTex_008CB8" Format="rgba16" Width="16" Height="16" Offset="0x8CB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_008EB8" OutName="object_ossanTex_008EB8" Format="rgba16" Width="32" Height="32" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0096B8" OutName="object_ossanTex_0096B8" Format="rgba16" Width="16" Height="16" Offset="0x96B8" AddedByScript="true"/>
+        <Texture Name="object_ossanTex_0098B8" OutName="object_ossanTex_0098B8" Format="rgba16" Width="16" Height="16" Offset="0x98B8" AddedByScript="true"/>
+        <Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
+        <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
+        <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
+        <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
+        <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
+        <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ouke_haka.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ouke_haka.xml
new file mode 100644
index 0000000000..11da9b26ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ouke_haka.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_ouke_haka" Segment="6">
+        <DList Name="object_ouke_haka_DL_0000C0" Offset="0xC0"/>
+        <Texture Name="object_ouke_haka_Tex_000170" OutName="tex_00000170" Format="i4" Width="128" Height="32" Offset="0x170"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_owl.xml b/soh/assets/xml/N64_NTSC_12/objects/object_owl.xml
new file mode 100644
index 0000000000..64fdf64c53
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_owl.xml
@@ -0,0 +1,79 @@
+<Root>
+    <File Name="object_owl" Segment="6">
+        <Texture Name="object_owlTex_0071A8" OutName="object_owlTex_0071A8" Format="rgba16" Width="32" Height="32" Offset="0x71A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0079A8" OutName="object_owlTex_0079A8" Format="rgba16" Width="32" Height="32" Offset="0x79A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0081A8" OutName="object_owlTex_0081A8" Format="rgba16" Width="32" Height="32" Offset="0x81A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_0095A8" OutName="object_owlTex_0095A8" Format="rgba16" Width="32" Height="32" Offset="0x95A8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009DA8" OutName="object_owlTex_009DA8" Format="rgba16" Width="16" Height="16" Offset="0x9DA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_009FA8" OutName="object_owlTex_009FA8" Format="rgba16" Width="64" Height="32" Offset="0x9FA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00AFA8" OutName="object_owlTex_00AFA8" Format="rgba16" Width="32" Height="32" Offset="0xAFA8" AddedByScript="true"/>
+        <Texture Name="object_owlTex_00B7A8" OutName="object_owlTex_00B7A8" Format="rgba16" Width="32" Height="32" Offset="0xB7A8" AddedByScript="true"/>
+        <!-- Flying Owl Skeleton -->
+        <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
+
+        <!-- Default Owl Limbs -->
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
+
+        <!-- Default Owl Limb DisplayLists -->
+        <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
+        <DList Name="gOwlNeckDL" Offset="0x4CB8"/>
+        <DList Name="gOwlHeadDL" Offset="0x4DE0"/>
+        <DList Name="gOwlRightEyebrowDL" Offset="0x5318"/>
+        <DList Name="gOwlLeftEyebrowDL" Offset="0x5260"/>
+        <DList Name="gOwlLowerLeftWingDL" Offset="0x5720"/>
+        <DList Name="gOwlMiddleLeftWing1DL" Offset="0x5960"/>
+        <DList Name="gOwlMiddleLeftWing2DL" Offset="0x5BB8"/>
+        <DList Name="gOwlUpperLeftWingDL" Offset="0x5DE8"/>
+        <DList Name="gOwlLowerRightWingDL" Offset="0x6068"/>
+        <DList Name="gOwlMiddleRightWing1DL" Offset="0x62A8"/>
+        <DList Name="gOwlMiddleRightWing2DL" Offset="0x6500"/>
+        <DList Name="gOwlUpperRightWingDL" Offset="0x6730"/>
+        <DList Name="gOwlUpperRightLegDL" Offset="0x53D0"/>
+        <DList Name="gOwlLowerRightLegDL" Offset="0x5498"/>
+        <DList Name="gOwlRightClawDL" Offset="0x5588"/>
+        <DList Name="gOwlUpperLeftLegDL" Offset="0x6A58"/>
+        <DList Name="gOwlLowerLeftLegDL" Offset="0x6B20"/>
+        <DList Name="gOwlLeftClawDL" Offset="0x6C10"/>
+        <DList Name="gOwlTailDL" Offset="0x69B0"/>
+
+        <!-- Owl Animations -->
+        <Animation Name="gOwlTakeoffAnim" Offset="0x1168"/>
+        <Animation Name="gOwlFlyAnim" Offset="0x15CC"/>
+        <Animation Name="gOwlGlideAnim" Offset="0xC1C4"/>
+        <Animation Name="gOwlUnfoldWingsAnim" Offset="0xC684"/>
+        <Animation Name="gOwlPerchAnim" Offset="0xC8A0"/>
+
+        <!-- Owl Perching Skeleton -->
+        <Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
+
+        <!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
+        <!-- TLUT used in gOwlPerchingSkel -->
+        <Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
+        <!-- TLUT used in gOwlFlyingSkel -->
+        <Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
+        <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_peehat.xml b/soh/assets/xml/N64_NTSC_12/objects/object_peehat.xml
new file mode 100644
index 0000000000..42ee66cdef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_peehat.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_peehat" Segment="6">
+        <!-- Peehat Skeleton -->
+        <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
+
+        <!-- Peehat Limbs -->
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
+
+        <!-- Peehat Limb DisplayLists -->
+        <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
+        <DList Name="gPeehatWing1DL" Offset="0x0ED0"/>
+        <DList Name="gPeehatWing2DL" Offset="0x0F60"/>
+        <DList Name="gPeehatWing3DL" Offset="0x0FF0"/>
+        <DList Name="gPeehatWing4DL" Offset="0x1080"/>
+        <DList Name="gPeehatWing5DL" Offset="0x1110"/>
+        <DList Name="gPeehatWing6DL" Offset="0x11A0"/>
+        <DList Name="gPeehatTopDL" Offset="0x1230"/>
+
+        <!-- Peehat DisplayList Textures -->
+        <Texture Name="gPeehatLowerBodyTex" OutName="lower_body" Format="rgba16" Width="8" Height="8" Offset="0x1410"/>
+        <Texture Name="gPeehatLeafTopTex" OutName="leaf_top" Format="rgba16" Width="16" Height="32" Offset="0x1490"/>
+        <Texture Name="gPeehatWingTex" OutName="wing" Format="rgba16" Width="8" Height="32" Offset="0x1890"/>
+        <Texture Name="gPeehatUpperBodyTex" OutName="upper_body" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+
+        <!-- Peehat Animations -->
+        <Animation Name="gPeehatLandingAnim" Offset="0x350"/>
+        <Animation Name="gPeehatFlyingAnim" Offset="0x5C4"/>
+        <Animation Name="gPeehatRecoilAnim" Offset="0x844"/>
+        <Animation Name="gPeehatRisingAnim" Offset="0x9C4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_po_composer.xml b/soh/assets/xml/N64_NTSC_12/objects/object_po_composer.xml
new file mode 100644
index 0000000000..ff995efceb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_po_composer.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_po_composer" Segment="6">
+        <Texture Name="object_po_composerTex_001450" OutName="object_po_composerTex_001450" Format="i8" Width="32" Height="64" Offset="0x1450" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0054E0" OutName="object_po_composerTex_0054E0" Format="rgba16" Width="16" Height="16" Offset="0x54E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0056E0" OutName="object_po_composerTex_0056E0" Format="rgba16" Width="16" Height="16" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0058E0" OutName="object_po_composerTex_0058E0" Format="rgba16" Width="16" Height="16" Offset="0x58E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005AE0" OutName="object_po_composerTex_005AE0" Format="rgba16" Width="16" Height="16" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_005CE0" OutName="object_po_composerTex_005CE0" Format="rgba16" Width="16" Height="32" Offset="0x5CE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0060E0" OutName="object_po_composerTex_0060E0" Format="rgba16" Width="16" Height="16" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0062E0" OutName="object_po_composerTex_0062E0" Format="rgba16" Width="16" Height="16" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0064E0" OutName="object_po_composerTex_0064E0" Format="rgba16" Width="16" Height="16" Offset="0x64E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0066E0" OutName="object_po_composerTex_0066E0" Format="rgba16" Width="16" Height="16" Offset="0x66E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_0068E0" OutName="object_po_composerTex_0068E0" Format="rgba16" Width="16" Height="16" Offset="0x68E0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006AE0" OutName="object_po_composerTex_006AE0" Format="rgba16" Width="16" Height="16" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="object_po_composerTex_006CE0" OutName="object_po_composerTex_006CE0" Format="rgba16" Width="16" Height="16" Offset="0x6CE0" AddedByScript="true"/>
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
+        <Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x0708"/>
+        <Animation Name="gPoeComposerFloatAnim" Offset="0x09DC"/>
+        <Animation Name="gPoeComposerAppearAnim" Offset="0x0FE4"/>
+        <Animation Name="gPoeComposerDisappearAnim" Offset="0x1440"/>
+        <DList Name="gPoeComposerSoulDL" Offset="0x1C90"/>
+        <DList Name="gPoeComposerLanternBottomDL" Offset="0x4498"/>
+        <DList Name="gPoeComposerLanternTopDL" Offset="0x4530"/>
+        <DList Name="gPoeComposerLanternDL" Offset="0x45A0"/>
+        <DList Name="gPoeComposerFlatHeadDL" Offset="0x4638"/>
+        <DList Name="gPoeComposerBurnDL" Offset="0x5220"/>
+        <Skeleton Name="gPoeComposerSkel" Type="Flex" LimbType="Standard" Offset="0x6F90"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_po_field.xml b/soh/assets/xml/N64_NTSC_12/objects/object_po_field.xml
new file mode 100644
index 0000000000..78bc0d65ad
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_po_field.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="object_po_field" Segment="6">
+        <Texture Name="object_po_fieldTex_002470" OutName="object_po_fieldTex_002470" Format="rgba16" Width="16" Height="16" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002670" OutName="object_po_fieldTex_002670" Format="rgba16" Width="16" Height="16" Offset="0x2670" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_002870" OutName="object_po_fieldTex_002870" Format="rgba16" Width="32" Height="32" Offset="0x2870" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003070" OutName="object_po_fieldTex_003070" Format="rgba16" Width="16" Height="16" Offset="0x3070" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_003270" OutName="object_po_fieldTex_003270" Format="rgba16" Width="8" Height="8" Offset="0x3270" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0032F0" OutName="object_po_fieldTex_0032F0" Format="rgba16" Width="16" Height="8" Offset="0x32F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0033F0" OutName="object_po_fieldTex_0033F0" Format="rgba16" Width="16" Height="16" Offset="0x33F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0035F0" OutName="object_po_fieldTex_0035F0" Format="rgba16" Width="16" Height="16" Offset="0x35F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_0037F0" OutName="object_po_fieldTex_0037F0" Format="rgba16" Width="16" Height="16" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005AB0" OutName="object_po_fieldTex_005AB0" Format="rgba16" Width="16" Height="16" Offset="0x5AB0" AddedByScript="true"/>
+        <Texture Name="object_po_fieldTex_005CB0" OutName="object_po_fieldTex_005CB0" Format="rgba16" Width="8" Height="8" Offset="0x5CB0" AddedByScript="true"/>
+        <Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
+        <Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>
+        <Animation Name="gPoeFieldFleeAnim" Offset="0x0608"/>
+        <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
+        <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
+        <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
+        <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
+        <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
+        <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
+        <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_po_sisters.xml b/soh/assets/xml/N64_NTSC_12/objects/object_po_sisters.xml
new file mode 100644
index 0000000000..b429be2588
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_po_sisters.xml
@@ -0,0 +1,56 @@
+<Root>
+    <File Name="object_po_sisters" Segment="6">
+        <Texture Name="object_po_sistersTex_0048D8" OutName="object_po_sistersTex_0048D8" Format="rgba16" Width="16" Height="16" Offset="0x48D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_004AD8" OutName="object_po_sistersTex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0052D8" OutName="object_po_sistersTex_0052D8" Format="rgba16" Width="32" Height="16" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0056D8" OutName="object_po_sistersTex_0056D8" Format="rgba16" Width="16" Height="16" Offset="0x56D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058D8" OutName="object_po_sistersTex_0058D8" Format="rgba16" Width="4" Height="4" Offset="0x58D8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0058F8" OutName="object_po_sistersTex_0058F8" Format="rgba16" Width="16" Height="16" Offset="0x58F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005AF8" OutName="object_po_sistersTex_005AF8" Format="rgba16" Width="16" Height="16" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005CF8" OutName="object_po_sistersTex_005CF8" Format="rgba16" Width="8" Height="8" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005D78" OutName="object_po_sistersTex_005D78" Format="rgba16" Width="16" Height="16" Offset="0x5D78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_005F78" OutName="object_po_sistersTex_005F78" Format="rgba16" Width="16" Height="8" Offset="0x5F78" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006078" OutName="object_po_sistersTex_006078" Format="rgba16" Width="16" Height="16" Offset="0x6078" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006278" OutName="object_po_sistersTex_006278" Format="rgba16" Width="8" Height="8" Offset="0x6278" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0062F8" OutName="object_po_sistersTex_0062F8" Format="rgba16" Width="4" Height="4" Offset="0x62F8" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_006318" OutName="object_po_sistersTex_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_007AC0" OutName="object_po_sistersTex_007AC0" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0082C0" OutName="object_po_sistersTex_0082C0" Format="rgba16" Width="8" Height="16" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0083C0" OutName="object_po_sistersTex_0083C0" Format="rgba16" Width="32" Height="32" Offset="0x83C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_008BC0" OutName="object_po_sistersTex_008BC0" Format="rgba16" Width="32" Height="32" Offset="0x8BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_0093C0" OutName="object_po_sistersTex_0093C0" Format="rgba16" Width="32" Height="32" Offset="0x93C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_009BC0" OutName="object_po_sistersTex_009BC0" Format="rgba16" Width="32" Height="32" Offset="0x9BC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00A3C0" OutName="object_po_sistersTex_00A3C0" Format="rgba16" Width="32" Height="32" Offset="0xA3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00ABC0" OutName="object_po_sistersTex_00ABC0" Format="rgba16" Width="32" Height="32" Offset="0xABC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00B3C0" OutName="object_po_sistersTex_00B3C0" Format="rgba16" Width="32" Height="32" Offset="0xB3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00BBC0" OutName="object_po_sistersTex_00BBC0" Format="rgba16" Width="32" Height="32" Offset="0xBBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00C3C0" OutName="object_po_sistersTex_00C3C0" Format="rgba16" Width="32" Height="32" Offset="0xC3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00CBC0" OutName="object_po_sistersTex_00CBC0" Format="rgba16" Width="32" Height="32" Offset="0xCBC0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00D3C0" OutName="object_po_sistersTex_00D3C0" Format="rgba16" Width="32" Height="32" Offset="0xD3C0" AddedByScript="true"/>
+        <Texture Name="object_po_sistersTex_00DBC0" OutName="object_po_sistersTex_00DBC0" Format="rgba16" Width="32" Height="32" Offset="0xDBC0" AddedByScript="true"/>
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x0114"/>
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x0680"/>
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x08C0"/>
+        <Animation Name="gPoeSistersFleeAnim" Offset="0x0A54"/>
+        <Animation Name="gPoeSistersFloatAnim" Offset="0x0D40"/>
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C"/>
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC"/>
+        <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0"/>
+        <DList Name="gPoeSistersMegBodyDL" Offset="0x1DE0"/>
+        <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="gPoeSistersJoelleFaceDL" Offset="0x2EB8"/>
+        <DList Name="gPoeSistersJoelleBodyDL" Offset="0x2F88"/>
+        <DList Name="gPoeSistersBethBodyDL" Offset="0x3628"/>
+        <DList Name="gPoeSistersBethFaceDL" Offset="0x3880"/>
+        <DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
+        <DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
+        <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
+        <DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/> 
+        <DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/> 
+        <DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/> 
+        <DList Name="gPoSistersAmyBlockDL" Offset="0x75A0"/> 
+        <Collision Name="gPoSistersAmyBlockCol" Offset="0x7860"/>
+        <DList Name="gPoSistersAmyBethBlockDL" Offset="0x79E0"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_poh.xml b/soh/assets/xml/N64_NTSC_12/objects/object_poh.xml
new file mode 100644
index 0000000000..be6d6eff4b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_poh.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_poh" Segment="6">
+        <Texture Name="object_pohTex_003010" OutName="object_pohTex_003010" Format="i8" Width="32" Height="64" Offset="0x3010" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003910" OutName="object_pohTex_003910" Format="rgba16" Width="32" Height="16" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="object_pohTex_003D10" OutName="object_pohTex_003D10" Format="rgba16" Width="32" Height="32" Offset="0x3D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004510" OutName="object_pohTex_004510" Format="rgba16" Width="16" Height="16" Offset="0x4510" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004710" OutName="object_pohTex_004710" Format="rgba16" Width="8" Height="8" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004790" OutName="object_pohTex_004790" Format="rgba16" Width="16" Height="16" Offset="0x4790" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004990" OutName="object_pohTex_004990" Format="rgba16" Width="8" Height="8" Offset="0x4990" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004A10" OutName="object_pohTex_004A10" Format="rgba16" Width="8" Height="16" Offset="0x4A10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004B10" OutName="object_pohTex_004B10" Format="rgba16" Width="16" Height="16" Offset="0x4B10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004D10" OutName="object_pohTex_004D10" Format="rgba16" Width="16" Height="16" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="object_pohTex_004F10" OutName="object_pohTex_004F10" Format="rgba16" Width="8" Height="8" Offset="0x4F10" AddedByScript="true"/>
+        <Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
+        <Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>
+        <Animation Name="gPoeFleeAnim" Offset="0x06E0"/>
+        <Animation Name="gPoeFloatAnim" Offset="0x0A60"/>
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4"/>
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0"/>
+        <DList Name="gPoeBurnDL" Offset="0x2608"/>
+        <DList Name="gPoeLanternDL" Offset="0x2D28"/>
+        <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ps.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ps.xml
new file mode 100644
index 0000000000..9f9c894a60
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ps.xml
@@ -0,0 +1,42 @@
+<Root>
+    <File Name="object_ps" Segment="6">
+        <Texture Name="object_psTex_0005B8" OutName="object_psTex_0005B8" Format="rgba16" Width="32" Height="64" Offset="0x5B8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015B8" OutName="object_psTex_0015B8" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_0015F8" OutName="object_psTex_0015F8" Format="rgba16" Width="16" Height="16" Offset="0x15F8" AddedByScript="true"/>
+        <Texture Name="object_psTex_0017F8" OutName="object_psTex_0017F8" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001838" OutName="object_psTex_001838" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001C38" OutName="object_psTex_001C38" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D38" OutName="object_psTex_001D38" Format="i8" Width="8" Height="8" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="object_psTex_001D78" OutName="object_psTex_001D78" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001E78" OutName="object_psTex_001E78" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_001F78" OutName="object_psTex_001F78" Format="rgba16" Width="16" Height="16" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="object_psTex_002178" OutName="object_psTex_002178" Format="rgba16" Width="16" Height="16" Offset="0x2178" AddedByScript="true"/>
+        <Texture Name="object_psTex_002378" OutName="object_psTex_002378" Format="i4" Width="32" Height="32" Offset="0x2378" AddedByScript="true"/>
+        <Texture Name="object_psTex_002578" OutName="object_psTex_002578" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTex_002978" OutName="object_psTex_002978" Format="rgba16" Width="8" Height="16" Offset="0x2978" AddedByScript="true"/>
+        <Texture Name="object_psTex_007180" OutName="object_psTex_007180" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0071C0" OutName="object_psTex_0071C0" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_0075C0" OutName="object_psTex_0075C0" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007600" OutName="object_psTex_007600" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007640" OutName="object_psTex_007640" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTex_007A40" OutName="object_psTex_007A40" Format="rgba16" Width="16" Height="16" Offset="0x7A40" AddedByScript="true"/>
+        <Texture Name="object_psTex_007C40" OutName="object_psTex_007C40" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_0004B0" OutName="object_psTLUT_0004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0" AddedByScript="true"/>
+        <Texture Name="object_psTLUT_005880" OutName="object_psTLUT_005880" Format="rgba16" Width="16" Height="16" Offset="0x5880" AddedByScript="true"/>
+        <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
+        <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
+        <Texture Name="gPoeSellerCarpetTex" OutName="poe_seller_carpet" Format="rgba16" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
+        <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
+        <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
+        <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
+        <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
+        <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
+        <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_pu_box.xml b/soh/assets/xml/N64_NTSC_12/objects/object_pu_box.xml
new file mode 100644
index 0000000000..e1d686e979
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_pu_box.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_pu_box" Segment="6">
+        <DList Name="gBlockSmallDL" Offset="0x0"/>
+        <Collision Name="gBlockSmallCol" Offset="0x350"/>
+        <DList Name="gBlockMediumDL" Offset="0x380"/>
+        <Collision Name="gBlockMediumCol" Offset="0x6D0"/>
+        <DList Name="gBlockTallDL" Offset="0x700"/>
+        <Collision Name="gBlockTallCol" Offset="0xA50"/>
+        <DList Name="gBlockTallestDL" Offset="0xA80"/>
+        <Collision Name="gBlockTallestCol" Offset="0x15D0"/>
+        <Texture Name="gBlockTex" OutName="block" Format="rgba16" Width="32" Height="32" Offset="0xCC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_rd.xml b/soh/assets/xml/N64_NTSC_12/objects/object_rd.xml
new file mode 100644
index 0000000000..22c7d33738
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_rd.xml
@@ -0,0 +1,124 @@
+<Root>
+    <!-- Assets for Gibdos and Redeads -->
+    <File Name="object_rd" Segment="6">
+        <!-- Gibdo Textures -->
+        <Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
+
+        <!-- Gibdo Limb DisplayLists -->
+        <DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
+        <DList Name="gGibdoHeadDL" Offset="0x2D40"/>
+        <DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
+        <DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
+        <DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
+        <DList Name="gGibdoRightHandDL" Offset="0x3220"/>
+        <DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
+        <DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
+        <DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
+        <DList Name="gGibdoRightThighDL" Offset="0x3628"/>
+        <DList Name="gGibdoRightShinDL" Offset="0x3738"/>
+        <DList Name="gGibdoRightFootDL" Offset="0x3830"/>
+        <DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
+        <DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
+        <DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
+
+        <!-- Gidbo Limbs -->
+        <Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
+        <Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
+        <Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
+        <Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
+        <Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
+        <Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
+        <Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
+        <Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
+        <Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
+        <Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
+        <Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
+        <Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
+        <Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
+        <Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
+        <Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
+        <Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
+        <Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
+        <Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
+        <Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
+        <Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
+        <Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
+        <Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
+        <Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
+        <Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
+        <Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
+
+        <!-- Gibdo Skeleton -->
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
+
+        <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
+        <Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
+        <Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
+        <Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
+        <Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
+        <Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
+        <Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
+        <Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
+        <Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
+        <Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
+
+        <!-- Redead Textures -->
+        <Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
+        <Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
+        <Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
+        <Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
+        <Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
+        <Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
+        <Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
+
+        <!-- Redead Limb DisplayLists -->
+        <DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
+        <DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
+        <DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
+        <DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
+        <DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
+        <DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
+        <DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
+        <DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
+        <DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
+        <DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
+        <DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
+        <DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
+        <DList Name="gRedeadRightThighDL" Offset="0xE358"/>
+        <DList Name="gRedeadRightShinDL" Offset="0xE438"/>
+        <DList Name="gRedeadRightFootDL" Offset="0xE500"/>
+
+        <!-- Redead Limbs -->
+        <Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
+        <Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
+        <Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
+        <Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
+        <Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
+        <Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
+        <Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
+        <Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
+        <Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
+        <Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
+        <Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
+        <Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
+        <Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
+        <Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
+        <Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
+        <Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
+        <Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
+        <Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
+        <Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
+        <Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
+        <Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
+        <Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
+        <Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
+        <Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
+        <Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
+
+        <!-- Redead Skeleton -->
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
+
+        <Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_reeba.xml b/soh/assets/xml/N64_NTSC_12/objects/object_reeba.xml
new file mode 100644
index 0000000000..32c697bd9d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_reeba.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_reeba" Segment="6">
+        <Animation Name="object_reeba_Anim_0001E4" Offset="0x1E4"/>
+        <DList Name="object_reeba_DL_000200" Offset="0x200"/>
+        <DList Name="object_reeba_DL_0002D0" Offset="0x2D0"/>
+        <DList Name="object_reeba_DL_0002E0" Offset="0x2E0"/>
+        <DList Name="object_reeba_DL_000430" Offset="0x430"/>
+        <DList Name="object_reeba_DL_000570" Offset="0x570"/>
+        <DList Name="object_reeba_DL_000580" Offset="0x580"/>
+        <DList Name="object_reeba_DL_000760" Offset="0x760"/>
+        <DList Name="object_reeba_DL_0007F8" Offset="0x7F8"/>
+        <DList Name="object_reeba_DL_000808" Offset="0x808"/>
+        <DList Name="object_reeba_DL_0008B8" Offset="0x8B8"/>
+        <DList Name="object_reeba_DL_000950" Offset="0x950"/>
+        <DList Name="object_reeba_DL_000960" Offset="0x960"/>
+        <DList Name="object_reeba_DL_000A10" Offset="0xA10"/>
+        <DList Name="object_reeba_DL_000AB0" Offset="0xAB0"/>
+        <DList Name="object_reeba_DL_000AC0" Offset="0xAC0"/>
+        <DList Name="object_reeba_DL_000B80" Offset="0xB80"/>
+        <DList Name="object_reeba_DL_000C18" Offset="0xC18"/>
+        <DList Name="object_reeba_DL_000C28" Offset="0xC28"/>
+        <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
+        <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
+        <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_relay_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_relay_objects.xml
new file mode 100644
index 0000000000..47b92fcd2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_relay_objects.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="object_relay_objects" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gDampeRaceDoorDL" Offset="0x1A0"/>
+        <DList Name="gWindmillRotatingPlatformDL" Offset="0x1AB0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gWindmillRotatingPlatformTLUT" OutName="windmill_platform_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3F0"/>
+
+        <!-- Textures -->
+        <Texture Name="gWindmillRotatingPlatform1Tex" OutName="windmill_platform_1" Format="ci4" Width="64" Height="64" Offset="0x410" TlutOffset="0x3F0"/>
+        <Texture Name="gWindmillRotatingPlatform2Tex" OutName="windmill_platform_2" Format="rgba16" Width="32" Height="16" Offset="0xC10"/>
+        <Texture Name="gDampeRaceDoorTex" OutName="dampe_race_door" Format="i4" Width="64" Height="128" Offset="0x2630"/>
+
+        <!-- Collision -->
+        <Collision Name="gDampeRaceDoorCol" Offset="0x3C4"/>
+        <Collision Name="gWindmillRotatingPlatformCol" Offset="0x25FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_rl.xml b/soh/assets/xml/N64_NTSC_12/objects/object_rl.xml
new file mode 100644
index 0000000000..2a5ad30f6b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_rl.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="object_rl" Segment="6">
+        <Texture Name="object_rlTex_0033E0" OutName="object_rlTex_0033E0" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Texture Name="object_rlTex_003420" OutName="object_rlTex_003420" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0" AddedByScript="true"/>
+        <Animation Name="object_rl_Anim_00040C" Offset="0x40C"/>
+        <Animation Name="object_rl_Anim_000830" Offset="0x830"/>
+        <Animation Name="object_rl_Anim_000A3C" Offset="0xA3C"/>
+        <DList Name="object_rl_DL_002230" Offset="0x2230"/>
+        <DList Name="object_rl_DL_0023D8" Offset="0x23D8"/>
+        <DList Name="object_rl_DL_0029A0" Offset="0x29A0"/>
+        <DList Name="object_rl_DL_002AA0" Offset="0x2AA0"/>
+        <DList Name="object_rl_DL_002BD8" Offset="0x2BD8"/>
+        <DList Name="object_rl_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
+        <DList Name="object_rl_DL_003058" Offset="0x3058"/>
+        <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
+
+        <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
+        <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
+        <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
+
+        <DList Name="object_rl_DL_005220" Offset="0x5220"/>
+        <Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
+        <Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
+        <Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
+        <Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
+        <Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
+        <Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
+        <Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>
+        <Limb Name="object_rl_Limb_007ABC" LimbType="Standard" Offset="0x7ABC"/>
+        <Limb Name="object_rl_Limb_007AC8" LimbType="Standard" Offset="0x7AC8"/>
+        <Limb Name="object_rl_Limb_007AD4" LimbType="Standard" Offset="0x7AD4"/>
+        <Limb Name="object_rl_Limb_007AE0" LimbType="Standard" Offset="0x7AE0"/>
+        <Limb Name="object_rl_Limb_007AEC" LimbType="Standard" Offset="0x7AEC"/>
+        <Limb Name="object_rl_Limb_007AF8" LimbType="Standard" Offset="0x7AF8"/>
+        <Limb Name="object_rl_Limb_007B04" LimbType="Standard" Offset="0x7B04"/>
+        <Skeleton Name="object_rl_Skel_007B38" Type="Flex" LimbType="Standard" Offset="0x7B38"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_rr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_rr.xml
new file mode 100644
index 0000000000..98726b14bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_rr.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_rr" Segment="6">
+        <DList Name="gLikeLikeDL" Offset="0x470"/>
+        <Texture Name="gLikeLikeBodyPattern1Tex" OutName="body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gLikeLikeBodyPattern2Tex" OutName="body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gLikeLikeHoleTex" OutName="hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_rs.xml b/soh/assets/xml/N64_NTSC_12/objects/object_rs.xml
new file mode 100644
index 0000000000..152b5489e1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_rs.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="object_rs" Segment="6">
+        <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
+        <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
+        <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
+        <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
+        <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
+        <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
+        <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
+        <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
+        <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
+        <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperSkinTex" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEarTex" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperTattooTex" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperFingersTex" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
+        <Texture Name="gBombchuShopkeeperVestTex" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
+        <Texture Name="gBombchuShopkeeperTorsoTex" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
+        <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
+        <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
+        <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
+        <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
+        <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
+        <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
+        <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
+        <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
+        <Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ru1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ru1.xml
new file mode 100644
index 0000000000..3d413619ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ru1.xml
@@ -0,0 +1,83 @@
+<Root>
+    <File Name="object_ru1" Segment="6">
+        <Animation Name="gRutoChildWaitHandsBehindBackAnim" Offset="0x690"/>
+        <Animation Name="gRutoChildWaitHandsOnHipsAnim" Offset="0xE54"/>
+        <Animation Name="gRutoChildTransitionHandsOnHipToCrossArmsAndLegsAnim" Offset="0x1488"/>
+        <Animation Name="gRutoChildWaitSittingAnim" Offset="0x2058"/>
+        <Animation Name="gRutoChildWaitInBlueWarpAnim" Offset="0x2990"/>
+        <Animation Name="gRutoChildBringHandsDownAnim" Offset="0x2EC0"/>
+        <Animation Name="gRutoChildHoldArmsUpAnim" Offset="0x3608"/>
+        <Animation Name="gRutoChildBringArmsUpAnim" Offset="0x3784"/>
+        <Animation Name="gRutoChildTurnAroundAnim" Offset="0x4074"/>
+        <Animation Name="gRutoChildSquirmAnim" Offset="0x4350"/>
+        <Animation Name="gRutoChildSeesSapphireAnim" Offset="0x4648"/>
+        <Animation Name="gRutoChildShutterAnim" Offset="0x4BF0"/>
+        <Animation Name="gRutoChildWalkToAndHoldUpSapphireAnim" Offset="0x63F4"/>
+        <Animation Name="gRutoChildSittingAnim" Offset="0x6B9C"/>
+        <Animation Name="gRutoChildSitAnim" Offset="0x7534"/>
+        <Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
+        <Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
+        <Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
+        <Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
+        <Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
+        <Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
+        <Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>
+
+        <DList Name="gRutoChildTorsoDL" Offset="0xC0A0"/>
+        <DList Name="gRutoChildLeftThighDL" Offset="0xC188"/>
+        <DList Name="gRutoChildLeftShinDL" Offset="0xC3D8"/>
+        <DList Name="gRutoChildLeftFootDL" Offset="0xC630"/>
+        <DList Name="gRutoChildRightThighDL" Offset="0xC7D0"/>
+        <DList Name="gRutoChildRightShinDL" Offset="0xCA20"/>
+        <DList Name="gRutoChildRightFootDL" Offset="0xCC78"/>
+        <DList Name="gRutoChildChestDL" Offset="0xCE18"/>
+        <DList Name="gRutoChildRightUpperArmDL" Offset="0xD0B8"/>
+        <DList Name="gRutoChildRightFinDL" Offset="0xD308"/>
+        <DList Name="gRutoChildRightHandDL" Offset="0xD5E0"/>
+        <DList Name="gRutoChildLeftUpperArmDL" Offset="0xD870"/>
+        <DList Name="gRutoChildLeftFinDL" Offset="0xDAC0"/>
+        <DList Name="gRutoChildLeftHandDL" Offset="0xDDA8"/>
+        <DList Name="gRutoChildHeadDL" Offset="0x119F8"/>
+        
+        <Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
+        <Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
+        
+        <Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
+        <Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
+
+        <Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
+
+        <Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
+        <Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
+
+        <Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
+        <Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>
+        <Texture Name="gRutoChildUnkHeadCircleTex" OutName="tex_0000F038" Format="rgba16" Width="16" Height="16" Offset="0xF038"/> <!-- TODO rename me-->
+        <Texture Name="gRutoChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gRutoChildCircleGradientTex" OutName="circle_gradient" Format="rgba16" Width="16" Height="16" Offset="0x12400"/>
+        
+        <Skeleton Name="gRutoChildSkel" Type="Flex" LimbType="Standard" Offset="0x12700"/>
+        
+        <Limb Name="gRutoChildRootLimb" LimbType="Standard" Offset="0x12600"/>
+        <Limb Name="gRutoChildLeftThighLimb" LimbType="Standard" Offset="0x1260C"/>
+        <Limb Name="gRutoChildLeftShinLimb" LimbType="Standard" Offset="0x12618"/>
+        <Limb Name="gRutoChildLeftFootLimb" LimbType="Standard" Offset="0x12624"/>
+        <Limb Name="gRutoChildRightThighLimb" LimbType="Standard" Offset="0x12630"/>
+        <Limb Name="gRutoChildRightShinLimb" LimbType="Standard" Offset="0x1263C"/>
+        <Limb Name="gRutoChildRightFootLimb" LimbType="Standard" Offset="0x12648"/>
+        <Limb Name="gRutoChildChestLimb" LimbType="Standard" Offset="0x12654"/>
+        <Limb Name="gRutoChildLeftUpperArmLimb" LimbType="Standard" Offset="0x12660"/>
+        <Limb Name="gRutoChildLeftFinLimb" LimbType="Standard" Offset="0x1266C"/>
+        <Limb Name="gRutoChildLeftHandLimb" LimbType="Standard" Offset="0x12678"/>
+        <Limb Name="gRutoChildRightUpperArmLimb" LimbType="Standard" Offset="0x12684"/>
+        <Limb Name="gRutoChildRightFinLimb" LimbType="Standard" Offset="0x12690"/>
+        <Limb Name="gRutoChildRightHandLimb" LimbType="Standard" Offset="0x1269C"/>
+        <Limb Name="gRutoChildHeadLimb" LimbType="Standard" Offset="0x126A8"/>
+        <Limb Name="gRutoChildTorsoLimb" LimbType="Standard" Offset="0x126B4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ru2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ru2.xml
new file mode 100644
index 0000000000..fedf37d48b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ru2.xml
@@ -0,0 +1,92 @@
+<Root>
+    <File Name="object_ru2" Segment="6">
+        <Texture Name="object_ru2Tex_0055C0" OutName="object_ru2Tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0" AddedByScript="true"/>
+        <Texture Name="object_ru2Tex_0056C0" OutName="object_ru2Tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" AddedByScript="true"/>
+        <!-- Adult Ruto Skeleton -->
+        <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
+
+        <!-- Adult Ruto Limbs -->
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
+
+        <!-- Adult Ruto Limb DisplayLists -->
+        <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
+        <DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
+        <DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
+        <DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
+        <DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
+        <DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
+        <DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
+        <DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
+        <DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
+        <DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
+        <DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
+        <DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
+        <DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
+        <DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
+        <DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
+        <DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
+        <DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
+        <DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
+        <DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
+        <DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
+        <DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
+        
+        <!-- Adult Ruto Palettes -->
+        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+
+        <!-- Adult Ruto Eye Textures -->
+        <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
+        <Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
+        <Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
+        
+        <!-- Adult Ruto Textures -->
+        <Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
+        <Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
+        <Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
+        <Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
+        <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+
+        <!-- Adult Ruto Animations -->
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_sa.xml b/soh/assets/xml/N64_NTSC_12/objects/object_sa.xml
new file mode 100644
index 0000000000..ec45ac961d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_sa.xml
@@ -0,0 +1,100 @@
+<Root>
+    <File Name="object_sa" Segment="6">
+        <Texture Name="object_saTex_002530" OutName="object_saTex_002530" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0" AddedByScript="true"/>
+        <Skeleton Name="gSariaSkel" Type="Flex" LimbType="Standard" Offset="0xB1A0"/>
+        
+        <Limb Name="gSariaRootLimb" LimbType="Standard" Offset="0xB0A0"/>
+        <Limb Name="gSariaWaistLimb" LimbType="Standard" Offset="0xB0AC"/>
+        <Limb Name="gSariaLeftThighLimb" LimbType="Standard" Offset="0xB0B8"/>
+        <Limb Name="gSariaLeftShinLimb" LimbType="Standard" Offset="0xB0C4"/>
+        <Limb Name="gSariaLeftFootLimb" LimbType="Standard" Offset="0xB0D0"/>
+        <Limb Name="gSariaRightThighLimb" LimbType="Standard" Offset="0xB0DC"/>
+        <Limb Name="gSariaRightShinLimb" LimbType="Standard" Offset="0xB0E8"/>
+        <Limb Name="gSariaRightFootLimb" LimbType="Standard" Offset="0xB0F4"/>
+        <Limb Name="gSariaRightChestLimb" LimbType="Standard" Offset="0xB100"/>
+        <Limb Name="gSariaLeftShoulderLimb" LimbType="Standard" Offset="0xB10C"/>
+        <Limb Name="gSariaLeftArmLimb" LimbType="Standard" Offset="0xB118"/>
+        <Limb Name="gSariaLeftHandLimb" LimbType="Standard" Offset="0xB124"/>
+        <Limb Name="gSariaRightShoulderLimb" LimbType="Standard" Offset="0xB130"/>
+        <Limb Name="gSariaRightArmLimb" LimbType="Standard" Offset="0xB13C"/>
+        <Limb Name="gSariaRightHandLimb" LimbType="Standard" Offset="0xB148"/>
+        <Limb Name="gSariaHeadLimb" LimbType="Standard" Offset="0xB154"/>
+
+        <Animation Name="gSariaSealGanonAnim" Offset="0x1334"/>
+        <Animation Name="gSariaOcarinaToMouthAnim" Offset="0x1D50"/>
+        <Animation Name="gSariaWaitArmsToSideAnim" Offset="0x21D8"/>
+        <Animation Name="gSariaPlayingOcarinaAnim" Offset="0xBAEC"/>
+        <Animation Name="gSariaStopPlayingOcarinaAnim" Offset="0xC500"/>
+        <Animation Name="gSariaLinkLearnedSariasSongAnim" Offset="0xCFD8"/>
+        <Animation Name="gSariaReturnToOcarinaAnim" Offset="0xD7E8"/>
+        <Animation Name="gSariaGiveForestMedallionAnim" Offset="0xDF80"/>
+        <Animation Name="gSariaGiveForestMedallionStandAnim" Offset="0xE500"/>
+        <Animation Name="gSariaLookUpArmExtendedAnim" Offset="0xE908"/>
+        <Animation Name="gSariaRunAnim" Offset="0xEBB0"/>
+        <Animation Name="gSariaWaveAnim" Offset="0xF1D4"/>
+        <Animation Name="gSariaSitting1Anim" Offset="0xF580"/>
+        <Animation Name="gSariaSitting2Anim" Offset="0xFCE0"/>
+        <Animation Name="gSariaSitting3Anim" Offset="0xFFD4"/>
+        <Animation Name="gSariaLookOverShoulderAnim" Offset="0x10C44"/>
+        <Animation Name="gSariaWaitOnBridgeAnim" Offset="0x1113C"/>
+        <Animation Name="gSariaTransitionHandsSideToBackAnim" Offset="0x11580"/>
+        <Animation Name="gSariaHandsOutAnim" Offset="0x1186C"/>
+        <Animation Name="gSariaTransitionHandsSideToHipsAnim" Offset="0x11C38"/>
+        <Animation Name="gSariaHandsBehindBackWaitAnim" Offset="0x12100"/>
+        <Animation Name="gSariaTransitionHandsSideToChestToSideAnim" Offset="0x1291C"/>
+        <Animation Name="gSariaRightArmExtendedWaitAnim" Offset="0x13008"/>
+        <Animation Name="gSariaGiveLinkOcarinaAnim" Offset="0x135EC"/>
+        <Animation Name="gSariaHoldOutOcarinaAnim" Offset="0x13CD8"/>
+        <Animation Name="gSariaHoldOcarinaAnim" Offset="0x140BC"/>
+        <Animation Name="gSariaStandHandsOnHipsAnim" Offset="0x14470"/>
+        <Animation Name="gSariaExtendRightArmAnim" Offset="0x14850"/>
+        <Animation Name="gSariaHandsOnFaceAnim" Offset="0x15220"/>
+
+        <DList Name="gSariaHeadDL" Offset="0x6BF8"/>
+        <DList Name="gSariaLeftHandDL" Offset="0x7900"/>
+        <DList Name="gSariaRightHandDL" Offset="0x7A40"/>
+        <DList Name="gSariaRightHandAndOcarinaDL" Offset="0x7B80"/>
+        <DList Name="gSariaChestDL" Offset="0x9918"/>
+        <DList Name="gSariaRightShoulderDL" Offset="0x9AA8"/>
+        <DList Name="gSariaRightArmDL" Offset="0x9C70"/>
+        <DList Name="gSariaLeftShoulderDL" Offset="0x9DA8"/>
+        <DList Name="gSariaLeftArmDL" Offset="0x9F70"/>
+        <DList Name="gSariaWaistDL" Offset="0xA0A8"/>
+        <DList Name="gSariaRightThighDL" Offset="0xA300"/>
+        <DList Name="gSariaRightShinDL" Offset="0xA550"/>
+        <DList Name="gSariaRightFootDL" Offset="0xA810"/>
+        <DList Name="gSariaLeftThighDL" Offset="0xA9D0"/>
+        <DList Name="gSariaLeftShinDL" Offset="0xAC20"/>
+        <DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
+
+        <Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
+        <Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
+        <Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
+        <Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
+
+        <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/> 
+        <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
+        <Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
+        <Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
+        <Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
+        <Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
+        <Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_sb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_sb.xml
new file mode 100644
index 0000000000..64d3bb005a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_sb.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_sb" Segment="6">
+        <Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
+        <Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>
+        <Animation Name="object_sb_Anim_000124" Offset="0x124"/>
+        <Animation Name="object_sb_Anim_000194" Offset="0x194"/>
+        <Blob Name="object_sb_Blob_0001A4" Size="0x49C" Offset="0x1A4"/>
+        <Blob Name="object_sb_Blob_000840" Size="0x3C0" Offset="0x840"/>
+        <DList Name="object_sb_DL_000D80" Offset="0xD80"/>
+        <DList Name="object_sb_DL_000E70" Offset="0xE70"/>
+        <Texture Name="object_sb_Tex_001020" OutName="tex_00001020" Format="rgba16" Width="32" Height="32" Offset="0x1020"/>
+        <Texture Name="object_sb_Tex_001820" OutName="tex_00001820" Format="rgba16" Width="8" Height="16" Offset="0x1820"/>
+        <Texture Name="object_sb_Tex_001920" OutName="tex_00001920" Format="rgba16" Width="8" Height="8" Offset="0x1920"/>
+        <Texture Name="object_sb_Tex_0019A0" OutName="tex_000019A0" Format="rgba16" Width="8" Height="8" Offset="0x19A0"/>
+        <Texture Name="object_sb_Tex_001A20" OutName="tex_00001A20" Format="rgba16" Width="8" Height="8" Offset="0x1A20"/>
+        <DList Name="object_sb_DL_0025B0" Offset="0x25B0"/>
+        <DList Name="object_sb_DL_002858" Offset="0x2858"/>
+        <Texture Name="object_sb_Tex_002AF0" OutName="tex_00002AF0" Format="rgba16" Width="8" Height="8" Offset="0x2AF0"/>
+        <Limb Name="object_sb_Limb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="object_sb_Limb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="object_sb_Limb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="object_sb_Limb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="object_sb_Limb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="object_sb_Limb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="object_sb_Limb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="object_sb_Limb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" Offset="0x2BF0"/>
+        <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_sd.xml b/soh/assets/xml/N64_NTSC_12/objects/object_sd.xml
new file mode 100644
index 0000000000..fb58428c3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_sd.xml
@@ -0,0 +1,70 @@
+<Root>
+    <File Name="object_sd" Segment="6">
+        <Skeleton Name="gEnHeishiSkel" Type="Normal" LimbType="Standard" Offset="0xBAC8"/>
+        <Limb Name="gEnHeishiRootLimb" LimbType="Standard" Offset="0xB9C8"/>
+        <Limb Name="gEnHeishiTorsoLimb" LimbType="Standard" Offset="0xB9D4"/>
+        <Limb Name="gEnHeishiLeftThighLimb" LimbType="Standard" Offset="0xB9E0"/>
+        <Limb Name="gEnHeishiLeftShinLimb" LimbType="Standard" Offset="0xB9EC"/>
+        <Limb Name="gEnHeishiLeftFootLimb" LimbType="Standard" Offset="0xB9F8"/>
+        <Limb Name="gEnHeishiRightThighLimb" LimbType="Standard" Offset="0xBA04"/>
+        <Limb Name="gEnHeishiRightShinLimb" LimbType="Standard" Offset="0xBA10"/>
+        <Limb Name="gEnHeishiRightFootLimb" LimbType="Standard" Offset="0xBA1C"/>
+        <Limb Name="gEnHeishiChestLimb" LimbType="Standard" Offset="0xBA28"/>
+        <Limb Name="gEnHeishiLeftUpperArmLimb" LimbType="Standard" Offset="0xBA34"/>
+        <Limb Name="gEnHeishiLeftArmLimb" LimbType="Standard" Offset="0xBA40"/>
+        <Limb Name="gEnHeishiLeftHandLimb" LimbType="Standard" Offset="0xBA4C"/>
+        <Limb Name="gEnHeishiRightUpperArmLimb" LimbType="Standard" Offset="0xBA58"/>
+        <Limb Name="gEnHeishiRightArmLimb" LimbType="Standard" Offset="0xBA64"/>
+        <Limb Name="gEnHeishiRightHandLimb" LimbType="Standard" Offset="0xBA70"/>
+        <Limb Name="gEnHeishiRightHeadLimb" LimbType="Standard" Offset="0xBA7C"/>
+
+        <Animation Name="gEnHeishiSlamSpearAnim" Offset="0x5500"/>
+        <Animation Name="gEnHeishiWalkAnim" Offset="0x5880"/>
+        <Animation Name="gEnHeishiIdleAnim" Offset="0x5C30"/>
+        <Animation Name="gEnHeishiDyingGuardTalkAnim" Offset="0xC6C8"/>
+        <Animation Name="gEnHeishiDyingGuardDieAnim" Offset="0xC374"/>
+        <Animation Name="gEnHeishiDyingGuardAnim_00C444" Offset="0xC444"/>
+
+        <DList Name="gHeishiKingGuardDL" Offset="0x2C10"/>
+        <DList Name="gEnHeishiHeadDL" Offset="0xA030"/>
+        <DList Name="gEnHeishiTorsoArmorDL" Offset="0xA440"/>
+        <DList Name="gEnHeishiTorsoDL" Offset="0xA6F8"/><!--Belt?-->
+        <DList Name="gEnHeishiRightFootDL" Offset="0xA848"/>
+        <DList Name="gEnHeishiLeg1DL" Offset="0xA930"/>
+        <DList Name="gEnHeishiUpperLeg1DL" Offset="0xAAC0"/>
+        <DList Name="gEnHeishiSpearDL" Offset="0xAC10"/>
+        <DList Name="gEnHeishiLowerRightArmDL" Offset="0xAEC0"/>
+        <DList Name="gEnHeishiUpperArmDL" Offset="0xB050"/>
+        <DList Name="gEnHeishiLeftFootDL" Offset="0xB158"/>
+        <DList Name="gEnHeishiLeftShinDL" Offset="0xB240"/>
+        <DList Name="gEnHeishiLeftThighDL" Offset="0xB3D0"/>
+        <DList Name="gEnHeishiHandDL" Offset="0xB520"/>
+        <DList Name="gEnHeishiLeftArmDL" Offset="0xB730"/>
+        <DList Name="gEnHeishiUpperLeftArmDL" Offset="0xB8C0"/>
+
+        <!--King Guard Textures-->
+        <Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
+        <Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
+        <Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
+        <Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
+        <Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
+        
+        <!--Normal Guard Textures-->
+        <Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
+        <Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
+        <Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
+        <Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
+        <Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_shop_dungen.xml b/soh/assets/xml/N64_NTSC_12/objects/object_shop_dungen.xml
new file mode 100644
index 0000000000..594c43d390
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_shop_dungen.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_shop_dungen" Segment="6">
+        <DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
+        <Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
+        <Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
+        <Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
+        <DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
+        <Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_shopnuts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_shopnuts.xml
new file mode 100644
index 0000000000..7065f8941a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_shopnuts.xml
@@ -0,0 +1,67 @@
+<Root>
+    <File Name="object_shopnuts" Segment="6">
+        <!-- Business Scrub Skeleton -->
+        <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
+
+        <!-- Business Scrub Limbs -->
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
+
+        <!-- Business Scrub Limb DisplayLists -->
+        <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
+        <DList Name="gBusinessScrubLeftThighDL" Offset="0x2640"/>
+        <DList Name="gBusinessScrubLeftShinDL" Offset="0x2570"/>
+        <DList Name="gBusinessScrubLeftFootDL" Offset="0x2488"/>
+        <DList Name="gBusinessScrubRightThighDL" Offset="0x23D8"/>
+        <DList Name="gBusinessScrubRightShinDL" Offset="0x2308"/>
+        <DList Name="gBusinessScrubRightFootDL" Offset="0x2220"/>
+        <DList Name="gBusinessScrubTopLeafDL" Offset="0x3D30"/>
+        <DList Name="gBusinessScrubNoseDL" Offset="0x3B68"/>
+        <DList Name="gBusinessScrubLeftUpperArmDL" Offset="0x2170"/>
+        <DList Name="gBusinessScrubLeftForearmDL" Offset="0x20A0"/>
+        <DList Name="gBusinessScrubLeftHandDL" Offset="0x1FA8"/>
+        <DList Name="gBusinessScrubRightUpperArmDL" Offset="0x1EF8"/>
+        <DList Name="gBusinessScrubRightForearmDL" Offset="0x1E28"/>
+        <DList Name="gBusinessScrubRightHandDL" Offset="0x1D30"/>
+        <DList Name="gBusinessScrubEyesDL" Offset="0x3AD0"/>
+        <DList Name="gBusinessScrubBodyDL" Offset="0x3930"/>
+
+        <!-- Business Scrub Textures -->
+        <Texture Name="gBusinessScrubBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="gBusinessScrubNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="gBusinessScrubNostrilTex" OutName="nostril" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="gBusinessScrubEyeTex" OutName="eye" Format="rgba16" Width="8" Height="8" Offset="0x29F0"/>
+        <Texture Name="gBusinessScrubLeafStemTex" OutName="leaf_stem" Format="rgba16" Width="8" Height="8" Offset="0x2A70"/>
+        <Texture Name="gBusinessScrubLeafTex" OutName="leaf" Format="rgba16" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gBusinessScrubDekuNutTex" OutName="deku_nut" Format="rgba16" Width="16" Height="16" Offset="0x3DD8"/>
+
+        <!-- Other Business Scrub DisplayLists -->
+        <DList Name="gBusinessScrubDekuNutDL" Offset="0x4008"/>
+
+        <!-- Business Scrub Animations -->
+        <Animation Name="gBusinessScrubAnim_1EC" Offset="0x1EC"/>
+        <Animation Name="gBusinessScrubAnim_39C" Offset="0x39C"/>
+        <Animation Name="gBusinessScrubRotateAnim" Offset="0x764"/>
+        <Animation Name="gBusinessScrubNervousTransitionAnim" Offset="0x9A0"/>
+        <Animation Name="gBusinessScrubLookAroundAnim" Offset="0xBA0"/>
+        <Animation Name="gBusinessScrubNervousIdleAnim" Offset="0x1108"/>
+        <Animation Name="gBusinessScrubAnim_139C" Offset="0x139C"/>
+        <Animation Name="gBusinessScrubLeaveBurrowAnim" Offset="0x4404"/>
+        <Animation Name="gBusinessScrubAnim_4574" Offset="0x4574"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_siofuki.xml b/soh/assets/xml/N64_NTSC_12/objects/object_siofuki.xml
new file mode 100644
index 0000000000..a23240a728
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_siofuki.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_siofuki" Segment="6">
+        <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/>
+        <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_sk2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_sk2.xml
new file mode 100644
index 0000000000..f2e7ef6d89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_sk2.xml
@@ -0,0 +1,130 @@
+<Root>
+    <File Name="object_sk2" Segment="6">
+        <!-- Stalfos DLists -->
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
+
+        <!-- Stalfos textures -->
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
+        <!-- Also used for shoulder armor, helm and sword hilt -->
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
+
+        <!-- Stalfos limbs and skeleton -->
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+
+        <!-- Stalfos Animations -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_skb.xml b/soh/assets/xml/N64_NTSC_12/objects/object_skb.xml
new file mode 100644
index 0000000000..5b5efb4848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_skb.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="object_skb" Segment="6">
+        <!-- Stalchild skeleton -->
+        <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
+
+        <!-- Stalchild Limbs -->
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
+
+        <!-- Stalchild DisplayLists -->
+        <DList Name="gStalchildHeadDL" Offset="0x3230"/>
+        <DList Name="gStalchildJawDL" Offset="0x3598"/>
+        <DList Name="gStalchildRibCageDL" Offset="0x3640"/>
+        <DList Name="gStalchildSpineDL" Offset="0x3708"/>
+        <DList Name="gStalchildWaistDL" Offset="0x37A0"/>
+        <DList Name="gStalchildLeftHumerusDL" Offset="0x38A8"/>
+        <DList Name="gStalchildLeftForearmDL" Offset="0x3968"/>
+        <DList Name="gStalchildLeftHandDL" Offset="0x3A10"/>
+        <DList Name="gStalchildRightHumerusDL" Offset="0x3AD8"/>
+        <DList Name="gStalchildRightForearmDL" Offset="0x3B98"/>
+        <DList Name="gStalchildRightHandDL" Offset="0x3C40"/>
+        <DList Name="gStalchildLeftFemurDL" Offset="0x3D08"/>
+        <DList Name="gStalchildLeftShinDL" Offset="0x3DA0"/>
+        <DList Name="gStalchildLeftFootDL" Offset="0x3E48"/>
+        <DList Name="gStalchildRightFemurDL" Offset="0x3EE8"/>
+        <DList Name="gStalchildRightShinDL" Offset="0x3F80"/>
+        <DList Name="gStalchildRightFootDL" Offset="0x4028"/>
+
+        <!-- Stalchild Textures -->
+        <Texture Name="gStalchildWaistTex" OutName="stalchild_waist" Format="rgba16" Width="16" Height="16" Offset="0x18A0"/>
+        <Texture Name="gStalchildRibCageTex" OutName="stalchild_rib_cage" Format="rgba16" Width="8" Height="16" Offset="0x1AA0"/>
+        <Texture Name="gStalchildHeadTex" OutName="stalchild_head" Format="rgba16" Width="8" Height="8" Offset="0x1BA0"/>
+        <Texture Name="gStalchildBoneTex" OutName="stalchild_bone" Format="rgba16" Width="8" Height="8" Offset="0x1CA0"/>
+        <Texture Name="gStalchildNostrilTex" OutName="stalchild_nostril" Format="rgba16" Width="8" Height="8" Offset="0x1C20"/>
+        <Texture Name="gStalchildHandAndFeetTex" OutName="stalchild_hand_and_feet" Format="rgba16" Width="8" Height="16" Offset="0x1D20"/>
+        <Texture Name="gStalchildTeethTex" OutName="stalchild_teeth" Format="rgba16" Width="16" Height="8" Offset="0x1E20"/>
+        <Texture Name="gStalchildEyeSocketTex" OutName="stalchild_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x1F20"/>
+        <Texture Name="gStalchildEyeTex" OutName="stalchild_eye" Format="rgba16" Width="8" Height="8" Offset="0x2120"/>
+
+        <!-- Stalchild animations -->
+        <Animation Name="gStalchildUncurlingAnim" Offset="0x1854"/>
+        <Animation Name="gStalchildDyingAnim" Offset="0x9DC"/>
+        <Animation Name="gStalchildDamagedAnim" Offset="0xD98"/>
+        <Animation Name="gStalchildWalkingAnim" Offset="0x47E0"/>
+        <Animation Name="gStalchildAttackingAnim" Offset="0x460"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_skj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_skj.xml
new file mode 100644
index 0000000000..74548e5185
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_skj.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_skj" Segment="6">
+        <Texture Name="object_skjTex_005300" OutName="object_skjTex_005300" Format="rgba16" Width="16" Height="16" Offset="0x5300" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005500" OutName="object_skjTex_005500" Format="rgba16" Width="16" Height="16" Offset="0x5500" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005700" OutName="object_skjTex_005700" Format="rgba16" Width="16" Height="16" Offset="0x5700" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005900" OutName="object_skjTex_005900" Format="rgba16" Width="16" Height="16" Offset="0x5900" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B00" OutName="object_skjTex_005B00" Format="rgba16" Width="8" Height="8" Offset="0x5B00" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005B80" OutName="object_skjTex_005B80" Format="rgba16" Width="16" Height="16" Offset="0x5B80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005D80" OutName="object_skjTex_005D80" Format="rgba16" Width="4" Height="4" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="object_skjTex_005DA0" OutName="object_skjTex_005DA0" Format="ia16" Width="8" Height="8" Offset="0x5DA0" AddedByScript="true"/>
+        <DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
+        <DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
+
+        <Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
+        <Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
+        <Limb Name="gSkullKidUnkLimb_5E38" LimbType="Standard" Offset="0x5E38"/>
+        <Limb Name="gSkullKidLeftUpperLegLimb" LimbType="Standard" Offset="0x5E44"/>
+        <Limb Name="gSkullKidLeftLowerLegLimb" LimbType="Standard" Offset="0x5E50"/>
+        <Limb Name="gSkullKidLeftFootLimb" LimbType="Standard" Offset="0x5E5C"/>
+        <Limb Name="gSkullKidRightUpperLegLimb" LimbType="Standard" Offset="0x5E68"/>
+        <Limb Name="gSkullKidRightLowerLegLimb" LimbType="Standard" Offset="0x5E74"/>
+        <Limb Name="gSkullKidRightFootLimb" LimbType="Standard" Offset="0x5E80"/>
+        <Limb Name="gSkullKidChestAndClothesLimb" LimbType="Standard" Offset="0x5E8C"/>
+        <Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
+        <Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
+        <Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
+        <Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
+        <Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
+        <Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
+        <Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
+        <Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
+
+        <!--Limb DLists-->
+        <DList Name="gSkullKidLeftUpperLegDL" Offset="0x3B90"/>
+        <DList Name="gSkullKidLeftLowerLegDL" Offset="0x3C88"/>
+        <DList Name="gSkullKidLeftFootDL" Offset="0x3A28"/>
+        <DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
+        <DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
+        <DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
+        <DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
+        <DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
+        <DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
+        <DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
+        <DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
+        <DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
+        <DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
+        <DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
+        <DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
+
+        <Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
+        <Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
+        <Animation Name="gSkullKidPlayFluteAnim" Offset="0x0E10"/>
+        <Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
+        <Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
+        <Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
+        <Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
+        <Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
+        <Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
+        <Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>
+
+        <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
+        <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
+        <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <!--Unaccounted blocks larger than the padding of a file-->
+        <Blob Name="gSKJunaccounted_52C" Size="0x24" Offset="0x52C"/>
+        <Blob Name="gSKJunaccounted_E20" Size="0x30" Offset="0xE20"/>
+        <Blob Name="gSKJunaccounted_EAA8" Size="0x48" Offset="0x6AA8"/>
+        <Blob Name="gSKJunaccounted_ED94" Size="0x1C" Offset="0x6D94"/>
+        <Blob Name="gSKJunaccounted_7138" Size="0x18" Offset="0x7138"/>
+        <Blob Name="gSKJunaccounted_8184" Size="0x6C" Offset="0x8184"/>
+        <Blob Name="gSKJunaccounted_8BAC" Size="0x54" Offset="0x8BAC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot00_break.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot00_break.xml
new file mode 100644
index 0000000000..d3be88315f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot00_break.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot00_break" Segment="6">
+        <DList Name="gBrokenDrawbridgeDL" Offset="0x440"/>
+        <Texture Name="gBrokenDrawbridgeBoltTex" OutName="broken_drawbridge_bolt" Format="rgba16" Width="32" Height="32" Offset="0xB20"/>
+        <Texture Name="gBrokenDrawbridgeDirtTex" OutName="broken_drawbridge_dirt" Format="rgba16" Width="16" Height="16" Offset="0x1320"/>
+        <Texture Name="gBrokenDrawbridgeChainTex" OutName="broken_drawbridge_chain" Format="rgba16" Width="8" Height="16" Offset="0x1520"/>
+        <Collision Name="gBrokenDrawbridgeCol" Offset="0x908"/>
+
+        <DList Name="gBarbedWireFenceDL" Offset="0x980"/>
+        <Texture Name="gBarbedWireFenceTex" OutName="barbed_wire_fence" Format="rgba16" Width="32" Height="32" Offset="0x1620"/>  
+        <Collision Name="gBarbedWireFenceCol" Offset="0xAF0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot00_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot00_objects.xml
new file mode 100644
index 0000000000..10fb13aeac
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot00_objects.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_spot00_objects" Segment="6">
+        <!-- Hyrule Field Castle Drawbridge -->
+        <DList Name="gHyruleFieldCastleDrawbridgeDL" Offset="0x0430"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeWoodTex" OutName="drawbridge_wood" Format="rgba16" Width="32" Height="64" Offset="0x0610"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeBoltDL" OutName="drawbridge_bolt" Format="rgba16" Width="16" Height="16" Offset="0x1A10"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeCol" Offset="0x05E0"/>
+
+        <!-- Hyrule Field Castle Drawbridge Chains -->
+        <DList Name="gHyruleFieldCastleDrawbridgeChainsDL" Offset="0x00C0"/>
+        <Texture Name="gHyruleFieldCastleDrawbridgeChainsTex" OutName="drawbridge_chains" Format="rgba16" Width="16" Height="32" Offset="0x1610"/>
+        <Collision Name="gHyruleFieldCastleDrawbridgeChainsCol" Offset="0x0280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoya.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoya.xml
new file mode 100644
index 0000000000..d44b944e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoya.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_spot01_matoya" Segment="6">
+        <!-- Kakariko Shooting Gallery -->
+        <DList Name="gKakarikoShootingGalleryDL" Offset="0x1528"/>
+        <DList Name="gKakarikoShootingGallerySignDL" Offset="0x2780"/>
+        <Texture Name="gKakarikoShootingGalleryRoofEdgeTex" OutName="shooting_gallery_roof_edge" Format="ci8" Width="32" Height="32" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryRoofTex" OutName="shooting_gallery_roof" Format="ci8" Width="16" Height="32" Offset="0x608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryDoorShadowTex" OutName="shooting_gallery_door_shadow" Format="ci8" Width="16" Height="32" Offset="0x808" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGalleryWallTex" OutName="shooting_gallery_wall" Format="ci8" Width="32" Height="64" Offset="0xA08" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoShootingGallerySignTex" OutName="shooting_gallery_sign" Format="rgba16" Width="32" Height="32" Offset="0x1F40"/>
+        <Collision Name="gKakarikoShootingGalleryCol" Offset="0x1A38"/>
+
+        <!-- Kakariko Potion Shop -->
+        <DList Name="gKakarikoPotionShopSignDL" Offset="0x1EB0"/>
+        <Texture Name="gKakarikoPotionShopSignTex" OutName="potion_shop_sign" Format="rgba16" Width="32" Height="16" Offset="0x1A70"/>
+
+        <!-- Kakariko Bazaar -->
+        <DList Name="gKakarikoBazaarSignDL" Offset="0x3078"/>
+        <Texture Name="gKakarikoBazaarSignTex" OutName="bazaar_sign" Format="ci4" Width="64" Height="64" Offset="0x2838" TlutOffset="0x2810"/>
+
+        <!-- BOTW Stone -->
+        <DList Name="gKakarikoBOTWStoneDL" Offset="0x3B20"/>
+        <Texture Name="gKakarikoBOTWStoneTex" OutName="botw_stone" Format="rgba16" Width="32" Height="32" Offset="0x3140"/>
+        <Collision Name="gKakarikoBOTWStoneCol" Offset="0x3C64"/>
+
+        <!-- Palettes -->
+        <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoyab.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoyab.xml
new file mode 100644
index 0000000000..720f50cd3e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_matoyab.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="object_spot01_matoyab" Segment="6">
+        <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/>
+
+        <!-- Kakariko Guard Gate -->
+        <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/>
+        <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/>
+        <Collision Name="gKakarikoGuardGateCol" Offset="0x1DA8"/>
+
+        <!-- Kakariko Construction Site -->
+        <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
+        <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
+        <Texture Name="gKakarikoConstructionSiteWoodTex" OutName="construction_site_wood" Format="ci8" Width="16" Height="32" Offset="0x0688" TlutOffset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects.xml
new file mode 100644
index 0000000000..413e032a9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot01_objects" Segment="6">
+        <!-- Kakariko Windmill Sails-->
+        <DList Name="gKakarikoWindmillSailsDL" Offset="0x0100"/>
+        <Texture Name="gKakarikoWindmillSailsTex" OutName="windmill_sails" Format="rgba16" Width="32" Height="64" Offset="0x1090"/>
+
+        <!-- Kakariko Well Arch -->
+        <DList Name="gKakarikoWellArchDL" Offset="0x0420"/>
+        <Texture Name="gKakarikoWellArchTex" OutName="well_arch" Format="rgba16" Width="32" Height="16" Offset="0x2090"/>
+
+        <!-- Kakariko Well Water -->
+        <DList Name="gKakarikoWellWaterDL" Offset="0x07D0"/>
+        <Texture Name="gKakarikoWellWaterTex" OutName="well_water" Format="rgba16" Width="32" Height="32" Offset="0x0890"/>
+        <Collision Name="gKakarikoWellArchCol" Offset="0x075C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..36741a9492
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_spot01_objects2" Segment="6" >
+        <!-- Seems to be empty -->
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot02_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot02_objects.xml
new file mode 100644
index 0000000000..65f45ff515
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot02_objects.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="object_spot02_objects" Segment="6">
+        <Texture Name="object_spot02_objects_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_spot02_objects_Tex_000800" OutName="tex_00000800" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
+        <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
+        <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
+        <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
+        <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
+        <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
+        <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/>
+        <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/>
+        <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/>
+        <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/>
+        <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/>
+        <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/>
+        <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/>
+        <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/>
+        <Texture Name="object_spot02_objects_Tex_014820" OutName="tex_00014820" Format="rgba16" Width="16" Height="32" Offset="0x14820"/>
+        <Texture Name="object_spot02_objects_Tex_014C20" OutName="tex_00014C20" Format="rgba16" Width="64" Height="32" Offset="0x14C20"/>
+        <Texture Name="object_spot02_objects_Tex_015C20" OutName="tex_00015C20" Format="rgba16" Width="32" Height="32" Offset="0x15C20"/>
+        <Texture Name="object_spot02_objects_Tex_016420" OutName="tex_00016420" Format="rgba16" Width="16" Height="16" Offset="0x16420"/>
+        <Texture Name="gEffSunGraveSpark1Tex" OutName="eff_sun_grave_spark_1" Format="i8" Width="64" Height="64" Offset="0x15E0"/>
+        <Texture Name="gEffSunGraveSpark2Tex" OutName="eff_sun_grave_spark_2" Format="i8" Width="64" Height="64" Offset="0x25E0"/>
+        <Texture Name="gEffSunGraveSpark3Tex" OutName="eff_sun_grave_spark_3" Format="i8" Width="64" Height="64" Offset="0x35E0"/>
+        <Texture Name="gEffSunGraveSpark4Tex" OutName="eff_sun_grave_spark_4" Format="i8" Width="64" Height="64" Offset="0x45E0"/>
+        <Texture Name="gEffSunGraveSpark5Tex" OutName="eff_sun_grave_spark_5" Format="i8" Width="64" Height="64" Offset="0x55E0"/>
+        <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
+        <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
+        <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot03_object.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot03_object.xml
new file mode 100644
index 0000000000..f182e7d99a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot03_object.xml
@@ -0,0 +1,16 @@
+<Root>
+    <File Name="object_spot03_object" Segment="6">
+        <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800">
+            <Vtx/>
+        </Array>
+        <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990">
+            <Vtx/>
+        </Array>
+        <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/>
+        <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/>
+        <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/>
+        <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/>
+        <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot04_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot04_objects.xml
new file mode 100644
index 0000000000..66293d7523
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot04_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot04_objects" Segment="6">
+        <Texture Name="gDekuTreeMouthTex_0000" OutName="tex_0000" Format="rgba16" Width="32" Height="16" Offset="0x0000"/>
+        <Texture Name="gDekuTreeMouthTex_0400" OutName="tex_0400" Format="rgba16" Width="32" Height="16" Offset="0x0400"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_0EC0" OutName="tex_0EC0" Format="rgba16" Width="32" Height="16" Offset="0x0EC0"/>
+        <Texture Name="gDekuTreeUnusedMouthTex_12C0" OutName="tex_12C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <DList Name="gDekuTreeMouthDL" Offset="0x09D0"/>
+        <Collision Name="gDekuTreeMouthCol" Offset="0x0E94"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot05_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot05_objects.xml
new file mode 100644
index 0000000000..6e70791493
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot05_objects.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="object_spot05_objects" Segment="6">
+        <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/>
+        <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/>
+        <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/>
+        <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/>
+        <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot06_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot06_objects.xml
new file mode 100644
index 0000000000..e3da63b0f0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot06_objects.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="object_spot06_objects" Segment="6">
+        <!-- Lake Hylia Low Water -->
+        <DList Name="gLakeHyliaLowWaterDL" Offset="0x0120"/>
+
+        <!-- Lake Hylia High Water -->
+        <DList Name="gLakeHyliaHighWaterDL" Offset="0x0470"/>
+        <Texture Name="gLakeHyliaWaterTex" OutName="water" Format="rgba16" Width="32" Height="32" Offset="0x25A0"/>
+
+        <!-- Lake Hylia Water Temple Gate -->
+        <DList Name="gLakeHyliaWaterTempleGateDL" Offset="0x0E10"/>
+        <Texture Name="gLakeHyliaWaterTempleGateTex" OutName="water_temple_gate" Format="rgba16" Width="16" Height="64" Offset="0x05D0"/>
+        <Collision Name="gLakeHyliaWaterTempleGateCol" Offset="0x0EE8"/>
+
+        <!-- Lake Hylia Zora Shortcut Iceblock -->
+        <DList Name="gLakeHyliaZoraShortcutIceblockDL" Offset="0x1160"/>
+        <Texture Name="gLakeHyliaZoraShortcutIceblockTex" OutName="zora_shortcut_iceblock" Format="rgba16" Width="16" Height="16" Offset="0x0F20"/>
+        <Collision Name="gLakeHyliaZoraShortcutIceblockCol" Offset="0x1238"/>
+        
+        <!-- Lake Hylia Water Temple Key -->
+        <DList Name="gLakeHyliaWaterTempleKeyDL" Offset="0x2490"/>
+        <Texture Name="gLakeHyliaWaterTempleKeyTex" OutName="water_temple_key" Format="rgba16" Width="32" Height="64" Offset="0x1270"/>     
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot07_object.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot07_object.xml
new file mode 100644
index 0000000000..5bc2bfb6bf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot07_object.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_spot07_object" Segment="6">
+        <DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
+        <DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
+        <Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
+        <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
+        <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
+        <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
+        <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
+        <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
+        <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
+        <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
+        <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
+        <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>
+        <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/>
+        <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/>
+        <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/>
+        <Texture Name="object_spot07_object_Tex_005130" OutName="tex_00005130" Format="i8" Width="32" Height="32" Offset="0x5130"/>
+        <Texture Name="object_spot07_object_Tex_005530" OutName="tex_00005530" Format="rgba16" Width="32" Height="32" Offset="0x5530"/>
+        <Texture Name="object_spot07_object_Tex_005D30" OutName="tex_00005D30" Format="rgba16" Width="32" Height="32" Offset="0x5D30"/>
+        <Texture Name="object_spot07_object_Tex_006530" OutName="tex_00006530" Format="i4" Width="64" Height="64" Offset="0x6530"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot08_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot08_obj.xml
new file mode 100644
index 0000000000..4d71f3473f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot08_obj.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="object_spot08_obj" Segment="6">
+        <!-- Zora's Fountain Ice Ramp -->
+        <DList Name="gZorasFountainIceRampDL" Offset="0xDE0"/>
+        <Texture Name="gZorasFountainIceRampTLUT" OutName="ice_ramp_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
+        <Texture Name="gZorasFountainIceRampLowerSideTex" OutName="ice_ramp_lower_side" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
+        <Texture Name="gZorasFountainIceRampSurfaceTex" OutName="ice_ramp_surface" Format="rgba16" Width="32" Height="32" Offset="0x3E00"/>
+        <Texture Name="gZorasFountainIceRampUpperSideTex" OutName="ice_ramp_upper_side" Format="rgba16" Width="32" Height="32" Offset="0x4600"/>
+        <Texture Name="gZorasFountainIceRampMiddleSlopeTex" OutName="ice_ramp_middle_slope" Format="rgba16" Width="32" Height="32" Offset="0x4E00"/>
+        <Collision Name="gZorasFountainIceRampCol" Offset="0x1904"/>
+
+        <!-- Zora's Fountain Iceberg -->
+        <DList Name="gZorasFountainIcebergDL" Offset="0x2BD0"/>
+        <Texture Name="gZorasFountainIceberg1TLUT" OutName="iceberg_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x1930"/>
+        <Texture Name="gZorasFountainIceberg2TLUT" OutName="iceberg_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergSideTex" OutName="iceberg_side" Format="ci4" Width="64" Height="64" Offset="0x1970" TlutOffset="0x1930"/>
+        <Texture Name="gZorasFountainIcebergTopTex" OutName="iceberg_top" Format="ci4" Width="64" Height="64" Offset="0x2170" TlutOffset="0x1950"/>
+        <Texture Name="gZorasFountainIcebergUndersideTex" OutName="iceberg_underside" Format="rgba16" Width="64" Height="8" Offset="0x3A00"/> 
+        <Collision Name="gZorasFountainIcebergCol" Offset="0x2FD8"/>
+
+        <!-- Zora's Fountain Bombable Wall -->
+        <DList Name="gZorasFountainBombableWallDL" Offset="0x3898"/>
+        <Texture Name="gZorasFountainBombableWallTLUT" OutName="bombable_wall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3010"/>
+        <Texture Name="gZorasFountainBombableWallTex" OutName="bombable_wall" Format="ci4" Width="128" Height="32" Offset="0x3038" TlutOffset="0x3010"/>
+        <Collision Name="gZorasFountainBombableWallCol" Offset="0x39D4"/> 
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot09_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot09_obj.xml
new file mode 100644
index 0000000000..eb65283931
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot09_obj.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_spot09_obj" Segment="6">
+        <Texture Name="object_spot09_objTex_008490" OutName="object_spot09_objTex_008490" Format="rgba16" Width="32" Height="32" Offset="0x8490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_008C90" OutName="object_spot09_objTex_008C90" Format="rgba16" Width="32" Height="32" Offset="0x8C90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_009490" OutName="object_spot09_objTex_009490" Format="rgba16" Width="64" Height="32" Offset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00A490" OutName="object_spot09_objTex_00A490" Format="rgba16" Width="32" Height="32" Offset="0xA490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00AC90" OutName="object_spot09_objTex_00AC90" Format="rgba16" Width="32" Height="32" Offset="0xAC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00B490" OutName="object_spot09_objTex_00B490" Format="rgba16" Width="32" Height="32" Offset="0xB490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00BC90" OutName="object_spot09_objTex_00BC90" Format="rgba16" Width="32" Height="64" Offset="0xBC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00CC90" OutName="object_spot09_objTex_00CC90" Format="rgba16" Width="64" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00DC90" OutName="object_spot09_objTex_00DC90" Format="rgba16" Width="32" Height="64" Offset="0xDC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00EC90" OutName="object_spot09_objTex_00EC90" Format="rgba16" Width="64" Height="32" Offset="0xEC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_00FC90" OutName="object_spot09_objTex_00FC90" Format="rgba16" Width="16" Height="32" Offset="0xFC90" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_010090" OutName="object_spot09_objTex_010090" Format="rgba16" Width="64" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_011090" OutName="object_spot09_objTex_011090" Format="rgba16" Width="32" Height="64" Offset="0x11090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_012090" OutName="object_spot09_objTex_012090" Format="rgba16" Width="64" Height="32" Offset="0x12090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_013090" OutName="object_spot09_objTex_013090" Format="rgba16" Width="64" Height="32" Offset="0x13090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_014090" OutName="object_spot09_objTex_014090" Format="rgba16" Width="64" Height="32" Offset="0x14090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_015090" OutName="object_spot09_objTex_015090" Format="rgba16" Width="32" Height="64" Offset="0x15090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_016090" OutName="object_spot09_objTex_016090" Format="rgba16" Width="32" Height="64" Offset="0x16090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017090" OutName="object_spot09_objTex_017090" Format="i8" Width="32" Height="32" Offset="0x17090" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017490" OutName="object_spot09_objTex_017490" Format="i8" Width="32" Height="32" Offset="0x17490" AddedByScript="true"/>
+        <Texture Name="object_spot09_objTex_017890" OutName="object_spot09_objTex_017890" Format="i4" Width="128" Height="64" Offset="0x17890" AddedByScript="true"/>
+        <DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
+        <DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
+        <DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
+        <DList Name="gCarpentersTentDL" Offset="0x7D40"/>
+        <DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
+        <DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
+        <Collision Name="gValleyObjects1Col" Offset="0x5520"/>
+        <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
+        <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
+        <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot11_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot11_obj.xml
new file mode 100644
index 0000000000..257298f7cc
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot11_obj.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_spot11_obj" Segment="6">
+        <Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <DList Name="gDesertColossusOasisDL" Offset="0x870"/>
+        <Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgba16" Width="32" Height="64" Offset="0x940"/>
+        <DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
+        <Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot12_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot12_obj.xml
new file mode 100644
index 0000000000..d619c781e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot12_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot12_obj" Segment="6">
+        <!-- Gerudo Fortress Wasteland Gate -->
+        <DList Name="gGerudoFortressWastelandGateDL" Offset="0x1080"/>
+        <Texture Name="gGerudoFortressWastelandGateTex" OutName="wasteland_gate" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Collision Name="gGerudoFortressWastelandGateCol" Offset="0x11EC"/>
+
+        <!-- Gerudo Fortress GTG Shutter -->
+        <DList Name="gGerudoFortressGTGShutterDL" Offset="0x2260"/>
+        <Texture Name="gGerudoFortressGTGShutterTex" OutName="gtg_shutter" Format="rgba16" Width="32" Height="64" Offset="0x1220"/>
+        <Collision Name="gGerudoFortressGTGShutterCol" Offset="0x238C"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot15_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot15_obj.xml
new file mode 100644
index 0000000000..bd59b8cd18
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot15_obj.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_spot15_obj" Segment="6">
+        <!-- Lon Lon Milk Crate -->
+        <DList Name="gLonLonMilkCrateDL" Offset="0x180"/>
+        <Texture Name="gLonLonMilkCrateTex" OutName="milk_crate" Format="rgba16" Width="32" Height="64" Offset="0xD00"/>
+        <Collision Name="gLonLonMilkCrateCol" Offset="0x348"/>
+
+        <!-- Lon Lon Corral Fence -->
+        <DList Name="gLonLonCorralFenceDL" Offset="0x3C0"/>
+        <Texture Name="gLonLonCorralFenceTex" OutName="corral_fence" Format="i4" Width="32" Height="128" Offset="0x500"/>
+        <Collision Name="gLonLonCorralFenceCol" Offset="0x4D0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot16_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot16_obj.xml
new file mode 100644
index 0000000000..d39de812a9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot16_obj.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_spot16_obj" Segment="6">
+        <DList Name="gDodongosCavernRockDL" Offset="0x0B00"/>
+        <DList Name="gDodongosCavernRock2DL" Offset="0x0C00"/>
+        <DList Name="gDodongosCavernRock3DL" Offset="0x0C20"/>
+        <DList Name="gDeathMountainRingDL" Offset="0x1470"/>
+        <Texture Name="gDodongosCavernRockTex" OutName="rock_tex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
+        <Texture Name="gDeathMountainRingTex" OutName="smoke_ring" Format="ia16" Width="32" Height="32" Offset="0x0C30"/>
+        
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot17_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot17_obj.xml
new file mode 100644
index 0000000000..d4239d8d28
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot17_obj.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="object_spot17_obj" Segment="6">
+        <Texture Name="gCraterRockTLUT" OutName="crater_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
+        <Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
+        <DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
+        <DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
+        <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
+        <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
+        <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_spot18_obj.xml b/soh/assets/xml/N64_NTSC_12/objects/object_spot18_obj.xml
new file mode 100644
index 0000000000..cc12b78946
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_spot18_obj.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="object_spot18_obj" Segment="6">
+        <!-- DisplayLists -->
+        <DList Name="gGoronCityVaseLidDL" Offset="0x150"/>
+        <DList Name="gGoronCityDoorDL" Offset="0x420"/>
+        <DList Name="gGoronCityVaseDL" Offset="0x18B0"/>
+        <DList Name="gGoronCityStatueSpearDL" Offset="0x2370"/>
+        <DList Name="gGoronCityStatueDL" Offset="0x2BC0"/>
+
+        <!-- Palettes -->
+        <Texture Name="gGoronCityVaseTLUT" OutName="vase_tlut" Format="rgba16" Width="4" Height="4" Offset="0x560"/>
+
+        <!-- Textures -->
+        <Texture Name="gGoronCityVaseTex_580" OutName="vase_580" Format="ci4" Width="64" Height="64" Offset="0x580" TlutOffset="0x560"/>
+        <Texture Name="gGoronCityVaseTex_D80" OutName="vase_D80" Format="ci4" Width="32" Height="32" Offset="0xD80" TlutOffset="0x560"/>
+        <Texture Name="gGoronCitySpearLeafTex" OutName="spear_leaf" Format="rgba16" Width="32" Height="64" Offset="0x3010"/>
+        <Texture Name="gGoronCitySpearTipTex" OutName="spear_tip" Format="rgba16" Width="32" Height="32" Offset="0x4010"/>
+        <Texture Name="gGoronCitySpearHandleTex" OutName="spear_handle" Format="rgba16" Width="32" Height="32" Offset="0x4810"/>
+        <Texture Name="gGoronCityStatuePattern1Tex" OutName="statue_pattern_1" Format="rgba16" Width="32" Height="64" Offset="0x5010"/>
+        <Texture Name="gGoronCityStatuePattern2Tex" OutName="statue_pattern_2" Format="rgba16" Width="32" Height="64" Offset="0x6010"/>
+        <Texture Name="gGoronCityStatueTex_7010" OutName="statue_7010" Format="rgba16" Width="64" Height="32" Offset="0x7010"/>
+        <Texture Name="gGoronCityStatueAngryFaceTex" OutName="statue_angry_face" Format="rgba16" Width="32" Height="64" Offset="0x8010"/>
+        <Texture Name="gGoronCityStatueNeutralFaceTex" OutName="statue_neutral_face" Format="rgba16" Width="32" Height="64" Offset="0x9010"/>
+        <Texture Name="gGoronCityStatueHappyFaceTex" OutName="statue_happy_face" Format="rgba16" Width="32" Height="64" Offset="0xA010"/>
+        <Texture Name="gGoronCityVaseLidTex" OutName="vase_lid" Format="rgba16" Width="32" Height="32" Offset="0xB010"/>
+        <Texture Name="gGoronCityVaseLidHandleTex" OutName="vase_lid_handle" Format="rgba16" Width="16" Height="16" Offset="0xB810"/>
+        <Texture Name="gGoronCityDoorTex" OutName="door" Format="rgba16" Width="32" Height="64" Offset="0xBA10"/>
+
+        <!-- Collision -->
+        <Collision Name="gGoronCityVaseLidCol" Offset="0x368"/>
+        <Collision Name="gGoronCityDoorCol" Offset="0x534"/>
+        <Collision Name="gGoronCityVaseCol" Offset="0x2154"/>
+        <Collision Name="gGoronCityStatueSpearCol" Offset="0x261C"/>
+        <Collision Name="gGoronCityStatueCol" Offset="0x2FE4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ssh.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ssh.xml
new file mode 100644
index 0000000000..6283f8e9f2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ssh.xml
@@ -0,0 +1,61 @@
+<Root>
+    <File Name="object_ssh" Segment="6">
+        <Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
+        <Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
+        <Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
+        <Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
+        <DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ssh_DL_004080" Offset="0x4080"/>
+        <DList Name="object_ssh_DL_004510" Offset="0x4510"/>
+        <DList Name="object_ssh_DL_0046C0" Offset="0x46C0"/>
+        <DList Name="object_ssh_DL_004878" Offset="0x4878"/>
+        <DList Name="object_ssh_DL_004940" Offset="0x4940"/>
+        <DList Name="object_ssh_DL_004A08" Offset="0x4A08"/>
+        <DList Name="object_ssh_DL_004AD0" Offset="0x4AD0"/>
+        <DList Name="object_ssh_DL_004B98" Offset="0x4B98"/>
+        <DList Name="object_ssh_DL_004C60" Offset="0x4C60"/>
+        <DList Name="object_ssh_DL_004D28" Offset="0x4D28"/>
+        <DList Name="object_ssh_DL_004DE8" Offset="0x4DE8"/>
+        <DList Name="object_ssh_DL_005048" Offset="0x5048"/>
+        <Limb Name="object_ssh_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_ssh_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_ssh_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_ssh_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_ssh_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_ssh_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_ssh_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_ssh_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_ssh_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_ssh_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_ssh_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_ssh_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_ssh_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_ssh_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_ssh_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_ssh_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_ssh_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_ssh_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_ssh_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_ssh_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_ssh_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_ssh_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_ssh_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Limb Name="object_ssh_Limb_005224" LimbType="Standard" Offset="0x5224"/>
+        <Limb Name="object_ssh_Limb_005230" LimbType="Standard" Offset="0x5230"/>
+        <Limb Name="object_ssh_Limb_00523C" LimbType="Standard" Offset="0x523C"/>
+        <Limb Name="object_ssh_Limb_005248" LimbType="Standard" Offset="0x5248"/>
+        <Limb Name="object_ssh_Limb_005254" LimbType="Standard" Offset="0x5254"/>
+        <Limb Name="object_ssh_Limb_005260" LimbType="Standard" Offset="0x5260"/>
+        <Skeleton Name="object_ssh_Skel_0052E0" Type="Normal" LimbType="Standard" Offset="0x52E0"/>
+        <Animation Name="object_ssh_Anim_0055F8" Offset="0x55F8"/>
+        <Animation Name="object_ssh_Anim_005BE8" Offset="0x5BE8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_sst.xml b/soh/assets/xml/N64_NTSC_12/objects/object_sst.xml
new file mode 100644
index 0000000000..b874b9a418
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_sst.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_sst" Segment="6">
+        <Texture Name="object_sstTex_017FE0" OutName="object_sstTex_017FE0" Format="rgba16" Width="32" Height="64" Offset="0x16BE0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019530" OutName="object_sstTex_019530" Format="rgba16" Width="4" Height="8" Offset="0x18130" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019570" OutName="object_sstTex_019570" Format="rgba16" Width="8" Height="16" Offset="0x18170" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019670" OutName="object_sstTex_019670" Format="rgba16" Width="8" Height="16" Offset="0x18270" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019770" OutName="object_sstTex_019770" Format="rgba16" Width="4" Height="8" Offset="0x18370" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0197B0" OutName="object_sstTex_0197B0" Format="rgba16" Width="16" Height="16" Offset="0x184B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_0199B0" OutName="object_sstTex_0199B0" Format="rgba16" Width="8" Height="16" Offset="0x185B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019AB0" OutName="object_sstTex_019AB0" Format="rgba16" Width="8" Height="16" Offset="0x186B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019BB0" OutName="object_sstTex_019BB0" Format="rgba16" Width="16" Height="32" Offset="0x187B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_019FB0" OutName="object_sstTex_019FB0" Format="rgba16" Width="8" Height="16" Offset="0x18BB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A0B0" OutName="object_sstTex_01A0B0" Format="rgba16" Width="8" Height="16" Offset="0x18CB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A1B0" OutName="object_sstTex_01A1B0" Format="rgba16" Width="8" Height="32" Offset="0x18DB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A3B0" OutName="object_sstTex_01A3B0" Format="rgba16" Width="16" Height="16" Offset="0x18FB0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A5B0" OutName="object_sstTex_01A5B0" Format="rgba16" Width="8" Height="16" Offset="0x191B0" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
+        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
+        <!-- Boss Title Card -->
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
+        
+        <!-- Skeletons -->
+        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
+        <Skeleton Name="gBongoRightHandSkel" Type="Flex" LimbType="Standard" Offset="0x0A350"/>
+        <Skeleton Name="gBongoHeadSkel" Type="Flex" LimbType="Standard" Offset="0x16840"/>
+
+        <!-- Left hand animations -->
+        <Animation Name="gBongoLeftHandIdleAnim" Offset="0x002E8"/>
+        <Animation Name="gBongoLeftHandFlatPoseAnim" Offset="0x04EC4"/>
+        <Animation Name="gBongoLeftHandOpenPoseAnim" Offset="0x04FB4"/>
+        <Animation Name="gBongoLeftHandFistPoseAnim" Offset="0x050A8"/>
+        <Animation Name="gBongoLeftHandClenchAnim" Offset="0x0529C"/>
+        <Animation Name="gBongoLeftHandDamagePoseAnim" Offset="0x0539C"/>
+        <Animation Name="gBongoLeftHandPushoffPoseAnim" Offset="0x0549C"/>
+        <Animation Name="gBongoLeftHandHangPoseAnim" Offset="0x05588"/>
+
+        <!-- Right hand animations -->
+        <Animation Name="gBongoRightHandIdleAnim" Offset="0x05860"/>
+        <Animation Name="gBongoRightHandFlatPoseAnim" Offset="0x0A434"/>
+        <Animation Name="gBongoRightHandOpenPoseAnim" Offset="0x0A524"/>
+        <Animation Name="gBongoRightHandFistPoseAnim" Offset="0x0A618"/>
+        <Animation Name="gBongoRightHandClenchAnim" Offset="0x0A848"/>
+        <Animation Name="gBongoRightHandDamagePoseAnim" Offset="0x0A948"/>
+        <Animation Name="gBongoRightHandPushoffPoseAnim" Offset="0x0AA4C"/>
+        <Animation Name="gBongoRightHandHangPoseAnim" Offset="0x0AB38"/>
+
+        <!-- Head animations -->
+        <Animation Name="gBongoHeadStunnedAnim" Offset="0x0ACD4"/>
+        <Animation Name="gBongoHeadChargeAnim" Offset="0x0B0D8"/>
+        <Animation Name="gBongoHeadKnockoutAnim" Offset="0x0B6FC"/>
+        <Animation Name="gBongoHeadEyeCloseAnim" Offset="0x0C288"/>
+        <Animation Name="gBongoHeadDamagedHandAnim" Offset="0x0C5B0"/>
+        <Animation Name="gBongoHeadEyeOpenAnim" Offset="0x0C9BC"/>
+        <Animation Name="gBongoHeadDamageAnim" Offset="0x0CC6C"/>
+        <Animation Name="gBongoHeadRecoverAnim" Offset="0x0D458"/>
+        <Animation Name="gBongoHeadEyeCloseIdleAnim" Offset="0x0DC2C"/>
+        <Animation Name="gBongoHeadEyeOpenIdleAnim" Offset="0x0E7B8"/>
+
+        <!-- Ice effect display lists -->
+        <DList Name="gBongoIceCrystalDL" Offset="0x16AE0"/>
+        <DList Name="gBongoIceShardDL" Offset="0x16B80"/>
+
+        <!-- Drum head data -->
+        <DList Name="gBongoDrumDL" Offset="0x17E10"/>
+        <Collision Name="gBongoDrumCol" Offset="0x180F8"/>
+
+        <!-- Unused textures -->
+        <Texture Name="gBongoUnused1Tex" OutName="bongo_unused_1" Format="rgba16" Width="8" Height="8" Offset="0x192B0"/>
+        <Texture Name="gBongoUnused2Tex" OutName="bongo_unused_2" Format="rgba16" Width="16" Height="16" Offset="0x195B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_st.xml b/soh/assets/xml/N64_NTSC_12/objects/object_st.xml
new file mode 100644
index 0000000000..983b9e2eab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_st.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="object_st" Segment="6">
+        <Animation Name="object_st_Anim_000304" Offset="0x304"/>
+        <Texture Name="object_st_Tex_000320" OutName="tex_00000320" Format="i4" Width="16" Height="8" Offset="0x320"/>
+        <Texture Name="object_st_Tex_000360" OutName="tex_00000360" Format="rgba16" Width="16" Height="8" Offset="0x360"/>
+        <Texture Name="object_st_Tex_000460" OutName="tex_00000460" Format="rgba16" Width="8" Height="8" Offset="0x460"/>
+        <Texture Name="object_st_Tex_0004E0" OutName="tex_000004E0" Format="i4" Width="16" Height="16" Offset="0x4E0"/>
+        <Texture Name="object_st_Tex_000560" OutName="tex_00000560" Format="rgba16" Width="16" Height="16" Offset="0x560"/>
+        <Texture Name="object_st_Tex_000760" OutName="tex_00000760" Format="rgba16" Width="8" Height="8" Offset="0x760"/>
+        <Texture Name="object_st_Tex_0007E0" OutName="tex_000007E0" Format="rgba16" Width="8" Height="8" Offset="0x7E0"/>
+        <DList Name="object_st_DL_001A40" Offset="0x1A40"/>
+        <DList Name="object_st_DL_001C30" Offset="0x1C30"/>
+        <DList Name="object_st_DL_001FD0" Offset="0x1FD0"/>
+        <DList Name="object_st_DL_002068" Offset="0x2068"/>
+        <DList Name="object_st_DL_002100" Offset="0x2100"/>
+        <DList Name="object_st_DL_002198" Offset="0x2198"/>
+        <DList Name="object_st_DL_002230" Offset="0x2230"/>
+        <DList Name="object_st_DL_0022C8" Offset="0x22C8"/>
+        <DList Name="object_st_DL_002360" Offset="0x2360"/>
+        <DList Name="object_st_DL_0023F8" Offset="0x23F8"/>
+        <Texture Name="object_st_Tex_002490" OutName="tex_00002490" Format="i8" Width="8" Height="8" Offset="0x2490"/>
+        <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/>
+        <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/>
+        <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/>
+        <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/>
+        <DList Name="object_st_DL_0043D8" Offset="0x43D8"/>
+        <DList Name="object_st_DL_0045C0" Offset="0x45C0"/>
+        <DList Name="object_st_DL_004658" Offset="0x4658"/>
+        <DList Name="object_st_DL_0046F0" Offset="0x46F0"/>
+        <DList Name="object_st_DL_004788" Offset="0x4788"/>
+        <DList Name="object_st_DL_004820" Offset="0x4820"/>
+        <DList Name="object_st_DL_0048B8" Offset="0x48B8"/>
+        <DList Name="object_st_DL_004950" Offset="0x4950"/>
+        <DList Name="object_st_DL_0049E8" Offset="0x49E8"/>
+        <DList Name="gSkulltulaTokenDL" Offset="0x4DB0"/>
+        <DList Name="gSkulltulaTokenFlameDL" Offset="0x4EB8"/>
+        <Limb Name="object_st_Limb_0050C8" LimbType="Standard" Offset="0x50C8"/>
+        <Limb Name="object_st_Limb_0050D4" LimbType="Standard" Offset="0x50D4"/>
+        <Limb Name="object_st_Limb_0050E0" LimbType="Standard" Offset="0x50E0"/>
+        <Limb Name="object_st_Limb_0050EC" LimbType="Standard" Offset="0x50EC"/>
+        <Limb Name="object_st_Limb_0050F8" LimbType="Standard" Offset="0x50F8"/>
+        <Limb Name="object_st_Limb_005104" LimbType="Standard" Offset="0x5104"/>
+        <Limb Name="object_st_Limb_005110" LimbType="Standard" Offset="0x5110"/>
+        <Limb Name="object_st_Limb_00511C" LimbType="Standard" Offset="0x511C"/>
+        <Limb Name="object_st_Limb_005128" LimbType="Standard" Offset="0x5128"/>
+        <Limb Name="object_st_Limb_005134" LimbType="Standard" Offset="0x5134"/>
+        <Limb Name="object_st_Limb_005140" LimbType="Standard" Offset="0x5140"/>
+        <Limb Name="object_st_Limb_00514C" LimbType="Standard" Offset="0x514C"/>
+        <Limb Name="object_st_Limb_005158" LimbType="Standard" Offset="0x5158"/>
+        <Limb Name="object_st_Limb_005164" LimbType="Standard" Offset="0x5164"/>
+        <Limb Name="object_st_Limb_005170" LimbType="Standard" Offset="0x5170"/>
+        <Limb Name="object_st_Limb_00517C" LimbType="Standard" Offset="0x517C"/>
+        <Limb Name="object_st_Limb_005188" LimbType="Standard" Offset="0x5188"/>
+        <Limb Name="object_st_Limb_005194" LimbType="Standard" Offset="0x5194"/>
+        <Limb Name="object_st_Limb_0051A0" LimbType="Standard" Offset="0x51A0"/>
+        <Limb Name="object_st_Limb_0051AC" LimbType="Standard" Offset="0x51AC"/>
+        <Limb Name="object_st_Limb_0051B8" LimbType="Standard" Offset="0x51B8"/>
+        <Limb Name="object_st_Limb_0051C4" LimbType="Standard" Offset="0x51C4"/>
+        <Limb Name="object_st_Limb_0051D0" LimbType="Standard" Offset="0x51D0"/>
+        <Limb Name="object_st_Limb_0051DC" LimbType="Standard" Offset="0x51DC"/>
+        <Limb Name="object_st_Limb_0051E8" LimbType="Standard" Offset="0x51E8"/>
+        <Limb Name="object_st_Limb_0051F4" LimbType="Standard" Offset="0x51F4"/>
+        <Limb Name="object_st_Limb_005200" LimbType="Standard" Offset="0x5200"/>
+        <Limb Name="object_st_Limb_00520C" LimbType="Standard" Offset="0x520C"/>
+        <Limb Name="object_st_Limb_005218" LimbType="Standard" Offset="0x5218"/>
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" Offset="0x5298"/>
+        <Animation Name="object_st_Anim_0055A8" Offset="0x55A8"/>
+        <Animation Name="object_st_Anim_005B98" Offset="0x5B98"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_stream.xml b/soh/assets/xml/N64_NTSC_12/objects/object_stream.xml
new file mode 100644
index 0000000000..59b0838e47
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_stream.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_stream" Segment="6">
+        <Texture Name="object_stream_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="object_stream_DL_000950" Offset="0x950"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_syokudai.xml b/soh/assets/xml/N64_NTSC_12/objects/object_syokudai.xml
new file mode 100644
index 0000000000..c1670edece
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_syokudai.xml
@@ -0,0 +1,13 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
+    <File Name="object_syokudai" Segment="6">
+        <DList Name="gGoldenTorchDL" Offset="0x3A0"/>
+        <DList Name="gWoodenTorchDL" Offset="0x870"/>
+        <DList Name="gTimedTorchDL" Offset="0xB90"/>
+        <Texture Name="gGoldenTorch1Tex" OutName="golden_torch_1" Format="rgba16" Width="32" Height="32" Offset="0xC90"/>
+        <Texture Name="gGoldenTorch2Tex" OutName="golden_torch_2" Format="rgba16" Width="32" Height="64" Offset="0x1490"/>
+        <Texture Name="gTorchFlameGuardTex" OutName="torch_flame_guard" Format="rgba16" Width="32" Height="32" Offset="0x2490"/>
+        <Texture Name="gTimedTorchTex" OutName="timed_torch" Format="rgba16" Width="32" Height="32" Offset="0x2C90"/>
+        <Texture Name="gWoodenTorchTex" OutName="wooden_torch" Format="rgba16" Width="16" Height="64" Offset="0x3490"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ta.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ta.xml
new file mode 100644
index 0000000000..5e446bf5c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ta.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="object_ta" Segment="6">
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
+        <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
+        <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
+        <Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
+        <Animation Name="gTalonRunAnim" Offset="0xC858"/>
+        <Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
+        <Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
+        <Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
+        <DList Name="gTalonTorsoDL" Offset="0x3F70"/>
+        <DList Name="gTalonChestDL" Offset="0x4288"/>
+        <DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
+        <DList Name="gTalonRightArmDL" Offset="0x4B40"/>
+        <DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
+        <DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
+        <DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
+        <DList Name="gTalonLeftHandDL" Offset="0x5770"/>
+        <DList Name="gTalonRightThighDL" Offset="0x5B98"/>
+        <DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
+        <DList Name="gTalonLeftThighDL" Offset="0x6330"/>
+        <DList Name="gTalonLeftLegDL" Offset="0x6770"/>
+        <DList Name="gTalonHeadDL" Offset="0x96D0"/>
+        <DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
+        <DList Name="gTalonLeftFootDL" Offset="0xA498"/>
+        <Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
+        <Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
+        <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
+        <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
+        <Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
+        <Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
+        <Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
+        <Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
+        <Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
+        <Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
+
+        <Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_timeblock.xml b/soh/assets/xml/N64_NTSC_12/objects/object_timeblock.xml
new file mode 100644
index 0000000000..1d6b9e698c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_timeblock.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_timeblock" Segment="6">
+        <DList Name="gSongOfTimeBlockDL" Offset="0x980"/>
+        <Texture Name="gSongOfTimeBlockTex" OutName="block" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Collision Name="gSongOfTimeBlockCol" Offset="0xB30"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tite.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tite.xml
new file mode 100644
index 0000000000..1be65c4950
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tite.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="object_tite" Segment="6">
+        <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/>
+        <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/>
+        <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/>
+        <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) -->
+        <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) -->
+        <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) -->
+        <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/>
+        <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) -->
+        <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/>
+        <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/>
+        <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/>
+        <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/>
+        <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/>
+        <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/>
+        <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/>
+        <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/>
+        <DList Name="object_tite_DL_003160" Offset="0x3160"/>
+        <DList Name="object_tite_DL_003290" Offset="0x3290"/>
+        <DList Name="object_tite_DL_003330" Offset="0x3330"/>
+        <DList Name="object_tite_DL_003460" Offset="0x3460"/>
+        <DList Name="object_tite_DL_003500" Offset="0x3500"/>
+        <DList Name="object_tite_DL_003630" Offset="0x3630"/>
+        <DList Name="object_tite_DL_0036D0" Offset="0x36D0"/>
+        <DList Name="object_tite_DL_003800" Offset="0x3800"/>
+        <Limb Name="object_tite_Limb_0038A0" LimbType="Standard" Offset="0x38A0"/>
+        <Limb Name="object_tite_Limb_0038AC" LimbType="Standard" Offset="0x38AC"/>
+        <Limb Name="object_tite_Limb_0038B8" LimbType="Standard" Offset="0x38B8"/>
+        <Limb Name="object_tite_Limb_0038C4" LimbType="Standard" Offset="0x38C4"/>
+        <Limb Name="object_tite_Limb_0038D0" LimbType="Standard" Offset="0x38D0"/>
+        <Limb Name="object_tite_Limb_0038DC" LimbType="Standard" Offset="0x38DC"/>
+        <Limb Name="object_tite_Limb_0038E8" LimbType="Standard" Offset="0x38E8"/>
+        <Limb Name="object_tite_Limb_0038F4" LimbType="Standard" Offset="0x38F4"/>
+        <Limb Name="object_tite_Limb_003900" LimbType="Standard" Offset="0x3900"/>
+        <Limb Name="object_tite_Limb_00390C" LimbType="Standard" Offset="0x390C"/>
+        <Limb Name="object_tite_Limb_003918" LimbType="Standard" Offset="0x3918"/>
+        <Limb Name="object_tite_Limb_003924" LimbType="Standard" Offset="0x3924"/>
+        <Limb Name="object_tite_Limb_003930" LimbType="Standard" Offset="0x3930"/>
+        <Limb Name="object_tite_Limb_00393C" LimbType="Standard" Offset="0x393C"/>
+        <Limb Name="object_tite_Limb_003948" LimbType="Standard" Offset="0x3948"/>
+        <Limb Name="object_tite_Limb_003954" LimbType="Standard" Offset="0x3954"/>
+        <Limb Name="object_tite_Limb_003960" LimbType="Standard" Offset="0x3960"/>
+        <Limb Name="object_tite_Limb_00396C" LimbType="Standard" Offset="0x396C"/>
+        <Limb Name="object_tite_Limb_003978" LimbType="Standard" Offset="0x3978"/>
+        <Limb Name="object_tite_Limb_003984" LimbType="Standard" Offset="0x3984"/>
+        <Limb Name="object_tite_Limb_003990" LimbType="Standard" Offset="0x3990"/>
+        <Limb Name="object_tite_Limb_00399C" LimbType="Standard" Offset="0x399C"/>
+        <Limb Name="object_tite_Limb_0039A8" LimbType="Standard" Offset="0x39A8"/>
+        <Limb Name="object_tite_Limb_0039B4" LimbType="Standard" Offset="0x39B4"/>
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" Offset="0x3A20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tk.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tk.xml
new file mode 100644
index 0000000000..6b6cce7244
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tk.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_tk" Segment="6">
+        <Texture Name="object_tkTex_003980" OutName="object_tkTex_003980" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0039C0" OutName="object_tkTex_0039C0" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A00" OutName="object_tkTex_003A00" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_003A40" OutName="object_tkTex_003A40" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005340" OutName="object_tkTex_005340" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_005440" OutName="object_tkTex_005440" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_0056C0" OutName="object_tkTex_0056C0" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009B00" OutName="object_tkTex_009B00" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C00" OutName="object_tkTex_009C00" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009C80" OutName="object_tkTex_009C80" Format="i8" Width="8" Height="8" Offset="0x9C80" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009CC0" OutName="object_tkTex_009CC0" Format="rgba16" Width="8" Height="8" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="object_tkTex_009D40" OutName="object_tkTex_009D40" Format="i4" Width="16" Height="32" Offset="0x9D40" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B088" OutName="object_tkTex_00B088" Format="rgba16" Width="16" Height="16" Offset="0xB088" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B288" OutName="object_tkTex_00B288" Format="rgba16" Width="16" Height="16" Offset="0xB288" AddedByScript="true"/>
+        <Texture Name="object_tkTex_00B488" OutName="object_tkTex_00B488" Format="rgba16" Width="16" Height="16" Offset="0xB488" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_003780" OutName="object_tkTLUT_003780" Format="rgba16" Width="16" Height="16" Offset="0x3780" AddedByScript="true"/>
+        <Texture Name="object_tkTLUT_009AB0" OutName="object_tkTLUT_009AB0" Format="rgba16" Width="16" Height="16" Offset="0x9AB0" AddedByScript="true"/>
+        <Animation Name="gDampeDigAnim" Offset="0x1144"/>
+        <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
+        <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
+        <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
+        <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <DList Name="gDampeLanternDL" Offset="0xB838"/>
+        <DList Name="gDampeHaloDL" Offset="0xBBA0"/>
+        <DList Name="gDampeEff1DL" Offset="0xBC90"/>
+        <DList Name="gDampeEff2DL" Offset="0xBCA0"/>
+        <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_toki_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..cd07e60d2b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="object_toki_objects" Segment="6">
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
+        <Collision Name="gDoorTokiCol" Offset="0x7888"/>
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_torch2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_torch2.xml
new file mode 100644
index 0000000000..3388e7d34e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_torch2.xml
@@ -0,0 +1,13 @@
+<Root>
+    <File Name="object_torch2" Segment="6">
+        <Texture Name="object_torch2Tex_0041C0" OutName="object_torch2Tex_0041C0" Format="rgba16" Width="16" Height="16" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="object_torch2Tex_0043C0" OutName="object_torch2Tex_0043C0" Format="ia16" Width="16" Height="16" Offset="0x43C0" AddedByScript="true"/>
+        <!-- Dark Link's skeleton -->
+        <Skeleton Name="gDarkLinkSkel" Type="Flex" LimbType="LOD" Offset="0x4764"/>
+
+        <!-- Unused Content -->
+
+        <!-- Dark Link DLists -->
+        <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_toryo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_toryo.xml
new file mode 100644
index 0000000000..73f3dcb1e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_toryo.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="object_toryo" Segment="6">
+        <Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
+        <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
+        <Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
+        <Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
+        <DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
+        <DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
+        <DList Name="object_toryo_DL_005438" Offset="0x5438"/>
+        <DList Name="object_toryo_DL_005720" Offset="0x5720"/>
+        <DList Name="object_toryo_DL_005958" Offset="0x5958"/>
+        <DList Name="object_toryo_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_toryo_DL_005D10" Offset="0x5D10"/>
+        <DList Name="object_toryo_DL_005EC8" Offset="0x5EC8"/>
+        <DList Name="object_toryo_DL_006110" Offset="0x6110"/>
+        <DList Name="object_toryo_DL_006280" Offset="0x6280"/>
+        <DList Name="object_toryo_DL_0064B8" Offset="0x64B8"/>
+        <DList Name="object_toryo_DL_0067E0" Offset="0x67E0"/>
+        <DList Name="object_toryo_DL_0068E8" Offset="0x68E8"/>
+        <DList Name="object_toryo_DL_006A88" Offset="0x6A88"/>
+        <DList Name="object_toryo_DL_006DA8" Offset="0x6DA8"/>
+        <DList Name="object_toryo_DL_006EB0" Offset="0x6EB0"/>
+        <Limb Name="object_toryo_Limb_007050" LimbType="Standard" Offset="0x7050"/>
+        <Limb Name="object_toryo_Limb_00705C" LimbType="Standard" Offset="0x705C"/>
+        <Limb Name="object_toryo_Limb_007068" LimbType="Standard" Offset="0x7068"/>
+        <Limb Name="object_toryo_Limb_007074" LimbType="Standard" Offset="0x7074"/>
+        <Limb Name="object_toryo_Limb_007080" LimbType="Standard" Offset="0x7080"/>
+        <Limb Name="object_toryo_Limb_00708C" LimbType="Standard" Offset="0x708C"/>
+        <Limb Name="object_toryo_Limb_007098" LimbType="Standard" Offset="0x7098"/>
+        <Limb Name="object_toryo_Limb_0070A4" LimbType="Standard" Offset="0x70A4"/>
+        <Limb Name="object_toryo_Limb_0070B0" LimbType="Standard" Offset="0x70B0"/>
+        <Limb Name="object_toryo_Limb_0070BC" LimbType="Standard" Offset="0x70BC"/>
+        <Limb Name="object_toryo_Limb_0070C8" LimbType="Standard" Offset="0x70C8"/>
+        <Limb Name="object_toryo_Limb_0070D4" LimbType="Standard" Offset="0x70D4"/>
+        <Limb Name="object_toryo_Limb_0070E0" LimbType="Standard" Offset="0x70E0"/>
+        <Limb Name="object_toryo_Limb_0070EC" LimbType="Standard" Offset="0x70EC"/>
+        <Limb Name="object_toryo_Limb_0070F8" LimbType="Standard" Offset="0x70F8"/>
+        <Limb Name="object_toryo_Limb_007104" LimbType="Standard" Offset="0x7104"/>
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" Offset="0x7150"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tp.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tp.xml
new file mode 100644
index 0000000000..8ea908825e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tp.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="object_tp" Segment="6">
+
+        <!-- Tailpasaran displaylists -->
+        <DList Name="gTailpasaranTailSegmentDL" Offset="0x0000"/>
+        <DList Name="gTailpasaranHeadClawDL" Offset="0x0690"/>
+        <DList Name="gTailpasaranHeadMouthpartsDL" Offset="0x0840"/>
+        <DList Name="gTailpasaranHeadDL" Offset="0x08D0"/>
+
+        <!-- Tailpasaran textures -->
+        <Texture Name="gTailpasaranHeadRearTex" OutName="tailpasaran_head_rear" Format="rgba16" Width="8" Height="16" Offset="0x08E8"/>
+        <Texture Name="gTailpasaranHeadClawBaseTex" OutName="tailpasaran_head_claw_base" Format="rgba16" Width="8" Height="8" Offset="0x09E8"/>
+        <Texture Name="gTailpasaranHeadClawTex" OutName="tailpasaran_head_claw" Format="rgba16" Width="16" Height="16" Offset="0x0A68"/>
+        <Texture Name="gTailpasaranTailSegmentTex" OutName="tailpasaran_tail_segment" Format="ia8" Width="64" Height="64" Offset="0x0C68"/>
+        <Texture Name="gTailpasaranHeadMouthpartsTex" OutName="tailpasaran_head_mouthparts" Format="rgba16" Width="8" Height="8" Offset="0x1C68"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tr.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tr.xml
new file mode 100644
index 0000000000..17ab9ae392
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tr.xml
@@ -0,0 +1,149 @@
+<Root>
+    <File Name="object_tr" Segment="6">
+        <Animation Name="gKotakeKoumeLookOverRightShoulderAnim" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverRightShoulderAnim" Offset="0x13CC"/> <!-- Looking over right shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverLeftShoulderAnim" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
+        <Animation Name="gKotakeKoumeLookOverLeftShoulderAnim" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
+        <Animation Name="gKotakeKoumeLookingOverLeftShoulderAnim" Offset="0x35CC"/> <!-- Looking over left shoulder -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderAnim" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
+        <Animation Name="gKotakeKoumeFlyAnim" Offset="0x49C8"/> <!-- Floating on broom -->
+        <Animation Name="gKotakeKoumeStandingBroomOverRightShoulderUnusedAnim" Offset="0x5308"/>
+        <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/>
+        <DList Name="gKotakePelvisDL" Offset="0x6520"/>
+        <DList Name="gKotakeTorsoDL" Offset="0x66A0"/>
+        <DList Name="gKotakeNeckDL" Offset="0x6800"/>
+        <DList Name="gKotakeLeftBraidStartDL" Offset="0x6940"/>
+        <DList Name="gKotakeLeftBraidEndDL" Offset="0x6A50"/>
+        <DList Name="gKotakeRightBraidStartDL" Offset="0x6B48"/>
+        <DList Name="gKotakeRightBraidEndDL" Offset="0x6C58"/>
+        <DList Name="gKotakeRightSleeveStartDL" Offset="0x6D50"/>
+        <DList Name="gKotakeRightSleeveFrontDL" Offset="0x6E70"/>
+        <DList Name="gKotakeRightSleeveMidDL" Offset="0x6FF0"/>
+        <DList Name="gKotakeRightSleeveEndDL" Offset="0x7118"/>
+        <DList Name="gKotakeLeftSleeveStartDL" Offset="0x7238"/>
+        <DList Name="gKotakeLeftSleeveFrontDL" Offset="0x7358"/>
+        <DList Name="gKotakeLeftSleeveMidDL" Offset="0x74D8"/>
+        <DList Name="gKotakeLeftSleeveEndDL" Offset="0x7600"/>
+        <DList Name="gKotakeRightThighDL" Offset="0x7720"/>
+        <DList Name="gKotakeLeftThighDL" Offset="0x7728"/>
+        <Texture Name="gKotakeKoumeTLUT" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
+        <Texture Name="gKotakeGerudoFabricTex" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
+        <Texture Name="gKotakeRobeTex" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
+        <Texture Name="gKotakeKoumeRobePatternTex" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
+        <Texture Name="gKotakeKoumeRobeTrimTex" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
+        <Texture Name="gKotakeKoumeEyeOpenTex" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
+        <Texture Name="gKotakeKoumeSkinTex" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeMouthTex" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeHairTex" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
+        <Texture Name="gKotakeKoumeEarTex" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeFingerTex" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeBroomHandleTex" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
+        <Texture Name="gKotakeKoumeBroomHeadTex" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
+        <Texture Name="gKotakeKoumeJewelHolderTex" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
+        <Texture Name="gKotakeJewelTex" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
+        <Texture Name="gKotakeKoumeNeckTex" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeNostrilsTex" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
+        <Texture Name="gKotakeKoumeEyeHalfTex" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
+        <Texture Name="gKotakeKoumeEyeClosedTex" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
+        <DList Name="gKotakeHeadDL" Offset="0xAF38"/>
+        <DList Name="gKotakeTeethDL" Offset="0xB568"/>
+        <DList Name="gKotakeRightShinDL" Offset="0xB5C8"/>
+        <DList Name="gKotakeLeftShinDL" Offset="0xB678"/>
+        <DList Name="gKotakeBroomDL" Offset="0xB728"/>
+        <DList Name="gKotakeRightFootDL" Offset="0xB8D0"/>
+        <DList Name="gKotakeLeftFootDL" Offset="0xB968"/>
+        <DList Name="gKotakeRightHandDL" Offset="0xBA00"/>
+        <DList Name="gKotakeLeftHandDL" Offset="0xBB68"/>
+        <Texture Name="gKotakeKoumeBraidEndTex" OutName="tex_0000BCD0" Format="rgba16" Width="8" Height="8" Offset="0xBCD0"/>
+        <Blob Name="object_tr_Blob_00BD50" Size="0x580" Offset="0xBD50"/>
+        <Texture Name="gKotakeCollarNeckTex" OutName="tex_0000C2D0" Format="rgba16" Width="4" Height="8" Offset="0xC2D0"/>
+        <Blob Name="object_tr_Blob_00C310" Size="0x80" Offset="0xC310"/>
+        <Limb Name="gKotakePelvisLimb" LimbType="Standard" Offset="0xC390"/>
+        <Limb Name="gKotakeLeftThighLimb" LimbType="Standard" Offset="0xC39C"/>
+        <Limb Name="gKotakeLeftShinLimb" LimbType="Standard" Offset="0xC3A8"/>
+        <Limb Name="gKotakeLeftFootLimb" LimbType="Standard" Offset="0xC3B4"/>
+        <Limb Name="gKotakeRightThighLimb" LimbType="Standard" Offset="0xC3C0"/>
+        <Limb Name="gKotakeRightShinLimb" LimbType="Standard" Offset="0xC3CC"/>
+        <Limb Name="gKotakeRightFootLimb" LimbType="Standard" Offset="0xC3D8"/>
+        <Limb Name="gKotakeTorsoLimb" LimbType="Standard" Offset="0xC3E4"/>
+        <Limb Name="gKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0xC3F0"/>
+        <Limb Name="gKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0xC3FC"/>
+        <Limb Name="gKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0xC408"/>
+        <Limb Name="gKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0xC414"/>
+        <Limb Name="gKotakeLeftHandLimb" LimbType="Standard" Offset="0xC420"/>
+        <Limb Name="gKotakeBroomLimb" LimbType="Standard" Offset="0xC42C"/>
+        <Limb Name="gKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0xC438"/>
+        <Limb Name="gKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0xC444"/>
+        <Limb Name="gKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0xC450"/>
+        <Limb Name="gKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0xC45C"/>
+        <Limb Name="gKotakeRightHandLimb" LimbType="Standard" Offset="0xC468"/>
+        <Limb Name="gKotakeNeckLimb" LimbType="Standard" Offset="0xC474"/>
+        <Limb Name="gKotakeHeadLimb" LimbType="Standard" Offset="0xC480"/>
+        <Limb Name="gKotakeRightBraidStartLimb" LimbType="Standard" Offset="0xC48C"/>
+        <Limb Name="gKotakeRightBraidEndLimb" LimbType="Standard" Offset="0xC498"/>
+        <Limb Name="gKotakeTeethLimb" LimbType="Standard" Offset="0xC4A4"/>
+        <Limb Name="gKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0xC4B0"/>
+        <Limb Name="gKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0xC4BC"/>
+        <Skeleton Name="gKotakeSkel" Type="Flex" LimbType="Standard" Offset="0xC530"/>
+        <Animation Name="gKotakeKoumeTPoseAnim" Offset="0xC60C"/>
+        <Blob Name="object_tr_Blob_00D5E0" Size="0x60" Offset="0xD5E0"/>
+        <DList Name="gKoumePelvisDL" Offset="0xD820"/>
+        <DList Name="gKoumeTorsoDL" Offset="0xD9A0"/>
+        <DList Name="gKoumeNeckDL" Offset="0xDB00"/>
+        <DList Name="gKoumeLeftBraidStartDL" Offset="0xDC40"/>
+        <DList Name="gKoumeLeftBraidEndDL" Offset="0xDD50"/>
+        <DList Name="gKoumeRightBraidStartDL" Offset="0xDE48"/>
+        <DList Name="gKoumeRightBraidEndDL" Offset="0xDF58"/>
+        <DList Name="gKoumeRightSleeveStartDL" Offset="0xE050"/>
+        <DList Name="gKoumeRightSleeveFrontDL" Offset="0xE170"/>
+        <DList Name="gKoumeRightSleeveMidDL" Offset="0xE2F0"/>
+        <DList Name="gKoumeRightSleeveEndDL" Offset="0xE418"/>
+        <DList Name="gKoumeLeftSleeveStartDL" Offset="0xE538"/>
+        <DList Name="gKoumeLeftSleeveFrontDL" Offset="0xE658"/>
+        <DList Name="gKoumeLeftSleeveMidDL" Offset="0xE7D8"/>
+        <DList Name="gKoumeLeftSleeveEndDL" Offset="0xE900"/>
+        <DList Name="gKoumeRightThighDL" Offset="0xEA20"/>
+        <DList Name="gKoumeLeftThighDL" Offset="0xEA28"/>
+        <Texture Name="gKoumeGerudoFabricTex" OutName="tex_0000EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30"/>
+        <Texture Name="gKoumeRobeTex" OutName="tex_0000F230" Format="rgba16" Width="16" Height="16" Offset="0xF230"/>
+        <Texture Name="gKoumeJewelTex" OutName="tex_0000F430" Format="rgba16" Width="8" Height="8" Offset="0xF430"/>
+        <DList Name="gKoumeHeadDL" Offset="0x10710"/>
+        <DList Name="gKoumeTeethDL" Offset="0x10D40"/>
+        <DList Name="gKoumeRightShinDL" Offset="0x10DA0"/>
+        <DList Name="gKoumeLeftShinDL" Offset="0x10E50"/>
+        <DList Name="gKoumeBroomDL" Offset="0x10F00"/>
+        <DList Name="gKoumeRightFootDL" Offset="0x110A8"/>
+        <DList Name="gKoumeLeftFootDL" Offset="0x11140"/>
+        <DList Name="gKoumeRightHandDL" Offset="0x111D8"/>
+        <DList Name="gKoumeLeftHandDL" Offset="0x11340"/>
+        <Texture Name="gKoumeCollarNeckTex" OutName="tex_000114A8" Format="rgba16" Width="4" Height="8" Offset="0x114A8"/>
+        <Limb Name="gKoumePelvisLimb" LimbType="Standard" Offset="0x114E8"/>
+        <Limb Name="gKoumeLeftThighLimb" LimbType="Standard" Offset="0x114F4"/>
+        <Limb Name="gKoumeLeftShinLimb" LimbType="Standard" Offset="0x11500"/>
+        <Limb Name="gKoumeLeftFootLimb" LimbType="Standard" Offset="0x1150C"/>
+        <Limb Name="gKoumeRightThighLimb" LimbType="Standard" Offset="0x11518"/>
+        <Limb Name="gKoumeRightShinLimb" LimbType="Standard" Offset="0x11524"/>
+        <Limb Name="gKoumeRightFootLimb" LimbType="Standard" Offset="0x11530"/>
+        <Limb Name="gKoumeTorsoLimb" LimbType="Standard" Offset="0x1153C"/>
+        <Limb Name="gKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x11548"/>
+        <Limb Name="gKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x11554"/>
+        <Limb Name="gKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x11560"/>
+        <Limb Name="gKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1156C"/>
+        <Limb Name="gKoumeLeftHandLimb" LimbType="Standard" Offset="0x11578"/>
+        <Limb Name="gKoumeBroomLimb" LimbType="Standard" Offset="0x11584"/>
+        <Limb Name="gKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x11590"/>
+        <Limb Name="gKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1159C"/>
+        <Limb Name="gKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x115A8"/>
+        <Limb Name="gKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x115B4"/>
+        <Limb Name="gKoumeRightHandLimb" LimbType="Standard" Offset="0x115C0"/>
+        <Limb Name="gKoumeNeckLimb" LimbType="Standard" Offset="0x115CC"/>
+        <Limb Name="gKoumeHeadLimb" LimbType="Standard" Offset="0x115D8"/>
+        <Limb Name="gKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x115E4"/>
+        <Limb Name="gKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x115F0"/>
+        <Limb Name="gKoumeTeethLimb" LimbType="Standard" Offset="0x115FC"/>
+        <Limb Name="gKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x11608"/>
+        <Limb Name="gKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x11614"/>
+        <Skeleton Name="gKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x11688"/>
+        <Animation Name="gKotakeKoumeCastMagicAnim" Offset="0x12E1C"/> <!-- Casting magic -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_trap.xml b/soh/assets/xml/N64_NTSC_12/objects/object_trap.xml
new file mode 100644
index 0000000000..56195cf41b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_trap.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="object_trap" Segment="6">
+        <Texture Name="gSlidingBladeTrapTex_0000" OutName="tex_0000" Format="i8" Width="32" Height="32" Offset="0x0000"/>
+        <Texture Name="gSlidingBladeTrapBoltsTex" OutName="blade_trap_bolts" Format="i8" Width="32" Height="32" Offset="0x0400"/>
+        <Texture Name="gSlidingBladeTrapGradientTex" OutName="blade_trap_gradient" Format="i8" Width="32" Height="32" Offset="0x0800"/>
+        <Texture Name="gLandmineBillboardTex" OutName="land_mine_billboard" Format="rgba16" Width="32" Height="32" Offset="0x1BD8"/>
+        <DList Name="gSlidingBladeTrapDL" Offset="0x1400"/>
+        <DList Name="gLandmineBillboardDL" Offset="0x1630"/>
+        <DList Name="gUnusedSpikeDL" Offset="0x1710"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_triforce_spot.xml b/soh/assets/xml/N64_NTSC_12/objects/object_triforce_spot.xml
new file mode 100644
index 0000000000..87d4494589
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_triforce_spot.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="object_triforce_spot" Segment="6">
+        <Array Name="gTriforceVtx" Count="96" Offset="0x0000">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gTriforceDL" Offset="0x0600"/>
+        <DList Name="gTriforceLightColumnDL" Offset="0x0840"/>
+
+        <Texture Name="gTriforceTex" OutName="triforce" Format="i8" Width="64" Height="64" Offset="0x0910"/>
+        <Texture Name="gTriforceColumnSide1Tex" OutName="triforce_light_column_side_1" Format="i8" Width="64" Height="32" Offset="0x1910"/>
+        <Texture Name="gTriforceColumnSide2Tex" OutName="triforce_light_column_side_2" Format="i8" Width="64" Height="32" Offset="0x2110"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ts.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ts.xml
new file mode 100644
index 0000000000..567277bc39
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ts.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ts" Segment="6">
+        <Animation Name="object_ts_Anim_000498" Offset="0x498"/>
+        <Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
+        <Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
+        <DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
+        <DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ts_DL_004378" Offset="0x4378"/>
+        <DList Name="object_ts_DL_0046A0" Offset="0x46A0"/>
+        <DList Name="object_ts_DL_004818" Offset="0x4818"/>
+        <DList Name="object_ts_DL_004978" Offset="0x4978"/>
+        <DList Name="object_ts_DL_004AF8" Offset="0x4AF8"/>
+        <DList Name="object_ts_DL_004C70" Offset="0x4C70"/>
+        <DList Name="object_ts_DL_004DD0" Offset="0x4DD0"/>
+        <Limb Name="object_ts_Limb_004F50" LimbType="Standard" Offset="0x4F50"/>
+        <Limb Name="object_ts_Limb_004F5C" LimbType="Standard" Offset="0x4F5C"/>
+        <Limb Name="object_ts_Limb_004F68" LimbType="Standard" Offset="0x4F68"/>
+        <Limb Name="object_ts_Limb_004F74" LimbType="Standard" Offset="0x4F74"/>
+        <Limb Name="object_ts_Limb_004F80" LimbType="Standard" Offset="0x4F80"/>
+        <Limb Name="object_ts_Limb_004F8C" LimbType="Standard" Offset="0x4F8C"/>
+        <Limb Name="object_ts_Limb_004F98" LimbType="Standard" Offset="0x4F98"/>
+        <Limb Name="object_ts_Limb_004FA4" LimbType="Standard" Offset="0x4FA4"/>
+        <Limb Name="object_ts_Limb_004FB0" LimbType="Standard" Offset="0x4FB0"/>
+        <Skeleton Name="object_ts_Skel_004FE0" Type="Flex" LimbType="Standard" Offset="0x4FE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tsubo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tsubo.xml
new file mode 100644
index 0000000000..ee2c5e1846
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tsubo.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_tsubo" Segment="6">
+        <Texture Name="object_tsubo_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_tsubo_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="object_tsubo_Tex_001200" OutName="tex_00001200" Format="rgba16" Width="16" Height="16" Offset="0x1200"/>
+        <DList Name="object_tsubo_DL_0017C0" Offset="0x17C0"/>
+        <DList Name="object_tsubo_DL_001960" Offset="0x1960"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_tw.xml b/soh/assets/xml/N64_NTSC_12/objects/object_tw.xml
new file mode 100644
index 0000000000..c7fd2a60be
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_tw.xml
@@ -0,0 +1,332 @@
+<Root>
+    <File Name="object_tw" Segment="6">
+        <Animation Name="gTwinrovaKotakeKoumeIdleLoopAnim" Offset="0x4A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeIdleEndAnim" Offset="0xAAC"/>
+        <Animation Name="gTwinrovaKotakeKoumeBickerAnim" Offset="0x12A4"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookUpAnim" Offset="0x17E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeFloatLookForwardAnim" Offset="0x1D10"/>
+        <Animation Name="gTwinrovaKotakeKoumeShakeHandAnim" Offset="0x230C"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackStartAnim" Offset="0x3614"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackLoopAnim" Offset="0x3E34"/>
+        <Animation Name="gTwinrovaKotakeKoumeAttackEndAnim" Offset="0x4548"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageStartAnim" Offset="0x578C"/>
+        <Animation Name="gTwinrovaKotakeKoumeDamageEndAnim" Offset="0x6530"/>
+        <Animation Name="gTwinrovaKotakeKoumeFlyAnim" Offset="0x6F28"/>
+        <Limb Name="gTwinrovaKotakePelvisLimb" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="gTwinrovaKotakeLeftThighLimb" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="gTwinrovaKotakeLeftShinLimb" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="gTwinrovaKotakeLeftFootLimb" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="gTwinrovaKotakeRightThighLimb" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="gTwinrovaKotakeRightShinLimb" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="gTwinrovaKotakeRightFootLimb" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="gTwinrovaKotakeTorsoLimb" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveStartLimb" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveMidLimb" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveEndLimb" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="gTwinrovaKotakeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="gTwinrovaKotakeLeftHandLimb" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="gTwinrovaKotakeBroomLimb" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveStartLimb" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveMidLimb" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveEndLimb" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="gTwinrovaKotakeRightSleeveFrontLimb" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="gTwinrovaKotakeRightHandLimb" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="gTwinrovaKotakeNeckLimb" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="gTwinrovaKotakeHeadLimb" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="gTwinrovaKotakeRightBraidStartLimb" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="gTwinrovaKotakeRightBraidEndLimb" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="gTwinrovaKotakeTeethLimb" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidStartLimb" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="gTwinrovaKotakeLeftBraidEndLimb" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="gTwinrovaKotakeSkel" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackStartAnim" Offset="0x7688"/>
+        <Animation Name="gTwinrovaKotakeKoumeSpinAnim" Offset="0x7CA8"/>
+        <Animation Name="gTwinrovaKotakeKoumeLaughAnim" Offset="0x88C8"/>
+        <Animation Name="gTwinrovaKotakeKoumeChargeUpAttackLoopAnim" Offset="0x9398"/>
+        <Animation Name="gTwinrovaKotakeKoumeTPoseAnim" Offset="0x947C"/>
+        <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
+        <Texture Name="gTwinrovaKoumeKotakeTLUT" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeGerudoFabricTex" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="gTwinrovaKotakeRobeTex" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="gTwinrovaRobePatternTex" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="gTwinrovaRobeTrimTex" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeOpenTex" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeSkinTex" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeMouthTex" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaHairTex" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
+        <Texture Name="gTwinrovaKotakeKoumeEarTex" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeFingerTex" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaBroomHandleTex" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="gTwinrovaBroomHeadTex" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="gTwinrovaKotakeKoumeJewelHolderTex" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="gTwinrovaKotakeJewelTex" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
+        <Texture Name="gTwinrovaKotakeKoumeNeckTex" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeNostrilsTex" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeHalfTex" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaKotakeKoumeEyeClosedTex" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
+        <Texture Name="gTwinrovaEffectTex" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="gTwinrovaEffectMaskTex" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="gTwinrovaKoumeGerudoFabricTex" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="gTwinrovaKoumeJewelTex" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="gTwinrovaKoumeRobeTex" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="gTwinrovaKotakeHeadInvisibleHairDL" Offset="0x110A8"/>
+        <DList Name="gTwinrovaKoumeHeadInvisibleHairDL" Offset="0x116A0"/>
+        <DList Name="gTwinrovaKotakeBroomInvisibleHeadDL" Offset="0x11C98"/>
+        <DList Name="gTwinrovaKoumeBroomInvisibleHeadDL" Offset="0x11E28"/>
+        <DList Name="gTwinrovaKotakeTeethDL" Offset="0x11FB8"/>
+        <DList Name="gTwinrovaKotakeRightShinDL" Offset="0x12018"/>
+        <DList Name="gTwinrovaKotakeLeftShinDL" Offset="0x120C8"/>
+        <DList Name="gTwinrovaKotakeRightFootDL" Offset="0x12178"/>
+        <DList Name="gTwinrovaKotakeLeftFootDL" Offset="0x12210"/>
+        <DList Name="gTwinrovaKotakeRightHandDL" Offset="0x122A8"/>
+        <DList Name="gTwinrovaKotakeLeftHandDL" Offset="0x12410"/>
+        <DList Name="gTwinrovaKoumeRightHandDL" Offset="0x12578"/>
+        <DList Name="gTwinrovaKoumeLeftHandDL" Offset="0x126E0"/>
+        <DList Name="gTwinrovaKoumeLeftFootDL" Offset="0x12848"/>
+        <DList Name="gTwinrovaKoumeRightFootDL" Offset="0x128E0"/>
+        <DList Name="gTwinrovaKoumeLeftShinDL" Offset="0x12978"/>
+        <DList Name="gTwinrovaKoumeRightShinDL" Offset="0x12A28"/>
+        <DList Name="gTwinrovaKoumeTeethDL" Offset="0x12AD8"/>
+        <DList Name="gTwinrovaKotakeBroomDL" Offset="0x12B38"/>
+        <DList Name="gTwinrovaKotakeHeadDL" Offset="0x12CE0"/>
+        <DList Name="gTwinrovaKoumeBroomDL" Offset="0x13310"/>
+        <DList Name="gTwinrovaKoumeHeadDL" Offset="0x134B8"/>
+        <DList Name="gTwinrovaKotakeIceHairDL" Offset="0x13AE8"/>
+        <DList Name="gTwinrovaKoumeFireHairDL" Offset="0x13D68"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadDL" Offset="0x13E98"/>
+        <DList Name="gTwinrovaKotakeIceBroomHeadOuterDL" Offset="0x13F98"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadDL" Offset="0x14070"/>
+        <DList Name="gTwinrovaKotakeFireBroomHeadOuterDL" Offset="0x14158"/>
+        <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
+        <DList Name="gTwinrovaKotakeLeftBraidEndDL" Offset="0x15440"/>
+        <DList Name="gTwinrovaKotakeLeftBraidStartDL" Offset="0x15538"/>
+        <DList Name="gTwinrovaKotakeRightBraidEndDL" Offset="0x15648"/>
+        <DList Name="gTwinrovaKotakeRightBraidStartDL" Offset="0x15740"/>
+        <DList Name="gTwinrovaKotakeNeckDL" Offset="0x15850"/>
+        <DList Name="gTwinrovaKotakeRightSleeveFrontDL" Offset="0x15990"/>
+        <DList Name="gTwinrovaKotakeRightSleeveEndDL" Offset="0x15B10"/>
+        <DList Name="gTwinrovaKotakeRightSleeveMidDL" Offset="0x15C30"/>
+        <DList Name="gTwinrovaKotakeRightSleeveStartDL" Offset="0x15D58"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveFrontDL" Offset="0x15E78"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveEndDL" Offset="0x15FF8"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveMidDL" Offset="0x16118"/>
+        <DList Name="gTwinrovaKotakeLeftSleeveStartDL" Offset="0x16240"/>
+        <DList Name="gTwinrovaKotakeTorsoDL" Offset="0x16360"/>
+        <DList Name="gTwinrovaKotakeRightThighDL" Offset="0x164C0"/>
+        <DList Name="gTwinrovaKotakeLeftThighDL" Offset="0x164C8"/>
+        <DList Name="gTwinrovaKotakePelvisDL" Offset="0x164D0"/>
+        <Texture Name="gTwinrovaBraidEndTex" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="gTwinrovaLeftFootTex" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
+        <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
+        <DList Name="gTwinrovaKoumeLeftBraidEndDL" Offset="0x17910"/>
+        <DList Name="gTwinrovaKoumeLeftBraidStartDL" Offset="0x17A08"/>
+        <DList Name="gTwinrovaKoumeRightBraidEndDL" Offset="0x17B18"/>
+        <DList Name="gTwinrovaKoumeRightBraidStartDL" Offset="0x17C10"/>
+        <DList Name="gTwinrovaKoumeNeckDL" Offset="0x17D20"/>
+        <DList Name="gTwinrovaKoumeRightSleeveFrontDL" Offset="0x17E60"/>
+        <DList Name="gTwinrovaKoumeRightSleeveEndDL" Offset="0x17FE0"/>
+        <DList Name="gTwinrovaKoumeRightSleeveMidDL" Offset="0x18100"/>
+        <DList Name="gTwinrovaKoumeRightSleeveStartDL" Offset="0x18228"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveFrontDL" Offset="0x18348"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveEndDL" Offset="0x184C8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveMidDL" Offset="0x185E8"/>
+        <DList Name="gTwinrovaKoumeLeftSleeveStartDL" Offset="0x18710"/>
+        <DList Name="gTwinrovaKoumeTorsoDL" Offset="0x18830"/>
+        <DList Name="gTwinrovaKoumeRightThighDL" Offset="0x18990"/>
+        <DList Name="gTwinrovaKoumeLeftThighDL" Offset="0x18998"/>
+        <DList Name="gTwinrovaKoumePelvisDL" Offset="0x189A0"/>
+        <Texture Name="gTwinrovaRightFootTex" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="gTwinrovaFireSmokeTex" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="gTwinrovaFireSmokeDL" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="gTwinrovaBigFlameTex" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="gTwinrovaBigFlameMaskTex" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="gTwinrovaBigFlameDL" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="gTwinrovaFirePoolAndShieldChargeCenterTex" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="gTwinrovaFirePoolDL" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="gTwinrovaFireTex" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="gTwinrovaFireMaskTex" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="gTwinrovaFireDL" Offset="0x1A430"/>
+        <DList Name="gTwinrovaMagicParticleMaterialDL" Offset="0x1A528"/>
+        <DList Name="gTwinrovaMagicParticleModelDL" Offset="0x1A5A8"/>
+        <Texture Name="gTwinrovaMagicParticleTex" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="gTwinrovaEffectHaloDL" Offset="0x1A790"/>
+        <DList Name="gTwinrovaUnusedIceSteamCloudDL" Offset="0x1A8A0"/>
+        <DList Name="gTwinrovaIceMaterialDL" Offset="0x1A998"/>
+        <DList Name="gTwinrovaIceSurroundingPlayerMaterialDL" Offset="0x1AA50"/>
+        <DList Name="gTwinrovaIceModelDL" Offset="0x1AB00"/>
+        <Texture Name="gTwinrovaIcePoolTex" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
+        <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
+        <DList Name="gTwinrovaIcePoolDL" Offset="0x1BC00"/>
+        <Texture Name="gTwinrovaIcePoolShineTex" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="gTwinrovaIcePoolShineMaskTex" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="gTwinrovaIcePoolShineDL" Offset="0x1C1C0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilMaskTex" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="gTwinrovaKotakeMagicSigilTex" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="gTwinrovaKotakeMagicSigilDL" Offset="0x1CEE0"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilMaskTex" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="gTwinrovaKoumeMagicSigilTex" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="gTwinrovaKoumeMagicSigilDL" Offset="0x1DBE8"/>
+        <DList Name="gTwinrovaBeamDL" Offset="0x1DDF0"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeCenterDL" Offset="0x1E020"/>
+        <DList Name="gTwinrovaMirrorShieldFireChargeSidesDL" Offset="0x1E0E0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeCenterDL" Offset="0x1E2C0"/>
+        <DList Name="gTwinrovaMirrorShieldIceChargeSidesDL" Offset="0x1E3A0"/>
+        <Texture Name="gTwinrovaCloudMaskTex" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="gTwinrovaShieldAbsorbAndReflectEffectDL" Offset="0x1E9F0"/>
+        <Texture Name="gTwinrovaCircleTex" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="gTwinrovaSpawnPortalShadowDL" Offset="0x1EC68"/>
+        <Texture Name="gTwinrovaLightPillarAndHaloTex" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="gTwinrovaLightPillarDL" Offset="0x1EEB0"/>
+        <DList Name="gTwinrovaLightRaysDL" Offset="0x1F238"/>
+        <DList Name="gTwinrovaLightCircleDL" Offset="0x1F390"/>
+        <DList Name="gTwinrovaHaloDL" Offset="0x1F608"/>
+        <Limb Name="gTwinrovaKoumePelvisLimb" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="gTwinrovaKoumeLeftThighLimb" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="gTwinrovaKoumeLeftShinLimb" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="gTwinrovaKoumeLeftFootLimb" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="gTwinrovaKoumeRightThighLimb" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="gTwinrovaKoumeRightShinLimb" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="gTwinrovaKoumeRightFootLimb" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="gTwinrovaKoumeTorsoLimb" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveStartLimb" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveMidLimb" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveEndLimb" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="gTwinrovaKoumeLeftSleeveFrontLimb" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="gTwinrovaKoumeLeftHandLimb" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="gTwinrovaKoumeBroomLimb" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveStartLimb" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveMidLimb" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveEndLimb" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="gTwinrovaKoumeRightSleeveFrontLimb" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="gTwinrovaKoumeRightHandLimb" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="gTwinrovaKoumeNeckLimb" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="gTwinrovaKoumeHeadLimb" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="gTwinrovaKoumeRightBraidStartLimb" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="gTwinrovaKoumeRightBraidEndLimb" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="gTwinrovaKoumeTeethLimb" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidStartLimb" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="gTwinrovaKoumeLeftBraidEndLimb" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="gTwinrovaKoumeSkel" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Texture Name="gTwinrovaEyeHalfTex" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
+        <Animation Name="gTwinrovaDeathAnim" Offset="0x216DC"/>
+        <Animation Name="gTwinrovaIceAttackAnim" Offset="0x22700"/>
+        <Animation Name="gTwinrovaFireAttackAnim" Offset="0x23750"/>
+        <Animation Name="gTwinrovaDamageAnim" Offset="0x24374"/>
+        <Animation Name="gTwinrovaTPoseAnim" Offset="0x244B4"/>
+        <Texture Name="gTwinrovaSkinAndBangleTex" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="gTwinrovaEmblemTex" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="gTwinrovaBreastTex" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="gTwinrovaRightPantLegTex" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="gTwinrovaLeftPantLegTex" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="gTwinrovaRightFootDL" Offset="0x27720"/>
+        <DList Name="gTwinrovaRightShinDL" Offset="0x27820"/>
+        <DList Name="gTwinrovaRightThighDL" Offset="0x27970"/>
+        <DList Name="gTwinrovaRightSleeveEndDL" Offset="0x27A60"/>
+        <DList Name="gTwinrovaRightSleeveStartDL" Offset="0x27B78"/>
+        <DList Name="gTwinrovaRightForearmDL" Offset="0x27C98"/>
+        <DList Name="gTwinrovaRightUpperArmDL" Offset="0x27DE8"/>
+        <DList Name="gTwinrovaRightShoulderDL" Offset="0x27EE0"/>
+        <DList Name="gTwinrovaLeftSleeveEndDL" Offset="0x27FE8"/>
+        <DList Name="gTwinrovaLeftSleeveStartDL" Offset="0x28100"/>
+        <DList Name="gTwinrovaLeftForearmDL" Offset="0x28220"/>
+        <DList Name="gTwinrovaLeftUpperArmDL" Offset="0x28370"/>
+        <DList Name="gTwinrovaLeftShoulderDL" Offset="0x28468"/>
+        <DList Name="gTwinrovaLeftBraidEndDL" Offset="0x28570"/>
+        <DList Name="gTwinrovaLeftBraidStartDL" Offset="0x28668"/>
+        <DList Name="gTwinrovaRightBraidEndDL" Offset="0x28778"/>
+        <DList Name="gTwinrovaRightBraidStartDL" Offset="0x28870"/>
+        <DList Name="gTwinrovaRightBreastDL" Offset="0x28980"/>
+        <DList Name="gTwinrovaLeftBreastDL" Offset="0x28B78"/>
+        <DList Name="gTwinrovaTorsoDL" Offset="0x28D70"/>
+        <DList Name="gTwinrovaLeftFootDL" Offset="0x29268"/>
+        <DList Name="gTwinrovaLeftShinDL" Offset="0x293E0"/>
+        <DList Name="gTwinrovaLeftThighDL" Offset="0x29530"/>
+        <DList Name="gTwinrovaSash4DL" Offset="0x29620"/>
+        <DList Name="gTwinrovaSash3DL" Offset="0x29738"/>
+        <DList Name="gTwinrovaSash2DL" Offset="0x29900"/>
+        <DList Name="gTwinrovaSash1DL" Offset="0x299F8"/>
+        <DList Name="gTwinrovaPelvisDL" Offset="0x29B10"/>
+        <Texture Name="gTwinrovaEyeAndMouthTLUT" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="gTwinrovaEarAndFingerTLUT" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="gTwinrovaEyeClosedTex" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaGrimaceTex" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaEyebrowTex" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
+        <Texture Name="gTwinrovaEyeOpenTex" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
+        <Texture Name="gTwinrovaNoseTex" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
+        <Texture Name="gTwinrovaEarTex" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
+        <Texture Name="gTwinrovaSmileTex" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
+        <Texture Name="gTwinrovaFingerTex" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
+        <DList Name="gTwinrovaInvisibleLeftHairBunDL" Offset="0x2CAF0"/>
+        <DList Name="gTwinrovaInvisibleRightHairBunDL" Offset="0x2CB50"/>
+        <DList Name="gTwinrovaHeadDL" Offset="0x2CBB0"/>
+        <DList Name="gTwinrovaLeftHandDL" Offset="0x2D320"/>
+        <DList Name="gTwinrovaRightBroomDL" Offset="0x2D4A0"/>
+        <DList Name="gTwinrovaLeftBroomDL" Offset="0x2D5D8"/>
+        <DList Name="gTwinrovaRightHandDL" Offset="0x2D710"/>
+        <DList Name="gTwinrovaRightHairBunDL" Offset="0x2D890"/>
+        <DList Name="gTwinrovaLeftHairBunDL" Offset="0x2D940"/>
+        <DList Name="gTwinrovaHairIceJetDL" Offset="0x2D9F0"/>
+        <DList Name="gTwinrovaHairIceTrailDL" Offset="0x2DAE0"/>
+        <DList Name="gTwinrovaHairFireJetDL" Offset="0x2DBC8"/>
+        <DList Name="gTwinrovaHairFireTrailDL" Offset="0x2DCB8"/>
+        <DList Name="gTwinrovaBroomIceJetDL" Offset="0x2DDD8"/>
+        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
+        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
+        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
+        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
+        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
+        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
+        <Limb Name="gTwinrovaSash3Limb" LimbType="Standard" Offset="0x30994"/>
+        <Limb Name="gTwinrovaSash4Limb" LimbType="Standard" Offset="0x309A0"/>
+        <Limb Name="gTwinrovaLeftThighLimb" LimbType="Standard" Offset="0x309AC"/>
+        <Limb Name="gTwinrovaLeftShinLimb" LimbType="Standard" Offset="0x309B8"/>
+        <Limb Name="gTwinrovaLeftFootLimb" LimbType="Standard" Offset="0x309C4"/>
+        <Limb Name="gTwinrovaRightThighLimb" LimbType="Standard" Offset="0x309D0"/>
+        <Limb Name="gTwinrovaRightShinLimb" LimbType="Standard" Offset="0x309DC"/>
+        <Limb Name="gTwinrovaRightFootLimb" LimbType="Standard" Offset="0x309E8"/>
+        <Limb Name="gTwinrovaTorsoLimb" LimbType="Standard" Offset="0x309F4"/>
+        <Limb Name="gTwinrovaLeftBreastLimb" LimbType="Standard" Offset="0x30A00"/>
+        <Limb Name="gTwinrovaRightBreastLimb" LimbType="Standard" Offset="0x30A0C"/>
+        <Limb Name="gTwinrovaHairIceTrailLimb" LimbType="Standard" Offset="0x30A18"/>
+        <Limb Name="gTwinrovaHairIceJetLimb" LimbType="Standard" Offset="0x30A24"/>
+        <Limb Name="gTwinrovaHairFireJetLimb" LimbType="Standard" Offset="0x30A30"/>
+        <Limb Name="gTwinrovaHairFireTrailLimb" LimbType="Standard" Offset="0x30A3C"/>
+        <Limb Name="gTwinrovaLeftHairBunLimb" LimbType="Standard" Offset="0x30A48"/>
+        <Limb Name="gTwinrovaRightHairBunLimb" LimbType="Standard" Offset="0x30A54"/>
+        <Limb Name="gTwinrovaHeadLimb" LimbType="Standard" Offset="0x30A60"/>
+        <Limb Name="gTwinrovaRightBraidStartLimb" LimbType="Standard" Offset="0x30A6C"/>
+        <Limb Name="gTwinrovaRightBraidEndLimb" LimbType="Standard" Offset="0x30A78"/>
+        <Limb Name="gTwinrovaLeftBraidStartLimb" LimbType="Standard" Offset="0x30A84"/>
+        <Limb Name="gTwinrovaLeftBraidEndLimb" LimbType="Standard" Offset="0x30A90"/>
+        <Limb Name="gTwinrovaLeftShoulderLimb" LimbType="Standard" Offset="0x30A9C"/>
+        <Limb Name="gTwinrovaLeftUpperArmLimb" LimbType="Standard" Offset="0x30AA8"/>
+        <Limb Name="gTwinrovaLeftForearmLimb" LimbType="Standard" Offset="0x30AB4"/>
+        <Limb Name="gTwinrovaLeftSleeveStartLimb" LimbType="Standard" Offset="0x30AC0"/>
+        <Limb Name="gTwinrovaLeftSleeveEndLimb" LimbType="Standard" Offset="0x30ACC"/>
+        <Limb Name="gTwinrovaBroomIceTrailLimb" LimbType="Standard" Offset="0x30AD8"/>
+        <Limb Name="gTwinrovaBroomIceJetLimb" LimbType="Standard" Offset="0x30AE4"/>
+        <Limb Name="gTwinrovaLeftHandLimb" LimbType="Standard" Offset="0x30AF0"/>
+        <Limb Name="gTwinrovaLeftBroomLimb" LimbType="Standard" Offset="0x30AFC"/>
+        <Limb Name="gTwinrovaRightShoulderLimb" LimbType="Standard" Offset="0x30B08"/>
+        <Limb Name="gTwinrovaRightUpperArmLimb" LimbType="Standard" Offset="0x30B14"/>
+        <Limb Name="gTwinrovaRightForearmLimb" LimbType="Standard" Offset="0x30B20"/>
+        <Limb Name="gTwinrovaRightSleeveStartLimb" LimbType="Standard" Offset="0x30B2C"/>
+        <Limb Name="gTwinrovaRightSleeveEndLimb" LimbType="Standard" Offset="0x30B38"/>
+        <Limb Name="gTwinrovaRightBroomLimb" LimbType="Standard" Offset="0x30B44"/>
+        <Limb Name="gTwinrovaBroomFireJetLimb" LimbType="Standard" Offset="0x30B50"/>
+        <Limb Name="gTwinrovaBroomFireTrailLimb" LimbType="Standard" Offset="0x30B5C"/>
+        <Limb Name="gTwinrovaRightHandLimb" LimbType="Standard" Offset="0x30B68"/>
+        <Skeleton Name="gTwinrovaSkel" Type="Flex" LimbType="Standard" Offset="0x30C20"/>
+        <Animation Name="gTwinrovaHoverAnim" Offset="0x317F8"/>
+        <Animation Name="gTwinrovaChargedAttackHitAnim" Offset="0x324F0"/>
+        <Animation Name="gTwinrovaStunStartAnim" Offset="0x32FB4"/>
+        <Animation Name="gTwinrovaStunLoopAnim" Offset="0x33C30"/>
+        <Animation Name="gTwinrovaStunEndAnim" Offset="0x34588"/>
+        <Animation Name="gTwinrovaWindUpAnim" Offset="0x35BBC"/>
+        <Animation Name="gTwinrovaIntroAnim" Offset="0x37A2C"/>
+        <Animation Name="gTwinrovaLaughAnim" Offset="0x38ED0"/>
+        <DList Name="gTwinrovaUnusedBoulderDL" Offset="0x39280"/>
+        <Texture Name="gTwinrovaUnusedBoulderTex" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x393B0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_umajump.xml b/soh/assets/xml/N64_NTSC_12/objects/object_umajump.xml
new file mode 100644
index 0000000000..2ee4ade46a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_umajump.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_umajump" Segment="6">
+        <Texture Name="gJumpableHorseFenceBrickTex" OutName="brick" Format="rgba16" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="gJumpableHorseFenceMetalBarTex" OutName="metal_bar" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <DList Name="gJumpableHorseFenceDL" Offset="0x1220"/>
+        <Collision Name="gJumpableHorseFenceCol" Offset="0x1438"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_vali.xml b/soh/assets/xml/N64_NTSC_12/objects/object_vali.xml
new file mode 100644
index 0000000000..2bab5efaa6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_vali.xml
@@ -0,0 +1,63 @@
+<Root>
+    <File Name="object_vali" Segment="6">
+        <!-- Bari animations -->
+        <Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
+        <Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
+        <Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
+        <Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
+        <Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
+
+        <!-- Bari DLists -->
+        <DList Name="gBariInnerHoodDL" Offset="0x2610"/>
+        <DList Name="gBariNucleusDL" Offset="0x2740"/>
+        <DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
+        <DList Name="gBariRightMandibleDL" Offset="0x2968"/>
+        <DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
+        <DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
+        <DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
+        <DList Name="gBariRightForearmDL" Offset="0x2C20"/>
+        <DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
+        <DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
+        <DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
+        <DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
+        <DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
+
+        <!-- Bari DList textures -->
+        <Texture Name="gBariNucleusTex" OutName="bari_nucleus" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
+        <Texture Name="gBariMandibleClawTex" OutName="bari_mandible_claw" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="gBariOuterHoodForearmTex" OutName="bari_outer_hood_forearm" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
+        <Texture Name="gBariOuterHoodBottomTex" OutName="bari_outer_hood_bottom" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
+        <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
+
+        <!-- Bari Limbs and Skeleton -->
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_vase.xml b/soh/assets/xml/N64_NTSC_12/objects/object_vase.xml
new file mode 100644
index 0000000000..091d4c51e3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_vase.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="object_vase" Segment="6">
+        <DList Name="gUnusedVaseDL" Offset="0x0"/>
+        <Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgba16" Width="32" Height="32" Offset="0xD90"/>
+        <Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgba16" Width="32" Height="32" Offset="0x590"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_vm.xml b/soh/assets/xml/N64_NTSC_12/objects/object_vm.xml
new file mode 100644
index 0000000000..c5b949b36e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_vm.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="object_vm" Segment="6">
+        <!-- Beamos Skeleton -->
+        <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
+
+        <!-- Beamos Skeleton Limbs -->
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
+
+        <!-- Beamos Limb DisplayLists -->
+        <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
+        <DList Name="gBeamosBottomEyelidDL" Offset="0x2460"/>
+        <DList Name="gBeamosEyeDL" Offset="0x2610"/>
+        <DList Name="gBeamosBodyDL" Offset="0x1E00"/>
+
+        <!-- Beamos DisplayList Textures -->
+        <Texture Name="gBeamosBodyGradientTex" OutName="body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0"/>
+        <Texture Name="gBeamosGrayMetalTex" OutName="gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840"/>
+        <Texture Name="gBeamosBoltAndMetalTex" OutName="bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940"/>
+        <Texture Name="gBeamosTex_2D40" OutName="tex_2D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40"/>
+        <Texture Name="gBeamosEyeOutlineTex" OutName="eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40"/>
+        <Texture Name="gBeamosEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="gBeamosBodyTex" OutName="body" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
+        <Texture Name="gBeamosLaserTex" OutName="laser" Format="rgba16" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gBeamosTeethTex" OutName="teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0"/>
+
+        <!-- Beamos Animations -->
+        <Animation Name="gBeamosAnim" Offset="0x68"/>
+
+        <!-- Beamos Laser DisplayList -->
+        <DList Name="gBeamosLaserDL" Offset="0x2728"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_wallmaster.xml b/soh/assets/xml/N64_NTSC_12/objects/object_wallmaster.xml
new file mode 100644
index 0000000000..fbbc4f4af3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_wallmaster.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="object_wallmaster" Segment="6">
+        <!-- Used by both Wallmaster and Floormaster -->
+        <Animation Name="gWallmasterDamageAnim" Offset="0x590"/>
+        <Animation Name="gWallmasterRecoverFromDamageAnim" Offset="0xEA4"/>
+        <Animation Name="gWallmasterJumpAnim" Offset="0x19CC"/>
+        <Animation Name="gWallmasterWalkAnim" Offset="0x41F4"/>
+        <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244"/>
+        <Animation Name="gWallmasterHoverAnim" Offset="0x9520"/>
+        <Animation Name="gWallmasterWaitAnim" Offset="0x9DB0"/>
+        <Animation Name="gWallmasterStandUpAnim" Offset="0xA054"/>
+
+        <DList Name="gWallmasterFingerDL" Offset="0x8688"/>
+
+        <Texture Name="gWallmasterExposedBoneTex" OutName="exposed_bone" Format="rgba16" Width="8" Height="16" Offset="0x88F0"/>
+        <Texture Name="gWallmasterBloodyEdgeTex" OutName="bloody_edge" Format="rgba16" Width="8" Height="16" Offset="0x89F0"/>
+        <Texture Name="gWallmasterUpperSkinTex" OutName="upper_skin" Format="rgba16" Width="8" Height="8" Offset="0x8AF0"/>
+        <Texture Name="gWallmasterFingerTipTex" OutName="finger_tip" Format="rgba16" Width="4" Height="16" Offset="0x8B70"/>
+        <Texture Name="gWallmasterUpperToUnderBorderTex" OutName="upper_under_border" Format="rgba16" Width="4" Height="8" Offset="0x8BF0"/>
+        <Texture Name="gWallmasterUnderSkinTex" OutName="under_skin" Format="rgba16" Width="8" Height="16" Offset="0x8C30"/>
+        <Texture Name="gWallmasterKnuckleTex" OutName="knuckle" Format="rgba16" Width="8" Height="16" Offset="0x8D30"/>
+
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" Offset="0x8FB0"/>
+
+        <!-- Used by Wallmaster only -->
+        <Animation Name="gWallmasterLungeAnim" Offset="0x299C"/>
+
+        <!-- Used by Floormaster only -->
+        <Animation Name="gFloormasterTurnAnim" Offset="0x2158"/>
+        <Animation Name="gFloormasterTapFingerAnim" Offset="0x39B0"/>
+
+        <!-- Unused. Name inferred from OoT3D -->
+        <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_warp1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_warp1.xml
new file mode 100644
index 0000000000..1497d7a108
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_warp1.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="object_warp1" Segment="6">
+        <!-- Portal -->
+        <DList Name="gWarpPortalDL" Offset="0x01A0"/>
+        <Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
+        <!-- Crystal -->
+        <Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
+        <DList Name="gWarp1DL_001750" Offset="0x1750"/>
+        <DList Name="gWarp1DL_001828" Offset="0x1828"/>
+        <DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
+        <DList Name="gWarp1DL_001938" Offset="0x1938"/>
+        <DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
+        <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
+        <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
+        <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
+        <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_warp2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_warp2.xml
new file mode 100644
index 0000000000..b6d1b3624c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_warp2.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="object_warp2" Segment="6">
+        <!-- This file is empty -->
+        <Blob Name="gWarp2Blob_000000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_wf.xml b/soh/assets/xml/N64_NTSC_12/objects/object_wf.xml
new file mode 100644
index 0000000000..ebfb708d2d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_wf.xml
@@ -0,0 +1,128 @@
+<Root>
+    <File Name="object_wf" Segment="6">
+        <Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0"/>
+        <Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100"/>
+        <Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180"/>
+        <Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200"/>
+        <Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280"/>
+        <Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300"/>
+        
+        <DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20"/>
+        <DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8"/>
+        <DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8"/>
+        <DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8"/>
+        <DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98"/>
+        <DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98"/>
+        <DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88"/>
+        <DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078"/>
+        <DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148"/>
+        <DList Name="gWolfosWhiteThoraxDL" Offset="0x2248"/>
+        <DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368"/>
+        <DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490"/>
+        <DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0"/>
+        <DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8"/>
+        
+        <Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8"/>
+        <Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8"/>
+        
+        <DList Name="gWolfosWhiteTailDL" Offset="0x3488"/>
+        <DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528"/>
+        <DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0"/>
+        <DList Name="gWolfosWhiteHeadDL" Offset="0x36B8"/>
+        <DList Name="gWolfosWhiteEyesDL" Offset="0x39D8"/>
+
+        <Limb Name="gWolfosWhiteRootLimb" LimbType="Standard" Offset="0x3A70"/>
+        <Limb Name="gWolfosWhiteBackLeftThighLimb" LimbType="Standard" Offset="0x3A7C"/>
+        <Limb Name="gWolfosWhiteBackLeftShinLimb" LimbType="Standard" Offset="0x3A88"/>
+        <Limb Name="gWolfosWhiteBackLeftPasternLimb" LimbType="Standard" Offset="0x3A94"/>
+        <Limb Name="gWolfosWhiteBackLeftPawLimb" LimbType="Standard" Offset="0x3AA0"/>
+        <Limb Name="gWolfosWhiteTailLimb" LimbType="Standard" Offset="0x3AAC"/>
+        <Limb Name="gWolfosWhiteAbdomenLimb" LimbType="Standard" Offset="0x3AB8"/>
+        <Limb Name="gWolfosWhiteBackRightThighLimb" LimbType="Standard" Offset="0x3AC4"/>
+        <Limb Name="gWolfosWhiteBackRightShinLimb" LimbType="Standard" Offset="0x3AD0"/>
+        <Limb Name="gWolfosWhiteBackRightPasternLimb" LimbType="Standard" Offset="0x3ADC"/>
+        <Limb Name="gWolfosWhiteBackRightPawLimb" LimbType="Standard" Offset="0x3AE8"/>
+        <Limb Name="gWolfosWhiteThoraxLimb" LimbType="Standard" Offset="0x3AF4"/>
+        <Limb Name="gWolfosWhiteFrontRightUpperLegLimb" LimbType="Standard" Offset="0x3B00"/>
+        <Limb Name="gWolfosWhiteFrontRightLowerLegLimb" LimbType="Standard" Offset="0x3B0C"/>
+        <Limb Name="gWolfosWhiteFrontRightClawLimb" LimbType="Standard" Offset="0x3B18"/>
+        <Limb Name="gWolfosWhiteHeadRootLimb" LimbType="Standard" Offset="0x3B24"/>
+        <Limb Name="gWolfosWhiteHeadLimb" LimbType="Standard" Offset="0x3B30"/>
+        <Limb Name="gWolfosWhiteEyesLimb" LimbType="Standard" Offset="0x3B3C"/>
+        <Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x3B48"/>
+        <Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x3B54"/>
+        <Limb Name="gWolfosWhiteFrontLeftClawLimb" LimbType="Standard" Offset="0x3B60"/>
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x3BC0"/>
+
+        <Animation Name="gWolfosSlashingAnim" Offset="0x4638"/>
+        <Blob Name="object_wf_zeroes_Blob_004648" Size="0x48" Offset="0x4648"/>
+        <Animation Name="gWolfosBackflippingAnim" Offset="0x4AD0"/>
+        <Blob Name="object_wf_zeroes_Blob_004AE0" Size="0x20" Offset="0x4AE0"/>
+        <Animation Name="gWolfosBlockingAnim" Offset="0x4CA4"/>
+        <Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x5430"/><!-- Used partially for appearing and completely for dying -->
+        <Blob Name="object_wf_zeroes_Blob_005440" Size="0x40" Offset="0x5440"/>
+        <Animation Name="gWolfosRunningAnim" Offset="0x57A0"/>
+        <Blob Name="object_wf_zeroes_Blob_0057B0" Size="0x20" Offset="0x57B0"/>
+
+        <DList Name="gWolfosNormalAbdomenDL" Offset="0x6DD0"/>
+        <DList Name="gWolfosNormalBackRightThighDL" Offset="0x6E98"/>
+        <DList Name="gWolfosNormalBackRightShinDL" Offset="0x6F88"/>
+        <DList Name="gWolfosNormalBackRightPasternDL" Offset="0x7078"/>
+        <DList Name="gWolfosNormalBackRightPawDL" Offset="0x7148"/>
+        <DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7248"/>
+        <DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7338"/>
+        <DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7428"/>
+        <DList Name="gWolfosNormalBackLeftPawDL" Offset="0x74F8"/>
+        <DList Name="gWolfosNormalThoraxDL" Offset="0x75F8"/>
+        <DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7718"/>
+        <DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7830"/>
+        <DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7940"/>
+        <DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7A58"/>
+
+        <Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7B68"/>
+
+        <Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7D68"/>
+        <Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x8168"/>
+        <Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x81E8"/>
+        <Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x8268"/>
+        <Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x82E8"/>
+
+        <Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x8368"/>
+        <Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x8568"/>
+
+        <DList Name="gWolfosNormalTailDL" Offset="0x8F58"/>
+        <DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8FF8"/>
+        <DList Name="gWolfosNormalFrontRightClawDL" Offset="0x90C0"/>
+        <DList Name="gWolfosNormalHeadDL" Offset="0x9188"/>
+        <DList Name="gWolfosNormalEyesDL" Offset="0x94A8"/>
+
+        <Limb Name="gWolfosNormalRootLimb" LimbType="Standard" Offset="0x9540"/>
+        <Limb Name="gWolfosNormalBackLeftThighLimb" LimbType="Standard" Offset="0x954C"/>
+        <Limb Name="gWolfosNormalBackLeftShinLimb" LimbType="Standard" Offset="0x9558"/>
+        <Limb Name="gWolfosNormalBackLeftPasternLimb" LimbType="Standard" Offset="0x9564"/>
+        <Limb Name="gWolfosNormalBackLeftPawLimb" LimbType="Standard" Offset="0x9570"/>
+        <Limb Name="gWolfosNormalTailLimb" LimbType="Standard" Offset="0x957C"/>
+        <Limb Name="gWolfosNormalAbdomenLimb" LimbType="Standard" Offset="0x9588"/>
+        <Limb Name="gWolfosNormalBackRightThighLimb" LimbType="Standard" Offset="0x9594"/>
+        <Limb Name="gWolfosNormalBackRightShinLimb" LimbType="Standard" Offset="0x95A0"/>
+        <Limb Name="gWolfosNormalBackRightPasternLimb" LimbType="Standard" Offset="0x95AC"/>
+        <Limb Name="gWolfosNormalBackRightPawLimb" LimbType="Standard" Offset="0x95B8"/>
+        <Limb Name="gWolfosNormalThoraxLimb" LimbType="Standard" Offset="0x95C4"/>
+        <Limb Name="gWolfosNormalFrontRightUpperLegLimb" LimbType="Standard" Offset="0x95D0"/>
+        <Limb Name="gWolfosNormalFrontRightLowerLegLimb" LimbType="Standard" Offset="0x95DC"/>
+        <Limb Name="gWolfosNormalFrontRightClawLimb" LimbType="Standard" Offset="0x95E8"/>
+        <Limb Name="gWolfosNormalHeadRootLimb" LimbType="Standard" Offset="0x95F4"/>
+        <Limb Name="gWolfosNormalHeadLimb" LimbType="Standard" Offset="0x9600"/>
+        <Limb Name="gWolfosNormalEyesLimb" LimbType="Standard" Offset="0x960C"/>
+        <Limb Name="gWolfosNormalFrontLeftUpperLegLimb" LimbType="Standard" Offset="0x9618"/>
+        <Limb Name="gWolfosNormalFrontLeftLowerLegLimb" LimbType="Standard" Offset="0x9624"/>
+        <Limb Name="gWolfosNormalFrontLeftClawLimb" LimbType="Standard" Offset="0x9630"/>
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" Offset="0x9690"/>
+
+        <Animation Name="gWolfosSidesteppingAnim" Offset="0x98C8"/>
+        <Blob Name="object_wf_zeroes_Blob_0098D8" Size="0x18" Offset="0x98D8"/>
+        <Animation Name="gWolfosDamagedAnim" Offset="0x9B20"/>
+        <Animation Name="gWolfosWaitingAnim" Offset="0xA4AC"/>
+        <Blob Name="object_wf_zeroes_Blob_00A4BC" Size="0x44" Offset="0xA4BC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_wood02.xml b/soh/assets/xml/N64_NTSC_12/objects/object_wood02.xml
new file mode 100644
index 0000000000..47ec342caa
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_wood02.xml
@@ -0,0 +1,35 @@
+<Root>
+    <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="objects/gameplay_field_keep/"/>
+    <File Name="object_wood02" Segment="6">
+        <DList Name="object_wood02_DL_000090" Offset="0x90"/>
+        <DList Name="object_wood02_DL_000160" Offset="0x160"/>
+        <DList Name="object_wood02_DL_000340" Offset="0x340"/>
+        <DList Name="object_wood02_DL_000440" Offset="0x440"/>
+        <Texture Name="object_wood02_Tex_0004D0" OutName="tex_000004D0" Format="rgba16" Width="16" Height="16" Offset="0x4D0"/>
+        <DList Name="object_wood02_DL_000700" Offset="0x700"/>
+        <Texture Name="object_wood02_Tex_000790" OutName="tex_00000790" Format="rgba16" Width="32" Height="32" Offset="0x790"/>
+        <Texture Name="object_wood02_Tex_000F90" OutName="tex_00000F90" Format="ia4" Width="32" Height="128" Offset="0xF90"/>
+        <Texture Name="object_wood02_Tex_001790" OutName="tex_00001790" Format="ia8" Width="32" Height="128" Offset="0x1790"/>
+        <Texture Name="object_wood02_Tex_002790" OutName="tex_00002790" Format="ia4" Width="32" Height="128" Offset="0x2790"/>
+        <Texture Name="object_wood02_Tex_002F90" OutName="tex_00002F90" Format="rgba16" Width="32" Height="32" Offset="0x2F90"/>
+        <Texture Name="object_wood02_Tex_003790" OutName="tex_00003790" Format="ia8" Width="32" Height="128" Offset="0x3790"/>
+        <Texture Name="object_wood02_Tex_004790" OutName="tex_00004790" Format="ia8" Width="32" Height="64" Offset="0x4790"/>
+        <Texture Name="object_wood02_Tex_004F90" OutName="tex_00004F90" Format="ia8" Width="32" Height="128" Offset="0x4F90"/>
+        <Texture Name="object_wood02_Tex_005F90" OutName="tex_00005F90" Format="ia8" Width="32" Height="64" Offset="0x5F90"/>
+        <Texture Name="object_wood02_Tex_006790" OutName="tex_00006790" Format="ia8" Width="32" Height="64" Offset="0x6790"/>
+        <Texture Name="object_wood02_Tex_006F90" OutName="tex_00006F90" Format="ia8" Width="32" Height="64" Offset="0x6F90"/>
+        <DList Name="object_wood02_DL_0078D0" Offset="0x78D0"/>
+        <DList Name="object_wood02_DL_007968" Offset="0x7968"/>
+        <Blob Name="object_wood02_Blob_007A00" Size="0xA0" Offset="0x7A00"/>
+        <DList Name="object_wood02_DL_007AD0" Offset="0x7AD0"/>
+        <DList Name="object_wood02_DL_007CA0" Offset="0x7CA0"/>
+        <DList Name="object_wood02_DL_007D38" Offset="0x7D38"/>
+        <DList Name="object_wood02_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_wood02_DL_0080D0" Offset="0x80D0"/>
+        <DList Name="object_wood02_DL_0081A8" Offset="0x81A8"/>
+        <DList Name="object_wood02_DL_0082B0" Offset="0x82B0"/>
+        <DList Name="object_wood02_DL_008350" Offset="0x8350"/>
+        <DList Name="object_wood02_DL_0083E0" Offset="0x83E0"/>
+        <DList Name="object_wood02_DL_0085C0" Offset="0x85C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_xc.xml b/soh/assets/xml/N64_NTSC_12/objects/object_xc.xml
new file mode 100644
index 0000000000..bb2bf3e7af
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_xc.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="object_xc" Segment="6">
+        <Texture Name="object_xcTex_004C40" OutName="object_xcTex_004C40" Format="ci8" Width="8" Height="8" Offset="0x5660" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_004C80" OutName="object_xcTex_004C80" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_005CC0" OutName="object_xcTex_005CC0" Format="ci8" Width="32" Height="32" Offset="0x66E0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0060C0" OutName="object_xcTex_0060C0" Format="ci8" Width="32" Height="32" Offset="0x6AE0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0064C0" OutName="object_xcTex_0064C0" Format="rgba16" Width="32" Height="32" Offset="0x6EE0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006CC0" OutName="object_xcTex_006CC0" Format="ci8" Width="8" Height="16" Offset="0x76E0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D40" OutName="object_xcTex_006D40" Format="ci8" Width="8" Height="8" Offset="0x7760" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006D80" OutName="object_xcTex_006D80" Format="ci8" Width="16" Height="16" Offset="0x77A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_006E80" OutName="object_xcTex_006E80" Format="ci8" Width="32" Height="32" Offset="0x78A0" TlutOffset="0x5460" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007280" OutName="object_xcTex_007280" Format="ci8" Width="16" Height="16" Offset="0x7CA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007380" OutName="object_xcTex_007380" Format="rgba16" Width="32" Height="32" Offset="0x7DA0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_007B80" OutName="object_xcTex_007B80" Format="ci8" Width="32" Height="64" Offset="0x85A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008380" OutName="object_xcTex_008380" Format="ci8" Width="32" Height="64" Offset="0x8DA0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008B80" OutName="object_xcTex_008B80" Format="ci8" Width="16" Height="8" Offset="0x95A0" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_008C00" OutName="object_xcTex_008C00" Format="ci8" Width="32" Height="16" Offset="0x9620" TlutOffset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F790" OutName="object_xcTex_00F790" Format="ci8" Width="8" Height="8" Offset="0x101B0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00F7D0" OutName="object_xcTex_00F7D0" Format="ci8" Width="32" Height="32" Offset="0x101F0" TlutOffset="0x10140" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FBD0" OutName="object_xcTex_00FBD0" Format="ci8" Width="16" Height="16" Offset="0x105F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FCD0" OutName="object_xcTex_00FCD0" Format="ci8" Width="8" Height="8" Offset="0x106F0" TlutOffset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD10" OutName="object_xcTex_00FD10" Format="rgba16" Width="8" Height="8" Offset="0x10730" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FD90" OutName="object_xcTex_00FD90" Format="i8" Width="8" Height="8" Offset="0x107B0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_00FDD0" OutName="object_xcTex_00FDD0" Format="rgba16" Width="16" Height="32" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_0101D0" OutName="object_xcTex_0101D0" Format="rgba16" Width="8" Height="16" Offset="0x10BF0" AddedByScript="true"/>
+        <Texture Name="object_xcTex_011930" OutName="object_xcTex_011930" Format="i8" Width="64" Height="64" Offset="0x12350" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_004840" OutName="object_xcTLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F6C0" OutName="object_xcTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0x100E0" AddedByScript="true"/>
+        <Texture Name="object_xcTLUT_00F720" OutName="object_xcTLUT_00F720" Format="rgba16" Width="16" Height="16" Offset="0x10140" AddedByScript="true"/>
+        <Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x13510"/>
+        <Animation Name="gSheikPlayingHarpAnim" Offset="0xDB8"/>
+        <Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1C58"/>
+        <Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1F64"/>
+        <Animation Name="gSheikPlayingHarp2Anim" Offset="0x2D38"/>
+        <Animation Name="gSheikPlayingHarp3Anim" Offset="0x3CE8"/>
+        <Animation Name="gSheikPlayingHarp4Anim" Offset="0x4F90"/>
+        <Animation Name="gSheikIdleAnim" Offset="0x5248"/>
+        <Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x5460"/>
+        <Animation Name="gSheikWalkingAnim" Offset="0x139F0"/>
+        <Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x144C4"/>
+        <Animation Name="gSheikFallingFromContortionsAnim" Offset="0x15404"/>
+        <Animation Name="gSheikContortionsAnim" Offset="0x17408"/>
+        <Animation Name="gSheikPlayingHarp5Anim" Offset="0x18218"/>
+        <Animation Name="gSheikInitialHarpAnim" Offset="0x18674"/>
+        <Animation Name="gSheikDefenseStanceAnim" Offset="0x19520"/>
+        <Animation Name="gSheikThrowingNutAnim" Offset="0x19FB8"/>
+        <Animation Name="gSheikKneelingAnim" Offset="0x1A650"/>
+        <Animation Name="gSheikHittingGroundAnim" Offset="0x1A998"/>
+        <Animation Name="gSheikAnim_01A048" Offset="0x1AA68"/>
+        <Animation Name="gSheikPullingOutHarpAnim" Offset="0x1BBBC"/>
+        <Animation Name="gSheikFallingFromSkyAnim" Offset="0x1CB08"/>
+        <Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
+        <Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
+        <Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x5EE0"/>
+        <Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x62E0"/>
+        <DList Name="gSheikHarpDL" Offset="0x11B70"/>
+        <DList Name="gSheikDL_011620" Offset="0x12040"/>
+        <DList Name="gSheikDL_012970" Offset="0x13390"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_yabusame_point.xml b/soh/assets/xml/N64_NTSC_12/objects/object_yabusame_point.xml
new file mode 100644
index 0000000000..bed9e8a609
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_yabusame_point.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_yabusame_point" Segment="6">
+        <Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
+        <Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
+        <DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_ydan_objects.xml b/soh/assets/xml/N64_NTSC_12/objects/object_ydan_objects.xml
new file mode 100644
index 0000000000..e2adf307f7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_ydan_objects.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="object_ydan_objects" Segment="6">
+
+        <Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgba16" Width="32" Height="64" Offset="0x2800"/>
+        <Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
+        <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
+        <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
+        <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
+        <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
+        <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
+        <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
+        <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
+        <DList Name="gDTWebWallDL" Offset="0x5F40"/>
+        <DList Name="gDTWebFloorDL" Offset="0x61B0"/>
+        <DList Name="gDTFallingLadderDL" Offset="0x6570"/>
+        <DList Name="gDTDungeonDoor1DL" Offset="0x67A0"/>
+        <DList Name="gDTDungeonDoor2DL" Offset="0x6910"/>
+        <DList Name="gDTSlidingPlatformDL" Offset="0x7508"/>
+        <DList Name="gDTRollingSpikeTrapDL" Offset="0x8D88"/>
+        <Collision Name="gDTRisingPlatformsCol" Offset="0x5780"/>
+        <Collision Name="gDTWebWallCol" Offset="0x6050"/>
+        <Collision Name="gDTWebFloorCol" Offset="0x6460"/>
+        <Collision Name="gDTFallingLadderCol" Offset="0x66A8"/>
+        <Collision Name="gDTSlidingPlatformCol" Offset="0x7798"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_yukabyun.xml b/soh/assets/xml/N64_NTSC_12/objects/object_yukabyun.xml
new file mode 100644
index 0000000000..d594ebbb89
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_yukabyun.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="object_yukabyun" Segment="6">
+        <Texture Name="gFloorTileEnemyBottomTex" OutName="bottom" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gFloorTileEnemyTopTex" OutName="top" Format="rgba16" Width="32" Height="32" Offset="0xAF0"/>
+        <Texture Name="gFloorTileEnemyFragmentTex" OutName="fragment" Format="rgba16" Width="16" Height="16" Offset="0x12F0"/>
+        <DList Name="gFloorTileEnemyDL" Offset="0x970"/>
+        <DList Name="gFloorTileEnemyFragmentDL" Offset="0xA60"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zf.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zf.xml
new file mode 100644
index 0000000000..7f20eb7866
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zf.xml
@@ -0,0 +1,182 @@
+<Root>
+    <File Name="object_zf" Segment="6">
+        <Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
+        <Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
+        <Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
+        <Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
+        <Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
+        <Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
+        <Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
+        <DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
+        <DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>
+        <DList Name="gZfDinolfosRightFootDL" Offset="0x3908"/>
+        <DList Name="gZfDinolfosLeftThighDL" Offset="0x3A60"/>
+        <DList Name="gZfDinolfosLeftShinDL" Offset="0x3CC8"/>
+        <DList Name="gZfDinolfosLeftFootDL" Offset="0x3E58"/>
+        <DList Name="gZfDinolfosRightUpperArmDL" Offset="0x3FB0"/>
+        <DList Name="gZfDinolfosRightForearmDL" Offset="0x41A8"/>
+        <DList Name="gZfDinolfosSwordDL" Offset="0x4330"/>
+        <DList Name="gZfDinolfosLeftUpperArmDL" Offset="0x44F0"/>
+        <DList Name="gZfDinolfosLeftForearmDL" Offset="0x46E8"/>
+        <DList Name="gZfDinolfosLeftHandDL" Offset="0x4870"/>
+        <DList Name="gZfDinolfosTailBaseDL" Offset="0x4A00"/>
+        <DList Name="gZfDinolfosTailTipDL" Offset="0x4D50"/>
+        <DList Name="gZfDinolfosScabbardDL" Offset="0x4DF8"/>
+        <DList Name="gZfDinolfosTrunkDL" Offset="0x4EA0"/>
+        <DList Name="gZfDinolfosChestArmorDL" Offset="0x5180"/>
+        <DList Name="gZfDinolfosNeckDL" Offset="0x5300"/>
+        <DList Name="gZfDinolfosJawDL" Offset="0x5598"/>
+        <DList Name="gZfDinolfosHeadDL" Offset="0x59C8"/>
+        <Limb Name="gZfDinolfosRootLimb" LimbType="Standard" Offset="0x6390"/>
+        <Limb Name="gZfDinolfosBodyRootLimb" LimbType="Standard" Offset="0x639C"/>
+        <Limb Name="gZfDinolfosUpperBodyRootLimb" LimbType="Standard" Offset="0x63A8"/>
+        <Limb Name="gZfDinolfosNeckRootLimb" LimbType="Standard" Offset="0x63B4"/>
+        <Limb Name="gZfDinolfosHeadRootLimb" LimbType="Standard" Offset="0x63C0"/>
+        <Limb Name="gZfDinolfosJawRootRootLimb" LimbType="Standard" Offset="0x63CC"/>
+        <Limb Name="gZfDinolfosJawRootLimb" LimbType="Standard" Offset="0x63D8"/>
+        <Limb Name="gZfDinolfosJawLimb" LimbType="Standard" Offset="0x63E4"/>
+        <Limb Name="gZfDinolfosHeadLimb" LimbType="Standard" Offset="0x63F0"/>
+        <Limb Name="gZfDinolfosNeckLimb" LimbType="Standard" Offset="0x63FC"/>
+        <Limb Name="gZfDinolfosRightArmRootLimb" LimbType="Standard" Offset="0x6408"/>
+        <Limb Name="gZfDinolfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x6414"/>
+        <Limb Name="gZfDinolfosRightForearmRootLimb" LimbType="Standard" Offset="0x6420"/>
+        <Limb Name="gZfDinolfosSwordRootLimb" LimbType="Standard" Offset="0x642C"/>
+        <Limb Name="gZfDinolfosSwordLimb" LimbType="Standard" Offset="0x6438"/>
+        <Limb Name="gZfDinolfosRightForearmLimb" LimbType="Standard" Offset="0x6444"/>
+        <Limb Name="gZfDinolfosRightUpperArmLimb" LimbType="Standard" Offset="0x6450"/>
+        <Limb Name="gZfDinolfosLeftArmRootLimb" LimbType="Standard" Offset="0x645C"/>
+        <Limb Name="gZfDinolfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x6468"/>
+        <Limb Name="gZfDinolfosLeftForearmRootLimb" LimbType="Standard" Offset="0x6474"/>
+        <Limb Name="gZfDinolfosLeftHandRootLimb" LimbType="Standard" Offset="0x6480"/>
+        <Limb Name="gZfDinolfosLeftHandLimb" LimbType="Standard" Offset="0x648C"/>
+        <Limb Name="gZfDinolfosLeftForearmLimb" LimbType="Standard" Offset="0x6498"/>
+        <Limb Name="gZfDinolfosLeftUpperArmLimb" LimbType="Standard" Offset="0x64A4"/>
+        <Limb Name="gZfDinolfosChestArmorLimb" LimbType="Standard" Offset="0x64B0"/>
+        <Limb Name="gZfDinolfosTailRootLimb" LimbType="Standard" Offset="0x64BC"/>
+        <Limb Name="gZfDinolfosTailBaseRootLimb" LimbType="Standard" Offset="0x64C8"/>
+        <Limb Name="gZfDinolfosTailTipRootLimb" LimbType="Standard" Offset="0x64D4"/>
+        <Limb Name="gZfDinolfosTailTipLimb" LimbType="Standard" Offset="0x64E0"/>
+        <Limb Name="gZfDinolfosTailBaseLimb" LimbType="Standard" Offset="0x64EC"/>
+        <Limb Name="gZfDinolfosScabbardRootRootLimb" LimbType="Standard" Offset="0x64F8"/>
+        <Limb Name="gZfDinolfosScabbardRootLimb" LimbType="Standard" Offset="0x6504"/>
+        <Limb Name="gZfDinolfosScabbardLimb" LimbType="Standard" Offset="0x6510"/>
+        <Limb Name="gZfDinolfosRightLegRootLimb" LimbType="Standard" Offset="0x651C"/>
+        <Limb Name="gZfDinolfosRightThighRootLimb" LimbType="Standard" Offset="0x6528"/>
+        <Limb Name="gZfDinolfosRightShinRootLimb" LimbType="Standard" Offset="0x6534"/>
+        <Limb Name="gZfDinolfosRightFootRootLimb" LimbType="Standard" Offset="0x6540"/>
+        <Limb Name="gZfDinolfosRightFootLimb" LimbType="Standard" Offset="0x654C"/>
+        <Limb Name="gZfDinolfosRightShinLimb" LimbType="Standard" Offset="0x6558"/>
+        <Limb Name="gZfDinolfosRightThighLimb" LimbType="Standard" Offset="0x6564"/>
+        <Limb Name="gZfDinolfosLeftLegRootLimb" LimbType="Standard" Offset="0x6570"/>
+        <Limb Name="gZfDinolfosLeftThighRootLimb" LimbType="Standard" Offset="0x657C"/>
+        <Limb Name="gZfDinolfosLeftShinRootLimb" LimbType="Standard" Offset="0x6588"/>
+        <Limb Name="gZfDinolfosLeftFootRootLimb" LimbType="Standard" Offset="0x6594"/>
+        <Limb Name="gZfDinolfosLeftFootLimb" LimbType="Standard" Offset="0x65A0"/>
+        <Limb Name="gZfDinolfosLeftShinLimb" LimbType="Standard" Offset="0x65AC"/>
+        <Limb Name="gZfDinolfosLeftThighLimb" LimbType="Standard" Offset="0x65B8"/>
+        <Limb Name="gZfDinolfosTrunkLimb" LimbType="Standard" Offset="0x65C4"/>
+        <Skeleton Name="gZfDinolfosSkel" Type="Normal" LimbType="Standard" Offset="0x6690"/>
+
+        <Animation Name="gZfWalkingAnim" Offset="0x8138"/>
+        <Animation Name="gZfLandingAnim" Offset="0x8C6C"/>
+        <Animation Name="gZfJumpingAnim" Offset="0x9530"/>
+        <Animation Name="gZfSlashAnim" Offset="0xA3D4"/>
+        <Animation Name="gZfCryingAnim" Offset="0xB10C"/>
+
+        <Texture Name="object_zf_Tex_00B120" OutName="tex_0000B120" Format="rgba16" Width="32" Height="32" Offset="0xB120"/>
+        <Texture Name="object_zf_Tex_00B920" OutName="tex_0000B920" Format="rgba16" Width="8" Height="8" Offset="0xB920"/>
+        <Texture Name="object_zf_Tex_00B9A0" OutName="tex_0000B9A0" Format="rgba16" Width="8" Height="8" Offset="0xB9A0"/>
+        <Texture Name="object_zf_Tex_00BA20" OutName="tex_0000BA20" Format="rgba16" Width="8" Height="8" Offset="0xBA20"/>
+        <Texture Name="object_zf_Tex_00BAA0" OutName="tex_0000BAA0" Format="rgba16" Width="8" Height="8" Offset="0xBAA0"/>
+        <Texture Name="object_zf_Tex_00BB20" OutName="tex_0000BB20" Format="rgba16" Width="8" Height="8" Offset="0xBB20"/>
+        <Texture Name="object_zf_Tex_00BBA0" OutName="tex_0000BBA0" Format="rgba16" Width="16" Height="16" Offset="0xBBA0"/>
+        <Texture Name="object_zf_Tex_00BDA0" OutName="tex_0000BDA0" Format="rgba16" Width="8" Height="8" Offset="0xBDA0"/>
+        <Texture Name="object_zf_Tex_00BE20" OutName="tex_0000BE20" Format="rgba16" Width="16" Height="16" Offset="0xBE20"/>
+        <Texture Name="object_zf_Tex_00C020" OutName="tex_0000C020" Format="rgba16" Width="16" Height="16" Offset="0xC020"/>
+        <Texture Name="object_zf_Tex_00C220" OutName="tex_0000C220" Format="rgba16" Width="8" Height="8" Offset="0xC220"/>
+        <Texture Name="object_zf_Tex_00C2A0" OutName="tex_0000C2A0" Format="rgba16" Width="8" Height="8" Offset="0xC2A0"/>
+        <DList Name="gZfLizalfosLeftThighDL" Offset="0xC410"/>
+        <DList Name="gZfLizalfosLeftShinDL" Offset="0xC640"/>
+        <DList Name="gZfLizalfosLeftFootDL" Offset="0xC978"/>
+        <DList Name="gZfLizalfosLeftUpperArmDL" Offset="0xCB48"/>
+        <DList Name="gZfLizalfosLeftForearmDL" Offset="0xCC80"/>
+        <DList Name="gZfLizalfosLeftHandDL" Offset="0xCFF0"/>
+        <DList Name="gZfLizalfosRightThighDL" Offset="0xD230"/>
+        <DList Name="gZfLizalfosRightShinDL" Offset="0xD460"/>
+        <DList Name="gZfLizalfosRightFootDL" Offset="0xD798"/>
+        <DList Name="gZfLizalfosRightUpperArmDL" Offset="0xD968"/>
+        <DList Name="gZfLizalfosRightForearmDL" Offset="0xDAA0"/>
+        <DList Name="gZfLizalfosSwordDL" Offset="0xDD20"/>
+        <DList Name="gZfEmptyHandDL" Offset="0xE198"/>
+        <DList Name="gZfLizalfosJawDL" Offset="0xE3E8"/>
+        <DList Name="gZfLizalfosHeadDL" Offset="0xE7E0"/>
+        <DList Name="gZfLizalfosTrunkDL" Offset="0xEBA8"/>
+        <DList Name="gZfLizalfosNeckDL" Offset="0xEE60"/>
+        <DList Name="gZfLizalfosChestArmorDL" Offset="0xF620"/>
+        <DList Name="gZfLizalfosTailBaseDL" Offset="0xF970"/>
+        <DList Name="gZfLizalfosTailTipDL" Offset="0xFB88"/>
+        <DList Name="gZfLizalfosScabbardDL" Offset="0xFDA0"/>
+        <DList Name="gZfSheathedSwordDL" Offset="0x10060"/>
+        <Limb Name="gZfLizalfosRootLimb" LimbType="Standard" Offset="0x101B8"/>
+        <Limb Name="gZfLizalfosBodyRootLimb" LimbType="Standard" Offset="0x101C4"/>
+        <Limb Name="gZfLizalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x101D0"/>
+        <Limb Name="gZfLizalfosNeckRootLimb" LimbType="Standard" Offset="0x101DC"/>
+        <Limb Name="gZfLizalfosHeadRootLimb" LimbType="Standard" Offset="0x101E8"/>
+        <Limb Name="gZfLizalfosJawRootRootLimb" LimbType="Standard" Offset="0x101F4"/>
+        <Limb Name="gZfLizalfosJawRootLimb" LimbType="Standard" Offset="0x10200"/>
+        <Limb Name="gZfLizalfosJawLimb" LimbType="Standard" Offset="0x1020C"/>
+        <Limb Name="gZfLizalfosHeadLimb" LimbType="Standard" Offset="0x10218"/>
+        <Limb Name="gZfLizalfosNeckLimb" LimbType="Standard" Offset="0x10224"/>
+        <Limb Name="gZfLizalfosRightArmRootLimb" LimbType="Standard" Offset="0x10230"/>
+        <Limb Name="gZfLizalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x1023C"/>
+        <Limb Name="gZfLizalfosRightForearmRootLimb" LimbType="Standard" Offset="0x10248"/>
+        <Limb Name="gZfLizalfosSwordRootLimb" LimbType="Standard" Offset="0x10254"/>
+        <Limb Name="gZfLizalfosSwordLimb" LimbType="Standard" Offset="0x10260"/>
+        <Limb Name="gZfLizalfosRightForearmLimb" LimbType="Standard" Offset="0x1026C"/>
+        <Limb Name="gZfLizalfosRightUpperArmLimb" LimbType="Standard" Offset="0x10278"/>
+        <Limb Name="gZfLizalfosLeftArmRootLimb" LimbType="Standard" Offset="0x10284"/>
+        <Limb Name="gZfLizalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x10290"/>
+        <Limb Name="gZfLizalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x1029C"/>
+        <Limb Name="gZfLizalfosLeftHandRootLimb" LimbType="Standard" Offset="0x102A8"/>
+        <Limb Name="gZfLizalfosLeftHandLimb" LimbType="Standard" Offset="0x102B4"/>
+        <Limb Name="gZfLizalfosLeftForearmLimb" LimbType="Standard" Offset="0x102C0"/>
+        <Limb Name="gZfLizalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x102CC"/>
+        <Limb Name="gZfLizalfosChestArmorLimb" LimbType="Standard" Offset="0x102D8"/>
+        <Limb Name="gZfLizalfosTailRootLimb" LimbType="Standard" Offset="0x102E4"/>
+        <Limb Name="gZfLizalfosTailBaseRootLimb" LimbType="Standard" Offset="0x102F0"/>
+        <Limb Name="gZfLizalfosTailTipRootLimb" LimbType="Standard" Offset="0x102FC"/>
+        <Limb Name="gZfLizalfosTailTipLimb" LimbType="Standard" Offset="0x10308"/>
+        <Limb Name="gZfLizalfosTailBaseLimb" LimbType="Standard" Offset="0x10314"/>
+        <Limb Name="gZfLizalfosScabbardRootRootLimb" LimbType="Standard" Offset="0x10320"/>
+        <Limb Name="gZfLizalfosScabbardRootLimb" LimbType="Standard" Offset="0x1032C"/>
+        <Limb Name="gZfLizalfosScabbardLimb" LimbType="Standard" Offset="0x10338"/>
+        <Limb Name="gZfLizalfosRightLegRootLimb" LimbType="Standard" Offset="0x10344"/>
+        <Limb Name="gZfLizalfosRightThighRootLimb" LimbType="Standard" Offset="0x10350"/>
+        <Limb Name="gZfLizalfosRightShinRootLimb" LimbType="Standard" Offset="0x1035C"/>
+        <Limb Name="gZfLizalfosRightFootRootLimb" LimbType="Standard" Offset="0x10368"/>
+        <Limb Name="gZfLizalfosRightFootLimb" LimbType="Standard" Offset="0x10374"/>
+        <Limb Name="gZfLizalfosRightShinLimb" LimbType="Standard" Offset="0x10380"/>
+        <Limb Name="gZfLizalfosRightThighLimb" LimbType="Standard" Offset="0x1038C"/>
+        <Limb Name="gZfLizalfosLeftLegRootLimb" LimbType="Standard" Offset="0x10398"/>
+        <Limb Name="gZfLizalfosLeftThighRootLimb" LimbType="Standard" Offset="0x103A4"/>
+        <Limb Name="gZfLizalfosLeftShinRootLimb" LimbType="Standard" Offset="0x103B0"/>
+        <Limb Name="gZfLizalfosLeftFootRootLimb" LimbType="Standard" Offset="0x103BC"/>
+        <Limb Name="gZfLizalfosLeftFootLimb" LimbType="Standard" Offset="0x103C8"/>
+        <Limb Name="gZfLizalfosLeftShinLimb" LimbType="Standard" Offset="0x103D4"/>
+        <Limb Name="gZfLizalfosLeftThighLimb" LimbType="Standard" Offset="0x103E0"/>
+        <Limb Name="gZfLizalfosTrunkLimb" LimbType="Standard" Offset="0x103EC"/>
+        <Skeleton Name="gZfLizalfosSkel" Type="Normal" LimbType="Standard" Offset="0x104B8"/>
+
+        <Animation Name="gZfHopCrouchingAnim" Offset="0x1081C"/>
+        <Animation Name="gZfHopLeapingAnim" Offset="0x10CAC"/>
+        <Animation Name="gZfHopLandingAnim" Offset="0x11070"/>
+        <Animation Name="gZfSheathingSwordAnim" Offset="0x119F4"/>
+        <Animation Name="gZfDrawingSwordAnim" Offset="0x1366C"/>
+        <Animation Name="gZfDyingAnim" Offset="0x14E60"/>
+        <Animation Name="gZfKnockedBackAnim" Offset="0x157F8"/>
+        <Animation Name="gZfSidesteppingAnim" Offset="0x16388"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zg.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zg.xml
new file mode 100644
index 0000000000..79005516c4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zg.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="object_zg" Segment="6">
+        <Texture Name="gTowerCollapseBarMetalTex" OutName="bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gTowerCollapseBarFlameTex" OutName="bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
+        <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zl1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zl1.xml
new file mode 100644
index 0000000000..001e5be145
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zl1.xml
@@ -0,0 +1,115 @@
+<Root>
+    <File Name="object_zl1" Segment="6">
+        <Texture Name="object_zl1Tex_00EE58" OutName="object_zl1Tex_00EE58" Format="rgba16" Width="32" Height="16" Offset="0xEE58" AddedByScript="true"/>
+        <!-- Child Zelda 1 Skeleton -->
+        <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
+
+        <!-- Child Zelda 1 Limbs -->
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
+
+        <!-- Child Zelda 1 Limb DisplayLists -->
+        <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
+        <DList Name="gChildZelda1LeftLegDL" Offset="0xEE00"/>
+        <DList Name="gChildZelda1LeftFootDL" Offset="0xE748"/>
+        <DList Name="gChildZelda1RightLegDL" Offset="0xEDA8"/>
+        <DList Name="gChildZelda1RightFootDL" Offset="0xEA78"/>
+        <DList Name="gChildZelda1Dress1DL" Offset="0x6828"/>
+        <DList Name="gChildZelda1Dress2DL" Offset="0x69E0"/>
+        <DList Name="gChildZelda1Dress3DL" Offset="0x6BA0"/>
+        <DList Name="gChildZelda1TorsoDL" Offset="0x4B50"/>
+        <DList Name="gChildZelda1LeftUpperArmDL" Offset="0x5A68"/>
+        <DList Name="gChildZelda1LeftForearmDL" Offset="0x5CD8"/>
+        <DList Name="gChildZelda1LeftHandDL" Offset="0x5E28"/>
+        <DList Name="gChildZelda1RightUpperArmDL" Offset="0x54D0"/>
+        <DList Name="gChildZelda1RightForearmDL" Offset="0x5738"/>
+        <DList Name="gChildZelda1RightHandDL" Offset="0x5888"/>
+        <DList Name="gChildZelda1HeadDL" Offset="0xCD98"/>
+
+        <!-- Textures -->
+        <Texture Name="gChildZelda1DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0x0650" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PurpleDressPatternTex" OutName="purple_dress_pattern" Format="ci8" Width="16" Height="16" Offset="0x0690" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0x0790" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltTex" OutName="belt" Format="ci8" Width="32" Height="8" Offset="0x0F90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BeltLoopsTex" OutName="belt_loops" Format="ci8" Width="8" Height="8" Offset="0x1090" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x10D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BackOfHandTex" OutName="back_of_hand" Format="rgba16" Width="16" Height="16" Offset="0x14D0"/>
+        <Texture Name="gChildZelda1BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x16D0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient_1" Format="rgba16" Width="8" Height="8" Offset="0x17D0"/>
+        <Texture Name="gChildZelda1BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x1850"/>
+        <Texture Name="gChildZelda1Tex_1A50" OutName="tex_1A50" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1StripedShoulderPatternTex" OutName="striped_shoulder_pattern" Format="ci8" Width="8" Height="8" Offset="0x1A90" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x1AD0" TlutOffset="0x0450"/>
+        <Texture Name="gChildZelda1PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="gChildZelda1HeaddressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x7A08" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x7A48"/>
+        <Texture Name="gChildZelda1HeaddressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x7AC8"/>
+        <Texture Name="gChildZelda1PointedHairOnSideTex" OutName="pointed_hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x7EC8"/>
+        <Texture Name="gChildZelda1HairTex" OutName="hair" Format="rgba16" Width="16" Height="8" Offset="0x80C8"/>
+        <Texture Name="gChildZelda1Tex_81C8" OutName="tex_81C8" Format="ci8" Width="8" Height="8" Offset="0x81C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x8208"/>
+        <Texture Name="gChildZelda1AlternateDressPatternTex" OutName="alternate_dress_pattern" Format="ci8" Width="8" Height="8" Offset="0x8408" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1ALternateDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x8448" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x8548" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1AlternateDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x8648"/>
+        <Texture Name="gChildZelda1BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x8748"/>
+        <Texture Name="gChildZelda1BootShaftTex" OutName="boot_shaft" Format="rgba16" Width="8" Height="8" Offset="0x87C8"/>
+        <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
+        <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
+        <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+
+        <!-- Other DisplayLists -->
+        <DList Name="gChildZelda1AlternateDressDL" Offset="0xDEC8"/>
+        <DList Name="gChildZelda1OcarinaDL" Offset="0xF3A8"/>
+
+        <!-- Palettes -->
+        <Texture Name="gChildZelda1TLUT_0450" OutName="tlut_0450" Format="rgba16" Width="16" Height="16" Offset="0x0450"/>
+        <Texture Name="gChildZelda1TLUT_6CD8" OutName="tlut_6CD8" Format="rgba16" Width="252" Height="1" Offset="0x6CD8"/>
+        <Texture Name="gChildZelda1TLUT_6ED0" OutName="tlut_6ED0" Format="rgba16" Width="252" Height="1" Offset="0x6ED0"/>
+        <Texture Name="gChildZelda1TLUT_70C8" OutName="tlut_70C8" Format="rgba16" Width="160" Height="1" Offset="0x70C8"/>
+
+        <!-- Eye Textures -->
+        <Texture Name="gChildZelda1EyeOpenLookingUpRightTex" OutName="eye_open_looking_up_right" Format="ci8" Width="32" Height="32" Offset="0x7208" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingLeftTex" OutName="eye_open_looking_left" Format="ci8" Width="32" Height="32" Offset="0x8848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeOpenLookingRightTex" OutName="eye_open_looking_right" Format="ci8" Width="32" Height="32" Offset="0x8C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf1Tex" OutName="eye_half_1" Format="ci8" Width="32" Height="32" Offset="0x9448" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x9848" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9C48" TlutOffset="0x6CD8"/>
+        <Texture Name="gChildZelda1EyeWideTex" OutName="eye_wide" Format="ci8" Width="32" Height="32" Offset="0xA048" TlutOffset="0x6CD8"/>
+
+        <!-- Mouth Textures -->
+        <Texture Name="gChildZelda1MouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="32" Offset="0x7608" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="32" Offset="0x9048" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0xA448" TlutOffset="0x6ED0"/>
+        <Texture Name="gChildZelda1MouthOpenSmilingTex" OutName="mouth_open_smiling" Format="ci8" Width="32" Height="32" Offset="0xAB48" TlutOffset="0x6ED0"/>
+        
+        <!-- Animations -->
+        <Animation Name="gChildZelda1Anim_00438" Offset="0x00438"/>
+        <Animation Name="gChildZelda1Anim_10B38" Offset="0x10B38"/>
+        <Animation Name="gChildZelda1Anim_11348" Offset="0x11348"/>
+        <Animation Name="gChildZelda1Anim_116E4" Offset="0x116E4"/>
+        <Animation Name="gChildZelda1Anim_12B88" Offset="0x11B88"/>
+        <Animation Name="gChildZelda1Anim_12118" Offset="0x12118"/>
+        <Animation Name="gChildZelda1Anim_12B04" Offset="0x12B04"/>
+        <Animation Name="gChildZelda1Anim_12F80" Offset="0x12F80"/>
+        <Animation Name="gChildZelda1Anim_132D8" Offset="0x132D8"/>
+        <Animation Name="gChildZelda1Anim_138E0" Offset="0x138E0"/>
+        <Animation Name="gChildZelda1Anim_13F10" Offset="0x13F10"/>
+        <Animation Name="gChildZelda1Anim_143A8" Offset="0x143A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zl2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zl2.xml
new file mode 100644
index 0000000000..959a919ec6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zl2.xml
@@ -0,0 +1,75 @@
+<Root>
+    <File Name="object_zl2" Segment="6">
+        <Texture Name="object_zl2Tex_000E00" OutName="object_zl2Tex_000E00" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F00" OutName="object_zl2Tex_000F00" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_000F40" OutName="object_zl2Tex_000F40" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001140" OutName="object_zl2Tex_001140" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001180" OutName="object_zl2Tex_001180" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001280" OutName="object_zl2Tex_001280" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0012C0" OutName="object_zl2Tex_0012C0" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0016C0" OutName="object_zl2Tex_0016C0" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001AC0" OutName="object_zl2Tex_001AC0" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_001CC0" OutName="object_zl2Tex_001CC0" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0024C0" OutName="object_zl2Tex_0024C0" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002500" OutName="object_zl2Tex_002500" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002600" OutName="object_zl2Tex_002600" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002700" OutName="object_zl2Tex_002700" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002740" OutName="object_zl2Tex_002740" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002780" OutName="object_zl2Tex_002780" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_002880" OutName="object_zl2Tex_002880" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_0034C8" OutName="object_zl2Tex_0034C8" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003908" OutName="object_zl2Tex_003908" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A08" OutName="object_zl2Tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003A48" OutName="object_zl2Tex_003A48" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003AC8" OutName="object_zl2Tex_003AC8" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_003B48" OutName="object_zl2Tex_003B48" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_004448" OutName="object_zl2Tex_004448" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_006548" OutName="object_zl2Tex_006548" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009738" OutName="object_zl2Tex_009738" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009938" OutName="object_zl2Tex_009938" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A38" OutName="object_zl2Tex_009A38" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009A78" OutName="object_zl2Tex_009A78" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009E78" OutName="object_zl2Tex_009E78" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009F78" OutName="object_zl2Tex_009F78" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_009FF8" OutName="object_zl2Tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708" AddedByScript="true"/>
+        <Texture Name="object_zl2Tex_00A0F8" OutName="object_zl2Tex_00A0F8" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708" AddedByScript="true"/>
+        <!-- Zelda 2 skeleton -->
+        <Skeleton Name="gZelda2Skel" Type="Flex" LimbType="Standard" Offset="0x10D70"/>
+
+        <!-- Zelda 2 eyes textures -->
+        <Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
+        <Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
+        <Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
+        <Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
+
+        <Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
+
+        <!-- Zelda 2 mouth textures -->
+        <Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
+        <Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
+        <Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
+
+        <!-- Ocarina of time -->
+        <DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>
+        <Texture Name="gZelda2OcarinaTex" OutName="zelda_2_ocarina" Format="rgba16" Width="32" Height="16" Offset="0xB598"/>
+
+        <!-- palettes -->
+        <Texture Name="gZelda2_0TLUT" OutName="zelda_2_0_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZelda2_1TLUT" OutName="zelda_2_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gZelda2_2TLUT" OutName="zelda_2_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gZelda2_3TLUT" OutName="zelda_2_3_tlut" Format="rgba16" Width="9" Height="8" Offset="0x2D00"/>
+        <Texture Name="gZelda2_4TLUT" OutName="zelda_2_4_tlut" Format="rgba16" Width="47" Height="4" Offset="0x2F50"/>
+        <Texture Name="gZelda2_5TLUT" OutName="zelda_2_5_tlut" Format="rgba16" Width="17" Height="8" Offset="0x9490"/>
+        <Texture Name="gZelda2_6TLUT" OutName="zelda_2_6_tlut" Format="rgba16" Width="15" Height="12" Offset="0x95A0"/>
+        <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
+
+        <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime1.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime1.xml
new file mode 100644
index 0000000000..cada504867
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime1.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="object_zl2_anime1" Segment="6">
+        <Animation Name="gZelda2Anime1Anim_0003BC" Offset="0x3BC"/>
+        <Animation Name="gZelda2Anime1Anim_000A50" Offset="0xA50"/>
+        <Animation Name="gZelda2Anime1Anim_000EB0" Offset="0xEB0"/>
+        <Animation Name="gZelda2Anime1Anim_001010" Offset="0x1010"/>
+        <Animation Name="gZelda2Anime1Anim_0013A0" Offset="0x13A0"/>
+        <Animation Name="gZelda2Anime1Anim_001670" Offset="0x1670"/>
+        <Animation Name="gZelda2Anime1Anim_001B48" Offset="0x1B48"/>
+        <Animation Name="gZelda2Anime1Anim_0022D0" Offset="0x22D0"/>
+        <Animation Name="gZelda2Anime1Anim_002750" Offset="0x2750"/>
+        <Animation Name="gZelda2Anime1Anim_002B14" Offset="0x2B14"/>
+        <Animation Name="gZelda2Anime1Anim_002F30" Offset="0x2F30"/>
+        <Animation Name="gZelda2Anime1Anim_00325C" Offset="0x325C"/>
+        <Animation Name="gZelda2Anime1Anim_003538" Offset="0x3538"/>
+        <Animation Name="gZelda2Anime1Anim_004900" Offset="0x4900"/>
+        <Animation Name="gZelda2Anime1Anim_005F40" Offset="0x5F40"/>
+        <Animation Name="gZelda2Anime1Anim_006778" Offset="0x6778"/>
+        <Animation Name="gZelda2Anime1Anim_007D0C" Offset="0x7D0C"/>
+        <Animation Name="gZelda2Anime1Anim_0087B8" Offset="0x87B8"/>
+        <Animation Name="gZelda2Anime1Anim_0090D8" Offset="0x90D8"/>
+        <Animation Name="gZelda2Anime1Anim_009AD4" Offset="0x9AD4"/>
+        <Animation Name="gZelda2Anime1Anim_00A15C" Offset="0xA15C"/>
+        <Animation Name="gZelda2Anime1Anim_00A79C" Offset="0xA79C"/>
+        <Animation Name="gZelda2Anime1Anim_00AAD4" Offset="0xAAD4"/>
+        <Animation Name="gZelda2Anime1Anim_00AFE0" Offset="0xAFE0"/>
+        <Animation Name="gZelda2Anime1Anim_00B224" Offset="0xB224"/>
+        <Animation Name="gZelda2Anime1Anim_00B5FC" Offset="0xB5FC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime2.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime2.xml
new file mode 100644
index 0000000000..47016e2e00
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zl2_anime2.xml
@@ -0,0 +1,40 @@
+<Root>
+    <File Name="object_zl2_anime2" Segment="6">
+        <Animation Name="gZelda2Anime2Anim_0001D8" Offset="0x1D8"/>
+        <Animation Name="gZelda2Anime2Anim_0004F4" Offset="0x4F4"/>
+        <Animation Name="gZelda2Anime2Anim_001110" Offset="0x1110"/>
+        <Animation Name="gZelda2Anime2Anim_0014DC" Offset="0x14DC"/>
+        <Animation Name="gZelda2Anime2Anim_001D8C" Offset="0x1D8C"/>
+        <Animation Name="gZelda2Anime2Anim_00210C" Offset="0x210C"/>
+        <Animation Name="gZelda2Anime2Anim_002348" Offset="0x2348"/>
+        <Animation Name="gZelda2Anime2Anim_002710" Offset="0x2710"/>
+        <Animation Name="gZelda2Anime2Anim_002E54" Offset="0x2E54"/>
+        <Animation Name="gZelda2Anime2Anim_00322C" Offset="0x322C"/>
+        <Animation Name="gZelda2Anime2Anim_0038C0" Offset="0x38C0"/>
+        <Animation Name="gZelda2Anime2Anim_003D20" Offset="0x3D20"/>
+        <Animation Name="gZelda2Anime2Anim_003FF8" Offset="0x3FF8"/>
+        <Animation Name="gZelda2Anime2Anim_004408" Offset="0x4408"/>
+        <Animation Name="gZelda2Anime2Anim_00499C" Offset="0x499C"/>
+        <Animation Name="gZelda2Anime2Anim_005248" Offset="0x5248"/>
+        <Animation Name="gZelda2Anime2Anim_0054E0" Offset="0x54E0"/>
+        <Animation Name="gZelda2Anime2Anim_005A0C" Offset="0x5A0C"/>
+        <Animation Name="gZelda2Anime2Anim_0061C4" Offset="0x61C4"/>
+        <Animation Name="gZelda2Anime2Anim_006508" Offset="0x6508"/>
+        <Animation Name="gZelda2Anime2Anim_006AB0" Offset="0x6AB0"/>
+        <Animation Name="gZelda2Anime2Anim_006F04" Offset="0x6F04"/>
+        <Animation Name="gZelda2Anime2Anim_007664" Offset="0x7664"/>
+        <Animation Name="gZelda2Anime2Anim_007A78" Offset="0x7A78"/>
+        <Animation Name="gZelda2Anime2Anim_007C84" Offset="0x7C84"/>
+        <Animation Name="gZelda2Anime2Anim_008050" Offset="0x8050"/>
+        <Animation Name="gZelda2Anime2Anim_0082F8" Offset="0x82F8"/>
+        <Animation Name="gZelda2Anime2Anim_008684" Offset="0x8684"/>
+        <Animation Name="gZelda2Anime2Anim_008AD0" Offset="0x8AD0"/>
+        <Animation Name="gZelda2Anime2Anim_0091D8" Offset="0x91D8"/>
+        <Animation Name="gZelda2Anime2Anim_0099A0" Offset="0x99A0"/>
+        <Animation Name="gZelda2Anime2Anim_009BE4" Offset="0x9BE4"/>
+        <Animation Name="gZelda2Anime2Anim_009FBC" Offset="0x9FBC"/>
+        <Animation Name="gZelda2Anime2Anim_00A334" Offset="0xA334"/>
+        <Animation Name="gZelda2Anime2Anim_00A598" Offset="0xA598"/>
+        <Animation Name="gZelda2Anime2Anim_00AACC" Offset="0xAACC"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zl4.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zl4.xml
new file mode 100644
index 0000000000..8e7a2837ed
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zl4.xml
@@ -0,0 +1,91 @@
+<Root>
+    <File Name="object_zl4" Segment="6">
+        <Texture Name="object_zl4Tex_000C70" OutName="object_zl4Tex_000C70" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000CB0" OutName="object_zl4Tex_000CB0" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_000DB0" OutName="object_zl4Tex_000DB0" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0015B0" OutName="object_zl4Tex_0015B0" Format="rgba16" Width="8" Height="8" Offset="0x15B0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001630" OutName="object_zl4Tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0016B0" OutName="object_zl4Tex_0016B0" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017B0" OutName="object_zl4Tex_0017B0" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0017F0" OutName="object_zl4Tex_0017F0" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001BF0" OutName="object_zl4Tex_001BF0" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001CF0" OutName="object_zl4Tex_001CF0" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001DF0" OutName="object_zl4Tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_001E30" OutName="object_zl4Tex_001E30" Format="rgba16" Width="16" Height="32" Offset="0x1E30" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002230" OutName="object_zl4Tex_002230" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002270" OutName="object_zl4Tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0022F0" OutName="object_zl4Tex_0022F0" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0024F0" OutName="object_zl4Tex_0024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0026F0" OutName="object_zl4Tex_0026F0" Format="rgba16" Width="16" Height="16" Offset="0x26F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0028F0" OutName="object_zl4Tex_0028F0" Format="rgba16" Width="8" Height="8" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_002970" OutName="object_zl4Tex_002970" Format="rgba16" Width="8" Height="8" Offset="0x2970" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0029F0" OutName="object_zl4Tex_0029F0" Format="rgba16" Width="16" Height="8" Offset="0x29F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0056F0" OutName="object_zl4Tex_0056F0" Format="rgba16" Width="16" Height="16" Offset="0x56F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0058F0" OutName="object_zl4Tex_0058F0" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_0059F0" OutName="object_zl4Tex_0059F0" Format="rgba16" Width="8" Height="8" Offset="0x59F0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005A70" OutName="object_zl4Tex_005A70" Format="rgba16" Width="16" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005C70" OutName="object_zl4Tex_005C70" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005CB0" OutName="object_zl4Tex_005CB0" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_005DB0" OutName="object_zl4Tex_005DB0" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" AddedByScript="true"/>
+        <Texture Name="object_zl4Tex_00D8B8" OutName="object_zl4Tex_00D8B8" Format="rgba16" Width="32" Height="16" Offset="0xD8B8" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000670" OutName="object_zl4TLUT_000670" Format="rgba16" Width="16" Height="16" Offset="0x670" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000870" OutName="object_zl4TLUT_000870" Format="rgba16" Width="16" Height="16" Offset="0x870" AddedByScript="true"/>
+        <Texture Name="object_zl4TLUT_000A70" OutName="object_zl4TLUT_000A70" Format="rgba16" Width="16" Height="16" Offset="0xA70" AddedByScript="true"/>
+        <!-- Child Zelda's skeleton -->
+        <Skeleton Name="gChildZeldaSkel" Type="Flex" LimbType="Standard" Offset="0xE038"/>
+
+        <!-- Child Zelda's animations -->
+        <Animation Name="gChildZeldaAnim_000654" Offset="0x654"/>
+        <Animation Name="gChildZeldaAnim_00E5C8" Offset="0xE5C8"/>
+        <Animation Name="gChildZeldaAnim_00EBC4" Offset="0xEBC4"/>
+        <Animation Name="gChildZeldaAnim_010DF8" Offset="0x10DF8"/>
+        <Animation Name="gChildZeldaAnim_011248" Offset="0x11248"/>
+        <Animation Name="gChildZeldaAnim_011698" Offset="0x11698"/>
+        <Animation Name="gChildZeldaAnim_011B34" Offset="0x11B34"/>
+        <Animation Name="gChildZeldaAnim_0125E4" Offset="0x125E4"/>
+        <Animation Name="gChildZeldaAnim_012E58" Offset="0x12E58"/>
+        <Animation Name="gChildZeldaAnim_013280" Offset="0x13280"/>
+        <Animation Name="gChildZeldaAnim_013628" Offset="0x13628"/>
+        <Animation Name="gChildZeldaAnim_013A50" Offset="0x13A50"/>
+        <Animation Name="gChildZeldaAnim_013EA0" Offset="0x13EA0"/>
+        <Animation Name="gChildZeldaAnim_015F14" Offset="0x15F14"/>
+        <Animation Name="gChildZeldaAnim_01726C" Offset="0x1726C"/>
+        <Animation Name="gChildZeldaAnim_017818" Offset="0x17818"/>
+        <Animation Name="gChildZeldaAnim_0169B4" Offset="0x169B4"/>
+        <Animation Name="gChildZeldaAnim_016D08" Offset="0x16D08"/>
+        <Animation Name="gChildZeldaAnim_01805C" Offset="0x1805C"/>
+        <Animation Name="gChildZeldaAnim_018898" Offset="0x18898"/>
+        <Animation Name="gChildZeldaAnim_01910C" Offset="0x1910C"/>
+        <Animation Name="gChildZeldaAnim_019600" Offset="0x19600"/>
+        <Animation Name="gChildZeldaAnim_01991C" Offset="0x1991C"/>
+        <Animation Name="gChildZeldaAnim_01A2FC" Offset="0x1A2FC"/>
+        <Animation Name="gChildZeldaAnim_01AAE0" Offset="0x1AAE0"/>
+        <Animation Name="gChildZeldaAnim_01AE88" Offset="0x1AE88"/>
+        <Animation Name="gChildZeldaAnim_01B874" Offset="0x1B874"/>
+        <Animation Name="gChildZeldaAnim_01BCF0" Offset="0x1BCF0"/>
+        <Animation Name="gChildZeldaAnim_01CE08" Offset="0x1CE08"/>
+        <Animation Name="gChildZeldaAnim_01C494" Offset="0x1C494"/>
+        <Animation Name="gChildZeldaAnim_01C7B0" Offset="0x1C7B0"/>
+        <Animation Name="gChildZeldaAnim_00F0A4" Offset="0xF0A4"/>
+        <Animation Name="gChildZeldaAnim_00F894" Offset="0xF894"/>
+
+        <!-- Child Zelda's mouth textures -->
+        <Texture Name="gChildZeldaMouthNeutralTex" OutName="child_zelda_mouth_neutral" Format="i8" Width="32" Height="32" Offset="0x46F0"/>
+        <Texture Name="gChildZeldaMouthHappyTex" OutName="child_zelda_mouth_happy" Format="i8" Width="32" Height="32" Offset="0x4AF0"/>
+        <Texture Name="gChildZeldaMouthWorriedTex" OutName="child_zelda_mouth_worried" Format="i8" Width="32" Height="32" Offset="0x4EF0"/>
+        <Texture Name="gChildZeldaMouthSurprisedTex" OutName="child_zelda_mouth_surprised" Format="i8" Width="32" Height="32" Offset="0x52F0"/>
+        
+        <!-- Child Zelda's eye textures -->
+        <Texture Name="gChildZeldaEyeOpenTex" OutName="child_zelda_eye_open" Format="i8" Width="32" Height="32" Offset="0x2AF0"/>
+        <Texture Name="gChildZeldaEyeBlinkTex" OutName="child_zelda_eye_blink" Format="i8" Width="32" Height="32" Offset="0x2EF0"/>
+        <Texture Name="gChildZeldaEyeShutTex" OutName="child_zelda_eye_shut" Format="i8" Width="32" Height="32" Offset="0x32F0"/>
+        <Texture Name="gChildZeldaEyeWideTex" OutName="child_zelda_eye_wide" Format="i8" Width="32" Height="32" Offset="0x36F0"/>
+        <Texture Name="gChildZeldaEyeSquintTex" OutName="child_zelda_eye_squint" Format="i8" Width="32" Height="32" Offset="0x3AF0"/>
+        <Texture Name="gChildZeldaEyeOutTex" OutName="child_zelda_eye_out" Format="i8" Width="32" Height="32" Offset="0x3EF0"/>
+        <Texture Name="gChildZeldaEyeInTex" OutName="child_zelda_eye_in" Format="i8" Width="32" Height="32" Offset="0x42F0"/>
+
+        <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
+        <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
+        <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/objects/object_zo.xml b/soh/assets/xml/N64_NTSC_12/objects/object_zo.xml
new file mode 100644
index 0000000000..77465760ef
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/objects/object_zo.xml
@@ -0,0 +1,88 @@
+<Root>
+    <File Name="object_zo" Segment="6">
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <DList Name="gZoraPelvisDL" Offset="0x9040"/>
+
+        <!-- Left leg -->
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
+
+        <!-- Right leg -->
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <DList Name="gZoraRightShinDL" Offset="0xB058"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <DList Name="gZoraRightFootDL" Offset="0xB330"/>
+
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
+
+        <!-- Left arm -->
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
+
+        <!-- Right arm -->
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <DList Name="gZoraRightHandDL" Offset="0xA428"/>
+
+        <!-- Head and head tail -->
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <DList Name="gZoraHeadDL" Offset="0x9560"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <DList Name="gZoraHeadTailFinDL" Offset="0x9CA8"/>
+
+        <Animation Name="gZoraIdleAnim" Offset="0x2FE8"/>
+        <Animation Name="gZoraSurfaceAnim" Offset="0x2F10"/>
+        <Animation Name="gZoraThrowRupeesAnim" Offset="0x219C"/>
+        <Animation Name="gZoraHandsOnHipsTappingFootAnim" Offset="0x598"/>
+        <Animation Name="gZoraOpenArmsAnim" Offset="0xD48"/>
+
+        <!-- Eyes textures -->
+        <Texture Name="gZoraEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3E40"/>
+        <Texture Name="gZoraEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x4640"/>
+        <Texture Name="gZoraEyeClosedTex" OutName="eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4E40"/>
+
+        <!-- Other body parts textures -->
+        <Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
+        <Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
+        <Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
+        <Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
+
+        <!-- Palette / Tlut -->
+        <Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>
+
+        <Texture Name="gZoraBubblesTex" OutName="bubbles" Format="ia8" Width="16" Height="16" Offset="0x21B0"/>
+        <DList Name="gZoraBubblesMaterialDL" Offset="0x22F0"/>
+        <DList Name="gZoraBubblesModelDL" Offset="0x2350"/>
+
+        <Texture Name="gZoraSplashesTex" OutName="splashes" Format="i8" Width="16" Height="16" Offset="0x2370"/>
+        <DList Name="gZoraSplashesMaterialDL" Offset="0x24A0"/>
+        <DList Name="gZoraSplashesModelDL" Offset="0x2510"/>
+
+        <DList Name="gZoraRipplesMaterialDL" Offset="0xBFC0"/>
+        <DList Name="gZoraRipplesModelDL" Offset="0xC028"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Fire.xml
new file mode 100644
index 0000000000..841be4f894
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Fire.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Fire" BaseAddress="0x80A5ECC0" RangeStart="0x960" RangeEnd="0x1DF0">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x960" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1160" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1960" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C10" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CC0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Ice.xml
new file mode 100644
index 0000000000..811002bc81
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Ice.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Ice" BaseAddress="0x80A60B80" RangeStart="0x980" RangeEnd="0x1E10">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Light.xml
new file mode 100644
index 0000000000..56243b5fcb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Arrow_Light.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Arrow_Light" BaseAddress="0x80A62A60" RangeStart="0x990" RangeEnd="0x1DD0">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x990" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1190" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1990" Static="On">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1C40" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1CF0" Static="On"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Ganon_Otyuka.xml
new file mode 100644
index 0000000000..5e2d16753c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80A54200" RangeStart="0x1110" RangeEnd="0x24EC">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1110"/>
+        
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x1918">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformMaterialDL" Offset="0x1958"/>
+        <DList Name="sPlatformTopDL" Offset="0x19E0"/>
+        
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x19F8">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformBottomDL" Offset="0x1A38"/>
+
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01A50">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlatformSideDL" Offset="0x1A90"/>
+
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1AA8"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x22A8">
+            <Vtx/>
+        </Array>
+        <DList Name="sFlashDL" Offset="0x2328"/>
+        
+        <Collision Name="sCol" Offset="0x24C0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Jya_Cobra.xml
new file mode 100644
index 0000000000..c23bf356cb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Bg_Jya_Cobra.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x80A32870" RangeStart="0x1830" RangeEnd="0x19C8">
+        <Array Name="sShadowVtx" Count="4" Offset="0x1830">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sShadowDL" Offset="0x1870"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Dodongo.xml
new file mode 100644
index 0000000000..741842575d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Dodongo.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x8089D9F0" RangeStart="0x61C8" RangeEnd="0x91C8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon.xml
new file mode 100644
index 0000000000..70cf49d2d9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon.xml
@@ -0,0 +1,68 @@
+<Root>
+    <File Name="ovl_Boss_Ganon" BaseAddress="0x809F20E0" RangeStart="0xE388" RangeEnd="0x20EA4">
+        <Texture Name="ovl_Boss_GanonTex_00E748" OutName="ovl_Boss_GanonTex_00E748" Format="i8" Width="64" Height="64" Offset="0xE418" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_00F848" OutName="ovl_Boss_GanonTex_00F848" Format="ci8" Width="32" Height="32" Offset="0xF518" TlutOffset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_010538" OutName="ovl_Boss_GanonTex_010538" Format="i8" Width="64" Height="64" Offset="0x10208" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01A7B0" OutName="ovl_Boss_GanonTex_01A7B0" Format="ia16" Width="32" Height="32" Offset="0x1A480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01AFB0" OutName="ovl_Boss_GanonTex_01AFB0" Format="i4" Width="64" Height="64" Offset="0x1AC80" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01B7B0" OutName="ovl_Boss_GanonTex_01B7B0" Format="i4" Width="64" Height="64" Offset="0x1B480" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01C420" OutName="ovl_Boss_GanonTex_01C420" Format="i8" Width="64" Height="32" Offset="0x1C0F0" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01CEB8" OutName="ovl_Boss_GanonTex_01CEB8" Format="i8" Width="32" Height="64" Offset="0x1CB88" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01D6B8" OutName="ovl_Boss_GanonTex_01D6B8" Format="i8" Width="32" Height="32" Offset="0x1D388" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01DE88" OutName="ovl_Boss_GanonTex_01DE88" Format="i8" Width="32" Height="64" Offset="0x1DB58" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01E688" OutName="ovl_Boss_GanonTex_01E688" Format="i8" Width="32" Height="64" Offset="0x1E358" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01EF90" OutName="ovl_Boss_GanonTex_01EF90" Format="i8" Width="96" Height="16" Offset="0x1EC60" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_01FFF8" OutName="ovl_Boss_GanonTex_01FFF8" Format="i4" Width="32" Height="32" Offset="0x1FCC8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020370" OutName="ovl_Boss_GanonTex_020370" Format="i8" Width="32" Height="32" Offset="0x20040" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTex_020770" OutName="ovl_Boss_GanonTex_020770" Format="i8" Width="32" Height="64" Offset="0x20440" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_GanonTLUT_00F808" OutName="ovl_Boss_GanonTLUT_00F808" Format="rgba16" Width="16" Height="16" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x112D0" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11ED0" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12AD0" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x136D0" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x142D0" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14ED0" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15AD0" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x166D0" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x172D0" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17ED0" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18AD0" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x196D0" Static="Off"/>
+        
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFA08" Static="Off"/>
+
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x1F9C0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x1F9F8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FA30" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FA68" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FAA0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FAD8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FB10" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FB48" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FB80" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FBB8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FBF0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FC28" Static="Off"/>
+
+        <DList Name="gGanondorfShadowSetupDL" Offset="0xE3C8" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0xE3E8" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0xF458" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xF948" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0xF9F0" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11248" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x112B8" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0x1A310" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0x1A3C0" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A438" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0x1BE90" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1BF80" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0x1C028" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0x1CA90" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0x1D928" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0x1DA40" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x1EB98" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x1FEF8" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x1FFC0" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x20DA0" Static="Off"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon2.xml
new file mode 100644
index 0000000000..ad3e1bcc7e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Ganon2.xml
@@ -0,0 +1,76 @@
+<Root>
+    <File Name="ovl_Boss_Ganon2" BaseAddress="0x80B05980" RangeStart="0x9F38" RangeEnd="0x10778">
+        <Texture Name="gGanonLightOrbTex" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F38"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF38">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x00AF78"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x00AFE8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B000">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x00B040"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x00B060"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B090"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B490"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x00B690">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonSwordTrailDL" Offset="0x00B7F0"/>
+        <Texture Name="gGanonTriforceTex" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B908"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C908">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonTriforceDL" Offset="0x00C948"/>
+        <Texture Name="gGanonLightningTex" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00C9C8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D3C8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonLightningDL" Offset="0x00D408"/>
+        <Texture Name="gGanonFireRingTex" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D490"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DC90">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonFireRingDL" Offset="0x00DE30"/>
+        <Texture Name="gGanonZeldaMagicTex" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DF50"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E750">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x00E8B0"/>
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00E9B8"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EDB8">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x00EDF8"/>
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EE78"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F078"/>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F878">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8A8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAA8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FB98">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC48">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCA8">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFD68">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE08">
+            <Vtx/>
+        </Array>
+        <Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF08">
+            <Vtx/>
+        </Array>
+        <DList Name="gGanonMasterSwordDL" Offset="0x010018"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Sst.xml
new file mode 100644
index 0000000000..937e71fcc6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Boss_Sst.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Boss_Sst" BaseAddress="0x80A17EC0" RangeStart="0xA370" RangeEnd="0xAD70">
+        <Texture Name="ovl_Boss_SstTex_00A438" OutName="ovl_Boss_SstTex_00A438" Format="i8" Width="16" Height="64" Offset="0xA3E8" AddedByScript="true"/>
+        <Texture Name="ovl_Boss_SstTex_00A8F0" OutName="ovl_Boss_SstTex_00A8F0" Format="i8" Width="32" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <DList Name="sBodyStaticDList" Offset="0xA370"/>
+        <DList Name="sHandTrailDList" Offset="0xA388"/>
+        <DList Name="sIntroVanishDList" Offset="0xA7E8"/>
+        <DList Name="sShadowDList" Offset="0xACA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Demo_Shd.xml
new file mode 100644
index 0000000000..b0444edb64
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Demo_Shd.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Demo_Shd" BaseAddress="0x80A72C80" RangeStart="0x410" RangeEnd="0x23D0">
+
+    <Texture Name="ovl_Demo_ShdTex_000450" OutName="ovl_Demo_ShdTex_000450" Format="i8" Width="16" Height="128" Offset="0x410" AddedByScript="true"/>
+        <Texture Name="ovl_Demo_ShdTex_000C50" OutName="ovl_Demo_ShdTex_000C50" Format="i8" Width="32" Height="64" Offset="0xC10" AddedByScript="true"/>
+        <DList Name="D_809932D0" Offset="0x2060"/>
+    <DList Name="D_80993390" Offset="0x2120"/>
+    <DList Name="D_809934B8" Offset="0x2248"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Bili.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Bili.xml
new file mode 100644
index 0000000000..109b5d5128
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Bili.xml
@@ -0,0 +1,7 @@
+<Root>
+    <File Name="ovl_En_Bili" BaseAddress="0x808C01E0" RangeStart="0x1E40" RangeEnd="0x1E70">
+        <DList Name="D_809C16F0" Offset="0x1E40"/>
+        <DList Name="D_809C1700" Offset="0x1E50"/>
+    
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Clear_Tag.xml
new file mode 100644
index 0000000000..eadc2c0d7b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Clear_Tag.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="ovl_En_Clear_Tag" BaseAddress="0x80A92E20" RangeStart="0x2600" RangeEnd="0x89F0">
+        <Texture Name="ovl_En_Clear_TagTex_003308" OutName="ovl_En_Clear_TagTex_003308" Format="rgba16" Width="8" Height="8" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003388" OutName="ovl_En_Clear_TagTex_003388" Format="rgba16" Width="32" Height="32" Offset="0x3298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_003B88" OutName="ovl_En_Clear_TagTex_003B88" Format="rgba16" Width="64" Height="32" Offset="0x3A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_004B88" OutName="ovl_En_Clear_TagTex_004B88" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005388" OutName="ovl_En_Clear_TagTex_005388" Format="rgba16" Width="32" Height="32" Offset="0x5298" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_005B88" OutName="ovl_En_Clear_TagTex_005B88" Format="rgba16" Width="32" Height="32" Offset="0x5A98" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006458" OutName="ovl_En_Clear_TagTex_006458" Format="rgba16" Width="16" Height="16" Offset="0x6368" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006708" OutName="ovl_En_Clear_TagTex_006708" Format="i8" Width="16" Height="16" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006808" OutName="ovl_En_Clear_TagTex_006808" Format="rgba16" Width="16" Height="16" Offset="0x6718" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006AD0" OutName="ovl_En_Clear_TagTex_006AD0" Format="i4" Width="32" Height="64" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_006ED0" OutName="ovl_En_Clear_TagTex_006ED0" Format="i4" Width="32" Height="32" Offset="0x6DE0" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_0071C8" OutName="ovl_En_Clear_TagTex_0071C8" Format="i8" Width="64" Height="64" Offset="0x70D8" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008288" OutName="ovl_En_Clear_TagTex_008288" Format="i4" Width="32" Height="32" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="ovl_En_Clear_TagTex_008540" OutName="ovl_En_Clear_TagTex_008540" Format="i8" Width="32" Height="32" Offset="0x8450" AddedByScript="true"/>
+        <DList Name="gArwingDL" Offset="0x2600"/>
+        <DList Name="gArwingLaserDL" Offset="0x6298"/>
+        <DList Name="gArwingBackfireDL" Offset="0x6598"/>
+        <DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
+        <DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
+        <DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
+        <DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
+        <DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
+        <DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
+        <DList Name="gArwingShadowDL" Offset="0x8880"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Mant.xml
new file mode 100644
index 0000000000..65e8669015
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Mant.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ovl_En_Ganon_Mant" BaseAddress="0x80AE8D20" RangeStart="0x11E8" RangeEnd="0x4118">
+        <Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x11E8"/>
+
+        <Texture Name="gMantUnusedTex" OutName="mant_unused" Format="rgba16" Width="32" Height="32" Offset="0x21E8"/>
+
+        <Array Name="gMant1Vtx" Count="144" Offset="0x29E8">
+            <Vtx/>
+        </Array>
+
+        <DList Name="gMantMaterialDL" Offset="0x32E8"/>
+
+        <!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
+        <DList Name="gMantUnusedMaterialDL" Offset="0x3340"/>
+
+        <DList Name="gMantDL" Offset="0x3398"/>
+
+        <Array Name="gMant2Vtx" Count="144" Offset="0x37E8">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Organ.xml
new file mode 100644
index 0000000000..3bc27ac6f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ganon_Organ.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ovl_En_Ganon_Organ" BaseAddress="0x80AC8730" RangeStart="0x328" RangeEnd="0x6F70">
+        <Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x328"/>
+        <Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB28"/>
+        <Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD28"/>
+        <Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDA8"/>
+        <Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFA8"/>
+        <Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11A8"/>
+        <Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1228"/>
+        <Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1428"/>
+        <Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1628"/>
+        <Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1728"/>
+        <Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1928"/>
+        <Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x1968"/>
+
+        <DList Name="sRoomOrganAndFloorDL" Offset="0x4BE8"/>
+        <DList Name="sRoomStatuesDL" Offset="0x69F0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Holl.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Holl.xml
new file mode 100644
index 0000000000..1cb407a30b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Holl.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Holl" BaseAddress="0x80895860" RangeStart="0xE68" RangeEnd="0xEE0">
+        <Array Name="sPlaneVtx" Count="4" Offset="0xE68">
+            <Vtx/>
+        </Array>
+        <DList Name="sPlaneDL" Offset="0xEA8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Jsjutan.xml
new file mode 100644
index 0000000000..fc48deac35
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Jsjutan.xml
@@ -0,0 +1,38 @@
+<Root>
+    <File Name="ovl_En_Jsjutan" BaseAddress="0x80ADC220" RangeStart="0x12B8" RangeEnd="0x4C88">
+        <!-- D_80A8AA98. Carpet texture. -->
+        <Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12B8"/>
+
+        <!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="gShadowOddVtx" Count="144" Offset="0x22B8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sShadowEvenVtx" Count="144" Offset="0x2BB8">
+            <Vtx/>
+        </Array>
+        <!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
+        <Array Name="sCarpetOddVtx" Count="144" Offset="0x34B8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
+        <Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E30"/>
+
+        <!-- D_80A8D598. Draws the carpet's texture. -->
+        <DList Name="sCarpetMaterialDL" Offset="0x3DB8"/>
+        <!-- D_80A8D618. Draws the carpet's shadow texture. -->
+        <DList Name="sShadowMaterialDL" Offset="0x3E38"/>
+
+        <!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
+        <DList Name="sModelDL" Offset="0x3EA8"/>
+
+        <!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
+        <Array Name="sCarpetEvenVtx" Count="144" Offset="0x42D8">
+            <Vtx/>
+        </Array>
+
+        <!-- D_80A8E400 -->
+        <Collision Name="sCol" Offset="0x4C20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Kanban.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Kanban.xml
new file mode 100644
index 0000000000..dd00b76647
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Kanban.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Kanban" BaseAddress="0x80AA2010" RangeStart="0x2E70" RangeEnd="0x3040">
+        <Array Name="sShadowVtx" Count="4" Offset="0x2E70">
+            <Vtx/>
+        </Array>
+        <DList Name="sShadowDL" Offset="0x2EB0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sda.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sda.xml
new file mode 100644
index 0000000000..b651595887
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sda.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="ovl_En_Sda" BaseAddress="0x80A91720" RangeStart="0x1498" RangeEnd="0x1608">
+        <Array Name="D_80AFA398" Count="4" Offset="0x14A8">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80AFA3D8" Offset="0x14E8"/>
+        <DList Name="D_80AFA3F8" Offset="0x1508"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ssh.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ssh.xml
new file mode 100644
index 0000000000..5105ef63e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Ssh.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_Ssh" BaseAddress="0x80B25AB0" RangeStart="0x2150" RangeEnd="0x21E0">
+        <Array Name="D_80B043C0" Count="4" Offset="0x2150">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80B04400" Offset="0x2190"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_St.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_St.xml
new file mode 100644
index 0000000000..3350277474
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_St.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="ovl_En_St" BaseAddress="0x808C4300" RangeStart="0x26A0" RangeEnd="0x2740">
+        <Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
+            <Vtx/>
+        </Array>
+        <DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sth.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sth.xml
new file mode 100644
index 0000000000..81bbc8de46
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_En_Sth.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_En_Sth" BaseAddress="0x80B280A0" RangeStart="0xE60" RangeEnd="0x3EC4">
+        <Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE60"/>
+        <Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEE0"/>
+        <Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFE0"/>
+        <Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1060"/>
+        <Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1860"/>
+        <Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C60"/>
+        <Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CE0"/>
+        <DList Name="D_80B0A050" Offset="0x2A80"/>
+        <DList Name="D_80B0A3C0" Offset="0x2DF0"/>
+        <Animation Name="sChildDanceAnim" Offset="0x3590"/>
+        <Animation Name="sParentDanceAnim" Offset="0x3E24"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_End_Title.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_End_Title.xml
new file mode 100644
index 0000000000..b2c9cf3f69
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_End_Title.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="ovl_End_Title" BaseAddress="0x80B1B160" RangeStart="0x6F0" RangeEnd="0x4128">
+        <Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6F0"/>
+        <Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1230"/>
+        <Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1930"/>
+        <Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20B0"/>
+        <Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CB0"/>
+        <Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38B0"/>
+        
+        <Array Name="sTriforceVtx" Count="6" Offset="0x3EB0">
+            <Vtx/>
+        </Array>
+        <DList Name="sTriforceDL" Offset="0x3F10"/>
+        
+        <DList Name="sPresentedByNintendoDL" Offset="0x3F70"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_File_Choose.xml
new file mode 100644
index 0000000000..dba3fe1bb0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_File_Choose.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="ovl_file_choose" BaseAddress="0x80803880" RangeStart="0xEC50" RangeEnd="0xF330">
+        <Array Name="D_80811BB0_NTSC" Count="24" Offset="0xEC50" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German headers vertices are combined into one array -->
+        <Array Name="D_80811D30_NTSC" Count="24" Offset="0xEF70" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- German options vertices are combined into one array -->
+        <Array Name="D_80811F30_NTSC" Count="52" Offset="0xF070" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- Not used for NTSC N64, instead these vertices are apart of D_80811F30 -->
+        <!-- <Array Name="D_80812130" Count="12" Offset="0xF6A0" Static="Off">
+            <Vtx/>
+        </Array> -->
+        <Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xF270" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xF2B0" Static="Off">
+            <Vtx/>
+        </Array>
+        <Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xF2F0" Static="Off">
+            <Vtx/>
+        </Array>
+        <!-- PAL N64 only -->
+        <!-- <Array Name="gOptionsDividerChangeLangVtx" Count="4" Offset="0xF8E0" Static="Off">
+            <Vtx/>
+        </Array> -->
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Dark.xml
new file mode 100644
index 0000000000..2522b97ac9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Dark.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Magic_Dark" BaseAddress="0x80A2BE40" RangeStart="0xC90" RangeEnd="0x1740">
+        <Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
+
+        <Array Name="sDiamondVtx" Count="20" Offset="0x1490">
+            <Vtx/>
+        </Array>
+
+        <DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
+        <DList Name="sDiamondModelDL" Offset="0x1680"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Fire.xml
new file mode 100644
index 0000000000..8cb56a1585
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Fire.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Magic_Fire" BaseAddress="0x8095DAF0" RangeStart="0xB20" RangeEnd="0x2170">
+        <Texture Name="sTex" OutName="dins_fire" Format="i8" Width="64" Height="64" Offset="0xB20"/>
+        <Array Name="sSphereVtx" Count="76" Offset="0x1B20">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1FE0"/>
+        <DList Name="sModelDL" Offset="0x2008"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Wind.xml
new file mode 100644
index 0000000000..e09b58a502
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Magic_Wind.xml
@@ -0,0 +1,15 @@
+<Root>
+    <File Name="ovl_Magic_Wind" BaseAddress="0x8095BDF0" RangeStart="0x580" RangeEnd="0x1C98">
+		<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
+		<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
+		<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>
+		<Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1B8C"/>
+		<Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1B98"/>
+		<Array Name="sCylinderVtx" Count="36" Offset="0x6A0">
+			<Vtx/>
+		</Array>
+		<Texture Name="sTex" OutName="magic_wind" Format="i8" Width="64" Height="64" Offset="0x8E0"/>
+		<DList Name="sInnerCylinderDL" Offset="0x18E0"/>
+		<DList Name="sOuterCylinderDL" Offset="0x19E8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Spot.xml
new file mode 100644
index 0000000000..b5b809a6a0
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Spot.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Spot" BaseAddress="0x80B1A230" RangeStart="0x780" RangeEnd="0xE58">
+        <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0xB80">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0xD30"/>
+        <DList Name="sCylinderModelDL" Offset="0xDC8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Storm.xml
new file mode 100644
index 0000000000..d2ff95ab3d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Storm.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Storm" BaseAddress="0x80B39440" RangeStart="0x740" RangeEnd="0x1B40">
+        <Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x740"/>
+        <DList Name="sMaterialDL" Offset="0x1740"/>
+        <Array Name="sCylinderVtx" Count="27" Offset="0x17E8">
+            <Vtx/>
+        </Array>
+        <DList Name="sCylinderMaterialDL" Offset="0x1998"/>
+        <DList Name="sCylinderModelDL" Offset="0x1A40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe.xml
new file mode 100644
index 0000000000..97e85cbb35
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe" BaseAddress="0x80B2C150" RangeStart="0x4F0" RangeEnd="0xD10">
+        <Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x4F0"/>
+        <Array Name="sFrustumVtx" Count="40" Offset="0x8F0">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xB70"/>
+        <DList Name="sFrustumDL" Offset="0xBF8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe2.xml
new file mode 100644
index 0000000000..9a94efde09
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe2.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B46A90" RangeStart="0x430" RangeEnd="0x16E8">
+        <Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
+        <Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1638"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe3.xml
new file mode 100644
index 0000000000..c675cba2fe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe3.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B48200" RangeStart="0x430" RangeEnd="0x16C8">
+        <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0x1430">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0x1590"/>
+        <DList Name="sFrustumDL" Offset="0x1618"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe4.xml
new file mode 100644
index 0000000000..bdd1b567df
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/overlays/ovl_Oceff_Wipe4.xml
@@ -0,0 +1,11 @@
+<Root>
+    <File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B7B490" RangeStart="0x410" RangeEnd="0xF48">
+        <Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
+        <Array Name="sFrustumVtx" Count="22" Offset="0xC10">
+            <Vtx/>
+        </Array>
+        <DList Name="sMaterialDL" Offset="0xD70"/>
+        <DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
+        <DList Name="sMaterial2DL" Offset="0xE40"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/Bmori1.xml
new file mode 100644
index 0000000000..ad43114260
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/Bmori1.xml
@@ -0,0 +1,231 @@
+<Root>
+    <File Name="Bmori1_scene" Segment="2">
+        <Texture Name="Bmori1_sceneTex_014490" OutName="Bmori1_sceneTex_014490" Format="ci8" Width="32" Height="8" Offset="0x14490" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015590" OutName="Bmori1_sceneTex_015590" Format="ci8" Width="16" Height="16" Offset="0x15590" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015690" OutName="Bmori1_sceneTex_015690" Format="ci8" Width="32" Height="32" Offset="0x15690" TlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015A90" OutName="Bmori1_sceneTex_015A90" Format="ci8" Width="16" Height="16" Offset="0x15A90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTex_015B90" OutName="Bmori1_sceneTex_015B90" Format="ci8" Width="32" Height="32" Offset="0x15B90" TlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014080" OutName="Bmori1_sceneTLUT_014080" Format="rgba16" Width="16" Height="16" Offset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_sceneTLUT_014288" OutName="Bmori1_sceneTLUT_014288" Format="rgba16" Width="16" Height="16" Offset="0x14288" AddedByScript="true"/>
+        <Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
+        <Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
+        <Scene Name="Bmori1_scene" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Texture Name="Bmori1_room_0Tex_005CF8" OutName="Bmori1_room_0Tex_005CF8" Format="ci8" Width="64" Height="32" Offset="0x5D28" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0064F8" OutName="Bmori1_room_0Tex_0064F8" Format="i8" Width="64" Height="64" Offset="0x6528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0074F8" OutName="Bmori1_room_0Tex_0074F8" Format="rgba16" Width="32" Height="32" Offset="0x7528" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_007CF8" OutName="Bmori1_room_0Tex_007CF8" Format="rgba16" Width="32" Height="32" Offset="0x7D28" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0084F8" OutName="Bmori1_room_0Tex_0084F8" Format="ci8" Width="16" Height="64" Offset="0x8528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0088F8" OutName="Bmori1_room_0Tex_0088F8" Format="rgba16" Width="32" Height="64" Offset="0x8928" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_0098F8" OutName="Bmori1_room_0Tex_0098F8" Format="ci8" Width="32" Height="64" Offset="0x9928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00A0F8" OutName="Bmori1_room_0Tex_00A0F8" Format="rgba16" Width="32" Height="64" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B0F8" OutName="Bmori1_room_0Tex_00B0F8" Format="ci8" Width="32" Height="32" Offset="0xB128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B4F8" OutName="Bmori1_room_0Tex_00B4F8" Format="ci8" Width="32" Height="32" Offset="0xB528" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00B8F8" OutName="Bmori1_room_0Tex_00B8F8" Format="ci8" Width="64" Height="32" Offset="0xB928" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C0F8" OutName="Bmori1_room_0Tex_00C0F8" Format="ci8" Width="16" Height="32" Offset="0xC128" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00C2F8" OutName="Bmori1_room_0Tex_00C2F8" Format="ci8" Width="32" Height="32" Offset="0xC328" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_0Tex_00CB88" OutName="Bmori1_room_0Tex_00CB88" Format="rgba16" Width="32" Height="64" Offset="0xCBB8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Texture Name="Bmori1_room_1Tex_003368" OutName="Bmori1_room_1Tex_003368" Format="rgba16" Width="32" Height="32" Offset="0x3358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_003B68" OutName="Bmori1_room_1Tex_003B68" Format="ci8" Width="64" Height="32" Offset="0x3B58" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_004368" OutName="Bmori1_room_1Tex_004368" Format="rgba16" Width="32" Height="64" Offset="0x4358" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_1Tex_005368" OutName="Bmori1_room_1Tex_005368" Format="ci8" Width="32" Height="64" Offset="0x5358" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Texture Name="Bmori1_room_2Tex_00A380" OutName="Bmori1_room_2Tex_00A380" Format="ci8" Width="64" Height="32" Offset="0xA430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AB80" OutName="Bmori1_room_2Tex_00AB80" Format="ci8" Width="16" Height="64" Offset="0xAC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00AF80" OutName="Bmori1_room_2Tex_00AF80" Format="rgba16" Width="32" Height="64" Offset="0xB030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00BF80" OutName="Bmori1_room_2Tex_00BF80" Format="rgba16" Width="32" Height="64" Offset="0xC030" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00CF80" OutName="Bmori1_room_2Tex_00CF80" Format="ci8" Width="32" Height="32" Offset="0xD030" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00D380" OutName="Bmori1_room_2Tex_00D380" Format="ci8" Width="64" Height="32" Offset="0xD430" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DB80" OutName="Bmori1_room_2Tex_00DB80" Format="ci8" Width="16" Height="32" Offset="0xDC30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00DD80" OutName="Bmori1_room_2Tex_00DD80" Format="ci8" Width="64" Height="32" Offset="0xDE30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E580" OutName="Bmori1_room_2Tex_00E580" Format="ci8" Width="32" Height="32" Offset="0xE630" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00E980" OutName="Bmori1_room_2Tex_00E980" Format="ci8" Width="32" Height="64" Offset="0xEA30" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_2Tex_00F180" OutName="Bmori1_room_2Tex_00F180" Format="rgba16" Width="32" Height="32" Offset="0xF230" AddedByScript="true"/>
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Texture Name="Bmori1_room_3Tex_0023D8" OutName="Bmori1_room_3Tex_0023D8" Format="rgba16" Width="32" Height="32" Offset="0x2408" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_002BD8" OutName="Bmori1_room_3Tex_002BD8" Format="ci8" Width="16" Height="128" Offset="0x2C08" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0033D8" OutName="Bmori1_room_3Tex_0033D8" Format="ci8" Width="32" Height="32" Offset="0x3408" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0037D8" OutName="Bmori1_room_3Tex_0037D8" Format="rgba16" Width="8" Height="16" Offset="0x3808" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_3Tex_0038D8" OutName="Bmori1_room_3Tex_0038D8" Format="rgba16" Width="16" Height="8" Offset="0x3908" AddedByScript="true"/>
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Texture Name="Bmori1_room_4Tex_0022B8" OutName="Bmori1_room_4Tex_0022B8" Format="rgba16" Width="32" Height="32" Offset="0x22A8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_4Tex_002AB8" OutName="Bmori1_room_4Tex_002AB8" Format="ci8" Width="64" Height="32" Offset="0x2AA8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Texture Name="Bmori1_room_5Tex_0023D0" OutName="Bmori1_room_5Tex_0023D0" Format="ci8" Width="32" Height="32" Offset="0x23E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0027D0" OutName="Bmori1_room_5Tex_0027D0" Format="ci8" Width="16" Height="128" Offset="0x27E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_002FD0" OutName="Bmori1_room_5Tex_002FD0" Format="ci8" Width="32" Height="32" Offset="0x2FE0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0033D0" OutName="Bmori1_room_5Tex_0033D0" Format="rgba16" Width="8" Height="16" Offset="0x33E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_5Tex_0034D0" OutName="Bmori1_room_5Tex_0034D0" Format="rgba16" Width="16" Height="8" Offset="0x34E0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Texture Name="Bmori1_room_6Tex_006630" OutName="Bmori1_room_6Tex_006630" Format="rgba16" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_006E30" OutName="Bmori1_room_6Tex_006E30" Format="rgba16" Width="32" Height="32" Offset="0x6EC0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007630" OutName="Bmori1_room_6Tex_007630" Format="ci8" Width="32" Height="32" Offset="0x76C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_007A30" OutName="Bmori1_room_6Tex_007A30" Format="ci8" Width="64" Height="32" Offset="0x7AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008230" OutName="Bmori1_room_6Tex_008230" Format="ci8" Width="64" Height="32" Offset="0x82C0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008A30" OutName="Bmori1_room_6Tex_008A30" Format="ci8" Width="16" Height="32" Offset="0x8AC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_6Tex_008C30" OutName="Bmori1_room_6Tex_008C30" Format="ci8" Width="32" Height="64" Offset="0x8CC0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Texture Name="Bmori1_room_7Tex_007DD0" OutName="Bmori1_room_7Tex_007DD0" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0085D0" OutName="Bmori1_room_7Tex_0085D0" Format="rgba16" Width="32" Height="32" Offset="0x85F0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_008DD0" OutName="Bmori1_room_7Tex_008DD0" Format="ci8" Width="32" Height="32" Offset="0x8DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0091D0" OutName="Bmori1_room_7Tex_0091D0" Format="ci8" Width="32" Height="32" Offset="0x91F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0095D0" OutName="Bmori1_room_7Tex_0095D0" Format="ci8" Width="32" Height="64" Offset="0x95F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_009DD0" OutName="Bmori1_room_7Tex_009DD0" Format="ci8" Width="32" Height="64" Offset="0x9DF0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00A5D0" OutName="Bmori1_room_7Tex_00A5D0" Format="ci8" Width="64" Height="32" Offset="0xA5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00ADD0" OutName="Bmori1_room_7Tex_00ADD0" Format="rgba16" Width="32" Height="32" Offset="0xADF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00B5D0" OutName="Bmori1_room_7Tex_00B5D0" Format="ci8" Width="64" Height="32" Offset="0xB5F0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00BDD0" OutName="Bmori1_room_7Tex_00BDD0" Format="rgba16" Width="32" Height="64" Offset="0xBDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00CDD0" OutName="Bmori1_room_7Tex_00CDD0" Format="rgba16" Width="32" Height="64" Offset="0xCDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00DDD0" OutName="Bmori1_room_7Tex_00DDD0" Format="rgba16" Width="32" Height="32" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00EFD8" OutName="Bmori1_room_7Tex_00EFD8" Format="i4" Width="64" Height="128" Offset="0xEFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_00FFD8" OutName="Bmori1_room_7Tex_00FFD8" Format="rgba16" Width="32" Height="64" Offset="0xFFF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_010FD8" OutName="Bmori1_room_7Tex_010FD8" Format="rgba16" Width="32" Height="32" Offset="0x10FF8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_0117D8" OutName="Bmori1_room_7Tex_0117D8" Format="ia16" Width="32" Height="32" Offset="0x117F8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_7Tex_011FD8" OutName="Bmori1_room_7Tex_011FD8" Format="rgba16" Width="32" Height="64" Offset="0x11FF8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Texture Name="Bmori1_room_8Tex_00AC10" OutName="Bmori1_room_8Tex_00AC10" Format="rgba16" Width="32" Height="32" Offset="0xACD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00B410" OutName="Bmori1_room_8Tex_00B410" Format="rgba16" Width="32" Height="64" Offset="0xB4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00C410" OutName="Bmori1_room_8Tex_00C410" Format="rgba16" Width="32" Height="32" Offset="0xC4D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00CC10" OutName="Bmori1_room_8Tex_00CC10" Format="ci8" Width="32" Height="32" Offset="0xCCD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D010" OutName="Bmori1_room_8Tex_00D010" Format="ci8" Width="32" Height="32" Offset="0xD0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D410" OutName="Bmori1_room_8Tex_00D410" Format="ci8" Width="32" Height="32" Offset="0xD4D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00D810" OutName="Bmori1_room_8Tex_00D810" Format="ci8" Width="32" Height="64" Offset="0xD8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E010" OutName="Bmori1_room_8Tex_00E010" Format="ci8" Width="32" Height="64" Offset="0xE0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00E810" OutName="Bmori1_room_8Tex_00E810" Format="ci8" Width="64" Height="32" Offset="0xE8D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F010" OutName="Bmori1_room_8Tex_00F010" Format="ci8" Width="64" Height="32" Offset="0xF0D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_00F810" OutName="Bmori1_room_8Tex_00F810" Format="rgba16" Width="32" Height="64" Offset="0xF8D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_010810" OutName="Bmori1_room_8Tex_010810" Format="rgba16" Width="32" Height="64" Offset="0x108D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011810" OutName="Bmori1_room_8Tex_011810" Format="ci8" Width="32" Height="32" Offset="0x118D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_011C10" OutName="Bmori1_room_8Tex_011C10" Format="ci8" Width="64" Height="32" Offset="0x11CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_012410" OutName="Bmori1_room_8Tex_012410" Format="rgba16" Width="32" Height="32" Offset="0x124D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_013AB0" OutName="Bmori1_room_8Tex_013AB0" Format="i4" Width="64" Height="128" Offset="0x13B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_014AB0" OutName="Bmori1_room_8Tex_014AB0" Format="rgba16" Width="32" Height="32" Offset="0x14B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_0152B0" OutName="Bmori1_room_8Tex_0152B0" Format="ia16" Width="32" Height="32" Offset="0x15370" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_015AB0" OutName="Bmori1_room_8Tex_015AB0" Format="rgba16" Width="32" Height="64" Offset="0x15B70" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_8Tex_016AB0" OutName="Bmori1_room_8Tex_016AB0" Format="rgba16" Width="32" Height="64" Offset="0x16B70" AddedByScript="true"/>
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Texture Name="Bmori1_room_9Tex_0048B8" OutName="Bmori1_room_9Tex_0048B8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0050B8" OutName="Bmori1_room_9Tex_0050B8" Format="ci8" Width="32" Height="32" Offset="0x50E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0054B8" OutName="Bmori1_room_9Tex_0054B8" Format="ci8" Width="32" Height="64" Offset="0x54E8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_005CB8" OutName="Bmori1_room_9Tex_005CB8" Format="ci8" Width="64" Height="32" Offset="0x5CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0064B8" OutName="Bmori1_room_9Tex_0064B8" Format="rgba16" Width="32" Height="32" Offset="0x64E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_006CB8" OutName="Bmori1_room_9Tex_006CB8" Format="ci8" Width="64" Height="32" Offset="0x6CE8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_0074B8" OutName="Bmori1_room_9Tex_0074B8" Format="rgba16" Width="32" Height="64" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_008958" OutName="Bmori1_room_9Tex_008958" Format="ia16" Width="32" Height="32" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_9Tex_009158" OutName="Bmori1_room_9Tex_009158" Format="rgba16" Width="32" Height="64" Offset="0x9188" AddedByScript="true"/>
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Texture Name="Bmori1_room_10Tex_001260" OutName="Bmori1_room_10Tex_001260" Format="rgba16" Width="32" Height="32" Offset="0x1260" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_001A60" OutName="Bmori1_room_10Tex_001A60" Format="ci8" Width="16" Height="128" Offset="0x1A60" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002260" OutName="Bmori1_room_10Tex_002260" Format="ci8" Width="64" Height="32" Offset="0x2260" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_002A60" OutName="Bmori1_room_10Tex_002A60" Format="rgba16" Width="32" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_003A60" OutName="Bmori1_room_10Tex_003A60" Format="rgba16" Width="32" Height="64" Offset="0x3A60" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_10Tex_004BD8" OutName="Bmori1_room_10Tex_004BD8" Format="ia16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Texture Name="Bmori1_room_11Tex_008198" OutName="Bmori1_room_11Tex_008198" Format="rgba16" Width="64" Height="32" Offset="0x8188" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009198" OutName="Bmori1_room_11Tex_009198" Format="ci8" Width="32" Height="32" Offset="0x9188" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009598" OutName="Bmori1_room_11Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x9588" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_009D98" OutName="Bmori1_room_11Tex_009D98" Format="i4" Width="64" Height="64" Offset="0x9D88" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_11Tex_00A598" OutName="Bmori1_room_11Tex_00A598" Format="ci8" Width="32" Height="32" Offset="0xA588" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Texture Name="Bmori1_room_12Tex_004A00" OutName="Bmori1_room_12Tex_004A00" Format="ci8" Width="32" Height="32" Offset="0x4A00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_004E00" OutName="Bmori1_room_12Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005600" OutName="Bmori1_room_12Tex_005600" Format="ci8" Width="64" Height="32" Offset="0x5600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_005E00" OutName="Bmori1_room_12Tex_005E00" Format="ci8" Width="64" Height="32" Offset="0x5E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006600" OutName="Bmori1_room_12Tex_006600" Format="ci8" Width="64" Height="32" Offset="0x6600" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_006E00" OutName="Bmori1_room_12Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007200" OutName="Bmori1_room_12Tex_007200" Format="rgba16" Width="32" Height="32" Offset="0x7200" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_12Tex_007BD8" OutName="Bmori1_room_12Tex_007BD8" Format="ia16" Width="32" Height="32" Offset="0x7BD8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Texture Name="Bmori1_room_13Tex_004CD0" OutName="Bmori1_room_13Tex_004CD0" Format="rgba16" Width="32" Height="32" Offset="0x4CD0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0054D0" OutName="Bmori1_room_13Tex_0054D0" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_005CD0" OutName="Bmori1_room_13Tex_005CD0" Format="ci8" Width="64" Height="32" Offset="0x5CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0064D0" OutName="Bmori1_room_13Tex_0064D0" Format="ci8" Width="64" Height="32" Offset="0x64D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_006CD0" OutName="Bmori1_room_13Tex_006CD0" Format="ci8" Width="64" Height="32" Offset="0x6CD0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0074D0" OutName="Bmori1_room_13Tex_0074D0" Format="ci8" Width="32" Height="32" Offset="0x74D0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0078D0" OutName="Bmori1_room_13Tex_0078D0" Format="rgba16" Width="32" Height="32" Offset="0x78D0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_13Tex_0082A8" OutName="Bmori1_room_13Tex_0082A8" Format="ia16" Width="32" Height="32" Offset="0x82A8" AddedByScript="true"/>
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Texture Name="Bmori1_room_14Tex_003560" OutName="Bmori1_room_14Tex_003560" Format="ci8" Width="32" Height="32" Offset="0x35A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_003960" OutName="Bmori1_room_14Tex_003960" Format="rgba16" Width="32" Height="32" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004160" OutName="Bmori1_room_14Tex_004160" Format="rgba16" Width="32" Height="32" Offset="0x41A0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004960" OutName="Bmori1_room_14Tex_004960" Format="ci8" Width="32" Height="32" Offset="0x49A0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_004D60" OutName="Bmori1_room_14Tex_004D60" Format="ci8" Width="64" Height="32" Offset="0x4DA0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_14Tex_005770" OutName="Bmori1_room_14Tex_005770" Format="ia8" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Texture Name="Bmori1_room_15Tex_0012E0" OutName="Bmori1_room_15Tex_0012E0" Format="ci8" Width="32" Height="64" Offset="0x1290" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001AE0" OutName="Bmori1_room_15Tex_001AE0" Format="ci8" Width="32" Height="32" Offset="0x1A90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_15Tex_001EE0" OutName="Bmori1_room_15Tex_001EE0" Format="ci8" Width="64" Height="32" Offset="0x1E90" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Texture Name="Bmori1_room_16Tex_002F98" OutName="Bmori1_room_16Tex_002F98" Format="rgba16" Width="32" Height="32" Offset="0x2F98" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003798" OutName="Bmori1_room_16Tex_003798" Format="ci8" Width="64" Height="32" Offset="0x3798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_003F98" OutName="Bmori1_room_16Tex_003F98" Format="ci8" Width="32" Height="32" Offset="0x3F98" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004398" OutName="Bmori1_room_16Tex_004398" Format="ci8" Width="32" Height="32" Offset="0x4398" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_16Tex_004798" OutName="Bmori1_room_16Tex_004798" Format="ci8" Width="64" Height="32" Offset="0x4798" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Texture Name="Bmori1_room_17Tex_0064E8" OutName="Bmori1_room_17Tex_0064E8" Format="rgba16" Width="32" Height="32" Offset="0x6548" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_006CE8" OutName="Bmori1_room_17Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0074E8" OutName="Bmori1_room_17Tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x7548" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0078E8" OutName="Bmori1_room_17Tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x7948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_007CE8" OutName="Bmori1_room_17Tex_007CE8" Format="ci8" Width="32" Height="32" Offset="0x7D48" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0080E8" OutName="Bmori1_room_17Tex_0080E8" Format="ci8" Width="64" Height="32" Offset="0x8148" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_17Tex_0088E8" OutName="Bmori1_room_17Tex_0088E8" Format="ci8" Width="32" Height="64" Offset="0x8948" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Texture Name="Bmori1_room_18Tex_000B30" OutName="Bmori1_room_18Tex_000B30" Format="ci8" Width="64" Height="32" Offset="0xB40" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Texture Name="Bmori1_room_20Tex_0006F8" OutName="Bmori1_room_20Tex_0006F8" Format="ci8" Width="32" Height="64" Offset="0x6F8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_20Tex_000EF8" OutName="Bmori1_room_20Tex_000EF8" Format="ci8" Width="32" Height="32" Offset="0xEF8" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14080" AddedByScript="true"/>
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Texture Name="Bmori1_room_21Tex_000F70" OutName="Bmori1_room_21Tex_000F70" Format="ci8" Width="64" Height="32" Offset="0xF80" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
+    </File>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Texture Name="Bmori1_room_22Tex_0005E0" OutName="Bmori1_room_22Tex_0005E0" Format="rgba16" Width="64" Height="32" Offset="0x5E0" AddedByScript="true"/>
+        <Texture Name="Bmori1_room_22Tex_0015E0" OutName="Bmori1_room_22Tex_0015E0" Format="ci8" Width="64" Height="32" Offset="0x15E0" ExternalTlut="Bmori1_scene" ExternalTlutOffset="0x14288" AddedByScript="true"/>
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/FIRE_bs.xml
new file mode 100644
index 0000000000..89331ecc2f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/FIRE_bs.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="FIRE_bs_scene" Segment="2">
+        <Texture Name="FIRE_bs_sceneTex_002C00" OutName="FIRE_bs_sceneTex_002C00" Format="rgba16" Width="32" Height="32" Offset="0x2C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003400" OutName="FIRE_bs_sceneTex_003400" Format="rgba16" Width="32" Height="32" Offset="0x3400" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_003C00" OutName="FIRE_bs_sceneTex_003C00" Format="rgba16" Width="32" Height="32" Offset="0x3C00" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_sceneTex_004400" OutName="FIRE_bs_sceneTex_004400" Format="rgba16" Width="32" Height="32" Offset="0x4400" AddedByScript="true"/>
+        <Scene Name="FIRE_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Texture Name="FIRE_bs_room_0Tex_002E68" OutName="FIRE_bs_room_0Tex_002E68" Format="ci4" Width="32" Height="32" Offset="0x2E68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003068" OutName="FIRE_bs_room_0Tex_003068" Format="ci4" Width="32" Height="64" Offset="0x3068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003468" OutName="FIRE_bs_room_0Tex_003468" Format="ci4" Width="64" Height="32" Offset="0x3468" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003868" OutName="FIRE_bs_room_0Tex_003868" Format="ci4" Width="32" Height="32" Offset="0x3868" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003A68" OutName="FIRE_bs_room_0Tex_003A68" Format="ci4" Width="32" Height="32" Offset="0x3A68" TlutOffset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_003C68" OutName="FIRE_bs_room_0Tex_003C68" Format="ci4" Width="32" Height="64" Offset="0x3C68" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0Tex_004068" OutName="FIRE_bs_room_0Tex_004068" Format="ci4" Width="32" Height="32" Offset="0x4068" TlutOffset="0x2E48" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E28" OutName="FIRE_bs_room_0TLUT_002E28" Format="rgba16" Width="4" Height="4" Offset="0x2E28" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_0TLUT_002E48" OutName="FIRE_bs_room_0TLUT_002E48" Format="rgba16" Width="4" Height="4" Offset="0x2E48" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Texture Name="FIRE_bs_room_1Tex_0049D8" OutName="FIRE_bs_room_1Tex_0049D8" Format="ci4" Width="32" Height="32" Offset="0x49D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_004BD8" OutName="FIRE_bs_room_1Tex_004BD8" Format="rgba16" Width="32" Height="32" Offset="0x4BD8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0053D8" OutName="FIRE_bs_room_1Tex_0053D8" Format="rgba16" Width="32" Height="32" Offset="0x53D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005BD8" OutName="FIRE_bs_room_1Tex_005BD8" Format="ci4" Width="64" Height="32" Offset="0x5BD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_005FD8" OutName="FIRE_bs_room_1Tex_005FD8" Format="ci4" Width="32" Height="32" Offset="0x5FD8" TlutOffset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0061D8" OutName="FIRE_bs_room_1Tex_0061D8" Format="ci4" Width="32" Height="64" Offset="0x61D8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_0065D8" OutName="FIRE_bs_room_1Tex_0065D8" Format="rgba16" Width="32" Height="32" Offset="0x65D8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1Tex_006DD8" OutName="FIRE_bs_room_1Tex_006DD8" Format="ci4" Width="32" Height="32" Offset="0x6DD8" TlutOffset="0x49B8" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_004998" OutName="FIRE_bs_room_1TLUT_004998" Format="rgba16" Width="4" Height="4" Offset="0x4998" AddedByScript="true"/>
+        <Texture Name="FIRE_bs_room_1TLUT_0049B8" OutName="FIRE_bs_room_1TLUT_0049B8" Format="rgba16" Width="4" Height="4" Offset="0x49B8" AddedByScript="true"/>
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan.xml
new file mode 100644
index 0000000000..e557c80a55
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan.xml
@@ -0,0 +1,191 @@
+<Root>
+    <File Name="HAKAdan_scene" Segment="2">
+        <Texture Name="HAKAdan_sceneTex_0163C0" OutName="HAKAdan_sceneTex_0163C0" Format="rgba16" Width="32" Height="32" Offset="0x163C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_016BC0" OutName="HAKAdan_sceneTex_016BC0" Format="rgba16" Width="32" Height="32" Offset="0x16BC0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_0173C0" OutName="HAKAdan_sceneTex_0173C0" Format="rgba16" Width="32" Height="32" Offset="0x173C0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_sceneTex_017BC0" OutName="HAKAdan_sceneTex_017BC0" Format="rgba16" Width="32" Height="32" Offset="0x17BC0" AddedByScript="true"/>
+        <Scene Name="HAKAdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Texture Name="HAKAdan_room_0Tex_008230" OutName="HAKAdan_room_0Tex_008230" Format="rgba16" Width="32" Height="64" Offset="0x81A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_009230" OutName="HAKAdan_room_0Tex_009230" Format="rgba16" Width="32" Height="64" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00A230" OutName="HAKAdan_room_0Tex_00A230" Format="rgba16" Width="32" Height="32" Offset="0xA1A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_0Tex_00AD48" OutName="HAKAdan_room_0Tex_00AD48" Format="ia8" Width="32" Height="32" Offset="0xACB8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Texture Name="HAKAdan_room_1Tex_0012E8" OutName="HAKAdan_room_1Tex_0012E8" Format="rgba16" Width="32" Height="32" Offset="0x12B8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Texture Name="HAKAdan_room_2Tex_006BD8" OutName="HAKAdan_room_2Tex_006BD8" Format="i4" Width="64" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0073D8" OutName="HAKAdan_room_2Tex_0073D8" Format="rgba16" Width="32" Height="16" Offset="0x7308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0077D8" OutName="HAKAdan_room_2Tex_0077D8" Format="rgba16" Width="32" Height="32" Offset="0x7708" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_007FD8" OutName="HAKAdan_room_2Tex_007FD8" Format="rgba16" Width="32" Height="8" Offset="0x7F08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0081D8" OutName="HAKAdan_room_2Tex_0081D8" Format="rgba16" Width="32" Height="64" Offset="0x8108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0091D8" OutName="HAKAdan_room_2Tex_0091D8" Format="rgba16" Width="32" Height="32" Offset="0x9108" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_0099D8" OutName="HAKAdan_room_2Tex_0099D8" Format="i4" Width="32" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_009BD8" OutName="HAKAdan_room_2Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9B08" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A3D8" OutName="HAKAdan_room_2Tex_00A3D8" Format="i4" Width="32" Height="32" Offset="0xA308" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A5D8" OutName="HAKAdan_room_2Tex_00A5D8" Format="i4" Width="32" Height="32" Offset="0xA508" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_2Tex_00A7D8" OutName="HAKAdan_room_2Tex_00A7D8" Format="i4" Width="32" Height="32" Offset="0xA708" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Texture Name="HAKAdan_room_3Tex_001578" OutName="HAKAdan_room_3Tex_001578" Format="rgba16" Width="32" Height="32" Offset="0x1538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_001D78" OutName="HAKAdan_room_3Tex_001D78" Format="rgba16" Width="32" Height="32" Offset="0x1D38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002578" OutName="HAKAdan_room_3Tex_002578" Format="i4" Width="32" Height="32" Offset="0x2538" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_3Tex_002778" OutName="HAKAdan_room_3Tex_002778" Format="i4" Width="32" Height="32" Offset="0x2738" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Texture Name="HAKAdan_room_4Tex_001458" OutName="HAKAdan_room_4Tex_001458" Format="rgba16" Width="32" Height="32" Offset="0x1438" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Texture Name="HAKAdan_room_5Tex_003CC0" OutName="HAKAdan_room_5Tex_003CC0" Format="rgba16" Width="32" Height="16" Offset="0x3C60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0040C0" OutName="HAKAdan_room_5Tex_0040C0" Format="rgba16" Width="32" Height="32" Offset="0x4060" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0048C0" OutName="HAKAdan_room_5Tex_0048C0" Format="rgba16" Width="32" Height="8" Offset="0x4860" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_004AC0" OutName="HAKAdan_room_5Tex_004AC0" Format="rgba16" Width="32" Height="32" Offset="0x4A60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_5Tex_0052C0" OutName="HAKAdan_room_5Tex_0052C0" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Texture Name="HAKAdan_room_6Tex_004BF0" OutName="HAKAdan_room_6Tex_004BF0" Format="i4" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0053F0" OutName="HAKAdan_room_6Tex_0053F0" Format="rgba16" Width="32" Height="8" Offset="0x5370" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0055F0" OutName="HAKAdan_room_6Tex_0055F0" Format="rgba16" Width="32" Height="64" Offset="0x5570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0065F0" OutName="HAKAdan_room_6Tex_0065F0" Format="rgba16" Width="32" Height="32" Offset="0x6570" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_006DF0" OutName="HAKAdan_room_6Tex_006DF0" Format="rgba16" Width="16" Height="32" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_6Tex_0071F0" OutName="HAKAdan_room_6Tex_0071F0" Format="rgba16" Width="16" Height="32" Offset="0x7170" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Texture Name="HAKAdan_room_7Tex_0012D8" OutName="HAKAdan_room_7Tex_0012D8" Format="rgba16" Width="32" Height="32" Offset="0x12A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Texture Name="HAKAdan_room_8Tex_003098" OutName="HAKAdan_room_8Tex_003098" Format="rgba16" Width="32" Height="8" Offset="0x3058" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_003298" OutName="HAKAdan_room_8Tex_003298" Format="ia4" Width="128" Height="64" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004298" OutName="HAKAdan_room_8Tex_004298" Format="rgba16" Width="32" Height="32" Offset="0x4258" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004A98" OutName="HAKAdan_room_8Tex_004A98" Format="i4" Width="32" Height="32" Offset="0x4A58" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_8Tex_004C98" OutName="HAKAdan_room_8Tex_004C98" Format="rgba16" Width="16" Height="32" Offset="0x4C58" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Texture Name="HAKAdan_room_9Tex_009090" OutName="HAKAdan_room_9Tex_009090" Format="i4" Width="64" Height="64" Offset="0x8F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_009890" OutName="HAKAdan_room_9Tex_009890" Format="rgba16" Width="32" Height="32" Offset="0x9760" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A090" OutName="HAKAdan_room_9Tex_00A090" Format="rgba16" Width="32" Height="8" Offset="0x9F60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00A290" OutName="HAKAdan_room_9Tex_00A290" Format="ia4" Width="128" Height="64" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00B290" OutName="HAKAdan_room_9Tex_00B290" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BA90" OutName="HAKAdan_room_9Tex_00BA90" Format="rgba16" Width="16" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00BE90" OutName="HAKAdan_room_9Tex_00BE90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C690" OutName="HAKAdan_room_9Tex_00C690" Format="i4" Width="32" Height="32" Offset="0xC560" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_9Tex_00C890" OutName="HAKAdan_room_9Tex_00C890" Format="rgba16" Width="16" Height="32" Offset="0xC760" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Texture Name="HAKAdan_room_10Tex_0039F0" OutName="HAKAdan_room_10Tex_0039F0" Format="rgba16" Width="32" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003DF0" OutName="HAKAdan_room_10Tex_003DF0" Format="rgba16" Width="32" Height="8" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_003FF0" OutName="HAKAdan_room_10Tex_003FF0" Format="rgba16" Width="32" Height="64" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_004FF0" OutName="HAKAdan_room_10Tex_004FF0" Format="ia4" Width="128" Height="64" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_005FF0" OutName="HAKAdan_room_10Tex_005FF0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0067F0" OutName="HAKAdan_room_10Tex_0067F0" Format="rgba16" Width="16" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_006BF0" OutName="HAKAdan_room_10Tex_006BF0" Format="rgba16" Width="16" Height="64" Offset="0x6BA0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_10Tex_0073F0" OutName="HAKAdan_room_10Tex_0073F0" Format="rgba16" Width="16" Height="32" Offset="0x73A0" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Texture Name="HAKAdan_room_11Tex_001E60" OutName="HAKAdan_room_11Tex_001E60" Format="i4" Width="64" Height="64" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002660" OutName="HAKAdan_room_11Tex_002660" Format="rgba16" Width="32" Height="16" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002A60" OutName="HAKAdan_room_11Tex_002A60" Format="rgba16" Width="32" Height="8" Offset="0x2940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_002C60" OutName="HAKAdan_room_11Tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2B40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003460" OutName="HAKAdan_room_11Tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_11Tex_003C60" OutName="HAKAdan_room_11Tex_003C60" Format="i4" Width="32" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Texture Name="HAKAdan_room_12Tex_003348" OutName="HAKAdan_room_12Tex_003348" Format="i4" Width="32" Height="32" Offset="0x3318" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003548" OutName="HAKAdan_room_12Tex_003548" Format="i4" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003748" OutName="HAKAdan_room_12Tex_003748" Format="rgba16" Width="32" Height="16" Offset="0x3718" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003B48" OutName="HAKAdan_room_12Tex_003B48" Format="rgba16" Width="32" Height="8" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_003D48" OutName="HAKAdan_room_12Tex_003D48" Format="rgba16" Width="32" Height="64" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_004D48" OutName="HAKAdan_room_12Tex_004D48" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_12Tex_005548" OutName="HAKAdan_room_12Tex_005548" Format="i4" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Texture Name="HAKAdan_room_13Tex_000818" OutName="HAKAdan_room_13Tex_000818" Format="rgba16" Width="32" Height="32" Offset="0x7A8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Texture Name="HAKAdan_room_14Tex_003500" OutName="HAKAdan_room_14Tex_003500" Format="i4" Width="32" Height="32" Offset="0x3540" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003700" OutName="HAKAdan_room_14Tex_003700" Format="i4" Width="32" Height="32" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003900" OutName="HAKAdan_room_14Tex_003900" Format="rgba16" Width="32" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003D00" OutName="HAKAdan_room_14Tex_003D00" Format="rgba16" Width="32" Height="8" Offset="0x3D40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_003F00" OutName="HAKAdan_room_14Tex_003F00" Format="rgba16" Width="32" Height="64" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_004F00" OutName="HAKAdan_room_14Tex_004F00" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_14Tex_005700" OutName="HAKAdan_room_14Tex_005700" Format="i4" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Texture Name="HAKAdan_room_15Tex_0056C0" OutName="HAKAdan_room_15Tex_0056C0" Format="i4" Width="32" Height="32" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0058C0" OutName="HAKAdan_room_15Tex_0058C0" Format="i4" Width="32" Height="32" Offset="0x5870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005AC0" OutName="HAKAdan_room_15Tex_005AC0" Format="rgba16" Width="32" Height="16" Offset="0x5A70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_005EC0" OutName="HAKAdan_room_15Tex_005EC0" Format="rgba16" Width="32" Height="8" Offset="0x5E70" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0060C0" OutName="HAKAdan_room_15Tex_0060C0" Format="rgba16" Width="32" Height="32" Offset="0x6070" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0068C0" OutName="HAKAdan_room_15Tex_0068C0" Format="rgba16" Width="32" Height="32" Offset="0x6870" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_15Tex_0070C0" OutName="HAKAdan_room_15Tex_0070C0" Format="i4" Width="32" Height="32" Offset="0x7070" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Texture Name="HAKAdan_room_16Tex_001930" OutName="HAKAdan_room_16Tex_001930" Format="rgba16" Width="32" Height="64" Offset="0x1880" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Texture Name="HAKAdan_room_17Tex_001248" OutName="HAKAdan_room_17Tex_001248" Format="rgba16" Width="32" Height="8" Offset="0x1138" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001448" OutName="HAKAdan_room_17Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1338" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_001C48" OutName="HAKAdan_room_17Tex_001C48" Format="rgba16" Width="16" Height="32" Offset="0x1B38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_002048" OutName="HAKAdan_room_17Tex_002048" Format="rgba16" Width="16" Height="32" Offset="0x1F38" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_17Tex_0025D8" OutName="HAKAdan_room_17Tex_0025D8" Format="ia16" Width="32" Height="32" Offset="0x24C8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Texture Name="HAKAdan_room_18Tex_00B908" OutName="HAKAdan_room_18Tex_00B908" Format="i4" Width="32" Height="32" Offset="0xB878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BB08" OutName="HAKAdan_room_18Tex_00BB08" Format="rgba16" Width="32" Height="16" Offset="0xBA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00BF08" OutName="HAKAdan_room_18Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C708" OutName="HAKAdan_room_18Tex_00C708" Format="rgba16" Width="32" Height="8" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00C908" OutName="HAKAdan_room_18Tex_00C908" Format="i4" Width="32" Height="32" Offset="0xC878" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CB08" OutName="HAKAdan_room_18Tex_00CB08" Format="i4" Width="32" Height="32" Offset="0xCA78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CD08" OutName="HAKAdan_room_18Tex_00CD08" Format="i4" Width="32" Height="32" Offset="0xCC78" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_18Tex_00CF08" OutName="HAKAdan_room_18Tex_00CF08" Format="rgba16" Width="16" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Texture Name="HAKAdan_room_19Tex_001578" OutName="HAKAdan_room_19Tex_001578" Format="rgba16" Width="32" Height="64" Offset="0x1518" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_19Tex_002578" OutName="HAKAdan_room_19Tex_002578" Format="rgba16" Width="32" Height="32" Offset="0x2518" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Texture Name="HAKAdan_room_20Tex_001640" OutName="HAKAdan_room_20Tex_001640" Format="rgba16" Width="32" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Texture Name="HAKAdan_room_21Tex_006E00" OutName="HAKAdan_room_21Tex_006E00" Format="rgba16" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007600" OutName="HAKAdan_room_21Tex_007600" Format="rgba16" Width="32" Height="8" Offset="0x7500" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_007800" OutName="HAKAdan_room_21Tex_007800" Format="rgba16" Width="32" Height="64" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_008800" OutName="HAKAdan_room_21Tex_008800" Format="rgba16" Width="32" Height="32" Offset="0x8700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009000" OutName="HAKAdan_room_21Tex_009000" Format="rgba16" Width="32" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_009800" OutName="HAKAdan_room_21Tex_009800" Format="rgba16" Width="16" Height="64" Offset="0x9700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A000" OutName="HAKAdan_room_21Tex_00A000" Format="rgba16" Width="32" Height="32" Offset="0x9F00" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00A800" OutName="HAKAdan_room_21Tex_00A800" Format="i4" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00AA00" OutName="HAKAdan_room_21Tex_00AA00" Format="i4" Width="32" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_21Tex_00ADA8" OutName="HAKAdan_room_21Tex_00ADA8" Format="rgba16" Width="32" Height="32" Offset="0xACA8" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Texture Name="HAKAdan_room_22Tex_000FA8" OutName="HAKAdan_room_22Tex_000FA8" Format="rgba16" Width="32" Height="8" Offset="0xF98" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0011A8" OutName="HAKAdan_room_22Tex_0011A8" Format="rgba16" Width="32" Height="64" Offset="0x1198" AddedByScript="true"/>
+        <Texture Name="HAKAdan_room_22Tex_0021A8" OutName="HAKAdan_room_22Tex_0021A8" Format="rgba16" Width="32" Height="32" Offset="0x2198" AddedByScript="true"/>
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdanCH.xml
new file mode 100644
index 0000000000..97401aff65
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdanCH.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="HAKAdanCH_scene" Segment="2">
+        <Texture Name="HAKAdanCH_sceneTex_00A590" OutName="HAKAdanCH_sceneTex_00A590" Format="rgba16" Width="32" Height="32" Offset="0xA560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00AD90" OutName="HAKAdanCH_sceneTex_00AD90" Format="rgba16" Width="32" Height="32" Offset="0xAD60" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00B590" OutName="HAKAdanCH_sceneTex_00B590" Format="rgba16" Width="32" Height="32" Offset="0xB560" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_sceneTex_00BD90" OutName="HAKAdanCH_sceneTex_00BD90" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Texture Name="HAKAdanCH_room_0Tex_00D720" OutName="HAKAdanCH_room_0Tex_00D720" Format="rgba16" Width="32" Height="32" Offset="0xD5F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00DF20" OutName="HAKAdanCH_room_0Tex_00DF20" Format="rgba16" Width="32" Height="8" Offset="0xDDF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00E120" OutName="HAKAdanCH_room_0Tex_00E120" Format="rgba16" Width="32" Height="64" Offset="0xDFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F120" OutName="HAKAdanCH_room_0Tex_00F120" Format="rgba16" Width="32" Height="32" Offset="0xEFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_00F920" OutName="HAKAdanCH_room_0Tex_00F920" Format="rgba16" Width="32" Height="32" Offset="0xF7F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_010120" OutName="HAKAdanCH_room_0Tex_010120" Format="rgba16" Width="32" Height="64" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011120" OutName="HAKAdanCH_room_0Tex_011120" Format="rgba16" Width="32" Height="32" Offset="0x10FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011920" OutName="HAKAdanCH_room_0Tex_011920" Format="rgba16" Width="16" Height="32" Offset="0x117F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011D20" OutName="HAKAdanCH_room_0Tex_011D20" Format="i4" Width="32" Height="32" Offset="0x11BF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_011F20" OutName="HAKAdanCH_room_0Tex_011F20" Format="rgba16" Width="16" Height="64" Offset="0x11DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012720" OutName="HAKAdanCH_room_0Tex_012720" Format="rgba16" Width="32" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_012F20" OutName="HAKAdanCH_room_0Tex_012F20" Format="i4" Width="32" Height="32" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013120" OutName="HAKAdanCH_room_0Tex_013120" Format="i4" Width="32" Height="32" Offset="0x12FF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013320" OutName="HAKAdanCH_room_0Tex_013320" Format="rgba16" Width="16" Height="32" Offset="0x131F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013720" OutName="HAKAdanCH_room_0Tex_013720" Format="rgba16" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_013F20" OutName="HAKAdanCH_room_0Tex_013F20" Format="i4" Width="32" Height="32" Offset="0x13DF0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014B20" OutName="HAKAdanCH_room_0Tex_014B20" Format="ia4" Width="16" Height="128" Offset="0x149F0" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_0Tex_014F20" OutName="HAKAdanCH_room_0Tex_014F20" Format="ia16" Width="32" Height="32" Offset="0x14DF0" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Texture Name="HAKAdanCH_room_1Tex_008D58" OutName="HAKAdanCH_room_1Tex_008D58" Format="rgba16" Width="32" Height="8" Offset="0x8EF8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_008F58" OutName="HAKAdanCH_room_1Tex_008F58" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009158" OutName="HAKAdanCH_room_1Tex_009158" Format="i4" Width="32" Height="32" Offset="0x92F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009358" OutName="HAKAdanCH_room_1Tex_009358" Format="rgba16" Width="32" Height="16" Offset="0x94F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009758" OutName="HAKAdanCH_room_1Tex_009758" Format="rgba16" Width="32" Height="32" Offset="0x98F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_009F58" OutName="HAKAdanCH_room_1Tex_009F58" Format="i4" Width="32" Height="32" Offset="0xA0F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A158" OutName="HAKAdanCH_room_1Tex_00A158" Format="rgba16" Width="16" Height="32" Offset="0xA2F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00A558" OutName="HAKAdanCH_room_1Tex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA6F8" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_1Tex_00AD58" OutName="HAKAdanCH_room_1Tex_00AD58" Format="i4" Width="32" Height="32" Offset="0xAEF8" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Texture Name="HAKAdanCH_room_2Tex_002958" OutName="HAKAdanCH_room_2Tex_002958" Format="rgba16" Width="32" Height="8" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002B58" OutName="HAKAdanCH_room_2Tex_002B58" Format="i4" Width="32" Height="32" Offset="0x2B88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002D58" OutName="HAKAdanCH_room_2Tex_002D58" Format="i4" Width="32" Height="32" Offset="0x2D88" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_2Tex_002F58" OutName="HAKAdanCH_room_2Tex_002F58" Format="i4" Width="32" Height="32" Offset="0x2F88" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Texture Name="HAKAdanCH_room_3Tex_0014C0" OutName="HAKAdanCH_room_3Tex_0014C0" Format="rgba16" Width="32" Height="32" Offset="0x1460" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Texture Name="HAKAdanCH_room_4Tex_001498" OutName="HAKAdanCH_room_4Tex_001498" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_4Tex_001C98" OutName="HAKAdanCH_room_4Tex_001C98" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Texture Name="HAKAdanCH_room_5Tex_001190" OutName="HAKAdanCH_room_5Tex_001190" Format="rgba16" Width="32" Height="64" Offset="0x1160" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_5Tex_002190" OutName="HAKAdanCH_room_5Tex_002190" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Texture Name="HAKAdanCH_room_6Tex_000EA0" OutName="HAKAdanCH_room_6Tex_000EA0" Format="rgba16" Width="32" Height="32" Offset="0xE80" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0016A0" OutName="HAKAdanCH_room_6Tex_0016A0" Format="rgba16" Width="32" Height="64" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="HAKAdanCH_room_6Tex_0026A0" OutName="HAKAdanCH_room_6Tex_0026A0" Format="rgba16" Width="32" Height="32" Offset="0x2680" AddedByScript="true"/>
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan_bs.xml
new file mode 100644
index 0000000000..d36ac6b774
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HAKAdan_bs.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="HAKAdan_bs_scene" Segment="2">
+        <Texture Name="HAKAdan_bs_sceneTex_001380" OutName="HAKAdan_bs_sceneTex_001380" Format="i4" Width="32" Height="32" Offset="0x1380" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001580" OutName="HAKAdan_bs_sceneTex_001580" Format="rgba16" Width="32" Height="8" Offset="0x1580" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001780" OutName="HAKAdan_bs_sceneTex_001780" Format="rgba16" Width="32" Height="32" Offset="0x1780" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_sceneTex_001F80" OutName="HAKAdan_bs_sceneTex_001F80" Format="rgba16" Width="32" Height="32" Offset="0x1F80" AddedByScript="true"/>
+        <Scene Name="HAKAdan_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Texture Name="HAKAdan_bs_room_0Tex_0021E0" OutName="HAKAdan_bs_room_0Tex_0021E0" Format="i4" Width="32" Height="32" Offset="0x21E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0023E0" OutName="HAKAdan_bs_room_0Tex_0023E0" Format="rgba16" Width="32" Height="16" Offset="0x23E0" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_0Tex_0027E0" OutName="HAKAdan_bs_room_0Tex_0027E0" Format="i4" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Texture Name="HAKAdan_bs_room_1Tex_002D50" OutName="HAKAdan_bs_room_1Tex_002D50" Format="i4" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_002F50" OutName="HAKAdan_bs_room_1Tex_002F50" Format="rgba16" Width="32" Height="32" Offset="0x2F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003750" OutName="HAKAdan_bs_room_1Tex_003750" Format="rgba16" Width="32" Height="32" Offset="0x3750" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_003F50" OutName="HAKAdan_bs_room_1Tex_003F50" Format="rgba16" Width="32" Height="64" Offset="0x3F50" AddedByScript="true"/>
+        <Texture Name="HAKAdan_bs_room_1Tex_004F50" OutName="HAKAdan_bs_room_1Tex_004F50" Format="rgba16" Width="32" Height="64" Offset="0x4F50" AddedByScript="true"/>
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HIDAN.xml
new file mode 100644
index 0000000000..fa4d784f1a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/HIDAN.xml
@@ -0,0 +1,288 @@
+<Root>
+    <File Name="HIDAN_scene" Segment="2">
+        <Texture Name="HIDAN_sceneTex_0189D0" OutName="HIDAN_sceneTex_0189D0" Format="ci4" Width="32" Height="32" Offset="0x18B70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018BD0" OutName="HIDAN_sceneTex_018BD0" Format="ci4" Width="32" Height="32" Offset="0x18D70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_018DD0" OutName="HIDAN_sceneTex_018DD0" Format="rgba16" Width="32" Height="32" Offset="0x18F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_0195D0" OutName="HIDAN_sceneTex_0195D0" Format="rgba16" Width="32" Height="32" Offset="0x19770" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019DD0" OutName="HIDAN_sceneTex_019DD0" Format="ci4" Width="32" Height="32" Offset="0x19F70" TlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTex_019FD0" OutName="HIDAN_sceneTex_019FD0" Format="rgba16" Width="32" Height="32" Offset="0x1A170" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_018990" OutName="HIDAN_sceneTLUT_018990" Format="rgba16" Width="4" Height="4" Offset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_sceneTLUT_0189B0" OutName="HIDAN_sceneTLUT_0189B0" Format="rgba16" Width="4" Height="4" Offset="0x18B50" AddedByScript="true"/>
+        <Path Name="gHidanPath_560" Offset="0x558" NumPaths="19"/>
+        <Scene Name="HIDAN_scene" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Texture Name="HIDAN_room_0Tex_004EF0" OutName="HIDAN_room_0Tex_004EF0" Format="ci4" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0052F0" OutName="HIDAN_room_0Tex_0052F0" Format="ci4" Width="64" Height="32" Offset="0x52C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0056F0" OutName="HIDAN_room_0Tex_0056F0" Format="ci4" Width="64" Height="32" Offset="0x56C0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005AF0" OutName="HIDAN_room_0Tex_005AF0" Format="ci4" Width="32" Height="32" Offset="0x5AC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005CF0" OutName="HIDAN_room_0Tex_005CF0" Format="ci4" Width="32" Height="32" Offset="0x5CC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_005EF0" OutName="HIDAN_room_0Tex_005EF0" Format="ci4" Width="32" Height="64" Offset="0x5EC0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_0Tex_0062F0" OutName="HIDAN_room_0Tex_0062F0" Format="rgba16" Width="32" Height="64" Offset="0x62C0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Texture Name="HIDAN_room_1Tex_008730" OutName="HIDAN_room_1Tex_008730" Format="rgba16" Width="16" Height="16" Offset="0x87E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_008930" OutName="HIDAN_room_1Tex_008930" Format="rgba16" Width="32" Height="32" Offset="0x89E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009130" OutName="HIDAN_room_1Tex_009130" Format="rgba16" Width="32" Height="32" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_009930" OutName="HIDAN_room_1Tex_009930" Format="rgba16" Width="32" Height="32" Offset="0x99E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A130" OutName="HIDAN_room_1Tex_00A130" Format="ci4" Width="64" Height="32" Offset="0xA1E0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00A530" OutName="HIDAN_room_1Tex_00A530" Format="rgba16" Width="64" Height="32" Offset="0xA5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00B530" OutName="HIDAN_room_1Tex_00B530" Format="rgba16" Width="32" Height="32" Offset="0xB5E0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00BD30" OutName="HIDAN_room_1Tex_00BD30" Format="ci4" Width="32" Height="64" Offset="0xBDE0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_1Tex_00C130" OutName="HIDAN_room_1Tex_00C130" Format="rgba16" Width="32" Height="32" Offset="0xC1E0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Texture Name="HIDAN_room_2Tex_009628" OutName="HIDAN_room_2Tex_009628" Format="rgba16" Width="32" Height="8" Offset="0x95C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_009828" OutName="HIDAN_room_2Tex_009828" Format="rgba16" Width="32" Height="32" Offset="0x97C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A028" OutName="HIDAN_room_2Tex_00A028" Format="rgba16" Width="32" Height="32" Offset="0x9FC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00A828" OutName="HIDAN_room_2Tex_00A828" Format="ci4" Width="64" Height="32" Offset="0xA7C8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00AC28" OutName="HIDAN_room_2Tex_00AC28" Format="rgba16" Width="64" Height="32" Offset="0xABC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00BC28" OutName="HIDAN_room_2Tex_00BC28" Format="rgba16" Width="64" Height="32" Offset="0xBBC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CC28" OutName="HIDAN_room_2Tex_00CC28" Format="ci4" Width="32" Height="32" Offset="0xCBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00CE28" OutName="HIDAN_room_2Tex_00CE28" Format="rgba16" Width="64" Height="32" Offset="0xCDC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00DE28" OutName="HIDAN_room_2Tex_00DE28" Format="ci4" Width="32" Height="32" Offset="0xDDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E028" OutName="HIDAN_room_2Tex_00E028" Format="ci4" Width="32" Height="64" Offset="0xDFC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00E428" OutName="HIDAN_room_2Tex_00E428" Format="rgba16" Width="32" Height="32" Offset="0xE3C8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00EC28" OutName="HIDAN_room_2Tex_00EC28" Format="ci4" Width="32" Height="64" Offset="0xEBC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F028" OutName="HIDAN_room_2Tex_00F028" Format="rgba16" Width="32" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_2Tex_00F828" OutName="HIDAN_room_2Tex_00F828" Format="rgba16" Width="32" Height="32" Offset="0xF7C8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Texture Name="HIDAN_room_3Tex_001AC8" OutName="HIDAN_room_3Tex_001AC8" Format="ci4" Width="32" Height="64" Offset="0x1AD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_001EC8" OutName="HIDAN_room_3Tex_001EC8" Format="ci4" Width="64" Height="32" Offset="0x1ED8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_3Tex_0022C8" OutName="HIDAN_room_3Tex_0022C8" Format="ci4" Width="32" Height="32" Offset="0x22D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Texture Name="HIDAN_room_4Tex_0050F0" OutName="HIDAN_room_4Tex_0050F0" Format="rgba16" Width="32" Height="8" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0052F0" OutName="HIDAN_room_4Tex_0052F0" Format="rgba16" Width="32" Height="32" Offset="0x5290" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_005AF0" OutName="HIDAN_room_4Tex_005AF0" Format="rgba16" Width="32" Height="32" Offset="0x5A90" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0062F0" OutName="HIDAN_room_4Tex_0062F0" Format="ci4" Width="32" Height="64" Offset="0x6290" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0066F0" OutName="HIDAN_room_4Tex_0066F0" Format="ci4" Width="32" Height="32" Offset="0x6690" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0068F0" OutName="HIDAN_room_4Tex_0068F0" Format="ci4" Width="32" Height="64" Offset="0x6890" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_006CF0" OutName="HIDAN_room_4Tex_006CF0" Format="ci4" Width="32" Height="64" Offset="0x6C90" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_4Tex_0070F0" OutName="HIDAN_room_4Tex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x7090" AddedByScript="true"/>
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Texture Name="HIDAN_room_5Tex_007EE0" OutName="HIDAN_room_5Tex_007EE0" Format="rgba16" Width="32" Height="8" Offset="0x7E30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0080E0" OutName="HIDAN_room_5Tex_0080E0" Format="rgba16" Width="32" Height="32" Offset="0x8030" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0088E0" OutName="HIDAN_room_5Tex_0088E0" Format="ci4" Width="32" Height="64" Offset="0x8830" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_008CE0" OutName="HIDAN_room_5Tex_008CE0" Format="rgba16" Width="32" Height="32" Offset="0x8C30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0094E0" OutName="HIDAN_room_5Tex_0094E0" Format="ci4" Width="32" Height="32" Offset="0x9430" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_0096E0" OutName="HIDAN_room_5Tex_0096E0" Format="ci4" Width="32" Height="64" Offset="0x9630" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009AE0" OutName="HIDAN_room_5Tex_009AE0" Format="ci4" Width="32" Height="64" Offset="0x9A30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_5Tex_009EE0" OutName="HIDAN_room_5Tex_009EE0" Format="ci4" Width="32" Height="64" Offset="0x9E30" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Texture Name="HIDAN_room_6Tex_003990" OutName="HIDAN_room_6Tex_003990" Format="rgba16" Width="16" Height="16" Offset="0x39A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_003B90" OutName="HIDAN_room_6Tex_003B90" Format="rgba16" Width="32" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004390" OutName="HIDAN_room_6Tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x43A0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_004B90" OutName="HIDAN_room_6Tex_004B90" Format="rgba16" Width="64" Height="32" Offset="0x4BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_005B90" OutName="HIDAN_room_6Tex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5BA0" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006390" OutName="HIDAN_room_6Tex_006390" Format="ci4" Width="32" Height="64" Offset="0x63A0" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_6Tex_006790" OutName="HIDAN_room_6Tex_006790" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Texture Name="HIDAN_room_7Tex_001C48" OutName="HIDAN_room_7Tex_001C48" Format="rgba16" Width="32" Height="8" Offset="0x1BD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_001E48" OutName="HIDAN_room_7Tex_001E48" Format="rgba16" Width="32" Height="32" Offset="0x1DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002648" OutName="HIDAN_room_7Tex_002648" Format="ci4" Width="32" Height="64" Offset="0x25D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_7Tex_002A48" OutName="HIDAN_room_7Tex_002A48" Format="rgba16" Width="32" Height="64" Offset="0x29D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Texture Name="HIDAN_room_8Tex_0050D8" OutName="HIDAN_room_8Tex_0050D8" Format="rgba16" Width="16" Height="16" Offset="0x50B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0052D8" OutName="HIDAN_room_8Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_005AD8" OutName="HIDAN_room_8Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0062D8" OutName="HIDAN_room_8Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_006AD8" OutName="HIDAN_room_8Tex_006AD8" Format="rgba16" Width="64" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_007AD8" OutName="HIDAN_room_8Tex_007AD8" Format="rgba16" Width="32" Height="32" Offset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0082D8" OutName="HIDAN_room_8Tex_0082D8" Format="ci4" Width="32" Height="64" Offset="0x82B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0086D8" OutName="HIDAN_room_8Tex_0086D8" Format="ci4" Width="32" Height="64" Offset="0x86B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_008AD8" OutName="HIDAN_room_8Tex_008AD8" Format="rgba16" Width="32" Height="32" Offset="0x8AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_8Tex_0092D8" OutName="HIDAN_room_8Tex_0092D8" Format="rgba16" Width="32" Height="32" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Texture Name="HIDAN_room_9Tex_004768" OutName="HIDAN_room_9Tex_004768" Format="rgba16" Width="32" Height="32" Offset="0x4768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_004F68" OutName="HIDAN_room_9Tex_004F68" Format="rgba16" Width="32" Height="32" Offset="0x4F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005768" OutName="HIDAN_room_9Tex_005768" Format="rgba16" Width="32" Height="32" Offset="0x5768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_005F68" OutName="HIDAN_room_9Tex_005F68" Format="rgba16" Width="32" Height="32" Offset="0x5F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006768" OutName="HIDAN_room_9Tex_006768" Format="rgba16" Width="32" Height="32" Offset="0x6768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_006F68" OutName="HIDAN_room_9Tex_006F68" Format="rgba16" Width="32" Height="32" Offset="0x6F68" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007768" OutName="HIDAN_room_9Tex_007768" Format="rgba16" Width="32" Height="32" Offset="0x7768" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_9Tex_007F68" OutName="HIDAN_room_9Tex_007F68" Format="rgba16" Width="32" Height="32" Offset="0x7F68" AddedByScript="true"/>
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Texture Name="HIDAN_room_10Tex_011818" OutName="HIDAN_room_10Tex_011818" Format="rgba16" Width="32" Height="8" Offset="0x11898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_011A18" OutName="HIDAN_room_10Tex_011A18" Format="rgba16" Width="32" Height="32" Offset="0x11A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012218" OutName="HIDAN_room_10Tex_012218" Format="ci4" Width="32" Height="64" Offset="0x12298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012618" OutName="HIDAN_room_10Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12698" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_012E18" OutName="HIDAN_room_10Tex_012E18" Format="ci4" Width="64" Height="32" Offset="0x12E98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013218" OutName="HIDAN_room_10Tex_013218" Format="ci4" Width="32" Height="32" Offset="0x13298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_013418" OutName="HIDAN_room_10Tex_013418" Format="rgba16" Width="64" Height="32" Offset="0x13498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_014418" OutName="HIDAN_room_10Tex_014418" Format="rgba16" Width="64" Height="32" Offset="0x14498" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015418" OutName="HIDAN_room_10Tex_015418" Format="ci4" Width="64" Height="32" Offset="0x15498" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015818" OutName="HIDAN_room_10Tex_015818" Format="ci4" Width="32" Height="32" Offset="0x15898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_015A18" OutName="HIDAN_room_10Tex_015A18" Format="rgba16" Width="64" Height="32" Offset="0x15A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016A18" OutName="HIDAN_room_10Tex_016A18" Format="ci4" Width="32" Height="32" Offset="0x16A98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_016C18" OutName="HIDAN_room_10Tex_016C18" Format="ci4" Width="32" Height="64" Offset="0x16C98" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017018" OutName="HIDAN_room_10Tex_017018" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017818" OutName="HIDAN_room_10Tex_017818" Format="ci4" Width="32" Height="64" Offset="0x17898" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_10Tex_017C18" OutName="HIDAN_room_10Tex_017C18" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Texture Name="HIDAN_room_11Tex_0027D8" OutName="HIDAN_room_11Tex_0027D8" Format="rgba16" Width="32" Height="32" Offset="0x27B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_002FD8" OutName="HIDAN_room_11Tex_002FD8" Format="ci4" Width="32" Height="64" Offset="0x2FB8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_11Tex_0033D8" OutName="HIDAN_room_11Tex_0033D8" Format="ci4" Width="32" Height="64" Offset="0x33B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Texture Name="HIDAN_room_12Tex_001D68" OutName="HIDAN_room_12Tex_001D68" Format="rgba16" Width="32" Height="8" Offset="0x1D78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_001F68" OutName="HIDAN_room_12Tex_001F68" Format="rgba16" Width="32" Height="32" Offset="0x1F78" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_12Tex_002768" OutName="HIDAN_room_12Tex_002768" Format="ci4" Width="32" Height="64" Offset="0x2778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Texture Name="HIDAN_room_13Tex_00A788" OutName="HIDAN_room_13Tex_00A788" Format="rgba16" Width="32" Height="32" Offset="0xA7D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00AF88" OutName="HIDAN_room_13Tex_00AF88" Format="ci4" Width="64" Height="32" Offset="0xAFD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B388" OutName="HIDAN_room_13Tex_00B388" Format="ci4" Width="32" Height="64" Offset="0xB3D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00B788" OutName="HIDAN_room_13Tex_00B788" Format="ci4" Width="32" Height="64" Offset="0xB7D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00BB88" OutName="HIDAN_room_13Tex_00BB88" Format="rgba16" Width="32" Height="32" Offset="0xBBD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_13Tex_00C388" OutName="HIDAN_room_13Tex_00C388" Format="rgba16" Width="32" Height="32" Offset="0xC3D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Texture Name="HIDAN_room_14Tex_0019F8" OutName="HIDAN_room_14Tex_0019F8" Format="ci4" Width="32" Height="64" Offset="0x1A58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_14Tex_001DF8" OutName="HIDAN_room_14Tex_001DF8" Format="ci4" Width="32" Height="64" Offset="0x1E58" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Texture Name="HIDAN_room_15Tex_000D88" OutName="HIDAN_room_15Tex_000D88" Format="ci4" Width="32" Height="64" Offset="0xDC8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Texture Name="HIDAN_room_16Tex_006DE0" OutName="HIDAN_room_16Tex_006DE0" Format="rgba16" Width="32" Height="8" Offset="0x6D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_006FE0" OutName="HIDAN_room_16Tex_006FE0" Format="rgba16" Width="32" Height="32" Offset="0x6F70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0077E0" OutName="HIDAN_room_16Tex_0077E0" Format="rgba16" Width="32" Height="32" Offset="0x7770" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_007FE0" OutName="HIDAN_room_16Tex_007FE0" Format="ci4" Width="32" Height="64" Offset="0x7F70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0083E0" OutName="HIDAN_room_16Tex_0083E0" Format="ci4" Width="32" Height="32" Offset="0x8370" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0085E0" OutName="HIDAN_room_16Tex_0085E0" Format="rgba16" Width="32" Height="32" Offset="0x8570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_008DE0" OutName="HIDAN_room_16Tex_008DE0" Format="ci4" Width="32" Height="64" Offset="0x8D70" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0091E0" OutName="HIDAN_room_16Tex_0091E0" Format="ci4" Width="32" Height="64" Offset="0x9170" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_0095E0" OutName="HIDAN_room_16Tex_0095E0" Format="rgba16" Width="16" Height="64" Offset="0x9570" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_009DE0" OutName="HIDAN_room_16Tex_009DE0" Format="rgba16" Width="32" Height="32" Offset="0x9D70" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A5E0" OutName="HIDAN_room_16Tex_00A5E0" Format="ci4" Width="32" Height="64" Offset="0xA570" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00A9E0" OutName="HIDAN_room_16Tex_00A9E0" Format="rgba16" Width="32" Height="32" Offset="0xA970" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_16Tex_00B1E0" OutName="HIDAN_room_16Tex_00B1E0" Format="rgba16" Width="32" Height="32" Offset="0xB170" AddedByScript="true"/>
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Texture Name="HIDAN_room_17Tex_005168" OutName="HIDAN_room_17Tex_005168" Format="rgba16" Width="32" Height="32" Offset="0x5138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_005968" OutName="HIDAN_room_17Tex_005968" Format="rgba16" Width="32" Height="32" Offset="0x5938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006168" OutName="HIDAN_room_17Tex_006168" Format="rgba16" Width="32" Height="32" Offset="0x6138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_006968" OutName="HIDAN_room_17Tex_006968" Format="rgba16" Width="32" Height="32" Offset="0x6938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007168" OutName="HIDAN_room_17Tex_007168" Format="rgba16" Width="32" Height="32" Offset="0x7138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_007968" OutName="HIDAN_room_17Tex_007968" Format="rgba16" Width="32" Height="32" Offset="0x7938" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008168" OutName="HIDAN_room_17Tex_008168" Format="rgba16" Width="32" Height="32" Offset="0x8138" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_17Tex_008968" OutName="HIDAN_room_17Tex_008968" Format="rgba16" Width="32" Height="32" Offset="0x8938" AddedByScript="true"/>
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Texture Name="HIDAN_room_18Tex_0027F8" OutName="HIDAN_room_18Tex_0027F8" Format="rgba16" Width="32" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_002FF8" OutName="HIDAN_room_18Tex_002FF8" Format="ci4" Width="32" Height="64" Offset="0x2F78" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0033F8" OutName="HIDAN_room_18Tex_0033F8" Format="ci4" Width="64" Height="32" Offset="0x3378" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0037F8" OutName="HIDAN_room_18Tex_0037F8" Format="ci4" Width="32" Height="32" Offset="0x3778" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_18Tex_0039F8" OutName="HIDAN_room_18Tex_0039F8" Format="ci4" Width="32" Height="32" Offset="0x3978" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Texture Name="HIDAN_room_19Tex_002E28" OutName="HIDAN_room_19Tex_002E28" Format="rgba16" Width="32" Height="32" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003628" OutName="HIDAN_room_19Tex_003628" Format="ci4" Width="32" Height="64" Offset="0x35D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003A28" OutName="HIDAN_room_19Tex_003A28" Format="ci4" Width="64" Height="32" Offset="0x39D8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_003E28" OutName="HIDAN_room_19Tex_003E28" Format="ci4" Width="32" Height="32" Offset="0x3DD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_19Tex_004028" OutName="HIDAN_room_19Tex_004028" Format="ci4" Width="32" Height="32" Offset="0x3FD8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Texture Name="HIDAN_room_20Tex_002D08" OutName="HIDAN_room_20Tex_002D08" Format="rgba16" Width="32" Height="32" Offset="0x2D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003508" OutName="HIDAN_room_20Tex_003508" Format="rgba16" Width="32" Height="32" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_003D08" OutName="HIDAN_room_20Tex_003D08" Format="rgba16" Width="32" Height="32" Offset="0x3D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004508" OutName="HIDAN_room_20Tex_004508" Format="rgba16" Width="32" Height="32" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_004D08" OutName="HIDAN_room_20Tex_004D08" Format="rgba16" Width="32" Height="32" Offset="0x4D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005508" OutName="HIDAN_room_20Tex_005508" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_005D08" OutName="HIDAN_room_20Tex_005D08" Format="rgba16" Width="32" Height="32" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_20Tex_006508" OutName="HIDAN_room_20Tex_006508" Format="rgba16" Width="32" Height="32" Offset="0x6508" AddedByScript="true"/>
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Texture Name="HIDAN_room_21Tex_004478" OutName="HIDAN_room_21Tex_004478" Format="rgba16" Width="32" Height="8" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004678" OutName="HIDAN_room_21Tex_004678" Format="rgba16" Width="32" Height="32" Offset="0x46B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_004E78" OutName="HIDAN_room_21Tex_004E78" Format="rgba16" Width="32" Height="32" Offset="0x4EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005678" OutName="HIDAN_room_21Tex_005678" Format="rgba16" Width="32" Height="32" Offset="0x56B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_005E78" OutName="HIDAN_room_21Tex_005E78" Format="rgba16" Width="32" Height="32" Offset="0x5EB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006678" OutName="HIDAN_room_21Tex_006678" Format="ci4" Width="64" Height="32" Offset="0x66B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_006A78" OutName="HIDAN_room_21Tex_006A78" Format="rgba16" Width="32" Height="32" Offset="0x6AB8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007278" OutName="HIDAN_room_21Tex_007278" Format="ci4" Width="32" Height="32" Offset="0x72B8" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007478" OutName="HIDAN_room_21Tex_007478" Format="rgba16" Width="32" Height="32" Offset="0x74B8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_21Tex_007C78" OutName="HIDAN_room_21Tex_007C78" Format="rgba16" Width="32" Height="32" Offset="0x7CB8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Texture Name="HIDAN_room_22Tex_002AE8" OutName="HIDAN_room_22Tex_002AE8" Format="rgba16" Width="32" Height="32" Offset="0x2AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0032E8" OutName="HIDAN_room_22Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_003AE8" OutName="HIDAN_room_22Tex_003AE8" Format="rgba16" Width="32" Height="32" Offset="0x3AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0042E8" OutName="HIDAN_room_22Tex_0042E8" Format="rgba16" Width="32" Height="32" Offset="0x42F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_004AE8" OutName="HIDAN_room_22Tex_004AE8" Format="rgba16" Width="32" Height="32" Offset="0x4AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0052E8" OutName="HIDAN_room_22Tex_0052E8" Format="rgba16" Width="32" Height="32" Offset="0x52F8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_005AE8" OutName="HIDAN_room_22Tex_005AE8" Format="rgba16" Width="32" Height="32" Offset="0x5AF8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_22Tex_0062E8" OutName="HIDAN_room_22Tex_0062E8" Format="rgba16" Width="32" Height="32" Offset="0x62F8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Texture Name="HIDAN_room_23Tex_002D18" OutName="HIDAN_room_23Tex_002D18" Format="rgba16" Width="32" Height="32" Offset="0x2D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003518" OutName="HIDAN_room_23Tex_003518" Format="rgba16" Width="32" Height="32" Offset="0x3518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_003D18" OutName="HIDAN_room_23Tex_003D18" Format="rgba16" Width="32" Height="32" Offset="0x3D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004518" OutName="HIDAN_room_23Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_004D18" OutName="HIDAN_room_23Tex_004D18" Format="rgba16" Width="32" Height="32" Offset="0x4D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005518" OutName="HIDAN_room_23Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5518" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_005D18" OutName="HIDAN_room_23Tex_005D18" Format="rgba16" Width="32" Height="32" Offset="0x5D18" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_23Tex_006518" OutName="HIDAN_room_23Tex_006518" Format="rgba16" Width="32" Height="32" Offset="0x6518" AddedByScript="true"/>
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Texture Name="HIDAN_room_24Tex_003B38" OutName="HIDAN_room_24Tex_003B38" Format="ci4" Width="32" Height="64" Offset="0x3B38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_003F38" OutName="HIDAN_room_24Tex_003F38" Format="ci4" Width="64" Height="32" Offset="0x3F38" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004338" OutName="HIDAN_room_24Tex_004338" Format="ci4" Width="64" Height="32" Offset="0x4338" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004738" OutName="HIDAN_room_24Tex_004738" Format="ci4" Width="32" Height="32" Offset="0x4738" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004938" OutName="HIDAN_room_24Tex_004938" Format="ci4" Width="32" Height="64" Offset="0x4938" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B50" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_24Tex_004D38" OutName="HIDAN_room_24Tex_004D38" Format="rgba16" Width="32" Height="32" Offset="0x4D38" AddedByScript="true"/>
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Texture Name="HIDAN_room_25Tex_002AD8" OutName="HIDAN_room_25Tex_002AD8" Format="rgba16" Width="32" Height="32" Offset="0x2AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0032D8" OutName="HIDAN_room_25Tex_0032D8" Format="rgba16" Width="32" Height="32" Offset="0x32D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_003AD8" OutName="HIDAN_room_25Tex_003AD8" Format="rgba16" Width="32" Height="32" Offset="0x3AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0042D8" OutName="HIDAN_room_25Tex_0042D8" Format="rgba16" Width="32" Height="32" Offset="0x42D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_004AD8" OutName="HIDAN_room_25Tex_004AD8" Format="rgba16" Width="32" Height="32" Offset="0x4AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0052D8" OutName="HIDAN_room_25Tex_0052D8" Format="rgba16" Width="32" Height="32" Offset="0x52D8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_005AD8" OutName="HIDAN_room_25Tex_005AD8" Format="rgba16" Width="32" Height="32" Offset="0x5AD8" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_25Tex_0062D8" OutName="HIDAN_room_25Tex_0062D8" Format="rgba16" Width="32" Height="32" Offset="0x62D8" AddedByScript="true"/>
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
+    </File>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Texture Name="HIDAN_room_26Tex_004A98" OutName="HIDAN_room_26Tex_004A98" Format="rgba16" Width="32" Height="32" Offset="0x4A98" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005298" OutName="HIDAN_room_26Tex_005298" Format="ci4" Width="64" Height="32" Offset="0x5298" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005698" OutName="HIDAN_room_26Tex_005698" Format="ci4" Width="32" Height="32" Offset="0x5698" ExternalTlut="HIDAN_scene" ExternalTlutOffset="0x18B30" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_005898" OutName="HIDAN_room_26Tex_005898" Format="rgba16" Width="32" Height="32" Offset="0x5898" AddedByScript="true"/>
+        <Texture Name="HIDAN_room_26Tex_006098" OutName="HIDAN_room_26Tex_006098" Format="rgba16" Width="32" Height="32" Offset="0x6098" AddedByScript="true"/>
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin.xml
new file mode 100644
index 0000000000..00c5aa82dd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin.xml
@@ -0,0 +1,262 @@
+<Root>
+    <File Name="MIZUsin_scene" Segment="2">
+        <Texture Name="MIZUsin_sceneTex_013C30" OutName="MIZUsin_sceneTex_013C30" Format="rgba16" Width="32" Height="32" Offset="0x13CF0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_014430" OutName="MIZUsin_sceneTex_014430" Format="rgba16" Width="32" Height="32" Offset="0x144F0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_sceneTex_015030" OutName="MIZUsin_sceneTex_015030" Format="rgba16" Width="32" Height="32" Offset="0x150F0" AddedByScript="true"/>
+        <Path Name="gWaterTemplePath_00424" Offset="0x424" NumPaths="7"/>
+        <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14CF0"/>
+        <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x158F0"/>
+        <Scene Name="MIZUsin_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Texture Name="MIZUsin_room_0Tex_00CDF8" OutName="MIZUsin_room_0Tex_00CDF8" Format="i4" Width="64" Height="64" Offset="0xCE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00D5F8" OutName="MIZUsin_room_0Tex_00D5F8" Format="i4" Width="64" Height="64" Offset="0xD648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00DDF8" OutName="MIZUsin_room_0Tex_00DDF8" Format="rgba16" Width="32" Height="32" Offset="0xDE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00E5F8" OutName="MIZUsin_room_0Tex_00E5F8" Format="rgba16" Width="32" Height="32" Offset="0xE648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00EDF8" OutName="MIZUsin_room_0Tex_00EDF8" Format="rgba16" Width="32" Height="32" Offset="0xEE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00F5F8" OutName="MIZUsin_room_0Tex_00F5F8" Format="rgba16" Width="32" Height="32" Offset="0xF648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_00FDF8" OutName="MIZUsin_room_0Tex_00FDF8" Format="rgba16" Width="32" Height="32" Offset="0xFE48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0105F8" OutName="MIZUsin_room_0Tex_0105F8" Format="rgba16" Width="32" Height="32" Offset="0x10648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_010DF8" OutName="MIZUsin_room_0Tex_010DF8" Format="rgba16" Width="32" Height="32" Offset="0x10E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0115F8" OutName="MIZUsin_room_0Tex_0115F8" Format="rgba16" Width="32" Height="32" Offset="0x11648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_011DF8" OutName="MIZUsin_room_0Tex_011DF8" Format="rgba16" Width="32" Height="32" Offset="0x11E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0125F8" OutName="MIZUsin_room_0Tex_0125F8" Format="rgba16" Width="32" Height="32" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_012DF8" OutName="MIZUsin_room_0Tex_012DF8" Format="rgba16" Width="32" Height="32" Offset="0x12E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0135F8" OutName="MIZUsin_room_0Tex_0135F8" Format="rgba16" Width="32" Height="32" Offset="0x13648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_013DF8" OutName="MIZUsin_room_0Tex_013DF8" Format="rgba16" Width="32" Height="32" Offset="0x13E48" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_0145F8" OutName="MIZUsin_room_0Tex_0145F8" Format="rgba16" Width="32" Height="32" Offset="0x14648" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_0Tex_015428" OutName="MIZUsin_room_0Tex_015428" Format="ia16" Width="32" Height="32" Offset="0x15478" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Texture Name="MIZUsin_room_1Tex_0059D0" OutName="MIZUsin_room_1Tex_0059D0" Format="i4" Width="64" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0061D0" OutName="MIZUsin_room_1Tex_0061D0" Format="i4" Width="64" Height="64" Offset="0x6160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0069D0" OutName="MIZUsin_room_1Tex_0069D0" Format="rgba16" Width="32" Height="32" Offset="0x6960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0071D0" OutName="MIZUsin_room_1Tex_0071D0" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0079D0" OutName="MIZUsin_room_1Tex_0079D0" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0081D0" OutName="MIZUsin_room_1Tex_0081D0" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0089D0" OutName="MIZUsin_room_1Tex_0089D0" Format="rgba16" Width="32" Height="32" Offset="0x8960" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0091D0" OutName="MIZUsin_room_1Tex_0091D0" Format="rgba16" Width="32" Height="32" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_1Tex_0099D0" OutName="MIZUsin_room_1Tex_0099D0" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Texture Name="MIZUsin_room_2Tex_002AB8" OutName="MIZUsin_room_2Tex_002AB8" Format="rgba16" Width="32" Height="32" Offset="0x29B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0032B8" OutName="MIZUsin_room_2Tex_0032B8" Format="rgba16" Width="32" Height="32" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_003AB8" OutName="MIZUsin_room_2Tex_003AB8" Format="rgba16" Width="32" Height="32" Offset="0x39B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_0042B8" OutName="MIZUsin_room_2Tex_0042B8" Format="rgba16" Width="32" Height="32" Offset="0x41B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_004AB8" OutName="MIZUsin_room_2Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x49B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_2Tex_005488" OutName="MIZUsin_room_2Tex_005488" Format="ia16" Width="32" Height="32" Offset="0x5388" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Texture Name="MIZUsin_room_3Tex_0037B8" OutName="MIZUsin_room_3Tex_0037B8" Format="rgba16" Width="32" Height="32" Offset="0x3708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_003FB8" OutName="MIZUsin_room_3Tex_003FB8" Format="rgba16" Width="32" Height="32" Offset="0x3F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0047B8" OutName="MIZUsin_room_3Tex_0047B8" Format="rgba16" Width="32" Height="32" Offset="0x4708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_004FB8" OutName="MIZUsin_room_3Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_0057B8" OutName="MIZUsin_room_3Tex_0057B8" Format="rgba16" Width="32" Height="32" Offset="0x5708" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_3Tex_005FB8" OutName="MIZUsin_room_3Tex_005FB8" Format="rgba16" Width="32" Height="32" Offset="0x5F08" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Texture Name="MIZUsin_room_4Tex_002820" OutName="MIZUsin_room_4Tex_002820" Format="i4" Width="64" Height="64" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003020" OutName="MIZUsin_room_4Tex_003020" Format="rgba16" Width="32" Height="32" Offset="0x2FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_003820" OutName="MIZUsin_room_4Tex_003820" Format="rgba16" Width="32" Height="32" Offset="0x37E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004020" OutName="MIZUsin_room_4Tex_004020" Format="rgba16" Width="32" Height="32" Offset="0x3FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_004820" OutName="MIZUsin_room_4Tex_004820" Format="rgba16" Width="32" Height="32" Offset="0x47E0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005020" OutName="MIZUsin_room_4Tex_005020" Format="rgba16" Width="32" Height="32" Offset="0x4FE0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_4Tex_005820" OutName="MIZUsin_room_4Tex_005820" Format="rgba16" Width="32" Height="32" Offset="0x57E0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Texture Name="MIZUsin_room_5Tex_003A48" OutName="MIZUsin_room_5Tex_003A48" Format="rgba16" Width="32" Height="32" Offset="0x39F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004248" OutName="MIZUsin_room_5Tex_004248" Format="rgba16" Width="32" Height="32" Offset="0x41F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_004A48" OutName="MIZUsin_room_5Tex_004A48" Format="rgba16" Width="32" Height="32" Offset="0x49F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005248" OutName="MIZUsin_room_5Tex_005248" Format="rgba16" Width="32" Height="32" Offset="0x51F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_005A48" OutName="MIZUsin_room_5Tex_005A48" Format="rgba16" Width="32" Height="32" Offset="0x59F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006248" OutName="MIZUsin_room_5Tex_006248" Format="rgba16" Width="32" Height="32" Offset="0x61F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_006A48" OutName="MIZUsin_room_5Tex_006A48" Format="rgba16" Width="32" Height="32" Offset="0x69F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007248" OutName="MIZUsin_room_5Tex_007248" Format="rgba16" Width="32" Height="32" Offset="0x71F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_007A48" OutName="MIZUsin_room_5Tex_007A48" Format="rgba16" Width="32" Height="32" Offset="0x79F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008248" OutName="MIZUsin_room_5Tex_008248" Format="rgba16" Width="32" Height="32" Offset="0x81F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_008A48" OutName="MIZUsin_room_5Tex_008A48" Format="rgba16" Width="32" Height="32" Offset="0x89F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009248" OutName="MIZUsin_room_5Tex_009248" Format="rgba16" Width="32" Height="32" Offset="0x91F8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_5Tex_009E38" OutName="MIZUsin_room_5Tex_009E38" Format="ia16" Width="32" Height="32" Offset="0x9DE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Texture Name="MIZUsin_room_6Tex_005100" OutName="MIZUsin_room_6Tex_005100" Format="i4" Width="32" Height="32" Offset="0x50C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005300" OutName="MIZUsin_room_6Tex_005300" Format="rgba16" Width="32" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_005B00" OutName="MIZUsin_room_6Tex_005B00" Format="rgba16" Width="32" Height="32" Offset="0x5AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006300" OutName="MIZUsin_room_6Tex_006300" Format="i4" Width="32" Height="32" Offset="0x62C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006500" OutName="MIZUsin_room_6Tex_006500" Format="i4" Width="32" Height="32" Offset="0x64C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006700" OutName="MIZUsin_room_6Tex_006700" Format="i4" Width="32" Height="32" Offset="0x66C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006900" OutName="MIZUsin_room_6Tex_006900" Format="i4" Width="32" Height="32" Offset="0x68C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_006B00" OutName="MIZUsin_room_6Tex_006B00" Format="i4" Width="64" Height="64" Offset="0x6AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007300" OutName="MIZUsin_room_6Tex_007300" Format="rgba16" Width="32" Height="32" Offset="0x72C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_007B00" OutName="MIZUsin_room_6Tex_007B00" Format="rgba16" Width="32" Height="32" Offset="0x7AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008300" OutName="MIZUsin_room_6Tex_008300" Format="rgba16" Width="32" Height="32" Offset="0x82C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_008B00" OutName="MIZUsin_room_6Tex_008B00" Format="rgba16" Width="32" Height="32" Offset="0x8AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009300" OutName="MIZUsin_room_6Tex_009300" Format="rgba16" Width="32" Height="32" Offset="0x92C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_009B00" OutName="MIZUsin_room_6Tex_009B00" Format="rgba16" Width="32" Height="32" Offset="0x9AC0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00A300" OutName="MIZUsin_room_6Tex_00A300" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_6Tex_00AB00" OutName="MIZUsin_room_6Tex_00AB00" Format="rgba16" Width="32" Height="32" Offset="0xAAC0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Texture Name="MIZUsin_room_7Tex_002560" OutName="MIZUsin_room_7Tex_002560" Format="rgba16" Width="32" Height="32" Offset="0x2550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_002D60" OutName="MIZUsin_room_7Tex_002D60" Format="rgba16" Width="32" Height="32" Offset="0x2D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003560" OutName="MIZUsin_room_7Tex_003560" Format="rgba16" Width="32" Height="32" Offset="0x3550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_003D60" OutName="MIZUsin_room_7Tex_003D60" Format="rgba16" Width="32" Height="32" Offset="0x3D50" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004560" OutName="MIZUsin_room_7Tex_004560" Format="rgba16" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_7Tex_004D60" OutName="MIZUsin_room_7Tex_004D60" Format="rgba16" Width="32" Height="32" Offset="0x4D50" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Texture Name="MIZUsin_room_8Tex_005D98" OutName="MIZUsin_room_8Tex_005D98" Format="i4" Width="32" Height="32" Offset="0x5CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_005F98" OutName="MIZUsin_room_8Tex_005F98" Format="i4" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006198" OutName="MIZUsin_room_8Tex_006198" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_006998" OutName="MIZUsin_room_8Tex_006998" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007198" OutName="MIZUsin_room_8Tex_007198" Format="i4" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007398" OutName="MIZUsin_room_8Tex_007398" Format="i4" Width="32" Height="32" Offset="0x72E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007598" OutName="MIZUsin_room_8Tex_007598" Format="rgba16" Width="32" Height="32" Offset="0x74E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_007D98" OutName="MIZUsin_room_8Tex_007D98" Format="i4" Width="64" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008598" OutName="MIZUsin_room_8Tex_008598" Format="rgba16" Width="32" Height="32" Offset="0x84E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_008D98" OutName="MIZUsin_room_8Tex_008D98" Format="rgba16" Width="32" Height="32" Offset="0x8CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009598" OutName="MIZUsin_room_8Tex_009598" Format="rgba16" Width="32" Height="32" Offset="0x94E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_009D98" OutName="MIZUsin_room_8Tex_009D98" Format="rgba16" Width="32" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00A598" OutName="MIZUsin_room_8Tex_00A598" Format="rgba16" Width="32" Height="32" Offset="0xA4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00AD98" OutName="MIZUsin_room_8Tex_00AD98" Format="rgba16" Width="32" Height="32" Offset="0xACE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00B598" OutName="MIZUsin_room_8Tex_00B598" Format="rgba16" Width="32" Height="32" Offset="0xB4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00BD98" OutName="MIZUsin_room_8Tex_00BD98" Format="rgba16" Width="32" Height="32" Offset="0xBCE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00C598" OutName="MIZUsin_room_8Tex_00C598" Format="rgba16" Width="32" Height="32" Offset="0xC4E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_8Tex_00D578" OutName="MIZUsin_room_8Tex_00D578" Format="ia16" Width="32" Height="32" Offset="0xD4C8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Texture Name="MIZUsin_room_9Tex_0036D8" OutName="MIZUsin_room_9Tex_0036D8" Format="i4" Width="64" Height="64" Offset="0x3608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_003ED8" OutName="MIZUsin_room_9Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0046D8" OutName="MIZUsin_room_9Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_004ED8" OutName="MIZUsin_room_9Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0056D8" OutName="MIZUsin_room_9Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_005ED8" OutName="MIZUsin_room_9Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0066D8" OutName="MIZUsin_room_9Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6608" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_006ED8" OutName="MIZUsin_room_9Tex_006ED8" Format="rgba16" Width="32" Height="32" Offset="0x6E08" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_9Tex_0078A8" OutName="MIZUsin_room_9Tex_0078A8" Format="ia16" Width="32" Height="32" Offset="0x77D8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Texture Name="MIZUsin_room_10Tex_003870" OutName="MIZUsin_room_10Tex_003870" Format="rgba16" Width="32" Height="32" Offset="0x37B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004070" OutName="MIZUsin_room_10Tex_004070" Format="rgba16" Width="32" Height="32" Offset="0x3FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_004870" OutName="MIZUsin_room_10Tex_004870" Format="rgba16" Width="32" Height="32" Offset="0x47B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005070" OutName="MIZUsin_room_10Tex_005070" Format="rgba16" Width="32" Height="32" Offset="0x4FB0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_10Tex_005870" OutName="MIZUsin_room_10Tex_005870" Format="rgba16" Width="32" Height="32" Offset="0x57B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Texture Name="MIZUsin_room_11Tex_002220" OutName="MIZUsin_room_11Tex_002220" Format="rgba16" Width="32" Height="32" Offset="0x21B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_002A20" OutName="MIZUsin_room_11Tex_002A20" Format="rgba16" Width="32" Height="32" Offset="0x29B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003220" OutName="MIZUsin_room_11Tex_003220" Format="rgba16" Width="32" Height="32" Offset="0x31B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_003A20" OutName="MIZUsin_room_11Tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x39B0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_11Tex_004220" OutName="MIZUsin_room_11Tex_004220" Format="rgba16" Width="32" Height="32" Offset="0x41B0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Texture Name="MIZUsin_room_12Tex_0039C8" OutName="MIZUsin_room_12Tex_0039C8" Format="rgba16" Width="32" Height="32" Offset="0x3928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0041C8" OutName="MIZUsin_room_12Tex_0041C8" Format="rgba16" Width="32" Height="32" Offset="0x4128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0049C8" OutName="MIZUsin_room_12Tex_0049C8" Format="rgba16" Width="32" Height="32" Offset="0x4928" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_0051C8" OutName="MIZUsin_room_12Tex_0051C8" Format="rgba16" Width="32" Height="32" Offset="0x5128" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_12Tex_006628" OutName="MIZUsin_room_12Tex_006628" Format="ia16" Width="32" Height="32" Offset="0x6588" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Texture Name="MIZUsin_room_13Tex_0001F8" OutName="MIZUsin_room_13Tex_0001F8" Format="rgba16" Width="32" Height="32" Offset="0x1F8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Texture Name="MIZUsin_room_14Tex_003680" OutName="MIZUsin_room_14Tex_003680" Format="i4" Width="64" Height="64" Offset="0x3660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_003E80" OutName="MIZUsin_room_14Tex_003E80" Format="rgba16" Width="32" Height="32" Offset="0x3E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004680" OutName="MIZUsin_room_14Tex_004680" Format="rgba16" Width="32" Height="32" Offset="0x4660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_004E80" OutName="MIZUsin_room_14Tex_004E80" Format="rgba16" Width="32" Height="32" Offset="0x4E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005680" OutName="MIZUsin_room_14Tex_005680" Format="rgba16" Width="32" Height="32" Offset="0x5660" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_005E80" OutName="MIZUsin_room_14Tex_005E80" Format="rgba16" Width="32" Height="32" Offset="0x5E60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_14Tex_006680" OutName="MIZUsin_room_14Tex_006680" Format="rgba16" Width="32" Height="32" Offset="0x6660" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Texture Name="MIZUsin_room_15Tex_002C68" OutName="MIZUsin_room_15Tex_002C68" Format="i4" Width="64" Height="64" Offset="0x2C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003468" OutName="MIZUsin_room_15Tex_003468" Format="rgba16" Width="32" Height="32" Offset="0x3428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_003C68" OutName="MIZUsin_room_15Tex_003C68" Format="rgba16" Width="32" Height="32" Offset="0x3C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004468" OutName="MIZUsin_room_15Tex_004468" Format="rgba16" Width="32" Height="32" Offset="0x4428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_004C68" OutName="MIZUsin_room_15Tex_004C68" Format="rgba16" Width="32" Height="32" Offset="0x4C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005468" OutName="MIZUsin_room_15Tex_005468" Format="rgba16" Width="32" Height="32" Offset="0x5428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_005C68" OutName="MIZUsin_room_15Tex_005C68" Format="rgba16" Width="32" Height="32" Offset="0x5C28" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006468" OutName="MIZUsin_room_15Tex_006468" Format="rgba16" Width="32" Height="32" Offset="0x6428" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_15Tex_006C68" OutName="MIZUsin_room_15Tex_006C68" Format="rgba16" Width="32" Height="32" Offset="0x6C28" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Texture Name="MIZUsin_room_16Tex_001330" OutName="MIZUsin_room_16Tex_001330" Format="rgba16" Width="32" Height="32" Offset="0x12D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_001B30" OutName="MIZUsin_room_16Tex_001B30" Format="rgba16" Width="32" Height="32" Offset="0x1AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002330" OutName="MIZUsin_room_16Tex_002330" Format="rgba16" Width="32" Height="32" Offset="0x22D0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_002B30" OutName="MIZUsin_room_16Tex_002B30" Format="rgba16" Width="32" Height="32" Offset="0x2AD0" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_16Tex_003330" OutName="MIZUsin_room_16Tex_003330" Format="rgba16" Width="32" Height="32" Offset="0x32D0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Texture Name="MIZUsin_room_17Tex_005AA8" OutName="MIZUsin_room_17Tex_005AA8" Format="rgba16" Width="32" Height="32" Offset="0x5A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0062A8" OutName="MIZUsin_room_17Tex_0062A8" Format="i4" Width="64" Height="64" Offset="0x6218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_006AA8" OutName="MIZUsin_room_17Tex_006AA8" Format="rgba16" Width="32" Height="32" Offset="0x6A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0072A8" OutName="MIZUsin_room_17Tex_0072A8" Format="rgba16" Width="32" Height="32" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_007AA8" OutName="MIZUsin_room_17Tex_007AA8" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_17Tex_0082A8" OutName="MIZUsin_room_17Tex_0082A8" Format="rgba16" Width="32" Height="32" Offset="0x8218" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Texture Name="MIZUsin_room_18Tex_0018F8" OutName="MIZUsin_room_18Tex_0018F8" Format="rgba16" Width="32" Height="32" Offset="0x18B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0020F8" OutName="MIZUsin_room_18Tex_0020F8" Format="rgba16" Width="32" Height="32" Offset="0x20B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0028F8" OutName="MIZUsin_room_18Tex_0028F8" Format="rgba16" Width="32" Height="32" Offset="0x28B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0030F8" OutName="MIZUsin_room_18Tex_0030F8" Format="rgba16" Width="32" Height="32" Offset="0x30B8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_18Tex_0038F8" OutName="MIZUsin_room_18Tex_0038F8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Texture Name="MIZUsin_room_19Tex_001130" OutName="MIZUsin_room_19Tex_001130" Format="rgba16" Width="32" Height="32" Offset="0x1130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_001930" OutName="MIZUsin_room_19Tex_001930" Format="rgba16" Width="32" Height="32" Offset="0x1930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002130" OutName="MIZUsin_room_19Tex_002130" Format="rgba16" Width="32" Height="32" Offset="0x2130" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_002930" OutName="MIZUsin_room_19Tex_002930" Format="rgba16" Width="32" Height="32" Offset="0x2930" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_19Tex_003130" OutName="MIZUsin_room_19Tex_003130" Format="rgba16" Width="32" Height="32" Offset="0x3130" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Texture Name="MIZUsin_room_20Tex_003040" OutName="MIZUsin_room_20Tex_003040" Format="rgba16" Width="32" Height="32" Offset="0x2F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_003840" OutName="MIZUsin_room_20Tex_003840" Format="i4" Width="64" Height="64" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004040" OutName="MIZUsin_room_20Tex_004040" Format="rgba16" Width="32" Height="32" Offset="0x3F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_004840" OutName="MIZUsin_room_20Tex_004840" Format="rgba16" Width="32" Height="32" Offset="0x4740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005040" OutName="MIZUsin_room_20Tex_005040" Format="rgba16" Width="32" Height="32" Offset="0x4F40" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_005840" OutName="MIZUsin_room_20Tex_005840" Format="rgba16" Width="32" Height="32" Offset="0x5740" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_20Tex_006040" OutName="MIZUsin_room_20Tex_006040" Format="rgba16" Width="32" Height="32" Offset="0x5F40" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Texture Name="MIZUsin_room_21Tex_004360" OutName="MIZUsin_room_21Tex_004360" Format="rgba16" Width="32" Height="32" Offset="0x4360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_004B60" OutName="MIZUsin_room_21Tex_004B60" Format="rgba16" Width="32" Height="32" Offset="0x4B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005360" OutName="MIZUsin_room_21Tex_005360" Format="rgba16" Width="32" Height="32" Offset="0x5360" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_005B60" OutName="MIZUsin_room_21Tex_005B60" Format="rgba16" Width="32" Height="32" Offset="0x5B60" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_21Tex_006CA0" OutName="MIZUsin_room_21Tex_006CA0" Format="ia16" Width="32" Height="32" Offset="0x6CA0" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Texture Name="MIZUsin_room_22Tex_0044E8" OutName="MIZUsin_room_22Tex_0044E8" Format="rgba16" Width="32" Height="16" Offset="0x44E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0048E8" OutName="MIZUsin_room_22Tex_0048E8" Format="rgba16" Width="32" Height="32" Offset="0x48E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0050E8" OutName="MIZUsin_room_22Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0058E8" OutName="MIZUsin_room_22Tex_0058E8" Format="rgba16" Width="32" Height="32" Offset="0x58E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0060E8" OutName="MIZUsin_room_22Tex_0060E8" Format="rgba16" Width="32" Height="32" Offset="0x60E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0068E8" OutName="MIZUsin_room_22Tex_0068E8" Format="rgba16" Width="32" Height="32" Offset="0x68E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0070E8" OutName="MIZUsin_room_22Tex_0070E8" Format="rgba16" Width="32" Height="32" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0078E8" OutName="MIZUsin_room_22Tex_0078E8" Format="rgba16" Width="32" Height="32" Offset="0x78E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0080E8" OutName="MIZUsin_room_22Tex_0080E8" Format="rgba16" Width="32" Height="32" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_room_22Tex_0088E8" OutName="MIZUsin_room_22Tex_0088E8" Format="rgba16" Width="32" Height="32" Offset="0x88E8" AddedByScript="true"/>
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin_bs.xml
new file mode 100644
index 0000000000..99ae2b3efe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/MIZUsin_bs.xml
@@ -0,0 +1,29 @@
+<Root>
+    <File Name="MIZUsin_bs_scene" Segment="2">
+        <Scene Name="MIZUsin_bs_scene" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Texture Name="MIZUsin_bs_room_0Tex_001470" OutName="MIZUsin_bs_room_0Tex_001470" Format="rgba16" Width="32" Height="32" Offset="0x1470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_001C70" OutName="MIZUsin_bs_room_0Tex_001C70" Format="rgba16" Width="32" Height="32" Offset="0x1C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002470" OutName="MIZUsin_bs_room_0Tex_002470" Format="rgba16" Width="32" Height="32" Offset="0x2470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_002C70" OutName="MIZUsin_bs_room_0Tex_002C70" Format="rgba16" Width="32" Height="32" Offset="0x2C70" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003470" OutName="MIZUsin_bs_room_0Tex_003470" Format="rgba16" Width="32" Height="32" Offset="0x3470" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_0Tex_003C70" OutName="MIZUsin_bs_room_0Tex_003C70" Format="rgba16" Width="32" Height="32" Offset="0x3C70" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
+    </File>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Texture Name="MIZUsin_bs_room_1Tex_0056E8" OutName="MIZUsin_bs_room_1Tex_0056E8" Format="rgba16" Width="32" Height="32" Offset="0x56E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_005EE8" OutName="MIZUsin_bs_room_1Tex_005EE8" Format="rgba16" Width="32" Height="32" Offset="0x5EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0066E8" OutName="MIZUsin_bs_room_1Tex_0066E8" Format="rgba16" Width="32" Height="32" Offset="0x66E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_006EE8" OutName="MIZUsin_bs_room_1Tex_006EE8" Format="rgba16" Width="32" Height="32" Offset="0x6EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0076E8" OutName="MIZUsin_bs_room_1Tex_0076E8" Format="rgba16" Width="32" Height="32" Offset="0x76E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_007EE8" OutName="MIZUsin_bs_room_1Tex_007EE8" Format="rgba16" Width="32" Height="32" Offset="0x7EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0086E8" OutName="MIZUsin_bs_room_1Tex_0086E8" Format="rgba16" Width="32" Height="32" Offset="0x86E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_008EE8" OutName="MIZUsin_bs_room_1Tex_008EE8" Format="rgba16" Width="32" Height="16" Offset="0x8EE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_0092E8" OutName="MIZUsin_bs_room_1Tex_0092E8" Format="rgba16" Width="32" Height="32" Offset="0x92E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_009AE8" OutName="MIZUsin_bs_room_1Tex_009AE8" Format="rgba16" Width="32" Height="32" Offset="0x9AE8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00A2E8" OutName="MIZUsin_bs_room_1Tex_00A2E8" Format="rgba16" Width="32" Height="32" Offset="0xA2E8" AddedByScript="true"/>
+        <Texture Name="MIZUsin_bs_room_1Tex_00AAE8" OutName="MIZUsin_bs_room_1Tex_00AAE8" Format="i4" Width="64" Height="64" Offset="0xAAE8" AddedByScript="true"/>
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan.xml
new file mode 100644
index 0000000000..a9e520f4cf
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan.xml
@@ -0,0 +1,96 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_scene" Segment="2">
+        <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_014A00" OutName="bdan_sceneTex_014A00" Format="ci8" Width="32" Height="64" Offset="0x149E0" TlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTex_015200" OutName="bdan_sceneTex_015200" Format="ci8" Width="32" Height="32" Offset="0x151E0" TlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_0139F0" OutName="bdan_sceneTLUT_0139F0" Format="rgba16" Width="16" Height="16" Offset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_sceneTLUT_013BF8" OutName="bdan_sceneTLUT_013BF8" Format="rgba16" Width="16" Height="16" Offset="0x13BD8" AddedByScript="true"/>
+        <Cutscene Name="gJabuJabuIntroCs" Offset="0x155E0"/>
+        <Scene Name="bdan_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_0" Segment="3">
+        <Texture Name="bdan_room_0Tex_002DB8" OutName="bdan_room_0Tex_002DB8" Format="ci8" Width="32" Height="32" Offset="0x2CE8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0031B8" OutName="bdan_room_0Tex_0031B8" Format="ci8" Width="32" Height="64" Offset="0x30E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_0Tex_0039B8" OutName="bdan_room_0Tex_0039B8" Format="ci8" Width="32" Height="32" Offset="0x38E8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_1" Segment="3">
+        <Texture Name="bdan_room_1Tex_004E00" OutName="bdan_room_1Tex_004E00" Format="ci8" Width="32" Height="64" Offset="0x4CD0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_1Tex_005600" OutName="bdan_room_1Tex_005600" Format="ci8" Width="32" Height="64" Offset="0x54D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_2" Segment="3">
+        <Texture Name="bdan_room_2Tex_006E38" OutName="bdan_room_2Tex_006E38" Format="rgba16" Width="32" Height="64" Offset="0x6DC8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_007E38" OutName="bdan_room_2Tex_007E38" Format="ci8" Width="32" Height="64" Offset="0x7DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008638" OutName="bdan_room_2Tex_008638" Format="ci8" Width="32" Height="64" Offset="0x85C8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_2Tex_008E38" OutName="bdan_room_2Tex_008E38" Format="ci8" Width="32" Height="32" Offset="0x8DC8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_3" Segment="3">
+        <Texture Name="bdan_room_3Tex_004888" OutName="bdan_room_3Tex_004888" Format="rgba16" Width="32" Height="64" Offset="0x4788" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_005888" OutName="bdan_room_3Tex_005888" Format="ci8" Width="32" Height="64" Offset="0x5788" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006088" OutName="bdan_room_3Tex_006088" Format="ci8" Width="32" Height="32" Offset="0x5F88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006488" OutName="bdan_room_3Tex_006488" Format="ci8" Width="32" Height="64" Offset="0x6388" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_3Tex_006C88" OutName="bdan_room_3Tex_006C88" Format="ci8" Width="32" Height="32" Offset="0x6B88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_4" Segment="3">
+        <Texture Name="bdan_room_4Tex_002B30" OutName="bdan_room_4Tex_002B30" Format="ci8" Width="32" Height="32" Offset="0x2A80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_002F30" OutName="bdan_room_4Tex_002F30" Format="ci8" Width="32" Height="64" Offset="0x2E80" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_4Tex_003730" OutName="bdan_room_4Tex_003730" Format="ci8" Width="32" Height="64" Offset="0x3680" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_5" Segment="3">
+        <Texture Name="bdan_room_5Tex_0024A8" OutName="bdan_room_5Tex_0024A8" Format="ci8" Width="32" Height="32" Offset="0x2438" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0028A8" OutName="bdan_room_5Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2838" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_0030A8" OutName="bdan_room_5Tex_0030A8" Format="ci8" Width="32" Height="64" Offset="0x3038" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_004090" OutName="bdan_room_5Tex_004090" Format="rgba16" Width="32" Height="64" Offset="0x4020" AddedByScript="true"/>
+        <Texture Name="bdan_room_5Tex_005090" OutName="bdan_room_5Tex_005090" Format="ia16" Width="32" Height="64" Offset="0x5020" AddedByScript="true"/>
+        <Room Name="bdan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_6" Segment="3">
+        <Texture Name="bdan_room_6Tex_003068" OutName="bdan_room_6Tex_003068" Format="ci8" Width="32" Height="64" Offset="0x3068" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_6Tex_003868" OutName="bdan_room_6Tex_003868" Format="ci8" Width="32" Height="64" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_7" Segment="3">
+        <Texture Name="bdan_room_7Tex_002CD0" OutName="bdan_room_7Tex_002CD0" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_7Tex_0030D0" OutName="bdan_room_7Tex_0030D0" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="bdan_scene" ExternalTlutOffset="0x139D0" AddedByScript="true"/>
+        <Room Name="bdan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_9" Segment="3">
+        <Texture Name="bdan_room_9Tex_003828" OutName="bdan_room_9Tex_003828" Format="ci8" Width="32" Height="32" Offset="0x3868" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_12" Segment="3">
+        <Texture Name="bdan_room_12Tex_0038E0" OutName="bdan_room_12Tex_0038E0" Format="ci8" Width="32" Height="32" Offset="0x38D0" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_13" Segment="3">
+        <Texture Name="bdan_room_13Tex_0015B8" OutName="bdan_room_13Tex_0015B8" Format="ci8" Width="32" Height="64" Offset="0x1588" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_001DB8" OutName="bdan_room_13Tex_001DB8" Format="ci8" Width="32" Height="32" Offset="0x1D88" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_13Tex_0021B8" OutName="bdan_room_13Tex_0021B8" Format="ci8" Width="32" Height="64" Offset="0x2188" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_14" Segment="3">
+        <Texture Name="bdan_room_14Tex_0045C8" OutName="bdan_room_14Tex_0045C8" Format="ci8" Width="32" Height="64" Offset="0x45D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_004DC8" OutName="bdan_room_14Tex_004DC8" Format="ci8" Width="32" Height="64" Offset="0x4DD8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0055C8" OutName="bdan_room_14Tex_0055C8" Format="ci8" Width="32" Height="32" Offset="0x55D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Texture Name="bdan_room_14Tex_0059C8" OutName="bdan_room_14Tex_0059C8" Format="ci8" Width="32" Height="64" Offset="0x59D8" ExternalTlut="bdan_scene" ExternalTlutOffset="0x13BD8" AddedByScript="true"/>
+        <Room Name="bdan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan_boss.xml
new file mode 100644
index 0000000000..9fccf2c301
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/bdan_boss.xml
@@ -0,0 +1,20 @@
+<Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
+    <File Name="bdan_boss_scene" Segment="2">
+        <Scene Name="bdan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Texture Name="bdan_boss_room_0Tex_002040" OutName="bdan_boss_room_0Tex_002040" Format="ci8" Width="32" Height="64" Offset="0x2040" TlutOffset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0Tex_002C18" OutName="bdan_boss_room_0Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2C18" TlutOffset="0x2A10" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_001E38" OutName="bdan_boss_room_0TLUT_001E38" Format="rgba16" Width="16" Height="16" Offset="0x1E38" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_0TLUT_002A10" OutName="bdan_boss_room_0TLUT_002A10" Format="rgba16" Width="16" Height="16" Offset="0x2A10" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Texture Name="bdan_boss_room_1Tex_003CB8" OutName="bdan_boss_room_1Tex_003CB8" Format="ci8" Width="32" Height="64" Offset="0x3CB8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0044B8" OutName="bdan_boss_room_1Tex_0044B8" Format="ci8" Width="32" Height="32" Offset="0x44B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1Tex_0048B8" OutName="bdan_boss_room_1Tex_0048B8" Format="ci8" Width="32" Height="64" Offset="0x48B8" TlutOffset="0x3AB0" AddedByScript="true"/>
+        <Texture Name="bdan_boss_room_1TLUT_003AB0" OutName="bdan_boss_room_1TLUT_003AB0" Format="rgba16" Width="16" Height="16" Offset="0x3AB0" AddedByScript="true"/>
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan.xml
new file mode 100644
index 0000000000..1446a9c98b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan.xml
@@ -0,0 +1,220 @@
+<Root>
+    <File Name="ddan_scene" Segment="2">
+        <Texture Name="ddan_sceneTLUT_011D70" OutName="ddan_sceneTLUT_011D70" Format="rgba16" Width="16" Height="16" Offset="0x11D70" AddedByScript="true"/>
+        <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
+        <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
+
+        <!-- these need to have TLUTs extract from room 0 at 0x11290-->
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
+        
+        <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
+        <Scene Name="ddan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_0" Segment="3">
+        <Texture Name="ddan_room_0Tex_011498" OutName="ddan_room_0Tex_011498" Format="ci8" Width="32" Height="32" Offset="0x11498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011898" OutName="ddan_room_0Tex_011898" Format="ci8" Width="32" Height="32" Offset="0x11898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_011C98" OutName="ddan_room_0Tex_011C98" Format="ci8" Width="64" Height="32" Offset="0x11C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012498" OutName="ddan_room_0Tex_012498" Format="ci8" Width="32" Height="64" Offset="0x12498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_012C98" OutName="ddan_room_0Tex_012C98" Format="rgba16" Width="32" Height="64" Offset="0x12C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_013C98" OutName="ddan_room_0Tex_013C98" Format="rgba16" Width="32" Height="64" Offset="0x13C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_014C98" OutName="ddan_room_0Tex_014C98" Format="rgba16" Width="32" Height="32" Offset="0x14C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015498" OutName="ddan_room_0Tex_015498" Format="ci8" Width="32" Height="64" Offset="0x15498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_015C98" OutName="ddan_room_0Tex_015C98" Format="ci8" Width="32" Height="64" Offset="0x15C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016498" OutName="ddan_room_0Tex_016498" Format="ci8" Width="32" Height="32" Offset="0x16498" TlutOffset="0x11290" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_016898" OutName="ddan_room_0Tex_016898" Format="ci8" Width="32" Height="64" Offset="0x16898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017098" OutName="ddan_room_0Tex_017098" Format="rgba16" Width="32" Height="32" Offset="0x17098" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017898" OutName="ddan_room_0Tex_017898" Format="ci8" Width="32" Height="32" Offset="0x17898" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_017C98" OutName="ddan_room_0Tex_017C98" Format="rgba16" Width="32" Height="32" Offset="0x17C98" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018498" OutName="ddan_room_0Tex_018498" Format="ci8" Width="32" Height="64" Offset="0x18498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_018C98" OutName="ddan_room_0Tex_018C98" Format="ci8" Width="32" Height="64" Offset="0x18C98" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_019498" OutName="ddan_room_0Tex_019498" Format="rgba16" Width="64" Height="32" Offset="0x19498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01A498" OutName="ddan_room_0Tex_01A498" Format="rgba16" Width="64" Height="32" Offset="0x1A498" AddedByScript="true"/>
+        <Texture Name="ddan_room_0Tex_01B498" OutName="ddan_room_0Tex_01B498" Format="ci8" Width="32" Height="32" Offset="0x1B498" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_0TLUT_011290" OutName="ddan_room_0TLUT_011290" Format="rgba16" Width="16" Height="16" Offset="0x11290" AddedByScript="true"/>
+        <Room Name="ddan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_1" Segment="3">
+        <Texture Name="ddan_room_1Tex_004770" OutName="ddan_room_1Tex_004770" Format="ci8" Width="32" Height="32" Offset="0x4700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004B70" OutName="ddan_room_1Tex_004B70" Format="ci8" Width="32" Height="32" Offset="0x4B00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_004F70" OutName="ddan_room_1Tex_004F70" Format="ci8" Width="32" Height="64" Offset="0x4F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005770" OutName="ddan_room_1Tex_005770" Format="ci8" Width="64" Height="32" Offset="0x5700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_005F70" OutName="ddan_room_1Tex_005F70" Format="rgba16" Width="32" Height="64" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_006F70" OutName="ddan_room_1Tex_006F70" Format="rgba16" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_007F70" OutName="ddan_room_1Tex_007F70" Format="ci8" Width="32" Height="64" Offset="0x7F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008770" OutName="ddan_room_1Tex_008770" Format="ci8" Width="64" Height="32" Offset="0x8700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_008F70" OutName="ddan_room_1Tex_008F70" Format="ci8" Width="32" Height="64" Offset="0x8F00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_1Tex_009770" OutName="ddan_room_1Tex_009770" Format="ci8" Width="32" Height="32" Offset="0x9700" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_2" Segment="3">
+        <Texture Name="ddan_room_2Tex_003B80" OutName="ddan_room_2Tex_003B80" Format="ci8" Width="64" Height="32" Offset="0x3A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004380" OutName="ddan_room_2Tex_004380" Format="ci8" Width="32" Height="32" Offset="0x4260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004780" OutName="ddan_room_2Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4660" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_004B80" OutName="ddan_room_2Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005380" OutName="ddan_room_2Tex_005380" Format="ci8" Width="64" Height="32" Offset="0x5260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005B80" OutName="ddan_room_2Tex_005B80" Format="ci8" Width="32" Height="32" Offset="0x5A60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_005F80" OutName="ddan_room_2Tex_005F80" Format="ci8" Width="32" Height="32" Offset="0x5E60" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006380" OutName="ddan_room_2Tex_006380" Format="ci8" Width="32" Height="32" Offset="0x6260" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_2Tex_006EB8" OutName="ddan_room_2Tex_006EB8" Format="rgba16" Width="32" Height="64" Offset="0x6D98" AddedByScript="true"/>
+        <Room Name="ddan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_3" Segment="3">
+        <Texture Name="ddan_room_3Tex_008838" OutName="ddan_room_3Tex_008838" Format="ci8" Width="32" Height="32" Offset="0x8788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_008C38" OutName="ddan_room_3Tex_008C38" Format="ci8" Width="64" Height="32" Offset="0x8B88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009438" OutName="ddan_room_3Tex_009438" Format="ci8" Width="32" Height="32" Offset="0x9388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_009838" OutName="ddan_room_3Tex_009838" Format="ci8" Width="32" Height="64" Offset="0x9788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A038" OutName="ddan_room_3Tex_00A038" Format="ci8" Width="32" Height="64" Offset="0x9F88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00A838" OutName="ddan_room_3Tex_00A838" Format="ci8" Width="32" Height="64" Offset="0xA788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B038" OutName="ddan_room_3Tex_00B038" Format="ci8" Width="32" Height="32" Offset="0xAF88" TlutOffset="0x8580" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B438" OutName="ddan_room_3Tex_00B438" Format="ci8" Width="32" Height="32" Offset="0xB388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00B838" OutName="ddan_room_3Tex_00B838" Format="ci8" Width="32" Height="32" Offset="0xB788" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00BC38" OutName="ddan_room_3Tex_00BC38" Format="ci8" Width="64" Height="32" Offset="0xBB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00C438" OutName="ddan_room_3Tex_00C438" Format="ci8" Width="32" Height="64" Offset="0xC388" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00CC38" OutName="ddan_room_3Tex_00CC38" Format="ci8" Width="32" Height="32" Offset="0xCB88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D038" OutName="ddan_room_3Tex_00D038" Format="ci8" Width="32" Height="32" Offset="0xCF88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_3Tex_00D668" OutName="ddan_room_3Tex_00D668" Format="ia8" Width="64" Height="32" Offset="0xD5B8" AddedByScript="true"/>
+        <Texture Name="ddan_room_3TLUT_008630" OutName="ddan_room_3TLUT_008630" Format="rgba16" Width="16" Height="16" Offset="0x8580" AddedByScript="true"/>
+        <Room Name="ddan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_4" Segment="3">
+        <Texture Name="ddan_room_4Tex_006D58" OutName="ddan_room_4Tex_006D58" Format="ci8" Width="32" Height="32" Offset="0x6C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007158" OutName="ddan_room_4Tex_007158" Format="ci8" Width="32" Height="32" Offset="0x7048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007558" OutName="ddan_room_4Tex_007558" Format="ci8" Width="64" Height="32" Offset="0x7448" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_007D58" OutName="ddan_room_4Tex_007D58" Format="ci8" Width="32" Height="64" Offset="0x7C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008558" OutName="ddan_room_4Tex_008558" Format="ci8" Width="32" Height="64" Offset="0x8448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_008D58" OutName="ddan_room_4Tex_008D58" Format="ci8" Width="32" Height="32" Offset="0x8C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_4Tex_009158" OutName="ddan_room_4Tex_009158" Format="ci8" Width="64" Height="32" Offset="0x9048" TlutOffset="0x6A40" AddedByScript="true"/>
+        <Texture Name="ddan_room_4TLUT_006B50" OutName="ddan_room_4TLUT_006B50" Format="rgba16" Width="16" Height="16" Offset="0x6A40" AddedByScript="true"/>
+        <Room Name="ddan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_5" Segment="3">
+        <Texture Name="ddan_room_5Tex_0032B8" OutName="ddan_room_5Tex_0032B8" Format="ci8" Width="32" Height="64" Offset="0x32D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_003AB8" OutName="ddan_room_5Tex_003AB8" Format="ci8" Width="32" Height="64" Offset="0x3AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0042B8" OutName="ddan_room_5Tex_0042B8" Format="ci8" Width="32" Height="32" Offset="0x42D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0046B8" OutName="ddan_room_5Tex_0046B8" Format="ci8" Width="32" Height="32" Offset="0x46D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004AB8" OutName="ddan_room_5Tex_004AB8" Format="ci8" Width="32" Height="32" Offset="0x4AD8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_004EB8" OutName="ddan_room_5Tex_004EB8" Format="rgba16" Width="32" Height="32" Offset="0x4ED8" AddedByScript="true"/>
+        <Texture Name="ddan_room_5Tex_0056B8" OutName="ddan_room_5Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56D8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_6" Segment="3">
+        <Texture Name="ddan_room_6Tex_000CA8" OutName="ddan_room_6Tex_000CA8" Format="ci8" Width="32" Height="64" Offset="0xBF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0014A8" OutName="ddan_room_6Tex_0014A8" Format="ci8" Width="64" Height="32" Offset="0x13F8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_001CA8" OutName="ddan_room_6Tex_001CA8" Format="ci8" Width="32" Height="32" Offset="0x1BF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_6Tex_0020A8" OutName="ddan_room_6Tex_0020A8" Format="ci8" Width="32" Height="32" Offset="0x1FF8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_7" Segment="3">
+        <Texture Name="ddan_room_7Tex_0046F8" OutName="ddan_room_7Tex_0046F8" Format="ci8" Width="32" Height="32" Offset="0x46C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004AF8" OutName="ddan_room_7Tex_004AF8" Format="ci8" Width="32" Height="32" Offset="0x4AC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_004EF8" OutName="ddan_room_7Tex_004EF8" Format="ci8" Width="32" Height="64" Offset="0x4EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0056F8" OutName="ddan_room_7Tex_0056F8" Format="ci8" Width="32" Height="64" Offset="0x56C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_005EF8" OutName="ddan_room_7Tex_005EF8" Format="ci8" Width="32" Height="64" Offset="0x5EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_0066F8" OutName="ddan_room_7Tex_0066F8" Format="ci8" Width="32" Height="64" Offset="0x66C8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_7Tex_006EF8" OutName="ddan_room_7Tex_006EF8" Format="ci8" Width="32" Height="64" Offset="0x6EC8" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_8" Segment="3">
+        <Texture Name="ddan_room_8Tex_0041A0" OutName="ddan_room_8Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x4000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0049A0" OutName="ddan_room_8Tex_0049A0" Format="ci8" Width="32" Height="32" Offset="0x4800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_004DA0" OutName="ddan_room_8Tex_004DA0" Format="ci8" Width="32" Height="32" Offset="0x4C00" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0051A0" OutName="ddan_room_8Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x5000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0059A0" OutName="ddan_room_8Tex_0059A0" Format="ci8" Width="32" Height="64" Offset="0x5800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0061A0" OutName="ddan_room_8Tex_0061A0" Format="ci8" Width="32" Height="64" Offset="0x6000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0069A0" OutName="ddan_room_8Tex_0069A0" Format="ci8" Width="32" Height="64" Offset="0x6800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0071A0" OutName="ddan_room_8Tex_0071A0" Format="ci8" Width="32" Height="64" Offset="0x7000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0079A0" OutName="ddan_room_8Tex_0079A0" Format="ci8" Width="64" Height="32" Offset="0x7800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0081A0" OutName="ddan_room_8Tex_0081A0" Format="ci8" Width="32" Height="64" Offset="0x8000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0089A0" OutName="ddan_room_8Tex_0089A0" Format="ci8" Width="32" Height="64" Offset="0x8800" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_8Tex_0091A0" OutName="ddan_room_8Tex_0091A0" Format="ci8" Width="32" Height="32" Offset="0x9000" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_9" Segment="3">
+        <Texture Name="ddan_room_9Tex_005128" OutName="ddan_room_9Tex_005128" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005528" OutName="ddan_room_9Tex_005528" Format="ci8" Width="64" Height="32" Offset="0x5548" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_005D28" OutName="ddan_room_9Tex_005D28" Format="ci8" Width="32" Height="32" Offset="0x5D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006128" OutName="ddan_room_9Tex_006128" Format="ci8" Width="32" Height="64" Offset="0x6148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006928" OutName="ddan_room_9Tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_006D28" OutName="ddan_room_9Tex_006D28" Format="rgba16" Width="32" Height="64" Offset="0x6D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_007D28" OutName="ddan_room_9Tex_007D28" Format="rgba16" Width="32" Height="64" Offset="0x7D48" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_008D28" OutName="ddan_room_9Tex_008D28" Format="ci8" Width="32" Height="32" Offset="0x8D48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009128" OutName="ddan_room_9Tex_009128" Format="ci8" Width="32" Height="64" Offset="0x9148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_009928" OutName="ddan_room_9Tex_009928" Format="ci8" Width="64" Height="32" Offset="0x9948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A128" OutName="ddan_room_9Tex_00A128" Format="rgba16" Width="32" Height="32" Offset="0xA148" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00A928" OutName="ddan_room_9Tex_00A928" Format="ci8" Width="32" Height="64" Offset="0xA948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_9Tex_00B128" OutName="ddan_room_9Tex_00B128" Format="ci8" Width="32" Height="32" Offset="0xB148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_10" Segment="3">
+        <Texture Name="ddan_room_10Tex_002B10" OutName="ddan_room_10Tex_002B10" Format="ci8" Width="32" Height="32" Offset="0x2A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_002F10" OutName="ddan_room_10Tex_002F10" Format="ci8" Width="64" Height="32" Offset="0x2E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003710" OutName="ddan_room_10Tex_003710" Format="ci8" Width="32" Height="32" Offset="0x3650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_003B10" OutName="ddan_room_10Tex_003B10" Format="ci8" Width="32" Height="64" Offset="0x3A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004310" OutName="ddan_room_10Tex_004310" Format="ci8" Width="32" Height="32" Offset="0x4250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004710" OutName="ddan_room_10Tex_004710" Format="ci8" Width="32" Height="64" Offset="0x4650" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_004F10" OutName="ddan_room_10Tex_004F10" Format="ci8" Width="32" Height="32" Offset="0x4E50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_005310" OutName="ddan_room_10Tex_005310" Format="rgba16" Width="32" Height="64" Offset="0x5250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_006310" OutName="ddan_room_10Tex_006310" Format="rgba16" Width="32" Height="64" Offset="0x6250" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007310" OutName="ddan_room_10Tex_007310" Format="ci8" Width="32" Height="64" Offset="0x7250" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_10Tex_007B10" OutName="ddan_room_10Tex_007B10" Format="ci8" Width="32" Height="32" Offset="0x7A50" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_11" Segment="3">
+        <Texture Name="ddan_room_11Tex_000C30" OutName="ddan_room_11Tex_000C30" Format="ci8" Width="32" Height="64" Offset="0xC80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001430" OutName="ddan_room_11Tex_001430" Format="ci8" Width="64" Height="32" Offset="0x1480" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_11Tex_001C30" OutName="ddan_room_11Tex_001C30" Format="ci8" Width="32" Height="32" Offset="0x1C80" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_12" Segment="3">
+        <Texture Name="ddan_room_12Tex_002F80" OutName="ddan_room_12Tex_002F80" Format="ci8" Width="32" Height="32" Offset="0x2F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003380" OutName="ddan_room_12Tex_003380" Format="ci8" Width="64" Height="32" Offset="0x3330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003B80" OutName="ddan_room_12Tex_003B80" Format="ci8" Width="32" Height="32" Offset="0x3B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_003F80" OutName="ddan_room_12Tex_003F80" Format="ci8" Width="32" Height="64" Offset="0x3F30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004780" OutName="ddan_room_12Tex_004780" Format="ci8" Width="32" Height="32" Offset="0x4730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_004B80" OutName="ddan_room_12Tex_004B80" Format="ci8" Width="32" Height="64" Offset="0x4B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005380" OutName="ddan_room_12Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_005780" OutName="ddan_room_12Tex_005780" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_006780" OutName="ddan_room_12Tex_006780" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007780" OutName="ddan_room_12Tex_007780" Format="ci8" Width="32" Height="32" Offset="0x7730" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_007B80" OutName="ddan_room_12Tex_007B80" Format="ci8" Width="32" Height="64" Offset="0x7B30" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_12Tex_008380" OutName="ddan_room_12Tex_008380" Format="ci8" Width="32" Height="32" Offset="0x8330" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_13" Segment="3">
+        <Texture Name="ddan_room_13Tex_000CC8" OutName="ddan_room_13Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0014C8" OutName="ddan_room_13Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1478" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_001CC8" OutName="ddan_room_13Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C78" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_13Tex_0020C8" OutName="ddan_room_13Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2078" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_14" Segment="3">
+        <Texture Name="ddan_room_14Tex_000CC8" OutName="ddan_room_14Tex_000CC8" Format="ci8" Width="32" Height="64" Offset="0xC88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0014C8" OutName="ddan_room_14Tex_0014C8" Format="ci8" Width="64" Height="32" Offset="0x1488" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_001CC8" OutName="ddan_room_14Tex_001CC8" Format="ci8" Width="32" Height="32" Offset="0x1C88" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_14Tex_0020C8" OutName="ddan_room_14Tex_0020C8" Format="ci8" Width="32" Height="32" Offset="0x2088" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_15" Segment="3">
+        <Texture Name="ddan_room_15Tex_000D28" OutName="ddan_room_15Tex_000D28" Format="ci8" Width="64" Height="32" Offset="0xC48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001528" OutName="ddan_room_15Tex_001528" Format="ci8" Width="32" Height="64" Offset="0x1448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_001D28" OutName="ddan_room_15Tex_001D28" Format="ci8" Width="64" Height="32" Offset="0x1C48" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_15Tex_002528" OutName="ddan_room_15Tex_002528" Format="ci8" Width="32" Height="32" Offset="0x2448" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ddan_room_16" Segment="3">
+        <Texture Name="ddan_room_16Tex_002158" OutName="ddan_room_16Tex_002158" Format="rgba16" Width="32" Height="64" Offset="0x2148" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003158" OutName="ddan_room_16Tex_003158" Format="ci8" Width="32" Height="64" Offset="0x3148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_003958" OutName="ddan_room_16Tex_003958" Format="ci8" Width="32" Height="64" Offset="0x3948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004158" OutName="ddan_room_16Tex_004158" Format="ci8" Width="32" Height="64" Offset="0x4148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_004958" OutName="ddan_room_16Tex_004958" Format="ci8" Width="32" Height="64" Offset="0x4948" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Texture Name="ddan_room_16Tex_005158" OutName="ddan_room_16Tex_005158" Format="ci8" Width="32" Height="32" Offset="0x5148" ExternalTlut="ddan_scene" ExternalTlutOffset="0x11D70" AddedByScript="true"/>
+        <Room Name="ddan_room_16" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan_boss.xml
new file mode 100644
index 0000000000..05633e53e2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ddan_boss.xml
@@ -0,0 +1,22 @@
+<Root>
+    <File Name="ddan_boss_scene" Segment="2">
+        <Texture Name="ddan_boss_sceneTex_001058" OutName="ddan_boss_sceneTex_001058" Format="ci8" Width="32" Height="64" Offset="0x1058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_001858" OutName="ddan_boss_sceneTex_001858" Format="ci8" Width="32" Height="64" Offset="0x1858" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTex_002058" OutName="ddan_boss_sceneTex_002058" Format="ci8" Width="32" Height="64" Offset="0x2058" TlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_sceneTLUT_000E50" OutName="ddan_boss_sceneTLUT_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" AddedByScript="true"/>
+        <Scene Name="ddan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Texture Name="ddan_boss_room_0Tex_003628" OutName="ddan_boss_room_0Tex_003628" Format="ci8" Width="32" Height="32" Offset="0x3628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003A28" OutName="ddan_boss_room_0Tex_003A28" Format="ci8" Width="32" Height="32" Offset="0x3A28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_003E28" OutName="ddan_boss_room_0Tex_003E28" Format="ci8" Width="32" Height="64" Offset="0x3E28" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_0Tex_004628" OutName="ddan_boss_room_0Tex_004628" Format="ci8" Width="32" Height="64" Offset="0x4628" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Texture Name="ddan_boss_room_1Tex_0031D8" OutName="ddan_boss_room_1Tex_0031D8" Format="ci8" Width="32" Height="64" Offset="0x31D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="ddan_boss_room_1Tex_0039D8" OutName="ddan_boss_room_1Tex_0039D8" Format="ci8" Width="32" Height="32" Offset="0x39D8" ExternalTlut="ddan_boss_scene" ExternalTlutOffset="0xE50" AddedByScript="true"/>
+        <Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgba16" Width="32" Height="64" Offset="0x21D8"/>
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon.xml
new file mode 100644
index 0000000000..f857dbe94e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon.xml
@@ -0,0 +1,121 @@
+<Root>
+    <File Name="ganon_scene" Segment="2">
+        <Texture Name="ganon_sceneTex_00EFA8" OutName="ganon_sceneTex_00EFA8" Format="ci8" Width="32" Height="32" Offset="0xEFA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F3A8" OutName="ganon_sceneTex_00F3A8" Format="ci8" Width="32" Height="32" Offset="0xF3A8" TlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00F7A8" OutName="ganon_sceneTex_00F7A8" Format="ci8" Width="32" Height="32" Offset="0xF7A8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FBA8" OutName="ganon_sceneTex_00FBA8" Format="ci8" Width="32" Height="32" Offset="0xFBA8" TlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTex_00FFA8" OutName="ganon_sceneTex_00FFA8" Format="rgba16" Width="32" Height="32" Offset="0xFFA8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E7D0" OutName="ganon_sceneTLUT_00E7D0" Format="rgba16" Width="16" Height="16" Offset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00E9D8" OutName="ganon_sceneTLUT_00E9D8" Format="rgba16" Width="16" Height="16" Offset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EBE0" OutName="ganon_sceneTLUT_00EBE0" Format="rgba16" Width="16" Height="16" Offset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_sceneTLUT_00EDA0" OutName="ganon_sceneTLUT_00EDA0" Format="rgba16" Width="16" Height="16" Offset="0xEDA0" AddedByScript="true"/>
+        <Scene Name="ganon_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_0" Segment="3">
+        <Texture Name="ganon_room_0Tex_004C68" OutName="ganon_room_0Tex_004C68" Format="ci8" Width="32" Height="64" Offset="0x4C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005468" OutName="ganon_room_0Tex_005468" Format="ci8" Width="32" Height="64" Offset="0x5468" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_005C68" OutName="ganon_room_0Tex_005C68" Format="ci8" Width="32" Height="32" Offset="0x5C68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006068" OutName="ganon_room_0Tex_006068" Format="ci8" Width="64" Height="32" Offset="0x6068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_006868" OutName="ganon_room_0Tex_006868" Format="ci8" Width="64" Height="32" Offset="0x6868" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_007068" OutName="ganon_room_0Tex_007068" Format="ci8" Width="32" Height="32" Offset="0x7068" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_0Tex_0076D0" OutName="ganon_room_0Tex_0076D0" Format="ia16" Width="32" Height="32" Offset="0x76D0" AddedByScript="true"/>
+        <Room Name="ganon_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_1" Segment="3">
+        <Texture Name="ganon_room_1Tex_005370" OutName="ganon_room_1Tex_005370" Format="ci8" Width="64" Height="32" Offset="0x5370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005B70" OutName="ganon_room_1Tex_005B70" Format="ci8" Width="32" Height="32" Offset="0x5B70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_005F70" OutName="ganon_room_1Tex_005F70" Format="ci8" Width="32" Height="32" Offset="0x5F70" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006370" OutName="ganon_room_1Tex_006370" Format="ci8" Width="32" Height="32" Offset="0x6370" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_1Tex_006770" OutName="ganon_room_1Tex_006770" Format="rgba16" Width="32" Height="64" Offset="0x6770" AddedByScript="true"/>
+        <Room Name="ganon_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_2" Segment="3">
+        <Texture Name="ganon_room_2Tex_003DF0" OutName="ganon_room_2Tex_003DF0" Format="ci8" Width="32" Height="32" Offset="0x3DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0041F0" OutName="ganon_room_2Tex_0041F0" Format="ci8" Width="32" Height="64" Offset="0x41F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0049F0" OutName="ganon_room_2Tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_004DF0" OutName="ganon_room_2Tex_004DF0" Format="ci8" Width="32" Height="32" Offset="0x4DF0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0051F0" OutName="ganon_room_2Tex_0051F0" Format="ci8" Width="32" Height="64" Offset="0x51F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_0059F0" OutName="ganon_room_2Tex_0059F0" Format="ci8" Width="32" Height="32" Offset="0x59F0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_005DF0" OutName="ganon_room_2Tex_005DF0" Format="rgba16" Width="32" Height="64" Offset="0x5DF0" AddedByScript="true"/>
+        <Texture Name="ganon_room_2Tex_007050" OutName="ganon_room_2Tex_007050" Format="ia16" Width="32" Height="32" Offset="0x7050" AddedByScript="true"/>
+        <Room Name="ganon_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_3" Segment="3">
+        <Texture Name="ganon_room_3Tex_004F30" OutName="ganon_room_3Tex_004F30" Format="ci8" Width="32" Height="32" Offset="0x4F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005330" OutName="ganon_room_3Tex_005330" Format="ci8" Width="32" Height="32" Offset="0x5330" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005730" OutName="ganon_room_3Tex_005730" Format="ci8" Width="32" Height="64" Offset="0x5730" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_005F30" OutName="ganon_room_3Tex_005F30" Format="ci8" Width="32" Height="64" Offset="0x5F30" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_3Tex_006730" OutName="ganon_room_3Tex_006730" Format="rgba16" Width="32" Height="64" Offset="0x6730" AddedByScript="true"/>
+        <Room Name="ganon_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_4" Segment="3">
+        <Texture Name="ganon_room_4Tex_004668" OutName="ganon_room_4Tex_004668" Format="ci8" Width="32" Height="64" Offset="0x4668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_004E68" OutName="ganon_room_4Tex_004E68" Format="ci8" Width="32" Height="64" Offset="0x4E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005668" OutName="ganon_room_4Tex_005668" Format="ci8" Width="32" Height="32" Offset="0x5668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_005A68" OutName="ganon_room_4Tex_005A68" Format="ci8" Width="32" Height="64" Offset="0x5A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006268" OutName="ganon_room_4Tex_006268" Format="ci8" Width="32" Height="32" Offset="0x6268" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006668" OutName="ganon_room_4Tex_006668" Format="ci8" Width="32" Height="32" Offset="0x6668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006A68" OutName="ganon_room_4Tex_006A68" Format="ci8" Width="32" Height="32" Offset="0x6A68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_006E68" OutName="ganon_room_4Tex_006E68" Format="ci8" Width="32" Height="64" Offset="0x6E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007668" OutName="ganon_room_4Tex_007668" Format="ci8" Width="32" Height="64" Offset="0x7668" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_007E68" OutName="ganon_room_4Tex_007E68" Format="ci8" Width="32" Height="64" Offset="0x7E68" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_4Tex_0088D0" OutName="ganon_room_4Tex_0088D0" Format="ia16" Width="32" Height="32" Offset="0x88D0" AddedByScript="true"/>
+        <Room Name="ganon_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_5" Segment="3">
+        <Texture Name="ganon_room_5Tex_005B08" OutName="ganon_room_5Tex_005B08" Format="ci8" Width="32" Height="64" Offset="0x5B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006308" OutName="ganon_room_5Tex_006308" Format="ci8" Width="32" Height="64" Offset="0x6308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_006B08" OutName="ganon_room_5Tex_006B08" Format="rgba16" Width="32" Height="64" Offset="0x6B08" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007B08" OutName="ganon_room_5Tex_007B08" Format="ci8" Width="32" Height="32" Offset="0x7B08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_007F08" OutName="ganon_room_5Tex_007F08" Format="ci8" Width="32" Height="32" Offset="0x7F08" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_5Tex_008308" OutName="ganon_room_5Tex_008308" Format="ci8" Width="32" Height="64" Offset="0x8308" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Room Name="ganon_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_6" Segment="3">
+        <Texture Name="ganon_room_6Tex_006E00" OutName="ganon_room_6Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007200" OutName="ganon_room_6Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007600" OutName="ganon_room_6Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_007A00" OutName="ganon_room_6Tex_007A00" Format="ci8" Width="32" Height="64" Offset="0x7A00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008200" OutName="ganon_room_6Tex_008200" Format="ci8" Width="16" Height="16" Offset="0x8200" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008300" OutName="ganon_room_6Tex_008300" Format="ci8" Width="32" Height="64" Offset="0x8300" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_008B00" OutName="ganon_room_6Tex_008B00" Format="ci8" Width="32" Height="32" Offset="0x8B00" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_6Tex_009398" OutName="ganon_room_6Tex_009398" Format="rgba16" Width="32" Height="32" Offset="0x9398" AddedByScript="true"/>
+        <Room Name="ganon_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_7" Segment="3">
+        <Texture Name="ganon_room_7Tex_0071E0" OutName="ganon_room_7Tex_0071E0" Format="ci8" Width="32" Height="32" Offset="0x71E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0075E0" OutName="ganon_room_7Tex_0075E0" Format="ci8" Width="64" Height="32" Offset="0x75E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_007DE0" OutName="ganon_room_7Tex_007DE0" Format="ci8" Width="64" Height="32" Offset="0x7DE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0085E0" OutName="ganon_room_7Tex_0085E0" Format="ci8" Width="32" Height="32" Offset="0x85E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0089E0" OutName="ganon_room_7Tex_0089E0" Format="ci8" Width="32" Height="64" Offset="0x89E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE7D0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_0091E0" OutName="ganon_room_7Tex_0091E0" Format="ci8" Width="32" Height="64" Offset="0x91E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_7Tex_009F98" OutName="ganon_room_7Tex_009F98" Format="rgba16" Width="32" Height="32" Offset="0x9F98" AddedByScript="true"/>
+        <Room Name="ganon_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_8" Segment="3">
+        <Texture Name="ganon_room_8Tex_004A20" OutName="ganon_room_8Tex_004A20" Format="ci8" Width="32" Height="64" Offset="0x4A20" TlutOffset="0x4950" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005220" OutName="ganon_room_8Tex_005220" Format="ci8" Width="16" Height="16" Offset="0x5220" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005320" OutName="ganon_room_8Tex_005320" Format="ci8" Width="8" Height="8" Offset="0x5320" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005360" OutName="ganon_room_8Tex_005360" Format="ci8" Width="16" Height="8" Offset="0x5360" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0053E0" OutName="ganon_room_8Tex_0053E0" Format="ci8" Width="32" Height="64" Offset="0x53E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005BE0" OutName="ganon_room_8Tex_005BE0" Format="ci8" Width="32" Height="32" Offset="0x5BE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_005FE0" OutName="ganon_room_8Tex_005FE0" Format="ci8" Width="32" Height="32" Offset="0x5FE0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8Tex_0063E0" OutName="ganon_room_8Tex_0063E0" Format="ci8" Width="32" Height="64" Offset="0x63E0" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_8TLUT_004950" OutName="ganon_room_8TLUT_004950" Format="rgba16" Width="16" Height="16" Offset="0x4950" AddedByScript="true"/>
+        <Room Name="ganon_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganon_room_9" Segment="3">
+        <Texture Name="ganon_room_9Tex_002120" OutName="ganon_room_9Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x2120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002920" OutName="ganon_room_9Tex_002920" Format="ci8" Width="32" Height="32" Offset="0x2920" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_002D20" OutName="ganon_room_9Tex_002D20" Format="ci8" Width="32" Height="32" Offset="0x2D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003120" OutName="ganon_room_9Tex_003120" Format="ci8" Width="32" Height="32" Offset="0x3120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003520" OutName="ganon_room_9Tex_003520" Format="ci8" Width="32" Height="32" Offset="0x3520" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003920" OutName="ganon_room_9Tex_003920" Format="ci8" Width="32" Height="32" Offset="0x3920" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_003D20" OutName="ganon_room_9Tex_003D20" Format="ci8" Width="32" Height="64" Offset="0x3D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xE9D8" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004520" OutName="ganon_room_9Tex_004520" Format="ci8" Width="32" Height="64" Offset="0x4520" TlutOffset="0x1F18" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_004D20" OutName="ganon_room_9Tex_004D20" Format="ci8" Width="16" Height="64" Offset="0x4D20" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEBE0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9Tex_005120" OutName="ganon_room_9Tex_005120" Format="ci8" Width="32" Height="64" Offset="0x5120" ExternalTlut="ganon_scene" ExternalTlutOffset="0xEDA0" AddedByScript="true"/>
+        <Texture Name="ganon_room_9TLUT_001F18" OutName="ganon_room_9TLUT_001F18" Format="rgba16" Width="16" Height="16" Offset="0x1F18" AddedByScript="true"/>
+        <Room Name="ganon_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_boss.xml
new file mode 100644
index 0000000000..36c5e81070
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_boss.xml
@@ -0,0 +1,31 @@
+<Root>
+    <File Name="ganon_boss_scene" Segment="2">
+        <Texture Name="ganon_boss_sceneTex_001E58" OutName="ganon_boss_sceneTex_001E58" Format="ci8" Width="32" Height="64" Offset="0x1E58" TlutOffset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002658" OutName="ganon_boss_sceneTex_002658" Format="ci8" Width="16" Height="16" Offset="0x2658" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002758" OutName="ganon_boss_sceneTex_002758" Format="ci8" Width="8" Height="8" Offset="0x2758" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002798" OutName="ganon_boss_sceneTex_002798" Format="ci8" Width="32" Height="32" Offset="0x2798" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002B98" OutName="ganon_boss_sceneTex_002B98" Format="ci8" Width="16" Height="8" Offset="0x2B98" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_002C18" OutName="ganon_boss_sceneTex_002C18" Format="rgba16" Width="32" Height="64" Offset="0x2C18" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_003C18" OutName="ganon_boss_sceneTex_003C18" Format="ci8" Width="32" Height="32" Offset="0x3C18" TlutOffset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004018" OutName="ganon_boss_sceneTex_004018" Format="ci8" Width="32" Height="32" Offset="0x4018" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004418" OutName="ganon_boss_sceneTex_004418" Format="ci8" Width="32" Height="32" Offset="0x4418" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004818" OutName="ganon_boss_sceneTex_004818" Format="ci8" Width="32" Height="32" Offset="0x4818" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_004C18" OutName="ganon_boss_sceneTex_004C18" Format="ci8" Width="32" Height="32" Offset="0x4C18" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005018" OutName="ganon_boss_sceneTex_005018" Format="rgba16" Width="32" Height="32" Offset="0x5018" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_005818" OutName="ganon_boss_sceneTex_005818" Format="ci8" Width="32" Height="64" Offset="0x5818" TlutOffset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006018" OutName="ganon_boss_sceneTex_006018" Format="ci8" Width="16" Height="64" Offset="0x6018" TlutOffset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006418" OutName="ganon_boss_sceneTex_006418" Format="ci8" Width="32" Height="64" Offset="0x6418" TlutOffset="0x1C50" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" OutName="ganon_boss_sceneTex_006C18" Format="ci8" Width="32" Height="64" Offset="0x6C18" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTex_007418" OutName="ganon_boss_sceneTex_007418" Format="ci8" Width="32" Height="64" Offset="0x7418" TlutOffset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001550" OutName="ganon_boss_sceneTLUT_001550" Format="rgba16" Width="16" Height="16" Offset="0x1550" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001620" OutName="ganon_boss_sceneTLUT_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" OutName="ganon_boss_sceneTLUT_001680" Format="rgba16" Width="16" Height="16" Offset="0x1680" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001888" OutName="ganon_boss_sceneTLUT_001888" Format="rgba16" Width="16" Height="16" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001A90" OutName="ganon_boss_sceneTLUT_001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90" AddedByScript="true"/>
+        <Texture Name="ganon_boss_sceneTLUT_001C50" OutName="ganon_boss_sceneTLUT_001C50" Format="rgba16" Width="16" Height="16" Offset="0x1C50" AddedByScript="true"/>
+        <Scene Name="ganon_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_demo.xml
new file mode 100644
index 0000000000..56c98efed7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_demo.xml
@@ -0,0 +1,19 @@
+<Root>
+    <File Name="ganon_demo_scene" Segment="2">
+        <Texture Name="ganon_demo_sceneTex_001B70" OutName="ganon_demo_sceneTex_001B70" Format="i8" Width="128" Height="32" Offset="0x1B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_002B70" OutName="ganon_demo_sceneTex_002B70" Format="i8" Width="64" Height="64" Offset="0x2B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_003B70" OutName="ganon_demo_sceneTex_003B70" Format="i8" Width="64" Height="64" Offset="0x3B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_004B70" OutName="ganon_demo_sceneTex_004B70" Format="i8" Width="64" Height="64" Offset="0x4B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_005B70" OutName="ganon_demo_sceneTex_005B70" Format="rgba16" Width="64" Height="16" Offset="0x5B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006370" OutName="ganon_demo_sceneTex_006370" Format="rgba16" Width="32" Height="32" Offset="0x6370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_006B70" OutName="ganon_demo_sceneTex_006B70" Format="ia4" Width="128" Height="32" Offset="0x6B70" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_007370" OutName="ganon_demo_sceneTex_007370" Format="rgba16" Width="32" Height="64" Offset="0x7370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008370" OutName="ganon_demo_sceneTex_008370" Format="rgba16" Width="16" Height="32" Offset="0x8370" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008770" OutName="ganon_demo_sceneTex_008770" Format="i8" Width="16" Height="16" Offset="0x8770" AddedByScript="true"/>
+        <Texture Name="ganon_demo_sceneTex_008870" OutName="ganon_demo_sceneTex_008870" Format="rgba16" Width="32" Height="32" Offset="0x8870" AddedByScript="true"/>
+        <Scene Name="ganon_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_final.xml
new file mode 100644
index 0000000000..3ec568cfb9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_final.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_final_scene" Segment="2">
+        <Texture Name="ganon_final_sceneTex_002380" OutName="ganon_final_sceneTex_002380" Format="ia8" Width="32" Height="32" Offset="0x2380" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002780" OutName="ganon_final_sceneTex_002780" Format="rgba16" Width="16" Height="16" Offset="0x2780" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002980" OutName="ganon_final_sceneTex_002980" Format="i8" Width="64" Height="16" Offset="0x2980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_002D80" OutName="ganon_final_sceneTex_002D80" Format="i4" Width="64" Height="128" Offset="0x2D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_003D80" OutName="ganon_final_sceneTex_003D80" Format="i8" Width="32" Height="64" Offset="0x3D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004580" OutName="ganon_final_sceneTex_004580" Format="i8" Width="32" Height="64" Offset="0x4580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_004D80" OutName="ganon_final_sceneTex_004D80" Format="i8" Width="64" Height="64" Offset="0x4D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_005D80" OutName="ganon_final_sceneTex_005D80" Format="i4" Width="64" Height="128" Offset="0x5D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_006D80" OutName="ganon_final_sceneTex_006D80" Format="ia8" Width="64" Height="32" Offset="0x6D80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_007580" OutName="ganon_final_sceneTex_007580" Format="i4" Width="64" Height="128" Offset="0x7580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_008580" OutName="ganon_final_sceneTex_008580" Format="rgba16" Width="32" Height="64" Offset="0x8580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_009580" OutName="ganon_final_sceneTex_009580" Format="rgba16" Width="32" Height="64" Offset="0x9580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00A580" OutName="ganon_final_sceneTex_00A580" Format="ia4" Width="128" Height="32" Offset="0xA580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00AD80" OutName="ganon_final_sceneTex_00AD80" Format="rgba16" Width="32" Height="64" Offset="0xAD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00BD80" OutName="ganon_final_sceneTex_00BD80" Format="rgba16" Width="32" Height="64" Offset="0xBD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CD80" OutName="ganon_final_sceneTex_00CD80" Format="i8" Width="16" Height="16" Offset="0xCD80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00CE80" OutName="ganon_final_sceneTex_00CE80" Format="ia8" Width="64" Height="64" Offset="0xCE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00DE80" OutName="ganon_final_sceneTex_00DE80" Format="i4" Width="64" Height="16" Offset="0xDE80" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E080" OutName="ganon_final_sceneTex_00E080" Format="ia8" Width="16" Height="16" Offset="0xE080" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00E180" OutName="ganon_final_sceneTex_00E180" Format="i4" Width="128" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F180" OutName="ganon_final_sceneTex_00F180" Format="i8" Width="32" Height="32" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_00F580" OutName="ganon_final_sceneTex_00F580" Format="i8" Width="128" Height="32" Offset="0xF580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010580" OutName="ganon_final_sceneTex_010580" Format="i8" Width="32" Height="32" Offset="0x10580" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_010980" OutName="ganon_final_sceneTex_010980" Format="rgba16" Width="16" Height="64" Offset="0x10980" AddedByScript="true"/>
+        <Texture Name="ganon_final_sceneTex_011180" OutName="ganon_final_sceneTex_011180" Format="i8" Width="16" Height="256" Offset="0x11180" AddedByScript="true"/>
+        <Path Name="gGanonFinalPath_001F4" Offset="0x1F4" NumPaths="4"/>
+        <Scene Name="ganon_final_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_sonogo.xml
new file mode 100644
index 0000000000..84ef36950c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_sonogo.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="ganon_sonogo_scene" Segment="2">
+        <Texture Name="ganon_sonogo_sceneTex_006710" OutName="ganon_sonogo_sceneTex_006710" Format="ci8" Width="32" Height="64" Offset="0x6710" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_006F10" OutName="ganon_sonogo_sceneTex_006F10" Format="ci8" Width="32" Height="32" Offset="0x6F10" TlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007310" OutName="ganon_sonogo_sceneTex_007310" Format="ci8" Width="32" Height="32" Offset="0x7310" TlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTex_007710" OutName="ganon_sonogo_sceneTex_007710" Format="ia16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006300" OutName="ganon_sonogo_sceneTLUT_006300" Format="rgba16" Width="16" Height="16" Offset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_sceneTLUT_006508" OutName="ganon_sonogo_sceneTLUT_006508" Format="rgba16" Width="16" Height="16" Offset="0x6508" AddedByScript="true"/>
+        <Path Name="gGanonSonogoPath_00254" Offset="0x254" NumPaths="5"/>
+        <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Texture Name="ganon_sonogo_room_0Tex_005020" OutName="ganon_sonogo_room_0Tex_005020" Format="ci8" Width="32" Height="64" Offset="0x5020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005820" OutName="ganon_sonogo_room_0Tex_005820" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_005C20" OutName="ganon_sonogo_room_0Tex_005C20" Format="ci8" Width="32" Height="32" Offset="0x5C20" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006020" OutName="ganon_sonogo_room_0Tex_006020" Format="ci8" Width="64" Height="32" Offset="0x6020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_006820" OutName="ganon_sonogo_room_0Tex_006820" Format="ci8" Width="64" Height="32" Offset="0x6820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007020" OutName="ganon_sonogo_room_0Tex_007020" Format="ci8" Width="32" Height="32" Offset="0x7020" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007420" OutName="ganon_sonogo_room_0Tex_007420" Format="ci8" Width="32" Height="32" Offset="0x7420" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_0Tex_007820" OutName="ganon_sonogo_room_0Tex_007820" Format="ci8" Width="32" Height="32" Offset="0x7820" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Texture Name="ganon_sonogo_room_1Tex_004148" OutName="ganon_sonogo_room_1Tex_004148" Format="ci8" Width="32" Height="32" Offset="0x4148" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004548" OutName="ganon_sonogo_room_1Tex_004548" Format="ci8" Width="32" Height="32" Offset="0x4548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004948" OutName="ganon_sonogo_room_1Tex_004948" Format="ci8" Width="32" Height="32" Offset="0x4948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_004D48" OutName="ganon_sonogo_room_1Tex_004D48" Format="ci8" Width="32" Height="64" Offset="0x4D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005548" OutName="ganon_sonogo_room_1Tex_005548" Format="ci8" Width="32" Height="32" Offset="0x5548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005948" OutName="ganon_sonogo_room_1Tex_005948" Format="ci8" Width="32" Height="32" Offset="0x5948" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_005D48" OutName="ganon_sonogo_room_1Tex_005D48" Format="ci8" Width="32" Height="64" Offset="0x5D48" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006548" OutName="ganon_sonogo_room_1Tex_006548" Format="ci8" Width="32" Height="32" Offset="0x6548" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_1Tex_006948" OutName="ganon_sonogo_room_1Tex_006948" Format="rgba16" Width="32" Height="64" Offset="0x6948" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Texture Name="ganon_sonogo_room_2Tex_004A40" OutName="ganon_sonogo_room_2Tex_004A40" Format="ci8" Width="32" Height="64" Offset="0x4A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005240" OutName="ganon_sonogo_room_2Tex_005240" Format="ci8" Width="32" Height="32" Offset="0x5240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005640" OutName="ganon_sonogo_room_2Tex_005640" Format="ci8" Width="32" Height="32" Offset="0x5640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_005A40" OutName="ganon_sonogo_room_2Tex_005A40" Format="ci8" Width="32" Height="64" Offset="0x5A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006240" OutName="ganon_sonogo_room_2Tex_006240" Format="ci8" Width="32" Height="32" Offset="0x6240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006640" OutName="ganon_sonogo_room_2Tex_006640" Format="ci8" Width="32" Height="32" Offset="0x6640" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006A40" OutName="ganon_sonogo_room_2Tex_006A40" Format="ci8" Width="32" Height="32" Offset="0x6A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_006E40" OutName="ganon_sonogo_room_2Tex_006E40" Format="ci8" Width="32" Height="32" Offset="0x6E40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007240" OutName="ganon_sonogo_room_2Tex_007240" Format="ci8" Width="32" Height="64" Offset="0x7240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_007A40" OutName="ganon_sonogo_room_2Tex_007A40" Format="ci8" Width="32" Height="64" Offset="0x7A40" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_2Tex_008240" OutName="ganon_sonogo_room_2Tex_008240" Format="ci8" Width="32" Height="64" Offset="0x8240" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Texture Name="ganon_sonogo_room_3Tex_003A38" OutName="ganon_sonogo_room_3Tex_003A38" Format="ci8" Width="32" Height="32" Offset="0x3A38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_003E38" OutName="ganon_sonogo_room_3Tex_003E38" Format="ci8" Width="64" Height="32" Offset="0x3E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004638" OutName="ganon_sonogo_room_3Tex_004638" Format="ci8" Width="64" Height="32" Offset="0x4638" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_3Tex_004E38" OutName="ganon_sonogo_room_3Tex_004E38" Format="ci8" Width="32" Height="64" Offset="0x4E38" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6300" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Texture Name="ganon_sonogo_room_4Tex_004BA8" OutName="ganon_sonogo_room_4Tex_004BA8" Format="ci8" Width="32" Height="64" Offset="0x4BA8" TlutOffset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0053A8" OutName="ganon_sonogo_room_4Tex_0053A8" Format="ci8" Width="16" Height="16" Offset="0x53A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054A8" OutName="ganon_sonogo_room_4Tex_0054A8" Format="ci8" Width="8" Height="8" Offset="0x54A8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0054E8" OutName="ganon_sonogo_room_4Tex_0054E8" Format="rgba16" Width="32" Height="32" Offset="0x54E8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_005CE8" OutName="ganon_sonogo_room_4Tex_005CE8" Format="ci8" Width="32" Height="64" Offset="0x5CE8" TlutOffset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0064E8" OutName="ganon_sonogo_room_4Tex_0064E8" Format="ci8" Width="32" Height="32" Offset="0x64E8" TlutOffset="0x4B18" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0068E8" OutName="ganon_sonogo_room_4Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_006CE8" OutName="ganon_sonogo_room_4Tex_006CE8" Format="rgba16" Width="32" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_0074E8" OutName="ganon_sonogo_room_4Tex_0074E8" Format="ci8" Width="32" Height="64" Offset="0x74E8" ExternalTlut="ganon_sonogo_scene" ExternalTlutOffset="0x6508" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4Tex_007CE8" OutName="ganon_sonogo_room_4Tex_007CE8" Format="rgba16" Width="32" Height="64" Offset="0x7CE8" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004840" OutName="ganon_sonogo_room_4TLUT_004840" Format="rgba16" Width="16" Height="16" Offset="0x4840" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004910" OutName="ganon_sonogo_room_4TLUT_004910" Format="rgba16" Width="16" Height="16" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="ganon_sonogo_room_4TLUT_004B18" OutName="ganon_sonogo_room_4TLUT_004B18" Format="rgba16" Width="16" Height="16" Offset="0x4B18" AddedByScript="true"/>
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_tou.xml
new file mode 100644
index 0000000000..1ae37b9637
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganon_tou.xml
@@ -0,0 +1,34 @@
+<Root>
+    <File Name="ganon_tou_scene" Segment="2">
+        <Texture Name="ganon_tou_sceneTex_003280" OutName="ganon_tou_sceneTex_003280" Format="i8" Width="64" Height="64" Offset="0x3280" AddedByScript="true"/>
+        <Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
+        <Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
+        <Scene Name="ganon_tou_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Texture Name="ganon_tou_room_0Tex_008550" OutName="ganon_tou_room_0Tex_008550" Format="rgba16" Width="32" Height="32" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008D50" OutName="ganon_tou_room_0Tex_008D50" Format="rgba16" Width="16" Height="16" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_008F50" OutName="ganon_tou_room_0Tex_008F50" Format="rgba16" Width="32" Height="8" Offset="0x8F50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_009150" OutName="ganon_tou_room_0Tex_009150" Format="rgba16" Width="64" Height="32" Offset="0x9150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00A150" OutName="ganon_tou_room_0Tex_00A150" Format="rgba16" Width="128" Height="16" Offset="0xA150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B150" OutName="ganon_tou_room_0Tex_00B150" Format="rgba16" Width="32" Height="16" Offset="0xB150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B550" OutName="ganon_tou_room_0Tex_00B550" Format="i8" Width="32" Height="32" Offset="0xB550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00B950" OutName="ganon_tou_room_0Tex_00B950" Format="i8" Width="32" Height="32" Offset="0xB950" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BD50" OutName="ganon_tou_room_0Tex_00BD50" Format="rgba16" Width="16" Height="16" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00BF50" OutName="ganon_tou_room_0Tex_00BF50" Format="i8" Width="64" Height="64" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00CF50" OutName="ganon_tou_room_0Tex_00CF50" Format="rgba16" Width="32" Height="32" Offset="0xCF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00D750" OutName="ganon_tou_room_0Tex_00D750" Format="rgba16" Width="32" Height="64" Offset="0xD750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00E750" OutName="ganon_tou_room_0Tex_00E750" Format="rgba16" Width="32" Height="64" Offset="0xE750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00F750" OutName="ganon_tou_room_0Tex_00F750" Format="i8" Width="32" Height="32" Offset="0xF750" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FB50" OutName="ganon_tou_room_0Tex_00FB50" Format="i8" Width="64" Height="16" Offset="0xFB50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_00FF50" OutName="ganon_tou_room_0Tex_00FF50" Format="rgba16" Width="16" Height="16" Offset="0xFF50" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010150" OutName="ganon_tou_room_0Tex_010150" Format="rgba16" Width="32" Height="16" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_010550" OutName="ganon_tou_room_0Tex_010550" Format="rgba16" Width="32" Height="32" Offset="0x10550" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0124F0" OutName="ganon_tou_room_0Tex_0124F0" Format="ia8" Width="32" Height="8" Offset="0x124F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0125F0" OutName="ganon_tou_room_0Tex_0125F0" Format="ia4" Width="128" Height="32" Offset="0x125F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_012DF0" OutName="ganon_tou_room_0Tex_012DF0" Format="i4" Width="64" Height="64" Offset="0x12DF0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0135F0" OutName="ganon_tou_room_0Tex_0135F0" Format="ia8" Width="32" Height="32" Offset="0x135F0" AddedByScript="true"/>
+        <Texture Name="ganon_tou_room_0Tex_0139F0" OutName="ganon_tou_room_0Tex_0139F0" Format="ia8" Width="16" Height="16" Offset="0x139F0" AddedByScript="true"/>
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontika.xml
new file mode 100644
index 0000000000..a5ff210ce1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontika.xml
@@ -0,0 +1,254 @@
+<Root>
+    <File Name="ganontika_scene" Segment="2">
+        <Texture Name="ganontika_sceneTex_01F580" OutName="ganontika_sceneTex_01F580" Format="rgba16" Width="16" Height="16" Offset="0x1F570" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01F780" OutName="ganontika_sceneTex_01F780" Format="ci8" Width="32" Height="64" Offset="0x1F770" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_01FF80" OutName="ganontika_sceneTex_01FF80" Format="ci8" Width="32" Height="32" Offset="0x1FF70" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020380" OutName="ganontika_sceneTex_020380" Format="ci8" Width="64" Height="32" Offset="0x20370" TlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTex_020B80" OutName="ganontika_sceneTex_020B80" Format="rgba16" Width="32" Height="32" Offset="0x20B70" AddedByScript="true"/>
+        <Texture Name="ganontika_sceneTLUT_01F380" OutName="ganontika_sceneTLUT_01F380" Format="rgba16" Width="16" Height="16" Offset="0x1F370" AddedByScript="true"/>
+        <Path Name="gGanontikaPath_00674" Offset="0x674" NumPaths="3"/>
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC70"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6A0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D070"/>
+
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA40"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF80"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3D0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E780"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB30"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF60"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21370"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_0" Segment="3">
+        <Texture Name="ganontika_room_0Tex_007F48" OutName="ganontika_room_0Tex_007F48" Format="ci8" Width="64" Height="32" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_0Tex_008A10" OutName="ganontika_room_0Tex_008A10" Format="ia16" Width="8" Height="128" Offset="0x89C0" AddedByScript="true"/>
+        <Room Name="ganontika_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_1" Segment="3">
+        <Texture Name="ganontika_room_1Tex_00D9E0" OutName="ganontika_room_1Tex_00D9E0" Format="i4" Width="128" Height="64" Offset="0xD9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00E9E0" OutName="ganontika_room_1Tex_00E9E0" Format="i4" Width="128" Height="64" Offset="0xE9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_00F9E0" OutName="ganontika_room_1Tex_00F9E0" Format="i4" Width="128" Height="64" Offset="0xF9C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0109E0" OutName="ganontika_room_1Tex_0109E0" Format="rgba16" Width="64" Height="32" Offset="0x109C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0119E0" OutName="ganontika_room_1Tex_0119E0" Format="ci8" Width="32" Height="64" Offset="0x119C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0121E0" OutName="ganontika_room_1Tex_0121E0" Format="ci8" Width="64" Height="32" Offset="0x121C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0129E0" OutName="ganontika_room_1Tex_0129E0" Format="ci8" Width="32" Height="64" Offset="0x129C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0131E0" OutName="ganontika_room_1Tex_0131E0" Format="ci8" Width="64" Height="32" Offset="0x131C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0139E0" OutName="ganontika_room_1Tex_0139E0" Format="ci8" Width="64" Height="32" Offset="0x139C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0141E0" OutName="ganontika_room_1Tex_0141E0" Format="ci8" Width="64" Height="32" Offset="0x141C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0149E0" OutName="ganontika_room_1Tex_0149E0" Format="ci8" Width="64" Height="32" Offset="0x149C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0151E0" OutName="ganontika_room_1Tex_0151E0" Format="ci8" Width="32" Height="64" Offset="0x151C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0159E0" OutName="ganontika_room_1Tex_0159E0" Format="ci4" Width="64" Height="64" Offset="0x159C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0161E0" OutName="ganontika_room_1Tex_0161E0" Format="ci4" Width="64" Height="64" Offset="0x161C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0169E0" OutName="ganontika_room_1Tex_0169E0" Format="ci4" Width="64" Height="64" Offset="0x169C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0171E0" OutName="ganontika_room_1Tex_0171E0" Format="ci4" Width="64" Height="64" Offset="0x171C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0179E0" OutName="ganontika_room_1Tex_0179E0" Format="ci4" Width="64" Height="64" Offset="0x179C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0181E0" OutName="ganontika_room_1Tex_0181E0" Format="ci4" Width="64" Height="64" Offset="0x181C0" TlutOffset="0xD9A0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0189E0" OutName="ganontika_room_1Tex_0189E0" Format="rgba16" Width="64" Height="32" Offset="0x189C0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_0199E0" OutName="ganontika_room_1Tex_0199E0" Format="ci8" Width="64" Height="16" Offset="0x199C0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_019DE0" OutName="ganontika_room_1Tex_019DE0" Format="ci8" Width="64" Height="32" Offset="0x19DC0" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1Tex_01B9C8" OutName="ganontika_room_1Tex_01B9C8" Format="ia8" Width="64" Height="64" Offset="0x1B9A8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_1TLUT_00D9C0" OutName="ganontika_room_1TLUT_00D9C0" Format="rgba16" Width="4" Height="4" Offset="0xD9A0" AddedByScript="true"/>
+        <Room Name="ganontika_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_2" Segment="3">
+        <Texture Name="ganontika_room_2Tex_002FD8" OutName="ganontika_room_2Tex_002FD8" Format="rgba16" Width="32" Height="32" Offset="0x2FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0037D8" OutName="ganontika_room_2Tex_0037D8" Format="rgba16" Width="32" Height="32" Offset="0x37D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_003FD8" OutName="ganontika_room_2Tex_003FD8" Format="rgba16" Width="32" Height="32" Offset="0x3FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0047D8" OutName="ganontika_room_2Tex_0047D8" Format="rgba16" Width="32" Height="32" Offset="0x47D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_004FD8" OutName="ganontika_room_2Tex_004FD8" Format="rgba16" Width="32" Height="32" Offset="0x4FD8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0057D8" OutName="ganontika_room_2Tex_0057D8" Format="rgba16" Width="32" Height="32" Offset="0x57D8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_005FD8" OutName="ganontika_room_2Tex_005FD8" Format="ci8" Width="64" Height="32" Offset="0x5FD8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_2Tex_0067D8" OutName="ganontika_room_2Tex_0067D8" Format="rgba16" Width="64" Height="32" Offset="0x67D8" AddedByScript="true"/>
+        <Room Name="ganontika_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_3" Segment="3">
+        <Texture Name="ganontika_room_3Tex_003ED8" OutName="ganontika_room_3Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0046D8" OutName="ganontika_room_3Tex_0046D8" Format="rgba16" Width="32" Height="32" Offset="0x4628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_004ED8" OutName="ganontika_room_3Tex_004ED8" Format="rgba16" Width="32" Height="32" Offset="0x4E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0056D8" OutName="ganontika_room_3Tex_0056D8" Format="rgba16" Width="32" Height="32" Offset="0x5628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_005ED8" OutName="ganontika_room_3Tex_005ED8" Format="rgba16" Width="32" Height="32" Offset="0x5E28" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0066D8" OutName="ganontika_room_3Tex_0066D8" Format="rgba16" Width="32" Height="32" Offset="0x6628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_006ED8" OutName="ganontika_room_3Tex_006ED8" Format="ci4" Width="64" Height="64" Offset="0x6E28" TlutOffset="0x3E08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_0076D8" OutName="ganontika_room_3Tex_0076D8" Format="rgba16" Width="64" Height="32" Offset="0x7628" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3Tex_008A38" OutName="ganontika_room_3Tex_008A38" Format="ia8" Width="64" Height="64" Offset="0x8988" AddedByScript="true"/>
+        <Texture Name="ganontika_room_3TLUT_003EB8" OutName="ganontika_room_3TLUT_003EB8" Format="rgba16" Width="4" Height="4" Offset="0x3E08" AddedByScript="true"/>
+        <Room Name="ganontika_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_4" Segment="3">
+        <Texture Name="ganontika_room_4Tex_004288" OutName="ganontika_room_4Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_004A88" OutName="ganontika_room_4Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005288" OutName="ganontika_room_4Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_005A88" OutName="ganontika_room_4Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006288" OutName="ganontika_room_4Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006A88" OutName="ganontika_room_4Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_4Tex_006C88" OutName="ganontika_room_4Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_5" Segment="3">
+        <Texture Name="ganontika_room_5Tex_003B18" OutName="ganontika_room_5Tex_003B18" Format="rgba16" Width="16" Height="16" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_003D18" OutName="ganontika_room_5Tex_003D18" Format="ci8" Width="32" Height="64" Offset="0x3D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004518" OutName="ganontika_room_5Tex_004518" Format="rgba16" Width="32" Height="32" Offset="0x4538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_004D18" OutName="ganontika_room_5Tex_004D18" Format="ci8" Width="64" Height="32" Offset="0x4D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005518" OutName="ganontika_room_5Tex_005518" Format="rgba16" Width="32" Height="32" Offset="0x5538" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_005D18" OutName="ganontika_room_5Tex_005D18" Format="ci8" Width="64" Height="32" Offset="0x5D38" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_5Tex_006518" OutName="ganontika_room_5Tex_006518" Format="rgba16" Width="64" Height="32" Offset="0x6538" AddedByScript="true"/>
+        <Room Name="ganontika_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_6" Segment="3">
+        <Texture Name="ganontika_room_6Tex_00B500" OutName="ganontika_room_6Tex_00B500" Format="ci8" Width="32" Height="32" Offset="0xB490" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00B900" OutName="ganontika_room_6Tex_00B900" Format="ci8" Width="32" Height="64" Offset="0xB890" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C100" OutName="ganontika_room_6Tex_00C100" Format="ci8" Width="64" Height="32" Offset="0xC090" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00C900" OutName="ganontika_room_6Tex_00C900" Format="i4" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CB00" OutName="ganontika_room_6Tex_00CB00" Format="i4" Width="32" Height="32" Offset="0xCA90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CD00" OutName="ganontika_room_6Tex_00CD00" Format="i4" Width="32" Height="32" Offset="0xCC90" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00CF00" OutName="ganontika_room_6Tex_00CF00" Format="ci4" Width="64" Height="64" Offset="0xCE90" TlutOffset="0xB470" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D700" OutName="ganontika_room_6Tex_00D700" Format="i4" Width="32" Height="32" Offset="0xD690" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00D900" OutName="ganontika_room_6Tex_00D900" Format="rgba16" Width="64" Height="32" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6Tex_00EC58" OutName="ganontika_room_6Tex_00EC58" Format="ia8" Width="64" Height="64" Offset="0xEBE8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_6TLUT_00B4E0" OutName="ganontika_room_6TLUT_00B4E0" Format="rgba16" Width="4" Height="4" Offset="0xB470" AddedByScript="true"/>
+        <Room Name="ganontika_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_7" Segment="3">
+        <Texture Name="ganontika_room_7Tex_004288" OutName="ganontika_room_7Tex_004288" Format="rgba16" Width="32" Height="32" Offset="0x4288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_004A88" OutName="ganontika_room_7Tex_004A88" Format="ci8" Width="32" Height="64" Offset="0x4A88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005288" OutName="ganontika_room_7Tex_005288" Format="ci8" Width="64" Height="32" Offset="0x5288" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_005A88" OutName="ganontika_room_7Tex_005A88" Format="rgba16" Width="32" Height="32" Offset="0x5A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006288" OutName="ganontika_room_7Tex_006288" Format="rgba16" Width="32" Height="32" Offset="0x6288" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006A88" OutName="ganontika_room_7Tex_006A88" Format="rgba16" Width="16" Height="16" Offset="0x6A88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_7Tex_006C88" OutName="ganontika_room_7Tex_006C88" Format="rgba16" Width="64" Height="32" Offset="0x6C88" AddedByScript="true"/>
+        <Room Name="ganontika_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_8" Segment="3">
+        <Texture Name="ganontika_room_8Tex_0034B8" OutName="ganontika_room_8Tex_0034B8" Format="rgba16" Width="32" Height="64" Offset="0x3508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0044B8" OutName="ganontika_room_8Tex_0044B8" Format="rgba16" Width="32" Height="64" Offset="0x4508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0054B8" OutName="ganontika_room_8Tex_0054B8" Format="rgba16" Width="32" Height="32" Offset="0x5508" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_005CB8" OutName="ganontika_room_8Tex_005CB8" Format="rgba16" Width="32" Height="64" Offset="0x5D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_006CB8" OutName="ganontika_room_8Tex_006CB8" Format="rgba16" Width="32" Height="32" Offset="0x6D08" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_0074B8" OutName="ganontika_room_8Tex_0074B8" Format="ci4" Width="64" Height="64" Offset="0x7508" TlutOffset="0x34E8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8Tex_008018" OutName="ganontika_room_8Tex_008018" Format="ia8" Width="64" Height="64" Offset="0x8068" AddedByScript="true"/>
+        <Texture Name="ganontika_room_8TLUT_003498" OutName="ganontika_room_8TLUT_003498" Format="rgba16" Width="4" Height="4" Offset="0x34E8" AddedByScript="true"/>
+        <Room Name="ganontika_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_9" Segment="3">
+        <Texture Name="ganontika_room_9Tex_005488" OutName="ganontika_room_9Tex_005488" Format="rgba16" Width="64" Height="32" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_006488" OutName="ganontika_room_9Tex_006488" Format="rgba16" Width="64" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007488" OutName="ganontika_room_9Tex_007488" Format="rgba16" Width="32" Height="32" Offset="0x74F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007C88" OutName="ganontika_room_9Tex_007C88" Format="rgba16" Width="16" Height="16" Offset="0x7CF8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_007E88" OutName="ganontika_room_9Tex_007E88" Format="ci8" Width="32" Height="64" Offset="0x7EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008688" OutName="ganontika_room_9Tex_008688" Format="ci8" Width="64" Height="32" Offset="0x86F8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_008E88" OutName="ganontika_room_9Tex_008E88" Format="ci8" Width="64" Height="32" Offset="0x8EF8" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_009688" OutName="ganontika_room_9Tex_009688" Format="rgba16" Width="64" Height="32" Offset="0x96F8" AddedByScript="true"/>
+        <Texture Name="ganontika_room_9Tex_00A818" OutName="ganontika_room_9Tex_00A818" Format="rgba16" Width="32" Height="64" Offset="0xA888" AddedByScript="true"/>
+        <Room Name="ganontika_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_10" Segment="3">
+        <Texture Name="ganontika_room_10Tex_0039B8" OutName="ganontika_room_10Tex_0039B8" Format="rgba16" Width="32" Height="32" Offset="0x3968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0041B8" OutName="ganontika_room_10Tex_0041B8" Format="ci8" Width="32" Height="64" Offset="0x4168" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0049B8" OutName="ganontika_room_10Tex_0049B8" Format="rgba16" Width="32" Height="32" Offset="0x4968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0051B8" OutName="ganontika_room_10Tex_0051B8" Format="rgba16" Width="32" Height="32" Offset="0x5168" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_0059B8" OutName="ganontika_room_10Tex_0059B8" Format="rgba16" Width="16" Height="16" Offset="0x5968" AddedByScript="true"/>
+        <Texture Name="ganontika_room_10Tex_005BB8" OutName="ganontika_room_10Tex_005BB8" Format="rgba16" Width="64" Height="32" Offset="0x5B68" AddedByScript="true"/>
+        <Room Name="ganontika_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_11" Segment="3">
+        <Texture Name="ganontika_room_11Tex_004150" OutName="ganontika_room_11Tex_004150" Format="rgba16" Width="32" Height="32" Offset="0x4150" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_004950" OutName="ganontika_room_11Tex_004950" Format="ci8" Width="32" Height="64" Offset="0x4950" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005150" OutName="ganontika_room_11Tex_005150" Format="ci8" Width="64" Height="32" Offset="0x5150" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_005950" OutName="ganontika_room_11Tex_005950" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="ganontika_room_11Tex_006150" OutName="ganontika_room_11Tex_006150" Format="rgba16" Width="32" Height="32" Offset="0x6150" AddedByScript="true"/>
+        <Room Name="ganontika_room_11" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_12" Segment="3">
+        <Texture Name="ganontika_room_12Tex_005160" OutName="ganontika_room_12Tex_005160" Format="rgba16" Width="32" Height="32" Offset="0x5260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_005960" OutName="ganontika_room_12Tex_005960" Format="ci8" Width="64" Height="32" Offset="0x5A60" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006160" OutName="ganontika_room_12Tex_006160" Format="ci8" Width="32" Height="64" Offset="0x6260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_006960" OutName="ganontika_room_12Tex_006960" Format="ci4" Width="64" Height="64" Offset="0x6A60" TlutOffset="0x5240" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_007160" OutName="ganontika_room_12Tex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7260" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008160" OutName="ganontika_room_12Tex_008160" Format="ci8" Width="64" Height="16" Offset="0x8260" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_008560" OutName="ganontika_room_12Tex_008560" Format="ci8" Width="64" Height="32" Offset="0x8660" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_009270" OutName="ganontika_room_12Tex_009270" Format="ia8" Width="64" Height="64" Offset="0x9370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12Tex_00A270" OutName="ganontika_room_12Tex_00A270" Format="ia8" Width="32" Height="128" Offset="0xA370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_12TLUT_005140" OutName="ganontika_room_12TLUT_005140" Format="rgba16" Width="4" Height="4" Offset="0x5240" AddedByScript="true"/>
+        <Room Name="ganontika_room_12" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_13" Segment="3">
+        <Texture Name="ganontika_room_13Tex_004340" OutName="ganontika_room_13Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_004B40" OutName="ganontika_room_13Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005340" OutName="ganontika_room_13Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_005B40" OutName="ganontika_room_13Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006340" OutName="ganontika_room_13Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006B40" OutName="ganontika_room_13Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_13Tex_006D40" OutName="ganontika_room_13Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_13" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_14" Segment="3">
+        <Texture Name="ganontika_room_14Tex_004FB8" OutName="ganontika_room_14Tex_004FB8" Format="rgba16" Width="32" Height="32" Offset="0x4F88" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0057B8" OutName="ganontika_room_14Tex_0057B8" Format="ci8" Width="64" Height="32" Offset="0x5788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_005FB8" OutName="ganontika_room_14Tex_005FB8" Format="ci4" Width="64" Height="64" Offset="0x5F88" TlutOffset="0x4F68" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0067B8" OutName="ganontika_room_14Tex_0067B8" Format="rgba16" Width="64" Height="32" Offset="0x6788" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0077B8" OutName="ganontika_room_14Tex_0077B8" Format="ci8" Width="64" Height="16" Offset="0x7788" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_007BB8" OutName="ganontika_room_14Tex_007BB8" Format="ci8" Width="64" Height="32" Offset="0x7B88" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0089C8" OutName="ganontika_room_14Tex_0089C8" Format="ia8" Width="64" Height="64" Offset="0x8998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14Tex_0099C8" OutName="ganontika_room_14Tex_0099C8" Format="rgba16" Width="32" Height="32" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="ganontika_room_14TLUT_004F98" OutName="ganontika_room_14TLUT_004F98" Format="rgba16" Width="4" Height="4" Offset="0x4F68" AddedByScript="true"/>
+        <Room Name="ganontika_room_14" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_15" Segment="3">
+        <Texture Name="ganontika_room_15Tex_004340" OutName="ganontika_room_15Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_004B40" OutName="ganontika_room_15Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005340" OutName="ganontika_room_15Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_005B40" OutName="ganontika_room_15Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006340" OutName="ganontika_room_15Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006B40" OutName="ganontika_room_15Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_15Tex_006D40" OutName="ganontika_room_15Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_15" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_16" Segment="3">
+        <Texture Name="ganontika_room_16Tex_001630" OutName="ganontika_room_16Tex_001630" Format="rgba16" Width="64" Height="32" Offset="0x1620" AddedByScript="true"/>
+        <Texture Name="ganontika_room_16Tex_002630" OutName="ganontika_room_16Tex_002630" Format="ci8" Width="64" Height="32" Offset="0x2620" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Room Name="ganontika_room_16" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_17" Segment="3">
+        <Texture Name="ganontika_room_17Tex_002A18" OutName="ganontika_room_17Tex_002A18" Format="ci8" Width="32" Height="32" Offset="0x2A98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_002E18" OutName="ganontika_room_17Tex_002E18" Format="rgba16" Width="64" Height="32" Offset="0x2E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_003E18" OutName="ganontika_room_17Tex_003E18" Format="rgba16" Width="64" Height="32" Offset="0x3E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_004E18" OutName="ganontika_room_17Tex_004E18" Format="rgba16" Width="32" Height="32" Offset="0x4E98" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_005618" OutName="ganontika_room_17Tex_005618" Format="rgba16" Width="32" Height="64" Offset="0x5698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006618" OutName="ganontika_room_17Tex_006618" Format="rgba16" Width="32" Height="32" Offset="0x6698" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_006E18" OutName="ganontika_room_17Tex_006E18" Format="ci8" Width="64" Height="32" Offset="0x6E98" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_17Tex_007618" OutName="ganontika_room_17Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7698" AddedByScript="true"/>
+        <Room Name="ganontika_room_17" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_18" Segment="3">
+        <Texture Name="ganontika_room_18Tex_004380" OutName="ganontika_room_18Tex_004380" Format="rgba16" Width="32" Height="64" Offset="0x4310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005380" OutName="ganontika_room_18Tex_005380" Format="ci8" Width="32" Height="32" Offset="0x5310" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_005780" OutName="ganontika_room_18Tex_005780" Format="rgba16" Width="64" Height="32" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_006780" OutName="ganontika_room_18Tex_006780" Format="rgba16" Width="64" Height="32" Offset="0x6710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007780" OutName="ganontika_room_18Tex_007780" Format="rgba16" Width="32" Height="32" Offset="0x7710" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_007F80" OutName="ganontika_room_18Tex_007F80" Format="rgba16" Width="32" Height="64" Offset="0x7F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_008F80" OutName="ganontika_room_18Tex_008F80" Format="rgba16" Width="32" Height="8" Offset="0x8F10" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009180" OutName="ganontika_room_18Tex_009180" Format="rgba16" Width="32" Height="32" Offset="0x9110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_009980" OutName="ganontika_room_18Tex_009980" Format="ci4" Width="64" Height="64" Offset="0x9910" TlutOffset="0x42F0" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A180" OutName="ganontika_room_18Tex_00A180" Format="i4" Width="32" Height="32" Offset="0xA110" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00A380" OutName="ganontika_room_18Tex_00A380" Format="rgba16" Width="64" Height="32" Offset="0xA310" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18Tex_00B6E0" OutName="ganontika_room_18Tex_00B6E0" Format="ia8" Width="64" Height="64" Offset="0xB670" AddedByScript="true"/>
+        <Texture Name="ganontika_room_18TLUT_004360" OutName="ganontika_room_18TLUT_004360" Format="rgba16" Width="4" Height="4" Offset="0x42F0" AddedByScript="true"/>
+        <Room Name="ganontika_room_18" Offset="0x0"/>
+    </File>
+    <File Name="ganontika_room_19" Segment="3">
+        <Texture Name="ganontika_room_19Tex_004340" OutName="ganontika_room_19Tex_004340" Format="rgba16" Width="32" Height="32" Offset="0x4340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_004B40" OutName="ganontika_room_19Tex_004B40" Format="ci8" Width="32" Height="64" Offset="0x4B40" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005340" OutName="ganontika_room_19Tex_005340" Format="ci8" Width="64" Height="32" Offset="0x5340" ExternalTlut="ganontika_scene" ExternalTlutOffset="0x1F370" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_005B40" OutName="ganontika_room_19Tex_005B40" Format="rgba16" Width="32" Height="32" Offset="0x5B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006340" OutName="ganontika_room_19Tex_006340" Format="rgba16" Width="32" Height="32" Offset="0x6340" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006B40" OutName="ganontika_room_19Tex_006B40" Format="rgba16" Width="16" Height="16" Offset="0x6B40" AddedByScript="true"/>
+        <Texture Name="ganontika_room_19Tex_006D40" OutName="ganontika_room_19Tex_006D40" Format="rgba16" Width="64" Height="32" Offset="0x6D40" AddedByScript="true"/>
+        <Room Name="ganontika_room_19" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontikasonogo.xml
new file mode 100644
index 0000000000..060d4941ba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ganontikasonogo.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="ganontikasonogo_scene" Segment="2">
+        <Texture Name="ganontikasonogo_sceneTex_002B00" OutName="ganontikasonogo_sceneTex_002B00" Format="rgba16" Width="32" Height="64" Offset="0x2B00" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_sceneTex_003B00" OutName="ganontikasonogo_sceneTex_003B00" Format="rgba16" Width="64" Height="32" Offset="0x3B00" AddedByScript="true"/>
+        <Path Name="gGanonTikasongsoPath_00184" Offset="0x184" NumPaths="3"/>
+        <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Texture Name="ganontikasonogo_room_0Tex_0092D8" OutName="ganontikasonogo_room_0Tex_0092D8" Format="rgba16" Width="64" Height="32" Offset="0x92D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00A2D8" OutName="ganontikasonogo_room_0Tex_00A2D8" Format="rgba16" Width="64" Height="32" Offset="0xA2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00B2D8" OutName="ganontikasonogo_room_0Tex_00B2D8" Format="rgba16" Width="32" Height="64" Offset="0xB2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00C2D8" OutName="ganontikasonogo_room_0Tex_00C2D8" Format="rgba16" Width="64" Height="32" Offset="0xC2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00D2D8" OutName="ganontikasonogo_room_0Tex_00D2D8" Format="rgba16" Width="64" Height="32" Offset="0xD2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00E2D8" OutName="ganontikasonogo_room_0Tex_00E2D8" Format="rgba16" Width="64" Height="32" Offset="0xE2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00F2D8" OutName="ganontikasonogo_room_0Tex_00F2D8" Format="rgba16" Width="32" Height="32" Offset="0xF2D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_00FAD8" OutName="ganontikasonogo_room_0Tex_00FAD8" Format="rgba16" Width="32" Height="64" Offset="0xFAD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_010AD8" OutName="ganontikasonogo_room_0Tex_010AD8" Format="ci4" Width="64" Height="64" Offset="0x10AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0112D8" OutName="ganontikasonogo_room_0Tex_0112D8" Format="ci4" Width="64" Height="64" Offset="0x112D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_011AD8" OutName="ganontikasonogo_room_0Tex_011AD8" Format="ci4" Width="64" Height="64" Offset="0x11AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0122D8" OutName="ganontikasonogo_room_0Tex_0122D8" Format="ci4" Width="64" Height="64" Offset="0x122D8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_012AD8" OutName="ganontikasonogo_room_0Tex_012AD8" Format="ci4" Width="64" Height="64" Offset="0x12AD8" TlutOffset="0x92B8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0132D8" OutName="ganontikasonogo_room_0Tex_0132D8" Format="rgba16" Width="64" Height="32" Offset="0x132D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_0142D8" OutName="ganontikasonogo_room_0Tex_0142D8" Format="rgba16" Width="64" Height="16" Offset="0x142D8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_014AD8" OutName="ganontikasonogo_room_0Tex_014AD8" Format="rgba16" Width="64" Height="32" Offset="0x14AD8" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0Tex_016B78" OutName="ganontikasonogo_room_0Tex_016B78" Format="ia8" Width="64" Height="64" Offset="0x16B78" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_0TLUT_0092B8" OutName="ganontikasonogo_room_0TLUT_0092B8" Format="rgba16" Width="4" Height="4" Offset="0x92B8" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Texture Name="ganontikasonogo_room_1Tex_006C60" OutName="ganontikasonogo_room_1Tex_006C60" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_007460" OutName="ganontikasonogo_room_1Tex_007460" Format="rgba16" Width="64" Height="32" Offset="0x7460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_008460" OutName="ganontikasonogo_room_1Tex_008460" Format="rgba16" Width="32" Height="64" Offset="0x8460" AddedByScript="true"/>
+        <Texture Name="ganontikasonogo_room_1Tex_009720" OutName="ganontikasonogo_room_1Tex_009720" Format="ia16" Width="8" Height="128" Offset="0x9720" AddedByScript="true"/>
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/gerudoway.xml
new file mode 100644
index 0000000000..8272776143
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/gerudoway.xml
@@ -0,0 +1,55 @@
+<Root>
+    <File Name="gerudoway_scene" Segment="2">
+        <Texture Name="gerudoway_sceneTex_007520" OutName="gerudoway_sceneTex_007520" Format="rgba16" Width="32" Height="64" Offset="0x7520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008520" OutName="gerudoway_sceneTex_008520" Format="ia4" Width="128" Height="32" Offset="0x8520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_008D20" OutName="gerudoway_sceneTex_008D20" Format="ia8" Width="64" Height="32" Offset="0x8D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009520" OutName="gerudoway_sceneTex_009520" Format="ia8" Width="32" Height="64" Offset="0x9520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_009D20" OutName="gerudoway_sceneTex_009D20" Format="rgba16" Width="32" Height="32" Offset="0x9D20" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A520" OutName="gerudoway_sceneTex_00A520" Format="rgba16" Width="32" Height="16" Offset="0xA520" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00A920" OutName="gerudoway_sceneTex_00A920" Format="rgba16" Width="32" Height="64" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00C120" OutName="gerudoway_sceneTex_00C120" Format="rgba16" Width="64" Height="32" Offset="0xC120" AddedByScript="true"/>
+        <Texture Name="gerudoway_sceneTex_00D120" OutName="gerudoway_sceneTex_00D120" Format="rgba16" Width="32" Height="32" Offset="0xD120" AddedByScript="true"/>
+        <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
+        <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
+        <Path Name="gGerudowayPath_002AC" Offset="0x2AC" NumPaths="4"/>
+        <Scene Name="gerudoway_scene" Offset="0x0"/>
+    </File>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Texture Name="gerudoway_room_0Tex_002FB0" OutName="gerudoway_room_0Tex_002FB0" Format="rgba16" Width="64" Height="32" Offset="0x2FB0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_0Tex_003FB0" OutName="gerudoway_room_0Tex_003FB0" Format="rgba16" Width="32" Height="16" Offset="0x3FB0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Texture Name="gerudoway_room_1Tex_003710" OutName="gerudoway_room_1Tex_003710" Format="rgba16" Width="32" Height="32" Offset="0x3710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_003F10" OutName="gerudoway_room_1Tex_003F10" Format="ia4" Width="32" Height="128" Offset="0x3F10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_004710" OutName="gerudoway_room_1Tex_004710" Format="rgba16" Width="64" Height="32" Offset="0x4710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005710" OutName="gerudoway_room_1Tex_005710" Format="rgba16" Width="32" Height="16" Offset="0x5710" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_005B10" OutName="gerudoway_room_1Tex_005B10" Format="rgba16" Width="64" Height="16" Offset="0x5B10" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_1Tex_006310" OutName="gerudoway_room_1Tex_006310" Format="rgba16" Width="16" Height="64" Offset="0x6310" AddedByScript="true"/>
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Texture Name="gerudoway_room_2Tex_002298" OutName="gerudoway_room_2Tex_002298" Format="rgba16" Width="64" Height="16" Offset="0x2298" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_2Tex_002A98" OutName="gerudoway_room_2Tex_002A98" Format="rgba16" Width="16" Height="64" Offset="0x2A98" AddedByScript="true"/>
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Texture Name="gerudoway_room_3Tex_006EA0" OutName="gerudoway_room_3Tex_006EA0" Format="rgba16" Width="32" Height="32" Offset="0x6EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0076A0" OutName="gerudoway_room_3Tex_0076A0" Format="ia4" Width="32" Height="128" Offset="0x76A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_007EA0" OutName="gerudoway_room_3Tex_007EA0" Format="rgba16" Width="64" Height="32" Offset="0x7EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_008EA0" OutName="gerudoway_room_3Tex_008EA0" Format="rgba16" Width="32" Height="16" Offset="0x8EA0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_0092A0" OutName="gerudoway_room_3Tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_3Tex_009AA0" OutName="gerudoway_room_3Tex_009AA0" Format="rgba16" Width="16" Height="64" Offset="0x9AA0" AddedByScript="true"/>
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Texture Name="gerudoway_room_4Tex_002028" OutName="gerudoway_room_4Tex_002028" Format="rgba16" Width="64" Height="16" Offset="0x2028" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_4Tex_002828" OutName="gerudoway_room_4Tex_002828" Format="rgba16" Width="16" Height="64" Offset="0x2828" AddedByScript="true"/>
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
+    </File>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Texture Name="gerudoway_room_5Tex_002FF8" OutName="gerudoway_room_5Tex_002FF8" Format="rgba16" Width="64" Height="16" Offset="0x2FF8" AddedByScript="true"/>
+        <Texture Name="gerudoway_room_5Tex_0037F8" OutName="gerudoway_room_5Tex_0037F8" Format="rgba16" Width="16" Height="64" Offset="0x37F8" AddedByScript="true"/>
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ice_doukutu.xml
new file mode 100644
index 0000000000..0f1bc3b285
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ice_doukutu.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="ice_doukutu_scene" Segment="2">
+        <Texture Name="ice_doukutu_sceneTex_00FCC0" OutName="ice_doukutu_sceneTex_00FCC0" Format="i8" Width="32" Height="32" Offset="0xFBF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0100C0" OutName="ice_doukutu_sceneTex_0100C0" Format="rgba16" Width="32" Height="32" Offset="0xFFF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_0108C0" OutName="ice_doukutu_sceneTex_0108C0" Format="rgba16" Width="16" Height="16" Offset="0x107F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010AC0" OutName="ice_doukutu_sceneTex_010AC0" Format="i8" Width="32" Height="32" Offset="0x109F0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTex_010EC0" OutName="ice_doukutu_sceneTex_010EC0" Format="rgba16" Width="32" Height="32" Offset="0x10DF0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_sceneTLUT_00F8A0" OutName="ice_doukutu_sceneTLUT_00F8A0" Format="rgba16" Width="4" Height="4" Offset="0xF7D0" AddedByScript="true"/>
+        <Cutscene Name="gIceCavernSerenadeCs" Offset="0x250"/>
+        <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF7F0"/>
+        <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xF9F0"/>
+        <Scene Name="ice_doukutu_scene" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Texture Name="ice_doukutu_room_0Tex_002F50" OutName="ice_doukutu_room_0Tex_002F50" Format="rgba16" Width="32" Height="64" Offset="0x2F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_003F50" OutName="ice_doukutu_room_0Tex_003F50" Format="rgba16" Width="32" Height="32" Offset="0x3F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_004750" OutName="ice_doukutu_room_0Tex_004750" Format="rgba16" Width="32" Height="64" Offset="0x4730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005750" OutName="ice_doukutu_room_0Tex_005750" Format="rgba16" Width="32" Height="32" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_005F50" OutName="ice_doukutu_room_0Tex_005F50" Format="i8" Width="64" Height="64" Offset="0x5F30" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_0Tex_007678" OutName="ice_doukutu_room_0Tex_007678" Format="i8" Width="64" Height="64" Offset="0x7658" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Texture Name="ice_doukutu_room_1Tex_004110" OutName="ice_doukutu_room_1Tex_004110" Format="rgba16" Width="32" Height="64" Offset="0x4120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005110" OutName="ice_doukutu_room_1Tex_005110" Format="rgba16" Width="32" Height="32" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_005910" OutName="ice_doukutu_room_1Tex_005910" Format="rgba16" Width="32" Height="64" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_006910" OutName="ice_doukutu_room_1Tex_006910" Format="rgba16" Width="32" Height="32" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_007110" OutName="ice_doukutu_room_1Tex_007110" Format="rgba16" Width="32" Height="64" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_008110" OutName="ice_doukutu_room_1Tex_008110" Format="i8" Width="64" Height="64" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_009110" OutName="ice_doukutu_room_1Tex_009110" Format="rgba16" Width="32" Height="32" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00AB30" OutName="ice_doukutu_room_1Tex_00AB30" Format="rgba16" Width="32" Height="64" Offset="0xAB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BB30" OutName="ice_doukutu_room_1Tex_00BB30" Format="rgba16" Width="16" Height="16" Offset="0xBB40" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_1Tex_00BD30" OutName="ice_doukutu_room_1Tex_00BD30" Format="rgba16" Width="32" Height="32" Offset="0xBD40" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Texture Name="ice_doukutu_room_2Tex_001730" OutName="ice_doukutu_room_2Tex_001730" Format="rgba16" Width="32" Height="64" Offset="0x1720" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_002730" OutName="ice_doukutu_room_2Tex_002730" Format="ci4" Width="64" Height="64" Offset="0x2720" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_003AF8" OutName="ice_doukutu_room_2Tex_003AF8" Format="i8" Width="64" Height="64" Offset="0x3AE8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_2Tex_004AF8" OutName="ice_doukutu_room_2Tex_004AF8" Format="rgba16" Width="32" Height="64" Offset="0x4AE8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Texture Name="ice_doukutu_room_3Tex_003208" OutName="ice_doukutu_room_3Tex_003208" Format="rgba16" Width="32" Height="32" Offset="0x31F8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_003A08" OutName="ice_doukutu_room_3Tex_003A08" Format="ci4" Width="64" Height="64" Offset="0x39F8" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_005090" OutName="ice_doukutu_room_3Tex_005090" Format="i8" Width="64" Height="64" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_006090" OutName="ice_doukutu_room_3Tex_006090" Format="rgba16" Width="32" Height="64" Offset="0x6080" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_3Tex_007090" OutName="ice_doukutu_room_3Tex_007090" Format="i8" Width="32" Height="128" Offset="0x7080" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Texture Name="ice_doukutu_room_4Tex_0028E0" OutName="ice_doukutu_room_4Tex_0028E0" Format="rgba16" Width="32" Height="32" Offset="0x2900" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0030E0" OutName="ice_doukutu_room_4Tex_0030E0" Format="rgba16" Width="32" Height="32" Offset="0x3100" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_0038E0" OutName="ice_doukutu_room_4Tex_0038E0" Format="ci4" Width="64" Height="64" Offset="0x3900" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_004650" OutName="ice_doukutu_room_4Tex_004650" Format="i8" Width="64" Height="64" Offset="0x4670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_005650" OutName="ice_doukutu_room_4Tex_005650" Format="rgba16" Width="32" Height="64" Offset="0x5670" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_4Tex_006650" OutName="ice_doukutu_room_4Tex_006650" Format="i8" Width="32" Height="128" Offset="0x6670" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Texture Name="ice_doukutu_room_5Tex_004648" OutName="ice_doukutu_room_5Tex_004648" Format="rgba16" Width="16" Height="128" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005648" OutName="ice_doukutu_room_5Tex_005648" Format="rgba16" Width="32" Height="32" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_005E48" OutName="ice_doukutu_room_5Tex_005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_006648" OutName="ice_doukutu_room_5Tex_006648" Format="rgba16" Width="32" Height="32" Offset="0x6658" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007478" OutName="ice_doukutu_room_5Tex_007478" Format="i8" Width="32" Height="32" Offset="0x7488" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_5Tex_007878" OutName="ice_doukutu_room_5Tex_007878" Format="i8" Width="64" Height="64" Offset="0x7888" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Texture Name="ice_doukutu_room_6Tex_0029B0" OutName="ice_doukutu_room_6Tex_0029B0" Format="i8" Width="64" Height="64" Offset="0x2A60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_6Tex_0039B0" OutName="ice_doukutu_room_6Tex_0039B0" Format="rgba16" Width="32" Height="32" Offset="0x3A60" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Texture Name="ice_doukutu_room_7Tex_001758" OutName="ice_doukutu_room_7Tex_001758" Format="ci4" Width="64" Height="64" Offset="0x1758" ExternalTlut="ice_doukutu_scene" ExternalTlutOffset="0xF7E0" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0040E8" OutName="ice_doukutu_room_7Tex_0040E8" Format="i8" Width="64" Height="64" Offset="0x40E8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_7Tex_0050E8" OutName="ice_doukutu_room_7Tex_0050E8" Format="rgba16" Width="32" Height="32" Offset="0x50E8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Texture Name="ice_doukutu_room_9Tex_0044A0" OutName="ice_doukutu_room_9Tex_0044A0" Format="rgba16" Width="32" Height="64" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0054A0" OutName="ice_doukutu_room_9Tex_0054A0" Format="rgba16" Width="32" Height="32" Offset="0x5460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_005CA0" OutName="ice_doukutu_room_9Tex_005CA0" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_0064A0" OutName="ice_doukutu_room_9Tex_0064A0" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_006CA0" OutName="ice_doukutu_room_9Tex_006CA0" Format="rgba16" Width="32" Height="32" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_9Tex_007690" OutName="ice_doukutu_room_9Tex_007690" Format="rgba16" Width="32" Height="64" Offset="0x7650" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Texture Name="ice_doukutu_room_10Tex_001A28" OutName="ice_doukutu_room_10Tex_001A28" Format="rgba16" Width="32" Height="64" Offset="0x1A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_002A28" OutName="ice_doukutu_room_10Tex_002A28" Format="i8" Width="64" Height="64" Offset="0x2A28" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_10Tex_003BD8" OutName="ice_doukutu_room_10Tex_003BD8" Format="rgba16" Width="32" Height="32" Offset="0x3BD8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Texture Name="ice_doukutu_room_11Tex_002928" OutName="ice_doukutu_room_11Tex_002928" Format="rgba16" Width="32" Height="32" Offset="0x29D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003128" OutName="ice_doukutu_room_11Tex_003128" Format="rgba16" Width="32" Height="32" Offset="0x31D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_003928" OutName="ice_doukutu_room_11Tex_003928" Format="rgba16" Width="32" Height="32" Offset="0x39D8" AddedByScript="true"/>
+        <Texture Name="ice_doukutu_room_11Tex_004848" OutName="ice_doukutu_room_11Tex_004848" Format="i8" Width="64" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinboss.xml
new file mode 100644
index 0000000000..86c0d317b2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinboss.xml
@@ -0,0 +1,49 @@
+<Root>
+    <File Name="jyasinboss_scene" Segment="2">
+        <Texture Name="jyasinboss_sceneTex_006CF0" OutName="jyasinboss_sceneTex_006CF0" Format="rgba16" Width="64" Height="32" Offset="0x6CF0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_sceneTex_007CF0" OutName="jyasinboss_sceneTex_007CF0" Format="rgba16" Width="64" Height="32" Offset="0x7CF0" AddedByScript="true"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
+        <Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
+        <Scene Name="jyasinboss_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Texture Name="jyasinboss_room_0Tex_0007C8" OutName="jyasinboss_room_0Tex_0007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Texture Name="jyasinboss_room_1Tex_002E38" OutName="jyasinboss_room_1Tex_002E38" Format="rgba16" Width="64" Height="32" Offset="0x2E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_003E38" OutName="jyasinboss_room_1Tex_003E38" Format="rgba16" Width="64" Height="32" Offset="0x3E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_004E38" OutName="jyasinboss_room_1Tex_004E38" Format="rgba16" Width="32" Height="32" Offset="0x4E38" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_005638" OutName="jyasinboss_room_1Tex_005638" Format="rgba16" Width="64" Height="32" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006638" OutName="jyasinboss_room_1Tex_006638" Format="rgba16" Width="64" Height="16" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_006E38" OutName="jyasinboss_room_1Tex_006E38" Format="ci4" Width="64" Height="64" Offset="0x6E38" TlutOffset="0x2E18" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1Tex_007638" OutName="jyasinboss_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_1TLUT_002E18" OutName="jyasinboss_room_1TLUT_002E18" Format="rgba16" Width="4" Height="4" Offset="0x2E18" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Texture Name="jyasinboss_room_2Tex_0021C0" OutName="jyasinboss_room_2Tex_0021C0" Format="rgba16" Width="64" Height="16" Offset="0x21C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0029C0" OutName="jyasinboss_room_2Tex_0029C0" Format="rgba16" Width="32" Height="64" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_2Tex_0039C0" OutName="jyasinboss_room_2Tex_0039C0" Format="rgba16" Width="16" Height="32" Offset="0x39C0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Texture Name="jyasinboss_room_3Tex_003F00" OutName="jyasinboss_room_3Tex_003F00" Format="ci8" Width="32" Height="32" Offset="0x3F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004300" OutName="jyasinboss_room_3Tex_004300" Format="ci8" Width="32" Height="32" Offset="0x4300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004700" OutName="jyasinboss_room_3Tex_004700" Format="ci8" Width="64" Height="32" Offset="0x4700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_004F00" OutName="jyasinboss_room_3Tex_004F00" Format="ci8" Width="32" Height="32" Offset="0x4F00" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005300" OutName="jyasinboss_room_3Tex_005300" Format="ci8" Width="32" Height="32" Offset="0x5300" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005700" OutName="jyasinboss_room_3Tex_005700" Format="ci8" Width="32" Height="64" Offset="0x5700" TlutOffset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_005F00" OutName="jyasinboss_room_3Tex_005F00" Format="rgba16" Width="32" Height="32" Offset="0x5F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_006700" OutName="jyasinboss_room_3Tex_006700" Format="rgba16" Width="64" Height="32" Offset="0x6700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007700" OutName="jyasinboss_room_3Tex_007700" Format="rgba16" Width="32" Height="32" Offset="0x7700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_007F00" OutName="jyasinboss_room_3Tex_007F00" Format="rgba16" Width="16" Height="128" Offset="0x7F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_008F00" OutName="jyasinboss_room_3Tex_008F00" Format="rgba16" Width="64" Height="32" Offset="0x8F00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_009F00" OutName="jyasinboss_room_3Tex_009F00" Format="ci4" Width="64" Height="64" Offset="0x9F00" TlutOffset="0x3EE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00A700" OutName="jyasinboss_room_3Tex_00A700" Format="rgba16" Width="32" Height="32" Offset="0xA700" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3Tex_00AF00" OutName="jyasinboss_room_3Tex_00AF00" Format="rgba16" Width="32" Height="32" Offset="0xAF00" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003CE0" OutName="jyasinboss_room_3TLUT_003CE0" Format="rgba16" Width="16" Height="16" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="jyasinboss_room_3TLUT_003EE0" OutName="jyasinboss_room_3TLUT_003EE0" Format="rgba16" Width="4" Height="4" Offset="0x3EE0" AddedByScript="true"/>
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinzou.xml
new file mode 100644
index 0000000000..bc14a46ac3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/jyasinzou.xml
@@ -0,0 +1,358 @@
+<Root>
+    <File Name="jyasinzou_scene" Segment="2">
+        <Texture Name="jyasinzou_sceneTex_018820" OutName="jyasinzou_sceneTex_018820" Format="ci8" Width="16" Height="16" Offset="0x18840" TlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019120" OutName="jyasinzou_sceneTex_019120" Format="rgba16" Width="16" Height="16" Offset="0x19140" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTex_019320" OutName="jyasinzou_sceneTex_019320" Format="ci4" Width="64" Height="64" Offset="0x19340" TlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017BE0" OutName="jyasinzou_sceneTLUT_017BE0" Format="rgba16" Width="16" Height="16" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017DE0" OutName="jyasinzou_sceneTLUT_017DE0" Format="rgba16" Width="16" Height="16" Offset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_017FE0" OutName="jyasinzou_sceneTLUT_017FE0" Format="rgba16" Width="4" Height="4" Offset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_sceneTLUT_018000" OutName="jyasinzou_sceneTLUT_018000" Format="rgba16" Width="4" Height="4" Offset="0x18020" AddedByScript="true"/>
+        <Path Name="gSpiritTemplePath_004C0" Offset="0x4C0" NumPaths="6"/>
+        <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
+        <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
+        <Scene Name="jyasinzou_scene" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Texture Name="jyasinzou_room_0Tex_00A9D8" OutName="jyasinzou_room_0Tex_00A9D8" Format="ci8" Width="64" Height="32" Offset="0xA928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B1D8" OutName="jyasinzou_room_0Tex_00B1D8" Format="ci8" Width="64" Height="32" Offset="0xB128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00B9D8" OutName="jyasinzou_room_0Tex_00B9D8" Format="ci8" Width="32" Height="64" Offset="0xB928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C1D8" OutName="jyasinzou_room_0Tex_00C1D8" Format="ci8" Width="32" Height="64" Offset="0xC128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00C9D8" OutName="jyasinzou_room_0Tex_00C9D8" Format="ci8" Width="32" Height="64" Offset="0xC928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D1D8" OutName="jyasinzou_room_0Tex_00D1D8" Format="ci8" Width="32" Height="32" Offset="0xD128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00D5D8" OutName="jyasinzou_room_0Tex_00D5D8" Format="ci8" Width="16" Height="128" Offset="0xD528" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00DDD8" OutName="jyasinzou_room_0Tex_00DDD8" Format="ci8" Width="32" Height="32" Offset="0xDD28" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E1D8" OutName="jyasinzou_room_0Tex_00E1D8" Format="ci8" Width="64" Height="32" Offset="0xE128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00E9D8" OutName="jyasinzou_room_0Tex_00E9D8" Format="ci8" Width="64" Height="32" Offset="0xE928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F1D8" OutName="jyasinzou_room_0Tex_00F1D8" Format="ci4" Width="64" Height="64" Offset="0xF128" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_00F9D8" OutName="jyasinzou_room_0Tex_00F9D8" Format="ci4" Width="64" Height="64" Offset="0xF928" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_0Tex_0107E8" OutName="jyasinzou_room_0Tex_0107E8" Format="ia8" Width="64" Height="32" Offset="0x10738" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Texture Name="jyasinzou_room_1Tex_004F48" OutName="jyasinzou_room_1Tex_004F48" Format="ci8" Width="64" Height="32" Offset="0x4EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005748" OutName="jyasinzou_room_1Tex_005748" Format="ci8" Width="32" Height="64" Offset="0x56F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_005F48" OutName="jyasinzou_room_1Tex_005F48" Format="ci8" Width="32" Height="64" Offset="0x5EF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006748" OutName="jyasinzou_room_1Tex_006748" Format="ci8" Width="32" Height="32" Offset="0x66F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_006B48" OutName="jyasinzou_room_1Tex_006B48" Format="ci8" Width="32" Height="64" Offset="0x6AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007348" OutName="jyasinzou_room_1Tex_007348" Format="ci8" Width="64" Height="32" Offset="0x72F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_007B48" OutName="jyasinzou_room_1Tex_007B48" Format="ci8" Width="64" Height="32" Offset="0x7AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008348" OutName="jyasinzou_room_1Tex_008348" Format="ci4" Width="64" Height="64" Offset="0x82F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_1Tex_008B48" OutName="jyasinzou_room_1Tex_008B48" Format="ci4" Width="64" Height="64" Offset="0x8AF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Texture Name="jyasinzou_room_2Tex_0023B0" OutName="jyasinzou_room_2Tex_0023B0" Format="rgba16" Width="32" Height="64" Offset="0x2410" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0033B0" OutName="jyasinzou_room_2Tex_0033B0" Format="ci8" Width="64" Height="32" Offset="0x3410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003BB0" OutName="jyasinzou_room_2Tex_003BB0" Format="rgba16" Width="16" Height="32" Offset="0x3C10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_003FB0" OutName="jyasinzou_room_2Tex_003FB0" Format="rgba16" Width="32" Height="32" Offset="0x4010" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0047B0" OutName="jyasinzou_room_2Tex_0047B0" Format="ci8" Width="32" Height="32" Offset="0x4810" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_004BB0" OutName="jyasinzou_room_2Tex_004BB0" Format="ci8" Width="64" Height="32" Offset="0x4C10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_2Tex_0053B0" OutName="jyasinzou_room_2Tex_0053B0" Format="ci4" Width="64" Height="64" Offset="0x5410" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Texture Name="jyasinzou_room_3Tex_001FC8" OutName="jyasinzou_room_3Tex_001FC8" Format="ci8" Width="32" Height="32" Offset="0x1F48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0023C8" OutName="jyasinzou_room_3Tex_0023C8" Format="ci8" Width="64" Height="32" Offset="0x2348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_002BC8" OutName="jyasinzou_room_3Tex_002BC8" Format="ci4" Width="64" Height="64" Offset="0x2B48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_3Tex_0033C8" OutName="jyasinzou_room_3Tex_0033C8" Format="ci4" Width="64" Height="64" Offset="0x3348" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Texture Name="jyasinzou_room_4Tex_003698" OutName="jyasinzou_room_4Tex_003698" Format="ci8" Width="32" Height="64" Offset="0x3688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_003E98" OutName="jyasinzou_room_4Tex_003E98" Format="ci8" Width="32" Height="64" Offset="0x3E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004698" OutName="jyasinzou_room_4Tex_004698" Format="ci8" Width="32" Height="64" Offset="0x4688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_004E98" OutName="jyasinzou_room_4Tex_004E98" Format="ci8" Width="64" Height="32" Offset="0x4E88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005698" OutName="jyasinzou_room_4Tex_005698" Format="ci8" Width="16" Height="16" Offset="0x5688" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005798" OutName="jyasinzou_room_4Tex_005798" Format="ci8" Width="32" Height="32" Offset="0x5788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_005B98" OutName="jyasinzou_room_4Tex_005B98" Format="ci8" Width="64" Height="32" Offset="0x5B88" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006398" OutName="jyasinzou_room_4Tex_006398" Format="ci8" Width="32" Height="32" Offset="0x6388" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_4Tex_006798" OutName="jyasinzou_room_4Tex_006798" Format="ci4" Width="64" Height="64" Offset="0x6788" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Texture Name="jyasinzou_room_5Tex_00CBC8" OutName="jyasinzou_room_5Tex_00CBC8" Format="ci8" Width="32" Height="32" Offset="0xCAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00CFC8" OutName="jyasinzou_room_5Tex_00CFC8" Format="ci8" Width="64" Height="32" Offset="0xCEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00D7C8" OutName="jyasinzou_room_5Tex_00D7C8" Format="ci8" Width="16" Height="64" Offset="0xD6F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DBC8" OutName="jyasinzou_room_5Tex_00DBC8" Format="ci8" Width="32" Height="32" Offset="0xDAF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00DFC8" OutName="jyasinzou_room_5Tex_00DFC8" Format="ci8" Width="64" Height="32" Offset="0xDEF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00E7C8" OutName="jyasinzou_room_5Tex_00E7C8" Format="rgba16" Width="32" Height="32" Offset="0xE6F8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00EFC8" OutName="jyasinzou_room_5Tex_00EFC8" Format="rgba16" Width="32" Height="16" Offset="0xEEF8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F3C8" OutName="jyasinzou_room_5Tex_00F3C8" Format="ci8" Width="32" Height="32" Offset="0xF2F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00F7C8" OutName="jyasinzou_room_5Tex_00F7C8" Format="ci8" Width="32" Height="64" Offset="0xF6F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_00FFC8" OutName="jyasinzou_room_5Tex_00FFC8" Format="ci8" Width="16" Height="16" Offset="0xFEF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0100C8" OutName="jyasinzou_room_5Tex_0100C8" Format="ci8" Width="64" Height="32" Offset="0xFFF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0108C8" OutName="jyasinzou_room_5Tex_0108C8" Format="ci8" Width="32" Height="32" Offset="0x107F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_010CC8" OutName="jyasinzou_room_5Tex_010CC8" Format="ci8" Width="32" Height="32" Offset="0x10BF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0110C8" OutName="jyasinzou_room_5Tex_0110C8" Format="ci8" Width="32" Height="32" Offset="0x10FF8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0114C8" OutName="jyasinzou_room_5Tex_0114C8" Format="ci8" Width="32" Height="32" Offset="0x113F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0118C8" OutName="jyasinzou_room_5Tex_0118C8" Format="ci8" Width="32" Height="32" Offset="0x117F8" TlutOffset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_011CC8" OutName="jyasinzou_room_5Tex_011CC8" Format="ci4" Width="32" Height="128" Offset="0x11BF8" TlutOffset="0xCAD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0124C8" OutName="jyasinzou_room_5Tex_0124C8" Format="ci8" Width="32" Height="64" Offset="0x123F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_012CC8" OutName="jyasinzou_room_5Tex_012CC8" Format="ci8" Width="64" Height="32" Offset="0x12BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0134C8" OutName="jyasinzou_room_5Tex_0134C8" Format="ci8" Width="32" Height="32" Offset="0x133F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0138C8" OutName="jyasinzou_room_5Tex_0138C8" Format="ci8" Width="32" Height="64" Offset="0x137F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0140C8" OutName="jyasinzou_room_5Tex_0140C8" Format="ci8" Width="64" Height="32" Offset="0x13FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0148C8" OutName="jyasinzou_room_5Tex_0148C8" Format="ci8" Width="64" Height="32" Offset="0x147F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0150C8" OutName="jyasinzou_room_5Tex_0150C8" Format="ci4" Width="64" Height="64" Offset="0x14FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_0158C8" OutName="jyasinzou_room_5Tex_0158C8" Format="ci8" Width="32" Height="32" Offset="0x157F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_015CC8" OutName="jyasinzou_room_5Tex_015CC8" Format="ci4" Width="64" Height="64" Offset="0x15BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_016808" OutName="jyasinzou_room_5Tex_016808" Format="ia8" Width="64" Height="32" Offset="0x16738" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5Tex_017008" OutName="jyasinzou_room_5Tex_017008" Format="rgba16" Width="32" Height="64" Offset="0x16F38" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00C9B0" OutName="jyasinzou_room_5TLUT_00C9B0" Format="rgba16" Width="16" Height="16" Offset="0xC8E0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_5TLUT_00CBA8" OutName="jyasinzou_room_5TLUT_00CBA8" Format="rgba16" Width="4" Height="4" Offset="0xCAD8" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Texture Name="jyasinzou_room_6Tex_002BE8" OutName="jyasinzou_room_6Tex_002BE8" Format="ci8" Width="64" Height="32" Offset="0x2BF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0033E8" OutName="jyasinzou_room_6Tex_0033E8" Format="ci8" Width="32" Height="32" Offset="0x33F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_0037E8" OutName="jyasinzou_room_6Tex_0037E8" Format="ci8" Width="64" Height="32" Offset="0x37F8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_6Tex_003FE8" OutName="jyasinzou_room_6Tex_003FE8" Format="ci8" Width="64" Height="32" Offset="0x3FF8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Texture Name="jyasinzou_room_7Tex_002908" OutName="jyasinzou_room_7Tex_002908" Format="rgba16" Width="32" Height="64" Offset="0x2908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_003908" OutName="jyasinzou_room_7Tex_003908" Format="ci8" Width="64" Height="32" Offset="0x3908" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004108" OutName="jyasinzou_room_7Tex_004108" Format="ci8" Width="64" Height="32" Offset="0x4108" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004908" OutName="jyasinzou_room_7Tex_004908" Format="rgba16" Width="16" Height="32" Offset="0x4908" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_7Tex_004D08" OutName="jyasinzou_room_7Tex_004D08" Format="ci4" Width="64" Height="64" Offset="0x4D08" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Texture Name="jyasinzou_room_8Tex_003A50" OutName="jyasinzou_room_8Tex_003A50" Format="ci8" Width="64" Height="32" Offset="0x3A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004250" OutName="jyasinzou_room_8Tex_004250" Format="ci8" Width="64" Height="32" Offset="0x4210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004A50" OutName="jyasinzou_room_8Tex_004A50" Format="ci8" Width="32" Height="32" Offset="0x4A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_004E50" OutName="jyasinzou_room_8Tex_004E50" Format="rgba16" Width="32" Height="32" Offset="0x4E10" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005650" OutName="jyasinzou_room_8Tex_005650" Format="ci8" Width="32" Height="64" Offset="0x5610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_005E50" OutName="jyasinzou_room_8Tex_005E50" Format="ci8" Width="32" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006250" OutName="jyasinzou_room_8Tex_006250" Format="ci8" Width="32" Height="64" Offset="0x6210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_006A50" OutName="jyasinzou_room_8Tex_006A50" Format="ci8" Width="64" Height="32" Offset="0x6A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_8Tex_007250" OutName="jyasinzou_room_8Tex_007250" Format="ci4" Width="64" Height="64" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Texture Name="jyasinzou_room_9Tex_002DC8" OutName="jyasinzou_room_9Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_003DC8" OutName="jyasinzou_room_9Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0045C8" OutName="jyasinzou_room_9Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_004DC8" OutName="jyasinzou_room_9Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0051C8" OutName="jyasinzou_room_9Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_9Tex_0055C8" OutName="jyasinzou_room_9Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Texture Name="jyasinzou_room_10Tex_0031A0" OutName="jyasinzou_room_10Tex_0031A0" Format="rgba16" Width="32" Height="64" Offset="0x31A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0041A0" OutName="jyasinzou_room_10Tex_0041A0" Format="ci8" Width="64" Height="32" Offset="0x41A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0049A0" OutName="jyasinzou_room_10Tex_0049A0" Format="ci8" Width="64" Height="32" Offset="0x49A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0051A0" OutName="jyasinzou_room_10Tex_0051A0" Format="ci8" Width="64" Height="32" Offset="0x51A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0059A0" OutName="jyasinzou_room_10Tex_0059A0" Format="rgba16" Width="16" Height="32" Offset="0x59A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_005DA0" OutName="jyasinzou_room_10Tex_005DA0" Format="ci8" Width="64" Height="32" Offset="0x5DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0065A0" OutName="jyasinzou_room_10Tex_0065A0" Format="ci8" Width="32" Height="32" Offset="0x65A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0069A0" OutName="jyasinzou_room_10Tex_0069A0" Format="rgba16" Width="64" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_0079A0" OutName="jyasinzou_room_10Tex_0079A0" Format="ci8" Width="64" Height="16" Offset="0x79A0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_10Tex_007DA0" OutName="jyasinzou_room_10Tex_007DA0" Format="ci8" Width="32" Height="32" Offset="0x7DA0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Texture Name="jyasinzou_room_11Tex_000780" OutName="jyasinzou_room_11Tex_000780" Format="ci8" Width="32" Height="32" Offset="0x780" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Texture Name="jyasinzou_room_12Tex_0010D8" OutName="jyasinzou_room_12Tex_0010D8" Format="ci8" Width="64" Height="32" Offset="0x1058" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_12Tex_0018D8" OutName="jyasinzou_room_12Tex_0018D8" Format="ci8" Width="32" Height="64" Offset="0x1858" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Texture Name="jyasinzou_room_13Tex_0028A8" OutName="jyasinzou_room_13Tex_0028A8" Format="ci8" Width="32" Height="64" Offset="0x2848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0030A8" OutName="jyasinzou_room_13Tex_0030A8" Format="ci8" Width="64" Height="32" Offset="0x3048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0038A8" OutName="jyasinzou_room_13Tex_0038A8" Format="ci8" Width="32" Height="32" Offset="0x3848" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_003CA8" OutName="jyasinzou_room_13Tex_003CA8" Format="ci8" Width="64" Height="32" Offset="0x3C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0044A8" OutName="jyasinzou_room_13Tex_0044A8" Format="ci8" Width="64" Height="32" Offset="0x4448" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_004CA8" OutName="jyasinzou_room_13Tex_004CA8" Format="ci8" Width="32" Height="32" Offset="0x4C48" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_13Tex_0050A8" OutName="jyasinzou_room_13Tex_0050A8" Format="ci4" Width="64" Height="64" Offset="0x5048" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Texture Name="jyasinzou_room_14Tex_001CA0" OutName="jyasinzou_room_14Tex_001CA0" Format="ci8" Width="64" Height="32" Offset="0x1C90" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0024A0" OutName="jyasinzou_room_14Tex_0024A0" Format="ci8" Width="32" Height="32" Offset="0x2490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0028A0" OutName="jyasinzou_room_14Tex_0028A0" Format="ci8" Width="64" Height="32" Offset="0x2890" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0030A0" OutName="jyasinzou_room_14Tex_0030A0" Format="ci8" Width="32" Height="32" Offset="0x3090" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0034A0" OutName="jyasinzou_room_14Tex_0034A0" Format="rgba16" Width="32" Height="64" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_14Tex_0044A0" OutName="jyasinzou_room_14Tex_0044A0" Format="ci4" Width="64" Height="64" Offset="0x4490" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Texture Name="jyasinzou_room_15Tex_002FE8" OutName="jyasinzou_room_15Tex_002FE8" Format="rgba16" Width="32" Height="64" Offset="0x2FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_003FE8" OutName="jyasinzou_room_15Tex_003FE8" Format="rgba16" Width="16" Height="32" Offset="0x3FB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0043E8" OutName="jyasinzou_room_15Tex_0043E8" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_004BE8" OutName="jyasinzou_room_15Tex_004BE8" Format="ci8" Width="32" Height="64" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0053E8" OutName="jyasinzou_room_15Tex_0053E8" Format="ci8" Width="64" Height="32" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005BE8" OutName="jyasinzou_room_15Tex_005BE8" Format="ci8" Width="16" Height="16" Offset="0x5BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_005CE8" OutName="jyasinzou_room_15Tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0060E8" OutName="jyasinzou_room_15Tex_0060E8" Format="ci8" Width="64" Height="32" Offset="0x60B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_0068E8" OutName="jyasinzou_room_15Tex_0068E8" Format="ci8" Width="32" Height="32" Offset="0x68B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_006CE8" OutName="jyasinzou_room_15Tex_006CE8" Format="ci4" Width="64" Height="64" Offset="0x6CB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_15Tex_007C98" OutName="jyasinzou_room_15Tex_007C98" Format="rgba16" Width="32" Height="32" Offset="0x7C68" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Texture Name="jyasinzou_room_16Tex_0029B8" OutName="jyasinzou_room_16Tex_0029B8" Format="rgba16" Width="32" Height="64" Offset="0x2988" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0039B8" OutName="jyasinzou_room_16Tex_0039B8" Format="ci8" Width="64" Height="32" Offset="0x3988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0041B8" OutName="jyasinzou_room_16Tex_0041B8" Format="ci8" Width="16" Height="64" Offset="0x4188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0045B8" OutName="jyasinzou_room_16Tex_0045B8" Format="ci8" Width="64" Height="32" Offset="0x4588" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_004DB8" OutName="jyasinzou_room_16Tex_004DB8" Format="rgba16" Width="16" Height="32" Offset="0x4D88" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0051B8" OutName="jyasinzou_room_16Tex_0051B8" Format="ci8" Width="32" Height="64" Offset="0x5188" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_16Tex_0059B8" OutName="jyasinzou_room_16Tex_0059B8" Format="ci4" Width="64" Height="64" Offset="0x5988" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Texture Name="jyasinzou_room_17Tex_005E50" OutName="jyasinzou_room_17Tex_005E50" Format="ci8" Width="64" Height="32" Offset="0x5E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006650" OutName="jyasinzou_room_17Tex_006650" Format="ci8" Width="64" Height="32" Offset="0x6610" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_006E50" OutName="jyasinzou_room_17Tex_006E50" Format="ci8" Width="32" Height="32" Offset="0x6E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007250" OutName="jyasinzou_room_17Tex_007250" Format="ci8" Width="64" Height="32" Offset="0x7210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_007A50" OutName="jyasinzou_room_17Tex_007A50" Format="ci8" Width="64" Height="32" Offset="0x7A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008250" OutName="jyasinzou_room_17Tex_008250" Format="ci4" Width="64" Height="64" Offset="0x8210" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008A50" OutName="jyasinzou_room_17Tex_008A50" Format="ci8" Width="32" Height="32" Offset="0x8A10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_17Tex_008E50" OutName="jyasinzou_room_17Tex_008E50" Format="ci4" Width="64" Height="64" Offset="0x8E10" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Texture Name="jyasinzou_room_18Tex_0020F0" OutName="jyasinzou_room_18Tex_0020F0" Format="ci8" Width="64" Height="32" Offset="0x20C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0028F0" OutName="jyasinzou_room_18Tex_0028F0" Format="ci8" Width="64" Height="32" Offset="0x28C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0030F0" OutName="jyasinzou_room_18Tex_0030F0" Format="ci8" Width="32" Height="32" Offset="0x30C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0034F0" OutName="jyasinzou_room_18Tex_0034F0" Format="rgba16" Width="32" Height="32" Offset="0x34C0" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_003CF0" OutName="jyasinzou_room_18Tex_003CF0" Format="ci8" Width="16" Height="128" Offset="0x3CC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0044F0" OutName="jyasinzou_room_18Tex_0044F0" Format="ci8" Width="32" Height="32" Offset="0x44C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0048F0" OutName="jyasinzou_room_18Tex_0048F0" Format="ci8" Width="32" Height="32" Offset="0x48C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_18Tex_0054E0" OutName="jyasinzou_room_18Tex_0054E0" Format="rgba16" Width="32" Height="32" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Texture Name="jyasinzou_room_19Tex_002DC8" OutName="jyasinzou_room_19Tex_002DC8" Format="rgba16" Width="32" Height="64" Offset="0x2DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_003DC8" OutName="jyasinzou_room_19Tex_003DC8" Format="ci8" Width="64" Height="32" Offset="0x3DD8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0045C8" OutName="jyasinzou_room_19Tex_0045C8" Format="ci8" Width="64" Height="32" Offset="0x45D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_004DC8" OutName="jyasinzou_room_19Tex_004DC8" Format="rgba16" Width="16" Height="32" Offset="0x4DD8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0051C8" OutName="jyasinzou_room_19Tex_0051C8" Format="ci8" Width="64" Height="16" Offset="0x51D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_19Tex_0055C8" OutName="jyasinzou_room_19Tex_0055C8" Format="ci8" Width="64" Height="32" Offset="0x55D8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Texture Name="jyasinzou_room_20Tex_0031B8" OutName="jyasinzou_room_20Tex_0031B8" Format="rgba16" Width="32" Height="64" Offset="0x31B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0041B8" OutName="jyasinzou_room_20Tex_0041B8" Format="ci8" Width="64" Height="32" Offset="0x41B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0049B8" OutName="jyasinzou_room_20Tex_0049B8" Format="ci8" Width="64" Height="32" Offset="0x49B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0051B8" OutName="jyasinzou_room_20Tex_0051B8" Format="ci8" Width="64" Height="32" Offset="0x51B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0059B8" OutName="jyasinzou_room_20Tex_0059B8" Format="rgba16" Width="16" Height="32" Offset="0x59B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_005DB8" OutName="jyasinzou_room_20Tex_005DB8" Format="ci8" Width="64" Height="32" Offset="0x5DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0065B8" OutName="jyasinzou_room_20Tex_0065B8" Format="ci8" Width="32" Height="32" Offset="0x65B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0069B8" OutName="jyasinzou_room_20Tex_0069B8" Format="rgba16" Width="64" Height="32" Offset="0x69B8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_0079B8" OutName="jyasinzou_room_20Tex_0079B8" Format="ci8" Width="64" Height="16" Offset="0x79B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_20Tex_007DB8" OutName="jyasinzou_room_20Tex_007DB8" Format="ci8" Width="32" Height="32" Offset="0x7DB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Texture Name="jyasinzou_room_21Tex_001660" OutName="jyasinzou_room_21Tex_001660" Format="rgba16" Width="32" Height="64" Offset="0x1650" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002660" OutName="jyasinzou_room_21Tex_002660" Format="ci8" Width="64" Height="32" Offset="0x2650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_002E60" OutName="jyasinzou_room_21Tex_002E60" Format="rgba16" Width="16" Height="32" Offset="0x2E50" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003260" OutName="jyasinzou_room_21Tex_003260" Format="ci8" Width="32" Height="32" Offset="0x3250" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003660" OutName="jyasinzou_room_21Tex_003660" Format="ci8" Width="64" Height="32" Offset="0x3650" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_21Tex_003E60" OutName="jyasinzou_room_21Tex_003E60" Format="ci4" Width="64" Height="64" Offset="0x3E50" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Texture Name="jyasinzou_room_22Tex_001468" OutName="jyasinzou_room_22Tex_001468" Format="ci8" Width="64" Height="32" Offset="0x14C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_001C68" OutName="jyasinzou_room_22Tex_001C68" Format="ci8" Width="32" Height="64" Offset="0x1CC8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002468" OutName="jyasinzou_room_22Tex_002468" Format="ci8" Width="32" Height="32" Offset="0x24C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_22Tex_002868" OutName="jyasinzou_room_22Tex_002868" Format="ci4" Width="64" Height="64" Offset="0x28C8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Texture Name="jyasinzou_room_23Tex_004438" OutName="jyasinzou_room_23Tex_004438" Format="ci8" Width="32" Height="64" Offset="0x43B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_004C38" OutName="jyasinzou_room_23Tex_004C38" Format="ci8" Width="64" Height="32" Offset="0x4BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005438" OutName="jyasinzou_room_23Tex_005438" Format="ci8" Width="16" Height="64" Offset="0x53B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_005838" OutName="jyasinzou_room_23Tex_005838" Format="ci8" Width="64" Height="32" Offset="0x57B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006038" OutName="jyasinzou_room_23Tex_006038" Format="ci8" Width="32" Height="32" Offset="0x5FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006438" OutName="jyasinzou_room_23Tex_006438" Format="ci8" Width="16" Height="128" Offset="0x63B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_006C38" OutName="jyasinzou_room_23Tex_006C38" Format="rgba16" Width="32" Height="32" Offset="0x6BB8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007438" OutName="jyasinzou_room_23Tex_007438" Format="ci8" Width="64" Height="32" Offset="0x73B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_007C38" OutName="jyasinzou_room_23Tex_007C38" Format="ci8" Width="32" Height="32" Offset="0x7BB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008038" OutName="jyasinzou_room_23Tex_008038" Format="ci8" Width="64" Height="32" Offset="0x7FB8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_23Tex_008838" OutName="jyasinzou_room_23Tex_008838" Format="ci4" Width="64" Height="64" Offset="0x87B8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Texture Name="jyasinzou_room_24Tex_001B38" OutName="jyasinzou_room_24Tex_001B38" Format="rgba16" Width="32" Height="64" Offset="0x1B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_002B38" OutName="jyasinzou_room_24Tex_002B38" Format="ci8" Width="64" Height="32" Offset="0x2B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003338" OutName="jyasinzou_room_24Tex_003338" Format="ci8" Width="64" Height="32" Offset="0x3318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003B38" OutName="jyasinzou_room_24Tex_003B38" Format="rgba16" Width="16" Height="32" Offset="0x3B18" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_003F38" OutName="jyasinzou_room_24Tex_003F38" Format="ci8" Width="32" Height="32" Offset="0x3F18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004338" OutName="jyasinzou_room_24Tex_004338" Format="ci8" Width="64" Height="32" Offset="0x4318" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_004B38" OutName="jyasinzou_room_24Tex_004B38" Format="ci4" Width="64" Height="64" Offset="0x4B18" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_24Tex_0054D0" OutName="jyasinzou_room_24Tex_0054D0" Format="rgba16" Width="32" Height="64" Offset="0x54B0" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Texture Name="jyasinzou_room_25Tex_00BA98" OutName="jyasinzou_room_25Tex_00BA98" Format="rgba16" Width="16" Height="32" Offset="0xBA68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00BE98" OutName="jyasinzou_room_25Tex_00BE98" Format="rgba16" Width="32" Height="64" Offset="0xBE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00CE98" OutName="jyasinzou_room_25Tex_00CE98" Format="ci8" Width="32" Height="64" Offset="0xCE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00D698" OutName="jyasinzou_room_25Tex_00D698" Format="ci8" Width="16" Height="64" Offset="0xD668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DA98" OutName="jyasinzou_room_25Tex_00DA98" Format="ci8" Width="32" Height="32" Offset="0xDA68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00DE98" OutName="jyasinzou_room_25Tex_00DE98" Format="ci8" Width="32" Height="64" Offset="0xDE68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00E698" OutName="jyasinzou_room_25Tex_00E698" Format="ci8" Width="64" Height="32" Offset="0xE668" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00EE98" OutName="jyasinzou_room_25Tex_00EE98" Format="rgba16" Width="32" Height="16" Offset="0xEE68" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F298" OutName="jyasinzou_room_25Tex_00F298" Format="ci8" Width="32" Height="32" Offset="0xF268" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00F698" OutName="jyasinzou_room_25Tex_00F698" Format="ci8" Width="32" Height="64" Offset="0xF668" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FE98" OutName="jyasinzou_room_25Tex_00FE98" Format="ci8" Width="16" Height="16" Offset="0xFE68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_00FF98" OutName="jyasinzou_room_25Tex_00FF98" Format="ci8" Width="32" Height="32" Offset="0xFF68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010398" OutName="jyasinzou_room_25Tex_010398" Format="ci8" Width="32" Height="32" Offset="0x10368" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010798" OutName="jyasinzou_room_25Tex_010798" Format="ci8" Width="32" Height="32" Offset="0x10768" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010B98" OutName="jyasinzou_room_25Tex_010B98" Format="ci8" Width="32" Height="32" Offset="0x10B68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_010F98" OutName="jyasinzou_room_25Tex_010F98" Format="ci8" Width="32" Height="32" Offset="0x10F68" TlutOffset="0xB870" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011398" OutName="jyasinzou_room_25Tex_011398" Format="ci8" Width="32" Height="32" Offset="0x11368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011798" OutName="jyasinzou_room_25Tex_011798" Format="ci8" Width="16" Height="128" Offset="0x11768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_011F98" OutName="jyasinzou_room_25Tex_011F98" Format="ci8" Width="64" Height="32" Offset="0x11F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012798" OutName="jyasinzou_room_25Tex_012798" Format="ci8" Width="32" Height="32" Offset="0x12768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_012B98" OutName="jyasinzou_room_25Tex_012B98" Format="ci8" Width="32" Height="64" Offset="0x12B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013398" OutName="jyasinzou_room_25Tex_013398" Format="ci8" Width="64" Height="32" Offset="0x13368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_013B98" OutName="jyasinzou_room_25Tex_013B98" Format="ci8" Width="64" Height="32" Offset="0x13B68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014398" OutName="jyasinzou_room_25Tex_014398" Format="ci8" Width="32" Height="32" Offset="0x14368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014798" OutName="jyasinzou_room_25Tex_014798" Format="ci4" Width="64" Height="64" Offset="0x14768" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_014F98" OutName="jyasinzou_room_25Tex_014F98" Format="ci8" Width="32" Height="32" Offset="0x14F68" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25Tex_015398" OutName="jyasinzou_room_25Tex_015398" Format="ci4" Width="64" Height="64" Offset="0x15368" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_25TLUT_00B8A0" OutName="jyasinzou_room_25TLUT_00B8A0" Format="rgba16" Width="16" Height="16" Offset="0xB870" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Texture Name="jyasinzou_room_26Tex_006CC8" OutName="jyasinzou_room_26Tex_006CC8" Format="rgba16" Width="16" Height="32" Offset="0x6CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0070C8" OutName="jyasinzou_room_26Tex_0070C8" Format="rgba16" Width="32" Height="64" Offset="0x70E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0080C8" OutName="jyasinzou_room_26Tex_0080C8" Format="rgba16" Width="16" Height="16" Offset="0x80E8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0082C8" OutName="jyasinzou_room_26Tex_0082C8" Format="ci8" Width="32" Height="64" Offset="0x82E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008AC8" OutName="jyasinzou_room_26Tex_008AC8" Format="ci8" Width="16" Height="32" Offset="0x8AE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_008CC8" OutName="jyasinzou_room_26Tex_008CC8" Format="ci8" Width="32" Height="64" Offset="0x8CE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_0094C8" OutName="jyasinzou_room_26Tex_0094C8" Format="ci8" Width="64" Height="32" Offset="0x94E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_009CC8" OutName="jyasinzou_room_26Tex_009CC8" Format="rgba16" Width="16" Height="32" Offset="0x9CE8" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A0C8" OutName="jyasinzou_room_26Tex_00A0C8" Format="ci8" Width="16" Height="128" Offset="0xA0E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00A8C8" OutName="jyasinzou_room_26Tex_00A8C8" Format="ci8" Width="32" Height="32" Offset="0xA8E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00ACC8" OutName="jyasinzou_room_26Tex_00ACC8" Format="ci4" Width="64" Height="64" Offset="0xACE8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00B4C8" OutName="jyasinzou_room_26Tex_00B4C8" Format="ci4" Width="64" Height="64" Offset="0xB4E8" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18020" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_26Tex_00C2F8" OutName="jyasinzou_room_26Tex_00C2F8" Format="ia16" Width="32" Height="32" Offset="0xC318" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Texture Name="jyasinzou_room_27Tex_004310" OutName="jyasinzou_room_27Tex_004310" Format="ci8" Width="32" Height="64" Offset="0x42C0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004B10" OutName="jyasinzou_room_27Tex_004B10" Format="ci8" Width="32" Height="32" Offset="0x4AC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_27Tex_004F10" OutName="jyasinzou_room_27Tex_004F10" Format="ci8" Width="64" Height="32" Offset="0x4EC0" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17C00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
+    </File>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Texture Name="jyasinzou_room_28Tex_004130" OutName="jyasinzou_room_28Tex_004130" Format="ci8" Width="64" Height="32" Offset="0x4120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_004930" OutName="jyasinzou_room_28Tex_004930" Format="ci8" Width="64" Height="32" Offset="0x4920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005130" OutName="jyasinzou_room_28Tex_005130" Format="ci8" Width="64" Height="32" Offset="0x5120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_005930" OutName="jyasinzou_room_28Tex_005930" Format="ci8" Width="64" Height="32" Offset="0x5920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006130" OutName="jyasinzou_room_28Tex_006130" Format="ci8" Width="32" Height="32" Offset="0x6120" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_006530" OutName="jyasinzou_room_28Tex_006530" Format="rgba16" Width="64" Height="32" Offset="0x6520" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007530" OutName="jyasinzou_room_28Tex_007530" Format="ci8" Width="64" Height="16" Offset="0x7520" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007930" OutName="jyasinzou_room_28Tex_007930" Format="ci8" Width="16" Height="16" Offset="0x7920" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007A30" OutName="jyasinzou_room_28Tex_007A30" Format="ci8" Width="16" Height="64" Offset="0x7A20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_007E30" OutName="jyasinzou_room_28Tex_007E30" Format="ci4" Width="64" Height="64" Offset="0x7E20" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x18000" AddedByScript="true"/>
+        <Texture Name="jyasinzou_room_28Tex_008630" OutName="jyasinzou_room_28Tex_008630" Format="ci8" Width="32" Height="32" Offset="0x8620" ExternalTlut="jyasinzou_scene" ExternalTlutOffset="0x17E00" AddedByScript="true"/>
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/men.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/men.xml
new file mode 100644
index 0000000000..d9e5960e82
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/men.xml
@@ -0,0 +1,127 @@
+<Root>
+    <File Name="men_scene" Segment="2">
+        <Texture Name="men_sceneTex_0108C0" OutName="men_sceneTex_0108C0" Format="ci8" Width="32" Height="32" Offset="0x10930" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTex_010CC0" OutName="men_sceneTex_010CC0" Format="ci8" Width="64" Height="32" Offset="0x10D30" TlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_sceneTLUT_00F6C0" OutName="men_sceneTLUT_00F6C0" Format="rgba16" Width="16" Height="16" Offset="0xF730" AddedByScript="true"/>
+        <Path Name="gGTGPath_002F0" Offset="0x2F0" NumPaths="2"/>
+        <Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF930"/>
+        <Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x10130"/>
+        <Scene Name="men_scene" Offset="0x0"/>
+    </File>
+    <File Name="men_room_0" Segment="3">
+        <Texture Name="men_room_0Tex_008138" OutName="men_room_0Tex_008138" Format="ci8" Width="64" Height="32" Offset="0x8138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_008938" OutName="men_room_0Tex_008938" Format="ci8" Width="32" Height="64" Offset="0x8938" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009138" OutName="men_room_0Tex_009138" Format="ci8" Width="32" Height="32" Offset="0x9138" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009538" OutName="men_room_0Tex_009538" Format="rgba16" Width="32" Height="32" Offset="0x9538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_009D38" OutName="men_room_0Tex_009D38" Format="ci8" Width="32" Height="64" Offset="0x9D38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00A538" OutName="men_room_0Tex_00A538" Format="ia8" Width="64" Height="64" Offset="0xA538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00B538" OutName="men_room_0Tex_00B538" Format="ci8" Width="32" Height="64" Offset="0xB538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00BD38" OutName="men_room_0Tex_00BD38" Format="ci8" Width="64" Height="32" Offset="0xBD38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00C538" OutName="men_room_0Tex_00C538" Format="i4" Width="64" Height="128" Offset="0xC538" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00D538" OutName="men_room_0Tex_00D538" Format="ci8" Width="64" Height="32" Offset="0xD538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00DD38" OutName="men_room_0Tex_00DD38" Format="rgba16" Width="16" Height="128" Offset="0xDD38" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00ED38" OutName="men_room_0Tex_00ED38" Format="ci8" Width="64" Height="32" Offset="0xED38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_0Tex_00F538" OutName="men_room_0Tex_00F538" Format="ci8" Width="64" Height="32" Offset="0xF538" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
+    </File>
+    <File Name="men_room_1" Segment="3">
+        <Texture Name="men_room_1Tex_004270" OutName="men_room_1Tex_004270" Format="rgba16" Width="32" Height="32" Offset="0x4290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_004A70" OutName="men_room_1Tex_004A70" Format="ci8" Width="64" Height="32" Offset="0x4A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005270" OutName="men_room_1Tex_005270" Format="ci8" Width="32" Height="64" Offset="0x5290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_005A70" OutName="men_room_1Tex_005A70" Format="ci8" Width="64" Height="32" Offset="0x5A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006270" OutName="men_room_1Tex_006270" Format="rgba16" Width="32" Height="32" Offset="0x6290" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_006A70" OutName="men_room_1Tex_006A70" Format="rgba16" Width="32" Height="32" Offset="0x6A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007270" OutName="men_room_1Tex_007270" Format="ci8" Width="64" Height="32" Offset="0x7290" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_007A70" OutName="men_room_1Tex_007A70" Format="rgba16" Width="16" Height="128" Offset="0x7A90" AddedByScript="true"/>
+        <Texture Name="men_room_1Tex_008A70" OutName="men_room_1Tex_008A70" Format="ci8" Width="64" Height="32" Offset="0x8A90" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_1" Offset="0x0"/>
+    </File>
+    <File Name="men_room_2" Segment="3">
+        <Texture Name="men_room_2Tex_003C48" OutName="men_room_2Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004448" OutName="men_room_2Tex_004448" Format="ci8" Width="64" Height="32" Offset="0x4378" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_2Tex_004C48" OutName="men_room_2Tex_004C48" Format="ci8" Width="32" Height="32" Offset="0x4B78" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_2" Offset="0x0"/>
+    </File>
+    <File Name="men_room_3" Segment="3">
+        <Texture Name="men_room_3Tex_003850" OutName="men_room_3Tex_003850" Format="ci8" Width="64" Height="32" Offset="0x3820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004050" OutName="men_room_3Tex_004050" Format="ci8" Width="64" Height="32" Offset="0x4020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_004850" OutName="men_room_3Tex_004850" Format="ci8" Width="32" Height="64" Offset="0x4820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005050" OutName="men_room_3Tex_005050" Format="ci8" Width="64" Height="32" Offset="0x5020" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005850" OutName="men_room_3Tex_005850" Format="ci8" Width="32" Height="32" Offset="0x5820" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_005C50" OutName="men_room_3Tex_005C50" Format="ci8" Width="64" Height="32" Offset="0x5C20" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_006450" OutName="men_room_3Tex_006450" Format="rgba16" Width="16" Height="128" Offset="0x6420" AddedByScript="true"/>
+        <Texture Name="men_room_3Tex_007450" OutName="men_room_3Tex_007450" Format="ci8" Width="64" Height="32" Offset="0x7420" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_3" Offset="0x0"/>
+    </File>
+    <File Name="men_room_4" Segment="3">
+        <Texture Name="men_room_4Tex_0051E0" OutName="men_room_4Tex_0051E0" Format="rgba16" Width="32" Height="32" Offset="0x5150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0059E0" OutName="men_room_4Tex_0059E0" Format="rgba16" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0061E0" OutName="men_room_4Tex_0061E0" Format="i4" Width="128" Height="64" Offset="0x6150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0071E0" OutName="men_room_4Tex_0071E0" Format="i4" Width="64" Height="128" Offset="0x7150" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0081E0" OutName="men_room_4Tex_0081E0" Format="ci8" Width="32" Height="64" Offset="0x8150" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0089E0" OutName="men_room_4Tex_0089E0" Format="i4" Width="64" Height="128" Offset="0x8950" AddedByScript="true"/>
+        <Texture Name="men_room_4Tex_0099E0" OutName="men_room_4Tex_0099E0" Format="ci8" Width="64" Height="32" Offset="0x9950" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_4" Offset="0x0"/>
+    </File>
+    <File Name="men_room_5" Segment="3">
+        <Texture Name="men_room_5Tex_002418" OutName="men_room_5Tex_002418" Format="ci8" Width="64" Height="32" Offset="0x24D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_002C18" OutName="men_room_5Tex_002C18" Format="ci8" Width="32" Height="32" Offset="0x2CD8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003018" OutName="men_room_5Tex_003018" Format="ci8" Width="32" Height="64" Offset="0x30D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_003818" OutName="men_room_5Tex_003818" Format="ci8" Width="64" Height="32" Offset="0x38D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004018" OutName="men_room_5Tex_004018" Format="ci8" Width="64" Height="32" Offset="0x40D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_5Tex_004818" OutName="men_room_5Tex_004818" Format="ci8" Width="64" Height="32" Offset="0x48D8" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_5" Offset="0x0"/>
+    </File>
+    <File Name="men_room_6" Segment="3">
+        <Texture Name="men_room_6Tex_003F78" OutName="men_room_6Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F38" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004778" OutName="men_room_6Tex_004778" Format="ci8" Width="32" Height="64" Offset="0x4738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_004F78" OutName="men_room_6Tex_004F78" Format="ci8" Width="32" Height="32" Offset="0x4F38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005378" OutName="men_room_6Tex_005378" Format="rgba16" Width="32" Height="32" Offset="0x5338" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_005B78" OutName="men_room_6Tex_005B78" Format="ci8" Width="32" Height="64" Offset="0x5B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006378" OutName="men_room_6Tex_006378" Format="ci8" Width="32" Height="64" Offset="0x6338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_006B78" OutName="men_room_6Tex_006B78" Format="ci8" Width="64" Height="32" Offset="0x6B38" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007378" OutName="men_room_6Tex_007378" Format="ci8" Width="32" Height="32" Offset="0x7338" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_6Tex_007778" OutName="men_room_6Tex_007778" Format="ci8" Width="64" Height="32" Offset="0x7738" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_6" Offset="0x0"/>
+    </File>
+    <File Name="men_room_7" Segment="3">
+        <Texture Name="men_room_7Tex_0036B8" OutName="men_room_7Tex_0036B8" Format="ci8" Width="32" Height="32" Offset="0x3728" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_003AB8" OutName="men_room_7Tex_003AB8" Format="ci8" Width="64" Height="32" Offset="0x3B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0042B8" OutName="men_room_7Tex_0042B8" Format="ci8" Width="32" Height="64" Offset="0x4328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_004AB8" OutName="men_room_7Tex_004AB8" Format="rgba16" Width="32" Height="32" Offset="0x4B28" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0052B8" OutName="men_room_7Tex_0052B8" Format="ci8" Width="64" Height="32" Offset="0x5328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_005AB8" OutName="men_room_7Tex_005AB8" Format="ci8" Width="64" Height="32" Offset="0x5B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0062B8" OutName="men_room_7Tex_0062B8" Format="rgba16" Width="16" Height="128" Offset="0x6328" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_0072B8" OutName="men_room_7Tex_0072B8" Format="ci8" Width="64" Height="32" Offset="0x7328" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_7Tex_007AB8" OutName="men_room_7Tex_007AB8" Format="ci8" Width="64" Height="32" Offset="0x7B28" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_7" Offset="0x0"/>
+    </File>
+    <File Name="men_room_8" Segment="3">
+        <Texture Name="men_room_8Tex_005D30" OutName="men_room_8Tex_005D30" Format="rgba16" Width="16" Height="64" Offset="0x5D10" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006530" OutName="men_room_8Tex_006530" Format="rgba16" Width="32" Height="32" Offset="0x6510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_006D30" OutName="men_room_8Tex_006D30" Format="ci8" Width="32" Height="64" Offset="0x6D10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007530" OutName="men_room_8Tex_007530" Format="rgba16" Width="8" Height="16" Offset="0x7510" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007630" OutName="men_room_8Tex_007630" Format="rgba16" Width="32" Height="32" Offset="0x7610" AddedByScript="true"/>
+        <Texture Name="men_room_8Tex_007E30" OutName="men_room_8Tex_007E30" Format="ci8" Width="32" Height="32" Offset="0x7E10" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_8" Offset="0x0"/>
+    </File>
+    <File Name="men_room_9" Segment="3">
+        <Texture Name="men_room_9Tex_001AB0" OutName="men_room_9Tex_001AB0" Format="rgba16" Width="32" Height="32" Offset="0x1B30" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0022B0" OutName="men_room_9Tex_0022B0" Format="ci8" Width="32" Height="32" Offset="0x2330" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_0026B0" OutName="men_room_9Tex_0026B0" Format="ci8" Width="64" Height="32" Offset="0x2730" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_9Tex_003070" OutName="men_room_9Tex_003070" Format="rgba16" Width="32" Height="32" Offset="0x30F0" AddedByScript="true"/>
+        <Room Name="men_room_9" Offset="0x0"/>
+    </File>
+    <File Name="men_room_10" Segment="3">
+        <Texture Name="men_room_10Tex_002448" OutName="men_room_10Tex_002448" Format="ci8" Width="64" Height="32" Offset="0x2458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_002C48" OutName="men_room_10Tex_002C48" Format="rgba16" Width="32" Height="32" Offset="0x2C58" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003448" OutName="men_room_10Tex_003448" Format="ci8" Width="32" Height="64" Offset="0x3458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_003C48" OutName="men_room_10Tex_003C48" Format="ci8" Width="64" Height="32" Offset="0x3C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004448" OutName="men_room_10Tex_004448" Format="rgba16" Width="32" Height="32" Offset="0x4458" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_004C48" OutName="men_room_10Tex_004C48" Format="ci8" Width="32" Height="64" Offset="0x4C58" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Texture Name="men_room_10Tex_005448" OutName="men_room_10Tex_005448" Format="ci8" Width="64" Height="32" Offset="0x5458" ExternalTlut="men_scene" ExternalTlutOffset="0xF730" AddedByScript="true"/>
+        <Room Name="men_room_10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/moribossroom.xml
new file mode 100644
index 0000000000..b9959eefab
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/moribossroom.xml
@@ -0,0 +1,33 @@
+<Root>
+    <File Name="moribossroom_scene" Segment="2">
+        <Texture Name="moribossroom_sceneTex_000CF8" OutName="moribossroom_sceneTex_000CF8" Format="ci8" Width="32" Height="32" Offset="0xCF8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTex_0010F8" OutName="moribossroom_sceneTex_0010F8" Format="ci8" Width="32" Height="64" Offset="0x10F8" TlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_sceneTLUT_000B50" OutName="moribossroom_sceneTLUT_000B50" Format="rgba16" Width="16" Height="16" Offset="0xB50" AddedByScript="true"/>
+        <Scene Name="moribossroom_scene" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Texture Name="moribossroom_room_0Tex_0038B8" OutName="moribossroom_room_0Tex_0038B8" Format="rgba16" Width="32" Height="32" Offset="0x38B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0040B8" OutName="moribossroom_room_0Tex_0040B8" Format="ci8" Width="32" Height="32" Offset="0x40B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0044B8" OutName="moribossroom_room_0Tex_0044B8" Format="rgba16" Width="64" Height="32" Offset="0x44B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0054B8" OutName="moribossroom_room_0Tex_0054B8" Format="rgba16" Width="16" Height="16" Offset="0x54B8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_0Tex_0056B8" OutName="moribossroom_room_0Tex_0056B8" Format="ci8" Width="32" Height="64" Offset="0x56B8" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
+    </File>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Texture Name="moribossroom_room_1Tex_006A20" OutName="moribossroom_room_1Tex_006A20" Format="rgba16" Width="32" Height="64" Offset="0x6A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_007A20" OutName="moribossroom_room_1Tex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_008A20" OutName="moribossroom_room_1Tex_008A20" Format="rgba16" Width="64" Height="32" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009A20" OutName="moribossroom_room_1Tex_009A20" Format="rgba16" Width="8" Height="16" Offset="0x9A20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009B20" OutName="moribossroom_room_1Tex_009B20" Format="rgba16" Width="16" Height="16" Offset="0x9B20" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_009D20" OutName="moribossroom_room_1Tex_009D20" Format="ci8" Width="32" Height="64" Offset="0x9D20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00A520" OutName="moribossroom_room_1Tex_00A520" Format="ci8" Width="64" Height="32" Offset="0xA520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00AD20" OutName="moribossroom_room_1Tex_00AD20" Format="ci8" Width="64" Height="32" Offset="0xAD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00B520" OutName="moribossroom_room_1Tex_00B520" Format="ci8" Width="64" Height="32" Offset="0xB520" ExternalTlut="moribossroom_scene" ExternalTlutOffset="0xB50" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00BD20" OutName="moribossroom_room_1Tex_00BD20" Format="ci8" Width="32" Height="64" Offset="0xBD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00C520" OutName="moribossroom_room_1Tex_00C520" Format="ci8" Width="64" Height="32" Offset="0xC520" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00CD20" OutName="moribossroom_room_1Tex_00CD20" Format="ci8" Width="64" Height="32" Offset="0xCD20" TlutOffset="0x6828" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1Tex_00D6A8" OutName="moribossroom_room_1Tex_00D6A8" Format="rgba16" Width="16" Height="32" Offset="0xD6A8" AddedByScript="true"/>
+        <Texture Name="moribossroom_room_1TLUT_006828" OutName="moribossroom_room_1TLUT_006828" Format="rgba16" Width="16" Height="16" Offset="0x6828" AddedByScript="true"/>
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan.xml
new file mode 100644
index 0000000000..aed7d26604
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan.xml
@@ -0,0 +1,157 @@
+<Root>
+    <File Name="ydan_scene" Segment="2">
+        <Texture Name="ydan_sceneTLUT_00B810" OutName="ydan_sceneTLUT_00B810" Format="rgba16" Width="16" Height="16" Offset="0xB800" AddedByScript="true"/>
+        <Cutscene Name="gDekuTreeIntroCs" Offset="0xB640"/>
+        <Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA08"/>
+        <Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA08"/>
+
+        <Scene Name="ydan_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_0" Segment="3">
+        <Texture Name="ydan_room_0Tex_0071C0" OutName="ydan_room_0Tex_0071C0" Format="rgba16" Width="32" Height="64" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0081C0" OutName="ydan_room_0Tex_0081C0" Format="rgba16" Width="32" Height="64" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0091C0" OutName="ydan_room_0Tex_0091C0" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0099C0" OutName="ydan_room_0Tex_0099C0" Format="ci8" Width="32" Height="64" Offset="0x9960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A1C0" OutName="ydan_room_0Tex_00A1C0" Format="ci8" Width="32" Height="32" Offset="0xA160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00A5C0" OutName="ydan_room_0Tex_00A5C0" Format="ci8" Width="32" Height="64" Offset="0xA560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00ADC0" OutName="ydan_room_0Tex_00ADC0" Format="ci8" Width="32" Height="64" Offset="0xAD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00B5C0" OutName="ydan_room_0Tex_00B5C0" Format="ci8" Width="32" Height="64" Offset="0xB560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00BDC0" OutName="ydan_room_0Tex_00BDC0" Format="rgba16" Width="32" Height="32" Offset="0xBD60" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00C5C0" OutName="ydan_room_0Tex_00C5C0" Format="ci8" Width="32" Height="64" Offset="0xC560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00CDC0" OutName="ydan_room_0Tex_00CDC0" Format="ci8" Width="32" Height="64" Offset="0xCD60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D5C0" OutName="ydan_room_0Tex_00D5C0" Format="ci8" Width="32" Height="32" Offset="0xD560" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00D9C0" OutName="ydan_room_0Tex_00D9C0" Format="ci8" Width="32" Height="64" Offset="0xD960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E1C0" OutName="ydan_room_0Tex_00E1C0" Format="ci8" Width="32" Height="64" Offset="0xE160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00E9C0" OutName="ydan_room_0Tex_00E9C0" Format="ci8" Width="32" Height="64" Offset="0xE960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F1C0" OutName="ydan_room_0Tex_00F1C0" Format="ci8" Width="32" Height="64" Offset="0xF160" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_00F9C0" OutName="ydan_room_0Tex_00F9C0" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_0109C0" OutName="ydan_room_0Tex_0109C0" Format="ci8" Width="32" Height="64" Offset="0x10960" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_012F48" OutName="ydan_room_0Tex_012F48" Format="rgba16" Width="32" Height="64" Offset="0x12EE8" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_013F48" OutName="ydan_room_0Tex_013F48" Format="ci8" Width="32" Height="32" Offset="0x13EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_0Tex_014348" OutName="ydan_room_0Tex_014348" Format="ia16" Width="32" Height="64" Offset="0x142E8" AddedByScript="true"/>
+        <Room Name="ydan_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_1" Segment="3">
+        <Texture Name="ydan_room_1Tex_000F98" OutName="ydan_room_1Tex_000F98" Format="ci8" Width="32" Height="64" Offset="0xEE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001798" OutName="ydan_room_1Tex_001798" Format="ci8" Width="32" Height="64" Offset="0x16E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_001F98" OutName="ydan_room_1Tex_001F98" Format="ci8" Width="32" Height="64" Offset="0x1EE8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_002798" OutName="ydan_room_1Tex_002798" Format="ci8" Width="32" Height="64" Offset="0x26E8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_1Tex_003200" OutName="ydan_room_1Tex_003200" Format="ia16" Width="32" Height="64" Offset="0x3150" AddedByScript="true"/>
+        <Room Name="ydan_room_1" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_2" Segment="3">
+        <Texture Name="ydan_room_2Tex_001D08" OutName="ydan_room_2Tex_001D08" Format="ci8" Width="32" Height="64" Offset="0x1C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002508" OutName="ydan_room_2Tex_002508" Format="ci8" Width="32" Height="64" Offset="0x2408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_002D08" OutName="ydan_room_2Tex_002D08" Format="ci8" Width="32" Height="64" Offset="0x2C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003508" OutName="ydan_room_2Tex_003508" Format="ci8" Width="32" Height="64" Offset="0x3408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_003D08" OutName="ydan_room_2Tex_003D08" Format="ci8" Width="32" Height="64" Offset="0x3C08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004508" OutName="ydan_room_2Tex_004508" Format="ci8" Width="32" Height="64" Offset="0x4408" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_2Tex_004F28" OutName="ydan_room_2Tex_004F28" Format="rgba16" Width="32" Height="64" Offset="0x4E28" AddedByScript="true"/>
+        <Room Name="ydan_room_2" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_3" Segment="3">
+        <Texture Name="ydan_room_3Tex_0074C0" OutName="ydan_room_3Tex_0074C0" Format="rgba16" Width="32" Height="64" Offset="0x74B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0084C0" OutName="ydan_room_3Tex_0084C0" Format="ci8" Width="32" Height="64" Offset="0x84B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_008CC0" OutName="ydan_room_3Tex_008CC0" Format="ci8" Width="32" Height="64" Offset="0x8CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0094C0" OutName="ydan_room_3Tex_0094C0" Format="ci8" Width="32" Height="64" Offset="0x94B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_009CC0" OutName="ydan_room_3Tex_009CC0" Format="ci8" Width="32" Height="32" Offset="0x9CB0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A0C0" OutName="ydan_room_3Tex_00A0C0" Format="ci8" Width="32" Height="64" Offset="0xA0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00A8C0" OutName="ydan_room_3Tex_00A8C0" Format="ci8" Width="64" Height="32" Offset="0xA8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B0C0" OutName="ydan_room_3Tex_00B0C0" Format="ci8" Width="32" Height="32" Offset="0xB0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B4C0" OutName="ydan_room_3Tex_00B4C0" Format="ci8" Width="32" Height="32" Offset="0xB4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00B8C0" OutName="ydan_room_3Tex_00B8C0" Format="ci8" Width="32" Height="64" Offset="0xB8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C0C0" OutName="ydan_room_3Tex_00C0C0" Format="ci8" Width="32" Height="64" Offset="0xC0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00C8C0" OutName="ydan_room_3Tex_00C8C0" Format="ci8" Width="32" Height="64" Offset="0xC8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D0C0" OutName="ydan_room_3Tex_00D0C0" Format="ci8" Width="32" Height="32" Offset="0xD0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D4C0" OutName="ydan_room_3Tex_00D4C0" Format="ci8" Width="32" Height="32" Offset="0xD4B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00D8C0" OutName="ydan_room_3Tex_00D8C0" Format="ci8" Width="32" Height="64" Offset="0xD8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E0C0" OutName="ydan_room_3Tex_00E0C0" Format="ci8" Width="32" Height="64" Offset="0xE0B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00E8C0" OutName="ydan_room_3Tex_00E8C0" Format="rgba16" Width="64" Height="32" Offset="0xE8B0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_00F8C0" OutName="ydan_room_3Tex_00F8C0" Format="ci8" Width="32" Height="64" Offset="0xF8B0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_011DB0" OutName="ydan_room_3Tex_011DB0" Format="rgba16" Width="32" Height="64" Offset="0x11DA0" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_012DB0" OutName="ydan_room_3Tex_012DB0" Format="ci8" Width="32" Height="32" Offset="0x12DA0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_3Tex_0131B0" OutName="ydan_room_3Tex_0131B0" Format="ia16" Width="32" Height="64" Offset="0x131A0" AddedByScript="true"/>
+        <Room Name="ydan_room_3" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_4" Segment="3">
+        <Texture Name="ydan_room_4Tex_001920" OutName="ydan_room_4Tex_001920" Format="ci8" Width="32" Height="64" Offset="0x18C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002120" OutName="ydan_room_4Tex_002120" Format="ci8" Width="32" Height="64" Offset="0x20C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_002920" OutName="ydan_room_4Tex_002920" Format="ci8" Width="32" Height="64" Offset="0x28C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003120" OutName="ydan_room_4Tex_003120" Format="ci8" Width="64" Height="32" Offset="0x30C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_4Tex_003C28" OutName="ydan_room_4Tex_003C28" Format="ia16" Width="32" Height="64" Offset="0x3BC8" AddedByScript="true"/>
+        <Room Name="ydan_room_4" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_5" Segment="3">
+        <Texture Name="ydan_room_5Tex_003F88" OutName="ydan_room_5Tex_003F88" Format="ci8" Width="32" Height="64" Offset="0x3F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004788" OutName="ydan_room_5Tex_004788" Format="ci8" Width="32" Height="64" Offset="0x4718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_004F88" OutName="ydan_room_5Tex_004F88" Format="ci8" Width="32" Height="64" Offset="0x4F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005788" OutName="ydan_room_5Tex_005788" Format="ci8" Width="32" Height="32" Offset="0x5718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_005B88" OutName="ydan_room_5Tex_005B88" Format="ci8" Width="32" Height="64" Offset="0x5B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006388" OutName="ydan_room_5Tex_006388" Format="ci8" Width="64" Height="32" Offset="0x6318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006B88" OutName="ydan_room_5Tex_006B88" Format="ci8" Width="32" Height="32" Offset="0x6B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_006F88" OutName="ydan_room_5Tex_006F88" Format="ci8" Width="32" Height="32" Offset="0x6F18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007388" OutName="ydan_room_5Tex_007388" Format="ci8" Width="32" Height="32" Offset="0x7318" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007788" OutName="ydan_room_5Tex_007788" Format="ci8" Width="32" Height="32" Offset="0x7718" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_5Tex_007B88" OutName="ydan_room_5Tex_007B88" Format="ci8" Width="32" Height="64" Offset="0x7B18" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_5" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_6" Segment="3">
+        <Texture Name="ydan_room_6Tex_001F00" OutName="ydan_room_6Tex_001F00" Format="ci8" Width="32" Height="64" Offset="0x1EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002700" OutName="ydan_room_6Tex_002700" Format="ci8" Width="32" Height="64" Offset="0x26C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_002F00" OutName="ydan_room_6Tex_002F00" Format="ci8" Width="32" Height="64" Offset="0x2EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003700" OutName="ydan_room_6Tex_003700" Format="ci8" Width="32" Height="64" Offset="0x36C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_003F00" OutName="ydan_room_6Tex_003F00" Format="ci8" Width="32" Height="64" Offset="0x3EC0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_6Tex_004700" OutName="ydan_room_6Tex_004700" Format="ci8" Width="32" Height="64" Offset="0x46C0" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_6" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_7" Segment="3">
+        <Texture Name="ydan_room_7Tex_002C98" OutName="ydan_room_7Tex_002C98" Format="ci8" Width="32" Height="64" Offset="0x2B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003498" OutName="ydan_room_7Tex_003498" Format="ci8" Width="32" Height="64" Offset="0x3308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_003C98" OutName="ydan_room_7Tex_003C98" Format="ci8" Width="32" Height="64" Offset="0x3B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004498" OutName="ydan_room_7Tex_004498" Format="ci8" Width="32" Height="64" Offset="0x4308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_004C98" OutName="ydan_room_7Tex_004C98" Format="ci8" Width="64" Height="32" Offset="0x4B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005498" OutName="ydan_room_7Tex_005498" Format="ci8" Width="32" Height="32" Offset="0x5308" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_005898" OutName="ydan_room_7Tex_005898" Format="ci8" Width="32" Height="64" Offset="0x5708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006098" OutName="ydan_room_7Tex_006098" Format="ci8" Width="32" Height="64" Offset="0x5F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006898" OutName="ydan_room_7Tex_006898" Format="ci8" Width="32" Height="32" Offset="0x6708" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_006C98" OutName="ydan_room_7Tex_006C98" Format="ci8" Width="32" Height="32" Offset="0x6B08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007098" OutName="ydan_room_7Tex_007098" Format="ci8" Width="32" Height="64" Offset="0x6F08" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_7Tex_007A98" OutName="ydan_room_7Tex_007A98" Format="rgba16" Width="32" Height="64" Offset="0x7908" AddedByScript="true"/>
+        <Room Name="ydan_room_7" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_8" Segment="3">
+        <Texture Name="ydan_room_8Tex_000988" OutName="ydan_room_8Tex_000988" Format="ci8" Width="32" Height="32" Offset="0x8F8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Room Name="ydan_room_8" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_9" Segment="3">
+        <Texture Name="ydan_room_9Tex_002480" OutName="ydan_room_9Tex_002480" Format="ci8" Width="32" Height="64" Offset="0x2480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_002C80" OutName="ydan_room_9Tex_002C80" Format="ci8" Width="32" Height="64" Offset="0x2C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003480" OutName="ydan_room_9Tex_003480" Format="ci8" Width="32" Height="64" Offset="0x3480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_003C80" OutName="ydan_room_9Tex_003C80" Format="ci8" Width="32" Height="64" Offset="0x3C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004480" OutName="ydan_room_9Tex_004480" Format="ci8" Width="32" Height="64" Offset="0x4480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_004C80" OutName="ydan_room_9Tex_004C80" Format="ci8" Width="32" Height="64" Offset="0x4C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005480" OutName="ydan_room_9Tex_005480" Format="ci8" Width="32" Height="64" Offset="0x5480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_005C80" OutName="ydan_room_9Tex_005C80" Format="ci8" Width="32" Height="64" Offset="0x5C80" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_006480" OutName="ydan_room_9Tex_006480" Format="ci8" Width="32" Height="64" Offset="0x6480" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_007498" OutName="ydan_room_9Tex_007498" Format="rgba16" Width="32" Height="64" Offset="0x7498" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008498" OutName="ydan_room_9Tex_008498" Format="ci8" Width="32" Height="32" Offset="0x8498" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_9Tex_008898" OutName="ydan_room_9Tex_008898" Format="ia16" Width="32" Height="64" Offset="0x8898" AddedByScript="true"/>
+        <Room Name="ydan_room_9" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_10" Segment="3">
+        <Texture Name="ydan_room_10Tex_001BE0" OutName="ydan_room_10Tex_001BE0" Format="ci8" Width="32" Height="64" Offset="0x1B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0023E0" OutName="ydan_room_10Tex_0023E0" Format="ci8" Width="32" Height="64" Offset="0x2360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_002BE0" OutName="ydan_room_10Tex_002BE0" Format="ci8" Width="32" Height="64" Offset="0x2B60" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_0033E0" OutName="ydan_room_10Tex_0033E0" Format="ci8" Width="32" Height="64" Offset="0x3360" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_10Tex_003DF8" OutName="ydan_room_10Tex_003DF8" Format="rgba16" Width="32" Height="64" Offset="0x3D78" AddedByScript="true"/>
+        <Room Name="ydan_room_10" Offset="0x0"/>
+    </File>
+    <File Name="ydan_room_11" Segment="3">
+        <Texture Name="ydan_room_11Tex_003CD8" OutName="ydan_room_11Tex_003CD8" Format="ci8" Width="32" Height="64" Offset="0x3CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0044D8" OutName="ydan_room_11Tex_0044D8" Format="rgba16" Width="32" Height="64" Offset="0x44D8" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_0054D8" OutName="ydan_room_11Tex_0054D8" Format="ci8" Width="32" Height="64" Offset="0x54D8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_005CD8" OutName="ydan_room_11Tex_005CD8" Format="ci8" Width="32" Height="32" Offset="0x5CD8" ExternalTlut="ydan_scene" ExternalTlutOffset="0xB800" AddedByScript="true"/>
+        <Texture Name="ydan_room_11Tex_006968" OutName="ydan_room_11Tex_006968" Format="ia8" Width="64" Height="32" Offset="0x6968" AddedByScript="true"/>
+        <Room Name="ydan_room_11" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan_boss.xml
new file mode 100644
index 0000000000..7ea240547a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/dungeons/ydan_boss.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="ydan_boss_scene" Segment="2">
+        <Texture Name="ydan_boss_sceneTex_000F38" OutName="ydan_boss_sceneTex_000F38" Format="ci8" Width="32" Height="64" Offset="0xF38" TlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_sceneTLUT_000D30" OutName="ydan_boss_sceneTLUT_000D30" Format="rgba16" Width="16" Height="16" Offset="0xD30" AddedByScript="true"/>
+        <Scene Name="ydan_boss_scene" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Texture Name="ydan_boss_room_0Tex_001790" OutName="ydan_boss_room_0Tex_001790" Format="ci8" Width="32" Height="64" Offset="0x1790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_001F90" OutName="ydan_boss_room_0Tex_001F90" Format="ci8" Width="32" Height="64" Offset="0x1F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002790" OutName="ydan_boss_room_0Tex_002790" Format="ci8" Width="32" Height="64" Offset="0x2790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_002F90" OutName="ydan_boss_room_0Tex_002F90" Format="ci8" Width="32" Height="64" Offset="0x2F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003790" OutName="ydan_boss_room_0Tex_003790" Format="ci8" Width="32" Height="64" Offset="0x3790" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_003F90" OutName="ydan_boss_room_0Tex_003F90" Format="ci8" Width="32" Height="64" Offset="0x3F90" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_004BF0" OutName="ydan_boss_room_0Tex_004BF0" Format="rgba16" Width="32" Height="64" Offset="0x4BF0" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005BF0" OutName="ydan_boss_room_0Tex_005BF0" Format="ci8" Width="32" Height="32" Offset="0x5BF0" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_0Tex_005FF0" OutName="ydan_boss_room_0Tex_005FF0" Format="ia16" Width="32" Height="64" Offset="0x5FF0" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
+    </File>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Texture Name="ydan_boss_room_1Tex_003B38" OutName="ydan_boss_room_1Tex_003B38" Format="rgba16" Width="32" Height="64" Offset="0x3B38" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_004B38" OutName="ydan_boss_room_1Tex_004B38" Format="ci8" Width="32" Height="64" Offset="0x4B38" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005338" OutName="ydan_boss_room_1Tex_005338" Format="ci8" Width="32" Height="32" Offset="0x5338" ExternalTlut="ydan_boss_scene" ExternalTlutOffset="0xD30" AddedByScript="true"/>
+        <Texture Name="ydan_boss_room_1Tex_005FE8" OutName="ydan_boss_room_1Tex_005FE8" Format="ia8" Width="64" Height="32" Offset="0x5FE8" AddedByScript="true"/>
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/bowling.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/bowling.xml
new file mode 100644
index 0000000000..9a41763a27
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/bowling.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="bowling_scene" Segment="2">
+        <Texture Name="bowling_sceneTex_001AA0" OutName="bowling_sceneTex_001AA0" Format="rgba16" Width="32" Height="32" Offset="0x1AA0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_0022A0" OutName="bowling_sceneTex_0022A0" Format="i4" Width="16" Height="16" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002320" OutName="bowling_sceneTex_002320" Format="rgba16" Width="16" Height="32" Offset="0x2320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002720" OutName="bowling_sceneTex_002720" Format="rgba16" Width="32" Height="32" Offset="0x2720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_002F20" OutName="bowling_sceneTex_002F20" Format="rgba16" Width="32" Height="32" Offset="0x2F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_003720" OutName="bowling_sceneTex_003720" Format="i4" Width="64" Height="128" Offset="0x3720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004720" OutName="bowling_sceneTex_004720" Format="ia4" Width="64" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_004F20" OutName="bowling_sceneTex_004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005120" OutName="bowling_sceneTex_005120" Format="rgba16" Width="16" Height="16" Offset="0x5120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005320" OutName="bowling_sceneTex_005320" Format="rgba16" Width="16" Height="16" Offset="0x5320" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005520" OutName="bowling_sceneTex_005520" Format="rgba16" Width="16" Height="32" Offset="0x5520" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_005920" OutName="bowling_sceneTex_005920" Format="rgba16" Width="32" Height="32" Offset="0x5920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_006120" OutName="bowling_sceneTex_006120" Format="rgba16" Width="64" Height="32" Offset="0x6120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_007120" OutName="bowling_sceneTex_007120" Format="ia8" Width="128" Height="32" Offset="0x7120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008120" OutName="bowling_sceneTex_008120" Format="rgba16" Width="32" Height="32" Offset="0x8120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_008920" OutName="bowling_sceneTex_008920" Format="rgba16" Width="32" Height="32" Offset="0x8920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_009120" OutName="bowling_sceneTex_009120" Format="rgba16" Width="32" Height="64" Offset="0x9120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A120" OutName="bowling_sceneTex_00A120" Format="rgba16" Width="32" Height="32" Offset="0xA120" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00A920" OutName="bowling_sceneTex_00A920" Format="i8" Width="32" Height="16" Offset="0xA920" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AB20" OutName="bowling_sceneTex_00AB20" Format="ia8" Width="32" Height="16" Offset="0xAB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AD20" OutName="bowling_sceneTex_00AD20" Format="i4" Width="32" Height="32" Offset="0xAD20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00AF20" OutName="bowling_sceneTex_00AF20" Format="ia8" Width="64" Height="32" Offset="0xAF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00B720" OutName="bowling_sceneTex_00B720" Format="ia8" Width="32" Height="32" Offset="0xB720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BB20" OutName="bowling_sceneTex_00BB20" Format="ia8" Width="32" Height="32" Offset="0xBB20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00BF20" OutName="bowling_sceneTex_00BF20" Format="rgba16" Width="32" Height="32" Offset="0xBF20" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00C720" OutName="bowling_sceneTex_00C720" Format="ia8" Width="64" Height="64" Offset="0xC720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00D720" OutName="bowling_sceneTex_00D720" Format="i8" Width="32" Height="32" Offset="0xD720" AddedByScript="true"/>
+        <Texture Name="bowling_sceneTex_00DB20" OutName="bowling_sceneTex_00DB20" Format="rgba16" Width="64" Height="32" Offset="0xDB20" AddedByScript="true"/>
+        <Scene Name="bowling_scene" Offset="0x0"/>
+    </File>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/daiyousei_izumi.xml
new file mode 100644
index 0000000000..4f9a03fc02
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/daiyousei_izumi.xml
@@ -0,0 +1,25 @@
+<Root>
+    <File Name="daiyousei_izumi_scene" Segment="2">
+        <Texture Name="daiyousei_izumi_sceneTex_004800" OutName="daiyousei_izumi_sceneTex_004800" Format="i8" Width="32" Height="64" Offset="0x4800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005000" OutName="daiyousei_izumi_sceneTex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_005800" OutName="daiyousei_izumi_sceneTex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_006000" OutName="daiyousei_izumi_sceneTex_006000" Format="ia4" Width="64" Height="128" Offset="0x6000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_007000" OutName="daiyousei_izumi_sceneTex_007000" Format="rgba16" Width="32" Height="64" Offset="0x7000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_008000" OutName="daiyousei_izumi_sceneTex_008000" Format="rgba16" Width="32" Height="64" Offset="0x8000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_009000" OutName="daiyousei_izumi_sceneTex_009000" Format="rgba16" Width="32" Height="64" Offset="0x9000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A000" OutName="daiyousei_izumi_sceneTex_00A000" Format="i8" Width="32" Height="64" Offset="0xA000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00A800" OutName="daiyousei_izumi_sceneTex_00A800" Format="rgba16" Width="32" Height="32" Offset="0xA800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00B000" OutName="daiyousei_izumi_sceneTex_00B000" Format="i8" Width="32" Height="128" Offset="0xB000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C000" OutName="daiyousei_izumi_sceneTex_00C000" Format="rgba16" Width="32" Height="32" Offset="0xC000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00C800" OutName="daiyousei_izumi_sceneTex_00C800" Format="ia8" Width="64" Height="32" Offset="0xC800" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D000" OutName="daiyousei_izumi_sceneTex_00D000" Format="rgba16" Width="32" Height="32" Offset="0xD000" AddedByScript="true"/>
+        <Texture Name="daiyousei_izumi_sceneTex_00D800" OutName="daiyousei_izumi_sceneTex_00D800" Format="rgba16" Width="32" Height="32" Offset="0xD800" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
+        <Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
+        <Cutscene Name="gGreatFairyDoubleDefenseCs" Offset="0x25D0"/>
+        <Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
+    </File>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa.xml
new file mode 100644
index 0000000000..06d89f2fe7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="hairal_niwa_scene" Segment="2">
+        <Texture Name="hairal_niwa_sceneTex_003390" OutName="hairal_niwa_sceneTex_003390" Format="rgba16" Width="32" Height="32" Offset="0x3390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_003B90" OutName="hairal_niwa_sceneTex_003B90" Format="ia16" Width="32" Height="64" Offset="0x3B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_004B90" OutName="hairal_niwa_sceneTex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005390" OutName="hairal_niwa_sceneTex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_005B90" OutName="hairal_niwa_sceneTex_005B90" Format="rgba16" Width="32" Height="32" Offset="0x5B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_006390" OutName="hairal_niwa_sceneTex_006390" Format="rgba16" Width="32" Height="64" Offset="0x6390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007390" OutName="hairal_niwa_sceneTex_007390" Format="i4" Width="64" Height="64" Offset="0x7390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_007B90" OutName="hairal_niwa_sceneTex_007B90" Format="rgba16" Width="32" Height="64" Offset="0x7B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_008B90" OutName="hairal_niwa_sceneTex_008B90" Format="rgba16" Width="32" Height="32" Offset="0x8B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009390" OutName="hairal_niwa_sceneTex_009390" Format="rgba16" Width="32" Height="32" Offset="0x9390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_009B90" OutName="hairal_niwa_sceneTex_009B90" Format="rgba16" Width="32" Height="64" Offset="0x9B90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00AB90" OutName="hairal_niwa_sceneTex_00AB90" Format="rgba16" Width="32" Height="32" Offset="0xAB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00B390" OutName="hairal_niwa_sceneTex_00B390" Format="rgba16" Width="32" Height="32" Offset="0xB390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00BB90" OutName="hairal_niwa_sceneTex_00BB90" Format="rgba16" Width="32" Height="32" Offset="0xBB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00C390" OutName="hairal_niwa_sceneTex_00C390" Format="ia4" Width="64" Height="64" Offset="0xC390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00CB90" OutName="hairal_niwa_sceneTex_00CB90" Format="i8" Width="32" Height="64" Offset="0xCB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00D390" OutName="hairal_niwa_sceneTex_00D390" Format="ia4" Width="32" Height="128" Offset="0xD390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00DB90" OutName="hairal_niwa_sceneTex_00DB90" Format="rgba16" Width="32" Height="64" Offset="0xDB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00EB90" OutName="hairal_niwa_sceneTex_00EB90" Format="rgba16" Width="32" Height="32" Offset="0xEB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00F390" OutName="hairal_niwa_sceneTex_00F390" Format="rgba16" Width="32" Height="32" Offset="0xF390" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_00FB90" OutName="hairal_niwa_sceneTex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_sceneTex_010390" OutName="hairal_niwa_sceneTex_010390" Format="rgba16" Width="32" Height="64" Offset="0x10390" AddedByScript="true"/>
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
+        <Scene Name="hairal_niwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa_n.xml
new file mode 100644
index 0000000000..6f4c181e0e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hairal_niwa_n.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="hairal_niwa_n_scene" Segment="2">
+        <Texture Name="hairal_niwa_n_sceneTex_0010F0" OutName="hairal_niwa_n_sceneTex_0010F0" Format="rgba16" Width="32" Height="32" Offset="0x10F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0018F0" OutName="hairal_niwa_n_sceneTex_0018F0" Format="rgba16" Width="32" Height="32" Offset="0x18F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0020F0" OutName="hairal_niwa_n_sceneTex_0020F0" Format="rgba16" Width="32" Height="32" Offset="0x20F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0028F0" OutName="hairal_niwa_n_sceneTex_0028F0" Format="rgba16" Width="32" Height="64" Offset="0x28F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0038F0" OutName="hairal_niwa_n_sceneTex_0038F0" Format="i4" Width="64" Height="64" Offset="0x38F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0040F0" OutName="hairal_niwa_n_sceneTex_0040F0" Format="rgba16" Width="32" Height="64" Offset="0x40F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0050F0" OutName="hairal_niwa_n_sceneTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0058F0" OutName="hairal_niwa_n_sceneTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0060F0" OutName="hairal_niwa_n_sceneTex_0060F0" Format="ia4" Width="32" Height="128" Offset="0x60F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0068F0" OutName="hairal_niwa_n_sceneTex_0068F0" Format="rgba16" Width="32" Height="32" Offset="0x68F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0070F0" OutName="hairal_niwa_n_sceneTex_0070F0" Format="rgba16" Width="32" Height="32" Offset="0x70F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0078F0" OutName="hairal_niwa_n_sceneTex_0078F0" Format="rgba16" Width="32" Height="32" Offset="0x78F0" AddedByScript="true"/>
+        <Texture Name="hairal_niwa_n_sceneTex_0080F0" OutName="hairal_niwa_n_sceneTex_0080F0" Format="rgba16" Width="32" Height="64" Offset="0x80F0" AddedByScript="true"/>
+        <Scene Name="hairal_niwa_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hakasitarelay.xml
new file mode 100644
index 0000000000..91be63d147
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hakasitarelay.xml
@@ -0,0 +1,80 @@
+<Root>
+    <File Name="hakasitarelay_scene" Segment="2">
+        <Texture Name="hakasitarelay_sceneTex_00C080" OutName="hakasitarelay_sceneTex_00C080" Format="rgba16" Width="64" Height="32" Offset="0xC080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D080" OutName="hakasitarelay_sceneTex_00D080" Format="rgba16" Width="32" Height="32" Offset="0xD080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_sceneTex_00D880" OutName="hakasitarelay_sceneTex_00D880" Format="i4" Width="64" Height="64" Offset="0xD880" AddedByScript="true"/>
+        <Scene Name="hakasitarelay_scene" Offset="0x0"/>
+        <Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
+    </File>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Texture Name="hakasitarelay_room_0Tex_003248" OutName="hakasitarelay_room_0Tex_003248" Format="i4" Width="32" Height="32" Offset="0x3248" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_003448" OutName="hakasitarelay_room_0Tex_003448" Format="rgba16" Width="32" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004448" OutName="hakasitarelay_room_0Tex_004448" Format="i4" Width="128" Height="32" Offset="0x4448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_004C48" OutName="hakasitarelay_room_0Tex_004C48" Format="i4" Width="32" Height="128" Offset="0x4C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005448" OutName="hakasitarelay_room_0Tex_005448" Format="i8" Width="32" Height="32" Offset="0x5448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_005848" OutName="hakasitarelay_room_0Tex_005848" Format="i8" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_0Tex_0062B8" OutName="hakasitarelay_room_0Tex_0062B8" Format="ia16" Width="128" Height="16" Offset="0x62B8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Texture Name="hakasitarelay_room_1Tex_003F20" OutName="hakasitarelay_room_1Tex_003F20" Format="i8" Width="32" Height="32" Offset="0x3F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004320" OutName="hakasitarelay_room_1Tex_004320" Format="i8" Width="32" Height="32" Offset="0x4320" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_004720" OutName="hakasitarelay_room_1Tex_004720" Format="rgba16" Width="32" Height="64" Offset="0x4720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005720" OutName="hakasitarelay_room_1Tex_005720" Format="rgba16" Width="32" Height="32" Offset="0x5720" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_005F20" OutName="hakasitarelay_room_1Tex_005F20" Format="rgba16" Width="32" Height="16" Offset="0x5F20" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_1Tex_006320" OutName="hakasitarelay_room_1Tex_006320" Format="rgba16" Width="32" Height="16" Offset="0x6320" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Texture Name="hakasitarelay_room_2Tex_0054A8" OutName="hakasitarelay_room_2Tex_0054A8" Format="i8" Width="32" Height="32" Offset="0x54A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0058A8" OutName="hakasitarelay_room_2Tex_0058A8" Format="i8" Width="32" Height="32" Offset="0x58A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_005CA8" OutName="hakasitarelay_room_2Tex_005CA8" Format="rgba16" Width="32" Height="64" Offset="0x5CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_006CA8" OutName="hakasitarelay_room_2Tex_006CA8" Format="i8" Width="64" Height="32" Offset="0x6CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0074A8" OutName="hakasitarelay_room_2Tex_0074A8" Format="rgba16" Width="32" Height="32" Offset="0x74A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_007CA8" OutName="hakasitarelay_room_2Tex_007CA8" Format="rgba16" Width="32" Height="16" Offset="0x7CA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_2Tex_0080A8" OutName="hakasitarelay_room_2Tex_0080A8" Format="rgba16" Width="32" Height="16" Offset="0x80A8" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Texture Name="hakasitarelay_room_3Tex_0056E0" OutName="hakasitarelay_room_3Tex_0056E0" Format="i8" Width="32" Height="32" Offset="0x56E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005AE0" OutName="hakasitarelay_room_3Tex_005AE0" Format="i8" Width="32" Height="32" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_005EE0" OutName="hakasitarelay_room_3Tex_005EE0" Format="i4" Width="32" Height="32" Offset="0x5EE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0060E0" OutName="hakasitarelay_room_3Tex_0060E0" Format="rgba16" Width="32" Height="64" Offset="0x60E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0070E0" OutName="hakasitarelay_room_3Tex_0070E0" Format="rgba16" Width="32" Height="32" Offset="0x70E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0078E0" OutName="hakasitarelay_room_3Tex_0078E0" Format="rgba16" Width="32" Height="16" Offset="0x78E0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_007CE0" OutName="hakasitarelay_room_3Tex_007CE0" Format="i4" Width="128" Height="32" Offset="0x7CE0" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_3Tex_0084E0" OutName="hakasitarelay_room_3Tex_0084E0" Format="i8" Width="64" Height="32" Offset="0x84E0" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Texture Name="hakasitarelay_room_4Tex_001E80" OutName="hakasitarelay_room_4Tex_001E80" Format="i4" Width="32" Height="32" Offset="0x1E80" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002080" OutName="hakasitarelay_room_4Tex_002080" Format="i8" Width="64" Height="32" Offset="0x2080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_002880" OutName="hakasitarelay_room_4Tex_002880" Format="i4" Width="32" Height="128" Offset="0x2880" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003080" OutName="hakasitarelay_room_4Tex_003080" Format="i8" Width="32" Height="32" Offset="0x3080" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003480" OutName="hakasitarelay_room_4Tex_003480" Format="i8" Width="64" Height="32" Offset="0x3480" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_4Tex_003C80" OutName="hakasitarelay_room_4Tex_003C80" Format="i4" Width="64" Height="64" Offset="0x3C80" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Texture Name="hakasitarelay_room_5Tex_001C48" OutName="hakasitarelay_room_5Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002448" OutName="hakasitarelay_room_5Tex_002448" Format="ci4" Width="64" Height="64" Offset="0x2448" TlutOffset="0x1C28" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_002C48" OutName="hakasitarelay_room_5Tex_002C48" Format="i8" Width="64" Height="32" Offset="0x2C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003448" OutName="hakasitarelay_room_5Tex_003448" Format="i4" Width="64" Height="64" Offset="0x3448" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5Tex_003C48" OutName="hakasitarelay_room_5Tex_003C48" Format="i4" Width="64" Height="64" Offset="0x3C48" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_5TLUT_001C28" OutName="hakasitarelay_room_5TLUT_001C28" Format="rgba16" Width="4" Height="4" Offset="0x1C28" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
+    </File>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Texture Name="hakasitarelay_room_6Tex_0041A8" OutName="hakasitarelay_room_6Tex_0041A8" Format="rgba16" Width="16" Height="8" Offset="0x41A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0042A8" OutName="hakasitarelay_room_6Tex_0042A8" Format="rgba16" Width="32" Height="32" Offset="0x42A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004AA8" OutName="hakasitarelay_room_6Tex_004AA8" Format="rgba16" Width="32" Height="16" Offset="0x4AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_004EA8" OutName="hakasitarelay_room_6Tex_004EA8" Format="ci4" Width="64" Height="64" Offset="0x4EA8" TlutOffset="0x4188" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0056A8" OutName="hakasitarelay_room_6Tex_0056A8" Format="i8" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_005EA8" OutName="hakasitarelay_room_6Tex_005EA8" Format="i4" Width="64" Height="64" Offset="0x5EA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0066A8" OutName="hakasitarelay_room_6Tex_0066A8" Format="i8" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_006AA8" OutName="hakasitarelay_room_6Tex_006AA8" Format="i8" Width="64" Height="32" Offset="0x6AA8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6Tex_0072A8" OutName="hakasitarelay_room_6Tex_0072A8" Format="i4" Width="64" Height="64" Offset="0x72A8" AddedByScript="true"/>
+        <Texture Name="hakasitarelay_room_6TLUT_004188" OutName="hakasitarelay_room_6TLUT_004188" Format="rgba16" Width="4" Height="4" Offset="0x4188" AddedByScript="true"/>
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/hut.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hut.xml
new file mode 100644
index 0000000000..a4ef5715ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hut.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hut_scene" Segment="2">
+        <Scene Name="hut_scene" Offset="0x0"/>
+    </File>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hylia_labo.xml
new file mode 100644
index 0000000000..56822e67a7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/hylia_labo.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="hylia_labo_scene" Segment="2">
+        <Texture Name="hylia_labo_sceneTex_001090" OutName="hylia_labo_sceneTex_001090" Format="ia8" Width="16" Height="64" Offset="0x1090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_001490" OutName="hylia_labo_sceneTex_001490" Format="rgba16" Width="64" Height="32" Offset="0x1490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_002490" OutName="hylia_labo_sceneTex_002490" Format="rgba16" Width="32" Height="64" Offset="0x2490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003490" OutName="hylia_labo_sceneTex_003490" Format="rgba16" Width="32" Height="32" Offset="0x3490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_003C90" OutName="hylia_labo_sceneTex_003C90" Format="rgba16" Width="32" Height="64" Offset="0x3C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_004C90" OutName="hylia_labo_sceneTex_004C90" Format="rgba16" Width="32" Height="32" Offset="0x4C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005490" OutName="hylia_labo_sceneTex_005490" Format="rgba16" Width="32" Height="32" Offset="0x5490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_005C90" OutName="hylia_labo_sceneTex_005C90" Format="ia8" Width="64" Height="16" Offset="0x5C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006090" OutName="hylia_labo_sceneTex_006090" Format="rgba16" Width="32" Height="4" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006190" OutName="hylia_labo_sceneTex_006190" Format="rgba16" Width="32" Height="32" Offset="0x6190" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006990" OutName="hylia_labo_sceneTex_006990" Format="rgba16" Width="32" Height="16" Offset="0x6990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_006D90" OutName="hylia_labo_sceneTex_006D90" Format="ia4" Width="64" Height="128" Offset="0x6D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_007D90" OutName="hylia_labo_sceneTex_007D90" Format="rgba16" Width="32" Height="32" Offset="0x7D90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008590" OutName="hylia_labo_sceneTex_008590" Format="ia8" Width="32" Height="16" Offset="0x8590" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_008790" OutName="hylia_labo_sceneTex_008790" Format="ia8" Width="32" Height="128" Offset="0x8790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009790" OutName="hylia_labo_sceneTex_009790" Format="rgba16" Width="32" Height="8" Offset="0x9790" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009990" OutName="hylia_labo_sceneTex_009990" Format="ia8" Width="16" Height="16" Offset="0x9990" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009A90" OutName="hylia_labo_sceneTex_009A90" Format="ia8" Width="16" Height="32" Offset="0x9A90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_009C90" OutName="hylia_labo_sceneTex_009C90" Format="ia8" Width="32" Height="32" Offset="0x9C90" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00A090" OutName="hylia_labo_sceneTex_00A090" Format="rgba16" Width="32" Height="64" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00B090" OutName="hylia_labo_sceneTex_00B090" Format="rgba16" Width="64" Height="32" Offset="0xB090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C090" OutName="hylia_labo_sceneTex_00C090" Format="rgba16" Width="64" Height="16" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00C890" OutName="hylia_labo_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D090" OutName="hylia_labo_sceneTex_00D090" Format="rgba16" Width="64" Height="16" Offset="0xD090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00D890" OutName="hylia_labo_sceneTex_00D890" Format="rgba16" Width="64" Height="16" Offset="0xD890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E090" OutName="hylia_labo_sceneTex_00E090" Format="rgba16" Width="32" Height="32" Offset="0xE090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00E890" OutName="hylia_labo_sceneTex_00E890" Format="rgba16" Width="32" Height="64" Offset="0xE890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_00F890" OutName="hylia_labo_sceneTex_00F890" Format="rgba16" Width="32" Height="32" Offset="0xF890" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010090" OutName="hylia_labo_sceneTex_010090" Format="i8" Width="32" Height="32" Offset="0x10090" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010490" OutName="hylia_labo_sceneTex_010490" Format="i8" Width="32" Height="32" Offset="0x10490" AddedByScript="true"/>
+        <Texture Name="hylia_labo_sceneTex_010890" OutName="hylia_labo_sceneTex_010890" Format="rgba16" Width="32" Height="32" Offset="0x10890" AddedByScript="true"/>
+        <Scene Name="hylia_labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/impa.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/impa.xml
new file mode 100644
index 0000000000..db757e3d3c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/impa.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="impa_scene" Segment="2">
+        <Scene Name="impa_scene" Offset="0x0"/>
+    </File>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kakariko.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kakariko.xml
new file mode 100644
index 0000000000..e4e9b102c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kakariko.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko_scene" Segment="2">
+        <Scene Name="kakariko_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kenjyanoma.xml
new file mode 100644
index 0000000000..4e8a58f3b6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kenjyanoma.xml
@@ -0,0 +1,27 @@
+<Root>
+    <File Name="kenjyanoma_scene" Segment="2">
+        <Scene Name="kenjyanoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Texture Name="kenjyanoma_room_0Tex_001618" OutName="kenjyanoma_room_0Tex_001618" Format="rgba16" Width="64" Height="32" Offset="0x1618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_002618" OutName="kenjyanoma_room_0Tex_002618" Format="rgba16" Width="64" Height="32" Offset="0x2618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_003618" OutName="kenjyanoma_room_0Tex_003618" Format="rgba16" Width="64" Height="32" Offset="0x3618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_004618" OutName="kenjyanoma_room_0Tex_004618" Format="rgba16" Width="64" Height="32" Offset="0x4618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_005618" OutName="kenjyanoma_room_0Tex_005618" Format="rgba16" Width="64" Height="32" Offset="0x5618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_006618" OutName="kenjyanoma_room_0Tex_006618" Format="rgba16" Width="64" Height="32" Offset="0x6618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_007618" OutName="kenjyanoma_room_0Tex_007618" Format="rgba16" Width="64" Height="32" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_008618" OutName="kenjyanoma_room_0Tex_008618" Format="rgba16" Width="64" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_009618" OutName="kenjyanoma_room_0Tex_009618" Format="rgba16" Width="32" Height="64" Offset="0x9618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00A618" OutName="kenjyanoma_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00B618" OutName="kenjyanoma_room_0Tex_00B618" Format="rgba16" Width="64" Height="32" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00C618" OutName="kenjyanoma_room_0Tex_00C618" Format="rgba16" Width="64" Height="32" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_00D618" OutName="kenjyanoma_room_0Tex_00D618" Format="rgba16" Width="32" Height="32" Offset="0xD618" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_010CE8" OutName="kenjyanoma_room_0Tex_010CE8" Format="ia16" Width="32" Height="32" Offset="0x10CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_0114E8" OutName="kenjyanoma_room_0Tex_0114E8" Format="i8" Width="32" Height="64" Offset="0x114E8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011CE8" OutName="kenjyanoma_room_0Tex_011CE8" Format="rgba16" Width="4" Height="4" Offset="0x11CE8" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_011D08" OutName="kenjyanoma_room_0Tex_011D08" Format="rgba16" Width="32" Height="32" Offset="0x11D08" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012508" OutName="kenjyanoma_room_0Tex_012508" Format="i8" Width="32" Height="64" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="kenjyanoma_room_0Tex_012D08" OutName="kenjyanoma_room_0Tex_012D08" Format="i8" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home.xml
new file mode 100644
index 0000000000..8c0305493a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home_scene" Segment="2">
+        <Scene Name="kokiri_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home3.xml
new file mode 100644
index 0000000000..9f36eb41c9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home3_scene" Segment="2">
+        <Scene Name="kokiri_home3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home4.xml
new file mode 100644
index 0000000000..eb861aedb4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home4.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home4_scene" Segment="2">
+        <Scene Name="kokiri_home4_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home5.xml
new file mode 100644
index 0000000000..974987feda
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/kokiri_home5.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_home5_scene" Segment="2">
+        <Scene Name="kokiri_home5_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/labo.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/labo.xml
new file mode 100644
index 0000000000..c0a9d2eb8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/labo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="labo_scene" Segment="2">
+        <Scene Name="labo_scene" Offset="0x0"/>
+    </File>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/link_home.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/link_home.xml
new file mode 100644
index 0000000000..2fb88ae347
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/link_home.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="link_home_scene" Segment="2">
+        <Scene Name="link_home_scene" Offset="0x0"/>
+    </File>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/mahouya.xml
new file mode 100644
index 0000000000..8ae462f9db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/mahouya.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="mahouya_scene" Segment="2">
+        <Texture Name="mahouya_sceneTex_000A20" OutName="mahouya_sceneTex_000A20" Format="rgba16" Width="32" Height="32" Offset="0xA20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001220" OutName="mahouya_sceneTex_001220" Format="rgba16" Width="32" Height="32" Offset="0x1220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_001A20" OutName="mahouya_sceneTex_001A20" Format="rgba16" Width="16" Height="128" Offset="0x1A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_002A20" OutName="mahouya_sceneTex_002A20" Format="rgba16" Width="32" Height="64" Offset="0x2A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_003A20" OutName="mahouya_sceneTex_003A20" Format="rgba16" Width="64" Height="32" Offset="0x3A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_004A20" OutName="mahouya_sceneTex_004A20" Format="rgba16" Width="32" Height="32" Offset="0x4A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_005220" OutName="mahouya_sceneTex_005220" Format="rgba16" Width="16" Height="128" Offset="0x5220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_006220" OutName="mahouya_sceneTex_006220" Format="rgba16" Width="16" Height="128" Offset="0x6220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007220" OutName="mahouya_sceneTex_007220" Format="rgba16" Width="32" Height="32" Offset="0x7220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_007A20" OutName="mahouya_sceneTex_007A20" Format="rgba16" Width="64" Height="32" Offset="0x7A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_008A20" OutName="mahouya_sceneTex_008A20" Format="i8" Width="16" Height="128" Offset="0x8A20" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009220" OutName="mahouya_sceneTex_009220" Format="rgba16" Width="32" Height="32" Offset="0x9220" AddedByScript="true"/>
+        <Texture Name="mahouya_sceneTex_009A20" OutName="mahouya_sceneTex_009A20" Format="rgba16" Width="64" Height="32" Offset="0x9A20" AddedByScript="true"/>
+        <Scene Name="mahouya_scene" Offset="0x0"/>
+    </File>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/malon_stable.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/malon_stable.xml
new file mode 100644
index 0000000000..aff97eeb86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/malon_stable.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="malon_stable_scene" Segment="2">
+        <Scene Name="malon_stable_scene" Offset="0x0"/>
+    </File>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/miharigoya.xml
new file mode 100644
index 0000000000..63f8676ac1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/miharigoya.xml
@@ -0,0 +1,28 @@
+<Root>
+    <File Name="miharigoya_scene" Segment="2">
+        <Texture Name="miharigoya_sceneTex_000C50" OutName="miharigoya_sceneTex_000C50" Format="ia8" Width="64" Height="16" Offset="0xC50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001050" OutName="miharigoya_sceneTex_001050" Format="rgba16" Width="32" Height="4" Offset="0x1050" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_001150" OutName="miharigoya_sceneTex_001150" Format="ia8" Width="32" Height="16" Offset="0x1150" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_003350" OutName="miharigoya_sceneTex_003350" Format="rgba16" Width="32" Height="8" Offset="0x3350" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004550" OutName="miharigoya_sceneTex_004550" Format="i8" Width="32" Height="32" Offset="0x4550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_004950" OutName="miharigoya_sceneTex_004950" Format="rgba16" Width="64" Height="32" Offset="0x4950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005950" OutName="miharigoya_sceneTex_005950" Format="i8" Width="32" Height="32" Offset="0x5950" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_005D50" OutName="miharigoya_sceneTex_005D50" Format="rgba16" Width="64" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_007550" OutName="miharigoya_sceneTex_007550" Format="rgba16" Width="32" Height="64" Offset="0x7550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008550" OutName="miharigoya_sceneTex_008550" Format="i4" Width="64" Height="64" Offset="0x8550" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_008D50" OutName="miharigoya_sceneTex_008D50" Format="i8" Width="64" Height="64" Offset="0x8D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_009D50" OutName="miharigoya_sceneTex_009D50" Format="rgba16" Width="32" Height="64" Offset="0x9D50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00AD50" OutName="miharigoya_sceneTex_00AD50" Format="i8" Width="64" Height="64" Offset="0xAD50" AddedByScript="true"/>
+        <Texture Name="miharigoya_sceneTex_00BD50" OutName="miharigoya_sceneTex_00BD50" Format="rgba16" Width="32" Height="32" Offset="0xBD50" AddedByScript="true"/>
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
+    </File>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/nakaniwa.xml
new file mode 100644
index 0000000000..2fb2d5e6a4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/nakaniwa.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+        <Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
+    </File>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Texture Name="nakaniwa_room_0Tex_007218" OutName="nakaniwa_room_0Tex_007218" Format="rgba16" Width="16" Height="16" Offset="0x7218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007418" OutName="nakaniwa_room_0Tex_007418" Format="rgba16" Width="16" Height="16" Offset="0x7418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007618" OutName="nakaniwa_room_0Tex_007618" Format="rgba16" Width="16" Height="16" Offset="0x7618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007818" OutName="nakaniwa_room_0Tex_007818" Format="rgba16" Width="16" Height="16" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_007A18" OutName="nakaniwa_room_0Tex_007A18" Format="rgba16" Width="32" Height="32" Offset="0x7A18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008218" OutName="nakaniwa_room_0Tex_008218" Format="rgba16" Width="16" Height="16" Offset="0x8218" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008418" OutName="nakaniwa_room_0Tex_008418" Format="rgba16" Width="16" Height="16" Offset="0x8418" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008618" OutName="nakaniwa_room_0Tex_008618" Format="rgba16" Width="32" Height="32" Offset="0x8618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_008E18" OutName="nakaniwa_room_0Tex_008E18" Format="rgba16" Width="32" Height="64" Offset="0x8E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_009E18" OutName="nakaniwa_room_0Tex_009E18" Format="rgba16" Width="32" Height="32" Offset="0x9E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00A618" OutName="nakaniwa_room_0Tex_00A618" Format="rgba16" Width="32" Height="64" Offset="0xA618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00B618" OutName="nakaniwa_room_0Tex_00B618" Format="rgba16" Width="32" Height="64" Offset="0xB618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00C618" OutName="nakaniwa_room_0Tex_00C618" Format="i4" Width="64" Height="64" Offset="0xC618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00CE18" OutName="nakaniwa_room_0Tex_00CE18" Format="rgba16" Width="32" Height="64" Offset="0xCE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00DE18" OutName="nakaniwa_room_0Tex_00DE18" Format="rgba16" Width="32" Height="32" Offset="0xDE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00E618" OutName="nakaniwa_room_0Tex_00E618" Format="rgba16" Width="16" Height="64" Offset="0xE618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00EE18" OutName="nakaniwa_room_0Tex_00EE18" Format="rgba16" Width="32" Height="32" Offset="0xEE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00F618" OutName="nakaniwa_room_0Tex_00F618" Format="rgba16" Width="32" Height="32" Offset="0xF618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_00FE18" OutName="nakaniwa_room_0Tex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010618" OutName="nakaniwa_room_0Tex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_010E18" OutName="nakaniwa_room_0Tex_010E18" Format="rgba16" Width="32" Height="32" Offset="0x10E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011618" OutName="nakaniwa_room_0Tex_011618" Format="rgba16" Width="32" Height="32" Offset="0x11618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_011E18" OutName="nakaniwa_room_0Tex_011E18" Format="rgba16" Width="32" Height="32" Offset="0x11E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012618" OutName="nakaniwa_room_0Tex_012618" Format="rgba16" Width="32" Height="32" Offset="0x12618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_012E18" OutName="nakaniwa_room_0Tex_012E18" Format="rgba16" Width="64" Height="16" Offset="0x12E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013618" OutName="nakaniwa_room_0Tex_013618" Format="rgba16" Width="32" Height="32" Offset="0x13618" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_013E18" OutName="nakaniwa_room_0Tex_013E18" Format="i4" Width="32" Height="32" Offset="0x13E18" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_014EC0" OutName="nakaniwa_room_0Tex_014EC0" Format="ia16" Width="32" Height="32" Offset="0x14EC0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0156C0" OutName="nakaniwa_room_0Tex_0156C0" Format="ia16" Width="64" Height="32" Offset="0x156C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_0166C0" OutName="nakaniwa_room_0Tex_0166C0" Format="rgba16" Width="32" Height="32" Offset="0x166C0" AddedByScript="true"/>
+        <Texture Name="nakaniwa_room_0Tex_016EC0" OutName="nakaniwa_room_0Tex_016EC0" Format="ia16" Width="32" Height="64" Offset="0x16EC0" AddedByScript="true"/>
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/syatekijyou.xml
new file mode 100644
index 0000000000..05243b52ca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/syatekijyou.xml
@@ -0,0 +1,30 @@
+<Root>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Texture Name="syatekijyou_sceneTex_001C40" OutName="syatekijyou_sceneTex_001C40" Format="rgba16" Width="32" Height="4" Offset="0x1C40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_001D40" OutName="syatekijyou_sceneTex_001D40" Format="rgba16" Width="32" Height="16" Offset="0x1D40" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002140" OutName="syatekijyou_sceneTex_002140" Format="rgba16" Width="32" Height="16" Offset="0x2140" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002540" OutName="syatekijyou_sceneTex_002540" Format="ia4" Width="32" Height="32" Offset="0x2540" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_002740" OutName="syatekijyou_sceneTex_002740" Format="rgba16" Width="64" Height="32" Offset="0x2740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003740" OutName="syatekijyou_sceneTex_003740" Format="ia8" Width="32" Height="16" Offset="0x3740" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003940" OutName="syatekijyou_sceneTex_003940" Format="rgba16" Width="4" Height="16" Offset="0x3940" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0039C0" OutName="syatekijyou_sceneTex_0039C0" Format="ia8" Width="16" Height="64" Offset="0x39C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_003DC0" OutName="syatekijyou_sceneTex_003DC0" Format="rgba16" Width="32" Height="16" Offset="0x3DC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0041C0" OutName="syatekijyou_sceneTex_0041C0" Format="rgba16" Width="32" Height="64" Offset="0x41C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0051C0" OutName="syatekijyou_sceneTex_0051C0" Format="ia8" Width="16" Height="16" Offset="0x51C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0052C0" OutName="syatekijyou_sceneTex_0052C0" Format="ia8" Width="16" Height="32" Offset="0x52C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_0054C0" OutName="syatekijyou_sceneTex_0054C0" Format="rgba16" Width="32" Height="32" Offset="0x54C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_005CC0" OutName="syatekijyou_sceneTex_005CC0" Format="rgba16" Width="32" Height="64" Offset="0x5CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_006CC0" OutName="syatekijyou_sceneTex_006CC0" Format="rgba16" Width="32" Height="64" Offset="0x6CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_007CC0" OutName="syatekijyou_sceneTex_007CC0" Format="i8" Width="64" Height="64" Offset="0x7CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_008CC0" OutName="syatekijyou_sceneTex_008CC0" Format="rgba16" Width="32" Height="64" Offset="0x8CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_009CC0" OutName="syatekijyou_sceneTex_009CC0" Format="ia4" Width="64" Height="64" Offset="0x9CC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00A4C0" OutName="syatekijyou_sceneTex_00A4C0" Format="rgba16" Width="32" Height="32" Offset="0xA4C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00ACC0" OutName="syatekijyou_sceneTex_00ACC0" Format="ia8" Width="32" Height="32" Offset="0xACC0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B0C0" OutName="syatekijyou_sceneTex_00B0C0" Format="i4" Width="32" Height="32" Offset="0xB0C0" AddedByScript="true"/>
+        <Texture Name="syatekijyou_sceneTex_00B2C0" OutName="syatekijyou_sceneTex_00B2C0" Format="rgba16" Width="64" Height="32" Offset="0xB2C0" AddedByScript="true"/>
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
+    </File>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/takaraya.xml
new file mode 100644
index 0000000000..5b438980b7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/takaraya.xml
@@ -0,0 +1,53 @@
+<Root>
+    <File Name="takaraya_scene" Segment="2">
+        <Texture Name="takaraya_sceneTex_0051B0" OutName="takaraya_sceneTex_0051B0" Format="rgba16" Width="32" Height="32" Offset="0x51B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0059B0" OutName="takaraya_sceneTex_0059B0" Format="rgba16" Width="32" Height="32" Offset="0x59B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0061B0" OutName="takaraya_sceneTex_0061B0" Format="rgba16" Width="32" Height="32" Offset="0x61B0" AddedByScript="true"/>
+        <Texture Name="takaraya_sceneTex_0069B0" OutName="takaraya_sceneTex_0069B0" Format="rgba16" Width="32" Height="32" Offset="0x69B0" AddedByScript="true"/>
+        <Scene Name="takaraya_scene" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_0" Segment="3">
+        <Texture Name="takaraya_room_0Tex_003BE0" OutName="takaraya_room_0Tex_003BE0" Format="rgba16" Width="16" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0043E0" OutName="takaraya_room_0Tex_0043E0" Format="rgba16" Width="32" Height="32" Offset="0x43E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_004BE0" OutName="takaraya_room_0Tex_004BE0" Format="rgba16" Width="64" Height="32" Offset="0x4BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_005BE0" OutName="takaraya_room_0Tex_005BE0" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0063E0" OutName="takaraya_room_0Tex_0063E0" Format="rgba16" Width="32" Height="32" Offset="0x63E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_006BE0" OutName="takaraya_room_0Tex_006BE0" Format="rgba16" Width="32" Height="32" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0073E0" OutName="takaraya_room_0Tex_0073E0" Format="rgba16" Width="32" Height="32" Offset="0x73E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_007BE0" OutName="takaraya_room_0Tex_007BE0" Format="rgba16" Width="32" Height="32" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0083E0" OutName="takaraya_room_0Tex_0083E0" Format="rgba16" Width="32" Height="64" Offset="0x83E0" AddedByScript="true"/>
+        <Texture Name="takaraya_room_0Tex_0095C0" OutName="takaraya_room_0Tex_0095C0" Format="ia4" Width="64" Height="64" Offset="0x95C0" AddedByScript="true"/>
+        <Room Name="takaraya_room_0" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_1" Segment="3">
+        <Texture Name="takaraya_room_1Tex_0017F8" OutName="takaraya_room_1Tex_0017F8" Format="rgba16" Width="16" Height="64" Offset="0x17F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_1" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_2" Segment="3">
+        <Texture Name="takaraya_room_2Tex_001828" OutName="takaraya_room_2Tex_001828" Format="rgba16" Width="16" Height="64" Offset="0x1828" AddedByScript="true"/>
+        <Room Name="takaraya_room_2" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_3" Segment="3">
+        <Texture Name="takaraya_room_3Tex_001818" OutName="takaraya_room_3Tex_001818" Format="rgba16" Width="16" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="takaraya_room_3Tex_002018" OutName="takaraya_room_3Tex_002018" Format="rgba16" Width="32" Height="32" Offset="0x2018" AddedByScript="true"/>
+        <Room Name="takaraya_room_3" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_4" Segment="3">
+        <Texture Name="takaraya_room_4Tex_001820" OutName="takaraya_room_4Tex_001820" Format="rgba16" Width="16" Height="64" Offset="0x1820" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002020" OutName="takaraya_room_4Tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" AddedByScript="true"/>
+        <Texture Name="takaraya_room_4Tex_002820" OutName="takaraya_room_4Tex_002820" Format="rgba16" Width="32" Height="32" Offset="0x2820" AddedByScript="true"/>
+        <Room Name="takaraya_room_4" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_5" Segment="3">
+        <Texture Name="takaraya_room_5Tex_0017F8" OutName="takaraya_room_5Tex_0017F8" Format="rgba16" Width="32" Height="32" Offset="0x17F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_001FF8" OutName="takaraya_room_5Tex_001FF8" Format="rgba16" Width="32" Height="32" Offset="0x1FF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_5Tex_0027F8" OutName="takaraya_room_5Tex_0027F8" Format="rgba16" Width="16" Height="64" Offset="0x27F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_5" Offset="0x0"/>
+    </File>
+    <File Name="takaraya_room_6" Segment="3">
+        <Texture Name="takaraya_room_6Tex_0012F8" OutName="takaraya_room_6Tex_0012F8" Format="rgba16" Width="32" Height="32" Offset="0x12F8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_001AF8" OutName="takaraya_room_6Tex_001AF8" Format="rgba16" Width="16" Height="64" Offset="0x1AF8" AddedByScript="true"/>
+        <Texture Name="takaraya_room_6Tex_0022F8" OutName="takaraya_room_6Tex_0022F8" Format="rgba16" Width="32" Height="32" Offset="0x22F8" AddedByScript="true"/>
+        <Room Name="takaraya_room_6" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/tent.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/tent.xml
new file mode 100644
index 0000000000..de72cc5f45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/tent.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="tent_scene" Segment="2">
+        <Scene Name="tent_scene" Offset="0x0"/>
+    </File>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/tokinoma.xml
new file mode 100644
index 0000000000..d7878b8951
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/tokinoma.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="tokinoma_scene" Segment="2">
+        <Texture Name="tokinoma_sceneTex_00CFA0" OutName="tokinoma_sceneTex_00CFA0" Format="rgba16" Width="32" Height="32" Offset="0xCFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00D7A0" OutName="tokinoma_sceneTex_00D7A0" Format="rgba16" Width="32" Height="32" Offset="0xD7A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00DFA0" OutName="tokinoma_sceneTex_00DFA0" Format="rgba16" Width="32" Height="64" Offset="0xDFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00EFA0" OutName="tokinoma_sceneTex_00EFA0" Format="rgba16" Width="32" Height="64" Offset="0xEFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_00FFA0" OutName="tokinoma_sceneTex_00FFA0" Format="rgba16" Width="32" Height="32" Offset="0xFFA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0107A0" OutName="tokinoma_sceneTex_0107A0" Format="rgba16" Width="32" Height="32" Offset="0x107A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_010FA0" OutName="tokinoma_sceneTex_010FA0" Format="rgba16" Width="32" Height="32" Offset="0x10FA0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_0117A0" OutName="tokinoma_sceneTex_0117A0" Format="rgba16" Width="32" Height="32" Offset="0x117A0" AddedByScript="true"/>
+        <Texture Name="tokinoma_sceneTex_011FA0" OutName="tokinoma_sceneTex_011FA0" Format="rgba16" Width="32" Height="32" Offset="0x11FA0" AddedByScript="true"/>
+        <Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
+        <Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Texture Name="tokinoma_room_0Tex_0081D8" OutName="tokinoma_room_0Tex_0081D8" Format="rgba16" Width="64" Height="32" Offset="0x81D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0091D8" OutName="tokinoma_room_0Tex_0091D8" Format="rgba16" Width="64" Height="32" Offset="0x91D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00A1D8" OutName="tokinoma_room_0Tex_00A1D8" Format="rgba16" Width="64" Height="32" Offset="0xA1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00B1D8" OutName="tokinoma_room_0Tex_00B1D8" Format="rgba16" Width="64" Height="32" Offset="0xB1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00C1D8" OutName="tokinoma_room_0Tex_00C1D8" Format="rgba16" Width="64" Height="32" Offset="0xC1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00D1D8" OutName="tokinoma_room_0Tex_00D1D8" Format="rgba16" Width="64" Height="32" Offset="0xD1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00E1D8" OutName="tokinoma_room_0Tex_00E1D8" Format="rgba16" Width="64" Height="32" Offset="0xE1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_00F1D8" OutName="tokinoma_room_0Tex_00F1D8" Format="rgba16" Width="64" Height="32" Offset="0xF1D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0101D8" OutName="tokinoma_room_0Tex_0101D8" Format="rgba16" Width="64" Height="32" Offset="0x101D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0111D8" OutName="tokinoma_room_0Tex_0111D8" Format="rgba16" Width="64" Height="32" Offset="0x111D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0121D8" OutName="tokinoma_room_0Tex_0121D8" Format="rgba16" Width="64" Height="32" Offset="0x121D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0131D8" OutName="tokinoma_room_0Tex_0131D8" Format="rgba16" Width="64" Height="32" Offset="0x131D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0141D8" OutName="tokinoma_room_0Tex_0141D8" Format="rgba16" Width="32" Height="32" Offset="0x141D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0149D8" OutName="tokinoma_room_0Tex_0149D8" Format="rgba16" Width="32" Height="32" Offset="0x149D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0151D8" OutName="tokinoma_room_0Tex_0151D8" Format="rgba16" Width="32" Height="32" Offset="0x151D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0159D8" OutName="tokinoma_room_0Tex_0159D8" Format="rgba16" Width="32" Height="32" Offset="0x159D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0161D8" OutName="tokinoma_room_0Tex_0161D8" Format="rgba16" Width="32" Height="32" Offset="0x161D8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_0Tex_0169D8" OutName="tokinoma_room_0Tex_0169D8" Format="rgba16" Width="32" Height="32" Offset="0x169D8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
+    </File>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Texture Name="tokinoma_room_1Tex_005458" OutName="tokinoma_room_1Tex_005458" Format="rgba16" Width="16" Height="16" Offset="0x5458" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005658" OutName="tokinoma_room_1Tex_005658" Format="rgba16" Width="16" Height="16" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_005858" OutName="tokinoma_room_1Tex_005858" Format="rgba16" Width="32" Height="32" Offset="0x5858" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_006488" OutName="tokinoma_room_1Tex_006488" Format="i8" Width="8" Height="8" Offset="0x6488" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0064C8" OutName="tokinoma_room_1Tex_0064C8" Format="ia4" Width="128" Height="16" Offset="0x64C8" AddedByScript="true"/>
+        <Texture Name="tokinoma_room_1Tex_0068C8" OutName="tokinoma_room_1Tex_0068C8" Format="ia8" Width="64" Height="32" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_tate.xml
new file mode 100644
index 0000000000..3b6dd2dec2
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_tate.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="yousei_izumi_tate_scene" Segment="2">
+        <Texture Name="yousei_izumi_tate_sceneTex_002010" OutName="yousei_izumi_tate_sceneTex_002010" Format="ia8" Width="64" Height="32" Offset="0x2010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_002810" OutName="yousei_izumi_tate_sceneTex_002810" Format="i8" Width="16" Height="256" Offset="0x2810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_003810" OutName="yousei_izumi_tate_sceneTex_003810" Format="ia16" Width="128" Height="16" Offset="0x3810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_004810" OutName="yousei_izumi_tate_sceneTex_004810" Format="i8" Width="32" Height="64" Offset="0x4810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005010" OutName="yousei_izumi_tate_sceneTex_005010" Format="i8" Width="32" Height="64" Offset="0x5010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_005810" OutName="yousei_izumi_tate_sceneTex_005810" Format="rgba16" Width="32" Height="32" Offset="0x5810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_006010" OutName="yousei_izumi_tate_sceneTex_006010" Format="i4" Width="64" Height="128" Offset="0x6010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007010" OutName="yousei_izumi_tate_sceneTex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_007810" OutName="yousei_izumi_tate_sceneTex_007810" Format="rgba16" Width="32" Height="32" Offset="0x7810" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_tate_sceneTex_008010" OutName="yousei_izumi_tate_sceneTex_008010" Format="rgba16" Width="32" Height="32" Offset="0x8010" AddedByScript="true"/>
+        <Scene Name="yousei_izumi_tate_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_yoko.xml
new file mode 100644
index 0000000000..90a8d95d09
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/indoors/yousei_izumi_yoko.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
+        <Texture Name="yousei_izumi_yoko_sceneTex_003DA0" OutName="yousei_izumi_yoko_sceneTex_003DA0" Format="i8" Width="32" Height="64" Offset="0x3DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0045A0" OutName="yousei_izumi_yoko_sceneTex_0045A0" Format="rgba16" Width="32" Height="32" Offset="0x45A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_004DA0" OutName="yousei_izumi_yoko_sceneTex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0055A0" OutName="yousei_izumi_yoko_sceneTex_0055A0" Format="ia4" Width="64" Height="128" Offset="0x55A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0065A0" OutName="yousei_izumi_yoko_sceneTex_0065A0" Format="rgba16" Width="32" Height="64" Offset="0x65A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0075A0" OutName="yousei_izumi_yoko_sceneTex_0075A0" Format="rgba16" Width="32" Height="64" Offset="0x75A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0085A0" OutName="yousei_izumi_yoko_sceneTex_0085A0" Format="rgba16" Width="32" Height="64" Offset="0x85A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_0095A0" OutName="yousei_izumi_yoko_sceneTex_0095A0" Format="rgba16" Width="32" Height="32" Offset="0x95A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_009DA0" OutName="yousei_izumi_yoko_sceneTex_009DA0" Format="i8" Width="32" Height="128" Offset="0x9DA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00ADA0" OutName="yousei_izumi_yoko_sceneTex_00ADA0" Format="rgba16" Width="32" Height="32" Offset="0xADA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00B5A0" OutName="yousei_izumi_yoko_sceneTex_00B5A0" Format="ia8" Width="64" Height="32" Offset="0xB5A0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00BDA0" OutName="yousei_izumi_yoko_sceneTex_00BDA0" Format="rgba16" Width="32" Height="32" Offset="0xBDA0" AddedByScript="true"/>
+        <Texture Name="yousei_izumi_yoko_sceneTex_00C5A0" OutName="yousei_izumi_yoko_sceneTex_00C5A0" Format="rgba16" Width="32" Height="32" Offset="0xC5A0" AddedByScript="true"/>
+        <Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
+        <Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
+        <Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
+        <Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
+    </File>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/enrui.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/enrui.xml
new file mode 100644
index 0000000000..d8c06e5454
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/enrui.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="enrui_scene" Segment="2">
+        <Scene Name="enrui_scene" Offset="0x0"/>
+    </File>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/entra_n.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/entra_n.xml
new file mode 100644
index 0000000000..5b408ac3a6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/entra_n.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_n_scene" Segment="2">
+        <Scene Name="entra_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana.xml
new file mode 100644
index 0000000000..e7dc93dd0c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="hakaana_scene" Segment="2">
+        <Scene Name="hakaana_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_room_0" Segment="3">
+        <Texture Name="hakaana_room_0Tex_002658" OutName="hakaana_room_0Tex_002658" Format="rgba16" Width="32" Height="32" Offset="0x2658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_002E58" OutName="hakaana_room_0Tex_002E58" Format="rgba16" Width="32" Height="16" Offset="0x2E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003258" OutName="hakaana_room_0Tex_003258" Format="rgba16" Width="32" Height="16" Offset="0x3258" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003658" OutName="hakaana_room_0Tex_003658" Format="rgba16" Width="32" Height="32" Offset="0x3658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_003E58" OutName="hakaana_room_0Tex_003E58" Format="i4" Width="128" Height="32" Offset="0x3E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004658" OutName="hakaana_room_0Tex_004658" Format="rgba16" Width="32" Height="32" Offset="0x4658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_004E58" OutName="hakaana_room_0Tex_004E58" Format="i4" Width="64" Height="64" Offset="0x4E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005658" OutName="hakaana_room_0Tex_005658" Format="i4" Width="64" Height="64" Offset="0x5658" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_005E58" OutName="hakaana_room_0Tex_005E58" Format="i4" Width="64" Height="64" Offset="0x5E58" AddedByScript="true"/>
+        <Texture Name="hakaana_room_0Tex_0068C8" OutName="hakaana_room_0Tex_0068C8" Format="ia16" Width="128" Height="16" Offset="0x68C8" AddedByScript="true"/>
+        <Room Name="hakaana_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana2.xml
new file mode 100644
index 0000000000..2d8ba4906a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana2.xml
@@ -0,0 +1,26 @@
+<Root>
+    <File Name="hakaana2_scene" Segment="2">
+        <Texture Name="hakaana2_sceneTex_003090" OutName="hakaana2_sceneTex_003090" Format="rgba16" Width="32" Height="32" Offset="0x3090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_003890" OutName="hakaana2_sceneTex_003890" Format="rgba16" Width="32" Height="32" Offset="0x3890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004090" OutName="hakaana2_sceneTex_004090" Format="rgba16" Width="32" Height="16" Offset="0x4090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004490" OutName="hakaana2_sceneTex_004490" Format="rgba16" Width="32" Height="16" Offset="0x4490" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_004890" OutName="hakaana2_sceneTex_004890" Format="i4" Width="64" Height="64" Offset="0x4890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005090" OutName="hakaana2_sceneTex_005090" Format="i4" Width="64" Height="64" Offset="0x5090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_005890" OutName="hakaana2_sceneTex_005890" Format="i4" Width="128" Height="32" Offset="0x5890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006090" OutName="hakaana2_sceneTex_006090" Format="i4" Width="64" Height="64" Offset="0x6090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_006890" OutName="hakaana2_sceneTex_006890" Format="ia8" Width="64" Height="32" Offset="0x6890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_007090" OutName="hakaana2_sceneTex_007090" Format="i8" Width="16" Height="256" Offset="0x7090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_008090" OutName="hakaana2_sceneTex_008090" Format="ia16" Width="128" Height="16" Offset="0x8090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009090" OutName="hakaana2_sceneTex_009090" Format="i8" Width="32" Height="64" Offset="0x9090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_009890" OutName="hakaana2_sceneTex_009890" Format="i8" Width="32" Height="64" Offset="0x9890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A090" OutName="hakaana2_sceneTex_00A090" Format="rgba16" Width="32" Height="32" Offset="0xA090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00A890" OutName="hakaana2_sceneTex_00A890" Format="i4" Width="64" Height="128" Offset="0xA890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00B890" OutName="hakaana2_sceneTex_00B890" Format="rgba16" Width="32" Height="32" Offset="0xB890" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C090" OutName="hakaana2_sceneTex_00C090" Format="rgba16" Width="32" Height="32" Offset="0xC090" AddedByScript="true"/>
+        <Texture Name="hakaana2_sceneTex_00C890" OutName="hakaana2_sceneTex_00C890" Format="rgba16" Width="32" Height="32" Offset="0xC890" AddedByScript="true"/>
+        <Scene Name="hakaana2_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana_ouke.xml
new file mode 100644
index 0000000000..17f53613e4
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/hakaana_ouke.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="hakaana_ouke_scene" Segment="2">
+        <Texture Name="hakaana_ouke_sceneTex_002AE0" OutName="hakaana_ouke_sceneTex_002AE0" Format="rgba16" Width="32" Height="16" Offset="0x2AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_002EE0" OutName="hakaana_ouke_sceneTex_002EE0" Format="rgba16" Width="32" Height="16" Offset="0x2EE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0032E0" OutName="hakaana_ouke_sceneTex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_003AE0" OutName="hakaana_ouke_sceneTex_003AE0" Format="i4" Width="64" Height="64" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_sceneTex_0042E0" OutName="hakaana_ouke_sceneTex_0042E0" Format="i4" Width="64" Height="64" Offset="0x42E0" AddedByScript="true"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
+        <Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
+        <Scene Name="hakaana_ouke_scene" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Texture Name="hakaana_ouke_room_0Tex_004F30" OutName="hakaana_ouke_room_0Tex_004F30" Format="rgba16" Width="16" Height="64" Offset="0x4F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_005730" OutName="hakaana_ouke_room_0Tex_005730" Format="rgba16" Width="32" Height="64" Offset="0x5730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006730" OutName="hakaana_ouke_room_0Tex_006730" Format="i4" Width="128" Height="32" Offset="0x6730" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_006F30" OutName="hakaana_ouke_room_0Tex_006F30" Format="i4" Width="64" Height="64" Offset="0x6F30" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_007FF8" OutName="hakaana_ouke_room_0Tex_007FF8" Format="ia4" Width="32" Height="256" Offset="0x7FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_008FF8" OutName="hakaana_ouke_room_0Tex_008FF8" Format="ia8" Width="8" Height="256" Offset="0x8FF8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_0Tex_0097F8" OutName="hakaana_ouke_room_0Tex_0097F8" Format="ia16" Width="128" Height="16" Offset="0x97F8" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Texture Name="hakaana_ouke_room_1Tex_001FC8" OutName="hakaana_ouke_room_1Tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_0027C8" OutName="hakaana_ouke_room_1Tex_0027C8" Format="rgba16" Width="32" Height="64" Offset="0x27C8" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_1Tex_004000" OutName="hakaana_ouke_room_1Tex_004000" Format="i8" Width="16" Height="128" Offset="0x4000" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
+    </File>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Texture Name="hakaana_ouke_room_2Tex_002778" OutName="hakaana_ouke_room_2Tex_002778" Format="i4" Width="128" Height="32" Offset="0x2778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_002F78" OutName="hakaana_ouke_room_2Tex_002F78" Format="rgba16" Width="32" Height="32" Offset="0x2F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003778" OutName="hakaana_ouke_room_2Tex_003778" Format="i4" Width="128" Height="32" Offset="0x3778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_003F78" OutName="hakaana_ouke_room_2Tex_003F78" Format="rgba16" Width="32" Height="32" Offset="0x3F78" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_004778" OutName="hakaana_ouke_room_2Tex_004778" Format="i4" Width="64" Height="64" Offset="0x4778" AddedByScript="true"/>
+        <Texture Name="hakaana_ouke_room_2Tex_005108" OutName="hakaana_ouke_room_2Tex_005108" Format="ia8" Width="128" Height="32" Offset="0x5108" AddedByScript="true"/>
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/hiral_demo.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/hiral_demo.xml
new file mode 100644
index 0000000000..1331fdd4c5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/hiral_demo.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="hiral_demo_scene" Segment="2">
+        <Scene Name="hiral_demo_scene" Offset="0x0"/>
+    </File>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/kakariko3.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/kakariko3.xml
new file mode 100644
index 0000000000..07b62c44df
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/kakariko3.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kakariko3_scene" Segment="2">
+        <Scene Name="kakariko3_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/kakusiana.xml
new file mode 100644
index 0000000000..c3f993ff4f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/kakusiana.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="kakusiana_scene" Segment="2">
+        <Texture Name="kakusiana_sceneTex_00B820" OutName="kakusiana_sceneTex_00B820" Format="ia4" Width="64" Height="64" Offset="0xB820" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00C020" OutName="kakusiana_sceneTex_00C020" Format="ia16" Width="128" Height="16" Offset="0xC020" AddedByScript="true"/>
+        <Texture Name="kakusiana_sceneTex_00D020" OutName="kakusiana_sceneTex_00D020" Format="rgba16" Width="32" Height="32" Offset="0xD020" AddedByScript="true"/>
+        <Scene Name="kakusiana_scene" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Texture Name="kakusiana_room_0Tex_0022A0" OutName="kakusiana_room_0Tex_0022A0" Format="rgba16" Width="64" Height="32" Offset="0x22A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0032A0" OutName="kakusiana_room_0Tex_0032A0" Format="rgba16" Width="64" Height="32" Offset="0x32A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_0042A0" OutName="kakusiana_room_0Tex_0042A0" Format="rgba16" Width="32" Height="32" Offset="0x42A0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_004AA0" OutName="kakusiana_room_0Tex_004AA0" Format="i8" Width="64" Height="64" Offset="0x4AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_005AA0" OutName="kakusiana_room_0Tex_005AA0" Format="rgba16" Width="32" Height="32" Offset="0x5AA0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_0Tex_006AA0" OutName="kakusiana_room_0Tex_006AA0" Format="rgba16" Width="32" Height="32" Offset="0x6AA0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Texture Name="kakusiana_room_1Tex_001A18" OutName="kakusiana_room_1Tex_001A18" Format="i8" Width="64" Height="64" Offset="0x1A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_002A18" OutName="kakusiana_room_1Tex_002A18" Format="rgba16" Width="32" Height="32" Offset="0x2A18" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_003218" OutName="kakusiana_room_1Tex_003218" Format="i8" Width="64" Height="64" Offset="0x3218" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_1Tex_004990" OutName="kakusiana_room_1Tex_004990" Format="ia8" Width="8" Height="256" Offset="0x4990" AddedByScript="true"/>
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Texture Name="kakusiana_room_2Tex_001448" OutName="kakusiana_room_2Tex_001448" Format="rgba16" Width="32" Height="32" Offset="0x1448" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_2Tex_001C48" OutName="kakusiana_room_2Tex_001C48" Format="rgba16" Width="32" Height="32" Offset="0x1C48" AddedByScript="true"/>
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Texture Name="kakusiana_room_3Tex_001818" OutName="kakusiana_room_3Tex_001818" Format="i8" Width="64" Height="64" Offset="0x1818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_002818" OutName="kakusiana_room_3Tex_002818" Format="i8" Width="64" Height="64" Offset="0x2818" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004130" OutName="kakusiana_room_3Tex_004130" Format="ia8" Width="8" Height="256" Offset="0x4130" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_3Tex_004930" OutName="kakusiana_room_3Tex_004930" Format="rgba16" Width="32" Height="32" Offset="0x4930" AddedByScript="true"/>
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Texture Name="kakusiana_room_4Tex_002138" OutName="kakusiana_room_4Tex_002138" Format="rgba16" Width="32" Height="64" Offset="0x2138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_003138" OutName="kakusiana_room_4Tex_003138" Format="rgba16" Width="32" Height="64" Offset="0x3138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_004138" OutName="kakusiana_room_4Tex_004138" Format="rgba16" Width="32" Height="32" Offset="0x4138" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_005958" OutName="kakusiana_room_4Tex_005958" Format="i8" Width="64" Height="64" Offset="0x5958" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_4Tex_006958" OutName="kakusiana_room_4Tex_006958" Format="i8" Width="64" Height="64" Offset="0x6958" AddedByScript="true"/>
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Texture Name="kakusiana_room_5Tex_001888" OutName="kakusiana_room_5Tex_001888" Format="i8" Width="64" Height="64" Offset="0x1888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_002888" OutName="kakusiana_room_5Tex_002888" Format="i8" Width="64" Height="64" Offset="0x2888" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_5Tex_003ED8" OutName="kakusiana_room_5Tex_003ED8" Format="rgba16" Width="32" Height="32" Offset="0x3ED8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Texture Name="kakusiana_room_6Tex_0022E0" OutName="kakusiana_room_6Tex_0022E0" Format="rgba16" Width="32" Height="64" Offset="0x22E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_0032E0" OutName="kakusiana_room_6Tex_0032E0" Format="rgba16" Width="32" Height="32" Offset="0x32E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_003AE0" OutName="kakusiana_room_6Tex_003AE0" Format="rgba16" Width="64" Height="32" Offset="0x3AE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_6Tex_004AE0" OutName="kakusiana_room_6Tex_004AE0" Format="rgba16" Width="32" Height="32" Offset="0x4AE0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Texture Name="kakusiana_room_7Tex_001D60" OutName="kakusiana_room_7Tex_001D60" Format="rgba16" Width="32" Height="16" Offset="0x1D60" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002160" OutName="kakusiana_room_7Tex_002160" Format="rgba16" Width="32" Height="32" Offset="0x2160" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002960" OutName="kakusiana_room_7Tex_002960" Format="rgba16" Width="16" Height="16" Offset="0x2960" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_7Tex_002B60" OutName="kakusiana_room_7Tex_002B60" Format="i8" Width="64" Height="64" Offset="0x2B60" AddedByScript="true"/>
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Texture Name="kakusiana_room_8Tex_0019C0" OutName="kakusiana_room_8Tex_0019C0" Format="rgba16" Width="32" Height="64" Offset="0x19C0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_8Tex_0029C0" OutName="kakusiana_room_8Tex_0029C0" Format="rgba16" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Texture Name="kakusiana_room_9Tex_002340" OutName="kakusiana_room_9Tex_002340" Format="rgba16" Width="32" Height="64" Offset="0x2340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003340" OutName="kakusiana_room_9Tex_003340" Format="rgba16" Width="32" Height="32" Offset="0x3340" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_003B40" OutName="kakusiana_room_9Tex_003B40" Format="rgba16" Width="64" Height="32" Offset="0x3B40" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_9Tex_004B40" OutName="kakusiana_room_9Tex_004B40" Format="rgba16" Width="32" Height="32" Offset="0x4B40" AddedByScript="true"/>
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Texture Name="kakusiana_room_10Tex_0017E0" OutName="kakusiana_room_10Tex_0017E0" Format="i8" Width="32" Height="64" Offset="0x17E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_001FE0" OutName="kakusiana_room_10Tex_001FE0" Format="i8" Width="32" Height="64" Offset="0x1FE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_0027E0" OutName="kakusiana_room_10Tex_0027E0" Format="i8" Width="32" Height="32" Offset="0x27E0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_002BE0" OutName="kakusiana_room_10Tex_002BE0" Format="i8" Width="64" Height="64" Offset="0x2BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_003BE0" OutName="kakusiana_room_10Tex_003BE0" Format="i8" Width="64" Height="64" Offset="0x3BE0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_10Tex_005228" OutName="kakusiana_room_10Tex_005228" Format="rgba16" Width="32" Height="32" Offset="0x5228" AddedByScript="true"/>
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Texture Name="kakusiana_room_11Tex_002848" OutName="kakusiana_room_11Tex_002848" Format="rgba16" Width="32" Height="32" Offset="0x2848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_003048" OutName="kakusiana_room_11Tex_003048" Format="rgba16" Width="32" Height="64" Offset="0x3048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_004048" OutName="kakusiana_room_11Tex_004048" Format="rgba16" Width="32" Height="64" Offset="0x4048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005048" OutName="kakusiana_room_11Tex_005048" Format="rgba16" Width="32" Height="32" Offset="0x5048" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_005848" OutName="kakusiana_room_11Tex_005848" Format="rgba16" Width="64" Height="32" Offset="0x5848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_006848" OutName="kakusiana_room_11Tex_006848" Format="rgba16" Width="64" Height="32" Offset="0x6848" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_11Tex_007848" OutName="kakusiana_room_11Tex_007848" Format="rgba16" Width="32" Height="32" Offset="0x7848" AddedByScript="true"/>
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Texture Name="kakusiana_room_12Tex_001FF0" OutName="kakusiana_room_12Tex_001FF0" Format="rgba16" Width="32" Height="32" Offset="0x1FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0027F0" OutName="kakusiana_room_12Tex_0027F0" Format="rgba16" Width="32" Height="64" Offset="0x27F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0037F0" OutName="kakusiana_room_12Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_0047F0" OutName="kakusiana_room_12Tex_0047F0" Format="rgba16" Width="32" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_004FF0" OutName="kakusiana_room_12Tex_004FF0" Format="rgba16" Width="64" Height="32" Offset="0x4FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_005FF0" OutName="kakusiana_room_12Tex_005FF0" Format="rgba16" Width="64" Height="32" Offset="0x5FF0" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_12Tex_006FF0" OutName="kakusiana_room_12Tex_006FF0" Format="rgba16" Width="32" Height="32" Offset="0x6FF0" AddedByScript="true"/>
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
+    </File>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Texture Name="kakusiana_room_13Tex_001950" OutName="kakusiana_room_13Tex_001950" Format="rgba16" Width="32" Height="64" Offset="0x1950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_002950" OutName="kakusiana_room_13Tex_002950" Format="rgba16" Width="32" Height="64" Offset="0x2950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_003950" OutName="kakusiana_room_13Tex_003950" Format="rgba16" Width="32" Height="32" Offset="0x3950" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_004EC8" OutName="kakusiana_room_13Tex_004EC8" Format="i8" Width="64" Height="64" Offset="0x4EC8" AddedByScript="true"/>
+        <Texture Name="kakusiana_room_13Tex_005EC8" OutName="kakusiana_room_13Tex_005EC8" Format="i8" Width="64" Height="64" Offset="0x5EC8" AddedByScript="true"/>
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/kinsuta.xml
new file mode 100644
index 0000000000..aac0f6c4ea
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/kinsuta.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="kinsuta_scene" Segment="2">
+        <Scene Name="kinsuta_scene" Offset="0x0"/>
+    </File>
+    <File Name="kinsuta_room_0" Segment="3">
+        <Texture Name="kinsuta_room_0Tex_003110" OutName="kinsuta_room_0Tex_003110" Format="ci4" Width="64" Height="64" Offset="0x3110" TlutOffset="0x30F0" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_003910" OutName="kinsuta_room_0Tex_003910" Format="i4" Width="64" Height="128" Offset="0x3910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_004910" OutName="kinsuta_room_0Tex_004910" Format="i4" Width="64" Height="128" Offset="0x4910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_005910" OutName="kinsuta_room_0Tex_005910" Format="i4" Width="64" Height="128" Offset="0x5910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_006910" OutName="kinsuta_room_0Tex_006910" Format="rgba16" Width="32" Height="64" Offset="0x6910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_007910" OutName="kinsuta_room_0Tex_007910" Format="rgba16" Width="32" Height="64" Offset="0x7910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008910" OutName="kinsuta_room_0Tex_008910" Format="i8" Width="32" Height="32" Offset="0x8910" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_008D10" OutName="kinsuta_room_0Tex_008D10" Format="rgba16" Width="64" Height="32" Offset="0x8D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_009D10" OutName="kinsuta_room_0Tex_009D10" Format="rgba16" Width="32" Height="16" Offset="0x9D10" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00B098" OutName="kinsuta_room_0Tex_00B098" Format="ia16" Width="32" Height="64" Offset="0xB098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00C098" OutName="kinsuta_room_0Tex_00C098" Format="i8" Width="64" Height="64" Offset="0xC098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0Tex_00D098" OutName="kinsuta_room_0Tex_00D098" Format="i8" Width="64" Height="64" Offset="0xD098" AddedByScript="true"/>
+        <Texture Name="kinsuta_room_0TLUT_0030F0" OutName="kinsuta_room_0TLUT_0030F0" Format="rgba16" Width="4" Height="4" Offset="0x30F0" AddedByScript="true"/>
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley.xml
new file mode 100644
index 0000000000..c304673032
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_alley_scene" Segment="2">
+        <Scene Name="market_alley_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley_n.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley_n.xml
new file mode 100644
index 0000000000..65db604113
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_alley_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="gMarketAlleyNightPath_0019C" Offset="0x19C" NumPaths="4"/>
+        <Scene Name="market_alley_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/market_day.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_day.xml
new file mode 100644
index 0000000000..00887e69cd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_day.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_day_scene" Segment="2">
+        <Path Name="gMarketDayPath_00330" Offset="0x330" NumPaths="4"/>
+        <Scene Name="market_day_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/market_night.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_night.xml
new file mode 100644
index 0000000000..c58e38744e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_night.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="market_night_scene" Segment="2">
+        <Path Name="gMarketNightPath_002FC" Offset="0x2FC" NumPaths="7"/>
+        <Scene Name="market_night_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/market_ruins.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_ruins.xml
new file mode 100644
index 0000000000..f0ec75e759
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/market_ruins.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="market_ruins_scene" Segment="2">
+        <Scene Name="market_ruins_scene" Offset="0x0"/>
+    </File>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine.xml
new file mode 100644
index 0000000000..b9ddf2cf70
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_scene" Segment="2">
+        <Scene Name="shrine_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_n.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_n.xml
new file mode 100644
index 0000000000..4878338aa1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_n.xml
@@ -0,0 +1,9 @@
+<Root>
+    <File Name="shrine_n_scene" Segment="2">
+        <Path Name="gShrinePath_00100" Offset="0x100" NumPaths="2"/>
+        <Scene Name="shrine_n_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_r.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_r.xml
new file mode 100644
index 0000000000..1220367919
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/shrine_r.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shrine_r_scene" Segment="2">
+        <Scene Name="shrine_r_scene" Offset="0x0"/>
+    </File>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/misc/turibori.xml b/soh/assets/xml/N64_NTSC_12/scenes/misc/turibori.xml
new file mode 100644
index 0000000000..0633224d9c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/misc/turibori.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="turibori_scene" Segment="2">
+        <Texture Name="turibori_sceneTex_001CE0" OutName="turibori_sceneTex_001CE0" Format="rgba16" Width="32" Height="64" Offset="0x1CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_002CE0" OutName="turibori_sceneTex_002CE0" Format="rgba16" Width="64" Height="32" Offset="0x2CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_003CE0" OutName="turibori_sceneTex_003CE0" Format="rgba16" Width="64" Height="32" Offset="0x3CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004CE0" OutName="turibori_sceneTex_004CE0" Format="rgba16" Width="32" Height="4" Offset="0x4CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_004DE0" OutName="turibori_sceneTex_004DE0" Format="rgba16" Width="32" Height="16" Offset="0x4DE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0051E0" OutName="turibori_sceneTex_0051E0" Format="ia16" Width="32" Height="32" Offset="0x51E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0059E0" OutName="turibori_sceneTex_0059E0" Format="ia8" Width="64" Height="64" Offset="0x59E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0069E0" OutName="turibori_sceneTex_0069E0" Format="ia8" Width="32" Height="16" Offset="0x69E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_006BE0" OutName="turibori_sceneTex_006BE0" Format="rgba16" Width="32" Height="64" Offset="0x6BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007BE0" OutName="turibori_sceneTex_007BE0" Format="ia8" Width="64" Height="16" Offset="0x7BE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_007FE0" OutName="turibori_sceneTex_007FE0" Format="rgba16" Width="32" Height="8" Offset="0x7FE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0081E0" OutName="turibori_sceneTex_0081E0" Format="rgba16" Width="64" Height="32" Offset="0x81E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0091E0" OutName="turibori_sceneTex_0091E0" Format="ia8" Width="16" Height="16" Offset="0x91E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0092E0" OutName="turibori_sceneTex_0092E0" Format="ia8" Width="16" Height="32" Offset="0x92E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0094E0" OutName="turibori_sceneTex_0094E0" Format="rgba16" Width="32" Height="32" Offset="0x94E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_009CE0" OutName="turibori_sceneTex_009CE0" Format="rgba16" Width="32" Height="64" Offset="0x9CE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ACE0" OutName="turibori_sceneTex_00ACE0" Format="rgba16" Width="64" Height="32" Offset="0xACE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00BCE0" OutName="turibori_sceneTex_00BCE0" Format="ia8" Width="32" Height="128" Offset="0xBCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00CCE0" OutName="turibori_sceneTex_00CCE0" Format="rgba16" Width="64" Height="32" Offset="0xCCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00DCE0" OutName="turibori_sceneTex_00DCE0" Format="rgba16" Width="32" Height="32" Offset="0xDCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00E4E0" OutName="turibori_sceneTex_00E4E0" Format="rgba16" Width="32" Height="32" Offset="0xE4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00ECE0" OutName="turibori_sceneTex_00ECE0" Format="rgba16" Width="32" Height="32" Offset="0xECE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00F4E0" OutName="turibori_sceneTex_00F4E0" Format="ia4" Width="64" Height="64" Offset="0xF4E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_00FCE0" OutName="turibori_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0104E0" OutName="turibori_sceneTex_0104E0" Format="rgba16" Width="64" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0114E0" OutName="turibori_sceneTex_0114E0" Format="i4" Width="32" Height="32" Offset="0x114E0" AddedByScript="true"/>
+        <Texture Name="turibori_sceneTex_0116E0" OutName="turibori_sceneTex_0116E0" Format="rgba16" Width="32" Height="64" Offset="0x116E0" AddedByScript="true"/>
+        <Scene Name="turibori_scene" Offset="0x0"/>
+    </File>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/entra.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/entra.xml
new file mode 100644
index 0000000000..92ee57f59a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/entra.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="entra_scene" Segment="2">
+        <Scene Name="entra_scene" Offset="0x0"/>
+    </File>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/souko.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/souko.xml
new file mode 100644
index 0000000000..8dd9d9e48a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/souko.xml
@@ -0,0 +1,44 @@
+<Root>
+    <File Name="souko_scene" Segment="2">
+        <Texture Name="souko_sceneTex_004410" OutName="souko_sceneTex_004410" Format="rgba16" Width="32" Height="32" Offset="0x4410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_004C10" OutName="souko_sceneTex_004C10" Format="rgba16" Width="32" Height="16" Offset="0x4C10" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005410" OutName="souko_sceneTex_005410" Format="rgba16" Width="32" Height="32" Offset="0x5410" AddedByScript="true"/>
+        <Texture Name="souko_sceneTex_005C10" OutName="souko_sceneTex_005C10" Format="rgba16" Width="64" Height="32" Offset="0x5C10" AddedByScript="true"/>
+        <Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/> 
+        <Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/> 
+        <Scene Name="souko_scene" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_0" Segment="3">
+        <Texture Name="souko_room_0Tex_0054F8" OutName="souko_room_0Tex_0054F8" Format="i4" Width="64" Height="64" Offset="0x54F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_005CF8" OutName="souko_room_0Tex_005CF8" Format="rgba16" Width="32" Height="32" Offset="0x5CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0064F8" OutName="souko_room_0Tex_0064F8" Format="rgba16" Width="32" Height="32" Offset="0x64F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_006CF8" OutName="souko_room_0Tex_006CF8" Format="rgba16" Width="16" Height="32" Offset="0x6CF8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0070F8" OutName="souko_room_0Tex_0070F8" Format="rgba16" Width="32" Height="32" Offset="0x70F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0078F8" OutName="souko_room_0Tex_0078F8" Format="rgba16" Width="32" Height="32" Offset="0x78F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0080F8" OutName="souko_room_0Tex_0080F8" Format="rgba16" Width="32" Height="64" Offset="0x80F8" AddedByScript="true"/>
+        <Texture Name="souko_room_0Tex_0090F8" OutName="souko_room_0Tex_0090F8" Format="i4" Width="32" Height="32" Offset="0x90F8" AddedByScript="true"/>
+        <Room Name="souko_room_0" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_1" Segment="3">
+        <Texture Name="souko_room_1Tex_005118" OutName="souko_room_1Tex_005118" Format="rgba16" Width="16" Height="64" Offset="0x5118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_005918" OutName="souko_room_1Tex_005918" Format="rgba16" Width="32" Height="32" Offset="0x5918" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_006118" OutName="souko_room_1Tex_006118" Format="rgba16" Width="32" Height="64" Offset="0x6118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007118" OutName="souko_room_1Tex_007118" Format="rgba16" Width="16" Height="32" Offset="0x7118" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007518" OutName="souko_room_1Tex_007518" Format="rgba16" Width="32" Height="32" Offset="0x7518" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_007D18" OutName="souko_room_1Tex_007D18" Format="rgba16" Width="32" Height="64" Offset="0x7D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_008D18" OutName="souko_room_1Tex_008D18" Format="rgba16" Width="32" Height="32" Offset="0x8D18" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_009F28" OutName="souko_room_1Tex_009F28" Format="rgba16" Width="16" Height="16" Offset="0x9F28" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A128" OutName="souko_room_1Tex_00A128" Format="ia8" Width="16" Height="16" Offset="0xA128" AddedByScript="true"/>
+        <Texture Name="souko_room_1Tex_00A228" OutName="souko_room_1Tex_00A228" Format="ia8" Width="16" Height="32" Offset="0xA228" AddedByScript="true"/>
+        <Room Name="souko_room_1" Offset="0x0"/>
+    </File>
+    <File Name="souko_room_2" Segment="3">
+        <Texture Name="souko_room_2Tex_004EE0" OutName="souko_room_2Tex_004EE0" Format="rgba16" Width="16" Height="32" Offset="0x4EE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0052E0" OutName="souko_room_2Tex_0052E0" Format="i4" Width="64" Height="64" Offset="0x52E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_005AE0" OutName="souko_room_2Tex_005AE0" Format="rgba16" Width="8" Height="128" Offset="0x5AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_0062E0" OutName="souko_room_2Tex_0062E0" Format="rgba16" Width="16" Height="64" Offset="0x62E0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_006AE0" OutName="souko_room_2Tex_006AE0" Format="rgba16" Width="32" Height="64" Offset="0x6AE0" AddedByScript="true"/>
+        <Texture Name="souko_room_2Tex_007F78" OutName="souko_room_2Tex_007F78" Format="ia8" Width="16" Height="32" Offset="0x7F78" AddedByScript="true"/>
+        <Room Name="souko_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot00.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot00.xml
new file mode 100644
index 0000000000..508d9309b3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot00.xml
@@ -0,0 +1,69 @@
+<Root>
+    <File Name="spot00_scene" Segment="2">
+        <Texture Name="spot00_sceneTex_013D98" OutName="spot00_sceneTex_013D98" Format="rgba16" Width="32" Height="32" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014598" OutName="spot00_sceneTex_014598" Format="rgba16" Width="16" Height="32" Offset="0x14598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014998" OutName="spot00_sceneTex_014998" Format="rgba16" Width="32" Height="16" Offset="0x14998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_014D98" OutName="spot00_sceneTex_014D98" Format="rgba16" Width="64" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015D98" OutName="spot00_sceneTex_015D98" Format="rgba16" Width="8" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_015E98" OutName="spot00_sceneTex_015E98" Format="rgba16" Width="16" Height="64" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016698" OutName="spot00_sceneTex_016698" Format="rgba16" Width="32" Height="16" Offset="0x16698" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016A98" OutName="spot00_sceneTex_016A98" Format="ia4" Width="16" Height="32" Offset="0x16A98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_016B98" OutName="spot00_sceneTex_016B98" Format="rgba16" Width="32" Height="32" Offset="0x16B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017398" OutName="spot00_sceneTex_017398" Format="rgba16" Width="32" Height="32" Offset="0x17398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_017B98" OutName="spot00_sceneTex_017B98" Format="rgba16" Width="32" Height="64" Offset="0x17B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_018B98" OutName="spot00_sceneTex_018B98" Format="rgba16" Width="32" Height="32" Offset="0x18B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019398" OutName="spot00_sceneTex_019398" Format="rgba16" Width="32" Height="32" Offset="0x19398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_019B98" OutName="spot00_sceneTex_019B98" Format="rgba16" Width="32" Height="64" Offset="0x19B98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01AB98" OutName="spot00_sceneTex_01AB98" Format="rgba16" Width="32" Height="32" Offset="0x1AB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01B398" OutName="spot00_sceneTex_01B398" Format="rgba16" Width="32" Height="32" Offset="0x1B398" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BB98" OutName="spot00_sceneTex_01BB98" Format="rgba16" Width="16" Height="16" Offset="0x1BB98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01BD98" OutName="spot00_sceneTex_01BD98" Format="rgba16" Width="16" Height="32" Offset="0x1BD98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C198" OutName="spot00_sceneTex_01C198" Format="rgba16" Width="32" Height="32" Offset="0x1C198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01C998" OutName="spot00_sceneTex_01C998" Format="rgba16" Width="32" Height="32" Offset="0x1C998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D198" OutName="spot00_sceneTex_01D198" Format="rgba16" Width="64" Height="16" Offset="0x1D198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01D998" OutName="spot00_sceneTex_01D998" Format="rgba16" Width="32" Height="64" Offset="0x1D998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01E998" OutName="spot00_sceneTex_01E998" Format="ia4" Width="128" Height="32" Offset="0x1E998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F198" OutName="spot00_sceneTex_01F198" Format="ia4" Width="64" Height="32" Offset="0x1F198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F598" OutName="spot00_sceneTex_01F598" Format="i4" Width="16" Height="16" Offset="0x1F598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F618" OutName="spot00_sceneTex_01F618" Format="rgba16" Width="8" Height="32" Offset="0x1F618" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_01F818" OutName="spot00_sceneTex_01F818" Format="rgba16" Width="32" Height="32" Offset="0x1F818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020018" OutName="spot00_sceneTex_020018" Format="i4" Width="64" Height="64" Offset="0x20018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_020818" OutName="spot00_sceneTex_020818" Format="rgba16" Width="32" Height="32" Offset="0x20818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021018" OutName="spot00_sceneTex_021018" Format="rgba16" Width="16" Height="64" Offset="0x21018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_021818" OutName="spot00_sceneTex_021818" Format="rgba16" Width="16" Height="64" Offset="0x21818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022018" OutName="spot00_sceneTex_022018" Format="ia4" Width="128" Height="32" Offset="0x22018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_022818" OutName="spot00_sceneTex_022818" Format="rgba16" Width="64" Height="16" Offset="0x22818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023018" OutName="spot00_sceneTex_023018" Format="rgba16" Width="64" Height="16" Offset="0x23018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_023818" OutName="spot00_sceneTex_023818" Format="i4" Width="64" Height="64" Offset="0x23818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024018" OutName="spot00_sceneTex_024018" Format="i4" Width="64" Height="64" Offset="0x24018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_024818" OutName="spot00_sceneTex_024818" Format="ci4" Width="64" Height="64" Offset="0x24818" TlutOffset="0x13D70" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025018" OutName="spot00_sceneTex_025018" Format="i4" Width="64" Height="64" Offset="0x25018" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025818" OutName="spot00_sceneTex_025818" Format="rgba16" Width="8" Height="8" Offset="0x25818" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_025898" OutName="spot00_sceneTex_025898" Format="rgba16" Width="32" Height="32" Offset="0x25898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026098" OutName="spot00_sceneTex_026098" Format="rgba16" Width="32" Height="32" Offset="0x26098" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026898" OutName="spot00_sceneTex_026898" Format="ia4" Width="16" Height="32" Offset="0x26898" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_026998" OutName="spot00_sceneTex_026998" Format="rgba16" Width="64" Height="32" Offset="0x26998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027998" OutName="spot00_sceneTex_027998" Format="i4" Width="32" Height="64" Offset="0x27998" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_027D98" OutName="spot00_sceneTex_027D98" Format="i4" Width="32" Height="64" Offset="0x27D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028198" OutName="spot00_sceneTex_028198" Format="rgba16" Width="8" Height="64" Offset="0x28198" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_028598" OutName="spot00_sceneTex_028598" Format="rgba16" Width="64" Height="32" Offset="0x28598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029598" OutName="spot00_sceneTex_029598" Format="i4" Width="64" Height="64" Offset="0x29598" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029D98" OutName="spot00_sceneTex_029D98" Format="i4" Width="32" Height="32" Offset="0x29D98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTex_029F98" OutName="spot00_sceneTex_029F98" Format="i4" Width="32" Height="32" Offset="0x29F98" AddedByScript="true"/>
+        <Texture Name="spot00_sceneTLUT_013D70" OutName="spot00_sceneTLUT_013D70" Format="rgba16" Width="4" Height="4" Offset="0x13D70" AddedByScript="true"/>
+        <Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
+        <Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
+        <Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
+        <Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
+        <Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
+        <Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
+        <Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
+        <Path Name="spot00_scenePathway_011AB4" Offset="0x11AB4" NumPaths="2"/>
+        <Scene Name="spot00_scene" Offset="0x0"/>
+        <Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
+    </File>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
+        <DList Name="spot00_room_0DL_012B20" Offset="0x12B20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot01.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot01.xml
new file mode 100644
index 0000000000..eb725afa68
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot01.xml
@@ -0,0 +1,51 @@
+<Root>
+    <File Name="spot01_scene" Segment="2">
+        <Texture Name="spot01_sceneTex_00AA50" OutName="spot01_sceneTex_00AA50" Format="rgba16" Width="32" Height="32" Offset="0xAA50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B250" OutName="spot01_sceneTex_00B250" Format="ci8" Width="16" Height="16" Offset="0xB250" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B350" OutName="spot01_sceneTex_00B350" Format="ci8" Width="16" Height="64" Offset="0xB350" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00B750" OutName="spot01_sceneTex_00B750" Format="ci8" Width="32" Height="32" Offset="0xB750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BB50" OutName="spot01_sceneTex_00BB50" Format="rgba16" Width="16" Height="32" Offset="0xBB50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00BF50" OutName="spot01_sceneTex_00BF50" Format="rgba16" Width="32" Height="32" Offset="0xBF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C750" OutName="spot01_sceneTex_00C750" Format="ci8" Width="16" Height="32" Offset="0xC750" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00C950" OutName="spot01_sceneTex_00C950" Format="ci8" Width="32" Height="32" Offset="0xC950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00CD50" OutName="spot01_sceneTex_00CD50" Format="ci8" Width="32" Height="64" Offset="0xCD50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00D550" OutName="spot01_sceneTex_00D550" Format="i4" Width="64" Height="64" Offset="0xD550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00DD50" OutName="spot01_sceneTex_00DD50" Format="i4" Width="64" Height="64" Offset="0xDD50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00E550" OutName="spot01_sceneTex_00E550" Format="ci8" Width="32" Height="64" Offset="0xE550" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00ED50" OutName="spot01_sceneTex_00ED50" Format="ci4" Width="64" Height="64" Offset="0xED50" TlutOffset="0xAA28" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F550" OutName="spot01_sceneTex_00F550" Format="rgba16" Width="32" Height="16" Offset="0xF550" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_00F950" OutName="spot01_sceneTex_00F950" Format="rgba16" Width="32" Height="32" Offset="0xF950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010150" OutName="spot01_sceneTex_010150" Format="rgba16" Width="32" Height="32" Offset="0x10150" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_010950" OutName="spot01_sceneTex_010950" Format="rgba16" Width="32" Height="64" Offset="0x10950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_011950" OutName="spot01_sceneTex_011950" Format="rgba16" Width="32" Height="64" Offset="0x11950" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012950" OutName="spot01_sceneTex_012950" Format="ci8" Width="16" Height="32" Offset="0x12950" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_012B50" OutName="spot01_sceneTex_012B50" Format="rgba16" Width="64" Height="32" Offset="0x12B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_013B50" OutName="spot01_sceneTex_013B50" Format="rgba16" Width="16" Height="64" Offset="0x13B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014350" OutName="spot01_sceneTex_014350" Format="ia4" Width="64" Height="32" Offset="0x14350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014750" OutName="spot01_sceneTex_014750" Format="ia4" Width="64" Height="32" Offset="0x14750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014B50" OutName="spot01_sceneTex_014B50" Format="ci8" Width="32" Height="32" Offset="0x14B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_014F50" OutName="spot01_sceneTex_014F50" Format="ci8" Width="64" Height="16" Offset="0x14F50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_015350" OutName="spot01_sceneTex_015350" Format="ia4" Width="64" Height="64" Offset="0x15350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_017B50" OutName="spot01_sceneTex_017B50" Format="ci8" Width="32" Height="64" Offset="0x17B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018350" OutName="spot01_sceneTex_018350" Format="i4" Width="64" Height="64" Offset="0x18350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_018B50" OutName="spot01_sceneTex_018B50" Format="rgba16" Width="32" Height="32" Offset="0x18B50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019350" OutName="spot01_sceneTex_019350" Format="rgba16" Width="32" Height="32" Offset="0x19350" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019B50" OutName="spot01_sceneTex_019B50" Format="ci8" Width="32" Height="32" Offset="0x19B50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_019F50" OutName="spot01_sceneTex_019F50" Format="rgba16" Width="32" Height="32" Offset="0x19F50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01A750" OutName="spot01_sceneTex_01A750" Format="i4" Width="64" Height="64" Offset="0x1A750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01AF50" OutName="spot01_sceneTex_01AF50" Format="rgba16" Width="16" Height="64" Offset="0x1AF50" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01B750" OutName="spot01_sceneTex_01B750" Format="rgba16" Width="32" Height="32" Offset="0x1B750" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTex_01BF50" OutName="spot01_sceneTex_01BF50" Format="ci8" Width="16" Height="32" Offset="0x1BF50" TlutOffset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00A870" OutName="spot01_sceneTLUT_00A870" Format="rgba16" Width="16" Height="16" Offset="0xA870" AddedByScript="true"/>
+        <Texture Name="spot01_sceneTLUT_00AA28" OutName="spot01_sceneTLUT_00AA28" Format="rgba16" Width="4" Height="4" Offset="0xAA28" AddedByScript="true"/>
+        <Path Name="gKakarikoVillagePath_003D0" Offset="0x3D0" NumPaths="3"/>
+        <Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
+        <Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
+        <Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
+        <Scene Name="spot01_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot02.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot02.xml
new file mode 100644
index 0000000000..c7924c29db
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot02.xml
@@ -0,0 +1,64 @@
+<Root>
+    <File Name="spot02_scene" Segment="2">
+        <Texture Name="spot02_sceneTex_007280" OutName="spot02_sceneTex_007280" Format="rgba16" Width="32" Height="32" Offset="0x7280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007A80" OutName="spot02_sceneTex_007A80" Format="rgba16" Width="32" Height="16" Offset="0x7A80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_007E80" OutName="spot02_sceneTex_007E80" Format="rgba16" Width="32" Height="32" Offset="0x7E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008680" OutName="spot02_sceneTex_008680" Format="rgba16" Width="16" Height="64" Offset="0x8680" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_008E80" OutName="spot02_sceneTex_008E80" Format="i8" Width="64" Height="64" Offset="0x8E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_009E80" OutName="spot02_sceneTex_009E80" Format="ia4" Width="32" Height="64" Offset="0x9E80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00A280" OutName="spot02_sceneTex_00A280" Format="rgba16" Width="32" Height="32" Offset="0xA280" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AA80" OutName="spot02_sceneTex_00AA80" Format="rgba16" Width="32" Height="16" Offset="0xAA80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00AE80" OutName="spot02_sceneTex_00AE80" Format="i4" Width="32" Height="32" Offset="0xAE80" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B080" OutName="spot02_sceneTex_00B080" Format="rgba16" Width="32" Height="32" Offset="0xB080" AddedByScript="true"/>
+        <Texture Name="spot02_sceneTex_00B880" OutName="spot02_sceneTex_00B880" Format="rgba16" Width="16" Height="32" Offset="0xB880" AddedByScript="true"/>
+        <Scene Name="spot02_scene" Offset="0x0"/>
+
+        <Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
+
+        <Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
+        <Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
+    </File>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot02_room_1" Segment="3">
+        <Texture Name="spot02_room_1Tex_008F08" OutName="spot02_room_1Tex_008F08" Format="rgba16" Width="32" Height="32" Offset="0x8F08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009708" OutName="spot02_room_1Tex_009708" Format="rgba16" Width="16" Height="16" Offset="0x9708" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_009908" OutName="spot02_room_1Tex_009908" Format="rgba16" Width="64" Height="32" Offset="0x9908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00A908" OutName="spot02_room_1Tex_00A908" Format="rgba16" Width="32" Height="32" Offset="0xA908" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00B108" OutName="spot02_room_1Tex_00B108" Format="rgba16" Width="32" Height="64" Offset="0xB108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C108" OutName="spot02_room_1Tex_00C108" Format="rgba16" Width="16" Height="32" Offset="0xC108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00C508" OutName="spot02_room_1Tex_00C508" Format="ci4" Width="64" Height="64" Offset="0xC508" TlutOffset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00CD08" OutName="spot02_room_1Tex_00CD08" Format="rgba16" Width="64" Height="32" Offset="0xCD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00DD08" OutName="spot02_room_1Tex_00DD08" Format="ia8" Width="32" Height="32" Offset="0xDD08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E108" OutName="spot02_room_1Tex_00E108" Format="rgba16" Width="16" Height="16" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00E308" OutName="spot02_room_1Tex_00E308" Format="rgba16" Width="32" Height="32" Offset="0xE308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00EB08" OutName="spot02_room_1Tex_00EB08" Format="rgba16" Width="16" Height="64" Offset="0xEB08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_00F308" OutName="spot02_room_1Tex_00F308" Format="rgba16" Width="32" Height="64" Offset="0xF308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010308" OutName="spot02_room_1Tex_010308" Format="rgba16" Width="32" Height="32" Offset="0x10308" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010B08" OutName="spot02_room_1Tex_010B08" Format="rgba16" Width="16" Height="16" Offset="0x10B08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_010D08" OutName="spot02_room_1Tex_010D08" Format="rgba16" Width="32" Height="32" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_011508" OutName="spot02_room_1Tex_011508" Format="ia8" Width="64" Height="64" Offset="0x11508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012508" OutName="spot02_room_1Tex_012508" Format="rgba16" Width="32" Height="32" Offset="0x12508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_012D08" OutName="spot02_room_1Tex_012D08" Format="rgba16" Width="32" Height="32" Offset="0x12D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_013508" OutName="spot02_room_1Tex_013508" Format="rgba16" Width="32" Height="64" Offset="0x13508" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014508" OutName="spot02_room_1Tex_014508" Format="ci4" Width="64" Height="64" Offset="0x14508" TlutOffset="0x8EE0" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_014D08" OutName="spot02_room_1Tex_014D08" Format="rgba16" Width="128" Height="16" Offset="0x14D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_015D08" OutName="spot02_room_1Tex_015D08" Format="i8" Width="64" Height="64" Offset="0x15D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D08" OutName="spot02_room_1Tex_016D08" Format="i4" Width="16" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_016D88" OutName="spot02_room_1Tex_016D88" Format="rgba16" Width="32" Height="32" Offset="0x16D88" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017588" OutName="spot02_room_1Tex_017588" Format="rgba16" Width="32" Height="16" Offset="0x17588" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_017988" OutName="spot02_room_1Tex_017988" Format="ia8" Width="128" Height="32" Offset="0x17988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_018988" OutName="spot02_room_1Tex_018988" Format="rgba16" Width="32" Height="64" Offset="0x18988" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01B690" OutName="spot02_room_1Tex_01B690" Format="ia8" Width="64" Height="32" Offset="0x1B690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01BE90" OutName="spot02_room_1Tex_01BE90" Format="ia8" Width="32" Height="32" Offset="0x1BE90" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C290" OutName="spot02_room_1Tex_01C290" Format="ia8" Width="32" Height="32" Offset="0x1C290" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C690" OutName="spot02_room_1Tex_01C690" Format="ia8" Width="16" Height="16" Offset="0x1C690" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01C790" OutName="spot02_room_1Tex_01C790" Format="ia8" Width="64" Height="64" Offset="0x1C790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1Tex_01D790" OutName="spot02_room_1Tex_01D790" Format="ia8" Width="32" Height="64" Offset="0x1D790" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EB8" OutName="spot02_room_1TLUT_008EB8" Format="rgba16" Width="4" Height="4" Offset="0x8EB8" AddedByScript="true"/>
+        <Texture Name="spot02_room_1TLUT_008EE0" OutName="spot02_room_1TLUT_008EE0" Format="rgba16" Width="4" Height="4" Offset="0x8EE0" AddedByScript="true"/>
+        <Room Name="spot02_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot03.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot03.xml
new file mode 100644
index 0000000000..9434185f44
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot03.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot03_scene" Segment="2">
+        <Texture Name="spot03_sceneTex_006D58" OutName="spot03_sceneTex_006D58" Format="ci8" Width="16" Height="64" Offset="0x6D58" TlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007158" OutName="spot03_sceneTex_007158" Format="rgba16" Width="16" Height="32" Offset="0x7158" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007558" OutName="spot03_sceneTex_007558" Format="rgba16" Width="32" Height="16" Offset="0x7558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007958" OutName="spot03_sceneTex_007958" Format="ci8" Width="32" Height="32" Offset="0x7958" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_007D58" OutName="spot03_sceneTex_007D58" Format="rgba16" Width="32" Height="32" Offset="0x7D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008558" OutName="spot03_sceneTex_008558" Format="ci8" Width="32" Height="64" Offset="0x8558" TlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_008D58" OutName="spot03_sceneTex_008D58" Format="rgba16" Width="32" Height="32" Offset="0x8D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009558" OutName="spot03_sceneTex_009558" Format="ci4" Width="64" Height="64" Offset="0x9558" TlutOffset="0x6D30" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_009D58" OutName="spot03_sceneTex_009D58" Format="rgba16" Width="32" Height="32" Offset="0x9D58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00A558" OutName="spot03_sceneTex_00A558" Format="rgba16" Width="32" Height="32" Offset="0xA558" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTex_00AD58" OutName="spot03_sceneTex_00AD58" Format="ia4" Width="64" Height="64" Offset="0xAD58" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006920" OutName="spot03_sceneTLUT_006920" Format="rgba16" Width="16" Height="16" Offset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006B28" OutName="spot03_sceneTLUT_006B28" Format="rgba16" Width="16" Height="16" Offset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_sceneTLUT_006D30" OutName="spot03_sceneTLUT_006D30" Format="rgba16" Width="4" Height="4" Offset="0x6D30" AddedByScript="true"/>
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_0" Segment="3">
+        <Texture Name="spot03_room_0Tex_0097B0" OutName="spot03_room_0Tex_0097B0" Format="ci8" Width="32" Height="32" Offset="0x97B0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_009BB0" OutName="spot03_room_0Tex_009BB0" Format="ci8" Width="32" Height="64" Offset="0x9BB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00A3B0" OutName="spot03_room_0Tex_00A3B0" Format="rgba16" Width="16" Height="64" Offset="0xA3B0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00ABB0" OutName="spot03_room_0Tex_00ABB0" Format="rgba16" Width="64" Height="32" Offset="0xABB0" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BBB0" OutName="spot03_room_0Tex_00BBB0" Format="ci8" Width="32" Height="32" Offset="0xBBB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00BFB0" OutName="spot03_room_0Tex_00BFB0" Format="ci8" Width="32" Height="32" Offset="0xBFB0" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6B28" AddedByScript="true"/>
+        <Texture Name="spot03_room_0Tex_00D180" OutName="spot03_room_0Tex_00D180" Format="i4" Width="64" Height="64" Offset="0xD180" AddedByScript="true"/>
+        <Room Name="spot03_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot03_room_1" Segment="3">
+        <Texture Name="spot03_room_1Tex_0050D8" OutName="spot03_room_1Tex_0050D8" Format="ci8" Width="64" Height="32" Offset="0x50D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0058D8" OutName="spot03_room_1Tex_0058D8" Format="ci8" Width="64" Height="16" Offset="0x58D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005CD8" OutName="spot03_room_1Tex_005CD8" Format="ci8" Width="32" Height="16" Offset="0x5CD8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_005ED8" OutName="spot03_room_1Tex_005ED8" Format="ci8" Width="16" Height="64" Offset="0x5ED8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <Texture Name="spot03_room_1Tex_0062D8" OutName="spot03_room_1Tex_0062D8" Format="ci8" Width="64" Height="32" Offset="0x62D8" ExternalTlut="spot03_scene" ExternalTlutOffset="0x6920" AddedByScript="true"/>
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot04.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot04.xml
new file mode 100644
index 0000000000..f338604207
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot04.xml
@@ -0,0 +1,81 @@
+<Root>
+    <File Name="spot04_scene" Segment="2">
+        <Texture Name="spot04_sceneTex_00E218" OutName="spot04_sceneTex_00E218" Format="rgba16" Width="32" Height="32" Offset="0xE218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00EA18" OutName="spot04_sceneTex_00EA18" Format="i4" Width="64" Height="64" Offset="0xEA18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00F218" OutName="spot04_sceneTex_00F218" Format="i4" Width="64" Height="64" Offset="0xF218" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FA18" OutName="spot04_sceneTex_00FA18" Format="ci8" Width="32" Height="32" Offset="0xFA18" TlutOffset="0xE010" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_00FE18" OutName="spot04_sceneTex_00FE18" Format="rgba16" Width="32" Height="32" Offset="0xFE18" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTex_010618" OutName="spot04_sceneTex_010618" Format="rgba16" Width="32" Height="32" Offset="0x10618" AddedByScript="true"/>
+        <Texture Name="spot04_sceneTLUT_00E010" OutName="spot04_sceneTLUT_00E010" Format="rgba16" Width="16" Height="16" Offset="0xE010" AddedByScript="true"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_0" Segment="3">
+        <Texture Name="spot04_room_0Tex_00BF08" OutName="spot04_room_0Tex_00BF08" Format="rgba16" Width="32" Height="32" Offset="0xBF08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00C708" OutName="spot04_room_0Tex_00C708" Format="rgba16" Width="32" Height="16" Offset="0xC708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CB08" OutName="spot04_room_0Tex_00CB08" Format="rgba16" Width="32" Height="16" Offset="0xCB08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00CF08" OutName="spot04_room_0Tex_00CF08" Format="ci8" Width="32" Height="32" Offset="0xCF08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D308" OutName="spot04_room_0Tex_00D308" Format="ci8" Width="16" Height="16" Offset="0xD308" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D408" OutName="spot04_room_0Tex_00D408" Format="ci8" Width="16" Height="16" Offset="0xD408" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D508" OutName="spot04_room_0Tex_00D508" Format="rgba16" Width="16" Height="32" Offset="0xD508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00D908" OutName="spot04_room_0Tex_00D908" Format="rgba16" Width="16" Height="64" Offset="0xD908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E108" OutName="spot04_room_0Tex_00E108" Format="rgba16" Width="32" Height="32" Offset="0xE108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00E908" OutName="spot04_room_0Tex_00E908" Format="rgba16" Width="32" Height="32" Offset="0xE908" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F108" OutName="spot04_room_0Tex_00F108" Format="rgba16" Width="64" Height="8" Offset="0xF108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00F508" OutName="spot04_room_0Tex_00F508" Format="rgba16" Width="32" Height="32" Offset="0xF508" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_00FD08" OutName="spot04_room_0Tex_00FD08" Format="rgba16" Width="32" Height="64" Offset="0xFD08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_010D08" OutName="spot04_room_0Tex_010D08" Format="rgba16" Width="32" Height="64" Offset="0x10D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011D08" OutName="spot04_room_0Tex_011D08" Format="ci8" Width="16" Height="32" Offset="0x11D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_011F08" OutName="spot04_room_0Tex_011F08" Format="rgba16" Width="64" Height="32" Offset="0x11F08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_012F08" OutName="spot04_room_0Tex_012F08" Format="ci8" Width="32" Height="16" Offset="0x12F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013108" OutName="spot04_room_0Tex_013108" Format="ci8" Width="32" Height="16" Offset="0x13108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013308" OutName="spot04_room_0Tex_013308" Format="rgba16" Width="16" Height="32" Offset="0x13308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013708" OutName="spot04_room_0Tex_013708" Format="rgba16" Width="32" Height="32" Offset="0x13708" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_013F08" OutName="spot04_room_0Tex_013F08" Format="ci8" Width="32" Height="32" Offset="0x13F08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014308" OutName="spot04_room_0Tex_014308" Format="rgba16" Width="32" Height="32" Offset="0x14308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_014B08" OutName="spot04_room_0Tex_014B08" Format="rgba16" Width="32" Height="32" Offset="0x14B08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015308" OutName="spot04_room_0Tex_015308" Format="rgba16" Width="64" Height="16" Offset="0x15308" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015B08" OutName="spot04_room_0Tex_015B08" Format="ci8" Width="16" Height="32" Offset="0x15B08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_015D08" OutName="spot04_room_0Tex_015D08" Format="ci8" Width="16" Height="64" Offset="0x15D08" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016108" OutName="spot04_room_0Tex_016108" Format="ci8" Width="16" Height="64" Offset="0x16108" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016508" OutName="spot04_room_0Tex_016508" Format="ci8" Width="32" Height="32" Offset="0x16508" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016908" OutName="spot04_room_0Tex_016908" Format="ci8" Width="16" Height="64" Offset="0x16908" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_016D08" OutName="spot04_room_0Tex_016D08" Format="rgba16" Width="32" Height="16" Offset="0x16D08" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_017108" OutName="spot04_room_0Tex_017108" Format="rgba16" Width="32" Height="32" Offset="0x17108" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_018A90" OutName="spot04_room_0Tex_018A90" Format="rgba16" Width="32" Height="32" Offset="0x18A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019290" OutName="spot04_room_0Tex_019290" Format="i4" Width="64" Height="64" Offset="0x19290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_019A90" OutName="spot04_room_0Tex_019A90" Format="i4" Width="64" Height="64" Offset="0x19A90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A290" OutName="spot04_room_0Tex_01A290" Format="ia8" Width="16" Height="32" Offset="0x1A290" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01A490" OutName="spot04_room_0Tex_01A490" Format="ia4" Width="64" Height="64" Offset="0x1A490" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AC90" OutName="spot04_room_0Tex_01AC90" Format="ia4" Width="32" Height="32" Offset="0x1AC90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01AE90" OutName="spot04_room_0Tex_01AE90" Format="ia4" Width="32" Height="32" Offset="0x1AE90" AddedByScript="true"/>
+        <Texture Name="spot04_room_0Tex_01B090" OutName="spot04_room_0Tex_01B090" Format="rgba16" Width="16" Height="32" Offset="0x1B090" AddedByScript="true"/>
+        <Room Name="spot04_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_1" Segment="3">
+        <Texture Name="spot04_room_1Tex_004EA8" OutName="spot04_room_1Tex_004EA8" Format="rgba16" Width="32" Height="16" Offset="0x4EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0052A8" OutName="spot04_room_1Tex_0052A8" Format="rgba16" Width="32" Height="16" Offset="0x52A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0056A8" OutName="spot04_room_1Tex_0056A8" Format="rgba16" Width="64" Height="32" Offset="0x56A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_0066A8" OutName="spot04_room_1Tex_0066A8" Format="rgba16" Width="32" Height="32" Offset="0x66A8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_006EA8" OutName="spot04_room_1Tex_006EA8" Format="rgba16" Width="32" Height="32" Offset="0x6EA8" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007B78" OutName="spot04_room_1Tex_007B78" Format="ia8" Width="16" Height="32" Offset="0x7B78" AddedByScript="true"/>
+        <Texture Name="spot04_room_1Tex_007D78" OutName="spot04_room_1Tex_007D78" Format="i4" Width="64" Height="64" Offset="0x7D78" AddedByScript="true"/>
+        <Room Name="spot04_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot04_room_2" Segment="3">
+        <Texture Name="spot04_room_2Tex_002BF8" OutName="spot04_room_2Tex_002BF8" Format="ci8" Width="32" Height="16" Offset="0x2BF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002DF8" OutName="spot04_room_2Tex_002DF8" Format="ci8" Width="32" Height="16" Offset="0x2DF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_002FF8" OutName="spot04_room_2Tex_002FF8" Format="ci8" Width="32" Height="32" Offset="0x2FF8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0033F8" OutName="spot04_room_2Tex_0033F8" Format="rgba16" Width="32" Height="32" Offset="0x33F8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_003BF8" OutName="spot04_room_2Tex_003BF8" Format="rgba16" Width="64" Height="16" Offset="0x3BF8" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0043F8" OutName="spot04_room_2Tex_0043F8" Format="ci8" Width="16" Height="32" Offset="0x43F8" ExternalTlut="spot04_scene" ExternalTlutOffset="0xE040" AddedByScript="true"/>
+        <Texture Name="spot04_room_2Tex_0045F8" OutName="spot04_room_2Tex_0045F8" Format="rgba16" Width="32" Height="32" Offset="0x45F8" AddedByScript="true"/>
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot05.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot05.xml
new file mode 100644
index 0000000000..4f7c62b91e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot05.xml
@@ -0,0 +1,43 @@
+<Root>
+    <File Name="spot05_scene" Segment="2">
+        <Texture Name="spot05_sceneTex_006D60" OutName="spot05_sceneTex_006D60" Format="rgba16" Width="32" Height="64" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_007D60" OutName="spot05_sceneTex_007D60" Format="rgba16" Width="32" Height="64" Offset="0x7D60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_008D60" OutName="spot05_sceneTex_008D60" Format="ci8" Width="32" Height="32" Offset="0x8D60" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009160" OutName="spot05_sceneTex_009160" Format="ci8" Width="32" Height="32" Offset="0x9160" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009560" OutName="spot05_sceneTex_009560" Format="rgba16" Width="16" Height="32" Offset="0x9560" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_009960" OutName="spot05_sceneTex_009960" Format="ci8" Width="64" Height="32" Offset="0x9960" TlutOffset="0x6BC0" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00A160" OutName="spot05_sceneTex_00A160" Format="rgba16" Width="64" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B160" OutName="spot05_sceneTex_00B160" Format="rgba16" Width="32" Height="32" Offset="0xB160" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00B960" OutName="spot05_sceneTex_00B960" Format="rgba16" Width="16" Height="16" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00BB60" OutName="spot05_sceneTex_00BB60" Format="rgba16" Width="16" Height="128" Offset="0xBB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00CB60" OutName="spot05_sceneTex_00CB60" Format="rgba16" Width="32" Height="32" Offset="0xCB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00D360" OutName="spot05_sceneTex_00D360" Format="i4" Width="64" Height="64" Offset="0xD360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00DB60" OutName="spot05_sceneTex_00DB60" Format="rgba16" Width="32" Height="32" Offset="0xDB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00E360" OutName="spot05_sceneTex_00E360" Format="i4" Width="64" Height="64" Offset="0xE360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00EB60" OutName="spot05_sceneTex_00EB60" Format="rgba16" Width="64" Height="16" Offset="0xEB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00F360" OutName="spot05_sceneTex_00F360" Format="rgba16" Width="32" Height="32" Offset="0xF360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_00FB60" OutName="spot05_sceneTex_00FB60" Format="i4" Width="64" Height="64" Offset="0xFB60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010360" OutName="spot05_sceneTex_010360" Format="rgba16" Width="32" Height="32" Offset="0x10360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_010B60" OutName="spot05_sceneTex_010B60" Format="rgba16" Width="32" Height="32" Offset="0x10B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_011360" OutName="spot05_sceneTex_011360" Format="rgba16" Width="32" Height="64" Offset="0x11360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012360" OutName="spot05_sceneTex_012360" Format="rgba16" Width="32" Height="32" Offset="0x12360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_012B60" OutName="spot05_sceneTex_012B60" Format="rgba16" Width="32" Height="32" Offset="0x12B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013360" OutName="spot05_sceneTex_013360" Format="rgba16" Width="32" Height="32" Offset="0x13360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_013B60" OutName="spot05_sceneTex_013B60" Format="rgba16" Width="64" Height="16" Offset="0x13B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014360" OutName="spot05_sceneTex_014360" Format="rgba16" Width="32" Height="32" Offset="0x14360" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTex_014B60" OutName="spot05_sceneTex_014B60" Format="ia8" Width="16" Height="32" Offset="0x14B60" AddedByScript="true"/>
+        <Texture Name="spot05_sceneTLUT_006BC0" OutName="spot05_sceneTLUT_006BC0" Format="rgba16" Width="16" Height="16" Offset="0x6BC0" AddedByScript="true"/>
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
+
+        <Path Name="gSpot05Path_0069D8" Offset="0x69D8" NumPaths="5"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot06.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot06.xml
new file mode 100644
index 0000000000..f4af602cfd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot06.xml
@@ -0,0 +1,58 @@
+<Root>
+    <File Name="spot06_scene" Segment="2">
+        <Texture Name="spot06_sceneTex_007C38" OutName="spot06_sceneTex_007C38" Format="rgba16" Width="16" Height="32" Offset="0x7C38" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008038" OutName="spot06_sceneTex_008038" Format="rgba16" Width="16" Height="32" Offset="0x8038" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008438" OutName="spot06_sceneTex_008438" Format="rgba16" Width="16" Height="32" Offset="0x8438" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_008838" OutName="spot06_sceneTex_008838" Format="rgba16" Width="32" Height="64" Offset="0x8838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009838" OutName="spot06_sceneTex_009838" Format="rgba16" Width="8" Height="8" Offset="0x9838" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0098B8" OutName="spot06_sceneTex_0098B8" Format="rgba16" Width="8" Height="32" Offset="0x98B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_009AB8" OutName="spot06_sceneTex_009AB8" Format="rgba16" Width="32" Height="64" Offset="0x9AB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AAB8" OutName="spot06_sceneTex_00AAB8" Format="rgba16" Width="32" Height="16" Offset="0xAAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00AEB8" OutName="spot06_sceneTex_00AEB8" Format="rgba16" Width="32" Height="32" Offset="0xAEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00B6B8" OutName="spot06_sceneTex_00B6B8" Format="rgba16" Width="16" Height="32" Offset="0xB6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BAB8" OutName="spot06_sceneTex_00BAB8" Format="ia8" Width="32" Height="32" Offset="0xBAB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00BEB8" OutName="spot06_sceneTex_00BEB8" Format="rgba16" Width="32" Height="16" Offset="0xBEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C2B8" OutName="spot06_sceneTex_00C2B8" Format="rgba16" Width="16" Height="16" Offset="0xC2B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00C4B8" OutName="spot06_sceneTex_00C4B8" Format="rgba16" Width="32" Height="32" Offset="0xC4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00CCB8" OutName="spot06_sceneTex_00CCB8" Format="rgba16" Width="32" Height="64" Offset="0xCCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00DCB8" OutName="spot06_sceneTex_00DCB8" Format="rgba16" Width="32" Height="64" Offset="0xDCB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00ECB8" OutName="spot06_sceneTex_00ECB8" Format="rgba16" Width="16" Height="64" Offset="0xECB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F4B8" OutName="spot06_sceneTex_00F4B8" Format="rgba16" Width="16" Height="16" Offset="0xF4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00F6B8" OutName="spot06_sceneTex_00F6B8" Format="rgba16" Width="32" Height="32" Offset="0xF6B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_00FEB8" OutName="spot06_sceneTex_00FEB8" Format="rgba16" Width="32" Height="64" Offset="0xFEB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_010EB8" OutName="spot06_sceneTex_010EB8" Format="rgba16" Width="32" Height="32" Offset="0x10EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0116B8" OutName="spot06_sceneTex_0116B8" Format="rgba16" Width="32" Height="32" Offset="0x116B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_011EB8" OutName="spot06_sceneTex_011EB8" Format="rgba16" Width="16" Height="32" Offset="0x11EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0122B8" OutName="spot06_sceneTex_0122B8" Format="rgba16" Width="32" Height="16" Offset="0x122B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0126B8" OutName="spot06_sceneTex_0126B8" Format="rgba16" Width="32" Height="32" Offset="0x126B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_012EB8" OutName="spot06_sceneTex_012EB8" Format="rgba16" Width="8" Height="32" Offset="0x12EB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0130B8" OutName="spot06_sceneTex_0130B8" Format="rgba16" Width="32" Height="64" Offset="0x130B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0140B8" OutName="spot06_sceneTex_0140B8" Format="rgba16" Width="16" Height="64" Offset="0x140B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0148B8" OutName="spot06_sceneTex_0148B8" Format="rgba16" Width="16" Height="32" Offset="0x148B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_014CB8" OutName="spot06_sceneTex_014CB8" Format="rgba16" Width="32" Height="32" Offset="0x14CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0154B8" OutName="spot06_sceneTex_0154B8" Format="rgba16" Width="16" Height="64" Offset="0x154B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_015CB8" OutName="spot06_sceneTex_015CB8" Format="rgba16" Width="16" Height="64" Offset="0x15CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0164B8" OutName="spot06_sceneTex_0164B8" Format="rgba16" Width="32" Height="32" Offset="0x164B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_016CB8" OutName="spot06_sceneTex_016CB8" Format="rgba16" Width="16" Height="32" Offset="0x16CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0170B8" OutName="spot06_sceneTex_0170B8" Format="rgba16" Width="32" Height="32" Offset="0x170B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0178B8" OutName="spot06_sceneTex_0178B8" Format="rgba16" Width="16" Height="32" Offset="0x178B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_017CB8" OutName="spot06_sceneTex_017CB8" Format="ci4" Width="64" Height="64" Offset="0x17CB8" TlutOffset="0x7C10" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0184B8" OutName="spot06_sceneTex_0184B8" Format="rgba16" Width="32" Height="32" Offset="0x184B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_018CB8" OutName="spot06_sceneTex_018CB8" Format="rgba16" Width="32" Height="32" Offset="0x18CB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_0194B8" OutName="spot06_sceneTex_0194B8" Format="rgba16" Width="16" Height="128" Offset="0x194B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01A4B8" OutName="spot06_sceneTex_01A4B8" Format="i4" Width="64" Height="64" Offset="0x1A4B8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTex_01ACB8" OutName="spot06_sceneTex_01ACB8" Format="rgba16" Width="16" Height="32" Offset="0x1ACB8" AddedByScript="true"/>
+        <Texture Name="spot06_sceneTLUT_007C10" OutName="spot06_sceneTLUT_007C10" Format="rgba16" Width="4" Height="4" Offset="0x7C10" AddedByScript="true"/>
+        <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
+        <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
+        <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
+        <Scene Name="spot06_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot07.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot07.xml
new file mode 100644
index 0000000000..eeb976f7f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot07.xml
@@ -0,0 +1,47 @@
+<Root>
+    <File Name="spot07_scene" Segment="2">
+        <Texture Name="spot07_sceneTex_003F98" OutName="spot07_sceneTex_003F98" Format="rgba16" Width="32" Height="64" Offset="0x3F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_004F98" OutName="spot07_sceneTex_004F98" Format="ci4" Width="64" Height="32" Offset="0x4F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005398" OutName="spot07_sceneTex_005398" Format="ci4" Width="64" Height="32" Offset="0x5398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005798" OutName="spot07_sceneTex_005798" Format="ci4" Width="64" Height="32" Offset="0x5798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005B98" OutName="spot07_sceneTex_005B98" Format="ci4" Width="64" Height="32" Offset="0x5B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_005F98" OutName="spot07_sceneTex_005F98" Format="ci4" Width="64" Height="32" Offset="0x5F98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006398" OutName="spot07_sceneTex_006398" Format="ci4" Width="64" Height="32" Offset="0x6398" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006798" OutName="spot07_sceneTex_006798" Format="ci4" Width="64" Height="32" Offset="0x6798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006B98" OutName="spot07_sceneTex_006B98" Format="ci4" Width="64" Height="32" Offset="0x6B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_006F98" OutName="spot07_sceneTex_006F98" Format="rgba16" Width="32" Height="32" Offset="0x6F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007798" OutName="spot07_sceneTex_007798" Format="ci4" Width="64" Height="32" Offset="0x7798" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007B98" OutName="spot07_sceneTex_007B98" Format="ci4" Width="64" Height="32" Offset="0x7B98" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_007F98" OutName="spot07_sceneTex_007F98" Format="rgba16" Width="32" Height="32" Offset="0x7F98" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_008798" OutName="spot07_sceneTex_008798" Format="ia4" Width="64" Height="64" Offset="0x8798" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009018" OutName="spot07_sceneTex_009018" Format="ci4" Width="64" Height="32" Offset="0x9018" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTex_009418" OutName="spot07_sceneTex_009418" Format="ci4" Width="64" Height="32" Offset="0x9418" TlutOffset="0x3F70" AddedByScript="true"/>
+        <Texture Name="spot07_sceneTLUT_003F70" OutName="spot07_sceneTLUT_003F70" Format="rgba16" Width="4" Height="4" Offset="0x3F70" AddedByScript="true"/>
+        <Path Name="gZorasDomainPath_0234" Offset="0x234" NumPaths="3"/>
+        <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
+        <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
+        <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Scene Name="spot07_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_0" Segment="3">
+        <Texture Name="spot07_room_0Tex_004748" OutName="spot07_room_0Tex_004748" Format="rgba16" Width="64" Height="16" Offset="0x4748" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_004F48" OutName="spot07_room_0Tex_004F48" Format="rgba16" Width="64" Height="16" Offset="0x4F48" AddedByScript="true"/>
+        <Texture Name="spot07_room_0Tex_005748" OutName="spot07_room_0Tex_005748" Format="rgba16" Width="16" Height="64" Offset="0x5748" AddedByScript="true"/>
+        <Room Name="spot07_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot07_room_1" Segment="3">
+        <Texture Name="spot07_room_1Tex_0076D8" OutName="spot07_room_1Tex_0076D8" Format="rgba16" Width="32" Height="32" Offset="0x76D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_007ED8" OutName="spot07_room_1Tex_007ED8" Format="rgba16" Width="16" Height="64" Offset="0x7ED8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0086D8" OutName="spot07_room_1Tex_0086D8" Format="ci4" Width="64" Height="32" Offset="0x86D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008AD8" OutName="spot07_room_1Tex_008AD8" Format="ci4" Width="32" Height="16" Offset="0x8AD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008BD8" OutName="spot07_room_1Tex_008BD8" Format="ci4" Width="64" Height="32" Offset="0x8BD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_008FD8" OutName="spot07_room_1Tex_008FD8" Format="ci4" Width="64" Height="32" Offset="0x8FD8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0093D8" OutName="spot07_room_1Tex_0093D8" Format="ci4" Width="64" Height="32" Offset="0x93D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_0097D8" OutName="spot07_room_1Tex_0097D8" Format="ci4" Width="64" Height="32" Offset="0x97D8" ExternalTlut="spot07_scene" ExternalTlutOffset="0x3F80" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_009BD8" OutName="spot07_room_1Tex_009BD8" Format="rgba16" Width="32" Height="32" Offset="0x9BD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00A3D8" OutName="spot07_room_1Tex_00A3D8" Format="rgba16" Width="32" Height="32" Offset="0xA3D8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00ABD8" OutName="spot07_room_1Tex_00ABD8" Format="rgba16" Width="16" Height="128" Offset="0xABD8" AddedByScript="true"/>
+        <Texture Name="spot07_room_1Tex_00C1A0" OutName="spot07_room_1Tex_00C1A0" Format="rgba16" Width="64" Height="16" Offset="0xC1A0" AddedByScript="true"/>
+        <Room Name="spot07_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot08.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot08.xml
new file mode 100644
index 0000000000..86582f0dca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot08.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot08_scene" Segment="2">
+        <Texture Name="spot08_sceneTex_004DA0" OutName="spot08_sceneTex_004DA0" Format="rgba16" Width="64" Height="32" Offset="0x4DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_005DA0" OutName="spot08_sceneTex_005DA0" Format="rgba16" Width="32" Height="16" Offset="0x5DA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0061A0" OutName="spot08_sceneTex_0061A0" Format="rgba16" Width="32" Height="32" Offset="0x61A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0069A0" OutName="spot08_sceneTex_0069A0" Format="rgba16" Width="32" Height="32" Offset="0x69A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0071A0" OutName="spot08_sceneTex_0071A0" Format="ia4" Width="256" Height="32" Offset="0x71A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0081A0" OutName="spot08_sceneTex_0081A0" Format="ci4" Width="128" Height="32" Offset="0x81A0" TlutOffset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0089A0" OutName="spot08_sceneTex_0089A0" Format="rgba16" Width="32" Height="32" Offset="0x89A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0091A0" OutName="spot08_sceneTex_0091A0" Format="rgba16" Width="16" Height="128" Offset="0x91A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A1A0" OutName="spot08_sceneTex_00A1A0" Format="ci4" Width="128" Height="32" Offset="0xA1A0" TlutOffset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00A9A0" OutName="spot08_sceneTex_00A9A0" Format="ci4" Width="64" Height="64" Offset="0xA9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B1A0" OutName="spot08_sceneTex_00B1A0" Format="ci4" Width="64" Height="64" Offset="0xB1A0" TlutOffset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00B9A0" OutName="spot08_sceneTex_00B9A0" Format="ci4" Width="64" Height="64" Offset="0xB9A0" TlutOffset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00C1A0" OutName="spot08_sceneTex_00C1A0" Format="rgba16" Width="64" Height="32" Offset="0xC1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00D1A0" OutName="spot08_sceneTex_00D1A0" Format="i8" Width="64" Height="64" Offset="0xD1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00E1A0" OutName="spot08_sceneTex_00E1A0" Format="rgba16" Width="32" Height="64" Offset="0xE1A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F1A0" OutName="spot08_sceneTex_00F1A0" Format="ci4" Width="32" Height="128" Offset="0xF1A0" TlutOffset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_00F9A0" OutName="spot08_sceneTex_00F9A0" Format="ci4" Width="64" Height="64" Offset="0xF9A0" TlutOffset="0x4D80" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0101A0" OutName="spot08_sceneTex_0101A0" Format="i4" Width="64" Height="64" Offset="0x101A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_0109A0" OutName="spot08_sceneTex_0109A0" Format="ia8" Width="16" Height="16" Offset="0x109A0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010AA0" OutName="spot08_sceneTex_010AA0" Format="rgba16" Width="16" Height="32" Offset="0x10AA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTex_010EA0" OutName="spot08_sceneTex_010EA0" Format="rgba16" Width="32" Height="32" Offset="0x10EA0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CC0" OutName="spot08_sceneTLUT_004CC0" Format="rgba16" Width="4" Height="4" Offset="0x4CC0" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004CE8" OutName="spot08_sceneTLUT_004CE8" Format="rgba16" Width="4" Height="4" Offset="0x4CE8" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D10" OutName="spot08_sceneTLUT_004D10" Format="rgba16" Width="4" Height="4" Offset="0x4D10" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D38" OutName="spot08_sceneTLUT_004D38" Format="rgba16" Width="4" Height="4" Offset="0x4D38" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D60" OutName="spot08_sceneTLUT_004D60" Format="rgba16" Width="4" Height="4" Offset="0x4D60" AddedByScript="true"/>
+        <Texture Name="spot08_sceneTLUT_004D80" OutName="spot08_sceneTLUT_004D80" Format="rgba16" Width="4" Height="4" Offset="0x4D80" AddedByScript="true"/>
+        <Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
+        <Scene Name="spot08_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot09.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot09.xml
new file mode 100644
index 0000000000..5bb9e059c7
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot09.xml
@@ -0,0 +1,37 @@
+<Root>
+    <File Name="spot09_scene" Segment="2">
+        <Texture Name="spot09_sceneTex_003460" OutName="spot09_sceneTex_003460" Format="rgba16" Width="32" Height="64" Offset="0x3460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_004460" OutName="spot09_sceneTex_004460" Format="rgba16" Width="64" Height="32" Offset="0x4460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005460" OutName="spot09_sceneTex_005460" Format="ci4" Width="32" Height="128" Offset="0x5460" TlutOffset="0x3440" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_005C60" OutName="spot09_sceneTex_005C60" Format="rgba16" Width="32" Height="32" Offset="0x5C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006460" OutName="spot09_sceneTex_006460" Format="rgba16" Width="32" Height="32" Offset="0x6460" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006C60" OutName="spot09_sceneTex_006C60" Format="i8" Width="16" Height="16" Offset="0x6C60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_006D60" OutName="spot09_sceneTex_006D60" Format="rgba16" Width="16" Height="32" Offset="0x6D60" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_007160" OutName="spot09_sceneTex_007160" Format="rgba16" Width="64" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_008160" OutName="spot09_sceneTex_008160" Format="rgba16" Width="64" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_009160" OutName="spot09_sceneTex_009160" Format="rgba16" Width="32" Height="64" Offset="0x9160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A160" OutName="spot09_sceneTex_00A160" Format="rgba16" Width="32" Height="32" Offset="0xA160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00A960" OutName="spot09_sceneTex_00A960" Format="rgba16" Width="32" Height="64" Offset="0xA960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00B960" OutName="spot09_sceneTex_00B960" Format="rgba16" Width="32" Height="32" Offset="0xB960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00C160" OutName="spot09_sceneTex_00C160" Format="rgba16" Width="64" Height="32" Offset="0xC160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00D160" OutName="spot09_sceneTex_00D160" Format="rgba16" Width="128" Height="16" Offset="0xD160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E160" OutName="spot09_sceneTex_00E160" Format="rgba16" Width="32" Height="32" Offset="0xE160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00E960" OutName="spot09_sceneTex_00E960" Format="i4" Width="64" Height="64" Offset="0xE960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F160" OutName="spot09_sceneTex_00F160" Format="i4" Width="32" Height="128" Offset="0xF160" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_00F960" OutName="spot09_sceneTex_00F960" Format="rgba16" Width="64" Height="32" Offset="0xF960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTex_010960" OutName="spot09_sceneTex_010960" Format="rgba16" Width="32" Height="32" Offset="0x10960" AddedByScript="true"/>
+        <Texture Name="spot09_sceneTLUT_003440" OutName="spot09_sceneTLUT_003440" Format="rgba16" Width="4" Height="4" Offset="0x3440" AddedByScript="true"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+        <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
+        <Path Name="gSpot09Path_002F58" Offset="0x2F58" NumPaths="3"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot10.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot10.xml
new file mode 100644
index 0000000000..66365e3d86
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot10.xml
@@ -0,0 +1,71 @@
+<Root>
+    <File Name="spot10_scene" Segment="2">
+        <Texture Name="spot10_sceneTex_00C230" OutName="spot10_sceneTex_00C230" Format="rgba16" Width="32" Height="32" Offset="0xC230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00CA30" OutName="spot10_sceneTex_00CA30" Format="rgba16" Width="32" Height="32" Offset="0xCA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00D230" OutName="spot10_sceneTex_00D230" Format="i4" Width="64" Height="64" Offset="0xD230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00DA30" OutName="spot10_sceneTex_00DA30" Format="rgba16" Width="32" Height="64" Offset="0xDA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00EA30" OutName="spot10_sceneTex_00EA30" Format="rgba16" Width="32" Height="32" Offset="0xEA30" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F230" OutName="spot10_sceneTex_00F230" Format="rgba16" Width="16" Height="16" Offset="0xF230" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00F430" OutName="spot10_sceneTex_00F430" Format="rgba16" Width="32" Height="32" Offset="0xF430" AddedByScript="true"/>
+        <Texture Name="spot10_sceneTex_00FC30" OutName="spot10_sceneTex_00FC30" Format="rgba16" Width="32" Height="32" Offset="0xFC30" AddedByScript="true"/>
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
+        <Scene Name="spot10_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_1" Segment="3">
+        <Texture Name="spot10_room_1Tex_003BA0" OutName="spot10_room_1Tex_003BA0" Format="rgba16" Width="16" Height="32" Offset="0x3BA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_003FA0" OutName="spot10_room_1Tex_003FA0" Format="rgba16" Width="32" Height="32" Offset="0x3FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0047A0" OutName="spot10_room_1Tex_0047A0" Format="rgba16" Width="32" Height="32" Offset="0x47A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_004FA0" OutName="spot10_room_1Tex_004FA0" Format="rgba16" Width="64" Height="32" Offset="0x4FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_005FA0" OutName="spot10_room_1Tex_005FA0" Format="rgba16" Width="32" Height="32" Offset="0x5FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_0067A0" OutName="spot10_room_1Tex_0067A0" Format="rgba16" Width="32" Height="32" Offset="0x67A0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_006FA0" OutName="spot10_room_1Tex_006FA0" Format="rgba16" Width="64" Height="16" Offset="0x6FA0" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_007C30" OutName="spot10_room_1Tex_007C30" Format="ia8" Width="32" Height="32" Offset="0x7C30" AddedByScript="true"/>
+        <Texture Name="spot10_room_1Tex_008030" OutName="spot10_room_1Tex_008030" Format="ia16" Width="32" Height="16" Offset="0x8030" AddedByScript="true"/>
+        <Room Name="spot10_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_2" Segment="3">
+        <Texture Name="spot10_room_2Tex_0023E8" OutName="spot10_room_2Tex_0023E8" Format="rgba16" Width="64" Height="32" Offset="0x23E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0033E8" OutName="spot10_room_2Tex_0033E8" Format="rgba16" Width="64" Height="32" Offset="0x33E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_2Tex_0043E8" OutName="spot10_room_2Tex_0043E8" Format="rgba16" Width="16" Height="64" Offset="0x43E8" AddedByScript="true"/>
+        <Room Name="spot10_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_3" Segment="3">
+        <Texture Name="spot10_room_3Tex_0028F8" OutName="spot10_room_3Tex_0028F8" Format="rgba16" Width="64" Height="32" Offset="0x28F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0038F8" OutName="spot10_room_3Tex_0038F8" Format="rgba16" Width="64" Height="32" Offset="0x38F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0048F8" OutName="spot10_room_3Tex_0048F8" Format="rgba16" Width="16" Height="64" Offset="0x48F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_3Tex_0052A8" OutName="spot10_room_3Tex_0052A8" Format="rgba16" Width="32" Height="32" Offset="0x52A8" AddedByScript="true"/>
+        <Room Name="spot10_room_3" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_5" Segment="3">
+        <Texture Name="spot10_room_5Tex_0037F0" OutName="spot10_room_5Tex_0037F0" Format="rgba16" Width="32" Height="64" Offset="0x37F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0047F0" OutName="spot10_room_5Tex_0047F0" Format="rgba16" Width="64" Height="32" Offset="0x47F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0057F0" OutName="spot10_room_5Tex_0057F0" Format="rgba16" Width="64" Height="32" Offset="0x57F0" AddedByScript="true"/>
+        <Texture Name="spot10_room_5Tex_0067F0" OutName="spot10_room_5Tex_0067F0" Format="rgba16" Width="32" Height="32" Offset="0x67F0" AddedByScript="true"/>
+        <Room Name="spot10_room_5" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_6" Segment="3">
+        <Texture Name="spot10_room_6Tex_0022E8" OutName="spot10_room_6Tex_0022E8" Format="rgba16" Width="32" Height="32" Offset="0x22E8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_002AE8" OutName="spot10_room_6Tex_002AE8" Format="rgba16" Width="64" Height="16" Offset="0x2AE8" AddedByScript="true"/>
+        <Texture Name="spot10_room_6Tex_0032E8" OutName="spot10_room_6Tex_0032E8" Format="rgba16" Width="32" Height="32" Offset="0x32E8" AddedByScript="true"/>
+        <Room Name="spot10_room_6" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
+    </File>
+    <File Name="spot10_room_9" Segment="3">
+        <Texture Name="spot10_room_9Tex_001EF8" OutName="spot10_room_9Tex_001EF8" Format="rgba16" Width="32" Height="32" Offset="0x1EF8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0026F8" OutName="spot10_room_9Tex_0026F8" Format="rgba16" Width="32" Height="32" Offset="0x26F8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0033D8" OutName="spot10_room_9Tex_0033D8" Format="ia8" Width="32" Height="32" Offset="0x33D8" AddedByScript="true"/>
+        <Texture Name="spot10_room_9Tex_0037D8" OutName="spot10_room_9Tex_0037D8" Format="ia16" Width="32" Height="16" Offset="0x37D8" AddedByScript="true"/>
+        <Room Name="spot10_room_9" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot11.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot11.xml
new file mode 100644
index 0000000000..76ff3b8223
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot11.xml
@@ -0,0 +1,41 @@
+<Root>
+    <File Name="spot11_scene" Segment="2">
+        <Texture Name="spot11_sceneTex_007CA0" OutName="spot11_sceneTex_007CA0" Format="rgba16" Width="32" Height="32" Offset="0x7CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0084A0" OutName="spot11_sceneTex_0084A0" Format="rgba16" Width="32" Height="32" Offset="0x84A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_008CA0" OutName="spot11_sceneTex_008CA0" Format="rgba16" Width="16" Height="32" Offset="0x8CA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0090A0" OutName="spot11_sceneTex_0090A0" Format="rgba16" Width="128" Height="16" Offset="0x90A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A0A0" OutName="spot11_sceneTex_00A0A0" Format="rgba16" Width="32" Height="32" Offset="0xA0A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00A8A0" OutName="spot11_sceneTex_00A8A0" Format="rgba16" Width="64" Height="32" Offset="0xA8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00B8A0" OutName="spot11_sceneTex_00B8A0" Format="rgba16" Width="16" Height="32" Offset="0xB8A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00BCA0" OutName="spot11_sceneTex_00BCA0" Format="rgba16" Width="32" Height="32" Offset="0xBCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00C4A0" OutName="spot11_sceneTex_00C4A0" Format="rgba16" Width="32" Height="32" Offset="0xC4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00CCA0" OutName="spot11_sceneTex_00CCA0" Format="rgba16" Width="16" Height="64" Offset="0xCCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00D4A0" OutName="spot11_sceneTex_00D4A0" Format="rgba16" Width="32" Height="32" Offset="0xD4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00DCA0" OutName="spot11_sceneTex_00DCA0" Format="rgba16" Width="64" Height="32" Offset="0xDCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00ECA0" OutName="spot11_sceneTex_00ECA0" Format="rgba16" Width="32" Height="32" Offset="0xECA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00F4A0" OutName="spot11_sceneTex_00F4A0" Format="rgba16" Width="32" Height="32" Offset="0xF4A0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCA0" OutName="spot11_sceneTex_00FCA0" Format="ia8" Width="8" Height="8" Offset="0xFCA0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_00FCE0" OutName="spot11_sceneTex_00FCE0" Format="rgba16" Width="32" Height="32" Offset="0xFCE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0104E0" OutName="spot11_sceneTex_0104E0" Format="rgba16" Width="32" Height="32" Offset="0x104E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_010CE0" OutName="spot11_sceneTex_010CE0" Format="rgba16" Width="32" Height="64" Offset="0x10CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_011CE0" OutName="spot11_sceneTex_011CE0" Format="rgba16" Width="32" Height="32" Offset="0x11CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0124E0" OutName="spot11_sceneTex_0124E0" Format="rgba16" Width="32" Height="32" Offset="0x124E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_012CE0" OutName="spot11_sceneTex_012CE0" Format="rgba16" Width="32" Height="32" Offset="0x12CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0134E0" OutName="spot11_sceneTex_0134E0" Format="rgba16" Width="32" Height="32" Offset="0x134E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_013CE0" OutName="spot11_sceneTex_013CE0" Format="rgba16" Width="32" Height="32" Offset="0x13CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0144E0" OutName="spot11_sceneTex_0144E0" Format="rgba16" Width="32" Height="64" Offset="0x144E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0154E0" OutName="spot11_sceneTex_0154E0" Format="rgba16" Width="32" Height="32" Offset="0x154E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_015CE0" OutName="spot11_sceneTex_015CE0" Format="rgba16" Width="32" Height="32" Offset="0x15CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0164E0" OutName="spot11_sceneTex_0164E0" Format="ia4" Width="32" Height="128" Offset="0x164E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_016CE0" OutName="spot11_sceneTex_016CE0" Format="rgba16" Width="32" Height="32" Offset="0x16CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0174E0" OutName="spot11_sceneTex_0174E0" Format="rgba16" Width="16" Height="64" Offset="0x174E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_017CE0" OutName="spot11_sceneTex_017CE0" Format="ia4" Width="64" Height="64" Offset="0x17CE0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_0184E0" OutName="spot11_sceneTex_0184E0" Format="rgba16" Width="32" Height="32" Offset="0x184E0" AddedByScript="true"/>
+        <Texture Name="spot11_sceneTex_018CE0" OutName="spot11_sceneTex_018CE0" Format="rgba16" Width="32" Height="32" Offset="0x18CE0" AddedByScript="true"/>
+        <Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
+        <Scene Name="spot11_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot12.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot12.xml
new file mode 100644
index 0000000000..e21523b217
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot12.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot12_scene" Segment="2">
+        <Texture Name="spot12_sceneTex_006678" OutName="spot12_sceneTex_006678" Format="rgba16" Width="32" Height="64" Offset="0x6678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_007678" OutName="spot12_sceneTex_007678" Format="rgba16" Width="32" Height="64" Offset="0x7678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008678" OutName="spot12_sceneTex_008678" Format="rgba16" Width="32" Height="32" Offset="0x8678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_008E78" OutName="spot12_sceneTex_008E78" Format="ci4" Width="32" Height="128" Offset="0x8E78" TlutOffset="0x6650" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00A678" OutName="spot12_sceneTex_00A678" Format="rgba16" Width="64" Height="32" Offset="0xA678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00B678" OutName="spot12_sceneTex_00B678" Format="rgba16" Width="32" Height="32" Offset="0xB678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00BE78" OutName="spot12_sceneTex_00BE78" Format="rgba16" Width="64" Height="16" Offset="0xBE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00C678" OutName="spot12_sceneTex_00C678" Format="rgba16" Width="32" Height="32" Offset="0xC678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00CE78" OutName="spot12_sceneTex_00CE78" Format="rgba16" Width="32" Height="32" Offset="0xCE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00D678" OutName="spot12_sceneTex_00D678" Format="rgba16" Width="32" Height="32" Offset="0xD678" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTex_00EE78" OutName="spot12_sceneTex_00EE78" Format="rgba16" Width="64" Height="32" Offset="0xEE78" AddedByScript="true"/>
+        <Texture Name="spot12_sceneTLUT_006650" OutName="spot12_sceneTLUT_006650" Format="rgba16" Width="4" Height="4" Offset="0x6650" AddedByScript="true"/>
+        <Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
+        <Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
+        <Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
+        <Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_0" Segment="3">
+        <Texture Name="spot12_room_0Tex_008AB0" OutName="spot12_room_0Tex_008AB0" Format="rgba16" Width="32" Height="32" Offset="0x8AB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0092B0" OutName="spot12_room_0Tex_0092B0" Format="rgba16" Width="32" Height="16" Offset="0x92B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0096B0" OutName="spot12_room_0Tex_0096B0" Format="rgba16" Width="32" Height="32" Offset="0x96B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_009EB0" OutName="spot12_room_0Tex_009EB0" Format="rgba16" Width="32" Height="32" Offset="0x9EB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00A6B0" OutName="spot12_room_0Tex_00A6B0" Format="rgba16" Width="64" Height="32" Offset="0xA6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00B6B0" OutName="spot12_room_0Tex_00B6B0" Format="rgba16" Width="32" Height="32" Offset="0xB6B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00BEB0" OutName="spot12_room_0Tex_00BEB0" Format="rgba16" Width="32" Height="32" Offset="0xBEB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00C6B0" OutName="spot12_room_0Tex_00C6B0" Format="ci4" Width="64" Height="32" Offset="0xC6B0" TlutOffset="0x8A90" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00CAB0" OutName="spot12_room_0Tex_00CAB0" Format="rgba16" Width="16" Height="64" Offset="0xCAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00D2B0" OutName="spot12_room_0Tex_00D2B0" Format="rgba16" Width="64" Height="32" Offset="0xD2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00E2B0" OutName="spot12_room_0Tex_00E2B0" Format="rgba16" Width="32" Height="32" Offset="0xE2B0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00EAB0" OutName="spot12_room_0Tex_00EAB0" Format="rgba16" Width="32" Height="32" Offset="0xEAB0" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FD78" OutName="spot12_room_0Tex_00FD78" Format="ia8" Width="8" Height="8" Offset="0xFD78" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_00FDB8" OutName="spot12_room_0Tex_00FDB8" Format="rgba16" Width="16" Height="64" Offset="0xFDB8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0Tex_0105B8" OutName="spot12_room_0Tex_0105B8" Format="rgba16" Width="32" Height="64" Offset="0x105B8" AddedByScript="true"/>
+        <Texture Name="spot12_room_0TLUT_008A90" OutName="spot12_room_0TLUT_008A90" Format="rgba16" Width="4" Height="4" Offset="0x8A90" AddedByScript="true"/>
+        <Room Name="spot12_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot12_room_1" Segment="3">
+        <Texture Name="spot12_room_1Tex_005638" OutName="spot12_room_1Tex_005638" Format="rgba16" Width="32" Height="64" Offset="0x5638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_006638" OutName="spot12_room_1Tex_006638" Format="rgba16" Width="32" Height="64" Offset="0x6638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007638" OutName="spot12_room_1Tex_007638" Format="rgba16" Width="32" Height="32" Offset="0x7638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_007E38" OutName="spot12_room_1Tex_007E38" Format="rgba16" Width="64" Height="32" Offset="0x7E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_008E38" OutName="spot12_room_1Tex_008E38" Format="rgba16" Width="64" Height="32" Offset="0x8E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_009E38" OutName="spot12_room_1Tex_009E38" Format="rgba16" Width="32" Height="32" Offset="0x9E38" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00A638" OutName="spot12_room_1Tex_00A638" Format="i4" Width="64" Height="64" Offset="0xA638" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B0A0" OutName="spot12_room_1Tex_00B0A0" Format="i8" Width="32" Height="64" Offset="0xB0A0" AddedByScript="true"/>
+        <Texture Name="spot12_room_1Tex_00B8A0" OutName="spot12_room_1Tex_00B8A0" Format="i8" Width="32" Height="64" Offset="0xB8A0" AddedByScript="true"/>
+        <Room Name="spot12_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot13.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot13.xml
new file mode 100644
index 0000000000..c689130650
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot13.xml
@@ -0,0 +1,39 @@
+<Root>
+    <File Name="spot13_scene" Segment="2">
+        <Texture Name="spot13_sceneTex_003A30" OutName="spot13_sceneTex_003A30" Format="rgba16" Width="32" Height="16" Offset="0x3A30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_003E30" OutName="spot13_sceneTex_003E30" Format="rgba16" Width="32" Height="64" Offset="0x3E30" AddedByScript="true"/>
+        <Texture Name="spot13_sceneTex_004E30" OutName="spot13_sceneTex_004E30" Format="rgba16" Width="64" Height="32" Offset="0x4E30" AddedByScript="true"/>
+        <Scene Name="spot13_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot13_room_1" Segment="3">
+        <Texture Name="spot13_room_1Tex_007E08" OutName="spot13_room_1Tex_007E08" Format="rgba16" Width="32" Height="32" Offset="0x7E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008608" OutName="spot13_room_1Tex_008608" Format="rgba16" Width="16" Height="32" Offset="0x8608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_008A08" OutName="spot13_room_1Tex_008A08" Format="rgba16" Width="32" Height="64" Offset="0x8A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009A08" OutName="spot13_room_1Tex_009A08" Format="rgba16" Width="16" Height="16" Offset="0x9A08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009C08" OutName="spot13_room_1Tex_009C08" Format="rgba16" Width="16" Height="16" Offset="0x9C08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_009E08" OutName="spot13_room_1Tex_009E08" Format="rgba16" Width="32" Height="32" Offset="0x9E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00A608" OutName="spot13_room_1Tex_00A608" Format="rgba16" Width="32" Height="16" Offset="0xA608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AA08" OutName="spot13_room_1Tex_00AA08" Format="rgba16" Width="32" Height="16" Offset="0xAA08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00AE08" OutName="spot13_room_1Tex_00AE08" Format="ci4" Width="32" Height="128" Offset="0xAE08" TlutOffset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B608" OutName="spot13_room_1Tex_00B608" Format="rgba16" Width="16" Height="16" Offset="0xB608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00B808" OutName="spot13_room_1Tex_00B808" Format="ci4" Width="64" Height="32" Offset="0xB808" TlutOffset="0x7DE8" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00BC08" OutName="spot13_room_1Tex_00BC08" Format="rgba16" Width="32" Height="32" Offset="0xBC08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C408" OutName="spot13_room_1Tex_00C408" Format="rgba16" Width="8" Height="32" Offset="0xC408" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00C608" OutName="spot13_room_1Tex_00C608" Format="rgba16" Width="64" Height="32" Offset="0xC608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00D608" OutName="spot13_room_1Tex_00D608" Format="rgba16" Width="32" Height="64" Offset="0xD608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00E608" OutName="spot13_room_1Tex_00E608" Format="rgba16" Width="32" Height="32" Offset="0xE608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00EE08" OutName="spot13_room_1Tex_00EE08" Format="rgba16" Width="32" Height="64" Offset="0xEE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_00FE08" OutName="spot13_room_1Tex_00FE08" Format="rgba16" Width="32" Height="32" Offset="0xFE08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010608" OutName="spot13_room_1Tex_010608" Format="rgba16" Width="32" Height="32" Offset="0x10608" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_010E08" OutName="spot13_room_1Tex_010E08" Format="rgba16" Width="32" Height="16" Offset="0x10E08" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011208" OutName="spot13_room_1Tex_011208" Format="rgba16" Width="32" Height="32" Offset="0x11208" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_011E40" OutName="spot13_room_1Tex_011E40" Format="ia4" Width="64" Height="32" Offset="0x11E40" AddedByScript="true"/>
+        <Texture Name="spot13_room_1Tex_012240" OutName="spot13_room_1Tex_012240" Format="rgba16" Width="32" Height="32" Offset="0x12240" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DC0" OutName="spot13_room_1TLUT_007DC0" Format="rgba16" Width="4" Height="4" Offset="0x7DC0" AddedByScript="true"/>
+        <Texture Name="spot13_room_1TLUT_007DE8" OutName="spot13_room_1TLUT_007DE8" Format="rgba16" Width="4" Height="4" Offset="0x7DE8" AddedByScript="true"/>
+        <Room Name="spot13_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot15.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot15.xml
new file mode 100644
index 0000000000..e75f7b6845
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot15.xml
@@ -0,0 +1,52 @@
+<Root>
+    <File Name="spot15_scene" Segment="2">
+        <Texture Name="spot15_sceneTex_004100" OutName="spot15_sceneTex_004100" Format="rgba16" Width="32" Height="32" Offset="0x4100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004900" OutName="spot15_sceneTex_004900" Format="ia4" Width="32" Height="16" Offset="0x4900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004A00" OutName="spot15_sceneTex_004A00" Format="ia8" Width="8" Height="64" Offset="0x4A00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_004C00" OutName="spot15_sceneTex_004C00" Format="rgba16" Width="16" Height="64" Offset="0x4C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_005400" OutName="spot15_sceneTex_005400" Format="rgba16" Width="32" Height="64" Offset="0x5400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006400" OutName="spot15_sceneTex_006400" Format="ia8" Width="32" Height="8" Offset="0x6400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006500" OutName="spot15_sceneTex_006500" Format="rgba16" Width="32" Height="32" Offset="0x6500" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006D00" OutName="spot15_sceneTex_006D00" Format="i4" Width="32" Height="32" Offset="0x6D00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_006F00" OutName="spot15_sceneTex_006F00" Format="ia4" Width="32" Height="64" Offset="0x6F00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007300" OutName="spot15_sceneTex_007300" Format="ia4" Width="32" Height="128" Offset="0x7300" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007B00" OutName="spot15_sceneTex_007B00" Format="ia4" Width="16" Height="32" Offset="0x7B00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007C00" OutName="spot15_sceneTex_007C00" Format="rgba16" Width="32" Height="8" Offset="0x7C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_007E00" OutName="spot15_sceneTex_007E00" Format="rgba16" Width="32" Height="64" Offset="0x7E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_008E00" OutName="spot15_sceneTex_008E00" Format="rgba16" Width="32" Height="32" Offset="0x8E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009600" OutName="spot15_sceneTex_009600" Format="rgba16" Width="16" Height="16" Offset="0x9600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009800" OutName="spot15_sceneTex_009800" Format="ia8" Width="16" Height="16" Offset="0x9800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_009900" OutName="spot15_sceneTex_009900" Format="rgba16" Width="32" Height="32" Offset="0x9900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A100" OutName="spot15_sceneTex_00A100" Format="rgba16" Width="32" Height="32" Offset="0xA100" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00A900" OutName="spot15_sceneTex_00A900" Format="rgba16" Width="64" Height="32" Offset="0xA900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00B900" OutName="spot15_sceneTex_00B900" Format="ia8" Width="16" Height="16" Offset="0xB900" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00BA00" OutName="spot15_sceneTex_00BA00" Format="rgba16" Width="32" Height="32" Offset="0xBA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00C200" OutName="spot15_sceneTex_00C200" Format="rgba16" Width="32" Height="32" Offset="0xC200" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00CA00" OutName="spot15_sceneTex_00CA00" Format="rgba16" Width="64" Height="32" Offset="0xCA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00DA00" OutName="spot15_sceneTex_00DA00" Format="rgba16" Width="128" Height="16" Offset="0xDA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EA00" OutName="spot15_sceneTex_00EA00" Format="i4" Width="32" Height="32" Offset="0xEA00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00EC00" OutName="spot15_sceneTex_00EC00" Format="i8" Width="128" Height="32" Offset="0xEC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_00FC00" OutName="spot15_sceneTex_00FC00" Format="rgba16" Width="32" Height="32" Offset="0xFC00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010400" OutName="spot15_sceneTex_010400" Format="rgba16" Width="32" Height="32" Offset="0x10400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_010C00" OutName="spot15_sceneTex_010C00" Format="i4" Width="64" Height="64" Offset="0x10C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011400" OutName="spot15_sceneTex_011400" Format="rgba16" Width="32" Height="32" Offset="0x11400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_011C00" OutName="spot15_sceneTex_011C00" Format="ia4" Width="128" Height="32" Offset="0x11C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_012400" OutName="spot15_sceneTex_012400" Format="rgba16" Width="32" Height="64" Offset="0x12400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_013400" OutName="spot15_sceneTex_013400" Format="rgba16" Width="32" Height="64" Offset="0x13400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014400" OutName="spot15_sceneTex_014400" Format="rgba16" Width="32" Height="32" Offset="0x14400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_014C00" OutName="spot15_sceneTex_014C00" Format="rgba16" Width="64" Height="32" Offset="0x14C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015C00" OutName="spot15_sceneTex_015C00" Format="rgba16" Width="16" Height="16" Offset="0x15C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_015E00" OutName="spot15_sceneTex_015E00" Format="rgba16" Width="32" Height="32" Offset="0x15E00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016600" OutName="spot15_sceneTex_016600" Format="rgba16" Width="16" Height="16" Offset="0x16600" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016800" OutName="spot15_sceneTex_016800" Format="rgba16" Width="32" Height="16" Offset="0x16800" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_016C00" OutName="spot15_sceneTex_016C00" Format="rgba16" Width="32" Height="32" Offset="0x16C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017400" OutName="spot15_sceneTex_017400" Format="rgba16" Width="32" Height="32" Offset="0x17400" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_017C00" OutName="spot15_sceneTex_017C00" Format="rgba16" Width="32" Height="32" Offset="0x17C00" AddedByScript="true"/>
+        <Texture Name="spot15_sceneTex_018400" OutName="spot15_sceneTex_018400" Format="ia8" Width="16" Height="16" Offset="0x18400" AddedByScript="true"/>
+        <Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
+        <Scene Name="spot15_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot16.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot16.xml
new file mode 100644
index 0000000000..f41b226f8e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot16.xml
@@ -0,0 +1,50 @@
+<Root>
+    <File Name="spot16_scene" Segment="2">
+        <Texture Name="spot16_sceneTex_008198" OutName="spot16_sceneTex_008198" Format="i8" Width="64" Height="64" Offset="0x8198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009198" OutName="spot16_sceneTex_009198" Format="i8" Width="64" Height="32" Offset="0x9198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009998" OutName="spot16_sceneTex_009998" Format="i8" Width="64" Height="16" Offset="0x9998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_009D98" OutName="spot16_sceneTex_009D98" Format="i8" Width="64" Height="64" Offset="0x9D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00AD98" OutName="spot16_sceneTex_00AD98" Format="i8" Width="64" Height="64" Offset="0xAD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00BD98" OutName="spot16_sceneTex_00BD98" Format="rgba16" Width="64" Height="32" Offset="0xBD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CD98" OutName="spot16_sceneTex_00CD98" Format="rgba16" Width="16" Height="16" Offset="0xCD98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00CF98" OutName="spot16_sceneTex_00CF98" Format="rgba16" Width="32" Height="16" Offset="0xCF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D398" OutName="spot16_sceneTex_00D398" Format="rgba16" Width="16" Height="32" Offset="0xD398" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00D798" OutName="spot16_sceneTex_00D798" Format="ci4" Width="64" Height="64" Offset="0xD798" TlutOffset="0x8170" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00DF98" OutName="spot16_sceneTex_00DF98" Format="i4" Width="64" Height="16" Offset="0xDF98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00E198" OutName="spot16_sceneTex_00E198" Format="rgba16" Width="64" Height="32" Offset="0xE198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_00F198" OutName="spot16_sceneTex_00F198" Format="rgba16" Width="16" Height="128" Offset="0xF198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_010198" OutName="spot16_sceneTex_010198" Format="rgba16" Width="32" Height="64" Offset="0x10198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011198" OutName="spot16_sceneTex_011198" Format="rgba16" Width="16" Height="32" Offset="0x11198" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011598" OutName="spot16_sceneTex_011598" Format="i4" Width="64" Height="16" Offset="0x11598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_011798" OutName="spot16_sceneTex_011798" Format="rgba16" Width="64" Height="32" Offset="0x11798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_012798" OutName="spot16_sceneTex_012798" Format="rgba16" Width="64" Height="32" Offset="0x12798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013798" OutName="spot16_sceneTex_013798" Format="i4" Width="64" Height="16" Offset="0x13798" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013998" OutName="spot16_sceneTex_013998" Format="rgba16" Width="32" Height="16" Offset="0x13998" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_013D98" OutName="spot16_sceneTex_013D98" Format="rgba16" Width="32" Height="64" Offset="0x13D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_014D98" OutName="spot16_sceneTex_014D98" Format="rgba16" Width="32" Height="32" Offset="0x14D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015598" OutName="spot16_sceneTex_015598" Format="i4" Width="64" Height="64" Offset="0x15598" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015D98" OutName="spot16_sceneTex_015D98" Format="ia8" Width="16" Height="16" Offset="0x15D98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_015E98" OutName="spot16_sceneTex_015E98" Format="ia8" Width="128" Height="32" Offset="0x15E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_016E98" OutName="spot16_sceneTex_016E98" Format="i4" Width="128" Height="64" Offset="0x16E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_017E98" OutName="spot16_sceneTex_017E98" Format="rgba16" Width="32" Height="32" Offset="0x17E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018698" OutName="spot16_sceneTex_018698" Format="rgba16" Width="32" Height="32" Offset="0x18698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_018E98" OutName="spot16_sceneTex_018E98" Format="rgba16" Width="32" Height="32" Offset="0x18E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019698" OutName="spot16_sceneTex_019698" Format="rgba16" Width="64" Height="16" Offset="0x19698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_019E98" OutName="spot16_sceneTex_019E98" Format="rgba16" Width="32" Height="64" Offset="0x19E98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01B698" OutName="spot16_sceneTex_01B698" Format="ia8" Width="64" Height="64" Offset="0x1B698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01C698" OutName="spot16_sceneTex_01C698" Format="rgba16" Width="32" Height="64" Offset="0x1C698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01D698" OutName="spot16_sceneTex_01D698" Format="i8" Width="64" Height="32" Offset="0x1D698" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTex_01DE98" OutName="spot16_sceneTex_01DE98" Format="rgba16" Width="32" Height="32" Offset="0x1DE98" AddedByScript="true"/>
+        <Texture Name="spot16_sceneTLUT_008170" OutName="spot16_sceneTLUT_008170" Format="rgba16" Width="4" Height="4" Offset="0x8170" AddedByScript="true"/>
+        <Path Name="gDMTPath_00254" Offset="0x254" NumPaths="3"/>
+        <Path Name="gDMTPath_07884" Offset="0x7884" NumPaths="3"/>
+        <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
+        <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Scene Name="spot16_scene" Offset="0x0"/>
+        <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
+    </File>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
+        <DList Name="spot16_room_0DL_00AA48" Offset="0xAA48"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot17.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot17.xml
new file mode 100644
index 0000000000..feb267251e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot17.xml
@@ -0,0 +1,54 @@
+<Root>
+    <File Name="spot17_scene" Segment="2">
+        <Texture Name="spot17_sceneTex_007AD8" OutName="spot17_sceneTex_007AD8" Format="ci8" Width="16" Height="128" Offset="0x7AD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0082D8" OutName="spot17_sceneTex_0082D8" Format="ci8" Width="32" Height="32" Offset="0x82D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0086D8" OutName="spot17_sceneTex_0086D8" Format="ci8" Width="64" Height="32" Offset="0x86D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_008ED8" OutName="spot17_sceneTex_008ED8" Format="ci8" Width="64" Height="32" Offset="0x8ED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_0096D8" OutName="spot17_sceneTex_0096D8" Format="ci8" Width="64" Height="32" Offset="0x96D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_009ED8" OutName="spot17_sceneTex_009ED8" Format="rgba16" Width="32" Height="32" Offset="0x9ED8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00A6D8" OutName="spot17_sceneTex_00A6D8" Format="rgba16" Width="32" Height="32" Offset="0xA6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00AED8" OutName="spot17_sceneTex_00AED8" Format="ci4" Width="64" Height="64" Offset="0xAED8" TlutOffset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00B6D8" OutName="spot17_sceneTex_00B6D8" Format="ci8" Width="64" Height="32" Offset="0xB6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00BED8" OutName="spot17_sceneTex_00BED8" Format="ci8" Width="32" Height="64" Offset="0xBED8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00C6D8" OutName="spot17_sceneTex_00C6D8" Format="rgba16" Width="32" Height="64" Offset="0xC6D8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D6D8" OutName="spot17_sceneTex_00D6D8" Format="ci8" Width="16" Height="32" Offset="0xD6D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00D8D8" OutName="spot17_sceneTex_00D8D8" Format="ci8" Width="16" Height="128" Offset="0xD8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E0D8" OutName="spot17_sceneTex_00E0D8" Format="ci4" Width="64" Height="64" Offset="0xE0D8" TlutOffset="0x7AB8" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00E8D8" OutName="spot17_sceneTex_00E8D8" Format="ci8" Width="32" Height="64" Offset="0xE8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F0D8" OutName="spot17_sceneTex_00F0D8" Format="ci8" Width="32" Height="64" Offset="0xF0D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00F8D8" OutName="spot17_sceneTex_00F8D8" Format="ci8" Width="32" Height="32" Offset="0xF8D8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTex_00FCD8" OutName="spot17_sceneTex_00FCD8" Format="ci8" Width="16" Height="32" Offset="0xFCD8" TlutOffset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007890" OutName="spot17_sceneTLUT_007890" Format="rgba16" Width="16" Height="16" Offset="0x7890" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007A98" OutName="spot17_sceneTLUT_007A98" Format="rgba16" Width="4" Height="4" Offset="0x7A98" AddedByScript="true"/>
+        <Texture Name="spot17_sceneTLUT_007AB8" OutName="spot17_sceneTLUT_007AB8" Format="rgba16" Width="4" Height="4" Offset="0x7AB8" AddedByScript="true"/>
+        <Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
+        <Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_0" Segment="3">
+        <Texture Name="spot17_room_0Tex_003880" OutName="spot17_room_0Tex_003880" Format="rgba16" Width="64" Height="32" Offset="0x3880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_004880" OutName="spot17_room_0Tex_004880" Format="rgba16" Width="32" Height="32" Offset="0x4880" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005080" OutName="spot17_room_0Tex_005080" Format="rgba16" Width="32" Height="32" Offset="0x5080" AddedByScript="true"/>
+        <Texture Name="spot17_room_0Tex_005880" OutName="spot17_room_0Tex_005880" Format="rgba16" Width="32" Height="64" Offset="0x5880" AddedByScript="true"/>
+        <Room Name="spot17_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot17_room_1" Segment="3">
+        <Texture Name="spot17_room_1Tex_00BBD8" OutName="spot17_room_1Tex_00BBD8" Format="ci8" Width="64" Height="32" Offset="0xBBD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00C3D8" OutName="spot17_room_1Tex_00C3D8" Format="ci8" Width="64" Height="32" Offset="0xC3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00CBD8" OutName="spot17_room_1Tex_00CBD8" Format="rgba16" Width="32" Height="32" Offset="0xCBD8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D3D8" OutName="spot17_room_1Tex_00D3D8" Format="ci8" Width="32" Height="32" Offset="0xD3D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00D7D8" OutName="spot17_room_1Tex_00D7D8" Format="rgba16" Width="64" Height="32" Offset="0xD7D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E7D8" OutName="spot17_room_1Tex_00E7D8" Format="ci8" Width="16" Height="16" Offset="0xE7D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00E8D8" OutName="spot17_room_1Tex_00E8D8" Format="ci8" Width="32" Height="32" Offset="0xE8D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00ECD8" OutName="spot17_room_1Tex_00ECD8" Format="ci8" Width="32" Height="32" Offset="0xECD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F0D8" OutName="spot17_room_1Tex_00F0D8" Format="ci8" Width="32" Height="32" Offset="0xF0D8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00F4D8" OutName="spot17_room_1Tex_00F4D8" Format="rgba16" Width="32" Height="32" Offset="0xF4D8" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_00FCD8" OutName="spot17_room_1Tex_00FCD8" Format="ci8" Width="32" Height="16" Offset="0xFCD8" ExternalTlut="spot17_scene" ExternalTlutOffset="0x78A0" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_010E58" OutName="spot17_room_1Tex_010E58" Format="i4" Width="64" Height="32" Offset="0x10E58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011258" OutName="spot17_room_1Tex_011258" Format="i4" Width="64" Height="32" Offset="0x11258" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011658" OutName="spot17_room_1Tex_011658" Format="i4" Width="64" Height="32" Offset="0x11658" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_011A58" OutName="spot17_room_1Tex_011A58" Format="rgba16" Width="32" Height="32" Offset="0x11A58" AddedByScript="true"/>
+        <Texture Name="spot17_room_1Tex_012258" OutName="spot17_room_1Tex_012258" Format="ia8" Width="16" Height="16" Offset="0x12258" AddedByScript="true"/>
+        <Room Name="spot17_room_1" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot18.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot18.xml
new file mode 100644
index 0000000000..d70fccf4bb
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot18.xml
@@ -0,0 +1,105 @@
+<Root>
+    <File Name="spot18_scene" Segment="2">
+        <Texture Name="spot18_sceneTex_0087C8" OutName="spot18_sceneTex_0087C8" Format="rgba16" Width="32" Height="32" Offset="0x87C8" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009008" OutName="spot18_sceneTex_009008" Format="ci8" Width="64" Height="32" Offset="0x9008" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009848" OutName="spot18_sceneTex_009848" Format="rgba16" Width="16" Height="32" Offset="0x9848" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTex_009C48" OutName="spot18_sceneTex_009C48" Format="ci8" Width="64" Height="32" Offset="0x9C48" TlutOffset="0x85C0" AddedByScript="true"/>
+        <Texture Name="spot18_sceneTLUT_0085C0" OutName="spot18_sceneTLUT_0085C0" Format="rgba16" Width="16" Height="16" Offset="0x85C0" AddedByScript="true"/>
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
+        <Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
+        <Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
+        <Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
+        <Scene Name="spot18_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_0" Segment="3">
+        <Texture Name="spot18_room_0Tex_004960" OutName="spot18_room_0Tex_004960" Format="rgba16" Width="32" Height="32" Offset="0x4960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005160" OutName="spot18_room_0Tex_005160" Format="rgba16" Width="16" Height="32" Offset="0x5160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005560" OutName="spot18_room_0Tex_005560" Format="rgba16" Width="16" Height="32" Offset="0x5560" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_005960" OutName="spot18_room_0Tex_005960" Format="rgba16" Width="32" Height="64" Offset="0x5960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_006960" OutName="spot18_room_0Tex_006960" Format="ci8" Width="32" Height="64" Offset="0x6960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007160" OutName="spot18_room_0Tex_007160" Format="rgba16" Width="32" Height="32" Offset="0x7160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_007960" OutName="spot18_room_0Tex_007960" Format="rgba16" Width="32" Height="32" Offset="0x7960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008160" OutName="spot18_room_0Tex_008160" Format="rgba16" Width="32" Height="32" Offset="0x8160" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_008960" OutName="spot18_room_0Tex_008960" Format="ci8" Width="32" Height="64" Offset="0x8960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009160" OutName="spot18_room_0Tex_009160" Format="ci8" Width="32" Height="64" Offset="0x9160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_009960" OutName="spot18_room_0Tex_009960" Format="rgba16" Width="32" Height="32" Offset="0x9960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A160" OutName="spot18_room_0Tex_00A160" Format="ci8" Width="64" Height="32" Offset="0xA160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00A960" OutName="spot18_room_0Tex_00A960" Format="ci8" Width="32" Height="64" Offset="0xA960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B160" OutName="spot18_room_0Tex_00B160" Format="ci8" Width="32" Height="64" Offset="0xB160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00B960" OutName="spot18_room_0Tex_00B960" Format="ci8" Width="32" Height="64" Offset="0xB960" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C160" OutName="spot18_room_0Tex_00C160" Format="ci8" Width="32" Height="64" Offset="0xC160" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00C960" OutName="spot18_room_0Tex_00C960" Format="ia8" Width="64" Height="64" Offset="0xC960" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00DFC8" OutName="spot18_room_0Tex_00DFC8" Format="rgba16" Width="32" Height="64" Offset="0xDFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00EFC8" OutName="spot18_room_0Tex_00EFC8" Format="rgba16" Width="64" Height="32" Offset="0xEFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_00FFC8" OutName="spot18_room_0Tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0107C8" OutName="spot18_room_0Tex_0107C8" Format="rgba16" Width="64" Height="32" Offset="0x107C8" AddedByScript="true"/>
+        <Texture Name="spot18_room_0Tex_0117C8" OutName="spot18_room_0Tex_0117C8" Format="rgba16" Width="64" Height="32" Offset="0x117C8" AddedByScript="true"/>
+        <Room Name="spot18_room_0" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_1" Segment="3">
+        <Texture Name="spot18_room_1Tex_002868" OutName="spot18_room_1Tex_002868" Format="rgba16" Width="32" Height="32" Offset="0x2868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_003068" OutName="spot18_room_1Tex_003068" Format="i4" Width="128" Height="64" Offset="0x3068" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004068" OutName="spot18_room_1Tex_004068" Format="ci8" Width="64" Height="32" Offset="0x4068" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_004868" OutName="spot18_room_1Tex_004868" Format="rgba16" Width="32" Height="64" Offset="0x4868" AddedByScript="true"/>
+        <Texture Name="spot18_room_1Tex_005E00" OutName="spot18_room_1Tex_005E00" Format="ia4" Width="32" Height="64" Offset="0x5E00" AddedByScript="true"/>
+        <Room Name="spot18_room_1" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_2" Segment="3">
+        <Texture Name="spot18_room_2Tex_004818" OutName="spot18_room_2Tex_004818" Format="rgba16" Width="32" Height="64" Offset="0x4818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_005818" OutName="spot18_room_2Tex_005818" Format="rgba16" Width="32" Height="32" Offset="0x5818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006018" OutName="spot18_room_2Tex_006018" Format="rgba16" Width="32" Height="32" Offset="0x6018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_006818" OutName="spot18_room_2Tex_006818" Format="rgba16" Width="32" Height="32" Offset="0x6818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007018" OutName="spot18_room_2Tex_007018" Format="ci8" Width="32" Height="64" Offset="0x7018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_007818" OutName="spot18_room_2Tex_007818" Format="rgba16" Width="32" Height="32" Offset="0x7818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008018" OutName="spot18_room_2Tex_008018" Format="rgba16" Width="32" Height="32" Offset="0x8018" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_008818" OutName="spot18_room_2Tex_008818" Format="ci8" Width="32" Height="64" Offset="0x8818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009018" OutName="spot18_room_2Tex_009018" Format="ci8" Width="32" Height="64" Offset="0x9018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_009818" OutName="spot18_room_2Tex_009818" Format="ci8" Width="32" Height="64" Offset="0x9818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A018" OutName="spot18_room_2Tex_00A018" Format="ci8" Width="32" Height="64" Offset="0xA018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00A818" OutName="spot18_room_2Tex_00A818" Format="ci8" Width="32" Height="64" Offset="0xA818" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B018" OutName="spot18_room_2Tex_00B018" Format="ci8" Width="32" Height="64" Offset="0xB018" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00B818" OutName="spot18_room_2Tex_00B818" Format="ia8" Width="64" Height="64" Offset="0xB818" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00D1A8" OutName="spot18_room_2Tex_00D1A8" Format="rgba16" Width="32" Height="64" Offset="0xD1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00E1A8" OutName="spot18_room_2Tex_00E1A8" Format="rgba16" Width="64" Height="32" Offset="0xE1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F1A8" OutName="spot18_room_2Tex_00F1A8" Format="rgba16" Width="32" Height="32" Offset="0xF1A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_00F9A8" OutName="spot18_room_2Tex_00F9A8" Format="rgba16" Width="64" Height="32" Offset="0xF9A8" AddedByScript="true"/>
+        <Texture Name="spot18_room_2Tex_0109A8" OutName="spot18_room_2Tex_0109A8" Format="rgba16" Width="64" Height="32" Offset="0x109A8" AddedByScript="true"/>
+        <Room Name="spot18_room_2" Offset="0x0"/>
+    </File>
+    <File Name="spot18_room_3" Segment="3">
+        <Texture Name="spot18_room_3Tex_00B448" OutName="spot18_room_3Tex_00B448" Format="rgba16" Width="32" Height="32" Offset="0xB448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00BC48" OutName="spot18_room_3Tex_00BC48" Format="rgba16" Width="16" Height="32" Offset="0xBC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C048" OutName="spot18_room_3Tex_00C048" Format="rgba16" Width="16" Height="32" Offset="0xC048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C448" OutName="spot18_room_3Tex_00C448" Format="rgba16" Width="16" Height="32" Offset="0xC448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00C848" OutName="spot18_room_3Tex_00C848" Format="rgba16" Width="32" Height="64" Offset="0xC848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00D848" OutName="spot18_room_3Tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00DC48" OutName="spot18_room_3Tex_00DC48" Format="ci8" Width="32" Height="64" Offset="0xDC48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00E448" OutName="spot18_room_3Tex_00E448" Format="ci8" Width="32" Height="64" Offset="0xE448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00EC48" OutName="spot18_room_3Tex_00EC48" Format="rgba16" Width="32" Height="32" Offset="0xEC48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_00F448" OutName="spot18_room_3Tex_00F448" Format="rgba16" Width="64" Height="32" Offset="0xF448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010448" OutName="spot18_room_3Tex_010448" Format="rgba16" Width="32" Height="32" Offset="0x10448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_010C48" OutName="spot18_room_3Tex_010C48" Format="rgba16" Width="32" Height="32" Offset="0x10C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011448" OutName="spot18_room_3Tex_011448" Format="ci8" Width="32" Height="64" Offset="0x11448" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_011C48" OutName="spot18_room_3Tex_011C48" Format="ci8" Width="32" Height="64" Offset="0x11C48" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012448" OutName="spot18_room_3Tex_012448" Format="rgba16" Width="16" Height="16" Offset="0x12448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012648" OutName="spot18_room_3Tex_012648" Format="rgba16" Width="16" Height="16" Offset="0x12648" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_012848" OutName="spot18_room_3Tex_012848" Format="i4" Width="128" Height="64" Offset="0x12848" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_013848" OutName="spot18_room_3Tex_013848" Format="ci8" Width="64" Height="32" Offset="0x13848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014048" OutName="spot18_room_3Tex_014048" Format="rgba16" Width="32" Height="32" Offset="0x14048" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_014848" OutName="spot18_room_3Tex_014848" Format="ci8" Width="32" Height="64" Offset="0x14848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015048" OutName="spot18_room_3Tex_015048" Format="ci8" Width="32" Height="64" Offset="0x15048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_015848" OutName="spot18_room_3Tex_015848" Format="ci8" Width="32" Height="64" Offset="0x15848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016048" OutName="spot18_room_3Tex_016048" Format="ci8" Width="32" Height="64" Offset="0x16048" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016848" OutName="spot18_room_3Tex_016848" Format="ci8" Width="32" Height="32" Offset="0x16848" ExternalTlut="spot18_scene" ExternalTlutOffset="0x8540" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_016C48" OutName="spot18_room_3Tex_016C48" Format="rgba16" Width="32" Height="32" Offset="0x16C48" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_017448" OutName="spot18_room_3Tex_017448" Format="ia8" Width="64" Height="64" Offset="0x17448" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_0194E8" OutName="spot18_room_3Tex_0194E8" Format="rgba16" Width="32" Height="64" Offset="0x194E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01A4E8" OutName="spot18_room_3Tex_01A4E8" Format="rgba16" Width="64" Height="32" Offset="0x1A4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01B4E8" OutName="spot18_room_3Tex_01B4E8" Format="rgba16" Width="32" Height="32" Offset="0x1B4E8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01BCE8" OutName="spot18_room_3Tex_01BCE8" Format="rgba16" Width="64" Height="32" Offset="0x1BCE8" AddedByScript="true"/>
+        <Texture Name="spot18_room_3Tex_01CCE8" OutName="spot18_room_3Tex_01CCE8" Format="rgba16" Width="64" Height="32" Offset="0x1CCE8" AddedByScript="true"/>
+        <Room Name="spot18_room_3" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot20.xml b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot20.xml
new file mode 100644
index 0000000000..1381f6ecbe
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/overworld/spot20.xml
@@ -0,0 +1,36 @@
+<Root>
+    <File Name="spot20_scene" Segment="2">
+        <Texture Name="spot20_sceneTex_005FE0" OutName="spot20_sceneTex_005FE0" Format="ci8" Width="32" Height="64" Offset="0x5F80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0067E0" OutName="spot20_sceneTex_0067E0" Format="ci8" Width="16" Height="32" Offset="0x6780" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0069E0" OutName="spot20_sceneTex_0069E0" Format="ci8" Width="64" Height="32" Offset="0x6980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0071E0" OutName="spot20_sceneTex_0071E0" Format="rgba16" Width="64" Height="32" Offset="0x7180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0091E0" OutName="spot20_sceneTex_0091E0" Format="ci8" Width="16" Height="32" Offset="0x9180" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_0093E0" OutName="spot20_sceneTex_0093E0" Format="rgba16" Width="16" Height="64" Offset="0x9380" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_009BE0" OutName="spot20_sceneTex_009BE0" Format="rgba16" Width="64" Height="32" Offset="0x9B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00ABE0" OutName="spot20_sceneTex_00ABE0" Format="rgba16" Width="32" Height="64" Offset="0xAB80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BBE0" OutName="spot20_sceneTex_00BBE0" Format="ci8" Width="32" Height="16" Offset="0xBB80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00BDE0" OutName="spot20_sceneTex_00BDE0" Format="ci8" Width="32" Height="32" Offset="0xBD80" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C1E0" OutName="spot20_sceneTex_00C1E0" Format="ci4" Width="64" Height="64" Offset="0xC180" TlutOffset="0x5F58" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00C9E0" OutName="spot20_sceneTex_00C9E0" Format="ci8" Width="32" Height="64" Offset="0xC980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D1E0" OutName="spot20_sceneTex_00D1E0" Format="rgba16" Width="32" Height="32" Offset="0xD180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00D9E0" OutName="spot20_sceneTex_00D9E0" Format="rgba16" Width="32" Height="32" Offset="0xD980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E1E0" OutName="spot20_sceneTex_00E1E0" Format="i4" Width="64" Height="64" Offset="0xE180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00E9E0" OutName="spot20_sceneTex_00E9E0" Format="i4" Width="64" Height="64" Offset="0xE980" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F1E0" OutName="spot20_sceneTex_00F1E0" Format="i4" Width="64" Height="64" Offset="0xF180" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_00F9E0" OutName="spot20_sceneTex_00F9E0" Format="ci8" Width="8" Height="64" Offset="0xF980" TlutOffset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010BE0" OutName="spot20_sceneTex_010BE0" Format="i4" Width="64" Height="18" Offset="0x10B80" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTex_010E20" OutName="spot20_sceneTex_010E20" Format="ia8" Width="64" Height="64" Offset="0x10DC0" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005DB0" OutName="spot20_sceneTLUT_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5D50" AddedByScript="true"/>
+        <Texture Name="spot20_sceneTLUT_005FB8" OutName="spot20_sceneTLUT_005FB8" Format="rgba16" Width="4" Height="4" Offset="0x5F58" AddedByScript="true"/>
+        <Path Name="gLonLonPath_05844" Offset="0x57E4" NumPaths="3"/>
+        <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5B70"/>
+        <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x8180"/>
+        <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFB80"/>
+        <Scene Name="spot20_scene" Offset="0x0"/>
+    </File>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/alley_shop.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/alley_shop.xml
new file mode 100644
index 0000000000..95548de1bd
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/alley_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="alley_shop_scene" Segment="2">
+        <Scene Name="alley_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/drag.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/drag.xml
new file mode 100644
index 0000000000..acb6515fba
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/drag.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="drag_scene" Segment="2">
+        <Scene Name="drag_scene" Offset="0x0"/>
+    </File>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/face_shop.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/face_shop.xml
new file mode 100644
index 0000000000..16a9746081
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/face_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="face_shop_scene" Segment="2">
+        <Scene Name="face_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/golon.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/golon.xml
new file mode 100644
index 0000000000..c586727988
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/golon.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="golon_scene" Segment="2">
+        <Scene Name="golon_scene" Offset="0x0"/>
+    </File>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/kokiri_shop.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/kokiri_shop.xml
new file mode 100644
index 0000000000..50cd633e57
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/kokiri_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="kokiri_shop_scene" Segment="2">
+        <Scene Name="kokiri_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/night_shop.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/night_shop.xml
new file mode 100644
index 0000000000..5954d9c83d
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/night_shop.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="night_shop_scene" Segment="2">
+        <Scene Name="night_shop_scene" Offset="0x0"/>
+    </File>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/shop1.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/shop1.xml
new file mode 100644
index 0000000000..525a06d633
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/shop1.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="shop1_scene" Segment="2">
+        <Scene Name="shop1_scene" Offset="0x0"/>
+    </File>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/scenes/shops/zoora.xml b/soh/assets/xml/N64_NTSC_12/scenes/shops/zoora.xml
new file mode 100644
index 0000000000..0e4ac18f8c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/scenes/shops/zoora.xml
@@ -0,0 +1,8 @@
+<Root>
+    <File Name="zoora_scene" Segment="2">
+        <Scene Name="zoora_scene" Offset="0x0"/>
+    </File>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/text/elf_message_field.xml b/soh/assets/xml/N64_NTSC_12/text/elf_message_field.xml
new file mode 100644
index 0000000000..789a554ce8
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/text/elf_message_field.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_field">
+    <Blob Name="elf_message_field" Size="70"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/text/elf_message_ydan.xml b/soh/assets/xml/N64_NTSC_12/text/elf_message_ydan.xml
new file mode 100644
index 0000000000..f784afcf45
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/text/elf_message_ydan.xml
@@ -0,0 +1,5 @@
+<Root>
+  <File Name="elf_message_ydan">
+    <Blob Name="elf_message_ydan" Size="10"/>
+  </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/text/message_data_static.xml b/soh/assets/xml/N64_NTSC_12/text/message_data_static.xml
new file mode 100644
index 0000000000..7315e03a4b
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/text/message_data_static.xml
@@ -0,0 +1,11 @@
+<Root>
+	<File Name="jpn_message_data_static">
+		<Text Name="jpn_message_data_static" CodeOffset="0xF991C" Language="Japanese"/>
+	</File>
+	<File Name="nes_message_data_static">
+		<Text Name="ntsc_nes_message_data_static" CodeOffset="0xFDA5C"/>
+	</File>
+	<File Name="staff_message_data_static">
+		<Text Name="staff_message_data_static" CodeOffset="0x101C7C"/>
+	</File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/backgrounds.xml b/soh/assets/xml/N64_NTSC_12/textures/backgrounds.xml
new file mode 100644
index 0000000000..c60ff57a8a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/backgrounds.xml
@@ -0,0 +1,246 @@
+<Root>
+    <File Name="vr_ALVR_static">
+        <Texture Name="gMarketPotionShopBgTex" OutName="market_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMarketPotionShop2BgTex" OutName="market_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ALVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ALVR_pal_static">
+        <Texture Name="gMarketPotionShopBgTLUT" OutName="market_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketPotionShopBg2TLUT" OutName="market_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_DGVR_static">
+        <Texture Name="gKakPotionShopBgTex" OutName="kak_potion_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gKakPotionShop2BgTex" OutName="kak_potion_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_DGVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_DGVR_pal_static">
+        <Texture Name="gKakPotionShopBgTLUT" OutName="kak_potion_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKakPotionShopBg2TLUT" OutName="kak_potion_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_FCVR_static">
+        <Texture Name="gMaskShopBgTex" OutName="mask_shopp" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMaskShop2BgTex" OutName="mask_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_FCVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_FCVR_pal_static">
+        <Texture Name="gMaskShopBgTLUT" OutName="mask_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMaskShopBg2TLUT" OutName="mask_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_GLVR_static">
+        <Texture Name="gGoronShopBgTex" OutName="goron_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gGoronShop2BgTex" OutName="goron_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_GLVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_GLVR_pal_static">
+        <Texture Name="gGoronShopBgTLUT" OutName="goron_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGoronShopBg2TLUT" OutName="goron_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_IPVR_static">
+        <Texture Name="gRichardsHouseBgTex" OutName="richards_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gRichardsHouse2BgTex" OutName="richards_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gRichardsHouse3BgTex" OutName="richards_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gRichardsHouse4BgTex" OutName="richards_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_IPVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_IPVR_pal_static">
+        <Texture Name="gRichardsHouseBgTLUT" OutName="richards_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gRichardsHouseBg2TLUT" OutName="richards_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gRichardsHouseBg3TLUT" OutName="richards_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gRichardsHouseBg4TLUT" OutName="richards_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_K3VR_static">
+        <Texture Name="gHouseOfTwinsBgTex" OutName="house_of_twins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gHouseOfTwins2BgTex" OutName="house_of_twins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gHouseOfTwins3BgTex" OutName="house_of_twins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K3VR_pal_static">
+        <Texture Name="gHouseOfTwinsBgTLUT" OutName="house_of_twins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHouseOfTwinsBg2TLUT" OutName="house_of_twins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHouseOfTwinsBg3TLUT" OutName="house_of_twins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K4VR_static">
+        <Texture Name="gMidosHouseBgTex" OutName="midos_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gMidosHouse2BgTex" OutName="midos_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMidosHouse3BgTex" OutName="midos_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K4VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K4VR_pal_static">
+        <Texture Name="gMidosHouseBgTLUT" OutName="midos_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMidosHouseBg2TLUT" OutName="midos_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMidosHouseBg3TLUT" OutName="midos_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_K5VR_static">
+        <Texture Name="gSariasHouseBgTex" OutName="sarias_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x0"/>
+        <Texture Name="gSariasHouse2BgTex" OutName="sarias_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gSariasHouse3BgTex" OutName="sarias_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_K5VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_K5VR_pal_static">
+        <Texture Name="gSariasHouseBgTLUT" OutName="sarias_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gSariasHouseBg2TLUT" OutName="sarias_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gSariasHouseBg3TLUT" OutName="sarias_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KHVR_static">
+        <Texture Name="gKnowItAllBrosHouseBgTex" OutName="know_it_all_bros_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKnowItAllBrosHouse2BgTex" OutName="know_it_all_bros_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouse3BgTex" OutName="know_it_all_bros_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouse4BgTex" OutName="know_it_all_bros_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KHVR_pal_static">
+        <Texture Name="gKnowItAllBrosHouseBgTLUT" OutName="know_it_all_bros_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKnowItAllBrosHouseBg2TLUT" OutName="know_it_all_bros_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gKnowItAllBrosHouseBg3TLUT" OutName="know_it_all_bros_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gKnowItAllBrosHouseBg4TLUT" OutName="know_it_all_bros_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KKRVR_static">
+        <Texture Name="gCarpentersHouseBgTex" OutName="carpenters_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersHouse2BgTex" OutName="carpenters_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersHouse3BgTex" OutName="carpenters_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCarpentersHouse4BgTex" OutName="carpenters_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_KKRVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_KKRVR_pal_static">
+        <Texture Name="gCarpentersHouseBgTLUT" OutName="carpenters_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersHouseBg2TLUT" OutName="carpenters_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersHouseBg3TLUT" OutName="carpenters_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCarpentersHouseBg4TLUT" OutName="carpenters_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_KR3VR_static">
+        <Texture Name="gBackAlleyHouseBgTex" OutName="back_alley_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBackAlleyHouse2BgTex" OutName="back_alley_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gBackAlleyHouse3BgTex" OutName="back_alley_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_KR3VR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_KR3VR_pal_static">
+        <Texture Name="gBackAlleyHouseBgTLUT" OutName="back_alley_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBackAlleyHouseBg2TLUT" OutName="back_alley_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gBackAlleyHouseBg3TLUT" OutName="back_alley_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_KSVR_static">
+        <Texture Name="gKokiriShopBgTex" OutName="kokiri_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gKokiriShop2BgTex" OutName="kokiri_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_KSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_KSVR_pal_static">
+        <Texture Name="gKokiriShopBgTLUT" OutName="kokiri_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gKokiriShopBg2TLUT" OutName="kokiri_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_LBVR_static">
+        <Texture Name="gCowHouseBgTex" OutName="cow_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCowHouse2BgTex" OutName="cow_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCowHouse3BgTex" OutName="cow_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gCowHouse4BgTex" OutName="cow_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LBVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LBVR_pal_static">
+        <Texture Name="gCowHouseBgTLUT" OutName="cow_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCowHouseBg2TLUT" OutName="cow_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCowHouseBg3TLUT" OutName="cow_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gCowHouseBg4TLUT" OutName="cow_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_LHVR_static">
+        <Texture Name="gLinksHouseBgTex" OutName="links_house" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gLinksHouse2BgTex" OutName="links_house2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gLinksHouse3BgTex" OutName="links_house3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gLinksHouse4BgTex" OutName="links_house4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_LHVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_LHVR_pal_static">
+        <Texture Name="gLinksHouseBgTLUT" OutName="links_house_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gLinksHouseBg2TLUT" OutName="links_house2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gLinksHouseBg3TLUT" OutName="links_house3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gLinksHouseBg4TLUT" OutName="links_house4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MDVR_static">
+        <Texture Name="gMarketDayBgTex" OutName="market_day" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketDay2BgTex" OutName="market_day2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketDay3BgTex" OutName="market_day3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketDay4BgTex" OutName="market_day4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MDVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MDVR_pal_static">
+        <Texture Name="gMarketDayBgTLUT" OutName="market_day_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketDayBg2TLUT" OutName="market_day2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketDayBg3TLUT" OutName="market_day3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketDayBg4TLUT" OutName="market_day4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MNVR_static">
+        <Texture Name="gMarketNightBgTex" OutName="market_night" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketNight2BgTex" OutName="market_night2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketNight3BgTex" OutName="market_night3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketNight4BgTex" OutName="market_night4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MNVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MNVR_pal_static">
+        <Texture Name="gMarketNightBgTLUT" OutName="market_night_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketNightBg2TLUT" OutName="market_night2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketNightBg3TLUT" OutName="market_night3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketNightBg4TLUT" OutName="market_night4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_MLVR_static">
+        <Texture Name="gStableBgTex" OutName="stable" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gStable2BgTex" OutName="stable2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gStable3BgTex" OutName="stable3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gStable4BgTex" OutName="stable4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_MLVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_MLVR_pal_static">
+        <Texture Name="gStableBgTLUT" OutName="stable_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gStableBg2TLUT" OutName="stable2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gStableBg3TLUT" OutName="stable3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gStableBg4TLUT" OutName="stable4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_NSVR_static">
+        <Texture Name="gBombchuShopBgTex" OutName="bombchu_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBombchuShop2BgTex" OutName="bombchu_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_NSVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_NSVR_pal_static">
+        <Texture Name="gBombchuShopBgTLUT" OutName="bombchu_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBombchuShopBg2TLUT" OutName="bombchu_shop2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_RUVR_static">
+        <Texture Name="gMarketRuinsBgTex" OutName="market_ruins" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gMarketRuins2BgTex" OutName="market_ruins2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gMarketRuins3BgTex" OutName="market_ruins3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x400"/>
+        <Texture Name="gMarketRuins4BgTex" OutName="market_ruins4" Format="ci8" Width="256" Height="256" Offset="0x30000" ExternalTlut="vr_RUVR_pal_static" ExternalTlutOffset="0x600"/>
+    </File>
+    <File Name="vr_RUVR_pal_static">
+        <Texture Name="gMarketRuinsBgTLUT" OutName="market_ruins_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMarketRuinsBg2TLUT" OutName="market_ruins2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMarketRuinsBg3TLUT" OutName="market_ruins3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMarketRuinsBg4TLUT" OutName="market_ruins4_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600"/>
+    </File>
+
+    <File Name="vr_SP1a_static">
+        <Texture Name="gBazaarBgTex" OutName="bazaar" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gBazaar2BgTex" OutName="bazaar2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_SP1a_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_SP1a_pal_static">
+        <Texture Name="gBazaarBgTLUT" OutName="bazaar_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gBazaarBg2TLUT" OutName="bazaar2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+    <File Name="vr_TTVR_static">
+        <Texture Name="gCarpentersTentBgTex" OutName="carpenters_tent" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gCarpentersTent2BgTex" OutName="carpenters_tent2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x200"/>
+        <Texture Name="gCarpentersTent3BgTex" OutName="carpenters_tent3" Format="ci8" Width="256" Height="256" Offset="0x20000" ExternalTlut="vr_TTVR_pal_static" ExternalTlutOffset="0x400"/>
+    </File>
+    <File Name="vr_TTVR_pal_static">
+        <Texture Name="gCarpentersTentBgTLUT" OutName="carpenters_tent_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gCarpentersTentBg2TLUT" OutName="carpenters_tent2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gCarpentersTentBg3TLUT" OutName="carpenters_tent3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400"/>
+    </File>
+
+    <File Name="vr_ZRVR_static">
+        <Texture Name="gZoraShopBgTex" OutName="zora_shop" Format="ci8" Width="256" Height="256" Offset="0x0" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x000"/>
+        <Texture Name="gZoraShop2BgTex" OutName="zora_shop2" Format="ci8" Width="256" Height="256" Offset="0x10000" ExternalTlut="vr_ZRVR_pal_static" ExternalTlutOffset="0x200"/>
+    </File>
+    <File Name="vr_ZRVR_pal_static">
+        <Texture Name="gZoraShopBgTLUT" OutName="zora_shop_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gZoraShopBg2TLUT" OutName="zora_shop_tlut2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+    </File>
+
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/boss_title_cards.xml b/soh/assets/xml/N64_NTSC_12/textures/boss_title_cards.xml
new file mode 100644
index 0000000000..84f555bd10
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/boss_title_cards.xml
@@ -0,0 +1,42 @@
+<Root>
+	<File Name="object_bv" Segment="6">
+		<Texture Name="gBarinadeTitleCardJPNTex" OutName="barinade_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1230" />
+		<Texture Name="gBarinadeTitleCardENGTex" OutName="barinade_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2630" />
+	</File>
+	<File Name="object_fd" Segment="6">
+		<Texture Name="gVolvagiaBossTitleCardJPNTex" OutName="volvagia_boss_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xd700" />
+		<Texture Name="gVolvagiaBossTitleCardENGTex" OutName="volvagia_boss_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xeb00" />
+	</File>
+	<File Name="object_fhg" Segment="6">
+		<Texture Name="gPhantomGanonTitleCardJPNTex" OutName="phantom_ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x59a0" />
+		<Texture Name="gPhantomGanonTitleCardENGTex" OutName="phantom_ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x6da0" />
+	</File>
+	<File Name="object_ganon" Segment="6">
+		<Texture Name="gGanondorfTitleCardJPNTex" OutName="ganondorf_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0xcf00" />
+		<Texture Name="gGanondorfTitleCardENGTex" OutName="ganondorf_eng_title_card" Format="i8" Width="128" Height="40" Offset="0xe300" />
+	</File>
+	<File Name="object_ganon2" Segment="6">
+		<Texture Name="gGanonTitleCardJPNTex" OutName="ganon_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x21a90" />
+		<Texture Name="gGanonTitleCardENGTex" OutName="ganon_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x22e90" />
+	</File>
+	<File Name="object_goma" Segment="6">
+		<Texture Name="gGohmaTitleCardJPNTex" OutName="gohma_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x19ba8" />
+		<Texture Name="gGohmaTitleCardENGTex" OutName="gohma_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x1afa8" />
+	</File>
+	<File Name="object_kingdodongo" Segment="6">
+		<Texture Name="gKingDodongoTitleCardJPNTex" OutName="king_dodongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x17410" />
+		<Texture Name="gKingDodongoTitleCardENGTex" OutName="king_dodongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x18810" />
+	</File>
+	<File Name="object_mo" Segment="6">
+		<Texture Name="gMorphaTitleCardJPNTex" OutName="morpha_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x1010" />
+		<Texture Name="gMorphaTitleCardENGTex" OutName="morpha_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2410" />
+	</File>
+	<File Name="object_sst" Segment="6">
+		<Texture Name="gBongoTitleCardJPNTex" OutName="bongo_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x13d80" />
+		<Texture Name="gBongoTitleCardENGTex" OutName="bongo_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x15180" />
+	</File>
+	<File Name="object_tw" Segment="6">
+		<Texture Name="gTwinrovaTitleCardJPNTex" OutName="twinrova_jpn_title_card" Format="i8" Width="128" Height="40" Offset="0x2e170" />
+		<Texture Name="gTwinrovaTitleCardENGTex" OutName="twinrova_eng_title_card" Format="i8" Width="128" Height="40" Offset="0x2f570" />
+	</File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/textures/do_action_static.xml b/soh/assets/xml/N64_NTSC_12/textures/do_action_static.xml
new file mode 100644
index 0000000000..efabd54a58
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/do_action_static.xml
@@ -0,0 +1,62 @@
+<Root>
+     <File Name="do_action_static" Segment="7">
+        <Texture Name="gAttackDoActionJPNTex" OutName="attack_jpn" Format="ia4" Width="48" Height="16" Offset="0x0"/>
+        <Texture Name="gCheckDoActionJPNTex" OutName="check_jpn" Format="ia4" Width="48" Height="16" Offset="0x180"/>
+        <Texture Name="gEnterDoActionJPNTex" OutName="enter_jpn" Format="ia4" Width="48" Height="16" Offset="0x300"/>
+        <Texture Name="gReturnDoActionJPNTex" OutName="return_jpn" Format="ia4" Width="48" Height="16" Offset="0x480"/>
+        <Texture Name="gOpenDoActionJPNTex" OutName="open_jpn" Format="ia4" Width="48" Height="16" Offset="0x600"/>
+        <Texture Name="gJumpDoActionJPNTex" OutName="jump_jpn" Format="ia4" Width="48" Height="16" Offset="0x780"/>
+        <Texture Name="gDecideDoActionJPNTex" OutName="decide_jpn" Format="ia4" Width="48" Height="16" Offset="0x900"/>
+        <Texture Name="gDiveDoActionJPNTex" OutName="dive_jpn" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
+        <Texture Name="gFasterDoActionJPNTex" OutName="faster_jpn" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
+        <Texture Name="gThrowDoActionJPNTex" OutName="throw_jpn" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
+        <Texture Name="gUnusedNaviDoActionJPNTex" OutName="navi_unused_jpn" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
+        <Texture Name="gClimbDoActionJPNTex" OutName="climb_jpn" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
+        <Texture Name="gDropDoActionJPNTex" OutName="drop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
+        <Texture Name="gDownDoActionJPNTex" OutName="down_jpn" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
+        <Texture Name="gSaveDoActionJPNTex" OutName="save_jpn" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
+        <Texture Name="gSpeakDoActionJPNTex" OutName="speak_jpn" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
+        <Texture Name="gNextDoActionJPNTex" OutName="next_jpn" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
+        <Texture Name="gGrabDoActionJPNTex" OutName="grab_jpn" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
+        <Texture Name="gStopDoActionJPNTex" OutName="stop_jpn" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
+        <Texture Name="gPutAwayDoActionJPNTex" OutName="put_away_jpn" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
+        <Texture Name="gReelDoActionJPNTex" OutName="reel_jpn" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
+        <Texture Name="gNum1DoActionJPNTex" OutName="num_1_jpn" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
+        <Texture Name="gNum2DoActionJPNTex" OutName="num_2_jpn" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
+        <Texture Name="gNum3DoActionJPNTex" OutName="num_3_jpn" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
+        <Texture Name="gNum4DoActionJPNTex" OutName="num_4_jpn" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
+        <Texture Name="gNum5DoActionJPNTex" OutName="num_5_jpn" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
+        <Texture Name="gNum6DoActionJPNTex" OutName="num_6_jpn" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
+        <Texture Name="gNum7DoActionJPNTex" OutName="num_7_jpn" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
+        <Texture Name="gNum8DoActionJPNTex" OutName="num_8_jpn" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
+        <Texture Name="gAttackDoActionENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
+        <Texture Name="gCheckDoActionENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
+        <Texture Name="gEnterDoActionENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
+        <Texture Name="gReturnDoActionENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
+        <Texture Name="gOpenDoActionENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
+        <Texture Name="gJumpDoActionENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
+        <Texture Name="gDecideDoActionENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
+        <Texture Name="gDiveDoActionENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
+        <Texture Name="gFasterDoActionENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
+        <Texture Name="gThrowDoActionENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
+        <Texture Name="gUnusedNaviDoActionENGTex" OutName="navi_unused_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
+        <Texture Name="gClimbDoActionENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
+        <Texture Name="gDropDoActionENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
+        <Texture Name="gDownDoActionENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x3F00"/>
+        <Texture Name="gSaveDoActionENGTex" OutName="save_eng" Format="ia4" Width="48" Height="16" Offset="0x4080"/>
+        <Texture Name="gSpeakDoActionENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x4200"/>
+        <Texture Name="gNextDoActionENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x4380"/>
+        <Texture Name="gGrabDoActionENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x4500"/>
+        <Texture Name="gStopDoActionENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x4680"/>
+        <Texture Name="gPutAwayDoActionENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x4800"/>
+        <Texture Name="gReelDoActionENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x4980"/>
+        <Texture Name="gNum1DoActionENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x4B00"/>
+        <Texture Name="gNum2DoActionENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x4C80"/>
+        <Texture Name="gNum3DoActionENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x4E00"/>
+        <Texture Name="gNum4DoActionENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x4F80"/>
+        <Texture Name="gNum5DoActionENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x5100"/>
+        <Texture Name="gNum6DoActionENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x5280"/>
+        <Texture Name="gNum7DoActionENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x5400"/>
+        <Texture Name="gNum8DoActionENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x5580"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_24_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_24_static.xml
new file mode 100644
index 0000000000..cdb8cc7379
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_24_static.xml
@@ -0,0 +1,24 @@
+<Root>
+    <File Name="icon_item_24_static" Segment="9">
+        <Texture Name="gQuestIconMedallionForestTex" OutName="forest_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestIconMedallionFireTex" OutName="fire_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x900"/>
+        <Texture Name="gQuestIconMedallionWaterTex" OutName="water_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200"/>
+        <Texture Name="gQuestIconMedallionSpiritTex" OutName="spirit_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00"/>
+        <Texture Name="gQuestIconMedallionShadowTex" OutName="shadow_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400"/>
+        <Texture Name="gQuestIconMedallionLightTex" OutName="light_medallion_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00"/>
+        <Texture Name="gQuestIconKokiriEmeraldTex" OutName="kokiri_emerald_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600"/>
+        <Texture Name="gQuestIconGoronRubyTex" OutName="goron_ruby_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00"/>
+        <Texture Name="gQuestIconZoraSapphireTex" OutName="zora_sapphire_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800"/>
+        <Texture Name="gQuestIconStoneOfAgonyTex" OutName="stone_of_agony_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100"/>
+        <Texture Name="gQuestIconGerudosCardTex" OutName="gerudos_card_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00"/>
+        <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300"/>
+        <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00"/>
+        <Texture Name="gQuestIconHeartPieceTex" OutName="unsed_piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x7500"/>
+        <Texture Name="gQuestIconDungeonBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x7E00"/>
+        <Texture Name="gQuestIconDungeonCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x8700"/>
+        <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x9000"/>
+        <Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x9900"/>
+        <Texture Name="gQuestIconMagicJarSmallTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xA200"/>
+        <Texture Name="gQuestIconMagicJarBigTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0xAB00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_dungeon_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_dungeon_static.xml
new file mode 100644
index 0000000000..873c490fc5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_dungeon_static.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="icon_item_dungeon_static" Segment="12">
+        <Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
+        <Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
+        <Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
+        <Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
+        <Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
+        <Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
+        <Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
+        <Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
+        <Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
+        <Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
+        <Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
+        <Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
+        <Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
+        <Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
+        <Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
+        <Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
+        <Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
+        <Texture Name="gDungeonMapLinkHeadTex" OutName="dungeon_map_link_head" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1B80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_field_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_field_static.xml
new file mode 100644
index 0000000000..ed991406b5
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_field_static.xml
@@ -0,0 +1,32 @@
+<Root>
+    <File Name="icon_item_field_static" Segment="12">
+        <Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
+        <Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
+        <Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
+        <Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
+        <Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
+        <Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
+        <Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
+        <Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
+        <Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
+        <Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
+        <Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
+        <Texture Name="gWorldMapCloud1Tex" OutName="world_map_cloud_1" Format="i4" Width="64" Height="60" Offset="0x8418"/>
+        <Texture Name="gWorldMapCloud2Tex" OutName="world_map_cloud_2" Format="i4" Width="48" Height="45" Offset="0x8B98"/>
+        <Texture Name="gWorldMapCloud3Tex" OutName="world_map_cloud_3" Format="i4" Width="48" Height="32" Offset="0x8FD0"/>
+        <Texture Name="gWorldMapCloud4Tex" OutName="world_map_cloud_4" Format="i4" Width="48" Height="49" Offset="0x92D0"/>
+        <Texture Name="gWorldMapCloud5Tex" OutName="world_map_cloud_5" Format="i4" Width="48" Height="21" Offset="0x9768"/>
+        <Texture Name="gWorldMapCloud6Tex" OutName="world_map_cloud_6" Format="i4" Width="32" Height="22" Offset="0x9960"/>
+        <Texture Name="gWorldMapCloud7Tex" OutName="world_map_cloud_7" Format="i4" Width="64" Height="26" Offset="0x9AC0"/>
+        <Texture Name="gWorldMapCloud8Tex" OutName="world_map_cloud_8" Format="i4" Width="32" Height="14" Offset="0x9E00"/>
+        <Texture Name="gWorldMapCloud9Tex" OutName="world_map_cloud_9" Format="i4" Width="48" Height="27" Offset="0x9EE0"/>
+        <Texture Name="gWorldMapCloud10Tex" OutName="world_map_cloud_10" Format="i4" Width="32" Height="19" Offset="0xA168"/>
+        <Texture Name="gWorldMapCloud11Tex" OutName="world_map_cloud_11" Format="i4" Width="32" Height="20" Offset="0xA298"/>
+        <Texture Name="gWorldMapCloud12Tex" OutName="world_map_cloud_12" Format="i4" Width="32" Height="19" Offset="0xA3D8"/>
+        <Texture Name="gWorldMapCloud13Tex" OutName="world_map_cloud_13" Format="i4" Width="48" Height="22" Offset="0xA508"/>
+        <Texture Name="gWorldMapCloud14Tex" OutName="world_map_cloud_14" Format="i4" Width="32" Height="13" Offset="0xA718"/>
+        <Texture Name="gWorldMapCloud15Tex" OutName="world_map_cloud_15" Format="i4" Width="112" Height="72" Offset="0xA7E8"/>
+        <Texture Name="gWorldMapCloud16Tex" OutName="world_map_cloud_16" Format="i4" Width="32" Height="24" Offset="0xB7A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_gameover_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_gameover_static.xml
new file mode 100644
index 0000000000..ffd3928680
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_gameover_static.xml
@@ -0,0 +1,10 @@
+<Root>
+    <File Name="icon_item_gameover_static" Segment="12">
+        <Texture Name="gGameOverP1Tex" OutName="game_over_p1" Format="ia8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGameOverP2Tex" OutName="game_over_p2" Format="ia8" Width="64" Height="32" Offset="0x800"/>
+        <Texture Name="gGameOverP3Tex" OutName="game_over_p3" Format="ia8" Width="64" Height="32" Offset="0x1000"/>
+        <Texture Name="gGameOverMaskTex" OutName="game_over_mask" Format="ia8" Width="64" Height="32" Offset="0x1800"/>
+        <Texture Name="gContinuePlayingJPNTex" OutName="continue_playing_jpn" Format="ia8" Width="152" Height="16" Offset="0x2000"/>
+        <Texture Name="gContinuePlayingENGTex" OutName="continue_playing_eng" Format="ia8" Width="152" Height="16" Offset="0x2980"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_jpn_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_jpn_static.xml
new file mode 100644
index 0000000000..f2fe854b8e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_jpn_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_jpn_static" Segment="13">
+        <Texture Name="gPauseDekuTitleJPNTex" OutName="pause_deku_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleJPNTex" OutName="pause_dodongo_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleJPNTex" OutName="pause_inside_jabu_title_jpn" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleJPNTex" OutName="pause_forest_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleJPNTex" OutName="pause_fire_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleJPNTex" OutName="pause_water_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleJPNTex" OutName="pause_spirit_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleJPNTex" OutName="pause_shadow_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleJPNTex" OutName="pause_botw_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleJPNTex" OutName="pause_ice_cavern_title_jpn" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipJPNTex" OutName="pause_to_equip_jpn" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideJPNTex" OutName="pause_to_decide_jpn" Format="ia8" Width="48" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyJPNTex" OutName="pause_to_play_melody_jpn" Format="ia8" Width="96" Height="16" Offset="0x4280"/>
+        <Texture Name="gPauseToSelectItemJPNTex" OutName="pause_to_select_item_jpn" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapJPNTex" OutName="pause_to_map_jpn" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusJPNTex" OutName="pause_to_quest_status_jpn" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentJPNTex" OutName="pause_to_equipment_jpn" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptJPNTex" OutName="pause_save_prompt_jpn" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationJPNTex" OutName="pause_save_confirmation_jpn" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesJPNTex" OutName="pause_yes_jpn" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoJPNTex" OutName="pause_no_jpn" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionJPNTex" OutName="pause_current_position_jpn" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10JPNTex" OutName="pause_equipment_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_nes_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_nes_static.xml
new file mode 100644
index 0000000000..6cd92acfca
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_nes_static.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="icon_item_nes_static" Segment="13">
+        <Texture Name="gPauseDekuTitleENGTex" OutName="pause_deku_title_eng" Format="ia8" Width="96" Height="16" Offset="0x0"/>
+        <Texture Name="gPauseDodongoTitleENGTex" OutName="pause_dodongo_title_eng" Format="ia8" Width="96" Height="16" Offset="0x600"/>
+        <Texture Name="gPauseJabuTitleENGTex" OutName="pause_inside_jabu_title_eng" Format="ia8" Width="96" Height="16" Offset="0xC00"/>
+        <Texture Name="gPauseForestTitleENGTex" OutName="pause_forest_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1200"/>
+        <Texture Name="gPauseFireTitleENGTex" OutName="pause_fire_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1800"/>
+        <Texture Name="gPauseWaterTitleENGTex" OutName="pause_water_title_eng" Format="ia8" Width="96" Height="16" Offset="0x1E00"/>
+        <Texture Name="gPauseSpiritTitleENGTex" OutName="pause_spirit_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2400"/>
+        <Texture Name="gPauseShadowTitleENGTex" OutName="pause_shadow_title_eng" Format="ia8" Width="96" Height="16" Offset="0x2A00"/>
+        <Texture Name="gPauseBotWTitleENGTex" OutName="pause_botw_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3000"/>
+        <Texture Name="gPauseIceCavernTitleENGTex" OutName="pause_ice_cavern_title_eng" Format="ia8" Width="96" Height="16" Offset="0x3600"/>
+        <Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia8" Width="56" Height="16" Offset="0x3C00"/>
+        <Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia8" Width="64" Height="16" Offset="0x3F80"/>
+        <Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia8" Width="80" Height="16" Offset="0x4380"/>
+        <Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia8" Width="128" Height="16" Offset="0x4880"/>
+        <Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia8" Width="128" Height="16" Offset="0x5080"/>
+        <Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia8" Width="128" Height="16" Offset="0x5880"/>
+        <Texture Name="gPauseToEquipmentENGTex" OutName="pause_to_equipment_eng" Format="ia8" Width="128" Height="16" Offset="0x6080"/>
+        <Texture Name="gPauseSavePromptENGTex" OutName="pause_save_prompt_eng" Format="ia8" Width="152" Height="16" Offset="0x6880"/>
+        <Texture Name="gPauseSaveConfirmationENGTex" OutName="pause_save_confirmation_eng" Format="ia8" Width="152" Height="16" Offset="0x7200"/>
+        <Texture Name="gPauseYesENGTex" OutName="pause_yes_eng" Format="ia8" Width="48" Height="16" Offset="0x7B80"/>
+        <Texture Name="gPauseNoENGTex" OutName="pause_no_eng" Format="ia8" Width="48" Height="16" Offset="0x7E80"/>
+        <Texture Name="gPauseCurrentPositionENGTex" OutName="pause_current_position_eng" Format="i4" Width="64" Height="8" Offset="0x8180"/>
+        <Texture Name="gPauseEquipment10ENGTex" OutName="pause_equipment_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8280"/>
+        <Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8C80"/>
+        <Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x9680"/>
+        <Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xA080"/>
+        <Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xAA80"/>
+        <Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0xB480"/>
+        <Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xBE80"/>
+        <Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0xC880"/>
+        <Texture Name="gPauseSave10ENGTex" OutName="pause_save_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0xD280"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/icon_item_static.xml b/soh/assets/xml/N64_NTSC_12/textures/icon_item_static.xml
new file mode 100644
index 0000000000..9e844615b1
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/icon_item_static.xml
@@ -0,0 +1,188 @@
+<Root>
+    <File Name="icon_item_static" Segment="8">
+        <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="gItemIconBowTex" OutName="fairy_bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="gItemIconArrowFireTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="gItemIconDinsFireTex" OutName="dins_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="gItemIconSlingshotTex" OutName="fairy_slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="gItemIconOcarinaFairyTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000"/>
+        <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000"/>
+        <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000"/>
+        <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000"/>
+        <Texture Name="gItemIconArrowIceTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000"/>
+        <Texture Name="gItemIconFaroresWindTex" OutName="farores_wind_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000"/>
+        <Texture Name="gItemIconBoomerangTex" OutName="boomerang_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000"/>
+        <Texture Name="gItemIconLensOfTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000"/>
+        <Texture Name="gItemIconMagicBeanTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000"/>
+        <Texture Name="gItemIconHammerTex" OutName="megaton_hammer_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000"/>
+        <Texture Name="gItemIconArrowLightTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000"/>
+        <Texture Name="gItemIconNayrusLoveTex" OutName="nayrus_love_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000"/>
+        <Texture Name="gItemIconBottleEmptyTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000"/>
+        <Texture Name="gItemIconBottlePotionRedTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000"/>
+        <Texture Name="gItemIconBottlePotionGreenTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000"/>
+        <Texture Name="gItemIconBottlePotionBlueTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000"/>
+        <Texture Name="gItemIconBottleFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000"/>
+        <Texture Name="gItemIconBottleFishTex" OutName="fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000"/>
+        <Texture Name="gItemIconBottleMilkFullTex" OutName="milk_full_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000"/>
+        <Texture Name="gItemIconBottleRutosLetterTex" OutName="rutos_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000"/>
+        <Texture Name="gItemIconBottleBlueFireTex" OutName="blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000"/>
+        <Texture Name="gItemIconBottleBugTex" OutName="bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000"/>
+        <Texture Name="gItemIconBottleBigPoeTex" OutName="big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000"/>
+        <Texture Name="gItemIconBottleMilkHalfTex" OutName="milk_half_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000"/>
+        <Texture Name="gItemIconBottlePoeTex" OutName="poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000"/>
+        <Texture Name="gItemIconWeirdEggTex" OutName="weird_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000"/>
+        <Texture Name="gItemIconChickenTex" OutName="cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000"/>
+        <Texture Name="gItemIconZeldasLetterTex" OutName="zeldas_letter_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000"/>
+        <Texture Name="gItemIconMaskKeatonTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000"/>
+        <Texture Name="gItemIconMaskSkullTex" OutName="skull_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000"/>
+        <Texture Name="gItemIconMaskSpookyTex" OutName="spooky_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000"/>
+        <Texture Name="gItemIconMaskBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000"/>
+        <Texture Name="gItemIconMaskGoronTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000"/>
+        <Texture Name="gItemIconMaskZoraTex" OutName="zoras_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000"/>
+        <Texture Name="gItemIconMaskGerudoTex" OutName="gerudos_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000"/>
+        <Texture Name="gItemIconMaskTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000"/>
+        <Texture Name="gItemIconSoldOutTex" OutName="sold_out_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000"/>
+        <Texture Name="gItemIconPocketEggTex" OutName="pocket_egg" Format="rgba32" Width="32" Height="32" Offset="0x2D000"/>
+        <Texture Name="gItemIconPocketCuccoTex" OutName="pocket_cucco_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000"/>
+        <Texture Name="gItemIconCojiroTex" OutName="cojiro_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000"/>
+        <Texture Name="gItemIconOddMushroomTex" OutName="odd_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000"/>
+        <Texture Name="gItemIconOddPotionTex" OutName="odd_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000"/>
+        <Texture Name="gItemIconPoachersSawTex" OutName="poachers_saw_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000"/>
+        <Texture Name="gItemIconBrokenGoronsSwordTex" OutName="broken_biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000"/>
+        <Texture Name="gItemIconPrescriptionTex" OutName="prescription_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000"/>
+        <Texture Name="gItemIconEyeballFrogTex" OutName="eyeball_frog_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000"/>
+        <Texture Name="gItemIconEyeDropsTex" OutName="eye_drops_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000"/>
+        <Texture Name="gItemIconClaimCheckTex" OutName="claim_check_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000"/>
+        <Texture Name="gItemIconBowFireTex" OutName="fairy_bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000"/>
+        <Texture Name="gItemIconBowIceTex" OutName="fairy_bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000"/>
+        <Texture Name="gItemIconBowLightTex" OutName="fairy_bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000"/>
+        <Texture Name="gItemIconSwordKokiriTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000"/>
+        <Texture Name="gItemIconSwordMasterTex" OutName="master_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000"/>
+        <Texture Name="gItemIconSwordBiggoronTex" OutName="biggoron_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000"/>
+        <Texture Name="gItemIconShieldDekuTex" OutName="deku_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000"/>
+        <Texture Name="gItemIconShieldHylianTex" OutName="hylian_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000"/>
+        <Texture Name="gItemIconShieldMirrorTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000"/>
+        <Texture Name="gItemIconTunicKokiriTex" OutName="kokiri_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000"/>
+        <Texture Name="gItemIconTunicGoronTex" OutName="goron_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000"/>
+        <Texture Name="gItemIconTunicZoraTex" OutName="zora_tunic_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000"/>
+        <Texture Name="gItemIconBootsKokiriTex" OutName="kokiri_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000"/>
+        <Texture Name="gItemIconBootsIronTex" OutName="iron_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000"/>
+        <Texture Name="gItemIconBootsHoverTex" OutName="hover_boots_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000"/>
+        <Texture Name="gItemIconBulletBag30Tex" OutName="bullet_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000"/>
+        <Texture Name="gItemIconBulletBag40Tex" OutName="bullet_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000"/>
+        <Texture Name="gItemIconBulletBag50Tex" OutName="bullet_bag_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000"/>
+        <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000"/>
+        <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000"/>
+        <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000"/>
+        <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000"/>
+        <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000"/>
+        <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000"/>
+        <Texture Name="gItemIconGoronsBraceletTex" OutName="gorons_bracelet_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000"/>
+        <Texture Name="gItemIconSilverGauntletsTex" OutName="silver_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000"/>
+        <Texture Name="gItemIconGoldenGauntletsTex" OutName="golden_gauntlets_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000"/>
+        <Texture Name="gItemIconScaleSilverTex" OutName="silver_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000"/>
+        <Texture Name="gItemIconScaleGoldenTex" OutName="golden_scale_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000"/>
+        <Texture Name="gItemIconBrokenGiantsKnifeTex" OutName="broken_giants_knife_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000"/>
+        <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000"/>
+        <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000"/>
+        <Texture Name="gItemIconDekuSeedsTex" OutName="deku_seeds_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000"/>
+        <Texture Name="gItemIconFishingPoleTex" OutName="fishing_pole_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000"/>
+        <Texture Name="gHeartPieceIcon1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x5A000"/>
+        <Texture Name="gHeartPieceIcon2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x5A900"/>
+        <Texture Name="gHeartPieceIcon3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x5B200"/>
+        <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x5BB00"/>
+        <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x5BF80"/>
+        <Texture Name="gPauseMenuCursorTopLeftTex" OutName="pause_menu_cursor_top_left" Format="ia4" Width="16" Height="16" Offset="0x5C1C0"/>
+        <Texture Name="gPauseMenuCursorTopRightTex" OutName="pause_menu_cursor_top_right" Format="ia4" Width="16" Height="16" Offset="0x5C240"/>
+        <Texture Name="gPauseMenuCursorBottomLeftTex" OutName="pause_menu_cursor_bottom_left" Format="ia4" Width="16" Height="16" Offset="0x5C2C0"/>
+        <Texture Name="gPauseMenuCursorBottomRightTex" OutName="pause_menu_cursor_bottom_right" Format="ia4" Width="16" Height="16" Offset="0x5C340"/>
+        <Texture Name="gPauseEquipment00Tex" OutName="pause_equipment_0_0" Format="ia8" Width="80" Height="32" Offset="0x5C3C0"/>
+        <Texture Name="gPauseEquipment20Tex" OutName="pause_equipment_2_0" Format="ia8" Width="80" Height="32" Offset="0x5CDC0"/>
+        <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x5D7C0"/>
+        <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x5E1C0"/>
+        <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x5EBC0"/>
+        <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x5F5C0"/>
+        <Texture Name="gPauseEquipment01Tex" OutName="pause_equipment_0_1" Format="ia8" Width="80" Height="32" Offset="0x5FFC0"/>
+        <Texture Name="gPauseEquipment11Tex" OutName="pause_equipment_1_1" Format="ia8" Width="80" Height="32" Offset="0x609C0"/>
+        <Texture Name="gPauseEquipment21Tex" OutName="pause_equipment_2_1" Format="ia8" Width="80" Height="32" Offset="0x613C0"/>
+        <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x61DC0"/>
+        <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x627C0"/>
+        <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x631C0"/>
+        <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x63BC0"/>
+        <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x645C0"/>
+        <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x64FC0"/>
+        <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x659C0"/>
+        <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x663C0"/>
+        <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x66DC0"/>
+        <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x677C0"/>
+        <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x681C0"/>
+        <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x68BC0"/>
+        <Texture Name="gPauseEquipment02Tex" OutName="pause_equipment_0_2" Format="ia8" Width="80" Height="32" Offset="0x695C0"/>
+        <Texture Name="gPauseEquipment12Tex" OutName="pause_equipment_1_2" Format="ia8" Width="80" Height="32" Offset="0x69FC0"/>
+        <Texture Name="gPauseEquipment22Tex" OutName="pause_equipment_2_2" Format="ia8" Width="80" Height="32" Offset="0x6A9C0"/>
+        <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x6B3C0"/>
+        <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x6BDC0"/>
+        <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x6C7C0"/>
+        <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x6D1C0"/>
+        <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x6DBC0"/>
+        <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x6E5C0"/>
+        <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x6EFC0"/>
+        <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x6F9C0"/>
+        <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x703C0"/>
+        <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x70DC0"/>
+        <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x717C0"/>
+        <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x721C0"/>
+        <Texture Name="gPauseEquipment03Tex" OutName="pause_equipment_0_3" Format="ia8" Width="80" Height="32" Offset="0x72BC0"/>
+        <Texture Name="gPauseEquipment13Tex" OutName="pause_equipment_1_3" Format="ia8" Width="80" Height="32" Offset="0x735C0"/>
+        <Texture Name="gPauseEquipment23Tex" OutName="pause_equipment_2_3" Format="ia8" Width="80" Height="32" Offset="0x73FC0"/>
+        <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x749C0"/>
+        <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x753C0"/>
+        <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x75DC0"/>
+        <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x767C0"/>
+        <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x771C0"/>
+        <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x77BC0"/>
+        <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x785C0"/>
+        <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x78FC0"/>
+        <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x799C0"/>
+        <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x7A3C0"/>
+        <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x7ADC0"/>
+        <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x7B7C0"/>
+        <Texture Name="gPauseEquipment04Tex" OutName="pause_equipment_0_4" Format="ia8" Width="80" Height="32" Offset="0x7C1C0"/>
+        <Texture Name="gPauseEquipment14Tex" OutName="pause_equipment_1_4" Format="ia8" Width="80" Height="32" Offset="0x7CBC0"/>
+        <Texture Name="gPauseEquipment24Tex" OutName="pause_equipment_2_4" Format="ia8" Width="80" Height="32" Offset="0x7D5C0"/>
+        <Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x7DFC0"/>
+        <Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x7E9C0"/>
+        <Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x7F3C0"/>
+        <Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x7FDC0"/>
+        <Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x807C0"/>
+        <Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x811C0"/>
+        <Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x81BC0"/>
+        <Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x825C0"/>
+        <Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x82FC0"/>
+        <Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x839C0"/>
+        <Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x843C0"/>
+        <Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x84DC0"/>
+        <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x857C0"/>
+        <Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x861C0"/>
+        <Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x86340"/>
+        <Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x864C0"/>
+        <Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x867C0"/>
+        <Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x86E80"/>
+        <Texture Name="gLButtonTex" OutName="l_button" Format="ia8" Width="24" Height="32" Offset="0x87540"/>
+        <Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x87840"/>
+        <Texture Name="gUnknownJPTex" OutName="unknown_JP" Format="ia8" Width="80" Height="16" Offset="0x87B40"/>
+        <Texture Name="gSongNoteTex" OutName="song_note" Format="ia8" Width="16" Height="24" Offset="0x88040"/>
+        <Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x881C0"/>
+        <DList Name="gItemNamePanelDL" Offset="0x885C0"/>
+        <DList Name="gLButtonIconDL" Offset="0x88650"/>
+        <DList Name="gRButtonIconDL" Offset="0x886A0"/>
+        <DList Name="gCButtonIconsDL" Offset="0x886F0"/>
+        <DList Name="gAButtonIconDL" Offset="0x88748"/>
+        <DList Name="gBButtonIconDL" Offset="0x887A0"/>
+        <DList Name="gPromptCursorLeftDL" Offset="0x887F8"/>
+        <DList Name="gPromptCursorRightDL" Offset="0x88848"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/item_name_static.xml b/soh/assets/xml/N64_NTSC_12/textures/item_name_static.xml
new file mode 100644
index 0000000000..1bc074c2ff
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/item_name_static.xml
@@ -0,0 +1,250 @@
+<Root>
+     <File Name="item_name_static" Segment="10">
+        <Texture Name="gDekuStickItemNameJPNTex" OutName="deku_stick_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gDekuNutItemNameJPNTex" OutName="deku_nut_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gBombItemNameJPNTex" OutName="bomb_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFairyBowItemNameJPNTex" OutName="fairy_bow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC00"/>
+        <Texture Name="gFireArrowItemNameJPNTex" OutName="fire_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gDinsFireItemNameJPNTex" OutName="dins_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gFairySlingshotItemNameJPNTex" OutName="fairy_slingshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFairyOcarinaItemNameJPNTex" OutName="fairy_ocarina_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C00"/>
+        <Texture Name="gOcarinaOfTimeItemNameJPNTex" OutName="ocarina_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gBombchuItemNameJPNTex" OutName="bombchu_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gHookshotItemNameJPNTex" OutName="hookshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gLongshotItemNameJPNTex" OutName="longshot_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00"/>
+        <Texture Name="gIceArrowItemNameJPNTex" OutName="icearrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gFaroresWindItemNameJPNTex" OutName="farores_wind_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gBoomerangItemNameJPNTex" OutName="boomerang_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gLensItemNameJPNTex" OutName="lens_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMagicBeansItemNameJPNTex" OutName="magic_beans_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMegatonHammerItemNameJPNTex" OutName="megaton_hammer_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gLightArrowItemNameJPNTex" OutName="light_arrow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gNayrusLoveItemNameJPNTex" OutName="nayrus_love_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x4C00"/>
+        <Texture Name="gEmptyBottleItemNameJPNTex" OutName="empty_bottle_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gRedPotionItemNameJPNTex" OutName="red_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gGreenPotionItemNameJPNTex" OutName="green_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gBluePotionItemNameJPNTex" OutName="blue_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x5C00"/>
+        <Texture Name="gBottledFairyItemNameJPNTex" OutName="bottled_fairy_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6000"/>
+        <Texture Name="gFishItemNameJPNTex" OutName="fish_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6400"/>
+        <Texture Name="gFullMilkItemNameJPNTex" OutName="full_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6800"/>
+        <Texture Name="gRutosLetterItemNameJPNTex" OutName="rutos_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x6C00"/>
+        <Texture Name="gBlueFireItemNameJPNTex" OutName="blue_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7000"/>
+        <Texture Name="gBugItemNameJPNTex" OutName="bug_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7400"/>
+        <Texture Name="gBigPoeItemNameJPNTex" OutName="big_poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7800"/>
+        <Texture Name="gHalfMilkItemNameJPNTex" OutName="half_milk_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x7C00"/>
+        <Texture Name="gPoeItemNameJPNTex" OutName="poe_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8000"/>
+        <Texture Name="gWeirdEggItemNameJPNTex" OutName="weird_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8400"/>
+        <Texture Name="gCuccoItemNameJPNTex" OutName="cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8800"/>
+        <Texture Name="gZeldasLetterItemNameJPNTex" OutName="zeldas_letter_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x8C00"/>
+        <Texture Name="gKeatonMaskItemNameJPNTex" OutName="keaton_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9000"/>
+        <Texture Name="gSkullMaskItemNameJPNTex" OutName="skull_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9400"/>
+        <Texture Name="gSpookyMaskItemNameJPNTex" OutName="spooky_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800"/>
+        <Texture Name="gBunnyHoodItemNameJPNTex" OutName="bunny_hood_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00"/>
+        <Texture Name="gGoronMaskItemNameJPNTex" OutName="goron_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA000"/>
+        <Texture Name="gZoraMaskItemNameJPNTex" OutName="zora_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA400"/>
+        <Texture Name="gGerudoMaskItemNameJPNTex" OutName="gerudo_mask_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xA800"/>
+        <Texture Name="gMaskofTruthItemNameJPNTex" OutName="mask_of_truth_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xAC00"/>
+        <Texture Name="gSOLDOUTItemNameJPNTex" OutName="sold_out_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB000"/>
+        <Texture Name="gPocketEggItemNameJPNTex" OutName="pocket_egg_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB400"/>
+        <Texture Name="gPocketCuccoItemNameJPNTex" OutName="pocket_cucco_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xB800"/>
+        <Texture Name="gCojiroItemNameJPNTex" OutName="cojiro_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xBC00"/>
+        <Texture Name="gOddMushroomItemNameJPNTex" OutName="odd_mushroom_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC000"/>
+        <Texture Name="gOddPotionItemNameJPNTex" OutName="odd_potion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400"/>
+        <Texture Name="gPoachersSawItemNameJPNTex" OutName="poachers_saw_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xC800"/>
+        <Texture Name="gBrokenGoronsSwordItemNameJPNTex" OutName="broken_gorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xCC00"/>
+        <Texture Name="gPrescriptionItemNameJPNTex" OutName="prescription_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD000"/>
+        <Texture Name="gEyeBallFrogItemNameJPNTex" OutName="eyeball_frog_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD400"/>
+        <Texture Name="gEyeDropsItemNameJPNTex" OutName="eyedrops_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xD800"/>
+        <Texture Name="gClaimCheckItemNameJPNTex" OutName="claim_check_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xDC00"/>
+        <Texture Name="gUnusedWindMedallionItemName1JPNTex" OutName="wind_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE000"/>
+        <Texture Name="gUnusedFireMedallionItemName1JPNTex" OutName="fire_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE400"/>
+        <Texture Name="gUnusedIceMedallionItemName1JPNTex" OutName="ice_medallion_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0xE800"/>
+        <Texture Name="gKokiriSwordItemNameJPNTex" OutName="kokiri_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMasterSwordItemNameJPNTex" OutName="master_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF000"/>
+        <Texture Name="gGiantsKnifeItemNameJPNTex" OutName="giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF400"/>
+        <Texture Name="gDekuShieldItemNameJPNTex" OutName="deku_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xF800"/>
+        <Texture Name="gHylianShieldItemNameJPNTex" OutName="hylian_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMirrorShieldItemNameJPNTex" OutName="mirror_shield_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10000"/>
+        <Texture Name="gKokiriTunicItemNameJPNTex" OutName="kokiri_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10400"/>
+        <Texture Name="gGoronTunicItemNameJPNTex" OutName="goron_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10800"/>
+        <Texture Name="gZoraTunicItemNameJPNTex" OutName="zora_tunic_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x10C00"/>
+        <Texture Name="gKokiriBootsItemNameJPNTex" OutName="kokiri_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11000"/>
+        <Texture Name="gIronBootsItemNameJPNTex" OutName="iron_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11400"/>
+        <Texture Name="gHoverBootsItemNameJPNTex" OutName="hover_boots_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11800"/>
+        <Texture Name="gBulletBag30ItemNameJPNTex" OutName="bullet_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x11C00"/>
+        <Texture Name="gBulletBag40ItemNameJPNTex" OutName="bullet_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12000"/>
+        <Texture Name="gBulletBag50ItemNameJPNTex" OutName="bullet_bag_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12400"/>
+        <Texture Name="gQuiver30ItemNameJPNTex" OutName="quiver_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800"/>
+        <Texture Name="gQuiver40ItemNameJPNTex" OutName="quiver_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00"/>
+        <Texture Name="gQuiver50ItemNameJPNTex" OutName="quiver_50_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000"/>
+        <Texture Name="gBombBag20ItemNameJPNTex" OutName="bomb_bag_20_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13400"/>
+        <Texture Name="gBombBag30ItemNameJPNTex" OutName="bomb_bag_30_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13800"/>
+        <Texture Name="gBombBag40ItemNameJPNTex" OutName="bomb_bag_40_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x13C00"/>
+        <Texture Name="gGoronsBraceletItemNameJPNTex" OutName="gorons_bracelet_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000"/>
+        <Texture Name="gSilverGauntletsItemNameJPNTex" OutName="silver_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14400"/>
+        <Texture Name="gGoldenGauntletsItemNameJPNTex" OutName="golden_gauntlets_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14800"/>
+        <Texture Name="gSilverScaleItemNameJPNTex" OutName="silver_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x14C00"/>
+        <Texture Name="gGoldenScaleItemNameJPNTex" OutName="golden_scale_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15000"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameJPNTex" OutName="broken_giants_knife_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x15400"/>
+        <Texture Name="gUnusedBossKeyItemName1JPNTex" OutName="boss_key_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x15800"/>
+        <Texture Name="gUnusedBossKeyItemName2JPNTex" OutName="boss_key_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x15C00"/>
+        <Texture Name="gUnusedBossKeyItemName3JPNTex" OutName="boss_key_item_name_unused_jpn_3" Format="ia4" Width="128" Height="16" Offset="0x16000"/>
+        <Texture Name="gUnusedBossKeyItemName4JPNTex" OutName="boss_key_item_name_unused_jpn_4" Format="ia4" Width="128" Height="16" Offset="0x16400"/>
+        <Texture Name="gMinuetOfForestItemNameJPNTex" OutName="minuet_of_forest_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800"/>
+        <Texture Name="gBoleroOfFireItemNameJPNTex" OutName="bolero_of_fire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00"/>
+        <Texture Name="gSerenadeOfWaterItemNameJPNTex" OutName="serenade_of_water_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000"/>
+        <Texture Name="gRequiemOfSpiritItemNameJPNTex" OutName="requiem_of_spirit_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17400"/>
+        <Texture Name="gNocturneOfShadowItemNameJPNTex" OutName="nocturne_of_shadow_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17800"/>
+        <Texture Name="gPreludeOfLightItemNameJPNTex" OutName="prelude_of_light_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x17C00"/>
+        <Texture Name="gZeldasLullabyItemNameJPNTex" OutName="zeldas_lullaby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18000"/>
+        <Texture Name="gEponasSongItemNameJPNTex" OutName="eponas_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18400"/>
+        <Texture Name="gSariasSongItemNameJPNTex" OutName="sarias_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18800"/>
+        <Texture Name="gSunsSongItemNameJPNTex" OutName="suns_song_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x18C00"/>
+        <Texture Name="gSongOfTimeItemNameJPNTex" OutName="song_of_time_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19000"/>
+        <Texture Name="gSongOfStormsItemNameJPNTex" OutName="song_of_storms_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19400"/>
+        <Texture Name="gForestMedallionItemNameJPNTex" OutName="forest_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800"/>
+        <Texture Name="gFireMedallionItemNameJPNTex" OutName="fire_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x19C00"/>
+        <Texture Name="gWaterMedallionItemNameJPNTex" OutName="water_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A000"/>
+        <Texture Name="gSpiritMedallionItemNameJPNTex" OutName="spirit_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A400"/>
+        <Texture Name="gShadowMedallionItemNameJPNTex" OutName="shadow_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1A800"/>
+        <Texture Name="gLightMedallionItemNameJPNTex" OutName="light_medallion_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gKokiriEmeraldItemNameJPNTex" OutName="kokiri_emerald_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000"/>
+        <Texture Name="gGoronsRubyItemNameJPNTex" OutName="gorons_ruby_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B400"/>
+        <Texture Name="gZorasSapphireItemNameJPNTex" OutName="zoras_sapphire_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800"/>
+        <Texture Name="gStoneofAgonyItemNameJPNTex" OutName="stone_of_agony_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gGerudosCardItemNameJPNTex" OutName="gerudos_card_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000"/>
+        <Texture Name="gGoldSkulltulaItemNameJPNTex" OutName="gold_skulltula_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400"/>
+        <Texture Name="gPieceOfHeartItemNameJPNTex" OutName="piece_of_heart_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800"/>
+        <Texture Name="gUnusedPieceOfHeartItemName1JPNTex" OutName="piece_of_heart_item_name_unused_jpn_1" Format="ia4" Width="128" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gUnusedBigKeyItemNameJPNTex" OutName="bigkey_item_name_unused_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D000"/>
+        <Texture Name="gCompassItemNameJPNTex" OutName="compass_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D400"/>
+        <Texture Name="gDungeonMapItemNameJPNTex" OutName="dungeon_map_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1D800"/>
+        <Texture Name="gUnusedBossKeyItemName5JPNTex" OutName="boss_key_item_name_unused_jpn_5" Format="ia4" Width="128" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gUnusedBossKeyItemName6JPNTex" OutName="boss_key_item_name_unused_jpn_6" Format="ia4" Width="128" Height="16" Offset="0x1E000"/>
+        <Texture Name="gUnusedBossKeyItemName7JPNTex" OutName="boss_key_item_name_unused_jpn_7" Format="ia4" Width="128" Height="16" Offset="0x1E400"/>
+        <Texture Name="gBiggoronsSwordItemNameJPNTex" OutName="biggorons_sword_item_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1E800"/>
+        <Texture Name="gDekuStickItemNameENGTex" OutName="deku_stick_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gDekuNutItemNameENGTex" OutName="dekunut_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F000"/>
+        <Texture Name="gBombItemNameENGTex" OutName="bomb_item_name_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F400"/>
+        <Texture Name="gFairyBowItemNameENGTex" OutName="fairy_bow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1F800"/>
+        <Texture Name="gFireArrowItemNameENGTex" OutName="fire_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gDinsFireItemNameENGTex" OutName="dins_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20000"/>
+        <Texture Name="gFairySlingshotItemNameENGTex" OutName="fairy_slingshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20400"/>
+        <Texture Name="gFairyOcarinaItemNameENGTex" OutName="fairy_ocarina_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20800"/>
+        <Texture Name="gOcarinaOfTimeItemNameENGTex" OutName="ocarina_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x20C00"/>
+        <Texture Name="gBombchuItemNameENGTex" OutName="bombchu_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21000"/>
+        <Texture Name="gHookshotItemNameENGTex" OutName="hookshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21400"/>
+        <Texture Name="gLongshotItemNameENGTex" OutName="longshot_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21800"/>
+        <Texture Name="gIceArrowItemNameENGTex" OutName="icearrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x21C00"/>
+        <Texture Name="gFaroresWindItemNameENGTex" OutName="farores_wind_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22000"/>
+        <Texture Name="gBoomerangItemNameENGTex" OutName="boomerang_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22400"/>
+        <Texture Name="gLensItemNameENGTex" OutName="lens_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22800"/>
+        <Texture Name="gMagicBeansItemNameENGTex" OutName="magic_beans_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMegatonHammerItemNameENGTex" OutName="megaton_hammer_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23000"/>
+        <Texture Name="gLightArrowItemNameENGTex" OutName="light_arrow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23400"/>
+        <Texture Name="gNayrusLoveItemNameENGTex" OutName="nayrus_love_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23800"/>
+        <Texture Name="gEmptyBottleItemNameENGTex" OutName="empty_bottle_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x23C00"/>
+        <Texture Name="gRedPotionItemNameENGTex" OutName="red_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24000"/>
+        <Texture Name="gGreenPotionItemNameENGTex" OutName="green_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24400"/>
+        <Texture Name="gBluePotionItemNameENGTex" OutName="blue_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24800"/>
+        <Texture Name="gBottledFairyItemNameENGTex" OutName="bottled_fairy_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x24C00"/>
+        <Texture Name="gFishItemNameENGTex" OutName="fish_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25000"/>
+        <Texture Name="gFullMilkItemNameENGTex" OutName="full_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25400"/>
+        <Texture Name="gRutosLetterItemNameENGTex" OutName="rutos_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25800"/>
+        <Texture Name="gBlueFireItemNameENGTex" OutName="blue_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x25C00"/>
+        <Texture Name="gBugItemNameENGTex" OutName="bug_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26000"/>
+        <Texture Name="gBigPoeItemNameENGTex" OutName="big_poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26400"/>
+        <Texture Name="gHalfMilkItemNameENGTex" OutName="half_milk_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26800"/>
+        <Texture Name="gPoeItemNameENGTex" OutName="poe_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x26C00"/>
+        <Texture Name="gWeirdEggItemNameENGTex" OutName="weird_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27000"/>
+        <Texture Name="gCuccoItemNameENGTex" OutName="cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27400"/>
+        <Texture Name="gZeldasLetterItemNameENGTex" OutName="zeldas_letter_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27800"/>
+        <Texture Name="gKeatonMaskItemNameENGTex" OutName="keaton_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x27C00"/>
+        <Texture Name="gSkullMaskItemNameENGTex" OutName="skull_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28000"/>
+        <Texture Name="gSpookyMaskItemNameENGTex" OutName="spooky_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28400"/>
+        <Texture Name="gBunnyHoodItemNameENGTex" OutName="bunny_hood_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28800"/>
+        <Texture Name="gGoronMaskItemNameENGTex" OutName="goron_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x28C00"/>
+        <Texture Name="gZoraMaskItemNameENGTex" OutName="zora_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29000"/>
+        <Texture Name="gGerudoMaskItemNameENGTex" OutName="gerudo_mask_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29400"/>
+        <Texture Name="gMaskofTruthItemNameENGTex" OutName="mask_of_truth_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29800"/>
+        <Texture Name="gSOLDOUTItemNameENGTex" OutName="sold_out_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x29C00"/>
+        <Texture Name="gPocketEggItemNameENGTex" OutName="pocket_egg_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A000"/>
+        <Texture Name="gPocketCuccoItemNameENGTex" OutName="pocket_cucco_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A400"/>
+        <Texture Name="gCojiroItemNameENGTex" OutName="cojiro_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2A800"/>
+        <Texture Name="gOddMushroomItemNameENGTex" OutName="odd_mushroom_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gOddPotionItemNameENGTex" OutName="odd_potion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B000"/>
+        <Texture Name="gPoachersSawItemNameENGTex" OutName="poachers_saw_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B400"/>
+        <Texture Name="gBrokenGoronsSwordItemNameENGTex" OutName="broken_gorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2B800"/>
+        <Texture Name="gPrescriptionItemNameENGTex" OutName="prescription_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gEyeBallFrogItemNameENGTex" OutName="eyeball_frog_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C000"/>
+        <Texture Name="gEyeDropsItemNameENGTex" OutName="eyedrops_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C400"/>
+        <Texture Name="gClaimCheckItemNameENGTex" OutName="claim_check_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2C800"/>
+        <Texture Name="gUnusedWindMedallionItemName2JPNTex" OutName="wind_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gUnusedFireMedallionItemName2JPNTex" OutName="fire_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D000"/>
+        <Texture Name="gUnusedIceMedallionItemName2JPNTex" OutName="ice_medallion_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x2D400"/>
+        <Texture Name="gKokiriSwordItemNameENGTex" OutName="kokiri_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMasterSwordItemNameENGTex" OutName="master_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gGiantsKnifeItemNameENGTex" OutName="giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E000"/>
+        <Texture Name="gDekuShieldItemNameENGTex" OutName="deku_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E400"/>
+        <Texture Name="gHylianShieldItemNameENGTex" OutName="hylian_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMirrorShieldItemNameENGTex" OutName="mirror_shield_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gKokiriTunicItemNameENGTex" OutName="kokiri_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F000"/>
+        <Texture Name="gGoronTunicItemNameENGTex" OutName="goron_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F400"/>
+        <Texture Name="gZoraTunicItemNameENGTex" OutName="zora_tunic_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2F800"/>
+        <Texture Name="gKokiriBootsItemNameENGTex" OutName="kokiri_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gIronBootsItemNameENGTex" OutName="iron_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30000"/>
+        <Texture Name="gHoverBootsItemNameENGTex" OutName="hover_boots_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30400"/>
+        <Texture Name="gBulletBag30ItemNameENGTex" OutName="bullet_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30800"/>
+        <Texture Name="gBulletBag40ItemNameENGTex" OutName="bullet_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x30C00"/>
+        <Texture Name="gBulletBag50ItemNameENGTex" OutName="bullet_bag_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31000"/>
+        <Texture Name="gQuiver30ItemNameENGTex" OutName="quiver_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31400"/>
+        <Texture Name="gQuiver40ItemNameENGTex" OutName="quiver_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31800"/>
+        <Texture Name="gQuiver50ItemNameENGTex" OutName="quiver_50_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x31C00"/>
+        <Texture Name="gBombBag20ItemNameENGTex" OutName="bomb_bag_20_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32000"/>
+        <Texture Name="gBombBag30ItemNameENGTex" OutName="bomb_bag_30_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32400"/>
+        <Texture Name="gBombBag40ItemNameENGTex" OutName="bomb_bag_40_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32800"/>
+        <Texture Name="gGoronsBraceletItemNameENGTex" OutName="gorons_bracelet_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x32C00"/>
+        <Texture Name="gSilverGauntletsItemNameENGTex" OutName="silver_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33000"/>
+        <Texture Name="gGoldenGauntletsItemNameENGTex" OutName="golden_gauntlets_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33400"/>
+        <Texture Name="gSilverScaleItemNameENGTex" OutName="silver_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33800"/>
+        <Texture Name="gGoldenScaleItemNameENGTex" OutName="golden_scale_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x33C00"/>
+        <Texture Name="gBrokenGiantsKnifeItemNameENGTex" OutName="broken_giants_knife_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x34000"/>
+        <Texture Name="gUnusedBossKeyItemName8JPNTex" OutName="boss_key_item_name_unused_jpn_8" Format="ia4" Width="128" Height="16" Offset="0x34400"/>
+        <Texture Name="gUnusedBossKeyItemName9JPNTex" OutName="boss_key_item_name_unused_jpn_9" Format="ia4" Width="128" Height="16" Offset="0x34800"/>
+        <Texture Name="gUnusedBossKeyItemName10JPNTex" OutName="boss_key_item_name_unused_jpn_10" Format="ia4" Width="128" Height="16" Offset="0x34C00"/>
+        <Texture Name="gUnusedBossKeyItemName11JPNTex" OutName="boss_key_item_name_unused_jpn_11" Format="ia4" Width="128" Height="16" Offset="0x35000"/>
+        <Texture Name="gMinuetOfForestItemNameENGTex" OutName="minuet_of_forest_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35400"/>
+        <Texture Name="gBoleroOfFireItemNameENGTex" OutName="bolero_of_fire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35800"/>
+        <Texture Name="gSerenadeOfWaterItemNameENGTex" OutName="serenade_of_water_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x35C00"/>
+        <Texture Name="gRequiemOfSpiritItemNameENGTex" OutName="requiem_of_spirit_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36000"/>
+        <Texture Name="gNocturneOfShadowItemNameENGTex" OutName="nocturne_of_shadow_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36400"/>
+        <Texture Name="gPreludeOfLightItemNameENGTex" OutName="prelude_of_light_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36800"/>
+        <Texture Name="gZeldasLullabyItemNameENGTex" OutName="zeldas_lullaby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x36C00"/>
+        <Texture Name="gEponasSongItemNameENGTex" OutName="eponas_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37000"/>
+        <Texture Name="gSariasSongItemNameENGTex" OutName="sarias_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37400"/>
+        <Texture Name="gSunsSongItemNameENGTex" OutName="suns_song_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37800"/>
+        <Texture Name="gSongOfTimeItemNameENGTex" OutName="song_of_time_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x37C00"/>
+        <Texture Name="gSongOfStormsItemNameENGTex" OutName="song_of_storms_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38000"/>
+        <Texture Name="gForestMedallionItemNameENGTex" OutName="forest_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38400"/>
+        <Texture Name="gFireMedallionItemNameENGTex" OutName="fire_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38800"/>
+        <Texture Name="gWaterMedallionItemNameENGTex" OutName="water_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x38C00"/>
+        <Texture Name="gSpiritMedallionItemNameENGTex" OutName="spirit_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39000"/>
+        <Texture Name="gShadowMedallionItemNameENGTex" OutName="shadow_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39400"/>
+        <Texture Name="gLightMedallionItemNameENGTex" OutName="light_medallion_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39800"/>
+        <Texture Name="gKokiriEmeraldItemNameENGTex" OutName="kokiri_emerald_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x39C00"/>
+        <Texture Name="gGoronsRubyItemNameENGTex" OutName="gorons_ruby_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A000"/>
+        <Texture Name="gZorasSapphireItemNameENGTex" OutName="zoras_sapphire_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A400"/>
+        <Texture Name="gStoneofAgonyItemNameENGTex" OutName="stone_of_agony_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3A800"/>
+        <Texture Name="gGerudosCardItemNameENGTex" OutName="gerudos_card_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
+        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
+        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
+        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
+        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
+        <Texture Name="gUnusedBossKeyItemName13JPNTex" OutName="boss_key_item_name_unused_jpn_13" Format="ia4" Width="128" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gUnusedBossKeyItemName14JPNTex" OutName="boss_key_item_name_unused_jpn_14" Format="ia4" Width="128" Height="16" Offset="0x3D000"/>
+        <Texture Name="gBiggoronsSwordItemNameENGTex" OutName="biggorons_sword_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3D400"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/kanji.xml b/soh/assets/xml/N64_NTSC_12/textures/kanji.xml
new file mode 100644
index 0000000000..5159387a13
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/kanji.xml
@@ -0,0 +1,3984 @@
+<Root>
+    <File Name="kanji">
+        <!-- The four-digit number after the prefix is the character's codepoint: the hexadecimal short it corresponds to in the text data -->
+        <Texture Name="gMsgKanji8140SpaceTex" OutName="msg_kanji_8140_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgKanji8141ToutenTex" OutName="msg_kanji_8141_touten" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgKanji8142KutenTex" OutName="msg_kanji_8142_kuten" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgKanji8143CommaTex" OutName="msg_kanji_8143_comma" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgKanji8144PeriodTex" OutName="msg_kanji_8144_period" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgKanji8145NakatenTex" OutName="msg_kanji_8145_nakaten" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgKanji8146ColonTex" OutName="msg_kanji_8146_colon" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgKanji8147SemicolonTex" OutName="msg_kanji_8147_semicolon" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgKanji8148QuestionMarkTex" OutName="msg_kanji_8148_question_mark" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgKanji8149ExclamationMarkTex" OutName="msg_kanji_8149_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgKanji814ADakutenTex" OutName="msg_kanji_814A_dakuten" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgKanji814BHandakutenTex" OutName="msg_kanji_814B_handakuten" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgKanji814CAcuteAccentTex" OutName="msg_kanji_814C_acute_accent" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgKanji814DGraveAccentTex" OutName="msg_kanji_814D_grave_accent" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgKanji814EDiaeresisTex" OutName="msg_kanji_814E_diaeresis" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgKanji814FCircumflexAccentTex" OutName="msg_kanji_814F_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgKanji8150EmptyTex" OutName="msg_kanji_8150_empty" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgKanji8151EmptyTex" OutName="msg_kanji_8151_empty" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgKanji8152IchinojitenKatakanaTex" OutName="msg_kanji_8152_ichinojiten_katakana" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgKanji8153IchinojitenKatakanaDakutenTex" OutName="msg_kanji_8153_ichinojiten_katakana_dakuten" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgKanji8154IchinojitenHiraganaTex" OutName="msg_kanji_8154_ichinojiten_hiragana" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgKanji8155IchinojitenHiraganaDakutenTex" OutName="msg_kanji_8155_ichinojiten_hiragana_dakuten" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgKanji8156NonojitenTex" OutName="msg_kanji_8156_nonojiten" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgKanji8157Tex" OutName="msg_kanji_8157" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgKanji8158DounojitenTex" OutName="msg_kanji_8158_dounojiten" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgKanji8159ShimeTex" OutName="msg_kanji_8159_shime" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgKanji815AZeroTex" OutName="msg_kanji_815A_zero" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgKanji815BChouonpuTex" OutName="msg_kanji_815B_chouonpu" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgKanji815CDashTex" OutName="msg_kanji_815C_dash" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgKanji815DHyphenTex" OutName="msg_kanji_815D_hyphen" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgKanji815ESlashTex" OutName="msg_kanji_815E_slash" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgKanji815FBackSlashTex" OutName="msg_kanji_815F_back_slash" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgKanji8160WaveDashTex" OutName="msg_kanji_8160_wave_dash" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgKanji8161DoubleVerticalLineTex" OutName="msg_kanji_8161_double_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgKanji8162VerticalLineTex" OutName="msg_kanji_8162_vertical_line" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgKanji8163SantenLeaderTex" OutName="msg_kanji_8163_santen_leader" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgKanji8164NitenLeaderTex" OutName="msg_kanji_8164_niten_leader" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgKanji8165SingleQuotationMarkLeftTex" OutName="msg_kanji_8165_single_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgKanji8166SingleQuotationMarkRightTex" OutName="msg_kanji_8166_single_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgKanji8167DoubleQuotationMarkLeftTex" OutName="msg_kanji_8167_double_quotation_mark_left" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgKanji8168DoubleQuotationMarkRightTex" OutName="msg_kanji_8168_double_quotation_mark_right" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgKanji8169ParenthesesLeftTex" OutName="msg_kanji_8169_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgKanji816AParenthesesRightTex" OutName="msg_kanji_816A_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgKanji816BKikkoukakkoLeftTex" OutName="msg_kanji_816B_kikkoukakko_left" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgKanji816CKikkoukakkoRightTex" OutName="msg_kanji_816C_kikkoukakko_right" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgKanji816DSquareBracketLeftTex" OutName="msg_kanji_816D_square_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgKanji816ESquareBracketRightTex" OutName="msg_kanji_816E_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgKanji816FCurlyBracketLeftTex" OutName="msg_kanji_816F_curly_bracket_left" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgKanji8170CurlyBracketRightTex" OutName="msg_kanji_8170_curly_bracket_right" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgKanji8171YamakakkoLeftTex" OutName="msg_kanji_8171_yamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgKanji8172YamakakkoRightTex" OutName="msg_kanji_8172_yamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgKanji8173NijyuuyamakakkoLeftTex" OutName="msg_kanji_8173_nijyuuyamakakko_left" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgKanji8174NijyuuyamakakkoRightTex" OutName="msg_kanji_8174_nijyuuyamakakko_right" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgKanji8175KagikakkoLeftTex" OutName="msg_kanji_8175_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgKanji8176KagikakkoRightTex" OutName="msg_kanji_8176_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgKanji8177NijyuukagikakkoLeftTex" OutName="msg_kanji_8177_nijyuukagikakko_left" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgKanji8178NijyuukagikakkoRightTex" OutName="msg_kanji_8178_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgKanji8179SumitsukikakkoLeftTex" OutName="msg_kanji_8179_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgKanji817ASumitsukikakkoRightTex" OutName="msg_kanji_817A_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgKanji817BPlusSignTex" OutName="msg_kanji_817B_plus_sign" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgKanji817CMinusSignTex" OutName="msg_kanji_817C_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgKanji817DPlusMinusSignTex" OutName="msg_kanji_817D_plus_minus_sign" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgKanji817EMultiplicationSignTex" OutName="msg_kanji_817E_multiplication_sign" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgKanji8180DivisionSignTex" OutName="msg_kanji_8180_division_sign" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgKanji8181EqualsSignTex" OutName="msg_kanji_8181_equals_sign" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgKanji8182NotEqualSignTex" OutName="msg_kanji_8182_not_equal_sign" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgKanji8183LessThanSignTex" OutName="msg_kanji_8183_less_than_sign" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgKanji8184GreaterThanSignTex" OutName="msg_kanji_8184_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgKanji8185LessThanOrEqualToTex" OutName="msg_kanji_8185_less_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgKanji8186GreaterThanOrEqualToTex" OutName="msg_kanji_8186_greater_than_or_equal_to" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgKanji8187InfinityTex" OutName="msg_kanji_8187_infinity" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgKanji8188ThereforeTex" OutName="msg_kanji_8188_therefore" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgKanji8189MaleTex" OutName="msg_kanji_8189_male" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgKanji818AFemaleTex" OutName="msg_kanji_818A_female" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgKanji818BDegreeSignTex" OutName="msg_kanji_818B_degree_sign" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgKanji818CPrimeTex" OutName="msg_kanji_818C_prime" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgKanji818DDoublePrimeTex" OutName="msg_kanji_818D_double_prime" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgKanji818ECelciusTex" OutName="msg_kanji_818E_celcius" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgKanji818FYenSignTex" OutName="msg_kanji_818F_yen_sign" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgKanji8190DollarSignTex" OutName="msg_kanji_8190_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgKanji8191CentSignTex" OutName="msg_kanji_8191_cent_sign" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgKanji8192PoundSignTex" OutName="msg_kanji_8192_pound_sign" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgKanji8193PercentSignTex" OutName="msg_kanji_8193_percent_sign" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgKanji8194NumberSignTex" OutName="msg_kanji_8194_number_sign" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgKanji8195AmpersandTex" OutName="msg_kanji_8195_ampersand" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgKanji8196AsteriskTex" OutName="msg_kanji_8196_asterisk" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgKanji8197AtSignTex" OutName="msg_kanji_8197_at_sign" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgKanji8198SectionSignTex" OutName="msg_kanji_8198_section_sign" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgKanji8199WhiteStarTex" OutName="msg_kanji_8199_white_star" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgKanji819ABlackStarTex" OutName="msg_kanji_819A_black_star" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgKanji819BWhiteCircleTex" OutName="msg_kanji_819B_white_circle" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgKanji819CBlackCircleTex" OutName="msg_kanji_819C_black_circle" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgKanji819DDoubleCircleTex" OutName="msg_kanji_819D_double_circle" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgKanji819EWhiteDiamondTex" OutName="msg_kanji_819E_white_diamond" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgKanji819FBlackDiamondTex" OutName="msg_kanji_819F_black_diamond" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgKanji81A0WhiteSquareTex" OutName="msg_kanji_81A0_white_square" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgKanji81A1BlackSquareTex" OutName="msg_kanji_81A1_black_square" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgKanji81A2WhiteTriangleTex" OutName="msg_kanji_81A2_white_triangle" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgKanji81A3BlackTriangleTex" OutName="msg_kanji_81A3_black_triangle" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgKanji81A4WhiteInvertedTriangleTex" OutName="msg_kanji_81A4_white_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgKanji81A5BlackInvertedTriangleTex" OutName="msg_kanji_81A5_black_inverted_triangle" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgKanji81A6KomejirushiTex" OutName="msg_kanji_81A6_komejirushi" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgKanji81A7PostalMarkTex" OutName="msg_kanji_81A7_postal_mark" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgKanji81A8ArrowRightTex" OutName="msg_kanji_81A8_arrow_right" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgKanji81A9ArrowLeftTex" OutName="msg_kanji_81A9_arrow_left" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgKanji81AAArrowUpTex" OutName="msg_kanji_81AA_arrow_up" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgKanji81ABArrowDownTex" OutName="msg_kanji_81AB_arrow_down" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgKanji81ACGetaTex" OutName="msg_kanji_81AC_geta" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgKanji81B8EmptyTex" OutName="msg_kanji_81B8_empty" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgKanji81B9EmptyTex" OutName="msg_kanji_81B9_empty" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgKanji81BAEmptyTex" OutName="msg_kanji_81BA_empty" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgKanji81BBEmptyTex" OutName="msg_kanji_81BB_empty" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgKanji81BCEmptyTex" OutName="msg_kanji_81BC_empty" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgKanji81BDEmptyTex" OutName="msg_kanji_81BD_empty" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgKanji81BEEmptyTex" OutName="msg_kanji_81BE_empty" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgKanji81BFIntersectionTex" OutName="msg_kanji_81BF_intersection" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgKanji81C8EmptyTex" OutName="msg_kanji_81C8_empty" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgKanji81C9EmptyTex" OutName="msg_kanji_81C9_empty" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgKanji81CAEmptyTex" OutName="msg_kanji_81CA_empty" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgKanji81CBEmptyTex" OutName="msg_kanji_81CB_empty" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgKanji81CCEmptyTex" OutName="msg_kanji_81CC_empty" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgKanji81CDEmptyTex" OutName="msg_kanji_81CD_empty" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgKanji81CEEmptyTex" OutName="msg_kanji_81CE_empty" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgKanji81DBEmptyTex" OutName="msg_kanji_81DB_empty" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgKanji81DCEmptyTex" OutName="msg_kanji_81DC_empty" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgKanji81DDEmptyTex" OutName="msg_kanji_81DD_empty" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgKanji81DEEmptyTex" OutName="msg_kanji_81DE_empty" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgKanji81DFEmptyTex" OutName="msg_kanji_81DF_empty" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgKanji81E0ApproximatelyEqualToTex" OutName="msg_kanji_81E0_approximately_equal_to" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgKanji81E1MuchLessThanTex" OutName="msg_kanji_81E1_much_less_than" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgKanji81E2MuchGreaterThanTex" OutName="msg_kanji_81E2_much_greater_than" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgKanji81E3SquareRootTex" OutName="msg_kanji_81E3_square_root" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgKanji81E4SimilarTex" OutName="msg_kanji_81E4_similar" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgKanji81E5ProportionalTex" OutName="msg_kanji_81E5_proportional" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgKanji81E6BecauseTex" OutName="msg_kanji_81E6_because" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgKanji81E7IntegralTex" OutName="msg_kanji_81E7_integral" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgKanji81E8DoubleIntegralTex" OutName="msg_kanji_81E8_double_integral" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgKanji81F0EmptyTex" OutName="msg_kanji_81F0_empty" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgKanji81F1EmptyTex" OutName="msg_kanji_81F1_empty" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+        <Texture Name="gMsgKanji81F2EmptyTex" OutName="msg_kanji_81F2_empty" Format="i4" Width="16" Height="16" Offset="0x4580"/>
+        <Texture Name="gMsgKanji81F3EmptyTex" OutName="msg_kanji_81F3_empty" Format="i4" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="gMsgKanji81F4EmptyTex" OutName="msg_kanji_81F4_empty" Format="i4" Width="16" Height="16" Offset="0x4680"/>
+        <Texture Name="gMsgKanji81F5EmptyTex" OutName="msg_kanji_81F5_empty" Format="i4" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="gMsgKanji81F6EmptyTex" OutName="msg_kanji_81F6_empty" Format="i4" Width="16" Height="16" Offset="0x4780"/>
+        <Texture Name="gMsgKanji81F7EmptyTex" OutName="msg_kanji_81F7_empty" Format="i4" Width="16" Height="16" Offset="0x4800"/>
+        <Texture Name="gMsgKanji81FCEmptyTex" OutName="msg_kanji_81FC_empty" Format="i4" Width="16" Height="16" Offset="0x4880"/>
+        <Texture Name="gMsgKanji824FZeroTex" OutName="msg_kanji_824F_zero" Format="i4" Width="16" Height="16" Offset="0x4900"/>
+        <Texture Name="gMsgKanji8250OneTex" OutName="msg_kanji_8250_one" Format="i4" Width="16" Height="16" Offset="0x4980"/>
+        <Texture Name="gMsgKanji8251TwoTex" OutName="msg_kanji_8251_two" Format="i4" Width="16" Height="16" Offset="0x4A00"/>
+        <Texture Name="gMsgKanji8252ThreeTex" OutName="msg_kanji_8252_three" Format="i4" Width="16" Height="16" Offset="0x4A80"/>
+        <Texture Name="gMsgKanji8253FourTex" OutName="msg_kanji_8253_four" Format="i4" Width="16" Height="16" Offset="0x4B00"/>
+        <Texture Name="gMsgKanji8254FiveTex" OutName="msg_kanji_8254_five" Format="i4" Width="16" Height="16" Offset="0x4B80"/>
+        <Texture Name="gMsgKanji8255SixTex" OutName="msg_kanji_8255_six" Format="i4" Width="16" Height="16" Offset="0x4C00"/>
+        <Texture Name="gMsgKanji8256SevenTex" OutName="msg_kanji_8256_seven" Format="i4" Width="16" Height="16" Offset="0x4C80"/>
+        <Texture Name="gMsgKanji8257EightTex" OutName="msg_kanji_8257_eight" Format="i4" Width="16" Height="16" Offset="0x4D00"/>
+        <Texture Name="gMsgKanji8258NineTex" OutName="msg_kanji_8258_nine" Format="i4" Width="16" Height="16" Offset="0x4D80"/>
+        <Texture Name="gMsgKanji8260CapitalATex" OutName="msg_kanji_8260_capital_a" Format="i4" Width="16" Height="16" Offset="0x4E00"/>
+        <Texture Name="gMsgKanji8261CapitalBTex" OutName="msg_kanji_8261_capital_b" Format="i4" Width="16" Height="16" Offset="0x4E80"/>
+        <Texture Name="gMsgKanji8262CapitalCTex" OutName="msg_kanji_8262_capital_c" Format="i4" Width="16" Height="16" Offset="0x4F00"/>
+        <Texture Name="gMsgKanji8263CapitalDTex" OutName="msg_kanji_8263_capital_d" Format="i4" Width="16" Height="16" Offset="0x4F80"/>
+        <Texture Name="gMsgKanji8264CapitalETex" OutName="msg_kanji_8264_capital_e" Format="i4" Width="16" Height="16" Offset="0x5000"/>
+        <Texture Name="gMsgKanji8265CapitalFTex" OutName="msg_kanji_8265_capital_f" Format="i4" Width="16" Height="16" Offset="0x5080"/>
+        <Texture Name="gMsgKanji8266CapitalGTex" OutName="msg_kanji_8266_capital_g" Format="i4" Width="16" Height="16" Offset="0x5100"/>
+        <Texture Name="gMsgKanji8267CapitalHTex" OutName="msg_kanji_8267_capital_h" Format="i4" Width="16" Height="16" Offset="0x5180"/>
+        <Texture Name="gMsgKanji8268CapitalITex" OutName="msg_kanji_8268_capital_i" Format="i4" Width="16" Height="16" Offset="0x5200"/>
+        <Texture Name="gMsgKanji8269CapitalJTex" OutName="msg_kanji_8269_capital_j" Format="i4" Width="16" Height="16" Offset="0x5280"/>
+        <Texture Name="gMsgKanji826ACapitalKTex" OutName="msg_kanji_826A_capital_k" Format="i4" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="gMsgKanji826BCapitalLTex" OutName="msg_kanji_826B_capital_l" Format="i4" Width="16" Height="16" Offset="0x5380"/>
+        <Texture Name="gMsgKanji826CCapitalMTex" OutName="msg_kanji_826C_capital_m" Format="i4" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gMsgKanji826DCapitalNTex" OutName="msg_kanji_826D_capital_n" Format="i4" Width="16" Height="16" Offset="0x5480"/>
+        <Texture Name="gMsgKanji826ECapitalOTex" OutName="msg_kanji_826E_capital_o" Format="i4" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="gMsgKanji826FCapitalPTex" OutName="msg_kanji_826F_capital_p" Format="i4" Width="16" Height="16" Offset="0x5580"/>
+        <Texture Name="gMsgKanji8270CapitalQTex" OutName="msg_kanji_8270_capital_q" Format="i4" Width="16" Height="16" Offset="0x5600"/>
+        <Texture Name="gMsgKanji8271CapitalRTex" OutName="msg_kanji_8271_capital_r" Format="i4" Width="16" Height="16" Offset="0x5680"/>
+        <Texture Name="gMsgKanji8272CapitalSTex" OutName="msg_kanji_8272_capital_s" Format="i4" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="gMsgKanji8273CapitalTTex" OutName="msg_kanji_8273_capital_t" Format="i4" Width="16" Height="16" Offset="0x5780"/>
+        <Texture Name="gMsgKanji8274CapitalUTex" OutName="msg_kanji_8274_capital_u" Format="i4" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gMsgKanji8275CapitalVTex" OutName="msg_kanji_8275_capital_v" Format="i4" Width="16" Height="16" Offset="0x5880"/>
+        <Texture Name="gMsgKanji8276CapitalWTex" OutName="msg_kanji_8276_capital_w" Format="i4" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="gMsgKanji8277CapitalXTex" OutName="msg_kanji_8277_capital_x" Format="i4" Width="16" Height="16" Offset="0x5980"/>
+        <Texture Name="gMsgKanji8278CapitalYTex" OutName="msg_kanji_8278_capital_y" Format="i4" Width="16" Height="16" Offset="0x5A00"/>
+        <Texture Name="gMsgKanji8279CapitalZTex" OutName="msg_kanji_8279_captial_z" Format="i4" Width="16" Height="16" Offset="0x5A80"/>
+        <Texture Name="gMsgKanji8281LowercaseATex" OutName="msg_kanji_8281_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x5B00"/>
+        <Texture Name="gMsgKanji8282LowercaseBTex" OutName="msg_kanji_8282_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="gMsgKanji8283LowercaseCTex" OutName="msg_kanji_8283_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x5C00"/>
+        <Texture Name="gMsgKanji8284LowercaseDTex" OutName="msg_kanji_8284_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x5C80"/>
+        <Texture Name="gMsgKanji8285LowercaseETex" OutName="msg_kanji_8285_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x5D00"/>
+        <Texture Name="gMsgKanji8286LowercaseFTex" OutName="msg_kanji_8286_lowercase_f" Format="i4" Width="16" Height="16" Offset="0x5D80"/>
+        <Texture Name="gMsgKanji8287LowercaseGTex" OutName="msg_kanji_8287_lowercase_g" Format="i4" Width="16" Height="16" Offset="0x5E00"/>
+        <Texture Name="gMsgKanji8288LowercaseHTex" OutName="msg_kanji_8288_lowercase_h" Format="i4" Width="16" Height="16" Offset="0x5E80"/>
+        <Texture Name="gMsgKanji8289LowercaseITex" OutName="msg_kanji_8289_lowercase_i" Format="i4" Width="16" Height="16" Offset="0x5F00"/>
+        <Texture Name="gMsgKanji828ALowercaseJTex" OutName="msg_kanji_828A_lowercase_j" Format="i4" Width="16" Height="16" Offset="0x5F80"/>
+        <Texture Name="gMsgKanji828BLowercaseKTex" OutName="msg_kanji_828B_lowercase_k" Format="i4" Width="16" Height="16" Offset="0x6000"/>
+        <Texture Name="gMsgKanji828CLowercaseLTex" OutName="msg_kanji_828C_lowercase_l" Format="i4" Width="16" Height="16" Offset="0x6080"/>
+        <Texture Name="gMsgKanji828DLowercaseMTex" OutName="msg_kanji_828D_lowercase_m" Format="i4" Width="16" Height="16" Offset="0x6100"/>
+        <Texture Name="gMsgKanji828ELowercaseNTex" OutName="msg_kanji_828E_lowercase_n" Format="i4" Width="16" Height="16" Offset="0x6180"/>
+        <Texture Name="gMsgKanji828FLowercaseOTex" OutName="msg_kanji_828F_lowercase_o" Format="i4" Width="16" Height="16" Offset="0x6200"/>
+        <Texture Name="gMsgKanji8290LowercasePTex" OutName="msg_kanji_8290_lowercase_p" Format="i4" Width="16" Height="16" Offset="0x6280"/>
+        <Texture Name="gMsgKanji8291LowercaseQTex" OutName="msg_kanji_8291_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x6300"/>
+        <Texture Name="gMsgKanji8292LowercaseRTex" OutName="msg_kanji_8292_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x6380"/>
+        <Texture Name="gMsgKanji8293LowercaseSTex" OutName="msg_kanji_8293_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x6400"/>
+        <Texture Name="gMsgKanji8294LowercaseTTex" OutName="msg_kanji_8294_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x6480"/>
+        <Texture Name="gMsgKanji8295LowercaseUTex" OutName="msg_kanji_8295_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x6500"/>
+        <Texture Name="gMsgKanji8296LowercaseVTex" OutName="msg_kanji_8296_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x6580"/>
+        <Texture Name="gMsgKanji8297LowercaseWTex" OutName="msg_kanji_8297_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x6600"/>
+        <Texture Name="gMsgKanji8298LowercaseXTex" OutName="msg_kanji_8298_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x6680"/>
+        <Texture Name="gMsgKanji8299LowercaseYTex" OutName="msg_kanji_8299_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x6700"/>
+        <Texture Name="gMsgKanji829ALowercaseZTex" OutName="msg_kanji_829A_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x6780"/>
+        <Texture Name="gMsgKanji829FHiraganaSmallATex" OutName="msg_kanji_829F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x6800"/>
+        <Texture Name="gMsgKanji82A0HiraganaATex" OutName="msg_kanji_82A0_hiragana_a" Format="i4" Width="16" Height="16" Offset="0x6880"/>
+        <Texture Name="gMsgKanji82A1HiraganaSmallITex" OutName="msg_kanji_82A1_hiragana_small_i" Format="i4" Width="16" Height="16" Offset="0x6900"/>
+        <Texture Name="gMsgKanji82A2HiraganaITex" OutName="msg_kanji_82A2_hiragana_i" Format="i4" Width="16" Height="16" Offset="0x6980"/>
+        <Texture Name="gMsgKanji82A3HiraganaSmallUTex" OutName="msg_kanji_82A3_hiragana_small_u" Format="i4" Width="16" Height="16" Offset="0x6A00"/>
+        <Texture Name="gMsgKanji82A4HiraganaUTex" OutName="msg_kanji_82A4_hiragana_u" Format="i4" Width="16" Height="16" Offset="0x6A80"/>
+        <Texture Name="gMsgKanji82A5HiraganaSmallETex" OutName="msg_kanji_82A5_hiragana_small_e" Format="i4" Width="16" Height="16" Offset="0x6B00"/>
+        <Texture Name="gMsgKanji82A6HiraganaETex" OutName="msg_kanji_82A6_hiragana_e" Format="i4" Width="16" Height="16" Offset="0x6B80"/>
+        <Texture Name="gMsgKanji82A7HiraganaSmallOTex" OutName="msg_kanji_82A7_hiragana_small_o" Format="i4" Width="16" Height="16" Offset="0x6C00"/>
+        <Texture Name="gMsgKanji82A8HiraganaOTex" OutName="msg_kanji_82A8_hiragana_o" Format="i4" Width="16" Height="16" Offset="0x6C80"/>
+        <Texture Name="gMsgKanji82A9HiraganaKaTex" OutName="msg_kanji_82A9_hiragana_ka" Format="i4" Width="16" Height="16" Offset="0x6D00"/>
+        <Texture Name="gMsgKanji82AAHiraganaGaTex" OutName="msg_kanji_82AA_hiragana_ga" Format="i4" Width="16" Height="16" Offset="0x6D80"/>
+        <Texture Name="gMsgKanji82ABHiraganaKiTex" OutName="msg_kanji_82AB_hiragana_ki" Format="i4" Width="16" Height="16" Offset="0x6E00"/>
+        <Texture Name="gMsgKanji82ACHiraganaGiTex" OutName="msg_kanji_82AC_hiragana_gi" Format="i4" Width="16" Height="16" Offset="0x6E80"/>
+        <Texture Name="gMsgKanji82ADHiraganaKuTex" OutName="msg_kanji_82AD_hiragana_ku" Format="i4" Width="16" Height="16" Offset="0x6F00"/>
+        <Texture Name="gMsgKanji82AEHiraganaGuTex" OutName="msg_kanji_82AE_hiragana_gu" Format="i4" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="gMsgKanji82AFHiraganaKeTex" OutName="msg_kanji_82AF_hiragana_ke" Format="i4" Width="16" Height="16" Offset="0x7000"/>
+        <Texture Name="gMsgKanji82B0HiraganaGeTex" OutName="msg_kanji_82B0_hiragana_ge" Format="i4" Width="16" Height="16" Offset="0x7080"/>
+        <Texture Name="gMsgKanji82B1HiraganaKoTex" OutName="msg_kanji_82B1_hiragana_ko" Format="i4" Width="16" Height="16" Offset="0x7100"/>
+        <Texture Name="gMsgKanji82B2HiraganaGoTex" OutName="msg_kanji_82B2_hiragana_go" Format="i4" Width="16" Height="16" Offset="0x7180"/>
+        <Texture Name="gMsgKanji82B3HiraganaSaTex" OutName="msg_kanji_82B3_hiragana_sa" Format="i4" Width="16" Height="16" Offset="0x7200"/>
+        <Texture Name="gMsgKanji82B4HiraganaZaTex" OutName="msg_kanji_82B4_hiragana_za" Format="i4" Width="16" Height="16" Offset="0x7280"/>
+        <Texture Name="gMsgKanji82B5HiraganaShiTex" OutName="msg_kanji_82B5_hiragana_shi" Format="i4" Width="16" Height="16" Offset="0x7300"/>
+        <Texture Name="gMsgKanji82B6HiraganaJiTex" OutName="msg_kanji_82B6_hiragana_ji" Format="i4" Width="16" Height="16" Offset="0x7380"/>
+        <Texture Name="gMsgKanji82B7HiraganaSuTex" OutName="msg_kanji_82B7_hiragana_su" Format="i4" Width="16" Height="16" Offset="0x7400"/>
+        <Texture Name="gMsgKanji82B8HiraganaZuTex" OutName="msg_kanji_82B8_hiragana_zu" Format="i4" Width="16" Height="16" Offset="0x7480"/>
+        <Texture Name="gMsgKanji82B9HiraganaSeTex" OutName="msg_kanji_82B9_hiragana_se" Format="i4" Width="16" Height="16" Offset="0x7500"/>
+        <Texture Name="gMsgKanji82BAHiraganaZeTex" OutName="msg_kanji_82BA_hiragana_ze" Format="i4" Width="16" Height="16" Offset="0x7580"/>
+        <Texture Name="gMsgKanji82BBHiraganaSoTex" OutName="msg_kanji_82BB_hiragana_so" Format="i4" Width="16" Height="16" Offset="0x7600"/>
+        <Texture Name="gMsgKanji82BCHiraganaZoTex" OutName="msg_kanji_82BC_hiragana_zo" Format="i4" Width="16" Height="16" Offset="0x7680"/>
+        <Texture Name="gMsgKanji82BDHiraganaTaTex" OutName="msg_kanji_82BD_hiragana_ta" Format="i4" Width="16" Height="16" Offset="0x7700"/>
+        <Texture Name="gMsgKanji82BEHiraganaDaTex" OutName="msg_kanji_82BE_hiragana_da" Format="i4" Width="16" Height="16" Offset="0x7780"/>
+        <Texture Name="gMsgKanji82BFHiraganaChiTex" OutName="msg_kanji_82BF_hiragana_chi" Format="i4" Width="16" Height="16" Offset="0x7800"/>
+        <Texture Name="gMsgKanji82C0HiraganaDiTex" OutName="msg_kanji_82C0_hiragana_di" Format="i4" Width="16" Height="16" Offset="0x7880"/>
+        <Texture Name="gMsgKanji82C1HiraganaSmallTsuTex" OutName="msg_kanji_82C1_hiragana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x7900"/>
+        <Texture Name="gMsgKanji82C2HiraganaTsuTex" OutName="msg_kanji_82C2_hiragana_tsu" Format="i4" Width="16" Height="16" Offset="0x7980"/>
+        <Texture Name="gMsgKanji82C3HiraganaDuTex" OutName="msg_kanji_82C3_hiragana_du" Format="i4" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gMsgKanji82C4HiraganaTeTex" OutName="msg_kanji_82C4_hiragana_te" Format="i4" Width="16" Height="16" Offset="0x7A80"/>
+        <Texture Name="gMsgKanji82C5HiraganaDeTex" OutName="msg_kanji_82C5_hiragana_de" Format="i4" Width="16" Height="16" Offset="0x7B00"/>
+        <Texture Name="gMsgKanji82C6HiraganaToTex" OutName="msg_kanji_82C6_hiragana_to" Format="i4" Width="16" Height="16" Offset="0x7B80"/>
+        <Texture Name="gMsgKanji82C7HiraganaDoTex" OutName="msg_kanji_82C7_hiragana_do" Format="i4" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gMsgKanji82C8HiraganaNaTex" OutName="msg_kanji_82C8_hiragana_na" Format="i4" Width="16" Height="16" Offset="0x7C80"/>
+        <Texture Name="gMsgKanji82C9HiraganaNiTex" OutName="msg_kanji_82C9_hiragana_ni" Format="i4" Width="16" Height="16" Offset="0x7D00"/>
+        <Texture Name="gMsgKanji82CAHiraganaNuTex" OutName="msg_kanji_82CA_hiragana_nu" Format="i4" Width="16" Height="16" Offset="0x7D80"/>
+        <Texture Name="gMsgKanji82CBHiraganaNeTex" OutName="msg_kanji_82CB_hiragana_ne" Format="i4" Width="16" Height="16" Offset="0x7E00"/>
+        <Texture Name="gMsgKanji82CCHiraganaNoTex" OutName="msg_kanji_82CC_hiragana_no" Format="i4" Width="16" Height="16" Offset="0x7E80"/>
+        <Texture Name="gMsgKanji82CDHiraganaHaTex" OutName="msg_kanji_82CD_hiragana_ha" Format="i4" Width="16" Height="16" Offset="0x7F00"/>
+        <Texture Name="gMsgKanji82CEHiraganaBaTex" OutName="msg_kanji_82CE_hiragana_ba" Format="i4" Width="16" Height="16" Offset="0x7F80"/>
+        <Texture Name="gMsgKanji82CFHiraganaPaTex" OutName="msg_kanji_82CF_hiragana_pa" Format="i4" Width="16" Height="16" Offset="0x8000"/>
+        <Texture Name="gMsgKanji82D0HiraganaHiTex" OutName="msg_kanji_82D0_hiragana_hi" Format="i4" Width="16" Height="16" Offset="0x8080"/>
+        <Texture Name="gMsgKanji82D1HiraganaBiTex" OutName="msg_kanji_82D1_hiragana_bi" Format="i4" Width="16" Height="16" Offset="0x8100"/>
+        <Texture Name="gMsgKanji82D2HiraganaPiTex" OutName="msg_kanji_82D2_hiragana_pi" Format="i4" Width="16" Height="16" Offset="0x8180"/>
+        <Texture Name="gMsgKanji82D3HiraganaFuTex" OutName="msg_kanji_82D3_hiragana_fu" Format="i4" Width="16" Height="16" Offset="0x8200"/>
+        <Texture Name="gMsgKanji82D4HiraganaBuTex" OutName="msg_kanji_82D4_hiragana_bu" Format="i4" Width="16" Height="16" Offset="0x8280"/>
+        <Texture Name="gMsgKanji82D5HiraganaPuTex" OutName="msg_kanji_82D5_hiragana_pu" Format="i4" Width="16" Height="16" Offset="0x8300"/>
+        <Texture Name="gMsgKanji82D6HiraganaHeTex" OutName="msg_kanji_82D6_hiragana_he" Format="i4" Width="16" Height="16" Offset="0x8380"/>
+        <Texture Name="gMsgKanji82D7HiraganaBeTex" OutName="msg_kanji_82D7_hiragana_be" Format="i4" Width="16" Height="16" Offset="0x8400"/>
+        <Texture Name="gMsgKanji82D8HiraganaPeTex" OutName="msg_kanji_82D8_hiragana_pe" Format="i4" Width="16" Height="16" Offset="0x8480"/>
+        <Texture Name="gMsgKanji82D9HiraganaHoTex" OutName="msg_kanji_82D9_hiragana_ho" Format="i4" Width="16" Height="16" Offset="0x8500"/>
+        <Texture Name="gMsgKanji82DAHiraganaBoTex" OutName="msg_kanji_82DA_hiragana_bo" Format="i4" Width="16" Height="16" Offset="0x8580"/>
+        <Texture Name="gMsgKanji82DBHiraganaPoTex" OutName="msg_kanji_82DB_hiragana_po" Format="i4" Width="16" Height="16" Offset="0x8600"/>
+        <Texture Name="gMsgKanji82DCHiraganaMaTex" OutName="msg_kanji_82DC_hiragana_ma" Format="i4" Width="16" Height="16" Offset="0x8680"/>
+        <Texture Name="gMsgKanji82DDHiraganaMiTex" OutName="msg_kanji_82DD_hiragana_mi" Format="i4" Width="16" Height="16" Offset="0x8700"/>
+        <Texture Name="gMsgKanji82DEHiraganaMuTex" OutName="msg_kanji_82DE_hiragana_mu" Format="i4" Width="16" Height="16" Offset="0x8780"/>
+        <Texture Name="gMsgKanji82DFHiraganaMeTex" OutName="msg_kanji_82DF_hiragana_me" Format="i4" Width="16" Height="16" Offset="0x8800"/>
+        <Texture Name="gMsgKanji82E0HiraganaMoTex" OutName="msg_kanji_82E0_hiragana_mo" Format="i4" Width="16" Height="16" Offset="0x8880"/>
+        <Texture Name="gMsgKanji82E1HiraganaSmallYaTex" OutName="msg_kanji_82E1_hiragana_small_ya" Format="i4" Width="16" Height="16" Offset="0x8900"/>
+        <Texture Name="gMsgKanji82E2HiraganaYaTex" OutName="msg_kanji_82E2_hiragana_ya" Format="i4" Width="16" Height="16" Offset="0x8980"/>
+        <Texture Name="gMsgKanji82E3HiraganaSmallYuTex" OutName="msg_kanji_82E3_hiragana_small_yu" Format="i4" Width="16" Height="16" Offset="0x8A00"/>
+        <Texture Name="gMsgKanji82E4HiraganaYuTex" OutName="msg_kanji_82E4_hiragana_yu" Format="i4" Width="16" Height="16" Offset="0x8A80"/>
+        <Texture Name="gMsgKanji82E5HiraganaSmallYoTex" OutName="msg_kanji_82E5_hiragana_small_yo" Format="i4" Width="16" Height="16" Offset="0x8B00"/>
+        <Texture Name="gMsgKanji82E6HiraganaYoTex" OutName="msg_kanji_82E6_hiragana_yo" Format="i4" Width="16" Height="16" Offset="0x8B80"/>
+        <Texture Name="gMsgKanji82E7HiraganaRaTex" OutName="msg_kanji_82E7_hiragana_ra" Format="i4" Width="16" Height="16" Offset="0x8C00"/>
+        <Texture Name="gMsgKanji82E8HiraganaRiTex" OutName="msg_kanji_82E8_hiragana_ri" Format="i4" Width="16" Height="16" Offset="0x8C80"/>
+        <Texture Name="gMsgKanji82E9HiraganaRuTex" OutName="msg_kanji_82E9_hiragana_ru" Format="i4" Width="16" Height="16" Offset="0x8D00"/>
+        <Texture Name="gMsgKanji82EAHiraganaReTex" OutName="msg_kanji_82EA_hiragana_re" Format="i4" Width="16" Height="16" Offset="0x8D80"/>
+        <Texture Name="gMsgKanji82EBHiraganaRoTex" OutName="msg_kanji_82EB_hiragana_ro" Format="i4" Width="16" Height="16" Offset="0x8E00"/>
+        <Texture Name="gMsgKanji82ECHiraganaSmallWaTex" OutName="msg_kanji_82EC_hiragana_small_wa" Format="i4" Width="16" Height="16" Offset="0x8E80"/>
+        <Texture Name="gMsgKanji82EDHiraganaWaTex" OutName="msg_kanji_82ED_hiragana_wa" Format="i4" Width="16" Height="16" Offset="0x8F00"/>
+        <Texture Name="gMsgKanji82EEHiraganaWiTex" OutName="msg_kanji_82EE_hiragana_wi" Format="i4" Width="16" Height="16" Offset="0x8F80"/>
+        <Texture Name="gMsgKanji82EFHiraganaWeTex" OutName="msg_kanji_82EF_hiragana_we" Format="i4" Width="16" Height="16" Offset="0x9000"/>
+        <Texture Name="gMsgKanji82F0HiraganaWoTex" OutName="msg_kanji_82F0_hiragana_wo" Format="i4" Width="16" Height="16" Offset="0x9080"/>
+        <Texture Name="gMsgKanji82F1HiraganaNTex" OutName="msg_kanji_82F1_hiragana_n" Format="i4" Width="16" Height="16" Offset="0x9100"/>
+        <Texture Name="gMsgKanji82F2EmptyTex" OutName="msg_kanji_82F2_empty" Format="i4" Width="16" Height="16" Offset="0x9180"/>
+        <Texture Name="gMsgKanji8340KatakanaSmallATex" OutName="msg_kanji_8340_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x9200"/>
+        <Texture Name="gMsgKanji8341KatakanaATex" OutName="msg_kanji_8341_katakana_a" Format="i4" Width="16" Height="16" Offset="0x9280"/>
+        <Texture Name="gMsgKanji8342KatakanaSmallITex" OutName="msg_kanji_8342_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x9300"/>
+        <Texture Name="gMsgKanji8343KatakanaITex" OutName="msg_kanji_8343_katakana_i" Format="i4" Width="16" Height="16" Offset="0x9380"/>
+        <Texture Name="gMsgKanji8344KatakanaSmallUTex" OutName="msg_kanji_8344_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x9400"/>
+        <Texture Name="gMsgKanji8345KatakanaUTex" OutName="msg_kanji_8345_katakana_u" Format="i4" Width="16" Height="16" Offset="0x9480"/>
+        <Texture Name="gMsgKanji8346KatakanaSmallETex" OutName="msg_kanji_8346_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x9500"/>
+        <Texture Name="gMsgKanji8347KatakanaETex" OutName="msg_kanji_8347_katakana_e" Format="i4" Width="16" Height="16" Offset="0x9580"/>
+        <Texture Name="gMsgKanji8348KatakanaSmallOTex" OutName="msg_kanji_8348_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x9600"/>
+        <Texture Name="gMsgKanji8349KatakanaOTex" OutName="msg_kanji_8349_katakana_o" Format="i4" Width="16" Height="16" Offset="0x9680"/>
+        <Texture Name="gMsgKanji834AKatakanaKaTex" OutName="msg_kanji_834A_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x9700"/>
+        <Texture Name="gMsgKanji834BKatakanaGaTex" OutName="msg_kanji_834B_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x9780"/>
+        <Texture Name="gMsgKanji834CKatakanaKiTex" OutName="msg_kanji_834C_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x9800"/>
+        <Texture Name="gMsgKanji834DKatakanaGiTex" OutName="msg_kanji_834D_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x9880"/>
+        <Texture Name="gMsgKanji834EKatakanaKuTex" OutName="msg_kanji_834E_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x9900"/>
+        <Texture Name="gMsgKanji834FKatakanaGuTex" OutName="msg_kanji_834F_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x9980"/>
+        <Texture Name="gMsgKanji8350KatakanaKeTex" OutName="msg_kanji_8350_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x9A00"/>
+        <Texture Name="gMsgKanji8351KatakanaGeTex" OutName="msg_kanji_8351_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x9A80"/>
+        <Texture Name="gMsgKanji8352KatakanaKoTex" OutName="msg_kanji_8352_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x9B00"/>
+        <Texture Name="gMsgKanji8353KatakanaGoTex" OutName="msg_kanji_8353_katakana_go" Format="i4" Width="16" Height="16" Offset="0x9B80"/>
+        <Texture Name="gMsgKanji8354KatakanaSaTex" OutName="msg_kanji_8354_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x9C00"/>
+        <Texture Name="gMsgKanji8355KatakanaZaTex" OutName="msg_kanji_8355_katakana_za" Format="i4" Width="16" Height="16" Offset="0x9C80"/>
+        <Texture Name="gMsgKanji8356KatakanaShiTex" OutName="msg_kanji_8356_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x9D00"/>
+        <Texture Name="gMsgKanji8357KatakanaJiTex" OutName="msg_kanji_8357_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x9D80"/>
+        <Texture Name="gMsgKanji8358KatakanaSuTex" OutName="msg_kanji_8358_katakana_su" Format="i4" Width="16" Height="16" Offset="0x9E00"/>
+        <Texture Name="gMsgKanji8359KatakanaZuTex" OutName="msg_kanji_8359_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x9E80"/>
+        <Texture Name="gMsgKanji835AKatakanaSeTex" OutName="msg_kanji_835A_katakana_se" Format="i4" Width="16" Height="16" Offset="0x9F00"/>
+        <Texture Name="gMsgKanji835BKatakanaZeTex" OutName="msg_kanji_835B_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x9F80"/>
+        <Texture Name="gMsgKanji835CKatakanaSoTex" OutName="msg_kanji_835C_katakana_so" Format="i4" Width="16" Height="16" Offset="0xA000"/>
+        <Texture Name="gMsgKanji835DKatakanaZoTex" OutName="msg_kanji_835D_katakana_zo" Format="i4" Width="16" Height="16" Offset="0xA080"/>
+        <Texture Name="gMsgKanji835EKatakanaTaTex" OutName="msg_kanji_835E_katakana_ta" Format="i4" Width="16" Height="16" Offset="0xA100"/>
+        <Texture Name="gMsgKanji835FKatakanaDaTex" OutName="msg_kanji_835F_katakana_da" Format="i4" Width="16" Height="16" Offset="0xA180"/>
+        <Texture Name="gMsgKanji8360KatakanaChiTex" OutName="msg_kanji_8360_katakana_chi" Format="i4" Width="16" Height="16" Offset="0xA200"/>
+        <Texture Name="gMsgKanji8361KatakanaDiTex" OutName="msg_kanji_8361_katakana_di" Format="i4" Width="16" Height="16" Offset="0xA280"/>
+        <Texture Name="gMsgKanji8362KatakanaSmallTsuTex" OutName="msg_kanji_8362_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0xA300"/>
+        <Texture Name="gMsgKanji8363KatakanaTsuTex" OutName="msg_kanji_8363_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0xA380"/>
+        <Texture Name="gMsgKanji8364KatakanaDuTex" OutName="msg_kanji_8364_katakana_du" Format="i4" Width="16" Height="16" Offset="0xA400"/>
+        <Texture Name="gMsgKanji8365KatakanaTeTex" OutName="msg_kanji_8365_katakana_te" Format="i4" Width="16" Height="16" Offset="0xA480"/>
+        <Texture Name="gMsgKanji8366KatakanaDeTex" OutName="msg_kanji_8366_katakana_de" Format="i4" Width="16" Height="16" Offset="0xA500"/>
+        <Texture Name="gMsgKanji8367KatakanaToTex" OutName="msg_kanji_8367_katakana_to" Format="i4" Width="16" Height="16" Offset="0xA580"/>
+        <Texture Name="gMsgKanji8368KatakanaDoTex" OutName="msg_kanji_8368_katakana_do" Format="i4" Width="16" Height="16" Offset="0xA600"/>
+        <Texture Name="gMsgKanji8369KatakanaNaTex" OutName="msg_kanji_8369_katakana_na" Format="i4" Width="16" Height="16" Offset="0xA680"/>
+        <Texture Name="gMsgKanji836AKatakanaNiTex" OutName="msg_kanji_836A_katakana_ni" Format="i4" Width="16" Height="16" Offset="0xA700"/>
+        <Texture Name="gMsgKanji836BKatakanaNuTex" OutName="msg_kanji_836B_katakana_nu" Format="i4" Width="16" Height="16" Offset="0xA780"/>
+        <Texture Name="gMsgKanji836CKatakanaNeTex" OutName="msg_kanji_836C_katakana_ne" Format="i4" Width="16" Height="16" Offset="0xA800"/>
+        <Texture Name="gMsgKanji836DKatakanaNoTex" OutName="msg_kanji_836D_katakana_no" Format="i4" Width="16" Height="16" Offset="0xA880"/>
+        <Texture Name="gMsgKanji836EKatakanaHaTex" OutName="msg_kanji_836E_katakana_ha" Format="i4" Width="16" Height="16" Offset="0xA900"/>
+        <Texture Name="gMsgKanji836FKatakanaBaTex" OutName="msg_kanji_836F_katakana_ba" Format="i4" Width="16" Height="16" Offset="0xA980"/>
+        <Texture Name="gMsgKanji8370KatakanaPaTex" OutName="msg_kanji_8370_katakana_pa" Format="i4" Width="16" Height="16" Offset="0xAA00"/>
+        <Texture Name="gMsgKanji8371KatakanaHiTex" OutName="msg_kanji_8371_katakana_hi" Format="i4" Width="16" Height="16" Offset="0xAA80"/>
+        <Texture Name="gMsgKanji8372KatakanaBiTex" OutName="msg_kanji_8372_katakana_bi" Format="i4" Width="16" Height="16" Offset="0xAB00"/>
+        <Texture Name="gMsgKanji8373KatakanaPiTex" OutName="msg_kanji_8373_katakana_pi" Format="i4" Width="16" Height="16" Offset="0xAB80"/>
+        <Texture Name="gMsgKanji8374KatakanaFuTex" OutName="msg_kanji_8374_katakana_fu" Format="i4" Width="16" Height="16" Offset="0xAC00"/>
+        <Texture Name="gMsgKanji8375KatakanaBuTex" OutName="msg_kanji_8375_katakana_bu" Format="i4" Width="16" Height="16" Offset="0xAC80"/>
+        <Texture Name="gMsgKanji8376KatakanaPuTex" OutName="msg_kanji_8376_katakana_pu" Format="i4" Width="16" Height="16" Offset="0xAD00"/>
+        <Texture Name="gMsgKanji8377KatakanaHeTex" OutName="msg_kanji_8377_katakana_he" Format="i4" Width="16" Height="16" Offset="0xAD80"/>
+        <Texture Name="gMsgKanji8378KatakanaBeTex" OutName="msg_kanji_8378_katakana_be" Format="i4" Width="16" Height="16" Offset="0xAE00"/>
+        <Texture Name="gMsgKanji8379KatakanaPeTex" OutName="msg_kanji_8379_katakana_pe" Format="i4" Width="16" Height="16" Offset="0xAE80"/>
+        <Texture Name="gMsgKanji837AKatakanaHoTex" OutName="msg_kanji_837A_katakana_ho" Format="i4" Width="16" Height="16" Offset="0xAF00"/>
+        <Texture Name="gMsgKanji837BKatakanaBoTex" OutName="msg_kanji_837B_katakana_bo" Format="i4" Width="16" Height="16" Offset="0xAF80"/>
+        <Texture Name="gMsgKanji837CKatakanaPoTex" OutName="msg_kanji_837C_katakana_po" Format="i4" Width="16" Height="16" Offset="0xB000"/>
+        <Texture Name="gMsgKanji837DKatakanaMaTex" OutName="msg_kanji_837D_katakana_ma" Format="i4" Width="16" Height="16" Offset="0xB080"/>
+        <Texture Name="gMsgKanji837EKatakanaMiTex" OutName="msg_kanji_837E_katakana_mi" Format="i4" Width="16" Height="16" Offset="0xB100"/>
+        <Texture Name="gMsgKanji8380KatakanaMuTex" OutName="msg_kanji_8380_katakana_mu" Format="i4" Width="16" Height="16" Offset="0xB180"/>
+        <Texture Name="gMsgKanji8381KatakanaMeTex" OutName="msg_kanji_8381_katakana_me" Format="i4" Width="16" Height="16" Offset="0xB200"/>
+        <Texture Name="gMsgKanji8382KatakanaMoTex" OutName="msg_kanji_8382_katakana_mo" Format="i4" Width="16" Height="16" Offset="0xB280"/>
+        <Texture Name="gMsgKanji8383KatakanaSmallYaTex" OutName="msg_kanji_8383_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0xB300"/>
+        <Texture Name="gMsgKanji8384KatakanaYaTex" OutName="msg_kanji_8384_katakana_ya" Format="i4" Width="16" Height="16" Offset="0xB380"/>
+        <Texture Name="gMsgKanji8385KatakanaSmallYuTex" OutName="msg_kanji_8385_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0xB400"/>
+        <Texture Name="gMsgKanji8386KatakanaYuTex" OutName="msg_kanji_8386_katakana_yu" Format="i4" Width="16" Height="16" Offset="0xB480"/>
+        <Texture Name="gMsgKanji8387KatakanaSmallYoTex" OutName="msg_kanji_8387_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0xB500"/>
+        <Texture Name="gMsgKanji8388KatakanaYoTex" OutName="msg_kanji_8388_katakana_yo" Format="i4" Width="16" Height="16" Offset="0xB580"/>
+        <Texture Name="gMsgKanji8389KatakanaRaTex" OutName="msg_kanji_8389_katakana_ra" Format="i4" Width="16" Height="16" Offset="0xB600"/>
+        <Texture Name="gMsgKanji838AKatakanaRiTex" OutName="msg_kanji_838A_katakana_ri" Format="i4" Width="16" Height="16" Offset="0xB680"/>
+        <Texture Name="gMsgKanji838BKatakanaRuTex" OutName="msg_kanji_838B_katakana_ru" Format="i4" Width="16" Height="16" Offset="0xB700"/>
+        <Texture Name="gMsgKanji838CKatakanaReTex" OutName="msg_kanji_838C_katakana_re" Format="i4" Width="16" Height="16" Offset="0xB780"/>
+        <Texture Name="gMsgKanji838DKatakanaRoTex" OutName="msg_kanji_838D_katakana_ro" Format="i4" Width="16" Height="16" Offset="0xB800"/>
+        <Texture Name="gMsgKanji838EKatakanaSmallWaTex" OutName="msg_kanji_838E_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0xB880"/>
+        <Texture Name="gMsgKanji838FKatakanaWaTex" OutName="msg_kanji_838F_katakana_wa" Format="i4" Width="16" Height="16" Offset="0xB900"/>
+        <Texture Name="gMsgKanji8390KatakanaWiTex" OutName="msg_kanji_8390_katakana_wi" Format="i4" Width="16" Height="16" Offset="0xB980"/>
+        <Texture Name="gMsgKanji8391KatakanaWeTex" OutName="msg_kanji_8391_katakana_we" Format="i4" Width="16" Height="16" Offset="0xBA00"/>
+        <Texture Name="gMsgKanji8392KatakanaWoTex" OutName="msg_kanji_8392_katakana_wo" Format="i4" Width="16" Height="16" Offset="0xBA80"/>
+        <Texture Name="gMsgKanji8393KatakanaNTex" OutName="msg_kanji_8393_katakana_n" Format="i4" Width="16" Height="16" Offset="0xBB00"/>
+        <Texture Name="gMsgKanji8394KatakanaVuTex" OutName="msg_kanji_8394_katakana_vu" Format="i4" Width="16" Height="16" Offset="0xBB80"/>
+        <Texture Name="gMsgKanji8395KatakanaSmallKaTex" OutName="msg_kanji_8395_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0xBC00"/>
+        <Texture Name="gMsgKanji8396KatakanaSmallKeTex" OutName="msg_kanji_8396_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0xBC80"/>
+        <!-- Button icons replace the start of Greek characters -->
+        <Texture Name="gMsgKanji839FButtonATex" OutName="msg_kanji_839F_button_a" Format="i4" Width="16" Height="16" Offset="0xBD00"/>
+        <Texture Name="gMsgKanji83A0ButtonBTex" OutName="msg_kanji_83A0_button_b" Format="i4" Width="16" Height="16" Offset="0xBD80"/>
+        <Texture Name="gMsgKanji83A1ButtonCTex" OutName="msg_kanji_83A1_button_c" Format="i4" Width="16" Height="16" Offset="0xBE00"/>
+        <Texture Name="gMsgKanji83A2ButtonLTex" OutName="msg_kanji_83A2_button_l" Format="i4" Width="16" Height="16" Offset="0xBE80"/>
+        <Texture Name="gMsgKanji83A3ButtonRTex" OutName="msg_kanji_83A3_button_r" Format="i4" Width="16" Height="16" Offset="0xBF00"/>
+        <Texture Name="gMsgKanji83A4ButtonZTex" OutName="msg_kanji_83A4_button_z" Format="i4" Width="16" Height="16" Offset="0xBF80"/>
+        <Texture Name="gMsgKanji83A5ButtonCUpTex" OutName="msg_kanji_83A5_button_c_up" Format="i4" Width="16" Height="16" Offset="0xC000"/>
+        <Texture Name="gMsgKanji83A6ButtonCDownTex" OutName="msg_kanji_83A6_button_c_down" Format="i4" Width="16" Height="16" Offset="0xC080"/>
+        <Texture Name="gMsgKanji83A7ButtonCLeftTex" OutName="msg_kanji_83A7_button_c_left" Format="i4" Width="16" Height="16" Offset="0xC100"/>
+        <Texture Name="gMsgKanji83A8ButtonCRightTex" OutName="msg_kanji_83A8_button_c_right" Format="i4" Width="16" Height="16" Offset="0xC180"/>
+        <Texture Name="gMsgKanji83A9ZTargetSignTex" OutName="msg_kanji_83A9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0xC200"/>
+        <Texture Name="gMsgKanji83AAControlStickTex" OutName="msg_kanji_83AA_control_stick" Format="i4" Width="16" Height="16" Offset="0xC280"/>
+        <Texture Name="gMsgKanji83ABGreekCapitalNuTex" OutName="msg_kanji_83AB_greek_capital_nu" Format="i4" Width="16" Height="16" Offset="0xC300"/>
+        <Texture Name="gMsgKanji83ACGreekCapitalXiTex" OutName="msg_kanji_83AC_greek_capital_xi" Format="i4" Width="16" Height="16" Offset="0xC380"/>
+        <Texture Name="gMsgKanji83ADGreekCapitalOmicronTex" OutName="msg_kanji_83AD_greek_capital_omicron" Format="i4" Width="16" Height="16" Offset="0xC400"/>
+        <Texture Name="gMsgKanji83AEGreekCapitalPiTex" OutName="msg_kanji_83AE_greek_capital_pi" Format="i4" Width="16" Height="16" Offset="0xC480"/>
+        <Texture Name="gMsgKanji83AFGreekCapitalRhoTex" OutName="msg_kanji_83AF_greek_capital_rho" Format="i4" Width="16" Height="16" Offset="0xC500"/>
+        <Texture Name="gMsgKanji83B0GreekCapitalSigmaTex" OutName="msg_kanji_83B0_greek_capital_sigma" Format="i4" Width="16" Height="16" Offset="0xC580"/>
+        <Texture Name="gMsgKanji83B1GreekCapitalTauTex" OutName="msg_kanji_83B1_greek_capital_tau" Format="i4" Width="16" Height="16" Offset="0xC600"/>
+        <Texture Name="gMsgKanji83B2GreekCapitalUpsilonTex" OutName="msg_kanji_83B2_greek_capital_upsilon" Format="i4" Width="16" Height="16" Offset="0xC680"/>
+        <Texture Name="gMsgKanji83B3GreekCapitalPhiTex" OutName="msg_kanji_83B3_greek_capital_phi" Format="i4" Width="16" Height="16" Offset="0xC700"/>
+        <Texture Name="gMsgKanji83B4GreekCapitalChiTex" OutName="msg_kanji_83B4_greek_capital_chi" Format="i4" Width="16" Height="16" Offset="0xC780"/>
+        <Texture Name="gMsgKanji83B5GreekCapitalPsiTex" OutName="msg_kanji_83B5_greek_capital_psi" Format="i4" Width="16" Height="16" Offset="0xC800"/>
+        <Texture Name="gMsgKanji83B6GreekCapitalOmegaTex" OutName="msg_kanji_83B6_greek_capital_omega" Format="i4" Width="16" Height="16" Offset="0xC880"/>
+        <Texture Name="gMsgKanji83BFGreekLowercaseAlphaTex" OutName="msg_kanji_83BF_greek_lowercase_alpha" Format="i4" Width="16" Height="16" Offset="0xC900"/>
+        <Texture Name="gMsgKanji83C0GreekLowercaseBetaTex" OutName="msg_kanji_83C0_greek_lowercase_beta" Format="i4" Width="16" Height="16" Offset="0xC980"/>
+        <Texture Name="gMsgKanji83C1GreekLowercaseGammaTex" OutName="msg_kanji_83C1_greek_lowercase_gamma" Format="i4" Width="16" Height="16" Offset="0xCA00"/>
+        <Texture Name="gMsgKanji83C2GreekLowercaseDeltaTex" OutName="msg_kanji_83C2_greek_lowercase_delta" Format="i4" Width="16" Height="16" Offset="0xCA80"/>
+        <Texture Name="gMsgKanji83C3GreekLowercaseEpsilonTex" OutName="msg_kanji_83C3_greek_lowercase_epsilon" Format="i4" Width="16" Height="16" Offset="0xCB00"/>
+        <Texture Name="gMsgKanji83C4GreekLowercaseZetaTex" OutName="msg_kanji_83C4_greek_lowercase_zeta" Format="i4" Width="16" Height="16" Offset="0xCB80"/>
+        <Texture Name="gMsgKanji83C5GreekLowercaseEtaTex" OutName="msg_kanji_83C5_greek_lowercase_eta" Format="i4" Width="16" Height="16" Offset="0xCC00"/>
+        <Texture Name="gMsgKanji83C6GreekLowercaseThetaTex" OutName="msg_kanji_83C6_greek_lowercase_theta" Format="i4" Width="16" Height="16" Offset="0xCC80"/>
+        <Texture Name="gMsgKanji83C7GreekLowercaseIotaTex" OutName="msg_kanji_83C7_greek_lowercase_iota" Format="i4" Width="16" Height="16" Offset="0xCD00"/>
+        <Texture Name="gMsgKanji83C8GreekLowercaseKappaTex" OutName="msg_kanji_83C8_greek_lowercase_kappa" Format="i4" Width="16" Height="16" Offset="0xCD80"/>
+        <Texture Name="gMsgKanji83C9GreekLowercaseLamdaTex" OutName="msg_kanji_83C9_greek_lowercase_lamda" Format="i4" Width="16" Height="16" Offset="0xCE00"/>
+        <Texture Name="gMsgKanji83CAGreekLowercaseMuTex" OutName="msg_kanji_83CA_greek_lowercase_mu" Format="i4" Width="16" Height="16" Offset="0xCE80"/>
+        <Texture Name="gMsgKanji83CBGreekLowercaseNuTex" OutName="msg_kanji_83CB_greek_lowercase_nu" Format="i4" Width="16" Height="16" Offset="0xCF00"/>
+        <Texture Name="gMsgKanji83CCGreekLowercaseXiTex" OutName="msg_kanji_83CC_greek_lowercase_xi" Format="i4" Width="16" Height="16" Offset="0xCF80"/>
+        <Texture Name="gMsgKanji83CDGreekLowercaseOmicronTex" OutName="msg_kanji_83CD_greek_lowercase_omicron" Format="i4" Width="16" Height="16" Offset="0xD000"/>
+        <Texture Name="gMsgKanji83CEGreekLowercasePiTex" OutName="msg_kanji_83CE_greek_lowercase_pi" Format="i4" Width="16" Height="16" Offset="0xD080"/>
+        <Texture Name="gMsgKanji83CFGreekLowercaseRhoTex" OutName="msg_kanji_83CF_greek_lowercase_rho" Format="i4" Width="16" Height="16" Offset="0xD100"/>
+        <Texture Name="gMsgKanji83D0GreekLowercaseSigmaTex" OutName="msg_kanji_83D0_greek_lowercase_sigma" Format="i4" Width="16" Height="16" Offset="0xD180"/>
+        <Texture Name="gMsgKanji83D1GreekLowercaseTauTex" OutName="msg_kanji_83D1_greek_lowercase_tau" Format="i4" Width="16" Height="16" Offset="0xD200"/>
+        <Texture Name="gMsgKanji83D2GreekLowercaseUpsilonTex" OutName="msg_kanji_83D2_greek_lowercase_upsilon" Format="i4" Width="16" Height="16" Offset="0xD280"/>
+        <Texture Name="gMsgKanji83D3GreekLowercasePhiTex" OutName="msg_kanji_83D3_greek_lowercase_phi" Format="i4" Width="16" Height="16" Offset="0xD300"/>
+        <Texture Name="gMsgKanji83D4GreekLowercaseChiTex" OutName="msg_kanji_83D4_greek_lowercase_chi" Format="i4" Width="16" Height="16" Offset="0xD380"/>
+        <Texture Name="gMsgKanji83D5GreekLowercasePsiTex" OutName="msg_kanji_83D5_greek_lowercase_psi" Format="i4" Width="16" Height="16" Offset="0xD400"/>
+        <Texture Name="gMsgKanji83D6GreekLowercaseOmegaTex" OutName="msg_kanji_83D6_greek_lowercase_omega" Format="i4" Width="16" Height="16" Offset="0xD480"/>
+        <Texture Name="gMsgKanji83D7EmptyTex" OutName="msg_kanji_83D7_empty" Format="i4" Width="16" Height="16" Offset="0xD500"/>
+        <!-- Hylian replaces the start of Cyrillic characters -->
+        <Texture Name="gMsgKanji8440HylianATex" OutName="msg_kanji_8440_hylian_a" Format="i4" Width="16" Height="16" Offset="0xD580"/>
+        <Texture Name="gMsgKanji8441HylianITex" OutName="msg_kanji_8441_hylian_i" Format="i4" Width="16" Height="16" Offset="0xD600"/>
+        <Texture Name="gMsgKanji8442HylianUTex" OutName="msg_kanji_8442_hylian_u" Format="i4" Width="16" Height="16" Offset="0xD680"/>
+        <Texture Name="gMsgKanji8443HylianETex" OutName="msg_kanji_8443_hylian_e" Format="i4" Width="16" Height="16" Offset="0xD700"/>
+        <Texture Name="gMsgKanji8444HylianOTex" OutName="msg_kanji_8444_hylian_o" Format="i4" Width="16" Height="16" Offset="0xD780"/>
+        <Texture Name="gMsgKanji8445HylianKaTex" OutName="msg_kanji_8445_hylian_ka" Format="i4" Width="16" Height="16" Offset="0xD800"/>
+        <Texture Name="gMsgKanji8446HylianKiTex" OutName="msg_kanji_8446_hylian_ki" Format="i4" Width="16" Height="16" Offset="0xD880"/>
+        <Texture Name="gMsgKanji8447HylianKuTex" OutName="msg_kanji_8447_hylian_ku" Format="i4" Width="16" Height="16" Offset="0xD900"/>
+        <Texture Name="gMsgKanji8448HylianKeTex" OutName="msg_kanji_8448_hylian_ke" Format="i4" Width="16" Height="16" Offset="0xD980"/>
+        <Texture Name="gMsgKanji8449HylianKoTex" OutName="msg_kanji_8449_hylian_ko" Format="i4" Width="16" Height="16" Offset="0xDA00"/>
+        <Texture Name="gMsgKanji844AHylianSaTex" OutName="msg_kanji_844A_hylian_sa" Format="i4" Width="16" Height="16" Offset="0xDA80"/>
+        <Texture Name="gMsgKanji844BHylianShiTex" OutName="msg_kanji_844B_hylian_shi" Format="i4" Width="16" Height="16" Offset="0xDB00"/>
+        <Texture Name="gMsgKanji844CHylianSuTex" OutName="msg_kanji_844C_hylian_su" Format="i4" Width="16" Height="16" Offset="0xDB80"/>
+        <Texture Name="gMsgKanji844DHylianSeTex" OutName="msg_kanji_844D_hylian_se" Format="i4" Width="16" Height="16" Offset="0xDC00"/>
+        <Texture Name="gMsgKanji844EHylianSoTex" OutName="msg_kanji_844E_hylian_so" Format="i4" Width="16" Height="16" Offset="0xDC80"/>
+        <Texture Name="gMsgKanji844FHylianTaTex" OutName="msg_kanji_844F_hylian_ta" Format="i4" Width="16" Height="16" Offset="0xDD00"/>
+        <Texture Name="gMsgKanji8450HylianChiTex" OutName="msg_kanji_8450_hylian_chi" Format="i4" Width="16" Height="16" Offset="0xDD80"/>
+        <Texture Name="gMsgKanji8451HylianTsuTex" OutName="msg_kanji_8451_hylian_tsu" Format="i4" Width="16" Height="16" Offset="0xDE00"/>
+        <Texture Name="gMsgKanji8452HylianTeTex" OutName="msg_kanji_8452_hylian_te" Format="i4" Width="16" Height="16" Offset="0xDE80"/>
+        <Texture Name="gMsgKanji8453HylianToTex" OutName="msg_kanji_8453_hylian_to" Format="i4" Width="16" Height="16" Offset="0xDF00"/>
+        <Texture Name="gMsgKanji8454HylianNaTex" OutName="msg_kanji_8454_hylian_na" Format="i4" Width="16" Height="16" Offset="0xDF80"/>
+        <Texture Name="gMsgKanji8455HylianNiTex" OutName="msg_kanji_8455_hylian_ni" Format="i4" Width="16" Height="16" Offset="0xE000"/>
+        <Texture Name="gMsgKanji8456HylianNuTex" OutName="msg_kanji_8456_hylian_nu" Format="i4" Width="16" Height="16" Offset="0xE080"/>
+        <Texture Name="gMsgKanji8457HylianNeTex" OutName="msg_kanji_8457_hylian_ne" Format="i4" Width="16" Height="16" Offset="0xE100"/>
+        <Texture Name="gMsgKanji8458HylianNoTex" OutName="msg_kanji_8458_hylian_no" Format="i4" Width="16" Height="16" Offset="0xE180"/>
+        <Texture Name="gMsgKanji8459HylianHaTex" OutName="msg_kanji_8459_hylian_ha" Format="i4" Width="16" Height="16" Offset="0xE200"/>
+        <Texture Name="gMsgKanji845AHylianHiTex" OutName="msg_kanji_845A_hylian_hi" Format="i4" Width="16" Height="16" Offset="0xE280"/>
+        <Texture Name="gMsgKanji845BHylianFuTex" OutName="msg_kanji_845B_hylian_fu" Format="i4" Width="16" Height="16" Offset="0xE300"/>
+        <Texture Name="gMsgKanji845CHylianHeTex" OutName="msg_kanji_845C_hylian_he" Format="i4" Width="16" Height="16" Offset="0xE380"/>
+        <Texture Name="gMsgKanji845DHylianHoTex" OutName="msg_kanji_845D_hylian_ho" Format="i4" Width="16" Height="16" Offset="0xE400"/>
+        <Texture Name="gMsgKanji845EHylianMaTex" OutName="msg_kanji_845E_hylian_ma" Format="i4" Width="16" Height="16" Offset="0xE480"/>
+        <Texture Name="gMsgKanji845FHylianMiTex" OutName="msg_kanji_845F_hylian_mi" Format="i4" Width="16" Height="16" Offset="0xE500"/>
+        <Texture Name="gMsgKanji8460HylianMuTex" OutName="msg_kanji_8460_hylian_mu" Format="i4" Width="16" Height="16" Offset="0xE580"/>
+        <Texture Name="gMsgKanji8470HylianMeTex" OutName="msg_kanji_8470_hylian_me" Format="i4" Width="16" Height="16" Offset="0xE600"/>
+        <Texture Name="gMsgKanji8471HylianMoTex" OutName="msg_kanji_8471_hylian_mo" Format="i4" Width="16" Height="16" Offset="0xE680"/>
+        <Texture Name="gMsgKanji8472HylianYaTex" OutName="msg_kanji_8472_hylian_ya" Format="i4" Width="16" Height="16" Offset="0xE700"/>
+        <Texture Name="gMsgKanji8473HylianYuTex" OutName="msg_kanji_8473_hylian_yu" Format="i4" Width="16" Height="16" Offset="0xE780"/>
+        <Texture Name="gMsgKanji8474HylianYoTex" OutName="msg_kanji_8474_hylian_yo" Format="i4" Width="16" Height="16" Offset="0xE800"/>
+        <Texture Name="gMsgKanji8475HylianRaTex" OutName="msg_kanji_8475_hylian_ra" Format="i4" Width="16" Height="16" Offset="0xE880"/>
+        <Texture Name="gMsgKanji8476HylianRiTex" OutName="msg_kanji_8476_hylian_ri" Format="i4" Width="16" Height="16" Offset="0xE900"/>
+        <Texture Name="gMsgKanji8477HylianRuTex" OutName="msg_kanji_8477_hylian_ru" Format="i4" Width="16" Height="16" Offset="0xE980"/>
+        <Texture Name="gMsgKanji8478HylianReTex" OutName="msg_kanji_8478_hylian_re" Format="i4" Width="16" Height="16" Offset="0xEA00"/>
+        <Texture Name="gMsgKanji8479HylianRoTex" OutName="msg_kanji_8479_hylian_ro" Format="i4" Width="16" Height="16" Offset="0xEA80"/>
+        <Texture Name="gMsgKanji847AHylianWaTex" OutName="msg_kanji_847A_hylian_wa" Format="i4" Width="16" Height="16" Offset="0xEB00"/>
+        <Texture Name="gMsgKanji847BHylianWoTex" OutName="msg_kanji_847B_hylian_wo" Format="i4" Width="16" Height="16" Offset="0xEB80"/>
+        <Texture Name="gMsgKanji847CHylianNTex" OutName="msg_kanji_847C_hylian_n" Format="i4" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="gMsgKanji847DHylianToutenTex" OutName="msg_kanji_847D_hylian_touten" Format="i4" Width="16" Height="16" Offset="0xEC80"/>
+        <Texture Name="gMsgKanji847EHylianKutenTex" OutName="msg_kanji_847E_hylian_kuten" Format="i4" Width="16" Height="16" Offset="0xED00"/>
+        <Texture Name="gMsgKanji8480CyrillicLowercaseOTex" OutName="msg_kanji_8480_cyrillic_lowercase_o" Format="i4" Width="16" Height="16" Offset="0xED80"/>
+        <Texture Name="gMsgKanji8481CyrillicLowercasePeTex" OutName="msg_kanji_8481_cyrillic_lowercase_pe" Format="i4" Width="16" Height="16" Offset="0xEE00"/>
+        <Texture Name="gMsgKanji8482CyrillicLowercaseErTex" OutName="msg_kanji_8482_cyrillic_lowercase_er" Format="i4" Width="16" Height="16" Offset="0xEE80"/>
+        <Texture Name="gMsgKanji8483CyrillicLowercaseEsTex" OutName="msg_kanji_8483_cyrillic_lowercase_es" Format="i4" Width="16" Height="16" Offset="0xEF00"/>
+        <Texture Name="gMsgKanji8484CyrillicLowercaseTeTex" OutName="msg_kanji_8484_cyrillic_lowercase_te" Format="i4" Width="16" Height="16" Offset="0xEF80"/>
+        <Texture Name="gMsgKanji8485CyrillicLowercaseUTex" OutName="msg_kanji_8485_cyrillic_lowercase_u" Format="i4" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="gMsgKanji8486CyrillicLowercaseEfTex" OutName="msg_kanji_8486_cyrillic_lowercase_ef" Format="i4" Width="16" Height="16" Offset="0xF080"/>
+        <Texture Name="gMsgKanji8487CyrillicLowercaseHaTex" OutName="msg_kanji_8487_cyrillic_lowercase_ha" Format="i4" Width="16" Height="16" Offset="0xF100"/>
+        <Texture Name="gMsgKanji8488CyrillicLowercaseTseTex" OutName="msg_kanji_8488_cyrillic_lowercase_tse" Format="i4" Width="16" Height="16" Offset="0xF180"/>
+        <Texture Name="gMsgKanji8489CyrillicLowercaseCheTex" OutName="msg_kanji_8489_cyrillic_lowercase_che" Format="i4" Width="16" Height="16" Offset="0xF200"/>
+        <Texture Name="gMsgKanji848ACyrillicLowercaseShaTex" OutName="msg_kanji_848A_cyrillic_lowercase_sha" Format="i4" Width="16" Height="16" Offset="0xF280"/>
+        <Texture Name="gMsgKanji848BCyrillicLowercaseShchaTex" OutName="msg_kanji_848B_cyrillic_lowercase_shcha" Format="i4" Width="16" Height="16" Offset="0xF300"/>
+        <Texture Name="gMsgKanji848CCyrillicLowercaseHardSignTex" OutName="msg_kanji_848C_cyrillic_lowercase_hard_sign" Format="i4" Width="16" Height="16" Offset="0xF380"/>
+        <Texture Name="gMsgKanji848DCyrillicLowercaseYeruTex" OutName="msg_kanji_848D_cyrillic_lowercase_yeru" Format="i4" Width="16" Height="16" Offset="0xF400"/>
+        <Texture Name="gMsgKanji848ECyrillicLowercaseSoftSignTex" OutName="msg_kanji_848E_cyrillic_lowercase_soft_sign" Format="i4" Width="16" Height="16" Offset="0xF480"/>
+        <Texture Name="gMsgKanji848FCyrillicLowercaseETex" OutName="msg_kanji_848F_cyrillic_lowercase_e" Format="i4" Width="16" Height="16" Offset="0xF500"/>
+        <Texture Name="gMsgKanji8490CyrillicLowercaseYuTex" OutName="msg_kanji_8490_cyrillic_lowercase_yu" Format="i4" Width="16" Height="16" Offset="0xF580"/>
+        <Texture Name="gMsgKanji8491CyrillicLowercaseYaTex" OutName="msg_kanji_8491_cyrillic_lowercase_ya" Format="i4" Width="16" Height="16" Offset="0xF600"/>
+        <Texture Name="gMsgKanji849FBoxThinHorizontalTex" OutName="msg_kanji_849F_box_thin_horizontal" Format="i4" Width="16" Height="16" Offset="0xF680"/>
+        <Texture Name="gMsgKanji84A0BoxThinVerticalTex" OutName="msg_kanji_84A0_box_thin_vertical" Format="i4" Width="16" Height="16" Offset="0xF700"/>
+        <Texture Name="gMsgKanji84A1BoxThinTopLeftTex" OutName="msg_kanji_84A1_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0xF780"/>
+        <Texture Name="gMsgKanji84A2BoxThinTopRightTex" OutName="msg_kanji_84A2_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0xF800"/>
+        <Texture Name="gMsgKanji84A3BoxThinBottomRightTex" OutName="msg_kanji_84A3_box_thin_bottom_right" Format="i4" Width="16" Height="16" Offset="0xF880"/>
+        <Texture Name="gMsgKanji84A4BoxThinBottomLeftTex" OutName="msg_kanji_84A4_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0xF900"/>
+        <Texture Name="gMsgKanji84A5BoxThinLeftTex" OutName="msg_kanji_84A5_box_thin_left" Format="i4" Width="16" Height="16" Offset="0xF980"/>
+        <Texture Name="gMsgKanji84A6BoxThinTopTex" OutName="msg_kanji_84A6_box_thin_top" Format="i4" Width="16" Height="16" Offset="0xFA00"/>
+        <Texture Name="gMsgKanji84A7BoxThinRightTex" OutName="msg_kanji_84A7_box_thin_right" Format="i4" Width="16" Height="16" Offset="0xFA80"/>
+        <Texture Name="gMsgKanji84A8BoxThinBottomTex" OutName="msg_kanji_84A8_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0xFB00"/>
+        <Texture Name="gMsgKanji84A9BoxThinCenterTex" OutName="msg_kanji_84A9_box_thin_center" Format="i4" Width="16" Height="16" Offset="0xFB80"/>
+        <Texture Name="gMsgKanji84AABoxThickHorizontalTex" OutName="msg_kanji_84AA_box_thick_horizontal" Format="i4" Width="16" Height="16" Offset="0xFC00"/>
+        <Texture Name="gMsgKanji84ABBoxThickVerticalTex" OutName="msg_kanji_84AB_box_thick_vertical" Format="i4" Width="16" Height="16" Offset="0xFC80"/>
+        <Texture Name="gMsgKanji84ACBoxThickTopLeftTex" OutName="msg_kanji_84AC_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0xFD00"/>
+        <Texture Name="gMsgKanji84ADBoxThickTopRightTex" OutName="msg_kanji_84AD_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0xFD80"/>
+        <Texture Name="gMsgKanji84AEBoxThickBottomRightTex" OutName="msg_kanji_84AE_box_thick_bottom_right" Format="i4" Width="16" Height="16" Offset="0xFE00"/>
+        <Texture Name="gMsgKanji84AFBoxThickBottomLeftTex" OutName="msg_kanji_84AF_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0xFE80"/>
+        <Texture Name="gMsgKanji84B0BoxThickLeftTex" OutName="msg_kanji_84B0_box_thick_left" Format="i4" Width="16" Height="16" Offset="0xFF00"/>
+        <Texture Name="gMsgKanji84B1BoxThickTopTex" OutName="msg_kanji_84B1_box_thick_top" Format="i4" Width="16" Height="16" Offset="0xFF80"/>
+        <Texture Name="gMsgKanji84B2BoxThickRightTex" OutName="msg_kanji_84B2_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x10000"/>
+        <Texture Name="gMsgKanji84B3BoxThickBottomTex" OutName="msg_kanji_84B3_box_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10080"/>
+        <Texture Name="gMsgKanji84B4BoxThickCenterTex" OutName="msg_kanji_84B4_box_thick_center" Format="i4" Width="16" Height="16" Offset="0x10100"/>
+        <Texture Name="gMsgKanji84B5BoxVertThickHorizThinLeftTex" OutName="msg_kanji_84B5_box_vert_thick_horiz_thin_left" Format="i4" Width="16" Height="16" Offset="0x10180"/>
+        <Texture Name="gMsgKanji84B6BoxVertThinHorizThickTopTex" OutName="msg_kanji_84B6_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x10200"/>
+        <Texture Name="gMsgKanji84B7BoxVertThickHorizThinRightTex" OutName="msg_kanji_84B7_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x10280"/>
+        <Texture Name="gMsgKanji84B8BoxVertThinHorizThickBottomTex" OutName="msg_kanji_84B8_box_vert_thin_horiz_thick_bottom" Format="i4" Width="16" Height="16" Offset="0x10300"/>
+        <Texture Name="gMsgKanji84B9BoxVertThinHorizThickCenterTex" OutName="msg_kanji_84B9_box_vert_thin_horiz_thick_center" Format="i4" Width="16" Height="16" Offset="0x10380"/>
+        <Texture Name="gMsgKanji84BABoxVertThinHorizThickLeftTex" OutName="msg_kanji_84BA_box_vert_thin_horiz_thick_left" Format="i4" Width="16" Height="16" Offset="0x10400"/>
+        <Texture Name="gMsgKanji84BBBoxVertThickHorizThinTopTex" OutName="msg_kanji_84BB_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x10480"/>
+        <Texture Name="gMsgKanji84BCBoxVertThinHorizThickRightTex" OutName="msg_kanji_84BC_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x10500"/>
+        <Texture Name="gMsgKanji84BDBoxVertThickHorizThinBottomTex" OutName="msg_kanji_84BD_box_vert_thick_horiz_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x10580"/>
+        <Texture Name="gMsgKanji84BEBoxVertThickHorizThinCenterTex" OutName="msg_kanji_84BE_box_vert_thick_horiz_thin_center" Format="i4" Width="16" Height="16" Offset="0x10600"/>
+        <Texture Name="gMsgKanji84BFEmptyTex" OutName="msg_kanji_84BF_empty" Format="i4" Width="16" Height="16" Offset="0x10680"/>
+        <Texture Name="gMsgKanji8540HalfwidthExclamationMarkTex" OutName="msg_kanji_8540_halfwidth_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x10700"/>
+        <Texture Name="gMsgKanji8541HalfwidthQuotationMarkTex" OutName="msg_kanji_8541_halfwidth_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x10780"/>
+        <Texture Name="gMsgKanji8542HalfwidthNumberSignTex" OutName="msg_kanji_8542_halfwidth_number_sign" Format="i4" Width="16" Height="16" Offset="0x10800"/>
+        <Texture Name="gMsgKanji8543HalfwidthDollarSignTex" OutName="msg_kanji_8543_halfwidth_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x10880"/>
+        <Texture Name="gMsgKanji8544HalfwidthPercentSignTex" OutName="msg_kanji_8544_halfwidth_percent_sign" Format="i4" Width="16" Height="16" Offset="0x10900"/>
+        <Texture Name="gMsgKanji8545HalfwidthAmpersandTex" OutName="msg_kanji_8545_halfwidth_ampersand" Format="i4" Width="16" Height="16" Offset="0x10980"/>
+        <Texture Name="gMsgKanji8546HalfwidthApostropheTex" OutName="msg_kanji_8546_halfwidth_apostrophe" Format="i4" Width="16" Height="16" Offset="0x10A00"/>
+        <Texture Name="gMsgKanji8547HalfwidthParenthesesLeftTex" OutName="msg_kanji_8547_halfwidth_parentheses_left" Format="i4" Width="16" Height="16" Offset="0x10A80"/>
+        <Texture Name="gMsgKanji8548HalfwidthParenthesesRightTex" OutName="msg_kanji_8548_halfwidth_parentheses_right" Format="i4" Width="16" Height="16" Offset="0x10B00"/>
+        <Texture Name="gMsgKanji8549HalfwidthAsteriskTex" OutName="msg_kanji_8549_halfwidth_asterisk" Format="i4" Width="16" Height="16" Offset="0x10B80"/>
+        <Texture Name="gMsgKanji854AHalfwidthPlusSignTex" OutName="msg_kanji_854A_halfwidth_plus_sign" Format="i4" Width="16" Height="16" Offset="0x10C00"/>
+        <Texture Name="gMsgKanji854BHalfwidthCommaTex" OutName="msg_kanji_854B_halfwidth_comma" Format="i4" Width="16" Height="16" Offset="0x10C80"/>
+        <Texture Name="gMsgKanji854CHalfwidthHyphenMinusTex" OutName="msg_kanji_854C_halfwidth_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x10D00"/>
+        <Texture Name="gMsgKanji854DHalfwidthPeriodTex" OutName="msg_kanji_854D_halfwidth_period" Format="i4" Width="16" Height="16" Offset="0x10D80"/>
+        <Texture Name="gMsgKanji854EHalfwidthSlashTex" OutName="msg_kanji_854E_halfwidth_slash" Format="i4" Width="16" Height="16" Offset="0x10E00"/>
+        <Texture Name="gMsgKanji854FHalfwidth0Tex" OutName="msg_kanji_854F_halfwidth_0" Format="i4" Width="16" Height="16" Offset="0x10E80"/>
+        <Texture Name="gMsgKanji8550Halfwidth1Tex" OutName="msg_kanji_8550_halfwidth_1" Format="i4" Width="16" Height="16" Offset="0x10F00"/>
+        <Texture Name="gMsgKanji8551Halfwidth2Tex" OutName="msg_kanji_8551_halfwidth_2" Format="i4" Width="16" Height="16" Offset="0x10F80"/>
+        <Texture Name="gMsgKanji8552Halfwidth3Tex" OutName="msg_kanji_8552_halfwidth_3" Format="i4" Width="16" Height="16" Offset="0x11000"/>
+        <Texture Name="gMsgKanji8553Halfwidth4Tex" OutName="msg_kanji_8553_halfwidth_4" Format="i4" Width="16" Height="16" Offset="0x11080"/>
+        <Texture Name="gMsgKanji855EHalfwidthQuestionMarkTex" OutName="msg_kanji_855E_halfwidth_question_mark" Format="i4" Width="16" Height="16" Offset="0x11100"/>
+        <Texture Name="gMsgKanji855FHalfwidthAtSignTex" OutName="msg_kanji_855F_halfwidth_at_sign" Format="i4" Width="16" Height="16" Offset="0x11180"/>
+        <Texture Name="gMsgKanji8560HalfwidthCapitalATex" OutName="msg_kanji_8560_halfwidth_capital_a" Format="i4" Width="16" Height="16" Offset="0x11200"/>
+        <Texture Name="gMsgKanji8561HalfwidthCapitalBTex" OutName="msg_kanji_8561_halfwidth_capital_b" Format="i4" Width="16" Height="16" Offset="0x11280"/>
+        <Texture Name="gMsgKanji8562HalfwidthCapitalCTex" OutName="msg_kanji_8562_halfwidth_capital_c" Format="i4" Width="16" Height="16" Offset="0x11300"/>
+        <Texture Name="gMsgKanji8563HalfwidthCapitalDTex" OutName="msg_kanji_8563_halfwidth_capital_d" Format="i4" Width="16" Height="16" Offset="0x11380"/>
+        <Texture Name="gMsgKanji8564HalfwidthCapitalETex" OutName="msg_kanji_8564_halfwidth_capital_e" Format="i4" Width="16" Height="16" Offset="0x11400"/>
+        <Texture Name="gMsgKanji8565HalfwidthCapitalFTex" OutName="msg_kanji_8565_halfwidth_capital_f" Format="i4" Width="16" Height="16" Offset="0x11480"/>
+        <Texture Name="gMsgKanji8566HalfwidthCapitalGTex" OutName="msg_kanji_8566_halfwidth_capital_g" Format="i4" Width="16" Height="16" Offset="0x11500"/>
+        <Texture Name="gMsgKanji8567HalfwidthCapitalHTex" OutName="msg_kanji_8567_halfwidth_capital_h" Format="i4" Width="16" Height="16" Offset="0x11580"/>
+        <Texture Name="gMsgKanji8568HalfwidthCapitalITex" OutName="msg_kanji_8568_halfwidth_capital_i" Format="i4" Width="16" Height="16" Offset="0x11600"/>
+        <Texture Name="gMsgKanji8569HalfwidthCapitalJTex" OutName="msg_kanji_8569_halfwidth_capital_j" Format="i4" Width="16" Height="16" Offset="0x11680"/>
+        <Texture Name="gMsgKanji856AHalfwidthCapitalKTex" OutName="msg_kanji_856A_halfwidth_capital_k" Format="i4" Width="16" Height="16" Offset="0x11700"/>
+        <Texture Name="gMsgKanji856BHalfwidthCapitalLTex" OutName="msg_kanji_856B_halfwidth_capital_l" Format="i4" Width="16" Height="16" Offset="0x11780"/>
+        <Texture Name="gMsgKanji856CHalfwidthCapitalMTex" OutName="msg_kanji_856C_halfwidth_capital_m" Format="i4" Width="16" Height="16" Offset="0x11800"/>
+        <Texture Name="gMsgKanji856DHalfwidthCapitalNTex" OutName="msg_kanji_856D_halfwidth_capital_n" Format="i4" Width="16" Height="16" Offset="0x11880"/>
+        <Texture Name="gMsgKanji856EHalfwidthCapitalOTex" OutName="msg_kanji_856E_halfwidth_capital_o" Format="i4" Width="16" Height="16" Offset="0x11900"/>
+        <Texture Name="gMsgKanji856FHalfwidthCapitalPTex" OutName="msg_kanji_856F_halfwidth_capital_p" Format="i4" Width="16" Height="16" Offset="0x11980"/>
+        <Texture Name="gMsgKanji8570HalfwidthCapitalQTex" OutName="msg_kanji_8570_halfwidth_capital_q" Format="i4" Width="16" Height="16" Offset="0x11A00"/>
+        <Texture Name="gMsgKanji8571HalfwidthCapitalRTex" OutName="msg_kanji_8571_halfwidth_capital_r" Format="i4" Width="16" Height="16" Offset="0x11A80"/>
+        <Texture Name="gMsgKanji857CHalfwidthSquareBracketRightTex" OutName="msg_kanji_857C_halfwidth_square_bracket_right" Format="i4" Width="16" Height="16" Offset="0x11B00"/>
+        <Texture Name="gMsgKanji857DHalfwidthCircumflexAccentTex" OutName="msg_kanji_857D_halfwidth_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x11B80"/>
+        <Texture Name="gMsgKanji857EEmptyTex" OutName="msg_kanji_857E_empty" Format="i4" Width="16" Height="16" Offset="0x11C00"/>
+        <Texture Name="gMsgKanji8580HalfwidthGraveAccentTex" OutName="msg_kanji_8580_halfwidth_grave_accent" Format="i4" Width="16" Height="16" Offset="0x11C80"/>
+        <Texture Name="gMsgKanji8581HalfwidthLowercaseATex" OutName="msg_kanji_8581_halfwidth_lowercase_a" Format="i4" Width="16" Height="16" Offset="0x11D00"/>
+        <Texture Name="gMsgKanji8582HalfwidthLowercaseBTex" OutName="msg_kanji_8582_halfwidth_lowercase_b" Format="i4" Width="16" Height="16" Offset="0x11D80"/>
+        <Texture Name="gMsgKanji8583HalfwidthLowercaseCTex" OutName="msg_kanji_8583_halfwidth_lowercase_c" Format="i4" Width="16" Height="16" Offset="0x11E00"/>
+        <Texture Name="gMsgKanji8584HalfwidthLowercaseDTex" OutName="msg_kanji_8584_halfwidth_lowercase_d" Format="i4" Width="16" Height="16" Offset="0x11E80"/>
+        <Texture Name="gMsgKanji8585HalfwidthLowercaseETex" OutName="msg_kanji_8585_halfwidth_lowercase_e" Format="i4" Width="16" Height="16" Offset="0x11F00"/>
+        <Texture Name="gMsgKanji8591HalfwidthLowercaseQTex" OutName="msg_kanji_8591_halfwidth_lowercase_q" Format="i4" Width="16" Height="16" Offset="0x11F80"/>
+        <Texture Name="gMsgKanji8592HalfwidthLowercaseRTex" OutName="msg_kanji_8592_halfwidth_lowercase_r" Format="i4" Width="16" Height="16" Offset="0x12000"/>
+        <Texture Name="gMsgKanji8593HalfwidthLowercaseSTex" OutName="msg_kanji_8593_halfwidth_lowercase_s" Format="i4" Width="16" Height="16" Offset="0x12080"/>
+        <Texture Name="gMsgKanji8594HalfwidthLowercaseTTex" OutName="msg_kanji_8594_halfwidth_lowercase_t" Format="i4" Width="16" Height="16" Offset="0x12100"/>
+        <Texture Name="gMsgKanji8595HalfwidthLowercaseUTex" OutName="msg_kanji_8595_halfwidth_lowercase_u" Format="i4" Width="16" Height="16" Offset="0x12180"/>
+        <Texture Name="gMsgKanji8596HalfwidthLowercaseVTex" OutName="msg_kanji_8596_halfwidth_lowercase_v" Format="i4" Width="16" Height="16" Offset="0x12200"/>
+        <Texture Name="gMsgKanji8597HalfwidthLowercaseWTex" OutName="msg_kanji_8597_halfwidth_lowercase_w" Format="i4" Width="16" Height="16" Offset="0x12280"/>
+        <Texture Name="gMsgKanji8598HalfwidthLowercaseXTex" OutName="msg_kanji_8598_halfwidth_lowercase_x" Format="i4" Width="16" Height="16" Offset="0x12300"/>
+        <Texture Name="gMsgKanji8599HalfwidthLowercaseYTex" OutName="msg_kanji_8599_halfwidth_lowercase_y" Format="i4" Width="16" Height="16" Offset="0x12380"/>
+        <Texture Name="gMsgKanji859AHalfwidthLowercaseZTex" OutName="msg_kanji_859A_halfwidth_lowercase_z" Format="i4" Width="16" Height="16" Offset="0x12400"/>
+        <Texture Name="gMsgKanji859FHalfwidthKutenTex" OutName="msg_kanji_859F_halfwidth_kuten" Format="i4" Width="16" Height="16" Offset="0x12480"/>
+        <Texture Name="gMsgKanji85A0HalfwidthKagikakkoLeftTex" OutName="msg_kanji_85A0_halfwidth_kagikakko_left" Format="i4" Width="16" Height="16" Offset="0x12500"/>
+        <Texture Name="gMsgKanji85A1HalfwidthKagikakkoRightTex" OutName="msg_kanji_85A1_halfwidth_kagikakko_right" Format="i4" Width="16" Height="16" Offset="0x12580"/>
+        <Texture Name="gMsgKanji85A2HalfwidthToutenTex" OutName="msg_kanji_85A2_halfwidth_touten" Format="i4" Width="16" Height="16" Offset="0x12600"/>
+        <Texture Name="gMsgKanji85A3HalfwidthNakatenTex" OutName="msg_kanji_85A3_halfwidth_nakaten" Format="i4" Width="16" Height="16" Offset="0x12680"/>
+        <Texture Name="gMsgKanji85A4HalfwidthKatakanaWoTex" OutName="msg_kanji_85A4_halfwidth_katakana_wo" Format="i4" Width="16" Height="16" Offset="0x12700"/>
+        <Texture Name="gMsgKanji85A5HalfwidthKatakanaSmallATex" OutName="msg_kanji_85A5_halfwidth_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x12780"/>
+        <Texture Name="gMsgKanji85A6HalfwidthKatakanaSmallITex" OutName="msg_kanji_85A6_halfwidth_katakana_small_i" Format="i4" Width="16" Height="16" Offset="0x12800"/>
+        <Texture Name="gMsgKanji85A7HalfwidthKatakanaSmallUTex" OutName="msg_kanji_85A7_halfwidth_katakana_small_u" Format="i4" Width="16" Height="16" Offset="0x12880"/>
+        <Texture Name="gMsgKanji85A8HalfwidthKatakanaSmallETex" OutName="msg_kanji_85A8_halfwidth_katakana_small_e" Format="i4" Width="16" Height="16" Offset="0x12900"/>
+        <Texture Name="gMsgKanji85A9HalfwidthKatakanaSmallOTex" OutName="msg_kanji_85A9_halfwidth_katakana_small_o" Format="i4" Width="16" Height="16" Offset="0x12980"/>
+        <Texture Name="gMsgKanji85AAHalfwidthKatakanaSmallYaTex" OutName="msg_kanji_85AA_halfwidth_katakana_small_ya" Format="i4" Width="16" Height="16" Offset="0x12A00"/>
+        <Texture Name="gMsgKanji85ABHalfwidthKatakanaSmallYuTex" OutName="msg_kanji_85AB_halfwidth_katakana_small_yu" Format="i4" Width="16" Height="16" Offset="0x12A80"/>
+        <Texture Name="gMsgKanji85ACHalfwidthKatakanaSmallYoTex" OutName="msg_kanji_85AC_halfwidth_katakana_small_yo" Format="i4" Width="16" Height="16" Offset="0x12B00"/>
+        <Texture Name="gMsgKanji85ADHalfwidthKatakanaSmallTsuTex" OutName="msg_kanji_85AD_halfwidth_katakana_small_tsu" Format="i4" Width="16" Height="16" Offset="0x12B80"/>
+        <Texture Name="gMsgKanji85B3HalfwidthKatakanaOTex" OutName="msg_kanji_85B3_halfwidth_katakana_o" Format="i4" Width="16" Height="16" Offset="0x12C00"/>
+        <Texture Name="gMsgKanji85B4HalfwidthKatakanaKaTex" OutName="msg_kanji_85B4_halfwidth_katakana_ka" Format="i4" Width="16" Height="16" Offset="0x12C80"/>
+        <Texture Name="gMsgKanji85B5HalfwidthKatakanaKiTex" OutName="msg_kanji_85B5_halfwidth_katakana_ki" Format="i4" Width="16" Height="16" Offset="0x12D00"/>
+        <Texture Name="gMsgKanji85B6HalfwidthKatakanaKuTex" OutName="msg_kanji_85B6_halfwidth_katakana_ku" Format="i4" Width="16" Height="16" Offset="0x12D80"/>
+        <Texture Name="gMsgKanji85B7HalfwidthKatakanaKeTex" OutName="msg_kanji_85B7_halfwidth_katakana_ke" Format="i4" Width="16" Height="16" Offset="0x12E00"/>
+        <Texture Name="gMsgKanji85B8HalfwidthKatakanaKoTex" OutName="msg_kanji_85B8_halfwidth_katakana_ko" Format="i4" Width="16" Height="16" Offset="0x12E80"/>
+        <Texture Name="gMsgKanji85B9HalfwidthKatakanaSaTex" OutName="msg_kanji_85B9_halfwidth_katakana_sa" Format="i4" Width="16" Height="16" Offset="0x12F00"/>
+        <Texture Name="gMsgKanji85BAHalfwidthKatakanaShiTex" OutName="msg_kanji_85BA_halfwidth_katakana_shi" Format="i4" Width="16" Height="16" Offset="0x12F80"/>
+        <Texture Name="gMsgKanji85BBHalfwidthKatakanaSuTex" OutName="msg_kanji_85BB_halfwidth_katakana_su" Format="i4" Width="16" Height="16" Offset="0x13000"/>
+        <Texture Name="gMsgKanji85BCHalfwidthKatakanaSeTex" OutName="msg_kanji_85BC_halfwidth_katakana_se" Format="i4" Width="16" Height="16" Offset="0x13080"/>
+        <Texture Name="gMsgKanji85BDHalfwidthKatakanaSoTex" OutName="msg_kanji_85BD_halfwidth_katakana_so" Format="i4" Width="16" Height="16" Offset="0x13100"/>
+        <Texture Name="gMsgKanji85BEHalfwidthKatakanaTaTex" OutName="msg_kanji_85BE_halfwidth_katakana_ta" Format="i4" Width="16" Height="16" Offset="0x13180"/>
+        <Texture Name="gMsgKanji85BFHalfwidthKatakanaChiTex" OutName="msg_kanji_85BF_halfwidth_katakana_chi" Format="i4" Width="16" Height="16" Offset="0x13200"/>
+        <Texture Name="gMsgKanji85C0HalfwidthKatakanaTsuTex" OutName="msg_kanji_85C0_halfwidth_katakana_tsu" Format="i4" Width="16" Height="16" Offset="0x13280"/>
+        <Texture Name="gMsgKanji85C1HalfwidthKatakanaTeTex" OutName="msg_kanji_85C1_halfwidth_katakana_te" Format="i4" Width="16" Height="16" Offset="0x13300"/>
+        <Texture Name="gMsgKanji85DBHalfwidthKatakanaNTex" OutName="msg_kanji_85DB_halfwidth_katakana_n" Format="i4" Width="16" Height="16" Offset="0x13380"/>
+        <Texture Name="gMsgKanji85DCHalfwidthDakutenTex" OutName="msg_kanji_85DC_halfwidth_dakuten" Format="i4" Width="16" Height="16" Offset="0x13400"/>
+        <Texture Name="gMsgKanji85DDHalfwidthHandakutenTex" OutName="msg_kanji_85DD_halfwidth_handakuten" Format="i4" Width="16" Height="16" Offset="0x13480"/>
+        <Texture Name="gMsgKanji85DEHalfwidthKatakanaWiTex" OutName="msg_kanji_85DE_halfwidth_katakana_wi" Format="i4" Width="16" Height="16" Offset="0x13500"/>
+        <Texture Name="gMsgKanji85DFHalfwidthKatakanaWeTex" OutName="msg_kanji_85DF_halfwidth_katakana_we" Format="i4" Width="16" Height="16" Offset="0x13580"/>
+        <Texture Name="gMsgKanji85E0HalfwidthKatakanaSmallWaTex" OutName="msg_kanji_85E0_halfwidth_katakana_small_wa" Format="i4" Width="16" Height="16" Offset="0x13600"/>
+        <Texture Name="gMsgKanji85E1HalfwidthKatakanaSmallKaTex" OutName="msg_kanji_85E1_halfwidth_katakana_small_ka" Format="i4" Width="16" Height="16" Offset="0x13680"/>
+        <Texture Name="gMsgKanji85E2HalfwidthKatakanaSmallKeTex" OutName="msg_kanji_85E2_halfwidth_katakana_small_ke" Format="i4" Width="16" Height="16" Offset="0x13700"/>
+        <Texture Name="gMsgKanji85E3HalfwidthKatakanaVuTex" OutName="msg_kanji_85E3_halfwidth_katakana_vu" Format="i4" Width="16" Height="16" Offset="0x13780"/>
+        <Texture Name="gMsgKanji85E4HalfwidthKatakanaGaTex" OutName="msg_kanji_85E4_halfwidth_katakana_ga" Format="i4" Width="16" Height="16" Offset="0x13800"/>
+        <Texture Name="gMsgKanji85E5HalfwidthKatakanaGiTex" OutName="msg_kanji_85E5_halfwidth_katakana_gi" Format="i4" Width="16" Height="16" Offset="0x13880"/>
+        <Texture Name="gMsgKanji85E6HalfwidthKatakanaGuTex" OutName="msg_kanji_85E6_halfwidth_katakana_gu" Format="i4" Width="16" Height="16" Offset="0x13900"/>
+        <Texture Name="gMsgKanji85E7HalfwidthKatakanaGeTex" OutName="msg_kanji_85E7_halfwidth_katakana_ge" Format="i4" Width="16" Height="16" Offset="0x13980"/>
+        <Texture Name="gMsgKanji85E8HalfwidthKatakanaGoTex" OutName="msg_kanji_85E8_halfwidth_katakana_go" Format="i4" Width="16" Height="16" Offset="0x13A00"/>
+        <Texture Name="gMsgKanji85E9HalfwidthKatakanaZaTex" OutName="msg_kanji_85E9_halfwidth_katakana_za" Format="i4" Width="16" Height="16" Offset="0x13A80"/>
+        <Texture Name="gMsgKanji85EAHalfwidthKatakanaJiTex" OutName="msg_kanji_85EA_halfwidth_katakana_ji" Format="i4" Width="16" Height="16" Offset="0x13B00"/>
+        <Texture Name="gMsgKanji85EBHalfwidthKatakanaZuTex" OutName="msg_kanji_85EB_halfwidth_katakana_zu" Format="i4" Width="16" Height="16" Offset="0x13B80"/>
+        <Texture Name="gMsgKanji85ECHalfwidthKatakanaZeTex" OutName="msg_kanji_85EC_halfwidth_katakana_ze" Format="i4" Width="16" Height="16" Offset="0x13C00"/>
+        <Texture Name="gMsgKanji85EDHalfwidthKatakanaZoTex" OutName="msg_kanji_85ED_halfwidth_katakana_zo" Format="i4" Width="16" Height="16" Offset="0x13C80"/>
+        <Texture Name="gMsgKanji85EEHalfwidthKatakanaDaTex" OutName="msg_kanji_85EE_halfwidth_katakana_da" Format="i4" Width="16" Height="16" Offset="0x13D00"/>
+        <Texture Name="gMsgKanji85EFHalfwidthKatakanaDiTex" OutName="msg_kanji_85EF_halfwidth_katakana_di" Format="i4" Width="16" Height="16" Offset="0x13D80"/>
+        <Texture Name="gMsgKanji85F0HalfwidthKatakanaDuTex" OutName="msg_kanji_85F0_halfwidth_katakana_du" Format="i4" Width="16" Height="16" Offset="0x13E00"/>
+        <Texture Name="gMsgKanji85F1HalfwidthKatakanaDeTex" OutName="msg_kanji_85F1_halfwidth_katakana_de" Format="i4" Width="16" Height="16" Offset="0x13E80"/>
+        <Texture Name="gMsgKanji85F2HalfwidthKatakanaDoTex" OutName="msg_kanji_85F2_halfwidth_katakana_do" Format="i4" Width="16" Height="16" Offset="0x13F00"/>
+        <Texture Name="gMsgKanji85F3HalfwidthKatakanaBaTex" OutName="msg_kanji_85F3_halfwidth_katakana_ba" Format="i4" Width="16" Height="16" Offset="0x13F80"/>
+        <Texture Name="gMsgKanji85F4HalfwidthKatakanaPaTex" OutName="msg_kanji_85F4_halfwidth_katakana_pa" Format="i4" Width="16" Height="16" Offset="0x14000"/>
+        <Texture Name="gMsgKanji85F5HalfwidthKatakanaBiTex" OutName="msg_kanji_85F5_halfwidth_katakana_bi" Format="i4" Width="16" Height="16" Offset="0x14080"/>
+        <Texture Name="gMsgKanji8640EmptyTex" OutName="msg_kanji_8640_empty" Format="i4" Width="16" Height="16" Offset="0x14100"/>
+        <Texture Name="gMsgKanji8641TategakiToutenTex" OutName="msg_kanji_8641_tategaki_touten" Format="i4" Width="16" Height="16" Offset="0x14180"/>
+        <Texture Name="gMsgKanji8642TategakiKutenTex" OutName="msg_kanji_8642_tategaki_kuten" Format="i4" Width="16" Height="16" Offset="0x14200"/>
+        <Texture Name="gMsgKanji8643HalfwidthHorizontalThinTex" OutName="msg_kanji_8643_halfwidth_horizontal_thin" Format="i4" Width="16" Height="16" Offset="0x14280"/>
+        <Texture Name="gMsgKanji8644HalfwidthHorizontalThickTex" OutName="msg_kanji_8644_halfwidth_horizontal_thick" Format="i4" Width="16" Height="16" Offset="0x14300"/>
+        <Texture Name="gMsgKanji8645HalfwidthVerticalThinTex" OutName="msg_kanji_8645_halfwidth_vertical_thin" Format="i4" Width="16" Height="16" Offset="0x14380"/>
+        <Texture Name="gMsgKanji8646HalfwidthVerticalThickTex" OutName="msg_kanji_8646_halfwidth_vertical_thick" Format="i4" Width="16" Height="16" Offset="0x14400"/>
+        <Texture Name="gMsgKanji8647HalfwidthHorizontalThinDottedTex" OutName="msg_kanji_8647_halfwidth_horizontal_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14480"/>
+        <Texture Name="gMsgKanji8648HalfwidthHorizontalThickDottedTex" OutName="msg_kanji_8648_halfwidth_horizontal_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14500"/>
+        <Texture Name="gMsgKanji8649HalfwidthVerticalThinDottedTex" OutName="msg_kanji_8649_halfwidth_vertical_thin_dotted" Format="i4" Width="16" Height="16" Offset="0x14580"/>
+        <Texture Name="gMsgKanji864AHalfwidthVerticalThickDottedTex" OutName="msg_kanji_864A_halfwidth_vertical_thick_dotted" Format="i4" Width="16" Height="16" Offset="0x14600"/>
+        <Texture Name="gMsgKanji864BHalfwidthHorizontalThinDotted2Tex" OutName="msg_kanji_864B_halfwidth_horizontal_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14680"/>
+        <Texture Name="gMsgKanji864CHalfwidthHorizontalThickDotted2Tex" OutName="msg_kanji_864C_halfwidth_horizontal_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14700"/>
+        <Texture Name="gMsgKanji864DHalfwidthVerticalThinDotted2Tex" OutName="msg_kanji_864D_halfwidth_vertical_thin_dotted2" Format="i4" Width="16" Height="16" Offset="0x14780"/>
+        <Texture Name="gMsgKanji864EHalfwidthVerticalThickDotted2Tex" OutName="msg_kanji_864E_halfwidth_vertical_thick_dotted2" Format="i4" Width="16" Height="16" Offset="0x14800"/>
+        <Texture Name="gMsgKanji864FHalfwidthBoxThinTopLeftTex" OutName="msg_kanji_864F_halfwidth_box_thin_top_left" Format="i4" Width="16" Height="16" Offset="0x14880"/>
+        <Texture Name="gMsgKanji8650VerticalFarRightTex" OutName="msg_kanji_8650_vertical_far_right" Format="i4" Width="16" Height="16" Offset="0x14900"/>
+        <Texture Name="gMsgKanji8651VerticalFarLeftTex" OutName="msg_kanji_8651_vertical_far_left" Format="i4" Width="16" Height="16" Offset="0x14980"/>
+        <Texture Name="gMsgKanji8652HalfwidthBoxThickTopLeftTex" OutName="msg_kanji_8652_halfwidth_box_thick_top_left" Format="i4" Width="16" Height="16" Offset="0x14A00"/>
+        <Texture Name="gMsgKanji8653HalfwidthBoxThinTopRightTex" OutName="msg_kanji_8653_halfwidth_box_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14A80"/>
+        <Texture Name="gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex" OutName="msg_kanji_8654_halfwidth_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14B00"/>
+        <Texture Name="gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex" OutName="msg_kanji_8655_halfwidth_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x14B80"/>
+        <Texture Name="gMsgKanji8656HalfwidthBoxThickTopRightTex" OutName="msg_kanji_8656_halfwidth_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x14C00"/>
+        <Texture Name="gMsgKanji8657HalfwidthBoxThinBottomLeftTex" OutName="msg_kanji_8657_halfwidth_box_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14C80"/>
+        <Texture Name="gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex" OutName="msg_kanji_8658_halfwidth_box_vert_thin_horiz_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D00"/>
+        <Texture Name="gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex" OutName="msg_kanji_8659_halfwidth_box_vert_thick_horiz_thin_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14D80"/>
+        <Texture Name="gMsgKanji865AHalfwidthBoxThickBottomLeftTex" OutName="msg_kanji_865A_halfwidth_box_thick_bottom_left" Format="i4" Width="16" Height="16" Offset="0x14E00"/>
+        <Texture Name="gMsgKanji865BTategakiChouonpuTex" OutName="msg_kanji_865B_tategaki_chouonpu" Format="i4" Width="16" Height="16" Offset="0x14E80"/>
+        <Texture Name="gMsgKanji865CTategakiDashTex" OutName="msg_kanji_865C_tategaki_dash" Format="i4" Width="16" Height="16" Offset="0x14F00"/>
+        <Texture Name="gMsgKanji865DTategakiHyphenTex" OutName="msg_kanji_865D_tategaki_hyphen" Format="i4" Width="16" Height="16" Offset="0x14F80"/>
+        <Texture Name="gMsgKanji869BHalfwidthNijyuukagikakkoRightTex" OutName="msg_kanji_869B_halfwidth_nijyuukagikakko_right" Format="i4" Width="16" Height="16" Offset="0x15000"/>
+        <Texture Name="gMsgKanji869CHalfwidthSumitsukikakkoLeftTex" OutName="msg_kanji_869C_halfwidth_sumitsukikakko_left" Format="i4" Width="16" Height="16" Offset="0x15080"/>
+        <Texture Name="gMsgKanji869DHalfwidthSumitsukikakkoRightTex" OutName="msg_kanji_869D_halfwidth_sumitsukikakko_right" Format="i4" Width="16" Height="16" Offset="0x15100"/>
+        <Texture Name="gMsgKanji869EHalfwidthHyphenTex" OutName="msg_kanji_869E_halfwidth_hyphen" Format="i4" Width="16" Height="16" Offset="0x15180"/>
+        <Texture Name="gMsgKanji869FEmptyTex" OutName="msg_kanji_869F_empty" Format="i4" Width="16" Height="16" Offset="0x15200"/>
+        <Texture Name="gMsgKanji86A0EmptyTex" OutName="msg_kanji_86A0_empty" Format="i4" Width="16" Height="16" Offset="0x15280"/>
+        <Texture Name="gMsgKanji86A1EmptyTex" OutName="msg_kanji_86A1_empty" Format="i4" Width="16" Height="16" Offset="0x15300"/>
+        <Texture Name="gMsgKanji86A2EmptyTex" OutName="msg_kanji_86A2_empty" Format="i4" Width="16" Height="16" Offset="0x15380"/>
+        <Texture Name="gMsgKanji86A3EmptyTex" OutName="msg_kanji_86A3_empty" Format="i4" Width="16" Height="16" Offset="0x15400"/>
+        <Texture Name="gMsgKanji86A4EmptyTex" OutName="msg_kanji_86A4_empty" Format="i4" Width="16" Height="16" Offset="0x15480"/>
+        <Texture Name="gMsgKanji86A5EmptyTex" OutName="msg_kanji_86A5_empty" Format="i4" Width="16" Height="16" Offset="0x15500"/>
+        <Texture Name="gMsgKanji86A6EmptyTex" OutName="msg_kanji_86A6_empty" Format="i4" Width="16" Height="16" Offset="0x15580"/>
+        <Texture Name="gMsgKanji86B3BoxVertThinHorizThickTopRightTex" OutName="msg_kanji_86B3_box_vert_thin_horiz_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15600"/>
+        <Texture Name="gMsgKanji86B4BoxVertThickHorizThinTopRightTex" OutName="msg_kanji_86B4_box_vert_thick_horiz_thin_top_right" Format="i4" Width="16" Height="16" Offset="0x15680"/>
+        <Texture Name="gMsgKanji86B5BoxThickTopRightTex" OutName="msg_kanji_86B5_box_thick_top_right" Format="i4" Width="16" Height="16" Offset="0x15700"/>
+        <Texture Name="gMsgKanji86C7BoxVertThinHorizThickRightTex" OutName="msg_kanji_86C7_box_vert_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15780"/>
+        <Texture Name="gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex" OutName="msg_kanji_86C8_box_top_thick_bottom_thin_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15800"/>
+        <Texture Name="gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex" OutName="msg_kanji_86C9_box_top_thin_bottom_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15880"/>
+        <Texture Name="gMsgKanji86CABoxVertThickHorizThinRightTex" OutName="msg_kanji_86CA_box_vert_thick_horiz_thin_right" Format="i4" Width="16" Height="16" Offset="0x15900"/>
+        <Texture Name="gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex" OutName="msg_kanji_86CB_box_top_thick_bottom_thin_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15980"/>
+        <Texture Name="gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex" OutName="msg_kanji_86CC_box_top_thin_bottom_thick_horiz_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A00"/>
+        <Texture Name="gMsgKanji86CDBoxThickRightTex" OutName="msg_kanji_86CD_box_thick_right" Format="i4" Width="16" Height="16" Offset="0x15A80"/>
+        <Texture Name="gMsgKanji86CEBoxThinTopTex" OutName="msg_kanji_86CE_box_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B00"/>
+        <Texture Name="gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex" OutName="msg_kanji_86CF_box_vert_thin_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15B80"/>
+        <Texture Name="gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex" OutName="msg_kanji_86D0_box_vert_thin_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C00"/>
+        <Texture Name="gMsgKanji86D1BoxVertThinHorizThickTopTex" OutName="msg_kanji_86D1_box_vert_thin_horiz_thick_top" Format="i4" Width="16" Height="16" Offset="0x15C80"/>
+        <Texture Name="gMsgKanji86D2BoxVertThickHorizThinTopTex" OutName="msg_kanji_86D2_box_vert_thick_horiz_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D00"/>
+        <Texture Name="gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex" OutName="msg_kanji_86D3_box_vert_thick_left_thick_right_thin_top" Format="i4" Width="16" Height="16" Offset="0x15D80"/>
+        <Texture Name="gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex" OutName="msg_kanji_86D4_box_vert_thick_left_thin_right_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E00"/>
+        <Texture Name="gMsgKanji86D5BoxThickTopTex" OutName="msg_kanji_86D5_box_thick_top" Format="i4" Width="16" Height="16" Offset="0x15E80"/>
+        <Texture Name="gMsgKanji86D6BoxThinBottomTex" OutName="msg_kanji_86D6_box_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F00"/>
+        <Texture Name="gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex" OutName="msg_kanji_86D7_box_vert_thin_left_thick_right_thin_bottom" Format="i4" Width="16" Height="16" Offset="0x15F80"/>
+        <Texture Name="gMsgKanji8740Circled1Tex" OutName="msg_kanji_8740_circled_1" Format="i4" Width="16" Height="16" Offset="0x16000"/>
+        <Texture Name="gMsgKanji8741Circled2Tex" OutName="msg_kanji_8741_circled_2" Format="i4" Width="16" Height="16" Offset="0x16080"/>
+        <Texture Name="gMsgKanji8742Circled3Tex" OutName="msg_kanji_8742_circled_3" Format="i4" Width="16" Height="16" Offset="0x16100"/>
+        <Texture Name="gMsgKanji8743Circled4Tex" OutName="msg_kanji_8743_circled_4" Format="i4" Width="16" Height="16" Offset="0x16180"/>
+        <Texture Name="gMsgKanji8744Circled5Tex" OutName="msg_kanji_8744_circled_5" Format="i4" Width="16" Height="16" Offset="0x16200"/>
+        <Texture Name="gMsgKanji8745Circled6Tex" OutName="msg_kanji_8745_circled_6" Format="i4" Width="16" Height="16" Offset="0x16280"/>
+        <Texture Name="gMsgKanji8746Circled7Tex" OutName="msg_kanji_8746_circled_7" Format="i4" Width="16" Height="16" Offset="0x16300"/>
+        <Texture Name="gMsgKanji8747Circled8Tex" OutName="msg_kanji_8747_circled_8" Format="i4" Width="16" Height="16" Offset="0x16380"/>
+        <Texture Name="gMsgKanji8748Circled9Tex" OutName="msg_kanji_8748_circled_9" Format="i4" Width="16" Height="16" Offset="0x16400"/>
+        <Texture Name="gMsgKanji8749Circled10Tex" OutName="msg_kanji_8749_circled_10" Format="i4" Width="16" Height="16" Offset="0x16480"/>
+        <Texture Name="gMsgKanji874ACircled11Tex" OutName="msg_kanji_874A_circled_11" Format="i4" Width="16" Height="16" Offset="0x16500"/>
+        <Texture Name="gMsgKanji874BCircled12Tex" OutName="msg_kanji_874B_circled_12" Format="i4" Width="16" Height="16" Offset="0x16580"/>
+        <Texture Name="gMsgKanji874CCircled13Tex" OutName="msg_kanji_874C_circled_13" Format="i4" Width="16" Height="16" Offset="0x16600"/>
+        <Texture Name="gMsgKanji874DCircled14Tex" OutName="msg_kanji_874D_circled_14" Format="i4" Width="16" Height="16" Offset="0x16680"/>
+        <Texture Name="gMsgKanji874ECircled15Tex" OutName="msg_kanji_874E_circled_15" Format="i4" Width="16" Height="16" Offset="0x16700"/>
+        <Texture Name="gMsgKanji874FCircled16Tex" OutName="msg_kanji_874F_circled_16" Format="i4" Width="16" Height="16" Offset="0x16780"/>
+        <Texture Name="gMsgKanji8750Circled17Tex" OutName="msg_kanji_8750_circled_17" Format="i4" Width="16" Height="16" Offset="0x16800"/>
+        <Texture Name="gMsgKanji8751Circled18Tex" OutName="msg_kanji_8751_circled_18" Format="i4" Width="16" Height="16" Offset="0x16880"/>
+        <Texture Name="gMsgKanji8752Circled19Tex" OutName="msg_kanji_8752_circled_19" Format="i4" Width="16" Height="16" Offset="0x16900"/>
+        <Texture Name="gMsgKanji8753Circled20Tex" OutName="msg_kanji_8753_circled_20" Format="i4" Width="16" Height="16" Offset="0x16980"/>
+        <Texture Name="gMsgKanji8754RomanNumeral1Tex" OutName="msg_kanji_8754_roman_numeral_1" Format="i4" Width="16" Height="16" Offset="0x16A00"/>
+        <Texture Name="gMsgKanji8755RomanNumeral2Tex" OutName="msg_kanji_8755_roman_numeral_2" Format="i4" Width="16" Height="16" Offset="0x16A80"/>
+        <Texture Name="gMsgKanji8756RomanNumeral3Tex" OutName="msg_kanji_8756_roman_numeral_3" Format="i4" Width="16" Height="16" Offset="0x16B00"/>
+        <Texture Name="gMsgKanji8757RomanNumeral4Tex" OutName="msg_kanji_8757_roman_numeral_4" Format="i4" Width="16" Height="16" Offset="0x16B80"/>
+        <Texture Name="gMsgKanji8758RomanNumeral5Tex" OutName="msg_kanji_8758_roman_numeral_5" Format="i4" Width="16" Height="16" Offset="0x16C00"/>
+        <Texture Name="gMsgKanji8791IdenticalToTex" OutName="msg_kanji_8791_identical_to" Format="i4" Width="16" Height="16" Offset="0x16C80"/>
+        <Texture Name="gMsgKanji8792IntegralTex" OutName="msg_kanji_8792_integral" Format="i4" Width="16" Height="16" Offset="0x16D00"/>
+        <Texture Name="gMsgKanji8793CountourIntegralTex" OutName="msg_kanji_8793_contour_integral" Format="i4" Width="16" Height="16" Offset="0x16D80"/>
+        <Texture Name="gMsgKanji8794SummationTex" OutName="msg_kanji_8794_summation" Format="i4" Width="16" Height="16" Offset="0x16E00"/>
+        <Texture Name="gMsgKanji8795SquareRootTex" OutName="msg_kanji_8795_square_root" Format="i4" Width="16" Height="16" Offset="0x16E80"/>
+        <Texture Name="gMsgKanji8796PerpendicularSymbolTex" OutName="msg_kanji_8796_perpendicular_symbol" Format="i4" Width="16" Height="16" Offset="0x16F00"/>
+        <Texture Name="gMsgKanji8797AngleTex" OutName="msg_kanji_8797_angle" Format="i4" Width="16" Height="16" Offset="0x16F80"/>
+        <Texture Name="gMsgKanji8798RightAngleTex" OutName="msg_kanji_8798_right_angle" Format="i4" Width="16" Height="16" Offset="0x17000"/>
+        <Texture Name="gMsgKanji8799RightTriangleTex" OutName="msg_kanji_8799_right_triangle" Format="i4" Width="16" Height="16" Offset="0x17080"/>
+        <Texture Name="gMsgKanji879ABecauseTex" OutName="msg_kanji_879A_because" Format="i4" Width="16" Height="16" Offset="0x17100"/>
+        <Texture Name="gMsgKanji879BIntersectionTex" OutName="msg_kanji_879B_intersection" Format="i4" Width="16" Height="16" Offset="0x17180"/>
+        <Texture Name="gMsgKanji879CUnionTex" OutName="msg_kanji_879C_union" Format="i4" Width="16" Height="16" Offset="0x17200"/>
+        <Texture Name="gMsgKanji879DEmptyTex" OutName="msg_kanji_879D_empty" Format="i4" Width="16" Height="16" Offset="0x17280"/>
+        <Texture Name="gMsgKanji879EEmptyTex" OutName="msg_kanji_879E_empty" Format="i4" Width="16" Height="16" Offset="0x17300"/>
+        <Texture Name="gMsgKanji879FHiraganaSmallATex" OutName="msg_kanji_879F_hiragana_small_a" Format="i4" Width="16" Height="16" Offset="0x17380"/>
+        <Texture Name="gMsgKanji87A0EmptyTex" OutName="msg_kanji_87A0_empty" Format="i4" Width="16" Height="16" Offset="0x17400"/>
+        <Texture Name="gMsgKanji87A1EmptyTex" OutName="msg_kanji_87A1_empty" Format="i4" Width="16" Height="16" Offset="0x17480"/>
+        <Texture Name="gMsgKanji87A2EmptyTex" OutName="msg_kanji_87A2_empty" Format="i4" Width="16" Height="16" Offset="0x17500"/>
+        <Texture Name="gMsgKanji87A3EmptyTex" OutName="msg_kanji_87A3_empty" Format="i4" Width="16" Height="16" Offset="0x17580"/>
+        <Texture Name="gMsgKanji87A4EmptyTex" OutName="msg_kanji_87A4_empty" Format="i4" Width="16" Height="16" Offset="0x17600"/>
+        <Texture Name="gMsgKanji87A5EmptyTex" OutName="msg_kanji_87A5_empty" Format="i4" Width="16" Height="16" Offset="0x17680"/>
+        <Texture Name="gMsgKanji87A6EmptyTex" OutName="msg_kanji_87A6_empty" Format="i4" Width="16" Height="16" Offset="0x17700"/>
+        <Texture Name="gMsgKanji87A7EmptyTex" OutName="msg_kanji_87A7_empty" Format="i4" Width="16" Height="16" Offset="0x17780"/>
+        <Texture Name="gMsgKanji87A8EmptyTex" OutName="msg_kanji_87A8_empty" Format="i4" Width="16" Height="16" Offset="0x17800"/>
+        <Texture Name="gMsgKanji87A9EmptyTex" OutName="msg_kanji_87A9_empty" Format="i4" Width="16" Height="16" Offset="0x17880"/>
+        <Texture Name="gMsgKanji87AAEmptyTex" OutName="msg_kanji_87AA_empty" Format="i4" Width="16" Height="16" Offset="0x17900"/>
+        <Texture Name="gMsgKanji87ABEmptyTex" OutName="msg_kanji_87AB_empty" Format="i4" Width="16" Height="16" Offset="0x17980"/>
+        <Texture Name="gMsgKanji87ACEmptyTex" OutName="msg_kanji_87AC_empty" Format="i4" Width="16" Height="16" Offset="0x17A00"/>
+        <Texture Name="gMsgKanji87ADEmptyTex" OutName="msg_kanji_87AD_empty" Format="i4" Width="16" Height="16" Offset="0x17A80"/>
+        <Texture Name="gMsgKanji87AEEmptyTex" OutName="msg_kanji_87AE_empty" Format="i4" Width="16" Height="16" Offset="0x17B00"/>
+        <Texture Name="gMsgKanji87AFEmptyTex" OutName="msg_kanji_87AF_empty" Format="i4" Width="16" Height="16" Offset="0x17B80"/>
+        <Texture Name="gMsgKanji87B0EmptyTex" OutName="msg_kanji_87B0_empty" Format="i4" Width="16" Height="16" Offset="0x17C00"/>
+        <Texture Name="gMsgKanji87B1EmptyTex" OutName="msg_kanji_87B1_empty" Format="i4" Width="16" Height="16" Offset="0x17C80"/>
+        <Texture Name="gMsgKanji87B2EmptyTex" OutName="msg_kanji_87B2_empty" Format="i4" Width="16" Height="16" Offset="0x17D00"/>
+        <Texture Name="gMsgKanji87B3EmptyTex" OutName="msg_kanji_87B3_empty" Format="i4" Width="16" Height="16" Offset="0x17D80"/>
+        <Texture Name="gMsgKanji87B4EmptyTex" OutName="msg_kanji_87B4_empty" Format="i4" Width="16" Height="16" Offset="0x17E00"/>
+        <Texture Name="gMsgKanji87B5EmptyTex" OutName="msg_kanji_87B5_empty" Format="i4" Width="16" Height="16" Offset="0x17E80"/>
+        <Texture Name="gMsgKanji87BDEmptyTex" OutName="msg_kanji_87BD_empty" Format="i4" Width="16" Height="16" Offset="0x17F00"/>
+        <Texture Name="gMsgKanji87BEEmptyTex" OutName="msg_kanji_87BE_empty" Format="i4" Width="16" Height="16" Offset="0x17F80"/>
+        <Texture Name="gMsgKanji87BFEmptyTex" OutName="msg_kanji_87BF_empty" Format="i4" Width="16" Height="16" Offset="0x18000"/>
+        <Texture Name="gMsgKanji87C0EmptyTex" OutName="msg_kanji_87C0_empty" Format="i4" Width="16" Height="16" Offset="0x18080"/>
+        <Texture Name="gMsgKanji87C1EmptyTex" OutName="msg_kanji_87C1_empty" Format="i4" Width="16" Height="16" Offset="0x18100"/>
+        <Texture Name="gMsgKanji87E5EmptyTex" OutName="msg_kanji_87E5_empty" Format="i4" Width="16" Height="16" Offset="0x18180"/>
+        <Texture Name="gMsgKanji87E6EmptyTex" OutName="msg_kanji_87E6_empty" Format="i4" Width="16" Height="16" Offset="0x18200"/>
+        <Texture Name="gMsgKanji87E7EmptyTex" OutName="msg_kanji_87E7_empty" Format="i4" Width="16" Height="16" Offset="0x18280"/>
+        <Texture Name="gMsgKanji87E8EmptyTex" OutName="msg_kanji_87E8_empty" Format="i4" Width="16" Height="16" Offset="0x18300"/>
+        <Texture Name="gMsgKanji87FAEmptyTex" OutName="msg_kanji_87FA_empty" Format="i4" Width="16" Height="16" Offset="0x18380"/>
+        <Texture Name="gMsgKanji87FBEmptyTex" OutName="msg_kanji_87FB_empty" Format="i4" Width="16" Height="16" Offset="0x18400"/>
+        <Texture Name="gMsgKanji87FCEmptyTex" OutName="msg_kanji_87FC_empty" Format="i4" Width="16" Height="16" Offset="0x18480"/>
+        <Texture Name="gMsgKanji8840KatakanaSmallATex" OutName="msg_kanji_8840_katakana_small_a" Format="i4" Width="16" Height="16" Offset="0x18500"/>
+        <Texture Name="gMsgKanji8841EmptyTex" OutName="msg_kanji_8841_empty" Format="i4" Width="16" Height="16" Offset="0x18580"/>
+        <Texture Name="gMsgKanji8842EmptyTex" OutName="msg_kanji_8842_empty" Format="i4" Width="16" Height="16" Offset="0x18600"/>
+        <Texture Name="gMsgKanji8843EmptyTex" OutName="msg_kanji_8843_empty" Format="i4" Width="16" Height="16" Offset="0x18680"/>
+        <Texture Name="gMsgKanji8844EmptyTex" OutName="msg_kanji_8844_empty" Format="i4" Width="16" Height="16" Offset="0x18700"/>
+        <Texture Name="gMsgKanji8845EmptyTex" OutName="msg_kanji_8845_empty" Format="i4" Width="16" Height="16" Offset="0x18780"/>
+        <Texture Name="gMsgKanji8846EmptyTex" OutName="msg_kanji_8846_empty" Format="i4" Width="16" Height="16" Offset="0x18800"/>
+        <Texture Name="gMsgKanji8847EmptyTex" OutName="msg_kanji_8847_empty" Format="i4" Width="16" Height="16" Offset="0x18880"/>
+        <Texture Name="gMsgKanji8848EmptyTex" OutName="msg_kanji_8848_empty" Format="i4" Width="16" Height="16" Offset="0x18900"/>
+        <Texture Name="gMsgKanji8849EmptyTex" OutName="msg_kanji_8849_empty" Format="i4" Width="16" Height="16" Offset="0x18980"/>
+        <Texture Name="gMsgKanji884AEmptyTex" OutName="msg_kanji_884A_empty" Format="i4" Width="16" Height="16" Offset="0x18A00"/>
+        <Texture Name="gMsgKanji884BEmptyTex" OutName="msg_kanji_884B_empty" Format="i4" Width="16" Height="16" Offset="0x18A80"/>
+        <Texture Name="gMsgKanji884CEmptyTex" OutName="msg_kanji_884C_empty" Format="i4" Width="16" Height="16" Offset="0x18B00"/>
+        <Texture Name="gMsgKanji884DEmptyTex" OutName="msg_kanji_884D_empty" Format="i4" Width="16" Height="16" Offset="0x18B80"/>
+        <Texture Name="gMsgKanji884EEmptyTex" OutName="msg_kanji_884E_empty" Format="i4" Width="16" Height="16" Offset="0x18C00"/>
+        <Texture Name="gMsgKanji884FEmptyTex" OutName="msg_kanji_884F_empty" Format="i4" Width="16" Height="16" Offset="0x18C80"/>
+        <Texture Name="gMsgKanji8850EmptyTex" OutName="msg_kanji_8850_empty" Format="i4" Width="16" Height="16" Offset="0x18D00"/>
+        <Texture Name="gMsgKanji8851EmptyTex" OutName="msg_kanji_8851_empty" Format="i4" Width="16" Height="16" Offset="0x18D80"/>
+        <Texture Name="gMsgKanji8852EmptyTex" OutName="msg_kanji_8852_empty" Format="i4" Width="16" Height="16" Offset="0x18E00"/>
+        <Texture Name="gMsgKanji8853EmptyTex" OutName="msg_kanji_8853_empty" Format="i4" Width="16" Height="16" Offset="0x18E80"/>
+        <Texture Name="gMsgKanji8854EmptyTex" OutName="msg_kanji_8854_empty" Format="i4" Width="16" Height="16" Offset="0x18F00"/>
+        <Texture Name="gMsgKanji8855EmptyTex" OutName="msg_kanji_8855_empty" Format="i4" Width="16" Height="16" Offset="0x18F80"/>
+        <Texture Name="gMsgKanji8856EmptyTex" OutName="msg_kanji_8856_empty" Format="i4" Width="16" Height="16" Offset="0x19000"/>
+        <Texture Name="gMsgKanji8857EmptyTex" OutName="msg_kanji_8857_empty" Format="i4" Width="16" Height="16" Offset="0x19080"/>
+        <Texture Name="gMsgKanji8858EmptyTex" OutName="msg_kanji_8858_empty" Format="i4" Width="16" Height="16" Offset="0x19100"/>
+        <Texture Name="gMsgKanji8859EmptyTex" OutName="msg_kanji_8859_empty" Format="i4" Width="16" Height="16" Offset="0x19180"/>
+        <Texture Name="gMsgKanji885AEmptyTex" OutName="msg_kanji_885A_empty" Format="i4" Width="16" Height="16" Offset="0x19200"/>
+        <Texture Name="gMsgKanji885BEmptyTex" OutName="msg_kanji_885B_empty" Format="i4" Width="16" Height="16" Offset="0x19280"/>
+        <Texture Name="gMsgKanji885CEmptyTex" OutName="msg_kanji_885C_empty" Format="i4" Width="16" Height="16" Offset="0x19300"/>
+        <Texture Name="gMsgKanji885DEmptyTex" OutName="msg_kanji_885D_empty" Format="i4" Width="16" Height="16" Offset="0x19380"/>
+        <Texture Name="gMsgKanji885EEmptyTex" OutName="msg_kanji_885E_empty" Format="i4" Width="16" Height="16" Offset="0x19400"/>
+        <Texture Name="gMsgKanji885FEmptyTex" OutName="msg_kanji_885F_empty" Format="i4" Width="16" Height="16" Offset="0x19480"/>
+        <Texture Name="gMsgKanji8860EmptyTex" OutName="msg_kanji_8860_empty" Format="i4" Width="16" Height="16" Offset="0x19500"/>
+        <Texture Name="gMsgKanji8861EmptyTex" OutName="msg_kanji_8861_empty" Format="i4" Width="16" Height="16" Offset="0x19580"/>
+        <Texture Name="gMsgKanji8862EmptyTex" OutName="msg_kanji_8862_empty" Format="i4" Width="16" Height="16" Offset="0x19600"/>
+        <Texture Name="gMsgKanji8863EmptyTex" OutName="msg_kanji_8863_empty" Format="i4" Width="16" Height="16" Offset="0x19680"/>
+        <Texture Name="gMsgKanji8864EmptyTex" OutName="msg_kanji_8864_empty" Format="i4" Width="16" Height="16" Offset="0x19700"/>
+        <Texture Name="gMsgKanji8865EmptyTex" OutName="msg_kanji_8865_empty" Format="i4" Width="16" Height="16" Offset="0x19780"/>
+        <Texture Name="gMsgKanji8866EmptyTex" OutName="msg_kanji_8866_empty" Format="i4" Width="16" Height="16" Offset="0x19800"/>
+        <Texture Name="gMsgKanji8867EmptyTex" OutName="msg_kanji_8867_empty" Format="i4" Width="16" Height="16" Offset="0x19880"/>
+        <Texture Name="gMsgKanji8868EmptyTex" OutName="msg_kanji_8868_empty" Format="i4" Width="16" Height="16" Offset="0x19900"/>
+        <Texture Name="gMsgKanji8869EmptyTex" OutName="msg_kanji_8869_empty" Format="i4" Width="16" Height="16" Offset="0x19980"/>
+        <Texture Name="gMsgKanji886AEmptyTex" OutName="msg_kanji_886A_empty" Format="i4" Width="16" Height="16" Offset="0x19A00"/>
+        <Texture Name="gMsgKanji886BEmptyTex" OutName="msg_kanji_886B_empty" Format="i4" Width="16" Height="16" Offset="0x19A80"/>
+        <Texture Name="gMsgKanji886CEmptyTex" OutName="msg_kanji_886C_empty" Format="i4" Width="16" Height="16" Offset="0x19B00"/>
+        <Texture Name="gMsgKanji886DEmptyTex" OutName="msg_kanji_886D_empty" Format="i4" Width="16" Height="16" Offset="0x19B80"/>
+        <Texture Name="gMsgKanji886EEmptyTex" OutName="msg_kanji_886E_empty" Format="i4" Width="16" Height="16" Offset="0x19C00"/>
+        <Texture Name="gMsgKanji886FEmptyTex" OutName="msg_kanji_886F_empty" Format="i4" Width="16" Height="16" Offset="0x19C80"/>
+        <Texture Name="gMsgKanji8870EmptyTex" OutName="msg_kanji_8870_empty" Format="i4" Width="16" Height="16" Offset="0x19D00"/>
+        <Texture Name="gMsgKanji8871EmptyTex" OutName="msg_kanji_8871_empty" Format="i4" Width="16" Height="16" Offset="0x19D80"/>
+        <Texture Name="gMsgKanji8872EmptyTex" OutName="msg_kanji_8872_empty" Format="i4" Width="16" Height="16" Offset="0x19E00"/>
+        <Texture Name="gMsgKanji8873EmptyTex" OutName="msg_kanji_8873_empty" Format="i4" Width="16" Height="16" Offset="0x19E80"/>
+        <Texture Name="gMsgKanji8874EmptyTex" OutName="msg_kanji_8874_empty" Format="i4" Width="16" Height="16" Offset="0x19F00"/>
+        <Texture Name="gMsgKanji8875EmptyTex" OutName="msg_kanji_8875_empty" Format="i4" Width="16" Height="16" Offset="0x19F80"/>
+        <Texture Name="gMsgKanji8876EmptyTex" OutName="msg_kanji_8876_empty" Format="i4" Width="16" Height="16" Offset="0x1A000"/>
+        <Texture Name="gMsgKanji8877EmptyTex" OutName="msg_kanji_8877_empty" Format="i4" Width="16" Height="16" Offset="0x1A080"/>
+        <Texture Name="gMsgKanji8878EmptyTex" OutName="msg_kanji_8878_empty" Format="i4" Width="16" Height="16" Offset="0x1A100"/>
+        <Texture Name="gMsgKanji8879EmptyTex" OutName="msg_kanji_8879_empty" Format="i4" Width="16" Height="16" Offset="0x1A180"/>
+        <Texture Name="gMsgKanji887AEmptyTex" OutName="msg_kanji_887A_empty" Format="i4" Width="16" Height="16" Offset="0x1A200"/>
+        <Texture Name="gMsgKanji887BEmptyTex" OutName="msg_kanji_887B_empty" Format="i4" Width="16" Height="16" Offset="0x1A280"/>
+        <Texture Name="gMsgKanji887CEmptyTex" OutName="msg_kanji_887C_empty" Format="i4" Width="16" Height="16" Offset="0x1A300"/>
+        <Texture Name="gMsgKanji887DEmptyTex" OutName="msg_kanji_887D_empty" Format="i4" Width="16" Height="16" Offset="0x1A380"/>
+        <Texture Name="gMsgKanji887EEmptyTex" OutName="msg_kanji_887E_empty" Format="i4" Width="16" Height="16" Offset="0x1A400"/>
+        <Texture Name="gMsgKanji8880EmptyTex" OutName="msg_kanji_8880_empty" Format="i4" Width="16" Height="16" Offset="0x1A480"/>
+        <Texture Name="gMsgKanji8881EmptyTex" OutName="msg_kanji_8881_empty" Format="i4" Width="16" Height="16" Offset="0x1A500"/>
+        <Texture Name="gMsgKanji8882EmptyTex" OutName="msg_kanji_8882_empty" Format="i4" Width="16" Height="16" Offset="0x1A580"/>
+        <Texture Name="gMsgKanji8883EmptyTex" OutName="msg_kanji_8883_empty" Format="i4" Width="16" Height="16" Offset="0x1A600"/>
+        <Texture Name="gMsgKanji8884EmptyTex" OutName="msg_kanji_8884_empty" Format="i4" Width="16" Height="16" Offset="0x1A680"/>
+        <Texture Name="gMsgKanji8885EmptyTex" OutName="msg_kanji_8885_empty" Format="i4" Width="16" Height="16" Offset="0x1A700"/>
+        <Texture Name="gMsgKanji8886EmptyTex" OutName="msg_kanji_8886_empty" Format="i4" Width="16" Height="16" Offset="0x1A780"/>
+        <Texture Name="gMsgKanji8887EmptyTex" OutName="msg_kanji_8887_empty" Format="i4" Width="16" Height="16" Offset="0x1A800"/>
+        <Texture Name="gMsgKanji8888EmptyTex" OutName="msg_kanji_8888_empty" Format="i4" Width="16" Height="16" Offset="0x1A880"/>
+        <Texture Name="gMsgKanji8889EmptyTex" OutName="msg_kanji_8889_empty" Format="i4" Width="16" Height="16" Offset="0x1A900"/>
+        <Texture Name="gMsgKanji888AEmptyTex" OutName="msg_kanji_888A_empty" Format="i4" Width="16" Height="16" Offset="0x1A980"/>
+        <Texture Name="gMsgKanji888BEmptyTex" OutName="msg_kanji_888B_empty" Format="i4" Width="16" Height="16" Offset="0x1AA00"/>
+        <Texture Name="gMsgKanji888CEmptyTex" OutName="msg_kanji_888C_empty" Format="i4" Width="16" Height="16" Offset="0x1AA80"/>
+        <Texture Name="gMsgKanji888DEmptyTex" OutName="msg_kanji_888D_empty" Format="i4" Width="16" Height="16" Offset="0x1AB00"/>
+        <Texture Name="gMsgKanji888EEmptyTex" OutName="msg_kanji_888E_empty" Format="i4" Width="16" Height="16" Offset="0x1AB80"/>
+        <Texture Name="gMsgKanji888FEmptyTex" OutName="msg_kanji_888F_empty" Format="i4" Width="16" Height="16" Offset="0x1AC00"/>
+        <Texture Name="gMsgKanji8890EmptyTex" OutName="msg_kanji_8890_empty" Format="i4" Width="16" Height="16" Offset="0x1AC80"/>
+        <Texture Name="gMsgKanji8891EmptyTex" OutName="msg_kanji_8891_empty" Format="i4" Width="16" Height="16" Offset="0x1AD00"/>
+        <Texture Name="gMsgKanji8892EmptyTex" OutName="msg_kanji_8892_empty" Format="i4" Width="16" Height="16" Offset="0x1AD80"/>
+        <Texture Name="gMsgKanji8893EmptyTex" OutName="msg_kanji_8893_empty" Format="i4" Width="16" Height="16" Offset="0x1AE00"/>
+        <Texture Name="gMsgKanji8894EmptyTex" OutName="msg_kanji_8894_empty" Format="i4" Width="16" Height="16" Offset="0x1AE80"/>
+        <Texture Name="gMsgKanji8895EmptyTex" OutName="msg_kanji_8895_empty" Format="i4" Width="16" Height="16" Offset="0x1AF00"/>
+        <Texture Name="gMsgKanji8896EmptyTex" OutName="msg_kanji_8896_empty" Format="i4" Width="16" Height="16" Offset="0x1AF80"/>
+        <Texture Name="gMsgKanji8897EmptyTex" OutName="msg_kanji_8897_empty" Format="i4" Width="16" Height="16" Offset="0x1B000"/>
+        <Texture Name="gMsgKanji8898EmptyTex" OutName="msg_kanji_8898_empty" Format="i4" Width="16" Height="16" Offset="0x1B080"/>
+        <Texture Name="gMsgKanji8899EmptyTex" OutName="msg_kanji_8899_empty" Format="i4" Width="16" Height="16" Offset="0x1B100"/>
+        <Texture Name="gMsgKanji889AEmptyTex" OutName="msg_kanji_889A_empty" Format="i4" Width="16" Height="16" Offset="0x1B180"/>
+        <Texture Name="gMsgKanji889BEmptyTex" OutName="msg_kanji_889B_empty" Format="i4" Width="16" Height="16" Offset="0x1B200"/>
+        <Texture Name="gMsgKanji889CEmptyTex" OutName="msg_kanji_889C_empty" Format="i4" Width="16" Height="16" Offset="0x1B280"/>
+        <Texture Name="gMsgKanji889DEmptyTex" OutName="msg_kanji_889D_empty" Format="i4" Width="16" Height="16" Offset="0x1B300"/>
+        <Texture Name="gMsgKanji889EEmptyTex" OutName="msg_kanji_889E_empty" Format="i4" Width="16" Height="16" Offset="0x1B380"/>
+        <!-- Kanji (2,965 in total) -->
+        <!-- These codepoints match shift jis, so a specific kanji can be found by using a codepoint table -->
+        <!-- https://web.archive.org/web/20230318164532/https://uic.io/en/charset/show/shift_jis/ -->
+        <Texture Name="gMsgKanji889FTex" OutName="msg_kanji_889F" Format="i4" Width="16" Height="16" Offset="0x1B400"/>
+        <Texture Name="gMsgKanji88A0Tex" OutName="msg_kanji_88A0" Format="i4" Width="16" Height="16" Offset="0x1B480"/>
+        <Texture Name="gMsgKanji88A1Tex" OutName="msg_kanji_88A1" Format="i4" Width="16" Height="16" Offset="0x1B500"/>
+        <Texture Name="gMsgKanji88A2Tex" OutName="msg_kanji_88A2" Format="i4" Width="16" Height="16" Offset="0x1B580"/>
+        <Texture Name="gMsgKanji88A3Tex" OutName="msg_kanji_88A3" Format="i4" Width="16" Height="16" Offset="0x1B600"/>
+        <Texture Name="gMsgKanji88A4Tex" OutName="msg_kanji_88A4" Format="i4" Width="16" Height="16" Offset="0x1B680"/>
+        <Texture Name="gMsgKanji88A5Tex" OutName="msg_kanji_88A5" Format="i4" Width="16" Height="16" Offset="0x1B700"/>
+        <Texture Name="gMsgKanji88A6Tex" OutName="msg_kanji_88A6" Format="i4" Width="16" Height="16" Offset="0x1B780"/>
+        <Texture Name="gMsgKanji88A7Tex" OutName="msg_kanji_88A7" Format="i4" Width="16" Height="16" Offset="0x1B800"/>
+        <Texture Name="gMsgKanji88A8Tex" OutName="msg_kanji_88A8" Format="i4" Width="16" Height="16" Offset="0x1B880"/>
+        <Texture Name="gMsgKanji88A9Tex" OutName="msg_kanji_88A9" Format="i4" Width="16" Height="16" Offset="0x1B900"/>
+        <Texture Name="gMsgKanji88AATex" OutName="msg_kanji_88AA" Format="i4" Width="16" Height="16" Offset="0x1B980"/>
+        <Texture Name="gMsgKanji88ABTex" OutName="msg_kanji_88AB" Format="i4" Width="16" Height="16" Offset="0x1BA00"/>
+        <Texture Name="gMsgKanji88ACTex" OutName="msg_kanji_88AC" Format="i4" Width="16" Height="16" Offset="0x1BA80"/>
+        <Texture Name="gMsgKanji88ADTex" OutName="msg_kanji_88AD" Format="i4" Width="16" Height="16" Offset="0x1BB00"/>
+        <Texture Name="gMsgKanji88AETex" OutName="msg_kanji_88AE" Format="i4" Width="16" Height="16" Offset="0x1BB80"/>
+        <Texture Name="gMsgKanji88AFTex" OutName="msg_kanji_88AF" Format="i4" Width="16" Height="16" Offset="0x1BC00"/>
+        <Texture Name="gMsgKanji88B0Tex" OutName="msg_kanji_88B0" Format="i4" Width="16" Height="16" Offset="0x1BC80"/>
+        <Texture Name="gMsgKanji88B1Tex" OutName="msg_kanji_88B1" Format="i4" Width="16" Height="16" Offset="0x1BD00"/>
+        <Texture Name="gMsgKanji88B2Tex" OutName="msg_kanji_88B2" Format="i4" Width="16" Height="16" Offset="0x1BD80"/>
+        <Texture Name="gMsgKanji88B3Tex" OutName="msg_kanji_88B3" Format="i4" Width="16" Height="16" Offset="0x1BE00"/>
+        <Texture Name="gMsgKanji88B4Tex" OutName="msg_kanji_88B4" Format="i4" Width="16" Height="16" Offset="0x1BE80"/>
+        <Texture Name="gMsgKanji88B5Tex" OutName="msg_kanji_88B5" Format="i4" Width="16" Height="16" Offset="0x1BF00"/>
+        <Texture Name="gMsgKanji88B6Tex" OutName="msg_kanji_88B6" Format="i4" Width="16" Height="16" Offset="0x1BF80"/>
+        <Texture Name="gMsgKanji88B7Tex" OutName="msg_kanji_88B7" Format="i4" Width="16" Height="16" Offset="0x1C000"/>
+        <Texture Name="gMsgKanji88B8Tex" OutName="msg_kanji_88B8" Format="i4" Width="16" Height="16" Offset="0x1C080"/>
+        <Texture Name="gMsgKanji88B9Tex" OutName="msg_kanji_88B9" Format="i4" Width="16" Height="16" Offset="0x1C100"/>
+        <Texture Name="gMsgKanji88BATex" OutName="msg_kanji_88BA" Format="i4" Width="16" Height="16" Offset="0x1C180"/>
+        <Texture Name="gMsgKanji88BBTex" OutName="msg_kanji_88BB" Format="i4" Width="16" Height="16" Offset="0x1C200"/>
+        <Texture Name="gMsgKanji88BCTex" OutName="msg_kanji_88BC" Format="i4" Width="16" Height="16" Offset="0x1C280"/>
+        <Texture Name="gMsgKanji88BDTex" OutName="msg_kanji_88BD" Format="i4" Width="16" Height="16" Offset="0x1C300"/>
+        <Texture Name="gMsgKanji88BETex" OutName="msg_kanji_88BE" Format="i4" Width="16" Height="16" Offset="0x1C380"/>
+        <Texture Name="gMsgKanji88BFTex" OutName="msg_kanji_88BF" Format="i4" Width="16" Height="16" Offset="0x1C400"/>
+        <Texture Name="gMsgKanji88C0Tex" OutName="msg_kanji_88C0" Format="i4" Width="16" Height="16" Offset="0x1C480"/>
+        <Texture Name="gMsgKanji88C1Tex" OutName="msg_kanji_88C1" Format="i4" Width="16" Height="16" Offset="0x1C500"/>
+        <Texture Name="gMsgKanji88C2Tex" OutName="msg_kanji_88C2" Format="i4" Width="16" Height="16" Offset="0x1C580"/>
+        <Texture Name="gMsgKanji88C3Tex" OutName="msg_kanji_88C3" Format="i4" Width="16" Height="16" Offset="0x1C600"/>
+        <Texture Name="gMsgKanji88C4Tex" OutName="msg_kanji_88C4" Format="i4" Width="16" Height="16" Offset="0x1C680"/>
+        <Texture Name="gMsgKanji88C5Tex" OutName="msg_kanji_88C5" Format="i4" Width="16" Height="16" Offset="0x1C700"/>
+        <Texture Name="gMsgKanji88C6Tex" OutName="msg_kanji_88C6" Format="i4" Width="16" Height="16" Offset="0x1C780"/>
+        <Texture Name="gMsgKanji88C7Tex" OutName="msg_kanji_88C7" Format="i4" Width="16" Height="16" Offset="0x1C800"/>
+        <Texture Name="gMsgKanji88C8Tex" OutName="msg_kanji_88C8" Format="i4" Width="16" Height="16" Offset="0x1C880"/>
+        <Texture Name="gMsgKanji88C9Tex" OutName="msg_kanji_88C9" Format="i4" Width="16" Height="16" Offset="0x1C900"/>
+        <Texture Name="gMsgKanji88CATex" OutName="msg_kanji_88CA" Format="i4" Width="16" Height="16" Offset="0x1C980"/>
+        <Texture Name="gMsgKanji88CBTex" OutName="msg_kanji_88CB" Format="i4" Width="16" Height="16" Offset="0x1CA00"/>
+        <Texture Name="gMsgKanji88CCTex" OutName="msg_kanji_88CC" Format="i4" Width="16" Height="16" Offset="0x1CA80"/>
+        <Texture Name="gMsgKanji88CDTex" OutName="msg_kanji_88CD" Format="i4" Width="16" Height="16" Offset="0x1CB00"/>
+        <Texture Name="gMsgKanji88CETex" OutName="msg_kanji_88CE" Format="i4" Width="16" Height="16" Offset="0x1CB80"/>
+        <Texture Name="gMsgKanji88CFTex" OutName="msg_kanji_88CF" Format="i4" Width="16" Height="16" Offset="0x1CC00"/>
+        <Texture Name="gMsgKanji88D0Tex" OutName="msg_kanji_88D0" Format="i4" Width="16" Height="16" Offset="0x1CC80"/>
+        <Texture Name="gMsgKanji88D1Tex" OutName="msg_kanji_88D1" Format="i4" Width="16" Height="16" Offset="0x1CD00"/>
+        <Texture Name="gMsgKanji88D2Tex" OutName="msg_kanji_88D2" Format="i4" Width="16" Height="16" Offset="0x1CD80"/>
+        <Texture Name="gMsgKanji88D3Tex" OutName="msg_kanji_88D3" Format="i4" Width="16" Height="16" Offset="0x1CE00"/>
+        <Texture Name="gMsgKanji88D4Tex" OutName="msg_kanji_88D4" Format="i4" Width="16" Height="16" Offset="0x1CE80"/>
+        <Texture Name="gMsgKanji88D5Tex" OutName="msg_kanji_88D5" Format="i4" Width="16" Height="16" Offset="0x1CF00"/>
+        <Texture Name="gMsgKanji88D6Tex" OutName="msg_kanji_88D6" Format="i4" Width="16" Height="16" Offset="0x1CF80"/>
+        <Texture Name="gMsgKanji88D7Tex" OutName="msg_kanji_88D7" Format="i4" Width="16" Height="16" Offset="0x1D000"/>
+        <Texture Name="gMsgKanji88D8Tex" OutName="msg_kanji_88D8" Format="i4" Width="16" Height="16" Offset="0x1D080"/>
+        <Texture Name="gMsgKanji88D9Tex" OutName="msg_kanji_88D9" Format="i4" Width="16" Height="16" Offset="0x1D100"/>
+        <Texture Name="gMsgKanji88DATex" OutName="msg_kanji_88DA" Format="i4" Width="16" Height="16" Offset="0x1D180"/>
+        <Texture Name="gMsgKanji88DBTex" OutName="msg_kanji_88DB" Format="i4" Width="16" Height="16" Offset="0x1D200"/>
+        <Texture Name="gMsgKanji88DCTex" OutName="msg_kanji_88DC" Format="i4" Width="16" Height="16" Offset="0x1D280"/>
+        <Texture Name="gMsgKanji88DDTex" OutName="msg_kanji_88DD" Format="i4" Width="16" Height="16" Offset="0x1D300"/>
+        <Texture Name="gMsgKanji88DETex" OutName="msg_kanji_88DE" Format="i4" Width="16" Height="16" Offset="0x1D380"/>
+        <Texture Name="gMsgKanji88DFTex" OutName="msg_kanji_88DF" Format="i4" Width="16" Height="16" Offset="0x1D400"/>
+        <Texture Name="gMsgKanji88E0Tex" OutName="msg_kanji_88E0" Format="i4" Width="16" Height="16" Offset="0x1D480"/>
+        <Texture Name="gMsgKanji88E1Tex" OutName="msg_kanji_88E1" Format="i4" Width="16" Height="16" Offset="0x1D500"/>
+        <Texture Name="gMsgKanji88E2Tex" OutName="msg_kanji_88E2" Format="i4" Width="16" Height="16" Offset="0x1D580"/>
+        <Texture Name="gMsgKanji88E3Tex" OutName="msg_kanji_88E3" Format="i4" Width="16" Height="16" Offset="0x1D600"/>
+        <Texture Name="gMsgKanji88E4Tex" OutName="msg_kanji_88E4" Format="i4" Width="16" Height="16" Offset="0x1D680"/>
+        <Texture Name="gMsgKanji88E5Tex" OutName="msg_kanji_88E5" Format="i4" Width="16" Height="16" Offset="0x1D700"/>
+        <Texture Name="gMsgKanji88E6Tex" OutName="msg_kanji_88E6" Format="i4" Width="16" Height="16" Offset="0x1D780"/>
+        <Texture Name="gMsgKanji88E7Tex" OutName="msg_kanji_88E7" Format="i4" Width="16" Height="16" Offset="0x1D800"/>
+        <Texture Name="gMsgKanji88E8Tex" OutName="msg_kanji_88E8" Format="i4" Width="16" Height="16" Offset="0x1D880"/>
+        <Texture Name="gMsgKanji88E9Tex" OutName="msg_kanji_88E9" Format="i4" Width="16" Height="16" Offset="0x1D900"/>
+        <Texture Name="gMsgKanji88EATex" OutName="msg_kanji_88EA" Format="i4" Width="16" Height="16" Offset="0x1D980"/>
+        <Texture Name="gMsgKanji88EBTex" OutName="msg_kanji_88EB" Format="i4" Width="16" Height="16" Offset="0x1DA00"/>
+        <Texture Name="gMsgKanji88ECTex" OutName="msg_kanji_88EC" Format="i4" Width="16" Height="16" Offset="0x1DA80"/>
+        <Texture Name="gMsgKanji88EDTex" OutName="msg_kanji_88ED" Format="i4" Width="16" Height="16" Offset="0x1DB00"/>
+        <Texture Name="gMsgKanji88EETex" OutName="msg_kanji_88EE" Format="i4" Width="16" Height="16" Offset="0x1DB80"/>
+        <Texture Name="gMsgKanji88EFTex" OutName="msg_kanji_88EF" Format="i4" Width="16" Height="16" Offset="0x1DC00"/>
+        <Texture Name="gMsgKanji88F0Tex" OutName="msg_kanji_88F0" Format="i4" Width="16" Height="16" Offset="0x1DC80"/>
+        <Texture Name="gMsgKanji88F1Tex" OutName="msg_kanji_88F1" Format="i4" Width="16" Height="16" Offset="0x1DD00"/>
+        <Texture Name="gMsgKanji88F2Tex" OutName="msg_kanji_88F2" Format="i4" Width="16" Height="16" Offset="0x1DD80"/>
+        <Texture Name="gMsgKanji88F3Tex" OutName="msg_kanji_88F3" Format="i4" Width="16" Height="16" Offset="0x1DE00"/>
+        <Texture Name="gMsgKanji88F4Tex" OutName="msg_kanji_88F4" Format="i4" Width="16" Height="16" Offset="0x1DE80"/>
+        <Texture Name="gMsgKanji88F5Tex" OutName="msg_kanji_88F5" Format="i4" Width="16" Height="16" Offset="0x1DF00"/>
+        <Texture Name="gMsgKanji88F6Tex" OutName="msg_kanji_88F6" Format="i4" Width="16" Height="16" Offset="0x1DF80"/>
+        <Texture Name="gMsgKanji88F7Tex" OutName="msg_kanji_88F7" Format="i4" Width="16" Height="16" Offset="0x1E000"/>
+        <Texture Name="gMsgKanji88F8Tex" OutName="msg_kanji_88F8" Format="i4" Width="16" Height="16" Offset="0x1E080"/>
+        <Texture Name="gMsgKanji88F9Tex" OutName="msg_kanji_88F9" Format="i4" Width="16" Height="16" Offset="0x1E100"/>
+        <Texture Name="gMsgKanji88FATex" OutName="msg_kanji_88FA" Format="i4" Width="16" Height="16" Offset="0x1E180"/>
+        <Texture Name="gMsgKanji88FBTex" OutName="msg_kanji_88FB" Format="i4" Width="16" Height="16" Offset="0x1E200"/>
+        <Texture Name="gMsgKanji88FCTex" OutName="msg_kanji_88FC" Format="i4" Width="16" Height="16" Offset="0x1E280"/>
+        <Texture Name="gMsgKanji8940Tex" OutName="msg_kanji_8940" Format="i4" Width="16" Height="16" Offset="0x1E300"/>
+        <Texture Name="gMsgKanji8941Tex" OutName="msg_kanji_8941" Format="i4" Width="16" Height="16" Offset="0x1E380"/>
+        <Texture Name="gMsgKanji8942Tex" OutName="msg_kanji_8942" Format="i4" Width="16" Height="16" Offset="0x1E400"/>
+        <Texture Name="gMsgKanji8943Tex" OutName="msg_kanji_8943" Format="i4" Width="16" Height="16" Offset="0x1E480"/>
+        <Texture Name="gMsgKanji8944Tex" OutName="msg_kanji_8944" Format="i4" Width="16" Height="16" Offset="0x1E500"/>
+        <Texture Name="gMsgKanji8945Tex" OutName="msg_kanji_8945" Format="i4" Width="16" Height="16" Offset="0x1E580"/>
+        <Texture Name="gMsgKanji8946Tex" OutName="msg_kanji_8946" Format="i4" Width="16" Height="16" Offset="0x1E600"/>
+        <Texture Name="gMsgKanji8947Tex" OutName="msg_kanji_8947" Format="i4" Width="16" Height="16" Offset="0x1E680"/>
+        <Texture Name="gMsgKanji8948Tex" OutName="msg_kanji_8948" Format="i4" Width="16" Height="16" Offset="0x1E700"/>
+        <Texture Name="gMsgKanji8949Tex" OutName="msg_kanji_8949" Format="i4" Width="16" Height="16" Offset="0x1E780"/>
+        <Texture Name="gMsgKanji894ATex" OutName="msg_kanji_894A" Format="i4" Width="16" Height="16" Offset="0x1E800"/>
+        <Texture Name="gMsgKanji894BTex" OutName="msg_kanji_894B" Format="i4" Width="16" Height="16" Offset="0x1E880"/>
+        <Texture Name="gMsgKanji894CTex" OutName="msg_kanji_894C" Format="i4" Width="16" Height="16" Offset="0x1E900"/>
+        <Texture Name="gMsgKanji894DTex" OutName="msg_kanji_894D" Format="i4" Width="16" Height="16" Offset="0x1E980"/>
+        <Texture Name="gMsgKanji894ETex" OutName="msg_kanji_894E" Format="i4" Width="16" Height="16" Offset="0x1EA00"/>
+        <Texture Name="gMsgKanji894FTex" OutName="msg_kanji_894F" Format="i4" Width="16" Height="16" Offset="0x1EA80"/>
+        <Texture Name="gMsgKanji8950Tex" OutName="msg_kanji_8950" Format="i4" Width="16" Height="16" Offset="0x1EB00"/>
+        <Texture Name="gMsgKanji8951Tex" OutName="msg_kanji_8951" Format="i4" Width="16" Height="16" Offset="0x1EB80"/>
+        <Texture Name="gMsgKanji8952Tex" OutName="msg_kanji_8952" Format="i4" Width="16" Height="16" Offset="0x1EC00"/>
+        <Texture Name="gMsgKanji8953Tex" OutName="msg_kanji_8953" Format="i4" Width="16" Height="16" Offset="0x1EC80"/>
+        <Texture Name="gMsgKanji8954Tex" OutName="msg_kanji_8954" Format="i4" Width="16" Height="16" Offset="0x1ED00"/>
+        <Texture Name="gMsgKanji8955Tex" OutName="msg_kanji_8955" Format="i4" Width="16" Height="16" Offset="0x1ED80"/>
+        <Texture Name="gMsgKanji8956Tex" OutName="msg_kanji_8956" Format="i4" Width="16" Height="16" Offset="0x1EE00"/>
+        <Texture Name="gMsgKanji8957Tex" OutName="msg_kanji_8957" Format="i4" Width="16" Height="16" Offset="0x1EE80"/>
+        <Texture Name="gMsgKanji8958Tex" OutName="msg_kanji_8958" Format="i4" Width="16" Height="16" Offset="0x1EF00"/>
+        <Texture Name="gMsgKanji8959Tex" OutName="msg_kanji_8959" Format="i4" Width="16" Height="16" Offset="0x1EF80"/>
+        <Texture Name="gMsgKanji895ATex" OutName="msg_kanji_895A" Format="i4" Width="16" Height="16" Offset="0x1F000"/>
+        <Texture Name="gMsgKanji895BTex" OutName="msg_kanji_895B" Format="i4" Width="16" Height="16" Offset="0x1F080"/>
+        <Texture Name="gMsgKanji895CTex" OutName="msg_kanji_895C" Format="i4" Width="16" Height="16" Offset="0x1F100"/>
+        <Texture Name="gMsgKanji895DTex" OutName="msg_kanji_895D" Format="i4" Width="16" Height="16" Offset="0x1F180"/>
+        <Texture Name="gMsgKanji895ETex" OutName="msg_kanji_895E" Format="i4" Width="16" Height="16" Offset="0x1F200"/>
+        <Texture Name="gMsgKanji895FTex" OutName="msg_kanji_895F" Format="i4" Width="16" Height="16" Offset="0x1F280"/>
+        <Texture Name="gMsgKanji8960Tex" OutName="msg_kanji_8960" Format="i4" Width="16" Height="16" Offset="0x1F300"/>
+        <Texture Name="gMsgKanji8961Tex" OutName="msg_kanji_8961" Format="i4" Width="16" Height="16" Offset="0x1F380"/>
+        <Texture Name="gMsgKanji8962Tex" OutName="msg_kanji_8962" Format="i4" Width="16" Height="16" Offset="0x1F400"/>
+        <Texture Name="gMsgKanji8963Tex" OutName="msg_kanji_8963" Format="i4" Width="16" Height="16" Offset="0x1F480"/>
+        <Texture Name="gMsgKanji8964Tex" OutName="msg_kanji_8964" Format="i4" Width="16" Height="16" Offset="0x1F500"/>
+        <Texture Name="gMsgKanji8965Tex" OutName="msg_kanji_8965" Format="i4" Width="16" Height="16" Offset="0x1F580"/>
+        <Texture Name="gMsgKanji8966Tex" OutName="msg_kanji_8966" Format="i4" Width="16" Height="16" Offset="0x1F600"/>
+        <Texture Name="gMsgKanji8967Tex" OutName="msg_kanji_8967" Format="i4" Width="16" Height="16" Offset="0x1F680"/>
+        <Texture Name="gMsgKanji8968Tex" OutName="msg_kanji_8968" Format="i4" Width="16" Height="16" Offset="0x1F700"/>
+        <Texture Name="gMsgKanji8969Tex" OutName="msg_kanji_8969" Format="i4" Width="16" Height="16" Offset="0x1F780"/>
+        <Texture Name="gMsgKanji896ATex" OutName="msg_kanji_896A" Format="i4" Width="16" Height="16" Offset="0x1F800"/>
+        <Texture Name="gMsgKanji896BTex" OutName="msg_kanji_896B" Format="i4" Width="16" Height="16" Offset="0x1F880"/>
+        <Texture Name="gMsgKanji896CTex" OutName="msg_kanji_896C" Format="i4" Width="16" Height="16" Offset="0x1F900"/>
+        <Texture Name="gMsgKanji896DTex" OutName="msg_kanji_896D" Format="i4" Width="16" Height="16" Offset="0x1F980"/>
+        <Texture Name="gMsgKanji896ETex" OutName="msg_kanji_896E" Format="i4" Width="16" Height="16" Offset="0x1FA00"/>
+        <Texture Name="gMsgKanji896FTex" OutName="msg_kanji_896F" Format="i4" Width="16" Height="16" Offset="0x1FA80"/>
+        <Texture Name="gMsgKanji8970Tex" OutName="msg_kanji_8970" Format="i4" Width="16" Height="16" Offset="0x1FB00"/>
+        <Texture Name="gMsgKanji8971Tex" OutName="msg_kanji_8971" Format="i4" Width="16" Height="16" Offset="0x1FB80"/>
+        <Texture Name="gMsgKanji8972Tex" OutName="msg_kanji_8972" Format="i4" Width="16" Height="16" Offset="0x1FC00"/>
+        <Texture Name="gMsgKanji8973Tex" OutName="msg_kanji_8973" Format="i4" Width="16" Height="16" Offset="0x1FC80"/>
+        <Texture Name="gMsgKanji8974Tex" OutName="msg_kanji_8974" Format="i4" Width="16" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gMsgKanji8975Tex" OutName="msg_kanji_8975" Format="i4" Width="16" Height="16" Offset="0x1FD80"/>
+        <Texture Name="gMsgKanji8976Tex" OutName="msg_kanji_8976" Format="i4" Width="16" Height="16" Offset="0x1FE00"/>
+        <Texture Name="gMsgKanji8977Tex" OutName="msg_kanji_8977" Format="i4" Width="16" Height="16" Offset="0x1FE80"/>
+        <Texture Name="gMsgKanji8978Tex" OutName="msg_kanji_8978" Format="i4" Width="16" Height="16" Offset="0x1FF00"/>
+        <Texture Name="gMsgKanji8979Tex" OutName="msg_kanji_8979" Format="i4" Width="16" Height="16" Offset="0x1FF80"/>
+        <Texture Name="gMsgKanji897ATex" OutName="msg_kanji_897A" Format="i4" Width="16" Height="16" Offset="0x20000"/>
+        <Texture Name="gMsgKanji897BTex" OutName="msg_kanji_897B" Format="i4" Width="16" Height="16" Offset="0x20080"/>
+        <Texture Name="gMsgKanji897CTex" OutName="msg_kanji_897C" Format="i4" Width="16" Height="16" Offset="0x20100"/>
+        <Texture Name="gMsgKanji897DTex" OutName="msg_kanji_897D" Format="i4" Width="16" Height="16" Offset="0x20180"/>
+        <Texture Name="gMsgKanji897ETex" OutName="msg_kanji_897E" Format="i4" Width="16" Height="16" Offset="0x20200"/>
+        <Texture Name="gMsgKanji8980Tex" OutName="msg_kanji_8980" Format="i4" Width="16" Height="16" Offset="0x20280"/>
+        <Texture Name="gMsgKanji8981Tex" OutName="msg_kanji_8981" Format="i4" Width="16" Height="16" Offset="0x20300"/>
+        <Texture Name="gMsgKanji8982Tex" OutName="msg_kanji_8982" Format="i4" Width="16" Height="16" Offset="0x20380"/>
+        <Texture Name="gMsgKanji8983Tex" OutName="msg_kanji_8983" Format="i4" Width="16" Height="16" Offset="0x20400"/>
+        <Texture Name="gMsgKanji8984Tex" OutName="msg_kanji_8984" Format="i4" Width="16" Height="16" Offset="0x20480"/>
+        <Texture Name="gMsgKanji8985Tex" OutName="msg_kanji_8985" Format="i4" Width="16" Height="16" Offset="0x20500"/>
+        <Texture Name="gMsgKanji8986Tex" OutName="msg_kanji_8986" Format="i4" Width="16" Height="16" Offset="0x20580"/>
+        <Texture Name="gMsgKanji8987Tex" OutName="msg_kanji_8987" Format="i4" Width="16" Height="16" Offset="0x20600"/>
+        <Texture Name="gMsgKanji8988Tex" OutName="msg_kanji_8988" Format="i4" Width="16" Height="16" Offset="0x20680"/>
+        <Texture Name="gMsgKanji8989Tex" OutName="msg_kanji_8989" Format="i4" Width="16" Height="16" Offset="0x20700"/>
+        <Texture Name="gMsgKanji898ATex" OutName="msg_kanji_898A" Format="i4" Width="16" Height="16" Offset="0x20780"/>
+        <Texture Name="gMsgKanji898BTex" OutName="msg_kanji_898B" Format="i4" Width="16" Height="16" Offset="0x20800"/>
+        <Texture Name="gMsgKanji898CTex" OutName="msg_kanji_898C" Format="i4" Width="16" Height="16" Offset="0x20880"/>
+        <Texture Name="gMsgKanji898DTex" OutName="msg_kanji_898D" Format="i4" Width="16" Height="16" Offset="0x20900"/>
+        <Texture Name="gMsgKanji898ETex" OutName="msg_kanji_898E" Format="i4" Width="16" Height="16" Offset="0x20980"/>
+        <Texture Name="gMsgKanji898FTex" OutName="msg_kanji_898F" Format="i4" Width="16" Height="16" Offset="0x20A00"/>
+        <Texture Name="gMsgKanji8990Tex" OutName="msg_kanji_8990" Format="i4" Width="16" Height="16" Offset="0x20A80"/>
+        <Texture Name="gMsgKanji8991Tex" OutName="msg_kanji_8991" Format="i4" Width="16" Height="16" Offset="0x20B00"/>
+        <Texture Name="gMsgKanji8992Tex" OutName="msg_kanji_8992" Format="i4" Width="16" Height="16" Offset="0x20B80"/>
+        <Texture Name="gMsgKanji8993Tex" OutName="msg_kanji_8993" Format="i4" Width="16" Height="16" Offset="0x20C00"/>
+        <Texture Name="gMsgKanji8994Tex" OutName="msg_kanji_8994" Format="i4" Width="16" Height="16" Offset="0x20C80"/>
+        <Texture Name="gMsgKanji8995Tex" OutName="msg_kanji_8995" Format="i4" Width="16" Height="16" Offset="0x20D00"/>
+        <Texture Name="gMsgKanji8996Tex" OutName="msg_kanji_8996" Format="i4" Width="16" Height="16" Offset="0x20D80"/>
+        <Texture Name="gMsgKanji8997Tex" OutName="msg_kanji_8997" Format="i4" Width="16" Height="16" Offset="0x20E00"/>
+        <Texture Name="gMsgKanji8998Tex" OutName="msg_kanji_8998" Format="i4" Width="16" Height="16" Offset="0x20E80"/>
+        <Texture Name="gMsgKanji8999Tex" OutName="msg_kanji_8999" Format="i4" Width="16" Height="16" Offset="0x20F00"/>
+        <Texture Name="gMsgKanji899ATex" OutName="msg_kanji_899A" Format="i4" Width="16" Height="16" Offset="0x20F80"/>
+        <Texture Name="gMsgKanji899BTex" OutName="msg_kanji_899B" Format="i4" Width="16" Height="16" Offset="0x21000"/>
+        <Texture Name="gMsgKanji899CTex" OutName="msg_kanji_899C" Format="i4" Width="16" Height="16" Offset="0x21080"/>
+        <Texture Name="gMsgKanji899DTex" OutName="msg_kanji_899D" Format="i4" Width="16" Height="16" Offset="0x21100"/>
+        <Texture Name="gMsgKanji899ETex" OutName="msg_kanji_899E" Format="i4" Width="16" Height="16" Offset="0x21180"/>
+        <Texture Name="gMsgKanji899FTex" OutName="msg_kanji_899F" Format="i4" Width="16" Height="16" Offset="0x21200"/>
+        <Texture Name="gMsgKanji89A0Tex" OutName="msg_kanji_89A0" Format="i4" Width="16" Height="16" Offset="0x21280"/>
+        <Texture Name="gMsgKanji89A1Tex" OutName="msg_kanji_89A1" Format="i4" Width="16" Height="16" Offset="0x21300"/>
+        <Texture Name="gMsgKanji89A2Tex" OutName="msg_kanji_89A2" Format="i4" Width="16" Height="16" Offset="0x21380"/>
+        <Texture Name="gMsgKanji89A3Tex" OutName="msg_kanji_89A3" Format="i4" Width="16" Height="16" Offset="0x21400"/>
+        <Texture Name="gMsgKanji89A4Tex" OutName="msg_kanji_89A4" Format="i4" Width="16" Height="16" Offset="0x21480"/>
+        <Texture Name="gMsgKanji89A5Tex" OutName="msg_kanji_89A5" Format="i4" Width="16" Height="16" Offset="0x21500"/>
+        <Texture Name="gMsgKanji89A6Tex" OutName="msg_kanji_89A6" Format="i4" Width="16" Height="16" Offset="0x21580"/>
+        <Texture Name="gMsgKanji89A7Tex" OutName="msg_kanji_89A7" Format="i4" Width="16" Height="16" Offset="0x21600"/>
+        <Texture Name="gMsgKanji89A8Tex" OutName="msg_kanji_89A8" Format="i4" Width="16" Height="16" Offset="0x21680"/>
+        <Texture Name="gMsgKanji89A9Tex" OutName="msg_kanji_89A9" Format="i4" Width="16" Height="16" Offset="0x21700"/>
+        <Texture Name="gMsgKanji89AATex" OutName="msg_kanji_89AA" Format="i4" Width="16" Height="16" Offset="0x21780"/>
+        <Texture Name="gMsgKanji89ABTex" OutName="msg_kanji_89AB" Format="i4" Width="16" Height="16" Offset="0x21800"/>
+        <Texture Name="gMsgKanji89ACTex" OutName="msg_kanji_89AC" Format="i4" Width="16" Height="16" Offset="0x21880"/>
+        <Texture Name="gMsgKanji89ADTex" OutName="msg_kanji_89AD" Format="i4" Width="16" Height="16" Offset="0x21900"/>
+        <Texture Name="gMsgKanji89AETex" OutName="msg_kanji_89AE" Format="i4" Width="16" Height="16" Offset="0x21980"/>
+        <Texture Name="gMsgKanji89AFTex" OutName="msg_kanji_89AF" Format="i4" Width="16" Height="16" Offset="0x21A00"/>
+        <Texture Name="gMsgKanji89B0Tex" OutName="msg_kanji_89B0" Format="i4" Width="16" Height="16" Offset="0x21A80"/>
+        <Texture Name="gMsgKanji89B1Tex" OutName="msg_kanji_89B1" Format="i4" Width="16" Height="16" Offset="0x21B00"/>
+        <Texture Name="gMsgKanji89B2Tex" OutName="msg_kanji_89B2" Format="i4" Width="16" Height="16" Offset="0x21B80"/>
+        <Texture Name="gMsgKanji89B3Tex" OutName="msg_kanji_89B3" Format="i4" Width="16" Height="16" Offset="0x21C00"/>
+        <Texture Name="gMsgKanji89B4Tex" OutName="msg_kanji_89B4" Format="i4" Width="16" Height="16" Offset="0x21C80"/>
+        <Texture Name="gMsgKanji89B5Tex" OutName="msg_kanji_89B5" Format="i4" Width="16" Height="16" Offset="0x21D00"/>
+        <Texture Name="gMsgKanji89B6Tex" OutName="msg_kanji_89B6" Format="i4" Width="16" Height="16" Offset="0x21D80"/>
+        <Texture Name="gMsgKanji89B7Tex" OutName="msg_kanji_89B7" Format="i4" Width="16" Height="16" Offset="0x21E00"/>
+        <Texture Name="gMsgKanji89B8Tex" OutName="msg_kanji_89B8" Format="i4" Width="16" Height="16" Offset="0x21E80"/>
+        <Texture Name="gMsgKanji89B9Tex" OutName="msg_kanji_89B9" Format="i4" Width="16" Height="16" Offset="0x21F00"/>
+        <Texture Name="gMsgKanji89BATex" OutName="msg_kanji_89BA" Format="i4" Width="16" Height="16" Offset="0x21F80"/>
+        <Texture Name="gMsgKanji89BBTex" OutName="msg_kanji_89BB" Format="i4" Width="16" Height="16" Offset="0x22000"/>
+        <Texture Name="gMsgKanji89BCTex" OutName="msg_kanji_89BC" Format="i4" Width="16" Height="16" Offset="0x22080"/>
+        <Texture Name="gMsgKanji89BDTex" OutName="msg_kanji_89BD" Format="i4" Width="16" Height="16" Offset="0x22100"/>
+        <Texture Name="gMsgKanji89BETex" OutName="msg_kanji_89BE" Format="i4" Width="16" Height="16" Offset="0x22180"/>
+        <Texture Name="gMsgKanji89BFTex" OutName="msg_kanji_89BF" Format="i4" Width="16" Height="16" Offset="0x22200"/>
+        <Texture Name="gMsgKanji89C0Tex" OutName="msg_kanji_89C0" Format="i4" Width="16" Height="16" Offset="0x22280"/>
+        <Texture Name="gMsgKanji89C1Tex" OutName="msg_kanji_89C1" Format="i4" Width="16" Height="16" Offset="0x22300"/>
+        <Texture Name="gMsgKanji89C2Tex" OutName="msg_kanji_89C2" Format="i4" Width="16" Height="16" Offset="0x22380"/>
+        <Texture Name="gMsgKanji89C3Tex" OutName="msg_kanji_89C3" Format="i4" Width="16" Height="16" Offset="0x22400"/>
+        <Texture Name="gMsgKanji89C4Tex" OutName="msg_kanji_89C4" Format="i4" Width="16" Height="16" Offset="0x22480"/>
+        <Texture Name="gMsgKanji89C5Tex" OutName="msg_kanji_89C5" Format="i4" Width="16" Height="16" Offset="0x22500"/>
+        <Texture Name="gMsgKanji89C6Tex" OutName="msg_kanji_89C6" Format="i4" Width="16" Height="16" Offset="0x22580"/>
+        <Texture Name="gMsgKanji89C7Tex" OutName="msg_kanji_89C7" Format="i4" Width="16" Height="16" Offset="0x22600"/>
+        <Texture Name="gMsgKanji89C8Tex" OutName="msg_kanji_89C8" Format="i4" Width="16" Height="16" Offset="0x22680"/>
+        <Texture Name="gMsgKanji89C9Tex" OutName="msg_kanji_89C9" Format="i4" Width="16" Height="16" Offset="0x22700"/>
+        <Texture Name="gMsgKanji89CATex" OutName="msg_kanji_89CA" Format="i4" Width="16" Height="16" Offset="0x22780"/>
+        <Texture Name="gMsgKanji89CBTex" OutName="msg_kanji_89CB" Format="i4" Width="16" Height="16" Offset="0x22800"/>
+        <Texture Name="gMsgKanji89CCTex" OutName="msg_kanji_89CC" Format="i4" Width="16" Height="16" Offset="0x22880"/>
+        <Texture Name="gMsgKanji89CDTex" OutName="msg_kanji_89CD" Format="i4" Width="16" Height="16" Offset="0x22900"/>
+        <Texture Name="gMsgKanji89CETex" OutName="msg_kanji_89CE" Format="i4" Width="16" Height="16" Offset="0x22980"/>
+        <Texture Name="gMsgKanji89CFTex" OutName="msg_kanji_89CF" Format="i4" Width="16" Height="16" Offset="0x22A00"/>
+        <Texture Name="gMsgKanji89D0Tex" OutName="msg_kanji_89D0" Format="i4" Width="16" Height="16" Offset="0x22A80"/>
+        <Texture Name="gMsgKanji89D1Tex" OutName="msg_kanji_89D1" Format="i4" Width="16" Height="16" Offset="0x22B00"/>
+        <Texture Name="gMsgKanji89D2Tex" OutName="msg_kanji_89D2" Format="i4" Width="16" Height="16" Offset="0x22B80"/>
+        <Texture Name="gMsgKanji89D3Tex" OutName="msg_kanji_89D3" Format="i4" Width="16" Height="16" Offset="0x22C00"/>
+        <Texture Name="gMsgKanji89D4Tex" OutName="msg_kanji_89D4" Format="i4" Width="16" Height="16" Offset="0x22C80"/>
+        <Texture Name="gMsgKanji89D5Tex" OutName="msg_kanji_89D5" Format="i4" Width="16" Height="16" Offset="0x22D00"/>
+        <Texture Name="gMsgKanji89D6Tex" OutName="msg_kanji_89D6" Format="i4" Width="16" Height="16" Offset="0x22D80"/>
+        <Texture Name="gMsgKanji89D7Tex" OutName="msg_kanji_89D7" Format="i4" Width="16" Height="16" Offset="0x22E00"/>
+        <Texture Name="gMsgKanji89D8Tex" OutName="msg_kanji_89D8" Format="i4" Width="16" Height="16" Offset="0x22E80"/>
+        <Texture Name="gMsgKanji89D9Tex" OutName="msg_kanji_89D9" Format="i4" Width="16" Height="16" Offset="0x22F00"/>
+        <Texture Name="gMsgKanji89DATex" OutName="msg_kanji_89DA" Format="i4" Width="16" Height="16" Offset="0x22F80"/>
+        <Texture Name="gMsgKanji89DBTex" OutName="msg_kanji_89DB" Format="i4" Width="16" Height="16" Offset="0x23000"/>
+        <Texture Name="gMsgKanji89DCTex" OutName="msg_kanji_89DC" Format="i4" Width="16" Height="16" Offset="0x23080"/>
+        <Texture Name="gMsgKanji89DDTex" OutName="msg_kanji_89DD" Format="i4" Width="16" Height="16" Offset="0x23100"/>
+        <Texture Name="gMsgKanji89DETex" OutName="msg_kanji_89DE" Format="i4" Width="16" Height="16" Offset="0x23180"/>
+        <Texture Name="gMsgKanji89DFTex" OutName="msg_kanji_89DF" Format="i4" Width="16" Height="16" Offset="0x23200"/>
+        <Texture Name="gMsgKanji89E0Tex" OutName="msg_kanji_89E0" Format="i4" Width="16" Height="16" Offset="0x23280"/>
+        <Texture Name="gMsgKanji89E1Tex" OutName="msg_kanji_89E1" Format="i4" Width="16" Height="16" Offset="0x23300"/>
+        <Texture Name="gMsgKanji89E2Tex" OutName="msg_kanji_89E2" Format="i4" Width="16" Height="16" Offset="0x23380"/>
+        <Texture Name="gMsgKanji89E3Tex" OutName="msg_kanji_89E3" Format="i4" Width="16" Height="16" Offset="0x23400"/>
+        <Texture Name="gMsgKanji89E4Tex" OutName="msg_kanji_89E4" Format="i4" Width="16" Height="16" Offset="0x23480"/>
+        <Texture Name="gMsgKanji89E5Tex" OutName="msg_kanji_89E5" Format="i4" Width="16" Height="16" Offset="0x23500"/>
+        <Texture Name="gMsgKanji89E6Tex" OutName="msg_kanji_89E6" Format="i4" Width="16" Height="16" Offset="0x23580"/>
+        <Texture Name="gMsgKanji89E7Tex" OutName="msg_kanji_89E7" Format="i4" Width="16" Height="16" Offset="0x23600"/>
+        <Texture Name="gMsgKanji89E8Tex" OutName="msg_kanji_89E8" Format="i4" Width="16" Height="16" Offset="0x23680"/>
+        <Texture Name="gMsgKanji89E9Tex" OutName="msg_kanji_89E9" Format="i4" Width="16" Height="16" Offset="0x23700"/>
+        <Texture Name="gMsgKanji89EATex" OutName="msg_kanji_89EA" Format="i4" Width="16" Height="16" Offset="0x23780"/>
+        <Texture Name="gMsgKanji89EBTex" OutName="msg_kanji_89EB" Format="i4" Width="16" Height="16" Offset="0x23800"/>
+        <Texture Name="gMsgKanji89ECTex" OutName="msg_kanji_89EC" Format="i4" Width="16" Height="16" Offset="0x23880"/>
+        <Texture Name="gMsgKanji89EDTex" OutName="msg_kanji_89ED" Format="i4" Width="16" Height="16" Offset="0x23900"/>
+        <Texture Name="gMsgKanji89EETex" OutName="msg_kanji_89EE" Format="i4" Width="16" Height="16" Offset="0x23980"/>
+        <Texture Name="gMsgKanji89EFTex" OutName="msg_kanji_89EF" Format="i4" Width="16" Height="16" Offset="0x23A00"/>
+        <Texture Name="gMsgKanji89F0Tex" OutName="msg_kanji_89F0" Format="i4" Width="16" Height="16" Offset="0x23A80"/>
+        <Texture Name="gMsgKanji89F1Tex" OutName="msg_kanji_89F1" Format="i4" Width="16" Height="16" Offset="0x23B00"/>
+        <Texture Name="gMsgKanji89F2Tex" OutName="msg_kanji_89F2" Format="i4" Width="16" Height="16" Offset="0x23B80"/>
+        <Texture Name="gMsgKanji89F3Tex" OutName="msg_kanji_89F3" Format="i4" Width="16" Height="16" Offset="0x23C00"/>
+        <Texture Name="gMsgKanji89F4Tex" OutName="msg_kanji_89F4" Format="i4" Width="16" Height="16" Offset="0x23C80"/>
+        <Texture Name="gMsgKanji89F5Tex" OutName="msg_kanji_89F5" Format="i4" Width="16" Height="16" Offset="0x23D00"/>
+        <Texture Name="gMsgKanji89F6Tex" OutName="msg_kanji_89F6" Format="i4" Width="16" Height="16" Offset="0x23D80"/>
+        <Texture Name="gMsgKanji89F7Tex" OutName="msg_kanji_89F7" Format="i4" Width="16" Height="16" Offset="0x23E00"/>
+        <Texture Name="gMsgKanji89F8Tex" OutName="msg_kanji_89F8" Format="i4" Width="16" Height="16" Offset="0x23E80"/>
+        <Texture Name="gMsgKanji89F9Tex" OutName="msg_kanji_89F9" Format="i4" Width="16" Height="16" Offset="0x23F00"/>
+        <Texture Name="gMsgKanji89FATex" OutName="msg_kanji_89FA" Format="i4" Width="16" Height="16" Offset="0x23F80"/>
+        <Texture Name="gMsgKanji89FBTex" OutName="msg_kanji_89FB" Format="i4" Width="16" Height="16" Offset="0x24000"/>
+        <Texture Name="gMsgKanji89FCTex" OutName="msg_kanji_89FC" Format="i4" Width="16" Height="16" Offset="0x24080"/>
+        <Texture Name="gMsgKanji8A40Tex" OutName="msg_kanji_8A40" Format="i4" Width="16" Height="16" Offset="0x24100"/>
+        <Texture Name="gMsgKanji8A41Tex" OutName="msg_kanji_8A41" Format="i4" Width="16" Height="16" Offset="0x24180"/>
+        <Texture Name="gMsgKanji8A42Tex" OutName="msg_kanji_8A42" Format="i4" Width="16" Height="16" Offset="0x24200"/>
+        <Texture Name="gMsgKanji8A43Tex" OutName="msg_kanji_8A43" Format="i4" Width="16" Height="16" Offset="0x24280"/>
+        <Texture Name="gMsgKanji8A44Tex" OutName="msg_kanji_8A44" Format="i4" Width="16" Height="16" Offset="0x24300"/>
+        <Texture Name="gMsgKanji8A45Tex" OutName="msg_kanji_8A45" Format="i4" Width="16" Height="16" Offset="0x24380"/>
+        <Texture Name="gMsgKanji8A46Tex" OutName="msg_kanji_8A46" Format="i4" Width="16" Height="16" Offset="0x24400"/>
+        <Texture Name="gMsgKanji8A47Tex" OutName="msg_kanji_8A47" Format="i4" Width="16" Height="16" Offset="0x24480"/>
+        <Texture Name="gMsgKanji8A48Tex" OutName="msg_kanji_8A48" Format="i4" Width="16" Height="16" Offset="0x24500"/>
+        <Texture Name="gMsgKanji8A49Tex" OutName="msg_kanji_8A49" Format="i4" Width="16" Height="16" Offset="0x24580"/>
+        <Texture Name="gMsgKanji8A4ATex" OutName="msg_kanji_8A4A" Format="i4" Width="16" Height="16" Offset="0x24600"/>
+        <Texture Name="gMsgKanji8A4BTex" OutName="msg_kanji_8A4B" Format="i4" Width="16" Height="16" Offset="0x24680"/>
+        <Texture Name="gMsgKanji8A4CTex" OutName="msg_kanji_8A4C" Format="i4" Width="16" Height="16" Offset="0x24700"/>
+        <Texture Name="gMsgKanji8A4DTex" OutName="msg_kanji_8A4D" Format="i4" Width="16" Height="16" Offset="0x24780"/>
+        <Texture Name="gMsgKanji8A4ETex" OutName="msg_kanji_8A4E" Format="i4" Width="16" Height="16" Offset="0x24800"/>
+        <Texture Name="gMsgKanji8A4FTex" OutName="msg_kanji_8A4F" Format="i4" Width="16" Height="16" Offset="0x24880"/>
+        <Texture Name="gMsgKanji8A50Tex" OutName="msg_kanji_8A50" Format="i4" Width="16" Height="16" Offset="0x24900"/>
+        <Texture Name="gMsgKanji8A51Tex" OutName="msg_kanji_8A51" Format="i4" Width="16" Height="16" Offset="0x24980"/>
+        <Texture Name="gMsgKanji8A52Tex" OutName="msg_kanji_8A52" Format="i4" Width="16" Height="16" Offset="0x24A00"/>
+        <Texture Name="gMsgKanji8A53Tex" OutName="msg_kanji_8A53" Format="i4" Width="16" Height="16" Offset="0x24A80"/>
+        <Texture Name="gMsgKanji8A54Tex" OutName="msg_kanji_8A54" Format="i4" Width="16" Height="16" Offset="0x24B00"/>
+        <Texture Name="gMsgKanji8A55Tex" OutName="msg_kanji_8A55" Format="i4" Width="16" Height="16" Offset="0x24B80"/>
+        <Texture Name="gMsgKanji8A56Tex" OutName="msg_kanji_8A56" Format="i4" Width="16" Height="16" Offset="0x24C00"/>
+        <Texture Name="gMsgKanji8A57Tex" OutName="msg_kanji_8A57" Format="i4" Width="16" Height="16" Offset="0x24C80"/>
+        <Texture Name="gMsgKanji8A58Tex" OutName="msg_kanji_8A58" Format="i4" Width="16" Height="16" Offset="0x24D00"/>
+        <Texture Name="gMsgKanji8A59Tex" OutName="msg_kanji_8A59" Format="i4" Width="16" Height="16" Offset="0x24D80"/>
+        <Texture Name="gMsgKanji8A5ATex" OutName="msg_kanji_8A5A" Format="i4" Width="16" Height="16" Offset="0x24E00"/>
+        <Texture Name="gMsgKanji8A5BTex" OutName="msg_kanji_8A5B" Format="i4" Width="16" Height="16" Offset="0x24E80"/>
+        <Texture Name="gMsgKanji8A5CTex" OutName="msg_kanji_8A5C" Format="i4" Width="16" Height="16" Offset="0x24F00"/>
+        <Texture Name="gMsgKanji8A5DTex" OutName="msg_kanji_8A5D" Format="i4" Width="16" Height="16" Offset="0x24F80"/>
+        <Texture Name="gMsgKanji8A5ETex" OutName="msg_kanji_8A5E" Format="i4" Width="16" Height="16" Offset="0x25000"/>
+        <Texture Name="gMsgKanji8A5FTex" OutName="msg_kanji_8A5F" Format="i4" Width="16" Height="16" Offset="0x25080"/>
+        <Texture Name="gMsgKanji8A60Tex" OutName="msg_kanji_8A60" Format="i4" Width="16" Height="16" Offset="0x25100"/>
+        <Texture Name="gMsgKanji8A61Tex" OutName="msg_kanji_8A61" Format="i4" Width="16" Height="16" Offset="0x25180"/>
+        <Texture Name="gMsgKanji8A62Tex" OutName="msg_kanji_8A62" Format="i4" Width="16" Height="16" Offset="0x25200"/>
+        <Texture Name="gMsgKanji8A63Tex" OutName="msg_kanji_8A63" Format="i4" Width="16" Height="16" Offset="0x25280"/>
+        <Texture Name="gMsgKanji8A64Tex" OutName="msg_kanji_8A64" Format="i4" Width="16" Height="16" Offset="0x25300"/>
+        <Texture Name="gMsgKanji8A65Tex" OutName="msg_kanji_8A65" Format="i4" Width="16" Height="16" Offset="0x25380"/>
+        <Texture Name="gMsgKanji8A66Tex" OutName="msg_kanji_8A66" Format="i4" Width="16" Height="16" Offset="0x25400"/>
+        <Texture Name="gMsgKanji8A67Tex" OutName="msg_kanji_8A67" Format="i4" Width="16" Height="16" Offset="0x25480"/>
+        <Texture Name="gMsgKanji8A68Tex" OutName="msg_kanji_8A68" Format="i4" Width="16" Height="16" Offset="0x25500"/>
+        <Texture Name="gMsgKanji8A69Tex" OutName="msg_kanji_8A69" Format="i4" Width="16" Height="16" Offset="0x25580"/>
+        <Texture Name="gMsgKanji8A6ATex" OutName="msg_kanji_8A6A" Format="i4" Width="16" Height="16" Offset="0x25600"/>
+        <Texture Name="gMsgKanji8A6BTex" OutName="msg_kanji_8A6B" Format="i4" Width="16" Height="16" Offset="0x25680"/>
+        <Texture Name="gMsgKanji8A6CTex" OutName="msg_kanji_8A6C" Format="i4" Width="16" Height="16" Offset="0x25700"/>
+        <Texture Name="gMsgKanji8A6DTex" OutName="msg_kanji_8A6D" Format="i4" Width="16" Height="16" Offset="0x25780"/>
+        <Texture Name="gMsgKanji8A6ETex" OutName="msg_kanji_8A6E" Format="i4" Width="16" Height="16" Offset="0x25800"/>
+        <Texture Name="gMsgKanji8A6FTex" OutName="msg_kanji_8A6F" Format="i4" Width="16" Height="16" Offset="0x25880"/>
+        <Texture Name="gMsgKanji8A70Tex" OutName="msg_kanji_8A70" Format="i4" Width="16" Height="16" Offset="0x25900"/>
+        <Texture Name="gMsgKanji8A71Tex" OutName="msg_kanji_8A71" Format="i4" Width="16" Height="16" Offset="0x25980"/>
+        <Texture Name="gMsgKanji8A72Tex" OutName="msg_kanji_8A72" Format="i4" Width="16" Height="16" Offset="0x25A00"/>
+        <Texture Name="gMsgKanji8A73Tex" OutName="msg_kanji_8A73" Format="i4" Width="16" Height="16" Offset="0x25A80"/>
+        <Texture Name="gMsgKanji8A74Tex" OutName="msg_kanji_8A74" Format="i4" Width="16" Height="16" Offset="0x25B00"/>
+        <Texture Name="gMsgKanji8A75Tex" OutName="msg_kanji_8A75" Format="i4" Width="16" Height="16" Offset="0x25B80"/>
+        <Texture Name="gMsgKanji8A76Tex" OutName="msg_kanji_8A76" Format="i4" Width="16" Height="16" Offset="0x25C00"/>
+        <Texture Name="gMsgKanji8A77Tex" OutName="msg_kanji_8A77" Format="i4" Width="16" Height="16" Offset="0x25C80"/>
+        <Texture Name="gMsgKanji8A78Tex" OutName="msg_kanji_8A78" Format="i4" Width="16" Height="16" Offset="0x25D00"/>
+        <Texture Name="gMsgKanji8A79Tex" OutName="msg_kanji_8A79" Format="i4" Width="16" Height="16" Offset="0x25D80"/>
+        <Texture Name="gMsgKanji8A7ATex" OutName="msg_kanji_8A7A" Format="i4" Width="16" Height="16" Offset="0x25E00"/>
+        <Texture Name="gMsgKanji8A7BTex" OutName="msg_kanji_8A7B" Format="i4" Width="16" Height="16" Offset="0x25E80"/>
+        <Texture Name="gMsgKanji8A7CTex" OutName="msg_kanji_8A7C" Format="i4" Width="16" Height="16" Offset="0x25F00"/>
+        <Texture Name="gMsgKanji8A7DTex" OutName="msg_kanji_8A7D" Format="i4" Width="16" Height="16" Offset="0x25F80"/>
+        <Texture Name="gMsgKanji8A7ETex" OutName="msg_kanji_8A7E" Format="i4" Width="16" Height="16" Offset="0x26000"/>
+        <Texture Name="gMsgKanji8A80Tex" OutName="msg_kanji_8A80" Format="i4" Width="16" Height="16" Offset="0x26080"/>
+        <Texture Name="gMsgKanji8A81Tex" OutName="msg_kanji_8A81" Format="i4" Width="16" Height="16" Offset="0x26100"/>
+        <Texture Name="gMsgKanji8A82Tex" OutName="msg_kanji_8A82" Format="i4" Width="16" Height="16" Offset="0x26180"/>
+        <Texture Name="gMsgKanji8A83Tex" OutName="msg_kanji_8A83" Format="i4" Width="16" Height="16" Offset="0x26200"/>
+        <Texture Name="gMsgKanji8A84Tex" OutName="msg_kanji_8A84" Format="i4" Width="16" Height="16" Offset="0x26280"/>
+        <Texture Name="gMsgKanji8A85Tex" OutName="msg_kanji_8A85" Format="i4" Width="16" Height="16" Offset="0x26300"/>
+        <Texture Name="gMsgKanji8A86Tex" OutName="msg_kanji_8A86" Format="i4" Width="16" Height="16" Offset="0x26380"/>
+        <Texture Name="gMsgKanji8A87Tex" OutName="msg_kanji_8A87" Format="i4" Width="16" Height="16" Offset="0x26400"/>
+        <Texture Name="gMsgKanji8A88Tex" OutName="msg_kanji_8A88" Format="i4" Width="16" Height="16" Offset="0x26480"/>
+        <Texture Name="gMsgKanji8A89Tex" OutName="msg_kanji_8A89" Format="i4" Width="16" Height="16" Offset="0x26500"/>
+        <Texture Name="gMsgKanji8A8ATex" OutName="msg_kanji_8A8A" Format="i4" Width="16" Height="16" Offset="0x26580"/>
+        <Texture Name="gMsgKanji8A8BTex" OutName="msg_kanji_8A8B" Format="i4" Width="16" Height="16" Offset="0x26600"/>
+        <Texture Name="gMsgKanji8A8CTex" OutName="msg_kanji_8A8C" Format="i4" Width="16" Height="16" Offset="0x26680"/>
+        <Texture Name="gMsgKanji8A8DTex" OutName="msg_kanji_8A8D" Format="i4" Width="16" Height="16" Offset="0x26700"/>
+        <Texture Name="gMsgKanji8A8ETex" OutName="msg_kanji_8A8E" Format="i4" Width="16" Height="16" Offset="0x26780"/>
+        <Texture Name="gMsgKanji8A8FTex" OutName="msg_kanji_8A8F" Format="i4" Width="16" Height="16" Offset="0x26800"/>
+        <Texture Name="gMsgKanji8A90Tex" OutName="msg_kanji_8A90" Format="i4" Width="16" Height="16" Offset="0x26880"/>
+        <Texture Name="gMsgKanji8A91Tex" OutName="msg_kanji_8A91" Format="i4" Width="16" Height="16" Offset="0x26900"/>
+        <Texture Name="gMsgKanji8A92Tex" OutName="msg_kanji_8A92" Format="i4" Width="16" Height="16" Offset="0x26980"/>
+        <Texture Name="gMsgKanji8A93Tex" OutName="msg_kanji_8A93" Format="i4" Width="16" Height="16" Offset="0x26A00"/>
+        <Texture Name="gMsgKanji8A94Tex" OutName="msg_kanji_8A94" Format="i4" Width="16" Height="16" Offset="0x26A80"/>
+        <Texture Name="gMsgKanji8A95Tex" OutName="msg_kanji_8A95" Format="i4" Width="16" Height="16" Offset="0x26B00"/>
+        <Texture Name="gMsgKanji8A96Tex" OutName="msg_kanji_8A96" Format="i4" Width="16" Height="16" Offset="0x26B80"/>
+        <Texture Name="gMsgKanji8A97Tex" OutName="msg_kanji_8A97" Format="i4" Width="16" Height="16" Offset="0x26C00"/>
+        <Texture Name="gMsgKanji8A98Tex" OutName="msg_kanji_8A98" Format="i4" Width="16" Height="16" Offset="0x26C80"/>
+        <Texture Name="gMsgKanji8A99Tex" OutName="msg_kanji_8A99" Format="i4" Width="16" Height="16" Offset="0x26D00"/>
+        <Texture Name="gMsgKanji8A9ATex" OutName="msg_kanji_8A9A" Format="i4" Width="16" Height="16" Offset="0x26D80"/>
+        <Texture Name="gMsgKanji8A9BTex" OutName="msg_kanji_8A9B" Format="i4" Width="16" Height="16" Offset="0x26E00"/>
+        <Texture Name="gMsgKanji8A9CTex" OutName="msg_kanji_8A9C" Format="i4" Width="16" Height="16" Offset="0x26E80"/>
+        <Texture Name="gMsgKanji8A9DTex" OutName="msg_kanji_8A9D" Format="i4" Width="16" Height="16" Offset="0x26F00"/>
+        <Texture Name="gMsgKanji8A9ETex" OutName="msg_kanji_8A9E" Format="i4" Width="16" Height="16" Offset="0x26F80"/>
+        <Texture Name="gMsgKanji8A9FTex" OutName="msg_kanji_8A9F" Format="i4" Width="16" Height="16" Offset="0x27000"/>
+        <Texture Name="gMsgKanji8AA0Tex" OutName="msg_kanji_8AA0" Format="i4" Width="16" Height="16" Offset="0x27080"/>
+        <Texture Name="gMsgKanji8AA1Tex" OutName="msg_kanji_8AA1" Format="i4" Width="16" Height="16" Offset="0x27100"/>
+        <Texture Name="gMsgKanji8AA2Tex" OutName="msg_kanji_8AA2" Format="i4" Width="16" Height="16" Offset="0x27180"/>
+        <Texture Name="gMsgKanji8AA3Tex" OutName="msg_kanji_8AA3" Format="i4" Width="16" Height="16" Offset="0x27200"/>
+        <Texture Name="gMsgKanji8AA4Tex" OutName="msg_kanji_8AA4" Format="i4" Width="16" Height="16" Offset="0x27280"/>
+        <Texture Name="gMsgKanji8AA5Tex" OutName="msg_kanji_8AA5" Format="i4" Width="16" Height="16" Offset="0x27300"/>
+        <Texture Name="gMsgKanji8AA6Tex" OutName="msg_kanji_8AA6" Format="i4" Width="16" Height="16" Offset="0x27380"/>
+        <Texture Name="gMsgKanji8AA7Tex" OutName="msg_kanji_8AA7" Format="i4" Width="16" Height="16" Offset="0x27400"/>
+        <Texture Name="gMsgKanji8AA8Tex" OutName="msg_kanji_8AA8" Format="i4" Width="16" Height="16" Offset="0x27480"/>
+        <Texture Name="gMsgKanji8AA9Tex" OutName="msg_kanji_8AA9" Format="i4" Width="16" Height="16" Offset="0x27500"/>
+        <Texture Name="gMsgKanji8AAATex" OutName="msg_kanji_8AAA" Format="i4" Width="16" Height="16" Offset="0x27580"/>
+        <Texture Name="gMsgKanji8AABTex" OutName="msg_kanji_8AAB" Format="i4" Width="16" Height="16" Offset="0x27600"/>
+        <Texture Name="gMsgKanji8AACTex" OutName="msg_kanji_8AAC" Format="i4" Width="16" Height="16" Offset="0x27680"/>
+        <Texture Name="gMsgKanji8AADTex" OutName="msg_kanji_8AAD" Format="i4" Width="16" Height="16" Offset="0x27700"/>
+        <Texture Name="gMsgKanji8AAETex" OutName="msg_kanji_8AAE" Format="i4" Width="16" Height="16" Offset="0x27780"/>
+        <Texture Name="gMsgKanji8AAFTex" OutName="msg_kanji_8AAF" Format="i4" Width="16" Height="16" Offset="0x27800"/>
+        <Texture Name="gMsgKanji8AB0Tex" OutName="msg_kanji_8AB0" Format="i4" Width="16" Height="16" Offset="0x27880"/>
+        <Texture Name="gMsgKanji8AB1Tex" OutName="msg_kanji_8AB1" Format="i4" Width="16" Height="16" Offset="0x27900"/>
+        <Texture Name="gMsgKanji8AB2Tex" OutName="msg_kanji_8AB2" Format="i4" Width="16" Height="16" Offset="0x27980"/>
+        <Texture Name="gMsgKanji8AB3Tex" OutName="msg_kanji_8AB3" Format="i4" Width="16" Height="16" Offset="0x27A00"/>
+        <Texture Name="gMsgKanji8AB4Tex" OutName="msg_kanji_8AB4" Format="i4" Width="16" Height="16" Offset="0x27A80"/>
+        <Texture Name="gMsgKanji8AB5Tex" OutName="msg_kanji_8AB5" Format="i4" Width="16" Height="16" Offset="0x27B00"/>
+        <Texture Name="gMsgKanji8AB6Tex" OutName="msg_kanji_8AB6" Format="i4" Width="16" Height="16" Offset="0x27B80"/>
+        <Texture Name="gMsgKanji8AB7Tex" OutName="msg_kanji_8AB7" Format="i4" Width="16" Height="16" Offset="0x27C00"/>
+        <Texture Name="gMsgKanji8AB8Tex" OutName="msg_kanji_8AB8" Format="i4" Width="16" Height="16" Offset="0x27C80"/>
+        <Texture Name="gMsgKanji8AB9Tex" OutName="msg_kanji_8AB9" Format="i4" Width="16" Height="16" Offset="0x27D00"/>
+        <Texture Name="gMsgKanji8ABATex" OutName="msg_kanji_8ABA" Format="i4" Width="16" Height="16" Offset="0x27D80"/>
+        <Texture Name="gMsgKanji8ABBTex" OutName="msg_kanji_8ABB" Format="i4" Width="16" Height="16" Offset="0x27E00"/>
+        <Texture Name="gMsgKanji8ABCTex" OutName="msg_kanji_8ABC" Format="i4" Width="16" Height="16" Offset="0x27E80"/>
+        <Texture Name="gMsgKanji8ABDTex" OutName="msg_kanji_8ABD" Format="i4" Width="16" Height="16" Offset="0x27F00"/>
+        <Texture Name="gMsgKanji8ABETex" OutName="msg_kanji_8ABE" Format="i4" Width="16" Height="16" Offset="0x27F80"/>
+        <Texture Name="gMsgKanji8ABFTex" OutName="msg_kanji_8ABF" Format="i4" Width="16" Height="16" Offset="0x28000"/>
+        <Texture Name="gMsgKanji8AC0Tex" OutName="msg_kanji_8AC0" Format="i4" Width="16" Height="16" Offset="0x28080"/>
+        <Texture Name="gMsgKanji8AC1Tex" OutName="msg_kanji_8AC1" Format="i4" Width="16" Height="16" Offset="0x28100"/>
+        <Texture Name="gMsgKanji8AC2Tex" OutName="msg_kanji_8AC2" Format="i4" Width="16" Height="16" Offset="0x28180"/>
+        <Texture Name="gMsgKanji8AC3Tex" OutName="msg_kanji_8AC3" Format="i4" Width="16" Height="16" Offset="0x28200"/>
+        <Texture Name="gMsgKanji8AC4Tex" OutName="msg_kanji_8AC4" Format="i4" Width="16" Height="16" Offset="0x28280"/>
+        <Texture Name="gMsgKanji8AC5Tex" OutName="msg_kanji_8AC5" Format="i4" Width="16" Height="16" Offset="0x28300"/>
+        <Texture Name="gMsgKanji8AC6Tex" OutName="msg_kanji_8AC6" Format="i4" Width="16" Height="16" Offset="0x28380"/>
+        <Texture Name="gMsgKanji8AC7Tex" OutName="msg_kanji_8AC7" Format="i4" Width="16" Height="16" Offset="0x28400"/>
+        <Texture Name="gMsgKanji8AC8Tex" OutName="msg_kanji_8AC8" Format="i4" Width="16" Height="16" Offset="0x28480"/>
+        <Texture Name="gMsgKanji8AC9Tex" OutName="msg_kanji_8AC9" Format="i4" Width="16" Height="16" Offset="0x28500"/>
+        <Texture Name="gMsgKanji8ACATex" OutName="msg_kanji_8ACA" Format="i4" Width="16" Height="16" Offset="0x28580"/>
+        <Texture Name="gMsgKanji8ACBTex" OutName="msg_kanji_8ACB" Format="i4" Width="16" Height="16" Offset="0x28600"/>
+        <Texture Name="gMsgKanji8ACCTex" OutName="msg_kanji_8ACC" Format="i4" Width="16" Height="16" Offset="0x28680"/>
+        <Texture Name="gMsgKanji8ACDTex" OutName="msg_kanji_8ACD" Format="i4" Width="16" Height="16" Offset="0x28700"/>
+        <Texture Name="gMsgKanji8ACETex" OutName="msg_kanji_8ACE" Format="i4" Width="16" Height="16" Offset="0x28780"/>
+        <Texture Name="gMsgKanji8ACFTex" OutName="msg_kanji_8ACF" Format="i4" Width="16" Height="16" Offset="0x28800"/>
+        <Texture Name="gMsgKanji8AD0Tex" OutName="msg_kanji_8AD0" Format="i4" Width="16" Height="16" Offset="0x28880"/>
+        <Texture Name="gMsgKanji8AD1Tex" OutName="msg_kanji_8AD1" Format="i4" Width="16" Height="16" Offset="0x28900"/>
+        <Texture Name="gMsgKanji8AD2Tex" OutName="msg_kanji_8AD2" Format="i4" Width="16" Height="16" Offset="0x28980"/>
+        <Texture Name="gMsgKanji8AD3Tex" OutName="msg_kanji_8AD3" Format="i4" Width="16" Height="16" Offset="0x28A00"/>
+        <Texture Name="gMsgKanji8AD4Tex" OutName="msg_kanji_8AD4" Format="i4" Width="16" Height="16" Offset="0x28A80"/>
+        <Texture Name="gMsgKanji8AD5Tex" OutName="msg_kanji_8AD5" Format="i4" Width="16" Height="16" Offset="0x28B00"/>
+        <Texture Name="gMsgKanji8AD6Tex" OutName="msg_kanji_8AD6" Format="i4" Width="16" Height="16" Offset="0x28B80"/>
+        <Texture Name="gMsgKanji8AD7Tex" OutName="msg_kanji_8AD7" Format="i4" Width="16" Height="16" Offset="0x28C00"/>
+        <Texture Name="gMsgKanji8AD8Tex" OutName="msg_kanji_8AD8" Format="i4" Width="16" Height="16" Offset="0x28C80"/>
+        <Texture Name="gMsgKanji8AD9Tex" OutName="msg_kanji_8AD9" Format="i4" Width="16" Height="16" Offset="0x28D00"/>
+        <Texture Name="gMsgKanji8ADATex" OutName="msg_kanji_8ADA" Format="i4" Width="16" Height="16" Offset="0x28D80"/>
+        <Texture Name="gMsgKanji8ADBTex" OutName="msg_kanji_8ADB" Format="i4" Width="16" Height="16" Offset="0x28E00"/>
+        <Texture Name="gMsgKanji8ADCTex" OutName="msg_kanji_8ADC" Format="i4" Width="16" Height="16" Offset="0x28E80"/>
+        <Texture Name="gMsgKanji8ADDTex" OutName="msg_kanji_8ADD" Format="i4" Width="16" Height="16" Offset="0x28F00"/>
+        <Texture Name="gMsgKanji8ADETex" OutName="msg_kanji_8ADE" Format="i4" Width="16" Height="16" Offset="0x28F80"/>
+        <Texture Name="gMsgKanji8ADFTex" OutName="msg_kanji_8ADF" Format="i4" Width="16" Height="16" Offset="0x29000"/>
+        <Texture Name="gMsgKanji8AE0Tex" OutName="msg_kanji_8AE0" Format="i4" Width="16" Height="16" Offset="0x29080"/>
+        <Texture Name="gMsgKanji8AE1Tex" OutName="msg_kanji_8AE1" Format="i4" Width="16" Height="16" Offset="0x29100"/>
+        <Texture Name="gMsgKanji8AE2Tex" OutName="msg_kanji_8AE2" Format="i4" Width="16" Height="16" Offset="0x29180"/>
+        <Texture Name="gMsgKanji8AE3Tex" OutName="msg_kanji_8AE3" Format="i4" Width="16" Height="16" Offset="0x29200"/>
+        <Texture Name="gMsgKanji8AE4Tex" OutName="msg_kanji_8AE4" Format="i4" Width="16" Height="16" Offset="0x29280"/>
+        <Texture Name="gMsgKanji8AE5Tex" OutName="msg_kanji_8AE5" Format="i4" Width="16" Height="16" Offset="0x29300"/>
+        <Texture Name="gMsgKanji8AE6Tex" OutName="msg_kanji_8AE6" Format="i4" Width="16" Height="16" Offset="0x29380"/>
+        <Texture Name="gMsgKanji8AE7Tex" OutName="msg_kanji_8AE7" Format="i4" Width="16" Height="16" Offset="0x29400"/>
+        <Texture Name="gMsgKanji8AE8Tex" OutName="msg_kanji_8AE8" Format="i4" Width="16" Height="16" Offset="0x29480"/>
+        <Texture Name="gMsgKanji8AE9Tex" OutName="msg_kanji_8AE9" Format="i4" Width="16" Height="16" Offset="0x29500"/>
+        <Texture Name="gMsgKanji8AEATex" OutName="msg_kanji_8AEA" Format="i4" Width="16" Height="16" Offset="0x29580"/>
+        <Texture Name="gMsgKanji8AEBTex" OutName="msg_kanji_8AEB" Format="i4" Width="16" Height="16" Offset="0x29600"/>
+        <Texture Name="gMsgKanji8AECTex" OutName="msg_kanji_8AEC" Format="i4" Width="16" Height="16" Offset="0x29680"/>
+        <Texture Name="gMsgKanji8AEDTex" OutName="msg_kanji_8AED" Format="i4" Width="16" Height="16" Offset="0x29700"/>
+        <Texture Name="gMsgKanji8AEETex" OutName="msg_kanji_8AEE" Format="i4" Width="16" Height="16" Offset="0x29780"/>
+        <Texture Name="gMsgKanji8AEFTex" OutName="msg_kanji_8AEF" Format="i4" Width="16" Height="16" Offset="0x29800"/>
+        <Texture Name="gMsgKanji8AF0Tex" OutName="msg_kanji_8AF0" Format="i4" Width="16" Height="16" Offset="0x29880"/>
+        <Texture Name="gMsgKanji8AF1Tex" OutName="msg_kanji_8AF1" Format="i4" Width="16" Height="16" Offset="0x29900"/>
+        <Texture Name="gMsgKanji8AF2Tex" OutName="msg_kanji_8AF2" Format="i4" Width="16" Height="16" Offset="0x29980"/>
+        <Texture Name="gMsgKanji8AF3Tex" OutName="msg_kanji_8AF3" Format="i4" Width="16" Height="16" Offset="0x29A00"/>
+        <Texture Name="gMsgKanji8AF4Tex" OutName="msg_kanji_8AF4" Format="i4" Width="16" Height="16" Offset="0x29A80"/>
+        <Texture Name="gMsgKanji8AF5Tex" OutName="msg_kanji_8AF5" Format="i4" Width="16" Height="16" Offset="0x29B00"/>
+        <Texture Name="gMsgKanji8AF6Tex" OutName="msg_kanji_8AF6" Format="i4" Width="16" Height="16" Offset="0x29B80"/>
+        <Texture Name="gMsgKanji8AF7Tex" OutName="msg_kanji_8AF7" Format="i4" Width="16" Height="16" Offset="0x29C00"/>
+        <Texture Name="gMsgKanji8AF8Tex" OutName="msg_kanji_8AF8" Format="i4" Width="16" Height="16" Offset="0x29C80"/>
+        <Texture Name="gMsgKanji8AF9Tex" OutName="msg_kanji_8AF9" Format="i4" Width="16" Height="16" Offset="0x29D00"/>
+        <Texture Name="gMsgKanji8AFATex" OutName="msg_kanji_8AFA" Format="i4" Width="16" Height="16" Offset="0x29D80"/>
+        <Texture Name="gMsgKanji8AFBTex" OutName="msg_kanji_8AFB" Format="i4" Width="16" Height="16" Offset="0x29E00"/>
+        <Texture Name="gMsgKanji8AFCTex" OutName="msg_kanji_8AFC" Format="i4" Width="16" Height="16" Offset="0x29E80"/>
+        <Texture Name="gMsgKanji8B40Tex" OutName="msg_kanji_8B40" Format="i4" Width="16" Height="16" Offset="0x29F00"/>
+        <Texture Name="gMsgKanji8B41Tex" OutName="msg_kanji_8B41" Format="i4" Width="16" Height="16" Offset="0x29F80"/>
+        <Texture Name="gMsgKanji8B42Tex" OutName="msg_kanji_8B42" Format="i4" Width="16" Height="16" Offset="0x2A000"/>
+        <Texture Name="gMsgKanji8B43Tex" OutName="msg_kanji_8B43" Format="i4" Width="16" Height="16" Offset="0x2A080"/>
+        <Texture Name="gMsgKanji8B44Tex" OutName="msg_kanji_8B44" Format="i4" Width="16" Height="16" Offset="0x2A100"/>
+        <Texture Name="gMsgKanji8B45Tex" OutName="msg_kanji_8B45" Format="i4" Width="16" Height="16" Offset="0x2A180"/>
+        <Texture Name="gMsgKanji8B46Tex" OutName="msg_kanji_8B46" Format="i4" Width="16" Height="16" Offset="0x2A200"/>
+        <Texture Name="gMsgKanji8B47Tex" OutName="msg_kanji_8B47" Format="i4" Width="16" Height="16" Offset="0x2A280"/>
+        <Texture Name="gMsgKanji8B48Tex" OutName="msg_kanji_8B48" Format="i4" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gMsgKanji8B49Tex" OutName="msg_kanji_8B49" Format="i4" Width="16" Height="16" Offset="0x2A380"/>
+        <Texture Name="gMsgKanji8B4ATex" OutName="msg_kanji_8B4A" Format="i4" Width="16" Height="16" Offset="0x2A400"/>
+        <Texture Name="gMsgKanji8B4BTex" OutName="msg_kanji_8B4B" Format="i4" Width="16" Height="16" Offset="0x2A480"/>
+        <Texture Name="gMsgKanji8B4CTex" OutName="msg_kanji_8B4C" Format="i4" Width="16" Height="16" Offset="0x2A500"/>
+        <Texture Name="gMsgKanji8B4DTex" OutName="msg_kanji_8B4D" Format="i4" Width="16" Height="16" Offset="0x2A580"/>
+        <Texture Name="gMsgKanji8B4ETex" OutName="msg_kanji_8B4E" Format="i4" Width="16" Height="16" Offset="0x2A600"/>
+        <Texture Name="gMsgKanji8B4FTex" OutName="msg_kanji_8B4F" Format="i4" Width="16" Height="16" Offset="0x2A680"/>
+        <Texture Name="gMsgKanji8B50Tex" OutName="msg_kanji_8B50" Format="i4" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gMsgKanji8B51Tex" OutName="msg_kanji_8B51" Format="i4" Width="16" Height="16" Offset="0x2A780"/>
+        <Texture Name="gMsgKanji8B52Tex" OutName="msg_kanji_8B52" Format="i4" Width="16" Height="16" Offset="0x2A800"/>
+        <Texture Name="gMsgKanji8B53Tex" OutName="msg_kanji_8B53" Format="i4" Width="16" Height="16" Offset="0x2A880"/>
+        <Texture Name="gMsgKanji8B54Tex" OutName="msg_kanji_8B54" Format="i4" Width="16" Height="16" Offset="0x2A900"/>
+        <Texture Name="gMsgKanji8B55Tex" OutName="msg_kanji_8B55" Format="i4" Width="16" Height="16" Offset="0x2A980"/>
+        <Texture Name="gMsgKanji8B56Tex" OutName="msg_kanji_8B56" Format="i4" Width="16" Height="16" Offset="0x2AA00"/>
+        <Texture Name="gMsgKanji8B57Tex" OutName="msg_kanji_8B57" Format="i4" Width="16" Height="16" Offset="0x2AA80"/>
+        <Texture Name="gMsgKanji8B58Tex" OutName="msg_kanji_8B58" Format="i4" Width="16" Height="16" Offset="0x2AB00"/>
+        <Texture Name="gMsgKanji8B59Tex" OutName="msg_kanji_8B59" Format="i4" Width="16" Height="16" Offset="0x2AB80"/>
+        <Texture Name="gMsgKanji8B5ATex" OutName="msg_kanji_8B5A" Format="i4" Width="16" Height="16" Offset="0x2AC00"/>
+        <Texture Name="gMsgKanji8B5BTex" OutName="msg_kanji_8B5B" Format="i4" Width="16" Height="16" Offset="0x2AC80"/>
+        <Texture Name="gMsgKanji8B5CTex" OutName="msg_kanji_8B5C" Format="i4" Width="16" Height="16" Offset="0x2AD00"/>
+        <Texture Name="gMsgKanji8B5DTex" OutName="msg_kanji_8B5D" Format="i4" Width="16" Height="16" Offset="0x2AD80"/>
+        <Texture Name="gMsgKanji8B5ETex" OutName="msg_kanji_8B5E" Format="i4" Width="16" Height="16" Offset="0x2AE00"/>
+        <Texture Name="gMsgKanji8B5FTex" OutName="msg_kanji_8B5F" Format="i4" Width="16" Height="16" Offset="0x2AE80"/>
+        <Texture Name="gMsgKanji8B60Tex" OutName="msg_kanji_8B60" Format="i4" Width="16" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gMsgKanji8B61Tex" OutName="msg_kanji_8B61" Format="i4" Width="16" Height="16" Offset="0x2AF80"/>
+        <Texture Name="gMsgKanji8B62Tex" OutName="msg_kanji_8B62" Format="i4" Width="16" Height="16" Offset="0x2B000"/>
+        <Texture Name="gMsgKanji8B63Tex" OutName="msg_kanji_8B63" Format="i4" Width="16" Height="16" Offset="0x2B080"/>
+        <Texture Name="gMsgKanji8B64Tex" OutName="msg_kanji_8B64" Format="i4" Width="16" Height="16" Offset="0x2B100"/>
+        <Texture Name="gMsgKanji8B65Tex" OutName="msg_kanji_8B65" Format="i4" Width="16" Height="16" Offset="0x2B180"/>
+        <Texture Name="gMsgKanji8B66Tex" OutName="msg_kanji_8B66" Format="i4" Width="16" Height="16" Offset="0x2B200"/>
+        <Texture Name="gMsgKanji8B67Tex" OutName="msg_kanji_8B67" Format="i4" Width="16" Height="16" Offset="0x2B280"/>
+        <Texture Name="gMsgKanji8B68Tex" OutName="msg_kanji_8B68" Format="i4" Width="16" Height="16" Offset="0x2B300"/>
+        <Texture Name="gMsgKanji8B69Tex" OutName="msg_kanji_8B69" Format="i4" Width="16" Height="16" Offset="0x2B380"/>
+        <Texture Name="gMsgKanji8B6ATex" OutName="msg_kanji_8B6A" Format="i4" Width="16" Height="16" Offset="0x2B400"/>
+        <Texture Name="gMsgKanji8B6BTex" OutName="msg_kanji_8B6B" Format="i4" Width="16" Height="16" Offset="0x2B480"/>
+        <Texture Name="gMsgKanji8B6CTex" OutName="msg_kanji_8B6C" Format="i4" Width="16" Height="16" Offset="0x2B500"/>
+        <Texture Name="gMsgKanji8B6DTex" OutName="msg_kanji_8B6D" Format="i4" Width="16" Height="16" Offset="0x2B580"/>
+        <Texture Name="gMsgKanji8B6ETex" OutName="msg_kanji_8B6E" Format="i4" Width="16" Height="16" Offset="0x2B600"/>
+        <Texture Name="gMsgKanji8B6FTex" OutName="msg_kanji_8B6F" Format="i4" Width="16" Height="16" Offset="0x2B680"/>
+        <Texture Name="gMsgKanji8B70Tex" OutName="msg_kanji_8B70" Format="i4" Width="16" Height="16" Offset="0x2B700"/>
+        <Texture Name="gMsgKanji8B71Tex" OutName="msg_kanji_8B71" Format="i4" Width="16" Height="16" Offset="0x2B780"/>
+        <Texture Name="gMsgKanji8B72Tex" OutName="msg_kanji_8B72" Format="i4" Width="16" Height="16" Offset="0x2B800"/>
+        <Texture Name="gMsgKanji8B73Tex" OutName="msg_kanji_8B73" Format="i4" Width="16" Height="16" Offset="0x2B880"/>
+        <Texture Name="gMsgKanji8B74Tex" OutName="msg_kanji_8B74" Format="i4" Width="16" Height="16" Offset="0x2B900"/>
+        <Texture Name="gMsgKanji8B75Tex" OutName="msg_kanji_8B75" Format="i4" Width="16" Height="16" Offset="0x2B980"/>
+        <Texture Name="gMsgKanji8B76Tex" OutName="msg_kanji_8B76" Format="i4" Width="16" Height="16" Offset="0x2BA00"/>
+        <Texture Name="gMsgKanji8B77Tex" OutName="msg_kanji_8B77" Format="i4" Width="16" Height="16" Offset="0x2BA80"/>
+        <Texture Name="gMsgKanji8B78Tex" OutName="msg_kanji_8B78" Format="i4" Width="16" Height="16" Offset="0x2BB00"/>
+        <Texture Name="gMsgKanji8B79Tex" OutName="msg_kanji_8B79" Format="i4" Width="16" Height="16" Offset="0x2BB80"/>
+        <Texture Name="gMsgKanji8B7ATex" OutName="msg_kanji_8B7A" Format="i4" Width="16" Height="16" Offset="0x2BC00"/>
+        <Texture Name="gMsgKanji8B7BTex" OutName="msg_kanji_8B7B" Format="i4" Width="16" Height="16" Offset="0x2BC80"/>
+        <Texture Name="gMsgKanji8B7CTex" OutName="msg_kanji_8B7C" Format="i4" Width="16" Height="16" Offset="0x2BD00"/>
+        <Texture Name="gMsgKanji8B7DTex" OutName="msg_kanji_8B7D" Format="i4" Width="16" Height="16" Offset="0x2BD80"/>
+        <Texture Name="gMsgKanji8B7ETex" OutName="msg_kanji_8B7E" Format="i4" Width="16" Height="16" Offset="0x2BE00"/>
+        <Texture Name="gMsgKanji8B80Tex" OutName="msg_kanji_8B80" Format="i4" Width="16" Height="16" Offset="0x2BE80"/>
+        <Texture Name="gMsgKanji8B81Tex" OutName="msg_kanji_8B81" Format="i4" Width="16" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gMsgKanji8B82Tex" OutName="msg_kanji_8B82" Format="i4" Width="16" Height="16" Offset="0x2BF80"/>
+        <Texture Name="gMsgKanji8B83Tex" OutName="msg_kanji_8B83" Format="i4" Width="16" Height="16" Offset="0x2C000"/>
+        <Texture Name="gMsgKanji8B84Tex" OutName="msg_kanji_8B84" Format="i4" Width="16" Height="16" Offset="0x2C080"/>
+        <Texture Name="gMsgKanji8B85Tex" OutName="msg_kanji_8B85" Format="i4" Width="16" Height="16" Offset="0x2C100"/>
+        <Texture Name="gMsgKanji8B86Tex" OutName="msg_kanji_8B86" Format="i4" Width="16" Height="16" Offset="0x2C180"/>
+        <Texture Name="gMsgKanji8B87Tex" OutName="msg_kanji_8B87" Format="i4" Width="16" Height="16" Offset="0x2C200"/>
+        <Texture Name="gMsgKanji8B88Tex" OutName="msg_kanji_8B88" Format="i4" Width="16" Height="16" Offset="0x2C280"/>
+        <Texture Name="gMsgKanji8B89Tex" OutName="msg_kanji_8B89" Format="i4" Width="16" Height="16" Offset="0x2C300"/>
+        <Texture Name="gMsgKanji8B8ATex" OutName="msg_kanji_8B8A" Format="i4" Width="16" Height="16" Offset="0x2C380"/>
+        <Texture Name="gMsgKanji8B8BTex" OutName="msg_kanji_8B8B" Format="i4" Width="16" Height="16" Offset="0x2C400"/>
+        <Texture Name="gMsgKanji8B8CTex" OutName="msg_kanji_8B8C" Format="i4" Width="16" Height="16" Offset="0x2C480"/>
+        <Texture Name="gMsgKanji8B8DTex" OutName="msg_kanji_8B8D" Format="i4" Width="16" Height="16" Offset="0x2C500"/>
+        <Texture Name="gMsgKanji8B8ETex" OutName="msg_kanji_8B8E" Format="i4" Width="16" Height="16" Offset="0x2C580"/>
+        <Texture Name="gMsgKanji8B8FTex" OutName="msg_kanji_8B8F" Format="i4" Width="16" Height="16" Offset="0x2C600"/>
+        <Texture Name="gMsgKanji8B90Tex" OutName="msg_kanji_8B90" Format="i4" Width="16" Height="16" Offset="0x2C680"/>
+        <Texture Name="gMsgKanji8B91Tex" OutName="msg_kanji_8B91" Format="i4" Width="16" Height="16" Offset="0x2C700"/>
+        <Texture Name="gMsgKanji8B92Tex" OutName="msg_kanji_8B92" Format="i4" Width="16" Height="16" Offset="0x2C780"/>
+        <Texture Name="gMsgKanji8B93Tex" OutName="msg_kanji_8B93" Format="i4" Width="16" Height="16" Offset="0x2C800"/>
+        <Texture Name="gMsgKanji8B94Tex" OutName="msg_kanji_8B94" Format="i4" Width="16" Height="16" Offset="0x2C880"/>
+        <Texture Name="gMsgKanji8B95Tex" OutName="msg_kanji_8B95" Format="i4" Width="16" Height="16" Offset="0x2C900"/>
+        <Texture Name="gMsgKanji8B96Tex" OutName="msg_kanji_8B96" Format="i4" Width="16" Height="16" Offset="0x2C980"/>
+        <Texture Name="gMsgKanji8B97Tex" OutName="msg_kanji_8B97" Format="i4" Width="16" Height="16" Offset="0x2CA00"/>
+        <Texture Name="gMsgKanji8B98Tex" OutName="msg_kanji_8B98" Format="i4" Width="16" Height="16" Offset="0x2CA80"/>
+        <Texture Name="gMsgKanji8B99Tex" OutName="msg_kanji_8B99" Format="i4" Width="16" Height="16" Offset="0x2CB00"/>
+        <Texture Name="gMsgKanji8B9ATex" OutName="msg_kanji_8B9A" Format="i4" Width="16" Height="16" Offset="0x2CB80"/>
+        <Texture Name="gMsgKanji8B9BTex" OutName="msg_kanji_8B9B" Format="i4" Width="16" Height="16" Offset="0x2CC00"/>
+        <Texture Name="gMsgKanji8B9CTex" OutName="msg_kanji_8B9C" Format="i4" Width="16" Height="16" Offset="0x2CC80"/>
+        <Texture Name="gMsgKanji8B9DTex" OutName="msg_kanji_8B9D" Format="i4" Width="16" Height="16" Offset="0x2CD00"/>
+        <Texture Name="gMsgKanji8B9ETex" OutName="msg_kanji_8B9E" Format="i4" Width="16" Height="16" Offset="0x2CD80"/>
+        <Texture Name="gMsgKanji8B9FTex" OutName="msg_kanji_8B9F" Format="i4" Width="16" Height="16" Offset="0x2CE00"/>
+        <Texture Name="gMsgKanji8BA0Tex" OutName="msg_kanji_8BA0" Format="i4" Width="16" Height="16" Offset="0x2CE80"/>
+        <Texture Name="gMsgKanji8BA1Tex" OutName="msg_kanji_8BA1" Format="i4" Width="16" Height="16" Offset="0x2CF00"/>
+        <Texture Name="gMsgKanji8BA2Tex" OutName="msg_kanji_8BA2" Format="i4" Width="16" Height="16" Offset="0x2CF80"/>
+        <Texture Name="gMsgKanji8BA3Tex" OutName="msg_kanji_8BA3" Format="i4" Width="16" Height="16" Offset="0x2D000"/>
+        <Texture Name="gMsgKanji8BA4Tex" OutName="msg_kanji_8BA4" Format="i4" Width="16" Height="16" Offset="0x2D080"/>
+        <Texture Name="gMsgKanji8BA5Tex" OutName="msg_kanji_8BA5" Format="i4" Width="16" Height="16" Offset="0x2D100"/>
+        <Texture Name="gMsgKanji8BA6Tex" OutName="msg_kanji_8BA6" Format="i4" Width="16" Height="16" Offset="0x2D180"/>
+        <Texture Name="gMsgKanji8BA7Tex" OutName="msg_kanji_8BA7" Format="i4" Width="16" Height="16" Offset="0x2D200"/>
+        <Texture Name="gMsgKanji8BA8Tex" OutName="msg_kanji_8BA8" Format="i4" Width="16" Height="16" Offset="0x2D280"/>
+        <Texture Name="gMsgKanji8BA9Tex" OutName="msg_kanji_8BA9" Format="i4" Width="16" Height="16" Offset="0x2D300"/>
+        <Texture Name="gMsgKanji8BAATex" OutName="msg_kanji_8BAA" Format="i4" Width="16" Height="16" Offset="0x2D380"/>
+        <Texture Name="gMsgKanji8BABTex" OutName="msg_kanji_8BAB" Format="i4" Width="16" Height="16" Offset="0x2D400"/>
+        <Texture Name="gMsgKanji8BACTex" OutName="msg_kanji_8BAC" Format="i4" Width="16" Height="16" Offset="0x2D480"/>
+        <Texture Name="gMsgKanji8BADTex" OutName="msg_kanji_8BAD" Format="i4" Width="16" Height="16" Offset="0x2D500"/>
+        <Texture Name="gMsgKanji8BAETex" OutName="msg_kanji_8BAE" Format="i4" Width="16" Height="16" Offset="0x2D580"/>
+        <Texture Name="gMsgKanji8BAFTex" OutName="msg_kanji_8BAF" Format="i4" Width="16" Height="16" Offset="0x2D600"/>
+        <Texture Name="gMsgKanji8BB0Tex" OutName="msg_kanji_8BB0" Format="i4" Width="16" Height="16" Offset="0x2D680"/>
+        <Texture Name="gMsgKanji8BB1Tex" OutName="msg_kanji_8BB1" Format="i4" Width="16" Height="16" Offset="0x2D700"/>
+        <Texture Name="gMsgKanji8BB2Tex" OutName="msg_kanji_8BB2" Format="i4" Width="16" Height="16" Offset="0x2D780"/>
+        <Texture Name="gMsgKanji8BB3Tex" OutName="msg_kanji_8BB3" Format="i4" Width="16" Height="16" Offset="0x2D800"/>
+        <Texture Name="gMsgKanji8BB4Tex" OutName="msg_kanji_8BB4" Format="i4" Width="16" Height="16" Offset="0x2D880"/>
+        <Texture Name="gMsgKanji8BB5Tex" OutName="msg_kanji_8BB5" Format="i4" Width="16" Height="16" Offset="0x2D900"/>
+        <Texture Name="gMsgKanji8BB6Tex" OutName="msg_kanji_8BB6" Format="i4" Width="16" Height="16" Offset="0x2D980"/>
+        <Texture Name="gMsgKanji8BB7Tex" OutName="msg_kanji_8BB7" Format="i4" Width="16" Height="16" Offset="0x2DA00"/>
+        <Texture Name="gMsgKanji8BB8Tex" OutName="msg_kanji_8BB8" Format="i4" Width="16" Height="16" Offset="0x2DA80"/>
+        <Texture Name="gMsgKanji8BB9Tex" OutName="msg_kanji_8BB9" Format="i4" Width="16" Height="16" Offset="0x2DB00"/>
+        <Texture Name="gMsgKanji8BBATex" OutName="msg_kanji_8BBA" Format="i4" Width="16" Height="16" Offset="0x2DB80"/>
+        <Texture Name="gMsgKanji8BBBTex" OutName="msg_kanji_8BBB" Format="i4" Width="16" Height="16" Offset="0x2DC00"/>
+        <Texture Name="gMsgKanji8BBCTex" OutName="msg_kanji_8BBC" Format="i4" Width="16" Height="16" Offset="0x2DC80"/>
+        <Texture Name="gMsgKanji8BBDTex" OutName="msg_kanji_8BBD" Format="i4" Width="16" Height="16" Offset="0x2DD00"/>
+        <Texture Name="gMsgKanji8BBETex" OutName="msg_kanji_8BBE" Format="i4" Width="16" Height="16" Offset="0x2DD80"/>
+        <Texture Name="gMsgKanji8BBFTex" OutName="msg_kanji_8BBF" Format="i4" Width="16" Height="16" Offset="0x2DE00"/>
+        <Texture Name="gMsgKanji8BC0Tex" OutName="msg_kanji_8BC0" Format="i4" Width="16" Height="16" Offset="0x2DE80"/>
+        <Texture Name="gMsgKanji8BC1Tex" OutName="msg_kanji_8BC1" Format="i4" Width="16" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gMsgKanji8BC2Tex" OutName="msg_kanji_8BC2" Format="i4" Width="16" Height="16" Offset="0x2DF80"/>
+        <Texture Name="gMsgKanji8BC3Tex" OutName="msg_kanji_8BC3" Format="i4" Width="16" Height="16" Offset="0x2E000"/>
+        <Texture Name="gMsgKanji8BC4Tex" OutName="msg_kanji_8BC4" Format="i4" Width="16" Height="16" Offset="0x2E080"/>
+        <Texture Name="gMsgKanji8BC5Tex" OutName="msg_kanji_8BC5" Format="i4" Width="16" Height="16" Offset="0x2E100"/>
+        <Texture Name="gMsgKanji8BC6Tex" OutName="msg_kanji_8BC6" Format="i4" Width="16" Height="16" Offset="0x2E180"/>
+        <Texture Name="gMsgKanji8BC7Tex" OutName="msg_kanji_8BC7" Format="i4" Width="16" Height="16" Offset="0x2E200"/>
+        <Texture Name="gMsgKanji8BC8Tex" OutName="msg_kanji_8BC8" Format="i4" Width="16" Height="16" Offset="0x2E280"/>
+        <Texture Name="gMsgKanji8BC9Tex" OutName="msg_kanji_8BC9" Format="i4" Width="16" Height="16" Offset="0x2E300"/>
+        <Texture Name="gMsgKanji8BCATex" OutName="msg_kanji_8BCA" Format="i4" Width="16" Height="16" Offset="0x2E380"/>
+        <Texture Name="gMsgKanji8BCBTex" OutName="msg_kanji_8BCB" Format="i4" Width="16" Height="16" Offset="0x2E400"/>
+        <Texture Name="gMsgKanji8BCCTex" OutName="msg_kanji_8BCC" Format="i4" Width="16" Height="16" Offset="0x2E480"/>
+        <Texture Name="gMsgKanji8BCDTex" OutName="msg_kanji_8BCD" Format="i4" Width="16" Height="16" Offset="0x2E500"/>
+        <Texture Name="gMsgKanji8BCETex" OutName="msg_kanji_8BCE" Format="i4" Width="16" Height="16" Offset="0x2E580"/>
+        <Texture Name="gMsgKanji8BCFTex" OutName="msg_kanji_8BCF" Format="i4" Width="16" Height="16" Offset="0x2E600"/>
+        <Texture Name="gMsgKanji8BD0Tex" OutName="msg_kanji_8BD0" Format="i4" Width="16" Height="16" Offset="0x2E680"/>
+        <Texture Name="gMsgKanji8BD1Tex" OutName="msg_kanji_8BD1" Format="i4" Width="16" Height="16" Offset="0x2E700"/>
+        <Texture Name="gMsgKanji8BD2Tex" OutName="msg_kanji_8BD2" Format="i4" Width="16" Height="16" Offset="0x2E780"/>
+        <Texture Name="gMsgKanji8BD3Tex" OutName="msg_kanji_8BD3" Format="i4" Width="16" Height="16" Offset="0x2E800"/>
+        <Texture Name="gMsgKanji8BD4Tex" OutName="msg_kanji_8BD4" Format="i4" Width="16" Height="16" Offset="0x2E880"/>
+        <Texture Name="gMsgKanji8BD5Tex" OutName="msg_kanji_8BD5" Format="i4" Width="16" Height="16" Offset="0x2E900"/>
+        <Texture Name="gMsgKanji8BD6Tex" OutName="msg_kanji_8BD6" Format="i4" Width="16" Height="16" Offset="0x2E980"/>
+        <Texture Name="gMsgKanji8BD7Tex" OutName="msg_kanji_8BD7" Format="i4" Width="16" Height="16" Offset="0x2EA00"/>
+        <Texture Name="gMsgKanji8BD8Tex" OutName="msg_kanji_8BD8" Format="i4" Width="16" Height="16" Offset="0x2EA80"/>
+        <Texture Name="gMsgKanji8BD9Tex" OutName="msg_kanji_8BD9" Format="i4" Width="16" Height="16" Offset="0x2EB00"/>
+        <Texture Name="gMsgKanji8BDATex" OutName="msg_kanji_8BDA" Format="i4" Width="16" Height="16" Offset="0x2EB80"/>
+        <Texture Name="gMsgKanji8BDBTex" OutName="msg_kanji_8BDB" Format="i4" Width="16" Height="16" Offset="0x2EC00"/>
+        <Texture Name="gMsgKanji8BDCTex" OutName="msg_kanji_8BDC" Format="i4" Width="16" Height="16" Offset="0x2EC80"/>
+        <Texture Name="gMsgKanji8BDDTex" OutName="msg_kanji_8BDD" Format="i4" Width="16" Height="16" Offset="0x2ED00"/>
+        <Texture Name="gMsgKanji8BDETex" OutName="msg_kanji_8BDE" Format="i4" Width="16" Height="16" Offset="0x2ED80"/>
+        <Texture Name="gMsgKanji8BDFTex" OutName="msg_kanji_8BDF" Format="i4" Width="16" Height="16" Offset="0x2EE00"/>
+        <Texture Name="gMsgKanji8BE0Tex" OutName="msg_kanji_8BE0" Format="i4" Width="16" Height="16" Offset="0x2EE80"/>
+        <Texture Name="gMsgKanji8BE1Tex" OutName="msg_kanji_8BE1" Format="i4" Width="16" Height="16" Offset="0x2EF00"/>
+        <Texture Name="gMsgKanji8BE2Tex" OutName="msg_kanji_8BE2" Format="i4" Width="16" Height="16" Offset="0x2EF80"/>
+        <Texture Name="gMsgKanji8BE3Tex" OutName="msg_kanji_8BE3" Format="i4" Width="16" Height="16" Offset="0x2F000"/>
+        <Texture Name="gMsgKanji8BE4Tex" OutName="msg_kanji_8BE4" Format="i4" Width="16" Height="16" Offset="0x2F080"/>
+        <Texture Name="gMsgKanji8BE5Tex" OutName="msg_kanji_8BE5" Format="i4" Width="16" Height="16" Offset="0x2F100"/>
+        <Texture Name="gMsgKanji8BE6Tex" OutName="msg_kanji_8BE6" Format="i4" Width="16" Height="16" Offset="0x2F180"/>
+        <Texture Name="gMsgKanji8BE7Tex" OutName="msg_kanji_8BE7" Format="i4" Width="16" Height="16" Offset="0x2F200"/>
+        <Texture Name="gMsgKanji8BE8Tex" OutName="msg_kanji_8BE8" Format="i4" Width="16" Height="16" Offset="0x2F280"/>
+        <Texture Name="gMsgKanji8BE9Tex" OutName="msg_kanji_8BE9" Format="i4" Width="16" Height="16" Offset="0x2F300"/>
+        <Texture Name="gMsgKanji8BEATex" OutName="msg_kanji_8BEA" Format="i4" Width="16" Height="16" Offset="0x2F380"/>
+        <Texture Name="gMsgKanji8BEBTex" OutName="msg_kanji_8BEB" Format="i4" Width="16" Height="16" Offset="0x2F400"/>
+        <Texture Name="gMsgKanji8BECTex" OutName="msg_kanji_8BEC" Format="i4" Width="16" Height="16" Offset="0x2F480"/>
+        <Texture Name="gMsgKanji8BEDTex" OutName="msg_kanji_8BED" Format="i4" Width="16" Height="16" Offset="0x2F500"/>
+        <Texture Name="gMsgKanji8BEETex" OutName="msg_kanji_8BEE" Format="i4" Width="16" Height="16" Offset="0x2F580"/>
+        <Texture Name="gMsgKanji8BEFTex" OutName="msg_kanji_8BEF" Format="i4" Width="16" Height="16" Offset="0x2F600"/>
+        <Texture Name="gMsgKanji8BF0Tex" OutName="msg_kanji_8BF0" Format="i4" Width="16" Height="16" Offset="0x2F680"/>
+        <Texture Name="gMsgKanji8BF1Tex" OutName="msg_kanji_8BF1" Format="i4" Width="16" Height="16" Offset="0x2F700"/>
+        <Texture Name="gMsgKanji8BF2Tex" OutName="msg_kanji_8BF2" Format="i4" Width="16" Height="16" Offset="0x2F780"/>
+        <Texture Name="gMsgKanji8BF3Tex" OutName="msg_kanji_8BF3" Format="i4" Width="16" Height="16" Offset="0x2F800"/>
+        <Texture Name="gMsgKanji8BF4Tex" OutName="msg_kanji_8BF4" Format="i4" Width="16" Height="16" Offset="0x2F880"/>
+        <Texture Name="gMsgKanji8BF5Tex" OutName="msg_kanji_8BF5" Format="i4" Width="16" Height="16" Offset="0x2F900"/>
+        <Texture Name="gMsgKanji8BF6Tex" OutName="msg_kanji_8BF6" Format="i4" Width="16" Height="16" Offset="0x2F980"/>
+        <Texture Name="gMsgKanji8BF7Tex" OutName="msg_kanji_8BF7" Format="i4" Width="16" Height="16" Offset="0x2FA00"/>
+        <Texture Name="gMsgKanji8BF8Tex" OutName="msg_kanji_8BF8" Format="i4" Width="16" Height="16" Offset="0x2FA80"/>
+        <Texture Name="gMsgKanji8BF9Tex" OutName="msg_kanji_8BF9" Format="i4" Width="16" Height="16" Offset="0x2FB00"/>
+        <Texture Name="gMsgKanji8BFATex" OutName="msg_kanji_8BFA" Format="i4" Width="16" Height="16" Offset="0x2FB80"/>
+        <Texture Name="gMsgKanji8BFBTex" OutName="msg_kanji_8BFB" Format="i4" Width="16" Height="16" Offset="0x2FC00"/>
+        <Texture Name="gMsgKanji8BFCTex" OutName="msg_kanji_8BFC" Format="i4" Width="16" Height="16" Offset="0x2FC80"/>
+        <Texture Name="gMsgKanji8C40Tex" OutName="msg_kanji_8C40" Format="i4" Width="16" Height="16" Offset="0x2FD00"/>
+        <Texture Name="gMsgKanji8C41Tex" OutName="msg_kanji_8C41" Format="i4" Width="16" Height="16" Offset="0x2FD80"/>
+        <Texture Name="gMsgKanji8C42Tex" OutName="msg_kanji_8C42" Format="i4" Width="16" Height="16" Offset="0x2FE00"/>
+        <Texture Name="gMsgKanji8C43Tex" OutName="msg_kanji_8C43" Format="i4" Width="16" Height="16" Offset="0x2FE80"/>
+        <Texture Name="gMsgKanji8C44Tex" OutName="msg_kanji_8C44" Format="i4" Width="16" Height="16" Offset="0x2FF00"/>
+        <Texture Name="gMsgKanji8C45Tex" OutName="msg_kanji_8C45" Format="i4" Width="16" Height="16" Offset="0x2FF80"/>
+        <Texture Name="gMsgKanji8C46Tex" OutName="msg_kanji_8C46" Format="i4" Width="16" Height="16" Offset="0x30000"/>
+        <Texture Name="gMsgKanji8C47Tex" OutName="msg_kanji_8C47" Format="i4" Width="16" Height="16" Offset="0x30080"/>
+        <Texture Name="gMsgKanji8C48Tex" OutName="msg_kanji_8C48" Format="i4" Width="16" Height="16" Offset="0x30100"/>
+        <Texture Name="gMsgKanji8C49Tex" OutName="msg_kanji_8C49" Format="i4" Width="16" Height="16" Offset="0x30180"/>
+        <Texture Name="gMsgKanji8C4ATex" OutName="msg_kanji_8C4A" Format="i4" Width="16" Height="16" Offset="0x30200"/>
+        <Texture Name="gMsgKanji8C4BTex" OutName="msg_kanji_8C4B" Format="i4" Width="16" Height="16" Offset="0x30280"/>
+        <Texture Name="gMsgKanji8C4CTex" OutName="msg_kanji_8C4C" Format="i4" Width="16" Height="16" Offset="0x30300"/>
+        <Texture Name="gMsgKanji8C4DTex" OutName="msg_kanji_8C4D" Format="i4" Width="16" Height="16" Offset="0x30380"/>
+        <Texture Name="gMsgKanji8C4ETex" OutName="msg_kanji_8C4E" Format="i4" Width="16" Height="16" Offset="0x30400"/>
+        <Texture Name="gMsgKanji8C4FTex" OutName="msg_kanji_8C4F" Format="i4" Width="16" Height="16" Offset="0x30480"/>
+        <Texture Name="gMsgKanji8C50Tex" OutName="msg_kanji_8C50" Format="i4" Width="16" Height="16" Offset="0x30500"/>
+        <Texture Name="gMsgKanji8C51Tex" OutName="msg_kanji_8C51" Format="i4" Width="16" Height="16" Offset="0x30580"/>
+        <Texture Name="gMsgKanji8C52Tex" OutName="msg_kanji_8C52" Format="i4" Width="16" Height="16" Offset="0x30600"/>
+        <Texture Name="gMsgKanji8C53Tex" OutName="msg_kanji_8C53" Format="i4" Width="16" Height="16" Offset="0x30680"/>
+        <Texture Name="gMsgKanji8C54Tex" OutName="msg_kanji_8C54" Format="i4" Width="16" Height="16" Offset="0x30700"/>
+        <Texture Name="gMsgKanji8C55Tex" OutName="msg_kanji_8C55" Format="i4" Width="16" Height="16" Offset="0x30780"/>
+        <Texture Name="gMsgKanji8C56Tex" OutName="msg_kanji_8C56" Format="i4" Width="16" Height="16" Offset="0x30800"/>
+        <Texture Name="gMsgKanji8C57Tex" OutName="msg_kanji_8C57" Format="i4" Width="16" Height="16" Offset="0x30880"/>
+        <Texture Name="gMsgKanji8C58Tex" OutName="msg_kanji_8C58" Format="i4" Width="16" Height="16" Offset="0x30900"/>
+        <Texture Name="gMsgKanji8C59Tex" OutName="msg_kanji_8C59" Format="i4" Width="16" Height="16" Offset="0x30980"/>
+        <Texture Name="gMsgKanji8C5ATex" OutName="msg_kanji_8C5A" Format="i4" Width="16" Height="16" Offset="0x30A00"/>
+        <Texture Name="gMsgKanji8C5BTex" OutName="msg_kanji_8C5B" Format="i4" Width="16" Height="16" Offset="0x30A80"/>
+        <Texture Name="gMsgKanji8C5CTex" OutName="msg_kanji_8C5C" Format="i4" Width="16" Height="16" Offset="0x30B00"/>
+        <Texture Name="gMsgKanji8C5DTex" OutName="msg_kanji_8C5D" Format="i4" Width="16" Height="16" Offset="0x30B80"/>
+        <Texture Name="gMsgKanji8C5ETex" OutName="msg_kanji_8C5E" Format="i4" Width="16" Height="16" Offset="0x30C00"/>
+        <Texture Name="gMsgKanji8C5FTex" OutName="msg_kanji_8C5F" Format="i4" Width="16" Height="16" Offset="0x30C80"/>
+        <Texture Name="gMsgKanji8C60Tex" OutName="msg_kanji_8C60" Format="i4" Width="16" Height="16" Offset="0x30D00"/>
+        <Texture Name="gMsgKanji8C61Tex" OutName="msg_kanji_8C61" Format="i4" Width="16" Height="16" Offset="0x30D80"/>
+        <Texture Name="gMsgKanji8C62Tex" OutName="msg_kanji_8C62" Format="i4" Width="16" Height="16" Offset="0x30E00"/>
+        <Texture Name="gMsgKanji8C63Tex" OutName="msg_kanji_8C63" Format="i4" Width="16" Height="16" Offset="0x30E80"/>
+        <Texture Name="gMsgKanji8C64Tex" OutName="msg_kanji_8C64" Format="i4" Width="16" Height="16" Offset="0x30F00"/>
+        <Texture Name="gMsgKanji8C65Tex" OutName="msg_kanji_8C65" Format="i4" Width="16" Height="16" Offset="0x30F80"/>
+        <Texture Name="gMsgKanji8C66Tex" OutName="msg_kanji_8C66" Format="i4" Width="16" Height="16" Offset="0x31000"/>
+        <Texture Name="gMsgKanji8C67Tex" OutName="msg_kanji_8C67" Format="i4" Width="16" Height="16" Offset="0x31080"/>
+        <Texture Name="gMsgKanji8C68Tex" OutName="msg_kanji_8C68" Format="i4" Width="16" Height="16" Offset="0x31100"/>
+        <Texture Name="gMsgKanji8C69Tex" OutName="msg_kanji_8C69" Format="i4" Width="16" Height="16" Offset="0x31180"/>
+        <Texture Name="gMsgKanji8C6ATex" OutName="msg_kanji_8C6A" Format="i4" Width="16" Height="16" Offset="0x31200"/>
+        <Texture Name="gMsgKanji8C6BTex" OutName="msg_kanji_8C6B" Format="i4" Width="16" Height="16" Offset="0x31280"/>
+        <Texture Name="gMsgKanji8C6CTex" OutName="msg_kanji_8C6C" Format="i4" Width="16" Height="16" Offset="0x31300"/>
+        <Texture Name="gMsgKanji8C6DTex" OutName="msg_kanji_8C6D" Format="i4" Width="16" Height="16" Offset="0x31380"/>
+        <Texture Name="gMsgKanji8C6ETex" OutName="msg_kanji_8C6E" Format="i4" Width="16" Height="16" Offset="0x31400"/>
+        <Texture Name="gMsgKanji8C6FTex" OutName="msg_kanji_8C6F" Format="i4" Width="16" Height="16" Offset="0x31480"/>
+        <Texture Name="gMsgKanji8C70Tex" OutName="msg_kanji_8C70" Format="i4" Width="16" Height="16" Offset="0x31500"/>
+        <Texture Name="gMsgKanji8C71Tex" OutName="msg_kanji_8C71" Format="i4" Width="16" Height="16" Offset="0x31580"/>
+        <Texture Name="gMsgKanji8C72Tex" OutName="msg_kanji_8C72" Format="i4" Width="16" Height="16" Offset="0x31600"/>
+        <Texture Name="gMsgKanji8C73Tex" OutName="msg_kanji_8C73" Format="i4" Width="16" Height="16" Offset="0x31680"/>
+        <Texture Name="gMsgKanji8C74Tex" OutName="msg_kanji_8C74" Format="i4" Width="16" Height="16" Offset="0x31700"/>
+        <Texture Name="gMsgKanji8C75Tex" OutName="msg_kanji_8C75" Format="i4" Width="16" Height="16" Offset="0x31780"/>
+        <Texture Name="gMsgKanji8C76Tex" OutName="msg_kanji_8C76" Format="i4" Width="16" Height="16" Offset="0x31800"/>
+        <Texture Name="gMsgKanji8C77Tex" OutName="msg_kanji_8C77" Format="i4" Width="16" Height="16" Offset="0x31880"/>
+        <Texture Name="gMsgKanji8C78Tex" OutName="msg_kanji_8C78" Format="i4" Width="16" Height="16" Offset="0x31900"/>
+        <Texture Name="gMsgKanji8C79Tex" OutName="msg_kanji_8C79" Format="i4" Width="16" Height="16" Offset="0x31980"/>
+        <Texture Name="gMsgKanji8C7ATex" OutName="msg_kanji_8C7A" Format="i4" Width="16" Height="16" Offset="0x31A00"/>
+        <Texture Name="gMsgKanji8C7BTex" OutName="msg_kanji_8C7B" Format="i4" Width="16" Height="16" Offset="0x31A80"/>
+        <Texture Name="gMsgKanji8C7CTex" OutName="msg_kanji_8C7C" Format="i4" Width="16" Height="16" Offset="0x31B00"/>
+        <Texture Name="gMsgKanji8C7DTex" OutName="msg_kanji_8C7D" Format="i4" Width="16" Height="16" Offset="0x31B80"/>
+        <Texture Name="gMsgKanji8C7ETex" OutName="msg_kanji_8C7E" Format="i4" Width="16" Height="16" Offset="0x31C00"/>
+        <Texture Name="gMsgKanji8C80Tex" OutName="msg_kanji_8C80" Format="i4" Width="16" Height="16" Offset="0x31C80"/>
+        <Texture Name="gMsgKanji8C81Tex" OutName="msg_kanji_8C81" Format="i4" Width="16" Height="16" Offset="0x31D00"/>
+        <Texture Name="gMsgKanji8C82Tex" OutName="msg_kanji_8C82" Format="i4" Width="16" Height="16" Offset="0x31D80"/>
+        <Texture Name="gMsgKanji8C83Tex" OutName="msg_kanji_8C83" Format="i4" Width="16" Height="16" Offset="0x31E00"/>
+        <Texture Name="gMsgKanji8C84Tex" OutName="msg_kanji_8C84" Format="i4" Width="16" Height="16" Offset="0x31E80"/>
+        <Texture Name="gMsgKanji8C85Tex" OutName="msg_kanji_8C85" Format="i4" Width="16" Height="16" Offset="0x31F00"/>
+        <Texture Name="gMsgKanji8C86Tex" OutName="msg_kanji_8C86" Format="i4" Width="16" Height="16" Offset="0x31F80"/>
+        <Texture Name="gMsgKanji8C87Tex" OutName="msg_kanji_8C87" Format="i4" Width="16" Height="16" Offset="0x32000"/>
+        <Texture Name="gMsgKanji8C88Tex" OutName="msg_kanji_8C88" Format="i4" Width="16" Height="16" Offset="0x32080"/>
+        <Texture Name="gMsgKanji8C89Tex" OutName="msg_kanji_8C89" Format="i4" Width="16" Height="16" Offset="0x32100"/>
+        <Texture Name="gMsgKanji8C8ATex" OutName="msg_kanji_8C8A" Format="i4" Width="16" Height="16" Offset="0x32180"/>
+        <Texture Name="gMsgKanji8C8BTex" OutName="msg_kanji_8C8B" Format="i4" Width="16" Height="16" Offset="0x32200"/>
+        <Texture Name="gMsgKanji8C8CTex" OutName="msg_kanji_8C8C" Format="i4" Width="16" Height="16" Offset="0x32280"/>
+        <Texture Name="gMsgKanji8C8DTex" OutName="msg_kanji_8C8D" Format="i4" Width="16" Height="16" Offset="0x32300"/>
+        <Texture Name="gMsgKanji8C8ETex" OutName="msg_kanji_8C8E" Format="i4" Width="16" Height="16" Offset="0x32380"/>
+        <Texture Name="gMsgKanji8C8FTex" OutName="msg_kanji_8C8F" Format="i4" Width="16" Height="16" Offset="0x32400"/>
+        <Texture Name="gMsgKanji8C90Tex" OutName="msg_kanji_8C90" Format="i4" Width="16" Height="16" Offset="0x32480"/>
+        <Texture Name="gMsgKanji8C91Tex" OutName="msg_kanji_8C91" Format="i4" Width="16" Height="16" Offset="0x32500"/>
+        <Texture Name="gMsgKanji8C92Tex" OutName="msg_kanji_8C92" Format="i4" Width="16" Height="16" Offset="0x32580"/>
+        <Texture Name="gMsgKanji8C93Tex" OutName="msg_kanji_8C93" Format="i4" Width="16" Height="16" Offset="0x32600"/>
+        <Texture Name="gMsgKanji8C94Tex" OutName="msg_kanji_8C94" Format="i4" Width="16" Height="16" Offset="0x32680"/>
+        <Texture Name="gMsgKanji8C95Tex" OutName="msg_kanji_8C95" Format="i4" Width="16" Height="16" Offset="0x32700"/>
+        <Texture Name="gMsgKanji8C96Tex" OutName="msg_kanji_8C96" Format="i4" Width="16" Height="16" Offset="0x32780"/>
+        <Texture Name="gMsgKanji8C97Tex" OutName="msg_kanji_8C97" Format="i4" Width="16" Height="16" Offset="0x32800"/>
+        <Texture Name="gMsgKanji8C98Tex" OutName="msg_kanji_8C98" Format="i4" Width="16" Height="16" Offset="0x32880"/>
+        <Texture Name="gMsgKanji8C99Tex" OutName="msg_kanji_8C99" Format="i4" Width="16" Height="16" Offset="0x32900"/>
+        <Texture Name="gMsgKanji8C9ATex" OutName="msg_kanji_8C9A" Format="i4" Width="16" Height="16" Offset="0x32980"/>
+        <Texture Name="gMsgKanji8C9BTex" OutName="msg_kanji_8C9B" Format="i4" Width="16" Height="16" Offset="0x32A00"/>
+        <Texture Name="gMsgKanji8C9CTex" OutName="msg_kanji_8C9C" Format="i4" Width="16" Height="16" Offset="0x32A80"/>
+        <Texture Name="gMsgKanji8C9DTex" OutName="msg_kanji_8C9D" Format="i4" Width="16" Height="16" Offset="0x32B00"/>
+        <Texture Name="gMsgKanji8C9ETex" OutName="msg_kanji_8C9E" Format="i4" Width="16" Height="16" Offset="0x32B80"/>
+        <Texture Name="gMsgKanji8C9FTex" OutName="msg_kanji_8C9F" Format="i4" Width="16" Height="16" Offset="0x32C00"/>
+        <Texture Name="gMsgKanji8CA0Tex" OutName="msg_kanji_8CA0" Format="i4" Width="16" Height="16" Offset="0x32C80"/>
+        <Texture Name="gMsgKanji8CA1Tex" OutName="msg_kanji_8CA1" Format="i4" Width="16" Height="16" Offset="0x32D00"/>
+        <Texture Name="gMsgKanji8CA2Tex" OutName="msg_kanji_8CA2" Format="i4" Width="16" Height="16" Offset="0x32D80"/>
+        <Texture Name="gMsgKanji8CA3Tex" OutName="msg_kanji_8CA3" Format="i4" Width="16" Height="16" Offset="0x32E00"/>
+        <Texture Name="gMsgKanji8CA4Tex" OutName="msg_kanji_8CA4" Format="i4" Width="16" Height="16" Offset="0x32E80"/>
+        <Texture Name="gMsgKanji8CA5Tex" OutName="msg_kanji_8CA5" Format="i4" Width="16" Height="16" Offset="0x32F00"/>
+        <Texture Name="gMsgKanji8CA6Tex" OutName="msg_kanji_8CA6" Format="i4" Width="16" Height="16" Offset="0x32F80"/>
+        <Texture Name="gMsgKanji8CA7Tex" OutName="msg_kanji_8CA7" Format="i4" Width="16" Height="16" Offset="0x33000"/>
+        <Texture Name="gMsgKanji8CA8Tex" OutName="msg_kanji_8CA8" Format="i4" Width="16" Height="16" Offset="0x33080"/>
+        <Texture Name="gMsgKanji8CA9Tex" OutName="msg_kanji_8CA9" Format="i4" Width="16" Height="16" Offset="0x33100"/>
+        <Texture Name="gMsgKanji8CAATex" OutName="msg_kanji_8CAA" Format="i4" Width="16" Height="16" Offset="0x33180"/>
+        <Texture Name="gMsgKanji8CABTex" OutName="msg_kanji_8CAB" Format="i4" Width="16" Height="16" Offset="0x33200"/>
+        <Texture Name="gMsgKanji8CACTex" OutName="msg_kanji_8CAC" Format="i4" Width="16" Height="16" Offset="0x33280"/>
+        <Texture Name="gMsgKanji8CADTex" OutName="msg_kanji_8CAD" Format="i4" Width="16" Height="16" Offset="0x33300"/>
+        <Texture Name="gMsgKanji8CAETex" OutName="msg_kanji_8CAE" Format="i4" Width="16" Height="16" Offset="0x33380"/>
+        <Texture Name="gMsgKanji8CAFTex" OutName="msg_kanji_8CAF" Format="i4" Width="16" Height="16" Offset="0x33400"/>
+        <Texture Name="gMsgKanji8CB0Tex" OutName="msg_kanji_8CB0" Format="i4" Width="16" Height="16" Offset="0x33480"/>
+        <Texture Name="gMsgKanji8CB1Tex" OutName="msg_kanji_8CB1" Format="i4" Width="16" Height="16" Offset="0x33500"/>
+        <Texture Name="gMsgKanji8CB2Tex" OutName="msg_kanji_8CB2" Format="i4" Width="16" Height="16" Offset="0x33580"/>
+        <Texture Name="gMsgKanji8CB3Tex" OutName="msg_kanji_8CB3" Format="i4" Width="16" Height="16" Offset="0x33600"/>
+        <Texture Name="gMsgKanji8CB4Tex" OutName="msg_kanji_8CB4" Format="i4" Width="16" Height="16" Offset="0x33680"/>
+        <Texture Name="gMsgKanji8CB5Tex" OutName="msg_kanji_8CB5" Format="i4" Width="16" Height="16" Offset="0x33700"/>
+        <Texture Name="gMsgKanji8CB6Tex" OutName="msg_kanji_8CB6" Format="i4" Width="16" Height="16" Offset="0x33780"/>
+        <Texture Name="gMsgKanji8CB7Tex" OutName="msg_kanji_8CB7" Format="i4" Width="16" Height="16" Offset="0x33800"/>
+        <Texture Name="gMsgKanji8CB8Tex" OutName="msg_kanji_8CB8" Format="i4" Width="16" Height="16" Offset="0x33880"/>
+        <Texture Name="gMsgKanji8CB9Tex" OutName="msg_kanji_8CB9" Format="i4" Width="16" Height="16" Offset="0x33900"/>
+        <Texture Name="gMsgKanji8CBATex" OutName="msg_kanji_8CBA" Format="i4" Width="16" Height="16" Offset="0x33980"/>
+        <Texture Name="gMsgKanji8CBBTex" OutName="msg_kanji_8CBB" Format="i4" Width="16" Height="16" Offset="0x33A00"/>
+        <Texture Name="gMsgKanji8CBCTex" OutName="msg_kanji_8CBC" Format="i4" Width="16" Height="16" Offset="0x33A80"/>
+        <Texture Name="gMsgKanji8CBDTex" OutName="msg_kanji_8CBD" Format="i4" Width="16" Height="16" Offset="0x33B00"/>
+        <Texture Name="gMsgKanji8CBETex" OutName="msg_kanji_8CBE" Format="i4" Width="16" Height="16" Offset="0x33B80"/>
+        <Texture Name="gMsgKanji8CBFTex" OutName="msg_kanji_8CBF" Format="i4" Width="16" Height="16" Offset="0x33C00"/>
+        <Texture Name="gMsgKanji8CC0Tex" OutName="msg_kanji_8CC0" Format="i4" Width="16" Height="16" Offset="0x33C80"/>
+        <Texture Name="gMsgKanji8CC1Tex" OutName="msg_kanji_8CC1" Format="i4" Width="16" Height="16" Offset="0x33D00"/>
+        <Texture Name="gMsgKanji8CC2Tex" OutName="msg_kanji_8CC2" Format="i4" Width="16" Height="16" Offset="0x33D80"/>
+        <Texture Name="gMsgKanji8CC3Tex" OutName="msg_kanji_8CC3" Format="i4" Width="16" Height="16" Offset="0x33E00"/>
+        <Texture Name="gMsgKanji8CC4Tex" OutName="msg_kanji_8CC4" Format="i4" Width="16" Height="16" Offset="0x33E80"/>
+        <Texture Name="gMsgKanji8CC5Tex" OutName="msg_kanji_8CC5" Format="i4" Width="16" Height="16" Offset="0x33F00"/>
+        <Texture Name="gMsgKanji8CC6Tex" OutName="msg_kanji_8CC6" Format="i4" Width="16" Height="16" Offset="0x33F80"/>
+        <Texture Name="gMsgKanji8CC7Tex" OutName="msg_kanji_8CC7" Format="i4" Width="16" Height="16" Offset="0x34000"/>
+        <Texture Name="gMsgKanji8CC8Tex" OutName="msg_kanji_8CC8" Format="i4" Width="16" Height="16" Offset="0x34080"/>
+        <Texture Name="gMsgKanji8CC9Tex" OutName="msg_kanji_8CC9" Format="i4" Width="16" Height="16" Offset="0x34100"/>
+        <Texture Name="gMsgKanji8CCATex" OutName="msg_kanji_8CCA" Format="i4" Width="16" Height="16" Offset="0x34180"/>
+        <Texture Name="gMsgKanji8CCBTex" OutName="msg_kanji_8CCB" Format="i4" Width="16" Height="16" Offset="0x34200"/>
+        <Texture Name="gMsgKanji8CCCTex" OutName="msg_kanji_8CCC" Format="i4" Width="16" Height="16" Offset="0x34280"/>
+        <Texture Name="gMsgKanji8CCDTex" OutName="msg_kanji_8CCD" Format="i4" Width="16" Height="16" Offset="0x34300"/>
+        <Texture Name="gMsgKanji8CCETex" OutName="msg_kanji_8CCE" Format="i4" Width="16" Height="16" Offset="0x34380"/>
+        <Texture Name="gMsgKanji8CCFTex" OutName="msg_kanji_8CCF" Format="i4" Width="16" Height="16" Offset="0x34400"/>
+        <Texture Name="gMsgKanji8CD0Tex" OutName="msg_kanji_8CD0" Format="i4" Width="16" Height="16" Offset="0x34480"/>
+        <Texture Name="gMsgKanji8CD1Tex" OutName="msg_kanji_8CD1" Format="i4" Width="16" Height="16" Offset="0x34500"/>
+        <Texture Name="gMsgKanji8CD2Tex" OutName="msg_kanji_8CD2" Format="i4" Width="16" Height="16" Offset="0x34580"/>
+        <Texture Name="gMsgKanji8CD3Tex" OutName="msg_kanji_8CD3" Format="i4" Width="16" Height="16" Offset="0x34600"/>
+        <Texture Name="gMsgKanji8CD4Tex" OutName="msg_kanji_8CD4" Format="i4" Width="16" Height="16" Offset="0x34680"/>
+        <Texture Name="gMsgKanji8CD5Tex" OutName="msg_kanji_8CD5" Format="i4" Width="16" Height="16" Offset="0x34700"/>
+        <Texture Name="gMsgKanji8CD6Tex" OutName="msg_kanji_8CD6" Format="i4" Width="16" Height="16" Offset="0x34780"/>
+        <Texture Name="gMsgKanji8CD7Tex" OutName="msg_kanji_8CD7" Format="i4" Width="16" Height="16" Offset="0x34800"/>
+        <Texture Name="gMsgKanji8CD8Tex" OutName="msg_kanji_8CD8" Format="i4" Width="16" Height="16" Offset="0x34880"/>
+        <Texture Name="gMsgKanji8CD9Tex" OutName="msg_kanji_8CD9" Format="i4" Width="16" Height="16" Offset="0x34900"/>
+        <Texture Name="gMsgKanji8CDATex" OutName="msg_kanji_8CDA" Format="i4" Width="16" Height="16" Offset="0x34980"/>
+        <Texture Name="gMsgKanji8CDBTex" OutName="msg_kanji_8CDB" Format="i4" Width="16" Height="16" Offset="0x34A00"/>
+        <Texture Name="gMsgKanji8CDCTex" OutName="msg_kanji_8CDC" Format="i4" Width="16" Height="16" Offset="0x34A80"/>
+        <Texture Name="gMsgKanji8CDDTex" OutName="msg_kanji_8CDD" Format="i4" Width="16" Height="16" Offset="0x34B00"/>
+        <Texture Name="gMsgKanji8CDETex" OutName="msg_kanji_8CDE" Format="i4" Width="16" Height="16" Offset="0x34B80"/>
+        <Texture Name="gMsgKanji8CDFTex" OutName="msg_kanji_8CDF" Format="i4" Width="16" Height="16" Offset="0x34C00"/>
+        <Texture Name="gMsgKanji8CE0Tex" OutName="msg_kanji_8CE0" Format="i4" Width="16" Height="16" Offset="0x34C80"/>
+        <Texture Name="gMsgKanji8CE1Tex" OutName="msg_kanji_8CE1" Format="i4" Width="16" Height="16" Offset="0x34D00"/>
+        <Texture Name="gMsgKanji8CE2Tex" OutName="msg_kanji_8CE2" Format="i4" Width="16" Height="16" Offset="0x34D80"/>
+        <Texture Name="gMsgKanji8CE3Tex" OutName="msg_kanji_8CE3" Format="i4" Width="16" Height="16" Offset="0x34E00"/>
+        <Texture Name="gMsgKanji8CE4Tex" OutName="msg_kanji_8CE4" Format="i4" Width="16" Height="16" Offset="0x34E80"/>
+        <Texture Name="gMsgKanji8CE5Tex" OutName="msg_kanji_8CE5" Format="i4" Width="16" Height="16" Offset="0x34F00"/>
+        <Texture Name="gMsgKanji8CE6Tex" OutName="msg_kanji_8CE6" Format="i4" Width="16" Height="16" Offset="0x34F80"/>
+        <Texture Name="gMsgKanji8CE7Tex" OutName="msg_kanji_8CE7" Format="i4" Width="16" Height="16" Offset="0x35000"/>
+        <Texture Name="gMsgKanji8CE8Tex" OutName="msg_kanji_8CE8" Format="i4" Width="16" Height="16" Offset="0x35080"/>
+        <Texture Name="gMsgKanji8CE9Tex" OutName="msg_kanji_8CE9" Format="i4" Width="16" Height="16" Offset="0x35100"/>
+        <Texture Name="gMsgKanji8CEATex" OutName="msg_kanji_8CEA" Format="i4" Width="16" Height="16" Offset="0x35180"/>
+        <Texture Name="gMsgKanji8CEBTex" OutName="msg_kanji_8CEB" Format="i4" Width="16" Height="16" Offset="0x35200"/>
+        <Texture Name="gMsgKanji8CECTex" OutName="msg_kanji_8CEC" Format="i4" Width="16" Height="16" Offset="0x35280"/>
+        <Texture Name="gMsgKanji8CEDTex" OutName="msg_kanji_8CED" Format="i4" Width="16" Height="16" Offset="0x35300"/>
+        <Texture Name="gMsgKanji8CEETex" OutName="msg_kanji_8CEE" Format="i4" Width="16" Height="16" Offset="0x35380"/>
+        <Texture Name="gMsgKanji8CEFTex" OutName="msg_kanji_8CEF" Format="i4" Width="16" Height="16" Offset="0x35400"/>
+        <Texture Name="gMsgKanji8CF0Tex" OutName="msg_kanji_8CF0" Format="i4" Width="16" Height="16" Offset="0x35480"/>
+        <Texture Name="gMsgKanji8CF1Tex" OutName="msg_kanji_8CF1" Format="i4" Width="16" Height="16" Offset="0x35500"/>
+        <Texture Name="gMsgKanji8CF2Tex" OutName="msg_kanji_8CF2" Format="i4" Width="16" Height="16" Offset="0x35580"/>
+        <Texture Name="gMsgKanji8CF3Tex" OutName="msg_kanji_8CF3" Format="i4" Width="16" Height="16" Offset="0x35600"/>
+        <Texture Name="gMsgKanji8CF4Tex" OutName="msg_kanji_8CF4" Format="i4" Width="16" Height="16" Offset="0x35680"/>
+        <Texture Name="gMsgKanji8CF5Tex" OutName="msg_kanji_8CF5" Format="i4" Width="16" Height="16" Offset="0x35700"/>
+        <Texture Name="gMsgKanji8CF6Tex" OutName="msg_kanji_8CF6" Format="i4" Width="16" Height="16" Offset="0x35780"/>
+        <Texture Name="gMsgKanji8CF7Tex" OutName="msg_kanji_8CF7" Format="i4" Width="16" Height="16" Offset="0x35800"/>
+        <Texture Name="gMsgKanji8CF8Tex" OutName="msg_kanji_8CF8" Format="i4" Width="16" Height="16" Offset="0x35880"/>
+        <Texture Name="gMsgKanji8CF9Tex" OutName="msg_kanji_8CF9" Format="i4" Width="16" Height="16" Offset="0x35900"/>
+        <Texture Name="gMsgKanji8CFATex" OutName="msg_kanji_8CFA" Format="i4" Width="16" Height="16" Offset="0x35980"/>
+        <Texture Name="gMsgKanji8CFBTex" OutName="msg_kanji_8CFB" Format="i4" Width="16" Height="16" Offset="0x35A00"/>
+        <Texture Name="gMsgKanji8CFCTex" OutName="msg_kanji_8CFC" Format="i4" Width="16" Height="16" Offset="0x35A80"/>
+        <Texture Name="gMsgKanji8D40Tex" OutName="msg_kanji_8D40" Format="i4" Width="16" Height="16" Offset="0x35B00"/>
+        <Texture Name="gMsgKanji8D41Tex" OutName="msg_kanji_8D41" Format="i4" Width="16" Height="16" Offset="0x35B80"/>
+        <Texture Name="gMsgKanji8D42Tex" OutName="msg_kanji_8D42" Format="i4" Width="16" Height="16" Offset="0x35C00"/>
+        <Texture Name="gMsgKanji8D43Tex" OutName="msg_kanji_8D43" Format="i4" Width="16" Height="16" Offset="0x35C80"/>
+        <Texture Name="gMsgKanji8D44Tex" OutName="msg_kanji_8D44" Format="i4" Width="16" Height="16" Offset="0x35D00"/>
+        <Texture Name="gMsgKanji8D45Tex" OutName="msg_kanji_8D45" Format="i4" Width="16" Height="16" Offset="0x35D80"/>
+        <Texture Name="gMsgKanji8D46Tex" OutName="msg_kanji_8D46" Format="i4" Width="16" Height="16" Offset="0x35E00"/>
+        <Texture Name="gMsgKanji8D47Tex" OutName="msg_kanji_8D47" Format="i4" Width="16" Height="16" Offset="0x35E80"/>
+        <Texture Name="gMsgKanji8D48Tex" OutName="msg_kanji_8D48" Format="i4" Width="16" Height="16" Offset="0x35F00"/>
+        <Texture Name="gMsgKanji8D49Tex" OutName="msg_kanji_8D49" Format="i4" Width="16" Height="16" Offset="0x35F80"/>
+        <Texture Name="gMsgKanji8D4ATex" OutName="msg_kanji_8D4A" Format="i4" Width="16" Height="16" Offset="0x36000"/>
+        <Texture Name="gMsgKanji8D4BTex" OutName="msg_kanji_8D4B" Format="i4" Width="16" Height="16" Offset="0x36080"/>
+        <Texture Name="gMsgKanji8D4CTex" OutName="msg_kanji_8D4C" Format="i4" Width="16" Height="16" Offset="0x36100"/>
+        <Texture Name="gMsgKanji8D4DTex" OutName="msg_kanji_8D4D" Format="i4" Width="16" Height="16" Offset="0x36180"/>
+        <Texture Name="gMsgKanji8D4ETex" OutName="msg_kanji_8D4E" Format="i4" Width="16" Height="16" Offset="0x36200"/>
+        <Texture Name="gMsgKanji8D4FTex" OutName="msg_kanji_8D4F" Format="i4" Width="16" Height="16" Offset="0x36280"/>
+        <Texture Name="gMsgKanji8D50Tex" OutName="msg_kanji_8D50" Format="i4" Width="16" Height="16" Offset="0x36300"/>
+        <Texture Name="gMsgKanji8D51Tex" OutName="msg_kanji_8D51" Format="i4" Width="16" Height="16" Offset="0x36380"/>
+        <Texture Name="gMsgKanji8D52Tex" OutName="msg_kanji_8D52" Format="i4" Width="16" Height="16" Offset="0x36400"/>
+        <Texture Name="gMsgKanji8D53Tex" OutName="msg_kanji_8D53" Format="i4" Width="16" Height="16" Offset="0x36480"/>
+        <Texture Name="gMsgKanji8D54Tex" OutName="msg_kanji_8D54" Format="i4" Width="16" Height="16" Offset="0x36500"/>
+        <Texture Name="gMsgKanji8D55Tex" OutName="msg_kanji_8D55" Format="i4" Width="16" Height="16" Offset="0x36580"/>
+        <Texture Name="gMsgKanji8D56Tex" OutName="msg_kanji_8D56" Format="i4" Width="16" Height="16" Offset="0x36600"/>
+        <Texture Name="gMsgKanji8D57Tex" OutName="msg_kanji_8D57" Format="i4" Width="16" Height="16" Offset="0x36680"/>
+        <Texture Name="gMsgKanji8D58Tex" OutName="msg_kanji_8D58" Format="i4" Width="16" Height="16" Offset="0x36700"/>
+        <Texture Name="gMsgKanji8D59Tex" OutName="msg_kanji_8D59" Format="i4" Width="16" Height="16" Offset="0x36780"/>
+        <Texture Name="gMsgKanji8D5ATex" OutName="msg_kanji_8D5A" Format="i4" Width="16" Height="16" Offset="0x36800"/>
+        <Texture Name="gMsgKanji8D5BTex" OutName="msg_kanji_8D5B" Format="i4" Width="16" Height="16" Offset="0x36880"/>
+        <Texture Name="gMsgKanji8D5CTex" OutName="msg_kanji_8D5C" Format="i4" Width="16" Height="16" Offset="0x36900"/>
+        <Texture Name="gMsgKanji8D5DTex" OutName="msg_kanji_8D5D" Format="i4" Width="16" Height="16" Offset="0x36980"/>
+        <Texture Name="gMsgKanji8D5ETex" OutName="msg_kanji_8D5E" Format="i4" Width="16" Height="16" Offset="0x36A00"/>
+        <Texture Name="gMsgKanji8D5FTex" OutName="msg_kanji_8D5F" Format="i4" Width="16" Height="16" Offset="0x36A80"/>
+        <Texture Name="gMsgKanji8D60Tex" OutName="msg_kanji_8D60" Format="i4" Width="16" Height="16" Offset="0x36B00"/>
+        <Texture Name="gMsgKanji8D61Tex" OutName="msg_kanji_8D61" Format="i4" Width="16" Height="16" Offset="0x36B80"/>
+        <Texture Name="gMsgKanji8D62Tex" OutName="msg_kanji_8D62" Format="i4" Width="16" Height="16" Offset="0x36C00"/>
+        <Texture Name="gMsgKanji8D63Tex" OutName="msg_kanji_8D63" Format="i4" Width="16" Height="16" Offset="0x36C80"/>
+        <Texture Name="gMsgKanji8D64Tex" OutName="msg_kanji_8D64" Format="i4" Width="16" Height="16" Offset="0x36D00"/>
+        <Texture Name="gMsgKanji8D65Tex" OutName="msg_kanji_8D65" Format="i4" Width="16" Height="16" Offset="0x36D80"/>
+        <Texture Name="gMsgKanji8D66Tex" OutName="msg_kanji_8D66" Format="i4" Width="16" Height="16" Offset="0x36E00"/>
+        <Texture Name="gMsgKanji8D67Tex" OutName="msg_kanji_8D67" Format="i4" Width="16" Height="16" Offset="0x36E80"/>
+        <Texture Name="gMsgKanji8D68Tex" OutName="msg_kanji_8D68" Format="i4" Width="16" Height="16" Offset="0x36F00"/>
+        <Texture Name="gMsgKanji8D69Tex" OutName="msg_kanji_8D69" Format="i4" Width="16" Height="16" Offset="0x36F80"/>
+        <Texture Name="gMsgKanji8D6ATex" OutName="msg_kanji_8D6A" Format="i4" Width="16" Height="16" Offset="0x37000"/>
+        <Texture Name="gMsgKanji8D6BTex" OutName="msg_kanji_8D6B" Format="i4" Width="16" Height="16" Offset="0x37080"/>
+        <Texture Name="gMsgKanji8D6CTex" OutName="msg_kanji_8D6C" Format="i4" Width="16" Height="16" Offset="0x37100"/>
+        <Texture Name="gMsgKanji8D6DTex" OutName="msg_kanji_8D6D" Format="i4" Width="16" Height="16" Offset="0x37180"/>
+        <Texture Name="gMsgKanji8D6ETex" OutName="msg_kanji_8D6E" Format="i4" Width="16" Height="16" Offset="0x37200"/>
+        <Texture Name="gMsgKanji8D6FTex" OutName="msg_kanji_8D6F" Format="i4" Width="16" Height="16" Offset="0x37280"/>
+        <Texture Name="gMsgKanji8D70Tex" OutName="msg_kanji_8D70" Format="i4" Width="16" Height="16" Offset="0x37300"/>
+        <Texture Name="gMsgKanji8D71Tex" OutName="msg_kanji_8D71" Format="i4" Width="16" Height="16" Offset="0x37380"/>
+        <Texture Name="gMsgKanji8D72Tex" OutName="msg_kanji_8D72" Format="i4" Width="16" Height="16" Offset="0x37400"/>
+        <Texture Name="gMsgKanji8D73Tex" OutName="msg_kanji_8D73" Format="i4" Width="16" Height="16" Offset="0x37480"/>
+        <Texture Name="gMsgKanji8D74Tex" OutName="msg_kanji_8D74" Format="i4" Width="16" Height="16" Offset="0x37500"/>
+        <Texture Name="gMsgKanji8D75Tex" OutName="msg_kanji_8D75" Format="i4" Width="16" Height="16" Offset="0x37580"/>
+        <Texture Name="gMsgKanji8D76Tex" OutName="msg_kanji_8D76" Format="i4" Width="16" Height="16" Offset="0x37600"/>
+        <Texture Name="gMsgKanji8D77Tex" OutName="msg_kanji_8D77" Format="i4" Width="16" Height="16" Offset="0x37680"/>
+        <Texture Name="gMsgKanji8D78Tex" OutName="msg_kanji_8D78" Format="i4" Width="16" Height="16" Offset="0x37700"/>
+        <Texture Name="gMsgKanji8D79Tex" OutName="msg_kanji_8D79" Format="i4" Width="16" Height="16" Offset="0x37780"/>
+        <Texture Name="gMsgKanji8D7ATex" OutName="msg_kanji_8D7A" Format="i4" Width="16" Height="16" Offset="0x37800"/>
+        <Texture Name="gMsgKanji8D7BTex" OutName="msg_kanji_8D7B" Format="i4" Width="16" Height="16" Offset="0x37880"/>
+        <Texture Name="gMsgKanji8D7CTex" OutName="msg_kanji_8D7C" Format="i4" Width="16" Height="16" Offset="0x37900"/>
+        <Texture Name="gMsgKanji8D7DTex" OutName="msg_kanji_8D7D" Format="i4" Width="16" Height="16" Offset="0x37980"/>
+        <Texture Name="gMsgKanji8D7ETex" OutName="msg_kanji_8D7E" Format="i4" Width="16" Height="16" Offset="0x37A00"/>
+        <Texture Name="gMsgKanji8D80Tex" OutName="msg_kanji_8D80" Format="i4" Width="16" Height="16" Offset="0x37A80"/>
+        <Texture Name="gMsgKanji8D81Tex" OutName="msg_kanji_8D81" Format="i4" Width="16" Height="16" Offset="0x37B00"/>
+        <Texture Name="gMsgKanji8D82Tex" OutName="msg_kanji_8D82" Format="i4" Width="16" Height="16" Offset="0x37B80"/>
+        <Texture Name="gMsgKanji8D83Tex" OutName="msg_kanji_8D83" Format="i4" Width="16" Height="16" Offset="0x37C00"/>
+        <Texture Name="gMsgKanji8D84Tex" OutName="msg_kanji_8D84" Format="i4" Width="16" Height="16" Offset="0x37C80"/>
+        <Texture Name="gMsgKanji8D85Tex" OutName="msg_kanji_8D85" Format="i4" Width="16" Height="16" Offset="0x37D00"/>
+        <Texture Name="gMsgKanji8D86Tex" OutName="msg_kanji_8D86" Format="i4" Width="16" Height="16" Offset="0x37D80"/>
+        <Texture Name="gMsgKanji8D87Tex" OutName="msg_kanji_8D87" Format="i4" Width="16" Height="16" Offset="0x37E00"/>
+        <Texture Name="gMsgKanji8D88Tex" OutName="msg_kanji_8D88" Format="i4" Width="16" Height="16" Offset="0x37E80"/>
+        <Texture Name="gMsgKanji8D89Tex" OutName="msg_kanji_8D89" Format="i4" Width="16" Height="16" Offset="0x37F00"/>
+        <Texture Name="gMsgKanji8D8ATex" OutName="msg_kanji_8D8A" Format="i4" Width="16" Height="16" Offset="0x37F80"/>
+        <Texture Name="gMsgKanji8D8BTex" OutName="msg_kanji_8D8B" Format="i4" Width="16" Height="16" Offset="0x38000"/>
+        <Texture Name="gMsgKanji8D8CTex" OutName="msg_kanji_8D8C" Format="i4" Width="16" Height="16" Offset="0x38080"/>
+        <Texture Name="gMsgKanji8D8DTex" OutName="msg_kanji_8D8D" Format="i4" Width="16" Height="16" Offset="0x38100"/>
+        <Texture Name="gMsgKanji8D8ETex" OutName="msg_kanji_8D8E" Format="i4" Width="16" Height="16" Offset="0x38180"/>
+        <Texture Name="gMsgKanji8D8FTex" OutName="msg_kanji_8D8F" Format="i4" Width="16" Height="16" Offset="0x38200"/>
+        <Texture Name="gMsgKanji8D90Tex" OutName="msg_kanji_8D90" Format="i4" Width="16" Height="16" Offset="0x38280"/>
+        <Texture Name="gMsgKanji8D91Tex" OutName="msg_kanji_8D91" Format="i4" Width="16" Height="16" Offset="0x38300"/>
+        <Texture Name="gMsgKanji8D92Tex" OutName="msg_kanji_8D92" Format="i4" Width="16" Height="16" Offset="0x38380"/>
+        <Texture Name="gMsgKanji8D93Tex" OutName="msg_kanji_8D93" Format="i4" Width="16" Height="16" Offset="0x38400"/>
+        <Texture Name="gMsgKanji8D94Tex" OutName="msg_kanji_8D94" Format="i4" Width="16" Height="16" Offset="0x38480"/>
+        <Texture Name="gMsgKanji8D95Tex" OutName="msg_kanji_8D95" Format="i4" Width="16" Height="16" Offset="0x38500"/>
+        <Texture Name="gMsgKanji8D96Tex" OutName="msg_kanji_8D96" Format="i4" Width="16" Height="16" Offset="0x38580"/>
+        <Texture Name="gMsgKanji8D97Tex" OutName="msg_kanji_8D97" Format="i4" Width="16" Height="16" Offset="0x38600"/>
+        <Texture Name="gMsgKanji8D98Tex" OutName="msg_kanji_8D98" Format="i4" Width="16" Height="16" Offset="0x38680"/>
+        <Texture Name="gMsgKanji8D99Tex" OutName="msg_kanji_8D99" Format="i4" Width="16" Height="16" Offset="0x38700"/>
+        <Texture Name="gMsgKanji8D9ATex" OutName="msg_kanji_8D9A" Format="i4" Width="16" Height="16" Offset="0x38780"/>
+        <Texture Name="gMsgKanji8D9BTex" OutName="msg_kanji_8D9B" Format="i4" Width="16" Height="16" Offset="0x38800"/>
+        <Texture Name="gMsgKanji8D9CTex" OutName="msg_kanji_8D9C" Format="i4" Width="16" Height="16" Offset="0x38880"/>
+        <Texture Name="gMsgKanji8D9DTex" OutName="msg_kanji_8D9D" Format="i4" Width="16" Height="16" Offset="0x38900"/>
+        <Texture Name="gMsgKanji8D9ETex" OutName="msg_kanji_8D9E" Format="i4" Width="16" Height="16" Offset="0x38980"/>
+        <Texture Name="gMsgKanji8D9FTex" OutName="msg_kanji_8D9F" Format="i4" Width="16" Height="16" Offset="0x38A00"/>
+        <Texture Name="gMsgKanji8DA0Tex" OutName="msg_kanji_8DA0" Format="i4" Width="16" Height="16" Offset="0x38A80"/>
+        <Texture Name="gMsgKanji8DA1Tex" OutName="msg_kanji_8DA1" Format="i4" Width="16" Height="16" Offset="0x38B00"/>
+        <Texture Name="gMsgKanji8DA2Tex" OutName="msg_kanji_8DA2" Format="i4" Width="16" Height="16" Offset="0x38B80"/>
+        <Texture Name="gMsgKanji8DA3Tex" OutName="msg_kanji_8DA3" Format="i4" Width="16" Height="16" Offset="0x38C00"/>
+        <Texture Name="gMsgKanji8DA4Tex" OutName="msg_kanji_8DA4" Format="i4" Width="16" Height="16" Offset="0x38C80"/>
+        <Texture Name="gMsgKanji8DA5Tex" OutName="msg_kanji_8DA5" Format="i4" Width="16" Height="16" Offset="0x38D00"/>
+        <Texture Name="gMsgKanji8DA6Tex" OutName="msg_kanji_8DA6" Format="i4" Width="16" Height="16" Offset="0x38D80"/>
+        <Texture Name="gMsgKanji8DA7Tex" OutName="msg_kanji_8DA7" Format="i4" Width="16" Height="16" Offset="0x38E00"/>
+        <Texture Name="gMsgKanji8DA8Tex" OutName="msg_kanji_8DA8" Format="i4" Width="16" Height="16" Offset="0x38E80"/>
+        <Texture Name="gMsgKanji8DA9Tex" OutName="msg_kanji_8DA9" Format="i4" Width="16" Height="16" Offset="0x38F00"/>
+        <Texture Name="gMsgKanji8DAATex" OutName="msg_kanji_8DAA" Format="i4" Width="16" Height="16" Offset="0x38F80"/>
+        <Texture Name="gMsgKanji8DABTex" OutName="msg_kanji_8DAB" Format="i4" Width="16" Height="16" Offset="0x39000"/>
+        <Texture Name="gMsgKanji8DACTex" OutName="msg_kanji_8DAC" Format="i4" Width="16" Height="16" Offset="0x39080"/>
+        <Texture Name="gMsgKanji8DADTex" OutName="msg_kanji_8DAD" Format="i4" Width="16" Height="16" Offset="0x39100"/>
+        <Texture Name="gMsgKanji8DAETex" OutName="msg_kanji_8DAE" Format="i4" Width="16" Height="16" Offset="0x39180"/>
+        <Texture Name="gMsgKanji8DAFTex" OutName="msg_kanji_8DAF" Format="i4" Width="16" Height="16" Offset="0x39200"/>
+        <Texture Name="gMsgKanji8DB0Tex" OutName="msg_kanji_8DB0" Format="i4" Width="16" Height="16" Offset="0x39280"/>
+        <Texture Name="gMsgKanji8DB1Tex" OutName="msg_kanji_8DB1" Format="i4" Width="16" Height="16" Offset="0x39300"/>
+        <Texture Name="gMsgKanji8DB2Tex" OutName="msg_kanji_8DB2" Format="i4" Width="16" Height="16" Offset="0x39380"/>
+        <Texture Name="gMsgKanji8DB3Tex" OutName="msg_kanji_8DB3" Format="i4" Width="16" Height="16" Offset="0x39400"/>
+        <Texture Name="gMsgKanji8DB4Tex" OutName="msg_kanji_8DB4" Format="i4" Width="16" Height="16" Offset="0x39480"/>
+        <Texture Name="gMsgKanji8DB5Tex" OutName="msg_kanji_8DB5" Format="i4" Width="16" Height="16" Offset="0x39500"/>
+        <Texture Name="gMsgKanji8DB6Tex" OutName="msg_kanji_8DB6" Format="i4" Width="16" Height="16" Offset="0x39580"/>
+        <Texture Name="gMsgKanji8DB7Tex" OutName="msg_kanji_8DB7" Format="i4" Width="16" Height="16" Offset="0x39600"/>
+        <Texture Name="gMsgKanji8DB8Tex" OutName="msg_kanji_8DB8" Format="i4" Width="16" Height="16" Offset="0x39680"/>
+        <Texture Name="gMsgKanji8DB9Tex" OutName="msg_kanji_8DB9" Format="i4" Width="16" Height="16" Offset="0x39700"/>
+        <Texture Name="gMsgKanji8DBATex" OutName="msg_kanji_8DBA" Format="i4" Width="16" Height="16" Offset="0x39780"/>
+        <Texture Name="gMsgKanji8DBBTex" OutName="msg_kanji_8DBB" Format="i4" Width="16" Height="16" Offset="0x39800"/>
+        <Texture Name="gMsgKanji8DBCTex" OutName="msg_kanji_8DBC" Format="i4" Width="16" Height="16" Offset="0x39880"/>
+        <Texture Name="gMsgKanji8DBDTex" OutName="msg_kanji_8DBD" Format="i4" Width="16" Height="16" Offset="0x39900"/>
+        <Texture Name="gMsgKanji8DBETex" OutName="msg_kanji_8DBE" Format="i4" Width="16" Height="16" Offset="0x39980"/>
+        <Texture Name="gMsgKanji8DBFTex" OutName="msg_kanji_8DBF" Format="i4" Width="16" Height="16" Offset="0x39A00"/>
+        <Texture Name="gMsgKanji8DC0Tex" OutName="msg_kanji_8DC0" Format="i4" Width="16" Height="16" Offset="0x39A80"/>
+        <Texture Name="gMsgKanji8DC1Tex" OutName="msg_kanji_8DC1" Format="i4" Width="16" Height="16" Offset="0x39B00"/>
+        <Texture Name="gMsgKanji8DC2Tex" OutName="msg_kanji_8DC2" Format="i4" Width="16" Height="16" Offset="0x39B80"/>
+        <Texture Name="gMsgKanji8DC3Tex" OutName="msg_kanji_8DC3" Format="i4" Width="16" Height="16" Offset="0x39C00"/>
+        <Texture Name="gMsgKanji8DC4Tex" OutName="msg_kanji_8DC4" Format="i4" Width="16" Height="16" Offset="0x39C80"/>
+        <Texture Name="gMsgKanji8DC5Tex" OutName="msg_kanji_8DC5" Format="i4" Width="16" Height="16" Offset="0x39D00"/>
+        <Texture Name="gMsgKanji8DC6Tex" OutName="msg_kanji_8DC6" Format="i4" Width="16" Height="16" Offset="0x39D80"/>
+        <Texture Name="gMsgKanji8DC7Tex" OutName="msg_kanji_8DC7" Format="i4" Width="16" Height="16" Offset="0x39E00"/>
+        <Texture Name="gMsgKanji8DC8Tex" OutName="msg_kanji_8DC8" Format="i4" Width="16" Height="16" Offset="0x39E80"/>
+        <Texture Name="gMsgKanji8DC9Tex" OutName="msg_kanji_8DC9" Format="i4" Width="16" Height="16" Offset="0x39F00"/>
+        <Texture Name="gMsgKanji8DCATex" OutName="msg_kanji_8DCA" Format="i4" Width="16" Height="16" Offset="0x39F80"/>
+        <Texture Name="gMsgKanji8DCBTex" OutName="msg_kanji_8DCB" Format="i4" Width="16" Height="16" Offset="0x3A000"/>
+        <Texture Name="gMsgKanji8DCCTex" OutName="msg_kanji_8DCC" Format="i4" Width="16" Height="16" Offset="0x3A080"/>
+        <Texture Name="gMsgKanji8DCDTex" OutName="msg_kanji_8DCD" Format="i4" Width="16" Height="16" Offset="0x3A100"/>
+        <Texture Name="gMsgKanji8DCETex" OutName="msg_kanji_8DCE" Format="i4" Width="16" Height="16" Offset="0x3A180"/>
+        <Texture Name="gMsgKanji8DCFTex" OutName="msg_kanji_8DCF" Format="i4" Width="16" Height="16" Offset="0x3A200"/>
+        <Texture Name="gMsgKanji8DD0Tex" OutName="msg_kanji_8DD0" Format="i4" Width="16" Height="16" Offset="0x3A280"/>
+        <Texture Name="gMsgKanji8DD1Tex" OutName="msg_kanji_8DD1" Format="i4" Width="16" Height="16" Offset="0x3A300"/>
+        <Texture Name="gMsgKanji8DD2Tex" OutName="msg_kanji_8DD2" Format="i4" Width="16" Height="16" Offset="0x3A380"/>
+        <Texture Name="gMsgKanji8DD3Tex" OutName="msg_kanji_8DD3" Format="i4" Width="16" Height="16" Offset="0x3A400"/>
+        <Texture Name="gMsgKanji8DD4Tex" OutName="msg_kanji_8DD4" Format="i4" Width="16" Height="16" Offset="0x3A480"/>
+        <Texture Name="gMsgKanji8DD5Tex" OutName="msg_kanji_8DD5" Format="i4" Width="16" Height="16" Offset="0x3A500"/>
+        <Texture Name="gMsgKanji8DD6Tex" OutName="msg_kanji_8DD6" Format="i4" Width="16" Height="16" Offset="0x3A580"/>
+        <Texture Name="gMsgKanji8DD7Tex" OutName="msg_kanji_8DD7" Format="i4" Width="16" Height="16" Offset="0x3A600"/>
+        <Texture Name="gMsgKanji8DD8Tex" OutName="msg_kanji_8DD8" Format="i4" Width="16" Height="16" Offset="0x3A680"/>
+        <Texture Name="gMsgKanji8DD9Tex" OutName="msg_kanji_8DD9" Format="i4" Width="16" Height="16" Offset="0x3A700"/>
+        <Texture Name="gMsgKanji8DDATex" OutName="msg_kanji_8DDA" Format="i4" Width="16" Height="16" Offset="0x3A780"/>
+        <Texture Name="gMsgKanji8DDBTex" OutName="msg_kanji_8DDB" Format="i4" Width="16" Height="16" Offset="0x3A800"/>
+        <Texture Name="gMsgKanji8DDCTex" OutName="msg_kanji_8DDC" Format="i4" Width="16" Height="16" Offset="0x3A880"/>
+        <Texture Name="gMsgKanji8DDDTex" OutName="msg_kanji_8DDD" Format="i4" Width="16" Height="16" Offset="0x3A900"/>
+        <Texture Name="gMsgKanji8DDETex" OutName="msg_kanji_8DDE" Format="i4" Width="16" Height="16" Offset="0x3A980"/>
+        <Texture Name="gMsgKanji8DDFTex" OutName="msg_kanji_8DDF" Format="i4" Width="16" Height="16" Offset="0x3AA00"/>
+        <Texture Name="gMsgKanji8DE0Tex" OutName="msg_kanji_8DE0" Format="i4" Width="16" Height="16" Offset="0x3AA80"/>
+        <Texture Name="gMsgKanji8DE1Tex" OutName="msg_kanji_8DE1" Format="i4" Width="16" Height="16" Offset="0x3AB00"/>
+        <Texture Name="gMsgKanji8DE2Tex" OutName="msg_kanji_8DE2" Format="i4" Width="16" Height="16" Offset="0x3AB80"/>
+        <Texture Name="gMsgKanji8DE3Tex" OutName="msg_kanji_8DE3" Format="i4" Width="16" Height="16" Offset="0x3AC00"/>
+        <Texture Name="gMsgKanji8DE4Tex" OutName="msg_kanji_8DE4" Format="i4" Width="16" Height="16" Offset="0x3AC80"/>
+        <Texture Name="gMsgKanji8DE5Tex" OutName="msg_kanji_8DE5" Format="i4" Width="16" Height="16" Offset="0x3AD00"/>
+        <Texture Name="gMsgKanji8DE6Tex" OutName="msg_kanji_8DE6" Format="i4" Width="16" Height="16" Offset="0x3AD80"/>
+        <Texture Name="gMsgKanji8DE7Tex" OutName="msg_kanji_8DE7" Format="i4" Width="16" Height="16" Offset="0x3AE00"/>
+        <Texture Name="gMsgKanji8DE8Tex" OutName="msg_kanji_8DE8" Format="i4" Width="16" Height="16" Offset="0x3AE80"/>
+        <Texture Name="gMsgKanji8DE9Tex" OutName="msg_kanji_8DE9" Format="i4" Width="16" Height="16" Offset="0x3AF00"/>
+        <Texture Name="gMsgKanji8DEATex" OutName="msg_kanji_8DEA" Format="i4" Width="16" Height="16" Offset="0x3AF80"/>
+        <Texture Name="gMsgKanji8DEBTex" OutName="msg_kanji_8DEB" Format="i4" Width="16" Height="16" Offset="0x3B000"/>
+        <Texture Name="gMsgKanji8DECTex" OutName="msg_kanji_8DEC" Format="i4" Width="16" Height="16" Offset="0x3B080"/>
+        <Texture Name="gMsgKanji8DEDTex" OutName="msg_kanji_8DED" Format="i4" Width="16" Height="16" Offset="0x3B100"/>
+        <Texture Name="gMsgKanji8DEETex" OutName="msg_kanji_8DEE" Format="i4" Width="16" Height="16" Offset="0x3B180"/>
+        <Texture Name="gMsgKanji8DEFTex" OutName="msg_kanji_8DEF" Format="i4" Width="16" Height="16" Offset="0x3B200"/>
+        <Texture Name="gMsgKanji8DF0Tex" OutName="msg_kanji_8DF0" Format="i4" Width="16" Height="16" Offset="0x3B280"/>
+        <Texture Name="gMsgKanji8DF1Tex" OutName="msg_kanji_8DF1" Format="i4" Width="16" Height="16" Offset="0x3B300"/>
+        <Texture Name="gMsgKanji8DF2Tex" OutName="msg_kanji_8DF2" Format="i4" Width="16" Height="16" Offset="0x3B380"/>
+        <Texture Name="gMsgKanji8DF3Tex" OutName="msg_kanji_8DF3" Format="i4" Width="16" Height="16" Offset="0x3B400"/>
+        <Texture Name="gMsgKanji8DF4Tex" OutName="msg_kanji_8DF4" Format="i4" Width="16" Height="16" Offset="0x3B480"/>
+        <Texture Name="gMsgKanji8DF5Tex" OutName="msg_kanji_8DF5" Format="i4" Width="16" Height="16" Offset="0x3B500"/>
+        <Texture Name="gMsgKanji8DF6Tex" OutName="msg_kanji_8DF6" Format="i4" Width="16" Height="16" Offset="0x3B580"/>
+        <Texture Name="gMsgKanji8DF7Tex" OutName="msg_kanji_8DF7" Format="i4" Width="16" Height="16" Offset="0x3B600"/>
+        <Texture Name="gMsgKanji8DF8Tex" OutName="msg_kanji_8DF8" Format="i4" Width="16" Height="16" Offset="0x3B680"/>
+        <Texture Name="gMsgKanji8DF9Tex" OutName="msg_kanji_8DF9" Format="i4" Width="16" Height="16" Offset="0x3B700"/>
+        <Texture Name="gMsgKanji8DFATex" OutName="msg_kanji_8DFA" Format="i4" Width="16" Height="16" Offset="0x3B780"/>
+        <Texture Name="gMsgKanji8DFBTex" OutName="msg_kanji_8DFB" Format="i4" Width="16" Height="16" Offset="0x3B800"/>
+        <Texture Name="gMsgKanji8DFCTex" OutName="msg_kanji_8DFC" Format="i4" Width="16" Height="16" Offset="0x3B880"/>
+        <Texture Name="gMsgKanji8E40Tex" OutName="msg_kanji_8E40" Format="i4" Width="16" Height="16" Offset="0x3B900"/>
+        <Texture Name="gMsgKanji8E41Tex" OutName="msg_kanji_8E41" Format="i4" Width="16" Height="16" Offset="0x3B980"/>
+        <Texture Name="gMsgKanji8E42Tex" OutName="msg_kanji_8E42" Format="i4" Width="16" Height="16" Offset="0x3BA00"/>
+        <Texture Name="gMsgKanji8E43Tex" OutName="msg_kanji_8E43" Format="i4" Width="16" Height="16" Offset="0x3BA80"/>
+        <Texture Name="gMsgKanji8E44Tex" OutName="msg_kanji_8E44" Format="i4" Width="16" Height="16" Offset="0x3BB00"/>
+        <Texture Name="gMsgKanji8E45Tex" OutName="msg_kanji_8E45" Format="i4" Width="16" Height="16" Offset="0x3BB80"/>
+        <Texture Name="gMsgKanji8E46Tex" OutName="msg_kanji_8E46" Format="i4" Width="16" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gMsgKanji8E47Tex" OutName="msg_kanji_8E47" Format="i4" Width="16" Height="16" Offset="0x3BC80"/>
+        <Texture Name="gMsgKanji8E48Tex" OutName="msg_kanji_8E48" Format="i4" Width="16" Height="16" Offset="0x3BD00"/>
+        <Texture Name="gMsgKanji8E49Tex" OutName="msg_kanji_8E49" Format="i4" Width="16" Height="16" Offset="0x3BD80"/>
+        <Texture Name="gMsgKanji8E4ATex" OutName="msg_kanji_8E4A" Format="i4" Width="16" Height="16" Offset="0x3BE00"/>
+        <Texture Name="gMsgKanji8E4BTex" OutName="msg_kanji_8E4B" Format="i4" Width="16" Height="16" Offset="0x3BE80"/>
+        <Texture Name="gMsgKanji8E4CTex" OutName="msg_kanji_8E4C" Format="i4" Width="16" Height="16" Offset="0x3BF00"/>
+        <Texture Name="gMsgKanji8E4DTex" OutName="msg_kanji_8E4D" Format="i4" Width="16" Height="16" Offset="0x3BF80"/>
+        <Texture Name="gMsgKanji8E4ETex" OutName="msg_kanji_8E4E" Format="i4" Width="16" Height="16" Offset="0x3C000"/>
+        <Texture Name="gMsgKanji8E4FTex" OutName="msg_kanji_8E4F" Format="i4" Width="16" Height="16" Offset="0x3C080"/>
+        <Texture Name="gMsgKanji8E50Tex" OutName="msg_kanji_8E50" Format="i4" Width="16" Height="16" Offset="0x3C100"/>
+        <Texture Name="gMsgKanji8E51Tex" OutName="msg_kanji_8E51" Format="i4" Width="16" Height="16" Offset="0x3C180"/>
+        <Texture Name="gMsgKanji8E52Tex" OutName="msg_kanji_8E52" Format="i4" Width="16" Height="16" Offset="0x3C200"/>
+        <Texture Name="gMsgKanji8E53Tex" OutName="msg_kanji_8E53" Format="i4" Width="16" Height="16" Offset="0x3C280"/>
+        <Texture Name="gMsgKanji8E54Tex" OutName="msg_kanji_8E54" Format="i4" Width="16" Height="16" Offset="0x3C300"/>
+        <Texture Name="gMsgKanji8E55Tex" OutName="msg_kanji_8E55" Format="i4" Width="16" Height="16" Offset="0x3C380"/>
+        <Texture Name="gMsgKanji8E56Tex" OutName="msg_kanji_8E56" Format="i4" Width="16" Height="16" Offset="0x3C400"/>
+        <Texture Name="gMsgKanji8E57Tex" OutName="msg_kanji_8E57" Format="i4" Width="16" Height="16" Offset="0x3C480"/>
+        <Texture Name="gMsgKanji8E58Tex" OutName="msg_kanji_8E58" Format="i4" Width="16" Height="16" Offset="0x3C500"/>
+        <Texture Name="gMsgKanji8E59Tex" OutName="msg_kanji_8E59" Format="i4" Width="16" Height="16" Offset="0x3C580"/>
+        <Texture Name="gMsgKanji8E5ATex" OutName="msg_kanji_8E5A" Format="i4" Width="16" Height="16" Offset="0x3C600"/>
+        <Texture Name="gMsgKanji8E5BTex" OutName="msg_kanji_8E5B" Format="i4" Width="16" Height="16" Offset="0x3C680"/>
+        <Texture Name="gMsgKanji8E5CTex" OutName="msg_kanji_8E5C" Format="i4" Width="16" Height="16" Offset="0x3C700"/>
+        <Texture Name="gMsgKanji8E5DTex" OutName="msg_kanji_8E5D" Format="i4" Width="16" Height="16" Offset="0x3C780"/>
+        <Texture Name="gMsgKanji8E5ETex" OutName="msg_kanji_8E5E" Format="i4" Width="16" Height="16" Offset="0x3C800"/>
+        <Texture Name="gMsgKanji8E5FTex" OutName="msg_kanji_8E5F" Format="i4" Width="16" Height="16" Offset="0x3C880"/>
+        <Texture Name="gMsgKanji8E60Tex" OutName="msg_kanji_8E60" Format="i4" Width="16" Height="16" Offset="0x3C900"/>
+        <Texture Name="gMsgKanji8E61Tex" OutName="msg_kanji_8E61" Format="i4" Width="16" Height="16" Offset="0x3C980"/>
+        <Texture Name="gMsgKanji8E62Tex" OutName="msg_kanji_8E62" Format="i4" Width="16" Height="16" Offset="0x3CA00"/>
+        <Texture Name="gMsgKanji8E63Tex" OutName="msg_kanji_8E63" Format="i4" Width="16" Height="16" Offset="0x3CA80"/>
+        <Texture Name="gMsgKanji8E64Tex" OutName="msg_kanji_8E64" Format="i4" Width="16" Height="16" Offset="0x3CB00"/>
+        <Texture Name="gMsgKanji8E65Tex" OutName="msg_kanji_8E65" Format="i4" Width="16" Height="16" Offset="0x3CB80"/>
+        <Texture Name="gMsgKanji8E66Tex" OutName="msg_kanji_8E66" Format="i4" Width="16" Height="16" Offset="0x3CC00"/>
+        <Texture Name="gMsgKanji8E67Tex" OutName="msg_kanji_8E67" Format="i4" Width="16" Height="16" Offset="0x3CC80"/>
+        <Texture Name="gMsgKanji8E68Tex" OutName="msg_kanji_8E68" Format="i4" Width="16" Height="16" Offset="0x3CD00"/>
+        <Texture Name="gMsgKanji8E69Tex" OutName="msg_kanji_8E69" Format="i4" Width="16" Height="16" Offset="0x3CD80"/>
+        <Texture Name="gMsgKanji8E6ATex" OutName="msg_kanji_8E6A" Format="i4" Width="16" Height="16" Offset="0x3CE00"/>
+        <Texture Name="gMsgKanji8E6BTex" OutName="msg_kanji_8E6B" Format="i4" Width="16" Height="16" Offset="0x3CE80"/>
+        <Texture Name="gMsgKanji8E6CTex" OutName="msg_kanji_8E6C" Format="i4" Width="16" Height="16" Offset="0x3CF00"/>
+        <Texture Name="gMsgKanji8E6DTex" OutName="msg_kanji_8E6D" Format="i4" Width="16" Height="16" Offset="0x3CF80"/>
+        <Texture Name="gMsgKanji8E6ETex" OutName="msg_kanji_8E6E" Format="i4" Width="16" Height="16" Offset="0x3D000"/>
+        <Texture Name="gMsgKanji8E6FTex" OutName="msg_kanji_8E6F" Format="i4" Width="16" Height="16" Offset="0x3D080"/>
+        <Texture Name="gMsgKanji8E70Tex" OutName="msg_kanji_8E70" Format="i4" Width="16" Height="16" Offset="0x3D100"/>
+        <Texture Name="gMsgKanji8E71Tex" OutName="msg_kanji_8E71" Format="i4" Width="16" Height="16" Offset="0x3D180"/>
+        <Texture Name="gMsgKanji8E72Tex" OutName="msg_kanji_8E72" Format="i4" Width="16" Height="16" Offset="0x3D200"/>
+        <Texture Name="gMsgKanji8E73Tex" OutName="msg_kanji_8E73" Format="i4" Width="16" Height="16" Offset="0x3D280"/>
+        <Texture Name="gMsgKanji8E74Tex" OutName="msg_kanji_8E74" Format="i4" Width="16" Height="16" Offset="0x3D300"/>
+        <Texture Name="gMsgKanji8E75Tex" OutName="msg_kanji_8E75" Format="i4" Width="16" Height="16" Offset="0x3D380"/>
+        <Texture Name="gMsgKanji8E76Tex" OutName="msg_kanji_8E76" Format="i4" Width="16" Height="16" Offset="0x3D400"/>
+        <Texture Name="gMsgKanji8E77Tex" OutName="msg_kanji_8E77" Format="i4" Width="16" Height="16" Offset="0x3D480"/>
+        <Texture Name="gMsgKanji8E78Tex" OutName="msg_kanji_8E78" Format="i4" Width="16" Height="16" Offset="0x3D500"/>
+        <Texture Name="gMsgKanji8E79Tex" OutName="msg_kanji_8E79" Format="i4" Width="16" Height="16" Offset="0x3D580"/>
+        <Texture Name="gMsgKanji8E7ATex" OutName="msg_kanji_8E7A" Format="i4" Width="16" Height="16" Offset="0x3D600"/>
+        <Texture Name="gMsgKanji8E7BTex" OutName="msg_kanji_8E7B" Format="i4" Width="16" Height="16" Offset="0x3D680"/>
+        <Texture Name="gMsgKanji8E7CTex" OutName="msg_kanji_8E7C" Format="i4" Width="16" Height="16" Offset="0x3D700"/>
+        <Texture Name="gMsgKanji8E7DTex" OutName="msg_kanji_8E7D" Format="i4" Width="16" Height="16" Offset="0x3D780"/>
+        <Texture Name="gMsgKanji8E7ETex" OutName="msg_kanji_8E7E" Format="i4" Width="16" Height="16" Offset="0x3D800"/>
+        <Texture Name="gMsgKanji8E80Tex" OutName="msg_kanji_8E80" Format="i4" Width="16" Height="16" Offset="0x3D880"/>
+        <Texture Name="gMsgKanji8E81Tex" OutName="msg_kanji_8E81" Format="i4" Width="16" Height="16" Offset="0x3D900"/>
+        <Texture Name="gMsgKanji8E82Tex" OutName="msg_kanji_8E82" Format="i4" Width="16" Height="16" Offset="0x3D980"/>
+        <Texture Name="gMsgKanji8E83Tex" OutName="msg_kanji_8E83" Format="i4" Width="16" Height="16" Offset="0x3DA00"/>
+        <Texture Name="gMsgKanji8E84Tex" OutName="msg_kanji_8E84" Format="i4" Width="16" Height="16" Offset="0x3DA80"/>
+        <Texture Name="gMsgKanji8E85Tex" OutName="msg_kanji_8E85" Format="i4" Width="16" Height="16" Offset="0x3DB00"/>
+        <Texture Name="gMsgKanji8E86Tex" OutName="msg_kanji_8E86" Format="i4" Width="16" Height="16" Offset="0x3DB80"/>
+        <Texture Name="gMsgKanji8E87Tex" OutName="msg_kanji_8E87" Format="i4" Width="16" Height="16" Offset="0x3DC00"/>
+        <Texture Name="gMsgKanji8E88Tex" OutName="msg_kanji_8E88" Format="i4" Width="16" Height="16" Offset="0x3DC80"/>
+        <Texture Name="gMsgKanji8E89Tex" OutName="msg_kanji_8E89" Format="i4" Width="16" Height="16" Offset="0x3DD00"/>
+        <Texture Name="gMsgKanji8E8ATex" OutName="msg_kanji_8E8A" Format="i4" Width="16" Height="16" Offset="0x3DD80"/>
+        <Texture Name="gMsgKanji8E8BTex" OutName="msg_kanji_8E8B" Format="i4" Width="16" Height="16" Offset="0x3DE00"/>
+        <Texture Name="gMsgKanji8E8CTex" OutName="msg_kanji_8E8C" Format="i4" Width="16" Height="16" Offset="0x3DE80"/>
+        <Texture Name="gMsgKanji8E8DTex" OutName="msg_kanji_8E8D" Format="i4" Width="16" Height="16" Offset="0x3DF00"/>
+        <Texture Name="gMsgKanji8E8ETex" OutName="msg_kanji_8E8E" Format="i4" Width="16" Height="16" Offset="0x3DF80"/>
+        <Texture Name="gMsgKanji8E8FTex" OutName="msg_kanji_8E8F" Format="i4" Width="16" Height="16" Offset="0x3E000"/>
+        <Texture Name="gMsgKanji8E90Tex" OutName="msg_kanji_8E90" Format="i4" Width="16" Height="16" Offset="0x3E080"/>
+        <Texture Name="gMsgKanji8E91Tex" OutName="msg_kanji_8E91" Format="i4" Width="16" Height="16" Offset="0x3E100"/>
+        <Texture Name="gMsgKanji8E92Tex" OutName="msg_kanji_8E92" Format="i4" Width="16" Height="16" Offset="0x3E180"/>
+        <Texture Name="gMsgKanji8E93Tex" OutName="msg_kanji_8E93" Format="i4" Width="16" Height="16" Offset="0x3E200"/>
+        <Texture Name="gMsgKanji8E94Tex" OutName="msg_kanji_8E94" Format="i4" Width="16" Height="16" Offset="0x3E280"/>
+        <Texture Name="gMsgKanji8E95Tex" OutName="msg_kanji_8E95" Format="i4" Width="16" Height="16" Offset="0x3E300"/>
+        <Texture Name="gMsgKanji8E96Tex" OutName="msg_kanji_8E96" Format="i4" Width="16" Height="16" Offset="0x3E380"/>
+        <Texture Name="gMsgKanji8E97Tex" OutName="msg_kanji_8E97" Format="i4" Width="16" Height="16" Offset="0x3E400"/>
+        <Texture Name="gMsgKanji8E98Tex" OutName="msg_kanji_8E98" Format="i4" Width="16" Height="16" Offset="0x3E480"/>
+        <Texture Name="gMsgKanji8E99Tex" OutName="msg_kanji_8E99" Format="i4" Width="16" Height="16" Offset="0x3E500"/>
+        <Texture Name="gMsgKanji8E9ATex" OutName="msg_kanji_8E9A" Format="i4" Width="16" Height="16" Offset="0x3E580"/>
+        <Texture Name="gMsgKanji8E9BTex" OutName="msg_kanji_8E9B" Format="i4" Width="16" Height="16" Offset="0x3E600"/>
+        <Texture Name="gMsgKanji8E9CTex" OutName="msg_kanji_8E9C" Format="i4" Width="16" Height="16" Offset="0x3E680"/>
+        <Texture Name="gMsgKanji8E9DTex" OutName="msg_kanji_8E9D" Format="i4" Width="16" Height="16" Offset="0x3E700"/>
+        <Texture Name="gMsgKanji8E9ETex" OutName="msg_kanji_8E9E" Format="i4" Width="16" Height="16" Offset="0x3E780"/>
+        <Texture Name="gMsgKanji8E9FTex" OutName="msg_kanji_8E9F" Format="i4" Width="16" Height="16" Offset="0x3E800"/>
+        <Texture Name="gMsgKanji8EA0Tex" OutName="msg_kanji_8EA0" Format="i4" Width="16" Height="16" Offset="0x3E880"/>
+        <Texture Name="gMsgKanji8EA1Tex" OutName="msg_kanji_8EA1" Format="i4" Width="16" Height="16" Offset="0x3E900"/>
+        <Texture Name="gMsgKanji8EA2Tex" OutName="msg_kanji_8EA2" Format="i4" Width="16" Height="16" Offset="0x3E980"/>
+        <Texture Name="gMsgKanji8EA3Tex" OutName="msg_kanji_8EA3" Format="i4" Width="16" Height="16" Offset="0x3EA00"/>
+        <Texture Name="gMsgKanji8EA4Tex" OutName="msg_kanji_8EA4" Format="i4" Width="16" Height="16" Offset="0x3EA80"/>
+        <Texture Name="gMsgKanji8EA5Tex" OutName="msg_kanji_8EA5" Format="i4" Width="16" Height="16" Offset="0x3EB00"/>
+        <Texture Name="gMsgKanji8EA6Tex" OutName="msg_kanji_8EA6" Format="i4" Width="16" Height="16" Offset="0x3EB80"/>
+        <Texture Name="gMsgKanji8EA7Tex" OutName="msg_kanji_8EA7" Format="i4" Width="16" Height="16" Offset="0x3EC00"/>
+        <Texture Name="gMsgKanji8EA8Tex" OutName="msg_kanji_8EA8" Format="i4" Width="16" Height="16" Offset="0x3EC80"/>
+        <Texture Name="gMsgKanji8EA9Tex" OutName="msg_kanji_8EA9" Format="i4" Width="16" Height="16" Offset="0x3ED00"/>
+        <Texture Name="gMsgKanji8EAATex" OutName="msg_kanji_8EAA" Format="i4" Width="16" Height="16" Offset="0x3ED80"/>
+        <Texture Name="gMsgKanji8EABTex" OutName="msg_kanji_8EAB" Format="i4" Width="16" Height="16" Offset="0x3EE00"/>
+        <Texture Name="gMsgKanji8EACTex" OutName="msg_kanji_8EAC" Format="i4" Width="16" Height="16" Offset="0x3EE80"/>
+        <Texture Name="gMsgKanji8EADTex" OutName="msg_kanji_8EAD" Format="i4" Width="16" Height="16" Offset="0x3EF00"/>
+        <Texture Name="gMsgKanji8EAETex" OutName="msg_kanji_8EAE" Format="i4" Width="16" Height="16" Offset="0x3EF80"/>
+        <Texture Name="gMsgKanji8EAFTex" OutName="msg_kanji_8EAF" Format="i4" Width="16" Height="16" Offset="0x3F000"/>
+        <Texture Name="gMsgKanji8EB0Tex" OutName="msg_kanji_8EB0" Format="i4" Width="16" Height="16" Offset="0x3F080"/>
+        <Texture Name="gMsgKanji8EB1Tex" OutName="msg_kanji_8EB1" Format="i4" Width="16" Height="16" Offset="0x3F100"/>
+        <Texture Name="gMsgKanji8EB2Tex" OutName="msg_kanji_8EB2" Format="i4" Width="16" Height="16" Offset="0x3F180"/>
+        <Texture Name="gMsgKanji8EB3Tex" OutName="msg_kanji_8EB3" Format="i4" Width="16" Height="16" Offset="0x3F200"/>
+        <Texture Name="gMsgKanji8EB4Tex" OutName="msg_kanji_8EB4" Format="i4" Width="16" Height="16" Offset="0x3F280"/>
+        <Texture Name="gMsgKanji8EB5Tex" OutName="msg_kanji_8EB5" Format="i4" Width="16" Height="16" Offset="0x3F300"/>
+        <Texture Name="gMsgKanji8EB6Tex" OutName="msg_kanji_8EB6" Format="i4" Width="16" Height="16" Offset="0x3F380"/>
+        <Texture Name="gMsgKanji8EB7Tex" OutName="msg_kanji_8EB7" Format="i4" Width="16" Height="16" Offset="0x3F400"/>
+        <Texture Name="gMsgKanji8EB8Tex" OutName="msg_kanji_8EB8" Format="i4" Width="16" Height="16" Offset="0x3F480"/>
+        <Texture Name="gMsgKanji8EB9Tex" OutName="msg_kanji_8EB9" Format="i4" Width="16" Height="16" Offset="0x3F500"/>
+        <Texture Name="gMsgKanji8EBATex" OutName="msg_kanji_8EBA" Format="i4" Width="16" Height="16" Offset="0x3F580"/>
+        <Texture Name="gMsgKanji8EBBTex" OutName="msg_kanji_8EBB" Format="i4" Width="16" Height="16" Offset="0x3F600"/>
+        <Texture Name="gMsgKanji8EBCTex" OutName="msg_kanji_8EBC" Format="i4" Width="16" Height="16" Offset="0x3F680"/>
+        <Texture Name="gMsgKanji8EBDTex" OutName="msg_kanji_8EBD" Format="i4" Width="16" Height="16" Offset="0x3F700"/>
+        <Texture Name="gMsgKanji8EBETex" OutName="msg_kanji_8EBE" Format="i4" Width="16" Height="16" Offset="0x3F780"/>
+        <Texture Name="gMsgKanji8EBFTex" OutName="msg_kanji_8EBF" Format="i4" Width="16" Height="16" Offset="0x3F800"/>
+        <Texture Name="gMsgKanji8EC0Tex" OutName="msg_kanji_8EC0" Format="i4" Width="16" Height="16" Offset="0x3F880"/>
+        <Texture Name="gMsgKanji8EC1Tex" OutName="msg_kanji_8EC1" Format="i4" Width="16" Height="16" Offset="0x3F900"/>
+        <Texture Name="gMsgKanji8EC2Tex" OutName="msg_kanji_8EC2" Format="i4" Width="16" Height="16" Offset="0x3F980"/>
+        <Texture Name="gMsgKanji8EC3Tex" OutName="msg_kanji_8EC3" Format="i4" Width="16" Height="16" Offset="0x3FA00"/>
+        <Texture Name="gMsgKanji8EC4Tex" OutName="msg_kanji_8EC4" Format="i4" Width="16" Height="16" Offset="0x3FA80"/>
+        <Texture Name="gMsgKanji8EC5Tex" OutName="msg_kanji_8EC5" Format="i4" Width="16" Height="16" Offset="0x3FB00"/>
+        <Texture Name="gMsgKanji8EC6Tex" OutName="msg_kanji_8EC6" Format="i4" Width="16" Height="16" Offset="0x3FB80"/>
+        <Texture Name="gMsgKanji8EC7Tex" OutName="msg_kanji_8EC7" Format="i4" Width="16" Height="16" Offset="0x3FC00"/>
+        <Texture Name="gMsgKanji8EC8Tex" OutName="msg_kanji_8EC8" Format="i4" Width="16" Height="16" Offset="0x3FC80"/>
+        <Texture Name="gMsgKanji8EC9Tex" OutName="msg_kanji_8EC9" Format="i4" Width="16" Height="16" Offset="0x3FD00"/>
+        <Texture Name="gMsgKanji8ECATex" OutName="msg_kanji_8ECA" Format="i4" Width="16" Height="16" Offset="0x3FD80"/>
+        <Texture Name="gMsgKanji8ECBTex" OutName="msg_kanji_8ECB" Format="i4" Width="16" Height="16" Offset="0x3FE00"/>
+        <Texture Name="gMsgKanji8ECCTex" OutName="msg_kanji_8ECC" Format="i4" Width="16" Height="16" Offset="0x3FE80"/>
+        <Texture Name="gMsgKanji8ECDTex" OutName="msg_kanji_8ECD" Format="i4" Width="16" Height="16" Offset="0x3FF00"/>
+        <Texture Name="gMsgKanji8ECETex" OutName="msg_kanji_8ECE" Format="i4" Width="16" Height="16" Offset="0x3FF80"/>
+        <Texture Name="gMsgKanji8ECFTex" OutName="msg_kanji_8ECF" Format="i4" Width="16" Height="16" Offset="0x40000"/>
+        <Texture Name="gMsgKanji8ED0Tex" OutName="msg_kanji_8ED0" Format="i4" Width="16" Height="16" Offset="0x40080"/>
+        <Texture Name="gMsgKanji8ED1Tex" OutName="msg_kanji_8ED1" Format="i4" Width="16" Height="16" Offset="0x40100"/>
+        <Texture Name="gMsgKanji8ED2Tex" OutName="msg_kanji_8ED2" Format="i4" Width="16" Height="16" Offset="0x40180"/>
+        <Texture Name="gMsgKanji8ED3Tex" OutName="msg_kanji_8ED3" Format="i4" Width="16" Height="16" Offset="0x40200"/>
+        <Texture Name="gMsgKanji8ED4Tex" OutName="msg_kanji_8ED4" Format="i4" Width="16" Height="16" Offset="0x40280"/>
+        <Texture Name="gMsgKanji8ED5Tex" OutName="msg_kanji_8ED5" Format="i4" Width="16" Height="16" Offset="0x40300"/>
+        <Texture Name="gMsgKanji8ED6Tex" OutName="msg_kanji_8ED6" Format="i4" Width="16" Height="16" Offset="0x40380"/>
+        <Texture Name="gMsgKanji8ED7Tex" OutName="msg_kanji_8ED7" Format="i4" Width="16" Height="16" Offset="0x40400"/>
+        <Texture Name="gMsgKanji8ED8Tex" OutName="msg_kanji_8ED8" Format="i4" Width="16" Height="16" Offset="0x40480"/>
+        <Texture Name="gMsgKanji8ED9Tex" OutName="msg_kanji_8ED9" Format="i4" Width="16" Height="16" Offset="0x40500"/>
+        <Texture Name="gMsgKanji8EDATex" OutName="msg_kanji_8EDA" Format="i4" Width="16" Height="16" Offset="0x40580"/>
+        <Texture Name="gMsgKanji8EDBTex" OutName="msg_kanji_8EDB" Format="i4" Width="16" Height="16" Offset="0x40600"/>
+        <Texture Name="gMsgKanji8EDCTex" OutName="msg_kanji_8EDC" Format="i4" Width="16" Height="16" Offset="0x40680"/>
+        <Texture Name="gMsgKanji8EDDTex" OutName="msg_kanji_8EDD" Format="i4" Width="16" Height="16" Offset="0x40700"/>
+        <Texture Name="gMsgKanji8EDETex" OutName="msg_kanji_8EDE" Format="i4" Width="16" Height="16" Offset="0x40780"/>
+        <Texture Name="gMsgKanji8EDFTex" OutName="msg_kanji_8EDF" Format="i4" Width="16" Height="16" Offset="0x40800"/>
+        <Texture Name="gMsgKanji8EE0Tex" OutName="msg_kanji_8EE0" Format="i4" Width="16" Height="16" Offset="0x40880"/>
+        <Texture Name="gMsgKanji8EE1Tex" OutName="msg_kanji_8EE1" Format="i4" Width="16" Height="16" Offset="0x40900"/>
+        <Texture Name="gMsgKanji8EE2Tex" OutName="msg_kanji_8EE2" Format="i4" Width="16" Height="16" Offset="0x40980"/>
+        <Texture Name="gMsgKanji8EE3Tex" OutName="msg_kanji_8EE3" Format="i4" Width="16" Height="16" Offset="0x40A00"/>
+        <Texture Name="gMsgKanji8EE4Tex" OutName="msg_kanji_8EE4" Format="i4" Width="16" Height="16" Offset="0x40A80"/>
+        <Texture Name="gMsgKanji8EE5Tex" OutName="msg_kanji_8EE5" Format="i4" Width="16" Height="16" Offset="0x40B00"/>
+        <Texture Name="gMsgKanji8EE6Tex" OutName="msg_kanji_8EE6" Format="i4" Width="16" Height="16" Offset="0x40B80"/>
+        <Texture Name="gMsgKanji8EE7Tex" OutName="msg_kanji_8EE7" Format="i4" Width="16" Height="16" Offset="0x40C00"/>
+        <Texture Name="gMsgKanji8EE8Tex" OutName="msg_kanji_8EE8" Format="i4" Width="16" Height="16" Offset="0x40C80"/>
+        <Texture Name="gMsgKanji8EE9Tex" OutName="msg_kanji_8EE9" Format="i4" Width="16" Height="16" Offset="0x40D00"/>
+        <Texture Name="gMsgKanji8EEATex" OutName="msg_kanji_8EEA" Format="i4" Width="16" Height="16" Offset="0x40D80"/>
+        <Texture Name="gMsgKanji8EEBTex" OutName="msg_kanji_8EEB" Format="i4" Width="16" Height="16" Offset="0x40E00"/>
+        <Texture Name="gMsgKanji8EECTex" OutName="msg_kanji_8EEC" Format="i4" Width="16" Height="16" Offset="0x40E80"/>
+        <Texture Name="gMsgKanji8EEDTex" OutName="msg_kanji_8EED" Format="i4" Width="16" Height="16" Offset="0x40F00"/>
+        <Texture Name="gMsgKanji8EEETex" OutName="msg_kanji_8EEE" Format="i4" Width="16" Height="16" Offset="0x40F80"/>
+        <Texture Name="gMsgKanji8EEFTex" OutName="msg_kanji_8EEF" Format="i4" Width="16" Height="16" Offset="0x41000"/>
+        <Texture Name="gMsgKanji8EF0Tex" OutName="msg_kanji_8EF0" Format="i4" Width="16" Height="16" Offset="0x41080"/>
+        <Texture Name="gMsgKanji8EF1Tex" OutName="msg_kanji_8EF1" Format="i4" Width="16" Height="16" Offset="0x41100"/>
+        <Texture Name="gMsgKanji8EF2Tex" OutName="msg_kanji_8EF2" Format="i4" Width="16" Height="16" Offset="0x41180"/>
+        <Texture Name="gMsgKanji8EF3Tex" OutName="msg_kanji_8EF3" Format="i4" Width="16" Height="16" Offset="0x41200"/>
+        <Texture Name="gMsgKanji8EF4Tex" OutName="msg_kanji_8EF4" Format="i4" Width="16" Height="16" Offset="0x41280"/>
+        <Texture Name="gMsgKanji8EF5Tex" OutName="msg_kanji_8EF5" Format="i4" Width="16" Height="16" Offset="0x41300"/>
+        <Texture Name="gMsgKanji8EF6Tex" OutName="msg_kanji_8EF6" Format="i4" Width="16" Height="16" Offset="0x41380"/>
+        <Texture Name="gMsgKanji8EF7Tex" OutName="msg_kanji_8EF7" Format="i4" Width="16" Height="16" Offset="0x41400"/>
+        <Texture Name="gMsgKanji8EF8Tex" OutName="msg_kanji_8EF8" Format="i4" Width="16" Height="16" Offset="0x41480"/>
+        <Texture Name="gMsgKanji8EF9Tex" OutName="msg_kanji_8EF9" Format="i4" Width="16" Height="16" Offset="0x41500"/>
+        <Texture Name="gMsgKanji8EFATex" OutName="msg_kanji_8EFA" Format="i4" Width="16" Height="16" Offset="0x41580"/>
+        <Texture Name="gMsgKanji8EFBTex" OutName="msg_kanji_8EFB" Format="i4" Width="16" Height="16" Offset="0x41600"/>
+        <Texture Name="gMsgKanji8EFCTex" OutName="msg_kanji_8EFC" Format="i4" Width="16" Height="16" Offset="0x41680"/>
+        <Texture Name="gMsgKanji8F40Tex" OutName="msg_kanji_8F40" Format="i4" Width="16" Height="16" Offset="0x41700"/>
+        <Texture Name="gMsgKanji8F41Tex" OutName="msg_kanji_8F41" Format="i4" Width="16" Height="16" Offset="0x41780"/>
+        <Texture Name="gMsgKanji8F42Tex" OutName="msg_kanji_8F42" Format="i4" Width="16" Height="16" Offset="0x41800"/>
+        <Texture Name="gMsgKanji8F43Tex" OutName="msg_kanji_8F43" Format="i4" Width="16" Height="16" Offset="0x41880"/>
+        <Texture Name="gMsgKanji8F44Tex" OutName="msg_kanji_8F44" Format="i4" Width="16" Height="16" Offset="0x41900"/>
+        <Texture Name="gMsgKanji8F45Tex" OutName="msg_kanji_8F45" Format="i4" Width="16" Height="16" Offset="0x41980"/>
+        <Texture Name="gMsgKanji8F46Tex" OutName="msg_kanji_8F46" Format="i4" Width="16" Height="16" Offset="0x41A00"/>
+        <Texture Name="gMsgKanji8F47Tex" OutName="msg_kanji_8F47" Format="i4" Width="16" Height="16" Offset="0x41A80"/>
+        <Texture Name="gMsgKanji8F48Tex" OutName="msg_kanji_8F48" Format="i4" Width="16" Height="16" Offset="0x41B00"/>
+        <Texture Name="gMsgKanji8F49Tex" OutName="msg_kanji_8F49" Format="i4" Width="16" Height="16" Offset="0x41B80"/>
+        <Texture Name="gMsgKanji8F4ATex" OutName="msg_kanji_8F4A" Format="i4" Width="16" Height="16" Offset="0x41C00"/>
+        <Texture Name="gMsgKanji8F4BTex" OutName="msg_kanji_8F4B" Format="i4" Width="16" Height="16" Offset="0x41C80"/>
+        <Texture Name="gMsgKanji8F4CTex" OutName="msg_kanji_8F4C" Format="i4" Width="16" Height="16" Offset="0x41D00"/>
+        <Texture Name="gMsgKanji8F4DTex" OutName="msg_kanji_8F4D" Format="i4" Width="16" Height="16" Offset="0x41D80"/>
+        <Texture Name="gMsgKanji8F4ETex" OutName="msg_kanji_8F4E" Format="i4" Width="16" Height="16" Offset="0x41E00"/>
+        <Texture Name="gMsgKanji8F4FTex" OutName="msg_kanji_8F4F" Format="i4" Width="16" Height="16" Offset="0x41E80"/>
+        <Texture Name="gMsgKanji8F50Tex" OutName="msg_kanji_8F50" Format="i4" Width="16" Height="16" Offset="0x41F00"/>
+        <Texture Name="gMsgKanji8F51Tex" OutName="msg_kanji_8F51" Format="i4" Width="16" Height="16" Offset="0x41F80"/>
+        <Texture Name="gMsgKanji8F52Tex" OutName="msg_kanji_8F52" Format="i4" Width="16" Height="16" Offset="0x42000"/>
+        <Texture Name="gMsgKanji8F53Tex" OutName="msg_kanji_8F53" Format="i4" Width="16" Height="16" Offset="0x42080"/>
+        <Texture Name="gMsgKanji8F54Tex" OutName="msg_kanji_8F54" Format="i4" Width="16" Height="16" Offset="0x42100"/>
+        <Texture Name="gMsgKanji8F55Tex" OutName="msg_kanji_8F55" Format="i4" Width="16" Height="16" Offset="0x42180"/>
+        <Texture Name="gMsgKanji8F56Tex" OutName="msg_kanji_8F56" Format="i4" Width="16" Height="16" Offset="0x42200"/>
+        <Texture Name="gMsgKanji8F57Tex" OutName="msg_kanji_8F57" Format="i4" Width="16" Height="16" Offset="0x42280"/>
+        <Texture Name="gMsgKanji8F58Tex" OutName="msg_kanji_8F58" Format="i4" Width="16" Height="16" Offset="0x42300"/>
+        <Texture Name="gMsgKanji8F59Tex" OutName="msg_kanji_8F59" Format="i4" Width="16" Height="16" Offset="0x42380"/>
+        <Texture Name="gMsgKanji8F5ATex" OutName="msg_kanji_8F5A" Format="i4" Width="16" Height="16" Offset="0x42400"/>
+        <Texture Name="gMsgKanji8F5BTex" OutName="msg_kanji_8F5B" Format="i4" Width="16" Height="16" Offset="0x42480"/>
+        <Texture Name="gMsgKanji8F5CTex" OutName="msg_kanji_8F5C" Format="i4" Width="16" Height="16" Offset="0x42500"/>
+        <Texture Name="gMsgKanji8F5DTex" OutName="msg_kanji_8F5D" Format="i4" Width="16" Height="16" Offset="0x42580"/>
+        <Texture Name="gMsgKanji8F5ETex" OutName="msg_kanji_8F5E" Format="i4" Width="16" Height="16" Offset="0x42600"/>
+        <Texture Name="gMsgKanji8F5FTex" OutName="msg_kanji_8F5F" Format="i4" Width="16" Height="16" Offset="0x42680"/>
+        <Texture Name="gMsgKanji8F60Tex" OutName="msg_kanji_8F60" Format="i4" Width="16" Height="16" Offset="0x42700"/>
+        <Texture Name="gMsgKanji8F61Tex" OutName="msg_kanji_8F61" Format="i4" Width="16" Height="16" Offset="0x42780"/>
+        <Texture Name="gMsgKanji8F62Tex" OutName="msg_kanji_8F62" Format="i4" Width="16" Height="16" Offset="0x42800"/>
+        <Texture Name="gMsgKanji8F63Tex" OutName="msg_kanji_8F63" Format="i4" Width="16" Height="16" Offset="0x42880"/>
+        <Texture Name="gMsgKanji8F64Tex" OutName="msg_kanji_8F64" Format="i4" Width="16" Height="16" Offset="0x42900"/>
+        <Texture Name="gMsgKanji8F65Tex" OutName="msg_kanji_8F65" Format="i4" Width="16" Height="16" Offset="0x42980"/>
+        <Texture Name="gMsgKanji8F66Tex" OutName="msg_kanji_8F66" Format="i4" Width="16" Height="16" Offset="0x42A00"/>
+        <Texture Name="gMsgKanji8F67Tex" OutName="msg_kanji_8F67" Format="i4" Width="16" Height="16" Offset="0x42A80"/>
+        <Texture Name="gMsgKanji8F68Tex" OutName="msg_kanji_8F68" Format="i4" Width="16" Height="16" Offset="0x42B00"/>
+        <Texture Name="gMsgKanji8F69Tex" OutName="msg_kanji_8F69" Format="i4" Width="16" Height="16" Offset="0x42B80"/>
+        <Texture Name="gMsgKanji8F6ATex" OutName="msg_kanji_8F6A" Format="i4" Width="16" Height="16" Offset="0x42C00"/>
+        <Texture Name="gMsgKanji8F6BTex" OutName="msg_kanji_8F6B" Format="i4" Width="16" Height="16" Offset="0x42C80"/>
+        <Texture Name="gMsgKanji8F6CTex" OutName="msg_kanji_8F6C" Format="i4" Width="16" Height="16" Offset="0x42D00"/>
+        <Texture Name="gMsgKanji8F6DTex" OutName="msg_kanji_8F6D" Format="i4" Width="16" Height="16" Offset="0x42D80"/>
+        <Texture Name="gMsgKanji8F6ETex" OutName="msg_kanji_8F6E" Format="i4" Width="16" Height="16" Offset="0x42E00"/>
+        <Texture Name="gMsgKanji8F6FTex" OutName="msg_kanji_8F6F" Format="i4" Width="16" Height="16" Offset="0x42E80"/>
+        <Texture Name="gMsgKanji8F70Tex" OutName="msg_kanji_8F70" Format="i4" Width="16" Height="16" Offset="0x42F00"/>
+        <Texture Name="gMsgKanji8F71Tex" OutName="msg_kanji_8F71" Format="i4" Width="16" Height="16" Offset="0x42F80"/>
+        <Texture Name="gMsgKanji8F72Tex" OutName="msg_kanji_8F72" Format="i4" Width="16" Height="16" Offset="0x43000"/>
+        <Texture Name="gMsgKanji8F73Tex" OutName="msg_kanji_8F73" Format="i4" Width="16" Height="16" Offset="0x43080"/>
+        <Texture Name="gMsgKanji8F74Tex" OutName="msg_kanji_8F74" Format="i4" Width="16" Height="16" Offset="0x43100"/>
+        <Texture Name="gMsgKanji8F75Tex" OutName="msg_kanji_8F75" Format="i4" Width="16" Height="16" Offset="0x43180"/>
+        <Texture Name="gMsgKanji8F76Tex" OutName="msg_kanji_8F76" Format="i4" Width="16" Height="16" Offset="0x43200"/>
+        <Texture Name="gMsgKanji8F77Tex" OutName="msg_kanji_8F77" Format="i4" Width="16" Height="16" Offset="0x43280"/>
+        <Texture Name="gMsgKanji8F78Tex" OutName="msg_kanji_8F78" Format="i4" Width="16" Height="16" Offset="0x43300"/>
+        <Texture Name="gMsgKanji8F79Tex" OutName="msg_kanji_8F79" Format="i4" Width="16" Height="16" Offset="0x43380"/>
+        <Texture Name="gMsgKanji8F7ATex" OutName="msg_kanji_8F7A" Format="i4" Width="16" Height="16" Offset="0x43400"/>
+        <Texture Name="gMsgKanji8F7BTex" OutName="msg_kanji_8F7B" Format="i4" Width="16" Height="16" Offset="0x43480"/>
+        <Texture Name="gMsgKanji8F7CTex" OutName="msg_kanji_8F7C" Format="i4" Width="16" Height="16" Offset="0x43500"/>
+        <Texture Name="gMsgKanji8F7DTex" OutName="msg_kanji_8F7D" Format="i4" Width="16" Height="16" Offset="0x43580"/>
+        <Texture Name="gMsgKanji8F7ETex" OutName="msg_kanji_8F7E" Format="i4" Width="16" Height="16" Offset="0x43600"/>
+        <Texture Name="gMsgKanji8F80Tex" OutName="msg_kanji_8F80" Format="i4" Width="16" Height="16" Offset="0x43680"/>
+        <Texture Name="gMsgKanji8F81Tex" OutName="msg_kanji_8F81" Format="i4" Width="16" Height="16" Offset="0x43700"/>
+        <Texture Name="gMsgKanji8F82Tex" OutName="msg_kanji_8F82" Format="i4" Width="16" Height="16" Offset="0x43780"/>
+        <Texture Name="gMsgKanji8F83Tex" OutName="msg_kanji_8F83" Format="i4" Width="16" Height="16" Offset="0x43800"/>
+        <Texture Name="gMsgKanji8F84Tex" OutName="msg_kanji_8F84" Format="i4" Width="16" Height="16" Offset="0x43880"/>
+        <Texture Name="gMsgKanji8F85Tex" OutName="msg_kanji_8F85" Format="i4" Width="16" Height="16" Offset="0x43900"/>
+        <Texture Name="gMsgKanji8F86Tex" OutName="msg_kanji_8F86" Format="i4" Width="16" Height="16" Offset="0x43980"/>
+        <Texture Name="gMsgKanji8F87Tex" OutName="msg_kanji_8F87" Format="i4" Width="16" Height="16" Offset="0x43A00"/>
+        <Texture Name="gMsgKanji8F88Tex" OutName="msg_kanji_8F88" Format="i4" Width="16" Height="16" Offset="0x43A80"/>
+        <Texture Name="gMsgKanji8F89Tex" OutName="msg_kanji_8F89" Format="i4" Width="16" Height="16" Offset="0x43B00"/>
+        <Texture Name="gMsgKanji8F8ATex" OutName="msg_kanji_8F8A" Format="i4" Width="16" Height="16" Offset="0x43B80"/>
+        <Texture Name="gMsgKanji8F8BTex" OutName="msg_kanji_8F8B" Format="i4" Width="16" Height="16" Offset="0x43C00"/>
+        <Texture Name="gMsgKanji8F8CTex" OutName="msg_kanji_8F8C" Format="i4" Width="16" Height="16" Offset="0x43C80"/>
+        <Texture Name="gMsgKanji8F8DTex" OutName="msg_kanji_8F8D" Format="i4" Width="16" Height="16" Offset="0x43D00"/>
+        <Texture Name="gMsgKanji8F8ETex" OutName="msg_kanji_8F8E" Format="i4" Width="16" Height="16" Offset="0x43D80"/>
+        <Texture Name="gMsgKanji8F8FTex" OutName="msg_kanji_8F8F" Format="i4" Width="16" Height="16" Offset="0x43E00"/>
+        <Texture Name="gMsgKanji8F90Tex" OutName="msg_kanji_8F90" Format="i4" Width="16" Height="16" Offset="0x43E80"/>
+        <Texture Name="gMsgKanji8F91Tex" OutName="msg_kanji_8F91" Format="i4" Width="16" Height="16" Offset="0x43F00"/>
+        <Texture Name="gMsgKanji8F92Tex" OutName="msg_kanji_8F92" Format="i4" Width="16" Height="16" Offset="0x43F80"/>
+        <Texture Name="gMsgKanji8F93Tex" OutName="msg_kanji_8F93" Format="i4" Width="16" Height="16" Offset="0x44000"/>
+        <Texture Name="gMsgKanji8F94Tex" OutName="msg_kanji_8F94" Format="i4" Width="16" Height="16" Offset="0x44080"/>
+        <Texture Name="gMsgKanji8F95Tex" OutName="msg_kanji_8F95" Format="i4" Width="16" Height="16" Offset="0x44100"/>
+        <Texture Name="gMsgKanji8F96Tex" OutName="msg_kanji_8F96" Format="i4" Width="16" Height="16" Offset="0x44180"/>
+        <Texture Name="gMsgKanji8F97Tex" OutName="msg_kanji_8F97" Format="i4" Width="16" Height="16" Offset="0x44200"/>
+        <Texture Name="gMsgKanji8F98Tex" OutName="msg_kanji_8F98" Format="i4" Width="16" Height="16" Offset="0x44280"/>
+        <Texture Name="gMsgKanji8F99Tex" OutName="msg_kanji_8F99" Format="i4" Width="16" Height="16" Offset="0x44300"/>
+        <Texture Name="gMsgKanji8F9ATex" OutName="msg_kanji_8F9A" Format="i4" Width="16" Height="16" Offset="0x44380"/>
+        <Texture Name="gMsgKanji8F9BTex" OutName="msg_kanji_8F9B" Format="i4" Width="16" Height="16" Offset="0x44400"/>
+        <Texture Name="gMsgKanji8F9CTex" OutName="msg_kanji_8F9C" Format="i4" Width="16" Height="16" Offset="0x44480"/>
+        <Texture Name="gMsgKanji8F9DTex" OutName="msg_kanji_8F9D" Format="i4" Width="16" Height="16" Offset="0x44500"/>
+        <Texture Name="gMsgKanji8F9ETex" OutName="msg_kanji_8F9E" Format="i4" Width="16" Height="16" Offset="0x44580"/>
+        <Texture Name="gMsgKanji8F9FTex" OutName="msg_kanji_8F9F" Format="i4" Width="16" Height="16" Offset="0x44600"/>
+        <Texture Name="gMsgKanji8FA0Tex" OutName="msg_kanji_8FA0" Format="i4" Width="16" Height="16" Offset="0x44680"/>
+        <Texture Name="gMsgKanji8FA1Tex" OutName="msg_kanji_8FA1" Format="i4" Width="16" Height="16" Offset="0x44700"/>
+        <Texture Name="gMsgKanji8FA2Tex" OutName="msg_kanji_8FA2" Format="i4" Width="16" Height="16" Offset="0x44780"/>
+        <Texture Name="gMsgKanji8FA3Tex" OutName="msg_kanji_8FA3" Format="i4" Width="16" Height="16" Offset="0x44800"/>
+        <Texture Name="gMsgKanji8FA4Tex" OutName="msg_kanji_8FA4" Format="i4" Width="16" Height="16" Offset="0x44880"/>
+        <Texture Name="gMsgKanji8FA5Tex" OutName="msg_kanji_8FA5" Format="i4" Width="16" Height="16" Offset="0x44900"/>
+        <Texture Name="gMsgKanji8FA6Tex" OutName="msg_kanji_8FA6" Format="i4" Width="16" Height="16" Offset="0x44980"/>
+        <Texture Name="gMsgKanji8FA7Tex" OutName="msg_kanji_8FA7" Format="i4" Width="16" Height="16" Offset="0x44A00"/>
+        <Texture Name="gMsgKanji8FA8Tex" OutName="msg_kanji_8FA8" Format="i4" Width="16" Height="16" Offset="0x44A80"/>
+        <Texture Name="gMsgKanji8FA9Tex" OutName="msg_kanji_8FA9" Format="i4" Width="16" Height="16" Offset="0x44B00"/>
+        <Texture Name="gMsgKanji8FAATex" OutName="msg_kanji_8FAA" Format="i4" Width="16" Height="16" Offset="0x44B80"/>
+        <Texture Name="gMsgKanji8FABTex" OutName="msg_kanji_8FAB" Format="i4" Width="16" Height="16" Offset="0x44C00"/>
+        <Texture Name="gMsgKanji8FACTex" OutName="msg_kanji_8FAC" Format="i4" Width="16" Height="16" Offset="0x44C80"/>
+        <Texture Name="gMsgKanji8FADTex" OutName="msg_kanji_8FAD" Format="i4" Width="16" Height="16" Offset="0x44D00"/>
+        <Texture Name="gMsgKanji8FAETex" OutName="msg_kanji_8FAE" Format="i4" Width="16" Height="16" Offset="0x44D80"/>
+        <Texture Name="gMsgKanji8FAFTex" OutName="msg_kanji_8FAF" Format="i4" Width="16" Height="16" Offset="0x44E00"/>
+        <Texture Name="gMsgKanji8FB0Tex" OutName="msg_kanji_8FB0" Format="i4" Width="16" Height="16" Offset="0x44E80"/>
+        <Texture Name="gMsgKanji8FB1Tex" OutName="msg_kanji_8FB1" Format="i4" Width="16" Height="16" Offset="0x44F00"/>
+        <Texture Name="gMsgKanji8FB2Tex" OutName="msg_kanji_8FB2" Format="i4" Width="16" Height="16" Offset="0x44F80"/>
+        <Texture Name="gMsgKanji8FB3Tex" OutName="msg_kanji_8FB3" Format="i4" Width="16" Height="16" Offset="0x45000"/>
+        <Texture Name="gMsgKanji8FB4Tex" OutName="msg_kanji_8FB4" Format="i4" Width="16" Height="16" Offset="0x45080"/>
+        <Texture Name="gMsgKanji8FB5Tex" OutName="msg_kanji_8FB5" Format="i4" Width="16" Height="16" Offset="0x45100"/>
+        <Texture Name="gMsgKanji8FB6Tex" OutName="msg_kanji_8FB6" Format="i4" Width="16" Height="16" Offset="0x45180"/>
+        <Texture Name="gMsgKanji8FB7Tex" OutName="msg_kanji_8FB7" Format="i4" Width="16" Height="16" Offset="0x45200"/>
+        <Texture Name="gMsgKanji8FB8Tex" OutName="msg_kanji_8FB8" Format="i4" Width="16" Height="16" Offset="0x45280"/>
+        <Texture Name="gMsgKanji8FB9Tex" OutName="msg_kanji_8FB9" Format="i4" Width="16" Height="16" Offset="0x45300"/>
+        <Texture Name="gMsgKanji8FBATex" OutName="msg_kanji_8FBA" Format="i4" Width="16" Height="16" Offset="0x45380"/>
+        <Texture Name="gMsgKanji8FBBTex" OutName="msg_kanji_8FBB" Format="i4" Width="16" Height="16" Offset="0x45400"/>
+        <Texture Name="gMsgKanji8FBCTex" OutName="msg_kanji_8FBC" Format="i4" Width="16" Height="16" Offset="0x45480"/>
+        <Texture Name="gMsgKanji8FBDTex" OutName="msg_kanji_8FBD" Format="i4" Width="16" Height="16" Offset="0x45500"/>
+        <Texture Name="gMsgKanji8FBETex" OutName="msg_kanji_8FBE" Format="i4" Width="16" Height="16" Offset="0x45580"/>
+        <Texture Name="gMsgKanji8FBFTex" OutName="msg_kanji_8FBF" Format="i4" Width="16" Height="16" Offset="0x45600"/>
+        <Texture Name="gMsgKanji8FC0Tex" OutName="msg_kanji_8FC0" Format="i4" Width="16" Height="16" Offset="0x45680"/>
+        <Texture Name="gMsgKanji8FC1Tex" OutName="msg_kanji_8FC1" Format="i4" Width="16" Height="16" Offset="0x45700"/>
+        <Texture Name="gMsgKanji8FC2Tex" OutName="msg_kanji_8FC2" Format="i4" Width="16" Height="16" Offset="0x45780"/>
+        <Texture Name="gMsgKanji8FC3Tex" OutName="msg_kanji_8FC3" Format="i4" Width="16" Height="16" Offset="0x45800"/>
+        <Texture Name="gMsgKanji8FC4Tex" OutName="msg_kanji_8FC4" Format="i4" Width="16" Height="16" Offset="0x45880"/>
+        <Texture Name="gMsgKanji8FC5Tex" OutName="msg_kanji_8FC5" Format="i4" Width="16" Height="16" Offset="0x45900"/>
+        <Texture Name="gMsgKanji8FC6Tex" OutName="msg_kanji_8FC6" Format="i4" Width="16" Height="16" Offset="0x45980"/>
+        <Texture Name="gMsgKanji8FC7Tex" OutName="msg_kanji_8FC7" Format="i4" Width="16" Height="16" Offset="0x45A00"/>
+        <Texture Name="gMsgKanji8FC8Tex" OutName="msg_kanji_8FC8" Format="i4" Width="16" Height="16" Offset="0x45A80"/>
+        <Texture Name="gMsgKanji8FC9Tex" OutName="msg_kanji_8FC9" Format="i4" Width="16" Height="16" Offset="0x45B00"/>
+        <Texture Name="gMsgKanji8FCATex" OutName="msg_kanji_8FCA" Format="i4" Width="16" Height="16" Offset="0x45B80"/>
+        <Texture Name="gMsgKanji8FCBTex" OutName="msg_kanji_8FCB" Format="i4" Width="16" Height="16" Offset="0x45C00"/>
+        <Texture Name="gMsgKanji8FCCTex" OutName="msg_kanji_8FCC" Format="i4" Width="16" Height="16" Offset="0x45C80"/>
+        <Texture Name="gMsgKanji8FCDTex" OutName="msg_kanji_8FCD" Format="i4" Width="16" Height="16" Offset="0x45D00"/>
+        <Texture Name="gMsgKanji8FCETex" OutName="msg_kanji_8FCE" Format="i4" Width="16" Height="16" Offset="0x45D80"/>
+        <Texture Name="gMsgKanji8FCFTex" OutName="msg_kanji_8FCF" Format="i4" Width="16" Height="16" Offset="0x45E00"/>
+        <Texture Name="gMsgKanji8FD0Tex" OutName="msg_kanji_8FD0" Format="i4" Width="16" Height="16" Offset="0x45E80"/>
+        <Texture Name="gMsgKanji8FD1Tex" OutName="msg_kanji_8FD1" Format="i4" Width="16" Height="16" Offset="0x45F00"/>
+        <Texture Name="gMsgKanji8FD2Tex" OutName="msg_kanji_8FD2" Format="i4" Width="16" Height="16" Offset="0x45F80"/>
+        <Texture Name="gMsgKanji8FD3Tex" OutName="msg_kanji_8FD3" Format="i4" Width="16" Height="16" Offset="0x46000"/>
+        <Texture Name="gMsgKanji8FD4Tex" OutName="msg_kanji_8FD4" Format="i4" Width="16" Height="16" Offset="0x46080"/>
+        <Texture Name="gMsgKanji8FD5Tex" OutName="msg_kanji_8FD5" Format="i4" Width="16" Height="16" Offset="0x46100"/>
+        <Texture Name="gMsgKanji8FD6Tex" OutName="msg_kanji_8FD6" Format="i4" Width="16" Height="16" Offset="0x46180"/>
+        <Texture Name="gMsgKanji8FD7Tex" OutName="msg_kanji_8FD7" Format="i4" Width="16" Height="16" Offset="0x46200"/>
+        <Texture Name="gMsgKanji8FD8Tex" OutName="msg_kanji_8FD8" Format="i4" Width="16" Height="16" Offset="0x46280"/>
+        <Texture Name="gMsgKanji8FD9Tex" OutName="msg_kanji_8FD9" Format="i4" Width="16" Height="16" Offset="0x46300"/>
+        <Texture Name="gMsgKanji8FDATex" OutName="msg_kanji_8FDA" Format="i4" Width="16" Height="16" Offset="0x46380"/>
+        <Texture Name="gMsgKanji8FDBTex" OutName="msg_kanji_8FDB" Format="i4" Width="16" Height="16" Offset="0x46400"/>
+        <Texture Name="gMsgKanji8FDCTex" OutName="msg_kanji_8FDC" Format="i4" Width="16" Height="16" Offset="0x46480"/>
+        <Texture Name="gMsgKanji8FDDTex" OutName="msg_kanji_8FDD" Format="i4" Width="16" Height="16" Offset="0x46500"/>
+        <Texture Name="gMsgKanji8FDETex" OutName="msg_kanji_8FDE" Format="i4" Width="16" Height="16" Offset="0x46580"/>
+        <Texture Name="gMsgKanji8FDFTex" OutName="msg_kanji_8FDF" Format="i4" Width="16" Height="16" Offset="0x46600"/>
+        <Texture Name="gMsgKanji8FE0Tex" OutName="msg_kanji_8FE0" Format="i4" Width="16" Height="16" Offset="0x46680"/>
+        <Texture Name="gMsgKanji8FE1Tex" OutName="msg_kanji_8FE1" Format="i4" Width="16" Height="16" Offset="0x46700"/>
+        <Texture Name="gMsgKanji8FE2Tex" OutName="msg_kanji_8FE2" Format="i4" Width="16" Height="16" Offset="0x46780"/>
+        <Texture Name="gMsgKanji8FE3Tex" OutName="msg_kanji_8FE3" Format="i4" Width="16" Height="16" Offset="0x46800"/>
+        <Texture Name="gMsgKanji8FE4Tex" OutName="msg_kanji_8FE4" Format="i4" Width="16" Height="16" Offset="0x46880"/>
+        <Texture Name="gMsgKanji8FE5Tex" OutName="msg_kanji_8FE5" Format="i4" Width="16" Height="16" Offset="0x46900"/>
+        <Texture Name="gMsgKanji8FE6Tex" OutName="msg_kanji_8FE6" Format="i4" Width="16" Height="16" Offset="0x46980"/>
+        <Texture Name="gMsgKanji8FE7Tex" OutName="msg_kanji_8FE7" Format="i4" Width="16" Height="16" Offset="0x46A00"/>
+        <Texture Name="gMsgKanji8FE8Tex" OutName="msg_kanji_8FE8" Format="i4" Width="16" Height="16" Offset="0x46A80"/>
+        <Texture Name="gMsgKanji8FE9Tex" OutName="msg_kanji_8FE9" Format="i4" Width="16" Height="16" Offset="0x46B00"/>
+        <Texture Name="gMsgKanji8FEATex" OutName="msg_kanji_8FEA" Format="i4" Width="16" Height="16" Offset="0x46B80"/>
+        <Texture Name="gMsgKanji8FEBTex" OutName="msg_kanji_8FEB" Format="i4" Width="16" Height="16" Offset="0x46C00"/>
+        <Texture Name="gMsgKanji8FECTex" OutName="msg_kanji_8FEC" Format="i4" Width="16" Height="16" Offset="0x46C80"/>
+        <Texture Name="gMsgKanji8FEDTex" OutName="msg_kanji_8FED" Format="i4" Width="16" Height="16" Offset="0x46D00"/>
+        <Texture Name="gMsgKanji8FEETex" OutName="msg_kanji_8FEE" Format="i4" Width="16" Height="16" Offset="0x46D80"/>
+        <Texture Name="gMsgKanji8FEFTex" OutName="msg_kanji_8FEF" Format="i4" Width="16" Height="16" Offset="0x46E00"/>
+        <Texture Name="gMsgKanji8FF0Tex" OutName="msg_kanji_8FF0" Format="i4" Width="16" Height="16" Offset="0x46E80"/>
+        <Texture Name="gMsgKanji8FF1Tex" OutName="msg_kanji_8FF1" Format="i4" Width="16" Height="16" Offset="0x46F00"/>
+        <Texture Name="gMsgKanji8FF2Tex" OutName="msg_kanji_8FF2" Format="i4" Width="16" Height="16" Offset="0x46F80"/>
+        <Texture Name="gMsgKanji8FF3Tex" OutName="msg_kanji_8FF3" Format="i4" Width="16" Height="16" Offset="0x47000"/>
+        <Texture Name="gMsgKanji8FF4Tex" OutName="msg_kanji_8FF4" Format="i4" Width="16" Height="16" Offset="0x47080"/>
+        <Texture Name="gMsgKanji8FF5Tex" OutName="msg_kanji_8FF5" Format="i4" Width="16" Height="16" Offset="0x47100"/>
+        <Texture Name="gMsgKanji8FF6Tex" OutName="msg_kanji_8FF6" Format="i4" Width="16" Height="16" Offset="0x47180"/>
+        <Texture Name="gMsgKanji8FF7Tex" OutName="msg_kanji_8FF7" Format="i4" Width="16" Height="16" Offset="0x47200"/>
+        <Texture Name="gMsgKanji8FF8Tex" OutName="msg_kanji_8FF8" Format="i4" Width="16" Height="16" Offset="0x47280"/>
+        <Texture Name="gMsgKanji8FF9Tex" OutName="msg_kanji_8FF9" Format="i4" Width="16" Height="16" Offset="0x47300"/>
+        <Texture Name="gMsgKanji8FFATex" OutName="msg_kanji_8FFA" Format="i4" Width="16" Height="16" Offset="0x47380"/>
+        <Texture Name="gMsgKanji8FFBTex" OutName="msg_kanji_8FFB" Format="i4" Width="16" Height="16" Offset="0x47400"/>
+        <Texture Name="gMsgKanji8FFCTex" OutName="msg_kanji_8FFC" Format="i4" Width="16" Height="16" Offset="0x47480"/>
+        <Texture Name="gMsgKanji9040Tex" OutName="msg_kanji_9040" Format="i4" Width="16" Height="16" Offset="0x47500"/>
+        <Texture Name="gMsgKanji9041Tex" OutName="msg_kanji_9041" Format="i4" Width="16" Height="16" Offset="0x47580"/>
+        <Texture Name="gMsgKanji9042Tex" OutName="msg_kanji_9042" Format="i4" Width="16" Height="16" Offset="0x47600"/>
+        <Texture Name="gMsgKanji9043Tex" OutName="msg_kanji_9043" Format="i4" Width="16" Height="16" Offset="0x47680"/>
+        <Texture Name="gMsgKanji9044Tex" OutName="msg_kanji_9044" Format="i4" Width="16" Height="16" Offset="0x47700"/>
+        <Texture Name="gMsgKanji9045Tex" OutName="msg_kanji_9045" Format="i4" Width="16" Height="16" Offset="0x47780"/>
+        <Texture Name="gMsgKanji9046Tex" OutName="msg_kanji_9046" Format="i4" Width="16" Height="16" Offset="0x47800"/>
+        <Texture Name="gMsgKanji9047Tex" OutName="msg_kanji_9047" Format="i4" Width="16" Height="16" Offset="0x47880"/>
+        <Texture Name="gMsgKanji9048Tex" OutName="msg_kanji_9048" Format="i4" Width="16" Height="16" Offset="0x47900"/>
+        <Texture Name="gMsgKanji9049Tex" OutName="msg_kanji_9049" Format="i4" Width="16" Height="16" Offset="0x47980"/>
+        <Texture Name="gMsgKanji904ATex" OutName="msg_kanji_904A" Format="i4" Width="16" Height="16" Offset="0x47A00"/>
+        <Texture Name="gMsgKanji904BTex" OutName="msg_kanji_904B" Format="i4" Width="16" Height="16" Offset="0x47A80"/>
+        <Texture Name="gMsgKanji904CTex" OutName="msg_kanji_904C" Format="i4" Width="16" Height="16" Offset="0x47B00"/>
+        <Texture Name="gMsgKanji904DTex" OutName="msg_kanji_904D" Format="i4" Width="16" Height="16" Offset="0x47B80"/>
+        <Texture Name="gMsgKanji904ETex" OutName="msg_kanji_904E" Format="i4" Width="16" Height="16" Offset="0x47C00"/>
+        <Texture Name="gMsgKanji904FTex" OutName="msg_kanji_904F" Format="i4" Width="16" Height="16" Offset="0x47C80"/>
+        <Texture Name="gMsgKanji9050Tex" OutName="msg_kanji_9050" Format="i4" Width="16" Height="16" Offset="0x47D00"/>
+        <Texture Name="gMsgKanji9051Tex" OutName="msg_kanji_9051" Format="i4" Width="16" Height="16" Offset="0x47D80"/>
+        <Texture Name="gMsgKanji9052Tex" OutName="msg_kanji_9052" Format="i4" Width="16" Height="16" Offset="0x47E00"/>
+        <Texture Name="gMsgKanji9053Tex" OutName="msg_kanji_9053" Format="i4" Width="16" Height="16" Offset="0x47E80"/>
+        <Texture Name="gMsgKanji9054Tex" OutName="msg_kanji_9054" Format="i4" Width="16" Height="16" Offset="0x47F00"/>
+        <Texture Name="gMsgKanji9055Tex" OutName="msg_kanji_9055" Format="i4" Width="16" Height="16" Offset="0x47F80"/>
+        <Texture Name="gMsgKanji9056Tex" OutName="msg_kanji_9056" Format="i4" Width="16" Height="16" Offset="0x48000"/>
+        <Texture Name="gMsgKanji9057Tex" OutName="msg_kanji_9057" Format="i4" Width="16" Height="16" Offset="0x48080"/>
+        <Texture Name="gMsgKanji9058Tex" OutName="msg_kanji_9058" Format="i4" Width="16" Height="16" Offset="0x48100"/>
+        <Texture Name="gMsgKanji9059Tex" OutName="msg_kanji_9059" Format="i4" Width="16" Height="16" Offset="0x48180"/>
+        <Texture Name="gMsgKanji905ATex" OutName="msg_kanji_905A" Format="i4" Width="16" Height="16" Offset="0x48200"/>
+        <Texture Name="gMsgKanji905BTex" OutName="msg_kanji_905B" Format="i4" Width="16" Height="16" Offset="0x48280"/>
+        <Texture Name="gMsgKanji905CTex" OutName="msg_kanji_905C" Format="i4" Width="16" Height="16" Offset="0x48300"/>
+        <Texture Name="gMsgKanji905DTex" OutName="msg_kanji_905D" Format="i4" Width="16" Height="16" Offset="0x48380"/>
+        <Texture Name="gMsgKanji905ETex" OutName="msg_kanji_905E" Format="i4" Width="16" Height="16" Offset="0x48400"/>
+        <Texture Name="gMsgKanji905FTex" OutName="msg_kanji_905F" Format="i4" Width="16" Height="16" Offset="0x48480"/>
+        <Texture Name="gMsgKanji9060Tex" OutName="msg_kanji_9060" Format="i4" Width="16" Height="16" Offset="0x48500"/>
+        <Texture Name="gMsgKanji9061Tex" OutName="msg_kanji_9061" Format="i4" Width="16" Height="16" Offset="0x48580"/>
+        <Texture Name="gMsgKanji9062Tex" OutName="msg_kanji_9062" Format="i4" Width="16" Height="16" Offset="0x48600"/>
+        <Texture Name="gMsgKanji9063Tex" OutName="msg_kanji_9063" Format="i4" Width="16" Height="16" Offset="0x48680"/>
+        <Texture Name="gMsgKanji9064Tex" OutName="msg_kanji_9064" Format="i4" Width="16" Height="16" Offset="0x48700"/>
+        <Texture Name="gMsgKanji9065Tex" OutName="msg_kanji_9065" Format="i4" Width="16" Height="16" Offset="0x48780"/>
+        <Texture Name="gMsgKanji9066Tex" OutName="msg_kanji_9066" Format="i4" Width="16" Height="16" Offset="0x48800"/>
+        <Texture Name="gMsgKanji9067Tex" OutName="msg_kanji_9067" Format="i4" Width="16" Height="16" Offset="0x48880"/>
+        <Texture Name="gMsgKanji9068Tex" OutName="msg_kanji_9068" Format="i4" Width="16" Height="16" Offset="0x48900"/>
+        <Texture Name="gMsgKanji9069Tex" OutName="msg_kanji_9069" Format="i4" Width="16" Height="16" Offset="0x48980"/>
+        <Texture Name="gMsgKanji906ATex" OutName="msg_kanji_906A" Format="i4" Width="16" Height="16" Offset="0x48A00"/>
+        <Texture Name="gMsgKanji906BTex" OutName="msg_kanji_906B" Format="i4" Width="16" Height="16" Offset="0x48A80"/>
+        <Texture Name="gMsgKanji906CTex" OutName="msg_kanji_906C" Format="i4" Width="16" Height="16" Offset="0x48B00"/>
+        <Texture Name="gMsgKanji906DTex" OutName="msg_kanji_906D" Format="i4" Width="16" Height="16" Offset="0x48B80"/>
+        <Texture Name="gMsgKanji906ETex" OutName="msg_kanji_906E" Format="i4" Width="16" Height="16" Offset="0x48C00"/>
+        <Texture Name="gMsgKanji906FTex" OutName="msg_kanji_906F" Format="i4" Width="16" Height="16" Offset="0x48C80"/>
+        <Texture Name="gMsgKanji9070Tex" OutName="msg_kanji_9070" Format="i4" Width="16" Height="16" Offset="0x48D00"/>
+        <Texture Name="gMsgKanji9071Tex" OutName="msg_kanji_9071" Format="i4" Width="16" Height="16" Offset="0x48D80"/>
+        <Texture Name="gMsgKanji9072Tex" OutName="msg_kanji_9072" Format="i4" Width="16" Height="16" Offset="0x48E00"/>
+        <Texture Name="gMsgKanji9073Tex" OutName="msg_kanji_9073" Format="i4" Width="16" Height="16" Offset="0x48E80"/>
+        <Texture Name="gMsgKanji9074Tex" OutName="msg_kanji_9074" Format="i4" Width="16" Height="16" Offset="0x48F00"/>
+        <Texture Name="gMsgKanji9075Tex" OutName="msg_kanji_9075" Format="i4" Width="16" Height="16" Offset="0x48F80"/>
+        <Texture Name="gMsgKanji9076Tex" OutName="msg_kanji_9076" Format="i4" Width="16" Height="16" Offset="0x49000"/>
+        <Texture Name="gMsgKanji9077Tex" OutName="msg_kanji_9077" Format="i4" Width="16" Height="16" Offset="0x49080"/>
+        <Texture Name="gMsgKanji9078Tex" OutName="msg_kanji_9078" Format="i4" Width="16" Height="16" Offset="0x49100"/>
+        <Texture Name="gMsgKanji9079Tex" OutName="msg_kanji_9079" Format="i4" Width="16" Height="16" Offset="0x49180"/>
+        <Texture Name="gMsgKanji907ATex" OutName="msg_kanji_907A" Format="i4" Width="16" Height="16" Offset="0x49200"/>
+        <Texture Name="gMsgKanji907BTex" OutName="msg_kanji_907B" Format="i4" Width="16" Height="16" Offset="0x49280"/>
+        <Texture Name="gMsgKanji907CTex" OutName="msg_kanji_907C" Format="i4" Width="16" Height="16" Offset="0x49300"/>
+        <Texture Name="gMsgKanji907DTex" OutName="msg_kanji_907D" Format="i4" Width="16" Height="16" Offset="0x49380"/>
+        <Texture Name="gMsgKanji907ETex" OutName="msg_kanji_907E" Format="i4" Width="16" Height="16" Offset="0x49400"/>
+        <Texture Name="gMsgKanji9080Tex" OutName="msg_kanji_9080" Format="i4" Width="16" Height="16" Offset="0x49480"/>
+        <Texture Name="gMsgKanji9081Tex" OutName="msg_kanji_9081" Format="i4" Width="16" Height="16" Offset="0x49500"/>
+        <Texture Name="gMsgKanji9082Tex" OutName="msg_kanji_9082" Format="i4" Width="16" Height="16" Offset="0x49580"/>
+        <Texture Name="gMsgKanji9083Tex" OutName="msg_kanji_9083" Format="i4" Width="16" Height="16" Offset="0x49600"/>
+        <Texture Name="gMsgKanji9084Tex" OutName="msg_kanji_9084" Format="i4" Width="16" Height="16" Offset="0x49680"/>
+        <Texture Name="gMsgKanji9085Tex" OutName="msg_kanji_9085" Format="i4" Width="16" Height="16" Offset="0x49700"/>
+        <Texture Name="gMsgKanji9086Tex" OutName="msg_kanji_9086" Format="i4" Width="16" Height="16" Offset="0x49780"/>
+        <Texture Name="gMsgKanji9087Tex" OutName="msg_kanji_9087" Format="i4" Width="16" Height="16" Offset="0x49800"/>
+        <Texture Name="gMsgKanji9088Tex" OutName="msg_kanji_9088" Format="i4" Width="16" Height="16" Offset="0x49880"/>
+        <Texture Name="gMsgKanji9089Tex" OutName="msg_kanji_9089" Format="i4" Width="16" Height="16" Offset="0x49900"/>
+        <Texture Name="gMsgKanji908ATex" OutName="msg_kanji_908A" Format="i4" Width="16" Height="16" Offset="0x49980"/>
+        <Texture Name="gMsgKanji908BTex" OutName="msg_kanji_908B" Format="i4" Width="16" Height="16" Offset="0x49A00"/>
+        <Texture Name="gMsgKanji908CTex" OutName="msg_kanji_908C" Format="i4" Width="16" Height="16" Offset="0x49A80"/>
+        <Texture Name="gMsgKanji908DTex" OutName="msg_kanji_908D" Format="i4" Width="16" Height="16" Offset="0x49B00"/>
+        <Texture Name="gMsgKanji908ETex" OutName="msg_kanji_908E" Format="i4" Width="16" Height="16" Offset="0x49B80"/>
+        <Texture Name="gMsgKanji908FTex" OutName="msg_kanji_908F" Format="i4" Width="16" Height="16" Offset="0x49C00"/>
+        <Texture Name="gMsgKanji9090Tex" OutName="msg_kanji_9090" Format="i4" Width="16" Height="16" Offset="0x49C80"/>
+        <Texture Name="gMsgKanji9091Tex" OutName="msg_kanji_9091" Format="i4" Width="16" Height="16" Offset="0x49D00"/>
+        <Texture Name="gMsgKanji9092Tex" OutName="msg_kanji_9092" Format="i4" Width="16" Height="16" Offset="0x49D80"/>
+        <Texture Name="gMsgKanji9093Tex" OutName="msg_kanji_9093" Format="i4" Width="16" Height="16" Offset="0x49E00"/>
+        <Texture Name="gMsgKanji9094Tex" OutName="msg_kanji_9094" Format="i4" Width="16" Height="16" Offset="0x49E80"/>
+        <Texture Name="gMsgKanji9095Tex" OutName="msg_kanji_9095" Format="i4" Width="16" Height="16" Offset="0x49F00"/>
+        <Texture Name="gMsgKanji9096Tex" OutName="msg_kanji_9096" Format="i4" Width="16" Height="16" Offset="0x49F80"/>
+        <Texture Name="gMsgKanji9097Tex" OutName="msg_kanji_9097" Format="i4" Width="16" Height="16" Offset="0x4A000"/>
+        <Texture Name="gMsgKanji9098Tex" OutName="msg_kanji_9098" Format="i4" Width="16" Height="16" Offset="0x4A080"/>
+        <Texture Name="gMsgKanji9099Tex" OutName="msg_kanji_9099" Format="i4" Width="16" Height="16" Offset="0x4A100"/>
+        <Texture Name="gMsgKanji909ATex" OutName="msg_kanji_909A" Format="i4" Width="16" Height="16" Offset="0x4A180"/>
+        <Texture Name="gMsgKanji909BTex" OutName="msg_kanji_909B" Format="i4" Width="16" Height="16" Offset="0x4A200"/>
+        <Texture Name="gMsgKanji909CTex" OutName="msg_kanji_909C" Format="i4" Width="16" Height="16" Offset="0x4A280"/>
+        <Texture Name="gMsgKanji909DTex" OutName="msg_kanji_909D" Format="i4" Width="16" Height="16" Offset="0x4A300"/>
+        <Texture Name="gMsgKanji909ETex" OutName="msg_kanji_909E" Format="i4" Width="16" Height="16" Offset="0x4A380"/>
+        <Texture Name="gMsgKanji909FTex" OutName="msg_kanji_909F" Format="i4" Width="16" Height="16" Offset="0x4A400"/>
+        <Texture Name="gMsgKanji90A0Tex" OutName="msg_kanji_90A0" Format="i4" Width="16" Height="16" Offset="0x4A480"/>
+        <Texture Name="gMsgKanji90A1Tex" OutName="msg_kanji_90A1" Format="i4" Width="16" Height="16" Offset="0x4A500"/>
+        <Texture Name="gMsgKanji90A2Tex" OutName="msg_kanji_90A2" Format="i4" Width="16" Height="16" Offset="0x4A580"/>
+        <Texture Name="gMsgKanji90A3Tex" OutName="msg_kanji_90A3" Format="i4" Width="16" Height="16" Offset="0x4A600"/>
+        <Texture Name="gMsgKanji90A4Tex" OutName="msg_kanji_90A4" Format="i4" Width="16" Height="16" Offset="0x4A680"/>
+        <Texture Name="gMsgKanji90A5Tex" OutName="msg_kanji_90A5" Format="i4" Width="16" Height="16" Offset="0x4A700"/>
+        <Texture Name="gMsgKanji90A6Tex" OutName="msg_kanji_90A6" Format="i4" Width="16" Height="16" Offset="0x4A780"/>
+        <Texture Name="gMsgKanji90A7Tex" OutName="msg_kanji_90A7" Format="i4" Width="16" Height="16" Offset="0x4A800"/>
+        <Texture Name="gMsgKanji90A8Tex" OutName="msg_kanji_90A8" Format="i4" Width="16" Height="16" Offset="0x4A880"/>
+        <Texture Name="gMsgKanji90A9Tex" OutName="msg_kanji_90A9" Format="i4" Width="16" Height="16" Offset="0x4A900"/>
+        <Texture Name="gMsgKanji90AATex" OutName="msg_kanji_90AA" Format="i4" Width="16" Height="16" Offset="0x4A980"/>
+        <Texture Name="gMsgKanji90ABTex" OutName="msg_kanji_90AB" Format="i4" Width="16" Height="16" Offset="0x4AA00"/>
+        <Texture Name="gMsgKanji90ACTex" OutName="msg_kanji_90AC" Format="i4" Width="16" Height="16" Offset="0x4AA80"/>
+        <Texture Name="gMsgKanji90ADTex" OutName="msg_kanji_90AD" Format="i4" Width="16" Height="16" Offset="0x4AB00"/>
+        <Texture Name="gMsgKanji90AETex" OutName="msg_kanji_90AE" Format="i4" Width="16" Height="16" Offset="0x4AB80"/>
+        <Texture Name="gMsgKanji90AFTex" OutName="msg_kanji_90AF" Format="i4" Width="16" Height="16" Offset="0x4AC00"/>
+        <Texture Name="gMsgKanji90B0Tex" OutName="msg_kanji_90B0" Format="i4" Width="16" Height="16" Offset="0x4AC80"/>
+        <Texture Name="gMsgKanji90B1Tex" OutName="msg_kanji_90B1" Format="i4" Width="16" Height="16" Offset="0x4AD00"/>
+        <Texture Name="gMsgKanji90B2Tex" OutName="msg_kanji_90B2" Format="i4" Width="16" Height="16" Offset="0x4AD80"/>
+        <Texture Name="gMsgKanji90B3Tex" OutName="msg_kanji_90B3" Format="i4" Width="16" Height="16" Offset="0x4AE00"/>
+        <Texture Name="gMsgKanji90B4Tex" OutName="msg_kanji_90B4" Format="i4" Width="16" Height="16" Offset="0x4AE80"/>
+        <Texture Name="gMsgKanji90B5Tex" OutName="msg_kanji_90B5" Format="i4" Width="16" Height="16" Offset="0x4AF00"/>
+        <Texture Name="gMsgKanji90B6Tex" OutName="msg_kanji_90B6" Format="i4" Width="16" Height="16" Offset="0x4AF80"/>
+        <Texture Name="gMsgKanji90B7Tex" OutName="msg_kanji_90B7" Format="i4" Width="16" Height="16" Offset="0x4B000"/>
+        <Texture Name="gMsgKanji90B8Tex" OutName="msg_kanji_90B8" Format="i4" Width="16" Height="16" Offset="0x4B080"/>
+        <Texture Name="gMsgKanji90B9Tex" OutName="msg_kanji_90B9" Format="i4" Width="16" Height="16" Offset="0x4B100"/>
+        <Texture Name="gMsgKanji90BATex" OutName="msg_kanji_90BA" Format="i4" Width="16" Height="16" Offset="0x4B180"/>
+        <Texture Name="gMsgKanji90BBTex" OutName="msg_kanji_90BB" Format="i4" Width="16" Height="16" Offset="0x4B200"/>
+        <Texture Name="gMsgKanji90BCTex" OutName="msg_kanji_90BC" Format="i4" Width="16" Height="16" Offset="0x4B280"/>
+        <Texture Name="gMsgKanji90BDTex" OutName="msg_kanji_90BD" Format="i4" Width="16" Height="16" Offset="0x4B300"/>
+        <Texture Name="gMsgKanji90BETex" OutName="msg_kanji_90BE" Format="i4" Width="16" Height="16" Offset="0x4B380"/>
+        <Texture Name="gMsgKanji90BFTex" OutName="msg_kanji_90BF" Format="i4" Width="16" Height="16" Offset="0x4B400"/>
+        <Texture Name="gMsgKanji90C0Tex" OutName="msg_kanji_90C0" Format="i4" Width="16" Height="16" Offset="0x4B480"/>
+        <Texture Name="gMsgKanji90C1Tex" OutName="msg_kanji_90C1" Format="i4" Width="16" Height="16" Offset="0x4B500"/>
+        <Texture Name="gMsgKanji90C2Tex" OutName="msg_kanji_90C2" Format="i4" Width="16" Height="16" Offset="0x4B580"/>
+        <Texture Name="gMsgKanji90C3Tex" OutName="msg_kanji_90C3" Format="i4" Width="16" Height="16" Offset="0x4B600"/>
+        <Texture Name="gMsgKanji90C4Tex" OutName="msg_kanji_90C4" Format="i4" Width="16" Height="16" Offset="0x4B680"/>
+        <Texture Name="gMsgKanji90C5Tex" OutName="msg_kanji_90C5" Format="i4" Width="16" Height="16" Offset="0x4B700"/>
+        <Texture Name="gMsgKanji90C6Tex" OutName="msg_kanji_90C6" Format="i4" Width="16" Height="16" Offset="0x4B780"/>
+        <Texture Name="gMsgKanji90C7Tex" OutName="msg_kanji_90C7" Format="i4" Width="16" Height="16" Offset="0x4B800"/>
+        <Texture Name="gMsgKanji90C8Tex" OutName="msg_kanji_90C8" Format="i4" Width="16" Height="16" Offset="0x4B880"/>
+        <Texture Name="gMsgKanji90C9Tex" OutName="msg_kanji_90C9" Format="i4" Width="16" Height="16" Offset="0x4B900"/>
+        <Texture Name="gMsgKanji90CATex" OutName="msg_kanji_90CA" Format="i4" Width="16" Height="16" Offset="0x4B980"/>
+        <Texture Name="gMsgKanji90CBTex" OutName="msg_kanji_90CB" Format="i4" Width="16" Height="16" Offset="0x4BA00"/>
+        <Texture Name="gMsgKanji90CCTex" OutName="msg_kanji_90CC" Format="i4" Width="16" Height="16" Offset="0x4BA80"/>
+        <Texture Name="gMsgKanji90CDTex" OutName="msg_kanji_90CD" Format="i4" Width="16" Height="16" Offset="0x4BB00"/>
+        <Texture Name="gMsgKanji90CETex" OutName="msg_kanji_90CE" Format="i4" Width="16" Height="16" Offset="0x4BB80"/>
+        <Texture Name="gMsgKanji90CFTex" OutName="msg_kanji_90CF" Format="i4" Width="16" Height="16" Offset="0x4BC00"/>
+        <Texture Name="gMsgKanji90D0Tex" OutName="msg_kanji_90D0" Format="i4" Width="16" Height="16" Offset="0x4BC80"/>
+        <Texture Name="gMsgKanji90D1Tex" OutName="msg_kanji_90D1" Format="i4" Width="16" Height="16" Offset="0x4BD00"/>
+        <Texture Name="gMsgKanji90D2Tex" OutName="msg_kanji_90D2" Format="i4" Width="16" Height="16" Offset="0x4BD80"/>
+        <Texture Name="gMsgKanji90D3Tex" OutName="msg_kanji_90D3" Format="i4" Width="16" Height="16" Offset="0x4BE00"/>
+        <Texture Name="gMsgKanji90D4Tex" OutName="msg_kanji_90D4" Format="i4" Width="16" Height="16" Offset="0x4BE80"/>
+        <Texture Name="gMsgKanji90D5Tex" OutName="msg_kanji_90D5" Format="i4" Width="16" Height="16" Offset="0x4BF00"/>
+        <Texture Name="gMsgKanji90D6Tex" OutName="msg_kanji_90D6" Format="i4" Width="16" Height="16" Offset="0x4BF80"/>
+        <Texture Name="gMsgKanji90D7Tex" OutName="msg_kanji_90D7" Format="i4" Width="16" Height="16" Offset="0x4C000"/>
+        <Texture Name="gMsgKanji90D8Tex" OutName="msg_kanji_90D8" Format="i4" Width="16" Height="16" Offset="0x4C080"/>
+        <Texture Name="gMsgKanji90D9Tex" OutName="msg_kanji_90D9" Format="i4" Width="16" Height="16" Offset="0x4C100"/>
+        <Texture Name="gMsgKanji90DATex" OutName="msg_kanji_90DA" Format="i4" Width="16" Height="16" Offset="0x4C180"/>
+        <Texture Name="gMsgKanji90DBTex" OutName="msg_kanji_90DB" Format="i4" Width="16" Height="16" Offset="0x4C200"/>
+        <Texture Name="gMsgKanji90DCTex" OutName="msg_kanji_90DC" Format="i4" Width="16" Height="16" Offset="0x4C280"/>
+        <Texture Name="gMsgKanji90DDTex" OutName="msg_kanji_90DD" Format="i4" Width="16" Height="16" Offset="0x4C300"/>
+        <Texture Name="gMsgKanji90DETex" OutName="msg_kanji_90DE" Format="i4" Width="16" Height="16" Offset="0x4C380"/>
+        <Texture Name="gMsgKanji90DFTex" OutName="msg_kanji_90DF" Format="i4" Width="16" Height="16" Offset="0x4C400"/>
+        <Texture Name="gMsgKanji90E0Tex" OutName="msg_kanji_90E0" Format="i4" Width="16" Height="16" Offset="0x4C480"/>
+        <Texture Name="gMsgKanji90E1Tex" OutName="msg_kanji_90E1" Format="i4" Width="16" Height="16" Offset="0x4C500"/>
+        <Texture Name="gMsgKanji90E2Tex" OutName="msg_kanji_90E2" Format="i4" Width="16" Height="16" Offset="0x4C580"/>
+        <Texture Name="gMsgKanji90E3Tex" OutName="msg_kanji_90E3" Format="i4" Width="16" Height="16" Offset="0x4C600"/>
+        <Texture Name="gMsgKanji90E4Tex" OutName="msg_kanji_90E4" Format="i4" Width="16" Height="16" Offset="0x4C680"/>
+        <Texture Name="gMsgKanji90E5Tex" OutName="msg_kanji_90E5" Format="i4" Width="16" Height="16" Offset="0x4C700"/>
+        <Texture Name="gMsgKanji90E6Tex" OutName="msg_kanji_90E6" Format="i4" Width="16" Height="16" Offset="0x4C780"/>
+        <Texture Name="gMsgKanji90E7Tex" OutName="msg_kanji_90E7" Format="i4" Width="16" Height="16" Offset="0x4C800"/>
+        <Texture Name="gMsgKanji90E8Tex" OutName="msg_kanji_90E8" Format="i4" Width="16" Height="16" Offset="0x4C880"/>
+        <Texture Name="gMsgKanji90E9Tex" OutName="msg_kanji_90E9" Format="i4" Width="16" Height="16" Offset="0x4C900"/>
+        <Texture Name="gMsgKanji90EATex" OutName="msg_kanji_90EA" Format="i4" Width="16" Height="16" Offset="0x4C980"/>
+        <Texture Name="gMsgKanji90EBTex" OutName="msg_kanji_90EB" Format="i4" Width="16" Height="16" Offset="0x4CA00"/>
+        <Texture Name="gMsgKanji90ECTex" OutName="msg_kanji_90EC" Format="i4" Width="16" Height="16" Offset="0x4CA80"/>
+        <Texture Name="gMsgKanji90EDTex" OutName="msg_kanji_90ED" Format="i4" Width="16" Height="16" Offset="0x4CB00"/>
+        <Texture Name="gMsgKanji90EETex" OutName="msg_kanji_90EE" Format="i4" Width="16" Height="16" Offset="0x4CB80"/>
+        <Texture Name="gMsgKanji90EFTex" OutName="msg_kanji_90EF" Format="i4" Width="16" Height="16" Offset="0x4CC00"/>
+        <Texture Name="gMsgKanji90F0Tex" OutName="msg_kanji_90F0" Format="i4" Width="16" Height="16" Offset="0x4CC80"/>
+        <Texture Name="gMsgKanji90F1Tex" OutName="msg_kanji_90F1" Format="i4" Width="16" Height="16" Offset="0x4CD00"/>
+        <Texture Name="gMsgKanji90F2Tex" OutName="msg_kanji_90F2" Format="i4" Width="16" Height="16" Offset="0x4CD80"/>
+        <Texture Name="gMsgKanji90F3Tex" OutName="msg_kanji_90F3" Format="i4" Width="16" Height="16" Offset="0x4CE00"/>
+        <Texture Name="gMsgKanji90F4Tex" OutName="msg_kanji_90F4" Format="i4" Width="16" Height="16" Offset="0x4CE80"/>
+        <Texture Name="gMsgKanji90F5Tex" OutName="msg_kanji_90F5" Format="i4" Width="16" Height="16" Offset="0x4CF00"/>
+        <Texture Name="gMsgKanji90F6Tex" OutName="msg_kanji_90F6" Format="i4" Width="16" Height="16" Offset="0x4CF80"/>
+        <Texture Name="gMsgKanji90F7Tex" OutName="msg_kanji_90F7" Format="i4" Width="16" Height="16" Offset="0x4D000"/>
+        <Texture Name="gMsgKanji90F8Tex" OutName="msg_kanji_90F8" Format="i4" Width="16" Height="16" Offset="0x4D080"/>
+        <Texture Name="gMsgKanji90F9Tex" OutName="msg_kanji_90F9" Format="i4" Width="16" Height="16" Offset="0x4D100"/>
+        <Texture Name="gMsgKanji90FATex" OutName="msg_kanji_90FA" Format="i4" Width="16" Height="16" Offset="0x4D180"/>
+        <Texture Name="gMsgKanji90FBTex" OutName="msg_kanji_90FB" Format="i4" Width="16" Height="16" Offset="0x4D200"/>
+        <Texture Name="gMsgKanji90FCTex" OutName="msg_kanji_90FC" Format="i4" Width="16" Height="16" Offset="0x4D280"/>
+        <Texture Name="gMsgKanji9140Tex" OutName="msg_kanji_9140" Format="i4" Width="16" Height="16" Offset="0x4D300"/>
+        <Texture Name="gMsgKanji9141Tex" OutName="msg_kanji_9141" Format="i4" Width="16" Height="16" Offset="0x4D380"/>
+        <Texture Name="gMsgKanji9142Tex" OutName="msg_kanji_9142" Format="i4" Width="16" Height="16" Offset="0x4D400"/>
+        <Texture Name="gMsgKanji9143Tex" OutName="msg_kanji_9143" Format="i4" Width="16" Height="16" Offset="0x4D480"/>
+        <Texture Name="gMsgKanji9144Tex" OutName="msg_kanji_9144" Format="i4" Width="16" Height="16" Offset="0x4D500"/>
+        <Texture Name="gMsgKanji9145Tex" OutName="msg_kanji_9145" Format="i4" Width="16" Height="16" Offset="0x4D580"/>
+        <Texture Name="gMsgKanji9146Tex" OutName="msg_kanji_9146" Format="i4" Width="16" Height="16" Offset="0x4D600"/>
+        <Texture Name="gMsgKanji9147Tex" OutName="msg_kanji_9147" Format="i4" Width="16" Height="16" Offset="0x4D680"/>
+        <Texture Name="gMsgKanji9148Tex" OutName="msg_kanji_9148" Format="i4" Width="16" Height="16" Offset="0x4D700"/>
+        <Texture Name="gMsgKanji9149Tex" OutName="msg_kanji_9149" Format="i4" Width="16" Height="16" Offset="0x4D780"/>
+        <Texture Name="gMsgKanji914ATex" OutName="msg_kanji_914A" Format="i4" Width="16" Height="16" Offset="0x4D800"/>
+        <Texture Name="gMsgKanji914BTex" OutName="msg_kanji_914B" Format="i4" Width="16" Height="16" Offset="0x4D880"/>
+        <Texture Name="gMsgKanji914CTex" OutName="msg_kanji_914C" Format="i4" Width="16" Height="16" Offset="0x4D900"/>
+        <Texture Name="gMsgKanji914DTex" OutName="msg_kanji_914D" Format="i4" Width="16" Height="16" Offset="0x4D980"/>
+        <Texture Name="gMsgKanji914ETex" OutName="msg_kanji_914E" Format="i4" Width="16" Height="16" Offset="0x4DA00"/>
+        <Texture Name="gMsgKanji914FTex" OutName="msg_kanji_914F" Format="i4" Width="16" Height="16" Offset="0x4DA80"/>
+        <Texture Name="gMsgKanji9150Tex" OutName="msg_kanji_9150" Format="i4" Width="16" Height="16" Offset="0x4DB00"/>
+        <Texture Name="gMsgKanji9151Tex" OutName="msg_kanji_9151" Format="i4" Width="16" Height="16" Offset="0x4DB80"/>
+        <Texture Name="gMsgKanji9152Tex" OutName="msg_kanji_9152" Format="i4" Width="16" Height="16" Offset="0x4DC00"/>
+        <Texture Name="gMsgKanji9153Tex" OutName="msg_kanji_9153" Format="i4" Width="16" Height="16" Offset="0x4DC80"/>
+        <Texture Name="gMsgKanji9154Tex" OutName="msg_kanji_9154" Format="i4" Width="16" Height="16" Offset="0x4DD00"/>
+        <Texture Name="gMsgKanji9155Tex" OutName="msg_kanji_9155" Format="i4" Width="16" Height="16" Offset="0x4DD80"/>
+        <Texture Name="gMsgKanji9156Tex" OutName="msg_kanji_9156" Format="i4" Width="16" Height="16" Offset="0x4DE00"/>
+        <Texture Name="gMsgKanji9157Tex" OutName="msg_kanji_9157" Format="i4" Width="16" Height="16" Offset="0x4DE80"/>
+        <Texture Name="gMsgKanji9158Tex" OutName="msg_kanji_9158" Format="i4" Width="16" Height="16" Offset="0x4DF00"/>
+        <Texture Name="gMsgKanji9159Tex" OutName="msg_kanji_9159" Format="i4" Width="16" Height="16" Offset="0x4DF80"/>
+        <Texture Name="gMsgKanji915ATex" OutName="msg_kanji_915A" Format="i4" Width="16" Height="16" Offset="0x4E000"/>
+        <Texture Name="gMsgKanji915BTex" OutName="msg_kanji_915B" Format="i4" Width="16" Height="16" Offset="0x4E080"/>
+        <Texture Name="gMsgKanji915CTex" OutName="msg_kanji_915C" Format="i4" Width="16" Height="16" Offset="0x4E100"/>
+        <Texture Name="gMsgKanji915DTex" OutName="msg_kanji_915D" Format="i4" Width="16" Height="16" Offset="0x4E180"/>
+        <Texture Name="gMsgKanji915ETex" OutName="msg_kanji_915E" Format="i4" Width="16" Height="16" Offset="0x4E200"/>
+        <Texture Name="gMsgKanji915FTex" OutName="msg_kanji_915F" Format="i4" Width="16" Height="16" Offset="0x4E280"/>
+        <Texture Name="gMsgKanji9160Tex" OutName="msg_kanji_9160" Format="i4" Width="16" Height="16" Offset="0x4E300"/>
+        <Texture Name="gMsgKanji9161Tex" OutName="msg_kanji_9161" Format="i4" Width="16" Height="16" Offset="0x4E380"/>
+        <Texture Name="gMsgKanji9162Tex" OutName="msg_kanji_9162" Format="i4" Width="16" Height="16" Offset="0x4E400"/>
+        <Texture Name="gMsgKanji9163Tex" OutName="msg_kanji_9163" Format="i4" Width="16" Height="16" Offset="0x4E480"/>
+        <Texture Name="gMsgKanji9164Tex" OutName="msg_kanji_9164" Format="i4" Width="16" Height="16" Offset="0x4E500"/>
+        <Texture Name="gMsgKanji9165Tex" OutName="msg_kanji_9165" Format="i4" Width="16" Height="16" Offset="0x4E580"/>
+        <Texture Name="gMsgKanji9166Tex" OutName="msg_kanji_9166" Format="i4" Width="16" Height="16" Offset="0x4E600"/>
+        <Texture Name="gMsgKanji9167Tex" OutName="msg_kanji_9167" Format="i4" Width="16" Height="16" Offset="0x4E680"/>
+        <Texture Name="gMsgKanji9168Tex" OutName="msg_kanji_9168" Format="i4" Width="16" Height="16" Offset="0x4E700"/>
+        <Texture Name="gMsgKanji9169Tex" OutName="msg_kanji_9169" Format="i4" Width="16" Height="16" Offset="0x4E780"/>
+        <Texture Name="gMsgKanji916ATex" OutName="msg_kanji_916A" Format="i4" Width="16" Height="16" Offset="0x4E800"/>
+        <Texture Name="gMsgKanji916BTex" OutName="msg_kanji_916B" Format="i4" Width="16" Height="16" Offset="0x4E880"/>
+        <Texture Name="gMsgKanji916CTex" OutName="msg_kanji_916C" Format="i4" Width="16" Height="16" Offset="0x4E900"/>
+        <Texture Name="gMsgKanji916DTex" OutName="msg_kanji_916D" Format="i4" Width="16" Height="16" Offset="0x4E980"/>
+        <Texture Name="gMsgKanji916ETex" OutName="msg_kanji_916E" Format="i4" Width="16" Height="16" Offset="0x4EA00"/>
+        <Texture Name="gMsgKanji916FTex" OutName="msg_kanji_916F" Format="i4" Width="16" Height="16" Offset="0x4EA80"/>
+        <Texture Name="gMsgKanji9170Tex" OutName="msg_kanji_9170" Format="i4" Width="16" Height="16" Offset="0x4EB00"/>
+        <Texture Name="gMsgKanji9171Tex" OutName="msg_kanji_9171" Format="i4" Width="16" Height="16" Offset="0x4EB80"/>
+        <Texture Name="gMsgKanji9172Tex" OutName="msg_kanji_9172" Format="i4" Width="16" Height="16" Offset="0x4EC00"/>
+        <Texture Name="gMsgKanji9173Tex" OutName="msg_kanji_9173" Format="i4" Width="16" Height="16" Offset="0x4EC80"/>
+        <Texture Name="gMsgKanji9174Tex" OutName="msg_kanji_9174" Format="i4" Width="16" Height="16" Offset="0x4ED00"/>
+        <Texture Name="gMsgKanji9175Tex" OutName="msg_kanji_9175" Format="i4" Width="16" Height="16" Offset="0x4ED80"/>
+        <Texture Name="gMsgKanji9176Tex" OutName="msg_kanji_9176" Format="i4" Width="16" Height="16" Offset="0x4EE00"/>
+        <Texture Name="gMsgKanji9177Tex" OutName="msg_kanji_9177" Format="i4" Width="16" Height="16" Offset="0x4EE80"/>
+        <Texture Name="gMsgKanji9178Tex" OutName="msg_kanji_9178" Format="i4" Width="16" Height="16" Offset="0x4EF00"/>
+        <Texture Name="gMsgKanji9179Tex" OutName="msg_kanji_9179" Format="i4" Width="16" Height="16" Offset="0x4EF80"/>
+        <Texture Name="gMsgKanji917ATex" OutName="msg_kanji_917A" Format="i4" Width="16" Height="16" Offset="0x4F000"/>
+        <Texture Name="gMsgKanji917BTex" OutName="msg_kanji_917B" Format="i4" Width="16" Height="16" Offset="0x4F080"/>
+        <Texture Name="gMsgKanji917CTex" OutName="msg_kanji_917C" Format="i4" Width="16" Height="16" Offset="0x4F100"/>
+        <Texture Name="gMsgKanji917DTex" OutName="msg_kanji_917D" Format="i4" Width="16" Height="16" Offset="0x4F180"/>
+        <Texture Name="gMsgKanji917ETex" OutName="msg_kanji_917E" Format="i4" Width="16" Height="16" Offset="0x4F200"/>
+        <Texture Name="gMsgKanji9180Tex" OutName="msg_kanji_9180" Format="i4" Width="16" Height="16" Offset="0x4F280"/>
+        <Texture Name="gMsgKanji9181Tex" OutName="msg_kanji_9181" Format="i4" Width="16" Height="16" Offset="0x4F300"/>
+        <Texture Name="gMsgKanji9182Tex" OutName="msg_kanji_9182" Format="i4" Width="16" Height="16" Offset="0x4F380"/>
+        <Texture Name="gMsgKanji9183Tex" OutName="msg_kanji_9183" Format="i4" Width="16" Height="16" Offset="0x4F400"/>
+        <Texture Name="gMsgKanji9184Tex" OutName="msg_kanji_9184" Format="i4" Width="16" Height="16" Offset="0x4F480"/>
+        <Texture Name="gMsgKanji9185Tex" OutName="msg_kanji_9185" Format="i4" Width="16" Height="16" Offset="0x4F500"/>
+        <Texture Name="gMsgKanji9186Tex" OutName="msg_kanji_9186" Format="i4" Width="16" Height="16" Offset="0x4F580"/>
+        <Texture Name="gMsgKanji9187Tex" OutName="msg_kanji_9187" Format="i4" Width="16" Height="16" Offset="0x4F600"/>
+        <Texture Name="gMsgKanji9188Tex" OutName="msg_kanji_9188" Format="i4" Width="16" Height="16" Offset="0x4F680"/>
+        <Texture Name="gMsgKanji9189Tex" OutName="msg_kanji_9189" Format="i4" Width="16" Height="16" Offset="0x4F700"/>
+        <Texture Name="gMsgKanji918ATex" OutName="msg_kanji_918A" Format="i4" Width="16" Height="16" Offset="0x4F780"/>
+        <Texture Name="gMsgKanji918BTex" OutName="msg_kanji_918B" Format="i4" Width="16" Height="16" Offset="0x4F800"/>
+        <Texture Name="gMsgKanji918CTex" OutName="msg_kanji_918C" Format="i4" Width="16" Height="16" Offset="0x4F880"/>
+        <Texture Name="gMsgKanji918DTex" OutName="msg_kanji_918D" Format="i4" Width="16" Height="16" Offset="0x4F900"/>
+        <Texture Name="gMsgKanji918ETex" OutName="msg_kanji_918E" Format="i4" Width="16" Height="16" Offset="0x4F980"/>
+        <Texture Name="gMsgKanji918FTex" OutName="msg_kanji_918F" Format="i4" Width="16" Height="16" Offset="0x4FA00"/>
+        <Texture Name="gMsgKanji9190Tex" OutName="msg_kanji_9190" Format="i4" Width="16" Height="16" Offset="0x4FA80"/>
+        <Texture Name="gMsgKanji9191Tex" OutName="msg_kanji_9191" Format="i4" Width="16" Height="16" Offset="0x4FB00"/>
+        <Texture Name="gMsgKanji9192Tex" OutName="msg_kanji_9192" Format="i4" Width="16" Height="16" Offset="0x4FB80"/>
+        <Texture Name="gMsgKanji9193Tex" OutName="msg_kanji_9193" Format="i4" Width="16" Height="16" Offset="0x4FC00"/>
+        <Texture Name="gMsgKanji9194Tex" OutName="msg_kanji_9194" Format="i4" Width="16" Height="16" Offset="0x4FC80"/>
+        <Texture Name="gMsgKanji9195Tex" OutName="msg_kanji_9195" Format="i4" Width="16" Height="16" Offset="0x4FD00"/>
+        <Texture Name="gMsgKanji9196Tex" OutName="msg_kanji_9196" Format="i4" Width="16" Height="16" Offset="0x4FD80"/>
+        <Texture Name="gMsgKanji9197Tex" OutName="msg_kanji_9197" Format="i4" Width="16" Height="16" Offset="0x4FE00"/>
+        <Texture Name="gMsgKanji9198Tex" OutName="msg_kanji_9198" Format="i4" Width="16" Height="16" Offset="0x4FE80"/>
+        <Texture Name="gMsgKanji9199Tex" OutName="msg_kanji_9199" Format="i4" Width="16" Height="16" Offset="0x4FF00"/>
+        <Texture Name="gMsgKanji919ATex" OutName="msg_kanji_919A" Format="i4" Width="16" Height="16" Offset="0x4FF80"/>
+        <Texture Name="gMsgKanji919BTex" OutName="msg_kanji_919B" Format="i4" Width="16" Height="16" Offset="0x50000"/>
+        <Texture Name="gMsgKanji919CTex" OutName="msg_kanji_919C" Format="i4" Width="16" Height="16" Offset="0x50080"/>
+        <Texture Name="gMsgKanji919DTex" OutName="msg_kanji_919D" Format="i4" Width="16" Height="16" Offset="0x50100"/>
+        <Texture Name="gMsgKanji919ETex" OutName="msg_kanji_919E" Format="i4" Width="16" Height="16" Offset="0x50180"/>
+        <Texture Name="gMsgKanji919FTex" OutName="msg_kanji_919F" Format="i4" Width="16" Height="16" Offset="0x50200"/>
+        <Texture Name="gMsgKanji91A0Tex" OutName="msg_kanji_91A0" Format="i4" Width="16" Height="16" Offset="0x50280"/>
+        <Texture Name="gMsgKanji91A1Tex" OutName="msg_kanji_91A1" Format="i4" Width="16" Height="16" Offset="0x50300"/>
+        <Texture Name="gMsgKanji91A2Tex" OutName="msg_kanji_91A2" Format="i4" Width="16" Height="16" Offset="0x50380"/>
+        <Texture Name="gMsgKanji91A3Tex" OutName="msg_kanji_91A3" Format="i4" Width="16" Height="16" Offset="0x50400"/>
+        <Texture Name="gMsgKanji91A4Tex" OutName="msg_kanji_91A4" Format="i4" Width="16" Height="16" Offset="0x50480"/>
+        <Texture Name="gMsgKanji91A5Tex" OutName="msg_kanji_91A5" Format="i4" Width="16" Height="16" Offset="0x50500"/>
+        <Texture Name="gMsgKanji91A6Tex" OutName="msg_kanji_91A6" Format="i4" Width="16" Height="16" Offset="0x50580"/>
+        <Texture Name="gMsgKanji91A7Tex" OutName="msg_kanji_91A7" Format="i4" Width="16" Height="16" Offset="0x50600"/>
+        <Texture Name="gMsgKanji91A8Tex" OutName="msg_kanji_91A8" Format="i4" Width="16" Height="16" Offset="0x50680"/>
+        <Texture Name="gMsgKanji91A9Tex" OutName="msg_kanji_91A9" Format="i4" Width="16" Height="16" Offset="0x50700"/>
+        <Texture Name="gMsgKanji91AATex" OutName="msg_kanji_91AA" Format="i4" Width="16" Height="16" Offset="0x50780"/>
+        <Texture Name="gMsgKanji91ABTex" OutName="msg_kanji_91AB" Format="i4" Width="16" Height="16" Offset="0x50800"/>
+        <Texture Name="gMsgKanji91ACTex" OutName="msg_kanji_91AC" Format="i4" Width="16" Height="16" Offset="0x50880"/>
+        <Texture Name="gMsgKanji91ADTex" OutName="msg_kanji_91AD" Format="i4" Width="16" Height="16" Offset="0x50900"/>
+        <Texture Name="gMsgKanji91AETex" OutName="msg_kanji_91AE" Format="i4" Width="16" Height="16" Offset="0x50980"/>
+        <Texture Name="gMsgKanji91AFTex" OutName="msg_kanji_91AF" Format="i4" Width="16" Height="16" Offset="0x50A00"/>
+        <Texture Name="gMsgKanji91B0Tex" OutName="msg_kanji_91B0" Format="i4" Width="16" Height="16" Offset="0x50A80"/>
+        <Texture Name="gMsgKanji91B1Tex" OutName="msg_kanji_91B1" Format="i4" Width="16" Height="16" Offset="0x50B00"/>
+        <Texture Name="gMsgKanji91B2Tex" OutName="msg_kanji_91B2" Format="i4" Width="16" Height="16" Offset="0x50B80"/>
+        <Texture Name="gMsgKanji91B3Tex" OutName="msg_kanji_91B3" Format="i4" Width="16" Height="16" Offset="0x50C00"/>
+        <Texture Name="gMsgKanji91B4Tex" OutName="msg_kanji_91B4" Format="i4" Width="16" Height="16" Offset="0x50C80"/>
+        <Texture Name="gMsgKanji91B5Tex" OutName="msg_kanji_91B5" Format="i4" Width="16" Height="16" Offset="0x50D00"/>
+        <Texture Name="gMsgKanji91B6Tex" OutName="msg_kanji_91B6" Format="i4" Width="16" Height="16" Offset="0x50D80"/>
+        <Texture Name="gMsgKanji91B7Tex" OutName="msg_kanji_91B7" Format="i4" Width="16" Height="16" Offset="0x50E00"/>
+        <Texture Name="gMsgKanji91B8Tex" OutName="msg_kanji_91B8" Format="i4" Width="16" Height="16" Offset="0x50E80"/>
+        <Texture Name="gMsgKanji91B9Tex" OutName="msg_kanji_91B9" Format="i4" Width="16" Height="16" Offset="0x50F00"/>
+        <Texture Name="gMsgKanji91BATex" OutName="msg_kanji_91BA" Format="i4" Width="16" Height="16" Offset="0x50F80"/>
+        <Texture Name="gMsgKanji91BBTex" OutName="msg_kanji_91BB" Format="i4" Width="16" Height="16" Offset="0x51000"/>
+        <Texture Name="gMsgKanji91BCTex" OutName="msg_kanji_91BC" Format="i4" Width="16" Height="16" Offset="0x51080"/>
+        <Texture Name="gMsgKanji91BDTex" OutName="msg_kanji_91BD" Format="i4" Width="16" Height="16" Offset="0x51100"/>
+        <Texture Name="gMsgKanji91BETex" OutName="msg_kanji_91BE" Format="i4" Width="16" Height="16" Offset="0x51180"/>
+        <Texture Name="gMsgKanji91BFTex" OutName="msg_kanji_91BF" Format="i4" Width="16" Height="16" Offset="0x51200"/>
+        <Texture Name="gMsgKanji91C0Tex" OutName="msg_kanji_91C0" Format="i4" Width="16" Height="16" Offset="0x51280"/>
+        <Texture Name="gMsgKanji91C1Tex" OutName="msg_kanji_91C1" Format="i4" Width="16" Height="16" Offset="0x51300"/>
+        <Texture Name="gMsgKanji91C2Tex" OutName="msg_kanji_91C2" Format="i4" Width="16" Height="16" Offset="0x51380"/>
+        <Texture Name="gMsgKanji91C3Tex" OutName="msg_kanji_91C3" Format="i4" Width="16" Height="16" Offset="0x51400"/>
+        <Texture Name="gMsgKanji91C4Tex" OutName="msg_kanji_91C4" Format="i4" Width="16" Height="16" Offset="0x51480"/>
+        <Texture Name="gMsgKanji91C5Tex" OutName="msg_kanji_91C5" Format="i4" Width="16" Height="16" Offset="0x51500"/>
+        <Texture Name="gMsgKanji91C6Tex" OutName="msg_kanji_91C6" Format="i4" Width="16" Height="16" Offset="0x51580"/>
+        <Texture Name="gMsgKanji91C7Tex" OutName="msg_kanji_91C7" Format="i4" Width="16" Height="16" Offset="0x51600"/>
+        <Texture Name="gMsgKanji91C8Tex" OutName="msg_kanji_91C8" Format="i4" Width="16" Height="16" Offset="0x51680"/>
+        <Texture Name="gMsgKanji91C9Tex" OutName="msg_kanji_91C9" Format="i4" Width="16" Height="16" Offset="0x51700"/>
+        <Texture Name="gMsgKanji91CATex" OutName="msg_kanji_91CA" Format="i4" Width="16" Height="16" Offset="0x51780"/>
+        <Texture Name="gMsgKanji91CBTex" OutName="msg_kanji_91CB" Format="i4" Width="16" Height="16" Offset="0x51800"/>
+        <Texture Name="gMsgKanji91CCTex" OutName="msg_kanji_91CC" Format="i4" Width="16" Height="16" Offset="0x51880"/>
+        <Texture Name="gMsgKanji91CDTex" OutName="msg_kanji_91CD" Format="i4" Width="16" Height="16" Offset="0x51900"/>
+        <Texture Name="gMsgKanji91CETex" OutName="msg_kanji_91CE" Format="i4" Width="16" Height="16" Offset="0x51980"/>
+        <Texture Name="gMsgKanji91CFTex" OutName="msg_kanji_91CF" Format="i4" Width="16" Height="16" Offset="0x51A00"/>
+        <Texture Name="gMsgKanji91D0Tex" OutName="msg_kanji_91D0" Format="i4" Width="16" Height="16" Offset="0x51A80"/>
+        <Texture Name="gMsgKanji91D1Tex" OutName="msg_kanji_91D1" Format="i4" Width="16" Height="16" Offset="0x51B00"/>
+        <Texture Name="gMsgKanji91D2Tex" OutName="msg_kanji_91D2" Format="i4" Width="16" Height="16" Offset="0x51B80"/>
+        <Texture Name="gMsgKanji91D3Tex" OutName="msg_kanji_91D3" Format="i4" Width="16" Height="16" Offset="0x51C00"/>
+        <Texture Name="gMsgKanji91D4Tex" OutName="msg_kanji_91D4" Format="i4" Width="16" Height="16" Offset="0x51C80"/>
+        <Texture Name="gMsgKanji91D5Tex" OutName="msg_kanji_91D5" Format="i4" Width="16" Height="16" Offset="0x51D00"/>
+        <Texture Name="gMsgKanji91D6Tex" OutName="msg_kanji_91D6" Format="i4" Width="16" Height="16" Offset="0x51D80"/>
+        <Texture Name="gMsgKanji91D7Tex" OutName="msg_kanji_91D7" Format="i4" Width="16" Height="16" Offset="0x51E00"/>
+        <Texture Name="gMsgKanji91D8Tex" OutName="msg_kanji_91D8" Format="i4" Width="16" Height="16" Offset="0x51E80"/>
+        <Texture Name="gMsgKanji91D9Tex" OutName="msg_kanji_91D9" Format="i4" Width="16" Height="16" Offset="0x51F00"/>
+        <Texture Name="gMsgKanji91DATex" OutName="msg_kanji_91DA" Format="i4" Width="16" Height="16" Offset="0x51F80"/>
+        <Texture Name="gMsgKanji91DBTex" OutName="msg_kanji_91DB" Format="i4" Width="16" Height="16" Offset="0x52000"/>
+        <Texture Name="gMsgKanji91DCTex" OutName="msg_kanji_91DC" Format="i4" Width="16" Height="16" Offset="0x52080"/>
+        <Texture Name="gMsgKanji91DDTex" OutName="msg_kanji_91DD" Format="i4" Width="16" Height="16" Offset="0x52100"/>
+        <Texture Name="gMsgKanji91DETex" OutName="msg_kanji_91DE" Format="i4" Width="16" Height="16" Offset="0x52180"/>
+        <Texture Name="gMsgKanji91DFTex" OutName="msg_kanji_91DF" Format="i4" Width="16" Height="16" Offset="0x52200"/>
+        <Texture Name="gMsgKanji91E0Tex" OutName="msg_kanji_91E0" Format="i4" Width="16" Height="16" Offset="0x52280"/>
+        <Texture Name="gMsgKanji91E1Tex" OutName="msg_kanji_91E1" Format="i4" Width="16" Height="16" Offset="0x52300"/>
+        <Texture Name="gMsgKanji91E2Tex" OutName="msg_kanji_91E2" Format="i4" Width="16" Height="16" Offset="0x52380"/>
+        <Texture Name="gMsgKanji91E3Tex" OutName="msg_kanji_91E3" Format="i4" Width="16" Height="16" Offset="0x52400"/>
+        <Texture Name="gMsgKanji91E4Tex" OutName="msg_kanji_91E4" Format="i4" Width="16" Height="16" Offset="0x52480"/>
+        <Texture Name="gMsgKanji91E5Tex" OutName="msg_kanji_91E5" Format="i4" Width="16" Height="16" Offset="0x52500"/>
+        <Texture Name="gMsgKanji91E6Tex" OutName="msg_kanji_91E6" Format="i4" Width="16" Height="16" Offset="0x52580"/>
+        <Texture Name="gMsgKanji91E7Tex" OutName="msg_kanji_91E7" Format="i4" Width="16" Height="16" Offset="0x52600"/>
+        <Texture Name="gMsgKanji91E8Tex" OutName="msg_kanji_91E8" Format="i4" Width="16" Height="16" Offset="0x52680"/>
+        <Texture Name="gMsgKanji91E9Tex" OutName="msg_kanji_91E9" Format="i4" Width="16" Height="16" Offset="0x52700"/>
+        <Texture Name="gMsgKanji91EATex" OutName="msg_kanji_91EA" Format="i4" Width="16" Height="16" Offset="0x52780"/>
+        <Texture Name="gMsgKanji91EBTex" OutName="msg_kanji_91EB" Format="i4" Width="16" Height="16" Offset="0x52800"/>
+        <Texture Name="gMsgKanji91ECTex" OutName="msg_kanji_91EC" Format="i4" Width="16" Height="16" Offset="0x52880"/>
+        <Texture Name="gMsgKanji91EDTex" OutName="msg_kanji_91ED" Format="i4" Width="16" Height="16" Offset="0x52900"/>
+        <Texture Name="gMsgKanji91EETex" OutName="msg_kanji_91EE" Format="i4" Width="16" Height="16" Offset="0x52980"/>
+        <Texture Name="gMsgKanji91EFTex" OutName="msg_kanji_91EF" Format="i4" Width="16" Height="16" Offset="0x52A00"/>
+        <Texture Name="gMsgKanji91F0Tex" OutName="msg_kanji_91F0" Format="i4" Width="16" Height="16" Offset="0x52A80"/>
+        <Texture Name="gMsgKanji91F1Tex" OutName="msg_kanji_91F1" Format="i4" Width="16" Height="16" Offset="0x52B00"/>
+        <Texture Name="gMsgKanji91F2Tex" OutName="msg_kanji_91F2" Format="i4" Width="16" Height="16" Offset="0x52B80"/>
+        <Texture Name="gMsgKanji91F3Tex" OutName="msg_kanji_91F3" Format="i4" Width="16" Height="16" Offset="0x52C00"/>
+        <Texture Name="gMsgKanji91F4Tex" OutName="msg_kanji_91F4" Format="i4" Width="16" Height="16" Offset="0x52C80"/>
+        <Texture Name="gMsgKanji91F5Tex" OutName="msg_kanji_91F5" Format="i4" Width="16" Height="16" Offset="0x52D00"/>
+        <Texture Name="gMsgKanji91F6Tex" OutName="msg_kanji_91F6" Format="i4" Width="16" Height="16" Offset="0x52D80"/>
+        <Texture Name="gMsgKanji91F7Tex" OutName="msg_kanji_91F7" Format="i4" Width="16" Height="16" Offset="0x52E00"/>
+        <Texture Name="gMsgKanji91F8Tex" OutName="msg_kanji_91F8" Format="i4" Width="16" Height="16" Offset="0x52E80"/>
+        <Texture Name="gMsgKanji91F9Tex" OutName="msg_kanji_91F9" Format="i4" Width="16" Height="16" Offset="0x52F00"/>
+        <Texture Name="gMsgKanji91FATex" OutName="msg_kanji_91FA" Format="i4" Width="16" Height="16" Offset="0x52F80"/>
+        <Texture Name="gMsgKanji91FBTex" OutName="msg_kanji_91FB" Format="i4" Width="16" Height="16" Offset="0x53000"/>
+        <Texture Name="gMsgKanji91FCTex" OutName="msg_kanji_91FC" Format="i4" Width="16" Height="16" Offset="0x53080"/>
+        <Texture Name="gMsgKanji9240Tex" OutName="msg_kanji_9240" Format="i4" Width="16" Height="16" Offset="0x53100"/>
+        <Texture Name="gMsgKanji9241Tex" OutName="msg_kanji_9241" Format="i4" Width="16" Height="16" Offset="0x53180"/>
+        <Texture Name="gMsgKanji9242Tex" OutName="msg_kanji_9242" Format="i4" Width="16" Height="16" Offset="0x53200"/>
+        <Texture Name="gMsgKanji9243Tex" OutName="msg_kanji_9243" Format="i4" Width="16" Height="16" Offset="0x53280"/>
+        <Texture Name="gMsgKanji9244Tex" OutName="msg_kanji_9244" Format="i4" Width="16" Height="16" Offset="0x53300"/>
+        <Texture Name="gMsgKanji9245Tex" OutName="msg_kanji_9245" Format="i4" Width="16" Height="16" Offset="0x53380"/>
+        <Texture Name="gMsgKanji9246Tex" OutName="msg_kanji_9246" Format="i4" Width="16" Height="16" Offset="0x53400"/>
+        <Texture Name="gMsgKanji9247Tex" OutName="msg_kanji_9247" Format="i4" Width="16" Height="16" Offset="0x53480"/>
+        <Texture Name="gMsgKanji9248Tex" OutName="msg_kanji_9248" Format="i4" Width="16" Height="16" Offset="0x53500"/>
+        <Texture Name="gMsgKanji9249Tex" OutName="msg_kanji_9249" Format="i4" Width="16" Height="16" Offset="0x53580"/>
+        <Texture Name="gMsgKanji924ATex" OutName="msg_kanji_924A" Format="i4" Width="16" Height="16" Offset="0x53600"/>
+        <Texture Name="gMsgKanji924BTex" OutName="msg_kanji_924B" Format="i4" Width="16" Height="16" Offset="0x53680"/>
+        <Texture Name="gMsgKanji924CTex" OutName="msg_kanji_924C" Format="i4" Width="16" Height="16" Offset="0x53700"/>
+        <Texture Name="gMsgKanji924DTex" OutName="msg_kanji_924D" Format="i4" Width="16" Height="16" Offset="0x53780"/>
+        <Texture Name="gMsgKanji924ETex" OutName="msg_kanji_924E" Format="i4" Width="16" Height="16" Offset="0x53800"/>
+        <Texture Name="gMsgKanji924FTex" OutName="msg_kanji_924F" Format="i4" Width="16" Height="16" Offset="0x53880"/>
+        <Texture Name="gMsgKanji9250Tex" OutName="msg_kanji_9250" Format="i4" Width="16" Height="16" Offset="0x53900"/>
+        <Texture Name="gMsgKanji9251Tex" OutName="msg_kanji_9251" Format="i4" Width="16" Height="16" Offset="0x53980"/>
+        <Texture Name="gMsgKanji9252Tex" OutName="msg_kanji_9252" Format="i4" Width="16" Height="16" Offset="0x53A00"/>
+        <Texture Name="gMsgKanji9253Tex" OutName="msg_kanji_9253" Format="i4" Width="16" Height="16" Offset="0x53A80"/>
+        <Texture Name="gMsgKanji9254Tex" OutName="msg_kanji_9254" Format="i4" Width="16" Height="16" Offset="0x53B00"/>
+        <Texture Name="gMsgKanji9255Tex" OutName="msg_kanji_9255" Format="i4" Width="16" Height="16" Offset="0x53B80"/>
+        <Texture Name="gMsgKanji9256Tex" OutName="msg_kanji_9256" Format="i4" Width="16" Height="16" Offset="0x53C00"/>
+        <Texture Name="gMsgKanji9257Tex" OutName="msg_kanji_9257" Format="i4" Width="16" Height="16" Offset="0x53C80"/>
+        <Texture Name="gMsgKanji9258Tex" OutName="msg_kanji_9258" Format="i4" Width="16" Height="16" Offset="0x53D00"/>
+        <Texture Name="gMsgKanji9259Tex" OutName="msg_kanji_9259" Format="i4" Width="16" Height="16" Offset="0x53D80"/>
+        <Texture Name="gMsgKanji925ATex" OutName="msg_kanji_925A" Format="i4" Width="16" Height="16" Offset="0x53E00"/>
+        <Texture Name="gMsgKanji925BTex" OutName="msg_kanji_925B" Format="i4" Width="16" Height="16" Offset="0x53E80"/>
+        <Texture Name="gMsgKanji925CTex" OutName="msg_kanji_925C" Format="i4" Width="16" Height="16" Offset="0x53F00"/>
+        <Texture Name="gMsgKanji925DTex" OutName="msg_kanji_925D" Format="i4" Width="16" Height="16" Offset="0x53F80"/>
+        <Texture Name="gMsgKanji925ETex" OutName="msg_kanji_925E" Format="i4" Width="16" Height="16" Offset="0x54000"/>
+        <Texture Name="gMsgKanji925FTex" OutName="msg_kanji_925F" Format="i4" Width="16" Height="16" Offset="0x54080"/>
+        <Texture Name="gMsgKanji9260Tex" OutName="msg_kanji_9260" Format="i4" Width="16" Height="16" Offset="0x54100"/>
+        <Texture Name="gMsgKanji9261Tex" OutName="msg_kanji_9261" Format="i4" Width="16" Height="16" Offset="0x54180"/>
+        <Texture Name="gMsgKanji9262Tex" OutName="msg_kanji_9262" Format="i4" Width="16" Height="16" Offset="0x54200"/>
+        <Texture Name="gMsgKanji9263Tex" OutName="msg_kanji_9263" Format="i4" Width="16" Height="16" Offset="0x54280"/>
+        <Texture Name="gMsgKanji9264Tex" OutName="msg_kanji_9264" Format="i4" Width="16" Height="16" Offset="0x54300"/>
+        <Texture Name="gMsgKanji9265Tex" OutName="msg_kanji_9265" Format="i4" Width="16" Height="16" Offset="0x54380"/>
+        <Texture Name="gMsgKanji9266Tex" OutName="msg_kanji_9266" Format="i4" Width="16" Height="16" Offset="0x54400"/>
+        <Texture Name="gMsgKanji9267Tex" OutName="msg_kanji_9267" Format="i4" Width="16" Height="16" Offset="0x54480"/>
+        <Texture Name="gMsgKanji9268Tex" OutName="msg_kanji_9268" Format="i4" Width="16" Height="16" Offset="0x54500"/>
+        <Texture Name="gMsgKanji9269Tex" OutName="msg_kanji_9269" Format="i4" Width="16" Height="16" Offset="0x54580"/>
+        <Texture Name="gMsgKanji926ATex" OutName="msg_kanji_926A" Format="i4" Width="16" Height="16" Offset="0x54600"/>
+        <Texture Name="gMsgKanji926BTex" OutName="msg_kanji_926B" Format="i4" Width="16" Height="16" Offset="0x54680"/>
+        <Texture Name="gMsgKanji926CTex" OutName="msg_kanji_926C" Format="i4" Width="16" Height="16" Offset="0x54700"/>
+        <Texture Name="gMsgKanji926DTex" OutName="msg_kanji_926D" Format="i4" Width="16" Height="16" Offset="0x54780"/>
+        <Texture Name="gMsgKanji926ETex" OutName="msg_kanji_926E" Format="i4" Width="16" Height="16" Offset="0x54800"/>
+        <Texture Name="gMsgKanji926FTex" OutName="msg_kanji_926F" Format="i4" Width="16" Height="16" Offset="0x54880"/>
+        <Texture Name="gMsgKanji9270Tex" OutName="msg_kanji_9270" Format="i4" Width="16" Height="16" Offset="0x54900"/>
+        <Texture Name="gMsgKanji9271Tex" OutName="msg_kanji_9271" Format="i4" Width="16" Height="16" Offset="0x54980"/>
+        <Texture Name="gMsgKanji9272Tex" OutName="msg_kanji_9272" Format="i4" Width="16" Height="16" Offset="0x54A00"/>
+        <Texture Name="gMsgKanji9273Tex" OutName="msg_kanji_9273" Format="i4" Width="16" Height="16" Offset="0x54A80"/>
+        <Texture Name="gMsgKanji9274Tex" OutName="msg_kanji_9274" Format="i4" Width="16" Height="16" Offset="0x54B00"/>
+        <Texture Name="gMsgKanji9275Tex" OutName="msg_kanji_9275" Format="i4" Width="16" Height="16" Offset="0x54B80"/>
+        <Texture Name="gMsgKanji9276Tex" OutName="msg_kanji_9276" Format="i4" Width="16" Height="16" Offset="0x54C00"/>
+        <Texture Name="gMsgKanji9277Tex" OutName="msg_kanji_9277" Format="i4" Width="16" Height="16" Offset="0x54C80"/>
+        <Texture Name="gMsgKanji9278Tex" OutName="msg_kanji_9278" Format="i4" Width="16" Height="16" Offset="0x54D00"/>
+        <Texture Name="gMsgKanji9279Tex" OutName="msg_kanji_9279" Format="i4" Width="16" Height="16" Offset="0x54D80"/>
+        <Texture Name="gMsgKanji927ATex" OutName="msg_kanji_927A" Format="i4" Width="16" Height="16" Offset="0x54E00"/>
+        <Texture Name="gMsgKanji927BTex" OutName="msg_kanji_927B" Format="i4" Width="16" Height="16" Offset="0x54E80"/>
+        <Texture Name="gMsgKanji927CTex" OutName="msg_kanji_927C" Format="i4" Width="16" Height="16" Offset="0x54F00"/>
+        <Texture Name="gMsgKanji927DTex" OutName="msg_kanji_927D" Format="i4" Width="16" Height="16" Offset="0x54F80"/>
+        <Texture Name="gMsgKanji927ETex" OutName="msg_kanji_927E" Format="i4" Width="16" Height="16" Offset="0x55000"/>
+        <Texture Name="gMsgKanji9280Tex" OutName="msg_kanji_9280" Format="i4" Width="16" Height="16" Offset="0x55080"/>
+        <Texture Name="gMsgKanji9281Tex" OutName="msg_kanji_9281" Format="i4" Width="16" Height="16" Offset="0x55100"/>
+        <Texture Name="gMsgKanji9282Tex" OutName="msg_kanji_9282" Format="i4" Width="16" Height="16" Offset="0x55180"/>
+        <Texture Name="gMsgKanji9283Tex" OutName="msg_kanji_9283" Format="i4" Width="16" Height="16" Offset="0x55200"/>
+        <Texture Name="gMsgKanji9284Tex" OutName="msg_kanji_9284" Format="i4" Width="16" Height="16" Offset="0x55280"/>
+        <Texture Name="gMsgKanji9285Tex" OutName="msg_kanji_9285" Format="i4" Width="16" Height="16" Offset="0x55300"/>
+        <Texture Name="gMsgKanji9286Tex" OutName="msg_kanji_9286" Format="i4" Width="16" Height="16" Offset="0x55380"/>
+        <Texture Name="gMsgKanji9287Tex" OutName="msg_kanji_9287" Format="i4" Width="16" Height="16" Offset="0x55400"/>
+        <Texture Name="gMsgKanji9288Tex" OutName="msg_kanji_9288" Format="i4" Width="16" Height="16" Offset="0x55480"/>
+        <Texture Name="gMsgKanji9289Tex" OutName="msg_kanji_9289" Format="i4" Width="16" Height="16" Offset="0x55500"/>
+        <Texture Name="gMsgKanji928ATex" OutName="msg_kanji_928A" Format="i4" Width="16" Height="16" Offset="0x55580"/>
+        <Texture Name="gMsgKanji928BTex" OutName="msg_kanji_928B" Format="i4" Width="16" Height="16" Offset="0x55600"/>
+        <Texture Name="gMsgKanji928CTex" OutName="msg_kanji_928C" Format="i4" Width="16" Height="16" Offset="0x55680"/>
+        <Texture Name="gMsgKanji928DTex" OutName="msg_kanji_928D" Format="i4" Width="16" Height="16" Offset="0x55700"/>
+        <Texture Name="gMsgKanji928ETex" OutName="msg_kanji_928E" Format="i4" Width="16" Height="16" Offset="0x55780"/>
+        <Texture Name="gMsgKanji928FTex" OutName="msg_kanji_928F" Format="i4" Width="16" Height="16" Offset="0x55800"/>
+        <Texture Name="gMsgKanji9290Tex" OutName="msg_kanji_9290" Format="i4" Width="16" Height="16" Offset="0x55880"/>
+        <Texture Name="gMsgKanji9291Tex" OutName="msg_kanji_9291" Format="i4" Width="16" Height="16" Offset="0x55900"/>
+        <Texture Name="gMsgKanji9292Tex" OutName="msg_kanji_9292" Format="i4" Width="16" Height="16" Offset="0x55980"/>
+        <Texture Name="gMsgKanji9293Tex" OutName="msg_kanji_9293" Format="i4" Width="16" Height="16" Offset="0x55A00"/>
+        <Texture Name="gMsgKanji9294Tex" OutName="msg_kanji_9294" Format="i4" Width="16" Height="16" Offset="0x55A80"/>
+        <Texture Name="gMsgKanji9295Tex" OutName="msg_kanji_9295" Format="i4" Width="16" Height="16" Offset="0x55B00"/>
+        <Texture Name="gMsgKanji9296Tex" OutName="msg_kanji_9296" Format="i4" Width="16" Height="16" Offset="0x55B80"/>
+        <Texture Name="gMsgKanji9297Tex" OutName="msg_kanji_9297" Format="i4" Width="16" Height="16" Offset="0x55C00"/>
+        <Texture Name="gMsgKanji9298Tex" OutName="msg_kanji_9298" Format="i4" Width="16" Height="16" Offset="0x55C80"/>
+        <Texture Name="gMsgKanji9299Tex" OutName="msg_kanji_9299" Format="i4" Width="16" Height="16" Offset="0x55D00"/>
+        <Texture Name="gMsgKanji929ATex" OutName="msg_kanji_929A" Format="i4" Width="16" Height="16" Offset="0x55D80"/>
+        <Texture Name="gMsgKanji929BTex" OutName="msg_kanji_929B" Format="i4" Width="16" Height="16" Offset="0x55E00"/>
+        <Texture Name="gMsgKanji929CTex" OutName="msg_kanji_929C" Format="i4" Width="16" Height="16" Offset="0x55E80"/>
+        <Texture Name="gMsgKanji929DTex" OutName="msg_kanji_929D" Format="i4" Width="16" Height="16" Offset="0x55F00"/>
+        <Texture Name="gMsgKanji929ETex" OutName="msg_kanji_929E" Format="i4" Width="16" Height="16" Offset="0x55F80"/>
+        <Texture Name="gMsgKanji929FTex" OutName="msg_kanji_929F" Format="i4" Width="16" Height="16" Offset="0x56000"/>
+        <Texture Name="gMsgKanji92A0Tex" OutName="msg_kanji_92A0" Format="i4" Width="16" Height="16" Offset="0x56080"/>
+        <Texture Name="gMsgKanji92A1Tex" OutName="msg_kanji_92A1" Format="i4" Width="16" Height="16" Offset="0x56100"/>
+        <Texture Name="gMsgKanji92A2Tex" OutName="msg_kanji_92A2" Format="i4" Width="16" Height="16" Offset="0x56180"/>
+        <Texture Name="gMsgKanji92A3Tex" OutName="msg_kanji_92A3" Format="i4" Width="16" Height="16" Offset="0x56200"/>
+        <Texture Name="gMsgKanji92A4Tex" OutName="msg_kanji_92A4" Format="i4" Width="16" Height="16" Offset="0x56280"/>
+        <Texture Name="gMsgKanji92A5Tex" OutName="msg_kanji_92A5" Format="i4" Width="16" Height="16" Offset="0x56300"/>
+        <Texture Name="gMsgKanji92A6Tex" OutName="msg_kanji_92A6" Format="i4" Width="16" Height="16" Offset="0x56380"/>
+        <Texture Name="gMsgKanji92A7Tex" OutName="msg_kanji_92A7" Format="i4" Width="16" Height="16" Offset="0x56400"/>
+        <Texture Name="gMsgKanji92A8Tex" OutName="msg_kanji_92A8" Format="i4" Width="16" Height="16" Offset="0x56480"/>
+        <Texture Name="gMsgKanji92A9Tex" OutName="msg_kanji_92A9" Format="i4" Width="16" Height="16" Offset="0x56500"/>
+        <Texture Name="gMsgKanji92AATex" OutName="msg_kanji_92AA" Format="i4" Width="16" Height="16" Offset="0x56580"/>
+        <Texture Name="gMsgKanji92ABTex" OutName="msg_kanji_92AB" Format="i4" Width="16" Height="16" Offset="0x56600"/>
+        <Texture Name="gMsgKanji92ACTex" OutName="msg_kanji_92AC" Format="i4" Width="16" Height="16" Offset="0x56680"/>
+        <Texture Name="gMsgKanji92ADTex" OutName="msg_kanji_92AD" Format="i4" Width="16" Height="16" Offset="0x56700"/>
+        <Texture Name="gMsgKanji92AETex" OutName="msg_kanji_92AE" Format="i4" Width="16" Height="16" Offset="0x56780"/>
+        <Texture Name="gMsgKanji92AFTex" OutName="msg_kanji_92AF" Format="i4" Width="16" Height="16" Offset="0x56800"/>
+        <Texture Name="gMsgKanji92B0Tex" OutName="msg_kanji_92B0" Format="i4" Width="16" Height="16" Offset="0x56880"/>
+        <Texture Name="gMsgKanji92B1Tex" OutName="msg_kanji_92B1" Format="i4" Width="16" Height="16" Offset="0x56900"/>
+        <Texture Name="gMsgKanji92B2Tex" OutName="msg_kanji_92B2" Format="i4" Width="16" Height="16" Offset="0x56980"/>
+        <Texture Name="gMsgKanji92B3Tex" OutName="msg_kanji_92B3" Format="i4" Width="16" Height="16" Offset="0x56A00"/>
+        <Texture Name="gMsgKanji92B4Tex" OutName="msg_kanji_92B4" Format="i4" Width="16" Height="16" Offset="0x56A80"/>
+        <Texture Name="gMsgKanji92B5Tex" OutName="msg_kanji_92B5" Format="i4" Width="16" Height="16" Offset="0x56B00"/>
+        <Texture Name="gMsgKanji92B6Tex" OutName="msg_kanji_92B6" Format="i4" Width="16" Height="16" Offset="0x56B80"/>
+        <Texture Name="gMsgKanji92B7Tex" OutName="msg_kanji_92B7" Format="i4" Width="16" Height="16" Offset="0x56C00"/>
+        <Texture Name="gMsgKanji92B8Tex" OutName="msg_kanji_92B8" Format="i4" Width="16" Height="16" Offset="0x56C80"/>
+        <Texture Name="gMsgKanji92B9Tex" OutName="msg_kanji_92B9" Format="i4" Width="16" Height="16" Offset="0x56D00"/>
+        <Texture Name="gMsgKanji92BATex" OutName="msg_kanji_92BA" Format="i4" Width="16" Height="16" Offset="0x56D80"/>
+        <Texture Name="gMsgKanji92BBTex" OutName="msg_kanji_92BB" Format="i4" Width="16" Height="16" Offset="0x56E00"/>
+        <Texture Name="gMsgKanji92BCTex" OutName="msg_kanji_92BC" Format="i4" Width="16" Height="16" Offset="0x56E80"/>
+        <Texture Name="gMsgKanji92BDTex" OutName="msg_kanji_92BD" Format="i4" Width="16" Height="16" Offset="0x56F00"/>
+        <Texture Name="gMsgKanji92BETex" OutName="msg_kanji_92BE" Format="i4" Width="16" Height="16" Offset="0x56F80"/>
+        <Texture Name="gMsgKanji92BFTex" OutName="msg_kanji_92BF" Format="i4" Width="16" Height="16" Offset="0x57000"/>
+        <Texture Name="gMsgKanji92C0Tex" OutName="msg_kanji_92C0" Format="i4" Width="16" Height="16" Offset="0x57080"/>
+        <Texture Name="gMsgKanji92C1Tex" OutName="msg_kanji_92C1" Format="i4" Width="16" Height="16" Offset="0x57100"/>
+        <Texture Name="gMsgKanji92C2Tex" OutName="msg_kanji_92C2" Format="i4" Width="16" Height="16" Offset="0x57180"/>
+        <Texture Name="gMsgKanji92C3Tex" OutName="msg_kanji_92C3" Format="i4" Width="16" Height="16" Offset="0x57200"/>
+        <Texture Name="gMsgKanji92C4Tex" OutName="msg_kanji_92C4" Format="i4" Width="16" Height="16" Offset="0x57280"/>
+        <Texture Name="gMsgKanji92C5Tex" OutName="msg_kanji_92C5" Format="i4" Width="16" Height="16" Offset="0x57300"/>
+        <Texture Name="gMsgKanji92C6Tex" OutName="msg_kanji_92C6" Format="i4" Width="16" Height="16" Offset="0x57380"/>
+        <Texture Name="gMsgKanji92C7Tex" OutName="msg_kanji_92C7" Format="i4" Width="16" Height="16" Offset="0x57400"/>
+        <Texture Name="gMsgKanji92C8Tex" OutName="msg_kanji_92C8" Format="i4" Width="16" Height="16" Offset="0x57480"/>
+        <Texture Name="gMsgKanji92C9Tex" OutName="msg_kanji_92C9" Format="i4" Width="16" Height="16" Offset="0x57500"/>
+        <Texture Name="gMsgKanji92CATex" OutName="msg_kanji_92CA" Format="i4" Width="16" Height="16" Offset="0x57580"/>
+        <Texture Name="gMsgKanji92CBTex" OutName="msg_kanji_92CB" Format="i4" Width="16" Height="16" Offset="0x57600"/>
+        <Texture Name="gMsgKanji92CCTex" OutName="msg_kanji_92CC" Format="i4" Width="16" Height="16" Offset="0x57680"/>
+        <Texture Name="gMsgKanji92CDTex" OutName="msg_kanji_92CD" Format="i4" Width="16" Height="16" Offset="0x57700"/>
+        <Texture Name="gMsgKanji92CETex" OutName="msg_kanji_92CE" Format="i4" Width="16" Height="16" Offset="0x57780"/>
+        <Texture Name="gMsgKanji92CFTex" OutName="msg_kanji_92CF" Format="i4" Width="16" Height="16" Offset="0x57800"/>
+        <Texture Name="gMsgKanji92D0Tex" OutName="msg_kanji_92D0" Format="i4" Width="16" Height="16" Offset="0x57880"/>
+        <Texture Name="gMsgKanji92D1Tex" OutName="msg_kanji_92D1" Format="i4" Width="16" Height="16" Offset="0x57900"/>
+        <Texture Name="gMsgKanji92D2Tex" OutName="msg_kanji_92D2" Format="i4" Width="16" Height="16" Offset="0x57980"/>
+        <Texture Name="gMsgKanji92D3Tex" OutName="msg_kanji_92D3" Format="i4" Width="16" Height="16" Offset="0x57A00"/>
+        <Texture Name="gMsgKanji92D4Tex" OutName="msg_kanji_92D4" Format="i4" Width="16" Height="16" Offset="0x57A80"/>
+        <Texture Name="gMsgKanji92D5Tex" OutName="msg_kanji_92D5" Format="i4" Width="16" Height="16" Offset="0x57B00"/>
+        <Texture Name="gMsgKanji92D6Tex" OutName="msg_kanji_92D6" Format="i4" Width="16" Height="16" Offset="0x57B80"/>
+        <Texture Name="gMsgKanji92D7Tex" OutName="msg_kanji_92D7" Format="i4" Width="16" Height="16" Offset="0x57C00"/>
+        <Texture Name="gMsgKanji92D8Tex" OutName="msg_kanji_92D8" Format="i4" Width="16" Height="16" Offset="0x57C80"/>
+        <Texture Name="gMsgKanji92D9Tex" OutName="msg_kanji_92D9" Format="i4" Width="16" Height="16" Offset="0x57D00"/>
+        <Texture Name="gMsgKanji92DATex" OutName="msg_kanji_92DA" Format="i4" Width="16" Height="16" Offset="0x57D80"/>
+        <Texture Name="gMsgKanji92DBTex" OutName="msg_kanji_92DB" Format="i4" Width="16" Height="16" Offset="0x57E00"/>
+        <Texture Name="gMsgKanji92DCTex" OutName="msg_kanji_92DC" Format="i4" Width="16" Height="16" Offset="0x57E80"/>
+        <Texture Name="gMsgKanji92DDTex" OutName="msg_kanji_92DD" Format="i4" Width="16" Height="16" Offset="0x57F00"/>
+        <Texture Name="gMsgKanji92DETex" OutName="msg_kanji_92DE" Format="i4" Width="16" Height="16" Offset="0x57F80"/>
+        <Texture Name="gMsgKanji92DFTex" OutName="msg_kanji_92DF" Format="i4" Width="16" Height="16" Offset="0x58000"/>
+        <Texture Name="gMsgKanji92E0Tex" OutName="msg_kanji_92E0" Format="i4" Width="16" Height="16" Offset="0x58080"/>
+        <Texture Name="gMsgKanji92E1Tex" OutName="msg_kanji_92E1" Format="i4" Width="16" Height="16" Offset="0x58100"/>
+        <Texture Name="gMsgKanji92E2Tex" OutName="msg_kanji_92E2" Format="i4" Width="16" Height="16" Offset="0x58180"/>
+        <Texture Name="gMsgKanji92E3Tex" OutName="msg_kanji_92E3" Format="i4" Width="16" Height="16" Offset="0x58200"/>
+        <Texture Name="gMsgKanji92E4Tex" OutName="msg_kanji_92E4" Format="i4" Width="16" Height="16" Offset="0x58280"/>
+        <Texture Name="gMsgKanji92E5Tex" OutName="msg_kanji_92E5" Format="i4" Width="16" Height="16" Offset="0x58300"/>
+        <Texture Name="gMsgKanji92E6Tex" OutName="msg_kanji_92E6" Format="i4" Width="16" Height="16" Offset="0x58380"/>
+        <Texture Name="gMsgKanji92E7Tex" OutName="msg_kanji_92E7" Format="i4" Width="16" Height="16" Offset="0x58400"/>
+        <Texture Name="gMsgKanji92E8Tex" OutName="msg_kanji_92E8" Format="i4" Width="16" Height="16" Offset="0x58480"/>
+        <Texture Name="gMsgKanji92E9Tex" OutName="msg_kanji_92E9" Format="i4" Width="16" Height="16" Offset="0x58500"/>
+        <Texture Name="gMsgKanji92EATex" OutName="msg_kanji_92EA" Format="i4" Width="16" Height="16" Offset="0x58580"/>
+        <Texture Name="gMsgKanji92EBTex" OutName="msg_kanji_92EB" Format="i4" Width="16" Height="16" Offset="0x58600"/>
+        <Texture Name="gMsgKanji92ECTex" OutName="msg_kanji_92EC" Format="i4" Width="16" Height="16" Offset="0x58680"/>
+        <Texture Name="gMsgKanji92EDTex" OutName="msg_kanji_92ED" Format="i4" Width="16" Height="16" Offset="0x58700"/>
+        <Texture Name="gMsgKanji92EETex" OutName="msg_kanji_92EE" Format="i4" Width="16" Height="16" Offset="0x58780"/>
+        <Texture Name="gMsgKanji92EFTex" OutName="msg_kanji_92EF" Format="i4" Width="16" Height="16" Offset="0x58800"/>
+        <Texture Name="gMsgKanji92F0Tex" OutName="msg_kanji_92F0" Format="i4" Width="16" Height="16" Offset="0x58880"/>
+        <Texture Name="gMsgKanji92F1Tex" OutName="msg_kanji_92F1" Format="i4" Width="16" Height="16" Offset="0x58900"/>
+        <Texture Name="gMsgKanji92F2Tex" OutName="msg_kanji_92F2" Format="i4" Width="16" Height="16" Offset="0x58980"/>
+        <Texture Name="gMsgKanji92F3Tex" OutName="msg_kanji_92F3" Format="i4" Width="16" Height="16" Offset="0x58A00"/>
+        <Texture Name="gMsgKanji92F4Tex" OutName="msg_kanji_92F4" Format="i4" Width="16" Height="16" Offset="0x58A80"/>
+        <Texture Name="gMsgKanji92F5Tex" OutName="msg_kanji_92F5" Format="i4" Width="16" Height="16" Offset="0x58B00"/>
+        <Texture Name="gMsgKanji92F6Tex" OutName="msg_kanji_92F6" Format="i4" Width="16" Height="16" Offset="0x58B80"/>
+        <Texture Name="gMsgKanji92F7Tex" OutName="msg_kanji_92F7" Format="i4" Width="16" Height="16" Offset="0x58C00"/>
+        <Texture Name="gMsgKanji92F8Tex" OutName="msg_kanji_92F8" Format="i4" Width="16" Height="16" Offset="0x58C80"/>
+        <Texture Name="gMsgKanji92F9Tex" OutName="msg_kanji_92F9" Format="i4" Width="16" Height="16" Offset="0x58D00"/>
+        <Texture Name="gMsgKanji92FATex" OutName="msg_kanji_92FA" Format="i4" Width="16" Height="16" Offset="0x58D80"/>
+        <Texture Name="gMsgKanji92FBTex" OutName="msg_kanji_92FB" Format="i4" Width="16" Height="16" Offset="0x58E00"/>
+        <Texture Name="gMsgKanji92FCTex" OutName="msg_kanji_92FC" Format="i4" Width="16" Height="16" Offset="0x58E80"/>
+        <Texture Name="gMsgKanji9340Tex" OutName="msg_kanji_9340" Format="i4" Width="16" Height="16" Offset="0x58F00"/>
+        <Texture Name="gMsgKanji9341Tex" OutName="msg_kanji_9341" Format="i4" Width="16" Height="16" Offset="0x58F80"/>
+        <Texture Name="gMsgKanji9342Tex" OutName="msg_kanji_9342" Format="i4" Width="16" Height="16" Offset="0x59000"/>
+        <Texture Name="gMsgKanji9343Tex" OutName="msg_kanji_9343" Format="i4" Width="16" Height="16" Offset="0x59080"/>
+        <Texture Name="gMsgKanji9344Tex" OutName="msg_kanji_9344" Format="i4" Width="16" Height="16" Offset="0x59100"/>
+        <Texture Name="gMsgKanji9345Tex" OutName="msg_kanji_9345" Format="i4" Width="16" Height="16" Offset="0x59180"/>
+        <Texture Name="gMsgKanji9346Tex" OutName="msg_kanji_9346" Format="i4" Width="16" Height="16" Offset="0x59200"/>
+        <Texture Name="gMsgKanji9347Tex" OutName="msg_kanji_9347" Format="i4" Width="16" Height="16" Offset="0x59280"/>
+        <Texture Name="gMsgKanji9348Tex" OutName="msg_kanji_9348" Format="i4" Width="16" Height="16" Offset="0x59300"/>
+        <Texture Name="gMsgKanji9349Tex" OutName="msg_kanji_9349" Format="i4" Width="16" Height="16" Offset="0x59380"/>
+        <Texture Name="gMsgKanji934ATex" OutName="msg_kanji_934A" Format="i4" Width="16" Height="16" Offset="0x59400"/>
+        <Texture Name="gMsgKanji934BTex" OutName="msg_kanji_934B" Format="i4" Width="16" Height="16" Offset="0x59480"/>
+        <Texture Name="gMsgKanji934CTex" OutName="msg_kanji_934C" Format="i4" Width="16" Height="16" Offset="0x59500"/>
+        <Texture Name="gMsgKanji934DTex" OutName="msg_kanji_934D" Format="i4" Width="16" Height="16" Offset="0x59580"/>
+        <Texture Name="gMsgKanji934ETex" OutName="msg_kanji_934E" Format="i4" Width="16" Height="16" Offset="0x59600"/>
+        <Texture Name="gMsgKanji934FTex" OutName="msg_kanji_934F" Format="i4" Width="16" Height="16" Offset="0x59680"/>
+        <Texture Name="gMsgKanji9350Tex" OutName="msg_kanji_9350" Format="i4" Width="16" Height="16" Offset="0x59700"/>
+        <Texture Name="gMsgKanji9351Tex" OutName="msg_kanji_9351" Format="i4" Width="16" Height="16" Offset="0x59780"/>
+        <Texture Name="gMsgKanji9352Tex" OutName="msg_kanji_9352" Format="i4" Width="16" Height="16" Offset="0x59800"/>
+        <Texture Name="gMsgKanji9353Tex" OutName="msg_kanji_9353" Format="i4" Width="16" Height="16" Offset="0x59880"/>
+        <Texture Name="gMsgKanji9354Tex" OutName="msg_kanji_9354" Format="i4" Width="16" Height="16" Offset="0x59900"/>
+        <Texture Name="gMsgKanji9355Tex" OutName="msg_kanji_9355" Format="i4" Width="16" Height="16" Offset="0x59980"/>
+        <Texture Name="gMsgKanji9356Tex" OutName="msg_kanji_9356" Format="i4" Width="16" Height="16" Offset="0x59A00"/>
+        <Texture Name="gMsgKanji9357Tex" OutName="msg_kanji_9357" Format="i4" Width="16" Height="16" Offset="0x59A80"/>
+        <Texture Name="gMsgKanji9358Tex" OutName="msg_kanji_9358" Format="i4" Width="16" Height="16" Offset="0x59B00"/>
+        <Texture Name="gMsgKanji9359Tex" OutName="msg_kanji_9359" Format="i4" Width="16" Height="16" Offset="0x59B80"/>
+        <Texture Name="gMsgKanji935ATex" OutName="msg_kanji_935A" Format="i4" Width="16" Height="16" Offset="0x59C00"/>
+        <Texture Name="gMsgKanji935BTex" OutName="msg_kanji_935B" Format="i4" Width="16" Height="16" Offset="0x59C80"/>
+        <Texture Name="gMsgKanji935CTex" OutName="msg_kanji_935C" Format="i4" Width="16" Height="16" Offset="0x59D00"/>
+        <Texture Name="gMsgKanji935DTex" OutName="msg_kanji_935D" Format="i4" Width="16" Height="16" Offset="0x59D80"/>
+        <Texture Name="gMsgKanji935ETex" OutName="msg_kanji_935E" Format="i4" Width="16" Height="16" Offset="0x59E00"/>
+        <Texture Name="gMsgKanji935FTex" OutName="msg_kanji_935F" Format="i4" Width="16" Height="16" Offset="0x59E80"/>
+        <Texture Name="gMsgKanji9360Tex" OutName="msg_kanji_9360" Format="i4" Width="16" Height="16" Offset="0x59F00"/>
+        <Texture Name="gMsgKanji9361Tex" OutName="msg_kanji_9361" Format="i4" Width="16" Height="16" Offset="0x59F80"/>
+        <Texture Name="gMsgKanji9362Tex" OutName="msg_kanji_9362" Format="i4" Width="16" Height="16" Offset="0x5A000"/>
+        <Texture Name="gMsgKanji9363Tex" OutName="msg_kanji_9363" Format="i4" Width="16" Height="16" Offset="0x5A080"/>
+        <Texture Name="gMsgKanji9364Tex" OutName="msg_kanji_9364" Format="i4" Width="16" Height="16" Offset="0x5A100"/>
+        <Texture Name="gMsgKanji9365Tex" OutName="msg_kanji_9365" Format="i4" Width="16" Height="16" Offset="0x5A180"/>
+        <Texture Name="gMsgKanji9366Tex" OutName="msg_kanji_9366" Format="i4" Width="16" Height="16" Offset="0x5A200"/>
+        <Texture Name="gMsgKanji9367Tex" OutName="msg_kanji_9367" Format="i4" Width="16" Height="16" Offset="0x5A280"/>
+        <Texture Name="gMsgKanji9368Tex" OutName="msg_kanji_9368" Format="i4" Width="16" Height="16" Offset="0x5A300"/>
+        <Texture Name="gMsgKanji9369Tex" OutName="msg_kanji_9369" Format="i4" Width="16" Height="16" Offset="0x5A380"/>
+        <Texture Name="gMsgKanji936ATex" OutName="msg_kanji_936A" Format="i4" Width="16" Height="16" Offset="0x5A400"/>
+        <Texture Name="gMsgKanji936BTex" OutName="msg_kanji_936B" Format="i4" Width="16" Height="16" Offset="0x5A480"/>
+        <Texture Name="gMsgKanji936CTex" OutName="msg_kanji_936C" Format="i4" Width="16" Height="16" Offset="0x5A500"/>
+        <Texture Name="gMsgKanji936DTex" OutName="msg_kanji_936D" Format="i4" Width="16" Height="16" Offset="0x5A580"/>
+        <Texture Name="gMsgKanji936ETex" OutName="msg_kanji_936E" Format="i4" Width="16" Height="16" Offset="0x5A600"/>
+        <Texture Name="gMsgKanji936FTex" OutName="msg_kanji_936F" Format="i4" Width="16" Height="16" Offset="0x5A680"/>
+        <Texture Name="gMsgKanji9370Tex" OutName="msg_kanji_9370" Format="i4" Width="16" Height="16" Offset="0x5A700"/>
+        <Texture Name="gMsgKanji9371Tex" OutName="msg_kanji_9371" Format="i4" Width="16" Height="16" Offset="0x5A780"/>
+        <Texture Name="gMsgKanji9372Tex" OutName="msg_kanji_9372" Format="i4" Width="16" Height="16" Offset="0x5A800"/>
+        <Texture Name="gMsgKanji9373Tex" OutName="msg_kanji_9373" Format="i4" Width="16" Height="16" Offset="0x5A880"/>
+        <Texture Name="gMsgKanji9374Tex" OutName="msg_kanji_9374" Format="i4" Width="16" Height="16" Offset="0x5A900"/>
+        <Texture Name="gMsgKanji9375Tex" OutName="msg_kanji_9375" Format="i4" Width="16" Height="16" Offset="0x5A980"/>
+        <Texture Name="gMsgKanji9376Tex" OutName="msg_kanji_9376" Format="i4" Width="16" Height="16" Offset="0x5AA00"/>
+        <Texture Name="gMsgKanji9377Tex" OutName="msg_kanji_9377" Format="i4" Width="16" Height="16" Offset="0x5AA80"/>
+        <Texture Name="gMsgKanji9378Tex" OutName="msg_kanji_9378" Format="i4" Width="16" Height="16" Offset="0x5AB00"/>
+        <Texture Name="gMsgKanji9379Tex" OutName="msg_kanji_9379" Format="i4" Width="16" Height="16" Offset="0x5AB80"/>
+        <Texture Name="gMsgKanji937ATex" OutName="msg_kanji_937A" Format="i4" Width="16" Height="16" Offset="0x5AC00"/>
+        <Texture Name="gMsgKanji937BTex" OutName="msg_kanji_937B" Format="i4" Width="16" Height="16" Offset="0x5AC80"/>
+        <Texture Name="gMsgKanji937CTex" OutName="msg_kanji_937C" Format="i4" Width="16" Height="16" Offset="0x5AD00"/>
+        <Texture Name="gMsgKanji937DTex" OutName="msg_kanji_937D" Format="i4" Width="16" Height="16" Offset="0x5AD80"/>
+        <Texture Name="gMsgKanji937ETex" OutName="msg_kanji_937E" Format="i4" Width="16" Height="16" Offset="0x5AE00"/>
+        <Texture Name="gMsgKanji9380Tex" OutName="msg_kanji_9380" Format="i4" Width="16" Height="16" Offset="0x5AE80"/>
+        <Texture Name="gMsgKanji9381Tex" OutName="msg_kanji_9381" Format="i4" Width="16" Height="16" Offset="0x5AF00"/>
+        <Texture Name="gMsgKanji9382Tex" OutName="msg_kanji_9382" Format="i4" Width="16" Height="16" Offset="0x5AF80"/>
+        <Texture Name="gMsgKanji9383Tex" OutName="msg_kanji_9383" Format="i4" Width="16" Height="16" Offset="0x5B000"/>
+        <Texture Name="gMsgKanji9384Tex" OutName="msg_kanji_9384" Format="i4" Width="16" Height="16" Offset="0x5B080"/>
+        <Texture Name="gMsgKanji9385Tex" OutName="msg_kanji_9385" Format="i4" Width="16" Height="16" Offset="0x5B100"/>
+        <Texture Name="gMsgKanji9386Tex" OutName="msg_kanji_9386" Format="i4" Width="16" Height="16" Offset="0x5B180"/>
+        <Texture Name="gMsgKanji9387Tex" OutName="msg_kanji_9387" Format="i4" Width="16" Height="16" Offset="0x5B200"/>
+        <Texture Name="gMsgKanji9388Tex" OutName="msg_kanji_9388" Format="i4" Width="16" Height="16" Offset="0x5B280"/>
+        <Texture Name="gMsgKanji9389Tex" OutName="msg_kanji_9389" Format="i4" Width="16" Height="16" Offset="0x5B300"/>
+        <Texture Name="gMsgKanji938ATex" OutName="msg_kanji_938A" Format="i4" Width="16" Height="16" Offset="0x5B380"/>
+        <Texture Name="gMsgKanji938BTex" OutName="msg_kanji_938B" Format="i4" Width="16" Height="16" Offset="0x5B400"/>
+        <Texture Name="gMsgKanji938CTex" OutName="msg_kanji_938C" Format="i4" Width="16" Height="16" Offset="0x5B480"/>
+        <Texture Name="gMsgKanji938DTex" OutName="msg_kanji_938D" Format="i4" Width="16" Height="16" Offset="0x5B500"/>
+        <Texture Name="gMsgKanji938ETex" OutName="msg_kanji_938E" Format="i4" Width="16" Height="16" Offset="0x5B580"/>
+        <Texture Name="gMsgKanji938FTex" OutName="msg_kanji_938F" Format="i4" Width="16" Height="16" Offset="0x5B600"/>
+        <Texture Name="gMsgKanji9390Tex" OutName="msg_kanji_9390" Format="i4" Width="16" Height="16" Offset="0x5B680"/>
+        <Texture Name="gMsgKanji9391Tex" OutName="msg_kanji_9391" Format="i4" Width="16" Height="16" Offset="0x5B700"/>
+        <Texture Name="gMsgKanji9392Tex" OutName="msg_kanji_9392" Format="i4" Width="16" Height="16" Offset="0x5B780"/>
+        <Texture Name="gMsgKanji9393Tex" OutName="msg_kanji_9393" Format="i4" Width="16" Height="16" Offset="0x5B800"/>
+        <Texture Name="gMsgKanji9394Tex" OutName="msg_kanji_9394" Format="i4" Width="16" Height="16" Offset="0x5B880"/>
+        <Texture Name="gMsgKanji9395Tex" OutName="msg_kanji_9395" Format="i4" Width="16" Height="16" Offset="0x5B900"/>
+        <Texture Name="gMsgKanji9396Tex" OutName="msg_kanji_9396" Format="i4" Width="16" Height="16" Offset="0x5B980"/>
+        <Texture Name="gMsgKanji9397Tex" OutName="msg_kanji_9397" Format="i4" Width="16" Height="16" Offset="0x5BA00"/>
+        <Texture Name="gMsgKanji9398Tex" OutName="msg_kanji_9398" Format="i4" Width="16" Height="16" Offset="0x5BA80"/>
+        <Texture Name="gMsgKanji9399Tex" OutName="msg_kanji_9399" Format="i4" Width="16" Height="16" Offset="0x5BB00"/>
+        <Texture Name="gMsgKanji939ATex" OutName="msg_kanji_939A" Format="i4" Width="16" Height="16" Offset="0x5BB80"/>
+        <Texture Name="gMsgKanji939BTex" OutName="msg_kanji_939B" Format="i4" Width="16" Height="16" Offset="0x5BC00"/>
+        <Texture Name="gMsgKanji939CTex" OutName="msg_kanji_939C" Format="i4" Width="16" Height="16" Offset="0x5BC80"/>
+        <Texture Name="gMsgKanji939DTex" OutName="msg_kanji_939D" Format="i4" Width="16" Height="16" Offset="0x5BD00"/>
+        <Texture Name="gMsgKanji939ETex" OutName="msg_kanji_939E" Format="i4" Width="16" Height="16" Offset="0x5BD80"/>
+        <Texture Name="gMsgKanji939FTex" OutName="msg_kanji_939F" Format="i4" Width="16" Height="16" Offset="0x5BE00"/>
+        <Texture Name="gMsgKanji93A0Tex" OutName="msg_kanji_93A0" Format="i4" Width="16" Height="16" Offset="0x5BE80"/>
+        <Texture Name="gMsgKanji93A1Tex" OutName="msg_kanji_93A1" Format="i4" Width="16" Height="16" Offset="0x5BF00"/>
+        <Texture Name="gMsgKanji93A2Tex" OutName="msg_kanji_93A2" Format="i4" Width="16" Height="16" Offset="0x5BF80"/>
+        <Texture Name="gMsgKanji93A3Tex" OutName="msg_kanji_93A3" Format="i4" Width="16" Height="16" Offset="0x5C000"/>
+        <Texture Name="gMsgKanji93A4Tex" OutName="msg_kanji_93A4" Format="i4" Width="16" Height="16" Offset="0x5C080"/>
+        <Texture Name="gMsgKanji93A5Tex" OutName="msg_kanji_93A5" Format="i4" Width="16" Height="16" Offset="0x5C100"/>
+        <Texture Name="gMsgKanji93A6Tex" OutName="msg_kanji_93A6" Format="i4" Width="16" Height="16" Offset="0x5C180"/>
+        <Texture Name="gMsgKanji93A7Tex" OutName="msg_kanji_93A7" Format="i4" Width="16" Height="16" Offset="0x5C200"/>
+        <Texture Name="gMsgKanji93A8Tex" OutName="msg_kanji_93A8" Format="i4" Width="16" Height="16" Offset="0x5C280"/>
+        <Texture Name="gMsgKanji93A9Tex" OutName="msg_kanji_93A9" Format="i4" Width="16" Height="16" Offset="0x5C300"/>
+        <Texture Name="gMsgKanji93AATex" OutName="msg_kanji_93AA" Format="i4" Width="16" Height="16" Offset="0x5C380"/>
+        <Texture Name="gMsgKanji93ABTex" OutName="msg_kanji_93AB" Format="i4" Width="16" Height="16" Offset="0x5C400"/>
+        <Texture Name="gMsgKanji93ACTex" OutName="msg_kanji_93AC" Format="i4" Width="16" Height="16" Offset="0x5C480"/>
+        <Texture Name="gMsgKanji93ADTex" OutName="msg_kanji_93AD" Format="i4" Width="16" Height="16" Offset="0x5C500"/>
+        <Texture Name="gMsgKanji93AETex" OutName="msg_kanji_93AE" Format="i4" Width="16" Height="16" Offset="0x5C580"/>
+        <Texture Name="gMsgKanji93AFTex" OutName="msg_kanji_93AF" Format="i4" Width="16" Height="16" Offset="0x5C600"/>
+        <Texture Name="gMsgKanji93B0Tex" OutName="msg_kanji_93B0" Format="i4" Width="16" Height="16" Offset="0x5C680"/>
+        <Texture Name="gMsgKanji93B1Tex" OutName="msg_kanji_93B1" Format="i4" Width="16" Height="16" Offset="0x5C700"/>
+        <Texture Name="gMsgKanji93B2Tex" OutName="msg_kanji_93B2" Format="i4" Width="16" Height="16" Offset="0x5C780"/>
+        <Texture Name="gMsgKanji93B3Tex" OutName="msg_kanji_93B3" Format="i4" Width="16" Height="16" Offset="0x5C800"/>
+        <Texture Name="gMsgKanji93B4Tex" OutName="msg_kanji_93B4" Format="i4" Width="16" Height="16" Offset="0x5C880"/>
+        <Texture Name="gMsgKanji93B5Tex" OutName="msg_kanji_93B5" Format="i4" Width="16" Height="16" Offset="0x5C900"/>
+        <Texture Name="gMsgKanji93B6Tex" OutName="msg_kanji_93B6" Format="i4" Width="16" Height="16" Offset="0x5C980"/>
+        <Texture Name="gMsgKanji93B7Tex" OutName="msg_kanji_93B7" Format="i4" Width="16" Height="16" Offset="0x5CA00"/>
+        <Texture Name="gMsgKanji93B8Tex" OutName="msg_kanji_93B8" Format="i4" Width="16" Height="16" Offset="0x5CA80"/>
+        <Texture Name="gMsgKanji93B9Tex" OutName="msg_kanji_93B9" Format="i4" Width="16" Height="16" Offset="0x5CB00"/>
+        <Texture Name="gMsgKanji93BATex" OutName="msg_kanji_93BA" Format="i4" Width="16" Height="16" Offset="0x5CB80"/>
+        <Texture Name="gMsgKanji93BBTex" OutName="msg_kanji_93BB" Format="i4" Width="16" Height="16" Offset="0x5CC00"/>
+        <Texture Name="gMsgKanji93BCTex" OutName="msg_kanji_93BC" Format="i4" Width="16" Height="16" Offset="0x5CC80"/>
+        <Texture Name="gMsgKanji93BDTex" OutName="msg_kanji_93BD" Format="i4" Width="16" Height="16" Offset="0x5CD00"/>
+        <Texture Name="gMsgKanji93BETex" OutName="msg_kanji_93BE" Format="i4" Width="16" Height="16" Offset="0x5CD80"/>
+        <Texture Name="gMsgKanji93BFTex" OutName="msg_kanji_93BF" Format="i4" Width="16" Height="16" Offset="0x5CE00"/>
+        <Texture Name="gMsgKanji93C0Tex" OutName="msg_kanji_93C0" Format="i4" Width="16" Height="16" Offset="0x5CE80"/>
+        <Texture Name="gMsgKanji93C1Tex" OutName="msg_kanji_93C1" Format="i4" Width="16" Height="16" Offset="0x5CF00"/>
+        <Texture Name="gMsgKanji93C2Tex" OutName="msg_kanji_93C2" Format="i4" Width="16" Height="16" Offset="0x5CF80"/>
+        <Texture Name="gMsgKanji93C3Tex" OutName="msg_kanji_93C3" Format="i4" Width="16" Height="16" Offset="0x5D000"/>
+        <Texture Name="gMsgKanji93C4Tex" OutName="msg_kanji_93C4" Format="i4" Width="16" Height="16" Offset="0x5D080"/>
+        <Texture Name="gMsgKanji93C5Tex" OutName="msg_kanji_93C5" Format="i4" Width="16" Height="16" Offset="0x5D100"/>
+        <Texture Name="gMsgKanji93C6Tex" OutName="msg_kanji_93C6" Format="i4" Width="16" Height="16" Offset="0x5D180"/>
+        <Texture Name="gMsgKanji93C7Tex" OutName="msg_kanji_93C7" Format="i4" Width="16" Height="16" Offset="0x5D200"/>
+        <Texture Name="gMsgKanji93C8Tex" OutName="msg_kanji_93C8" Format="i4" Width="16" Height="16" Offset="0x5D280"/>
+        <Texture Name="gMsgKanji93C9Tex" OutName="msg_kanji_93C9" Format="i4" Width="16" Height="16" Offset="0x5D300"/>
+        <Texture Name="gMsgKanji93CATex" OutName="msg_kanji_93CA" Format="i4" Width="16" Height="16" Offset="0x5D380"/>
+        <Texture Name="gMsgKanji93CBTex" OutName="msg_kanji_93CB" Format="i4" Width="16" Height="16" Offset="0x5D400"/>
+        <Texture Name="gMsgKanji93CCTex" OutName="msg_kanji_93CC" Format="i4" Width="16" Height="16" Offset="0x5D480"/>
+        <Texture Name="gMsgKanji93CDTex" OutName="msg_kanji_93CD" Format="i4" Width="16" Height="16" Offset="0x5D500"/>
+        <Texture Name="gMsgKanji93CETex" OutName="msg_kanji_93CE" Format="i4" Width="16" Height="16" Offset="0x5D580"/>
+        <Texture Name="gMsgKanji93CFTex" OutName="msg_kanji_93CF" Format="i4" Width="16" Height="16" Offset="0x5D600"/>
+        <Texture Name="gMsgKanji93D0Tex" OutName="msg_kanji_93D0" Format="i4" Width="16" Height="16" Offset="0x5D680"/>
+        <Texture Name="gMsgKanji93D1Tex" OutName="msg_kanji_93D1" Format="i4" Width="16" Height="16" Offset="0x5D700"/>
+        <Texture Name="gMsgKanji93D2Tex" OutName="msg_kanji_93D2" Format="i4" Width="16" Height="16" Offset="0x5D780"/>
+        <Texture Name="gMsgKanji93D3Tex" OutName="msg_kanji_93D3" Format="i4" Width="16" Height="16" Offset="0x5D800"/>
+        <Texture Name="gMsgKanji93D4Tex" OutName="msg_kanji_93D4" Format="i4" Width="16" Height="16" Offset="0x5D880"/>
+        <Texture Name="gMsgKanji93D5Tex" OutName="msg_kanji_93D5" Format="i4" Width="16" Height="16" Offset="0x5D900"/>
+        <Texture Name="gMsgKanji93D6Tex" OutName="msg_kanji_93D6" Format="i4" Width="16" Height="16" Offset="0x5D980"/>
+        <Texture Name="gMsgKanji93D7Tex" OutName="msg_kanji_93D7" Format="i4" Width="16" Height="16" Offset="0x5DA00"/>
+        <Texture Name="gMsgKanji93D8Tex" OutName="msg_kanji_93D8" Format="i4" Width="16" Height="16" Offset="0x5DA80"/>
+        <Texture Name="gMsgKanji93D9Tex" OutName="msg_kanji_93D9" Format="i4" Width="16" Height="16" Offset="0x5DB00"/>
+        <Texture Name="gMsgKanji93DATex" OutName="msg_kanji_93DA" Format="i4" Width="16" Height="16" Offset="0x5DB80"/>
+        <Texture Name="gMsgKanji93DBTex" OutName="msg_kanji_93DB" Format="i4" Width="16" Height="16" Offset="0x5DC00"/>
+        <Texture Name="gMsgKanji93DCTex" OutName="msg_kanji_93DC" Format="i4" Width="16" Height="16" Offset="0x5DC80"/>
+        <Texture Name="gMsgKanji93DDTex" OutName="msg_kanji_93DD" Format="i4" Width="16" Height="16" Offset="0x5DD00"/>
+        <Texture Name="gMsgKanji93DETex" OutName="msg_kanji_93DE" Format="i4" Width="16" Height="16" Offset="0x5DD80"/>
+        <Texture Name="gMsgKanji93DFTex" OutName="msg_kanji_93DF" Format="i4" Width="16" Height="16" Offset="0x5DE00"/>
+        <Texture Name="gMsgKanji93E0Tex" OutName="msg_kanji_93E0" Format="i4" Width="16" Height="16" Offset="0x5DE80"/>
+        <Texture Name="gMsgKanji93E1Tex" OutName="msg_kanji_93E1" Format="i4" Width="16" Height="16" Offset="0x5DF00"/>
+        <Texture Name="gMsgKanji93E2Tex" OutName="msg_kanji_93E2" Format="i4" Width="16" Height="16" Offset="0x5DF80"/>
+        <Texture Name="gMsgKanji93E3Tex" OutName="msg_kanji_93E3" Format="i4" Width="16" Height="16" Offset="0x5E000"/>
+        <Texture Name="gMsgKanji93E4Tex" OutName="msg_kanji_93E4" Format="i4" Width="16" Height="16" Offset="0x5E080"/>
+        <Texture Name="gMsgKanji93E5Tex" OutName="msg_kanji_93E5" Format="i4" Width="16" Height="16" Offset="0x5E100"/>
+        <Texture Name="gMsgKanji93E6Tex" OutName="msg_kanji_93E6" Format="i4" Width="16" Height="16" Offset="0x5E180"/>
+        <Texture Name="gMsgKanji93E7Tex" OutName="msg_kanji_93E7" Format="i4" Width="16" Height="16" Offset="0x5E200"/>
+        <Texture Name="gMsgKanji93E8Tex" OutName="msg_kanji_93E8" Format="i4" Width="16" Height="16" Offset="0x5E280"/>
+        <Texture Name="gMsgKanji93E9Tex" OutName="msg_kanji_93E9" Format="i4" Width="16" Height="16" Offset="0x5E300"/>
+        <Texture Name="gMsgKanji93EATex" OutName="msg_kanji_93EA" Format="i4" Width="16" Height="16" Offset="0x5E380"/>
+        <Texture Name="gMsgKanji93EBTex" OutName="msg_kanji_93EB" Format="i4" Width="16" Height="16" Offset="0x5E400"/>
+        <Texture Name="gMsgKanji93ECTex" OutName="msg_kanji_93EC" Format="i4" Width="16" Height="16" Offset="0x5E480"/>
+        <Texture Name="gMsgKanji93EDTex" OutName="msg_kanji_93ED" Format="i4" Width="16" Height="16" Offset="0x5E500"/>
+        <Texture Name="gMsgKanji93EETex" OutName="msg_kanji_93EE" Format="i4" Width="16" Height="16" Offset="0x5E580"/>
+        <Texture Name="gMsgKanji93EFTex" OutName="msg_kanji_93EF" Format="i4" Width="16" Height="16" Offset="0x5E600"/>
+        <Texture Name="gMsgKanji93F0Tex" OutName="msg_kanji_93F0" Format="i4" Width="16" Height="16" Offset="0x5E680"/>
+        <Texture Name="gMsgKanji93F1Tex" OutName="msg_kanji_93F1" Format="i4" Width="16" Height="16" Offset="0x5E700"/>
+        <Texture Name="gMsgKanji93F2Tex" OutName="msg_kanji_93F2" Format="i4" Width="16" Height="16" Offset="0x5E780"/>
+        <Texture Name="gMsgKanji93F3Tex" OutName="msg_kanji_93F3" Format="i4" Width="16" Height="16" Offset="0x5E800"/>
+        <Texture Name="gMsgKanji93F4Tex" OutName="msg_kanji_93F4" Format="i4" Width="16" Height="16" Offset="0x5E880"/>
+        <Texture Name="gMsgKanji93F5Tex" OutName="msg_kanji_93F5" Format="i4" Width="16" Height="16" Offset="0x5E900"/>
+        <Texture Name="gMsgKanji93F6Tex" OutName="msg_kanji_93F6" Format="i4" Width="16" Height="16" Offset="0x5E980"/>
+        <Texture Name="gMsgKanji93F7Tex" OutName="msg_kanji_93F7" Format="i4" Width="16" Height="16" Offset="0x5EA00"/>
+        <Texture Name="gMsgKanji93F8Tex" OutName="msg_kanji_93F8" Format="i4" Width="16" Height="16" Offset="0x5EA80"/>
+        <Texture Name="gMsgKanji93F9Tex" OutName="msg_kanji_93F9" Format="i4" Width="16" Height="16" Offset="0x5EB00"/>
+        <Texture Name="gMsgKanji93FATex" OutName="msg_kanji_93FA" Format="i4" Width="16" Height="16" Offset="0x5EB80"/>
+        <Texture Name="gMsgKanji93FBTex" OutName="msg_kanji_93FB" Format="i4" Width="16" Height="16" Offset="0x5EC00"/>
+        <Texture Name="gMsgKanji93FCTex" OutName="msg_kanji_93FC" Format="i4" Width="16" Height="16" Offset="0x5EC80"/>
+        <Texture Name="gMsgKanji9440Tex" OutName="msg_kanji_9440" Format="i4" Width="16" Height="16" Offset="0x5ED00"/>
+        <Texture Name="gMsgKanji9441Tex" OutName="msg_kanji_9441" Format="i4" Width="16" Height="16" Offset="0x5ED80"/>
+        <Texture Name="gMsgKanji9442Tex" OutName="msg_kanji_9442" Format="i4" Width="16" Height="16" Offset="0x5EE00"/>
+        <Texture Name="gMsgKanji9443Tex" OutName="msg_kanji_9443" Format="i4" Width="16" Height="16" Offset="0x5EE80"/>
+        <Texture Name="gMsgKanji9444Tex" OutName="msg_kanji_9444" Format="i4" Width="16" Height="16" Offset="0x5EF00"/>
+        <Texture Name="gMsgKanji9445Tex" OutName="msg_kanji_9445" Format="i4" Width="16" Height="16" Offset="0x5EF80"/>
+        <Texture Name="gMsgKanji9446Tex" OutName="msg_kanji_9446" Format="i4" Width="16" Height="16" Offset="0x5F000"/>
+        <Texture Name="gMsgKanji9447Tex" OutName="msg_kanji_9447" Format="i4" Width="16" Height="16" Offset="0x5F080"/>
+        <Texture Name="gMsgKanji9448Tex" OutName="msg_kanji_9448" Format="i4" Width="16" Height="16" Offset="0x5F100"/>
+        <Texture Name="gMsgKanji9449Tex" OutName="msg_kanji_9449" Format="i4" Width="16" Height="16" Offset="0x5F180"/>
+        <Texture Name="gMsgKanji944ATex" OutName="msg_kanji_944A" Format="i4" Width="16" Height="16" Offset="0x5F200"/>
+        <Texture Name="gMsgKanji944BTex" OutName="msg_kanji_944B" Format="i4" Width="16" Height="16" Offset="0x5F280"/>
+        <Texture Name="gMsgKanji944CTex" OutName="msg_kanji_944C" Format="i4" Width="16" Height="16" Offset="0x5F300"/>
+        <Texture Name="gMsgKanji944DTex" OutName="msg_kanji_944D" Format="i4" Width="16" Height="16" Offset="0x5F380"/>
+        <Texture Name="gMsgKanji944ETex" OutName="msg_kanji_944E" Format="i4" Width="16" Height="16" Offset="0x5F400"/>
+        <Texture Name="gMsgKanji944FTex" OutName="msg_kanji_944F" Format="i4" Width="16" Height="16" Offset="0x5F480"/>
+        <Texture Name="gMsgKanji9450Tex" OutName="msg_kanji_9450" Format="i4" Width="16" Height="16" Offset="0x5F500"/>
+        <Texture Name="gMsgKanji9451Tex" OutName="msg_kanji_9451" Format="i4" Width="16" Height="16" Offset="0x5F580"/>
+        <Texture Name="gMsgKanji9452Tex" OutName="msg_kanji_9452" Format="i4" Width="16" Height="16" Offset="0x5F600"/>
+        <Texture Name="gMsgKanji9453Tex" OutName="msg_kanji_9453" Format="i4" Width="16" Height="16" Offset="0x5F680"/>
+        <Texture Name="gMsgKanji9454Tex" OutName="msg_kanji_9454" Format="i4" Width="16" Height="16" Offset="0x5F700"/>
+        <Texture Name="gMsgKanji9455Tex" OutName="msg_kanji_9455" Format="i4" Width="16" Height="16" Offset="0x5F780"/>
+        <Texture Name="gMsgKanji9456Tex" OutName="msg_kanji_9456" Format="i4" Width="16" Height="16" Offset="0x5F800"/>
+        <Texture Name="gMsgKanji9457Tex" OutName="msg_kanji_9457" Format="i4" Width="16" Height="16" Offset="0x5F880"/>
+        <Texture Name="gMsgKanji9458Tex" OutName="msg_kanji_9458" Format="i4" Width="16" Height="16" Offset="0x5F900"/>
+        <Texture Name="gMsgKanji9459Tex" OutName="msg_kanji_9459" Format="i4" Width="16" Height="16" Offset="0x5F980"/>
+        <Texture Name="gMsgKanji945ATex" OutName="msg_kanji_945A" Format="i4" Width="16" Height="16" Offset="0x5FA00"/>
+        <Texture Name="gMsgKanji945BTex" OutName="msg_kanji_945B" Format="i4" Width="16" Height="16" Offset="0x5FA80"/>
+        <Texture Name="gMsgKanji945CTex" OutName="msg_kanji_945C" Format="i4" Width="16" Height="16" Offset="0x5FB00"/>
+        <Texture Name="gMsgKanji945DTex" OutName="msg_kanji_945D" Format="i4" Width="16" Height="16" Offset="0x5FB80"/>
+        <Texture Name="gMsgKanji945ETex" OutName="msg_kanji_945E" Format="i4" Width="16" Height="16" Offset="0x5FC00"/>
+        <Texture Name="gMsgKanji945FTex" OutName="msg_kanji_945F" Format="i4" Width="16" Height="16" Offset="0x5FC80"/>
+        <Texture Name="gMsgKanji9460Tex" OutName="msg_kanji_9460" Format="i4" Width="16" Height="16" Offset="0x5FD00"/>
+        <Texture Name="gMsgKanji9461Tex" OutName="msg_kanji_9461" Format="i4" Width="16" Height="16" Offset="0x5FD80"/>
+        <Texture Name="gMsgKanji9462Tex" OutName="msg_kanji_9462" Format="i4" Width="16" Height="16" Offset="0x5FE00"/>
+        <Texture Name="gMsgKanji9463Tex" OutName="msg_kanji_9463" Format="i4" Width="16" Height="16" Offset="0x5FE80"/>
+        <Texture Name="gMsgKanji9464Tex" OutName="msg_kanji_9464" Format="i4" Width="16" Height="16" Offset="0x5FF00"/>
+        <Texture Name="gMsgKanji9465Tex" OutName="msg_kanji_9465" Format="i4" Width="16" Height="16" Offset="0x5FF80"/>
+        <Texture Name="gMsgKanji9466Tex" OutName="msg_kanji_9466" Format="i4" Width="16" Height="16" Offset="0x60000"/>
+        <Texture Name="gMsgKanji9467Tex" OutName="msg_kanji_9467" Format="i4" Width="16" Height="16" Offset="0x60080"/>
+        <Texture Name="gMsgKanji9468Tex" OutName="msg_kanji_9468" Format="i4" Width="16" Height="16" Offset="0x60100"/>
+        <Texture Name="gMsgKanji9469Tex" OutName="msg_kanji_9469" Format="i4" Width="16" Height="16" Offset="0x60180"/>
+        <Texture Name="gMsgKanji946ATex" OutName="msg_kanji_946A" Format="i4" Width="16" Height="16" Offset="0x60200"/>
+        <Texture Name="gMsgKanji946BTex" OutName="msg_kanji_946B" Format="i4" Width="16" Height="16" Offset="0x60280"/>
+        <Texture Name="gMsgKanji946CTex" OutName="msg_kanji_946C" Format="i4" Width="16" Height="16" Offset="0x60300"/>
+        <Texture Name="gMsgKanji946DTex" OutName="msg_kanji_946D" Format="i4" Width="16" Height="16" Offset="0x60380"/>
+        <Texture Name="gMsgKanji946ETex" OutName="msg_kanji_946E" Format="i4" Width="16" Height="16" Offset="0x60400"/>
+        <Texture Name="gMsgKanji946FTex" OutName="msg_kanji_946F" Format="i4" Width="16" Height="16" Offset="0x60480"/>
+        <Texture Name="gMsgKanji9470Tex" OutName="msg_kanji_9470" Format="i4" Width="16" Height="16" Offset="0x60500"/>
+        <Texture Name="gMsgKanji9471Tex" OutName="msg_kanji_9471" Format="i4" Width="16" Height="16" Offset="0x60580"/>
+        <Texture Name="gMsgKanji9472Tex" OutName="msg_kanji_9472" Format="i4" Width="16" Height="16" Offset="0x60600"/>
+        <Texture Name="gMsgKanji9473Tex" OutName="msg_kanji_9473" Format="i4" Width="16" Height="16" Offset="0x60680"/>
+        <Texture Name="gMsgKanji9474Tex" OutName="msg_kanji_9474" Format="i4" Width="16" Height="16" Offset="0x60700"/>
+        <Texture Name="gMsgKanji9475Tex" OutName="msg_kanji_9475" Format="i4" Width="16" Height="16" Offset="0x60780"/>
+        <Texture Name="gMsgKanji9476Tex" OutName="msg_kanji_9476" Format="i4" Width="16" Height="16" Offset="0x60800"/>
+        <Texture Name="gMsgKanji9477Tex" OutName="msg_kanji_9477" Format="i4" Width="16" Height="16" Offset="0x60880"/>
+        <Texture Name="gMsgKanji9478Tex" OutName="msg_kanji_9478" Format="i4" Width="16" Height="16" Offset="0x60900"/>
+        <Texture Name="gMsgKanji9479Tex" OutName="msg_kanji_9479" Format="i4" Width="16" Height="16" Offset="0x60980"/>
+        <Texture Name="gMsgKanji947ATex" OutName="msg_kanji_947A" Format="i4" Width="16" Height="16" Offset="0x60A00"/>
+        <Texture Name="gMsgKanji947BTex" OutName="msg_kanji_947B" Format="i4" Width="16" Height="16" Offset="0x60A80"/>
+        <Texture Name="gMsgKanji947CTex" OutName="msg_kanji_947C" Format="i4" Width="16" Height="16" Offset="0x60B00"/>
+        <Texture Name="gMsgKanji947DTex" OutName="msg_kanji_947D" Format="i4" Width="16" Height="16" Offset="0x60B80"/>
+        <Texture Name="gMsgKanji947ETex" OutName="msg_kanji_947E" Format="i4" Width="16" Height="16" Offset="0x60C00"/>
+        <Texture Name="gMsgKanji9480Tex" OutName="msg_kanji_9480" Format="i4" Width="16" Height="16" Offset="0x60C80"/>
+        <Texture Name="gMsgKanji9481Tex" OutName="msg_kanji_9481" Format="i4" Width="16" Height="16" Offset="0x60D00"/>
+        <Texture Name="gMsgKanji9482Tex" OutName="msg_kanji_9482" Format="i4" Width="16" Height="16" Offset="0x60D80"/>
+        <Texture Name="gMsgKanji9483Tex" OutName="msg_kanji_9483" Format="i4" Width="16" Height="16" Offset="0x60E00"/>
+        <Texture Name="gMsgKanji9484Tex" OutName="msg_kanji_9484" Format="i4" Width="16" Height="16" Offset="0x60E80"/>
+        <Texture Name="gMsgKanji9485Tex" OutName="msg_kanji_9485" Format="i4" Width="16" Height="16" Offset="0x60F00"/>
+        <Texture Name="gMsgKanji9486Tex" OutName="msg_kanji_9486" Format="i4" Width="16" Height="16" Offset="0x60F80"/>
+        <Texture Name="gMsgKanji9487Tex" OutName="msg_kanji_9487" Format="i4" Width="16" Height="16" Offset="0x61000"/>
+        <Texture Name="gMsgKanji9488Tex" OutName="msg_kanji_9488" Format="i4" Width="16" Height="16" Offset="0x61080"/>
+        <Texture Name="gMsgKanji9489Tex" OutName="msg_kanji_9489" Format="i4" Width="16" Height="16" Offset="0x61100"/>
+        <Texture Name="gMsgKanji948ATex" OutName="msg_kanji_948A" Format="i4" Width="16" Height="16" Offset="0x61180"/>
+        <Texture Name="gMsgKanji948BTex" OutName="msg_kanji_948B" Format="i4" Width="16" Height="16" Offset="0x61200"/>
+        <Texture Name="gMsgKanji948CTex" OutName="msg_kanji_948C" Format="i4" Width="16" Height="16" Offset="0x61280"/>
+        <Texture Name="gMsgKanji948DTex" OutName="msg_kanji_948D" Format="i4" Width="16" Height="16" Offset="0x61300"/>
+        <Texture Name="gMsgKanji948ETex" OutName="msg_kanji_948E" Format="i4" Width="16" Height="16" Offset="0x61380"/>
+        <Texture Name="gMsgKanji948FTex" OutName="msg_kanji_948F" Format="i4" Width="16" Height="16" Offset="0x61400"/>
+        <Texture Name="gMsgKanji9490Tex" OutName="msg_kanji_9490" Format="i4" Width="16" Height="16" Offset="0x61480"/>
+        <Texture Name="gMsgKanji9491Tex" OutName="msg_kanji_9491" Format="i4" Width="16" Height="16" Offset="0x61500"/>
+        <Texture Name="gMsgKanji9492Tex" OutName="msg_kanji_9492" Format="i4" Width="16" Height="16" Offset="0x61580"/>
+        <Texture Name="gMsgKanji9493Tex" OutName="msg_kanji_9493" Format="i4" Width="16" Height="16" Offset="0x61600"/>
+        <Texture Name="gMsgKanji9494Tex" OutName="msg_kanji_9494" Format="i4" Width="16" Height="16" Offset="0x61680"/>
+        <Texture Name="gMsgKanji9495Tex" OutName="msg_kanji_9495" Format="i4" Width="16" Height="16" Offset="0x61700"/>
+        <Texture Name="gMsgKanji9496Tex" OutName="msg_kanji_9496" Format="i4" Width="16" Height="16" Offset="0x61780"/>
+        <Texture Name="gMsgKanji9497Tex" OutName="msg_kanji_9497" Format="i4" Width="16" Height="16" Offset="0x61800"/>
+        <Texture Name="gMsgKanji9498Tex" OutName="msg_kanji_9498" Format="i4" Width="16" Height="16" Offset="0x61880"/>
+        <Texture Name="gMsgKanji9499Tex" OutName="msg_kanji_9499" Format="i4" Width="16" Height="16" Offset="0x61900"/>
+        <Texture Name="gMsgKanji949ATex" OutName="msg_kanji_949A" Format="i4" Width="16" Height="16" Offset="0x61980"/>
+        <Texture Name="gMsgKanji949BTex" OutName="msg_kanji_949B" Format="i4" Width="16" Height="16" Offset="0x61A00"/>
+        <Texture Name="gMsgKanji949CTex" OutName="msg_kanji_949C" Format="i4" Width="16" Height="16" Offset="0x61A80"/>
+        <Texture Name="gMsgKanji949DTex" OutName="msg_kanji_949D" Format="i4" Width="16" Height="16" Offset="0x61B00"/>
+        <Texture Name="gMsgKanji949ETex" OutName="msg_kanji_949E" Format="i4" Width="16" Height="16" Offset="0x61B80"/>
+        <Texture Name="gMsgKanji949FTex" OutName="msg_kanji_949F" Format="i4" Width="16" Height="16" Offset="0x61C00"/>
+        <Texture Name="gMsgKanji94A0Tex" OutName="msg_kanji_94A0" Format="i4" Width="16" Height="16" Offset="0x61C80"/>
+        <Texture Name="gMsgKanji94A1Tex" OutName="msg_kanji_94A1" Format="i4" Width="16" Height="16" Offset="0x61D00"/>
+        <Texture Name="gMsgKanji94A2Tex" OutName="msg_kanji_94A2" Format="i4" Width="16" Height="16" Offset="0x61D80"/>
+        <Texture Name="gMsgKanji94A3Tex" OutName="msg_kanji_94A3" Format="i4" Width="16" Height="16" Offset="0x61E00"/>
+        <Texture Name="gMsgKanji94A4Tex" OutName="msg_kanji_94A4" Format="i4" Width="16" Height="16" Offset="0x61E80"/>
+        <Texture Name="gMsgKanji94A5Tex" OutName="msg_kanji_94A5" Format="i4" Width="16" Height="16" Offset="0x61F00"/>
+        <Texture Name="gMsgKanji94A6Tex" OutName="msg_kanji_94A6" Format="i4" Width="16" Height="16" Offset="0x61F80"/>
+        <Texture Name="gMsgKanji94A7Tex" OutName="msg_kanji_94A7" Format="i4" Width="16" Height="16" Offset="0x62000"/>
+        <Texture Name="gMsgKanji94A8Tex" OutName="msg_kanji_94A8" Format="i4" Width="16" Height="16" Offset="0x62080"/>
+        <Texture Name="gMsgKanji94A9Tex" OutName="msg_kanji_94A9" Format="i4" Width="16" Height="16" Offset="0x62100"/>
+        <Texture Name="gMsgKanji94AATex" OutName="msg_kanji_94AA" Format="i4" Width="16" Height="16" Offset="0x62180"/>
+        <Texture Name="gMsgKanji94ABTex" OutName="msg_kanji_94AB" Format="i4" Width="16" Height="16" Offset="0x62200"/>
+        <Texture Name="gMsgKanji94ACTex" OutName="msg_kanji_94AC" Format="i4" Width="16" Height="16" Offset="0x62280"/>
+        <Texture Name="gMsgKanji94ADTex" OutName="msg_kanji_94AD" Format="i4" Width="16" Height="16" Offset="0x62300"/>
+        <Texture Name="gMsgKanji94AETex" OutName="msg_kanji_94AE" Format="i4" Width="16" Height="16" Offset="0x62380"/>
+        <Texture Name="gMsgKanji94AFTex" OutName="msg_kanji_94AF" Format="i4" Width="16" Height="16" Offset="0x62400"/>
+        <Texture Name="gMsgKanji94B0Tex" OutName="msg_kanji_94B0" Format="i4" Width="16" Height="16" Offset="0x62480"/>
+        <Texture Name="gMsgKanji94B1Tex" OutName="msg_kanji_94B1" Format="i4" Width="16" Height="16" Offset="0x62500"/>
+        <Texture Name="gMsgKanji94B2Tex" OutName="msg_kanji_94B2" Format="i4" Width="16" Height="16" Offset="0x62580"/>
+        <Texture Name="gMsgKanji94B3Tex" OutName="msg_kanji_94B3" Format="i4" Width="16" Height="16" Offset="0x62600"/>
+        <Texture Name="gMsgKanji94B4Tex" OutName="msg_kanji_94B4" Format="i4" Width="16" Height="16" Offset="0x62680"/>
+        <Texture Name="gMsgKanji94B5Tex" OutName="msg_kanji_94B5" Format="i4" Width="16" Height="16" Offset="0x62700"/>
+        <Texture Name="gMsgKanji94B6Tex" OutName="msg_kanji_94B6" Format="i4" Width="16" Height="16" Offset="0x62780"/>
+        <Texture Name="gMsgKanji94B7Tex" OutName="msg_kanji_94B7" Format="i4" Width="16" Height="16" Offset="0x62800"/>
+        <Texture Name="gMsgKanji94B8Tex" OutName="msg_kanji_94B8" Format="i4" Width="16" Height="16" Offset="0x62880"/>
+        <Texture Name="gMsgKanji94B9Tex" OutName="msg_kanji_94B9" Format="i4" Width="16" Height="16" Offset="0x62900"/>
+        <Texture Name="gMsgKanji94BATex" OutName="msg_kanji_94BA" Format="i4" Width="16" Height="16" Offset="0x62980"/>
+        <Texture Name="gMsgKanji94BBTex" OutName="msg_kanji_94BB" Format="i4" Width="16" Height="16" Offset="0x62A00"/>
+        <Texture Name="gMsgKanji94BCTex" OutName="msg_kanji_94BC" Format="i4" Width="16" Height="16" Offset="0x62A80"/>
+        <Texture Name="gMsgKanji94BDTex" OutName="msg_kanji_94BD" Format="i4" Width="16" Height="16" Offset="0x62B00"/>
+        <Texture Name="gMsgKanji94BETex" OutName="msg_kanji_94BE" Format="i4" Width="16" Height="16" Offset="0x62B80"/>
+        <Texture Name="gMsgKanji94BFTex" OutName="msg_kanji_94BF" Format="i4" Width="16" Height="16" Offset="0x62C00"/>
+        <Texture Name="gMsgKanji94C0Tex" OutName="msg_kanji_94C0" Format="i4" Width="16" Height="16" Offset="0x62C80"/>
+        <Texture Name="gMsgKanji94C1Tex" OutName="msg_kanji_94C1" Format="i4" Width="16" Height="16" Offset="0x62D00"/>
+        <Texture Name="gMsgKanji94C2Tex" OutName="msg_kanji_94C2" Format="i4" Width="16" Height="16" Offset="0x62D80"/>
+        <Texture Name="gMsgKanji94C3Tex" OutName="msg_kanji_94C3" Format="i4" Width="16" Height="16" Offset="0x62E00"/>
+        <Texture Name="gMsgKanji94C4Tex" OutName="msg_kanji_94C4" Format="i4" Width="16" Height="16" Offset="0x62E80"/>
+        <Texture Name="gMsgKanji94C5Tex" OutName="msg_kanji_94C5" Format="i4" Width="16" Height="16" Offset="0x62F00"/>
+        <Texture Name="gMsgKanji94C6Tex" OutName="msg_kanji_94C6" Format="i4" Width="16" Height="16" Offset="0x62F80"/>
+        <Texture Name="gMsgKanji94C7Tex" OutName="msg_kanji_94C7" Format="i4" Width="16" Height="16" Offset="0x63000"/>
+        <Texture Name="gMsgKanji94C8Tex" OutName="msg_kanji_94C8" Format="i4" Width="16" Height="16" Offset="0x63080"/>
+        <Texture Name="gMsgKanji94C9Tex" OutName="msg_kanji_94C9" Format="i4" Width="16" Height="16" Offset="0x63100"/>
+        <Texture Name="gMsgKanji94CATex" OutName="msg_kanji_94CA" Format="i4" Width="16" Height="16" Offset="0x63180"/>
+        <Texture Name="gMsgKanji94CBTex" OutName="msg_kanji_94CB" Format="i4" Width="16" Height="16" Offset="0x63200"/>
+        <Texture Name="gMsgKanji94CCTex" OutName="msg_kanji_94CC" Format="i4" Width="16" Height="16" Offset="0x63280"/>
+        <Texture Name="gMsgKanji94CDTex" OutName="msg_kanji_94CD" Format="i4" Width="16" Height="16" Offset="0x63300"/>
+        <Texture Name="gMsgKanji94CETex" OutName="msg_kanji_94CE" Format="i4" Width="16" Height="16" Offset="0x63380"/>
+        <Texture Name="gMsgKanji94CFTex" OutName="msg_kanji_94CF" Format="i4" Width="16" Height="16" Offset="0x63400"/>
+        <Texture Name="gMsgKanji94D0Tex" OutName="msg_kanji_94D0" Format="i4" Width="16" Height="16" Offset="0x63480"/>
+        <Texture Name="gMsgKanji94D1Tex" OutName="msg_kanji_94D1" Format="i4" Width="16" Height="16" Offset="0x63500"/>
+        <Texture Name="gMsgKanji94D2Tex" OutName="msg_kanji_94D2" Format="i4" Width="16" Height="16" Offset="0x63580"/>
+        <Texture Name="gMsgKanji94D3Tex" OutName="msg_kanji_94D3" Format="i4" Width="16" Height="16" Offset="0x63600"/>
+        <Texture Name="gMsgKanji94D4Tex" OutName="msg_kanji_94D4" Format="i4" Width="16" Height="16" Offset="0x63680"/>
+        <Texture Name="gMsgKanji94D5Tex" OutName="msg_kanji_94D5" Format="i4" Width="16" Height="16" Offset="0x63700"/>
+        <Texture Name="gMsgKanji94D6Tex" OutName="msg_kanji_94D6" Format="i4" Width="16" Height="16" Offset="0x63780"/>
+        <Texture Name="gMsgKanji94D7Tex" OutName="msg_kanji_94D7" Format="i4" Width="16" Height="16" Offset="0x63800"/>
+        <Texture Name="gMsgKanji94D8Tex" OutName="msg_kanji_94D8" Format="i4" Width="16" Height="16" Offset="0x63880"/>
+        <Texture Name="gMsgKanji94D9Tex" OutName="msg_kanji_94D9" Format="i4" Width="16" Height="16" Offset="0x63900"/>
+        <Texture Name="gMsgKanji94DATex" OutName="msg_kanji_94DA" Format="i4" Width="16" Height="16" Offset="0x63980"/>
+        <Texture Name="gMsgKanji94DBTex" OutName="msg_kanji_94DB" Format="i4" Width="16" Height="16" Offset="0x63A00"/>
+        <Texture Name="gMsgKanji94DCTex" OutName="msg_kanji_94DC" Format="i4" Width="16" Height="16" Offset="0x63A80"/>
+        <Texture Name="gMsgKanji94DDTex" OutName="msg_kanji_94DD" Format="i4" Width="16" Height="16" Offset="0x63B00"/>
+        <Texture Name="gMsgKanji94DETex" OutName="msg_kanji_94DE" Format="i4" Width="16" Height="16" Offset="0x63B80"/>
+        <Texture Name="gMsgKanji94DFTex" OutName="msg_kanji_94DF" Format="i4" Width="16" Height="16" Offset="0x63C00"/>
+        <Texture Name="gMsgKanji94E0Tex" OutName="msg_kanji_94E0" Format="i4" Width="16" Height="16" Offset="0x63C80"/>
+        <Texture Name="gMsgKanji94E1Tex" OutName="msg_kanji_94E1" Format="i4" Width="16" Height="16" Offset="0x63D00"/>
+        <Texture Name="gMsgKanji94E2Tex" OutName="msg_kanji_94E2" Format="i4" Width="16" Height="16" Offset="0x63D80"/>
+        <Texture Name="gMsgKanji94E3Tex" OutName="msg_kanji_94E3" Format="i4" Width="16" Height="16" Offset="0x63E00"/>
+        <Texture Name="gMsgKanji94E4Tex" OutName="msg_kanji_94E4" Format="i4" Width="16" Height="16" Offset="0x63E80"/>
+        <Texture Name="gMsgKanji94E5Tex" OutName="msg_kanji_94E5" Format="i4" Width="16" Height="16" Offset="0x63F00"/>
+        <Texture Name="gMsgKanji94E6Tex" OutName="msg_kanji_94E6" Format="i4" Width="16" Height="16" Offset="0x63F80"/>
+        <Texture Name="gMsgKanji94E7Tex" OutName="msg_kanji_94E7" Format="i4" Width="16" Height="16" Offset="0x64000"/>
+        <Texture Name="gMsgKanji94E8Tex" OutName="msg_kanji_94E8" Format="i4" Width="16" Height="16" Offset="0x64080"/>
+        <Texture Name="gMsgKanji94E9Tex" OutName="msg_kanji_94E9" Format="i4" Width="16" Height="16" Offset="0x64100"/>
+        <Texture Name="gMsgKanji94EATex" OutName="msg_kanji_94EA" Format="i4" Width="16" Height="16" Offset="0x64180"/>
+        <Texture Name="gMsgKanji94EBTex" OutName="msg_kanji_94EB" Format="i4" Width="16" Height="16" Offset="0x64200"/>
+        <Texture Name="gMsgKanji94ECTex" OutName="msg_kanji_94EC" Format="i4" Width="16" Height="16" Offset="0x64280"/>
+        <Texture Name="gMsgKanji94EDTex" OutName="msg_kanji_94ED" Format="i4" Width="16" Height="16" Offset="0x64300"/>
+        <Texture Name="gMsgKanji94EETex" OutName="msg_kanji_94EE" Format="i4" Width="16" Height="16" Offset="0x64380"/>
+        <Texture Name="gMsgKanji94EFTex" OutName="msg_kanji_94EF" Format="i4" Width="16" Height="16" Offset="0x64400"/>
+        <Texture Name="gMsgKanji94F0Tex" OutName="msg_kanji_94F0" Format="i4" Width="16" Height="16" Offset="0x64480"/>
+        <Texture Name="gMsgKanji94F1Tex" OutName="msg_kanji_94F1" Format="i4" Width="16" Height="16" Offset="0x64500"/>
+        <Texture Name="gMsgKanji94F2Tex" OutName="msg_kanji_94F2" Format="i4" Width="16" Height="16" Offset="0x64580"/>
+        <Texture Name="gMsgKanji94F3Tex" OutName="msg_kanji_94F3" Format="i4" Width="16" Height="16" Offset="0x64600"/>
+        <Texture Name="gMsgKanji94F4Tex" OutName="msg_kanji_94F4" Format="i4" Width="16" Height="16" Offset="0x64680"/>
+        <Texture Name="gMsgKanji94F5Tex" OutName="msg_kanji_94F5" Format="i4" Width="16" Height="16" Offset="0x64700"/>
+        <Texture Name="gMsgKanji94F6Tex" OutName="msg_kanji_94F6" Format="i4" Width="16" Height="16" Offset="0x64780"/>
+        <Texture Name="gMsgKanji94F7Tex" OutName="msg_kanji_94F7" Format="i4" Width="16" Height="16" Offset="0x64800"/>
+        <Texture Name="gMsgKanji94F8Tex" OutName="msg_kanji_94F8" Format="i4" Width="16" Height="16" Offset="0x64880"/>
+        <Texture Name="gMsgKanji94F9Tex" OutName="msg_kanji_94F9" Format="i4" Width="16" Height="16" Offset="0x64900"/>
+        <Texture Name="gMsgKanji94FATex" OutName="msg_kanji_94FA" Format="i4" Width="16" Height="16" Offset="0x64980"/>
+        <Texture Name="gMsgKanji94FBTex" OutName="msg_kanji_94FB" Format="i4" Width="16" Height="16" Offset="0x64A00"/>
+        <Texture Name="gMsgKanji94FCTex" OutName="msg_kanji_94FC" Format="i4" Width="16" Height="16" Offset="0x64A80"/>
+        <Texture Name="gMsgKanji9540Tex" OutName="msg_kanji_9540" Format="i4" Width="16" Height="16" Offset="0x64B00"/>
+        <Texture Name="gMsgKanji9541Tex" OutName="msg_kanji_9541" Format="i4" Width="16" Height="16" Offset="0x64B80"/>
+        <Texture Name="gMsgKanji9542Tex" OutName="msg_kanji_9542" Format="i4" Width="16" Height="16" Offset="0x64C00"/>
+        <Texture Name="gMsgKanji9543Tex" OutName="msg_kanji_9543" Format="i4" Width="16" Height="16" Offset="0x64C80"/>
+        <Texture Name="gMsgKanji9544Tex" OutName="msg_kanji_9544" Format="i4" Width="16" Height="16" Offset="0x64D00"/>
+        <Texture Name="gMsgKanji9545Tex" OutName="msg_kanji_9545" Format="i4" Width="16" Height="16" Offset="0x64D80"/>
+        <Texture Name="gMsgKanji9546Tex" OutName="msg_kanji_9546" Format="i4" Width="16" Height="16" Offset="0x64E00"/>
+        <Texture Name="gMsgKanji9547Tex" OutName="msg_kanji_9547" Format="i4" Width="16" Height="16" Offset="0x64E80"/>
+        <Texture Name="gMsgKanji9548Tex" OutName="msg_kanji_9548" Format="i4" Width="16" Height="16" Offset="0x64F00"/>
+        <Texture Name="gMsgKanji9549Tex" OutName="msg_kanji_9549" Format="i4" Width="16" Height="16" Offset="0x64F80"/>
+        <Texture Name="gMsgKanji954ATex" OutName="msg_kanji_954A" Format="i4" Width="16" Height="16" Offset="0x65000"/>
+        <Texture Name="gMsgKanji954BTex" OutName="msg_kanji_954B" Format="i4" Width="16" Height="16" Offset="0x65080"/>
+        <Texture Name="gMsgKanji954CTex" OutName="msg_kanji_954C" Format="i4" Width="16" Height="16" Offset="0x65100"/>
+        <Texture Name="gMsgKanji954DTex" OutName="msg_kanji_954D" Format="i4" Width="16" Height="16" Offset="0x65180"/>
+        <Texture Name="gMsgKanji954ETex" OutName="msg_kanji_954E" Format="i4" Width="16" Height="16" Offset="0x65200"/>
+        <Texture Name="gMsgKanji954FTex" OutName="msg_kanji_954F" Format="i4" Width="16" Height="16" Offset="0x65280"/>
+        <Texture Name="gMsgKanji9550Tex" OutName="msg_kanji_9550" Format="i4" Width="16" Height="16" Offset="0x65300"/>
+        <Texture Name="gMsgKanji9551Tex" OutName="msg_kanji_9551" Format="i4" Width="16" Height="16" Offset="0x65380"/>
+        <Texture Name="gMsgKanji9552Tex" OutName="msg_kanji_9552" Format="i4" Width="16" Height="16" Offset="0x65400"/>
+        <Texture Name="gMsgKanji9553Tex" OutName="msg_kanji_9553" Format="i4" Width="16" Height="16" Offset="0x65480"/>
+        <Texture Name="gMsgKanji9554Tex" OutName="msg_kanji_9554" Format="i4" Width="16" Height="16" Offset="0x65500"/>
+        <Texture Name="gMsgKanji9555Tex" OutName="msg_kanji_9555" Format="i4" Width="16" Height="16" Offset="0x65580"/>
+        <Texture Name="gMsgKanji9556Tex" OutName="msg_kanji_9556" Format="i4" Width="16" Height="16" Offset="0x65600"/>
+        <Texture Name="gMsgKanji9557Tex" OutName="msg_kanji_9557" Format="i4" Width="16" Height="16" Offset="0x65680"/>
+        <Texture Name="gMsgKanji9558Tex" OutName="msg_kanji_9558" Format="i4" Width="16" Height="16" Offset="0x65700"/>
+        <Texture Name="gMsgKanji9559Tex" OutName="msg_kanji_9559" Format="i4" Width="16" Height="16" Offset="0x65780"/>
+        <Texture Name="gMsgKanji955ATex" OutName="msg_kanji_955A" Format="i4" Width="16" Height="16" Offset="0x65800"/>
+        <Texture Name="gMsgKanji955BTex" OutName="msg_kanji_955B" Format="i4" Width="16" Height="16" Offset="0x65880"/>
+        <Texture Name="gMsgKanji955CTex" OutName="msg_kanji_955C" Format="i4" Width="16" Height="16" Offset="0x65900"/>
+        <Texture Name="gMsgKanji955DTex" OutName="msg_kanji_955D" Format="i4" Width="16" Height="16" Offset="0x65980"/>
+        <Texture Name="gMsgKanji955ETex" OutName="msg_kanji_955E" Format="i4" Width="16" Height="16" Offset="0x65A00"/>
+        <Texture Name="gMsgKanji955FTex" OutName="msg_kanji_955F" Format="i4" Width="16" Height="16" Offset="0x65A80"/>
+        <Texture Name="gMsgKanji9560Tex" OutName="msg_kanji_9560" Format="i4" Width="16" Height="16" Offset="0x65B00"/>
+        <Texture Name="gMsgKanji9561Tex" OutName="msg_kanji_9561" Format="i4" Width="16" Height="16" Offset="0x65B80"/>
+        <Texture Name="gMsgKanji9562Tex" OutName="msg_kanji_9562" Format="i4" Width="16" Height="16" Offset="0x65C00"/>
+        <Texture Name="gMsgKanji9563Tex" OutName="msg_kanji_9563" Format="i4" Width="16" Height="16" Offset="0x65C80"/>
+        <Texture Name="gMsgKanji9564Tex" OutName="msg_kanji_9564" Format="i4" Width="16" Height="16" Offset="0x65D00"/>
+        <Texture Name="gMsgKanji9565Tex" OutName="msg_kanji_9565" Format="i4" Width="16" Height="16" Offset="0x65D80"/>
+        <Texture Name="gMsgKanji9566Tex" OutName="msg_kanji_9566" Format="i4" Width="16" Height="16" Offset="0x65E00"/>
+        <Texture Name="gMsgKanji9567Tex" OutName="msg_kanji_9567" Format="i4" Width="16" Height="16" Offset="0x65E80"/>
+        <Texture Name="gMsgKanji9568Tex" OutName="msg_kanji_9568" Format="i4" Width="16" Height="16" Offset="0x65F00"/>
+        <Texture Name="gMsgKanji9569Tex" OutName="msg_kanji_9569" Format="i4" Width="16" Height="16" Offset="0x65F80"/>
+        <Texture Name="gMsgKanji956ATex" OutName="msg_kanji_956A" Format="i4" Width="16" Height="16" Offset="0x66000"/>
+        <Texture Name="gMsgKanji956BTex" OutName="msg_kanji_956B" Format="i4" Width="16" Height="16" Offset="0x66080"/>
+        <Texture Name="gMsgKanji956CTex" OutName="msg_kanji_956C" Format="i4" Width="16" Height="16" Offset="0x66100"/>
+        <Texture Name="gMsgKanji956DTex" OutName="msg_kanji_956D" Format="i4" Width="16" Height="16" Offset="0x66180"/>
+        <Texture Name="gMsgKanji956ETex" OutName="msg_kanji_956E" Format="i4" Width="16" Height="16" Offset="0x66200"/>
+        <Texture Name="gMsgKanji956FTex" OutName="msg_kanji_956F" Format="i4" Width="16" Height="16" Offset="0x66280"/>
+        <Texture Name="gMsgKanji9570Tex" OutName="msg_kanji_9570" Format="i4" Width="16" Height="16" Offset="0x66300"/>
+        <Texture Name="gMsgKanji9571Tex" OutName="msg_kanji_9571" Format="i4" Width="16" Height="16" Offset="0x66380"/>
+        <Texture Name="gMsgKanji9572Tex" OutName="msg_kanji_9572" Format="i4" Width="16" Height="16" Offset="0x66400"/>
+        <Texture Name="gMsgKanji9573Tex" OutName="msg_kanji_9573" Format="i4" Width="16" Height="16" Offset="0x66480"/>
+        <Texture Name="gMsgKanji9574Tex" OutName="msg_kanji_9574" Format="i4" Width="16" Height="16" Offset="0x66500"/>
+        <Texture Name="gMsgKanji9575Tex" OutName="msg_kanji_9575" Format="i4" Width="16" Height="16" Offset="0x66580"/>
+        <Texture Name="gMsgKanji9576Tex" OutName="msg_kanji_9576" Format="i4" Width="16" Height="16" Offset="0x66600"/>
+        <Texture Name="gMsgKanji9577Tex" OutName="msg_kanji_9577" Format="i4" Width="16" Height="16" Offset="0x66680"/>
+        <Texture Name="gMsgKanji9578Tex" OutName="msg_kanji_9578" Format="i4" Width="16" Height="16" Offset="0x66700"/>
+        <Texture Name="gMsgKanji9579Tex" OutName="msg_kanji_9579" Format="i4" Width="16" Height="16" Offset="0x66780"/>
+        <Texture Name="gMsgKanji957ATex" OutName="msg_kanji_957A" Format="i4" Width="16" Height="16" Offset="0x66800"/>
+        <Texture Name="gMsgKanji957BTex" OutName="msg_kanji_957B" Format="i4" Width="16" Height="16" Offset="0x66880"/>
+        <Texture Name="gMsgKanji957CTex" OutName="msg_kanji_957C" Format="i4" Width="16" Height="16" Offset="0x66900"/>
+        <Texture Name="gMsgKanji957DTex" OutName="msg_kanji_957D" Format="i4" Width="16" Height="16" Offset="0x66980"/>
+        <Texture Name="gMsgKanji957ETex" OutName="msg_kanji_957E" Format="i4" Width="16" Height="16" Offset="0x66A00"/>
+        <Texture Name="gMsgKanji9580Tex" OutName="msg_kanji_9580" Format="i4" Width="16" Height="16" Offset="0x66A80"/>
+        <Texture Name="gMsgKanji9581Tex" OutName="msg_kanji_9581" Format="i4" Width="16" Height="16" Offset="0x66B00"/>
+        <Texture Name="gMsgKanji9582Tex" OutName="msg_kanji_9582" Format="i4" Width="16" Height="16" Offset="0x66B80"/>
+        <Texture Name="gMsgKanji9583Tex" OutName="msg_kanji_9583" Format="i4" Width="16" Height="16" Offset="0x66C00"/>
+        <Texture Name="gMsgKanji9584Tex" OutName="msg_kanji_9584" Format="i4" Width="16" Height="16" Offset="0x66C80"/>
+        <Texture Name="gMsgKanji9585Tex" OutName="msg_kanji_9585" Format="i4" Width="16" Height="16" Offset="0x66D00"/>
+        <Texture Name="gMsgKanji9586Tex" OutName="msg_kanji_9586" Format="i4" Width="16" Height="16" Offset="0x66D80"/>
+        <Texture Name="gMsgKanji9587Tex" OutName="msg_kanji_9587" Format="i4" Width="16" Height="16" Offset="0x66E00"/>
+        <Texture Name="gMsgKanji9588Tex" OutName="msg_kanji_9588" Format="i4" Width="16" Height="16" Offset="0x66E80"/>
+        <Texture Name="gMsgKanji9589Tex" OutName="msg_kanji_9589" Format="i4" Width="16" Height="16" Offset="0x66F00"/>
+        <Texture Name="gMsgKanji958ATex" OutName="msg_kanji_958A" Format="i4" Width="16" Height="16" Offset="0x66F80"/>
+        <Texture Name="gMsgKanji958BTex" OutName="msg_kanji_958B" Format="i4" Width="16" Height="16" Offset="0x67000"/>
+        <Texture Name="gMsgKanji958CTex" OutName="msg_kanji_958C" Format="i4" Width="16" Height="16" Offset="0x67080"/>
+        <Texture Name="gMsgKanji958DTex" OutName="msg_kanji_958D" Format="i4" Width="16" Height="16" Offset="0x67100"/>
+        <Texture Name="gMsgKanji958ETex" OutName="msg_kanji_958E" Format="i4" Width="16" Height="16" Offset="0x67180"/>
+        <Texture Name="gMsgKanji958FTex" OutName="msg_kanji_958F" Format="i4" Width="16" Height="16" Offset="0x67200"/>
+        <Texture Name="gMsgKanji9590Tex" OutName="msg_kanji_9590" Format="i4" Width="16" Height="16" Offset="0x67280"/>
+        <Texture Name="gMsgKanji9591Tex" OutName="msg_kanji_9591" Format="i4" Width="16" Height="16" Offset="0x67300"/>
+        <Texture Name="gMsgKanji9592Tex" OutName="msg_kanji_9592" Format="i4" Width="16" Height="16" Offset="0x67380"/>
+        <Texture Name="gMsgKanji9593Tex" OutName="msg_kanji_9593" Format="i4" Width="16" Height="16" Offset="0x67400"/>
+        <Texture Name="gMsgKanji9594Tex" OutName="msg_kanji_9594" Format="i4" Width="16" Height="16" Offset="0x67480"/>
+        <Texture Name="gMsgKanji9595Tex" OutName="msg_kanji_9595" Format="i4" Width="16" Height="16" Offset="0x67500"/>
+        <Texture Name="gMsgKanji9596Tex" OutName="msg_kanji_9596" Format="i4" Width="16" Height="16" Offset="0x67580"/>
+        <Texture Name="gMsgKanji9597Tex" OutName="msg_kanji_9597" Format="i4" Width="16" Height="16" Offset="0x67600"/>
+        <Texture Name="gMsgKanji9598Tex" OutName="msg_kanji_9598" Format="i4" Width="16" Height="16" Offset="0x67680"/>
+        <Texture Name="gMsgKanji9599Tex" OutName="msg_kanji_9599" Format="i4" Width="16" Height="16" Offset="0x67700"/>
+        <Texture Name="gMsgKanji959ATex" OutName="msg_kanji_959A" Format="i4" Width="16" Height="16" Offset="0x67780"/>
+        <Texture Name="gMsgKanji959BTex" OutName="msg_kanji_959B" Format="i4" Width="16" Height="16" Offset="0x67800"/>
+        <Texture Name="gMsgKanji959CTex" OutName="msg_kanji_959C" Format="i4" Width="16" Height="16" Offset="0x67880"/>
+        <Texture Name="gMsgKanji959DTex" OutName="msg_kanji_959D" Format="i4" Width="16" Height="16" Offset="0x67900"/>
+        <Texture Name="gMsgKanji959ETex" OutName="msg_kanji_959E" Format="i4" Width="16" Height="16" Offset="0x67980"/>
+        <Texture Name="gMsgKanji959FTex" OutName="msg_kanji_959F" Format="i4" Width="16" Height="16" Offset="0x67A00"/>
+        <Texture Name="gMsgKanji95A0Tex" OutName="msg_kanji_95A0" Format="i4" Width="16" Height="16" Offset="0x67A80"/>
+        <Texture Name="gMsgKanji95A1Tex" OutName="msg_kanji_95A1" Format="i4" Width="16" Height="16" Offset="0x67B00"/>
+        <Texture Name="gMsgKanji95A2Tex" OutName="msg_kanji_95A2" Format="i4" Width="16" Height="16" Offset="0x67B80"/>
+        <Texture Name="gMsgKanji95A3Tex" OutName="msg_kanji_95A3" Format="i4" Width="16" Height="16" Offset="0x67C00"/>
+        <Texture Name="gMsgKanji95A4Tex" OutName="msg_kanji_95A4" Format="i4" Width="16" Height="16" Offset="0x67C80"/>
+        <Texture Name="gMsgKanji95A5Tex" OutName="msg_kanji_95A5" Format="i4" Width="16" Height="16" Offset="0x67D00"/>
+        <Texture Name="gMsgKanji95A6Tex" OutName="msg_kanji_95A6" Format="i4" Width="16" Height="16" Offset="0x67D80"/>
+        <Texture Name="gMsgKanji95A7Tex" OutName="msg_kanji_95A7" Format="i4" Width="16" Height="16" Offset="0x67E00"/>
+        <Texture Name="gMsgKanji95A8Tex" OutName="msg_kanji_95A8" Format="i4" Width="16" Height="16" Offset="0x67E80"/>
+        <Texture Name="gMsgKanji95A9Tex" OutName="msg_kanji_95A9" Format="i4" Width="16" Height="16" Offset="0x67F00"/>
+        <Texture Name="gMsgKanji95AATex" OutName="msg_kanji_95AA" Format="i4" Width="16" Height="16" Offset="0x67F80"/>
+        <Texture Name="gMsgKanji95ABTex" OutName="msg_kanji_95AB" Format="i4" Width="16" Height="16" Offset="0x68000"/>
+        <Texture Name="gMsgKanji95ACTex" OutName="msg_kanji_95AC" Format="i4" Width="16" Height="16" Offset="0x68080"/>
+        <Texture Name="gMsgKanji95ADTex" OutName="msg_kanji_95AD" Format="i4" Width="16" Height="16" Offset="0x68100"/>
+        <Texture Name="gMsgKanji95AETex" OutName="msg_kanji_95AE" Format="i4" Width="16" Height="16" Offset="0x68180"/>
+        <Texture Name="gMsgKanji95AFTex" OutName="msg_kanji_95AF" Format="i4" Width="16" Height="16" Offset="0x68200"/>
+        <Texture Name="gMsgKanji95B0Tex" OutName="msg_kanji_95B0" Format="i4" Width="16" Height="16" Offset="0x68280"/>
+        <Texture Name="gMsgKanji95B1Tex" OutName="msg_kanji_95B1" Format="i4" Width="16" Height="16" Offset="0x68300"/>
+        <Texture Name="gMsgKanji95B2Tex" OutName="msg_kanji_95B2" Format="i4" Width="16" Height="16" Offset="0x68380"/>
+        <Texture Name="gMsgKanji95B3Tex" OutName="msg_kanji_95B3" Format="i4" Width="16" Height="16" Offset="0x68400"/>
+        <Texture Name="gMsgKanji95B4Tex" OutName="msg_kanji_95B4" Format="i4" Width="16" Height="16" Offset="0x68480"/>
+        <Texture Name="gMsgKanji95B5Tex" OutName="msg_kanji_95B5" Format="i4" Width="16" Height="16" Offset="0x68500"/>
+        <Texture Name="gMsgKanji95B6Tex" OutName="msg_kanji_95B6" Format="i4" Width="16" Height="16" Offset="0x68580"/>
+        <Texture Name="gMsgKanji95B7Tex" OutName="msg_kanji_95B7" Format="i4" Width="16" Height="16" Offset="0x68600"/>
+        <Texture Name="gMsgKanji95B8Tex" OutName="msg_kanji_95B8" Format="i4" Width="16" Height="16" Offset="0x68680"/>
+        <Texture Name="gMsgKanji95B9Tex" OutName="msg_kanji_95B9" Format="i4" Width="16" Height="16" Offset="0x68700"/>
+        <Texture Name="gMsgKanji95BATex" OutName="msg_kanji_95BA" Format="i4" Width="16" Height="16" Offset="0x68780"/>
+        <Texture Name="gMsgKanji95BBTex" OutName="msg_kanji_95BB" Format="i4" Width="16" Height="16" Offset="0x68800"/>
+        <Texture Name="gMsgKanji95BCTex" OutName="msg_kanji_95BC" Format="i4" Width="16" Height="16" Offset="0x68880"/>
+        <Texture Name="gMsgKanji95BDTex" OutName="msg_kanji_95BD" Format="i4" Width="16" Height="16" Offset="0x68900"/>
+        <Texture Name="gMsgKanji95BETex" OutName="msg_kanji_95BE" Format="i4" Width="16" Height="16" Offset="0x68980"/>
+        <Texture Name="gMsgKanji95BFTex" OutName="msg_kanji_95BF" Format="i4" Width="16" Height="16" Offset="0x68A00"/>
+        <Texture Name="gMsgKanji95C0Tex" OutName="msg_kanji_95C0" Format="i4" Width="16" Height="16" Offset="0x68A80"/>
+        <Texture Name="gMsgKanji95C1Tex" OutName="msg_kanji_95C1" Format="i4" Width="16" Height="16" Offset="0x68B00"/>
+        <Texture Name="gMsgKanji95C2Tex" OutName="msg_kanji_95C2" Format="i4" Width="16" Height="16" Offset="0x68B80"/>
+        <Texture Name="gMsgKanji95C3Tex" OutName="msg_kanji_95C3" Format="i4" Width="16" Height="16" Offset="0x68C00"/>
+        <Texture Name="gMsgKanji95C4Tex" OutName="msg_kanji_95C4" Format="i4" Width="16" Height="16" Offset="0x68C80"/>
+        <Texture Name="gMsgKanji95C5Tex" OutName="msg_kanji_95C5" Format="i4" Width="16" Height="16" Offset="0x68D00"/>
+        <Texture Name="gMsgKanji95C6Tex" OutName="msg_kanji_95C6" Format="i4" Width="16" Height="16" Offset="0x68D80"/>
+        <Texture Name="gMsgKanji95C7Tex" OutName="msg_kanji_95C7" Format="i4" Width="16" Height="16" Offset="0x68E00"/>
+        <Texture Name="gMsgKanji95C8Tex" OutName="msg_kanji_95C8" Format="i4" Width="16" Height="16" Offset="0x68E80"/>
+        <Texture Name="gMsgKanji95C9Tex" OutName="msg_kanji_95C9" Format="i4" Width="16" Height="16" Offset="0x68F00"/>
+        <Texture Name="gMsgKanji95CATex" OutName="msg_kanji_95CA" Format="i4" Width="16" Height="16" Offset="0x68F80"/>
+        <Texture Name="gMsgKanji95CBTex" OutName="msg_kanji_95CB" Format="i4" Width="16" Height="16" Offset="0x69000"/>
+        <Texture Name="gMsgKanji95CCTex" OutName="msg_kanji_95CC" Format="i4" Width="16" Height="16" Offset="0x69080"/>
+        <Texture Name="gMsgKanji95CDTex" OutName="msg_kanji_95CD" Format="i4" Width="16" Height="16" Offset="0x69100"/>
+        <Texture Name="gMsgKanji95CETex" OutName="msg_kanji_95CE" Format="i4" Width="16" Height="16" Offset="0x69180"/>
+        <Texture Name="gMsgKanji95CFTex" OutName="msg_kanji_95CF" Format="i4" Width="16" Height="16" Offset="0x69200"/>
+        <Texture Name="gMsgKanji95D0Tex" OutName="msg_kanji_95D0" Format="i4" Width="16" Height="16" Offset="0x69280"/>
+        <Texture Name="gMsgKanji95D1Tex" OutName="msg_kanji_95D1" Format="i4" Width="16" Height="16" Offset="0x69300"/>
+        <Texture Name="gMsgKanji95D2Tex" OutName="msg_kanji_95D2" Format="i4" Width="16" Height="16" Offset="0x69380"/>
+        <Texture Name="gMsgKanji95D3Tex" OutName="msg_kanji_95D3" Format="i4" Width="16" Height="16" Offset="0x69400"/>
+        <Texture Name="gMsgKanji95D4Tex" OutName="msg_kanji_95D4" Format="i4" Width="16" Height="16" Offset="0x69480"/>
+        <Texture Name="gMsgKanji95D5Tex" OutName="msg_kanji_95D5" Format="i4" Width="16" Height="16" Offset="0x69500"/>
+        <Texture Name="gMsgKanji95D6Tex" OutName="msg_kanji_95D6" Format="i4" Width="16" Height="16" Offset="0x69580"/>
+        <Texture Name="gMsgKanji95D7Tex" OutName="msg_kanji_95D7" Format="i4" Width="16" Height="16" Offset="0x69600"/>
+        <Texture Name="gMsgKanji95D8Tex" OutName="msg_kanji_95D8" Format="i4" Width="16" Height="16" Offset="0x69680"/>
+        <Texture Name="gMsgKanji95D9Tex" OutName="msg_kanji_95D9" Format="i4" Width="16" Height="16" Offset="0x69700"/>
+        <Texture Name="gMsgKanji95DATex" OutName="msg_kanji_95DA" Format="i4" Width="16" Height="16" Offset="0x69780"/>
+        <Texture Name="gMsgKanji95DBTex" OutName="msg_kanji_95DB" Format="i4" Width="16" Height="16" Offset="0x69800"/>
+        <Texture Name="gMsgKanji95DCTex" OutName="msg_kanji_95DC" Format="i4" Width="16" Height="16" Offset="0x69880"/>
+        <Texture Name="gMsgKanji95DDTex" OutName="msg_kanji_95DD" Format="i4" Width="16" Height="16" Offset="0x69900"/>
+        <Texture Name="gMsgKanji95DETex" OutName="msg_kanji_95DE" Format="i4" Width="16" Height="16" Offset="0x69980"/>
+        <Texture Name="gMsgKanji95DFTex" OutName="msg_kanji_95DF" Format="i4" Width="16" Height="16" Offset="0x69A00"/>
+        <Texture Name="gMsgKanji95E0Tex" OutName="msg_kanji_95E0" Format="i4" Width="16" Height="16" Offset="0x69A80"/>
+        <Texture Name="gMsgKanji95E1Tex" OutName="msg_kanji_95E1" Format="i4" Width="16" Height="16" Offset="0x69B00"/>
+        <Texture Name="gMsgKanji95E2Tex" OutName="msg_kanji_95E2" Format="i4" Width="16" Height="16" Offset="0x69B80"/>
+        <Texture Name="gMsgKanji95E3Tex" OutName="msg_kanji_95E3" Format="i4" Width="16" Height="16" Offset="0x69C00"/>
+        <Texture Name="gMsgKanji95E4Tex" OutName="msg_kanji_95E4" Format="i4" Width="16" Height="16" Offset="0x69C80"/>
+        <Texture Name="gMsgKanji95E5Tex" OutName="msg_kanji_95E5" Format="i4" Width="16" Height="16" Offset="0x69D00"/>
+        <Texture Name="gMsgKanji95E6Tex" OutName="msg_kanji_95E6" Format="i4" Width="16" Height="16" Offset="0x69D80"/>
+        <Texture Name="gMsgKanji95E7Tex" OutName="msg_kanji_95E7" Format="i4" Width="16" Height="16" Offset="0x69E00"/>
+        <Texture Name="gMsgKanji95E8Tex" OutName="msg_kanji_95E8" Format="i4" Width="16" Height="16" Offset="0x69E80"/>
+        <Texture Name="gMsgKanji95E9Tex" OutName="msg_kanji_95E9" Format="i4" Width="16" Height="16" Offset="0x69F00"/>
+        <Texture Name="gMsgKanji95EATex" OutName="msg_kanji_95EA" Format="i4" Width="16" Height="16" Offset="0x69F80"/>
+        <Texture Name="gMsgKanji95EBTex" OutName="msg_kanji_95EB" Format="i4" Width="16" Height="16" Offset="0x6A000"/>
+        <Texture Name="gMsgKanji95ECTex" OutName="msg_kanji_95EC" Format="i4" Width="16" Height="16" Offset="0x6A080"/>
+        <Texture Name="gMsgKanji95EDTex" OutName="msg_kanji_95ED" Format="i4" Width="16" Height="16" Offset="0x6A100"/>
+        <Texture Name="gMsgKanji95EETex" OutName="msg_kanji_95EE" Format="i4" Width="16" Height="16" Offset="0x6A180"/>
+        <Texture Name="gMsgKanji95EFTex" OutName="msg_kanji_95EF" Format="i4" Width="16" Height="16" Offset="0x6A200"/>
+        <Texture Name="gMsgKanji95F0Tex" OutName="msg_kanji_95F0" Format="i4" Width="16" Height="16" Offset="0x6A280"/>
+        <Texture Name="gMsgKanji95F1Tex" OutName="msg_kanji_95F1" Format="i4" Width="16" Height="16" Offset="0x6A300"/>
+        <Texture Name="gMsgKanji95F2Tex" OutName="msg_kanji_95F2" Format="i4" Width="16" Height="16" Offset="0x6A380"/>
+        <Texture Name="gMsgKanji95F3Tex" OutName="msg_kanji_95F3" Format="i4" Width="16" Height="16" Offset="0x6A400"/>
+        <Texture Name="gMsgKanji95F4Tex" OutName="msg_kanji_95F4" Format="i4" Width="16" Height="16" Offset="0x6A480"/>
+        <Texture Name="gMsgKanji95F5Tex" OutName="msg_kanji_95F5" Format="i4" Width="16" Height="16" Offset="0x6A500"/>
+        <Texture Name="gMsgKanji95F6Tex" OutName="msg_kanji_95F6" Format="i4" Width="16" Height="16" Offset="0x6A580"/>
+        <Texture Name="gMsgKanji95F7Tex" OutName="msg_kanji_95F7" Format="i4" Width="16" Height="16" Offset="0x6A600"/>
+        <Texture Name="gMsgKanji95F8Tex" OutName="msg_kanji_95F8" Format="i4" Width="16" Height="16" Offset="0x6A680"/>
+        <Texture Name="gMsgKanji95F9Tex" OutName="msg_kanji_95F9" Format="i4" Width="16" Height="16" Offset="0x6A700"/>
+        <Texture Name="gMsgKanji95FATex" OutName="msg_kanji_95FA" Format="i4" Width="16" Height="16" Offset="0x6A780"/>
+        <Texture Name="gMsgKanji95FBTex" OutName="msg_kanji_95FB" Format="i4" Width="16" Height="16" Offset="0x6A800"/>
+        <Texture Name="gMsgKanji95FCTex" OutName="msg_kanji_95FC" Format="i4" Width="16" Height="16" Offset="0x6A880"/>
+        <Texture Name="gMsgKanji9640Tex" OutName="msg_kanji_9640" Format="i4" Width="16" Height="16" Offset="0x6A900"/>
+        <Texture Name="gMsgKanji9641Tex" OutName="msg_kanji_9641" Format="i4" Width="16" Height="16" Offset="0x6A980"/>
+        <Texture Name="gMsgKanji9642Tex" OutName="msg_kanji_9642" Format="i4" Width="16" Height="16" Offset="0x6AA00"/>
+        <Texture Name="gMsgKanji9643Tex" OutName="msg_kanji_9643" Format="i4" Width="16" Height="16" Offset="0x6AA80"/>
+        <Texture Name="gMsgKanji9644Tex" OutName="msg_kanji_9644" Format="i4" Width="16" Height="16" Offset="0x6AB00"/>
+        <Texture Name="gMsgKanji9645Tex" OutName="msg_kanji_9645" Format="i4" Width="16" Height="16" Offset="0x6AB80"/>
+        <Texture Name="gMsgKanji9646Tex" OutName="msg_kanji_9646" Format="i4" Width="16" Height="16" Offset="0x6AC00"/>
+        <Texture Name="gMsgKanji9647Tex" OutName="msg_kanji_9647" Format="i4" Width="16" Height="16" Offset="0x6AC80"/>
+        <Texture Name="gMsgKanji9648Tex" OutName="msg_kanji_9648" Format="i4" Width="16" Height="16" Offset="0x6AD00"/>
+        <Texture Name="gMsgKanji9649Tex" OutName="msg_kanji_9649" Format="i4" Width="16" Height="16" Offset="0x6AD80"/>
+        <Texture Name="gMsgKanji964ATex" OutName="msg_kanji_964A" Format="i4" Width="16" Height="16" Offset="0x6AE00"/>
+        <Texture Name="gMsgKanji964BTex" OutName="msg_kanji_964B" Format="i4" Width="16" Height="16" Offset="0x6AE80"/>
+        <Texture Name="gMsgKanji964CTex" OutName="msg_kanji_964C" Format="i4" Width="16" Height="16" Offset="0x6AF00"/>
+        <Texture Name="gMsgKanji964DTex" OutName="msg_kanji_964D" Format="i4" Width="16" Height="16" Offset="0x6AF80"/>
+        <Texture Name="gMsgKanji964ETex" OutName="msg_kanji_964E" Format="i4" Width="16" Height="16" Offset="0x6B000"/>
+        <Texture Name="gMsgKanji964FTex" OutName="msg_kanji_964F" Format="i4" Width="16" Height="16" Offset="0x6B080"/>
+        <Texture Name="gMsgKanji9650Tex" OutName="msg_kanji_9650" Format="i4" Width="16" Height="16" Offset="0x6B100"/>
+        <Texture Name="gMsgKanji9651Tex" OutName="msg_kanji_9651" Format="i4" Width="16" Height="16" Offset="0x6B180"/>
+        <Texture Name="gMsgKanji9652Tex" OutName="msg_kanji_9652" Format="i4" Width="16" Height="16" Offset="0x6B200"/>
+        <Texture Name="gMsgKanji9653Tex" OutName="msg_kanji_9653" Format="i4" Width="16" Height="16" Offset="0x6B280"/>
+        <Texture Name="gMsgKanji9654Tex" OutName="msg_kanji_9654" Format="i4" Width="16" Height="16" Offset="0x6B300"/>
+        <Texture Name="gMsgKanji9655Tex" OutName="msg_kanji_9655" Format="i4" Width="16" Height="16" Offset="0x6B380"/>
+        <Texture Name="gMsgKanji9656Tex" OutName="msg_kanji_9656" Format="i4" Width="16" Height="16" Offset="0x6B400"/>
+        <Texture Name="gMsgKanji9657Tex" OutName="msg_kanji_9657" Format="i4" Width="16" Height="16" Offset="0x6B480"/>
+        <Texture Name="gMsgKanji9658Tex" OutName="msg_kanji_9658" Format="i4" Width="16" Height="16" Offset="0x6B500"/>
+        <Texture Name="gMsgKanji9659Tex" OutName="msg_kanji_9659" Format="i4" Width="16" Height="16" Offset="0x6B580"/>
+        <Texture Name="gMsgKanji965ATex" OutName="msg_kanji_965A" Format="i4" Width="16" Height="16" Offset="0x6B600"/>
+        <Texture Name="gMsgKanji965BTex" OutName="msg_kanji_965B" Format="i4" Width="16" Height="16" Offset="0x6B680"/>
+        <Texture Name="gMsgKanji965CTex" OutName="msg_kanji_965C" Format="i4" Width="16" Height="16" Offset="0x6B700"/>
+        <Texture Name="gMsgKanji965DTex" OutName="msg_kanji_965D" Format="i4" Width="16" Height="16" Offset="0x6B780"/>
+        <Texture Name="gMsgKanji965ETex" OutName="msg_kanji_965E" Format="i4" Width="16" Height="16" Offset="0x6B800"/>
+        <Texture Name="gMsgKanji965FTex" OutName="msg_kanji_965F" Format="i4" Width="16" Height="16" Offset="0x6B880"/>
+        <Texture Name="gMsgKanji9660Tex" OutName="msg_kanji_9660" Format="i4" Width="16" Height="16" Offset="0x6B900"/>
+        <Texture Name="gMsgKanji9661Tex" OutName="msg_kanji_9661" Format="i4" Width="16" Height="16" Offset="0x6B980"/>
+        <Texture Name="gMsgKanji9662Tex" OutName="msg_kanji_9662" Format="i4" Width="16" Height="16" Offset="0x6BA00"/>
+        <Texture Name="gMsgKanji9663Tex" OutName="msg_kanji_9663" Format="i4" Width="16" Height="16" Offset="0x6BA80"/>
+        <Texture Name="gMsgKanji9664Tex" OutName="msg_kanji_9664" Format="i4" Width="16" Height="16" Offset="0x6BB00"/>
+        <Texture Name="gMsgKanji9665Tex" OutName="msg_kanji_9665" Format="i4" Width="16" Height="16" Offset="0x6BB80"/>
+        <Texture Name="gMsgKanji9666Tex" OutName="msg_kanji_9666" Format="i4" Width="16" Height="16" Offset="0x6BC00"/>
+        <Texture Name="gMsgKanji9667Tex" OutName="msg_kanji_9667" Format="i4" Width="16" Height="16" Offset="0x6BC80"/>
+        <Texture Name="gMsgKanji9668Tex" OutName="msg_kanji_9668" Format="i4" Width="16" Height="16" Offset="0x6BD00"/>
+        <Texture Name="gMsgKanji9669Tex" OutName="msg_kanji_9669" Format="i4" Width="16" Height="16" Offset="0x6BD80"/>
+        <Texture Name="gMsgKanji966ATex" OutName="msg_kanji_966A" Format="i4" Width="16" Height="16" Offset="0x6BE00"/>
+        <Texture Name="gMsgKanji966BTex" OutName="msg_kanji_966B" Format="i4" Width="16" Height="16" Offset="0x6BE80"/>
+        <Texture Name="gMsgKanji966CTex" OutName="msg_kanji_966C" Format="i4" Width="16" Height="16" Offset="0x6BF00"/>
+        <Texture Name="gMsgKanji966DTex" OutName="msg_kanji_966D" Format="i4" Width="16" Height="16" Offset="0x6BF80"/>
+        <Texture Name="gMsgKanji966ETex" OutName="msg_kanji_966E" Format="i4" Width="16" Height="16" Offset="0x6C000"/>
+        <Texture Name="gMsgKanji966FTex" OutName="msg_kanji_966F" Format="i4" Width="16" Height="16" Offset="0x6C080"/>
+        <Texture Name="gMsgKanji9670Tex" OutName="msg_kanji_9670" Format="i4" Width="16" Height="16" Offset="0x6C100"/>
+        <Texture Name="gMsgKanji9671Tex" OutName="msg_kanji_9671" Format="i4" Width="16" Height="16" Offset="0x6C180"/>
+        <Texture Name="gMsgKanji9672Tex" OutName="msg_kanji_9672" Format="i4" Width="16" Height="16" Offset="0x6C200"/>
+        <Texture Name="gMsgKanji9673Tex" OutName="msg_kanji_9673" Format="i4" Width="16" Height="16" Offset="0x6C280"/>
+        <Texture Name="gMsgKanji9674Tex" OutName="msg_kanji_9674" Format="i4" Width="16" Height="16" Offset="0x6C300"/>
+        <Texture Name="gMsgKanji9675Tex" OutName="msg_kanji_9675" Format="i4" Width="16" Height="16" Offset="0x6C380"/>
+        <Texture Name="gMsgKanji9676Tex" OutName="msg_kanji_9676" Format="i4" Width="16" Height="16" Offset="0x6C400"/>
+        <Texture Name="gMsgKanji9677Tex" OutName="msg_kanji_9677" Format="i4" Width="16" Height="16" Offset="0x6C480"/>
+        <Texture Name="gMsgKanji9678Tex" OutName="msg_kanji_9678" Format="i4" Width="16" Height="16" Offset="0x6C500"/>
+        <Texture Name="gMsgKanji9679Tex" OutName="msg_kanji_9679" Format="i4" Width="16" Height="16" Offset="0x6C580"/>
+        <Texture Name="gMsgKanji967ATex" OutName="msg_kanji_967A" Format="i4" Width="16" Height="16" Offset="0x6C600"/>
+        <Texture Name="gMsgKanji967BTex" OutName="msg_kanji_967B" Format="i4" Width="16" Height="16" Offset="0x6C680"/>
+        <Texture Name="gMsgKanji967CTex" OutName="msg_kanji_967C" Format="i4" Width="16" Height="16" Offset="0x6C700"/>
+        <Texture Name="gMsgKanji967DTex" OutName="msg_kanji_967D" Format="i4" Width="16" Height="16" Offset="0x6C780"/>
+        <Texture Name="gMsgKanji967ETex" OutName="msg_kanji_967E" Format="i4" Width="16" Height="16" Offset="0x6C800"/>
+        <Texture Name="gMsgKanji9680Tex" OutName="msg_kanji_9680" Format="i4" Width="16" Height="16" Offset="0x6C880"/>
+        <Texture Name="gMsgKanji9681Tex" OutName="msg_kanji_9681" Format="i4" Width="16" Height="16" Offset="0x6C900"/>
+        <Texture Name="gMsgKanji9682Tex" OutName="msg_kanji_9682" Format="i4" Width="16" Height="16" Offset="0x6C980"/>
+        <Texture Name="gMsgKanji9683Tex" OutName="msg_kanji_9683" Format="i4" Width="16" Height="16" Offset="0x6CA00"/>
+        <Texture Name="gMsgKanji9684Tex" OutName="msg_kanji_9684" Format="i4" Width="16" Height="16" Offset="0x6CA80"/>
+        <Texture Name="gMsgKanji9685Tex" OutName="msg_kanji_9685" Format="i4" Width="16" Height="16" Offset="0x6CB00"/>
+        <Texture Name="gMsgKanji9686Tex" OutName="msg_kanji_9686" Format="i4" Width="16" Height="16" Offset="0x6CB80"/>
+        <Texture Name="gMsgKanji9687Tex" OutName="msg_kanji_9687" Format="i4" Width="16" Height="16" Offset="0x6CC00"/>
+        <Texture Name="gMsgKanji9688Tex" OutName="msg_kanji_9688" Format="i4" Width="16" Height="16" Offset="0x6CC80"/>
+        <Texture Name="gMsgKanji9689Tex" OutName="msg_kanji_9689" Format="i4" Width="16" Height="16" Offset="0x6CD00"/>
+        <Texture Name="gMsgKanji968ATex" OutName="msg_kanji_968A" Format="i4" Width="16" Height="16" Offset="0x6CD80"/>
+        <Texture Name="gMsgKanji968BTex" OutName="msg_kanji_968B" Format="i4" Width="16" Height="16" Offset="0x6CE00"/>
+        <Texture Name="gMsgKanji968CTex" OutName="msg_kanji_968C" Format="i4" Width="16" Height="16" Offset="0x6CE80"/>
+        <Texture Name="gMsgKanji968DTex" OutName="msg_kanji_968D" Format="i4" Width="16" Height="16" Offset="0x6CF00"/>
+        <Texture Name="gMsgKanji968ETex" OutName="msg_kanji_968E" Format="i4" Width="16" Height="16" Offset="0x6CF80"/>
+        <Texture Name="gMsgKanji968FTex" OutName="msg_kanji_968F" Format="i4" Width="16" Height="16" Offset="0x6D000"/>
+        <Texture Name="gMsgKanji9690Tex" OutName="msg_kanji_9690" Format="i4" Width="16" Height="16" Offset="0x6D080"/>
+        <Texture Name="gMsgKanji9691Tex" OutName="msg_kanji_9691" Format="i4" Width="16" Height="16" Offset="0x6D100"/>
+        <Texture Name="gMsgKanji9692Tex" OutName="msg_kanji_9692" Format="i4" Width="16" Height="16" Offset="0x6D180"/>
+        <Texture Name="gMsgKanji9693Tex" OutName="msg_kanji_9693" Format="i4" Width="16" Height="16" Offset="0x6D200"/>
+        <Texture Name="gMsgKanji9694Tex" OutName="msg_kanji_9694" Format="i4" Width="16" Height="16" Offset="0x6D280"/>
+        <Texture Name="gMsgKanji9695Tex" OutName="msg_kanji_9695" Format="i4" Width="16" Height="16" Offset="0x6D300"/>
+        <Texture Name="gMsgKanji9696Tex" OutName="msg_kanji_9696" Format="i4" Width="16" Height="16" Offset="0x6D380"/>
+        <Texture Name="gMsgKanji9697Tex" OutName="msg_kanji_9697" Format="i4" Width="16" Height="16" Offset="0x6D400"/>
+        <Texture Name="gMsgKanji9698Tex" OutName="msg_kanji_9698" Format="i4" Width="16" Height="16" Offset="0x6D480"/>
+        <Texture Name="gMsgKanji9699Tex" OutName="msg_kanji_9699" Format="i4" Width="16" Height="16" Offset="0x6D500"/>
+        <Texture Name="gMsgKanji969ATex" OutName="msg_kanji_969A" Format="i4" Width="16" Height="16" Offset="0x6D580"/>
+        <Texture Name="gMsgKanji969BTex" OutName="msg_kanji_969B" Format="i4" Width="16" Height="16" Offset="0x6D600"/>
+        <Texture Name="gMsgKanji969CTex" OutName="msg_kanji_969C" Format="i4" Width="16" Height="16" Offset="0x6D680"/>
+        <Texture Name="gMsgKanji969DTex" OutName="msg_kanji_969D" Format="i4" Width="16" Height="16" Offset="0x6D700"/>
+        <Texture Name="gMsgKanji969ETex" OutName="msg_kanji_969E" Format="i4" Width="16" Height="16" Offset="0x6D780"/>
+        <Texture Name="gMsgKanji969FTex" OutName="msg_kanji_969F" Format="i4" Width="16" Height="16" Offset="0x6D800"/>
+        <Texture Name="gMsgKanji96A0Tex" OutName="msg_kanji_96A0" Format="i4" Width="16" Height="16" Offset="0x6D880"/>
+        <Texture Name="gMsgKanji96A1Tex" OutName="msg_kanji_96A1" Format="i4" Width="16" Height="16" Offset="0x6D900"/>
+        <Texture Name="gMsgKanji96A2Tex" OutName="msg_kanji_96A2" Format="i4" Width="16" Height="16" Offset="0x6D980"/>
+        <Texture Name="gMsgKanji96A3Tex" OutName="msg_kanji_96A3" Format="i4" Width="16" Height="16" Offset="0x6DA00"/>
+        <Texture Name="gMsgKanji96A4Tex" OutName="msg_kanji_96A4" Format="i4" Width="16" Height="16" Offset="0x6DA80"/>
+        <Texture Name="gMsgKanji96A5Tex" OutName="msg_kanji_96A5" Format="i4" Width="16" Height="16" Offset="0x6DB00"/>
+        <Texture Name="gMsgKanji96A6Tex" OutName="msg_kanji_96A6" Format="i4" Width="16" Height="16" Offset="0x6DB80"/>
+        <Texture Name="gMsgKanji96A7Tex" OutName="msg_kanji_96A7" Format="i4" Width="16" Height="16" Offset="0x6DC00"/>
+        <Texture Name="gMsgKanji96A8Tex" OutName="msg_kanji_96A8" Format="i4" Width="16" Height="16" Offset="0x6DC80"/>
+        <Texture Name="gMsgKanji96A9Tex" OutName="msg_kanji_96A9" Format="i4" Width="16" Height="16" Offset="0x6DD00"/>
+        <Texture Name="gMsgKanji96AATex" OutName="msg_kanji_96AA" Format="i4" Width="16" Height="16" Offset="0x6DD80"/>
+        <Texture Name="gMsgKanji96ABTex" OutName="msg_kanji_96AB" Format="i4" Width="16" Height="16" Offset="0x6DE00"/>
+        <Texture Name="gMsgKanji96ACTex" OutName="msg_kanji_96AC" Format="i4" Width="16" Height="16" Offset="0x6DE80"/>
+        <Texture Name="gMsgKanji96ADTex" OutName="msg_kanji_96AD" Format="i4" Width="16" Height="16" Offset="0x6DF00"/>
+        <Texture Name="gMsgKanji96AETex" OutName="msg_kanji_96AE" Format="i4" Width="16" Height="16" Offset="0x6DF80"/>
+        <Texture Name="gMsgKanji96AFTex" OutName="msg_kanji_96AF" Format="i4" Width="16" Height="16" Offset="0x6E000"/>
+        <Texture Name="gMsgKanji96B0Tex" OutName="msg_kanji_96B0" Format="i4" Width="16" Height="16" Offset="0x6E080"/>
+        <Texture Name="gMsgKanji96B1Tex" OutName="msg_kanji_96B1" Format="i4" Width="16" Height="16" Offset="0x6E100"/>
+        <Texture Name="gMsgKanji96B2Tex" OutName="msg_kanji_96B2" Format="i4" Width="16" Height="16" Offset="0x6E180"/>
+        <Texture Name="gMsgKanji96B3Tex" OutName="msg_kanji_96B3" Format="i4" Width="16" Height="16" Offset="0x6E200"/>
+        <Texture Name="gMsgKanji96B4Tex" OutName="msg_kanji_96B4" Format="i4" Width="16" Height="16" Offset="0x6E280"/>
+        <Texture Name="gMsgKanji96B5Tex" OutName="msg_kanji_96B5" Format="i4" Width="16" Height="16" Offset="0x6E300"/>
+        <Texture Name="gMsgKanji96B6Tex" OutName="msg_kanji_96B6" Format="i4" Width="16" Height="16" Offset="0x6E380"/>
+        <Texture Name="gMsgKanji96B7Tex" OutName="msg_kanji_96B7" Format="i4" Width="16" Height="16" Offset="0x6E400"/>
+        <Texture Name="gMsgKanji96B8Tex" OutName="msg_kanji_96B8" Format="i4" Width="16" Height="16" Offset="0x6E480"/>
+        <Texture Name="gMsgKanji96B9Tex" OutName="msg_kanji_96B9" Format="i4" Width="16" Height="16" Offset="0x6E500"/>
+        <Texture Name="gMsgKanji96BATex" OutName="msg_kanji_96BA" Format="i4" Width="16" Height="16" Offset="0x6E580"/>
+        <Texture Name="gMsgKanji96BBTex" OutName="msg_kanji_96BB" Format="i4" Width="16" Height="16" Offset="0x6E600"/>
+        <Texture Name="gMsgKanji96BCTex" OutName="msg_kanji_96BC" Format="i4" Width="16" Height="16" Offset="0x6E680"/>
+        <Texture Name="gMsgKanji96BDTex" OutName="msg_kanji_96BD" Format="i4" Width="16" Height="16" Offset="0x6E700"/>
+        <Texture Name="gMsgKanji96BETex" OutName="msg_kanji_96BE" Format="i4" Width="16" Height="16" Offset="0x6E780"/>
+        <Texture Name="gMsgKanji96BFTex" OutName="msg_kanji_96BF" Format="i4" Width="16" Height="16" Offset="0x6E800"/>
+        <Texture Name="gMsgKanji96C0Tex" OutName="msg_kanji_96C0" Format="i4" Width="16" Height="16" Offset="0x6E880"/>
+        <Texture Name="gMsgKanji96C1Tex" OutName="msg_kanji_96C1" Format="i4" Width="16" Height="16" Offset="0x6E900"/>
+        <Texture Name="gMsgKanji96C2Tex" OutName="msg_kanji_96C2" Format="i4" Width="16" Height="16" Offset="0x6E980"/>
+        <Texture Name="gMsgKanji96C3Tex" OutName="msg_kanji_96C3" Format="i4" Width="16" Height="16" Offset="0x6EA00"/>
+        <Texture Name="gMsgKanji96C4Tex" OutName="msg_kanji_96C4" Format="i4" Width="16" Height="16" Offset="0x6EA80"/>
+        <Texture Name="gMsgKanji96C5Tex" OutName="msg_kanji_96C5" Format="i4" Width="16" Height="16" Offset="0x6EB00"/>
+        <Texture Name="gMsgKanji96C6Tex" OutName="msg_kanji_96C6" Format="i4" Width="16" Height="16" Offset="0x6EB80"/>
+        <Texture Name="gMsgKanji96C7Tex" OutName="msg_kanji_96C7" Format="i4" Width="16" Height="16" Offset="0x6EC00"/>
+        <Texture Name="gMsgKanji96C8Tex" OutName="msg_kanji_96C8" Format="i4" Width="16" Height="16" Offset="0x6EC80"/>
+        <Texture Name="gMsgKanji96C9Tex" OutName="msg_kanji_96C9" Format="i4" Width="16" Height="16" Offset="0x6ED00"/>
+        <Texture Name="gMsgKanji96CATex" OutName="msg_kanji_96CA" Format="i4" Width="16" Height="16" Offset="0x6ED80"/>
+        <Texture Name="gMsgKanji96CBTex" OutName="msg_kanji_96CB" Format="i4" Width="16" Height="16" Offset="0x6EE00"/>
+        <Texture Name="gMsgKanji96CCTex" OutName="msg_kanji_96CC" Format="i4" Width="16" Height="16" Offset="0x6EE80"/>
+        <Texture Name="gMsgKanji96CDTex" OutName="msg_kanji_96CD" Format="i4" Width="16" Height="16" Offset="0x6EF00"/>
+        <Texture Name="gMsgKanji96CETex" OutName="msg_kanji_96CE" Format="i4" Width="16" Height="16" Offset="0x6EF80"/>
+        <Texture Name="gMsgKanji96CFTex" OutName="msg_kanji_96CF" Format="i4" Width="16" Height="16" Offset="0x6F000"/>
+        <Texture Name="gMsgKanji96D0Tex" OutName="msg_kanji_96D0" Format="i4" Width="16" Height="16" Offset="0x6F080"/>
+        <Texture Name="gMsgKanji96D1Tex" OutName="msg_kanji_96D1" Format="i4" Width="16" Height="16" Offset="0x6F100"/>
+        <Texture Name="gMsgKanji96D2Tex" OutName="msg_kanji_96D2" Format="i4" Width="16" Height="16" Offset="0x6F180"/>
+        <Texture Name="gMsgKanji96D3Tex" OutName="msg_kanji_96D3" Format="i4" Width="16" Height="16" Offset="0x6F200"/>
+        <Texture Name="gMsgKanji96D4Tex" OutName="msg_kanji_96D4" Format="i4" Width="16" Height="16" Offset="0x6F280"/>
+        <Texture Name="gMsgKanji96D5Tex" OutName="msg_kanji_96D5" Format="i4" Width="16" Height="16" Offset="0x6F300"/>
+        <Texture Name="gMsgKanji96D6Tex" OutName="msg_kanji_96D6" Format="i4" Width="16" Height="16" Offset="0x6F380"/>
+        <Texture Name="gMsgKanji96D7Tex" OutName="msg_kanji_96D7" Format="i4" Width="16" Height="16" Offset="0x6F400"/>
+        <Texture Name="gMsgKanji96D8Tex" OutName="msg_kanji_96D8" Format="i4" Width="16" Height="16" Offset="0x6F480"/>
+        <Texture Name="gMsgKanji96D9Tex" OutName="msg_kanji_96D9" Format="i4" Width="16" Height="16" Offset="0x6F500"/>
+        <Texture Name="gMsgKanji96DATex" OutName="msg_kanji_96DA" Format="i4" Width="16" Height="16" Offset="0x6F580"/>
+        <Texture Name="gMsgKanji96DBTex" OutName="msg_kanji_96DB" Format="i4" Width="16" Height="16" Offset="0x6F600"/>
+        <Texture Name="gMsgKanji96DCTex" OutName="msg_kanji_96DC" Format="i4" Width="16" Height="16" Offset="0x6F680"/>
+        <Texture Name="gMsgKanji96DDTex" OutName="msg_kanji_96DD" Format="i4" Width="16" Height="16" Offset="0x6F700"/>
+        <Texture Name="gMsgKanji96DETex" OutName="msg_kanji_96DE" Format="i4" Width="16" Height="16" Offset="0x6F780"/>
+        <Texture Name="gMsgKanji96DFTex" OutName="msg_kanji_96DF" Format="i4" Width="16" Height="16" Offset="0x6F800"/>
+        <Texture Name="gMsgKanji96E0Tex" OutName="msg_kanji_96E0" Format="i4" Width="16" Height="16" Offset="0x6F880"/>
+        <Texture Name="gMsgKanji96E1Tex" OutName="msg_kanji_96E1" Format="i4" Width="16" Height="16" Offset="0x6F900"/>
+        <Texture Name="gMsgKanji96E2Tex" OutName="msg_kanji_96E2" Format="i4" Width="16" Height="16" Offset="0x6F980"/>
+        <Texture Name="gMsgKanji96E3Tex" OutName="msg_kanji_96E3" Format="i4" Width="16" Height="16" Offset="0x6FA00"/>
+        <Texture Name="gMsgKanji96E4Tex" OutName="msg_kanji_96E4" Format="i4" Width="16" Height="16" Offset="0x6FA80"/>
+        <Texture Name="gMsgKanji96E5Tex" OutName="msg_kanji_96E5" Format="i4" Width="16" Height="16" Offset="0x6FB00"/>
+        <Texture Name="gMsgKanji96E6Tex" OutName="msg_kanji_96E6" Format="i4" Width="16" Height="16" Offset="0x6FB80"/>
+        <Texture Name="gMsgKanji96E7Tex" OutName="msg_kanji_96E7" Format="i4" Width="16" Height="16" Offset="0x6FC00"/>
+        <Texture Name="gMsgKanji96E8Tex" OutName="msg_kanji_96E8" Format="i4" Width="16" Height="16" Offset="0x6FC80"/>
+        <Texture Name="gMsgKanji96E9Tex" OutName="msg_kanji_96E9" Format="i4" Width="16" Height="16" Offset="0x6FD00"/>
+        <Texture Name="gMsgKanji96EATex" OutName="msg_kanji_96EA" Format="i4" Width="16" Height="16" Offset="0x6FD80"/>
+        <Texture Name="gMsgKanji96EBTex" OutName="msg_kanji_96EB" Format="i4" Width="16" Height="16" Offset="0x6FE00"/>
+        <Texture Name="gMsgKanji96ECTex" OutName="msg_kanji_96EC" Format="i4" Width="16" Height="16" Offset="0x6FE80"/>
+        <Texture Name="gMsgKanji96EDTex" OutName="msg_kanji_96ED" Format="i4" Width="16" Height="16" Offset="0x6FF00"/>
+        <Texture Name="gMsgKanji96EETex" OutName="msg_kanji_96EE" Format="i4" Width="16" Height="16" Offset="0x6FF80"/>
+        <Texture Name="gMsgKanji96EFTex" OutName="msg_kanji_96EF" Format="i4" Width="16" Height="16" Offset="0x70000"/>
+        <Texture Name="gMsgKanji96F0Tex" OutName="msg_kanji_96F0" Format="i4" Width="16" Height="16" Offset="0x70080"/>
+        <Texture Name="gMsgKanji96F1Tex" OutName="msg_kanji_96F1" Format="i4" Width="16" Height="16" Offset="0x70100"/>
+        <Texture Name="gMsgKanji96F2Tex" OutName="msg_kanji_96F2" Format="i4" Width="16" Height="16" Offset="0x70180"/>
+        <Texture Name="gMsgKanji96F3Tex" OutName="msg_kanji_96F3" Format="i4" Width="16" Height="16" Offset="0x70200"/>
+        <Texture Name="gMsgKanji96F4Tex" OutName="msg_kanji_96F4" Format="i4" Width="16" Height="16" Offset="0x70280"/>
+        <Texture Name="gMsgKanji96F5Tex" OutName="msg_kanji_96F5" Format="i4" Width="16" Height="16" Offset="0x70300"/>
+        <Texture Name="gMsgKanji96F6Tex" OutName="msg_kanji_96F6" Format="i4" Width="16" Height="16" Offset="0x70380"/>
+        <Texture Name="gMsgKanji96F7Tex" OutName="msg_kanji_96F7" Format="i4" Width="16" Height="16" Offset="0x70400"/>
+        <Texture Name="gMsgKanji96F8Tex" OutName="msg_kanji_96F8" Format="i4" Width="16" Height="16" Offset="0x70480"/>
+        <Texture Name="gMsgKanji96F9Tex" OutName="msg_kanji_96F9" Format="i4" Width="16" Height="16" Offset="0x70500"/>
+        <Texture Name="gMsgKanji96FATex" OutName="msg_kanji_96FA" Format="i4" Width="16" Height="16" Offset="0x70580"/>
+        <Texture Name="gMsgKanji96FBTex" OutName="msg_kanji_96FB" Format="i4" Width="16" Height="16" Offset="0x70600"/>
+        <Texture Name="gMsgKanji96FCTex" OutName="msg_kanji_96FC" Format="i4" Width="16" Height="16" Offset="0x70680"/>
+        <Texture Name="gMsgKanji9740Tex" OutName="msg_kanji_9740" Format="i4" Width="16" Height="16" Offset="0x70700"/>
+        <Texture Name="gMsgKanji9741Tex" OutName="msg_kanji_9741" Format="i4" Width="16" Height="16" Offset="0x70780"/>
+        <Texture Name="gMsgKanji9742Tex" OutName="msg_kanji_9742" Format="i4" Width="16" Height="16" Offset="0x70800"/>
+        <Texture Name="gMsgKanji9743Tex" OutName="msg_kanji_9743" Format="i4" Width="16" Height="16" Offset="0x70880"/>
+        <Texture Name="gMsgKanji9744Tex" OutName="msg_kanji_9744" Format="i4" Width="16" Height="16" Offset="0x70900"/>
+        <Texture Name="gMsgKanji9745Tex" OutName="msg_kanji_9745" Format="i4" Width="16" Height="16" Offset="0x70980"/>
+        <Texture Name="gMsgKanji9746Tex" OutName="msg_kanji_9746" Format="i4" Width="16" Height="16" Offset="0x70A00"/>
+        <Texture Name="gMsgKanji9747Tex" OutName="msg_kanji_9747" Format="i4" Width="16" Height="16" Offset="0x70A80"/>
+        <Texture Name="gMsgKanji9748Tex" OutName="msg_kanji_9748" Format="i4" Width="16" Height="16" Offset="0x70B00"/>
+        <Texture Name="gMsgKanji9749Tex" OutName="msg_kanji_9749" Format="i4" Width="16" Height="16" Offset="0x70B80"/>
+        <Texture Name="gMsgKanji974ATex" OutName="msg_kanji_974A" Format="i4" Width="16" Height="16" Offset="0x70C00"/>
+        <Texture Name="gMsgKanji974BTex" OutName="msg_kanji_974B" Format="i4" Width="16" Height="16" Offset="0x70C80"/>
+        <Texture Name="gMsgKanji974CTex" OutName="msg_kanji_974C" Format="i4" Width="16" Height="16" Offset="0x70D00"/>
+        <Texture Name="gMsgKanji974DTex" OutName="msg_kanji_974D" Format="i4" Width="16" Height="16" Offset="0x70D80"/>
+        <Texture Name="gMsgKanji974ETex" OutName="msg_kanji_974E" Format="i4" Width="16" Height="16" Offset="0x70E00"/>
+        <Texture Name="gMsgKanji974FTex" OutName="msg_kanji_974F" Format="i4" Width="16" Height="16" Offset="0x70E80"/>
+        <Texture Name="gMsgKanji9750Tex" OutName="msg_kanji_9750" Format="i4" Width="16" Height="16" Offset="0x70F00"/>
+        <Texture Name="gMsgKanji9751Tex" OutName="msg_kanji_9751" Format="i4" Width="16" Height="16" Offset="0x70F80"/>
+        <Texture Name="gMsgKanji9752Tex" OutName="msg_kanji_9752" Format="i4" Width="16" Height="16" Offset="0x71000"/>
+        <Texture Name="gMsgKanji9753Tex" OutName="msg_kanji_9753" Format="i4" Width="16" Height="16" Offset="0x71080"/>
+        <Texture Name="gMsgKanji9754Tex" OutName="msg_kanji_9754" Format="i4" Width="16" Height="16" Offset="0x71100"/>
+        <Texture Name="gMsgKanji9755Tex" OutName="msg_kanji_9755" Format="i4" Width="16" Height="16" Offset="0x71180"/>
+        <Texture Name="gMsgKanji9756Tex" OutName="msg_kanji_9756" Format="i4" Width="16" Height="16" Offset="0x71200"/>
+        <Texture Name="gMsgKanji9757Tex" OutName="msg_kanji_9757" Format="i4" Width="16" Height="16" Offset="0x71280"/>
+        <Texture Name="gMsgKanji9758Tex" OutName="msg_kanji_9758" Format="i4" Width="16" Height="16" Offset="0x71300"/>
+        <Texture Name="gMsgKanji9759Tex" OutName="msg_kanji_9759" Format="i4" Width="16" Height="16" Offset="0x71380"/>
+        <Texture Name="gMsgKanji975ATex" OutName="msg_kanji_975A" Format="i4" Width="16" Height="16" Offset="0x71400"/>
+        <Texture Name="gMsgKanji975BTex" OutName="msg_kanji_975B" Format="i4" Width="16" Height="16" Offset="0x71480"/>
+        <Texture Name="gMsgKanji975CTex" OutName="msg_kanji_975C" Format="i4" Width="16" Height="16" Offset="0x71500"/>
+        <Texture Name="gMsgKanji975DTex" OutName="msg_kanji_975D" Format="i4" Width="16" Height="16" Offset="0x71580"/>
+        <Texture Name="gMsgKanji975ETex" OutName="msg_kanji_975E" Format="i4" Width="16" Height="16" Offset="0x71600"/>
+        <Texture Name="gMsgKanji975FTex" OutName="msg_kanji_975F" Format="i4" Width="16" Height="16" Offset="0x71680"/>
+        <Texture Name="gMsgKanji9760Tex" OutName="msg_kanji_9760" Format="i4" Width="16" Height="16" Offset="0x71700"/>
+        <Texture Name="gMsgKanji9761Tex" OutName="msg_kanji_9761" Format="i4" Width="16" Height="16" Offset="0x71780"/>
+        <Texture Name="gMsgKanji9762Tex" OutName="msg_kanji_9762" Format="i4" Width="16" Height="16" Offset="0x71800"/>
+        <Texture Name="gMsgKanji9763Tex" OutName="msg_kanji_9763" Format="i4" Width="16" Height="16" Offset="0x71880"/>
+        <Texture Name="gMsgKanji9764Tex" OutName="msg_kanji_9764" Format="i4" Width="16" Height="16" Offset="0x71900"/>
+        <Texture Name="gMsgKanji9765Tex" OutName="msg_kanji_9765" Format="i4" Width="16" Height="16" Offset="0x71980"/>
+        <Texture Name="gMsgKanji9766Tex" OutName="msg_kanji_9766" Format="i4" Width="16" Height="16" Offset="0x71A00"/>
+        <Texture Name="gMsgKanji9767Tex" OutName="msg_kanji_9767" Format="i4" Width="16" Height="16" Offset="0x71A80"/>
+        <Texture Name="gMsgKanji9768Tex" OutName="msg_kanji_9768" Format="i4" Width="16" Height="16" Offset="0x71B00"/>
+        <Texture Name="gMsgKanji9769Tex" OutName="msg_kanji_9769" Format="i4" Width="16" Height="16" Offset="0x71B80"/>
+        <Texture Name="gMsgKanji976ATex" OutName="msg_kanji_976A" Format="i4" Width="16" Height="16" Offset="0x71C00"/>
+        <Texture Name="gMsgKanji976BTex" OutName="msg_kanji_976B" Format="i4" Width="16" Height="16" Offset="0x71C80"/>
+        <Texture Name="gMsgKanji976CTex" OutName="msg_kanji_976C" Format="i4" Width="16" Height="16" Offset="0x71D00"/>
+        <Texture Name="gMsgKanji976DTex" OutName="msg_kanji_976D" Format="i4" Width="16" Height="16" Offset="0x71D80"/>
+        <Texture Name="gMsgKanji976ETex" OutName="msg_kanji_976E" Format="i4" Width="16" Height="16" Offset="0x71E00"/>
+        <Texture Name="gMsgKanji976FTex" OutName="msg_kanji_976F" Format="i4" Width="16" Height="16" Offset="0x71E80"/>
+        <Texture Name="gMsgKanji9770Tex" OutName="msg_kanji_9770" Format="i4" Width="16" Height="16" Offset="0x71F00"/>
+        <Texture Name="gMsgKanji9771Tex" OutName="msg_kanji_9771" Format="i4" Width="16" Height="16" Offset="0x71F80"/>
+        <Texture Name="gMsgKanji9772Tex" OutName="msg_kanji_9772" Format="i4" Width="16" Height="16" Offset="0x72000"/>
+        <Texture Name="gMsgKanji9773Tex" OutName="msg_kanji_9773" Format="i4" Width="16" Height="16" Offset="0x72080"/>
+        <Texture Name="gMsgKanji9774Tex" OutName="msg_kanji_9774" Format="i4" Width="16" Height="16" Offset="0x72100"/>
+        <Texture Name="gMsgKanji9775Tex" OutName="msg_kanji_9775" Format="i4" Width="16" Height="16" Offset="0x72180"/>
+        <Texture Name="gMsgKanji9776Tex" OutName="msg_kanji_9776" Format="i4" Width="16" Height="16" Offset="0x72200"/>
+        <Texture Name="gMsgKanji9777Tex" OutName="msg_kanji_9777" Format="i4" Width="16" Height="16" Offset="0x72280"/>
+        <Texture Name="gMsgKanji9778Tex" OutName="msg_kanji_9778" Format="i4" Width="16" Height="16" Offset="0x72300"/>
+        <Texture Name="gMsgKanji9779Tex" OutName="msg_kanji_9779" Format="i4" Width="16" Height="16" Offset="0x72380"/>
+        <Texture Name="gMsgKanji977ATex" OutName="msg_kanji_977A" Format="i4" Width="16" Height="16" Offset="0x72400"/>
+        <Texture Name="gMsgKanji977BTex" OutName="msg_kanji_977B" Format="i4" Width="16" Height="16" Offset="0x72480"/>
+        <Texture Name="gMsgKanji977CTex" OutName="msg_kanji_977C" Format="i4" Width="16" Height="16" Offset="0x72500"/>
+        <Texture Name="gMsgKanji977DTex" OutName="msg_kanji_977D" Format="i4" Width="16" Height="16" Offset="0x72580"/>
+        <Texture Name="gMsgKanji977ETex" OutName="msg_kanji_977E" Format="i4" Width="16" Height="16" Offset="0x72600"/>
+        <Texture Name="gMsgKanji9780Tex" OutName="msg_kanji_9780" Format="i4" Width="16" Height="16" Offset="0x72680"/>
+        <Texture Name="gMsgKanji9781Tex" OutName="msg_kanji_9781" Format="i4" Width="16" Height="16" Offset="0x72700"/>
+        <Texture Name="gMsgKanji9782Tex" OutName="msg_kanji_9782" Format="i4" Width="16" Height="16" Offset="0x72780"/>
+        <Texture Name="gMsgKanji9783Tex" OutName="msg_kanji_9783" Format="i4" Width="16" Height="16" Offset="0x72800"/>
+        <Texture Name="gMsgKanji9784Tex" OutName="msg_kanji_9784" Format="i4" Width="16" Height="16" Offset="0x72880"/>
+        <Texture Name="gMsgKanji9785Tex" OutName="msg_kanji_9785" Format="i4" Width="16" Height="16" Offset="0x72900"/>
+        <Texture Name="gMsgKanji9786Tex" OutName="msg_kanji_9786" Format="i4" Width="16" Height="16" Offset="0x72980"/>
+        <Texture Name="gMsgKanji9787Tex" OutName="msg_kanji_9787" Format="i4" Width="16" Height="16" Offset="0x72A00"/>
+        <Texture Name="gMsgKanji9788Tex" OutName="msg_kanji_9788" Format="i4" Width="16" Height="16" Offset="0x72A80"/>
+        <Texture Name="gMsgKanji9789Tex" OutName="msg_kanji_9789" Format="i4" Width="16" Height="16" Offset="0x72B00"/>
+        <Texture Name="gMsgKanji978ATex" OutName="msg_kanji_978A" Format="i4" Width="16" Height="16" Offset="0x72B80"/>
+        <Texture Name="gMsgKanji978BTex" OutName="msg_kanji_978B" Format="i4" Width="16" Height="16" Offset="0x72C00"/>
+        <Texture Name="gMsgKanji978CTex" OutName="msg_kanji_978C" Format="i4" Width="16" Height="16" Offset="0x72C80"/>
+        <Texture Name="gMsgKanji978DTex" OutName="msg_kanji_978D" Format="i4" Width="16" Height="16" Offset="0x72D00"/>
+        <Texture Name="gMsgKanji978ETex" OutName="msg_kanji_978E" Format="i4" Width="16" Height="16" Offset="0x72D80"/>
+        <Texture Name="gMsgKanji978FTex" OutName="msg_kanji_978F" Format="i4" Width="16" Height="16" Offset="0x72E00"/>
+        <Texture Name="gMsgKanji9790Tex" OutName="msg_kanji_9790" Format="i4" Width="16" Height="16" Offset="0x72E80"/>
+        <Texture Name="gMsgKanji9791Tex" OutName="msg_kanji_9791" Format="i4" Width="16" Height="16" Offset="0x72F00"/>
+        <Texture Name="gMsgKanji9792Tex" OutName="msg_kanji_9792" Format="i4" Width="16" Height="16" Offset="0x72F80"/>
+        <Texture Name="gMsgKanji9793Tex" OutName="msg_kanji_9793" Format="i4" Width="16" Height="16" Offset="0x73000"/>
+        <Texture Name="gMsgKanji9794Tex" OutName="msg_kanji_9794" Format="i4" Width="16" Height="16" Offset="0x73080"/>
+        <Texture Name="gMsgKanji9795Tex" OutName="msg_kanji_9795" Format="i4" Width="16" Height="16" Offset="0x73100"/>
+        <Texture Name="gMsgKanji9796Tex" OutName="msg_kanji_9796" Format="i4" Width="16" Height="16" Offset="0x73180"/>
+        <Texture Name="gMsgKanji9797Tex" OutName="msg_kanji_9797" Format="i4" Width="16" Height="16" Offset="0x73200"/>
+        <Texture Name="gMsgKanji9798Tex" OutName="msg_kanji_9798" Format="i4" Width="16" Height="16" Offset="0x73280"/>
+        <Texture Name="gMsgKanji9799Tex" OutName="msg_kanji_9799" Format="i4" Width="16" Height="16" Offset="0x73300"/>
+        <Texture Name="gMsgKanji979ATex" OutName="msg_kanji_979A" Format="i4" Width="16" Height="16" Offset="0x73380"/>
+        <Texture Name="gMsgKanji979BTex" OutName="msg_kanji_979B" Format="i4" Width="16" Height="16" Offset="0x73400"/>
+        <Texture Name="gMsgKanji979CTex" OutName="msg_kanji_979C" Format="i4" Width="16" Height="16" Offset="0x73480"/>
+        <Texture Name="gMsgKanji979DTex" OutName="msg_kanji_979D" Format="i4" Width="16" Height="16" Offset="0x73500"/>
+        <Texture Name="gMsgKanji979ETex" OutName="msg_kanji_979E" Format="i4" Width="16" Height="16" Offset="0x73580"/>
+        <Texture Name="gMsgKanji979FTex" OutName="msg_kanji_979F" Format="i4" Width="16" Height="16" Offset="0x73600"/>
+        <Texture Name="gMsgKanji97A0Tex" OutName="msg_kanji_97A0" Format="i4" Width="16" Height="16" Offset="0x73680"/>
+        <Texture Name="gMsgKanji97A1Tex" OutName="msg_kanji_97A1" Format="i4" Width="16" Height="16" Offset="0x73700"/>
+        <Texture Name="gMsgKanji97A2Tex" OutName="msg_kanji_97A2" Format="i4" Width="16" Height="16" Offset="0x73780"/>
+        <Texture Name="gMsgKanji97A3Tex" OutName="msg_kanji_97A3" Format="i4" Width="16" Height="16" Offset="0x73800"/>
+        <Texture Name="gMsgKanji97A4Tex" OutName="msg_kanji_97A4" Format="i4" Width="16" Height="16" Offset="0x73880"/>
+        <Texture Name="gMsgKanji97A5Tex" OutName="msg_kanji_97A5" Format="i4" Width="16" Height="16" Offset="0x73900"/>
+        <Texture Name="gMsgKanji97A6Tex" OutName="msg_kanji_97A6" Format="i4" Width="16" Height="16" Offset="0x73980"/>
+        <Texture Name="gMsgKanji97A7Tex" OutName="msg_kanji_97A7" Format="i4" Width="16" Height="16" Offset="0x73A00"/>
+        <Texture Name="gMsgKanji97A8Tex" OutName="msg_kanji_97A8" Format="i4" Width="16" Height="16" Offset="0x73A80"/>
+        <Texture Name="gMsgKanji97A9Tex" OutName="msg_kanji_97A9" Format="i4" Width="16" Height="16" Offset="0x73B00"/>
+        <Texture Name="gMsgKanji97AATex" OutName="msg_kanji_97AA" Format="i4" Width="16" Height="16" Offset="0x73B80"/>
+        <Texture Name="gMsgKanji97ABTex" OutName="msg_kanji_97AB" Format="i4" Width="16" Height="16" Offset="0x73C00"/>
+        <Texture Name="gMsgKanji97ACTex" OutName="msg_kanji_97AC" Format="i4" Width="16" Height="16" Offset="0x73C80"/>
+        <Texture Name="gMsgKanji97ADTex" OutName="msg_kanji_97AD" Format="i4" Width="16" Height="16" Offset="0x73D00"/>
+        <Texture Name="gMsgKanji97AETex" OutName="msg_kanji_97AE" Format="i4" Width="16" Height="16" Offset="0x73D80"/>
+        <Texture Name="gMsgKanji97AFTex" OutName="msg_kanji_97AF" Format="i4" Width="16" Height="16" Offset="0x73E00"/>
+        <Texture Name="gMsgKanji97B0Tex" OutName="msg_kanji_97B0" Format="i4" Width="16" Height="16" Offset="0x73E80"/>
+        <Texture Name="gMsgKanji97B1Tex" OutName="msg_kanji_97B1" Format="i4" Width="16" Height="16" Offset="0x73F00"/>
+        <Texture Name="gMsgKanji97B2Tex" OutName="msg_kanji_97B2" Format="i4" Width="16" Height="16" Offset="0x73F80"/>
+        <Texture Name="gMsgKanji97B3Tex" OutName="msg_kanji_97B3" Format="i4" Width="16" Height="16" Offset="0x74000"/>
+        <Texture Name="gMsgKanji97B4Tex" OutName="msg_kanji_97B4" Format="i4" Width="16" Height="16" Offset="0x74080"/>
+        <Texture Name="gMsgKanji97B5Tex" OutName="msg_kanji_97B5" Format="i4" Width="16" Height="16" Offset="0x74100"/>
+        <Texture Name="gMsgKanji97B6Tex" OutName="msg_kanji_97B6" Format="i4" Width="16" Height="16" Offset="0x74180"/>
+        <Texture Name="gMsgKanji97B7Tex" OutName="msg_kanji_97B7" Format="i4" Width="16" Height="16" Offset="0x74200"/>
+        <Texture Name="gMsgKanji97B8Tex" OutName="msg_kanji_97B8" Format="i4" Width="16" Height="16" Offset="0x74280"/>
+        <Texture Name="gMsgKanji97B9Tex" OutName="msg_kanji_97B9" Format="i4" Width="16" Height="16" Offset="0x74300"/>
+        <Texture Name="gMsgKanji97BATex" OutName="msg_kanji_97BA" Format="i4" Width="16" Height="16" Offset="0x74380"/>
+        <Texture Name="gMsgKanji97BBTex" OutName="msg_kanji_97BB" Format="i4" Width="16" Height="16" Offset="0x74400"/>
+        <Texture Name="gMsgKanji97BCTex" OutName="msg_kanji_97BC" Format="i4" Width="16" Height="16" Offset="0x74480"/>
+        <Texture Name="gMsgKanji97BDTex" OutName="msg_kanji_97BD" Format="i4" Width="16" Height="16" Offset="0x74500"/>
+        <Texture Name="gMsgKanji97BETex" OutName="msg_kanji_97BE" Format="i4" Width="16" Height="16" Offset="0x74580"/>
+        <Texture Name="gMsgKanji97BFTex" OutName="msg_kanji_97BF" Format="i4" Width="16" Height="16" Offset="0x74600"/>
+        <Texture Name="gMsgKanji97C0Tex" OutName="msg_kanji_97C0" Format="i4" Width="16" Height="16" Offset="0x74680"/>
+        <Texture Name="gMsgKanji97C1Tex" OutName="msg_kanji_97C1" Format="i4" Width="16" Height="16" Offset="0x74700"/>
+        <Texture Name="gMsgKanji97C2Tex" OutName="msg_kanji_97C2" Format="i4" Width="16" Height="16" Offset="0x74780"/>
+        <Texture Name="gMsgKanji97C3Tex" OutName="msg_kanji_97C3" Format="i4" Width="16" Height="16" Offset="0x74800"/>
+        <Texture Name="gMsgKanji97C4Tex" OutName="msg_kanji_97C4" Format="i4" Width="16" Height="16" Offset="0x74880"/>
+        <Texture Name="gMsgKanji97C5Tex" OutName="msg_kanji_97C5" Format="i4" Width="16" Height="16" Offset="0x74900"/>
+        <Texture Name="gMsgKanji97C6Tex" OutName="msg_kanji_97C6" Format="i4" Width="16" Height="16" Offset="0x74980"/>
+        <Texture Name="gMsgKanji97C7Tex" OutName="msg_kanji_97C7" Format="i4" Width="16" Height="16" Offset="0x74A00"/>
+        <Texture Name="gMsgKanji97C8Tex" OutName="msg_kanji_97C8" Format="i4" Width="16" Height="16" Offset="0x74A80"/>
+        <Texture Name="gMsgKanji97C9Tex" OutName="msg_kanji_97C9" Format="i4" Width="16" Height="16" Offset="0x74B00"/>
+        <Texture Name="gMsgKanji97CATex" OutName="msg_kanji_97CA" Format="i4" Width="16" Height="16" Offset="0x74B80"/>
+        <Texture Name="gMsgKanji97CBTex" OutName="msg_kanji_97CB" Format="i4" Width="16" Height="16" Offset="0x74C00"/>
+        <Texture Name="gMsgKanji97CCTex" OutName="msg_kanji_97CC" Format="i4" Width="16" Height="16" Offset="0x74C80"/>
+        <Texture Name="gMsgKanji97CDTex" OutName="msg_kanji_97CD" Format="i4" Width="16" Height="16" Offset="0x74D00"/>
+        <Texture Name="gMsgKanji97CETex" OutName="msg_kanji_97CE" Format="i4" Width="16" Height="16" Offset="0x74D80"/>
+        <Texture Name="gMsgKanji97CFTex" OutName="msg_kanji_97CF" Format="i4" Width="16" Height="16" Offset="0x74E00"/>
+        <Texture Name="gMsgKanji97D0Tex" OutName="msg_kanji_97D0" Format="i4" Width="16" Height="16" Offset="0x74E80"/>
+        <Texture Name="gMsgKanji97D1Tex" OutName="msg_kanji_97D1" Format="i4" Width="16" Height="16" Offset="0x74F00"/>
+        <Texture Name="gMsgKanji97D2Tex" OutName="msg_kanji_97D2" Format="i4" Width="16" Height="16" Offset="0x74F80"/>
+        <Texture Name="gMsgKanji97D3Tex" OutName="msg_kanji_97D3" Format="i4" Width="16" Height="16" Offset="0x75000"/>
+        <Texture Name="gMsgKanji97D4Tex" OutName="msg_kanji_97D4" Format="i4" Width="16" Height="16" Offset="0x75080"/>
+        <Texture Name="gMsgKanji97D5Tex" OutName="msg_kanji_97D5" Format="i4" Width="16" Height="16" Offset="0x75100"/>
+        <Texture Name="gMsgKanji97D6Tex" OutName="msg_kanji_97D6" Format="i4" Width="16" Height="16" Offset="0x75180"/>
+        <Texture Name="gMsgKanji97D7Tex" OutName="msg_kanji_97D7" Format="i4" Width="16" Height="16" Offset="0x75200"/>
+        <Texture Name="gMsgKanji97D8Tex" OutName="msg_kanji_97D8" Format="i4" Width="16" Height="16" Offset="0x75280"/>
+        <Texture Name="gMsgKanji97D9Tex" OutName="msg_kanji_97D9" Format="i4" Width="16" Height="16" Offset="0x75300"/>
+        <Texture Name="gMsgKanji97DATex" OutName="msg_kanji_97DA" Format="i4" Width="16" Height="16" Offset="0x75380"/>
+        <Texture Name="gMsgKanji97DBTex" OutName="msg_kanji_97DB" Format="i4" Width="16" Height="16" Offset="0x75400"/>
+        <Texture Name="gMsgKanji97DCTex" OutName="msg_kanji_97DC" Format="i4" Width="16" Height="16" Offset="0x75480"/>
+        <Texture Name="gMsgKanji97DDTex" OutName="msg_kanji_97DD" Format="i4" Width="16" Height="16" Offset="0x75500"/>
+        <Texture Name="gMsgKanji97DETex" OutName="msg_kanji_97DE" Format="i4" Width="16" Height="16" Offset="0x75580"/>
+        <Texture Name="gMsgKanji97DFTex" OutName="msg_kanji_97DF" Format="i4" Width="16" Height="16" Offset="0x75600"/>
+        <Texture Name="gMsgKanji97E0Tex" OutName="msg_kanji_97E0" Format="i4" Width="16" Height="16" Offset="0x75680"/>
+        <Texture Name="gMsgKanji97E1Tex" OutName="msg_kanji_97E1" Format="i4" Width="16" Height="16" Offset="0x75700"/>
+        <Texture Name="gMsgKanji97E2Tex" OutName="msg_kanji_97E2" Format="i4" Width="16" Height="16" Offset="0x75780"/>
+        <Texture Name="gMsgKanji97E3Tex" OutName="msg_kanji_97E3" Format="i4" Width="16" Height="16" Offset="0x75800"/>
+        <Texture Name="gMsgKanji97E4Tex" OutName="msg_kanji_97E4" Format="i4" Width="16" Height="16" Offset="0x75880"/>
+        <Texture Name="gMsgKanji97E5Tex" OutName="msg_kanji_97E5" Format="i4" Width="16" Height="16" Offset="0x75900"/>
+        <Texture Name="gMsgKanji97E6Tex" OutName="msg_kanji_97E6" Format="i4" Width="16" Height="16" Offset="0x75980"/>
+        <Texture Name="gMsgKanji97E7Tex" OutName="msg_kanji_97E7" Format="i4" Width="16" Height="16" Offset="0x75A00"/>
+        <Texture Name="gMsgKanji97E8Tex" OutName="msg_kanji_97E8" Format="i4" Width="16" Height="16" Offset="0x75A80"/>
+        <Texture Name="gMsgKanji97E9Tex" OutName="msg_kanji_97E9" Format="i4" Width="16" Height="16" Offset="0x75B00"/>
+        <Texture Name="gMsgKanji97EATex" OutName="msg_kanji_97EA" Format="i4" Width="16" Height="16" Offset="0x75B80"/>
+        <Texture Name="gMsgKanji97EBTex" OutName="msg_kanji_97EB" Format="i4" Width="16" Height="16" Offset="0x75C00"/>
+        <Texture Name="gMsgKanji97ECTex" OutName="msg_kanji_97EC" Format="i4" Width="16" Height="16" Offset="0x75C80"/>
+        <Texture Name="gMsgKanji97EDTex" OutName="msg_kanji_97ED" Format="i4" Width="16" Height="16" Offset="0x75D00"/>
+        <Texture Name="gMsgKanji97EETex" OutName="msg_kanji_97EE" Format="i4" Width="16" Height="16" Offset="0x75D80"/>
+        <Texture Name="gMsgKanji97EFTex" OutName="msg_kanji_97EF" Format="i4" Width="16" Height="16" Offset="0x75E00"/>
+        <Texture Name="gMsgKanji97F0Tex" OutName="msg_kanji_97F0" Format="i4" Width="16" Height="16" Offset="0x75E80"/>
+        <Texture Name="gMsgKanji97F1Tex" OutName="msg_kanji_97F1" Format="i4" Width="16" Height="16" Offset="0x75F00"/>
+        <Texture Name="gMsgKanji97F2Tex" OutName="msg_kanji_97F2" Format="i4" Width="16" Height="16" Offset="0x75F80"/>
+        <Texture Name="gMsgKanji97F3Tex" OutName="msg_kanji_97F3" Format="i4" Width="16" Height="16" Offset="0x76000"/>
+        <Texture Name="gMsgKanji97F4Tex" OutName="msg_kanji_97F4" Format="i4" Width="16" Height="16" Offset="0x76080"/>
+        <Texture Name="gMsgKanji97F5Tex" OutName="msg_kanji_97F5" Format="i4" Width="16" Height="16" Offset="0x76100"/>
+        <Texture Name="gMsgKanji97F6Tex" OutName="msg_kanji_97F6" Format="i4" Width="16" Height="16" Offset="0x76180"/>
+        <Texture Name="gMsgKanji97F7Tex" OutName="msg_kanji_97F7" Format="i4" Width="16" Height="16" Offset="0x76200"/>
+        <Texture Name="gMsgKanji97F8Tex" OutName="msg_kanji_97F8" Format="i4" Width="16" Height="16" Offset="0x76280"/>
+        <Texture Name="gMsgKanji97F9Tex" OutName="msg_kanji_97F9" Format="i4" Width="16" Height="16" Offset="0x76300"/>
+        <Texture Name="gMsgKanji97FATex" OutName="msg_kanji_97FA" Format="i4" Width="16" Height="16" Offset="0x76380"/>
+        <Texture Name="gMsgKanji97FBTex" OutName="msg_kanji_97FB" Format="i4" Width="16" Height="16" Offset="0x76400"/>
+        <Texture Name="gMsgKanji97FCTex" OutName="msg_kanji_97FC" Format="i4" Width="16" Height="16" Offset="0x76480"/>
+        <Texture Name="gMsgKanji9840Tex" OutName="msg_kanji_9840" Format="i4" Width="16" Height="16" Offset="0x76500"/>
+        <Texture Name="gMsgKanji9841Tex" OutName="msg_kanji_9841" Format="i4" Width="16" Height="16" Offset="0x76580"/>
+        <Texture Name="gMsgKanji9842Tex" OutName="msg_kanji_9842" Format="i4" Width="16" Height="16" Offset="0x76600"/>
+        <Texture Name="gMsgKanji9843Tex" OutName="msg_kanji_9843" Format="i4" Width="16" Height="16" Offset="0x76680"/>
+        <Texture Name="gMsgKanji9844Tex" OutName="msg_kanji_9844" Format="i4" Width="16" Height="16" Offset="0x76700"/>
+        <Texture Name="gMsgKanji9845Tex" OutName="msg_kanji_9845" Format="i4" Width="16" Height="16" Offset="0x76780"/>
+        <Texture Name="gMsgKanji9846Tex" OutName="msg_kanji_9846" Format="i4" Width="16" Height="16" Offset="0x76800"/>
+        <Texture Name="gMsgKanji9847Tex" OutName="msg_kanji_9847" Format="i4" Width="16" Height="16" Offset="0x76880"/>
+        <Texture Name="gMsgKanji9848Tex" OutName="msg_kanji_9848" Format="i4" Width="16" Height="16" Offset="0x76900"/>
+        <Texture Name="gMsgKanji9849Tex" OutName="msg_kanji_9849" Format="i4" Width="16" Height="16" Offset="0x76980"/>
+        <Texture Name="gMsgKanji984ATex" OutName="msg_kanji_984A" Format="i4" Width="16" Height="16" Offset="0x76A00"/>
+        <Texture Name="gMsgKanji984BTex" OutName="msg_kanji_984B" Format="i4" Width="16" Height="16" Offset="0x76A80"/>
+        <Texture Name="gMsgKanji984CTex" OutName="msg_kanji_984C" Format="i4" Width="16" Height="16" Offset="0x76B00"/>
+        <Texture Name="gMsgKanji984DTex" OutName="msg_kanji_984D" Format="i4" Width="16" Height="16" Offset="0x76B80"/>
+        <Texture Name="gMsgKanji984ETex" OutName="msg_kanji_984E" Format="i4" Width="16" Height="16" Offset="0x76C00"/>
+        <Texture Name="gMsgKanji984FTex" OutName="msg_kanji_984F" Format="i4" Width="16" Height="16" Offset="0x76C80"/>
+        <Texture Name="gMsgKanji9850Tex" OutName="msg_kanji_9850" Format="i4" Width="16" Height="16" Offset="0x76D00"/>
+        <Texture Name="gMsgKanji9851Tex" OutName="msg_kanji_9851" Format="i4" Width="16" Height="16" Offset="0x76D80"/>
+        <Texture Name="gMsgKanji9852Tex" OutName="msg_kanji_9852" Format="i4" Width="16" Height="16" Offset="0x76E00"/>
+        <Texture Name="gMsgKanji9853Tex" OutName="msg_kanji_9853" Format="i4" Width="16" Height="16" Offset="0x76E80"/>
+        <Texture Name="gMsgKanji9854Tex" OutName="msg_kanji_9854" Format="i4" Width="16" Height="16" Offset="0x76F00"/>
+        <Texture Name="gMsgKanji9855Tex" OutName="msg_kanji_9855" Format="i4" Width="16" Height="16" Offset="0x76F80"/>
+        <Texture Name="gMsgKanji9856Tex" OutName="msg_kanji_9856" Format="i4" Width="16" Height="16" Offset="0x77000"/>
+        <Texture Name="gMsgKanji9857Tex" OutName="msg_kanji_9857" Format="i4" Width="16" Height="16" Offset="0x77080"/>
+        <Texture Name="gMsgKanji9858Tex" OutName="msg_kanji_9858" Format="i4" Width="16" Height="16" Offset="0x77100"/>
+        <Texture Name="gMsgKanji9859Tex" OutName="msg_kanji_9859" Format="i4" Width="16" Height="16" Offset="0x77180"/>
+        <Texture Name="gMsgKanji985ATex" OutName="msg_kanji_985A" Format="i4" Width="16" Height="16" Offset="0x77200"/>
+        <Texture Name="gMsgKanji985BTex" OutName="msg_kanji_985B" Format="i4" Width="16" Height="16" Offset="0x77280"/>
+        <Texture Name="gMsgKanji985CTex" OutName="msg_kanji_985C" Format="i4" Width="16" Height="16" Offset="0x77300"/>
+        <Texture Name="gMsgKanji985DTex" OutName="msg_kanji_985D" Format="i4" Width="16" Height="16" Offset="0x77380"/>
+        <Texture Name="gMsgKanji985ETex" OutName="msg_kanji_985E" Format="i4" Width="16" Height="16" Offset="0x77400"/>
+        <Texture Name="gMsgKanji985FTex" OutName="msg_kanji_985F" Format="i4" Width="16" Height="16" Offset="0x77480"/>
+        <Texture Name="gMsgKanji9860Tex" OutName="msg_kanji_9860" Format="i4" Width="16" Height="16" Offset="0x77500"/>
+        <Texture Name="gMsgKanji9861Tex" OutName="msg_kanji_9861" Format="i4" Width="16" Height="16" Offset="0x77580"/>
+        <Texture Name="gMsgKanji9862Tex" OutName="msg_kanji_9862" Format="i4" Width="16" Height="16" Offset="0x77600"/>
+        <Texture Name="gMsgKanji9863Tex" OutName="msg_kanji_9863" Format="i4" Width="16" Height="16" Offset="0x77680"/>
+        <Texture Name="gMsgKanji9864Tex" OutName="msg_kanji_9864" Format="i4" Width="16" Height="16" Offset="0x77700"/>
+        <Texture Name="gMsgKanji9865Tex" OutName="msg_kanji_9865" Format="i4" Width="16" Height="16" Offset="0x77780"/>
+        <Texture Name="gMsgKanji9866Tex" OutName="msg_kanji_9866" Format="i4" Width="16" Height="16" Offset="0x77800"/>
+        <Texture Name="gMsgKanji9867Tex" OutName="msg_kanji_9867" Format="i4" Width="16" Height="16" Offset="0x77880"/>
+        <Texture Name="gMsgKanji9868Tex" OutName="msg_kanji_9868" Format="i4" Width="16" Height="16" Offset="0x77900"/>
+        <Texture Name="gMsgKanji9869Tex" OutName="msg_kanji_9869" Format="i4" Width="16" Height="16" Offset="0x77980"/>
+        <Texture Name="gMsgKanji986ATex" OutName="msg_kanji_986A" Format="i4" Width="16" Height="16" Offset="0x77A00"/>
+        <Texture Name="gMsgKanji986BTex" OutName="msg_kanji_986B" Format="i4" Width="16" Height="16" Offset="0x77A80"/>
+        <Texture Name="gMsgKanji986CTex" OutName="msg_kanji_986C" Format="i4" Width="16" Height="16" Offset="0x77B00"/>
+        <Texture Name="gMsgKanji986DTex" OutName="msg_kanji_986D" Format="i4" Width="16" Height="16" Offset="0x77B80"/>
+        <Texture Name="gMsgKanji986ETex" OutName="msg_kanji_986E" Format="i4" Width="16" Height="16" Offset="0x77C00"/>
+        <Texture Name="gMsgKanji986FTex" OutName="msg_kanji_986F" Format="i4" Width="16" Height="16" Offset="0x77C80"/>
+        <Texture Name="gMsgKanji9870Tex" OutName="msg_kanji_9870" Format="i4" Width="16" Height="16" Offset="0x77D00"/>
+        <Texture Name="gMsgKanji9871Tex" OutName="msg_kanji_9871" Format="i4" Width="16" Height="16" Offset="0x77D80"/>
+        <Texture Name="gMsgKanji9872Tex" OutName="msg_kanji_9872" Format="i4" Width="16" Height="16" Offset="0x77E00"/>
+        <Texture Name="gMsgKanji9873EmptyTex" OutName="msg_kanji_9873_empty" Format="i4" Width="16" Height="16" Offset="0x77E80"/>
+        <Texture Name="gMsgKanji9874EmptyTex" OutName="msg_kanji_9874_empty" Format="i4" Width="16" Height="16" Offset="0x77F00"/>
+        <Texture Name="gMsgKanji9875EmptyTex" OutName="msg_kanji_9875_empty" Format="i4" Width="16" Height="16" Offset="0x77F80"/>
+        <Texture Name="gMsgKanji9876EmptyTex" OutName="msg_kanji_9876_empty" Format="i4" Width="16" Height="16" Offset="0x78000"/>
+        <Texture Name="gMsgKanji9877EmptyTex" OutName="msg_kanji_9877_empty" Format="i4" Width="16" Height="16" Offset="0x78080"/>
+        <Texture Name="gMsgKanji9878EmptyTex" OutName="msg_kanji_9878_empty" Format="i4" Width="16" Height="16" Offset="0x78100"/>
+        <Texture Name="gMsgKanji9879EmptyTex" OutName="msg_kanji_9879_empty" Format="i4" Width="16" Height="16" Offset="0x78180"/>
+        <Texture Name="gMsgKanji987AEmptyTex" OutName="msg_kanji_987A_empty" Format="i4" Width="16" Height="16" Offset="0x78200"/>
+        <Texture Name="gMsgKanji987BEmptyTex" OutName="msg_kanji_987B_empty" Format="i4" Width="16" Height="16" Offset="0x78280"/>
+        <Texture Name="gMsgKanji987CEmptyTex" OutName="msg_kanji_987C_empty" Format="i4" Width="16" Height="16" Offset="0x78300"/>
+        <Texture Name="gMsgKanji987DEmptyTex" OutName="msg_kanji_987D_empty" Format="i4" Width="16" Height="16" Offset="0x78380"/>
+        <Texture Name="gMsgKanji987EEmptyTex" OutName="msg_kanji_987E_empty" Format="i4" Width="16" Height="16" Offset="0x78400"/>
+        <Texture Name="gMsgKanji9880EmptyTex" OutName="msg_kanji_9880_empty" Format="i4" Width="16" Height="16" Offset="0x78480"/>
+        <Texture Name="gMsgKanji9881EmptyTex" OutName="msg_kanji_9881_empty" Format="i4" Width="16" Height="16" Offset="0x78500"/>
+        <Texture Name="gMsgKanji9882EmptyTex" OutName="msg_kanji_9882_empty" Format="i4" Width="16" Height="16" Offset="0x78580"/>
+        <Texture Name="gMsgKanji9883EmptyTex" OutName="msg_kanji_9883_empty" Format="i4" Width="16" Height="16" Offset="0x78600"/>
+        <Texture Name="gMsgKanji9884EmptyTex" OutName="msg_kanji_9884_empty" Format="i4" Width="16" Height="16" Offset="0x78680"/>
+        <Texture Name="gMsgKanji9885EmptyTex" OutName="msg_kanji_9885_empty" Format="i4" Width="16" Height="16" Offset="0x78700"/>
+        <Texture Name="gMsgKanji9886EmptyTex" OutName="msg_kanji_9886_empty" Format="i4" Width="16" Height="16" Offset="0x78780"/>
+        <Texture Name="gMsgKanji9887EmptyTex" OutName="msg_kanji_9887_empty" Format="i4" Width="16" Height="16" Offset="0x78800"/>
+        <Texture Name="gMsgKanji9888EmptyTex" OutName="msg_kanji_9888_empty" Format="i4" Width="16" Height="16" Offset="0x78880"/>
+        <Texture Name="gMsgKanji9889EmptyTex" OutName="msg_kanji_9889_empty" Format="i4" Width="16" Height="16" Offset="0x78900"/>
+        <Texture Name="gMsgKanji988AEmptyTex" OutName="msg_kanji_988A_empty" Format="i4" Width="16" Height="16" Offset="0x78980"/>
+        <Texture Name="gMsgKanji988BEmptyTex" OutName="msg_kanji_988B_empty" Format="i4" Width="16" Height="16" Offset="0x78A00"/>
+        <Texture Name="gMsgKanji988CEmptyTex" OutName="msg_kanji_988C_empty" Format="i4" Width="16" Height="16" Offset="0x78A80"/>
+        <Texture Name="gMsgKanji988DEmptyTex" OutName="msg_kanji_988D_empty" Format="i4" Width="16" Height="16" Offset="0x78B00"/>
+        <Texture Name="gMsgKanji988EEmptyTex" OutName="msg_kanji_988E_empty" Format="i4" Width="16" Height="16" Offset="0x78B80"/>
+        <Texture Name="gMsgKanji988FEmptyTex" OutName="msg_kanji_988F_empty" Format="i4" Width="16" Height="16" Offset="0x78C00"/>
+        <Texture Name="gMsgKanji9890EmptyTex" OutName="msg_kanji_9890_empty" Format="i4" Width="16" Height="16" Offset="0x78C80"/>
+        <Texture Name="gMsgKanji9891EmptyTex" OutName="msg_kanji_9891_empty" Format="i4" Width="16" Height="16" Offset="0x78D00"/>
+        <Texture Name="gMsgKanji9892EmptyTex" OutName="msg_kanji_9892_empty" Format="i4" Width="16" Height="16" Offset="0x78D80"/>
+        <Texture Name="gMsgKanji9893EmptyTex" OutName="msg_kanji_9893_empty" Format="i4" Width="16" Height="16" Offset="0x78E00"/>
+        <Texture Name="gMsgKanji9894EmptyTex" OutName="msg_kanji_9894_empty" Format="i4" Width="16" Height="16" Offset="0x78E80"/>
+        <Texture Name="gMsgKanji9895EmptyTex" OutName="msg_kanji_9895_empty" Format="i4" Width="16" Height="16" Offset="0x78F00"/>
+        <Texture Name="gMsgKanji9896EmptyTex" OutName="msg_kanji_9896_empty" Format="i4" Width="16" Height="16" Offset="0x78F80"/>
+        <Texture Name="gMsgKanji9897EmptyTex" OutName="msg_kanji_9897_empty" Format="i4" Width="16" Height="16" Offset="0x79000"/>
+        <Texture Name="gMsgKanji9898EmptyTex" OutName="msg_kanji_9898_empty" Format="i4" Width="16" Height="16" Offset="0x79080"/>
+        <Texture Name="gMsgKanji9899EmptyTex" OutName="msg_kanji_9899_empty" Format="i4" Width="16" Height="16" Offset="0x79100"/>
+        <Texture Name="gMsgKanji989AEmptyTex" OutName="msg_kanji_989A_empty" Format="i4" Width="16" Height="16" Offset="0x79180"/>
+        <Texture Name="gMsgKanji989BEmptyTex" OutName="msg_kanji_989B_empty" Format="i4" Width="16" Height="16" Offset="0x79200"/>
+        <Texture Name="gMsgKanji989CEmptyTex" OutName="msg_kanji_989C_empty" Format="i4" Width="16" Height="16" Offset="0x79280"/>
+        <Texture Name="gMsgKanji989DEmptyTex" OutName="msg_kanji_989D_empty" Format="i4" Width="16" Height="16" Offset="0x79300"/>
+        <Texture Name="gMsgKanji989EEmptyTex" OutName="msg_kanji_989E_empty" Format="i4" Width="16" Height="16" Offset="0x79380"/>
+        <Texture Name="gMsgKanji989FEmptyTex" OutName="msg_kanji_989F_empty" Format="i4" Width="16" Height="16" Offset="0x79400"/>
+        <Texture Name="gMsgKanji98A0EmptyTex" OutName="msg_kanji_98A0_empty" Format="i4" Width="16" Height="16" Offset="0x79480"/>
+        <Texture Name="gMsgKanji98A1EmptyTex" OutName="msg_kanji_98A1_empty" Format="i4" Width="16" Height="16" Offset="0x79500"/>
+        <Texture Name="gMsgKanji98A2EmptyTex" OutName="msg_kanji_98A2_empty" Format="i4" Width="16" Height="16" Offset="0x79580"/>
+        <Texture Name="gMsgKanji98A3EmptyTex" OutName="msg_kanji_98A3_empty" Format="i4" Width="16" Height="16" Offset="0x79600"/>
+        <Texture Name="gMsgKanji98A4EmptyTex" OutName="msg_kanji_98A4_empty" Format="i4" Width="16" Height="16" Offset="0x79680"/>
+        <Texture Name="gMsgKanji98A5EmptyTex" OutName="msg_kanji_98A5_empty" Format="i4" Width="16" Height="16" Offset="0x79700"/>
+        <Texture Name="gMsgKanji98A6EmptyTex" OutName="msg_kanji_98A6_empty" Format="i4" Width="16" Height="16" Offset="0x79780"/>
+        <Texture Name="gMsgKanji98A7EmptyTex" OutName="msg_kanji_98A7_empty" Format="i4" Width="16" Height="16" Offset="0x79800"/>
+        <Texture Name="gMsgKanji98A8EmptyTex" OutName="msg_kanji_98A8_empty" Format="i4" Width="16" Height="16" Offset="0x79880"/>
+        <Texture Name="gMsgKanji98A9EmptyTex" OutName="msg_kanji_98A9_empty" Format="i4" Width="16" Height="16" Offset="0x79900"/>
+        <Texture Name="gMsgKanji98AAEmptyTex" OutName="msg_kanji_98AA_empty" Format="i4" Width="16" Height="16" Offset="0x79980"/>
+        <Texture Name="gMsgKanji98ABEmptyTex" OutName="msg_kanji_98AB_empty" Format="i4" Width="16" Height="16" Offset="0x79A00"/>
+        <Texture Name="gMsgKanji98ACEmptyTex" OutName="msg_kanji_98AC_empty" Format="i4" Width="16" Height="16" Offset="0x79A80"/>
+        <Texture Name="gMsgKanji98ADEmptyTex" OutName="msg_kanji_98AD_empty" Format="i4" Width="16" Height="16" Offset="0x79B00"/>
+        <Texture Name="gMsgKanji98AEEmptyTex" OutName="msg_kanji_98AE_empty" Format="i4" Width="16" Height="16" Offset="0x79B80"/>
+        <Texture Name="gMsgKanji98AFEmptyTex" OutName="msg_kanji_98AF_empty" Format="i4" Width="16" Height="16" Offset="0x79C00"/>
+        <Texture Name="gMsgKanji98B0EmptyTex" OutName="msg_kanji_98B0_empty" Format="i4" Width="16" Height="16" Offset="0x79C80"/>
+        <Texture Name="gMsgKanji98B1EmptyTex" OutName="msg_kanji_98B1_empty" Format="i4" Width="16" Height="16" Offset="0x79D00"/>
+        <Texture Name="gMsgKanji98B2EmptyTex" OutName="msg_kanji_98B2_empty" Format="i4" Width="16" Height="16" Offset="0x79D80"/>
+        <Texture Name="gMsgKanji98B3EmptyTex" OutName="msg_kanji_98B3_empty" Format="i4" Width="16" Height="16" Offset="0x79E00"/>
+        <Texture Name="gMsgKanji98B4EmptyTex" OutName="msg_kanji_98B4_empty" Format="i4" Width="16" Height="16" Offset="0x79E80"/>
+        <Texture Name="gMsgKanji98B5EmptyTex" OutName="msg_kanji_98B5_empty" Format="i4" Width="16" Height="16" Offset="0x79F00"/>
+        <Texture Name="gMsgKanji98B6EmptyTex" OutName="msg_kanji_98B6_empty" Format="i4" Width="16" Height="16" Offset="0x79F80"/>
+        <Texture Name="gMsgKanji98B7EmptyTex" OutName="msg_kanji_98B7_empty" Format="i4" Width="16" Height="16" Offset="0x7A000"/>
+        <Texture Name="gMsgKanji98B8EmptyTex" OutName="msg_kanji_98B8_empty" Format="i4" Width="16" Height="16" Offset="0x7A080"/>
+        <Texture Name="gMsgKanji98B9EmptyTex" OutName="msg_kanji_98B9_empty" Format="i4" Width="16" Height="16" Offset="0x7A100"/>
+        <Texture Name="gMsgKanji98BAEmptyTex" OutName="msg_kanji_98BA_empty" Format="i4" Width="16" Height="16" Offset="0x7A180"/>
+        <Texture Name="gMsgKanji98BBEmptyTex" OutName="msg_kanji_98BB_empty" Format="i4" Width="16" Height="16" Offset="0x7A200"/>
+        <Texture Name="gMsgKanji98BCEmptyTex" OutName="msg_kanji_98BC_empty" Format="i4" Width="16" Height="16" Offset="0x7A280"/>
+        <Texture Name="gMsgKanji98BDEmptyTex" OutName="msg_kanji_98BD_empty" Format="i4" Width="16" Height="16" Offset="0x7A300"/>
+        <Texture Name="gMsgKanji98BEEmptyTex" OutName="msg_kanji_98BE_empty" Format="i4" Width="16" Height="16" Offset="0x7A380"/>
+        <Texture Name="gMsgKanji98BFEmptyTex" OutName="msg_kanji_98BF_empty" Format="i4" Width="16" Height="16" Offset="0x7A400"/>
+        <Texture Name="gMsgKanji98C0EmptyTex" OutName="msg_kanji_98C0_empty" Format="i4" Width="16" Height="16" Offset="0x7A480"/>
+        <Texture Name="gMsgKanji98C1EmptyTex" OutName="msg_kanji_98C1_empty" Format="i4" Width="16" Height="16" Offset="0x7A500"/>
+        <Texture Name="gMsgKanji98C2EmptyTex" OutName="msg_kanji_98C2_empty" Format="i4" Width="16" Height="16" Offset="0x7A580"/>
+        <Texture Name="gMsgKanji98C3EmptyTex" OutName="msg_kanji_98C3_empty" Format="i4" Width="16" Height="16" Offset="0x7A600"/>
+        <Texture Name="gMsgKanji98C4EmptyTex" OutName="msg_kanji_98C4_empty" Format="i4" Width="16" Height="16" Offset="0x7A680"/>
+        <Texture Name="gMsgKanji98C5EmptyTex" OutName="msg_kanji_98C5_empty" Format="i4" Width="16" Height="16" Offset="0x7A700"/>
+        <Texture Name="gMsgKanji98C6EmptyTex" OutName="msg_kanji_98C6_empty" Format="i4" Width="16" Height="16" Offset="0x7A780"/>
+        <Texture Name="gMsgKanji98C7EmptyTex" OutName="msg_kanji_98C7_empty" Format="i4" Width="16" Height="16" Offset="0x7A800"/>
+        <Texture Name="gMsgKanji98C8EmptyTex" OutName="msg_kanji_98C8_empty" Format="i4" Width="16" Height="16" Offset="0x7A880"/>
+        <Texture Name="gMsgKanji98C9EmptyTex" OutName="msg_kanji_98C9_empty" Format="i4" Width="16" Height="16" Offset="0x7A900"/>
+        <Texture Name="gMsgKanji98CAEmptyTex" OutName="msg_kanji_98CA_empty" Format="i4" Width="16" Height="16" Offset="0x7A980"/>
+        <Texture Name="gMsgKanji98CBEmptyTex" OutName="msg_kanji_98CB_empty" Format="i4" Width="16" Height="16" Offset="0x7AA00"/>
+        <Texture Name="gMsgKanji98CCEmptyTex" OutName="msg_kanji_98CC_empty" Format="i4" Width="16" Height="16" Offset="0x7AA80"/>
+        <Texture Name="gMsgKanji98CDEmptyTex" OutName="msg_kanji_98CD_empty" Format="i4" Width="16" Height="16" Offset="0x7AB00"/>
+        <Texture Name="gMsgKanji98CEEmptyTex" OutName="msg_kanji_98CE_empty" Format="i4" Width="16" Height="16" Offset="0x7AB80"/>
+        <Texture Name="gMsgKanji98CFEmptyTex" OutName="msg_kanji_98CF_empty" Format="i4" Width="16" Height="16" Offset="0x7AC00"/>
+        <Texture Name="gMsgKanji98D0EmptyTex" OutName="msg_kanji_98D0_empty" Format="i4" Width="16" Height="16" Offset="0x7AC80"/>
+        <Texture Name="gMsgKanji98D1EmptyTex" OutName="msg_kanji_98D1_empty" Format="i4" Width="16" Height="16" Offset="0x7AD00"/>
+        <Texture Name="gMsgKanji98D2EmptyTex" OutName="msg_kanji_98D2_empty" Format="i4" Width="16" Height="16" Offset="0x7AD80"/>
+        <Texture Name="gMsgKanji98D3EmptyTex" OutName="msg_kanji_98D3_empty" Format="i4" Width="16" Height="16" Offset="0x7AE00"/>
+        <Texture Name="gMsgKanji98D4EmptyTex" OutName="msg_kanji_98D4_empty" Format="i4" Width="16" Height="16" Offset="0x7AE80"/>
+        <Texture Name="gMsgKanji98D5EmptyTex" OutName="msg_kanji_98D5_empty" Format="i4" Width="16" Height="16" Offset="0x7AF00"/>
+        <Texture Name="gMsgKanji98D6EmptyTex" OutName="msg_kanji_98D6_empty" Format="i4" Width="16" Height="16" Offset="0x7AF80"/>
+        <Texture Name="gMsgKanji98D7EmptyTex" OutName="msg_kanji_98D7_empty" Format="i4" Width="16" Height="16" Offset="0x7B000"/>
+        <Texture Name="gMsgKanji98D8EmptyTex" OutName="msg_kanji_98D8_empty" Format="i4" Width="16" Height="16" Offset="0x7B080"/>
+        <Texture Name="gMsgKanji98D9EmptyTex" OutName="msg_kanji_98D9_empty" Format="i4" Width="16" Height="16" Offset="0x7B100"/>
+        <Texture Name="gMsgKanji98DAEmptyTex" OutName="msg_kanji_98DA_empty" Format="i4" Width="16" Height="16" Offset="0x7B180"/>
+        <Texture Name="gMsgKanji98DBEmptyTex" OutName="msg_kanji_98DB_empty" Format="i4" Width="16" Height="16" Offset="0x7B200"/>
+        <Texture Name="gMsgKanji98DCEmptyTex" OutName="msg_kanji_98DC_empty" Format="i4" Width="16" Height="16" Offset="0x7B280"/>
+        <Texture Name="gMsgKanji98DDEmptyTex" OutName="msg_kanji_98DD_empty" Format="i4" Width="16" Height="16" Offset="0x7B300"/>
+        <Texture Name="gMsgKanji98DEEmptyTex" OutName="msg_kanji_98DE_empty" Format="i4" Width="16" Height="16" Offset="0x7B380"/>
+        <Texture Name="gMsgKanji98DFEmptyTex" OutName="msg_kanji_98DF_empty" Format="i4" Width="16" Height="16" Offset="0x7B400"/>
+        <Texture Name="gMsgKanji98E0EmptyTex" OutName="msg_kanji_98E0_empty" Format="i4" Width="16" Height="16" Offset="0x7B480"/>
+        <Texture Name="gMsgKanji98E1EmptyTex" OutName="msg_kanji_98E1_empty" Format="i4" Width="16" Height="16" Offset="0x7B500"/>
+        <Texture Name="gMsgKanji98E2EmptyTex" OutName="msg_kanji_98E2_empty" Format="i4" Width="16" Height="16" Offset="0x7B580"/>
+        <Texture Name="gMsgKanji98E3EmptyTex" OutName="msg_kanji_98E3_empty" Format="i4" Width="16" Height="16" Offset="0x7B600"/>
+        <Texture Name="gMsgKanji98E4EmptyTex" OutName="msg_kanji_98E4_empty" Format="i4" Width="16" Height="16" Offset="0x7B680"/>
+        <Texture Name="gMsgKanji98E5EmptyTex" OutName="msg_kanji_98E5_empty" Format="i4" Width="16" Height="16" Offset="0x7B700"/>
+        <Texture Name="gMsgKanji98E6EmptyTex" OutName="msg_kanji_98E6_empty" Format="i4" Width="16" Height="16" Offset="0x7B780"/>
+        <Texture Name="gMsgKanji98E7EmptyTex" OutName="msg_kanji_98E7_empty" Format="i4" Width="16" Height="16" Offset="0x7B800"/>
+        <Texture Name="gMsgKanji98E8EmptyTex" OutName="msg_kanji_98E8_empty" Format="i4" Width="16" Height="16" Offset="0x7B880"/>
+        <Texture Name="gMsgKanji98E9EmptyTex" OutName="msg_kanji_98E9_empty" Format="i4" Width="16" Height="16" Offset="0x7B900"/>
+        <Texture Name="gMsgKanji98EAEmptyTex" OutName="msg_kanji_98EA_empty" Format="i4" Width="16" Height="16" Offset="0x7B980"/>
+        <Texture Name="gMsgKanji98EBEmptyTex" OutName="msg_kanji_98EB_empty" Format="i4" Width="16" Height="16" Offset="0x7BA00"/>
+        <Texture Name="gMsgKanji98ECEmptyTex" OutName="msg_kanji_98EC_empty" Format="i4" Width="16" Height="16" Offset="0x7BA80"/>
+        <Texture Name="gMsgKanji98EDEmptyTex" OutName="msg_kanji_98ED_empty" Format="i4" Width="16" Height="16" Offset="0x7BB00"/>
+        <Texture Name="gMsgKanji98EEEmptyTex" OutName="msg_kanji_98EE_empty" Format="i4" Width="16" Height="16" Offset="0x7BB80"/>
+        <Texture Name="gMsgKanji98EFEmptyTex" OutName="msg_kanji_98EF_empty" Format="i4" Width="16" Height="16" Offset="0x7BC00"/>
+        <Texture Name="gMsgKanji98F0EmptyTex" OutName="msg_kanji_98F0_empty" Format="i4" Width="16" Height="16" Offset="0x7BC80"/>
+        <Texture Name="gMsgKanji98F1EmptyTex" OutName="msg_kanji_98F1_empty" Format="i4" Width="16" Height="16" Offset="0x7BD00"/>
+        <Texture Name="gMsgKanji98F2EmptyTex" OutName="msg_kanji_98F2_empty" Format="i4" Width="16" Height="16" Offset="0x7BD80"/>
+        <Texture Name="gMsgKanji98F3EmptyTex" OutName="msg_kanji_98F3_empty" Format="i4" Width="16" Height="16" Offset="0x7BE00"/>
+        <Texture Name="gMsgKanji98F4EmptyTex" OutName="msg_kanji_98F4_empty" Format="i4" Width="16" Height="16" Offset="0x7BE80"/>
+        <Texture Name="gMsgKanji98F5EmptyTex" OutName="msg_kanji_98F5_empty" Format="i4" Width="16" Height="16" Offset="0x7BF00"/>
+        <Texture Name="gMsgKanji98F6EmptyTex" OutName="msg_kanji_98F6_empty" Format="i4" Width="16" Height="16" Offset="0x7BF80"/>
+        <Texture Name="gMsgKanji98F7EmptyTex" OutName="msg_kanji_98F7_empty" Format="i4" Width="16" Height="16" Offset="0x7C000"/>
+        <Texture Name="gMsgKanji98F8EmptyTex" OutName="msg_kanji_98F8_empty" Format="i4" Width="16" Height="16" Offset="0x7C080"/>
+        <Texture Name="gMsgKanji98F9EmptyTex" OutName="msg_kanji_98F9_empty" Format="i4" Width="16" Height="16" Offset="0x7C100"/>
+        <Texture Name="gMsgKanji98FAEmptyTex" OutName="msg_kanji_98FA_empty" Format="i4" Width="16" Height="16" Offset="0x7C180"/>
+        <Texture Name="gMsgKanji98FBEmptyTex" OutName="msg_kanji_98FB_empty" Format="i4" Width="16" Height="16" Offset="0x7C200"/>
+        <Texture Name="gMsgKanji98FCEmptyTex" OutName="msg_kanji_98FC_empty" Format="i4" Width="16" Height="16" Offset="0x7C280"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/textures/map_48x85_static.xml b/soh/assets/xml/N64_NTSC_12/textures/map_48x85_static.xml
new file mode 100644
index 0000000000..b2ea46340a
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/map_48x85_static.xml
@@ -0,0 +1,72 @@
+<Root>
+    <File Name="map_48x85_static" Segment="12">
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
+    </File>
+</Root>
\ No newline at end of file
diff --git a/soh/assets/xml/N64_NTSC_12/textures/map_grand_static.xml b/soh/assets/xml/N64_NTSC_12/textures/map_grand_static.xml
new file mode 100644
index 0000000000..201955bfc3
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/map_grand_static.xml
@@ -0,0 +1,28 @@
+<Root>
+     <File Name="map_grand_static" Segment="11">
+        <Texture Name="gHyruleFieldMinimapTex" OutName="hyrule_field_minimap" Format="ia4" Width="80" Height="73" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageMinimapTex" OutName="kakariko_village_minimap" Format="ia4" Width="80" Height="64" Offset="0xB68"/>
+        <Texture Name="gGraveyardMinimapTex" OutName="graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0x1568"/>
+        <Texture Name="gZorasRiverMinimapTex" OutName="zoras_river_minimap" Format="ia4" Width="96" Height="58" Offset="0x1B80"/>
+        <Texture Name="gKokiriForestMinimapTex" OutName="kokiri_forest_minimap" Format="ia4" Width="96" Height="62" Offset="0x2660"/>
+        <Texture Name="gSacredMeadowMinimapTex" OutName="sacred_meadow_minimap" Format="ia4" Width="48" Height="85" Offset="0x3200"/>
+        <Texture Name="gLakeHyliaMinimapTex" OutName="lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0x39F8"/>
+        <Texture Name="gZorasDomainMinimapTex" OutName="zoras_domain_minimap" Format="ia4" Width="64" Height="73" Offset="0x46A0"/>
+        <Texture Name="gZorasFountainMinimapTex" OutName="zoras_fountain_minimap" Format="ia4" Width="64" Height="65" Offset="0x4FC0"/>
+        <Texture Name="gGerudoValleyMinimapTex" OutName="gerudo_valley_minimap" Format="ia4" Width="80" Height="65" Offset="0x57E0"/>
+        <Texture Name="gHauntedWastelandMinimapTex" OutName="haunted_wasteland_minimap" Format="ia4" Width="64" Height="56" Offset="0x6208"/>
+        <Texture Name="gDesertColossusMinimapTex" OutName="desert_colossus_minimap" Format="ia4" Width="64" Height="59" Offset="0x6908"/>
+        <Texture Name="gGerudosFortessMinimapTex" OutName="gerudos_fortess_minimap" Format="ia4" Width="80" Height="85" Offset="0x7068"/>
+        <Texture Name="gLostWoodsMinimapTex" OutName="lost_woods_minimap" Format="ia4" Width="64" Height="56" Offset="0x7DB0"/>
+        <Texture Name="gHyruleCastleAreaMinimapTex" OutName="hyrule_castle_area_minimap" Format="ia4" Width="64" Height="59" Offset="0x84B0"/>
+        <Texture Name="gDeathMountainTrailMinimapTex" OutName="death_mountain_trail_minimap" Format="ia4" Width="48" Height="85" Offset="0x8C10"/>
+        <Texture Name="gDeathMountainCraterMinimapTex" OutName="death_mountain_crater_minimap" Format="ia4" Width="80" Height="78" Offset="0x9408"/>
+        <Texture Name="gGoronCityMinimapTex" OutName="goron_city_minimap" Format="ia4" Width="64" Height="72" Offset="0xA038"/>
+        <Texture Name="gLonLonRanchMinimapTex" OutName="lon_lon_ranch_minimap" Format="ia4" Width="64" Height="68" Offset="0xA938"/>
+        <Texture Name="gOutsideGanonsCastleMinimapTex" OutName="outside_ganons_castle_minimap" Format="ia4" Width="64" Height="59" Offset="0xB1B8"/>
+        <Texture Name="gExploredShadowGraveyardMinimapTex" OutName="explored_shadow_graveyard_minimap" Format="ia4" Width="80" Height="39" Offset="0xB918"/>
+        <Texture Name="gDrainedLakeHyliaMinimapTex" OutName="drained_lake_hylia_minimap" Format="ia4" Width="80" Height="81" Offset="0xBF30"/>
+        <Texture Name="gGerudoValleyWithBrokenBridgeMinimapTex" OutName="gerudo_valley_with_broken_bridge_minimap" Format="ia4" Width="80" Height="65" Offset="0xCBD8"/>
+        <Texture Name="gGerudosFortressMinimapTex" OutName="gerudos_fortress_minimap" Format="ia4" Width="80" Height="85" Offset="0xD600"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/map_i_static.xml b/soh/assets/xml/N64_NTSC_12/textures/map_i_static.xml
new file mode 100644
index 0000000000..1721f6d848
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/map_i_static.xml
@@ -0,0 +1,243 @@
+<Root>
+     <File Name="map_i_static" Segment="11">
+        <Texture Name="gDekuTreeRoom0Floor1MinimapTex" OutName="deku_tree_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreeRoom1MinimapTex" OutName="deku_tree_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xFF0"/>
+        <Texture Name="gDekuTreeRoom2MinimapTex" OutName="deku_tree_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreeRoom3MinimapTex" OutName="deku_tree_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreeRoom4MinimapTex" OutName="deku_tree_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreeRoom5MinimapTex" OutName="deku_tree_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDekuTreeRoom6MinimapTex" OutName="deku_tree_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDekuTreeRoom7MinimapTex" OutName="deku_tree_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x6F90"/>
+        <Texture Name="gDekuTreeRoom8MinimapTex" OutName="deku_tree_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x7F80"/>
+        <Texture Name="gDekuTreeRoom9MinimapTex" OutName="deku_tree_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x8F70"/>
+        <Texture Name="gDekuTreeRoom10MinimapTex" OutName="deku_tree_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x9F60"/>
+        <Texture Name="gDekuTreeRoom0Floor2MinimapTex" OutName="deku_tree_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xAF50"/>
+        <Texture Name="gDekuTreeRoom0Floor3MinimapTex" OutName="deku_tree_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBF40"/>
+        <Texture Name="gDodongosCavernRoom0MinimapTex" OutName="dodongos_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xCF30"/>
+        <Texture Name="gDodongosCavernRoom1MinimapTex" OutName="dodongos_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xDF20"/>
+        <Texture Name="gDodongosCavernRoom2MinimapTex" OutName="dodongos_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xEF10"/>
+        <Texture Name="gDodongosCavernRoom3MinimapTex" OutName="dodongos_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xFF00"/>
+        <Texture Name="gDodongosCavernRoom4MinimapTex" OutName="dodongos_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gDodongosCavernRoom5MinimapTex" OutName="dodongos_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gDodongosCavernRoom6MinimapTex" OutName="dodongos_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gDodongosCavernRoom7MinimapTex" OutName="dodongos_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gDodongosCavernRoom8MinimapTex" OutName="dodongos_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gDodongosCavernRoom9MinimapTex" OutName="dodongos_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gDodongosCavernRoom10MinimapTex" OutName="dodongos_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x16E90"/>
+        <Texture Name="gDodongosCavernRoom11MinimapTex" OutName="dodongos_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x17E80"/>
+        <Texture Name="gDodongosCavernRoom12MinimapTex" OutName="dodongos_cavern_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x18E70"/>
+        <Texture Name="gDodongosCavernRoom13MinimapTex" OutName="dodongos_cavern_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x19E60"/>
+        <Texture Name="gDodongosCavernRoom14MinimapTex" OutName="dodongos_cavern_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gDodongosCavernRoom15MinimapTex" OutName="dodongos_cavern_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gDodongosCavernRoom0Floor3MinimapTex" OutName="dodongos_cavern_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gDodongosCavernRoom2Floor3MinimapTex" OutName="dodongos_cavern_room_2_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gDodongosCavernRoom3Floor3MinimapTex" OutName="dodongos_cavern_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gJabuRoom0MinimapTex" OutName="jabu_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gJabuRoom1MinimapTex" OutName="jabu_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gJabuRoom2MinimapTex" OutName="jabu_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x21DE0"/>
+        <Texture Name="gJabuRoom3MinimapTex" OutName="jabu_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x22DD0"/>
+        <Texture Name="gJabuRoom4MinimapTex" OutName="jabu_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x23DC0"/>
+        <Texture Name="gJabuRoom5MinimapTex" OutName="jabu_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x24DB0"/>
+        <Texture Name="gJabuRoom6MinimapTex" OutName="jabu_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x25DA0"/>
+        <Texture Name="gJabuRoom7MinimapTex" OutName="jabu_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x26D90"/>
+        <Texture Name="gJabuRoom8MinimapTex" OutName="jabu_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x27D80"/>
+        <Texture Name="gJabuRoom9MinimapTex" OutName="jabu_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x28D70"/>
+        <Texture Name="gJabuRoom10MinimapTex" OutName="jabu_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x29D60"/>
+        <Texture Name="gJabuRoom11MinimapTex" OutName="jabu_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x2AD50"/>
+        <Texture Name="gJabuRoom12MinimapTex" OutName="jabu_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x2BD40"/>
+        <Texture Name="gJabuRoom13MinimapTex" OutName="jabu_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x2CD30"/>
+        <Texture Name="gJabuRoom14MinimapTex" OutName="jabu_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x2DD20"/>
+        <Texture Name="gJabuRoom1Basement1MinimapTex" OutName="jabu_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2ED10"/>
+        <Texture Name="gJabuRoom6Basement1MinimapTex" OutName="jabu_room_6_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x2FD00"/>
+        <Texture Name="gForestTempleRoom0Floor1MinimapTex" OutName="forest_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x30CF0"/>
+        <Texture Name="gForestTempleRoom1MinimapTex" OutName="forest_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x31CE0"/>
+        <Texture Name="gForestTempleRoom2MinimapTex" OutName="forest_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x32CD0"/>
+        <Texture Name="gForestTempleRoom3MinimapTex" OutName="forest_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x33CC0"/>
+        <Texture Name="gForestTempleRoom4MinimapTex" OutName="forest_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0x34CB0"/>
+        <Texture Name="gForestTempleRoom5MinimapTex" OutName="forest_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0x35CA0"/>
+        <Texture Name="gForestTempleRoom6Floor1MinimapTex" OutName="forest_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x36C90"/>
+        <Texture Name="gForestTempleRoom7Floor1MinimapTex" OutName="forest_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x37C80"/>
+        <Texture Name="gForestTempleRoom8Floor1MinimapTex" OutName="forest_temple_room_8_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x38C70"/>
+        <Texture Name="gForestTempleRoom9MinimapTex" OutName="forest_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x39C60"/>
+        <Texture Name="gForestTempleRoom10MinimapTex" OutName="forest_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0x3AC50"/>
+        <Texture Name="gForestTempleRoom11Floor1MinimapTex" OutName="forest_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x3BC40"/>
+        <Texture Name="gForestTempleRoom12MinimapTex" OutName="forest_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0x3CC30"/>
+        <Texture Name="gForestTempleRoom13MinimapTex" OutName="forest_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x3DC20"/>
+        <Texture Name="gForestTempleRoom14MinimapTex" OutName="forest_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x3EC10"/>
+        <Texture Name="gForestTempleRoom15MinimapTex" OutName="forest_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x3FC00"/>
+        <Texture Name="gForestTempleRoom16MinimapTex" OutName="forest_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x40BF0"/>
+        <Texture Name="gForestTempleRoom17MinimapTex" OutName="forest_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x41BE0"/>
+        <Texture Name="gForestTempleRoom18MinimapTex" OutName="forest_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x42BD0"/>
+        <Texture Name="gForestTempleRoom19MinimapTex" OutName="forest_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x43BC0"/>
+        <Texture Name="gForestTempleRoom20MinimapTex" OutName="forest_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x44BB0"/>
+        <Texture Name="gForestTempleRoom21MinimapTex" OutName="forest_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0x45BA0"/>
+        <Texture Name="gForestTempleRoom0Floor3MinimapTex" OutName="forest_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x46B90"/>
+        <Texture Name="gForestTempleRoom6Floor3MinimapTex" OutName="forest_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x47B80"/>
+        <Texture Name="gForestTempleRoom7Floor3MinimapTex" OutName="forest_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x48B70"/>
+        <Texture Name="gForestTempleRoom8Floor3MinimapTex" OutName="forest_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x49B60"/>
+        <Texture Name="gForestTempleRoom11Floor3MinimapTex" OutName="forest_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4AB50"/>
+        <Texture Name="gFireTempleRoom0MinimapTex" OutName="fire_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x4BB40"/>
+        <Texture Name="gFireTempleRoom1MinimapTex" OutName="fire_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4CB30"/>
+        <Texture Name="gFireTempleRoom2MinimapTex" OutName="fire_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x4DB20"/>
+        <Texture Name="gFireTempleRoom3MinimapTex" OutName="fire_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0x4EB10"/>
+        <Texture Name="gFireTempleRoom4Floor1MinimapTex" OutName="fire_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x4FB00"/>
+        <Texture Name="gFireTempleRoom5Floor1MinimapTex" OutName="fire_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x50AF0"/>
+        <Texture Name="gFireTempleRoom6Floor1MinimapTex" OutName="fire_temple_room_6_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x51AE0"/>
+        <Texture Name="gFireTempleRoom7Floor1MinimapTex" OutName="fire_temple_room_7_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x52AD0"/>
+        <Texture Name="gFireTempleRoom8MinimapTex" OutName="fire_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0x53AC0"/>
+        <Texture Name="gFireTempleRoom9MinimapTex" OutName="fire_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0x54AB0"/>
+        <Texture Name="gFireTempleRoom10Floor1MinimapTex" OutName="fire_temple_room_10_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x55AA0"/>
+        <Texture Name="gFireTempleRoom11Floor1MinimapTex" OutName="fire_temple_room_11_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x56A90"/>
+        <Texture Name="gFireTempleRoom12Floor1MinimapTex" OutName="fire_temple_room_12_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x57A80"/>
+        <Texture Name="gFireTempleRoom13Floor1MinimapTex" OutName="fire_temple_room_13_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x58A70"/>
+        <Texture Name="gFireTempleRoom14MinimapTex" OutName="fire_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0x59A60"/>
+        <Texture Name="gFireTempleRoom15MinimapTex" OutName="fire_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0x5AA50"/>
+        <Texture Name="gFireTempleRoom16MinimapTex" OutName="fire_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x5BA40"/>
+        <Texture Name="gFireTempleRoom17MinimapTex" OutName="fire_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0x5CA30"/>
+        <Texture Name="gFireTempleRoom18MinimapTex" OutName="fire_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x5DA20"/>
+        <Texture Name="gFireTempleRoom19MinimapTex" OutName="fire_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x5EA10"/>
+        <Texture Name="gFireTempleRoom20MinimapTex" OutName="fire_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0x5FA00"/>
+        <Texture Name="gFireTempleRoom21Floor1MinimapTex" OutName="fire_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x609F0"/>
+        <Texture Name="gFireTempleRoom22MinimapTex" OutName="fire_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0x619E0"/>
+        <Texture Name="gFireTempleRoom23MinimapTex" OutName="fire_temple_room_23_minimap" Format="i4" Width="96" Height="85" Offset="0x629D0"/>
+        <Texture Name="gFireTempleRoom24Floor1MinimapTex" OutName="fire_temple_room_24_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x639C0"/>
+        <Texture Name="gFireTempleRoom25MinimapTex" OutName="fire_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0x649B0"/>
+        <Texture Name="gFireTempleRoom4Floor3MinimapTex" OutName="fire_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x659A0"/>
+        <Texture Name="gFireTempleRoom5Floor3MinimapTex" OutName="fire_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x66990"/>
+        <Texture Name="gFireTempleRoom6Floor2MinimapTex" OutName="fire_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x67980"/>
+        <Texture Name="gFireTempleRoom6Floor3MinimapTex" OutName="fire_temple_room_6_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x68970"/>
+        <Texture Name="gFireTempleRoom7Floor3MinimapTex" OutName="fire_temple_room_7_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x69960"/>
+        <Texture Name="gFireTempleRoom10Floor2MinimapTex" OutName="fire_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x6A950"/>
+        <Texture Name="gFireTempleRoom10Floor3MinimapTex" OutName="fire_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6B940"/>
+        <Texture Name="gFireTempleRoom11Floor3MinimapTex" OutName="fire_temple_room_11_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6C930"/>
+        <Texture Name="gFireTempleRoom12Floor3MinimapTex" OutName="fire_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6D920"/>
+        <Texture Name="gFireTempleRoom13Floor3MinimapTex" OutName="fire_temple_room_13_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6E910"/>
+        <Texture Name="gFireTempleRoom21Floor3MinimapTex" OutName="fire_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x6F900"/>
+        <Texture Name="gFireTempleRoom24Floor3MinimapTex" OutName="fire_temple_room_24_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x708F0"/>
+        <Texture Name="gWaterTempleRoom0Floor3MinimapTex" OutName="water_temple_room_0_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x718E0"/>
+        <Texture Name="gWaterTempleRoom1Floor3MinimapTex" OutName="water_temple_room_1_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x728D0"/>
+        <Texture Name="gWaterTempleRoom2MinimapTex" OutName="water_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x738C0"/>
+        <Texture Name="gWaterTempleRoom3Floor3MinimapTex" OutName="water_temple_room_3_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x748B0"/>
+        <Texture Name="gWaterTempleRoom4Floor3MinimapTex" OutName="water_temple_room_4_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x758A0"/>
+        <Texture Name="gWaterTempleRoom5Floor3MinimapTex" OutName="water_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x76890"/>
+        <Texture Name="gWaterTempleRoom6MinimapTex" OutName="water_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0x77880"/>
+        <Texture Name="gWaterTempleRoom7MinimapTex" OutName="water_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0x78870"/>
+        <Texture Name="gWaterTempleRoom8Floor3MinimapTex" OutName="water_temple_room_8_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x79860"/>
+        <Texture Name="gWaterTempleRoom9Floor3MinimapTex" OutName="water_temple_room_9_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7A850"/>
+        <Texture Name="gWaterTempleRoom10Floor3MinimapTex" OutName="water_temple_room_10_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7B840"/>
+        <Texture Name="gWaterTempleRoom11MinimapTex" OutName="water_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0x7C830"/>
+        <Texture Name="gWaterTempleRoom12Floor3MinimapTex" OutName="water_temple_room_12_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7D820"/>
+        <Texture Name="gWaterTempleRoom13MinimapTex" OutName="water_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0x7E810"/>
+        <Texture Name="gWaterTempleRoom14Floor3MinimapTex" OutName="water_temple_room_14_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x7F800"/>
+        <Texture Name="gWaterTempleRoom15Floor3MinimapTex" OutName="water_temple_room_15_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x807F0"/>
+        <Texture Name="gWaterTempleRoom16MinimapTex" OutName="water_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0x817E0"/>
+        <Texture Name="gWaterTempleRoom17Floor3MinimapTex" OutName="water_temple_room_17_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x827D0"/>
+        <Texture Name="gWaterTempleRoom18MinimapTex" OutName="water_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0x837C0"/>
+        <Texture Name="gWaterTempleRoom19MinimapTex" OutName="water_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0x847B0"/>
+        <Texture Name="gWaterTempleRoom20Floor3MinimapTex" OutName="water_temple_room_20_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x857A0"/>
+        <Texture Name="gWaterTempleRoom21Floor3MinimapTex" OutName="water_temple_room_21_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0x86790"/>
+        <Texture Name="gWaterTempleRoom0Floor2MinimapTex" OutName="water_temple_room_0_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x87780"/>
+        <Texture Name="gWaterTempleRoom0Floor1MinimapTex" OutName="water_temple_room_0_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x88770"/>
+        <Texture Name="gWaterTempleRoom0Basement1MinimapTex" OutName="water_temple_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x89760"/>
+        <Texture Name="gWaterTempleRoom1Floor2MinimapTex" OutName="water_temple_room_1_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8A750"/>
+        <Texture Name="gWaterTempleRoom1Floor1MinimapTex" OutName="water_temple_room_1_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8B740"/>
+        <Texture Name="gWaterTempleRoom1Basement1MinimapTex" OutName="water_temple_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8C730"/>
+        <Texture Name="gWaterTempleRoom3Basement1MinimapTex" OutName="water_temple_room_3_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x8D720"/>
+        <Texture Name="gWaterTempleRoom4Floor2MinimapTex" OutName="water_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8E710"/>
+        <Texture Name="gWaterTempleRoom5Floor2MinimapTex" OutName="water_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x8F700"/>
+        <Texture Name="gWaterTempleRoom5Floor1MinimapTex" OutName="water_temple_room_5_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x906F0"/>
+        <Texture Name="gWaterTempleRoom6Floor2MinimapTex" OutName="water_temple_room_6_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x916E0"/>
+        <Texture Name="gWaterTempleRoom8Basement1MinimapTex" OutName="water_temple_room_8_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x926D0"/>
+        <Texture Name="gWaterTempleRoom9Basement1MinimapTex" OutName="water_temple_room_9_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x936C0"/>
+        <Texture Name="gWaterTempleRoom10Floor2MinimapTex" OutName="water_temple_room_10_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x946B0"/>
+        <Texture Name="gWaterTempleRoom12Basement1MinimapTex" OutName="water_temple_room_12_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x956A0"/>
+        <Texture Name="gWaterTempleRoom14Basement1MinimapTex" OutName="water_temple_room_14_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x96690"/>
+        <Texture Name="gWaterTempleRoom15Basement1MinimapTex" OutName="water_temple_room_15_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x97680"/>
+        <Texture Name="gWaterTempleRoom17Floor2MinimapTex" OutName="water_temple_room_17_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x98670"/>
+        <Texture Name="gWaterTempleRoom17Floor1MinimapTex" OutName="water_temple_room_17_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x99660"/>
+        <Texture Name="gWaterTempleRoom20Floor2MinimapTex" OutName="water_temple_room_20_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9A650"/>
+        <Texture Name="gWaterTempleRoom21Floor1MinimapTex" OutName="water_temple_room_21_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9B640"/>
+        <Texture Name="gWaterTempleRoom5Basement1MinimapTex" OutName="water_temple_room_5_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9C630"/>
+        <Texture Name="gSpiritTempleRoom0MinimapTex" OutName="spirit_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0x9D620"/>
+        <Texture Name="gSpiritTempleRoom1MinimapTex" OutName="spirit_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0x9E610"/>
+        <Texture Name="gSpiritTempleRoom2MinimapTex" OutName="spirit_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0x9F600"/>
+        <Texture Name="gSpiritTempleRoom3MinimapTex" OutName="spirit_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xA05F0"/>
+        <Texture Name="gSpiritTempleRoom4Floor1MinimapTex" OutName="spirit_temple_room_4_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xA15E0"/>
+        <Texture Name="gSpiritTempleRoom5Floor2MinimapTex" OutName="spirit_temple_room_5_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xA25D0"/>
+        <Texture Name="gSpiritTempleRoom6MinimapTex" OutName="spirit_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xA35C0"/>
+        <Texture Name="gSpiritTempleRoom7MinimapTex" OutName="spirit_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xA45B0"/>
+        <Texture Name="gSpiritTempleRoom8MinimapTex" OutName="spirit_temple_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xA55A0"/>
+        <Texture Name="gSpiritTempleRoom9MinimapTex" OutName="spirit_temple_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xA6590"/>
+        <Texture Name="gSpiritTempleRoom10MinimapTex" OutName="spirit_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xA7580"/>
+        <Texture Name="gBlankSpiritTempleRoom11MinimapTex" OutName="blankspirit_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xA8570"/>
+        <Texture Name="gSpiritTempleRoom12MinimapTex" OutName="spirit_temple_room_12_minimap" Format="i4" Width="96" Height="85" Offset="0xA9560"/>
+        <Texture Name="gSpiritTempleRoom13MinimapTex" OutName="spirit_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xAA550"/>
+        <Texture Name="gSpiritTempleRoom14MinimapTex" OutName="spirit_temple_room_14_minimap" Format="i4" Width="96" Height="85" Offset="0xAB540"/>
+        <Texture Name="gSpiritTempleRoom15Floor1MinimapTex" OutName="spirit_temple_room_15_floor_1_minimap" Format="i4" Width="96" Height="85" Offset="0xAC530"/>
+        <Texture Name="gSpiritTempleRoom16MinimapTex" OutName="spirit_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xAD520"/>
+        <Texture Name="gSpiritTempleRoom17MinimapTex" OutName="spirit_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xAE510"/>
+        <Texture Name="gSpiritTempleRoom18MinimapTex" OutName="spirit_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xAF500"/>
+        <Texture Name="gSpiritTempleRoom19MinimapTex" OutName="spirit_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xB04F0"/>
+        <Texture Name="gSpiritTempleRoom20MinimapTex" OutName="spirit_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xB14E0"/>
+        <Texture Name="gSpiritTempleRoom21MinimapTex" OutName="spirit_temple_room_21_minimap" Format="i4" Width="96" Height="85" Offset="0xB24D0"/>
+        <Texture Name="gSpiritTempleRoom22MinimapTex" OutName="spirit_temple_room_22_minimap" Format="i4" Width="96" Height="85" Offset="0xB34C0"/>
+        <Texture Name="gSpiritTempleRoom23Floor3MinimapTex" OutName="spirit_temple_room_23_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xB44B0"/>
+        <Texture Name="gSpiritTempleRoom24MinimapTex" OutName="spirit_temple_room_24_minimap" Format="i4" Width="96" Height="85" Offset="0xB54A0"/>
+        <Texture Name="gSpiritTempleRoom25MinimapTex" OutName="spirit_temple_room_25_minimap" Format="i4" Width="96" Height="85" Offset="0xB6490"/>
+        <Texture Name="gSpiritTempleRoom26MinimapTex" OutName="spirit_temple_room_26_minimap" Format="i4" Width="96" Height="85" Offset="0xB7480"/>
+        <Texture Name="gSpiritTempleRoom27MinimapTex" OutName="spirit_temple_room_27_minimap" Format="i4" Width="96" Height="85" Offset="0xB8470"/>
+        <Texture Name="gSpiritTempleRoom4Floor2MinimapTex" OutName="spirit_temple_room_4_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xB9460"/>
+        <Texture Name="gSpiritTempleRoom5Floor3MinimapTex" OutName="spirit_temple_room_5_floor_3_minimap" Format="i4" Width="96" Height="85" Offset="0xBA450"/>
+        <Texture Name="gSpiritTempleRoom15Floor2MinimapTex" OutName="spirit_temple_room_15_floor_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBB440"/>
+        <Texture Name="gSpiritTempleRoom23Floor4MinimapTex" OutName="spirit_temple_room_23_floor_4_minimap" Format="i4" Width="96" Height="85" Offset="0xBC430"/>
+        <Texture Name="gShadowTempleRoom0MinimapTex" OutName="shadow_temple_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xBD420"/>
+        <Texture Name="gShadowTempleRoom1MinimapTex" OutName="shadow_temple_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xBE410"/>
+        <Texture Name="gShadowTempleRoom2MinimapTex" OutName="shadow_temple_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xBF400"/>
+        <Texture Name="gShadowTempleRoom3MinimapTex" OutName="shadow_temple_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC03F0"/>
+        <Texture Name="gShadowTempleRoom4MinimapTex" OutName="shadow_temple_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xC13E0"/>
+        <Texture Name="gShadowTempleRoom5MinimapTex" OutName="shadow_temple_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xC23D0"/>
+        <Texture Name="gShadowTempleRoom6MinimapTex" OutName="shadow_temple_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xC33C0"/>
+        <Texture Name="gShadowTempleRoom7MinimapTex" OutName="shadow_temple_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xC43B0"/>
+        <Texture Name="gShadowTempleRoom8Basement2MinimapTex" OutName="shadow_temple_room_8_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xC53A0"/>
+        <Texture Name="gShadowTempleRoom9Basement3MinimapTex" OutName="shadow_temple_room_9_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC6390"/>
+        <Texture Name="gShadowTempleRoom10MinimapTex" OutName="shadow_temple_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xC7380"/>
+        <Texture Name="gShadowTempleRoom11MinimapTex" OutName="shadow_temple_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xC8370"/>
+        <Texture Name="gShadowTempleRoom12Basement3MinimapTex" OutName="shadow_temple_room_12_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xC9360"/>
+        <Texture Name="gShadowTempleRoom13MinimapTex" OutName="shadow_temple_room_13_minimap" Format="i4" Width="96" Height="85" Offset="0xCA350"/>
+        <Texture Name="gShadowTempleRoom14Basement3MinimapTex" OutName="shadow_temple_room_14_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xCB340"/>
+        <Texture Name="gShadowTempleRoom15MinimapTex" OutName="shadow_temple_room_15_minimap" Format="i4" Width="96" Height="85" Offset="0xCC330"/>
+        <Texture Name="gShadowTempleRoom16MinimapTex" OutName="shadow_temple_room_16_minimap" Format="i4" Width="96" Height="85" Offset="0xCD320"/>
+        <Texture Name="gShadowTempleRoom17MinimapTex" OutName="shadow_temple_room_17_minimap" Format="i4" Width="96" Height="85" Offset="0xCE310"/>
+        <Texture Name="gShadowTempleRoom18MinimapTex" OutName="shadow_temple_room_18_minimap" Format="i4" Width="96" Height="85" Offset="0xCF300"/>
+        <Texture Name="gShadowTempleRoom19MinimapTex" OutName="shadow_temple_room_19_minimap" Format="i4" Width="96" Height="85" Offset="0xD02F0"/>
+        <Texture Name="gShadowTempleRoom20MinimapTex" OutName="shadow_temple_room_20_minimap" Format="i4" Width="96" Height="85" Offset="0xD12E0"/>
+        <Texture Name="gShadowTempleRoom21Basement3MinimapTex" OutName="shadow_temple_room_21_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD22D0"/>
+        <Texture Name="gShadowTempleRoom8Basement3MinimapTex" OutName="shadow_temple_room_8_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xD32C0"/>
+        <Texture Name="gShadowTempleRoom9Basement4MinimapTex" OutName="shadow_temple_room_9_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD42B0"/>
+        <Texture Name="gShadowTempleRoom12Basement4MinimapTex" OutName="shadow_temple_room_12_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD52A0"/>
+        <Texture Name="gShadowTempleRoom14Basement4MinimapTex" OutName="shadow_temple_room_14_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD6290"/>
+        <Texture Name="gShadowTempleRoom21Basement4MinimapTex" OutName="shadow_temple_room_21_basement_4_minimap" Format="i4" Width="96" Height="85" Offset="0xD7280"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement1MinimapTex" OutName="bottom_of_the_well_room_0_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD8270"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement1MinimapTex" OutName="bottom_of_the_well_room_1_basement_1_minimap" Format="i4" Width="96" Height="85" Offset="0xD9260"/>
+        <Texture Name="gBottomOfTheWellRoom2MinimapTex" OutName="bottom_of_the_well_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDA250"/>
+        <Texture Name="gBottomOfTheWellRoom3MinimapTex" OutName="bottom_of_the_well_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xDB240"/>
+        <Texture Name="gBottomOfTheWellRoom4MinimapTex" OutName="bottom_of_the_well_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xDC230"/>
+        <Texture Name="gBottomOfTheWellRoom5MinimapTex" OutName="bottom_of_the_well_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xDD220"/>
+        <Texture Name="gBottomOfTheWellRoom6MinimapTex" OutName="bottom_of_the_well_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xDE210"/>
+        <Texture Name="gBottomOfTheWellRoom0Basement2MinimapTex" OutName="bottom_of_the_well_room_0_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xDF200"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement2MinimapTex" OutName="bottom_of_the_well_room_1_basement_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE01F0"/>
+        <Texture Name="gBottomOfTheWellRoom1Basement3MinimapTex" OutName="bottom_of_the_well_room_1_basement_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE11E0"/>
+        <Texture Name="gIceCavernRoom0MinimapTex" OutName="ice_cavern_room_0_minimap" Format="i4" Width="96" Height="85" Offset="0xE21D0"/>
+        <Texture Name="gIceCavernRoom1MinimapTex" OutName="ice_cavern_room_1_minimap" Format="i4" Width="96" Height="85" Offset="0xE31C0"/>
+        <Texture Name="gIceCavernRoom2MinimapTex" OutName="ice_cavern_room_2_minimap" Format="i4" Width="96" Height="85" Offset="0xE41B0"/>
+        <Texture Name="gIceCavernRoom3MinimapTex" OutName="ice_cavern_room_3_minimap" Format="i4" Width="96" Height="85" Offset="0xE51A0"/>
+        <Texture Name="gIceCavernRoom4MinimapTex" OutName="ice_cavern_room_4_minimap" Format="i4" Width="96" Height="85" Offset="0xE6190"/>
+        <Texture Name="gIceCavernRoom5MinimapTex" OutName="ice_cavern_room_5_minimap" Format="i4" Width="96" Height="85" Offset="0xE7180"/>
+        <Texture Name="gIceCavernRoom6MinimapTex" OutName="ice_cavern_room_6_minimap" Format="i4" Width="96" Height="85" Offset="0xE8170"/>
+        <Texture Name="gIceCavernRoom7MinimapTex" OutName="ice_cavern_room_7_minimap" Format="i4" Width="96" Height="85" Offset="0xE9160"/>
+        <Texture Name="gIceCavernRoom8MinimapTex" OutName="ice_cavern_room_8_minimap" Format="i4" Width="96" Height="85" Offset="0xEA150"/>
+        <Texture Name="gIceCavernRoom9MinimapTex" OutName="ice_cavern_room_9_minimap" Format="i4" Width="96" Height="85" Offset="0xEB140"/>
+        <Texture Name="gIceCavernRoom10MinimapTex" OutName="ice_cavern_room_10_minimap" Format="i4" Width="96" Height="85" Offset="0xEC130"/>
+        <Texture Name="gIceCavernRoom11MinimapTex" OutName="ice_cavern_room_11_minimap" Format="i4" Width="96" Height="85" Offset="0xED120"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/map_name_static.xml b/soh/assets/xml/N64_NTSC_12/textures/map_name_static.xml
new file mode 100644
index 0000000000..ca4c4c0bd6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/map_name_static.xml
@@ -0,0 +1,72 @@
+<Root>
+     <File Name="map_name_static" Segment="11">
+        <Texture Name="gHauntedWastelandPointNameJPNTex" OutName="haunted_wasteland_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gGerudosFortressPointNameJPNTex" OutName="gerudos_fortress_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x400"/>
+        <Texture Name="gGerudoValleyPointNameJPNTex" OutName="gerudo_valley_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gHyliaLakesidePointNameJPNTex" OutName="hylia_lakeside_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0xc00"/>
+        <Texture Name="gLonLonRanchPointNameJPNTex" OutName="lon_lon_ranch_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gMarketPointNameJPNTex" OutName="market_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400"/>
+        <Texture Name="gHyruleFieldPointNameJPNTex" OutName="hyrulefield_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gDeathMountainPointNameJPNTex" OutName="death_mountain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x1c00"/>
+        <Texture Name="gKakarikoVillagePointNameJPNTex" OutName="kakariko_village_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2000"/>
+        <Texture Name="gLostWoodsPointNameJPNTex" OutName="lost_woods_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2400"/>
+        <Texture Name="gKokiriForestPointNameJPNTex" OutName="kokiri_forest_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2800"/>
+        <Texture Name="gZorasDomainPointNameJPNTex" OutName="zoras_domain_point_name_jpn" Format="ia4" Width="128" Height="16" Offset="0x2c00"/>
+        <Texture Name="gHauntedWastelandPointNameENGTex" OutName="haunted_wasteland_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3000"/>
+        <Texture Name="gGerudosFortressPointNameENGTex" OutName="gerudos_fortress_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3400"/>
+        <Texture Name="gGerudoValleyPointNameENGTex" OutName="gerudo_valley_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3800"/>
+        <Texture Name="gHyliaLakesidePointNameENGTex" OutName="hylia_lakeside_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3c00"/>
+        <Texture Name="gLonLonRanchPointNameENGTex" OutName="lon_lon_ranch_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4000"/>
+        <Texture Name="gMarketPointNameENGTex" OutName="market_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4400"/>
+        <Texture Name="gHyruleFieldPointNameENGTex" OutName="hyrule_field_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4800"/>
+        <Texture Name="gDeathMountainPointNameENGTex" OutName="death_mountain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x4c00"/>
+        <Texture Name="gKakarikoVillagePointNameENGTex" OutName="kakariko_village_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5000"/>
+        <Texture Name="gLostWoodsPointNameENGTex" OutName="lost_woods_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5400"/>
+        <Texture Name="gKokiriForestPointNameENGTex" OutName="kokiri_forest_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5800"/>
+        <Texture Name="gZorasDomainPointNameENGTex" OutName="zoras_domain_point_name_eng" Format="ia4" Width="128" Height="16" Offset="0x5c00"/>
+        <Texture Name="gHyruleFieldPositionNameJPNTex" OutName="hyrule_field_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6000"/>
+        <Texture Name="gKakarikoVillagePositionNameJPNTex" OutName="kakariko_village_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x6a00"/>
+        <Texture Name="gGraveyardPositionNameJPNTex" OutName="graveyard_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7400"/>
+        <Texture Name="gZorasRiverPositionNameJPNTex" OutName="zoras_river_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x7e00"/>
+        <Texture Name="gKokiriForestPositionNameJPNTex" OutName="kokiri_forest_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x8800"/>
+        <Texture Name="gSacredForestMeadowPositionNameJPNTex" OutName="sacred_forest_meadow_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9200"/>
+        <Texture Name="gLakeHyliaPositionNameJPNTex" OutName="lake_hylia_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x9c00"/>
+        <Texture Name="gZorasDomainPositionNameJPNTex" OutName="zoras_domain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xa600"/>
+        <Texture Name="gZorasFountainPositionNameJPNTex" OutName="zoras_fountain_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xb000"/>
+        <Texture Name="gGerudoValleyPositionNameJPNTex" OutName="gerudo_valley_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xba00"/>
+        <Texture Name="gLostWoodsPositionNameJPNTex" OutName="lost_woods_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xc400"/>
+        <Texture Name="gDesertColossusPositionNameJPNTex" OutName="desert_colossus_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xce00"/>
+        <Texture Name="gGerudosFortressPositionNameJPNTex" OutName="gerudos_fortress_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xd800"/>
+        <Texture Name="gHauntedWastelandPositionNameJPNTex" OutName="haunted_wasteland_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xe200"/>
+        <Texture Name="gMarketPositionNameJPNTex" OutName="market_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xec00"/>
+        <Texture Name="gHyruleCastlePositionNameJPNTex" OutName="hyrule_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0xf600"/>
+        <Texture Name="gDeathMountainTrailPositionNameJPNTex" OutName="death_mountain_trail_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10000"/>
+        <Texture Name="gDeathMountainCraterPositionNameJPNTex" OutName="death_mountain_crater_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x10a00"/>
+        <Texture Name="gGoronCityPositionNameJPNTex" OutName="goron_city_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11400"/>
+        <Texture Name="gLonLonRanchPositionNameJPNTex" OutName="lon_lon_ranch_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x11e00"/>
+        <Texture Name="gQuestionMarkPositionNameJPNTex" OutName="question_mark_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x12800"/>
+        <Texture Name="gGanonsCastlePositionNameJPNTex" OutName="ganons_castle_position_name_jpn" Format="ia8" Width="80" Height="32" Offset="0x13200"/>
+        <Texture Name="gHyruleFieldPositionNameENGTex" OutName="hyrule_field_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x13c00"/>
+        <Texture Name="gKakarikoVillagePositionNameENGTex" OutName="kakariko_village_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x14600"/>
+        <Texture Name="gGraveyardPositionNameENGTex" OutName="graveyard_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15000"/>
+        <Texture Name="gZorasRiverPositionNameENGTex" OutName="zoras_river_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x15a00"/>
+        <Texture Name="gKokiriForestPositionNameENGTex" OutName="kokiri_forest_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16400"/>
+        <Texture Name="gSacredForestMeadowPositionNameENGTex" OutName="sacred_forest_meadow_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x16e00"/>
+        <Texture Name="gLakeHyliaPositionNameENGTex" OutName="lake_hylia_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x17800"/>
+        <Texture Name="gZorasDomainPositionNameENGTex" OutName="zoras_domain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18200"/>
+        <Texture Name="gZorasFountainPositionNameENGTex" OutName="zoras_fountain_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x18c00"/>
+        <Texture Name="gGerudoValleyPositionNameENGTex" OutName="gerudo_valley_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x19600"/>
+        <Texture Name="gLostWoodsPositionNameENGTex" OutName="lost_woods_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1a000"/>
+        <Texture Name="gDesertColossusPositionNameENGTex" OutName="desert_colossus_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1aa00"/>
+        <Texture Name="gGerudosFortressPositionNameENGTex" OutName="gerudos_fortress_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1b400"/>
+        <Texture Name="gHauntedWastelandPositionNameENGTex" OutName="haunted_wasteland_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1be00"/>
+        <Texture Name="gMarketPositionNameENGTex" OutName="market_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1c800"/>
+        <Texture Name="gHyruleCastlePositionNameENGTex" OutName="hyrule_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1d200"/>
+        <Texture Name="gDeathMountainTrailPositionNameENGTex" OutName="death_mountain_trail_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1dc00"/>
+        <Texture Name="gDeathMountainCraterPositionNameENGTex" OutName="death_mountain_crater_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1e600"/>
+        <Texture Name="gGoronCityPositionNameENGTex" OutName="goron_city_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1f000"/>
+        <Texture Name="gLonLonRanchPositionNameENGTex" OutName="lon_lon_ranch_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x1fa00"/>
+        <Texture Name="gQuestionMarkPositionNameENGTex" OutName="question_mark_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20400"/>
+        <Texture Name="gGanonsCastlePositionNameENGTex" OutName="ganons_castle_position_name_eng" Format="ia8" Width="80" Height="32" Offset="0x20e00"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/message_static.xml b/soh/assets/xml/N64_NTSC_12/textures/message_static.xml
new file mode 100644
index 0000000000..afdde60def
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/message_static.xml
@@ -0,0 +1,11 @@
+<Root>
+     <File Name="message_static" Segment="7">
+        <Texture Name="gDefaultMessageBackgroundTex" OutName="default_message_background" Format="ia4" Width="128" Height="64" Offset="0x0"/>
+        <Texture Name="gSignMessageBackgroundTex" OutName="sign_message_background" Format="ia4" Width="128" Height="64" Offset="0x1000"/>
+        <Texture Name="gNoteStaffMessageBackgroundTex" OutName="note_staff_message_background" Format="ia4" Width="128" Height="64" Offset="0x2000"/>
+        <Texture Name="gFadingMessageBackgroundTex" OutName="fading_message_background" Format="i4" Width="128" Height="64" Offset="0x3000"/>
+        <Texture Name="gMessageContinueTriangleTex" OutName="message_continue_triangle" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMessageEndSquareTex" OutName="message_end_square" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMessageArrowTex" OutName="message_arrow" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/message_texture_static.xml b/soh/assets/xml/N64_NTSC_12/textures/message_texture_static.xml
new file mode 100644
index 0000000000..bbf7e1259e
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/message_texture_static.xml
@@ -0,0 +1,6 @@
+<Root>
+     <File Name="message_texture_static" Segment="9">
+        <Texture Name="gRedMessageXLeftTex" OutName="red_message_x_left" Format="i4" Width="96" Height="48" Offset="0x0"/>
+        <Texture Name="gRedMessageXRightTex" OutName="red_message_x_right" Format="i4" Width="96" Height="48" Offset="0x900"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/nes_font_static.xml b/soh/assets/xml/N64_NTSC_12/textures/nes_font_static.xml
new file mode 100644
index 0000000000..f1b80ee045
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/nes_font_static.xml
@@ -0,0 +1,144 @@
+<Root>
+     <File Name="nes_font_static" Segment="10">
+     <!-- The two-digit number after the prefix is the character's codepoint: the hexadecimal byte it corresponds to in the text data -->
+        <Texture Name="gMsgChar20SpaceTex" OutName="msg_char_20_space" Format="i4" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gMsgChar21ExclamationMarkTex" OutName="msg_char_21_exclamation_mark" Format="i4" Width="16" Height="16" Offset="0x80"/>
+        <Texture Name="gMsgChar22QuotationMarkTex" OutName="msg_char_22_quotation_mark" Format="i4" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gMsgChar23NumberSignTex" OutName="msg_char_23_number_sign" Format="i4" Width="16" Height="16" Offset="0x180"/>
+        <Texture Name="gMsgChar24DollarSignTex" OutName="msg_char_24_dollar_sign" Format="i4" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gMsgChar25PercentSignTex" OutName="msg_char_25_percent_sign" Format="i4" Width="16" Height="16" Offset="0x280"/>
+        <Texture Name="gMsgChar26AmpersandTex" OutName="msg_char_26_ampersand" Format="i4" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gMsgChar27ApostropheTex" OutName="msg_char_27_apostrophe" Format="i4" Width="16" Height="16" Offset="0x380"/>
+        <Texture Name="gMsgChar28LeftParenthesesTex" OutName="msg_char_28_left_parentheses" Format="i4" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gMsgChar29RightParenthesesTex" OutName="msg_char_29_right_parentheses" Format="i4" Width="16" Height="16" Offset="0x480"/>
+        <Texture Name="gMsgChar2AAsteriskTex" OutName="msg_char_2a_asterisk" Format="i4" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gMsgChar2BPlusSignTex" OutName="msg_char_2b_plus_sign" Format="i4" Width="16" Height="16" Offset="0x580"/>
+        <Texture Name="gMsgChar2CCommaTex" OutName="msg_char_2c_comma" Format="i4" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gMsgChar2DHyphenMinusTex" OutName="msg_char_2d_hyphen_minus" Format="i4" Width="16" Height="16" Offset="0x680"/>
+        <Texture Name="gMsgChar2EFullStopTex" OutName="msg_char_2e_full_stop" Format="i4" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gMsgChar2FSolidusTex" OutName="msg_char_2f_solidus" Format="i4" Width="16" Height="16" Offset="0x780"/>
+        <Texture Name="gMsgChar30Digit0Tex" OutName="msg_char_30_digit_0" Format="i4" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gMsgChar31Digit1Tex" OutName="msg_char_31_digit_1" Format="i4" Width="16" Height="16" Offset="0x880"/>
+        <Texture Name="gMsgChar32Digit2Tex" OutName="msg_char_32_digit_2" Format="i4" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gMsgChar33Digit3Tex" OutName="msg_char_33_digit_3" Format="i4" Width="16" Height="16" Offset="0x980"/>
+        <Texture Name="gMsgChar34Digit4Tex" OutName="msg_char_34_digit_4" Format="i4" Width="16" Height="16" Offset="0xA00"/>
+        <Texture Name="gMsgChar35Digit5Tex" OutName="msg_char_35_digit_5" Format="i4" Width="16" Height="16" Offset="0xA80"/>
+        <Texture Name="gMsgChar36Digit6Tex" OutName="msg_char_36_digit_6" Format="i4" Width="16" Height="16" Offset="0xB00"/>
+        <Texture Name="gMsgChar37Digit7Tex" OutName="msg_char_37_digit_7" Format="i4" Width="16" Height="16" Offset="0xB80"/>
+        <Texture Name="gMsgChar38Digit8Tex" OutName="msg_char_38_digit_8" Format="i4" Width="16" Height="16" Offset="0xC00"/>
+        <Texture Name="gMsgChar39Digit9Tex" OutName="msg_char_39_digit_9" Format="i4" Width="16" Height="16" Offset="0xC80"/>
+        <Texture Name="gMsgChar3AColonTex" OutName="msg_char_3a_colon" Format="i4" Width="16" Height="16" Offset="0xD00"/>
+        <Texture Name="gMsgChar3BSemicolonTex" OutName="msg_char_3b_semicolon" Format="i4" Width="16" Height="16" Offset="0xD80"/>
+        <Texture Name="gMsgChar3CLessThanSignTex" OutName="msg_char_3c_less_than_sign" Format="i4" Width="16" Height="16" Offset="0xE00"/>
+        <Texture Name="gMsgChar3DEqualsSignTex" OutName="msg_char_3d_equals_sign" Format="i4" Width="16" Height="16" Offset="0xE80"/>
+        <Texture Name="gMsgChar3EGreaterThanSignTex" OutName="msg_char_3e_greater_than_sign" Format="i4" Width="16" Height="16" Offset="0xF00"/>
+        <Texture Name="gMsgChar3FQuestionMarkTex" OutName="msg_char_3f_question_mark" Format="i4" Width="16" Height="16" Offset="0xF80"/>
+        <Texture Name="gMsgChar40CommercialAtTex" OutName="msg_char_40_commercial_at" Format="i4" Width="16" Height="16" Offset="0x1000"/>
+        <Texture Name="gMsgChar41LatinCapitalLetterATex" OutName="msg_char_41_latin_capital_letter_a" Format="i4" Width="16" Height="16" Offset="0x1080"/>
+        <Texture Name="gMsgChar42LatinCapitalLetterBTex" OutName="msg_char_42_latin_capital_letter_b" Format="i4" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="gMsgChar43LatinCapitalLetterCTex" OutName="msg_char_43_latin_capital_letter_c" Format="i4" Width="16" Height="16" Offset="0x1180"/>
+        <Texture Name="gMsgChar44LatinCapitalLetterDTex" OutName="msg_char_44_latin_capital_letter_d" Format="i4" Width="16" Height="16" Offset="0x1200"/>
+        <Texture Name="gMsgChar45LatinCapitalLetterETex" OutName="msg_char_45_latin_capital_letter_e" Format="i4" Width="16" Height="16" Offset="0x1280"/>
+        <Texture Name="gMsgChar46LatinCapitalLetterFTex" OutName="msg_char_46_latin_capital_letter_f" Format="i4" Width="16" Height="16" Offset="0x1300"/>
+        <Texture Name="gMsgChar47LatinCapitalLetterGTex" OutName="msg_char_47_latin_capital_letter_g" Format="i4" Width="16" Height="16" Offset="0x1380"/>
+        <Texture Name="gMsgChar48LatinCapitalLetterHTex" OutName="msg_char_48_latin_capital_letter_h" Format="i4" Width="16" Height="16" Offset="0x1400"/>
+        <Texture Name="gMsgChar49LatinCapitalLetterITex" OutName="msg_char_49_latin_capital_letter_i" Format="i4" Width="16" Height="16" Offset="0x1480"/>
+        <Texture Name="gMsgChar4ALatinCapitalLetterJTex" OutName="msg_char_4a_latin_capital_letter_j" Format="i4" Width="16" Height="16" Offset="0x1500"/>
+        <Texture Name="gMsgChar4BLatinCapitalLetterKTex" OutName="msg_char_4b_latin_capital_letter_k" Format="i4" Width="16" Height="16" Offset="0x1580"/>
+        <Texture Name="gMsgChar4CLatinCapitalLetterLTex" OutName="msg_char_4c_latin_capital_letter_l" Format="i4" Width="16" Height="16" Offset="0x1600"/>
+        <Texture Name="gMsgChar4DLatinCapitalLetterMTex" OutName="msg_char_4d_latin_capital_letter_m" Format="i4" Width="16" Height="16" Offset="0x1680"/>
+        <Texture Name="gMsgChar4ELatinCapitalLetterNTex" OutName="msg_char_4e_latin_capital_letter_n" Format="i4" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="gMsgChar4FLatinCapitalLetterOTex" OutName="msg_char_4f_latin_capital_letter_o" Format="i4" Width="16" Height="16" Offset="0x1780"/>
+        <Texture Name="gMsgChar50LatinCapitalLetterPTex" OutName="msg_char_50_latin_capital_letter_p" Format="i4" Width="16" Height="16" Offset="0x1800"/>
+        <Texture Name="gMsgChar51LatinCapitalLetterQTex" OutName="msg_char_51_latin_capital_letter_q" Format="i4" Width="16" Height="16" Offset="0x1880"/>
+        <Texture Name="gMsgChar52LatinCapitalLetterRTex" OutName="msg_char_52_latin_capital_letter_r" Format="i4" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="gMsgChar53LatinCapitalLetterSTex" OutName="msg_char_53_latin_capital_letter_s" Format="i4" Width="16" Height="16" Offset="0x1980"/>
+        <Texture Name="gMsgChar54LatinCapitalLetterTTex" OutName="msg_char_54_latin_capital_letter_t" Format="i4" Width="16" Height="16" Offset="0x1A00"/>
+        <Texture Name="gMsgChar55LatinCapitalLetterUTex" OutName="msg_char_55_latin_capital_letter_u" Format="i4" Width="16" Height="16" Offset="0x1A80"/>
+        <Texture Name="gMsgChar56LatinCapitalLetterVTex" OutName="msg_char_56_latin_capital_letter_v" Format="i4" Width="16" Height="16" Offset="0x1B00"/>
+        <Texture Name="gMsgChar57LatinCapitalLetterWTex" OutName="msg_char_57_latin_capital_letter_w" Format="i4" Width="16" Height="16" Offset="0x1B80"/>
+        <Texture Name="gMsgChar58LatinCapitalLetterXTex" OutName="msg_char_58_latin_capital_letter_x" Format="i4" Width="16" Height="16" Offset="0x1C00"/>
+        <Texture Name="gMsgChar59LatinCapitalLetterYTex" OutName="msg_char_59_latin_capital_letter_y" Format="i4" Width="16" Height="16" Offset="0x1C80"/>
+        <Texture Name="gMsgChar5ALatinCapitalLetterZTex" OutName="msg_char_5a_latin_capital_letter_z" Format="i4" Width="16" Height="16" Offset="0x1D00"/>
+        <Texture Name="gMsgChar5BLeftSquareBracketTex" OutName="msg_char_5b_left_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1D80"/>
+        <Texture Name="gMsgChar5CYenSignTex" OutName="msg_char_5c_yen_sign" Format="i4" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gMsgChar5DRightSquareBracketTex" OutName="msg_char_5d_right_square_bracket" Format="i4" Width="16" Height="16" Offset="0x1E80"/>
+        <Texture Name="gMsgChar5ECircumflexAccentTex" OutName="msg_char_5e_circumflex_accent" Format="i4" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gMsgChar5FLowLineTex" OutName="msg_char_5f_low_line" Format="i4" Width="16" Height="16" Offset="0x1F80"/>
+        <Texture Name="gMsgChar60GraveAccentTex" OutName="msg_char_60_grave_accent" Format="i4" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gMsgChar61LatinSmallLetterATex" OutName="msg_char_61_latin_small_letter_a" Format="i4" Width="16" Height="16" Offset="0x2080"/>
+        <Texture Name="gMsgChar62LatinSmallLetterBTex" OutName="msg_char_62_latin_small_letter_b" Format="i4" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMsgChar63LatinSmallLetterCTex" OutName="msg_char_63_latin_small_letter_c" Format="i4" Width="16" Height="16" Offset="0x2180"/>
+        <Texture Name="gMsgChar64LatinSmallLetterDTex" OutName="msg_char_64_latin_small_letter_d" Format="i4" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="gMsgChar65LatinSmallLetterETex" OutName="msg_char_65_latin_small_letter_e" Format="i4" Width="16" Height="16" Offset="0x2280"/>
+        <Texture Name="gMsgChar66LatinSmallLetterFTex" OutName="msg_char_66_latin_small_letter_f" Format="i4" Width="16" Height="16" Offset="0x2300"/>
+        <Texture Name="gMsgChar67LatinSmallLetterGTex" OutName="msg_char_67_latin_small_letter_g" Format="i4" Width="16" Height="16" Offset="0x2380"/>
+        <Texture Name="gMsgChar68LatinSmallLetterHTex" OutName="msg_char_68_latin_small_letter_h" Format="i4" Width="16" Height="16" Offset="0x2400"/>
+        <Texture Name="gMsgChar69LatinSmallLetterITex" OutName="msg_char_69_latin_small_letter_i" Format="i4" Width="16" Height="16" Offset="0x2480"/>
+        <Texture Name="gMsgChar6ALatinSmallLetterJTex" OutName="msg_char_6a_latin_small_letter_j" Format="i4" Width="16" Height="16" Offset="0x2500"/>
+        <Texture Name="gMsgChar6BLatinSmallLetterKTex" OutName="msg_char_6b_latin_small_letter_k" Format="i4" Width="16" Height="16" Offset="0x2580"/>
+        <Texture Name="gMsgChar6CLatinSmallLetterLTex" OutName="msg_char_6c_latin_small_letter_l" Format="i4" Width="16" Height="16" Offset="0x2600"/>
+        <Texture Name="gMsgChar6DLatinSmallLetterMTex" OutName="msg_char_6d_latin_small_letter_m" Format="i4" Width="16" Height="16" Offset="0x2680"/>
+        <Texture Name="gMsgChar6ELatinSmallLetterNTex" OutName="msg_char_6e_latin_small_letter_n" Format="i4" Width="16" Height="16" Offset="0x2700"/>
+        <Texture Name="gMsgChar6FLatinSmallLetterOTex" OutName="msg_char_6f_latin_small_letter_o" Format="i4" Width="16" Height="16" Offset="0x2780"/>
+        <Texture Name="gMsgChar70LatinSmallLetterPTex" OutName="msg_char_70_latin_small_letter_p" Format="i4" Width="16" Height="16" Offset="0x2800"/>
+        <Texture Name="gMsgChar71LatinSmallLetterQTex" OutName="msg_char_71_latin_small_letter_q" Format="i4" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="gMsgChar72LatinSmallLetterRTex" OutName="msg_char_72_latin_small_letter_r" Format="i4" Width="16" Height="16" Offset="0x2900"/>
+        <Texture Name="gMsgChar73LatinSmallLetterSTex" OutName="msg_char_73_latin_small_letter_s" Format="i4" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gMsgChar74LatinSmallLetterTTex" OutName="msg_char_74_latin_small_letter_t" Format="i4" Width="16" Height="16" Offset="0x2A00"/>
+        <Texture Name="gMsgChar75LatinSmallLetterUTex" OutName="msg_char_75_latin_small_letter_u" Format="i4" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gMsgChar76LatinSmallLetterVTex" OutName="msg_char_76_latin_small_letter_v" Format="i4" Width="16" Height="16" Offset="0x2B00"/>
+        <Texture Name="gMsgChar77LatinSmallLetterWTex" OutName="msg_char_77_latin_small_letter_w" Format="i4" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gMsgChar78LatinSmallLetterXTex" OutName="msg_char_78_latin_small_letter_x" Format="i4" Width="16" Height="16" Offset="0x2C00"/>
+        <Texture Name="gMsgChar79LatinSmallLetterYTex" OutName="msg_char_79_latin_small_letter_y" Format="i4" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gMsgChar7ALatinSmallLetterZTex" OutName="msg_char_7a_latin_small_letter_z" Format="i4" Width="16" Height="16" Offset="0x2D00"/>
+        <Texture Name="gMsgChar7BLeftCurlyBracketTex" OutName="msg_char_7b_left_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gMsgChar7CVerticalLineTex" OutName="msg_char_7c_vertical_line" Format="i4" Width="16" Height="16" Offset="0x2E00"/>
+        <Texture Name="gMsgChar7DRightCurlyBracketTex" OutName="msg_char_7d_right_curly_bracket" Format="i4" Width="16" Height="16" Offset="0x2E80"/>
+        <Texture Name="gMsgChar7ETildeTex" OutName="msg_char_7e_tilde" Format="i4" Width="16" Height="16" Offset="0x2F00"/>
+        <Texture Name="gMsgChar7FBlankTex" OutName="msg_char_7f_blank" Format="i4" Width="16" Height="16" Offset="0x2F80"/>
+        <Texture Name="gMsgChar80LatinCapitalLetterAWithGraveTex" OutName="msg_char_80_latin_capital_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3000"/>
+        <Texture Name="gMsgChar81LatinCapitalLetterIWithCircumflexTex" OutName="msg_char_81_latin_capital_letter_i_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3080"/>
+        <Texture Name="gMsgChar82LatinCapitalLetterAWithCircumflexTex" OutName="msg_char_82_latin_capital_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3100"/>
+        <Texture Name="gMsgChar83LatinCapitalLetterAWithDiaeresisTex" OutName="msg_char_83_latin_capital_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3180"/>
+        <Texture Name="gMsgChar84LatinCapitalLetterCWithCedillaTex" OutName="msg_char_84_latin_capital_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3200"/>
+        <Texture Name="gMsgChar85LatinCapitalLetterEWithGraveTex" OutName="msg_char_85_latin_capital_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3280"/>
+        <Texture Name="gMsgChar86LatinCapitalLetterEWithAcuteTex" OutName="msg_char_86_latin_capital_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3300"/>
+        <Texture Name="gMsgChar87LatinCapitalLetterEWithCircumflexTex" OutName="msg_char_87_latin_capital_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3380"/>
+        <Texture Name="gMsgChar88LatinCapitalLetterEWithDiaeresisTex" OutName="msg_char_88_latin_capital_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3400"/>
+        <Texture Name="gMsgChar89LatinCapitalLetterIWithDiaeresisTex" OutName="msg_char_89_latin_capital_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3480"/>
+        <Texture Name="gMsgChar8ALatinCapitalLetterOWithCircumflexTex" OutName="msg_char_8a_latin_capital_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3500"/>
+        <Texture Name="gMsgChar8BLatinCapitalLetterOWithDiaeresisTex" OutName="msg_char_8b_latin_capital_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3580"/>
+        <Texture Name="gMsgChar8CLatinCapitalLetterUWithGraveTex" OutName="msg_char_8c_latin_capital_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3600"/>
+        <Texture Name="gMsgChar8DLatinCapitalLetterUWithCircumflexTex" OutName="msg_char_8d_latin_capital_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3680"/>
+        <Texture Name="gMsgChar8ELatinCapitalLetterUWithDiaeresisTex" OutName="msg_char_8e_latin_capital_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3700"/>
+        <Texture Name="gMsgChar8FLatinSmallLetterSharpSTex" OutName="msg_char_8f_latin_small_letter_sharp_s" Format="i4" Width="16" Height="16" Offset="0x3780"/>
+        <Texture Name="gMsgChar90LatinSmallLetterAWithGraveTex" OutName="msg_char_90_latin_small_letter_a_with_grave" Format="i4" Width="16" Height="16" Offset="0x3800"/>
+        <Texture Name="gMsgChar91LatinSmallLetterAWithAcuteTex" OutName="msg_char_91_latin_small_letter_a_with_acute" Format="i4" Width="16" Height="16" Offset="0x3880"/>
+        <Texture Name="gMsgChar92LatinSmallLetterAWithCircumflexTex" OutName="msg_char_92_latin_small_letter_a_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3900"/>
+        <Texture Name="gMsgChar93LatinSmallLetterAWithDiaeresisTex" OutName="msg_char_93_latin_small_letter_a_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3980"/>
+        <Texture Name="gMsgChar94LatinSmallLetterCWithCedillaTex" OutName="msg_char_94_latin_small_letter_c_with_cedilla" Format="i4" Width="16" Height="16" Offset="0x3A00"/>
+        <Texture Name="gMsgChar95LatinSmallLetterEWithGraveTex" OutName="msg_char_95_latin_small_letter_e_with_grave" Format="i4" Width="16" Height="16" Offset="0x3A80"/>
+        <Texture Name="gMsgChar96LatinSmallLetterEWithAcuteTex" OutName="msg_char_96_latin_small_letter_e_with_acute" Format="i4" Width="16" Height="16" Offset="0x3B00"/>
+        <Texture Name="gMsgChar97LatinSmallLetterEWithCircumflexTex" OutName="msg_char_97_latin_small_letter_e_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3B80"/>
+        <Texture Name="gMsgChar98LatinSmallLetterEWithDiaeresisTex" OutName="msg_char_98_latin_small_letter_e_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C00"/>
+        <Texture Name="gMsgChar99LatinSmallLetterIWithDiaeresisTex" OutName="msg_char_99_latin_small_letter_i_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3C80"/>
+        <Texture Name="gMsgChar9ALatinSmallLetterOWithCircumflexTex" OutName="msg_char_9a_latin_small_letter_o_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3D00"/>
+        <Texture Name="gMsgChar9BLatinSmallLetterOWithDiaeresisTex" OutName="msg_char_9b_latin_small_letter_o_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3D80"/>
+        <Texture Name="gMsgChar9CLatinSmallLetterUWithGraveTex" OutName="msg_char_9c_latin_small_letter_u_with_grave" Format="i4" Width="16" Height="16" Offset="0x3E00"/>
+        <Texture Name="gMsgChar9DLatinSmallLetterUWithCircumflexTex" OutName="msg_char_9d_latin_small_letter_u_with_circumflex" Format="i4" Width="16" Height="16" Offset="0x3E80"/>
+        <Texture Name="gMsgChar9ELatinSmallLetterUWithDiaeresisTex" OutName="msg_char_9e_latin_small_letter_u_with_diaeresis" Format="i4" Width="16" Height="16" Offset="0x3F00"/>
+        <Texture Name="gMsgChar9FButtonATex" OutName="msg_char_9f_button_a" Format="i4" Width="16" Height="16" Offset="0x3F80"/>
+        <Texture Name="gMsgCharA0ButtonBTex" OutName="msg_char_a0_button_b" Format="i4" Width="16" Height="16" Offset="0x4000"/>
+        <Texture Name="gMsgCharA1ButtonCTex" OutName="msg_char_a1_button_c" Format="i4" Width="16" Height="16" Offset="0x4080"/>
+        <Texture Name="gMsgCharA2ButtonLTex" OutName="msg_char_a2_button_l" Format="i4" Width="16" Height="16" Offset="0x4100"/>
+        <Texture Name="gMsgCharA3ButtonRTex" OutName="msg_char_a3_button_r" Format="i4" Width="16" Height="16" Offset="0x4180"/>
+        <Texture Name="gMsgCharA4ButtonZTex" OutName="msg_char_a4_button_z" Format="i4" Width="16" Height="16" Offset="0x4200"/>
+        <Texture Name="gMsgCharA5ButtonCUpTex" OutName="msg_char_a5_button_c_up" Format="i4" Width="16" Height="16" Offset="0x4280"/>
+        <Texture Name="gMsgCharA6ButtonCDownTex" OutName="msg_char_a6_button_c_down" Format="i4" Width="16" Height="16" Offset="0x4300"/>
+        <Texture Name="gMsgCharA7ButtonCLeftTex" OutName="msg_char_a7_button_c_left" Format="i4" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gMsgCharA8ButtonCRightTex" OutName="msg_char_a8_button_c_right" Format="i4" Width="16" Height="16" Offset="0x4400"/>
+        <Texture Name="gMsgCharA9ZTargetSignTex" OutName="msg_char_a9_z_target_sign" Format="i4" Width="16" Height="16" Offset="0x4480"/>
+        <Texture Name="gMsgCharAAControlStickTex" OutName="msg_char_aa_control_stick" Format="i4" Width="16" Height="16" Offset="0x4500"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_NTSC_12/textures/nintendo_rogo_static.xml
new file mode 100644
index 0000000000..f09de3b0f9
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/nintendo_rogo_static.xml
@@ -0,0 +1,9 @@
+<Root>
+     <File Name="nintendo_rogo_static" Segment="1">
+
+         <Texture Name="nintendo_rogo_staticTex_0029C0" OutName="nintendo_rogo_staticTex_0029C0" Format="i8" Width="32" Height="32" Offset="0x29C0" AddedByScript="true"/>
+        <Texture Name="nintendo_rogo_static_Tex_000000" OutName="tex_00000000" Format="i8" Width="192" Height="32" Offset="0x0000"/>
+         <Texture Name="nintendo_rogo_static_Tex_001800" OutName="tex_00001800" Format="i8" Width="32" Height="32" Offset="0x1800"/>
+         <DList Name="gNintendo64LogoDL" Offset="0x2720"/>
+     </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/parameter_static.xml b/soh/assets/xml/N64_NTSC_12/textures/parameter_static.xml
new file mode 100644
index 0000000000..c51dacf1f6
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/parameter_static.xml
@@ -0,0 +1,60 @@
+<Root>
+    <File Name="parameter_static" Segment="2">
+        <Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x100"/>
+        <Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16" Offset="0x200"/>
+        <Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x300"/>
+        <Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16" Offset="0x400"/>
+        <Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16" Offset="0x500"/>
+        <Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16" Offset="0x600"/>
+        <Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16" Offset="0x700"/>
+        <Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16" Offset="0x800"/>
+        <Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16" Offset="0x900"/>
+        <Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32" Offset="0xA00"/>
+        <Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32" Offset="0xE00"/>
+        <Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32" Offset="0x1200"/>
+        <Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32" Offset="0x1600"/>
+        <Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1E00"/>
+        <Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16" Offset="0x1F00"/>
+        <Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16" Offset="0x2000"/>
+        <Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16" Offset="0x2100"/>
+        <Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgba16" Width="8" Height="8" Offset="0x2500"/>
+        <Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgba16" Width="8" Height="8" Offset="0x2580"/>
+        <Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgba16" Width="24" Height="16" Offset="0x2600"/>
+        <Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8" Offset="0x2900"/>
+        <Texture Name="gOcarinaBtnIconATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16" Offset="0x2940"/>
+        <Texture Name="gOcarinaBtnIconCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16" Offset="0x2A40"/>
+        <Texture Name="gOcarinaBtnIconCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16" Offset="0x2B40"/>
+        <Texture Name="gOcarinaBtnIconCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16" Offset="0x2C40"/>
+        <Texture Name="gOcarinaBtnIconCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16" Offset="0x2D40"/>
+        <Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8" Offset="0x2F40"/>
+        <Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8" Offset="0x2FC0"/>
+        <Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16" Offset="0x3040"/>
+        <Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16" Offset="0x30C0"/>
+        <Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16" Offset="0x3140"/>
+        <Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16" Offset="0x31C0"/>
+        <Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16" Offset="0x3240"/>
+        <Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16" Offset="0x32C0"/>
+        <Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16" Offset="0x3340"/>
+        <Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16" Offset="0x33C0"/>
+        <Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16" Offset="0x3440"/>
+        <Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16" Offset="0x34C0"/>
+        <Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16" Offset="0x3540"/>
+        <Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8" Offset="0x35C0"/>
+        <Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8" Offset="0x3600"/>
+        <Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8" Offset="0x3640"/>
+        <Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8" Offset="0x3680"/>
+        <Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8" Offset="0x36C0"/>
+        <Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8" Offset="0x3700"/>
+        <Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8" Offset="0x3740"/>
+        <Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8" Offset="0x3780"/>
+        <Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8" Offset="0x37C0"/>
+        <Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8" Offset="0x3800"/>
+        <Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8" Offset="0x3840"/>
+        <Texture Name="gMagicMeterEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16" Offset="0x38C0"/>
+        <Texture Name="gMagicMeterMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16" Offset="0x3940"/>
+        <Texture Name="gMagicMeterFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8" Offset="0x3AC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/place_title_cards.xml b/soh/assets/xml/N64_NTSC_12/textures/place_title_cards.xml
new file mode 100644
index 0000000000..b688cce00c
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/place_title_cards.xml
@@ -0,0 +1,230 @@
+<Root>
+    <File Name="g_pn_01">
+        <Texture Name="gForestTempleTitleCardJPNTex" OutName="forest_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_02">
+        <Texture Name="gShadowTempleTitleCardJPNTex" OutName="shadow_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShadowTempleTitleCardENGTex" OutName="shadow_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_03">
+        <Texture Name="gFireTempleTitleCardJPNTex" OutName="fire_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFireTempleTitleCardENGTex" OutName="fire_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_04">
+        <Texture Name="gWaterTempleTitleCardJPNTex" OutName="water_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gWaterTempleTitleCardENGTex" OutName="water_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_05">
+        <Texture Name="gSpiritTempleTitleCardJPNTex" OutName="spirit_temple_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSpiritTempleTitleCardENGTex" OutName="spirit_temple_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_06">
+        <Texture Name="gDekuTreeTitleCardJPNTex" OutName="deku_tree_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDekuTreeTitleCardENGTex" OutName="deku_tree_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_07">
+        <Texture Name="gJabuJabuTitleCardJPNTex" OutName="jabu_jabu_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gJabuJabuTitleCardENGTex" OutName="jabu_jabu_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_08">
+        <Texture Name="gDodongosCavernTitleCardJPNTex" OutName="dodongos_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDodongosCavernTitleCardENGTex" OutName="dodongos_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_09">
+        <Texture Name="gInsideGanonsCastleTitleCardJPNTex" OutName="inside_ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gInsideGanonsCastleTitleCardENGTex" OutName="inside_ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_10">
+        <Texture Name="gIceCavernTitleCardJPNTex" OutName="ice_cavern_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gIceCavernTitleCardENGTex" OutName="ice_cavern_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_11">
+        <Texture Name="gGERudoTrainingGroundTitleCardJPNTex" OutName="gerudo_training_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoTrainingGroundTitleCardENGTex" OutName="gerudo_training_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_12">
+        <Texture Name="gCastleCourtyardTitleCardJPNTex" OutName="castle_courtyard_ground_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gCastleCourtyardTitleCardENGTex" OutName="castle_courtyard_ground_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_13">
+        <Texture Name="gGreatFairysFountainTitleCardJPNTex" OutName="great_fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGreatFairysFountainTitleCardENGTex" OutName="great_fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_14">
+        <Texture Name="gChamberOfTheSagesTitleCardJPNTex" OutName="chamber_of_the_sages_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_15">
+        <Texture Name="gShootingGalleryTitleCardJPNTex" OutName="shooting_gallery_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gShootingGalleryTitleCardENGTex" OutName="shooting_gallery_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_16">
+        <Texture Name="gTempleOfTimeTitleCardJPNTex" OutName="temple_of_time_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTempleOfTimeTitleCardENGTex" OutName="temple_of_time_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_17">
+        <Texture Name="gMarketTitleCardJPNTex" OutName="market_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gMarketTitleCardENGTex" OutName="market_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_18">
+        <Texture Name="gBackAlleyTitleCardJPNTex" OutName="back_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBackAlleyTitleCardENGTex" OutName="back_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_19">
+        <Texture Name="gKokiriShopTitleCardJPNTex" OutName="kokiri_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriShopTitleCardENGTex" OutName="kokiri_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_20">
+        <Texture Name="gGoronShopTitleCardJPNTex" OutName="goron_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronShopTitleCardENGTex" OutName="goron_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_21">
+        <Texture Name="gZoraShopTitleCardJPNTex" OutName="zora_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZoraShopTitleCardENGTex" OutName="zora_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_22">
+        <Texture Name="gHouseOfSkulltulaTitleCardJPNTex" OutName="house_of_skulltula_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHouseOfSkulltulaTitleCardENGTex" OutName="house_of_skulltula_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_23">
+        <Texture Name="gBazaarTitleCardJPNTex" OutName="bazaar_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBazaarTitleCardENGTex" OutName="bazaar_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_24">
+        <Texture Name="gPotionShopTitleCardJPNTex" OutName="potion_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gPotionShopTitleCardENGTex" OutName="potion_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_25">
+        <Texture Name="gGravekeepersHutTitleCardJPNTex" OutName="gravekeepsers_hut_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGravekeepersHutTitleCardENGTex" OutName="gravekeepsers_hut_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_26">
+        <Texture Name="gLakesideLaboratoryTitleCardJPNTex" OutName="lakeside_laboratory_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakesideLaboratoryTitleCardENGTex" OutName="lakeside_laboratory_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_27">
+        <Texture Name="gHyruleFieldTitleCardJPNTex" OutName="hyrule_field_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleFieldTitleCardENGTex" OutName="hyrule_field_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_28">
+        <Texture Name="gKakarikoVillageTitleCardJPNTex" OutName="kakariko_village_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKakarikoVillageTitleCardENGTex" OutName="kakariko_village_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_29">
+        <Texture Name="gGraveyardTitleCardJPNTex" OutName="graveyard_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGraveyardTitleCardENGTex" OutName="graveyard_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_30">
+        <Texture Name="gZorasRiverTitleCardJPNTex" OutName="zoras_river_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasRiverTitleCardENGTex" OutName="zoras_river_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_31">
+        <Texture Name="gKokiriForestTitleCardJPNTex" OutName="kokiri_firest_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gKokiriForestTitleCardENGTex" OutName="kokiri_firest_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_32">
+        <Texture Name="gLakeHyliaTitleCardJPNTex" OutName="lake_hylia_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLakeHyliaTitleCardENGTex" OutName="lake_hylia_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_33">
+        <Texture Name="gZorasDomainTitleCardJPNTex" OutName="zoras_domain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasDomainTitleCardENGTex" OutName="zoras_domain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_34">
+        <Texture Name="gZorasFountainTitleCardJPNTex" OutName="zoras_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gZorasFountainTitleCardENGTex" OutName="zoras_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_35">
+        <Texture Name="gGERudoValleyTitleCardJPNTex" OutName="gerudo_valley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudoValleyTitleCardENGTex" OutName="gerudo_valley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_36">
+        <Texture Name="gLostWoodsTitleCardJPNTex" OutName="lost_woods_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLostWoodsTitleCardENGTex" OutName="lost_woods_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_37">
+        <Texture Name="gHauntedWastelandTitleCardJPNTex" OutName="haunted_wasteland_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHauntedWastelandTitleCardENGTex" OutName="haunted_wasteland_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_38">
+        <Texture Name="gHyruleCastleTitleCardJPNTex" OutName="hyrule_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHyruleCastleTitleCardENGTex" OutName="hyrule_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_39">
+        <Texture Name="gDeathMountainTrailTitleCardJPNTex" OutName="death_mountain_trail_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainTrailTitleCardENGTex" OutName="death_mountain_trail_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_40">
+        <Texture Name="gDeathMountainCraterTitleCardJPNTex" OutName="death_mountain_crater_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDeathMountainCraterTitleCardENGTex" OutName="death_mountain_crater_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_41">
+        <Texture Name="gGoronCityTitleCardJPNTex" OutName="goron_city_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGoronCityTitleCardENGTex" OutName="goron_city_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_42">
+        <Texture Name="gLonLonRanchTitleCardJPNTex" OutName="lon_lon_ranch_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gLonLonRanchTitleCardENGTex" OutName="lon_lon_ranch_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_43">
+        <Texture Name="gGanonsCastleTitleCardJPNTex" OutName="ganons_castle_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGanonsCastleTitleCardENGTex" OutName="ganons_castle_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_44">
+        <Texture Name="gRoyalFamilysTombTitleCardJPNTex" OutName="royal_familys_tomb_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gRoyalFamilysTombTitleCardENGTex" OutName="royal_familys_tomb_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_45">
+        <Texture Name="gFairysFountainTitleCardJPNTex" OutName="fairys_fountain_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFairysFountainTitleCardENGTex" OutName="fairys_fountain_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_46">
+        <Texture Name="gFishingPondTitleCardJPNTex" OutName="fishing_pond_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gFishingPondTitleCardENGTex" OutName="fishing_pond_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_47">
+        <Texture Name="gBombchuBowlingAlleyCardJPNTex" OutName="bombchu_bowling_alley_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuBowlingAlleyCardENGTex" OutName="bombchu_bowling_alley_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_48">
+        <Texture Name="gStableTitleCardJPNTex" OutName="stable_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gStableTitleCardENGTex" OutName="stable_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_49">
+        <Texture Name="gThievesHideoutTitleCardJPNTex" OutName="thieves_hideout_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gThievesHideoutTitleCardENGTex" OutName="thieves_hideout_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_50">
+        <Texture Name="gHappyMaskShopTitleCardJPNTex" OutName="happy_mask_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gHappyMaskShopTitleCardENGTex" OutName="happy_mask_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_51">
+        <Texture Name="gTreasureBoxShopTitleCardJPNTex" OutName="treasure_box_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gTreasureBoxShopTitleCardENGTex" OutName="treasure_box_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_52">
+        <Texture Name="gSacredForestMeadowTitleCardJPNTex" OutName="sacred_forest_meadow_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gSacredForestMeadowTitleCardENGTex" OutName="sacred_forest_meadow_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_53">
+        <Texture Name="gGERudosFortressTitleCardJPNTex" OutName="gerudos_fortress_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gGERudosFortressTitleCardENGTex" OutName="gerudos_fortress_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_54">
+        <Texture Name="gBottomOfTheWellTitleCardJPNTex" OutName="bottom_of_the_well_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBottomOfTheWellTitleCardENGTex" OutName="bottom_of_the_well_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_55">
+        <Texture Name="gDesertColossusTitleCardJPNTex" OutName="desert_colossus_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gDesertColossusTitleCardENGTex" OutName="desert_colossus_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_56">
+        <Texture Name="gBombchuShopTitleCardJPNTex" OutName="bombchu_shop_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gBombchuShopTitleCardENGTex" OutName="bombchu_shop_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+    <File Name="g_pn_57">
+        <Texture Name="gQuestionMarkTitleCardJPNTex" OutName="question_mark_jpn" Format="ia8" Width="144" Height="24" Offset="0x0"/>
+        <Texture Name="gQuestionMarkTitleCardENGTex" OutName="question_mark_eng" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/skyboxes.xml b/soh/assets/xml/N64_NTSC_12/textures/skyboxes.xml
new file mode 100644
index 0000000000..104ffb2a3f
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/skyboxes.xml
@@ -0,0 +1,113 @@
+<Root>
+    <File Name="vr_fine0_static">
+        <Texture Name="gSunriseSkybox1Tex" OutName="sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox2Tex" OutName="sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox3Tex" OutName="sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox4Tex" OutName="sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseSkybox5Tex" OutName="sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine0_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine0_pal_static">
+        <Texture Name="gSunriseSkyboxTLUT" OutName="sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine1_static">
+        <Texture Name="gDaySkybox1Tex" OutName="day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox2Tex" OutName="day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox3Tex" OutName="day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox4Tex" OutName="day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDaySkybox5Tex" OutName="day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine1_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine1_pal_static">
+        <Texture Name="gDaySkyboxTLUT" OutName="day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine2_static">
+        <Texture Name="gSunsetSkybox1Tex" OutName="sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox2Tex" OutName="sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox3Tex" OutName="sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox4Tex" OutName="sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetSkybox5Tex" OutName="sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine2_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine2_pal_static">
+        <Texture Name="gSunsetSkyboxTLUT" OutName="sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_fine3_static">
+        <Texture Name="gNightSkybox1Tex" OutName="night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox2Tex" OutName="night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox3Tex" OutName="night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox4Tex" OutName="night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightSkybox5Tex" OutName="night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_fine3_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_fine3_pal_static">
+        <Texture Name="gNightSkyboxTLUT" OutName="night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud0_static">
+        <Texture Name="gSunriseOvercastSkybox1Tex" OutName="overcast_sunrise_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox2Tex" OutName="overcast_sunrise_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox3Tex" OutName="overcast_sunrise_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox4Tex" OutName="overcast_sunrise_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunriseOvercastSkybox5Tex" OutName="overcast_sunrise_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud0_pal_static">
+        <Texture Name="gSunriseOvercastSkyboxTLUT" OutName="overcast_sunrise_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud1_static">
+        <Texture Name="gDayOvercastSkybox1Tex" OutName="overcast_day_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox2Tex" OutName="overcast_day_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox3Tex" OutName="overcast_day_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox4Tex" OutName="overcast_day_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gDayOvercastSkybox5Tex" OutName="overcast_day_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud1_pal_static">
+        <Texture Name="gDayOvercastSkyboxTLUT" OutName="overcast_day_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud2_static">
+        <Texture Name="gSunsetOvercastSkybox1Tex" OutName="overcast_sunset_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox2Tex" OutName="overcast_sunset_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox3Tex" OutName="overcast_sunset_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox4Tex" OutName="overcast_sunset_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gSunsetOvercastSkybox5Tex" OutName="overcast_sunset_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud2_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud2_pal_static">
+        <Texture Name="gSunsetOvercastSkyboxTLUT" OutName="overcast_sunset_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_cloud3_static">
+        <Texture Name="gNightOvercastSkybox1Tex" OutName="overcast_night_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox2Tex" OutName="overcast_night_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox3Tex" OutName="overcast_night_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox4Tex" OutName="overcast_night_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gNightOvercastSkybox5Tex" OutName="overcast_night_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_cloud3_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_cloud3_pal_static">
+        <Texture Name="gNightOvercastSkyboxTLUT" OutName="overcast_night_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy0_static">
+        <Texture Name="gHoly0Skybox1Tex" OutName="holy0_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox2Tex" OutName="holy0_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox3Tex" OutName="holy0_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox4Tex" OutName="holy0_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox5Tex" OutName="holy0_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly0Skybox6Tex" OutName="holy0_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy0_pal_static" SplitTlut="false" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy0_pal_static">
+        <Texture Name="gHoly0SkyboxTLUT" OutName="holy0_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+
+    <File Name="vr_holy1_static">
+        <Texture Name="gHoly1Skybox1Tex" OutName="holy1_1" Format="ci8" Width="128" Height="64" Offset="0x0" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox2Tex" OutName="holy1_2" Format="ci8" Width="128" Height="64" Offset="0x2000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox3Tex" OutName="holy1_3" Format="ci8" Width="128" Height="64" Offset="0x4000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox4Tex" OutName="holy1_4" Format="ci8" Width="128" Height="64" Offset="0x6000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox5Tex" OutName="holy1_5" Format="ci8" Width="128" Height="128" Offset="0x8000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+        <Texture Name="gHoly1Skybox6Tex" OutName="holy1_6" Format="ci8" Width="128" Height="128" Offset="0xC000" ExternalTlut="vr_holy1_pal_static" SplitTlut="true" ExternalTlutOffset="0x000"/>
+    </File>
+    <File Name="vr_holy1_pal_static">
+        <Texture Name="gHoly1SkyboxTLUT" OutName="holy1_tlut" Format="rgba16" Width="16" Height="8" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_NTSC_12/textures/title_static.xml b/soh/assets/xml/N64_NTSC_12/textures/title_static.xml
new file mode 100644
index 0000000000..5f58c5a820
--- /dev/null
+++ b/soh/assets/xml/N64_NTSC_12/textures/title_static.xml
@@ -0,0 +1,169 @@
+<Root>
+    <File Name="title_static" Segment="1">
+        <Texture Name="gFileSelNoFileToCopyJPNTex" OutName="no_file_to_copy_jpn" Format="ia8" Width="128" Height="16" Offset="0x0"/>
+        <Texture Name="gFileSelNoFileToEraseJPNTex" OutName="no_file_to_erase_jpn" Format="ia8" Width="128" Height="16" Offset="0x800"/>
+        <Texture Name="gFileSelNoEmptyFileJPNTex" OutName="no_empty_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
+        <Texture Name="gFileSelFileEmptyJPNTex" OutName="file_empty_jpn" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
+        <Texture Name="gFileSelFileInUseJPNTex" OutName="file_in_use_jpn" Format="ia8" Width="128" Height="16" Offset="0x2000"/>
+
+        <Texture Name="gFileSelConnectorTex" OutName="connector" Format="ia8" Width="24" Height="16" Offset="0x2800"/>
+
+        <Texture Name="gFileSelForestMedallionTex" OutName="forest_medallion" Format="ia8" Width="16" Height="16" Offset="0x2980"/>
+        <Texture Name="gFileSelFireMedallionTex" OutName="fire_medallion" Format="ia8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="gFileSelWaterMedallionTex" OutName="water_medallion" Format="ia8" Width="16" Height="16" Offset="0x2B80"/>
+        <Texture Name="gFileSelSpiritMedallionTex" OutName="spirit_medallion" Format="ia8" Width="16" Height="16" Offset="0x2C80"/>
+        <Texture Name="gFileSelShadowMedallionTex" OutName="shadow_medallion" Format="ia8" Width="16" Height="16" Offset="0x2D80"/>
+        <Texture Name="gFileSelLightMedallionTex" OutName="light_medallion" Format="ia8" Width="16" Height="16" Offset="0x2E80"/>
+
+        <Texture Name="gFileSelWhichFile1JPNTex" OutName="which_file_1_jpn" Format="ia8" Width="128" Height="16" Offset="0x2F80"/>
+        <Texture Name="gFileSelCopyToWhichFileJPNTex" OutName="copy_to_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x3780"/>
+        <Texture Name="gFileSelAreYouSureJPNTex" OutName="are_you_sure_jpn" Format="ia8" Width="128" Height="16" Offset="0x3F80"/>
+        <Texture Name="gFileSelFileCopiedJPNTex" OutName="file_copied_jpn" Format="ia8" Width="128" Height="16" Offset="0x4780"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileJPNTex" OutName="please_select_a_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x4F80"/>
+        <Texture Name="gFileSelOpenThisFileJPNTex" OutName="open_this_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5780"/>
+
+        <Texture Name="gFileSelEraseWhichFileJPNTex" OutName="erase_which_file_jpn" Format="ia8" Width="128" Height="16" Offset="0x5F80"/>
+        <Texture Name="gFileSelAreYouSure2JPNTex" OutName="are_you_sure_jpn_2" Format="ia8" Width="128" Height="16" Offset="0x6780"/>
+        <Texture Name="gFileSelFileErasedJPNTex" OutName="file_erased_jpn" Format="ia8" Width="128" Height="16" Offset="0x6F80"/>
+
+        <Texture Name="gFileSelOptionsJPNTex" OutName="options_jpn" Format="ia8" Width="128" Height="16" Offset="0x7780"/>
+        <Texture Name="gFileSelNameJPNTex" OutName="name_jpn" Format="ia8" Width="56" Height="16" Offset="0x7F80"/>
+
+        <Texture Name="gFileSelSurroundJPNTex" OutName="surround_jpn" Format="ia8" Width="48" Height="16" Offset="0x8300"/>
+        <Texture Name="gFileSelHeadsetJPNTex" OutName="headset_jpn" Format="ia8" Width="48" Height="16" Offset="0x8600"/>
+        <Texture Name="gFileSelMonoJPNTex" OutName="mono_jpn" Format="ia8" Width="48" Height="16" Offset="0x8900"/>
+
+        <Texture Name="gFileSelSOUNDENGTex" OutName="SOUND_eng" Format="ia8" Width="64" Height="16" Offset="0x8C00"/>
+
+        <Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
+
+        <Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
+        <Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
+        <Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
+
+        <Texture Name="gFileSelControlsJPNTex" OutName="controls_jpn" Format="ia8" Width="144" Height="16" Offset="0x9D00"/>
+
+        <Texture Name="gFileSelCheckBrightnessJPNTex" OutName="check_brightness_jpn" Format="ia8" Width="96" Height="16" Offset="0xA600"/>
+
+        <Texture Name="gFileSelWindow1Tex" OutName="window_1" Format="ia16" Width="64" Height="32" Offset="0xAC00"/>
+        <Texture Name="gFileSelWindow2Tex" OutName="window_2" Format="ia16" Width="64" Height="32" Offset="0xBC00"/>
+        <Texture Name="gFileSelWindow3Tex" OutName="window_3" Format="ia16" Width="64" Height="32" Offset="0xCC00"/>
+        <Texture Name="gFileSelWindow4Tex" OutName="window_4" Format="ia16" Width="48" Height="32" Offset="0xDC00"/>
+        <Texture Name="gFileSelWindow5Tex" OutName="window_5" Format="ia16" Width="64" Height="32" Offset="0xE800"/>
+        <Texture Name="gFileSelWindow6Tex" OutName="window_6" Format="ia16" Width="64" Height="32" Offset="0xF800"/>
+        <Texture Name="gFileSelWindow7Tex" OutName="window_7" Format="ia16" Width="64" Height="32" Offset="0x10800"/>
+        <Texture Name="gFileSelWindow8Tex" OutName="window_8" Format="ia16" Width="48" Height="32" Offset="0x11800"/>
+        <Texture Name="gFileSelWindow9Tex" OutName="window_9" Format="ia16" Width="64" Height="32" Offset="0x12400"/>
+        <Texture Name="gFileSelWindow10Tex" OutName="window_10" Format="ia16" Width="64" Height="32" Offset="0x13400"/>
+        <Texture Name="gFileSelWindow11Tex" OutName="window_11" Format="ia16" Width="64" Height="32" Offset="0x14400"/>
+        <Texture Name="gFileSelWindow12Tex" OutName="window_12" Format="ia16" Width="48" Height="32" Offset="0x15400"/>
+        <Texture Name="gFileSelWindow13Tex" OutName="window_13" Format="ia16" Width="64" Height="32" Offset="0x16000"/>
+        <Texture Name="gFileSelWindow14Tex" OutName="window_14" Format="ia16" Width="64" Height="32" Offset="0x17000"/>
+        <Texture Name="gFileSelWindow15Tex" OutName="window_15" Format="ia16" Width="64" Height="32" Offset="0x18000"/>
+        <Texture Name="gFileSelWindow16Tex" OutName="window_16" Format="ia16" Width="48" Height="32" Offset="0x19000"/>
+        <Texture Name="gFileSelWindow17Tex" OutName="window_17" Format="ia16" Width="64" Height="32" Offset="0x19C00"/>
+        <Texture Name="gFileSelWindow18Tex" OutName="window_18" Format="ia16" Width="64" Height="32" Offset="0x1AC00"/>
+        <Texture Name="gFileSelWindow19Tex" OutName="window_19" Format="ia16" Width="64" Height="32" Offset="0x1BC00"/>
+        <Texture Name="gFileSelWindow20Tex" OutName="window_20" Format="ia16" Width="48" Height="32" Offset="0x1CC00"/>
+
+        <Texture Name="gFileSelCopyButtonJPNTex" OutName="copy_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1D800"/>
+
+        <Texture Name="gFileSelFile1ButtonJPNTex" OutName="file_1_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E000"/>
+        <Texture Name="gFileSelFile2ButtonJPNTex" OutName="file_2_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1E800"/>
+        <Texture Name="gFileSelFile3ButtonJPNTex" OutName="file_3_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F000"/>
+
+        <Texture Name="gFileSelYesButtonJPNTex" OutName="yes_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x1F800"/>
+        
+        <Texture Name="gFileSelEraseButtonJPNTex" OutName="erase_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x20000"/>
+
+        <Texture Name="gFileSelKanjiButtonTex" OutName="kanji_button" Format="ia16" Width="28" Height="16" Offset="0x20800"/>
+        <Texture Name="gFileSelHiraganaButtonTex" OutName="hiragana_button" Format="ia16" Width="44" Height="16" Offset="0x20B80"/>
+        <Texture Name="gFileSelKatakanaButtonTex" OutName="katakana_button" Format="ia16" Width="44" Height="16" Offset="0x21100"/>
+
+        <Texture Name="gFileSelENDButtonENGTex" OutName="end_button_eng" Format="ia16" Width="44" Height="16" Offset="0x21680"/>
+
+        <Texture Name="gFileSelBackspaceButtonTex" OutName="backspace_button" Format="ia16" Width="28" Height="16" Offset="0x21C00"/>
+
+        <Texture Name="gFileSelNameBoxTex" OutName="name_box" Format="ia16" Width="108" Height="16" Offset="0x21F80"/>
+
+        <Texture Name="gFileSelFileInfoBox1Tex" OutName="file_info_box_1" Format="ia16" Width="36" Height="56" Offset="0x22D00"/>
+        <Texture Name="gFileSelFileInfoBox2Tex" OutName="file_info_box_2" Format="ia16" Width="36" Height="56" Offset="0x23CC0"/>
+        <Texture Name="gFileSelFileInfoBox3Tex" OutName="file_info_box_3" Format="ia16" Width="36" Height="56" Offset="0x24C80"/>
+        <Texture Name="gFileSelFileInfoBox4Tex" OutName="file_info_box_4" Format="ia16" Width="36" Height="56" Offset="0x25C40"/>
+        <Texture Name="gFileSelFileInfoBox5Tex" OutName="file_info_box_5" Format="ia16" Width="24" Height="56" Offset="0x26C00"/>
+
+        <Texture Name="gFileSelOptionsButtonJPNTex" OutName="options_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27680"/>
+        <Texture Name="gFileSelQuitButtonJPNTex" OutName="quit_button_jpn" Format="ia16" Width="64" Height="16" Offset="0x27E80"/>
+
+        <Texture Name="gFileSelDISKButtonTex" OutName="disk_button" Format="ia16" Width="44" Height="16" Offset="0x28680"/>
+        <Texture Name="gFileSelOptionsDividerTex" OutName="options_divider" Format="ia4" Width="256" Height="2" Offset="0x28C00"/>
+        <Texture Name="gFileSelBrightnessCheckTex" OutName="brightness_check" Format="ia4" Width="96" Height="16" Offset="0x28D00"/>
+
+        <Texture Name="gFileSelSaveXJPNTex" OutName="save_x_jpn" Format="i4" Width="32" Height="16" Offset="0x29000"/>
+
+        <Texture Name="gFileSelBigButtonHighlightTex" OutName="big_button_highlight" Format="i8" Width="72" Height="24" Offset="0x29100"/>
+        <Texture Name="gFileSelCharHighlightTex" OutName="char_highlight" Format="i8" Width="24" Height="24" Offset="0x297C0"/>
+        <Texture Name="gFileSelMediumButtonHighlightTex" OutName="medium_button_highlight" Format="i8" Width="56" Height="24" Offset="0x29A00"/>
+        <Texture Name="gFileSelSmallButtonHighlightTex" OutName="small_button_highlight" Format="i8" Width="40" Height="24" Offset="0x29F40"/>
+
+        <Texture Name="gFileSelKokiriEmeraldTex" OutName="kokiri_emerald" Format="rgba32" Width="16" Height="16" Offset="0x2A300"/>
+        <Texture Name="gFileSelGoronRubyTex" OutName="goron_ruby" Format="rgba32" Width="16" Height="16" Offset="0x2A700"/>
+        <Texture Name="gFileSelZoraSapphireTex" OutName="zora_sapphire" Format="rgba32" Width="16" Height="16" Offset="0x2AB00"/>
+
+        <Texture Name="gFileSelNoFileToCopyENGTex" OutName="no_file_to_copy_eng" Format="ia8" Width="128" Height="16" Offset="0x2AF00"/>
+        <Texture Name="gFileSelNoFileToEraseENGTex" OutName="no_file_to_erase_eng" Format="ia8" Width="128" Height="16" Offset="0x2B700"/>
+        <Texture Name="gFileSelNoEmptyFileENGTex" OutName="no_empty_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2BF00"/>
+        <Texture Name="gFileSelFileEmptyENGTex" OutName="file_empty_eng" Format="ia8" Width="128" Height="16" Offset="0x2C700"/>
+        <Texture Name="gFileSelFileInUseENGTex" OutName="file_in_use_eng" Format="ia8" Width="128" Height="16" Offset="0x2CF00"/>
+
+        <Texture Name="gFileSelCopyWhichFileENGTex" OutName="copy_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2D700"/>
+        <Texture Name="gFileSelCopyToWhichFileENGTex" OutName="copy_to_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2DF00"/>
+        <Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x2E700"/>
+        <Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x2EF00"/>
+
+        <Texture Name="gFileSelPleaseSelectAFileENGTex" OutName="please_select_a_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2F700"/>
+        <Texture Name="gFileSelOpenThisFileENGTex" OutName="open_this_file_eng" Format="ia8" Width="128" Height="16" Offset="0x2FF00"/>
+
+        <Texture Name="gFileSelEraseWhichFileENGTex" OutName="erase_which_file_eng" Format="ia8" Width="128" Height="16" Offset="0x30700"/>
+        <Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x30F00"/>
+        <Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x31700"/>
+
+        <Texture Name="gFileSelOptionsENGTex" OutName="options_eng" Format="ia8" Width="128" Height="16" Offset="0x31F00"/>
+
+        <Texture Name="gFileSelNameENGTex" OutName="name_eng" Format="ia8" Width="56" Height="16" Offset="0x32700"/>
+
+        <Texture Name="gFileSelSurroundENGTex" OutName="surround_eng" Format="ia8" Width="48" Height="16" Offset="0x32A80"/>
+        <Texture Name="gFileSelHeadsetENGTex" OutName="headset_eng" Format="ia8" Width="48" Height="16" Offset="0x32D80"/>
+        <Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
+        <Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
+
+        <Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
+        <Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
+        <Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>
+
+        <Texture Name="gFileSelControlsENGTex" OutName="controls_eng" Format="ia8" Width="144" Height="16" Offset="0x34080"/>
+
+        <Texture Name="gFileSelCheckBrightnessENGNTSCTex" OutName="check_brightness_eng" Format="ia8" Width="96" Height="16" Offset="0x34980"/>
+
+        <Texture Name="gFileSelCopyButtonENGTex" OutName="copy_button_eng" Format="ia16" Width="64" Height="16" Offset="0x34F80"/>
+
+        <Texture Name="gFileSelFile1ButtonENGTex" OutName="file_1_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35780"/>
+        <Texture Name="gFileSelFile2ButtonENGTex" OutName="file_2_button_eng" Format="ia16" Width="64" Height="16" Offset="0x35F80"/>
+        <Texture Name="gFileSelFile3ButtonENGTex" OutName="file_3_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36780"/>
+
+        <Texture Name="gFileSelYesButtonENGTex" OutName="yes_button_eng" Format="ia16" Width="64" Height="16" Offset="0x36F80"/>
+
+        <Texture Name="gFileSelEraseButtonENGTex" OutName="erase_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37780"/>
+
+        <Texture Name="gFileSelOptionsButtonENGTex" OutName="options_button_eng" Format="ia16" Width="64" Height="16" Offset="0x37F80"/>
+
+        <Texture Name="gFileSelQuitButtonENGTex" OutName="quit_button_eng" Format="ia16" Width="64" Height="16" Offset="0x38780"/>
+
+        <Texture Name="gFileSelSaveXENGTex" OutName="save_x_eng" Format="i4" Width="32" Height="16" Offset="0x38F80"/>
+
+        <DList Name="gFileSelWindow1DL" Offset="0x39080"/>
+        <DList Name="gFileSelWindow2DL" Offset="0x39298"/>
+        <DList Name="gFileSelWindow3DL" Offset="0x394A8"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_PAL_10/audio/Audio.xml b/soh/assets/xml/N64_PAL_10/audio/Audio.xml
index b2e32ab26c..382a078a9e 100644
--- a/soh/assets/xml/N64_PAL_10/audio/Audio.xml
+++ b/soh/assets/xml/N64_PAL_10/audio/Audio.xml
@@ -114,1402 +114,483 @@
 				<Sequence Name="109_Cutscene_Effects"/>
 			</Sequences>
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 			
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
index 7877d0bdf6..61886ffbe4 100644
--- a/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
+++ b/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x116E0" RangeStart="0xEB620" RangeEnd="0xEB660">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x800116E0" RangeStart="0xEB620" RangeEnd="0xEB660">
         <Mtx Name="gMtxClear" Offset="0xEB620"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml
index 5ffc52f655..8824228847 100644
--- a/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml
+++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/assets/xml/N64_PAL_11/audio/Audio.xml b/soh/assets/xml/N64_PAL_11/audio/Audio.xml
index f830ef6481..ece8393c89 100644
--- a/soh/assets/xml/N64_PAL_11/audio/Audio.xml
+++ b/soh/assets/xml/N64_PAL_11/audio/Audio.xml
@@ -114,1402 +114,483 @@
 				<Sequence Name="109_Cutscene_Effects"/>
 			</Sequences>
 			<Samples Bank="0">
-				<Sample Name="Bird Chirp 1">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Insect Chirrup" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x5B0"/>
-				</Sample>
-				<Sample Name="Bird Chirp 2">
-					<Offset Version="MQDebug" At="0x780"/>
-				</Sample>
-				<Sample Name="Crickets">
-					<Offset Version="MQDebug" At="0xC70"/>
-				</Sample>
-				<Sample Name="Loud Bird Chirp">
-					<Offset Version="MQDebug" At="0x1730"/>
-				</Sample>
-				<Sample Name="Crow Caws">
-					<Offset Version="MQDebug" At="0x1ED0"/>
-				</Sample>
-				<Sample Name="Bird Call">
-					<Offset Version="MQDebug" At="0x2D10"/>
-				</Sample>
-				<Sample Name="Bird Screech">
-					<Offset Version="MQDebug" At="0x4250"/>
-				</Sample>
-				<Sample Name="Bird Song (Unused)">
-					<Offset Version="MQDebug" At="0x5480"/>
-				</Sample>
-				<Sample Name="Owl Hoot">
-					<Offset Version="MQDebug" At="0x77D0"/>
-				</Sample>
-				<Sample Name="Hawk Screech">
-					<Offset Version="MQDebug" At="0x97E0"/>
-				</Sample>
-				<Sample Name="Small Bird Chirps">
-					<Offset Version="MQDebug" At="0xB660"/>
-				</Sample>
-				<Sample Name="Rushing Water">
-					<Offset Version="MQDebug" At="0xBC80"/>
-				</Sample>
-				<Sample Name="Howling Wind">
-					<Offset Version="MQDebug" At="0xE4B0"/>
-				</Sample>
-				<Sample Name="Rainfall">
-					<Offset Version="MQDebug" At="0x11D80"/>
-				</Sample>
-				<Sample Name="Low Thunder">
-					<Offset Version="MQDebug" At="0x1C4A0"/>
-				</Sample>
-				<Sample Name="Lightning">
-					<Offset Version="MQDebug" At="0x27DA0"/>
-				</Sample>
-				<Sample Name="Howling Wind (Short)">
-					<Offset Version="MQDebug" At="0x33800"/>
-				</Sample>
-				<Sample Name="Cucco Crows">
-					<Offset Version="MQDebug" At="0x393F0"/>
-				</Sample>
-				<Sample Name="Cawing Bird">
-					<Offset Version="MQDebug" At="0x3D090"/>
-				</Sample>
-				<Sample Name="Step - Ground">
-					<Offset Version="MQDebug" At="0x3E360"/>
-				</Sample>
-				<Sample Name="Step - Sand">
-					<Offset Version="MQDebug" At="0x3ECE0"/>
-				</Sample>
-				<Sample Name="Step - Rock">
-					<Offset Version="MQDebug" At="0x3F770"/>
-				</Sample>
-				<Sample Name="Step - Jabu Jabu">
-					<Offset Version="MQDebug" At="0x40000"/>
-				</Sample>
-				<Sample Name="Step - Water">
-					<Offset Version="MQDebug" At="0x40AA0"/>
-				</Sample>
-				<Sample Name="Step - Carpet" SampleRate="8000">
-					<Offset Version="MQDebug" At="0x414F0"/>
-				</Sample>
-				<Sample Name="Step - Thick Carpet">
-					<Offset Version="MQDebug" At="0x41A20"/>
-				</Sample>
-				<Sample Name="Step - Tall Grass">
-					<Offset Version="MQDebug" At="0x41CD0"/>
-				</Sample>
-				<Sample Name="Synth Pad Sting">
-					<Offset Version="MQDebug" At="0x439A0"/>
-				</Sample>
-				<Sample Name="Small Splash">
-					<Offset Version="MQDebug" At="0x46810"/>
-				</Sample>
-				<Sample Name="Crunchy Drop">
-					<Offset Version="MQDebug" At="0x48840"/>
-				</Sample>
-				<Sample Name="Sliding Block">
-					<Offset Version="MQDebug" At="0x4A6A0"/>
-				</Sample>
-				<Sample Name="Step - Wood">
-					<Offset Version="MQDebug" At="0x4A510"/>
-				</Sample>
-				<Sample Name="Boots Sliding">
-					<Offset Version="MQDebug" At="0x4F790"/>
-				</Sample>
-				<Sample Name="Heavy Slide">
-					<Offset Version="MQDebug" At="0x53210"/>
-				</Sample>
-				<Sample Name="High Static">
-					<Offset Version="MQDebug" At="0x55BA0"/>
-				</Sample>
-				<Sample Name="Distorted Static">
-					<Offset Version="MQDebug" At="0x57D10"/>
-				</Sample>
-				<Sample Name="Heavy Static">
-					<Offset Version="MQDebug" At="0x5B590"/>
-				</Sample>
-				<Sample Name="Large Water Splash">
-					<Offset Version="MQDebug" At="0x5CBA0"/>
-				</Sample>
-				<Sample Name="Swimming">
-					<Offset Version="MQDebug" At="0x60240"/>
-				</Sample>
-				<Sample Name="Stone Doof">
-					<Offset Version="MQDebug" At="0x61B90"/>
-				</Sample>
-				<Sample Name="Step - Wooden Bridge">
-					<Offset Version="MQDebug" At="0x63350"/>
-				</Sample>
-				<Sample Name="Step - Fire">
-					<Offset Version="MQDebug" At="0x63B70"/>
-				</Sample>
-				<Sample Name="Iron Boots 2">
-					<Offset Version="MQDebug" At="0x64600"/>
-				</Sample>
-				<Sample Name="Step - Ice">
-					<Offset Version="MQDebug" At="0x64F70"/>
-				</Sample>
-				<Sample Name="Crackling Fire (Keese)">
-					<Offset Version="MQDebug" At="0x65580"/>
-				</Sample>
-				<Sample Name="Metal Clink">
-					<Offset Version="MQDebug" At="0x67FA0"/>
-				</Sample>
-				<Sample Name="Whish">
-					<Offset Version="MQDebug" At="0x68CC0"/>
-				</Sample>
-				<Sample Name="Sheathe Sword" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x69130"/>
-				</Sample>
-				<Sample Name="Draw Sword" SampleRate="17640">
-					<Offset Version="MQDebug" At="0x6A040"/>
-				</Sample>
-				<Sample Name="Air Swish" SampleRate="15435">
-					<Offset Version="MQDebug" At="0x6BA00"/>
-				</Sample>
-				<Sample Name="Air Whistle">
-					<Offset Version="MQDebug" At="0x6C3C0"/>
-				</Sample>
-				<Sample Name="Bow Pulled Taut">
-					<Offset Version="MQDebug" At="0x6D5B0"/>
-				</Sample>
-				<Sample Name="Sword Striking Metal Shield">
-					<Offset Version="MQDebug" At="0x71C70"/>
-				</Sample>
-				<Sample Name="Moving Metal Chain">
-					<Offset Version="MQDebug" At="0x732A0"/>
-				</Sample>
-				<Sample Name="Hissing Fuse">
-					<Offset Version="MQDebug" At="0x74790"/>
-				</Sample>
-				<Sample Name="Heavy Thump">
-					<Offset Version="MQDebug" At="0x77010"/>
-				</Sample>
-				<Sample Name="Egg Hatching">
-					<Offset Version="MQDebug" At="0x77BA0"/>
-				</Sample>
-				<Sample Name="Arrow Thunk in Wood">
-					<Offset Version="MQDebug" At="0x7AFD0"/>
-				</Sample>
-				<Sample Name="Air Whoosh">
-					<Offset Version="MQDebug" At="0x7D290"/>
-				</Sample>
-				<Sample Name="Broken Wood">
-					<Offset Version="MQDebug" At="0x7F3F0"/>
-				</Sample>
-				<Sample Name="Whip Snap">
-					<Offset Version="MQDebug" At="0x7FC90"/>
-				</Sample>
-				<Sample Name="Buzzing Synth">
-					<Offset Version="MQDebug" At="0x80E00"/>
-				</Sample>
-				<Sample Name="Soft Thump">
-					<Offset Version="MQDebug" At="0x82000"/>
-				</Sample>
-				<Sample Name="Sword Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x82ED0"/>
-				</Sample>
-				<Sample Name="Eye of Truth">
-					<Offset Version="MQDebug" At="0x84380"/>
-				</Sample>
-				<Sample Name="Popping Cork">
-					<Offset Version="MQDebug" At="0x87030"/>
-				</Sample>
-				<Sample Name="Bowstring Twang" SampleRate="19200">
-					<Offset Version="MQDebug" At="0x87440"/>
-				</Sample>
-				<Sample Name="Bombchu Motor" SampleRate="22050">
-					<Offset Version="MQDebug" At="0x88620"/>
-				</Sample>
-				<Sample Name="Rupee" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x88A50"/>
-				</Sample>
-				<Sample Name="Opening Wooden Door">
-					<Offset Version="MQDebug" At="0x8A4B0"/>
-				</Sample>
-				<Sample Name="Closing Wooden Door">
-					<Offset Version="MQDebug" At="0x8E160"/>
-				</Sample>
-				<Sample Name="Explosion 1">
-					<Offset Version="MQDebug" At="0x8F6F0"/>
-				</Sample>
-				<Sample Name="Gallop">
-					<Offset Version="MQDebug" At="0x93DB0"/>
-				</Sample>
-				<Sample Name="Horse Neigh">
-					<Offset Version="MQDebug" At="0x94B10"/>
-				</Sample>
-				<Sample Name="Flowing Creek">
-					<Offset Version="MQDebug" At="0x98B00"/>
-				</Sample>
-				<Sample Name="Rushing Waterfall">
-					<Offset Version="MQDebug" At="0x9D5F0"/>
-				</Sample>
-				<Sample Name="Mechanically Shifting Stone">
-					<Offset Version="MQDebug" At="0xA0260"/>
-				</Sample>
-				<Sample Name="Rolling Boulder" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xA14A0"/>
-				</Sample>
-				<Sample Name="Bubbling Lava">
-					<Offset Version="MQDebug" At="0xA2590"/>
-				</Sample>
-				<Sample Name="Retracting Metal Chain">
-					<Offset Version="MQDebug" At="0xA9EF0"/>
-				</Sample>
-				<Sample Name="Relaxed Cucco Clucks">
-					<Offset Version="MQDebug" At="0xAB9E0"/>
-				</Sample>
-				<Sample Name="Stone Strike" SampleRate="10000">
-					<Offset Version="MQDebug" At="0xADBA0"/>
-				</Sample>
-				<Sample Name="Horse Snort" SampleRate="12000">
-					<Offset Version="MQDebug" At="0xAF0A0"/>
-				</Sample>
-				<Sample Name="Water Splish">
-					<Offset Version="MQDebug" At="0xB0960"/>
-				</Sample>
-				<Sample Name="Wooden Strike">
-					<Offset Version="MQDebug" At="0xB3600"/>
-				</Sample>
-				<Sample Name="Flying Fairy">
-					<Offset Version="MQDebug" At="0xB3B10"/>
-				</Sample>
-				<Sample Name="Settled Stone Block">
-					<Offset Version="MQDebug" At="0xB4B90"/>
-				</Sample>
-				<Sample Name="Creaking Door">
-					<Offset Version="MQDebug" At="0xB5A80"/>
-				</Sample>
-				<Sample Name="Creaking Wood">
-					<Offset Version="MQDebug" At="0xB8690"/>
-				</Sample>
-				<Sample Name="Ignition">
-					<Offset Version="MQDebug" At="0xBA0D0"/>
-				</Sample>
-				<Sample Name="Warp Circle Ambience">
-					<Offset Version="MQDebug" At="0xBBB00"/>
-				</Sample>
-				<Sample Name="Fairy Magic">
-					<Offset Version="MQDebug" At="0xC42B0"/>
-				</Sample>
-				<Sample Name="Water Drips">
-					<Offset Version="MQDebug" At="0xC5140"/>
-				</Sample>
-				<Sample Name="Underwater Bubbles">
-					<Offset Version="MQDebug" At="0xC88C0"/>
-				</Sample>
-				<Sample Name="Fire Crackling">
-					<Offset Version="MQDebug" At="0xCAF60"/>
-				</Sample>
-				<Sample Name="Heavy Platform Rotating" SampleRate="8000">
-					<Offset Version="MQDebug" At="0xD16F0"/>
-				</Sample>
-				<Sample Name="Light Rock Slam">
-					<Offset Version="MQDebug" At="0xD2110"/>
-				</Sample>
-				<Sample Name="Flapping Cloak">
-					<Offset Version="MQDebug" At="0xD3DC0"/>
-				</Sample>
-				<Sample Name="People Chattering">
-					<Offset Version="MQDebug" At="0xD57A0"/>
-				</Sample>
-				<Sample Name="Cloth Ripping">
-					<Offset Version="MQDebug" At="0xDE0A0"/>
-				</Sample>
-				<Sample Name="Mechanical Ramp-Up">
-					<Offset Version="MQDebug" At="0xE01F0"/>
-				</Sample>
-				<Sample Name="Crystal Synth (Low)">
-					<Offset Version="MQDebug" At="0xE2510"/>
-				</Sample>
-				<Sample Name="Shimmering Treasure">
-					<Offset Version="MQDebug" At="0xE44A0"/>
-				</Sample>
-				<Sample Name="Gunshot">
-					<Offset Version="MQDebug" At="0xE4B00"/>
-				</Sample>
-				<Sample Name="Wolf Howl">
-					<Offset Version="MQDebug" At="0xE5B70"/>
-				</Sample>
-				<Sample Name="Frog Ribbit">
-					<Offset Version="MQDebug" At="0xEA760"/>
-				</Sample>
-				<Sample Name="Dog Yip">
-					<Offset Version="MQDebug" At="0xEAFC0"/>
-				</Sample>
-				<Sample Name="Metal Door">
-					<Offset Version="MQDebug" At="0xEB5B0"/>
-				</Sample>
-				<Sample Name="Cow Moo">
-					<Offset Version="MQDebug" At="0xECF40"/>
-				</Sample>
-				<Sample Name="Dialogue Continue (Harp)">
-					<Offset Version="MQDebug" At="0xEEB80"/>
-				</Sample>
-				<Sample Name="Dong (Failed Learning)">
-					<Offset Version="MQDebug" At="0xF2FE0"/>
-				</Sample>
-				<Sample Name="Whistle">
-					<Offset Version="MQDebug" At="0xF5350"/>
-				</Sample>
-				<Sample Name="Clanging Bells">
-					<Offset Version="MQDebug" At="0xF5A90"/>
-				</Sample>
-				<Sample Name="Person Whistling">
-					<Offset Version="MQDebug" At="0xF72A0"/>
-				</Sample>
-				<Sample Name="Ocarina_Looped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x1550"/>
-				</Sample>
-				<Sample Name="Ocarina_NoLooped">
-					<Offset Version="MQDebug" At="0xFAD40" LoopOffset="0x77C0"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Tambo Drum">
-					<Offset Version="MQDebug" At="0x10CD20"/>
-				</Sample>
-				<Sample Name="Small Cymbal">
-					<Offset Version="MQDebug" At="0x10EFF0"/>
-				</Sample>
-				<Sample Name="Z Target">
-					<Offset Version="MQDebug" At="0x111520"/>
-				</Sample>
-				<Sample Name="Enemy Target Lock-On">
-					<Offset Version="MQDebug" At="0x1129E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 1">
-					<Offset Version="MQDebug" At="0x114D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Spur Horse 2">
-					<Offset Version="MQDebug" At="0x1165E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 1">
-					<Offset Version="MQDebug" At="0x1176B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 2">
-					<Offset Version="MQDebug" At="0x118910"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 3">
-					<Offset Version="MQDebug" At="0x119870"/>
-				</Sample>
-				<Sample Name="Adult Link - Attack 4">
-					<Offset Version="MQDebug" At="0x11A270"/>
-				</Sample>
-				<Sample Name="Adult Link - Hup">
-					<Offset Version="MQDebug" At="0x11B0E0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x11B790"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x11BE20"/>
-				</Sample>
-				<Sample Name="Adult Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x11D6D0"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Grunt">
-					<Offset Version="MQDebug" At="0x11EE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x11FB00"/>
-				</Sample>
-				<Sample Name="Adult Link - Climb Edge">
-					<Offset Version="MQDebug" At="0x120D60"/>
-				</Sample>
-				<Sample Name="Adult Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x121BF0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x122C10"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x1243F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x125A90"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x126ED0"/>
-				</Sample>
-				<Sample Name="Adult Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x128DA0"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x12AC80"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 1">
-					<Offset Version="MQDebug" At="0x12CD30"/>
-				</Sample>
-				<Sample Name="Adult Link - Falling 2">
-					<Offset Version="MQDebug" At="0x133AB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x139D70"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x13AF50"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 1">
-					<Offset Version="MQDebug" At="0x13C040"/>
-				</Sample>
-				<Sample Name="Adult Link - Pant 2">
-					<Offset Version="MQDebug" At="0x13D3B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Glug">
-					<Offset Version="MQDebug" At="0x13E870"/>
-				</Sample>
-				<Sample Name="Adult Link - Refreshed">
-					<Offset Version="MQDebug" At="0x13F6B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Lift (Unused)">
-					<Offset Version="MQDebug" At="0x140FC0"/>
-				</Sample>
-				<Sample Name="Adult Link - Cast Attacking Magic">
-					<Offset Version="MQDebug" At="0x141960"/>
-				</Sample>
-				<Sample Name="Adult Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x143690"/>
-				</Sample>
-				<Sample Name="Adult Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x146490"/>
-				</Sample>
-				<Sample Name="Adult Link - Hurt (Unused)">
-					<Offset Version="MQDebug" At="0x1478F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Choking">
-					<Offset Version="MQDebug" At="0x148390"/>
-				</Sample>
-				<Sample Name="Adult Link - Gasping (Unused)">
-					<Offset Version="MQDebug" At="0x1493C0"/>
-				</Sample>
-				<Sample Name="Adult Link - Small Gasp (Unused)">
-					<Offset Version="MQDebug" At="0x14B440"/>
-				</Sample>
-				<Sample Name="Adult Link - Unsettled Moan">
-					<Offset Version="MQDebug" At="0x14C250"/>
-				</Sample>
-				<Sample Name="Adult Link - Sneezes">
-					<Offset Version="MQDebug" At="0x151520"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x15A6A0"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x15BE50"/>
-				</Sample>
-				<Sample Name="Adult Link - Sigh 3">
-					<Offset Version="MQDebug" At="0x15DCB0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretch Start">
-					<Offset Version="MQDebug" At="0x15F4B0"/>
-				</Sample>
-				<Sample Name="Adult Link - Stretching">
-					<Offset Version="MQDebug" At="0x1617F0"/>
-				</Sample>
-				<Sample Name="Adult Link - Finished Stretching">
-					<Offset Version="MQDebug" At="0x163280"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 1">
-					<Offset Version="MQDebug" At="0x166790"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 2">
-					<Offset Version="MQDebug" At="0x167800"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 3">
-					<Offset Version="MQDebug" At="0x168650"/>
-				</Sample>
-				<Sample Name="Child Link - Attack 4">
-					<Offset Version="MQDebug" At="0x1698E0"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 1">
-					<Offset Version="MQDebug" At="0x16A450"/>
-				</Sample>
-				<Sample Name="Child Link - Hup 2">
-					<Offset Version="MQDebug" At="0x16AEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 1">
-					<Offset Version="MQDebug" At="0x16B3E0"/>
-				</Sample>
-				<Sample Name="Child Link - Strong Attack 2">
-					<Offset Version="MQDebug" At="0x16CE20"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 1">
-					<Offset Version="MQDebug" At="0x16EEA0"/>
-				</Sample>
-				<Sample Name="Child Link - Dangling Gasp 2">
-					<Offset Version="MQDebug" At="0x16FE60"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 1">
-					<Offset Version="MQDebug" At="0x170E80"/>
-				</Sample>
-				<Sample Name="Child Link - Sigh 2">
-					<Offset Version="MQDebug" At="0x171DA0"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 1">
-					<Offset Version="MQDebug" At="0x173320"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 2">
-					<Offset Version="MQDebug" At="0x174240"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 3">
-					<Offset Version="MQDebug" At="0x175140"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 4">
-					<Offset Version="MQDebug" At="0x175C30"/>
-				</Sample>
-				<Sample Name="Child Link - Knocked Back">
-					<Offset Version="MQDebug" At="0x177480"/>
-				</Sample>
-				<Sample Name="Child Link - Hurt 5">
-					<Offset Version="MQDebug" At="0x178D40"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 1">
-					<Offset Version="MQDebug" At="0x1795F0"/>
-				</Sample>
-				<Sample Name="Child Link - Falling 2">
-					<Offset Version="MQDebug" At="0x17E6C0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 1">
-					<Offset Version="MQDebug" At="0x182EC0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 2">
-					<Offset Version="MQDebug" At="0x1844E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wheeze">
-					<Offset Version="MQDebug" At="0x185BA0"/>
-				</Sample>
-				<Sample Name="Child Link - Exhausted Panting">
-					<Offset Version="MQDebug" At="0x188170"/>
-				</Sample>
-				<Sample Name="Child Link - Glug">
-					<Offset Version="MQDebug" At="0x18A560"/>
-				</Sample>
-				<Sample Name="Child Link - Refreshed">
-					<Offset Version="MQDebug" At="0x18B650"/>
-				</Sample>
-				<Sample Name="Child Link - Charge Up (Unused)">
-					<Offset Version="MQDebug" At="0x18D090"/>
-				</Sample>
-				<Sample Name="Child Link - Cast Attack Spell">
-					<Offset Version="MQDebug" At="0x18E480"/>
-				</Sample>
-				<Sample Name="Child Link - Painful Landing">
-					<Offset Version="MQDebug" At="0x190200"/>
-				</Sample>
-				<Sample Name="Child Link - Dramatic Gasp">
-					<Offset Version="MQDebug" At="0x193410"/>
-				</Sample>
-				<Sample Name="Child Link - Dying Gasp">
-					<Offset Version="MQDebug" At="0x196950"/>
-				</Sample>
-				<Sample Name="Child Link - Strangled (Unused)">
-					<Offset Version="MQDebug" At="0x1971A0"/>
-				</Sample>
-				<Sample Name="Child Link - Gasp 3">
-					<Offset Version="MQDebug" At="0x197500"/>
-				</Sample>
-				<Sample Name="Child Link - Shivers">
-					<Offset Version="MQDebug" At="0x198F30"/>
-				</Sample>
-				<Sample Name="Child Link - Sneeze">
-					<Offset Version="MQDebug" At="0x19F6D0"/>
-				</Sample>
-				<Sample Name="Child Link - Grunt">
-					<Offset Version="MQDebug" At="0x1A1670"/>
-				</Sample>
-				<Sample Name="Child Link - Moans From Heat">
-					<Offset Version="MQDebug" At="0x1A2580"/>
-				</Sample>
-				<Sample Name="Child Link - Awakening Grunt">
-					<Offset Version="MQDebug" At="0x1A71E0"/>
-				</Sample>
-				<Sample Name="Child Link - Wiping Off Sweat">
-					<Offset Version="MQDebug" At="0x1A79C0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn Starts">
-					<Offset Version="MQDebug" At="0x1AF2E0"/>
-				</Sample>
-				<Sample Name="Child Link - Yawn and Stretch">
-					<Offset Version="MQDebug" At="0x1AFEE0"/>
-				</Sample>
-				<Sample Name="Child Link - Stretch Refreshingly">
-					<Offset Version="MQDebug" At="0x1B3F50"/>
-				</Sample>
-				<Sample Name="Navi - Watch Out!">
-					<Offset Version="MQDebug" At="0x1B6530"/>
-				</Sample>
-				<Sample Name="Navi - Look!">
-					<Offset Version="MQDebug" At="0x1B7B40"/>
-				</Sample>
-				<Sample Name="Navi - Hey!">
-					<Offset Version="MQDebug" At="0x1B8DB0"/>
-				</Sample>
-				<Sample Name="Navi - Listen!">
-					<Offset Version="MQDebug" At="0x1B9D70"/>
-				</Sample>
-				<Sample Name="Navi - Hello!">
-					<Offset Version="MQDebug" At="0x1BB410"/>
-				</Sample>
-				<Sample Name="Talon Snoring">
-					<Offset Version="MQDebug" At="0x1BC380"/>
-				</Sample>
-				<Sample Name="Talon Startled">
-					<Offset Version="MQDebug" At="0x1BFA40"/>
-				</Sample>
-				<Sample Name="Talon Distressed">
-					<Offset Version="MQDebug" At="0x1C0F80"/>
-				</Sample>
-				<Sample Name="Talon Fearful">
-					<Offset Version="MQDebug" At="0x1C2510"/>
-				</Sample>
-				<Sample Name="Great Fairy Laughter">
-					<Offset Version="MQDebug" At="0x1C6870"/>
-				</Sample>
-				<Sample Name="Great Fairy Titters">
-					<Offset Version="MQDebug" At="0x1CC560"/>
-				</Sample>
-				<Sample Name="Ingo Yowls">
-					<Offset Version="MQDebug" At="0x1CF9C0"/>
-				</Sample>
-				<Sample Name="Ingo Exclaims">
-					<Offset Version="MQDebug" At="0x1D25C0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyeaaaaugh">
-					<Offset Version="MQDebug" At="0x1D58F0"/>
-				</Sample>
-				<Sample Name="Ingo - Hyah!">
-					<Offset Version="MQDebug" At="0x1D74B0"/>
-				</Sample>
-				<Sample Name="Girl Gasps">
-					<Offset Version="MQDebug" At="0x1D8420"/>
-				</Sample>
-				<Sample Name="Girl Screams 1">
-					<Offset Version="MQDebug" At="0x1D9880"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 1">
-					<Offset Version="MQDebug" At="0x1DDA40"/>
-				</Sample>
-				<Sample Name="Girl Hurt">
-					<Offset Version="MQDebug" At="0x1DE3C0"/>
-				</Sample>
-				<Sample Name="Girl Startled 1">
-					<Offset Version="MQDebug" At="0x1DF040"/>
-				</Sample>
-				<Sample Name="Girl Screams 2">
-					<Offset Version="MQDebug" At="0x1E0140"/>
-				</Sample>
-				<Sample Name="Girl Delighted">
-					<Offset Version="MQDebug" At="0x1E3160"/>
-				</Sample>
-				<Sample Name="Girl Surprised 1">
-					<Offset Version="MQDebug" At="0x1E48E0"/>
-				</Sample>
-				<Sample Name="Girl Surprised 2">
-					<Offset Version="MQDebug" At="0x1E55F0"/>
-				</Sample>
-				<Sample Name="Girl Discombobulated (Unused)">
-					<Offset Version="MQDebug" At="0x1E6000"/>
-				</Sample>
-				<Sample Name="Woman Yells">
-					<Offset Version="MQDebug" At="0x1E7E90"/>
-				</Sample>
-				<Sample Name="Woman Yells, Startled">
-					<Offset Version="MQDebug" At="0x1E9960"/>
-				</Sample>
-				<Sample Name="Woman Grunts">
-					<Offset Version="MQDebug" At="0x1EB6B0"/>
-				</Sample>
-				<Sample Name="Woman Hup">
-					<Offset Version="MQDebug" At="0x1EC2B0"/>
-				</Sample>
-				<Sample Name="Girl Sighs">
-					<Offset Version="MQDebug" At="0x1EC990"/>
-				</Sample>
-				<Sample Name="Girl Startled 2">
-					<Offset Version="MQDebug" At="0x1EE390"/>
-				</Sample>
-				<Sample Name="Girl Inquiring 2">
-					<Offset Version="MQDebug" At="0x1EF1B0"/>
-				</Sample>
-				<Sample Name="Girl Disappointed">
-					<Offset Version="MQDebug" At="0x1EFCE0"/>
-				</Sample>
-				<Sample Name="Girl Laughing">
-					<Offset Version="MQDebug" At="0x1F1600"/>
-				</Sample>
-				<Sample Name="Girl Startled 3">
-					<Offset Version="MQDebug" At="0x1F3020"/>
-				</Sample>
-				<Sample Name="Girl Grunts in Effort">
-					<Offset Version="MQDebug" At="0x1F4010"/>
-				</Sample>
-				<Sample Name="Girl Screams 3">
-					<Offset Version="MQDebug" At="0x1F4EB0"/>
-				</Sample>
-				<Sample Name="Girl Screams 4">
-					<Offset Version="MQDebug" At="0x1F5E50"/>
-				</Sample>
-				<Sample Name="Girl Sighs Contentedly">
-					<Offset Version="MQDebug" At="0x1F7220"/>
-				</Sample>
-				<Sample Name="Girl Surprised 3">
-					<Offset Version="MQDebug" At="0x1F9490"/>
-				</Sample>
-				<Sample Name="Girl Scared">
-					<Offset Version="MQDebug" At="0x1FA230"/>
-				</Sample>
-				<Sample Name="Skulltula Screaming">
-					<Offset Version="MQDebug" At="0x1FB850"/>
-				</Sample>
-				<Sample Name="Skulltula Grunts Angrily">
-					<Offset Version="MQDebug" At="0x1FEA30"/>
-				</Sample>
-				<Sample Name="King Zora Scoots">
-					<Offset Version="MQDebug" At="0x1FFD80"/>
-				</Sample>
-				<Sample Name="Flamethrower">
-					<Offset Version="MQDebug" At="0x200840"/>
-				</Sample>
-				<Sample Name="Dodongo Roar">
-					<Offset Version="MQDebug" At="0x206D10"/>
-				</Sample>
-				<Sample Name="Heavy Rumbling">
-					<Offset Version="MQDebug" At="0x209E40"/>
-				</Sample>
-				<Sample Name="Clattering Spear" SampleRate="10000">
-					<Offset Version="MQDebug" At="0x20B580"/>
-				</Sample>
-				<Sample Name="Ganon's Electrical Charge">
-					<Offset Version="MQDebug" At="0x20BDA0"/>
-				</Sample>
-				<Sample Name="Dramatic Swoosh">
-					<Offset Version="MQDebug" At="0x20C9E0"/>
-				</Sample>
-				<Sample Name="Broken Pottery" SampleRate="12000">
-					<Offset Version="MQDebug" At="0x20DE70"/>
-				</Sample>
-				<Sample Name="Shattered Glass">
-					<Offset Version="MQDebug" At="0x20F440"/>
-				</Sample>
-				<Sample Name="Heavy Gunshot">
-					<Offset Version="MQDebug" At="0x2115A0"/>
-				</Sample>
-				<Sample Name="Dodongo Inhale">
-					<Offset Version="MQDebug" At="0x212040"/>
-				</Sample>
-				<Sample Name="Gulp">
-					<Offset Version="MQDebug" At="0x2147A0"/>
-				</Sample>
-				<Sample Name="Rustling Thicket">
-					<Offset Version="MQDebug" At="0x214E10"/>
-				</Sample>
-				<Sample Name="Cracking Egg">
-					<Offset Version="MQDebug" At="0x215810"/>
-				</Sample>
-				<Sample Name="Resounding Smash">
-					<Offset Version="MQDebug" At="0x216210"/>
-				</Sample>
-				<Sample Name="Cloaking Poe">
-					<Offset Version="MQDebug" At="0x216D00"/>
-				</Sample>
-				<Sample Name="Chittering Keese">
-					<Offset Version="MQDebug" At="0x2187D0"/>
-				</Sample>
-				<Sample Name="Rustling Large Wings">
-					<Offset Version="MQDebug" At="0x2193E0"/>
-				</Sample>
-				<Sample Name="Guay Hurt">
-					<Offset Version="MQDebug" At="0x219F10"/>
-				</Sample>
-				<Sample Name="Scritch">
-					<Offset Version="MQDebug" At="0x21A810"/>
-				</Sample>
-				<Sample Name="Gruff Voice">
-					<Offset Version="MQDebug" At="0x21AA80"/>
-				</Sample>
-				<Sample Name="Lizalfos Triumphant Cry">
-					<Offset Version="MQDebug" At="0x21ACF0"/>
-				</Sample>
-				<Sample Name="Lizalfos Foot Patter">
-					<Offset Version="MQDebug" At="0x21B150"/>
-				</Sample>
-				<Sample Name="Lizalfos Laughter">
-					<Offset Version="MQDebug" At="0x21B370"/>
-				</Sample>
-				<Sample Name="Deku Scrub Collapses">
-					<Offset Version="MQDebug" At="0x21BBC0"/>
-				</Sample>
-				<Sample Name="Broken Small Pottery">
-					<Offset Version="MQDebug" At="0x21C330"/>
-				</Sample>
-				<Sample Name="Monstrous Growl">
-					<Offset Version="MQDebug" At="0x21CF00"/>
-				</Sample>
-				<Sample Name="Moaning Phantom Ganon">
-					<Offset Version="MQDebug" At="0x21DDB0"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Laughing">
-					<Offset Version="MQDebug" At="0x220770"/>
-				</Sample>
-				<Sample Name="Gerudo Scimitar Slash">
-					<Offset Version="MQDebug" At="0x2222F0"/>
-				</Sample>
-				<Sample Name="Deku Baba Chomp">
-					<Offset Version="MQDebug" At="0x222BA0"/>
-				</Sample>
-				<Sample Name="Deku Baba Lunge" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x2230B0"/>
-				</Sample>
-				<Sample Name="Buzzing">
-					<Offset Version="MQDebug" At="0x223C90"/>
-				</Sample>
-				<Sample Name="Electric Burst">
-					<Offset Version="MQDebug" At="0x224FD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hovering">
-					<Offset Version="MQDebug" At="0x228A70"/>
-				</Sample>
-				<Sample Name="Magical Charge-Up">
-					<Offset Version="MQDebug" At="0x22C380"/>
-				</Sample>
-				<Sample Name="Echoing Thunderburst">
-					<Offset Version="MQDebug" At="0x22DD50"/>
-				</Sample>
-				<Sample Name="Phantom Ganon in Agony">
-					<Offset Version="MQDebug" At="0x233280"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Attacks">
-					<Offset Version="MQDebug" At="0x236F80"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Groans (Unused)">
-					<Offset Version="MQDebug" At="0x237BA0"/>
-				</Sample>
-				<Sample Name="Thunder and Groan">
-					<Offset Version="MQDebug" At="0x23AD60"/>
-				</Sample>
-				<Sample Name="Goron and Redead Moan">
-					<Offset Version="MQDebug" At="0x23D490"/>
-				</Sample>
-				<Sample Name="Phantom Ganon Growls">
-					<Offset Version="MQDebug" At="0x240600"/>
-				</Sample>
-				<Sample Name="Goron Inquiring">
-					<Offset Version="MQDebug" At="0x241690"/>
-				</Sample>
-				<Sample Name="Goron Recognizes">
-					<Offset Version="MQDebug" At="0x241C20"/>
-				</Sample>
-				<Sample Name="Goron Yawns">
-					<Offset Version="MQDebug" At="0x243440"/>
-				</Sample>
-				<Sample Name="Witch Cackles 1">
-					<Offset Version="MQDebug" At="0x244DD0"/>
-				</Sample>
-				<Sample Name="Witch Cackles 2">
-					<Offset Version="MQDebug" At="0x247290"/>
-				</Sample>
-				<Sample Name="Witch Hurt">
-					<Offset Version="MQDebug" At="0x249810"/>
-				</Sample>
-				<Sample Name="Witch Attacks">
-					<Offset Version="MQDebug" At="0x24AB70"/>
-				</Sample>
-				<Sample Name="Witch Inquires">
-					<Offset Version="MQDebug" At="0x24BBE0"/>
-				</Sample>
-				<Sample Name="Witch Yells a Curse">
-					<Offset Version="MQDebug" At="0x24C2C0"/>
-				</Sample>
-				<Sample Name="Witch Arguing">
-					<Offset Version="MQDebug" At="0x24E060"/>
-				</Sample>
-				<Sample Name="Witch Surprised">
-					<Offset Version="MQDebug" At="0x24F440"/>
-				</Sample>
-				<Sample Name="Twinrova Gasps">
-					<Offset Version="MQDebug" At="0x24FED0"/>
-				</Sample>
-				<Sample Name="Twinrova Thrown Off">
-					<Offset Version="MQDebug" At="0x250E20"/>
-				</Sample>
-				<Sample Name="Twinrova Laughs">
-					<Offset Version="MQDebug" At="0x2516D0"/>
-				</Sample>
-				<Sample Name="Witch Howls">
-					<Offset Version="MQDebug" At="0x252B10"/>
-				</Sample>
-				<Sample Name="Woman Chuckles">
-					<Offset Version="MQDebug" At="0x255720"/>
-				</Sample>
-				<Sample Name="Witch Charges (Unused)">
-					<Offset Version="MQDebug" At="0x2564A0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Attacks">
-					<Offset Version="MQDebug" At="0x258360"/>
-				</Sample>
-				<Sample Name="Finger Snap">
-					<Offset Version="MQDebug" At="0x2581C0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunt (Unused)">
-					<Offset Version="MQDebug" At="0x259120"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Charges">
-					<Offset Version="MQDebug" At="0x259BF0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Dies">
-					<Offset Version="MQDebug" At="0x25AAC0"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Grunts">
-					<Offset Version="MQDebug" At="0x25C140"/>
-				</Sample>
-				<Sample Name="Iron Knuckle Murmurs (Unused)">
-					<Offset Version="MQDebug" At="0x25CD60"/>
-				</Sample>
-				<Sample Name="Muted Timpani">
-					<Offset Version="MQDebug" At="0x25DB50"/>
-				</Sample>
-				<Sample Name="Chanting">
-					<Offset Version="MQDebug" At="0x25E9E0"/>
-				</Sample>
-				<Sample Name="Gerudo Attacks">
-					<Offset Version="MQDebug" At="0x25FC50"/>
-				</Sample>
-				<Sample Name="Gerudo Breathes">
-					<Offset Version="MQDebug" At="0x260420"/>
-				</Sample>
-				<Sample Name="Gerudo Hurt">
-					<Offset Version="MQDebug" At="0x261790"/>
-				</Sample>
-				<Sample Name="Gerudo Vanquished">
-					<Offset Version="MQDebug" At="0x262170"/>
-				</Sample>
-				<Sample Name="Enemy Struck">
-					<Offset Version="MQDebug" At="0x263270"/>
-				</Sample>
-				<Sample Name="Ganondorf Laughing">
-					<Offset Version="MQDebug" At="0x264B60"/>
-				</Sample>
-				<Sample Name="Ganondorf Attacks">
-					<Offset Version="MQDebug" At="0x26A060"/>
-				</Sample>
-				<Sample Name="Ganondorf Heavy Attack">
-					<Offset Version="MQDebug" At="0x26AAD0"/>
-				</Sample>
-				<Sample Name="Ganondorf Rebuffs">
-					<Offset Version="MQDebug" At="0x26B960"/>
-				</Sample>
-				<Sample Name="Ganondorf Strikes the Ground">
-					<Offset Version="MQDebug" At="0x26BEF0"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 1">
-					<Offset Version="MQDebug" At="0x26CE70"/>
-				</Sample>
-				<Sample Name="Ganondorf Hurt 2">
-					<Offset Version="MQDebug" At="0x26DF40"/>
-				</Sample>
-				<Sample Name="Ganondorf Breathes (Unused)">
-					<Offset Version="MQDebug" At="0x26FC60"/>
-				</Sample>
-				<Sample Name="Ganondorf Recovers">
-					<Offset Version="MQDebug" At="0x270E40"/>
-				</Sample>
-				<Sample Name="Ganondorf Gurgling Yell (Unused)">
-					<Offset Version="MQDebug" At="0x271A70"/>
-				</Sample>
-				<Sample Name="Ganondorf Dying Breath">
-					<Offset Version="MQDebug" At="0x273860"/>
-				</Sample>
-				<Sample Name="Ganondorf Vomits">
-					<Offset Version="MQDebug" At="0x274EA0"/>
-				</Sample>
-				<Sample Name="Ganondorf Yells in Defiance">
-					<Offset Version="MQDebug" At="0x2765B0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack (Unused)">
-					<Offset Version="MQDebug" At="0x27C0A0"/>
-				</Sample>
-				<Sample Name="Ganondorf's Final Attack 2 (Unused)">
-					<Offset Version="MQDebug" At="0x27E260"/>
-				</Sample>
-				<Sample Name="Ganondorf Chuckles">
-					<Offset Version="MQDebug" At="0x280C70"/>
-				</Sample>
-				<Sample Name="Redead Scream">
-					<Offset Version="MQDebug" At="0x283440"/>
-				</Sample>
-				<Sample Name="Monstrous Roaring">
-					<Offset Version="MQDebug" At="0x2869C0"/>
-				</Sample>
-				<Sample Name="Larval Sound Base">
-					<Offset Version="MQDebug" At="0x28BF50"/>
-				</Sample>
-				<Sample Name="Dinosaur Cry">
-					<Offset Version="MQDebug" At="0x28CE90"/>
-				</Sample>
-				<Sample Name="Phantom Ganon's Laughter">
-					<Offset Version="MQDebug" At="0x2938F0"/>
-				</Sample>
-				<Sample Name="Iron Boots 1">
-					<Offset Version="MQDebug" At="0x29B480"/>
-				</Sample>
-				<Sample Name="Metal Clink (Copy)">
-					<Offset Version="MQDebug" At="0x29EB20"/>
-				</Sample>
+				<Sample Name="Bird Chirp 1" Offset="0"/>
+				<Sample Name="Insect Chirrup" Offset="0x5B0" SampleRate="16000"/>
+				<Sample Name="Bird Chirp 2" Offset="0x780"/>
+				<Sample Name="Crickets" Offset="0xC70"/>
+				<Sample Name="Loud Bird Chirp" Offset="0x1730"/>
+				<Sample Name="Crow Caws" Offset="0x1ED0"/>
+				<Sample Name="Bird Call" Offset="0x2D10"/>
+				<Sample Name="Bird Screech" Offset="0x4250"/>
+				<Sample Name="Bird Song (Unused)" Offset="0x5480"/>
+				<Sample Name="Owl Hoot" Offset="0x77D0"/>
+				<Sample Name="Hawk Screech" Offset="0x97E0"/>
+				<Sample Name="Small Bird Chirps" Offset="0xB660"/>
+				<Sample Name="Rushing Water" Offset="0xBC80"/>
+				<Sample Name="Howling Wind" Offset="0xE4B0"/>
+				<Sample Name="Rainfall" Offset="0x11D80"/>
+				<Sample Name="Low Thunder" Offset="0x1C4A0"/>
+				<Sample Name="Lightning" Offset="0x27DA0"/>
+				<Sample Name="Howling Wind (Short)" Offset="0x33800"/>
+				<Sample Name="Cucco Crows" Offset="0x393F0"/>
+				<Sample Name="Cawing Bird" Offset="0x3D090"/>
+				<Sample Name="Step - Ground" Offset="0x3E360"/>
+				<Sample Name="Step - Sand" Offset="0x3ECE0"/>
+				<Sample Name="Step - Rock" Offset="0x3F770"/>
+				<Sample Name="Step - Jabu Jabu" Offset="0x40000"/>
+				<Sample Name="Step - Water" Offset="0x40AA0"/>
+				<Sample Name="Step - Carpet" Offset="0x414F0" SampleRate="8000"/>
+				<Sample Name="Step - Thick Carpet" Offset="0x41A20"/>
+				<Sample Name="Step - Tall Grass" Offset="0x41CD0"/>
+				<Sample Name="Synth Pad Sting" Offset="0x439A0"/>
+				<Sample Name="Small Splash" Offset="0x46810"/>
+				<Sample Name="Crunchy Drop" Offset="0x48840"/>
+				<Sample Name="Sliding Block" Offset="0x4A6A0"/>
+				<Sample Name="Step - Wood" Offset="0x4A510"/>
+				<Sample Name="Boots Sliding" Offset="0x4F790"/>
+				<Sample Name="Heavy Slide" Offset="0x53210"/>
+				<Sample Name="High Static" Offset="0x55BA0"/>
+				<Sample Name="Distorted Static" Offset="0x57D10"/>
+				<Sample Name="Heavy Static" Offset="0x5B590"/>
+				<Sample Name="Large Water Splash" Offset="0x5CBA0"/>
+				<Sample Name="Swimming" Offset="0x60240"/>
+				<Sample Name="Stone Doof" Offset="0x61B90"/>
+				<Sample Name="Step - Wooden Bridge" Offset="0x63350"/>
+				<Sample Name="Step - Fire" Offset="0x63B70"/>
+				<Sample Name="Iron Boots 2" Offset="0x64600"/>
+				<Sample Name="Step - Ice" Offset="0x64F70"/>
+				<Sample Name="Crackling Fire (Keese)" Offset="0x65580"/>
+				<Sample Name="Metal Clink" Offset="0x67FA0"/>
+				<Sample Name="Whish" Offset="0x68CC0"/>
+				<Sample Name="Sheathe Sword" Offset="0x69130" SampleRate="16000"/>
+				<Sample Name="Draw Sword" Offset="0x6A040" SampleRate="17640"/>
+				<Sample Name="Air Swish" Offset="0x6BA00" SampleRate="15435"/>
+				<Sample Name="Air Whistle" Offset="0x6C3C0"/>
+				<Sample Name="Bow Pulled Taut" Offset="0x6D5B0"/>
+				<Sample Name="Sword Striking Metal Shield" Offset="0x71C70"/>
+				<Sample Name="Moving Metal Chain" Offset="0x732A0"/>
+				<Sample Name="Hissing Fuse" Offset="0x74790"/>
+				<Sample Name="Heavy Thump" Offset="0x77010"/>
+				<Sample Name="Egg Hatching" Offset="0x77BA0"/>
+				<Sample Name="Arrow Thunk in Wood" Offset="0x7AFD0"/>
+				<Sample Name="Air Whoosh" Offset="0x7D290"/>
+				<Sample Name="Broken Wood" Offset="0x7F3F0"/>
+				<Sample Name="Whip Snap" Offset="0x7FC90"/>
+				<Sample Name="Buzzing Synth" Offset="0x80E00"/>
+				<Sample Name="Soft Thump" Offset="0x82000"/>
+				<Sample Name="Sword Strike" Offset="0x82ED0" SampleRate="10000"/>
+				<Sample Name="Eye of Truth" Offset="0x84380"/>
+				<Sample Name="Popping Cork" Offset="0x87030"/>
+				<Sample Name="Bowstring Twang" Offset="0x87440" SampleRate="19200"/>
+				<Sample Name="Bombchu Motor" Offset="0x88620" SampleRate="22050"/>
+				<Sample Name="Rupee" Offset="0x88A50" SampleRate="32000"/>
+				<Sample Name="Opening Wooden Door" Offset="0x8A4B0"/>
+				<Sample Name="Closing Wooden Door" Offset="0x8E160"/>
+				<Sample Name="Explosion 1" Offset="0x8F6F0"/>
+				<Sample Name="Gallop" Offset="0x93DB0"/>
+				<Sample Name="Horse Neigh" Offset="0x94B10"/>
+				<Sample Name="Flowing Creek" Offset="0x98B00"/>
+				<Sample Name="Rushing Waterfall" Offset="0x9D5F0"/>
+				<Sample Name="Mechanically Shifting Stone" Offset="0xA0260"/>
+				<Sample Name="Rolling Boulder" Offset="0xA14A0" SampleRate="8000"/>
+				<Sample Name="Bubbling Lava" Offset="0xA2590"/>
+				<Sample Name="Retracting Metal Chain" Offset="0xA9EF0"/>
+				<Sample Name="Relaxed Cucco Clucks" Offset="0xAB9E0"/>
+				<Sample Name="Stone Strike" Offset="0xADBA0" SampleRate="10000"/>
+				<Sample Name="Horse Snort" Offset="0xAF0A0" SampleRate="12000"/>
+				<Sample Name="Water Splish" Offset="0xB0960"/>
+				<Sample Name="Wooden Strike" Offset="0xB3600"/>
+				<Sample Name="Flying Fairy" Offset="0xB3B10"/>
+				<Sample Name="Settled Stone Block" Offset="0xB4B90"/>
+				<Sample Name="Creaking Door" Offset="0xB5A80"/>
+				<Sample Name="Creaking Wood" Offset="0xB8690"/>
+				<Sample Name="Ignition" Offset="0xBA0D0"/>
+				<Sample Name="Warp Circle Ambience" Offset="0xBBB00"/>
+				<Sample Name="Fairy Magic" Offset="0xC42B0"/>
+				<Sample Name="Water Drips" Offset="0xC5140"/>
+				<Sample Name="Underwater Bubbles" Offset="0xC88C0"/>
+				<Sample Name="Fire Crackling" Offset="0xCAF60"/>
+				<Sample Name="Heavy Platform Rotating" Offset="0xD16F0" SampleRate="8000"/>
+				<Sample Name="Light Rock Slam" Offset="0xD2110"/>
+				<Sample Name="Flapping Cloak" Offset="0xD3DC0"/>
+				<Sample Name="People Chattering" Offset="0xD57A0"/>
+				<Sample Name="Cloth Ripping" Offset="0xDE0A0"/>
+				<Sample Name="Mechanical Ramp-Up" Offset="0xE01F0"/>
+				<Sample Name="Crystal Synth (Low)" Offset="0xE2510"/>
+				<Sample Name="Shimmering Treasure" Offset="0xE44A0"/>
+				<Sample Name="Gunshot" Offset="0xE4B00"/>
+				<Sample Name="Wolf Howl" Offset="0xE5B70"/>
+				<Sample Name="Frog Ribbit" Offset="0xEA760"/>
+				<Sample Name="Dog Yip" Offset="0xEAFC0"/>
+				<Sample Name="Metal Door" Offset="0xEB5B0"/>
+				<Sample Name="Cow Moo" Offset="0xECF40"/>
+				<Sample Name="Dialogue Continue (Harp)" Offset="0xEEB80"/>
+				<Sample Name="Dong (Failed Learning)" Offset="0xF2FE0"/>
+				<Sample Name="Whistle" Offset="0xF5350"/>
+				<Sample Name="Clanging Bells" Offset="0xF5A90"/>
+				<Sample Name="Person Whistling" Offset="0xF72A0"/>
+				<Sample Name="Ocarina_Looped" Offset="0xFAD40"/>
+				<!--<Sample Name="Ocarina_Looped" Offset="0xFAD40" LoopOffset="0x1550"/>
+-->
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Tambo Drum" Offset="0x10CD20"/>
+				<Sample Name="Small Cymbal" Offset="0x10EFF0"/>
+				<Sample Name="Z Target" Offset="0x111520"/>
+				<Sample Name="Enemy Target Lock-On" Offset="0x1129E0"/>
+				<Sample Name="Adult Link - Spur Horse 1" Offset="0x114D70"/>
+				<Sample Name="Adult Link - Spur Horse 2" Offset="0x1165E0"/>
+				<Sample Name="Adult Link - Attack 1" Offset="0x1176B0"/>
+				<Sample Name="Adult Link - Attack 2" Offset="0x118910"/>
+				<Sample Name="Adult Link - Attack 3" Offset="0x119870"/>
+				<Sample Name="Adult Link - Attack 4" Offset="0x11A270"/>
+				<Sample Name="Adult Link - Hup" Offset="0x11B0E0"/>
+				<Sample Name="Adult Link - Gasp 1" Offset="0x11B790"/>
+				<Sample Name="Adult Link - Strong Attack 1" Offset="0x11BE20"/>
+				<Sample Name="Adult Link - Strong Attack 2" Offset="0x11D6D0"/>
+				<Sample Name="Adult Link - Dangling Grunt" Offset="0x11EE50"/>
+				<Sample Name="Adult Link - Dangling Gasp 1" Offset="0x11FB00"/>
+				<Sample Name="Adult Link - Climb Edge" Offset="0x120D60"/>
+				<Sample Name="Adult Link - Dangling Gasp 2" Offset="0x121BF0"/>
+				<Sample Name="Adult Link - Hurt 1" Offset="0x122C10"/>
+				<Sample Name="Adult Link - Hurt 2" Offset="0x1243F0"/>
+				<Sample Name="Adult Link - Hurt 3" Offset="0x125A90"/>
+				<Sample Name="Adult Link - Hurt 4" Offset="0x126ED0"/>
+				<Sample Name="Adult Link - Knocked Back" Offset="0x128DA0"/>
+				<Sample Name="Adult Link - Hurt 5" Offset="0x12AC80"/>
+				<Sample Name="Adult Link - Falling 1" Offset="0x12CD30"/>
+				<Sample Name="Adult Link - Falling 2" Offset="0x133AB0"/>
+				<Sample Name="Adult Link - Gasp 2" Offset="0x139D70"/>
+				<Sample Name="Adult Link - Gasp 3" Offset="0x13AF50"/>
+				<Sample Name="Adult Link - Pant 1" Offset="0x13C040"/>
+				<Sample Name="Adult Link - Pant 2" Offset="0x13D3B0"/>
+				<Sample Name="Adult Link - Glug" Offset="0x13E870"/>
+				<Sample Name="Adult Link - Refreshed" Offset="0x13F6B0"/>
+				<Sample Name="Adult Link - Lift (Unused)" Offset="0x140FC0"/>
+				<Sample Name="Adult Link - Cast Attacking Magic" Offset="0x141960"/>
+				<Sample Name="Adult Link - Painful Landing" Offset="0x143690"/>
+				<Sample Name="Adult Link - Dramatic Gasp" Offset="0x146490"/>
+				<Sample Name="Adult Link - Hurt (Unused)" Offset="0x1478F0"/>
+				<Sample Name="Adult Link - Choking" Offset="0x148390"/>
+				<Sample Name="Adult Link - Gasping (Unused)" Offset="0x1493C0"/>
+				<Sample Name="Adult Link - Small Gasp (Unused)" Offset="0x14B440"/>
+				<Sample Name="Adult Link - Unsettled Moan" Offset="0x14C250"/>
+				<Sample Name="Adult Link - Sneezes" Offset="0x151520"/>
+				<Sample Name="Adult Link - Sigh 1" Offset="0x15A6A0"/>
+				<Sample Name="Adult Link - Sigh 2" Offset="0x15BE50"/>
+				<Sample Name="Adult Link - Sigh 3" Offset="0x15DCB0"/>
+				<Sample Name="Adult Link - Stretch Start" Offset="0x15F4B0"/>
+				<Sample Name="Adult Link - Stretching" Offset="0x1617F0"/>
+				<Sample Name="Adult Link - Finished Stretching" Offset="0x163280"/>
+				<Sample Name="Child Link - Attack 1" Offset="0x166790"/>
+				<Sample Name="Child Link - Attack 2" Offset="0x167800"/>
+				<Sample Name="Child Link - Attack 3" Offset="0x168650"/>
+				<Sample Name="Child Link - Attack 4" Offset="0x1698E0"/>
+				<Sample Name="Child Link - Hup 1" Offset="0x16A450"/>
+				<Sample Name="Child Link - Hup 2" Offset="0x16AEA0"/>
+				<Sample Name="Child Link - Strong Attack 1" Offset="0x16B3E0"/>
+				<Sample Name="Child Link - Strong Attack 2" Offset="0x16CE20"/>
+				<Sample Name="Child Link - Dangling Gasp 1" Offset="0x16EEA0"/>
+				<Sample Name="Child Link - Dangling Gasp 2" Offset="0x16FE60"/>
+				<Sample Name="Child Link - Sigh 1" Offset="0x170E80"/>
+				<Sample Name="Child Link - Sigh 2" Offset="0x171DA0"/>
+				<Sample Name="Child Link - Hurt 1" Offset="0x173320"/>
+				<Sample Name="Child Link - Hurt 2" Offset="0x174240"/>
+				<Sample Name="Child Link - Hurt 3" Offset="0x175140"/>
+				<Sample Name="Child Link - Hurt 4" Offset="0x175C30"/>
+				<Sample Name="Child Link - Knocked Back" Offset="0x177480"/>
+				<Sample Name="Child Link - Hurt 5" Offset="0x178D40"/>
+				<Sample Name="Child Link - Falling 1" Offset="0x1795F0"/>
+				<Sample Name="Child Link - Falling 2" Offset="0x17E6C0"/>
+				<Sample Name="Child Link - Gasp 1" Offset="0x182EC0"/>
+				<Sample Name="Child Link - Gasp 2" Offset="0x1844E0"/>
+				<Sample Name="Child Link - Wheeze" Offset="0x185BA0"/>
+				<Sample Name="Child Link - Exhausted Panting" Offset="0x188170"/>
+				<Sample Name="Child Link - Glug" Offset="0x18A560"/>
+				<Sample Name="Child Link - Refreshed" Offset="0x18B650"/>
+				<Sample Name="Child Link - Charge Up (Unused)" Offset="0x18D090"/>
+				<Sample Name="Child Link - Cast Attack Spell" Offset="0x18E480"/>
+				<Sample Name="Child Link - Painful Landing" Offset="0x190200"/>
+				<Sample Name="Child Link - Dramatic Gasp" Offset="0x193410"/>
+				<Sample Name="Child Link - Dying Gasp" Offset="0x196950"/>
+				<Sample Name="Child Link - Strangled (Unused)" Offset="0x1971A0"/>
+				<Sample Name="Child Link - Gasp 3" Offset="0x197500"/>
+				<Sample Name="Child Link - Shivers" Offset="0x198F30"/>
+				<Sample Name="Child Link - Sneeze" Offset="0x19F6D0"/>
+				<Sample Name="Child Link - Grunt" Offset="0x1A1670"/>
+				<Sample Name="Child Link - Moans From Heat" Offset="0x1A2580"/>
+				<Sample Name="Child Link - Awakening Grunt" Offset="0x1A71E0"/>
+				<Sample Name="Child Link - Wiping Off Sweat" Offset="0x1A79C0"/>
+				<Sample Name="Child Link - Yawn Starts" Offset="0x1AF2E0"/>
+				<Sample Name="Child Link - Yawn and Stretch" Offset="0x1AFEE0"/>
+				<Sample Name="Child Link - Stretch Refreshingly" Offset="0x1B3F50"/>
+				<Sample Name="Navi - Watch Out!" Offset="0x1B6530"/>
+				<Sample Name="Navi - Look!" Offset="0x1B7B40"/>
+				<Sample Name="Navi - Hey!" Offset="0x1B8DB0"/>
+				<Sample Name="Navi - Listen!" Offset="0x1B9D70"/>
+				<Sample Name="Navi - Hello!" Offset="0x1BB410"/>
+				<Sample Name="Talon Snoring" Offset="0x1BC380"/>
+				<Sample Name="Talon Startled" Offset="0x1BFA40"/>
+				<Sample Name="Talon Distressed" Offset="0x1C0F80"/>
+				<Sample Name="Talon Fearful" Offset="0x1C2510"/>
+				<Sample Name="Great Fairy Laughter" Offset="0x1C6870"/>
+				<Sample Name="Great Fairy Titters" Offset="0x1CC560"/>
+				<Sample Name="Ingo Yowls" Offset="0x1CF9C0"/>
+				<Sample Name="Ingo Exclaims" Offset="0x1D25C0"/>
+				<Sample Name="Ingo - Hyeaaaaugh" Offset="0x1D58F0"/>
+				<Sample Name="Ingo - Hyah!" Offset="0x1D74B0"/>
+				<Sample Name="Girl Gasps" Offset="0x1D8420"/>
+				<Sample Name="Girl Screams 1" Offset="0x1D9880"/>
+				<Sample Name="Girl Inquiring 1" Offset="0x1DDA40"/>
+				<Sample Name="Girl Hurt" Offset="0x1DE3C0"/>
+				<Sample Name="Girl Startled 1" Offset="0x1DF040"/>
+				<Sample Name="Girl Screams 2" Offset="0x1E0140"/>
+				<Sample Name="Girl Delighted" Offset="0x1E3160"/>
+				<Sample Name="Girl Surprised 1" Offset="0x1E48E0"/>
+				<Sample Name="Girl Surprised 2" Offset="0x1E55F0"/>
+				<Sample Name="Girl Discombobulated (Unused)" Offset="0x1E6000"/>
+				<Sample Name="Woman Yells" Offset="0x1E7E90"/>
+				<Sample Name="Woman Yells, Startled" Offset="0x1E9960"/>
+				<Sample Name="Woman Grunts" Offset="0x1EB6B0"/>
+				<Sample Name="Woman Hup" Offset="0x1EC2B0"/>
+				<Sample Name="Girl Sighs" Offset="0x1EC990"/>
+				<Sample Name="Girl Startled 2" Offset="0x1EE390"/>
+				<Sample Name="Girl Inquiring 2" Offset="0x1EF1B0"/>
+				<Sample Name="Girl Disappointed" Offset="0x1EFCE0"/>
+				<Sample Name="Girl Laughing" Offset="0x1F1600"/>
+				<Sample Name="Girl Startled 3" Offset="0x1F3020"/>
+				<Sample Name="Girl Grunts in Effort" Offset="0x1F4010"/>
+				<Sample Name="Girl Screams 3" Offset="0x1F4EB0"/>
+				<Sample Name="Girl Screams 4" Offset="0x1F5E50"/>
+				<Sample Name="Girl Sighs Contentedly" Offset="0x1F7220"/>
+				<Sample Name="Girl Surprised 3" Offset="0x1F9490"/>
+				<Sample Name="Girl Scared" Offset="0x1FA230"/>
+				<Sample Name="Skulltula Screaming" Offset="0x1FB850"/>
+				<Sample Name="Skulltula Grunts Angrily" Offset="0x1FEA30"/>
+				<Sample Name="King Zora Scoots" Offset="0x1FFD80"/>
+				<Sample Name="Flamethrower" Offset="0x200840"/>
+				<Sample Name="Dodongo Roar" Offset="0x206D10"/>
+				<Sample Name="Heavy Rumbling" Offset="0x209E40"/>
+				<Sample Name="Clattering Spear" Offset="0x20B580" SampleRate="10000"/>
+				<Sample Name="Ganon's Electrical Charge" Offset="0x20BDA0"/>
+				<Sample Name="Dramatic Swoosh" Offset="0x20C9E0"/>
+				<Sample Name="Broken Pottery" Offset="0x20DE70" SampleRate="12000"/>
+				<Sample Name="Shattered Glass" Offset="0x20F440"/>
+				<Sample Name="Heavy Gunshot" Offset="0x2115A0"/>
+				<Sample Name="Dodongo Inhale" Offset="0x212040"/>
+				<Sample Name="Gulp" Offset="0x2147A0"/>
+				<Sample Name="Rustling Thicket" Offset="0x214E10"/>
+				<Sample Name="Cracking Egg" Offset="0x215810"/>
+				<Sample Name="Resounding Smash" Offset="0x216210"/>
+				<Sample Name="Cloaking Poe" Offset="0x216D00"/>
+				<Sample Name="Chittering Keese" Offset="0x2187D0"/>
+				<Sample Name="Rustling Large Wings" Offset="0x2193E0"/>
+				<Sample Name="Guay Hurt" Offset="0x219F10"/>
+				<Sample Name="Scritch" Offset="0x21A810"/>
+				<Sample Name="Gruff Voice" Offset="0x21AA80"/>
+				<Sample Name="Lizalfos Triumphant Cry" Offset="0x21ACF0"/>
+				<Sample Name="Lizalfos Foot Patter" Offset="0x21B150"/>
+				<Sample Name="Lizalfos Laughter" Offset="0x21B370"/>
+				<Sample Name="Deku Scrub Collapses" Offset="0x21BBC0"/>
+				<Sample Name="Broken Small Pottery" Offset="0x21C330"/>
+				<Sample Name="Monstrous Growl" Offset="0x21CF00"/>
+				<Sample Name="Moaning Phantom Ganon" Offset="0x21DDB0"/>
+				<Sample Name="Phantom Ganon Laughing" Offset="0x220770"/>
+				<Sample Name="Gerudo Scimitar Slash" Offset="0x2222F0"/>
+				<Sample Name="Deku Baba Chomp" Offset="0x222BA0"/>
+				<Sample Name="Deku Baba Lunge" Offset="0x2230B0" SampleRate="20000"/>
+				<Sample Name="Buzzing" Offset="0x223C90"/>
+				<Sample Name="Electric Burst" Offset="0x224FD0"/>
+				<Sample Name="Ganondorf Hovering" Offset="0x228A70"/>
+				<Sample Name="Magical Charge-Up" Offset="0x22C380"/>
+				<Sample Name="Echoing Thunderburst" Offset="0x22DD50"/>
+				<Sample Name="Phantom Ganon in Agony" Offset="0x233280"/>
+				<Sample Name="Phantom Ganon Attacks" Offset="0x236F80"/>
+				<Sample Name="Phantom Ganon Groans (Unused)" Offset="0x237BA0"/>
+				<Sample Name="Thunder and Groan" Offset="0x23AD60"/>
+				<Sample Name="Goron and Redead Moan" Offset="0x23D490"/>
+				<Sample Name="Phantom Ganon Growls" Offset="0x240600"/>
+				<Sample Name="Goron Inquiring" Offset="0x241690"/>
+				<Sample Name="Goron Recognizes" Offset="0x241C20"/>
+				<Sample Name="Goron Yawns" Offset="0x243440"/>
+				<Sample Name="Witch Cackles 1" Offset="0x244DD0"/>
+				<Sample Name="Witch Cackles 2" Offset="0x247290"/>
+				<Sample Name="Witch Hurt" Offset="0x249810"/>
+				<Sample Name="Witch Attacks" Offset="0x24AB70"/>
+				<Sample Name="Witch Inquires" Offset="0x24BBE0"/>
+				<Sample Name="Witch Yells a Curse" Offset="0x24C2C0"/>
+				<Sample Name="Witch Arguing" Offset="0x24E060"/>
+				<Sample Name="Witch Surprised" Offset="0x24F440"/>
+				<Sample Name="Twinrova Gasps" Offset="0x24FED0"/>
+				<Sample Name="Twinrova Thrown Off" Offset="0x250E20"/>
+				<Sample Name="Twinrova Laughs" Offset="0x2516D0"/>
+				<Sample Name="Witch Howls" Offset="0x252B10"/>
+				<Sample Name="Woman Chuckles" Offset="0x255720"/>
+				<Sample Name="Witch Charges (Unused)" Offset="0x2564A0"/>
+				<Sample Name="Iron Knuckle Attacks" Offset="0x258360"/>
+				<Sample Name="Finger Snap" Offset="0x2581C0"/>
+				<Sample Name="Iron Knuckle Grunt (Unused)" Offset="0x259120"/>
+				<Sample Name="Iron Knuckle Charges" Offset="0x259BF0"/>
+				<Sample Name="Iron Knuckle Dies" Offset="0x25AAC0"/>
+				<Sample Name="Iron Knuckle Grunts" Offset="0x25C140"/>
+				<Sample Name="Iron Knuckle Murmurs (Unused)" Offset="0x25CD60"/>
+				<Sample Name="Muted Timpani" Offset="0x25DB50"/>
+				<Sample Name="Chanting" Offset="0x25E9E0"/>
+				<Sample Name="Gerudo Attacks" Offset="0x25FC50"/>
+				<Sample Name="Gerudo Breathes" Offset="0x260420"/>
+				<Sample Name="Gerudo Hurt" Offset="0x261790"/>
+				<Sample Name="Gerudo Vanquished" Offset="0x262170"/>
+				<Sample Name="Enemy Struck" Offset="0x263270"/>
+				<Sample Name="Ganondorf Laughing" Offset="0x264B60"/>
+				<Sample Name="Ganondorf Attacks" Offset="0x26A060"/>
+				<Sample Name="Ganondorf Heavy Attack" Offset="0x26AAD0"/>
+				<Sample Name="Ganondorf Rebuffs" Offset="0x26B960"/>
+				<Sample Name="Ganondorf Strikes the Ground" Offset="0x26BEF0"/>
+				<Sample Name="Ganondorf Hurt 1" Offset="0x26CE70"/>
+				<Sample Name="Ganondorf Hurt 2" Offset="0x26DF40"/>
+				<Sample Name="Ganondorf Breathes (Unused)" Offset="0x26FC60"/>
+				<Sample Name="Ganondorf Recovers" Offset="0x270E40"/>
+				<Sample Name="Ganondorf Gurgling Yell (Unused)" Offset="0x271A70"/>
+				<Sample Name="Ganondorf Dying Breath" Offset="0x273860"/>
+				<Sample Name="Ganondorf Vomits" Offset="0x274EA0"/>
+				<Sample Name="Ganondorf Yells in Defiance" Offset="0x2765B0"/>
+				<Sample Name="Ganondorf's Final Attack (Unused)" Offset="0x27C0A0"/>
+				<Sample Name="Ganondorf's Final Attack 2 (Unused)" Offset="0x27E260"/>
+				<Sample Name="Ganondorf Chuckles" Offset="0x280C70"/>
+				<Sample Name="Redead Scream" Offset="0x283440"/>
+				<Sample Name="Monstrous Roaring" Offset="0x2869C0"/>
+				<Sample Name="Larval Sound Base" Offset="0x28BF50"/>
+				<Sample Name="Dinosaur Cry" Offset="0x28CE90"/>
+				<Sample Name="Phantom Ganon's Laughter" Offset="0x2938F0"/>
+				<Sample Name="Iron Boots 1" Offset="0x29B480"/>
+				<Sample Name="Metal Clink (Copy)" Offset="0x29EB20"/>
 			</Samples>
 			<Samples Bank="1">
-				<Sample Name="Ocarina_Bank1">
-					<Offset Version="MQDebug" At="0xFAD40"/>
-				</Sample>
-				<Sample Name="Accordion">
-					<Offset Version="MQDebug" At="0xFDFC0"/>
-				</Sample>
-				<Sample Name="Harp 1">
-					<Offset Version="MQDebug" At="0x1026F0"/>
-				</Sample>
-				<Sample Name="Malon">
-					<Offset Version="MQDebug" At="0x106C20"/>
-				</Sample>
-				<Sample Name="Flute">
-					<Offset Version="MQDebug" At="0x108690"/>
-				</Sample>
-				<Sample Name="Ghostly Wind">
-					<Offset Version="MQDebug" At="0x29FE30"/>
-				</Sample>
-				<Sample Name="Ghostly Echoes">
-					<Offset Version="MQDebug" At="0x2A4D40"/>
-				</Sample>
-				<Sample Name="Echoing Drums" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x2A8500"/>
-				</Sample>
-				<Sample Name="Vocal Oohs">
-					<Offset Version="MQDebug" At="0x2AF020"/>
-				</Sample>
-				<Sample Name="Vocal Eees">
-					<Offset Version="MQDebug" At="0x2B43B0"/>
-				</Sample>
-				<Sample Name="Rattling Scream">
-					<Offset Version="MQDebug" At="0x2B9E60"/>
-				</Sample>
-				<Sample Name="Harpsichord" SampleRate="75000">
-					<Offset Version="MQDebug" At="0x2C8510"/>
-				</Sample>
-				<Sample Name="Piano">
-					<Offset Version="MQDebug" At="0x2CFEE0"/>
-				</Sample>
-				<Sample Name="Piano (Soft)">
-					<Offset Version="MQDebug" At="0x2D96A0"/>
-				</Sample>
-				<Sample Name="Vocal Aahs" SampleRate="16518">
-					<Offset Version="MQDebug" At="0x2DFF40"/>
-				</Sample>
-				<Sample Name="Resonant Vocal Aahs" SampleRate="11680">
-					<Offset Version="MQDebug" At="0x2E7410"/>
-				</Sample>
-				<Sample Name="Harp 2">
-					<Offset Version="MQDebug" At="0x2EF650"/>
-				</Sample>
-				<Sample Name="Glockenspiel" SampleRate="16951">
-					<Offset Version="MQDebug" At="0x2F3300"/>
-				</Sample>
-				<Sample Name="Mechanical Rumbling">
-					<Offset Version="MQDebug" At="0x2F8690"/>
-				</Sample>
-				<Sample Name="Trumpet">
-					<Offset Version="MQDebug" At="0x2F9A90"/>
-				</Sample>
-				<Sample Name="Trombone" SampleRate="21357">
-					<Offset Version="MQDebug" At="0x2FD270"/>
-				</Sample>
-				<Sample Name="Tuba" SampleRate="101593">
-					<Offset Version="MQDebug" At="0x301EC0"/>
-				</Sample>
-				<Sample Name="Bass Drum 1">
-					<Offset Version="MQDebug" At="0x304E30"/>
-				</Sample>
-				<Sample Name="Snare Drum 1">
-					<Offset Version="MQDebug" At="0x309BD0"/>
-				</Sample>
-				<Sample Name="Snare Drum 2" SampleRate="33902">
-					<Offset Version="MQDebug" At="0x30C360"/>
-				</Sample>
-				<Sample Name="Cymbal">
-					<Offset Version="MQDebug" At="0x30EAF0"/>
-				</Sample>
-				<Sample Name="Timpani" SampleRate="16000">
-					<Offset Version="MQDebug" At="0x317260"/>
-				</Sample>
-				<Sample Name="Strings (Low)" SampleRate="128000">
-					<Offset Version="MQDebug" At="0x31F640"/>
-				</Sample>
-				<Sample Name="Strings 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x324660"/>
-				</Sample>
-				<Sample Name="Strings 2" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x328D10"/>
-				</Sample>
-				<Sample Name="Fiddle" SampleRate="20158">
-					<Offset Version="MQDebug" At="0x32CA00"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 1" SampleRate="40317">
-					<Offset Version="MQDebug" At="0x32ECB0"/>
-				</Sample>
-				<Sample Name="Acoustic Guitar 2" SampleRate="13454">
-					<Offset Version="MQDebug" At="0x332D10"/>
-				</Sample>
-				<Sample Name="Tom Drum" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x335740"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0x337A10"/>
-				</Sample>
-				<Sample Name="Finger Cymbals">
-					<Offset Version="MQDebug" At="0x338450"/>
-				</Sample>
-				<Sample Name="Oboe" SampleRate="12699">
-					<Offset Version="MQDebug" At="0x33A980"/>
-				</Sample>
-				<Sample Name="Bassoon" SampleRate="76109">
-					<Offset Version="MQDebug" At="0x33BC30"/>
-				</Sample>
-				<Sample Name="Harp 3" SampleRate="67805">
-					<Offset Version="MQDebug" At="0x33D130"/>
-				</Sample>
-				<Sample Name="Pizzicato Violin" SampleRate="17959">
-					<Offset Version="MQDebug" At="0x3403F0"/>
-				</Sample>
-				<Sample Name="Church Organ">
-					<Offset Version="MQDebug" At="0x343870"/>
-				</Sample>
-				<Sample Name="Electric Organ">
-					<Offset Version="MQDebug" At="0x34D670"/>
-				</Sample>
-				<Sample Name="Horn">
-					<Offset Version="MQDebug" At="0x351810"/>
-				</Sample>
-				<Sample Name="Bass Guitar" SampleRate="76195">
-					<Offset Version="MQDebug" At="0x359170"/>
-				</Sample>
-				<Sample Name="Clap" SampleRate="24000">
-					<Offset Version="MQDebug" At="0x35C900"/>
-				</Sample>
-				<Sample Name="Resonant Bass Marimba" SampleRate="18541">
-					<Offset Version="MQDebug" At="0x35D100"/>
-				</Sample>
-				<Sample Name="Haunting Wind">
-					<Offset Version="MQDebug" At="0x364580"/>
-				</Sample>
-				<Sample Name="Off Hi-Hat" SampleRate="26000">
-					<Offset Version="MQDebug" At="0x36FE80"/>
-				</Sample>
-				<Sample Name="Drum and Sitar" SampleRate="20000">
-					<Offset Version="MQDebug" At="0x374C20"/>
-				</Sample>
-				<Sample Name="Percussive Resonance" SampleRate="23973">
-					<Offset Version="MQDebug" At="0x378360"/>
-				</Sample>
-				<Sample Name="Clarinet">
-					<Offset Version="MQDebug" At="0x37A6B0"/>
-				</Sample>
-				<Sample Name="Harpsichord (High)" SampleRate="42714">
-					<Offset Version="MQDebug" At="0x37B2A0"/>
-				</Sample>
-				<Sample Name="Marimba 1" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x382830"/>
-				</Sample>
-				<Sample Name="Marimba 2" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x384ED0"/>
-				</Sample>
-				<Sample Name="Crystal Synth" SampleRate="26939">
-					<Offset Version="MQDebug" At="0x387060"/>
-				</Sample>
-				<Sample Name="Sitar" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x38F000"/>
-				</Sample>
-				<Sample Name="Koto" SampleRate="28508">
-					<Offset Version="MQDebug" At="0x3926D0"/>
-				</Sample>
-				<Sample Name="Some Manner of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x396F80"/>
-				</Sample>
-				<Sample Name="Another Type of Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x397FA0"/>
-				</Sample>
-				<Sample Name="Quick Drum" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x399790"/>
-				</Sample>
-				<Sample Name="Gong" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x39A6B0"/>
-				</Sample>
-				<Sample Name="Windchimes">
-					<Offset Version="MQDebug" At="0x3A4BE0"/>
-				</Sample>
-				<Sample Name="Goron Drum">
-					<Offset Version="MQDebug" At="0x3AA6E0"/>
-				</Sample>
-				<Sample Name="Melodic Wooden Clacking" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3ACC20"/>
-				</Sample>
-				<Sample Name="Vocal Ohs">
-					<Offset Version="MQDebug" At="0x3AE1C0"/>
-				</Sample>
-				<Sample Name="Flute and Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B45D0"/>
-				</Sample>
-				<Sample Name="Off-Kilter Flute" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B5490"/>
-				</Sample>
-				<Sample Name="Voice" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B63F0"/>
-				</Sample>
-				<Sample Name="Drum 1" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B71F0"/>
-				</Sample>
-				<Sample Name="Drum 2" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3B94B0"/>
-				</Sample>
-				<Sample Name="Slap Bass" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BBC80"/>
-				</Sample>
-				<Sample Name="Shaker">
-					<Offset Version="MQDebug" At="0x3BE750"/>
-				</Sample>
-				<Sample Name="Cowbell" SampleRate="32000">
-					<Offset Version="MQDebug" At="0x3BF6A0"/>
-				</Sample>
-				<Sample Name="Guitar (Low)" SampleRate="19000">
-					<Offset Version="MQDebug" At="0x3C0360"/>
-				</Sample>
-				<Sample Name="Guitar">
-					<Offset Version="MQDebug" At="0x3C2B40"/>
-				</Sample>
-				<Sample Name="Guitar (High)" SampleRate="10690">
-					<Offset Version="MQDebug" At="0x3C4D00"/>
-				</Sample>
-				<Sample Name="Viola" SampleRate="19027">
-					<Offset Version="MQDebug" At="0x3C6BD0"/>
-				</Sample>
-				<Sample Name="Church Bell">
-					<Offset Version="MQDebug" At="0x3CAC50"/>
-				</Sample>
-				<Sample Name="Goron Oh (High)">
-					<Offset Version="MQDebug" At="0x3CF8A0"/>
-				</Sample>
-				<Sample Name="Goron Oh">
-					<Offset Version="MQDebug" At="0x3D0140"/>
-				</Sample>
-				<Sample Name="Banjo (Low)" SampleRate="57017">
-					<Offset Version="MQDebug" At="0x3D0C00"/>
-				</Sample>
-				<Sample Name="Banjo" SampleRate="38054">
-					<Offset Version="MQDebug" At="0x3D3A40"/>
-				</Sample>
-				<Sample Name="Islamic Chant">
-					<Offset Version="MQDebug" At="0x3D62E0"/>
-				</Sample>
-				<Sample Name="Steel Drum">
-					<Offset Version="MQDebug" At="0x3E3F50"/>
-				</Sample>
-				<Sample Name="Steel Drum (High)" SampleRate="14254">
-					<Offset Version="MQDebug" At="0x3E8BB0"/>
-				</Sample>
+				<Sample Name="Ocarina_Bank1" Offset="0xFAD40"/>
+				<Sample Name="Accordion" Offset="0xFDFC0"/>
+				<Sample Name="Harp 1" Offset="0x1026F0"/>
+				<Sample Name="Malon" Offset="0x106C20"/>
+				<Sample Name="Flute" Offset="0x108690"/>
+				<Sample Name="Ghostly Wind" Offset="0x29FE30"/>
+				<Sample Name="Ghostly Echoes" Offset="0x2A4D40"/>
+				<Sample Name="Echoing Drums" Offset="0x2A8500" SampleRate="32000"/>
+				<Sample Name="Vocal Oohs" Offset="0x2AF020"/>
+				<Sample Name="Vocal Eees" Offset="0x2B43B0"/>
+				<Sample Name="Rattling Scream" Offset="0x2B9E60"/>
+				<Sample Name="Harpsichord" Offset="0x2C8510" SampleRate="75000"/>
+				<Sample Name="Piano" Offset="0x2CFEE0"/>
+				<Sample Name="Piano (Soft)" Offset="0x2D96A0"/>
+				<Sample Name="Vocal Aahs" Offset="0x2DFF40" SampleRate="16518"/>
+				<Sample Name="Resonant Vocal Aahs" Offset="0x2E7410" SampleRate="11680"/>
+				<Sample Name="Harp 2" Offset="0x2EF650"/>
+				<Sample Name="Glockenspiel" Offset="0x2F3300" SampleRate="16951"/>
+				<Sample Name="Mechanical Rumbling" Offset="0x2F8690"/>
+				<Sample Name="Trumpet" Offset="0x2F9A90"/>
+				<Sample Name="Trombone" Offset="0x2FD270" SampleRate="21357"/>
+				<Sample Name="Tuba" Offset="0x301EC0" SampleRate="101593"/>
+				<Sample Name="Bass Drum 1" Offset="0x304E30"/>
+				<Sample Name="Snare Drum 1" Offset="0x309BD0"/>
+				<Sample Name="Snare Drum 2" Offset="0x30C360" SampleRate="33902"/>
+				<Sample Name="Cymbal" Offset="0x30EAF0"/>
+				<Sample Name="Timpani" Offset="0x317260" SampleRate="16000"/>
+				<Sample Name="Strings (Low)" Offset="0x31F640" SampleRate="128000"/>
+				<Sample Name="Strings 1" Offset="0x324660" SampleRate="40317"/>
+				<Sample Name="Strings 2" Offset="0x328D10" SampleRate="20158"/>
+				<Sample Name="Fiddle" Offset="0x32CA00" SampleRate="20158"/>
+				<Sample Name="Acoustic Guitar 1" Offset="0x32ECB0" SampleRate="40317"/>
+				<Sample Name="Acoustic Guitar 2" Offset="0x332D10" SampleRate="13454"/>
+				<Sample Name="Tom Drum" Offset="0x335740" SampleRate="20000"/>
+				<Sample Name="Drum Sidestick" Offset="0x337A10"/>
+				<Sample Name="Finger Cymbals" Offset="0x338450"/>
+				<Sample Name="Oboe" Offset="0x33A980" SampleRate="12699"/>
+				<Sample Name="Bassoon" Offset="0x33BC30" SampleRate="76109"/>
+				<Sample Name="Harp 3" Offset="0x33D130" SampleRate="67805"/>
+				<Sample Name="Pizzicato Violin" Offset="0x3403F0" SampleRate="17959"/>
+				<Sample Name="Church Organ" Offset="0x343870"/>
+				<Sample Name="Electric Organ" Offset="0x34D670"/>
+				<Sample Name="Horn" Offset="0x351810"/>
+				<Sample Name="Bass Guitar" Offset="0x359170" SampleRate="76195"/>
+				<Sample Name="Clap" Offset="0x35C900" SampleRate="24000"/>
+				<Sample Name="Resonant Bass Marimba" Offset="0x35D100" SampleRate="18541"/>
+				<Sample Name="Haunting Wind" Offset="0x364580"/>
+				<Sample Name="Off Hi-Hat" Offset="0x36FE80" SampleRate="26000"/>
+				<Sample Name="Drum and Sitar" Offset="0x374C20" SampleRate="20000"/>
+				<Sample Name="Percussive Resonance" Offset="0x378360" SampleRate="23973"/>
+				<Sample Name="Clarinet" Offset="0x37A6B0"/>
+				<Sample Name="Harpsichord (High)" Offset="0x37B2A0" SampleRate="42714"/>
+				<Sample Name="Marimba 1" Offset="0x382830" SampleRate="28508"/>
+				<Sample Name="Marimba 2" Offset="0x384ED0" SampleRate="14254"/>
+				<Sample Name="Crystal Synth" Offset="0x387060" SampleRate="26939"/>
+				<Sample Name="Sitar" Offset="0x38F000" SampleRate="57017"/>
+				<Sample Name="Koto" Offset="0x3926D0" SampleRate="28508"/>
+				<Sample Name="Some Manner of Drum" Offset="0x396F80" SampleRate="32000"/>
+				<Sample Name="Another Type of Drum" Offset="0x397FA0" SampleRate="32000"/>
+				<Sample Name="Quick Drum" Offset="0x399790" SampleRate="32000"/>
+				<Sample Name="Gong" Offset="0x39A6B0" SampleRate="32000"/>
+				<Sample Name="Windchimes" Offset="0x3A4BE0"/>
+				<Sample Name="Goron Drum" Offset="0x3AA6E0"/>
+				<Sample Name="Melodic Wooden Clacking" Offset="0x3ACC20" SampleRate="32000"/>
+				<Sample Name="Vocal Ohs" Offset="0x3AE1C0"/>
+				<Sample Name="Flute and Voice" Offset="0x3B45D0" SampleRate="32000"/>
+				<Sample Name="Off-Kilter Flute" Offset="0x3B5490" SampleRate="32000"/>
+				<Sample Name="Voice" Offset="0x3B63F0" SampleRate="32000"/>
+				<Sample Name="Drum 1" Offset="0x3B71F0" SampleRate="32000"/>
+				<Sample Name="Drum 2" Offset="0x3B94B0" SampleRate="32000"/>
+				<Sample Name="Slap Bass" Offset="0x3BBC80" SampleRate="32000"/>
+				<Sample Name="Shaker" Offset="0x3BE750"/>
+				<Sample Name="Cowbell" Offset="0x3BF6A0" SampleRate="32000"/>
+				<Sample Name="Guitar (Low)" Offset="0x3C0360" SampleRate="19000"/>
+				<Sample Name="Guitar" Offset="0x3C2B40"/>
+				<Sample Name="Guitar (High)" Offset="0x3C4D00" SampleRate="10690"/>
+				<Sample Name="Viola" Offset="0x3C6BD0" SampleRate="19027"/>
+				<Sample Name="Church Bell" Offset="0x3CAC50"/>
+				<Sample Name="Goron Oh (High)" Offset="0x3CF8A0"/>
+				<Sample Name="Goron Oh" Offset="0x3D0140"/>
+				<Sample Name="Banjo (Low)" Offset="0x3D0C00" SampleRate="57017"/>
+				<Sample Name="Banjo" Offset="0x3D3A40" SampleRate="38054"/>
+				<Sample Name="Islamic Chant" Offset="0x3D62E0"/>
+				<Sample Name="Steel Drum" Offset="0x3E3F50"/>
+				<Sample Name="Steel Drum (High)" Offset="0x3E8BB0" SampleRate="14254"/>
 			</Samples>
 
 			<Samples Bank="2">
-				<Sample Name="Warm Pad">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
+				<Sample Name="Warm Pad" Offset="0"/>
 			</Samples>
 			
 			<Samples Bank="3">
-				<Sample Name="Low Rumbling">
-					<Offset Version="MQDebug" At="0"/>
-				</Sample>
-				<Sample Name="Drum Sidestick">
-					<Offset Version="MQDebug" At="0xA590"/>
-				</Sample>
-				<Sample Name="Low Drum">
-					<Offset Version="MQDebug" At="0x8BC0"/>
-				</Sample>
-				<Sample Name="Sweep Pad">
-					<Offset Version="MQDebug" At="0xB3B0"/>
-				</Sample>
-				<Sample Name="Organic Gurgling">
-					<Offset Version="MQDebug" At="0x16480"/>
-				</Sample>
+				<Sample Name="Low Rumbling" Offset="0"/>
+				<Sample Name="Drum Sidestick" Offset="0xA590"/>
+				<Sample Name="Low Drum" Offset="0x8BC0"/>
+				<Sample Name="Sweep Pad" Offset="0xB3B0"/>
+				<Sample Name="Organic Gurgling" Offset="0x16480"/>
 		</Samples>
 		<Samples Bank="4">
-			<Sample Name="Vocal Ohs">
-				<Offset Version="MQDebug" At="0"/>
-			</Sample>
-			<Sample Name="Flute and Voice">
-				<Offset Version="MQDebug" At="0x6410"/>
-			</Sample>
-			<Sample Name="Off-Kilter Flute">
-				<Offset Version="MQDebug" At="0x72D0"/>
-			</Sample>
-			<Sample Name="Voice">
-				<Offset Version="MQDebug" At="0x8230"/>
-			</Sample>
-			<Sample Name="Melodic Wooden Clacking">
-				<Offset Version="MQDebug" At="0x9030"/>
-			</Sample>
+			<Sample Name="Vocal Ohs" Offset="0"/>
+			<Sample Name="Flute and Voice" Offset="0x6410"/>
+			<Sample Name="Off-Kilter Flute" Offset="0x72D0"/>
+			<Sample Name="Voice" Offset="0x8230"/>
+			<Sample Name="Melodic Wooden Clacking" Offset="0x9030"/>
 	</Samples>
 
 	<Samples Bank="5">
-		<Sample Name="Goron Drum">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x2540"/>
-		</Sample>
-		<Sample Name="Goron Ooh">
-			<Offset Version="MQDebug" At="0x4800"/>
-		</Sample>
-		<Sample Name="Goron Ooh (High)">
-			<Offset Version="MQDebug" At="0x72D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0x7B70"/>
-		</Sample>
-		<Sample Name="Resonant Bass Marimba">
-			<Offset Version="MQDebug" At="0x8630"/>
-		</Sample>
+		<Sample Name="Goron Drum" Offset="0"/>
+		<Sample Name="Bass Slap" Offset="0x2540"/>
+		<Sample Name="Goron Ooh" Offset="0x4800"/>
+		<Sample Name="Goron Ooh (High)" Offset="0x72D0"/>
+		<Sample Name="Tom Drum" Offset="0x7B70"/>
+		<Sample Name="Resonant Bass Marimba" Offset="0x8630"/>
 	</Samples>
 
 	<Samples Bank="6">
-		<Sample Name="Warm Synth Pad">
-			<Offset Version="MQDebug" At="0"/>
-		</Sample>
-		<Sample Name="Egyptian Flute">
-			<Offset Version="MQDebug" At="0xB0D0"/>
-		</Sample>
-		<Sample Name="Tom Drum">
-			<Offset Version="MQDebug" At="0xE120"/>
-		</Sample>
-		<Sample Name="Vocal Synth">
-			<Offset Version="MQDebug" At="0x103E0"/>
-		</Sample>
-		<Sample Name="Gong">
-			<Offset Version="MQDebug" At="0x12EB0"/>
-		</Sample>
-		<Sample Name="Bass Slap">
-			<Offset Version="MQDebug" At="0x1D3E0"/>
-		</Sample>
-		<Sample Name="Windchimes">
-			<Offset Version="MQDebug" At="0x22EE0"/>
-		</Sample>
+		<Sample Name="Warm Synth Pad" Offset="0"/>
+		<Sample Name="Egyptian Flute" Offset="0xB0D0"/>
+		<Sample Name="Tom Drum" Offset="0xE120"/>
+		<Sample Name="Vocal Synth" Offset="0x103E0"/>
+		<Sample Name="Gong" Offset="0x12EB0"/>
+		<Sample Name="Bass Slap" Offset="0x1D3E0"/>
+		<Sample Name="Windchimes" Offset="0x22EE0"/>
 	</Samples>
 		
 
diff --git a/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
index cee1835e9b..3c50f90123 100644
--- a/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
+++ b/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" BaseAddress="0x116E0" RangeStart="0xEB660" RangeEnd="0xEB6A0">
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x800116E0" RangeStart="0xEB660" RangeEnd="0xEB6A0">
         <Mtx Name="gMtxClear" Offset="0xEB660"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml b/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml
index 5ffc52f655..8824228847 100644
--- a/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml
+++ b/soh/assets/xml/N64_PAL_11/objects/gameplay_keep.xml
@@ -7,6 +7,8 @@
         <Texture Name="gameplay_keepTex_04CF40" OutName="gameplay_keepTex_04CF40" Format="i8" Width="64" Height="17" Offset="0x4CF40" AddedByScript="true"/>
         <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
         <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>
+        <!-- SOH [Port] Additional entry for authentic overflowed texture usage. This entry has its offset off by "one pixel" due to ZAPD not allowing duplicates -->
+        <Texture Name="gHilite2Tex_Overflow" OutName="hilite_2_overflow" Format="rgba16" Width="32" Height="32" Offset="0x1FE" />
         <Texture Name="gHylianShieldDesignTex" OutName="hylian_shield_design" Format="rgba16" Width="32" Height="64" Offset="0x400"/>
         <Texture Name="gOcarinaofTimeDesignTex" OutName="ocarina_of_time_design" Format="rgba16" Width="32" Height="16" Offset="0x1400"/>
         <Texture Name="gBottleGlassTex" OutName="bottle_glass" Format="rgba16" Width="16" Height="16" Offset="0x1800"/>
diff --git a/soh/include/boost_custom/container_hash/detail/hash_mix_32.hpp b/soh/include/boost_custom/container_hash/detail/hash_mix_32.hpp
deleted file mode 100644
index 95cfdcd778..0000000000
--- a/soh/include/boost_custom/container_hash/detail/hash_mix_32.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// 32 bit implementation based off of Boost hash
-
-#ifndef BOOST_HASH_DETAIL_HASH_MIX_32_HPP
-#define BOOST_HASH_DETAIL_HASH_MIX_32_HPP
-
-#include <boost/cstdint.hpp>
-#include <cstddef>
-#include <climits>
-
-namespace boost
-{
-namespace hash_detail
-{
-
-template<uint32_t Bits> struct hash_mix_impl_32;
-
-// hash_mix for 32 bit
-//
-// We use the "best xmxmx" implementation from
-// https://github.com/skeeto/hash-prospector/issues/19
-
-template<> struct hash_mix_impl_32<32>
-{
-    inline static boost::uint32_t fn( boost::uint32_t x )
-    {
-        boost::uint32_t const m1 = 0x21f0aaad;
-        boost::uint32_t const m2 = 0x735a2d97;
-
-        x ^= x >> 16;
-        x *= m1;
-        x ^= x >> 15;
-        x *= m2;
-        x ^= x >> 15;
-
-        return x;
-    }
-};
-
-inline uint32_t hash_mix_32( uint32_t v )
-{
-    return hash_mix_impl_32<32>::fn( v );
-}
-
-} // namespace hash_detail
-} // namespace boost
-
-#endif // #ifndef BOOST_HASH_DETAIL_HASH_MIX_32_HPP
diff --git a/soh/include/boost_custom/container_hash/detail/hash_range_32.hpp b/soh/include/boost_custom/container_hash/detail/hash_range_32.hpp
deleted file mode 100644
index cfa0a2a2d2..0000000000
--- a/soh/include/boost_custom/container_hash/detail/hash_range_32.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// 32 bit implementation based off of Boost hash
-// Only implementing 32 bit version of char based ranges
-
-#ifndef BOOST_HASH_DETAIL_HASH_RANGE_32_HPP
-#define BOOST_HASH_DETAIL_HASH_RANGE_32_HPP
-
-#include <boost_custom/container_hash/hash_fwd_32.hpp>
-#include <boost_custom/container_hash/version.hpp>
-
-#if BOOST_VERSION_HAS_HASH_RANGE
-#include <boost/container_hash/detail/hash_range.hpp>
-#else
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/type_traits/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/cstdint.hpp>
-#include <cstddef>
-#include <climits>
-#include <iterator>
-#endif // #if BOOST_VERSION_HAS_HASH_RANGE
-
-namespace boost
-{
-namespace hash_detail
-{
-
-#if !BOOST_VERSION_HAS_HASH_RANGE
-
-template<class T> struct is_char_type: public boost::false_type {};
-
-#if CHAR_BIT == 8
-
-template<> struct is_char_type<char>: public boost::true_type {};
-template<> struct is_char_type<signed char>: public boost::true_type {};
-template<> struct is_char_type<unsigned char>: public boost::true_type {};
-
-#if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
-template<> struct is_char_type<char8_t>: public boost::true_type {};
-#endif
-
-#if defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603L
-template<> struct is_char_type<std::byte>: public boost::true_type {};
-#endif
-
-#endif
-
-#endif // #if !BOOST_VERSION_HAS_HASH_RANGE
-
-#if BOOST_USE_STD_TYPES
-#define BOOST_ENABLE_IF std::enable_if
-#define BOOST_IS_SAME std::is_same
-#else
-#define BOOST_ENABLE_IF boost::enable_if_
-#define BOOST_IS_SAME is_same
-#endif
-
-template<class It>
-inline typename BOOST_ENABLE_IF<
-    is_char_type<typename std::iterator_traits<It>::value_type>::value &&
-    BOOST_IS_SAME<typename std::iterator_traits<It>::iterator_category, std::random_access_iterator_tag>::value,
-std::size_t>::type
-    hash_range_32( uint32_t seed, It first, It last )
-{
-    std::size_t n = static_cast<std::size_t>( last - first );
-
-    for( ; n >= 4; first += 4, n -= 4 )
-    {
-        // clang 5+, gcc 5+ figure out this pattern and use a single mov on x86
-        // gcc on s390x and power BE even knows how to use load-reverse
-
-        boost::uint32_t w =
-            static_cast<boost::uint32_t>( static_cast<unsigned char>( first[0] ) ) |
-            static_cast<boost::uint32_t>( static_cast<unsigned char>( first[1] ) ) <<  8 |
-            static_cast<boost::uint32_t>( static_cast<unsigned char>( first[2] ) ) << 16 |
-            static_cast<boost::uint32_t>( static_cast<unsigned char>( first[3] ) ) << 24;
-
-        hash_combine_32( seed, w );
-    }
-
-    {
-        // add a trailing suffix byte of 0x01 because otherwise sequences of
-        // trailing zeroes are indistinguishable from end of string
-
-        boost::uint32_t w = 0x01u;
-
-        switch( n )
-        {
-        case 1:
-
-            w =
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[0] ) ) |
-                0x0100u;
-
-            break;
-
-        case 2:
-
-            w =
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[0] ) ) |
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[1] ) ) <<  8 |
-                0x010000u;
-
-            break;
-
-        case 3:
-
-            w =
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[0] ) ) |
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[1] ) ) <<  8 |
-                static_cast<boost::uint32_t>( static_cast<unsigned char>( first[2] ) ) << 16 |
-                0x01000000u;
-
-            break;
-        }
-
-        hash_combine_32( seed, w );
-    }
-
-    return seed;
-}
-
-} // namespace hash_detail
-} // namespace boost
-
-#undef BOOST_ENABLE_IF
-#undef BOOST_IS_SAME
-
-#endif // #ifndef BOOST_HASH_DETAIL_HASH_RANGE_32_HPP
diff --git a/soh/include/boost_custom/container_hash/hash_32.hpp b/soh/include/boost_custom/container_hash/hash_32.hpp
deleted file mode 100644
index eaf459a343..0000000000
--- a/soh/include/boost_custom/container_hash/hash_32.hpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// 32 bit implementation based off of Boost hash
-// Only implementing 32 bit versions integral and string based hashes
-
-#ifndef BOOST_FUNCTIONAL_HASH_HASH_32_HPP
-#define BOOST_FUNCTIONAL_HASH_HASH_32_HPP
-
-#include <boost/container_hash/hash.hpp>
-#include <boost_custom/container_hash/hash_fwd_32.hpp>
-#include <boost_custom/container_hash/detail/hash_mix_32.hpp>
-#include <boost_custom/container_hash/detail/hash_range_32.hpp>
-#include <boost_custom/container_hash/version.hpp>
-
-#if !BOOST_VERSION_HAS_HASH_RANGE
-#include <boost/type_traits/is_unsigned.hpp>
-#include <boost/type_traits/make_unsigned.hpp>
-
-#if BOOST_WORKAROUND(__GNUC__, < 3) \
-    && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-#define BOOST_HASH_CHAR_TRAITS string_char_traits
-#else
-#define BOOST_HASH_CHAR_TRAITS char_traits
-#endif
-
-#endif // #if !BOOST_VERSION_HAS_HASH_RANGE
-
-#if BOOST_USE_STD_TYPES
-#define BOOST_ENABLE_IF std::enable_if
-#define BOOST_IS_INTEGRAL hash_detail::is_integral
-#define BOOST_IS_UNSIGNED is_unsigned
-#define BOOST_MAKE_UNSIGNED make_unsigned
-#else
-#define BOOST_ENABLE_IF boost::enable_if_
-#define BOOST_IS_INTEGRAL boost::is_integral
-#define BOOST_IS_UNSIGNED boost::is_unsigned
-#define BOOST_MAKE_UNSIGNED boost::make_unsigned
-#endif
-
-namespace boost
-{
-
-    //
-    // boost::hash_value
-    //
-
-    // integral types
-
-    namespace hash_detail
-    {
-        template<class T,
-            bool bigger_than_size_t = (sizeof(T) > sizeof(uint32_t)),
-            bool is_unsigned = BOOST_IS_UNSIGNED<T>::value,
-            std::size_t size_t_bits = sizeof(uint32_t) * CHAR_BIT,
-            std::size_t type_bits = sizeof(T) * CHAR_BIT>
-        struct hash_integral_impl_32;
-
-        template<class T, bool is_unsigned, std::size_t size_t_bits, std::size_t type_bits> struct hash_integral_impl_32<T, false, is_unsigned, size_t_bits, type_bits>
-        {
-            static uint32_t fn( T v )
-            {
-                return static_cast<uint32_t>( v );
-            }
-        };
-
-        template<class T, std::size_t size_t_bits, std::size_t type_bits> struct hash_integral_impl_32<T, true, false, size_t_bits, type_bits>
-        {
-            static uint32_t fn( T v )
-            {
-                typedef typename BOOST_MAKE_UNSIGNED<T>::type U;
-
-                if( v >= 0 )
-                {
-                    return hash_integral_impl_32<U>::fn( static_cast<U>( v ) );
-                }
-                else
-                {
-                    return ~hash_integral_impl_32<U>::fn( static_cast<U>( ~static_cast<U>( v ) ) );
-                }
-            }
-        };
-
-        template<class T> struct hash_integral_impl_32<T, true, true, 32, 64>
-        {
-            static uint32_t fn( T v )
-            {
-                uint32_t seed = 0;
-
-                seed = static_cast<uint32_t>( v >> 32 ) + hash_detail::hash_mix_32( seed );
-                seed = static_cast<uint32_t>( v ) + hash_detail::hash_mix_32( seed );
-
-                return seed;
-            }
-        };
-
-        template<class T> struct hash_integral_impl_32<T, true, true, 32, 128>
-        {
-            static uint32_t fn( T v )
-            {
-                uint32_t seed = 0;
-
-                seed = static_cast<uint32_t>( v >> 96 ) + hash_detail::hash_mix_32( seed );
-                seed = static_cast<uint32_t>( v >> 64 ) + hash_detail::hash_mix_32( seed );
-                seed = static_cast<uint32_t>( v >> 32 ) + hash_detail::hash_mix_32( seed );
-                seed = static_cast<uint32_t>( v ) + hash_detail::hash_mix_32( seed );
-
-                return seed;
-            }
-        };
-
-    } // namespace hash_detail
-
-    template <typename T>
-    typename BOOST_ENABLE_IF<BOOST_IS_INTEGRAL<T>::value, uint32_t>::type
-        hash_value_32( T v )
-    {
-        return hash_detail::hash_integral_impl_32<T>::fn( v );
-    }
-
-    // contiguous ranges (string, vector, array)
-#if BOOST_VERSION_HAS_HASH_RANGE
-    template <typename T>
-    typename BOOST_ENABLE_IF<container_hash::is_contiguous_range<T>::value, uint32_t>::type
-        hash_value_32( T const& v )
-    {
-        return boost::hash_range_32( v.data(), v.data() + v.size() );
-    }
-#else
-    template <class Ch, class A>
-    inline uint32_t hash_value_32(
-        std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const& v)
-    {
-        return boost::hash_range_32( v.data(), v.data() + v.size() );
-    }
-#endif
-
-    //
-    // boost::hash_combine
-    //
-
-    template <class T>
-    inline void hash_combine_32( uint32_t& seed, T const& v )
-    {
-        seed = boost::hash_detail::hash_mix_32( seed + 0x9e3779b9 + boost::hash_32<T>()( v ) );
-    }
-
-    //
-    // boost::hash_range
-    //
-
-    template <class It>
-    inline void hash_range_32( uint32_t& seed, It first, It last )
-    {
-        seed = hash_detail::hash_range_32( seed, first, last );
-    }
-
-    template <class It>
-    inline uint32_t hash_range_32( It first, It last )
-    {
-        uint32_t seed = 0;
-
-        hash_range_32( seed, first, last );
-
-        return seed;
-    }
-
-    //
-    // boost::hash
-    //
-
-    template <class T> struct hash_32
-    {
-        typedef T argument_type;
-        typedef uint32_t result_type;
-
-        uint32_t operator()( T const& val ) const
-        {
-            return hash_value_32( val );
-        }
-    };
-
-} // namespace boost
-
-#undef BOOST_HASH_CHAR_TRAITS
-#undef BOOST_ENABLE_IF
-#undef BOOST_IS_INTEGRAL
-#undef BOOST_IS_UNSIGNED
-#undef BOOST_MAKE_UNSIGNED
-
-#endif // #ifndef BOOST_FUNCTIONAL_HASH_HASH_32_HPP
diff --git a/soh/include/boost_custom/container_hash/hash_fwd_32.hpp b/soh/include/boost_custom/container_hash/hash_fwd_32.hpp
deleted file mode 100644
index 2ad101f2bb..0000000000
--- a/soh/include/boost_custom/container_hash/hash_fwd_32.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// 32 bit implementation based off of Boost hash
-
-#ifndef BOOST_FUNCTIONAL_HASH_FWD_32_HPP
-#define BOOST_FUNCTIONAL_HASH_FWD_32_HPP
-
-#include <boost/container_hash/hash_fwd.hpp>
-
-namespace boost
-{
-
-namespace container_hash
-{
-
-} // namespace container_hash
-
-template<class T> struct hash_32;
-
-template<class T> void hash_combine_32( uint32_t& seed, T const& v );
-
-template<class It> void hash_range_32( uint32_t&, It, It );
-template<class It> uint32_t hash_range_32( It, It );
-
-} // namespace boost
-
-#endif // #ifndef BOOST_FUNCTIONAL_HASH_FWD_32_HPP
diff --git a/soh/include/boost_custom/container_hash/version.hpp b/soh/include/boost_custom/container_hash/version.hpp
deleted file mode 100644
index 3863b507c8..0000000000
--- a/soh/include/boost_custom/container_hash/version.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef BOOST_CONTAINER_HASH_VERSION_HPP
-#define BOOST_CONTAINER_HASH_VERSION_HPP
-
-#include <boost/version.hpp>
-
-#define BOOST_VERSION_HAS_HASH_RANGE ((BOOST_VERSION / 100 % 1000) >= 81)
-
-#define BOOST_USE_STD_TYPES ((BOOST_VERSION / 100 % 1000) >= 84)
-
-#endif // #ifndef BOOST_CONTAINER_HASH_VERSION_HPP
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 147500c660..8deb369534 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -12,10 +12,9 @@ extern "C"
 
 #include "luslog.h"
 #include <soh/Enhancements/item-tables/ItemTableTypes.h>
-#include <soh/Enhancements/randomizer/randomizer_inf.h>
 
 #if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)
-#define osSyncPrintf(fmt, ...) lusprintf(__FILE__, __LINE__, 0, fmt, __VA_ARGS__)
+#define osSyncPrintf(fmt, ...) lusprintf(__FILE__, __LINE__, 0, fmt, ##__VA_ARGS__)
 #else
 #define osSyncPrintf(fmt, ...) osSyncPrintfUnused(fmt, ##__VA_ARGS__)
 #endif
@@ -901,9 +900,8 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* workBuff, u32 workSize);
 void KaleidoSetup_Update(PlayState* play);
 void KaleidoSetup_Init(PlayState* play);
 void KaleidoSetup_Destroy(PlayState* play);
-void func_8006EE50(Font* font, u16 arg1, u16 arg2);
+void Font_LoadCharWide(Font* font, u16 arg1, u16 arg2);
 void Font_LoadChar(Font* font, u8 character, u16 codePointIndex);
-void* Font_FetchCharTexture(u8 character);
 void Font_LoadMessageBoxIcon(Font* font, u16 icon);
 void Font_LoadOrderedFont(Font* font);
 s32 func_8006F0A0(s32 arg0);
@@ -1045,6 +1043,7 @@ VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec);
 VecSph* OLib_Vec3fToVecSphGeo(VecSph* arg0, Vec3f* arg1);
 VecSph* OLib_Vec3fDiffToVecSphGeo(VecSph* arg0, Vec3f* a, Vec3f* b);
 Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b);
+void OnePointCutscene_SetCsCamPoints(Camera* camera, s16 actionParameters, s16 initTimer, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints);
 s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s16 camIdx);
 s16 OnePointCutscene_EndCutscene(PlayState* play, s16 camIdx);
 s32 OnePointCutscene_Attention(PlayState* play, Actor* actor);
@@ -1103,6 +1102,7 @@ void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx);
 s32 FrameAdvance_Update(FrameAdvanceContext* frameAdvCtx, Input* input);
 u8 PlayerGrounded(Player* player);
 void Player_SetBootData(PlayState* play, Player* player);
+void Player_StartAnimMovement(PlayState* play, Player* player, s32 flags);
 s32 Player_InBlockingCsMode(PlayState* play, Player* player);
 s32 Player_TryCsAction(PlayState* play, Actor* actor, s32 csAction);
 s32 Player_InCsMode(PlayState* play);
@@ -1377,7 +1377,7 @@ void func_800AA0B4();
 void func_800AA0F0(void);
 u32 func_800AA148();
 void func_800AA15C();
-void func_800AA16C();
+void Rumble_ClearRequests();
 void func_800AA178(u32);
 View* View_New(GraphicsContext* gfxCtx);
 void View_Free(View* view);
@@ -2418,7 +2418,6 @@ u8 Message_GetState(MessageContext* msgCtx);
 void Message_Draw(PlayState* play);
 void Message_Update(PlayState* play);
 void Message_SetTables(void);
-f32 Message_GetCharacterWidth(unsigned char characterIndex);
 void GameOver_Init(PlayState* play);
 void GameOver_FadeInLights(PlayState* play);
 void GameOver_Update(PlayState* play);
@@ -2447,9 +2446,13 @@ void Message_OpenText(PlayState* play, u16 textId);
 void Message_Decode(PlayState* play);
 void Message_DrawText(PlayState* play, Gfx** gfxP);
 
+// #region SOH [NTSC Support]
+s32 Kanji_OffsetFromShiftJIS(u32 arg0);
+void Font_LoadOrderedFontNTSC(Font* font);
+// #endregion
+
 // #region SOH [General]
 
-void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH);
 void Interface_RandoRestoreSwordless(void);
 s32 Ship_CalcShouldDrawAndUpdate(PlayState* play, Actor* actor, Vec3f* projectedPos, f32 projectedW, bool* shouldDraw,
                                  bool* shouldUpdate);
diff --git a/soh/include/macros.h b/soh/include/macros.h
index 302e3755de..325fb91b6a 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -8,6 +8,10 @@
 // #define __attribute__(x)
 // #endif
 
+// this was removed from the LUS rcp.h in https://github.com/Kenix3/libultraship/pull/833/
+// it is still used in graph.c and fault.c
+#define HW_REG(reg, type) *(volatile type*)((reg) | 0xA0000000)
+
 // SoH [Port] Always use the AVOID_UB version (we don't set AVOID_UB while building yet)
 /*
 #ifndef AVOID_UB
diff --git a/soh/include/message_data_fmt.h b/soh/include/message_data_fmt.h
index fffac116c8..5506268e9d 100644
--- a/soh/include/message_data_fmt.h
+++ b/soh/include/message_data_fmt.h
@@ -173,6 +173,40 @@
 #define MESSAGE_FISH_INFO               HEX(CTRL_FISH_INFO)
 #define MESSAGE_HIGHSCORE               HEX(CTRL_HIGHSCORE)
 #define MESSAGE_TIME                    HEX(CTRL_TIME)
+
+#define MESSAGE_NEWLINE_JPN             0x000A
+#define MESSAGE_END_JPN                 0x8170
+#define MESSAGE_BOX_BREAK_JPN           0x81A5
+#define MESSAGE_COLOR_JPN               0x000B
+#define MESSAGE_SHIFT_JPN               0x86C7
+#define MESSAGE_TEXTID_JPN              0x81CB
+#define MESSAGE_QUICKTEXT_ENABLE_JPN    0x8189
+#define MESSAGE_QUICKTEXT_DISABLE_JPN   0x818A
+#define MESSAGE_PERSISTENT_JPN          0x86C8
+#define MESSAGE_EVENT_JPN               0x819F
+#define MESSAGE_BOX_BREAK_DELAYED_JPN   0x81A3
+#define MESSAGE_AWAIT_BUTTON_PRESS_JPN  0x81A4
+#define MESSAGE_FADE_JPN                0x819E
+#define MESSAGE_NAME_JPN                0x874F
+#define MESSAGE_OCARINA_JPN             0x81F0
+#define MESSAGE_FADE2_JPN               0x81F4
+#define MESSAGE_SFX_JPN                 0x81F3
+#define MESSAGE_ITEM_ICON_JPN           0x819A
+#define MESSAGE_TEXT_SPEED_JPN          0x86C9
+#define MESSAGE_BACKGROUND_JPN          0x86B3
+#define MESSAGE_MARATHON_TIME_JPN       0x8791
+#define MESSAGE_RACE_TIME_JPN           0x8792
+#define MESSAGE_POINTS_JPN              0x879B
+#define MESSAGE_TOKENS_JPN              0x86A3
+#define MESSAGE_UNSKIPPABLE_JPN         0x8199
+#define MESSAGE_TWO_CHOICE_JPN          0x81BC
+#define MESSAGE_THREE_CHOICE_JPN        0x81B8
+#define MESSAGE_FISH_INFO_JPN           0x86A4
+#define MESSAGE_HIGHSCORE_JPN           0x869F
+#define MESSAGE_TIME_JPN                0x81A1
+
+#define MESSAGE_SPACE_JPN               0x8140
+
 #endif
 
 #endif
diff --git a/soh/include/variables.h b/soh/include/variables.h
index e3408eef60..27ad4584d2 100644
--- a/soh/include/variables.h
+++ b/soh/include/variables.h
@@ -45,12 +45,12 @@ extern "C"
 	extern OSViContext* __osViNext;
 	extern OSViMode osViModeFpalLan1;
 	extern u32 __additional_scanline;
-	extern u8 gBuildVersion[];
+	extern const char gBuildVersion[];
 	extern u16 gBuildVersionMajor;
 	extern u16 gBuildVersionMinor;
 	extern u16 gBuildVersionPatch;
-	extern u8 gGitBranch[];
-	extern u8 gGitCommitHash[];
+	extern const char gGitBranch[];
+    extern const char gGitCommitHash[];
 	extern u8 gGitCommitTag[];
 	extern u8 gBuildTeam[];
 	extern u8 gBuildDate[];
diff --git a/soh/include/z64.h b/soh/include/z64.h
index 882d3dd9a2..79ecdabcd4 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -540,9 +540,12 @@ typedef enum {
     LANGUAGE_ENG,
     LANGUAGE_GER,
     LANGUAGE_FRA,
+    LANGUAGE_JPN,
     LANGUAGE_MAX
 } Language;
 
+#define TODO_TRANSLATE "TranslateThis" 
+
 // TODO get these properties from the textures themselves
 #define FONT_CHAR_TEX_WIDTH  16
 #define FONT_CHAR_TEX_HEIGHT 16
@@ -662,7 +665,10 @@ typedef struct {
     /* 0xE300 */ s32    msgLength; // original name : "msg_data"
     /* 0xE304 */ u8     msgMode; // original name: "msg_mode"
     /* 0xE305 */ char   unk_E305[0x1];
-    /* 0xE306 */ u8     msgBufDecoded[200]; // decoded message buffer, may be smaller than this
+    /* 0xE306 */ union {
+                    u8  msgBufDecoded[200];
+                    u16 msgBufDecodedWide[100];
+                 }; // decoded message buffer, may be smaller than this
     /* 0xE3CE */ u16    msgBufPos; // original name : "rdp"
     /* 0xE3D0 */ u16    unk_E3D0; // unused, only ever set to 0
     /* 0xE3D2 */ u16    textDrawPos; // draw all decoded characters up to this buffer position
@@ -1327,12 +1333,15 @@ typedef struct {
 } SceneSelectLoadingMessages;
 
 typedef struct {
+    /*      */ char* japaneseAge;
     /*      */ char* englishAge;
     /*      */ char* germanAge;
     /*      */ char* frenchAge;
 } BetterSceneSelectAgeLabels;
 
+
 typedef struct {
+  /*      */ char* japaneseName;
   /*      */ char* englishName;
   /*      */ char* germanName;
   /*      */ char* frenchName;
@@ -1341,6 +1350,7 @@ typedef struct {
 } BetterSceneSelectEntrancePair;
 
 typedef struct {
+    /*      */ char* japaneseName;
     /*      */ char* englishName;
     /*      */ char* germanName;
     /*      */ char* frenchName;
diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h
index 6d8fd3ca07..77172bda4a 100644
--- a/soh/include/z64actor.h
+++ b/soh/include/z64actor.h
@@ -266,9 +266,6 @@ typedef struct Actor {
     /* 0x134 */ ActorFunc draw; // Draw Routine. Called by `Actor_Draw`
     /* 0x138 */ ActorResetFunc reset;
     /* 0x13C */ char dbgPad[0x10]; // Padding that only exists in the debug rom
-    // #region SOH [General]
-    /*       */ u8 maximumHealth; // Max health value for use with health bars, set on actor init
-    // #endregion
 } Actor; // size = 0x14C
 
 typedef enum {
diff --git a/soh/include/z64animation.h b/soh/include/z64animation.h
index b61627a27f..3edba982d0 100755
--- a/soh/include/z64animation.h
+++ b/soh/include/z64animation.h
@@ -245,27 +245,30 @@ typedef void (*PostCurveLimbDraw)(struct PlayState* play, SkelAnimeCurve* skelCu
 typedef s32 (*AnimUpdateFunc)();
 
 typedef struct SkelAnime {
-    /* 0x00 */ u8 limbCount;      // Number of limbs in the skeleton
-    /* 0x01 */ u8 mode;           // See `AnimationMode`
-    /* 0x02 */ u8 dListCount;     // Number of display lists in a flexible skeleton
-    /* 0x03 */ s8 taper;          // Tapering to use when morphing between animations. Only used by Door_Warp1.
-    /* 0x04 */ void** skeleton;   // An array of pointers to limbs. Can be StandardLimb, LodLimb, or SkinLimb.
-    /* 0x08 */ void* animation;   // Can be an AnimationHeader or LinkAnimationHeader.
-    /* 0x0C */ f32 startFrame;    // In mode ANIMMODE_LOOP_PARTIAL*, start of partial loop.
-    /* 0x10 */ f32 endFrame;      // In mode ANIMMODE_ONCE*, Update returns true when curFrame is equal to this. In mode ANIMMODE_LOOP_PARTIAL*, end of partial loop.
-    /* 0x14 */ f32 animLength;    // Total number of frames in the current animation.
-    /* 0x18 */ f32 curFrame;      // Current frame in the animation
-    /* 0x1C */ f32 playSpeed;     // Multiplied by R_UPDATE_RATE / 3 to get the animation's frame rate.
+    /* 0x00 */ u8 limbCount; // Number of limbs in the skeleton
+    /* 0x01 */ u8 mode; // See `AnimationMode`
+    /* 0x02 */ u8 dListCount; // Number of display lists in a flexible skeleton
+    /* 0x03 */ s8 taper; // Tapering to use when morphing between animations. Only used by Door_Warp1.
+    /* 0x04 */ void** skeleton; // An array of pointers to limbs. Can be StandardLimb, LodLimb, or SkinLimb.
+    /* 0x08 */ void* animation; // Can be an AnimationHeader or LinkAnimationHeader.
+    /* 0x0C */ f32 startFrame; // In mode ANIMMODE_LOOP_PARTIAL*, start of partial loop.
+    /* 0x10 */ f32 endFrame; // In mode ANIMMODE_ONCE*, Update returns true when curFrame is equal to this. In mode ANIMMODE_LOOP_PARTIAL*, end of partial loop.
+    /* 0x14 */ f32 animLength; // Total number of frames in the current animation.
+    /* 0x18 */ f32 curFrame; // Current frame in the animation
+    /* 0x1C */ f32 playSpeed; // Multiplied by R_UPDATE_RATE / 3 to get the animation's frame rate.
     /* 0x20 */ Vec3s* jointTable; // Current translation of model and rotations of all limbs
     /* 0x24 */ Vec3s* morphTable; // Table of values used to morph between animations
-    /* 0x28 */ f32 morphWeight;   // Weight of the current animation morph as a fraction in [0,1]
-    /* 0x2C */ f32 morphRate;     // Reciprocal of the number of frames in the morph
-    /* 0x30 */ s32 (*update)();   // Can be Loop, Partial loop, Play once, Morph, or Tapered morph. Link only has Loop, Play once, and Morph.
-    /* 0x34 */ s8 initFlags;      // Flags used when initializing Link's skeleton
-    /* 0x35 */ u8 moveFlags;      // Flags used for animations that move the actor in worldspace.
-    /* 0x36 */ s16 prevRot;       // Previous rotation in worldspace.
-    /* 0x38 */ Vec3s prevTransl;  // Previous modelspace translation.
-    /* 0x3E */ Vec3s baseTransl;  // Base modelspace translation.
+    /* 0x28 */ f32 morphWeight; // Weight of the current animation morph as a fraction in [0,1]
+    /* 0x2C */ f32 morphRate; // Reciprocal of the number of frames in the morph
+    /* 0x30 */ union {
+        s32 (*normal)(struct SkelAnime*); // Can be Loop, Partial loop, Play once, Morph, or Tapered morph
+        s32 (*link)(struct PlayState*, struct SkelAnime*); // Can be Loop, Play once, or Morph
+    } update;
+    /* 0x34 */ s8 initFlags; // Flags used when initializing Link's skeleton
+    /* 0x35 */ u8 movementFlags; // Flags used for animations that move the actor in worldspace.
+    /* 0x36 */ s16 prevRot; // Previous rotation in worldspace.
+    /* 0x38 */ Vec3s prevTransl; // Previous modelspace translation.
+    /* 0x3E */ Vec3s baseTransl; // Base modelspace translation.
                SkeletonHeader* skeletonHeader;
 } SkelAnime; // size = 0x44
 
diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
index 81775feba3..c562b820fc 100644
--- a/soh/include/z64audio.h
+++ b/soh/include/z64audio.h
@@ -1,6 +1,10 @@
 #ifndef Z64_AUDIO_H
 #define Z64_AUDIO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <endianness.h>
 
 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
@@ -24,8 +28,8 @@
 
 //#define MAX_SEQUENCES 0x800
 extern size_t sequenceMapSize;
-
-extern char* fontMap[256];
+extern size_t fontMapSize;
+extern char** fontMap;
 
 #define MAX_AUTHENTIC_SEQID 110
 
@@ -54,7 +58,8 @@ typedef enum {
     /* 2 */ CODEC_S16_INMEMORY,
     /* 3 */ CODEC_SMALL_ADPCM,
     /* 4 */ CODEC_REVERB,
-    /* 5 */ CODEC_S16
+    /* 5 */ CODEC_S16,
+    /* 6 */ CODEC_OPUS,
 } SampleCodec;
 
 typedef enum {
@@ -117,13 +122,14 @@ typedef struct {
     /* 0x2 */ s16 arg;
 } AdsrEnvelope; // size = 0x4
 
-typedef struct {
-    /* 0x00 */ uintptr_t start;
-    /* 0x04 */ uintptr_t end;
-    /* 0x08 */ u32 count;
-    /* 0x0C */ char unk_0C[0x4];
-    /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
-} AdpcmLoop; // size = 0x30 (or 0x10)
+typedef struct AdpcmLoop {
+    /* 0x00 */ u32 start;
+    /* 0x04 */ u32 loopEnd;   // numSamples position into the sample where the loop ends
+    /* 0x08 */ u32 count;     // The number of times the loop is played before the sound completes. Setting count to -1
+    // indicates that the loop should play indefinitely.
+    /* 0x0C */ u32 sampleEnd; // total number of s16-samples in the sample audio clip
+    /* 0x10 */ s16 predictorState[16]; // only exists if count != 0. 8-byte aligned
+} AdpcmLoop;    // size = 0x30 (or 0x10)
 
 typedef struct {
     /* 0x00 */ s32 order;
@@ -131,24 +137,23 @@ typedef struct {
     /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
 } AdpcmBook; // size >= 0x8
 
-typedef struct 
-{
+typedef struct SoundFontSample {
     union {
         struct {
-            /* 0x00 */ u32 codec : 4;
-            /* 0x00 */ u32 medium : 2;
-            /* 0x00 */ u32 unk_bit26 : 1;
-            /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret
-            /* 0x01 */ u32 size : 24;
+            ///* 0x0 */ u32 unk_0 : 1;
+            /* 0x0 */ u32 codec : 4; // The state of compression or decompression, See `SampleCodec`
+            /* 0x0 */ u32 medium : 2; // Medium where sample is currently stored. See `SampleMedium`
+            /* 0x0 */ u32 unk_bit26 : 1;
+            /* 0x0 */ u32 isRelocated : 1; // Has the sample header been relocated (offsets to pointers)
+
         };
         u32 asU32;
     };
-
-    /* 0x04 */ u8* sampleAddr;
-    /* 0x08 */ AdpcmLoop* loop;
-    /* 0x0C */ AdpcmBook* book;
-    u32 sampleRateMagicValue; // For wav samples only...
-    s32 sampleRate;           // For wav samples only...
+    /* 0x1 */ u32 size;  // Size of the sample
+    u32 fileSize;
+    /* 0x4 */ u8* sampleAddr; // Raw sample data. Offset from the start of the sample bank or absolute address to either rom or ram
+    /* 0x8 */ AdpcmLoop* loop; // Adpcm loop parameters used by the sample. Offset from the start of the sound font / pointer to ram
+    /* 0xC */ AdpcmBook* book; // Adpcm book parameters used by the sample. Offset from the start of the sound font / pointer to ram
 } SoundFontSample; // size = 0x10
 
 typedef struct {
@@ -465,6 +470,8 @@ typedef struct {
     /* 0x00F0 */ s16 dummyResampleState[0x10];
 } NoteSynthesisBuffers; // size = 0x110
 
+struct OggOpusFile;
+
 typedef struct {
     /* 0x00 */ u8 restart;
     /* 0x01 */ u8 sampleDmaIndex;
@@ -483,6 +490,7 @@ typedef struct {
     /* 0x1A */ u8 unk_1A;
     /* 0x1C */ u16 unk_1C;
     /* 0x1E */ u16 unk_1E;
+    struct OggOpusFile* opusFile; // Only for streamed opus audio
 } NoteSynthesisState; // size = 0x20
 
 typedef struct {
@@ -917,7 +925,7 @@ typedef struct {
     /* 0x3420 */ AudioPoolSplit3 persistentCommonPoolSplit;
     /* 0x342C */ AudioPoolSplit3 temporaryCommonPoolSplit;
     /* 0x3438 */ u8 sampleFontLoadStatus[0x30];
-    /* 0x3468 */ u8 fontLoadStatus[0x30];
+    /* 0x3468 */ u8* fontLoadStatus;
     /* 0x3498 */ u8* seqLoadStatus;
     /* 0x3518 */ volatile u8 resetStatus;
     /* 0x3519 */ u8 audioResetSpecIdToLoad;
@@ -1119,10 +1127,6 @@ typedef struct {
     uint8_t fonts[16];
 } SequenceData;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void Audio_SetGameVolume(int player_id, f32 volume);
 float Audio_GetGameVolume(int player_id);
 
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index f7873031f3..63a9b1d10d 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -5,7 +5,6 @@
 #include "z64math.h"
 #include "z64audio.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include "soh/Enhancements/randomizer/randomizer_inf.h"
 #include "soh/Enhancements/gameplaystats.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/boss-rush/BossRushTypes.h"
@@ -186,6 +185,7 @@ typedef struct ShipSaveContextData {
     FaroresWindData backupFW;
     ShipQuestSaveContextData quest;
     u8 maskMemory;
+    u8 filenameLanguage;
     //TODO: Move non-rando specific flags to a new sohInf and move the remaining randomizerInf to ShipRandomizerSaveContextData
     u16 randomizerInf[(RAND_INF_MAX + 15) / 16];
 } ShipSaveContextData;
@@ -202,7 +202,7 @@ typedef struct {
     /* 0x0018 */ s32 bgsDayCount; // increments with totalDays, can be cleared with `Environment_ClearBgsDayCount`
     /* 0x001C */ char newf[6]; // string "ZELDAZ". start of `info` substruct, originally called "information"
     /* 0x0022 */ u16 deaths;
-    /* 0x0024 */ char playerName[8];
+    /* 0x0024 */ u8 playerName[8];
     /* 0x002C */ s16 n64ddFlag;
     /* 0x002E */ s16 healthCapacity; // "max_life"
     /* 0x0030 */ s16 health; // "now_life"
@@ -260,17 +260,17 @@ typedef struct {
     /* 0x13C8 */ s16 nayrusLoveTimer;
     /* 0x13CA */ char unk_13CA[0x0002];
     /* 0x13CC */ s16 rupeeAccumulator;
-    /* 0x13CE */ s16 timer1State;
-    /* 0x13D0 */ s16 timer1Value;
-    /* 0x13D2 */ s16 timer2State;
-    /* 0x13D4 */ s16 timer2Value;
+    /* 0x13CE */ s16 timerState;
+    /* 0x13D0 */ s16 timerSeconds;
+    /* 0x13D2 */ s16 subTimerState;
+    /* 0x13D4 */ s16 subTimerSeconds;
     /* 0x13D6 */ s16 timerX[2];
     /* 0x13DA */ s16 timerY[2];
     /* 0x13DE */ char unk_13DE[0x0002];
     /* 0x13E0 */ u8 seqId;
     /* 0x13E1 */ u8 natureAmbienceId;
     /* 0x13E2 */ u8 buttonStatus[9]; // SOH [Enhancements] Changed from 5 to 9 to support Dpad equips
-    /* 0x13E7 */ u8 unk_13E7; // alpha related
+    /* 0x13E7 */ u8 forceRisingButtonAlphas; // alpha related
     /* 0x13E8 */ u16 unk_13E8; // alpha type?
     /* 0x13EA */ u16 unk_13EA; // also alpha type?
     /* 0x13EC */ u16 unk_13EC; // alpha type counter?
diff --git a/soh/platform/pathconf.c b/soh/platform/pathconf.c
index 9e4111db3e..a52d313a5e 100644
--- a/soh/platform/pathconf.c
+++ b/soh/platform/pathconf.c
@@ -1,5 +1,5 @@
 #include <unistd.h>
 
-long pathconf(const char *path, int name) {
+long pathconf(const char* path, int name) {
     return -1;
 }
\ No newline at end of file
diff --git a/soh/resource.h b/soh/resource.h
index 8a193b3e8a..771a9af38b 100644
--- a/soh/resource.h
+++ b/soh/resource.h
@@ -2,15 +2,15 @@
 // Microsoft Visual C++ generated include file.
 // Used by Resource.rc
 //
-#define IDI_ICON1                       111
+#define IDI_ICON1 111
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        113
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_RESOURCE_VALUE 113
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
 #endif
 #endif
diff --git a/soh/soh/AboutWindow.cpp b/soh/soh/AboutWindow.cpp
deleted file mode 100644
index e5d51300cb..0000000000
--- a/soh/soh/AboutWindow.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "AboutWindow.h"
-#include <imgui.h>
-#include <soh/GameVersions.h>
-#include "soh/ResourceManagerHelpers.h"
-
-extern "C" {
-#include "variables.h"
-}
-
-AboutWindow::~AboutWindow() {
-    SPDLOG_TRACE("destruct about window");
-}
-
-void AboutWindow::InitElement() {
-    mIsTaggedVersion = gGitCommitTag[0] != 0;
-
-    strncpy(mGitCommitHashTruncated, (char*)gGitCommitHash, 7);
-    mGitCommitHashTruncated[7] = 0;
-}
-
-void AboutWindow::Draw() {
-    if (!IsVisible()) {
-        return;
-    }
-
-    ImGuiWindowFlags windowFlags = ImGuiWindowFlags_AlwaysAutoResize |
-                                   ImGuiWindowFlags_NoResize |
-                                   ImGuiWindowFlags_NoDocking |
-                                   ImGuiWindowFlags_NoScrollWithMouse |
-                                   ImGuiWindowFlags_NoScrollbar;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(16 * ImGui::GetIO().FontGlobalScale, 8 * ImGui::GetIO().FontGlobalScale));
-
-    if (!ImGui::Begin(GetName().c_str(), &mIsVisible, windowFlags)) {
-        ImGui::End();
-    } else {
-        DrawElement();
-        ImGui::End();
-    }
-
-    ImGui::PopStyleVar();
-
-    // Sync up the IsVisible flag if it was changed by ImGui
-    SyncVisibilityConsoleVariable();
-}
-
-const char* AboutWindow::GetGameVersionString(uint32_t index) {
-    uint32_t gameVersion = ResourceMgr_GetGameVersion(index);
-    switch (gameVersion) {
-        case OOT_NTSC_US_10:
-            return "NTSC-U 1.0";
-        case OOT_NTSC_US_11:
-            return "NTSC-U 1.1";
-        case OOT_NTSC_US_12:
-            return "NTSC-U 1.2";
-        case OOT_PAL_10:
-            return "PAL 1.0";
-        case OOT_PAL_11:
-            return "PAL 1.1";
-        case OOT_PAL_GC:
-            return "PAL GC";
-        case OOT_PAL_MQ:
-            return "PAL MQ";
-        case OOT_PAL_GC_DBG1:
-        case OOT_PAL_GC_DBG2:
-            return "PAL GC-D";
-        case OOT_PAL_GC_MQ_DBG:
-            return "PAL MQ-D";
-        case OOT_IQUE_CN:
-            return "IQUE CN";
-        case OOT_IQUE_TW:
-            return "IQUE TW";
-        default:
-            return "UNKNOWN";
-    }
-}
-
-void AboutWindow::DrawElement() {
-    // The icon is already padded - adjust for that
-    ImVec2 cursorPos = ImGui::GetCursorScreenPos();
-    cursorPos.x -= 16 * ImGui::GetIO().FontGlobalScale;
-    ImGui::SetCursorScreenPos(cursorPos);
-
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Game_Icon"), ImVec2(64.0f * ImGui::GetIO().FontGlobalScale, 64.0f * ImGui::GetIO().FontGlobalScale));
-
-    ImGui::SameLine();
-
-    ImGui::BeginGroup();
-    ImGui::Text("Ship of Harkinian");
-    if (mIsTaggedVersion) {
-        ImGui::Text("%s", gBuildVersion);
-    } else {
-        ImGui::Text("%s", gGitBranch);
-        ImGui::Text("%s", mGitCommitHashTruncated);
-    }
-    ImGui::EndGroup();
-
-    ImGui::Dummy(ImVec2(0, 2 * ImGui::GetIO().FontGlobalScale));
-    ImGui::Text("Game Archives:");
-    for (uint32_t i = 0; i < ResourceMgr_GetNumGameVersions(); i++) {
-        ImGui::BulletText(GetGameVersionString(i));
-    }
-}
diff --git a/soh/soh/AboutWindow.h b/soh/soh/AboutWindow.h
deleted file mode 100644
index 5a731fdc17..0000000000
--- a/soh/soh/AboutWindow.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <libultraship/libultraship.h>
-
-class AboutWindow : public Ship::GuiWindow {
-  public:
-    using GuiWindow::GuiWindow;
-    ~AboutWindow();
-
-  private:
-    void InitElement() override;
-    void Draw() override;
-    void DrawElement() override;
-    void UpdateElement() override {};
-
-    const char* GetGameVersionString(uint32_t index);
-
-    bool mIsTaggedVersion;
-    char mGitCommitHashTruncated[8];
-};
diff --git a/soh/soh/ActorDB.cpp b/soh/soh/ActorDB.cpp
index 880b2dab97..70ea29675e 100644
--- a/soh/soh/ActorDB.cpp
+++ b/soh/soh/ActorDB.cpp
@@ -4,7 +4,6 @@
 
 ActorDB* ActorDB::Instance;
 
-
 #define DEFINE_ACTOR(name, _1, _2) extern "C" ActorInit name##_InitVars;
 #define DEFINE_ACTOR_INTERNAL(name, _1, _2) extern "C" ActorInit name##_InitVars;
 #define DEFINE_ACTOR_UNSET(_0)
@@ -462,9 +461,10 @@ static constexpr std::pair<u16, const char*> actorDescriptionData[] = {
     { ACTOR_EN_ZL4, "Zelda (Child)" },
     { ACTOR_EN_MM2, "Running Man (Adult Era)" },
     { ACTOR_BG_JYA_BLOCK, "Silver Block (Child Era)" },
-    { ACTOR_OBJ_WARP2BLOCK, "Navi Infospot (Green, Time Block)" }
+    { ACTOR_OBJ_WARP2BLOCK, "Navi Infospot (Green, Time Block)" },
 };
-static std::unordered_map<u16, const char*> actorDescriptions = std::unordered_map<u16, const char*>(std::begin(actorDescriptionData), std::end(actorDescriptionData));
+static std::unordered_map<u16, const char*> actorDescriptions =
+    std::unordered_map<u16, const char*>(std::begin(actorDescriptionData), std::end(actorDescriptionData));
 
 ActorDB::ActorDB() {
     db.reserve(ACTOR_NUMBER_MAX); // reserve size for all initial entries so we don't do it for each
@@ -475,7 +475,8 @@ ActorDB::ActorDB() {
 
 // Adds an actor at the given index. The name must be unique.
 ActorDB::Entry& ActorDB::AddEntry(const std::string& name, const std::string& desc, size_t index) {
-    assert(!nameTable.contains(name)); // TODO this should maybe throw instead. We'll need to think about error handling for mods that try to declare the same actor.
+    assert(!nameTable.contains(name)); // TODO this should maybe throw instead. We'll need to think about error handling
+                                       // for mods that try to declare the same actor.
 
     if (db.size() < (index + 1)) {
         db.resize(index + 1);
@@ -513,7 +514,8 @@ ActorDB::Entry& ActorDB::AddEntry(const std::string& name, const std::string& de
     return entry;
 }
 
-// Adds an actor with the new ActorDBInit struct. The id assigned to the actor is dynamic. Use the return Entry or RetrieveId to get it.
+// Adds an actor with the new ActorDBInit struct. The id assigned to the actor is dynamic. Use the return Entry or
+// RetrieveId to get it.
 ActorDB::Entry& ActorDB::AddEntry(const ActorDBInit& init) {
     Entry& entry = AddEntry(init.name, init.desc, nextFreeId);
 
@@ -598,7 +600,8 @@ static ActorDBInit EnPartnerInit = {
     "En_Partner",
     "Ivan",
     ACTORCAT_ITEMACTION,
-    (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER | ACTOR_FLAG_CAN_PRESS_SWITCHES),
+    (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER |
+     ACTOR_FLAG_CAN_PRESS_SWITCHES),
     OBJECT_GAMEPLAY_KEEP,
     sizeof(EnPartner),
     (ActorFunc)EnPartner_Init,
diff --git a/soh/soh/ActorDB.h b/soh/soh/ActorDB.h
index 8bcbb3f6a7..dd8ecf9015 100644
--- a/soh/soh/ActorDB.h
+++ b/soh/soh/ActorDB.h
@@ -39,7 +39,7 @@ struct ActorDBInit {
 };
 
 class ActorDB {
-public:
+  public:
     static ActorDB* Instance;
 
     ActorDB();
@@ -65,7 +65,8 @@ public:
     static void AddBuiltInCustomActors();
 
     int GetEntryCount();
-private:
+
+  private:
     Entry& AddEntry(const std::string& name, const std::string& desc, size_t index);
     Entry& AddEntry(const std::string& name, const std::string& desc, const ActorInit& init);
 
diff --git a/soh/soh/CrashHandlerExp.h b/soh/soh/CrashHandlerExp.h
index fd57bba42f..8cda6e61e8 100644
--- a/soh/soh/CrashHandlerExp.h
+++ b/soh/soh/CrashHandlerExp.h
@@ -1,11 +1,10 @@
 #include <libultraship/bridge.h>
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void CrashHandler_PrintSohData(char* buffer, size_t* pos); 
+void CrashHandler_PrintSohData(char* buffer, size_t* pos);
 
 #ifdef __cplusplus
 }
diff --git a/soh/soh/CrashHandlerExt.cpp b/soh/soh/CrashHandlerExt.cpp
index c4a535f121..cc9c7b1ee4 100644
--- a/soh/soh/CrashHandlerExt.cpp
+++ b/soh/soh/CrashHandlerExt.cpp
@@ -22,7 +22,7 @@ static std::array<const char*, ACTORCAT_MAX> sCatToStrArray{
 #define DEFINE_SCENE(_1, _2, enumName, _4, _5, _6) #enumName
 
 static std::array<const char*, SCENE_ID_MAX> sSceneIdToStrArray{
-    #include "tables/scene_table.h"
+#include "tables/scene_table.h"
 };
 
 #undef DEFINE_SCENE
@@ -46,7 +46,7 @@ static void CrashHandler_WriteActorData(char* buffer, size_t* pos) {
         ActorListEntry* entry = &gPlayState->actorCtx.actorLists[i];
         Actor* cur;
 
-        if(entry->length == 0) {
+        if (entry->length == 0) {
             continue;
         }
         WRITE_VAR_LINE(buffer, pos, "Actor Cat: ", sCatToStrArray[i]);
@@ -76,7 +76,7 @@ extern "C" void CrashHandler_PrintSohData(char* buffer, size_t* pos) {
     if (gPlayState != nullptr) {
         append_line(buffer, pos, "Actors:");
         CrashHandler_WriteActorData(buffer, pos);
-        
+
         WRITE_VAR_LINE(buffer, pos, "Scene: ", sSceneIdToStrArray[gPlayState->sceneNum]);
 
         snprintf(intCharBuffer, sizeof(intCharBuffer), "%i", gPlayState->roomCtx.curRoom.num);
diff --git a/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp b/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
index 3a52312c9a..1ca5a7c19f 100644
--- a/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
+++ b/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
@@ -16,10 +16,9 @@ static u16 sItemButtons[] = { BTN_B, BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP,
 
 void UseTunicBoots(Player* player, PlayState* play, Input* input) {
     // Boots and tunics equip despite state
-    if (
-        player->stateFlags1 & (PLAYER_STATE1_INPUT_DISABLED | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE | PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD) ||
-        player->stateFlags2 & PLAYER_STATE2_OCARINA_PLAYING
-    ) {
+    if (player->stateFlags1 & (PLAYER_STATE1_INPUT_DISABLED | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE |
+                               PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD) ||
+        player->stateFlags2 & PLAYER_STATE2_OCARINA_PLAYING) {
         return;
     }
 
@@ -40,7 +39,8 @@ void UseTunicBoots(Player* player, PlayState* play, Input* input) {
                 Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, bootsValue);
             }
             Player_SetEquipmentData(play, player);
-            func_808328EC(player, CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) == EQUIP_VALUE_BOOTS_IRON ? NA_SE_PL_WALK_HEAVYBOOTS : NA_SE_PL_CHANGE_ARMS);
+            func_808328EC(player, CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) == EQUIP_VALUE_BOOTS_IRON ? NA_SE_PL_WALK_HEAVYBOOTS
+                                                                                              : NA_SE_PL_CHANGE_ARMS);
         } else {
             u16 tunicValue = item - ITEM_TUNIC_KOKIRI + 1;
             if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == tunicValue) {
@@ -87,6 +87,28 @@ void RegisterAssignableTunicsBoots() {
         }
     });
 
+    // don't throw items when the pressed button is a tunic or boots
+    COND_VB_SHOULD(VB_THROW_OR_PUT_DOWN_HELD_ITEM, CVAR_TUNICBOOTS_VALUE != CVAR_TUNICBOOTS_DEFAULT, {
+        // if the vanilla condition doesn't want us to throw/put down the item, early return
+        if (!*should) {
+            return;
+        }
+
+        Input* input = va_arg(args, Input*);
+
+        s32 item = ITEM_NONE;
+        for (s32 i = 0; i < ARRAY_COUNT(sItemButtons); i++) {
+            if (CHECK_BTN_ALL(input->press.button, sItemButtons[i])) {
+                item = Player_GetItemOnButton(gPlayState, i);
+                break;
+            }
+        }
+
+        if (item >= ITEM_TUNIC_KOKIRI && item <= ITEM_BOOTS_HOVER) {
+            *should = false;
+        }
+    });
+
     // do something when the player presses a button to use the tunics/boots
     COND_VB_SHOULD(VB_EXECUTE_PLAYER_ACTION_FUNC, CVAR_TUNICBOOTS_VALUE != CVAR_TUNICBOOTS_DEFAULT, {
         // if the vanilla condition doesn't want us to run the actionFunc, don't do any of this
diff --git a/soh/soh/Enhancements/BootToDebugWarpScreen.cpp b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp
new file mode 100644
index 0000000000..a2b8c6b60f
--- /dev/null
+++ b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp
@@ -0,0 +1,47 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+#include "functions.h"
+
+extern "C" {
+#include "z64.h"
+#include "overlays/gamestates/ovl_file_choose/file_choose.h"
+}
+
+static constexpr int32_t CVAR_DEBUG_ENABLED_DEFAULT = 0;
+#define CVAR_DEBUG_ENABLED_NAME CVAR_DEVELOPER_TOOLS("DebugEnabled")
+#define CVAR_DEBUG_ENABLED_VALUE CVarGetInteger(CVAR_DEBUG_ENABLED_NAME, CVAR_DEBUG_ENABLED_DEFAULT)
+
+static constexpr int32_t CVAR_BOOT_TO_DEBUG_WARP_SCREEN_DEFAULT = 0;
+#define CVAR_BOOT_TO_DEBUG_WARP_SCREEN_NAME CVAR_DEVELOPER_TOOLS("BootToDebugWarpScreen")
+#define CVAR_BOOT_TO_DEBUG_WARP_SCREEN_VALUE \
+    CVarGetInteger(CVAR_BOOT_TO_DEBUG_WARP_SCREEN_NAME, CVAR_BOOT_TO_DEBUG_WARP_SCREEN_DEFAULT)
+
+void OnFileChooseMainBootToDebugWarpScreen(void* gameState) {
+    FileChooseContext* fileChooseContext = (FileChooseContext*)gameState;
+    fileChooseContext->buttonIndex = 0xFF;
+    fileChooseContext->menuMode = FS_MENU_MODE_SELECT;
+    fileChooseContext->selectMode = SM_LOAD_GAME;
+}
+
+void OnZTitleUpdateBootToDebugWarpScreen(void* gameState) {
+    TitleContext* titleContext = (TitleContext*)gameState;
+
+    gSaveContext.seqId = (u8)NA_BGM_DISABLED;
+    gSaveContext.natureAmbienceId = 0xFF;
+    gSaveContext.gameMode = GAMEMODE_FILE_SELECT;
+    titleContext->state.running = false;
+
+    SET_NEXT_GAMESTATE(&titleContext->state, FileChoose_Init, FileChooseContext);
+}
+
+void RegisterBootToDebugWarpScreen() {
+    COND_HOOK(OnFileChooseMain, CVAR_DEBUG_ENABLED_VALUE && CVAR_BOOT_TO_DEBUG_WARP_SCREEN_VALUE,
+              OnFileChooseMainBootToDebugWarpScreen);
+    COND_HOOK(OnZTitleUpdate, CVAR_DEBUG_ENABLED_VALUE && CVAR_BOOT_TO_DEBUG_WARP_SCREEN_VALUE,
+              OnZTitleUpdateBootToDebugWarpScreen);
+}
+
+static RegisterShipInitFunc initFunc_BootToDebugWarpScreen(RegisterBootToDebugWarpScreen,
+                                                           { CVAR_DEBUG_ENABLED_NAME,
+                                                             CVAR_BOOT_TO_DEBUG_WARP_SCREEN_NAME });
diff --git a/soh/soh/Enhancements/Cheats/DekuStick.cpp b/soh/soh/Enhancements/Cheats/DekuStick.cpp
index 8afa0e3303..6798780711 100644
--- a/soh/soh/Enhancements/Cheats/DekuStick.cpp
+++ b/soh/soh/Enhancements/Cheats/DekuStick.cpp
@@ -13,13 +13,13 @@ extern PlayState* gPlayState;
 #define CVAR_DEKU_STICK_VALUE CVarGetInteger(CVAR_DEKU_STICK_NAME, CVAR_DEKU_STICK_DEFAULT)
 
 void RegisterDekuStickCheats() {
-    COND_VB_SHOULD(VB_DEKU_STICK_BREAK,     CVAR_DEKU_STICK_VALUE != DEKU_STICK_NORMAL, { *should = false; });
-    COND_VB_SHOULD(VB_DEKU_STICK_BURN_OUT,  CVAR_DEKU_STICK_VALUE != DEKU_STICK_NORMAL, { *should = false; });
+    COND_VB_SHOULD(VB_DEKU_STICK_BREAK, CVAR_DEKU_STICK_VALUE != DEKU_STICK_NORMAL, { *should = false; });
+    COND_VB_SHOULD(VB_DEKU_STICK_BURN_OUT, CVAR_DEKU_STICK_VALUE != DEKU_STICK_NORMAL, { *should = false; });
     COND_VB_SHOULD(VB_DEKU_STICK_BURN_DOWN, CVAR_DEKU_STICK_VALUE != DEKU_STICK_NORMAL, { *should = false; });
     COND_VB_SHOULD(VB_DEKU_STICK_BE_ON_FIRE, CVAR_DEKU_STICK_VALUE == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, {
         Player* player = GET_PLAYER(gPlayState);
-        player->unk_860 = 200;    // Keeps the stick's flame lit
-        player->unk_85C = 1.0f;   // Ensures the stick is the proper length
+        player->unk_860 = 200;  // Keeps the stick's flame lit
+        player->unk_85C = 1.0f; // Ensures the stick is the proper length
         *should = true;
     });
 }
diff --git a/soh/soh/Enhancements/Cheats/FreezeTime.cpp b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
index 2296c4fc9d..a3028d7dab 100644
--- a/soh/soh/Enhancements/Cheats/FreezeTime.cpp
+++ b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
@@ -30,7 +30,8 @@ void RegisterFreezeTime() {
     GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnGameFrameUpdate>(hookId);
     hookId = 0;
     if (CVAR_FREEZE_TIME_VALUE) {
-        hookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(OnGameFrameUpdateFreezeTime);
+        hookId =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(OnGameFrameUpdateFreezeTime);
     } else {
         CVarClear(CVAR_PREV_TIME_NAME);
     }
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
index 292f65065f..38b402d6d2 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
@@ -15,10 +15,7 @@ extern s32 Flags_GetRandomizerInf(RandomizerInf flag);
 #define CVAR_INFINITE_MONEY_VALUE CVarGetInteger(CVAR_INFINITE_MONEY_NAME, CVAR_INFINITE_MONEY_DEFAULT)
 
 void OnGameFrameUpdateInfiniteMoney() {
-    if (
-        !GameInteractor::IsSaveLoaded(true) ||
-        (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))
-    ) {
+    if (!GameInteractor::IsSaveLoaded(true) || (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
         return;
     }
 
diff --git a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
index 0bea9afc98..f3ff5fe043 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
@@ -7,7 +7,8 @@ extern "C" SaveContext gSaveContext;
 
 #define CVAR_INFINITE_NAYRUS_LOVE_NAME CVAR_CHEAT("InfiniteNayru")
 #define CVAR_INFINITE_NAYRUS_LOVE_DEFAULT 0
-#define CVAR_INFINITE_NAYRUS_LOVE_VALUE CVarGetInteger(CVAR_INFINITE_NAYRUS_LOVE_NAME, CVAR_INFINITE_NAYRUS_LOVE_DEFAULT)
+#define CVAR_INFINITE_NAYRUS_LOVE_VALUE \
+    CVarGetInteger(CVAR_INFINITE_NAYRUS_LOVE_NAME, CVAR_INFINITE_NAYRUS_LOVE_DEFAULT)
 
 void OnGameFrameUpdateInfiniteNayrusLove() {
     if (!GameInteractor::IsSaveLoaded(true)) {
diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
new file mode 100644
index 0000000000..911f3cd257
--- /dev/null
+++ b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
@@ -0,0 +1,23 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "macros.h"
+}
+
+static constexpr int32_t CVAR_NOKEESEGUAYTARGET_DEFAULT = 0;
+#define CVAR_NOKEESEGUAYTARGET_NAME CVAR_CHEAT("NoKeeseGuayTarget")
+#define CVAR_NOKEESEGUAYTARGET_VALUE CVarGetInteger(CVAR_NOKEESEGUAYTARGET_NAME, CVAR_NOKEESEGUAYTARGET_DEFAULT)
+
+void RegisterNoKeeseGuayTarget() {
+    // Dive Attack
+    COND_VB_SHOULD(VB_KEESE_DO_DIVE_ATTACK, CVAR_NOKEESEGUAYTARGET_VALUE, { *should = false; });
+    COND_VB_SHOULD(VB_GUAY_DO_DIVE_ATTACK, CVAR_NOKEESEGUAYTARGET_VALUE, { *should = false; });
+
+    // Force Fly Away
+    COND_VB_SHOULD(VB_KEESE_FORCE_FLY_AWAY, CVAR_NOKEESEGUAYTARGET_VALUE, { *should = true; });
+    COND_VB_SHOULD(VB_GUAY_FORCE_FLY_AWAY, CVAR_NOKEESEGUAYTARGET_VALUE, { *should = true; });
+}
+
+static RegisterShipInitFunc initFunc_NoKeeseGuayTarget(RegisterNoKeeseGuayTarget, { CVAR_NOKEESEGUAYTARGET_NAME });
diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
new file mode 100644
index 0000000000..ccc406104f
--- /dev/null
+++ b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
@@ -0,0 +1,17 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "macros.h"
+}
+
+static constexpr int32_t CVAR_NOREDEADFREEZE_DEFAULT = 0;
+#define CVAR_NOREDEADFREEZE_NAME CVAR_CHEAT("NoRedeadFreeze")
+#define CVAR_NOREDEADFREEZE_VALUE CVarGetInteger(CVAR_NOREDEADFREEZE_NAME, CVAR_NOREDEADFREEZE_DEFAULT)
+
+void RegisterNoRedeadFreeze() {
+    COND_VB_SHOULD(VB_REDEAD_GIBDO_FREEZE_LINK, CVAR_NOREDEADFREEZE_VALUE, { *should = false; });
+}
+
+static RegisterShipInitFunc initFunc_NoRedeadFreeze(RegisterNoRedeadFreeze, { CVAR_NOREDEADFREEZE_NAME });
diff --git a/soh/soh/Enhancements/CuccosToReturn.cpp b/soh/soh/Enhancements/CuccosToReturn.cpp
new file mode 100644
index 0000000000..2de929fd30
--- /dev/null
+++ b/soh/soh/Enhancements/CuccosToReturn.cpp
@@ -0,0 +1,18 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+extern PlayState* gPlayState;
+#include "src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h"
+}
+
+void RegisterCuccosToReturn() {
+    COND_VB_SHOULD(VB_SET_CUCCO_COUNT, CVarGetInteger(CVAR_ENHANCEMENT("CuccosToReturn"), 7) != 7, {
+        EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
+        // Override starting Cucco count using setting value
+        enNiwLady->cuccosInPen = 7 - CVarGetInteger(CVAR_ENHANCEMENT("CuccosToReturn"), 7);
+        *should = false;
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterCuccosToReturn, { CVAR_ENHANCEMENT("CuccosToReturn") });
diff --git a/soh/soh/Enhancements/DampeFire.cpp b/soh/soh/Enhancements/DampeFire.cpp
new file mode 100644
index 0000000000..1378ecb044
--- /dev/null
+++ b/soh/soh/Enhancements/DampeFire.cpp
@@ -0,0 +1,48 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "soh/Enhancements/enhancementTypes.h"
+
+extern "C" {
+extern PlayState* gPlayState;
+#include "src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h"
+}
+
+void RegisterDampeFire() {
+    COND_VB_SHOULD(VB_DAMPE_DROP_FLAME, CVarGetInteger(CVAR_ENHANCEMENT("DampeDropRate"), DAMPE_NORMAL) != DAMPE_NORMAL,
+                   {
+                       double chance;
+                       int cooldown = 9;
+                       switch (CVarGetInteger(CVAR_ENHANCEMENT("DampeDropRate"), DAMPE_NORMAL)) {
+                           case DAMPE_NONE:
+                               *should = false;
+                               return;
+                           default:
+                           case DAMPE_NORMAL:
+                               return;
+                           case DAMPE_JALAPENO:
+                               chance = 0.03;
+                               break;
+                           case DAMPE_CHIPOTLE:
+                               chance = 0.1;
+                               break;
+                           case DAMPE_SCOTCH_BONNET:
+                               chance = 0.2;
+                               break;
+                           case DAMPE_GHOST_PEPPER:
+                               chance = 0.5;
+                               cooldown = 4;
+                               break;
+                           case DAMPE_INFERNO:
+                               *should = true;
+                               return;
+                       }
+
+                       EnPoRelay* actor = va_arg(args, EnPoRelay*);
+                       if (actor->actionTimer > cooldown) {
+                           actor->actionTimer = cooldown;
+                       }
+                       *should = actor->actionTimer == 0 && Rand_ZeroOne() < chance;
+                   });
+}
+
+static RegisterShipInitFunc initFunc(RegisterDampeFire, { CVAR_ENHANCEMENT("DampeDropRate") });
diff --git a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
new file mode 100644
index 0000000000..3e7660b84e
--- /dev/null
+++ b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
@@ -0,0 +1,42 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
+
+extern "C" PlayState* gPlayState;
+
+static constexpr int32_t CVAR_RUPEE_DASH_DEFAULT = 0;
+#define CVAR_RUPEE_DASH_NAME CVAR_ENHANCEMENT("RupeeDash")
+#define CVAR_RUPEE_DASH_VALUE CVarGetInteger(CVAR_RUPEE_DASH_NAME, CVAR_RUPEE_DASH_DEFAULT)
+
+static constexpr int32_t CVAR_RUPEE_DASH_INTERVAL_DEFAULT = 5;
+#define CVAR_RUPEE_DASH_INTERVAL_NAME CVAR_ENHANCEMENT("RupeeDashInterval")
+#define CVAR_RUPEE_DASH_INTERVAL_TIME \
+    CVarGetInteger(CVAR_RUPEE_DASH_INTERVAL_NAME, CVAR_RUPEE_DASH_INTERVAL_DEFAULT) * 20
+
+void UpdateRupeeDash() {
+    // Initialize Timer
+    static uint16_t rupeeDashTimer = 0;
+
+    // Did time change by DashInterval?
+    if (rupeeDashTimer < CVAR_RUPEE_DASH_INTERVAL_TIME) {
+        rupeeDashTimer++;
+        return;
+    }
+
+    rupeeDashTimer = 0;
+    if (gSaveContext.rupees > 0) {
+        uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1;
+        Rupees_ChangeBy(walletSize);
+    } else {
+        Health_ChangeBy(gPlayState, -16);
+    }
+}
+
+void RegisterRupeeDash() {
+    COND_HOOK(OnPlayerUpdate, CVAR_RUPEE_DASH_VALUE, UpdateRupeeDash);
+}
+
+static RegisterShipInitFunc initFunc_RupeeDash(RegisterRupeeDash, { CVAR_RUPEE_DASH_NAME });
diff --git a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
new file mode 100644
index 0000000000..dc85534c8d
--- /dev/null
+++ b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
@@ -0,0 +1,50 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "functions.h"
+
+extern "C" PlayState* gPlayState;
+
+static constexpr int32_t CVAR_SHADOW_TAG_DEFAULT = 0;
+#define CVAR_SHADOW_TAG_NAME CVAR_ENHANCEMENT("ShadowTag")
+#define CVAR_SHADOW_TAG_VALUE CVarGetInteger(CVAR_SHADOW_TAG_NAME, CVAR_SHADOW_TAG_DEFAULT)
+
+static bool shouldSpawn = false;
+static uint16_t delayTimer = 60;
+
+static constexpr s8 ROOM_GREEN_POE = 16;
+static constexpr s8 ROOM_BLUE_POE = 13;
+static constexpr s8 ROOM_RED_POE = 12;
+
+void OnPlayerUpdateShadowTag() {
+    if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE) {
+        switch (gPlayState->roomCtx.curRoom.num) {
+            case ROOM_GREEN_POE:
+            case ROOM_BLUE_POE:
+            case ROOM_RED_POE:
+                return;
+            default:
+                break;
+        }
+    }
+
+    if (shouldSpawn && (delayTimer <= 0)) {
+        Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false);
+        shouldSpawn = false;
+    } else {
+        delayTimer--;
+    }
+}
+
+void ResetShadowTagSpawnTimer() {
+    shouldSpawn = true;
+    delayTimer = 60;
+}
+
+void RegisterShadowTag() {
+    COND_HOOK(OnPlayerUpdate, CVAR_SHADOW_TAG_VALUE, OnPlayerUpdateShadowTag);
+    COND_HOOK(OnSceneSpawnActors, true, []() { ResetShadowTagSpawnTimer(); });
+    COND_HOOK(OnSceneInit, true, [](int16_t) { ResetShadowTagSpawnTimer(); });
+}
+
+static RegisterShipInitFunc initFunc_ShadowTag(RegisterShadowTag, { CVAR_SHADOW_TAG_NAME });
diff --git a/soh/soh/Enhancements/ExtraTraps.cpp b/soh/soh/Enhancements/ExtraTraps.cpp
index 4de771006c..155b1af713 100644
--- a/soh/soh/Enhancements/ExtraTraps.cpp
+++ b/soh/soh/Enhancements/ExtraTraps.cpp
@@ -36,23 +36,19 @@ static int statusTimer = -1;
 static int eventTimer = -1;
 
 const char* altTrapTypeCvars[] = {
-    CVAR_ENHANCEMENT("ExtraTraps.Ice"),
-    CVAR_ENHANCEMENT("ExtraTraps.Burn"),
-    CVAR_ENHANCEMENT("ExtraTraps.Shock"),
-    CVAR_ENHANCEMENT("ExtraTraps.Knockback"),
-    CVAR_ENHANCEMENT("ExtraTraps.Speed"),
-    CVAR_ENHANCEMENT("ExtraTraps.Bomb"),
-    CVAR_ENHANCEMENT("ExtraTraps.Void"),
-    CVAR_ENHANCEMENT("ExtraTraps.Ammo"),
-    CVAR_ENHANCEMENT("ExtraTraps.Kill"),
-    CVAR_ENHANCEMENT("ExtraTraps.Teleport")
+    CVAR_ENHANCEMENT("ExtraTraps.Ice"),   CVAR_ENHANCEMENT("ExtraTraps.Burn"),
+    CVAR_ENHANCEMENT("ExtraTraps.Shock"), CVAR_ENHANCEMENT("ExtraTraps.Knockback"),
+    CVAR_ENHANCEMENT("ExtraTraps.Speed"), CVAR_ENHANCEMENT("ExtraTraps.Bomb"),
+    CVAR_ENHANCEMENT("ExtraTraps.Void"),  CVAR_ENHANCEMENT("ExtraTraps.Ammo"),
+    CVAR_ENHANCEMENT("ExtraTraps.Kill"),  CVAR_ENHANCEMENT("ExtraTraps.Teleport"),
 };
 
-std::vector<AltTrapType> getEnabledAddTraps () {
+std::vector<AltTrapType> getEnabledAddTraps() {
     std::vector<AltTrapType> enabledAddTraps;
     for (int i = 0; i < ADD_TRAP_MAX; i++) {
         if (CVarGetInteger(altTrapTypeCvars[i], 0)) {
-            if (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE && (i == ADD_VOID_TRAP || i == ADD_TELEPORT_TRAP)) {
+            if (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE &&
+                (i == ADD_VOID_TRAP || i == ADD_TELEPORT_TRAP)) {
                 continue; // don't add void or teleport if you're holding the fishing pole, as this causes issues
             }
             enabledAddTraps.push_back(static_cast<AltTrapType>(i));
@@ -65,7 +61,8 @@ std::vector<AltTrapType> getEnabledAddTraps () {
 };
 
 static void RollRandomTrap(uint32_t seed) {
-    uint32_t finalSeed = seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() : gSaveContext.ship.stats.fileCreatedAt);
+    uint32_t finalSeed = seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed()
+                                          : static_cast<uint32_t>(gSaveContext.ship.stats.fileCreatedAt));
     Random_Init(finalSeed);
 
     roll = RandomElement(getEnabledAddTraps());
@@ -83,7 +80,8 @@ static void RollRandomTrap(uint32_t seed) {
             eventTimer = 3;
             break;
         case ADD_SPEED_TRAP:
-            Audio_PlaySoundGeneral(NA_SE_VO_KZ_MOVE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_VO_KZ_MOVE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             GameInteractor::State::MovementSpeedMultiplier = 0.5f;
             statusTimer = 200;
             Notification::Emit({ .message = "Speed Decreased!" });
@@ -92,7 +90,8 @@ static void RollRandomTrap(uint32_t seed) {
             eventTimer = 3;
             break;
         case ADD_VOID_TRAP:
-            Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             eventTimer = 3;
             break;
         case ADD_AMMO_TRAP:
@@ -127,13 +126,14 @@ static void OnPlayerUpdate() {
                 Play_TriggerRespawn(gPlayState);
                 break;
             case ADD_AMMO_TRAP:
-                AMMO(ITEM_STICK) = AMMO(ITEM_STICK) * 0.5;
-                AMMO(ITEM_NUT) = AMMO(ITEM_NUT) * 0.5;
-                AMMO(ITEM_SLINGSHOT) = AMMO(ITEM_SLINGSHOT) * 0.5;
-                AMMO(ITEM_BOW) = AMMO(ITEM_BOW) * 0.5;
-                AMMO(ITEM_BOMB) = AMMO(ITEM_BOMB) * 0.5;
-                AMMO(ITEM_BOMBCHU) = AMMO(ITEM_BOMBCHU) * 0.5;
-                Audio_PlaySoundGeneral(NA_SE_VO_FR_SMILE_0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                AMMO(ITEM_STICK) = static_cast<int8_t>(floor(AMMO(ITEM_STICK) * 0.5f));
+                AMMO(ITEM_NUT) = static_cast<int8_t>(floor(AMMO(ITEM_NUT) * 0.5f));
+                AMMO(ITEM_SLINGSHOT) = static_cast<int8_t>(floor(AMMO(ITEM_SLINGSHOT) * 0.5f));
+                AMMO(ITEM_BOW) = static_cast<int8_t>(floor(AMMO(ITEM_BOW) * 0.5f));
+                AMMO(ITEM_BOMB) = static_cast<int8_t>(floor(AMMO(ITEM_BOMB) * 0.5f));
+                AMMO(ITEM_BOMBCHU) = static_cast<int8_t>(floor(AMMO(ITEM_BOMBCHU) * 0.5f));
+                Audio_PlaySoundGeneral(NA_SE_VO_FR_SMILE_0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 break;
             case ADD_TELEPORT_TRAP: {
                 int entrance;
@@ -199,5 +199,3 @@ void RegisterExtraTraps() {
 }
 
 static RegisterShipInitFunc initFunc(RegisterExtraTraps, { CVAR_EXTRA_TRAPS_NAME });
-
-
diff --git a/soh/soh/Enhancements/FileSelectEnhancements.cpp b/soh/soh/Enhancements/FileSelectEnhancements.cpp
index 84cff9d121..ec8810d020 100644
--- a/soh/soh/Enhancements/FileSelectEnhancements.cpp
+++ b/soh/soh/Enhancements/FileSelectEnhancements.cpp
@@ -6,12 +6,12 @@
 #include <string>
 #include <vector>
 
-std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = {     
+std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = {
     {
         // English
         "Start Randomizer",
         // German
-        "Start Randomizer",
+        "Randomizer starten",
         // French
         "Commencer le Randomizer",
     },
@@ -19,7 +19,7 @@ std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = {
         // English
         "Generate New Randomizer Seed",
         // German
-        "Generate New Randomizer Seed",
+        "Neuen Randomizer Seed generieren",
         // French
         "Générer une nouvelle seed pour le Randomizer",
     },
@@ -27,7 +27,7 @@ std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = {
         // English
         "Open Randomizer Settings",
         // German
-        "Open Randomizer Settings",
+        "Randomizer Optionen öffnen",
         // French
         "Ouvrir les paramètres du Randomizer",
     },
@@ -35,32 +35,31 @@ std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = {
         // English
         "Generating...",
         // German
-        "Generating...",
+        "Generiere...",
         // French
         "Génération en cours...",
     },
-    {
-        // English
-        "No randomizer seed loaded.\nPlease generate one first"
-    #if defined(__WIIU__) || defined(__SWITCH__)
-        ".",
-    #else
-        ",\nor drop a spoiler log on the game window.",
-    #endif
-        // German
-        "No randomizer seed loaded.\nPlease generate one first"
-    #if defined(__WIIU__) || defined(__SWITCH__)
-        ".",
-    #else
-        ",\nor drop a spoiler log on the game window.",
-    #endif
-        // French
-        "Aucune Seed de Randomizer actuellement disponible.\nGénérez-en une dans les \"Randomizer Settings\""
-    #if (defined(__WIIU__) || defined(__SWITCH__))
-        "."
-    #else
-        "\nou glissez un spoilerlog sur la fenêtre du jeu."
-    #endif
+    { // English
+      "No randomizer seed loaded.\nPlease generate one first"
+#if defined(__WIIU__) || defined(__SWITCH__)
+      ".",
+#else
+      ",\nor drop a spoiler log on the game window.",
+#endif
+      // German
+      "Kein Randomizer Seed gefunden.\nBitte generiere zuerst einen"
+#if defined(__WIIU__) || defined(__SWITCH__)
+      ".",
+#else
+      ",\noder ziehe ein Spoiler Log\nauf das Spielfenster.",
+#endif
+      // French
+      "Aucune Seed de Randomizer actuellement disponible.\nGénérez-en une dans les \"Randomizer Settings\""
+#if (defined(__WIIU__) || defined(__SWITCH__))
+      "."
+#else
+      "\nou glissez un spoilerlog sur la fenêtre du jeu."
+#endif
     },
 };
 
diff --git a/soh/soh/Enhancements/Presets/Presets.cpp b/soh/soh/Enhancements/Presets/Presets.cpp
new file mode 100644
index 0000000000..b84cb95ca1
--- /dev/null
+++ b/soh/soh/Enhancements/Presets/Presets.cpp
@@ -0,0 +1,446 @@
+#include "Presets.h"
+#include <variant>
+#include <string>
+#include <fstream>
+#include <config/Config.h>
+#include <libultraship/classes.h>
+#include <nlohmann/json.hpp>
+#include <libultraship/libultraship.h>
+#include <Json.h>
+#include "soh/OTRGlobals.h"
+#include "soh/SohGui/MenuTypes.h"
+#include "soh/SohGui/SohMenu.h"
+#include "soh/SohGui/SohGui.hpp"
+#include "soh/Enhancements/randomizer/randomizer_settings_window.h"
+#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
+#include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
+#include "soh/Enhancements/randomizer/randomizer_item_tracker.h"
+
+namespace fs = std::filesystem;
+
+namespace SohGui {
+extern std::shared_ptr<SohMenu> mSohMenu;
+extern std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
+} // namespace SohGui
+
+struct PresetInfo {
+    nlohmann::json presetValues;
+    std::string fileName;
+    bool apply[PRESET_SECTION_MAX];
+    bool isBuiltIn = false;
+};
+
+struct BlockInfo {
+    std::vector<std::string> sections;
+    const char* icon;
+    std::string names[2];
+};
+
+static std::map<std::string, PresetInfo> presets;
+static std::string presetFolder;
+
+void BlankButton() {
+    ImGui::PushStyleColor(ImGuiCol_Button, { 0, 0, 0, 0 });
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, { 0, 0, 0, 0 });
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, { 0, 0, 0, 0 });
+    ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 });
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8.0f, 8.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PresetCheckboxStyle(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(1.0f, 1.0f, 1.0f, 0.7f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(6.0f, 6.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+static BlockInfo blockInfo[PRESET_SECTION_MAX] = {
+    { { CVAR_PREFIX_SETTING, CVAR_PREFIX_WINDOW }, ICON_FA_COG, { "Settings", "settings" } },
+    { { CVAR_PREFIX_ENHANCEMENT, CVAR_PREFIX_RANDOMIZER_ENHANCEMENT, CVAR_PREFIX_CHEAT },
+      ICON_FA_PLUS_CIRCLE,
+      { "Enhancements", "enhancements" } },
+    { { CVAR_PREFIX_AUDIO }, ICON_FA_MUSIC, { "Audio", "audio" } },
+    { { CVAR_PREFIX_COSMETIC }, ICON_FA_PAINT_BRUSH, { "Cosmetics", "cosmetics" } },
+    { { CVAR_PREFIX_RANDOMIZER_SETTING }, ICON_FA_RANDOM, { "Rando Settings", "rando" } },
+    { { CVAR_PREFIX_TRACKER }, ICON_FA_MAP, { "Trackers", "trackers" } },
+    { { CVAR_PREFIX_REMOTE }, ICON_FA_WIFI, { "Network", "network" } },
+};
+
+std::string FormatPresetPath(std::string name) {
+    return fmt::format("{}/{}.json", presetFolder, name);
+}
+
+void applyPreset(std::string presetName, std::vector<PresetSection> includeSections) {
+    auto& info = presets[presetName];
+    for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+        if (info.apply[i] && info.presetValues["blocks"].contains(blockInfo[i].names[1])) {
+            if (!includeSections.empty() &&
+                std::find(includeSections.begin(), includeSections.end(), i) == includeSections.end()) {
+                continue;
+            }
+            if (i == PRESET_SECTION_TRACKERS) {
+                ItemTracker_LoadFromPreset(info.presetValues["blocks"][blockInfo[i].names[1]]["windows"]);
+                if (info.presetValues["blocks"][blockInfo[i].names[1]]["windows"].contains("Check Tracker")) {
+                    CheckTracker::CheckTracker_LoadFromPreset(
+                        info.presetValues["blocks"][blockInfo[i].names[1]]["windows"]["Check Tracker"]);
+                }
+                if (info.presetValues["blocks"][blockInfo[i].names[1]]["windows"].contains("Entrance Tracker")) {
+                    EntranceTracker_LoadFromPreset(
+                        info.presetValues["blocks"][blockInfo[i].names[1]]["windows"]["Entrance Tracker"]);
+                }
+            }
+            auto section = info.presetValues["blocks"][blockInfo[i].names[1]];
+            for (auto& item : section.items()) {
+                if (section[item.key()].is_null()) {
+                    CVarClearBlock(item.key().c_str());
+                } else {
+                    Ship::Context::GetInstance()->GetConfig()->SetBlock(fmt::format("{}.{}", "CVars", item.key()),
+                                                                        item.value());
+                    Ship::Context::GetInstance()->GetConsoleVariables()->Load();
+                }
+            }
+            if (i == PRESET_SECTION_RANDOMIZER) {
+                SohGui::mRandomizerSettingsWindow->SetNeedsUpdate();
+            }
+        }
+    }
+    ShipInit::InitAll();
+}
+
+void DrawPresetSelector(std::vector<PresetSection> includeSections, std::string presetLoc, bool disabled) {
+    std::vector<std::string> includedPresets;
+    for (auto& [name, info] : presets) {
+        for (auto& section : includeSections) {
+            if (info.apply[section]) {
+                includedPresets.push_back(name);
+            }
+        }
+    }
+    ImGui::Text("Presets");
+    if (includedPresets.empty()) {
+        ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(UIWidgets::Colors::Orange));
+        ImGui::Text("No presets with rando options. Make some in Settings -> Presets");
+        ImGui::PopStyleColor();
+        return;
+    }
+    std::string selectorCvar = fmt::format(CVAR_GENERAL("{}SelectedPreset"), presetLoc);
+    std::string currentIndex = CVarGetString(selectorCvar.c_str(), includedPresets[0].c_str());
+    if (!presets.contains(currentIndex)) {
+        currentIndex = *includedPresets.begin();
+        CVarSetString(selectorCvar.c_str(), currentIndex.c_str());
+    }
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
+    if (ImGui::BeginCombo("##PresetsComboBox", currentIndex.c_str())) {
+        for (auto iter = includedPresets.begin(); iter != includedPresets.end(); ++iter) {
+            if (ImGui::Selectable(iter->c_str(), *iter == currentIndex)) {
+                CVarSetString(selectorCvar.c_str(), iter->c_str());
+                currentIndex = *iter;
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+            }
+        }
+
+        ImGui::EndCombo();
+    }
+    UIWidgets::PopStyleCombobox();
+    // UIWidgets::Tooltip(comboboxTooltip.c_str());
+
+    UIWidgets::PushStyleButton(THEME_COLOR);
+    if (UIWidgets::Button(
+            ("Apply Preset##" + selectorCvar).c_str(),
+            UIWidgets::ButtonOptions({ { .disabled = disabled } }).Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
+        applyPreset(currentIndex, includeSections);
+    }
+    UIWidgets::PopStyleButton();
+}
+
+void DrawSectionCheck(const std::string& name, bool empty, bool* pointer, std::string section) {
+    ImGui::AlignTextToFramePadding();
+    if (empty) {
+        ImGui::PushStyleColor(ImGuiCol_Text, { 1.0f, 0.0f, 0.0f, 0.7f });
+        BlankButton();
+        ImGui::BeginDisabled();
+        ImGui::Button((ICON_FA_TIMES + std::string("##") + name + section).c_str());
+        ImGui::EndDisabled();
+        UIWidgets::PopStyleButton();
+        ImGui::PopStyleColor();
+    } else {
+        ImGui::PushFont(OTRGlobals::Instance->fontMono);
+        ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::GetStyle().FramePadding.y));
+        UIWidgets::Checkbox(("##" + name + section).c_str(), pointer,
+                            { .defaultValue = true, .padding = { 6.0f, 6.0f }, .color = THEME_COLOR });
+        ImGui::PopFont();
+    }
+}
+
+void ParsePreset(nlohmann::json& json, std::string name) {
+    try {
+        presets[json["presetName"]].presetValues = json;
+        presets[json["presetName"]].fileName = name;
+        if (json.contains("isBuiltIn")) {
+            presets[json["presetName"]].isBuiltIn = json["isBuiltIn"];
+        }
+        for (int i = 0; i < PRESET_SECTION_MAX; i++) {
+            if (presets[json["presetName"]].presetValues["blocks"].contains(blockInfo[i].names[1])) {
+                presets[json["presetName"]].apply[i] = true;
+            }
+        }
+    } catch (...) {}
+}
+
+void LoadPresets() {
+    if (!presets.empty()) {
+        presets.clear();
+    }
+    if (fs::exists(presetFolder)) {
+        for (auto const& preset : fs::directory_iterator(presetFolder)) {
+            std::ifstream ifs(preset.path());
+
+            auto json = nlohmann::json::parse(ifs);
+            if (!json.contains("presetName")) {
+                spdlog::error(fmt::format("Attempted to load file {} as a preset, but was not a preset file.",
+                                          preset.path().filename().string()));
+            } else {
+                ParsePreset(json, preset.path().filename().stem().string());
+            }
+            ifs.close();
+        }
+    }
+    auto initData = std::make_shared<Ship::ResourceInitData>();
+    initData->Format = RESOURCE_FORMAT_BINARY;
+    initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json);
+    initData->ResourceVersion = 0;
+    std::string folder = "presets/*";
+    auto builtIns = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles(folder);
+    size_t start = std::string(folder).size() - 1;
+    for (size_t i = 0; i < builtIns->size(); i++) {
+        std::string filePath = builtIns->at(i);
+        auto json = std::static_pointer_cast<Ship::Json>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResource(filePath, true, initData));
+
+        std::string fileName = filePath.substr(start, filePath.size() - start - 5); // 5 for length of ".json"
+        ParsePreset(json->Data, fileName);
+    }
+}
+
+void SavePreset(std::string& presetName) {
+    if (!fs::exists(presetFolder)) {
+        fs::create_directory(presetFolder);
+    }
+    presets[presetName].presetValues["presetName"] = presetName;
+    std::ofstream file(
+        fmt::format("{}/{}.json", Ship::Context::GetInstance()->LocateFileAcrossAppDirs("presets"), presetName));
+    file << presets[presetName].presetValues.dump(4);
+    file.close();
+    LoadPresets();
+}
+
+static std::string newPresetName;
+static bool saveSection[PRESET_SECTION_MAX];
+
+void DrawNewPresetPopup() {
+    bool nameExists = presets.contains(newPresetName);
+    UIWidgets::InputString("Preset Name", &newPresetName,
+                           UIWidgets::InputOptions()
+                               .Color(THEME_COLOR)
+                               .Size({ 200, 40 })
+                               .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                               .LabelPosition(UIWidgets::LabelPositions::Near)
+                               .ErrorText("Preset name already exists")
+                               .HasError(nameExists));
+    nameExists = presets.contains(newPresetName);
+    bool noneSelected = true;
+    for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+        if (saveSection[i]) {
+            noneSelected = false;
+            break;
+        }
+    }
+    const char* disabledTooltip =
+        (newPresetName.empty() ? "Preset name is empty"
+                               : (noneSelected ? "No sections selected" : "Preset name already exists"));
+    for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+        UIWidgets::Checkbox(fmt::format("Save {}", blockInfo[i].names[0]).c_str(), &saveSection[i],
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR).Padding({ 6.0f, 6.0f }));
+    }
+    if (UIWidgets::Button(
+            "Save", UIWidgets::ButtonOptions({ { .disabled = (nameExists || noneSelected || newPresetName.empty()),
+                                                 .disabledTooltip = disabledTooltip } })
+                        .Padding({ 6.0f, 6.0f })
+                        .Color(THEME_COLOR))) {
+        presets[newPresetName] = {};
+        auto config = Ship::Context::GetInstance()->GetConfig()->GetNestedJson();
+        for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+            if (saveSection[i]) {
+                for (int j = 0; j < blockInfo[i].sections.size(); j++) {
+                    presets[newPresetName].presetValues["blocks"][blockInfo[i].names[1]][blockInfo[i].sections[j]] =
+                        config["CVars"][blockInfo[i].sections[j]];
+                }
+            }
+        }
+        if (saveSection[PRESET_SECTION_TRACKERS]) {
+            for (auto id : itemTrackerWindowIDs) {
+                auto window = ImGui::FindWindowByName(id);
+                if (window != nullptr) {
+                    auto size = window->Size;
+                    auto pos = window->Pos;
+                    presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]
+                                                       ["windows"][id]["size"]["width"] = size.x;
+                    presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]
+                                                       ["windows"][id]["size"]["height"] = size.y;
+                    presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]
+                                                       ["windows"][id]["pos"]["x"] = pos.x;
+                    presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]
+                                                       ["windows"][id]["pos"]["y"] = pos.y;
+                }
+            }
+
+            auto window = ImGui::FindWindowByName("Entrance Tracker");
+            if (window != nullptr) {
+                auto size = window->Size;
+                auto pos = window->Pos;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Entrance Tracker"]["size"]["width"] = size.x;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Entrance Tracker"]["size"]["height"] = size.y;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Entrance Tracker"]["pos"]["x"] = pos.x;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Entrance Tracker"]["pos"]["y"] = pos.y;
+            }
+
+            window = ImGui::FindWindowByName("Check Tracker");
+            if (window != nullptr) {
+                auto size = window->Size;
+                auto pos = window->Pos;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Check Tracker"]["size"]["width"] = size.x;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Check Tracker"]["size"]["height"] = size.y;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Check Tracker"]["pos"]["x"] = pos.x;
+                presets[newPresetName].presetValues["blocks"][blockInfo[PRESET_SECTION_TRACKERS].names[1]]["windows"]
+                                                   ["Check Tracker"]["pos"]["y"] = pos.y;
+            }
+        }
+        presets[newPresetName].fileName = newPresetName;
+        std::fill_n(presets[newPresetName].apply, PRESET_SECTION_MAX, true);
+        SavePreset(newPresetName);
+        newPresetName = "";
+        ImGui::CloseCurrentPopup();
+    }
+    if (UIWidgets::Button("Cancel", UIWidgets::ButtonOptions().Padding({ 6.0f, 6.0f }).Color(THEME_COLOR))) {
+        ImGui::CloseCurrentPopup();
+    }
+    ImGui::EndPopup();
+}
+
+void PresetsCustomWidget(WidgetInfo& info) {
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLargest);
+    if (UIWidgets::Button("New Preset", UIWidgets::ButtonOptions(
+                                            { { .disabled = (CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) != 0),
+                                                .disabledTooltip = "Disabled because of race lockout" } })
+                                            .Size(UIWidgets::Sizes::Inline)
+                                            .Color(THEME_COLOR))) {
+        ImGui::OpenPopup("newPreset");
+    }
+    if (ImGui::BeginPopup("newPreset", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
+                                           ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar |
+                                           ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar)) {
+        DrawNewPresetPopup();
+    }
+    ImGui::SameLine();
+    UIWidgets::CVarCheckbox("Hide built-in presets", CVAR_GENERAL("HideBuiltInPresets"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+    bool hideBuiltIn = CVarGetInteger(CVAR_GENERAL("HideBuiltInPresets"), 0);
+    UIWidgets::PushStyleTabs(THEME_COLOR);
+    if (ImGui::BeginTable("PresetWidgetTable", PRESET_SECTION_MAX + 3)) {
+        ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 250);
+        for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+            ImGui::TableSetupColumn(blockInfo[i].names[0].c_str());
+        }
+        ImGui::TableSetupColumn("Apply", ImGuiTableColumnFlags_WidthFixed,
+                                ImGui::CalcTextSize("Apply").x + ImGui::GetStyle().FramePadding.x * 2);
+        ImGui::TableSetupColumn("Delete", ImGuiTableColumnFlags_WidthFixed,
+                                ImGui::CalcTextSize("Delete").x + ImGui::GetStyle().FramePadding.x * 2);
+        BlankButton();
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+            ImGui::TableNextColumn();
+            ImGui::Button(fmt::format("{}##header{}", blockInfo[i].icon, blockInfo[i].names[1]).c_str());
+            UIWidgets::Tooltip(blockInfo[i].names[0].c_str());
+        }
+        UIWidgets::PopStyleButton();
+
+        if (presets.empty()) {
+            ImGui::TableNextRow();
+            ImGui::TableNextColumn();
+            ImGui::AlignTextToFramePadding();
+            ImGui::Text("No presets found.");
+            ImGui::EndTable();
+            UIWidgets::PopStyleTabs();
+            ImGui::PopFont();
+            return;
+        }
+        for (auto& [name, info] : presets) {
+            if (hideBuiltIn && info.isBuiltIn) {
+                continue;
+            }
+            ImGui::TableNextRow();
+            ImGui::TableNextColumn();
+            ImGui::AlignTextToFramePadding();
+            ImGui::Text(name.c_str());
+            for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
+                ImGui::TableNextColumn();
+                DrawSectionCheck(name, !info.presetValues["blocks"].contains(blockInfo[i].names[1]), &info.apply[i],
+                                 blockInfo[i].names[1]);
+            }
+            ImGui::TableNextColumn();
+            UIWidgets::PushStyleButton(THEME_COLOR);
+            if (UIWidgets::Button(
+                    ("Apply##" + name).c_str(),
+                    UIWidgets::ButtonOptions({ { .disabled = (CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) != 0),
+                                                 .disabledTooltip = "Disabled because of race lockout" } })
+                        .Padding({ 6.0f, 6.0f }))) {
+                applyPreset(name);
+            }
+            UIWidgets::PopStyleButton();
+            ImGui::TableNextColumn();
+            UIWidgets::PushStyleButton(THEME_COLOR);
+            if (!info.isBuiltIn) {
+                if (UIWidgets::Button(("Delete##" + name).c_str(),
+                                      UIWidgets::ButtonOptions().Padding({ 6.0f, 6.0f }))) {
+                    auto path = FormatPresetPath(info.fileName);
+                    if (fs::exists(path)) {
+                        fs::remove(path);
+                    }
+                    presets.erase(name);
+                    UIWidgets::PopStyleButton();
+                    break;
+                }
+            }
+            UIWidgets::PopStyleButton();
+        }
+
+        ImGui::EndTable();
+    }
+    ImGui::PopFont();
+    UIWidgets::PopStyleTabs();
+}
+
+void RegisterPresetsWidgets() {
+    SohGui::mSohMenu->AddSidebarEntry("Settings", "Presets", 1);
+    WidgetPath path = { "Settings", "Presets", SECTION_COLUMN_1 };
+    SohGui::mSohMenu->AddWidget(path, "PresetsWidget", WIDGET_CUSTOM).CustomFunction(PresetsCustomWidget);
+    presetFolder = Ship::Context::GetInstance()->GetPathRelativeToAppDirectory("presets");
+    std::fill_n(saveSection, PRESET_SECTION_MAX, true);
+    LoadPresets();
+}
+
+static RegisterMenuInitFunc initFunc(RegisterPresetsWidgets);
diff --git a/soh/soh/Enhancements/Presets/Presets.h b/soh/soh/Enhancements/Presets/Presets.h
new file mode 100644
index 0000000000..5edb265a3e
--- /dev/null
+++ b/soh/soh/Enhancements/Presets/Presets.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+enum PresetSection {
+    PRESET_SECTION_SETTINGS,
+    PRESET_SECTION_ENHANCEMENTS,
+    PRESET_SECTION_AUDIO,
+    PRESET_SECTION_COSMETICS,
+    PRESET_SECTION_RANDOMIZER,
+    PRESET_SECTION_TRACKERS,
+    PRESET_SECTION_NETWORK,
+    PRESET_SECTION_MAX,
+};
+
+void DrawPresetSelector(std::vector<PresetSection> includeSections, std::string currentIndex, bool disabled);
+void applyPreset(std::string presetName, std::vector<PresetSection> includeSections = {});
diff --git a/soh/soh/Enhancements/QoL/DaytimeGS.cpp b/soh/soh/Enhancements/QoL/DaytimeGS.cpp
new file mode 100644
index 0000000000..869945cb53
--- /dev/null
+++ b/soh/soh/Enhancements/QoL/DaytimeGS.cpp
@@ -0,0 +1,70 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "functions.h"
+#include "macros.h"
+
+extern "C" {
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
+}
+
+static constexpr int32_t CVAR_DAYTIME_GS_DEFAULT = 0;
+#define CVAR_DAYTIME_GS_NAME CVAR_ENHANCEMENT("NightGSAlwaysSpawn")
+#define CVAR_DAYTIME_GS_VALUE CVarGetInteger(CVAR_DAYTIME_GS_NAME, CVAR_DAYTIME_GS_DEFAULT)
+
+struct DayTimeGoldSkulltulas {
+    uint16_t scene;
+    uint16_t room;
+    bool forChild;
+    std::vector<ActorEntry> actorEntries;
+};
+
+using DayTimeGoldSkulltulasList = std::vector<DayTimeGoldSkulltulas>;
+
+void OnSpawnNighttimeGoldSkulltula() {
+    // Gold Skulltulas that are not part of the scene actor list during the day
+    // Actor values copied from the night time scene actor list
+    static const DayTimeGoldSkulltulasList dayTimeGoldSkulltulas = {
+        // Graveyard
+        { SCENE_GRAVEYARD, 1, true, { { ACTOR_EN_SW, { 156, 315, 795 }, { 16384, -32768, 0 }, -20096 } } },
+        // ZF
+        { SCENE_ZORAS_FOUNTAIN, 0, true, { { ACTOR_EN_SW, { -1891, 187, 1911 }, { 16384, 18022, 0 }, -19964 } } },
+        // GF
+        { SCENE_GERUDOS_FORTRESS, 0, false, { { ACTOR_EN_SW, { 1598, 999, -2008 }, { 16384, -16384, 0 }, -19198 } } },
+        { SCENE_GERUDOS_FORTRESS, 1, false, { { ACTOR_EN_SW, { 3377, 1734, -4935 }, { 16384, 0, 0 }, -19199 } } },
+        // Kak
+        { SCENE_KAKARIKO_VILLAGE, 0, false, { { ACTOR_EN_SW, { -18, 540, 1800 }, { 0, -32768, 0 }, -20160 } } },
+        { SCENE_KAKARIKO_VILLAGE,
+          0,
+          true,
+          { { ACTOR_EN_SW, { -465, 377, -888 }, { 0, 28217, 0 }, -20222 },
+            { ACTOR_EN_SW, { 5, 686, -171 }, { 0, -32768, 0 }, -20220 },
+            { ACTOR_EN_SW, { 324, 270, 905 }, { 16384, 0, 0 }, -20216 },
+            { ACTOR_EN_SW, { -602, 120, 1120 }, { 16384, 0, 0 }, -20208 } } },
+        // LLR
+        { SCENE_LON_LON_RANCH,
+          0,
+          true,
+          { { ACTOR_EN_SW, { -2344, 180, 672 }, { 16384, 22938, 0 }, -29695 },
+            { ACTOR_EN_SW, { 808, 48, 326 }, { 16384, 0, 0 }, -29694 },
+            { ACTOR_EN_SW, { 997, 286, -2698 }, { 16384, -16384, 0 }, -29692 } } },
+    };
+
+    for (const auto& dayTimeGS : dayTimeGoldSkulltulas) {
+        if (IS_DAY && dayTimeGS.forChild == LINK_IS_CHILD && dayTimeGS.scene == gPlayState->sceneNum &&
+            dayTimeGS.room == gPlayState->roomCtx.curRoom.num) {
+            for (const auto& actorEntry : dayTimeGS.actorEntries) {
+                Actor_Spawn(&gPlayState->actorCtx, gPlayState, actorEntry.id, actorEntry.pos.x, actorEntry.pos.y,
+                            actorEntry.pos.z, actorEntry.rot.x, actorEntry.rot.y, actorEntry.rot.z, actorEntry.params,
+                            false);
+            }
+        }
+    }
+}
+
+void RegisterDaytimeGoldSkultullas() {
+    COND_HOOK(OnSceneSpawnActors, CVAR_DAYTIME_GS_VALUE, OnSpawnNighttimeGoldSkulltula);
+}
+
+static RegisterShipInitFunc initFunc_DaytimeGoldSkulltulas(RegisterDaytimeGoldSkultullas, { CVAR_DAYTIME_GS_NAME });
diff --git a/soh/soh/Enhancements/RebottleBlueFire.cpp b/soh/soh/Enhancements/RebottleBlueFire.cpp
new file mode 100644
index 0000000000..8ca11e4e62
--- /dev/null
+++ b/soh/soh/Enhancements/RebottleBlueFire.cpp
@@ -0,0 +1,25 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h"
+void EnIceHono_CapturableFlame(EnIceHono* thisx, PlayState* play);
+u32 EnIceHono_InBottleRange(EnIceHono* thisx, PlayState* play);
+}
+
+extern PlayState* gPlayState;
+
+void OnEnIceHonoUpdate(void* actor) {
+    EnIceHono* thisx = (EnIceHono*)actor;
+    if (thisx->actionFunc != EnIceHono_CapturableFlame && EnIceHono_InBottleRange(thisx, gPlayState)) {
+        // GI_MAX in this case allows the player to catch the actor in a bottle
+        Actor_OfferGetItem(&thisx->actor, gPlayState, GI_MAX, 60.0f, 100.0f);
+    }
+}
+
+void RegisterRebottleBlueFire() {
+    COND_ID_HOOK(OnActorUpdate, ACTOR_EN_ICE_HONO, CVarGetInteger(CVAR_ENHANCEMENT("RebottleBlueFire"), 0),
+                 OnEnIceHonoUpdate);
+}
+
+static RegisterShipInitFunc initFunc(RegisterRebottleBlueFire, { CVAR_ENHANCEMENT("RebottleBlueFire") });
\ No newline at end of file
diff --git a/soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp b/soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp
index 20beb193a2..9658170301 100644
--- a/soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp
+++ b/soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp
@@ -10,6 +10,12 @@ void Custom_EnMThunder_Update(Actor* thisx, PlayState* play) {
     f32 blueRadius;
     s32 redGreen;
 
+    // If thunder effect doesn't exist (aka player doesn't have magic),
+    // don't do anything.
+    if (enMThunder->actionFunc == nullptr) {
+        return;
+    }
+
     enMThunder->actionFunc(enMThunder, play);
     // don't call this part, it's what makes the spin attack darkness happen
     // func_80A9F314(play, this->unk_1BC);
@@ -27,10 +33,13 @@ void OnEnMThunderInitReplaceUpdateWithCustom(void* thunder) {
 
 #define CVAR_REMOVESPINATTACKDARKNESS_NAME CVAR_ENHANCEMENT("RemoveSpinAttackDarkness")
 #define CVAR_REMOVESPINATTACKDARKNESS_DEFAULT 0
-#define CVAR_REMOVESPINATTACKDARKNESS_VALUE CVarGetInteger(CVAR_REMOVESPINATTACKDARKNESS_NAME, CVAR_REMOVESPINATTACKDARKNESS_DEFAULT)
+#define CVAR_REMOVESPINATTACKDARKNESS_VALUE \
+    CVarGetInteger(CVAR_REMOVESPINATTACKDARKNESS_NAME, CVAR_REMOVESPINATTACKDARKNESS_DEFAULT)
 
 void RegisterCustomEnMThunderUpdate() {
-    COND_ID_HOOK(OnActorInit, ACTOR_EN_M_THUNDER, CVAR_REMOVESPINATTACKDARKNESS_VALUE != CVAR_REMOVESPINATTACKDARKNESS_DEFAULT, OnEnMThunderInitReplaceUpdateWithCustom);
+    COND_ID_HOOK(OnActorInit, ACTOR_EN_M_THUNDER,
+                 CVAR_REMOVESPINATTACKDARKNESS_VALUE != CVAR_REMOVESPINATTACKDARKNESS_DEFAULT,
+                 OnEnMThunderInitReplaceUpdateWithCustom);
 }
 
 static RegisterShipInitFunc initFunc(RegisterCustomEnMThunderUpdate, { CVAR_REMOVESPINATTACKDARKNESS_NAME });
diff --git a/soh/soh/Enhancements/Restorations/BottleAdventure.cpp b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp
new file mode 100644
index 0000000000..22cc74e679
--- /dev/null
+++ b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp
@@ -0,0 +1,481 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "variables.h"
+}
+
+// gSaveContext.inventory.items
+void HandleBAInventoryItems() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.items[itemOnCRight];
+}
+
+void HandleRBAInventoryItems(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.inventory.items[itemOnCRight] = itemToPutInBottle;
+}
+
+// gSaveContext.inventory.ammo
+void HandleBAInventoryAmmo() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.ammo[itemOnCRight - ITEM_FAIRY];
+}
+
+void HandleRBAInventoryAmmo(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.inventory.ammo[itemOnCRight - ITEM_FAIRY] = itemToPutInBottle;
+}
+
+// gSaveContext.inventory.equipment
+void HandleBAInventoryEquipment() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_MASK_GORON) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.equipment >> 8) & 0xFF;
+    } else if (itemOnCRight == ITEM_MASK_ZORA) {
+        gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.equipment & 0xFF;
+    }
+}
+
+void HandleRBAInventoryEquipment(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_MASK_GORON) {
+        gSaveContext.inventory.equipment = (itemToPutInBottle << 8) | (gSaveContext.inventory.equipment & 0x00FF);
+    } else if (itemOnCRight == ITEM_MASK_ZORA) {
+        gSaveContext.inventory.equipment = itemToPutInBottle | (gSaveContext.inventory.equipment & 0xFF00);
+    }
+}
+
+// gSaveContext.inventory.upgrades
+void HandleBAInventoryUpgrades() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_SOLD_OUT) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.upgrades >> 24) & 0xFF;
+    } else if (itemOnCRight == ITEM_POCKET_EGG) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.upgrades >> 16) & 0xFF;
+    } else if (itemOnCRight == ITEM_POCKET_CUCCO) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.upgrades >> 8) & 0xFF;
+    } else if (itemOnCRight == ITEM_COJIRO) {
+        gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.upgrades & 0xFF;
+    }
+}
+
+void HandleRBAInventoryUpgrades(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_SOLD_OUT) {
+        gSaveContext.inventory.upgrades = (itemToPutInBottle << 24) | (gSaveContext.inventory.upgrades & 0x00FFFFFF);
+    } else if (itemOnCRight == ITEM_POCKET_EGG) {
+        gSaveContext.inventory.upgrades = (itemToPutInBottle << 16) | (gSaveContext.inventory.upgrades & 0xFF00FFFF);
+    } else if (itemOnCRight == ITEM_POCKET_CUCCO) {
+        gSaveContext.inventory.upgrades = (itemToPutInBottle << 8) | (gSaveContext.inventory.upgrades & 0xFFFF00FF);
+    } else if (itemOnCRight == ITEM_COJIRO) {
+        gSaveContext.inventory.upgrades = itemToPutInBottle | (gSaveContext.inventory.upgrades & 0xFFFFFF00);
+    }
+}
+
+// gSaveContext.inventory.questItems
+void HandleBAInventoryQuestItems() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_ODD_MUSHROOM) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.questItems >> 24) & 0xFF;
+    } else if (itemOnCRight == ITEM_ODD_POTION) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.questItems >> 16) & 0xFF;
+    } else if (itemOnCRight == ITEM_SAW) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.questItems >> 8) & 0xFF;
+    } else if (itemOnCRight == ITEM_SWORD_BROKEN) {
+        gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.questItems & 0xFF;
+    }
+}
+
+void HandleRBAInventoryQuestItems(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_ODD_MUSHROOM) {
+        gSaveContext.inventory.questItems =
+            (itemToPutInBottle << 24) | (gSaveContext.inventory.questItems & 0x00FFFFFF);
+    } else if (itemOnCRight == ITEM_ODD_POTION) {
+        gSaveContext.inventory.questItems =
+            (itemToPutInBottle << 16) | (gSaveContext.inventory.questItems & 0xFF00FFFF);
+    } else if (itemOnCRight == ITEM_SAW) {
+        gSaveContext.inventory.questItems = (itemToPutInBottle << 8) | (gSaveContext.inventory.questItems & 0xFFFF00FF);
+    } else if (itemOnCRight == ITEM_SWORD_BROKEN) {
+        gSaveContext.inventory.questItems = itemToPutInBottle | (gSaveContext.inventory.questItems & 0xFFFFFF00);
+    }
+}
+
+// gSaveContext.inventory.dungeonItems
+void HandleBAInventoryDungeonItems() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.dungeonItems[itemOnCRight - ITEM_PRESCRIPTION];
+}
+
+void HandleRBAInventoryDungeonItems(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.inventory.dungeonItems[itemOnCRight - ITEM_PRESCRIPTION] = itemToPutInBottle;
+}
+
+// gSaveContext.inventory.dungeonKeys
+void HandleBAInventoryDungeonKeys() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.dungeonKeys[itemOnCRight - ITEM_BULLET_BAG_40];
+}
+
+void HandleRBAInventoryDungeonKeys(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    gSaveContext.inventory.dungeonKeys[itemOnCRight - ITEM_BULLET_BAG_40] = itemToPutInBottle;
+}
+
+// gSaveContext.inventory.defenseHearts
+void HandleBAInventoryDefenseHearts() {
+    gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.defenseHearts;
+}
+
+void HandleRBAInventoryDefenseHearts(uint8_t itemToPutInBottle) {
+    gSaveContext.inventory.defenseHearts = itemToPutInBottle;
+}
+
+// gSaveContext.inventory.gsTokens
+void HandleBAInventoryGSTokens() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_SONG_SERENADE) {
+        gSaveContext.equips.buttonItems[0] = (gSaveContext.inventory.gsTokens >> 8) & 0xFF;
+    } else if (itemOnCRight == ITEM_SONG_REQUIEM) {
+        gSaveContext.equips.buttonItems[0] = gSaveContext.inventory.gsTokens & 0xFF;
+    }
+}
+
+void HandleRBAInventoryGSTokens(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight == ITEM_SONG_SERENADE) {
+        gSaveContext.inventory.gsTokens = (itemToPutInBottle << 8) | (gSaveContext.inventory.gsTokens & 0x00FF);
+    } else if (itemOnCRight == ITEM_SONG_REQUIEM) {
+        gSaveContext.inventory.gsTokens = itemToPutInBottle | (gSaveContext.inventory.gsTokens & 0xFF00);
+    }
+}
+
+// gSaveContext.sceneFlags
+void HandleBASceneFlags() {
+    // The rest of the items fall into the saved scene flags. Let's calculate the scene and which field it pulls from
+    u32 offset = gSaveContext.equips.buttonItems[3] - ITEM_SONG_LULLABY;
+    u32 scene = offset / sizeof(SavedSceneFlags);
+    switch (offset % sizeof(SavedSceneFlags)) {
+        case 0:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].chest >> 24) & 0xFF;
+            break;
+        case 1:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].chest >> 16) & 0xFF;
+            break;
+        case 2:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].chest >> 8) & 0xFF;
+            break;
+        case 3:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].chest & 0xFF;
+            break;
+        case 4:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].swch >> 24) & 0xFF;
+            break;
+        case 5:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].swch >> 16) & 0xFF;
+            break;
+        case 6:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].swch >> 8) & 0xFF;
+            break;
+        case 7:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].swch & 0xFF;
+            break;
+        case 8:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].clear >> 24) & 0xFF;
+            break;
+        case 9:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].clear >> 16) & 0xFF;
+            break;
+        case 10:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].clear >> 8) & 0xFF;
+            break;
+        case 11:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].clear & 0xFF;
+            break;
+        case 12:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].collect >> 24) & 0xFF;
+            break;
+        case 13:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].collect >> 16) & 0xFF;
+            break;
+        case 14:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].collect >> 8) & 0xFF;
+            break;
+        case 15:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].collect & 0xFF;
+            break;
+        case 16:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].unk >> 24) & 0xFF;
+            break;
+        case 17:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].unk >> 16) & 0xFF;
+            break;
+        case 18:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].unk >> 8) & 0xFF;
+            break;
+        case 19:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].unk & 0xFF;
+            break;
+        case 20:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].rooms >> 24) & 0xFF;
+            break;
+        case 21:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].rooms >> 16) & 0xFF;
+            break;
+        case 22:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].rooms >> 8) & 0xFF;
+            break;
+        case 23:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].rooms & 0xFF;
+            break;
+        case 24:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].floors >> 24) & 0xFF;
+            break;
+        case 25:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].floors >> 16) & 0xFF;
+            break;
+        case 26:
+            gSaveContext.equips.buttonItems[0] = (gSaveContext.sceneFlags[scene].floors >> 8) & 0xFF;
+            break;
+        case 27:
+            gSaveContext.equips.buttonItems[0] = gSaveContext.sceneFlags[scene].floors & 0xFF;
+            break;
+    }
+}
+
+void HandleRBASceneFlags(uint8_t itemToPutInBottle) {
+    // The rest of the items fall into the saved scene flags. Let's calculate the scene and which field it sets
+    u32 offset = gSaveContext.equips.buttonItems[3] - ITEM_SONG_LULLABY;
+    u32 scene = offset / sizeof(SavedSceneFlags);
+    switch (offset % sizeof(SavedSceneFlags)) {
+        case 0:
+            gSaveContext.sceneFlags[scene].chest =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].chest & 0x00FFFFFF);
+            break;
+        case 1:
+            gSaveContext.sceneFlags[scene].chest =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].chest & 0xFF00FFFF);
+            break;
+        case 2:
+            gSaveContext.sceneFlags[scene].chest =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].chest & 0xFFFF00FF);
+            break;
+        case 3:
+            gSaveContext.sceneFlags[scene].chest =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].chest & 0xFFFFFF00);
+            break;
+        case 4:
+            gSaveContext.sceneFlags[scene].swch =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].swch & 0x00FFFFFF);
+            break;
+        case 5:
+            gSaveContext.sceneFlags[scene].swch =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].swch & 0xFF00FFFF);
+            break;
+        case 6:
+            gSaveContext.sceneFlags[scene].swch =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].swch & 0xFFFF00FF);
+            break;
+        case 7:
+            gSaveContext.sceneFlags[scene].swch =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].swch & 0xFFFFFF00);
+            break;
+        case 8:
+            gSaveContext.sceneFlags[scene].clear =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].clear & 0x00FFFFFF);
+            break;
+        case 9:
+            gSaveContext.sceneFlags[scene].clear =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].clear & 0xFF00FFFF);
+            break;
+        case 10:
+            gSaveContext.sceneFlags[scene].clear =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].clear & 0xFFFF00FF);
+            break;
+        case 11:
+            gSaveContext.sceneFlags[scene].clear =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].clear & 0xFFFFFF00);
+            break;
+        case 12:
+            gSaveContext.sceneFlags[scene].collect =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].collect & 0x00FFFFFF);
+            break;
+        case 13:
+            gSaveContext.sceneFlags[scene].collect =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].collect & 0xFF00FFFF);
+            break;
+        case 14:
+            gSaveContext.sceneFlags[scene].collect =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].collect & 0xFFFF00FF);
+            break;
+        case 15:
+            gSaveContext.sceneFlags[scene].collect =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].collect & 0xFFFFFF00);
+            break;
+        case 16:
+            gSaveContext.sceneFlags[scene].unk =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].unk & 0x00FFFFFF);
+            break;
+        case 17:
+            gSaveContext.sceneFlags[scene].unk =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].unk & 0xFF00FFFF);
+            break;
+        case 18:
+            gSaveContext.sceneFlags[scene].unk =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].unk & 0xFFFF00FF);
+            break;
+        case 19:
+            gSaveContext.sceneFlags[scene].unk = itemToPutInBottle | (gSaveContext.sceneFlags[scene].unk & 0xFFFFFF00);
+            break;
+        case 20:
+            gSaveContext.sceneFlags[scene].rooms =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].rooms & 0x00FFFFFF);
+            break;
+        case 21:
+            gSaveContext.sceneFlags[scene].rooms =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].rooms & 0xFF00FFFF);
+            break;
+        case 22:
+            gSaveContext.sceneFlags[scene].rooms =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].rooms & 0xFFFF00FF);
+            break;
+        case 23:
+            gSaveContext.sceneFlags[scene].rooms =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].rooms & 0xFFFFFF00);
+            break;
+        case 24:
+            gSaveContext.sceneFlags[scene].floors =
+                (itemToPutInBottle << 24) | (gSaveContext.sceneFlags[scene].floors & 0x00FFFFFF);
+            break;
+        case 25:
+            gSaveContext.sceneFlags[scene].floors =
+                (itemToPutInBottle << 16) | (gSaveContext.sceneFlags[scene].floors & 0xFF00FFFF);
+            break;
+        case 26:
+            gSaveContext.sceneFlags[scene].floors =
+                (itemToPutInBottle << 8) | (gSaveContext.sceneFlags[scene].floors & 0xFFFF00FF);
+            break;
+        case 27:
+            gSaveContext.sceneFlags[scene].floors =
+                itemToPutInBottle | (gSaveContext.sceneFlags[scene].floors & 0xFFFFFF00);
+            break;
+    }
+}
+
+// padding bytes
+void HandleBAPaddingBytes() {
+    // Reading from padding bytes is not implemented
+    gSaveContext.equips.buttonItems[0] = 0;
+}
+
+void HandleRBAPaddingBytes() {
+    // Writing to padding bytes is not implemented
+}
+
+// Bottle Adventure
+void DoBA() {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight >= ITEM_STICK && itemOnCRight <= ITEM_POTION_BLUE) {
+        HandleBAInventoryItems();
+    } else if (itemOnCRight >= ITEM_FAIRY && itemOnCRight <= ITEM_MASK_BUNNY) {
+        HandleBAInventoryAmmo();
+    } else if (itemOnCRight == ITEM_MASK_GORON || itemOnCRight == ITEM_MASK_ZORA) {
+        HandleBAInventoryEquipment();
+    } else if (itemOnCRight == ITEM_MASK_GERUDO || itemOnCRight == ITEM_MASK_TRUTH) {
+        HandleBAPaddingBytes();
+    } else if (itemOnCRight >= ITEM_SOLD_OUT && itemOnCRight <= ITEM_COJIRO) {
+        HandleBAInventoryUpgrades();
+    } else if (itemOnCRight >= ITEM_ODD_MUSHROOM && itemOnCRight <= ITEM_SWORD_BROKEN) {
+        HandleBAInventoryQuestItems();
+    } else if (itemOnCRight >= ITEM_PRESCRIPTION && itemOnCRight <= ITEM_BULLET_BAG_30) {
+        HandleBAInventoryDungeonItems();
+    } else if (itemOnCRight >= ITEM_BULLET_BAG_40 && itemOnCRight <= ITEM_SWORD_KNIFE) {
+        HandleBAInventoryDungeonKeys();
+    } else if (itemOnCRight == ITEM_SONG_BOLERO) {
+        HandleBAInventoryDefenseHearts();
+    } else if (itemOnCRight == ITEM_SONG_SERENADE || itemOnCRight == ITEM_SONG_REQUIEM) {
+        HandleBAInventoryGSTokens();
+    } else if (itemOnCRight == ITEM_SONG_NOCTURNE || itemOnCRight == ITEM_SONG_PRELUDE) {
+        HandleBAPaddingBytes();
+    } else if (itemOnCRight >= ITEM_SONG_LULLABY) {
+        HandleBASceneFlags();
+    }
+}
+
+// Reverse Bottle Adventure
+void DoRBA(uint8_t itemToPutInBottle) {
+    auto itemOnCRight = gSaveContext.equips.buttonItems[3];
+
+    if (itemOnCRight >= ITEM_STICK && itemOnCRight <= ITEM_POTION_BLUE) {
+        HandleRBAInventoryItems(itemToPutInBottle);
+    } else if (itemOnCRight >= ITEM_FAIRY && itemOnCRight <= ITEM_MASK_BUNNY) {
+        HandleRBAInventoryAmmo(itemToPutInBottle);
+    } else if (itemOnCRight == ITEM_MASK_GORON || itemOnCRight == ITEM_MASK_ZORA) {
+        HandleRBAInventoryEquipment(itemToPutInBottle);
+    } else if (itemOnCRight == ITEM_MASK_GERUDO || itemOnCRight == ITEM_MASK_TRUTH) {
+        HandleRBAPaddingBytes();
+    } else if (itemOnCRight >= ITEM_SOLD_OUT && itemOnCRight <= ITEM_COJIRO) {
+        HandleRBAInventoryUpgrades(itemToPutInBottle);
+    } else if (itemOnCRight >= ITEM_ODD_MUSHROOM && itemOnCRight <= ITEM_SWORD_BROKEN) {
+        HandleRBAInventoryQuestItems(itemToPutInBottle);
+    } else if (itemOnCRight >= ITEM_PRESCRIPTION && itemOnCRight <= ITEM_BULLET_BAG_30) {
+        HandleRBAInventoryDungeonItems(itemToPutInBottle);
+    } else if (itemOnCRight >= ITEM_BULLET_BAG_40 && itemOnCRight <= ITEM_SWORD_KNIFE) {
+        HandleRBAInventoryDungeonKeys(itemToPutInBottle);
+    } else if (itemOnCRight == ITEM_SONG_BOLERO) {
+        HandleRBAInventoryDefenseHearts(itemToPutInBottle);
+    } else if (itemOnCRight == ITEM_SONG_SERENADE || itemOnCRight == ITEM_SONG_REQUIEM) {
+        HandleRBAInventoryGSTokens(itemToPutInBottle);
+    } else if (itemOnCRight == ITEM_SONG_NOCTURNE || itemOnCRight == ITEM_SONG_PRELUDE) {
+        HandleRBAPaddingBytes();
+    } else if (itemOnCRight >= ITEM_SONG_LULLABY) {
+        HandleRBASceneFlags(itemToPutInBottle);
+    }
+}
+
+void RegisterBottleAdventure() {
+    REGISTER_VB_SHOULD(VB_SET_BUTTON_ITEM_FROM_C_BUTTON_SLOT, {
+        // if we aren't dealing with the b button, early return
+        auto button = static_cast<int16_t>(va_arg(args, int32_t));
+        if (button != 0) {
+            return;
+        }
+
+        *should = false;
+        DoBA();
+    });
+
+    REGISTER_VB_SHOULD(VB_UPDATE_BOTTLE_ITEM, {
+        // if we aren't dealing with a bottle on b, early return
+        auto buttonBottleIsOn = static_cast<uint8_t>(va_arg(args, int32_t));
+        if (buttonBottleIsOn != 0) {
+            return;
+        }
+
+        *should = false;
+
+        auto itemToPutInBottle = static_cast<uint8_t>(va_arg(args, int32_t));
+        DoRBA(itemToPutInBottle);
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterBottleAdventure);
diff --git a/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp b/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
new file mode 100644
index 0000000000..0e6b1cbf38
--- /dev/null
+++ b/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
@@ -0,0 +1,170 @@
+#include "public/bridge/consolevariablebridge.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+#include <vector>
+#include <spdlog/spdlog.h>
+
+#include "WeirdAnimation.h"
+
+extern "C" {
+#include "macros.h"
+#include "z64player.h"
+
+#include "objects/gameplay_keep/gameplay_keep.h"
+
+int ResourceMgr_OTRSigCheck(char* imgData);
+AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path);
+}
+
+#define CVAR_NAME CVAR_ENHANCEMENT("N64WeirdFrames")
+#define CVAR_DEFAULT 0
+#define CVAR_VALUE CVarGetInteger(CVAR_NAME, CVAR_DEFAULT)
+
+// A list of weird animations to contruct. These can either be an index out of bounds before
+// the start of the animation or past the end of it. In either case you add a list of animations'
+// data that are neighboring before or after the target animation. If more weird frame data is
+// required then add more of the neighboring animations in ROM.
+static std::vector<WeirdAnimation> weirdAnimations{
+    // For weirdshots.
+    { gPlayerAnim_link_bow_side_walk,
+      PLAYER_LIMB_MAX,
+      IndexDirection::BACKWARD,
+      {
+          "__OTR__misc/link_animetion/gPlayerAnimData_0940E0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_096370",
+          "__OTR__misc/link_animetion/gPlayerAnimData_096610",
+          "__OTR__misc/link_animetion/gPlayerAnimData_097650",
+          "__OTR__misc/link_animetion/gPlayerAnimData_097FC0",
+      } },
+    // For weirdslides.
+    { gPlayerAnim_link_normal_side_walk,
+      PLAYER_LIMB_MAX,
+      IndexDirection::BACKWARD,
+      {
+          "__OTR__misc/link_animetion/gPlayerAnimData_1AFDD0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B0E10",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B1910",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B20F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B25B0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B2B80",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B3600",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B4080",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B4B00",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B51D0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B5BD0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B6C10",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B72E0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B7B40",
+      } },
+    // For weirdslides.
+    { gPlayerAnim_link_normal_side_walk,
+      PLAYER_LIMB_MAX,
+      IndexDirection::FORWARD,
+      {
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B92D0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B9B30",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BA390",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BB2C0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BC6B0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BCA60",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BDC30",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BE410",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BF6F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C01F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C0CF0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C1230",
+      } },
+    // For weirdslides.
+    { gPlayerAnim_link_normal_side_walk_free,
+      PLAYER_LIMB_MAX,
+      IndexDirection::BACKWARD,
+      {
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B1910",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B20F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B25B0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B2B80",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B3600",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B4080",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B4B00",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B51D0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B5BD0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B6C10",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B72E0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B7B40",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B83A0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B92D0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1B9B30",
+      } },
+    // For weirdslides.
+    { gPlayerAnim_link_normal_side_walk_free,
+      PLAYER_LIMB_MAX,
+      IndexDirection::FORWARD,
+      {
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BB2C0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BC6B0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BCA60",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BDC30",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BE410",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1BF6F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C01F0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C0CF0",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C1230",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C1C30",
+          "__OTR__misc/link_animetion/gPlayerAnimData_1C2630",
+      } },
+};
+
+void RegisterN64WeirdFrames() {
+    COND_VB_SHOULD(VB_LOAD_PLAYER_ANIMATION_FRAME, CVAR_VALUE, {
+        const auto entry = va_arg(args, AnimationEntry*);
+        if (entry == nullptr) {
+            return;
+        }
+
+        auto animation = va_arg(args, LinkAnimationHeader*);
+        auto frame = va_arg(args, s32);
+        const auto limbCount = va_arg(args, s32);
+        const auto frameTable = va_arg(args, Vec3s*);
+
+        std::optional<const char*> animationName;
+
+        if (ResourceMgr_OTRSigCheck(reinterpret_cast<char*>(animation)) != 0) {
+            animationName = reinterpret_cast<const char*>(animation);
+            animation = reinterpret_cast<LinkAnimationHeader*>(ResourceMgr_LoadAnimByName(*animationName));
+        }
+
+        const auto playerAnimHeader =
+            static_cast<LinkAnimationHeader*>(SEGMENTED_TO_VIRTUAL(static_cast<void*>(animation)));
+
+        if (frame < 0 || frame >= playerAnimHeader->common.frameCount) {
+            const auto direction = frame < 0 ? IndexDirection::BACKWARD : IndexDirection::FORWARD;
+
+            if (animationName.has_value()) {
+                for (auto& weirdAnimation : weirdAnimations) {
+                    if (weirdAnimation.GetDirection() == direction &&
+                        weirdAnimation.GetTargetAnimation() == *animationName) {
+                        if (const auto frameData = weirdAnimation.GetFrame(frame, playerAnimHeader->common.frameCount);
+                            frameData != nullptr) {
+                            *should = false;
+
+                            SPDLOG_DEBUG("Weird animation for \"{}\": frame {}", weirdAnimation.GetTargetAnimation(),
+                                         frame);
+                            std::memcpy(frameTable, frameData, sizeof(Vec3s) * limbCount + sizeof(s16));
+                        } else {
+                            SPDLOG_WARN("Weird Frame {} not included in weird animation for \"{}\"", frame,
+                                        weirdAnimation.GetTargetAnimation());
+                        }
+
+                        return;
+                    }
+                }
+            }
+
+            SPDLOG_WARN("Weird Animation not present for \"{}\" but frame {} is out of bounds",
+                        animationName.has_value() ? *animationName : "<null>", frame);
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterN64WeirdFrames, { CVAR_NAME });
diff --git a/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
new file mode 100644
index 0000000000..bd812c658a
--- /dev/null
+++ b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
@@ -0,0 +1,65 @@
+#include "WeirdAnimation.h"
+
+#include "resource/ResourceManager.h"
+#include "Context.h"
+
+#include <cassert>
+#include <cstring>
+#include <spdlog/spdlog.h>
+
+extern "C" {
+#include "z64math.h"
+}
+
+const void* WeirdAnimation::GetFrame(s32 frame, s32 targetAnimationFrameCount) {
+    if (!animationData.has_value()) {
+        Build();
+    }
+
+    if (direction == IndexDirection::BACKWARD) {
+        const auto frameData = std::end(*animationData) + (((sizeof(Vec3s) * limbCount + sizeof(s16)) * frame));
+
+        return frameData >= std::begin(*animationData) ? &*frameData : nullptr;
+    } else if (direction == IndexDirection::FORWARD) {
+        const auto frameData = std::begin(*animationData) +
+                               (((sizeof(Vec3s) * limbCount + sizeof(s16)) * (frame - targetAnimationFrameCount)));
+
+        return frameData < std::end(*animationData) ? &*frameData : nullptr;
+    } else {
+        SPDLOG_ERROR("Expected valid IndexDirection, got: {}", static_cast<int>(direction));
+        assert(false);
+        return nullptr;
+    }
+}
+
+void WeirdAnimation::Build() {
+    auto& animation = animationData.emplace();
+
+    for (const auto& neighborName : neighborAnimations) {
+        const auto neighbor = Ship::Context::GetInstance()->GetResourceManager()->LoadResource(neighborName);
+
+        const auto prevSize = animation.size();
+        animation.resize(prevSize + neighbor->GetPointerSize());
+        std::memcpy(animation.data() + prevSize, neighbor->GetRawPointer(), neighbor->GetPointerSize());
+
+        // Animation data in ROM is padded to 0x10 bytes. Align the buffer the same way.
+        animation.resize((animation.size() + 0xF) & ~0xF);
+    }
+
+    const auto frameCount = animation.size() / (sizeof(Vec3s) * limbCount + sizeof(s16));
+    const auto directionStr = [this] {
+        switch (direction) {
+            case IndexDirection::BACKWARD:
+                return "backward";
+            case IndexDirection::FORWARD:
+                return "forward";
+            default:
+                SPDLOG_ERROR("Expected valid IndexDirection, got: {}", static_cast<int>(direction));
+                assert(false);
+                return "???";
+        }
+    }();
+
+    SPDLOG_DEBUG("Weird animation built for \"{}\": frameCount = {}, direction = {}", targetAnimation, frameCount,
+                 directionStr);
+}
diff --git a/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.h b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.h
new file mode 100644
index 0000000000..e8c3537200
--- /dev/null
+++ b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <libultraship/libultra/types.h>
+
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
+enum class IndexDirection {
+    BACKWARD,
+    FORWARD,
+};
+
+class WeirdAnimation {
+  public:
+    WeirdAnimation(std::string targetAnimation, s32 limbCount, IndexDirection direction,
+                   std::vector<std::string> neighborAnimations)
+        : targetAnimation(std::move(targetAnimation)), limbCount(limbCount), direction(direction),
+          neighborAnimations(std::move(neighborAnimations)) {
+    }
+
+    const std::string& GetTargetAnimation() {
+        return targetAnimation;
+    }
+
+    IndexDirection GetDirection() {
+        return direction;
+    }
+
+    const void* GetFrame(s32 frame, s32 targetAnimationFrameCount);
+
+  private:
+    std::string targetAnimation;
+    s32 limbCount;
+    IndexDirection direction;
+    std::vector<std::string> neighborAnimations;
+
+    std::optional<std::vector<std::byte>> animationData;
+
+    void Build();
+};
diff --git a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
index 373d481ef9..090c46a60e 100644
--- a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
+++ b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
@@ -31,8 +31,9 @@ void RegisterPauseBufferInputs() {
     COND_VB_SHOULD(VB_KALEIDO_UNPAUSE_CLOSE, CVAR_BUFFER_VALUE || CVAR_INCLUDE_VALUE, {
         Input* input = &gPlayState->state.input[0];
 
-        // STEP #3: If the user opts to include held inputs in the buffer window, store the currnently held inputs, minus 
-        // the held inputs when the pause menu was opened. This only applies to the first frame of the buffer window
+        // STEP #3: If the user opts to include held inputs in the buffer window, store the currnently held inputs,
+        // minus the held inputs when the pause menu was opened. This only applies to the first frame of the buffer
+        // window
         if (CVAR_INCLUDE_VALUE && inputBufferTimer == 0) {
             pauseInputs |= input->cur.button & ~prePauseInputs;
             prePauseInputs = 0;
@@ -56,16 +57,15 @@ void RegisterPauseBufferInputs() {
         Input* input = &gPlayState->state.input[0];
         PauseContext* pauseCtx = &gPlayState->pauseCtx;
 
-        // STEP #1: If the user opts to include held inputs in the buffer window, store the held inputs at the beginning 
+        // STEP #1: If the user opts to include held inputs in the buffer window, store the held inputs at the beginning
         // of the pause process, minus the START input
         if (pauseCtx->state == PAUSE_STATE_OPENING_1 && CVAR_INCLUDE_VALUE) {
             prePauseInputs = input->cur.button & ~BTN_START;
         }
 
         // STEP #2: The unpause process has begun, so let's reset the input buffer timer
-        if (pauseCtx->state == PAUSE_STATE_UNPAUSE_SETUP || (
-            pauseCtx->state == PAUSE_STATE_SAVEPROMPT && (pauseCtx->unk_1EC == 2 || pauseCtx->unk_1EC == 5)
-        )) {
+        if (pauseCtx->state == PAUSE_STATE_UNPAUSE_SETUP ||
+            (pauseCtx->state == PAUSE_STATE_SAVEPROMPT && (pauseCtx->unk_1EC == 2 || pauseCtx->unk_1EC == 5))) {
             inputBufferTimer = 0;
         }
 
diff --git a/soh/soh/Enhancements/SkipAmyPuzzle.cpp b/soh/soh/Enhancements/SkipAmyPuzzle.cpp
new file mode 100644
index 0000000000..27486e04cd
--- /dev/null
+++ b/soh/soh/Enhancements/SkipAmyPuzzle.cpp
@@ -0,0 +1,8 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+void RegisterSkipAmyPuzzle() {
+    COND_VB_SHOULD(VB_AMY_SOLVE, CVarGetInteger(CVAR_ENHANCEMENT("SkipAmyPuzzle"), 0), { *should = true; });
+}
+
+static RegisterShipInitFunc initFunc(RegisterSkipAmyPuzzle, { CVAR_ENHANCEMENT("SkipAmyPuzzle") });
\ No newline at end of file
diff --git a/soh/soh/Enhancements/SwitchTimerMultiplier.cpp b/soh/soh/Enhancements/SwitchTimerMultiplier.cpp
new file mode 100644
index 0000000000..94982837d8
--- /dev/null
+++ b/soh/soh/Enhancements/SwitchTimerMultiplier.cpp
@@ -0,0 +1,29 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+extern PlayState* gPlayState;
+}
+
+void RegisterSwitchTimerMultiplier() {
+    COND_VB_SHOULD(VB_SWITCH_TIMER_TICK, CVarGetInteger(CVAR_ENHANCEMENT("SwitchTimerMultiplier"), 0) != 0, {
+        int multiplier = CVarGetInteger(CVAR_ENHANCEMENT("SwitchTimerMultiplier"), 0);
+        if (multiplier != 0) {
+            Actor* actor = va_arg(args, Actor*);
+            if (multiplier < -3 && actor->id == ACTOR_OBJ_SYOKUDAI) {
+                multiplier = -3;
+            } else if (multiplier < -4 && actor->id == ACTOR_BG_GND_DARKMEIRO) {
+                multiplier = -4;
+            }
+
+            if (multiplier > 0 && gPlayState->gameplayFrames % (multiplier + 1) != 0) {
+                *should = false;
+            } else if (gPlayState->gameplayFrames % (6 + multiplier) == 0) {
+                s16* timer = va_arg(args, s16*);
+                *timer -= *timer > 1;
+            }
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterSwitchTimerMultiplier, { CVAR_ENHANCEMENT("SwitchTimerMultiplier") });
diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
index 05e03dae16..8f1f0ac402 100644
--- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
+++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
@@ -37,10 +37,10 @@ const static std::vector<std::pair<std::string, const char*>> digitList = {
 };
 
 const std::vector<TimeObject> timeDisplayList = {
-    { DISPLAY_IN_GAME_TIMER, "Display Gameplay Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.InGameTimer") },
-    { DISPLAY_TIME_OF_DAY, "Display Time of Day", CVAR_ENHANCEMENT("TimeDisplay.Timers.TimeofDay") },
-    { DISPLAY_CONDITIONAL_TIMER, "Display Conditional Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.HotWater") },
-    { DISPLAY_NAVI_TIMER, "Display Navi Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.NaviTimer") }
+    { DISPLAY_IN_GAME_TIMER, "Display Gameplay Timer", CVAR_TIME_DISPLAY("Timers.InGameTimer") },
+    { DISPLAY_TIME_OF_DAY, "Display Time of Day", CVAR_TIME_DISPLAY("Timers.TimeofDay") },
+    { DISPLAY_CONDITIONAL_TIMER, "Display Conditional Timer", CVAR_TIME_DISPLAY("Timers.HotWater") },
+    { DISPLAY_NAVI_TIMER, "Display Navi Timer", CVAR_TIME_DISPLAY("Timers.NaviTimer") }
 };
 
 static std::vector<TimeObject> activeTimers;
@@ -81,7 +81,7 @@ static void TimeDisplayGetTimer(uint32_t timeID) {
     textColor = COLOR_WHITE;
 
     Player* player = GET_PLAYER(gPlayState);
-    uint32_t timer1 = gSaveContext.timer1Value;
+    uint32_t timer1 = gSaveContext.timerSeconds;
 
     switch (timeID) {
         case DISPLAY_IN_GAME_TIMER:
@@ -99,20 +99,20 @@ static void TimeDisplayGetTimer(uint32_t timeID) {
             timeDisplayTime = convertDayTime(gSaveContext.dayTime).c_str();
             break;
         case DISPLAY_CONDITIONAL_TIMER:
-            if (gSaveContext.timer1State > 0) {
-                timeDisplayTime = formatHotWaterDisplay(gSaveContext.timer1Value).c_str();
+            if (gSaveContext.timerState > 0) {
+                timeDisplayTime = formatHotWaterDisplay(gSaveContext.timerSeconds).c_str();
                 textColor =
-                    gSaveContext.timer1State <= 4
+                    gSaveContext.timerState <= 4
                         ? (gPlayState->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3 ? COLOR_LIGHT_RED
                                                                                               : COLOR_LIGHT_BLUE)
                         : COLOR_WHITE;
-                if (gSaveContext.timer1State <= 4) {
+                if (gSaveContext.timerState <= 4) {
                     textureDisplay = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
                         gPlayState->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3
                             ? itemMapping[ITEM_TUNIC_GORON].name
                             : itemMapping[ITEM_TUNIC_ZORA].name);
                 }
-                if (gSaveContext.timer1State >= 6) {
+                if (gSaveContext.timerState >= 6) {
                     textureDisplay = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
                         itemMapping[ITEM_SWORD_MASTER].name);
                 }
@@ -147,18 +147,18 @@ void TimeDisplayUpdateDisplayOptions() {
         }
     }
 
-    //if (pushBack) {
-    //    activeTimers.push_back(timeDisplayList[timeID]);
-    //} else {
-    //    uint32_t index = 0;
-    //    for (auto& check : activeTimers) {
-    //        if (check.timeID == timeID) {
-    //            activeTimers.erase(activeTimers.begin() + index);
-    //            return;
-    //        }
-    //        index++;
-    //    }
-    //}
+    // if (pushBack) {
+    //     activeTimers.push_back(timeDisplayList[timeID]);
+    // } else {
+    //     uint32_t index = 0;
+    //     for (auto& check : activeTimers) {
+    //         if (check.timeID == timeID) {
+    //             activeTimers.erase(activeTimers.begin() + index);
+    //             return;
+    //         }
+    //         index++;
+    //     }
+    // }
 }
 
 void TimeDisplayWindow::Draw() {
@@ -174,9 +174,9 @@ void TimeDisplayWindow::Draw() {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
 
     ImGui::Begin("TimerDisplay", nullptr,
-                    ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoFocusOnAppearing |
-                    ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar |
-                    ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar);
+                 ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoFocusOnAppearing |
+                     ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar |
+                     ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar);
     ImGui::SetWindowFontScale(fontScale);
     if (activeTimers.size() == 0) {
         ImGui::Text("No Enabled Timers...");
@@ -227,11 +227,11 @@ void TimeDisplayWindow::Draw() {
 }
 
 void TimeDisplayInitSettings() {
-    fontScale = CVarGetFloat(CVAR_ENHANCEMENT("TimeDisplay.FontScale"), 1.0f);
+    fontScale = CVarGetFloat(CVAR_TIME_DISPLAY("FontScale"), 1.0f);
     if (fontScale < 1.0f) {
         fontScale = 1.0f;
     }
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeDisplay.ShowWindowBG"), 0)) {
+    if (CVarGetInteger(CVAR_TIME_DISPLAY("ShowWindowBG"), 0)) {
         windowBG = ImVec4(0, 0, 0, 0);
     } else {
         windowBG = ImVec4(0, 0, 0, 0.5f);
@@ -247,13 +247,17 @@ static void TimeDisplayInitTimers() {
 }
 
 void TimeDisplayWindow::InitElement() {
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("GAMEPLAY_TIMER", gClockIconTex, ImVec4(1, 1, 1, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("DAY_TIME_TIMER", gSunIconTex, ImVec4(1, 1, 1, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NIGHT_TIME_TIMER", gMoonIconTex, ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("GAMEPLAY_TIMER", gClockIconTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("DAY_TIME_TIMER", gSunIconTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NIGHT_TIME_TIMER", gMoonIconTex,
+                                                                        ImVec4(1, 1, 1, 1));
     Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NAVI_TIMER", gNaviIconTex, ImVec4(1, 1, 1, 1));
 
     for (auto& load : digitList) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(load.first.c_str(), load.second, ImVec4(1, 1, 1, 1));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(load.first.c_str(), load.second,
+                                                                            ImVec4(1, 1, 1, 1));
     }
 
     TimeDisplayInitSettings();
diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h
index 090ac2901f..c6635b5a77 100644
--- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h
+++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h
@@ -1,32 +1,32 @@
 #include <libultraship/libultraship.h>
 
-class TimeDisplayWindow : public Ship::GuiWindow {
+class TimeDisplayWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
-    void DrawElement() override {};
+    void DrawElement() override{};
     void Draw() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
 void TimeDisplayUpdateDisplayOptions();
 void TimeDisplayInitSettings();
 
-typedef enum {
+typedef enum TimerDisplay {
     DISPLAY_IN_GAME_TIMER,
     DISPLAY_TIME_OF_DAY,
     DISPLAY_CONDITIONAL_TIMER,
-    DISPLAY_NAVI_TIMER
-};
+    DISPLAY_NAVI_TIMER,
+} TimerDisplay;
 
-typedef enum {
+typedef enum NaviTimerValues {
     NAVI_PREPARE = 600,
     NAVI_ACTIVE = 3000,
     NAVI_COOLDOWN = 25800,
     DAY_BEGINS = 17759,
     NIGHT_BEGINS = 49155
-};
+} NaviTimerValues;
 
 typedef struct {
     uint32_t timeID;
@@ -34,4 +34,4 @@ typedef struct {
     const char* timeEnable;
 } TimeObject;
 
-extern const std::vector<TimeObject> timeDisplayList;
\ No newline at end of file
+extern const std::vector<TimeObject> timeDisplayList;
diff --git a/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
new file mode 100644
index 0000000000..896f07973c
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
@@ -0,0 +1,110 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "global.h"
+
+extern "C" {
+#include "functions.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+extern PlayState* gPlayState;
+}
+
+#define CVAR_CRAWL_SPEED_NAME CVAR_ENHANCEMENT("CrawlSpeed")
+#define CVAR_CRAWL_SPEED_DEFAULT 1
+#define CVAR_CRAWL_SPEED_VALUE CVarGetInteger(CVAR_CRAWL_SPEED_NAME, CVAR_CRAWL_SPEED_DEFAULT)
+#define CVAR_GLITCH_AIDING_NAME CVAR_ENHANCEMENT("GlitchAidingCrawlspaces")
+#define CVAR_GLITCH_AIDING_DEFAULT 0
+#define CVAR_GLITCH_AIDING_VALUE CVarGetInteger(CVAR_GLITCH_AIDING_NAME, CVAR_GLITCH_AIDING_DEFAULT)
+
+extern "C" void ExitCrawlspace(Player* player, PlayState* play) {
+    LinkAnimationHeader* animExit = (LinkAnimationHeader*)gPlayerAnim_link_child_tunnel_end;
+    LinkAnimationHeader* animEnter = (LinkAnimationHeader*)gPlayerAnim_link_child_tunnel_start;
+
+    if (player->linearVelocity > 0.0f) {
+        // Leaving a crawlspace forwards
+        player->actor.shape.rot.y = player->actor.wallYaw + 0x8000;
+        LinkAnimation_Change(play, &player->skelAnime, animExit, ((CVAR_CRAWL_SPEED_VALUE + 1.0f) / 2.0f), 0.0f,
+                             Animation_GetLastFrame(animExit), ANIMMODE_ONCE, 0.0f);
+        Player_StartAnimMovement(play, player, 0x9D);
+        OnePointCutscene_Init(play, 9601, 999, NULL, MAIN_CAM);
+    } else {
+        // Leaving a crawlspace backwards
+        player->actor.shape.rot.y = player->actor.wallYaw;
+        LinkAnimation_Change(play, &player->skelAnime, animEnter, -1.0f * ((CVAR_CRAWL_SPEED_VALUE + 1.0f) / 2.0f),
+                             Animation_GetLastFrame(animEnter), 0.0f, ANIMMODE_ONCE, 0.0f);
+        Player_StartAnimMovement(play, player, 0x9D);
+        OnePointCutscene_Init(play, 9602, 999, NULL, MAIN_CAM);
+    }
+}
+
+extern "C" void ExitCrawlspaceCS(PlayState* play, Camera* csCam, int16_t actionParameters, int16_t initTimer,
+                                 CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints) {
+    s16 camCrawlTemp = CVAR_CRAWL_SPEED_VALUE;
+    s16 camCrawlTimer = initTimer / camCrawlTemp;
+
+    OnePointCutscene_SetCsCamPoints(csCam, actionParameters | 0x1000, camCrawlTimer, atPoints, eyePoints);
+}
+
+extern "C" void EnterCrawlspace(Player* player, PlayState* play) {
+    LinkAnimationHeader* anim = (LinkAnimationHeader*)gPlayerAnim_link_child_tunnel_start;
+
+    LinkAnimation_Change(play, &player->skelAnime, anim, ((CVAR_CRAWL_SPEED_VALUE + 1.0f) / 2.0f), 0.0f,
+                         Animation_GetLastFrame(anim), ANIMMODE_ONCE, 0.0f);
+}
+
+extern "C" void IncreaseCrawlSpeed(Player* player, PlayState* play) {
+    Input* sControlInput = &play->state.input[0];
+    player->linearVelocity = sControlInput->rel.stick_y * 0.03f * CVAR_CRAWL_SPEED_VALUE;
+}
+
+void CrawlSpeed_Register() {
+    bool shouldRegister = CVAR_CRAWL_SPEED_VALUE > 1;
+
+    COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT, shouldRegister, {
+        Player* player = GET_PLAYER(gPlayState);
+        bool excludeWellBackroom = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
+                                   (player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) &&
+                                   gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL;
+        bool excludeGlitchAiding = CVAR_GLITCH_AIDING_VALUE;
+        if (excludeGlitchAiding && excludeWellBackroom) {
+            *should = true;
+        } else {
+            ExitCrawlspace(player, gPlayState);
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_CRAWL_SPEED_EXIT_CS, shouldRegister, {
+        Player* player = GET_PLAYER(gPlayState);
+        Camera* csCam = va_arg(args, Camera*);
+        s16 csId = static_cast<s16>(va_arg(args, int));
+        s16 actionParameters = static_cast<s16>(va_arg(args, int));
+        s16 initTimer = static_cast<s16>(va_arg(args, int));
+        CutsceneCameraPoint* atPoints = va_arg(args, CutsceneCameraPoint*);
+        CutsceneCameraPoint* eyePoints = va_arg(args, CutsceneCameraPoint*);
+        bool excludeWellBackroom = (player->actor.world.pos.x > 950.0f) && (player->actor.world.pos.x < 1025.0f) &&
+                                   (player->actor.world.pos.z > -1510.0f) && (player->actor.world.pos.z < -1490.0f) &&
+                                   gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL;
+        bool excludeGlitchAiding = CVAR_GLITCH_AIDING_VALUE;
+        if (excludeGlitchAiding && excludeWellBackroom) {
+            *should = true;
+        } else {
+            ExitCrawlspaceCS(gPlayState, csCam, actionParameters, initTimer, atPoints, eyePoints);
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_CRAWL_SPEED_ENTER, shouldRegister, {
+        Player* player = GET_PLAYER(gPlayState);
+        EnterCrawlspace(player, gPlayState);
+        *should = false;
+    });
+
+    COND_VB_SHOULD(VB_CRAWL_SPEED_INCREASE, shouldRegister, {
+        Player* player = GET_PLAYER(gPlayState);
+        IncreaseCrawlSpeed(player, gPlayState);
+        *should = false;
+    });
+}
+
+static RegisterShipInitFunc initSpeed(CrawlSpeed_Register, { CVAR_CRAWL_SPEED_NAME });
\ No newline at end of file
diff --git a/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
new file mode 100644
index 0000000000..20011bba31
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
@@ -0,0 +1,13 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "z64save.h"
+}
+
+void RegisterFasterBeanSkulltula() {
+    COND_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0),
+                   { *should = true; });
+}
+
+static RegisterShipInitFunc initFunc(RegisterFasterBeanSkulltula, { CVAR_ENHANCEMENT("FasterBeanSkull") });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
new file mode 100644
index 0000000000..47b6b7461e
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
@@ -0,0 +1,19 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "z64save.h"
+}
+
+void RegisterFasterEmptyBottle() {
+    COND_VB_SHOULD(VB_EMPTYING_BOTTLE, CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0), {
+        Player* player = va_arg(args, Player*);
+        if (player->skelAnime.curFrame <= 60.0f) {
+            player->skelAnime.playSpeed = 3.0f;
+        } else {
+            player->skelAnime.playSpeed = 1.0f;
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterFasterEmptyBottle, { CVAR_ENHANCEMENT("FasterBottleEmpty") });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
index 73909cbdad..05a98fd808 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
@@ -1,58 +1,56 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
-#include "spdlog/spdlog.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "z64save.h"
-    #include "macros.h"
-    #include "variables.h"
-    #include "functions.h"
-    extern PlayState* gPlayState;
-    extern SaveContext gSaveContext;
+#include "z64save.h"
+#include "macros.h"
+#include "variables.h"
+#include "functions.h"
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
 }
 
+#define CVAR_BLOCKLIFT_NAME CVAR_ENHANCEMENT("FasterHeavyBlockLift")
+#define CVAR_BLOCKLIFT_VALUE CVarGetInteger(CVAR_BLOCKLIFT_NAME, 0)
+
+#define CVAR_SKIP_CUTSCENE_NAME CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint")
+#define CVAR_SKIP_CUTSCENE_VALUE CVarGetInteger(CVAR_SKIP_CUTSCENE_NAME, IS_RANDO)
+
 /**
  * This primarily handles speeding up the heavy block lifts (OGC and in the Fire Trial) but also handles skipping
  * the one point cutscene since the two options are so similar in what they do.
  */
-void FasterHeavyBlockLift_Register() {
-    REGISTER_VB_SHOULD(VB_PLAY_ONEPOINT_ACTOR_CS, {
+void RegisterFasterHeavyBlockLift() {
+    COND_VB_SHOULD(VB_PLAY_ONEPOINT_ACTOR_CS, CVAR_BLOCKLIFT_VALUE || CVAR_SKIP_CUTSCENE_VALUE, {
         Actor* actor = va_arg(args, Actor*);
 
-        if (
-            actor->id == ACTOR_BG_HEAVY_BLOCK && 
-            (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO))
-        ) {
+        if (actor->id == ACTOR_BG_HEAVY_BLOCK) {
             *should = false;
         }
     });
 
-    REGISTER_VB_SHOULD(VB_FREEZE_LINK_FOR_BLOCK_THROW, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
-            *should = false;
-        }
-    });
+    COND_VB_SHOULD(VB_FREEZE_LINK_FOR_BLOCK_THROW, CVAR_BLOCKLIFT_VALUE || CVAR_SKIP_CUTSCENE_VALUE,
+                   { *should = false; });
 
-    REGISTER_VB_SHOULD(VB_PLAY_THROW_ANIMATION, {
-        Player *player = GET_PLAYER(gPlayState);
+    COND_VB_SHOULD(VB_PLAY_THROW_ANIMATION, CVAR_BLOCKLIFT_VALUE, {
+        Player* player = GET_PLAYER(gPlayState);
         Actor* interactRangeActor = player->interactRangeActor;
         s32 interactActorId = interactRangeActor->id;
         LinkAnimationHeader* anim = va_arg(args, LinkAnimationHeader*);
 
         // Same actor is used for small and large silver rocks, use actor params to identify large ones
-        bool isLargeSilverRock = interactActorId == ACTOR_EN_ISHI && interactRangeActor->params & 1 == 1;
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0) && (isLargeSilverRock || interactActorId == ACTOR_BG_HEAVY_BLOCK)) {
+        bool isLargeSilverRock = (interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 1) == 1);
+        if (isLargeSilverRock || interactActorId == ACTOR_BG_HEAVY_BLOCK) {
             *should = false;
             LinkAnimation_PlayOnceSetSpeed(gPlayState, &player->skelAnime, anim, 5.0f);
         }
     });
 
-    REGISTER_VB_SHOULD(VB_MOVE_THROWN_ACTOR, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 0)) {
-            Actor* heldActor = va_arg(args, Actor*);
+    COND_VB_SHOULD(VB_MOVE_THROWN_ACTOR, CVAR_BLOCKLIFT_VALUE, {
+        Actor* heldActor = va_arg(args, Actor*);
 
-            heldActor->shape.rot.x -= 3510;
-        }
+        heldActor->shape.rot.x -= 3510;
     });
 }
+
+static RegisterShipInitFunc initFunc(RegisterFasterHeavyBlockLift, { CVAR_BLOCKLIFT_NAME, CVAR_SKIP_CUTSCENE_NAME });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterPauseMenu.cpp b/soh/soh/Enhancements/TimeSavers/FasterPauseMenu.cpp
new file mode 100644
index 0000000000..d9f23216de
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/FasterPauseMenu.cpp
@@ -0,0 +1,35 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "variables.h"
+extern PlayState* gPlayState;
+extern void func_808237B4(PlayState* play, Input* input);
+}
+
+#define CVAR_FASTER_PAUSE_MENU_NAME CVAR_ENHANCEMENT("FasterPauseMenu")
+#define CVAR_FASTER_PAUSE_MENU_VALUE CVarGetInteger(CVAR_FASTER_PAUSE_MENU_NAME, 0)
+
+void OnKaleidoUpdateFaster() {
+    ZREG(46) = 2; // pauseCtx->eye and pauseCtx->unk_1EA multiply by this for animation. Double the default value.
+    WREG(6) = 4;  // Numerous kaleido animations divide by this for movement and alpha. Half the default value.
+
+    // Page turn animation is governed by func_808237B4. Those values don't use registers to modify the speed, so we
+    // just directly call it twice to effectively double the speed.
+    if (gPlayState->pauseCtx.state == 6 && gPlayState->pauseCtx.unk_1E4 == 1) { // In page turning mode
+        func_808237B4(gPlayState, gPlayState->state.input);
+    }
+}
+
+void InitFasterPauseMenu() {
+    COND_HOOK(GameInteractor::OnKaleidoUpdate, CVAR_FASTER_PAUSE_MENU_VALUE, OnKaleidoUpdateFaster);
+
+    // Reset register values on close. These values are only used by z_kaleido_scope_PAL.c
+    COND_VB_SHOULD(VB_KALEIDO_UNPAUSE_CLOSE, CVAR_FASTER_PAUSE_MENU_VALUE, {
+        // Default values, as defined in Regs_InitDataImpl
+        ZREG(46) = 1;
+        WREG(6) = 8;
+    });
+}
+
+static RegisterShipInitFunc initFunc(InitFasterPauseMenu, { CVAR_FASTER_PAUSE_MENU_NAME });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
index b7b6587ba2..5fcfb0d268 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
@@ -1,21 +1,17 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
-#include "spdlog/spdlog.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "z64save.h"
-    #include "macros.h"
-    #include "variables.h"
-    #include "functions.h"
-    extern PlayState* gPlayState;
-    extern SaveContext gSaveContext;
+#include "z64save.h"
+#include "macros.h"
+#include "variables.h"
+#include "functions.h"
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
 }
 
-void FasterRupeeAccumulator_Register() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnInterfaceUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.FasterRupeeAccumulator"), 0)) return;
-
+void RegisterFasterRupeeAccumulator() {
+    COND_HOOK(OnInterfaceUpdate, CVarGetInteger(CVAR_ENHANCEMENT("FasterRupeeAccumulator"), 0), []() {
         if (gSaveContext.rupeeAccumulator == 0) {
             return;
         }
@@ -28,10 +24,10 @@ void FasterRupeeAccumulator_Register() {
             }
 
             if (gSaveContext.rupeeAccumulator >= 10 && gSaveContext.rupees + 10 < CUR_CAPACITY(UPG_WALLET)) {
-                gSaveContext.rupeeAccumulator-= 10;
+                gSaveContext.rupeeAccumulator -= 10;
                 gSaveContext.rupees += 10;
             }
-        // Losing rupees
+            // Losing rupees
         } else if (gSaveContext.rupeeAccumulator < 0) {
             // No rupees to lose
             if (gSaveContext.rupees == 0) {
@@ -45,3 +41,5 @@ void FasterRupeeAccumulator_Register() {
         }
     });
 }
+
+static RegisterShipInitFunc initFunc(RegisterFasterRupeeAccumulator, { CVAR_ENHANCEMENT("FasterRupeeAccumulator") });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterShadowShip.cpp b/soh/soh/Enhancements/TimeSavers/FasterShadowShip.cpp
new file mode 100644
index 0000000000..c59ccc6037
--- /dev/null
+++ b/soh/soh/Enhancements/TimeSavers/FasterShadowShip.cpp
@@ -0,0 +1,26 @@
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "functions.h"
+#include "src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h"
+}
+
+void RegisterFasterShadowShip() {
+    COND_VB_SHOULD(VB_SHADOW_SHIP_SET_SPEED, CVarGetInteger(CVAR_ENHANCEMENT("FasterShadowShip"), 0), {
+        BgHakaShip* ship = va_arg(args, BgHakaShip*);
+        PlayState* play = va_arg(args, PlayState*);
+        if (!Play_InCsMode(play)) {
+            if (Actor_FindNearby(play, &ship->dyna.actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 800.0) == NULL &&
+                Actor_FindNearby(play, &ship->dyna.actor, ACTOR_PLAYER, ACTORCAT_PLAYER, 450.0) != NULL) {
+                *should = false;
+                ship->dyna.actor.speedXZ = 25.0f;
+            } else if (ship->dyna.actor.speedXZ > 4.0f) {
+                *should = false;
+                ship->dyna.actor.speedXZ = 4.0f;
+            }
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterFasterShadowShip, { CVAR_ENHANCEMENT("FasterShadowShip") });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index f7db9de32a..26eae80978 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -1,6 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/randomizer/context.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64save.h"
@@ -10,12 +10,13 @@ extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
 }
 
-void SkipIntro_Register() {
-    REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
+void RegisterSkipIntro() {
+    bool shouldRegister = CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), 0) || IS_RANDO;
+    COND_VB_SHOULD(VB_PLAY_TRANSITION_CS, shouldRegister, {
         // If we're playing rando and if starting age is adult and/or overworld spawns are shuffled we need to skip
         // the cutscene regardless of the enhancement being on.
         bool adultStart = gSaveContext.linkAge == LINK_AGE_ADULT;
-        bool shuffleEntrances = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_ENTRANCES).Is(true);
+        bool shuffleEntrances = Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_ENTRANCES).Is(true);
         if ((CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
              (IS_RANDO && (adultStart || shuffleEntrances))) &&
             gSaveContext.cutsceneIndex == 0xFFF1) {
@@ -45,3 +46,6 @@ void SkipIntro_Register() {
         }
     });
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipIntro,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index c9a999cb1a..cc136b14f8 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -1,6 +1,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/randomizer/context.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "macros.h"
@@ -10,111 +11,8 @@ extern "C" {
 #include "variables.h"
 }
 
-#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
-
 static bool sEnteredBlueWarp = false;
 
-/**
- * This will override the transitions into the blue warp cutscenes, set any appropriate flags, and
- * set the entrance index to where you would normally end up after the blue warp cutscene. This
- * should also account for the difference between your first and following visits to the blue warp.
- */
-void SkipBlueWarp_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, va_list originalArgs) {
-    bool overrideBlueWarpDestinations =
-        IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
-                     RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
-
-    // Force blue warp skip on when ER needs to place Link somewhere else.
-    // This is preferred over having story cutscenes play in the overworld and then reloading Link somewhere else after.
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) || overrideBlueWarpDestinations) {
-        bool isBlueWarpCutscene = false;
-        // Deku Tree Blue warp
-        if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
-            gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Dodongo's Cavern Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT && gSaveContext.cutsceneIndex == 0xFFF1) {
-            gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Jabu Jabu's Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP && gSaveContext.cutsceneIndex == 0xFFF0) {
-            gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Forest Temple Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
-            // Normally set in the blue warp cutscene
-            Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
-
-            if (IS_RANDO) {
-                gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP;
-            } else {
-                gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
-            }
-
-            isBlueWarpCutscene = true;
-        // Fire Temple Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE && gSaveContext.cutsceneIndex == 0xFFF3) {
-            // Normally set in the blue warp cutscene
-            Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
-
-            gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Water Temple Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
-            // Normally set in the blue warp cutscene
-            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
-            Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
-
-            gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Spirit Temple Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
-            gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        // Shadow Temple Blue warp
-        } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 && gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
-            gSaveContext.entranceIndex = ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP;
-            isBlueWarpCutscene = true;
-        }
-
-        if (isBlueWarpCutscene) {
-            if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP) {
-                // Normally set in the blue warp cutscene
-                gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
-            }
-
-            *should = false;
-            gSaveContext.cutsceneIndex = 0;
-        }
-
-        // This is outside the above condition because we want to handle both first and following visits to the blue warp
-        if (sEnteredBlueWarp && overrideBlueWarpDestinations) {
-            Entrance_OverrideBlueWarp();
-        }
-    }
-
-    sEnteredBlueWarp = false;
-}
-
-/**
- * Using this hook to simply observe that Link has entered a bluewarp
- * This way we know to allow entrance rando overrides to be processed on the next tranisition hook
- */
-void SkipBlueWarp_ShouldPlayBlueWarpCS(GIVanillaBehavior _, bool* should, va_list originalArgs) {
-    sEnteredBlueWarp = true;
-}
-
-/**
- * While we could rely on the Item_Give that's normally called, it's not very clear to the player that they
- * received the item when skipping the blue warp cutscene, so we'll prevent that and queue it up to be given 
- * to the player instead.
- */
-void SkipBlueWarp_ShouldGiveItem(GIVanillaBehavior _, bool* should, va_list originalArgs) {
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        *should = false;
-    }
-}
-
 // Todo: Move item queueing here
 
 /**
@@ -137,31 +35,143 @@ void EnKo_MoveWhenReady(EnKo* enKo, PlayState* play) {
 void SkipBlueWarp_OnActorUpdate(void* actorPtr) {
     EnKo* enKo = static_cast<EnKo*>(actorPtr);
 
-    if (
-        (enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3 &&
-        enKo->actionFunc == func_80A995CC &&
-        CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)
-    ) {
+    if ((enKo->actor.params & 0xFF) == ENKO_TYPE_CHILD_3 && enKo->actionFunc == func_80A995CC) {
         enKo->actionFunc = EnKo_MoveWhenReady;
     }
 }
 
-/**
- * This will ensure that the Deku Tree Sprout considers the Forest Temple finished when you skip the blue warp cutscene.
- * Typically this checks for if you have the medallion, and when skipping the cutscene at this point you don't have it yet.
- */
-void SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished(GIVanillaBehavior _, bool* should, va_list originalArgs) {
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP && gSaveContext.cutsceneIndex == 0xFFF1) {
-            *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
-        }
-    }
+void RegisterSkipBlueWarp() {
+    COND_ID_HOOK(OnActorUpdate, ACTOR_EN_KO,
+                 CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO),
+                 SkipBlueWarp_OnActorUpdate);
+
+    /**
+     * This will ensure that the Deku Tree Sprout considers the Forest Temple finished when you skip the blue warp
+     * cutscene. Typically this checks for if you have the medallion, and when skipping the cutscene at this point you
+     * don't have it yet.
+     */
+    COND_VB_SHOULD(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), {
+                       if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP &&
+                           gSaveContext.cutsceneIndex == 0xFFF1) {
+                           *should = Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
+                       }
+                   });
+
+    /**
+     * While we could rely on the Item_Give that's normally called, it's not very clear to the player that they
+     * received the item when skipping the blue warp cutscene, so we'll prevent that and queue it up to be given
+     * to the player instead.
+     */
+    COND_VB_SHOULD(VB_GIVE_ITEM_FROM_BLUE_WARP,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), { *should = false; });
 }
 
-void SkipBlueWarp_Register() {
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_EN_KO, SkipBlueWarp_OnActorUpdate);
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_PLAY_TRANSITION_CS, SkipBlueWarp_ShouldPlayTransitionCS);
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_PLAY_BLUE_WARP_CS, SkipBlueWarp_ShouldPlayBlueWarpCS);
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, SkipBlueWarp_ShouldDekuJrConsiderForestTempleFinished);
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_GIVE_ITEM_FROM_BLUE_WARP, SkipBlueWarp_ShouldGiveItem);
+void RegisterShouldPlayBlueWarp() {
+    /**
+     * This will override the transitions into the blue warp cutscenes, set any appropriate flags, and
+     * set the entrance index to where you would normally end up after the blue warp cutscene. This
+     * should also account for the difference between your first and following visits to the blue warp.
+     */
+    REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
+        // Do nothing when in a boss rush
+        if (IS_BOSS_RUSH) {
+            return;
+        }
+
+        bool overrideBlueWarpDestinations =
+            IS_RANDO && (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
+                         RAND_GET_OPTION(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
+
+        // Force blue warp skip on when ER needs to place Link somewhere else.
+        // This is preferred over having story cutscenes play in the overworld and then reloading Link somewhere else
+        // after.
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) ||
+            overrideBlueWarpDestinations) {
+            bool isBlueWarpCutscene = false;
+            // Deku Tree Blue warp
+            if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.cutsceneIndex == 0xFFF1) {
+                gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Dodongo's Cavern Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT &&
+                       gSaveContext.cutsceneIndex == 0xFFF1) {
+                gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Jabu Jabu's Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP &&
+                       gSaveContext.cutsceneIndex == 0xFFF0) {
+                gSaveContext.entranceIndex = ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Forest Temple Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 &&
+                       gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) {
+                // Normally set in the blue warp cutscene
+                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_DEKU_TREE_SPROUT);
+
+                if (IS_RANDO) {
+                    gSaveContext.entranceIndex = ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP;
+                } else {
+                    gSaveContext.entranceIndex = ENTR_KOKIRI_FOREST_12;
+                }
+
+                isBlueWarpCutscene = true;
+                // Fire Temple Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE &&
+                       gSaveContext.cutsceneIndex == 0xFFF3) {
+                // Normally set in the blue warp cutscene
+                Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED);
+
+                gSaveContext.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Water Temple Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 &&
+                       gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
+                // Normally set in the blue warp cutscene
+                gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
+                Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
+
+                gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Spirit Temple Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 &&
+                       gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) {
+                gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP;
+                isBlueWarpCutscene = true;
+                // Shadow Temple Blue warp
+            } else if (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0 && gSaveContext.cutsceneIndex == 0x0 &&
+                       gSaveContext.chamberCutsceneNum == CHAMBER_CS_SHADOW) {
+                gSaveContext.entranceIndex = ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP;
+                isBlueWarpCutscene = true;
+            }
+
+            if (isBlueWarpCutscene) {
+                if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP) {
+                    // Normally set in the blue warp cutscene
+                    gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+                }
+
+                *should = false;
+                gSaveContext.cutsceneIndex = 0;
+            }
+
+            // This is outside the above condition because we want to handle both first and following visits to the blue
+            // warp
+            if (sEnteredBlueWarp && overrideBlueWarpDestinations) {
+                Entrance_OverrideBlueWarp();
+            }
+        }
+
+        sEnteredBlueWarp = false;
+    });
+
+    /**
+     * Using this hook to simply observe that Link has entered a bluewarp
+     * This way we know to allow entrance rando overrides to be processed on the next tranisition hook
+     */
+    REGISTER_VB_SHOULD(VB_PLAY_BLUE_WARP_CS, { sEnteredBlueWarp = true; });
 }
+
+static RegisterShipInitFunc initHooks(RegisterSkipBlueWarp,
+                                      { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), "IS_RANDO" });
+static RegisterShipInitFunc initUnconditionalHooks(RegisterShouldPlayBlueWarp);
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
index e1cc1db216..9faa312a16 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipDekuTreeIntro.cpp
@@ -1,22 +1,24 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
+#include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
 }
 
 /**
  * This will skip the Deku Tree intro, and simply open the mouth as you approach it.
-*/
-void SkipDekuTreeIntro_Register() {
-    REGISTER_VB_SHOULD(VB_PLAY_DEKU_TREE_INTRO_CS, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-            BgTreemouth* treeMouth = va_arg(args, BgTreemouth*);
-            Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
-            Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-            BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
-            *should = false;
-        }
-    });
+ */
+void RegisterSkipDekuTreeIntro() {
+    COND_VB_SHOULD(VB_PLAY_DEKU_TREE_INTRO_CS,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), {
+                       BgTreemouth* treeMouth = va_arg(args, BgTreemouth*);
+                       Flags_SetEventChkInf(EVENTCHKINF_DEKU_TREE_OPENED_MOUTH);
+                       Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                              &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                       BgTreemouth_SetupAction(treeMouth, func_808BC6F8);
+                       *should = false;
+                   });
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipDekuTreeIntro,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
index d487c1f471..d743bead94 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp
@@ -1,39 +1,40 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "z64save.h"
-    #include "functions.h"
-    extern PlayState* gPlayState;
-    extern SaveContext gSaveContext;
+#include "z64save.h"
+#include "functions.h"
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
 }
 
-void SkipLostWoodsBridge_Register() {
+void RegisterSkipLostWoodsBridge() {
     /**
-     * This skips the cutscene where you speak to Saria on the bridge in Lost Woods, where she gives you the Fairy Ocarina.
+     * This skips the cutscene where you speak to Saria on the bridge in Lost Woods, where she gives you the Fairy
+     * Ocarina.
      */
-    REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-            if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
-                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-                if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
-                    Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
-                }
-                *should = false;
+    COND_VB_SHOULD(VB_PLAY_TRANSITION_CS, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), {
+        if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) &&
+            !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
+            Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+            if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
+                Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
             }
-        }
-    });
-
-    /**
-     * While we could rely on the Item_Give that's normally called (and that we have above), it's not very clear to the player
-     * that they received the item when skipping the cutscene, so we'll prevent it, and queue it up to be given instead.
-     */
-    REGISTER_VB_SHOULD(VB_GIVE_ITEM_FAIRY_OCARINA, {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
             *should = false;
         }
     });
 
+    /**
+     * While we could rely on the Item_Give that's normally called (and that we have above), it's not very clear to the
+     * player that they received the item when skipping the cutscene, so we'll prevent it, and queue it up to be given
+     * instead.
+     */
+    COND_VB_SHOULD(VB_GIVE_ITEM_FAIRY_OCARINA,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), { *should = false; });
+
     // Todo: Move item queueing here
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipLostWoodsBridge,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
index 357125db84..1acd6dabed 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipToGivingZeldasLetter.cpp
@@ -1,9 +1,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
+#include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
 }
 
 /**
@@ -21,7 +20,8 @@ void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
         Audio_PlayFanfare(NA_BGM_APPEAR);
         enZl4->csState = 8; // ZL4_CS_PLAN
     } else {
-        Npc_UpdateTalking(play, &enZl4->actor, &enZl4->interactInfo.talkState, enZl4->collider.dim.radius + 60.0f, EnZl4_GiveItemTextId, func_80B5B9B0);
+        Npc_UpdateTalking(play, &enZl4->actor, &enZl4->interactInfo.talkState, enZl4->collider.dim.radius + 60.0f,
+                          EnZl4_GiveItemTextId, func_80B5B9B0);
         func_80B5BB78(enZl4, play);
 
         if (enZl4->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
@@ -32,14 +32,17 @@ void EnZl4_SkipToGivingZeldasLetter(EnZl4* enZl4, PlayState* play) {
 }
 
 void SkipToGivingZeldasLetter_OnActorInit(void* actorPtr) {
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        EnZl4* enZl4 = static_cast<EnZl4*>(actorPtr);
-        if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0) return;
+    EnZl4* enZl4 = static_cast<EnZl4*>(actorPtr);
+    if (enZl4->actionFunc != EnZl4_Cutscene || enZl4->csState != 0)
+        return;
 
-        enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
-    }
+    enZl4->actionFunc = EnZl4_SkipToGivingZeldasLetter;
 }
 
-void SkipToGivingZeldasLetter_Register() {
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_EN_ZL4, SkipToGivingZeldasLetter_OnActorInit);
+void RegisterSkipToGivingZeldasLetter() {
+    COND_ID_HOOK(OnActorInit, ACTOR_EN_ZL4, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO),
+                 SkipToGivingZeldasLetter_OnActorInit);
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipToGivingZeldasLetter,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
index 1cb331539f..ae82ff9f0f 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipZeldaFleeingCastle.cpp
@@ -1,23 +1,10 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "z64save.h"
-    #include "functions.h"
-    extern SaveContext gSaveContext;
-}
-
-void SkipZeldaFleeingCastle_ShouldPlayTransitionCS(GIVanillaBehavior _, bool* should, va_list originalArgs) {
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
-        if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN && gSaveContext.cutsceneIndex == 0xFFF1) {
-            // Normally set in the cutscene
-            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4AAA;
-
-            gSaveContext.cutsceneIndex = 0;
-            *should = false;
-        }
-    }
+#include "z64save.h"
+#include "functions.h"
+extern SaveContext gSaveContext;
 }
 
 /**
@@ -46,13 +33,11 @@ void SkipZeldaFleeingCastle_OnActorUpdate(void* actorPtr) {
 void SkipZeldaFleeingCastle_OnActorInit(void* actorPtr) {
     Actor* actor = static_cast<Actor*>(actorPtr);
 
-    if (
-        actor->params == 3 &&
-        CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)
-    ) {
+    if (actor->params == 3) {
         framesSinceSpawn = 0;
-        itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHookForPtr<GameInteractor::OnActorUpdate>((uintptr_t)actorPtr, SkipZeldaFleeingCastle_OnActorUpdate);
-        sceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([] (int16_t sceneNum) {
+        itemOcarinaUpdateHook = GameInteractor::Instance->RegisterGameHookForPtr<GameInteractor::OnActorUpdate>(
+            (uintptr_t)actorPtr, SkipZeldaFleeingCastle_OnActorUpdate);
+        sceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
             GameInteractor::Instance->UnregisterGameHookForPtr<GameInteractor::OnActorUpdate>(itemOcarinaUpdateHook);
             GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(sceneInitHook);
             itemOcarinaUpdateHook = 0;
@@ -61,7 +46,20 @@ void SkipZeldaFleeingCastle_OnActorInit(void* actorPtr) {
     }
 }
 
-void SkipZeldaFleeingCastle_Register() {
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_ITEM_OCARINA, SkipZeldaFleeingCastle_OnActorInit);
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnVanillaBehavior>(VB_PLAY_TRANSITION_CS, SkipZeldaFleeingCastle_ShouldPlayTransitionCS);
+void RegisterSkipZeldaFleeingCastle() {
+    COND_ID_HOOK(OnActorInit, ACTOR_ITEM_OCARINA,
+                 CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO),
+                 SkipZeldaFleeingCastle_OnActorInit);
+    COND_VB_SHOULD(VB_PLAY_TRANSITION_CS, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), {
+        if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN && gSaveContext.cutsceneIndex == 0xFFF1) {
+            // Normally set in the cutscene
+            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4AAA;
+
+            gSaveContext.cutsceneIndex = 0;
+            *should = false;
+        }
+    });
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipZeldaFleeingCastle,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveJabuJabuElevator.cpp b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveJabuJabuElevator.cpp
index 1e1c6ceb5b..34e2fdf614 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveJabuJabuElevator.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveJabuJabuElevator.cpp
@@ -1,27 +1,28 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h"
 }
 
+void BdanInit(void* actorRef) {
+    Player* player = GET_PLAYER(gPlayState);
+    BgBdanObjects* bgBdanObjects = static_cast<BgBdanObjects*>(actorRef);
+
+    if (bgBdanObjects->dyna.actor.params == 1) {
+        if (player->actor.world.pos.y < -500.0f) {
+            bgBdanObjects->timer = 220;
+        }
+    }
+}
+
 /**
  * Adjusts the behavior of the elevator to start near the bottom if you are entering the room from the bottom
  */
-void MoveJabuJabuElevator_Register() {
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_BG_BDAN_OBJECTS, [](void* actorRef) {
-        Player* player = GET_PLAYER(gPlayState);
-        BgBdanObjects* bgBdanObjects = static_cast<BgBdanObjects*>(actorRef);
-
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-            return;
-        }
-
-        if (bgBdanObjects->dyna.actor.params == 1) {
-            if (player->actor.world.pos.y < -500.0f) {
-                bgBdanObjects->timer = 220;
-            }
-        }
-    });
+void RegisterMoveJabuJabuElevator() {
+    COND_ID_HOOK(OnActorInit, ACTOR_BG_BDAN_OBJECTS,
+                 CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), BdanInit);
 }
+
+static RegisterShipInitFunc initFunc(RegisterMoveJabuJabuElevator,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
index 59381968aa..1e4e77d444 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
@@ -1,31 +1,30 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-    #include "z64save.h"
-    #include "macros.h"
-    #include "variables.h"
-    #include "functions.h"
-    extern PlayState* gPlayState;
-    extern SaveContext gSaveContext;
+#include "z64save.h"
+#include "macros.h"
+#include "variables.h"
+#include "functions.h"
+extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
 }
 
 /**
  * This simply skips the Mido interaction in Kokiri Forest, once you equip the Kokiri
  * Sword and Deku Shield he will move out of the way without you needing to talk to him.
  */
-void MoveMidoInKokiriForest_Register() {
-    REGISTER_VB_SHOULD(VB_MOVE_MIDO_IN_KOKIRI_FOREST, {
-        if (
-            CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
-            !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
-            (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && 
-            (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI) &&
-            gSaveContext.cutsceneIndex == 0
-        ) {
-            Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
-            *should = true;
-        }
-    });
+void RegisterMoveMidoInKokiriForest() {
+    COND_VB_SHOULD(
+        VB_MOVE_MIDO_IN_KOKIRI_FOREST, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), {
+            if (!Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
+                (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) &&
+                (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI) && gSaveContext.cutsceneIndex == 0) {
+                Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
+                *should = true;
+            }
+        });
 }
+
+static RegisterShipInitFunc initFunc(RegisterMoveMidoInKokiriForest,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp
index 7d676e6f82..39417d5dee 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp
@@ -1,6 +1,5 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "overlays/actors/ovl_En_Ru1/z_en_ru1.h"
@@ -9,85 +8,87 @@ extern "C" {
 Actor* func_80AEB124(PlayState* play);
 }
 
-void SkipChildRutoInteractions_Register() {
-    // Skips the Child Ruto introduction cutscene, where she drops down into the hole in Jabu-Jabu's Belly
-    REGISTER_VB_SHOULD(VB_PLAY_CHILD_RUTO_INTRO, {
-        EnRu1* enRu1 = va_arg(args, EnRu1*);
+void Ru1Init(void* actorRef) {
+    EnRu1* enRu1 = static_cast<EnRu1*>(actorRef);
 
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-            return;
-        }
-
-        Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO);
-        Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME);
-        Flags_SetInfTable(INFTABLE_143);
+    if (enRu1->action == 22) {
+        enRu1->action = 27;
         enRu1->drawConfig = 1;
-        enRu1->actor.world.pos.x = 127.0f;
-        enRu1->actor.world.pos.y = -340.0f;
-        enRu1->actor.world.pos.z = -3041.0f;
-        enRu1->actor.shape.rot.y = enRu1->actor.world.rot.y = -5098;
+        enRu1->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY;
+        Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildSittingAnim, 1.0f, 0.0f,
+                         Animation_GetLastFrame((void*)&gRutoChildSittingAnim), ANIMMODE_LOOP, 0.0f);
+    }
+}
 
-        if (*should) {
-            Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildTurnAroundAnim, 1.0f, 0,
-                        Animation_GetLastFrame((void*)&gRutoChildTurnAroundAnim), ANIMMODE_ONCE, -8.0f);
-            enRu1->action = 10;
-        }
+void RegisterSkipChildRutoInteractions() {
+    // Skips the Child Ruto introduction cutscene, where she drops down into the hole in Jabu-Jabu's Belly
+    COND_VB_SHOULD(
+        VB_PLAY_CHILD_RUTO_INTRO, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), {
+            EnRu1* enRu1 = va_arg(args, EnRu1*);
 
-        *should = false;
-    });
+            Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO);
+            Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME);
+            Flags_SetInfTable(INFTABLE_143);
+            enRu1->drawConfig = 1;
+            enRu1->actor.world.pos.x = 127.0f;
+            enRu1->actor.world.pos.y = -340.0f;
+            enRu1->actor.world.pos.z = -3041.0f;
+            enRu1->actor.shape.rot.y = enRu1->actor.world.rot.y = -5098;
+
+            if (*should) {
+                Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildTurnAroundAnim, 1.0f, 0,
+                                 Animation_GetLastFrame((void*)&gRutoChildTurnAroundAnim), ANIMMODE_ONCE, -8.0f);
+                enRu1->action = 10;
+            }
+
+            *should = false;
+        });
 
     // Skips a short dialogue sequence where Ruto tells you to throw her to the Sapphire
-    REGISTER_VB_SHOULD(VB_RUTO_WANT_TO_BE_TOSSED_TO_SAPPHIRE, {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-            return;
-        }
+    COND_VB_SHOULD(VB_RUTO_WANT_TO_BE_TOSSED_TO_SAPPHIRE,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), {
+                       if (*should) {
+                           Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE);
+                           *should = false;
+                       }
+                   });
 
-        if (*should) {
-            Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE);
-            *should = false;
-        }
-    });
+    // Prevents Ruto from running to the Sapphire when she wants to be tossed to it, instead she just stands up and
+    // waits for link to get closer
+    COND_VB_SHOULD(VB_RUTO_RUN_TO_SAPPHIRE,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), {
+                       EnRu1* enRu1 = va_arg(args, EnRu1*);
+                       DynaPolyActor* dynaPolyActor = va_arg(args, DynaPolyActor*);
 
-    // Prevents Ruto from running to the Sapphire when she wants to be tossed to it, instead she just stands up and waits for link to get closer
-    REGISTER_VB_SHOULD(VB_RUTO_RUN_TO_SAPPHIRE, {
-        EnRu1* enRu1 = va_arg(args, EnRu1*);
-        DynaPolyActor* dynaPolyActor = va_arg(args, DynaPolyActor*);
+                       if (*should) {
+                           enRu1->unk_28C = (BgBdanObjects*)dynaPolyActor;
+                           Flags_SetInfTable(INFTABLE_145);
+                           Flags_SetSwitch(gPlayState, 0x02);
+                           Flags_SetSwitch(gPlayState, 0x1F);
+                           enRu1->action = 42;
+                           Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildWait2Anim, 1.0f, 0,
+                                            Animation_GetLastFrame((void*)&gRutoChildWait2Anim), ANIMMODE_LOOP, -8.0f);
+                           // If we aren't skipping one point cutscenes and BgBdan objects has set the camera setting
+                           // to CAM_SET_NORMAL1 (2), don't reset the camera setting to 1. This prevents the One Point
+                           // Cutscene of Ruto getting lifted up from getting queued up twice.
+                           if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO) ||
+                               enRu1->unk_28C->cameraSetting != 2) {
+                               enRu1->unk_28C->cameraSetting = 1;
+                           }
+                           Actor* sapphire = func_80AEB124(gPlayState);
+                           if (sapphire != NULL) {
+                               Actor_Kill(sapphire);
+                           }
+                           enRu1->actor.room = gPlayState->roomCtx.curRoom.num;
+                           *should = false;
+                       }
+                   });
 
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-            return;
-        }
-
-        if (*should) {
-            enRu1->unk_28C = (BgBdanObjects*)dynaPolyActor;
-            Flags_SetInfTable(INFTABLE_145);
-            Flags_SetSwitch(gPlayState, 0x02);
-            Flags_SetSwitch(gPlayState, 0x1F);
-            enRu1->action = 42;
-            Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildWait2Anim, 1.0f, 0, 
-                        Animation_GetLastFrame((void*)&gRutoChildWait2Anim), ANIMMODE_LOOP, -8.0f);
-            enRu1->unk_28C->cameraSetting = 1;
-            Actor* sapphire = func_80AEB124(gPlayState);
-            if (sapphire != NULL) {
-                Actor_Kill(sapphire);
-            }
-            enRu1->actor.room = gPlayState->roomCtx.curRoom.num;
-            *should = false;
-        }
-    });
-
-    // This overrides the behavior that causes Ruto to get upset at you before sitting back down again when INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME is set
-    GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorInit>(ACTOR_EN_RU1, [](void* actorRef) {
-        EnRu1* enRu1 = static_cast<EnRu1*>(actorRef);
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
-            return;
-        }
-
-        if (enRu1->action == 22) {
-            enRu1->action = 27;
-            enRu1->drawConfig = 1;
-            enRu1->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY;
-            Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildSittingAnim, 1.0f, 0.0f,
-                         Animation_GetLastFrame((void*)&gRutoChildSittingAnim), ANIMMODE_LOOP, 0.0f);
-        }
-    });
+    // This overrides the behavior that causes Ruto to get upset at you before sitting back down again when
+    // INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME is set
+    COND_ID_HOOK(OnActorInit, ACTOR_EN_RU1,
+                 CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), Ru1Init);
 }
+
+static RegisterShipInitFunc initFunc(RegisterSkipChildRutoInteractions,
+                                     { CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), "IS_RANDO" });
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp b/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
deleted file mode 100644
index a198f82890..0000000000
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "TimeSavers.h"
-
-void TimeSavers_Register() {
-    // SkipCutscene
-        // Story
-            SkipBlueWarp_Register();
-            SkipDekuTreeIntro_Register();
-            SkipLostWoodsBridge_Register();
-            SkipToGivingZeldasLetter_Register();
-            SkipZeldaFleeingCastle_Register();
-        SkipIntro_Register();
-    // SkipMiscInteractions
-        MoveJabuJabuElevator_Register();
-        MoveMidoInKokiriForest_Register();
-        SkipChildRutoInteractions_Register();
-    FasterHeavyBlockLift_Register();
-    FasterRupeeAccumulator_Register();
-}
diff --git a/soh/soh/Enhancements/TimeSavers/TimeSavers.h b/soh/soh/Enhancements/TimeSavers/TimeSavers.h
deleted file mode 100644
index ad521c6c2b..0000000000
--- a/soh/soh/Enhancements/TimeSavers/TimeSavers.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TIME_SAVERS_H
-#define TIME_SAVERS_H
-
-void TimeSavers_Register();
-
-// SkipCutscene
-    // Story
-        void SkipBlueWarp_Register();
-        void SkipDekuTreeIntro_Register();
-        void SkipLostWoodsBridge_Register();
-        void SkipToGivingZeldasLetter_Register();
-        void SkipZeldaFleeingCastle_Register();
-    void SkipIntro_Register();
-// SkipMiscInteractions
-    void MoveJabuJabuElevator_Register();
-    void MoveMidoInKokiriForest_Register();
-    void SkipChildRutoInteractions_Register();
-void FasterHeavyBlockLift_Register();
-void FasterRupeeAccumulator_Register();
-
-#endif // TIME_SAVERS_H
diff --git a/soh/soh/Enhancements/TreesDropSticks.cpp b/soh/soh/Enhancements/TreesDropSticks.cpp
new file mode 100644
index 0000000000..7fdc4eb0a1
--- /dev/null
+++ b/soh/soh/Enhancements/TreesDropSticks.cpp
@@ -0,0 +1,31 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h"
+}
+
+extern PlayState* gPlayState;
+
+void RegisterTreesDropSticks() {
+    COND_VB_SHOULD(VB_TREE_DROP_COLLECTIBLE, CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0), {
+        if (INV_CONTENT(ITEM_STICK) != ITEM_NONE) {
+            EnWood02* tree = va_arg(args, EnWood02*);
+            Vec3f dropsSpawnPt = tree->actor.world.pos;
+            dropsSpawnPt.y += 200.0f;
+
+            *should = false;
+            for (s32 numDrops = Rand_Next() % 4; numDrops > 0; numDrops--) {
+                Item_DropCollectible(gPlayState, &dropsSpawnPt, ITEM00_STICK);
+            }
+        }
+    });
+
+    COND_VB_SHOULD(VB_PREVENT_ADULT_STICK, CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0), {
+        if (INV_CONTENT(ITEM_STICK) != ITEM_NONE) {
+            *should = false;
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterTreesDropSticks, { CVAR_ENHANCEMENT("TreesDropSticks") });
diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index 28e8d3d990..d3f69dad85 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -11,9 +11,14 @@
 #include <filesystem>
 
 #define SEQUENCE_MAP_ENTRY(sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement) \
-    { sequenceId, { sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement } }
+    {                                                                                                  \
+        sequenceId, {                                                                                  \
+            sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement                 \
+        }                                                                                              \
+    }
 
 AudioCollection::AudioCollection() {
+    // clang-format off
     //                    (originalSequenceId,                  label,                                      sfxKey,                           category,    canBeReplaced, canBeUsedAsReplacement),
     sequenceMap = {
 
@@ -114,7 +119,7 @@ AudioCollection::AudioCollection() {
         SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2,                      "End Credits II",                           "NA_BGM_STAFF_2",                 SEQ_BGM_EVENT,    false,    false), // Previously SEQ_UNUSED, so not shown anywhere?
         SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3,                      "End Credits III",                          "NA_BGM_STAFF_3",                 SEQ_BGM_EVENT,    false,    false), // Previously SEQ_UNUSED, so not shown anywhere?
         SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4,                      "End Credits IV",                           "NA_BGM_STAFF_4",                 SEQ_BGM_EVENT,    false,    false), // Previously SEQ_UNUSED, so not shown anywhere?
-        
+
         // SEQ_INSTRUMENT
         SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1,               "Ocarina",                                  "OCARINA_INSTRUMENT_DEFAULT",     SEQ_INSTRUMENT,   true,     true),
         SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2,               "Malon",                                    "OCARINA_INSTRUMENT_MALON",       SEQ_INSTRUMENT,   true,     true),
@@ -299,7 +304,7 @@ AudioCollection::AudioCollection() {
         //SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV",    "NA_SE_VO_LI_ELECTRIC_SHOCK_LV",        SEQ_VOICE, true, false),
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)",              "NA_SE_VO_LI_GROAN_KID",                SEQ_VOICE, true, false),
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID",    SEQ_VOICE, true, false),
-        
+
         // Following group of Dummies are all duplicate entries for Navi saying Look/Hey/Watchout
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45,          "NA_SE_VO_DUMMY_0x45",                 "NA_SE_VO_DUMMY_0x45",            SEQ_VOICE, true, false),
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46,          "NA_SE_VO_DUMMY_0x46",                 "NA_SE_VO_DUMMY_0x46",            SEQ_VOICE, true, false),
@@ -328,7 +333,7 @@ AudioCollection::AudioCollection() {
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x88_YOBI,     "NA_SE_VO_DUMMY_0x88_YOBI",            "NA_SE_VO_DUMMY_0x88_YOBI",       SEQ_VOICE, true, false), // ..
         //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x89_YOBI,     "NA_SE_VO_DUMMY_0x89_YOBI",            "NA_SE_VO_DUMMY_0x89_YOBI",       SEQ_VOICE, true, false), // ..
     };
-
+    // clang-format on
 }
 
 std::string AudioCollection::GetCvarKey(std::string sfxKey) {
@@ -354,10 +359,13 @@ void AudioCollection::AddToCollection(char* otrPath, uint16_t seqNum) {
     if (typeString == "fanfare") {
         type = SEQ_FANFARE;
     }
-    SequenceInfo info = {seqNum,
-                         sequenceName,
-                         StringHelper::Replace(StringHelper::Replace(StringHelper::Replace(sequenceName, " ", "_"), "~", "-"),".", ""),
-                         type, false, true};
+    SequenceInfo info = { seqNum,
+                          sequenceName,
+                          StringHelper::Replace(
+                              StringHelper::Replace(StringHelper::Replace(sequenceName, " ", "_"), "~", "-"), ".", ""),
+                          type,
+                          false,
+                          true };
     sequenceMap.emplace(seqNum, info);
 }
 
@@ -366,7 +374,8 @@ uint16_t AudioCollection::GetReplacementSequence(uint16_t seqId) {
     // for Hyrule Field instead. Otherwise, leave it alone, so that without any sfx editor modifications we will
     // play the normal track as usual.
     if (seqId == NA_BGM_FIELD_MORNING) {
-        if (CVarGetInteger(CVAR_AUDIO("ReplacedSequences.NA_BGM_FIELD_LOGIC.value"), NA_BGM_FIELD_LOGIC) != NA_BGM_FIELD_LOGIC) {
+        if (CVarGetInteger(CVAR_AUDIO("ReplacedSequences.NA_BGM_FIELD_LOGIC.value"), NA_BGM_FIELD_LOGIC) !=
+            NA_BGM_FIELD_LOGIC) {
             seqId = NA_BGM_FIELD_LOGIC;
         }
     }
@@ -401,10 +410,12 @@ void AudioCollection::AddToShufflePool(SequenceInfo* seqInfo) {
 }
 
 void AudioCollection::InitializeShufflePool() {
-    if (shufflePoolInitialized) return;
-    
+    if (shufflePoolInitialized)
+        return;
+
     for (auto& [seqId, seqInfo] : sequenceMap) {
-        if (!seqInfo.canBeUsedAsReplacement) continue;
+        if (!seqInfo.canBeUsedAsReplacement)
+            continue;
         const std::string cvarKey = std::string(CVAR_AUDIO("Excluded.")) + seqInfo.sfxKey;
         if (CVarGetInteger(cvarKey.c_str(), 0)) {
             excludedSequences.insert(&seqInfo);
@@ -416,7 +427,7 @@ void AudioCollection::InitializeShufflePool() {
     shufflePoolInitialized = true;
 };
 
-extern "C" void AudioCollection_AddToCollection(char *otrPath, uint16_t seqNum) {
+extern "C" void AudioCollection_AddToCollection(char* otrPath, uint16_t seqNum) {
     AudioCollection::Instance->AddToCollection(otrPath, seqNum);
 }
 
diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h
index f3fd964bc0..2cdb02e217 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.h
+++ b/soh/soh/Enhancements/audio/AudioCollection.h
@@ -6,16 +6,16 @@
 #include <cstdint>
 
 enum SeqType {
-    SEQ_NOSHUFFLE  = 0,
-    SEQ_BGM_WORLD  = 1 << 0,
-    SEQ_BGM_EVENT  = 1 << 1,
+    SEQ_NOSHUFFLE = 0,
+    SEQ_BGM_WORLD = 1 << 0,
+    SEQ_BGM_EVENT = 1 << 1,
     SEQ_BGM_BATTLE = 1 << 2,
-    SEQ_OCARINA    = 1 << 3,
-    SEQ_FANFARE    = 1 << 4,
-    SEQ_BGM_ERROR  = 1 << 5,
-    SEQ_SFX        = 1 << 6,
+    SEQ_OCARINA = 1 << 3,
+    SEQ_FANFARE = 1 << 4,
+    SEQ_BGM_ERROR = 1 << 5,
+    SEQ_SFX = 1 << 6,
     SEQ_INSTRUMENT = 1 << 7,
-    SEQ_VOICE      = 1 << 8,
+    SEQ_VOICE = 1 << 8,
     SEQ_BGM_CUSTOM = SEQ_BGM_WORLD | SEQ_BGM_EVENT | SEQ_BGM_BATTLE,
 };
 
@@ -31,45 +31,45 @@ struct SequenceInfo {
 };
 
 class AudioCollection {
-    private:
-        // All Loaded Audio
-        std::map<uint16_t, SequenceInfo> sequenceMap;
-        
-        // Sequences/SFX to include in/exclude from shuffle pool
-        struct compareSequenceLabel {
-            bool operator() (SequenceInfo* a, SequenceInfo* b) const {
-                return a->label < b->label;
-            };
-        };
-        std::set<SequenceInfo*, compareSequenceLabel> includedSequences;
-        std::set<SequenceInfo*, compareSequenceLabel> excludedSequences;
-        bool shufflePoolInitialized = false;
+  private:
+    // All Loaded Audio
+    std::map<uint16_t, SequenceInfo> sequenceMap;
 
-    public:
-        static AudioCollection* Instance;
-        AudioCollection();
-        std::map<uint16_t, SequenceInfo> GetAllSequences() const {
-            return sequenceMap;
-        }
-        std::set<SequenceInfo*, compareSequenceLabel> GetIncludedSequences() const {
-            return includedSequences;
+    // Sequences/SFX to include in/exclude from shuffle pool
+    struct compareSequenceLabel {
+        bool operator()(SequenceInfo* a, SequenceInfo* b) const {
+            return a->label < b->label;
         };
-        std::set<SequenceInfo*, compareSequenceLabel> GetExcludedSequences() const {
-            return excludedSequences;
-        };
-        void AddToShufflePool(SequenceInfo*);
-        void RemoveFromShufflePool(SequenceInfo*);
-        void AddToCollection(char* otrPath, uint16_t seqNum);
-        uint16_t GetReplacementSequence(uint16_t seqId);
-        void InitializeShufflePool();
-        const char* GetSequenceName(uint16_t seqId);
-        bool HasSequenceNum(uint16_t seqId);
-        size_t SequenceMapSize();
-        std::string GetCvarKey(std::string sfxKey);
-        std::string GetCvarLockKey(std::string sfxKey);
+    };
+    std::set<SequenceInfo*, compareSequenceLabel> includedSequences;
+    std::set<SequenceInfo*, compareSequenceLabel> excludedSequences;
+    bool shufflePoolInitialized = false;
+
+  public:
+    static AudioCollection* Instance;
+    AudioCollection();
+    std::map<uint16_t, SequenceInfo> GetAllSequences() const {
+        return sequenceMap;
+    }
+    std::set<SequenceInfo*, compareSequenceLabel> GetIncludedSequences() const {
+        return includedSequences;
+    };
+    std::set<SequenceInfo*, compareSequenceLabel> GetExcludedSequences() const {
+        return excludedSequences;
+    };
+    void AddToShufflePool(SequenceInfo*);
+    void RemoveFromShufflePool(SequenceInfo*);
+    void AddToCollection(char* otrPath, uint16_t seqNum);
+    uint16_t GetReplacementSequence(uint16_t seqId);
+    void InitializeShufflePool();
+    const char* GetSequenceName(uint16_t seqId);
+    bool HasSequenceNum(uint16_t seqId);
+    size_t SequenceMapSize();
+    std::string GetCvarKey(std::string sfxKey);
+    std::string GetCvarLockKey(std::string sfxKey);
 };
 #else
-void AudioCollection_AddToCollection(char *otrPath, uint16_t seqNum);
+void AudioCollection_AddToCollection(char* otrPath, uint16_t seqNum);
 const char* AudioCollection_GetSequenceName(uint16_t seqId);
 bool AudioCollection_HasSequenceNum(uint16_t seqId);
 size_t AudioCollection_SequenceMapSize();
diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp
index d15bc5f254..4cf1f389d0 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.cpp
+++ b/soh/soh/Enhancements/audio/AudioEditor.cpp
@@ -12,9 +12,15 @@
 #include "soh/cvar_prefixes.h"
 #include <utils/StringHelper.h>
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "AudioCollection.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
+extern "C" {
+#include "z64save.h"
+extern SaveContext gSaveContext;
+}
+
 Vec3f pos = { 0.0f, 0.0f, 0.0f };
 f32 freqScale = 1.0f;
 s8 reverbAdd = 0;
@@ -52,7 +58,7 @@ size_t AuthenticCountBySequenceType(SeqType type) {
         case SEQ_VOICE:
             return SEQ_COUNT_VOICE;
         default:
-            return 0;        
+            return 0;
     }
 }
 
@@ -95,7 +101,8 @@ void RandomizeGroup(SeqType type) {
         }
 
         // if we didn't find any, return early without shuffling to prevent an infinite loop
-        if (!values.size()) return;
+        if (!values.size())
+            return;
     }
     Shuffle(values);
     for (const auto& [seqId, seqData] : AudioCollection::Instance->GetAllSequences()) {
@@ -104,7 +111,9 @@ void RandomizeGroup(SeqType type) {
         // don't randomize locked entries
         if ((seqData.category & type) && CVarGetInteger(cvarLockKey.c_str(), 0) == 0) {
             // Only save authentic sequence CVars
-            if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) {
+            if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) &&
+                 seqData.sequenceId >= MAX_AUTHENTIC_SEQID) ||
+                seqData.canBeReplaced == false) {
                 continue;
             }
             const int randomValue = values.back();
@@ -165,14 +174,21 @@ void DrawPreviewButton(uint16_t sequenceId, std::string sfxKey, SeqType sequence
     const std::string previewButton = ICON_FA_PLAY + hiddenKey;
 
     if (CVarGetInteger(CVAR_AUDIO("Playing"), 0) == sequenceId) {
-        if (ImGui::Button(stopButton.c_str())) {
+        if (UIWidgets::Button(stopButton.c_str(), UIWidgets::ButtonOptions()
+                                                      .Size(UIWidgets::Sizes::Inline)
+                                                      .Padding(ImVec2(10.0f, 6.0f))
+                                                      .Tooltip("Stop Preview")
+                                                      .Color(THEME_COLOR))) {
             func_800F5C2C();
             CVarSetInteger(CVAR_AUDIO("Playing"), 0);
         }
-        UIWidgets::Tooltip("Stop Preview");
     } else {
-        if (ImGui::Button(previewButton.c_str())) {
-            if  (CVarGetInteger(CVAR_AUDIO("Playing"), 0) != 0) {
+        if (UIWidgets::Button(previewButton.c_str(), UIWidgets::ButtonOptions()
+                                                         .Size(UIWidgets::Sizes::Inline)
+                                                         .Padding(ImVec2(10.0f, 6.0f))
+                                                         .Tooltip("Play Preview")
+                                                         .Color(THEME_COLOR))) {
+            if (CVarGetInteger(CVAR_AUDIO("Playing"), 0) != 0) {
                 func_800F5C2C();
                 CVarSetInteger(CVAR_AUDIO("Playing"), 0);
             } else {
@@ -188,11 +204,10 @@ void DrawPreviewButton(uint16_t sequenceId, std::string sfxKey, SeqType sequence
                 }
             }
         }
-        UIWidgets::Tooltip("Play Preview");
     }
 }
 
-void Draw_SfxTab(const std::string& tabId, SeqType type) {
+void Draw_SfxTab(const std::string& tabId, SeqType type, const std::string& tabName) {
     const std::map<u16, SequenceInfo>& map = AudioCollection::Instance->GetAllSequences();
 
     const std::string hiddenTabId = "##" + tabId;
@@ -200,7 +215,10 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
     const std::string randomizeAllButton = "Randomize All" + hiddenTabId;
     const std::string lockAllButton = "Lock All" + hiddenTabId;
     const std::string unlockAllButton = "Unlock All" + hiddenTabId;
-    if (ImGui::Button(resetAllButton.c_str())) {
+
+    ImGui::SeparatorText(tabName.c_str());
+    if (UIWidgets::Button(resetAllButton.c_str(),
+                          UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
         auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
         auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM);
         ResetGroup(map, type);
@@ -211,7 +229,8 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
         }
     }
     ImGui::SameLine();
-    if (ImGui::Button(randomizeAllButton.c_str())) {
+    if (UIWidgets::Button(randomizeAllButton.c_str(),
+                          UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
         auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
         auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM);
         RandomizeGroup(type);
@@ -222,7 +241,8 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
         }
     }
     ImGui::SameLine();
-    if (ImGui::Button(lockAllButton.c_str())) {
+    if (UIWidgets::Button(lockAllButton.c_str(),
+                          UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
         auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
         auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM);
         LockGroup(map, type);
@@ -233,7 +253,8 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
         }
     }
     ImGui::SameLine();
-    if (ImGui::Button(unlockAllButton.c_str())) {
+    if (UIWidgets::Button(unlockAllButton.c_str(),
+                          UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
         auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
         auto prevReplacement = AudioCollection::Instance->GetReplacementSequence(currentBGM);
         UnlockGroup(map, type);
@@ -244,16 +265,23 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
         }
     }
 
+    auto playingFromMenu = CVarGetInteger(CVAR_AUDIO("Playing"), 0);
+    auto currentBGM = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
+
+    // Longest text in Audio Editor
+    ImVec2 columnSize = ImGui::CalcTextSize("Navi - Look/Hey/Watchout (Target Enemy)");
     ImGui::BeginTable(tabId.c_str(), 3, ImGuiTableFlags_SizingFixedFit);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 100.0f);
+    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, columnSize.x + 30);
+    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, columnSize.x + 30);
+    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 160.0f);
     for (const auto& [defaultValue, seqData] : map) {
         if (~(seqData.category) & type) {
             continue;
         }
         // Do not display custom sequences in the list
-        if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && defaultValue >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) {
+        if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) &&
+             defaultValue >= MAX_AUTHENTIC_SEQID) ||
+            seqData.canBeReplaced == false) {
             continue;
         }
 
@@ -266,17 +294,23 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
         const std::string lockedButton = ICON_FA_LOCK + hiddenKey;
         const std::string unlockedButton = ICON_FA_UNLOCK + hiddenKey;
         const int currentValue = CVarGetInteger(cvarKey.c_str(), defaultValue);
+        const bool isCurrentlyPlaying = currentValue == playingFromMenu || seqData.sequenceId == currentBGM;
 
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
-        ImGui::Text("%s", seqData.label.c_str());
+        ImGui::TextColored(
+            UIWidgets::ColorValues.at(isCurrentlyPlaying ? UIWidgets::Colors::Yellow : UIWidgets::Colors::White), "%s",
+            seqData.label.c_str());
         ImGui::TableNextColumn();
         ImGui::PushItemWidth(-FLT_MIN);
         const int initialValue = map.contains(currentValue) ? currentValue : defaultValue;
+        UIWidgets::PushStyleCombobox(THEME_COLOR);
         if (ImGui::BeginCombo(hiddenKey.c_str(), map.at(initialValue).label.c_str())) {
             for (const auto& [value, seqData] : map) {
-                // If excluded as a replacement sequence, don't show in other dropdowns except the effect's own dropdown.
-                if (~(seqData.category) & type || (!seqData.canBeUsedAsReplacement && initialSfxKey != seqData.sfxKey)) {
+                // If excluded as a replacement sequence, don't show in other dropdowns except the effect's own
+                // dropdown.
+                if (~(seqData.category) & type ||
+                    (!seqData.canBeUsedAsReplacement && initialSfxKey != seqData.sfxKey)) {
                     continue;
                 }
 
@@ -293,22 +327,32 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
 
             ImGui::EndCombo();
         }
+        UIWidgets::PopStyleCombobox();
         ImGui::TableNextColumn();
         ImGui::PushItemWidth(-FLT_MIN);
-        DrawPreviewButton((type == SEQ_SFX || type == SEQ_VOICE || type == SEQ_INSTRUMENT) ? defaultValue : currentValue, seqData.sfxKey, type);
-		auto locked = CVarGetInteger(cvarLockKey.c_str(), 0) == 1;
+        DrawPreviewButton((type == SEQ_SFX || type == SEQ_VOICE || type == SEQ_INSTRUMENT) ? defaultValue
+                                                                                           : currentValue,
+                          seqData.sfxKey, type);
+        auto locked = CVarGetInteger(cvarLockKey.c_str(), 0) == 1;
         ImGui::SameLine();
         ImGui::PushItemWidth(-FLT_MIN);
-        if (ImGui::Button(resetButton.c_str())) {
+        if (UIWidgets::Button(resetButton.c_str(), UIWidgets::ButtonOptions()
+                                                       .Size(UIWidgets::Sizes::Inline)
+                                                       .Padding(ImVec2(10.0f, 6.0f))
+                                                       .Tooltip("Reset to default")
+                                                       .Color(THEME_COLOR))) {
             CVarClear(cvarKey.c_str());
             CVarClear(cvarLockKey.c_str());
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             UpdateCurrentBGM(defaultValue, seqData.category);
         }
-        UIWidgets::Tooltip("Reset to default");
         ImGui::SameLine();
         ImGui::PushItemWidth(-FLT_MIN);
-        if (ImGui::Button(randomizeButton.c_str())) {
+        if (UIWidgets::Button(randomizeButton.c_str(), UIWidgets::ButtonOptions()
+                                                           .Size(UIWidgets::Sizes::Inline)
+                                                           .Padding(ImVec2(10.0f, 6.0f))
+                                                           .Tooltip("Randomize this sound")
+                                                           .Color(THEME_COLOR))) {
             std::vector<SequenceInfo*> validSequences = {};
             for (const auto seqInfo : AudioCollection::Instance->GetIncludedSequences()) {
                 if (seqInfo->category & type) {
@@ -325,12 +369,16 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
                 }
                 Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 UpdateCurrentBGM(defaultValue, type);
-            } 
+            }
         }
-        UIWidgets::Tooltip("Randomize this sound");
         ImGui::SameLine();
         ImGui::PushItemWidth(-FLT_MIN);
-        if (ImGui::Button(locked ? lockedButton.c_str() : unlockedButton.c_str())) {
+        if (UIWidgets::Button(locked ? lockedButton.c_str() : unlockedButton.c_str(),
+                              UIWidgets::ButtonOptions()
+                                  .Size(UIWidgets::Sizes::Inline)
+                                  .Padding(ImVec2(10.0f, 6.0f))
+                                  .Tooltip(locked ? "Sound locked" : "Sound unlocked")
+                                  .Color(THEME_COLOR))) {
             if (locked) {
                 CVarClear(cvarLockKey.c_str());
             } else {
@@ -338,7 +386,6 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) {
             }
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         }
-        UIWidgets::Tooltip(locked ? "Sound locked" : "Sound unlocked");
     }
     ImGui::EndTable();
 }
@@ -401,18 +448,18 @@ ImVec4 GetSequenceTypeColor(SeqType type) {
     }
 }
 
-void DrawTypeChip(SeqType type) {
+void DrawTypeChip(SeqType type, std::string sequenceName) {
     ImGui::BeginDisabled();
     ImGui::PushStyleColor(ImGuiCol_Button, GetSequenceTypeColor(type));
-    ImGui::SmallButton(GetSequenceTypeName(type).c_str());
+    std::string buttonLabel = GetSequenceTypeName(type) + "##" + sequenceName;
+    ImGui::Button(buttonLabel.c_str());
     ImGui::PopStyleColor();
     ImGui::EndDisabled();
 }
 
-
 void AudioEditorRegisterOnSceneInitHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
-        if (CVarGetInteger(CVAR_AUDIO("RandomizeAllOnNewScene"), 0)) {
+        if (gSaveContext.gameMode != GAMEMODE_END_CREDITS && CVarGetInteger(CVAR_AUDIO("RandomizeAllOnNewScene"), 0)) {
             AudioEditor_RandomizeAll();
         }
     });
@@ -425,114 +472,112 @@ void AudioEditor::InitElement() {
 void AudioEditor::DrawElement() {
     AudioCollection::Instance->InitializeShufflePool();
 
-    float buttonSegments = ImGui::GetContentRegionAvail().x / 4;
-    if (ImGui::Button("Randomize All Groups", ImVec2(buttonSegments, 30.0f))) {
+    UIWidgets::Separator();
+    if (UIWidgets::Button("Randomize All Groups",
+                          UIWidgets::ButtonOptions()
+                              .Size(ImVec2(230.0f, 0.0f))
+                              .Color(THEME_COLOR)
+                              .Tooltip("Randomizes all unlocked music and sound effects across tab groups"))) {
         AudioEditor_RandomizeAll();
     }
-    UIWidgets::Tooltip("Randomizes all unlocked music and sound effects across tab groups");
     ImGui::SameLine();
-    if (ImGui::Button("Reset All Groups", ImVec2(buttonSegments, 30.0f))) {
+    if (UIWidgets::Button("Reset All Groups",
+                          UIWidgets::ButtonOptions()
+                              .Size(ImVec2(230.0f, 0.0f))
+                              .Color(THEME_COLOR)
+                              .Tooltip("Resets all unlocked music and sound effects across tab groups"))) {
         AudioEditor_ResetAll();
     }
-    UIWidgets::Tooltip("Resets all unlocked music and sound effects across tab groups");
     ImGui::SameLine();
-    if (ImGui::Button("Lock All Groups", ImVec2(buttonSegments, 30.0f))) {
+    if (UIWidgets::Button("Lock All Groups", UIWidgets::ButtonOptions()
+                                                 .Size(ImVec2(230.0f, 0.0f))
+                                                 .Color(THEME_COLOR)
+                                                 .Tooltip("Locks all music and sound effects across tab groups"))) {
         AudioEditor_LockAll();
     }
-    UIWidgets::Tooltip("Locks all music and sound effects across tab groups");
     ImGui::SameLine();
-    if (ImGui::Button("Unlock All Groups", ImVec2(buttonSegments, 30.0f))) {
+    if (UIWidgets::Button("Unlock All Groups", UIWidgets::ButtonOptions()
+                                                   .Size(ImVec2(230.0f, 0.0f))
+                                                   .Color(THEME_COLOR)
+                                                   .Tooltip("Unlocks all music and sound effects across tab groups"))) {
         AudioEditor_UnlockAll();
     }
-    UIWidgets::Tooltip("Unlocks all music and sound effects across tab groups");
-
+    UIWidgets::Separator();
 
+    UIWidgets::PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("SfxContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
-        if (ImGui::BeginTabItem("Background Music")) {
-            Draw_SfxTab("backgroundMusic", SEQ_BGM_WORLD);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Fanfares")) {
-            Draw_SfxTab("fanfares", SEQ_FANFARE);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Events")) {
-            Draw_SfxTab("event", SEQ_BGM_EVENT);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Battle Music")) {
-            Draw_SfxTab("battleMusic", SEQ_BGM_BATTLE);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Ocarina")) {
-            Draw_SfxTab("instrument", SEQ_INSTRUMENT);
-            Draw_SfxTab("ocarina", SEQ_OCARINA);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Sound Effects")) {
-            Draw_SfxTab("sfx", SEQ_SFX);
-            ImGui::EndTabItem();
-        }
-        if (ImGui::BeginTabItem("Voices")) {
-            Draw_SfxTab("voice", SEQ_VOICE);
-            ImGui::EndTabItem();
-        }
 
         static ImVec2 cellPadding(8.0f, 8.0f);
-        if (ImGui::BeginTabItem("Options")) {
+        if (ImGui::BeginTabItem("Audio Options")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            ImGui::BeginTable("Options", 1, ImGuiTableFlags_SizingStretchSame);
+            ImGui::BeginTable("Audio Options", 1, ImGuiTableFlags_SizingStretchSame);
             ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
             if (ImGui::BeginChild("SfxOptions", ImVec2(0, -8))) {
-                ImGui::PushItemWidth(-FLT_MIN);
-                UIWidgets::EnhancementCheckbox("Disable Enemy Proximity Music", CVAR_AUDIO("EnemyBGMDisable"));
-                UIWidgets::InsertHelpHoverText(
-                    "Disables the music change when getting close to enemies. Useful for hearing "
-                    "your custom music for each scene more often.");
-                UIWidgets::EnhancementCheckbox("Disable Leading Music in Lost Woods", CVAR_AUDIO("LostWoodsConsistentVolume"));
-                UIWidgets::InsertHelpHoverText(
-                    "Disables the volume shifting in the Lost Woods. Useful for hearing "
-                    "your custom music in the Lost Woods if you don't need the navigation assitance "
-                    "the volume changing provides. If toggling this while in the Lost Woods, reload "
-                    "the area for the effect to kick in."
-                );
-                UIWidgets::EnhancementCheckbox("Display Sequence Name on Overlay", CVAR_AUDIO("SeqNameOverlay"));
-                UIWidgets::InsertHelpHoverText(
-                    "Displays the name of the current sequence in the corner of the screen whenever a new sequence "
-                    "is loaded to the main sequence player (does not apply to fanfares or enemy BGM)."
-                );
+                UIWidgets::CVarCheckbox(
+                    "Mute Low HP Alarm", CVAR_AUDIO("LowHpAlarm"),
+                    UIWidgets::CheckboxOptions().Color(THEME_COLOR).Tooltip("Disable the low HP beeping sound."));
+                UIWidgets::CVarCheckbox("Disable Navi Call Audio", CVAR_AUDIO("DisableNaviCallAudio"),
+                                        UIWidgets::CheckboxOptions()
+                                            .Color(THEME_COLOR)
+                                            .Tooltip("Disables the voice audio when Navi calls you."));
+                UIWidgets::CVarCheckbox(
+                    "Disable Enemy Proximity Music", CVAR_AUDIO("EnemyBGMDisable"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Disables the music change when getting close to enemies. Useful for hearing "
+                                 "your custom music for each scene more often."));
+                UIWidgets::CVarCheckbox(
+                    "Disable Leading Music in Lost Woods", CVAR_AUDIO("LostWoodsConsistentVolume"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Disables the volume shifting in the Lost Woods. Useful for hearing "
+                                 "your custom music in the Lost Woods if you don't need the navigation assitance "
+                                 "the volume changing provides. If toggling this while in the Lost Woods, reload "
+                                 "the area for the effect to kick in."));
+                UIWidgets::CVarCheckbox(
+                    "Display Sequence Name on Overlay", CVAR_AUDIO("SeqNameOverlay"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Displays the name of the current sequence in the corner of the screen whenever a new "
+                                 "sequence "
+                                 "is loaded to the main sequence player (does not apply to fanfares or enemy BGM)."));
+                UIWidgets::CVarSliderInt("Overlay Duration: %d seconds", CVAR_AUDIO("SeqNameOverlayDuration"),
+                                         UIWidgets::IntSliderOptions()
+                                             .Min(1)
+                                             .Max(10)
+                                             .DefaultValue(5)
+                                             .Size(ImVec2(300.0f, 0.0f))
+                                             .Color(THEME_COLOR));
+                UIWidgets::CVarSliderFloat("Link's voice pitch multiplier", CVAR_AUDIO("LinkVoiceFreqMultiplier"),
+                                           UIWidgets::FloatSliderOptions()
+                                               .IsPercentage()
+                                               .Min(0.4f)
+                                               .Max(2.5f)
+                                               .DefaultValue(1.0f)
+                                               .Size(ImVec2(300.0f, 0.0f))
+                                               .Color(THEME_COLOR));
                 ImGui::SameLine();
-                ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-                UIWidgets::EnhancementSliderInt("Overlay Duration: %d seconds", "##SeqNameOverlayDuration",
-                                                CVAR_AUDIO("SeqNameOverlayDuration"), 1, 10, "", 5);
-                ImGui::PopItemWidth();
-                ImGui::NewLine();
-                ImGui::PopItemWidth();
-                UIWidgets::EnhancementSliderFloat("Link's voice pitch multiplier: %.1f %%", "##linkVoiceFreqMultiplier",
-                        CVAR_AUDIO("LinkVoiceFreqMultiplier"), 0.4, 2.5, "", 1.0, true, true);
-                ImGui::SameLine();
-                const std::string resetButton = "Reset##linkVoiceFreqMultiplier";
-                if (ImGui::Button(resetButton.c_str())) {
+                ImGui::SetCursorPosY(ImGui::GetCursorPos().y + 40.f);
+                if (UIWidgets::Button("Reset##linkVoiceFreqMultiplier",
+                                      UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
                     CVarSetFloat(CVAR_AUDIO("LinkVoiceFreqMultiplier"), 1.0f);
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 }
-
-                ImGui::NewLine();
-                UIWidgets::EnhancementCheckbox("Randomize All Music and Sound Effects on New Scene", CVAR_AUDIO("RandomizeAllOnNewScene"));
-                UIWidgets::Tooltip("Enables randomizing all unlocked music and sound effects when you enter a new scene.");
-
-                ImGui::NewLine();
-                ImGui::PushItemWidth(-FLT_MIN);
-                UIWidgets::PaddedSeparator();
-                UIWidgets::PaddedText("The following options are experimental and may cause music\nto sound odd or have other undesireable effects.");
-                UIWidgets::EnhancementCheckbox("Lower Octaves of Unplayable High Notes", CVAR_AUDIO("ExperimentalOctaveDrop"));
-                UIWidgets::InsertHelpHoverText("Some custom sequences may have notes that are too high for the game's audio "
-                                            "engine to play. Enabling this checkbox will cause these notes to drop a "
-                                            "couple of octaves so they can still harmonize with the other notes of the "
-                                            "sequence.");
-                ImGui::PopItemWidth();
+                UIWidgets::CVarCheckbox(
+                    "Randomize All Music and Sound Effects on New Scene", CVAR_AUDIO("RandomizeAllOnNewScene"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip(
+                            "Enables randomizing all unlocked music and sound effects when you enter a new scene."));
+                UIWidgets::CVarCheckbox(
+                    "Lower Octaves of Unplayable High Notes", CVAR_AUDIO("ExperimentalOctaveDrop"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Some custom sequences may have notes that are too high for the game's audio "
+                                 "engine to play. Enabling this checkbox will cause these notes to drop a "
+                                 "couple of octaves so they can still harmonize with the other notes of the "
+                                 "sequence."));
             }
             ImGui::EndChild();
             ImGui::EndTable();
@@ -540,6 +585,36 @@ void AudioEditor::DrawElement() {
             ImGui::EndTabItem();
         }
 
+        if (ImGui::BeginTabItem("Background Music")) {
+            Draw_SfxTab("backgroundMusic", SEQ_BGM_WORLD, "Background Music");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Fanfares")) {
+            Draw_SfxTab("fanfares", SEQ_FANFARE, "Fanfares");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Events")) {
+            Draw_SfxTab("event", SEQ_BGM_EVENT, "Events");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Battle Music")) {
+            Draw_SfxTab("battleMusic", SEQ_BGM_BATTLE, "Battle Music");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Ocarina")) {
+            Draw_SfxTab("instrument", SEQ_INSTRUMENT, "Instruments");
+            Draw_SfxTab("ocarina", SEQ_OCARINA, "Ocarina");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Sound Effects")) {
+            Draw_SfxTab("sfx", SEQ_SFX, "Sound Effects");
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Voices")) {
+            Draw_SfxTab("voice", SEQ_VOICE, "Voices");
+            ImGui::EndTabItem();
+        }
+
         static bool excludeTabOpen = false;
         if (ImGui::BeginTabItem("Audio Shuffle Pool Management")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
@@ -547,16 +622,10 @@ void AudioEditor::DrawElement() {
                 excludeTabOpen = true;
             }
 
-            static std::map<SeqType, bool> showType {
-                {SEQ_BGM_WORLD, true},
-                {SEQ_BGM_EVENT, true},
-                {SEQ_BGM_BATTLE, true},
-                {SEQ_OCARINA, true},
-                {SEQ_FANFARE, true},    
-                {SEQ_SFX, true },                                     
-                {SEQ_VOICE, true },
-                {SEQ_INSTRUMENT, true},
-                {SEQ_BGM_CUSTOM, true}
+            static std::map<SeqType, bool> showType{
+                { SEQ_BGM_WORLD, true }, { SEQ_BGM_EVENT, true },  { SEQ_BGM_BATTLE, true },
+                { SEQ_OCARINA, true },   { SEQ_FANFARE, true },    { SEQ_SFX, true },
+                { SEQ_VOICE, true },     { SEQ_INSTRUMENT, true }, { SEQ_BGM_CUSTOM, true },
             };
 
             // make temporary sets because removing from the set we're iterating through crashes ImGui
@@ -564,9 +633,12 @@ void AudioEditor::DrawElement() {
             std::set<SequenceInfo*> seqsToExclude = {};
 
             static ImGuiTextFilter sequenceSearch;
+            UIWidgets::PushStyleInput(THEME_COLOR);
             sequenceSearch.Draw("Filter (inc,-exc)", 490.0f);
+            UIWidgets::PopStyleInput();
             ImGui::SameLine();
-            if (ImGui::Button("Exclude All")) {
+            if (UIWidgets::Button("Exclude All",
+                                  UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
                 for (auto seqInfo : AudioCollection::Instance->GetIncludedSequences()) {
                     if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) {
                         seqsToExclude.insert(seqInfo);
@@ -574,7 +646,8 @@ void AudioEditor::DrawElement() {
                 }
             }
             ImGui::SameLine();
-            if (ImGui::Button("Include All")) {
+            if (UIWidgets::Button("Include All",
+                                  UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline).Color(THEME_COLOR))) {
                 for (auto seqInfo : AudioCollection::Instance->GetExcludedSequences()) {
                     if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) {
                         seqsToInclude.insert(seqInfo);
@@ -582,7 +655,8 @@ void AudioEditor::DrawElement() {
                 }
             }
 
-            ImGui::BeginTable("sequenceTypes", 9, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders);
+            ImGui::BeginTable("sequenceTypes", 9,
+                              ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders);
 
             ImGui::TableNextColumn();
             ImGui::PushStyleColor(ImGuiCol_Header, GetSequenceTypeColor(SEQ_BGM_WORLD));
@@ -643,13 +717,17 @@ void AudioEditor::DrawElement() {
                 ImGui::BeginChild("ChildIncludedSequences", ImVec2(0, -8));
                 for (auto seqInfo : AudioCollection::Instance->GetIncludedSequences()) {
                     if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) {
-                        if (ImGui::Button(std::string(ICON_FA_TIMES "##" + seqInfo->sfxKey).c_str())) {
+                        if (UIWidgets::Button(std::string(ICON_FA_TIMES "##" + seqInfo->sfxKey).c_str(),
+                                              UIWidgets::ButtonOptions()
+                                                  .Size(UIWidgets::Sizes::Inline)
+                                                  .Padding(ImVec2(9.0f, 6.0f))
+                                                  .Color(THEME_COLOR))) {
                             seqsToExclude.insert(seqInfo);
                         }
                         ImGui::SameLine();
                         DrawPreviewButton(seqInfo->sequenceId, seqInfo->sfxKey, seqInfo->category);
                         ImGui::SameLine();
-                        DrawTypeChip(seqInfo->category);
+                        DrawTypeChip(seqInfo->category, seqInfo->label);
                         ImGui::SameLine();
                         ImGui::Text("%s", seqInfo->label.c_str());
                     }
@@ -667,13 +745,17 @@ void AudioEditor::DrawElement() {
                 ImGui::BeginChild("ChildExcludedSequences", ImVec2(0, -8));
                 for (auto seqInfo : AudioCollection::Instance->GetExcludedSequences()) {
                     if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) {
-                        if (ImGui::Button(std::string(ICON_FA_PLUS "##" + seqInfo->sfxKey).c_str())) {
+                        if (UIWidgets::Button(std::string(ICON_FA_PLUS "##" + seqInfo->sfxKey).c_str(),
+                                              UIWidgets::ButtonOptions()
+                                                  .Size(UIWidgets::Sizes::Inline)
+                                                  .Padding(ImVec2(9.0f, 6.0f))
+                                                  .Color(THEME_COLOR))) {
                             seqsToInclude.insert(seqInfo);
                         }
                         ImGui::SameLine();
                         DrawPreviewButton(seqInfo->sequenceId, seqInfo->sfxKey, seqInfo->category);
                         ImGui::SameLine();
-                        DrawTypeChip(seqInfo->category);
+                        DrawTypeChip(seqInfo->category, seqInfo->sfxKey);
                         ImGui::SameLine();
                         ImGui::Text("%s", seqInfo->label.c_str());
                     }
@@ -695,9 +777,12 @@ void AudioEditor::DrawElement() {
 
         ImGui::EndTabBar();
     }
+    UIWidgets::PopStyleTabs();
 }
 
-std::vector<SeqType> allTypes = { SEQ_BGM_WORLD, SEQ_BGM_EVENT, SEQ_BGM_BATTLE, SEQ_OCARINA, SEQ_FANFARE, SEQ_INSTRUMENT, SEQ_SFX, SEQ_VOICE };
+std::vector<SeqType> allTypes = {
+    SEQ_BGM_WORLD, SEQ_BGM_EVENT, SEQ_BGM_BATTLE, SEQ_OCARINA, SEQ_FANFARE, SEQ_INSTRUMENT, SEQ_SFX, SEQ_VOICE,
+};
 
 void AudioEditor_RandomizeAll() {
     for (auto type : allTypes) {
diff --git a/soh/soh/Enhancements/audio/AudioEditor.h b/soh/soh/Enhancements/audio/AudioEditor.h
index b1b034f246..ca3636d9a8 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.h
+++ b/soh/soh/Enhancements/audio/AudioEditor.h
@@ -7,14 +7,14 @@
 #include <imgui.h>
 #include "AudioCollection.h"
 
-class AudioEditor : public Ship::GuiWindow {
-    public:
-        using GuiWindow::GuiWindow;
+class AudioEditor final : public Ship::GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
 
-        void DrawElement() override;
-        void InitElement() override;
-        void UpdateElement() override {};
-        ~AudioEditor() {};
+    void DrawElement() override;
+    void InitElement() override;
+    void UpdateElement() override{};
+    ~AudioEditor(){};
 };
 
 void AudioEditor_RandomizeAll();
@@ -29,7 +29,6 @@ extern "C" {
 
 u16 AudioEditor_GetReplacementSeq(u16 seqId);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index ac2ae2bc53..dde827ec57 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -12,8 +12,7 @@
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 
-void BootCommands_Init()
-{
+void BootCommands_Init() {
     // Clears vars to prevent randomizer menu from being disabled
     CVarClear(CVAR_GENERAL("RandoGenerating")); // Clear when a crash happened during rando seed generation
     CVarClear(CVAR_GENERAL("NewSeedGenerated"));
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index aabe5d67ab..979f0ad6a2 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -1,4 +1,4 @@
-#include "BossRush.h"
+#include "BossRush.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
@@ -8,18 +8,18 @@
 #include <vector>
 
 extern "C" {
-    #include "functions.h"
-    #include "macros.h"
-    #include "variables.h"
-    #include "src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
-    #include "src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h"
-    #include "src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
-    extern PlayState* gPlayState;
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
+#include "src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
+#include "src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h"
+#include "src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
+extern PlayState* gPlayState;
 
-    Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
-    #include "textures/icon_item_nes_static/icon_item_nes_static.h"
-    #include "textures/icon_item_ger_static/icon_item_ger_static.h"
-    #include "textures/icon_item_fra_static/icon_item_fra_static.h"
+Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
+#include "textures/icon_item_nes_static/icon_item_nes_static.h"
+#include "textures/icon_item_ger_static/icon_item_ger_static.h"
+#include "textures/icon_item_fra_static/icon_item_fra_static.h"
 }
 
 typedef struct BossRushSetting {
@@ -27,103 +27,79 @@ typedef struct BossRushSetting {
     std::vector<std::array<std::string, LANGUAGE_MAX>> choices;
 } BossRushSetting;
 
-BossRushSetting BossRushOptions[BR_OPTIONS_MAX] = { 
-    {
-        { "BOSSES:", "BOSSE:", "BOSS:" },
-        {
-            { "All", "Alle", "Tous" },
-            { "Child", "Kind", "Enfant" },
-            { "Adult", "Erwachsener", "Adulte" },
-            { "Ganondorf & Ganon", "Ganondorf & Ganon", "Ganondorf & Ganon" }
-        }
-    },
-    {
-        { "HEARTS:", "HERZEN:", "COEURS:" },
-        {
-            { "10", "10", "10" },
-            { "15", "15", "15" },
-            { "20", "20", "20" },
-            { "3", "3", "3" },
-            { "5", "5", "5" },
-            { "7", "7", "7" }
-        }
-    },
-    {
-        { "AMMO:", "MUNITION:", "MUNITIONS:" },
-        {
-            { "Limited", "Limitiert", "Limitées" },
-            { "Full", "Voll", "Pleines" },
-            { "Maxed", "Maximum", "Maximum" }
-        }
-    },
-    {
-        { "HEAL:", "REGENERATION:", "SOIN:" },
-        {
-            { "Before Ganondorf", "Vor Ganondorf", "Avant Ganondorf" },
-            { "Every Boss", "Bei jedem Boss", "Tous les Boss" },
-            { "Never", "Niemals", "Jamais" }
-        }
-    },
-    {
-        { "HYPER BOSSES:", "HYPER-BOSSE:", "HYPER BOSS:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Yes", "Ja", "Oui" }
-        }
-    },
-    {
-        { "MAGIC:", "MAGIE:", "MAGIE:" },
-        {
-            { "Single", "Einzel", "Simple" },
-            { "Double", "Doppel", "Double" }
-        }
-    },
-    {
-        { "BIG. SWORD:", "BIG.-SCHWERT:", "EPÉE DE BIG.:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Yes", "Ja", "Oui" }
-        }
-    },
-    {
-        { "BOTTLE:", "FLASCHEN:", "BOUTEILLE:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Empty", "Leer", "Vide" },
-            { "Fairy", "Fee", "Fée" },
-            { "Red Potion", "Rotes Elixier", "Potion Rouge" },
-            { "Green Potion", "Grünes Elixier", "Potion Verte" },
-            { "Blue Potion", "Blaues Elixier", "Potion Bleue" }
-        }
-    },
-    {
-        { "LONGSHOT:", "ENTERHAKEN:", "SUPER GRAPPIN:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Yes", "Ja", "Oui" }
-        }
-    },
-    {
-        { "HOVER BOOTS:", "GLEITSTIEFEL:", "BOTTES DES AIRS:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Yes", "Ja", "Oui" }
-        }
-    },
-    {
-        { "BUNNY HOOD:", "HASENOHREN:", "MASQUE DU LAPIN:" },
-        {
-            { "No", "Nein", "Non" },
-            { "Yes", "Ja", "Oui" }
-        }
-    },
-    {
-        { "TIMER:", "TIMER:", "TIMER:" },
-        {
-            { "Yes", "Ja", "Oui" },
-            { "No", "Nein", "Non" }
-        }
-    }
+BossRushSetting BossRushOptions[BR_OPTIONS_MAX] = {
+    { { "BOSSES:", "BOSSE:", "BOSS:" },
+      {
+          { "All", "Alle", "Tous" },
+          { "Child", "Kind", "Enfant" },
+          { "Adult", "Erwachsener", "Adulte" },
+          { "Ganondorf & Ganon", "Ganondorf & Ganon", "Ganondorf & Ganon" },
+      } },
+    { { "HEARTS:", "HERZEN:", "COEURS:" },
+      {
+          { "10", "10", "10" },
+          { "15", "15", "15" },
+          { "20", "20", "20" },
+          { "3", "3", "3" },
+          { "5", "5", "5" },
+          { "7", "7", "7" },
+      } },
+    { { "AMMO:", "MUNITION:", "MUNITIONS:" },
+      {
+          { "Limited", "Limitiert", "Limitées" },
+          { "Full", "Voll", "Pleines" },
+          { "Maxed", "Maximum", "Maximum" },
+      } },
+    { { "HEAL:", "REGENERATION:", "SOIN:" },
+      {
+          { "Before Ganondorf", "Vor Ganondorf", "Avant Ganondorf" },
+          { "Every Boss", "Bei jedem Boss", "Tous les Boss" },
+          { "Never", "Niemals", "Jamais" },
+      } },
+    { { "HYPER BOSSES:", "HYPER-BOSSE:", "HYPER BOSS:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Yes", "Ja", "Oui" },
+      } },
+    { { "MAGIC:", "MAGIE:", "MAGIE:" },
+      {
+          { "Single", "Einzel", "Simple" },
+          { "Double", "Doppel", "Double" },
+      } },
+    { { "BIG. SWORD:", "BIG.-SCHWERT:", "EPÉE DE BIG.:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Yes", "Ja", "Oui" },
+      } },
+    { { "BOTTLE:", "FLASCHEN:", "BOUTEILLE:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Empty", "Leer", "Vide" },
+          { "Fairy", "Fee", "Fée" },
+          { "Red Potion", "Rotes Elixier", "Potion Rouge" },
+          { "Green Potion", "Grünes Elixier", "Potion Verte" },
+          { "Blue Potion", "Blaues Elixier", "Potion Bleue" },
+      } },
+    { { "LONGSHOT:", "ENTERHAKEN:", "SUPER GRAPPIN:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Yes", "Ja", "Oui" },
+      } },
+    { { "HOVER BOOTS:", "GLEITSTIEFEL:", "BOTTES DES AIRS:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Yes", "Ja", "Oui" },
+      } },
+    { { "BUNNY HOOD:", "HASENOHREN:", "MASQUE DU LAPIN:" },
+      {
+          { "No", "Nein", "Non" },
+          { "Yes", "Ja", "Oui" },
+      } },
+    { { "TIMER:", "TIMER:", "TIMER:" },
+      {
+          { "Yes", "Ja", "Oui" },
+          { "No", "Nein", "Non" },
+      } }
 };
 
 const char* BossRush_GetSettingName(u8 optionIndex, u8 language) {
@@ -135,7 +111,7 @@ const char* BossRush_GetSettingChoiceName(u8 optionIndex, u8 choiceIndex, u8 lan
 }
 
 u8 BossRush_GetSettingOptionsAmount(u8 optionIndex) {
-    return BossRushOptions[optionIndex].choices.size();
+    return static_cast<u8>(BossRushOptions[optionIndex].choices.size());
 }
 
 void BossRush_SpawnBlueWarps(PlayState* play) {
@@ -196,7 +172,7 @@ void BossRush_SetEquipment(u8 linkAge) {
 
         Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
         Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU);
-    // Set Adult equipment.
+        // Set Adult equipment.
     } else {
         brButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW,  ITEM_HAMMER, ITEM_BOMB,
                           ITEM_NONE,         ITEM_NONE, ITEM_NONE,   ITEM_NONE };
@@ -229,34 +205,36 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
             } else {
                 play->nextEntranceIndex = ENTR_FOREST_TEMPLE_BOSS_ENTRANCE;
             }
-        // King Dodongo & Volvagia
+            // King Dodongo & Volvagia
         } else if (warpPosX == 100 && warpPosZ == -170) {
             if (gSaveContext.linkAge == LINK_AGE_CHILD) {
                 play->nextEntranceIndex = ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE;
             } else {
                 play->nextEntranceIndex = ENTR_FIRE_TEMPLE_BOSS_ENTRANCE;
             }
-        // Barinade & Morb
+            // Barinade & Morb
         } else if (warpPosX == 199 && warpPosZ == 0) {
             if (gSaveContext.linkAge == LINK_AGE_CHILD) {
                 play->nextEntranceIndex = ENTR_JABU_JABU_BOSS_ENTRANCE;
             } else {
                 play->nextEntranceIndex = ENTR_WATER_TEMPLE_BOSS_ENTRANCE;
             }
-        // Twinrova
+            // Twinrova
         } else if (warpPosX == 100 && warpPosZ == 170) {
             play->nextEntranceIndex = ENTR_SPIRIT_TEMPLE_BOSS_2;
-        // Bongo Bongo
+            // Bongo Bongo
         } else if (warpPosX == -100 && warpPosZ == 170) {
             play->nextEntranceIndex = ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE;
-        // Ganondork
+            // Ganondork
         } else if (warpPosX == -199 && warpPosZ == 0) {
             play->nextEntranceIndex = ENTR_GANONDORF_BOSS_0;
         } else {
-            SPDLOG_ERROR("[BossRush]: Unknown blue warp in chamber of sages at position ({}, {}). Warping back to chamber of sages.", warpPosX, warpPosZ);
+            SPDLOG_ERROR("[BossRush]: Unknown blue warp in chamber of sages at position ({}, {}). Warping back to "
+                         "chamber of sages.",
+                         warpPosX, warpPosZ);
             play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
         }
-    // If coming from a boss room, teleport back to Chamber of Sages and set flag.
+        // If coming from a boss room, teleport back to Chamber of Sages and set flag.
     } else {
         play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
 
@@ -267,7 +245,7 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) {
             // Change to Adult Link.
             if (gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_ALL) {
                 BossRush_SetEquipment(LINK_AGE_ADULT);
-            // Warp to credits.
+                // Warp to credits.
             } else if (gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_CHILD) {
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 gSaveContext.nextCutsceneIndex = 0xFFF2;
@@ -328,11 +306,13 @@ void BossRush_HandleCompleteBoss(PlayState* play) {
         Health_ChangeBy(play, 320);
     }
 
-    if ((CheckDungeonCount() == 3 && gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_CHILD) ||
+    if ((CheckDungeonCount() == 3 &&
+         gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_CHILD) ||
         play->sceneNum == SCENE_GANON_BOSS) {
         gSaveContext.ship.stats.playTimer += 2;
         gSaveContext.ship.stats.gameComplete = 1;
-        gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_BOSSRUSH_FINISH] = GAMEPLAYSTAT_TOTAL_TIME;
+        gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_BOSSRUSH_FINISH] =
+            static_cast<uint32_t>(GAMEPLAYSTAT_TOTAL_TIME);
     }
 }
 
@@ -399,17 +379,17 @@ void BossRush_InitSave() {
     gSaveContext.eventChkInf[7] |= 0x80; // bongo bongo
 
     // Sets all rando flags to false
-    // Boss Rush currently uses 2 randomizer flags (RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE & RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)
+    // Boss Rush currently uses 2 randomizer flags (RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE &
+    // RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)
     for (s32 i = 0; i < ARRAY_COUNT(gSaveContext.ship.randomizerInf); i++) {
         gSaveContext.ship.randomizerInf[i] = 0;
     }
 
     // Set items
     std::array<u8, 24> brItems = {
-        ITEM_STICK,     ITEM_NUT,  ITEM_BOMB, ITEM_BOW,      ITEM_NONE,        ITEM_NONE,
-        ITEM_SLINGSHOT, ITEM_NONE, ITEM_NONE, ITEM_HOOKSHOT, ITEM_NONE,        ITEM_NONE,
-        ITEM_BOOMERANG, ITEM_LENS, ITEM_NONE, ITEM_HAMMER,   ITEM_ARROW_LIGHT, ITEM_NONE,
-        ITEM_NONE,      ITEM_NONE, ITEM_NONE, ITEM_NONE,     ITEM_NONE,        ITEM_NONE,
+        ITEM_STICK,       ITEM_NUT,      ITEM_BOMB, ITEM_BOW,  ITEM_NONE,      ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE,
+        ITEM_NONE,        ITEM_HOOKSHOT, ITEM_NONE, ITEM_NONE, ITEM_BOOMERANG, ITEM_LENS, ITEM_NONE,      ITEM_HAMMER,
+        ITEM_ARROW_LIGHT, ITEM_NONE,     ITEM_NONE, ITEM_NONE, ITEM_NONE,      ITEM_NONE, ITEM_NONE,      ITEM_NONE,
     };
 
     if (gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_LONGSHOT] == BR_CHOICE_LONGSHOT_YES) {
@@ -507,7 +487,7 @@ void BossRush_InitSave() {
 static void* sSavePromptNoChoiceTexs[] = {
     (void*)gPauseNoENGTex,
     (void*)gPauseNoGERTex,
-    (void*)gPauseNoFRATex
+    (void*)gPauseNoFRATex,
 };
 
 void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
@@ -541,11 +521,13 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                             break;
                         }
                     }
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, childPos.x, bossGoma->actor.world.pos.y, childPos.z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, childPos.x,
+                                bossGoma->actor.world.pos.y, childPos.z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
                     break;
                 }
                 case SCENE_DODONGOS_CAVERN_BOSS: {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0,
+                                0, WARP_DUNGEON_ADULT, false);
                     break;
                 }
                 case SCENE_JABU_JABU_BOSS: {
@@ -563,28 +545,34 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                         }
                     }
 
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, sWarpPos[sp7C].x, sWarpPos[sp7C].y, sWarpPos[sp7C].z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, sWarpPos[sp7C].x, sWarpPos[sp7C].y,
+                                sWarpPos[sp7C].z, 0, 0, 0, WARP_DUNGEON_ADULT, false);
                     break;
                 }
                 case SCENE_FOREST_TEMPLE_BOSS: {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 14.0f, -33.0f, -3315.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 14.0f, -33.0f, -3315.0f, 0, 0, 0,
+                                WARP_DUNGEON_ADULT, true);
                     break;
                 }
                 case SCENE_FIRE_TEMPLE_BOSS: {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0, 0,
+                                WARP_DUNGEON_ADULT, true);
                     break;
                 }
                 case SCENE_WATER_TEMPLE_BOSS: {
                     BossMo* bossMo = va_arg(args, BossMo*);
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, bossMo->actor.world.pos.x, -280.0f, bossMo->actor.world.pos.z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, bossMo->actor.world.pos.x, -280.0f,
+                                bossMo->actor.world.pos.z, 0, 0, 0, WARP_DUNGEON_ADULT, true);
                     break;
                 }
                 case SCENE_SPIRIT_TEMPLE_BOSS: {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0, 0, 0,
+                                WARP_DUNGEON_ADULT, true);
                     break;
                 }
                 case SCENE_SHADOW_TEMPLE_BOSS: {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -50.0f, 0.0f, 400.0f, 0, 0, 0, WARP_DUNGEON_ADULT, true);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_WARP1, -50.0f, 0.0f, 400.0f, 0, 0, 0,
+                                WARP_DUNGEON_ADULT, true);
                     break;
                 }
                 default: {
@@ -699,12 +687,18 @@ void BossRush_RegisterHooks() {
         onBossDefeatHook = 0;
         onActorUpdate = 0;
 
-        if (!IS_BOSS_RUSH) return;
+        if (!IS_BOSS_RUSH)
+            return;
 
-        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(BossRush_OnVanillaBehaviorHandler);
-        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(BossRush_OnSceneInitHandler);
-        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(BossRush_OnActorInitHandler);
-        onBossDefeatHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>(BossRush_OnBossDefeatHandler);
-        onActorUpdate = GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_DOOR_WARP1, BossRush_OnBlueWarpUpdate);
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(
+            BossRush_OnVanillaBehaviorHandler);
+        onSceneInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(BossRush_OnSceneInitHandler);
+        onActorInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(BossRush_OnActorInitHandler);
+        onBossDefeatHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>(BossRush_OnBossDefeatHandler);
+        onActorUpdate = GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(
+            ACTOR_DOOR_WARP1, BossRush_OnBlueWarpUpdate);
     });
 }
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.h b/soh/soh/Enhancements/boss-rush/BossRush.h
index 292cbaf26a..881d8d53f6 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.h
+++ b/soh/soh/Enhancements/boss-rush/BossRush.h
@@ -5,12 +5,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    void BossRush_HandleBlueWarpHeal(PlayState* play);
-    void BossRush_InitSave();
-    const char* BossRush_GetSettingName(u8 optionIndex, u8 language);
-    const char* BossRush_GetSettingChoiceName(u8 optionIndex, u8 choiceIndex, u8 language);
-    u8 BossRush_GetSettingOptionsAmount(u8 optionIndex);
-    void BossRush_RegisterHooks();
+void BossRush_HandleBlueWarpHeal(PlayState* play);
+void BossRush_InitSave();
+const char* BossRush_GetSettingName(u8 optionIndex, u8 language);
+const char* BossRush_GetSettingChoiceName(u8 optionIndex, u8 choiceIndex, u8 language);
+u8 BossRush_GetSettingOptionsAmount(u8 optionIndex);
+void BossRush_RegisterHooks();
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/boss-rush/BossRushTypes.h b/soh/soh/Enhancements/boss-rush/BossRushTypes.h
index cf4d3aaba1..973f1599f4 100644
--- a/soh/soh/Enhancements/boss-rush/BossRushTypes.h
+++ b/soh/soh/Enhancements/boss-rush/BossRushTypes.h
@@ -37,28 +37,28 @@ typedef enum {
 typedef enum {
     BR_CHOICE_AMMO_LIMITED,
     BR_CHOICE_AMMO_FULL,
-    BR_CHOICE_AMMO_MAXED
+    BR_CHOICE_AMMO_MAXED,
 } BossRushAmmoChoices;
 
 typedef enum {
     BR_CHOICE_HEAL_GANONDORF,
     BR_CHOICE_HEAL_EVERYBOSS,
-    BR_CHOICE_HEAL_NEVER
+    BR_CHOICE_HEAL_NEVER,
 } BossRushHealChoices;
 
 typedef enum {
     BR_CHOICE_HYPERBOSSES_NO,
-    BR_CHOICE_HYPERBOSSES_YES
+    BR_CHOICE_HYPERBOSSES_YES,
 } BossRushHyperBossesChoices;
 
 typedef enum {
     BR_CHOICE_MAGIC_SINGLE,
-    BR_CHOICE_MAGIC_DOUBLE
+    BR_CHOICE_MAGIC_DOUBLE,
 } BossRushMagicChoices;
 
 typedef enum {
     BR_CHOICE_BGS_NO,
-    BR_CHOICE_BGS_YES
+    BR_CHOICE_BGS_YES,
 } BossRushBgsChoices;
 
 typedef enum {
@@ -72,20 +72,20 @@ typedef enum {
 
 typedef enum {
     BR_CHOICE_LONGSHOT_NO,
-    BR_CHOICE_LONGSHOT_YES
+    BR_CHOICE_LONGSHOT_YES,
 } BossRushLongshotChoices;
 
 typedef enum {
     BR_CHOICE_HOVERBOOTS_NO,
-    BR_CHOICE_HOVERBOOTS_YES
+    BR_CHOICE_HOVERBOOTS_YES,
 } BossRushHoverBootsChoices;
 
 typedef enum {
     BR_CHOICE_BUNNYHOOD_NO,
-    BR_CHOICE_BUNNYHOOD_YES
+    BR_CHOICE_BUNNYHOOD_YES,
 } BossRushBunnyHoodChoices;
 
 typedef enum {
     BR_CHOICE_TIMER_YES,
-    BR_CHOICE_TIMER_NO
+    BR_CHOICE_TIMER_NO,
 } BossRushTimerChoices;
diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp
index 5f650a25fe..1fbab40c21 100644
--- a/soh/soh/Enhancements/controls/InputViewer.cpp
+++ b/soh/soh/Enhancements/controls/InputViewer.cpp
@@ -10,31 +10,32 @@
 #include <cmath>
 
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
+
+using namespace UIWidgets;
 
 // Text colors
-static ImVec4 textColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-static ImVec4 range1Color = ImVec4(1.0f, 0.7f, 0, 1.0f);
-static ImVec4 range2Color = ImVec4(0, 1.0f, 0, 1.0f);
+static Color_RGBA8 textColorDefault = { 255, 255, 255, 255 };
+static Color_RGBA8 range1ColorDefault = { 255, 178, 0, 255 };
+static Color_RGBA8 range2ColorDefault = { 0, 255, 0, 255 };
 
-static const char* buttonOutlineOptions[4] = { "Always Shown", "Shown Only While Not Pressed",
-                                               "Shown Only While Pressed", "Always Hidden" };
-static const char* buttonOutlineOptionsVerbose[4] = { "Outline Always Shown", "Outline Shown Only While Not Pressed",
-                                                      "Outline Shown Only While Pressed", "Outline Always Hidden" };
+static std::unordered_map<int32_t, const char*> buttonOutlineOptions = {
+    { BUTTON_OUTLINE_ALWAYS_SHOWN, "Always Shown" },
+    { BUTTON_OUTLINE_NOT_PRESSED, "Shown Only While Not Pressed" },
+    { BUTTON_OUTLINE_PRESSED, "Shown Only While Pressed" },
+    { BUTTON_OUTLINE_ALWAYS_HIDDEN, "Always Hidden" }
+};
+static std::unordered_map<int32_t, const char*> buttonOutlineOptionsVerbose = {
+    { BUTTON_OUTLINE_ALWAYS_SHOWN, "Outline Always Shown" },
+    { BUTTON_OUTLINE_NOT_PRESSED, "Outline Shown Only While Not Pressed" },
+    { BUTTON_OUTLINE_PRESSED, "Outline Shown Only While Pressed" },
+    { BUTTON_OUTLINE_ALWAYS_HIDDEN, "Outline Always Hidden" }
+};
 
-static const char* stickModeOptions[3] = { "Always", "While In Use", "Never" };
-
-static Color_RGBA8 vec2Color(ImVec4 vec) {
-    Color_RGBA8 color;
-    color.r = vec.x * 255.0;
-    color.g = vec.y * 255.0;
-    color.b = vec.z * 255.0;
-    color.a = vec.w * 255.0;
-    return color;
-}
-
-static ImVec4 color2Vec(Color_RGBA8 color) {
-    return ImVec4(color.r / 255.0, color.g / 255.0, color.b / 255.0, color.a / 255.0);
-}
+static std::unordered_map<int32_t, const char*> stickModeOptions = { { STICK_MODE_ALWAYS_SHOWN, "Always" },
+                                                                     { STICK_MODE_HIDDEN_IN_DEADZONE, "While In Use" },
+                                                                     { STICK_MODE_ALWAYS_HIDDEN, "Never" } };
 
 InputViewer::~InputViewer() {
     SPDLOG_TRACE("destruct input viewer");
@@ -48,14 +49,14 @@ void InputViewer::RenderButton(std::string btnTexture, std::string btnOutlineTex
     if (outlineMode == BUTTON_OUTLINE_ALWAYS_SHOWN || (outlineMode == BUTTON_OUTLINE_NOT_PRESSED && !state) ||
         (outlineMode == BUTTON_OUTLINE_PRESSED && state)) {
         ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(btnOutlineTexture), size,
-                     ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                     ImVec2(0, 0), ImVec2(1.0f, 1.0f));
     }
     // Render button if pressed
     if (state) {
         ImGui::SetCursorPos(pos);
         ImGui::SetNextItemAllowOverlap();
         ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(btnTexture), size,
-                     ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                     ImVec2(0, 0), ImVec2(1.0f, 1.0f));
     }
 }
 
@@ -74,71 +75,83 @@ void InputViewer::DrawElement() {
         if (!sButtonTexturesLoaded) {
             Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
                 "Input-Viewer-Background", "textures/buttons/InputViewerBackground.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("A-Btn", "textures/buttons/ABtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("B-Btn", "textures/buttons/BBtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("L-Btn", "textures/buttons/LBtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("R-Btn", "textures/buttons/RBtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Z-Btn", "textures/buttons/ZBtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Start-Btn",
-                "textures/buttons/StartBtn.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Left", "textures/buttons/CLeft.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Right", "textures/buttons/CRight.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Up", "textures/buttons/CUp.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Down", "textures/buttons/CDown.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Analog-Stick",
-                "textures/buttons/AnalogStick.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Left",
-                "textures/buttons/DPadLeft.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Right",
-                "textures/buttons/DPadRight.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Up", "textures/buttons/DPadUp.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Down",
-                "textures/buttons/DPadDown.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-1", "textures/buttons/Mod1.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-2", "textures/buttons/Mod2.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Right-Stick",
-                "textures/buttons/RightStick.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("A-Btn Outline",
-                "textures/buttons/ABtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("B-Btn Outline",
-                "textures/buttons/BBtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("L-Btn Outline",
-                "textures/buttons/LBtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("R-Btn Outline",
-                "textures/buttons/RBtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Z-Btn Outline",
-                "textures/buttons/ZBtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Start-Btn Outline",
-                "textures/buttons/StartBtnOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Left Outline",
-                "textures/buttons/CLeftOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Right Outline",
-                "textures/buttons/CRightOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Up Outline",
-                "textures/buttons/CUpOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Down Outline",
-                "textures/buttons/CDownOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Analog-Stick Outline",
-                "textures/buttons/AnalogStickOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Left Outline",
-                "textures/buttons/DPadLeftOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Right Outline",
-                "textures/buttons/DPadRightOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Up Outline",
-                "textures/buttons/DPadUpOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Down Outline",
-                "textures/buttons/DPadDownOutline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-1 Outline",
-                "textures/buttons/Mod1Outline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-2 Outline",
-                "textures/buttons/Mod2Outline.png");
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Right-Stick Outline",
-                "textures/buttons/RightStickOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("A-Btn",
+                                                                                         "textures/buttons/ABtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("B-Btn",
+                                                                                         "textures/buttons/BBtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("L-Btn",
+                                                                                         "textures/buttons/LBtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("R-Btn",
+                                                                                         "textures/buttons/RBtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Z-Btn",
+                                                                                         "textures/buttons/ZBtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Start-Btn", "textures/buttons/StartBtn.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Left",
+                                                                                         "textures/buttons/CLeft.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Right",
+                                                                                         "textures/buttons/CRight.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Up",
+                                                                                         "textures/buttons/CUp.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Down",
+                                                                                         "textures/buttons/CDown.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Analog-Stick", "textures/buttons/AnalogStick.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Left", "textures/buttons/DPadLeft.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Right", "textures/buttons/DPadRight.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Up",
+                                                                                         "textures/buttons/DPadUp.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Down", "textures/buttons/DPadDown.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-1",
+                                                                                         "textures/buttons/Mod1.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Modifier-2",
+                                                                                         "textures/buttons/Mod2.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Right-Stick", "textures/buttons/RightStick.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "A-Btn Outline", "textures/buttons/ABtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "B-Btn Outline", "textures/buttons/BBtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "L-Btn Outline", "textures/buttons/LBtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "R-Btn Outline", "textures/buttons/RBtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Z-Btn Outline", "textures/buttons/ZBtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Start-Btn Outline", "textures/buttons/StartBtnOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "C-Left Outline", "textures/buttons/CLeftOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "C-Right Outline", "textures/buttons/CRightOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "C-Up Outline", "textures/buttons/CUpOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "C-Down Outline", "textures/buttons/CDownOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Analog-Stick Outline", "textures/buttons/AnalogStickOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Left Outline", "textures/buttons/DPadLeftOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Right Outline", "textures/buttons/DPadRightOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Up Outline", "textures/buttons/DPadUpOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Dpad-Down Outline", "textures/buttons/DPadDownOutline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Modifier-1 Outline", "textures/buttons/Mod1Outline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Modifier-2 Outline", "textures/buttons/Mod2Outline.png");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Right-Stick Outline", "textures/buttons/RightStickOutline.png");
             sButtonTexturesLoaded = true;
         }
 
         ImVec2 mainPos = ImGui::GetWindowPos();
-        ImVec2 size = ImGui::GetContentRegionAvail();
+        ImVec2 size = ImGui::GetMainViewport()->WorkSize;
 
 #ifdef __WIIU__
         const float scale = CVarGetFloat(CVAR_INPUT_VIEWER("Scale"), 1.0f) * 2.0f;
@@ -146,7 +159,8 @@ void InputViewer::DrawElement() {
         const float scale = CVarGetFloat(CVAR_INPUT_VIEWER("Scale"), 1.0f);
 #endif
         const int showAnalogAngles = CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Enabled"), 0);
-        const int buttonOutlineMode = CVarGetInteger(CVAR_INPUT_VIEWER("ButtonOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED);
+        const int buttonOutlineMode =
+            CVarGetInteger(CVAR_INPUT_VIEWER("ButtonOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED);
         const bool useGlobalOutlineMode = CVarGetInteger(CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"), 1);
 
         ImVec2 bgSize = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureSize("Input-Viewer-Background");
@@ -154,12 +168,12 @@ void InputViewer::DrawElement() {
 
         ImGui::SetNextWindowSize(
             ImVec2(scaledBGSize.x + 20, scaledBGSize.y +
-                (showAnalogAngles ? ImGui::CalcTextSize("X").y : 0) * scale *
-                CVarGetFloat(CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 1.0f) +
-                20));
+                                            (showAnalogAngles ? ImGui::CalcTextSize("X").y : 0) * scale *
+                                                CVarGetFloat(CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 1.0f) +
+                                            20));
         ImGui::SetNextWindowContentSize(
             ImVec2(scaledBGSize.x, scaledBGSize.y + (showAnalogAngles ? 15 : 0) * scale *
-                CVarGetFloat(CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 1.0f)));
+                                                        CVarGetFloat(CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 1.0f)));
         ImGui::SetNextWindowPos(
             ImVec2(mainPos.x + size.x - scaledBGSize.x - 30, mainPos.y + size.y - scaledBGSize.y - 30),
             ImGuiCond_FirstUseEver);
@@ -167,11 +181,12 @@ void InputViewer::DrawElement() {
         ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
         ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f));
 
-        OSContPad* pads = std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
+        OSContPad* pads =
+            std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
 
         ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar |
-            ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground |
-            ImGuiWindowFlags_NoFocusOnAppearing;
+                                       ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground |
+                                       ImGuiWindowFlags_NoFocusOnAppearing;
 
         if (!CVarGetInteger(CVAR_INPUT_VIEWER("EnableDragging"), 1)) {
             windowFlags |= ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove;
@@ -186,7 +201,7 @@ void InputViewer::DrawElement() {
                 // Background
                 ImGui::Image(
                     Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Input-Viewer-Background"),
-                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f));
             }
 
             // A/B
@@ -194,17 +209,17 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("B-Btn", "B-Btn Outline", pads[0].button & BTN_B, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("BBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("BBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("ABtn"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("A-Btn", "A-Btn Outline", pads[0].button & BTN_A, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("ABtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("ABtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             // C buttons
@@ -212,33 +227,33 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("C-Up", "C-Up Outline", pads[0].button & BTN_CUP, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("CUpOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("CUpOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("CLeft"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("C-Left", "C-Left Outline", pads[0].button & BTN_CLEFT, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("CLeftOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("CLeftOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("CRight"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("C-Right", "C-Right Outline", pads[0].button & BTN_CRIGHT, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("CRightOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("CRightOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("CDown"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("C-Down", "C-Down Outline", pads[0].button & BTN_CDOWN, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("CDownOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("CDownOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             // L/R/Z
@@ -246,25 +261,25 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("L-Btn", "L-Btn Outline", pads[0].button & BTN_L, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("LBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("LBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("RBtn"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("R-Btn", "R-Btn Outline", pads[0].button & BTN_R, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("RBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("RBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             if (CVarGetInteger(CVAR_INPUT_VIEWER("ZBtn"), 1)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Z-Btn", "Z-Btn Outline", pads[0].button & BTN_Z, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("ZBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("ZBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             // Start
@@ -272,9 +287,9 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Start-Btn", "Start-Btn Outline", pads[0].button & BTN_START, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("StartBtnOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode ? buttonOutlineMode
+                                                  : CVarGetInteger(CVAR_INPUT_VIEWER("StartBtnOutlineMode"),
+                                                                   BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             // Dpad
@@ -282,27 +297,27 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Dpad-Left", "Dpad-Left Outline", pads[0].button & BTN_DLEFT, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Dpad-Right", "Dpad-Right Outline", pads[0].button & BTN_DRIGHT, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Dpad-Up", "Dpad-Up Outline", pads[0].button & BTN_DUP, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Dpad-Down", "Dpad-Down Outline", pads[0].button & BTN_DDOWN, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("DpadOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             // Modifier 1
@@ -310,18 +325,18 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Modifier-1", "Modifier-1 Outline", pads[0].button & BTN_CUSTOM_MODIFIER1, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("Mod1OutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("Mod1OutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
             // Modifier 2
             if (CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 RenderButton("Modifier-2", "Modifier-2 Outline", pads[0].button & BTN_CUSTOM_MODIFIER2, scaledBGSize,
-                    useGlobalOutlineMode
-                    ? buttonOutlineMode
-                    : CVarGetInteger(CVAR_INPUT_VIEWER("Mod2OutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
+                             useGlobalOutlineMode
+                                 ? buttonOutlineMode
+                                 : CVarGetInteger(CVAR_INPUT_VIEWER("Mod2OutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
             }
 
             const bool analogStickIsInDeadzone = !pads[0].stick_x && !pads[0].stick_y;
@@ -330,14 +345,14 @@ void InputViewer::DrawElement() {
             // Analog Stick
             const int analogOutlineMode =
                 CVarGetInteger(CVAR_INPUT_VIEWER("AnalogStick.OutlineMode"), STICK_MODE_ALWAYS_SHOWN);
-            const float maxStickDistance = CVarGetInteger(CVAR_INPUT_VIEWER("AnalogStick.Movement"), 12);
+            const int32_t maxStickDistance = CVarGetInteger(CVAR_INPUT_VIEWER("AnalogStick.Movement"), 12);
             if (analogOutlineMode == STICK_MODE_ALWAYS_SHOWN ||
                 (analogOutlineMode == STICK_MODE_HIDDEN_IN_DEADZONE && !analogStickIsInDeadzone)) {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(aPos);
                 ImGui::Image(
                     Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Analog-Stick Outline"),
-                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f));
             }
             const int analogStickMode =
                 CVarGetInteger(CVAR_INPUT_VIEWER("AnalogStick.VisibilityMode"), STICK_MODE_ALWAYS_SHOWN);
@@ -346,13 +361,13 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(
                     ImVec2(aPos.x + maxStickDistance * ((float)(pads[0].stick_x) / MAX_AXIS_RANGE) * scale,
-                        aPos.y - maxStickDistance * ((float)(pads[0].stick_y) / MAX_AXIS_RANGE) * scale));
+                           aPos.y - maxStickDistance * ((float)(pads[0].stick_y) / MAX_AXIS_RANGE) * scale));
                 ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Analog-Stick"),
-                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                             scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f));
             }
 
             // Right Stick
-            const float maxRightStickDistance = CVarGetInteger(CVAR_INPUT_VIEWER("RightStick.Movement"), 7);
+            const int32_t maxRightStickDistance = CVarGetInteger(CVAR_INPUT_VIEWER("RightStick.Movement"), 7);
             const int rightOutlineMode =
                 CVarGetInteger(CVAR_INPUT_VIEWER("RightStick.OutlineMode"), STICK_MODE_ALWAYS_HIDDEN);
             if (rightOutlineMode == STICK_MODE_ALWAYS_SHOWN ||
@@ -361,7 +376,7 @@ void InputViewer::DrawElement() {
                 ImGui::SetCursorPos(aPos);
                 ImGui::Image(
                     Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Right-Stick Outline"),
-                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f));
             }
             const int rightStickMode =
                 CVarGetInteger(CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), STICK_MODE_ALWAYS_HIDDEN);
@@ -370,22 +385,23 @@ void InputViewer::DrawElement() {
                 ImGui::SetNextItemAllowOverlap();
                 ImGui::SetCursorPos(
                     ImVec2(aPos.x + maxRightStickDistance * ((float)(pads[0].right_stick_x) / MAX_AXIS_RANGE) * scale,
-                        aPos.y - maxRightStickDistance * ((float)(pads[0].right_stick_y) / MAX_AXIS_RANGE) * scale));
+                           aPos.y - maxRightStickDistance * ((float)(pads[0].right_stick_y) / MAX_AXIS_RANGE) * scale));
                 ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Right-Stick"),
-                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+                             scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f));
             }
 
             // Analog stick angle text
             if (showAnalogAngles) {
-                ImGui::SetCursorPos(ImVec2(aPos.x + 10 + CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Offset"), 0) * scale,
-                    scaledBGSize.y + aPos.y + 10));
+                ImGui::SetCursorPos(
+                    ImVec2(aPos.x + 10 + CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Offset"), 0) * scale,
+                           scaledBGSize.y + aPos.y + 10));
                 // Scale font with input viewer scale
                 float oldFontScale = ImGui::GetFont()->Scale;
                 ImGui::GetFont()->Scale *= scale * CVarGetFloat(CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 1.0f);
                 ImGui::PushFont(ImGui::GetFont());
 
                 // Calculate polar R coordinate from X and Y angles, squared to avoid sqrt
-                const float rSquared = pads[0].stick_x * pads[0].stick_x + pads[0].stick_y * pads[0].stick_y;
+                const int32_t rSquared = pads[0].stick_x * pads[0].stick_x + pads[0].stick_y * pads[0].stick_y;
 
                 // ESS range
                 const int range1Min = CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Min"), 8);
@@ -398,18 +414,17 @@ void InputViewer::DrawElement() {
                 if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Enabled"), 0) &&
                     (rSquared >= (range1Min * range1Min)) && (rSquared < (range1Max * range1Max))) {
                     ImGui::PushStyleColor(
-                        ImGuiCol_Text,
-                        color2Vec(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Color"), vec2Color(range1Color))));
-                }
-                else if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Enabled"), 0) &&
-                    (rSquared >= (range2Min * range2Min)) && (rSquared < (range2Max * range2Max))) {
+                        ImGuiCol_Text, VecFromRGBA8(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Color.Value"),
+                                                                 range1ColorDefault)));
+                } else if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Enabled"), 0) &&
+                           (rSquared >= (range2Min * range2Min)) && (rSquared < (range2Max * range2Max))) {
                     ImGui::PushStyleColor(
-                        ImGuiCol_Text,
-                        color2Vec(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Color"), vec2Color(range2Color))));
-                }
-                else {
-                    ImGui::PushStyleColor(ImGuiCol_Text, color2Vec(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.TextColor"),
-                        vec2Color(textColor))));
+                        ImGuiCol_Text, VecFromRGBA8(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Color.Value"),
+                                                                 range2ColorDefault)));
+                } else {
+                    ImGui::PushStyleColor(ImGuiCol_Text,
+                                          VecFromRGBA8(CVarGetColor(CVAR_INPUT_VIEWER("AnalogAngles.TextColor.Value"),
+                                                                    textColorDefault)));
                 }
 
                 // Render text
@@ -434,158 +449,164 @@ InputViewerSettingsWindow::~InputViewerSettingsWindow() {
 }
 
 void InputViewerSettingsWindow::DrawElement() {
-   // gInputViewer.Scale
-    UIWidgets::EnhancementSliderFloat("Input Viewer Scale: %.2f", "##Input", CVAR_INPUT_VIEWER("Scale"), 0.1f, 5.0f, "",
-                                        1.0f, false, true);
-    UIWidgets::Tooltip("Sets the on screen size of the input viewer");
+    // gInputViewer.Scale
+    CVarSliderFloat("Input Viewer Scale: %.2f", CVAR_INPUT_VIEWER("Scale"),
+                    FloatSliderOptions()
+                        .Color(THEME_COLOR)
+                        .DefaultValue(1.0f)
+                        .Min(0.1f)
+                        .Max(5.0f)
+                        .ShowButtons(true)
+                        .Tooltip("Sets the on screen size of the input viewer"));
 
     // gInputViewer.EnableDragging
-    UIWidgets::EnhancementCheckbox("Enable Dragging", CVAR_INPUT_VIEWER("EnableDragging"), false, "",
-                                    UIWidgets::CheckboxGraphics::Checkmark, true);
+    CVarCheckbox("Enable Dragging", CVAR_INPUT_VIEWER("EnableDragging"),
+                 CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
 
     UIWidgets::PaddedSeparator(true, true);
 
     // gInputViewer.ShowBackground
-    UIWidgets::EnhancementCheckbox("Show Background Layer", CVAR_INPUT_VIEWER("ShowBackground"), false, "",
-                                    UIWidgets::CheckboxGraphics::Checkmark, true);
+    CVarCheckbox("Show Background Layer", CVAR_INPUT_VIEWER("ShowBackground"),
+                 CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
 
     UIWidgets::PaddedSeparator(true, true);
 
+    PushStyleHeader(THEME_COLOR);
     if (ImGui::CollapsingHeader("Buttons")) {
 
         // gInputViewer.ButtonOutlineMode
-        UIWidgets::PaddedText("Button Outlines/Backgrounds", true, false);
-        UIWidgets::EnhancementCombobox(
-            CVAR_INPUT_VIEWER("ButtonOutlineMode"), buttonOutlineOptions, BUTTON_OUTLINE_NOT_PRESSED,
-            !CVarGetInteger(CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"), 1), "",
-            CVarGetInteger(CVAR_INPUT_VIEWER("ButtonOutlineMode"), BUTTON_OUTLINE_NOT_PRESSED));
-        UIWidgets::Tooltip(
-            "Sets the desired visibility behavior for the button outline/background layers. Useful for "
-            "custom input viewers.");
+        CVarCombobox(
+            "Button Outlines/Backgrounds", CVAR_INPUT_VIEWER("ButtonOutlineMode"), buttonOutlineOptions,
+            ComboboxOptions({ { .disabled = !CVarGetInteger(CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"), 1),
+                                .disabledTooltip = "Disabled because Global Button Outline is off" } })
+                .Color(THEME_COLOR)
+                .DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED)
+                .Tooltip("Sets the desired visibility behavior for the button outline/background layers. Useful for "
+                         "custom input viewers."));
 
         // gInputViewer.UseGlobalButtonOutlineMode
-        UIWidgets::EnhancementCheckbox("Use for all buttons", CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Use for all buttons", CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
 
         UIWidgets::PaddedSeparator();
 
         bool useIndividualOutlines = !CVarGetInteger(CVAR_INPUT_VIEWER("UseGlobalButtonOutlineMode"), 1);
 
         // gInputViewer.ABtn
-        UIWidgets::EnhancementCheckbox("Show A-Button Layers", CVAR_INPUT_VIEWER("ABtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show A-Button Layers", CVAR_INPUT_VIEWER("ABtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("ABtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("ABtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##ABtnOutline", CVAR_INPUT_VIEWER("ABtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.BBtn
-        UIWidgets::EnhancementCheckbox("Show B-Button Layers", CVAR_INPUT_VIEWER("BBtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show B-Button Layers", CVAR_INPUT_VIEWER("BBtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("BBtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("BBtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##BBtnOutline", CVAR_INPUT_VIEWER("BBtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.CUp
-        UIWidgets::EnhancementCheckbox("Show C-Up Layers", CVAR_INPUT_VIEWER("CUp"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show C-Up Layers", CVAR_INPUT_VIEWER("CUp"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("CUp"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("CUpOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##CUpOutline", CVAR_INPUT_VIEWER("CUpOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.CRight
-        UIWidgets::EnhancementCheckbox("Show C-Right Layers", CVAR_INPUT_VIEWER("CRight"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show C-Right Layers", CVAR_INPUT_VIEWER("CRight"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("CRight"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("CRightOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##CRightOutline", CVAR_INPUT_VIEWER("CRightOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.CDown
-        UIWidgets::EnhancementCheckbox("Show C-Down Layers", CVAR_INPUT_VIEWER("CDown"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show C-Down Layers", CVAR_INPUT_VIEWER("CDown"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("CDown"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("CDownOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##CDownOutline", CVAR_INPUT_VIEWER("CDownOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.CLeft
-        UIWidgets::EnhancementCheckbox("Show C-Left Layers", CVAR_INPUT_VIEWER("CLeft"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show C-Left Layers", CVAR_INPUT_VIEWER("CLeft"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("CLeft"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("CLeftOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##CLeftOutline", CVAR_INPUT_VIEWER("CLeftOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.LBtn
-        UIWidgets::EnhancementCheckbox("Show L-Button Layers", CVAR_INPUT_VIEWER("LBtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show L-Button Layers", CVAR_INPUT_VIEWER("LBtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("LBtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("LBtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##LBtnOutline", CVAR_INPUT_VIEWER("LBtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.RBtn
-        UIWidgets::EnhancementCheckbox("Show R-Button Layers", CVAR_INPUT_VIEWER("RBtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show R-Button Layers", CVAR_INPUT_VIEWER("RBtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("RBtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("RBtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##RBtnOutline", CVAR_INPUT_VIEWER("RBtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.ZBtn
-        UIWidgets::EnhancementCheckbox("Show Z-Button Layers", CVAR_INPUT_VIEWER("ZBtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show Z-Button Layers", CVAR_INPUT_VIEWER("ZBtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("ZBtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("ZBtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##ZBtnOutline", CVAR_INPUT_VIEWER("ZBtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.StartBtn
-        UIWidgets::EnhancementCheckbox("Show Start Button Layers", CVAR_INPUT_VIEWER("StartBtn"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, true);
+        CVarCheckbox("Show Start Button Layers", CVAR_INPUT_VIEWER("StartBtn"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("StartBtn"), 1)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("StartBtnOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##StartBtnOutline", CVAR_INPUT_VIEWER("StartBtnOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.Dpad
-        UIWidgets::EnhancementCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, false);
+        CVarCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Dpad"), 0)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##DpadOutline", CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.Mod1
-        UIWidgets::EnhancementCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, false);
+        CVarCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod1"), 0)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##Mmod1Outline", CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
         // gInputViewer.Mod2
-        UIWidgets::EnhancementCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"), false, "",
-                                        UIWidgets::CheckboxGraphics::Checkmark, false);
+        CVarCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"),
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
         if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) {
             ImGui::Indent();
-            UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose,
-                                            BUTTON_OUTLINE_NOT_PRESSED);
+            CVarCombobox("##Mod2Outline", CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose,
+                         ComboboxOptions().Color(THEME_COLOR).DefaultIndex(BUTTON_OUTLINE_NOT_PRESSED));
             ImGui::Unindent();
         }
 
@@ -594,90 +615,126 @@ void InputViewerSettingsWindow::DrawElement() {
 
     if (ImGui::CollapsingHeader("Analog Stick")) {
         // gInputViewer.AnalogStick.VisibilityMode
-        UIWidgets::PaddedText("Analog Stick Visibility", true, false);
-        UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("AnalogStick.VisibilityMode"), stickModeOptions,
-                                        STICK_MODE_ALWAYS_SHOWN);
-        UIWidgets::Tooltip(
-            "Determines the conditions under which the moving layer of the analog stick texture is visible.");
+        CVarCombobox(
+            "Analog Stick Visibility", CVAR_INPUT_VIEWER("AnalogStick.VisibilityMode"), stickModeOptions,
+            ComboboxOptions()
+                .Color(THEME_COLOR)
+                .DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
+                .Tooltip(
+                    "Determines the conditions under which the moving layer of the analog stick texture is visible."));
 
         // gInputViewer.AnalogStick.OutlineMode
-        UIWidgets::PaddedText("Analog Stick Outline/Background Visibility", true, false);
-        UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("AnalogStick.OutlineMode"), stickModeOptions,
-                                        STICK_MODE_ALWAYS_SHOWN);
-        UIWidgets::Tooltip(
-            "Determines the conditions under which the analog stick outline/background texture is visible.");
+        CVarCombobox(
+            "Analog Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("AnalogStick.OutlineMode"),
+            stickModeOptions,
+            ComboboxOptions()
+                .Color(THEME_COLOR)
+                .DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
+                .Tooltip(
+                    "Determines the conditions under which the analog stick outline/background texture is visible."));
 
         // gInputViewer.AnalogStick.Movement
-        UIWidgets::EnhancementSliderInt("Analog Stick Movement: %dpx", "##AnalogMovement",
-                                        CVAR_INPUT_VIEWER("AnalogStick.Movement"), 0, 200, "", 12, true);
-        UIWidgets::Tooltip(
-            "Sets the distance to move the analog stick in the input viewer. Useful for custom input viewers.");
+        CVarSliderInt("Analog Stick Movement: %dpx", CVAR_INPUT_VIEWER("AnalogStick.Movement"),
+                      IntSliderOptions()
+                          .Color(THEME_COLOR)
+                          .Min(0)
+                          .Max(200)
+                          .DefaultValue(12)
+                          .ShowButtons(true)
+                          .Tooltip("Sets the distance to move the analog stick in the input viewer. Useful for custom "
+                                   "input viewers."));
         UIWidgets::PaddedSeparator(true, true);
     }
 
     if (ImGui::CollapsingHeader("Additional (\"Right\") Stick")) {
         // gInputViewer.RightStick.VisibilityMode
-        UIWidgets::PaddedText("Right Stick Visibility", true, false);
-        UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions,
-                                        STICK_MODE_HIDDEN_IN_DEADZONE);
-        UIWidgets::Tooltip(
-            "Determines the conditions under which the moving layer of the right stick texture is visible.");
+        CVarCombobox(
+            "Right Stick Visibility", CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions,
+            ComboboxOptions()
+                .Color(THEME_COLOR)
+                .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
+                .Tooltip(
+                    "Determines the conditions under which the moving layer of the right stick texture is visible."));
 
         // gInputViewer.RightStick.OutlineMode
-        UIWidgets::PaddedText("Right Stick Outline/Background Visibility", true, false);
-        UIWidgets::EnhancementCombobox(CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions,
-                                        STICK_MODE_HIDDEN_IN_DEADZONE);
-        UIWidgets::Tooltip(
-            "Determines the conditions under which the right stick outline/background texture is visible.");
+        CVarCombobox(
+            "Right Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions,
+            ComboboxOptions()
+                .Color(THEME_COLOR)
+                .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
+                .Tooltip(
+                    "Determines the conditions under which the right stick outline/background texture is visible."));
 
         // gInputViewer.RightStick.Movement
-        UIWidgets::EnhancementSliderInt("Right Stick Movement: %dpx", "##RightMovement",
-                                        CVAR_INPUT_VIEWER("RightStick.Movement"), 0, 200, "", 7, true);
-        UIWidgets::Tooltip(
-            "Sets the distance to move the right stick in the input viewer. Useful for custom input viewers.");
+        CVarSliderInt(
+            "Right Stick Movement: %dpx", CVAR_INPUT_VIEWER("RightStick.Movement"),
+            IntSliderOptions()
+                .Color(THEME_COLOR)
+                .Min(0)
+                .Max(200)
+                .DefaultValue(7)
+                .ShowButtons(true)
+                .Tooltip(
+                    "Sets the distance to move the right stick in the input viewer. Useful for custom input viewers."));
         UIWidgets::PaddedSeparator(true, true);
     }
 
     if (ImGui::CollapsingHeader("Analog Angle Values")) {
         // gAnalogAngles
-        UIWidgets::EnhancementCheckbox("Show Analog Stick Angle Values", CVAR_INPUT_VIEWER("AnalogAngles.Enabled"));
-        UIWidgets::Tooltip("Displays analog stick angle values in the input viewer");
+        CVarCheckbox(
+            "Show Analog Stick Angle Values", CVAR_INPUT_VIEWER("AnalogAngles.Enabled"),
+            CheckboxOptions().Color(THEME_COLOR).Tooltip("Displays analog stick angle values in the input viewer"));
         if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Enabled"), 0)) {
             // gInputViewer.AnalogAngles.TextColor
-            if (ImGui::ColorEdit4("Text Color", (float*)&textColor)) {
-                CVarSetColor(CVAR_INPUT_VIEWER("AnalogAngles.TextColor"), vec2Color(textColor));
-            }
+            CVarColorPicker("Text Color", CVAR_INPUT_VIEWER("AnalogAngles.TextColor"), textColorDefault, true,
+                            ColorPickerRandomButton | ColorPickerResetButton);
             // gAnalogAngleScale
-            UIWidgets::EnhancementSliderFloat("Angle Text Scale: %.2f%%", "##AnalogAngleScale",
-                                                CVAR_INPUT_VIEWER("AnalogAngles.Scale"), 0.1f, 5.0f, "", 1.0f, true, true);
+            CVarSliderFloat("Angle Text Scale: %.2f%%", CVAR_INPUT_VIEWER("AnalogAngles.Scale"),
+                            FloatSliderOptions()
+                                .Color(THEME_COLOR)
+                                .IsPercentage()
+                                .Min(0.1f)
+                                .Max(5.0f)
+                                .DefaultValue(1.0f)
+                                .ShowButtons(true));
             // gInputViewer.AnalogAngles.Offset
-            UIWidgets::EnhancementSliderInt("Angle Text Offset: %dpx", "##AnalogAngleOffset",
-                                            CVAR_INPUT_VIEWER("AnalogAngles.Offset"), 0, 400, "", 0, true);
+            CVarSliderInt("Angle Text Offset: %dpx", CVAR_INPUT_VIEWER("AnalogAngles.Offset"),
+                          IntSliderOptions()
+                              .Color(THEME_COLOR)
+                              .Min(0)
+                              .Max(400)
+                              .DefaultValue(0)
+                              .ShowButtons(true)
+                              .Tooltip("Sets the distance to move the right stick in the input viewer. Useful for "
+                                       "custom input viewers."));
             UIWidgets::PaddedSeparator(true, true);
             // gInputViewer.AnalogAngles.Range1.Enabled
-            UIWidgets::EnhancementCheckbox("Highlight ESS Position", CVAR_INPUT_VIEWER("AnalogAngles.Range1.Enabled"));
-            UIWidgets::Tooltip(
-                "Highlights the angle value text when the analog stick is in ESS position (on flat ground)");
+            CVarCheckbox(
+                "Highlight ESS Position", CVAR_INPUT_VIEWER("AnalogAngles.Range1.Enabled"),
+                CheckboxOptions()
+                    .Color(THEME_COLOR)
+                    .Tooltip(
+                        "Highlights the angle value text when the analog stick is in ESS position (on flat ground)"));
             if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Enabled"), 0)) {
                 // gInputViewer.AnalogAngles.Range1.Color
-                if (ImGui::ColorEdit4("ESS Color", (float*)&range1Color)) {
-                    CVarSetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range1.Color"), vec2Color(range1Color));
-                }
+                CVarColorPicker("ESS Color", CVAR_INPUT_VIEWER("AnalogAngles.Range1.Color"), range1ColorDefault, true,
+                                ColorPickerRandomButton | ColorPickerResetButton);
             }
 
             UIWidgets::PaddedSeparator(true, true);
             // gInputViewer.AnalogAngles.Range2.Enabled
-            UIWidgets::EnhancementCheckbox("Highlight Walking Speed Angles",
-                                            CVAR_INPUT_VIEWER("AnalogAngles.Range2.Enabled"));
-            UIWidgets::Tooltip("Highlights the angle value text when the analog stick is at an angle that would "
-                                "produce a walking speed (on flat ground)\n\n"
-                                "Useful for 1.0 Empty Jumpslash Quick Put Away");
+            CVarCheckbox("Highlight Walking Speed Angles", CVAR_INPUT_VIEWER("AnalogAngles.Range2.Enabled"),
+                         CheckboxOptions()
+                             .Color(THEME_COLOR)
+                             .Tooltip("Highlights the angle value text when the analog stick is at an angle that would "
+                                      "produce a walking speed (on flat ground)\n\n"
+                                      "Useful for 1.0 Empty Jumpslash Quick Put Away"));
             if (CVarGetInteger(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Enabled"), 0)) {
                 // gInputViewer.AnalogAngles.Range2.Color
-                if (ImGui::ColorEdit4("Walking Speed Color", (float*)&range2Color)) {
-                    CVarSetColor(CVAR_INPUT_VIEWER("AnalogAngles.Range2.Color"), vec2Color(range2Color));
-                }
+                CVarColorPicker("Walking Speed Color", CVAR_INPUT_VIEWER("AnalogAngles.Range2.Color"),
+                                range2ColorDefault, true, ColorPickerRandomButton | ColorPickerResetButton);
             }
         }
     }
+    PopStyleHeader();
 }
diff --git a/soh/soh/Enhancements/controls/InputViewer.h b/soh/soh/Enhancements/controls/InputViewer.h
index a4b1cc44fc..67303b7eb5 100644
--- a/soh/soh/Enhancements/controls/InputViewer.h
+++ b/soh/soh/Enhancements/controls/InputViewer.h
@@ -17,29 +17,29 @@ typedef enum {
     STICK_MODE_ALWAYS_HIDDEN,
 } StickMode;
 
-class InputViewer : public Ship::GuiWindow {
-public:
+class InputViewer final : public Ship::GuiWindow {
+  public:
     using GuiWindow::GuiWindow;
 
     void Draw() override;
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 
     InputViewer();
     ~InputViewer();
- 
-    private:
-        void RenderButton(std::string btn, std::string btnOutline, int state, ImVec2 size, int outlineMode);
+
+  private:
+    void RenderButton(std::string btn, std::string btnOutline, int state, ImVec2 size, int outlineMode);
 };
 
-class InputViewerSettingsWindow : public Ship::GuiWindow {
-public:
+class InputViewerSettingsWindow final : public Ship::GuiWindow {
+  public:
     using GuiWindow::GuiWindow;
 
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 
     InputViewerSettingsWindow();
     ~InputViewerSettingsWindow();
diff --git a/soh/soh/Enhancements/controls/Mouse.cpp b/soh/soh/Enhancements/controls/Mouse.cpp
new file mode 100644
index 0000000000..4ad9d11d0d
--- /dev/null
+++ b/soh/soh/Enhancements/controls/Mouse.cpp
@@ -0,0 +1,156 @@
+#include "Mouse.h"
+#include "soh/OTRGlobals.h"
+#include "z64player.h"
+#include "global.h"
+#include <Window.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+static Ship::Coords mouseCoord = {};
+static Ship::Coords mouseCoordRel = {};
+
+#define CVAR_ENABLE_MOUSE_NAME CVAR_SETTING("EnableMouse")
+#define CVAR_ENABLE_MOUSE_DEFAULT 0
+#define CVAR_ENABLE_MOUSE_VALUE CVarGetInteger(CVAR_ENABLE_MOUSE_NAME, CVAR_ENABLE_MOUSE_DEFAULT)
+#define MOUSE_ENABLED (CVAR_ENABLE_MOUSE_VALUE && GetWindow()->IsMouseCaptured())
+
+std::shared_ptr<Ship::Window> GetWindow() {
+    return OTRGlobals::Instance->context->GetWindow();
+}
+
+extern "C" {
+void Mouse_UpdatePos() {
+    mouseCoord = GetWindow()->GetMousePos();
+}
+
+void Mouse_UpdatePosRel() {
+    mouseCoordRel = GetWindow()->GetMouseDelta();
+}
+
+void Mouse_UpdateAll() {
+    Mouse_UpdatePos();
+    Mouse_UpdatePosRel();
+}
+
+void Mouse_HandleThirdPerson(f32* newCamX, f32* newCamY) {
+    if (MOUSE_ENABLED) {
+        *newCamX -= mouseCoordRel.x * 40.0f;
+        *newCamY += mouseCoordRel.y * 40.0f;
+    }
+}
+
+void Mouse_HandleFirstPerson(Player* player) {
+    f32 xAxisMulti = CVarGetFloat(CVAR_SETTING("FirstPersonCameraSensitivity.X"), 1.0f);
+    f32 yAxisMulti = CVarGetFloat(CVAR_SETTING("FirstPersonCameraSensitivity.Y"), 1.0f);
+    s8 invertXAxisMulti = ((CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) &&
+                            !CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) ||
+                           (!CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) &&
+                            CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)))
+                              ? -1
+                              : 1;
+    s8 invertYAxisMulti = CVarGetInteger(CVAR_SETTING("Controls.InvertAimingYAxis"), 1) ? 1 : -1;
+    if (MOUSE_ENABLED) {
+        player->actor.focus.rot.y -= static_cast<int16_t>(mouseCoordRel.x * 6.0f * xAxisMulti * invertXAxisMulti);
+        player->actor.focus.rot.x += static_cast<int16_t>(mouseCoordRel.y * 6.0f * yAxisMulti * invertYAxisMulti);
+    }
+}
+
+void Mouse_RecenterCursor() {
+    u32 width = GetWindow()->GetWidth();
+    u32 height = GetWindow()->GetHeight();
+    if (MOUSE_ENABLED) {
+        GetWindow()->SetMousePos({ static_cast<s32>(width / 2), static_cast<s32>(height / 2) });
+    }
+}
+
+void Mouse_HandleShield(f32* sp50, f32* sp54) {
+    if (MOUSE_ENABLED) {
+        s32 width = GetWindow()->GetWidth();
+        s32 height = GetWindow()->GetHeight();
+        f32 xBound = 7200 / (width / 2.0f);
+        f32 yBound = 6000 / (height / 2.0f);
+        *sp50 +=
+            (mouseCoord.x - (width / 2)) * xBound * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 1 : -1);
+        *sp54 += (mouseCoord.y - (height / 2)) * yBound;
+        *sp50 = CLAMP(*sp50, -7200, 7200);
+        *sp54 = CLAMP(*sp54, -6000, 6000);
+    }
+}
+
+static s8 iterMouse = 0;
+static s32 mouseQuickspinX[5] = {};
+static s32 mouseQuickspinY[5] = {};
+static u8 quickspinCount = 0;
+
+void Mouse_UpdateQuickspinCount() {
+    if (MOUSE_ENABLED) {
+        quickspinCount = (quickspinCount + 1) % 5;
+        mouseQuickspinX[quickspinCount] = mouseCoord.x;
+        mouseQuickspinY[quickspinCount] = mouseCoord.y;
+    } else {
+        quickspinCount = 0;
+    }
+}
+
+bool Mouse_HandleQuickspin(bool* should, s8* iter2, s8* sp3C) {
+    s8 temp1;
+    s8 temp2;
+    s32 i;
+    if (!MOUSE_ENABLED) {
+        return *should = false;
+    }
+
+    for (i = 0; i < 4; i++, iter2++) {
+        // Calculating angles as per z_lib.c:func_80077D10()
+        s32 relY = mouseQuickspinY[i + 1] - mouseQuickspinY[i];
+        s32 relX = mouseQuickspinX[i + 1] - mouseQuickspinX[i];
+        s16 aTan = Math_Atan2S((f32)relY, (f32)-relX);
+        iterMouse = (u16)(aTan + 0x2000) >> 9; // See z_player.c:Player_ProcessControlStick()
+        if ((*iter2 = iterMouse) < 0) {
+            return *should = false;
+        }
+        *iter2 *= 2;
+    }
+    temp1 = sp3C[0] - sp3C[1];
+    if (ABS(temp1) < 10) {
+        return *should = false;
+    }
+    iter2 = &sp3C[1];
+    for (i = 1; i < 3; i++, iter2++) {
+        temp2 = *iter2 - *(iter2 + 1);
+        if ((ABS(temp2) < 10) || (temp2 * temp1 < 0)) {
+            return *should = false;
+        }
+    }
+
+    return *should = true;
+}
+
+// Hook handlers
+
+void Mouse_RegisterRecenterCursorOnShield() {
+    COND_HOOK(OnPlayerHoldUpShield, true, Mouse_RecenterCursor);
+}
+
+void Mouse_RegisterHandleFirstPerson() {
+    COND_HOOK(OnPlayerFirstPersonControl, true, Mouse_HandleFirstPerson);
+}
+
+void Mouse_RegisterHandleShield() {
+    COND_HOOK(OnPlayerShieldControl, true, Mouse_HandleShield);
+}
+
+void Mouse_RegisterUpdateQuickspinCount() {
+    COND_HOOK(OnPlayerProcessStick, true, Mouse_UpdateQuickspinCount);
+}
+
+void Mouse_RegisterHandleQuickspin() {
+    REGISTER_VB_SHOULD(VB_SHOULD_QUICKSPIN, { Mouse_HandleQuickspin(should, va_arg(args, s8*), va_arg(args, s8*)); });
+}
+
+static RegisterShipInitFunc initFunc_shieldRecenter(Mouse_RegisterRecenterCursorOnShield, { CVAR_ENABLE_MOUSE_NAME });
+static RegisterShipInitFunc initFunc_firstPerson(Mouse_RegisterHandleFirstPerson, { CVAR_ENABLE_MOUSE_NAME });
+static RegisterShipInitFunc initFunc_quickspinCount(Mouse_RegisterUpdateQuickspinCount, { CVAR_ENABLE_MOUSE_NAME });
+static RegisterShipInitFunc initFunc_quickspin(Mouse_RegisterHandleQuickspin, { CVAR_ENABLE_MOUSE_NAME });
+static RegisterShipInitFunc initFunc_shieldMove(Mouse_RegisterHandleShield, { CVAR_ENABLE_MOUSE_NAME });
+} // extern "C"
diff --git a/soh/soh/Enhancements/controls/Mouse.h b/soh/soh/Enhancements/controls/Mouse.h
new file mode 100644
index 0000000000..2ab954e47d
--- /dev/null
+++ b/soh/soh/Enhancements/controls/Mouse.h
@@ -0,0 +1,25 @@
+#ifndef MOUSE_H
+#define MOUSE_H
+
+#pragma once
+
+#include <libultraship/libultraship.h>
+
+struct Player;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void Mouse_UpdateAll();
+void Mouse_RecenterCursor();
+void Mouse_HandleThirdPerson(f32* newCamX, f32* newCamY);
+void Mouse_HandleFirstPerson(struct Player* player);
+void Mouse_HandleShield(f32* sp50, f32* sp54);
+bool Mouse_HandleQuickspin(bool* should, s8* iter2, s8* sp3C);
+void Mouse_UpdateQuickspinCount();
+#ifdef __cplusplus
+}; // extern "C"
+#endif
+
+// MOUSE_H
+#endif
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
index 7e49187992..8a8227073e 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
@@ -2,6 +2,7 @@
 #include <utils/StringHelper.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "z64.h"
 #include "soh/cvar_prefixes.h"
 #ifndef __WIIU__
@@ -10,6 +11,8 @@
 
 #define SCALE_IMGUI_SIZE(value) ((value / 13.0f) * ImGui::GetFontSize())
 
+using namespace UIWidgets;
+
 SohInputEditorWindow::~SohInputEditorWindow() {
 }
 
@@ -23,29 +26,25 @@ void SohInputEditorWindow::InitElement() {
     mButtonsBitmasks = { BTN_A, BTN_B, BTN_START, BTN_L, BTN_R, BTN_Z, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT };
     mDpadBitmasks = { BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
     mModifierButtonsBitmasks = { BTN_CUSTOM_MODIFIER1, BTN_CUSTOM_MODIFIER2 };
-    mCustomOcarinaButtonsBitmasks = {
-        BTN_CUSTOM_OCARINA_NOTE_D4,
-        BTN_CUSTOM_OCARINA_NOTE_F4,
-        BTN_CUSTOM_OCARINA_NOTE_A4,
-        BTN_CUSTOM_OCARINA_NOTE_B4,
-        BTN_CUSTOM_OCARINA_NOTE_D5
-    };
+    mCustomOcarinaButtonsBitmasks = { BTN_CUSTOM_OCARINA_NOTE_D4, BTN_CUSTOM_OCARINA_NOTE_F4,
+                                      BTN_CUSTOM_OCARINA_NOTE_A4, BTN_CUSTOM_OCARINA_NOTE_B4,
+                                      BTN_CUSTOM_OCARINA_NOTE_D5 };
 
-    addButtonName(BTN_A,		"A");
-    addButtonName(BTN_B,		"B");
-    addButtonName(BTN_CUP,		"C Up");
-    addButtonName(BTN_CDOWN,	"C Down");
-    addButtonName(BTN_CLEFT,	"C Left");
-    addButtonName(BTN_CRIGHT,	"C Right");
-    addButtonName(BTN_L,		"L");
-    addButtonName(BTN_Z,		"Z");
-    addButtonName(BTN_R,		"R");
-    addButtonName(BTN_START,	"Start");
-    addButtonName(BTN_DUP,		"D-pad up");
-    addButtonName(BTN_DDOWN,	"D-pad down");
-    addButtonName(BTN_DLEFT,	"D-pad left");
-    addButtonName(BTN_DRIGHT,	"D-pad right");
-    addButtonName(0,			"None");
+    addButtonName(BTN_A, "A");
+    addButtonName(BTN_B, "B");
+    addButtonName(BTN_CUP, "C Up");
+    addButtonName(BTN_CDOWN, "C Down");
+    addButtonName(BTN_CLEFT, "C Left");
+    addButtonName(BTN_CRIGHT, "C Right");
+    addButtonName(BTN_L, "L");
+    addButtonName(BTN_Z, "Z");
+    addButtonName(BTN_R, "R");
+    addButtonName(BTN_START, "Start");
+    addButtonName(BTN_DUP, "D-pad up");
+    addButtonName(BTN_DDOWN, "D-pad down");
+    addButtonName(BTN_DLEFT, "D-pad left");
+    addButtonName(BTN_DRIGHT, "D-pad right");
+    addButtonName(0, "None");
 }
 
 #define INPUT_EDITOR_WINDOW_GAME_INPUT_BLOCK_ID 95237929
@@ -169,8 +168,8 @@ void SohInputEditorWindow::DrawAnalogPreview(const char* label, ImVec2 stick, fl
 #define BUTTON_COLOR_KEYBOARD_BEIGE ImVec4(0.651f, 0.482f, 0.357f, 0.5f)
 #define BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED ImVec4(0.651f, 0.482f, 0.357f, 1.0f)
 
-#define BUTTON_COLOR_MOUSE_BEIGE ImVec4(0.5f, 0.5f, 0.5f, 0.5f)
-#define BUTTON_COLOR_MOUSE_BEIGE_HOVERED ImVec4(0.5f, 0.5f, 0.5f, 1.0f)
+#define BUTTON_COLOR_MOUSE_GRAY ImVec4(0.5f, 0.5f, 0.5f, 0.5f)
+#define BUTTON_COLOR_MOUSE_GRAY_HOVERED ImVec4(0.5f, 0.5f, 0.5f, 1.0f)
 
 #define BUTTON_COLOR_GAMEPAD_BLUE ImVec4(0.0f, 0.255f, 0.976f, 0.5f)
 #define BUTTON_COLOR_GAMEPAD_BLUE_HOVERED ImVec4(0.0f, 0.255f, 0.976f, 1.0f)
@@ -188,15 +187,15 @@ void SohInputEditorWindow::DrawAnalogPreview(const char* label, ImVec2 stick, fl
 #define BUTTON_COLOR_GAMEPAD_PURPLE_HOVERED ImVec4(0.431f, 0.369f, 0.706f, 1.0f)
 
 void SohInputEditorWindow::GetButtonColorsForDeviceType(Ship::PhysicalDeviceType lusIndex, ImVec4& buttonColor,
-                                                            ImVec4& buttonHoveredColor) {
+                                                        ImVec4& buttonHoveredColor) {
     switch (lusIndex) {
         case Ship::PhysicalDeviceType::Keyboard:
             buttonColor = BUTTON_COLOR_KEYBOARD_BEIGE;
             buttonHoveredColor = BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED;
             break;
         case Ship::PhysicalDeviceType::Mouse:
-            buttonColor = BUTTON_COLOR_MOUSE_BEIGE;
-            buttonHoveredColor = BUTTON_COLOR_MOUSE_BEIGE_HOVERED;
+            buttonColor = BUTTON_COLOR_MOUSE_GRAY;
+            buttonHoveredColor = BUTTON_COLOR_MOUSE_GRAY_HOVERED;
             break;
         case Ship::PhysicalDeviceType::SDLGamepad:
             buttonColor = BUTTON_COLOR_GAMEPAD_BLUE;
@@ -262,6 +261,7 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
             icon = ICON_FA_GAMEPAD;
             break;
         case MAPPING_TYPE_KEYBOARD:
+        case MAPPING_TYPE_MOUSE:
             icon = ICON_FA_KEYBOARD_O;
             break;
         case MAPPING_TYPE_UNKNOWN:
@@ -642,10 +642,14 @@ void SohInputEditorWindow::DrawStickSection(uint8_t port, uint8_t stick, int32_t
 
     ImGui::SameLine();
     ImGui::BeginGroup();
-    DrawStickDirectionLine(ICON_FA_ARROW_UP, port, stick, Ship::UP, color);
-    DrawStickDirectionLine(ICON_FA_ARROW_DOWN, port, stick, Ship::DOWN, color);
-    DrawStickDirectionLine(ICON_FA_ARROW_LEFT, port, stick, Ship::LEFT, color);
-    DrawStickDirectionLine(ICON_FA_ARROW_RIGHT, port, stick, Ship::RIGHT, color);
+    DrawStickDirectionLine(StringHelper::Sprintf("%s##%d", ICON_FA_ARROW_UP, stick).c_str(), port, stick, Ship::UP,
+                           color);
+    DrawStickDirectionLine(StringHelper::Sprintf("%s##%d", ICON_FA_ARROW_DOWN, stick).c_str(), port, stick, Ship::DOWN,
+                           color);
+    DrawStickDirectionLine(StringHelper::Sprintf("%s##%d", ICON_FA_ARROW_LEFT, stick).c_str(), port, stick, Ship::LEFT,
+                           color);
+    DrawStickDirectionLine(StringHelper::Sprintf("%s##%d", ICON_FA_ARROW_RIGHT, stick).c_str(), port, stick,
+                           Ship::RIGHT, color);
     ImGui::EndGroup();
     ImGui::SetNextItemOpen(true, ImGuiCond_Once);
     if (ImGui::TreeNode(StringHelper::Sprintf("Analog Stick Options##%d", id).c_str())) {
@@ -665,8 +669,8 @@ void SohInputEditorWindow::DrawStickSection(uint8_t port, uint8_t stick, int32_t
         }
         ImGui::SameLine(0.0f, 0.0f);
         ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f));
-        if (ImGui::SliderInt(StringHelper::Sprintf("##Sensitivity%d", id).c_str(), &sensitivityPercentage, 0, 200, "%d%%",
-                             ImGuiSliderFlags_AlwaysClamp)) {
+        if (ImGui::SliderInt(StringHelper::Sprintf("##Sensitivity%d", id).c_str(), &sensitivityPercentage, 0, 200,
+                             "%d%%", ImGuiSliderFlags_AlwaysClamp)) {
             controllerStick->SetSensitivity(sensitivityPercentage);
         }
         ImGui::SameLine(0.0f, 0.0f);
@@ -1062,17 +1066,20 @@ void SohInputEditorWindow::DrawLEDSection(uint8_t port) {
             }
             // todo: clean this up, probably just hardcode to LED_COLOR_SOURCE_GAME and use SoH options only here
             if (mapping->GetColorSource() == LED_COLOR_SOURCE_GAME) {
-                static const char* ledSources[] = {
+                static std::vector<const char*> ledSources = {
                     "Original Tunic Colors",          "Cosmetics Tunic Colors",          "Health Colors",
                     "Original Navi Targeting Colors", "Cosmetics Navi Targeting Colors", "Custom"
                 };
-                UIWidgets::PaddedText("Source");
-                UIWidgets::EnhancementCombobox(CVAR_SETTING("LEDColorSource"), ledSources, LED_SOURCE_TUNIC_ORIGINAL);
-                UIWidgets::Tooltip("Health\n- Red when health critical (13-20% depending on max health)\n- Yellow when "
-                                   "health < 40%. Green otherwise.\n\n"
-                                   "Tunics: colors will mirror currently equipped tunic, whether original or the current "
-                                   "values in Cosmetics Editor.\n\n"
-                                   "Custom: single, solid color");
+                CVarCombobox(
+                    "Source", CVAR_SETTING("LEDColorSource"), ledSources,
+                    UIWidgets::ComboboxOptions()
+                        .Color(THEME_COLOR)
+                        .DefaultIndex(LED_SOURCE_TUNIC_ORIGINAL)
+                        .Tooltip("Health\n- Red when health critical (13-20% depending on max health)\n- Yellow when "
+                                 "health < 40%. Green otherwise.\n\n"
+                                 "Tunics: colors will mirror currently equipped tunic, whether original or the current "
+                                 "values in Cosmetics Editor.\n\n"
+                                 "Custom: single, solid color"));
                 if (CVarGetInteger(CVAR_SETTING("LEDColorSource"), 1) == LED_SOURCE_CUSTOM) {
                     UIWidgets::Spacer(3);
                     auto port1Color = CVarGetColor24(CVAR_SETTING("LEDPort1Color"), { 255, 255, 255 });
@@ -1090,14 +1097,22 @@ void SohInputEditorWindow::DrawLEDSection(uint8_t port) {
                     ImGui::SameLine();
                     ImGui::Text("Custom Color");
                 }
-                UIWidgets::PaddedEnhancementSliderFloat("Brightness: %.1f %%", "##LED_Brightness", CVAR_SETTING("LEDBrightness"), 0.0f,
-                                                        1.0f, "", 1.0f, true, true);
-                UIWidgets::Tooltip("Sets the brightness of controller LEDs. 0% brightness = LEDs off.");
-                UIWidgets::PaddedEnhancementCheckbox(
-                    "Critical Health Override", CVAR_SETTING("LEDCriticalOverride"), true, true,
-                    CVarGetInteger(CVAR_SETTING("LEDColorSource"), LED_SOURCE_TUNIC_ORIGINAL) == LED_SOURCE_HEALTH,
-                    "Override redundant for health source.", UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::Tooltip("Shows red color when health is critical, otherwise displays according to color source.");
+                CVarSliderFloat("Brightness: %.1f %%", CVAR_SETTING("LEDBrightness"),
+                                FloatSliderOptions()
+                                    .IsPercentage()
+                                    .Min(0.0f)
+                                    .Max(1.0f)
+                                    .DefaultValue(1.0f)
+                                    .ShowButtons(true)
+                                    .Tooltip("Sets the brightness of controller LEDs. 0% brightness = LEDs off."));
+                CVarCheckbox(
+                    "Critical Health Override", CVAR_SETTING("LEDCriticalOverride"),
+                    CheckboxOptions({ { .disabled = CVarGetInteger(CVAR_SETTING("LEDColorSource"),
+                                                                   LED_SOURCE_TUNIC_ORIGINAL) == LED_SOURCE_HEALTH,
+                                        .disabledTooltip = "Override redundant for health source." } })
+                        .DefaultValue(true)
+                        .Tooltip(
+                            "Shows red color when health is critical, otherwise displays according to color source."));
             }
             ImGui::TreePop();
         }
@@ -1232,38 +1247,35 @@ void SohInputEditorWindow::DrawGyroSection(uint8_t port) {
     }
 }
 
-const ImGuiTableFlags PANEL_TABLE_FLAGS =
-    ImGuiTableFlags_BordersH |
-    ImGuiTableFlags_BordersV;
+const ImGuiTableFlags PANEL_TABLE_FLAGS = ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV;
 const ImGuiTableColumnFlags PANEL_TABLE_COLUMN_FLAGS =
-    ImGuiTableColumnFlags_IndentEnable |
-    ImGuiTableColumnFlags_NoSort;
+    ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort;
 
 namespace TableHelper {
-    void InitHeader(bool has_header = true) {
-        if (has_header) {
-            ImGui::TableHeadersRow();
-        }
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::AlignTextToFramePadding(); //This is to adjust Vertical pos of item in a cell to be normlized.
-        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-    }
-
-    void NextCol() {
-        ImGui::TableNextColumn();
-        ImGui::AlignTextToFramePadding();
-        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-    }
-
-    void NextLine() {
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::AlignTextToFramePadding();
-        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
+void InitHeader(bool has_header = true) {
+    if (has_header) {
+        ImGui::TableHeadersRow();
     }
+    ImGui::TableNextRow();
+    ImGui::TableNextColumn();
+    ImGui::AlignTextToFramePadding(); // This is to adjust Vertical pos of item in a cell to be normlized.
+    ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
 }
 
+void NextCol() {
+    ImGui::TableNextColumn();
+    ImGui::AlignTextToFramePadding();
+    ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
+}
+
+void NextLine() {
+    ImGui::TableNextRow();
+    ImGui::TableNextColumn();
+    ImGui::AlignTextToFramePadding();
+    ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
+}
+} // namespace TableHelper
+
 void SohInputEditorWindow::addButtonName(N64ButtonMask mask, const char* name) {
     buttons.push_back(std::make_pair(mask, name));
     buttonNames[mask] = std::prev(buttons.end());
@@ -1281,7 +1293,6 @@ void SohInputEditorWindow::DrawMapping(CustomButtonMap& mapping, float labelWidt
         preview = "Unknown";
     }
 
-    UIWidgets::Spacer(0);
     ImVec2 cursorPos = ImGui::GetCursorPos();
     ImVec2 textSize = ImGui::CalcTextSize(mapping.label);
     ImGui::SetCursorPosY(cursorPos.y + textSize.y / 4);
@@ -1291,7 +1302,7 @@ void SohInputEditorWindow::DrawMapping(CustomButtonMap& mapping, float labelWidt
     ImGui::SetCursorPosY(cursorPos.y);
 
     ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
-        if (ImGui::BeginCombo(StringHelper::Sprintf("##%s", mapping.cVarName).c_str(), preview)) {
+    if (ImGui::BeginCombo(StringHelper::Sprintf("##%s", mapping.cVarName).c_str(), preview)) {
         for (auto i = buttons.begin(); i != buttons.end(); i++) {
             if ((i->first & excludedButtons) != 0) {
                 continue;
@@ -1303,16 +1314,16 @@ void SohInputEditorWindow::DrawMapping(CustomButtonMap& mapping, float labelWidt
         }
         ImGui::EndCombo();
     }
-    UIWidgets::Spacer(0);
 }
 
 void SohInputEditorWindow::DrawOcarinaControlPanel() {
     ImVec2 cursor = ImGui::GetCursorPos();
     ImGui::SetCursorPos(ImVec2(cursor.x, cursor.y + 5));
-    
-    UIWidgets::EnhancementCheckbox("Dpad Ocarina Playback", CVAR_SETTING("CustomOcarina.Dpad"));
-    UIWidgets::EnhancementCheckbox("Right Stick Ocarina Playback", CVAR_SETTING("CustomOcarina.RightStick"));
-    UIWidgets::EnhancementCheckbox("Customize Ocarina Controls", CVAR_SETTING("CustomOcarina.Enabled"));
+
+    CheckboxOptions checkOpt = CheckboxOptions().Color(THEME_COLOR);
+    CVarCheckbox("Dpad Ocarina Playback", CVAR_SETTING("CustomOcarina.Dpad"), checkOpt);
+    CVarCheckbox("Right Stick Ocarina Playback", CVAR_SETTING("CustomOcarina.RightStick"), checkOpt);
+    CVarCheckbox("Customize Ocarina Controls", CVAR_SETTING("CustomOcarina.Enabled"), checkOpt);
 
     if (!CVarGetInteger(CVAR_SETTING("CustomOcarina.Enabled"), 0)) {
         ImGui::BeginDisabled();
@@ -1328,12 +1339,12 @@ void SohInputEditorWindow::DrawOcarinaControlPanel() {
 
     ImGui::AlignTextToFramePadding();
     ImGui::BulletText("Disable song detection");
-    DrawButtonLine(ICON_FA_BAN, 0, BTN_CUSTOM_OCARINA_DISABLE_SONGS);
+    DrawButtonLine(ICON_FA_BAN "##DisableSongDetection", 0, BTN_CUSTOM_OCARINA_DISABLE_SONGS);
 
     ImGui::AlignTextToFramePadding();
     ImGui::BulletText("Pitch");
-    DrawButtonLine(ICON_FA_ARROW_UP, 0, BTN_CUSTOM_OCARINA_PITCH_UP);
-    DrawButtonLine(ICON_FA_ARROW_DOWN, 0, BTN_CUSTOM_OCARINA_PITCH_DOWN);
+    DrawButtonLine(ICON_FA_ARROW_UP "##Pitch", 0, BTN_CUSTOM_OCARINA_PITCH_UP);
+    DrawButtonLine(ICON_FA_ARROW_DOWN "##Pitch", 0, BTN_CUSTOM_OCARINA_PITCH_DOWN);
 
     if (!CVarGetInteger(CVAR_SETTING("CustomOcarina.Enabled"), 0)) {
         ImGui::EndDisabled();
@@ -1343,61 +1354,110 @@ void SohInputEditorWindow::DrawOcarinaControlPanel() {
 void SohInputEditorWindow::DrawCameraControlPanel() {
     ImVec2 cursor = ImGui::GetCursorPos();
     ImGui::SetCursorPos(ImVec2(cursor.x + 5, cursor.y + 5));
+    CVarCheckbox(
+        "Enable Mouse Controls", CVAR_SETTING("EnableMouse"),
+        CheckboxOptions()
+            .Color(THEME_COLOR)
+            .Tooltip("Allows for using the mouse to control the camera (must enable Free Look), "
+                     "aim with the shield, and perform quickspin attacks (quickly rotate the mouse then press B)"));
     Ship::GuiWindow::BeginGroupPanel("Aiming/First-Person Camera", ImGui::GetContentRegionAvail());
-    UIWidgets::PaddedEnhancementCheckbox("Right Stick Aiming", CVAR_SETTING("Controls.RightStickAim"));
-    UIWidgets::Tooltip("Allows for aiming with the right stick in:\n-First-Person/C-Up view\n-Weapon Aiming");
+    CVarCheckbox("Right Stick Aiming", CVAR_SETTING("Controls.RightStickAim"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .Tooltip("Allows for aiming with the right stick in:\n-First-Person/C-Up view\n-Weapon Aiming"));
     if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
-        UIWidgets::PaddedEnhancementCheckbox("Allow moving while in first person mode", CVAR_SETTING("MoveInFirstPerson"));
-        UIWidgets::Tooltip("Changes the left stick to move the player while in first person mode");
+        CVarCheckbox("Allow moving while in first person mode", CVAR_SETTING("MoveInFirstPerson"),
+                     CheckboxOptions()
+                         .Color(THEME_COLOR)
+                         .Tooltip("Changes the left stick to move the player while in first person mode"));
     }
-    UIWidgets::PaddedEnhancementCheckbox("Invert Aiming X Axis", CVAR_SETTING("Controls.InvertAimingXAxis"));
-    UIWidgets::Tooltip("Inverts the Camera X Axis in:\n-First-Person/C-Up view\n-Weapon Aiming");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Aiming Y Axis", CVAR_SETTING("Controls.InvertAimingYAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::Tooltip("Inverts the Camera Y Axis in:\n-First-Person/C-Up view\n-Weapon Aiming");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming X Axis", CVAR_SETTING("Controls.InvertShieldAimingXAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::Tooltip("Inverts the Shield Aiming X Axis");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Shield Aiming Y Axis", CVAR_SETTING("Controls.InvertShieldAimingYAxis"));
-    UIWidgets::Tooltip("Inverts the Shield Aiming Y Axis");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Z-Weapon Aiming Y Axis", CVAR_SETTING("Controls.InvertZAimingYAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::Tooltip("Inverts the Camera Y Axis in:\n-Z-Weapon Aiming");
-    UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First-Person View", CVAR_SETTING("DisableFirstPersonAutoCenterView"));
-    UIWidgets::Tooltip("Prevents the C-Up view from auto-centering, allowing for Gyro Aiming");
-    if (UIWidgets::PaddedEnhancementCheckbox("Enable Custom Aiming/First-Person sensitivity", CVAR_SETTING("FirstPersonCameraSensitivity.Enabled"), true, false)) {
+    CVarCheckbox("Invert Aiming X Axis", CVAR_SETTING("Controls.InvertAimingXAxis"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .Tooltip("Inverts the Camera X Axis in:\n-First-Person/C-Up view\n-Weapon Aiming"));
+    CVarCheckbox("Invert Aiming Y Axis", CVAR_SETTING("Controls.InvertAimingYAxis"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .DefaultValue(true)
+                     .Tooltip("Inverts the Camera Y Axis in:\n-First-Person/C-Up view\n-Weapon Aiming"));
+    CVarCheckbox("Invert Shield Aiming X Axis", CVAR_SETTING("Controls.InvertShieldAimingXAxis"),
+                 CheckboxOptions().Color(THEME_COLOR).DefaultValue(true).Tooltip("Inverts the Shield Aiming X Axis"));
+    CVarCheckbox("Invert Shield Aiming Y Axis", CVAR_SETTING("Controls.InvertShieldAimingYAxis"),
+                 CheckboxOptions().Color(THEME_COLOR).Tooltip("Inverts the Shield Aiming Y Axis"));
+    CVarCheckbox("Invert Z-Weapon Aiming Y Axis", CVAR_SETTING("Controls.InvertZAimingYAxis"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .DefaultValue(true)
+                     .Tooltip("Inverts the Camera Y Axis in:\n-Z-Weapon Aiming"));
+    CVarCheckbox("Disable Auto-Centering in First-Person View", CVAR_SETTING("DisableFirstPersonAutoCenterView"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .Tooltip("Prevents the C-Up view from auto-centering, allowing for Gyro Aiming"));
+    if (CVarCheckbox("Enable Custom Aiming/First-Person sensitivity",
+                     CVAR_SETTING("FirstPersonCameraSensitivity.Enabled"), CheckboxOptions().Color(THEME_COLOR))) {
         if (!CVarGetInteger(CVAR_SETTING("FirstPersonCameraSensitivity.Enabled"), 0)) {
             CVarClear(CVAR_SETTING("FirstPersonCameraSensitivity.X"));
             CVarClear(CVAR_SETTING("FirstPersonCameraSensitivity.Y"));
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         }
     }
     if (CVarGetInteger(CVAR_SETTING("FirstPersonCameraSensitivity.Enabled"), 0)) {
-        UIWidgets::EnhancementSliderFloat("Aiming/First-Person Horizontal Sensitivity: %.0f %%", "##FirstPersonSensitivity Horizontal",
-                                            CVAR_SETTING("FirstPersonCameraSensitivity.X"), 0.01f, 5.0f, "", 1.0f, true);
-        UIWidgets::EnhancementSliderFloat("Aiming/First-Person Vertical Sensitivity: %.0f %%", "##FirstPersonSensitivity Vertical",
-                                          CVAR_SETTING("FirstPersonCameraSensitivity.Y"), 0.01f, 5.0f, "", 1.0f, true);
+        CVarSliderFloat("Aiming/First-Person Horizontal Sensitivity: %.0f %%",
+                        CVAR_SETTING("FirstPersonCameraSensitivity.X"),
+                        FloatSliderOptions()
+                            .Color(THEME_COLOR)
+                            .IsPercentage()
+                            .Min(0.01f)
+                            .Max(5.0f)
+                            .DefaultValue(1.0f)
+                            .ShowButtons(true));
+        CVarSliderFloat("Aiming/First-Person Vertical Sensitivity: %.0f %%",
+                        CVAR_SETTING("FirstPersonCameraSensitivity.Y"),
+                        FloatSliderOptions()
+                            .Color(THEME_COLOR)
+                            .IsPercentage()
+                            .Min(0.01f)
+                            .Max(5.0f)
+                            .DefaultValue(1.0f)
+                            .ShowButtons(true));
     }
-    UIWidgets::Spacer(0);
     Ship::GuiWindow::EndGroupPanel(0);
 
-    UIWidgets::Spacer(0);
     cursor = ImGui::GetCursorPos();
     ImGui::SetCursorPos(ImVec2(cursor.x + 5, cursor.y + 5));
     Ship::GuiWindow::BeginGroupPanel("Third-Person Camera", ImGui::GetContentRegionAvail());
 
-    UIWidgets::PaddedEnhancementCheckbox("Free Look", CVAR_SETTING("FreeLook.Enabled"));
-    UIWidgets::Tooltip("Enables free look camera control\nNote: You must remap C buttons off of the right stick in the "
-                            "controller config menu, and map the camera stick to the right stick.");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Camera X Axis", CVAR_SETTING("FreeLook.InvertXAxis"));
-    UIWidgets::Tooltip("Inverts the Camera X Axis in:\n-Free look");
-    UIWidgets::PaddedEnhancementCheckbox("Invert Camera Y Axis", CVAR_SETTING("FreeLook.InvertYAxis"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::Tooltip("Inverts the Camera Y Axis in:\n-Free look");
-    UIWidgets::Spacer(0);
-    UIWidgets::PaddedEnhancementSliderFloat("Third-Person Horizontal Sensitivity: %.0f %%", "##ThirdPersonSensitivity Horizontal",
-                                            CVAR_SETTING("FreeLook.CameraSensitivity.X"), 0.01f, 5.0f, "", 1.0f, true, true, false, true);
-    UIWidgets::PaddedEnhancementSliderFloat("Third-Person Vertical Sensitivity: %.0f %%", "##ThirdPersonSensitivity Vertical",
-                                            CVAR_SETTING("FreeLook.CameraSensitivity.Y"), 0.01f, 5.0f, "", 1.0f, true, true, false, true);
-    UIWidgets::PaddedEnhancementSliderInt("Camera Distance: %d", "##CamDist",
-                                    CVAR_SETTING("FreeLook.MaxCameraDistance"), 100, 900, "", 185, true, false, true);
-    UIWidgets::PaddedEnhancementSliderInt("Camera Transition Speed: %d", "##CamTranSpeed",
-                                    CVAR_SETTING("FreeLook.TransitionSpeed"), 0, 900, "", 25, true, false, true);
+    CVarCheckbox(
+        "Free Look", CVAR_SETTING("FreeLook.Enabled"),
+        CheckboxOptions()
+            .Color(THEME_COLOR)
+            .Tooltip("Enables free look camera control\nNote: You must remap C buttons off of the right stick in the "
+                     "controller config menu, and map the camera stick to the right stick."));
+    CVarCheckbox("Invert Camera X Axis", CVAR_SETTING("FreeLook.InvertXAxis"),
+                 CheckboxOptions().Color(THEME_COLOR).Tooltip("Inverts the Camera X Axis in:\n-Free look"));
+    CVarCheckbox(
+        "Invert Camera Y Axis", CVAR_SETTING("FreeLook.InvertYAxis"),
+        CheckboxOptions().Color(THEME_COLOR).DefaultValue(true).Tooltip("Inverts the Camera Y Axis in:\n-Free look"));
+    CVarSliderFloat("Third-Person Horizontal Sensitivity: %.0f %%", CVAR_SETTING("FreeLook.CameraSensitivity.X"),
+                    FloatSliderOptions()
+                        .Color(THEME_COLOR)
+                        .IsPercentage()
+                        .Min(0.01f)
+                        .Max(5.0f)
+                        .DefaultValue(1.0f)
+                        .ShowButtons(true));
+    CVarSliderFloat("Third-Person Vertical Sensitivity: %.0f %%", CVAR_SETTING("FreeLook.CameraSensitivity.Y"),
+                    FloatSliderOptions()
+                        .Color(THEME_COLOR)
+                        .IsPercentage()
+                        .Min(0.01f)
+                        .Max(5.0f)
+                        .DefaultValue(1.0f)
+                        .ShowButtons(true));
+    CVarSliderInt("Camera Distance: %d", CVAR_SETTING("FreeLook.MaxCameraDistance"),
+                  IntSliderOptions().Color(THEME_COLOR).Min(100).Max(900).DefaultValue(185).ShowButtons(true));
+    CVarSliderInt("Camera Transition Speed: %d", CVAR_SETTING("FreeLook.TransitionSpeed"),
+                  IntSliderOptions().Color(THEME_COLOR).Min(0).Max(900).DefaultValue(25).ShowButtons(true));
     Ship::GuiWindow::EndGroupPanel(0);
 }
 
@@ -1405,17 +1465,26 @@ void SohInputEditorWindow::DrawDpadControlPanel() {
     ImVec2 cursor = ImGui::GetCursorPos();
     ImGui::SetCursorPos(ImVec2(cursor.x + 5, cursor.y + 5));
     Ship::GuiWindow::BeginGroupPanel("D-Pad Options", ImGui::GetContentRegionAvail());
-    UIWidgets::PaddedEnhancementCheckbox("D-pad Support on Pause Screen", CVAR_SETTING("DPadOnPause"));
-    UIWidgets::Tooltip("Navigate Pause with the D-pad\nIf used with \"D-pad as Equip Items\", you must hold C-Up to equip instead of navigate");
-    UIWidgets::PaddedEnhancementCheckbox("D-pad Support in Text Boxes", CVAR_SETTING("DpadInText"));
-    UIWidgets::Tooltip("Navigate choices in text boxes, shop item selection, and the file select / name entry screens with the D-pad");
+    CVarCheckbox("D-pad Support on Pause Screen", CVAR_SETTING("DPadOnPause"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .Tooltip("Navigate Pause with the D-pad\nIf used with \"D-pad as Equip Items\", you must hold "
+                              "C-Up to equip instead of navigate"));
+    CVarCheckbox("D-pad Support in Text Boxes", CVAR_SETTING("DpadInText"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .Tooltip("Navigate choices in text boxes, shop item selection, and the file select / name entry "
+                              "screens with the D-pad"));
 
     if (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) && !CVarGetInteger(CVAR_SETTING("DpadInText"), 0)) {
         ImGui::BeginDisabled();
     }
 
-    UIWidgets::PaddedEnhancementCheckbox("D-pad hold change", CVAR_SETTING("DpadHoldChange"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::Tooltip("The cursor will only move a single space no matter how long a D-pad direction is held");
+    CVarCheckbox("D-pad hold change", CVAR_SETTING("DpadHoldChange"),
+                 CheckboxOptions()
+                     .Color(THEME_COLOR)
+                     .DefaultValue(true)
+                     .Tooltip("The cursor will only move a single space no matter how long a D-pad direction is held"));
 
     if (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) && !CVarGetInteger(CVAR_SETTING("DpadInText"), 0)) {
         ImGui::EndDisabled();
@@ -1457,7 +1526,7 @@ void SohInputEditorWindow::DrawDeviceToggles(uint8_t portIndex) {
         ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor);
         auto notIgnored = !connectedDeviceManager->PortIsIgnoringInstanceId(portIndex, instanceId);
         ImGui::PopItemFlag();
-        if(ImGui::Checkbox(StringHelper::Sprintf("###instanceId_%d", instanceId).c_str(), &notIgnored)) {
+        if (ImGui::Checkbox(StringHelper::Sprintf("###instanceId_%d", instanceId).c_str(), &notIgnored)) {
             if (notIgnored) {
                 connectedDeviceManager->UnignoreInstanceIdForPort(portIndex, instanceId);
             } else {
@@ -1505,10 +1574,10 @@ void SohInputEditorWindow::DrawLinkTab() {
         }
 
         if (ImGui::CollapsingHeader("D-Pad", NULL, ImGuiTreeNodeFlags_DefaultOpen)) {
-            DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_DUP);
-            DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_DDOWN);
-            DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_DLEFT);
-            DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_DRIGHT);
+            DrawButtonLine(StringHelper::Sprintf("D %s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_DUP);
+            DrawButtonLine(StringHelper::Sprintf("D %s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_DDOWN);
+            DrawButtonLine(StringHelper::Sprintf("D %s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_DLEFT);
+            DrawButtonLine(StringHelper::Sprintf("D %s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_DRIGHT);
         }
 
         if (ImGui::CollapsingHeader("Analog Stick", NULL, ImGuiTreeNodeFlags_DefaultOpen)) {
@@ -1536,30 +1605,52 @@ void SohInputEditorWindow::DrawLinkTab() {
             DrawButtonLine("M2", portIndex, BTN_CUSTOM_MODIFIER2);
 
             ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
-            UIWidgets::PaddedEnhancementCheckbox("Enable speed modifiers", CVAR_SETTING("WalkModifier.Enabled"), true, false);
-            UIWidgets::Tooltip("Hold the assigned button to change the maximum walking or swimming speed");
+            CVarCheckbox("Enable speed modifiers", CVAR_SETTING("WalkModifier.Enabled"),
+                         CheckboxOptions()
+                             .Color(THEME_COLOR)
+                             .Tooltip("Hold the assigned button to change the maximum walking or swimming speed"));
             if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0)) {
                 UIWidgets::Spacer(5);
                 Ship::GuiWindow::BeginGroupPanel("Speed Modifier", ImGui::GetContentRegionAvail());
-                UIWidgets::PaddedEnhancementCheckbox("Toggle modifier instead of holding",
-                                                     CVAR_SETTING("WalkModifier.SpeedToggle"), true, false);
+                CVarCheckbox("Toggle modifier instead of holding", CVAR_SETTING("WalkModifier.SpeedToggle"),
+                             CheckboxOptions().Color(THEME_COLOR));
                 Ship::GuiWindow::BeginGroupPanel("Walk Modifier", ImGui::GetContentRegionAvail());
-                UIWidgets::PaddedEnhancementCheckbox("Don't affect jump distance/velocity",
-                                                     CVAR_SETTING("WalkModifier.DoesntChangeJump"), true, false);
-                UIWidgets::PaddedEnhancementSliderFloat("Walk Modifier 1: %.0f %%", "##WalkMod1",
-                                                        CVAR_SETTING("WalkModifier.Mapping1"), 0.0f, 5.0f, "", 1.0f,
-                                                        true, true, false, true);
-                UIWidgets::PaddedEnhancementSliderFloat("Walk Modifier 2: %.0f %%", "##WalkMod2",
-                                                        CVAR_SETTING("WalkModifier.Mapping2"), 0.0f, 5.0f, "", 1.0f,
-                                                        true, true, false, true);
+                CVarCheckbox("Don't affect jump distance/velocity", CVAR_SETTING("WalkModifier.DoesntChangeJump"),
+                             CheckboxOptions().Color(THEME_COLOR));
+                CVarSliderFloat("Walk Modifier 1: %.0f %%", CVAR_SETTING("WalkModifier.Mapping1"),
+                                FloatSliderOptions()
+                                    .Color(THEME_COLOR)
+                                    .IsPercentage()
+                                    .Min(0.0f)
+                                    .Max(5.0f)
+                                    .DefaultValue(1.0f)
+                                    .ShowButtons(true));
+                CVarSliderFloat("Walk Modifier 2: %.0f %%", CVAR_SETTING("WalkModifier.Mapping2"),
+                                FloatSliderOptions()
+                                    .Color(THEME_COLOR)
+                                    .IsPercentage()
+                                    .Min(0.0f)
+                                    .Max(5.0f)
+                                    .DefaultValue(1.0f)
+                                    .ShowButtons(true));
                 Ship::GuiWindow::EndGroupPanel(0);
                 Ship::GuiWindow::BeginGroupPanel("Swim Modifier", ImGui::GetContentRegionAvail());
-                UIWidgets::PaddedEnhancementSliderFloat("Swim Modifier 1: %.0f %%", "##SwimMod1",
-                                                        CVAR_SETTING("WalkModifier.SwimMapping1"), 0.0f, 5.0f, "", 1.0f,
-                                                        true, true, false, true);
-                UIWidgets::PaddedEnhancementSliderFloat("Swim Modifier 2: %.0f %%", "##SwimMod2",
-                                                        CVAR_SETTING("WalkModifier.SwimMapping2"), 0.0f, 5.0f, "", 1.0f,
-                                                        true, true, false, true);
+                CVarSliderFloat("Swim Modifier 1: %.0f %%", CVAR_SETTING("WalkModifier.SwimMapping1"),
+                                FloatSliderOptions()
+                                    .Color(THEME_COLOR)
+                                    .IsPercentage()
+                                    .Min(0.0f)
+                                    .Max(5.0f)
+                                    .DefaultValue(1.0f)
+                                    .ShowButtons(true));
+                CVarSliderFloat("Swim Modifier 2: %.0f %%", CVAR_SETTING("WalkModifier.SwimMapping2"),
+                                FloatSliderOptions()
+                                    .Color(THEME_COLOR)
+                                    .IsPercentage()
+                                    .Min(0.0f)
+                                    .Max(5.0f)
+                                    .DefaultValue(1.0f)
+                                    .ShowButtons(true));
                 Ship::GuiWindow::EndGroupPanel(0);
                 Ship::GuiWindow::EndGroupPanel(0);
             }
@@ -1659,9 +1750,7 @@ void SohInputEditorWindow::DrawDebugPortTab(uint8_t portIndex, std::string custo
         UpdateBitmaskToMappingIds(portIndex);
         UpdateStickDirectionToMappingIds(portIndex);
 
-        ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.133f, 0.133f, 0.133f, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
+        PushStyleHeader(THEME_COLOR);
 
         if (ImGui::CollapsingHeader("Buttons", NULL, ImGuiTreeNodeFlags_DefaultOpen)) {
             DrawButtonLine("A", portIndex, BTN_A, CHIP_COLOR_N64_BLUE);
@@ -1690,19 +1779,20 @@ void SohInputEditorWindow::DrawDebugPortTab(uint8_t portIndex, std::string custo
             DrawStickSection(portIndex, Ship::LEFT, 0);
         }
 
-        ImGui::PopStyleColor();
-        ImGui::PopStyleColor();
-        ImGui::PopStyleColor();
+        PopStyleHeader();
         ImGui::EndTabItem();
     }
 }
 
 void SohInputEditorWindow::DrawClearAllButton(uint8_t portIndex) {
+    PushStyleButton(THEME_COLOR);
     if (ImGui::Button("Clear All", ImGui::CalcTextSize("Clear All") * 2)) {
         ImGui::OpenPopup("Clear All##clearAllPopup");
     }
+    PopStyleButton();
     if (ImGui::BeginPopupModal("Clear All##clearAllPopup", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
         ImGui::Text("This will clear all mappings for port %d.\n\nContinue?", portIndex + 1);
+        PushStyleButton(THEME_COLOR);
         if (ImGui::Button("Cancel")) {
             ImGui::CloseCurrentPopup();
         }
@@ -1710,6 +1800,7 @@ void SohInputEditorWindow::DrawClearAllButton(uint8_t portIndex) {
             Ship::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->ClearAllMappings();
             ImGui::CloseCurrentPopup();
         }
+        PopStyleButton();
         ImGui::EndPopup();
     }
 }
@@ -1717,22 +1808,23 @@ void SohInputEditorWindow::DrawClearAllButton(uint8_t portIndex) {
 void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
     ImGui::SameLine();
     auto popupId = StringHelper::Sprintf("setDefaultsPopup##%d", portIndex);
+    PushStyleButton(THEME_COLOR);
     if (ImGui::Button(StringHelper::Sprintf("Set Defaults##%d", portIndex).c_str(),
                       ImVec2(ImGui::CalcTextSize("Set Defaults") * 2))) {
         ImGui::OpenPopup(popupId.c_str());
     }
+    PopStyleButton();
 
     if (ImGui::BeginPopup(popupId.c_str())) {
         bool shouldClose = false;
-        ImGui::PushStyleColor(ImGuiCol_Button, BUTTON_COLOR_KEYBOARD_BEIGE);
-        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED);
+        PushStyleButton(BUTTON_COLOR_KEYBOARD_BEIGE);
         if (ImGui::Button(StringHelper::Sprintf("%s Keyboard", ICON_FA_KEYBOARD_O).c_str())) {
             ImGui::OpenPopup("Set Defaults for Keyboard");
         }
-        ImGui::PopStyleColor();
-        ImGui::PopStyleColor();
+        PopStyleButton();
         if (ImGui::BeginPopupModal("Set Defaults for Keyboard", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
             ImGui::Text("This will clear all existing mappings for\nKeyboard on port %d.\n\nContinue?", portIndex + 1);
+            PushStyleButton(THEME_COLOR);
             if (ImGui::Button("Cancel")) {
                 shouldClose = true;
                 ImGui::CloseCurrentPopup();
@@ -1747,21 +1839,22 @@ void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
                 shouldClose = true;
                 ImGui::CloseCurrentPopup();
             }
+            PopStyleButton();
             ImGui::EndPopup();
         }
 
         auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button);
         auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered);
         GetButtonColorsForDeviceType(Ship::PhysicalDeviceType::SDLGamepad, buttonColor, buttonHoveredColor);
-        ImGui::PushStyleColor(ImGuiCol_Button, buttonColor);
-        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor);
+        PushStyleButton(buttonColor);
         if (ImGui::Button(StringHelper::Sprintf("%s %s", ICON_FA_GAMEPAD, "Gamepad (SDL)").c_str())) {
             ImGui::OpenPopup("Set Defaults for Gamepad (SDL)");
         }
-        ImGui::PopStyleColor();
-        ImGui::PopStyleColor();
+        PopStyleButton();
         if (ImGui::BeginPopupModal("Set Defaults for Gamepad (SDL)", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
-            ImGui::Text("This will clear all existing mappings for\nGamepad (SDL) on port %d.\n\nContinue?", portIndex + 1);
+            ImGui::Text("This will clear all existing mappings for\nGamepad (SDL) on port %d.\n\nContinue?",
+                        portIndex + 1);
+            PushStyleButton(THEME_COLOR);
             if (ImGui::Button("Cancel")) {
                 shouldClose = true;
                 ImGui::CloseCurrentPopup();
@@ -1776,18 +1869,26 @@ void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
                 shouldClose = true;
                 ImGui::CloseCurrentPopup();
             }
+            PopStyleButton();
             ImGui::EndPopup();
         }
 
+        PushStyleButton(THEME_COLOR);
         if (ImGui::Button("Cancel") || shouldClose) {
             ImGui::CloseCurrentPopup();
         }
+        PopStyleButton();
 
         ImGui::EndPopup();
     }
 }
 
 void SohInputEditorWindow::DrawElement() {
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+    ImVec4 themeColor = ColorValues.at(THEME_COLOR);
+    ImGui::PushStyleColor(ImGuiCol_Tab, ImVec4(themeColor.x, themeColor.y, themeColor.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_TabHovered, ImVec4(themeColor.x, themeColor.y, themeColor.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_TabActive, ImVec4(themeColor.x, themeColor.y, themeColor.z, 0.6f));
     ImGui::BeginTabBar("##ControllerConfigPortTabs");
     DrawLinkTab();
     DrawIvanTab();
@@ -1796,4 +1897,6 @@ void SohInputEditorWindow::DrawElement() {
         DrawDebugPortTab(3);
     }
     ImGui::EndTabBar();
+    ImGui::PopStyleColor(3);
+    ImGui::PopFont();
 }
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
index 4545f771d6..a6815f060a 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.h
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
@@ -17,7 +17,7 @@ typedef struct {
     N64ButtonMask defaultBtn;
 } CustomButtonMap;
 
-class SohInputEditorWindow : public Ship::GuiWindow {
+class SohInputEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     ~SohInputEditorWindow();
@@ -41,7 +41,8 @@ class SohInputEditorWindow : public Ship::GuiWindow {
     void DrawButtonLineEditMappingButton(uint8_t port, N64ButtonMask bitmask, std::string id);
     void DrawButtonLineAddMappingButton(uint8_t port, N64ButtonMask bitmask);
 
-    void DrawStickDirectionLineEditMappingButton(uint8_t port, uint8_t stick, Ship::Direction direction, std::string id);
+    void DrawStickDirectionLineEditMappingButton(uint8_t port, uint8_t stick, Ship::Direction direction,
+                                                 std::string id);
     void DrawStickDirectionLineAddMappingButton(uint8_t port, uint8_t stick, Ship::Direction direction);
     void DrawStickSection(uint8_t port, uint8_t stick, int32_t id, ImVec4 color);
 
@@ -84,7 +85,7 @@ class SohInputEditorWindow : public Ship::GuiWindow {
     void UpdateStickDirectionToMappingIds(uint8_t port);
 
     void GetButtonColorsForDeviceType(Ship::PhysicalDeviceType lusIndex, ImVec4& buttonColor,
-                                          ImVec4& buttonHoveredColor);
+                                      ImVec4& buttonHoveredColor);
     void DrawLinkTab();
     void DrawIvanTab();
     void DrawDebugPortTab(uint8_t portIndex, std::string customName = "");
diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
index 16fb2bed43..8074fa7074 100644
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
@@ -11,6 +11,7 @@
 #include <libultraship/libultraship.h>
 
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
@@ -50,7 +51,8 @@ extern "C" {
 
 extern PlayState* gPlayState;
 void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
-void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex, int sourceIndex);
+void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex,
+                                           int sourceIndex);
 void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 }
@@ -67,31 +69,32 @@ u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 static const ALIGN_ASSET(2) char gEndGrayscaleAndEndDlistDL[] = dgEndGrayscaleAndEndDlistDL;
 
 std::map<CosmeticGroup, const char*> groupLabels = {
-    { COSMETICS_GROUP_LINK,         "Link" },
+    { COSMETICS_GROUP_LINK, "Link" },
     { COSMETICS_GROUP_MIRRORSHIELD, "Mirror Shield" },
-    { COSMETICS_GROUP_SWORDS,       "Swords" },
-    { COSMETICS_GROUP_GLOVES,       "Gloves" },
-    { COSMETICS_GROUP_EQUIPMENT,    "Equipment" },
-    { COSMETICS_GROUP_KEYRING,      "Keyring" },
-    { COSMETICS_GROUP_SMALL_KEYS,   "Small Keys" },
-    { COSMETICS_GROUP_BOSS_KEYS,    "Boss Keys" },
-    { COSMETICS_GROUP_CONSUMABLE,   "Consumables" },
-    { COSMETICS_GROUP_HUD,          "HUD" },
-    { COSMETICS_GROUP_KALEIDO,      "Pause Menu" },
-    { COSMETICS_GROUP_TITLE,        "Title Screen" },
-    { COSMETICS_GROUP_NPC,          "NPCs" },
-    { COSMETICS_GROUP_WORLD,        "World" },
-    { COSMETICS_GROUP_MAGIC,        "Magic Effects" },
-    { COSMETICS_GROUP_ARROWS,       "Arrow Effects" },
-    { COSMETICS_GROUP_SPIN_ATTACK,  "Spin Attack" },
-    { COSMETICS_GROUP_TRAILS,       "Trails" },
-    { COSMETICS_GROUP_NAVI,         "Navi" },
-    { COSMETICS_GROUP_IVAN,         "Ivan" },
-    { COSMETICS_GROUP_MESSAGE,      "Message" },
+    { COSMETICS_GROUP_SWORDS, "Swords" },
+    { COSMETICS_GROUP_GLOVES, "Gloves" },
+    { COSMETICS_GROUP_EQUIPMENT, "Equipment" },
+    { COSMETICS_GROUP_KEYRING, "Keyring" },
+    { COSMETICS_GROUP_SMALL_KEYS, "Small Keys" },
+    { COSMETICS_GROUP_BOSS_KEYS, "Boss Keys" },
+    { COSMETICS_GROUP_CONSUMABLE, "Consumables" },
+    { COSMETICS_GROUP_HUD, "HUD" },
+    { COSMETICS_GROUP_KALEIDO, "Pause Menu" },
+    { COSMETICS_GROUP_TITLE, "Title Screen" },
+    { COSMETICS_GROUP_NPC, "NPCs" },
+    { COSMETICS_GROUP_WORLD, "World" },
+    { COSMETICS_GROUP_MAGIC, "Magic Effects" },
+    { COSMETICS_GROUP_ARROWS, "Arrow Effects" },
+    { COSMETICS_GROUP_SPIN_ATTACK, "Spin Attack" },
+    { COSMETICS_GROUP_TRAILS, "Trails" },
+    { COSMETICS_GROUP_NAVI, "Navi" },
+    { COSMETICS_GROUP_IVAN, "Ivan" },
+    { COSMETICS_GROUP_MESSAGE, "Message" },
 };
 
 typedef struct {
     const char* cvar;
+    const char* valuesCvar;
     const char* rainbowCvar;
     const char* lockedCvar;
     const char* changedCvar;
@@ -109,13 +112,18 @@ Color_RGBA8 ColorRGBA8(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
     return color;
 }
 
-#define COSMETIC_OPTION(id, label, group, defaultColor, supportsAlpha, supportsRainbow, advancedOption)                                    \
-    { id, {                                                                                                                                \
-        CVAR_COSMETIC(id ".Value"), CVAR_COSMETIC(id ".Rainbow"), CVAR_COSMETIC(id ".Locked"), CVAR_COSMETIC(id ".Changed"), label, group, \
-        ImVec4(defaultColor.r / 255.0f, defaultColor.g / 255.0f, defaultColor.b / 255.0f, defaultColor.a / 255.0f), defaultColor,          \
-        supportsAlpha, supportsRainbow, advancedOption                                                                                     \
-    } }
+#define COSMETIC_OPTION(id, label, group, defaultColor, supportsAlpha, supportsRainbow, advancedOption)               \
+    {                                                                                                                 \
+        id, {                                                                                                         \
+            CVAR_COSMETIC(id), CVAR_COSMETIC(id ".Value"), CVAR_COSMETIC(id ".Rainbow"), CVAR_COSMETIC(id ".Locked"), \
+                CVAR_COSMETIC(id ".Changed"), label, group,                                                           \
+                ImVec4(defaultColor.r / 255.0f, defaultColor.g / 255.0f, defaultColor.b / 255.0f,                     \
+                       defaultColor.a / 255.0f),                                                                      \
+                defaultColor, supportsAlpha, supportsRainbow, advancedOption                                          \
+        }                                                                                                             \
+    }
 
+// clang-format off
 /*
     So, you would like to add a new cosmetic option? BUCKLE UP
 
@@ -280,13 +288,13 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
     COSMETIC_OPTION("Key.GanonsBossGem",            "Ganons Boss Key Gem",      COSMETICS_GROUP_BOSS_KEYS,    ColorRGBA8(255, 0,   0,   255), false, true, false),
 
     COSMETIC_OPTION("Key.WellSmallBody",            "Well Small Key",           COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, false),
-    COSMETIC_OPTION("Key.WellSmallEmblem",          "Well Small Key Emblem",    COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(227, 110, 255, 255), false, true, true),
+    COSMETIC_OPTION("Key.WellSmallEmblem",          "Well Small Key Emblem",    COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(227, 110, 255, 255), false, true, false),
     COSMETIC_OPTION("Key.FortSmallBody",            "Fortress Small Key",       COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, false),
-    COSMETIC_OPTION("Key.FortSmallEmblem",          "Fortress Small Key Emblem",COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, true),
+    COSMETIC_OPTION("Key.FortSmallEmblem",          "Fortress Small Key Emblem",COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, false),
     COSMETIC_OPTION("Key.GTGSmallBody",             "GTG Small Key",            COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, false),
-    COSMETIC_OPTION("Key.GTGSmallEmblem",           "GTG Small Key Emblem",     COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(221, 212, 60,  255), false, true, true),
+    COSMETIC_OPTION("Key.GTGSmallEmblem",           "GTG Small Key Emblem",     COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(221, 212, 60,  255), false, true, false),
     //COSMETIC_OPTION("Key.ChestGameSmallBody",     "Chest Game Key",           COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 255, 255), false, true, false),
-    //COSMETIC_OPTION("Key.ChestGameEmblem",        "Chest Game Key Emblem",    COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 0,   0,   255), false, true, true),
+    //COSMETIC_OPTION("Key.ChestGameEmblem",        "Chest Game Key Emblem",    COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 0,   0,   255), false, true, false),
     COSMETIC_OPTION("Key.Skeleton",                 "Skeleton Key",             COSMETICS_GROUP_SMALL_KEYS,   ColorRGBA8(255, 255, 170, 255), false, true, false),
 
     COSMETIC_OPTION("HUD.AButton",                  "A Button",                 COSMETICS_GROUP_HUD,          ColorRGBA8( 90,  90, 255, 255), false, true, false),
@@ -313,7 +321,7 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
     #define MESSAGE_COSMETIC_OPTION(id, label, r, g, b) COSMETIC_OPTION("Message." id, label, COSMETICS_GROUP_MESSAGE,  ColorRGBA8(r, g, b, 255), false, true, true)
 
     MESSAGE_COSMETIC_OPTION("Default.Normal",                   "Message Default Color",                     255, 255, 255),
-    MESSAGE_COSMETIC_OPTION("Default.NoneNoShadow",             "Message Default (None No Shadow) Color",      0,   0,   0),
+    MESSAGE_COSMETIC_OPTION("Default.NoneNoShadow",             "Message Default (None No Shadow)",            0,   0,   0),
     MESSAGE_COSMETIC_OPTION("Red.Normal",                       "Message Red Color",                         255,  60,  60),
     MESSAGE_COSMETIC_OPTION("Red.Wooden",                       "Message Red (Wooden) Color",                255, 120,   0),
     MESSAGE_COSMETIC_OPTION("Adjustable.Normal",                "Message Adjustable Color",                   70, 255,  80),
@@ -322,7 +330,7 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
     MESSAGE_COSMETIC_OPTION("Blue.Wooden",                      "Message Blue (Wooden) Color",                80, 110, 255),
     MESSAGE_COSMETIC_OPTION("LightBlue.Normal",                 "Message Light Blue Color",                  100, 180, 255),
     MESSAGE_COSMETIC_OPTION("LightBlue.Wooden",                 "Message Light Blue (Wooden) Color",          90, 180, 255),
-    MESSAGE_COSMETIC_OPTION("LightBlue.LightBlue.NoneNoShadow", "Message Light Blue (None No Shadow) Color",  80, 150, 180),
+    MESSAGE_COSMETIC_OPTION("LightBlue.LightBlue.NoneNoShadow", "Message Light Blue (None No Shadow)",        80, 150, 180),
     MESSAGE_COSMETIC_OPTION("Purple.Normal",                    "Message Purple Color",                      255, 150, 180),
     MESSAGE_COSMETIC_OPTION("Purple.Wooden",                    "Message Purple (Wooden) Color",             210, 100, 255),
     MESSAGE_COSMETIC_OPTION("Yellow.Normal",                    "Message Yellow Color",                      255, 255,  50),
@@ -436,74 +444,53 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
     COSMETIC_OPTION("NPC.MetalTrap",                "Metal Trap",               COSMETICS_GROUP_NPC,          ColorRGBA8(255, 255, 255, 255), false, true, true),
     COSMETIC_OPTION("NPC.IronKnuckles",             "Iron Knuckles",            COSMETICS_GROUP_NPC,          ColorRGBA8(245, 255, 205, 255), false, true, false),
 };
+// clang-format on
 
-static const char* MarginCvarList[] {
-    CVAR_COSMETIC("HUD.Hearts"),
-    CVAR_COSMETIC("HUD.HeartsCount"),
-    CVAR_COSMETIC("HUD.MagicBar"),
-    CVAR_COSMETIC("HUD.VisualSoA"),
-    CVAR_COSMETIC("HUD.BButton"),
-    CVAR_COSMETIC("HUD.AButton"),
-    CVAR_COSMETIC("HUD.StartButton"), 
-    CVAR_COSMETIC("HUD.CUpButton"),
-    CVAR_COSMETIC("HUD.CDownButton"),
-    CVAR_COSMETIC("HUD.CLeftButton"),
-    CVAR_COSMETIC("HUD.CRightButton"),
-    CVAR_COSMETIC("HUD.Dpad"),
-    CVAR_COSMETIC("HUD.Minimap"), 
-    CVAR_COSMETIC("HUD.SmallKey"),
-    CVAR_COSMETIC("HUD.Rupees"),
-    CVAR_COSMETIC("HUD.Carrots"),
-    CVAR_COSMETIC("HUD.Timers"),
-    CVAR_COSMETIC("HUD.ArcheryScore"),
-    CVAR_COSMETIC("HUD.TitleCard.Map"),
-    CVAR_COSMETIC("HUD.TitleCard.Boss"),
-    CVAR_COSMETIC("HUD.IGT")
+static const char* MarginCvarList[]{
+    CVAR_COSMETIC("HUD.Hearts"),        CVAR_COSMETIC("HUD.HeartsCount"),    CVAR_COSMETIC("HUD.MagicBar"),
+    CVAR_COSMETIC("HUD.VisualSoA"),     CVAR_COSMETIC("HUD.BButton"),        CVAR_COSMETIC("HUD.AButton"),
+    CVAR_COSMETIC("HUD.StartButton"),   CVAR_COSMETIC("HUD.CUpButton"),      CVAR_COSMETIC("HUD.CDownButton"),
+    CVAR_COSMETIC("HUD.CLeftButton"),   CVAR_COSMETIC("HUD.CRightButton"),   CVAR_COSMETIC("HUD.Dpad"),
+    CVAR_COSMETIC("HUD.Minimap"),       CVAR_COSMETIC("HUD.SmallKey"),       CVAR_COSMETIC("HUD.Rupees"),
+    CVAR_COSMETIC("HUD.Carrots"),       CVAR_COSMETIC("HUD.Timers"),         CVAR_COSMETIC("HUD.ArcheryScore"),
+    CVAR_COSMETIC("HUD.TitleCard.Map"), CVAR_COSMETIC("HUD.TitleCard.Boss"), CVAR_COSMETIC("HUD.IGT"),
 };
 
-static const char* MarginCvarNonAnchor[] {
-    CVAR_COSMETIC("HUD.Carrots"),
-    CVAR_COSMETIC("HUD.Timers"),
-    CVAR_COSMETIC("HUD.ArcheryScore"),
-    CVAR_COSMETIC("HUD.TitleCard.Map"),
-    CVAR_COSMETIC("HUD.TitleCard.Boss")
+static const char* MarginCvarNonAnchor[]{
+    CVAR_COSMETIC("HUD.Carrots"),       CVAR_COSMETIC("HUD.Timers"),         CVAR_COSMETIC("HUD.ArcheryScore"),
+    CVAR_COSMETIC("HUD.TitleCard.Map"), CVAR_COSMETIC("HUD.TitleCard.Boss"),
 };
 
-ImVec4 GetRandomValue() {
-#if !defined(__SWITCH__) && !defined(__WIIU__)
-    std::random_device rd;
-    std::mt19937 rng(rd());
-#else
-    size_t seed = std::hash<std::string>{}(std::to_string(rand()));
-    std::mt19937_64 rng(seed);
-#endif
-    std::uniform_int_distribution<int> dist(0, 255 - 1);
-
-    ImVec4 NewColor;
-    NewColor.x = (float)(dist(rng)) / 255.0f;
-    NewColor.y = (float)(dist(rng)) / 255.0f;
-    NewColor.z = (float)(dist(rng)) / 255.0f;
-    return NewColor;
-}
-
-void SetMarginAll(const char* ButtonName, bool SetActivated) {
-    if (ImGui::Button(ButtonName)) {
-        //MarginCvarNonAnchor is an array that list every element that has No anchor by default, because if that the case this function will not touch it with pose type 0.
+void SetMarginAll(const char* ButtonName, bool SetActivated, const char* tooltip) {
+    if (UIWidgets::Button(ButtonName,
+                          UIWidgets::ButtonOptions().Size(ImVec2(200.0f, 0.0f)).Color(THEME_COLOR).Tooltip(tooltip))) {
+        // MarginCvarNonAnchor is an array that list every element that has No anchor by default, because if that the
+        // case this function will not touch it with pose type 0.
         u8 arrayLengthNonMargin = sizeof(MarginCvarNonAnchor) / sizeof(*MarginCvarNonAnchor);
         for (auto cvarName : MarginCvarList) {
             std::string cvarPosType = std::string(cvarName).append(".PosType");
             std::string cvarNameMargins = std::string(cvarName).append(".UseMargins");
-            if (CVarGetInteger(cvarPosType.c_str(),0) <= ANCHOR_RIGHT && SetActivated) { //Our element is not Hidden or Non anchor
+            if (CVarGetInteger(cvarPosType.c_str(), 0) <= ANCHOR_RIGHT &&
+                SetActivated) { // Our element is not Hidden or Non anchor
                 for (int i = 0; i < arrayLengthNonMargin; i++) {
-                    if ((strcmp(cvarName, MarginCvarNonAnchor[i]) == 0) && (CVarGetInteger(cvarPosType.c_str(), 0) == ORIGINAL_LOCATION)) { //Our element is both in original position and do not have anchor by default so we skip it.
-                        CVarSetInteger(cvarNameMargins.c_str(), false); //force set off
-                    } else if ((strcmp(cvarName, MarginCvarNonAnchor[i]) == 0) && (CVarGetInteger(cvarPosType.c_str(), 0) != ORIGINAL_LOCATION)) { //Our element is not in original position regarless it has no anchor by default since player made it anchored we can toggle margins
+                    if ((strcmp(cvarName, MarginCvarNonAnchor[i]) == 0) &&
+                        (CVarGetInteger(cvarPosType.c_str(), 0) ==
+                         ORIGINAL_LOCATION)) { // Our element is both in original position and do not have anchor by
+                                               // default so we skip it.
+                        CVarSetInteger(cvarNameMargins.c_str(), false); // force set off
+                    } else if ((strcmp(cvarName, MarginCvarNonAnchor[i]) == 0) &&
+                               (CVarGetInteger(cvarPosType.c_str(), 0) !=
+                                ORIGINAL_LOCATION)) { // Our element is not in original position regarless it has no
+                                                      // anchor by default since player made it anchored we can toggle
+                                                      // margins
                         CVarSetInteger(cvarNameMargins.c_str(), SetActivated);
-                    } else if (strcmp(cvarName, MarginCvarNonAnchor[i]) != 0) { //Our elements has an anchor by default so regarless of it's position right now that okay to toggle margins.
+                    } else if (strcmp(cvarName, MarginCvarNonAnchor[i]) !=
+                               0) { // Our elements has an anchor by default so regarless of it's position right now
+                                    // that okay to toggle margins.
                         CVarSetInteger(cvarNameMargins.c_str(), SetActivated);
                     }
                 }
-            } else { //Since the user requested to turn all margin off no need to do any check there.
+            } else { // Since the user requested to turn all margin off no need to do any check there.
                 CVarSetInteger(cvarNameMargins.c_str(), SetActivated);
             }
         }
@@ -511,19 +498,24 @@ void SetMarginAll(const char* ButtonName, bool SetActivated) {
 }
 
 void ResetPositionAll() {
-    if (ImGui::Button("Reset all positions")) {
+    if (UIWidgets::Button("Reset all positions",
+                          UIWidgets::ButtonOptions()
+                              .Size(ImVec2(200.0f, 0.0f))
+                              .Color(THEME_COLOR)
+                              .Tooltip("Revert every element to use their original position and no margins"))) {
         for (auto cvarName : MarginCvarList) {
             std::string cvarPosType = std::string(cvarName).append(".PosType");
             std::string cvarNameMargins = std::string(cvarName).append(".UseMargins");
             CVarSetInteger(cvarPosType.c_str(), 0);
-            CVarSetInteger(cvarNameMargins.c_str(), false); //Turn margin off to everythings as that original position.
+            CVarSetInteger(cvarNameMargins.c_str(), false); // Turn margin off to everythings as that original position.
         }
     }
 }
 
 int hue = 0;
 
-// Runs every frame to update rainbow hue, a potential future optimization is to only run this a once or twice a second and increase the speed of the rainbow hue rotation.
+// Runs every frame to update rainbow hue, a potential future optimization is to only run this a once or twice a second
+// and increase the speed of the rainbow hue rotation.
 void CosmeticsUpdateTick() {
     int index = 0;
     float rainbowSpeed = CVarGetFloat(CVAR_COSMETIC("RainbowSpeed"), 0.6f);
@@ -545,7 +537,7 @@ void CosmeticsUpdateTick() {
             cosmeticOption.currentColor.z = newColor.b / 255.0f;
             cosmeticOption.currentColor.w = newColor.a / 255.0f;
 
-            CVarSetColor(cosmeticOption.cvar, newColor);
+            CVarSetColor(cosmeticOption.valuesCvar, newColor);
         }
         // If we don't want the rainbow color on items to be synced, offset the index for each item in the loop.
         // Technically this would work if you replaced "60" with 1 but the hue would be so close it's
@@ -562,501 +554,725 @@ void CosmeticsUpdateTick() {
 }
 
 /*
-    This is called every time a color is changed in the UI, and every frame to update colors that have rainbow mode enabled
-    The columns/arguments for PATCH_GFX are as follows:
-    1. Display List: This should be a valid display list pointer, if you have errors listing one here make sure to include the appropriate header file up top
-    2. Patch Name: Each of these MUST be unique, used for restoring the original DList command, if these are not unique bugs WILL happen
+    This is called every time a color is changed in the UI, and every frame to update colors that have rainbow mode
+   enabled The columns/arguments for PATCH_GFX are as follows:
+    1. Display List: This should be a valid display list pointer, if you have errors listing one here make sure to
+   include the appropriate header file up top
+    2. Patch Name: Each of these MUST be unique, used for restoring the original DList command, if these are not unique
+   bugs WILL happen
     3. Changed Cvar: What determines if a patch should be applied or reset.
-    4. GFX Command Index: Index of the GFX command you want to replace, the instructions on finding this are in the giant comment block above the cosmeticOptions map
+    4. GFX Command Index: Index of the GFX command you want to replace, the instructions on finding this are in the
+   giant comment block above the cosmeticOptions map
     5. GFX Command: The GFX command you want to insert
 */
 void ApplyOrResetCustomGfxPatches(bool manualChange) {
     static CosmeticOption& magicFaroresPrimary = cosmeticOptions.at("Magic.FaroresPrimary");
     if (manualChange || CVarGetInteger(magicFaroresPrimary.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(magicFaroresPrimary.cvar, magicFaroresPrimary.defaultColor);
-        PATCH_GFX(sInnerCylinderDL,                               "Magic_FaroresPrimary1",    magicFaroresPrimary.changedCvar,     24, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(sOuterCylinderDL,                               "Magic_FaroresPrimary2",    magicFaroresPrimary.changedCvar,     24, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(magicFaroresPrimary.valuesCvar, magicFaroresPrimary.defaultColor);
+        PATCH_GFX(sInnerCylinderDL, "Magic_FaroresPrimary1", magicFaroresPrimary.changedCvar, 24,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(sOuterCylinderDL, "Magic_FaroresPrimary2", magicFaroresPrimary.changedCvar, 24,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& magicFaroresSecondary = cosmeticOptions.at("Magic.FaroresSecondary");
     if (manualChange || CVarGetInteger(magicFaroresSecondary.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(magicFaroresSecondary.cvar, magicFaroresSecondary.defaultColor);
-        PATCH_GFX(sInnerCylinderDL,                               "Magic_FaroresSecondary1",  magicFaroresSecondary.changedCvar,   25, gsDPSetEnvColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(sOuterCylinderDL,                               "Magic_FaroresSecondary2",  magicFaroresSecondary.changedCvar,   25, gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(magicFaroresSecondary.valuesCvar, magicFaroresSecondary.defaultColor);
+        PATCH_GFX(sInnerCylinderDL, "Magic_FaroresSecondary1", magicFaroresSecondary.changedCvar, 25,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(sOuterCylinderDL, "Magic_FaroresSecondary2", magicFaroresSecondary.changedCvar, 25,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& linkGoronTunic = cosmeticOptions.at("Link.GoronTunic");
     if (manualChange || CVarGetInteger(linkGoronTunic.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(linkGoronTunic.cvar, linkGoronTunic.defaultColor);
-        PATCH_GFX(gGiGoronTunicColorDL,                           "Link_GoronTunic1",         linkGoronTunic.changedCvar,           3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGoronCollarColorDL,                          "Link_GoronTunic2",         linkGoronTunic.changedCvar,           3, gsDPSetPrimColor(0, 0, color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiGoronTunicColorDL,                           "Link_GoronTunic3",         linkGoronTunic.changedCvar,           4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiGoronCollarColorDL,                          "Link_GoronTunic4",         linkGoronTunic.changedCvar,           4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        Color_RGBA8 color = CVarGetColor(linkGoronTunic.valuesCvar, linkGoronTunic.defaultColor);
+        PATCH_GFX(gGiGoronTunicColorDL, "Link_GoronTunic1", linkGoronTunic.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGoronCollarColorDL, "Link_GoronTunic2", linkGoronTunic.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiGoronTunicColorDL, "Link_GoronTunic3", linkGoronTunic.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiGoronCollarColorDL, "Link_GoronTunic4", linkGoronTunic.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
     }
 
     static CosmeticOption& linkZoraTunic = cosmeticOptions.at("Link.ZoraTunic");
     if (manualChange || CVarGetInteger(linkZoraTunic.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(linkZoraTunic.cvar, linkZoraTunic.defaultColor);
-        PATCH_GFX(gGiZoraTunicColorDL,                            "Link_ZoraTunic1",          linkZoraTunic.changedCvar,            3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiZoraCollarColorDL,                           "Link_ZoraTunic2",          linkZoraTunic.changedCvar,            3, gsDPSetPrimColor(0, 0, color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiZoraTunicColorDL,                            "Link_ZoraTunic3",          linkZoraTunic.changedCvar,            4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiZoraCollarColorDL,                           "Link_ZoraTunic4",          linkZoraTunic.changedCvar,            4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        Color_RGBA8 color = CVarGetColor(linkZoraTunic.valuesCvar, linkZoraTunic.defaultColor);
+        PATCH_GFX(gGiZoraTunicColorDL, "Link_ZoraTunic1", linkZoraTunic.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiZoraCollarColorDL, "Link_ZoraTunic2", linkZoraTunic.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiZoraTunicColorDL, "Link_ZoraTunic3", linkZoraTunic.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiZoraCollarColorDL, "Link_ZoraTunic4", linkZoraTunic.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
     }
 
     static CosmeticOption& linkHair = cosmeticOptions.at("Link.Hair");
     if (manualChange || CVarGetInteger(linkHair.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(linkHair.cvar, linkHair.defaultColor);
-        PATCH_GFX(gLinkChildHeadNearDL,                           "Link_Hair1",               linkHair.changedCvar,                10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildHeadFarDL,                            "Link_Hair2",               linkHair.changedCvar,                10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultHeadNearDL,                           "Link_Hair3",               linkHair.changedCvar,                10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultHeadFarDL,                            "Link_Hair4",               linkHair.changedCvar,                10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(linkHair.valuesCvar, linkHair.defaultColor);
+        PATCH_GFX(gLinkChildHeadNearDL, "Link_Hair1", linkHair.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildHeadFarDL, "Link_Hair2", linkHair.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultHeadNearDL, "Link_Hair3", linkHair.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultHeadFarDL, "Link_Hair4", linkHair.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildHeadNearDL,                       "Link_Hair5",               linkHair.changedCvar,                46, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildHeadNearDL,                       "Link_Hair6",               linkHair.changedCvar,                54, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildHeadNearDL,                       "Link_Hair7",               linkHair.changedCvar,               136, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildHeadNearDL,                       "Link_Hair8",               linkHair.changedCvar,               162, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildHeadFarDL,                        "Link_Hair9",               linkHair.changedCvar,               101, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildHeadFarDL,                        "Link_Hair10",              linkHair.changedCvar,               118, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHeadNearDL,                       "Link_Hair11",              linkHair.changedCvar,               125, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultHeadNearDL,                       "Link_Hair12",              linkHair.changedCvar,               159, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHeadFarDL,                        "Link_Hair13",              linkHair.changedCvar,               102, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultHeadFarDL,                        "Link_Hair14",              linkHair.changedCvar,               122, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHeadNearDL, "Link_Hair5", linkHair.changedCvar, 46, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildHeadNearDL, "Link_Hair6", linkHair.changedCvar, 54, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHeadNearDL, "Link_Hair7", linkHair.changedCvar, 136, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildHeadNearDL, "Link_Hair8", linkHair.changedCvar, 162, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHeadFarDL, "Link_Hair9", linkHair.changedCvar, 101, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildHeadFarDL, "Link_Hair10", linkHair.changedCvar, 118, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHeadNearDL, "Link_Hair11", linkHair.changedCvar, 125, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultHeadNearDL, "Link_Hair12", linkHair.changedCvar, 159, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHeadFarDL, "Link_Hair13", linkHair.changedCvar, 102, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultHeadFarDL, "Link_Hair14", linkHair.changedCvar, 122, gsSPGrayscale(false));
         }
     }
 
     static CosmeticOption& linkLinen = cosmeticOptions.at("Link.Linen");
     if (manualChange || CVarGetInteger(linkLinen.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(linkLinen.cvar, linkLinen.defaultColor);
-        PATCH_GFX(gLinkAdultLeftArmNearDL,                        "Link_Linen1",              linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftArmNearDL,                        "Link_Linen2",              linkLinen.changedCvar,               83, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftArmOutNearDL,                     "Link_Linen3",              linkLinen.changedCvar,               25, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftArmFarDL,                         "Link_Linen4",              linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftArmFarDL,                         "Link_Linen5",              linkLinen.changedCvar,               70, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightArmFarDL,                        "Link_Linen6",              linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightArmFarDL,                        "Link_Linen7",              linkLinen.changedCvar,               70, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightArmNearDL,                       "Link_Linen8",              linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftShoulderFarDL,                    "Link_Linen9",              linkLinen.changedCvar,               55, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftShoulderNearDL,                   "Link_Linen10",             linkLinen.changedCvar,               57, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightShoulderNearDL,                  "Link_Linen11",             linkLinen.changedCvar,               57, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightShoulderFarDL,                   "Link_Linen12",             linkLinen.changedCvar,               55, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultTorsoNearDL,                          "Link_Linen13",             linkLinen.changedCvar,               66, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultTorsoFarDL,                           "Link_Linen14",             linkLinen.changedCvar,               57, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightThighNearDL,                     "Link_Linen15",             linkLinen.changedCvar,               53, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftThighNearDL,                      "Link_Linen16",             linkLinen.changedCvar,               53, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightThighFarDL,                      "Link_Linen17",             linkLinen.changedCvar,               54, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftThighFarDL,                       "Link_Linen18",             linkLinen.changedCvar,               54, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightLegNearDL,                       "Link_Linen19",             linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftLegNearDL,                        "Link_Linen20",             linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightLegFarDL,                        "Link_Linen21",             linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftLegFarDL,                         "Link_Linen22",             linkLinen.changedCvar,               30, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(linkLinen.valuesCvar, linkLinen.defaultColor);
+        PATCH_GFX(gLinkAdultLeftArmNearDL, "Link_Linen1", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftArmNearDL, "Link_Linen2", linkLinen.changedCvar, 83,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftArmOutNearDL, "Link_Linen3", linkLinen.changedCvar, 25,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftArmFarDL, "Link_Linen4", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftArmFarDL, "Link_Linen5", linkLinen.changedCvar, 70,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightArmFarDL, "Link_Linen6", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightArmFarDL, "Link_Linen7", linkLinen.changedCvar, 70,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightArmNearDL, "Link_Linen8", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftShoulderFarDL, "Link_Linen9", linkLinen.changedCvar, 55,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftShoulderNearDL, "Link_Linen10", linkLinen.changedCvar, 57,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightShoulderNearDL, "Link_Linen11", linkLinen.changedCvar, 57,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightShoulderFarDL, "Link_Linen12", linkLinen.changedCvar, 55,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultTorsoNearDL, "Link_Linen13", linkLinen.changedCvar, 66,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultTorsoFarDL, "Link_Linen14", linkLinen.changedCvar, 57,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightThighNearDL, "Link_Linen15", linkLinen.changedCvar, 53,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftThighNearDL, "Link_Linen16", linkLinen.changedCvar, 53,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightThighFarDL, "Link_Linen17", linkLinen.changedCvar, 54,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftThighFarDL, "Link_Linen18", linkLinen.changedCvar, 54,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightLegNearDL, "Link_Linen19", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftLegNearDL, "Link_Linen20", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightLegFarDL, "Link_Linen21", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftLegFarDL, "Link_Linen22", linkLinen.changedCvar, 30,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkAdultLeftArmFarDL,                     "Link_Linen23",             linkLinen.changedCvar,               35, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultLeftArmOutNearDL,                 "Link_Linen24",             linkLinen.changedCvar,               45, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultLeftArmNearDL,                    "Link_Linen25",             linkLinen.changedCvar,               40, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultLeftArmFarDL,                     "Link_Linen26",             linkLinen.changedCvar,               77, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultRightArmFarDL,                    "Link_Linen27",             linkLinen.changedCvar,               35, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultRightArmFarDL,                    "Link_Linen28",             linkLinen.changedCvar,               77, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultRightArmNearDL,                   "Link_Linen29",             linkLinen.changedCvar,               42, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultRightLegNearDL,                   "Link_Linen30",             linkLinen.changedCvar,               43, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultLeftLegNearDL,                    "Link_Linen31",             linkLinen.changedCvar,               43, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultRightLegFarDL,                    "Link_Linen32",             linkLinen.changedCvar,               38, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
-            PATCH_GFX(gLinkAdultLeftLegFarDL,                     "Link_Linen33",             linkLinen.changedCvar,               38, gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftArmFarDL, "Link_Linen23", linkLinen.changedCvar, 35,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftArmOutNearDL, "Link_Linen24", linkLinen.changedCvar, 45,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftArmNearDL, "Link_Linen25", linkLinen.changedCvar, 40,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftArmFarDL, "Link_Linen26", linkLinen.changedCvar, 77,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultRightArmFarDL, "Link_Linen27", linkLinen.changedCvar, 35,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultRightArmFarDL, "Link_Linen28", linkLinen.changedCvar, 77,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultRightArmNearDL, "Link_Linen29", linkLinen.changedCvar, 42,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultRightLegNearDL, "Link_Linen30", linkLinen.changedCvar, 43,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftLegNearDL, "Link_Linen31", linkLinen.changedCvar, 43,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultRightLegFarDL, "Link_Linen32", linkLinen.changedCvar, 38,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
+            PATCH_GFX(gLinkAdultLeftLegFarDL, "Link_Linen33", linkLinen.changedCvar, 38,
+                      gsDPSetPrimColor(0, 0, 255, 255, 255, 255));
         }
     }
 
     static CosmeticOption& linkBoots = cosmeticOptions.at("Link.Boots");
     if (manualChange || CVarGetInteger(linkBoots.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(linkBoots.cvar, linkBoots.defaultColor);
-        PATCH_GFX(gLinkChildRightShinNearDL,                      "Link_Boots1",              linkBoots.changedCvar,               10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildRightShinFarDL,                       "Link_Boots2",              linkBoots.changedCvar,               10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightLegNearDL,                       "Link_Boots3",              linkBoots.changedCvar,               10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightLegFarDL,                        "Link_Boots4",              linkBoots.changedCvar,               10, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(linkBoots.valuesCvar, linkBoots.defaultColor);
+        PATCH_GFX(gLinkChildRightShinNearDL, "Link_Boots1", linkBoots.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildRightShinFarDL, "Link_Boots2", linkBoots.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightLegNearDL, "Link_Boots3", linkBoots.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightLegFarDL, "Link_Boots4", linkBoots.changedCvar, 10,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildRightShinNearDL,                  "Link_Boots5",              linkBoots.changedCvar,               53, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightShinNearDL,                  "Link_Boots6",              linkBoots.changedCvar,               69, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildRightShinFarDL,                   "Link_Boots7",              linkBoots.changedCvar,               52, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightShinFarDL,                   "Link_Boots8",              linkBoots.changedCvar,               61, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildLeftShinNearDL,                   "Link_Boots9",              linkBoots.changedCvar,               53, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftShinNearDL,                   "Link_Boots10",             linkBoots.changedCvar,               69, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildLeftShinFarDL,                    "Link_Boots11",             linkBoots.changedCvar,               52, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftShinFarDL,                    "Link_Boots12",             linkBoots.changedCvar,               61, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildRightFootNearDL,                  "Link_Boots13",             linkBoots.changedCvar,               30, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightFootFarDL,                   "Link_Boots14",             linkBoots.changedCvar,               30, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftFootNearDL,                   "Link_Boots15",             linkBoots.changedCvar,               30, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftFootFarDL,                    "Link_Boots16",             linkBoots.changedCvar,               30, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftThighNearDL,                  "Link_Boots17",             linkBoots.changedCvar,               10, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildLeftThighFarDL,                   "Link_Boots18",             linkBoots.changedCvar,               10, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildHeadNearDL,                       "Link_Boots19",             linkBoots.changedCvar,               20, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildHeadFarDL,                        "Link_Boots20",             linkBoots.changedCvar,               20, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultRightLegNearDL,                   "Link_Boots21",             linkBoots.changedCvar,               57, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultRightLegFarDL,                    "Link_Boots22",             linkBoots.changedCvar,               52, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftLegNearDL,                    "Link_Boots23",             linkBoots.changedCvar,               57, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftLegFarDL,                     "Link_Boots24",             linkBoots.changedCvar,               52, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftThighNearDL,                  "Link_Boots25",             linkBoots.changedCvar,               10, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultLeftThighFarDL,                   "Link_Boots26",             linkBoots.changedCvar,               10, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHeadNearDL,                       "Link_Boots27",             linkBoots.changedCvar,               20, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHeadFarDL,                        "Link_Boots28",             linkBoots.changedCvar,               20, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightShinNearDL, "Link_Boots5", linkBoots.changedCvar, 53, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightShinNearDL, "Link_Boots6", linkBoots.changedCvar, 69, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightShinFarDL, "Link_Boots7", linkBoots.changedCvar, 52, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightShinFarDL, "Link_Boots8", linkBoots.changedCvar, 61, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildLeftShinNearDL, "Link_Boots9", linkBoots.changedCvar, 53, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftShinNearDL, "Link_Boots10", linkBoots.changedCvar, 69, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildLeftShinFarDL, "Link_Boots11", linkBoots.changedCvar, 52, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftShinFarDL, "Link_Boots12", linkBoots.changedCvar, 61, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightFootNearDL, "Link_Boots13", linkBoots.changedCvar, 30, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightFootFarDL, "Link_Boots14", linkBoots.changedCvar, 30, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftFootNearDL, "Link_Boots15", linkBoots.changedCvar, 30, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftFootFarDL, "Link_Boots16", linkBoots.changedCvar, 30, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftThighNearDL, "Link_Boots17", linkBoots.changedCvar, 10, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildLeftThighFarDL, "Link_Boots18", linkBoots.changedCvar, 10, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHeadNearDL, "Link_Boots19", linkBoots.changedCvar, 20, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHeadFarDL, "Link_Boots20", linkBoots.changedCvar, 20, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultRightLegNearDL, "Link_Boots21", linkBoots.changedCvar, 57, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultRightLegFarDL, "Link_Boots22", linkBoots.changedCvar, 52, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultLeftLegNearDL, "Link_Boots23", linkBoots.changedCvar, 57, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultLeftLegFarDL, "Link_Boots24", linkBoots.changedCvar, 52, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultLeftThighNearDL, "Link_Boots25", linkBoots.changedCvar, 10, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultLeftThighFarDL, "Link_Boots26", linkBoots.changedCvar, 10, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHeadNearDL, "Link_Boots27", linkBoots.changedCvar, 20, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHeadFarDL, "Link_Boots28", linkBoots.changedCvar, 20, gsSPGrayscale(false));
         }
     }
 
     static CosmeticOption& mirrorShieldBody = cosmeticOptions.at("MirrorShield.Body");
     if (manualChange || CVarGetInteger(mirrorShieldBody.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(mirrorShieldBody.cvar, mirrorShieldBody.defaultColor);
-        PATCH_GFX(gGiMirrorShieldDL,                              "MirrorShield_Body1",       mirrorShieldBody.changedCvar,         5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiMirrorShieldDL,                              "MirrorShield_Body2",       mirrorShieldBody.changedCvar,         6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL,     "MirrorShield_Body3",       mirrorShieldBody.changedCvar,        28, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,      "MirrorShield_Body4",       mirrorShieldBody.changedCvar,        17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL,          "MirrorShield_Body5",       mirrorShieldBody.changedCvar,        28, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL,           "MirrorShield_Body6",       mirrorShieldBody.changedCvar,        17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL,   "MirrorShield_Body7",       mirrorShieldBody.changedCvar,        28, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL,    "MirrorShield_Body8",       mirrorShieldBody.changedCvar,        95, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(mirrorShieldBody.valuesCvar, mirrorShieldBody.defaultColor);
+        PATCH_GFX(gGiMirrorShieldDL, "MirrorShield_Body1", mirrorShieldBody.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiMirrorShieldDL, "MirrorShield_Body2", mirrorShieldBody.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "MirrorShield_Body3", mirrorShieldBody.changedCvar, 28,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL, "MirrorShield_Body4", mirrorShieldBody.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL, "MirrorShield_Body5", mirrorShieldBody.changedCvar, 28,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL, "MirrorShield_Body6", mirrorShieldBody.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL, "MirrorShield_Body7", mirrorShieldBody.changedCvar, 28,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL, "MirrorShield_Body8", mirrorShieldBody.changedCvar, 95,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& mirrorShieldMirror = cosmeticOptions.at("MirrorShield.Mirror");
     if (manualChange || CVarGetInteger(mirrorShieldMirror.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(mirrorShieldMirror.cvar, mirrorShieldMirror.defaultColor);
-        PATCH_GFX(gGiMirrorShieldDL,                              "MirrorShield_Mirror1",     mirrorShieldMirror.changedCvar,      47, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiMirrorShieldDL,                              "MirrorShield_Mirror2",     mirrorShieldMirror.changedCvar,      48, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL,     "MirrorShield_Mirror3",     mirrorShieldMirror.changedCvar,      17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,      "MirrorShield_Mirror4",     mirrorShieldMirror.changedCvar,      33, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL,          "MirrorShield_Mirror5",     mirrorShieldMirror.changedCvar,      17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL,           "MirrorShield_Mirror6",     mirrorShieldMirror.changedCvar,      33, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL,   "MirrorShield_Mirror7",     mirrorShieldMirror.changedCvar,      17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL,    "MirrorShield_Mirror8",     mirrorShieldMirror.changedCvar,     111, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(mirrorShieldMirror.valuesCvar, mirrorShieldMirror.defaultColor);
+        PATCH_GFX(gGiMirrorShieldDL, "MirrorShield_Mirror1", mirrorShieldMirror.changedCvar, 47,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiMirrorShieldDL, "MirrorShield_Mirror2", mirrorShieldMirror.changedCvar, 48,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "MirrorShield_Mirror3", mirrorShieldMirror.changedCvar,
+                  17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL, "MirrorShield_Mirror4", mirrorShieldMirror.changedCvar, 33,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL, "MirrorShield_Mirror5", mirrorShieldMirror.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL, "MirrorShield_Mirror6", mirrorShieldMirror.changedCvar, 33,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL, "MirrorShield_Mirror7", mirrorShieldMirror.changedCvar,
+                  17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL, "MirrorShield_Mirror8", mirrorShieldMirror.changedCvar,
+                  111, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& mirrorShieldEmblem = cosmeticOptions.at("MirrorShield.Emblem");
     if (manualChange || CVarGetInteger(mirrorShieldEmblem.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(mirrorShieldEmblem.cvar, mirrorShieldEmblem.defaultColor);
-        PATCH_GFX(gGiMirrorShieldSymbolDL,                        "MirrorShield_Emblem1",     mirrorShieldEmblem.changedCvar,       5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 140));
-        PATCH_GFX(gGiMirrorShieldSymbolDL,                        "MirrorShield_Emblem2",     mirrorShieldEmblem.changedCvar,       6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL,     "MirrorShield_Emblem3",     mirrorShieldEmblem.changedCvar,     165, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,      "MirrorShield_Emblem4",     mirrorShieldEmblem.changedCvar,     135, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL,          "MirrorShield_Emblem5",     mirrorShieldEmblem.changedCvar,     129, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL,           "MirrorShield_Emblem6",     mirrorShieldEmblem.changedCvar,     103, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL,   "MirrorShield_Emblem7",     mirrorShieldEmblem.changedCvar,     162, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL,    "MirrorShield_Emblem8",     mirrorShieldEmblem.changedCvar,     133, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(mirrorShieldEmblem.valuesCvar, mirrorShieldEmblem.defaultColor);
+        PATCH_GFX(gGiMirrorShieldSymbolDL, "MirrorShield_Emblem1", mirrorShieldEmblem.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 140));
+        PATCH_GFX(gGiMirrorShieldSymbolDL, "MirrorShield_Emblem2", mirrorShieldEmblem.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "MirrorShield_Emblem3", mirrorShieldEmblem.changedCvar,
+                  165, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL, "MirrorShield_Emblem4", mirrorShieldEmblem.changedCvar,
+                  135, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathNearDL, "MirrorShield_Emblem5", mirrorShieldEmblem.changedCvar, 129,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldAndSheathFarDL, "MirrorShield_Emblem6", mirrorShieldEmblem.changedCvar, 103,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldNearDL, "MirrorShield_Emblem7", mirrorShieldEmblem.changedCvar,
+                  162, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingMirrorShieldFarDL, "MirrorShield_Emblem8", mirrorShieldEmblem.changedCvar,
+                  133, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& swordsKokiriBlade = cosmeticOptions.at("Swords.KokiriBlade");
     if (manualChange || CVarGetInteger(swordsKokiriBlade.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsKokiriBlade.cvar, swordsKokiriBlade.defaultColor);
-        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,         "Swords_KokiriBlade1",      swordsKokiriBlade.changedCvar,       79, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,          "Swords_KokiriBlade2",      swordsKokiriBlade.changedCvar,       75, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriBlade3",      swordsKokiriBlade.changedCvar,        5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriBlade4",      swordsKokiriBlade.changedCvar,        6, gsDPSetEnvColor(color.r / 4, color.g / 4, color.b / 4, 255));
+        Color_RGBA8 color = CVarGetColor(swordsKokiriBlade.valuesCvar, swordsKokiriBlade.defaultColor);
+        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL, "Swords_KokiriBlade1", swordsKokiriBlade.changedCvar, 79,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL, "Swords_KokiriBlade2", swordsKokiriBlade.changedCvar, 75,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiKokiriSwordDL, "Swords_KokiriBlade3", swordsKokiriBlade.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiKokiriSwordDL, "Swords_KokiriBlade4", swordsKokiriBlade.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 4, color.g / 4, color.b / 4, 255));
     }
     /*
     static CosmeticOption& swordsKokiriHilt = cosmeticOptions.at("Swords.KokiriHilt");
     if (manualChange || CVarGetInteger(swordsKokiriHilt.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsKokiriHilt.cvar, swordsKokiriHilt.defaultColor);
-        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,         "Swords_KokiriHilt1",       swordsKokiriHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,          "Swords_KokiriHilt2",       swordsKokiriHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildSwordAndSheathNearDL,                 "Swords_KokiriHilt3",       swordsKokiriHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildSwordAndSheathFarDL,                  "Swords_KokiriHilt4",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,       "Swords_KokiriHilt5",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,        "Swords_KokiriHilt6",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL,     "Swords_KokiriHilt7",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,      "Swords_KokiriHilt8",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt9",       swordsKokiriHilt.changedCvar,        64,  gsDPSetPrimColor(0, 0, MAX(color.r - 50, 0), MAX(color.g - 50, 0), MAX(color.b - 50, 0), 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt10",      swordsKokiriHilt.changedCvar,        66,  gsDPSetEnvColor(MAX(color.r - 50, 0) / 3, MAX(color.g - 50, 0) / 3, MAX(color.b - 50, 0) / 3, 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt11",      swordsKokiriHilt.changedCvar,       162,  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt12",      swordsKokiriHilt.changedCvar,       164,  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        Color_RGBA8 color = CVarGetColor(swordsKokiriHilt.valuesCvar, swordsKokiriHilt.defaultColor);
+        PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,         "Swords_KokiriHilt1", swordsKokiriHilt.changedCvar, 4,
+    gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,
+    "Swords_KokiriHilt2",       swordsKokiriHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(gLinkChildSwordAndSheathNearDL,                 "Swords_KokiriHilt3",
+    swordsKokiriHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildSwordAndSheathFarDL,                  "Swords_KokiriHilt4", swordsKokiriHilt.changedCvar, 4,
+    gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,
+    "Swords_KokiriHilt5",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,        "Swords_KokiriHilt6",
+    swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL,     "Swords_KokiriHilt7", swordsKokiriHilt.changedCvar, 4,
+    gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,
+    "Swords_KokiriHilt8",       swordsKokiriHilt.changedCvar,         4,  gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt9",
+    swordsKokiriHilt.changedCvar,        64,  gsDPSetPrimColor(0, 0, MAX(color.r - 50, 0), MAX(color.g - 50, 0),
+    MAX(color.b - 50, 0), 255)); PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt10",
+    swordsKokiriHilt.changedCvar,        66,  gsDPSetEnvColor(MAX(color.r - 50, 0) / 3, MAX(color.g - 50, 0) / 3,
+    MAX(color.b - 50, 0) / 3, 255)); PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt11",
+    swordsKokiriHilt.changedCvar,       162,  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiKokiriSwordDL,                               "Swords_KokiriHilt12", swordsKokiriHilt.changedCvar,
+    164,  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,     "Swords_KokiriHilt13",      swordsKokiriHilt.changedCvar,       108, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,     "Swords_KokiriHilt14",      swordsKokiriHilt.changedCvar,       134, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,      "Swords_KokiriHilt15",      swordsKokiriHilt.changedCvar,       106, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,      "Swords_KokiriHilt16",      swordsKokiriHilt.changedCvar,       126, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildSwordAndSheathNearDL,             "Swords_KokiriHilt17",      swordsKokiriHilt.changedCvar,       100, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildSwordAndSheathNearDL,             "Swords_KokiriHilt18",      swordsKokiriHilt.changedCvar,       126, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildSwordAndSheathNearDL,             "Swords_KokiriHilt19",      swordsKokiriHilt.changedCvar,       128, gsSPEndDisplayList());
-            PATCH_GFX(gLinkChildSwordAndSheathFarDL,              "Swords_KokiriHilt20",      swordsKokiriHilt.changedCvar,        98, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildSwordAndSheathFarDL,              "Swords_KokiriHilt21",      swordsKokiriHilt.changedCvar,       118, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildSwordAndSheathFarDL,              "Swords_KokiriHilt22",      swordsKokiriHilt.changedCvar,       120, gsSPEndDisplayList());
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,   "Swords_KokiriHilt23",      swordsKokiriHilt.changedCvar,       166, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,   "Swords_KokiriHilt24",      swordsKokiriHilt.changedCvar,       192, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,   "Swords_KokiriHilt25",      swordsKokiriHilt.changedCvar,       194, gsSPEndDisplayList());
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,    "Swords_KokiriHilt26",      swordsKokiriHilt.changedCvar,       156, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,    "Swords_KokiriHilt27",      swordsKokiriHilt.changedCvar,       176, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,    "Swords_KokiriHilt28",      swordsKokiriHilt.changedCvar,       178, gsSPEndDisplayList());
-            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL, "Swords_KokiriHilt29",      swordsKokiriHilt.changedCvar,       162, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL, "Swords_KokiriHilt30",      swordsKokiriHilt.changedCvar,       188, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL, "Swords_KokiriHilt31",      swordsKokiriHilt.changedCvar,       190, gsSPEndDisplayList());
-            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,  "Swords_KokiriHilt32",      swordsKokiriHilt.changedCvar,        98, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,  "Swords_KokiriHilt33",      swordsKokiriHilt.changedCvar,       118, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,     "Swords_KokiriHilt13", swordsKokiriHilt.changedCvar,
+    108, gsSPGrayscale(true)); PATCH_GFX(gLinkChildLeftFistAndKokiriSwordNearDL,     "Swords_KokiriHilt14",
+    swordsKokiriHilt.changedCvar,       134, gsSPGrayscale(false)); PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,
+    "Swords_KokiriHilt15",      swordsKokiriHilt.changedCvar,       106, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildLeftFistAndKokiriSwordFarDL,      "Swords_KokiriHilt16", swordsKokiriHilt.changedCvar,
+    126, gsSPGrayscale(false)); PATCH_GFX(gLinkChildSwordAndSheathNearDL,             "Swords_KokiriHilt17",
+    swordsKokiriHilt.changedCvar,       100, gsSPGrayscale(true)); PATCH_GFX(gLinkChildSwordAndSheathNearDL,
+    "Swords_KokiriHilt18",      swordsKokiriHilt.changedCvar,       126, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildSwordAndSheathNearDL,             "Swords_KokiriHilt19", swordsKokiriHilt.changedCvar,
+    128, gsSPEndDisplayList()); PATCH_GFX(gLinkChildSwordAndSheathFarDL,              "Swords_KokiriHilt20",
+    swordsKokiriHilt.changedCvar,        98, gsSPGrayscale(true)); PATCH_GFX(gLinkChildSwordAndSheathFarDL,
+    "Swords_KokiriHilt21",      swordsKokiriHilt.changedCvar,       118, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildSwordAndSheathFarDL,              "Swords_KokiriHilt22", swordsKokiriHilt.changedCvar,
+    120, gsSPEndDisplayList()); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,   "Swords_KokiriHilt23",
+    swordsKokiriHilt.changedCvar,       166, gsSPGrayscale(true)); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,
+    "Swords_KokiriHilt24",      swordsKokiriHilt.changedCvar,       192, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathNearDL,   "Swords_KokiriHilt25", swordsKokiriHilt.changedCvar,
+    194, gsSPEndDisplayList()); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,    "Swords_KokiriHilt26",
+    swordsKokiriHilt.changedCvar,       156, gsSPGrayscale(true)); PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,
+    "Swords_KokiriHilt27",      swordsKokiriHilt.changedCvar,       176, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildDekuShieldSwordAndSheathFarDL,    "Swords_KokiriHilt28", swordsKokiriHilt.changedCvar,
+    178, gsSPEndDisplayList()); PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL, "Swords_KokiriHilt29",
+    swordsKokiriHilt.changedCvar,       162, gsSPGrayscale(true)); PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL,
+    "Swords_KokiriHilt30",      swordsKokiriHilt.changedCvar,       188, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildHylianShieldSwordAndSheathNearDL, "Swords_KokiriHilt31", swordsKokiriHilt.changedCvar,
+    190, gsSPEndDisplayList()); PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,  "Swords_KokiriHilt32",
+    swordsKokiriHilt.changedCvar,        98, gsSPGrayscale(true)); PATCH_GFX(gLinkChildHylianShieldSwordAndSheathFarDL,
+    "Swords_KokiriHilt33",      swordsKokiriHilt.changedCvar,       118, gsSPGrayscale(false));
         }
     }
     */
     static CosmeticOption& swordsMasterBlade = cosmeticOptions.at("Swords.MasterBlade");
     if (manualChange || CVarGetInteger(swordsMasterBlade.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsMasterBlade.cvar, swordsMasterBlade.defaultColor);
-        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,      "Swords_MasterBlade1",      swordsMasterBlade.changedCvar,       60, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL,     "Swords_MasterBlade2",      swordsMasterBlade.changedCvar,       17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(object_toki_objects_DL_001BD0,                  "Swords_MasterBlade3",      swordsMasterBlade.changedCvar,       13, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(object_toki_objects_DL_001BD0,                  "Swords_MasterBlade4",      swordsMasterBlade.changedCvar,       14, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGanonMasterSwordDL,                            "Swords_MasterBlade5",      swordsMasterBlade.changedCvar,       13, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGanonMasterSwordDL,                            "Swords_MasterBlade6",      swordsMasterBlade.changedCvar,       14, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        Color_RGBA8 color = CVarGetColor(swordsMasterBlade.valuesCvar, swordsMasterBlade.defaultColor);
+        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL, "Swords_MasterBlade1", swordsMasterBlade.changedCvar, 60,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL, "Swords_MasterBlade2", swordsMasterBlade.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterBlade3", swordsMasterBlade.changedCvar, 13,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(object_toki_objects_DL_001BD0, "Swords_MasterBlade4", swordsMasterBlade.changedCvar, 14,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterBlade5", swordsMasterBlade.changedCvar, 13,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGanonMasterSwordDL, "Swords_MasterBlade6", swordsMasterBlade.changedCvar, 14,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
     }
     /*
     static CosmeticOption& swordsMasterHilt = cosmeticOptions.at("Swords.MasterHilt");
     if (manualChange || CVarGetInteger(swordsMasterHilt.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsMasterHilt.cvar, swordsMasterHilt.defaultColor);
-        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL,     "Swords_MasterHilt1",       swordsMasterHilt.changedCvar,        20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,      "Swords_MasterHilt2",       swordsMasterHilt.changedCvar,        20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(object_toki_objects_DL_001BD0,                  "Swords_MasterHilt3",       swordsMasterHilt.changedCvar,        16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,           "Swords_MasterHilt4",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,            "Swords_MasterHilt5",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL,     "Swords_MasterHilt6",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,      "Swords_MasterHilt7",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL,     "Swords_MasterHilt8",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,      "Swords_MasterHilt9",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGanonMasterSwordDL,                            "Swords_MasterHilt10",      swordsMasterHilt.changedCvar,        16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(swordsMasterHilt.valuesCvar, swordsMasterHilt.defaultColor);
+        PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL,     "Swords_MasterHilt1", swordsMasterHilt.changedCvar,
+    20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,
+    "Swords_MasterHilt2",       swordsMasterHilt.changedCvar,        20, gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(object_toki_objects_DL_001BD0,                  "Swords_MasterHilt3",
+    swordsMasterHilt.changedCvar,        16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,           "Swords_MasterHilt4", swordsMasterHilt.changedCvar, 4,
+    gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,
+    "Swords_MasterHilt5",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL,     "Swords_MasterHilt6",
+    swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,      "Swords_MasterHilt7", swordsMasterHilt.changedCvar, 4,
+    gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL,
+    "Swords_MasterHilt8",       swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g,
+    color.b, 255)); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,      "Swords_MasterHilt9",
+    swordsMasterHilt.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGanonMasterSwordDL,                            "Swords_MasterHilt10", swordsMasterHilt.changedCvar,
+    16, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt11",      swordsMasterHilt.changedCvar,        38, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt12",      swordsMasterHilt.changedCvar,        64, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt13",      swordsMasterHilt.changedCvar,       106, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt14",      swordsMasterHilt.changedCvar,       120, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,       "Swords_MasterHilt15",      swordsMasterHilt.changedCvar,       104, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,       "Swords_MasterHilt16",      swordsMasterHilt.changedCvar,       182, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,       "Swords_MasterHilt17",      swordsMasterHilt.changedCvar,       184, gsSPEndDisplayList());
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt18",      swordsMasterHilt.changedCvar,        80, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt19",      swordsMasterHilt.changedCvar,        94, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt20",      swordsMasterHilt.changedCvar,       162, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt21",      swordsMasterHilt.changedCvar,       180, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL, "Swords_MasterHilt22",      swordsMasterHilt.changedCvar,       154, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL, "Swords_MasterHilt23",      swordsMasterHilt.changedCvar,       232, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt24",      swordsMasterHilt.changedCvar,       112, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt25",      swordsMasterHilt.changedCvar,       130, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt26",      swordsMasterHilt.changedCvar,       172, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt27",      swordsMasterHilt.changedCvar,       186, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "Swords_MasterHilt28",      swordsMasterHilt.changedCvar,       220, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "Swords_MasterHilt29",      swordsMasterHilt.changedCvar,       298, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,  "Swords_MasterHilt30",      swordsMasterHilt.changedCvar,        38, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,  "Swords_MasterHilt31",      swordsMasterHilt.changedCvar,       112, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL, "Swords_MasterHilt32",      swordsMasterHilt.changedCvar,        86, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL, "Swords_MasterHilt33",      swordsMasterHilt.changedCvar,       208, gsSPGrayscale(false));
-            PATCH_GFX(object_toki_objects_DL_001BD0,              "Swords_MasterHilt34",      swordsMasterHilt.changedCvar,       112, gsSPGrayscale(true));
-            PATCH_GFX(object_toki_objects_DL_001BD0,              "Swords_MasterHilt35",      swordsMasterHilt.changedCvar,       278, gsSPGrayscale(false));
-            PATCH_GFX(object_toki_objects_DL_001BD0,              "Swords_MasterHilt36",      swordsMasterHilt.changedCvar,       280, gsSPEndDisplayList());
-            PATCH_GFX(gGanonMasterSwordDL,                        "Swords_MasterHilt37",      swordsMasterHilt.changedCvar,       112, gsSPGrayscale(true));
-            PATCH_GFX(gGanonMasterSwordDL,                        "Swords_MasterHilt38",      swordsMasterHilt.changedCvar,       278, gsSPGrayscale(false));
-            PATCH_GFX(gGanonMasterSwordDL,                        "Swords_MasterHilt39",      swordsMasterHilt.changedCvar,       280, gsSPEndDisplayList());
+            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt11", swordsMasterHilt.changedCvar,
+    38, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt12",
+    swordsMasterHilt.changedCvar,        64, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,
+    "Swords_MasterHilt13",      swordsMasterHilt.changedCvar,       106, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultMasterSwordAndSheathFarDL,        "Swords_MasterHilt14", swordsMasterHilt.changedCvar,
+    120, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,       "Swords_MasterHilt15",
+    swordsMasterHilt.changedCvar,       104, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,
+    "Swords_MasterHilt16",      swordsMasterHilt.changedCvar,       182, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultMasterSwordAndSheathNearDL,       "Swords_MasterHilt17", swordsMasterHilt.changedCvar,
+    184, gsSPEndDisplayList()); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt18",
+    swordsMasterHilt.changedCvar,        80, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,
+    "Swords_MasterHilt19",      swordsMasterHilt.changedCvar,        94, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt20", swordsMasterHilt.changedCvar,
+    162, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathFarDL,  "Swords_MasterHilt21",
+    swordsMasterHilt.changedCvar,       180, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL, "Swords_MasterHilt22", swordsMasterHilt.changedCvar,
+    154, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultHylianShieldSwordAndSheathNearDL, "Swords_MasterHilt23",
+    swordsMasterHilt.changedCvar,       232, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,
+    "Swords_MasterHilt24",      swordsMasterHilt.changedCvar,       112, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt25", swordsMasterHilt.changedCvar,
+    130, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,  "Swords_MasterHilt26",
+    swordsMasterHilt.changedCvar,       172, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathFarDL,
+    "Swords_MasterHilt27",      swordsMasterHilt.changedCvar,       186, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "Swords_MasterHilt28", swordsMasterHilt.changedCvar,
+    220, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultMirrorShieldSwordAndSheathNearDL, "Swords_MasterHilt29",
+    swordsMasterHilt.changedCvar,       298, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,
+    "Swords_MasterHilt30",      swordsMasterHilt.changedCvar,        38, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordFarDL,  "Swords_MasterHilt31", swordsMasterHilt.changedCvar,
+    112, gsSPGrayscale(false)); PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL, "Swords_MasterHilt32",
+    swordsMasterHilt.changedCvar,        86, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultLeftHandHoldingMasterSwordNearDL,
+    "Swords_MasterHilt33",      swordsMasterHilt.changedCvar,       208, gsSPGrayscale(false));
+            PATCH_GFX(object_toki_objects_DL_001BD0,              "Swords_MasterHilt34", swordsMasterHilt.changedCvar,
+    112, gsSPGrayscale(true)); PATCH_GFX(object_toki_objects_DL_001BD0,              "Swords_MasterHilt35",
+    swordsMasterHilt.changedCvar,       278, gsSPGrayscale(false)); PATCH_GFX(object_toki_objects_DL_001BD0,
+    "Swords_MasterHilt36",      swordsMasterHilt.changedCvar,       280, gsSPEndDisplayList());
+            PATCH_GFX(gGanonMasterSwordDL,                        "Swords_MasterHilt37", swordsMasterHilt.changedCvar,
+    112, gsSPGrayscale(true)); PATCH_GFX(gGanonMasterSwordDL,                        "Swords_MasterHilt38",
+    swordsMasterHilt.changedCvar,       278, gsSPGrayscale(false)); PATCH_GFX(gGanonMasterSwordDL,
+    "Swords_MasterHilt39",      swordsMasterHilt.changedCvar,       280, gsSPEndDisplayList());
         }
     }
     */
     static CosmeticOption& swordsBiggoronBlade = cosmeticOptions.at("Swords.BiggoronBlade");
     if (manualChange || CVarGetInteger(swordsBiggoronBlade.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsBiggoronBlade.cvar, swordsBiggoronBlade.defaultColor);
-        PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,              "Swords_BiggoronBlade1",    swordsBiggoronBlade.changedCvar,    108, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,             "Swords_BiggoronBlade2",    swordsBiggoronBlade.changedCvar,     63, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronBlade3",    swordsBiggoronBlade.changedCvar,      5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronBlade4",    swordsBiggoronBlade.changedCvar,      6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        Color_RGBA8 color = CVarGetColor(swordsBiggoronBlade.valuesCvar, swordsBiggoronBlade.defaultColor);
+        PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL, "Swords_BiggoronBlade1", swordsBiggoronBlade.changedCvar, 108,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL, "Swords_BiggoronBlade2", swordsBiggoronBlade.changedCvar, 63,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBiggoronSwordDL, "Swords_BiggoronBlade3", swordsBiggoronBlade.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBiggoronSwordDL, "Swords_BiggoronBlade4", swordsBiggoronBlade.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
     }
     /*
     static CosmeticOption& swordsBiggoronHilt = cosmeticOptions.at("Swords.BiggoronHilt");
     if (manualChange || CVarGetInteger(swordsBiggoronHilt.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(swordsBiggoronHilt.cvar, swordsBiggoronHilt.defaultColor);
-        PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,             "Swords_BiggoronHilt1",     swordsBiggoronHilt.changedCvar,      20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,              "Swords_BiggoronHilt2",     swordsBiggoronHilt.changedCvar,      20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt3",     swordsBiggoronHilt.changedCvar,      74, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt4",     swordsBiggoronHilt.changedCvar,      76, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt5",     swordsBiggoronHilt.changedCvar,     154, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt6",     swordsBiggoronHilt.changedCvar,     156, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        Color_RGBA8 color = CVarGetColor(swordsBiggoronHilt.valuesCvar, swordsBiggoronHilt.defaultColor);
+        PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,             "Swords_BiggoronHilt1",
+    swordsBiggoronHilt.changedCvar,      20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,              "Swords_BiggoronHilt2",
+    swordsBiggoronHilt.changedCvar,      20, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt3",
+    swordsBiggoronHilt.changedCvar,      74, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt4",
+    swordsBiggoronHilt.changedCvar,      76, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt5",
+    swordsBiggoronHilt.changedCvar,     154, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBiggoronSwordDL,                             "Swords_BiggoronHilt6",
+    swordsBiggoronHilt.changedCvar,     156, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,          "Swords_BiggoronHilt7",     swordsBiggoronHilt.changedCvar,     278, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,          "Swords_BiggoronHilt8",     swordsBiggoronHilt.changedCvar,     332, gsSPGrayscale(false));
-            PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,          "Swords_BiggoronHilt9",     swordsBiggoronHilt.changedCvar,     334, gsSPEndDisplayList());
-            PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,         "Swords_BiggoronHilt10",    swordsBiggoronHilt.changedCvar,      38, gsSPGrayscale(true));
-            PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,         "Swords_BiggoronHilt11",    swordsBiggoronHilt.changedCvar,     118, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,          "Swords_BiggoronHilt7",
+    swordsBiggoronHilt.changedCvar,     278, gsSPGrayscale(true)); PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,
+    "Swords_BiggoronHilt8",     swordsBiggoronHilt.changedCvar,     332, gsSPGrayscale(false));
+            PATCH_GFX(gLinkAdultLeftHandHoldingBgsFarDL,          "Swords_BiggoronHilt9",
+    swordsBiggoronHilt.changedCvar,     334, gsSPEndDisplayList()); PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,
+    "Swords_BiggoronHilt10",    swordsBiggoronHilt.changedCvar,      38, gsSPGrayscale(true));
+            PATCH_GFX(gLinkAdultLeftHandHoldingBgsNearDL,         "Swords_BiggoronHilt11",
+    swordsBiggoronHilt.changedCvar,     118, gsSPGrayscale(false));
         }
     }
     */
     static CosmeticOption& glovesGoronBracelet = cosmeticOptions.at("Gloves.GoronBracelet");
     if (manualChange || CVarGetInteger(glovesGoronBracelet.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(glovesGoronBracelet.cvar, glovesGoronBracelet.defaultColor);
-        PATCH_GFX(gGiGoronBraceletDL,                             "Gloves_GoronBracelet1",    glovesGoronBracelet.changedCvar,      5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGoronBraceletDL,                             "Gloves_GoronBracelet2",    glovesGoronBracelet.changedCvar,      6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkChildGoronBraceletDL,                      "Gloves_GoronBracelet3",    glovesGoronBracelet.changedCvar,      3, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(glovesGoronBracelet.valuesCvar, glovesGoronBracelet.defaultColor);
+        PATCH_GFX(gGiGoronBraceletDL, "Gloves_GoronBracelet1", glovesGoronBracelet.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGoronBraceletDL, "Gloves_GoronBracelet2", glovesGoronBracelet.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkChildGoronBraceletDL, "Gloves_GoronBracelet3", glovesGoronBracelet.changedCvar, 3,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildGoronBraceletDL,                  "Gloves_GoronBracelet4",    glovesGoronBracelet.changedCvar,     11, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildGoronBraceletDL,                  "Gloves_GoronBracelet5",    glovesGoronBracelet.changedCvar,     39, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildGoronBraceletDL, "Gloves_GoronBracelet4", glovesGoronBracelet.changedCvar, 11,
+                      gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildGoronBraceletDL, "Gloves_GoronBracelet5", glovesGoronBracelet.changedCvar, 39,
+                      gsSPGrayscale(false));
         }
     }
     static CosmeticOption& glovesSilverGauntlets = cosmeticOptions.at("Gloves.SilverGauntlets");
     if (manualChange || CVarGetInteger(glovesSilverGauntlets.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(glovesSilverGauntlets.cvar, glovesSilverGauntlets.defaultColor);
-        PATCH_GFX(gGiSilverGauntletsColorDL,                      "Gloves_SilverGauntlets1",  glovesSilverGauntlets.changedCvar,    3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSilverGauntletsColorDL,                      "Gloves_SilverGauntlets2",  glovesSilverGauntlets.changedCvar,    4, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        Color_RGBA8 color = CVarGetColor(glovesSilverGauntlets.valuesCvar, glovesSilverGauntlets.defaultColor);
+        PATCH_GFX(gGiSilverGauntletsColorDL, "Gloves_SilverGauntlets1", glovesSilverGauntlets.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiSilverGauntletsColorDL, "Gloves_SilverGauntlets2", glovesSilverGauntlets.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
     }
     static CosmeticOption& glovesGoldenGauntlets = cosmeticOptions.at("Gloves.GoldenGauntlets");
     if (manualChange || CVarGetInteger(glovesGoldenGauntlets.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(glovesGoldenGauntlets.cvar, glovesGoldenGauntlets.defaultColor);
-        PATCH_GFX(gGiGoldenGauntletsColorDL,                      "Gloves_GoldenGauntlets1",  glovesGoldenGauntlets.changedCvar,    3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGoldenGauntletsColorDL,                      "Gloves_GoldenGauntlets2",  glovesGoldenGauntlets.changedCvar,    4, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        Color_RGBA8 color = CVarGetColor(glovesGoldenGauntlets.valuesCvar, glovesGoldenGauntlets.defaultColor);
+        PATCH_GFX(gGiGoldenGauntletsColorDL, "Gloves_GoldenGauntlets1", glovesGoldenGauntlets.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGoldenGauntletsColorDL, "Gloves_GoldenGauntlets2", glovesGoldenGauntlets.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
     }
     static CosmeticOption& glovesGauntletsGem = cosmeticOptions.at("Gloves.GauntletsGem");
     if (manualChange || CVarGetInteger(glovesGauntletsGem.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(glovesGauntletsGem.cvar, glovesGauntletsGem.defaultColor);
-        PATCH_GFX(gGiGauntletsDL,                                 "Gloves_GauntletsGem1",     glovesGauntletsGem.changedCvar,      84, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGauntletsDL,                                 "Gloves_GauntletsGem2",     glovesGauntletsGem.changedCvar,      85, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultLeftGauntletPlate2DL,                 "Gloves_GauntletsGem3",     glovesGauntletsGem.changedCvar,      42, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightGauntletPlate2DL,                "Gloves_GauntletsGem4",     glovesGauntletsGem.changedCvar,      42, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftGauntletPlate3DL,                 "Gloves_GauntletsGem5",     glovesGauntletsGem.changedCvar,      42, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightGauntletPlate3DL,                "Gloves_GauntletsGem6",     glovesGauntletsGem.changedCvar,      42, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(glovesGauntletsGem.valuesCvar, glovesGauntletsGem.defaultColor);
+        PATCH_GFX(gGiGauntletsDL, "Gloves_GauntletsGem1", glovesGauntletsGem.changedCvar, 84,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGauntletsDL, "Gloves_GauntletsGem2", glovesGauntletsGem.changedCvar, 85,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultLeftGauntletPlate2DL, "Gloves_GauntletsGem3", glovesGauntletsGem.changedCvar, 42,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightGauntletPlate2DL, "Gloves_GauntletsGem4", glovesGauntletsGem.changedCvar, 42,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftGauntletPlate3DL, "Gloves_GauntletsGem5", glovesGauntletsGem.changedCvar, 42,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightGauntletPlate3DL, "Gloves_GauntletsGem6", glovesGauntletsGem.changedCvar, 42,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentBoomerangBody = cosmeticOptions.at("Equipment.BoomerangBody");
     if (manualChange || CVarGetInteger(equipmentBoomerangBody.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBoomerangBody.cvar, equipmentBoomerangBody.defaultColor);
-        PATCH_GFX(gGiBoomerangDL,                                 "Equipment_BoomerangBody1", equipmentBoomerangBody.changedCvar,   5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBoomerangDL,                                 "Equipment_BoomerangBody2", equipmentBoomerangBody.changedCvar,   6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkChildLeftFistAndBoomerangNearDL,           "Equipment_BoomerangBody3", equipmentBoomerangBody.changedCvar,  34, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildLeftFistAndBoomerangFarDL,            "Equipment_BoomerangBody4", equipmentBoomerangBody.changedCvar,   9, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gBoomerangDL,                                   "Equipment_BoomerangBody5", equipmentBoomerangBody.changedCvar,  39, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBoomerangBody.valuesCvar, equipmentBoomerangBody.defaultColor);
+        PATCH_GFX(gGiBoomerangDL, "Equipment_BoomerangBody1", equipmentBoomerangBody.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBoomerangDL, "Equipment_BoomerangBody2", equipmentBoomerangBody.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkChildLeftFistAndBoomerangNearDL, "Equipment_BoomerangBody3", equipmentBoomerangBody.changedCvar,
+                  34, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildLeftFistAndBoomerangFarDL, "Equipment_BoomerangBody4", equipmentBoomerangBody.changedCvar,
+                  9, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gBoomerangDL, "Equipment_BoomerangBody5", equipmentBoomerangBody.changedCvar, 39,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& equipmentBoomerangGem = cosmeticOptions.at("Equipment.BoomerangGem");
     if (manualChange || CVarGetInteger(equipmentBoomerangGem.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBoomerangGem.cvar, equipmentBoomerangGem.defaultColor);
-        PATCH_GFX(gGiBoomerangDL,                                 "Equipment_BoomerangGem1",  equipmentBoomerangGem.changedCvar,   84, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBoomerangDL,                                 "Equipment_BoomerangGem2",  equipmentBoomerangGem.changedCvar,   85, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkChildLeftFistAndBoomerangNearDL,           "Equipment_BoomerangGem3",  equipmentBoomerangGem.changedCvar,   16, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gBoomerangDL,                                   "Equipment_BoomerangGem4",  equipmentBoomerangGem.changedCvar,   23, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBoomerangGem.valuesCvar, equipmentBoomerangGem.defaultColor);
+        PATCH_GFX(gGiBoomerangDL, "Equipment_BoomerangGem1", equipmentBoomerangGem.changedCvar, 84,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBoomerangDL, "Equipment_BoomerangGem2", equipmentBoomerangGem.changedCvar, 85,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkChildLeftFistAndBoomerangNearDL, "Equipment_BoomerangGem3", equipmentBoomerangGem.changedCvar,
+                  16, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gBoomerangDL, "Equipment_BoomerangGem4", equipmentBoomerangGem.changedCvar, 23,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
         // There appears to be no gem rendered on the far LOD variant, not sure if this is an SOH bug or what.
-        // PATCH_GFX(gLinkChildLeftFistAndBoomerangFarDL,  "Equipment_BoomerangGem5",  equipmentBoomerangGem.changedCvar,  32, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        // PATCH_GFX(gLinkChildLeftFistAndBoomerangFarDL,  "Equipment_BoomerangGem5", equipmentBoomerangGem.changedCvar,
+        // 32, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     /*
     static CosmeticOption& equipmentSlingshotBody = cosmeticOptions.at("Equipment.SlingshotBody");
     if (manualChange || CVarGetInteger(equipmentSlingshotBody.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentSlingshotBody.cvar, equipmentSlingshotBody.defaultColor);
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody1", equipmentSlingshotBody.changedCvar,  10, gsDPSetPrimColor(0, 0, MAX(color.r - 100, 0), MAX(color.g - 100, 0), MAX(color.b - 100, 0), 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody2", equipmentSlingshotBody.changedCvar,  12, gsDPSetEnvColor(MAX(color.r - 100, 0) / 3, MAX(color.g - 100, 0) / 3, MAX(color.b - 100, 0) / 3, 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody3", equipmentSlingshotBody.changedCvar,  74, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody4", equipmentSlingshotBody.changedCvar,  76, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody5", equipmentSlingshotBody.changedCvar, 128, gsDPSetPrimColor(0, 0, MAX(color.r - 100, 0), MAX(color.g - 100, 0), MAX(color.b - 100, 0), 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody6", equipmentSlingshotBody.changedCvar, 130, gsDPSetEnvColor(MAX(color.r - 100, 0) / 3, MAX(color.g - 100, 0) / 3, MAX(color.b - 100, 0) / 3, 255));
-        PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL,         "Equipment_SlingshotBody7", equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,      "Equipment_SlingshotBody8", equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,       "Equipment_SlingshotBody9", equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentSlingshotBody.valuesCvar, equipmentSlingshotBody.defaultColor);
+        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody1",
+    equipmentSlingshotBody.changedCvar,  10, gsDPSetPrimColor(0, 0, MAX(color.r - 100, 0), MAX(color.g - 100, 0),
+    MAX(color.b - 100, 0), 255)); PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody2",
+    equipmentSlingshotBody.changedCvar,  12, gsDPSetEnvColor(MAX(color.r - 100, 0) / 3, MAX(color.g - 100, 0) / 3,
+    MAX(color.b - 100, 0) / 3, 255)); PATCH_GFX(gGiSlingshotDL, "Equipment_SlingshotBody3",
+    equipmentSlingshotBody.changedCvar,  74, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody4",
+    equipmentSlingshotBody.changedCvar,  76, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody5",
+    equipmentSlingshotBody.changedCvar, 128, gsDPSetPrimColor(0, 0, MAX(color.r - 100, 0), MAX(color.g - 100, 0),
+    MAX(color.b - 100, 0), 255)); PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotBody6",
+    equipmentSlingshotBody.changedCvar, 130, gsDPSetEnvColor(MAX(color.r - 100, 0) / 3, MAX(color.g - 100, 0) / 3,
+    MAX(color.b - 100, 0) / 3, 255)); PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL, "Equipment_SlingshotBody7",
+    equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,      "Equipment_SlingshotBody8",
+    equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,       "Equipment_SlingshotBody9",
+    equipmentSlingshotBody.changedCvar,   4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL,     "Equipment_SlingshotBody10",equipmentSlingshotBody.changedCvar,  20, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL,     "Equipment_SlingshotBody11",equipmentSlingshotBody.changedCvar,  74, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,   "Equipment_SlingshotBody12",equipmentSlingshotBody.changedCvar,  20, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,   "Equipment_SlingshotBody13",equipmentSlingshotBody.changedCvar,  66, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,  "Equipment_SlingshotBody14",equipmentSlingshotBody.changedCvar,  96, gsSPGrayscale(true));
-            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,  "Equipment_SlingshotBody15",equipmentSlingshotBody.changedCvar, 136, gsSPGrayscale(false));
-            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,  "Equipment_SlingshotBody16",equipmentSlingshotBody.changedCvar, 138, gsSPEndDisplayList());
+            PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL,
+    "Equipment_SlingshotBody10",equipmentSlingshotBody.changedCvar,  20, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightArmStretchedSlingshotDL,
+    "Equipment_SlingshotBody11",equipmentSlingshotBody.changedCvar,  74, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,
+    "Equipment_SlingshotBody12",equipmentSlingshotBody.changedCvar,  20, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightHandHoldingSlingshotFarDL,
+    "Equipment_SlingshotBody13",equipmentSlingshotBody.changedCvar,  66, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,
+    "Equipment_SlingshotBody14",equipmentSlingshotBody.changedCvar,  96, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,
+    "Equipment_SlingshotBody15",equipmentSlingshotBody.changedCvar, 136, gsSPGrayscale(false));
+            PATCH_GFX(gLinkChildRightHandHoldingSlingshotNearDL,
+    "Equipment_SlingshotBody16",equipmentSlingshotBody.changedCvar, 138, gsSPEndDisplayList());
         }
     }
     */
     static CosmeticOption& equipmentSlingshotString = cosmeticOptions.at("Equipment.SlingshotString");
     if (manualChange || CVarGetInteger(equipmentSlingshotString.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentSlingshotString.cvar, equipmentSlingshotString.defaultColor);
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotString1",equipmentSlingshotString.changedCvar, 75, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSlingshotDL,                                 "Equipment_SlingshotString2",equipmentSlingshotString.changedCvar, 76, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gLinkChildSlingshotStringDL,                    "Equipment_SlingshotString3",equipmentSlingshotString.changedCvar,  9, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentSlingshotString.valuesCvar, equipmentSlingshotString.defaultColor);
+        PATCH_GFX(gGiSlingshotDL, "Equipment_SlingshotString1", equipmentSlingshotString.changedCvar, 75,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiSlingshotDL, "Equipment_SlingshotString2", equipmentSlingshotString.changedCvar, 76,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gLinkChildSlingshotStringDL, "Equipment_SlingshotString3", equipmentSlingshotString.changedCvar, 9,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentBowTips = cosmeticOptions.at("Equipment.BowTips");
     if (manualChange || CVarGetInteger(equipmentBowTips.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBowTips.cvar, equipmentBowTips.defaultColor);
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowTips1",       equipmentBowTips.changedCvar,        86, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowTips2",       equipmentBowTips.changedCvar,        87, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL,     "Equipment_BowTips3",       equipmentBowTips.changedCvar,        34, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL,            "Equipment_BowTips4",       equipmentBowTips.changedCvar,        26, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL,             "Equipment_BowTips5",       equipmentBowTips.changedCvar,        25, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBowTips.valuesCvar, equipmentBowTips.defaultColor);
+        PATCH_GFX(gGiBowDL, "Equipment_BowTips1", equipmentBowTips.changedCvar, 86,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBowDL, "Equipment_BowTips2", equipmentBowTips.changedCvar, 87,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL, "Equipment_BowTips3", equipmentBowTips.changedCvar, 34,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL, "Equipment_BowTips4", equipmentBowTips.changedCvar, 26,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL, "Equipment_BowTips5", equipmentBowTips.changedCvar, 25,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& equipmentBowString = cosmeticOptions.at("Equipment.BowString");
     if (manualChange || CVarGetInteger(equipmentBowString.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBowString.cvar, equipmentBowString.defaultColor);
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowString1",     equipmentBowString.changedCvar,     105, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowString2",     equipmentBowString.changedCvar,     106, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultBowStringDL,                          "Equipment_BowString3",     equipmentBowString.changedCvar,       9, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBowString.valuesCvar, equipmentBowString.defaultColor);
+        PATCH_GFX(gGiBowDL, "Equipment_BowString1", equipmentBowString.changedCvar, 105,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBowDL, "Equipment_BowString2", equipmentBowString.changedCvar, 106,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultBowStringDL, "Equipment_BowString3", equipmentBowString.changedCvar, 9,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& equipmentBowBody = cosmeticOptions.at("Equipment.BowBody");
     if (manualChange || CVarGetInteger(equipmentBowBody.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBowBody.cvar, equipmentBowBody.defaultColor);
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowBody1",       equipmentBowBody.changedCvar,         5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowBody2",       equipmentBowBody.changedCvar,         6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL,     "Equipment_BowBody3",       equipmentBowBody.changedCvar,        42, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL,            "Equipment_BowBody4",       equipmentBowBody.changedCvar,        33, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL,             "Equipment_BowBody5",       equipmentBowBody.changedCvar,        31, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBowBody.valuesCvar, equipmentBowBody.defaultColor);
+        PATCH_GFX(gGiBowDL, "Equipment_BowBody1", equipmentBowBody.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBowDL, "Equipment_BowBody2", equipmentBowBody.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL, "Equipment_BowBody3", equipmentBowBody.changedCvar, 42,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL, "Equipment_BowBody4", equipmentBowBody.changedCvar, 33,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL, "Equipment_BowBody5", equipmentBowBody.changedCvar, 31,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& equipmentBowHandle = cosmeticOptions.at("Equipment.BowHandle");
     if (manualChange || CVarGetInteger(equipmentBowHandle.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBowHandle.cvar, equipmentBowHandle.defaultColor);
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowHandle1",     equipmentBowHandle.changedCvar,      51, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBowDL,                                       "Equipment_BowHandle2",     equipmentBowHandle.changedCvar,      52, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL,     "Equipment_BowHandle3",     equipmentBowHandle.changedCvar,      18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL,            "Equipment_BowHandle4",     equipmentBowHandle.changedCvar,      18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL,             "Equipment_BowHandle5",     equipmentBowHandle.changedCvar,      18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBowHandle.valuesCvar, equipmentBowHandle.defaultColor);
+        PATCH_GFX(gGiBowDL, "Equipment_BowHandle1", equipmentBowHandle.changedCvar, 51,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBowDL, "Equipment_BowHandle2", equipmentBowHandle.changedCvar, 52,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFirstPersonDL, "Equipment_BowHandle3", equipmentBowHandle.changedCvar,
+                  18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowNearDL, "Equipment_BowHandle4", equipmentBowHandle.changedCvar, 18,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultRightHandHoldingBowFarDL, "Equipment_BowHandle5", equipmentBowHandle.changedCvar, 18,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentHammerHead = cosmeticOptions.at("Equipment.HammerHead");
     if (manualChange || CVarGetInteger(equipmentHammerHead.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentHammerHead.cvar, equipmentHammerHead.defaultColor);
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHead1",    equipmentHammerHead.changedCvar,      5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHead2",    equipmentHammerHead.changedCvar,      6, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHead3",    equipmentHammerHead.changedCvar,     68, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHead4",    equipmentHammerHead.changedCvar,     69, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingHammerNearDL,          "Equipment_HammerHead5",    equipmentHammerHead.changedCvar,     38, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingHammerFarDL,           "Equipment_HammerHead6",    equipmentHammerHead.changedCvar,     38, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentHammerHead.valuesCvar, equipmentHammerHead.defaultColor);
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHead1", equipmentHammerHead.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHead2", equipmentHammerHead.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHead3", equipmentHammerHead.changedCvar, 68,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHead4", equipmentHammerHead.changedCvar, 69,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingHammerNearDL, "Equipment_HammerHead5", equipmentHammerHead.changedCvar, 38,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingHammerFarDL, "Equipment_HammerHead6", equipmentHammerHead.changedCvar, 38,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
     static CosmeticOption& equipmentHammerHandle = cosmeticOptions.at("Equipment.HammerHandle");
     if (manualChange || CVarGetInteger(equipmentHammerHandle.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentHammerHandle.cvar, equipmentHammerHandle.defaultColor);
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHandle1",  equipmentHammerHandle.changedCvar,   84, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiHammerDL,                                    "Equipment_HammerHandle2",  equipmentHammerHandle.changedCvar,   85, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingHammerNearDL,          "Equipment_HammerHandle5",  equipmentHammerHandle.changedCvar,   18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gLinkAdultLeftHandHoldingHammerFarDL,           "Equipment_HammerHandle6",  equipmentHammerHandle.changedCvar,   18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentHammerHandle.valuesCvar, equipmentHammerHandle.defaultColor);
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHandle1", equipmentHammerHandle.changedCvar, 84,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiHammerDL, "Equipment_HammerHandle2", equipmentHammerHandle.changedCvar, 85,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingHammerNearDL, "Equipment_HammerHandle5", equipmentHammerHandle.changedCvar,
+                  18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gLinkAdultLeftHandHoldingHammerFarDL, "Equipment_HammerHandle6", equipmentHammerHandle.changedCvar,
+                  18, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentHookshotChain = cosmeticOptions.at("Equipment.HookshotChain");
     if (manualChange || CVarGetInteger(equipmentHookshotChain.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentHookshotChain.cvar, equipmentHookshotChain.defaultColor);
-        PATCH_GFX(gLinkAdultHookshotChainDL,                      "Equipment_HookshotChain1",  equipmentHookshotChain.changedCvar,   17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentHookshotChain.valuesCvar, equipmentHookshotChain.defaultColor);
+        PATCH_GFX(gLinkAdultHookshotChainDL, "Equipment_HookshotChain1", equipmentHookshotChain.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentChuFace = cosmeticOptions.at("Equipment.ChuFace");
     if (manualChange || CVarGetInteger(equipmentChuFace.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentChuFace.cvar, equipmentChuFace.defaultColor);
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuFace1",       equipmentChuFace.changedCvar,         5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuFace2",       equipmentChuFace.changedCvar,         6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gBombchuDL,                                     "Equipment_ChuFace3",       equipmentChuFace.changedCvar,         2, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentChuFace.valuesCvar, equipmentChuFace.defaultColor);
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuFace1", equipmentChuFace.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuFace2", equipmentChuFace.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gBombchuDL, "Equipment_ChuFace3", equipmentChuFace.changedCvar, 2,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-        PATCH_GFX(gBombchuDL,                                     "Equipment_ChuFace4",       equipmentChuFace.changedCvar,        10, gsSPGrayscale(true));
-        PATCH_GFX(gBombchuDL,                                     "Equipment_ChuFace5",       equipmentChuFace.changedCvar,        27, gsSPGrayscale(false));
+            PATCH_GFX(gBombchuDL, "Equipment_ChuFace4", equipmentChuFace.changedCvar, 10, gsSPGrayscale(true));
+            PATCH_GFX(gBombchuDL, "Equipment_ChuFace5", equipmentChuFace.changedCvar, 27, gsSPGrayscale(false));
         }
     }
     static CosmeticOption& equipmentChuBody = cosmeticOptions.at("Equipment.ChuBody");
     if (manualChange || CVarGetInteger(equipmentChuBody.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentChuBody.cvar, equipmentChuBody.defaultColor);
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuBody1",       equipmentChuBody.changedCvar,        39, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuBody2",       equipmentChuBody.changedCvar,        40, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuBody3",       equipmentChuBody.changedCvar,        60, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBombchuDL,                                   "Equipment_ChuBody4",       equipmentChuBody.changedCvar,        61, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gBombchuDL,                                     "Equipment_ChuBody5",       equipmentChuBody.changedCvar,        46, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentChuBody.valuesCvar, equipmentChuBody.defaultColor);
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuBody1", equipmentChuBody.changedCvar, 39,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuBody2", equipmentChuBody.changedCvar, 40,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuBody3", equipmentChuBody.changedCvar, 60,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBombchuDL, "Equipment_ChuBody4", equipmentChuBody.changedCvar, 61,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gBombchuDL, "Equipment_ChuBody5", equipmentChuBody.changedCvar, 46,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& equipmentBunnyHood = cosmeticOptions.at("Equipment.BunnyHood");
     if (manualChange || CVarGetInteger(equipmentBunnyHood.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(equipmentBunnyHood.cvar, equipmentBunnyHood.defaultColor);
-        PATCH_GFX(gGiBunnyHoodDL,                                 "Equipment_BunnyHood1",       equipmentBunnyHood.changedCvar,        5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBunnyHoodDL,                                 "Equipment_BunnyHood2",       equipmentBunnyHood.changedCvar,        6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gGiBunnyHoodDL,                                 "Equipment_BunnyHood3",       equipmentBunnyHood.changedCvar,        83, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBunnyHoodDL,                                 "Equipment_BunnyHood4",       equipmentBunnyHood.changedCvar,        84, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
-        PATCH_GFX(gLinkChildBunnyHoodDL,                          "Equipment_BunnyHood5",       equipmentBunnyHood.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(equipmentBunnyHood.valuesCvar, equipmentBunnyHood.defaultColor);
+        PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood1", equipmentBunnyHood.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood2", equipmentBunnyHood.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood3", equipmentBunnyHood.changedCvar, 83,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood4", equipmentBunnyHood.changedCvar, 84,
+                  gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255));
+        PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood5", equipmentBunnyHood.changedCvar, 4,
+                  gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
 
         if (manualChange) {
-            PATCH_GFX(gLinkChildBunnyHoodDL,                      "Equipment_BunnyHood6",       equipmentBunnyHood.changedCvar,        13, gsSPGrayscale(true));
+            PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood6", equipmentBunnyHood.changedCvar, 13,
+                      gsSPGrayscale(true));
             if (CVarGetInteger(equipmentBunnyHood.changedCvar, 0)) {
-                ResourceMgr_PatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7",                                             125, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
+                ResourceMgr_PatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7", 125,
+                                           gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
             } else {
                 ResourceMgr_UnpatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7");
             }
@@ -1065,17 +1281,24 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) {
 
     static CosmeticOption& consumableGreenRupee = cosmeticOptions.at("Consumable.GreenRupee");
     if (manualChange || CVarGetInteger(consumableGreenRupee.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableGreenRupee.cvar, consumableGreenRupee.defaultColor);
-        PATCH_GFX(gGiGreenRupeeInnerColorDL,                      "Consumable_GreenRupee1",   consumableGreenRupee.changedCvar,     3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGreenRupeeInnerColorDL,                      "Consumable_GreenRupee2",   consumableGreenRupee.changedCvar,     4, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiGreenRupeeOuterColorDL,                      "Consumable_GreenRupee3",   consumableGreenRupee.changedCvar,     3, gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
-        PATCH_GFX(gGiGreenRupeeOuterColorDL,                      "Consumable_GreenRupee4",   consumableGreenRupee.changedCvar,     4, gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
+        Color_RGBA8 color = CVarGetColor(consumableGreenRupee.valuesCvar, consumableGreenRupee.defaultColor);
+        PATCH_GFX(gGiGreenRupeeInnerColorDL, "Consumable_GreenRupee1", consumableGreenRupee.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGreenRupeeInnerColorDL, "Consumable_GreenRupee2", consumableGreenRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(
+            gGiGreenRupeeOuterColorDL, "Consumable_GreenRupee3", consumableGreenRupee.changedCvar, 3,
+            gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
+        PATCH_GFX(gGiGreenRupeeOuterColorDL, "Consumable_GreenRupee4", consumableGreenRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
 
         // Greg Bridge
         if (Randomizer_GetSettingValue(RSK_RAINBOW_BRIDGE) == RO_BRIDGE_GREG) {
             ResourceMgr_PatchGfxByName(gRainbowBridgeDL, "RainbowBridge_StartGrayscale", 2, gsSPGrayscale(true));
-            ResourceMgr_PatchGfxByName(gRainbowBridgeDL, "RainbowBridge_MakeGreen", 10, gsDPSetGrayscaleColor(color.r, color.g, color.b, color.a));
-            ResourceMgr_PatchGfxByName(gRainbowBridgeDL, "RainbowBridge_EndGrayscaleAndEndDlist", 79, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
+            ResourceMgr_PatchGfxByName(gRainbowBridgeDL, "RainbowBridge_MakeGreen", 10,
+                                       gsDPSetGrayscaleColor(color.r, color.g, color.b, color.a));
+            ResourceMgr_PatchGfxByName(gRainbowBridgeDL, "RainbowBridge_EndGrayscaleAndEndDlist", 79,
+                                       gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
         } else {
             ResourceMgr_UnpatchGfxByName(gRainbowBridgeDL, "RainbowBridge_StartGrayscale");
             ResourceMgr_UnpatchGfxByName(gRainbowBridgeDL, "RainbowBridge_MakeGreen");
@@ -1084,127 +1307,188 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) {
     }
     static CosmeticOption& consumableBlueRupee = cosmeticOptions.at("Consumable.BlueRupee");
     if (manualChange || CVarGetInteger(consumableBlueRupee.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableBlueRupee.cvar, consumableBlueRupee.defaultColor);
-        PATCH_GFX(gGiBlueRupeeInnerColorDL,                       "Consumable_BlueRupee1",    consumableBlueRupee.changedCvar,      3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiBlueRupeeInnerColorDL,                       "Consumable_BlueRupee2",    consumableBlueRupee.changedCvar,      4, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiBlueRupeeOuterColorDL,                       "Consumable_BlueRupee3",    consumableBlueRupee.changedCvar,      3, gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
-        PATCH_GFX(gGiBlueRupeeOuterColorDL,                       "Consumable_BlueRupee4",    consumableBlueRupee.changedCvar,      4, gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
+        Color_RGBA8 color = CVarGetColor(consumableBlueRupee.valuesCvar, consumableBlueRupee.defaultColor);
+        PATCH_GFX(gGiBlueRupeeInnerColorDL, "Consumable_BlueRupee1", consumableBlueRupee.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiBlueRupeeInnerColorDL, "Consumable_BlueRupee2", consumableBlueRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(
+            gGiBlueRupeeOuterColorDL, "Consumable_BlueRupee3", consumableBlueRupee.changedCvar, 3,
+            gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
+        PATCH_GFX(gGiBlueRupeeOuterColorDL, "Consumable_BlueRupee4", consumableBlueRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
     }
     static CosmeticOption& consumableRedRupee = cosmeticOptions.at("Consumable.RedRupee");
     if (manualChange || CVarGetInteger(consumableRedRupee.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableRedRupee.cvar, consumableRedRupee.defaultColor);
-        PATCH_GFX(gGiRedRupeeInnerColorDL,                        "Consumable_RedRupee1",     consumableRedRupee.changedCvar,       3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiRedRupeeInnerColorDL,                        "Consumable_RedRupee2",     consumableRedRupee.changedCvar,       4, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiRedRupeeOuterColorDL,                        "Consumable_RedRupee3",     consumableRedRupee.changedCvar,       3, gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
-        PATCH_GFX(gGiRedRupeeOuterColorDL,                        "Consumable_RedRupee4",     consumableRedRupee.changedCvar,       4, gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
+        Color_RGBA8 color = CVarGetColor(consumableRedRupee.valuesCvar, consumableRedRupee.defaultColor);
+        PATCH_GFX(gGiRedRupeeInnerColorDL, "Consumable_RedRupee1", consumableRedRupee.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiRedRupeeInnerColorDL, "Consumable_RedRupee2", consumableRedRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(
+            gGiRedRupeeOuterColorDL, "Consumable_RedRupee3", consumableRedRupee.changedCvar, 3,
+            gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
+        PATCH_GFX(gGiRedRupeeOuterColorDL, "Consumable_RedRupee4", consumableRedRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
     }
     static CosmeticOption& consumablePurpleRupee = cosmeticOptions.at("Consumable.PurpleRupee");
     if (manualChange || CVarGetInteger(consumablePurpleRupee.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumablePurpleRupee.cvar, consumablePurpleRupee.defaultColor);
-        PATCH_GFX(gGiPurpleRupeeInnerColorDL,                     "Consumable_PurpleRupee1",  consumablePurpleRupee.changedCvar,    3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiPurpleRupeeInnerColorDL,                     "Consumable_PurpleRupee2",  consumablePurpleRupee.changedCvar,    4, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiPurpleRupeeOuterColorDL,                     "Consumable_PurpleRupee3",  consumablePurpleRupee.changedCvar,    3, gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
-        PATCH_GFX(gGiPurpleRupeeOuterColorDL,                     "Consumable_PurpleRupee4",  consumablePurpleRupee.changedCvar,    4, gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
+        Color_RGBA8 color = CVarGetColor(consumablePurpleRupee.valuesCvar, consumablePurpleRupee.defaultColor);
+        PATCH_GFX(gGiPurpleRupeeInnerColorDL, "Consumable_PurpleRupee1", consumablePurpleRupee.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiPurpleRupeeInnerColorDL, "Consumable_PurpleRupee2", consumablePurpleRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(
+            gGiPurpleRupeeOuterColorDL, "Consumable_PurpleRupee3", consumablePurpleRupee.changedCvar, 3,
+            gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
+        PATCH_GFX(gGiPurpleRupeeOuterColorDL, "Consumable_PurpleRupee4", consumablePurpleRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
     }
     static CosmeticOption& consumableGoldRupee = cosmeticOptions.at("Consumable.GoldRupee");
     if (manualChange || CVarGetInteger(consumableGoldRupee.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableGoldRupee.cvar, consumableGoldRupee.defaultColor);
-        PATCH_GFX(gGiGoldRupeeInnerColorDL,                       "Consumable_GoldRupee1",    consumableGoldRupee.changedCvar,      3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGoldRupeeInnerColorDL,                       "Consumable_GoldRupee2",    consumableGoldRupee.changedCvar,      4, gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
-        PATCH_GFX(gGiGoldRupeeOuterColorDL,                       "Consumable_GoldRupee3",    consumableGoldRupee.changedCvar,      3, gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
-        PATCH_GFX(gGiGoldRupeeOuterColorDL,                       "Consumable_GoldRupee4",    consumableGoldRupee.changedCvar,      4, gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
+        Color_RGBA8 color = CVarGetColor(consumableGoldRupee.valuesCvar, consumableGoldRupee.defaultColor);
+        PATCH_GFX(gGiGoldRupeeInnerColorDL, "Consumable_GoldRupee1", consumableGoldRupee.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGoldRupeeInnerColorDL, "Consumable_GoldRupee2", consumableGoldRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 5, color.g / 5, color.b / 5, 255));
+        PATCH_GFX(
+            gGiGoldRupeeOuterColorDL, "Consumable_GoldRupee3", consumableGoldRupee.changedCvar, 3,
+            gsDPSetPrimColor(0, 0, MIN(color.r + 100, 255), MIN(color.g + 100, 255), MIN(color.b + 100, 255), 255));
+        PATCH_GFX(gGiGoldRupeeOuterColorDL, "Consumable_GoldRupee4", consumableGoldRupee.changedCvar, 4,
+                  gsDPSetEnvColor(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, 255));
     }
 
     static CosmeticOption& consumableHearts = cosmeticOptions.at("Consumable.Hearts");
     if (manualChange || CVarGetInteger(consumableHearts.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableHearts.cvar, consumableHearts.defaultColor);
+        Color_RGBA8 color = CVarGetColor(consumableHearts.valuesCvar, consumableHearts.defaultColor);
         /*
-        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts1",       consumableHearts.changedCvar,         4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts2",       consumableHearts.changedCvar,        26, gsSPGrayscale(true));
-        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts3",       consumableHearts.changedCvar,        72, gsSPGrayscale(false));
-        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts4",       consumableHearts.changedCvar,        74, gsSPEndDisplayList());
+        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts1", consumableHearts.changedCvar, 4,
+        gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); PATCH_GFX(gGiRecoveryHeartDL, "Consumable_Hearts2",
+        consumableHearts.changedCvar,        26, gsSPGrayscale(true)); PATCH_GFX(gGiRecoveryHeartDL,
+        "Consumable_Hearts3",       consumableHearts.changedCvar,        72, gsSPGrayscale(false));
+        PATCH_GFX(gGiRecoveryHeartDL,                             "Consumable_Hearts4", consumableHearts.changedCvar,
+        74, gsSPEndDisplayList());
         */
-        PATCH_GFX(gGiHeartPieceDL,                                "Consumable_Hearts5",       consumableHearts.changedCvar,         2, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiHeartPieceDL,                                "Consumable_Hearts6",       consumableHearts.changedCvar,         6, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiHeartContainerDL,                            "Consumable_Hearts7",       consumableHearts.changedCvar,         2, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiHeartContainerDL,                            "Consumable_Hearts8",       consumableHearts.changedCvar,         6, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiRedPotColorDL,                               "Consumable_Hearts9",       consumableHearts.changedCvar,         3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiRedPotColorDL,                               "Consumable_Hearts10",      consumableHearts.changedCvar,         4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiHeartPieceDL, "Consumable_Hearts5", consumableHearts.changedCvar, 2,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiHeartPieceDL, "Consumable_Hearts6", consumableHearts.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiHeartContainerDL, "Consumable_Hearts7", consumableHearts.changedCvar, 2,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiHeartContainerDL, "Consumable_Hearts8", consumableHearts.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiRedPotColorDL, "Consumable_Hearts9", consumableHearts.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiRedPotColorDL, "Consumable_Hearts10", consumableHearts.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
     }
     static CosmeticOption& consumableMagic = cosmeticOptions.at("Consumable.Magic");
     if (manualChange || CVarGetInteger(consumableMagic.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(consumableMagic.cvar, consumableMagic.defaultColor);
-        PATCH_GFX(gGiMagicJarSmallDL,                             "Consumable_Magic1",        consumableMagic.changedCvar,         31, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiMagicJarSmallDL,                             "Consumable_Magic2",        consumableMagic.changedCvar,         32, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiMagicJarLargeDL,                             "Consumable_Magic3",        consumableMagic.changedCvar,         31, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiMagicJarLargeDL,                             "Consumable_Magic4",        consumableMagic.changedCvar,         32, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiGreenPotColorDL,                             "Consumable_Magic5",        consumableMagic.changedCvar,          3, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiGreenPotColorDL,                             "Consumable_Magic6",        consumableMagic.changedCvar,          4, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        Color_RGBA8 color = CVarGetColor(consumableMagic.valuesCvar, consumableMagic.defaultColor);
+        PATCH_GFX(gGiMagicJarSmallDL, "Consumable_Magic1", consumableMagic.changedCvar, 31,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiMagicJarSmallDL, "Consumable_Magic2", consumableMagic.changedCvar, 32,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiMagicJarLargeDL, "Consumable_Magic3", consumableMagic.changedCvar, 31,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiMagicJarLargeDL, "Consumable_Magic4", consumableMagic.changedCvar, 32,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiGreenPotColorDL, "Consumable_Magic5", consumableMagic.changedCvar, 3,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiGreenPotColorDL, "Consumable_Magic6", consumableMagic.changedCvar, 4,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
     }
 
     static CosmeticOption& npcGoldenSkulltula = cosmeticOptions.at("NPC.GoldenSkulltula");
     if (manualChange || CVarGetInteger(npcGoldenSkulltula.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(npcGoldenSkulltula.cvar, npcGoldenSkulltula.defaultColor);
-        PATCH_GFX(gSkulltulaTokenDL,                              "NPC_GoldenSkulltula1",     npcGoldenSkulltula.changedCvar,       5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gSkulltulaTokenDL,                              "NPC_GoldenSkulltula2",     npcGoldenSkulltula.changedCvar,       6, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gSkulltulaTokenFlameDL,                         "NPC_GoldenSkulltula3",     npcGoldenSkulltula.changedCvar,      32, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gSkulltulaTokenFlameDL,                         "NPC_GoldenSkulltula4",     npcGoldenSkulltula.changedCvar,      33, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiSkulltulaTokenDL,                            "NPC_GoldenSkulltula5",     npcGoldenSkulltula.changedCvar,       5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSkulltulaTokenDL,                            "NPC_GoldenSkulltula6",     npcGoldenSkulltula.changedCvar,       6, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiSkulltulaTokenFlameDL,                       "NPC_GoldenSkulltula7",     npcGoldenSkulltula.changedCvar,      32, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSkulltulaTokenFlameDL,                       "NPC_GoldenSkulltula8",     npcGoldenSkulltula.changedCvar,      33, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(object_st_DL_003FB0,                            "NPC_GoldenSkulltula9",     npcGoldenSkulltula.changedCvar,     118, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(object_st_DL_003FB0,                            "NPC_GoldenSkulltula10",    npcGoldenSkulltula.changedCvar,     119, gsDPSetEnvColor(color.r / 4, color.g / 4, color.b / 4, 255));
+        Color_RGBA8 color = CVarGetColor(npcGoldenSkulltula.valuesCvar, npcGoldenSkulltula.defaultColor);
+        PATCH_GFX(gSkulltulaTokenDL, "NPC_GoldenSkulltula1", npcGoldenSkulltula.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gSkulltulaTokenDL, "NPC_GoldenSkulltula2", npcGoldenSkulltula.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gSkulltulaTokenFlameDL, "NPC_GoldenSkulltula3", npcGoldenSkulltula.changedCvar, 32,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gSkulltulaTokenFlameDL, "NPC_GoldenSkulltula4", npcGoldenSkulltula.changedCvar, 33,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiSkulltulaTokenDL, "NPC_GoldenSkulltula5", npcGoldenSkulltula.changedCvar, 5,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiSkulltulaTokenDL, "NPC_GoldenSkulltula6", npcGoldenSkulltula.changedCvar, 6,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(gGiSkulltulaTokenFlameDL, "NPC_GoldenSkulltula7", npcGoldenSkulltula.changedCvar, 32,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGiSkulltulaTokenFlameDL, "NPC_GoldenSkulltula8", npcGoldenSkulltula.changedCvar, 33,
+                  gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
+        PATCH_GFX(object_st_DL_003FB0, "NPC_GoldenSkulltula9", npcGoldenSkulltula.changedCvar, 118,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(object_st_DL_003FB0, "NPC_GoldenSkulltula10", npcGoldenSkulltula.changedCvar, 119,
+                  gsDPSetEnvColor(color.r / 4, color.g / 4, color.b / 4, 255));
     }
 
     static CosmeticOption& npcGerudo = cosmeticOptions.at("NPC.Gerudo");
     if (manualChange || CVarGetInteger(npcGerudo.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(npcGerudo.cvar, npcGerudo.defaultColor);
-        PATCH_GFX(gGerudoPurpleTorsoDL,                           "NPC_Gerudo1",              npcGerudo.changedCvar,              139, gsDPSetEnvColor( color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleRightThighDL,                      "NPC_Gerudo2",              npcGerudo.changedCvar,               11, gsDPSetEnvColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleLeftThighDL,                       "NPC_Gerudo3",              npcGerudo.changedCvar,               11, gsDPSetEnvColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleVeilDL,                            "NPC_Gerudo4",              npcGerudo.changedCvar,               17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleLeftShinDL,                        "NPC_Gerudo5",              npcGerudo.changedCvar,               11, gsDPSetEnvColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleRightShinDL,                       "NPC_Gerudo6",              npcGerudo.changedCvar,               11, gsDPSetEnvColor(color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleLeftHandDL,                        "NPC_Gerudo7",              npcGerudo.changedCvar,               17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGerudoPurpleRightHandDL,                       "NPC_Gerudo8",              npcGerudo.changedCvar,               17, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(npcGerudo.valuesCvar, npcGerudo.defaultColor);
+        PATCH_GFX(gGerudoPurpleTorsoDL, "NPC_Gerudo1", npcGerudo.changedCvar, 139,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleRightThighDL, "NPC_Gerudo2", npcGerudo.changedCvar, 11,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleLeftThighDL, "NPC_Gerudo3", npcGerudo.changedCvar, 11,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleVeilDL, "NPC_Gerudo4", npcGerudo.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleLeftShinDL, "NPC_Gerudo5", npcGerudo.changedCvar, 11,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleRightShinDL, "NPC_Gerudo6", npcGerudo.changedCvar, 11,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleLeftHandDL, "NPC_Gerudo7", npcGerudo.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        PATCH_GFX(gGerudoPurpleRightHandDL, "NPC_Gerudo8", npcGerudo.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& npcMetalTrap = cosmeticOptions.at("NPC.MetalTrap");
     if (manualChange || CVarGetInteger(npcMetalTrap.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(npcMetalTrap.cvar, npcMetalTrap.defaultColor);
-        PATCH_GFX(gSlidingBladeTrapDL,                            "NPC_MetalTrap1",           npcMetalTrap.changedCvar,            59, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
+        Color_RGBA8 color = CVarGetColor(npcMetalTrap.valuesCvar, npcMetalTrap.defaultColor);
+        PATCH_GFX(gSlidingBladeTrapDL, "NPC_MetalTrap1", npcMetalTrap.changedCvar, 59,
+                  gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     }
 
     static CosmeticOption& n64LogoRed = cosmeticOptions.at("Title.N64LogoRed");
     if (manualChange || CVarGetInteger(n64LogoRed.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(n64LogoRed.cvar, n64LogoRed.defaultColor);
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoRed1",          n64LogoRed.changedCvar,              17, gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoRed2",          n64LogoRed.changedCvar,              18, gsDPSetEnvColor(color.r, color.g, color.b, 128));
+        Color_RGBA8 color = CVarGetColor(n64LogoRed.valuesCvar, n64LogoRed.defaultColor);
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoRed1", n64LogoRed.changedCvar, 17,
+                  gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoRed2", n64LogoRed.changedCvar, 18,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 128));
     }
     static CosmeticOption& n64LogoBlue = cosmeticOptions.at("Title.N64LogoBlue");
     if (manualChange || CVarGetInteger(n64LogoBlue.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(n64LogoBlue.cvar, n64LogoBlue.defaultColor);
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoBlue1",         n64LogoBlue.changedCvar,             29, gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoBlue2",         n64LogoBlue.changedCvar,             30, gsDPSetEnvColor(color.r, color.g, color.b, 128));
+        Color_RGBA8 color = CVarGetColor(n64LogoBlue.valuesCvar, n64LogoBlue.defaultColor);
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoBlue1", n64LogoBlue.changedCvar, 29,
+                  gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoBlue2", n64LogoBlue.changedCvar, 30,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 128));
     }
     static CosmeticOption& n64LogoGreen = cosmeticOptions.at("Title.N64LogoGreen");
     if (manualChange || CVarGetInteger(n64LogoGreen.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(n64LogoGreen.cvar, n64LogoGreen.defaultColor);
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoGreen1",        n64LogoGreen.changedCvar,            56, gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoGreen2",        n64LogoGreen.changedCvar,            57, gsDPSetEnvColor(color.r, color.g, color.b, 128));
+        Color_RGBA8 color = CVarGetColor(n64LogoGreen.valuesCvar, n64LogoGreen.defaultColor);
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoGreen1", n64LogoGreen.changedCvar, 56,
+                  gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoGreen2", n64LogoGreen.changedCvar, 57,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 128));
     }
     static CosmeticOption& n64LogoYellow = cosmeticOptions.at("Title.N64LogoYellow");
     if (manualChange || CVarGetInteger(n64LogoYellow.rainbowCvar, 0)) {
-        Color_RGBA8 color = CVarGetColor(n64LogoYellow.cvar, n64LogoYellow.defaultColor);
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoYellow1",       n64LogoYellow.changedCvar,           81, gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
-        PATCH_GFX(gNintendo64LogoDL,                              "Title_N64LogoYellow2",       n64LogoYellow.changedCvar,           82, gsDPSetEnvColor(color.r, color.g, color.b, 128));
+        Color_RGBA8 color = CVarGetColor(n64LogoYellow.valuesCvar, n64LogoYellow.defaultColor);
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoYellow1", n64LogoYellow.changedCvar, 81,
+                  gsDPSetPrimColor(0, 0, 255, 255, 255, 255))
+        PATCH_GFX(gNintendo64LogoDL, "Title_N64LogoYellow2", n64LogoYellow.changedCvar, 82,
+                  gsDPSetEnvColor(color.r, color.g, color.b, 128));
     }
 
     if (gPlayState != nullptr) {
-        if (CVarGetInteger(CVAR_COSMETIC("Link.BodyScale.Changed"), 0)) {
+        if (CVarGetInteger(CVAR_COSMETIC("Link.BodySize.Changed"), 0)) {
             static Player* player = GET_PLAYER(gPlayState);
-            float scale = CVarGetFloat(CVAR_COSMETIC("Link.BodyScale.Value"), 0.01f);
+            float scale = CVarGetFloat(CVAR_COSMETIC("Link.BodySize.Value"), 0.01f);
             player->actor.scale.x = scale;
             player->actor.scale.y = scale;
             player->actor.scale.z = scale;
@@ -1213,12 +1497,10 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) {
 }
 
 extern "C" Color_RGBA8 CosmeticsEditor_GetDefaultValue(const char* id) {
-    return Color_RGBA8 {
-        (uint8_t)(cosmeticOptions[id].defaultColor.r * 255.0f),
+    return Color_RGBA8{ (uint8_t)(cosmeticOptions[id].defaultColor.r * 255.0f),
                         (uint8_t)(cosmeticOptions[id].defaultColor.g * 255.0f),
                         (uint8_t)(cosmeticOptions[id].defaultColor.b * 255.0f),
-        (uint8_t)(cosmeticOptions[id].defaultColor.a * 255.0f)
-    };
+                        (uint8_t)(cosmeticOptions[id].defaultColor.a * 255.0f) };
 }
 
 void Table_InitHeader(bool has_header = true) {
@@ -1227,53 +1509,81 @@ void Table_InitHeader(bool has_header = true) {
     }
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
-    ImGui::AlignTextToFramePadding(); //This is to adjust Vertical pos of item in a cell to be normlized.
+    ImGui::AlignTextToFramePadding(); // This is to adjust Vertical pos of item in a cell to be normlized.
     ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 2);
     ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - 60);
 }
 
-void DrawUseMarginsSlider(const std::string ElementName, const std::string CvarName){
+void DrawUseMarginsSlider(const std::string ElementName, const std::string CvarName) {
     std::string CvarLabel = CvarName + ".UseMargins";
     std::string Label = ElementName + " use margins";
-    UIWidgets::EnhancementCheckbox(Label.c_str(), CvarLabel.c_str());
-    UIWidgets::Tooltip("Using this allow you move the element with General margins sliders");
+    UIWidgets::CVarCheckbox(Label.c_str(), CvarLabel.c_str(),
+                            UIWidgets::CheckboxOptions()
+                                .Color(THEME_COLOR)
+                                .Tooltip("Using this allow you move the element with General margins sliders"));
 }
 
-void DrawPositionsRadioBoxes(const std::string CvarName, bool NoAnchorEnabled = true){
+void DrawPositionsRadioBoxes(const std::string CvarName, bool NoAnchorEnabled = true) {
     std::string CvarLabel = CvarName + ".PosType";
-    UIWidgets::EnhancementRadioButton("Original position", CvarLabel.c_str(), 0);
-    UIWidgets::Tooltip("This will use original intended elements position");
-    UIWidgets::EnhancementRadioButton("Anchor to the left", CvarLabel.c_str(), 1);
-    UIWidgets::Tooltip("This will make your elements follow the left side of your game window");
-    UIWidgets::EnhancementRadioButton("Anchor to the right", CvarLabel.c_str(), 2);
-    UIWidgets::Tooltip("This will make your elements follow the right side of your game window");
+    UIWidgets::CVarRadioButton("Original position", CvarLabel.c_str(), 0,
+                               UIWidgets::RadioButtonsOptions()
+                                   .Color(THEME_COLOR)
+                                   .Tooltip("This will use original intended elements position"));
+    UIWidgets::CVarRadioButton("Anchor to the left", CvarLabel.c_str(), 1,
+                               UIWidgets::RadioButtonsOptions()
+                                   .Color(THEME_COLOR)
+                                   .Tooltip("This will make your elements follow the left side of your game window"));
+    UIWidgets::CVarRadioButton("Anchor to the right", CvarLabel.c_str(), 2,
+                               UIWidgets::RadioButtonsOptions()
+                                   .Color(THEME_COLOR)
+                                   .Tooltip("This will make your elements follow the right side of your game window"));
     if (NoAnchorEnabled) {
-        UIWidgets::EnhancementRadioButton("No anchors", CvarLabel.c_str(), 3);
-        UIWidgets::Tooltip("This will make your elements to not follow any side\nBetter used for center elements");
+        UIWidgets::CVarRadioButton(
+            "No anchors", CvarLabel.c_str(), 3,
+            UIWidgets::RadioButtonsOptions()
+                .Color(THEME_COLOR)
+                .Tooltip("This will make your elements to not follow any side\nBetter used for center elements"));
     }
-    UIWidgets::EnhancementRadioButton("Hidden", CvarLabel.c_str(), 4);
-    UIWidgets::Tooltip("This will make your elements hidden");
+    UIWidgets::CVarRadioButton(
+        "Hidden", CvarLabel.c_str(), 4,
+        UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("This will make your elements hidden"));
 }
 
-void DrawPositionSlider(const std::string CvarName, int MinY, int MaxY, int MinX, int MaxX){
+void DrawPositionSlider(const std::string CvarName, int MinY, int MaxY, int MinX, int MaxX) {
     std::string PosXCvar = CvarName + ".PosX";
     std::string PosYCvar = CvarName + ".PosY";
     std::string InvisibleLabelX = "##" + PosXCvar;
     std::string InvisibleLabelY = "##" + PosYCvar;
-    UIWidgets::EnhancementSliderInt("Up <-> Down : %d", InvisibleLabelY.c_str(), PosYCvar.c_str(), MinY, MaxY, "", 0);
-    UIWidgets::Tooltip("This slider is used to move Up and Down your elements.");
-    UIWidgets::EnhancementSliderInt("Left <-> Right : %d", InvisibleLabelX.c_str(), PosXCvar.c_str(), MinX, MaxX, "", 0);
-    UIWidgets::Tooltip("This slider is used to move Left and Right your elements.");
+    UIWidgets::CVarSliderInt("Up <-> Down : %d", PosYCvar.c_str(),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(MinY)
+                                 .Max(MaxY)
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR)
+                                 .Tooltip("This slider is used to move Up and Down your elements."));
+    UIWidgets::CVarSliderInt("Left <-> Right : %d", PosXCvar.c_str(),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(MinX)
+                                 .Max(MaxX)
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR)
+                                 .Tooltip("This slider is used to move Left and Right your elements."));
 }
 
-void DrawScaleSlider(const std::string CvarName, float DefaultValue){
+void DrawScaleSlider(const std::string CvarName, float DefaultValue) {
     std::string InvisibleLabel = "##" + CvarName;
     std::string CvarLabel = CvarName + ".Scale";
-    //Disabled for now. feature not done and several fixes needed to be merged.
-    //UIWidgets::EnhancementSliderFloat("Scale : %dx", InvisibleLabel.c_str(), CvarLabel.c_str(), 0.1f, 3.0f,"",DefaultValue,true);
+    // Disabled for now. feature not done and several fixes needed to be merged.
+    // UIWidgets::EnhancementSliderFloat("Scale : %dx", InvisibleLabel.c_str(), CvarLabel.c_str(),
+    // 0.1f, 3.0f,"",DefaultValue,true);
 }
 
-void Draw_Table_Dropdown(const char* Header_Title, const char* Table_ID, const char* Column_Title, const char* Slider_Title, const char* Slider_ID, int MinY, int MaxY, int MinX, int MaxX, float Default_Value) {
+void Draw_Table_Dropdown(const char* Header_Title, const char* Table_ID, const char* Column_Title,
+                         const char* Slider_Title, const char* Slider_ID, int MinY, int MaxY, int MinX, int MaxX,
+                         float Default_Value) {
+    UIWidgets::PushStyleHeader(THEME_COLOR);
     if (ImGui::CollapsingHeader(Header_Title)) {
         if (ImGui::BeginTable(Table_ID, 1, FlagsTable)) {
             ImGui::TableSetupColumn(Column_Title, FlagsCell, TablesCellsWidth);
@@ -1282,13 +1592,16 @@ void Draw_Table_Dropdown(const char* Header_Title, const char* Table_ID, const c
             DrawPositionsRadioBoxes(Slider_ID);
             DrawPositionSlider(Slider_ID, MinY, MaxY, MinX, MaxX);
             DrawScaleSlider(Slider_ID, Default_Value);
-            ImGui::NewLine();
             ImGui::EndTable();
         }
     }
+    UIWidgets::PopStyleHeader();
 }
 
-void C_Button_Dropdown(const char* Header_Title, const char* Table_ID, const char* Column_Title, const char* Slider_Title, const char* Slider_ID, const char* Int_Type, float Slider_Scale_Value) {
+void C_Button_Dropdown(const char* Header_Title, const char* Table_ID, const char* Column_Title,
+                       const char* Slider_Title, const char* Slider_ID, const char* Int_Type,
+                       float Slider_Scale_Value) {
+    UIWidgets::PushStyleHeader(THEME_COLOR);
     if (ImGui::CollapsingHeader(Header_Title)) {
         if (ImGui::BeginTable(Table_ID, 1, FlagsTable)) {
             ImGui::TableSetupColumn(Column_Title, FlagsCell, TablesCellsWidth);
@@ -1297,19 +1610,20 @@ void C_Button_Dropdown(const char* Header_Title, const char* Table_ID, const cha
             DrawPositionsRadioBoxes(Slider_ID);
             s16 Min_X_CU = 0;
             s16 Max_X_CU = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2);
-            if(CVarGetInteger(Int_Type, 0) == 2){
+            if (CVarGetInteger(Int_Type, 0) == 2) {
                 Max_X_CU = 294;
-            } else if(CVarGetInteger(Int_Type, 0) == 3){
+            } else if (CVarGetInteger(Int_Type, 0) == 3) {
                 Max_X_CU = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2);
-            } else if(CVarGetInteger(Int_Type, 0) == 4){
+            } else if (CVarGetInteger(Int_Type, 0) == 4) {
                 Min_X_CU = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2) * -1;
             }
-            DrawPositionSlider(Slider_ID, 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), Min_X_CU, Max_X_CU);
+            DrawPositionSlider(Slider_ID, 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), Min_X_CU,
+                               Max_X_CU);
             DrawScaleSlider(Slider_ID, Slider_Scale_Value);
-            ImGui::NewLine();
             ImGui::EndTable();
         }
-        std::shared_ptr<Ship::Controller> controller = Ship::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0);
+        std::shared_ptr<Ship::Controller> controller =
+            Ship::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0);
         for (auto [id, mapping] : controller->GetButton(BTN_DDOWN)->GetAllButtonMappings()) {
             controller->GetButton(BTN_CUSTOM_OCARINA_NOTE_F4)->AddButtonMapping(mapping);
         }
@@ -1323,38 +1637,67 @@ void C_Button_Dropdown(const char* Header_Title, const char* Table_ID, const cha
             controller->GetButton(BTN_CUSTOM_OCARINA_NOTE_D5)->AddButtonMapping(mapping);
         }
     }
+    UIWidgets::PopStyleHeader();
 }
 
-void Draw_Placements(){
-    if (ImGui::BeginTable("tableMargins", 1, FlagsTable)) {
-        ImGui::TableSetupColumn("General margins settings", FlagsCell, TablesCellsWidth);
-        Table_InitHeader();
-        UIWidgets::EnhancementSliderInt("Top : %dx", "##UIMARGINT", CVAR_COSMETIC("HUD.Margin.T"), static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2) * -1, 25, "", 0);
-        UIWidgets::EnhancementSliderInt("Left: %dx", "##UIMARGINL", CVAR_COSMETIC("HUD.Margin.L"), -25, static_cast<s16>(ImGui::GetWindowViewport()->Size.x), "", 0);
-        UIWidgets::EnhancementSliderInt("Right: %dx", "##UIMARGINR", CVAR_COSMETIC("HUD.Margin.R"), static_cast<s16>(ImGui::GetWindowViewport()->Size.x) * -1, 25, "", 0);
-        UIWidgets::EnhancementSliderInt("Bottom: %dx", "##UIMARGINB", CVAR_COSMETIC("HUD.Margin.B"), static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2) * -1, 25, "", 0);
-        SetMarginAll("All margins on",true);
-        UIWidgets::Tooltip("Set most of the elements to use margins\nSome elements with default position will not be affected\nElements without Anchor or Hidden will not be turned on");
-        ImGui::SameLine();
-        SetMarginAll("All margins off",false);
-        UIWidgets::Tooltip("Set all of the elements to not use margins");
-        ImGui::SameLine();
-        ResetPositionAll();
-        UIWidgets::Tooltip("Revert every element to use their original position and no margins");
-        ImGui::NewLine();
-        ImGui::EndTable();
-    }
+void Draw_Placements() {
+    UIWidgets::PushStyleHeader(THEME_COLOR);
+    ImGui::SeparatorText("General Margins Settings");
+    UIWidgets::CVarSliderInt("Top: %dpx", CVAR_COSMETIC("HUD.Margin.T"),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2) * -1)
+                                 .Max(25)
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR));
+    UIWidgets::CVarSliderInt("Left: %dpx", CVAR_COSMETIC("HUD.Margin.L"),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(-25)
+                                 .Max(static_cast<s16>(ImGui::GetWindowViewport()->Size.x))
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR));
+    UIWidgets::CVarSliderInt("Right: %dpx", CVAR_COSMETIC("HUD.Margin.R"),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(static_cast<s16>(ImGui::GetWindowViewport()->Size.x) * -1)
+                                 .Max(25)
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR));
+    UIWidgets::CVarSliderInt("Bottom: %dpx", CVAR_COSMETIC("HUD.Margin.B"),
+                             UIWidgets::IntSliderOptions()
+                                 .Min(static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2) * -1)
+                                 .Max(25)
+                                 .DefaultValue(0)
+                                 .Size(ImVec2(300.0f, 0.0f))
+                                 .Color(THEME_COLOR));
+    SetMarginAll("All margins on", true,
+                 "Set most of the elements to use margins\nSome elements with default position will not be "
+                 "affected\nElements without Anchor or Hidden will not be turned on");
+    ImGui::SameLine();
+    SetMarginAll("All margins off", false, "Set all of the elements to not use margins");
+    ImGui::SameLine();
+    ResetPositionAll();
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
     if (ImGui::CollapsingHeader("Hearts count position")) {
         if (ImGui::BeginTable("tableHeartsCounts", 1, FlagsTable)) {
             ImGui::TableSetupColumn("Hearts counts settings", FlagsCell, TablesCellsWidth);
             Table_InitHeader(false);
             DrawUseMarginsSlider("Hearts counts", CVAR_COSMETIC("HUD.Hearts"));
             DrawPositionsRadioBoxes(CVAR_COSMETIC("HUD.HeartsCount"));
-            DrawPositionSlider(CVAR_COSMETIC("HUD.HeartsCount"), -22, static_cast<s16>(ImGui::GetWindowViewport()->Size.y), -125, static_cast<s16>(ImGui::GetWindowViewport()->Size.x));
+            DrawPositionSlider(CVAR_COSMETIC("HUD.HeartsCount"), -22,
+                               static_cast<s16>(ImGui::GetWindowViewport()->Size.y), -125,
+                               static_cast<s16>(ImGui::GetWindowViewport()->Size.x));
             DrawScaleSlider(CVAR_COSMETIC("HUD.HeartsCount"), 0.7f);
-            UIWidgets::EnhancementSliderInt("Heart line length : %d", "##HeartLineLength", CVAR_COSMETIC("HUD.Hearts.LineLength"), 0, 20, "", 10);
-            UIWidgets::Tooltip("This will set the length of a row of hearts. Set to 0 for unlimited length.");
-            ImGui::NewLine();
+            UIWidgets::CVarSliderInt(
+                "Heart line length : %d", CVAR_COSMETIC("HUD.Hearts.LineLength"),
+                UIWidgets::IntSliderOptions()
+                    .Min(0)
+                    .Max(20)
+                    .DefaultValue(0)
+                    .Size(ImVec2(300.0f, 0.0f))
+                    .Color(THEME_COLOR)
+                    .Tooltip("This will set the length of a row of hearts. Set to 0 for unlimited length."));
             ImGui::EndTable();
         }
     }
@@ -1364,15 +1707,20 @@ void Draw_Placements(){
             Table_InitHeader(false);
             DrawUseMarginsSlider("Magic meter", CVAR_COSMETIC("HUD.MagicBar"));
             DrawPositionsRadioBoxes(CVAR_COSMETIC("HUD.MagicBar"));
-            UIWidgets::EnhancementRadioButton("Anchor to life bar", CVAR_COSMETIC("HUD.MagicBar.PosType"), 5);
-            UIWidgets::Tooltip("This will make your elements follow the bottom of the life meter");
-            DrawPositionSlider(CVAR_COSMETIC("HUD.MagicBar"), 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), -5, static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2));
+            UIWidgets::CVarRadioButton(
+                "Anchor to life bar", CVAR_COSMETIC("HUD.MagicBar.PosType"), 5,
+                UIWidgets::RadioButtonsOptions()
+                    .Color(THEME_COLOR)
+                    .Tooltip("This will make your elements follow the bottom of the life meter"));
+            DrawPositionSlider(CVAR_COSMETIC("HUD.MagicBar"), 0,
+                               static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), -5,
+                               static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2));
             DrawScaleSlider(CVAR_COSMETIC("HUD.MagicBar"), 1.0f);
-            ImGui::NewLine();
             ImGui::EndTable();
         }
     }
-    if (CVarGetInteger(CVAR_ENHANCEMENT("VisualAgony"), 0) && ImGui::CollapsingHeader("Visual stone of agony position")) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("VisualAgony"), 0) &&
+        ImGui::CollapsingHeader("Visual stone of agony position")) {
         if (ImGui::BeginTable("tabledvisualstoneofagony", 1, FlagsTable)) {
             ImGui::TableSetupColumn("Visual stone of agony settings", FlagsCell, TablesCellsWidth);
             Table_InitHeader(false);
@@ -1380,24 +1728,34 @@ void Draw_Placements(){
             DrawPositionsRadioBoxes(CVAR_COSMETIC("HUD.VisualSoA"));
             s16 Min_X_VSOA = 0;
             s16 Max_X_VSOA = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2);
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_RIGHT){
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_RIGHT) {
                 Max_X_VSOA = 290;
-            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == HIDDEN){
+            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == HIDDEN) {
                 Min_X_VSOA = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2) * -1;
             }
-            DrawPositionSlider(CVAR_COSMETIC("HUD.VisualSoA"), 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), Min_X_VSOA, Max_X_VSOA);
+            DrawPositionSlider(CVAR_COSMETIC("HUD.VisualSoA"), 0,
+                               static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), Min_X_VSOA, Max_X_VSOA);
             DrawScaleSlider(CVAR_COSMETIC("HUD.VisualSoA"), 1.0f);
-            ImGui::NewLine();
             ImGui::EndTable();
         }
     }
-    Draw_Table_Dropdown("B Button position", "tablebbtn", "B Button settings", "B Button", CVAR_COSMETIC("HUD.BButton"), 0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 4) + 50, -1, static_cast<int>(ImGui::GetWindowViewport()->Size.x) - 50, 0.95f);
-    Draw_Table_Dropdown("A Button position", "tableabtn", "A Button settings", "A Button", CVAR_COSMETIC("HUD.AButton"), -10, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 4) + 50, -20, static_cast<int>(ImGui::GetWindowViewport()->Size.x) - 50, 0.95f);
-    Draw_Table_Dropdown("Start Button position", "tablestartbtn", "Start Button settings", "Start Button", CVAR_COSMETIC("HUD.StartButton"), 0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), 0, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 70, 0.75f);
-    C_Button_Dropdown("C Button Up position", "tablecubtn", "C Button Up settings", "C Button Up", CVAR_COSMETIC("HUD.CUpButton"), CVAR_COSMETIC("HUD.CUpButton.PosType"), 0.5f);
-    C_Button_Dropdown("C Button Down position", "tablecdbtn", "C Button Down settings", "C Button Down", CVAR_COSMETIC("HUD.CDownButton"), CVAR_COSMETIC("HUD.CDownButton.PosType"), 0.87f);
-    C_Button_Dropdown("C Button Left position", "tableclbtn", "C Button Left settings", "C Button Left", CVAR_COSMETIC("HUD.CLeftButton"), CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0.87f);
-    C_Button_Dropdown("C Button Right position", "tablecrbtn", "C Button Right settings", "C Button Right", CVAR_COSMETIC("HUD.CRightButton"), CVAR_COSMETIC("HUD.CRightButton.PosType"), 0.87f);
+    Draw_Table_Dropdown("B Button position", "tablebbtn", "B Button settings", "B Button", CVAR_COSMETIC("HUD.BButton"),
+                        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 4) + 50, -1,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x) - 50, 0.95f);
+    Draw_Table_Dropdown("A Button position", "tableabtn", "A Button settings", "A Button", CVAR_COSMETIC("HUD.AButton"),
+                        -10, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 4) + 50, -20,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x) - 50, 0.95f);
+    Draw_Table_Dropdown("Start Button position", "tablestartbtn", "Start Button settings", "Start Button",
+                        CVAR_COSMETIC("HUD.StartButton"), 0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2),
+                        0, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 70, 0.75f);
+    C_Button_Dropdown("C Button Up position", "tablecubtn", "C Button Up settings", "C Button Up",
+                      CVAR_COSMETIC("HUD.CUpButton"), CVAR_COSMETIC("HUD.CUpButton.PosType"), 0.5f);
+    C_Button_Dropdown("C Button Down position", "tablecdbtn", "C Button Down settings", "C Button Down",
+                      CVAR_COSMETIC("HUD.CDownButton"), CVAR_COSMETIC("HUD.CDownButton.PosType"), 0.87f);
+    C_Button_Dropdown("C Button Left position", "tableclbtn", "C Button Left settings", "C Button Left",
+                      CVAR_COSMETIC("HUD.CLeftButton"), CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0.87f);
+    C_Button_Dropdown("C Button Right position", "tablecrbtn", "C Button Right settings", "C Button Right",
+                      CVAR_COSMETIC("HUD.CRightButton"), CVAR_COSMETIC("HUD.CRightButton.PosType"), 0.87f);
     if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) && ImGui::CollapsingHeader("DPad items position")) {
         if (ImGui::BeginTable("tabledpaditems", 1, FlagsTable)) {
             ImGui::TableSetupColumn("DPad items settings", FlagsCell, TablesCellsWidth);
@@ -1411,95 +1769,136 @@ void Draw_Placements(){
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == HIDDEN) {
                 Min_X_Dpad = static_cast<s16>(ImGui::GetWindowViewport()->Size.x / 2) * -1;
             }
-            DrawPositionSlider(CVAR_COSMETIC("HUD.Dpad"), 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2), Min_X_Dpad, Max_X_Dpad);
+            DrawPositionSlider(CVAR_COSMETIC("HUD.Dpad"), 0, static_cast<s16>(ImGui::GetWindowViewport()->Size.y / 2),
+                               Min_X_Dpad, Max_X_Dpad);
             DrawScaleSlider(CVAR_COSMETIC("HUD.Dpad"), 1.0f);
-            ImGui::NewLine();
             ImGui::EndTable();
         }
     }
-    Draw_Table_Dropdown("Minimaps position", "tableminimapspos", "minimaps settings", "Minimap", CVAR_COSMETIC("HUD.Minimap"),
-        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3) * -1, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3), static_cast<int>(ImGui::GetWindowViewport()->Size.x) * -1, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
-    Draw_Table_Dropdown("Small Keys counter position", "tablesmolekeys", "Small Keys counter settings", "Small Keys counter", CVAR_COSMETIC("HUD.SmallKey"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3), -1, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
-    Draw_Table_Dropdown("Rupee counter position", "tablerupeecount", "Rupee counter settings", "Rupee counter", CVAR_COSMETIC("HUD.Rupees"),
-        -2, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3), -3, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
+    Draw_Table_Dropdown("Minimaps position", "tableminimapspos", "minimaps settings", "Minimap",
+                        CVAR_COSMETIC("HUD.Minimap"), static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3) * -1,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3),
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x) * -1,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
+    Draw_Table_Dropdown("Small Keys counter position", "tablesmolekeys", "Small Keys counter settings",
+                        "Small Keys counter", CVAR_COSMETIC("HUD.SmallKey"), 0,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3), -1,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
+    Draw_Table_Dropdown("Rupee counter position", "tablerupeecount", "Rupee counter settings", "Rupee counter",
+                        CVAR_COSMETIC("HUD.Rupees"), -2, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 3), -3,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), 1.0f);
     Draw_Table_Dropdown("Carrots position", "tableCarrots", "Carrots settings", "Carrots", CVAR_COSMETIC("HUD.Carrots"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 25, 1.0f);
-    Draw_Table_Dropdown("Timers position", "tabletimers", "Timers settings", "Timers", CVAR_COSMETIC("HUD.Timers"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) - 50, 1.0f);
-    Draw_Table_Dropdown("Archery Scores position", "tablearchery", "Archery Scores settings", "Archery scores", CVAR_COSMETIC("HUD.ArcheryScore"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) - 50, 1.0f);
-    Draw_Table_Dropdown("Title cards (Maps) position", "tabletcmaps", "Titlecard maps settings", "Title cards (overworld)", CVAR_COSMETIC("HUD.TitleCard.Map"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
-    Draw_Table_Dropdown("Title cards (Bosses) position", "tabletcbosses", "Title cards (Bosses) settings", "Title cards (Bosses)", CVAR_COSMETIC("HUD.TitleCard.Boss"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
-    Draw_Table_Dropdown("In-game Gameplay Timer position", "tablegameplaytimer", "In-game Gameplay Timer settings", "In-game Gameplay Timer", CVAR_COSMETIC("HUD.IGT"),
-        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
+                        0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 25, 1.0f);
+    Draw_Table_Dropdown("Timers position", "tabletimers", "Timers settings", "Timers", CVAR_COSMETIC("HUD.Timers"), 0,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) - 50, 1.0f);
+    Draw_Table_Dropdown("Archery Scores position", "tablearchery", "Archery Scores settings", "Archery scores",
+                        CVAR_COSMETIC("HUD.ArcheryScore"), 0, static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2),
+                        -50, static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) - 50, 1.0f);
+    Draw_Table_Dropdown("Title cards (Maps) position", "tabletcmaps", "Titlecard maps settings",
+                        "Title cards (overworld)", CVAR_COSMETIC("HUD.TitleCard.Map"), 0,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
+    Draw_Table_Dropdown("Title cards (Bosses) position", "tabletcbosses", "Title cards (Bosses) settings",
+                        "Title cards (Bosses)", CVAR_COSMETIC("HUD.TitleCard.Boss"), 0,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
+    Draw_Table_Dropdown("In-game Gameplay Timer position", "tablegameplaytimer", "In-game Gameplay Timer settings",
+                        "In-game Gameplay Timer", CVAR_COSMETIC("HUD.IGT"), 0,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
+                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
     if (ImGui::CollapsingHeader("Enemy Health Bar position")) {
         if (ImGui::BeginTable("enemyhealthbar", 1, FlagsTable)) {
             ImGui::TableSetupColumn("Enemy Health Bar settings", FlagsCell, TablesCellsWidth);
             Table_InitHeader(false);
             std::string posTypeCVar = CVAR_COSMETIC("HUD.EnemyHealthBar.PosType");
-            UIWidgets::EnhancementRadioButton("Anchor to Enemy", posTypeCVar.c_str(), ENEMYHEALTH_ANCHOR_ACTOR);
-            UIWidgets::Tooltip("This will use enemy on screen position");
-            UIWidgets::EnhancementRadioButton("Anchor to the top", posTypeCVar.c_str(), ENEMYHEALTH_ANCHOR_TOP);
-            UIWidgets::Tooltip("This will make your elements follow the top edge of your game window");
-            UIWidgets::EnhancementRadioButton("Anchor to the bottom", posTypeCVar.c_str(), ENEMYHEALTH_ANCHOR_BOTTOM);
-            UIWidgets::Tooltip("This will make your elements follow the bottom edge of your game window");
-            DrawPositionSlider(CVAR_COSMETIC("HUD.EnemyHealthBar."), -SCREEN_HEIGHT, SCREEN_HEIGHT, -static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2), static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2));
-            if (UIWidgets::EnhancementSliderInt("Health Bar Width: %d", "##EnemyHealthBarWidth", CVAR_COSMETIC("HUD.EnemyHealthBar.Width.Value"), 32, 128, "", 64)) {
+            UIWidgets::CVarRadioButton(
+                "Anchor to Enemy", CVAR_COSMETIC("HUD.EnemyHealthBar.PosType"), ENEMYHEALTH_ANCHOR_ACTOR,
+                UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("This will use enemy on screen position"));
+            UIWidgets::CVarRadioButton(
+                "Anchor to the top", CVAR_COSMETIC("HUD.EnemyHealthBar.PosType"), ENEMYHEALTH_ANCHOR_TOP,
+                UIWidgets::RadioButtonsOptions()
+                    .Color(THEME_COLOR)
+                    .Tooltip("This will make your elements follow the top edge of your game window"));
+            UIWidgets::CVarRadioButton(
+                "Anchor to the bottom", CVAR_COSMETIC("HUD.EnemyHealthBar.PosType"), ENEMYHEALTH_ANCHOR_BOTTOM,
+                UIWidgets::RadioButtonsOptions()
+                    .Color(THEME_COLOR)
+                    .Tooltip("This will make your elements follow the bottom edge of your game window"));
+            DrawPositionSlider(CVAR_COSMETIC("HUD.EnemyHealthBar."), -SCREEN_HEIGHT, SCREEN_HEIGHT,
+                               -static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2),
+                               static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2));
+            if (UIWidgets::CVarSliderInt("Health Bar Width: %d", CVAR_COSMETIC("HUD.EnemyHealthBar.Width.Value"),
+                                         UIWidgets::IntSliderOptions()
+                                             .Min(32)
+                                             .Max(128)
+                                             .DefaultValue(64)
+                                             .Size(ImVec2(300.0f, 0.0f))
+                                             .Color(THEME_COLOR)
+                                             .Tooltip("This will change the width of the health bar"))) {
                 CVarSetInteger(CVAR_COSMETIC("HUD.EnemyHealthBar.Width.Changed"), 1);
             }
-            UIWidgets::Tooltip("This will change the width of the health bar");
             ImGui::SameLine();
-            if (ImGui::Button("Reset##EnemyHealthBarWidth")) {
+            ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::CalcTextSize("g").y * 2));
+            if (UIWidgets::Button("Reset##EnemyHealthBarWidth",
+                                  UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
                 CVarClear(CVAR_COSMETIC("HUD.EnemyHealthBar.Width.Value"));
                 CVarClear(CVAR_COSMETIC("HUD.EnemyHealthBar.Width.Changed"));
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             }
-            ImGui::NewLine();
             ImGui::EndTable();
         }
     }
+    UIWidgets::PopStyleHeader();
 }
 
 void Reset_Option_Single(const char* Button_Title, const char* name) {
     ImGui::SameLine();
-    if (ImGui::Button(Button_Title)) {
+    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::CalcTextSize("g").y * 2));
+    if (UIWidgets::Button(Button_Title, UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
         CVarClear(name);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 }
 
 void Reset_Option_Double(const char* Button_Title, const char* name) {
     ImGui::SameLine();
-    if (ImGui::Button(Button_Title)) {
+    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::CalcTextSize("g").y * 2));
+    if (UIWidgets::Button(Button_Title, UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
         CVarClear((std::string(name) + ".Value").c_str());
         CVarClear((std::string(name) + ".Changed").c_str());
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 }
 
 void DrawSillyTab() {
     ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    if (UIWidgets::EnhancementCheckbox("Let It Snow", CVAR_GENERAL("LetItSnow"))) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    UIWidgets::Tooltip("Makes snow fall, changes chest texture colors to red and green, etc, for December holidays.\nWill reset on restart outside of December 23-25.");
+    UIWidgets::CVarCheckbox("Let It Snow", CVAR_GENERAL("LetItSnow"),
+                            UIWidgets::CheckboxOptions()
+                                .Color(THEME_COLOR)
+                                .Tooltip("Makes snow fall, changes chest texture colors to red and green, etc, for "
+                                         "December holidays.\nWill reset on restart outside of December 23-25."));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    if (UIWidgets::EnhancementSliderFloat("Link Body Scale: %.3fx", "##Link_BodyScale", CVAR_COSMETIC("Link.BodyScale.Value"), 0.001f, 0.025f, "", 0.01f, true)) {
-        CVarSetInteger(CVAR_COSMETIC("Link.BodyScale.Changed"), 1);
+    if (UIWidgets::CVarSliderFloat("Link Body Size", CVAR_COSMETIC("Link.BodySize.Value"),
+                                   UIWidgets::FloatSliderOptions()
+                                       .Format("%.3f")
+                                       .Min(0.001f)
+                                       .Max(0.05f)
+                                       .DefaultValue(0.01f)
+                                       .Step(0.001f)
+                                       .Size(ImVec2(300.0f, 0.0f))
+                                       .Color(THEME_COLOR))) {
+        CVarSetInteger(CVAR_COSMETIC("Link.BodySize.Changed"), 1);
     }
     ImGui::SameLine();
-    if (ImGui::Button("Reset##Link_BodyScale")) {
-        CVarClear(CVAR_COSMETIC("Link.BodyScale.Value"));
-        CVarClear(CVAR_COSMETIC("Link.BodyScale.Changed"));
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::CalcTextSize("g").y * 2));
+    if (UIWidgets::Button("Reset##Link_BodySize",
+                          UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
+        CVarClear(CVAR_COSMETIC("Link.BodySize.Value"));
+        CVarClear(CVAR_COSMETIC("Link.BodySize.Changed"));
         if (gPlayState != nullptr) {
             static Player* player = GET_PLAYER(gPlayState);
             player->actor.scale.x = 0.01f;
@@ -1508,69 +1907,142 @@ void DrawSillyTab() {
         }
     }
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
-
-    if (UIWidgets::EnhancementSliderFloat("Link Head Scale: %.2fx", "##Link_HeadScale", CVAR_COSMETIC("Link.HeadScale.Value"), 0.4f, 4.0f, "", 1.0f, false)) {
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
+    if (UIWidgets::CVarSliderFloat("Link Head Scale", CVAR_COSMETIC("Link.HeadScale.Value"),
+                                   UIWidgets::FloatSliderOptions()
+                                       .Format("%.1fx")
+                                       .Min(0.1f)
+                                       .Max(5.0f)
+                                       .DefaultValue(1.0f)
+                                       .Step(0.1f)
+                                       .Size(ImVec2(300.0f, 0.0f))
+                                       .Color(THEME_COLOR))) {
         CVarSetInteger(CVAR_COSMETIC("Link.HeadScale.Changed"), 1);
     }
     Reset_Option_Double("Reset##Link_HeadScale", CVAR_COSMETIC("Link.HeadScale"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    if (UIWidgets::EnhancementSliderFloat("Link Sword Scale: %f", "##Link_SwordScale", CVAR_COSMETIC("Link.SwordScale.Value"), 1.0f, 2.5f, "", 1.0f, false)) {
+    if (UIWidgets::CVarSliderFloat("Link Sword Scale", CVAR_COSMETIC("Link.SwordScale.Value"),
+                                   UIWidgets::FloatSliderOptions()
+                                       .Format("%.1fx")
+                                       .Min(0.1f)
+                                       .Max(5.0f)
+                                       .DefaultValue(1.0f)
+                                       .Step(0.1f)
+                                       .Size(ImVec2(300.0f, 0.0f))
+                                       .Color(THEME_COLOR))) {
         CVarSetInteger(CVAR_COSMETIC("Link.SwordScale.Changed"), 1);
     }
     Reset_Option_Double("Reset##Link_SwordScale", CVAR_COSMETIC("Link.SwordScale"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("Bunny Hood Length: %f", "##BunnyHood_EarLength", CVAR_COSMETIC("BunnyHood.EarLength"), -300.0f, 1000.0f, "", 0.0f, false);
+    UIWidgets::CVarSliderFloat("Bunny Hood Length", CVAR_COSMETIC("BunnyHood.EarLength"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.0f")
+                                   .Min(-300.0f)
+                                   .Max(1000.0f)
+                                   .DefaultValue(0.0f)
+                                   .Step(10.0f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##BunnyHood_EarLength", CVAR_COSMETIC("BunnyHood.EarLength"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("Bunny Hood Spread: %f", "##BunnyHood_EarSpread", CVAR_COSMETIC("BunnyHood.EarSpread"), -300.0f, 500.0f, "", 0.0f, false);
+    UIWidgets::CVarSliderFloat("Bunny Hood Spread", CVAR_COSMETIC("BunnyHood.EarSpread"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.0f")
+                                   .Min(-300.0f)
+                                   .Max(500.0f)
+                                   .DefaultValue(0.0f)
+                                   .Step(10.0f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##BunnyHood_EarSpread", CVAR_COSMETIC("BunnyHood.EarSpread"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("Goron Neck Length: %f", "##Goron_NeckLength", CVAR_COSMETIC("Goron.NeckLength"), 0.0f, 5000.0f, "", 0.0f, false);
+    UIWidgets::CVarSliderFloat("Goron Neck Length", CVAR_COSMETIC("Goron.NeckLength"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.0f")
+                                   .Min(0.0f)
+                                   .Max(5000.0f)
+                                   .DefaultValue(0.0f)
+                                   .Step(10.0f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##Goron_NeckLength", CVAR_COSMETIC("Goron.NeckLength"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementCheckbox("Unfix Goron Spin", CVAR_COSMETIC("UnfixGoronSpin"));
+    UIWidgets::CVarCheckbox("Unfix Goron Spin", CVAR_COSMETIC("UnfixGoronSpin"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("Fairies Size: %f", "##Fairies_Size", CVAR_COSMETIC("Fairies.Size"), 0.25f, 5.0f, "", 1.0f, false);
+    UIWidgets::CVarSliderFloat("Fairies Size", CVAR_COSMETIC("Fairies.Size"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.1fx")
+                                   .Min(0.1f)
+                                   .Max(5.0f)
+                                   .DefaultValue(1.0f)
+                                   .Step(0.1f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##Fairies_Size", CVAR_COSMETIC("Fairies.Size"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("N64 Logo Spin Speed: %f", "##N64Logo_SpinSpeed", CVAR_COSMETIC("N64Logo.SpinSpeed"), 0.25f, 5.0f, "", 1.0f, false);
+    UIWidgets::CVarSliderFloat("N64 Logo Spin Speed", CVAR_COSMETIC("N64Logo.SpinSpeed"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.1fx")
+                                   .Min(0.1f)
+                                   .Max(5.0f)
+                                   .DefaultValue(1.0f)
+                                   .Step(0.1f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##N64Logo_SpinSpeed", CVAR_COSMETIC("N64Logo.SpinSpeed"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    UIWidgets::EnhancementSliderFloat("Moon Size: %f", "##Moon_Size", CVAR_COSMETIC("Moon.Size"), 0.5f, 2.0f, "", 1.0f, false);
+    UIWidgets::CVarSliderFloat("Moon Size", CVAR_COSMETIC("Moon.Size"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.1fx")
+                                   .Min(0.1f)
+                                   .Max(5.0f)
+                                   .DefaultValue(1.0f)
+                                   .Step(0.1f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
     Reset_Option_Single("Reset##Moon_Size", CVAR_COSMETIC("Moon.Size"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-    if (UIWidgets::EnhancementSliderFloat("Kak Windmill Speed: %f", "##Kak_Windmill_Speed", CVAR_COSMETIC("Kak.Windmill_Speed.Value"), 100.0f, 6000.0f, "", 100.0f, false)) {
+    if (UIWidgets::CVarSliderFloat("Kak Windmill Speed", CVAR_COSMETIC("Kak.Windmill_Speed.Value"),
+                                   UIWidgets::FloatSliderOptions()
+                                       .Format("%.0f")
+                                       .Min(100.0f)
+                                       .Max(6000.0f)
+                                       .DefaultValue(100.0f)
+                                       .Step(10.0f)
+                                       .Size(ImVec2(300.0f, 0.0f))
+                                       .Color(THEME_COLOR))) {
         CVarSetInteger(CVAR_COSMETIC("Kak.Windmill_Speed.Changed"), 1);
     }
     Reset_Option_Double("Reset##Kak_Windmill_Speed", CVAR_COSMETIC("Kak.Windmill_Speed"));
 
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
     ImGui::EndDisabled();
 }
 
 // Copies the RGB values from one cosmetic option to another, multiplied by the passed in amount, this
 // allows you create and use multiple shades of the same color.
-void CopyMultipliedColor(CosmeticOption& cosmeticOptionSrc, CosmeticOption& cosmeticOptionTarget, float amount = 0.75f) {
+void CopyMultipliedColor(CosmeticOption& cosmeticOptionSrc, CosmeticOption& cosmeticOptionTarget,
+                         float amount = 0.75f) {
     Color_RGBA8 newColor;
     newColor.r = static_cast<uint8_t>(MIN((cosmeticOptionSrc.currentColor.x * 255.0f) * amount, 255));
     newColor.g = static_cast<uint8_t>(MIN((cosmeticOptionSrc.currentColor.y * 255.0f) * amount, 255));
@@ -1582,7 +2054,7 @@ void CopyMultipliedColor(CosmeticOption& cosmeticOptionSrc, CosmeticOption& cosm
     cosmeticOptionTarget.currentColor.z = newColor.b / 255.0f;
     cosmeticOptionTarget.currentColor.w = newColor.a / 255.0f;
 
-    CVarSetColor(cosmeticOptionTarget.cvar, newColor);
+    CVarSetColor(cosmeticOptionTarget.valuesCvar, newColor);
     CVarSetInteger((cosmeticOptionTarget.rainbowCvar), 0);
     CVarSetInteger((cosmeticOptionTarget.changedCvar), 1);
 }
@@ -1642,14 +2114,15 @@ void RandomizeColor(CosmeticOption& cosmeticOption) {
     cosmeticOption.currentColor.z = newColor.b / 255.0f;
     cosmeticOption.currentColor.w = newColor.a / 255.0f;
 
-    CVarSetColor(cosmeticOption.cvar, newColor);
+    CVarSetColor(cosmeticOption.valuesCvar, newColor);
     CVarSetInteger(cosmeticOption.rainbowCvar, 0);
     CVarSetInteger(cosmeticOption.changedCvar, 1);
     ApplySideEffects(cosmeticOption);
 }
 
 void ResetColor(CosmeticOption& cosmeticOption) {
-    Color_RGBA8 defaultColor = {cosmeticOption.defaultColor.r, cosmeticOption.defaultColor.g, cosmeticOption.defaultColor.b, cosmeticOption.defaultColor.a};
+    Color_RGBA8 defaultColor = { cosmeticOption.defaultColor.r, cosmeticOption.defaultColor.g,
+                                 cosmeticOption.defaultColor.b, cosmeticOption.defaultColor.a };
     cosmeticOption.currentColor.x = defaultColor.r / 255.0f;
     cosmeticOption.currentColor.y = defaultColor.g / 255.0f;
     cosmeticOption.currentColor.z = defaultColor.b / 255.0f;
@@ -1658,12 +2131,12 @@ void ResetColor(CosmeticOption& cosmeticOption) {
     CVarClear(cosmeticOption.changedCvar);
     CVarClear(cosmeticOption.rainbowCvar);
     CVarClear(cosmeticOption.lockedCvar);
-    CVarClear(cosmeticOption.cvar);
-    CVarClear((std::string(cosmeticOption.cvar) + ".R").c_str());
-    CVarClear((std::string(cosmeticOption.cvar) + ".G").c_str());
-    CVarClear((std::string(cosmeticOption.cvar) + ".B").c_str());
-    CVarClear((std::string(cosmeticOption.cvar) + ".A").c_str());
-    CVarClear((std::string(cosmeticOption.cvar) + ".Type").c_str());
+    CVarClear(cosmeticOption.valuesCvar);
+    CVarClear((std::string(cosmeticOption.valuesCvar) + ".R").c_str());
+    CVarClear((std::string(cosmeticOption.valuesCvar) + ".G").c_str());
+    CVarClear((std::string(cosmeticOption.valuesCvar) + ".B").c_str());
+    CVarClear((std::string(cosmeticOption.valuesCvar) + ".A").c_str());
+    CVarClear((std::string(cosmeticOption.valuesCvar) + ".Type").c_str());
 
     // This portion should match 1:1 the multiplied colors in `ApplySideEffect()`
     if (cosmeticOption.label == "Bow Body") {
@@ -1709,40 +2182,27 @@ void ResetColor(CosmeticOption& cosmeticOption) {
 }
 
 void DrawCosmeticRow(CosmeticOption& cosmeticOption) {
-    bool colorChanged;
-    if (cosmeticOption.supportsAlpha) {
-        colorChanged = ImGui::ColorEdit4(cosmeticOption.label.c_str(), (float*)&cosmeticOption.currentColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
-    } else {
-        colorChanged = ImGui::ColorEdit3(cosmeticOption.label.c_str(), (float*)&cosmeticOption.currentColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
-    }
-    if (colorChanged) {
-        Color_RGBA8 color;
-        color.r = static_cast<uint8_t>(cosmeticOption.currentColor.x * 255.0f);
-        color.g = static_cast<uint8_t>(cosmeticOption.currentColor.y * 255.0f);
-        color.b = static_cast<uint8_t>(cosmeticOption.currentColor.z * 255.0f);
-        color.a = static_cast<uint8_t>(cosmeticOption.currentColor.w * 255.0f);
-
-        CVarSetColor(cosmeticOption.cvar, color);
+    if (UIWidgets::CVarColorPicker(cosmeticOption.label.c_str(), cosmeticOption.cvar, cosmeticOption.defaultColor,
+                                   cosmeticOption.supportsAlpha, 0, THEME_COLOR)) {
         CVarSetInteger((cosmeticOption.rainbowCvar), 0);
         CVarSetInteger((cosmeticOption.changedCvar), 1);
         ApplySideEffects(cosmeticOption);
         ApplyOrResetCustomGfxPatches();
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
-    ImGui::SameLine();
-    ImGui::Text("%s", cosmeticOption.label.c_str());
-    //the longest option name
-    ImGui::SameLine((ImGui::CalcTextSize("Message Light Blue (None No Shadow) Color").x * 1.0f) + 60.0f);
-    if (ImGui::Button(("Random##" + cosmeticOption.label).c_str())) {
+    // the longest option name
+    ImGui::SameLine((ImGui::CalcTextSize("Message Light Blue (None No Shadow)").x * 1.0f) + 60.0f);
+    if (UIWidgets::Button(
+            ("Random##" + cosmeticOption.label).c_str(),
+            UIWidgets::ButtonOptions().Size(ImVec2(80, 31)).Padding(ImVec2(2.0f, 0.0f)).Color(THEME_COLOR))) {
         RandomizeColor(cosmeticOption);
         ApplyOrResetCustomGfxPatches();
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
     if (cosmeticOption.supportsRainbow) {
         ImGui::SameLine();
-        bool isRainbow = (bool)CVarGetInteger((cosmeticOption.rainbowCvar), 0);
-        if (ImGui::Checkbox(("Rainbow##" + cosmeticOption.label).c_str(), &isRainbow)) {
-            CVarSetInteger((cosmeticOption.rainbowCvar), isRainbow);
+        if (UIWidgets::CVarCheckbox(("Rainbow##" + cosmeticOption.label).c_str(), cosmeticOption.rainbowCvar,
+                                    UIWidgets::CheckboxOptions().Color(THEME_COLOR))) {
             CVarSetInteger((cosmeticOption.changedCvar), 1);
             ApplySideEffects(cosmeticOption);
             ApplyOrResetCustomGfxPatches();
@@ -1750,14 +2210,14 @@ void DrawCosmeticRow(CosmeticOption& cosmeticOption) {
         }
     }
     ImGui::SameLine();
-    bool isLocked = (bool)CVarGetInteger((cosmeticOption.lockedCvar), 0);
-    if (ImGui::Checkbox(("Locked##" + cosmeticOption.label).c_str(), &isLocked)) {
-        CVarSetInteger((cosmeticOption.lockedCvar), isLocked);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
+
+    UIWidgets::CVarCheckbox(("Locked##" + cosmeticOption.label).c_str(), cosmeticOption.lockedCvar,
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+
     if (CVarGetInteger((cosmeticOption.changedCvar), 0)) {
         ImGui::SameLine();
-        if (ImGui::Button(("Reset##" + cosmeticOption.label).c_str())) {
+        if (UIWidgets::Button(("Reset##" + cosmeticOption.label).c_str(),
+                              UIWidgets::ButtonOptions().Size(ImVec2(80, 31)).Padding(ImVec2(2.0f, 0.0f)))) {
             ResetColor(cosmeticOption);
             ApplyOrResetCustomGfxPatches();
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
@@ -1769,32 +2229,37 @@ void DrawCosmeticGroup(CosmeticGroup cosmeticGroup) {
     std::string label = groupLabels.at(cosmeticGroup);
     ImGui::Text("%s", label.c_str());
     // the longest option name
-    ImGui::SameLine((ImGui::CalcTextSize("Message Light Blue (None No Shadow) Color").x * 1.0f) + 60.0f);
-    if (ImGui::Button(("Random##" + label).c_str())) {
+    ImGui::SameLine((ImGui::CalcTextSize("Message Light Blue (None No Shadow)").x * 1.0f) + 60.0f);
+    if (UIWidgets::Button(
+            ("Random##" + label).c_str(),
+            UIWidgets::ButtonOptions().Size(ImVec2(80, 31)).Padding(ImVec2(2.0f, 0.0f)).Color(THEME_COLOR))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
-            if (cosmeticOption.group == cosmeticGroup && (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) && !CVarGetInteger(cosmeticOption.lockedCvar, 0)) {
+            if (cosmeticOption.group == cosmeticGroup &&
+                (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) &&
+                !CVarGetInteger(cosmeticOption.lockedCvar, 0)) {
                 RandomizeColor(cosmeticOption);
             }
         }
         ApplyOrResetCustomGfxPatches();
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
     ImGui::SameLine();
-    if (ImGui::Button(("Reset##" + label).c_str())) {
+    if (UIWidgets::Button(("Reset##" + label).c_str(),
+                          UIWidgets::ButtonOptions().Size(ImVec2(80, 31)).Padding(ImVec2(2.0f, 0.0f)))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
             if (cosmeticOption.group == cosmeticGroup && !CVarGetInteger(cosmeticOption.lockedCvar, 0)) {
                 ResetColor(cosmeticOption);
             }
         }
         ApplyOrResetCustomGfxPatches();
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
+    UIWidgets::Spacer();
     for (auto& [id, cosmeticOption] : cosmeticOptions) {
-        if (cosmeticOption.group == cosmeticGroup && (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0))) {
+        if (cosmeticOption.group == cosmeticGroup &&
+            (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0))) {
             DrawCosmeticRow(cosmeticOption);
         }
     }
-    UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+    UIWidgets::Separator(true, true, 2.0f, 2.0f);
 }
 
 static const char* colorSchemes[2] = {
@@ -1807,193 +2272,199 @@ void CosmeticsEditorWindow::ApplyDungeonKeyColors() {
     ResetColor(cosmeticOptions.at("Key.KeyringRing"));
 
     // Forest Temple
-    CVarSetColor(cosmeticOptions["Key.ForestSmallBody"].cvar, { 4, 195, 46, 255 });
+    CVarSetColor(cosmeticOptions["Key.ForestSmallBody"].valuesCvar, { 4, 195, 46, 255 });
     CVarSetInteger(cosmeticOptions["Key.ForestSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.ForestSmallBody"].currentColor = { 4 / 255.0f, 195 / 255.0f, 46 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.ForestSmallEmblem"));
 
     ResetColor(cosmeticOptions.at("Key.ForestBossBody"));
-    CVarSetColor(cosmeticOptions["Key.ForestBossGem"].cvar, { 0, 255, 0, 255 });
+    CVarSetColor(cosmeticOptions["Key.ForestBossGem"].valuesCvar, { 0, 255, 0, 255 });
     CVarSetInteger(cosmeticOptions["Key.ForestBossGem"].changedCvar, 1);
     cosmeticOptions["Key.ForestBossGem"].currentColor = { 0, 255 / 255.0f, 0, 255 / 255.0f };
 
     // Fire Temple
-    CVarSetColor(cosmeticOptions["Key.FireSmallBody"].cvar, { 237, 95, 95, 255 });
+    CVarSetColor(cosmeticOptions["Key.FireSmallBody"].valuesCvar, { 237, 95, 95, 255 });
     CVarSetInteger(cosmeticOptions["Key.FireSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.FireSmallBody"].currentColor = { 237 / 255.0f, 95 / 255.0f, 95 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.FireSmallEmblem"));
 
     ResetColor(cosmeticOptions.at("Key.FireBossBody"));
-    CVarSetColor(cosmeticOptions["Key.FireBossGem"].cvar, { 255, 30, 0, 255 });
+    CVarSetColor(cosmeticOptions["Key.FireBossGem"].valuesCvar, { 255, 30, 0, 255 });
     CVarSetInteger(cosmeticOptions["Key.FireBossGem"].changedCvar, 1);
     cosmeticOptions["Key.FireBossGem"].currentColor = { 255 / 255.0f, 30 / 255.0f, 0, 255 / 255.0f };
 
     // Water Temple
-    CVarSetColor(cosmeticOptions["Key.WaterSmallBody"].cvar, { 85, 180, 223, 255 });
+    CVarSetColor(cosmeticOptions["Key.WaterSmallBody"].valuesCvar, { 85, 180, 223, 255 });
     CVarSetInteger(cosmeticOptions["Key.WaterSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.WaterSmallBody"].currentColor = { 85 / 255.0f, 180 / 255.0f, 223 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.WaterSmallEmblem"));
 
     ResetColor(cosmeticOptions.at("Key.WaterBossBody"));
-    CVarSetColor(cosmeticOptions["Key.WaterBossGem"].cvar, { 0, 137, 255, 255 });
+    CVarSetColor(cosmeticOptions["Key.WaterBossGem"].valuesCvar, { 0, 137, 255, 255 });
     CVarSetInteger(cosmeticOptions["Key.WaterBossGem"].changedCvar, 1);
     cosmeticOptions["Key.WaterBossGem"].currentColor = { 0, 137 / 255.0f, 255 / 255.0f, 255 / 255.0f };
 
     // Spirit Temple
-    CVarSetColor(cosmeticOptions["Key.SpiritSmallBody"].cvar, { 222, 158, 47, 255 });
+    CVarSetColor(cosmeticOptions["Key.SpiritSmallBody"].valuesCvar, { 222, 158, 47, 255 });
     CVarSetInteger(cosmeticOptions["Key.SpiritSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.SpiritSmallBody"].currentColor = { 222 / 255.0f, 158 / 255.0f, 47 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.SpiritSmallEmblem"));
 
     ResetColor(cosmeticOptions.at("Key.SpiritBossBody"));
-    CVarSetColor(cosmeticOptions["Key.SpiritBossGem"].cvar, { 255, 85, 0, 255 });
+    CVarSetColor(cosmeticOptions["Key.SpiritBossGem"].valuesCvar, { 255, 85, 0, 255 });
     CVarSetInteger(cosmeticOptions["Key.SpiritBossGem"].changedCvar, 1);
     cosmeticOptions["Key.SpiritBossGem"].currentColor = { 255 / 255.0f, 85 / 255.0f, 0, 255 / 255.0f };
 
     // Shadow Temple
-    CVarSetColor(cosmeticOptions["Key.ShadowSmallBody"].cvar, { 126, 16, 177, 255 });
+    CVarSetColor(cosmeticOptions["Key.ShadowSmallBody"].valuesCvar, { 126, 16, 177, 255 });
     CVarSetInteger(cosmeticOptions["Key.ShadowSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.ShadowSmallBody"].currentColor = { 126 / 255.0f, 16 / 255.0f, 177 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.ShadowSmallEmblem"));
 
     ResetColor(cosmeticOptions.at("Key.ShadowBossBody"));
-    CVarSetColor(cosmeticOptions["Key.ShadowBossGem"].cvar, { 153, 0, 255, 255 });
+    CVarSetColor(cosmeticOptions["Key.ShadowBossGem"].valuesCvar, { 153, 0, 255, 255 });
     CVarSetInteger(cosmeticOptions["Key.ShadowBossGem"].changedCvar, 1);
     cosmeticOptions["Key.ShadowBossGem"].currentColor = { 153 / 255.0f, 0, 255 / 255.0f, 255 / 255.0f };
 
     // Ganon's Tower
-    CVarSetColor(cosmeticOptions["Key.GanonsSmallBody"].cvar, { 80, 80, 80, 255 });
+    CVarSetColor(cosmeticOptions["Key.GanonsSmallBody"].valuesCvar, { 80, 80, 80, 255 });
     CVarSetInteger(cosmeticOptions["Key.GanonsSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.GanonsSmallBody"].currentColor = { 80 / 255.0f, 80 / 255.0f, 80 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.GanonsSmallEmblem"));
 
-    CVarSetColor(cosmeticOptions["Key.GanonsBossBody"].cvar, { 80, 80, 80, 255 });
+    CVarSetColor(cosmeticOptions["Key.GanonsBossBody"].valuesCvar, { 80, 80, 80, 255 });
     CVarSetInteger(cosmeticOptions["Key.GanonsBossBody"].changedCvar, 1);
     cosmeticOptions["Key.GanonsBossBody"].currentColor = { 80 / 255.0f, 80 / 255.0f, 80 / 255.0f, 255 / 255.0f };
-    CVarSetColor(cosmeticOptions["Key.GanonsBossGem"].cvar, { 255, 0, 0, 255 });
+    CVarSetColor(cosmeticOptions["Key.GanonsBossGem"].valuesCvar, { 255, 0, 0, 255 });
     CVarSetInteger(cosmeticOptions["Key.GanonsBossGem"].changedCvar, 1);
     cosmeticOptions["Key.GanonsBossGem"].currentColor = { 255 / 255.0f, 0, 0, 255 / 255.0f };
 
     // Bottom of the Well
-    CVarSetColor(cosmeticOptions["Key.WellSmallBody"].cvar, { 227, 110, 255, 255 });
+    CVarSetColor(cosmeticOptions["Key.WellSmallBody"].valuesCvar, { 227, 110, 255, 255 });
     CVarSetInteger(cosmeticOptions["Key.WellSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.WellSmallBody"].currentColor = { 227 / 255.0f, 110 / 255.0f, 255 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.WellSmallEmblem"));
 
     // Gerudo Training Ground
-    CVarSetColor(cosmeticOptions["Key.GTGSmallBody"].cvar, { 221, 212, 60, 255 });
+    CVarSetColor(cosmeticOptions["Key.GTGSmallBody"].valuesCvar, { 221, 212, 60, 255 });
     CVarSetInteger(cosmeticOptions["Key.GTGSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.GTGSmallBody"].currentColor = { 221 / 255.0f, 212 / 255.0f, 60 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.GTGSmallEmblem"));
 
     // Gerudo Fortress
-    CVarSetColor(cosmeticOptions["Key.FortSmallBody"].cvar, { 255, 255, 255, 255 });
+    CVarSetColor(cosmeticOptions["Key.FortSmallBody"].valuesCvar, { 255, 255, 255, 255 });
     CVarSetInteger(cosmeticOptions["Key.FortSmallBody"].changedCvar, 1);
     cosmeticOptions["Key.FortSmallBody"].currentColor = { 255 / 255.0f, 255 / 255.0f, 255 / 255.0f, 255 / 255.0f };
     ResetColor(cosmeticOptions.at("Key.FortSmallEmblem"));
 }
 
 void CosmeticsEditorWindow::DrawElement() {
-    ImGui::Text("Color Scheme");
-    ImGui::SameLine();
-    UIWidgets::EnhancementCombobox(CVAR_COSMETIC("DefaultColorScheme"), colorSchemes, COLORSCHEME_N64);
-    UIWidgets::EnhancementCheckbox("Advanced Mode", CVAR_COSMETIC("AdvancedMode"));
-    UIWidgets::InsertHelpHoverText(
-        "Some cosmetic options may not apply if you have any mods that provide custom models for the cosmetic option.\n\n"
-        "For example, if you have custom Link model, then the Link's Hair color option will most likely not apply."
-    );
-
+    UIWidgets::CVarCombobox("Color Scheme", CVAR_COSMETIC("DefaultColorScheme"), colorSchemes,
+                            UIWidgets::ComboboxOptions()
+                                .DefaultIndex(COLORSCHEME_N64)
+                                .Color(THEME_COLOR)
+                                .LabelPosition(UIWidgets::LabelPositions::Near)
+                                .ComponentAlignment(UIWidgets::ComponentAlignments::Right));
+    UIWidgets::CVarCheckbox("Sync Rainbow colors", CVAR_COSMETIC("RainbowSync"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+    UIWidgets::CVarSliderFloat("Rainbow Speed", CVAR_COSMETIC("RainbowSpeed"),
+                               UIWidgets::FloatSliderOptions()
+                                   .Format("%.2f")
+                                   .Min(0.01f)
+                                   .Max(1.0f)
+                                   .DefaultValue(0.6f)
+                                   .Step(0.01f)
+                                   .Size(ImVec2(300.0f, 0.0f))
+                                   .Color(THEME_COLOR));
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    UIWidgets::CVarCheckbox("Randomize All on New Scene", CVAR_COSMETIC("RandomizeAllOnNewScene"),
+                            UIWidgets::CheckboxOptions()
+                                .Color(THEME_COLOR)
+                                .Tooltip("Enables randomizing all unlocked cosmetics when you enter a new scene."));
+    ImGui::EndDisabled();
+    UIWidgets::CVarCheckbox(
+        "Advanced Mode", CVAR_COSMETIC("AdvancedMode"),
+        UIWidgets::CheckboxOptions()
+            .Color(THEME_COLOR)
+            .Tooltip(
+                "Some cosmetic options may not apply if you have any mods that provide custom models for the cosmetic "
+                "option.\n\n"
+                "For example, if you have custom Link model, then the Link's Hair color option will most likely not "
+                "apply."));
     if (CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) {
-        if (ImGui::Button("Lock All Advanced", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) {
+        if (UIWidgets::Button("Lock All Advanced",
+                              UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
             for (auto& [id, cosmeticOption] : cosmeticOptions) {
                 if (cosmeticOption.advancedOption) {
                     CVarSetInteger(cosmeticOption.lockedCvar, 1);
                 }
             }
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         }
         ImGui::SameLine();
-        if (ImGui::Button("Unlock All Advanced", ImVec2(ImGui::GetContentRegionAvail().x, 30.0f))) {
+        if (UIWidgets::Button("Unlock All Advanced",
+                              UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
             for (auto& [id, cosmeticOption] : cosmeticOptions) {
                 if (cosmeticOption.advancedOption) {
                     CVarSetInteger(cosmeticOption.lockedCvar, 0);
                 }
             }
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         }
     }
-    UIWidgets::EnhancementCheckbox("Sync Rainbow colors", CVAR_COSMETIC("RainbowSync"));
-    UIWidgets::EnhancementSliderFloat("Rainbow Speed: %.3f", "##rainbowSpeed", CVAR_COSMETIC("RainbowSpeed"), 0.03f, 1.0f, "", 0.6f, false, true);
-    UIWidgets::EnhancementCheckbox("Randomize All on New Scene", CVAR_COSMETIC("RandomizeAllOnNewScene"));
-    UIWidgets::Tooltip("Enables randomizing all unlocked cosmetics when you enter a new scene.");
-
-    if (ImGui::Button("Randomize All", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    if (UIWidgets::Button("Randomize All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
         CosmeticsEditor_RandomizeAll();
     }
-    ImGui::SameLine();
-    if (ImGui::Button("Reset All", ImVec2(ImGui::GetContentRegionAvail().x, 30.0f))) {
-        for (auto& [id, cosmeticOption] : cosmeticOptions) {
-            if (!CVarGetInteger(cosmeticOption.lockedCvar, 0)) {
-                ResetColor(cosmeticOption);
-            }
-        }
-        ApplyOrResetCustomGfxPatches();
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
+    ImGui::EndDisabled();
 
-    if (ImGui::Button("Lock All", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) {
+    ImGui::SameLine();
+    if (UIWidgets::Button("Reset All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
+        CosmeticsEditor_ResetAll();
+    }
+    if (UIWidgets::Button("Lock All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
             if (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) {
                 CVarSetInteger(cosmeticOption.lockedCvar, 1);
             }
         }
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
     ImGui::SameLine();
-    if (ImGui::Button("Unlock All", ImVec2(ImGui::GetContentRegionAvail().x, 30.0f))) {
+    if (UIWidgets::Button("Unlock All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
             if (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) {
                 CVarSetInteger(cosmeticOption.lockedCvar, 0);
             }
         }
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 
-    if (ImGui::Button("Rainbow All", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    if (UIWidgets::Button("Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
-            if (
-                !CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
-                (
-                    !cosmeticOption.advancedOption ||
-                    CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)
-                )
-            ) {
+            if (!CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
+                (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0))) {
                 CVarSetInteger(cosmeticOption.rainbowCvar, 1);
                 CVarSetInteger(cosmeticOption.changedCvar, 1);
             }
         }
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
+    ImGui::EndDisabled();
+
     ImGui::SameLine();
-    if (ImGui::Button("Un-Rainbow All", ImVec2(ImGui::GetContentRegionAvail().x, 30.0f))) {
+    if (UIWidgets::Button("Un-Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
         for (auto& [id, cosmeticOption] : cosmeticOptions) {
-            if (
-                !CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
-                (
-                    !cosmeticOption.advancedOption ||
-                    CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)
-                )
-            ) {
+            if (!CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
+                (!cosmeticOption.advancedOption || CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0))) {
                 CVarSetInteger(cosmeticOption.rainbowCvar, 0);
             }
         }
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 
+    UIWidgets::Spacer(3.0f);
+
+    UIWidgets::PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("CosmeticsContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
         if (ImGui::BeginTabItem("Link & Items")) {
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             DrawCosmeticGroup(COSMETICS_GROUP_LINK);
             DrawCosmeticGroup(COSMETICS_GROUP_GLOVES);
@@ -2006,47 +2477,56 @@ void CosmeticsEditorWindow::DrawElement() {
 
         if (ImGui::BeginTabItem("Keys")) {
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
-            if (ImGui::Button("Give all keys dungeon-specific colors", ImVec2(300.0f, 30.0f))) {
+            if (UIWidgets::Button("Give all keys dungeon-specific colors",
+                                  UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
                 ApplyDungeonKeyColors();
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             }
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             DrawCosmeticGroup(COSMETICS_GROUP_KEYRING);
             DrawCosmeticGroup(COSMETICS_GROUP_SMALL_KEYS);
             DrawCosmeticGroup(COSMETICS_GROUP_BOSS_KEYS);
 
+            ImGui::EndDisabled();
             ImGui::EndTabItem();
         }
 
         if (ImGui::BeginTabItem("Effects")) {
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             DrawCosmeticGroup(COSMETICS_GROUP_MAGIC);
             DrawCosmeticGroup(COSMETICS_GROUP_ARROWS);
             DrawCosmeticGroup(COSMETICS_GROUP_SPIN_ATTACK);
             DrawCosmeticGroup(COSMETICS_GROUP_TRAILS);
-            if (UIWidgets::EnhancementSliderInt("Trails Duration: %d", "##Trails_Duration", CVAR_COSMETIC("Trails.Duration.Value"), 2, 20, "", 4)) {
+            if (UIWidgets::CVarSliderInt("Trails Duration: %d", CVAR_COSMETIC("Trails.Duration.Value"),
+                                         UIWidgets::IntSliderOptions()
+                                             .Min(2)
+                                             .Max(20)
+                                             .DefaultValue(4)
+                                             .Size(ImVec2(300.0f, 0.0f))
+                                             .Color(THEME_COLOR))) {
                 CVarSetInteger(CVAR_COSMETIC("Trails.Duration.Changed"), 1);
             }
             ImGui::SameLine();
-            if (ImGui::Button("Reset##Trails_Duration")) {
+            ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (ImGui::CalcTextSize("g").y * 2));
+            if (UIWidgets::Button("Reset##Trails_Duration",
+                                  UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
                 CVarClear(CVAR_COSMETIC("Trails.Duration.Value"));
                 CVarClear(CVAR_COSMETIC("Trails.Duration.Changed"));
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             }
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             ImGui::EndTabItem();
         }
         if (ImGui::BeginTabItem("World & NPCs")) {
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             DrawCosmeticGroup(COSMETICS_GROUP_WORLD);
             DrawCosmeticGroup(COSMETICS_GROUP_NAVI);
@@ -2060,7 +2540,7 @@ void CosmeticsEditorWindow::DrawElement() {
         }
         if (ImGui::BeginTabItem("HUD")) {
 
-            UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
+            UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
             DrawCosmeticGroup(COSMETICS_GROUP_HUD);
             DrawCosmeticGroup(COSMETICS_GROUP_TITLE);
@@ -2074,6 +2554,7 @@ void CosmeticsEditorWindow::DrawElement() {
 
         if (CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) {
             if (ImGui::BeginTabItem("Pause Menu")) {
+                UIWidgets::Separator(true, true, 2.0f, 2.0f);
                 DrawCosmeticGroup(COSMETICS_GROUP_KALEIDO);
                 ImGui::EndTabItem();
             }
@@ -2081,24 +2562,23 @@ void CosmeticsEditorWindow::DrawElement() {
 
         if (CVarGetInteger(CVAR_COSMETIC("AdvancedMode"), 0)) {
             if (ImGui::BeginTabItem("Message")) {
+                UIWidgets::Separator(true, true, 2.0f, 2.0f);
                 DrawCosmeticGroup(COSMETICS_GROUP_MESSAGE);
                 ImGui::EndTabItem();
             }
         }
         ImGui::EndTabBar();
     }
+    UIWidgets::PopStyleTabs();
 }
 
 void RegisterOnLoadGameHook() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
-        ApplyOrResetCustomGfxPatches();
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(
+        [](int32_t fileNum) { ApplyOrResetCustomGfxPatches(); });
 }
 
 void RegisterOnGameFrameUpdateHook() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        CosmeticsUpdateTick();
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() { CosmeticsUpdateTick(); });
 }
 
 void Cosmetics_RegisterOnSceneInitHook() {
@@ -2112,8 +2592,9 @@ void Cosmetics_RegisterOnSceneInitHook() {
 void CosmeticsEditorWindow::InitElement() {
     // Convert the `current color` into the format that the ImGui color picker expects
     for (auto& [id, cosmeticOption] : cosmeticOptions) {
-        Color_RGBA8 defaultColor = {cosmeticOption.defaultColor.r, cosmeticOption.defaultColor.g, cosmeticOption.defaultColor.b, cosmeticOption.defaultColor.a};
-        Color_RGBA8 cvarColor = CVarGetColor(cosmeticOption.cvar, defaultColor);
+        Color_RGBA8 defaultColor = { cosmeticOption.defaultColor.r, cosmeticOption.defaultColor.g,
+                                     cosmeticOption.defaultColor.b, cosmeticOption.defaultColor.a };
+        Color_RGBA8 cvarColor = CVarGetColor(cosmeticOption.valuesCvar, defaultColor);
 
         cosmeticOption.currentColor.x = cvarColor.r / 255.0f;
         cosmeticOption.currentColor.y = cvarColor.g / 255.0f;
diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h
index c9a28ef295..e10583081d 100644
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.h
@@ -1,8 +1,9 @@
 #pragma once
 #include <libultraship/libultraship.h>
 
-// Not to be confused with tabs, groups are 1:1 with the boxes shown in the UI, grouping them allows us to reset/randomize
-// every item in a group at once. If you are looking for tabs they are rendered manually in ImGui in `DrawCosmeticsEditor`
+// Not to be confused with tabs, groups are 1:1 with the boxes shown in the UI, grouping them allows us to
+// reset/randomize every item in a group at once. If you are looking for tabs they are rendered manually in ImGui in
+// `DrawCosmeticsEditor`
 typedef enum {
     COSMETICS_GROUP_LINK,
     COSMETICS_GROUP_MIRRORSHIELD,
@@ -25,14 +26,14 @@ typedef enum {
     COSMETICS_GROUP_NAVI,
     COSMETICS_GROUP_IVAN,
     COSMETICS_GROUP_MESSAGE,
-    COSMETICS_GROUP_MAX
+    COSMETICS_GROUP_MAX,
 } CosmeticGroup;
 
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
 
-    Color_RGBA8 CosmeticsEditor_GetDefaultValue(const char* id);
+Color_RGBA8 CosmeticsEditor_GetDefaultValue(const char* id);
 
 #ifdef __cplusplus
 }
@@ -50,22 +51,22 @@ typedef struct {
 
 static float TablesCellsWidth = 300.0f;
 static ImGuiTableColumnFlags FlagsTable = ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV;
-static ImGuiTableColumnFlags FlagsCell = ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort;
+static ImGuiTableColumnFlags FlagsCell =
+    ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort;
 
-ImVec4 GetRandomValue();
 void CosmeticsEditor_RandomizeAll();
 void CosmeticsEditor_RandomizeGroup(CosmeticGroup group);
 void CosmeticsEditor_ResetAll();
 void CosmeticsEditor_ResetGroup(CosmeticGroup group);
 void ApplyOrResetCustomGfxPatches(bool manualChange = true);
 
-class CosmeticsEditorWindow : public Ship::GuiWindow {
+class CosmeticsEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
     void ApplyDungeonKeyColors();
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 #endif //__cplusplus
\ No newline at end of file
diff --git a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
index 2d750ab5d0..029284fa40 100644
--- a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
+++ b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
@@ -68,9 +68,10 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
     gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
     gDPSetRenderMode(POLY_OPA_DISP++, G_RM_XLU_SURF2, G_RM_OPA_CI | CVG_DST_WRAP);
     gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, ENVIRONMENT,
-        COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
+                      COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
     if (CVarGetInteger(CVAR_COSMETIC("Title.NintendoLogo.Changed"), 0)) {
-        Color_RGB8 nintendoLogoColor = CVarGetColor24(CVAR_COSMETIC("Title.NintendoLogo.Value"), Color_RGB8{0, 0, 255});
+        Color_RGB8 nintendoLogoColor =
+            CVarGetColor24(CVAR_COSMETIC("Title.NintendoLogo.Value"), Color_RGB8{ 0, 0, 255 });
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
         gDPSetEnvColor(POLY_OPA_DISP++, nintendoLogoColor.r, nintendoLogoColor.g, nintendoLogoColor.b, 128);
     } else {
@@ -79,16 +80,16 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
     }
 
     gDPLoadMultiBlock(POLY_OPA_DISP++, nintendo_rogo_static_Tex_001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
-        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11);
+                      G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11);
 
-    for (idx = 0, y = 94; idx < 16; idx++, y += 2)
-    {
-        gDPLoadMultiTile(POLY_OPA_DISP++, (logoToDraw == LOGO_TO_DRAW_N64) ? nintendo_rogo_static_Tex_000000 : nintendo_rogo_static_Tex_LUS_000000, 0, G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b, 192, 32,
-                         0, idx * 2, 192 - 1, (idx + 1) * 2 - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                         G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-        
-        gDPSetTileSize(POLY_OPA_DISP++, 0, 0, 0, (192 - 1) << G_TEXTURE_IMAGE_FRAC,
-                       (2 - 1) << G_TEXTURE_IMAGE_FRAC);
+    for (idx = 0, y = 94; idx < 16; idx++, y += 2) {
+        gDPLoadMultiTile(
+            POLY_OPA_DISP++,
+            (logoToDraw == LOGO_TO_DRAW_N64) ? nintendo_rogo_static_Tex_000000 : nintendo_rogo_static_Tex_LUS_000000, 0,
+            G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b, 192, 32, 0, idx * 2, 192 - 1, (idx + 1) * 2 - 1, 0,
+            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+        gDPSetTileSize(POLY_OPA_DISP++, 0, 0, 0, (192 - 1) << G_TEXTURE_IMAGE_FRAC, (2 - 1) << G_TEXTURE_IMAGE_FRAC);
 
         gDPSetTileSize(POLY_OPA_DISP++, 1, titleContext->uls, (titleContext->ult & 0x7F) - idx * 4, 0, 0);
         gSPTextureRectangle(POLY_OPA_DISP++, 388, y << 2, 1156, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
@@ -99,13 +100,13 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
         f32 scale = 0.4f;
 
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                    (uintptr_t)Gfx_TwoTexScroll(titleContext->state.gfxCtx, 0, 0, (0 - 1) % 128, 32, 32, 1,
-                                    0, (1 * -2) % 128, 32, 32));
+                   (uintptr_t)Gfx_TwoTexScroll(titleContext->state.gfxCtx, 0, 0, (0 - 1) % 128, 32, 32, 1, 0,
+                                               (1 * -2) % 128, 32, 32));
 
         Matrix_Translate(0.0f, -10.0f, 0.0f, MTXMODE_APPLY);
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(titleContext->state.gfxCtx),
-                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 50, 100, 255);
         gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gEffIceFragment3DL);
     }
@@ -117,7 +118,7 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
     CLOSE_DISPS(titleContext->state.gfxCtx);
 }
 
-#define CVAR_BOOTSEQUENCE_NAME CVAR_ENHANCEMENT("BootSequence")
+#define CVAR_BOOTSEQUENCE_NAME CVAR_SETTING("BootSequence")
 #define CVAR_BOOTSEQUENCE_DEFAULT BOOTSEQUENCE_DEFAULT
 #define CVAR_BOOTSEQUENCE_VALUE CVarGetInteger(CVAR_BOOTSEQUENCE_NAME, CVAR_BOOTSEQUENCE_DEFAULT)
 
@@ -150,7 +151,7 @@ extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
         gSaveContext.natureAmbienceId = 0xFF;
         gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN;
         titleContext->state.running = false;
-        
+
         logosSeen++;
 
         if (CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_DEFAULT && logosSeen == 1) {
@@ -171,7 +172,7 @@ extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
 
 // // // //
 // Always
-// 
+//
 
 void OnZTitleInitReplaceTitleMainWithCustom(void* gameState) {
     TitleContext* titleContext = (TitleContext*)gameState;
@@ -198,7 +199,7 @@ static RegisterShipInitFunc initFuncAlways(RegisterCustomLogoTitle);
 
 // // // // // //
 // Bootsequence
-// 
+//
 
 void OnZTitleUpdateSkipToFileSelect(void* gameState) {
     TitleContext* titleContext = (TitleContext*)gameState;
@@ -219,7 +220,7 @@ static RegisterShipInitFunc initFuncBootsequence(RegisterCustomLogoTitleBootsequ
 
 // // // // // //
 // Let it Snow
-// 
+//
 
 #define CVAR_LETITSNOW_NAME CVAR_GENERAL("LetItSnow")
 #define CVAR_LETITSNOW_DEFAULT 0
diff --git a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
index 4d4b267159..be011c675b 100644
--- a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
+++ b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
@@ -19,10 +19,10 @@ void UpdateNoMSPatch() {
     bool shouldPatch = (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER &&
                         gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS &&
                         gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE &&
-                        (gSaveContext.equips.buttonItems[0] != ITEM_FISHING_POLE || 
-                        (!CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) &&
-                            !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) &&
-                            !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE))));
+                        (gSaveContext.equips.buttonItems[0] != ITEM_FISHING_POLE ||
+                         (!CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) &&
+                          !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) &&
+                          !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE))));
 
     if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) && shouldPatch) {
         // Patching if conditions are met
@@ -38,9 +38,12 @@ void UpdateNoMSPatch() {
             std::string patchName = "adultNoMS." + std::to_string(3) + "." + std::to_string(i);
             ResourceMgr_PatchGfxByName(gLinkAdultMirrorShieldSwordAndSheathFarDL, patchName.c_str(), i, gsDPNoOp());
         }
-        ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathNearDL, "adultNoMSHylianShield1", 75, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathFarDL, "adultNoMSHylianShield2", 71, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultMasterSwordAndSheathNearDL, "adultNoMasterSword1", 2, gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathNearDL, "adultNoMSHylianShield1", 75,
+                                   gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathFarDL, "adultNoMSHylianShield2", 71,
+                                   gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultMasterSwordAndSheathNearDL, "adultNoMasterSword1", 2,
+                                   gsSPEndDisplayList());
         ResourceMgr_PatchGfxByName(gLinkAdultMasterSwordAndSheathFarDL, "adultNoMasterSword2", 2, gsSPEndDisplayList());
     } else {
         // Unpatching if conditions are not met
@@ -80,26 +83,27 @@ void RegisterNoMasterSword() {
             *should = false;
         }
     });
-    
+
     // skip post pedestal animation when we don't have a master sword
     COND_VB_SHOULD(VB_EXECUTE_PLAYER_STARTMODE_FUNC, IS_RANDO && MASTER_SWORD_SHUFFLED, {
         int32_t startMode = va_arg(args, int32_t);
         Player* player = GET_PLAYER(gPlayState);
 
-        if (startMode == PLAYER_START_MODE_TIME_TRAVEL && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+        if (startMode == PLAYER_START_MODE_TIME_TRAVEL &&
+            !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
             // don't run the vanilla startMode func
             *should = false;
-            
+
             // position link correctly
             Math_Vec3f_Copy(&player->actor.world.pos, &D_808546F4);
             player->yaw = player->actor.shape.rot.y = -0x8000;
-            
+
             // execute the idle startMode func
             Player_StartMode_Idle(gPlayState, player);
         }
     });
 
-    COND_HOOK(OnPlayerUpdate, IS_RANDO, []{
+    COND_HOOK(OnPlayerUpdate, IS_RANDO, [] {
         static uint16_t lastItemOnB = gSaveContext.equips.buttonItems[0];
         if (lastItemOnB != gSaveContext.equips.buttonItems[0]) {
             UpdateNoMSPatch();
diff --git a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
new file mode 100644
index 0000000000..d33f4f7e8e
--- /dev/null
+++ b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
@@ -0,0 +1,20 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+#include "z64save.h"
+
+extern "C" SaveContext gSaveContext;
+
+static constexpr int32_t CVAR_TIMEFLOWFILESELECT_DEFAULT = 0;
+#define CVAR_TIMEFLOWFILESELECT_NAME CVAR_ENHANCEMENT("TimeFlowFileSelect")
+#define CVAR_TIMEFLOWFILESELECT_VALUE CVarGetInteger(CVAR_TIMEFLOWFILESELECT_NAME, CVAR_TIMEFLOWFILESELECT_DEFAULT)
+
+void OnFileChooseMainTimeFlowFileSelect(void* gameState) {
+    gSaveContext.skyboxTime += 0x10;
+}
+
+void RegisterTimeFlowFileSelect() {
+    COND_HOOK(OnFileChooseMain, CVAR_TIMEFLOWFILESELECT_VALUE, OnFileChooseMainTimeFlowFileSelect);
+}
+
+static RegisterShipInitFunc initFunc_TimeFlowFileSelect(RegisterTimeFlowFileSelect, { CVAR_TIMEFLOWFILESELECT_NAME });
diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
index 75f6bd35d3..b2b473166d 100644
--- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
+++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
@@ -18,125 +18,212 @@ typedef struct {
     int startInstruction;
 } DListPatchInfo;
 
-static DListPatchInfo freezardEffectDListPatchInfos[] = {
-    { gFreezardIntactDL, 5 },
-    { gFreezardTopRightHornChippedDL, 5 },
-    { gFreezardHeadChippedDL, 5 },
-    { gFreezardIceTriangleDL, 5 },
+static DListPatchInfo freezardBodyDListPatchInfos[] = {
+    { gFreezardIntactDL, 5 },      { gFreezardTopRightHornChippedDL, 5 },
+    { gFreezardHeadChippedDL, 5 }, { gFreezardIceTriangleDL, 5 },
     { gFreezardIceRockDL, 5 },
 };
 
 static DListPatchInfo ironKnuckleDListPatchInfos[] = {
+    // VambraceLeft
     { object_ik_DL_01BE98, 39 },
     { object_ik_DL_01BE98, 59 },
 
+    // ArmLeft
     { object_ik_DL_01C130, 38 },
 
+    // VambraceRight
     { object_ik_DL_01C2B8, 39 },
     { object_ik_DL_01C2B8, 59 },
 
+    // ArmRight
     { object_ik_DL_01C550, 38 },
 
+    // Waist
     { object_ik_DL_01C7B8, 8 },
     { object_ik_DL_01C7B8, 28 },
 
+    // PauldronLeft
     { object_ik_DL_01CB58, 8 },
     { object_ik_DL_01CB58, 31 },
 
+    // BootTipLeft
     { object_ik_DL_01CCA0, 15 },
     { object_ik_DL_01CCA0, 37 },
     { object_ik_DL_01CCA0, 52 },
     { object_ik_DL_01CCA0, 68 },
 
+    // WaistArmorLeft
     { object_ik_DL_01CEE0, 27 },
     { object_ik_DL_01CEE0, 46 },
     { object_ik_DL_01CEE0, 125 },
 
+    // PauldronRight
     { object_ik_DL_01D2B0, 8 },
     { object_ik_DL_01D2B0, 32 },
-    
+
+    // BootTipRight
     { object_ik_DL_01D3F8, 15 },
     { object_ik_DL_01D3F8, 37 },
     { object_ik_DL_01D3F8, 52 },
     { object_ik_DL_01D3F8, 68 },
 
+    // WaistArmorRight
     { object_ik_DL_01D638, 23 },
     { object_ik_DL_01D638, 42 },
     { object_ik_DL_01D638, 110 },
 };
 
+static DListPatchInfo arrowTipDListPatchInfos[] = {
+    { gArrowNearDL, 46 },
+    { gArrowFarDL, 5 },
+};
+
+void PatchArrowTipTexture() {
+    // Custom texture for Arrow tips that accounts for overflow texture reading
+    Gfx arrowTipTextureWithOverflowFixGfx =
+        gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, gHilite2Tex_Overflow);
+
+    // Gfx instructions to fix authentic vanilla bug where the Arrow tips texture is read as the wrong size
+    Gfx arrowTipTextureWithSizeFixGfx[] = {
+        gsDPLoadTextureBlock(gHilite2Tex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
+                             G_TX_MIRROR | G_TX_WRAP, 5, 5, 1, 1),
+    };
+
+    bool fixTexturesOOB = CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0);
+
+    for (const auto& patchInfo : arrowTipDListPatchInfos) {
+        const char* dlist = patchInfo.dlist;
+        int start = patchInfo.startInstruction;
+
+        // Patch using custom overflowed texture
+        if (!fixTexturesOOB) {
+            // Unpatch the other texture fix
+            for (size_t i = 4; i < 8; i++) {
+                int instruction = start + i;
+                std::string unpatchName = "arrowTipTextureWithSizeFix_" + std::to_string(instruction);
+                ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
+            }
+
+            std::string patchName = "arrowTipTextureWithOverflowFix_" + std::to_string(start);
+            std::string patchName2 = "arrowTipTextureWithOverflowFix_" + std::to_string(start + 1);
+            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, arrowTipTextureWithOverflowFixGfx);
+            ResourceMgr_PatchGfxByName(dlist, patchName2.c_str(), start + 1, gsSPNoOp());
+        } else { // Patch texture to use correct image size/fmt
+            // Unpatch the other texture fix
+            std::string unpatchName = "arrowTipTextureWithOverflowFix_" + std::to_string(start);
+            std::string unpatchName2 = "arrowTipTextureWithOverflowFix_" + std::to_string(start + 1);
+            ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
+            ResourceMgr_UnpatchGfxByName(dlist, unpatchName2.c_str());
+
+            for (size_t i = 4; i < 8; i++) {
+                int instruction = start + i;
+                std::string patchName = "arrowTipTextureWithSizeFix_" + std::to_string(instruction);
+
+                if (i == 0) {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gsSPNoOp());
+                } else {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction,
+                                               arrowTipTextureWithSizeFixGfx[i - 1]);
+                }
+            }
+        }
+    }
+}
+
 void PatchDekuStickTextureOverflow() {
     // Custom texture for holding Deku Stick that accounts for overflow texture reading
-    Gfx gDekuStickOverflowTexFix = gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 1, gDekuStickOverflowTex);
+    Gfx dekuSticTexkWithOverflowFixGfx = gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 1, gDekuStickOverflowTex);
 
     // Gfx instructions to fix authentic vanilla bug where the Deku Stick texture is read as the wrong size
-    Gfx gDekuStickTexFix[] = {
+    Gfx dekuStickTexWithSizeFixGfx[] = {
         gsDPLoadTextureBlock(gDekuStickTex, G_IM_FMT_I, G_IM_SIZ_8b, 8, 8, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                             G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD)
+                             G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
     };
 
     const char* dlist = gLinkChildLinkDekuStickDL;
     int start = 5;
 
+    // Patch using custom overflowed texture
     if (!CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0)) {
         // Unpatch the other texture fix
-        for (size_t i = 0; i < 7; i++) {
-            int instruction = start + (i == 0 ? 0 : i + 1);
-            std::string unpatchName = "DekuStickFix" + std::to_string(instruction);
+        for (size_t i = 0; i < 8; i++) {
+            int instruction = start + i;
+            std::string unpatchName = "dekuStickWithSizeFix_" + std::to_string(instruction);
             ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
         }
 
-        std::string patchName = "DekuStickOverflow" + std::to_string(start);
-        ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, gDekuStickOverflowTexFix);
-    } else {
+        std::string patchName = "dekuStickWithOverflowFix_" + std::to_string(start);
+        std::string patchName2 = "dekuStickWithOverflowFix_" + std::to_string(start + 1);
+        ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, dekuSticTexkWithOverflowFixGfx);
+        ResourceMgr_PatchGfxByName(dlist, patchName2.c_str(), start + 1, gsSPNoOp());
+    } else { // Patch texture to use correct image size/fmt
         // Unpatch the other texture fix
-        std::string unpatchName = "DekuStickOverflow" + std::to_string(start);
+        std::string unpatchName = "dekuStickWithOverflowFix_" + std::to_string(start);
+        std::string unpatchName2 = "dekuStickWithOverflowFix_" + std::to_string(start + 1);
         ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
-        
-        for (size_t i = 0; i < 7; i++) {
-            int instruction = start + (i == 0 ? 0 : i + 1);
-            std::string patchName = "DekuStickFix" + std::to_string(instruction);
-            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gDekuStickTexFix[i]);
+        ResourceMgr_UnpatchGfxByName(dlist, unpatchName2.c_str());
+
+        for (size_t i = 0; i < 8; i++) {
+            int instruction = start + i;
+            std::string patchName = "dekuStickWithSizeFix_" + std::to_string(instruction);
+
+            if (i == 0) {
+                ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gsSPNoOp());
+            } else {
+                ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, dekuStickTexWithSizeFixGfx[i - 1]);
+            }
         }
     }
 }
 
 void PatchFreezardTextureOverflow() {
     // Custom texture for Freezard effect that accounts for overflow texture reading
-    Gfx gEffUnknown12OverflowTextFix = gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, gEffUnknown12OverflowTex);
+    Gfx freezardBodyTextureWithOverflowFixGfx =
+        gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, gEffUnknown12OverflowTex);
 
     // Gfx instructions to fix authentic vanilla bug where the Freezard effect texture is read as the wrong format
-    Gfx gEffUnknown12TexFix[] = {
-        gsDPLoadTextureBlock(gEffUnknown12Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR |
-                             G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD)
+    Gfx freezardBodyTextureWithFormatFixGfx[] = {
+        gsDPLoadTextureBlock(gEffUnknown12Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                             G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
     };
 
-    for (const auto& patchInfo : freezardEffectDListPatchInfos) {
+    bool fixTexturesOOB = CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0);
+
+    for (const auto& patchInfo : freezardBodyDListPatchInfos) {
         const char* dlist = patchInfo.dlist;
         int start = patchInfo.startInstruction;
 
-        char patchNameBuf[24];
-
         // Patch using custom overflowed texture
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0)) {
+        if (!fixTexturesOOB) {
             // Unpatch the other texture fix
-            for (size_t i = 0; i < 7; i++) {
-                int instruction = start + (i == 0 ? 0 : i + 1);
-                std::string unpatchName = "gEffUnknown12Fix" + std::to_string(instruction);
+            for (size_t i = 0; i < 8; i++) {
+                int instruction = start + i;
+                std::string unpatchName = "freezardBodyTextureWithFormatFix_" + std::to_string(instruction);
                 ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
             }
 
-            std::string patchName = "gEffUnknown12Overflow" + std::to_string(start);
-            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, gEffUnknown12OverflowTextFix);
-        } else { // Patch texture to use correct image size
+            std::string patchName = "freezardBodyTextureWithOverflowFix_" + std::to_string(start);
+            std::string patchName2 = "freezardBodyTextureWithOverflowFix_" + std::to_string(start + 1);
+            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, freezardBodyTextureWithOverflowFixGfx);
+            ResourceMgr_PatchGfxByName(dlist, patchName2.c_str(), start + 1, gsSPNoOp());
+        } else { // Patch texture to use correct image size/fmt
             // Unpatch the other texture fix
-            std::string unpatchName = "gEffUnknown12Overflow" + std::to_string(start);
+            std::string unpatchName = "freezardBodyTextureWithOverflowFix_" + std::to_string(start);
+            std::string unpatchName2 = "freezardBodyTextureWithOverflowFix_" + std::to_string(start + 1);
             ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
+            ResourceMgr_UnpatchGfxByName(dlist, unpatchName2.c_str());
 
-            for (size_t i = 0; i < 7; i++) {
-                int instruction = start + (i == 0 ? 0 : i + 1);
-                std::string patchName = "gEffUnknown12Fix" + std::to_string(instruction);
-                ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gEffUnknown12TexFix[i]);
+            for (size_t i = 0; i < 8; i++) {
+                int instruction = start + i;
+                std::string patchName = "freezardBodyTextureWithFormatFix_" + std::to_string(instruction);
+
+                if (i == 0) {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gsSPNoOp());
+                } else {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction,
+                                               freezardBodyTextureWithFormatFixGfx[i - 1]);
+                }
             }
         }
     }
@@ -144,51 +231,74 @@ void PatchFreezardTextureOverflow() {
 
 void PatchIronKnuckleTextureOverflow() {
     // Custom texture for Iron Knuckle that accounts for overflow texture reading
-    Gfx gIronKnuckleMetalOverflowTexFix = gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 1, gIronKnuckleMetalOverflowTex);
+    Gfx ironKnuckleFireTexWithOverflowFixGfx =
+        gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 1, gIronKnuckleMetalOverflowTex);
 
     // Gfx instructions to fix authentic vanilla bug where the Iron Knuckle texture is read as the wrong format
-    Gfx gIronKnuckleMetalTexFix[] = {
-        gsDPLoadTextureBlock(gIronKnuckleMetalTex, G_IM_FMT_I, G_IM_SIZ_4b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP,
-                            G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD)
+    Gfx ironKnuckleFireTexWithFormatFixGfx[] = {
+        gsDPLoadTextureBlock_4b(gIronKnuckleMetalTex, G_IM_FMT_I, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP,
+                                G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
     };
 
+    bool fixTexturesOOB = CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0);
+
     for (const auto& patchInfo : ironKnuckleDListPatchInfos) {
         const char* dlist = patchInfo.dlist;
         int start = patchInfo.startInstruction;
 
-        // OTRTODO: Patching to use the correct size format for Iron Knuckle causes a tile size failure
-        // Until this is solved, Iron Knuckle will be hardcoded to always display with the "authentic" texture fix
-
         // Patch using custom overflowed texture
-        // if (!CVarGetInteger(CVAR_ENHANCEMENT("FixTexturesOOB"), 0)) {
+        if (!fixTexturesOOB) {
             // Unpatch the other texture fix
-            for (size_t i = 0; i < 7; i++) {
-                int instruction = start + (i == 0 ? 0 : i + 1);
-                std::string unpatchName = "MetalTexFix" + std::to_string(instruction);
+            for (size_t i = 0; i < 8; i++) {
+                int instruction = start + i;
+                std::string unpatchName = "ironKnuckleFireTexWithSizeFix_" + std::to_string(instruction);
                 ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
             }
 
-            std::string patchName = "MetalTexOverflow" + std::to_string(start);
-            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, gIronKnuckleMetalOverflowTexFix);
-        // } else { // Patch texture to use correct image size
-        //     // Unpatch the other texture fix
-        //     std::string unpatchName = "MetalTexOverflow" + std::to_string(start);
-        //     ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
+            std::string patchName = "ironKnuckleFireTexWithOverflowFix_" + std::to_string(start);
+            std::string patchName2 = "ironKnuckleFireTexWithOverflowFix_" + std::to_string(start + 1);
+            ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), start, ironKnuckleFireTexWithOverflowFixGfx);
+            ResourceMgr_PatchGfxByName(dlist, patchName2.c_str(), start + 1, ironKnuckleFireTexWithOverflowFixGfx);
+        } else { // Patch texture to use correct image size/fmt
+            // Unpatch the other texture fix
+            std::string unpatchName = "ironKnuckleFireTexWithOverflowFix_" + std::to_string(start);
+            std::string unpatchName2 = "ironKnuckleFireTexWithOverflowFix_" + std::to_string(start + 1);
+            ResourceMgr_UnpatchGfxByName(dlist, unpatchName.c_str());
+            ResourceMgr_UnpatchGfxByName(dlist, unpatchName2.c_str());
 
-        //     // Patch texture to use correct image size
-        //     for (size_t i = 0; i < 7; i++) {
-        //         int instruction = start + (i == 0 ? 0 : i + 1);
-        //         std::string patchName = "MetalTexFix" + std::to_string(instruction);
-        //         ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gIronKnuckleMetalTexFix[i]);
-        //     }
-        // }
+            for (size_t i = 0; i < 8; i++) {
+                int instruction = start + i;
+                std::string patchName = "ironKnuckleFireTexWithSizeFix_" + std::to_string(instruction);
+
+                if (i == 0) {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction, gsSPNoOp());
+                } else {
+                    ResourceMgr_PatchGfxByName(dlist, patchName.c_str(), instruction,
+                                               ironKnuckleFireTexWithFormatFixGfx[i - 1]);
+                }
+            }
+        }
     }
 }
 
+void PatchBoulderFragment() {
+    // The boulder fragment renders invisible due to the change made by https://github.com/Kenix3/libultraship/pull/721
+    // Until it is known wether this change is approriate or something else should be done to it, the following patches
+    // adjust the render mode for the DL to not become invisible
+    ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix3", 3,
+                               gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2));
+    ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix6", 6,
+                               gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2));
+}
+
 void ApplyAuthenticGfxPatches() {
+    // Overflow textures
+    PatchArrowTipTexture();
     PatchDekuStickTextureOverflow();
     PatchFreezardTextureOverflow();
     PatchIronKnuckleTextureOverflow();
+
+    PatchBoulderFragment();
 }
 
 // Patches the Sold Out GI DL to render the texture in the mirror boundary
@@ -240,7 +350,8 @@ void PatchMirroredSoldOutGI() {
 void PatchMirroredSunSongEtching() {
     // Only using these strings for graphics patching lookup, we don't need aligned assets here
     static const char gRoyalGraveBackRoomDL[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040";
-    static const char gRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80";
+    static const char gRoyalGraveBackRoomSongVtx[] =
+        "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80";
 
     static Vtx* mirroredSunSongVtx;
 
@@ -248,7 +359,7 @@ void PatchMirroredSunSongEtching() {
     // Only need to patch over the two SetTile commands to get the MIRROR effect
     Gfx mirroredSunSongTex[] = {
         gsDPLoadTextureBlock("", G_IM_FMT_IA, G_IM_SIZ_8b, 128, 32, 0, G_TX_MIRROR | G_TX_WRAP,
-                             G_TX_NOMIRROR | G_TX_CLAMP, 7, 5, G_TX_NOLOD, G_TX_NOLOD)
+                             G_TX_NOMIRROR | G_TX_CLAMP, 7, 5, G_TX_NOLOD, G_TX_NOLOD),
     };
 
     if (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) {
@@ -266,7 +377,8 @@ void PatchMirroredSunSongEtching() {
 
         ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_1", 13, mirroredSunSongTex[1]);
         ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_2", 17, mirroredSunSongTex[5]);
-        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24, gsSPVertex(mirroredSunSongVtx, 4, 0));
+        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24,
+                                   gsSPVertex(mirroredSunSongVtx, 4, 0));
         // noop as the original vertex command is 128 bit wide
         ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2", 25, gsSPNoOp());
     } else {
diff --git a/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h b/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h
index 7fc454117c..fec112c42c 100644
--- a/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h
+++ b/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h
@@ -1,6 +1,6 @@
 typedef enum {
     COLORSCHEME_N64,
-    COLORSCHEME_GAMECUBE
+    COLORSCHEME_GAMECUBE,
 } DefaultColorScheme;
 
 typedef enum {
@@ -9,11 +9,11 @@ typedef enum {
     ENEMYHEALTH_ANCHOR_BOTTOM,
 } EnemyHealthBarAnchorType;
 
-typedef enum { 
-    ORIGINAL_LOCATION, 
-    ANCHOR_LEFT, 
-    ANCHOR_RIGHT, 
-    ANCHOR_NONE, 
-    HIDDEN, 
-    ANCHOR_TO_LIFE_METER 
+typedef enum {
+    ORIGINAL_LOCATION,
+    ANCHOR_LEFT,
+    ANCHOR_RIGHT,
+    ANCHOR_NONE,
+    HIDDEN,
+    ANCHOR_TO_LIFE_METER,
 } PosType;
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
index 4d4d27b3f5..0ebba19ec2 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
@@ -16,35 +16,24 @@ static const std::unordered_map<std::string, char> textBoxSpecialCharacters = {
     { "è", 0x95 }, { "é", 0x96 }, { "ê", 0x97 }, { "ë", 0x98 }, { "ï", 0x99 }, { "ô", 0x9A }, { "ö", 0x9B },
     { "ù", 0x9C }, { "û", 0x9D }, { "ü", 0x9E }
 };
-static const std::unordered_map<std::string, std::string> percentColors = { { "w", QM_WHITE },  { "r", QM_RED },   { "g", QM_GREEN },
-                                                              { "b", QM_BLUE },   { "c", QM_LBLUE }, { "p", QM_PINK },
-                                                              { "y", QM_YELLOW }, { "B", QM_BLACK } };
+static const std::unordered_map<std::string, std::string> percentColors = {
+    { "w", QM_WHITE }, { "r", QM_RED },  { "g", QM_GREEN },  { "b", QM_BLUE },
+    { "c", QM_LBLUE }, { "p", QM_PINK }, { "y", QM_YELLOW }, { "B", QM_BLACK },
+};
 
-static const std::unordered_map<std::string, std::string> colorToPercent = { { QM_WHITE, "%w" },  { QM_RED, "%r"},   { QM_GREEN, "%g" },
-                                                              { QM_BLUE, "%b" },   { QM_LBLUE, "%c"}, { QM_PINK, "%p" },
-                                                              { QM_YELLOW, "%y" }, { QM_BLACK, "%B" } };
+static const std::unordered_map<std::string, std::string> colorToPercent = {
+    { QM_WHITE, "%w" }, { QM_RED, "%r" },  { QM_GREEN, "%g" },  { QM_BLUE, "%b" },
+    { QM_LBLUE, "%c" }, { QM_PINK, "%p" }, { QM_YELLOW, "%y" }, { QM_BLACK, "%B" },
+};
 
 static const std::unordered_map<std::string, ItemID> altarIcons = {
-    { "0", ITEM_KOKIRI_EMERALD },
-    { "1", ITEM_GORON_RUBY },
-    { "2", ITEM_ZORA_SAPPHIRE },
-    { "8", ITEM_MEDALLION_LIGHT },
-    { "3", ITEM_MEDALLION_FOREST },
-    { "4", ITEM_MEDALLION_FIRE },
-    { "5", ITEM_MEDALLION_WATER },
-    { "6", ITEM_MEDALLION_SPIRIT },
-    { "7", ITEM_MEDALLION_SHADOW },
-    { "l", ITEM_ARROW_LIGHT },
-    { "b", ITEM_KEY_BOSS },
-    { "o", ITEM_SWORD_MASTER },
-    { "c", ITEM_OCARINA_FAIRY },
-    { "i", ITEM_OCARINA_TIME },
-    { "L", ITEM_BOW_ARROW_LIGHT },
-    { "k", ITEM_TUNIC_KOKIRI },
-    { "m", ITEM_DUNGEON_MAP },
-    { "C", ITEM_COMPASS },
-    { "s", ITEM_SKULL_TOKEN },
-    { "g", ITEM_MASK_GORON }
+    { "0", ITEM_KOKIRI_EMERALD },  { "1", ITEM_GORON_RUBY },       { "2", ITEM_ZORA_SAPPHIRE },
+    { "8", ITEM_MEDALLION_LIGHT }, { "3", ITEM_MEDALLION_FOREST }, { "4", ITEM_MEDALLION_FIRE },
+    { "5", ITEM_MEDALLION_WATER }, { "6", ITEM_MEDALLION_SPIRIT }, { "7", ITEM_MEDALLION_SHADOW },
+    { "l", ITEM_ARROW_LIGHT },     { "b", ITEM_KEY_BOSS },         { "o", ITEM_SWORD_MASTER },
+    { "c", ITEM_OCARINA_FAIRY },   { "i", ITEM_OCARINA_TIME },     { "L", ITEM_BOW_ARROW_LIGHT },
+    { "k", ITEM_TUNIC_KOKIRI },    { "m", ITEM_DUNGEON_MAP },      { "C", ITEM_COMPASS },
+    { "s", ITEM_SKULL_TOKEN },     { "g", ITEM_MASK_GORON },
 };
 
 static std::map<std::string, int> pixelWidthTable = {
@@ -72,19 +61,20 @@ static std::map<std::string, int> pixelWidthTable = {
     { "í", 5 },  { "î", 5 },  { "ï", 5 },      { "ð", 7 },  { "ñ", 7 },  { "ò", 7 },  { "ó", 7 },  { "ô", 7 },
     { "õ", 7 },  { "ö", 7 },  { "÷", 11 },     { "ø", 9 },  { "ù", 7 },  { "ú", 7 },  { "û", 7 },  { "ü", 7 },
     { "ý", 8 },  { "þ", 8 },  { "ÿ", 8 },      { "Œ", 11 }, { "œ", 11 }, { "„", 5 },  { "”", 5 },  { "€", 10 },
-    { "Ÿ", 10 }, { "~", 8 }
+    { "Ÿ", 10 }, { "~", 8 },
 };
 
 CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, TextBoxType type_,
                              TextBoxPosition position_)
-    : type(type_), position(position_){
+    : type(type_), position(position_) {
     messages[LANGUAGE_ENG] = std::move(english_);
     messages[LANGUAGE_GER] = std::move(german_);
     messages[LANGUAGE_FRA] = std::move(french_);
 }
 
-CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<std::string> colors_,
-                              std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_) {
+CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_,
+                             std::vector<std::string> colors_, std::vector<bool> capital_, TextBoxType type_,
+                             TextBoxPosition position_) {
     messages[LANGUAGE_ENG] = std::move(english_);
     messages[LANGUAGE_GER] = std::move(german_);
     messages[LANGUAGE_FRA] = std::move(french_);
@@ -99,7 +89,8 @@ CustomMessage::CustomMessage(std::string english_, TextBoxType type_, TextBoxPos
     messages[LANGUAGE_ENG] = std::move(english_);
 }
 
-CustomMessage::CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_){
+CustomMessage::CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_,
+                             TextBoxType type_, TextBoxPosition position_) {
     messages[LANGUAGE_ENG] = std::move(english_);
     colors = colors_;
     capital = capital_;
@@ -107,13 +98,50 @@ CustomMessage::CustomMessage(std::string english_, std::vector<std::string> colo
     position = position_;
 }
 
-CustomMessage::CustomMessage(Text text, TextBoxType type_,TextBoxPosition position_)
+CustomMessage::CustomMessage(Text text, TextBoxType type_, TextBoxPosition position_)
     : type(type_), position(position_) {
     messages[LANGUAGE_ENG] = text.GetEnglish();
     messages[LANGUAGE_GER] = text.GetGerman();
     messages[LANGUAGE_FRA] = text.GetFrench();
 }
 
+typedef struct {
+    u16 textId;
+    u8 typePos;
+    const char* segment;
+    u32 msgSize;
+} MessageTableEntry;
+
+extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
+extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
+extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
+
+CustomMessage CustomMessage::LoadVanillaMessageTableEntry(uint16_t textId) {
+    const char* foundSeg;
+    const char* nextSeg;
+    MessageTableEntry* msgEntry = sNesMessageEntryTablePtr;
+    u16 bufferId = textId;
+    CustomMessage msg;
+    if (gSaveContext.language == LANGUAGE_GER) {
+        msgEntry = sGerMessageEntryTablePtr;
+    } else if (gSaveContext.language == LANGUAGE_FRA) {
+        msgEntry = sFraMessageEntryTablePtr;
+    }
+    while (msgEntry->textId != 0xFFFF) {
+        if (msgEntry->textId == bufferId) {
+            TextBoxPosition position = static_cast<TextBoxPosition>(msgEntry->typePos & 0xF);
+            TextBoxType type = static_cast<TextBoxType>(msgEntry->typePos >> 4);
+            // uint8_t icon = msgEntry->segment[1];
+            std::string message = std::string(msgEntry->segment, msgEntry->msgSize);
+            msg = CustomMessage(message, type, position);
+            // msg.Format(static_cast<ItemID>(icon));
+            return msg;
+        }
+        msgEntry++;
+    }
+    return CustomMessage();
+}
+
 const std::string CustomMessage::GetEnglish(MessageFormat format) const {
     return GetForLanguage(LANGUAGE_ENG, format);
 }
@@ -127,31 +155,32 @@ const std::string CustomMessage::GetFrench(MessageFormat format) const {
 }
 
 const std::string CustomMessage::GetForCurrentLanguage(MessageFormat format) const {
-    return GetForLanguage(gSaveContext.language, format);
+    return GetForLanguage(
+        ((Language)gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : (Language)gSaveContext.language, format);
 }
 
 const std::string CustomMessage::GetForLanguage(uint8_t language, MessageFormat format) const {
-    std::string output = messages[language].length() > 0 ? messages[language] : messages[LANGUAGE_ENG];
+    std::string output = !messages[language].starts_with(TODO_TRANSLATE) ? messages[language] : messages[LANGUAGE_ENG];
     ProcessMessageFormat(output, format);
     return output;
 }
 
-const std::vector<std::string> CustomMessage::GetAllMessages(MessageFormat format) const{
+const std::vector<std::string> CustomMessage::GetAllMessages(MessageFormat format) const {
     std::vector<std::string> output = messages;
-    for (auto str : output){
+    for (auto str : output) {
         ProcessMessageFormat(str, format);
     }
     return output;
 }
 
 void CustomMessage::ProcessMessageFormat(std::string& str, MessageFormat format) const {
-    if (format == MF_FORMATTED){
+    if (format == MF_FORMATTED) {
         FormatString(str);
-    } else if (format == MF_CLEAN){
+    } else if (format == MF_CLEAN) {
         CleanString(str);
-    } else if (format == MF_AUTO_FORMAT){
+    } else if (format == MF_AUTO_FORMAT) {
         AutoFormatString(str);
-    }else if (format == MF_ENCODE){
+    } else if (format == MF_ENCODE) {
         EncodeColors(str);
     }
 }
@@ -160,14 +189,14 @@ const std::vector<bool>& CustomMessage::GetCapital() const {
     return capital;
 }
 
-void CustomMessage::SetCapital(std::vector<bool> capital_){
+void CustomMessage::SetCapital(std::vector<bool> capital_) {
     capital = capital_;
 }
 const std::vector<std::string>& CustomMessage::GetColors() const {
     return colors;
 }
 
-void CustomMessage::SetColors(std::vector<std::string> colors_){
+void CustomMessage::SetColors(std::vector<std::string> colors_) {
     colors = colors_;
 }
 
@@ -175,7 +204,7 @@ const TextBoxType& CustomMessage::GetTextBoxType() const {
     return type;
 }
 
-void CustomMessage::SetTextBoxType(TextBoxType boxType){
+void CustomMessage::SetTextBoxType(TextBoxType boxType) {
     type = boxType;
 }
 
@@ -186,19 +215,19 @@ const TextBoxPosition& CustomMessage::GetTextBoxPosition() const {
 CustomMessage CustomMessage::operator+(const CustomMessage& right) const {
     std::vector<std::string> newColors = colors;
     std::vector<std::string> rColors = right.GetColors();
-    for (auto color: rColors){
+    for (auto color : rColors) {
         newColors.push_back(color);
     }
     std::vector<bool> newCapital = capital;
     newCapital.insert(newCapital.end(), right.GetCapital().begin(), right.GetCapital().end());
     return CustomMessage(messages[LANGUAGE_ENG] + right.GetEnglish(MF_RAW),
                          messages[LANGUAGE_GER] + right.GetGerman(MF_RAW),
-                         messages[LANGUAGE_FRA] + right.GetFrench(MF_RAW),
-                         newColors, newCapital, type, position);
+                         messages[LANGUAGE_FRA] + right.GetFrench(MF_RAW), newColors, newCapital, type, position);
 }
 
 CustomMessage CustomMessage::operator+(const std::string& right) const {
-    return CustomMessage(messages[LANGUAGE_ENG] + right, messages[LANGUAGE_GER] + right, messages[LANGUAGE_FRA] + right);
+    return CustomMessage(messages[LANGUAGE_ENG] + right, messages[LANGUAGE_GER] + right,
+                         messages[LANGUAGE_FRA] + right);
 }
 
 void CustomMessage::operator+=(const CustomMessage& right) {
@@ -220,8 +249,8 @@ bool CustomMessage::operator==(const CustomMessage& operand) const {
 }
 
 bool CustomMessage::operator==(const std::string& operand) const {
-    for (auto str: messages){
-        if (str == operand){
+    for (auto str : messages) {
+        if (str == operand) {
             return true;
         }
     }
@@ -243,17 +272,21 @@ void CustomMessage::Replace(std::string&& oldStr, std::string&& newStr) {
 }
 
 void CustomMessage::Replace(std::string&& oldStr, CustomMessage newMessage) {
-    for (uint8_t language = 0; language < LANGUAGE_MAX; language++) {
+    for (uint8_t language = 0; language < LANGUAGE_MAX - 1; language++) {
         size_t position = messages[language].find(oldStr);
+        std::string newMsg = newMessage.messages[language];
+        if (language != LANGUAGE_ENG && newMsg == TODO_TRANSLATE) {
+            newMsg = newMessage.messages[LANGUAGE_ENG];
+        }
         while (position != std::string::npos) {
-            messages[language].replace(position, oldStr.length(), newMessage.messages[language]);
+            messages[language].replace(position, oldStr.length(), newMsg);
             position = messages[language].find(oldStr);
         }
     }
 }
 
 void CustomMessage::Format(ItemID iid) {
-    for (std::string &str : messages) {
+    for (std::string& str : messages) {
         str.insert(0, ITEM_OBTAINED(iid));
         size_t start_pos = 0;
         std::replace(str.begin(), str.end(), '&', NEWLINE()[0]);
@@ -303,7 +336,7 @@ void CustomMessage::FormatString(std::string& str) const {
     str += MESSAGE_END();
 }
 
-void DeleteControlCode(std::string& str, std::string code){
+void DeleteControlCode(std::string& str, std::string code) {
     size_t start_pos = 0;
     while ((start_pos = str.find(code, start_pos)) != std::string::npos) {
         str.replace(start_pos, code.length(), "");
@@ -324,56 +357,57 @@ void CustomMessage::CleanString(std::string& str) const {
 }
 
 static size_t NextLineLength(const std::string* textStr, const size_t lastNewline, bool hasIcon = false) {
-  const  size_t maxLinePixelWidth = hasIcon ? 200 : 216;
+    const size_t maxLinePixelWidth = hasIcon ? 200 : 216;
 
-  size_t totalPixelWidth = 0;
-  size_t currentPos = lastNewline;
+    size_t totalPixelWidth = 0;
+    size_t currentPos = lastNewline;
 
-  // Looping through the string from the lastNewline until the total
-  // width of counted characters exceeds the maximum pixels in a line.
-  size_t nextPosJump = 0;
-  while (totalPixelWidth < maxLinePixelWidth && currentPos < textStr->length()) {
-    // Skip over control codes
-    if (textStr->at(currentPos) == '%') {
-      nextPosJump = 2;
-    } else if (textStr->at(currentPos) == '$') {
-      nextPosJump = 2;
-    } else if (textStr->at(currentPos) == '@') {
-      nextPosJump = 1;
-      // Assume worst case for player name 12 * 8 (widest character * longest name length)
-      totalPixelWidth += 96;
-    } else if (textStr->at(currentPos) == '\x05') {
-      // Skip colour control characters.
-      nextPosJump = 2;
-    } else if (textStr->at(currentPos) == '\x1E') {
-        //For the high score char, we have to take the next Char, then use that to get a worst case scenario.
-        if (textStr->at(currentPos+1) == '\x01'){
-            totalPixelWidth += 28;
-        } 
-        nextPosJump = 2;
-    } else {
-      // Some characters only one byte while others are two bytes
-      // So check both possibilities when checking for a character
-      if (pixelWidthTable.count(textStr->substr(currentPos, 1))) {
-        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 1)];
-        nextPosJump = 1;
-      } else if (pixelWidthTable.count(textStr->substr(currentPos, 2))) {
-        totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 2)];
-        nextPosJump = 2;
-      } else {
-        SPDLOG_DEBUG("Table does not contain " + textStr->substr(currentPos, 1) + "/" + textStr->substr(currentPos, 2));
-        SPDLOG_DEBUG("Full string: " + *textStr);
-        nextPosJump = 1;
-      }
+    // Looping through the string from the lastNewline until the total
+    // width of counted characters exceeds the maximum pixels in a line.
+    size_t nextPosJump = 0;
+    while (totalPixelWidth < maxLinePixelWidth && currentPos < textStr->length()) {
+        // Skip over control codes
+        if (textStr->at(currentPos) == '%') {
+            nextPosJump = 2;
+        } else if (textStr->at(currentPos) == '$') {
+            nextPosJump = 2;
+        } else if (textStr->at(currentPos) == '@') {
+            nextPosJump = 1;
+            // Assume worst case for player name 12 * 8 (widest character * longest name length)
+            totalPixelWidth += 96;
+        } else if (textStr->at(currentPos) == '\x05') {
+            // Skip colour control characters.
+            nextPosJump = 2;
+        } else if (textStr->at(currentPos) == '\x1E') {
+            // For the high score char, we have to take the next Char, then use that to get a worst case scenario.
+            if (textStr->at(currentPos + 1) == '\x01') {
+                totalPixelWidth += 28;
+            }
+            nextPosJump = 2;
+        } else {
+            // Some characters only one byte while others are two bytes
+            // So check both possibilities when checking for a character
+            if (pixelWidthTable.count(textStr->substr(currentPos, 1))) {
+                totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 1)];
+                nextPosJump = 1;
+            } else if (pixelWidthTable.count(textStr->substr(currentPos, 2))) {
+                totalPixelWidth += pixelWidthTable[textStr->substr(currentPos, 2)];
+                nextPosJump = 2;
+            } else {
+                SPDLOG_DEBUG("Table does not contain " + textStr->substr(currentPos, 1) + "/" +
+                             textStr->substr(currentPos, 2));
+                SPDLOG_DEBUG("Full string: " + *textStr);
+                nextPosJump = 1;
+            }
+        }
+        currentPos += nextPosJump;
+    }
+    // return the total number of characters we looped through
+    if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
+        return currentPos - lastNewline - nextPosJump;
+    } else {
+        return currentPos - lastNewline;
     }
-    currentPos += nextPosJump;
-  }
-  // return the total number of characters we looped through
-  if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
-    return currentPos - lastNewline - nextPosJump;
-  } else {
-    return currentPos - lastNewline;
-  }
 }
 
 size_t CustomMessage::FindNEWLINE(std::string& str, size_t lastNewline) const {
@@ -435,6 +469,27 @@ size_t CustomMessage::FindNEWLINE(std::string& str, size_t lastNewline) const {
     return newLine;
 }
 
+bool CustomMessage::AddBreakString(std::string& str, size_t pos, std::string breakString) const {
+    if (str[pos] == ' ' || str[pos] == '&') {
+        str.replace(pos, 1, breakString);
+        return false;
+    } else {
+        if (pos <= str.size() - 1) {
+            // If the next char is a new textbox, it has priority, ignore whatever we are replacing it with
+            if (str[pos + 1] == '^') {
+                return false;
+                // otherwise, if it is a line break or space, replace it
+            } else if (str[pos + 1] == ' ' || str[pos + 1] == '&') {
+                str.replace(pos + 1, 1, breakString);
+                return false;
+            }
+        }
+        // otherwise insert after it
+        str.insert(pos + 1, breakString);
+        return true;
+    }
+}
+
 void CustomMessage::AutoFormatString(std::string& str) const {
     ReplaceAltarIcons(str);
     ReplaceColors(str);
@@ -447,22 +502,21 @@ void CustomMessage::AutoFormatString(std::string& str) const {
     while (lastNewline + lineLength < str.length() || yesNo != std::string::npos) {
         const size_t carrot = str.find('^', lastNewline);
         const size_t ampersand = str.find('&', lastNewline);
-        const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
         size_t waitForInput = str.find(WAIT_FOR_INPUT()[0], lastNewline);
         size_t newLine = FindNEWLINE(str, lastNewline);
-        if (carrot < waitForInput){
+        if (carrot < waitForInput) {
             waitForInput = carrot;
         }
-        if (ampersand < newLine){
+        if (ampersand < newLine) {
             newLine = ampersand;
         }
-        if (lineCount != 3 && yesNo < lastNewline + lineLength && yesNo < waitForInput && yesNo < newLine){
-            if (lineCount >= 4){
+        if (lineCount != 3 && yesNo < lastNewline + lineLength && yesNo < waitForInput && yesNo < newLine) {
+            if (lineCount >= 4) {
                 str.replace(yesNo, 1, "^&&\x1B");
                 lineCount = 3;
                 lastNewline = yesNo + 3;
             } else {
-                while(lineCount < 3){
+                while (lineCount < 3) {
                     str.replace(yesNo, 1, "&\x1B");
                     yesNo++;
                     lineCount++;
@@ -470,7 +524,7 @@ void CustomMessage::AutoFormatString(std::string& str) const {
                 lastNewline = yesNo;
             }
         } else {
-            if (lineCount < 4){
+            if (lineCount < 4) {
                 // replace '&' first if it's within the newline range
                 if (newLine < lastNewline + lineLength) {
                     lastNewline = newLine + 1;
@@ -479,21 +533,33 @@ void CustomMessage::AutoFormatString(std::string& str) const {
                     lastNewline = waitForInput + 1;
                     lineCount = 0;
                     // some lines need to be split but don't have spaces, look for periods instead
-                } else if (lastSpace == std::string::npos) {
-                    const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
-                    str.replace(lastPeriod, 1, ".&");
-                    lastNewline = lastPeriod + 2;
                 } else {
-                    str.replace(lastSpace, 1, "&");
-                    lastNewline = lastSpace + 1;
+                    const size_t lastBreak =
+                        str.find_last_of(static_cast<std::string>(".,!?- "), lastNewline + lineLength);
+                    // if none exist or we go backwards, we look forward for a something and allow the overflow
+                    if (lastBreak == std::string::npos || lastBreak < lastNewline) {
+                        const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
+                        if (str[nextBreak] == '^') {
+                            lastNewline = nextBreak + 1;
+                            lineCount = 0; // increments to 1 at the end
+                        } else if (str[nextBreak] == '&') {
+                            lastNewline = nextBreak + 1;
+                        } else {
+                            bool isAdded = AddBreakString(str, nextBreak, "&");
+                            lastNewline = nextBreak + 1 + isAdded;
+                        }
+                    } else {
+                        bool isAdded = AddBreakString(str, lastBreak, "&");
+                        lastNewline = lastBreak + 1 + isAdded;
+                    }
                 }
                 lineCount += 1;
-            } else { 
+            } else {
                 const size_t lastColor = str.rfind("\x05"s, lastNewline + lineLength);
                 std::string colorText = "";
-                //check if we are on a non default colour, as ^ resets it, and readd if needed
-                if (lastColor != std::string::npos && str[lastColor+1] != 0){
-                    colorText = "\x05"s + str[lastColor+1];
+                // check if we are on a non default colour, as ^ resets it, and readd if needed
+                if (lastColor != std::string::npos && str[lastColor + 1] != 0) {
+                    colorText = "\x05"s + str[lastColor + 1];
                 }
                 // replace '&' first if it's within the newline range
                 if (ampersand < lastNewline + lineLength) {
@@ -502,14 +568,23 @@ void CustomMessage::AutoFormatString(std::string& str) const {
                     // or move the lastNewline cursor to the next line if a '^' is encountered.
                 } else if (carrot < lastNewline + lineLength) {
                     lastNewline = carrot + 1;
-                    // some lines need to be split but don't have spaces, look for periods instead
-                } else if (lastSpace == std::string::npos) {
-                    const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
-                    str.replace(lastPeriod, 1, ".^" + colorText);
-                    lastNewline = lastPeriod + 2;
+                    // some lines need to be split but don't have spaces, look for punctuation instead
                 } else {
-                    str.replace(lastSpace, 1, "^" + colorText);
-                    lastNewline = lastSpace + 1;
+                    const size_t lastBreak =
+                        str.find_last_of(static_cast<std::string>(".,!?- &"), lastNewline + lineLength);
+                    // if none exist or we go backwards, we look forward for a something and allow the overflow
+                    if (lastBreak == std::string::npos || lastBreak < lastNewline) {
+                        const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
+                        if (str[nextBreak] == '^') {
+                            lastNewline = nextBreak + 1;
+                        } else {
+                            bool isAdded = AddBreakString(str, nextBreak, "^" + colorText);
+                            lastNewline = nextBreak + 1 + isAdded;
+                        }
+                    } else {
+                        bool isAdded = AddBreakString(str, lastBreak, "^" + colorText);
+                        lastNewline = lastBreak + 1 + isAdded;
+                    }
                 }
                 lineCount = 1;
             }
@@ -526,7 +601,7 @@ void CustomMessage::AutoFormatString(std::string& str) const {
     str += MESSAGE_END();
 }
 
-void CustomMessage::InsertNumber(uint8_t num){
+void CustomMessage::InsertNumber(uint8_t num) {
     for (std::string& str : messages) {
         size_t firstBar = str.find('|');
         if (firstBar != std::string::npos) {
@@ -543,11 +618,33 @@ void CustomMessage::InsertNumber(uint8_t num){
             }
         }
     }
-    //remove the remaining bar
+    // remove the remaining bar
     this->Replace("|", "");
     Replace("[[d]]", std::to_string(num));
 }
 
+void CustomMessage::SetSingularPlural() {
+    for (std::string& str : messages) {
+        size_t firstBar = str.find('|');
+        if (firstBar != std::string::npos) {
+            size_t euroSign = str.find("€");
+            size_t secondBar = str.find('|', firstBar + 1);
+            if (secondBar != std::string::npos) {
+                size_t thirdBar = str.find('|', secondBar + 1);
+                if (thirdBar != std::string::npos) {
+                    if (euroSign == std::string::npos) {
+                        str.erase(secondBar, thirdBar - secondBar);
+                    } else {
+                        str.erase(firstBar, secondBar - firstBar);
+                    }
+                }
+            }
+        }
+    }
+    // remove the remaining bar
+    this->Replace("|", "");
+    this->Replace("€", "");
+}
 
 void CustomMessage::Capitalize() {
     for (std::string str : messages) {
@@ -587,7 +684,7 @@ const char* Interface_ReplaceSpecialCharacters(char text[]) {
 }
 
 void CustomMessage::EncodeColors(std::string& str) const {
-    for (std::string color: colors) {
+    for (std::string color : colors) {
         if (const size_t firstHashtag = str.find('#'); firstHashtag != std::string::npos) {
             str.replace(firstHashtag, 1, colorToPercent.at(color));
             if (const size_t secondHashtag = str.find('#', firstHashtag + 1); secondHashtag != std::string::npos) {
@@ -626,13 +723,13 @@ void CustomMessage::ReplaceAltarIcons(std::string& str) const {
     }
 }
 
-void CustomMessage::InsertNames(std::vector<CustomMessage> toInsert){
-    for(uint8_t a = 0; a < toInsert.size(); a++){
+void CustomMessage::InsertNames(std::vector<CustomMessage> toInsert) {
+    for (uint8_t a = 0; a < toInsert.size(); a++) {
         CustomMessage temp = toInsert[a];
-        if ((capital.size() > a) && (capital[a] = true)){
+        if ((capital.size() > a) && (capital[a] = true)) {
             temp.Capitalize();
-        } 
-        Replace("[[" + std::to_string(a+1) + "]]", temp); 
+        }
+        Replace("[[" + std::to_string(a + 1) + "]]", temp);
     }
 }
 
@@ -697,16 +794,16 @@ CustomMessage CustomMessageManager::RetrieveMessage(std::string tableID, uint16_
     }
     CustomMessage message = foundMessage->second;
 
-    if (format == MF_FORMATTED){
+    if (format == MF_FORMATTED) {
         message.Format();
-    } else if (format == MF_AUTO_FORMAT){
+    } else if (format == MF_AUTO_FORMAT) {
         message.AutoFormat();
-    } else if (format == MF_CLEAN){
+    } else if (format == MF_CLEAN) {
         message.Clean();
-    } else if (format == MF_ENCODE){
+    } else if (format == MF_ENCODE) {
         message.Encode();
     }
-    
+
     return message;
 }
 
@@ -720,7 +817,7 @@ bool CustomMessageManager::ClearMessageTable(std::string tableID) {
     return true;
 }
 
-bool CustomMessageManager::AddCustomMessageTable(std::string tableID) { 
+bool CustomMessageManager::AddCustomMessageTable(std::string tableID) {
     CustomMessageTable newMessageTable;
     return messageTables.emplace(tableID, newMessageTable).second;
 }
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
index e8a9690649..51bb84eb88 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h
@@ -6,6 +6,7 @@
 #include <string>
 
 #include "../../../include/z64item.h"
+#include "../../../include/z64.h"
 #include "../../../include/message_data_textbox_types.h"
 #include "../randomizer/3drando/text.hpp"
 
@@ -20,7 +21,7 @@
 #define QM_YELLOW "\x46"
 #define QM_BLACK "\x47"
 
-#define HS_HORSE_ARCHERY "\x00"s //HS_HBA is an enum already
+#define HS_HORSE_ARCHERY "\x00"s // HS_HBA is an enum already
 
 typedef enum {
     MF_FORMATTED,
@@ -41,19 +42,24 @@ class CustomMessage {
     CustomMessage() = default;
     CustomMessage(std::string english_, std::string german_, std::string french_,
                   TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
-    CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<std::string> colors_, std::vector<bool> capital_ = {},
-              TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
-    CustomMessage(std::string english_, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
-    CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_ = {}, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<std::string> colors_,
+                  std::vector<bool> capital_ = {}, TextBoxType type_ = TEXTBOX_TYPE_BLACK,
+                  TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, TextBoxType type_ = TEXTBOX_TYPE_BLACK,
+                  TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
+    CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_ = {},
+                  TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
     CustomMessage(Text text, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
 
-    static std::string MESSAGE_END() ;
-    static std::string ITEM_OBTAINED(uint8_t x) ;
-    static std::string NEWLINE() ;
-    static std::string COLOR(std::string x) ;
-    static std::string POINTS(std::string x) ;//HIGH_SCORE is also a macro
-    static std::string WAIT_FOR_INPUT() ;
-    static std::string PLAYER_NAME() ;
+    static CustomMessage LoadVanillaMessageTableEntry(uint16_t textId);
+
+    static std::string MESSAGE_END();
+    static std::string ITEM_OBTAINED(uint8_t x);
+    static std::string NEWLINE();
+    static std::string COLOR(std::string x);
+    static std::string POINTS(std::string x); // HIGH_SCORE is also a macro
+    static std::string WAIT_FOR_INPUT();
+    static std::string PLAYER_NAME();
 
     const std::string GetEnglish(MessageFormat format = MF_FORMATTED) const;
     const std::string GetFrench(MessageFormat format = MF_FORMATTED) const;
@@ -147,6 +153,13 @@ class CustomMessage {
      */
     void InsertNumber(uint8_t num);
 
+    /**
+     * @brief A € sign at the end of an item name signals that it is plural.
+     * If a hint text has |singular|plural| forms specified, the unused one get's deleted.
+     * If no € sign is present, the singular form is used.
+     */
+    void SetSingularPlural();
+
     /**
      * @brief Replaces various symbols with the control codes necessary to
      * display them in OoT's textboxes. i.e. special characters, colors, newlines,
@@ -155,13 +168,13 @@ class CustomMessage {
     void Format();
 
     /**
-     * @brief formats the message specifically to fit in OoT's 
+     * @brief formats the message specifically to fit in OoT's
      * textboxes, and use it's formatting.
      */
     void AutoFormat();
 
     /**
-     * @brief Removes all OoT formatting from the message, 
+     * @brief Removes all OoT formatting from the message,
      * making it a good form for writing into spoiler logs.
      */
     void Clean();
@@ -177,15 +190,26 @@ class CustomMessage {
      * . i.e. special characters, colors, newlines, wait for input, etc.
      */
     void FormatString(std::string& str) const;
-    
+
     /**
      * @brief finds NEWLINEs in a string, while filtering
      * /x01's that are used as opperands
      */
     size_t FindNEWLINE(std::string& str, size_t lastNewline) const;
-    
+
     /**
-     * @brief formats the string specifically to fit in OoT's 
+     * @brief Inserts a string into another string, following the rules
+     * of auto-format inserting new lines: spaces and & are replaced while
+     * other chars are appended to.
+     *
+     * @param str the string we are inserting into
+     * @param pos the position in the string to insert
+     * @param breakString the string we are inserting
+     */
+    bool AddBreakString(std::string& str, size_t pos, std::string breakString) const;
+
+    /**
+     * @brief formats the string specifically to fit in OoT's
      * textboxes, and use it's formatting.
      * RANDOTODO whoever knows exactly what this does check my adaption
      */
@@ -198,7 +222,7 @@ class CustomMessage {
     void CleanString(std::string& str) const;
 
   private:
-    std::vector<std::string> messages = {"","",""};
+    std::vector<std::string> messages = { "", TODO_TRANSLATE, TODO_TRANSLATE };
     TextBoxType type = TEXTBOX_TYPE_BLACK;
     TextBoxPosition position = TEXTBOX_POS_BOTTOM;
     std::vector<std::string> colors = {};
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 4a039987ed..b5bc0fd6e8 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -11,7 +11,7 @@ typedef enum {
     TEXT_SKULLTULA_PEOPLE_STARTING_TO_WEAKEN = 0x0024,
     TEXT_SKULLTULA_PEOPLE_WE_LOOK_LIKE_THIS = 0x0025,
     TEXT_SKULLTULA_PEOPLE_GS_TUTORIAL = 0x0026,
-    TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH = 0x0027, 
+    TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH = 0x0027,
     TEXT_SKULLTULA_PEOPLE_CURSE_HAS_BEEN_BROKEN = 0x0028,
     TEXT_SKULLTULA_PEOPLE_SAVING_MY_KIDS = 0x0029,
     TEXT_ITEM_KEY_SMALL = 0x0060,
@@ -96,7 +96,7 @@ typedef enum {
     TEXT_MALON_HOW_IS_EPONA_DOING = 0x2001,
     TEXT_MALON_EPONA_LOOKS_GREAT = 0x2002,
     TEXT_MALON_OBSTICLE_COURSE = 0x2003,
-    TEXT_MALON_EVERYONE_TURNING_EVIL = 0x204C, 
+    TEXT_MALON_EVERYONE_TURNING_EVIL = 0x204C,
     TEXT_MALON_I_SING_THIS_SONG = 0x2050,
     TEXT_MALON_EVERYONE_LIKED_SONG = 0x2051,
     TEXT_MALON_EPONA_LIKED_SONG = 0x2052,
@@ -162,6 +162,8 @@ typedef enum {
     TEXT_ANJU_THANKS_FOR_FINDING_MY_CUCCOS = 0x503B,
     TEXT_ANJU_ROUND_THEM_UP_OR_YOULL_PAY = 0x503C,
     TEXT_ANJU_DONT_TEASE_MY_CUCCOS = 0x503D,
+    TEXT_BIG_POE_COLLECTED_RANDO = 0x5090,
+    TEXT_GERUDO_GUARD_FRIENDLY = 0x6005,
     TEXT_HBA_NOT_ON_HORSE = 0x603F,
     TEXT_HBA_INITIAL_EXPLAINATION = 0x6040,
     TEXT_HBA_WANT_TO_TRY_AGAIN_YES_NO = 0x6041,
@@ -211,6 +213,6 @@ typedef struct {
     { giid, iid, message, message, message }
 
 #define GIMESSAGE_NO_GERMAN(giid, iid, english, french) \
-    { giid, iid, english, english, french  }
+    { giid, iid, english, english, french }
 
 #endif
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 57852fb634..c609dd2a19 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -11,6 +11,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
 #include "soh/Enhancements/audio/AudioEditor.h"
+#include "soh/Enhancements/randomizer/logic.h"
 
 #define Path _Path
 #define PATH_HACK
@@ -36,10 +37,17 @@ extern PlayState* gPlayState;
 
 #define CMD_REGISTER Ship::Context::GetInstance()->GetConsole()->AddCommand
 // TODO: Commands should be using the output passed in.
-#define ERROR_MESSAGE std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->SendErrorMessage
-#define INFO_MESSAGE std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->SendInfoMessage
+#define ERROR_MESSAGE                                                                 \
+    std::reinterpret_pointer_cast<Ship::ConsoleWindow>(                               \
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console")) \
+        ->SendErrorMessage
+#define INFO_MESSAGE                                                                  \
+    std::reinterpret_pointer_cast<Ship::ConsoleWindow>(                               \
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console")) \
+        ->SendInfoMessage
 
-static bool ActorSpawnHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool ActorSpawnHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     if ((args.size() != 9) && (args.size() != 3) && (args.size() != 6)) {
         ERROR_MESSAGE("Not enough arguments passed to actorspawn");
         return 1;
@@ -79,6 +87,7 @@ static bool ActorSpawnHandler(std::shared_ptr<Ship::Console> Console, const std:
             if (args[8][0] != ',') {
                 spawnPoint.rot.z = std::stoi(args[8]);
             }
+            [[fallthrough]];
         case 6:
             if (args[3][0] != ',') {
                 spawnPoint.pos.x = std::stoi(args[3]);
@@ -99,7 +108,8 @@ static bool ActorSpawnHandler(std::shared_ptr<Ship::Console> Console, const std:
     return 0;
 }
 
-static bool KillPlayerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>&, std::string* output) {
+static bool KillPlayerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>&,
+                              std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::SetPlayerHealth();
     dynamic_cast<ParameterizedGameInteractionEffect*>(effect)->parameters[0] = 0;
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
@@ -112,7 +122,8 @@ static bool KillPlayerHandler(std::shared_ptr<Ship::Console> Console, const std:
     }
 }
 
-static bool SetPlayerHealthHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool SetPlayerHealthHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                   std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -143,7 +154,8 @@ static bool SetPlayerHealthHandler(std::shared_ptr<Ship::Console> Console, const
     }
 }
 
-static bool LoadSceneHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>&, std::string* output) {
+static bool LoadSceneHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>&,
+                             std::string* output) {
     gSaveContext.respawnFlag = 0;
     gSaveContext.seqId = 0xFF;
     gSaveContext.gameMode = GAMEMODE_NORMAL;
@@ -151,7 +163,8 @@ static bool LoadSceneHandler(std::shared_ptr<Ship::Console> Console, const std::
     return 0;
 }
 
-static bool RupeeHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool RupeeHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                         std::string* output) {
     if (args.size() < 2) {
         return 1;
     }
@@ -159,8 +172,7 @@ static bool RupeeHandler(std::shared_ptr<Ship::Console> Console, const std::vect
     int rupeeAmount;
     try {
         rupeeAmount = std::stoi(args[1]);
-    }
-    catch (std::invalid_argument const& ex) {
+    } catch (std::invalid_argument const& ex) {
         ERROR_MESSAGE("[SOH] Rupee count must be an integer.");
         return 1;
     }
@@ -170,13 +182,14 @@ static bool RupeeHandler(std::shared_ptr<Ship::Console> Console, const std::vect
         return 1;
     }
 
-   gSaveContext.rupees = rupeeAmount;
+    gSaveContext.rupees = rupeeAmount;
 
     INFO_MESSAGE("Set rupee count to %u", rupeeAmount);
     return 0;
 }
 
-static bool SetPosHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string> args, std::string* output) {
+static bool SetPosHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string> args,
+                          std::string* output) {
     if (gPlayState == nullptr) {
         ERROR_MESSAGE("PlayState == nullptr");
         return 1;
@@ -185,9 +198,8 @@ static bool SetPosHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     Player* player = GET_PLAYER(gPlayState);
 
     if (args.size() == 1) {
-        INFO_MESSAGE("Player position is [ %.2f, %.2f, %.2f ]", player->actor.world.pos.x,
-                                            player->actor.world.pos.y,
-             player->actor.world.pos.z);
+        INFO_MESSAGE("Player position is [ %.2f, %.2f, %.2f ]", player->actor.world.pos.x, player->actor.world.pos.y,
+                     player->actor.world.pos.z);
         return 0;
     }
     if (args.size() < 4)
@@ -197,9 +209,8 @@ static bool SetPosHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     player->actor.world.pos.y = std::stof(args[2]);
     player->actor.world.pos.z = std::stof(args[3]);
 
-    INFO_MESSAGE("Set player position to [ %.2f, %.2f, %.2f ]", player->actor.world.pos.x,
-                                        player->actor.world.pos.y,
-         player->actor.world.pos.z);
+    INFO_MESSAGE("Set player position to [ %.2f, %.2f, %.2f ]", player->actor.world.pos.x, player->actor.world.pos.y,
+                 player->actor.world.pos.z);
     return 0;
 }
 
@@ -214,14 +225,13 @@ static bool ResetHandler(std::shared_ptr<Ship::Console> Console, std::vector<std
     return 0;
 }
 
-const static std::map<std::string, uint16_t> ammoItems{ 
-    { "sticks", ITEM_STICK }, { "nuts", ITEM_NUT },
-    { "bombs", ITEM_BOMB },   { "seeds", ITEM_SLINGSHOT },
-    { "arrows", ITEM_BOW },   { "bombchus", ITEM_BOMBCHU },
-    { "beans", ITEM_BEAN }
+const static std::map<std::string, uint16_t> ammoItems{
+    { "sticks", ITEM_STICK }, { "nuts", ITEM_NUT },         { "bombs", ITEM_BOMB }, { "seeds", ITEM_SLINGSHOT },
+    { "arrows", ITEM_BOW },   { "bombchus", ITEM_BOMBCHU }, { "beans", ITEM_BEAN },
 };
 
-static bool AddAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool AddAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                           std::string* output) {
     if (args.size() < 3) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -242,7 +252,8 @@ static bool AddAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::ve
 
     const auto& it = ammoItems.find(args[1]);
     if (it == ammoItems.end()) {
-        ERROR_MESSAGE("Invalid ammo type. Options are 'sticks', 'nuts', 'bombs', 'seeds', 'arrows', 'bombchus' and 'beans'");
+        ERROR_MESSAGE(
+            "Invalid ammo type. Options are 'sticks', 'nuts', 'bombs', 'seeds', 'arrows', 'bombchus' and 'beans'");
         return 1;
     }
 
@@ -260,7 +271,8 @@ static bool AddAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::ve
     }
 }
 
-static bool TakeAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool TakeAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                            std::string* output) {
     if (args.size() < 3) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -301,13 +313,22 @@ static bool TakeAmmoHandler(std::shared_ptr<Ship::Console> Console, const std::v
 }
 
 const static std::map<std::string, uint16_t> bottleItems{
-    { "green_potion", ITEM_POTION_GREEN }, { "red_potion", ITEM_POTION_RED }, { "blue_potion", ITEM_POTION_BLUE },
-    { "milk", ITEM_MILK },                 { "half_milk", ITEM_MILK_HALF },   { "fairy", ITEM_FAIRY },
-    { "bugs", ITEM_BUG },                  { "fish", ITEM_FISH },             { "poe", ITEM_POE },
-    { "big_poe", ITEM_BIG_POE },           { "blue_fire", ITEM_BLUE_FIRE },   { "rutos_letter", ITEM_LETTER_RUTO },
+    { "green_potion", ITEM_POTION_GREEN },
+    { "red_potion", ITEM_POTION_RED },
+    { "blue_potion", ITEM_POTION_BLUE },
+    { "milk", ITEM_MILK },
+    { "half_milk", ITEM_MILK_HALF },
+    { "fairy", ITEM_FAIRY },
+    { "bugs", ITEM_BUG },
+    { "fish", ITEM_FISH },
+    { "poe", ITEM_POE },
+    { "big_poe", ITEM_BIG_POE },
+    { "blue_fire", ITEM_BLUE_FIRE },
+    { "rutos_letter", ITEM_LETTER_RUTO },
 };
 
-static bool BottleHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool BottleHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                          std::string* output) {
     if (args.size() < 3) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -328,7 +349,7 @@ static bool BottleHandler(std::shared_ptr<Ship::Console> Console, const std::vec
 
     const auto& it = bottleItems.find(args[1]);
 
-    if (it ==  bottleItems.end()) {
+    if (it == bottleItems.end()) {
         ERROR_MESSAGE("Invalid item passed");
         return 1;
     }
@@ -339,7 +360,8 @@ static bool BottleHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     return 0;
 }
 
-static bool BHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool BHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                     std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -349,7 +371,8 @@ static bool BHandler(std::shared_ptr<Ship::Console> Console, const std::vector<s
     return 0;
 }
 
-static bool ItemHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool ItemHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     if (args.size() < 3) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -360,7 +383,8 @@ static bool ItemHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
     return 0;
 }
 
-static bool GiveItemHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string> args, std::string* output) {
+static bool GiveItemHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string> args,
+                            std::string* output) {
     if (args.size() < 3) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -381,7 +405,8 @@ static bool GiveItemHandler(std::shared_ptr<Ship::Console> Console, const std::v
     return 0;
 }
 
-static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                            std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -403,15 +428,16 @@ static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::v
     return 0;
 }
 
-static bool VoidHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool VoidHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     if (gPlayState != nullptr) {
-            gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags = gPlayState->actorCtx.flags.tempSwch;
-            gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags = gPlayState->actorCtx.flags.tempCollect;
-            gSaveContext.respawnFlag = 1;
-            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
-            gPlayState->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex;
-            gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
-            gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
+        gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags = gPlayState->actorCtx.flags.tempSwch;
+        gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags = gPlayState->actorCtx.flags.tempCollect;
+        gSaveContext.respawnFlag = 1;
+        gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+        gPlayState->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex;
+        gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
+        gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
     } else {
         ERROR_MESSAGE("gPlayState == nullptr");
         return 1;
@@ -419,7 +445,8 @@ static bool VoidHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
     return 0;
 }
 
-static bool ReloadHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool ReloadHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                          std::string* output) {
     if (gPlayState != nullptr) {
         gPlayState->nextEntranceIndex = gSaveContext.entranceIndex;
         gPlayState->transitionTrigger = TRANS_TRIGGER_START;
@@ -432,11 +459,10 @@ static bool ReloadHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     return 0;
 }
 
-const static std::map<std::string, uint16_t> fw_options {
-    { "clear", 0}, {"warp", 1}, {"backup", 2}
-};
+const static std::map<std::string, uint16_t> fw_options{ { "clear", 0 }, { "warp", 1 }, { "backup", 2 } };
 
-static bool FWHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool FWHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                      std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -447,16 +473,16 @@ static bool FWHandler(std::shared_ptr<Ship::Console> Console, const std::vector<
         ERROR_MESSAGE("[SOH] Invalid option. Options are 'clear', 'warp', 'backup'");
         return 1;
     }
-    
+
     if (gPlayState != nullptr) {
         FaroresWindData clear = {};
-        switch(it->second) {
-            case 0: //clear
+        switch (it->second) {
+            case 0: // clear
                 gSaveContext.fw = clear;
                 INFO_MESSAGE("[SOH] Farore's wind point cleared! Reload scene to take effect.");
                 return 0;
                 break;
-            case 1: //warp
+            case 1: // warp
                 if (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0) {
                     gPlayState->transitionTrigger = TRANS_TRIGGER_START;
                     gPlayState->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex;
@@ -467,7 +493,7 @@ static bool FWHandler(std::shared_ptr<Ship::Console> Console, const std::vector<
                 }
                 return 0;
                 break;
-            case 2: //backup
+            case 2: // backup
                 if (CVarGetInteger(CVAR_ENHANCEMENT("BetterFarore"), 0)) {
                     gSaveContext.fw = gSaveContext.ship.backupFW;
                     gSaveContext.fw.set = 1;
@@ -479,16 +505,16 @@ static bool FWHandler(std::shared_ptr<Ship::Console> Console, const std::vector<
                 }
                 break;
         }
-    }
-    else {
+    } else {
         ERROR_MESSAGE("gPlayState == nullptr");
         return 1;
     }
-    
+
     return 0;
 }
 
-static bool FileSelectHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool FileSelectHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     if (gGameState == nullptr) {
         ERROR_MESSAGE("gGameState == nullptr");
         return 1;
@@ -500,12 +526,14 @@ static bool FileSelectHandler(std::shared_ptr<Ship::Console> Console, const std:
     return 0;
 }
 
-static bool QuitHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool QuitHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     Ship::Context::GetInstance()->GetWindow()->Close();
     return 0;
 }
 
-static bool SaveStateHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool SaveStateHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
     const SaveStateReturn rtn = OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::SAVE });
 
@@ -521,7 +549,8 @@ static bool SaveStateHandler(std::shared_ptr<Ship::Console> Console, const std::
     }
 }
 
-static bool LoadStateHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool LoadStateHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
     const SaveStateReturn rtn = OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::LOAD });
 
@@ -541,10 +570,10 @@ static bool LoadStateHandler(std::shared_ptr<Ship::Console> Console, const std::
         default:
             return 1;
     }
-
 }
 
-static bool StateSlotSelectHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool StateSlotSelectHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                   std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -564,12 +593,12 @@ static bool StateSlotSelectHandler(std::shared_ptr<Ship::Console> Console, const
     }
 
     OTRGlobals::Instance->gSaveStateMgr->SetCurrentSlot(slot);
-    INFO_MESSAGE("[SOH] Slot %u selected",
-                                        OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot());
+    INFO_MESSAGE("[SOH] Slot %u selected", OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot());
     return 0;
 }
 
-static bool InvisibleHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool InvisibleHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -584,19 +613,19 @@ static bool InvisibleHandler(std::shared_ptr<Ship::Console> Console, const std::
     }
 
     RemovableGameInteractionEffect* effect = new GameInteractionEffect::InvisibleLink();
-    GameInteractionEffectQueryResult result = 
+    GameInteractionEffectQueryResult result =
         state ? GameInteractor::ApplyEffect(effect) : GameInteractor::RemoveEffect(effect);
     if (result == GameInteractionEffectQueryResult::Possible) {
         INFO_MESSAGE("[SOH] Invisible Link %s", state ? "enabled" : "disabled");
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not %s Invisible Link.",
-                                                state ? "enable" : "disable");
+        INFO_MESSAGE("[SOH] Command failed: Could not %s Invisible Link.", state ? "enable" : "disable");
         return 1;
     }
 }
 
-static bool GiantLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool GiantLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -618,13 +647,13 @@ static bool GiantLinkHandler(std::shared_ptr<Ship::Console> Console, const std::
         INFO_MESSAGE("[SOH] Giant Link %s", state ? "enabled" : "disabled");
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not %s Giant Link.",
-                                                state ? "enable" : "disable");
+        INFO_MESSAGE("[SOH] Command failed: Could not %s Giant Link.", state ? "enable" : "disable");
         return 1;
     }
 }
 
-static bool MinishLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool MinishLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -646,13 +675,13 @@ static bool MinishLinkHandler(std::shared_ptr<Ship::Console> Console, const std:
         INFO_MESSAGE("[SOH] Minish Link %s", state ? "enabled" : "disabled");
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not %s Minish Link.",
-                                                state ? "enable" : "disable");
+        INFO_MESSAGE("[SOH] Command failed: Could not %s Minish Link.", state ? "enable" : "disable");
         return 1;
     }
 }
 
-static bool AddHeartContainerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool AddHeartContainerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                     std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -683,7 +712,8 @@ static bool AddHeartContainerHandler(std::shared_ptr<Ship::Console> Console, con
     }
 }
 
-static bool RemoveHeartContainerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool RemoveHeartContainerHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                        std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -714,7 +744,8 @@ static bool RemoveHeartContainerHandler(std::shared_ptr<Ship::Console> Console,
     }
 }
 
-static bool GravityHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool GravityHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                           std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -723,12 +754,13 @@ static bool GravityHandler(std::shared_ptr<Ship::Console> Console, const std::ve
     GameInteractionEffectBase* effect = new GameInteractionEffect::ModifyGravity();
 
     try {
-        dynamic_cast<ParameterizedGameInteractionEffect*>(effect)->parameters[0] = Ship::Math::clamp(std::stoi(args[1], nullptr, 10), GI_GRAVITY_LEVEL_LIGHT, GI_GRAVITY_LEVEL_HEAVY);
+        dynamic_cast<ParameterizedGameInteractionEffect*>(effect)->parameters[0] =
+            Ship::Math::clamp(std::stoi(args[1], nullptr, 10), GI_GRAVITY_LEVEL_LIGHT, GI_GRAVITY_LEVEL_HEAVY);
     } catch (std::invalid_argument const& ex) {
         ERROR_MESSAGE("[SOH] Gravity value must be a number.");
         return 1;
     }
-    
+
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
     if (result == GameInteractionEffectQueryResult::Possible) {
         INFO_MESSAGE("[SOH] Updated gravity.");
@@ -739,7 +771,8 @@ static bool GravityHandler(std::shared_ptr<Ship::Console> Console, const std::ve
     }
 }
 
-static bool NoUIHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool NoUIHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -752,7 +785,7 @@ static bool NoUIHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
         ERROR_MESSAGE("[SOH] No UI value must be a number.");
         return 1;
     }
-    
+
     RemovableGameInteractionEffect* effect = new GameInteractionEffect::NoUI();
     GameInteractionEffectQueryResult result =
         state ? GameInteractor::ApplyEffect(effect) : GameInteractor::RemoveEffect(effect);
@@ -761,13 +794,13 @@ static bool NoUIHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
         INFO_MESSAGE("[SOH] No UI %s", state ? "enabled" : "disabled");
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not %s No UI.",
-                                                state ? "enable" : "disable");
+        INFO_MESSAGE("[SOH] Command failed: Could not %s No UI.", state ? "enable" : "disable");
         return 1;
     }
 }
 
-static bool FreezeHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool FreezeHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                          std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::FreezePlayer();
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
 
@@ -780,7 +813,8 @@ static bool FreezeHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     }
 }
 
-static bool DefenseModifierHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool DefenseModifierHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                   std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -796,7 +830,8 @@ static bool DefenseModifierHandler(std::shared_ptr<Ship::Console> Console, const
 
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
     if (result == GameInteractionEffectQueryResult::Possible) {
-        INFO_MESSAGE("[SOH] Defense modifier set to %d", dynamic_cast<ParameterizedGameInteractionEffect*>(effect)->parameters[0]);
+        INFO_MESSAGE("[SOH] Defense modifier set to %d",
+                     dynamic_cast<ParameterizedGameInteractionEffect*>(effect)->parameters[0]);
         return 0;
     } else {
         INFO_MESSAGE("[SOH] Command failed: Could not set defense modifier.");
@@ -804,7 +839,8 @@ static bool DefenseModifierHandler(std::shared_ptr<Ship::Console> Console, const
     }
 }
 
-static bool DamageHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool DamageHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                          std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -834,7 +870,8 @@ static bool DamageHandler(std::shared_ptr<Ship::Console> Console, const std::vec
     }
 }
 
-static bool HealHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool HealHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -864,7 +901,8 @@ static bool HealHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
     }
 }
 
-static bool FillMagicHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool FillMagicHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::FillMagic();
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
 
@@ -877,7 +915,8 @@ static bool FillMagicHandler(std::shared_ptr<Ship::Console> Console, const std::
     }
 }
 
-static bool EmptyMagicHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool EmptyMagicHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::EmptyMagic();
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
 
@@ -890,12 +929,13 @@ static bool EmptyMagicHandler(std::shared_ptr<Ship::Console> Console, const std:
     }
 }
 
-static bool NoZHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
-     if (args.size() < 2) {
+static bool NoZHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                       std::string* output) {
+    if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
     }
-     uint8_t state;
+    uint8_t state;
 
     try {
         state = std::stoi(args[1], nullptr, 10) == 0 ? 0 : 1;
@@ -912,13 +952,13 @@ static bool NoZHandler(std::shared_ptr<Ship::Console> Console, const std::vector
         INFO_MESSAGE("[SOH] NoZ " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " NoZ.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") + " NoZ.");
         return 1;
     }
 }
 
-static bool OneHitKOHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool OneHitKOHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                            std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -940,13 +980,13 @@ static bool OneHitKOHandler(std::shared_ptr<Ship::Console> Console, const std::v
         INFO_MESSAGE("[SOH] One-hit KO " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " One-hit KO.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") + " One-hit KO.");
         return 1;
     }
 }
 
-static bool PacifistHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool PacifistHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                            std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -968,13 +1008,13 @@ static bool PacifistHandler(std::shared_ptr<Ship::Console> Console, const std::v
         INFO_MESSAGE("[SOH] Pacifist " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " Pacifist.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") + " Pacifist.");
         return 1;
     }
 }
 
-static bool PaperLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool PaperLinkHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -997,13 +1037,13 @@ static bool PaperLinkHandler(std::shared_ptr<Ship::Console> Console, const std::
         INFO_MESSAGE("[SOH] Paper Link " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " Paper Link.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") + " Paper Link.");
         return 1;
     }
 }
 
-static bool RainstormHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool RainstormHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1025,13 +1065,13 @@ static bool RainstormHandler(std::shared_ptr<Ship::Console> Console, const std::
         INFO_MESSAGE("[SOH] Rainstorm " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " Rainstorm.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") + " Rainstorm.");
         return 1;
     }
 }
 
-static bool ReverseControlsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool ReverseControlsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                   std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1050,17 +1090,17 @@ static bool ReverseControlsHandler(std::shared_ptr<Ship::Console> Console, const
         state ? GameInteractor::ApplyEffect(effect) : GameInteractor::RemoveEffect(effect);
 
     if (result == GameInteractionEffectQueryResult::Possible) {
-        INFO_MESSAGE("[SOH] Reverse controls " +
-                                                std::string(state ? "enabled" : "disabled"));
+        INFO_MESSAGE("[SOH] Reverse controls " + std::string(state ? "enabled" : "disabled"));
         return 0;
     } else {
-        INFO_MESSAGE("[SOH] Command failed: Could not " +
-                                                std::string(state ? "enable" : "disable") + " Reverse controls.");
+        INFO_MESSAGE("[SOH] Command failed: Could not " + std::string(state ? "enable" : "disable") +
+                     " Reverse controls.");
         return 1;
     }
 }
 
-static bool UpdateRupeesHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool UpdateRupeesHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1084,7 +1124,8 @@ static bool UpdateRupeesHandler(std::shared_ptr<Ship::Console> Console, const st
     }
 }
 
-static bool SpeedModifierHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool SpeedModifierHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                 std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1108,13 +1149,14 @@ static bool SpeedModifierHandler(std::shared_ptr<Ship::Console> Console, const s
     }
 }
 
-const static std::map<std::string, uint16_t> boots {
+const static std::map<std::string, uint16_t> boots{
     { "kokiri", EQUIP_VALUE_BOOTS_KOKIRI },
     { "iron", EQUIP_VALUE_BOOTS_IRON },
     { "hover", EQUIP_VALUE_BOOTS_HOVER },
 };
 
-static bool BootsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool BootsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                         std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1139,13 +1181,14 @@ static bool BootsHandler(std::shared_ptr<Ship::Console> Console, const std::vect
     }
 }
 
-const static std::map<std::string, uint16_t> shields {
+const static std::map<std::string, uint16_t> shields{
     { "deku", ITEM_SHIELD_DEKU },
     { "hylian", ITEM_SHIELD_HYLIAN },
     { "mirror", ITEM_SHIELD_MIRROR },
 };
 
-static bool GiveShieldHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool GiveShieldHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1170,7 +1213,8 @@ static bool GiveShieldHandler(std::shared_ptr<Ship::Console> Console, const std:
     }
 }
 
-static bool TakeShieldHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool TakeShieldHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1195,7 +1239,8 @@ static bool TakeShieldHandler(std::shared_ptr<Ship::Console> Console, const std:
     }
 }
 
-static bool KnockbackHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool KnockbackHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1225,7 +1270,8 @@ static bool KnockbackHandler(std::shared_ptr<Ship::Console> Console, const std::
     }
 }
 
-static bool ElectrocuteHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool ElectrocuteHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                               std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::ElectrocutePlayer();
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
 
@@ -1238,7 +1284,8 @@ static bool ElectrocuteHandler(std::shared_ptr<Ship::Console> Console, const std
     }
 }
 
-static bool BurnHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool BurnHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                        std::string* output) {
     GameInteractionEffectBase* effect = new GameInteractionEffect::BurnPlayer();
     GameInteractionEffectQueryResult result = GameInteractor::ApplyEffect(effect);
 
@@ -1251,7 +1298,8 @@ static bool BurnHandler(std::shared_ptr<Ship::Console> Console, const std::vecto
     }
 }
 
-static bool CuccoStormHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool CuccoStormHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                              std::string* output) {
     GameInteractionEffectQueryResult result = GameInteractor::RawAction::SpawnActor(ACTOR_EN_NIW, 0);
 
     if (result == GameInteractionEffectQueryResult::Possible) {
@@ -1263,7 +1311,8 @@ static bool CuccoStormHandler(std::shared_ptr<Ship::Console> Console, const std:
     }
 }
 
-static bool GenerateRandoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool GenerateRandoHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                                 std::string* output) {
     if (args.size() == 1) {
         if (GenerateRandomizer()) {
             return 0;
@@ -1278,7 +1327,7 @@ static bool GenerateRandoHandler(std::shared_ptr<Ship::Console> Console, const s
             seed = "seed_testing_count";
         }
 
-        if (GenerateRandomizer(seed + std::to_string(value))){
+        if (GenerateRandomizer(seed + std::to_string(value))) {
             return 0;
         }
     } catch (std::invalid_argument const& ex) {
@@ -1286,36 +1335,36 @@ static bool GenerateRandoHandler(std::shared_ptr<Ship::Console> Console, const s
         return 1;
     }
 
-
     ERROR_MESSAGE("[SOH] Rando generation already in progress");
     return 1;
 }
 
-static constexpr std::array<std::pair<const char*, CosmeticGroup>, COSMETICS_GROUP_MAX> cosmetic_groups = {{
-    {"link", COSMETICS_GROUP_LINK},
-    {"mirror_shield", COSMETICS_GROUP_MIRRORSHIELD},
-    {"swords", COSMETICS_GROUP_SWORDS},
-    {"gloves", COSMETICS_GROUP_GLOVES},
-    {"equipment", COSMETICS_GROUP_EQUIPMENT},
-    {"keyring", COSMETICS_GROUP_KEYRING},
-    {"small_keys", COSMETICS_GROUP_SMALL_KEYS },
-    {"boss_keys", COSMETICS_GROUP_BOSS_KEYS },
-    {"consumable", COSMETICS_GROUP_CONSUMABLE},
-    {"hud", COSMETICS_GROUP_HUD},
-    {"kaleido", COSMETICS_GROUP_KALEIDO},
-    {"title", COSMETICS_GROUP_TITLE},
-    {"npc", COSMETICS_GROUP_NPC},
-    {"world", COSMETICS_GROUP_WORLD},
-    {"magic", COSMETICS_GROUP_MAGIC},
-    {"arrows", COSMETICS_GROUP_ARROWS},
-    {"spin_attack", COSMETICS_GROUP_SPIN_ATTACK},
-    {"trials", COSMETICS_GROUP_TRAILS},
-    {"navi", COSMETICS_GROUP_NAVI},
-    {"ivan", COSMETICS_GROUP_IVAN},
-    {"message", COSMETICS_GROUP_MESSAGE},
-}};
+static constexpr std::array<std::pair<const char*, CosmeticGroup>, COSMETICS_GROUP_MAX> cosmetic_groups = { {
+    { "link", COSMETICS_GROUP_LINK },
+    { "mirror_shield", COSMETICS_GROUP_MIRRORSHIELD },
+    { "swords", COSMETICS_GROUP_SWORDS },
+    { "gloves", COSMETICS_GROUP_GLOVES },
+    { "equipment", COSMETICS_GROUP_EQUIPMENT },
+    { "keyring", COSMETICS_GROUP_KEYRING },
+    { "small_keys", COSMETICS_GROUP_SMALL_KEYS },
+    { "boss_keys", COSMETICS_GROUP_BOSS_KEYS },
+    { "consumable", COSMETICS_GROUP_CONSUMABLE },
+    { "hud", COSMETICS_GROUP_HUD },
+    { "kaleido", COSMETICS_GROUP_KALEIDO },
+    { "title", COSMETICS_GROUP_TITLE },
+    { "npc", COSMETICS_GROUP_NPC },
+    { "world", COSMETICS_GROUP_WORLD },
+    { "magic", COSMETICS_GROUP_MAGIC },
+    { "arrows", COSMETICS_GROUP_ARROWS },
+    { "spin_attack", COSMETICS_GROUP_SPIN_ATTACK },
+    { "trials", COSMETICS_GROUP_TRAILS },
+    { "navi", COSMETICS_GROUP_NAVI },
+    { "ivan", COSMETICS_GROUP_IVAN },
+    { "message", COSMETICS_GROUP_MESSAGE },
+} };
 
-static bool CosmeticsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool CosmeticsHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                             std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1356,18 +1405,13 @@ static bool CosmeticsHandler(std::shared_ptr<Ship::Console> Console, const std::
 }
 
 static std::map<std::string, SeqType> sfx_groups = {
-    {"bgm", SEQ_BGM_WORLD},
-    {"fanfares", SEQ_FANFARE},
-    {"events", SEQ_BGM_EVENT},
-    {"battle", SEQ_BGM_BATTLE},
-    {"ocarina", SEQ_OCARINA},
-    {"instruments", SEQ_INSTRUMENT},
-    {"sfx", SEQ_SFX},
-    {"voices", SEQ_VOICE},
-    {"custom", SEQ_BGM_CUSTOM},
+    { "bgm", SEQ_BGM_WORLD },     { "fanfares", SEQ_FANFARE }, { "events", SEQ_BGM_EVENT },
+    { "battle", SEQ_BGM_BATTLE }, { "ocarina", SEQ_OCARINA },  { "instruments", SEQ_INSTRUMENT },
+    { "sfx", SEQ_SFX },           { "voices", SEQ_VOICE },     { "custom", SEQ_BGM_CUSTOM },
 };
 
-static bool SfxHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
+static bool SfxHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args,
+                       std::string* output) {
     if (args.size() < 2) {
         ERROR_MESSAGE("[SOH] Unexpected arguments passed");
         return 1;
@@ -1407,194 +1451,322 @@ static bool SfxHandler(std::shared_ptr<Ship::Console> Console, const std::vector
     return 0;
 }
 
+static bool AvailableChecksProcessUndiscoveredExitsHandler(std::shared_ptr<Ship::Console> Console,
+                                                           const std::vector<std::string>& args, std::string* output) {
+    const auto& logic = Rando::Context::GetInstance()->GetLogic();
+    bool enabled = false;
+
+    if (args.size() == 1) {
+        enabled = !logic->ACProcessUndiscoveredExits;
+    } else {
+        try {
+            enabled = std::stoi(args[1]);
+        } catch (std::invalid_argument const& ex) {
+            ERROR_MESSAGE("[SOH] Enable should be 0 or 1");
+            return 1;
+        }
+    }
+
+    logic->ACProcessUndiscoveredExits = enabled;
+    INFO_MESSAGE("[SOH] Available Checks - Process Undiscovered Exits %s",
+                 logic->ACProcessUndiscoveredExits ? "enabled" : "disabled");
+
+    if (GameInteractor::IsSaveLoaded(true)) {
+        CheckTracker::RecalculateAvailableChecks();
+    }
+
+    return 0;
+}
+
+static bool AvailableChecksRecalculateHandler(std::shared_ptr<Ship::Console> Console,
+                                              const std::vector<std::string>& args, std::string* output) {
+    RandomizerRegion startingRegion = RR_ROOT;
+
+    if (args.size() > 1) {
+        try {
+            startingRegion = static_cast<RandomizerRegion>(std::stoi(args[1]));
+        } catch (std::invalid_argument const& ex) {
+            ERROR_MESSAGE("[SOH] Region should be a number");
+            return 1;
+        }
+
+        if (startingRegion <= RR_NONE || startingRegion >= RR_MAX) {
+            ERROR_MESSAGE("[SOH] Region should be between 1 and %d", RR_MAX - 1);
+            return 1;
+        }
+    }
+
+    CheckTracker::RecalculateAvailableChecks(startingRegion);
+    return 0;
+}
+
 void DebugConsole_Init(void) {
     // Console
-    CMD_REGISTER("file_select", {FileSelectHandler, "Returns to the file select."});
-    CMD_REGISTER("reset", {ResetHandler, "Resets the game."});
-    CMD_REGISTER("quit", {QuitHandler, "Quits the game."});
+    CMD_REGISTER("file_select", { FileSelectHandler, "Returns to the file select." });
+    CMD_REGISTER("reset", { ResetHandler, "Resets the game." });
+    CMD_REGISTER("quit", { QuitHandler, "Quits the game." });
 
     // Save States
-    CMD_REGISTER("save_state", {SaveStateHandler, "Save a state."});
-    CMD_REGISTER("load_state", {LoadStateHandler, "Load a state."});
-    CMD_REGISTER("set_slot", {StateSlotSelectHandler, "Selects a SaveState slot", {
-            {"Slot number", Ship::ArgumentType::NUMBER,}
-    }});
+    CMD_REGISTER("save_state", { SaveStateHandler, "Save a state." });
+    CMD_REGISTER("load_state", { LoadStateHandler, "Load a state." });
+    CMD_REGISTER("set_slot", { StateSlotSelectHandler,
+                               "Selects a SaveState slot",
+                               {
+                                   { "Slot number", Ship::ArgumentType::NUMBER },
+                               } });
 
     // Map & Location
-    CMD_REGISTER("void", {VoidHandler, "Voids out of the current map."});
-    CMD_REGISTER("reload", {ReloadHandler, "Reloads the current map."});
-    CMD_REGISTER("fw", {FWHandler, "Spawns the player where Farore's Wind is set.", {
-            {"clear|warp|backup", Ship::ArgumentType::TEXT}
-    }});
-    CMD_REGISTER("entrance", {EntranceHandler, "Sends player to the entered entrance (hex)", {
-            {"entrance", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("void", { VoidHandler, "Voids out of the current map." });
+    CMD_REGISTER("reload", { ReloadHandler, "Reloads the current map." });
+    CMD_REGISTER("fw", { FWHandler,
+                         "Spawns the player where Farore's Wind is set.",
+                         {
+                             { "clear|warp|backup", Ship::ArgumentType::TEXT },
+                         } });
+    CMD_REGISTER("entrance", { EntranceHandler,
+                               "Sends player to the entered entrance (hex)",
+                               {
+                                   { "entrance", Ship::ArgumentType::NUMBER },
+                               } });
 
     // Gameplay
-    CMD_REGISTER("kill", {KillPlayerHandler, "Commit suicide."});
+    CMD_REGISTER("kill", { KillPlayerHandler, "Commit suicide." });
 
-    CMD_REGISTER("map", {LoadSceneHandler, "Load up kak?"});
+    CMD_REGISTER("map", { LoadSceneHandler, "Load up kak?" });
 
-    CMD_REGISTER("rupee", {RupeeHandler, "Set your rupee counter.", {
-            {"amount", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("rupee", { RupeeHandler,
+                            "Set your rupee counter.",
+                            {
+                                { "amount", Ship::ArgumentType::NUMBER },
+                            } });
 
-    CMD_REGISTER("bItem", {BHandler, "Set an item to the B button.", {
-            {"Item ID", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("bItem", { BHandler,
+                            "Set an item to the B button.",
+                            {
+                                { "Item ID", Ship::ArgumentType::NUMBER },
+                            } });
 
-    CMD_REGISTER("spawn", { ActorSpawnHandler, "Spawn an actor.", { { "actor name/id", Ship::ArgumentType::NUMBER }, // TODO there should be an actor_id arg type
-                                                                  {"data", Ship::ArgumentType::NUMBER},
-                                                                  {"x", Ship::ArgumentType::NUMBER, true},
-                                                                  {"y", Ship::ArgumentType::NUMBER, true},
-                                                                  {"z", Ship::ArgumentType::NUMBER, true},
-                                                                  {"rx", Ship::ArgumentType::NUMBER, true},
-                                                                  {"ry", Ship::ArgumentType::NUMBER, true},
-                                                                  {"rz", Ship::ArgumentType::NUMBER, true}
-    }});
+    CMD_REGISTER("spawn",
+                 { ActorSpawnHandler,
+                   "Spawn an actor.",
+                   {
+                       { "actor name/id", Ship::ArgumentType::NUMBER }, // TODO there should be an actor_id arg type
+                       { "data", Ship::ArgumentType::NUMBER },
+                       { "x", Ship::ArgumentType::NUMBER, true },
+                       { "y", Ship::ArgumentType::NUMBER, true },
+                       { "z", Ship::ArgumentType::NUMBER, true },
+                       { "rx", Ship::ArgumentType::NUMBER, true },
+                       { "ry", Ship::ArgumentType::NUMBER, true },
+                       { "rz", Ship::ArgumentType::NUMBER, true },
+                   } });
 
-    CMD_REGISTER("pos", {SetPosHandler, "Sets the position of the player.", {
-            {"x", Ship::ArgumentType::NUMBER, true},
-            {"y", Ship::ArgumentType::NUMBER, true},
-            {"z", Ship::ArgumentType::NUMBER, true}
-    }});
+    CMD_REGISTER("pos", { SetPosHandler,
+                          "Sets the position of the player.",
+                          {
+                              { "x", Ship::ArgumentType::NUMBER, true },
+                              { "y", Ship::ArgumentType::NUMBER, true },
+                              { "z", Ship::ArgumentType::NUMBER, true },
+                          } });
 
-    CMD_REGISTER("addammo", {AddAmmoHandler, "Adds ammo of an item.", {
-            {"sticks|nuts|bombs|seeds|arrows|bombchus|beans", Ship::ArgumentType::TEXT},
-            {"count", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("addammo", { AddAmmoHandler,
+                              "Adds ammo of an item.",
+                              {
+                                  { "sticks|nuts|bombs|seeds|arrows|bombchus|beans", Ship::ArgumentType::TEXT },
+                                  { "count", Ship::ArgumentType::NUMBER },
+                              } });
 
-    CMD_REGISTER("takeammo", {TakeAmmoHandler, "Removes ammo of an item.", {
-            {"sticks|nuts|bombs|seeds|arrows|bombchus|beans", Ship::ArgumentType::TEXT},
-            {"count", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("takeammo", { TakeAmmoHandler,
+                               "Removes ammo of an item.",
+                               {
+                                   { "sticks|nuts|bombs|seeds|arrows|bombchus|beans", Ship::ArgumentType::TEXT },
+                                   { "count", Ship::ArgumentType::NUMBER },
+                               } });
 
-    CMD_REGISTER("bottle", {BottleHandler, "Changes item in a bottle slot.", {
-            {"item", Ship::ArgumentType::TEXT},
-            {"slot", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("bottle", { BottleHandler,
+                             "Changes item in a bottle slot.",
+                             {
+                                 { "item", Ship::ArgumentType::TEXT },
+                                 { "slot", Ship::ArgumentType::NUMBER },
+                             } });
 
-    CMD_REGISTER("give_item", {GiveItemHandler, "Gives an item to the player as if it was given from an actor", {
-            {"vanilla|randomizer", Ship::ArgumentType::TEXT},
-            {"giveItemID", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("give_item", { GiveItemHandler,
+                                "Gives an item to the player as if it was given from an actor",
+                                {
+                                    { "vanilla|randomizer", Ship::ArgumentType::TEXT },
+                                    { "giveItemID", Ship::ArgumentType::NUMBER },
+                                } });
 
-    CMD_REGISTER("item", {ItemHandler, "Sets item ID in arg 1 into slot arg 2. No boundary checks. Use with caution.", {
-            {"slot", Ship::ArgumentType::NUMBER},
-            {"item id", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("item", { ItemHandler,
+                           "Sets item ID in arg 1 into slot arg 2. No boundary checks. Use with caution.",
+                           {
+                               { "slot", Ship::ArgumentType::NUMBER },
+                               { "item id", Ship::ArgumentType::NUMBER },
+                           } });
 
-    CMD_REGISTER("invisible", {InvisibleHandler, "Activate Link's Elvish cloak, making him appear invisible.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("invisible", { InvisibleHandler,
+                                "Activate Link's Elvish cloak, making him appear invisible.",
+                                {
+                                    { "value", Ship::ArgumentType::NUMBER },
+                                } });
 
-    CMD_REGISTER("giant_link", {GiantLinkHandler, "Turn Link into a giant Lonky boi.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("giant_link", { GiantLinkHandler,
+                                 "Turn Link into a giant Lonky boi.",
+                                 {
+                                     { "value", Ship::ArgumentType::NUMBER },
+                                 } });
 
-    CMD_REGISTER("minish_link", {MinishLinkHandler, "Turn Link into a minish boi.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("minish_link", { MinishLinkHandler,
+                                  "Turn Link into a minish boi.",
+                                  {
+                                      { "value", Ship::ArgumentType::NUMBER },
+                                  } });
 
     CMD_REGISTER("add_heart_container",
-                 {AddHeartContainerHandler, "Give Link a heart! The maximum amount of hearts is 20!"});
+                 { AddHeartContainerHandler, "Give Link a heart! The maximum amount of hearts is 20!" });
 
     CMD_REGISTER("remove_heart_container",
-                 {RemoveHeartContainerHandler, "Remove a heart from Link. The minimal amount of hearts is 3."});
+                 { RemoveHeartContainerHandler, "Remove a heart from Link. The minimal amount of hearts is 3." });
 
-    CMD_REGISTER("gravity", {GravityHandler, "Set gravity level.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("gravity", { GravityHandler,
+                              "Set gravity level.",
+                              {
+                                  { "value", Ship::ArgumentType::NUMBER },
+                              } });
 
-    CMD_REGISTER("no_ui", {NoUIHandler, "Disables the UI.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("no_ui", { NoUIHandler,
+                            "Disables the UI.",
+                            {
+                                { "value", Ship::ArgumentType::NUMBER },
+                            } });
 
-    CMD_REGISTER("freeze", {FreezeHandler, "Freezes Link in place"});
+    CMD_REGISTER("freeze", { FreezeHandler, "Freezes Link in place" });
 
-    CMD_REGISTER("defense_modifier", {DefenseModifierHandler, "Sets the defense modifier.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("defense_modifier", { DefenseModifierHandler,
+                                       "Sets the defense modifier.",
+                                       {
+                                           { "value", Ship::ArgumentType::NUMBER },
+                                       } });
 
-    CMD_REGISTER("damage", {DamageHandler, "Deal damage to Link.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("damage", { DamageHandler,
+                             "Deal damage to Link.",
+                             {
+                                 { "value", Ship::ArgumentType::NUMBER },
+                             } });
 
-    CMD_REGISTER("heal", {HealHandler, "Heals Link.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("heal", { HealHandler,
+                           "Heals Link.",
+                           {
+                               { "value", Ship::ArgumentType::NUMBER },
+                           } });
 
-    CMD_REGISTER("fill_magic", {FillMagicHandler, "Fills magic."});
+    CMD_REGISTER("fill_magic", { FillMagicHandler, "Fills magic." });
 
-    CMD_REGISTER("empty_magic", {EmptyMagicHandler, "Empties magic."});
+    CMD_REGISTER("empty_magic", { EmptyMagicHandler, "Empties magic." });
 
-    CMD_REGISTER("no_z", {NoZHandler, "Disables Z-button presses.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("no_z", { NoZHandler,
+                           "Disables Z-button presses.",
+                           {
+                               { "value", Ship::ArgumentType::NUMBER },
+                           } });
 
-    CMD_REGISTER("ohko", {OneHitKOHandler,
-                          "Activates one hit KO. Any damage kills Link and he cannot gain health in this mode.", {
-                                  {"value", Ship::ArgumentType::NUMBER}
-                          }});
+    CMD_REGISTER("ohko", { OneHitKOHandler,
+                           "Activates one hit KO. Any damage kills Link and he cannot gain health in this mode.",
+                           {
+                               { "value", Ship::ArgumentType::NUMBER },
+                           } });
 
-    CMD_REGISTER("pacifist", {PacifistHandler, "Activates pacifist mode. Prevents Link from using his weapon.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("pacifist", { PacifistHandler,
+                               "Activates pacifist mode. Prevents Link from using his weapon.",
+                               {
+                                   { "value", Ship::ArgumentType::NUMBER },
+                               } });
 
-    CMD_REGISTER("paper_link", {PaperLinkHandler, "Link but made out of paper.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("paper_link", { PaperLinkHandler,
+                                 "Link but made out of paper.",
+                                 {
+                                     { "value", Ship::ArgumentType::NUMBER },
+                                 } });
 
-    CMD_REGISTER("rainstorm", {RainstormHandler, "Activates rainstorm."});
+    CMD_REGISTER("rainstorm", { RainstormHandler, "Activates rainstorm." });
 
-    CMD_REGISTER("reverse_controls", {ReverseControlsHandler, "Reverses the controls.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("reverse_controls", { ReverseControlsHandler,
+                                       "Reverses the controls.",
+                                       {
+                                           { "value", Ship::ArgumentType::NUMBER },
+                                       } });
 
-    CMD_REGISTER("update_rupees", {UpdateRupeesHandler, "Adds rupees.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("update_rupees", { UpdateRupeesHandler,
+                                    "Adds rupees.",
+                                    {
+                                        { "value", Ship::ArgumentType::NUMBER },
+                                    } });
 
-    CMD_REGISTER("speed_modifier", {SpeedModifierHandler, "Sets the speed modifier.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("speed_modifier", { SpeedModifierHandler,
+                                     "Sets the speed modifier.",
+                                     {
+                                         { "value", Ship::ArgumentType::NUMBER },
+                                     } });
 
-    CMD_REGISTER("boots", {BootsHandler, "Activates boots.", {
-            {"kokiri|iron|hover", Ship::ArgumentType::TEXT},
-    }});
+    CMD_REGISTER("boots", { BootsHandler,
+                            "Activates boots.",
+                            {
+                                { "kokiri|iron|hover", Ship::ArgumentType::TEXT },
+                            } });
 
-    CMD_REGISTER("giveshield", {GiveShieldHandler, "Gives a shield and equips it when Link is the right age for it.", {
-            {"deku|hylian|mirror", Ship::ArgumentType::TEXT},
-    }});
+    CMD_REGISTER("giveshield", { GiveShieldHandler,
+                                 "Gives a shield and equips it when Link is the right age for it.",
+                                 {
+                                     { "deku|hylian|mirror", Ship::ArgumentType::TEXT },
+                                 } });
 
-    CMD_REGISTER("takeshield", {TakeShieldHandler, "Takes a shield and unequips it if Link is wearing it.", {
-            {"deku|hylian|mirror", Ship::ArgumentType::TEXT},
-    }});
+    CMD_REGISTER("takeshield", { TakeShieldHandler,
+                                 "Takes a shield and unequips it if Link is wearing it.",
+                                 {
+                                     { "deku|hylian|mirror", Ship::ArgumentType::TEXT },
+                                 } });
 
-    CMD_REGISTER("knockback", {KnockbackHandler, "Knocks Link back.", {
-            {"value", Ship::ArgumentType::NUMBER}
-    }});
+    CMD_REGISTER("knockback", { KnockbackHandler,
+                                "Knocks Link back.",
+                                {
+                                    { "value", Ship::ArgumentType::NUMBER },
+                                } });
 
-    CMD_REGISTER("electrocute", {ElectrocuteHandler, "Electrocutes Link."});
+    CMD_REGISTER("electrocute", { ElectrocuteHandler, "Electrocutes Link." });
 
-    CMD_REGISTER("burn", {BurnHandler, "Burns Link."});
+    CMD_REGISTER("burn", { BurnHandler, "Burns Link." });
 
-    CMD_REGISTER("cucco_storm", {CuccoStormHandler, "Cucco Storm"});
+    CMD_REGISTER("cucco_storm", { CuccoStormHandler, "Cucco Storm" });
 
-    CMD_REGISTER("gen_rando", {GenerateRandoHandler, "Generate a randomizer seed", {
-            {"seed|count", Ship::ArgumentType::NUMBER, true},
-            {"testing", Ship::ArgumentType::NUMBER, true},
-    }});
+    CMD_REGISTER("gen_rando", { GenerateRandoHandler,
+                                "Generate a randomizer seed",
+                                {
+                                    { "seed|count", Ship::ArgumentType::NUMBER, true },
+                                    { "testing", Ship::ArgumentType::NUMBER, true },
+                                } });
 
-    CMD_REGISTER("cosmetics", {CosmeticsHandler, "Change cosmetics.", {
-            {"reset|randomize", Ship::ArgumentType::TEXT},
-            {"group name", Ship::ArgumentType::TEXT, true},
-    }});
+    CMD_REGISTER("cosmetics", { CosmeticsHandler,
+                                "Change cosmetics.",
+                                {
+                                    { "reset|randomize", Ship::ArgumentType::TEXT },
+                                    { "group name", Ship::ArgumentType::TEXT, true },
+                                } });
 
-    CMD_REGISTER("sfx", {SfxHandler, "Change SFX.", {
-            {"reset|randomize", Ship::ArgumentType::TEXT},
-            {"group_name", Ship::ArgumentType::TEXT, true},
-    }});
+    CMD_REGISTER("sfx", { SfxHandler,
+                          "Change SFX.",
+                          {
+                              { "reset|randomize", Ship::ArgumentType::TEXT },
+                              { "group_name", Ship::ArgumentType::TEXT, true },
+                          } });
+
+    CMD_REGISTER("acpue", { AvailableChecksProcessUndiscoveredExitsHandler,
+                            "Available Checks - Process Undiscovered Exits",
+                            { { "enable", Ship::ArgumentType::NUMBER, true } } });
+
+    CMD_REGISTER("acr", { AvailableChecksRecalculateHandler,
+                          "Available Checks - Recalculate",
+                          {
+                              { "starting_region", Ship::ArgumentType::NUMBER, true },
+                          } });
 
     Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
 }
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp
index 589dbaf4a3..c018b00170 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@@ -1,6 +1,10 @@
 #include "MessageViewer.h"
 
-#include <soh/SohGui/UIWidgets.hpp>
+#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
+#include "soh/SohGui/SohMenu.h"
+#include "soh/OTRGlobals.h"
+
 #include <textures/message_static/message_static.h>
 
 #include "../custom-message/CustomMessageManager.h"
@@ -13,6 +17,8 @@
 
 extern "C" u8 sMessageHasSetSfx;
 
+using namespace UIWidgets;
+
 void MessageViewer::InitElement() {
     CustomMessageManager::Instance->AddCustomMessageTable(TABLE_ID);
     mTableIdBuf = static_cast<char*>(calloc(MAX_STRING_SIZE, sizeof(char)));
@@ -21,9 +27,12 @@ void MessageViewer::InitElement() {
 }
 
 void MessageViewer::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
     ImGui::Text("Table ID");
     ImGui::SameLine();
-    ImGui::InputText("##TableID", mTableIdBuf, MAX_STRING_SIZE, ImGuiInputTextFlags_CallbackCharFilter, UIWidgets::TextFilters::FilterAlphaNum);
+    PushStyleInput(THEME_COLOR);
+    ImGui::InputText("##TableID", mTableIdBuf, MAX_STRING_SIZE, ImGuiInputTextFlags_CallbackCharFilter,
+                     UIWidgets::TextFilters::FilterAlphaNum);
     UIWidgets::InsertHelpHoverText("Leave blank for vanilla table");
     ImGui::Text("Text ID");
     ImGui::SameLine();
@@ -35,9 +44,12 @@ void MessageViewer::DrawElement() {
         case HEXADECIMAL:
         default:
             ImGui::InputText("##TextID", mTextIdBuf, MAX_STRING_SIZE, ImGuiInputTextFlags_CharsHexadecimal);
-            UIWidgets::InsertHelpHoverText("Hexadecimal Text ID of the message to load. Hexadecimal digits only (0-9/A-F).");
+            UIWidgets::InsertHelpHoverText(
+                "Hexadecimal Text ID of the message to load. Hexadecimal digits only (0-9/A-F).");
             break;
     }
+    PopStyleInput();
+    PushStyleCheckbox(THEME_COLOR);
     if (ImGui::RadioButton("Hexadecimal", &mTextIdBase, HEXADECIMAL)) {
         memset(mTextIdBuf, 0, sizeof(char) * MAX_STRING_SIZE);
     }
@@ -45,20 +57,14 @@ void MessageViewer::DrawElement() {
     if (ImGui::RadioButton("Decimal", &mTextIdBase, DECIMAL)) {
         memset(mTextIdBuf, 0, sizeof(char) * MAX_STRING_SIZE);
     }
-    ImGui::Text("Language");
-    ImGui::SameLine();
-    if (ImGui::BeginCombo("##Language", mLanguages[mLanguage])) {
-        // ReSharper disable CppDFAUnreachableCode
-        for (size_t i = 0; i < mLanguages.size(); i++) {
-            if (strlen(mLanguages[i]) > 0) {
-                if (ImGui::Selectable(mLanguages[i], i == mLanguage)) {
-                    mLanguage = i;
-                }
-            }
-        }
-        ImGui::EndCombo();
-    }
-    UIWidgets::InsertHelpHoverText("Which language to load from the selected text ID");
+    PopStyleCheckbox();
+    SohGui::SohMenu::UpdateLanguageMap(SohGui::languages);
+    UIWidgets::Combobox("Language", &mLanguage, SohGui::languages,
+                        UIWidgets::ComboboxOptions()
+                            .Color(THEME_COLOR)
+                            .DefaultIndex(0)
+                            .Tooltip("Which language to load from the selected text ID"));
+    PushStyleButton(THEME_COLOR);
     if (ImGui::Button("Display Message##ExistingMessage")) {
         mDisplayExistingMessageClicked = true;
     }
@@ -66,11 +72,14 @@ void MessageViewer::DrawElement() {
     UIWidgets::InsertHelpHoverText("Enter a string using Custom Message Syntax to preview it in-game. "
                                    "Any newline (\\n) characters inserted by the Enter key will be stripped "
                                    "from the output.");
+    PushStyleInput(THEME_COLOR);
     ImGui::InputTextMultiline("##CustomMessage", mCustomMessageBuf, MAX_STRING_SIZE);
+    PopStyleInput();
     if (ImGui::Button("Display Message##CustomMessage")) {
         mDisplayCustomMessageClicked = true;
     }
-    // ReSharper restore CppDFAUnreachableCode
+    PopStyleButton();
+    ImGui::EndDisabled();
 }
 
 void MessageViewer::UpdateElement() {
@@ -107,6 +116,7 @@ void MessageViewer::DisplayCustomMessage() const {
 extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
 extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
 extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
+extern "C" MessageTableEntry* sJpnMessageEntryTablePtr;
 extern "C" MessageTableEntry* sStaffMessageEntryTablePtr;
 
 void FindMessage(PlayState* play, const uint16_t textId, const uint8_t language) {
@@ -114,18 +124,13 @@ void FindMessage(PlayState* play, const uint16_t textId, const uint8_t language)
     const char* nextSeg;
     MessageTableEntry* messageTableEntry = sNesMessageEntryTablePtr;
     Font* font;
-    u16 bufferId = textId;
-    // Use the better owl message if better owl is enabled
-    if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) != 0 && (bufferId == 0x2066 || bufferId == 0x607B ||
-        bufferId == 0x10C2 || bufferId == 0x10C6 || bufferId == 0x206A))
-    {
-        bufferId = 0x71B3;
-    }
 
     if (language == LANGUAGE_GER)
         messageTableEntry = sGerMessageEntryTablePtr;
     else if (language == LANGUAGE_FRA)
         messageTableEntry = sFraMessageEntryTablePtr;
+    else if (language == LANGUAGE_JPN)
+        messageTableEntry = sJpnMessageEntryTablePtr;
 
     // If PAL languages are not present in the OTR file, default to English
     if (messageTableEntry == nullptr)
@@ -136,7 +141,7 @@ void FindMessage(PlayState* play, const uint16_t textId, const uint8_t language)
     while (messageTableEntry->textId != 0xFFFF) {
         font = &play->msgCtx.font;
 
-        if (messageTableEntry->textId == bufferId) {
+        if (messageTableEntry->textId == textId) {
             foundSeg = messageTableEntry->segment;
             font->charTexBuf[0] = messageTableEntry->typePos;
 
@@ -159,15 +164,14 @@ void FindMessage(PlayState* play, const uint16_t textId, const uint8_t language)
     font->msgLength = nextSeg - foundSeg;
 }
 
-static const char* msgStaticTbl[] =
-{
+static const char* msgStaticTbl[] = {
     gDefaultMessageBackgroundTex,
     gSignMessageBackgroundTex,
     gNoteStaffMessageBackgroundTex,
     gFadingMessageBackgroundTex,
     gMessageContinueTriangleTex,
     gMessageEndSquareTex,
-    gMessageArrowTex
+    gMessageArrowTex,
 };
 
 void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t language) {
@@ -185,20 +189,24 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
     R_TEXT_CHAR_SCALE = 75;
     R_TEXT_LINE_SPACING = 12;
     R_TEXT_INIT_XPOS = 65;
+    if (language == LANGUAGE_JPN) {
+        R_TEXT_CHAR_SCALE = 88;
+        R_TEXT_LINE_SPACING = 18;
+        R_TEXT_INIT_XPOS = 65;
+    }
     char* buffer = font->msgBuf;
     msgCtx->textId = textId;
     if (strlen(tableId) == 0) {
         FindMessage(play, textId, language);
         msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
         const uintptr_t src = font->msgOffset;
-        memcpy(font->msgBuf, reinterpret_cast<void const *>(src), font->msgLength);
+        memcpy(font->msgBuf, reinterpret_cast<void const*>(src), font->msgLength);
     } else {
         constexpr int maxBufferSize = sizeof(font->msgBuf);
         const CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(tableId, textId);
         font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
-        switch (language) {
-            font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
-        }
+        font->msgLength =
+            SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
         msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
     }
     msgCtx->textBoxProperties = font->charTexBuf[0];
@@ -248,8 +256,6 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
 void MessageDebug_DisplayCustomMessage(const char* customMessage) {
     CustomMessageManager::Instance->ClearMessageTable(MessageViewer::TABLE_ID);
     CustomMessageManager::Instance->CreateMessage(MessageViewer::TABLE_ID, 0,
-        CustomMessage(customMessage, customMessage, customMessage));
+                                                  CustomMessage(customMessage, customMessage, customMessage));
     MessageDebug_StartTextBox(MessageViewer::TABLE_ID, 0, 0);
 }
-
-
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.h b/soh/soh/Enhancements/debugger/MessageViewer.h
index 43ae55aa76..9ce8eab05b 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.h
+++ b/soh/soh/Enhancements/debugger/MessageViewer.h
@@ -4,7 +4,7 @@
 
 #ifdef __cplusplus
 #include "GuiWindow.h"
-#include <array>
+#include <unordered_map>
 extern "C" {
 #endif
 /**
@@ -25,9 +25,8 @@ void MessageDebug_DisplayCustomMessage(const char* customMessage);
 #ifdef __cplusplus
 }
 
-
-class MessageViewer : public Ship::GuiWindow {
-public:
+class MessageViewer final : public Ship::GuiWindow {
+  public:
     static inline const char* TABLE_ID = "MessageViewer";
     using GuiWindow::GuiWindow;
 
@@ -37,12 +36,11 @@ public:
 
     virtual ~MessageViewer() = default;
 
-private:
+  private:
     void DisplayExistingMessage() const;
     void DisplayCustomMessage() const;
 
     static constexpr uint16_t MAX_STRING_SIZE = 1024;
-    static constexpr std::array<const char*, LANGUAGE_MAX> mLanguages = {"English", "German", "French"};
     static constexpr int HEXADECIMAL = 0;
     static constexpr int DECIMAL = 1;
     char* mTableIdBuf;
@@ -50,13 +48,12 @@ private:
     char* mTextIdBuf;
     uint16_t mTextId;
     int mTextIdBase = HEXADECIMAL;
-    size_t mLanguage = LANGUAGE_ENG;
+    int32_t mLanguage = LANGUAGE_ENG;
     char* mCustomMessageBuf;
     std::string mCustomMessageString;
     bool mDisplayExistingMessageClicked = false;
     bool mDisplayCustomMessageClicked = false;
 };
 
-
 #endif //__cplusplus
-#endif //CUSTOMMESSAGEDEBUGGER_H
+#endif // CUSTOMMESSAGEDEBUGGER_H
diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp b/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp
new file mode 100644
index 0000000000..19be376ed7
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp
@@ -0,0 +1,32 @@
+#include "SohConsoleWindow.h"
+#include "soh/OTRGlobals.h"
+#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
+
+void SohConsoleWindow::InitElement() {
+    ConsoleWindow::InitElement();
+}
+
+void SohConsoleWindow::UpdateElement() {
+    ConsoleWindow::UpdateElement();
+}
+
+void SohConsoleWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    UIWidgets::PushStyleInput(THEME_COLOR);
+    // Small font (13) to match hardcoded width values in the LUS window.. set large font after below TODO addressed
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoSmall);
+
+    // TODO: This can be removed after the LUS console window is designed better without hardcoding widths
+    ImGui::BeginChild("##Console Wrapper", ImVec2(0, 0), ImGuiChildFlags_None,
+                      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar |
+                          ImGuiWindowFlags_NoScrollWithMouse);
+
+    ConsoleWindow::DrawElement();
+
+    ImGui::EndChild();
+
+    ImGui::PopFont();
+    UIWidgets::PopStyleInput();
+    ImGui::EndDisabled();
+}
diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.h b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
new file mode 100644
index 0000000000..db039625b7
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
@@ -0,0 +1,17 @@
+#ifndef SOH_CONSOLE_H
+#define SOH_CONSOLE_H
+
+#include "window/gui/GuiWindow.h"
+#include "window/gui/ConsoleWindow.h"
+
+class SohConsoleWindow : public Ship::ConsoleWindow {
+  public:
+    using ConsoleWindow::ConsoleWindow;
+
+  protected:
+    void InitElement() override;
+    void UpdateElement() override;
+    void DrawElement() override;
+};
+
+#endif // SOH_CONSOLE_H
diff --git a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.cpp b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.cpp
new file mode 100644
index 0000000000..def23caccb
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.cpp
@@ -0,0 +1,18 @@
+#include "SohGfxDebuggerWindow.h"
+#include "soh/OTRGlobals.h"
+
+void SohGfxDebuggerWindow::InitElement() {
+    GfxDebuggerWindow::InitElement();
+}
+
+void SohGfxDebuggerWindow::UpdateElement() {
+    GfxDebuggerWindow::UpdateElement();
+}
+
+void SohGfxDebuggerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+    GfxDebuggerWindow::DrawElement();
+    ImGui::PopFont();
+    ImGui::EndDisabled();
+}
diff --git a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
new file mode 100644
index 0000000000..789173b88c
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
@@ -0,0 +1,17 @@
+#ifndef SOH_GFX_DEBUGGER_H
+#define SOH_GFX_DEBUGGER_H
+
+#include "window/gui/GuiWindow.h"
+#include "window/gui/GfxDebuggerWindow.h"
+
+class SohGfxDebuggerWindow : public LUS::GfxDebuggerWindow {
+  public:
+    using GfxDebuggerWindow::GfxDebuggerWindow;
+
+  protected:
+    void InitElement() override;
+    void UpdateElement() override;
+    void DrawElement() override;
+};
+
+#endif // SOH_GFX_DEBUGGER_H
diff --git a/soh/soh/Enhancements/debugger/SohStatsWindow.cpp b/soh/soh/Enhancements/debugger/SohStatsWindow.cpp
new file mode 100644
index 0000000000..56f81bee4c
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohStatsWindow.cpp
@@ -0,0 +1,24 @@
+#include "SohStatsWindow.h"
+#include "soh/OTRGlobals.h"
+
+void SohStatsWindow::DrawElement() {
+    const float framerate = ImGui::GetIO().Framerate;
+    const float deltatime = ImGui::GetIO().DeltaTime;
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
+
+#if defined(_WIN32)
+    ImGui::Text("Platform: Windows");
+#elif defined(__IOS__)
+    ImGui::Text("Platform: iOS");
+#elif defined(__APPLE__)
+    ImGui::Text("Platform: macOS");
+#elif defined(__linux__)
+    ImGui::Text("Platform: Linux");
+#else
+    ImGui::Text("Platform: Unknown");
+#endif
+    ImGui::Text("Status: %.3f ms/frame (%.1f FPS)", deltatime * 1000.0f, framerate);
+    ImGui::PopStyleColor();
+    ImGui::PopFont();
+}
diff --git a/soh/soh/Enhancements/debugger/SohStatsWindow.h b/soh/soh/Enhancements/debugger/SohStatsWindow.h
new file mode 100644
index 0000000000..09b495cdb6
--- /dev/null
+++ b/soh/soh/Enhancements/debugger/SohStatsWindow.h
@@ -0,0 +1,17 @@
+#ifndef SOH_STATS_H
+#define SOH_STATS_H
+
+#include <libultraship/libultraship.h>
+
+class SohStatsWindow final : public Ship::GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+    ~SohStatsWindow(){};
+
+  protected:
+    void InitElement() override{};
+    void DrawElement() override;
+    void UpdateElement() override{};
+};
+
+#endif // SOH_STATS_H
diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp
index 8aac609549..d21d9449e6 100644
--- a/soh/soh/Enhancements/debugger/actorViewer.cpp
+++ b/soh/soh/Enhancements/debugger/actorViewer.cpp
@@ -1,10 +1,13 @@
 #include "actorViewer.h"
 #include "../../util.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/ActorDB.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/nametag.h"
+#include "soh/ShipInit.hpp"
 
+#include <algorithm>
 #include <array>
 #include <bit>
 #include <map>
@@ -12,8 +15,10 @@
 #include <string>
 #include <libultraship/bridge.h>
 #include <libultraship/libultraship.h>
+#include <spdlog/fmt/fmt.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
+#include "soh/ObjectExtension/ActorListIndex.h"
 
 extern "C" {
 #include <z64.h>
@@ -30,6 +35,10 @@ extern PlayState* gPlayState;
 #define DEKUNUTS_FLOWER 10
 #define DEBUG_ACTOR_NAMETAG_TAG "debug_actor_viewer"
 
+#define CVAR_ACTOR_NAME_TAGS(val) CVAR_DEVELOPER_TOOLS("ActorViewer.NameTags." val)
+#define CVAR_ACTOR_NAME_TAGS_ENABLED_NAME CVAR_ACTOR_NAME_TAGS("Enabled")
+#define CVAR_ACTOR_NAME_TAGS_ENABLED CVarGetInteger(CVAR_ACTOR_NAME_TAGS("Enabled"), 0)
+
 typedef struct {
     u16 id;
     u16 params;
@@ -37,28 +46,17 @@ typedef struct {
     Vec3s rot;
 } ActorInfo;
 
-typedef enum {
-    LIST,
-    TARGET,
-    HELD,
-    INTERACT
-} RetrievalMethod;
-
-std::array<const char*, 12> acMapping = { 
-    "Switch",
-    "Background (Prop type 1)",
-    "Player",
-    "Bomb",
-    "NPC",
-    "Enemy",
-    "Prop type 2",
-    "Item/Action",
-    "Misc.",
-    "Boss",
-    "Door",
-    "Chest"
+std::array<const char*, 12> acMapping = {
+    "Switch",      "Background (Prop type 1)",
+    "Player",      "Bomb",
+    "NPC",         "Enemy",
+    "Prop type 2", "Item/Action",
+    "Misc.",       "Boss",
+    "Door",        "Chest",
 };
 
+using namespace UIWidgets;
+
 typedef enum {
     ACTORVIEWER_NAMETAGS_NONE,
     ACTORVIEWER_NAMETAGS_DESC,
@@ -70,29 +68,23 @@ const std::string GetActorDescription(u16 id) {
     return ActorDB::Instance->RetrieveEntry(id).entry.valid ? ActorDB::Instance->RetrieveEntry(id).entry.desc : "???";
 }
 
-template <typename T> void DrawGroupWithBorder(T&& drawFunc) {
-    // First group encapsulates the inner portion and border
-    ImGui::BeginGroup();
+const std::string GetActorDebugName(u16 id) {
+    return ActorDB::Instance->RetrieveEntry(id).entry.valid ? ActorDB::Instance->RetrieveEntry(id).entry.name : "???";
+}
 
-    ImVec2 padding = ImGui::GetStyle().FramePadding;
-    ImVec2 p0 = ImGui::GetCursorScreenPos();
-    ImGui::SetCursorScreenPos(ImVec2(p0.x + padding.x, p0.y + padding.y));
+template <typename T> void DrawGroupWithBorder(T&& drawFunc, std::string section) {
+    // First group encapsulates the inner portion and border
+    ImGui::BeginChild(std::string("##" + section).c_str(), ImVec2(0, 0),
+                      ImGuiChildFlags_AlwaysAutoResize | ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeX |
+                          ImGuiChildFlags_AutoResizeY);
 
     // Second group encapsulates just the inner portion
     ImGui::BeginGroup();
-
+    ImGui::AlignTextToFramePadding();
     drawFunc();
-
-    ImGui::Dummy(padding);
     ImGui::EndGroup();
 
-    ImVec2 p1 = ImGui::GetItemRectMax();
-    p1.x += padding.x;
-    ImVec4 borderCol = ImGui::GetStyle().Colors[ImGuiCol_Border];
-    ImGui::GetWindowDrawList()->AddRect(
-        p0, p1, IM_COL32(borderCol.x * 255, borderCol.y * 255, borderCol.z * 255, borderCol.w * 255));
-
-    ImGui::EndGroup();
+    ImGui::EndChild();
 }
 
 void PopulateActorDropdown(int i, std::vector<Actor*>& data) {
@@ -111,7 +103,7 @@ void PopulateActorDropdown(int i, std::vector<Actor*>& data) {
     }
 }
 
-//actors that don't use params at all
+// actors that don't use params at all
 static std::vector<u16> noParamsActors = {
     ACTOR_ARMS_HOOK,
     ACTOR_ARROW_FIRE,
@@ -238,7 +230,7 @@ static std::vector<u16> noParamsActors = {
     ACTOR_UNSET_15D,
     ACTOR_UNSET_161,
     ACTOR_UNSET_180,
-    ACTOR_UNSET_1AA
+    ACTOR_UNSET_1AA,
 };
 
 static std::unordered_map<u16, std::function<s16(s16)>> actorSpecificData;
@@ -258,7 +250,7 @@ void CreateActorSpecificData() {
         if (!isFlower) {
             ImGui::InputScalar("Shots Per Round", ImGuiDataType_S16, &shotsPerRound);
         }
-        
+
         return isFlower ? DEKUNUTS_FLOWER : (shotsPerRound << 8);
     };
 
@@ -267,12 +259,12 @@ void CreateActorSpecificData() {
         if (params == 0) {
             params = -2;
         }
-        //the + 2 is because the params are -2 & -1 instead of 0 & 1
+        // the + 2 is because the params are -2 & -1 instead of 0 & 1
         int selectedItem = params + 2;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem - 2;
         }
-        
+
         return params;
     };
 
@@ -282,7 +274,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -292,7 +284,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -302,7 +294,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -312,7 +304,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -322,7 +314,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -332,7 +324,7 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -341,12 +333,12 @@ void CreateActorSpecificData() {
         if (params == 0) {
             params = 0x40;
         }
-        //the - 0x40 is because the params are 0x40 & 0x41 instead of 0 & 1
+        // the - 0x40 is because the params are 0x40 & 0x41 instead of 0 & 1
         int selectedItem = params - 0x40;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem + 0x40;
         }
-        
+
         return params;
     };
 
@@ -356,21 +348,21 @@ void CreateActorSpecificData() {
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_REEBA] = [](s16 params) -> s16 {
         bool isBig = params != 0;
         ImGui::Checkbox("Big", &isBig);
-        
+
         return isBig;
     };
 
     actorSpecificData[ACTOR_EN_TK] = [](s16 params) -> s16 {
         bool canTurn = params >= 0;
         ImGui::Checkbox("Can Turn", &canTurn);
-        
+
         return canTurn ? 0 : -1;
     };
 
@@ -382,35 +374,13 @@ void CreateActorSpecificData() {
         if (collectibleFlag > 0x3F) {
             collectibleFlag = 0x3F;
         }
-        
+
         static const char* items[] = {
-            "Green Rupee",
-            "Blue Rupee",
-            "Red Rupee",
-            "Recovery Heart",
-            "Bombs (A)",
-            "Arrow",
-            "Heart Piece",
-            "Heart Container",
-            "Arrows (5)",
-            "Arrows (10)",
-            "Arrows (30)",
-            "Bombs (B)",
-            "Deku Nuts (5)",
-            "Deku Stick",
-            "Magic (Large)",
-            "Magic (Small)",
-            "Deku Seeds (5)",
-            "Small Key",
-            "Flexible",
-            "Gold Rupee",
-            "Purple Rupee",
-            "Deku Shield",
-            "Hylian Shield",
-            "Zora Tunic",
-            "Goron Tunic",
-            "Bombs (Special)",
-            "Bombchus"
+            "Green Rupee",   "Blue Rupee",      "Red Rupee",     "Recovery Heart", "Bombs (A)",      "Arrow",
+            "Heart Piece",   "Heart Container", "Arrows (5)",    "Arrows (10)",    "Arrows (30)",    "Bombs (B)",
+            "Deku Nuts (5)", "Deku Stick",      "Magic (Large)", "Magic (Small)",  "Deku Seeds (5)", "Small Key",
+            "Flexible",      "Gold Rupee",      "Purple Rupee",  "Deku Shield",    "Hylian Shield",  "Zora Tunic",
+            "Goron Tunic",   "Bombs (Special)", "Bombchus",
         };
 
         int selectedItem = params & 0xFF;
@@ -421,33 +391,11 @@ void CreateActorSpecificData() {
 
     actorSpecificData[ACTOR_OBJ_COMB] = [](s16 params) -> s16 {
         static const char* items[] = {
-            "Green Rupee",
-            "Blue Rupee",
-            "Red Rupee",
-            "Recovery Heart",
-            "Bombs (A)",
-            "Arrow",
-            "Heart Piece",
-            "Heart Container",
-            "Arrows (5)",
-            "Arrows (10)",
-            "Arrows (30)",
-            "Bombs (B)",
-            "Deku Nuts (5)",
-            "Deku Stick",
-            "Magic (Large)",
-            "Magic (Small)",
-            "Deku Seeds (5)",
-            "Small Key",
-            "Flexible",
-            "Gold Rupee",
-            "Purple Rupee",
-            "Deku Shield",
-            "Hylian Shield",
-            "Zora Tunic",
-            "Goron Tunic",
-            "Bombs (Special)",
-            "Bombchus"
+            "Green Rupee",   "Blue Rupee",      "Red Rupee",     "Recovery Heart", "Bombs (A)",      "Arrow",
+            "Heart Piece",   "Heart Container", "Arrows (5)",    "Arrows (10)",    "Arrows (30)",    "Bombs (B)",
+            "Deku Nuts (5)", "Deku Stick",      "Magic (Large)", "Magic (Small)",  "Deku Seeds (5)", "Small Key",
+            "Flexible",      "Gold Rupee",      "Purple Rupee",  "Deku Shield",    "Hylian Shield",  "Zora Tunic",
+            "Goron Tunic",   "Bombs (Special)", "Bombchus",
         };
 
         int selectedItem = params & 0xFF;
@@ -460,18 +408,18 @@ void CreateActorSpecificData() {
                 collectibleFlag = 0x3F;
             }
         }
-        
+
         return (collectibleFlag << 8) + selectedItem;
     };
 
     actorSpecificData[ACTOR_EN_GM] = [](s16 params) -> s16 {
         u8 switchFlag = (params & 0x3F00) >> 8;
-        
+
         ImGui::InputScalar("Switch Flag", ImGuiDataType_U8, &switchFlag);
         if (switchFlag > 0x3F) {
             switchFlag = 0x3F;
         }
-        
+
         return switchFlag << 8;
     };
 
@@ -527,13 +475,13 @@ void CreateActorSpecificData() {
             "Bombs (5) (35 Rupees)",
             "Red Potion (40 Rupees)",
             "Red Potion (50 Rupees)",
-            "Randomizer Item"
+            "Randomizer Item",
         };
         int selectedItem = params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
@@ -545,13 +493,13 @@ void CreateActorSpecificData() {
             "Spawned Falling (2)",
             //"INVALID",
             "Ceiling Spot Spawner",
-            "On Floor"
+            "On Floor",
         };
         int selectedItem = params > 3 ? params - 1 : params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem > 3 ? selectedItem + 1 : selectedItem;
         }
-        
+
         return params;
     };
 
@@ -576,119 +524,108 @@ void CreateActorSpecificData() {
             "Magic Fire",
             "Magic Wind",
             "Magic Dark",
-            "Bullet Bag"
+            "Bullet Bag",
         };
         int selectedItem = params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_ELF] = [](s16 params) -> s16 {
         static const char* items[] = {
-            "Navi",
-            "Revive Bottle",
-            "Heal Timed",
-            "Kokiri",
-            "Spawner",
-            "Revive Death",
-            "Heal",
-            "Heal Big"
+            "Navi", "Revive Bottle", "Heal Timed", "Kokiri", "Spawner", "Revive Death", "Heal", "Heal Big",
         };
         int selectedItem = params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_CLEAR_TAG] = [](s16 params) -> s16 {
         static const char* items[] = {
-            "Cutscene", //0
-            "Normal",   //1
-            "Laser"     //100
+            "Cutscene", // 0
+            "Normal",   // 1
+            "Laser",    // 100
         };
         int selectedItem = params == 100 ? 2 : params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem == 2 ? 100 : selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_BOMBF] = [](s16 params) -> s16 {
         static const char* items[] = { "Flower", "Body", "Explosion" };
-        //the + 1 is because the params are -1, 0 & 1 instead of 0, 1 & 2
+        // the + 1 is because the params are -1, 0 & 1 instead of 0, 1 & 2
         int selectedItem = params + 1;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem - 1;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_BOM] = [](s16 params) -> s16 {
         static const char* items[] = { "Body", "Explosion" };
-        
+
         int selectedItem = params;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_DOOR_WARP1] = [](s16 params) -> s16 {
         static const char* items[] = {
-            "Blue Crystal",   // -2
-            "Dungeon Adult",
-            "Dungeon Child",
-            "Clear Flag",     // Activate on temp clear flag
-            "Sages",          // Used by sages warping into chamber of sages during their cutscene
+            "Blue Crystal", // -2
+            "Dungeon Adult",  "Dungeon Child",
+            "Clear Flag", // Activate on temp clear flag
+            "Sages",      // Used by sages warping into chamber of sages during their cutscene
             "Purple Crystal",
-            "Yellow",         // The colored variants don't warp, they are cutscene setpieces
+            "Yellow", // The colored variants don't warp, they are cutscene setpieces
             "Blue Ruto",
-            "Destination",    // Spawning in after having taken a warp
-            "UNK 7",
-            "Orange",
-            "Green",
-            "Red"
+            "Destination", // Spawning in after having taken a warp
+            "UNK 7",          "Orange",        "Green", "Red",
         };
         int selectedItem = params + 2;
         if (ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem - 2;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_DY_EXTRA] = [](s16 params) -> s16 {
         static const char* items[] = { "Orange", "Green" };
-        
+
         int selectedItem = params;
         if (ImGui::Combo("Color", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 
     actorSpecificData[ACTOR_EN_SKB] = [](s16 params) -> s16 {
         u8 size = params;
         ImGui::InputScalar("Size", ImGuiDataType_U8, &size);
-        
+
         return size;
     };
 
     actorSpecificData[ACTOR_EN_WF] = [](s16 params) -> s16 {
         static const char* items[] = { "Normal", "White" };
-        
+
         int selectedItem = params;
         ImGui::Combo("Type", &selectedItem, items, IM_ARRAYSIZE(items));
-        
+
         u8 switchFlag = (params & 0x3F00) >> 8;
         ImGui::InputScalar("Switch Flag", ImGuiDataType_U8, &switchFlag);
         return (switchFlag << 8) + selectedItem;
@@ -711,7 +648,7 @@ void CreateActorSpecificData() {
         if (itemId > 0x7F) {
             itemId = 0x7F;
         }
-        
+
         static const char* items[] = {
             "Big (Default)",
             "Room Clear Big",
@@ -724,7 +661,7 @@ void CreateActorSpecificData() {
             "Switch Flag Fall Small",
             "9",
             "10",
-            "Switch Flag Big"
+            "Switch Flag Big",
         };
 
         int type = (params >> 12) & 0xF;
@@ -759,7 +696,7 @@ void CreateActorSpecificData() {
         if (transitionIndex > 0x3F) {
             transitionIndex = 0x3F;
         }
-        
+
         static const char* items[] = {
             "Room Load",     // loads rooms
             "Locked",        // small key locked door
@@ -800,9 +737,9 @@ void CreateActorSpecificData() {
 
     actorSpecificData[ACTOR_EN_PO_DESERT] = [](s16 params) -> s16 {
         u8 switchFlag = params >> 8;
-        
+
         ImGui::InputScalar("Path", ImGuiDataType_U8, &switchFlag);
-        
+
         return switchFlag << 8;
     };
 
@@ -815,30 +752,26 @@ void CreateActorSpecificData() {
         if (ImGui::Checkbox("Fishing Sign", &fishingSign)) {
             piece = false;
         }
-        
+
         u8 textId = params;
         if (!piece && !fishingSign) {
             if (ImGui::InputScalar("Text ID", ImGuiDataType_U8, &textId)) {
                 textId |= 0x300;
             }
         }
-        
+
         return piece ? (s16)0xFFDD : (fishingSign ? 0x300 : textId);
     };
 
     actorSpecificData[ACTOR_EN_KUSA] = [](s16 params) -> s16 {
-        static const char* items[] = {
-            "0",
-            "1",
-            "2"
-        };
+        static const char* items[] = { "0", "1", "2" };
 
         int type = params & 3;
         ImGui::Combo("Type", &type, items, IM_ARRAYSIZE(items));
 
         bool bugs = ((params >> 4) & 1) != 0;
         ImGui::Checkbox("Bugs", &bugs);
-        
+
         u8 drop = (params >> 8) & 0xF;
         if (type == 2) {
             ImGui::InputScalar("Random Drop Params", ImGuiDataType_U8, &drop);
@@ -853,17 +786,12 @@ void CreateActorSpecificData() {
     };
 
     actorSpecificData[ActorDB::Instance->RetrieveId("En_Partner")] = [](s16 params) -> s16 {
-        static const char* items[] = {
-            "Port 1",
-            "Port 2",
-            "Port 3",
-            "Port 4"
-        };
+        static const char* items[] = { "Port 1", "Port 2", "Port 3", "Port 4" };
         int selectedItem = params;
         if (ImGui::Combo("Controller Port", &selectedItem, items, IM_ARRAYSIZE(items))) {
             return selectedItem;
         }
-        
+
         return params;
     };
 }
@@ -889,25 +817,37 @@ std::vector<u16> GetActorsWithDescriptionContainingString(std::string s) {
 }
 
 void ActorViewer_AddTagForActor(Actor* actor) {
-    int val = CVarGetInteger(CVAR_DEVELOPER_TOOLS("ActorViewer.NameTags"), ACTORVIEWER_NAMETAGS_NONE);
-    auto entry = ActorDB::Instance->RetrieveEntry(actor->id);
-    std::string tag;
-
-    if (val > 0 && entry.entry.valid) {
-        switch (val) {
-            case ACTORVIEWER_NAMETAGS_DESC:
-                tag = entry.desc;
-                break;
-            case ACTORVIEWER_NAMETAGS_NAME:
-                tag = entry.name;
-                break;
-            case ACTORVIEWER_NAMETAGS_BOTH:
-                tag = entry.name + '\n' + entry.desc;
-                break;
-        }
-
-        NameTag_RegisterForActorWithOptions(actor, tag.c_str(), { .tag = DEBUG_ACTOR_NAMETAG_TAG });
+    if (!CVarGetInteger(CVAR_ACTOR_NAME_TAGS("Enabled"), 0)) {
+        return;
     }
+
+    std::vector<std::string> parts;
+
+    if (CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayID"), 0)) {
+        parts.push_back(GetActorDebugName(actor->id));
+    }
+    if (CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayDescription"), 0)) {
+        parts.push_back(GetActorDescription(actor->id));
+    }
+    if (CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayCategory"), 0)) {
+        parts.push_back(acMapping[actor->category]);
+    }
+    if (CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayParams"), 0)) {
+        parts.push_back(fmt::format("0x{:04X} ({})", (u16)actor->params, actor->params));
+    }
+
+    std::string tag = "";
+    for (size_t i = 0; i < parts.size(); i++) {
+        if (i != 0) {
+            tag += "\n";
+        }
+        tag += parts.at(i);
+    }
+
+    bool withZBuffer = CVarGetInteger(CVAR_ACTOR_NAME_TAGS("WithZBuffer"), 0);
+
+    NameTag_RegisterForActorWithOptions(actor, tag.c_str(),
+                                        { .tag = DEBUG_ACTOR_NAMETAG_TAG, .noZBuffer = !withZBuffer });
 }
 
 void ActorViewer_AddTagForAllActors() {
@@ -926,38 +866,67 @@ void ActorViewer_AddTagForAllActors() {
 }
 
 void ActorViewerWindow::DrawElement() {
-    static Actor* display;
-    static Actor empty{};
-    static Actor* fetch = NULL;
-    static ActorInfo newActor = {0,0, {0, 0, 0}, {0, 0, 0}};
-    static bool needs_reset = false;
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    static ActorInfo newActor = { 0, 0, { 0, 0, 0 }, { 0, 0, 0 } };
     static ImU16 one = 1;
-    static int actor;
-    static int category = 0;
-    static RetrievalMethod rm;
     static std::string filler = "Please select";
-    static std::vector<Actor*> list;
-    static u16 lastSceneId = 0;
-    static char searchString[64] = "";
-    static s16 currentSelectedInDropdown;
-    static std::vector<u16> actors;
+    static std::string searchString = "";
+    static s16 currentSelectedInDropdown = -1;
+    static std::vector<u16> actorSearchResults;
 
     if (gPlayState != nullptr) {
-        needs_reset = lastSceneId != gPlayState->sceneNum;
-        if (needs_reset) {
-            display = &empty;
-            fetch = nullptr;
-            actor = category = 0;
-            filler = "Please Select";
-            list.clear();
-            needs_reset = false;
-            for (size_t i = 0; i < ARRAY_COUNT(searchString); i += 1) {
-                searchString[i] = 0;
+        if (ImGui::BeginChild("options", ImVec2(0, 0), ImGuiChildFlags_Border | ImGuiChildFlags_AutoResizeY)) {
+            bool toggled = false;
+            bool optionChange = false;
+
+            ImGui::SeparatorText("Options");
+
+            toggled = UIWidgets::CVarCheckbox("Actor Name Tags", CVAR_ACTOR_NAME_TAGS("Enabled"),
+                                              { { .tooltip = "Adds \"name tags\" above actors for identification" } });
+
+            ImGui::SameLine();
+
+            UIWidgets::Button("Display Items", { { .tooltip = "Click to add display items on the name tags" } });
+
+            if (ImGui::BeginPopupContextItem(nullptr, ImGuiPopupFlags_MouseButtonLeft | ImGuiPopupFlags_NoReopen)) {
+                optionChange |= UIWidgets::CVarCheckbox("ID", CVAR_ACTOR_NAME_TAGS("DisplayID"));
+                optionChange |= UIWidgets::CVarCheckbox("Description", CVAR_ACTOR_NAME_TAGS("DisplayDescription"));
+                optionChange |= UIWidgets::CVarCheckbox("Category", CVAR_ACTOR_NAME_TAGS("DisplayCategory"));
+                optionChange |= UIWidgets::CVarCheckbox("Params", CVAR_ACTOR_NAME_TAGS("DisplayParams"));
+
+                ImGui::EndPopup();
+            }
+
+            optionChange |= UIWidgets::CVarCheckbox(
+                "Name tags with Z-Buffer", CVAR_ACTOR_NAME_TAGS("WithZBuffer"),
+                { { .tooltip = "Allow name tags to be obstructed when behind geometry and actors" } });
+
+            if (toggled || optionChange) {
+                bool tagsEnabled = CVarGetInteger(CVAR_ACTOR_NAME_TAGS("Enabled"), 0);
+                bool noOptionsEnabled = !CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayID"), 0) &&
+                                        !CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayDescription"), 0) &&
+                                        !CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayCategory"), 0) &&
+                                        !CVarGetInteger(CVAR_ACTOR_NAME_TAGS("DisplayParams"), 0);
+
+                // Save the user an extra click and prevent adding "empty" tags by enabling,
+                // disabling, or setting an option based on what changed
+                if (tagsEnabled && noOptionsEnabled) {
+                    if (toggled) {
+                        CVarSetInteger(CVAR_ACTOR_NAME_TAGS("DisplayID"), 1);
+                    } else {
+                        CVarSetInteger(CVAR_ACTOR_NAME_TAGS("Enabled"), 0);
+                    }
+                } else if (optionChange && !tagsEnabled && !noOptionsEnabled) {
+                    CVarSetInteger(CVAR_ACTOR_NAME_TAGS("Enabled"), 1);
+                }
+
+                NameTag_RemoveAllByTag(DEBUG_ACTOR_NAMETAG_TAG);
+                ActorViewer_AddTagForAllActors();
             }
-            currentSelectedInDropdown = -1;
-            actors.clear();
         }
-        lastSceneId = gPlayState->sceneNum;
+        ImGui::EndChild();
+
+        PushStyleCombobox(THEME_COLOR);
         if (ImGui::BeginCombo("Actor Type", acMapping[category])) {
             for (int i = 0; i < acMapping.size(); i++) {
                 if (ImGui::Selectable(acMapping[i])) {
@@ -969,155 +938,159 @@ void ActorViewerWindow::DrawElement() {
             ImGui::EndCombo();
         }
 
+        if (display == nullptr) {
+            filler = "Please select";
+        }
+
         if (ImGui::BeginCombo("Actor", filler.c_str())) {
-            if (gPlayState != nullptr && lastSceneId != gPlayState->sceneNum) {
-                PopulateActorDropdown(category, list);
-                lastSceneId = gPlayState->sceneNum;
-            }
             for (int i = 0; i < list.size(); i++) {
                 std::string label = std::to_string(i) + ": " + ActorDB::Instance->RetrieveEntry(list[i]->id).name;
                 std::string description = GetActorDescription(list[i]->id);
                 if (description != "")
                     label += " (" + description + ")";
 
-                if (ImGui::Selectable(label.c_str())) {
-                    rm = LIST;
+                if (ImGui::Selectable(label.c_str(), list[i] == display)) {
                     display = list[i];
-                    actor = i;
                     filler = label;
                     break;
                 }
             }
             ImGui::EndCombo();
         }
+        PopStyleCombobox();
 
+        PushStyleHeader(THEME_COLOR);
         if (ImGui::TreeNode("Selected Actor")) {
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Name: %s", ActorDB::Instance->RetrieveEntry(display->id).name.c_str());
-                ImGui::Text("Description: %s", GetActorDescription(display->id).c_str());
-                ImGui::Text("Category: %s", acMapping[display->category]);
-                ImGui::Text("ID: %d", display->id);
-                ImGui::Text("Parameters: %d", display->params);
-            });
-
-            ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
-
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Actor Position");
-                ImGui::InputScalar("x pos", ImGuiDataType_Float, &display->world.pos.x);
+            if (display != nullptr) {
+                DrawGroupWithBorder(
+                    [&]() {
+                        ImGui::Text("Name: %s", ActorDB::Instance->RetrieveEntry(display->id).name.c_str());
+                        ImGui::Text("Description: %s", GetActorDescription(display->id).c_str());
+                        ImGui::Text("Category: %s", acMapping[display->category]);
+                        ImGui::Text("ID: %d", display->id);
+                        ImGui::Text("Parameters: %d", display->params);
+                        ImGui::Text("Actor List Index: %d", GetActorListIndex(display));
+                    },
+                    "Selected Actor");
                 ImGui::SameLine();
-                ImGui::InputScalar("y pos", ImGuiDataType_Float, &display->world.pos.y);
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+
+                DrawGroupWithBorder(
+                    [&]() {
+                        ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                        PushStyleInput(THEME_COLOR);
+                        ImGui::Text("Actor Position");
+                        ImGui::InputScalar("X##CurPos", ImGuiDataType_Float, &display->world.pos.x);
+                        ImGui::InputScalar("Y##CurPos", ImGuiDataType_Float, &display->world.pos.y);
+                        ImGui::InputScalar("Z##CurPos", ImGuiDataType_Float, &display->world.pos.z);
+                        ImGui::PopItemWidth();
+                        PopStyleInput();
+                    },
+                    "Actor Position");
                 ImGui::SameLine();
-                ImGui::InputScalar("z pos", ImGuiDataType_Float, &display->world.pos.z);
-            });
+                DrawGroupWithBorder(
+                    [&]() {
+                        PushStyleInput(THEME_COLOR);
+                        ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                        ImGui::Text("Actor Rotation");
+                        ImGui::InputScalar("X##CurRot", ImGuiDataType_S16, &display->world.rot.x);
+                        ImGui::InputScalar("Y##CurRot", ImGuiDataType_S16, &display->world.rot.y);
+                        ImGui::InputScalar("Z##CurRot", ImGuiDataType_S16, &display->world.rot.z);
+                        ImGui::PopItemWidth();
+                        PopStyleInput();
+                    },
+                    "Actor Rotation");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Actor Rotation");
-                ImGui::InputScalar("x rot", ImGuiDataType_S16, &display->world.rot.x);
-                ImGui::SameLine();
-                ImGui::InputScalar("y rot", ImGuiDataType_S16, &display->world.rot.y);
-                ImGui::SameLine();
-                ImGui::InputScalar("z rot", ImGuiDataType_S16, &display->world.rot.z);
-            });
-
-            if (display->category == ACTORCAT_BOSS || display->category == ACTORCAT_ENEMY) {
-                ImGui::InputScalar("Enemy Health", ImGuiDataType_U8, &display->colChkInfo.health);
-                UIWidgets::InsertHelpHoverText("Some actors might not use this!");
-            }
-
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("flags");
-                UIWidgets::DrawFlagArray32("flags", display->flags);
-            });
-
-            ImGui::SameLine();
-
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("bgCheckFlags");
-                UIWidgets::DrawFlagArray16("bgCheckFlags", display->bgCheckFlags);
-            });
-
-            if (ImGui::Button("Refresh")) {
-                PopulateActorDropdown(category, list);
-                switch (rm) {
-                    case INTERACT:
-                    case HELD:
-                    case TARGET:
-                        display = fetch;
-                        break;
-                    case LIST:
-                        display = list[actor];
-                        break;
-                    default:
-                        break;
+                if (display->category == ACTORCAT_BOSS || display->category == ACTORCAT_ENEMY) {
+                    PushStyleInput(THEME_COLOR);
+                    ImGui::InputScalar("Enemy Health", ImGuiDataType_U8, &display->colChkInfo.health);
+                    PopStyleInput();
+                    UIWidgets::InsertHelpHoverText("Some actors might not use this!");
                 }
+
+                DrawGroupWithBorder(
+                    [&]() {
+                        ImGui::Text("flags");
+                        UIWidgets::DrawFlagArray32("flags", display->flags);
+                    },
+                    "flags");
+
+                ImGui::SameLine();
+
+                DrawGroupWithBorder(
+                    [&]() {
+                        ImGui::Text("bgCheckFlags");
+                        UIWidgets::DrawFlagArray16("bgCheckFlags", display->bgCheckFlags);
+                    },
+                    "bgCheckFlags");
+
+                if (Button("Go to Actor", ButtonOptions().Color(THEME_COLOR))) {
+                    Player* player = GET_PLAYER(gPlayState);
+                    Math_Vec3f_Copy(&player->actor.world.pos, &display->world.pos);
+                    Math_Vec3f_Copy(&player->actor.home.pos, &player->actor.world.pos);
+                }
+            } else {
+                ImGui::Text("Select an actor to display information.");
             }
 
-            if (ImGui::Button("Go to Actor")) {
+            if (Button("Fetch from Target",
+                       ButtonOptions()
+                           .Color(THEME_COLOR)
+                           .Tooltip("Grabs actor with target arrow above it. You might need C-Up for enemies"))) {
                 Player* player = GET_PLAYER(gPlayState);
-                Math_Vec3f_Copy(&player->actor.world.pos, &display->world.pos);
-                Math_Vec3f_Copy(&player->actor.home.pos, &player->actor.world.pos);
-            }
-
-            if (ImGui::Button("Fetch from Target")) {
-                Player* player = GET_PLAYER(gPlayState);
-                fetch = player->talkActor;
-                if (fetch != NULL) {
-                    display = fetch;
-                    category = fetch->category;
+                if (player->talkActor != NULL) {
+                    display = player->talkActor;
+                    category = display->category;
                     PopulateActorDropdown(category, list);
-                    rm = TARGET;
                 }
             }
-            UIWidgets::InsertHelpHoverText("Grabs actor with target arrow above it. You might need C-Up for enemies");
-            if (ImGui::Button("Fetch from Held")) {
+            if (Button("Fetch from Held",
+                       ButtonOptions().Color(THEME_COLOR).Tooltip("Grabs actor that Link is holding"))) {
                 Player* player = GET_PLAYER(gPlayState);
-                fetch = player->heldActor;
-                if (fetch != NULL) {
-                    display = fetch;
-                    category = fetch->category;
+                if (player->heldActor != NULL) {
+                    display = player->heldActor;
+                    category = display->category;
                     PopulateActorDropdown(category, list);
-                    rm = HELD;
                 }
             }
-            UIWidgets::InsertHelpHoverText("Grabs actor that Link is holding");
-            if (ImGui::Button("Fetch from Interaction")) {
+            if (Button("Fetch from Interaction",
+                       ButtonOptions().Color(THEME_COLOR).Tooltip("Grabs actor from \"interaction range\""))) {
                 Player* player = GET_PLAYER(gPlayState);
-                fetch = player->interactRangeActor;
-                if (fetch != NULL) {
-                    display = fetch;
-                    category = fetch->category;
+                if (player->interactRangeActor != NULL) {
+                    display = player->interactRangeActor;
+                    category = display->category;
                     PopulateActorDropdown(category, list);
-                    rm = INTERACT;
                 }
             }
-            UIWidgets::InsertHelpHoverText("Grabs actor from \"interaction range\"");
 
             ImGui::TreePop();
         }
 
         if (ImGui::TreeNode("New...")) {
-            ImGui::PushItemWidth(ImGui::GetFontSize() * 10);
+            // ImGui::PushItemWidth(ImGui::GetFontSize() * 10);
 
-            if (ImGui::InputText("Search Actor", searchString, ARRAY_COUNT(searchString))) {
-                actors = GetActorsWithDescriptionContainingString(std::string(searchString));
+            if (InputString("Search Actor", &searchString, InputOptions().Color(THEME_COLOR))) {
+                actorSearchResults = GetActorsWithDescriptionContainingString(searchString);
                 currentSelectedInDropdown = -1;
             }
 
-            if (searchString[0] != 0 && !actors.empty()) {
-                std::string preview = currentSelectedInDropdown == -1 ? "Please Select" : ActorDB::Instance->RetrieveEntry(actors[currentSelectedInDropdown]).desc;
+            if (!SohUtils::IsStringEmpty(searchString) && !actorSearchResults.empty()) {
+                std::string preview =
+                    currentSelectedInDropdown == -1
+                        ? "Please Select"
+                        : ActorDB::Instance->RetrieveEntry(actorSearchResults[currentSelectedInDropdown]).desc;
+                PushStyleCombobox(THEME_COLOR);
                 if (ImGui::BeginCombo("Results", preview.c_str())) {
-                    for (u8 i = 0; i < actors.size(); i++) {
-                        if (ImGui::Selectable(
-                            ActorDB::Instance->RetrieveEntry(actors[i]).desc.c_str(),
-                            i == currentSelectedInDropdown
-                        )) {
+                    for (u8 i = 0; i < actorSearchResults.size(); i++) {
+                        if (ImGui::Selectable(ActorDB::Instance->RetrieveEntry(actorSearchResults[i]).desc.c_str(),
+                                              i == currentSelectedInDropdown)) {
                             currentSelectedInDropdown = i;
-                            newActor.id = actors[i];
+                            newActor.id = actorSearchResults[i];
                         }
                     }
                     ImGui::EndCombo();
                 }
+                PopStyleCombobox();
             }
 
             ImGui::Text("%s", GetActorDescription(newActor.id).c_str());
@@ -1125,44 +1098,58 @@ void ActorViewerWindow::DrawElement() {
                 newActor.params = 0;
             }
 
-            UIWidgets::EnhancementCheckbox("Advanced mode", CVAR_DEVELOPER_TOOLS("ActorViewer.AdvancedParams"));
-            UIWidgets::InsertHelpHoverText("Changes the actor specific param menus with a direct input");
+            CVarCheckbox("Advanced mode", CVAR_DEVELOPER_TOOLS("ActorViewer.AdvancedParams"),
+                         CheckboxOptions().Tooltip("Changes the actor specific param menus with a direct input"));
 
             if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ActorViewer.AdvancedParams"), 0)) {
+                PushStyleInput(THEME_COLOR);
                 ImGui::InputScalar("params", ImGuiDataType_S16, &newActor.params, &one);
+                PopStyleInput();
             } else if (std::find(noParamsActors.begin(), noParamsActors.end(), newActor.id) == noParamsActors.end()) {
                 CreateActorSpecificData();
                 if (actorSpecificData.find(newActor.id) == actorSpecificData.end()) {
+                    PushStyleInput(THEME_COLOR);
                     ImGui::InputScalar("params", ImGuiDataType_S16, &newActor.params, &one);
+                    PopStyleInput();
                 } else {
-                    DrawGroupWithBorder([&]() {
-                        ImGui::Text("Actor Specific Data");
-                        newActor.params = actorSpecificData[newActor.id](newActor.params);
-                    });
+                    DrawGroupWithBorder(
+                        [&]() {
+                            ImGui::Text("Actor Specific Data");
+                            newActor.params = actorSpecificData[newActor.id](newActor.params);
+                        },
+                        "Actor Specific Data");
                 }
             }
 
             ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("New Actor Position");
-                ImGui::InputScalar("posX", ImGuiDataType_Float, &newActor.pos.x);
-                ImGui::SameLine();
-                ImGui::InputScalar("posY", ImGuiDataType_Float, &newActor.pos.y);
-                ImGui::SameLine();
-                ImGui::InputScalar("posZ", ImGuiDataType_Float, &newActor.pos.z);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    PushStyleInput(THEME_COLOR);
+                    ImGui::Text("New Actor Position");
+                    ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                    ImGui::InputScalar("X##NewPos", ImGuiDataType_Float, &newActor.pos.x);
+                    ImGui::InputScalar("Y##NewPos", ImGuiDataType_Float, &newActor.pos.y);
+                    ImGui::InputScalar("Z##NewPos", ImGuiDataType_Float, &newActor.pos.z);
+                    ImGui::PopItemWidth();
+                    PopStyleInput();
+                },
+                "New Actor Position");
+            ImGui::SameLine();
+            DrawGroupWithBorder(
+                [&]() {
+                    PushStyleInput(THEME_COLOR);
+                    ImGui::Text("New Actor Rotation");
+                    ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                    ImGui::InputScalar("X##NewRot", ImGuiDataType_S16, &newActor.rot.x);
+                    ImGui::InputScalar("Y##NewRot", ImGuiDataType_S16, &newActor.rot.y);
+                    ImGui::InputScalar("Z##NewRot", ImGuiDataType_S16, &newActor.rot.z);
+                    ImGui::PopItemWidth();
+                    PopStyleInput();
+                },
+                "New Actor Rotation");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("New Actor Rotation");
-                ImGui::InputScalar("rotX", ImGuiDataType_S16, &newActor.rot.x);
-                ImGui::SameLine();
-                ImGui::InputScalar("rotY", ImGuiDataType_S16, &newActor.rot.y);
-                ImGui::SameLine();
-                ImGui::InputScalar("rotZ", ImGuiDataType_S16, &newActor.rot.z);
-            });
-
-            if (ImGui::Button("Fetch from Link")) {
+            if (Button("Fetch from Link", ButtonOptions().Color(THEME_COLOR))) {
                 Player* player = GET_PLAYER(gPlayState);
                 Vec3f newPos = player->actor.world.pos;
                 Vec3s newRot = player->actor.world.rot;
@@ -1170,7 +1157,7 @@ void ActorViewerWindow::DrawElement() {
                 newActor.rot = newRot;
             }
 
-            if (ImGui::Button("Spawn")) {
+            if (Button("Spawn", ButtonOptions().Color(THEME_COLOR))) {
                 if (ActorDB::Instance->RetrieveEntry(newActor.id).entry.valid) {
                     Actor_Spawn(&gPlayState->actorCtx, gPlayState, newActor.id, newActor.pos.x, newActor.pos.y,
                                 newActor.pos.z, newActor.rot.x, newActor.rot.y, newActor.rot.z, newActor.params, 0);
@@ -1179,7 +1166,7 @@ void ActorViewerWindow::DrawElement() {
                 }
             }
 
-            if (ImGui::Button("Spawn as Child")) {
+            if (Button("Spawn as Child", ButtonOptions().Color(THEME_COLOR))) {
                 Actor* parent = display;
                 if (parent != NULL) {
                     if (newActor.id >= 0 && newActor.id < ACTOR_ID_MAX &&
@@ -1193,48 +1180,52 @@ void ActorViewerWindow::DrawElement() {
                 }
             }
 
-            if (ImGui::Button("Reset")) {
+            if (Button("Reset", ButtonOptions().Color(THEME_COLOR))) {
                 newActor = { 0, 0, { 0, 0, 0 }, { 0, 0, 0 } };
             }
 
             ImGui::TreePop();
         }
-
-        static const char* nameTagOptions[] = {
-            "None",
-            "Short Description",
-            "Actor ID",
-            "Both"
-        };
-
-        UIWidgets::Spacer(0);
-
-        ImGui::Text("Actor Name Tags");
-        if (UIWidgets::EnhancementCombobox(CVAR_DEVELOPER_TOOLS("ActorViewer.NameTags"), nameTagOptions, ACTORVIEWER_NAMETAGS_NONE)) {
-            NameTag_RemoveAllByTag(DEBUG_ACTOR_NAMETAG_TAG);
-            ActorViewer_AddTagForAllActors();
-        }
-        UIWidgets::Tooltip("Adds \"name tags\" above actors for identification");
+        PopStyleHeader();
     } else {
         ImGui::Text("Global Context needed for actor info!");
-        if (needs_reset) {
-            fetch = nullptr;
-            actor = category = 0;
-            filler = "Please Select";
-            list.clear();
-            needs_reset = false;
-            for (size_t i = 0; i < ARRAY_COUNT(searchString); i += 1) {
-                searchString[i] = 0;
-            }
-            currentSelectedInDropdown = -1;
-            actors.clear();
-        }
     }
+    ImGui::EndDisabled();
 }
 
 void ActorViewerWindow::InitElement() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorSpawn>([this](void* refActor) {
         Actor* actor = static_cast<Actor*>(refActor);
-        ActorViewer_AddTagForActor(actor);
+
+        // Reload actor list if the new actor belongs to the selected category
+        if (category == actor->category) {
+            PopulateActorDropdown(actor->category, list);
+        }
+    });
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorDestroy>([this](void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+
+        // If the actor belongs to the selected category, we need to manually remove it, as it has not been removed from
+        // the global actor array yet
+        if (category == actor->category) {
+            list.erase(std::remove(list.begin(), list.end(), actor), list.end());
+        }
+        if (display == actor) {
+            display = nullptr;
+        }
+    });
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([this](int16_t sceneNum) {
+        display = nullptr;
+        category = ACTORCAT_SWITCH;
+        list.clear();
     });
 }
+
+void ActorViewer_RegisterNameTagHooks() {
+    COND_HOOK(OnActorInit, CVAR_ACTOR_NAME_TAGS_ENABLED,
+              [](void* actor) { ActorViewer_AddTagForActor(static_cast<Actor*>(actor)); });
+}
+
+RegisterShipInitFunc nametagInit(ActorViewer_RegisterNameTagHooks, { CVAR_ACTOR_NAME_TAGS_ENABLED_NAME });
diff --git a/soh/soh/Enhancements/debugger/actorViewer.h b/soh/soh/Enhancements/debugger/actorViewer.h
index 2f4ca680a1..07c7e5e24d 100644
--- a/soh/soh/Enhancements/debugger/actorViewer.h
+++ b/soh/soh/Enhancements/debugger/actorViewer.h
@@ -2,11 +2,20 @@
 
 #include <libultraship/libultraship.h>
 
-class ActorViewerWindow : public Ship::GuiWindow {
+#include "z64actor.h"
+
+#include <vector>
+
+class ActorViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void DrawElement() override;
     void InitElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
+
+  private:
+    Actor* display = nullptr;
+    int category = ACTORCAT_SWITCH;
+    std::vector<Actor*> list;
 };
diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp
index 493ffdfdca..88e943f87e 100644
--- a/soh/soh/Enhancements/debugger/colViewer.cpp
+++ b/soh/soh/Enhancements/debugger/colViewer.cpp
@@ -1,6 +1,7 @@
 #include "colViewer.h"
 #include "../../frame_interpolation.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 
 #include <vector>
 #include <string>
@@ -19,12 +20,12 @@ extern "C" {
 extern PlayState* gPlayState;
 }
 
-enum class ColRenderSetting { Disabled, Solid, Transparent };
+enum ColRenderSetting { ColRenderDisabled, ColRenderSolid, ColRenderTransparent };
 
-static const char* ColRenderSettingNames[] = {
-    "Disabled",
-    "Solid",
-    "Transparent",
+static std::unordered_map<int32_t, const char*> ColRenderSettingNames = {
+    { ColRenderDisabled, "Disabled" },
+    { ColRenderSolid, "Solid" },
+    { ColRenderTransparent, "Transparent" },
 };
 
 ImVec4 scene_col;
@@ -53,45 +54,93 @@ static std::vector<Vtx> cylinderVtx;
 static std::vector<Gfx> sphereGfx;
 static std::vector<Vtx> sphereVtx;
 
+using namespace UIWidgets;
+
 // Draws the ImGui window for the collision viewer
 void ColViewerWindow::DrawElement() {
-    UIWidgets::EnhancementCheckbox("Enabled", CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"));
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    CheckboxOptions checkOpt = CheckboxOptions().Color(THEME_COLOR);
+    ComboboxOptions comboOpt = ComboboxOptions().Color(THEME_COLOR);
+    CVarCheckbox("Enabled", CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), checkOpt);
 
-    UIWidgets::LabeledRightAlignedEnhancementCombobox("Scene", CVAR_DEVELOPER_TOOLS("ColViewer.Scene"), ColRenderSettingNames, COLVIEW_DISABLED);
-    UIWidgets::LabeledRightAlignedEnhancementCombobox("Bg Actors", CVAR_DEVELOPER_TOOLS("ColViewer.BGActors"), ColRenderSettingNames, COLVIEW_DISABLED);
-    UIWidgets::LabeledRightAlignedEnhancementCombobox("Col Check", CVAR_DEVELOPER_TOOLS("ColViewer.ColCheck"), ColRenderSettingNames, COLVIEW_DISABLED);
-    UIWidgets::LabeledRightAlignedEnhancementCombobox("Waterbox", CVAR_DEVELOPER_TOOLS("ColViewer.Waterbox"), ColRenderSettingNames, COLVIEW_DISABLED);
+    CVarCombobox("Scene", CVAR_DEVELOPER_TOOLS("ColViewer.Scene"), ColRenderSettingNames, comboOpt);
+    CVarCombobox("Bg Actors", CVAR_DEVELOPER_TOOLS("ColViewer.BGActors"), ColRenderSettingNames, comboOpt);
+    CVarCombobox("Col Check", CVAR_DEVELOPER_TOOLS("ColViewer.ColCheck"), ColRenderSettingNames, comboOpt);
+    CVarCombobox("Waterbox", CVAR_DEVELOPER_TOOLS("ColViewer.Waterbox"), ColRenderSettingNames, comboOpt);
 
-    UIWidgets::EnhancementCheckbox("Apply as decal", CVAR_DEVELOPER_TOOLS("ColViewer.Decal"), false, "", UIWidgets::CheckboxGraphics::Cross, true);
-    UIWidgets::InsertHelpHoverText("Applies the collision as a decal display. This can be useful if there is z-fighting occuring "
-                        "with the scene geometry, but can cause other artifacts.");
-    UIWidgets::EnhancementCheckbox("Shaded", CVAR_DEVELOPER_TOOLS("ColViewer.Shaded"));
-    UIWidgets::InsertHelpHoverText("Applies the scene's shading to the collision display.");
+    CVarCheckbox("Apply as decal", CVAR_DEVELOPER_TOOLS("ColViewer.Decal"),
+                 checkOpt.DefaultValue(true).Tooltip(
+                     "Applies the collision as a decal display. This can be useful if there is z-fighting occuring "
+                     "with the scene geometry, but can cause other artifacts."));
+    CVarCheckbox("Shaded", CVAR_DEVELOPER_TOOLS("ColViewer.Shaded"),
+                 checkOpt.DefaultValue(false).Tooltip("Applies the scene's shading to the collision display."));
 
     // This has to be duplicated in both code paths due to the nature of ImGui::IsItemHovered()
     const std::string colorHelpText = "View and change the colors used for collision display.";
+    PushStyleHeader(THEME_COLOR);
     if (ImGui::TreeNode("Colors")) {
-        UIWidgets::InsertHelpHoverText(colorHelpText);
+        UIWidgets::Tooltip(colorHelpText.c_str());
 
-        UIWidgets::EnhancementColor("Normal", CVAR_DEVELOPER_TOOLS("ColViewer.ColorNormal"), scene_col, ImVec4(255, 255, 255, 255), false);
-        UIWidgets::EnhancementColor("Hookshot", CVAR_DEVELOPER_TOOLS("ColViewer.ColorHookshot"), hookshot_col, ImVec4(128, 128, 255, 255),
-                                   false);
-        UIWidgets::EnhancementColor("Entrance", CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance"), entrance_col, ImVec4(0, 255, 0, 255), false);
-        UIWidgets::EnhancementColor("Special Surface (Grass/Sand/Etc)", CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface"),
-                                   specialSurface_col, ImVec4(192, 255, 192, 255), false);
-        UIWidgets::EnhancementColor("Interactable (Vines/Crawlspace/Etc)", CVAR_DEVELOPER_TOOLS("ColViewer.ColorInteractable"),
-                                   interactable_col, ImVec4(192, 0, 192, 255), false);
-        UIWidgets::EnhancementColor("Slope", CVAR_DEVELOPER_TOOLS("ColViewer.ColorSlope"), slope_col, ImVec4(255, 255, 128, 255), false);
-        UIWidgets::EnhancementColor("Void", CVAR_DEVELOPER_TOOLS("ColViewer.ColorVoid"), void_col, ImVec4(255, 0, 0, 255), false);
-        UIWidgets::EnhancementColor("OC", CVAR_DEVELOPER_TOOLS("ColViewer.ColorOC"), oc_col, ImVec4(255, 255, 255, 255), false);
-        UIWidgets::EnhancementColor("AC", CVAR_DEVELOPER_TOOLS("ColViewer.ColorAC"), ac_col, ImVec4(0, 0, 255, 255), false);
-        UIWidgets::EnhancementColor("AT", CVAR_DEVELOPER_TOOLS("ColViewer.ColorAT"), at_col, ImVec4(255, 0, 0, 255), false);
-        UIWidgets::EnhancementColor("Waterbox", CVAR_DEVELOPER_TOOLS("ColViewer.ColorWaterbox"), waterbox_col, ImVec4(0, 0, 255, 255), false);
+        if (CVarColorPicker("Normal", CVAR_DEVELOPER_TOOLS("ColViewer.ColorNormal"), { 255, 255, 255, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            scene_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorNormal"), { 255, 255, 255, 255 }));
+        }
+        if (CVarColorPicker("Hookshot", CVAR_DEVELOPER_TOOLS("ColViewer.ColorHookshot"), { 128, 128, 255, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            hookshot_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorHookshot"), { 128, 128, 255, 255 }));
+        }
+        if (CVarColorPicker("Entrance", CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance"), { 0, 255, 0, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            entrance_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance"), { 0, 255, 0, 255 }));
+        }
+        if (CVarColorPicker("Special Surface (Grass/Sand/Etc)", CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface"),
+                            { 192, 255, 192, 255 }, false, ColorPickerResetButton | ColorPickerRandomButton,
+                            THEME_COLOR)) {
+            specialSurface_col = VecFromRGBA8(
+                CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface"), { 192, 255, 192, 255 }));
+        }
+        if (CVarColorPicker("Interactable (Vines/Crawlspace/Etc)", CVAR_DEVELOPER_TOOLS("ColViewer.ColorInteractable"),
+                            { 192, 0, 192, 255 }, false, ColorPickerResetButton | ColorPickerRandomButton,
+                            THEME_COLOR)) {
+            interactable_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorInteractable"), { 192, 0, 192, 255 }));
+        }
+        if (CVarColorPicker("Slope", CVAR_DEVELOPER_TOOLS("ColViewer.ColorSlope"), { 255, 255, 128, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            slope_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSlope"), { 255, 255, 128, 255 }));
+        }
+        if (CVarColorPicker("Void", CVAR_DEVELOPER_TOOLS("ColViewer.ColorVoid"), { 255, 0, 0, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            void_col = VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorVoid"), { 255, 0, 0, 255 }));
+        }
+        if (CVarColorPicker("OC", CVAR_DEVELOPER_TOOLS("ColViewer.ColorOC"), { 255, 255, 255, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            oc_col = VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorOC"), { 255, 255, 255, 255 }));
+        }
+        if (CVarColorPicker("AC", CVAR_DEVELOPER_TOOLS("ColViewer.ColorAC"), { 0, 0, 255, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            ac_col = VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAC"), { 0, 0, 255, 255 }));
+        }
+        if (CVarColorPicker("AT", CVAR_DEVELOPER_TOOLS("ColViewer.ColorAT"), { 255, 0, 0, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            at_col = VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAT"), { 255, 0, 0, 255 }));
+        }
+        if (CVarColorPicker("Waterbox", CVAR_DEVELOPER_TOOLS("ColViewer.ColorWaterbox"), { 0, 0, 255, 255 }, false,
+                            ColorPickerResetButton | ColorPickerRandomButton, THEME_COLOR)) {
+            waterbox_col =
+                VecFromRGBA8(CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorWaterbox"), { 0, 0, 255, 255 }));
+        }
 
         ImGui::TreePop();
     } else {
-        UIWidgets::InsertHelpHoverText(colorHelpText);
+        UIWidgets::Tooltip(colorHelpText.c_str());
     }
+    PopStyleHeader();
+    ImGui::EndDisabled();
 }
 
 // Calculates the normal for a triangle at the 3 specified points
@@ -185,9 +234,9 @@ void CreateSphereFace(std::vector<std::tuple<size_t, size_t, size_t>>& faces, in
 
     // Create 3 new verticies at the midpoints
     Vec3f vs[3] = {
-        Vec3f{(v0.n.ob[0] + v1.n.ob[0]) / 2.0f, (v0.n.ob[1] + v1.n.ob[1]) / 2.0f, (v0.n.ob[2] + v1.n.ob[2]) / 2.0f},
-        Vec3f{(v1.n.ob[0] + v2.n.ob[0]) / 2.0f, (v1.n.ob[1] + v2.n.ob[1]) / 2.0f, (v1.n.ob[2] + v2.n.ob[2]) / 2.0f},
-        Vec3f{(v2.n.ob[0] + v0.n.ob[0]) / 2.0f, (v2.n.ob[1] + v0.n.ob[1]) / 2.0f, (v2.n.ob[2] + v0.n.ob[2]) / 2.0f}
+        Vec3f{ (v0.n.ob[0] + v1.n.ob[0]) / 2.0f, (v0.n.ob[1] + v1.n.ob[1]) / 2.0f, (v0.n.ob[2] + v1.n.ob[2]) / 2.0f },
+        Vec3f{ (v1.n.ob[0] + v2.n.ob[0]) / 2.0f, (v1.n.ob[1] + v2.n.ob[1]) / 2.0f, (v1.n.ob[2] + v2.n.ob[2]) / 2.0f },
+        Vec3f{ (v2.n.ob[0] + v0.n.ob[0]) / 2.0f, (v2.n.ob[1] + v0.n.ob[1]) / 2.0f, (v2.n.ob[2] + v0.n.ob[2]) / 2.0f }
     };
 
     // Normalize vertex positions so they are on the sphere
@@ -212,20 +261,20 @@ void CreateSphereData() {
     float d = (1.0f + sqrtf(5.0f)) / 2.0f;
 
     // Create the 12 starting verticies, 4 on each rectangle
-    base.emplace_back(Vec3f({-1, d, 0}));
-    base.emplace_back(Vec3f({1, d, 0}));
-    base.emplace_back(Vec3f({-1, -d, 0}));
-    base.emplace_back(Vec3f({1, -d, 0}));
+    base.emplace_back(Vec3f({ -1, d, 0 }));
+    base.emplace_back(Vec3f({ 1, d, 0 }));
+    base.emplace_back(Vec3f({ -1, -d, 0 }));
+    base.emplace_back(Vec3f({ 1, -d, 0 }));
 
-    base.emplace_back(Vec3f({0, -1, d}));
-    base.emplace_back(Vec3f({0, 1, d}));
-    base.emplace_back(Vec3f({0, -1, -d}));
-    base.emplace_back(Vec3f({0, 1, -d}));
+    base.emplace_back(Vec3f({ 0, -1, d }));
+    base.emplace_back(Vec3f({ 0, 1, d }));
+    base.emplace_back(Vec3f({ 0, -1, -d }));
+    base.emplace_back(Vec3f({ 0, 1, -d }));
 
-    base.emplace_back(Vec3f({d, 0, -1}));
-    base.emplace_back(Vec3f({d, 0, 1}));
-    base.emplace_back(Vec3f({-d, 0, -1}));
-    base.emplace_back(Vec3f({-d, 0, 1}));
+    base.emplace_back(Vec3f({ d, 0, -1 }));
+    base.emplace_back(Vec3f({ d, 0, 1 }));
+    base.emplace_back(Vec3f({ -d, 0, -1 }));
+    base.emplace_back(Vec3f({ -d, 0, 1 }));
 
     // Normalize verticies so they are on the unit sphere
     for (Vec3f& v : base) {
@@ -287,7 +336,7 @@ void InitGfx(std::vector<Gfx>& gfx, ColRenderSetting setting) {
     uint64_t cm;
     uint32_t gm;
 
-    if (setting == ColRenderSetting::Transparent) {
+    if (setting == ColRenderTransparent) {
         rm = Z_CMP | IM_RD | CVG_DST_FULL | FORCE_BL;
         blc1 = GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA);
         blc2 = GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA);
@@ -301,7 +350,7 @@ void InitGfx(std::vector<Gfx>& gfx, ColRenderSetting setting) {
 
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Decal"), 1) != 0) {
         rm |= ZMODE_DEC;
-    } else if (setting == ColRenderSetting::Transparent) {
+    } else if (setting == ColRenderTransparent) {
         rm |= ZMODE_XLU;
     } else {
         rm |= ZMODE_OPA;
@@ -324,7 +373,7 @@ void InitGfx(std::vector<Gfx>& gfx, ColRenderSetting setting) {
 
 // Draws a dynapoly structure (scenes or Bg Actors)
 void DrawDynapoly(std::vector<Gfx>& dl, CollisionHeader* col, int32_t bgId) {
-    Color_RGBA8 color = {255, 255, 255, 255};
+    Color_RGBA8 color = { 255, 255, 255, 255 };
 
     uint32_t lastColorR = color.r;
     uint32_t lastColorG = color.g;
@@ -340,21 +389,21 @@ void DrawDynapoly(std::vector<Gfx>& dl, CollisionHeader* col, int32_t bgId) {
         CollisionPoly* poly = &col->polyList[i];
 
         if (SurfaceType_IsHookshotSurface(&gPlayState->colCtx, poly, bgId)) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorHookshot"), { 128, 128, 255, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorHookshot.Value"), { 128, 128, 255, 255 });
         } else if (func_80041D94(&gPlayState->colCtx, poly, bgId) > 0x01) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorInteractable"), {192, 0, 192, 255});
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorInteractable.Value"), { 192, 0, 192, 255 });
         } else if (func_80041E80(&gPlayState->colCtx, poly, bgId) == 0x0C) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorVoid"), { 255, 0, 0, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorVoid.Value"), { 255, 0, 0, 255 });
         } else if (SurfaceType_GetSceneExitIndex(&gPlayState->colCtx, poly, bgId) ||
                    func_80041E80(&gPlayState->colCtx, poly, bgId) == 0x05) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance"), { 0, 255, 0, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance.Value"), { 0, 255, 0, 255 });
         } else if (func_80041D4C(&gPlayState->colCtx, poly, bgId) != 0 ||
                    SurfaceType_IsWallDamage(&gPlayState->colCtx, poly, bgId)) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface"), { 192, 255, 192, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface.Value"), { 192, 255, 192, 255 });
         } else if (SurfaceType_GetSlope(&gPlayState->colCtx, poly, bgId) == 0x01) {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSlope"), { 255, 255, 128, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSlope.Value"), { 255, 255, 128, 255 });
         } else {
-            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorNormal"), { 255, 255, 255, 255 });
+            color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorNormal.Value"), { 255, 255, 255, 255 });
         }
 
         if (color.r != lastColorR || color.g != lastColorG || color.b != lastColorB) {
@@ -402,13 +451,14 @@ void DrawDynapoly(std::vector<Gfx>& dl, CollisionHeader* col, int32_t bgId) {
 
 // Draws the scene
 void DrawSceneCollision() {
-    ColRenderSetting showSceneColSetting = (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Scene"), COLVIEW_DISABLED);
+    ColRenderSetting showSceneColSetting =
+        (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Scene"), COLVIEW_DISABLED);
 
-    if (showSceneColSetting == ColRenderSetting::Disabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
+    if (showSceneColSetting == ColRenderDisabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
         return;
     }
 
-    std::vector<Gfx>& dl = (showSceneColSetting == ColRenderSetting::Transparent) ? xluDl : opaDl;
+    std::vector<Gfx>& dl = (showSceneColSetting == ColRenderTransparent) ? xluDl : opaDl;
     InitGfx(dl, showSceneColSetting);
     dl.push_back(gsSPMatrix(&gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH));
 
@@ -417,12 +467,13 @@ void DrawSceneCollision() {
 
 // Draws all Bg Actors
 void DrawBgActorCollision() {
-    ColRenderSetting showBgActorSetting = (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.BGActors"), COLVIEW_DISABLED);
-    if (showBgActorSetting == ColRenderSetting::Disabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
+    ColRenderSetting showBgActorSetting =
+        (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.BGActors"), COLVIEW_DISABLED);
+    if (showBgActorSetting == ColRenderDisabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
         return;
     }
 
-    std::vector<Gfx>& dl = (showBgActorSetting == ColRenderSetting::Transparent) ? xluDl : opaDl;
+    std::vector<Gfx>& dl = (showBgActorSetting == ColRenderTransparent) ? xluDl : opaDl;
     InitGfx(dl, showBgActorSetting);
     dl.push_back(gsSPMatrix(&gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH));
 
@@ -542,23 +593,24 @@ void DrawColCheckList(std::vector<Gfx>& dl, Collider** objects, int32_t count) {
 
 // Draws all Col Check objects
 void DrawColCheckCollision() {
-    ColRenderSetting showColCheckSetting = (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.ColCheck"), COLVIEW_DISABLED);
-    if (showColCheckSetting == ColRenderSetting::Disabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
+    ColRenderSetting showColCheckSetting =
+        (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.ColCheck"), COLVIEW_DISABLED);
+    if (showColCheckSetting == ColRenderDisabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
         return;
     }
 
-    std::vector<Gfx>& dl = (showColCheckSetting == ColRenderSetting::Transparent) ? xluDl : opaDl;
+    std::vector<Gfx>& dl = (showColCheckSetting == ColRenderTransparent) ? xluDl : opaDl;
     InitGfx(dl, showColCheckSetting);
     dl.push_back(gsSPMatrix(&gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH));
 
     CollisionCheckContext& col = gPlayState->colChkCtx;
-    Color_RGBA8 color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorOC"), { 255, 255, 255, 255 });
+    Color_RGBA8 color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorOC.Value"), { 255, 255, 255, 255 });
     dl.push_back(gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     DrawColCheckList(dl, col.colOC, col.colOCCount);
-    color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAC"), { 0, 0, 255, 255 });
+    color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAC.Value"), { 0, 0, 255, 255 });
     dl.push_back(gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
     DrawColCheckList(dl, col.colAC, col.colACCount);
-    color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAT"), { 0, 0, 255, 255 });
+    color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorAT.Value"), { 0, 0, 255, 255 });
     dl.push_back(gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
 
     DrawColCheckList(dl, col.colAT, col.colATCount);
@@ -594,16 +646,17 @@ extern "C" f32 zdWaterBoxMinY;
 
 // Draws all waterboxes
 void DrawWaterboxList() {
-    ColRenderSetting showWaterboxSetting = (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Waterbox"), COLVIEW_DISABLED);
-    if (showWaterboxSetting == ColRenderSetting::Disabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
+    ColRenderSetting showWaterboxSetting =
+        (ColRenderSetting)CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Waterbox"), COLVIEW_DISABLED);
+    if (showWaterboxSetting == ColRenderDisabled || !CVarGetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), 0)) {
         return;
     }
 
-    std::vector<Gfx>& dl = (showWaterboxSetting == ColRenderSetting::Transparent) ? xluDl : opaDl;
+    std::vector<Gfx>& dl = (showWaterboxSetting == ColRenderTransparent) ? xluDl : opaDl;
     InitGfx(dl, showWaterboxSetting);
     dl.push_back(gsSPMatrix(&gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH));
 
-    Color_RGBA8 color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorWaterbox"), { 0, 0, 255, 255 });
+    Color_RGBA8 color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorWaterbox.Value"), { 0, 0, 255, 255 });
 
     dl.push_back(gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
 
diff --git a/soh/soh/Enhancements/debugger/colViewer.h b/soh/soh/Enhancements/debugger/colViewer.h
index b4807e873a..04f457aa00 100644
--- a/soh/soh/Enhancements/debugger/colViewer.h
+++ b/soh/soh/Enhancements/debugger/colViewer.h
@@ -2,20 +2,16 @@
 
 #include <libultraship/libultraship.h>
 
-typedef enum {
-  COLVIEW_DISABLED,
-  COLVIEW_SOLID,
-  COLVIEW_TRANSPARENT
-} ColViewerRenderSetting;
+typedef enum { COLVIEW_DISABLED, COLVIEW_SOLID, COLVIEW_TRANSPARENT } ColViewerRenderSetting;
 
 #ifdef __cplusplus
-class ColViewerWindow : public Ship::GuiWindow {
+class ColViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
 #endif
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index b9858aff4e..547d1907a9 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -3,6 +3,7 @@
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 
 #include <spdlog/fmt/fmt.h>
 #include <array>
@@ -27,7 +28,7 @@ extern PlayState* gPlayState;
 }
 
 // Maps entries in the GS flag array to the area name it represents
-std::vector<std::string> gsMapping = {
+std::vector<const char*> gsMapping = {
     "Deku Tree",
     "Dodongo's Cavern",
     "Inside Jabu-Jabu's Belly",
@@ -56,6 +57,15 @@ extern "C" u8 gAreaGsFlags[];
 
 extern "C" u8 gAmmoItems[];
 
+#define IMAGE_SIZE 48.0f
+
+using namespace UIWidgets;
+
+IntSliderOptions intSliderOptionsBase;
+ButtonOptions buttonOptionsBase;
+CheckboxOptions checkboxOptionsBase;
+ComboboxOptions comboboxOptionsBase;
+
 // Modification of gAmmoItems that replaces ITEM_NONE with the item in inventory slot it represents
 u8 gAllAmmoItems[] = {
     ITEM_STICK,     ITEM_NUT,          ITEM_BOMB,    ITEM_BOW,      ITEM_ARROW_FIRE, ITEM_DINS_FIRE,
@@ -64,40 +74,29 @@ u8 gAllAmmoItems[] = {
 };
 
 // Encapsulates what is drawn by the passed-in function within a border
-template<typename T>
-void DrawGroupWithBorder(T&& drawFunc) {
+template <typename T> void DrawGroupWithBorder(T&& drawFunc, std::string section) {
     // First group encapsulates the inner portion and border
+    ImGui::BeginChild(std::string("##" + section).c_str(), ImVec2(0, 0),
+                      ImGuiChildFlags_AlwaysAutoResize | ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeX |
+                          ImGuiChildFlags_AutoResizeY);
+
     ImGui::BeginGroup();
-
-    ImVec2 padding = ImGui::GetStyle().FramePadding;
-    ImVec2 p0 = ImGui::GetCursorScreenPos();
-    ImGui::SetCursorScreenPos(ImVec2(p0.x + padding.x, p0.y + padding.y));
-
-    // Second group encapsulates just the inner portion
-    ImGui::BeginGroup();
-
+    ImGui::AlignTextToFramePadding();
     drawFunc();
-
-    ImGui::Dummy(padding);
     ImGui::EndGroup();
 
-    ImVec2 p1 = ImGui::GetItemRectMax();
-    p1.x += padding.x;
-    ImVec4 borderCol = ImGui::GetStyle().Colors[ImGuiCol_Border];
-    ImGui::GetWindowDrawList()->AddRect(p0, p1, IM_COL32(borderCol.x * 255, borderCol.y * 255, borderCol.z * 255, borderCol.w * 255));
-
-    ImGui::EndGroup();
+    ImGui::EndChild();
 }
 
 char z2ASCII(int code) {
     int ret;
-    if (code < 10) { //Digits
+    if (code < 10) { // Digits
         ret = code + 0x30;
-    } else if (code >= 10 && code < 36) { //Uppercase letters
+    } else if (code >= 10 && code < 36) { // Uppercase letters
         ret = code + 0x37;
-    } else if (code >= 36 && code < 62) { //Lowercase letters
+    } else if (code >= 36 && code < 62) { // Lowercase letters
         ret = code + 0x3D;
-    } else if (code == 62) { //Space
+    } else if (code == 62) { // Space
         ret = code - 0x1E;
     } else if (code == 63 || code == 64) { // _ and .
         ret = code - 0x12;
@@ -105,9 +104,40 @@ char z2ASCII(int code) {
         ret = code;
     }
     return char(ret);
-
 }
 
+enum MagicLevel { MAGIC_LEVEL_NONE, MAGIC_LEVEL_SINGLE, MAGIC_LEVEL_DOUBLE };
+
+std::unordered_map<int8_t, const char*> magicLevelMap = {
+    { MAGIC_LEVEL_NONE, "None" },
+    { MAGIC_LEVEL_SINGLE, "Single" },
+    { MAGIC_LEVEL_DOUBLE, "Double" },
+};
+
+enum AudioOutput {
+    AUDIO_STEREO,
+    AUDIO_MONO,
+    AUDIO_HEADSET,
+    AUDIO_SURROUND,
+};
+
+std::unordered_map<uint8_t, const char*> audioMap = {
+    { AUDIO_STEREO, "Stereo" },
+    { AUDIO_MONO, "Mono" },
+    { AUDIO_HEADSET, "Headset" },
+    { AUDIO_SURROUND, "Surround" },
+};
+
+enum ZTarget {
+    Z_TARGET_SWITCH,
+    Z_TARGET_HOLD,
+};
+
+std::unordered_map<uint8_t, const char*> zTargetMap = {
+    { Z_TARGET_SWITCH, "Switch" },
+    { Z_TARGET_HOLD, "Hold" },
+};
+
 void DrawInfoTab() {
     // TODO Needs a better method for name changing but for now this will work.
     std::string name;
@@ -121,305 +151,273 @@ void DrawInfoTab() {
     ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
 
     ImGui::Text("Name: %s", name.c_str());
-    UIWidgets::InsertHelpHoverText("Player Name");
+    Tooltip("Player Name");
     std::string nameID;
     for (int i = 0; i < 8; i++) {
         nameID = z2ASCII(i);
         if (i % 4 != 0) {
             ImGui::SameLine();
         }
+        PushStyleInput(THEME_COLOR);
         ImGui::InputScalar(nameID.c_str(), ImGuiDataType_U8, &gSaveContext.playerName[i], &one, NULL);
+        PopStyleInput();
     }
 
     // Use an intermediary to keep the health from updating (and potentially killing the player)
     // until it is done being edited
     int16_t healthIntermediary = gSaveContext.healthCapacity;
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Max Health", ImGuiDataType_S16, &healthIntermediary);
+    PopStyleInput();
     if (ImGui::IsItemDeactivated()) {
         gSaveContext.healthCapacity = healthIntermediary;
     }
-    UIWidgets::InsertHelpHoverText("Maximum health. 16 units per full heart");
+    Tooltip("Maximum health. 16 units per full heart");
     if (gSaveContext.health > gSaveContext.healthCapacity) {
         gSaveContext.health = gSaveContext.healthCapacity; // Clamp health to new max
     }
-
-    const uint16_t healthMin = 0;
-    const uint16_t healthMax = gSaveContext.healthCapacity;
-    ImGui::SetNextItemWidth(ImGui::GetFontSize() * 15);
-    ImGui::SliderScalar("Health", ImGuiDataType_S16, &gSaveContext.health, &healthMin, &healthMax);
-    UIWidgets::InsertHelpHoverText("Current health. 16 units per full heart");
+    int32_t health = (int32_t)gSaveContext.health;
+    if (SliderInt("Health", &health,
+                  intSliderOptionsBase.Tooltip("Current health. 16 units per full heart")
+                      .Min(0)
+                      .Max(gSaveContext.healthCapacity))) {
+        gSaveContext.health = (int16_t)health;
+    }
 
     bool isDoubleDefenseAcquired = gSaveContext.isDoubleDefenseAcquired != 0;
-    if (ImGui::Checkbox("Double Defense", &isDoubleDefenseAcquired)) {
+    if (Checkbox("Double Defense", &isDoubleDefenseAcquired,
+                 checkboxOptionsBase.Tooltip("Is double defense unlocked?"))) {
         gSaveContext.isDoubleDefenseAcquired = isDoubleDefenseAcquired;
         gSaveContext.inventory.defenseHearts =
             gSaveContext.isDoubleDefenseAcquired ? 20 : 0; // Set to get the border drawn in the UI
     }
-    UIWidgets::InsertHelpHoverText("Is double defense unlocked?");
-
-    std::string magicName;
-    if (gSaveContext.magicLevel == 2) {
-        magicName = "Double";
-    } else if (gSaveContext.magicLevel == 1) {
-        magicName = "Single";
-    } else {
-        magicName = "None";
+    if (Combobox("Magic Level", &gSaveContext.magicLevel, magicLevelMap,
+                 comboboxOptionsBase.Tooltip("Current magic level"))) {
+        gSaveContext.isMagicAcquired = gSaveContext.magicLevel > 0;
+        gSaveContext.isDoubleMagicAcquired = gSaveContext.magicLevel == 2;
     }
-    ImGui::SetNextItemWidth(ImGui::GetFontSize() * 6);
-    if (ImGui::BeginCombo("Magic Level", magicName.c_str())) {
-        if (ImGui::Selectable("Double")) {
-            gSaveContext.magicLevel = 2;
-            gSaveContext.isMagicAcquired = true;
-            gSaveContext.isDoubleMagicAcquired = true;
-        }
-        if (ImGui::Selectable("Single")) {
-            gSaveContext.magicLevel = 1;
-            gSaveContext.isMagicAcquired = true;
-            gSaveContext.isDoubleMagicAcquired = false;
-        }
-        if (ImGui::Selectable("None")) {
-            gSaveContext.magicLevel = 0;
-            gSaveContext.isMagicAcquired = false;
-            gSaveContext.isDoubleMagicAcquired = false;
-        }
-
-        ImGui::EndCombo();
-    }
-    UIWidgets::InsertHelpHoverText("Current magic level");
     gSaveContext.magicCapacity = gSaveContext.magicLevel * 0x30; // Set to get the bar drawn in the UI
     if (gSaveContext.magic > gSaveContext.magicCapacity) {
         gSaveContext.magic = gSaveContext.magicCapacity; // Clamp magic to new max
     }
 
-    const uint8_t magicMin = 0;
-    const uint8_t magicMax = gSaveContext.magicCapacity;
-    ImGui::SetNextItemWidth(ImGui::GetFontSize() * 15);
-    ImGui::SliderScalar("Magic", ImGuiDataType_S8, &gSaveContext.magic, &magicMin, &magicMax);
-    UIWidgets::InsertHelpHoverText("Current magic. 48 units per magic level");
+    int32_t magic = (int32_t)gSaveContext.magic;
+    if (SliderInt("Magic", &magic,
+                  intSliderOptionsBase.Min(0)
+                      .Max(gSaveContext.magicCapacity)
+                      .Tooltip("Current magic. 48 units per magic level"))) {
+        gSaveContext.magic = (int8_t)magic;
+    }
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Rupees", ImGuiDataType_S16, &gSaveContext.rupees);
-    UIWidgets::InsertHelpHoverText("Current rupees");
+    Tooltip("Current rupees");
+    PopStyleInput();
 
-    const uint16_t dayTimeMin = 0;
-    const uint16_t dayTimeMax = 0xFFFF;
-    ImGui::SetNextItemWidth(ImGui::GetFontSize() * 15);
-    ImGui::SliderScalar("Time", ImGuiDataType_U16, &gSaveContext.dayTime, &dayTimeMin, &dayTimeMax);
-    UIWidgets::InsertHelpHoverText("Time of day");
-    if (ImGui::Button("Dawn")) {
+    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 (ImGui::Button("Noon")) {
+    if (Button("Noon", buttonOptionsBase)) {
         gSaveContext.dayTime = 0x8000;
     }
     ImGui::SameLine();
-    if (ImGui::Button("Sunset")) {
+    if (Button("Sunset", buttonOptionsBase)) {
         gSaveContext.dayTime = 0xC001;
     }
     ImGui::SameLine();
-    if (ImGui::Button("Midnight")) {
+    if (Button("Midnight", buttonOptionsBase)) {
         gSaveContext.dayTime = 0;
     }
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Total Days", ImGuiDataType_S32, &gSaveContext.totalDays);
-    UIWidgets::InsertHelpHoverText("Total number of days elapsed since the start of the game");
+    Tooltip("Total number of days elapsed since the start of the game");
+    PopStyleInput();
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Deaths", ImGuiDataType_U16, &gSaveContext.deaths);
-    UIWidgets::InsertHelpHoverText("Total number of deaths");
+    Tooltip("Total number of deaths");
+    PopStyleInput();
 
-    bool bgsFlag = gSaveContext.bgsFlag != 0;
-    if (ImGui::Checkbox("Has BGS", &bgsFlag)) {
-        gSaveContext.bgsFlag = bgsFlag;
-    }
-    UIWidgets::InsertHelpHoverText("Is Biggoron sword unlocked? Replaces Giant's knife");
+    Checkbox("Has BGS", (bool*)&gSaveContext.bgsFlag,
+             checkboxOptionsBase.Tooltip("Is Biggoron sword unlocked? Replaces Giant's knife"));
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Sword Health", ImGuiDataType_U16, &gSaveContext.swordHealth);
-    UIWidgets::InsertHelpHoverText("Giant's knife health. Default is 8. Must be >0 for Biggoron sword to work");
+    Tooltip("Giant's knife health. Default is 8. Must be >0 for Biggoron sword to work");
+    PopStyleInput();
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Bgs Day Count", ImGuiDataType_S32, &gSaveContext.bgsDayCount);
-    UIWidgets::InsertHelpHoverText("Total number of days elapsed since giving Biggoron the claim check");
+    Tooltip("Total number of days elapsed since giving Biggoron the claim check");
+    PopStyleInput();
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Entrance Index", ImGuiDataType_S32, &gSaveContext.entranceIndex);
-    UIWidgets::InsertHelpHoverText("From which entrance did Link arrive?");
+    Tooltip("From which entrance did Link arrive?");
+    PopStyleInput();
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Cutscene Index", ImGuiDataType_S32, &gSaveContext.cutsceneIndex);
-    UIWidgets::InsertHelpHoverText("Which cutscene is this?");
+    Tooltip("Which cutscene is this?");
+    PopStyleInput();
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("Navi Timer", ImGuiDataType_U16, &gSaveContext.naviTimer);
-    UIWidgets::InsertHelpHoverText("Navi wants to talk at 600 units, decides not to at 3000.");
+    Tooltip("Navi wants to talk at 600 units, decides not to at 3000.");
+    PopStyleInput();
 
-    ImGui::InputScalar("Timer 1 State", ImGuiDataType_S16, &gSaveContext.timer1State);
-    UIWidgets::InsertHelpHoverText("Heat timer, race timer, etc. Has white font");
+    PushStyleInput(THEME_COLOR);
+    ImGui::InputScalar("Timer State", ImGuiDataType_S16, &gSaveContext.timerState);
+    Tooltip("Heat timer, race timer, etc. Has white font");
+    PopStyleInput();
 
-    ImGui::InputScalar("Timer 1 Value", ImGuiDataType_S16, &gSaveContext.timer1Value, &one, NULL);
-    UIWidgets::InsertHelpHoverText("Time, in seconds");
+    PushStyleInput(THEME_COLOR);
+    ImGui::InputScalar("Timer Seconds", ImGuiDataType_S16, &gSaveContext.timerSeconds, &one, NULL);
+    Tooltip("Time, in seconds");
+    PopStyleInput();
 
-    ImGui::InputScalar("Timer 2 State", ImGuiDataType_S16, &gSaveContext.timer2State);
-    UIWidgets::InsertHelpHoverText("Trade timer, Ganon collapse timer, etc. Has yellow font");
+    PushStyleInput(THEME_COLOR);
+    ImGui::InputScalar("Sub-Timer State", ImGuiDataType_S16, &gSaveContext.subTimerState);
+    Tooltip("Trade timer, Ganon collapse timer, etc. Has yellow font");
+    PopStyleInput();
 
-    ImGui::InputScalar("Timer 2 Value", ImGuiDataType_S16, &gSaveContext.timer2Value, &one, NULL);
-    UIWidgets::InsertHelpHoverText("Time, in seconds");
-     
-    const char* audioName;
-    switch (gSaveContext.audioSetting) { 
-        case 0:
-            audioName = "Stereo";
-            break;
-        case 1:
-            audioName = "Mono";
-            break;
-        case 2:
-            audioName = "Headset";
-            break;
-        case 3:
-            audioName = "Surround";
-            break;
-        default:
-            audioName = "?";
-    }
-    if (ImGui::BeginCombo("Audio", audioName)) {
-        if (ImGui::Selectable("Stereo")) {
-            gSaveContext.audioSetting = 0;
-        }
-        if (ImGui::Selectable("Mono")) {
-            gSaveContext.audioSetting = 1;
-        }
-        if (ImGui::Selectable("Headset")) {
-            gSaveContext.audioSetting = 2;
-        }
-        if (ImGui::Selectable("Surround")) {
-            gSaveContext.audioSetting = 3;
-        }
+    PushStyleInput(THEME_COLOR);
+    ImGui::InputScalar("Sub-Timer Seconds", ImGuiDataType_S16, &gSaveContext.subTimerSeconds, &one, NULL);
+    Tooltip("Time, in seconds");
+    PopStyleInput();
 
-        ImGui::EndCombo();
-    }
-    UIWidgets::InsertHelpHoverText("Sound setting");
-    
-    bool n64DDFlag = gSaveContext.n64ddFlag != 0;
-    if (ImGui::Checkbox("64 DD file?", &n64DDFlag)) {
-        gSaveContext.n64ddFlag = n64DDFlag;
-    }
-    UIWidgets::InsertHelpHoverText("WARNING! If you save, your file may be locked! Use caution!");
-    
-    if (ImGui::BeginCombo("Z Target Mode", gSaveContext.zTargetSetting ? "Hold" : "Switch")) {
-        if (ImGui::Selectable("Switch")) {
-            gSaveContext.zTargetSetting = 0;
-        }
-        if (ImGui::Selectable("Hold")) {
-            gSaveContext.zTargetSetting = 1;
-        }
-        ImGui::EndCombo();
-    }
-    UIWidgets::InsertHelpHoverText("Z-Targeting behavior");
+    Combobox("Audio", &gSaveContext.audioSetting, audioMap, comboboxOptionsBase.Tooltip("Sound setting"));
+
+    Checkbox("64 DD file?", (bool*)&gSaveContext.n64ddFlag,
+             checkboxOptionsBase.Tooltip("WARNING! If you save, your file may be locked! Use caution!"));
+
+    Combobox("Z Target Mode", &gSaveContext.zTargetSetting, zTargetMap,
+             comboboxOptionsBase.Tooltip("Z-Targeting behavior"));
 
     if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) {
-        ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U8, &gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
-        UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt.");
+        PushStyleInput(THEME_COLOR);
+        ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U8,
+                           &gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
+        Tooltip("Currently obtained Triforce Pieces. For Triforce Hunt.");
+        PopStyleInput();
     }
 
     ImGui::PushItemWidth(ImGui::GetFontSize() * 10);
-    static std::array<const char*, 7> minigameHS = { "Horseback Archery", 
-        "Big Poe Points",                                            
-        "Fishing",
-        "Malon's Obstacle Course",                                    
-        "Running Man Race",
-        "?",
-        "Dampe's Race" };
-    
+    static std::array<const char*, 7> minigameHS = { "Horseback Archery", "Big Poe Points",
+                                                     "Fishing",           "Malon's Obstacle Course",
+                                                     "Running Man Race",  "?",
+                                                     "Dampe's Race" };
+
     if (ImGui::TreeNode("Minigames")) {
         for (int i = 0; i < 7; i++) {
-            if(i == 2 && ImGui::TreeNode("Fishing") ){ //fishing has a few more flags to it
+            if (i == 2 && ImGui::TreeNode("Fishing")) { // fishing has a few more flags to it
                 u8 fishSize = gSaveContext.highScores[i] & 0x7F;
-                if(ImGui::InputScalar("Child Size Record",ImGuiDataType_U8,&fishSize)){
-                    gSaveContext.highScores[i]&=~0x7F;
-                    gSaveContext.highScores[i]|=fishSize & 0x7F;
+                PushStyleInput(THEME_COLOR);
+                if (ImGui::InputScalar("Child Size Record", ImGuiDataType_U8, &fishSize)) {
+                    gSaveContext.highScores[i] &= ~0x7F;
+                    gSaveContext.highScores[i] |= fishSize & 0x7F;
                 }
                 char fishMsg[64];
-                std::sprintf(fishMsg,"Weight: %2.0f lbs",((SQ(fishSize)*.0036)+.5));
-                UIWidgets::InsertHelpHoverText(fishMsg);
-                bool FishBool = gSaveContext.highScores[i]&0x80;
-                if (ImGui::Checkbox("Cheated as Child", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x80;
-                        gSaveContext.highScores[i] |= (0x80 * FishBool);
+                std::sprintf(fishMsg, "Weight: %2.0f lbs", ((SQ(fishSize) * .0036) + .5));
+                Tooltip(fishMsg);
+                PopStyleInput();
+                bool FishBool = gSaveContext.highScores[i] & 0x80;
+                if (Checkbox("Cheated as Child", &FishBool,
+                             checkboxOptionsBase.Tooltip("Used the Sinking lure to catch it."))) {
+                    gSaveContext.highScores[i] &= ~0x80;
+                    gSaveContext.highScores[i] |= (0x80 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Used the Sinking lure to catch it.");
-                fishSize=(gSaveContext.highScores[i] & 0x7F000000)>>0x18;
-                if(ImGui::InputScalar("Adult Size Record",ImGuiDataType_U8,&fishSize)){
-                    gSaveContext.highScores[i]&=~0x7F000000;
-                    gSaveContext.highScores[i]|=(fishSize & 0x7F) << 0x18;
+                fishSize = (gSaveContext.highScores[i] & 0x7F000000) >> 0x18;
+                PushStyleInput(THEME_COLOR);
+                if (ImGui::InputScalar("Adult Size Record", ImGuiDataType_U8, &fishSize)) {
+                    gSaveContext.highScores[i] &= ~0x7F000000;
+                    gSaveContext.highScores[i] |= (fishSize & 0x7F) << 0x18;
                 }
-                std::sprintf(fishMsg,"Weight: %2.0f lbs",((SQ(fishSize)*.0036)+.5));
-                UIWidgets::InsertHelpHoverText(fishMsg);
+                std::sprintf(fishMsg, "Weight: %2.0f lbs", ((SQ(fishSize) * .0036) + .5));
+                Tooltip(fishMsg);
+                PopStyleInput();
                 FishBool = gSaveContext.highScores[i] & 0x80000000;
-                if (ImGui::Checkbox("Cheated as Adult", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x80000000;
-                        gSaveContext.highScores[i] |= (0x80000000 * FishBool);
+                if (Checkbox("Cheated as Adult", &FishBool,
+                             checkboxOptionsBase.Tooltip("Used the Sinking lure to catch it."))) {
+                    gSaveContext.highScores[i] &= ~0x80000000;
+                    gSaveContext.highScores[i] |= (0x80000000 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Used the Sinking lure to catch it.");
-                FishBool = gSaveContext.highScores[i]&0x100;
-                if (ImGui::Checkbox("Played as Child", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x100;
-                        gSaveContext.highScores[i] |= (0x100 * FishBool);
+                FishBool = gSaveContext.highScores[i] & 0x100;
+                if (Checkbox("Played as Child", &FishBool,
+                             checkboxOptionsBase.Tooltip("Played at least one game as a child"))) {
+                    gSaveContext.highScores[i] &= ~0x100;
+                    gSaveContext.highScores[i] |= (0x100 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Played at least one game as a child");
-                FishBool = gSaveContext.highScores[i]&0x200;
-                if (ImGui::Checkbox("Played as Adult", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x200;
-                        gSaveContext.highScores[i] |= (0x200 * FishBool);
+                FishBool = gSaveContext.highScores[i] & 0x200;
+                if (Checkbox("Played as Adult", &FishBool,
+                             checkboxOptionsBase.Tooltip("Played at least one game as an adult"))) {
+                    gSaveContext.highScores[i] &= ~0x200;
+                    gSaveContext.highScores[i] |= (0x200 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Played at least one game as an adult");
-                FishBool = gSaveContext.highScores[i]&0x400;
-                if (ImGui::Checkbox("Got Prize as Child", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x400;
-                        gSaveContext.highScores[i] |= (0x400 * FishBool);
+                FishBool = gSaveContext.highScores[i] & 0x400;
+                if (Checkbox(
+                        "Got Prize as Child", &FishBool,
+                        checkboxOptionsBase.Tooltip(
+                            "Got the prize item (Heart Piece, unless rando.)\nunlocks Sinking Lure for Child Link."))) {
+                    gSaveContext.highScores[i] &= ~0x400;
+                    gSaveContext.highScores[i] |= (0x400 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Got the prize item (Heart Piece, unless rando.)\nunlocks Sinking Lure for Child Link.");
-                FishBool = gSaveContext.highScores[i]&0x800;
-                if (ImGui::Checkbox("Got Prize as Adult", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x800;
-                        gSaveContext.highScores[i] |= (0x800 * FishBool);
+                FishBool = gSaveContext.highScores[i] & 0x800;
+                if (Checkbox("Got Prize as Adult", &FishBool,
+                             checkboxOptionsBase.Tooltip("Got the prize item (Golden Scale, unless rando.)\nUnlocks "
+                                                         "Sinking Lure for Adult Link."))) {
+                    gSaveContext.highScores[i] &= ~0x800;
+                    gSaveContext.highScores[i] |= (0x800 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("Got the prize item (Golden Scale, unless rando.)\nUnlocks Sinking Lure for Adult Link.");
                 FishBool = gSaveContext.highScores[i] & 0x1000;
-                if (ImGui::Checkbox("Stole Owner's Hat", &FishBool)) {
-                        gSaveContext.highScores[i] &= ~0x1000;
-                        gSaveContext.highScores[i] |= (0x1000 * FishBool);
+                if (Checkbox("Stole Owner's Hat", &FishBool,
+                             checkboxOptionsBase.Tooltip("The owner's now visibly bald when Adult Link."))) {
+                    gSaveContext.highScores[i] &= ~0x1000;
+                    gSaveContext.highScores[i] |= (0x1000 * FishBool);
                 }
-                UIWidgets::InsertHelpHoverText("The owner's now visibly bald when Adult Link.");
-                fishSize=(gSaveContext.highScores[i] & 0xFF0000)>>16;
-                if(ImGui::InputScalar("Times Played",ImGuiDataType_U8,&fishSize)){
-                    gSaveContext.highScores[i]&=~0xFF0000;
-                    gSaveContext.highScores[i]|=(fishSize) << 16;
+                fishSize = (gSaveContext.highScores[i] & 0xFF0000) >> 16;
+                PushStyleInput(THEME_COLOR);
+                if (ImGui::InputScalar("Times Played", ImGuiDataType_U8, &fishSize)) {
+                    gSaveContext.highScores[i] &= ~0xFF0000;
+                    gSaveContext.highScores[i] |= (fishSize) << 16;
                 }
-                UIWidgets::InsertHelpHoverText("Determines weather and school size during dawn/dusk.");
-                
+                Tooltip("Determines weather and school size during dawn/dusk.");
+                PopStyleInput();
+
                 ImGui::TreePop();
                 continue;
             }
-            
-            if (i == 5) { //HS_UNK_05 is unused
+
+            if (i == 5 || i == 2) { // HS_UNK_05 is unused
                 continue;
             }
             std::string minigameLbl = minigameHS[i];
+            PushStyleInput(THEME_COLOR);
             ImGui::InputScalar(minigameLbl.c_str(), ImGuiDataType_S32, &gSaveContext.highScores[i], &one, NULL);
+            PopStyleInput();
         }
-        
+
         ImGui::TreePop();
     }
-    
+
     ImGui::PopItemWidth();
 }
 
 void DrawBGSItemFlag(uint8_t itemID) {
     const ItemMapEntry& slotEntry = itemMapping[itemID];
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name), ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
+                 ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
 }
 
 void DrawInventoryTab() {
     static bool restrictToValid = true;
 
-    ImGui::Checkbox("Restrict to valid items", &restrictToValid);
-    UIWidgets::InsertHelpHoverText("Restricts items and ammo to only what is possible to legally acquire in-game");
+    Checkbox(
+        "Restrict to valid items", &restrictToValid,
+        checkboxOptionsBase.Tooltip("Restricts items and ammo to only what is possible to legally acquire in-game"));
 
     for (int32_t y = 0; y < 4; y++) {
         for (int32_t x = 0; x < 6; x++) {
@@ -433,35 +431,36 @@ void DrawInventoryTab() {
                 ImGui::SameLine();
             }
 
-            ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1, 1, 1, 0));
-            ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
             uint8_t item = gSaveContext.inventory.items[index];
+            PushStyleButton(Colors::DarkGray);
             if (item != ITEM_NONE) {
                 const ItemMapEntry& slotEntry = itemMapping.find(item)->second;
-                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-                auto ret = ImGui::ImageButton(slotEntry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
-                                              ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
-                ImGui::PopStyleVar();
+                auto ret = ImGui::ImageButton(
+                    slotEntry.name.c_str(),
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
+                    ImVec2(48.0f, 48.0f), ImVec2(0, 0), ImVec2(1, 1));
                 if (ret) {
                     selectedIndex = index;
                     ImGui::OpenPopup(itemPopupPicker);
                 }
             } else {
-                if (ImGui::Button("##itemNone", ImVec2(32.0f, 32.0f))) {
+                if (ImGui::Button("##itemNone", ImVec2(IMAGE_SIZE, IMAGE_SIZE) + ImGui::GetStyle().FramePadding * 2)) {
                     selectedIndex = index;
                     ImGui::OpenPopup(itemPopupPicker);
                 }
             }
-            ImGui::PopStyleVar();
-            ImGui::PopStyleColor();
+            PopStyleButton();
 
             ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
             if (ImGui::BeginPopup(itemPopupPicker)) {
-                if (ImGui::Button("##itemNonePicker", ImVec2(32.0f, 32.0f))) {
+                PushStyleButton(Colors::DarkGray);
+                if (ImGui::Button("##itemNonePicker",
+                                  ImVec2(IMAGE_SIZE, IMAGE_SIZE) + ImGui::GetStyle().FramePadding * 2)) {
                     gSaveContext.inventory.items[selectedIndex] = ITEM_NONE;
                     ImGui::CloseCurrentPopup();
                 }
-                UIWidgets::SetLastItemHoverText("None");
+                PopStyleButton();
+                UIWidgets::Tooltip("None");
 
                 std::vector<ItemMapEntry> possibleItems;
                 if (restrictToValid) {
@@ -486,15 +485,17 @@ void DrawInventoryTab() {
                         ImGui::SameLine();
                     }
                     const ItemMapEntry& slotEntry = possibleItems[pickerIndex];
-                    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-                    auto ret = ImGui::ImageButton(slotEntry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
-                                                  ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
-                    ImGui::PopStyleVar();
+                    PushStyleButton(Colors::DarkGray);
+                    auto ret = ImGui::ImageButton(
+                        slotEntry.name.c_str(),
+                        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
+                        ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1));
+                    PopStyleButton();
                     if (ret) {
                         gSaveContext.inventory.items[selectedIndex] = slotEntry.id;
                         ImGui::CloseCurrentPopup();
                     }
-                    UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(slotEntry.id));
+                    UIWidgets::Tooltip(SohUtils::GetItemName(slotEntry.id).c_str());
                 }
 
                 ImGui::EndPopup();
@@ -517,22 +518,25 @@ void DrawInventoryTab() {
             drawnAmmoItems++;
 
             ImGui::PushID(ammoIndex);
-            ImGui::PushItemWidth(32.0f);
+            ImGui::PushItemWidth(IMAGE_SIZE);
             ImGui::BeginGroup();
 
-            ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(itemMapping[item].name), ImVec2(32.0f, 32.0f));
+            ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(itemMapping[item].name),
+                         ImVec2(IMAGE_SIZE, IMAGE_SIZE));
+            PushStyleInput(THEME_COLOR);
             ImGui::InputScalar("##ammoInput", ImGuiDataType_S8, &AMMO(item));
+            PopStyleInput();
 
             ImGui::EndGroup();
             ImGui::PopItemWidth();
             ImGui::PopID();
         }
     }
-    
+
     // Trade quest flags are only used when shuffling the trade sequence, so
     // don't show this if it isn't needed.
-    if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_ADULT_TRADE)
-        && ImGui::TreeNode("Adult trade quest items")) {
+    if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_ADULT_TRADE) &&
+        ImGui::TreeNode("Adult trade quest items")) {
         for (int i = ITEM_POCKET_EGG; i <= ITEM_CLAIM_CHECK; i++) {
             DrawBGSItemFlag(i);
         }
@@ -548,7 +552,14 @@ void DrawFlagTableArray16(const FlagTable& flagTable, uint16_t row, uint16_t& fl
         ImGui::PushID(flagIndex);
         bool hasDescription = !!flagTable.flagDescriptions.contains(row * 16 + flagIndex);
         uint32_t bitMask = 1 << flagIndex;
-        ImGui::PushStyleColor(ImGuiCol_FrameBg, hasDescription ? ImVec4(0.16f, 0.29f, 0.48f, 0.54f) : ImVec4(0.16f, 0.29f, 0.48f, 0.24f));
+        ImVec4 themeColor = ColorValues.at(THEME_COLOR);
+        ImVec4 colorDark = { themeColor.x * 0.4f, themeColor.y * 0.4f, themeColor.z * 0.4f, themeColor.z };
+        ImVec4& color = themeColor;
+        if (!hasDescription) {
+            color = colorDark;
+        }
+        PushStyleCheckbox(hasDescription ? themeColor : colorDark);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
         bool flag = (flags & bitMask) != 0;
         if (ImGui::Checkbox("##check", &flag)) {
             if (flag) {
@@ -557,7 +568,8 @@ void DrawFlagTableArray16(const FlagTable& flagTable, uint16_t row, uint16_t& fl
                 flags &= ~bitMask;
             }
         }
-        ImGui::PopStyleColor();
+        ImGui::PopStyleVar();
+        PopStyleCheckbox();
         if (ImGui::IsItemHovered() && hasDescription) {
             ImGui::BeginTooltip();
             ImGui::Text("%s", UIWidgets::WrappedText(flagTable.flagDescriptions.at(row * 16 + flagIndex), 60).c_str());
@@ -573,168 +585,181 @@ void DrawFlagsTab() {
         if (gPlayState != nullptr) {
             Player* player = GET_PLAYER(gPlayState);
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("stateFlags1");
-                UIWidgets::DrawFlagArray32("stateFlags1", player->stateFlags1);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("stateFlags1");
+                    DrawFlagArray32("stateFlags1", player->stateFlags1, THEME_COLOR);
+                },
+                "stateFlags1");
 
             ImGui::SameLine();
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("stateFlags2");
-                UIWidgets::DrawFlagArray32("stateFlags2", player->stateFlags2);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("stateFlags2");
+                    DrawFlagArray32("stateFlags2", player->stateFlags2, THEME_COLOR);
+                },
+                "stateFlags2");
+
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("stateFlags3");
+                    DrawFlagArray8("stateFlags3", player->stateFlags3, THEME_COLOR);
+                },
+                "stateFlags3");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("stateFlags3");
-                UIWidgets::DrawFlagArray8("stateFlags3", player->stateFlags3);
-            });
-            
             ImGui::SameLine();
-            
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("unk_6AE_rotFlags");
-                UIWidgets::DrawFlagArray16("unk_6AE_rotFlags", player->unk_6AE_rotFlags);
-            });
+
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("unk_6AE_rotFlags");
+                    DrawFlagArray16("unk_6AE_rotFlags", player->unk_6AE_rotFlags, THEME_COLOR);
+                },
+                "unk_6AE_rotFlags");
         }
         ImGui::TreePop();
     }
     if (ImGui::TreeNode("Current Scene")) {
         if (gPlayState != nullptr) {
             ActorContext* act = &gPlayState->actorCtx;
-
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Switch");
-                UIWidgets::InsertHelpHoverText("Permanently-saved switch flags");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Switch")) {
-                    act->flags.swch = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Switch")) {
-                    act->flags.swch = 0;
-                }
-                UIWidgets::DrawFlagArray32("Switch", act->flags.swch);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Switch");
+                    InsertHelpHoverText("Permanently-saved switch flags");
+                    if (Button("Set All##Switch", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.swch = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Switch", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.swch = 0;
+                    }
+                    DrawFlagArray32("Switch", act->flags.swch, THEME_COLOR);
+                },
+                "Switch");
 
             ImGui::SameLine();
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Temp Switch");
-                UIWidgets::InsertHelpHoverText("Temporary switch flags. Unset on scene transitions");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Temp Switch")) {
-                    act->flags.tempSwch = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Temp Switch")) {
-                    act->flags.tempSwch = 0;
-                }
-                UIWidgets::DrawFlagArray32("Temp Switch", act->flags.tempSwch);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Temp Switch");
+                    InsertHelpHoverText("Temporary switch flags. Unset on scene transitions");
+                    if (Button("Set All##Temp Switch", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempSwch = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Temp Switch", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempSwch = 0;
+                    }
+                    DrawFlagArray32("Temp Switch", act->flags.tempSwch, THEME_COLOR);
+                },
+                "Temp Switch");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Clear");
-                UIWidgets::InsertHelpHoverText("Permanently-saved room-clear flags");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Clear")) {
-                    act->flags.clear = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Clear")) {
-                    act->flags.clear = 0;
-                }
-                UIWidgets::DrawFlagArray32("Clear", act->flags.clear);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Clear");
+                    InsertHelpHoverText("Permanently-saved room-clear flags");
+                    if (Button("Set All##Clear", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.clear = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Clear", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.clear = 0;
+                    }
+                    DrawFlagArray32("Clear", act->flags.clear, THEME_COLOR);
+                },
+                "Clear");
 
             ImGui::SameLine();
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Temp Clear");
-                UIWidgets::InsertHelpHoverText("Temporary room-clear flags. Unset on scene transitions");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Temp Clear")) {
-                    act->flags.tempClear = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Temp Clear")) {
-                    act->flags.tempClear = 0;
-                }
-                UIWidgets::DrawFlagArray32("Temp Clear", act->flags.tempClear);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Temp Clear");
+                    InsertHelpHoverText("Temporary room-clear flags. Unset on scene transitions");
+                    if (Button("Set All##Temp Clear", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempClear = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Temp Clear", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempClear = 0;
+                    }
+                    DrawFlagArray32("Temp Clear", act->flags.tempClear, THEME_COLOR);
+                },
+                "Temp Clear");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Collect");
-                UIWidgets::InsertHelpHoverText("Permanently-saved collect flags");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Collect")) {
-                    act->flags.collect = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Collect")) {
-                    act->flags.collect = 0;
-                }
-                UIWidgets::DrawFlagArray32("Collect", act->flags.collect);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Collect");
+                    InsertHelpHoverText("Permanently-saved collect flags");
+                    if (Button("Set All##Collect", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.collect = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Collect", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.collect = 0;
+                    }
+                    DrawFlagArray32("Collect", act->flags.collect, THEME_COLOR);
+                },
+                "Collect");
 
             ImGui::SameLine();
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Temp Collect");
-                UIWidgets::InsertHelpHoverText("Temporary collect flags. Unset on scene transitions");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Temp Collect")) {
-                    act->flags.tempCollect = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Temp Collect")) {
-                    act->flags.tempCollect = 0;
-                }
-                UIWidgets::DrawFlagArray32("Temp Collect", act->flags.tempCollect);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Temp Collect");
+                    InsertHelpHoverText("Temporary collect flags. Unset on scene transitions");
+                    if (Button("Set All##Temp Collect", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempCollect = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Temp Collect", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.tempCollect = 0;
+                    }
+                    DrawFlagArray32("Temp Collect", act->flags.tempCollect, THEME_COLOR);
+                },
+                "Temp Collect");
 
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("Chest");
-                UIWidgets::InsertHelpHoverText("Permanently-saved chest flags");
-                ImGui::SameLine();
-                if (ImGui::Button("Set All##Chest")) {
-                    act->flags.chest = UINT32_MAX;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear All##Chest")) {
-                    act->flags.chest = 0;
-                }
-                UIWidgets::DrawFlagArray32("Chest", act->flags.chest);
-            });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("Chest");
+                    InsertHelpHoverText("Permanently-saved chest flags");
+                    if (Button("Set All##Chest", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.chest = UINT32_MAX;
+                    }
+                    ImGui::SameLine();
+                    if (Button("Clear All##Chest", buttonOptionsBase.Tooltip(""))) {
+                        act->flags.chest = 0;
+                    }
+                    DrawFlagArray32("Chest", act->flags.chest, THEME_COLOR);
+                },
+                "Chest");
 
             ImGui::SameLine();
 
             ImGui::BeginGroup();
 
-            if (ImGui::Button("Reload Flags")) {
+            if (Button("Reload Flags", buttonOptionsBase.Tooltip(
+                                           "Load flags from saved scene flags. Normally happens on scene load"))) {
                 act->flags.swch = gSaveContext.sceneFlags[gPlayState->sceneNum].swch;
                 act->flags.clear = gSaveContext.sceneFlags[gPlayState->sceneNum].clear;
                 act->flags.collect = gSaveContext.sceneFlags[gPlayState->sceneNum].collect;
                 act->flags.chest = gSaveContext.sceneFlags[gPlayState->sceneNum].chest;
             }
-            UIWidgets::SetLastItemHoverText("Load flags from saved scene flags. Normally happens on scene load");
 
-            if (ImGui::Button("Save Flags")) {
+            if (Button("Save Flags",
+                       buttonOptionsBase.Tooltip("Save current scene flags. Normally happens on scene exit"))) {
                 gSaveContext.sceneFlags[gPlayState->sceneNum].swch = act->flags.swch;
                 gSaveContext.sceneFlags[gPlayState->sceneNum].clear = act->flags.clear;
                 gSaveContext.sceneFlags[gPlayState->sceneNum].collect = act->flags.collect;
                 gSaveContext.sceneFlags[gPlayState->sceneNum].chest = act->flags.chest;
             }
-            UIWidgets::SetLastItemHoverText("Save current scene flags. Normally happens on scene exit");
-            
-            if (ImGui::Button("Clear Flags")) {
+
+            if (Button("Clear Flags",
+                       buttonOptionsBase.Tooltip("Clear current scene flags. Reload scene to see changes"))) {
                 act->flags.swch = 0;
                 act->flags.clear = 0;
                 act->flags.collect = 0;
                 act->flags.chest = 0;
             }
-            UIWidgets::SetLastItemHoverText("Clear current scene flags. Reload scene to see changes");
-
 
             ImGui::EndGroup();
         } else {
@@ -746,8 +771,10 @@ void DrawFlagsTab() {
 
     if (ImGui::TreeNode("Saved Scene Flags")) {
         static uint32_t selectedSceneFlagMap = 0;
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("Map");
         ImGui::SameLine();
+        PushStyleCombobox(THEME_COLOR);
         if (ImGui::BeginCombo("##Map", SohUtils::GetSceneName(selectedSceneFlagMap).c_str())) {
             for (int32_t sceneIndex = 0; sceneIndex < SCENE_ID_MAX; sceneIndex++) {
                 if (ImGui::Selectable(SohUtils::GetSceneName(sceneIndex).c_str())) {
@@ -757,120 +784,141 @@ void DrawFlagsTab() {
 
             ImGui::EndCombo();
         }
+        PopStyleCombobox();
 
         // Don't show current scene button if there is no current scene
         if (gPlayState != nullptr) {
             ImGui::SameLine();
-            if (ImGui::Button("Current")) {
+            if (Button("Current", buttonOptionsBase.Tooltip("Open flags for current scene"))) {
                 selectedSceneFlagMap = gPlayState->sceneNum;
             }
-            UIWidgets::SetLastItemHoverText("Open flags for current scene");
         }
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Switch");
-            UIWidgets::InsertHelpHoverText("Switch flags");
-            UIWidgets::DrawFlagArray32("Switch", gSaveContext.sceneFlags[selectedSceneFlagMap].swch);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Switch");
+                InsertHelpHoverText("Switch flags");
+                DrawFlagArray32("Switch", gSaveContext.sceneFlags[selectedSceneFlagMap].swch, THEME_COLOR);
+            },
+            "Saved Switch");
 
         ImGui::SameLine();
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Clear");
-            UIWidgets::InsertHelpHoverText("Room-clear flags");
-            UIWidgets::DrawFlagArray32("Clear", gSaveContext.sceneFlags[selectedSceneFlagMap].clear);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Clear");
+                InsertHelpHoverText("Room-clear flags");
+                DrawFlagArray32("Clear", gSaveContext.sceneFlags[selectedSceneFlagMap].clear, THEME_COLOR);
+            },
+            "Saved Clear");
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Collect");
-            UIWidgets::InsertHelpHoverText("Collect flags");
-            UIWidgets::DrawFlagArray32("Collect", gSaveContext.sceneFlags[selectedSceneFlagMap].collect);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Collect");
+                InsertHelpHoverText("Collect flags");
+                DrawFlagArray32("Collect", gSaveContext.sceneFlags[selectedSceneFlagMap].collect, THEME_COLOR);
+            },
+            "Saved Collect");
 
         ImGui::SameLine();
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Chest");
-            UIWidgets::InsertHelpHoverText("Chest flags");
-            UIWidgets::DrawFlagArray32("Chest", gSaveContext.sceneFlags[selectedSceneFlagMap].chest);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Chest");
+                InsertHelpHoverText("Chest flags");
+                DrawFlagArray32("Chest", gSaveContext.sceneFlags[selectedSceneFlagMap].chest, THEME_COLOR);
+            },
+            "Saved Chest");
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Rooms");
-            UIWidgets::InsertHelpHoverText("Flags for visted rooms");
-            UIWidgets::DrawFlagArray32("Rooms", gSaveContext.sceneFlags[selectedSceneFlagMap].rooms);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Rooms");
+                InsertHelpHoverText("Flags for visted rooms");
+                DrawFlagArray32("Rooms", gSaveContext.sceneFlags[selectedSceneFlagMap].rooms, THEME_COLOR);
+            },
+            "Saved Rooms");
 
         ImGui::SameLine();
 
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Floors");
-            UIWidgets::InsertHelpHoverText("Flags for visted floors");
-            UIWidgets::DrawFlagArray32("Floors", gSaveContext.sceneFlags[selectedSceneFlagMap].floors);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Floors");
+                InsertHelpHoverText("Flags for visted floors");
+                DrawFlagArray32("Floors", gSaveContext.sceneFlags[selectedSceneFlagMap].floors, THEME_COLOR);
+            },
+            "Saved Floors");
 
         ImGui::TreePop();
     }
 
-    DrawGroupWithBorder([&]() {
-        static uint32_t selectedGsMap = 0;
-        ImGui::Text("Gold Skulltulas");
-        ImGui::Text("Map");
-        ImGui::SameLine();
-        if (ImGui::BeginCombo("##Gold Skulltula Map", gsMapping[selectedGsMap].c_str())) {
-            for (int32_t gsIndex = 0; gsIndex < gsMapping.size(); gsIndex++) {
-                if (ImGui::Selectable(gsMapping[gsIndex].c_str())) {
-                    selectedGsMap = gsIndex;
+    DrawGroupWithBorder(
+        [&]() {
+            PushStyleCombobox(THEME_COLOR);
+            static size_t selectedGsMap = 0;
+            ImGui::Text("Gold Skulltulas");
+            if (ImGui::BeginCombo("##GSMap", gsMapping[selectedGsMap])) {
+                for (size_t index = 0; index < gsMapping.size(); index++) {
+                    if (ImGui::Selectable(gsMapping[index])) {
+                        selectedGsMap = index;
+                    }
                 }
+
+                ImGui::EndCombo();
+            }
+            PopStyleCombobox();
+
+            // TODO We should write out descriptions for each one... ugh
+            ImGui::AlignTextToFramePadding();
+            ImGui::Text("Flags");
+            uint32_t currentFlags = GET_GS_FLAGS(selectedGsMap);
+            uint32_t allFlags = gAreaGsFlags[selectedGsMap];
+            uint32_t setMask = 1;
+            // Iterate over bitfield and create a checkbox for each skulltula
+            while (allFlags != 0) {
+                bool isThisSet = (currentFlags & 0x1) == 0x1;
+
+                ImGui::SameLine();
+                ImGui::PushID(allFlags);
+                PushStyleCheckbox(THEME_COLOR);
+                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
+                if (ImGui::Checkbox("##gs", &isThisSet)) {
+                    if (isThisSet) {
+                        SET_GS_FLAGS(selectedGsMap, setMask);
+                    } else {
+                        // Have to do this roundabout method as the macro does not support clearing flags
+                        uint32_t currentFlagsBase = GET_GS_FLAGS(selectedGsMap);
+                        gSaveContext.gsFlags[selectedGsMap >> 2] &= ~gGsFlagsMasks[selectedGsMap & 3];
+                        SET_GS_FLAGS(selectedGsMap, currentFlagsBase & ~setMask);
+                    }
+                }
+                ImGui::PopStyleVar();
+                PopStyleCheckbox();
+
+                ImGui::PopID();
+
+                allFlags >>= 1;
+                currentFlags >>= 1;
+                setMask <<= 1;
             }
 
-            ImGui::EndCombo();
-        }
-
-        // TODO We should write out descriptions for each one... ugh
-        ImGui::Text("Flags");
-        uint32_t currentFlags = GET_GS_FLAGS(selectedGsMap);
-        uint32_t allFlags = gAreaGsFlags[selectedGsMap];
-        uint32_t setMask = 1;
-        // Iterate over bitfield and create a checkbox for each skulltula
-        while (allFlags != 0) {
-            bool isThisSet = (currentFlags & 0x1) == 0x1;
-
-            ImGui::SameLine();
-            ImGui::PushID(allFlags);
-            if (ImGui::Checkbox("##gs", &isThisSet)) {
-                if (isThisSet) {
-                    SET_GS_FLAGS(selectedGsMap, setMask);
-                } else {
-                    // Have to do this roundabout method as the macro does not support clearing flags
-                    uint32_t currentFlagsBase = GET_GS_FLAGS(selectedGsMap);
-                    gSaveContext.gsFlags[selectedGsMap >> 2] &= ~gGsFlagsMasks[selectedGsMap & 3];
-                    SET_GS_FLAGS(selectedGsMap, currentFlagsBase & ~setMask);
+            // If playing a Randomizer Save with Shuffle Skull Tokens on anything other than "Off" we don't want to keep
+            // GS Token Count updated, since Gold Skulltulas killed will not correlate to GS Tokens Collected.
+            if (!(IS_RANDO &&
+                  OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS) != RO_TOKENSANITY_OFF)) {
+                static bool keepGsCountUpdated = true;
+                Checkbox("Keep GS Count Updated", &keepGsCountUpdated,
+                         checkboxOptionsBase.Tooltip(
+                             "Automatically adjust the number of gold skulltula tokens acquired based on set flags."));
+                int32_t gsCount = 0;
+                if (keepGsCountUpdated) {
+                    for (int32_t gsFlagIndex = 0; gsFlagIndex < 6; gsFlagIndex++) {
+                        gsCount += std::popcount(static_cast<uint32_t>(gSaveContext.gsFlags[gsFlagIndex]));
+                    }
+                    gSaveContext.inventory.gsTokens = gsCount;
                 }
             }
-
-            ImGui::PopID();
-
-            allFlags >>= 1;
-            currentFlags >>= 1;
-            setMask <<= 1;
-        }
-
-        // If playing a Randomizer Save with Shuffle Skull Tokens on anything other than "Off" we don't want to keep
-        // GS Token Count updated, since Gold Skulltulas killed will not correlate to GS Tokens Collected.
-        if (!(IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS) != RO_TOKENSANITY_OFF)) {
-            static bool keepGsCountUpdated = true;
-            ImGui::Checkbox("Keep GS Count Updated", &keepGsCountUpdated);
-            UIWidgets::InsertHelpHoverText("Automatically adjust the number of gold skulltula tokens acquired based on set flags.");
-            int32_t gsCount = 0;
-            if (keepGsCountUpdated) {
-                for (int32_t gsFlagIndex = 0; gsFlagIndex < 6; gsFlagIndex++) {
-                    gsCount += std::popcount(static_cast<uint32_t>(gSaveContext.gsFlags[gsFlagIndex]));
-                }
-                gSaveContext.inventory.gsTokens = gsCount;
-            }
-        }
-    });
+        },
+        "Gold Skulltulas");
 
     for (int i = 0; i < flagTables.size(); i++) {
         const FlagTable& flagTable = flagTables[i];
@@ -880,32 +928,34 @@ void DrawFlagsTab() {
 
         if (ImGui::TreeNode(flagTable.name)) {
             for (int j = 0; j < flagTable.size + 1; j++) {
-                DrawGroupWithBorder([&]() {
-                    ImGui::Text("%s", fmt::format("{:<2x}", j).c_str());
-                    switch (flagTable.flagTableType) {
-                        case EVENT_CHECK_INF:
-                            DrawFlagTableArray16(flagTable, j, gSaveContext.eventChkInf[j]);
-                            break;
-                        case ITEM_GET_INF:
-                            DrawFlagTableArray16(flagTable, j, gSaveContext.itemGetInf[j]);
-                            break;
-                        case INF_TABLE:
-                            DrawFlagTableArray16(flagTable, j, gSaveContext.infTable[j]);
-                            break;
-                        case EVENT_INF:
-                            DrawFlagTableArray16(flagTable, j, gSaveContext.eventInf[j]);
-                            break;
-                        case RANDOMIZER_INF:
-                            DrawFlagTableArray16(flagTable, j, gSaveContext.ship.randomizerInf[j]);
-                            break;
-                    }
-                });
+                DrawGroupWithBorder(
+                    [&]() {
+                        ImGui::Text("%s", fmt::format("{:<2x}", j).c_str());
+                        switch (flagTable.flagTableType) {
+                            case EVENT_CHECK_INF:
+                                DrawFlagTableArray16(flagTable, j, gSaveContext.eventChkInf[j]);
+                                break;
+                            case ITEM_GET_INF:
+                                DrawFlagTableArray16(flagTable, j, gSaveContext.itemGetInf[j]);
+                                break;
+                            case INF_TABLE:
+                                DrawFlagTableArray16(flagTable, j, gSaveContext.infTable[j]);
+                                break;
+                            case EVENT_INF:
+                                DrawFlagTableArray16(flagTable, j, gSaveContext.eventInf[j]);
+                                break;
+                            case RANDOMIZER_INF:
+                                DrawFlagTableArray16(flagTable, j, gSaveContext.ship.randomizerInf[j]);
+                                break;
+                        }
+                    },
+                    flagTable.name);
             }
 
             // make some buttons to help with fishsanity debugging
             uint8_t fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
-            if (flagTable.flagTableType == RANDOMIZER_INF &&
-                fsMode != RO_FISHSANITY_OFF && fsMode != RO_FISHSANITY_OVERWORLD) {
+            if (flagTable.flagTableType == RANDOMIZER_INF && fsMode != RO_FISHSANITY_OFF &&
+                fsMode != RO_FISHSANITY_OVERWORLD) {
                 if (ImGui::Button("Catch All (Child)")) {
                     for (int k = RAND_INF_CHILD_FISH_1; k <= RAND_INF_CHILD_LOACH_2; k++) {
                         Flags_SetRandomizerInf((RandomizerInf)k);
@@ -941,6 +991,8 @@ void DrawUpgrade(const std::string& categoryName, int32_t categoryId, const std:
     ImGui::Text("%s", categoryName.c_str());
     ImGui::SameLine();
     ImGui::PushID(categoryName.c_str());
+    PushStyleCombobox(THEME_COLOR);
+    ImGui::AlignTextToFramePadding();
     if (ImGui::BeginCombo("##upgrade", names[CUR_UPG_VALUE(categoryId)].c_str())) {
         for (int32_t i = 0; i < names.size(); i++) {
             if (ImGui::Selectable(names[i].c_str())) {
@@ -950,8 +1002,9 @@ void DrawUpgrade(const std::string& categoryName, int32_t categoryId, const std:
 
         ImGui::EndCombo();
     }
+    PopStyleCombobox();
     ImGui::PopID();
-    UIWidgets::SetLastItemHoverText(categoryName.c_str());
+    UIWidgets::Tooltip(categoryName.c_str());
 }
 
 // Draws a combo that lets you choose and upgrade value from a popup grid of icons
@@ -960,58 +1013,53 @@ void DrawUpgradeIcon(const std::string& categoryName, int32_t categoryId, const
 
     ImGui::PushID(categoryName.c_str());
 
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1, 1, 1, 0));
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
+    PushStyleButton(Colors::DarkGray);
     uint8_t item = items[CUR_UPG_VALUE(categoryId)];
     if (item != ITEM_NONE) {
         const ItemMapEntry& slotEntry = itemMapping[item];
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-        auto ret = ImGui::ImageButton(slotEntry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
-                                      ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
-        ImGui::PopStyleVar();
-        if (ret) {
+        if (ImGui::ImageButton(slotEntry.name.c_str(),
+                               Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
+                               ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1))) {
             ImGui::OpenPopup(upgradePopupPicker);
         }
     } else {
-        if (ImGui::Button("##itemNone", ImVec2(32.0f, 32.0f))) {
+        if (ImGui::Button("##itemNone", ImVec2(IMAGE_SIZE, IMAGE_SIZE) + ImGui::GetStyle().FramePadding * 2)) {
             ImGui::OpenPopup(upgradePopupPicker);
         }
     }
-    ImGui::PopStyleVar();
-    ImGui::PopStyleColor();
-    UIWidgets::SetLastItemHoverText(categoryName.c_str());
+    PopStyleButton();
+    Tooltip(categoryName.c_str());
 
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
     if (ImGui::BeginPopup(upgradePopupPicker)) {
         for (int32_t pickerIndex = 0; pickerIndex < items.size(); pickerIndex++) {
             if ((pickerIndex % 8) != 0) {
                 ImGui::SameLine();
             }
 
+            PushStyleButton(Colors::DarkGray);
             if (items[pickerIndex] == ITEM_NONE) {
-                if (ImGui::Button("##upgradePopupPicker", ImVec2(32.0f, 32.0f))) {
+                if (ImGui::Button("##upgradePopupPicker",
+                                  ImVec2(IMAGE_SIZE, IMAGE_SIZE) + ImGui::GetStyle().FramePadding * 2)) {
                     Inventory_ChangeUpgrade(categoryId, pickerIndex);
                     ImGui::CloseCurrentPopup();
                 }
-                UIWidgets::SetLastItemHoverText("None");
+                Tooltip("None");
             } else {
                 const ItemMapEntry& slotEntry = itemMapping[items[pickerIndex]];
-                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-                auto ret = ImGui::ImageButton(slotEntry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
-                                              ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
-                ImGui::PopStyleVar();
+                auto ret = ImGui::ImageButton(
+                    slotEntry.name.c_str(),
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(slotEntry.name),
+                    ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1));
                 if (ret) {
                     Inventory_ChangeUpgrade(categoryId, pickerIndex);
                     ImGui::CloseCurrentPopup();
                 }
-                UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(slotEntry.id));
+                Tooltip(SohUtils::GetItemName(slotEntry.id).c_str());
             }
+            PopStyleButton();
         }
-
         ImGui::EndPopup();
     }
-    ImGui::PopStyleVar();
-
     ImGui::PopID();
 }
 
@@ -1035,11 +1083,11 @@ void DrawEquipmentTab() {
         uint32_t bitMask = 1 << i;
         bool hasEquip = (bitMask & gSaveContext.inventory.equipment) != 0;
         const ItemMapEntry& entry = itemMapping[equipmentValues[i]];
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-        auto ret = ImGui::ImageButton(entry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasEquip ? entry.name : entry.nameFaded),
-                                      ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1)); 
-        ImGui::PopStyleVar();
+        PushStyleButton(Colors::DarkGray);
+        auto ret = ImGui::ImageButton(entry.name.c_str(),
+                                      Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                                          hasEquip ? entry.name : entry.nameFaded),
+                                      ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1));
         if (ret) {
             if (hasEquip) {
                 gSaveContext.inventory.equipment &= ~bitMask;
@@ -1047,9 +1095,9 @@ void DrawEquipmentTab() {
                 gSaveContext.inventory.equipment |= bitMask;
             }
         }
-        ImGui::PopStyleColor();
+        PopStyleButton();
+        Tooltip(SohUtils::GetItemName(entry.id).c_str());
         ImGui::PopID();
-        UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(entry.id));
     }
 
     const std::vector<uint8_t> bulletBagValues = {
@@ -1137,11 +1185,11 @@ void DrawQuestItemButton(uint32_t item) {
     const QuestMapEntry& entry = questMapping[item];
     uint32_t bitMask = 1 << entry.id;
     bool hasQuestItem = (bitMask & gSaveContext.inventory.questItems) != 0;
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-    auto ret = ImGui::ImageButton(entry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasQuestItem ? entry.name : entry.nameFaded),
-                                  ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1)); 
-    ImGui::PopStyleVar();
+    PushStyleButton(Colors::DarkGray);
+    auto ret = ImGui::ImageButton(entry.name.c_str(),
+                                  Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                                      hasQuestItem ? entry.name : entry.nameFaded),
+                                  ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1));
     if (ret) {
         if (hasQuestItem) {
             gSaveContext.inventory.questItems &= ~bitMask;
@@ -1149,8 +1197,8 @@ void DrawQuestItemButton(uint32_t item) {
             gSaveContext.inventory.questItems |= bitMask;
         }
     }
-    ImGui::PopStyleColor();
-    UIWidgets::SetLastItemHoverText(SohUtils::GetQuestItemName(entry.id));
+    PopStyleButton();
+    Tooltip(SohUtils::GetQuestItemName(entry.id).c_str());
 }
 
 // Draws a toggleable icon for a dungeon item that is faded when disabled
@@ -1158,11 +1206,11 @@ void DrawDungeonItemButton(uint32_t item, uint32_t scene) {
     const ItemMapEntry& entry = itemMapping[item];
     uint32_t bitMask = 1 << (entry.id - ITEM_KEY_BOSS); // Bitset starts at ITEM_KEY_BOSS == 0. the rest are sequential
     bool hasItem = (bitMask & gSaveContext.inventory.dungeonItems[scene]) != 0;
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-    auto ret = ImGui::ImageButton(entry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasItem ? entry.name : entry.nameFaded),
-                                  ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1));
-    ImGui::PopStyleVar();
+    PushStyleButton(Colors::DarkGray);
+    auto ret = ImGui::ImageButton(
+        entry.name.c_str(),
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasItem ? entry.name : entry.nameFaded),
+        ImVec2(IMAGE_SIZE, IMAGE_SIZE), ImVec2(0, 0), ImVec2(1, 1));
     if (ret) {
         if (hasItem) {
             gSaveContext.inventory.dungeonItems[scene] &= ~bitMask;
@@ -1170,12 +1218,11 @@ void DrawDungeonItemButton(uint32_t item, uint32_t scene) {
             gSaveContext.inventory.dungeonItems[scene] |= bitMask;
         }
     }
-    ImGui::PopStyleColor();
-    UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(entry.id));
+    PopStyleButton();
+    Tooltip(SohUtils::GetItemName(entry.id).c_str());
 }
 
 void DrawQuestStatusTab() {
-    ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
 
     for (int32_t i = QUEST_MEDALLION_FOREST; i < QUEST_MEDALLION_LIGHT + 1; i++) {
         if (i != QUEST_MEDALLION_FOREST) {
@@ -1193,14 +1240,13 @@ void DrawQuestStatusTab() {
 
     // Put Stone of Agony and Gerudo Card on the same line with a little space between them
     ImGui::SameLine();
-    ImGui::Dummy(ImVec2(20, 0));
+    ImGui::Dummy(ImVec2(IMAGE_SIZE, IMAGE_SIZE) + ImGui::GetStyle().FramePadding * 2);
 
     ImGui::SameLine();
     DrawQuestItemButton(QUEST_STONE_OF_AGONY);
 
     ImGui::SameLine();
     DrawQuestItemButton(QUEST_GERUDO_CARD);
-
     for (const auto& [quest, entry] : songMapping) {
         if ((entry.id != QUEST_SONG_MINUET) && (entry.id != QUEST_SONG_LULLABY)) {
             ImGui::SameLine();
@@ -1208,11 +1254,11 @@ void DrawQuestStatusTab() {
 
         uint32_t bitMask = 1 << entry.id;
         bool hasQuestItem = (bitMask & gSaveContext.inventory.questItems) != 0;
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-        auto ret = ImGui::ImageButton(entry.name.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasQuestItem ? entry.name : entry.nameFaded),
-                                      ImVec2(16.0f, 24.0f), ImVec2(0, 0), ImVec2(1, 1));
-        ImGui::PopStyleVar();
+        PushStyleButton(Colors::DarkGray);
+        auto ret = ImGui::ImageButton(entry.name.c_str(),
+                                      Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                                          hasQuestItem ? entry.name : entry.nameFaded),
+                                      ImVec2(32.0f, 48.0f), ImVec2(0, 0), ImVec2(1, 1));
         if (ret) {
             if (hasQuestItem) {
                 gSaveContext.inventory.questItems &= ~bitMask;
@@ -1220,25 +1266,28 @@ void DrawQuestStatusTab() {
                 gSaveContext.inventory.questItems |= bitMask;
             }
         }
-        ImGui::PopStyleColor();
-        UIWidgets::SetLastItemHoverText(SohUtils::GetQuestItemName(entry.id));
+        PopStyleButton();
+        Tooltip(SohUtils::GetQuestItemName(entry.id).c_str());
     }
 
+    PushStyleInput(THEME_COLOR);
     ImGui::InputScalar("GS Count", ImGuiDataType_S16, &gSaveContext.inventory.gsTokens);
-    UIWidgets::InsertHelpHoverText("Number of gold skulltula tokens aquired");
+    PopStyleInput();
+    InsertHelpHoverText("Number of gold skulltula tokens aquired");
 
     uint32_t bitMask = 1 << QUEST_SKULL_TOKEN;
     bool gsUnlocked = (bitMask & gSaveContext.inventory.questItems) != 0;
-    if (ImGui::Checkbox("GS unlocked", &gsUnlocked)) {
+    if (Checkbox("GS unlocked", &gsUnlocked, CheckboxOptions().Color(THEME_COLOR))) {
         if (gsUnlocked) {
             gSaveContext.inventory.questItems |= bitMask;
         } else {
             gSaveContext.inventory.questItems &= ~bitMask;
         }
     }
-    UIWidgets::InsertHelpHoverText("If unlocked, enables showing the gold skulltula count in the quest status menu");
+    InsertHelpHoverText("If unlocked, enables showing the gold skulltula count in the quest status menu");
 
     int32_t pohCount = (gSaveContext.inventory.questItems & 0xF0000000) >> 28;
+    PushStyleCombobox(THEME_COLOR);
     if (ImGui::BeginCombo("PoH count", std::to_string(pohCount).c_str())) {
         for (int32_t i = 0; i < 4; i++) {
             if (ImGui::Selectable(std::to_string(i).c_str(), pohCount == i)) {
@@ -1248,45 +1297,53 @@ void DrawQuestStatusTab() {
         }
         ImGui::EndCombo();
     }
-    UIWidgets::InsertHelpHoverText("The number of pieces of heart acquired towards the next heart container");
+    InsertHelpHoverText("The number of pieces of heart acquired towards the next heart container");
+    PopStyleCombobox();
 
-    DrawGroupWithBorder([&]() {
-        ImGui::Text("Dungeon Items");
+    DrawGroupWithBorder(
+        [&]() {
+            ImGui::Text("Dungeon Items");
 
-        static int32_t dungeonItemsScene = SCENE_DEKU_TREE;
-        ImGui::PushItemWidth(-ImGui::GetWindowWidth() * 0.35f);
-        if (ImGui::BeginCombo("##DungeonSelect", SohUtils::GetSceneName(dungeonItemsScene).c_str())) {
-            for (int32_t dungeonIndex = SCENE_DEKU_TREE; dungeonIndex < SCENE_JABU_JABU_BOSS + 1; dungeonIndex++) {
-                if (ImGui::Selectable(SohUtils::GetSceneName(dungeonIndex).c_str(),
-                                      dungeonIndex == dungeonItemsScene)) {
-                    dungeonItemsScene = dungeonIndex;
+            static int32_t dungeonItemsScene = SCENE_DEKU_TREE;
+            PushStyleCombobox(THEME_COLOR);
+            if (ImGui::BeginCombo("##DungeonSelect", SohUtils::GetSceneName(dungeonItemsScene).c_str())) {
+                for (int32_t dungeonIndex = SCENE_DEKU_TREE; dungeonIndex < SCENE_JABU_JABU_BOSS + 1; dungeonIndex++) {
+                    if (ImGui::Selectable(SohUtils::GetSceneName(dungeonIndex).c_str(),
+                                          dungeonIndex == dungeonItemsScene)) {
+                        dungeonItemsScene = dungeonIndex;
+                    }
                 }
+
+                ImGui::EndCombo();
             }
+            PopStyleCombobox();
 
-            ImGui::EndCombo();
-        }
-        ImGui::PopItemWidth();
-
-        DrawDungeonItemButton(ITEM_KEY_BOSS, dungeonItemsScene);
-        ImGui::SameLine();
-        DrawDungeonItemButton(ITEM_COMPASS, dungeonItemsScene);
-        ImGui::SameLine();
-        DrawDungeonItemButton(ITEM_DUNGEON_MAP, dungeonItemsScene);
-
-        if (dungeonItemsScene != SCENE_JABU_JABU_BOSS) {
-            float lineHeight = ImGui::GetTextLineHeightWithSpacing();
-            ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(itemMapping[ITEM_KEY_SMALL].name), ImVec2(lineHeight, lineHeight));
+            DrawDungeonItemButton(ITEM_KEY_BOSS, dungeonItemsScene);
             ImGui::SameLine();
-            if (ImGui::InputScalar("##Keys", ImGuiDataType_S8, gSaveContext.inventory.dungeonKeys + dungeonItemsScene)) {
-                gSaveContext.ship.stats.dungeonKeys[dungeonItemsScene] = gSaveContext.inventory.dungeonKeys[dungeonItemsScene];
-            };
-        } else {
-            // dungeonItems is size 20 but dungeonKeys is size 19, so there are no keys for the last scene (Barinade's Lair)
-            ImGui::Text("Barinade's Lair does not have small keys");
-        }
-    });
+            DrawDungeonItemButton(ITEM_COMPASS, dungeonItemsScene);
+            ImGui::SameLine();
+            DrawDungeonItemButton(ITEM_DUNGEON_MAP, dungeonItemsScene);
 
-    ImGui::PopItemWidth();
+            if (dungeonItemsScene != SCENE_JABU_JABU_BOSS) {
+                float lineHeight = ImGui::GetTextLineHeightWithSpacing();
+                ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                                 itemMapping[ITEM_KEY_SMALL].name),
+                             ImVec2(lineHeight, lineHeight));
+                ImGui::SameLine();
+                PushStyleInput(THEME_COLOR);
+                if (ImGui::InputScalar("##Keys", ImGuiDataType_S8,
+                                       gSaveContext.inventory.dungeonKeys + dungeonItemsScene)) {
+                    gSaveContext.ship.stats.dungeonKeys[dungeonItemsScene] =
+                        gSaveContext.inventory.dungeonKeys[dungeonItemsScene];
+                };
+                PopStyleInput();
+            } else {
+                // dungeonItems is size 20 but dungeonKeys is size 19, so there are no keys for the last scene
+                // (Barinade's Lair)
+                ImGui::Text("Barinade's Lair does not have small keys");
+            }
+        },
+        "Dungeon Items");
 }
 
 void DrawPlayerTab() {
@@ -1299,7 +1356,7 @@ void DrawPlayerTab() {
 
         switch (player->currentSwordItemId) {
             case ITEM_SWORD_KOKIRI:
-                curSword = "Kokiri Sword"; 
+                curSword = "Kokiri Sword";
                 break;
             case ITEM_SWORD_MASTER:
                 curSword = "Master Sword";
@@ -1364,50 +1421,59 @@ void DrawPlayerTab() {
         }
 
         ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Link's Position");
-            ImGui::InputScalar("X Pos", ImGuiDataType_Float, &player->actor.world.pos.x);
-            ImGui::SameLine();
-            ImGui::InputScalar("Y Pos", ImGuiDataType_Float, &player->actor.world.pos.y);
-            ImGui::SameLine();
-            ImGui::InputScalar("Z Pos", ImGuiDataType_Float, &player->actor.world.pos.z);
-        });
-
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Link's Rotation");
-            UIWidgets::InsertHelpHoverText("For Link's rotation in relation to the world");
-            ImGui::InputScalar("X Rot", ImGuiDataType_S16, &player->actor.world.rot.x);
-            ImGui::SameLine();
-            ImGui::InputScalar("Y Rot", ImGuiDataType_S16, &player->actor.world.rot.y);
-            ImGui::SameLine();
-            ImGui::InputScalar("Z Rot", ImGuiDataType_S16, &player->actor.world.rot.z);
-        });
-
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Link's Model Rotation");
-            UIWidgets::InsertHelpHoverText("For Link's actual model");
-            ImGui::InputScalar("X ModRot", ImGuiDataType_S16, &player->actor.shape.rot.x);
-            ImGui::SameLine();
-            ImGui::InputScalar("Y ModRot", ImGuiDataType_S16, &player->actor.shape.rot.y);
-            ImGui::SameLine();
-            ImGui::InputScalar("Z ModRot", ImGuiDataType_S16, &player->actor.shape.rot.z);
-        });
+        PushStyleInput(THEME_COLOR);
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Link's Position");
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 12);
+                ImGui::InputScalar("X##Pos", ImGuiDataType_Float, &player->actor.world.pos.x);
+                ImGui::InputScalar("Y##Pos", ImGuiDataType_Float, &player->actor.world.pos.y);
+                ImGui::InputScalar("Z##Pos", ImGuiDataType_Float, &player->actor.world.pos.z);
+                ImGui::PopItemWidth();
+            },
+            "Link's Position");
+        ImGui::SameLine();
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Link's Rotation");
+                InsertHelpHoverText("For Link's rotation in relation to the world");
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 12);
+                ImGui::InputScalar("X##Rot", ImGuiDataType_S16, &player->actor.world.rot.x);
+                ImGui::InputScalar("Y##Rot", ImGuiDataType_S16, &player->actor.world.rot.y);
+                ImGui::InputScalar("Z##Rot", ImGuiDataType_S16, &player->actor.world.rot.z);
+                ImGui::PopItemWidth();
+            },
+            "Link's Rotation");
+        ImGui::SameLine();
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Link's Model Rotation");
+                InsertHelpHoverText("For Link's actual model");
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 12);
+                ImGui::InputScalar("X##ModRot", ImGuiDataType_S16, &player->actor.shape.rot.x);
+                ImGui::InputScalar("Y##ModRot", ImGuiDataType_S16, &player->actor.shape.rot.y);
+                ImGui::InputScalar("Z##ModRot", ImGuiDataType_S16, &player->actor.shape.rot.z);
+                ImGui::PopItemWidth();
+            },
+            "Link's Model Rotation");
 
         ImGui::InputScalar("Linear Velocity", ImGuiDataType_Float, &player->linearVelocity);
-        UIWidgets::InsertHelpHoverText("Link's speed along the XZ plane");
+        InsertHelpHoverText("Link's speed along the XZ plane");
 
         ImGui::InputScalar("Y Velocity", ImGuiDataType_Float, &player->actor.velocity.y);
-        UIWidgets::InsertHelpHoverText("Link's speed along the Y plane. Caps at -20");
+        InsertHelpHoverText("Link's speed along the Y plane. Caps at -20");
 
         ImGui::InputScalar("Wall Height", ImGuiDataType_Float, &player->yDistToLedge);
-        UIWidgets::InsertHelpHoverText("Height used to determine whether Link can climb or grab a ledge at the top");
+        InsertHelpHoverText("Height used to determine whether Link can climb or grab a ledge at the top");
 
         ImGui::InputScalar("Invincibility Timer", ImGuiDataType_S8, &player->invincibilityTimer);
-        UIWidgets::InsertHelpHoverText("Can't take damage while this is nonzero");
+        InsertHelpHoverText("Can't take damage while this is nonzero");
 
         ImGui::InputScalar("Gravity", ImGuiDataType_Float, &player->actor.gravity);
-        UIWidgets::InsertHelpHoverText("Rate at which Link falls. Default -4.0f");
+        InsertHelpHoverText("Rate at which Link falls. Default -4.0f");
+        PopStyleInput();
 
+        PushStyleCombobox(THEME_COLOR);
         if (ImGui::BeginCombo("Link Age on Load", gPlayState->linkAgeOnLoad == 0 ? "Adult" : "Child")) {
             if (ImGui::Selectable("Adult")) {
                 gPlayState->linkAgeOnLoad = 0;
@@ -1417,132 +1483,145 @@ void DrawPlayerTab() {
             }
             ImGui::EndCombo();
         }
-
-        UIWidgets::InsertHelpHoverText("This will change Link's age when you load a map");
-
+        InsertHelpHoverText("This will change Link's age when you load a map");
+        PopStyleCombobox();
         ImGui::Separator();
-        
-        ImGui::Text("Link's Current Equipment");
-        ImGui::PushItemWidth(ImGui::GetFontSize() * 15);
-        if (ImGui::BeginCombo("Sword", curSword)) {
-            if (ImGui::Selectable("None")) {
-                player->currentSwordItemId = ITEM_NONE;
-                gSaveContext.equips.buttonItems[0] = ITEM_NONE;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_NONE);
-            }
-            if (ImGui::Selectable("Kokiri Sword")) {
-                player->currentSwordItemId = ITEM_SWORD_KOKIRI;
-                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KOKIRI;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
-            }
-            if (ImGui::Selectable("Master Sword")) {
-                player->currentSwordItemId = ITEM_SWORD_MASTER;
-                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
-            }
-            if (ImGui::Selectable("Biggoron's Sword")) {
-                if (gSaveContext.bgsFlag) {
-                    if (gSaveContext.swordHealth < 8) {
-                        gSaveContext.swordHealth = 8;
+
+        DrawGroupWithBorder(
+            [&]() {
+                PushStyleCombobox(THEME_COLOR);
+                ImGui::Text("Link's Current Equipment");
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 12);
+                if (ImGui::BeginCombo("Sword", curSword)) {
+                    if (ImGui::Selectable("None")) {
+                        player->currentSwordItemId = ITEM_NONE;
+                        gSaveContext.equips.buttonItems[0] = ITEM_NONE;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_NONE);
                     }
-                    player->currentSwordItemId = ITEM_SWORD_BGS;
-                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
-                } else {
-                    if (gSaveContext.swordHealth < 8) {
-                        gSaveContext.swordHealth = 8;
+                    if (ImGui::Selectable("Kokiri Sword")) {
+                        player->currentSwordItemId = ITEM_SWORD_KOKIRI;
+                        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KOKIRI;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
                     }
-                    player->currentSwordItemId = ITEM_SWORD_BGS;
-                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
+                    if (ImGui::Selectable("Master Sword")) {
+                        player->currentSwordItemId = ITEM_SWORD_MASTER;
+                        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
+                    }
+                    if (ImGui::Selectable("Biggoron's Sword")) {
+                        if (gSaveContext.bgsFlag) {
+                            if (gSaveContext.swordHealth < 8) {
+                                gSaveContext.swordHealth = 8;
+                            }
+                            player->currentSwordItemId = ITEM_SWORD_BGS;
+                            gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+                        } else {
+                            if (gSaveContext.swordHealth < 8) {
+                                gSaveContext.swordHealth = 8;
+                            }
+                            player->currentSwordItemId = ITEM_SWORD_BGS;
+                            gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
+                        }
+
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_BIGGORON);
+                    }
+                    if (ImGui::Selectable("Fishing Pole")) {
+                        player->currentSwordItemId = ITEM_FISHING_POLE;
+                        gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
+                    }
+                    ImGui::EndCombo();
+                }
+                if (ImGui::BeginCombo("Shield", curShield)) {
+                    if (ImGui::Selectable("None")) {
+                        player->currentShield = PLAYER_SHIELD_NONE;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE);
+                    }
+                    if (ImGui::Selectable("Deku Shield")) {
+                        player->currentShield = PLAYER_SHIELD_DEKU;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU);
+                    }
+                    if (ImGui::Selectable("Hylian Shield")) {
+                        player->currentShield = PLAYER_SHIELD_HYLIAN;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_HYLIAN);
+                    }
+                    if (ImGui::Selectable("Mirror Shield")) {
+                        player->currentShield = PLAYER_SHIELD_MIRROR;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR);
+                    }
+                    ImGui::EndCombo();
                 }
-                
-                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_BIGGORON);
-            }
-            if (ImGui::Selectable("Fishing Pole")) {
-                player->currentSwordItemId = ITEM_FISHING_POLE;
-                gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
-            }
-            ImGui::EndCombo();
 
-        }
-        if (ImGui::BeginCombo("Shield", curShield)) {
-            if (ImGui::Selectable("None")) {
-                player->currentShield = PLAYER_SHIELD_NONE;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE);
-            }
-            if (ImGui::Selectable("Deku Shield")) {
-                player->currentShield = PLAYER_SHIELD_DEKU;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU);
-            }
-            if (ImGui::Selectable("Hylian Shield")) {
-                player->currentShield = PLAYER_SHIELD_HYLIAN;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_HYLIAN);
-            }
-            if (ImGui::Selectable("Mirror Shield")) {
-                player->currentShield = PLAYER_SHIELD_MIRROR;
-                Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR);
-            }
-            ImGui::EndCombo();
-        }
+                if (ImGui::BeginCombo("Tunic", curTunic)) {
+                    if (ImGui::Selectable("Kokiri Tunic")) {
+                        player->currentTunic = PLAYER_TUNIC_KOKIRI;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI);
+                    }
+                    if (ImGui::Selectable("Goron Tunic")) {
+                        player->currentTunic = PLAYER_TUNIC_GORON;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON);
+                    }
+                    if (ImGui::Selectable("Zora Tunic")) {
+                        player->currentTunic = PLAYER_TUNIC_ZORA;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_ZORA);
+                    }
+                    ImGui::EndCombo();
+                }
 
-        if (ImGui::BeginCombo("Tunic", curTunic)) {
-            if (ImGui::Selectable("Kokiri Tunic")) {
-                player->currentTunic = PLAYER_TUNIC_KOKIRI;
-                Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI);
-            }
-            if (ImGui::Selectable("Goron Tunic")) {
-                player->currentTunic = PLAYER_TUNIC_GORON;
-                Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON);
-            }
-            if (ImGui::Selectable("Zora Tunic")) {
-                player->currentTunic = PLAYER_TUNIC_ZORA;
-                Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_ZORA);
-            }
-            ImGui::EndCombo();
-        }
-
-        if (ImGui::BeginCombo("Boots", curBoots)) {
-            if (ImGui::Selectable("Kokiri Boots")) {
-                player->currentBoots = PLAYER_BOOTS_KOKIRI;
-                Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI);
-            }
-            if (ImGui::Selectable("Iron Boots")) {
-                player->currentBoots = PLAYER_BOOTS_IRON;
-                Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_IRON);
-            }
-            if (ImGui::Selectable("Hover Boots")) {
-                player->currentBoots = PLAYER_BOOTS_HOVER;
-                Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_HOVER);
-            }
-            ImGui::EndCombo();
-        }
+                if (ImGui::BeginCombo("Boots", curBoots)) {
+                    if (ImGui::Selectable("Kokiri Boots")) {
+                        player->currentBoots = PLAYER_BOOTS_KOKIRI;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI);
+                    }
+                    if (ImGui::Selectable("Iron Boots")) {
+                        player->currentBoots = PLAYER_BOOTS_IRON;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_IRON);
+                    }
+                    if (ImGui::Selectable("Hover Boots")) {
+                        player->currentBoots = PLAYER_BOOTS_HOVER;
+                        Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_HOVER);
+                    }
+                    ImGui::EndCombo();
+                }
+                ImGui::PopItemWidth();
+                PopStyleCombobox();
+            },
+            "Current Equipment");
+        ImGui::SameLine();
 
         ImU16 one = 1;
-        ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Current B Item");
-            ImGui::InputScalar("B Button", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[0], &one, NULL);
-            ImGui::NewLine();
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                PushStyleInput(THEME_COLOR);
+                ImGui::Text("Current Items");
+                ImGui::InputScalar("B Button", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[0], &one, NULL);
+                ImGui::InputScalar("C Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[1], &one, NULL);
+                ImGui::InputScalar("C Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[2], &one, NULL);
+                ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL);
+                PopStyleInput();
+                ImGui::PopItemWidth();
+            },
+            "Current Items");
 
-            ImGui::Text("Current C Equips");
-            ImGui::InputScalar("C Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[1], &one, NULL);
+        if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0)) {
             ImGui::SameLine();
-            ImGui::InputScalar("C Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[2], &one, NULL);
-            ImGui::SameLine();
-            ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL);
-
-            if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0)) {
-                ImGui::NewLine();
-                ImGui::Text("Current D-pad Equips");
-                ImGui::InputScalar("D-pad Up  ", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); // Two spaces at the end for aligning, not elegant but it's working
-                ImGui::SameLine();
-                ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL);
-                // Intentionnal to not put everything on the same line, else it's taking too much for lower resolution.
-                ImGui::InputScalar("D-pad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL);
-                ImGui::SameLine();
-                ImGui::InputScalar("D-pad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL);
-            }
-        });
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+                    PushStyleInput(THEME_COLOR);
+                    ImGui::Text("Current D-pad Items");
+                    // Two spaces at the end for aligning, not elegant but it's working
+                    ImGui::InputScalar("D-pad Up  ", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL);
+                    ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL);
+                    ImGui::InputScalar("D-pad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL);
+                    ImGui::InputScalar("D-pad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one,
+                                       NULL);
+                    PopStyleInput();
+                    ImGui::PopItemWidth();
+                },
+                "Current D-pad Items");
+        }
 
         ImGui::Text("Player State");
         uint8_t bit[32] = {};
@@ -1550,55 +1629,80 @@ void DrawPlayerTab() {
         std::vector<std::vector<std::string>> flag_strs = { state1, state2, state3 };
 
         for (int j = 0; j <= 2; j++) {
-            DrawGroupWithBorder([&]() {
-                ImGui::Text("State Flags %d", j + 1);
-                std::vector<std::string> state = flag_strs[j];
-                for (int i = 0; i <= 31; i++) {
-                    bit[i] = ((flags[j] >> i) & 1);
-                    if (bit[i] != 0) {
-                        ImGui::Text("%s", state[i].c_str());
+            std::string label = fmt::format("State Flags {}", j + 1);
+            DrawGroupWithBorder(
+                [&]() {
+                    ImGui::Text("%s", label.c_str());
+                    std::vector<std::string> state = flag_strs[j];
+                    for (int i = 0; i <= 31; i++) {
+                        bit[i] = ((flags[j] >> i) & 1);
+                        if (bit[i] != 0) {
+                            ImGui::Text("%s", state[i].c_str());
+                        }
                     }
-                }
-            });
+                },
+                label.c_str());
             ImGui::SameLine();
         }
-        DrawGroupWithBorder([&]() {
-            ImGui::Text("Sword");
-            ImGui::Text("  %d", player->meleeWeaponState);
-        });
+        DrawGroupWithBorder(
+            [&]() {
+                ImGui::Text("Sword");
+                ImGui::Text("  %d", player->meleeWeaponState);
+            },
+            "Sword");
 
     } else {
         ImGui::Text("Global Context needed for player info!");
     }
 }
 
+void ResetBaseOptions() {
+    intSliderOptionsBase.Color(THEME_COLOR).Size({ 320.0f, 0.0f }).Tooltip("");
+    buttonOptionsBase.Color(THEME_COLOR).Size(Sizes::Inline).Tooltip("");
+    checkboxOptionsBase.Color(THEME_COLOR).Tooltip("");
+    comboboxOptionsBase.Color(THEME_COLOR)
+        .ComponentAlignment(ComponentAlignments::Left)
+        .LabelPosition(LabelPositions::Near)
+        .Tooltip("");
+}
+
 void SaveEditorWindow::DrawElement() {
+    PushStyleTabs(THEME_COLOR);
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+
     if (ImGui::BeginTabBar("SaveContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Info")) {
             DrawInfoTab();
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Inventory")) {
             DrawInventoryTab();
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Flags")) {
             DrawFlagsTab();
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Equipment")) {
             DrawEquipmentTab();
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Quest Status")) {
             DrawQuestStatusTab();
             ImGui::EndTabItem();
         }
 
+        ResetBaseOptions();
         if (ImGui::BeginTabItem("Player")) {
             DrawPlayerTab();
             ImGui::EndTabItem();
@@ -1606,6 +1710,11 @@ void SaveEditorWindow::DrawElement() {
 
         ImGui::EndTabBar();
     }
+
+    ImGui::EndDisabled();
+    ImGui::PopFont();
+    PopStyleTabs();
 }
 
-void SaveEditorWindow::InitElement() {}
+void SaveEditorWindow::InitElement() {
+}
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 554a90b2ab..e8bdeb00a3 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 #include <cstdint>
-#include <soh/Enhancements/randomizer/randomizer_inf.h>
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include <libultraship/libultraship.h>
 
 typedef enum {
@@ -23,1610 +23,355 @@ typedef struct {
     std::map<uint16_t, const char*> flagDescriptions;
 } FlagTable;
 
+#define DEFINE_RAND_INF(rand_inf) { rand_inf, #rand_inf },
+
 // Reference https://tcrf.net/Proto:The_Legend_of_Zelda:_Ocarina_of_Time_Master_Quest/Event_Editor
 // The source was last referenced on 2022-09-03 and had a last updated value of 2020-05-02
 const std::vector<FlagTable> flagTables = {
-    { "Event Check Inf Flags", EVENT_CHECK_INF, 0x0D, {
-        { 0x02, "First Spoke to Mido" },
-        { 0x03, "Complained About Mido to Saria" },
-        { 0x04, "Showed Mido Sword & Shield" },
-        { 0x05, "Deku Tree Opened Mouth" },
-        { 0x06, "Spoke to Saria After Deku Tree's Death" },
-        { 0x07, "Obtained Kokiri Emerald & Deku Tree Dead" },
-        { 0x09, "Used Deku Tree Blue Warp" },
-        { 0x0A, "Played Saria's Song for Mido as Adult" },
-        { 0x0C, "Met Deku Tree" },
-        { 0x0F, "Spoke to Mido about Saria's whereabouts" },
-        { 0x10, "Spoke to Child Malon at Castle or Market" },
-        { 0x11, "Spoke to Ingo at Ranch before Talon returns" },
-        { 0x12, "Obtained Pocket Egg" },
-        { 0x13, "Woke Talon" },
-        { 0x14, "Talon Fled Hyrule Castle" },
-        { 0x15, "Spoke to Child Malon at Ranch" },
-        { 0x16, "Invited to Sing With Child Malon" },
-        { 0x17, "Great Deku Tree is Dead" },
-        { 0x18, "Obtained Epona" },
-        { 0x19, "Obtained Kokiri's Emerald" },
-        { 0x1B, "Rented Horse From Ingo" },
-        { 0x1C, "Spoke to Mido After Deku Tree's Death" },
-        { 0x1D, "Destroyed the Royal Family's Tomb" },
-        { 0x1E, "Won the Cow in Malon's Race" },
-        { 0x23, "Bombed Dodongo's Cavern Entrance" },
-        { 0x25, "Used Dodongo's Cavern Blue Warp" },
-        { 0x2F, "Death Mountain Erupted" },
-        { 0x30, "Spoke to a Zora" },
-        { 0x31, "Obtained Ruto's Letter" },
-        { 0x33, "King Zora Moved Aside" },
-        { 0x37, "Used Jabu-Jabu Blue Warp" },
-        { 0x38, "Obtained Silver Scale" },
-        { 0x39, "Opened Entrance to Zora's Domain" },
-        { 0x3A, "Offered Fish to Jabu-Jabu" },
-        { 0x3B, "Began Nabooru Battle" },
-        { 0x3C, "Finished Nabooru Battle" },
-        { 0x40, "Obtained Zelda's Letter" },
-        { 0x43, "Obtained Ocarina of Time" },
-        { 0x45, "Pulled Master Sword from Pedestal" },
-        { 0x48, "Used Forest Temple Blue Warp" },
-        { 0x49, "Used Fire Temple Blue Warp" },
-        { 0x4A, "Used Water Temple Blue Warp" },
-        { 0x4B, "Opened the Door of Time" },
-        { 0x4D, "Rainbow Bridge Built by Sages" },
-        { 0x4E, "Caught by Hyrule Castle Guards" },
-        { 0x4F, "Entered the Master Sword Chamber" },
-        { 0x50, "Learned Minuet of Forest" },
-        { 0x51, "Learned Bolero of Fire" },
-        { 0x52, "Learned Serenade of Water" },
-        { 0x54, "Learned Nocturne of Shadow" },
-        { 0x55, "Sheik Moved From Sword Pedestal" },
-        { 0x57, "Learned Saria's Song" },
-        { 0x59, "Learned Zelda's Lullaby" },
-        { 0x5A, "Learned Sun's Song" },
-        { 0x5B, "Learned Song of Storms" },
-        { 0x65, "Played Song of Storms in Windmill" },
-        { 0x67, "Drained Well in Kakariko Village" },
-        { 0x68, "Played Gerudo Archery Minigame" },
-        { 0x69, "Restored Lake Hylia's Water" },
-        { 0x6A, "Woke Talon in Kakariko" },
-        { 0x6B, "Spoke to Talon After Saving Ranch" },
-        { 0x6F, "Spoke to Kaepora Gaebora by Lost Woods" },
-        { 0x70, "Began Gohma Battle" },
-        { 0x71, "Began King Dodongo Battle" },
-        { 0x72, "Began Phantom Ganon Battle" },
-        { 0x73, "Began Volvagia Battle" },
-        { 0x74, "Began Morpha Battle" },
-        { 0x75, "Began Twinrova Battle" },
-        { 0x76, "Began Barinade Battle" },
-        { 0x77, "Began Bongo Bongo Battle" },
-        { 0x78, "Began Ganondorf Battle" },
-        { 0x80, "Zelda Fled Hyrule Castle" },
-        { 0x82, "Bridge Unlocked (After Zelda Escape Cutscene)" },
-        { 0x8C, "Paid Back Keaton Mask Fee" },
-        { 0x8D, "Paid Back Skull Mask Fee" },
-        { 0x8E, "Paid Back Spooky Mask Fee" },
-        { 0x8F, "Paid Back Bunny Hood Fee" },
-        { 0x90, "Rescued Red Carpenter" },
-        { 0x91, "Rescued Yellow Carpenter" },
-        { 0x92, "Rescued Blue Carpenter" },
-        { 0x93, "Rescued Green Carpenter" },
-        { 0x94, "Spoke to Nabooru in Spirit Temple" },
-        { 0x95, "Nabooru Captured by Twinrova" },
-        { 0x96, "Spoke to Cursed Man in Skulltula House" },
-        { 0x9C, "Played Song for Scarecrow as Adult" },
-        { 0xA0, "Entered Hyrule Field" },
-        { 0xA1, "Entered Death Mountain Trail" },
-        { 0xA3, "Entered Kakariko Village" },
-        { 0xA4, "Entered Zora's Domain" },
-        { 0xA5, "Entered Hyrule Castle" },
-        { 0xA6, "Entered Goron City" },
-        { 0xA7, "Entered Temple of Time" },
-        { 0xA8, "Entered Deku Tree" },
-        { 0xA9, "Learned Song of Time" },
-        { 0xAA, "Bongo Bongo Escaped Well" },
-        { 0xAC, "Learned Requiem of Spirit" },
-        { 0xAD, "Completed Spirit Trial" },
-        { 0xB0, "Entered Dodongo's Cavern" },
-        { 0xB1, "Entered Lake Hylia" },
-        { 0xB2, "Entered Gerudo Valley" },
-        { 0xB3, "Entered Gerudo's Fortress" },
-        { 0xB4, "Entered Lon Lon Ranch" },
-        { 0xB5, "Entered Jabu-Jabu's Belly" },
-        { 0xB6, "Entered Graveyard" },
-        { 0xB7, "Entered Zora's Fountain" },
-        { 0xB8, "Entered Desert Colossus" },
-        { 0xB9, "Entered Death Mountain Crater" },
-        { 0xBA, "Entered Ganon's Castle (Exterior)" },
-        { 0xBB, "Completed Forest Trial" },
-        { 0xBC, "Completed Water Trial" },
-        { 0xBD, "Completed Shadow Trial" },
-        { 0xBE, "Completed Fire Trial" },
-        { 0xBF, "Completed Light Trial" },
-        { 0xC0, "Nabooru Ordered to Fight by Twinrova" },
-        { 0xC1, "Spoke to Saria on Lost Woods Bridge" },
-        { 0xC3, "Dispelled Ganon's Tower Barrier" },
-        { 0xC4, "Returned to Temple of Time With All Medallions" },
-        { 0xC5, "Sheik, Spawned at Master Sword Pedestal as Adult" },
-        { 0xC6, "Spoke to Deku Tree Sprout" },
-        { 0xC7, "Watched Ganon's Tower Collapse / Caught by Gerudo" },
-        { 0xC8, "Obtained Spirit Medallion" },
-        { 0xC9, "Demo_Effect, Temple of Time Warp in blue aura + sfx the first time you spawn as Adult" },
-        { 0xD0, "Obtained Frogs' Piece of Heart" },
-        { 0xD1, "Played Zelda's Lullaby for Frogs" },
-        { 0xD2, "Played Epona's Song for Frogs" },
-        { 0xD3, "Played Sun's Song for Frogs" },
-        { 0xD4, "Played Saria's Song for Frogs" },
-        { 0xD5, "Played Song of Time for Frogs" },
-        { 0xD6, "Played Song of Storms for Frogs" },
-        { 0xDA, "Obtained Adult's Wallet" },
-        { 0xDB, "Obtained Stone of Agony" },
-        { 0xDC, "Obtained Giant's Wallet" },
-        { 0xDD, "Obtained Skulltula House's Bombchu" },
-        { 0xDE, "Obtained Skulltula House's Piece of Heart" },
-    } },
-    { "Item Get Inf Flags", ITEM_GET_INF, 0x03, {
-        { 0x02, "Obtained Super Cucco Bottle" },
-        { 0x03, "Bought Bombchu (Shelf 2: Top Right)" },
-        { 0x04, "Bought Bombchu (Shelf 1: Bot. Right)" },
-        { 0x05, "Bought Bombchu (Shelf 1: Top Left)" },
-        { 0x06, "Bought Bombchu (Shelf 2: Bot. Left)" },
-        { 0x07, "Bought Bombchu (Shelf 2: Bot. Right)" },
-        { 0x08, "Bought Bombchu (Shelf 1: Top Right)" },
-        { 0x09, "Bought Bombchu (Shelf 1: Bot. Left)" },
-        { 0x0A, "Bought Bombchu (Shelf 2: Top Left)" },
-        { 0x0B, "Obtained Scrub's Heart Piece" },
-        { 0x0C, "Obtained Cucco Lady's Bottle" },
-        { 0x0D, "Obtained Bullet Bag Upgrade (Market)" },
-        { 0x0E, "Obtained Big Quiver" },
-        { 0x0F, "Obtained Biggest Quiver" },
-        { 0x10, "Obtained Scientist's Heart Piece" },
-        { 0x11, "Obtained Bowling Bomb Bag Upgrade" },
-        { 0x12, "Obtained Bowling Heart Piece" },
-        { 0x13, "Obtained Deku Seeds" },
-        { 0x15, "Obtained Roof Guy's Heart Piece" },
-        { 0x16, "Obtained Skullkid's Heart Piece" },
-        { 0x17, "Obtained Skullkids' Heart Piece" },
-        { 0x18, "Obtained Farore's Wind" },
-        { 0x19, "Obtained Din's Fire" },
-        { 0x1A, "Obtained Nayru's Love" },
-        { 0x1B, "Obtained Treasure Chest Game Reward" },
-        { 0x1C, "Obtained Grave-Dig Heart Piece" },
-        { 0x1D, "Obtained Bullet Bag Upgrade (Woods)" },
-        { 0x1E, "Obtained Deku Stick Upgrade (Stage)" },
-        { 0x1F, "Obtained Deku Nut Upgrade (Stage)" },
-        { 0x23, "Obtained Keaton Mask" },
-        { 0x24, "Obtained Skull Mask" },
-        { 0x25, "Obtained Spooky Mask" },
-        { 0x26, "Obtained Bunny Hood" },
-        { 0x2A, "Obtained Mask of Truth" },
-        { 0x2C, "Obtained Pocket Egg" },
-        { 0x2E, "Obtained Cojiro" },
-        { 0x30, "Obtained Odd Potion" },
-        { 0x31, "Obtained Poacher's Saw" },
-        { 0x38, "Sold Keaton Mask" },
-        { 0x39, "Sold Skull Mask" },
-        { 0x3A, "Sold Spooky Mask" },
-        { 0x3B, "Sold Bunny Hood" },
-        { 0x3F, "Obtained Mask of Truth" },
-    } },
-    { "Inf Flags", INF_TABLE, 0x1D, {
-        { 0x00, "Greeted by Saria" },
-        { 0x01, "Spoke to Saria About Obtaining Fairy" },
-        { 0x03, "Complained About Mido to Saria" },
-        { 0x05, "Spoke to Saria in Saria's House" },
-        { 0x0C, "Mido Asked to See Sword & Shield" },
-        { 0x15, "Spoke to Mido in Lost Woods as Adult" },
-        { 0x19, "Told Mido Saria Won't Return" },
-        { 0x1E, "Spoke to Kokiri Girl by Jumping Stones" },
-        { 0x22, "Spoke to Kokiri Boy Guarding Forest Exit" },
-        { 0x24, "Spoke to Kokiri Boy Cutting Grass" },
-        { 0x26, "Spoke to Kokiri Girl on Shop Awning" },
-        { 0x28, "Spoke to Kokiri Girl About Training Center" },
-        { 0x41, "Spoke to Kokiri Boy on Bed in Mido's House" },
-        { 0x51, "Spoke to Kokiri Girl in Saria's House" },
-        { 0x59, "Spoke to Know-It-All Bro. About Temple" },
-        { 0x61, "Spoke to Know-It-All Bro. About Saria" },
-        { 0x66, "Spoke to Deku Tree Sprout After Cutscene" },
-        { 0x6C, "Spoke to Dying Knight" },
-        { 0x76, "Showed Zelda's Letter to Gate Guard" },
-        { 0x77, "Gate Guard Put On Keaton Mask" },
-        { 0x7E, "Spoke to Talon in Lon Lon Ranch House" },
-        { 0x84, "Spoke to Child Malon at Castle or Market" },
-        { 0x85, "Child Malon Said Epona Was Afraid of You" },
-        { 0x8B, "Entered Hyrule Castle" },
-        { 0x94, "Spoke to Ingo at Ranch Before Talon's Return" },
-        { 0x97, "Spoke to Ingo at Ranch" },
-        { 0x9A, "Spoke to Ingo as Adult" },
-        { 0xA2, "Refused Ingo's 50 Rupee Rental Request" },
-        { 0xAB, "Rode a Horse at Ingo's Ranch" },
-        { 0xB0, "Spoke to Medigoron as Child" },
-        { 0xB1, "Spoke to Medigoron as Adult" },
-        { 0xB6, "Spoke to Poe Collector in Ruined Market" },
-        { 0xB7, "Spoke to Fado in Kokiri Forest as Child" },
-        { 0xB8, "Spoke to Malon After Saving Ranch" },
-        { 0xB9, "Spoke to Malon on Horseback" },
-        { 0xBC, "Fado requested Odd Potion" },
-        { 0xC0, "Spoke to Fat Woman by Market Potion Shop" },
-        { 0xC1, "Spoke to Fat Woman After Zelda's Escape" },
-        { 0xC2, "Spoke to Burly Man About Talon Search" },
-        { 0xC3, "Spoke to Burly Man After Zelda's Escape" },
-        { 0xC4, "Spoke to Thief After Zelda's Escape" },
-        { 0xC5, "Spoke to Thin Man by Market Target Shop" },
-        { 0xC6, "Spoke to Old Woman by Market Fountain" },
-        { 0xC7, "Spoke to Old Man by Bombchu Bowling" },
-        { 0xC8, "Spoke to Thin Lady by Bombchu Bowling" },
-        { 0xC9, "Spoke to Thin Lady After Zelda's Escape (1.0)" },
-        { 0xCA, "Spoke to Red Joker in Market" },
-        { 0xCB, "Spoke to Blue Joker in Market (1.0) / Dog Lady as Adult (DBG)" },
-        { 0xCC, "Spoke to Itchy Lady After Malon Left Town" },
-        { 0xCD, "Spoke to Blue Jokester in Market (DBG)" },
-        { 0xCE, "Spoke to Thin Lady After Zelda's Escape (DBG)" },
-        { 0xD9, "Spoke to Dampé as Child" },
-        { 0xE0, "Spoke to Goron by Cavern" },
-        { 0xE3, "Spoke to Goron Hiding Stick" },
-        { 0xE6, "Spoke to Goron by Woods Exit" },
-        { 0xEB, "Spoke to Goron by Bomb Flowers" },
-        { 0xF0, "Spoke to Goron at City? Entrance" },
-        { 0xF4, "Spoke to Ruby-Crazed Goron" },
-        { 0xFC, "Spoke to Goron Shop Owner" },
-        { 0x109, "Goron City Doors Unlocked" },
-        { 0x10B, "Spoke to Goron Link About Volvagia" },
-        { 0x10C, "Stopped Goron Link's Rolling" },
-        { 0x10E, "Spoke to Goron Link" },
-        { 0x113, "Spoke to Darunia in Goron City" },
-        { 0x11A, "Spoke to Darunia in Fire Temple" },
-        { 0x11E, "Obtained Bomb Bag Upgrade (Goron City)" },
-        { 0x124, "Spoke to Zora Near Zora Shop?" },
-        { 0x128, "Spoke to Zora Beside Zora Shop?" },
-        { 0x129, "Spoke to Zora Swimming Behind Zora Shop" },
-        { 0x138, "Thawed King Zora" },
-        { 0x139, "Obtained Zora Tunic" },
-        { 0x140, "Ruto in JJ (M7) on Blue Switch" },
-        { 0x141, "Ruto in JJ (M2) Meet Ruto" },
-        { 0x142, "Ruto in JJ (M3) Talk First Time" },
-        { 0x143, "Ruto in JJ (M10) Can Be Escorted" },
-        { 0x144, "Ruto in JJ (?) Wants to be Tossed to Sapphire" },
-        { 0x145, "Ruto in JJ (M6) on Sapphire platform" },
-        { 0x146, "Ruto in JJ (M6) Kidnapped" },
-        { 0x147, "Ruto in JJ, Spawns on F1 Instead of B1" },
-        { 0x160, "Spoke to Man in Impa's House During Day" },
-        { 0x161, "Spoke to Man in Impa's House at Night" },
-        { 0x162, "Spoke to Man in Impa's House as Adult" },
-        { 0x163, "Spoke to Carpenter Boss's Wife as Child" },
-        { 0x164, "Spoke to Carpenter Boss's Wife as Adult" },
-        { 0x16C, "Refused Nabooru's Request" },
-        { 0x170, "Spoke to Carpenter Boss in Valley" },
-        { 0x172, "Spoke to Carpenter Boss in Kakariko" },
-        { 0x176, "Spoke to Blue Carpenter in Tent" },
-        { 0x178, "Spoke to Green Carpenter in Tent" },
-        { 0x17F, "Running Man Suggested a Race" },
-        { 0x190, "Obtained Gerudo Archery Piece of  Heart" },
-        { 0x191, "Obtained Dog Lady's Piece of Heart" },
-        { 0x192, "Obtained Deku Stick Upgrade (Lost Woods)" },
-        { 0x193, "Obtained Deku Nut Upgrade (Grotto)" },
-        { 0x195, "Spoke to Kaepora in Lake Hylia" },
-        { 0x196, "Spoke to Cursed Man With <10 Tokens" },
-        { 0x197, "Spoke to Cursed Man With 10 Tokens" },
-        { 0x198, "Obtained Small Magic Jar" },
-        { 0x199, "Caught Cucco by Field Entrance" },
-        { 0x19A, "Caught Cucco by Bazaar" },
-        { 0x19B, "Caught Cucco by Cucco Pen" },
-        { 0x19C, "Caught Cucco Behind Windmill" },
-        { 0x19D, "Caught Cucco in Crate" },
-        { 0x19E, "Caught Cucco by Skulltula House" },
-        { 0x19F, "Caught Cucco Behind Potion Shop" },
-        { 0x1A0, "Entered Deku Tree" },
-        { 0x1A1, "Entered Dodongo's Cavern" },
-        { 0x1A2, "Entered Jabu-Jabu's Belly" },
-        { 0x1A3, "Entered Forest Temple" },
-        { 0x1A4, "Entered Fire Temple" },
-        { 0x1A5, "Entered Water Temple" },
-        { 0x1A6, "Entered Spirit Temple" },
-        { 0x1A7, "Entered Shadow Temple" },
-        { 0x1A8, "Entered Bottom of the Well" },
-        { 0x1A9, "Entered Ice Cavern" },
-        { 0x1AA, "Entered Ganon's Tower" },
-        { 0x1AB, "Entered Gerudo Training Ground" },
-        { 0x1AC, "Entered Thieves' Hideout" },
-        { 0x1AD, "Entered Ganon's Castle" },
-        { 0x1AE, "Entered Ganon's Tower (Collapsing)" },
-        { 0x1AF, "Entered Ganon's Castle (Collapsing)" },
-        { 0x1D0, "No Sword on B" },
-    } },
-    { "Event Inf Flags", EVENT_INF, 0x03, {
-        { 0x00, "Rented Horse From Ingo" },
-        { 0x01, "Racing Ingo" },
-        { 0x02, "Won First Race With Ingo?" },
-        { 0x05, "Lost Race With Ingo?" },
-        { 0x06, "Racing Ingo For the Second Time" },
-        { 0x08, "Finished Special Cucco Minigame / Began Gerudo Archery" },
-        { 0x0A, "Won Special Cucco Minigame?" },
-        { 0x0F, "Rented Horse From Ingo" },
-        { 0x10, "Racing Running Man" },
-        { 0x20, "Market Crowd Text Randomizer" },
-        { 0x21, "Market Crowd Text Randomizer" },
-        { 0x22, "Market Crowd Text Randomizer" },
-        { 0x23, "Market Crowd Text Randomizer" },
-        { 0x24, "Market Crowd Text Randomizer" },
-        { 0x30, "Entered the Market" },
-    } },
-    { "Randomizer Inf Flags", RANDOMIZER_INF, (RAND_INF_MAX + 15) / 16, {
-        { RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE, "DUNGEONS_DONE_SPIRIT_TEMPLE" },
-        { RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE, "DUNGEONS_DONE_SHADOW_TEMPLE" },
-
-        { RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW, "COWS_MILKED_KF_LINKS_HOUSE_COW" },
-        { RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW, "COWS_MILKED_HF_COW_GROTTO_COW" },
-        { RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW, "COWS_MILKED_LLR_STABLES_LEFT_COW" },
-        { RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW, "COWS_MILKED_LLR_STABLES_RIGHT_COW" },
-        { RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW, "COWS_MILKED_LLR_TOWER_LEFT_COW" },
-        { RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW, "COWS_MILKED_LLR_TOWER_RIGHT_COW" },
-        { RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW, "COWS_MILKED_KAK_IMPAS_HOUSE_COW" },
-        { RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW, "COWS_MILKED_DMT_COW_GROTTO_COW" },
-        { RAND_INF_COWS_MILKED_GV_COW, "COWS_MILKED_GV_COW" },
-        { RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW, "COWS_MILKED_JABU_JABUS_BELLY_MQ_COW" },
-
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT, "SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, "SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, "SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, "SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY" },
-        { RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB, "SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, "SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, "SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT, "SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT, "SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO, "SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO" },
-        { RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR, "SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT, "SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR, "SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT, "SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT, "SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT, "SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER, "SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER" },
-        { RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR, "SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT, "SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR, "SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT, "SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT, "SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT, "SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER, "SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER" },
-        { RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT, "SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT, "SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER, "SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER" },
-        { RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT, "SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT, "SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER, "SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER" },
-        { RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR, "SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, "SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, "SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, "SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE, "SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE" },
-        { RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB, "SCRUBS_PURCHASED_DMC_DEKU_SCRUB" },
-        { RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB, "SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, "SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, "SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, "SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE" },
-        { RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, "SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, "SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, "SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, "SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, "SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT" },
-        { RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, "SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT" },
-
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1, "SHOP_ITEMS_KF_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2, "SHOP_ITEMS_KF_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3, "SHOP_ITEMS_KF_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4, "SHOP_ITEMS_KF_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5, "SHOP_ITEMS_KF_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6, "SHOP_ITEMS_KF_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7, "SHOP_ITEMS_KF_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8, "SHOP_ITEMS_KF_SHOP_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1, "SHOP_ITEMS_GC_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2, "SHOP_ITEMS_GC_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3, "SHOP_ITEMS_GC_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4, "SHOP_ITEMS_GC_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5, "SHOP_ITEMS_GC_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6, "SHOP_ITEMS_GC_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7, "SHOP_ITEMS_GC_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8, "SHOP_ITEMS_GC_SHOP_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1, "SHOP_ITEMS_ZD_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2, "SHOP_ITEMS_ZD_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3, "SHOP_ITEMS_ZD_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4, "SHOP_ITEMS_ZD_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5, "SHOP_ITEMS_ZD_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6, "SHOP_ITEMS_ZD_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7, "SHOP_ITEMS_ZD_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8, "SHOP_ITEMS_ZD_SHOP_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1, "SHOP_ITEMS_KAK_BAZAAR_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2, "SHOP_ITEMS_KAK_BAZAAR_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3, "SHOP_ITEMS_KAK_BAZAAR_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4, "SHOP_ITEMS_KAK_BAZAAR_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5, "SHOP_ITEMS_KAK_BAZAAR_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6, "SHOP_ITEMS_KAK_BAZAAR_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7, "SHOP_ITEMS_KAK_BAZAAR_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8, "SHOP_ITEMS_KAK_BAZAAR_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8, "SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8, "SHOP_ITEMS_MARKET_BAZAAR_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8, "SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7" },
-        { RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8, "SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8" },
-
-        { RAND_INF_MERCHANTS_CARPET_SALESMAN, "RAND_INF_MERCHANTS_CARPET_SALESMAN" },
-        { RAND_INF_MERCHANTS_MEDIGORON, "RAND_INF_MERCHANTS_MEDIGORON" },
-        { RAND_INF_MERCHANTS_GRANNYS_SHOP, "RAND_INF_MERCHANTS_GRANNY_SHOP"},
-        { RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN, "RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN"},
-
-        { RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO, "ADULT_TRADES_LW_TRADE_COJIRO" },
-        { RAND_INF_ADULT_TRADES_GV_TRADE_SAW, "ADULT_TRADES_GV_TRADE_SAW" },
-        { RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD, "ADULT_TRADES_DMT_TRADE_BROKEN_SWORD" },
-        { RAND_INF_ADULT_TRADES_LH_TRADE_FROG, "ADULT_TRADES_LH_TRADE_FROG" },
-        { RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS, "ADULT_TRADES_DMT_TRADE_EYEDROPS" },
-
-        { RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD, "KAK_100_GOLD_SKULLTULA_REWARD" },
-        { RAND_INF_GREG_FOUND, "RAND_INF_GREG_FOUND" },
-
-        { RAND_INF_TOT_MASTER_SWORD, "RAND_INF_TOT_MASTER_SWORD"},
-        { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" },
-        { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" },
-        { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" },
-        { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" },
-
-        { RAND_INF_GOHMA_SOUL, "RAND_INF_GOHMA_SOUL" },
-        { RAND_INF_KING_DODONGO_SOUL, "RAND_INF_KING_DODONGO_SOUL" },
-        { RAND_INF_BARINADE_SOUL, "RAND_INF_BARINADE_SOUL" },
-        { RAND_INF_PHANTOM_GANON_SOUL, "RAND_INF_PHANTOM_GANON_SOUL" },
-        { RAND_INF_VOLVAGIA_SOUL, "RAND_INF_VOLVAGIA_SOUL" },
-        { RAND_INF_MORPHA_SOUL, "RAND_INF_MORPHA_SOUL" },
-        { RAND_INF_BONGO_BONGO_SOUL, "RAND_INF_BONGO_BONGO_SOUL" },
-        { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" },
-        { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" },
-
-        { RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
-        { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },
-        { RAND_INF_HAS_OCARINA_C_DOWN, "RAND_INF_HAS_OCARINA_C_DOWN" },
-        { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"},
-        { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"},
-
-        { RAND_INF_KF_LINKS_HOUSE_POT, "RAND_INF_KF_LINKS_HOUSE_POT" },
-        { RAND_INF_KF_TWINS_HOUSE_POT_1, "RAND_INF_KF_TWINS_HOUSE_POT_1" },
-        { RAND_INF_KF_TWINS_HOUSE_POT_2, "RAND_INF_KF_TWINS_HOUSE_POT_2" },
-        { RAND_INF_KF_BROTHERS_HOUSE_POT_1, "RAND_INF_KF_BROTHERS_HOUSE_POT_1" },
-        { RAND_INF_KF_BROTHERS_HOUSE_POT_2, "RAND_INF_KF_BROTHERS_HOUSE_POT_2" },
-        { RAND_INF_GF_BREAK_ROOM_POT_1, "RAND_INF_GF_BREAK_ROOM_POT_1" },
-        { RAND_INF_GF_BREAK_ROOM_POT_2, "RAND_INF_GF_BREAK_ROOM_POT_2" },
-        { RAND_INF_GF_KITCHEN_POT_1, "RAND_INF_GF_KITCHEN_POT_1" },
-        { RAND_INF_GF_KITCHEN_POT_2, "RAND_INF_GF_KITCHEN_POT_2" },
-        { RAND_INF_GF_NORTH_F1_CARPENTER_POT_1, "RAND_INF_GF_NORTH_F1_CARPENTER_POT_1" },
-        { RAND_INF_GF_NORTH_F1_CARPENTER_POT_2, "RAND_INF_GF_NORTH_F1_CARPENTER_POT_2" },
-        { RAND_INF_GF_NORTH_F1_CARPENTER_POT_3, "RAND_INF_GF_NORTH_F1_CARPENTER_POT_3" },
-        { RAND_INF_GF_NORTH_F2_CARPENTER_POT_1, "RAND_INF_GF_NORTH_F2_CARPENTER_POT_1" },
-        { RAND_INF_GF_NORTH_F2_CARPENTER_POT_2, "RAND_INF_GF_NORTH_F2_CARPENTER_POT_2" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_POT_1, "RAND_INF_GF_SOUTH_F1_CARPENTER_POT_1" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_POT_2, "RAND_INF_GF_SOUTH_F1_CARPENTER_POT_2" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_POT_3, "RAND_INF_GF_SOUTH_F1_CARPENTER_POT_3" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_1, "RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_1" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_2, "RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_2" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_3, "RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_3" },
-        { RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_4, "RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_4" },
-        { RAND_INF_WASTELAND_NEAR_GS_POT_1, "RAND_INF_WASTELAND_NEAR_GS_POT_1" },
-        { RAND_INF_WASTELAND_NEAR_GS_POT_2, "RAND_INF_WASTELAND_NEAR_GS_POT_2" },
-        { RAND_INF_WASTELAND_NEAR_GS_POT_3, "RAND_INF_WASTELAND_NEAR_GS_POT_3" },
-        { RAND_INF_WASTELAND_NEAR_GS_POT_4, "RAND_INF_WASTELAND_NEAR_GS_POT_4" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43" },
-        { RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44, "RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10" },
-        { RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11, "RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11" },
-        { RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1, "RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1" },
-        { RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2, "RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2" },
-        { RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3, "RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3" },
-        { RAND_INF_KAK_NEAR_POTION_SHOP_POT_1, "RAND_INF_KAK_NEAR_POTION_SHOP_POT_1" },
-        { RAND_INF_KAK_NEAR_POTION_SHOP_POT_2, "RAND_INF_KAK_NEAR_POTION_SHOP_POT_2" },
-        { RAND_INF_KAK_NEAR_POTION_SHOP_POT_3, "RAND_INF_KAK_NEAR_POTION_SHOP_POT_3" },
-        { RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1, "RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1" },
-        { RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2, "RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2" },
-        { RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3, "RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3" },
-        { RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1, "RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1" },
-        { RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2, "RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2" },
-        { RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3, "RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3" },
-        { RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1, "RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1" },
-        { RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2, "RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_1, "RAND_INF_GY_DAMPES_GRAVE_POT_1" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_2, "RAND_INF_GY_DAMPES_GRAVE_POT_2" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_3, "RAND_INF_GY_DAMPES_GRAVE_POT_3" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_4, "RAND_INF_GY_DAMPES_GRAVE_POT_4" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_5, "RAND_INF_GY_DAMPES_GRAVE_POT_5" },
-        { RAND_INF_GY_DAMPES_GRAVE_POT_6, "RAND_INF_GY_DAMPES_GRAVE_POT_6" },
-        { RAND_INF_GC_LOWER_STAIRCASE_POT_1, "RAND_INF_GC_LOWER_STAIRCASE_POT_1" },
-        { RAND_INF_GC_LOWER_STAIRCASE_POT_2, "RAND_INF_GC_LOWER_STAIRCASE_POT_2" },
-        { RAND_INF_GC_UPPER_STAIRCASE_POT_1, "RAND_INF_GC_UPPER_STAIRCASE_POT_1" },
-        { RAND_INF_GC_UPPER_STAIRCASE_POT_2, "RAND_INF_GC_UPPER_STAIRCASE_POT_2" },
-        { RAND_INF_GC_UPPER_STAIRCASE_POT_3, "RAND_INF_GC_UPPER_STAIRCASE_POT_3" },
-        { RAND_INF_GC_MEDIGORON_POT_1, "RAND_INF_GC_MEDIGORON_POT_1" },
-        { RAND_INF_GC_DARUNIA_POT_1, "RAND_INF_GC_DARUNIA_POT_1" },
-        { RAND_INF_GC_DARUNIA_POT_2, "RAND_INF_GC_DARUNIA_POT_2" },
-        { RAND_INF_GC_DARUNIA_POT_3, "RAND_INF_GC_DARUNIA_POT_3" },
-        { RAND_INF_DMC_NEAR_GC_POT_1, "RAND_INF_DMC_NEAR_GC_POT_1" },
-        { RAND_INF_DMC_NEAR_GC_POT_2, "RAND_INF_DMC_NEAR_GC_POT_2" },
-        { RAND_INF_DMC_NEAR_GC_POT_3, "RAND_INF_DMC_NEAR_GC_POT_3" },
-        { RAND_INF_DMC_NEAR_GC_POT_4, "RAND_INF_DMC_NEAR_GC_POT_4" },
-        { RAND_INF_ZD_NEAR_SHOP_POT_1, "RAND_INF_ZD_NEAR_SHOP_POT_1" },
-        { RAND_INF_ZD_NEAR_SHOP_POT_2, "RAND_INF_ZD_NEAR_SHOP_POT_2" },
-        { RAND_INF_ZD_NEAR_SHOP_POT_3, "RAND_INF_ZD_NEAR_SHOP_POT_3" },
-        { RAND_INF_ZD_NEAR_SHOP_POT_4, "RAND_INF_ZD_NEAR_SHOP_POT_4" },
-        { RAND_INF_ZD_NEAR_SHOP_POT_5, "RAND_INF_ZD_NEAR_SHOP_POT_5" },
-        { RAND_INF_ZF_HIDDEN_CAVE_POT_1, "RAND_INF_ZF_HIDDEN_CAVE_POT_1" },
-        { RAND_INF_ZF_HIDDEN_CAVE_POT_2, "RAND_INF_ZF_HIDDEN_CAVE_POT_2" },
-        { RAND_INF_ZF_HIDDEN_CAVE_POT_3, "RAND_INF_ZF_HIDDEN_CAVE_POT_3" },
-        { RAND_INF_ZF_NEAR_JABU_POT_1, "RAND_INF_ZF_NEAR_JABU_POT_1" },
-        { RAND_INF_ZF_NEAR_JABU_POT_2, "RAND_INF_ZF_NEAR_JABU_POT_2" },
-        { RAND_INF_ZF_NEAR_JABU_POT_3, "RAND_INF_ZF_NEAR_JABU_POT_3" },
-        { RAND_INF_ZF_NEAR_JABU_POT_4, "RAND_INF_ZF_NEAR_JABU_POT_4" },
-        { RAND_INF_LLR_FRONT_POT_1, "RAND_INF_LLR_FRONT_POT_1" },
-        { RAND_INF_LLR_FRONT_POT_2, "RAND_INF_LLR_FRONT_POT_2" },
-        { RAND_INF_LLR_FRONT_POT_3, "RAND_INF_LLR_FRONT_POT_3" },
-        { RAND_INF_LLR_FRONT_POT_4, "RAND_INF_LLR_FRONT_POT_4" },
-        { RAND_INF_LLR_RAIN_SHED_POT_1, "RAND_INF_LLR_RAIN_SHED_POT_1" },
-        { RAND_INF_LLR_RAIN_SHED_POT_2, "RAND_INF_LLR_RAIN_SHED_POT_2" },
-        { RAND_INF_LLR_RAIN_SHED_POT_3, "RAND_INF_LLR_RAIN_SHED_POT_3" },
-        { RAND_INF_LLR_TALONS_HOUSE_POT_1, "RAND_INF_LLR_TALONS_HOUSE_POT_1" },
-        { RAND_INF_LLR_TALONS_HOUSE_POT_2, "RAND_INF_LLR_TALONS_HOUSE_POT_2" },
-        { RAND_INF_LLR_TALONS_HOUSE_POT_3, "RAND_INF_LLR_TALONS_HOUSE_POT_3" },
-        { RAND_INF_HF_COW_GROTTO_POT_1, "RAND_INF_HF_COW_GROTTO_POT_1" },
-        { RAND_INF_HF_COW_GROTTO_POT_2, "RAND_INF_HF_COW_GROTTO_POT_2" },
-        { RAND_INF_HC_STORMS_GROTTO_POT_1, "RAND_INF_HC_STORMS_GROTTO_POT_1" },
-        { RAND_INF_HC_STORMS_GROTTO_POT_2, "RAND_INF_HC_STORMS_GROTTO_POT_2" },
-        { RAND_INF_HC_STORMS_GROTTO_POT_3, "RAND_INF_HC_STORMS_GROTTO_POT_3" },
-        { RAND_INF_HC_STORMS_GROTTO_POT_4, "RAND_INF_HC_STORMS_GROTTO_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1, "RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2, "RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3, "RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4, "RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5" },
-        { RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6, "RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6" },
-        { RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3, "RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4, "RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1, "RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2, "RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3, "RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4, "RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1, "RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2, "RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_BLADE_POT_1, "RAND_INF_DODONGOS_CAVERN_BLADE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_BLADE_POT_2, "RAND_INF_DODONGOS_CAVERN_BLADE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1, "RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2, "RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3, "RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4, "RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4" },
-        { RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1, "RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2, "RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3, "RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5" },
-        { RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6, "RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6" },
-        { RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1, "RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2, "RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3, "RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3" },
-        { RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1, "RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2, "RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3, "RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3" },
-        { RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4, "RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4" },
-        { RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5, "RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_1, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_2, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_3, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_4, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_4" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_5, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_5" },
-        { RAND_INF_FOREST_TEMPLE_LOBBY_POT_6, "RAND_INF_FOREST_TEMPLE_LOBBY_POT_6" },
-        { RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1, "RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2, "RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1, "RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2, "RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1, "RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2, "RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3, "RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4, "RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4" },
-        { RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1, "RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2, "RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3, "RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1, "RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2, "RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1, "RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2, "RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3, "RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4, "RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4" },
-        { RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1, "RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2, "RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3, "RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4, "RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4" },
-        { RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1, "RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2, "RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1, "RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2, "RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2" },
-        { RAND_INF_WATER_TEMPLE_TORCH_POT_1, "RAND_INF_WATER_TEMPLE_TORCH_POT_1" },
-        { RAND_INF_WATER_TEMPLE_TORCH_POT_2, "RAND_INF_WATER_TEMPLE_TORCH_POT_2" },
-        { RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1, "RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1" },
-        { RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2, "RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2" },
-        { RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3, "RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3" },
-        { RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1, "RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1" },
-        { RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2, "RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2" },
-        { RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1" },
-        { RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2" },
-        { RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3" },
-        { RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4" },
-        { RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, "RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1" },
-        { RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, "RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2" },
-        { RAND_INF_WATER_TEMPLE_RIVER_POT_1, "RAND_INF_WATER_TEMPLE_RIVER_POT_1" },
-        { RAND_INF_WATER_TEMPLE_RIVER_POT_2, "RAND_INF_WATER_TEMPLE_RIVER_POT_2" },
-        { RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1, "RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1" },
-        { RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2, "RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2" },
-        { RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1, "RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1" },
-        { RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2, "RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1, "RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3" },
-        { RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4" },
-        { RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5" },
-        { RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1, "RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2, "RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1, "RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2, "RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3, "RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3" },
-        { RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4, "RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1, "RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2, "RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1, "RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1, "RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2, "RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1, "RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2, "RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3, "RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4, "RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1, "RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2, "RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1, "RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2, "RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3, "RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4, "RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1, "RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1, "RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2, "RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5" },
-        { RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6, "RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6" },
-        { RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1, "RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4" },
-        { RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1, "RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1" },
-        { RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17" },
-        { RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18, "RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2, "RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3, "RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2, "RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT, "RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT" },
-        { RAND_INF_ICE_CAVERN_HALL_POT_1, "RAND_INF_ICE_CAVERN_HALL_POT_1" },
-        { RAND_INF_ICE_CAVERN_HALL_POT_2, "RAND_INF_ICE_CAVERN_HALL_POT_2" },
-        { RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1, "RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1" },
-        { RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2, "RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2" },
-        { RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3, "RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3" },
-        { RAND_INF_ICE_CAVERN_NEAR_END_POT_1, "RAND_INF_ICE_CAVERN_NEAR_END_POT_1" },
-        { RAND_INF_ICE_CAVERN_NEAR_END_POT_2, "RAND_INF_ICE_CAVERN_NEAR_END_POT_2" },
-        { RAND_INF_ICE_CAVERN_FROZEN_POT_1, "RAND_INF_ICE_CAVERN_FROZEN_POT_1" },
-
-        { RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3, "RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4, "RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3, "RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3, "RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3" },
-        { RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4, "RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3, "RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4, "RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3, "RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4, "RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3, "RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4, "RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3, "RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4, "RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3, "RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4, "RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3, "RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4, "RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT, "RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1, "RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2, "RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3, "RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3, "RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7" },
-        { RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8, "RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8" },
-        { RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT, "RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT" },
-        { RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1, "RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1" },
-        { RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2, "RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2" },
-        { RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1, "RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1" },
-        { RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2, "RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2" },
-        { RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3, "RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3" },
-        { RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4, "RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4" },
-        { RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1, "RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1" },
-        { RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2, "RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2" },
-        { RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1, "RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1" },
-        { RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2, "RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3, "RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4, "RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4, "RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3, "RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4, "RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5, "RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3, "RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4, "RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1, "RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2, "RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1, "RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2, "RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3, "RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3" },
-        { RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4, "RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4" },
-        { RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5, "RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5" },
-        { RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1, "RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2, "RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3, "RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3" },
-        { RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1, "RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2, "RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3, "RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3" },
-        { RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4, "RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4" },
-        { RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5, "RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5" },
-        { RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1, "RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2, "RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1, "RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2, "RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1, "RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2, "RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1, "RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2, "RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1, "RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2, "RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3, "RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1, "RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2, "RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1, "RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2, "RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3, "RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3" },
-        { RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4, "RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4" },
-        { RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT, "RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1, "RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2, "RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1, "RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2, "RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2" },
-        
-        { RAND_INF_CAUGHT_LOACH, "RAND_INF_CAUGHT_LOACH" },
-
-        { RAND_INF_CAN_SWIM, "RAND_INF_CAN_SWIM" },
-
-        { RAND_INF_HAS_WALLET, "RAND_INF_HAS_WALLET" },
-
-        { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT, "RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO, "RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO" },
-        { RAND_INF_BEEHIVE_SFM_STORMS_GROTTO, "RAND_INF_BEEHIVE_SFM_STORMS_GROTTO" },
-        { RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT, "RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT, "RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO, "RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO" },
-        { RAND_INF_BEEHIVE_LLR_GROTTO, "RAND_INF_BEEHIVE_LLR_GROTTO" },
-        { RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_DMT_COW_GROTTO, "RAND_INF_BEEHIVE_DMT_COW_GROTTO" },
-        { RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT, "RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT, "RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_GC_GROTTO, "RAND_INF_BEEHIVE_GC_GROTTO" },
-        { RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT, "RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT, "RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO, "RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO" },
-        { RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT, "RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT" },
-        { RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT, "RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT" },
-        { RAND_INF_BEEHIVE_ZR_STORMS_GROTTO, "RAND_INF_BEEHIVE_ZR_STORMS_GROTTO" },
-        { RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT, "RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT" },
-        { RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT, "RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT" },
-        { RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA, "RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA" },
-        { RAND_INF_BEEHIVE_LH_GROTTO, "RAND_INF_BEEHIVE_LH_GROTTO" },
-        { RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO, "RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO" },
-        { RAND_INF_BEEHIVE_COLOSSUS_GROTTO, "RAND_INF_BEEHIVE_COLOSSUS_GROTTO" },
-
-        { RAND_INF_CHILD_FISH_1, "RAND_INF_CHILD_FISH_1" },
-        { RAND_INF_CHILD_FISH_2, "RAND_INF_CHILD_FISH_2" },
-        { RAND_INF_CHILD_FISH_3, "RAND_INF_CHILD_FISH_3" },
-        { RAND_INF_CHILD_FISH_4, "RAND_INF_CHILD_FISH_4" },
-        { RAND_INF_CHILD_FISH_5, "RAND_INF_CHILD_FISH_5" },
-        { RAND_INF_CHILD_FISH_6, "RAND_INF_CHILD_FISH_6" },
-        { RAND_INF_CHILD_FISH_7, "RAND_INF_CHILD_FISH_7" },
-        { RAND_INF_CHILD_FISH_8, "RAND_INF_CHILD_FISH_8" },
-        { RAND_INF_CHILD_FISH_9, "RAND_INF_CHILD_FISH_9" },
-        { RAND_INF_CHILD_FISH_10, "RAND_INF_CHILD_FISH_10" },
-        { RAND_INF_CHILD_FISH_11, "RAND_INF_CHILD_FISH_11" },
-        { RAND_INF_CHILD_FISH_12, "RAND_INF_CHILD_FISH_12" },
-        { RAND_INF_CHILD_FISH_13, "RAND_INF_CHILD_FISH_13" },
-        { RAND_INF_CHILD_FISH_14, "RAND_INF_CHILD_FISH_14" },
-        { RAND_INF_CHILD_FISH_15, "RAND_INF_CHILD_FISH_15" },
-        { RAND_INF_CHILD_LOACH_1, "RAND_INF_CHILD_LOACH_1" },
-        { RAND_INF_CHILD_LOACH_2, "RAND_INF_CHILD_LOACH_2" },
-        { RAND_INF_ADULT_FISH_1, "RAND_INF_ADULT_FISH_1" },
-        { RAND_INF_ADULT_FISH_2, "RAND_INF_ADULT_FISH_2" },
-        { RAND_INF_ADULT_FISH_3, "RAND_INF_ADULT_FISH_3" },
-        { RAND_INF_ADULT_FISH_4, "RAND_INF_ADULT_FISH_4" },
-        { RAND_INF_ADULT_FISH_5, "RAND_INF_ADULT_FISH_5" },
-        { RAND_INF_ADULT_FISH_6, "RAND_INF_ADULT_FISH_6" },
-        { RAND_INF_ADULT_FISH_7, "RAND_INF_ADULT_FISH_7" },
-        { RAND_INF_ADULT_FISH_8, "RAND_INF_ADULT_FISH_8" },
-        { RAND_INF_ADULT_FISH_9, "RAND_INF_ADULT_FISH_9" },
-        { RAND_INF_ADULT_FISH_10, "RAND_INF_ADULT_FISH_10" },
-        { RAND_INF_ADULT_FISH_11, "RAND_INF_ADULT_FISH_11" },
-        { RAND_INF_ADULT_FISH_12, "RAND_INF_ADULT_FISH_12" },
-        { RAND_INF_ADULT_FISH_13, "RAND_INF_ADULT_FISH_13" },
-        { RAND_INF_ADULT_FISH_14, "RAND_INF_ADULT_FISH_14" },
-        { RAND_INF_ADULT_FISH_15, "RAND_INF_ADULT_FISH_15" },
-        { RAND_INF_ADULT_LOACH, "RAND_INF_ADULT_LOACH" },
-        { RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO" },
-        { RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO, "RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO" },
-        { RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO, "RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO" },
-        { RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO" },
-        { RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO, "RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO" },
-        { RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO, "RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO" },
-        { RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO, "RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO" },
-        { RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO, "RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO" },
-        { RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO, "RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO" },
-        { RAND_INF_FISHING_POLE_FOUND, "RAND_INF_FISHING_POLE_FOUND" },
-        { RAND_INF_ZD_FISH_1, "RAND_INF_ZD_FISH_1" },
-        { RAND_INF_ZD_FISH_2, "RAND_INF_ZD_FISH_2" },
-        { RAND_INF_ZD_FISH_3, "RAND_INF_ZD_FISH_3" },
-        { RAND_INF_ZD_FISH_4, "RAND_INF_ZD_FISH_4" },
-        { RAND_INF_ZD_FISH_5, "RAND_INF_ZD_FISH_5" },
-
-        { RAND_INF_HAS_INFINITE_QUIVER, "RAND_INF_HAS_INFINITE_QUIVER" },
-        { RAND_INF_HAS_INFINITE_BOMB_BAG, "RAND_INF_HAS_INFINITE_BOMB_BAG" },
-        { RAND_INF_HAS_INFINITE_BULLET_BAG, "RAND_INF_HAS_INFINITE_BULLET_BAG" },
-        { RAND_INF_HAS_INFINITE_STICK_UPGRADE, "RAND_INF_HAS_INFINITE_STICK_UPGRADE" },
-        { RAND_INF_HAS_INFINITE_NUT_UPGRADE, "RAND_INF_HAS_INFINITE_NUT_UPGRADE" },
-        { RAND_INF_HAS_INFINITE_MAGIC_METER, "RAND_INF_HAS_INFINITE_MAGIC_METER" },
-        { RAND_INF_HAS_INFINITE_BOMBCHUS, "RAND_INF_HAS_INFINITE_BOMBCHUS" },
-        { RAND_INF_HAS_INFINITE_MONEY, "RAND_INF_HAS_INFINITE_MONEY" },
-
-        { RAND_INF_HAS_SKELETON_KEY, "RAND_INF_HAS_SKELETON_KEY" },
-
-        { RAND_INF_LINKS_POCKET, "RAND_INF_LINKS_POCKET" },
-        { RAND_INF_LEARNED_EPONA_SONG, "RAND_INF_LEARNED_EPONA_SONG" },
-        { RAND_INF_DARUNIAS_JOY, "RAND_INF_DARUNIAS_JOY" },
-        { RAND_INF_KING_ZORA_THAWED, "RAND_INF_KING_ZORA_THAWED" },
-
-        { RAND_INF_HC_GREAT_FAIRY_REWARD, "RAND_INF_HC_GREAT_FAIRY_REWARD" },
-        { RAND_INF_DMT_GREAT_FAIRY_REWARD, "RAND_INF_DMT_GREAT_FAIRY_REWARD" },
-        { RAND_INF_DMC_GREAT_FAIRY_REWARD, "RAND_INF_DMC_GREAT_FAIRY_REWARD" },
-        { RAND_INF_ZF_GREAT_FAIRY_REWARD, "RAND_INF_ZF_GREAT_FAIRY_REWARD" },
-        { RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD, "RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD" },
-        { RAND_INF_OGC_GREAT_FAIRY_REWARD, "RAND_INF_OGC_GREAT_FAIRY_REWARD" },
-
-        { RAND_INF_KF_SOUTH_GRASS_WEST_RUPEE, "RAND_INF_KF_SOUTH_GRASS_WEST_RUPEE" },
-        { RAND_INF_KF_NORTH_GRASS_WEST_RUPEE, "RAND_INF_KF_NORTH_GRASS_WEST_RUPEE" },
-        { RAND_INF_KF_NORTH_GRASS_EAST_RUPEE, "RAND_INF_KF_NORTH_GRASS_EAST_RUPEE" },
-        { RAND_INF_KF_SOUTH_GRASS_EAST_RUPEE, "RAND_INF_KF_SOUTH_GRASS_EAST_RUPEE" },
-        { RAND_INF_KF_SARIAS_TOP_LEFT_HEART, "RAND_INF_KF_SARIAS_TOP_LEFT_HEART" },
-        { RAND_INF_KF_SARIAS_TOP_RIGHT_HEART, "RAND_INF_KF_SARIAS_TOP_RIGHT_HEART" },
-        { RAND_INF_KF_SARIAS_BOTTOM_LEFT_HEART, "RAND_INF_KF_SARIAS_BOTTOM_LEFT_HEART" },
-        { RAND_INF_KF_SARIAS_BOTTOM_RIGHT_HEART, "RAND_INF_KF_SARIAS_BOTTOM_RIGHT_HEART" },
-        { RAND_INF_KF_BEAN_RUPEE_1, "RAND_INF_KF_BEAN_RUPEE_1" },
-        { RAND_INF_KF_BEAN_RUPEE_2, "RAND_INF_KF_BEAN_RUPEE_2" },
-        { RAND_INF_KF_BEAN_RUPEE_3, "RAND_INF_KF_BEAN_RUPEE_3" },
-        { RAND_INF_KF_BEAN_RUPEE_4, "RAND_INF_KF_BEAN_RUPEE_4" },
-        { RAND_INF_KF_BEAN_RUPEE_5, "RAND_INF_KF_BEAN_RUPEE_5" },
-        { RAND_INF_KF_BEAN_RUPEE_6, "RAND_INF_KF_BEAN_RUPEE_6" },
-        { RAND_INF_KF_BEAN_RED_RUPEE, "RAND_INF_KF_BEAN_RED_RUPEE" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_1, "RAND_INF_LW_SHORTCUT_RUPEE_1" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_2, "RAND_INF_LW_SHORTCUT_RUPEE_2" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_3, "RAND_INF_LW_SHORTCUT_RUPEE_3" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_4, "RAND_INF_LW_SHORTCUT_RUPEE_4" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_5, "RAND_INF_LW_SHORTCUT_RUPEE_5" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_6, "RAND_INF_LW_SHORTCUT_RUPEE_6" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_7, "RAND_INF_LW_SHORTCUT_RUPEE_7" },
-        { RAND_INF_LW_SHORTCUT_RUPEE_8, "RAND_INF_LW_SHORTCUT_RUPEE_8" },
-        { RAND_INF_LH_FRONT_RUPEE, "RAND_INF_LH_FRONT_RUPEE" },
-        { RAND_INF_LH_MIDDLE_RUPEE, "RAND_INF_LH_MIDDLE_RUPEE" },
-        { RAND_INF_LH_BACK_RUPEE, "RAND_INF_LH_BACK_RUPEE" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_1, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_1" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_2, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_2" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_3, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_3" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_4, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_4" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_5, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_5" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_6, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_6" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_7, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_7" },
-        { RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_8, "RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_8" },
-        { RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_BLUE_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_BLUE_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_BACK_BLUE_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_BACK_BLUE_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_BLUE_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_BLUE_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_GREEN_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_GREEN_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_GREEN_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_GREEN_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_BACK_LEFT_GREEN_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_BACK_LEFT_GREEN_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_BACK_RIGHT_GREEN_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_BACK_RIGHT_GREEN_RUPEE" },
-        { RAND_INF_GV_OCTOROK_GROTTO_RED_RUPEE, "RAND_INF_GV_OCTOROK_GROTTO_RED_RUPEE" },
-        { RAND_INF_DMT_BLUE_RUPEE, "RAND_INF_DMT_BLUE_RUPEE" },
-        { RAND_INF_DMT_COW_GROTTO_LEFT_HEART, "RAND_INF_DMT_COW_GROTTO_LEFT_HEART" },
-        { RAND_INF_DMT_COW_GROTTO_MIDDLE_LEFT_HEART, "RAND_INF_DMT_COW_GROTTO_MIDDLE_LEFT_HEART" },
-        { RAND_INF_DMT_COW_GROTTO_MIDDLE_RIGHT_HEART, "RAND_INF_DMT_COW_GROTTO_MIDDLE_RIGHT_HEART" },
-        { RAND_INF_DMT_COW_GROTTO_RIGHT_HEART, "RAND_INF_DMT_COW_GROTTO_RIGHT_HEART" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_1, "RAND_INF_DMT_COW_GROTTO_RUPEE_1" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_2, "RAND_INF_DMT_COW_GROTTO_RUPEE_2" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_3, "RAND_INF_DMT_COW_GROTTO_RUPEE_3" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_4, "RAND_INF_DMT_COW_GROTTO_RUPEE_4" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_5, "RAND_INF_DMT_COW_GROTTO_RUPEE_5" },
-        { RAND_INF_DMT_COW_GROTTO_RUPEE_6, "RAND_INF_DMT_COW_GROTTO_RUPEE_6" },
-        { RAND_INF_DMT_COW_GROTTO_RED_RUPEE, "RAND_INF_DMT_COW_GROTTO_RED_RUPEE" },
-        { RAND_INF_DMC_NEAR_PLATFORM_RED_RUPEE, "RAND_INF_DMC_NEAR_PLATFORM_RED_RUPEE" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_RED_RUPEE, "RAND_INF_DMC_MIDDLE_PLATFORM_RED_RUPEE" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_1, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_1" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_2, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_2" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_3, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_3" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_4, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_4" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_5, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_5" },
-        { RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_6, "RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_6" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_1, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_1" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_2, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_2" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_3, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_3" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_4, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_4" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_5, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_5" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_6, "RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_6" },
-        { RAND_INF_DMC_DISTANT_PLATFORM_RED_RUPEE, "RAND_INF_DMC_DISTANT_PLATFORM_RED_RUPEE" },
-        { RAND_INF_ZR_BENEATH_WATERFALL_LEFT_RUPEE, "RAND_INF_ZR_BENEATH_WATERFALL_LEFT_RUPEE" },
-        { RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_LEFT_RUPEE, "RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_LEFT_RUPEE" },
-        { RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_RIGHT_RUPEE, "RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_RIGHT_RUPEE" },
-        { RAND_INF_ZR_BENEATH_WATERFALL_RIGHT_RUPEE, "RAND_INF_ZR_BENEATH_WATERFALL_RIGHT_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTH_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTH_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHEAST_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHEAST_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHEAST_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHEAST_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTH_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTH_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHWEST_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHWEST_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHWEST_INNER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHWEST_INNER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTH_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_NORTH_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHEAST_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHEAST_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHEAST_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHEAST_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTH_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTH_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHWEST_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHWEST_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHWEST_MIDDLE_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHWEST_MIDDLE_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTH_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTH_OUTER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHEAST_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHEAST_OUTER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHEAST_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHEAST_OUTER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTH_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTH_OUTER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_SOUTHWEST_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_SOUTHWEST_OUTER_RUPEE" },
-        { RAND_INF_ZF_BOTTOM_NORTHWEST_OUTER_RUPEE, "RAND_INF_ZF_BOTTOM_NORTHWEST_OUTER_RUPEE" },
-        { RAND_INF_DEKU_TREE_LOBBY_LOWER_HEART, "RAND_INF_DEKU_TREE_LOBBY_LOWER_HEART" },
-        { RAND_INF_DEKU_TREE_LOBBY_UPPER_HEART, "RAND_INF_DEKU_TREE_LOBBY_UPPER_HEART" },
-        { RAND_INF_DEKU_TREE_BEFORE_BOSS_LEFT_HEART, "RAND_INF_DEKU_TREE_BEFORE_BOSS_LEFT_HEART" },
-        { RAND_INF_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART, "RAND_INF_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART" },
-        { RAND_INF_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART, "RAND_INF_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART" },
-        { RAND_INF_DODONGOS_CAVERN_BLADE_ROOM_HEART, "RAND_INF_DODONGOS_CAVERN_BLADE_ROOM_HEART" },
-        { RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_LEFT_HEART, "RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_LEFT_HEART" },
-        { RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_RIGHT_HEART, "RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_RIGHT_HEART" },
-        { RAND_INF_FOREST_TEMPLE_COURTYARD_RIGHT_HEART, "RAND_INF_FOREST_TEMPLE_COURTYARD_RIGHT_HEART" },
-        { RAND_INF_FOREST_TEMPLE_COURTYARD_LEFT_HEART, "RAND_INF_FOREST_TEMPLE_COURTYARD_LEFT_HEART" },
-        { RAND_INF_FOREST_TEMPLE_WELL_WEST_HEART, "RAND_INF_FOREST_TEMPLE_WELL_WEST_HEART" },
-        { RAND_INF_FOREST_TEMPLE_WELL_EAST_HEART, "RAND_INF_FOREST_TEMPLE_WELL_EAST_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_LEFT_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_LEFT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_RIGHT_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_RIGHT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_BACK_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_BACK_HEART" },
-        { RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_LEFT_HEART, "RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_LEFT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_RIGHT_HEART, "RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_RIGHT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_MIDDLE_HEART, "RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_MIDDLE_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_WALL_EAST_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_WALL_EAST_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_WALL_WEST_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_WALL_WEST_HEART" },
-        { RAND_INF_FIRE_TEMPLE_FIRE_WALL_EXIT_HEART, "RAND_INF_FIRE_TEMPLE_FIRE_WALL_EXIT_HEART" },
-        { RAND_INF_WATER_TEMPLE_RIVER_HEART_1, "RAND_INF_WATER_TEMPLE_RIVER_HEART_1" },
-        { RAND_INF_WATER_TEMPLE_RIVER_HEART_2, "RAND_INF_WATER_TEMPLE_RIVER_HEART_2" },
-        { RAND_INF_WATER_TEMPLE_RIVER_HEART_3, "RAND_INF_WATER_TEMPLE_RIVER_HEART_3" },
-        { RAND_INF_WATER_TEMPLE_RIVER_HEART_4, "RAND_INF_WATER_TEMPLE_RIVER_HEART_4" },
-        { RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_LEFT_HEART, "RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_LEFT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_RIGHT_HEART, "RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_RIGHT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_SCARECROW_NORTH_HEART, "RAND_INF_SHADOW_TEMPLE_SCARECROW_NORTH_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_SCARECROW_SOUTH_HEART, "RAND_INF_SHADOW_TEMPLE_SCARECROW_SOUTH_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_LEFT_HEART, "RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_LEFT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_RIGHT_HEART, "RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_RIGHT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_LOWER_HEART, "RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_LOWER_HEART" },
-        { RAND_INF_ICE_CAVERN_LOBBY_RUPEE, "RAND_INF_ICE_CAVERN_LOBBY_RUPEE" },
-        { RAND_INF_ICE_CAVERN_MAP_ROOM_LEFT_HEART, "RAND_INF_ICE_CAVERN_MAP_ROOM_LEFT_HEART" },
-        { RAND_INF_ICE_CAVERN_MAP_ROOM_MIDDLE_HEART, "RAND_INF_ICE_CAVERN_MAP_ROOM_MIDDLE_HEART" },
-        { RAND_INF_ICE_CAVERN_MAP_ROOM_RIGHT_HEART, "RAND_INF_ICE_CAVERN_MAP_ROOM_RIGHT_HEART" },
-        { RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1, "RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1" },
-        { RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2, "RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2" },
-        { RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3, "RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_MIDDLE_RIGHT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_MIDDLE_RIGHT_HEART" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_SOUTH_HEART, "RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_SOUTH_HEART" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_EAST_HEART, "RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_EAST_HEART" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_1, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_1" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_2, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_2" },
-        { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_3, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_3" },
-        { RAND_INF_GANONS_CASTLE_FIRE_TRIAL_HEART, "RAND_INF_GANONS_CASTLE_FIRE_TRIAL_HEART" },
-        { RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_HEART, "RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_COMPASS_ROOM_HEART, "RAND_INF_DEKU_TREE_MQ_COMPASS_ROOM_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_DEKU_BABA_HEART, "RAND_INF_DEKU_TREE_MQ_DEKU_BABA_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_LOBBY_HEART, "RAND_INF_DEKU_TREE_MQ_LOBBY_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_HEART, "RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_LEFT_HEART, "RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_LEFT_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_MIDDLE_HEART, "RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_MIDDLE_HEART" },
-        { RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_RIGHT_HEART, "RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_RIGHT_HEART" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_HEART, "RAND_INF_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_HEART" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_1, "RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_1" },
-        { RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_2, "RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_2" },
-        { RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_RIGHT_HEART, "RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_RIGHT_HEART" },
-        { RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_MIDDLE_HEART, "RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_MIDDLE_HEART" },
-        { RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_LEFT_HEART, "RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_LEFT_HEART" },
-        { RAND_INF_FOREST_TEMPLE_WELL_MQ_WEST_HEART, "RAND_INF_FOREST_TEMPLE_WELL_MQ_WEST_HEART" },
-        { RAND_INF_FOREST_TEMPLE_WELL_MQ_MIDDLE_HEART, "RAND_INF_FOREST_TEMPLE_WELL_MQ_MIDDLE_HEART" },
-        { RAND_INF_FOREST_TEMPLE_WELL_MQ_EAST_HEART, "RAND_INF_FOREST_TEMPLE_WELL_MQ_EAST_HEART" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LEFT_HEART, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LEFT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_RIGHT_HEART, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_RIGHT_HEART" },
-        { RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LOWER_HEART, "RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LOWER_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_LEFT_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_LEFT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_RIGHT_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_RIGHT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_NORTH_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_NORTH_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_SOUTH_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_SOUTH_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_LEFT_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_LEFT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_RIGHT_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_RIGHT_HEART" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_LOWER_HEART, "RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_LOWER_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_FRONT_RIGHT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_FRONT_RIGHT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_LEFT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_LEFT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_RIGHT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_RIGHT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_MIDDLE_LEFT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_MIDDLE_LEFT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_FRONT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_FRONT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_LEFT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_LEFT_HEART" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_RIGHT_HEART, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_RIGHT_HEART" },
-        { RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_HEART, "RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_HEART" },
-        { RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART, "RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART" },
-        { RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART, "RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART" },
-
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7" },
-        { RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8, "RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7" },
-        { RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8, "RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_1, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_1" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_2, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_2" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_3, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_3" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_4, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_4" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_5, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_5" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_6, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_6" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_7, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_7" },
-        { RAND_INF_HF_FAIRY_GROTTO_FAIRY_8, "RAND_INF_HF_FAIRY_GROTTO_FAIRY_8" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7" },
-        { RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8, "RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_1, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_1" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_2, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_2" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_3, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_3" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_4, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_4" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_5, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_5" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_6, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_6" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_7, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_7" },
-        { RAND_INF_GF_FAIRY_GROTTO_FAIRY_8, "RAND_INF_GF_FAIRY_GROTTO_FAIRY_8" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7" },
-        { RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8, "RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7" },
-        { RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8, "RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7" },
-        { RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8, "RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_1, "RAND_INF_COLOSSUS_OASIS_FAIRY_1" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_2, "RAND_INF_COLOSSUS_OASIS_FAIRY_2" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_3, "RAND_INF_COLOSSUS_OASIS_FAIRY_3" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_4, "RAND_INF_COLOSSUS_OASIS_FAIRY_4" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_5, "RAND_INF_COLOSSUS_OASIS_FAIRY_5" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_6, "RAND_INF_COLOSSUS_OASIS_FAIRY_6" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_7, "RAND_INF_COLOSSUS_OASIS_FAIRY_7" },
-        { RAND_INF_COLOSSUS_OASIS_FAIRY_8, "RAND_INF_COLOSSUS_OASIS_FAIRY_8" },
-
-        { RAND_INF_ZR_BEAN_SPROUT_FAIRY_1, "RAND_INF_ZR_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_ZR_BEAN_SPROUT_FAIRY_2, "RAND_INF_ZR_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_ZR_BEAN_SPROUT_FAIRY_3, "RAND_INF_ZR_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_KF_BEAN_SPROUT_FAIRY_1, "RAND_INF_KF_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_KF_BEAN_SPROUT_FAIRY_2, "RAND_INF_KF_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_KF_BEAN_SPROUT_FAIRY_3, "RAND_INF_KF_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1, "RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2, "RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3, "RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1, "RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2, "RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2" },
-        { RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3, "RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3" },
-        { RAND_INF_LH_BEAN_SPROUT_FAIRY_1, "RAND_INF_LH_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_LH_BEAN_SPROUT_FAIRY_2, "RAND_INF_LH_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_LH_BEAN_SPROUT_FAIRY_3, "RAND_INF_LH_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_GV_BEAN_SPROUT_FAIRY_1, "RAND_INF_GV_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_GV_BEAN_SPROUT_FAIRY_2, "RAND_INF_GV_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_GV_BEAN_SPROUT_FAIRY_3, "RAND_INF_GV_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1, "RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2, "RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3, "RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1, "RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2, "RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3, "RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_DMC_BEAN_SPROUT_FAIRY_1, "RAND_INF_DMC_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_DMC_BEAN_SPROUT_FAIRY_2, "RAND_INF_DMC_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_DMC_BEAN_SPROUT_FAIRY_3, "RAND_INF_DMC_BEAN_SPROUT_FAIRY_3" },
-        { RAND_INF_DMT_BEAN_SPROUT_FAIRY_1, "RAND_INF_DMT_BEAN_SPROUT_FAIRY_1" },
-        { RAND_INF_DMT_BEAN_SPROUT_FAIRY_2, "RAND_INF_DMT_BEAN_SPROUT_FAIRY_2" },
-        { RAND_INF_DMT_BEAN_SPROUT_FAIRY_3, "RAND_INF_DMT_BEAN_SPROUT_FAIRY_3" },
-
-        { RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY, "RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY, "RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY, "RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY, "RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DMC_GOSSIP_STONE_FAIRY, "RAND_INF_DMC_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DMT_GOSSIP_STONE_FAIRY, "RAND_INF_DMT_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY, "RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY, "RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY, "RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_GV_GOSSIP_STONE_FAIRY, "RAND_INF_GV_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY, "RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY, "RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY, "RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY, "RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY, "RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY, "RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY, "RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_KF_GOSSIP_STONE_FAIRY, "RAND_INF_KF_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY, "RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY, "RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY, "RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_LW_GOSSIP_STONE_FAIRY, "RAND_INF_LW_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY, "RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY, "RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY, "RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZD_GOSSIP_STONE_FAIRY, "RAND_INF_ZD_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY, "RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY, "RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY, "RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY, "RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        { RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY, "RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY" },
-        { RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG, "RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG" },
-        
-        { RAND_INF_LH_ISLAND_SUN_FAIRY, "RAND_INF_LH_ISLAND_SUN_FAIRY" },
-        { RAND_INF_HF_POND_STORMS_FAIRY, "RAND_INF_HF_POND_STORMS_FAIRY" },
-        { RAND_INF_DMT_FLAG_SUN_FAIRY, "RAND_INF_DMT_FLAG_SUN_FAIRY" },
-        { RAND_INF_LW_SHORTCUT_STORMS_FAIRY, "RAND_INF_LW_SHORTCUT_STORMS_FAIRY" },
-        { RAND_INF_GF_KITCHEN_SUN_FAIRY, "RAND_INF_GF_KITCHEN_SUN_FAIRY" },
-        { RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY, "RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY" },
-        { RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY, "RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY, "RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY, "RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY, "RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY, "RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY" },
-        { RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY, "RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY" },
-        { RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY, "RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY" },
-        { RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY, "RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY, "RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY" },
-        { RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY, "RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY" },
-        { RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY, "RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY" },
-        { RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY, "RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY" },
-        { RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY, "RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY" },
-        { RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY, "RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY, "RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY, "RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY" },
-        { RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY, "RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY" },
-        { RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY, "RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY" },
-
-        { RAND_INF_GUARD_HOUSE_UNLOCKED, "RAND_INF_GUARD_HOUSE_UNLOCKED" },
-        { RAND_INF_GUARD_HOUSE_KEY_OBTAINED, "RAND_INF_GUARD_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_MARKET_BAZAAR_UNLOCKED, "RAND_INF_MARKET_BAZAAR_UNLOCKED" },
-        { RAND_INF_MARKET_BAZAAR_KEY_OBTAINED, "RAND_INF_MARKET_BAZAAR_KEY_OBTAINED" },
-        { RAND_INF_MARKET_POTION_SHOP_UNLOCKED, "RAND_INF_MARKET_POTION_SHOP_UNLOCKED" },
-        { RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED, "RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED" },
-        { RAND_INF_MASK_SHOP_UNLOCKED, "RAND_INF_MASK_SHOP_UNLOCKED" },
-        { RAND_INF_MASK_SHOP_KEY_OBTAINED, "RAND_INF_MASK_SHOP_KEY_OBTAINED" },
-        { RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED, "RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED" },
-        { RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED, "RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED" },
-        { RAND_INF_BOMBCHU_BOWLING_UNLOCKED, "RAND_INF_BOMBCHU_BOWLING_UNLOCKED" },
-        { RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED, "RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED" },
-        { RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED, "RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED" },
-        { RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED, "RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED" },
-        { RAND_INF_BOMBCHU_SHOP_UNLOCKED, "RAND_INF_BOMBCHU_SHOP_UNLOCKED" },
-        { RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED, "RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED" },
-        { RAND_INF_RICHARDS_HOUSE_UNLOCKED, "RAND_INF_RICHARDS_HOUSE_UNLOCKED" },
-        { RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED, "RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_ALLEY_HOUSE_UNLOCKED, "RAND_INF_ALLEY_HOUSE_UNLOCKED" },
-        { RAND_INF_ALLEY_HOUSE_KEY_OBTAINED, "RAND_INF_ALLEY_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_KAK_BAZAAR_UNLOCKED, "RAND_INF_KAK_BAZAAR_UNLOCKED" },
-        { RAND_INF_KAK_BAZAAR_KEY_OBTAINED, "RAND_INF_KAK_BAZAAR_KEY_OBTAINED" },
-        { RAND_INF_KAK_POTION_SHOP_UNLOCKED, "RAND_INF_KAK_POTION_SHOP_UNLOCKED" },
-        { RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED, "RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED" },
-        { RAND_INF_BOSS_HOUSE_UNLOCKED, "RAND_INF_BOSS_HOUSE_UNLOCKED" },
-        { RAND_INF_BOSS_HOUSE_KEY_OBTAINED, "RAND_INF_BOSS_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED, "RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED" },
-        { RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED, "RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED" },
-        { RAND_INF_SKULLTULA_HOUSE_UNLOCKED, "RAND_INF_SKULLTULA_HOUSE_UNLOCKED" },
-        { RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED, "RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_IMPAS_HOUSE_UNLOCKED, "RAND_INF_IMPAS_HOUSE_UNLOCKED" },
-        { RAND_INF_IMPAS_HOUSE_KEY_OBTAINED, "RAND_INF_IMPAS_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_WINDMILL_UNLOCKED, "RAND_INF_WINDMILL_UNLOCKED" },
-        { RAND_INF_WINDMILL_KEY_OBTAINED, "RAND_INF_WINDMILL_KEY_OBTAINED" },
-        { RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED, "RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED" },
-        { RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED, "RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED" },
-        { RAND_INF_DAMPES_HUT_UNLOCKED, "RAND_INF_DAMPES_HUT_UNLOCKED" },
-        { RAND_INF_DAMPES_HUT_KEY_OBTAINED, "RAND_INF_DAMPES_HUT_KEY_OBTAINED" },
-        { RAND_INF_TALONS_HOUSE_UNLOCKED, "RAND_INF_TALONS_HOUSE_UNLOCKED" },
-        { RAND_INF_TALONS_HOUSE_KEY_OBTAINED, "RAND_INF_TALONS_HOUSE_KEY_OBTAINED" },
-        { RAND_INF_STABLES_UNLOCKED, "RAND_INF_STABLES_UNLOCKED" },
-        { RAND_INF_STABLES_KEY_OBTAINED, "RAND_INF_STABLES_KEY_OBTAINED" },
-        { RAND_INF_BACK_TOWER_UNLOCKED, "RAND_INF_BACK_TOWER_UNLOCKED" },
-        { RAND_INF_BACK_TOWER_KEY_OBTAINED, "RAND_INF_BACK_TOWER_KEY_OBTAINED" },
-        { RAND_INF_HYLIA_LAB_UNLOCKED, "RAND_INF_HYLIA_LAB_UNLOCKED" },
-        { RAND_INF_HYLIA_LAB_KEY_OBTAINED, "RAND_INF_HYLIA_LAB_KEY_OBTAINED" },
-        { RAND_INF_FISHING_HOLE_UNLOCKED, "RAND_INF_FISHING_HOLE_UNLOCKED" },
-        { RAND_INF_FISHING_HOLE_KEY_OBTAINED, "RAND_INF_FISHING_HOLE_KEY_OBTAINED" },
-
-        { RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG, "RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG" },
-        { RAND_INF_CHILD_TRADES_HAS_CHICKEN, "RAND_INF_CHILD_TRADES_HAS_CHICKEN" },
-        { RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA, "RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_KEATON, "RAND_INF_CHILD_TRADES_HAS_MASK_KEATON" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_SKULL, "RAND_INF_CHILD_TRADES_HAS_MASK_SKULL" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_SPOOKY, "RAND_INF_CHILD_TRADES_HAS_MASK_SPOOKY" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_BUNNY, "RAND_INF_CHILD_TRADES_HAS_MASK_BUNNY" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_GORON, "RAND_INF_CHILD_TRADES_HAS_MASK_GORON" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_ZORA, "RAND_INF_CHILD_TRADES_HAS_MASK_ZORA" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_GERUDO, "RAND_INF_CHILD_TRADES_HAS_MASK_GERUDO" },
-        { RAND_INF_CHILD_TRADES_HAS_MASK_TRUTH, "RAND_INF_CHILD_TRADES_HAS_MASK_TRUTH" },
-
-        { RAND_INF_ADULT_TRADES_HAS_POCKET_EGG, "RAND_INF_ADULT_TRADES_HAS_POCKET_EGG" },
-        { RAND_INF_ADULT_TRADES_HAS_POCKET_CUCCO, "RAND_INF_ADULT_TRADES_HAS_POCKET_CUCCO" },
-        { RAND_INF_ADULT_TRADES_HAS_COJIRO, "RAND_INF_ADULT_TRADES_HAS_COJIRO" },
-        { RAND_INF_ADULT_TRADES_HAS_ODD_MUSHROOM, "RAND_INF_ADULT_TRADES_HAS_ODD_MUSHROOM" },
-        { RAND_INF_ADULT_TRADES_HAS_ODD_POTION, "RAND_INF_ADULT_TRADES_HAS_ODD_POTION" },
-        { RAND_INF_ADULT_TRADES_HAS_SAW, "RAND_INF_ADULT_TRADES_HAS_SAW" },
-        { RAND_INF_ADULT_TRADES_HAS_SWORD_BROKEN, "RAND_INF_ADULT_TRADES_HAS_SWORD_BROKEN" },
-        { RAND_INF_ADULT_TRADES_HAS_PRESCRIPTION, "RAND_INF_ADULT_TRADES_HAS_PRESCRIPTION" },
-        { RAND_INF_ADULT_TRADES_HAS_FROG, "RAND_INF_ADULT_TRADES_HAS_FROG" },
-        { RAND_INF_ADULT_TRADES_HAS_EYEDROPS, "RAND_INF_ADULT_TRADES_HAS_EYEDROPS" },
-        { RAND_INF_ADULT_TRADES_HAS_CLAIM_CHECK, "RAND_INF_ADULT_TRADES_HAS_CLAIM_CHECK" },
-    } },
+    { "Event Check Inf Flags",
+      EVENT_CHECK_INF,
+      0x0D,
+      {
+          { 0x02, "First Spoke to Mido" },
+          { 0x03, "Complained About Mido to Saria" },
+          { 0x04, "Showed Mido Sword & Shield" },
+          { 0x05, "Deku Tree Opened Mouth" },
+          { 0x06, "Spoke to Saria After Deku Tree's Death" },
+          { 0x07, "Obtained Kokiri Emerald & Deku Tree Dead" },
+          { 0x09, "Used Deku Tree Blue Warp" },
+          { 0x0A, "Played Saria's Song for Mido as Adult" },
+          { 0x0C, "Met Deku Tree" },
+          { 0x0F, "Spoke to Mido about Saria's whereabouts" },
+          { 0x10, "Spoke to Child Malon at Castle or Market" },
+          { 0x11, "Spoke to Ingo at Ranch before Talon returns" },
+          { 0x12, "Obtained Pocket Egg" },
+          { 0x13, "Woke Talon" },
+          { 0x14, "Talon Fled Hyrule Castle" },
+          { 0x15, "Spoke to Child Malon at Ranch" },
+          { 0x16, "Invited to Sing With Child Malon" },
+          { 0x17, "Great Deku Tree is Dead" },
+          { 0x18, "Obtained Epona" },
+          { 0x19, "Obtained Kokiri's Emerald" },
+          { 0x1B, "Rented Horse From Ingo" },
+          { 0x1C, "Spoke to Mido After Deku Tree's Death" },
+          { 0x1D, "Destroyed the Royal Family's Tomb" },
+          { 0x1E, "Won the Cow in Malon's Race" },
+          { 0x23, "Bombed Dodongo's Cavern Entrance" },
+          { 0x25, "Used Dodongo's Cavern Blue Warp" },
+          { 0x2F, "Death Mountain Erupted" },
+          { 0x30, "Spoke to a Zora" },
+          { 0x31, "Obtained Ruto's Letter" },
+          { 0x33, "King Zora Moved Aside" },
+          { 0x37, "Used Jabu-Jabu Blue Warp" },
+          { 0x38, "Obtained Silver Scale" },
+          { 0x39, "Opened Entrance to Zora's Domain" },
+          { 0x3A, "Offered Fish to Jabu-Jabu" },
+          { 0x3B, "Began Nabooru Battle" },
+          { 0x3C, "Finished Nabooru Battle" },
+          { 0x40, "Obtained Zelda's Letter" },
+          { 0x43, "Obtained Ocarina of Time" },
+          { 0x45, "Pulled Master Sword from Pedestal" },
+          { 0x48, "Used Forest Temple Blue Warp" },
+          { 0x49, "Used Fire Temple Blue Warp" },
+          { 0x4A, "Used Water Temple Blue Warp" },
+          { 0x4B, "Opened the Door of Time" },
+          { 0x4D, "Rainbow Bridge Built by Sages" },
+          { 0x4E, "Caught by Hyrule Castle Guards" },
+          { 0x4F, "Entered the Master Sword Chamber" },
+          { 0x50, "Learned Minuet of Forest" },
+          { 0x51, "Learned Bolero of Fire" },
+          { 0x52, "Learned Serenade of Water" },
+          { 0x54, "Learned Nocturne of Shadow" },
+          { 0x55, "Sheik Moved From Sword Pedestal" },
+          { 0x57, "Learned Saria's Song" },
+          { 0x59, "Learned Zelda's Lullaby" },
+          { 0x5A, "Learned Sun's Song" },
+          { 0x5B, "Learned Song of Storms" },
+          { 0x65, "Played Song of Storms in Windmill" },
+          { 0x67, "Drained Well in Kakariko Village" },
+          { 0x68, "Played Gerudo Archery Minigame" },
+          { 0x69, "Restored Lake Hylia's Water" },
+          { 0x6A, "Woke Talon in Kakariko" },
+          { 0x6B, "Spoke to Talon After Saving Ranch" },
+          { 0x6F, "Spoke to Kaepora Gaebora by Lost Woods" },
+          { 0x70, "Began Gohma Battle" },
+          { 0x71, "Began King Dodongo Battle" },
+          { 0x72, "Began Phantom Ganon Battle" },
+          { 0x73, "Began Volvagia Battle" },
+          { 0x74, "Began Morpha Battle" },
+          { 0x75, "Began Twinrova Battle" },
+          { 0x76, "Began Barinade Battle" },
+          { 0x77, "Began Bongo Bongo Battle" },
+          { 0x78, "Began Ganondorf Battle" },
+          { 0x80, "Zelda Fled Hyrule Castle" },
+          { 0x82, "Bridge Unlocked (After Zelda Escape Cutscene)" },
+          { 0x8C, "Paid Back Keaton Mask Fee" },
+          { 0x8D, "Paid Back Skull Mask Fee" },
+          { 0x8E, "Paid Back Spooky Mask Fee" },
+          { 0x8F, "Paid Back Bunny Hood Fee" },
+          { 0x90, "Rescued Red Carpenter" },
+          { 0x91, "Rescued Yellow Carpenter" },
+          { 0x92, "Rescued Blue Carpenter" },
+          { 0x93, "Rescued Green Carpenter" },
+          { 0x94, "Spoke to Nabooru in Spirit Temple" },
+          { 0x95, "Nabooru Captured by Twinrova" },
+          { 0x96, "Spoke to Cursed Man in Skulltula House" },
+          { 0x9C, "Played Song for Scarecrow as Adult" },
+          { 0xA0, "Entered Hyrule Field" },
+          { 0xA1, "Entered Death Mountain Trail" },
+          { 0xA3, "Entered Kakariko Village" },
+          { 0xA4, "Entered Zora's Domain" },
+          { 0xA5, "Entered Hyrule Castle" },
+          { 0xA6, "Entered Goron City" },
+          { 0xA7, "Entered Temple of Time" },
+          { 0xA8, "Entered Deku Tree" },
+          { 0xA9, "Learned Song of Time" },
+          { 0xAA, "Bongo Bongo Escaped Well" },
+          { 0xAC, "Learned Requiem of Spirit" },
+          { 0xAD, "Completed Spirit Trial" },
+          { 0xB0, "Entered Dodongo's Cavern" },
+          { 0xB1, "Entered Lake Hylia" },
+          { 0xB2, "Entered Gerudo Valley" },
+          { 0xB3, "Entered Gerudo's Fortress" },
+          { 0xB4, "Entered Lon Lon Ranch" },
+          { 0xB5, "Entered Jabu-Jabu's Belly" },
+          { 0xB6, "Entered Graveyard" },
+          { 0xB7, "Entered Zora's Fountain" },
+          { 0xB8, "Entered Desert Colossus" },
+          { 0xB9, "Entered Death Mountain Crater" },
+          { 0xBA, "Entered Ganon's Castle (Exterior)" },
+          { 0xBB, "Completed Forest Trial" },
+          { 0xBC, "Completed Water Trial" },
+          { 0xBD, "Completed Shadow Trial" },
+          { 0xBE, "Completed Fire Trial" },
+          { 0xBF, "Completed Light Trial" },
+          { 0xC0, "Nabooru Ordered to Fight by Twinrova" },
+          { 0xC1, "Spoke to Saria on Lost Woods Bridge" },
+          { 0xC3, "Dispelled Ganon's Tower Barrier" },
+          { 0xC4, "Returned to Temple of Time With All Medallions" },
+          { 0xC5, "Sheik, Spawned at Master Sword Pedestal as Adult" },
+          { 0xC6, "Spoke to Deku Tree Sprout" },
+          { 0xC7, "Watched Ganon's Tower Collapse / Caught by Gerudo" },
+          { 0xC8, "Obtained Spirit Medallion" },
+          { 0xC9, "Demo_Effect, Temple of Time Warp in blue aura + sfx the first time you spawn as Adult" },
+          { 0xD0, "Obtained Frogs' Piece of Heart" },
+          { 0xD1, "Played Zelda's Lullaby for Frogs" },
+          { 0xD2, "Played Epona's Song for Frogs" },
+          { 0xD3, "Played Sun's Song for Frogs" },
+          { 0xD4, "Played Saria's Song for Frogs" },
+          { 0xD5, "Played Song of Time for Frogs" },
+          { 0xD6, "Played Song of Storms for Frogs" },
+          { 0xDA, "Obtained Adult's Wallet" },
+          { 0xDB, "Obtained Stone of Agony" },
+          { 0xDC, "Obtained Giant's Wallet" },
+          { 0xDD, "Obtained Skulltula House's Bombchu" },
+          { 0xDE, "Obtained Skulltula House's Piece of Heart" },
+      } },
+    { "Item Get Inf Flags",
+      ITEM_GET_INF,
+      0x03,
+      {
+          { 0x02, "Obtained Super Cucco Bottle" },
+          { 0x03, "Bought Bombchu (Shelf 2: Top Right)" },
+          { 0x04, "Bought Bombchu (Shelf 1: Bot. Right)" },
+          { 0x05, "Bought Bombchu (Shelf 1: Top Left)" },
+          { 0x06, "Bought Bombchu (Shelf 2: Bot. Left)" },
+          { 0x07, "Bought Bombchu (Shelf 2: Bot. Right)" },
+          { 0x08, "Bought Bombchu (Shelf 1: Top Right)" },
+          { 0x09, "Bought Bombchu (Shelf 1: Bot. Left)" },
+          { 0x0A, "Bought Bombchu (Shelf 2: Top Left)" },
+          { 0x0B, "Obtained Scrub's Heart Piece" },
+          { 0x0C, "Obtained Cucco Lady's Bottle" },
+          { 0x0D, "Obtained Bullet Bag Upgrade (Market)" },
+          { 0x0E, "Obtained Big Quiver" },
+          { 0x0F, "Obtained Biggest Quiver" },
+          { 0x10, "Obtained Scientist's Heart Piece" },
+          { 0x11, "Obtained Bowling Bomb Bag Upgrade" },
+          { 0x12, "Obtained Bowling Heart Piece" },
+          { 0x13, "Obtained Deku Seeds" },
+          { 0x15, "Obtained Roof Guy's Heart Piece" },
+          { 0x16, "Obtained Skullkid's Heart Piece" },
+          { 0x17, "Obtained Skullkids' Heart Piece" },
+          { 0x18, "Obtained Farore's Wind" },
+          { 0x19, "Obtained Din's Fire" },
+          { 0x1A, "Obtained Nayru's Love" },
+          { 0x1B, "Obtained Treasure Chest Game Reward" },
+          { 0x1C, "Obtained Grave-Dig Heart Piece" },
+          { 0x1D, "Obtained Bullet Bag Upgrade (Woods)" },
+          { 0x1E, "Obtained Deku Stick Upgrade (Stage)" },
+          { 0x1F, "Obtained Deku Nut Upgrade (Stage)" },
+          { 0x23, "Obtained Keaton Mask" },
+          { 0x24, "Obtained Skull Mask" },
+          { 0x25, "Obtained Spooky Mask" },
+          { 0x26, "Obtained Bunny Hood" },
+          { 0x2A, "Obtained Mask of Truth" },
+          { 0x2C, "Obtained Pocket Egg" },
+          { 0x2E, "Obtained Cojiro" },
+          { 0x30, "Obtained Odd Potion" },
+          { 0x31, "Obtained Poacher's Saw" },
+          { 0x38, "Sold Keaton Mask" },
+          { 0x39, "Sold Skull Mask" },
+          { 0x3A, "Sold Spooky Mask" },
+          { 0x3B, "Sold Bunny Hood" },
+          { 0x3F, "Obtained Mask of Truth" },
+      } },
+    { "Inf Flags",
+      INF_TABLE,
+      0x1D,
+      {
+          { 0x00, "Greeted by Saria" },
+          { 0x01, "Spoke to Saria About Obtaining Fairy" },
+          { 0x03, "Complained About Mido to Saria" },
+          { 0x05, "Spoke to Saria in Saria's House" },
+          { 0x0C, "Mido Asked to See Sword & Shield" },
+          { 0x15, "Spoke to Mido in Lost Woods as Adult" },
+          { 0x19, "Told Mido Saria Won't Return" },
+          { 0x1E, "Spoke to Kokiri Girl by Jumping Stones" },
+          { 0x22, "Spoke to Kokiri Boy Guarding Forest Exit" },
+          { 0x24, "Spoke to Kokiri Boy Cutting Grass" },
+          { 0x26, "Spoke to Kokiri Girl on Shop Awning" },
+          { 0x28, "Spoke to Kokiri Girl About Training Center" },
+          { 0x41, "Spoke to Kokiri Boy on Bed in Mido's House" },
+          { 0x51, "Spoke to Kokiri Girl in Saria's House" },
+          { 0x59, "Spoke to Know-It-All Bro. About Temple" },
+          { 0x61, "Spoke to Know-It-All Bro. About Saria" },
+          { 0x66, "Spoke to Deku Tree Sprout After Cutscene" },
+          { 0x6C, "Spoke to Dying Knight" },
+          { 0x76, "Showed Zelda's Letter to Gate Guard" },
+          { 0x77, "Gate Guard Put On Keaton Mask" },
+          { 0x7E, "Spoke to Talon in Lon Lon Ranch House" },
+          { 0x84, "Spoke to Child Malon at Castle or Market" },
+          { 0x85, "Child Malon Said Epona Was Afraid of You" },
+          { 0x8B, "Entered Hyrule Castle" },
+          { 0x94, "Spoke to Ingo at Ranch Before Talon's Return" },
+          { 0x97, "Spoke to Ingo at Ranch" },
+          { 0x9A, "Spoke to Ingo as Adult" },
+          { 0xA2, "Refused Ingo's 50 Rupee Rental Request" },
+          { 0xAB, "Rode a Horse at Ingo's Ranch" },
+          { 0xB0, "Spoke to Medigoron as Child" },
+          { 0xB1, "Spoke to Medigoron as Adult" },
+          { 0xB6, "Spoke to Poe Collector in Ruined Market" },
+          { 0xB7, "Spoke to Fado in Kokiri Forest as Child" },
+          { 0xB8, "Spoke to Malon After Saving Ranch" },
+          { 0xB9, "Spoke to Malon on Horseback" },
+          { 0xBC, "Fado requested Odd Potion" },
+          { 0xC0, "Spoke to Fat Woman by Market Potion Shop" },
+          { 0xC1, "Spoke to Fat Woman After Zelda's Escape" },
+          { 0xC2, "Spoke to Burly Man About Talon Search" },
+          { 0xC3, "Spoke to Burly Man After Zelda's Escape" },
+          { 0xC4, "Spoke to Thief After Zelda's Escape" },
+          { 0xC5, "Spoke to Thin Man by Market Target Shop" },
+          { 0xC6, "Spoke to Old Woman by Market Fountain" },
+          { 0xC7, "Spoke to Old Man by Bombchu Bowling" },
+          { 0xC8, "Spoke to Thin Lady by Bombchu Bowling" },
+          { 0xC9, "Spoke to Thin Lady After Zelda's Escape (1.0)" },
+          { 0xCA, "Spoke to Red Joker in Market" },
+          { 0xCB, "Spoke to Blue Joker in Market (1.0) / Dog Lady as Adult (DBG)" },
+          { 0xCC, "Spoke to Itchy Lady After Malon Left Town" },
+          { 0xCD, "Spoke to Blue Jokester in Market (DBG)" },
+          { 0xCE, "Spoke to Thin Lady After Zelda's Escape (DBG)" },
+          { 0xD9, "Spoke to Dampé as Child" },
+          { 0xE0, "Spoke to Goron by Cavern" },
+          { 0xE3, "Spoke to Goron Hiding Stick" },
+          { 0xE6, "Spoke to Goron by Woods Exit" },
+          { 0xEB, "Spoke to Goron by Bomb Flowers" },
+          { 0xF0, "Spoke to Goron at City? Entrance" },
+          { 0xF4, "Spoke to Ruby-Crazed Goron" },
+          { 0xFC, "Spoke to Goron Shop Owner" },
+          { 0x109, "Goron City Doors Unlocked" },
+          { 0x10B, "Spoke to Goron Link About Volvagia" },
+          { 0x10C, "Stopped Goron Link's Rolling" },
+          { 0x10E, "Spoke to Goron Link" },
+          { 0x113, "Spoke to Darunia in Goron City" },
+          { 0x11A, "Spoke to Darunia in Fire Temple" },
+          { 0x11E, "Obtained Bomb Bag Upgrade (Goron City)" },
+          { 0x124, "Spoke to Zora Near Zora Shop?" },
+          { 0x128, "Spoke to Zora Beside Zora Shop?" },
+          { 0x129, "Spoke to Zora Swimming Behind Zora Shop" },
+          { 0x138, "Thawed King Zora" },
+          { 0x139, "Obtained Zora Tunic" },
+          { 0x140, "Ruto in JJ (M7) on Blue Switch" },
+          { 0x141, "Ruto in JJ (M2) Meet Ruto" },
+          { 0x142, "Ruto in JJ (M3) Talk First Time" },
+          { 0x143, "Ruto in JJ (M10) Can Be Escorted" },
+          { 0x144, "Ruto in JJ (?) Wants to be Tossed to Sapphire" },
+          { 0x145, "Ruto in JJ (M6) on Sapphire platform" },
+          { 0x146, "Ruto in JJ (M6) Kidnapped" },
+          { 0x147, "Ruto in JJ, Spawns on F1 Instead of B1" },
+          { 0x160, "Spoke to Man in Impa's House During Day" },
+          { 0x161, "Spoke to Man in Impa's House at Night" },
+          { 0x162, "Spoke to Man in Impa's House as Adult" },
+          { 0x163, "Spoke to Carpenter Boss's Wife as Child" },
+          { 0x164, "Spoke to Carpenter Boss's Wife as Adult" },
+          { 0x16C, "Refused Nabooru's Request" },
+          { 0x170, "Spoke to Carpenter Boss in Valley" },
+          { 0x172, "Spoke to Carpenter Boss in Kakariko" },
+          { 0x176, "Spoke to Blue Carpenter in Tent" },
+          { 0x178, "Spoke to Green Carpenter in Tent" },
+          { 0x17F, "Running Man Suggested a Race" },
+          { 0x190, "Obtained Gerudo Archery Piece of  Heart" },
+          { 0x191, "Obtained Dog Lady's Piece of Heart" },
+          { 0x192, "Obtained Deku Stick Upgrade (Lost Woods)" },
+          { 0x193, "Obtained Deku Nut Upgrade (Grotto)" },
+          { 0x195, "Spoke to Kaepora in Lake Hylia" },
+          { 0x196, "Spoke to Cursed Man With <10 Tokens" },
+          { 0x197, "Spoke to Cursed Man With 10 Tokens" },
+          { 0x198, "Obtained Small Magic Jar" },
+          { 0x199, "Caught Cucco by Field Entrance" },
+          { 0x19A, "Caught Cucco by Bazaar" },
+          { 0x19B, "Caught Cucco by Cucco Pen" },
+          { 0x19C, "Caught Cucco Behind Windmill" },
+          { 0x19D, "Caught Cucco in Crate" },
+          { 0x19E, "Caught Cucco by Skulltula House" },
+          { 0x19F, "Caught Cucco Behind Potion Shop" },
+          { 0x1A0, "Entered Deku Tree" },
+          { 0x1A1, "Entered Dodongo's Cavern" },
+          { 0x1A2, "Entered Jabu-Jabu's Belly" },
+          { 0x1A3, "Entered Forest Temple" },
+          { 0x1A4, "Entered Fire Temple" },
+          { 0x1A5, "Entered Water Temple" },
+          { 0x1A6, "Entered Spirit Temple" },
+          { 0x1A7, "Entered Shadow Temple" },
+          { 0x1A8, "Entered Bottom of the Well" },
+          { 0x1A9, "Entered Ice Cavern" },
+          { 0x1AA, "Entered Ganon's Tower" },
+          { 0x1AB, "Entered Gerudo Training Ground" },
+          { 0x1AC, "Entered Thieves' Hideout" },
+          { 0x1AD, "Entered Ganon's Castle" },
+          { 0x1AE, "Entered Ganon's Tower (Collapsing)" },
+          { 0x1AF, "Entered Ganon's Castle (Collapsing)" },
+          { 0x1D0, "No Sword on B" },
+      } },
+    { "Event Inf Flags",
+      EVENT_INF,
+      0x03,
+      {
+          { 0x00, "Rented Horse From Ingo" },
+          { 0x01, "Racing Ingo" },
+          { 0x02, "Won First Race With Ingo?" },
+          { 0x05, "Lost Race With Ingo?" },
+          { 0x06, "Racing Ingo For the Second Time" },
+          { 0x08, "Finished Special Cucco Minigame / Began Gerudo Archery" },
+          { 0x0A, "Won Special Cucco Minigame?" },
+          { 0x0F, "Rented Horse From Ingo" },
+          { 0x10, "Racing Running Man" },
+          { 0x20, "Market Crowd Text Randomizer" },
+          { 0x21, "Market Crowd Text Randomizer" },
+          { 0x22, "Market Crowd Text Randomizer" },
+          { 0x23, "Market Crowd Text Randomizer" },
+          { 0x24, "Market Crowd Text Randomizer" },
+          { 0x30, "Entered the Market" },
+      } },
+    { "Randomizer Inf Flags",
+      RANDOMIZER_INF,
+      (RAND_INF_MAX + 15) / 16,
+      {
+#include "soh/Enhancements/randomizer/randomizer_inf.h"
+      } },
 };
 
+#undef DEFINE_RAND_INF
+
 const std::vector<std::string> state1 = {
     "Loading",
     "Swinging Bottle",
@@ -1658,8 +403,8 @@ const std::vector<std::string> state1 = {
     "In Water",
     "In Item Cutscene",
     "In Cutscene",
-    "30", //Unknown
-    "Floor collision disabled"
+    "30", // Unknown
+    "Floor collision disabled",
 };
 
 const std::vector<std::string> state2 = {
@@ -1694,7 +439,7 @@ const std::vector<std::string> state2 = {
     "Idling",
     "Disabled draw func",
     "Sword Lunge",
-    "Void out"
+    "Void out",
 };
 
 const std::vector<std::string> state3 = {
@@ -1705,14 +450,14 @@ const std::vector<std::string> state3 = {
     "Check Floor Water Collision",
     "Force Pull Ocarina",
     "Restore Nayru's Love",
-    "Travelling to Hook Target"
+    "Travelling to Hook Target",
 };
 
-class SaveEditorWindow : public Ship::GuiWindow {
+class SaveEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
diff --git a/soh/soh/Enhancements/debugger/dlViewer.cpp b/soh/soh/Enhancements/debugger/dlViewer.cpp
index 4f4d13bfff..a02aa7d95d 100644
--- a/soh/soh/Enhancements/debugger/dlViewer.cpp
+++ b/soh/soh/Enhancements/debugger/dlViewer.cpp
@@ -1,6 +1,7 @@
 #include "actorViewer.h"
 #include "soh/util.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "ResourceManager.h"
 #include "DisplayList.h"
 #include "soh/OTRGlobals.h"
@@ -65,7 +66,8 @@ std::map<int, std::string> cmdMap = {
 };
 
 void PerformDisplayListSearch() {
-    auto result = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles("*" + std::string(searchString) + "*DL*");
+    auto result = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles(
+        "*" + std::string(searchString) + "*DL*");
 
     displayListSearchResults.clear();
 
@@ -78,23 +80,25 @@ void PerformDisplayListSearch() {
     }
 
     // Sort the final list
-    std::sort(displayListSearchResults.begin(), displayListSearchResults.end(), [](const std::string& a, const std::string& b) {
-        return std::lexicographical_compare(
-            a.begin(), a.end(),
-            b.begin(), b.end(),
-            [](char c1, char c2) {
-                return std::tolower(c1) < std::tolower(c2);
-            }
-        );
-    });
+    std::sort(displayListSearchResults.begin(), displayListSearchResults.end(),
+              [](const std::string& a, const std::string& b) {
+                  return std::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end(), [](char c1, char c2) {
+                      return std::tolower(c1) < std::tolower(c2);
+                  });
+              });
 }
 
 void DLViewerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
     // Debounce the search field as listing otr files is expensive
+    UIWidgets::PushStyleInput(THEME_COLOR);
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+
     if (ImGui::InputText("Search Display Lists", searchString, ARRAY_COUNT(searchString))) {
         doSearch = true;
         searchDebounceFrames = 30;
     }
+    UIWidgets::PopStyleInput();
 
     if (doSearch) {
         if (searchDebounceFrames == 0) {
@@ -105,6 +109,7 @@ void DLViewerWindow::DrawElement() {
         searchDebounceFrames--;
     }
 
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
     if (ImGui::BeginCombo("Active Display List", activeDisplayList.c_str())) {
         for (size_t i = 0; i < displayListSearchResults.size(); i++) {
             if (ImGui::Selectable(displayListSearchResults[i].c_str())) {
@@ -114,16 +119,22 @@ void DLViewerWindow::DrawElement() {
         }
         ImGui::EndCombo();
     }
+    UIWidgets::PopStyleCombobox();
 
     if (activeDisplayList == "") {
+        ImGui::PopFont();
+        ImGui::EndDisabled();
         return;
     }
 
     try {
-        auto res = std::static_pointer_cast<Fast::DisplayList>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(activeDisplayList));
+        auto res = std::static_pointer_cast<Fast::DisplayList>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResource(activeDisplayList));
 
         if (res->GetInitData()->Type != static_cast<uint32_t>(Fast::ResourceType::DisplayList)) {
             ImGui::Text("Resource type is not a Display List. Please choose another.");
+            ImGui::PopFont();
+            ImGui::EndDisabled();
             return;
         }
 
@@ -133,7 +144,8 @@ void DLViewerWindow::DrawElement() {
             std::string id = "##CMD" + std::to_string(i);
             Gfx* gfx = (Gfx*)&res->Instructions[i];
             int cmd = gfx->words.w0 >> 24;
-            if (cmdMap.find(cmd) == cmdMap.end()) continue;
+            if (cmdMap.find(cmd) == cmdMap.end())
+                continue;
 
             std::string cmdLabel = cmdMap.at(cmd);
 
@@ -144,6 +156,7 @@ void DLViewerWindow::DrawElement() {
             ImGui::SameLine();
             ImGui::PushItemWidth(175.0f);
 
+            UIWidgets::PushStyleCombobox(THEME_COLOR);
             if (ImGui::BeginCombo(("CMD" + id).c_str(), cmdLabel.c_str())) {
                 if (ImGui::Selectable("gsDPSetPrimColor") && cmd != G_SETPRIMCOLOR) {
                     *gfx = gsDPSetPrimColor(0, 0, 0, 0, 0, 255);
@@ -162,6 +175,7 @@ void DLViewerWindow::DrawElement() {
                 }
                 ImGui::EndCombo();
             }
+            UIWidgets::PopStyleCombobox();
 
             ImGui::PopItemWidth();
 
@@ -189,14 +203,15 @@ void DLViewerWindow::DrawElement() {
                 }
                 ImGui::PopItemWidth();
             }
-            if (cmd == G_RDPPIPESYNC) {
-            }
+            if (cmd == G_RDPPIPESYNC) {}
             if (cmd == G_SETGRAYSCALE) {
                 bool* state = (bool*)&gfx->words.w1;
                 ImGui::SameLine();
+                UIWidgets::PushStyleCheckbox(THEME_COLOR);
                 if (ImGui::Checkbox(("state" + id).c_str(), state)) {
-                    // 
+                    //
                 }
+                UIWidgets::PopStyleCheckbox();
             }
             if (cmd == G_SETTILE) {
                 ImGui::SameLine();
@@ -292,8 +307,7 @@ void DLViewerWindow::DrawElement() {
                 ImGui::SameLine();
                 ImGui::Text("Vertex Name: %s", fileName);
             }
-            if (cmd == G_DL) {
-            }
+            if (cmd == G_DL) {}
             if (cmd == G_DL_OTR_HASH) {
                 gfx++;
                 uint64_t hash = ((uint64_t)gfx->words.w0 << 32) + (uint64_t)gfx->words.w1;
@@ -308,17 +322,17 @@ void DLViewerWindow::DrawElement() {
             }
 
             // Skip second half of instructions that are over 128-bit wide
-            if (cmd == G_SETTIMG_OTR_HASH || cmd == G_DL_OTR_HASH || cmd == G_VTX_OTR_HASH ||
-                cmd == G_BRANCH_Z_OTR || cmd == G_MARKER || cmd == G_MTX_OTR) {
+            if (cmd == G_SETTIMG_OTR_HASH || cmd == G_DL_OTR_HASH || cmd == G_VTX_OTR_HASH || cmd == G_BRANCH_Z_OTR ||
+                cmd == G_MARKER || cmd == G_MTX_OTR) {
                 i++;
                 ImGui::Text("%lu - Reserved - Second half of %s", i, cmdLabel.c_str());
             }
             ImGui::EndGroup();
         }
-    } catch (const std::exception& e) {
-        ImGui::Text("Error displaying DL instructions.");
-        return;
-    }
+    } catch (const std::exception& e) { ImGui::Text("Error displaying DL instructions."); }
+
+    ImGui::PopFont();
+    ImGui::EndDisabled();
 }
 
 void DLViewerWindow::InitElement() {
diff --git a/soh/soh/Enhancements/debugger/dlViewer.h b/soh/soh/Enhancements/debugger/dlViewer.h
index 9d27854566..a75fead971 100644
--- a/soh/soh/Enhancements/debugger/dlViewer.h
+++ b/soh/soh/Enhancements/debugger/dlViewer.h
@@ -2,11 +2,11 @@
 
 #include <libultraship/libultraship.h>
 
-class DLViewerWindow : public Ship::GuiWindow {
+class DLViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
diff --git a/soh/soh/Enhancements/debugger/hookDebugger.cpp b/soh/soh/Enhancements/debugger/hookDebugger.cpp
index 782cf4f7aa..146db2ddc9 100644
--- a/soh/soh/Enhancements/debugger/hookDebugger.cpp
+++ b/soh/soh/Enhancements/debugger/hookDebugger.cpp
@@ -1,31 +1,33 @@
 #include "hookDebugger.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/OTRGlobals.h"
 #include <string>
 #include <version>
 
-static std::unordered_map<const char*, std::unordered_map<HOOK_ID, HookInfo>*> hookData;
+static std::map<const char*, std::map<HOOK_ID, HookInfo>*> hookData;
 
 const ImVec4 grey = ImVec4(0.75, 0.75, 0.75, 1);
 const ImVec4 yellow = ImVec4(1, 1, 0, 1);
 const ImVec4 red = ImVec4(1, 0, 0, 1);
 
 void DrawHookRegisteringInfos(const char* hookName) {
-    if ((*hookData[hookName]).size() == 0) {
+    size_t numHooks = (*hookData[hookName]).size();
+
+    if (numHooks == 0) {
         ImGui::TextColored(grey, "No hooks found");
         return;
     }
 
-    if (ImGui::BeginTable(
-        ("Table##" + std::string(hookName)).c_str(),
-        4,
-        ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit
-    )) {
-        ImGui::TableSetupColumn("Id");
-        ImGui::TableSetupColumn("Type");
-        ImGui::TableSetupColumn("Registration Info");
-        //ImGui::TableSetupColumn("Stub");
-        ImGui::TableSetupColumn("Number of Calls");
+    ImGui::Text("Total Registered: %d", numHooks);
+
+    if (ImGui::BeginTable(("Table##" + std::string(hookName)).c_str(), 4,
+                          ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable |
+                              ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit)) {
+        ImGui::TableSetupColumn("ID", ImGuiTableColumnFlags_WidthFixed);
+        ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_WidthFixed);
+        ImGui::TableSetupColumn("Registration Info", ImGuiTableColumnFlags_WidthStretch);
+        ImGui::TableSetupColumn("# Calls", ImGuiTableColumnFlags_WidthFixed);
         ImGui::TableHeadersRow();
         for (auto& [id, hookInfo] : (*hookData[hookName])) {
             ImGui::TableNextRow();
@@ -39,7 +41,7 @@ void DrawHookRegisteringInfos(const char* hookName) {
                     ImGui::Text("Normal");
                     break;
                 case HOOK_TYPE_ID:
-                    ImGui::Text("Id");
+                    ImGui::Text("ID");
                     break;
                 case HOOK_TYPE_PTR:
                     ImGui::Text("Ptr");
@@ -54,27 +56,19 @@ void DrawHookRegisteringInfos(const char* hookName) {
 
             ImGui::TableNextColumn();
             if (hookInfo.registering.valid) {
-                ImGui::Text("%s(%d:%d) %s", hookInfo.registering.file, hookInfo.registering.line, hookInfo.registering.column, hookInfo.registering.function);
+                // Replace the space after the return type of the parent function with a non-breaking space
+                std::string parentFunction = std::string(hookInfo.registering.function);
+                size_t pos = parentFunction.find_first_of(" ");
+                if (pos != std::string::npos) {
+                    parentFunction.replace(pos, 1, "\u00A0");
+                }
+                // Non breaking space to keep the arrow with the parent function
+                ImGui::TextWrapped("%s(%d:%d) <-\u00A0%s", hookInfo.registering.file, hookInfo.registering.line,
+                                   hookInfo.registering.column, parentFunction.c_str());
             } else {
-                ImGui::TextColored(yellow, "[Unavaliable]");
+                ImGui::TextColored(yellow, "[Unavailable]");
             }
 
-            //TODO: not currently possible
-            /*
-            ImGui::TableNextColumn();
-
-            ImGui::BeginDisabled();
-
-            bool stubButtonPressed = ImGui::Button(("Stub##" + std::to_string(id)).c_str());
-            UIWidgets::SetLastItemHoverText("Stub this hook.\nThis is not possible to automatically undo.");
-
-            if (stubButtonPressed) {
-                //stub
-            }
-
-            ImGui::EndDisabled();
-            */
-
             ImGui::TableNextColumn();
             ImGui::Text("%d", hookInfo.calls);
         }
@@ -83,27 +77,30 @@ void DrawHookRegisteringInfos(const char* hookName) {
 }
 
 void HookDebuggerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
 #ifndef __cpp_lib_source_location
-    ImGui::TextColored(
-        yellow,
-        "Some features of the Hook Debugger are unavaliable because SoH was compiled "
-        "without \"<source_location>\" support "
-        "(\"__cpp_lib_source_location\" not defined in \"<version>\")."
-    );
+    ImGui::TextColored(yellow, "Some features of the Hook Debugger are unavailable because SoH was compiled "
+                               "without \"<source_location>\" support "
+                               "(\"__cpp_lib_source_location\" not defined in \"<version>\").");
 #endif
 
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+
     for (auto& [hookName, _] : hookData) {
         if (ImGui::TreeNode(hookName)) {
             DrawHookRegisteringInfos(hookName);
             ImGui::TreePop();
         }
     }
+
+    ImGui::PopFont();
+    ImGui::EndDisabled();
 }
 
 void HookDebuggerWindow::InitElement() {
-    #define DEFINE_HOOK(name, _) hookData.insert({#name, GameInteractor::Instance->GetHookData<GameInteractor::name>()});
+#define DEFINE_HOOK(name, _) hookData.insert({ #name, GameInteractor::Instance->GetHookData<GameInteractor::name>() });
 
-    #include "../game-interactor/GameInteractor_HookTable.h"
+#include "../game-interactor/GameInteractor_HookTable.h"
 
-    #undef DEFINE_HOOK
+#undef DEFINE_HOOK
 }
diff --git a/soh/soh/Enhancements/debugger/hookDebugger.h b/soh/soh/Enhancements/debugger/hookDebugger.h
index ae6f5113f2..1a586a09cf 100644
--- a/soh/soh/Enhancements/debugger/hookDebugger.h
+++ b/soh/soh/Enhancements/debugger/hookDebugger.h
@@ -1,10 +1,10 @@
 #include <libultraship/libultraship.h>
 
-class HookDebuggerWindow : public Ship::GuiWindow {
+class HookDebuggerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
diff --git a/soh/soh/Enhancements/debugger/performanceTimer.cpp b/soh/soh/Enhancements/debugger/performanceTimer.cpp
index 69ffc69257..43999e7bc4 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.cpp
+++ b/soh/soh/Enhancements/debugger/performanceTimer.cpp
@@ -1,17 +1,21 @@
 #include "performanceTimer.h"
 
-void StartPerformanceTimer(TimerID timer){
+void StartPerformanceTimer(TimerID timer) {
     timeStarted[timer] = std::chrono::high_resolution_clock::now();
 }
 
-void StopPerformanceTimer(TimerID timer){
+void StopPerformanceTimer(TimerID timer) {
     totalTimes[timer] += (std::chrono::high_resolution_clock::now() - timeStarted[timer]);
 }
 
-std::chrono::duration<double, std::milli> GetPerformanceTimer(TimerID timer){
+std::chrono::duration<double, std::milli> GetPerformanceTimer(TimerID timer) {
     return totalTimes[timer];
 }
 
-void ResetPerformanceTimers(){
+void ResetPerformanceTimer(TimerID timer) {
+    totalTimes[timer] = {};
+}
+
+void ResetPerformanceTimers() {
     totalTimes = {};
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/debugger/performanceTimer.h b/soh/soh/Enhancements/debugger/performanceTimer.h
index f4bc8f017c..6bff229a39 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.h
+++ b/soh/soh/Enhancements/debugger/performanceTimer.h
@@ -5,33 +5,34 @@
 #include <chrono>
 
 typedef enum {
-  PT_WHOLE_SEED,
-  PT_LOGIC_RESET,
-  PT_REGION_RESET,
-  PT_SPOILER_LOG,
-  PT_ENTRANCE_SHUFFLE,
-  PT_SHOPSANITY,
-  PT_OWN_DUNGEON,
-  PT_LIMITED_CHECKS,
-  PT_ADVANCEMENT_ITEMS,
-  PT_REMAINING_ITEMS,
-  PT_PLAYTHROUGH_GENERATION,
-  PT_PARE_DOWN_PLAYTHROUGH,
-  PT_WOTH,
-  PT_FOOLISH,
-  PT_OVERRIDES,
-  PT_HINTS,
-  PT_EVENT_ACCESS,
-  PT_TOD_ACCESS,
-  PT_ENTRANCE_LOGIC,
-  PT_LOCATION_LOGIC,
-  PT_MAX
+    PT_WHOLE_SEED,
+    PT_LOGIC_RESET,
+    PT_REGION_RESET,
+    PT_SPOILER_LOG,
+    PT_ENTRANCE_SHUFFLE,
+    PT_SHOPSANITY,
+    PT_OWN_DUNGEON,
+    PT_LIMITED_CHECKS,
+    PT_ADVANCEMENT_ITEMS,
+    PT_REMAINING_ITEMS,
+    PT_PLAYTHROUGH_GENERATION,
+    PT_PARE_DOWN_PLAYTHROUGH,
+    PT_WOTH,
+    PT_FOOLISH,
+    PT_OVERRIDES,
+    PT_HINTS,
+    PT_EVENT_ACCESS,
+    PT_TOD_ACCESS,
+    PT_ENTRANCE_LOGIC,
+    PT_LOCATION_LOGIC,
+    PT_RECALCULATE_AVAILABLE_CHECKS,
+    PT_MAX
 } TimerID;
 
 void StartPerformanceTimer(TimerID timer);
 void StopPerformanceTimer(TimerID timer);
 std::chrono::duration<double, std::milli> GetPerformanceTimer(TimerID timer);
+void ResetPerformanceTimer(TimerID timer);
 void ResetPerformanceTimers();
 static std::array<std::chrono::duration<double, std::milli>, PT_MAX> totalTimes = {};
 static std::array<std::chrono::high_resolution_clock::time_point, PT_MAX> timeStarted = {};
-
diff --git a/soh/soh/Enhancements/debugger/valueViewer.cpp b/soh/soh/Enhancements/debugger/valueViewer.cpp
index 7d09dfb632..4544979cb5 100644
--- a/soh/soh/Enhancements/debugger/valueViewer.cpp
+++ b/soh/soh/Enhancements/debugger/valueViewer.cpp
@@ -1,5 +1,6 @@
 #include "valueViewer.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
 
@@ -21,6 +22,7 @@ s32 GfxPrint_Printf(GfxPrint* printer, const char* fmt, ...);
 
 ImVec4 WHITE = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
 
+// clang-format off
 std::vector<ValueTableElement> valueTable = {
     { "Time",               "gSaveContext.dayTime",                 "TIME:",   TYPE_U16,   false, []() -> void* { return &gSaveContext.dayTime; },                      WHITE },
     { "Age",                "gSaveContext.linkAge",                 "AGE:",    TYPE_S32,   false, []() -> void* { return &gSaveContext.linkAge; },                      WHITE },
@@ -70,31 +72,40 @@ std::vector<ValueTableElement> valueTable = {
     "Deku Tree Warp Timer" u16 0x801F83A2
     */
 };
+// clang-format on
 
 extern "C" void ValueViewer_Draw(GfxPrint* printer) {
     for (int i = 0; i < valueTable.size(); i++) {
         ValueTableElement& element = valueTable[i];
-        if (!element.isActive || !element.isPrinted || (gPlayState == NULL && element.requiresPlayState)) continue;
-        GfxPrint_SetColor(printer, element.color.x * 255, element.color.y * 255, element.color.z * 255, element.color.w * 255);
+        if (!element.isActive || !element.isPrinted || (gPlayState == NULL && element.requiresPlayState))
+            continue;
+        GfxPrint_SetColor(printer, element.color.x * 255, element.color.y * 255, element.color.z * 255,
+                          element.color.w * 255);
         GfxPrint_SetPos(printer, element.x, element.y);
         switch (element.type) {
             case TYPE_S8:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s8*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(),
+                                *(s8*)element.valueFn());
                 break;
             case TYPE_U8:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u8*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(),
+                                *(u8*)element.valueFn());
                 break;
             case TYPE_S16:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s16*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(),
+                                *(s16*)element.valueFn());
                 break;
             case TYPE_U16:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u16*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(),
+                                *(u16*)element.valueFn());
                 break;
             case TYPE_S32:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s32*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(),
+                                *(s32*)element.valueFn());
                 break;
             case TYPE_U32:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u32*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(),
+                                *(u32*)element.valueFn());
                 break;
             case TYPE_CHAR:
                 GfxPrint_Printf(printer, "%s%c", element.prefix.c_str(), *(char*)element.valueFn());
@@ -103,7 +114,8 @@ extern "C" void ValueViewer_Draw(GfxPrint* printer) {
                 GfxPrint_Printf(printer, "%s%s", element.prefix.c_str(), (char*)element.valueFn());
                 break;
             case TYPE_FLOAT:
-                GfxPrint_Printf(printer, (element.typeFormat ? "%s%4.1f" : "%s%f"), element.prefix.c_str(), *(float*)element.valueFn());
+                GfxPrint_Printf(printer, (element.typeFormat ? "%s%4.1f" : "%s%f"), element.prefix.c_str(),
+                                *(float*)element.valueFn());
                 break;
         }
     }
@@ -142,20 +154,21 @@ void RegisterValueViewerHooks() {
 RegisterShipInitFunc initFunc(RegisterValueViewerHooks, { CVAR_NAME });
 
 void ValueViewerWindow::DrawElement() {
-    UIWidgets::PaddedEnhancementCheckbox("Enable Printing", CVAR_NAME);
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    UIWidgets::CVarCheckbox("Enable Printing", CVAR_NAME, UIWidgets::CheckboxOptions().Color(THEME_COLOR));
 
     ImGui::BeginGroup();
     static int selectedElement = -1;
-    std::string selectedElementText = (selectedElement == -1) ? "Select a value" : (
-        std::string(valueTable[selectedElement].name) + " (" + std::string(valueTable[selectedElement].path) + ")"
-    );
+    std::string selectedElementText = (selectedElement == -1) ? "Select a value"
+                                                              : (std::string(valueTable[selectedElement].name) + " (" +
+                                                                 std::string(valueTable[selectedElement].path) + ")");
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
     if (ImGui::BeginCombo("##valueViewerElement", selectedElementText.c_str())) {
         for (int i = 0; i < valueTable.size(); i++) {
-            if (valueTable[i].isActive) continue;
+            if (valueTable[i].isActive)
+                continue;
             bool isSelected = (selectedElement == i);
-            std::string elementText = (
-                std::string(valueTable[i].name) + " (" + std::string(valueTable[i].path) + ")"
-            );
+            std::string elementText = (std::string(valueTable[i].name) + " (" + std::string(valueTable[i].path) + ")");
             if (ImGui::Selectable(elementText.c_str(), isSelected)) {
                 selectedElement = i;
             }
@@ -165,20 +178,29 @@ void ValueViewerWindow::DrawElement() {
         }
         ImGui::EndCombo();
     }
+    UIWidgets::PopStyleCombobox();
     ImGui::SameLine();
+    UIWidgets::PushStyleButton(THEME_COLOR);
     if (selectedElement != -1 && ImGui::Button("+")) {
         valueTable[selectedElement].isActive = true;
         selectedElement = -1;
     }
+    UIWidgets::PopStyleButton();
     ImGui::EndGroup();
 
     for (int i = 0; i < valueTable.size(); i++) {
         ValueTableElement& element = valueTable[i];
-        if (!element.isActive || (gPlayState == NULL && element.requiresPlayState)) continue;
-        if (ImGui::Button(("x##" + std::string(element.name)).c_str())) {
+        if (!element.isActive || (gPlayState == NULL && element.requiresPlayState))
+            continue;
+        UIWidgets::PushStyleButton(THEME_COLOR);
+        UIWidgets::PushStyleCheckbox(THEME_COLOR);
+        ImGui::AlignTextToFramePadding();
+        if (ImGui::Button((ICON_FA_TIMES + std::string("##") + std::string(element.name)).c_str())) {
             element.isActive = false;
             element.isPrinted = false;
         }
+        UIWidgets::PopStyleCheckbox();
+        UIWidgets::PopStyleButton();
         ImGui::SameLine();
         ImGui::Text("%s:", element.name);
         ImGui::SameLine();
@@ -212,7 +234,7 @@ void ValueViewerWindow::DrawElement() {
                 break;
         }
         ImGui::SameLine();
-
+        UIWidgets::PushStyleCheckbox(THEME_COLOR);
         if (element.type <= TYPE_U32) {
             ImGui::Checkbox(("Hex##" + std::string(element.name)).c_str(), &element.typeFormat);
             ImGui::SameLine();
@@ -220,23 +242,31 @@ void ValueViewerWindow::DrawElement() {
             ImGui::Checkbox(("Trim##" + std::string(element.name)).c_str(), &element.typeFormat);
             ImGui::SameLine();
         }
+        UIWidgets::PopStyleCheckbox();
 
         ImGui::BeginGroup();
         if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ValueViewerEnablePrinting"), 0)) {
+            UIWidgets::PushStyleCheckbox(THEME_COLOR);
             ImGui::Checkbox(("Print##" + std::string(element.name)).c_str(), &element.isPrinted);
+            UIWidgets::PopStyleCheckbox();
             if (element.isPrinted) {
                 char* prefix = (char*)element.prefix.c_str();
                 ImGui::SameLine();
                 ImGui::SetNextItemWidth(80.0f);
+                UIWidgets::PushStyleInput(THEME_COLOR);
                 if (ImGui::InputText(("Prefix##" + std::string(element.name)).c_str(), prefix, 10)) {
                     element.prefix = prefix;
                 }
+                UIWidgets::PopStyleInput();
                 ImGui::SameLine();
-                ImGui::ColorEdit3(("##color" + std::string(element.name)).c_str(), (float*)&element.color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
+                ImGui::ColorEdit3(("##color" + std::string(element.name)).c_str(), (float*)&element.color,
+                                  ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel);
                 ImGui::SameLine();
+                UIWidgets::PushStyleCheckbox(THEME_COLOR);
                 if (ImGui::Button(("Position##" + std::string(element.name)).c_str())) {
                     ImGui::OpenPopup(("Position Picker##" + std::string(element.name)).c_str());
                 }
+                UIWidgets::PopStyleCheckbox();
                 if (ImGui::BeginPopup(("Position Picker##" + std::string(element.name)).c_str())) {
                     ImGui::DragInt("X", (int*)&element.x, 1.0f, 0, 44);
                     ImGui::DragInt("Y", (int*)&element.y, 1.0f, 0, 29);
@@ -246,6 +276,7 @@ void ValueViewerWindow::DrawElement() {
         }
         ImGui::EndGroup();
     }
+    ImGui::EndDisabled();
 }
 
 void ValueViewerWindow::InitElement() {
diff --git a/soh/soh/Enhancements/debugger/valueViewer.h b/soh/soh/Enhancements/debugger/valueViewer.h
index e93491fa56..04d698d2c8 100644
--- a/soh/soh/Enhancements/debugger/valueViewer.h
+++ b/soh/soh/Enhancements/debugger/valueViewer.h
@@ -33,13 +33,13 @@ typedef struct {
     uint32_t y;
 } ValueTableElement;
 
-class ValueViewerWindow : public Ship::GuiWindow {
+class ValueViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
 #endif
diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp
index a2b72ca071..2e15a9ed9c 100644
--- a/soh/soh/Enhancements/enemyrandomizer.cpp
+++ b/soh/soh/Enhancements/enemyrandomizer.cpp
@@ -11,17 +11,32 @@
 
 extern "C" {
 #include <z64.h>
+#include "src/overlays/actors/ovl_En_Rr/z_en_rr.h"
 }
 
-const char* enemyCVarList[] = {
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Armos"),        CVAR_ENHANCEMENT("RandomizedEnemyList.Arwing"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.BabyDodongo"),  CVAR_ENHANCEMENT("RandomizedEnemyList.Bari"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Beamos"),       CVAR_ENHANCEMENT("RandomizedEnemyList.BigSkulltula"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.BigStalchild"), CVAR_ENHANCEMENT("RandomizedEnemyList.Biri"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.BlackKnuckle"), CVAR_ENHANCEMENT("RandomizedEnemyList.BlueTektite"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Bubble"),       CVAR_ENHANCEMENT("RandomizedEnemyList.ClubMoblin"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.DarkLink"),     CVAR_ENHANCEMENT("RandomizedEnemyList.Dinolfos"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Dodongo"),      CVAR_ENHANCEMENT("RandomizedEnemyList.FireKeese"),
+#define CVAR_ENEMY_RANDOMIZER_NAME CVAR_ENHANCEMENT("RandomizedEnemies")
+#define CVAR_ENEMY_RANDOMIZER_DEFAULT ENEMY_RANDOMIZER_OFF
+#define CVAR_ENEMY_RANDOMIZER_VALUE CVarGetInteger(CVAR_ENEMY_RANDOMIZER_NAME, CVAR_ENEMY_RANDOMIZER_DEFAULT)
+
+typedef struct EnemyEntry {
+    int16_t id;
+    int16_t params;
+} EnemyEntry;
+
+bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, int16_t params, float posX);
+bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy);
+EnemyEntry GetRandomizedEnemyEntry(uint32_t seed, PlayState* play);
+
+const char* enemyCVarList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = {
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Anubis"),       CVAR_ENHANCEMENT("RandomizedEnemyList.Armos"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Arwing"),       CVAR_ENHANCEMENT("RandomizedEnemyList.BabyDodongo"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Bari"),         CVAR_ENHANCEMENT("RandomizedEnemyList.Beamos"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.BigSkulltula"), CVAR_ENHANCEMENT("RandomizedEnemyList.BigStalchild"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Biri"),         CVAR_ENHANCEMENT("RandomizedEnemyList.BlackKnuckle"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.BlueTektite"),  CVAR_ENHANCEMENT("RandomizedEnemyList.Bubble"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.ClubMoblin"),   CVAR_ENHANCEMENT("RandomizedEnemyList.DarkLink"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Dinolfos"),     CVAR_ENHANCEMENT("RandomizedEnemyList.Dodongo"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.FireKeese"), /*CVAR_ENHANCEMENT("RandomizedEnemyList.FlareDancer"),*/
     CVAR_ENHANCEMENT("RandomizedEnemyList.FloorTile"),    CVAR_ENHANCEMENT("RandomizedEnemyList.Floormaster"),
     CVAR_ENHANCEMENT("RandomizedEnemyList.FlyingPeahat"), CVAR_ENHANCEMENT("RandomizedEnemyList.FlyingPot"),
     CVAR_ENHANCEMENT("RandomizedEnemyList.Freezard"),     CVAR_ENHANCEMENT("RandomizedEnemyList.Gibdo"),
@@ -30,109 +45,160 @@ const char* enemyCVarList[] = {
     CVAR_ENHANCEMENT("RandomizedEnemyList.Keese"),        CVAR_ENHANCEMENT("RandomizedEnemyList.LargeBaba"),
     CVAR_ENHANCEMENT("RandomizedEnemyList.LikeLike"),     CVAR_ENHANCEMENT("RandomizedEnemyList.Lizalfos"),
     CVAR_ENHANCEMENT("RandomizedEnemyList.MadScrub"),     CVAR_ENHANCEMENT("RandomizedEnemyList.NormalWolfos"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.PeahatLarva"),  CVAR_ENHANCEMENT("RandomizedEnemyList.Redead"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.RedTektite"),   CVAR_ENHANCEMENT("RandomizedEnemyList.Shabom"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.ShellBlade"),   CVAR_ENHANCEMENT("RandomizedEnemyList.Skulltula"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.PeahatLarva"), /*CVAR_ENHANCEMENT("RandomizedEnemyList.Poe"),*/
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Redead"),       CVAR_ENHANCEMENT("RandomizedEnemyList.RedTektite"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Shabom"),       CVAR_ENHANCEMENT("RandomizedEnemyList.ShellBlade"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Skulltula"),    CVAR_ENHANCEMENT("RandomizedEnemyList.SkullKid"),
     CVAR_ENHANCEMENT("RandomizedEnemyList.SmallBaba"),    CVAR_ENHANCEMENT("RandomizedEnemyList.SmallStalchild"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Spike"),        CVAR_ENHANCEMENT("RandomizedEnemyList.Stalfos"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.Stinger"),      CVAR_ENHANCEMENT("RandomizedEnemyList.Tailparasan"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.TorchSlug"),    CVAR_ENHANCEMENT("RandomizedEnemyList.Wallmaster"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.WhiteKnuckle"), CVAR_ENHANCEMENT("RandomizedEnemyList.WhiteWolfos"),
-    CVAR_ENHANCEMENT("RandomizedEnemyList.WitheredBaba"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.SpearMoblin"),  CVAR_ENHANCEMENT("RandomizedEnemyList.Spike"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Stalfos"),      CVAR_ENHANCEMENT("RandomizedEnemyList.Stinger"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Tailparasan"),  CVAR_ENHANCEMENT("RandomizedEnemyList.TorchSlug"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.Wallmaster"),   CVAR_ENHANCEMENT("RandomizedEnemyList.WhiteKnuckle"),
+    CVAR_ENHANCEMENT("RandomizedEnemyList.WhiteWolfos"),  CVAR_ENHANCEMENT("RandomizedEnemyList.WitheredBaba"),
 };
 
-const char* enemyNameList[] = {
-    "Armos",    			"Arwing",    			"Baby Dodongo",    		"Bari",
-    "Beamos",    			"Big Skulltula",    	"Stalchild (Big)",    	"Biri",
-    "Iron Knuckle (Black)",	"Blue Tektite",    		"Bubble",    			"Club Moblin",
-    "Dark Link",    		"Dinolfos",    			"Dodongo",    			"Fire Keese",
-    "Floor Tile",    		"Floormaster",    		"Flying Peahat",    	"Flying Pot",
-    "Freezard",    			"Gibdo",    			"Gohma Larva",    		"Guay",
-    "Ice Keese",    		"Invisible Skulltula",  "Keese",    			"Large Deku Baba",
-    "Like-Like",    		"Lizalfos",    			"Mad Scrub",    		"Wolfos (Normal)",
-    "Peahat Larva",    		"Redead",    			"Red Tektite",    		"Shabom",
-    "ShellBlade",    		"Skulltula",    		"Small Deku Baba",    	"Stalchild (Small)",
-    "Spike",    			"Stalfos",    			"Stinger",    			"Tailparasan",
-    "Torch Slug",    		"Wallmaster",    		"Iron Knuckle (White)", "Wolfos (White)",
+const char* enemyNameList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = {
+    "Anubis",
+    "Armos",
+    "Arwing",
+    "Baby Dodongo",
+    "Bari",
+    "Beamos",
+    "Big Skulltula",
+    "Stalchild (Big)",
+    "Biri",
+    "Iron Knuckle (Black)",
+    "Blue Tektite",
+    "Bubble",
+    "Club Moblin",
+    "Dark Link",
+    "Dinolfos",
+    "Dodongo",
+    "Fire Keese",
+    //"Flare Dancer",
+    "Floor Tile",
+    "Floormaster",
+    "Flying Peahat",
+    "Flying Pot",
+    "Freezard",
+    "Gibdo",
+    "Gohma Larva",
+    "Guay",
+    "Ice Keese",
+    "Invisible Skulltula",
+    "Keese",
+    "Large Deku Baba",
+    "Like-Like",
+    "Lizalfos",
+    "Mad Scrub",
+    "Wolfos (Normal)",
+    "Peahat Larva",
+    //"Poe",
+    "Redead",
+    "Red Tektite",
+    "Shabom",
+    "Shell Blade",
+    "Skulltula",
+    "Skull Kid",
+    "Small Deku Baba",
+    "Stalchild (Small)",
+    "Spear Moblin",
+    "Spike",
+    "Stalfos",
+    "Stinger",
+    "Tailpasaran",
+    "Torch Slug",
+    "Wallmaster",
+    "Iron Knuckle (White)",
+    "Wolfos (White)",
     "Withered Deku Baba",
 };
 
 static EnemyEntry randomizedEnemySpawnTable[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = {
-    { ACTOR_EN_AM, -1 },        // Armos
-    { ACTOR_EN_CLEAR_TAG, 1 },  // Arwing
-    { ACTOR_EN_DODOJR, 0 },     // Baby Dodongo
-    { ACTOR_EN_VALI, -1 },      // Bari (big jellyfish)
-    { ACTOR_EN_VM, 1280 },      // Beamos
-    { ACTOR_EN_ST, 1 },         // Skulltula (big)
-    { ACTOR_EN_SKB, 20 },       // Stalchild (big)
-    { ACTOR_EN_BILI, 0 },       // Biri (jellyfish)
-    { ACTOR_EN_IK, 2 },         // Iron Knuckle (black, standing)
-    { ACTOR_EN_TITE, -2 },      // Tektite (blue)
-    { ACTOR_EN_BB, -1 },        // Bubble (flying skull enemy) (blue)
-    { ACTOR_EN_MB, 0 },         // Moblins (Club)
-    { ACTOR_EN_TORCH2, 0 },     // Dark Link
-    { ACTOR_EN_ZF, -2 },        // Dinolfos
-    { ACTOR_EN_DODONGO, -1 },   // Dodongo
-    { ACTOR_EN_FIREFLY, 1 },    // Fire Keese
-    { ACTOR_EN_YUKABYUN, 0 },   // Flying Floor Tile
-    { ACTOR_EN_FLOORMAS, 0 },   // Floormaster
-    { ACTOR_EN_PEEHAT, -1 },    // Flying Peahat (big grounded, doesn't spawn larva)
-    { ACTOR_EN_TUBO_TRAP, 0 },  // Flying pot
-    { ACTOR_EN_FZ, 0 },         // Freezard
-    { ACTOR_EN_RD, 32766 },     // Gibdo (standing)
-    { ACTOR_EN_GOMA, 7 },       // Gohma larva (non-gohma rooms)
-    { ACTOR_EN_CROW, 0 },       // Guay
-    { ACTOR_EN_FIREFLY, 4 },    // Ice Keese
-    { ACTOR_EN_ST, 2 },         // Skulltula (invisible)
-    { ACTOR_EN_IK, 3 },         // Iron Knuckle (white, standing)
-    { ACTOR_EN_FIREFLY, 2 },    // Regular Keese
-    { ACTOR_EN_DEKUBABA, 1 },   // Deku Baba (large)
+    { ACTOR_EN_ANUBICE_TAG, 1 }, // Anubis
+    { ACTOR_EN_AM, -1 },         // Armos
+    { ACTOR_EN_CLEAR_TAG, 1 },   // Arwing
+    { ACTOR_EN_DODOJR, 0 },      // Baby Dodongo
+    { ACTOR_EN_VALI, -1 },       // Bari (big jellyfish)
+    { ACTOR_EN_VM, 1280 },       // Beamos
+    { ACTOR_EN_ST, 1 },          // Skulltula (big)
+    { ACTOR_EN_SKB, 20 },        // Stalchild (big)
+    { ACTOR_EN_BILI, 0 },        // Biri (jellyfish)
+    { ACTOR_EN_IK, 2 },          // Iron Knuckle (black, standing)
+    { ACTOR_EN_TITE, -2 },       // Tektite (blue)
+    { ACTOR_EN_BB, -1 },         // Bubble (flying skull enemy) (blue)
+    { ACTOR_EN_MB, 0 },          // Club Moblin
+    { ACTOR_EN_TORCH2, 0 },      // Dark Link
+    { ACTOR_EN_ZF, -2 },         // Dinolfos
+    { ACTOR_EN_DODONGO, -1 },    // Dodongo
+    { ACTOR_EN_FIREFLY, 1 },     // Fire Keese
+    // { ACTOR_EN_FD, 0 },          // Flare Dancer (possible cause of crashes because of spawning flame actors on
+    // sloped ground)
+    { ACTOR_EN_YUKABYUN, 0 },  // Flying Floor Tile
+    { ACTOR_EN_FLOORMAS, 0 },  // Floormaster
+    { ACTOR_EN_PEEHAT, -1 },   // Flying Peahat (big grounded, doesn't spawn larva)
+    { ACTOR_EN_TUBO_TRAP, 0 }, // Flying pot
+    { ACTOR_EN_FZ, 0 },        // Freezard
+    { ACTOR_EN_RD, 32766 },    // Gibdo (standing)
+    { ACTOR_EN_GOMA, 7 },      // Gohma Larva (Non-Gohma rooms)
+    { ACTOR_EN_CROW, 0 },      // Guay
+    { ACTOR_EN_FIREFLY, 4 },   // Ice Keese
+    { ACTOR_EN_ST, 2 },        // Skulltula (invisible)
+    { ACTOR_EN_FIREFLY, 2 },   // Regular Keese
+    { ACTOR_EN_DEKUBABA, 1 },  // Deku Baba (large)
+    // Doesn't work (reliant on surface and also normally used in tandem with a leever spawner, kills itself too quickly
+    // otherwise) { ACTOR_EN_REEBA, 0 },       // Leever
     { ACTOR_EN_RR, 0 },         // Like-Like
     { ACTOR_EN_ZF, -1 },        // Lizalfos
     { ACTOR_EN_DEKUNUTS, 768 }, // Mad Scrub (triple attack) (projectiles don't work)
     { ACTOR_EN_WF, 0 },         // Wolfos (normal)
-    { ACTOR_EN_PEEHAT, 1 },     // Flying Peahat Larva
-    { ACTOR_EN_RD, 1 },         // Redead (standing)
-    { ACTOR_EN_TITE, -1 },      // Tektite (red)
-    { ACTOR_EN_BUBBLE, 0 },     // Shabom (bubble)
-    { ACTOR_EN_SB, 0 },         // Shell Blade
-    { ACTOR_EN_ST, 0 },         // Skulltula (normal)
-    { ACTOR_EN_DEKUBABA, 0 },   // Deku Baba (small)
-    { ACTOR_EN_SKB, 1 },        // Stalchild (small)
-    { ACTOR_EN_NY, 0 },         // Spike (rolling enemy)
-    { ACTOR_EN_TEST, 2 },       // Stalfos
-    { ACTOR_EN_EIYER, 10 },     // Stinger (land) (One in formation, sink under floor and do not activate)
-    { ACTOR_EN_TP, -1 },        // Electric Tailparasan
-    { ACTOR_EN_BW, 0 },         // Torch Slug
-    { ACTOR_EN_WALLMAS, 1 },    // Wallmaster
-    { ACTOR_EN_WF, 1 },         // Wolfos (white)
-    { ACTOR_EN_KAREBABA, 0 },   // Withered Deku Baba
-
-    // Doesn't work {ACTOR_EN_POH, 0}, // Poe (Seems to rely on other objects?)
-    // Doesn't work {ACTOR_EN_POH, 2}, // Poe (composer Sharp) (Seems to rely on other objects?)
-    // Doesn't work {ACTOR_EN_POH, 3}, // Poe (composer Flat) (Seems to rely on other objects?)
-    // Doesn't work {ACTOR_EN_OKUTA, 0}, // Octorok (actor directly uses water box collision to handle hiding/popping up)
-    // Doesn't work {ACTOR_EN_REEBA, 0}, // Leever (reliant on surface and also normally used in tandem with a leever spawner, kills itself too quickly otherwise)
-    // Kinda doesn't work { ACTOR_EN_FD, 0 }, // Flare Dancer (jumps out of bounds a lot, and possible cause of crashes because of spawning a ton of flame actors)
+    // Doesn't work (actor directly uses water box collision to handle hiding/popping up)
+    // { ACTOR_EN_OKUTA, 0 },       // Octorok
+    { ACTOR_EN_PEEHAT, 1 }, // Flying Peahat Larva
+    // Doesn't work (Seems to rely on other objects?)
+    // { ACTOR_EN_POH, 0 },         // Poe
+    // Doesn't work (Seems to rely on other objects?)
+    // { ACTOR_EN_POH, 2 },         // Poe (composer Sharp)
+    // Doesn't work (Seems to rely on other objects?)
+    // { ACTOR_EN_POH, 3 },         // Poe (composer Flat)
+    { ACTOR_EN_RD, 1 },       // Redead (standing)
+    { ACTOR_EN_TITE, -1 },    // Tektite (red)
+    { ACTOR_EN_BUBBLE, 0 },   // Shabom (bubble)
+    { ACTOR_EN_SB, 0 },       // Shell Blade
+    { ACTOR_EN_ST, 0 },       // Skulltula (normal)
+    { ACTOR_EN_SKJ, 4159 },   // Skull Kid
+    { ACTOR_EN_DEKUBABA, 0 }, // Deku Baba (small)
+    { ACTOR_EN_SKB, 1 },      // Stalchild (small)
+    { ACTOR_EN_MB, -1 },      // Spear Moblin
+    { ACTOR_EN_NY, 0 },       // Spike (rolling enemy)
+    { ACTOR_EN_TEST, 2 },     // Stalfos
+    { ACTOR_EN_EIYER, 10 },   // Stinger (land) (One in formation, sink under floor and do not activate)
+    { ACTOR_EN_TP, -1 },      // Electric Tailpasaran
+    { ACTOR_EN_BW, 0 },       // Torch Slug
+    { ACTOR_EN_WALLMAS, 1 },  // Wallmaster
+    { ACTOR_EN_IK, 3 },       // Iron Knuckle (white, standing)
+    { ACTOR_EN_WF, 1 },       // Wolfos (white)
+    { ACTOR_EN_KAREBABA, 0 }, // Withered Deku Baba
 };
 
 static int enemiesToRandomize[] = {
-    ACTOR_EN_FIREFLY,   // Keese (including fire/ice)
-    ACTOR_EN_TEST,      // Stalfos
-    ACTOR_EN_TITE,      // Tektite
-    ACTOR_EN_POH,       // Poe (normal, blue rupee, composers
-    ACTOR_EN_OKUTA,     // Octorok
-    ACTOR_EN_WALLMAS,   // Wallmaster
-    ACTOR_EN_DODONGO,   // Dodongo
-    // ACTOR_EN_REEBA,  // Leever (reliant on spawner (z_e_encount1.c)
+    ACTOR_EN_ANUBICE_TAG, // Anubis
+    ACTOR_EN_FIREFLY,     // Keese (including fire/ice)
+    ACTOR_EN_TEST,        // Stalfos
+    ACTOR_EN_TITE,        // Tektite
+    ACTOR_EN_POH,         // Poe (normal, blue rupee, composers)
+    ACTOR_EN_OKUTA,       // Octorok
+    ACTOR_EN_WALLMAS,     // Wallmaster
+    ACTOR_EN_DODONGO,     // Dodongo
+    // ACTOR_EN_REEBA,       // Leever (reliant on spawner (z_en_encount1.c))
     ACTOR_EN_PEEHAT,    // Flying Peahat, big one spawning larva, larva
-    ACTOR_EN_ZF,        // Lizalfos, dinolfos
-    ACTOR_EN_GOMA,      // Gohma larva (normal, eggs, gohma eggs)
+    ACTOR_EN_ZF,        // Lizalfos, Dinolfos
+    ACTOR_EN_GOMA,      // Gohma Larva (normal, eggs, gohma eggs)
     ACTOR_EN_BUBBLE,    // Shabom (bubble)
     ACTOR_EN_DODOJR,    // Baby Dodongo
     ACTOR_EN_TORCH2,    // Dark Link
     ACTOR_EN_BILI,      // Biri (small jellyfish)
-    ACTOR_EN_TP,        // Electric Tailparasan
+    ACTOR_EN_TP,        // Electric Tailpasaran
     ACTOR_EN_ST,        // Skulltula (normal, big, invisible)
     ACTOR_EN_BW,        // Torch Slug
     ACTOR_EN_EIYER,     // Stinger (land)
@@ -147,7 +213,7 @@ static int enemiesToRandomize[] = {
     ACTOR_EN_FLOORMAS,  // Floormaster
     ACTOR_EN_RD,        // Redead, Gibdo
     ACTOR_EN_SW,        // Skullwalltula
-    // ACTOR_EN_FD,     // Flare Dancer (can be randomized, but not randomized to, so keeping it in vanilla locations means it atleast shows up in the game
+    ACTOR_EN_FD,        // Flare Dancer
     ACTOR_EN_SB,        // Shell Blade
     ACTOR_EN_KAREBABA,  // Withered Deku Baba
     ACTOR_EN_RR,        // Like-Like
@@ -156,22 +222,24 @@ static int enemiesToRandomize[] = {
     ACTOR_EN_TUBO_TRAP, // Flying pot
     ACTOR_EN_FZ,        // Freezard
     ACTOR_EN_WEIYER,    // Stinger (Water)
-    ACTOR_EN_HINTNUTS,  // Hint deku scrubs
+    ACTOR_EN_HINTNUTS,  // Hint Deku Scrubs
     ACTOR_EN_WF,        // Wolfos
     ACTOR_EN_SKB,       // Stalchild
-    ACTOR_EN_CROW       // Guay
+    ACTOR_EN_CROW,      // Guay
+    ACTOR_EN_SKJ,       // Skull Kid
 };
 
-extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *posX, f32 *posY, f32 *posZ, int16_t *rotX,
-                                      int16_t *rotY, int16_t *rotZ, int16_t *params) {
+extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t* actorId, f32* posX, f32* posY, f32* posZ, int16_t* rotX,
+                                      int16_t* rotY, int16_t* rotZ, int16_t* params) {
 
     uint32_t isMQ = ResourceMgr_IsSceneMasterQuest(play->sceneNum);
 
     // Hack to remove enemies that wrongfully spawn because of bypassing object dependency with enemy randomizer on.
     // This should probably be handled on OTR generation in the future when object dependency is fully removed.
-    // Remove bats and skulltulas from graveyard.
-    // Remove octorok in lost woods.
-    if (((*actorId == ACTOR_EN_FIREFLY || (*actorId == ACTOR_EN_SW && *params == 0)) && play->sceneNum == SCENE_GRAVEYARD) ||
+    // Remove bats and Skulltulas from graveyard.
+    // Remove Octorok in Lost Woods.
+    if (((*actorId == ACTOR_EN_FIREFLY || (*actorId == ACTOR_EN_SW && *params == 0)) &&
+         play->sceneNum == SCENE_GRAVEYARD) ||
         (*actorId == ACTOR_EN_OKUTA && play->sceneNum == SCENE_LOST_WOODS)) {
         return 0;
     }
@@ -186,7 +254,7 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po
     // Lengthen timer in non-MQ Jabu Jabu bubble room.
     if (!isMQ && *actorId == ACTOR_OBJ_ROOMTIMER && *params == 30760 && play->sceneNum == SCENE_JABU_JABU &&
         play->roomCtx.curRoom.num == 12) {
-        *params = 92280;
+        *params = (*params & ~0x3FF) | 120;
     }
 
     if (IsEnemyFoundToRandomize(play->sceneNum, play->roomCtx.curRoom.num, *actorId, *params, *posX)) {
@@ -229,16 +297,9 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po
         }
 
         // Get randomized enemy ID and parameter.
-        uint32_t seed = play->sceneNum + *actorId + (int)*posX + (int)*posY + (int)*posZ + *rotX + *rotY + *rotZ + *params;
-        EnemyEntry randomEnemy = GetRandomizedEnemyEntry(seed);
-
-        int8_t timesRandomized = 1;
-
-        // While randomized enemy isn't allowed in certain situations, randomize again.
-        while (!IsEnemyAllowedToSpawn(play->sceneNum, play->roomCtx.curRoom.num, randomEnemy)) {
-            randomEnemy = GetRandomizedEnemyEntry(seed + timesRandomized);
-            timesRandomized++;
-        }
+        uint32_t seed =
+            play->sceneNum + *actorId + (int)*posX + (int)*posY + (int)*posZ + *rotX + *rotY + *rotZ + *params;
+        EnemyEntry randomEnemy = GetRandomizedEnemyEntry(seed, play);
 
         *actorId = randomEnemy.id;
         *params = randomEnemy.params;
@@ -251,13 +312,13 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po
             case ACTOR_EN_VALI:
                 *posY = *posY + 300;
                 break;
-            // Spawn peahat off the ground, otherwise it kills itself by colliding with the ground.
+            // Spawn Peahat off the ground, otherwise it kills itself by colliding with the ground.
             case ACTOR_EN_PEEHAT:
                 if (*params == 1) {
                     *posY = *posY + 100;
                 }
                 break;
-            // Spawn skulltulas off the ground.
+            // Spawn Skulltulas off the ground.
             case ACTOR_EN_ST:
                 *posY = *posY + 200;
                 break;
@@ -278,40 +339,44 @@ extern "C" uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *po
     return 1;
 }
 
-std::vector<EnemyEntry> selectedEnemyList;
+static std::vector<EnemyEntry> selectedEnemyList;
 
 void GetSelectedEnemies() {
     selectedEnemyList.clear();
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), ENEMY_RANDOMIZER_OFF) == ENEMY_RANDOMIZER_RANDOM) {
-        for (int i = 0; i < 49; i++) {
-            if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0)) {
-                selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
-            } else if (CVarGetInteger(enemyCVarList[i], 0)) {
-                selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
-            }
-        }
-        if (selectedEnemyList.size() == 0) {
-            selectedEnemyList.push_back(randomizedEnemySpawnTable[0]);
-        }
-    } else {
-        for (int i = 0; i < 49; i++) {
+    for (int i = 0; i < RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE; i++) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0)) {
+            selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
+        } else if (CVarGetInteger(enemyCVarList[i], 1)) {
             selectedEnemyList.push_back(randomizedEnemySpawnTable[i]);
         }
     }
+    if (selectedEnemyList.size() == 0) {
+        selectedEnemyList.push_back(randomizedEnemySpawnTable[0]);
+    }
 }
 
-EnemyEntry GetRandomizedEnemyEntry(uint32_t seed) {
+EnemyEntry GetRandomizedEnemyEntry(uint32_t seed, PlayState* play) {
+    std::vector<EnemyEntry> filteredEnemyList = {};
     if (selectedEnemyList.size() == 0) {
         GetSelectedEnemies();
     }
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), ENEMY_RANDOMIZER_OFF) == ENEMY_RANDOMIZER_RANDOM_SEEDED) {
-        uint32_t finalSeed = seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() : gSaveContext.ship.stats.fileCreatedAt);
+    for (EnemyEntry enemy : selectedEnemyList) {
+        if (IsEnemyAllowedToSpawn(play->sceneNum, play->roomCtx.curRoom.num, enemy)) {
+            filteredEnemyList.push_back(enemy);
+        }
+    }
+    if (filteredEnemyList.size() == 0) {
+        filteredEnemyList = selectedEnemyList;
+    }
+    if (CVAR_ENEMY_RANDOMIZER_VALUE == ENEMY_RANDOMIZER_RANDOM_SEEDED) {
+        uint32_t finalSeed =
+            seed + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() : gSaveContext.ship.stats.fileCreatedAt);
         Random_Init(finalSeed);
-        uint32_t randomNumber = Random(0, RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE);
-        return selectedEnemyList[randomNumber];
+        uint32_t randomNumber = Random(0, filteredEnemyList.size());
+        return filteredEnemyList[randomNumber];
     } else {
-        uint32_t randomSelectedEnemy = Random(0, selectedEnemyList.size());
-        return selectedEnemyList[randomSelectedEnemy];
+        uint32_t randomSelectedEnemy = Random(0, filteredEnemyList.size());
+        return filteredEnemyList[randomSelectedEnemy];
     }
 }
 
@@ -327,14 +392,14 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId,
                 // Only randomize the main component of Electric Tailparasans, not the tail segments they spawn.
                 case ACTOR_EN_TP:
                     return (params == -1);
-                // Only randomize the initial deku scrub actor (single and triple attack), not the flower they spawn.
+                // Only randomize the initial Deku Scrub actor (single and triple attack), not the flower they spawn.
                 case ACTOR_EN_DEKUNUTS:
                     return (params == -256 || params == 768);
-                // Don't randomize the OoB wallmaster in the silver rupee room because it's only there to
+                // Don't randomize the OoB wallmaster in the Silver Rupee room because it's only there to
                 // not trigger unlocking the door after killing the other wallmaster in authentic gameplay.
                 case ACTOR_EN_WALLMAS:
                     return (!(!isMQ && sceneNum == SCENE_GERUDO_TRAINING_GROUND && roomNum == 2 && posX == -2345));
-                // Only randomize initial floormaster actor (it can split and does some spawning on init).
+                // Only randomize initial Floormaster actor (it can split and does some spawning on init).
                 case ACTOR_EN_FLOORMAS:
                     return (params == 0 || params == -32768);
                 // Only randomize the initial eggs, not the enemies that spawn from them.
@@ -348,29 +413,33 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId,
                 // break the thrones in the room to access a button.
                 case ACTOR_EN_IK:
                     return (params != 1280 && !(isMQ && sceneNum == SCENE_INSIDE_GANONS_CASTLE && roomNum == 17));
-                // Only randomize the intitial spawn of the huge jellyfish. It spawns another copy when hit with a sword.
+                // Only randomize the initial spawn of the huge jellyfish. It spawns another copy when hit with a sword.
                 case ACTOR_EN_VALI:
                     return (params == -1);
-                // Don't randomize lizalfos in Doodong's Cavern because the gates won't work correctly otherwise.
+                // Don't randomize Lizalfos in Dodongo's Cavern because the gates won't work correctly otherwise.
                 case ACTOR_EN_ZF:
                     return (params != 1280 && params != 1281 && params != 1536 && params != 1537);
                 // Don't randomize the Wolfos in SFM because it's needed to open the gate.
                 case ACTOR_EN_WF:
                     return (params != 7936);
-                // Don't randomize the Stalfos in Forest Temple because other enemies fall through the hole and don't trigger the platform.
-                // Don't randomize the Stalfos spawning on the boat in Shadow Temple, as randomizing them places the new enemies
-                // down in the river.
+                // Don't randomize the Stalfos in Forest Temple because other enemies fall through the hole and don't
+                // trigger the platform. Don't randomize the Stalfos spawning on the boat in Shadow Temple, as
+                // randomizing them places the new enemies down in the river.
                 case ACTOR_EN_TEST:
                     return (params != 1 && !(sceneNum == SCENE_SHADOW_TEMPLE && roomNum == 21));
                 // Only randomize the enemy variant of Armos Statue.
-                // Leave one Armos unrandomized in the Spirit Temple room where an armos is needed to push down a button
+                // Leave one Armos unrandomized in the Spirit Temple room where an armos is needed to push down a
+                // button.
                 case ACTOR_EN_AM:
                     return ((params == -1 || params == 255) && !(sceneNum == SCENE_SPIRIT_TEMPLE && posX == 2141));
-                // Don't randomize Shell Blades and Spikes in the underwater portion in Water Temple as it's impossible to kill
-                // most other enemies underwater with just hookshot and they're required to be killed for a grate to open.
+                // Don't randomize Shell Blades and Spikes in the underwater portion in Water Temple as it's impossible
+                // to kill most other enemies underwater with just hookshot and they're required to be killed for a
+                // grate to open.
                 case ACTOR_EN_SB:
                 case ACTOR_EN_NY:
                     return (!(!isMQ && sceneNum == SCENE_WATER_TEMPLE && roomNum == 2));
+                case ACTOR_EN_SKJ:
+                    return !(sceneNum == SCENE_LOST_WOODS && LINK_IS_CHILD);
                 default:
                     return 1;
             }
@@ -382,19 +451,19 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId,
 }
 
 bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
-
     uint32_t isMQ = ResourceMgr_IsSceneMasterQuest(sceneNum);
 
-    // Freezard - Child Link can only kill this with jump slash deku sticks or other equipment like bombs.
+    // Freezard - Child Link can only kill this with jump slash Deku Sticks or other equipment like bombs.
     // Beamos - Needs bombs.
-    // Shell Blade & Spike - Child link can't kill these with sword or deku stick.
-    // Arwing & Dark Link - Both go out of bounds way too easily, softlocking the player.
+    // Anubis - Needs fire.
+    // Shell Blade & Spike - Child Link can't kill these with sword or Deku Stick.
+    // Flare dancer, Arwing & Dark Link - Both go out of bounds way too easily, softlocking the player.
     // Wallmaster - Not easily visible, often makes players think they're softlocked and that there's no enemies left.
     // Club Moblin - Many issues with them falling or placing out of bounds. Maybe fixable in the future?
-    bool enemiesToExcludeClearRooms = enemy.id == ACTOR_EN_FZ || enemy.id == ACTOR_EN_VM || enemy.id == ACTOR_EN_SB ||
-                                      enemy.id == ACTOR_EN_NY || enemy.id == ACTOR_EN_CLEAR_TAG ||
-                                      enemy.id == ACTOR_EN_WALLMAS || enemy.id == ACTOR_EN_TORCH2 ||
-                                      enemy.id == ACTOR_EN_MB;
+    bool enemiesToExcludeClearRooms =
+        enemy.id == ACTOR_EN_FZ || enemy.id == ACTOR_EN_VM || enemy.id == ACTOR_EN_SB || enemy.id == ACTOR_EN_NY ||
+        enemy.id == ACTOR_EN_CLEAR_TAG || enemy.id == ACTOR_EN_WALLMAS || enemy.id == ACTOR_EN_TORCH2 ||
+        (enemy.id == ACTOR_EN_MB && enemy.params == 0) || enemy.id == ACTOR_EN_FD || enemy.id == ACTOR_EN_ANUBICE_TAG;
 
     // Bari - Spawns 3 more enemies, potentially extremely difficult in timed rooms.
     bool enemiesToExcludeTimedRooms = enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI;
@@ -403,7 +472,8 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
         // Deku Tree
         case SCENE_DEKU_TREE:
             return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 9)) &&
-                    !(isMQ && enemiesToExcludeClearRooms && (roomNum == 4 || roomNum == 6 || roomNum == 9 || roomNum == 10)));
+                    !(isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 4 || roomNum == 6 || roomNum == 9 || roomNum == 10)));
         // Dodongo's Cavern
         case SCENE_DODONGOS_CAVERN:
             return (!(!isMQ && enemiesToExcludeClearRooms && roomNum == 15) &&
@@ -415,8 +485,10 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
                     !(isMQ && enemiesToExcludeClearRooms && (roomNum == 11 || roomNum == 14)));
         // Forest Temple
         case SCENE_FOREST_TEMPLE:
-            return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 6 || roomNum == 10 || roomNum == 18 || roomNum == 21)) &&
-                    !(isMQ && enemiesToExcludeClearRooms && (roomNum == 5 || roomNum == 6 || roomNum == 18 || roomNum == 21)));
+            return (!(!isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 6 || roomNum == 10 || roomNum == 18 || roomNum == 21)) &&
+                    !(isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 5 || roomNum == 6 || roomNum == 18 || roomNum == 21)));
         // Fire Temple
         case SCENE_FIRE_TEMPLE:
             return (!(!isMQ && enemiesToExcludeClearRooms && roomNum == 15) &&
@@ -427,23 +499,31 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
                     !(isMQ && enemiesToExcludeClearRooms && (roomNum == 13 || roomNum == 18)));
         // Spirit Temple
         case SCENE_SPIRIT_TEMPLE:
-            return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 10 || roomNum == 17 || roomNum == 20)) &&
-                    !(isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 2 || roomNum == 4 || roomNum == 10 || roomNum == 15 || roomNum == 19 || roomNum == 20)));
+            return (!(!isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 1 || roomNum == 10 || roomNum == 17 || roomNum == 20)) &&
+                    !(isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 1 || roomNum == 2 || roomNum == 4 || roomNum == 10 || roomNum == 15 ||
+                       roomNum == 19 || roomNum == 20)));
         // Shadow Temple
         case SCENE_SHADOW_TEMPLE:
-            return (!(!isMQ && enemiesToExcludeClearRooms && 
-                        (roomNum == 1 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 16 || roomNum == 17 || roomNum == 19 || roomNum == 20)) &&
-                    !(isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 6 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 20)));
+            return (
+                !(!isMQ && enemiesToExcludeClearRooms &&
+                  (roomNum == 1 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 16 || roomNum == 17 ||
+                   roomNum == 19 || roomNum == 20)) &&
+                !(isMQ && enemiesToExcludeClearRooms &&
+                  (roomNum == 1 || roomNum == 6 || roomNum == 7 || roomNum == 11 || roomNum == 14 || roomNum == 20)));
         // Ganon's Castle Trials
         case SCENE_INSIDE_GANONS_CASTLE:
             return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 2 || roomNum == 5 || roomNum == 9)) &&
-                    !(isMQ && enemiesToExcludeClearRooms && (roomNum == 0 || roomNum == 2 || roomNum == 5 || roomNum == 9)));
+                    !(isMQ && enemiesToExcludeClearRooms &&
+                      (roomNum == 0 || roomNum == 2 || roomNum == 5 || roomNum == 9)));
         // Ice Caverns
         case SCENE_ICE_CAVERN:
             return (!(!isMQ && enemiesToExcludeClearRooms && (roomNum == 1 || roomNum == 7)) &&
                     !(isMQ && enemiesToExcludeClearRooms && (roomNum == 3 || roomNum == 7)));
         // Bottom of the Well
-        // Exclude Dark Link from room with holes in the floor because it can pull you in a like-like making the player fall down.
+        // Exclude Dark Link from room with holes in the floor because it can pull you in a like-like making the player
+        // fall down.
         case SCENE_BOTTOM_OF_THE_WELL:
             return (!(!isMQ && enemy.id == ACTOR_EN_TORCH2 && roomNum == 3));
         // Don't allow Dark Link in areas with lava void out zones as it voids out the player as well.
@@ -452,18 +532,21 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
             return (!(enemy.id == ACTOR_EN_TORCH2 && roomNum == 6) &&
                     !(!isMQ && enemiesToExcludeTimedRooms && (roomNum == 1 || roomNum == 7)) &&
                     !(!isMQ && enemiesToExcludeClearRooms && (roomNum == 3 || roomNum == 5 || roomNum == 10)) &&
-                    !(isMQ && enemiesToExcludeTimedRooms && (roomNum == 1 || roomNum == 3 || roomNum == 5 || roomNum == 7)) &&
+                    !(isMQ && enemiesToExcludeTimedRooms &&
+                      (roomNum == 1 || roomNum == 3 || roomNum == 5 || roomNum == 7)) &&
                     !(isMQ && enemiesToExcludeClearRooms && roomNum == 10));
-        // Don't allow certain enemies in Ganon's Tower because they would spawn up on the ceilling,
+        // Don't allow certain enemies in Ganon's Tower because they would spawn up on the ceiling,
         // becoming impossible to kill.
         // Ganon's Tower.
         case SCENE_GANONS_TOWER:
-            return (!(enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI || (enemy.id == ACTOR_EN_ZF && enemy.params == -1)));
+            return (!(enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI ||
+                      (enemy.id == ACTOR_EN_ZF && enemy.params == -1)));
         // Ganon's Tower Escape.
         case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
             return (!((enemiesToExcludeTimedRooms || (enemy.id == ACTOR_EN_ZF && enemy.params == -1)) && roomNum == 1));
-        // Don't allow big stalchildren, big peahats and the large Bari (jellyfish) during the Gohma fight because they can clip into Gohma
-        // and it crashes the game. Likely because Gohma on the ceilling can't handle collision with other enemies.
+        // Don't allow big Stalchildren, big Peahats and the large Bari (jellyfish) during the Gohma fight because they
+        // can clip into Gohma and it crashes the game. Likely because Gohma on the ceiling can't handle collision with
+        // other enemies.
         case SCENE_DEKU_TREE_BOSS:
             return (!enemiesToExcludeTimedRooms && !(enemy.id == ACTOR_EN_SKB && enemy.params == 20) &&
                     !(enemy.id == ACTOR_EN_PEEHAT && enemy.params == -1));
@@ -481,3 +564,53 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
             return 1;
     }
 }
+
+void FixClubMoblinScale(void* ptr) {
+    Actor* actor = (Actor*)ptr;
+    if (actor->params == -1) {
+        Actor_SetScale(actor, 0.014f);
+    }
+}
+
+void RegisterEnemyRandomizer() {
+    COND_ID_HOOK(OnActorInit, ACTOR_EN_MB, CVAR_ENEMY_RANDOMIZER_VALUE, FixClubMoblinScale);
+    // prevent dark link from triggering a voidout
+    COND_VB_SHOULD(VB_TRIGGER_VOIDOUT, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, {
+        Actor* actor = va_arg(args, Actor*);
+
+        if (actor->category != ACTORCAT_PLAYER) {
+            *should = false;
+            Actor_Kill(actor);
+        }
+    });
+
+    // prevent dark link dealing fall damage to the player
+    COND_VB_SHOULD(VB_RECIEVE_FALL_DAMAGE, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, {
+        Actor* actor = va_arg(args, Actor*);
+
+        if (actor->category != ACTORCAT_PLAYER) {
+            *should = false;
+        }
+    });
+
+    // prevent dark link from interfering with HESS/recoil/etc when at more than 100 away from him
+    COND_VB_SHOULD(VB_TORCH2_HANDLE_CLANKING, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, {
+        Actor* darkLink = va_arg(args, Actor*);
+
+        if (darkLink->xzDistToPlayer > 100.0f) {
+            *should = false;
+        }
+    });
+
+    // prevent dark link from being grabbed by like likes and therefore grabbing the player
+    COND_VB_SHOULD(VB_LIKE_LIKE_GRAB_PLAYER, CVAR_ENEMY_RANDOMIZER_VALUE != CVAR_ENEMY_RANDOMIZER_DEFAULT, {
+        EnRr* likeLike = va_arg(args, EnRr*);
+
+        if (!(likeLike->collider1.base.oc != NULL && likeLike->collider1.base.oc->category == ACTORCAT_PLAYER) &&
+            !(likeLike->collider2.base.oc != NULL && likeLike->collider2.base.oc->category == ACTORCAT_PLAYER)) {
+            *should = false;
+        }
+    });
+}
+
+static RegisterShipInitFunc initFunc(RegisterEnemyRandomizer, { CVAR_ENEMY_RANDOMIZER_NAME });
\ No newline at end of file
diff --git a/soh/soh/Enhancements/enemyrandomizer.h b/soh/soh/Enhancements/enemyrandomizer.h
index f819de9bfa..9220f2db06 100644
--- a/soh/soh/Enhancements/enemyrandomizer.h
+++ b/soh/soh/Enhancements/enemyrandomizer.h
@@ -1,22 +1,17 @@
 #pragma once
 
-#include <libultraship/bridge.h>
+#include <libultraship/libultra/types.h>
+#include "item-tables/ItemTableTypes.h"
 
-typedef struct EnemyEntry {
-    int16_t id;
-    int16_t params;
-} EnemyEntry;
-
-#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 49
-
-bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, int16_t params, float posX);
-bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy);
-EnemyEntry GetRandomizedEnemyEntry(uint32_t seed);
+#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 52
 
 extern const char* enemyCVarList[];
 extern const char* enemyNameList[];
 extern void GetSelectedEnemies();
 
 #ifndef __cplusplus
-uint8_t GetRandomizedEnemy(PlayState* play, int16_t *actorId, f32 *posX, f32 *posY, f32 *posZ, int16_t *rotX, int16_t *rotY, int16_t *rotZ, int16_t *params);
+struct PlayState;
+
+uint8_t GetRandomizedEnemy(struct PlayState* play, int16_t* actorId, f32* posX, f32* posY, f32* posZ, int16_t* rotX,
+                           int16_t* rotY, int16_t* rotZ, int16_t* params);
 #endif
diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h
index db96a77000..c1b91cffad 100644
--- a/soh/soh/Enhancements/enhancementTypes.h
+++ b/soh/soh/Enhancements/enhancementTypes.h
@@ -11,14 +11,14 @@ typedef enum {
     CSMC_DISABLED,
     CSMC_BOTH,
     CSMC_TEXTURE,
-    CSMC_SIZE
+    CSMC_SIZE,
 } ChestStyleMatchesContentsType;
 
 typedef enum {
     SGIA_DISABLED,
     SGIA_JUNK,
     SGIA_ALL,
-    SGIA_SIZE
+    SGIA_SIZE,
 } SkipGetItemAnimationType;
 
 typedef enum {
@@ -30,8 +30,8 @@ typedef enum {
 
 typedef enum {
     BUNNY_HOOD_VANILLA,
+    BUNNY_HOOD_FAST,
     BUNNY_HOOD_FAST_AND_JUMP,
-    BUNNY_HOOD_FAST
 } BunnyHoodMode;
 
 typedef enum {
@@ -39,7 +39,7 @@ typedef enum {
     MIRRORED_WORLD_ALWAYS,
     MIRRORED_WORLD_RANDOM,
     MIRRORED_WORLD_RANDOM_SEEDED,
-    MIRRORED_WORLD_DUNGEONS_All,
+    MIRRORED_WORLD_DUNGEONS_ALL,
     MIRRORED_WORLD_DUNGEONS_VANILLA,
     MIRRORED_WORLD_DUNGEONS_MQ,
     MIRRORED_WORLD_DUNGEONS_RANDOM,
@@ -55,7 +55,7 @@ typedef enum {
 typedef enum {
     BOOTSEQUENCE_DEFAULT,
     BOOTSEQUENCE_AUTHENTIC,
-    BOOTSEQUENCE_FILESELECT
+    BOOTSEQUENCE_FILESELECT,
 } BootSequenceType;
 
 typedef enum {
@@ -75,6 +75,28 @@ typedef enum {
     BONK_DAMAGE_OHKO,
 } BonkDamage;
 
+typedef enum {
+    DAMAGE_VANILLA,
+    DAMAGE_DOUBLE,
+    DAMAGE_QUADRUPLE,
+    DAMAGE_OCTUPLE,
+    DAMAGE_FOOLISH,
+    DAMAGE_RIDICULOUS,
+    DAMAGE_MERCILESS,
+    DAMAGE_TORTURE,
+    DAMAGE_OHKO
+} DamageMultType;
+
+typedef enum {
+    DAMPE_NONE,
+    DAMPE_NORMAL,
+    DAMPE_JALAPENO,
+    DAMPE_CHIPOTLE,
+    DAMPE_SCOTCH_BONNET,
+    DAMPE_GHOST_PEPPER,
+    DAMPE_INFERNO,
+} DampeDropRate;
+
 typedef enum {
     DEKU_STICK_NORMAL,
     DEKU_STICK_UNBREAKABLE,
@@ -87,4 +109,16 @@ typedef enum {
     SWORD_TOGGLE_BOTH_AGES,
 } SwordToggleMode;
 
+typedef enum {
+    TIME_TRAVEL_DISABLED,
+    TIME_TRAVEL_OOT,
+    TIME_TRAVEL_ANY,
+} TimeTravelType;
+
+typedef enum {
+    WATERFALL_ALWAYS,
+    WATERFALL_ONCE,
+    WATERFALL_NEVER,
+} SleepingWaterfallType;
+
 #endif
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
index 33ebb6cbbf..b3769836b9 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
@@ -48,613 +48,609 @@ GameInteractionEffectQueryResult RemovableGameInteractionEffect::Remove() {
 
 namespace GameInteractionEffect {
 
-    // MARK: - Flags
-    GameInteractionEffectQueryResult SetSceneFlag::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        }
+// MARK: - Flags
+GameInteractionEffectQueryResult SetSceneFlag::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
 
+    return GameInteractionEffectQueryResult::Possible;
+}
+
+void SetSceneFlag::_Apply() {
+    GameInteractor::RawAction::SetSceneFlag(parameters[0], parameters[1], parameters[2]);
+}
+
+GameInteractionEffectQueryResult UnsetSceneFlag::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
+
+    return GameInteractionEffectQueryResult::Possible;
+}
+
+void UnsetSceneFlag::_Apply() {
+    GameInteractor::RawAction::UnsetSceneFlag(parameters[0], parameters[1], parameters[2]);
+}
+
+GameInteractionEffectQueryResult SetFlag::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
+
+    return GameInteractionEffectQueryResult::Possible;
+}
+
+void SetFlag::_Apply() {
+    GameInteractor::RawAction::SetFlag(parameters[0], parameters[1]);
+}
+
+GameInteractionEffectQueryResult UnsetFlag::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
+
+    return GameInteractionEffectQueryResult::Possible;
+}
+
+void UnsetFlag::_Apply() {
+    GameInteractor::RawAction::UnsetFlag(parameters[0], parameters[1]);
+}
+
+// MARK: - ModifyHeartContainers
+GameInteractionEffectQueryResult ModifyHeartContainers::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if ((parameters[0] > 0 && (gSaveContext.healthCapacity + (parameters[0] * 0x10) > 0x140)) ||
+               (parameters[0] < 0 && (gSaveContext.healthCapacity + (parameters[0] * 0x10) < 0x10))) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    }
+
+    return GameInteractionEffectQueryResult::Possible;
+}
+
+void ModifyHeartContainers::_Apply() {
+    GameInteractor::RawAction::AddOrRemoveHealthContainers(parameters[0]);
+}
+
+// MARK: - FillMagic
+GameInteractionEffectQueryResult FillMagic::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if (!gSaveContext.isMagicAcquired || gSaveContext.magic >= ((gSaveContext.isDoubleMagicAcquired + 1) * 48)) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
+}
+void FillMagic::_Apply() {
+    GameInteractor::RawAction::AddOrRemoveMagic(96);
+}
 
-    void SetSceneFlag::_Apply() {
-        GameInteractor::RawAction::SetSceneFlag(parameters[0], parameters[1], parameters[2]);
-    }
-
-    GameInteractionEffectQueryResult UnsetSceneFlag::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        }
-
+// MARK: - EmptyMagic
+GameInteractionEffectQueryResult EmptyMagic::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if (!gSaveContext.isMagicAcquired || gSaveContext.magic <= 0) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
+}
+void EmptyMagic::_Apply() {
+    GameInteractor::RawAction::AddOrRemoveMagic(-96);
+}
 
-    void UnsetSceneFlag::_Apply() {
-        GameInteractor::RawAction::UnsetSceneFlag(parameters[0], parameters[1], parameters[2]);
-    }
-
-    GameInteractionEffectQueryResult SetFlag::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        }
-
+// MARK: - ModifyRupees
+GameInteractionEffectQueryResult ModifyRupees::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if ((parameters[0] < 0 && gSaveContext.rupees <= 0) ||
+               (parameters[0] > 0 && gSaveContext.rupees >= CUR_CAPACITY(UPG_WALLET))) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ModifyRupees::_Apply() {
+    Rupees_ChangeBy(parameters[0]);
+}
 
-    void SetFlag::_Apply() {
-        GameInteractor::RawAction::SetFlag(parameters[0], parameters[1]);
-    }
-
-    GameInteractionEffectQueryResult UnsetFlag::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        }
-
+// MARK: - NoUI
+GameInteractionEffectQueryResult NoUI::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
+}
+void NoUI::_Apply() {
+    GameInteractor::State::NoUIActive = 1;
+}
+void NoUI::_Remove() {
+    GameInteractor::State::NoUIActive = 0;
+}
 
-    void UnsetFlag::_Apply() {
-        GameInteractor::RawAction::UnsetFlag(parameters[0], parameters[1]);
-    }
-
-    // MARK: - ModifyHeartContainers
-    GameInteractionEffectQueryResult ModifyHeartContainers::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (
-                (parameters[0] > 0 && (gSaveContext.healthCapacity + (parameters[0] * 0x10) > 0x140)) ||
-                (parameters[0] < 0 && (gSaveContext.healthCapacity + (parameters[0] * 0x10) < 0x10))
-            ) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        }
-
+// MARK: - ModifyGravity
+GameInteractionEffectQueryResult ModifyGravity::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ModifyGravity::_Apply() {
+    GameInteractor::State::GravityLevel = (GIGravityLevel)parameters[0];
+}
+void ModifyGravity::_Remove() {
+    GameInteractor::State::GravityLevel = GI_GRAVITY_LEVEL_NORMAL;
+}
 
-    void ModifyHeartContainers::_Apply() {
-        GameInteractor::RawAction::AddOrRemoveHealthContainers(parameters[0]);
+// MARK: - ModifyHealth
+GameInteractionEffectQueryResult ModifyHealth::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if ((parameters[0] > 0 && gSaveContext.health == gSaveContext.healthCapacity) ||
+               (parameters[0] < 0 && (gSaveContext.health + (16 * parameters[0]) <= 0))) {
+        return GameInteractionEffectQueryResult::NotPossible;
     }
 
-    // MARK: - FillMagic
-    GameInteractionEffectQueryResult FillMagic::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (!gSaveContext.isMagicAcquired || gSaveContext.magic >= ((gSaveContext.isDoubleMagicAcquired + 1) * 48)) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void FillMagic::_Apply() {
-        GameInteractor::RawAction::AddOrRemoveMagic(96);
-    }
-
-    // MARK: - EmptyMagic
-    GameInteractionEffectQueryResult EmptyMagic::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (!gSaveContext.isMagicAcquired || gSaveContext.magic <= 0) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void EmptyMagic::_Apply() {
-        GameInteractor::RawAction::AddOrRemoveMagic(-96);
-    }
-
-    // MARK: - ModifyRupees
-    GameInteractionEffectQueryResult ModifyRupees::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (
-            (parameters[0] < 0 && gSaveContext.rupees <= 0) ||
-            (parameters[0] > 0 && gSaveContext.rupees >= CUR_CAPACITY(UPG_WALLET))
-        ) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ModifyRupees::_Apply() {
-        Rupees_ChangeBy(parameters[0]);
-    }
-
-    // MARK: - NoUI
-    GameInteractionEffectQueryResult NoUI::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void NoUI::_Apply() {
-        GameInteractor::State::NoUIActive = 1;
-    }
-    void NoUI::_Remove() {
-        GameInteractor::State::NoUIActive = 0;
-    }
-
-    // MARK: - ModifyGravity
-    GameInteractionEffectQueryResult ModifyGravity::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ModifyGravity::_Apply() {
-        GameInteractor::State::GravityLevel = (GIGravityLevel)parameters[0];
-    }
-    void ModifyGravity::_Remove() {
-        GameInteractor::State::GravityLevel = GI_GRAVITY_LEVEL_NORMAL;
-    }
-
-    // MARK: - ModifyHealth
-    GameInteractionEffectQueryResult ModifyHealth::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (
-            (parameters[0] > 0 && gSaveContext.health == gSaveContext.healthCapacity)
-            || (parameters[0] < 0 && (gSaveContext.health + (16 * parameters[0]) <= 0))
-        ) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        }
+    return GameInteractionEffectQueryResult::Possible;
+}
+void ModifyHealth::_Apply() {
+    GameInteractor::RawAction::HealOrDamagePlayer(parameters[0]);
+}
 
+// MARK: - SetPlayerHealth
+GameInteractionEffectQueryResult SetPlayerHealth::CanBeApplied() {
+    Player* player = GET_PLAYER(gPlayState);
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
         return GameInteractionEffectQueryResult::Possible;
     }
-    void ModifyHealth::_Apply() {
-        GameInteractor::RawAction::HealOrDamagePlayer(parameters[0]);
-    }
+}
+void SetPlayerHealth::_Apply() {
+    GameInteractor::RawAction::SetPlayerHealth(parameters[0]);
+}
 
-    // MARK: - SetPlayerHealth
-    GameInteractionEffectQueryResult SetPlayerHealth::CanBeApplied() {
-        Player* player = GET_PLAYER(gPlayState);
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void SetPlayerHealth::_Apply() {
-        GameInteractor::RawAction::SetPlayerHealth(parameters[0]);
+// MARK: - FreezePlayer
+GameInteractionEffectQueryResult FreezePlayer::CanBeApplied() {
+    Player* player = GET_PLAYER(gPlayState);
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void FreezePlayer::_Apply() {
+    GameInteractor::RawAction::FreezePlayer();
+}
 
-    // MARK: - FreezePlayer
-    GameInteractionEffectQueryResult FreezePlayer::CanBeApplied() {
-        Player* player = GET_PLAYER(gPlayState);
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void FreezePlayer::_Apply() {
-        GameInteractor::RawAction::FreezePlayer();
+// MARK: - BurnPlayer
+GameInteractionEffectQueryResult BurnPlayer::CanBeApplied() {
+    Player* player = GET_PLAYER(gPlayState);
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void BurnPlayer::_Apply() {
+    GameInteractor::RawAction::BurnPlayer();
+}
 
-    // MARK: - BurnPlayer
-    GameInteractionEffectQueryResult BurnPlayer::CanBeApplied() {
-        Player* player = GET_PLAYER(gPlayState);
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void BurnPlayer::_Apply() {
-        GameInteractor::RawAction::BurnPlayer();
+// MARK: - ElectrocutePlayer
+GameInteractionEffectQueryResult ElectrocutePlayer::CanBeApplied() {
+    Player* player = GET_PLAYER(gPlayState);
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ElectrocutePlayer::_Apply() {
+    GameInteractor::RawAction::ElectrocutePlayer();
+}
 
-    // MARK: - ElectrocutePlayer
-    GameInteractionEffectQueryResult ElectrocutePlayer::CanBeApplied() {
-        Player* player = GET_PLAYER(gPlayState);
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || !PlayerGrounded(player)) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ElectrocutePlayer::_Apply() {
-        GameInteractor::RawAction::ElectrocutePlayer();
+// MARK: - KnockbackPlayer
+GameInteractionEffectQueryResult KnockbackPlayer::CanBeApplied() {
+    Player* player = GET_PLAYER(gPlayState);
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() ||
+        player->stateFlags2 & PLAYER_STATE2_CRAWLING) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void KnockbackPlayer::_Apply() {
+    GameInteractor::RawAction::KnockbackPlayer(parameters[0]);
+}
 
-    // MARK: - KnockbackPlayer
-    GameInteractionEffectQueryResult KnockbackPlayer::CanBeApplied() {
-        Player* player = GET_PLAYER(gPlayState);
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || player->stateFlags2 & PLAYER_STATE2_CRAWLING) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void KnockbackPlayer::_Apply() {
-        GameInteractor::RawAction::KnockbackPlayer(parameters[0]);
+// MARK: - ModifyLinkSize
+GameInteractionEffectQueryResult ModifyLinkSize::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ModifyLinkSize::_Apply() {
+    GameInteractor::State::LinkSize = (GILinkSize)parameters[0];
+}
+void ModifyLinkSize::_Remove() {
+    GameInteractor::State::LinkSize = GI_LINK_SIZE_RESET;
+}
 
-    // MARK: - ModifyLinkSize
-    GameInteractionEffectQueryResult ModifyLinkSize::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ModifyLinkSize::_Apply() {
-        GameInteractor::State::LinkSize = (GILinkSize)parameters[0];
-    }
-    void ModifyLinkSize::_Remove() {
-        GameInteractor::State::LinkSize = GI_LINK_SIZE_RESET;
+// MARK: - InvisibleLink
+GameInteractionEffectQueryResult InvisibleLink::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void InvisibleLink::_Apply() {
+    GameInteractor::RawAction::SetLinkInvisibility(true);
+}
+void InvisibleLink::_Remove() {
+    GameInteractor::RawAction::SetLinkInvisibility(false);
+}
 
-    // MARK: - InvisibleLink
-    GameInteractionEffectQueryResult InvisibleLink::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void InvisibleLink::_Apply() {
-        GameInteractor::RawAction::SetLinkInvisibility(true);
-    }
-    void InvisibleLink::_Remove() {
-        GameInteractor::RawAction::SetLinkInvisibility(false);
+// MARK: - PacifistMode
+GameInteractionEffectQueryResult PacifistMode::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void PacifistMode::_Apply() {
+    GameInteractor::State::SetPacifistMode(true);
+}
+void PacifistMode::_Remove() {
+    GameInteractor::State::SetPacifistMode(false);
+}
 
-    // MARK: - PacifistMode
-    GameInteractionEffectQueryResult PacifistMode::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void PacifistMode::_Apply() {
-        GameInteractor::State::SetPacifistMode(true);
-    }
-    void PacifistMode::_Remove() {
-        GameInteractor::State::SetPacifistMode(false);
+// MARK: - DisableZTargeting
+GameInteractionEffectQueryResult DisableZTargeting::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void DisableZTargeting::_Apply() {
+    GameInteractor::State::DisableZTargetingActive = 1;
+}
+void DisableZTargeting::_Remove() {
+    GameInteractor::State::DisableZTargetingActive = 0;
+}
 
-    // MARK: - DisableZTargeting
-    GameInteractionEffectQueryResult DisableZTargeting::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void DisableZTargeting::_Apply() {
-        GameInteractor::State::DisableZTargetingActive = 1;
-    }
-    void DisableZTargeting::_Remove() {
-        GameInteractor::State::DisableZTargetingActive = 0;
+// MARK: - WeatherRainstorm
+GameInteractionEffectQueryResult WeatherRainstorm::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void WeatherRainstorm::_Apply() {
+    GameInteractor::RawAction::SetWeatherStorm(true);
+}
+void WeatherRainstorm::_Remove() {
+    GameInteractor::RawAction::SetWeatherStorm(false);
+}
 
-    // MARK: - WeatherRainstorm
-    GameInteractionEffectQueryResult WeatherRainstorm::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void WeatherRainstorm::_Apply() {
-        GameInteractor::RawAction::SetWeatherStorm(true);
-    }
-    void WeatherRainstorm::_Remove() {
-        GameInteractor::RawAction::SetWeatherStorm(false);
+// MARK: - ReverseControls
+GameInteractionEffectQueryResult ReverseControls::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ReverseControls::_Apply() {
+    GameInteractor::State::ReverseControlsActive = 1;
+}
+void ReverseControls::_Remove() {
+    GameInteractor::State::ReverseControlsActive = 0;
+}
 
-    // MARK: - ReverseControls
-    GameInteractionEffectQueryResult ReverseControls::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ReverseControls::_Apply() {
-        GameInteractor::State::ReverseControlsActive = 1;
-    }
-    void ReverseControls::_Remove() {
-        GameInteractor::State::ReverseControlsActive = 0;
+// MARK: - ForceEquipBoots
+GameInteractionEffectQueryResult ForceEquipBoots::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
+}
+void ForceEquipBoots::_Apply() {
+    GameInteractor::RawAction::ForceEquipBoots(parameters[0]);
+}
+void ForceEquipBoots::_Remove() {
+    GameInteractor::RawAction::ForceEquipBoots(EQUIP_VALUE_BOOTS_KOKIRI);
+}
 
-    // MARK: - ForceEquipBoots
-    GameInteractionEffectQueryResult ForceEquipBoots::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
+// MARK: - ModifyMovementSpeedMultiplier
+GameInteractionEffectQueryResult ModifyMovementSpeedMultiplier::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
-    void ForceEquipBoots::_Apply() {
-        GameInteractor::RawAction::ForceEquipBoots(parameters[0]);
-    }
-    void ForceEquipBoots::_Remove() {
-        GameInteractor::RawAction::ForceEquipBoots(EQUIP_VALUE_BOOTS_KOKIRI);
-    }
-
-    // MARK: - ModifyMovementSpeedMultiplier
-    GameInteractionEffectQueryResult ModifyMovementSpeedMultiplier::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ModifyMovementSpeedMultiplier::_Apply() {
-        if (parameters[0] == -2) {
+}
+void ModifyMovementSpeedMultiplier::_Apply() {
+    if (parameters[0] == -2) {
             GameInteractor::State::MovementSpeedMultiplier = 0.5f;
         } else if (parameters[0] == 2) {
             GameInteractor::State::MovementSpeedMultiplier = 2.0f;
         }
-    }
-    void ModifyMovementSpeedMultiplier::_Remove() {
-        GameInteractor::State::MovementSpeedMultiplier = 1.0f;
-    }
+}
+void ModifyMovementSpeedMultiplier::_Remove() {
+    GameInteractor::State::MovementSpeedMultiplier = 1.0f;
+}
 
-    // MARK: - OneHitKO
-    GameInteractionEffectQueryResult OneHitKO::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void OneHitKO::_Apply() {
-        GameInteractor::State::OneHitKOActive = 1;
-    }
-    void OneHitKO::_Remove() {
-        GameInteractor::State::OneHitKOActive = 0;
-    }
-
-    // MARK: - ModifyDefenseModifier
-    GameInteractionEffectQueryResult ModifyDefenseModifier::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ModifyDefenseModifier::_Apply() {
-        GameInteractor::State::DefenseModifier = parameters[0];
-    }
-    void ModifyDefenseModifier::_Remove() {
-        GameInteractor::State::DefenseModifier = 0;
-    }
-
-    // MARK: - GiveOrTakeShield
-    GameInteractionEffectQueryResult GiveOrTakeShield::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if ((parameters[0] > 0 && ((gBitFlags[parameters[0] - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) &
-                                           gSaveContext.inventory.equipment)) ||
-                   (parameters[0] < 0 && !((gBitFlags[(parameters[0] * -1) - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) &
-                                           gSaveContext.inventory.equipment))) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void GiveOrTakeShield::_Apply() {
-        GameInteractor::RawAction::GiveOrTakeShield(parameters[0]);
-    }
-
-    // MARK: - TeleportPlayer
-    GameInteractionEffectQueryResult TeleportPlayer::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void TeleportPlayer::_Apply() {
-        GameInteractor::RawAction::TeleportPlayer(parameters[0]);
-    }
-
-    // MARK: - ClearAssignedButtons
-    GameInteractionEffectQueryResult ClearAssignedButtons::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void ClearAssignedButtons::_Apply() {
-        GameInteractor::RawAction::ClearAssignedButtons(parameters[0]);
-    }
-
-    // MARK: - SetTimeOfDay
-    GameInteractionEffectQueryResult SetTimeOfDay::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void SetTimeOfDay::_Apply() {
-        GameInteractor::RawAction::SetTimeOfDay(parameters[0]);
-    }
-
-    // MARK: - SetCollisionViewer
-    GameInteractionEffectQueryResult SetCollisionViewer::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void SetCollisionViewer::_Apply() {
-        GameInteractor::RawAction::SetCollisionViewer(true);
-    }
-    void SetCollisionViewer::_Remove() {
-        GameInteractor::RawAction::SetCollisionViewer(false);
-    }
-
-    // MARK: - RandomizeCosmetics
-    GameInteractionEffectQueryResult RandomizeCosmetics::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void RandomizeCosmetics::_Apply() {
-        CosmeticsEditor_RandomizeAll();
-    }
-
-    // MARK: - PressButton
-    GameInteractionEffectQueryResult PressButton::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void PressButton::_Apply() {
-        GameInteractor::RawAction::EmulateButtonPress(parameters[0]);
-    }
-
-    // MARK: - PressRandomButton
-    GameInteractionEffectQueryResult PressRandomButton::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void PressRandomButton::_Apply() {
-        GameInteractor::RawAction::EmulateRandomButtonPress(parameters[0]);
-    }
-
-    // MARK: - AddOrTakeAmmo
-    GameInteractionEffectQueryResult AddOrTakeAmmo::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else if (!GameInteractor::CanAddOrTakeAmmo(parameters[0], parameters[1])) {
-            return GameInteractionEffectQueryResult::NotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void AddOrTakeAmmo::_Apply() {
-        GameInteractor::RawAction::AddOrTakeAmmo(parameters[0], parameters[1]);
-    }
-
-    // MARK: - RandomBombFuseTimer
-    GameInteractionEffectQueryResult RandomBombFuseTimer::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void RandomBombFuseTimer::_Apply() {
-        GameInteractor::State::RandomBombFuseTimerActive = 1;
-    }
-    void RandomBombFuseTimer::_Remove() {
-        GameInteractor::State::RandomBombFuseTimerActive = 0;
-    }
-
-    // MARK: - DisableLedgeGrabs
-    GameInteractionEffectQueryResult DisableLedgeGrabs::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void DisableLedgeGrabs::_Apply() {
-        GameInteractor::State::DisableLedgeGrabsActive = 1;
-    }
-    void DisableLedgeGrabs::_Remove() {
-        GameInteractor::State::DisableLedgeGrabsActive = 0;
-    }
-
-    // MARK: - RandomWind
-    GameInteractionEffectQueryResult RandomWind::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void RandomWind::_Apply() {
-        GameInteractor::RawAction::SetRandomWind(true);
-    }
-    void RandomWind::_Remove() {
-        GameInteractor::RawAction::SetRandomWind(false);
-    }
-
-    // MARK: - RandomBonks
-    GameInteractionEffectQueryResult RandomBonks::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void RandomBonks::_Apply() {
-        GameInteractor::State::RandomBonksActive = 1;
-    }
-    void RandomBonks::_Remove() {
-        GameInteractor::State::RandomBonksActive = 0;
-    }
-
-    // MARK: - PlayerInvincibility
-    GameInteractionEffectQueryResult PlayerInvincibility::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void PlayerInvincibility::_Apply() {
-        GameInteractor::RawAction::SetPlayerInvincibility(true);
-    }
-    void PlayerInvincibility::_Remove() {
-        GameInteractor::RawAction::SetPlayerInvincibility(false);
-    }
-
-    // MARK: - SlipperyFloor
-    GameInteractionEffectQueryResult SlipperyFloor::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-        } else {
-            return GameInteractionEffectQueryResult::Possible;
-        }
-    }
-    void SlipperyFloor::_Apply() {
-        GameInteractor::State::SlipperyFloorActive = 1;
-    }
-    void SlipperyFloor::_Remove() {
-        GameInteractor::State::SlipperyFloorActive = 0;
-    }
-
-    // MARK: - SpawnEnemyWithOffset
-    GameInteractionEffectQueryResult SpawnEnemyWithOffset::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-    }
-            return GameInteractor::RawAction::SpawnEnemyWithOffset(parameters[0], parameters[1]);
-    }
-
-    void SpawnEnemyWithOffset::_Apply() {
-        GameInteractor::RawAction::SpawnEnemyWithOffset(parameters[0], parameters[1]);
-    }
-
-    // MARK: - SpawnActor
-    GameInteractionEffectQueryResult SpawnActor::CanBeApplied() {
-        if (!GameInteractor::IsSaveLoaded()) {
-            return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-    }
-            return GameInteractor::RawAction::SpawnActor(parameters[0], parameters[1]);
-    }
-
-    void SpawnActor::_Apply() {
-        GameInteractor::RawAction::SpawnActor(parameters[0], parameters[1]);
+// MARK: - OneHitKO
+GameInteractionEffectQueryResult OneHitKO::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
     }
 }
+void OneHitKO::_Apply() {
+    GameInteractor::State::OneHitKOActive = 1;
+}
+void OneHitKO::_Remove() {
+    GameInteractor::State::OneHitKOActive = 0;
+}
+
+// MARK: - ModifyDefenseModifier
+GameInteractionEffectQueryResult ModifyDefenseModifier::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void ModifyDefenseModifier::_Apply() {
+    GameInteractor::State::DefenseModifier = parameters[0];
+}
+void ModifyDefenseModifier::_Remove() {
+    GameInteractor::State::DefenseModifier = 0;
+}
+
+// MARK: - GiveOrTakeShield
+GameInteractionEffectQueryResult GiveOrTakeShield::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if ((parameters[0] > 0 && ((gBitFlags[parameters[0] - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) &
+                                      gSaveContext.inventory.equipment)) ||
+               (parameters[0] < 0 &&
+                !((gBitFlags[(parameters[0] * -1) - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) &
+                  gSaveContext.inventory.equipment))) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void GiveOrTakeShield::_Apply() {
+    GameInteractor::RawAction::GiveOrTakeShield(parameters[0]);
+}
+
+// MARK: - TeleportPlayer
+GameInteractionEffectQueryResult TeleportPlayer::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void TeleportPlayer::_Apply() {
+    GameInteractor::RawAction::TeleportPlayer(parameters[0]);
+}
+
+// MARK: - ClearAssignedButtons
+GameInteractionEffectQueryResult ClearAssignedButtons::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void ClearAssignedButtons::_Apply() {
+    GameInteractor::RawAction::ClearAssignedButtons(parameters[0]);
+}
+
+// MARK: - SetTimeOfDay
+GameInteractionEffectQueryResult SetTimeOfDay::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void SetTimeOfDay::_Apply() {
+    GameInteractor::RawAction::SetTimeOfDay(parameters[0]);
+}
+
+// MARK: - SetCollisionViewer
+GameInteractionEffectQueryResult SetCollisionViewer::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void SetCollisionViewer::_Apply() {
+    GameInteractor::RawAction::SetCollisionViewer(true);
+}
+void SetCollisionViewer::_Remove() {
+    GameInteractor::RawAction::SetCollisionViewer(false);
+}
+
+// MARK: - RandomizeCosmetics
+GameInteractionEffectQueryResult RandomizeCosmetics::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void RandomizeCosmetics::_Apply() {
+    CosmeticsEditor_RandomizeAll();
+}
+
+// MARK: - PressButton
+GameInteractionEffectQueryResult PressButton::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void PressButton::_Apply() {
+    GameInteractor::RawAction::EmulateButtonPress(parameters[0]);
+}
+
+// MARK: - PressRandomButton
+GameInteractionEffectQueryResult PressRandomButton::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void PressRandomButton::_Apply() {
+    GameInteractor::RawAction::EmulateRandomButtonPress(parameters[0]);
+}
+
+// MARK: - AddOrTakeAmmo
+GameInteractionEffectQueryResult AddOrTakeAmmo::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else if (!GameInteractor::CanAddOrTakeAmmo(parameters[0], parameters[1])) {
+        return GameInteractionEffectQueryResult::NotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void AddOrTakeAmmo::_Apply() {
+    GameInteractor::RawAction::AddOrTakeAmmo(parameters[0], parameters[1]);
+}
+
+// MARK: - RandomBombFuseTimer
+GameInteractionEffectQueryResult RandomBombFuseTimer::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void RandomBombFuseTimer::_Apply() {
+    GameInteractor::State::RandomBombFuseTimerActive = 1;
+}
+void RandomBombFuseTimer::_Remove() {
+    GameInteractor::State::RandomBombFuseTimerActive = 0;
+}
+
+// MARK: - DisableLedgeGrabs
+GameInteractionEffectQueryResult DisableLedgeGrabs::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void DisableLedgeGrabs::_Apply() {
+    GameInteractor::State::DisableLedgeGrabsActive = 1;
+}
+void DisableLedgeGrabs::_Remove() {
+    GameInteractor::State::DisableLedgeGrabsActive = 0;
+}
+
+// MARK: - RandomWind
+GameInteractionEffectQueryResult RandomWind::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void RandomWind::_Apply() {
+    GameInteractor::RawAction::SetRandomWind(true);
+}
+void RandomWind::_Remove() {
+    GameInteractor::RawAction::SetRandomWind(false);
+}
+
+// MARK: - RandomBonks
+GameInteractionEffectQueryResult RandomBonks::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void RandomBonks::_Apply() {
+    GameInteractor::State::RandomBonksActive = 1;
+}
+void RandomBonks::_Remove() {
+    GameInteractor::State::RandomBonksActive = 0;
+}
+
+// MARK: - PlayerInvincibility
+GameInteractionEffectQueryResult PlayerInvincibility::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void PlayerInvincibility::_Apply() {
+    GameInteractor::RawAction::SetPlayerInvincibility(true);
+}
+void PlayerInvincibility::_Remove() {
+    GameInteractor::RawAction::SetPlayerInvincibility(false);
+}
+
+// MARK: - SlipperyFloor
+GameInteractionEffectQueryResult SlipperyFloor::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    } else {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+}
+void SlipperyFloor::_Apply() {
+    GameInteractor::State::SlipperyFloorActive = 1;
+}
+void SlipperyFloor::_Remove() {
+    GameInteractor::State::SlipperyFloorActive = 0;
+}
+
+// MARK: - SpawnEnemyWithOffset
+GameInteractionEffectQueryResult SpawnEnemyWithOffset::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
+    return GameInteractor::RawAction::SpawnEnemyWithOffset(parameters[0], parameters[1]);
+}
+
+void SpawnEnemyWithOffset::_Apply() {
+    GameInteractor::RawAction::SpawnEnemyWithOffset(parameters[0], parameters[1]);
+}
+
+// MARK: - SpawnActor
+GameInteractionEffectQueryResult SpawnActor::CanBeApplied() {
+    if (!GameInteractor::IsSaveLoaded()) {
+        return GameInteractionEffectQueryResult::TemporarilyNotPossible;
+    }
+    return GameInteractor::RawAction::SpawnActor(parameters[0], parameters[1]);
+}
+
+void SpawnActor::_Apply() {
+    GameInteractor::RawAction::SpawnActor(parameters[0], parameters[1]);
+}
+} // namespace GameInteractionEffect
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
index de6cb50bf6..47893d116a 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
@@ -6,266 +6,264 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
-enum GameInteractionEffectQueryResult {
-    Possible                = 0x00,
-    TemporarilyNotPossible  = 0x01,
-    NotPossible             = 0xFF
-};
+enum GameInteractionEffectQueryResult { Possible = 0x00, TemporarilyNotPossible = 0x01, NotPossible = 0xFF };
 
 class GameInteractionEffectBase {
-public:
+  public:
     virtual GameInteractionEffectQueryResult CanBeApplied() = 0;
     GameInteractionEffectQueryResult Apply();
-protected:
+
+  protected:
     virtual void _Apply() = 0;
 };
 
-class RemovableGameInteractionEffect: public GameInteractionEffectBase {
-public:
+class RemovableGameInteractionEffect : public GameInteractionEffectBase {
+  public:
     virtual GameInteractionEffectQueryResult CanBeRemoved();
     GameInteractionEffectQueryResult Remove();
-protected:
-    virtual void _Remove() {};
+
+  protected:
+    virtual void _Remove(){};
 };
 
 class ParameterizedGameInteractionEffect {
-public:
+  public:
     int32_t parameters[3];
 };
 
 namespace GameInteractionEffect {
-    class SetSceneFlag: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class SetSceneFlag : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class UnsetSceneFlag: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class UnsetSceneFlag : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class SetFlag: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class SetFlag : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class UnsetFlag: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class UnsetFlag : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class ModifyHeartContainers: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class ModifyHeartContainers : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class FillMagic: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class FillMagic : public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class EmptyMagic: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class EmptyMagic : public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class ModifyRupees: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class ModifyRupees : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class NoUI: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class NoUI : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ModifyGravity: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ModifyGravity : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ModifyHealth: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class ModifyHealth : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class SetPlayerHealth: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class SetPlayerHealth : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class FreezePlayer: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class FreezePlayer : public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class BurnPlayer: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class BurnPlayer : public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class ElectrocutePlayer: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class ElectrocutePlayer : public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class KnockbackPlayer: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class KnockbackPlayer : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class ModifyLinkSize: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ModifyLinkSize : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class InvisibleLink : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class InvisibleLink : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class PacifistMode : public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class PacifistMode : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class DisableZTargeting: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class DisableZTargeting : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class WeatherRainstorm: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class WeatherRainstorm : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ReverseControls: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ReverseControls : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ForceEquipBoots: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ForceEquipBoots : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ModifyMovementSpeedMultiplier: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ModifyMovementSpeedMultiplier: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class OneHitKO : public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class OneHitKO : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class ModifyDefenseModifier: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class ModifyDefenseModifier : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class GiveOrTakeShield: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class GiveOrTakeShield : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class TeleportPlayer: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class TeleportPlayer : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class ClearAssignedButtons: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class ClearAssignedButtons : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class SetTimeOfDay: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class SetTimeOfDay : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class SetCollisionViewer: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class SetCollisionViewer : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class RandomizeCosmetics: public GameInteractionEffectBase {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class RandomizeCosmetics: public GameInteractionEffectBase {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class PressButton: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class PressButton : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class PressRandomButton: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class PressRandomButton : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class AddOrTakeAmmo: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
+class AddOrTakeAmmo : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
 
-    class RandomBombFuseTimer: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class RandomBombFuseTimer : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class DisableLedgeGrabs: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class DisableLedgeGrabs : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class RandomWind: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class RandomWind : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class RandomBonks: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class RandomBonks : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class PlayerInvincibility: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
+class PlayerInvincibility : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
 
-    class SlipperyFloor: public RemovableGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-        void _Remove() override;
-    };
-    class SpawnEnemyWithOffset: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
-    class SpawnActor: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
-        GameInteractionEffectQueryResult CanBeApplied() override;
-        void _Apply() override;
-    };
-}
+class SlipperyFloor : public RemovableGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+    void _Remove() override;
+};
+class SpawnEnemyWithOffset : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
+class SpawnActor : public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+    GameInteractionEffectQueryResult CanBeApplied() override;
+    void _Apply() override;
+};
+} // namespace GameInteractionEffect
 
 #endif /* __cplusplus */
 #endif /* GameInteractionEffect_h */
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
index dbb4782fd6..fb3db74df2 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
 GameInteractor is meant to be used for interacting with the game (yup...).
 It exposes functions that directly modify, add or remove game related elements.
 
@@ -54,7 +54,10 @@ bool GameInteractor::IsSaveLoaded(bool allowDbgSave) {
 
 bool GameInteractor::IsGameplayPaused() {
     Player* player = GET_PLAYER(gPlayState);
-    return (Player_InBlockingCsMode(gPlayState, player) || gPlayState->pauseCtx.state != 0 || gPlayState->msgCtx.msgMode != 0) ? true : false;
+    return (Player_InBlockingCsMode(gPlayState, player) || gPlayState->pauseCtx.state != 0 ||
+            gPlayState->msgCtx.msgMode != 0)
+               ? true
+               : false;
 }
 
 bool GameInteractor::CanSpawnActor() {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 3fbfbe5b7f..8ac2d9dda3 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -4,8 +4,8 @@
 #define GameInteractor_h
 
 #include "libultraship/libultraship.h"
-#include "GameInteractionEffect.h"
 #include "vanilla-behavior/GIVanillaBehavior.h"
+#include "GameInteractionEffect.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include <z64.h>
 
@@ -92,19 +92,20 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 }
 #endif
 
-
 #ifdef __cplusplus
 #include <stdarg.h>
 #include <thread>
+#include <map>
 #include <unordered_map>
 #include <vector>
 #include <functional>
 #include <string>
+
 #include <version>
 #ifdef __cpp_lib_source_location
 #include <source_location>
 #else
-#pragma message("Compiling without <source_location> support, the Hook Debugger will not be avaliable")
+#pragma message("Compiling without <source_location> support, the Hook Debugger will not be available")
 #endif
 
 typedef uint32_t HOOK_ID;
@@ -124,24 +125,31 @@ struct HookRegisteringInfo {
     const char* function;
     HookType type;
 
-    HookRegisteringInfo() : valid(false), file("unknown file"), line(0), column(0), function("unknown function"), type(HOOK_TYPE_NORMAL) {}
+    HookRegisteringInfo()
+        : valid(false), file("unknown file"), line(0), column(0), function("unknown function"), type(HOOK_TYPE_NORMAL) {
+    }
 
-    HookRegisteringInfo(const char* _file, std::uint_least32_t _line, std::uint_least32_t _column, const char* _function, HookType _type) :
-        valid(true), file(_file), line(_line), column(_column), function(_function), type(_type) {}
+    HookRegisteringInfo(const char* _file, std::uint_least32_t _line, std::uint_least32_t _column,
+                        const char* _function, HookType _type)
+        : valid(true), file(_file), line(_line), column(_column), function(_function), type(_type) {
+        // Trim off user parent directories
+        const char* trimmed = strstr(_file, "soh/soh/");
+        if (trimmed != nullptr) {
+            file = trimmed;
+        }
+    }
 };
 
 struct HookInfo {
     uint32_t calls;
     HookRegisteringInfo registering;
-
-    HookInfo() : calls(0), registering(HookRegisteringInfo{}) {}
-    HookInfo(HookRegisteringInfo _registering) : calls(0), registering(_registering) {}
 };
 
 #ifdef __cpp_lib_source_location
-#define GET_CURRENT_REGISTERING_INFO(type) HookRegisteringInfo{location.file_name(), location.line(), location.column(), location.function_name(), type}
+#define GET_CURRENT_REGISTERING_INFO(type) \
+    (HookRegisteringInfo{ location.file_name(), location.line(), location.column(), location.function_name(), type })
 #else
-#define GET_CURRENT_REGISTERING_INFO(type) HookRegisteringInfo{}
+#define GET_CURRENT_REGISTERING_INFO(type) (HookRegisteringInfo{})
 #endif
 
 #define REGISTER_VB_SHOULD(flag, body)                                                  \
@@ -171,23 +179,23 @@ struct HookInfo {
             hookId = GameInteractor::Instance->RegisterGameHookForID<GameInteractor::hookType>(id, body); \
         }                                                                                                 \
     }
-#define COND_VB_SHOULD(id, condition, body)                                                               \
-    {                                                                                                     \
-        static HOOK_ID hookId = 0;                                                                        \
+#define COND_VB_SHOULD(id, condition, body)                                                           \
+    {                                                                                                 \
+        static HOOK_ID hookId = 0;                                                                    \
         GameInteractor::Instance->UnregisterGameHookForID<GameInteractor::OnVanillaBehavior>(hookId); \
-        hookId = 0;                                                                                       \
-        if (condition) {                                                                                  \
-            hookId = REGISTER_VB_SHOULD(id, body);                                                        \
-        }                                                                                                 \
+        hookId = 0;                                                                                   \
+        if (condition) {                                                                              \
+            hookId = REGISTER_VB_SHOULD(id, body);                                                    \
+        }                                                                                             \
     }
 
 class GameInteractor {
-public:
+  public:
     static GameInteractor* Instance;
 
     // Game State
     class State {
-    public:
+      public:
         static bool NoUIActive;
         static GILinkSize LinkSize;
         static bool InvisibleLinkActive;
@@ -219,14 +227,15 @@ public:
 
     // Game Hooks
     HOOK_ID nextHookId = 1;
+
     template <typename H> struct RegisteredGameHooks {
         inline static std::unordered_map<HOOK_ID, typename H::fn> functions;
         inline static std::unordered_map<int32_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForID;
         inline static std::unordered_map<uintptr_t, std::unordered_map<HOOK_ID, typename H::fn>> functionsForPtr;
         inline static std::unordered_map<HOOK_ID, std::pair<typename H::filter, typename H::fn>> functionsForFilter;
 
-        //Used for the hook debugger
-        inline static std::unordered_map<HOOK_ID, HookInfo> hookData;
+        // Used for the hook debugger
+        inline static std::map<HOOK_ID, HookInfo> hookData;
     };
 
     template <typename H> struct HooksToUnregister {
@@ -236,39 +245,43 @@ public:
         inline static std::vector<HOOK_ID> hooksForFilter;
     };
 
-    template <typename H> std::unordered_map<uint32_t, HookInfo>* GetHookData() {
+    template <typename H> std::map<uint32_t, HookInfo>* GetHookData() {
         return &RegisteredGameHooks<H>::hookData;
     }
 
     // General Hooks
-    template <typename H> HOOK_ID RegisterGameHook(
-        typename H::fn h
+    template <typename H>
 #ifdef __cpp_lib_source_location
-        , const std::source_location location = std::source_location::current()
+    HOOK_ID RegisterGameHook(typename H::fn h, const std::source_location location = std::source_location::current()) {
+#else
+    HOOK_ID RegisterGameHook(typename H::fn h) {
 #endif
-    ) {
-        // Ensure hook id is unique and not 0, which is reserved for invalid hooks
-        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX)
+            this->nextHookId = 1;
         while (RegisteredGameHooks<H>::functions.find(this->nextHookId) != RegisteredGameHooks<H>::functions.end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functions[this->nextHookId] = h;
-        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_NORMAL)};
+        RegisteredGameHooks<H>::hookData[this->nextHookId] =
+            HookInfo{ 0, GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_NORMAL) };
         return this->nextHookId++;
     }
 
     template <typename H> void UnregisterGameHook(HOOK_ID hookId) {
-        if (hookId == 0) return;
+        if (hookId == 0)
+            return;
         HooksToUnregister<H>::hooks.push_back(hookId);
     }
 
     template <typename H, typename... Args> void ExecuteHooks(Args&&... args) {
+        // Remove pending hooks for this type
         for (auto& hookId : HooksToUnregister<H>::hooks) {
             RegisteredGameHooks<H>::functions.erase(hookId);
             RegisteredGameHooks<H>::hookData.erase(hookId);
         }
         HooksToUnregister<H>::hooks.clear();
+        // Execute hooks
         for (auto& hook : RegisteredGameHooks<H>::functions) {
             hook.second(std::forward<Args>(args)...);
             RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
@@ -276,39 +289,60 @@ public:
     }
 
     // ID based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForID(
-        int32_t id, typename H::fn h
+    template <typename H>
 #ifdef __cpp_lib_source_location
-        , const std::source_location location = std::source_location::current()
+    HOOK_ID RegisterGameHookForID(int32_t id, typename H::fn h,
+                                  std::source_location location = std::source_location::current()) {
+#else
+    HOOK_ID RegisterGameHookForID(int32_t id, typename H::fn h) {
 #endif
-    ) {
-        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
-        while (RegisteredGameHooks<H>::functionsForID[id].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForID[id].end()) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX)
+            this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForID[id].find(this->nextHookId) !=
+               RegisteredGameHooks<H>::functionsForID[id].end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForID[id][this->nextHookId] = h;
-        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_ID)};
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{ 0, GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_ID) };
         return this->nextHookId++;
     }
 
     template <typename H> void UnregisterGameHookForID(HOOK_ID hookId) {
-        if (hookId == 0) return;
+        if (hookId == 0)
+            return;
         HooksToUnregister<H>::hooksForID.push_back(hookId);
     }
 
     template <typename H, typename... Args> void ExecuteHooksForID(int32_t id, Args&&... args) {
-        for (auto& hookId : HooksToUnregister<H>::hooksForID) {
-            for (auto it = RegisteredGameHooks<H>::functionsForID[id].begin(); it != RegisteredGameHooks<H>::functionsForID[id].end(); ) {
-                if (it->first == hookId) {
+        // Remove pending hooks for this type
+        for (auto hookIdIt = HooksToUnregister<H>::hooksForID.begin();
+             hookIdIt != HooksToUnregister<H>::hooksForID.end();) {
+            bool remove = false;
+
+            if (RegisteredGameHooks<H>::functionsForID[id].size() == 0) {
+                break;
+            }
+
+            for (auto it = RegisteredGameHooks<H>::functionsForID[id].begin();
+                 it != RegisteredGameHooks<H>::functionsForID[id].end();) {
+                if (it->first == *hookIdIt) {
                     it = RegisteredGameHooks<H>::functionsForID[id].erase(it);
-                    HooksToUnregister<H>::hooksForID.erase(std::remove(HooksToUnregister<H>::hooksForID.begin(), HooksToUnregister<H>::hooksForID.end(), hookId), HooksToUnregister<H>::hooksForID.end());
-                    RegisteredGameHooks<H>::hookData.erase(hookId);
+                    RegisteredGameHooks<H>::hookData.erase(*hookIdIt);
+                    remove = true;
+                    break;
                 } else {
                     ++it;
                 }
             }
+
+            if (remove) {
+                hookIdIt = HooksToUnregister<H>::hooksForID.erase(hookIdIt);
+            } else {
+                ++hookIdIt;
+            }
         }
+        // Execute hooks
         for (auto& hook : RegisteredGameHooks<H>::functionsForID[id]) {
             hook.second(std::forward<Args>(args)...);
             RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
@@ -316,39 +350,60 @@ public:
     }
 
     // PTR based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForPtr(
-        uintptr_t ptr, typename H::fn h
+    template <typename H>
 #ifdef __cpp_lib_source_location
-        , const std::source_location location = std::source_location::current()
+    HOOK_ID RegisterGameHookForPtr(uintptr_t ptr, typename H::fn h,
+                                   const std::source_location location = std::source_location::current()) {
+#else
+    HOOK_ID RegisterGameHookForPtr(uintptr_t ptr, typename H::fn h) {
 #endif
-    ) {
-        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
-        while (RegisteredGameHooks<H>::functionsForPtr[ptr].find(this->nextHookId) != RegisteredGameHooks<H>::functionsForPtr[ptr].end()) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX)
+            this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForPtr[ptr].find(this->nextHookId) !=
+               RegisteredGameHooks<H>::functionsForPtr[ptr].end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForPtr[ptr][this->nextHookId] = h;
-        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_PTR)};
+        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{ 0, GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_PTR) };
         return this->nextHookId++;
     }
 
     template <typename H> void UnregisterGameHookForPtr(HOOK_ID hookId) {
-        if (hookId == 0) return;
+        if (hookId == 0)
+            return;
         HooksToUnregister<H>::hooksForPtr.push_back(hookId);
     }
 
     template <typename H, typename... Args> void ExecuteHooksForPtr(uintptr_t ptr, Args&&... args) {
-        for (auto& hookId : HooksToUnregister<H>::hooksForPtr) {
-            for (auto it = RegisteredGameHooks<H>::functionsForPtr[ptr].begin(); it != RegisteredGameHooks<H>::functionsForPtr[ptr].end(); ) {
-                if (it->first == hookId) {
+        // Remove pending hooks for this type
+        for (auto hookIdIt = HooksToUnregister<H>::hooksForPtr.begin();
+             hookIdIt != HooksToUnregister<H>::hooksForPtr.end();) {
+            bool remove = false;
+
+            if (RegisteredGameHooks<H>::functionsForPtr[ptr].size() == 0) {
+                break;
+            }
+
+            for (auto it = RegisteredGameHooks<H>::functionsForPtr[ptr].begin();
+                 it != RegisteredGameHooks<H>::functionsForPtr[ptr].end();) {
+                if (it->first == *hookIdIt) {
                     it = RegisteredGameHooks<H>::functionsForPtr[ptr].erase(it);
-                    HooksToUnregister<H>::hooksForPtr.erase(std::remove(HooksToUnregister<H>::hooksForPtr.begin(), HooksToUnregister<H>::hooksForPtr.end(), hookId), HooksToUnregister<H>::hooksForPtr.end());
-                    RegisteredGameHooks<H>::hookData.erase(hookId);
+                    RegisteredGameHooks<H>::hookData.erase(*hookIdIt);
+                    remove = true;
+                    break;
                 } else {
                     ++it;
                 }
             }
+
+            if (remove) {
+                hookIdIt = HooksToUnregister<H>::hooksForPtr.erase(hookIdIt);
+            } else {
+                ++hookIdIt;
+            }
         }
+        // Execute hooks
         for (auto& hook : RegisteredGameHooks<H>::functionsForPtr[ptr]) {
             hook.second(std::forward<Args>(args)...);
             RegisteredGameHooks<H>::hookData[hook.first].calls += 1;
@@ -356,33 +411,40 @@ public:
     }
 
     // Filter based Hooks
-    template <typename H> HOOK_ID RegisterGameHookForFilter(
-        typename H::filter f, typename H::fn h
+    template <typename H>
 #ifdef __cpp_lib_source_location
-        , const std::source_location location = std::source_location::current()
+    HOOK_ID RegisterGameHookForFilter(typename H::filter f, typename H::fn h,
+                                      const std::source_location location = std::source_location::current()) {
+#else
+    HOOK_ID RegisterGameHookForFilter(typename H::filter f, typename H::fn h) {
 #endif
-    ) {
-        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX) this->nextHookId = 1;
-        while (RegisteredGameHooks<H>::functionsForFilter.find(this->nextHookId) != RegisteredGameHooks<H>::functionsForFilter.end()) {
+        if (this->nextHookId == 0 || this->nextHookId >= UINT32_MAX)
+            this->nextHookId = 1;
+        while (RegisteredGameHooks<H>::functionsForFilter.find(this->nextHookId) !=
+               RegisteredGameHooks<H>::functionsForFilter.end()) {
             this->nextHookId++;
         }
 
         RegisteredGameHooks<H>::functionsForFilter[this->nextHookId] = std::make_pair(f, h);
-        RegisteredGameHooks<H>::hookData[this->nextHookId] = HookInfo{GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_FILTER)};
+        RegisteredGameHooks<H>::hookData[this->nextHookId] =
+            HookInfo{ 0, GET_CURRENT_REGISTERING_INFO(HOOK_TYPE_FILTER) };
         return this->nextHookId++;
     }
 
     template <typename H> void UnregisterGameHookForFilter(HOOK_ID hookId) {
-        if (hookId == 0) return;
+        if (hookId == 0)
+            return;
         HooksToUnregister<H>::hooksForFilter.push_back(hookId);
     }
 
     template <typename H, typename... Args> void ExecuteHooksForFilter(Args&&... args) {
+        // Remove pending hooks for this type
         for (auto& hookId : HooksToUnregister<H>::hooksForFilter) {
             RegisteredGameHooks<H>::functionsForFilter.erase(hookId);
             RegisteredGameHooks<H>::hookData.erase(hookId);
         }
         HooksToUnregister<H>::hooksForFilter.clear();
+        // Execute hooks
         for (auto& hook : RegisteredGameHooks<H>::functionsForFilter) {
             if (hook.second.first(std::forward<Args>(args)...)) {
                 hook.second.second(std::forward<Args>(args)...);
@@ -391,8 +453,62 @@ public:
         }
     }
 
+    template <typename H> void ProcessUnregisteredHooks() {
+        // Normal
+        for (auto& hookId : HooksToUnregister<H>::hooks) {
+            RegisteredGameHooks<H>::functions.erase(hookId);
+            RegisteredGameHooks<H>::hookData.erase(hookId);
+        }
+        HooksToUnregister<H>::hooks.clear();
+
+        // ID
+        for (auto& hookId : HooksToUnregister<H>::hooksForID) {
+            for (auto& idGroup : RegisteredGameHooks<H>::functionsForID) {
+                for (auto it = idGroup.second.begin(); it != idGroup.second.end();) {
+                    if (it->first == hookId) {
+                        it = idGroup.second.erase(it);
+                        RegisteredGameHooks<H>::hookData.erase(hookId);
+                    } else {
+                        ++it;
+                    }
+                }
+            }
+        }
+        HooksToUnregister<H>::hooksForID.clear();
+
+        // Ptr
+        for (auto& hookId : HooksToUnregister<H>::hooksForPtr) {
+            for (auto& ptrGroup : RegisteredGameHooks<H>::functionsForPtr) {
+                for (auto it = ptrGroup.second.begin(); it != ptrGroup.second.end();) {
+                    if (it->first == hookId) {
+                        it = ptrGroup.second.erase(it);
+                        RegisteredGameHooks<H>::hookData.erase(hookId);
+                    } else {
+                        ++it;
+                    }
+                }
+            }
+        }
+        HooksToUnregister<H>::hooksForPtr.clear();
+
+        // Filter
+        for (auto& hookId : HooksToUnregister<H>::hooksForFilter) {
+            RegisteredGameHooks<H>::functionsForFilter.erase(hookId);
+            RegisteredGameHooks<H>::hookData.erase(hookId);
+        }
+        HooksToUnregister<H>::hooksForFilter.clear();
+    }
+
+    void RemoveAllQueuedHooks() {
+#define DEFINE_HOOK(name, _) ProcessUnregisteredHooks<name>();
+
+#include "GameInteractor_HookTable.h"
+
+#undef DEFINE_HOOK
+    }
+
     class HookFilter {
-    public:
+      public:
         static auto ActorNotPlayer(Actor* actor) {
             return actor->id != ACTOR_PLAYER;
         }
@@ -401,15 +517,11 @@ public:
             return actor->id != ACTOR_PLAYER;
         }
         static auto ActorMatchIdAndParams(int16_t id, int16_t params) {
-            return [id, params](Actor* actor) {
-                return actor->id == id && actor->params == params;
-            };
+            return [id, params](Actor* actor) { return actor->id == id && actor->params == params; };
         }
         // For use with Should hooks
         static auto SActorMatchIdAndParams(int16_t id, int16_t params) {
-            return [id, params](Actor* actor, bool* result) {
-                return actor->id == id && actor->params == params;
-            };
+            return [id, params](Actor* actor, bool* result) { return actor->id == id && actor->params == params; };
         }
     };
 
@@ -430,7 +542,7 @@ public:
     static bool CanAddOrTakeAmmo(int16_t amount, int16_t item);
 
     class RawAction {
-    public:
+      public:
         static void SetSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag);
         static void UnsetSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag);
         static bool CheckFlag(int16_t flagType, int16_t flag);
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
index 3bd2ef36eb..51a6ab5a85 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -15,24 +15,32 @@ DEFINE_HOOK(OnItemReceive, (GetItemEntry itemEntry));
 DEFINE_HOOK(OnSaleEnd, (GetItemEntry itemEntry));
 DEFINE_HOOK(OnTransitionEnd, (int16_t sceneNum));
 DEFINE_HOOK(OnSceneInit, (int16_t sceneNum));
+DEFINE_HOOK(AfterSceneCommands, (int16_t sceneNum));
 DEFINE_HOOK(OnSceneFlagSet, (int16_t sceneNum, int16_t flagType, int16_t flag));
 DEFINE_HOOK(OnSceneFlagUnset, (int16_t sceneNum, int16_t flagType, int16_t flag));
 DEFINE_HOOK(OnFlagSet, (int16_t flagType, int16_t flag));
 DEFINE_HOOK(OnFlagUnset, (int16_t flagType, int16_t flag));
 DEFINE_HOOK(OnSceneSpawnActors, ());
 DEFINE_HOOK(OnPlayerUpdate, ());
+DEFINE_HOOK(OnSetDoAction, (uint16_t action));
 DEFINE_HOOK(OnOcarinaSongAction, ());
 DEFINE_HOOK(OnCuccoOrChickenHatch, ());
 DEFINE_HOOK(OnShopSlotChange, (uint8_t cursorIndex, int16_t price));
 DEFINE_HOOK(OnActorInit, (void* actor));
+DEFINE_HOOK(OnActorSpawn, (void* actor));
 DEFINE_HOOK(OnActorUpdate, (void* actor));
 DEFINE_HOOK(OnActorKill, (void* actor));
+DEFINE_HOOK(OnActorDestroy, (void* actor));
 DEFINE_HOOK(OnEnemyDefeat, (void* actor));
 DEFINE_HOOK(OnBossDefeat, (void* actor));
 DEFINE_HOOK(OnTimestamp, (u8 item));
 DEFINE_HOOK(OnPlayerBonk, ());
 DEFINE_HOOK(OnPlayerHealthChange, (int16_t amount));
 DEFINE_HOOK(OnPlayerBottleUpdate, (int16_t contents));
+DEFINE_HOOK(OnPlayerHoldUpShield, ());
+DEFINE_HOOK(OnPlayerFirstPersonControl, (Player * player));
+DEFINE_HOOK(OnPlayerProcessStick, ());
+DEFINE_HOOK(OnPlayerShieldControl, (float_t * sp50, float_t* sp54));
 DEFINE_HOOK(OnPlayDestroy, ());
 DEFINE_HOOK(OnPlayDrawEnd, ());
 DEFINE_HOOK(OnVanillaBehavior, (GIVanillaBehavior flag, bool* result, va_list originalArgs));
@@ -57,7 +65,9 @@ DEFINE_HOOK(OnUpdateFileTargetSelection, (uint8_t optionIndex));
 DEFINE_HOOK(OnUpdateFileLanguageSelection, (uint8_t optionIndex));
 DEFINE_HOOK(OnUpdateFileQuestSelection, (uint8_t questIndex));
 DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, (uint8_t optionIndex, uint8_t optionValue));
+DEFINE_HOOK(OnUpdateFileRandomizerOptionSelection, (uint8_t optionIndex));
 DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
+DEFINE_HOOK(OnFileChooseMain, (void* gameState));
 
 DEFINE_HOOK(OnSetGameLanguage, ());
 DEFINE_HOOK(OnFileDropped, (std::string filePath));
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index b41030cfa9..f69cc29af5 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -19,6 +19,9 @@ void GameInteractor_ExecuteOnExitGame(int32_t fileNum) {
 }
 
 void GameInteractor_ExecuteOnGameStateMainStart() {
+    // Cleanup all hooks at the start of each frame
+    GameInteractor::Instance->RemoveAllQueuedHooks();
+
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnGameStateMainStart>();
 }
 
@@ -42,12 +45,18 @@ void GameInteractor_ExecuteOnTransitionEndHooks(int16_t sceneNum) {
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnTransitionEnd>(sceneNum);
 }
 
-void GameInteractor_ExecuteOnSceneInitHooks(int16_t sceneNum) {
+void GameInteractor_ExecuteOnSceneInit(int16_t sceneNum) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(sceneNum);
     GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnSceneInit>(sceneNum, sceneNum);
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneInit>(sceneNum);
 }
 
+void GameInteractor_ExecuteAfterSceneCommands(int16_t sceneNum) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::AfterSceneCommands>(sceneNum);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::AfterSceneCommands>(sceneNum, sceneNum);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::AfterSceneCommands>(sceneNum);
+}
+
 void GameInteractor_ExecuteOnSceneFlagSet(int16_t sceneNum, int16_t flagType, int16_t flag) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
@@ -76,6 +85,10 @@ void GameInteractor_ExecuteOnPlayerUpdate() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerUpdate>();
 }
 
+void GameInteractor_ExecuteOnSetDoAction(uint16_t action) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSetDoAction>(action);
+}
+
 void GameInteractor_ExecuteOnOcarinaSongAction() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnOcarinaSongAction>();
 }
@@ -95,6 +108,13 @@ void GameInteractor_ExecuteOnActorInit(void* actor) {
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorInit>(actor);
 }
 
+void GameInteractor_ExecuteOnActorSpawn(void* actor) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorSpawn>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorSpawn>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorSpawn>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorSpawn>(actor);
+}
+
 void GameInteractor_ExecuteOnActorUpdate(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorUpdate>(actor);
     GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorUpdate>(((Actor*)actor)->id, actor);
@@ -109,6 +129,13 @@ void GameInteractor_ExecuteOnActorKill(void* actor) {
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorKill>(actor);
 }
 
+void GameInteractor_ExecuteOnActorDestroy(void* actor) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorDestroy>(actor);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorDestroy>(((Actor*)actor)->id, actor);
+    GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorDestroy>((uintptr_t)actor, actor);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorDestroy>(actor);
+}
+
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnEnemyDefeat>(actor);
     GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnEnemyDefeat>(((Actor*)actor)->id, actor);
@@ -123,7 +150,7 @@ void GameInteractor_ExecuteOnBossDefeat(void* actor) {
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnBossDefeat>(actor);
 }
 
-void GameInteractor_ExecuteOnTimestamp (u8 item) {
+void GameInteractor_ExecuteOnTimestamp(u8 item) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnTimestamp>(item);
 }
 
@@ -139,6 +166,22 @@ void GameInteractor_ExecuteOnPlayerBottleUpdate(int16_t contents) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerBottleUpdate>(contents);
 }
 
+void GameInteractor_ExecuteOnPlayerHoldUpShield() {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerHoldUpShield>();
+}
+
+void GameInteractor_ExecuteOnPlayerFirstPersonControl(Player* player) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerFirstPersonControl>(player);
+}
+
+void GameInteractor_ExecuteOnPlayerShieldControl(float_t* sp50, float_t* sp54) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerShieldControl>(sp50, sp54);
+}
+
+void GameInteractor_ExecuteOnPlayerProcessStick() {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerProcessStick>();
+}
+
 void GameInteractor_ExecuteOnPlayDestroy() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayDestroy>();
 }
@@ -247,13 +290,22 @@ void GameInteractor_ExecuteOnUpdateFileQuestSelection(uint8_t questIndex) {
 }
 
 void GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(uint8_t optionIndex, uint8_t optionValue) {
-    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnUpdateFileBossRushOptionSelection>(optionIndex, optionValue);
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnUpdateFileBossRushOptionSelection>(optionIndex,
+                                                                                                optionValue);
+}
+
+void GameInteractor_ExecuteOnUpdateFileRandomizerOptionSelection(uint8_t optionIndex) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnUpdateFileRandomizerOptionSelection>(optionIndex);
 }
 
 void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnUpdateFileNameSelection>(charCode);
 }
 
+void GameInteractor_ExecuteOnFileChooseMain(void* gameState) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnFileChooseMain>(gameState);
+}
+
 // MARK: - Game
 
 void GameInteractor_ExecuteOnSetGameLanguage() {
@@ -266,7 +318,7 @@ void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnAssetAltChange>(fn);
 }
 
-//MARK: Pause Menu
+// MARK: Pause Menu
 
 void GameInteractor_ExecuteOnKaleidoUpdate() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnKaleidoUpdate>();
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index f1b918cef2..a6f1563f23 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "vanilla-behavior/GIVanillaBehavior.h"
 #include "GameInteractor.h"
 #include <stdarg.h>
 
@@ -17,23 +18,31 @@ void GameInteractor_ExecuteOnItemReceiveHooks(GetItemEntry itemEntry);
 void GameInteractor_ExecuteOnSaleEndHooks(GetItemEntry itemEntry);
 void GameInteractor_ExecuteOnTransitionEndHooks(int16_t sceneNum);
 void GameInteractor_ExecuteOnSceneInit(int16_t sceneNum);
+void GameInteractor_ExecuteAfterSceneCommands(int16_t sceneNum);
 void GameInteractor_ExecuteOnSceneFlagSet(int16_t sceneNum, int16_t flagType, int16_t flag);
 void GameInteractor_ExecuteOnSceneFlagUnset(int16_t sceneNum, int16_t flagType, int16_t flag);
 void GameInteractor_ExecuteOnFlagSet(int16_t flagType, int16_t flag);
 void GameInteractor_ExecuteOnFlagUnset(int16_t flagType, int16_t flag);
 void GameInteractor_ExecuteOnSceneSpawnActors();
 void GameInteractor_ExecuteOnPlayerUpdate();
+void GameInteractor_ExecuteOnSetDoAction(uint16_t action);
 void GameInteractor_ExecuteOnOcarinaSongAction();
 void GameInteractor_ExecuteOnCuccoOrChickenHatch();
 void GameInteractor_ExecuteOnActorInit(void* actor);
+void GameInteractor_ExecuteOnActorSpawn(void* actor);
 void GameInteractor_ExecuteOnActorUpdate(void* actor);
 void GameInteractor_ExecuteOnActorKill(void* actor);
+void GameInteractor_ExecuteOnActorDestroy(void* actor);
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor);
 void GameInteractor_ExecuteOnBossDefeat(void* actor);
-void GameInteractor_ExecuteOnTimestamp (u8 item);
+void GameInteractor_ExecuteOnTimestamp(u8 item);
 void GameInteractor_ExecuteOnPlayerBonk();
 void GameInteractor_ExecuteOnPlayerHealthChange(int16_t amount);
 void GameInteractor_ExecuteOnPlayerBottleUpdate(int16_t contents);
+void GameInteractor_ExecuteOnPlayerHoldUpShield();
+void GameInteractor_ExecuteOnPlayerFirstPersonControl(Player* player);
+void GameInteractor_ExecuteOnPlayerShieldControl(float_t* sp50, float_t* sp54);
+void GameInteractor_ExecuteOnPlayerProcessStick();
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price);
 void GameInteractor_ExecuteOnPlayDestroy();
 void GameInteractor_ExecuteOnPlayDrawEnd();
@@ -63,7 +72,9 @@ void GameInteractor_ExecuteOnUpdateFileTargetSelection(uint8_t optionIndex);
 void GameInteractor_ExecuteOnUpdateFileLanguageSelection(uint8_t optionIndex);
 void GameInteractor_ExecuteOnUpdateFileQuestSelection(uint8_t questIndex);
 void GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(uint8_t optionIndex, uint8_t optionValue);
+void GameInteractor_ExecuteOnUpdateFileRandomizerOptionSelection(uint8_t optionIndex);
 void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode);
+void GameInteractor_ExecuteOnFileChooseMain(void* gameState);
 
 // MARK: - Game
 void GameInteractor_ExecuteOnSetGameLanguage();
@@ -71,7 +82,7 @@ void GameInteractor_ExecuteOnSetGameLanguage();
 // MARK: - System
 void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void));
 
-//Mark: - Pause Menu
+// Mark: - Pause Menu
 void GameInteractor_ExecuteOnKaleidoUpdate();
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
index c653e929f9..dea11cc8e5 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
@@ -112,7 +112,7 @@ void GameInteractor::RawAction::FreezePlayer() {
 void GameInteractor::RawAction::BurnPlayer() {
     Player* player = GET_PLAYER(gPlayState);
     for (int i = 0; i < 18; i++) {
-        player->bodyFlameTimers[i] = Rand_S16Offset(0, 200);
+        player->bodyFlameTimers[i] = static_cast<uint8_t>(Rand_S16Offset(0, 200));
     }
     player->bodyIsBurning = true;
     func_80837C0C(gPlayState, player, 0, 0, 0, 0, 0);
@@ -143,11 +143,13 @@ void GameInteractor::RawAction::SetSceneFlag(int16_t sceneNum, int16_t flagType,
             }
             break;
         case FlagType::FLAG_SCENE_CLEAR:
-            if (sceneNum == gPlayState->sceneNum) gPlayState->actorCtx.flags.clear |= (1 << flag);
+            if (sceneNum == gPlayState->sceneNum)
+                gPlayState->actorCtx.flags.clear |= (1 << flag);
             gSaveContext.sceneFlags[sceneNum].clear |= (1 << flag);
             break;
         case FlagType::FLAG_SCENE_TREASURE:
-            if (sceneNum == gPlayState->sceneNum) gPlayState->actorCtx.flags.chest |= (1 << flag);
+            if (sceneNum == gPlayState->sceneNum)
+                gPlayState->actorCtx.flags.chest |= (1 << flag);
             gSaveContext.sceneFlags[sceneNum].chest |= (1 << flag);
             break;
         case FlagType::FLAG_SCENE_COLLECTIBLE:
@@ -182,11 +184,13 @@ void GameInteractor::RawAction::UnsetSceneFlag(int16_t sceneNum, int16_t flagTyp
             }
             break;
         case FlagType::FLAG_SCENE_CLEAR:
-            if (sceneNum == gPlayState->sceneNum) gPlayState->actorCtx.flags.clear &= ~(1 << flag);
+            if (sceneNum == gPlayState->sceneNum)
+                gPlayState->actorCtx.flags.clear &= ~(1 << flag);
             gSaveContext.sceneFlags[sceneNum].clear &= ~(1 << flag);
             break;
         case FlagType::FLAG_SCENE_TREASURE:
-            if (sceneNum == gPlayState->sceneNum) gPlayState->actorCtx.flags.chest &= ~(1 << flag);
+            if (sceneNum == gPlayState->sceneNum)
+                gPlayState->actorCtx.flags.chest &= ~(1 << flag);
             gSaveContext.sceneFlags[sceneNum].chest &= ~(1 << flag);
             break;
         case FlagType::FLAG_SCENE_COLLECTIBLE:
@@ -220,6 +224,9 @@ bool GameInteractor::RawAction::CheckFlag(int16_t flagType, int16_t flag) {
             return Flags_GetRandomizerInf(static_cast<RandomizerInf>(flag));
         case FlagType::FLAG_GS_TOKEN:
             return GET_GS_FLAGS((flag & 0x1F00) >> 8);
+        default:
+            assert(false);
+            return false;
     }
 }
 
@@ -334,7 +341,7 @@ void GameInteractor::RawAction::UpdateActor(void* refActor) {
     // Update actor again outside of their normal update cycle.
 
     Actor* actor = static_cast<Actor*>(refActor);
-    
+
     // Sometimes the actor is destroyed in the previous Update, so check if the update function still exists.
     if (actor->update != NULL) {
         // Fix for enemies sometimes taking a "fake" hit, where their invincibility timer is
@@ -352,7 +359,8 @@ void GameInteractor::RawAction::UpdateActor(void* refActor) {
 }
 
 void GameInteractor::RawAction::TeleportPlayer(int32_t nextEntrance) {
-    Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     gPlayState->nextEntranceIndex = nextEntrance;
     gPlayState->transitionTrigger = TRANS_TRIGGER_START;
     gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
@@ -383,7 +391,7 @@ void GameInteractor::RawAction::SetTimeOfDay(uint32_t time) {
 void GameInteractor::RawAction::SetCollisionViewer(bool active) {
     CVarSetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), active);
     CVarSetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Decal"), active);
-    
+
     if (active) {
         CVarSetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.Scene"), COLVIEW_TRANSPARENT);
         CVarSetInteger(CVAR_DEVELOPER_TOOLS("ColViewer.BGActors"), COLVIEW_TRANSPARENT);
@@ -405,7 +413,7 @@ void GameInteractor::RawAction::EmulateRandomButtonPress(uint32_t chancePercenta
     uint32_t emulatedButton;
     uint32_t randomNumber = rand();
     uint32_t possibleButtons[14] = { BTN_CRIGHT, BTN_CLEFT, BTN_CDOWN, BTN_CUP,   BTN_R, BTN_L, BTN_DRIGHT,
-                             BTN_DLEFT,  BTN_DDOWN, BTN_DUP,   BTN_START, BTN_Z, BTN_B, BTN_A };
+                                     BTN_DLEFT,  BTN_DDOWN, BTN_DUP,   BTN_START, BTN_Z, BTN_B, BTN_A };
 
     emulatedButton = possibleButtons[randomNumber % 14];
 
@@ -432,14 +440,14 @@ void GameInteractor::RawAction::SetRandomWind(bool active) {
         GameInteractor::State::RandomWindActive = 0;
         GameInteractor::State::RandomWindSecondsSinceLastDirectionChange = 0;
         player->pushedSpeed = 0.0f;
-        player->pushedYaw = 0.0f;
+        player->pushedYaw = 0;
     }
 }
 
 void GameInteractor::RawAction::SetPlayerInvincibility(bool active) {
     Player* player = GET_PLAYER(gPlayState);
     if (active) {
-        player->invincibilityTimer = 1000;
+        player->invincibilityTimer = -20;
     } else {
         player->invincibilityTimer = 0;
     }
@@ -447,8 +455,9 @@ void GameInteractor::RawAction::SetPlayerInvincibility(bool active) {
 
 /// Clears the cutscene pointer to a value safe for wrong warps.
 void GameInteractor::RawAction::ClearCutscenePointer() {
-    if (!gPlayState) return;
-    static uint32_t null_cs[] = {0, 0};
+    if (!gPlayState)
+        return;
+    static uint32_t null_cs[] = { 0, 0 };
     gPlayState->csCtx.segment = &null_cs;
 }
 
@@ -481,14 +490,15 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnEnemyWithOffset
         // Don't allow Arwings in certain areas because they cause issues.
         // Locations: King dodongo room, Morpha room, Twinrova room, Ganondorf room, Fishing pond, Ganon's room
         // TODO: Swap this to disabling the option in CC options menu instead.
-        if (sceneNum == SCENE_DODONGOS_CAVERN_BOSS || sceneNum == SCENE_WATER_TEMPLE_BOSS || sceneNum == SCENE_SPIRIT_TEMPLE_BOSS ||
-            sceneNum == SCENE_GANONDORF_BOSS || sceneNum == SCENE_FISHING_POND || sceneNum == SCENE_GANON_BOSS) {
+        if (sceneNum == SCENE_DODONGOS_CAVERN_BOSS || sceneNum == SCENE_WATER_TEMPLE_BOSS ||
+            sceneNum == SCENE_SPIRIT_TEMPLE_BOSS || sceneNum == SCENE_GANONDORF_BOSS ||
+            sceneNum == SCENE_FISHING_POND || sceneNum == SCENE_GANON_BOSS) {
             return GameInteractionEffectQueryResult::NotPossible;
         }
     }
 
     // Generate point in random angle with a radius.
-    float angle = Random(0, 2 * M_PI);
+    float angle = static_cast<float>(RandomDouble() * 2 * M_PI);
     float radius = 150;
     float posXOffset = radius * cos(angle);
     float posZOffset = radius * sin(angle);
@@ -563,8 +573,9 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnActor(uint32_t
 
     if (actorId == ACTOR_EN_NIW) {
         // Spawn Cucco and make it angry
-        EnNiw* cucco = (EnNiw*)Actor_Spawn(&gPlayState->actorCtx, gPlayState, actorId, player->actor.world.pos.x,
-                                           player->actor.world.pos.y + 2200, player->actor.world.pos.z, 0, 0, 0, actorParams, 0);
+        EnNiw* cucco =
+            (EnNiw*)Actor_Spawn(&gPlayState->actorCtx, gPlayState, actorId, player->actor.world.pos.x,
+                                player->actor.world.pos.y + 2200, player->actor.world.pos.z, 0, 0, 0, actorParams, 0);
         if (cucco == NULL) {
             return GameInteractionEffectQueryResult::TemporarilyNotPossible;
         }
@@ -576,8 +587,9 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnActor(uint32_t
         return GameInteractionEffectQueryResult::Possible;
     } else if (actorId == ACTOR_EN_BOM) {
         // Spawn a bomb, make it explode instantly when params is set to 1 to emulate spawning an explosion
-        EnBom* bomb = (EnBom*)Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_BOM, player->actor.world.pos.x,
-                                   player->actor.world.pos.y + 30, player->actor.world.pos.z, 0, 0, 0, BOMB_BODY, true);
+        EnBom* bomb =
+            (EnBom*)Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_BOM, player->actor.world.pos.x,
+                                player->actor.world.pos.y + 30, player->actor.world.pos.z, 0, 0, 0, BOMB_BODY, true);
 
         if (bomb == NULL) {
             return GameInteractionEffectQueryResult::TemporarilyNotPossible;
@@ -604,5 +616,4 @@ GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnActor(uint32_t
     }
 
     return GameInteractionEffectQueryResult::TemporarilyNotPossible;
-    
 }
diff --git a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
index a95dabb00b..186307aede 100644
--- a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
+++ b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GI_VANILLA_BEHAVIOR_H
+#define GI_VANILLA_BEHAVIOR_H
+
 typedef enum {
     // #### `result`
     // ```c
@@ -15,6 +20,14 @@ typedef enum {
     // - `int32_t` (entrance index) (promoted from `uint16_t` by va_arg)
     VB_ALLOW_ENTRANCE_CS_FOR_EITHER_AGE,
 
+    // #### `result`
+    // ```c
+    // sBgPoEventPuzzleState == 0xF
+    // ```
+    // #### `args`
+    // - None
+    VB_AMY_SOLVE,
+
     // #### `result`
     // ```c
     // this->actor.textId == 0x401A
@@ -95,10 +108,10 @@ typedef enum {
     // #### `args`
     // - `*BgDyYoseizo`
     VB_BE_ELIGIBLE_FOR_GREAT_FAIRY_REWARD,
-    
+
     // #### `result`
     // ```c
-    // CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && 
+    // CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
     // CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
     // LINK_IS_ADULT &&
     // !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
@@ -118,11 +131,11 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE) && 
+    // (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE) &&
     // LINK_IS_ADULT &&
-    // Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && 
+    // Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
     // Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
-    // Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) && 
+    // Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
     // !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)
     // ```
     // #### `args`
@@ -131,7 +144,8 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)
+    // !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+    // Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)
     // ```
     // #### `args`
     // - None
@@ -158,7 +172,8 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)
+    // CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) &&
+    // !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)
     // ```
     // #### `args`
     // - None
@@ -221,6 +236,14 @@ typedef enum {
     // - `*Actor` (interactRangeActor)
     VB_BOTTLE_ACTOR,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnPoField`
+    VB_BOTTLE_BIG_POE,
+
     // #### `result`
     // ```c
     // ((this->actor.params == DNS_TYPE_HEART_PIECE) && (Flags_GetItemGetInf(ITEMGETINF_DEKU_SCRUB_HEART_PIECE))) ||
@@ -271,6 +294,67 @@ typedef enum {
     // - `*EnDoor`
     VB_CONSUME_SMALL_KEY,
 
+    // #### `result`
+    // ```c
+    // itemDropped >= 0 && itemDropped < 0x1A
+    // ```
+    // #### `args`
+    // - `*ObjKibako2`
+    VB_CRATE_DROP_ITEM,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*ObjKibako2`
+    VB_CRATE_SETUP_DRAW,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+    VB_CRAWL_SPEED_ENTER,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+    VB_CRAWL_SPEED_EXIT,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*Camera`
+    // - 'int16_t' (csId)
+    // - 'int16_t' (actionParameters)
+    // - 'int16_t' (initTimer)
+    // - 'CutsceneCameraPoint*' (atPoints)
+    // - 'CutsceneCameraPoint*' (eyePoints)
+    VB_CRAWL_SPEED_EXIT_CS,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+    VB_CRAWL_SPEED_INCREASE,
+
+    // #### `result`
+    // ```c
+    // this->actionTimer == 0 && Rand_ZeroOne() < 0.03f
+    // ```
+    // #### `args`
+    // - `*EnPoRelay`
+    VB_DAMPE_DROP_FLAME,
+
     // #### `result`
     // ```c
     // !Flags_GetItemGetInf(ITEMGETINF_1C)
@@ -281,7 +365,8 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD
+    // gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum !=
+    // SCENE_GRAVEYARD
     // ```
     // #### `args`
     // - `*EnTk`
@@ -350,7 +435,8 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE)
+    // play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT ||
+    // !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE)
     // ```
     // #### `args`
     // - `*EnCow`
@@ -400,6 +486,22 @@ typedef enum {
     // - `*int16_t` (item id)
     VB_DRAW_AMMO_COUNT,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - Player*
+    VB_EMPTYING_BOTTLE,
+
+    // #### `result`
+    // ```c
+    // (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)
+    // ```
+    // #### `args`
+    // - None
+    VB_END_GERUDO_MEMBERSHIP_TALK,
+
     // #### `result`
     // ```c
     // !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC)
@@ -441,6 +543,14 @@ typedef enum {
     // - `*BgHeavyBlock`
     VB_FREEZE_LINK_FOR_BLOCK_THROW,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+    VB_FREEZE_LINK_FOR_FOREST_PILLARS,
+
     // #### `result`
     // ```c
     // true
@@ -465,6 +575,14 @@ typedef enum {
     // - None
     VB_GANON_HEAL_BEFORE_FIGHT,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnGe2`
+    VB_GERUDO_GUARD_SET_ACTION_AFTER_TALK,
+
     // #### `result`
     // See logic in
     // ```c
@@ -473,7 +591,7 @@ typedef enum {
     // and
     // ```c
     // EnGe2_CheckCarpentersFreed()
-    // ``` 
+    // ```
     // #### `args`
     // - None
     VB_GERUDOS_BE_FRIENDLY,
@@ -913,6 +1031,14 @@ typedef enum {
     // - `*VBFishingData`
     VB_GIVE_RANDO_FISHING_PRIZE,
 
+    // #### `result`
+    // ```c
+    // false
+    // ```
+    // #### `args`
+    // - '*Fishing'
+    VB_GIVE_RANDO_GLITCH_FISHING_PRIZE,
+
     // #### `result`
     // ```c
     // true
@@ -961,6 +1087,22 @@ typedef enum {
     // - `*EnDs`
     VB_GRANNY_TAKE_MONEY,
 
+    // ### `result`
+    // ```c
+    // false
+    // ```
+    // ### `args`
+    // - `*EnKusa`
+    VB_GRASS_DROP_ITEM,
+
+    // ### `result`
+    // ```c
+    // true
+    // ```
+    // ### `args`
+    // - `*EnKusa`
+    VB_GRASS_SETUP_DRAW,
+
     // #### `result`
     // ```c
     // Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)
@@ -969,6 +1111,22 @@ typedef enum {
     // - None
     VB_GTG_GATE_BE_OPEN,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnCrow`
+    VB_GUAY_DO_DIVE_ATTACK,
+
+    // #### `result`
+    // ```c
+    // false
+    // ```
+    // #### `args`
+    // - `*EnCrow`
+    VB_GUAY_FORCE_FLY_AWAY,
+
     // #### `result`
     // ```c
     // true
@@ -1057,6 +1215,22 @@ typedef enum {
     // - None
     VB_KALEIDO_UNPAUSE_CLOSE,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnFirefly`
+    VB_KEESE_DO_DIVE_ATTACK,
+
+    // #### `result`
+    // ```c
+    // false
+    // ```
+    // #### `args`
+    // - `*EnFirefly`
+    VB_KEESE_FORCE_FLY_AWAY,
+
     // #### `result`
     // ```c
     // Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
@@ -1265,11 +1439,20 @@ typedef enum {
     // - None
     VB_PLAY_BOLERO_OF_FIRE_CS,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnDaiku`
+    VB_PLAY_CARPENTER_FREE_CS,
+
     // #### `result`
     // Close enough & various cutscene checks
     // ```c
-    // (func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) && 
-    // (!(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) &&
+    // (func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) &&
+    // (!(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
+    // PLAYER_STATE1_CLIMBING_LADDER))) &&
     // (player->actor.bgCheckFlags & 1)
     // ```
     // #### `args`
@@ -1292,6 +1475,14 @@ typedef enum {
     // - `*BgTreemouth`
     VB_PLAY_DEKU_TREE_INTRO_CS,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*DemoKekkai`
+    VB_PLAY_DISPEL_BARRIER_CS,
+
     // #### `result`
     // ```c
     // true
@@ -1356,6 +1547,15 @@ typedef enum {
     // - None
     VB_PLAY_FIRE_ARROW_CS,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnHeishi2`
+    // - `bool` (clearCamera - true if the code clears a sub-camera, false otherwise)
+    VB_PLAY_GATE_OPENING_OR_CLOSING_CS,
+
     // #### `result`
     // ```c
     // true
@@ -1537,6 +1737,23 @@ typedef enum {
     // - `*ObjTsubo`
     VB_POT_SETUP_DRAW,
 
+    // #### `result`
+    // ```c
+    // dropId == ITEM00_STICK
+    // ```
+    // #### `args`
+    // - None
+    VB_PREVENT_ADULT_STICK,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnRd`
+    VB_REDEAD_GIBDO_FREEZE_LINK,
+
+    // #### `result`
     // #### `result`
     // ```c
     // true
@@ -1597,6 +1814,22 @@ typedef enum {
     // - `*EnRu1`
     VB_RUTO_WANT_TO_BE_TOSSED_TO_SAPPHIRE,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnGb`
+    VB_SELL_POES_TO_POE_COLLECTOR,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `int32_t` (button - promoted from `s16`)
+    VB_SET_BUTTON_ITEM_FROM_C_BUTTON_SLOT,
+
     // #### `result`
     // ```c
     // true
@@ -1615,7 +1848,17 @@ typedef enum {
 
     // #### `result`
     // ```c
-    // (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT
+    // true
+    // ```
+    // #### `args`
+    // - BgHakaShip*
+    // - PlayState*
+    VB_SHADOW_SHIP_SET_SPEED,
+
+    // #### `result`
+    // ```c
+    // (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) &&
+    // !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT
     // ```
     // #### `args`
     // - None
@@ -1658,6 +1901,15 @@ typedef enum {
     // - `*VBFishingData`
     VB_SHOULD_SET_FISHING_RECORD,
 
+    // #### `result`
+    // ```c
+    // false
+    // ```
+    // #### `args`
+    // - `*s8 iter2`
+    // - `s8 sp3C[4]`
+    VB_SHOULD_QUICKSPIN,
+
     // #### `result`
     // ```c
     // (interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT
@@ -1674,6 +1926,22 @@ typedef enum {
     // - None
     VB_SHOW_TITLE_CARD,
 
+    // #### `result`
+    // ```c
+    // (collectible >= 0) && (collectible <= 0x19
+    // ```
+    // #### `args`
+    // - `*ObjKibako`
+    VB_SMALL_CRATE_DROP_ITEM,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*ObjKibako`
+    VB_SMALL_CRATE_SETUP_DRAW,
+
     // #### `result`
     // ```c
     // false
@@ -1690,6 +1958,14 @@ typedef enum {
     // - `*ObjBean`
     VB_SPAWN_BEAN_STALK_FAIRIES,
 
+    // #### `result`
+    // ```c
+    // this->timer >= 60
+    // ```
+    // #### `args`
+    // - `None`
+    VB_SPAWN_BEAN_SKULLTULA,
+
     // #### `result`
     // ```c
     // true
@@ -1697,25 +1973,25 @@ typedef enum {
     // #### `args`
     // ##### In `z_boss_dodongo.c`:
     // - `*BossDodongo`
-    // 
+    //
     // ##### In `z_boss_fd2.c`
     // - `*BossFd2`
-    // 
+    //
     // ##### In `z_boss_ganondrof.c`:
     // - `*BossGanondrof`
-    // 
+    //
     // ##### In `z_boss_goma.c`:
     // - `*BossGoma`
-    // 
+    //
     // ##### In `z_boss_mo.c`:
     // - `*BossMo`
-    // 
+    //
     // ##### In `z_boss_sst.c`:
     // - `*BossSst`
-    // 
+    //
     // ##### In `z_boss_tw.c`:
     // - `*BossTw`
-    // 
+    //
     // ##### In `z_boss_va.c`:
     // - `*BossVa`
     VB_SPAWN_BLUE_WARP,
@@ -1773,6 +2049,24 @@ typedef enum {
     // - `*ShotSun`
     VB_SPAWN_SONG_FAIRY,
 
+    // #### `result`
+    // ```c
+    // varies, never set should to true
+    // ```
+    // #### `args`
+    // - `*Actor`
+    // - `*s16` - timer value
+    VB_SWITCH_TIMER_TICK,
+
+    // #### `result`
+    // ```c
+    // (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) &&
+    // CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)
+    // ```
+    // #### `args`
+    // - `*Input`
+    VB_THROW_OR_PUT_DOWN_HELD_ITEM,
+
     // #### `result`
     // ```c
     // true
@@ -1853,6 +2147,22 @@ typedef enum {
     // - `*PauseContext`
     VB_TRANSITION_TO_SAVE_SCREEN_ON_DEATH,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnWood02`
+    VB_TREE_DROP_COLLECTIBLE,
+
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `int32_t` (button - promoted from `u8`)
+    // - `int32_t` (item - promoted from `u8`)
+    VB_UPDATE_BOTTLE_ITEM,
+
     // #### `result`
     // ```c
     // INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
@@ -1860,7 +2170,7 @@ typedef enum {
     // #### `args`
     // - `*EnMk`
     VB_USE_EYEDROP_DIALOGUE,
-    
+
     // #### `result`
     // ```c
     // true
@@ -1868,4 +2178,50 @@ typedef enum {
     // #### `args`
     // - `*EnWonderTalk2`
     VB_WONDER_TALK,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*Actor`
+    VB_TRIGGER_VOIDOUT,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*Actor`
+    VB_TORCH2_HANDLE_CLANKING,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*Actor`
+    VB_RECIEVE_FALL_DAMAGE,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*EnRr`
+    VB_LIKE_LIKE_GRAB_PLAYER,
+
+    // #### `result`
+    // ```c
+    // entry != NULL
+    // ```
+    // #### `args`
+    // - `*AnimationEntry`
+    // - `*LinkAnimationHeader`
+    // - `s32` frame
+    // - `s32` limbCount
+    // - `*Vec3s` frameTable
+    VB_LOAD_PLAYER_ANIMATION_FRAME,
 } GIVanillaBehavior;
+
+#endif
diff --git a/soh/soh/Enhancements/gameconsole.c b/soh/soh/Enhancements/gameconsole.c
index da0c7cf979..6992b7fb45 100644
--- a/soh/soh/Enhancements/gameconsole.c
+++ b/soh/soh/Enhancements/gameconsole.c
@@ -17,4 +17,5 @@
 
 extern PlayState* gPlayState;
 
-void GameConsole_Init() {}
\ No newline at end of file
+void GameConsole_Init() {
+}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/gameconsole.h b/soh/soh/Enhancements/gameconsole.h
index e9a3634a1d..0952baf08a 100644
--- a/soh/soh/Enhancements/gameconsole.h
+++ b/soh/soh/Enhancements/gameconsole.h
@@ -8,22 +8,19 @@
 #define MAX_CVARS 2048
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-typedef enum
-{
+typedef enum {
     CONSOLECOMMAND_RESULT_SUCCESS,
     CONSOLECOMMAND_RESULT_INVALIDARGS,
     CONSOLECOMMAND_RESULT_INVALIDCOMMAND,
     CONSOLECOMMAND_RESULT_FAILURE
 } ConsoleCommandResult;
 
-typedef ConsoleCommandResult(*ConsoleCommandFunc)(char** argv, s32 argc); // Returns the number of arguments it read
+typedef ConsoleCommandResult (*ConsoleCommandFunc)(char** argv, s32 argc); // Returns the number of arguments it read
 
-typedef struct ConsoleCommand
-{
+typedef struct ConsoleCommand {
     char* name;
     ConsoleCommandFunc func;
     char* description;
diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp
index aff0d07267..ca360543fa 100644
--- a/soh/soh/Enhancements/gameplaystats.cpp
+++ b/soh/soh/Enhancements/gameplaystats.cpp
@@ -1,11 +1,11 @@
 #include "gameplaystats.h"
-#include "gameplaystatswindow.h"
 
 #include "soh/SaveManager.h"
 #include "functions.h"
 #include "macros.h"
 #include "soh/cvar_prefixes.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/util.h"
 
 #include <vector>
@@ -35,7 +35,7 @@ const char* const sceneMappings[] = {
     "Ice Cavern",
     "Ganon's Tower",
     "Gerudo Training Ground",
-    "Theives' Hideout",
+    "Thieves' Hideout",
     "Inside Ganon's Castle",
     "Tower Collapse",
     "Castle Collapse",
@@ -124,7 +124,7 @@ const char* const sceneMappings[] = {
     "Goron City",
     "Lon Lon Ranch",
     "Outside Ganon's Castle",
-    //Debug Rooms
+    // Debug Rooms
     "Test Map",
     "Test Room",
     "Depth Test",
@@ -189,7 +189,7 @@ const char* const countMappings[] = {
     "Poe Sisters:",
     "Redead:",
     "Shabom:",
-    "Shellblade:",
+    "Shell Blade:",
     "Skull Kid:",
     "Skulltula:",
     "Skulltula (Big):",
@@ -230,15 +230,15 @@ const char* const countMappings[] = {
     "Start:",
 };
 
-#define COLOR_WHITE      ImVec4(1.00f, 1.00f, 1.00f, 1.00f)
-#define COLOR_RED        ImVec4(1.00f, 0.00f, 0.00f, 1.00f)
-#define COLOR_GREEN      ImVec4(0.10f, 1.00f, 0.10f, 1.00f)
-#define COLOR_BLUE       ImVec4(0.00f, 0.33f, 1.00f, 1.00f)
-#define COLOR_PURPLE     ImVec4(0.54f, 0.19f, 0.89f, 1.00f)
-#define COLOR_YELLOW     ImVec4(1.00f, 1.00f, 0.00f, 1.00f)
-#define COLOR_ORANGE     ImVec4(1.00f, 0.67f, 0.11f, 1.00f)
+#define COLOR_WHITE ImVec4(1.00f, 1.00f, 1.00f, 1.00f)
+#define COLOR_RED ImVec4(1.00f, 0.00f, 0.00f, 1.00f)
+#define COLOR_GREEN ImVec4(0.10f, 1.00f, 0.10f, 1.00f)
+#define COLOR_BLUE ImVec4(0.00f, 0.33f, 1.00f, 1.00f)
+#define COLOR_PURPLE ImVec4(0.54f, 0.19f, 0.89f, 1.00f)
+#define COLOR_YELLOW ImVec4(1.00f, 1.00f, 0.00f, 1.00f)
+#define COLOR_ORANGE ImVec4(1.00f, 0.67f, 0.11f, 1.00f)
 #define COLOR_LIGHT_BLUE ImVec4(0.00f, 0.88f, 1.00f, 1.00f)
-#define COLOR_GREY       ImVec4(0.78f, 0.78f, 0.78f, 1.00f)
+#define COLOR_GREY ImVec4(0.78f, 0.78f, 0.78f, 1.00f)
 
 char itemTimestampDisplayName[TIMESTAMP_MAX][21] = { "" };
 ImVec4 itemTimestampDisplayColor[TIMESTAMP_MAX];
@@ -248,14 +248,14 @@ typedef struct {
     u32 time;
     ImVec4 color;
     bool isRoom;
-}TimestampInfo;
+} TimestampInfo;
 
 // Timestamps are an array of structs, each with a name, time, and color
-// Names and colors are set up at the bottom of this file
-// Times are stored in gSaveContext.ship.stats.itemTimestamp
+// Names and colors are set up at the bottom of this file.
+// Times are stored in gSaveContext.ship.stats.itemTimestamp.
 TimestampInfo itemTimestampDisplay[TIMESTAMP_MAX];
 TimestampInfo sceneTimestampDisplay[8191];
-//std::vector<TimestampInfo> sceneTimestampDisplay;
+// std::vector<TimestampInfo> sceneTimestampDisplay;
 
 std::string formatTimestampGameplayStat(uint32_t value) {
     uint32_t sec = value / 10;
@@ -302,37 +302,38 @@ void LoadStatsVersion1() {
     SaveManager::Instance->LoadData("fileCreatedAt", gSaveContext.ship.stats.fileCreatedAt);
     SaveManager::Instance->LoadData("playTimer", gSaveContext.ship.stats.playTimer);
     SaveManager::Instance->LoadData("pauseTimer", gSaveContext.ship.stats.pauseTimer);
-    SaveManager::Instance->LoadArray("itemTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]);
-    });
-    SaveManager::Instance->LoadArray("sceneTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.sceneTimestamps), [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            int scene, room, sceneTime, roomTime, isRoom;
-            SaveManager::Instance->LoadData("scene", scene);
-            SaveManager::Instance->LoadData("room", room);
-            SaveManager::Instance->LoadData("sceneTime", sceneTime);
-            SaveManager::Instance->LoadData("roomTime", roomTime);
-            SaveManager::Instance->LoadData("isRoom", isRoom);
-            if (scene == 0 && room == 0 && sceneTime == 0 && roomTime == 0 && isRoom == 0) {
-                return;
-            }
-            gSaveContext.ship.stats.sceneTimestamps[i].scene = scene;
-            gSaveContext.ship.stats.sceneTimestamps[i].room = room;
-            gSaveContext.ship.stats.sceneTimestamps[i].sceneTime = sceneTime;
-            gSaveContext.ship.stats.sceneTimestamps[i].roomTime = roomTime;
-            gSaveContext.ship.stats.sceneTimestamps[i].isRoom = isRoom;
+    SaveManager::Instance->LoadArray(
+        "itemTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp),
+        [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]); });
+    SaveManager::Instance->LoadArray(
+        "sceneTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.sceneTimestamps), [&](size_t i) {
+            SaveManager::Instance->LoadStruct("", [&]() {
+                int scene, room, sceneTime, roomTime, isRoom;
+                SaveManager::Instance->LoadData("scene", scene);
+                SaveManager::Instance->LoadData("room", room);
+                SaveManager::Instance->LoadData("sceneTime", sceneTime);
+                SaveManager::Instance->LoadData("roomTime", roomTime);
+                SaveManager::Instance->LoadData("isRoom", isRoom);
+                if (scene == 0 && room == 0 && sceneTime == 0 && roomTime == 0 && isRoom == 0) {
+                    return;
+                }
+                gSaveContext.ship.stats.sceneTimestamps[i].scene = scene;
+                gSaveContext.ship.stats.sceneTimestamps[i].room = room;
+                gSaveContext.ship.stats.sceneTimestamps[i].sceneTime = sceneTime;
+                gSaveContext.ship.stats.sceneTimestamps[i].roomTime = roomTime;
+                gSaveContext.ship.stats.sceneTimestamps[i].isRoom = isRoom;
+            });
         });
-    });
     SaveManager::Instance->LoadData("tsIdx", gSaveContext.ship.stats.tsIdx);
     SaveManager::Instance->LoadArray("counts", ARRAY_COUNT(gSaveContext.ship.stats.count), [](size_t i) {
         SaveManager::Instance->LoadData("", gSaveContext.ship.stats.count[i]);
     });
-    SaveManager::Instance->LoadArray("scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]);
-    });
-    SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]);
-    });
+    SaveManager::Instance->LoadArray(
+        "scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered),
+        [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]); });
+    SaveManager::Instance->LoadArray(
+        "entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered),
+        [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]); });
 }
 
 void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) {
@@ -350,47 +351,53 @@ void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) {
     SaveManager::Instance->SaveData("fileCreatedAt", saveContext->ship.stats.fileCreatedAt);
     SaveManager::Instance->SaveData("playTimer", saveContext->ship.stats.playTimer);
     SaveManager::Instance->SaveData("pauseTimer", saveContext->ship.stats.pauseTimer);
-    SaveManager::Instance->SaveArray("itemTimestamps", ARRAY_COUNT(saveContext->ship.stats.itemTimestamp), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->ship.stats.itemTimestamp[i]);
-    });
-    SaveManager::Instance->SaveArray("sceneTimestamps", ARRAY_COUNT(saveContext->ship.stats.sceneTimestamps), [&](size_t i) {
-        if (saveContext->ship.stats.sceneTimestamps[i].scene != 254 && saveContext->ship.stats.sceneTimestamps[i].room != 254) {
-            SaveManager::Instance->SaveStruct("", [&]() {
-                SaveManager::Instance->SaveData("scene", saveContext->ship.stats.sceneTimestamps[i].scene);
-                SaveManager::Instance->SaveData("room", saveContext->ship.stats.sceneTimestamps[i].room);
-                SaveManager::Instance->SaveData("sceneTime", saveContext->ship.stats.sceneTimestamps[i].sceneTime);
-                SaveManager::Instance->SaveData("roomTime", saveContext->ship.stats.sceneTimestamps[i].roomTime);
-                SaveManager::Instance->SaveData("isRoom", saveContext->ship.stats.sceneTimestamps[i].isRoom);
-            });
-        }
-    });
+    SaveManager::Instance->SaveArray(
+        "itemTimestamps", ARRAY_COUNT(saveContext->ship.stats.itemTimestamp),
+        [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->ship.stats.itemTimestamp[i]); });
+    SaveManager::Instance->SaveArray(
+        "sceneTimestamps", ARRAY_COUNT(saveContext->ship.stats.sceneTimestamps), [&](size_t i) {
+            if (saveContext->ship.stats.sceneTimestamps[i].scene != 254 &&
+                saveContext->ship.stats.sceneTimestamps[i].room != 254) {
+                SaveManager::Instance->SaveStruct("", [&]() {
+                    SaveManager::Instance->SaveData("scene", saveContext->ship.stats.sceneTimestamps[i].scene);
+                    SaveManager::Instance->SaveData("room", saveContext->ship.stats.sceneTimestamps[i].room);
+                    SaveManager::Instance->SaveData("sceneTime", saveContext->ship.stats.sceneTimestamps[i].sceneTime);
+                    SaveManager::Instance->SaveData("roomTime", saveContext->ship.stats.sceneTimestamps[i].roomTime);
+                    SaveManager::Instance->SaveData("isRoom", saveContext->ship.stats.sceneTimestamps[i].isRoom);
+                });
+            }
+        });
     SaveManager::Instance->SaveData("tsIdx", saveContext->ship.stats.tsIdx);
     SaveManager::Instance->SaveArray("counts", ARRAY_COUNT(saveContext->ship.stats.count), [&](size_t i) {
         SaveManager::Instance->SaveData("", saveContext->ship.stats.count[i]);
     });
-    SaveManager::Instance->SaveArray("scenesDiscovered", ARRAY_COUNT(saveContext->ship.stats.scenesDiscovered), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->ship.stats.scenesDiscovered[i]);
-    });
-    SaveManager::Instance->SaveArray("entrancesDiscovered", ARRAY_COUNT(saveContext->ship.stats.entrancesDiscovered), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->ship.stats.entrancesDiscovered[i]);
-    });
+    SaveManager::Instance->SaveArray(
+        "scenesDiscovered", ARRAY_COUNT(saveContext->ship.stats.scenesDiscovered),
+        [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->ship.stats.scenesDiscovered[i]); });
+    SaveManager::Instance->SaveArray(
+        "entrancesDiscovered", ARRAY_COUNT(saveContext->ship.stats.entrancesDiscovered),
+        [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->ship.stats.entrancesDiscovered[i]); });
 }
 
-void GameplayStatsRow(const char* label, const std::string& value, ImVec4 color = COLOR_WHITE) {
+void GameplayStatsRow(const char* label, const std::string& value, ImVec4 color = COLOR_WHITE,
+                      const char* tooltip = "") {
     ImGui::PushStyleColor(ImGuiCol_Text, color);
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
     ImGui::Text("%s", label);
-    ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(value.c_str()).x - 8.0f));
+    ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(value.c_str()).x));
     ImGui::Text("%s", value.c_str());
     ImGui::PopStyleColor();
+    if (tooltip != "" && ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("%s", tooltip);
+    }
 }
 
 bool compareTimestampInfoByTime(const TimestampInfo& a, const TimestampInfo& b) {
-    return CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.ReverseTimestamps"), 0) ? a.time > b.time : a.time < b.time;
+    return CVarGetInteger(CVAR_GAMEPLAY_STATS("ReverseTimestamps"), 0) ? a.time > b.time : a.time < b.time;
 }
 
-const char* ResolveSceneID(int sceneID, int roomID){
+const char* ResolveSceneID(int sceneID, int roomID) {
     if (sceneID == SCENE_GROTTOS) {
         switch (roomID) {
             case 0:
@@ -423,7 +430,7 @@ const char* ResolveSceneID(int sceneID, int roomID){
                 return "Big Skulltula Grotto";
         };
     } else if (sceneID == SCENE_WINDMILL_AND_DAMPES_GRAVE) {
-        //Only the last room of Dampe's Grave (rm 6) is considered the windmill
+        // Only the last room of Dampe's Grave (rm 6) is considered the windmill.
         return roomID == 6 ? "Windmill" : "Dampe's Grave";
     } else if (sceneID < SCENE_ID_MAX) {
         return sceneMappings[sceneID];
@@ -436,7 +443,7 @@ void DrawGameplayStatsHeader() {
     ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, { 4.0f, 4.0f });
     ImGui::BeginTable("gameplayStatsHeader", 1, ImGuiTableFlags_BordersOuter);
     ImGui::TableSetupColumn("stat", ImGuiTableColumnFlags_WidthStretch);
-    //if tag is empty (not a release build)
+    // if tag is empty (not a release build)
     if (gGitCommitTag[0] == 0) {
         GameplayStatsRow("Git Branch:", (char*)gGitBranch);
         GameplayStatsRow("Git Commit Hash:", (char*)gGitCommitHash);
@@ -444,21 +451,30 @@ void DrawGameplayStatsHeader() {
         GameplayStatsRow("Build Version:", (char*)gBuildVersion);
     }
     if (gSaveContext.ship.stats.rtaTiming) {
-        GameplayStatsRow("Total Time (RTA):", formatTimestampGameplayStat(GAMEPLAYSTAT_TOTAL_TIME), gSaveContext.ship.stats.gameComplete ? COLOR_GREEN : COLOR_WHITE);
+        GameplayStatsRow("Total Time (RTA):", formatTimestampGameplayStat(GAMEPLAYSTAT_TOTAL_TIME),
+                         gSaveContext.ship.stats.gameComplete ? COLOR_GREEN : COLOR_WHITE);
     } else {
-        GameplayStatsRow("Total Game Time:", formatTimestampGameplayStat(GAMEPLAYSTAT_TOTAL_TIME), gSaveContext.ship.stats.gameComplete ? COLOR_GREEN : COLOR_WHITE);
+        GameplayStatsRow("Total Game Time:", formatTimestampGameplayStat(GAMEPLAYSTAT_TOTAL_TIME),
+                         gSaveContext.ship.stats.gameComplete ? COLOR_GREEN : COLOR_WHITE);
     }
-    if (CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.ShowAdditionalTimers"), 0)) { // !Only display total game time
-        GameplayStatsRow("Gameplay Time:", formatTimestampGameplayStat(gSaveContext.ship.stats.playTimer / 2), COLOR_GREY);
-        GameplayStatsRow("Pause Menu Time:", formatTimestampGameplayStat(gSaveContext.ship.stats.pauseTimer / 3), COLOR_GREY);
-        GameplayStatsRow("Time in scene:", formatTimestampGameplayStat(gSaveContext.ship.stats.sceneTimer / 2), COLOR_LIGHT_BLUE);
-        GameplayStatsRow("Time in room:", formatTimestampGameplayStat(gSaveContext.ship.stats.roomTimer / 2), COLOR_LIGHT_BLUE);
+    if (CVarGetInteger(CVAR_GAMEPLAY_STATS("ShowAdditionalTimers"), 0)) { // !Only display total game time
+        GameplayStatsRow("Gameplay Time:", formatTimestampGameplayStat(gSaveContext.ship.stats.playTimer / 2),
+                         COLOR_GREY);
+        GameplayStatsRow("Pause Menu Time:", formatTimestampGameplayStat(gSaveContext.ship.stats.pauseTimer / 3),
+                         COLOR_GREY);
+        GameplayStatsRow("Time in scene:", formatTimestampGameplayStat(gSaveContext.ship.stats.sceneTimer / 2),
+                         COLOR_LIGHT_BLUE);
+        GameplayStatsRow("Time in room:", formatTimestampGameplayStat(gSaveContext.ship.stats.roomTimer / 2),
+                         COLOR_LIGHT_BLUE);
     }
-    if (gPlayState != NULL && CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.ShowDebugInfo"), 0)) { // && display debug info
+    if (gPlayState != NULL && CVarGetInteger(CVAR_GAMEPLAY_STATS("ShowDebugInfo"), 0)) { // && display debug info
         GameplayStatsRow("play->sceneNum:", formatHexGameplayStat(gPlayState->sceneNum), COLOR_YELLOW);
-        GameplayStatsRow("gSaveContext.entranceIndex:", formatHexGameplayStat(gSaveContext.entranceIndex), COLOR_YELLOW);
-        GameplayStatsRow("gSaveContext.cutsceneIndex:", formatHexOnlyGameplayStat(gSaveContext.cutsceneIndex), COLOR_YELLOW);
-        GameplayStatsRow("play->roomCtx.curRoom.num:", formatIntGameplayStat(gPlayState->roomCtx.curRoom.num), COLOR_YELLOW);
+        GameplayStatsRow("gSaveContext.entranceIndex:", formatHexGameplayStat(gSaveContext.entranceIndex),
+                         COLOR_YELLOW);
+        GameplayStatsRow("gSaveContext.cutsceneIndex:", formatHexOnlyGameplayStat(gSaveContext.cutsceneIndex),
+                         COLOR_YELLOW);
+        GameplayStatsRow("play->roomCtx.curRoom.num:", formatIntGameplayStat(gPlayState->roomCtx.curRoom.num),
+                         COLOR_YELLOW);
     }
     ImGui::EndTable();
     ImGui::PopStyleVar(1);
@@ -480,12 +496,12 @@ void DrawGameplayStatsTimestampsTab() {
     for (int i = 0; i < TIMESTAMP_MAX; i++) {
         // To be shown, the entry must have a non-zero time and a string for its display name
         if (itemTimestampDisplay[i].time > 0 && strnlen(itemTimestampDisplay[i].name, 21) > 1) {
-            GameplayStatsRow(itemTimestampDisplay[i].name, formatTimestampGameplayStat(itemTimestampDisplay[i].time), itemTimestampDisplay[i].color);
+            GameplayStatsRow(itemTimestampDisplay[i].name, formatTimestampGameplayStat(itemTimestampDisplay[i].time),
+                             itemTimestampDisplay[i].color);
         }
     }
     ImGui::EndTable();
     ImGui::PopStyleVar(1);
-
 }
 
 void DrawGameplayStatsCountsTab() {
@@ -516,7 +532,8 @@ void DrawGameplayStatsCountsTab() {
     ImGui::TableSetupColumn("stat", ImGuiTableColumnFlags_WidthStretch);
     GameplayStatsRow("Enemies Defeated:", formatIntGameplayStat(enemiesDefeated));
     if (enemiesDefeated > 0) {
-        ImGui::TableNextRow(); ImGui::TableNextColumn();
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
         if (ImGui::TreeNodeEx("Enemy Details...", ImGuiTreeNodeFlags_NoTreePushOnOpen)) {
             for (int i = COUNT_ENEMIES_DEFEATED_ANUBIS; i <= COUNT_ENEMIES_DEFEATED_WOLFOS; i++) {
                 if (i == COUNT_ENEMIES_DEFEATED_FLOORMASTER) {
@@ -527,13 +544,14 @@ void DrawGameplayStatsCountsTab() {
             }
         }
     }
-    GameplayStatsRow("Rupees Collected:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_RUPEES_COLLECTED]));
-    UIWidgets::Tooltip("Includes rupees collected with a full wallet.");
+    GameplayStatsRow("Rupees Collected:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_RUPEES_COLLECTED]),
+                     COLOR_WHITE, "Includes rupees collected with a full wallet.");
     GameplayStatsRow("Rupees Spent:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_RUPEES_SPENT]));
     GameplayStatsRow("Chests Opened:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_CHESTS_OPENED]));
     GameplayStatsRow("Ammo Used:", formatIntGameplayStat(ammoUsed));
     if (ammoUsed > 0) {
-        ImGui::TableNextRow(); ImGui::TableNextColumn();
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
         if (ImGui::TreeNodeEx("Ammo Details...", ImGuiTreeNodeFlags_NoTreePushOnOpen)) {
             for (int i = COUNT_AMMO_USED_STICK; i <= COUNT_AMMO_USED_BEAN; i++) {
                 GameplayStatsRow(countMappings[i], formatIntGameplayStat(gSaveContext.ship.stats.count[i]));
@@ -544,8 +562,10 @@ void DrawGameplayStatsCountsTab() {
     GameplayStatsRow("Sword Swings:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_SWORD_SWINGS]));
     GameplayStatsRow("Steps Taken:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_STEPS]));
     // If using MM Bunny Hood enhancement, show how long it's been equipped (not counting pause time)
-    if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD] > 0) {
-        GameplayStatsRow("Bunny Hood Time:", formatTimestampGameplayStat(gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD] / 2));
+    if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA ||
+        gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD] > 0) {
+        GameplayStatsRow("Bunny Hood Time:",
+                         formatTimestampGameplayStat(gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD] / 2));
     }
     GameplayStatsRow("Rolls:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_ROLLS]));
     GameplayStatsRow("Bonks:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_BONKS]));
@@ -557,7 +577,8 @@ void DrawGameplayStatsCountsTab() {
     GameplayStatsRow("Bushes Cut:", formatIntGameplayStat(gSaveContext.ship.stats.count[COUNT_BUSHES_CUT]));
     GameplayStatsRow("Buttons Pressed:", formatIntGameplayStat(buttonPresses));
     if (buttonPresses > 0) {
-        ImGui::TableNextRow(); ImGui::TableNextColumn();
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
         if (ImGui::TreeNodeEx("Buttons...", ImGuiTreeNodeFlags_NoTreePushOnOpen)) {
             for (int i = COUNT_BUTTON_PRESSES_A; i <= COUNT_BUTTON_PRESSES_START; i++) {
                 GameplayStatsRow(countMappings[i], formatIntGameplayStat(gSaveContext.ship.stats.count[i]));
@@ -570,16 +591,19 @@ void DrawGameplayStatsCountsTab() {
 
 void DrawGameplayStatsBreakdownTab() {
     for (int i = 0; i < gSaveContext.ship.stats.tsIdx; i++) {
-        std::string sceneName = ResolveSceneID(gSaveContext.ship.stats.sceneTimestamps[i].scene, gSaveContext.ship.stats.sceneTimestamps[i].room);
+        std::string sceneName = ResolveSceneID(gSaveContext.ship.stats.sceneTimestamps[i].scene,
+                                               gSaveContext.ship.stats.sceneTimestamps[i].room);
         std::string name;
-        if (CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), 0) && gSaveContext.ship.stats.sceneTimestamps[i].scene != SCENE_GROTTOS) {
+        if (CVarGetInteger(CVAR_GAMEPLAY_STATS("RoomBreakdown"), 0) &&
+            gSaveContext.ship.stats.sceneTimestamps[i].scene != SCENE_GROTTOS) {
             name = fmt::format("{:s} Room {:d}", sceneName, gSaveContext.ship.stats.sceneTimestamps[i].room);
         } else {
             name = sceneName;
         }
         strcpy(sceneTimestampDisplay[i].name, name.c_str());
-        sceneTimestampDisplay[i].time = CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), 0) ?
-            gSaveContext.ship.stats.sceneTimestamps[i].roomTime : gSaveContext.ship.stats.sceneTimestamps[i].sceneTime;
+        sceneTimestampDisplay[i].time = CVarGetInteger(CVAR_GAMEPLAY_STATS("RoomBreakdown"), 0)
+                                            ? gSaveContext.ship.stats.sceneTimestamps[i].roomTime
+                                            : gSaveContext.ship.stats.sceneTimestamps[i].sceneTime;
         sceneTimestampDisplay[i].color = COLOR_GREY;
         sceneTimestampDisplay[i].isRoom = gSaveContext.ship.stats.sceneTimestamps[i].isRoom;
     }
@@ -589,14 +613,16 @@ void DrawGameplayStatsBreakdownTab() {
     ImGui::TableSetupColumn("stat", ImGuiTableColumnFlags_WidthStretch);
     for (int i = 0; i < gSaveContext.ship.stats.tsIdx; i++) {
         TimestampInfo tsInfo = sceneTimestampDisplay[i];
-        bool canShow = !tsInfo.isRoom || CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), 0);
+        bool canShow = !tsInfo.isRoom || CVarGetInteger(CVAR_GAMEPLAY_STATS("RoomBreakdown"), 0);
         if (tsInfo.time > 0 && strnlen(tsInfo.name, 40) > 1 && canShow) {
             GameplayStatsRow(tsInfo.name, formatTimestampGameplayStat(tsInfo.time), tsInfo.color);
         }
     }
     std::string toPass;
-    if (CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), 0) && gSaveContext.ship.stats.sceneNum != SCENE_GROTTOS) {
-        toPass = fmt::format("{:s} Room {:d}", ResolveSceneID(gSaveContext.ship.stats.sceneNum, gSaveContext.ship.stats.roomNum), gSaveContext.ship.stats.roomNum);
+    if (CVarGetInteger(CVAR_GAMEPLAY_STATS("RoomBreakdown"), 0) && gSaveContext.ship.stats.sceneNum != SCENE_GROTTOS) {
+        toPass = fmt::format("{:s} Room {:d}",
+                             ResolveSceneID(gSaveContext.ship.stats.sceneNum, gSaveContext.ship.stats.roomNum),
+                             gSaveContext.ship.stats.roomNum);
     } else {
         toPass = ResolveSceneID(gSaveContext.ship.stats.sceneNum, gSaveContext.ship.stats.roomNum);
     }
@@ -606,26 +632,36 @@ void DrawGameplayStatsBreakdownTab() {
 }
 
 void DrawGameplayStatsOptionsTab() {
-    UIWidgets::PaddedEnhancementCheckbox("Show in-game total timer", CVAR_ENHANCEMENT("GameplayStats.ShowIngameTimer"), true, false);
-    UIWidgets::InsertHelpHoverText("Keep track of the timer as an in-game HUD element. The position of the timer can be changed in the Cosmetics Editor.");
-    UIWidgets::PaddedEnhancementCheckbox("Show latest timestamps on top", CVAR_ENHANCEMENT("GameplayStats.ReverseTimestamps"), true, false);
-    UIWidgets::PaddedEnhancementCheckbox("Room Breakdown", CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), true, false);
-    ImGui::SameLine();
-    UIWidgets::InsertHelpHoverText("Allows a more in-depth perspective of time spent in a certain map.");
-    UIWidgets::PaddedEnhancementCheckbox("RTA Timing on new files", CVAR_ENHANCEMENT("GameplayStats.RTATiming"), true, false);
-    ImGui::SameLine();
-    UIWidgets::InsertHelpHoverText(
-        "Timestamps are relative to starting timestamp rather than in game time, usually necessary for races/speedruns.\n\n"
-        "Starting timestamp is on first non-c-up input after intro cutscene.\n\n"
-        "NOTE: THIS NEEDS TO BE SET BEFORE CREATING A FILE TO TAKE EFFECT"
-    );
-    UIWidgets::PaddedEnhancementCheckbox("Show additional detail timers", CVAR_ENHANCEMENT("GameplayStats.ShowAdditionalTimers"), true, false);
-    UIWidgets::PaddedEnhancementCheckbox("Show Debug Info", CVAR_ENHANCEMENT("GameplayStats.ShowDebugInfo"));
+    UIWidgets::CVarCheckbox("Show in-game total timer", CVAR_GAMEPLAY_STATS("ShowIngameTimer"),
+                            UIWidgets::CheckboxOptions()
+                                .Tooltip("Keep track of the timer as an in-game HUD element. The position of the "
+                                         "timer can be changed in the Cosmetics Editor.")
+                                .Color(THEME_COLOR));
+    UIWidgets::CVarCheckbox("Show latest timestamps on top", CVAR_GAMEPLAY_STATS("ReverseTimestamps"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+    UIWidgets::CVarCheckbox("Room Breakdown", CVAR_GAMEPLAY_STATS("RoomBreakdown"),
+                            UIWidgets::CheckboxOptions()
+                                .Tooltip("Allows a more in-depth perspective of time spent in a certain map.")
+                                .Color(THEME_COLOR));
+    UIWidgets::CVarCheckbox("RTA Timing on new files", CVAR_GAMEPLAY_STATS("RTATiming"),
+                            UIWidgets::CheckboxOptions()
+                                .Tooltip("Timestamps are relative to starting timestamp rather than in game time, "
+                                         "usually necessary for races/speedruns.\n\n"
+                                         "Starting timestamp is on first non-C-up input after intro cutscene.\n\n"
+                                         "NOTE: THIS NEEDS TO BE SET BEFORE CREATING A FILE TO TAKE EFFECT")
+                                .Color(THEME_COLOR));
+    UIWidgets::CVarCheckbox("Show additional detail timers", CVAR_GAMEPLAY_STATS("ShowAdditionalTimers"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+    UIWidgets::CVarCheckbox("Show Debug Info", CVAR_GAMEPLAY_STATS("ShowDebugInfo"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
 }
 
 void GameplayStatsWindow::DrawElement() {
+    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
     DrawGameplayStatsHeader();
 
+    UIWidgets::PushStyleTabs(THEME_COLOR);
+
     if (ImGui::BeginTabBar("Stats", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
         if (ImGui::BeginTabItem("Timestamps")) {
             DrawGameplayStatsTimestampsTab();
@@ -646,6 +682,9 @@ void GameplayStatsWindow::DrawElement() {
         ImGui::EndTabBar();
     }
 
+    UIWidgets::PopStyleTabs();
+    ImGui::PopFont();
+
     ImGui::Text("Note: Gameplay stats are saved to the current file and will be\nlost if you quit without saving.");
 }
 void InitStats(bool isDebug) {
@@ -654,7 +693,7 @@ void InitStats(bool isDebug) {
     for (int dungeon = 0; dungeon < ARRAY_COUNT(gSaveContext.ship.stats.dungeonKeys); dungeon++) {
         gSaveContext.ship.stats.dungeonKeys[dungeon] = isDebug ? 8 : 0;
     }
-    gSaveContext.ship.stats.rtaTiming = CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RTATiming"), 0);
+    gSaveContext.ship.stats.rtaTiming = CVarGetInteger(CVAR_GAMEPLAY_STATS("RTATiming"), 0);
     gSaveContext.ship.stats.fileCreatedAt = 0;
     gSaveContext.ship.stats.playTimer = 0;
     gSaveContext.ship.stats.pauseTimer = 0;
@@ -676,7 +715,8 @@ void InitStats(bool isDebug) {
     for (int scenesIdx = 0; scenesIdx < ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered); scenesIdx++) {
         gSaveContext.ship.stats.scenesDiscovered[scenesIdx] = 0;
     }
-    for (int entrancesIdx = 0; entrancesIdx < ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered); entrancesIdx++) {
+    for (int entrancesIdx = 0; entrancesIdx < ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered);
+         entrancesIdx++) {
         gSaveContext.ship.stats.entrancesDiscovered[entrancesIdx] = 0;
     }
 
@@ -692,6 +732,7 @@ void SetupDisplayNames() {
     // To add a timestamp for an item or event, add it to this list and ensure
     // it has a corresponding entry in the enum (see gameplaystats.h)
 
+    // clang-format off
     strcpy(itemTimestampDisplayName[ITEM_BOW],              "Fairy Bow:          ");
     strcpy(itemTimestampDisplayName[ITEM_ARROW_FIRE],       "Fire Arrows:        ");
     strcpy(itemTimestampDisplayName[ITEM_DINS_FIRE],        "Din's Fire:         ");
@@ -782,6 +823,7 @@ void SetupDisplayNames() {
     strcpy(itemTimestampDisplayName[TIMESTAMP_BOSSRUSH_FINISH],      "Boss Rush Finished: ");
     strcpy(itemTimestampDisplayName[TIMESTAMP_FOUND_GREG],           "Greg Found:         ");
     strcpy(itemTimestampDisplayName[TIMESTAMP_TRIFORCE_COMPLETED],   "Triforce Completed: ");
+    // clang-format on
 }
 
 void SetupDisplayColors() {
@@ -850,9 +892,9 @@ void GameplayStatsWindow::InitElement() {
     SetupDisplayColors();
 
     SaveManager::Instance->AddLoadFunction("sohStats", 1, LoadStatsVersion1);
-    // Add main section save, no parent
+    // Add main section save, no parent.
     SaveManager::Instance->AddSaveFunction("sohStats", 1, SaveStats, true, SECTION_PARENT_NONE);
-    // Add subsections, parent of "sohStats". Not sure how to do this without the redundant references to "SaveStats"
+    // Add subsections, parent of "sohStats". Not sure how to do this without the redundant references to "SaveStats".
     SaveManager::Instance->AddSaveFunction("entrances", 1, SaveStats, false, SECTION_ID_STATS);
     SaveManager::Instance->AddSaveFunction("scenes", 1, SaveStats, false, SECTION_ID_STATS);
     SaveManager::Instance->AddInitFunction(InitStats);
diff --git a/soh/soh/Enhancements/gameplaystats.h b/soh/soh/Enhancements/gameplaystats.h
index 81190c01eb..1f89cb3a43 100644
--- a/soh/soh/Enhancements/gameplaystats.h
+++ b/soh/soh/Enhancements/gameplaystats.h
@@ -6,30 +6,32 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-    uint64_t GetUnixTimestamp(void);
-    char* GameplayStats_GetCurrentTime();
+uint64_t GetUnixTimestamp(void);
+char* GameplayStats_GetCurrentTime();
 #ifdef __cplusplus
 };
 #endif
 
 // When using RTA timing
-    // get the diff since the save was created,
-    // unless the game is complete in which we use the defeated ganon timestamp
+// get the diff since the save was created,
+// unless the game is complete in which we use the defeated ganon timestamp
 // When not using RTA timing
-    // Total gameplay time is tracked in tenths of seconds
-    // I.E. game time counts frames at 20fps/2, pause time counts frames at 30fps/3
-    // Frame counts in z_play.c and z_kaleido_scope_call.c
-#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.ship.stats.rtaTiming ?\
-    (!gSaveContext.ship.stats.gameComplete ?\
-        (!gSaveContext.ship.stats.fileCreatedAt ? 0 : ((GetUnixTimestamp() - gSaveContext.ship.stats.fileCreatedAt) / 100)) :\
-        (gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_DEFEAT_GANON]                         \
+// Total gameplay time is tracked in tenths of seconds
+// I.E. game time counts frames at 20fps/2, pause time counts frames at 30fps/3
+// Frame counts in z_play.c and z_kaleido_scope_call.c
+#define GAMEPLAYSTAT_TOTAL_TIME                                                                \
+    (gSaveContext.ship.stats.rtaTiming                                                         \
+         ? (!gSaveContext.ship.stats.gameComplete                                              \
+                ? (!gSaveContext.ship.stats.fileCreatedAt                                      \
+                       ? 0                                                                     \
+                       : ((GetUnixTimestamp() - gSaveContext.ship.stats.fileCreatedAt) / 100)) \
+                : (gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_DEFEAT_GANON]               \
                        ? gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_DEFEAT_GANON]         \
                        : gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED])) \
-         :\
-    (gSaveContext.ship.stats.playTimer / 2 + gSaveContext.ship.stats.pauseTimer / 3))
-#define CURRENT_MODE_TIMER (CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.RoomBreakdown"), 0) ?\
-    gSaveContext.ship.stats.roomTimer :\
-    gSaveContext.ship.stats.sceneTimer)
+         : (gSaveContext.ship.stats.playTimer / 2 + gSaveContext.ship.stats.pauseTimer / 3))
+#define CURRENT_MODE_TIMER                                                                       \
+    (CVarGetInteger(CVAR_GAMEPLAY_STATS("RoomBreakdown"), 0) ? gSaveContext.ship.stats.roomTimer \
+                                                             : gSaveContext.ship.stats.sceneTimer)
 
 void InitStatTracker();
 
@@ -37,22 +39,22 @@ typedef enum {
     // 0x00 to 0x9B (0 to 155) used for getting items,
     // piggybacked off enum "ItemID" in z64item.h
 
-    /* 0xA0 */ TIMESTAMP_DEFEAT_GOHMA = 0xA0,   // z_boss_goma.c
-    /* 0xA1 */ TIMESTAMP_DEFEAT_KING_DODONGO,   // z_boss_dodongo.c
-    /* 0xA2 */ TIMESTAMP_DEFEAT_BARINADE,       // z_boss_va.c
-    /* 0xA3 */ TIMESTAMP_DEFEAT_PHANTOM_GANON,  // z_boss_ganondrof.c
-    /* 0xA4 */ TIMESTAMP_DEFEAT_VOLVAGIA,       // z_boss_fd2.c
-    /* 0xA5 */ TIMESTAMP_DEFEAT_MORPHA,         // z_boss_mo.c
-    /* 0xA6 */ TIMESTAMP_DEFEAT_BONGO_BONGO,    // z_boss_sst.c
-    /* 0xA7 */ TIMESTAMP_DEFEAT_TWINROVA,       // z_boss_tw.c
-    /* 0xA8 */ TIMESTAMP_DEFEAT_GANONDORF,      // z_boss_ganon.c
-    /* 0xA9 */ TIMESTAMP_DEFEAT_GANON,          // z_boss_ganon2.c
-    /* 0xA9 */ TIMESTAMP_BOSSRUSH_FINISH,       // z_boss_ganon2.c
-    /* 0xAA */ TIMESTAMP_FOUND_GREG,            // z_parameter.c
-    /* 0xAA */ TIMESTAMP_TRIFORCE_COMPLETED,    // z_parameter.c
+    /* 0xA0 */ TIMESTAMP_DEFEAT_GOHMA = 0xA0,  // z_boss_goma.c
+    /* 0xA1 */ TIMESTAMP_DEFEAT_KING_DODONGO,  // z_boss_dodongo.c
+    /* 0xA2 */ TIMESTAMP_DEFEAT_BARINADE,      // z_boss_va.c
+    /* 0xA3 */ TIMESTAMP_DEFEAT_PHANTOM_GANON, // z_boss_ganondrof.c
+    /* 0xA4 */ TIMESTAMP_DEFEAT_VOLVAGIA,      // z_boss_fd2.c
+    /* 0xA5 */ TIMESTAMP_DEFEAT_MORPHA,        // z_boss_mo.c
+    /* 0xA6 */ TIMESTAMP_DEFEAT_BONGO_BONGO,   // z_boss_sst.c
+    /* 0xA7 */ TIMESTAMP_DEFEAT_TWINROVA,      // z_boss_tw.c
+    /* 0xA8 */ TIMESTAMP_DEFEAT_GANONDORF,     // z_boss_ganon.c
+    /* 0xA9 */ TIMESTAMP_DEFEAT_GANON,         // z_boss_ganon2.c
+    /* 0xA9 */ TIMESTAMP_BOSSRUSH_FINISH,      // z_boss_ganon2.c
+    /* 0xAA */ TIMESTAMP_FOUND_GREG,           // z_parameter.c
+    /* 0xAA */ TIMESTAMP_TRIFORCE_COMPLETED,   // z_parameter.c
     /* 0xAB */ TIMESTAMP_MAX
 
-}GameplayStatTimestamp;
+} GameplayStatTimestamp;
 
 typedef enum {
     // Enemies defeated
diff --git a/soh/soh/Enhancements/gameplaystatswindow.h b/soh/soh/Enhancements/gameplaystatswindow.h
index 453b24559c..515820307d 100644
--- a/soh/soh/Enhancements/gameplaystatswindow.h
+++ b/soh/soh/Enhancements/gameplaystatswindow.h
@@ -1,11 +1,10 @@
 #include <libultraship/libultraship.h>
-#include "gameplaystats.h"
 
-class GameplayStatsWindow : public Ship::GuiWindow {
+class GameplayStatsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
\ No newline at end of file
diff --git a/soh/soh/Enhancements/item-tables/ItemTableManager.h b/soh/soh/Enhancements/item-tables/ItemTableManager.h
index e20632f387..8420e68976 100644
--- a/soh/soh/Enhancements/item-tables/ItemTableManager.h
+++ b/soh/soh/Enhancements/item-tables/ItemTableManager.h
@@ -8,16 +8,16 @@ typedef std::unordered_map<uint16_t, GetItemEntry> ItemTable;
 
 class ItemTableManager {
   public:
-      static ItemTableManager* Instance;
-      ItemTableManager();
-      ~ItemTableManager();
-      bool AddItemTable(uint16_t tableID);
-      bool AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry);
-      GetItemEntry RetrieveItemEntry(uint16_t tableID, uint16_t getItemID);
-      bool ClearItemTable(uint16_t tableID);
+    static ItemTableManager* Instance;
+    ItemTableManager();
+    ~ItemTableManager();
+    bool AddItemTable(uint16_t tableID);
+    bool AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry);
+    GetItemEntry RetrieveItemEntry(uint16_t tableID, uint16_t getItemID);
+    bool ClearItemTable(uint16_t tableID);
 
   private:
-      std::unordered_map<uint16_t, ItemTable> itemTables;
+    std::unordered_map<uint16_t, ItemTable> itemTables;
 
-      ItemTable* RetrieveItemTable(uint16_t tableID);
+    ItemTable* RetrieveItemTable(uint16_t tableID);
 };
diff --git a/soh/soh/Enhancements/item-tables/ItemTableTypes.h b/soh/soh/Enhancements/item-tables/ItemTableTypes.h
index d9d7427177..df59d67704 100644
--- a/soh/soh/Enhancements/item-tables/ItemTableTypes.h
+++ b/soh/soh/Enhancements/item-tables/ItemTableTypes.h
@@ -29,11 +29,18 @@ typedef enum GetItemCategory {
     /* 0x05 */ ITEM_CATEGORY_MAJOR,
 } GetItemCategory;
 
-#define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId) \
-    { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL }
+#define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId)                \
+    {                                                                                                                  \
+        itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, \
+            modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL                     \
+    }
 
-#define GET_ITEM_CUSTOM_TABLE(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, tableId, getItemId) \
-    { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, tableId, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL }
+#define GET_ITEM_CUSTOM_TABLE(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, tableId,     \
+                              getItemId)                                                                               \
+    {                                                                                                                  \
+        itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, \
+            tableId, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL                      \
+    }
 
 #define GET_ITEM_NONE \
     { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, ITEM_NONE, 0, NULL }
@@ -50,13 +57,16 @@ typedef struct GetItemEntry {
     /* 0x03 */ uint16_t textId;
     /* 0x04 */ uint16_t objectId;
     /* 0x06 */ uint16_t modIndex; // Primarily used for determining whether to use Item_Give or Randomizer_Item_Give
-    /* 0x07 */ uint16_t tableId; // GetItemEntry table this entry is in (usually the same as modIndex, but not always)
+    /* 0x07 */ uint16_t tableId;  // GetItemEntry table this entry is in (usually the same as modIndex, but not always)
     /* 0x08 */ int16_t getItemId;
     /* 0x0A */ uint16_t gid; // Stores the GID value unmodified for future reference.
-    /* 0x0C */ uint16_t collectable; // determines whether the item can be collected on the overworld. Will be true in most cases.
+    /* 0x0C */ uint16_t
+        collectable; // determines whether the item can be collected on the overworld. Will be true in most cases.
     /* 0x0E */ GetItemFrom getItemFrom;
     /* 0x0F */ GetItemCategory getItemCategory; // Primarily made and used for chest size/texture matches contents
-    /* 0x10 */ uint16_t drawItemId; // Will be a copy of itemId unless the item is an ice trap. Needed for particles to function on ice traps.
-    /* 0x11 */ uint16_t drawModIndex; // Will be a copy of modIndex unless the item is an ice trap. Needed for particles to function on ice traps.
+    /* 0x10 */ uint16_t drawItemId; // Will be a copy of itemId unless the item is an ice trap. Needed for particles to
+                                    // function on ice traps.
+    /* 0x11 */ uint16_t drawModIndex; // Will be a copy of modIndex unless the item is an ice trap. Needed for particles
+                                      // to function on ice traps.
     CustomDrawFunc drawFunc;
 } GetItemEntry; // size = 0x11
diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp
index 4cddeef43e..eef19b4952 100644
--- a/soh/soh/Enhancements/kaleido.cpp
+++ b/soh/soh/Enhancements/kaleido.cpp
@@ -1,6 +1,7 @@
 #include "kaleido.h"
 
 #include "soh/frame_interpolation.h"
+#include "soh/ShipUtils.h"
 
 extern "C" {
 #include "z64.h"
@@ -26,444 +27,423 @@ void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos);
 
 namespace Rando {
 
-    void KaleidoEntryIcon::LoadIconTex(std::vector<Gfx>* mEntryDl) {
-        if (mIconFormat == G_IM_FMT_IA) {
-            if (mIconSize == G_IM_SIZ_8b) {
-                Gfx iconTexture[] = { gsDPLoadTextureBlock(mIconResourceName, G_IM_FMT_IA, G_IM_SIZ_8b, mIconWidth, mIconHeight, 0,
-                                              G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                                              G_TX_NOLOD, G_TX_NOLOD) };
-                mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
-            }
-        } else if (mIconFormat == G_IM_FMT_RGBA) {
-            if (mIconSize == G_IM_SIZ_32b) {
-                Gfx iconTexture[] = { gsDPLoadTextureBlock(mIconResourceName, G_IM_FMT_RGBA, G_IM_SIZ_32b, mIconWidth, mIconHeight, 0,
-                                                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                                                           G_TX_NOLOD, G_TX_NOLOD) };
-                mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
-            }
+void KaleidoEntryIcon::LoadIconTex(std::vector<Gfx>* mEntryDl) {
+    if (mIconFormat == G_IM_FMT_IA) {
+        if (mIconSize == G_IM_SIZ_8b) {
+            Gfx iconTexture[] = { gsDPLoadTextureBlock(
+                mIconResourceName, G_IM_FMT_IA, G_IM_SIZ_8b, mIconWidth, mIconHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
+            mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
+        }
+    } else if (mIconFormat == G_IM_FMT_RGBA) {
+        if (mIconSize == G_IM_SIZ_32b) {
+            Gfx iconTexture[] = { gsDPLoadTextureBlock(
+                mIconResourceName, G_IM_FMT_RGBA, G_IM_SIZ_32b, mIconWidth, mIconHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
+            mEntryDl->insert(mEntryDl->end(), std::begin(iconTexture), std::end(iconTexture));
         }
     }
+}
 
-    KaleidoEntry::KaleidoEntry(int16_t x, int16_t y, std::string text) : mX(x), mY(y), mText(std::move(text)) {
-        mHeight = 0;
-        mWidth = 0;
-        vtx = nullptr;
+KaleidoEntry::KaleidoEntry(int16_t x, int16_t y, std::string text) : mX(x), mY(y), mText(std::move(text)) {
+    mHeight = 0;
+    mWidth = 0;
+    vtx = nullptr;
+}
+
+void KaleidoEntry::SetYOffset(int yOffset) {
+    mY = yOffset;
+}
+
+void KaleidoEntryIcon::Draw(PlayState* play, std::vector<Gfx>* mEntryDl) {
+    if (vtx == nullptr) {
+        return;
+    }
+    size_t numChar = mText.length();
+    if (numChar == 0) {
+        return;
     }
 
-    void KaleidoEntry::SetYOffset(int yOffset) {
-        mY = yOffset;
+    Color_RGBA8 textColor = { 255, 255, 255, 255 };
+    if (mAchieved) {
+        textColor = { 0x98, 0xFF, 0x44, 255 };
     }
 
-    void KaleidoEntryIcon::Draw(PlayState* play, std::vector<Gfx>* mEntryDl) {
-        if (vtx == nullptr) {
-            return;
-        }
-        size_t numChar = mText.length();
-        if (numChar == 0) {
-            return;
-        }
+    Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
 
-        Color_RGBA8 textColor = { 255, 255, 255, 255 };
-        if (mAchieved) {
-            textColor = { 0x98, 0xFF, 0x44, 255 };
-        }
+    mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+                                   G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
 
-        Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
-
-        mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
-
-        // icon
-        if (!mAchieved) {
-            mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
-            mEntryDl->push_back(gsSPGrayscale(true));
-        }
-        mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
-        mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
-        LoadIconTex(mEntryDl);
-        mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
-        mEntryDl->push_back(gsSPGrayscale(false));
-
-        // text
-        mEntryDl->push_back(gsDPSetPrimColor(0, 0, textColor.r, textColor.g, textColor.b, textColor.a));
-        for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
-            uint16_t texIndex = mText[i] - 32;
-
-            // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
-            // handle loading groups of 16 chars at a time until there are no more left to load.
-            // By this point 4 vertices have already been loaded for the preceding icon.
-            if (i % 16 == 0) {
-                size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
-                mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
-                vtxGroup++;
-            }
-
-            if (texIndex != 0) {
-                auto texture = reinterpret_cast<uintptr_t>(Font_FetchCharTexture(texIndex));
-                auto vertexStart = static_cast<int16_t>(4 * (i % 16));
-
-                Gfx charTexture[] = {gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH,
-                                                             FONT_CHAR_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                                                             G_TX_NOMIRROR | G_TX_CLAMP,
-                                                             G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD)};
-                mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
-                mEntryDl->push_back(
-                        gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
-            }
-        }
-        mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+    // icon
+    if (!mAchieved) {
+        mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
+        mEntryDl->push_back(gsSPGrayscale(true));
     }
+    mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
+    mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
+    LoadIconTex(mEntryDl);
+    mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
+    mEntryDl->push_back(gsSPGrayscale(false));
 
-    Kaleido::Kaleido() {
-        const auto ctx = Rando::Context::GetInstance();
-        int yOffset = 2;
-        mEntries.push_back(std::make_shared<KaleidoEntryIconFlag>(gRupeeCounterIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16,
-                              Color_RGBA8{ 0xC8, 0xFF, 0x64, 255 }, FlagType::FLAG_RANDOMIZER_INF,
-                              static_cast<int>(RAND_INF_GREG_FOUND), 0, yOffset, "Greg"));
+    // text
+    mEntryDl->push_back(gsDPSetPrimColor(0, 0, textColor.r, textColor.g, textColor.b, textColor.a));
+    for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
+        // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
+        // handle loading groups of 16 chars at a time until there are no more left to load.
+        // By this point 4 vertices have already been loaded for the preceding icon.
+        if (i % 16 == 0) {
+            size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
+            mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
+            vtxGroup++;
+        }
+
+        auto texture = reinterpret_cast<uintptr_t>(Ship_GetCharFontTexture(mText[i]));
+        auto vertexStart = static_cast<int16_t>(4 * (i % 16));
+
+        Gfx charTexture[] = { gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0,
+                                                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP,
+                                                      G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
+        mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
+        mEntryDl->push_back(gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
+    }
+    mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+}
+
+Kaleido::Kaleido() {
+    const auto ctx = Rando::Context::GetInstance();
+    int yOffset = 2;
+    mEntries.push_back(std::make_shared<KaleidoEntryIconFlag>(
+        gRupeeCounterIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, Color_RGBA8{ 0xC8, 0xFF, 0x64, 255 },
+        FlagType::FLAG_RANDOMIZER_INF, static_cast<int>(RAND_INF_GREG_FOUND), 0, yOffset, "Greg"));
+    yOffset += 18;
+    if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+        mEntries.push_back(std::make_shared<KaleidoEntryIconCountRequired>(
+            gTriforcePieceTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 }, 0, yOffset,
+            reinterpret_cast<int*>(&gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected),
+            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Get() + 1,
+            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Get() + 1));
         yOffset += 18;
-        if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
-            mEntries.push_back(
-                    std::make_shared<KaleidoEntryIconCountRequired>(
-                            gTriforcePieceTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255,255,255,255 }, 0,
-                            yOffset, reinterpret_cast<int*>(&gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected),
-                            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Get() + 1,
-                            ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Get() + 1));
-            yOffset += 18;
-        }
-        if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
-            mEntries.push_back(std::make_shared<KaleidoEntryOcarinaButtons>(0, yOffset));
-            yOffset += 18;
-        }
-        if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).IsNot(RO_BOSS_SOULS_OFF)) {
-            static const char* bossSoulNames[] = {
-                    "Gohma's Soul",
-                    "King Dodongo's Soul",
-                    "Barinade's Soul",
-                    "Phantom Ganon's Soul",
-                    "Volvagia's Soul",
-                    "Morpha's Soul",
-                    "Bongo Bongo's Soul",
-                    "Twinrova's Soul",
-            };
-            for (int i = RAND_INF_GOHMA_SOUL; i < RAND_INF_GANON_SOUL; i++) {
-                mEntries.push_back(
-                    std::make_shared<KaleidoEntryIconFlag>(
-                        gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
-                        FlagType::FLAG_RANDOMIZER_INF, i, 0, yOffset, bossSoulNames[i - RAND_INF_GOHMA_SOUL]
-                    )
-                );
-                yOffset += 18;
-            }
-        }
-        if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
-            mEntries.push_back(
-                    std::make_shared<KaleidoEntryIconFlag>(
-                            gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
-                            FlagType::FLAG_RANDOMIZER_INF, RAND_INF_GANON_SOUL, 0, yOffset, "Ganon's Soul"
-                    )
-            );
+    }
+    if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
+        mEntries.push_back(std::make_shared<KaleidoEntryOcarinaButtons>(0, yOffset));
+        yOffset += 18;
+    }
+    if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).IsNot(RO_BOSS_SOULS_OFF)) {
+        static const char* bossSoulNames[] = {
+            "Gohma's Soul",    "King Dodongo's Soul", "Barinade's Soul",    "Phantom Ganon's Soul",
+            "Volvagia's Soul", "Morpha's Soul",       "Bongo Bongo's Soul", "Twinrova's Soul",
+        };
+        for (int i = RAND_INF_GOHMA_SOUL; i < RAND_INF_GANON_SOUL; i++) {
+            mEntries.push_back(std::make_shared<KaleidoEntryIconFlag>(
+                gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
+                FlagType::FLAG_RANDOMIZER_INF, i, 0, yOffset, bossSoulNames[i - RAND_INF_GOHMA_SOUL]));
             yOffset += 18;
         }
     }
-
-    extern "C" {
-    void FrameInterpolation_RecordCloseChild(void);
-    void FrameInterpolation_RecordOpenChild(const void* a, int b);
+    if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
+        mEntries.push_back(std::make_shared<KaleidoEntryIconFlag>(
+            gBossSoulTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, Color_RGBA8{ 255, 255, 255, 255 },
+            FlagType::FLAG_RANDOMIZER_INF, RAND_INF_GANON_SOUL, 0, yOffset, "Ganon's Soul"));
+        yOffset += 18;
     }
+}
 
-    void Kaleido::Draw(PlayState* play) {
-        if (play == nullptr || mEntries.empty()) {
-            return;
-        }
-        PauseContext* pauseCtx = &play->pauseCtx;
-        Input* input = &play->state.input[0];
-        mEntryDl.clear();
-        OPEN_DISPS(play->state.gfxCtx);
-        mEntryDl.push_back(gsDPPipeSync());
-        Gfx_SetupDL_42Opa(play->state.gfxCtx);
-        mEntryDl.push_back(gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM));
+extern "C" {
+void FrameInterpolation_RecordCloseChild(void);
+void FrameInterpolation_RecordOpenChild(const void* a, int b);
+}
 
-        // Move the matrix origin to the top-left corner of the kaleido page
-        Matrix_Translate(-108.f, 58.f, 0.0f, MTXMODE_APPLY);
-        // Invert the matrix to render vertices with positive going down
-        Matrix_Scale(1.0f, -1.0f, 1.0f, MTXMODE_APPLY);
-        // The scrolling logic is in here because the built in kaleido input throttling happens
-        // in its Draw functions, which get called after their update functions. I hate it but fixing
-        // it would be a much larger Kaleido change.
-        bool shouldScroll = false;
-        bool dpad = CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0);
-        if (((pauseCtx->unk_1E4 == 0) || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) &&
-            (pauseCtx->pageIndex == PAUSE_QUEST)) {
-            if (!((pauseCtx->state != 6) || ((pauseCtx->stickRelX == 0) && (pauseCtx->stickRelY == 0)))) {
-                if (pauseCtx->cursorSpecialPos == 0) {
-                    if ((pauseCtx->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
-                        if (mTopIndex > 0) {
-                            mTopIndex--;
-                            shouldScroll = true;
-                        }
-                    } else if ((pauseCtx->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
-                        if (mTopIndex + mNumVisible < mEntries.size()) {
-                            mTopIndex++;
-                            shouldScroll = true;
-                        }
+void Kaleido::Draw(PlayState* play) {
+    if (play == nullptr || mEntries.empty()) {
+        return;
+    }
+    PauseContext* pauseCtx = &play->pauseCtx;
+    Input* input = &play->state.input[0];
+    mEntryDl.clear();
+    OPEN_DISPS(play->state.gfxCtx);
+    mEntryDl.push_back(gsDPPipeSync());
+    Gfx_SetupDL_42Opa(play->state.gfxCtx);
+    mEntryDl.push_back(gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM));
+
+    // Move the matrix origin to the top-left corner of the kaleido page
+    Matrix_Translate(-108.f, 58.f, 0.0f, MTXMODE_APPLY);
+    // Invert the matrix to render vertices with positive going down
+    Matrix_Scale(1.0f, -1.0f, 1.0f, MTXMODE_APPLY);
+    // The scrolling logic is in here because the built in kaleido input throttling happens
+    // in its Draw functions, which get called after their update functions. I hate it but fixing
+    // it would be a much larger Kaleido change.
+    bool shouldScroll = false;
+    bool dpad = CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0);
+    if (((pauseCtx->unk_1E4 == 0) || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) &&
+        (pauseCtx->pageIndex == PAUSE_QUEST)) {
+        if (!((pauseCtx->state != 6) || ((pauseCtx->stickRelX == 0) && (pauseCtx->stickRelY == 0)))) {
+            if (pauseCtx->cursorSpecialPos == 0) {
+                if ((pauseCtx->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
+                    if (mTopIndex > 0) {
+                        mTopIndex--;
+                        shouldScroll = true;
                     }
-                    if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
-                        KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_LEFT);
-                        pauseCtx->unk_1E4 = 0;
-                    } else if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
-                        KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_RIGHT);
-                        pauseCtx->unk_1E4 = 0;
-                    }
-                } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) {
-                    if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
-                        pauseCtx->cursorSpecialPos = 0;
-                        Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                    }
-                } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) {
-                    if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
-                        pauseCtx->cursorSpecialPos = 0;
-                        Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                } else if ((pauseCtx->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
+                    if (mTopIndex + mNumVisible < mEntries.size()) {
+                        mTopIndex++;
+                        shouldScroll = true;
                     }
                 }
-            } else if (pauseCtx->cursorSpecialPos != 0 && pauseCtx->state == 7) {
-                pauseCtx->cursorSpecialPos = 0;
+                if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_LEFT);
+                    pauseCtx->unk_1E4 = 0;
+                } else if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_RIGHT);
+                    pauseCtx->unk_1E4 = 0;
+                }
+            } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) {
+                if ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    pauseCtx->cursorSpecialPos = 0;
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+            } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) {
+                if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    pauseCtx->cursorSpecialPos = 0;
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
             }
-        }
-        int yOffset = 2;
-        for (int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
-            auto& entry = mEntries[i];
-            if (shouldScroll) {
-                entry->SetYOffset(yOffset);
-                yOffset += 18;
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-            }
-            Matrix_Push();
-            entry->Draw(play, &mEntryDl);
-            Matrix_Pop();
-        }
-
-        mEntryDl.push_back(gsSPEndDisplayList());
-        gSPDisplayList(POLY_OPA_DISP++, mEntryDl.data());
-        CLOSE_DISPS(play->state.gfxCtx);
-    }
-
-    void Kaleido::Update(PlayState *play) {
-        for(int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
-            const auto& entry = mEntries[i];
-            entry->Update(play);
+        } else if (pauseCtx->cursorSpecialPos != 0 && pauseCtx->state == 7) {
+            pauseCtx->cursorSpecialPos = 0;
         }
     }
-
-    extern "C" void RandoKaleido_DrawMiscCollectibles(PlayState* play) {
-        OTRGlobals::Instance->gRandoContext->GetKaleido()->Draw(play);
-    }
-
-    extern "C" void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene) {
-        PauseContext* pauseCtx = &gPlayState->pauseCtx;
-        if (pauseCtx->randoQuestMode && pauseCtx->pageIndex == PAUSE_QUEST) {
-            OTRGlobals::Instance->gRandoContext->GetKaleido()->Update(gPlayState);
+    int yOffset = 2;
+    for (int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
+        auto& entry = mEntries[i];
+        if (shouldScroll) {
+            entry->SetYOffset(yOffset);
+            yOffset += 18;
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
+        Matrix_Push();
+        entry->Draw(play, &mEntryDl);
+        Matrix_Pop();
     }
 
-    KaleidoEntryIconFlag::KaleidoEntryIconFlag(const char *iconResourceName, int iconFormat, int iconSize, int iconWidth,
-                                               int iconHeight, Color_RGBA8 iconColor, FlagType flagType, int flag,
-                                               int16_t x, int16_t y, std::string name) :
-        mFlagType(flagType), mFlag(flag),
-        KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y, std::move(name)) {
-        BuildVertices();
-    }
+    mEntryDl.push_back(gsSPEndDisplayList());
+    gSPDisplayList(POLY_OPA_DISP++, mEntryDl.data());
+    CLOSE_DISPS(play->state.gfxCtx);
+}
 
-    void KaleidoEntryIconFlag::Update(PlayState* play) {
-        mAchieved = GameInteractor::RawAction::CheckFlag(mFlagType, static_cast<int16_t>(mFlag));
+void Kaleido::Update(PlayState* play) {
+    for (int i = mTopIndex; i < (mTopIndex + mNumVisible) && i < mEntries.size(); i++) {
+        const auto& entry = mEntries[i];
+        entry->Update(play);
     }
+}
 
-    KaleidoEntryIconCountRequired::KaleidoEntryIconCountRequired(const char *iconResourceName, int iconFormat,
-        int iconSize, int iconWidth, int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch,
-        int required, int total) : mWatch(watch), mRequired(required), mTotal(total),
-        KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y) {
+extern "C" void RandoKaleido_DrawMiscCollectibles(PlayState* play) {
+    OTRGlobals::Instance->gRandoContext->GetKaleido()->Draw(play);
+}
+
+extern "C" void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene) {
+    PauseContext* pauseCtx = &gPlayState->pauseCtx;
+    if (pauseCtx->randoQuestMode && pauseCtx->pageIndex == PAUSE_QUEST) {
+        OTRGlobals::Instance->gRandoContext->GetKaleido()->Update(gPlayState);
+    }
+}
+
+KaleidoEntryIconFlag::KaleidoEntryIconFlag(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth,
+                                           int iconHeight, Color_RGBA8 iconColor, FlagType flagType, int flag,
+                                           int16_t x, int16_t y, std::string name)
+    : mFlagType(flagType), mFlag(flag), KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight,
+                                                         iconColor, x, y, std::move(name)) {
+    BuildVertices();
+}
+
+void KaleidoEntryIconFlag::Update(PlayState* play) {
+    mAchieved = GameInteractor::RawAction::CheckFlag(mFlagType, static_cast<int16_t>(mFlag));
+}
+
+KaleidoEntryIconCountRequired::KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize,
+                                                             int iconWidth, int iconHeight, Color_RGBA8 iconColor,
+                                                             int16_t x, int16_t y, int* watch, int required, int total)
+    : mWatch(watch), mRequired(required), mTotal(total),
+      KaleidoEntryIcon(iconResourceName, iconFormat, iconSize, iconWidth, iconHeight, iconColor, x, y) {
+    mCount = *mWatch;
+    BuildText();
+    BuildVertices();
+}
+
+void KaleidoEntryIconCountRequired::BuildText() {
+    std::ostringstream totals;
+    totals << mCount;
+    if (mRequired != 0 && mCount < mRequired) {
+        totals << '/' << mRequired;
+    }
+    if (mTotal >= mRequired && mCount >= mRequired) {
+        totals << '/' << mTotal;
+    }
+    mText = totals.str();
+}
+
+void KaleidoEntryIcon::BuildVertices() {
+    int offsetY = 0;
+    int offsetX = 0;
+    // 4 vertices per character, plus one for the preceding icon.
+    Vtx* vertices = (Vtx*)calloc(sizeof(Vtx[4]), mText.length() + 1);
+    // Vertex for the preceding icon.
+    Ship_CreateQuadVertexGroup(vertices, offsetX, offsetY, mIconWidth, mIconHeight, 0);
+    offsetX += 18;
+    for (size_t i = 0; i < mText.length(); i++) {
+        int charWidth = static_cast<int>(Ship_GetCharFontWidth(mText[i]));
+        Ship_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, offsetY, charWidth, 16, 0);
+        offsetX += charWidth;
+    }
+    offsetY += FONT_CHAR_TEX_HEIGHT;
+    mWidth = static_cast<int16_t>(offsetX);
+    mHeight = static_cast<int16_t>(offsetY);
+
+    vertices[1].v.ob[0] = 16;
+    vertices[2].v.ob[1] = 16;
+    vertices[3].v.ob[0] = 16;
+    vertices[3].v.ob[1] = 16;
+    vtx = vertices;
+}
+
+KaleidoEntryIcon::KaleidoEntryIcon(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth,
+                                   int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, std::string text)
+    : mIconResourceName(iconResourceName), mIconFormat(iconFormat), mIconSize(iconSize), mIconWidth(iconWidth),
+      mIconHeight(iconHeight), mIconColor(iconColor), KaleidoEntry(x, y, std::move(text)) {
+}
+
+void KaleidoEntryIcon::RebuildVertices() {
+    free(vtx);
+    vtx = nullptr;
+    BuildVertices();
+}
+
+void KaleidoEntryIconCountRequired::Update(PlayState* play) {
+    if (mCount != *mWatch) {
         mCount = *mWatch;
         BuildText();
-        BuildVertices();
+        RebuildVertices();
+        mAchieved = mCount >= mRequired;
     }
+}
 
-    void KaleidoEntryIconCountRequired::BuildText() {
-        std::ostringstream totals;
-        totals << mCount;
-        if (mRequired != 0 && mCount < mRequired) {
-            totals << '/' << mRequired;
-        }
-        if (mTotal >= mRequired && mCount >= mRequired) {
-            totals << '/' << mTotal;
-        }
-        mText = totals.str();
+KaleidoEntryOcarinaButtons::KaleidoEntryOcarinaButtons(int16_t x, int16_t y)
+    : KaleidoEntryIcon(gItemIconOcarinaOfTimeTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32,
+                       Color_RGBA8{ 255, 255, 255, 255 }, x, y, "\x9F\xA5\xA6\xA7\xA8") {
+    CalculateColors();
+    BuildVertices();
+}
+
+void KaleidoEntryOcarinaButtons::CalculateColors() {
+    Color_RGB8 aButtonColor = { 80, 150, 255 };
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.Changed"), 0)) {
+        aButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.AButton.Value"), aButtonColor);
+    } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
+        aButtonColor = { 80, 255, 150 };
     }
-
-    void KaleidoEntryIcon::BuildVertices() {
-        int offsetY = 0;
-        int offsetX = 0;
-        // 4 vertices per character, plus one for the preceding icon.
-        Vtx* vertices = (Vtx*)calloc(sizeof(Vtx[4]), mText.length() + 1);
-        // Vertex for the preceding icon.
-        Interface_CreateQuadVertexGroup(vertices, offsetX, offsetY, mIconWidth, mIconHeight, 0);
-        offsetX += 18;
-        for (size_t i = 0; i < mText.length(); i++) {
-            auto charIndex = static_cast<uint16_t>(mText[i] - 32);
-            int charWidth = 0;
-            if (charIndex >= 0) {
-                charWidth = static_cast<int>(Message_GetCharacterWidth(charIndex) * (100.0f / R_TEXT_CHAR_SCALE));
-            }
-            Interface_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, offsetY, charWidth, 16, 0);
-            offsetX += charWidth;
-        }
-        offsetY += FONT_CHAR_TEX_HEIGHT;
-        mWidth = static_cast<int16_t>(offsetX);
-        mHeight = static_cast<int16_t>(offsetY);
-
-        vertices[1].v.ob[0] = 16;
-        vertices[2].v.ob[1] = 16;
-        vertices[3].v.ob[0] = 16;
-        vertices[3].v.ob[1] = 16;
-        vtx = vertices;
+    mButtonColors[0] = { aButtonColor.r, aButtonColor.g, aButtonColor.b, 255 };
+    Color_RGB8 cButtonsColor = { 255, 255, 50 };
+    Color_RGB8 cUpButtonColor = cButtonsColor;
+    Color_RGB8 cDownButtonColor = cButtonsColor;
+    Color_RGB8 cLeftButtonColor = cButtonsColor;
+    Color_RGB8 cRightButtonColor = cButtonsColor;
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
+        cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+        cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+        cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
+        cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
     }
-
-    KaleidoEntryIcon::KaleidoEntryIcon(const char *iconResourceName, int iconFormat, int iconSize, int iconWidth,
-                                       int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, std::string text)
-                                       : mIconResourceName(iconResourceName), mIconFormat(iconFormat), mIconSize(iconSize),
-                                       mIconWidth(iconWidth), mIconHeight(iconHeight), mIconColor(iconColor),
-                                       KaleidoEntry(x, y, std::move(text)) {}
-
-    void KaleidoEntryIcon::RebuildVertices() {
-        free(vtx);
-        vtx = nullptr;
-        BuildVertices();
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
+        cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
     }
-
-    void KaleidoEntryIconCountRequired::Update(PlayState *play) {
-        if (mCount != *mWatch) {
-            mCount = *mWatch;
-            BuildText();
-            RebuildVertices();
-            mAchieved = mCount >= mRequired;
-        }
-
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
+        cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
     }
-
-    KaleidoEntryOcarinaButtons::KaleidoEntryOcarinaButtons(int16_t x, int16_t y) :
-            KaleidoEntryIcon(gItemIconOcarinaOfTimeTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32,
-                             Color_RGBA8{ 255, 255, 255, 255 }, x, y, "\x9F\xA5\xA6\xA7\xA8") {
-        CalculateColors();
-        BuildVertices();
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
+        cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
     }
-
-    void KaleidoEntryOcarinaButtons::CalculateColors() {
-        Color_RGB8 aButtonColor = { 80, 150, 255 };
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.Changed"), 0)) {
-            aButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.AButton.Value"), aButtonColor);
-        } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
-            aButtonColor = { 80, 255, 150};
-        }
-        mButtonColors[0] = { aButtonColor.r, aButtonColor.g, aButtonColor.b, 255 };
-        Color_RGB8 cButtonsColor = { 255, 255, 50 };
-        Color_RGB8 cUpButtonColor = cButtonsColor;
-        Color_RGB8 cDownButtonColor = cButtonsColor;
-        Color_RGB8 cLeftButtonColor = cButtonsColor;
-        Color_RGB8 cRightButtonColor = cButtonsColor;
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
-            cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
-            cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
-            cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
-            cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
-        }
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.Changed"), 0)) {
-            cUpButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CUpButton.Value"), cUpButtonColor);
-        }
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.Changed"), 0)) {
-            cDownButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CDownButton.Value"), cDownButtonColor);
-        }
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.Changed"), 0)) {
-            cLeftButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CLeftButton.Value"), cLeftButtonColor);
-        }
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
-            cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
-        }
-        mButtonColors[1] = { cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, 255 };
-        mButtonColors[2] = { cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, 255 };
-        mButtonColors[3] = { cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, 255 };
-        mButtonColors[4] = { cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, 255 };
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.Changed"), 0)) {
+        cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
     }
+    mButtonColors[1] = { cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, 255 };
+    mButtonColors[2] = { cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, 255 };
+    mButtonColors[3] = { cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, 255 };
+    mButtonColors[4] = { cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, 255 };
+}
 
-    void KaleidoEntryOcarinaButtons::Update(PlayState *play) {
-        mButtonCollected[0] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_A) > 0;
-        mButtonCollected[1] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_UP) > 0;
-        mButtonCollected[2] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_DOWN) > 0;
-        mButtonCollected[3] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_LEFT) > 0;
-        mButtonCollected[4] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_RIGHT) > 0;
-        CalculateColors();
-        mAchieved = false;
-        for (int i = 0; i < mButtonCollected.size(); i++) {
-            if (!mButtonCollected[i]) {
-                mButtonColors[i] = Color_RGBA8{ 109, 109, 109, 255 };
-            } else {
-                mAchieved = true;
-            }
+void KaleidoEntryOcarinaButtons::Update(PlayState* play) {
+    mButtonCollected[0] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_A) > 0;
+    mButtonCollected[1] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_UP) > 0;
+    mButtonCollected[2] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_DOWN) > 0;
+    mButtonCollected[3] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_LEFT) > 0;
+    mButtonCollected[4] = GameInteractor::RawAction::CheckFlag(FLAG_RANDOMIZER_INF, RAND_INF_HAS_OCARINA_C_RIGHT) > 0;
+    CalculateColors();
+    mAchieved = false;
+    for (int i = 0; i < mButtonCollected.size(); i++) {
+        if (!mButtonCollected[i]) {
+            mButtonColors[i] = Color_RGBA8{ 109, 109, 109, 255 };
+        } else {
+            mAchieved = true;
         }
     }
+}
 
-    void KaleidoEntryOcarinaButtons::Draw(PlayState *play, std::vector<Gfx>* mEntryDl) {
-        if (vtx == nullptr) {
-            return;
-        }
-        size_t numChar = mText.length();
-        if (numChar == 0) {
-            return;
-        }
-
-        Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
-//        Matrix_Scale(0.75f, 0.75f, 0.75f, MTXMODE_APPLY);
-
-        mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
-
-        // icon
-        if (!mAchieved) {
-            mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
-            mEntryDl->push_back(gsSPGrayscale(true));
-        }
-        mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
-        mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
-        LoadIconTex(mEntryDl);
-        mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
-        mEntryDl->push_back(gsSPGrayscale(false));
-
-        // text
-        for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
-            mEntryDl->push_back(gsDPSetPrimColor(0, 0, mButtonColors[i].r, mButtonColors[i].g, mButtonColors[i].b, mButtonColors[i].a));
-            uint16_t texIndex = mText[i] - 32;
-
-            // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
-            // handle loading groups of 16 chars at a time until there are no more left to load.
-            // By this point 4 vertices have already been loaded for the preceding icon.
-            if (i % 16 == 0) {
-                size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
-                mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
-                vtxGroup++;
-            }
-
-            if (texIndex != 0) {
-                auto texture = reinterpret_cast<uintptr_t>(Font_FetchCharTexture(texIndex));
-                auto vertexStart = static_cast<int16_t>(4 * (i % 16));
-
-                Gfx charTexture[] = {gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH,
-                                                             FONT_CHAR_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                                                             G_TX_NOMIRROR | G_TX_CLAMP,
-                                                             G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD)};
-                mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
-                mEntryDl->push_back(
-                        gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
-            }
-        }
-        mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+void KaleidoEntryOcarinaButtons::Draw(PlayState* play, std::vector<Gfx>* mEntryDl) {
+    if (vtx == nullptr) {
+        return;
     }
-} // Rando
+    size_t numChar = mText.length();
+    if (numChar == 0) {
+        return;
+    }
+
+    Matrix_Translate(mX, mY, 0.0f, MTXMODE_APPLY);
+    //        Matrix_Scale(0.75f, 0.75f, 0.75f, MTXMODE_APPLY);
+
+    mEntryDl->push_back(gsSPMatrix(Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+                                   G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW));
+
+    // icon
+    if (!mAchieved) {
+        mEntryDl->push_back(gsDPSetGrayscaleColor(109, 109, 109, 255));
+        mEntryDl->push_back(gsSPGrayscale(true));
+    }
+    mEntryDl->push_back(gsDPSetPrimColor(0, 0, mIconColor.r, mIconColor.g, mIconColor.b, mIconColor.a));
+    mEntryDl->push_back(gsSPVertex(vtx, 4, 0));
+    LoadIconTex(mEntryDl);
+    mEntryDl->push_back(gsSP1Quadrangle(0, 2, 3, 1, 0));
+    mEntryDl->push_back(gsSPGrayscale(false));
+
+    // text
+    for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
+        mEntryDl->push_back(
+            gsDPSetPrimColor(0, 0, mButtonColors[i].r, mButtonColors[i].g, mButtonColors[i].b, mButtonColors[i].a));
+
+        // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
+        // handle loading groups of 16 chars at a time until there are no more left to load.
+        // By this point 4 vertices have already been loaded for the preceding icon.
+        if (i % 16 == 0) {
+            size_t numVtxToLoad = std::min<size_t>(numChar - i, 16) * 4;
+            mEntryDl->push_back(gsSPVertex(&vtx[4 + (vtxGroup * 16 * 4)], numVtxToLoad, 0));
+            vtxGroup++;
+        }
+
+        auto texture = reinterpret_cast<uintptr_t>(Ship_GetCharFontTexture(mText[i]));
+        auto vertexStart = static_cast<int16_t>(4 * (i % 16));
+
+        Gfx charTexture[] = { gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0,
+                                                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP,
+                                                      G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
+        mEntryDl->insert(mEntryDl->end(), std::begin(charTexture), std::end(charTexture));
+        mEntryDl->push_back(gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
+    }
+    mEntryDl->push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
+}
+} // namespace Rando
 
 void RandoKaleido_RegisterHooks() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>(RandoKaleido_UpdateMiscCollectibles);
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>(
+        RandoKaleido_UpdateMiscCollectibles);
 }
diff --git a/soh/soh/Enhancements/kaleido.h b/soh/soh/Enhancements/kaleido.h
index db86a817e9..7776afb663 100644
--- a/soh/soh/Enhancements/kaleido.h
+++ b/soh/soh/Enhancements/kaleido.h
@@ -2,7 +2,6 @@
 #define KALEIDO_H
 #include <z64.h>
 
-
 #ifdef __cplusplus
 #include <vector>
 #include <string>
@@ -18,7 +17,7 @@ namespace Rando {
  * subclasses to declare their Draw and Update functions.
  */
 class KaleidoEntry {
-public:
+  public:
     /**
      * @brief Constructor for Base KaleidoEntry class. Sets the position and
      * initial value of the line of text.
@@ -31,7 +30,8 @@ public:
     virtual void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) = 0;
     virtual void Update(PlayState* play) = 0;
     void SetYOffset(int yOffset);
-protected:
+
+  protected:
     int16_t mX;
     int16_t mY;
     int16_t mHeight;
@@ -39,7 +39,6 @@ protected:
     Vtx* vtx;
     std::string mText;
     bool mAchieved = false;
-
 };
 
 /**
@@ -47,7 +46,7 @@ protected:
  * that wish to render an Icon at the start of their line.
  */
 class KaleidoEntryIcon : public KaleidoEntry {
-public:
+  public:
     /**
      * @param iconResourceName resource name of the icon to draw
      * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
@@ -63,7 +62,8 @@ public:
                      Color_RGBA8 iconColor, int16_t x, int16_t y, std::string text = "");
     void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) override;
     void RebuildVertices();
-protected:
+
+  protected:
     const char* mIconResourceName;
     int mIconFormat;
     int mIconSize;
@@ -80,7 +80,7 @@ protected:
  * that is either colored in or Grayscale according to a flag
  */
 class KaleidoEntryIconFlag : public KaleidoEntryIcon {
-public :
+  public:
     /**
      * @param iconResourceName resource name of the icon to draw
      * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
@@ -98,7 +98,8 @@ public :
                          Color_RGBA8 iconColor, FlagType flagType, int flag, int16_t x, int16_t y,
                          std::string name = "");
     void Update(PlayState* play) override;
-private:
+
+  private:
     FlagType mFlagType;
     int mFlag;
 };
@@ -109,7 +110,7 @@ private:
  * render the count and not show progress towards a required amount or a total.
  */
 class KaleidoEntryIconCountRequired : public KaleidoEntryIcon {
-public:
+  public:
     /**
      * @param iconResourceName resource name of the icon to draw
      * @param iconFormat flag representing the format of the icon (i.e. G_IM_FMT_IA)
@@ -126,10 +127,12 @@ public:
      * @param required The amount of this collectible required to beat the seed. Set to 0 to not render.
      * @param total The amount of this collectible available in the seed. Set to 0 to not render.
      */
-    KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth, int iconHeight,
-                                  Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch, int required = 0, int total = 0);
+    KaleidoEntryIconCountRequired(const char* iconResourceName, int iconFormat, int iconSize, int iconWidth,
+                                  int iconHeight, Color_RGBA8 iconColor, int16_t x, int16_t y, int* watch,
+                                  int required = 0, int total = 0);
     void Update(PlayState* play) override;
-private:
+
+  private:
     int* mWatch;
     int mRequired;
     int mTotal;
@@ -139,11 +142,12 @@ private:
 };
 
 class KaleidoEntryOcarinaButtons : public KaleidoEntryIcon {
-public:
+  public:
     KaleidoEntryOcarinaButtons(int16_t x, int16_t y);
     void Update(PlayState* play) override;
     void Draw(PlayState* play, std::vector<Gfx>* mEntryDl) override;
-private:
+
+  private:
     void CalculateColors();
 
     std::array<Color_RGBA8, 5> mButtonColors = {};
@@ -151,17 +155,18 @@ private:
 };
 
 class Kaleido {
-public:
+  public:
     Kaleido();
     void Draw(PlayState* play);
     void Update(PlayState* play);
-private:
+
+  private:
     std::vector<std::shared_ptr<KaleidoEntry>> mEntries;
     std::vector<Gfx> mEntryDl;
     int mTopIndex = 0;
     int mNumVisible = 7;
 };
-} // Rando
+} // namespace Rando
 
 extern "C" {
 #endif
@@ -172,5 +177,4 @@ void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene);
 #endif
 void RandoKaleido_RegisterHooks();
 
-
-#endif //KALEIDO_H
+#endif // KALEIDO_H
diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index cd60f7d8c9..6c547db08d 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -12,11 +12,8 @@
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
-#include "soh/Enhancements/nametag.h"
 #include "soh/Enhancements/timesaver_hook_handlers.h"
-#include "soh/Enhancements/TimeSavers/TimeSavers.h"
 #include "soh/Enhancements/randomizer/hook_handlers.h"
-#include "objects/object_gi_compass/object_gi_compass.h"
 
 #include "src/overlays/actors/ovl_En_Bb/z_en_bb.h"
 #include "src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h"
@@ -67,7 +64,8 @@ static const ALIGN_ASSET(2) char tokinoma_room_0DL_007FD0[] = dtokinoma_room_0DL
 
 /// Switches Link's age and respawns him at the last entrance he entered.
 void SwitchAge() {
-    if (gPlayState == NULL) return;
+    if (gPlayState == NULL)
+        return;
 
     Player* player = GET_PLAYER(gPlayState);
 
@@ -99,6 +97,13 @@ void SwitchAge() {
     gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK_FAST;
     gPlayState->linkAgeOnLoad ^= 1;
 
+    // Discover adult/child spawns
+    if (gPlayState->linkAgeOnLoad == LINK_AGE_ADULT) {
+        Entrance_SetEntranceDiscovered(ENTR_HYRULE_FIELD_10, false);
+    } else {
+        Entrance_SetEntranceDiscovered(ENTR_LINKS_HOUSE_CHILD_SPAWN, false);
+    }
+
     static HOOK_ID hookId = 0;
     hookId = REGISTER_VB_SHOULD(VB_INFLICT_VOID_DAMAGE, {
         *should = false;
@@ -115,14 +120,16 @@ void RegisterOcarinaTimeTravel() {
         }
 
         Actor* player = &GET_PLAYER(gPlayState)->actor;
-        Actor* nearbyTimeBlockEmpty = Actor_FindNearby(gPlayState, player, ACTOR_OBJ_WARP2BLOCK, ACTORCAT_ITEMACTION, 300.0f);
+        Actor* nearbyTimeBlockEmpty =
+            Actor_FindNearby(gPlayState, player, ACTOR_OBJ_WARP2BLOCK, ACTORCAT_ITEMACTION, 300.0f);
         Actor* nearbyTimeBlock = Actor_FindNearby(gPlayState, player, ACTOR_OBJ_TIMEBLOCK, ACTORCAT_ITEMACTION, 300.0f);
         Actor* nearbyOcarinaSpot = Actor_FindNearby(gPlayState, player, ACTOR_EN_OKARINA_TAG, ACTORCAT_PROP, 120.0f);
         Actor* nearbyDoorOfTime = Actor_FindNearby(gPlayState, player, ACTOR_DOOR_TOKI, ACTORCAT_BG, 500.0f);
         Actor* nearbyFrogs = Actor_FindNearby(gPlayState, player, ACTOR_EN_FR, ACTORCAT_NPC, 300.0f);
         Actor* nearbyGossipStone = Actor_FindNearby(gPlayState, player, ACTOR_EN_GS, ACTORCAT_NPC, 300.0f);
         bool justPlayedSoT = gPlayState->msgCtx.lastPlayedSong == OCARINA_SONG_TIME;
-        bool notNearAnySource = !nearbyTimeBlockEmpty && !nearbyTimeBlock && !nearbyOcarinaSpot && !nearbyDoorOfTime && !nearbyFrogs && !nearbyGossipStone;
+        bool notNearAnySource = !nearbyTimeBlockEmpty && !nearbyTimeBlock && !nearbyOcarinaSpot && !nearbyDoorOfTime &&
+                                !nearbyFrogs && !nearbyGossipStone;
         bool hasOcarinaOfTime = (INV_CONTENT(ITEM_OCARINA_TIME) == ITEM_OCARINA_TIME);
         bool doesntNeedOcarinaOfTime = CVarGetInteger(CVAR_ENHANCEMENT("TimeTravel"), 0) == 2;
         bool hasMasterSword = CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER);
@@ -133,72 +140,16 @@ void RegisterOcarinaTimeTravel() {
     });
 }
 
-void RegisterRupeeDash() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("RupeeDash"), 0)) {
-            return;
-        }
-        
-        // Initialize Timer
-        static uint16_t rupeeDashTimer = 0;
-        uint16_t rdmTime = CVarGetInteger(CVAR_ENHANCEMENT("RupeeDashInterval"), 5) * 20;
-        
-        // Did time change by DashInterval?
-        if (rupeeDashTimer >= rdmTime) {
-            rupeeDashTimer = 0;
-            if (gSaveContext.rupees > 0) {
-                uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1;
-                Rupees_ChangeBy(walletSize);
-            } else {
-                Health_ChangeBy(gPlayState, -16);
-            }
-        } else {
-            rupeeDashTimer++;
-        }
-    });
-}
-
-void RegisterShadowTag() {
-    static bool shouldSpawn = false;
-    static uint16_t delayTimer = 60;
-
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("ShadowTag"), 0)) {
-            return;
-        }
-        if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE &&  // Forest Temple Scene
-            gPlayState->roomCtx.curRoom.num == 16 ||        // Green Poe Room
-            gPlayState->roomCtx.curRoom.num == 13 ||        // Blue Poe Room
-            gPlayState->roomCtx.curRoom.num == 12) {        // Red Poe Room
-            return;
-        } else {
-            if (shouldSpawn && (delayTimer <= 0)) {
-                Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false);
-                shouldSpawn = false;
-            } else {
-                delayTimer--;
-            }
-        }
-    });
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {
-        shouldSpawn = true;
-        delayTimer = 60;
-    });
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
-        shouldSpawn = true;
-        delayTimer = 60;
-    });
-}
-
 static bool hasAffectedHealth = false;
 void UpdatePermanentHeartLossState() {
-    if (!GameInteractor::IsSaveLoaded()) return;
+    if (!GameInteractor::IsSaveLoaded())
+        return;
 
     if (!CVarGetInteger(CVAR_ENHANCEMENT("PermanentHeartLoss"), 0) && hasAffectedHealth) {
         uint8_t heartContainers = gSaveContext.ship.stats.heartContainers; // each worth 16 health
         uint8_t heartPieces = gSaveContext.ship.stats.heartPieces; // each worth 4 health, but only in groups of 4
-        uint8_t startingHealth = 16 * (IS_RANDO ? (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_HEARTS) + 1) : 3);
-
+        uint8_t startingHealth =
+            16 * (IS_RANDO ? (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_HEARTS) + 1) : 3);
 
         uint8_t newCapacity = startingHealth + (heartContainers * 16) + ((heartPieces - (heartPieces % 4)) * 4);
         gSaveContext.healthCapacity = MAX(newCapacity, gSaveContext.healthCapacity);
@@ -214,7 +165,8 @@ void RegisterPermanentHeartLoss() {
     });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("PermanentHeartLoss"), 0) || !GameInteractor::IsSaveLoaded()) return;
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("PermanentHeartLoss"), 0) || !GameInteractor::IsSaveLoaded())
+            return;
 
         if (gSaveContext.healthCapacity > 16 && gSaveContext.healthCapacity - gSaveContext.health >= 16) {
             gSaveContext.healthCapacity -= 16;
@@ -226,75 +178,24 @@ void RegisterPermanentHeartLoss() {
 
 void RegisterDeleteFileOnDeath() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("DeleteFileOnDeath"), 0) || !GameInteractor::IsSaveLoaded() || gPlayState == NULL) return;
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("DeleteFileOnDeath"), 0) || !GameInteractor::IsSaveLoaded() ||
+            gPlayState == NULL)
+            return;
 
         if (gPlayState->gameOverCtx.state == GAMEOVER_DEATH_MENU && gPlayState->pauseCtx.state == 9) {
             SaveManager::Instance->DeleteZeldaFile(gSaveContext.fileNum);
             hasAffectedHealth = false;
-            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch("reset");
-        }
-    });
-}
-
-struct DayTimeGoldSkulltulas {
-    uint16_t scene;
-    uint16_t room;
-    bool forChild;
-    std::vector<ActorEntry> actorEntries;
-};
-
-using DayTimeGoldSkulltulasList = std::vector<DayTimeGoldSkulltulas>;
-
-void RegisterDaytimeGoldSkultullas() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), 0)) {
-            return;
-        }
-
-        // Gold Skulltulas that are not part of the scene actor list during the day
-        // Actor values copied from the night time scene actor list
-        static const DayTimeGoldSkulltulasList dayTimeGoldSkulltulas = {
-            // Graveyard
-            { SCENE_GRAVEYARD, 1, true, { { ACTOR_EN_SW, { 156, 315, 795 }, { 16384, -32768, 0 }, -20096 } } },
-            // ZF
-            { SCENE_ZORAS_FOUNTAIN, 0, true, { { ACTOR_EN_SW, { -1891, 187, 1911 }, { 16384, 18022, 0 }, -19964 } } },
-            // GF
-            { SCENE_GERUDOS_FORTRESS, 0, false, { { ACTOR_EN_SW, { 1598, 999, -2008 }, { 16384, -16384, 0 }, -19198 } } },
-            { SCENE_GERUDOS_FORTRESS, 1, false, { { ACTOR_EN_SW, { 3377, 1734, -4935 }, { 16384, 0, 0 }, -19199 } } },
-            // Kak
-            { SCENE_KAKARIKO_VILLAGE, 0, false, { { ACTOR_EN_SW, { -18, 540, 1800 }, { 0, -32768, 0 }, -20160 } } },
-            { SCENE_KAKARIKO_VILLAGE,
-              0,
-              true,
-              { { ACTOR_EN_SW, { -465, 377, -888 }, { 0, 28217, 0 }, -20222 },
-                { ACTOR_EN_SW, { 5, 686, -171 }, { 0, -32768, 0 }, -20220 },
-                { ACTOR_EN_SW, { 324, 270, 905 }, { 16384, 0, 0 }, -20216 },
-                { ACTOR_EN_SW, { -602, 120, 1120 }, { 16384, 0, 0 }, -20208 } } },
-            // LLR
-            { SCENE_LON_LON_RANCH,
-              0,
-              true,
-              { { ACTOR_EN_SW, { -2344, 180, 672 }, { 16384, 22938, 0 }, -29695 },
-                { ACTOR_EN_SW, { 808, 48, 326 }, { 16384, 0, 0 }, -29694 },
-                { ACTOR_EN_SW, { 997, 286, -2698 }, { 16384, -16384, 0 }, -29692 } } },
-        };
-
-        for (const auto& dayTimeGS : dayTimeGoldSkulltulas) {
-            if (IS_DAY && dayTimeGS.forChild == LINK_IS_CHILD && dayTimeGS.scene == gPlayState->sceneNum &&
-                dayTimeGS.room == gPlayState->roomCtx.curRoom.num) {
-                for (const auto& actorEntry : dayTimeGS.actorEntries) {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, actorEntry.id, actorEntry.pos.x, actorEntry.pos.y,
-                                actorEntry.pos.z, actorEntry.rot.x, actorEntry.rot.y, actorEntry.rot.z,
-                                actorEntry.params, false);
-                }
-            }
+            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+                ->Dispatch("reset");
         }
     });
 }
 
 bool IsHyperBossesActive() {
     return CVarGetInteger(CVAR_ENHANCEMENT("HyperBosses"), 0) ||
-           (IS_BOSS_RUSH && gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_HYPERBOSSES] == BR_CHOICE_HYPERBOSSES_YES);
+           (IS_BOSS_RUSH &&
+            gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_HYPERBOSSES] == BR_CHOICE_HYPERBOSSES_YES);
 }
 
 void UpdateHyperBossesState() {
@@ -305,53 +206,53 @@ void UpdateHyperBossesState() {
     }
 
     if (IsHyperBossesActive()) {
-        actorUpdateHookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-            // Run the update function a second time to make bosses move and act twice as fast.
+        actorUpdateHookId =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
+                // Run the update function a second time to make bosses move and act twice as fast.
 
-            Player* player = GET_PLAYER(gPlayState);
-            Actor* actor = static_cast<Actor*>(refActor);
+                Player* player = GET_PLAYER(gPlayState);
+                Actor* actor = static_cast<Actor*>(refActor);
 
-            uint8_t isBossActor =
-                actor->id == ACTOR_BOSS_GOMA ||                              // Gohma
-                actor->id == ACTOR_BOSS_DODONGO ||                           // King Dodongo
-                actor->id == ACTOR_EN_BDFIRE ||                              // King Dodongo Fire Breath
-                actor->id == ACTOR_BOSS_VA ||                                // Barinade
-                actor->id == ACTOR_BOSS_GANONDROF ||                         // Phantom Ganon
-                actor->id == ACTOR_EN_FHG_FIRE ||                            // Phantom Ganon/Ganondorf Energy Ball/Thunder
-                actor->id == ACTOR_EN_FHG ||                                 // Phantom Ganon's Horse
-                actor->id == ACTOR_BOSS_FD || actor->id == ACTOR_BOSS_FD2 || // Volvagia (grounded/flying)
-                actor->id == ACTOR_EN_VB_BALL ||                             // Volvagia Rocks
-                actor->id == ACTOR_BOSS_MO ||                                // Morpha
-                actor->id == ACTOR_BOSS_SST ||                               // Bongo Bongo
-                actor->id == ACTOR_BOSS_TW ||                                // Twinrova
-                actor->id == ACTOR_BOSS_GANON ||                             // Ganondorf
-                actor->id == ACTOR_BOSS_GANON2;                              // Ganon
+                uint8_t isBossActor = actor->id == ACTOR_BOSS_GOMA ||      // Gohma
+                                      actor->id == ACTOR_BOSS_DODONGO ||   // King Dodongo
+                                      actor->id == ACTOR_EN_BDFIRE ||      // King Dodongo Fire Breath
+                                      actor->id == ACTOR_BOSS_VA ||        // Barinade
+                                      actor->id == ACTOR_BOSS_GANONDROF || // Phantom Ganon
+                                      actor->id == ACTOR_EN_FHG_FIRE || // Phantom Ganon/Ganondorf Energy Ball/Thunder
+                                      actor->id == ACTOR_EN_FHG ||      // Phantom Ganon's Horse
+                                      actor->id == ACTOR_BOSS_FD ||
+                                      actor->id == ACTOR_BOSS_FD2 ||   // Volvagia (grounded/flying)
+                                      actor->id == ACTOR_EN_VB_BALL || // Volvagia Rocks
+                                      actor->id == ACTOR_BOSS_MO ||    // Morpha
+                                      actor->id == ACTOR_BOSS_SST ||   // Bongo Bongo
+                                      actor->id == ACTOR_BOSS_TW ||    // Twinrova
+                                      actor->id == ACTOR_BOSS_GANON || // Ganondorf
+                                      actor->id == ACTOR_BOSS_GANON2;  // Ganon
 
-            // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some bosses.
-            if (IsHyperBossesActive() && isBossActor && !Player_InBlockingCsMode(gPlayState, player)) {
-                // Barinade needs to be updated in sequence to avoid unintended behaviour.
-                if (actor->id == ACTOR_BOSS_VA) {
-                    // params -1 is BOSSVA_BODY
-                    if (actor->params == -1) {
-                        Actor* actorList = gPlayState->actorCtx.actorLists[ACTORCAT_BOSS].head;
-                        while (actorList != NULL) {
-                            GameInteractor::RawAction::UpdateActor(actorList);
-                            actorList = actorList->next;
+                // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some bosses.
+                if (IsHyperBossesActive() && isBossActor && !Player_InBlockingCsMode(gPlayState, player)) {
+                    // Barinade needs to be updated in sequence to avoid unintended behaviour.
+                    if (actor->id == ACTOR_BOSS_VA) {
+                        // params -1 is BOSSVA_BODY
+                        if (actor->params == -1) {
+                            Actor* actorList = gPlayState->actorCtx.actorLists[ACTORCAT_BOSS].head;
+                            while (actorList != NULL) {
+                                GameInteractor::RawAction::UpdateActor(actorList);
+                                actorList = actorList->next;
+                            }
                         }
+                    } else {
+                        GameInteractor::RawAction::UpdateActor(actor);
                     }
-                } else {
-                    GameInteractor::RawAction::UpdateActor(actor);
                 }
-            }
-        });
+            });
     }
 }
 
 void RegisterHyperBosses() {
     UpdateHyperBossesState();
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int16_t fileNum) {
-        UpdateHyperBossesState();
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(
+        [](int16_t fileNum) { UpdateHyperBossesState(); });
 }
 
 void UpdateHyperEnemiesState() {
@@ -362,22 +263,23 @@ void UpdateHyperEnemiesState() {
     }
 
     if (CVarGetInteger(CVAR_ENHANCEMENT("HyperEnemies"), 0)) {
-        actorUpdateHookId = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-            // Run the update function a second time to make enemies and minibosses move and act twice as fast.
+        actorUpdateHookId =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
+                // Run the update function a second time to make enemies and minibosses move and act twice as fast.
 
-            Player* player = GET_PLAYER(gPlayState);
-            Actor* actor = static_cast<Actor*>(refActor);
+                Player* player = GET_PLAYER(gPlayState);
+                Actor* actor = static_cast<Actor*>(refActor);
 
-            // Some enemies are not in the ACTORCAT_ENEMY category, and some are that aren't really enemies.
-            bool isEnemy = actor->category == ACTORCAT_ENEMY || actor->id == ACTOR_EN_TORCH2;
-            bool isExcludedEnemy = actor->id == ACTOR_EN_FIRE_ROCK || actor->id == ACTOR_EN_ENCOUNT2;
+                // Some enemies are not in the ACTORCAT_ENEMY category, and some are that aren't really enemies.
+                bool isEnemy = actor->category == ACTORCAT_ENEMY || actor->id == ACTOR_EN_TORCH2;
+                bool isExcludedEnemy = actor->id == ACTOR_EN_FIRE_ROCK || actor->id == ACTOR_EN_ENCOUNT2;
 
-            // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some cutscenes.
-            if (CVarGetInteger(CVAR_ENHANCEMENT("HyperEnemies"), 0) && isEnemy && !isExcludedEnemy &&
-                !Player_InBlockingCsMode(gPlayState, player)) {
-                GameInteractor::RawAction::UpdateActor(actor);
-            }
-        });
+                // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some cutscenes.
+                if (CVarGetInteger(CVAR_ENHANCEMENT("HyperEnemies"), 0) && isEnemy && !isExcludedEnemy &&
+                    !Player_InBlockingCsMode(gPlayState, player)) {
+                    GameInteractor::RawAction::UpdateActor(actor);
+                }
+            });
     }
 }
 
@@ -416,7 +318,7 @@ void RegisterBonkDamage() {
             default:
                 break;
         }
-        
+
         Health_ChangeBy(gPlayState, -bonkDamage);
         // Set invincibility to make Link flash red as a visual damage indicator.
         Player* player = GET_PLAYER(gPlayState);
@@ -429,7 +331,8 @@ void UpdateDirtPathFixState(int32_t sceneNum) {
         case SCENE_HYRULE_FIELD:
         case SCENE_KOKIRI_FOREST:
         case SCENE_HYRULE_CASTLE:
-            CVarSetInteger(CVAR_Z_FIGHTING_MODE, CVarGetInteger(CVAR_ENHANCEMENT("SceneSpecificDirtPathFix"), ZFIGHT_FIX_DISABLED));
+            CVarSetInteger(CVAR_Z_FIGHTING_MODE,
+                           CVarGetInteger(CVAR_ENHANCEMENT("SceneSpecificDirtPathFix"), ZFIGHT_FIX_DISABLED));
             return;
         default:
             CVarClear(CVAR_Z_FIGHTING_MODE);
@@ -437,9 +340,8 @@ void UpdateDirtPathFixState(int32_t sceneNum) {
 }
 
 void RegisterMenuPathFix() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>([](int32_t sceneNum) {
-        UpdateDirtPathFixState(sceneNum);
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>(
+        [](int32_t sceneNum) { UpdateDirtPathFixState(sceneNum); });
 }
 
 void UpdateMirrorModeState(int32_t sceneNum) {
@@ -447,27 +349,28 @@ void UpdateMirrorModeState(int32_t sceneNum) {
     bool nextMirroredWorld = false;
 
     int16_t mirroredMode = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorldMode"), MIRRORED_WORLD_OFF);
-    int16_t inDungeon = (sceneNum >= SCENE_DEKU_TREE && sceneNum <= SCENE_INSIDE_GANONS_CASTLE_COLLAPSE && sceneNum != SCENE_THIEVES_HIDEOUT) ||
+    int16_t inDungeon = (sceneNum >= SCENE_DEKU_TREE && sceneNum <= SCENE_INSIDE_GANONS_CASTLE_COLLAPSE &&
+                         sceneNum != SCENE_THIEVES_HIDEOUT) ||
                         (sceneNum >= SCENE_DEKU_TREE_BOSS && sceneNum <= SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
                         (sceneNum == SCENE_GANON_BOSS);
 
     if (mirroredMode == MIRRORED_WORLD_RANDOM_SEEDED || mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED) {
-        uint32_t seed = sceneNum + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed()
-                                             : gSaveContext.ship.stats.fileCreatedAt);
+        uint32_t seed =
+            sceneNum + (IS_RANDO ? Rando::Context::GetInstance()->GetSeed() : gSaveContext.ship.stats.fileCreatedAt);
         Random_Init(seed);
     }
 
     bool randomMirror = Random(0, 2) == 1;
 
-    if (
-        mirroredMode == MIRRORED_WORLD_ALWAYS ||
+    if (mirroredMode == MIRRORED_WORLD_ALWAYS ||
         ((mirroredMode == MIRRORED_WORLD_RANDOM || mirroredMode == MIRRORED_WORLD_RANDOM_SEEDED) && randomMirror) ||
         // Dungeon modes
-        (inDungeon && (mirroredMode == MIRRORED_WORLD_DUNGEONS_All ||
-         (mirroredMode == MIRRORED_WORLD_DUNGEONS_VANILLA && !ResourceMgr_IsSceneMasterQuest(sceneNum)) ||
-         (mirroredMode == MIRRORED_WORLD_DUNGEONS_MQ && ResourceMgr_IsSceneMasterQuest(sceneNum)) ||
-         ((mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM || mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED) && randomMirror)))
-    ) {
+        (inDungeon &&
+         (mirroredMode == MIRRORED_WORLD_DUNGEONS_ALL ||
+          (mirroredMode == MIRRORED_WORLD_DUNGEONS_VANILLA && !ResourceMgr_IsSceneMasterQuest(sceneNum)) ||
+          (mirroredMode == MIRRORED_WORLD_DUNGEONS_MQ && ResourceMgr_IsSceneMasterQuest(sceneNum)) ||
+          ((mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM || mirroredMode == MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED) &&
+           randomMirror)))) {
         nextMirroredWorld = true;
         CVarSetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 1);
     } else {
@@ -482,25 +385,33 @@ void UpdateMirrorModeState(int32_t sceneNum) {
 }
 
 void RegisterMirrorModeHandler() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int32_t sceneNum) {
-        UpdateMirrorModeState(sceneNum);
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(
+        [](int32_t sceneNum) { UpdateMirrorModeState(sceneNum); });
 }
 
 void UpdatePatchHand() {
     if ((CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && LINK_IS_CHILD) {
-        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "childHammer1", 92, gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "childHammer1", 92,
+                                   gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
         ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "childHammer2", 93, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingHookshotNearDL, "childHookshot1", 84, gsSPDisplayListOTRFilePath(gLinkChildRightHandClosedNearDL));
-        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingHookshotNearDL, "childHookshot2", 85, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingBowNearDL, "childBow1", 51, gsSPDisplayListOTRFilePath(gLinkChildRightHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingHookshotNearDL, "childHookshot1", 84,
+                                   gsSPDisplayListOTRFilePath(gLinkChildRightHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingHookshotNearDL, "childHookshot2", 85,
+                                   gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingBowNearDL, "childBow1", 51,
+                                   gsSPDisplayListOTRFilePath(gLinkChildRightHandClosedNearDL));
         ResourceMgr_PatchGfxByName(gLinkAdultRightHandHoldingBowNearDL, "childBow2", 52, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingMasterSwordNearDL, "childMasterSword1", 104, gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
-        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingMasterSwordNearDL, "childMasterSword2", 105, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingBgsNearDL, "childBiggoronSword1", 79, gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingMasterSwordNearDL, "childMasterSword1", 104,
+                                   gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingMasterSwordNearDL, "childMasterSword2", 105,
+                                   gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingBgsNearDL, "childBiggoronSword1", 79,
+                                   gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
         ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingBgsNearDL, "childBiggoronSword2", 80, gsSPEndDisplayList());
-        ResourceMgr_PatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife1", 76, gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
-        ResourceMgr_PatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife2", 77, gsSPEndDisplayList());
+        ResourceMgr_PatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife1", 76,
+                                   gsSPDisplayListOTRFilePath(gLinkChildLeftFistNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife2", 77,
+                                   gsSPEndDisplayList());
 
     } else {
         ResourceMgr_UnpatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "childHammer1");
@@ -515,12 +426,16 @@ void UpdatePatchHand() {
         ResourceMgr_UnpatchGfxByName(gLinkAdultLeftHandHoldingBgsNearDL, "childBiggoronSword2");
         ResourceMgr_UnpatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife1");
         ResourceMgr_UnpatchGfxByName(gLinkAdultHandHoldingBrokenGiantsKnifeDL, "childBrokenGiantsKnife2");
-	}
+    }
     if ((CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && LINK_IS_ADULT) {
-        ResourceMgr_PatchGfxByName(gLinkChildLeftFistAndKokiriSwordNearDL, "adultKokiriSword", 13, gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
-        ResourceMgr_PatchGfxByName(gLinkChildRightHandHoldingSlingshotNearDL, "adultSlingshot", 13, gsSPDisplayListOTRFilePath(gLinkAdultRightHandClosedNearDL));
-        ResourceMgr_PatchGfxByName(gLinkChildLeftFistAndBoomerangNearDL, "adultBoomerang", 50, gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
-        ResourceMgr_PatchGfxByName(gLinkChildRightFistAndDekuShieldNearDL, "adultDekuShield", 49, gsSPDisplayListOTRFilePath(gLinkAdultRightHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkChildLeftFistAndKokiriSwordNearDL, "adultKokiriSword", 13,
+                                   gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkChildRightHandHoldingSlingshotNearDL, "adultSlingshot", 13,
+                                   gsSPDisplayListOTRFilePath(gLinkAdultRightHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkChildLeftFistAndBoomerangNearDL, "adultBoomerang", 50,
+                                   gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkChildRightFistAndDekuShieldNearDL, "adultDekuShield", 49,
+                                   gsSPDisplayListOTRFilePath(gLinkAdultRightHandClosedNearDL));
     } else {
         ResourceMgr_UnpatchGfxByName(gLinkChildLeftFistAndKokiriSwordNearDL, "adultKokiriSword");
         ResourceMgr_UnpatchGfxByName(gLinkChildRightHandHoldingSlingshotNearDL, "adultSlingshot");
@@ -528,7 +443,8 @@ void UpdatePatchHand() {
         ResourceMgr_UnpatchGfxByName(gLinkChildRightFistAndDekuShieldNearDL, "adultDekuShield");
     }
     if (CVarGetInteger("gEnhancements.FixHammerHand", 0) && LINK_IS_ADULT) {
-        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "hammerHand1", 92, gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
+        ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "hammerHand1", 92,
+                                   gsSPDisplayListOTRFilePath(gLinkAdultLeftHandClosedNearDL));
         ResourceMgr_PatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "hammerHand2", 93, gsSPEndDisplayList());
     } else {
         ResourceMgr_UnpatchGfxByName(gLinkAdultLeftHandHoldingHammerNearDL, "hammerHand1");
@@ -537,62 +453,61 @@ void UpdatePatchHand() {
 }
 
 void RegisterPatchHandHandler() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int32_t sceneNum) { 
-        UpdatePatchHand(); 
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(
+        [](int32_t sceneNum) { UpdatePatchHand(); });
 }
 
 void RegisterResetNaviTimer() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int32_t sceneNum) {
-		if (CVarGetInteger(CVAR_ENHANCEMENT("ResetNaviTimer"), 0)) {
-			gSaveContext.naviTimer = 0;
-		}
-	});
+        if (CVarGetInteger(CVAR_ENHANCEMENT("ResetNaviTimer"), 0)) {
+            gSaveContext.naviTimer = 0;
+        }
+    });
 }
 
-//this map is used for enemies that can be uniquely identified by their id
-//and that are always counted
-//enemies that can't be uniquely identified by their id
-//or only sometimes count (like ACTOR_EN_TP)
-//have to be manually handled in RegisterEnemyDefeatCounts
+// this map is used for enemies that can be uniquely identified by their id
+// and that are always counted
+// enemies that can't be uniquely identified by their id
+// or only sometimes count (like ACTOR_EN_TP)
+// have to be manually handled in RegisterEnemyDefeatCounts
 static std::unordered_map<u16, u16> uniqueEnemyIdToStatCount = {
-    { ACTOR_EN_ANUBICE,    COUNT_ENEMIES_DEFEATED_ANUBIS },
-    { ACTOR_EN_AM,         COUNT_ENEMIES_DEFEATED_ARMOS },
-    { ACTOR_EN_CLEAR_TAG,  COUNT_ENEMIES_DEFEATED_ARWING },
-    { ACTOR_EN_VALI,       COUNT_ENEMIES_DEFEATED_BARI },
-    { ACTOR_EN_VM,         COUNT_ENEMIES_DEFEATED_BEAMOS },
-    { ACTOR_EN_BIGOKUTA,   COUNT_ENEMIES_DEFEATED_BIG_OCTO },
-    { ACTOR_EN_BILI,       COUNT_ENEMIES_DEFEATED_BIRI },
-    { ACTOR_EN_DNS,        COUNT_ENEMIES_DEFEATED_BUSINESS_SCRUB },
-    { ACTOR_EN_TORCH,      COUNT_ENEMIES_DEFEATED_DARK_LINK },
-    { ACTOR_EN_DH,         COUNT_ENEMIES_DEFEATED_DEAD_HAND },
-    { ACTOR_EN_HINTNUTS,   COUNT_ENEMIES_DEFEATED_DEKU_SCRUB },
-    { ACTOR_EN_DODONGO,    COUNT_ENEMIES_DEFEATED_DODONGO },
-    { ACTOR_EN_DODOJR,     COUNT_ENEMIES_DEFEATED_DODONGO_BABY },
-    { ACTOR_DOOR_KILLER,   COUNT_ENEMIES_DEFEATED_DOOR_TRAP },
-    { ACTOR_EN_FD,         COUNT_ENEMIES_DEFEATED_FLARE_DANCER },
-    { ACTOR_EN_FLOORMAS,   COUNT_ENEMIES_DEFEATED_FLOORMASTER },
-    { ACTOR_EN_TUBO_TRAP,  COUNT_ENEMIES_DEFEATED_FLYING_POT },
-    { ACTOR_EN_YUKABYUN,   COUNT_ENEMIES_DEFEATED_FLOOR_TILE },
-    { ACTOR_EN_FZ,         COUNT_ENEMIES_DEFEATED_FREEZARD },
-    { ACTOR_EN_GELDB,      COUNT_ENEMIES_DEFEATED_GERUDO_THIEF },
-    { ACTOR_EN_GOMA,       COUNT_ENEMIES_DEFEATED_GOHMA_LARVA },
-    { ACTOR_EN_CROW,       COUNT_ENEMIES_DEFEATED_GUAY },
-    { ACTOR_EN_RR,         COUNT_ENEMIES_DEFEATED_LIKE_LIKE },
-    { ACTOR_EN_DEKUNUTS,   COUNT_ENEMIES_DEFEATED_MAD_SCRUB },
-    { ACTOR_EN_OKUTA,      COUNT_ENEMIES_DEFEATED_OCTOROK },
-    { ACTOR_EN_BA,         COUNT_ENEMIES_DEFEATED_PARASITIC_TENTACLE },
+    { ACTOR_EN_ANUBICE, COUNT_ENEMIES_DEFEATED_ANUBIS },
+    { ACTOR_EN_AM, COUNT_ENEMIES_DEFEATED_ARMOS },
+    { ACTOR_EN_CLEAR_TAG, COUNT_ENEMIES_DEFEATED_ARWING },
+    { ACTOR_EN_VALI, COUNT_ENEMIES_DEFEATED_BARI },
+    { ACTOR_EN_VM, COUNT_ENEMIES_DEFEATED_BEAMOS },
+    { ACTOR_EN_BIGOKUTA, COUNT_ENEMIES_DEFEATED_BIG_OCTO },
+    { ACTOR_EN_BILI, COUNT_ENEMIES_DEFEATED_BIRI },
+    { ACTOR_EN_DNS, COUNT_ENEMIES_DEFEATED_BUSINESS_SCRUB },
+    { ACTOR_EN_TORCH, COUNT_ENEMIES_DEFEATED_DARK_LINK },
+    { ACTOR_EN_DH, COUNT_ENEMIES_DEFEATED_DEAD_HAND },
+    { ACTOR_EN_HINTNUTS, COUNT_ENEMIES_DEFEATED_DEKU_SCRUB },
+    { ACTOR_EN_DODONGO, COUNT_ENEMIES_DEFEATED_DODONGO },
+    { ACTOR_EN_DODOJR, COUNT_ENEMIES_DEFEATED_DODONGO_BABY },
+    { ACTOR_DOOR_KILLER, COUNT_ENEMIES_DEFEATED_DOOR_TRAP },
+    { ACTOR_EN_FD, COUNT_ENEMIES_DEFEATED_FLARE_DANCER },
+    { ACTOR_EN_FLOORMAS, COUNT_ENEMIES_DEFEATED_FLOORMASTER },
+    { ACTOR_EN_TUBO_TRAP, COUNT_ENEMIES_DEFEATED_FLYING_POT },
+    { ACTOR_EN_YUKABYUN, COUNT_ENEMIES_DEFEATED_FLOOR_TILE },
+    { ACTOR_EN_FZ, COUNT_ENEMIES_DEFEATED_FREEZARD },
+    { ACTOR_EN_GELDB, COUNT_ENEMIES_DEFEATED_GERUDO_THIEF },
+    { ACTOR_EN_GOMA, COUNT_ENEMIES_DEFEATED_GOHMA_LARVA },
+    { ACTOR_EN_CROW, COUNT_ENEMIES_DEFEATED_GUAY },
+    { ACTOR_EN_RR, COUNT_ENEMIES_DEFEATED_LIKE_LIKE },
+    { ACTOR_EN_DEKUNUTS, COUNT_ENEMIES_DEFEATED_MAD_SCRUB },
+    { ACTOR_EN_OKUTA, COUNT_ENEMIES_DEFEATED_OCTOROK },
+    { ACTOR_EN_BA, COUNT_ENEMIES_DEFEATED_PARASITIC_TENTACLE },
     { ACTOR_EN_PO_SISTERS, COUNT_ENEMIES_DEFEATED_POE_SISTERS },
-    { ACTOR_EN_BUBBLE,     COUNT_ENEMIES_DEFEATED_SHABOM },
-    { ACTOR_EN_SB,         COUNT_ENEMIES_DEFEATED_SHELLBLADE },
-    { ACTOR_EN_SKJ,        COUNT_ENEMIES_DEFEATED_SKULL_KID },
-    { ACTOR_EN_NY,         COUNT_ENEMIES_DEFEATED_SPIKE },
-    { ACTOR_EN_SKB,        COUNT_ENEMIES_DEFEATED_STALCHILD },
-    { ACTOR_EN_TEST,       COUNT_ENEMIES_DEFEATED_STALFOS },
-    { ACTOR_EN_WEIYER,     COUNT_ENEMIES_DEFEATED_STINGER },
-    { ACTOR_EN_BW,         COUNT_ENEMIES_DEFEATED_TORCH_SLUG },
-    { ACTOR_EN_WALLMAS,    COUNT_ENEMIES_DEFEATED_WALLMASTER },
-    { ACTOR_EN_KAREBABA,   COUNT_ENEMIES_DEFEATED_WITHERED_DEKU_BABA },
+    { ACTOR_EN_BUBBLE, COUNT_ENEMIES_DEFEATED_SHABOM },
+    { ACTOR_EN_SB, COUNT_ENEMIES_DEFEATED_SHELLBLADE },
+    { ACTOR_EN_SKJ, COUNT_ENEMIES_DEFEATED_SKULL_KID },
+    { ACTOR_EN_NY, COUNT_ENEMIES_DEFEATED_SPIKE },
+    { ACTOR_EN_SKB, COUNT_ENEMIES_DEFEATED_STALCHILD },
+    { ACTOR_EN_TEST, COUNT_ENEMIES_DEFEATED_STALFOS },
+    { ACTOR_EN_WEIYER, COUNT_ENEMIES_DEFEATED_STINGER },
+    { ACTOR_EN_BW, COUNT_ENEMIES_DEFEATED_TORCH_SLUG },
+    { ACTOR_EN_WALLMAS, COUNT_ENEMIES_DEFEATED_WALLMASTER },
+    { ACTOR_EN_KAREBABA, COUNT_ENEMIES_DEFEATED_WITHERED_DEKU_BABA },
 };
 
 void RegisterEnemyDefeatCounts() {
@@ -656,16 +571,14 @@ void RegisterEnemyDefeatCounts() {
                     }
                     break;
 
-                case ACTOR_EN_REEBA:
-                    {
-                        EnReeba* reeba = (EnReeba*)actor;
-                        if (reeba->isBig) {
-                            gSaveContext.ship.stats.count[COUNT_ENEMIES_DEFEATED_LEEVER_BIG]++;
-                        } else {
-                            gSaveContext.ship.stats.count[COUNT_ENEMIES_DEFEATED_LEEVER]++;
-                        }
+                case ACTOR_EN_REEBA: {
+                    EnReeba* reeba = (EnReeba*)actor;
+                    if (reeba->isBig) {
+                        gSaveContext.ship.stats.count[COUNT_ENEMIES_DEFEATED_LEEVER_BIG]++;
+                    } else {
+                        gSaveContext.ship.stats.count[COUNT_ENEMIES_DEFEATED_LEEVER]++;
                     }
-                    break;
+                } break;
 
                 case ACTOR_EN_MB:
                     if (actor->params == 0) {
@@ -716,7 +629,8 @@ void RegisterEnemyDefeatCounts() {
                     break;
 
                 case ACTOR_EN_TP:
-                    if (actor->params == TAILPASARAN_HEAD) {  // Only count the head, otherwise each body segment will increment
+                    // Only count the head, otherwise each body segment will increment
+                    if (actor->params == TAILPASARAN_HEAD) {
                         gSaveContext.ship.stats.count[COUNT_ENEMIES_DEFEATED_TAILPASARAN]++;
                     }
                     break;
@@ -781,26 +695,25 @@ void RegisterBossDefeatTimestamps() {
 }
 
 void UpdateHurtContainerModeState(bool newState) {
-        static bool hurtEnabled = false;
-        if (hurtEnabled == newState) {
-            return;
-        }
+    static bool hurtEnabled = false;
+    if (hurtEnabled == newState) {
+        return;
+    }
 
-        hurtEnabled = newState;
-        uint16_t getHeartPieces = gSaveContext.ship.stats.heartPieces / 4;
-        uint16_t getHeartContainers = gSaveContext.ship.stats.heartContainers;
+    hurtEnabled = newState;
+    uint16_t getHeartPieces = gSaveContext.ship.stats.heartPieces / 4;
+    uint16_t getHeartContainers = gSaveContext.ship.stats.heartContainers;
 
-        if (hurtEnabled) {
-            gSaveContext.healthCapacity = 320 - ((getHeartPieces + getHeartContainers) * 16);
-        } else {
-            gSaveContext.healthCapacity = 48 + ((getHeartPieces + getHeartContainers) * 16);
-        }
+    if (hurtEnabled) {
+        gSaveContext.healthCapacity = 320 - ((getHeartPieces + getHeartContainers) * 16);
+    } else {
+        gSaveContext.healthCapacity = 48 + ((getHeartPieces + getHeartContainers) * 16);
+    }
 }
 
 void RegisterHurtContainerModeHandler() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
-        UpdateHurtContainerModeState(CVarGetInteger(CVAR_ENHANCEMENT("HurtContainer"), 0));
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(
+        [](int32_t fileNum) { UpdateHurtContainerModeState(CVarGetInteger(CVAR_ENHANCEMENT("HurtContainer"), 0)); });
 }
 
 void RegisterRandomizedEnemySizes() {
@@ -810,15 +723,18 @@ void RegisterRandomizedEnemySizes() {
         Actor* actor = static_cast<Actor*>(refActor);
 
         // Exclude wobbly platforms in Jabu because they need to act like platforms.
+        // Exclude demo effect for Zora sapphire being re-categorized as a "boss".
         // Exclude Dead Hand hands and Bongo Bongo main body because they make the fights (near) impossible.
-        uint8_t excludedEnemy = actor->id == ACTOR_EN_BROB || actor->id == ACTOR_EN_DHA || (actor->id == ACTOR_BOSS_SST && actor->params == -1);
+        uint8_t excludedEnemy = actor->id == ACTOR_EN_BROB || actor->id == ACTOR_EN_DHA ||
+                                actor->id == ACTOR_DEMO_EFFECT || (actor->id == ACTOR_BOSS_SST && actor->params == -1);
 
         // Dodongo, Volvagia and Dead Hand are always smaller because they're impossible when bigger.
         uint8_t smallOnlyEnemy = actor->id == ACTOR_BOSS_DODONGO || actor->id == ACTOR_BOSS_FD ||
                                  actor->id == ACTOR_BOSS_FD2 || actor->id == ACTOR_EN_DH;
 
         // Only apply to enemies and bosses.
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemySizes"), 0) || (actor->category != ACTORCAT_ENEMY && actor->category != ACTORCAT_BOSS) || excludedEnemy) {
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemySizes"), 0) ||
+            (actor->category != ACTORCAT_ENEMY && actor->category != ACTORCAT_BOSS) || excludedEnemy) {
             return;
         }
 
@@ -832,8 +748,8 @@ void RegisterRandomizedEnemySizes() {
             randomNumber = rand() % 200;
             // Between 100% and 300% size.
             randomScale = 1.0f + (randomNumber / 100);
-        // Small actor
         } else {
+            // Small actor
             randomNumber = rand() % 90;
             // Between 10% and 100% size.
             randomScale = 0.1f + (randomNumber / 100);
@@ -858,7 +774,8 @@ void RegisterOpenAllHours() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
         Actor* actor = static_cast<Actor*>(refActor);
 
-        if (CVarGetInteger(CVAR_ENHANCEMENT("OpenAllHours"), 0) && (actor->id == ACTOR_EN_DOOR) && (!IS_RANDO || !OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOCK_OVERWORLD_DOORS))) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("OpenAllHours"), 0) && (actor->id == ACTOR_EN_DOOR) &&
+            (!IS_RANDO || !OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOCK_OVERWORLD_DOORS))) {
             switch (actor->params) {
                 case 4753: // Night Market Bazaar
                 case 1678: // Night Potion Shop
@@ -890,47 +807,65 @@ void PatchToTMedallions() {
         ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_StartGrayscale", 7, gsSPGrayscale(true));
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeBlue", 16, gsDPSetGrayscaleColor(0, 161, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeBlue", 16,
+                                       gsDPSetGrayscaleColor(0, 161, 255, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeBlue", 16, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeBlue", 16,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeOrange", 45, gsDPSetGrayscaleColor(255, 135, 0, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeOrange", 45,
+                                       gsDPSetGrayscaleColor(255, 135, 0, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeOrange", 45, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeOrange", 45,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_LIGHT)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeYellow", 69, gsDPSetGrayscaleColor(255, 255, 0, 255));
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakeYellow", 16, gsDPSetGrayscaleColor(255, 255, 0, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeYellow", 69,
+                                       gsDPSetGrayscaleColor(255, 255, 0, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakeYellow", 16,
+                                       gsDPSetGrayscaleColor(255, 255, 0, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeYellow", 69, gsDPSetGrayscaleColor(255, 255, 255, 255));
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakeYellow", 16, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeYellow", 69,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakeYellow", 16,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeGreen", 94, gsDPSetGrayscaleColor(0, 255, 0, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeGreen", 94,
+                                       gsDPSetGrayscaleColor(0, 255, 0, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeGreen", 94, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeGreen", 94,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeRed", 118, gsDPSetGrayscaleColor(255, 0, 0, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeRed", 118,
+                                       gsDPSetGrayscaleColor(255, 0, 0, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeRed", 118, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakeRed", 118,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
         if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakePurple", 142, gsDPSetGrayscaleColor(212, 0, 255, 255));
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakePurple", 27, gsDPSetGrayscaleColor(212, 0, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakePurple", 142,
+                                       gsDPSetGrayscaleColor(212, 0, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakePurple", 27,
+                                       gsDPSetGrayscaleColor(212, 0, 255, 255));
         } else {
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakePurple", 142, gsDPSetGrayscaleColor(255, 255, 255, 255));
-            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakePurple", 27, gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_MakePurple", 142,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
+            ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_MakePurple", 27,
+                                       gsDPSetGrayscaleColor(255, 255, 255, 255));
         }
 
-        ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_EndGrayscaleAndEndDlist", 160, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
-        ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_EndGrayscaleAndEndDlist", 51, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
+        ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_EndGrayscaleAndEndDlist", 160,
+                                   gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
+        ResourceMgr_PatchGfxByName(tokinoma_room_0DL_007FD0, "ToTMedallions_2_EndGrayscaleAndEndDlist", 51,
+                                   gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL));
     } else {
         // Unpatch everything
         ResourceMgr_UnpatchGfxByName(tokinoma_room_0DL_007A70, "ToTMedallions_StartGrayscale");
@@ -951,7 +886,8 @@ void PatchToTMedallions() {
 
 void RegisterToTMedallions() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>([](GetItemEntry _unused) {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("ToTMedallionsColors"), 0) || !gPlayState || gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) {
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("ToTMedallionsColors"), 0) || !gPlayState ||
+            gPlayState->sceneNum != SCENE_TEMPLE_OF_TIME) {
             return;
         }
         PatchToTMedallions();
@@ -964,7 +900,6 @@ void RegisterToTMedallions() {
     });
 }
 
-
 void RegisterFloorSwitchesHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
         Actor* actor = static_cast<Actor*>(refActor);
@@ -989,40 +924,19 @@ void RegisterPauseMenuHooks() {
             return;
         }
         if (!pauseWarpHooksRegistered) {
-            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoUpdate>([]() {PauseWarp_HandleSelection();});
-            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-                    PauseWarp_Execute();
-            });
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoUpdate>(
+                []() { PauseWarp_HandleSelection(); });
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(
+                []() { PauseWarp_Execute(); });
             pauseWarpHooksRegistered = true;
         }
     });
 }
 
-extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
-
-void PatchCompasses() {
-    s8 compassesCanBeOutsideDungeon = IS_RANDO && DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
-    s8 isColoredCompassesEnabled = compassesCanBeOutsideDungeon && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MatchCompassColors"), 1);
-    if (isColoredCompassesEnabled) {
-        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_PrimColor", 5, gsDPNoOp());
-        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_EnvColor", 6, gsDPNoOp());
-    } else {
-        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_PrimColor");
-        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_EnvColor");
-    }
-}
-
-void RegisterRandomizerCompasses() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadFile>([](int32_t _unused) {
-        PatchCompasses();
-    });
-}
-
 void RegisterCustomSkeletons() {
     static int8_t previousTunic = -1;
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-
         if (!GameInteractor::IsSaveLoaded() || gPlayState == NULL) {
             return;
         }
@@ -1046,12 +960,8 @@ void InitMods() {
     BossRush_RegisterHooks();
     RandomizerRegisterHooks();
     TimeSaverRegisterHooks();
-    TimeSavers_Register();
     RegisterTTS();
     RegisterOcarinaTimeTravel();
-    RegisterDaytimeGoldSkultullas();
-    RegisterRupeeDash();
-    RegisterShadowTag();
     RegisterPermanentHeartLoss();
     RegisterDeleteFileOnDeath();
     RegisterHyperBosses();
@@ -1065,8 +975,6 @@ void InitMods() {
     RegisterRandomizedEnemySizes();
     RegisterOpenAllHours();
     RegisterToTMedallions();
-    RegisterRandomizerCompasses();
-    NameTag_RegisterHooks();
     RegisterFloorSwitchesHook();
     RegisterPatchHandHandler();
     RegisterHurtContainerModeHandler();
diff --git a/soh/soh/Enhancements/mods.h b/soh/soh/Enhancements/mods.h
index 9305222502..8ada99f1e3 100644
--- a/soh/soh/Enhancements/mods.h
+++ b/soh/soh/Enhancements/mods.h
@@ -11,12 +11,11 @@ void UpdateDirtPathFixState(int32_t sceneNum);
 void UpdateMirrorModeState(int32_t sceneNum);
 void UpdateHurtContainerModeState(bool newState);
 void PatchToTMedallions();
-void PatchCompasses();
 void UpdatePermanentHeartLossState();
 void UpdateHyperEnemiesState();
 void UpdateHyperBossesState();
 void InitMods();
-void UpdatePatchHand(); 
+void UpdatePatchHand();
 void SwitchAge();
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/n64_weird_frame_data.inc b/soh/soh/Enhancements/n64_weird_frame_data.inc
deleted file mode 100644
index 269450c157..0000000000
--- a/soh/soh/Enhancements/n64_weird_frame_data.inc
+++ /dev/null
@@ -1,658 +0,0 @@
-static u16 n64WeirdFrames[] = {
-    0x0000, 0x0000, 0x1F40, 0x0AA7, 0x06C8, 0xB3C8, 0xF909, 0xFA3E, 0xED5F,
-    0x0000, 0x0000, 0x2286, 0xF8F0, 0xF9C3, 0xB101, 0x61C2, 0xFE1D, 0x3AB1,
-    0xFA11, 0x1FD2, 0x35C8, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA,
-    0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE,
-    0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D27,
-    0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DF, 0xBFFD, 0x0000, 0x0000,
-    0x0000, 0xFF70, 0x0F7C, 0xF0FD, 0x0000, 0x0000, 0x1F19, 0x0AAC, 0x06BF,
-    0xB3E9, 0xF906, 0xFA42, 0xED71, 0x0000, 0x0000, 0x2260, 0xF8EC, 0xF9C8,
-    0xB11B, 0x61C2, 0xFE1D, 0x3AB1, 0xF9FD, 0x1FCF, 0x35AC, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000,
-    0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000,
-    0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFFC7, 0x0D29, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598,
-    0x02DF, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFF7B, 0x0F7B, 0xF111, 0x0000,
-    0x0000, 0x1EF3, 0x0AB2, 0x06B7, 0xB409, 0xF902, 0xFA45, 0xED83, 0x0000,
-    0x0000, 0x223B, 0xF8E8, 0xF9CC, 0xB133, 0x61C2, 0xFE1D, 0x3AB1, 0xF9EA,
-    0x1FCD, 0x3590, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C,
-    0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928,
-    0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D2B, 0xFCAD,
-    0x0000, 0x0000, 0x0000, 0x9598, 0x02DF, 0xBFFD, 0x0000, 0x0000, 0x0000,
-    0xFF86, 0x0F7A, 0xF125, 0x0000, 0x0000, 0x1ECE, 0x0AB7, 0x06AF, 0xB428,
-    0xF8FF, 0xFA49, 0xED95, 0x0000, 0x0000, 0x2218, 0xF8E4, 0xF9D0, 0xB14B,
-    0x61C2, 0xFE1D, 0x3AB1, 0xF9D7, 0x1FCA, 0x3576, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8,
-    0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000,
-    0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFFC7, 0x0D2D, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DE,
-    0xBFFD, 0x0000, 0x0000, 0x0000, 0xFF90, 0x0F78, 0xF137, 0x0000, 0x0000,
-    0x1EAA, 0x0ABC, 0x06A7, 0xB446, 0xF8FC, 0xFA4D, 0xEDA6, 0x0000, 0x0000,
-    0x21F6, 0xF8E1, 0xF9D4, 0xB161, 0x61C2, 0xFE1D, 0x3AB1, 0xF9C6, 0x1FC8,
-    0x355D, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957,
-    0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25,
-    0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D2E, 0xFCAD, 0x0000,
-    0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFF9A,
-    0x0F77, 0xF149, 0x0000, 0x0000, 0x1E89, 0x0AC1, 0x06A0, 0xB462, 0xF8F9,
-    0xFA50, 0xEDB5, 0x0000, 0x0000, 0x21D6, 0xF8DE, 0xF9D7, 0xB177, 0x61C2,
-    0xFE1D, 0x3AB1, 0xF9B5, 0x1FC5, 0x3545, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1,
-    0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23,
-    0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFFC7, 0x0D30, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD,
-    0x0000, 0x0000, 0x0000, 0xFFA3, 0x0F76, 0xF159, 0x0000, 0x0000, 0x1E6A,
-    0x0AC5, 0x0699, 0xB47B, 0xF8F6, 0xFA53, 0xEDC4, 0x0000, 0x0000, 0x21B9,
-    0xF8DB, 0xF9DB, 0xB18A, 0x61C2, 0xFE1D, 0x3AB1, 0xF9A6, 0x1FC3, 0x352F,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97,
-    0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871,
-    0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D31, 0xFCAD, 0x0000, 0x0000,
-    0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFFAB, 0x0F75,
-    0xF168, 0x0000, 0x0000, 0x1E4D, 0x0AC9, 0x0693, 0xB493, 0xF8F4, 0xFA56,
-    0xEDD1, 0x0000, 0x0000, 0x219D, 0xF8D8, 0xF9DE, 0xB19C, 0x61C2, 0xFE1D,
-    0x3AB1, 0xF998, 0x1FC1, 0x351B, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0,
-    0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547,
-    0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7,
-    0x0D32, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000,
-    0x0000, 0x0000, 0xFFB3, 0x0F75, 0xF176, 0x0000, 0x0000, 0x1E33, 0x0ACC,
-    0x068E, 0xB4A8, 0xF8F1, 0xFA58, 0xEDDE, 0x0000, 0x0000, 0x2185, 0xF8D5,
-    0xF9E1, 0xB1AC, 0x61C2, 0xFE1D, 0x3AB1, 0xF98B, 0x1FBF, 0x3509, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000,
-    0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000,
-    0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D33, 0xFCAD, 0x0000, 0x0000, 0x0000,
-    0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFFB9, 0x0F74, 0xF182,
-    0x0000, 0x0000, 0x1E1C, 0x0AD0, 0x0689, 0xB4BB, 0xF8F0, 0xFA5A, 0xEDE8,
-    0x0000, 0x0000, 0x216F, 0xF8D3, 0xF9E3, 0xB1BB, 0x61C2, 0xFE1D, 0x3AB1,
-    0xF980, 0x1FBE, 0x34FA, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA,
-    0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE,
-    0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D34,
-    0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000,
-    0x0000, 0xFFBF, 0x0F73, 0xF18C, 0x0000, 0x0000, 0x1E09, 0x0AD2, 0x0685,
-    0xB4CA, 0xF8EE, 0xFA5C, 0xEDF1, 0x0000, 0x0000, 0x215D, 0xF8D1, 0xF9E5,
-    0xB1C7, 0x61C2, 0xFE1D, 0x3AB1, 0xF977, 0x1FBD, 0x34EC, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000,
-    0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000,
-    0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFFC7, 0x0D35, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598,
-    0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFFC3, 0x0F73, 0xF194, 0x0000,
-    0x0000, 0x1DF9, 0x0AD4, 0x0681, 0xB4D7, 0xF8ED, 0xFA5E, 0xEDF9, 0x0000,
-    0x0000, 0x214E, 0xF8D0, 0xF9E7, 0xB1D0, 0x61C2, 0xFE1D, 0x3AB1, 0xF96F,
-    0x1FBC, 0x34E2, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C,
-    0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928,
-    0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D35, 0xFCAD,
-    0x0000, 0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000,
-    0xFFC6, 0x0F72, 0xF19A, 0x0000, 0x0000, 0x1DEE, 0x0AD6, 0x067F, 0xB4E0,
-    0xF8EC, 0xFA5F, 0xEDFE, 0x0000, 0x0000, 0x2143, 0xF8CF, 0xF9E8, 0xB1D7,
-    0x61C2, 0xFE1D, 0x3AB1, 0xF96A, 0x1FBB, 0x34DA, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8,
-    0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000,
-    0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFFC7, 0x0D36, 0xFCAD, 0x0000, 0x0000, 0x0000, 0x9598, 0x02DE,
-    0xBFFD, 0x0000, 0x0000, 0x0000, 0xFFC8, 0x0F72, 0xF19E, 0x0000, 0x0000,
-    0x1DE7, 0x0AD7, 0x067D, 0xB4E6, 0xF8EB, 0xFA60, 0xEE01, 0x0000, 0x0000,
-    0x213C, 0xF8CE, 0xF9E9, 0xB1DC, 0x61C2, 0xFE1D, 0x3AB1, 0xF966, 0x1FBA,
-    0x34D5, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957,
-    0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25,
-    0x3871, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFC7, 0x0D36, 0xFCAD, 0x0000,
-    0x0000, 0x0000, 0x9598, 0x02DE, 0xBFFD, 0x0000, 0x0000, 0x0000, 0xFFC9,
-    0x0F72, 0xF19F, 0x0000, 0x0000, 0x1DE5, 0x0AD7, 0x067D, 0xB4E8, 0xF8EB,
-    0xFA60, 0xEE02, 0x0000, 0x0000, 0x213A, 0xF8CE, 0xF9E9, 0xB1DD, 0x61C2,
-    0xFE1D, 0x3AB1, 0xF965, 0x1FBA, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1,
-    0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000, 0x0000, 0x0000, 0xFB23,
-    0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFFC7, 0x0D31, 0x0000, 0x0000, 0x0000, 0x0000, 0xC000,
-    0x02DA, 0xC000, 0x0000, 0x0000, 0x0000, 0x04D3, 0x0A4F, 0xEE9D, 0x0000,
-    0x0000, 0x2006, 0x0843, 0x075F, 0xB0BC, 0xF9A0, 0xF456, 0xEDD8, 0x0000,
-    0x0000, 0x2087, 0xF851, 0xF9F1, 0xB1DE, 0x4000, 0xF709, 0x4000, 0xFFE8,
-    0xFE51, 0x34DC, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x0931,
-    0xEDA0, 0x7893, 0x0000, 0x0000, 0xE5ED, 0xFFDC, 0xFE09, 0xC0D5, 0xFCE7,
-    0x136D, 0x8A32, 0x0000, 0x0000, 0xA937, 0x0F64, 0x0AF3, 0xBE0C, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFBB, 0x0C34, 0xFFB9,
-    0x0000, 0x0000, 0x0000, 0xBF85, 0xFE57, 0xBFF8, 0x0000, 0x0000, 0x0000,
-    0x051E, 0x0D98, 0xEA86, 0x0000, 0x0000, 0x3174, 0x0986, 0x09AB, 0xA6B2,
-    0xFF8B, 0xF0C4, 0xEC66, 0x0000, 0x0000, 0x3A30, 0xF5E6, 0xF97D, 0xB12A,
-    0x436E, 0xF3CA, 0x4025, 0xFEC7, 0x01A9, 0x3349, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x0F19, 0xEF22, 0x7252, 0x0000, 0x0000, 0xE073,
-    0xFFF5, 0x006B, 0xC0AE, 0xF1CB, 0x13A2, 0x7CCB, 0x0000, 0x0000, 0xAE44,
-    0x0DD9, 0x0B72, 0xC3AA, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFFA2, 0x0A07, 0xFF1C, 0x0000, 0x0000, 0x0000, 0xB6A0, 0xF8C4,
-    0xC0B4, 0x0000, 0x0000, 0x0000, 0x046F, 0x14CD, 0xE515, 0x0000, 0x0000,
-    0x4B1D, 0x0BDC, 0x0C10, 0x9B28, 0x0FD5, 0xEB60, 0xF04B, 0x0000, 0x0000,
-    0x4FC3, 0xF095, 0xF87E, 0xAF9D, 0x4AE1, 0xECA4, 0x4080, 0xFC4F, 0x08DD,
-    0x2FCF, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x1BF1, 0xF27E,
-    0x64A8, 0x0000, 0x0000, 0xD467, 0x002E, 0x05AA, 0xC058, 0xD95B, 0x1417,
-    0x5F4D, 0x0000, 0x0000, 0xB961, 0x0A76, 0x0C88, 0xD006, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF89, 0x07DA, 0xFE80, 0x0000,
-    0x0000, 0x0000, 0xAA24, 0xFF0F, 0xC009, 0x0000, 0x0000, 0x0000, 0xF90E,
-    0x1CAF, 0xCEFB, 0x0000, 0x0000, 0x5FFB, 0x0F61, 0x0A4A, 0x9E40, 0x2190,
-    0xE393, 0xD7FA, 0x0000, 0x0000, 0x5421, 0xEB43, 0xF77F, 0xAE10, 0x522D,
-    0xE580, 0x40F1, 0xF9E3, 0x0FAD, 0x2C50, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x286A, 0xF5F1, 0x573B, 0x0000, 0x0000, 0xC85C, 0x0066,
-    0x0AE9, 0xC002, 0xC0EB, 0x148C, 0x41D0, 0x0000, 0x0000, 0xC47E, 0x0713,
-    0x0D9E, 0xDC63, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFF7E, 0x06DC, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2,
-    0x0000, 0x0000, 0x0000, 0xE8F1, 0x1A2A, 0xB8CB, 0x0000, 0x0000, 0x67A9,
-    0x11B0, 0x083F, 0xA3A1, 0x232F, 0xE24B, 0xC7CF, 0x0000, 0x0000, 0x5267,
-    0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF8E4, 0x11DB, 0x2AAB,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE,
-    0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468,
-    0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06DC, 0xFE38, 0x0000,
-    0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xE8F1,
-    0x1A2A, 0xB8CB, 0x0000, 0x0000, 0x67A9, 0x11B0, 0x083F, 0xA3A1, 0x232F,
-    0xE24B, 0xC7CF, 0x0000, 0x0000, 0x5267, 0xE8D8, 0xF70B, 0xAD5B, 0x556C,
-    0xE241, 0x4131, 0xF8E4, 0x183F, 0x2AAB, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080,
-    0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589,
-    0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFF7E, 0x06E3, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2,
-    0x0000, 0x0000, 0x0000, 0xE93D, 0x1A35, 0xB905, 0x0000, 0x0000, 0x677C,
-    0x11B0, 0x083F, 0xA3A1, 0x22F0, 0xE251, 0xC7F9, 0x0000, 0x0000, 0x524A,
-    0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF910, 0x1848, 0x2AF9,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE,
-    0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468,
-    0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06E9, 0xFE38, 0x0000, 0x0000,
-    0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xE987, 0x1A40,
-    0xB93F, 0x0000, 0x0000, 0x674F, 0x11B0, 0x083F, 0xA3A1, 0x22B2, 0xE256,
-    0xC823, 0x0000, 0x0000, 0x522C, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241,
-    0x4131, 0xF93C, 0x1851, 0x2B47, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B,
-    0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D,
-    0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E,
-    0x06F0, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000,
-    0x0000, 0x0000, 0xE9D2, 0x1A4A, 0xB978, 0x0000, 0x0000, 0x6721, 0x11B0,
-    0x083F, 0xA3A1, 0x2275, 0xE25B, 0xC84D, 0x0000, 0x0000, 0x520E, 0xE8D8,
-    0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF969, 0x185A, 0x2B96, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000,
-    0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000,
-    0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFF7E, 0x06F6, 0xFE38, 0x0000, 0x0000, 0x0000,
-    0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEA1B, 0x1A54, 0xB9B1,
-    0x0000, 0x0000, 0x66F4, 0x11B0, 0x083F, 0xA3A1, 0x2237, 0xE261, 0xC876,
-    0x0000, 0x0000, 0x51F0, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131,
-    0xF995, 0x1863, 0x2BE4, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB,
-    0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201,
-    0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06FD,
-    0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000,
-    0x0000, 0xEA64, 0x1A5E, 0xB9EA, 0x0000, 0x0000, 0x66C6, 0x11B0, 0x083F,
-    0xA3A1, 0x21FA, 0xE266, 0xC8A0, 0x0000, 0x0000, 0x51D1, 0xE8D8, 0xF70B,
-    0xAD5B, 0x556C, 0xE241, 0x4131, 0xF9C2, 0x186D, 0x2C32, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000,
-    0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000,
-    0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFF7E, 0x0703, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A,
-    0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEAAC, 0x1A68, 0xBA22, 0x0000,
-    0x0000, 0x6698, 0x11B0, 0x083F, 0xA3A1, 0x21BD, 0xE26C, 0xC8C9, 0x0000,
-    0x0000, 0x51B2, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF9EE,
-    0x1876, 0x2C81, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35,
-    0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0,
-    0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x070A, 0xFE38,
-    0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000,
-    0xEAF4, 0x1A71, 0xBA5B, 0x0000, 0x0000, 0x6669, 0x11B0, 0x083F, 0xA3A1,
-    0x2180, 0xE271, 0xC8F3, 0x0000, 0x0000, 0x5193, 0xE8D8, 0xF70B, 0xAD5B,
-    0x556C, 0xE241, 0x4131, 0xFA1A, 0x187F, 0x2CCF, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2,
-    0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B,
-    0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFF7E, 0x0710, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF,
-    0xBDD2, 0x0000, 0x0000, 0x0000, 0xEB3B, 0x1A7B, 0xBA93, 0x0000, 0x0000,
-    0x663B, 0x11B0, 0x083F, 0xA3A1, 0x2144, 0xE277, 0xC91C, 0x0000, 0x0000,
-    0x5174, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFA47, 0x1888,
-    0x2D1D, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB,
-    0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1,
-    0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0717, 0xFE38, 0x0000,
-    0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEB81,
-    0x1A83, 0xBACA, 0x0000, 0x0000, 0x660C, 0x11B0, 0x083F, 0xA3A1, 0x2107,
-    0xE27C, 0xC945, 0x0000, 0x0000, 0x5154, 0xE8D8, 0xF70B, 0xAD5B, 0x556C,
-    0xE241, 0x4131, 0xFA73, 0x1891, 0x2D6C, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080,
-    0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589,
-    0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFF7E, 0x071D, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2,
-    0x0000, 0x0000, 0x0000, 0xEBC7, 0x1A8C, 0xBB02, 0x0000, 0x0000, 0x65DD,
-    0x11B0, 0x083F, 0xA3A1, 0x20CB, 0xE282, 0xC96E, 0x0000, 0x0000, 0x5134,
-    0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFAA0, 0x189A, 0x2DBA,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE,
-    0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468,
-    0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0724, 0xFE38, 0x0000, 0x0000,
-    0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEC0D, 0x1A95,
-    0xBB3A, 0x0000, 0x0000, 0x65AF, 0x11B0, 0x083F, 0xA3A1, 0x2090, 0xE287,
-    0xC997, 0x0000, 0x0000, 0x5114, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241,
-    0x4131, 0xFACC, 0x18A3, 0x2E08, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B,
-    0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D,
-    0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E,
-    0x072A, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000,
-    0x0000, 0x0000, 0xEC51, 0x1A9D, 0xBB71, 0x0000, 0x0000, 0x657F, 0x11B0,
-    0x083F, 0xA3A1, 0x2054, 0xE28D, 0xC9C0, 0x0000, 0x0000, 0x50F4, 0xE8D8,
-    0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFAF8, 0x18AD, 0x2E57, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000,
-    0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000,
-    0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFF7E, 0x0731, 0xFE38, 0x0000, 0x0000, 0x0000,
-    0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEC95, 0x1AA5, 0xBBA8,
-    0x0000, 0x0000, 0x6550, 0x11B0, 0x083F, 0xA3A1, 0x2019, 0xE293, 0xC9E9,
-    0x0000, 0x0000, 0x50D4, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131,
-    0xFB25, 0x18B6, 0x2EA5, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB,
-    0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201,
-    0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0737,
-    0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000,
-    0x0000, 0xECD9, 0x1AAD, 0xBBDF, 0x0000, 0x0000, 0x6521, 0x11B0, 0x083F,
-    0xA3A1, 0x1FDE, 0xE298, 0xCA12, 0x0000, 0x0000, 0x50B3, 0xE8D8, 0xF70B,
-    0xAD5B, 0x556C, 0xE241, 0x4131, 0xFB51, 0x18BF, 0x2EF3, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000,
-    0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000,
-    0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFF7E, 0x0732, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A,
-    0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEC9E, 0x1AA6, 0xBBAF, 0x0000,
-    0x0000, 0x654A, 0x11B0, 0x083F, 0xA3A1, 0x2011, 0xE293, 0xC9EE, 0x0000,
-    0x0000, 0x50D0, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFB7E,
-    0x18C8, 0x2F42, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35,
-    0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0,
-    0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x072C, 0xFE38,
-    0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000,
-    0xEC62, 0x1A9F, 0xBB7F, 0x0000, 0x0000, 0x6574, 0x11B0, 0x083F, 0xA3A1,
-    0x2045, 0xE28E, 0xC9CA, 0x0000, 0x0000, 0x50EC, 0xE8D8, 0xF70B, 0xAD5B,
-    0x556C, 0xE241, 0x4131, 0xFBAA, 0x18D1, 0x2F90, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2,
-    0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B,
-    0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFF7E, 0x0726, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF,
-    0xBDD2, 0x0000, 0x0000, 0x0000, 0xEC26, 0x1A98, 0xBB4E, 0x0000, 0x0000,
-    0x659D, 0x11B0, 0x083F, 0xA3A1, 0x2079, 0xE289, 0xC9A7, 0x0000, 0x0000,
-    0x5108, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFBA0, 0x18CF,
-    0x2F7E, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB,
-    0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1,
-    0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0721, 0xFE38, 0x0000,
-    0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEBEA,
-    0x1A90, 0xBB1E, 0x0000, 0x0000, 0x65C6, 0x11B0, 0x083F, 0xA3A1, 0x20AD,
-    0xE284, 0xC983, 0x0000, 0x0000, 0x5125, 0xE8D8, 0xF70B, 0xAD5B, 0x556C,
-    0xE241, 0x4131, 0xFB83, 0x18C9, 0x2F4B, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080,
-    0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589,
-    0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFF7E, 0x071B, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2,
-    0x0000, 0x0000, 0x0000, 0xEBAD, 0x1A89, 0xBAED, 0x0000, 0x0000, 0x65EF,
-    0x11B0, 0x083F, 0xA3A1, 0x20E2, 0xE280, 0xC95F, 0x0000, 0x0000, 0x5140,
-    0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFB56, 0x18C0, 0x2EFC,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE,
-    0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468,
-    0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0715, 0xFE38, 0x0000, 0x0000,
-    0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEB70, 0x1A81,
-    0xBABD, 0x0000, 0x0000, 0x6618, 0x11B0, 0x083F, 0xA3A1, 0x2117, 0xE27B,
-    0xC93B, 0x0000, 0x0000, 0x515C, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241,
-    0x4131, 0xFB1D, 0x18B4, 0x2E98, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B,
-    0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D,
-    0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E,
-    0x0710, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000,
-    0x0000, 0x0000, 0xEB32, 0x1A79, 0xBA8C, 0x0000, 0x0000, 0x6641, 0x11B0,
-    0x083F, 0xA3A1, 0x214B, 0xE276, 0xC917, 0x0000, 0x0000, 0x5178, 0xE8D8,
-    0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xFADB, 0x18A7, 0x2E23, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000,
-    0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000,
-    0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFF7E, 0x070A, 0xFE38, 0x0000, 0x0000, 0x0000,
-    0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEAF4, 0x1A71, 0xBA5B,
-    0x0000, 0x0000, 0x6669, 0x11B0, 0x083F, 0xA3A1, 0x2180, 0xE271, 0xC8F3,
-    0x0000, 0x0000, 0x5193, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131,
-    0xFA92, 0x1898, 0x2DA3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB,
-    0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201,
-    0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x0704,
-    0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000,
-    0x0000, 0xEAB5, 0x1A69, 0xBA29, 0x0000, 0x0000, 0x6692, 0x11B0, 0x083F,
-    0xA3A1, 0x21B5, 0xE26C, 0xC8CE, 0x0000, 0x0000, 0x51AE, 0xE8D8, 0xF70B,
-    0xAD5B, 0x556C, 0xE241, 0x4131, 0xFA47, 0x1888, 0x2D1D, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000,
-    0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000,
-    0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFF7E, 0x06FF, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A,
-    0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xEA76, 0x1A61, 0xB9F8, 0x0000,
-    0x0000, 0x66BA, 0x11B0, 0x083F, 0xA3A1, 0x21EB, 0xE268, 0xC8AA, 0x0000,
-    0x0000, 0x51C9, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF9FB,
-    0x1878, 0x2C98, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35,
-    0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0,
-    0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000,
-    0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06F9, 0xFE38,
-    0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000,
-    0xEA36, 0x1A58, 0xB9C6, 0x0000, 0x0000, 0x66E2, 0x11B0, 0x083F, 0xA3A1,
-    0x2220, 0xE263, 0xC886, 0x0000, 0x0000, 0x51E4, 0xE8D8, 0xF70B, 0xAD5B,
-    0x556C, 0xE241, 0x4131, 0xF9B3, 0x186A, 0x2C18, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2,
-    0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B,
-    0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFF7E, 0x06F3, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF,
-    0xBDD2, 0x0000, 0x0000, 0x0000, 0xE9F6, 0x1A4F, 0xB994, 0x0000, 0x0000,
-    0x670A, 0x11B0, 0x083F, 0xA3A1, 0x2256, 0xE25E, 0xC862, 0x0000, 0x0000,
-    0x51FF, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF970, 0x185C,
-    0x2BA3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB,
-    0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1,
-    0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06EE, 0xFE38, 0x0000,
-    0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xE9B6,
-    0x1A46, 0xB962, 0x0000, 0x0000, 0x6732, 0x11B0, 0x083F, 0xA3A1, 0x228C,
-    0xE259, 0xC83D, 0x0000, 0x0000, 0x5219, 0xE8D8, 0xF70B, 0xAD5B, 0x556C,
-    0xE241, 0x4131, 0xF937, 0x1850, 0x2B3F, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080,
-    0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589,
-    0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFF7E, 0x06E8, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2,
-    0x0000, 0x0000, 0x0000, 0xE975, 0x1A3D, 0xB930, 0x0000, 0x0000, 0x675A,
-    0x11B0, 0x083F, 0xA3A1, 0x22C2, 0xE255, 0xC819, 0x0000, 0x0000, 0x5233,
-    0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF90B, 0x1847, 0x2AF0,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE,
-    0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468,
-    0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E, 0x06E2, 0xFE38, 0x0000, 0x0000,
-    0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000, 0x0000, 0x0000, 0xE933, 0x1A34,
-    0xB8FE, 0x0000, 0x0000, 0x6782, 0x11B0, 0x083F, 0xA3A1, 0x22F8, 0xE250,
-    0xC7F4, 0x0000, 0x0000, 0x524D, 0xE8D8, 0xF70B, 0xAD5B, 0x556C, 0xE241,
-    0x4131, 0xF8EE, 0x1841, 0x2ABD, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000, 0x0000, 0xC2E2, 0x0080, 0x0D4B,
-    0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000, 0x0000, 0xC98B, 0x0589, 0x0E1D,
-    0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF7E,
-    0x06DC, 0xFE38, 0x0000, 0x0000, 0x0000, 0xA61A, 0x05CF, 0xBDD2, 0x0000,
-    0x0000, 0x0000, 0xE8F1, 0x1A2A, 0xB8CB, 0x0000, 0x0000, 0x67A9, 0x11B0,
-    0x083F, 0xA3A1, 0x232F, 0xE24B, 0xC7CF, 0x0000, 0x0000, 0x5267, 0xE8D8,
-    0xF70B, 0xAD5B, 0x556C, 0xE241, 0x4131, 0xF8E4, 0x183F, 0x2AAB, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x2D35, 0xF7BB, 0x51AE, 0x0000,
-    0x0000, 0xC2E2, 0x0080, 0x0D4B, 0xBFDB, 0xB5D0, 0x14C1, 0x3468, 0x0000,
-    0x0000, 0xC98B, 0x0589, 0x0E1D, 0xE201, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00F7, 0x0CAE, 0xFD93,
-    0x0000, 0x0000, 0x0000, 0x9953, 0x02B3, 0xC0ED, 0x0000, 0x0000, 0x0000,
-    0x087B, 0xFFC0, 0xE175, 0x0000, 0x0000, 0x21F0, 0xF6DE, 0x077F, 0xB7DB,
-    0xF4E5, 0x0606, 0x05E6, 0x0000, 0x0000, 0x20F1, 0xF94E, 0xF7A2, 0xA326,
-    0x61C2, 0xFE1D, 0x37D7, 0xF95E, 0x1FDD, 0x34D3, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x4557, 0xF959, 0x2A44, 0x0000, 0x0000, 0xAABB,
-    0xF8B0, 0x8BB6, 0xD4CC, 0xD92F, 0x1D54, 0x3848, 0x0000, 0x0000, 0x0000,
-    0xFB26, 0x0549, 0xC9CC, 0xC000, 0x6A5E, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0116, 0x0CC0, 0xFD9A, 0x0000, 0x0000, 0x0000, 0x9887, 0x0329,
-    0xC09E, 0x0000, 0x0000, 0x0000, 0x0799, 0x00ED, 0xE1D3, 0x0000, 0x0000,
-    0x22E2, 0xF7D8, 0x0726, 0xB67D, 0xF49C, 0x03DB, 0x005E, 0x0000, 0x0000,
-    0x2B3C, 0xF915, 0xF7F1, 0xA454, 0x62C0, 0xFE54, 0x3797, 0xF92C, 0x20DE,
-    0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x4621, 0xF96D,
-    0x27EA, 0x0000, 0x0000, 0xA9E6, 0xF91F, 0x8B69, 0xD466, 0xD95F, 0x1EAC,
-    0x371C, 0x0000, 0x0000, 0x0000, 0xFB3D, 0x055A, 0xC9C2, 0xC000, 0x69B8,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0CE8, 0xFD9C, 0x0000,
-    0x0000, 0x0000, 0x97EA, 0x0386, 0xC05E, 0x0000, 0x0000, 0x0000, 0x0626,
-    0x032D, 0xE3FB, 0x0000, 0x0000, 0x2426, 0xFAD2, 0x0685, 0xB38C, 0xF57E,
-    0xFFB5, 0xF6A9, 0x0000, 0x0000, 0x387B, 0xF8D1, 0xF858, 0xA605, 0x6384,
-    0xFE7E, 0x3766, 0xF906, 0x21A4, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x46BC, 0xF97C, 0x261B, 0x0000, 0x0000, 0xA942, 0xF975,
-    0x8B2E, 0xD418, 0xD984, 0x1FB4, 0x3636, 0x0000, 0x0000, 0x0000, 0xFB4E,
-    0x0566, 0xC9BA, 0xC000, 0x68B8, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0122, 0x0D15, 0xFD9C, 0x0000, 0x0000, 0x0000, 0x9777, 0x03CA, 0xC02D,
-    0x0000, 0x0000, 0x0000, 0x046D, 0x05D9, 0xE7E4, 0x0000, 0x0000, 0x2423,
-    0xFEA9, 0x05BE, 0xB001, 0xF807, 0xFB50, 0xEC3D, 0x0000, 0x0000, 0x41C4,
-    0xF886, 0xF8D0, 0xA815, 0x63DC, 0xFE9D, 0x3742, 0xF8EA, 0x2233, 0x34D3,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x472C, 0xF987, 0x24CA,
-    0x0000, 0x0000, 0xA8CB, 0xF9B3, 0x8B03, 0xD3DF, 0xD99F, 0x2074, 0x358F,
-    0x0000, 0x0000, 0x0000, 0xFB5B, 0x0570, 0xC9B4, 0xC000, 0x67AE, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x011D, 0x0D3B, 0xFD9B, 0x0000, 0x0000,
-    0x0000, 0x972A, 0x03F9, 0xC00C, 0x0000, 0x0000, 0x0000, 0x02CD, 0x0871,
-    0xECF0, 0x0000, 0x0000, 0x2282, 0x0237, 0x04F5, 0xACD1, 0xFAB6, 0xF82C,
-    0xE46E, 0x0000, 0x0000, 0x441A, 0xF838, 0xF952, 0xAA60, 0x63D8, 0xFEB2,
-    0x372A, 0xF8E4, 0x2293, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x4777, 0xF98E, 0x23EB, 0x0000, 0x0000, 0xA87C, 0xF9DC, 0x8AE6,
-    0xD3B9, 0xD9B1, 0x20F3, 0x3520, 0x0000, 0x0000, 0x0000, 0xFB63, 0x0576,
-    0xC9B0, 0xC000, 0x66EA, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x0119,
-    0x0D48, 0xFD9B, 0x0000, 0x0000, 0x0000, 0x9700, 0x0413, 0xBFF9, 0x0000,
-    0x0000, 0x0000, 0x0166, 0x0A9F, 0xF199, 0x0000, 0x0000, 0x20E8, 0x05CA,
-    0x03DE, 0xAA10, 0xFC09, 0xF67D, 0xE107, 0x0000, 0x0000, 0x3F53, 0xF7EC,
-    0xF9D9, 0xACBF, 0x63D6, 0xFEBD, 0x371C, 0xF8E4, 0x22C7, 0x34D3, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x47A0, 0xF992, 0x2370, 0x0000,
-    0x0000, 0xA851, 0xF9F3, 0x8AD7, 0xD3A4, 0xD9BB, 0x2139, 0x34E3, 0x0000,
-    0x0000, 0x0000, 0xFB68, 0x0579, 0xC9AE, 0xC000, 0x66BD, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0115, 0x0D1A, 0xFD9A, 0x0000, 0x0000, 0x0000,
-    0x96F2, 0x041B, 0xBFF3, 0x0000, 0x0000, 0x0000, 0xFF60, 0x0D4F, 0xF565,
-    0x0000, 0x0000, 0x22E9, 0x0918, 0x0309, 0xA7C3, 0xFC6B, 0xF55C, 0xE057,
-    0x0000, 0x0000, 0x36FF, 0xF7A5, 0xFA5C, 0xAF0E, 0x63D5, 0xFEC1, 0x3718,
-    0xF8E4, 0x22D5, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x47AB, 0xF993, 0x234F, 0x0000, 0x0000, 0xA845, 0xF9F9, 0x8AD2, 0xD39F,
-    0xD9BE, 0x214C, 0x34D2, 0x0000, 0x0000, 0x0000, 0xFB69, 0x057A, 0xC9AE,
-    0xC000, 0x67B5, 0xFD27, 0x0000, 0x0000, 0x0000, 0x0000, 0x010A, 0x0CC6,
-    0xFD97, 0x0000, 0x0000, 0x0000, 0x96FE, 0x0414, 0xBFF9, 0x0000, 0x0000,
-    0x0000, 0xFD19, 0x1014, 0xF9A5, 0x0000, 0x0000, 0x2559, 0x0C01, 0x0311,
-    0xA5B2, 0xFC12, 0xF4B0, 0xE1B0, 0x0000, 0x0000, 0x2D81, 0xF767, 0xFAD6,
-    0xB129, 0x63D6, 0xFEBE, 0x371C, 0xF8E4, 0x22C3, 0x34D3, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x479D, 0xF992, 0x2378, 0x0000, 0x0000,
-    0xA853, 0xF9F1, 0x8AD8, 0xD3A6, 0xD9BA, 0x2135, 0x34E7, 0x0000, 0x0000,
-    0x0000, 0xFB67, 0x0579, 0xC9AF, 0xC000, 0x6992, 0xFD28, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x00FF, 0x0C98, 0xFD95, 0x0000, 0x0000, 0x0000, 0x971F,
-    0x0400, 0xC007, 0x0000, 0x0000, 0x0000, 0xFB52, 0x1123, 0xFA0F, 0x0000,
-    0x0000, 0x2963, 0x0E7F, 0x036D, 0xA3F8, 0xFB18, 0xF4A7, 0xE4FB, 0x0000,
-    0x0000, 0x238E, 0xF736, 0xFB41, 0xB2EA, 0x63D7, 0xFEB5, 0x3726, 0xF8E4,
-    0x2297, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x477A,
-    0xF98F, 0x23E1, 0x0000, 0x0000, 0xA878, 0xF9DE, 0x8AE5, 0xD3B8, 0xD9B2,
-    0x20F9, 0x351B, 0x0000, 0x0000, 0x0000, 0xFB63, 0x0576, 0xC9B0, 0xC000,
-    0x6B72, 0xFD27, 0x0000, 0x0000, 0x0000, 0x0000, 0x00F7, 0x0CAA, 0xFD93,
-    0x0000, 0x0000, 0x0000, 0x9751, 0x03E1, 0xC01D, 0x0000, 0x0000, 0x0000,
-    0xFA1E, 0x1043, 0xF463, 0x0000, 0x0000, 0x3152, 0x0EB9, 0x03DB, 0xA3FA,
-    0xFA58, 0xF5A9, 0xE7CE, 0x0000, 0x0000, 0x21A2, 0xF716, 0xFB95, 0xB42C,
-    0x63DA, 0xFEA7, 0x3736, 0xF8E4, 0x2254, 0x34D3, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x4746, 0xF98A, 0x247C, 0x0000, 0x0000, 0xA8AF,
-    0xF9C1, 0x8AF9, 0xD3D2, 0xD9A6, 0x20A0, 0x3568, 0x0000, 0x0000, 0x0000,
-    0xFB5E, 0x0572, 0xC9B3, 0xC000, 0x6C75, 0xFD26, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x00F4, 0x0CD4, 0xFD92, 0x0000, 0x0000, 0x0000, 0x9790, 0x03BC,
-    0xC038, 0x0000, 0x0000, 0x0000, 0xF9E3, 0x0E84, 0xEC75, 0x0000, 0x0000,
-    0x3A01, 0x0CB5, 0x0446, 0xA5B7, 0xF9B9, 0xF749, 0xEA3F, 0x0000, 0x0000,
-    0x24A0, 0xF79E, 0xFB49, 0xB1AD, 0x63DD, 0xFE96, 0x3749, 0xF8F3, 0x2202,
-    0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x4706, 0xF983,
-    0x253D, 0x0000, 0x0000, 0xA8F4, 0xF99E, 0x8B11, 0xD3F2, 0xD996, 0x2033,
-    0x35C8, 0x0000, 0x0000, 0x0000, 0xFB56, 0x056C, 0xC9B6, 0xC000, 0x6C9C,
-    0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x00F3, 0x0D0A, 0xFD92, 0x0000,
-    0x0000, 0x0000, 0x97D7, 0x0391, 0xC056, 0x0000, 0x0000, 0x0000, 0xFB3A,
-    0x0C31, 0xE450, 0x0000, 0x0000, 0x408E, 0x09E0, 0x04C3, 0xA81B, 0xF8D4,
-    0xF91B, 0xEDE4, 0x0000, 0x0000, 0x2489, 0xF85F, 0xFAAF, 0xADC3, 0x639C,
-    0xFE83, 0x3760, 0xF905, 0x21A6, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x46BD, 0xF97C, 0x2616, 0x0000, 0x0000, 0xA941, 0xF976,
-    0x8B2D, 0xD417, 0xD985, 0x1FB6, 0x3634, 0x0000, 0x0000, 0x0000, 0xFB4E,
-    0x0567, 0xC9BA, 0xC000, 0x6C8A, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x00F3, 0x0D3F, 0xFD92, 0x0000, 0x0000, 0x0000, 0x9822, 0x0364, 0xC075,
-    0x0000, 0x0000, 0x0000, 0xFDE4, 0x09B2, 0xDDC3, 0x0000, 0x0000, 0x435A,
-    0x0683, 0x054B, 0xAAEB, 0xF7D0, 0xFB63, 0xF278, 0x0000, 0x0000, 0x235F,
-    0xF8A5, 0xFA74, 0xAC83, 0x633E, 0xFE6F, 0x3777, 0xF918, 0x2144, 0x34D3,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x4670, 0xF975, 0x26FC,
-    0x0000, 0x0000, 0xA992, 0xF94B, 0x8B4A, 0xD43E, 0xD972, 0x1F33, 0x36A6,
-    0x0000, 0x0000, 0x0000, 0xFB46, 0x0560, 0xC9BE, 0xC000, 0x6C4D, 0xFD26,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x00F3, 0x0D69, 0xFD92, 0x0000, 0x0000,
-    0x0000, 0x986D, 0x0338, 0xC094, 0x0000, 0x0000, 0x0000, 0x00CB, 0x079B,
-    0xDA49, 0x0000, 0x0000, 0x4227, 0x02E6, 0x05D5, 0xADEC, 0xF6E0, 0xFDF9,
-    0xF7A1, 0x0000, 0x0000, 0x211C, 0xF8CB, 0xFA47, 0xABDD, 0x62E0, 0xFE5B,
-    0x378F, 0xF92B, 0x20E2, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x4624, 0xF96D, 0x27E1, 0x0000, 0x0000, 0xA9E3, 0xF921, 0x8B68,
-    0xD465, 0xD960, 0x1EB1, 0x3718, 0x0000, 0x0000, 0x0000, 0xFB3D, 0x055A,
-    0xC9C2, 0xC000, 0x6BF3, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x00F4,
-    0x0D7B, 0xFD92, 0x0000, 0x0000, 0x0000, 0x98B5, 0x030E, 0xC0B0, 0x0000,
-    0x0000, 0x0000, 0x037C, 0x05C8, 0xDA0F, 0x0000, 0x0000, 0x3CBF, 0xFF51,
-    0x0658, 0xB0E4, 0xF62F, 0x009C, 0xFCD9, 0x0000, 0x0000, 0x1E4D, 0xF8EA,
-    0xF9F8, 0xAAD9, 0x6287, 0xFE48, 0x37A5, 0xF93D, 0x2086, 0x34D3, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x45DC, 0xF966, 0x28B9, 0x0000,
-    0x0000, 0xAA2F, 0xF8F9, 0x8B83, 0xD489, 0xD94F, 0x1E36, 0x3783, 0x0000,
-    0x0000, 0x0000, 0xFB35, 0x0554, 0xC9C5, 0xC000, 0x6B8A, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x00F4, 0x0D5C, 0xFD92, 0x0000, 0x0000, 0x0000,
-    0x98F4, 0x02E9, 0xC0C9, 0x0000, 0x0000, 0x0000, 0x05C7, 0x03CA, 0xDBA1,
-    0x0000, 0x0000, 0x34B7, 0xFC0A, 0x06CD, 0xB399, 0xF5B8, 0x02DC, 0x00ED,
-    0x0000, 0x0000, 0x1D69, 0xF90D, 0xF95C, 0xA8CB, 0x6239, 0xFE37, 0x37B9,
-    0xF94D, 0x2035, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x459C, 0xF960, 0x2977, 0x0000, 0x0000, 0xAA73, 0xF8D6, 0x8B9C, 0xD4AA,
-    0xD93F, 0x1DC9, 0x37E2, 0x0000, 0x0000, 0x0000, 0xFB2E, 0x054F, 0xC9C9,
-    0xC000, 0x6B20, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x00F5, 0x0D15,
-    0xFD93, 0x0000, 0x0000, 0x0000, 0x9926, 0x02CD, 0xC0DC, 0x0000, 0x0000,
-    0x0000, 0x075C, 0x01E0, 0xDDF8, 0x0000, 0x0000, 0x2C46, 0xF95A, 0x072A,
-    0xB5D0, 0xF554, 0x0489, 0x039F, 0x0000, 0x0000, 0x1EA1, 0xF92D, 0xF895,
-    0xA63E, 0x61FA, 0xFE29, 0x37C9, 0xF95A, 0x1FF4, 0x34D3, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x4569, 0xF95B, 0x2A0E, 0x0000, 0x0000,
-    0xAAA8, 0xF8BA, 0x8BAF, 0xD4C3, 0xD933, 0x1D73, 0x382D, 0x0000, 0x0000,
-    0x0000, 0xFB28, 0x054B, 0xC9CB, 0xC000, 0x6AC3, 0xFD26, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x00F6, 0x0CCE, 0xFD93, 0x0000, 0x0000, 0x0000, 0x9947,
-    0x02BA, 0xC0E8, 0x0000, 0x0000, 0x0000, 0x0838, 0x005F, 0xE057, 0x0000,
-    0x0000, 0x2512, 0xF789, 0x0768, 0xB74F, 0xF506, 0x05A2, 0x054F, 0x0000,
-    0x0000, 0x202D, 0xF945, 0xF7EA, 0xA411, 0x61D1, 0xFE20, 0x37D3, 0xF962,
-    0x1FCA, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x4548,
-    0xF958, 0x2A72, 0x0000, 0x0000, 0xAACC, 0xF8A7, 0x8BBC, 0xD4D4, 0xD92B,
-    0x1D3A, 0x385F, 0x0000, 0x0000, 0x0000, 0xFB24, 0x0548, 0xC9CD, 0xC000,
-    0x6A81, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD57,
-    0x0C75, 0xFD93, 0x0000, 0x0000, 0x0000, 0x95A0, 0x02DA, 0xC000, 0x0000,
-    0x0000, 0x0000, 0x0244, 0x0D14, 0xE896, 0x0000, 0x0000, 0x2E92, 0x08FA,
-    0x0919, 0xAA50, 0xFC76, 0xF14F, 0xE452, 0x0000, 0x0000, 0x2291, 0xF851,
-    0xF9F1, 0xB1DE, 0x61C2, 0xFE1D, 0x35CD, 0xF95B, 0x1FEF, 0x34D3, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000,
-    0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD92F, 0x1D54, 0x3848, 0x0000,
-    0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC006, 0x6A68, 0xFD32, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFD54, 0x0C77, 0xFD9E, 0x0000, 0x0000, 0x0000,
-    0x94AD, 0x0356, 0xBF9C, 0x0000, 0x0000, 0x0000, 0x0259, 0x0CB4, 0xE74A,
-    0x0000, 0x0000, 0x2EEA, 0x0809, 0x08E4, 0xAAB8, 0xFE17, 0xF127, 0xDF5D,
-    0x0000, 0x0000, 0x2B98, 0xF8F7, 0xF9E2, 0xB095, 0x61B8, 0xFE53, 0x357E,
-    0xF916, 0x212E, 0x34CB, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA,
-    0xD95F, 0x1EAA, 0x371E, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE,
-    0xC04E, 0x6A68, 0xFDC0, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD53, 0x0C8C,
-    0xFDA3, 0x0000, 0x0000, 0x0000, 0x93F0, 0x03B8, 0xBF4B, 0x0000, 0x0000,
-    0x0000, 0x02C7, 0x0BD5, 0xE5AA, 0x0000, 0x0000, 0x2E30, 0x0652, 0x0865,
-    0xABEB, 0xFFCD, 0xF110, 0xDABC, 0x0000, 0x0000, 0x34F5, 0xF9DB, 0xF9BC,
-    0xAEBB, 0x61AF, 0xFE7D, 0x3540, 0xF8EF, 0x21B7, 0x34B9, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000,
-    0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD984, 0x1FB1, 0x3639, 0x0000, 0x0000,
-    0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC0B7, 0x6A6B, 0xFE8E, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFD51, 0x0CAA, 0xFDA5, 0x0000, 0x0000, 0x0000, 0x9366,
-    0x0400, 0xBF0D, 0x0000, 0x0000, 0x0000, 0x0364, 0x0A9D, 0xE3F4, 0x0000,
-    0x0000, 0x2C91, 0x047C, 0x07C5, 0xADB1, 0x00D9, 0xF153, 0xD839, 0x0000,
-    0x0000, 0x3C47, 0xFAE5, 0xF986, 0xAC76, 0x61A8, 0xFE9C, 0x3513, 0xF8E4,
-    0x21B6, 0x34A5, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C,
-    0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD99F,
-    0x2070, 0x3592, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC133,
-    0x6A70, 0xFF83, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD50, 0x0CC4, 0xFDA5,
-    0x0000, 0x0000, 0x0000, 0x930A, 0x0432, 0xBEE3, 0x0000, 0x0000, 0x0000,
-    0x040C, 0x0932, 0xE254, 0x0000, 0x0000, 0x2A5B, 0x032F, 0x072C, 0xAFD6,
-    0x007B, 0xF22A, 0xD940, 0x0000, 0x0000, 0x3FC3, 0xFC00, 0xF947, 0xA9EC,
-    0x61A4, 0xFEB0, 0x34F5, 0xF8E4, 0x2157, 0x3493, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8,
-    0xF8A1, 0x8BC0, 0xD4DA, 0xD9B1, 0x20EF, 0x3524, 0x0000, 0x0000, 0x0000,
-    0xFB23, 0x0547, 0xC9CE, 0xC1B6, 0x6A78, 0x0088, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFD50, 0x0CCF, 0xFDA6, 0x0000, 0x0000, 0x0000, 0x92D5, 0x044D,
-    0xBECA, 0x0000, 0x0000, 0x0000, 0x049D, 0x07BC, 0xE0C0, 0x0000, 0x0000,
-    0x2834, 0x0288, 0x067C, 0xB323, 0xFE75, 0xF3EA, 0xDE7B, 0x0000, 0x0000,
-    0x3F06, 0xFD16, 0xF905, 0xA741, 0x61A1, 0xFEBC, 0x34E4, 0xF8F8, 0x20C9,
-    0x3489, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957,
-    0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD9BA, 0x2134,
-    0x34E7, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC235, 0x6A82,
-    0x0184, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4F, 0x0CC6, 0xFDA6, 0x0000,
-    0x0000, 0x0000, 0x92C4, 0x0457, 0xBEC2, 0x0000, 0x0000, 0x0000, 0x0547,
-    0x05B8, 0xDF1F, 0x0000, 0x0000, 0x24E0, 0x0233, 0x05AE, 0xB76D, 0xFBC0,
-    0xF679, 0xE64F, 0x0000, 0x0000, 0x3AF5, 0xFE10, 0xF8C7, 0xA49B, 0x61A1,
-    0xFEBF, 0x34DF, 0xF917, 0x2036, 0x348C, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1,
-    0x8BC0, 0xD4DA, 0xD9BD, 0x2148, 0x34D6, 0x0000, 0x0000, 0x0000, 0xFB23,
-    0x0547, 0xC9CE, 0xC2A3, 0x6A8D, 0x0260, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFD4F, 0x0CAE, 0xFDA6, 0x0000, 0x0000, 0x0000, 0x92D1, 0x0450, 0xBEC8,
-    0x0000, 0x0000, 0x0000, 0x05F3, 0x030D, 0xDE5A, 0x0000, 0x0000, 0x1E9D,
-    0x022D, 0x050A, 0xBB0D, 0xF963, 0xF95F, 0xEEBA, 0x0000, 0x0000, 0x33EA,
-    0xFEDA, 0xF893, 0xA21E, 0x61A1, 0xFEBC, 0x34E4, 0xF93D, 0x1FCD, 0x34A3,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97,
-    0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD9BA, 0x2130, 0x34EB,
-    0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC2F5, 0x6A97, 0x0304,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFD4E, 0x0C90, 0xFDA6, 0x0000, 0x0000,
-    0x0000, 0x92F8, 0x043B, 0xBEDA, 0x0000, 0x0000, 0x0000, 0x063A, 0x009D,
-    0xDE80, 0x0000, 0x0000, 0x17CA, 0x0272, 0x04DA, 0xBC5D, 0xF7F1, 0xFBE8,
-    0xF5E9, 0x0000, 0x0000, 0x2BD5, 0xFF5C, 0xF86F, 0x9FF1, 0x61A3, 0xFEB3,
-    0x34F1, 0xF965, 0x1FBA, 0x34D3, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0,
-    0xD4DA, 0xD9B1, 0x20F4, 0x351F, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547,
-    0xC9CE, 0xC320, 0x6A9D, 0x0359, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4E,
-    0x0C75, 0xFDA5, 0x0000, 0x0000, 0x0000, 0x9332, 0x041C, 0xBEF5, 0x0000,
-    0x0000, 0x0000, 0x0643, 0xFF9C, 0xDC98, 0x0000, 0x0000, 0x1859, 0x02F7,
-    0x0515, 0xBB8A, 0xF76E, 0xFD33, 0xF9B4, 0x0000, 0x0000, 0x26AE, 0xFF80,
-    0xF863, 0x9E38, 0x61A6, 0xFEA6, 0x3504, 0xF9C6, 0x2019, 0x356D, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000,
-    0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD9A5, 0x209C, 0x356C, 0x0000,
-    0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC317, 0x6A9B, 0x0346, 0x0000,
-    0x0000, 0x0000, 0x0000, 0xFD4D, 0x0C58, 0xFDA3, 0x0000, 0x0000, 0x0000,
-    0x937C, 0x03F5, 0xBF17, 0x0000, 0x0000, 0x0000, 0x0645, 0x0057, 0xD6D7,
-    0x0000, 0x0000, 0x23BD, 0x03A8, 0x0578, 0xB9FB, 0xF78A, 0xFCE7, 0xF92C,
-    0x0000, 0x0000, 0x26FA, 0xFD92, 0xF8C4, 0x9DB0, 0x61AA, 0xFE95, 0x351D,
-    0xFA67, 0x20B7, 0x366D, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000,
-    0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA,
-    0xD996, 0x202F, 0x35CB, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE,
-    0xC249, 0x6A84, 0x01AB, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4D, 0x0C3A,
-    0xFDA2, 0x0000, 0x0000, 0x0000, 0x93D1, 0x03C8, 0xBF3D, 0x0000, 0x0000,
-    0x0000, 0x05EF, 0x01C8, 0xD0E9, 0x0000, 0x0000, 0x3122, 0x0477, 0x05F9,
-    0xB7E3, 0xF80A, 0xFBA8, 0xF635, 0x0000, 0x0000, 0x29F3, 0xF9E9, 0xF981,
-    0x9EA1, 0x61AE, 0xFE82, 0x3539, 0xFAFF, 0x214C, 0x375D, 0x0000, 0x0000,
-    0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000,
-    0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD984, 0x1FB3, 0x3637, 0x0000, 0x0000,
-    0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC0AA, 0x6A6A, 0xFE71, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xFD4D, 0x0C2C, 0xFDA0, 0x0000, 0x0000, 0x0000, 0x942B,
-    0x0399, 0xBF64, 0x0000, 0x0000, 0x0000, 0x050D, 0x039A, 0xCCEF, 0x0000,
-    0x0000, 0x3C88, 0x0557, 0x068B, 0xB571, 0xF8DE, 0xF9EF, 0xF23F, 0x0000,
-    0x0000, 0x2CE0, 0xF780, 0xF9FF, 0xA080, 0x61B2, 0xFE6E, 0x3556, 0xFB42,
-    0x218E, 0x37C8, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C,
-    0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD972,
-    0x1F31, 0x36A8, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xBEF9,
-    0x6A6D, 0xFB18, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4C, 0x0C31, 0xFD9E,
-    0x0000, 0x0000, 0x0000, 0x9485, 0x036B, 0xBF8B, 0x0000, 0x0000, 0x0000,
-    0x03A2, 0x059C, 0xCBA5, 0x0000, 0x0000, 0x4487, 0x063A, 0x0725, 0xB2D8,
-    0xF9DF, 0xF818, 0xEE47, 0x0000, 0x0000, 0x2E5B, 0xF701, 0xFA1D, 0xA340,
-    0x61B6, 0xFE5A, 0x3574, 0xFB1E, 0x216B, 0x3790, 0x0000, 0x0000, 0x4DBE,
-    0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8,
-    0xF8A1, 0x8BC0, 0xD4DA, 0xD960, 0x1EAF, 0x371A, 0x0000, 0x0000, 0x0000,
-    0xFB23, 0x0547, 0xC9CE, 0xBDFA, 0x6A7E, 0xF923, 0x0000, 0x0000, 0x0000,
-    0x0000, 0xFD4D, 0x0C3F, 0xFD9B, 0x0000, 0x0000, 0x0000, 0x94DB, 0x033F,
-    0xBFAF, 0x0000, 0x0000, 0x0000, 0x021E, 0x0783, 0xCD13, 0x0000, 0x0000,
-    0x4842, 0x0713, 0x07BC, 0xB04A, 0xFAD8, 0xF65E, 0xEADE, 0x0000, 0x0000,
-    0x2E4B, 0xF6FD, 0xFA23, 0xA6CE, 0x61BA, 0xFE47, 0x358F, 0xFAC6, 0x2115,
-    0x3704, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957,
-    0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD94E, 0x1E34,
-    0x3784, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xBE13, 0x6A7C,
-    0xF955, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4D, 0x0C50, 0xFD98, 0x0000,
-    0x0000, 0x0000, 0x9527, 0x0318, 0xBFCF, 0x0000, 0x0000, 0x0000, 0x00F9,
-    0x098E, 0xD2CD, 0x0000, 0x0000, 0x45FA, 0x07D4, 0x0844, 0xADF7, 0xFB87,
-    0xF4FB, 0xE893, 0x0000, 0x0000, 0x2CAA, 0xF748, 0xFA1B, 0xAA9C, 0x61BD,
-    0xFE37, 0x35A8, 0xFA53, 0x20A4, 0x364E, 0x0000, 0x0000, 0x4DBE, 0x0000,
-    0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1,
-    0x8BC0, 0xD4DA, 0xD93F, 0x1DC8, 0x37E2, 0x0000, 0x0000, 0x0000, 0xFB23,
-    0x0547, 0xC9CE, 0xBECB, 0x6A70, 0xFAC2, 0x0000, 0x0000, 0x0000, 0x0000,
-    0xFD4D, 0x0C62, 0xFD95, 0x0000, 0x0000, 0x0000, 0x9565, 0x02F8, 0xBFE8,
-    0x0000, 0x0000, 0x0000, 0x00C4, 0x0B84, 0xDBCB, 0x0000, 0x0000, 0x3E09,
-    0x086E, 0x08B3, 0xAC11, 0xFC24, 0xF370, 0xE65E, 0x0000, 0x0000, 0x299C,
-    0xF7B6, 0xFA0A, 0xAE18, 0x61C0, 0xFE29, 0x35BC, 0xF9E1, 0x2033, 0x3597,
-    0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97,
-    0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD933, 0x1D72, 0x382D,
-    0x0000, 0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xBF9C, 0x6A69, 0xFC60,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xFD4D, 0x0C70, 0xFD93, 0x0000, 0x0000,
-    0x0000, 0x958F, 0x02E3, 0xBFF9, 0x0000, 0x0000, 0x0000, 0x019D, 0x0CAF,
-    0xE462, 0x0000, 0x0000, 0x3400, 0x08D5, 0x08FE, 0xAAC9, 0xFC7A, 0xF1EA,
-    0xE4AD, 0x0000, 0x0000, 0x251B, 0xF81D, 0xF9FA, 0xB0B2, 0x61C1, 0xFE20,
-    0x35C9, 0xF988, 0x1FDD, 0x350B, 0x0000, 0x0000, 0x4DBE, 0x0000, 0x0000,
-    0x0000, 0x453C, 0xF957, 0x2A97, 0x0000, 0x0000, 0xAAD8, 0xF8A1, 0x8BC0,
-    0xD4DA, 0xD92B, 0x1D3A, 0x385F, 0x0000, 0x0000, 0x0000, 0xFB23, 0x0547,
-    0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000, 0x0000, 0x0000, 0x0000, 0xFD4D,
-    0x0C75, 0xFD93, 0x0000, 0x0000, 0x0000, 0x95A0, 0x02DA, 0xC000, 0x0000,
-    0x0000, 0x0000, 0x024A, 0x0D01, 0xE869, 0x0000, 0x0000, 0x2EA2, 0x08FA,
-    0x0919, 0xAA50, 0xFC74, 0xF144, 0xE44B, 0x0000, 0x0000, 0x2254, 0xF850,
-    0xF9F2, 0xB1DA, 0x61C2, 0xFE1D, 0x35CD, 0xF965, 0x1FBA, 0x34D3, 0x0000,
-    0x0000, 0x4DBE, 0x0000, 0x0000, 0x0000, 0x453C, 0xF957, 0x2A97, 0x0000,
-    0x0000, 0xAAD8, 0xF8A1, 0x8BC0, 0xD4DA, 0xD928, 0x1D25, 0x3871, 0x0000,
-    0x0000, 0x0000, 0xFB23, 0x0547, 0xC9CE, 0xC000, 0x6A68, 0xFD26, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000,
-};
diff --git a/soh/soh/Enhancements/nametag.cpp b/soh/soh/Enhancements/nametag.cpp
index 49b0891fa3..1989b35528 100644
--- a/soh/soh/Enhancements/nametag.cpp
+++ b/soh/soh/Enhancements/nametag.cpp
@@ -5,7 +5,7 @@
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/custom-message/CustomMessageInterfaceAddon.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipUtils.h"
 
 extern "C" {
 #include "z64.h"
@@ -19,19 +19,23 @@ extern PlayState* gPlayState;
 
 typedef struct {
     Actor* actor;
-    std::string text; // Original text
+    std::string text;          // Original text
     std::string processedText; // Text filtered for supported font textures
-    const char* tag; // Tag identifier
-    Color_RGBA8 textColor; // Text color override. Global color is used if alpha is 0
-    int16_t height; // Textbox height
-    int16_t width; // Textbox width
-    int16_t yOffset; // Addition Y offset
-    Mtx* mtx; // Allocated Mtx for rendering
-    Vtx* vtx; // Allocated Vtx for rendering
+    const char* tag;           // Tag identifier
+    Color_RGBA8 textColor;     // Text color override. Global color is used if alpha is 0
+    int16_t height;            // Textbox height
+    int16_t width;             // Textbox width
+    int16_t yOffset;           // Addition Y offset
+    uint8_t noZBuffer;         // Allow rendering over geometry
+    Mtx* mtx;                  // Allocated Mtx for rendering
+    Vtx* vtx;                  // Allocated Vtx for rendering
 } NameTag;
 
 static std::vector<NameTag> nameTags;
 static std::vector<Gfx> nameTagDl;
+static bool sMirrorWorldActive = false;
+
+void NameTag_RegisterHooks();
 
 void FreeNameTag(NameTag* nameTag) {
     if (nameTag->vtx != nullptr) {
@@ -51,14 +55,14 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
     }
 
     // Name tag is too far away to meaningfully read, don't bother rendering it
-    if (nameTag->actor->xyzDistToPlayerSq > 200000.0f) {
+    if (nameTag->actor->xyzDistToPlayerSq > 440000.0f) {
         return;
     }
 
     // Fade out name tags that are far away
     float alpha = 1.0f;
-    if (nameTag->actor->xyzDistToPlayerSq > 160000.0f) {
-        alpha = (200000.0f - nameTag->actor->xyzDistToPlayerSq) / 40000.0f;
+    if (nameTag->actor->xyzDistToPlayerSq > 360000.0f) {
+        alpha = (440000.0f - nameTag->actor->xyzDistToPlayerSq) / 80000.0f;
     }
 
     float scale = 75.0f / 100.f;
@@ -69,7 +73,7 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
         return;
     }
 
-    Color_RGBA8 textboxColor = { 0, 0, 0, 80};
+    Color_RGBA8 textboxColor = { 0, 0, 0, 80 };
     Color_RGBA8 textColor = { 255, 255, 255, 255 };
 
     if (CVarGetInteger(CVAR_COSMETIC("HUD.NameTagActorBackground.Changed"), 0)) {
@@ -79,7 +83,7 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
         textColor = CVarGetColor(CVAR_COSMETIC("HUD.NameTagActorText.Value"), textColor);
     }
 
-    FrameInterpolation_RecordOpenChild(nameTag->actor, 10);
+    FrameInterpolation_RecordOpenChild(nameTag->actor, 0);
 
     // Prefer the highest between world position and focus position if targetable
     float posY = nameTag->actor->world.pos.y;
@@ -92,7 +96,7 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
     // Set position, billboard effect, scale (with mirror mode), then center nametag
     Matrix_Translate(nameTag->actor->world.pos.x, posY, nameTag->actor->world.pos.z, MTXMODE_NEW);
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    Matrix_Scale(scale * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1), -scale, 1.0f, MTXMODE_APPLY);
+    Matrix_Scale(scale * (sMirrorWorldActive ? -1.0f : 1.0f), -scale, 1.0f, MTXMODE_APPLY);
     Matrix_Translate(-(float)nameTag->width / 2, -nameTag->height, 0, MTXMODE_APPLY);
     Matrix_ToMtx(nameTag->mtx, (char*)__FILE__, __LINE__);
 
@@ -118,8 +122,6 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
     }
 
     for (size_t i = 0, vtxGroup = 0; i < numChar; i++) {
-        uint16_t texIndex = nameTag->processedText[i] - 32;
-
         // A maximum of 64 Vtx can be loaded at once by gSPVertex, or basically 16 characters
         // handle loading groups of 16 chars at a time until there are no more left to load
         if (i % 16 == 0) {
@@ -128,18 +130,16 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
             vtxGroup++;
         }
 
-        if (texIndex != 0 && nameTag->processedText[i] != '\n') {
-            uintptr_t texture = (uintptr_t)Font_FetchCharTexture(texIndex);
-            int16_t vertexStart = 4 * (i % 16);
+        uintptr_t texture = (uintptr_t)Ship_GetCharFontTexture(nameTag->processedText[i]);
+        int16_t vertexStart = 4 * (i % 16);
 
-            // Multi-instruction macro, need to insert all to the dl buffer
-            Gfx charTexture[] = { gsDPLoadTextureBlock_4b(
-                texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
-            nameTagDl.insert(nameTagDl.end(), std::begin(charTexture), std::end(charTexture));
+        // Multi-instruction macro, need to insert all to the dl buffer
+        Gfx charTexture[] = { gsDPLoadTextureBlock_4b(texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0,
+                                                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP,
+                                                      G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD) };
+        nameTagDl.insert(nameTagDl.end(), std::begin(charTexture), std::end(charTexture));
 
-            nameTagDl.push_back(gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
-        }
+        nameTagDl.push_back(gsSP1Quadrangle(vertexStart, vertexStart + 2, vertexStart + 3, vertexStart + 1, 0));
     }
 
     nameTagDl.push_back(gsSPPopMatrix(G_MTX_MODELVIEW));
@@ -158,15 +158,27 @@ void DrawNameTags() {
     OPEN_DISPS(gPlayState->state.gfxCtx);
 
     // Setup before rendering name tags
-    Gfx_SetupDL_38Xlu(gPlayState->state.gfxCtx);
-    nameTagDl.push_back(gsDPSetAlphaDither(G_AD_DISABLE));
-    nameTagDl.push_back(gsSPClearGeometryMode(G_SHADE));
+    POLY_XLU_DISP = Gfx_SetupDL_39(POLY_XLU_DISP);
 
+    nameTagDl.push_back(gsDPSetAlphaCompare(G_AC_NONE));
     nameTagDl.push_back(
         gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0));
 
+    bool zbufferEnabled = false;
+
     // Add all the name tags
     for (const auto& nameTag : nameTags) {
+        // Toggle ZBuffer mode based on last state and next tag
+        if (zbufferEnabled == nameTag.noZBuffer) {
+            if (nameTag.noZBuffer) {
+                nameTagDl.push_back(gsSPClearGeometryMode(G_ZBUFFER));
+                zbufferEnabled = false;
+            } else {
+                nameTagDl.push_back(gsSPSetGeometryMode(G_ZBUFFER));
+                zbufferEnabled = true;
+            }
+        }
+
         DrawNameTag(gPlayState, &nameTag);
     }
 
@@ -193,19 +205,22 @@ void UpdateNameTags() {
 
         return aDistToCamera > bDistToCamera;
     });
+
+    sMirrorWorldActive = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0);
 }
 
 extern "C" void NameTag_RegisterForActorWithOptions(Actor* actor, const char* text, NameTagOptions options) {
     std::string processedText = std::string(Interface_ReplaceSpecialCharacters((char*)text));
 
     // Strip out unsupported characters
-    processedText.erase(std::remove_if(processedText.begin(), processedText.end(), [](const char& c) {
-        // 172 is max supported texture for the in-game font system,
-        // and filter anything less than a space but not the newline or nul characters
-        return (unsigned char)c > 172 || (c < ' ' && c != '\n' && c != '\0');
-    }), processedText.end());
+    // 172 is max supported texture for the in-game font system,
+    // and filter anything less than a space but not the newline or nul characters
+    processedText.erase(
+        std::remove_if(processedText.begin(), processedText.end(),
+                       [](const char& c) { return (uint8_t)c > 172 || (c < ' ' && c != '\n' && c != '\0'); }),
+        processedText.end());
 
-    int16_t numChar = processedText.length();
+    size_t numChar = processedText.length();
     int16_t numLines = 1;
     int16_t offsetX = 0;
     int16_t maxOffsetX = 0;
@@ -214,20 +229,15 @@ extern "C" void NameTag_RegisterForActorWithOptions(Actor* actor, const char* te
     Vtx* vertices = (Vtx*)calloc(sizeof(Vtx[4]), numChar + 1);
 
     // Set all the char vtx first to get the total size for the textbox
-    for (int16_t i = 0; i < numChar; i++) {
+    for (size_t i = 0; i < numChar; i++) {
         if (processedText[i] == '\n') {
             offsetX = 0;
             numLines++;
         }
 
-        int16_t charIndex = processedText[i] - 32;
-        int16_t charWidth = 0;
-        // Don't add width for newline chars
-        if (charIndex >= 0) {
-            charWidth = (int16_t)(Message_GetCharacterWidth(charIndex) * (100.0f / R_TEXT_CHAR_SCALE));
-        }
+        int16_t charWidth = (int16_t)(Ship_GetCharFontWidth(processedText[i]));
 
-        Interface_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, (numLines - 1) * 16, charWidth, 16, 0);
+        Ship_CreateQuadVertexGroup(&(vertices)[(i + 1) * 4], offsetX, (numLines - 1) * 16, charWidth, 16, 0);
         offsetX += charWidth;
 
         if (offsetX > maxOffsetX) {
@@ -238,7 +248,7 @@ extern "C" void NameTag_RegisterForActorWithOptions(Actor* actor, const char* te
     // Vtx for textbox, add +/- 4 in all directions
     int16_t height = (numLines * 16) + 8;
     int16_t width = maxOffsetX + 8;
-    Interface_CreateQuadVertexGroup(vertices, -4, -4, width, height, 0);
+    Ship_CreateQuadVertexGroup(vertices, -4, -4, width, height, 0);
 
     // Update the texture coordinates to consume the full textbox texture size (including mirror region)
     vertices[1].v.tc[0] = 256 << 5;
@@ -255,10 +265,13 @@ extern "C" void NameTag_RegisterForActorWithOptions(Actor* actor, const char* te
     nameTag.height = height;
     nameTag.width = width;
     nameTag.yOffset = options.yOffset;
+    nameTag.noZBuffer = options.noZBuffer;
     nameTag.mtx = new Mtx();
     nameTag.vtx = vertices;
 
     nameTags.push_back(nameTag);
+
+    NameTag_RegisterHooks();
 }
 
 extern "C" void NameTag_RegisterForActor(Actor* actor, const char* text) {
@@ -274,6 +287,8 @@ extern "C" void NameTag_RemoveAllForActor(Actor* actor) {
             it++;
         }
     }
+
+    NameTag_RegisterHooks();
 }
 
 extern "C" void NameTag_RemoveAllByTag(const char* tag) {
@@ -285,6 +300,8 @@ extern "C" void NameTag_RemoveAllByTag(const char* tag) {
             it++;
         }
     }
+
+    NameTag_RegisterHooks();
 }
 
 void RemoveAllNameTags() {
@@ -293,23 +310,49 @@ void RemoveAllNameTags() {
     }
 
     nameTags.clear();
+
+    NameTag_RegisterHooks();
 }
 
-static bool sRegisteredHooks = false;
-
 void NameTag_RegisterHooks() {
-    if (sRegisteredHooks) {
+    static HOOK_ID gameStatUpdateHookID = 0;
+    static HOOK_ID drawHookID = 0;
+    static HOOK_ID playDestroyHookID = 0;
+    static HOOK_ID actorDestroyHookID = 0;
+    static bool sRegisteredHooks = false;
+
+    // Hooks already (un)registered based on nametags
+    if ((nameTags.size() > 0) == sRegisteredHooks) {
+        return;
+    }
+
+    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnGameFrameUpdate>(gameStatUpdateHookID);
+    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayDrawEnd>(drawHookID);
+    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayDestroy>(playDestroyHookID);
+    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorDestroy>(actorDestroyHookID);
+    gameStatUpdateHookID = 0;
+    drawHookID = 0;
+    playDestroyHookID = 0;
+    actorDestroyHookID = 0;
+    sRegisteredHooks = false;
+
+    if (nameTags.size() == 0) {
         return;
     }
 
     sRegisteredHooks = true;
 
     // Reorder tags every frame to mimic depth rendering
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() { UpdateNameTags(); });
+    gameStatUpdateHookID =
+        GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(UpdateNameTags);
 
-    // Render name tags at the end of player draw to avoid overflowing the display buffers
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDrawEnd>([]() { DrawNameTags(); });
+    // Render name tags at the end of the Play World drawing
+    drawHookID = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDrawEnd>(DrawNameTags);
 
     // Remove all name tags on play state destroy as all actors are removed anyways
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDestroy>([]() { RemoveAllNameTags(); });
+    playDestroyHookID = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDestroy>(RemoveAllNameTags);
+
+    // Remove all name tags for actor on destroy
+    actorDestroyHookID = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorDestroy>(
+        [](void* actor) { NameTag_RemoveAllForActor((Actor*)actor); });
 }
diff --git a/soh/soh/Enhancements/nametag.h b/soh/soh/Enhancements/nametag.h
index 9fd26643e8..47908e875e 100644
--- a/soh/soh/Enhancements/nametag.h
+++ b/soh/soh/Enhancements/nametag.h
@@ -1,11 +1,16 @@
-#ifndef _NAMETAG_H_
-#define _NAMETAG_H_
-#include <z64.h>
+#ifndef NAMETAG_H
+#define NAMETAG_H
+
+#include <libultraship/color.h>
+#include <libultraship/libultra.h>
+
+struct Actor;
 
 typedef struct {
-    const char* tag; // Tag identifier to filter/remove multiple tags 
-    int16_t yOffset; // Additional Y offset to apply for the name tag
+    const char* tag;       // Tag identifier to filter/remove multiple tags
+    int16_t yOffset;       // Additional Y offset to apply for the name tag
     Color_RGBA8 textColor; // Text color override. Global color is used if alpha is 0
+    uint8_t noZBuffer;     // Allow rendering over geometry
 } NameTagOptions;
 
 // Register required hooks for nametags on startup
@@ -28,4 +33,4 @@ void NameTag_RemoveAllByTag(const char* tag);
 }
 #endif
 
-#endif // _NAMETAG_H_
+#endif // NAMETAG_H
diff --git a/soh/soh/Enhancements/pausewarp.c b/soh/soh/Enhancements/pausewarp.c
index c767a34123..10f7e4e395 100644
--- a/soh/soh/Enhancements/pausewarp.c
+++ b/soh/soh/Enhancements/pausewarp.c
@@ -4,49 +4,37 @@
 #include "game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"
 
-static const int songMessageMap[] = { 
-    TEXT_WARP_MINUET_OF_FOREST,
-    TEXT_WARP_BOLERO_OF_FIRE,
-    TEXT_WARP_SERENADE_OF_WATER,
-    TEXT_WARP_REQUIEM_OF_SPIRIT,
-    TEXT_WARP_NOCTURNE_OF_SHADOW,
-    TEXT_WARP_PRELUDE_OF_LIGHT
+static const int songMessageMap[] = {
+    TEXT_WARP_MINUET_OF_FOREST,  TEXT_WARP_BOLERO_OF_FIRE,     TEXT_WARP_SERENADE_OF_WATER,
+    TEXT_WARP_REQUIEM_OF_SPIRIT, TEXT_WARP_NOCTURNE_OF_SHADOW, TEXT_WARP_PRELUDE_OF_LIGHT,
 };
 
 static const int ocarinaSongMap[] = {
-    OCARINA_SONG_MINUET,
-    OCARINA_SONG_BOLERO,
-    OCARINA_SONG_SERENADE,
-    OCARINA_SONG_REQUIEM,
-    OCARINA_SONG_NOCTURNE,
-    OCARINA_SONG_PRELUDE
+    OCARINA_SONG_MINUET,  OCARINA_SONG_BOLERO,   OCARINA_SONG_SERENADE,
+    OCARINA_SONG_REQUIEM, OCARINA_SONG_NOCTURNE, OCARINA_SONG_PRELUDE,
 };
 
 static const int entranceIndexMap[] = {
-    ENTR_SACRED_FOREST_MEADOW_WARP_PAD, // Minuet
+    ENTR_SACRED_FOREST_MEADOW_WARP_PAD,  // Minuet
     ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, // Bolero
-    ENTR_LAKE_HYLIA_WARP_PAD, // Serenade
-    ENTR_DESERT_COLOSSUS_WARP_PAD, // Requiem
-    ENTR_GRAVEYARD_WARP_PAD, // Nocturne
-    ENTR_TEMPLE_OF_TIME_WARP_PAD // Prelude
+    ENTR_LAKE_HYLIA_WARP_PAD,            // Serenade
+    ENTR_DESERT_COLOSSUS_WARP_PAD,       // Requiem
+    ENTR_GRAVEYARD_WARP_PAD,             // Nocturne
+    ENTR_TEMPLE_OF_TIME_WARP_PAD,        // Prelude
 };
 
-static const int songAudioMap[] = { 
-    NA_BGM_OCA_MINUET,
-    NA_BGM_OCA_BOLERO,
-    NA_BGM_OCA_SERENADE,
-    NA_BGM_OCA_REQUIEM,
-    NA_BGM_OCA_NOCTURNE,
-    NA_BGM_OCA_LIGHT
+static const int songAudioMap[] = {
+    NA_BGM_OCA_MINUET,  NA_BGM_OCA_BOLERO,   NA_BGM_OCA_SERENADE,
+    NA_BGM_OCA_REQUIEM, NA_BGM_OCA_NOCTURNE, NA_BGM_OCA_LIGHT,
 };
 
-static bool isWarpActive = false; 
+static bool isWarpActive = false;
 
 void PauseWarp_Execute() {
     if (!isWarpActive || gPlayState->msgCtx.msgMode != MSGMODE_NONE) {
         return;
     }
-    isWarpActive = false; 
+    isWarpActive = false;
     GET_PLAYER(gPlayState)->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
     if (gPlayState->msgCtx.choiceIndex != 0) {
         return;
@@ -88,41 +76,42 @@ void PauseWarp_HandleSelection() {
         int song = gPlayState->pauseCtx.cursorPoint[PAUSE_QUEST];
         if (aButtonPressed && CHECK_QUEST_ITEM(song) && song >= QUEST_SONG_MINUET && song <= QUEST_SONG_PRELUDE &&
             gPlayState->pauseCtx.pageIndex == PAUSE_QUEST && gPlayState->pauseCtx.state == 6) {
-            if (gSaveContext.ship.quest.id == QUEST_RANDOMIZER && Randomizer_GetSettingValue(RSK_SHUFFLE_OCARINA_BUTTONS)) {
+            if (gSaveContext.ship.quest.id == QUEST_RANDOMIZER &&
+                Randomizer_GetSettingValue(RSK_SHUFFLE_OCARINA_BUTTONS)) {
                 bool canplay = false;
                 switch (song) {
                     case QUEST_SONG_MINUET:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
                         break;
                     case QUEST_SONG_BOLERO:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
                         break;
                     case QUEST_SONG_SERENADE:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
                         break;
                     case QUEST_SONG_REQUIEM:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
                         break;
                     case QUEST_SONG_NOCTURNE:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_A) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_DOWN);
                         break;
                     case QUEST_SONG_PRELUDE:
                         canplay = Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_LEFT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
-                            Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_RIGHT) &&
+                                  Flags_GetRandomizerInf(RAND_INF_HAS_OCARINA_C_UP);
                         break;
                 }
                 if (!canplay) {
diff --git a/soh/soh/Enhancements/presets.cpp b/soh/soh/Enhancements/presets.cpp
deleted file mode 100644
index 2b1812d216..0000000000
--- a/soh/soh/Enhancements/presets.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "presets.h"
-#include <variant>
-#include <string>
-#include <cstdint>
-#include <libultraship/bridge.h>
-#include "soh/SohGui/UIWidgets.hpp"
-#include <libultraship/libultraship.h>
-
-std::string FormatLocations(std::vector<RandomizerCheck> locs) {
-    std::string locString = "";
-    for (auto loc: locs) {
-        locString += std::to_string(loc) + ",";
-    }
-    return locString;
-}
-
-void applyPreset(std::vector<PresetEntry> entries) {
-    for(auto& [cvar, type, value] : entries) {
-        switch (type) {
-            case PRESET_ENTRY_TYPE_S32:
-                CVarSetInteger(cvar, std::get<int32_t>(value));
-                break;
-            case PRESET_ENTRY_TYPE_FLOAT:
-                CVarSetFloat(cvar, std::get<float>(value));
-                break;
-            case PRESET_ENTRY_TYPE_STRING:
-                CVarSetString(cvar, std::get<const char*>(value));
-                break;
-            case PRESET_ENTRY_TYPE_CPP_STRING:
-                CVarSetString(cvar, std::get<std::string>(value).c_str());
-                break;
-        }
-    }
-}
-
-void DrawPresetSelector(PresetType presetTypeId) {
-    const std::string presetTypeCvar = CVAR_GENERAL("SelectedPresets.") + std::to_string(presetTypeId);
-    const PresetTypeDefinition presetTypeDef = presetTypes.at(presetTypeId);
-    uint16_t selectedPresetId = CVarGetInteger(presetTypeCvar.c_str(), 0);
-    if(selectedPresetId >= presetTypeDef.presets.size()){
-        selectedPresetId = 0;
-    }
-    const PresetDefinition selectedPresetDef = presetTypeDef.presets.at(selectedPresetId);
-    std::string comboboxTooltip = "";
-    for ( auto iter = presetTypeDef.presets.begin(); iter != presetTypeDef.presets.end(); ++iter ) {
-        if (iter->first != 0) comboboxTooltip += "\n\n";
-        comboboxTooltip += std::string(iter->second.label) + " - " + std::string(iter->second.description);
-    }
-
-    UIWidgets::PaddedText("Presets", false, true);
-    if (ImGui::BeginCombo("##PresetsComboBox", selectedPresetDef.label)) {
-        for ( auto iter = presetTypeDef.presets.begin(); iter != presetTypeDef.presets.end(); ++iter ) {
-            if (ImGui::Selectable(iter->second.label, iter->first == selectedPresetId)) {
-                CVarSetInteger(presetTypeCvar.c_str(), iter->first);
-            }
-        }
-
-        ImGui::EndCombo();
-    }
-    UIWidgets::Tooltip(comboboxTooltip.c_str());
-
-    UIWidgets::Spacer(0);
-
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(6.0f, 4.0f));
-    if (ImGui::Button(("Apply Preset##" + presetTypeCvar).c_str())) {
-        for(const char* block : presetTypeDef.blocksToClear) {
-            CVarClearBlock(block);
-        }
-        if (selectedPresetId != 0) {
-            applyPreset(selectedPresetDef.entries);
-        }
-        CVarSetInteger(presetTypeCvar.c_str(), selectedPresetId);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-        if (presetTypeId == PRESET_TYPE_RANDOMIZER){
-            Rando::Settings::GetInstance()->ReloadOptions();
-        }
-    }
-    ImGui::PopStyleVar(1);
-}
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
deleted file mode 100644
index 2922ec589b..0000000000
--- a/soh/soh/Enhancements/presets.h
+++ /dev/null
@@ -1,907 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-#include <variant>
-#include <cstdint>
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include "soh/Enhancements/enhancementTypes.h"
-#include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
-
-enum PresetEntryType {
-    PRESET_ENTRY_TYPE_S32,
-    PRESET_ENTRY_TYPE_FLOAT,
-    PRESET_ENTRY_TYPE_STRING,
-    PRESET_ENTRY_TYPE_CPP_STRING,
-};
-
-enum PresetType {
-    PRESET_TYPE_ENHANCEMENTS,
-    PRESET_TYPE_RANDOMIZER,
-};
-
-enum EnhancementPreset {
-    ENHANCEMENT_PRESET_DEFAULT,
-    ENHANCEMENT_PRESET_VANILLA_PLUS,
-    ENHANCEMENT_PRESET_ENHANCED,
-    ENHANCEMENT_PRESET_RANDOMIZER,
-};
-
-enum RandomizerPreset {
-    RANDOMIZER_PRESET_DEFAULT,
-    RANDOMIZER_PRESET_SPOCK_RACE,
-    RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC,
-    RANDOMIZER_PRESET_S6,
-    RANDOMIZER_PRESET_HELL_MODE,
-    RANDOMIZER_PRESET_BENCHMARK,
-};
-
-typedef struct PresetEntry {
-    const char* cvar;
-    PresetEntryType type;
-    std::variant<int32_t, float, const char*, std::string> value;
-} PresetEntry;
-
-std::string FormatLocations(std::vector<RandomizerCheck> locs);
-
-#define PRESET_ENTRY_S32(cvar, value) \
-    { cvar,    PRESET_ENTRY_TYPE_S32, value }
-#define PRESET_ENTRY_FLOAT(cvar, value) \
-    { cvar,  PRESET_ENTRY_TYPE_FLOAT, value }
-#define PRESET_ENTRY_STRING(cvar, value) \
-    { cvar, PRESET_ENTRY_TYPE_STRING, value }
-#define PRESET_ENTRY_CPP_STRING(cvar, value) \
-    { cvar, PRESET_ENTRY_TYPE_CPP_STRING, value }
-
-void DrawPresetSelector(PresetType presetType);
-void clearCvars(std::vector<const char*> cvarsToClear);
-void applyPreset(std::vector<PresetEntry> entries);
-
-// TODO: Ideally everything below this point will come from one/many JSON files
-
-const std::vector<PresetEntry> vanillaPlusPresetEntries = {
-    // D-pad Support in text and file select
-    PRESET_ENTRY_S32(CVAR_SETTING("DpadInText"), 1),
-    // Play Ocarina with D-pad
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.Dpad"), 1),
-    // Play Ocarina with Right Stick
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.RStick"), 1),
-    // D-pad as Equip Items
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadEquips"), 1),
-    // Prevent Dropped Ocarina Inputs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), 1),
-
-    // Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TextSpeed"), 5),
-    // Slow Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SlowTextSpeed"), 5),
-    // Skip Text
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipText"), 1),
-    // King Zora Speed (1 to 5)
-    PRESET_ENTRY_FLOAT(CVAR_ENHANCEMENT("MweepSpeed"), 2.0f),
-    // Faster Block Push (+0 to +5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
-    // Better Owl
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BetterOwl"), 1),
-
-    // Assignable Tunics and Boots
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 1),
-    // Enable passage of time on file select
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TimeFlowFileSelect"), 1),
-    // Inject Item Counts in messages
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 1),
-
-    // Dynamic Wallet Icon
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DynamicWalletIcon"), 1),
-    // Always show dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), 1),
-
-    // Fix L&R Pause menu
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
-    // Fix Dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
-    // Fix Two Handed idle animations
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
-    // Fix the Gravedigging Tour Glitch
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GravediggingTourFix"), 1),
-    // Fix Deku Nut upgrade
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    // Fix Navi text HUD position
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
-    // Extend Silver Rupee Jingle
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), 1),
-    // Fix some Floor Switches
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixFloorSwitches"), 1),
-
-    // Red Ganon blood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("RedGanonBlood"), 1),
-    // Fish while hovering
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("HoverFishing"), 1),
-    // N64 Weird Frames
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("N64WeirdFrames"), 1),
-    // Bombchus out of bounds
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BombchusOOB"), 1),
-    // Quick Putaway
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("QuickPutaway"), 1),
-    // Skip save confirmation
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 1),
-};
-
-const std::vector<PresetEntry> enhancedPresetEntries = {
-    // D-pad Support in text and file select
-    PRESET_ENTRY_S32(CVAR_SETTING("DpadInText"), 1),
-    // Play Ocarina with D-pad
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.Dpad"), 1),
-    // Play Ocarina with Right Stick
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.RStick"), 1),
-    // D-pad as Equip Items
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadEquips"), 1),
-    // Prevent Dropped Ocarina Inputs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), 1),
-
-    // Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TextSpeed"), 5),
-    // Slow Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SlowTextSpeed"), 5),
-    // Skip Text
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipText"), 1),
-    // King Zora Speed (1 to 5)
-    PRESET_ENTRY_FLOAT(CVAR_ENHANCEMENT("MweepSpeed"), 5.0f),
-    // Faster Block Push (+0 to +5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
-    // Better Owl
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BetterOwl"), 1),
-
-    // Assignable Tunics and Boots
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 1),
-    // Enable passage of time on file select
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TimeFlowFileSelect"), 1),
-    // Inject Item Counts in messages
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 1),
-
-    // Dynamic Wallet Icon
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DynamicWalletIcon"), 1),
-    // Always show dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), 1),
-
-    // Fix L&R Pause menu
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
-    // Fix Dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
-    // Fix Two Handed idle animations
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
-    // Fix the Gravedigging Tour Glitch
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GravediggingTourFix"), 1),
-    // Fix Deku Nut upgrade
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    // Fix Navi text HUD position
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
-    // Extend Silver Rupee Jingle
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), 1),
-    // Fix enemies not spawning on ground over water
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
-    // Fix some Floor Switches
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixFloorSwitches"), 1),
-
-    // Red Ganon blood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("RedGanonBlood"), 1),
-    // Fish while hovering
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("HoverFishing"), 1),
-    // N64 Weird Frames
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("N64WeirdFrames"), 1),
-    // Bombchus out of bounds
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BombchusOOB"), 1),
-    // Quick Putaway
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("QuickPutaway"), 1),
-    // Skip save confirmation
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 1),
-    // Biggoron Forge Time (0 to 3)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ForgeTime"), 0),
-    // Vine/Ladder Climb speed (+0 to +12)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ClimbSpeed"), 3),
-    // Faster Heavy Block Lift
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 1),
-    // No Forced Navi
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoForcedNavi"), 1),
-    // No Skulltula Freeze
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkulltulaFreeze"), 1),
-    // MM Bunny Hood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST_AND_JUMP),
-    // Adult Bunny Hood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    // Fast Chests
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    // Fast Drops
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastDrops"), 1),
-    // Fast Ocarina Playback
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 1),
-    // Instant Putaway
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantPutaway"), 1),
-    // Instant Boomerang Recall
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastBoomerang"), 1),
-    // Nuts Explode Bombs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NutsExplodeBombs"), 1),
-    // Ask to Equip New Items
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AskToEquip"), 1),
-    // Mask Select in Inventory
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MaskSelect"), 1),
-    // Always Win Goron Pot
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GoronPot"), 1),
-    // Always Win Dampe Digging
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeWin"), 1),
-    // Skip Magic Arrow Equip Animation
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipArrowAnimation"), 1),
-
-    // Equip arrows on multiple slots
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
-
-    // Disable Navi Call Audio
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
-
-    // Equipment Toggle
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
-    // Link's Cow in Both Time Periods
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CowOfTime"), 1),
-
-    // Enable 3D Dropped items/projectiles
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NewDrops"), 1),
-
-    // Fix Anubis fireballs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AnubisFix"), 1),
-
-    // Autosave
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("Autosave"), 1),
-
-    // Bombchu shop doesn't sell out, and 10 bombchus cost 99 instead of 100
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BetterBombchuShopping"), 1),
-};
-
-const std::vector<PresetEntry> randomizerPresetEntries = {
-    // D-pad Support in text and file select
-    PRESET_ENTRY_S32(CVAR_SETTING("DpadInText"), 1),
-    // Play Ocarina with D-pad
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.Dpad"), 1),
-    // Play Ocarina with Right Stick
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.RStick"), 1),
-    // D-pad as Equip Items
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadEquips"), 1),
-    // Prevent Dropped Ocarina Inputs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), 1),
-
-    // Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TextSpeed"), 5),
-    // Slow Text Speed (1 to 5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SlowTextSpeed"), 5),
-    // Skip Text
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipText"), 1),
-    // King Zora Speed (1 to 5)
-    PRESET_ENTRY_FLOAT(CVAR_ENHANCEMENT("MweepSpeed"), 5.0f),
-    // Faster Block Push (+0 to +5)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
-    // Better Owl
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BetterOwl"), 1),
-
-    // Assignable Tunics and Boots
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 1),
-    // Enable passage of time on file select
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TimeFlowFileSelect"), 1),
-    // Inject Item Counts in messages
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 1),
-
-    // Dynamic Wallet Icon
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DynamicWalletIcon"), 1),
-    // Always show dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), 1),
-
-    // Fix L&R Pause menu
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
-    // Fix Dungeon entrances
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
-    // Fix Two Handed idle animations
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
-    // Fix the Gravedigging Tour Glitch
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GravediggingTourFix"), 1),
-    // Fix Deku Nut upgrade
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    // Fix Navi text HUD position
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
-    // Extend Silver Rupee Jingle
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), 1),
-    // Fix some Floor Switches
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixFloorSwitches"), 1),
-
-    // Red Ganon blood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("RedGanonBlood"), 1),
-    // Fish while hovering
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("HoverFishing"), 1),
-    // N64 Weird Frames
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("N64WeirdFrames"), 1),
-    // Bombchus out of bounds
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("BombchusOOB"), 1),
-    // Quick Putaway
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("QuickPutaway"), 1),
-    // Skip save confirmation
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 1),
-    // Biggoron Forge Time (0 to 3)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ForgeTime"), 0),
-    // Vine/Ladder Climb speed (+0 to +12)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ClimbSpeed"), 3),
-    // Faster Heavy Block Lift
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 1),
-    // No Forced Navi
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoForcedNavi"), 1),
-    // No Skulltula Freeze
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkulltulaFreeze"), 1),
-    // MM Bunny Hood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST_AND_JUMP),
-    // Adult Bunny Hood
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    // Fast Chests
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    // Fast Drops
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastDrops"), 1),
-    // Fast Ocarina Playback
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 1),
-    // Instant Putaway
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantPutaway"), 1),
-    // Instant Boomerang Recall
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastBoomerang"), 1),
-    // Nuts Explode Bombs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NutsExplodeBombs"), 1),
-    // Ask to Equip New Items
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AskToEquip"), 1),
-    // Mask Select in Inventory
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MaskSelect"), 1),
-    // Always Win Goron Pot
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GoronPot"), 1),
-    // Always Win Dampe Digging
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeWin"), 1),
-    // Skip Magic Arrow Equip Animation
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipArrowAnimation"), 1),
-    // Exit Market at Night
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MarketSneak"), 1),
-
-    // Equip arrows on multiple slots
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
-
-    // Disable Navi Call Audio
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
-
-    // Equipment Toggle
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
-    // Link's Cow in Both Time Periods
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CowOfTime"), 1),
-
-    // Enable 3D Dropped items/projectiles
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NewDrops"), 1),
-
-    // Fix Anubis fireballs
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AnubisFix"), 1),
-
-    // Autosave
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("Autosave"), 1),
-
-    // Customize Fishing Behaviour
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeFishing"), 1),
-    // Guarantee Bite
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GuaranteeFishingBite"), 1),
-    // Fish Never Escape
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FishNeverEscape"), 1),
-    // Child Minimum Weight (6 to 10)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3),
-    // Adult Minimum Weight (8 to 13)
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6),
-
-    // Customize Lost Woods Ocarina Game Behavior
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 1),
-    // Start With Five Notes
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"), 5),
-    // Round One Notes
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("OcarinaGame.RoundOneNotes"), 5),
-
-    // Visual Stone of Agony
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("VisualAgony"), 1),
-    // Pull grave during the day
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DayGravePull"), 1),
-    // Pull out Ocarina to Summon Scarecrow
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantScarecrow"), 1),
-    // Chest size & texture matches contents
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_BOTH),
-
-    // Color Temple of Time's Medallions
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ToTMedallionsColors"), 1),
-
-    // Frames to wait
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinFrameCount"), 200),
-
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoInputForCredits"), 1),
-
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastFarores"), 1),
-};
-
-const std::vector<PresetEntry> spockRacePresetEntries = {
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LogicRules"), 0),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TextSpeed"), 5),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SlowTextSpeed"), 5),
-    PRESET_ENTRY_FLOAT(CVAR_ENHANCEMENT("MweepSpeed"), 5.0f),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ClimbSpeed"), 4),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoForcedNavi"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastDrops"), 1),
-    PRESET_ENTRY_S32(CVAR_SETTING("DpadInText"), 1),
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.Dpad"), 1),
-    PRESET_ENTRY_S32(CVAR_SETTING("OcarinaControl.RStick"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadEquips"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantScarecrow"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MarketSneak"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantPutaway"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastBoomerang"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DayGravePull"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NewDrops"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CreditsFix"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkipText"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkulltulaFreeze"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("PauseAnyCursor"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastFarores"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoInputForCredits"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MaskSelect"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeFishing"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FishNeverEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantFishing"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GuaranteeFishingBite"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GoronPot"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ForgeTime"), 0),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeAllNight"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("10GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("20GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("30GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("40GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchuBag"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DampeHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), 1),
-    PRESET_ENTRY_CPP_STRING(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), FormatLocations( 
-        { RC_MARKET_10_BIG_POES, RC_KAK_40_GOLD_SKULLTULA_REWARD, RC_KAK_50_GOLD_SKULLTULA_REWARD, RC_ZR_FROGS_OCARINA_GAME })),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FullWallets"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SKIP),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_FAST),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GregHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LacsRewardCount"), 5),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_GREG),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_BALANCED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_REWARDS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_COUNT),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_ALL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsPrice"), RO_PRICE_FIXED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsFixedPrice"), 10),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildStealth"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipTowerEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingConsumables"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_STARTWITH),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingOcarina"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SunlightArrows"), 1),
-};
-
-const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ClimbSpeed"), 4),
-    PRESET_ENTRY_S32(CVAR_COSMETIC("Goron.NeckLength"), 1000),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CreditsFix"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeFishing"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeAllNight"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DayGravePull"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastBoomerang"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastDrops"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastFarores"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FishNeverEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ForgeTime"), 0),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GoronPot"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GuaranteeFishingBite"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantFishing"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantPutaway"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MarketSneak"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MaskSelect"), 1),
-    PRESET_ENTRY_FLOAT(CVAR_ENHANCEMENT("MweepSpeed"), 5.0f),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoForcedNavi"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoInputForCredits"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("PauseAnyCursor"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("10GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("20GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("30GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("40GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchuBag"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DampeHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), 1),
-    PRESET_ENTRY_CPP_STRING(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), FormatLocations(
-        { RC_MARKET_10_BIG_POES, RC_KAK_40_GOLD_SKULLTULA_REWARD, RC_KAK_50_GOLD_SKULLTULA_REWARD, RC_ZR_FROGS_OCARINA_GAME })),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FullWallets"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SKIP),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_FAST),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GregHint"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Keysanity"), RO_DUNGEON_ITEM_LOC_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LacsRewardCount"), 5),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_NO_LOGIC),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_GREG),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_BALANCED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_BEANS_ONLY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchantPrices"), RO_PRICE_VANILLA),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_REWARDS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_COUNT),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_ALL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildStealth"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipTowerEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingConsumables"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_STARTWITH),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingOcarina"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SunlightArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("InstantScarecrow"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SkulltulaFreeze"), 1),
-};
-
-const std::vector<PresetEntry> s6PresetEntries = {
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_BOTH),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 4),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_OPEN),
-    PRESET_ENTRY_CPP_STRING(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), FormatLocations({ RC_DEKU_THEATER_MASK_OF_TRUTH })),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_DEKU_ONLY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SKIP),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_FAST),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IceTraps"), RO_ICE_TRAPS_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MedallionCount"), 6),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_MEDALLIONS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_STARTWITH),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpawns"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildStealth"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipTowerEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SleepingWaterfall"), RO_WATERFALL_CLOSED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingAge"), RO_AGE_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingConsumables"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingDekuShield"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_STARTWITH),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingOcarina"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ZorasFountain"), RO_ZF_CLOSED),
-};
-
-const std::vector<PresetEntry> hellModePresetEntries = {
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_BOTH),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_FAST),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("AdultMasks"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SET_NUMBER),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrialCount"), 6),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IceTraps"), RO_ICE_TRAPS_ONSLAUGHT),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ItemPool"), RO_ITEM_POOL_MINIMAL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Keysanity"), RO_DUNGEON_ITEM_LOC_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_NOTHING),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_RANDOM_NUMBER),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_DUNGEON_REWARDS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_SPECIFIC_COUNT),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityCount"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_RANGE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange1"), 0),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityPriceRange2"), 999),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_BEANS_ONLY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMerchantPrices"), RO_PRICE_VANILLA),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleCows"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_DUNGEONS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_ALL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubsPrice"), RO_PRICE_CHEAP_BALANCED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_ALL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildStealth"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipTowerEscape"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SleepingWaterfall"), RO_WATERFALL_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingAge"), RO_AGE_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SunlightArrows"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ZorasFountain"), RO_ZF_OPEN),
-};
-
-const std::vector<PresetEntry> BenchmarkPresetEntries = {
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_DEKU_ONLY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("KakarikoGate"), RO_KAK_GATE_OPEN),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_SONGONLY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SleepingWaterfall"), RO_WATERFALL_CLOSED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ZorasFountain"), RO_ZF_CLOSED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_DUNGEON_REWARDS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("RewardCount"), 5),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), RO_BRIDGE_GREG_REWARD),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SET_NUMBER),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanonTrialCount"), 6),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingAge"), RO_AGE_RANDOM),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleInteriorsEntrances"), RO_INTERIOR_ENTRANCE_SHUFFLE_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleWarpSongs"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOverworldSpawns"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DecoupleEntrances"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BombchusInLogic"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("EnableBombchuDrops"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("TriforceHunt"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_RANDOM_NUMBER),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MQDungeonsSelection"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LinksPocket"), RO_LINKS_POCKET_DUNGEON_REWARD),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shopsanity"), RO_SHOPSANITY_SPECIFIC_COUNT),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShopsanityCount"), RO_SHOPSANITY_COUNT_FOUR_ITEMS),
-    //RANDOTODO add refactored price/scrub/merchant settings
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKokiriSword"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleMasterSword"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleChildWallet"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleOcarinaButtons"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleSwim"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleFrogSongRupees"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleBossSouls"), RO_BOSS_SOULS_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDekuStickBag"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleDekuNutBag"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_BOTH),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_ANYWHERE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_LACS_MEDALLIONS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LacsMedallionCount"), 6),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), RO_KEYRINGS_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipChildZelda"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipEponaRace"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), 1),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 4),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GossipStoneHints"), RO_GOSSIP_STONES_NEED_NOTHING),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HintClarity"), RO_HINT_CLARITY_CLEAR),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HintDistribution"), RO_HINT_DIST_STRONG),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AltarHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GanondorfHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SheikLAHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("DampeHint"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GregHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SariaHint"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FrogsHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("OoTHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BiggoronHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BigPoesHint"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ChickensHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MalonHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("HBAHint"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("WarpSongText"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ScrubText"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("10GSHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("20GSHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("30GSHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("40GSHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("50GSHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("MaskShopHint"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("BlueFireArrows"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SunlightArrows"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("InfiniteUpgrades"), RO_INF_UPGRADES_PROGRESSIVE),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("SkeletonKey"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("ItemPool"), RO_ITEM_POOL_BALANCED),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("IceTraps"), RO_ICE_TRAPS_NORMAL),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingOcarina"), RO_STARTING_OCARINA_FAIRY),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingDekuShield"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingKokiriSword"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMasterSword"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingConsumables"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("FullWallets"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingZeldasLullaby"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingEponasSong"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSariasSong"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSunsSong"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSongOfTime"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSongOfStorms"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingMinuetOfForest"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingBoleroOfFire"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSerenadeOfWater"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingRequiemOfSpirit"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingNocturneOfShadow"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingPreludeOfLight"), RO_GENERIC_OFF),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("StartingSkulltulaToken"), 0),
-    PRESET_ENTRY_S32("gRandomizeStartingHearts", 2),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("AllLocationsReachable"), RO_GENERIC_ON),
-    PRESET_ENTRY_S32(CVAR_RANDOMIZER_SETTING("GsExpectSunsSong"), RO_GENERIC_ON),
-};
-
-typedef struct PresetDefinition {
-    const char* label;
-    const char* description;
-    std::vector<PresetEntry> entries;
-} PresetDefinition;
-
-typedef struct PresetTypeDefinition {
-    std::vector<const char*> blocksToClear;
-    std::map<uint16_t, PresetDefinition> presets;
-} PresetTypeDefinition;
-
-const std::map<PresetType, PresetTypeDefinition> presetTypes = {
-    { PRESET_TYPE_ENHANCEMENTS, { { CVAR_PREFIX_ENHANCEMENT, CVAR_PREFIX_CHEAT }, {
-        { ENHANCEMENT_PRESET_DEFAULT, {
-            "Default",
-            "Reset all options to their default values.",
-            {},
-        } },
-        { ENHANCEMENT_PRESET_VANILLA_PLUS, {
-            "Vanilla Plus",
-            "Adds Quality of Life features that enhance your experience, but don't alter gameplay. Recommended for a first playthrough of OoT.",
-            vanillaPlusPresetEntries,
-        } },
-        { ENHANCEMENT_PRESET_ENHANCED, {
-            "Enhanced",
-            "The \"Vanilla Plus\" preset, but with more quality of life enhancements that might alter gameplay slightly. Recommended for returning players.",
-            enhancedPresetEntries
-        } },
-        { ENHANCEMENT_PRESET_RANDOMIZER, {
-            "Randomizer",
-            "The \"Enhanced\" preset, plus any other enhancements that are recommended for playing Randomizer.",
-            randomizerPresetEntries
-        } },
-    } } },
-    { PRESET_TYPE_RANDOMIZER, { { CVAR_PREFIX_RANDOMIZER_SETTING, CVAR_PREFIX_RANDOMIZER_ENHANCEMENT }, {
-        { RANDOMIZER_PRESET_DEFAULT, {
-            "Default",
-            "Reset all options to their default values.",
-            {},
-        } },
-        { RANDOMIZER_PRESET_SPOCK_RACE, {
-            "Spock Race",
-            "Race preset used for the official Ship of Harkinian race on June 3rd 2023. The following settings are notable:\n" \
-            "- Rainbow Bridge is set to Greg\n" \
-            "- Ganon's Boss Key is 5 dungeon rewards\n" \
-            "- Shopsanity and Scrubsanity enabled\n" \
-            "- All locations reachable is off\n", \
-            spockRacePresetEntries,
-        } },
-        { RANDOMIZER_PRESET_SPOCK_RACE_NO_LOGIC, {
-                "Spock Race - No Logic",
-                "No Logic Race preset used for official Ship of Harkinian No Logic races. The following settings are "
-                "notable:\n"
-                "- Rainbow Bridge is set to Greg\n"
-                "- Ganon's Boss Key is 5 dungeon rewards\n"
-                "- Shopsanity and Scrubsanity enabled\n"
-                "- All locations reachable is off\n",
-                spockRaceNoLogicPresetEntries,
-            } },
-        { RANDOMIZER_PRESET_S6, {
-            "S6 Tournament (Adapted)",
-            "Matches OOTR S6 tournament settings as close as we can get with the options available in SoH. The following differences are notable:\n" \
-            "- Both child and adult overworld spawns are randomized\n" \
-            "- Dungeon rewards are shuffled at the end of dungeons, rather than at the end of their own dungeon\n" \
-            "- Full adult trade sequence is shuffled instead of the selected 4\n" \
-            "- Hint distribution no \"tournament\" mode, falling back to balanced",
-            s6PresetEntries,
-        } },
-        { RANDOMIZER_PRESET_HELL_MODE, {
-            "Hell Mode",
-            "All settings maxed but still using glitchless logic. Expect pain.",
-            hellModePresetEntries
-        } },
-        { RANDOMIZER_PRESET_BENCHMARK, {
-            "Benchmark",
-            "Used for benchmarking the logic.",
-            BenchmarkPresetEntries
-        } },
-    } } }
-};
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
index 179987dcc3..cec16a468f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp
@@ -2,292 +2,79 @@
 #include "../../custom-message/CustomMessageManager.h"
 #include "z64item.h"
 
-#include <array>
-#include <set>
-#include <sstream>
-
 namespace CustomMessages {
-
 using namespace std::literals::string_literals;
 
-class MessageEntryComp {
-public:
-    bool operator()(const MessageEntry& lhs, const MessageEntry& rhs) const {
-        return lhs.id < rhs.id;
-    }
-};
-
-constexpr std::array EnglishDungeonNames = {
-    "Deku Tree",
-    "Dodongo's Cavern",
-    "Jabu Jabu's Belly",
-    "Forest Temple",
-    "Fire Temple",
-    "Water Temple",
-    "Spirit Temple",
-    "Shadow Temple",
-    "Bottom of the Well",
-    "Ice Cavern",
-    "Ganon's Tower",
-    "Gerudo Training Ground",
-    "Gerudo Fortress",
-    "Ganon's Castle",
-};
-
-constexpr std::array FrenchDungeonNames = {
-    "Vénérable Arbre Mojo",
-    "Caverne Dodongo",
-    "Ventre de Jabu-Jabu",
-    "Temple de la Forêt",
-    "Temple du Feu",
-    "Temple de l'Eau",
-    "Temple de l'Esprit",
-    "Temple de l'Ombre",
-    "Puits",
-    "Caverne Polaire",
-    "Tour de Ganon",
-    "Gymnase Gerudo",
-    "Repaire des Voleurs",
-    "Château de Ganon",
-};
-
-constexpr std::array FrenchDungeonArticles = {
-    "du ",
-    "de la ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "de la ",
-    "",
-    "du ",
-    "de la ",
-    "du ",
-};
-
-constexpr std::array SpanishDungeonNames = {
-    "Gran Árbol Deku",
-    "Cueva de los Dodongos",
-    "Tripa de Jabu-Jabu",
-    "Templo del Bosque",
-    "Templo del Fuego",
-    "Templo del Agua",
-    "Templo del Espíritu",
-    "Templo de las Sombras",
-    "Fondo del pozo",
-    "Caverna de hielo",
-    "Torre de Ganon",
-    "Centro de Instrucción Gerudo",
-    "Fortaleza Gerudo",
-    "Castillo de Ganon",
-};
-
-constexpr std::array SpanishDungeonArticles = {
-    "del",
-    "de la",
-    "de la",
-    "del",
-    "del",
-    "del",
-    "del",
-    "del",
-    "del",
-    "de la",
-    "de la",
-    "del",
-    "de la",
-    "del",
-};
-
-constexpr std::array DungeonColors = {
-    QM_GREEN,
-    QM_RED,
-    QM_BLUE,
-    QM_GREEN,
-    QM_RED,
-    QM_BLUE,
-    QM_YELLOW,
-    QM_PINK,
-    QM_PINK,
-    QM_LBLUE,
-    QM_BLACK,
-    QM_YELLOW,
-    QM_YELLOW,
-    QM_RED,
-};
-
-    std::set<MessageEntry, MessageEntryComp> messageEntries;
-    std::stringstream messageData;
-
-    //textBoxType and textBoxPosition are defined here: https://wiki.cloudmodding.com/oot/Text_Format#Message_Id
-    void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition,
-                       std::string englishText, std::string frenchText, std::string spanishText) {
-            MessageEntry newEntry = { textId, unk_04, textBoxType, textBoxPosition, { 0 } };
-
-            while ((englishText.size() % 4) != 0) {
-              englishText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[ENGLISH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[ENGLISH_U].length = englishText.size();
-            messageData << englishText;
-
-            while ((frenchText.size() % 4) != 0) {
-              frenchText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[FRENCH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[FRENCH_U].length = frenchText.size();
-            messageData << frenchText;
-
-            while ((spanishText.size() % 4) != 0) {
-              spanishText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[SPANISH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[SPANISH_U].length = spanishText.size();
-            messageData << spanishText;
-
-            messageEntries.insert(newEntry);
-    }
-
-    void CreateMessageFromTextObject(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, const Text& text) {
-        CreateMessage(textId, unk_04, textBoxType, textBoxPosition, text.GetEnglish(), text.GetFrench(), text.GetSpanish());
-    }
-
-    Text AddColorsAndFormat(Text text, const std::vector<std::string>& colors /*= {}*/) {
-
-      //for each language
-      for (std::string* textStr : {&text.english, &text.french, &text.spanish}) {
-
-        //insert playername
-        size_t atSymbol = textStr->find('@');
-        while (atSymbol != std::string::npos) {
-          textStr->replace(atSymbol, 1, PLAYER_NAME());
-          atSymbol = textStr->find('@');
-        }
-        //insert newlines either manually or when encountering a '&'
-        constexpr size_t lineLength = 44;
-        size_t lastNewline = 0;
-        while (lastNewline + lineLength < textStr->length()) {
-          size_t carrot     = textStr->find('^', lastNewline);
-          size_t ampersand  = textStr->find('&', lastNewline);
-          size_t lastSpace  = textStr->rfind(' ', lastNewline + lineLength);
-          size_t lastPeriod = textStr->rfind('.', lastNewline + lineLength);
-          //replace '&' first if it's within the newline range
-          if (ampersand < lastNewline + lineLength) {
-            textStr->replace(ampersand, 1, NEWLINE());
-            lastNewline = ampersand + NEWLINE().length();
-          //or move the lastNewline cursor to the next line if a '^' is encountered
-          } else if (carrot < lastNewline + lineLength) {
-            lastNewline = carrot + 1;
-          //some lines need to be split but don't have spaces, look for periods instead
-          } else if (lastSpace == std::string::npos) {
-            textStr->replace(lastPeriod, 1, "."+NEWLINE());
-            lastNewline = lastPeriod + NEWLINE().length() + 1;
-          } else {
-            textStr->replace(lastSpace, 1, NEWLINE());
-            lastNewline = lastSpace + NEWLINE().length();
-          }
-        }
-        //clean up any remaining '&' characters
-        size_t ampersand = textStr->find('&');
-        while (ampersand != std::string::npos) {
-          textStr->replace(ampersand, 1, NEWLINE());
-          ampersand = textStr->find('&');
-        }
-
-        //insert box break
-        size_t carrotSymbol = textStr->find('^');
-        while (carrotSymbol != std::string::npos) {
-          textStr->replace(carrotSymbol, 1, INSTANT_TEXT_OFF()+WAIT_FOR_INPUT()+INSTANT_TEXT_ON());
-          carrotSymbol = textStr->find('^');
-        }
-
-        //If there's a two-way choice and only 1 newline before it in the same text box, add another one
-        size_t choice = textStr->find(TWO_WAY_CHOICE());
-        if (choice != std::string::npos) {
-          size_t newLinesCount = 0;
-          size_t lastBoxBreak = textStr->rfind(WAIT_FOR_INPUT(), choice);
-          lastNewline = choice;
-
-          if (lastBoxBreak == std::string::npos) {
-            lastBoxBreak = 0;
-          }
-
-          while ((lastNewline != std::string::npos)) {
-            lastNewline = textStr->rfind(NEWLINE(), lastNewline - 1);
-            if (lastNewline != std::string::npos && lastNewline > lastBoxBreak) {
-                newLinesCount++;
-            } else {
-                break;
-            }
-          }
-
-          if (newLinesCount <= 1) {
-              textStr->replace(choice, TWO_WAY_CHOICE().length(), NEWLINE()+TWO_WAY_CHOICE());
-          }
-        }
-
-        //add colors
-        for (auto color : colors) {
-          size_t firstHashtag = textStr->find('#');
-          if (firstHashtag != std::string::npos) {
-              textStr->replace(firstHashtag, 1, COLOR(color));
-              size_t secondHashtag = textStr->find('#');
-              if (secondHashtag == std::string::npos) {
-                //CitraPrint("ERROR: Couldn't find second '#' in " + (*textStr));
-              } else {
-                textStr->replace(secondHashtag, 1, COLOR(QM_WHITE));
-              }
-          }
-        }
-      }
-      return Text{"","",""}+UNSKIPPABLE()+INSTANT_TEXT_ON()+text+INSTANT_TEXT_OFF()+MESSAGE_END();
-    }
-
-    void ClearMessages() {
-        messageEntries.clear();
-        messageData.str("");
-    }
-
-    std::string MESSAGE_END()          { return  "\x7F\x00"s; }
-    std::string WAIT_FOR_INPUT()       { return  "\x7F\x01"s; }
-    std::string HORIZONTAL_SPACE(uint8_t x) {
-        return "\x7F\x02"s + char(x);
-    }
-    std::string GO_TO(uint16_t x) {
-        return "\x7F\x03"s + char(x >> 8) + char(x & 0x00FF);
-    }
-    std::string INSTANT_TEXT_ON()      { return  "\x7F\x04"s; }
-    std::string INSTANT_TEXT_OFF()     { return  "\x7F\x05"s; }
-    std::string SHOP_MESSAGE_BOX()     { return  "\x7F\x06\x00"s; }
-    std::string EVENT_TRIGGER()        { return  "\x7F\x07"s; }
-    std::string DELAY_FRAMES(uint8_t x) {
-        return "\x7F\x08"s + char(x);
-    }
-    std::string CLOSE_AFTER(uint8_t x) {
-        return "\x7F\x0A"s + char(x);
-    }
-    std::string PLAYER_NAME()          { return  "\x7F\x0B"s; }
-    std::string PLAY_OCARINA()         { return  "\x7F\x0C"s; }
-    std::string ITEM_OBTAINED(uint8_t x) {
-        return "\x7F\x0F"s + char(x);
-    }
-    std::string SET_SPEED(uint8_t x) {
-        return "\x7F\x10"s + char(x);
-    }
-    std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; } //RANDOTODO just refernce the versions in CustomMessage
-    std::string CURRENT_TIME()         { return  "\x7F\x17"s; }
-    std::string UNSKIPPABLE()          { return  "\x7F\x19"s; }
-    std::string TWO_WAY_CHOICE()       { return  "\x1B"s; }
-    std::string NEWLINE()              { return  "\x7F\x1C"s; }
-    std::string COLOR(std::string x)   { return  "\x7F\x1D"s + x; }
-    std::string CENTER_TEXT()          { return  "\x7F\x1E"s; }
-    std::string IF_NOT_MQ()            { return  "\x7F\x29"s; }
-    std::string MQ_ELSE()              { return  "\x7F\x2A"s; }
-    std::string MQ_END()               { return  "\x7F\x2B"s; }
+std::string MESSAGE_END() {
+    return "\x7F\x00"s;
 }
+std::string WAIT_FOR_INPUT() {
+    return "\x7F\x01"s;
+}
+std::string HORIZONTAL_SPACE(uint8_t x) {
+    return "\x7F\x02"s + char(x);
+}
+std::string GO_TO(uint16_t x) {
+    return "\x7F\x03"s + char(x >> 8) + char(x & 0x00FF);
+}
+std::string INSTANT_TEXT_ON() {
+    return "\x7F\x04"s;
+}
+std::string INSTANT_TEXT_OFF() {
+    return "\x7F\x05"s;
+}
+std::string SHOP_MESSAGE_BOX() {
+    return "\x7F\x06\x00"s;
+}
+std::string EVENT_TRIGGER() {
+    return "\x7F\x07"s;
+}
+std::string DELAY_FRAMES(uint8_t x) {
+    return "\x7F\x08"s + char(x);
+}
+std::string CLOSE_AFTER(uint8_t x) {
+    return "\x7F\x0A"s + char(x);
+}
+std::string PLAYER_NAME() {
+    return "\x7F\x0B"s;
+}
+std::string PLAY_OCARINA() {
+    return "\x7F\x0C"s;
+}
+std::string ITEM_OBTAINED(uint8_t x) {
+    return "\x7F\x0F"s + char(x);
+}
+std::string SET_SPEED(uint8_t x) {
+    return "\x7F\x10"s + char(x);
+}
+std::string SKULLTULAS_DESTROYED() {
+    return "\x7F\x15"s;
+}
+std::string CURRENT_TIME() {
+    return "\x7F\x17"s;
+}
+std::string UNSKIPPABLE() {
+    return "\x7F\x19"s;
+}
+std::string TWO_WAY_CHOICE() {
+    return "\x1B"s;
+}
+std::string NEWLINE() {
+    return "\x7F\x1C"s;
+}
+std::string COLOR(std::string x) {
+    return "\x7F\x1D"s + x;
+}
+std::string CENTER_TEXT() {
+    return "\x7F\x1E"s;
+}
+std::string IF_NOT_MQ() {
+    return "\x7F\x29"s;
+}
+std::string MQ_ELSE() {
+    return "\x7F\x2A"s;
+}
+std::string MQ_END() {
+    return "\x7F\x2B"s;
+}
+} // namespace CustomMessages
diff --git a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
index b9d2a08c63..71a0e66b0d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
@@ -1,72 +1,33 @@
 #pragma once
 
 #include <string>
-#include <utility>
-#include <vector>
 #include <cstdint>
 
 #include "text.hpp"
 
 namespace CustomMessages {
-typedef struct {
-    // In the true file format, offset is the offset into the QM file.
-    // In randomizer, offset will be a pointer to the text in the game's address space.
-    // Since these pointers will be much larger as u32 than the original script's offsets,
-    // We will be able to distinguish between original and custom text using their numerical value.
-    const char* offset;
-    uint32_t length;
-} MessageLanguageInfo;
-
-typedef enum {
-    /* 0x00 */ JAPANESE_J,
-    /* 0x01 */ ENGLISH_U,
-    /* 0x02 */ ENGLISH_E,
-    /* 0x03 */ GERMAN_E,
-    /* 0x04 */ FRENCH_E,
-    /* 0x05 */ FRENCH_U,
-    /* 0x06 */ SPANISH_E,
-    /* 0x07 */ SPANISH_U,
-    /* 0x08 */ ITALIAN_E,
-    /* 0x09 */ DUTCH_E,
-} MessageLanguage;
-
-typedef struct {
-    uint32_t id;
-    uint32_t unk_04;
-    uint32_t unk_08;
-    uint32_t unk_0C;
-    MessageLanguageInfo info[10];
-} MessageEntry; // size = 0x60
-
-    void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition,
-                       std::string englishText, std::string frenchText, std::string spanishText);
-    void CreateMessageFromTextObject(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, const Text& text);
-
-    Text AddColorsAndFormat(Text text, const std::vector<uint8_t>& colors = {});
-    void ClearMessages();
-
-    std::string MESSAGE_END();
-    std::string WAIT_FOR_INPUT();
-    std::string HORIZONTAL_SPACE(uint8_t x);
-    std::string GO_TO(uint16_t x);
-    std::string INSTANT_TEXT_ON();
-    std::string INSTANT_TEXT_OFF();
-    std::string SHOP_MESSAGE_BOX();
-    std::string EVENT_TRIGGER();
-    std::string DELAY_FRAMES(uint8_t x);
-    std::string CLOSE_AFTER(uint8_t x);
-    std::string PLAYER_NAME();
-    std::string PLAY_OCARINA();
-    std::string ITEM_OBTAINED(uint8_t x);
-    std::string SET_SPEED(uint8_t x);
-    std::string SKULLTULAS_DESTROYED();
-    std::string CURRENT_TIME();
-    std::string UNSKIPPABLE();
-    std::string TWO_WAY_CHOICE();
-    std::string NEWLINE();
-    std::string COLOR(std::string x);
-    std::string CENTER_TEXT();
-    std::string IF_NOT_MQ();
-    std::string MQ_ELSE();
-    std::string MQ_END();
-}
+std::string MESSAGE_END();
+std::string WAIT_FOR_INPUT();
+std::string HORIZONTAL_SPACE(uint8_t x);
+std::string GO_TO(uint16_t x);
+std::string INSTANT_TEXT_ON();
+std::string INSTANT_TEXT_OFF();
+std::string SHOP_MESSAGE_BOX();
+std::string EVENT_TRIGGER();
+std::string DELAY_FRAMES(uint8_t x);
+std::string CLOSE_AFTER(uint8_t x);
+std::string PLAYER_NAME();
+std::string PLAY_OCARINA();
+std::string ITEM_OBTAINED(uint8_t x);
+std::string SET_SPEED(uint8_t x);
+std::string SKULLTULAS_DESTROYED();
+std::string CURRENT_TIME();
+std::string UNSKIPPABLE();
+std::string TWO_WAY_CHOICE();
+std::string NEWLINE();
+std::string COLOR(std::string x);
+std::string CENTER_TEXT();
+std::string IF_NOT_MQ();
+std::string MQ_ELSE();
+std::string MQ_END();
+} // namespace CustomMessages
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 351c57fd2e..2ac5a35928 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1,6 +1,5 @@
 #include "fill.hpp"
 
-#include "custom_messages.hpp"
 #include "../dungeon.h"
 #include "../context.h"
 #include "item_pool.hpp"
@@ -19,267 +18,288 @@
 #include <set>
 #include <spdlog/spdlog.h>
 
-using namespace CustomMessages;
 using namespace Rando;
 
-
 static bool placementFailure = false;
 
+PriceSettingsStruct shopsanityPrices = {
+    RSK_SHOPSANITY_PRICES,
+    RSK_SHOPSANITY_PRICES_FIXED_PRICE,
+    RSK_SHOPSANITY_PRICES_RANGE_1,
+    RSK_SHOPSANITY_PRICES_RANGE_2,
+    RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT,
+    RSK_SHOPSANITY_PRICES_AFFORDABLE,
+};
 
-PriceSettingsStruct shopsanityPrices = {RSK_SHOPSANITY_PRICES, 
-                                        RSK_SHOPSANITY_PRICES_FIXED_PRICE,
-                                        RSK_SHOPSANITY_PRICES_RANGE_1,
-                                        RSK_SHOPSANITY_PRICES_RANGE_2,
-                                        RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT,
-                                        RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT,
-                                        RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT,
-                                        RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT,
-                                        RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT,
-                                        RSK_SHOPSANITY_PRICES_AFFORDABLE};
-  
-PriceSettingsStruct scrubPrices = {RSK_SCRUBS_PRICES, 
-                                   RSK_SCRUBS_PRICES_FIXED_PRICE,
-                                   RSK_SCRUBS_PRICES_RANGE_1,
-                                   RSK_SCRUBS_PRICES_RANGE_2,
-                                   RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT,
-                                   RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT,
-                                   RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT,
-                                   RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT,
-                                   RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT,
-                                   RSK_SCRUBS_PRICES_AFFORDABLE};
+PriceSettingsStruct scrubPrices = {
+    RSK_SCRUBS_PRICES,
+    RSK_SCRUBS_PRICES_FIXED_PRICE,
+    RSK_SCRUBS_PRICES_RANGE_1,
+    RSK_SCRUBS_PRICES_RANGE_2,
+    RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT,
+    RSK_SCRUBS_PRICES_AFFORDABLE,
+};
 
-PriceSettingsStruct merchantPrices = {RSK_MERCHANT_PRICES, 
-                                      RSK_MERCHANT_PRICES_FIXED_PRICE,
-                                      RSK_MERCHANT_PRICES_RANGE_1,
-                                      RSK_MERCHANT_PRICES_RANGE_2,
-                                      RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT,
-                                      RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT,
-                                      RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT,
-                                      RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT,
-                                      RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT,
-                                      RSK_MERCHANT_PRICES_AFFORDABLE};
+PriceSettingsStruct merchantPrices = {
+    RSK_MERCHANT_PRICES,
+    RSK_MERCHANT_PRICES_FIXED_PRICE,
+    RSK_MERCHANT_PRICES_RANGE_1,
+    RSK_MERCHANT_PRICES_RANGE_2,
+    RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT,
+    RSK_MERCHANT_PRICES_AFFORDABLE,
+};
 
 static void RemoveStartingItemsFromPool() {
-  for (RandomizerGet startingItem : StartingInventory) {
-    for (size_t i = 0; i < ItemPool.size(); i++) {
-      if (startingItem == RG_BIGGORON_SWORD) {
-        if (ItemPool[i] == RG_GIANTS_KNIFE || ItemPool[i] == RG_BIGGORON_SWORD) {
-          ItemPool[i] = GetJunkItem();
+    for (RandomizerGet startingItem : StartingInventory) {
+        for (size_t i = 0; i < ItemPool.size(); i++) {
+            if (startingItem == RG_BIGGORON_SWORD) {
+                if (ItemPool[i] == RG_GIANTS_KNIFE || ItemPool[i] == RG_BIGGORON_SWORD) {
+                    ItemPool[i] = GetJunkItem();
+                }
+                continue;
+            } else if (startingItem == ItemPool[i] || (Rando::StaticData::RetrieveItem(startingItem).IsBottleItem() &&
+                                                       Rando::StaticData::RetrieveItem(ItemPool[i]).IsBottleItem())) {
+                if (AdditionalHeartContainers > 0 &&
+                    (startingItem == RG_PIECE_OF_HEART || startingItem == RG_TREASURE_GAME_HEART)) {
+                    ItemPool[i] = RG_HEART_CONTAINER;
+                    AdditionalHeartContainers--;
+                } else {
+                    ItemPool[i] = GetJunkItem();
+                }
+                break;
+            }
         }
-        continue;
-      } else if (startingItem == ItemPool[i] || (Rando::StaticData::RetrieveItem(startingItem).IsBottleItem() &&
-                                                 Rando::StaticData::RetrieveItem(ItemPool[i]).IsBottleItem())) {
-        if (AdditionalHeartContainers > 0 && 
-          (startingItem == RG_PIECE_OF_HEART || startingItem == RG_TREASURE_GAME_HEART)) {
-          ItemPool[i] = RG_HEART_CONTAINER;
-          AdditionalHeartContainers--;
-        } else {
-          ItemPool[i] = GetJunkItem();
-        }
-        break;
-      }
     }
-  }
 }
 
-static void PropagateTimeTravel(GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
-                              bool stopOnBeatable = false, bool addToPlaythrough = false){
-  //special check for temple of time
-  if(gals.haveTimeAccess && gals.foundTempleOfTime && gals.validatedStartingRegion){
-    if (!RegionTable(RR_ROOT)->Adult() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child()) { //RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
-      RegionTable(RR_ROOT)->adultDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
-      RegionTable(RR_ROOT)->adultNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
-      ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
-    } else if (!RegionTable(RR_ROOT)->Child() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()){
-      RegionTable(RR_ROOT)->childDay   = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
-      RegionTable(RR_ROOT)->childNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
-      ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
+static void PropagateTimeTravel(GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
+                                bool stopOnBeatable = false, bool addToPlaythrough = false) {
+    // special check for temple of time
+    if (gals.haveTimeAccess && gals.foundTempleOfTime && gals.validatedStartingRegion) {
+        if (!RegionTable(RR_ROOT)->Adult() &&
+            RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)
+                ->Child()) { // RANDOTODO: sphere weirdness, other age locations not propagated in this sphere
+            RegionTable(RR_ROOT)->adultDay = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childDay;
+            RegionTable(RR_ROOT)->adultNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->childNight;
+            ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
+        } else if (!RegionTable(RR_ROOT)->Child() && RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult()) {
+            RegionTable(RR_ROOT)->childDay = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultDay;
+            RegionTable(RR_ROOT)->childNight = RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->adultNight;
+            ProcessRegion(RegionTable(RR_ROOT), gals, ignore, stopOnBeatable, addToPlaythrough);
+        }
     }
-  }
 }
 
-//This function will propagate Time of Day access through the entrance
+// This function will propagate Time of Day access through the entrance
 static bool UpdateToDAccess(Entrance* entrance, Region* connection) {
-  StartPerformanceTimer(PT_TOD_ACCESS);
+    StartPerformanceTimer(PT_TOD_ACCESS);
 
-  bool ageTimePropogated = false;
-  Region* parent = entrance->GetParentRegion();
+    bool ageTimePropogated = false;
+    Region* parent = entrance->GetParentRegion();
 
-  if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) {
-    connection->childDay = true;
-    ageTimePropogated = true;
-  }
-  if (!connection->childNight && parent->childNight && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) {
-    connection->childNight = true;
-    ageTimePropogated = true;
-  }
-  if (!connection->adultDay && parent->adultDay && entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) {
-    connection->adultDay = true;
-    ageTimePropogated = true;
-  }
-  if (!connection->adultNight && parent->adultNight && entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight)) {
-    connection->adultNight = true;
-    ageTimePropogated = true;
-  }
+    if (!connection->childDay && parent->childDay && entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) {
+        connection->childDay = true;
+        ageTimePropogated = true;
+    }
+    if (!connection->childNight && parent->childNight &&
+        entrance->CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) {
+        connection->childNight = true;
+        ageTimePropogated = true;
+    }
+    if (!connection->adultDay && parent->adultDay && entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) {
+        connection->adultDay = true;
+        ageTimePropogated = true;
+    }
+    if (!connection->adultNight && parent->adultNight &&
+        entrance->CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight)) {
+        connection->adultNight = true;
+        ageTimePropogated = true;
+    }
 
-  StopPerformanceTimer(PT_TOD_ACCESS);
-  return ageTimePropogated;
+    StopPerformanceTimer(PT_TOD_ACCESS);
+    return ageTimePropogated;
 }
 
 // Check if key locations in the overworld are accessable
 static void ValidateOtherEntrance(GetAccessibleLocationsStruct& gals) {
-  auto ctx = Rando::Context::GetInstance();
-  // Condition for validating Temple of Time Access
-  if (!gals.foundTempleOfTime && ((ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) && RegionTable(RR_TEMPLE_OF_TIME)->Adult()) || 
-                            (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT) && RegionTable(RR_TEMPLE_OF_TIME)->Child()))) {
-    gals.foundTempleOfTime = true;
-  }
-  // Condition for validating a valid starting region
-  if (!gals.validatedStartingRegion) {
-    bool childAccess = ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) || RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
-    bool adultAccess = ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT) || RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
-
-    Region* kokiri = RegionTable(RR_KOKIRI_FOREST);
-    Region* kakariko = RegionTable(RR_KAKARIKO_VILLAGE);
-
-    if ((childAccess && (kokiri->Child() || kakariko->Child())) ||// RANDOTODO when proper ammo logic is done, this could probably be made optional
-        (adultAccess && (kokiri->Adult() || kakariko->Adult()))) {
-       gals.validatedStartingRegion = true;
-       ApplyStartingInventory(); // RANDOTODO when proper ammo logic is done, this could be moved to the start
+    auto ctx = Rando::Context::GetInstance();
+    // Condition for validating Temple of Time Access
+    if (!gals.foundTempleOfTime &&
+        ((ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) && RegionTable(RR_TEMPLE_OF_TIME)->Adult()) ||
+         (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT) && RegionTable(RR_TEMPLE_OF_TIME)->Child()))) {
+        gals.foundTempleOfTime = true;
+    }
+    // Condition for validating a valid starting region
+    if (!gals.validatedStartingRegion) {
+        bool childAccess = ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) ||
+                           RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Child();
+        bool adultAccess = ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT) ||
+                           RegionTable(RR_TOT_BEYOND_DOOR_OF_TIME)->Adult();
+
+        Region* kokiri = RegionTable(RR_KOKIRI_FOREST);
+        Region* kakariko = RegionTable(RR_KAKARIKO_VILLAGE);
+
+        if ((childAccess &&
+             (kokiri->Child() ||
+              kakariko->Child())) || // RANDOTODO when proper ammo logic is done, this could probably be made optional
+            (adultAccess && (kokiri->Adult() || kakariko->Adult()))) {
+            gals.validatedStartingRegion = true;
+            ApplyStartingInventory(); // RANDOTODO when proper ammo logic is done, this could be moved to the start
+        }
     }
-  }
 }
 
 // Apply all items that are necessary for checking all location access
-static void ApplyAllAdvancmentItems(){
-  std::vector<RandomizerGet> itemsToPlace =
-      FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
-  for (RandomizerGet unplacedItem : itemsToPlace) {
-      Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
-  }
+static void ApplyAllAdvancmentItems() {
+    std::vector<RandomizerGet> itemsToPlace =
+        FilterFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+    for (RandomizerGet unplacedItem : itemsToPlace) {
+        Rando::StaticData::RetrieveItem(unplacedItem).ApplyEffect();
+    }
 }
 
 // Check if everything in an entrance rando seed that needs to be avalible without items, is,
 // and if so allow obtaining items in logic
-static void ValidateSphereZero(GetAccessibleLocationsStruct& gals){
-  auto ctx = Rando::Context::GetInstance();
-  // Condition for verifying everything required for sphere 0, expanding search to all locations
-  if (logic->CouldEmptyBigPoes && gals.validatedStartingRegion && gals.foundTempleOfTime && gals.haveTimeAccess) {
-    // Apply all items that are necessary for checking all location access
-    ApplyAllAdvancmentItems();
-    // Reset access as the non-starting age
-    if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
-      for (RandomizerRegion regionKey : gals.regionPool) {
-        RegionTable(regionKey)->adultDay = false;
-        RegionTable(regionKey)->adultNight = false;
-      }
-    } else {
-      for (RandomizerRegion regionKey : gals.regionPool) {
-        RegionTable(regionKey)->childDay = false;
-        RegionTable(regionKey)->childNight = false;
-      }
+static void ValidateSphereZero(GetAccessibleLocationsStruct& gals) {
+    auto ctx = Rando::Context::GetInstance();
+    // Condition for verifying everything required for sphere 0, expanding search to all locations
+    if (gals.validatedStartingRegion && gals.foundTempleOfTime && gals.haveTimeAccess) {
+        // Apply all items that are necessary for checking all location access
+        ApplyAllAdvancmentItems();
+        // Reset access as the non-starting age
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            for (RandomizerRegion regionKey : gals.regionPool) {
+                RegionTable(regionKey)->adultDay = false;
+                RegionTable(regionKey)->adultNight = false;
+            }
+        } else {
+            for (RandomizerRegion regionKey : gals.regionPool) {
+                RegionTable(regionKey)->childDay = false;
+                RegionTable(regionKey)->childNight = false;
+            }
+        }
+        // RANDOTODO do we want to keep the region pool after this reset?
+        // It's a lot of potential looping over regions we have no access to
+        gals.sphereZeroComplete = true;
     }
-    //RANDOTODO do we want to keep the region pool after this reset? 
-    //It's a lot of potential looping over regions we have no access to
-    gals.sphereZeroComplete = true;
-  } 
 }
 
-//This function handles each possible exit
-void ProcessExits(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
-                  bool stopOnBeatable = false, bool addToPlaythrough = false){
-  auto ctx = Rando::Context::GetInstance();
-  for (auto& exit : region->exits) {
-    Region* exitRegion = exit.GetConnectedRegion();
-    //Update Time of Day Access for the exit
-    if (UpdateToDAccess(&exit, exitRegion)) {
-      gals.logicUpdated = true;
-      if (!gals.sphereZeroComplete){
-        if (!gals.foundTempleOfTime || !gals.validatedStartingRegion){
-          ValidateOtherEntrance(gals);
+// This function handles each possible exit
+void ProcessExits(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
+                  bool stopOnBeatable = false, bool addToPlaythrough = false) {
+    auto ctx = Rando::Context::GetInstance();
+    for (auto& exit : region->exits) {
+        int16_t entranceIndex = exit.GetIndex();
+        if (!logic->ACProcessUndiscoveredExits && logic->CalculatingAvailableChecks &&
+            ctx->GetOption(RSK_SHUFFLE_ENTRANCES).Get() && exit.IsShuffled() && entranceIndex != -1 &&
+            !Entrance_GetIsEntranceDiscovered(entranceIndex)) {
+            continue;
         }
-        ValidateSphereZero(gals);
-      }
-      //process the region we just expanded to, to reduce looping
-      ProcessRegion(exitRegion, gals, ignore, stopOnBeatable, addToPlaythrough);
-    }
 
-    //If the exit is accessible and hasn't been added yet, add it to the pool
-    //RANDOTODO do we want to add the region after the loop now, considering we
-    //are processing the new region immediately. Maybe a reverse for loop in ProcessRegion?
-    if (!exitRegion->addedToPool && exit.ConditionsMet()) {
-      exitRegion->addedToPool = true;
-      gals.regionPool.push_back(exit.GetConnectedRegionKey());
-    }
+        Region* exitRegion = exit.GetConnectedRegion();
+        // Update Time of Day Access for the exit
+        if (UpdateToDAccess(&exit, exitRegion)) {
+            gals.logicUpdated = true;
+            if (!gals.sphereZeroComplete) {
+                if (!gals.foundTempleOfTime || !gals.validatedStartingRegion) {
+                    ValidateOtherEntrance(gals);
+                }
+                ValidateSphereZero(gals);
+            }
+            // If the exit is accessible and hasn't been added yet, add it to the pool
+            // RANDOTODO do we want to add the region after the loop now, considering we
+            // are processing the new region immediately. Maybe a reverse for loop in ProcessRegion?
+            if (!exitRegion->addedToPool) {
+                exitRegion->addedToPool = true;
+                gals.regionPool.push_back(exit.GetConnectedRegionKey());
+            }
 
-    if (addToPlaythrough){
-      // RANDOTODO Should this match the regular spheres?
-      // Add shuffled entrances to the entrance playthrough
-      // Include bluewarps when unshuffled but dungeon or boss shuffle is on
-      if((exit.IsShuffled() || (exit.GetType() == Rando::EntranceType::BlueWarp && 
-          (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
-          !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
-        gals.entranceSphere.push_back(&exit);
-        exit.AddToPool();
-        // Don't list a two-way coupled entrance from both directions
-        if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr && !exit.IsDecoupled()) {
-          exit.GetReplacement()->GetReverse()->AddToPool();
+            // process the region we just expanded to, to reduce looping
+            ProcessRegion(exitRegion, gals, ignore, stopOnBeatable, addToPlaythrough);
+        }
+
+        if (addToPlaythrough) {
+            // RANDOTODO Should this match the regular spheres?
+            // Add shuffled entrances to the entrance playthrough
+            // Include bluewarps when unshuffled but dungeon or boss shuffle is on
+            if ((exit.IsShuffled() ||
+                 (exit.GetType() == Rando::EntranceType::BlueWarp &&
+                  (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
+                !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+                gals.entranceSphere.push_back(&exit);
+                exit.AddToPool();
+                // Don't list a two-way coupled entrance from both directions
+                if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr &&
+                    !exit.IsDecoupled()) {
+                    exit.GetReplacement()->GetReverse()->AddToPool();
+                }
+            }
         }
-      }
     }
-  }
 }
 
-
-//Get the max number of tokens that can possibly be useful
+// Get the max number of tokens that can possibly be useful
 static int GetMaxGSCount() {
-  auto ctx = Rando::Context::GetInstance();
-  //If bridge or LACS is set to tokens, get how many are required
-  int maxBridge = 0;
-  int maxLACS = 0;
-  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
-    maxBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get();
-  }
-  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
-    maxLACS = ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get();
-  }
-  maxBridge = std::max(maxBridge, maxLACS);
-  //Get the max amount of GS which could be useful from token reward locations
-  int maxUseful = 0;
-  //If the highest advancement item is a token, we know it is useless since it won't lead to an otherwise useful item
-  if (ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() && ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-    maxUseful = 100;
-  } else if (ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
-             ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-      maxUseful = 50;
-  } else if (ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
-             ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-      maxUseful = 40;
-  } else if (ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
-             ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-      maxUseful = 30;
-  } else if (ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
-             ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-      maxUseful = 20;
-  } else if (ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
-             ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
-      maxUseful = 10;
-  }
-  //Return max of the two possible reasons tokens could be important, minus the tokens in the starting inventory
-  return std::max(maxUseful, maxBridge) - ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Get();
+    auto ctx = Rando::Context::GetInstance();
+    // If bridge or LACS is set to tokens, get how many are required
+    int maxBridge = 0;
+    int maxLACS = 0;
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+        maxBridge = ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get();
+    }
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+        maxLACS = ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get();
+    }
+    maxBridge = std::max(maxBridge, maxLACS);
+    // Get the max amount of GS which could be useful from token reward locations
+    int maxUseful = 0;
+    // If the highest advancement item is a token, we know it is useless since it won't lead to an otherwise useful item
+    if (ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+        ctx->GetItemLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 100;
+    } else if (ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+               ctx->GetItemLocation(RC_KAK_50_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 50;
+    } else if (ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+               ctx->GetItemLocation(RC_KAK_40_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 40;
+    } else if (ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+               ctx->GetItemLocation(RC_KAK_30_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 30;
+    } else if (ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+               ctx->GetItemLocation(RC_KAK_20_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 20;
+    } else if (ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().IsAdvancement() &&
+               ctx->GetItemLocation(RC_KAK_10_GOLD_SKULLTULA_REWARD)->GetPlacedItem().GetItemType() != ITEMTYPE_TOKEN) {
+        maxUseful = 10;
+    }
+    // Return max of the two possible reasons tokens could be important, minus the tokens in the starting inventory
+    return std::max(maxUseful, maxBridge) - ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Get();
 }
 
 std::string GetShopItemBaseName(std::string itemName) {
-  std::string baseName = itemName.erase(0, 4); //Delete "Buy "
-  //Delete amount, if present (so when it looks like Buy Deku Nut (10) remove the (10))
-  if (baseName.find("(") != std::string::npos) {
-    baseName = baseName.erase(baseName.find("("));
-  }
-  //Do the same for [] (only applies to red potions, other things with [] also have a ())
-  if (baseName.find("[") != std::string::npos) {
-    baseName = baseName.erase(baseName.find("["));
-  }
-  return baseName;
+    std::string baseName = itemName.erase(0, 4); // Delete "Buy "
+    // Delete amount, if present (so when it looks like Buy Deku Nut (10) remove the (10))
+    if (baseName.find("(") != std::string::npos) {
+        baseName = baseName.erase(baseName.find("("));
+    }
+    // Do the same for [] (only applies to red potions, other things with [] also have a ())
+    if (baseName.find("[") != std::string::npos) {
+        baseName = baseName.erase(baseName.find("["));
+    }
+    return baseName;
 }
 
 std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> targetLocations) {
@@ -296,486 +316,520 @@ std::vector<RandomizerCheck> GetAllEmptyLocations() {
     });
 }
 
-bool IsBombchus(RandomizerGet item, bool includeShops = false){
-  return (item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_20) || item == RG_PROGRESSIVE_BOMBCHUS || 
-    (includeShops && (item == RG_BUY_BOMBCHUS_10 || item == RG_BUY_BOMBCHUS_20));
+bool IsBombchus(RandomizerGet item, bool includeShops = false) {
+    return (item >= RG_BOMBCHU_5 && item <= RG_BOMBCHU_20) || item == RG_PROGRESSIVE_BOMBCHUS ||
+           (includeShops && (item == RG_BUY_BOMBCHUS_10 || item == RG_BUY_BOMBCHUS_20));
 }
 
-bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem, RandomizerGet ignore = RG_NONE){ //RANDOTODO make excludCheck an ItemLocation
-  auto ctx = Rando::Context::GetInstance();
-  RandomizerGet copy = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet(); //Copy out item
-  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE); //Write in empty item
-  ctx->playthroughBeatable = false;
-  logic->Reset();
-  CheckBeatable(ignore);
-  if (replaceItem){
-    ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); //Immediately put item back
-  }
-  return ctx->playthroughBeatable;
+bool IsBeatableWithout(RandomizerCheck excludedCheck, bool replaceItem,
+                       RandomizerGet ignore = RG_NONE) { // RANDOTODO make excludCheck an ItemLocation
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerGet copy = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet(); // Copy out item
+    ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);                        // Write in empty item
+    logic->Reset();
+    bool result = CheckBeatable(ignore);
+    if (replaceItem) {
+        ctx->GetItemLocation(excludedCheck)->SetPlacedItem(copy); // Immediately put item back
+    }
+    return result;
 }
 
 // Reset non-Logic-class logic, and optionally apply the initial inventory
-void ResetLogic(std::shared_ptr<Context>& ctx, GetAccessibleLocationsStruct& gals, bool applyInventory = false){
-  gals.timePassChildDay = true;
-  gals.timePassChildNight = true;
-  gals.timePassAdultDay = true;
-  gals.timePassAdultNight = true;
-  gals.haveTimeAccess = true;
-  gals.foundTempleOfTime = true;
-  gals.validatedStartingRegion = true;
-  gals.sphereZeroComplete = true;
-  if (applyInventory){
-    ApplyStartingInventory();
-  }
-  Regions::AccessReset();
-  ctx->LocationReset();
-} 
-
-//Generate the playthrough, so we want to add advancement items, unless we know to ignore them
-void AddToPlaythrough(LocationAccess& locPair, GetAccessibleLocationsStruct& gals){
-  auto ctx = Rando::Context::GetInstance();
-  RandomizerCheck loc = locPair.GetLocation();
-  Rando::ItemLocation* location = ctx->GetItemLocation(loc);
-  RandomizerGet locItem = location->GetPlacedRandomizerGet();
-  //Item is an advancement item, figure out if it should be added to this sphere
-  if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
-    ItemType type = location->GetPlacedItem().GetItemType();
-
-    //Decide whether to exclude this location
-    //This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
-    //Want to exclude:
-    //1) Tokens after the last potentially useful one (the last one that gives an advancement item or last for token bridge)
-    //2) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
-    bool exclude = true;
-    //Exclude tokens after the last possibly useful one
-    if (type == ITEMTYPE_TOKEN && gals.gsCount < gals.maxGsCount) {
-      gals.gsCount++;
-      exclude = false;
+void ResetLogic(std::shared_ptr<Context>& ctx, GetAccessibleLocationsStruct& gals, bool applyInventory = false) {
+    gals.timePassChildDay = true;
+    gals.timePassChildNight = true;
+    gals.timePassAdultDay = true;
+    gals.timePassAdultNight = true;
+    gals.haveTimeAccess = true;
+    gals.foundTempleOfTime = true;
+    gals.validatedStartingRegion = true;
+    gals.sphereZeroComplete = true;
+    if (applyInventory) {
+        ApplyStartingInventory();
     }
-    //Handle buy items
-    //If ammo drops are off, don't do this step, since buyable ammo becomes logically important
-    // TODO: Reimplement Ammo Drops setting
-    else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ type == ITEMTYPE_SHOP) {
-      //Only check each buy item once
-      auto buyItem = location->GetPlacedItem().GetLogicVal();
-      //Buy item not in list to ignore, add it to list and write to playthrough
-      if (std::find(gals.buyIgnores.begin(), gals.buyIgnores.end(), buyItem) == gals.buyIgnores.end()) {
-        exclude = false;
-        gals.buyIgnores.push_back(buyItem);
-      }
-    }
-    //Add all other advancement items
-    else if (type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
-      exclude = false;
-    }
-    //Has not been excluded, add to playthrough
-    if (!exclude) {
-      gals.itemSphere.push_back(loc);
-    }
-  }
-  //Triforce has been found, seed is beatable, nothing else in this or future spheres matters
-  else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE) {
-    gals.itemSphere.clear();
-    gals.itemSphere.push_back(loc);
-    ctx->playthroughBeatable = true;
-  }
+    Regions::AccessReset();
+    ctx->LocationReset();
 }
 
-void ApplyOrStoreItem(Rando::ItemLocation* loc, GetAccessibleLocationsStruct& gals, bool addToPlaythrough){
-  if (addToPlaythrough){
-    gals.newItemLocations.push_back(loc);
-  } else {
-    loc->ApplyPlacedItemEffect();
-  }
-  gals.logicUpdated = true;
+// Generate the playthrough, so we want to add advancement items, unless we know to ignore them
+void AddToPlaythrough(LocationAccess& locPair, GetAccessibleLocationsStruct& gals) {
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerCheck loc = locPair.GetLocation();
+    Rando::ItemLocation* location = ctx->GetItemLocation(loc);
+    RandomizerGet locItem = location->GetPlacedRandomizerGet();
+    // Item is an advancement item, figure out if it should be added to this sphere
+    if (!ctx->playthroughBeatable && location->GetPlacedItem().IsAdvancement()) {
+        ItemType type = location->GetPlacedItem().GetItemType();
+
+        // Decide whether to exclude this location
+        // This preprocessing is done to reduce the amount of searches performed in PareDownPlaythrough
+        // Want to exclude:
+        // 1) Tokens after the last potentially useful one (the last one that gives an advancement item or last for
+        // token bridge) 2) Buy items of the same type, after the first (So only see Buy Deku Nut of any amount once)
+        bool exclude = true;
+        // Exclude tokens after the last possibly useful one
+        if (type == ITEMTYPE_TOKEN && gals.gsCount < gals.maxGsCount) {
+            gals.gsCount++;
+            exclude = false;
+        }
+        // Handle buy items
+        // If ammo drops are off, don't do this step, since buyable ammo becomes logically important
+        //  TODO: Reimplement Ammo Drops setting
+        else if (/*AmmoDrops.IsNot(AMMODROPS_NONE) &&*/ type == ITEMTYPE_SHOP) {
+            // Only check each buy item once
+            auto buyItem = location->GetPlacedItem().GetLogicVal();
+            // Buy item not in list to ignore, add it to list and write to playthrough
+            if (std::find(gals.buyIgnores.begin(), gals.buyIgnores.end(), buyItem) == gals.buyIgnores.end()) {
+                exclude = false;
+                gals.buyIgnores.push_back(buyItem);
+            }
+        }
+        // Add all other advancement items
+        else if (type != ITEMTYPE_TOKEN && (/*AmmoDrops.Is(AMMODROPS_NONE) ||*/ type != ITEMTYPE_SHOP)) {
+            exclude = false;
+        }
+        // Has not been excluded, add to playthrough
+        if (!exclude) {
+            gals.itemSphere.push_back(loc);
+        }
+    }
+    // Triforce has been found, seed is beatable, nothing else in this or future spheres matters
+    else if (location->GetPlacedRandomizerGet() == RG_TRIFORCE) {
+        gals.itemSphere.clear();
+        gals.itemSphere.push_back(loc);
+        ctx->playthroughBeatable = true;
+    }
+}
+
+void ApplyOrStoreItem(Rando::ItemLocation* loc, GetAccessibleLocationsStruct& gals, bool addToPlaythrough) {
+    if (addToPlaythrough) {
+        gals.newItemLocations.push_back(loc);
+    } else {
+        loc->ApplyPlacedItemEffect();
+    }
+    gals.logicUpdated = true;
 }
 
 // Adds the contents of a location to the current progression and optionally playthrough
-bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable, Region* parentRegion, bool addToPlaythrough=false){
-  auto ctx = Rando::Context::GetInstance();
-  StartPerformanceTimer(PT_LOCATION_LOGIC);
-  RandomizerCheck loc = locPair.GetLocation();
-  Rando::ItemLocation* location = ctx->GetItemLocation(loc);
-  RandomizerGet locItem = location->GetPlacedRandomizerGet();
+bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals, RandomizerGet ignore,
+                     bool stopOnBeatable, Region* parentRegion, bool addToPlaythrough = false) {
+    auto ctx = Rando::Context::GetInstance();
+    StartPerformanceTimer(PT_LOCATION_LOGIC);
+    RandomizerCheck loc = locPair.GetLocation();
+    Rando::ItemLocation* location = ctx->GetItemLocation(loc);
+    RandomizerGet locItem = location->GetPlacedRandomizerGet();
 
-  if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion)) {
-    location->AddToPool();
+    if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion, logic->CalculatingAvailableChecks)) {
+        location->AddToPool();
 
-    if (locItem == RG_NONE) {
-      gals.accessibleLocations.push_back(loc); //Empty location, consider for placement
-    } else {
-      //If ignore has a value, we want to check if the item location should be considered or not
-      //This is necessary due to the below preprocessing for playthrough generation
-      if (ignore != RG_NONE) {
-        ItemType type = location->GetPlacedItem().GetItemType();
-        //If we want to ignore tokens, only add if not a token
-        if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
-          ApplyOrStoreItem(location, gals, addToPlaythrough);
+        if (locItem == RG_NONE || logic->CalculatingAvailableChecks) {
+            gals.accessibleLocations.push_back(loc); // Empty location, consider for placement
         }
-        //If we want to ignore bombchus, only add if bombchu is not in the name
-        else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
-          ApplyOrStoreItem(location, gals, addToPlaythrough);
+        if (locItem != RG_NONE) {
+            // If ignore has a value, we want to check if the item location should be considered or not
+            // This is necessary due to the below preprocessing for playthrough generation
+            if (ignore != RG_NONE) {
+                ItemType type = location->GetPlacedItem().GetItemType();
+                // If we want to ignore tokens, only add if not a token
+                if (ignore == RG_GOLD_SKULLTULA_TOKEN && type != ITEMTYPE_TOKEN) {
+                    ApplyOrStoreItem(location, gals, addToPlaythrough);
+                }
+                // If we want to ignore bombchus, only add if bombchu is not in the name
+                else if (IsBombchus(ignore) && IsBombchus(locItem, true)) {
+                    ApplyOrStoreItem(location, gals, addToPlaythrough);
+                }
+                // We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a
+                // shared GetLogicVal
+                else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
+                    if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() !=
+                                                      location->GetPlacedItem().GetLogicVal()) ||
+                        type != ITEMTYPE_SHOP) {
+                        ApplyOrStoreItem(location, gals, addToPlaythrough);
+                    }
+                }
+            }
+            // If it doesn't, we can just add the location
+            else {
+                ApplyOrStoreItem(location, gals,
+                                 addToPlaythrough); // Add item to cache to be considered in logic next iteration
+            }
         }
-        //We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a shared GetLogicVal
-        else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) {
-          if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) {
-            ApplyOrStoreItem(location, gals, addToPlaythrough);
-          }
+        if (addToPlaythrough) {
+            AddToPlaythrough(locPair, gals);
+        }
+        // All we care about is if the game is beatable, used to pare down playthrough
+        if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && stopOnBeatable) {
+            StopPerformanceTimer(PT_LOCATION_LOGIC);
+            return true; // Return early for efficiency
         }
-      }
-      //If it doesn't, we can just add the location
-      else {
-        ApplyOrStoreItem(location, gals, addToPlaythrough); //Add item to cache to be considered in logic next iteration
-      }
     }
-    if (addToPlaythrough){
-      AddToPlaythrough(locPair, gals);
-    }
-    //All we care about is if the game is beatable, used to pare down playthrough
-    if (location->GetPlacedRandomizerGet() == RG_TRIFORCE && stopOnBeatable) {
-      StopPerformanceTimer(PT_LOCATION_LOGIC);
-      return true; //Return early for efficiency
-    }
-  }
-  StopPerformanceTimer(PT_LOCATION_LOGIC);
-  return false;
+    StopPerformanceTimer(PT_LOCATION_LOGIC);
+    return false;
 }
 
-void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore, 
-                   bool stopOnBeatable, bool addToPlaythrough){
-  
-  if (gals.haveTimeAccess) {
-    region->ApplyTimePass();
-  } else {
-    // If we're checking for TimePass access do that for each region as it's being updated.
-    // TimePass Access is satisfied when every AgeTime can reach a region with TimePass
-    // without the aid of TimePass. During this mode, TimePass won't update ToD access
-    // in any region.
-    //RANDOTODO can probably be removed after a ToD rework that accounts for having Dampe time access
-    if (region->timePass) {
-      if (region->childDay) {
-        gals.timePassChildDay = true;
-      }
-      if (region->childNight) {
-        gals.timePassChildNight = true;
-      }
-      if (region->adultDay) {
-        gals.timePassAdultDay = true;
-      }
-      if (region->adultNight) {
-        gals.timePassAdultNight = true;
-      }
-    }
-    // Condition for validating that all startring AgeTimes have timepass access
-    if (gals.timePassChildDay && gals.timePassChildNight && 
-        gals.timePassAdultDay && gals.timePassAdultNight) {
-      gals.haveTimeAccess = true;
-      region->ApplyTimePass();
-    }
-  }
+void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore, bool stopOnBeatable,
+                   bool addToPlaythrough) {
 
-  if (region->UpdateEvents()){
-    gals.logicUpdated = true;
-    //if we are working in spheres, reset the sphere on an event being enabled to avoid sphere skipping
-    if (addToPlaythrough){
-      gals.resetSphere = true;
+    if (gals.haveTimeAccess) {
+        region->ApplyTimePass();
+    } else {
+        // If we're checking for TimePass access do that for each region as it's being updated.
+        // TimePass Access is satisfied when every AgeTime can reach a region with TimePass
+        // without the aid of TimePass. During this mode, TimePass won't update ToD access
+        // in any region.
+        // RANDOTODO can probably be removed after a ToD rework that accounts for having Dampe time access
+        if (region->TimePass()) {
+            if (region->childDay) {
+                gals.timePassChildDay = true;
+            }
+            if (region->childNight) {
+                gals.timePassChildNight = true;
+            }
+            if (region->adultDay) {
+                gals.timePassAdultDay = true;
+            }
+            if (region->adultNight) {
+                gals.timePassAdultNight = true;
+            }
+        }
+        // Condition for validating that all startring AgeTimes have timepass access
+        if (gals.timePassChildDay && gals.timePassChildNight && gals.timePassAdultDay && gals.timePassAdultNight) {
+            gals.haveTimeAccess = true;
+            region->ApplyTimePass();
+        }
     }
-  }
-  
-  ProcessExits(region, gals, ignore, stopOnBeatable, addToPlaythrough);
-  
-  PropagateTimeTravel(gals, ignore, stopOnBeatable, addToPlaythrough);
-  for (size_t k = 0; k < region->locations.size(); k++) {
-    if(AddCheckToLogic(region->locations[k], gals, ignore, stopOnBeatable, region, addToPlaythrough)){
-      Rando::Context::GetInstance()->playthroughBeatable = true;
-      return;
+
+    if (region->UpdateEvents()) {
+        gals.logicUpdated = true;
+        // if we are working in spheres, reset the sphere on an event being enabled to avoid sphere skipping
+        if (addToPlaythrough) {
+            gals.resetSphere = true;
+        }
+    }
+
+    ProcessExits(region, gals, ignore, stopOnBeatable, addToPlaythrough);
+
+    PropagateTimeTravel(gals, ignore, stopOnBeatable, addToPlaythrough);
+    for (size_t k = 0; k < region->locations.size(); k++) {
+        if (AddCheckToLogic(region->locations[k], gals, ignore, stopOnBeatable, region, addToPlaythrough)) {
+            Rando::Context::GetInstance()->playthroughBeatable = true;
+            return;
+        }
     }
-  }
 }
 
 // Return any of the targetLocations that are accessible in logic
-std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& targetLocations, RandomizerGet ignore /* = RG_NONE*/) {
-  auto ctx = Rando::Context::GetInstance();
-  GetAccessibleLocationsStruct gals(0);
-  ResetLogic(ctx, gals, true);
-  do {
-    gals.InitLoop();
-    for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore);
+std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& targetLocations,
+                                                RandomizerGet ignore /* = RG_NONE*/,
+                                                bool calculatingAvailableChecks /* = false */,
+                                                RandomizerRegion startingRegion /* = RR_ROOT */) {
+    auto ctx = Rando::Context::GetInstance();
+    GetAccessibleLocationsStruct gals(0);
+    ResetLogic(ctx, gals, !calculatingAvailableChecks);
+    if (startingRegion != RR_ROOT) {
+        gals.regionPool.insert(gals.regionPool.begin(), startingRegion);
+
+        const auto& region = RegionTable(startingRegion);
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            region->childDay = true;
+        } else {
+            region->adultDay = true;
+        }
+        if (region->timePass) {
+            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+                region->childNight = true;
+            } else {
+                region->adultNight = true;
+            }
+        }
     }
-  } while (gals.logicUpdated);
-  erase_if(gals.accessibleLocations, [&targetLocations, ctx](RandomizerCheck loc){
-    for (RandomizerCheck allowedLocation : targetLocations) {
-      if (loc == allowedLocation || ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE) {
-        return false;
-      }
+    if (calculatingAvailableChecks) {
+        logic->Reset(false);
+        logic->CalculatingAvailableChecks = true;
     }
-    return true;
-  });
-  return gals.accessibleLocations;
+    do {
+        gals.InitLoop();
+        for (size_t i = 0; i < gals.regionPool.size(); i++) {
+            ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore);
+        }
+    } while (gals.logicUpdated);
+    erase_if(gals.accessibleLocations, [&targetLocations, ctx, calculatingAvailableChecks](RandomizerCheck loc) {
+        if (ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() != RG_NONE && !calculatingAvailableChecks) {
+            return false;
+        }
+        for (RandomizerCheck allowedLocation : targetLocations) {
+            if (loc == allowedLocation) {
+                return false;
+            }
+        }
+        return true;
+    });
+    return gals.accessibleLocations;
 }
 
 // Create the playthrough for the seed
 void GeneratePlaythrough() {
-  auto ctx = Rando::Context::GetInstance();
-  ctx->playthroughBeatable = false;
-  logic->Reset();
-  GetAccessibleLocationsStruct gals(GetMaxGSCount());
-  ResetLogic(ctx, gals, true);
-  do {
-    gals.InitLoop();
-    for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      ProcessRegion(RegionTable(gals.regionPool[i]), gals, RG_NONE, false, true);
-      if (gals.resetSphere){
-        gals.resetSphere = false;
-        i = -1;
-      }
-    }
-    if (gals.itemSphere.size() > 0) {
-      ctx->playthroughLocations.push_back(gals.itemSphere);
-    }
-    if (gals.entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
-      ctx->GetEntranceShuffler()->playthroughEntrances.push_back(gals.entranceSphere);
-    }
-  } while (gals.logicUpdated);
+    auto ctx = Rando::Context::GetInstance();
+    ctx->playthroughBeatable = false;
+    logic->Reset();
+    GetAccessibleLocationsStruct gals(GetMaxGSCount());
+    ResetLogic(ctx, gals, true);
+    do {
+        gals.InitLoop();
+        for (size_t i = 0; i < gals.regionPool.size(); i++) {
+            ProcessRegion(RegionTable(gals.regionPool[i]), gals, RG_NONE, false, true);
+            if (gals.resetSphere) {
+                gals.resetSphere = false;
+                i = -1;
+            }
+        }
+        if (gals.itemSphere.size() > 0) {
+            ctx->playthroughLocations.push_back(gals.itemSphere);
+        }
+        if (gals.entranceSphere.size() > 0 && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+            ctx->GetEntranceShuffler()->playthroughEntrances.push_back(gals.entranceSphere);
+        }
+    } while (gals.logicUpdated);
 }
 
 // return if the seed is currently beatable or not
 bool CheckBeatable(RandomizerGet ignore /* = RG_NONE*/) {
-  auto ctx = Rando::Context::GetInstance();
-  GetAccessibleLocationsStruct gals(0);
-  ResetLogic(ctx, gals, true);
-  do {
-    gals.InitLoop();
-    for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore, true);
-      if (ctx->playthroughBeatable == true){
-        return true;
-      }
-    }
-  } while (gals.logicUpdated);
-  return false;
+    auto ctx = Rando::Context::GetInstance();
+    ctx->playthroughBeatable = false;
+    GetAccessibleLocationsStruct gals(0);
+    ResetLogic(ctx, gals, true);
+    do {
+        gals.InitLoop();
+        for (size_t i = 0; i < gals.regionPool.size(); i++) {
+            ProcessRegion(RegionTable(gals.regionPool[i]), gals, ignore, true);
+            if (ctx->playthroughBeatable == true) {
+                return true;
+            }
+        }
+    } while (gals.logicUpdated);
+    return false;
 }
 
 // Check if the currently randomised set of entrances is a valid game map.
-void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess) {
-  auto ctx = Rando::Context::GetInstance();
-  GetAccessibleLocationsStruct gals(0);
-  ResetLogic(ctx, gals, !checkOtherEntranceAccess);
+void ValidateEntrances(bool checkOtherEntranceAccess) {
+    auto ctx = Rando::Context::GetInstance();
+    GetAccessibleLocationsStruct gals(0);
+    ResetLogic(ctx, gals, !checkOtherEntranceAccess);
 
-  ctx->allLocationsReachable = false;
-  if (checkPoeCollectorAccess){
-    logic->CouldEmptyBigPoes = false;
-  }
+    ctx->allLocationsReachable = false;
 
-  if (checkOtherEntranceAccess){
-    gals.foundTempleOfTime = false;
-    gals.validatedStartingRegion = false;
-    //Variables for Time Pass access
-    gals.timePassChildDay = false;
-    gals.timePassChildNight = false;
-    gals.timePassAdultDay = false;
-    gals.timePassAdultNight = false;
-    gals.haveTimeAccess = false;
-    gals.sphereZeroComplete = false;
-    RegionTable(RR_ROOT)->childNight = true;
-    RegionTable(RR_ROOT)->adultNight = true;
-    RegionTable(RR_ROOT)->childDay = true;
-    RegionTable(RR_ROOT)->adultDay = true;
-  } else {
-    ApplyAllAdvancmentItems();
-  }
-
-  do {
-    gals.InitLoop();
-    for (size_t i = 0; i < gals.regionPool.size(); i++) {
-      ProcessRegion(RegionTable(gals.regionPool[i]), gals);
+    if (checkOtherEntranceAccess) {
+        gals.foundTempleOfTime = false;
+        gals.validatedStartingRegion = false;
+        // Variables for Time Pass access
+        gals.timePassChildDay = false;
+        gals.timePassChildNight = false;
+        gals.timePassAdultDay = false;
+        gals.timePassAdultNight = false;
+        gals.haveTimeAccess = false;
+        gals.sphereZeroComplete = false;
+        RegionTable(RR_ROOT)->childNight = true;
+        RegionTable(RR_ROOT)->adultNight = true;
+        RegionTable(RR_ROOT)->childDay = true;
+        RegionTable(RR_ROOT)->adultDay = true;
+    } else {
+        ApplyAllAdvancmentItems();
     }
-  } while (gals.logicUpdated);
-  if (gals.sphereZeroComplete) {
-    ctx->allLocationsReachable = true;
-    //RANDOTODO a size check here before getting the exact fails would be a minor optimization
-    //and a full list of location failures would be useful for logging when it does fail
-    for (const RandomizerCheck loc : ctx->allLocations) {
-      if (!ctx->GetItemLocation(loc)->IsAddedToPool()) {
-          ctx->allLocationsReachable = false;
-          auto message = "Location " +
-                         Rando::StaticData::GetLocation(ctx->GetItemLocation(loc)->GetRandomizerCheck())->GetName() +
-                         " not reachable\n";
-          LUSLOG_DEBUG("%s", message.c_str());
-        #ifndef ENABLE_DEBUG
-          break;
-        #endif
-      }
-    }
-  }
-}
 
-void LookForExternalArea(Region* currentRegion, std::set<Region*> &alreadyChecked, std::set<RandomizerArea> &areas, bool LowPriorityMode=false){
-  for (const auto& entrance : currentRegion->entrances) {
-    //if the region is arealess and hasn't already been checked, recursivly check what connects to it
-    //if this entrance does not pass areas, only process it if we are in low priority mode
-    if ((LowPriorityMode || entrance->DoesSpreadAreas()) && !alreadyChecked.contains(entrance->GetParentRegion())){
-      std::set<RandomizerArea> otherAreas = entrance->GetParentRegion()->GetAllAreas();
-      if (otherAreas.size() == 0) {
-        alreadyChecked.insert(entrance->GetParentRegion());
-        LookForExternalArea(entrance->GetParentRegion(), alreadyChecked, areas, LowPriorityMode);
-      //If we find a valid area we should add it.
-      //If it's Links Pocket or RA_NONE, do not propagate those, they are not real areas.
-      //This check is likely to fail if a region somehow is both in Link's Pocket and elsewhere, but this should never happen
-      } else if (*otherAreas.begin() > RA_LINKS_POCKET){
-        areas.merge(otherAreas);
-      }
-    }
-  }
-}
-
-void SetAreas(){
-  auto ctx = Rando::Context::GetInstance();
-//RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here,
-//then use those areas to not need to recursivly find ItemLocation areas when an identifying entrance's area
-  for (int regionType = 0; regionType < RR_MARKER_AREAS_END; regionType++) {
-    Region* region = &areaTable[regionType];
-    std::set<RandomizerArea> areas = region->GetAllAreas();
-    std::set<Region*> regionsToSet = {region};
-    if (areas.empty()) {
-      LookForExternalArea(region, regionsToSet, areas);
-      //If we found nothing, try again in low priority mode to try every entrance
-      if (areas.empty()) {
-        LookForExternalArea(region, regionsToSet, areas, true);
-        //If we still found nothing, we're disconnected, use RA_NONE to represent that
-        if (areas.empty()){
-          areas.insert(RA_NONE);
+    do {
+        gals.InitLoop();
+        for (size_t i = 0; i < gals.regionPool.size(); i++) {
+            ProcessRegion(RegionTable(gals.regionPool[i]), gals);
+        }
+    } while (gals.logicUpdated);
+    if (gals.sphereZeroComplete) {
+        ctx->allLocationsReachable = true;
+        // RANDOTODO a size check here before getting the exact fails would be a minor optimization
+        // and a full list of location failures would be useful for logging when it does fail
+        for (const RandomizerCheck loc : ctx->allLocations) {
+            if (!ctx->GetItemLocation(loc)->IsAddedToPool()) {
+                ctx->allLocationsReachable = false;
+                auto message =
+                    "Location " +
+                    Rando::StaticData::GetLocation(ctx->GetItemLocation(loc)->GetRandomizerCheck())->GetName() +
+                    " not reachable\n";
+                LUSLOG_DEBUG("%s", message.c_str());
+#ifndef ENABLE_DEBUG
+                break;
+#endif
+            }
         }
-      }
     }
-    for (auto regionToSet : regionsToSet) {
-      regionToSet->ReplaceAreas(areas);
-      for (auto& loc : regionToSet->locations){
-        ctx->GetItemLocation(loc.GetLocation())->MergeAreas(areas);
-      }
-    }
-  }
 }
 
-//Remove unnecessary items from playthrough by removing their location, and checking if game is still beatable
-//To reduce searches, some preprocessing is done in playthrough generation to avoid adding obviously unnecessary items
+void LookForExternalArea(Region* currentRegion, std::set<Region*>& alreadyChecked, std::set<RandomizerArea>& areas,
+                         bool LowPriorityMode = false) {
+    for (const auto& entrance : currentRegion->entrances) {
+        // if the region is arealess and hasn't already been checked, recursivly check what connects to it
+        // if this entrance does not pass areas, only process it if we are in low priority mode
+        if ((LowPriorityMode || entrance->DoesSpreadAreas()) && !alreadyChecked.contains(entrance->GetParentRegion())) {
+            std::set<RandomizerArea> otherAreas = entrance->GetParentRegion()->GetAllAreas();
+            if (otherAreas.size() == 0) {
+                alreadyChecked.insert(entrance->GetParentRegion());
+                LookForExternalArea(entrance->GetParentRegion(), alreadyChecked, areas, LowPriorityMode);
+                // If we find a valid area we should add it.
+                // If it's Links Pocket or RA_NONE, do not propagate those, they are not real areas.
+                // This check is likely to fail if a region somehow is both in Link's Pocket and elsewhere, but this
+                // should never happen
+            } else if (*otherAreas.begin() > RA_LINKS_POCKET) {
+                areas.merge(otherAreas);
+            }
+        }
+    }
+}
+
+void SetAreas() {
+    auto ctx = Rando::Context::GetInstance();
+    // RANDOTODO give entrances an enum like RandomizerCheck, the give them all areas here,
+    // then use those areas to not need to recursivly find ItemLocation areas when an identifying entrance's area
+    for (int regionType = 0; regionType < RR_MARKER_AREAS_END; regionType++) {
+        Region* region = &areaTable[regionType];
+        std::set<RandomizerArea> areas = region->GetAllAreas();
+        std::set<Region*> regionsToSet = { region };
+        if (areas.empty()) {
+            LookForExternalArea(region, regionsToSet, areas);
+            // If we found nothing, try again in low priority mode to try every entrance
+            if (areas.empty()) {
+                LookForExternalArea(region, regionsToSet, areas, true);
+                // If we still found nothing, we're disconnected, use RA_NONE to represent that
+                if (areas.empty()) {
+                    areas.insert(RA_NONE);
+                }
+            }
+        }
+        for (auto regionToSet : regionsToSet) {
+            regionToSet->ReplaceAreas(areas);
+            for (auto& loc : regionToSet->locations) {
+                ctx->GetItemLocation(loc.GetLocation())->MergeAreas(areas);
+            }
+        }
+    }
+}
+
+// Remove unnecessary items from playthrough by removing their location, and checking if game is still beatable
+// To reduce searches, some preprocessing is done in playthrough generation to avoid adding obviously unnecessary items
 static void PareDownPlaythrough() {
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> toAddBackItem;
-  //Start at sphere before Ganon's and count down
-  for (int i = ctx->playthroughLocations.size() - 2; i >= 0; i--) {
-    //Check each item location in sphere
-    std::vector<int> erasableIndices;
-    std::vector<RandomizerCheck> sphere = ctx->playthroughLocations.at(i);
-    for (int j = sphere.size() - 1; j >= 0; j--) {
-      RandomizerCheck loc = sphere.at(j);
-      RandomizerGet locGet = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); //Copy out item
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<RandomizerCheck> toAddBackItem;
+    // Start at sphere before Ganon's and count down
+    for (int32_t i = static_cast<int32_t>(ctx->playthroughLocations.size()) - 2; i >= 0; i--) {
+        // Check each item location in sphere
+        std::vector<int> erasableIndices;
+        std::vector<RandomizerCheck> sphere = ctx->playthroughLocations.at(i);
+        for (int32_t j = static_cast<int32_t>(sphere.size()) - 1; j >= 0; j--) {
+            RandomizerCheck loc = sphere.at(j);
+            RandomizerGet locGet = ctx->GetItemLocation(loc)->GetPlacedRandomizerGet(); // Copy out item
 
-      RandomizerGet ignore = RG_NONE;
-      if (locGet == RG_GOLD_SKULLTULA_TOKEN || IsBombchus(locGet, true)
-        || Rando::StaticData::RetrieveItem(locGet).GetItemType() == ITEMTYPE_SHOP) {
-        ignore = locGet;
-      }
+            RandomizerGet ignore = RG_NONE;
+            if (locGet == RG_GOLD_SKULLTULA_TOKEN || IsBombchus(locGet, true) ||
+                Rando::StaticData::RetrieveItem(locGet).GetItemType() == ITEMTYPE_SHOP) {
+                ignore = locGet;
+            }
 
-      //Playthrough is still beatable without this item, therefore it can be removed from playthrough section.
-      if (IsBeatableWithout(loc, false, ignore)) {
-        ctx->playthroughLocations[i].erase(ctx->playthroughLocations[i].begin() + j);
-        ctx->GetItemLocation(loc)->SetDelayedItem(locGet); //Game is still beatable, don't add back until later
-        toAddBackItem.push_back(loc);
-      }
-      else {
-        ctx->GetItemLocation(loc)->SetPlacedItem(locGet); //Immediately put item back so game is beatable again
-      }
+            // Playthrough is still beatable without this item, therefore it can be removed from playthrough section.
+            if (IsBeatableWithout(loc, false, ignore)) {
+                ctx->playthroughLocations[i].erase(ctx->playthroughLocations[i].begin() + j);
+                ctx->GetItemLocation(loc)->SetDelayedItem(locGet); // Game is still beatable, don't add back until later
+                toAddBackItem.push_back(loc);
+            } else {
+                ctx->GetItemLocation(loc)->SetPlacedItem(locGet); // Immediately put item back so game is beatable again
+            }
+        }
     }
-  }
 
-  //Some spheres may now be empty, remove these
-  for (int i = ctx->playthroughLocations.size() - 2; i >= 0; i--) {
-    if (ctx->playthroughLocations.at(i).size() == 0) {
-      ctx->playthroughLocations.erase(ctx->playthroughLocations.begin() + i);
+    // Some spheres may now be empty, remove these
+    for (int i = ctx->playthroughLocations.size() - 2; i >= 0; i--) {
+        if (ctx->playthroughLocations.at(i).size() == 0) {
+            ctx->playthroughLocations.erase(ctx->playthroughLocations.begin() + i);
+        }
     }
-  }
 
-  //Now we can add back items which were removed previously
-  for (RandomizerCheck loc : toAddBackItem) {
-    ctx->GetItemLocation(loc)->SaveDelayedItem();
-  }
+    // Now we can add back items which were removed previously
+    for (RandomizerCheck loc : toAddBackItem) {
+        ctx->GetItemLocation(loc)->SaveDelayedItem();
+    }
 }
 
-//Very similar to PareDownPlaythrough except it sets WotH candidacy of Way of the Hero items
-//Way of the Hero items are more specific than playthrough items in that they are items which *must*
-// be obtained to logically be able to complete the seed, rather than playthrough items which
-// are just possible items you *can* collect to complete the seed.
+// Very similar to PareDownPlaythrough except it sets WotH candidacy of Way of the Hero items
+// Way of the Hero items are more specific than playthrough items in that they are items which *must*
+//  be obtained to logically be able to complete the seed, rather than playthrough items which
+//  are just possible items you *can* collect to complete the seed.
 static void CalculateWotH() {
-  auto ctx = Rando::Context::GetInstance();
-  //size - 1 so Triforce is not counted
-  for (size_t i = 0; i < ctx->playthroughLocations.size() - 1; i++) {
-    for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
-      //If removing this item and no other item caused the game to become unbeatable, then it is strictly necessary,
-      //so add it unless it is in Links Pocket or an isolated place.
-      auto itemLoc = ctx->GetItemLocation(ctx->playthroughLocations[i][j]);
-      if (itemLoc->IsHintable() && itemLoc->GetFirstArea() > RA_LINKS_POCKET &&
-          !(IsBeatableWithout(ctx->playthroughLocations[i][j], true))) {
-        itemLoc->SetWothCandidate();
-      }
+    auto ctx = Rando::Context::GetInstance();
+    // size - 1 so Triforce is not counted
+    for (size_t i = 0; i < ctx->playthroughLocations.size() - 1; i++) {
+        for (size_t j = 0; j < ctx->playthroughLocations[i].size(); j++) {
+            // If removing this item and no other item caused the game to become unbeatable, then it is strictly
+            // necessary, so add it unless it is in Links Pocket or an isolated place.
+            auto itemLoc = ctx->GetItemLocation(ctx->playthroughLocations[i][j]);
+            if (itemLoc->IsHintable() && itemLoc->GetFirstArea() > RA_LINKS_POCKET &&
+                !(IsBeatableWithout(ctx->playthroughLocations[i][j], true))) {
+                itemLoc->SetWothCandidate();
+            }
+        }
     }
-  }
-  ctx->playthroughBeatable = true;
-  logic->Reset();
-  ReachabilitySearch(ctx->allLocations);
+    ctx->playthroughBeatable = true;
+    logic->Reset();
+    ReachabilitySearch(ctx->allLocations);
 }
 
-static bool FindIfBarren(Rando::ItemLocation* itemLoc, std::array<bool, RA_MAX> NotBarren){
-  std::set<RandomizerArea> locAreas = itemLoc->GetAreas();
-  for (auto locArea: locAreas){
-    if (NotBarren[locArea]){
-      return false;
-    }
-  }
-  return true;
-}
-
-//Calculate barren locations and assign Barren Candidacy to all locations inside those areas
-static void CalculateBarren() {
-  auto ctx = Rando::Context::GetInstance();
-  std::array<bool, RA_MAX> NotBarren = {}; //I would invert this but the "initialise all as true" syntax wasn't working
-  //Isolated Areas and Link's Pocket are never Hinted Barren
-  NotBarren[RA_NONE] = true;
-  NotBarren[RA_LINKS_POCKET] = true; 
-
-  for (RandomizerCheck loc : ctx->allLocations) {
-    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+static bool FindIfBarren(Rando::ItemLocation* itemLoc, std::array<bool, RA_MAX> NotBarren) {
     std::set<RandomizerArea> locAreas = itemLoc->GetAreas();
-    for (auto locArea: locAreas){
-      // If a location has a major item or is a way of the hero location, it is not barren
-      if (NotBarren[locArea] == false && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
-        NotBarren[locArea] = true;
-      } 
+    for (auto locArea : locAreas) {
+        if (NotBarren[locArea]) {
+            return false;
+        }
     }
-  }
-
-  for (RandomizerCheck loc : ctx->allLocations) {
-    Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
-    if (FindIfBarren(itemLoc, NotBarren)){
-      itemLoc->SetBarrenCandidate();
-    }
-  }
+    return true;
 }
 
-//Will place things completely randomly, no logic checks are performed
-static void FastFill(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> locations, bool endOnItemsEmpty = false) {
-  auto ctx = Rando::Context::GetInstance();
-  //Loop until locations are empty, or also end if items are empty and the parameters specify to end then
-  while (!locations.empty() && (!endOnItemsEmpty || !items.empty())) {
-    if (items.empty() && !endOnItemsEmpty) {
-      items.push_back(GetJunkItem());
+// Calculate barren locations and assign Barren Candidacy to all locations inside those areas
+static void CalculateBarren() {
+    auto ctx = Rando::Context::GetInstance();
+    std::array<bool, RA_MAX>
+        NotBarren = {}; // I would invert this but the "initialise all as true" syntax wasn't working
+    // Isolated Areas and Link's Pocket are never Hinted Barren
+    NotBarren[RA_NONE] = true;
+    NotBarren[RA_LINKS_POCKET] = true;
+
+    for (RandomizerCheck loc : ctx->allLocations) {
+        Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+        std::set<RandomizerArea> locAreas = itemLoc->GetAreas();
+        for (auto locArea : locAreas) {
+            // If a location has a major item or is a way of the hero location, it is not barren
+            if (NotBarren[locArea] == false && (itemLoc->GetPlacedItem().IsMajorItem() || itemLoc->IsWothCandidate())) {
+                NotBarren[locArea] = true;
+            }
+        }
     }
 
-    RandomizerCheck loc = RandomElement(locations, true);
-    ctx->GetItemLocation(loc)->SetAsHintable();
-    ctx->PlaceItemInLocation(loc, RandomElement(items, true));
-  }
+    for (RandomizerCheck loc : ctx->allLocations) {
+        Rando::ItemLocation* itemLoc = ctx->GetItemLocation(loc);
+        if (FindIfBarren(itemLoc, NotBarren)) {
+            itemLoc->SetBarrenCandidate();
+        }
+    }
+}
+
+// Will place things completely randomly, no logic checks are performed
+static void FastFill(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> locations,
+                     bool endOnItemsEmpty = false) {
+    auto ctx = Rando::Context::GetInstance();
+    // Loop until locations are empty, or also end if items are empty and the parameters specify to end then
+    while (!locations.empty() && (!endOnItemsEmpty || !items.empty())) {
+        if (items.empty() && !endOnItemsEmpty) {
+            items.push_back(GetJunkItem());
+        }
+
+        RandomizerCheck loc = RandomElement(locations, true);
+        ctx->GetItemLocation(loc)->SetAsHintable();
+        ctx->PlaceItemInLocation(loc, RandomElement(items, true));
+    }
 }
 
 /*
@@ -859,7 +913,7 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
                 // reset any locations that got an item
                 for (RandomizerCheck loc : attemptedLocations) {
                     ctx->GetItemLocation(loc)->SetPlacedItem(RG_NONE);
-                    //itemsPlaced--;
+                    // itemsPlaced--;
                 }
                 attemptedLocations.clear();
 
@@ -882,12 +936,10 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
             // If ALR is off, then we check beatability after placing the item.
             // If the game is beatable, then we can stop placing items with logic.
             if (!ctx->GetOption(RSK_ALL_LOCATIONS_REACHABLE)) {
-                ctx->playthroughBeatable = false;
                 logic->Reset();
-                CheckBeatable();
-                if (ctx->playthroughBeatable) {
+                if (CheckBeatable()) {
                     SPDLOG_DEBUG("Game beatable, now placing items randomly. " + std::to_string(itemsToPlace.size()) +
-                                " major items remaining.\n\n");
+                                 " major items remaining.\n\n");
                     FastFill(itemsToPlace, GetEmptyLocations(allowedLocations), true);
                     return;
                 }
@@ -896,121 +948,136 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
     } while (unsuccessfulPlacement);
 }
 
-//This function will specifically randomize dungeon rewards for the End of Dungeons
-//setting, or randomize one dungeon reward to Link's Pocket if that setting is on
+// This function will specifically randomize dungeon rewards for the End of Dungeons
+// setting, or randomize one dungeon reward to Link's Pocket if that setting is on
 static void RandomizeDungeonRewards() {
-  auto ctx = Rando::Context::GetInstance();
-  //quest item bit mask of each stone/medallion for the savefile
-  // static constexpr std::array<uint32_t, 9> bitMaskTable = {
-  //   0x00040000, //Kokiri Emerald
-  //   0x00080000, //Goron Ruby
-  //   0x00100000, //Zora Sapphire
-  //   0x00000001, //Forest Medallion
-  //   0x00000002, //Fire Medallion
-  //   0x00000004, //Water Medallion
-  //   0x00000008, //Spirit Medallion
-  //   0x00000010, //Shadow Medallion
-  //   0x00000020, //Light Medallion
-  // };
-  int baseOffset = Rando::StaticData::RetrieveItem(RG_KOKIRI_EMERALD).GetItemID();
+    auto ctx = Rando::Context::GetInstance();
+    // quest item bit mask of each stone/medallion for the savefile
+    //  static constexpr std::array<uint32_t, 9> bitMaskTable = {
+    //    0x00040000, //Kokiri Emerald
+    //    0x00080000, //Goron Ruby
+    //    0x00100000, //Zora Sapphire
+    //    0x00000001, //Forest Medallion
+    //    0x00000002, //Fire Medallion
+    //    0x00000004, //Water Medallion
+    //    0x00000008, //Spirit Medallion
+    //    0x00000010, //Shadow Medallion
+    //    0x00000020, //Light Medallion
+    //  };
+    int baseOffset = Rando::StaticData::RetrieveItem(RG_KOKIRI_EMERALD).GetItemID();
 
-  //End of Dungeons includes Link's Pocket
-  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
-    //get stones and medallions
-    std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
+    // End of Dungeons includes Link's Pocket
+    if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) ||
+        ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
+        // get stones and medallions
+        std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;
+        });
 
-    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) { // Place dungeon rewards in vanilla locations
-      for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) {
-        ctx->GetItemLocation(loc)->PlaceVanillaItem();
-      }
-      ctx->GetItemLocation(RC_GIFT_FROM_RAURU)->PlaceVanillaItem();
-    } else { // Randomize dungeon rewards with assumed fill
-      std::vector rewardLocations(Rando::StaticData::dungeonRewardLocations);
-      // If there are less than 9 dungeon rewards, prioritize actual dungeons for placement
-      if (rewards.size() < 9) {
-        ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
-      } else {
-        rewardLocations.push_back(RC_LINKS_POCKET);
-      }
-      AssumedFill(rewards, rewardLocations);
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA) ||
+            ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS)
+                .Is(RO_DUNGEON_REWARDS_VANILLA)) { // Place dungeon rewards in vanilla locations
+            for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) {
+                ctx->GetItemLocation(loc)->PlaceVanillaItem();
+            }
+            ctx->GetItemLocation(RC_GIFT_FROM_RAURU)->PlaceVanillaItem();
+        } else { // Randomize dungeon rewards with assumed fill
+            std::vector rewardLocations(Rando::StaticData::dungeonRewardLocations);
+            // If there are less than 9 dungeon rewards, prioritize actual dungeons for placement
+            if (rewards.size() < 9) {
+                ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
+            } else {
+                rewardLocations.push_back(RC_LINKS_POCKET);
+            }
+            AssumedFill(rewards, rewardLocations);
+        }
+    } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_DUNGEON_REWARD)) {
+        // get 1 stone/medallion
+        std::vector<RandomizerGet> rewards = FilterFromPool(ItemPool, [](const auto i) {
+            return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;
+        });
+        // If there are no remaining stones/medallions, then Link's pocket won't get one
+        if (rewards.empty()) {
+            ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
+            return;
+        }
+        RandomizerGet startingReward = RandomElement(rewards, true);
+
+        // LinksPocketRewardBitMask = bitMaskTable[Rando::StaticData::RetrieveItem(startingReward).GetItemID() -
+        // baseOffset];
+        ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingReward);
+        // erase the stone/medallion from the Item Pool
+        FilterAndEraseFromPool(ItemPool, [startingReward](const RandomizerGet i) { return i == startingReward; });
     }
-  } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_DUNGEON_REWARD)) {
-    //get 1 stone/medallion
-    std::vector<RandomizerGet> rewards = FilterFromPool(
-        ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
-    // If there are no remaining stones/medallions, then Link's pocket won't get one
-    if (rewards.empty()) {
-      ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
-      return;
-    }
-    RandomizerGet startingReward = RandomElement(rewards, true);
-
-    //LinksPocketRewardBitMask = bitMaskTable[Rando::StaticData::RetrieveItem(startingReward).GetItemID() - baseOffset];
-    ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingReward);
-    //erase the stone/medallion from the Item Pool
-    FilterAndEraseFromPool(ItemPool, [startingReward](const RandomizerGet i) {return i == startingReward;});
-  }
 }
 
-//Fills any locations excluded by the player with junk items so that advancement items
-//can't be placed there.
+// Fills any locations excluded by the player with junk items so that advancement items
+// can't be placed there.
 static void FillExcludedLocations() {
-  auto ctx = Rando::Context::GetInstance();
-  //Only fill in excluded locations that don't already have something and are forbidden
-  std::vector<RandomizerCheck> excludedLocations = FilterFromPool(ctx->allLocations, [ctx](const auto loc){
-    return ctx->GetItemLocation(loc)->IsExcluded();
-  });
+    auto ctx = Rando::Context::GetInstance();
+    // Only fill in excluded locations that don't already have something and are forbidden
+    std::vector<RandomizerCheck> excludedLocations =
+        FilterFromPool(ctx->allLocations, [ctx](const auto loc) { return ctx->GetItemLocation(loc)->IsExcluded(); });
 
-  for (RandomizerCheck loc : excludedLocations) {
-    PlaceJunkInExcludedLocation(loc);
-  }
+    for (RandomizerCheck loc : excludedLocations) {
+        PlaceJunkInExcludedLocation(loc);
+    }
 }
 
-//Function to handle the Own Dungeon setting
+// Function to handle the Own Dungeon setting
 static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerGet> dungeonItems;
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<RandomizerGet> dungeonItems;
 
-  // Search and filter for locations that match the hint region of the dungeon
-  // This accounts for boss room shuffle so that own dungeon items can be placed
-  // in the shuffled boss room
-  std::vector<RandomizerCheck> dungeonLocations = FilterFromPool(ctx->allLocations, [dungeon, ctx](const auto loc) {
-    return ctx->GetItemLocation(loc)->GetAreas().contains(dungeon->GetArea());
-  });
+    // Search and filter for locations that match the hint region of the dungeon
+    // This accounts for boss room shuffle so that own dungeon items can be placed
+    // in the shuffled boss room
+    std::vector<RandomizerCheck> dungeonLocations = FilterFromPool(ctx->allLocations, [dungeon, ctx](const auto loc) {
+        return ctx->GetItemLocation(loc)->GetAreas().contains(dungeon->GetArea());
+    });
 
-  //filter out locations that may be required to have songs placed at them
-  dungeonLocations = FilterFromPool(dungeonLocations, [ctx](const auto loc) {
-    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
-      return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION);
+    // filter out locations that may be required to have songs placed at them
+    dungeonLocations = FilterFromPool(dungeonLocations, [ctx](const auto loc) {
+        if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS) ||
+            ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_OFF)) {
+            return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION);
+        }
+        if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
+            return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
+                     loc == RC_SHEIK_IN_ICE_CAVERN || loc == RC_SONG_FROM_IMPA);
+        }
+        return true;
+    });
+
+    // Add specific items that need be randomized within this dungeon
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetSmallKey() != RG_NONE) {
+        std::vector<RandomizerGet> dungeonSmallKeys =
+            FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+                return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());
+            });
+        AddElementsToPool(dungeonItems, dungeonSmallKeys);
     }
-    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
-      return !(Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
-             loc == RC_SHEIK_IN_ICE_CAVERN ||
-             loc == RC_SONG_FROM_IMPA);
-    }
-    return true;
-  });
 
-  //Add specific items that need be randomized within this dungeon
-  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetSmallKey() != RG_NONE) {
-    std::vector<RandomizerGet> dungeonSmallKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
-    AddElementsToPool(dungeonItems, dungeonSmallKeys);
-  }
-
-  if ((ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) ||
-      (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON) && dungeon->GetBossKey() == RG_GANONS_CASTLE_BOSS_KEY)) {
-        auto dungeonBossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetBossKey();});
+    if ((ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) &&
+         dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) ||
+        (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON) &&
+         dungeon->GetBossKey() == RG_GANONS_CASTLE_BOSS_KEY)) {
+        auto dungeonBossKey =
+            FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) { return i == dungeon->GetBossKey(); });
         AddElementsToPool(dungeonItems, dungeonBossKey);
-  }
+    }
 
-  //randomize boss key and small keys together for even distribution
-  AssumedFill(dungeonItems, dungeonLocations);
+    // randomize boss key and small keys together for even distribution
+    AssumedFill(dungeonItems, dungeonLocations);
 
-  //randomize map and compass separately since they're not progressive
-  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetMap() != RG_NONE && dungeon->GetCompass() != RG_NONE) {
-    auto dungeonMapAndCompass = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){ return i == dungeon->GetMap() || i == dungeon->GetCompass();});
-    AssumedFill(dungeonMapAndCompass, dungeonLocations);
-  }
+    // randomize map and compass separately since they're not progressive
+    if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) && dungeon->GetMap() != RG_NONE &&
+        dungeon->GetCompass() != RG_NONE) {
+        auto dungeonMapAndCompass = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+            return i == dungeon->GetMap() || i == dungeon->GetCompass();
+        });
+        AssumedFill(dungeonMapAndCompass, dungeonLocations);
+    }
 }
 
 /*Randomize items restricted to a certain set of locations.
@@ -1022,353 +1089,373 @@ static void RandomizeOwnDungeon(const Rando::DungeonInfo* dungeon) {
   will be randomized together if they have the same setting. Maps and Compasses
   are randomized separately once the dungeon advancement items have all been placed.*/
 static void RandomizeDungeonItems() {
-  auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
 
-  //Get Any Dungeon and Overworld group locations
-  std::vector<RandomizerCheck> anyDungeonLocations = Rando::StaticData::GetAllDungeonLocations();
+    // Get Any Dungeon and Overworld group locations
+    std::vector<RandomizerCheck> anyDungeonLocations = Rando::StaticData::GetAllDungeonLocations();
 
-  //Create Any Dungeon and Overworld item pools
-  std::vector<RandomizerGet> anyDungeonItems;
-  std::vector<RandomizerGet> overworldItems;
+    // Create Any Dungeon and Overworld item pools
+    std::vector<RandomizerGet> anyDungeonItems;
+    std::vector<RandomizerGet> overworldItems;
 
-  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
-      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
-      AddElementsToPool(anyDungeonItems, dungeonKeys);
-    } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
-      auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());});
-      AddElementsToPool(overworldItems, dungeonKeys);
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+        if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
+            auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+                return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());
+            });
+            AddElementsToPool(anyDungeonItems, dungeonKeys);
+        } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+            auto dungeonKeys = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+                return (i == dungeon->GetSmallKey()) || (i == dungeon->GetKeyRing());
+            });
+            AddElementsToPool(overworldItems, dungeonKeys);
+        }
+
+        if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) &&
+            dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+            auto bossKey = FilterAndEraseFromPool(
+                ItemPool, [dungeon](const RandomizerGet i) { return i == dungeon->GetBossKey(); });
+            AddElementsToPool(anyDungeonItems, bossKey);
+        } else if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) &&
+                   dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
+            auto bossKey = FilterAndEraseFromPool(
+                ItemPool, [dungeon](const RandomizerGet i) { return i == dungeon->GetBossKey(); });
+            AddElementsToPool(overworldItems, bossKey);
+        }
+
+        if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
+            auto ganonBossKey =
+                FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
+            AddElementsToPool(anyDungeonItems, ganonBossKey);
+        } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
+            auto ganonBossKey =
+                FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
+            AddElementsToPool(overworldItems, ganonBossKey);
+        }
     }
 
-    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
-      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
-      AddElementsToPool(anyDungeonItems, bossKey);
-    } else if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) && dungeon->GetBossKey() != RG_GANONS_CASTLE_BOSS_KEY) {
-      auto bossKey = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetBossKey();});
-      AddElementsToPool(overworldItems, bossKey);
+    if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_ANY_DUNGEON)) {
+        auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return i == RG_GERUDO_FORTRESS_SMALL_KEY || i == RG_GERUDO_FORTRESS_KEY_RING;
+        });
+        AddElementsToPool(anyDungeonItems, gerudoKeys);
+    } else if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_OVERWORLD)) {
+        auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return i == RG_GERUDO_FORTRESS_SMALL_KEY || i == RG_GERUDO_FORTRESS_KEY_RING;
+        });
+        AddElementsToPool(overworldItems, gerudoKeys);
     }
 
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
-      auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i){return i == RG_GANONS_CASTLE_BOSS_KEY;});
-      AddElementsToPool(anyDungeonItems, ganonBossKey);
-    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
-        auto ganonBossKey = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GANONS_CASTLE_BOSS_KEY; });
-      AddElementsToPool(overworldItems, ganonBossKey);
+    if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANY_DUNGEON)) {
+        auto rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;
+        });
+        AddElementsToPool(anyDungeonItems, rewards);
+    } else if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_OVERWORLD)) {
+        auto rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;
+        });
+        AddElementsToPool(overworldItems, rewards);
     }
-  }
 
-  if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_ANY_DUNGEON)) {
-      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY || i == RG_GERUDO_FORTRESS_KEY_RING; });
-    AddElementsToPool(anyDungeonItems, gerudoKeys);
-  } else if (ctx->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_OVERWORLD)) {
-      auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == RG_GERUDO_FORTRESS_SMALL_KEY || i == RG_GERUDO_FORTRESS_KEY_RING; });
-    AddElementsToPool(overworldItems, gerudoKeys);
-  }
+    // Randomize Any Dungeon and Overworld pools
+    AssumedFill(anyDungeonItems, anyDungeonLocations, true);
+    AssumedFill(overworldItems, ctx->overworldLocations, true);
 
-  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANY_DUNGEON)) {
-      auto rewards = FilterAndEraseFromPool(
-          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
-    AddElementsToPool(anyDungeonItems, rewards);
-  } else if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_OVERWORLD)) {
-      auto rewards = FilterAndEraseFromPool(
-          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; });
-    AddElementsToPool(overworldItems, rewards);
-  }
-
-  //Randomize Any Dungeon and Overworld pools
-  AssumedFill(anyDungeonItems, anyDungeonLocations, true);
-  AssumedFill(overworldItems, ctx->overworldLocations, true);
-
-  //Randomize maps and compasses after since they're not advancement items
-  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
-      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
-      AssumedFill(mapAndCompassItems, anyDungeonLocations, true);
-    } else if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
-      auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i){return i == dungeon->GetMap() || i == dungeon->GetCompass();});
-      AssumedFill(mapAndCompassItems, ctx->overworldLocations, true);
+    // Randomize maps and compasses after since they're not advancement items
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+        if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON)) {
+            auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+                return i == dungeon->GetMap() || i == dungeon->GetCompass();
+            });
+            AssumedFill(mapAndCompassItems, anyDungeonLocations, true);
+        } else if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+            auto mapAndCompassItems = FilterAndEraseFromPool(ItemPool, [dungeon](const RandomizerGet i) {
+                return i == dungeon->GetMap() || i == dungeon->GetCompass();
+            });
+            AssumedFill(mapAndCompassItems, ctx->overworldLocations, true);
+        }
     }
-  }
 }
 
 static void RandomizeLinksPocket() {
-  auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_ADVANCEMENT)) {
-   //Get all the advancement items                                                                                                     don't include tokens
-      std::vector<RandomizerGet> advancementItems = FilterAndEraseFromPool(ItemPool, [](const auto i) {
-          return Rando::StaticData::RetrieveItem(i).IsAdvancement() && Rando::StaticData::RetrieveItem(i).GetItemType() != ITEMTYPE_TOKEN;
-      });
-   //select a random one
-   RandomizerGet startingItem = RandomElement(advancementItems, true);
-   //add the others back
-   AddElementsToPool(ItemPool, advancementItems);
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_ADVANCEMENT)) {
+        // Get all the advancement items don't include tokens
+        std::vector<RandomizerGet> advancementItems = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+            return Rando::StaticData::RetrieveItem(i).IsAdvancement() &&
+                   Rando::StaticData::RetrieveItem(i).GetItemType() != ITEMTYPE_TOKEN;
+        });
+        // select a random one
+        RandomizerGet startingItem = RandomElement(advancementItems, true);
+        // add the others back
+        AddElementsToPool(ItemPool, advancementItems);
 
-   ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingItem);
- } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_NOTHING)) {
-   ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
- }
+        ctx->PlaceItemInLocation(RC_LINKS_POCKET, startingItem);
+    } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_NOTHING)) {
+        ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
+    }
 }
 
 void VanillaFill() {
-  auto ctx = Rando::Context::GetInstance();
-  //Perform minimum needed initialization
-  RegionTable_Init();
-  ctx->GenerateLocationPool();
-  GenerateItemPool();
-  GenerateStartingInventory();
-  //Place vanilla item in each location
-  RandomizeDungeonRewards();
-  for (RandomizerCheck loc : ctx->allLocations) {
-    ctx->GetItemLocation(loc)->PlaceVanillaItem();
-  }
-  //If necessary, handle ER stuff
-  if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
-    SPDLOG_INFO("Shuffling Entrances...");
-    ctx->GetEntranceShuffler()->ShuffleAllEntrances();
-    SPDLOG_INFO("Shuffling Entrances Done");
-  }
-  // Populate the playthrough for entrances so they are placed in the spoiler log
-  GeneratePlaythrough();
-  //Finish up
-  ctx->CreateItemOverrides();
-  ctx->GetEntranceShuffler()->CreateEntranceOverrides();
-  CreateWarpSongTexts();
+    auto ctx = Rando::Context::GetInstance();
+    // Perform minimum needed initialization
+    RegionTable_Init();
+    ctx->GenerateLocationPool();
+    GenerateItemPool();
+    GenerateStartingInventory();
+    // Place vanilla item in each location
+    RandomizeDungeonRewards();
+    for (RandomizerCheck loc : ctx->allLocations) {
+        ctx->GetItemLocation(loc)->PlaceVanillaItem();
+    }
+    // If necessary, handle ER stuff
+    if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
+        SPDLOG_INFO("Shuffling Entrances...");
+        ctx->GetEntranceShuffler()->ShuffleAllEntrances();
+        SPDLOG_INFO("Shuffling Entrances Done");
+    }
+    // Populate the playthrough for entrances so they are placed in the spoiler log
+    GeneratePlaythrough();
+    // Finish up
+    ctx->CreateItemOverrides();
+    ctx->GetEntranceShuffler()->CreateEntranceOverrides();
+    CreateWarpSongTexts();
 }
 
 void ClearProgress() {
 }
 
 int Fill() {
-  auto ctx = Rando::Context::GetInstance();
-  int retries = 0;
-  SPDLOG_INFO("Starting seed generation...");
-  while(retries < 5) {
-    SPDLOG_INFO("Attempt {}...", retries + 1);
-    placementFailure = false;
-    //showItemProgress = false;
-    ctx->playthroughLocations.clear();
-    ctx->GetEntranceShuffler()->playthroughEntrances.clear();
-    RegionTable_Init(); //Reset the world graph to intialize the proper locations
-    ctx->ItemReset(); //Reset shops incase of shopsanity random
-    ctx->GenerateLocationPool();
-    GenerateItemPool();
-    GenerateStartingInventory();
-    RemoveStartingItemsFromPool();
-    FillExcludedLocations();
+    auto ctx = Rando::Context::GetInstance();
+    int retries = 0;
+    SPDLOG_INFO("Starting seed generation...");
+    while (retries < 5) {
+        SPDLOG_INFO("Attempt {}...", retries + 1);
+        placementFailure = false;
+        // showItemProgress = false;
+        ctx->playthroughLocations.clear();
+        ctx->GetEntranceShuffler()->playthroughEntrances.clear();
+        RegionTable_Init(); // Reset the world graph to intialize the proper locations
+        ctx->ItemReset();   // Reset shops incase of shopsanity random
+        ctx->GenerateLocationPool();
+        GenerateItemPool();
+        GenerateStartingInventory();
+        RemoveStartingItemsFromPool();
+        FillExcludedLocations();
 
-    //Temporarily add shop items to the ItemPool so that entrance randomization
-    //can validate the world using deku/hylian shields
-    StartPerformanceTimer(PT_ENTRANCE_SHUFFLE);
-    AddElementsToPool(ItemPool, GetMinVanillaShopItems(8)); //assume worst case shopsanity 7
-    if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
-      SPDLOG_INFO("Shuffling Entrances...");
-      if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
+        // Temporarily add shop items to the ItemPool so that entrance randomization
+        // can validate the world using deku/hylian shields
+        StartPerformanceTimer(PT_ENTRANCE_SHUFFLE);
+        AddElementsToPool(ItemPool, GetMinVanillaShopItems(8)); // assume worst case shopsanity 7
+        if (ctx->GetOption(RSK_SHUFFLE_ENTRANCES)) {
+            SPDLOG_INFO("Shuffling Entrances...");
+            if (ctx->GetEntranceShuffler()->ShuffleAllEntrances() == ENTRANCE_SHUFFLE_FAILURE) {
+                retries++;
+                ClearProgress();
+                continue;
+            }
+            SPDLOG_INFO("Shuffling Entrances Done");
+        }
+        SetAreas();
+        // erase temporary shop items
+        FilterAndEraseFromPool(ItemPool, [](const auto item) {
+            return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP;
+        });
+        StopPerformanceTimer(PT_ENTRANCE_SHUFFLE);
+
+        // ctx->showItemProgress = true;
+        // Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
+
+        StartPerformanceTimer(PT_SHOPSANITY);
+        if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
+            SPDLOG_INFO("Placing Vanilla Shop Items...");
+            PlaceVanillaShopItems(); // Place vanilla shop items in vanilla location
+        } else {
+            SPDLOG_INFO("Shuffling Shop Items");
+            int total_replaced = 0;
+            if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_RANDOM) ||
+                ctx->GetOption(RSK_SHOPSANITY_COUNT).IsNot(RO_SHOPSANITY_COUNT_ZERO_ITEMS)) { // Shopsanity 1-7, random
+                /*
+                Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
+                  8 6    2 4
+                  7 5    1 3
+                */
+                const std::array<int, 8> indices = { 7, 5, 8, 6, 3, 1, 4, 2 };
+// Overwrite appropriate number of shop items
+#define LOCATIONS_PER_SHOP 8
+                for (size_t i = 0; i < Rando::StaticData::GetShopLocations().size() / LOCATIONS_PER_SHOP; i++) {
+                    int num_to_replace =
+                        GetShopsanityReplaceAmount(); // 1-7 shop items will be overwritten, depending on settings
+                    total_replaced += num_to_replace;
+                    for (int j = 0; j < num_to_replace; j++) {
+                        int itemindex = indices[j];
+                        RandomizerCheck rc =
+                            Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1];
+                        Rando::ItemLocation* itemLoc = ctx->GetItemLocation(rc);
+                        uint16_t shopsanityPrice = GetRandomPrice(Rando::StaticData::GetLocation(rc), shopsanityPrices);
+                        itemLoc->SetCustomPrice(shopsanityPrice);
+                    }
+                }
+#undef LOCATIONS_PER_SHOP
+            }
+            // Get all locations and items that don't have a shopsanity price attached
+            std::vector<RandomizerCheck> shopLocations = {};
+            // Get as many vanilla shop items as the total number of shop items minus the number of replaced items
+            // So shopsanity 0 will get all 64 vanilla items, shopsanity 4 will get 32, etc.
+            std::vector<RandomizerGet> shopItems = GetMinVanillaShopItems(total_replaced);
+
+            for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetShopLocations()) {
+                if (!(ctx->GetItemLocation(randomizerCheck)->HasCustomPrice())) {
+                    shopLocations.push_back(randomizerCheck);
+                }
+            }
+            // Place the shop items which will still be at shop locations
+            AssumedFill(shopItems, shopLocations);
+        }
+
+        // Add prices to scrubs
+        auto scrubLoc = Rando::StaticData::GetScrubLocations();
+        if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
+            for (size_t i = 0; i < scrubLoc.size(); i++) {
+                ctx->GetItemLocation(scrubLoc[i])
+                    ->SetCustomPrice(GetRandomPrice(Rando::StaticData::GetLocation(scrubLoc[i]), scrubPrices));
+            }
+        } else {
+            for (size_t i = 0; i < scrubLoc.size(); i++) {
+                ctx->GetItemLocation(scrubLoc[i])
+                    ->SetCustomPrice(Rando::StaticData::GetLocation(scrubLoc[i])->GetVanillaPrice());
+            }
+        }
+
+        // set merchant prices
+        if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+            ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
+            ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)
+                ->SetCustomPrice(
+                    GetRandomPrice(Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN), merchantPrices));
+        } else {
+            ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)
+                ->SetCustomPrice(Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetVanillaPrice());
+        }
+
+        auto merchantLoc = Rando::StaticData::GetMerchantLocations();
+
+        if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+            ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
+            for (size_t i = 0; i < merchantLoc.size(); i++) {
+                ctx->GetItemLocation(merchantLoc[i])
+                    ->SetCustomPrice(GetRandomPrice(Rando::StaticData::GetLocation(merchantLoc[i]), merchantPrices));
+            }
+        } else {
+            for (size_t i = 0; i < merchantLoc.size(); i++) {
+                ctx->GetItemLocation(merchantLoc[i])
+                    ->SetCustomPrice(Rando::StaticData::GetLocation(merchantLoc[i])->GetVanillaPrice());
+            }
+        }
+        StopPerformanceTimer(PT_SHOPSANITY);
+
+        StartPerformanceTimer(PT_OWN_DUNGEON);
+        // Place dungeon rewards
+        SPDLOG_INFO("Shuffling and Placing Dungeon Items...");
+        RandomizeDungeonRewards();
+
+        // Place dungeon items restricted to their Own Dungeon
+        for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            RandomizeOwnDungeon(dungeon);
+        }
+        StopPerformanceTimer(PT_OWN_DUNGEON);
+
+        StartPerformanceTimer(PT_LIMITED_CHECKS);
+        // Then Place songs if song shuffle is set to specific locations
+        if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_ANYWHERE) &&
+            ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_OFF)) {
+            // Get each song
+            std::vector<RandomizerGet> songs = FilterAndEraseFromPool(ItemPool, [](const auto i) {
+                return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_SONG;
+            });
+
+            // Get each song location
+            std::vector<RandomizerCheck> songLocations;
+            if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
+                songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
+                    return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION;
+                });
+
+            } else if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
+                songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
+                    return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
+                           loc == RC_SHEIK_IN_ICE_CAVERN || loc == RC_SONG_FROM_IMPA;
+                });
+            }
+
+            AssumedFill(songs, songLocations, true);
+        }
+
+        // Then place dungeon items that are assigned to restrictive location pools
+        RandomizeDungeonItems();
+        SPDLOG_INFO("Dungeon Items Done");
+
+        // Then place Link's Pocket Item if it has to be an advancement item
+        RandomizeLinksPocket();
+        StopPerformanceTimer(PT_LIMITED_CHECKS);
+
+        StartPerformanceTimer(PT_ADVANCEMENT_ITEMS);
+        SPDLOG_INFO("Shuffling Advancement Items");
+        // Then place the rest of the advancement items
+        std::vector<RandomizerGet> remainingAdvancementItems = FilterAndEraseFromPool(
+            ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
+        AssumedFill(remainingAdvancementItems, ctx->allLocations, true);
+        StopPerformanceTimer(PT_ADVANCEMENT_ITEMS);
+
+        StartPerformanceTimer(PT_REMAINING_ITEMS);
+        // Fast fill for the rest of the pool
+        SPDLOG_INFO("Shuffling Remaining Items");
+        std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
+        FastFill(remainingPool, GetAllEmptyLocations(), false);
+        StopPerformanceTimer(PT_REMAINING_ITEMS);
+
+        StartPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
+        GeneratePlaythrough();
+        StopPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
+        // Successful placement, produced beatable result
+        if (ctx->playthroughBeatable && !placementFailure) {
+
+            SPDLOG_INFO("Calculating Playthrough...");
+            StartPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
+            PareDownPlaythrough();
+            StopPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
+
+            StartPerformanceTimer(PT_WOTH);
+            CalculateWotH();
+            StopPerformanceTimer(PT_WOTH);
+
+            StartPerformanceTimer(PT_FOOLISH);
+            CalculateBarren();
+            StopPerformanceTimer(PT_FOOLISH);
+            SPDLOG_INFO("Calculating Playthrough Done");
+
+            StartPerformanceTimer(PT_OVERRIDES);
+            ctx->CreateItemOverrides();
+            ctx->GetEntranceShuffler()->CreateEntranceOverrides();
+            StopPerformanceTimer(PT_OVERRIDES);
+
+            StartPerformanceTimer(PT_HINTS);
+            CreateAllHints();
+            CreateWarpSongTexts();
+            StopPerformanceTimer(PT_HINTS);
+            SPDLOG_DEBUG("Number of retries {}", retries);
+            return 1;
+        }
+        // Unsuccessful placement
+        if (retries < 4) {
+            SPDLOG_DEBUG("Failed to generate a beatable seed. Retrying...");
+            Regions::ResetAllLocations();
+            logic->Reset();
+            ClearProgress();
+        }
         retries++;
-        ClearProgress();
-        continue;
-      }
-      SPDLOG_INFO("Shuffling Entrances Done");
     }
-    SetAreas();
-    //erase temporary shop items
-    FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; });
-    StopPerformanceTimer(PT_ENTRANCE_SHUFFLE);
-
-    //ctx->showItemProgress = true;
-    //Place shop items first, since a buy shield is needed to place a dungeon reward on Gohma due to access
-
-    StartPerformanceTimer(PT_SHOPSANITY);
-    if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
-      SPDLOG_INFO("Placing Vanilla Shop Items...");
-      PlaceVanillaShopItems(); //Place vanilla shop items in vanilla location
-    } else {
-      SPDLOG_INFO("Shuffling Shop Items");
-      int total_replaced = 0;
-      if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_RANDOM) || ctx->GetOption(RSK_SHOPSANITY_COUNT).IsNot(RO_SHOPSANITY_COUNT_ZERO_ITEMS)) { //Shopsanity 1-7, random
-        /*
-        Indices from OoTR. So shopsanity one will overwrite 7, three will overwrite 7, 5, 8, etc.
-          8 6    2 4
-          7 5    1 3
-        */
-        const std::array<int, 8> indices = { 7, 5, 8, 6, 3, 1, 4, 2 };
-        //Overwrite appropriate number of shop items
-        #define LOCATIONS_PER_SHOP 8
-        for (size_t i = 0; i < Rando::StaticData::GetShopLocations().size() / LOCATIONS_PER_SHOP; i++) {
-          int num_to_replace = GetShopsanityReplaceAmount(); //1-7 shop items will be overwritten, depending on settings
-          total_replaced += num_to_replace;
-          for (int j = 0; j < num_to_replace; j++) {
-            int itemindex = indices[j];
-            RandomizerCheck rc = Rando::StaticData::GetShopLocations()[i * LOCATIONS_PER_SHOP + itemindex - 1];
-            Rando::ItemLocation* itemLoc = ctx->GetItemLocation(rc);
-            uint16_t shopsanityPrice = GetRandomPrice(Rando::StaticData::GetLocation(rc), shopsanityPrices);
-            itemLoc->SetCustomPrice(shopsanityPrice);
-          }
-        }
-        #undef LOCATIONS_PER_SHOP
-      }
-      //Get all locations and items that don't have a shopsanity price attached
-      std::vector<RandomizerCheck> shopLocations = {};
-      //Get as many vanilla shop items as the total number of shop items minus the number of replaced items
-      //So shopsanity 0 will get all 64 vanilla items, shopsanity 4 will get 32, etc.
-      std::vector<RandomizerGet> shopItems = GetMinVanillaShopItems(total_replaced);
-
-      for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetShopLocations()) {
-        if (!(ctx->GetItemLocation(randomizerCheck)->HasCustomPrice())) {
-          shopLocations.push_back(randomizerCheck);
-        }
-      }
-      //Place the shop items which will still be at shop locations
-      AssumedFill(shopItems, shopLocations);
-    }
-
-    //Add prices to scrubs
-    auto scrubLoc = Rando::StaticData::GetScrubLocations();
-    if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
-      for (size_t i = 0; i < scrubLoc.size(); i++) {
-        ctx->GetItemLocation(scrubLoc[i])->SetCustomPrice(
-          GetRandomPrice(Rando::StaticData::GetLocation(scrubLoc[i]), scrubPrices)
-        );
-      }
-    } else {
-      for (size_t i = 0; i < scrubLoc.size(); i++) {
-        ctx->GetItemLocation(scrubLoc[i])->SetCustomPrice(
-          Rando::StaticData::GetLocation(scrubLoc[i])->GetVanillaPrice()
-        );
-      }
-    }
-
-    //set merchant prices
-    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
-        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)){
-      ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->SetCustomPrice(
-        GetRandomPrice(Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN), merchantPrices)
-      );
-    } else {
-      ctx->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->SetCustomPrice(
-        Rando::StaticData::GetLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetVanillaPrice()
-      );
-    }
-
-    auto merchantLoc = Rando::StaticData::GetMerchantLocations();
-
-    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
-        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)){
-      for (size_t i = 0; i < merchantLoc.size(); i++) {
-        ctx->GetItemLocation(merchantLoc[i])->SetCustomPrice(
-          GetRandomPrice(Rando::StaticData::GetLocation(merchantLoc[i]), merchantPrices)
-        );
-      }
-    } else {
-      for (size_t i = 0; i < merchantLoc.size(); i++) {
-        ctx->GetItemLocation(merchantLoc[i])->SetCustomPrice(
-          Rando::StaticData::GetLocation(merchantLoc[i])->GetVanillaPrice()
-        );
-      }
-    }
-    StopPerformanceTimer(PT_SHOPSANITY);
-
-    StartPerformanceTimer(PT_OWN_DUNGEON);
-    //Place dungeon rewards
-    SPDLOG_INFO("Shuffling and Placing Dungeon Items...");
-    RandomizeDungeonRewards();
-
-    //Place dungeon items restricted to their Own Dungeon
-    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      RandomizeOwnDungeon(dungeon);
-    }
-    StopPerformanceTimer(PT_OWN_DUNGEON);
-
-    StartPerformanceTimer(PT_LIMITED_CHECKS);
-    //Then Place songs if song shuffle is set to specific locations
-    if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_ANYWHERE)) {
-
-      //Get each song
-      std::vector<RandomizerGet> songs = FilterAndEraseFromPool(
-          ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_SONG; });
-
-      //Get each song location
-      std::vector<RandomizerCheck> songLocations;
-      if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_SONG_LOCATIONS)) {
-          songLocations = FilterFromPool(
-              ctx->allLocations, [](const auto loc) { return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION; });
-
-      } else if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_DUNGEON_REWARDS)) {
-          songLocations = FilterFromPool(ctx->allLocations, [](const auto loc) {
-            return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_BOSS_HEART_OR_OTHER_REWARD ||
-                   loc == RC_SHEIK_IN_ICE_CAVERN ||
-                   loc == RC_SONG_FROM_IMPA;
-          });
-      }
-
-      AssumedFill(songs, songLocations, true);
-    }
-
-    //Then place dungeon items that are assigned to restrictive location pools
-    RandomizeDungeonItems();
-    SPDLOG_INFO("Dungeon Items Done");
-
-    //Then place Link's Pocket Item if it has to be an advancement item
-    RandomizeLinksPocket();
-    StopPerformanceTimer(PT_LIMITED_CHECKS);
-
-
-    StartPerformanceTimer(PT_ADVANCEMENT_ITEMS);
-    SPDLOG_INFO("Shuffling Advancement Items");
-    //Then place the rest of the advancement items
-    std::vector<RandomizerGet> remainingAdvancementItems =
-        FilterAndEraseFromPool(ItemPool, [](const auto i) { return Rando::StaticData::RetrieveItem(i).IsAdvancement(); });
-    AssumedFill(remainingAdvancementItems, ctx->allLocations, true);
-    StopPerformanceTimer(PT_ADVANCEMENT_ITEMS);
-
-    StartPerformanceTimer(PT_REMAINING_ITEMS);
-    //Fast fill for the rest of the pool
-    SPDLOG_INFO("Shuffling Remaining Items");
-    std::vector<RandomizerGet> remainingPool = FilterAndEraseFromPool(ItemPool, [](const auto i) { return true; });
-    FastFill(remainingPool, GetAllEmptyLocations(), false);
-    StopPerformanceTimer(PT_REMAINING_ITEMS);
-
-
-    StartPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
-    GeneratePlaythrough();
-    StopPerformanceTimer(PT_PLAYTHROUGH_GENERATION);
-    //Successful placement, produced beatable result
-    if(ctx->playthroughBeatable && !placementFailure) {
-
-      SPDLOG_INFO("Calculating Playthrough...");
-      StartPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
-      PareDownPlaythrough();
-      StopPerformanceTimer(PT_PARE_DOWN_PLAYTHROUGH);
-
-      StartPerformanceTimer(PT_WOTH);
-      CalculateWotH();
-      StopPerformanceTimer(PT_WOTH);
-
-      StartPerformanceTimer(PT_FOOLISH);
-      CalculateBarren(); 
-      StopPerformanceTimer(PT_FOOLISH);
-      SPDLOG_INFO("Calculating Playthrough Done");
-
-      StartPerformanceTimer(PT_OVERRIDES);
-      ctx->CreateItemOverrides();
-      ctx->GetEntranceShuffler()->CreateEntranceOverrides();
-      StopPerformanceTimer(PT_OVERRIDES);
-
-      StartPerformanceTimer(PT_HINTS);
-      CreateAllHints();
-      CreateWarpSongTexts();
-      StopPerformanceTimer(PT_HINTS);
-      SPDLOG_DEBUG("Number of retries {}", retries);
-      return 1;
-    }
-    //Unsuccessful placement
-    if(retries < 4) {
-      SPDLOG_DEBUG("Failed to generate a beatable seed. Retrying...");
-      Regions::ResetAllLocations();
-      logic->Reset();
-      ClearProgress();
-    }
-    retries++;
-  }
-  //All retries failed
-  return -1;
+    // All retries failed
+    return -1;
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index 106af7aab6..0e032985e0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -7,65 +7,70 @@
 #include <vector>
 #include <string>
 
-//RANDOTODO merge into Logic once Logic is a class passed to logic funtions 
+// RANDOTODO merge into Logic once Logic is a class passed to logic funtions
 struct GetAccessibleLocationsStruct {
-  std::vector<RandomizerCheck> accessibleLocations;
-  std::vector<RandomizerRegion> regionPool;
-  //Variables for playthrough
-  int gsCount;
-  int maxGsCount;
-  std::vector<LogicVal> buyIgnores;
+    std::vector<RandomizerCheck> accessibleLocations;
+    std::vector<RandomizerRegion> regionPool;
+    // Variables for playthrough
+    int gsCount;
+    int maxGsCount;
+    std::vector<LogicVal> buyIgnores;
 
-  //Variables for search
-  std::vector<Rando::ItemLocation*> newItemLocations;
-  bool logicUpdated;
-  bool resetSphere;
+    // Variables for search
+    std::vector<Rando::ItemLocation*> newItemLocations;
+    bool logicUpdated;
+    bool resetSphere;
 
-  //Variables For Validating Entrences
-  bool haveTimeAccess;
-  bool foundTempleOfTime;
-  bool validatedStartingRegion;
-  bool sphereZeroComplete;
-  bool timePassChildDay;
-  bool timePassChildNight;
-  bool timePassAdultDay;
-  bool timePassAdultNight;
+    // Variables For Validating Entrences
+    bool haveTimeAccess;
+    bool foundTempleOfTime;
+    bool validatedStartingRegion;
+    bool sphereZeroComplete;
+    bool timePassChildDay;
+    bool timePassChildNight;
+    bool timePassAdultDay;
+    bool timePassAdultNight;
 
-  std::vector<RandomizerCheck> itemSphere;
-  std::list<Rando::Entrance*> entranceSphere;
+    std::vector<RandomizerCheck> itemSphere;
+    std::list<Rando::Entrance*> entranceSphere;
 
-  GetAccessibleLocationsStruct(int _maxGsCount){
-    regionPool = {RR_ROOT};
-    gsCount = 0;
-    maxGsCount = _maxGsCount;
-    logicUpdated = false;
-    resetSphere = false;
-  }
+    bool calculatingAvailableChecks = false;
 
-  void InitLoop(){
-    logicUpdated = false;
-    for (Rando::ItemLocation* location : newItemLocations) {
-      location->ApplyPlacedItemEffect();
+    GetAccessibleLocationsStruct(int _maxGsCount) {
+        regionPool = { RR_ROOT };
+        gsCount = 0;
+        maxGsCount = _maxGsCount;
+        logicUpdated = false;
+        resetSphere = false;
+    }
+
+    void InitLoop() {
+        logicUpdated = false;
+        for (Rando::ItemLocation* location : newItemLocations) {
+            location->ApplyPlacedItemEffect();
+        }
+        newItemLocations.clear();
+        itemSphere.clear();
+        entranceSphere.clear();
     }
-    newItemLocations.clear();
-    itemSphere.clear();
-    entranceSphere.clear();
-  }
 };
 
 void ClearProgress();
 void VanillaFill();
 int Fill();
+void SetAreas();
 
 std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
 
-void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE, 
+void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
                    bool stopOnBeatable = false, bool addToPlaythrough = false);
 
-std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations, RandomizerGet ignore=RG_NONE);
+std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations,
+                                                RandomizerGet ignore = RG_NONE, bool calculatingAvailableChecks = false,
+                                                RandomizerRegion startingRegion = RR_ROOT);
 
 void GeneratePlaythrough();
 
-bool CheckBeatable(RandomizerGet ignore=RG_NONE);
+bool CheckBeatable(RandomizerGet ignore = RG_NONE);
 
-void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);
\ No newline at end of file
+void ValidateEntrances(bool checkOtherEntranceAccess);
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 3081d48630..2d597bc955 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -9,7 +9,7 @@ using namespace std::literals::string_literals;
 
 // Big thanks to Lioncache, Gabyelnuevo, Danius88, and Charade for their translations!
 
-// Text is {english, french, spanish}
+// Text is {english, german, french}
 
 // there are special characters that are read for certain in game commands:
 // ^ is a box break
@@ -19,50 +19,55 @@ using namespace std::literals::string_literals;
 // - OoT Randomizer
 
 // '[[d]]' indicates a number will be placed there, numbers in [[]] will be replaced by other text in hints
+// '€' at the end of an item name indicates that it's plural.
+// '|' separates singular and plural form |singular|plural|.
+
 namespace Rando {
 
 void StaticData::HintTable_Init() {
+    // clang-format off
     /*--------------------------
     |       GENERAL TEXT        |
     ---------------------------*/
     hintTextTable[RHT_NONE] = HintText(CustomMessage("No Hint", "Kein Hinweis", "Pas d'Indice" ));
     hintTextTable[RHT_WAY_OF_THE_HERO] =
         HintText(CustomMessage( "They say that #[[1]]# is on #the way of the hero#.", 
-                                "Man erzählt sich, daß #[[1]]# auf #dem Weg des Helden# sei.",
+                     /*german*/ "Man erzählt sich, daß #[[1]]# #der Weg des Helden# verlaufe.",
                      /*french*/ "Selon moi, #[[1]]# est sur #la voie du héros#.", {QM_RED, QM_LBLUE}));
                  // /*spanish*/ "Según dicen, #[[1]]# conduce a la senda del héroe."
     hintTextTable[RHT_FOOLISH] = 
         HintText(CustomMessage( "They say that plundering #[[1]]# is #a foolish choice#.",
-                                "Man erzählt sich, daß das Plündern von #[[1]]# #eine törichte Entscheidung# sei.",
-                        /*french*/ "Selon moi, explorer #[[1]]# est #futile#.", {QM_RED, QM_PINK}));
-                    // /*spanish*/ "Según dicen, inspeccionar #[[1]]# #no es una sabia decisión#."
+                     /*german*/ "Man erzählt sich, daß es #eine törichte Entscheidung# sei #[[1]]# Schätze zu plündern.",
+                     /*french*/ "Selon moi, explorer #[[1]]# est #futile#.", {QM_RED, QM_PINK}));
+                 // /*spanish*/ "Según dicen, inspeccionar #[[1]]# #no es una sabia decisión#."
     hintTextTable[RHT_CAN_BE_FOUND_AT] =
         HintText(CustomMessage( "They say that #[[1]]# can be found at #[[2]]#.",
-                                "Man erzählt sich, daß #[[1]]# bei #[[2]]# gefunden werden könne.",
-                        /*french*/ "Selon moi, #[[1]]# se trouve dans #[[2]]#.", {QM_GREEN, QM_RED}));
-                    // /*spanish*/ "Según dicen, #[[1]]# aguarda en #[[2]]#."
+                     /*german*/ "Man erzählt sich, daß #[[1]]# #[[2]]# zu finden |sei|seien|.",
+                     /*french*/ "Selon moi, #[[1]]# se trouve dans #[[2]]#.", {QM_GREEN, QM_RED}));
+                 // /*spanish*/ "Según dicen, #[[1]]# aguarda en #[[2]]#."
     hintTextTable[RHT_HOARDS] = 
         HintText(CustomMessage( "They say that #[[2]]# hoards #[[1]]#.",
-                                "Man erzählt sich, daß #[[2]]# #[[1]]# horte.",
+                     /*german*/ "Man erzählt sich, daß #[[2]]# #[[1]]# |horte|horten|.",
                      /*french*/ "Selon moi, #[[2]]# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
-                    // /*spanish*/ "Según dicen, #[[2]]# acapara #[[1]]#."
+                 // /*spanish*/ "Según dicen, #[[2]]# acapara #[[1]]#."
+    // clang-format on
 
     HintTable_Init_Item();
     HintTable_Init_Exclude_Overworld();
     HintTable_Init_Exclude_Dungeon();
 
-
+    // clang-format off
     /*--------------------------
     |    SOMETIMES HINT TEXT   |
     ---------------------------*/
 
     hintTextTable[RHT_KF_LINKS_HOUSE_COW] = HintText(CustomMessage("They say that #Malon's obstacle course# leads to #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß #Malons Hinderniskurs# zu #[[1]]# führe.",
+                                                        /*german*/ "Man erzählt sich, daß das Erzielen eines neuen Rekordes bei #Malons Hindernisparcours# #[[1]]# gewähre.",
                                                         /*french*/ "Selon moi, la #course à obstacle de Malon# amène à #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/la #carrera de obstáculos de Malon# brinda #[[1]]#.
                                                      {},
                                                      {CustomMessage("They say that the #bovine bounty of a horseback hustle# gifts #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß der #bovine Schatz einer Pferdehast# #[[1]]# sei.",
+                                                         /*german*/ "Man erzählt sich, daß der #bovine Schatz einer Pferdehast# #[[1]]# |sei|seien|.",
                                                          /*french*/ "Selon moi, le cadeau #qui découle d'une réussite équestre# est #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/la #recompensa bovina de un paseo a caballo# brinda #[[1]]#.
 
@@ -72,15 +77,15 @@ void StaticData::HintTable_Init() {
                                                                 // /*spanish*/exterminar #100 skulltulas doradas# revela #[[1]]#.
                                                                 {},
                                                                 {CustomMessage("They say that #100 bug badges# rewards #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #100 Insektenplaketten# mit #[[1]]# belohnt würde.",
+                                                                    /*german*/ "Man erzählt sich, daß die Belohnung für #100 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                     /*french*/ "Selon moi, #100 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/#100 medallas de insectos# otorgan #[[1]]#.
                                                                  CustomMessage("They say that #100 spider souls# yields #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #100 Spinnenseelen# #[[1]]# einbrächte.",
+                                                                    /*german*/ "Man erzählt sich, daß #100 Spinnenseelen# #[[1]]# einbrächten.",
                                                                     /*french*/ "Selon moi, #100 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/#100 almas de araña# otorgan #[[1]]#.
                                                                  CustomMessage("They say that #100 auriferous arachnids# lead to #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #100 goldhaltige Arachniden# zu #[[1]]# führen würde.",
+                                                                    /*german*/ "Man erzählt sich, daß #100 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                     /*french*/ "Selon moi, #100 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                  // /*spanish*/#100 arácnidos auríferos# otorgan #[[1]]#.
 
@@ -90,7 +95,7 @@ void StaticData::HintTable_Init() {
                                                             // /*spanish*/la #Ocarina del Tiempo# enseña #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_ROYAL_FAMILYS_TOMB] = HintText(CustomMessage("They say that #ReDead in the Composers' Grave# guard #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß #Zombies im Grab des Komponisten# #[[1]]# bewache.",
+                                                                  /*german*/ "Man erzählt sich, daß #Remorts im Grab des Komponisten# #[[1]]# bewachen.",
                                                                   /*french*/ "Selon moi, les #Éffrois du tombeau des compositeurs# protègent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                // /*spanish*/los #ReDeads del Panteón Real# guardan #[[1]]#.
 
@@ -105,17 +110,17 @@ void StaticData::HintTable_Init() {
                                                   // /*spanish*/Sheik espera en el #momumento del tiempo# para enseñar #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_CRATER] = HintText(CustomMessage("They say that the #crater's melody# is #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß die #Melodie eines Kraters# #[[1]]# sei.",
+                                                     /*german*/ "Man erzählt sich, daß die #Melodie des Kraters# #[[1]]# |sei|seien|.",
                                                      /*french*/ "Selon moi, Sheik confiera, #entouré de lave#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/la #melodía del cráter# otorga #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_ICE_CAVERN] = HintText(CustomMessage("They say that the #frozen cavern# echoes with #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß die #gefrorene Kaverne# mit #[[1]]# echoe.",
+                                                         /*german*/ "Man erzählt sich, daß die #gefrorene Kaverne# #[[1]]# ertönen lasse.",
                                                          /*french*/ "Selon moi, Sheik confiera, #dans une caverne enneigée#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                       // /*spanish*/en la #caverna de hielo# retumban los ecos de #[[1]]#.
 
     hintTextTable[RHT_SHEIK_IN_KAKARIKO] = HintText(CustomMessage("They say that a #ravaged village# mourns with #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß ein #verwüstetes Dorf# mit #[[1]]# trauere.",
+                                                       /*german*/ "Man erzählt sich, daß ein #verwüstetes Dorf# um #[[1]]# trauere.",
                                                        /*french*/ "Selon moi, Sheik confirera, #au coeur d'un village ravagé#, #[[1]]#.", {QM_RED, QM_GREEN})),
                                                     // /*spanish*/un #arrasado pueblo# llora #[[1]]#.
 
@@ -125,12 +130,12 @@ void StaticData::HintTable_Init() {
                                                     // /*spanish*/el héroe que se adentre #más allá del desierto# aprenderá #[[1]]#.
 
     hintTextTable[RHT_MARKET_10_BIG_POES] = HintText(CustomMessage("They say that catching #Big Poes# leads to #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß das Fangen #großer Irrlichter# zu #[[1]]# führe.",
+                                                        /*german*/ "Man erzählt sich, daß die Belohnung für das Fangen von #Nachtschwärmern# #[[1]]# |sei|seien|.",
                                                         /*french*/ "Selon moi, #d'attraper des Àmes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/hacerte con #Grandes Poes# conduce a #[[1]]#.
                                                      {},
                                                      {CustomMessage("They say that #ghost hunters# will be rewarded with #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß #Geisterjäger# mit #[[1]]# belohnt würde.",
+                                                         /*german*/ "Man erzählt sich, daß die Belohnung für #Geisterjäger# #[[1]]# |sei|seien|.",
                                                          /*french*/ "Selon moi, #les chasseurs de fantômes# sont récompensés avec #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/los #cazafantasmas# son premiados con #[[1]]#.
 
@@ -145,12 +150,12 @@ void StaticData::HintTable_Init() {
                                                              // /*spanish*/la #máscara de la verdad# premia #[[1]]#.
                                                              {},
                                                              {CustomMessage("They say that showing a #truthful eye to the crowd# rewards #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß das Zeigen eines #wahrhaftigen Auges zu der Menge# mit #[[1]]# belohnt würde.",
+                                                                 /*german*/ "Man erzählt sich, daß der #Menge ein wahrhaftiges Auge# zu zeigen #[[1]]# einbrächte.",
                                                                  /*french*/ "Selon moi, montrer #l'oeil de vérité à la foule# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/#mostrarle el ojo verdadero# a una multitud brinda #[[1]]#.
 
     hintTextTable[RHT_HF_OCARINA_OF_TIME_ITEM] = HintText(CustomMessage("They say that the #treasure thrown by Princess Zelda# is #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß der #von Prinzessin Zelda geworfene Schatz# #[[1]]# sei.",
+                                                             /*german*/ "Man erzählt sich, daß der #von Prinzessin Zelda geworfene Schatz# #[[1]]# |sei|seien|.",
                                                              /*french*/ "Selon moi, le trésor #laissé par la princesse# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                           // /*spanish*/el #tesoro arrojado por la Princesa Zelda# se trata de #[[1]]#.
 
@@ -175,7 +180,7 @@ void StaticData::HintTable_Init() {
                                                                // /*spanish*/exterminar #50 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #50 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #50 Insektenplaketten# mit #[[1]]# belohnt würde.",
+                                                                   /*german*/ "Man erzählt sich, daß die Belohnung für #50 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #50 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#50 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #50 spider souls# yields #[[1]]#.",
@@ -183,7 +188,7 @@ void StaticData::HintTable_Init() {
                                                                    /*french*/ "Selon moi, #50 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#50 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #50 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #50 goldhaltige Arachniden# zu #[[1]]# führen würde.",
+                                                                   /*german*/ "Man erzählt sich, daß #50 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                    /*french*/ "Selon moi, #50 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#50 arácnidos auríferos# otorgan #[[1]]#.
 
@@ -193,7 +198,7 @@ void StaticData::HintTable_Init() {
                                                                // /*spanish*/exterminar #40 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #40 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #40 Insektenplaketten# mit #[[1]]# belohnt würde.",
+                                                                   /*german*/ "Man erzählt sich, daß die Belohnung für #40 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #40 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#40 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #40 spider souls# yields #[[1]]#.",
@@ -201,7 +206,7 @@ void StaticData::HintTable_Init() {
                                                                    /*french*/ "Selon moi, #40 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#40 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #40 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #40 goldhaltige Arachniden# zu #[[1]]# führen würde.",
+                                                                   /*german*/ "Man erzählt sich, daß #40 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                    /*french*/ "Selon moi, #40 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#40 arácnidos auríferos# otorgan #[[1]]#.
 
@@ -211,7 +216,7 @@ void StaticData::HintTable_Init() {
                                                                // /*spanish*/exterminar #30 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #30 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #30 Insektenplaketten# mit #[[1]]# belohnt würde.",
+                                                                   /*german*/ "Man erzählt sich, daß die Belohnung für #30 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #30 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#30 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #30 spider souls# yields #[[1]]#.",
@@ -219,7 +224,7 @@ void StaticData::HintTable_Init() {
                                                                    /*french*/ "Selon moi, #30 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#30 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #30 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #30 goldhaltige Arachniden# zu #[[1]]# führen würde.",
+                                                                   /*german*/ "Man erzählt sich, daß #30 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                    /*french*/ "Selon moi, #30 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#30 arácnidos auríferos# otorgan #[[1]]#.
 
@@ -229,7 +234,7 @@ void StaticData::HintTable_Init() {
                                                                // /*spanish*/exterminar #20 skulltulas doradas# revela #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that #20 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #20 Insektenplaketten# mit #[[1]]# belohnt würde.",
+                                                                   /*german*/ "Man erzählt sich, daß die Belohnung für #20 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #20 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#20 medallas de insectos# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #20 spider souls# yields #[[1]]#.",
@@ -237,21 +242,21 @@ void StaticData::HintTable_Init() {
                                                                    /*french*/ "Selon moi, #20 âmes d'arachnide# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/#20 almas de araña# otorgan #[[1]]#.
                                                                 CustomMessage("They say that #20 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #20 goldhaltige Arachniden# zu #[[1]]# führen würde.",
+                                                                   /*german*/ "Man erzählt sich, daß #20 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                    /*french*/ "Selon moi, #20 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/#20 arácnidos auríferos# otorgan #[[1]]#.
 
     hintTextTable[RHT_KAK_ANJU_AS_CHILD] = HintText(CustomMessage("They say that #collecting cuccos# rewards #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß das #Sammeln von Hühnern# mit #[[1]]# belohnt würde.",
+                                                       /*german*/ "Man erzählt sich, daß das #Sammeln von Hühnern# #[[1]]# einbrächte.",
                                                        /*french*/ "Selon moi, #rapporter les Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                     // /*spanish*/#hacerte con todos los cucos# premia #[[1]]#.
                                                     {},
                                                     {CustomMessage("They say that #wrangling roosters# rewards #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß das #Rangeln mit Hähnen# mit #[[1]]# belohnt würde.",
+                                                        /*german*/ "Man erzählt sich, daß das #Rangeln mit Hähnen# #[[1]]# einbrächte.",
                                                         /*french*/ "Selon moi, #plumer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/#atrapar a las gallinas# premia #[[1]]#.
                                                      CustomMessage("They say that #chucking chickens# gifts #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß das #Werfen von Hühnchen# mit #[[1]]# belohnt würde.",
+                                                        /*german*/ "Man erzählt sich, daß das #Werfen von Hühnchen# #[[1]]# einbrächte.",
                                                         /*french*/ "Selon moi, #lancer des poulets# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                      // /*spanish*/#reunir a unos emplumados# premia #[[1]]#.
 
@@ -261,12 +266,12 @@ void StaticData::HintTable_Init() {
                                                          // /*spanish*/un #alegre cuco# en la madurez otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_TRADE_ODD_MUSHROOM] = HintText(CustomMessage("They say that the #potion shop lady# entrusts #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß die #Dame des Trankladens# #[[1]]# anvertraue.",
+                                                            /*german*/ "Man erzählt sich, daß die #Dame des Hexenladens# #[[1]]# anvertraue.",
                                                             /*french*/ "Selon moi, la #gribiche du magasin de potion# confie #[[1]]#.", {QM_RED, QM_GREEN})),
                                                          // /*spanish*/la #señora de la tienda de pociones# otorga #[[1]]#.
 
     hintTextTable[RHT_GC_DARUNIAS_JOY] = HintText(CustomMessage("They say that #Darunia's dance# leads to #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß #Darunias Tanz# zu #[[1]]# führe.",
+                                                     /*german*/ "Man erzählt sich, daß #Darunias Tanz# #[[1]]# gewähre.",
                                                      /*french*/ "Selon moi, #la dance de Darunia# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/#el baile de Darunia# conduce a #[[1]]#.
                                                   {},
@@ -306,7 +311,7 @@ void StaticData::HintTable_Init() {
                                                 // /*spanish*/el #científico del Lago Hylia# otorga con prisa #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_REWARD] = HintText(CustomMessage("They say that the #treasure chest game# grants #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß #Schatzkisten-Poker# #[[1]]# gewähre.",
+                                                                       /*german*/ "Man erzählt sich, daß die #Truhenlotterie# #[[1]]# gewähre.",
                                                                        /*french*/ "Selon moi, la #Chasse-aux-Trésors# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#el Cofre del Tesoro# premia #[[1]]#.
                                                                     {},
@@ -315,12 +320,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#los juegos de azar# revelan #[[1]]#.
                                                                      CustomMessage("They say that there is a #1/32 chance# to win #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß es eine #Chance von 1 zu 32# gäbe, um #[[1]]# zu gewinnen.",
+                                                                        /*german*/ "Man erzählt sich, daß es eine #Chance von 1 zu 32# gäbe um #[[1]]# zu gewinnen.",
                                                                         /*french*/ "Selon moi, être #le gagnant parmi 32# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/hay una #probabilidad de 1/32# de ganar #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_1] = HintText(CustomMessage("They say that the #first locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #erste verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #erste verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #première salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la primera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -329,12 +334,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier une fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar solo una vez# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #first or second game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #erste oder zweite Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #erste oder zweite Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #premier ou deuxième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el primer o segundo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_2] = HintText(CustomMessage("They say that the #second locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #deuxième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la segunda sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -343,12 +348,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier deux fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar dos veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #third or fourth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #dritte oder vierte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #dritte oder vierte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #troisième ou quatrième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el tercer o cuarto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_3] = HintText(CustomMessage("They say that the #third locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #troisième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la tercera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -357,12 +362,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier trois fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar tres veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #fifth or sixth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #fünfte oder sechste Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #fünfte oder sechste Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #cinquième ou sixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el quinto o sexto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_4] = HintText(CustomMessage("They say that the #fourth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #quatrième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la cuarta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -371,12 +376,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier quatre fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cuatro veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #seventh or eighth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #siebente oder achte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #siebente oder achte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #septième ou huitième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el séptimo u octavo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_ITEM_5] = HintText(CustomMessage("They say that the #fifth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #cinquième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la quinta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -385,12 +390,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier cinq fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cinco veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #ninth or tenth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #neuvième ou dixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el noveno o décimo cofre del azar# revela #[[1]]#.
 
    hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_1] = HintText(CustomMessage("They say that the #first locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #erste verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #erste verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #première salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la primera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -399,12 +404,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier une fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar solo una vez# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #first or second game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #erste oder zweite Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #erste oder zweite Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #premier ou deuxième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el primer o segundo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_2] = HintText(CustomMessage("They say that the #second locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #zweite verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #deuxième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la segunda sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -413,12 +418,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier deux fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar dos veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #third or fourth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #dritte oder vierte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #dritte oder vierte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #troisième ou quatrième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el tercer o cuarto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_3] = HintText(CustomMessage("They say that the #third locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #dritte verschloßene Raum# in der Truhenlotterie, #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #troisième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la tercera sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -427,12 +432,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier trois fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar tres veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #fifth or sixth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #fünfte oder sechste Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #fünfte oder sechste Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #cinquième ou sixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el quinto o sexto cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_4] = HintText(CustomMessage("They say that the #fourth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #vierte verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #quatrième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la cuarta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -441,12 +446,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier quatre fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cuatro veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #seventh or eighth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #siebente oder achte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #siebente oder achte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #septième ou huitième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el séptimo u octavo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME_KEY_5] = HintText(CustomMessage("They say that the #fifth locked room# in the chest game contains #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschlossene Raum# im Schatzkisten-Poker #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #fünfte verschloßene Raum# in der Truhenlotterie #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, la #cinquième salle# de la Chasse-aux-Trésors contient #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/#en la quinta sala del Cofre del Tesoro# aguarda #[[1]]#.
                                                                     {},
@@ -455,12 +460,12 @@ void StaticData::HintTable_Init() {
                                                                         /*french*/ "Selon moi, #parier cinq fois# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                      // /*spanish*/#apostar cinco veces# revelará #[[1]]#.
                                                                      CustomMessage("They say that the #ninth or tenth game chest# contains #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Schatzkiste im Spiel# #[[1]]# enthielte.",
+                                                                        /*german*/ "Man erzählt sich, daß die #neunte oder zehnte Spieltruhe# #[[1]]# enthielte.",
                                                                         /*french*/ "Selon moi, le #neuvième ou dixième coffre à jeu# contient #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/#el noveno o décimo cofre del azar# revela #[[1]]#.
 
     hintTextTable[RHT_GF_HBA_1500_POINTS] = HintText(CustomMessage("They say that scoring 1500 in #horseback archery# grants #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1500 Punkten beim #Bogenschießen zu Pferde# #[[1]]# gewähre.",
+                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1.500 Punkten beim #Bogenschießen zu Pferde# #[[1]]# gewähre.",
                                                         /*french*/ "Selon moi, obtenir 1500 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/conseguir 1500 puntos en el #tiro con arco a caballo# premia #[[1]]#.
                                                      {},
@@ -470,17 +475,17 @@ void StaticData::HintTable_Init() {
                                                       // /*spanish*/dominar el #tiro con arco a caballo# premia con #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] = HintText(CustomMessage("They say that playing #Sun's Song# in a grave spawns #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß das Spielen der #Hymne der Sonne# in einem Grab, #[[1]]# erscheinen ließe.",
+                                                                       /*german*/ "Man erzählt sich, daß das Spielen der #Hymne der Sonne# in einem Grab #[[1]]# erscheinen ließe.",
                                                                        /*french*/ "Selon moi, jouer le #chant du soleil# dans un tombeau donne #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                     // /*spanish*/#tocar la Canción del Sol# en una cripta conduce a #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_LEFT_CHEST] = HintText(CustomMessage("They say that in #Goron City# the hammer unlocks #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß der Hammer in #Goronia# #[[1]]# freilege.",
+                                                        /*german*/ "Man erzählt sich, daß der Stahlhammer in #Goronia# #[[1]]# freilege.",
                                                         /*french*/ "Selon moi, dans le #village Goron#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
                                                      // /*spanish*/en la #Ciudad Goron# el martillo desbloquea #[[1]]#.
 
     hintTextTable[RHT_GV_CHEST] = HintText(CustomMessage("They say that in #Gerudo Valley# the hammer unlocks #[[1]]#.",
-                                              /*german*/ "Man erzählt sich, daß der Hammer im #Gerudotal# #[[1]]# freilege.",
+                                              /*german*/ "Man erzählt sich, daß der Stahlhammer im #Gerudotal# #[[1]]# freilege.",
                                               /*french*/ "Selon moi, dans la #Vallée Gerudo#, le marteau donne accès à #[[1]]#.", {QM_RED, QM_GREEN})),
                                            // /*spanish*/en el #Valle Gerudo# el martillo desbloquea #[[1]]#.
 
@@ -505,7 +510,7 @@ void StaticData::HintTable_Init() {
                                                    // /*spanish*/una #Skulltula tras la telaraña# de una cueva otorga #[[1]]#.
 
     hintTextTable[RHT_HF_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow behind webs# in a grotto gifts #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß eine #Kuh hinter Weben# in einer Grotte #[[1]]# hielte.",
+                                                       /*german*/ "Man erzählt sich, daß eine #Kuh, hinter Weben# in einer Grotte, #[[1]]# hielte.",
                                                        /*french*/ "Selon moi, la #vache derrière les toiles# d'une grotte donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                     // /*spanish*/una #vaca tras la telaraña# de una cueva brinda #[[1]]#.
                                                     {},
@@ -515,7 +520,7 @@ void StaticData::HintTable_Init() {
                                                      // /*spanish*/una #vaca tras una telaraña# brinda #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_OCARINA_GAME] = HintText(CustomMessage("They say that the final reward from the #Frogs of Zora's River# is #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß die letzte Belohnung der #Frösche des Zora-Flußes# #[[1]]# sei.",
+                                                           /*german*/ "Man erzählt sich, daß die letzte Belohnung der #Frösche des Zora-Flußes# #[[1]]# |sei|seien|.",
                                                            /*french*/ "Selon moi, la dernière récompense des #grenouilles de la Rivière Zora# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/la recompensa final de las #ranas del Río Zora# premia #[[1]]#.
                                                         {},
@@ -538,7 +543,7 @@ void StaticData::HintTable_Init() {
                                                     // /*spanish*/una Skulltula en lo #alto de las congeladas aguas# otorga #[[1]]#.
 
     hintTextTable[RHT_WASTELAND_CHEST] = HintText(CustomMessage("They say that #deep in the wasteland# is #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß #tief im Ödland# #[[1]]# sei.",
+                                                     /*german*/ "Man erzählt sich, daß #tief im Ödland# #[[1]]# |sei|seien|.",
                                                      /*french*/ "Selon moi, #loin dans le désert# gît #[[1]]#.", {QM_RED, QM_GREEN})),
                                                   // /*spanish*/en lo #profundo del desierto encantado# yace #[[1]]#.
 
@@ -548,12 +553,12 @@ void StaticData::HintTable_Init() {
                                                // /*spanish*/una #Skulltula del desierto encantado# otorga #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] = HintText(CustomMessage("They say that #flames in the Composers' Grave# reveal #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß die #Flammen im Grab des Komponisten# #[[1]]# enthüllen würde.",
+                                                                        /*german*/ "Man erzählt sich, daß die #Flammen im Grab des Komponisten# #[[1]]# enthüllen würden.",
                                                                         /*french*/ "Selon moi, #les flammes dans le tombeau des compositeurs# cachent #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                      // /*spanish*/#las llamas del Panteón Real# revelan #[[1]]#.
 
     hintTextTable[RHT_ZF_BOTTOM_FREESTANDING_POH] = HintText(CustomMessage("They say that #under the icy waters# lies #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß #unter den eisigen Gewässern# #[[1]]# läge.",
+                                                                /*german*/ "Man erzählt sich, daß #unter den eisigen Gewässern# #[[1]]# |läge|lägen|.",
                                                                 /*french*/ "Selon moi, #sous les eaux glacées# se cache #[[1]]#.", {QM_RED, QM_GREEN})),
                                                              // /*spanish*/#bajo las congeladas aguas# yace #[[1]]#.
 
@@ -578,7 +583,7 @@ void StaticData::HintTable_Init() {
                                                         // /*spanish*/el #Rey Zora# otorga con prisa #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB] = HintText(CustomMessage("They say that a single #scrub in the crater# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß ein einzelner #Deku im Krater# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein einzelner #Deku-Händler im Krater# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #peste Mojo dans le cratère# vend #[[1]]#.", {QM_RED, QM_GREEN})),
                                                  // /*spanish*/un solitario #deku del cráter# vende #[[1]]#.
     hintTextTable[RHT_DMC_GS_CRATE] = HintText(CustomMessage("They say that a spider under a #crate in the crater# holds #[[1]]#.",
@@ -587,12 +592,12 @@ void StaticData::HintTable_Init() {
                                                // /*spanish*/una Skulltula bajo una #caja del cráter# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that a #temporal stone within the Deku Tree# contains #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb des Deku-Baums# #[[1]]# enthielte.",
+                                                                           /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb des Deku-Baumes# #[[1]]# enthielte.",
                                                                            /*french*/ "Selon moi, la #pierre temporelle dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                         // /*spanish*/un #bloque temporal del Gran Árbol Deku# contiene #[[1]]#.
                                                                         {},
                                                                         {CustomMessage("They say that a #temporal stone within a tree# contains #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb eines Baums# #[[1]]# enthielte.",
+                                                                            /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein innerhalb eines Baumes# #[[1]]# enthielte.",
                                                                             /*french*/ "Selon moi, la #pierre bleue dans un arbre# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                          // /*spanish*/un #bloque temporal de un árbol# contiene #[[1]]#.
 
@@ -627,12 +632,12 @@ void StaticData::HintTable_Init() {
                                                                     // /*spanish*/unos de #stingers engullidos por cierta deidad# guardan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM] = HintText(CustomMessage("They say that a spider surrounded by #shadows in Jabu-Jabu's Belly# holds #[[1]]#.",
-                                                                                   /*german*/ "Man erzählt sich, daß eine von #Schatten in Jabu-Jabus Bauch# umgebene Spinne #[[1]]# hielte.",
+                                                                                   /*german*/ "Man erzählt sich, daß eine von #Schatten umgebene Spinne in Jabu-Jabus Bauch# #[[1]]# hielte.",
                                                                                    /*french*/ "Selon moi, la Skulltula entourée d'#ombres dans Jabu-Jabu# possède #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                                 // /*spanish*/una Skulltula rodeada de #sombras en la Tripa de Jabu-Jabu# otorga #[[1]]#.
                                                                                 {},
                                                                                 {CustomMessage("They say that a spider surrounded by #shadows in the belly of a deity# holds #[[1]]#.",
-                                                                                    /*german*/ "Man erzählt sich, daß eine von #Schatten im Bauch einer Gottheit# umgebene Spinne #[[1]]# hielte.",
+                                                                                    /*german*/ "Man erzählt sich, daß eine von #Schatten umgebene Spinne im Bauche einer Gottheit#, #[[1]]# hielte.",
                                                                                     /*french*/ "Selon moi, l'araignée entourée d'#ombres dans le ventre du gardien# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                                  // /*spanish*/una Skulltula rodeada de #sombras en la tripa de cierta diedad# otorga #[[1]]#.
 
@@ -647,32 +652,32 @@ void StaticData::HintTable_Init() {
                                                            // /*spanish*/una #vaca engullida por cierta deidad# brinda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_SCARECROW_CHEST] = HintText(CustomMessage("They say that #Pierre atop the Fire Temple# hides #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #Pierre auf der Spitze des Feuertempels# #[[1]]# verstecke.",
+                                                                 /*german*/ "Man erzählt sich, daß #Pierre, an der Spitze des Feuertempels#, #[[1]]# verstecke.",
                                                                  /*french*/ "Selon moi, #Pierre au sommet du Temple du Feu# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/#Pierre en lo alto del Templo del Fuego# esconde #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that a #scarecrow atop the volcano# hides #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß eine #Vogelscheuche auf der Spitze des Vulkans# #[[1]]# verstecke.",
+                                                                  /*german*/ "Man erzählt sich, daß eine #Vogelscheuche, an der Spitze des Vulkans#, #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, l'#épouvantail au sommet d'un volcan# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/un #espantapájaros en lo alto del volcán# esconde #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MEGATON_HAMMER_CHEST] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Feuertempels# eine Truhe bewache, welche #[[1]]# enthielte.",
+                                                                      /*german*/ "Man erzählt sich, daß der #Flammenderwisch, an der Spitze des Feuertempels#, eine Truhe bewache welche #[[1]]# enthielte.",
                                                                       /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                    // /*spanish*/el #Bailaguego en lo alto del Templo del Fuego# otorga #[[1]]#.
                                                                    {},
                                                                    {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Vulkans# eine Truhe bewache, welche #[[1]]# enthielte.",
+                                                                       /*german*/ "Man erzählt sich, daß der #Flammenderwisch, an der Spitze des Vulkans#, eine Truhe bewache welche #[[1]]# enthielte.",
                                                                        /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                     // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_CHEST_ON_FIRE] = HintText(CustomMessage("They say that the #Flare Dancer atop the Fire Temple# guards a chest containing #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Feuertempels# eine Truhe bewache, welche #[[1]]# enthielte.",
+                                                                  /*german*/ "Man erzählt sich, daß der #Flammenderwisch, an der Spitze des Feuertempels#, eine Truhe bewache welche #[[1]]# enthielte.",
                                                                   /*french*/ "Selon moi, le #Danse-Flamme au sommet du Temple du Feu# protège #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/el #Bailafuego en lo alto del Templo del Fuego# otorga #[[1]]#.
                                                                {},
                                                                {CustomMessage("They say that the #Flare Dancer atop the volcano# guards a chest containing #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß der #Flammenderwisch auf der Spitze des Vulkans# eine Truhe bewache, welche #[[1]]# enthielte.",
+                                                                   /*german*/ "Man erzählt sich, daß der #Flammenderwisch, an der Spitze des Vulkans#, eine Truhe bewache welche #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, le #danseur au sommet du volcan# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/el #Bailafuego en lo alto del volcán# otorga #[[1]]#.
 
@@ -687,22 +692,22 @@ void StaticData::HintTable_Init() {
                                                                    // /*spanish*/una #Skulltula bajo el bloque de un volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_RIVER_CHEST] = HintText(CustomMessage("They say that beyond the #river in the Water Temple# waits #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß jenseits des #Flußes im Wassertempel# #[[1]]# warte.",
+                                                              /*german*/ "Man erzählt sich, daß jenseits des #Flußes im Wassertempel# #[[1]]# |warte|warten|.",
                                                               /*french*/ "Selon moi, au delà de #la rivière dans le Temple de l'Eau# se cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/tras el #río del Templo del Agua# yace #[[1]]#.
                                                            {},
                                                            {CustomMessage("They say that beyond the #river under the lake# waits #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß jenseits des #Flußes unter dem See# #[[1]]# warte.",
+                                                               /*german*/ "Man erzählt sich, daß jenseits des #Flußes unterhalb des Sees# #[[1]]# |warte|warten|.",
                                                                /*french*/ "Selon moi, au delà de #la rivière sous le lac# se cache #[[1]]#.", {QM_RED, QM_GREEN})});
                                                             // /*spanish*/tras el #río bajo el lago# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that dodging #rolling boulders in the Water Temple# leads to #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen im Wassertempel# zu #[[1]]# führe.",
+                                                                 /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen im Wassertempel# #[[1]]# einbrächte.",
                                                                  /*french*/ "Selon moi, éviter des #rochers roulants dans le Temple de l'Eau# mène à #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/esquivar #rocas rondantes del Templo del Agua# conduce a #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that dodging #rolling boulders under the lake# leads to #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen unter einem See# zu #[[1]]# führe.",
+                                                                  /*german*/ "Man erzählt sich, daß das Ausweichen von #rollenden Felsen unterhalb eines Sees# #[[1]]# einbrächte.",
                                                                   /*french*/ "Selon moi, éviter des #rochers roulants sous le lac# mène à #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/esquivar #rocas rodantes bajo el lago# conduce a #[[1]]#.
 
@@ -712,27 +717,27 @@ void StaticData::HintTable_Init() {
                                                               // /*spanish*/una Skulltula tras #una valla del Templo del Agua# otorga #[[1]]#.
                                                               {},
                                                               {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unter dem See# #[[1]]# hielte.",
+                                                                  /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unterhalb des Sees# #[[1]]# hielte.",
                                                                   /*french*/ "Selon moi, l'araignée derrière une #barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/una Skulltula tras #una valla bajo el lago# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden in a #box in the Water Temple# lies #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten im Wassertempel# #[[1]]# läge.",
+                                                                      /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten im Wassertempel# #[[1]]# |läge|lägen|.",
                                                                       /*french*/ "Selon moi, dans une #boîte dans le Temple de l'Eau# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                    // /*spanish*/en una #caja del Templo del Agua# yace #[[1]]#.
                                                                    {},
                                                                    {CustomMessage("They say that hidden in a #box under the lake# lies #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten unter dem See# #[[1]]# läge.",
+                                                                       /*german*/ "Man erzählt sich, daß versteckt in einem #Kasten unterhalb des Sees# #[[1]]# |läge|lägen|.",
                                                                        /*french*/ "Selon moi, dans une #boîte sous le lac# gît #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                     // /*spanish*/en una #caja bajo el lago# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA] = HintText(CustomMessage("They say that the #locked spider in the Water Temple# holds #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß eine #eingeschlossene Spinne im Wassertempel# #[[1]]# hielte.",
+                                                                              /*german*/ "Man erzählt sich, daß eine #eingeschloßene Spinne im Wassertempel# #[[1]]# hielte.",
                                                                               /*french*/ "Selon moi, une #Skulltula emprisonnée dans le Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                            // /*spanish*/la #Skulltula enjaulada del Templo del Agua# otorga #[[1]]#.
                                                                            {},
                                                                            {CustomMessage("They say that the #locked spider under the lake# holds #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß eine #eingeschlossene Spinne unter dem See# #[[1]]# hielte.",
+                                                                               /*german*/ "Man erzählt sich, daß eine #eingeschloßene Spinne unterhalb des Sees# #[[1]]# hielte.",
                                                                                /*french*/ "Selon moi, l'#araignée emprisonnée sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                             // /*spanish*/la #Skulltula enjaulada bajo el lago# otorga #[[1]]#.
 
@@ -742,7 +747,7 @@ void StaticData::HintTable_Init() {
                                                                        // /*spanish*/una Skulltula tras una #valla del Templo del Agua# #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that a spider behind a #gate under the lake# holds #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unter dem See# #[[1]]# hielte.",
+                                                                           /*german*/ "Man erzählt sich, daß eine Spinne hinter einem #Tor unterhalb des Sees# #[[1]]# hielte.",
                                                                            /*french*/ "Selon moi, l'#araignée derrière une barrière sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/una Skulltula tras una #valla bajo el lago# otorga #[[1]]#.
 
@@ -757,12 +762,12 @@ void StaticData::HintTable_Init() {
                                                                                           // /*spanish*/aquellos que busquen las #rupias plateadas sumergidas# encontrarán #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                  /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                   /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                                // /*spanish*/la recompensa final de la #instrucción de las bandida# brinda #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST] = HintText(CustomMessage("They say that the final prize of #the thieves' training# is #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                /*german*/ "Man erzählt sich, daß der letzte Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                 /*french*/ "Selon moi, la récompense ultime de #l'épreuve des voleurs# est #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                              // /*spanish*/el premio final de la #instrucción de las bandidas# brinda #[[1]]#.
 
@@ -776,12 +781,12 @@ void StaticData::HintTable_Init() {
                                                                              /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                           // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
                                                                           CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß der #Unterweltbewohner im Brunnen# #[[1]]# hielte.",
+                                                                             /*german*/ "Man erzählt sich, daß der #Unterweltbewohner des Brunnens# #[[1]]# hielte.",
                                                                              /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                           // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the well# holds #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß der #Hirnsauger im Brunnen# #[[1]]# hielte.",
+                                                                         /*german*/ "Man erzählt sich, daß der #Hirnsauger des Brunnens# #[[1]]# hielte.",
                                                                          /*french*/ "Selon moi, le #Poigneur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/la #Mano Muerta del pozo# concede #[[1]]#.
                                                                       {},
@@ -790,22 +795,22 @@ void StaticData::HintTable_Init() {
                                                                           /*french*/ "Selon moi, la #terreur du Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/en las #profundidades del pozo# se esconde #[[1]]#.
                                                                        CustomMessage("They say that a #nether dweller in the well# holds #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß der #Unterweltbewohner im Brunnen# #[[1]]# hielte.",
+                                                                          /*german*/ "Man erzählt sich, daß der #Unterweltbewohner des Brunnens# #[[1]]# hielte.",
                                                                           /*french*/ "Selon moi, le #spectre qui réside dans le Puits# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/el #temido morador del pozo# concede #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's right hand# is #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß auf der #rechten Hand des Koloßes# #[[1]]# sei.",
+                                                                          /*german*/ "Man erzählt sich, daß auf der #rechten Hand des Kolosses# #[[1]]# |sei|seien|.",
                                                                           /*french*/ "Selon moi, sur la #main droite du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/en la #mano derecha del Coloso# yace #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that the treasure #sought by Nabooru# is #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß der #von Naboru gesuchte Schatz# #[[1]]# sei.",
+                                                                           /*german*/ "Man erzählt sich, daß der #von Naboru gesuchte Schatz# #[[1]]# |sei|seien|.",
                                                                            /*french*/ "Selon moi, le trésor que #recherche Nabooru# est #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/el #ansiado tesoro de Nabooru# brinda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST] = HintText(CustomMessage("They say that upon the #Colossus's left hand# is #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß auf der #linken Hand des Koloßes# #[[1]]# sei.",
+                                                                       /*german*/ "Man erzählt sich, daß auf der #linken Hand des Kolosses# #[[1]]# |sei|seien|.",
                                                                        /*french*/ "Selon moi, sur la #main gauche du colosse# repose #[[1]]#.", {QM_RED, QM_GREEN})),
                                                                     // /*spanish*/en la #mano izquierda del Coloso# yace #[[1]]#.
 
@@ -815,27 +820,27 @@ void StaticData::HintTable_Init() {
                                                                              // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
                                                                              {},
                                                                              {CustomMessage("They say that a #temporal paradox in the Colossus# yields #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß ein #zeitliches Paradox im Koloß# #[[1]]# einbrächte.",
+                                                                                 /*german*/ "Man erzählt sich, daß ein #zeitliches Paradox im Koloss# #[[1]]# einbrächte.",
                                                                                  /*french*/ "Selon moi, un #paradoxe temporel dans le colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                               // /*spanish*/una #paradoja temporal del Coloso# conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST] = HintText(CustomMessage("They say that a #symphony in the Spirit Temple# yields #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß eine #Sinfonie im Geistertempel# #[[1]]# einbrächte.",
+                                                                          /*german*/ "Man erzählt sich, daß eine #Symphonie im Geistertempel# #[[1]]# einbrächte.",
                                                                           /*french*/ "Selon moi, les #cinq chansons du Temple de l'Esprit# révèlent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                        // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
                                                                        {},
                                                                        {CustomMessage("They say that a #symphony in the Colossus# yields #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß eine #Sinfonie im Koloß# #[[1]]# einbrächte.",
+                                                                           /*german*/ "Man erzählt sich, daß eine #Symphonie im Koloss# #[[1]]# einbrächte.",
                                                                            /*french*/ "Selon moi, la #symphonie du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                         // /*spanish*/una #sinfonía del Coloso# conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM] = HintText(CustomMessage("They say that a #spider's symphony in the Spirit Temple# yields #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß eine #Spinnensinfonie im Geistertempel# #[[1]]# einbrächte.",
+                                                                       /*german*/ "Man erzählt sich, daß eine #Spinnensymphonie im Geistertempel# #[[1]]# einbrächte.",
                                                                        /*french*/ "Selon moi, la #mélodie de la Skulltula du Temple de l'Esprit# révèle #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                     // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
                                                                     {},
                                                                     {CustomMessage("They say that a #spider's symphony in the Colossus# yields #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß eine #Spinnensinfonie im Koloß# #[[1]]# einbrächte.",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinnensymphonie im Koloss# #[[1]]# einbrächte.",
                                                                         /*french*/ "Selon moi, la #mélodie de l'araignée du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/la #Skulltula de la sinfonía del Coloso# otorga #[[1]]#.
 
@@ -859,12 +864,12 @@ void StaticData::HintTable_Init() {
                                                                      // /*spanish*/levantar una #roca del desierto# revela #[[1]]#.
 
     hintTextTable[RHT_GV_GROTTO_LEDGE_TO_GV_OCTOROK_GROTTO] = HintText(CustomMessage("They say that a rock on #a ledge in the valley# hides #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß ein Felsen auf #einem Vorsprung im Tal# #[[1]]# verstecke.",
+                                                                          /*german*/ "Man erzählt sich, daß ein Felsen auf #einem Vorsprung des Tals# #[[1]]# verstecke.",
                                                                           /*french*/ "Selon moi, soulever une #roche dans la vallée# révèle #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                        // /*spanish*/levantar una #roca al borde del valle# esconde #[[1]]#.
 
     hintTextTable[RHT_GC_GROTTO_PLATFORM_TO_GC_GROTTO] = HintText(CustomMessage("They say that a #pool of lava# in Goron City blocks the way to #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß ein #Lavateich# in Goronia den Weg zu #[[1]]# blockiere.",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Lavateich# in Goronia #[[1]]# blockiere.",
                                                                      /*french*/ "Selon moi, l'#étang de lave# dans le village Goron renferme #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                   // /*spanish*/un #estanque de lava# en la Ciudad Goron bloquea el paso a #[[1]]#.
 
@@ -909,27 +914,27 @@ void StaticData::HintTable_Init() {
                                                                         // /*spanish*/una #tienda de campaña del valle# cubre #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_WARP_PAD_REGION_TO_SHADOW_TEMPLE_ENTRYWAY] = HintText(CustomMessage("They say that at the #back of the Graveyard#, there is #[[1]]#.",
-                                                                                         /*german*/ "Man erzählt sich, daß sich #hinter dem Friedhof, #[[1]]# befände.",
+                                                                                         /*german*/ "Man erzählt sich, daß sich #hinter dem Friedhof# #[[1]]# |befände|befänden|.",
                                                                                          /*french*/ "Selon moi, #derrière le Cimetière# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                       // /*spanish*/en la #parte trasera del cementerio# se halla #[[1]]#.
 
     hintTextTable[RHT_LAKE_HYLIA_TO_WATER_TEMPLE_LOBBY] = HintText(CustomMessage("They say that deep #under a vast lake#, one can find #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß man tief #unter einem gewaltigen See#, #[[1]]# finden könne.",
+                                                                      /*german*/ "Man erzählt sich, daß man tief #unterhalb eines gewaltigen Sees# #[[1]]# finden könne.",
                                                                       /*french*/ "Selon moi, #sous le lac# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                    // /*spanish*/en las #profundidades de un lago inmenso# se halla #[[1]]#.
 
     hintTextTable[RHT_GERUDO_FORTRESS_TO_GERUDO_TRAINING_GROUND_LOBBY] = HintText(CustomMessage("They say that paying a #fee to the Gerudos# grants access to #[[1]]#.",
-                                                                                      /*german*/ "Man erzählt sich, daß das Bezahlen einer #Gebühr an die Gerudos#, Zugang zu #[[1]]# gewähre.",
+                                                                                      /*german*/ "Man erzählt sich, daß das Bezahlen einer #Gebühr an die Gerudos# #[[1]]# gewähre.",
                                                                                       /*french*/ "Selon moi, l'#entrée payante des Gerudo# donne accès à #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                    // /*spanish*/pagarle una #tasa a las gerudo# da acceso a #[[1]]#.
 
     hintTextTable[RHT_ZORAS_FOUNTAIN_TO_JABU_JABUS_BELLY_BEGINNING] = HintText(CustomMessage("They say that inside #Jabu-Jabu#, one can find #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß man #in Jabu-Jabu#, #[[1]]# finden könne.",
+                                                                                  /*german*/ "Man erzählt sich, daß man #in Jabu-Jabu# #[[1]]# finden könne.",
                                                                                   /*french*/ "Selon moi, #dans Jabu-Jabu# se trouve #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                                // /*spanish*/dentro de #Jabu-Jabu# se halla #[[1]]#.
 
     hintTextTable[RHT_KAKARIKO_VILLAGE_TO_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("They say that a #village well# leads to #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß ein #Dorfbrunnen# zu #[[1]]# führe.",
+                                                                            /*german*/ "Man erzählt sich, daß man #in einem Dorfbrunnen# #[[1]]# finden könne.",
                                                                             /*french*/ "Selon moi, dans le fond du #Puits du village# gît #[[1]]#.", {QM_RED, QM_BLUE})),
                                                                          // /*spanish*/el #pozo de un pueblo# conduce a #[[1]]#.
 
@@ -938,72 +943,72 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_LINKS_POCKET] = HintText(CustomMessage("Link's Pocket",
-                                                  /*german*/ "Links Taschen",
+                                                  /*german*/ "in Links Tasche",
                                                   /*french*/ "les Poches de @"));
                                                // /*spanish*/el bolsillo de @
 
     hintTextTable[RHT_KOKIRI_FOREST] = HintText(CustomMessage("Kokiri Forest",
-                                                   /*german*/ "Kokiri-Wald",
+                                                   /*german*/ "im Kokiri-Wald",
                                                    /*french*/ "la Forêt Kokiri"));
                                                 // /*spanish*/el Bosque Kokiri
 
     hintTextTable[RHT_THE_LOST_WOODS] = HintText(CustomMessage("the Lost Woods",
-                                                    /*german*/ "Verlorene Wälder",
+                                                    /*german*/ "in den Verlorenen Wäldern",
                                                     /*french*/ "les Bois Perdus"));
                                                  // /*spanish*/el Bosque Perdido
-    
+
     hintTextTable[RHT_SACRED_FOREST_MEADOW] = HintText(CustomMessage("Sacred Forest Meadow",
-                                                          /*german*/ "Heilige Lichtung",
+                                                          /*german*/ "auf der Heiligen Lichtung",
                                                           /*french*/ "le Bosquet Sacré"));
                                                        // /*spanish*/la pradera sagrada del bosque
 
     hintTextTable[RHT_HYRULE_FIELD] = HintText(CustomMessage("Hyrule Field",
-                                                  /*german*/ "Hylianische Steppe",
+                                                  /*german*/ "in der Hylianischen Steppe",
                                                   /*french*/ "la Plaine d'Hyrule"));
                                                // /*spanish*/la Llanura de Hyrule
 
     hintTextTable[RHT_LAKE_HYLIA] = HintText(CustomMessage("Lake Hylia",
-                                                /*german*/ "Hylia-See",
+                                                /*german*/ "am Hylia-See",
                                                 /*french*/ "le Lac Hylia"));
                                              // /*spanish*/el Lago Hylia
 
     hintTextTable[RHT_GERUDO_VALLEY] = HintText(CustomMessage("Gerudo Valley",
-                                                   /*german*/ "Gerudotal",
+                                                   /*german*/ "im Gerudotal",
                                                    /*french*/ "la Vallée Gerudo"));
                                                 // /*spanish*/el Valle Gerudo
 
     hintTextTable[RHT_GERUDO_FORTRESS] = HintText(CustomMessage("Gerudo's Fortress",
-                                                     /*german*/ "Gerudo-Festung",
+                                                     /*german*/ "in der Gerudo-Festung",
                                                      /*french*/ "le Repaire des Voleurs"));
                                                   // /*spanish*/la Fortaleza Gerudo
 
     hintTextTable[RHT_HAUNTED_WASTELAND] = HintText(CustomMessage("Haunted Wasteland",
-                                                       /*german*/ "Gespensterwüste",
+                                                       /*german*/ "in der Gespensterwüste",
                                                        /*french*/ "le Désert Hanté"));
                                                     // /*spanish*/el desierto encantado
 
     hintTextTable[RHT_DESERT_COLOSSUS] = HintText(CustomMessage("Desert Colossus",
-                                                     /*german*/ "Wüstenkoloß",
+                                                     /*german*/ "am Wüstenkoloss",
                                                      /*french*/ "le Colosse du Désert"));
                                                   // /*spanish*/el Coloso del Desierto
 
     hintTextTable[RHT_THE_MARKET] = HintText(CustomMessage("the Market",
-                                                /*german*/ "Markt",
+                                                /*german*/ "auf dem Markt",
                                                 /*french*/ "la Place du Marché"));
                                              // /*spanish*/la plaza del mercado
 
     hintTextTable[RHT_TEMPLE_OF_TIME] = HintText(CustomMessage("Temple of Time",
-                                                    /*german*/ "Zitadelle der Zeit",
+                                                    /*german*/ "in der Zitadelle der Zeit",
                                                     /*french*/ "le Temple du Temps"));
                                                  // /*spanish*/el Templo del Tiempo
-    
+
     hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
-                                                    /*german*/ "Anlage von Schloß Hyrule",
+                                                    /*german*/ "auf dem Schloßgelände",
                                                     /*french*/ "le Château d'Hyrule"));
                                                  // /*spanish*/
-    
+
     hintTextTable[RHT_HYRULE_CASTLE] = HintText(CustomMessage("Hyrule Castle",
-                                                   /*german*/ "Schloß Hyrule",
+                                                   /*german*/ "in Schloß Hyrule",
                                                    /*french*/ "le Château d'Hyrule"));
                                                 // /*spanish*/el Castillo de Hyrule
 
@@ -1012,53 +1017,48 @@ void StaticData::HintTable_Init() {
                                                            /*french*/ "les alentours du Château de Ganon"));
                                                         // /*spanish*/el exterior del Castillo de Ganon
 
-    hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
-                                                    /*german*/ "Anlage von Schloß Hyrule",
-                                                    /*french*/ "le Château d'Hyrule"));
-                                                 // /*spanish*/
-    
     hintTextTable[RHT_KAKARIKO_VILLAGE] = HintText(CustomMessage("Kakariko Village",
-                                                      /*german*/ "Kakariko",
+                                                      /*german*/ "in Kakariko",
                                                       /*french*/ "le Village Cocorico"));
                                                    // /*spanish*/Kakariko
 
     hintTextTable[RHT_THE_GRAVEYARD] = HintText(CustomMessage("the Graveyard",
-                                                   /*german*/ "Friedhof",
+                                                   /*german*/ "auf dem Friedhof",
                                                    /*french*/ "le Cimetière"));
                                                 // /*spanish*/el cementerio
 
     hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL] = HintText(CustomMessage("Death Mountain Trail",
-                                                          /*german*/ "Gebirgspfad",
+                                                          /*german*/ "auf dem Gebirgspfad",
                                                           /*french*/ "le Chemin du Péril"));
                                                        // /*spanish*/el sendero de la Montaña de la Muerte
 
     hintTextTable[RHT_GORON_CITY] = HintText(CustomMessage("Goron City",
-                                                /*german*/ "Goronia",
+                                                /*german*/ "in Goronia",
                                                 /*french*/ "le Village Goron"));
                                              // /*spanish*/la Ciudad Goron
 
     hintTextTable[RHT_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("Death Mountain Crater",
-                                                           /*german*/ "Todeskrater",
+                                                           /*german*/ "im Todeskrater",
                                                            /*french*/ "le Cratère du Péril"));
                                                         // /*spanish*/el cráter de la Montaña de la Muerte
 
     hintTextTable[RHT_ZORAS_RIVER] = HintText(CustomMessage("Zora's River",
-                                                 /*german*/ "Zoras Fluß",
+                                                 /*german*/ "am Zora-Fluß",
                                                  /*french*/ "la Rivière Zora"));
                                               // /*spanish*/el Río Zora
 
     hintTextTable[RHT_ZORAS_DOMAIN] = HintText(CustomMessage("Zora's Domain",
-                                                  /*german*/ "Zoras Reich",
+                                                  /*german*/ "in Zoras Reich",
                                                   /*french*/ "le Domaine Zora"));
                                                // /*spanish*/la Región de los Zora
 
     hintTextTable[RHT_ZORAS_FOUNTAIN] = HintText(CustomMessage("Zora's Fountain",
-                                                    /*german*/ "Zoras Quelle",
+                                                    /*german*/ "an Zoras Quelle",
                                                     /*french*/ "la Fontaine Zora"));
                                                  // /*spanish*/la Fuente Zora
-    
+
     hintTextTable[RHT_LON_LON_RANCH] = HintText(CustomMessage("Lon Lon Ranch",
-                                                   /*german*/ "Lon Lon-Farm",
+                                                   /*german*/ "auf der Lon Lon-Farm",
                                                    /*french*/ "le Ranch Lon Lon"));
                                                 // /*spanish*/el Rancho Lon Lon
 
@@ -1067,387 +1067,387 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_KF_LINKS_HOUSE] = HintText(CustomMessage("Link's House",
-                                                    /*german*/ "Links Haus",
+                                                    /*german*/ "in #Links Haus#",
                                                     /*french*/ "la #maison de @#"));
                                                  // /*spanish*/la casa de @
 
     hintTextTable[RHT_KF_MIDOS_HOUSE] = HintText(CustomMessage("Mido's house",
-                                                    /*german*/ "Midos Haus",
+                                                    /*german*/ "in #Midos Haus#",
                                                     /*french*/ "la Cabane du Grand Mido"));
                                                  // /*spanish*/la casa de Mido
-    
+
     hintTextTable[RHT_KF_SARIAS_HOUSE] = HintText(CustomMessage("Saria's House",
-                                                     /*german*/ "Salias Haus",
+                                                     /*german*/ "in #Salias Haus#",
                                                      /*french*/ "la Cabane de Saria"));
                                                   // /*spanish*/la casa de Saria
 
     hintTextTable[RHT_KF_HOUSE_OF_TWINS] = HintText(CustomMessage("the #House of Twins#",
-                                                       /*german*/ "das #Haus der Zwillinge#",
+                                                       /*german*/ "im #Haus der Zwillinge#",
                                                        /*french*/ "la Cabane des Jumelles"));
                                                     // /*spanish*/la casa de las gemelas
 
     hintTextTable[RHT_KF_KNOW_IT_ALL_HOUSE] = HintText(CustomMessage("Know-It-All Brothers' House",
-                                                          /*german*/ "das #Haus der allwissenden Brüder#",
+                                                          /*german*/ "im #Haus der allwissenden Brüder#",
                                                           /*french*/ "la Cabane des frères Je-Sais-Tout"));
                                                        // /*spanish*/la casa de los hermanos Sabelotodo
 
     hintTextTable[RHT_KF_KOKIRI_SHOP] = HintText(CustomMessage("the #Kokiri Shop#",
-                                                    /*german*/ "der #Kokiri-Laden#",
+                                                    /*german*/ "im #Kokiri-Laden#",
                                                     /*french*/ "le #Magasin Kokiri#"));
                                                  // /*spanish*/la tienda kokiri
-    
+
     hintTextTable[RHT_LH_LAB] = HintText(CustomMessage("the #Lakeside Laboratory#",
-                                            /*german*/ "das #Laboratorium des Sees#",
+                                            /*german*/ "im #Labor am See#",
                                             /*french*/ "le #Laboratoire du Lac#"));
                                          // /*spanish*/el laboratorio del lago
 
     hintTextTable[RHT_LH_FISHING_POND] = HintText(CustomMessage("the #Fishing Pond#",
-                                                     /*german*/ "der #Angelteich#",
+                                                     /*german*/ "am #Fischweiher#",
                                                      /*french*/ "l'#Étang#"));
                                                   // /*spanish*/el estanque
 
     hintTextTable[RHT_GV_CARPENTER_TENT] = HintText(CustomMessage("the #Carpenters' tent#",
-                                                       /*german*/ "das #Zelt der Zimmerleute#",
+                                                       /*german*/ "im #Zelt der Zimmerleute#",
                                                        /*french*/ "la #Tente des charpentiers#"));
                                                     // /*spanish*/la #tienda de campaña de los carpinteros#
 
     hintTextTable[RHT_MARKET_GUARD_HOUSE] = HintText(CustomMessage("the #Guard House#",
-                                                        /*german*/ "das #Haus der Wachen#",
+                                                        /*german*/ "im #Wachhaus#",
                                                         /*french*/ "le #poste de garde#"));
                                                      // /*spanish*/la caseta de guardia
 
     hintTextTable[RHT_MARKET_MASK_SHOP] = HintText(CustomMessage("the #Happy Mask Shop#",
-                                                      /*german*/ "der #Fröhliche Maskenladen#",
+                                                      /*german*/ "beim #Maskenhändler#",
                                                       /*french*/ "la #Foire Aux Masques#"));
                                                    // /*spanish*/la tienda de La Máscara Feliz
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING] = HintText(CustomMessage("the #Bombchu Bowling Alley#",
-                                                            /*german*/ "die #Krabbelminenbowlingbahn",
+                                                            /*german*/ "bei der #Minenbowlingbahn",
                                                             /*french*/ "le #Bowling Teigneux#"));
                                                          // /*spanish*/la Bolera Bombchu
 
     hintTextTable[RHT_MARKET_POTION_SHOP] = HintText(CustomMessage("the #Market Potion Shop#",
-                                                        /*german*/ "der #Magie-Laden des Marktes#",
+                                                        /*german*/ "im #Magie-Laden des Marktes#",
                                                         /*french*/ "l'#apothicaire de la Place du Marché#"));
                                                      // /*spanish*/la tienda de pociones de la plaza del mercado
 
     hintTextTable[RHT_MARKET_TREASURE_CHEST_GAME] = HintText(CustomMessage("the #Treasure Chest Shop#",
-                                                                /*german*/ "der #Schatztruhen-Laden#",
+                                                                /*german*/ "in der #Truhenlotterie#",
                                                                 /*french*/ "la #Chasse-aux-Trésors#"));
                                                              // /*spanish*/el Cofre del Tesoro
 
     hintTextTable[RHT_MARKET_BOMBCHU_SHOP] = HintText(CustomMessage("the #Bombchu Shop#",
-                                                         /*german*/ "der #Krabbelminen-Laden#",
+                                                         /*german*/ "im #Krabbelminen-Laden#",
                                                          /*french*/ "le #Magasin de Missiles#"));
                                                       // /*spanish*/la Tienda Bombchu
 
     hintTextTable[RHT_MARKET_MAN_IN_GREEN_HOUSE] = HintText(CustomMessage("Man in Green's House",
-                                                               /*german*/ "das #Haus des Mannes in grün#",
+                                                               /*german*/ "im #Haus des Mannes in grün#",
                                                                /*french*/ "la #Maison de l'Homme en Vert#"));
                                                             // /*spanish*/la casa del hombre de verde
 
     hintTextTable[RHT_KAK_WINDMILL] = HintText(CustomMessage("the #Windmill#",
-                                                  /*german*/ "die #Windmühle#",
+                                                  /*german*/ "in der #Windmühle#",
                                                   /*french*/ "le #Moulin#"));
                                                // /*spanish*/el #molino#
 
     hintTextTable[RHT_KAK_CARPENTER_BOSS_HOUSE] = HintText(CustomMessage("the #Carpenters' Boss House#",
-                                                              /*german*/ "das #Haus des Chefs der Zimmerleute#",
+                                                              /*german*/ "im #Haus des Chefs der Zimmerleute#",
                                                               /*french*/ "la #Maison du Chef des ouvriers#"));
                                                            // /*spanish*/la casa del capataz de los carpinteros
 
     hintTextTable[RHT_KAK_HOUSE_OF_SKULLTULA] = HintText(CustomMessage("the #House of Skulltula#",
-                                                            /*german*/ "das #Haus der Skulltula#",
+                                                            /*german*/ "im #Haus der Skulltula#",
                                                             /*french*/ "la #Maison des Skulltulas#"));
                                                          // /*spanish*/la casa de las Skulltulas
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE] = HintText(CustomMessage("Impa's House",
-                                                     /*german*/ "das #Haus von Impa#",
+                                                     /*german*/ "in #Impas Haus#",
                                                      /*french*/ "la #Maison d'Impa#"));
                                                   // /*spanish*/la casa de Impa
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE_BACK] = HintText(CustomMessage("Impa's cow cage",
-                                                          /*german*/ "der #Kuhkäfig von Impa#",
+                                                          /*german*/ "in #Impas Kuhkäfig#",
                                                           /*french*/ "la #cage à vache d'Impa#"));
                                                        // /*spanish*/la jaula de la vaca de Impa
 
     hintTextTable[RHT_KAK_ODD_POTION_BUILDING] = HintText(CustomMessage("Granny's Potion Shop",
-                                                             /*german*/ "Asas Hexenladen",
+                                                             /*german*/ "in Asas Hexenladen",
                                                              /*french*/ "la #maison bleue de Cocorico#"));
                                                           // /*spanish*/la tienda de pociones de la abuela
 
     hintTextTable[RHT_GRAVEYARD_DAMPES_HOUSE] = HintText(CustomMessage("Dampé's Hut",
-                                                            /*german*/ "die #Hütte von Boris#",
+                                                            /*german*/ "in der #Hütte des Totengräbers#",
                                                             /*french*/ "la #Cabane du Fossoyeur#"));
                                                          // /*spanish*/la cabaña de Dampé
 
     hintTextTable[RHT_GC_SHOP] = HintText(CustomMessage("the #Goron Shop#",
-                                             /*german*/ "der #Goronen-Laden#",
+                                             /*german*/ "im #Goronen-Laden#",
                                              /*french*/ "la #Boutique Goron#"));
                                           // /*spanish*/la #tienda goron#
 
     hintTextTable[RHT_ZD_SHOP] = HintText(CustomMessage("the #Zora Shop#",
-                                             /*german*/ "der #Zora-Laden#",
+                                             /*german*/ "im #Zora-Laden#",
                                              /*french*/ "la #Boutique Zora#"));
                                           // /*spanish*/la #tienda zora#
 
     hintTextTable[RHT_LLR_TALONS_HOUSE] = HintText(CustomMessage("Talon's House",
-                                                      /*german*/ "das #Haus von Talon#",
+                                                      /*german*/ "im #Haus von Talon#",
                                                       /*french*/ "la #Maison de Talon#"));
                                                    // /*spanish*/la casa de Talon
 
     hintTextTable[RHT_LLR_STABLES] = HintText(CustomMessage("a #stable#",
-                                                 /*german*/ "ein #Stall#",
+                                                 /*german*/ "in den #Ställen#",
                                                  /*french*/ "l'#Étable#"));
                                               // /*spanish*/el establo
 
     hintTextTable[RHT_LLR_TOWER] = HintText(CustomMessage("the #Lon Lon Tower#",
-                                               /*german*/ "der #Lon Lon-Turm#",
+                                               /*german*/ "im #Lon Lon-Turm#",
                                                /*french*/ "le #silo du Ranch Lon Lon#"));
                                             // /*spanish*/la torre Lon Lon
 
     hintTextTable[RHT_MARKET_BAZAAR] = HintText(CustomMessage("the #Market Bazaar#",
-                                                   /*german*/ "der #Basar des Marktes#",
+                                                   /*german*/ "im #Basar des Marktes#",
                                                    /*french*/ "le #Bazar de la Place du Marché#"));
                                                 // /*spanish*/el bazar de la plaza del mercado
 
     hintTextTable[RHT_MARKET_SHOOTING_GALLERY] = HintText(CustomMessage("a #Slingshot Shooting Gallery#",
-                                                             /*german*/ "die #Schießbude des Marktes#",
+                                                             /*german*/ "in der #Schießbude des Marktes#",
                                                              /*french*/ "le #Jeu d'Adresse de la Place du Marché#"));
                                                           // /*spanish*/el Tiro al Blanco con tirachinas
 
     hintTextTable[RHT_KAK_BAZAAR] = HintText(CustomMessage("the #Kakariko Bazaar#",
-                                                /*german*/ "der #Basar von Kakariko#",
+                                                /*german*/ "im #Basar von Kakariko#",
                                                 /*french*/ "le #Bazar de Cocorico#"));
                                              // /*spanish*/el bazar de Kakariko
 
     hintTextTable[RHT_KAK_POTION_SHOP_FRONT] = HintText(CustomMessage("the #Kakariko Potion Shop#",
-                                                           /*german*/ "der #Magie-Laden von Kakariko#",
+                                                           /*german*/ "im #Magie-Laden von Kakariko#",
                                                            /*french*/ "l'#apothicaire de Cocorico#"));
                                                         // /*spanish*/la tienda de pociones de Kakariko
 
     hintTextTable[RHT_KAK_POTION_SHOP_BACK] = HintText(CustomMessage("the #Kakariko Potion Shop#",
-                                                          /*german*/ "der #Magie-Laden von Kakariko#",
+                                                          /*german*/ "im #Magie-Laden von Kakariko#",
                                                           /*french*/ "l'#apothicaire de Cocorico#"));
                                                        // /*spanish*/la tienda de pociones de Kakariko
 
     hintTextTable[RHT_KAK_SHOOTING_GALLERY] = HintText(CustomMessage("a #Bow Shooting Gallery#",
-                                                          /*german*/ "eine #Schießbude von Kakariko#",
+                                                          /*german*/ "in der #Schießbude von Kakariko#",
                                                           /*french*/ "le #jeu d'adresse de Cocorico#"));
                                                        // /*spanish*/el Tiro al Blanco con arco
 
     hintTextTable[RHT_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                                   /*german*/ "eine #Feen-Quelle#",
+                                                                   /*german*/ "in einer #Feen-Quelle#",
                                                                    /*french*/ "une #Fontaine Royale des Fées#"));
                                                                 // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_HC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                             /*german*/ "eine #Feen-Quelle#",
+                                                             /*german*/ "in einer #Feen-Quelle#",
                                                              /*french*/ "une #Fontaine Royale des Fées#"));
                                                           // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_OGC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "eine #Feen-Quelle#",
+                                                              /*german*/ "in einer #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_DMC_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "eine #Feen-Quelle#",
+                                                              /*german*/ "in einer #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_DMT_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                              /*german*/ "eine #Feen-Quelle#",
+                                                              /*german*/ "in einer #Feen-Quelle#",
                                                               /*french*/ "une #Fontaine Royale des Fées#"));
                                                            // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_ZF_GREAT_FAIRY_FOUNTAIN] = HintText(CustomMessage("a #Great Fairy Fountain#",
-                                                             /*german*/ "eine #Feen-Quelle#",
+                                                             /*german*/ "in einer #Feen-Quelle#",
                                                              /*french*/ "une #Fontaine Royale des Fées#"));
                                                           // /*spanish*/una fuente de la Gran Hada
 
     hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE] = HintText(CustomMessage("a #grave with a free chest#",
-                                                            /*german*/ "ein #Grab mit einer Gratistruhe#",
+                                                            /*german*/ "in einem #Grab mit einer Gratistruhe#",
                                                             /*french*/ "le #tombeau avec un trésor#"));
                                                          // /*spanish*/la #tumba con un cofre#
 
     hintTextTable[RHT_GRAVEYARD_HEART_PIECE_GRAVE] = HintText(CustomMessage("a chest spawned by #Sun's Song#",
-                                                                 /*german*/ "eine von der #Hymne der Sonne# geschaffene Truhe",
+                                                                 /*german*/ "in einer von der #Hymne der Sonne# geschaffenen Truhe",
                                                                  /*french*/ "un #coffre apparaît avec le Chant du Soleil#"));
                                                               // /*spanish*/la #tumba de la Canción del Sol#
 
     hintTextTable[RHT_GRAVEYARD_COMPOSERS_GRAVE] = HintText(CustomMessage("the #Composers' Grave#",
-                                                               /*german*/ "das #Königsgrab#",
+                                                               /*german*/ "im #Königsgrab#",
                                                                /*french*/ "la #Tombe royale#"));
                                                             // /*spanish*/el #Panteón Real#
 
     hintTextTable[RHT_GRAVEYARD_DAMPES_GRAVE] = HintText(CustomMessage("Dampé's Grave",
-                                                            /*german*/ "das #Grab von Boris#",
+                                                            /*german*/ "im #Grab des Totengräbers#",
                                                             /*french*/ "la #Tombe d'Igor#"));
                                                          // /*spanish*/la #tumba de Dampé#
 
     hintTextTable[RHT_DMT_COW_GROTTO] = HintText(CustomMessage("a solitary #Cow#",
-                                                    /*german*/ "eine solitäre #Kuh#",
+                                                    /*german*/ "bei einer einsamen #Kuh#",
                                                     /*french*/ "la #grotte avec une vache#"));
                                                  // /*spanish*/una #vaca# solitaria
-    
+
     hintTextTable[RHT_HC_STORMS_GROTTO] = HintText(CustomMessage("a sandy grotto with #fragile walls#",
-                                                      /*german*/ "eine sandige Grotte mit #fragilen Wänden#",
+                                                      /*german*/ "in einer sandige Grotte mit #fragilen Wänden#",
                                                       /*french*/ "la #grotte avec des murs fragiles#"));
                                                    // /*spanish*/la arenosa gruta de #frágiles paredes#
 
     hintTextTable[RHT_HF_TEKTITE_GROTTO] = HintText(CustomMessage("a pool guarded by a #Tektite#",
-                                                       /*german*/ "ein poolbewachender #Arachno#",
+                                                       /*german*/ "in einem #Schwimmbecken mit einem Arachno#",
                                                        /*french*/ "l'#étang sous-terrain avec un Araknon#"));
                                                     // /*spanish*/un charco custodiado por un #Tektite#
 
     hintTextTable[RHT_HF_NEAR_KAK_GROTTO] = HintText(CustomMessage("a #Big Skulltula# guarding a Gold one",
-                                                        /*german*/ "eine goldene Skulltula bewachende #große Skulltula#",
+                                                        /*german*/ "bei #zwei unterirdischen Skulltulas#",
                                                         /*french*/ "la #grotte d'araignées#"));
                                                      // /*spanish*/una #gran Skulltula# custodiando una dorada
 
     hintTextTable[RHT_HF_COW_GROTTO] = HintText(CustomMessage("a grotto full of #spider webs#",
-                                                   /*german*/ "eine mit #Spinnweben# gefüllte Grotte",
+                                                   /*german*/ "in einer Grotte voller #Spinnweben#",
                                                    /*french*/ "la #grotte couverte de toiles d'araignées#"));
                                                 // /*spanish*/una gruta llena de #telarañas#
 
     hintTextTable[RHT_KAK_REDEAD_GROTTO] = HintText(CustomMessage("#ReDeads# guarding a chest",
-                                                       /*german*/ "truhenbewachende #Remorts#",
+                                                       /*german*/ "in einer Grotte mit #zwei Remorts#",
                                                        /*french*/ "le tombeau de #deux morts#"));
                                                     // /*spanish*/los #ReDeads# que custodian un cofre
 
     hintTextTable[RHT_SFM_WOLFOS_GROTTO] = HintText(CustomMessage("#Wolfos# guarding a chest",
-                                                       /*german*/ "truhenbewachende #Wolfos#",
+                                                       /*german*/ "in einer Grotte mit #zwei Wolfos#",
                                                        /*french*/ "la #grotte iridescente#"));
                                                     // /*spanish*/los #Wolfos# que custodian un cofre
 
     hintTextTable[RHT_GV_OCTOROK_GROTTO] = HintText(CustomMessage("an #Octorok# guarding a rich pool",
-                                                       /*german*/ "ein poolbewachender #Oktorok#",
+                                                       /*german*/ "in einem #Schwimmbecken mit einem Oktorok#",
                                                        /*french*/ "un #étang sous-terrain avec un Octorok#"));
                                                     // /*spanish*/un #Octorok# que custodia un lujoso charco
 
     hintTextTable[RHT_DEKU_THEATER] = HintText(CustomMessage("the #Lost Woods Stage#",
-                                                  /*german*/ "die #Verlorenen Wälder#",
+                                                  /*german*/ "auf der #Waldbühne#",
                                                   /*french*/ "le #théâtre sylvestre#"));
                                                // /*spanish*/el #escenario del Bosque Perdido#
 
     hintTextTable[RHT_ZR_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                    /*german*/ "eine #generische Grotte#",
+                                                    /*german*/ "in einer #gewöhnlichen Grotte#",
                                                     /*french*/ "une #grotte avec un trésor#"));
                                                  // /*spanish*/una #cueva genérica#
-    
+
     hintTextTable[RHT_DMC_UPPER_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                      /*german*/ "eine #generische Grotte#",
+                                                      /*german*/ "in einer #gewöhnlichen Grotte#",
                                                       /*french*/ "une #grotte avec un trésor#"));
                                                    // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_DMT_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                       /*german*/ "eine #generische Grotte#",
+                                                       /*german*/ "in einer #gewöhnlichen Grotte#",
                                                        /*french*/ "une #grotte avec un trésor#"));
                                                     // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_KAK_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                     /*german*/ "eine #generische Grotte#",
+                                                     /*german*/ "in einer #gewöhnlichen Grotte#",
                                                      /*french*/ "une #grotte avec un trésor#"));
                                                   // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                           /*german*/ "eine #generische Grotte#",
+                                                           /*german*/ "in einer #gewöhnlichen Grotte#",
                                                            /*french*/ "une #grotte avec un trésor#"));
                                                         // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_OPEN_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                    /*german*/ "eine #generische Grotte#",
+                                                    /*german*/ "in einer #gewöhnlichen Grotte#",
                                                     /*french*/ "une #grotte avec un trésor#"));
                                                  // /*spanish*/una #cueva genérica#
-    
+
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                         /*german*/ "eine #generische Grotte#",
+                                                         /*german*/ "in einer #gewöhnlichen Grotte#",
                                                          /*french*/ "une #grotte avec un trésor#"));
                                                       // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_KF_STORMS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                      /*german*/ "eine #generische Grotte#",
+                                                      /*german*/ "in einer #gewöhnlichen Grotte#",
                                                       /*french*/ "une #grotte avec un trésor#"));
                                                    // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO] = HintText(CustomMessage("a #generic grotto#",
-                                                              /*german*/ "eine #generische Grotte#",
+                                                              /*german*/ "in einer #gewöhnlichen Grotte#",
                                                               /*french*/ "une #grotte avec un trésor#"));
                                                            // /*spanish*/una #cueva genérica#
 
     hintTextTable[RHT_HF_INSIDE_FENCE_GROTTO] = HintText(CustomMessage("a #single Upgrade Deku Scrub#",
-                                                            /*german*/ "ein #einzelner Upgrade-Deku#",
+                                                            /*german*/ "bei einem #Deku-Händler mit guter Ware#",
                                                             /*french*/ "une #grotte avec une peste Mojo#"));
                                                          // /*spanish*/una cueva con un #solitario mercader deku#
 
     hintTextTable[RHT_LW_SCRUBS_GROTTO] = HintText(CustomMessage("#2 Deku Scrubs# including an Upgrade one",
-                                                      /*german*/ "#zwei Dekus# inklusive einem Upgrade-Deku",
+                                                      /*german*/ "bei #zwei Deku-Händlern mit guter Ware#",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_COLOSSUS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                     /*german*/ "zwei Dekus",
+                                                     /*german*/ "in einer Grotte mit #zwei Deku-Händlern#",
                                                      /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                   // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_ZR_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                      /*german*/ "zwei Dekus",
+                                                      /*german*/ "in einer Grotte mit #zwei Deku-Händlern#",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_SFM_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                       /*german*/ "zwei Dekus",
+                                                       /*german*/ "in einer Grotte mit #zwei Deku-Händlern#",
                                                        /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                     // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_GV_STORMS_GROTTO] = HintText(CustomMessage("2 Deku Scrubs",
-                                                      /*german*/ "zwei Dekus",
+                                                      /*german*/ "in einer Grotte mit #zwei Deku-Händlern#",
                                                       /*french*/ "une #grotte avec deux pestes Mojo#"));
                                                    // /*spanish*/una cueva con #dos mercaderes deku#
 
     hintTextTable[RHT_LH_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                               /*german*/ "drei Dekus",
+                                               /*german*/ "in einer Grotte mit #drei Deku-Händlern#",
                                                /*french*/ "une #grotte avec trois pestes Mojo#"));
                                             // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_DMC_HAMMER_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                                       /*german*/ "drei Dekus",
+                                                       /*german*/ "in einer Grotte mit #drei Deku-Händlern#",
                                                        /*french*/ "une #grotte avec trois pestes Mojo#"));
                                                     // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_GC_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                               /*german*/ "drei Dekus",
+                                               /*german*/ "in einer Grotte mit #drei Deku-Händlern#",
                                                /*french*/ "une #grotte avec trois pestes Mojo#"));
                                             // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_LLR_GROTTO] = HintText(CustomMessage("3 Deku Scrubs",
-                                                /*german*/ "drei Dekus",
+                                                /*german*/ "in einer Grotte mit #drei Deku-Händlern#",
                                                 /*french*/ "une #grotte avec trois pestes Mojo#"));
                                              // /*spanish*/una cueva con #tres mercaderes deku#
 
     hintTextTable[RHT_ZR_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                     /*german*/ "ein kleiner #Feen-Brunnen#",
+                                                     /*german*/ "in einem #Feen-Brunnen#",
                                                      /*french*/ "une #fontaine de fées#"));
                                                   // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_HF_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                     /*german*/ "ein kleiner #Feen-Brunnen#",
+                                                     /*german*/ "in einem #Feen-Brunnen#",
                                                      /*french*/ "une #fontaine de fées#"));
                                                   // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_SFM_FAIRY_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
+                                                      /*german*/ "in einem #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_ZD_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
+                                                      /*german*/ "in einem #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
     hintTextTable[RHT_GF_STORMS_GROTTO] = HintText(CustomMessage("a small #Fairy Fountain#",
-                                                      /*german*/ "ein kleiner #Feen-Brunnen#",
+                                                      /*german*/ "in einem #Feen-Brunnen#",
                                                       /*french*/ "une #fontaine de fées#"));
                                                    // /*spanish*/una pequeña #fuente de hadas#
 
@@ -1456,257 +1456,258 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_JUNK01] = HintText(CustomMessage("They say you must read the names of \"Special Deal\" shop items carefully.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß man die \"Sonderangebote\" in Läden sorgfältig lesen sollte!",
                                             /*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!"));
 
     hintTextTable[RHT_JUNK02] = HintText(CustomMessage("They say that Zelda is a poor leader.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Zelda eine schlechte Anführerin sei.",
                                             /*french*/ "Selon moi, Zelda ne ferait pas un bon monarque."));
 
     hintTextTable[RHT_JUNK03] = HintText(CustomMessage("These hints can be quite useful. This is an exception.",
-                                            /*german*/ "",
+                                            /*german*/ "Die Hinweise von uns Mythensteinen können sehr nützlich sein. Dies ist eine Ausnahme.",
                                             /*french*/ "Ces indices sont très utiles, à l'exception de celui-ci."));
 
     hintTextTable[RHT_JUNK04] = HintText(CustomMessage("They say that the Lizalfos in Dodongo's Cavern like to play in lava.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß die Echsalfos in Dodongos Höhle gerne in Lava spielen.",
                                             /*french*/ "Selon moi, les Lézalfos de la Caverne Dodongo aiment patauger dans la lave."));
 
     hintTextTable[RHT_JUNK05] = HintText(CustomMessage("They say that all the Zora drowned in Wind Waker.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß alle Zoras in Wind Waker ertrunken wären.",
                                             /*french*/ "Selon moi, les Zoras se sont noyés dans Wind Waker."));
 
     hintTextTable[RHT_JUNK06] = HintText(CustomMessage("If Gorons eat rocks, does that mean I'm in danger?",
-                                            /*german*/ "",
+                                            /*german*/ "Da Goronen Steine essen… heißt das, ich sollte mir Sorgen machen?",
                                             /*french*/ "Ne dis pas au Gorons que je suis ici. Ils mangent des roches, tu sais!"));
 
     hintTextTable[RHT_JUNK07] = HintText(CustomMessage("'Member when Ganon was a blue pig?^I 'member.",
-                                            /*german*/ "",
+                                            /*german*/ "Weißte noch als Ganon nur n' blaues Schwein war?^Damals war alles besser. Kein unnötiger Schnickschnack!",
                                             /*french*/ "Dans mon temps, Ganon était un cochon bleu...^Pff! Les jeunes de nos jours, et leur Ganondorf!"));
 
     hintTextTable[RHT_JUNK08] = HintText(CustomMessage("One who does not have Triforce can't go in.",
-                                            /*german*/ "",
+                                            /*german*/ "Jemand, der nicht im Besitz des Triforce ist, darf nicht eintreten!",
                                             /*french*/ "Ceux sans Triforce doivent rebrousser chemin."));
 
     hintTextTable[RHT_JUNK09] = HintText(CustomMessage("Save your future, end the Happy Mask Salesman.",
-                                            /*german*/ "",
+                                            /*german*/ "Rette die Zukunft, stoppe den Maskenhändler solange Du noch kannst.",
                                             /*french*/ "Selon moi, tu t'éviteras des jours de malheur si tu vaincs le vendeur de masques..."));
 
     hintTextTable[RHT_JUNK10] = HintText(CustomMessage("Glitches are a pathway to many abilities some consider to be... Unnatural.",
-                                            /*german*/ "",
+                                            /*german*/ "Glitches ermöglichen viele Fähigkeiten, die manche als... unnatürlich betrachten würden.",
                                             /*french*/ "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "));
 
     hintTextTable[RHT_JUNK11] = HintText(CustomMessage("I'm stoned. Get it?",
-                                            /*german*/ "",
-                                            /*french*/ "Allez, roche, papier, ciseau...&Roche."));
+                                            /*german*/ "Ich bin stoned. Verstehst du?",
+                                            /*french*/ "J'ai été pétrifié.&Tu as compris?"));
 
     hintTextTable[RHT_JUNK12] = HintText(CustomMessage("Hoot! Hoot! Would you like me to repeat that?",
-                                            /*german*/ "",
+                                            /*german*/ "Uhuuu! Uhu! Soll ich mich noch einmal wiederholen?",
                                             /*french*/ "Hou hou! Veux-tu que je répète tout ça?"));
 
     hintTextTable[RHT_JUNK13] = HintText(CustomMessage("Gorons are stupid. They eat rocks.",
-                                            /*german*/ "",
+                                            /*german*/ "Goronen sind doof. Sie essen Felsen.",
                                             /*french*/ "Les Gorons sont des vraies têtes dures."));
 
     hintTextTable[RHT_JUNK14] = HintText(CustomMessage("They say that Lon Lon Ranch prospered under Ingo.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Basil der Lon Lon-Farm zu neuem Glanz verholfen hat.",
                                             /*french*/ "Selon moi, le Ranch Lon Lon était plus prospère sous Ingo."));
 
     hintTextTable[RHT_JUNK15] = HintText(CustomMessage("They say without the Lens of Truth, the Treasure Chest Mini-Game is a 1 out of 32 chance.^Good luck!",
-                                            /*german*/ "",
-                                            /*french*/ "Gagner la Chasse-aux-Trésors est 1 chance sur 32.^Bonne chance!"));
+                                            /*german*/ "Man erzählt sich, daß Du ohne das Auge der Wahrheit bei der Truhenlotterie nur eine 1-zu-32-Chance hast.^Na dann, viel Glück.",
+                                            /*french*/ "Selon moi, les chances de gagner la Chasse-aux-Trésors sans Monocle de Vérité est de 1 chance sur 32.^Bonne chance!"));
 
     hintTextTable[RHT_JUNK16] = HintText(CustomMessage("Use bombs wisely.",
-                                            /*german*/ "",
+                                            /*german*/ "Setze Bomben mit Bedacht ein.",
                                             /*french*/ "Utilise les bombes avec précaution."));
 
     hintTextTable[RHT_JUNK17] = HintText(CustomMessage("They say that players who select the \"ON\" option for \"MOTION CONTROL\" are the real \"Zelda players!\"",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Spieler, die die Option \"BEWEGUNGSSTEUERUNG\" auf \"EIN\" stellen, die wahren \"Zelda-Spieler\" sind.",
                                             /*french*/ "Selon moi, ceux qui utilisent les contrôles gyroscopiques sont les VRAIS joueurs."));
 
     hintTextTable[RHT_JUNK18] = HintText(CustomMessage("L2P @.",
-                                            /*german*/ "",
+                                            /*german*/ "Lern zu spielen, @.",
                                             /*french*/ "Arrête de lire les indices et joue comme un grand, @."));
 
     hintTextTable[RHT_JUNK19] = HintText(CustomMessage("I bet you'd like to have more bombs.",
-                                            /*german*/ "",
+                                            /*german*/ "Möchtest Du zur Strafe mehr Bomben tragen können?",
                                             /*french*/ "Je parie que tu veux plus de bombes."));
 
     hintTextTable[RHT_JUNK20] = HintText(CustomMessage("When all else fails, use Fire.",
-                                            /*german*/ "",
+                                            /*german*/ "Wenn alles andere scheitert, benutze Feuer.",
                                             /*french*/ "Quand rien ne marche, utilise le feu."));
 
     hintTextTable[RHT_JUNK21] = HintText(CustomMessage("Here's a hint, @. Don't be bad.",
-                                            /*german*/ "",
+                                            /*german*/ "Hier ein Tipp, @: Sei nicht so schlecht.",
                                             /*french*/ "Selon moi, la #Triforce# n'est pas dans le jeu... Duh!"));
 
     hintTextTable[RHT_JUNK22] = HintText(CustomMessage("Game Over. Return of Ganon.",
-                                            /*german*/ "",
+                                            /*german*/ "Game Over. Ganons Rückkehr.",
                                             /*french*/ "Partie terminée. RETour de Ganon."));
 
     hintTextTable[RHT_JUNK23] = HintText(CustomMessage("May the way of the Hero lead to the Triforce.",
-                                            /*german*/ "",
+                                            /*german*/ "Möge der Weg des Helden zum Triforce führen.",
                                             /*french*/ "Que le chemin du héros te mène à la Triforce."));
 
     hintTextTable[RHT_JUNK24] = HintText(CustomMessage("Can't find an item? Scan an Amiibo.",
-                                            /*german*/ "",
+                                            /*german*/ "Du kannst einen Gegenstand nicht finden? Scanne ein Amiibo.",
                                             /*french*/ "Tu cherches de quoi? Utilise un Amiibo!"));
 
     hintTextTable[RHT_JUNK25] = HintText(CustomMessage("They say this game has just a few glitches.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß dieses Spiel nur ein paar Glitches hat.",
                                             /*french*/ "Selon moi, ce jeu est complètement exempt de glitchs."));
 
     hintTextTable[RHT_JUNK26] = HintText(CustomMessage("BRRING BRRING This is Ulrira. Wrong number?",
-                                            /*german*/ "",
+                                            /*german*/ "TUUUUT! TUUUUT! Ja? Hier Ulrira! Muss sich wohl verwählt haben.",
                                             /*french*/ "DRING DRING!! Pépé le Ramollo à l'appareil... Quoi? Faux numéro?"));
 
     hintTextTable[RHT_JUNK27] = HintText(CustomMessage("Tingle Tingle Kooloo Limpah!",
-                                            /*german*/ "",
+                                            /*german*/ "Tingle Tingle Kuuluu-Limpah!",
                                             /*french*/ "Tingle! Tingle! Kooloolin... Pah!"));
 
     hintTextTable[RHT_JUNK28] = HintText(CustomMessage("L is real 2401",
-                                            /*german*/ "",
+                                            /*german*/ "L is real 2401",
                                             /*french*/ "L is real 2401"));
 
     hintTextTable[RHT_JUNK29] = HintText(CustomMessage("They say that Ganondorf will appear in the next Mario Tennis.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Ganondorf im nächsten Mario Tennis erscheinen wird.",
                                             /*french*/ "Selon moi, Ganondorf sera la nouvelle recrue dans Mario Tennis."));
 
     hintTextTable[RHT_JUNK30] = HintText(CustomMessage("They say Medigoron sells the earliest Breath of the Wild demo.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Medigoron die früheste Breath of the Wild-Demo verkauft.",
                                             /*french*/ "Selon moi, Medigoron vend une démo de #Breath of the Wild#."));
 
     hintTextTable[RHT_JUNK31] = HintText(CustomMessage("Can you move me? I don't get great service here.",
-                                            /*german*/ "",
+                                            /*german*/ "Kannst Du mich bewegen? Ich habe schlechten Empfang.",
                                             /*french*/ "Peux-tu me déplacer? J'ai pas une bonne réception ici."));
 
     hintTextTable[RHT_JUNK32] = HintText(CustomMessage("They say if you use Strength on the truck, you can find Mew.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß man mit Stärke, unter dem Truck Mew finden kann.",
                                             /*french*/ "Selon moi, #Mew# se trouve dessous le camion... Duh!"));
 
     hintTextTable[RHT_JUNK33] = HintText(CustomMessage("I'm a helpful hint Gossip Stone!^See, I'm helping.",
-                                            /*german*/ "",
+                                            /*german*/ "Ich bin ein hilfreicher Mythenstein!^Siehst du? Ich helfe.",
                                             /*french*/ "Salut! Je suis une pierre de bons conseils!^Tiens, tu vois? J'aide bien, hein?"));
 
     hintTextTable[RHT_JUNK34] = HintText(CustomMessage("Dear @, please come to the castle. I've baked a cake for you.&Yours truly, Princess Zelda.",
-                                            /*german*/ "",
+                                            /*german*/ "Lieber @!&Komm mich doch einmal im Schloß besuchen! Der Kuchen steht bereit!&In Freundschaft, Prinzessin Zelda.",
                                             /*french*/ "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda"));
 
     hintTextTable[RHT_JUNK35] = HintText(CustomMessage("They say all toasters toast toast.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß alle Toaster Toast toasten.",
                                             /*french*/ "Selon moi, les grille-pains grillent du pain."));
 
     hintTextTable[RHT_JUNK36] = HintText(CustomMessage("You thought it would be a useful hint, but it was me, junk hint!",
-                                            /*german*/ "",
+                                            /*german*/ "Du dachtest dies wäre ein nützlicher Hinweis. Doch hier bin ich, der Müll-Hinweis!",
                                             /*french*/ "Tu t'attendais à un bon indice... Mais c'était moi, un mauvais indice!"));
 
     hintTextTable[RHT_JUNK37] = HintText(CustomMessage("They say that quest guidance can be found at a talking rock.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß man Quest-Hinweise bei einem sprechenden Stein finden kann.",
                                             /*french*/ "Selon moi, des #indices# se trouvent auprès d'une pierre parlante... Duh!"));
 
     hintTextTable[RHT_JUNK38] = HintText(CustomMessage("They say that the final item you're looking for can be found somewhere in Hyrule.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß der letzte Gegenstand nachdem Du gerade suchst, irgendwo in Hyrule zu finden sei.",
                                             /*french*/ "Selon moi, le #dernier objet# se trouve quelque part dans Hyrule... Duh!"));
 
     hintTextTable[RHT_JUNK39] = HintText(CustomMessage("Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
-                                            /*german*/ "",
+                                            /*german*/ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
                                             /*french*/ "Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip."));
 
     hintTextTable[RHT_JUNK40] = HintText(CustomMessage("They say that Barinade fears Deku Nuts.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Barinade Angst vor Deku-Nüssen hat.",
                                             /*french*/ "Selon moi, Barinade a la frousse des noix Mojo."));
 
     hintTextTable[RHT_JUNK41] = HintText(CustomMessage("They say that Flare Dancers do not fear Goron-crafted blades.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Flammenderwische keine Angst vor goronengeschmiedeten Klingen haben.",
                                             /*french*/ "Selon moi, le danse-flamme n'a pas peur des armes de Goron."));
 
     hintTextTable[RHT_JUNK42] = HintText(CustomMessage("They say that Morpha is easily trapped in a corner.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß man Morpha ganz leicht in die Ecke drängen kann.",
                                             /*french*/ "Selon moi, Morpha est facilement coincé."));
 
     hintTextTable[RHT_JUNK43] = HintText(CustomMessage("They say that Bongo Bongo really hates the cold.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Bongo Bongo die Kälte wirklich hasst.",
                                             /*french*/ "Selon moi, Bongo Bongo a facilement froid aux doigts."));
 
     hintTextTable[RHT_JUNK44] = HintText(CustomMessage("They say that your sword is most powerful when you put it away.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Dein Schwert am mächtigsten ist, wenn Du es wegsteckst.",
                                             /*french*/ "Selon moi, ton épée est à pleine puissance quand tu la rengaines."));
 
     hintTextTable[RHT_JUNK45] = HintText(CustomMessage("They say that bombing the hole Volvagia last flew into can be rewarding.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß es sich lohnt das Loch zu bombardieren, in das Volvagia zuletzt geflogen ist.",
                                             /*french*/ "Selon moi, le trou où se creuse Volvagia est vulnérable aux bombes."));
 
     hintTextTable[RHT_JUNK46] = HintText(CustomMessage("They say that invisible ghosts can be exposed with Deku Nuts.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß unsichtbare Geister mit Deku-Nüssen sichtbar gemacht werden können.",
                                             /*french*/ "Selon moi, des fantômes invisibles apparaissent avec des noix Mojo."));
 
     hintTextTable[RHT_JUNK47] = HintText(CustomMessage("They say that the real Phantom Ganon is bright and loud.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß der wahre Phantom-Ganon durch Helligkeit und Lärm auffällt.",
                                             /*french*/ "Selon moi, le vrai spectre de Ganon est clair et bruyant."));
 
     hintTextTable[RHT_JUNK48] = HintText(CustomMessage("They say that walking backwards is very fast.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß rückwärts laufen sehr schnell ist.",
                                             /*french*/ "Selon moi, tu fais marche arrière très rapidement pour un héros."));
 
     hintTextTable[RHT_JUNK49] = HintText(CustomMessage("They say Ingo is not very good at planning ahead.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Basil nicht besonders gut darin ist vorauszuplanen.",
                                             /*french*/ "Selon moi, Ingo ne fait pas un très bon geôlier."));
 
     hintTextTable[RHT_JUNK50] = HintText(CustomMessage("You found a spiritual Stone! By which I mean, I worship Nayru.",
-                                            /*german*/ "",
+                                            /*german*/ "Du hast einen Heiligen Stein gefunden!^Also... eigentlich heißt das nur, daß ich Nayru verehre.",
                                             /*french*/ "Vous avez trouvé une Pierre Ancestrale! En effet, je vénère la déesse Hylia."));
 
     hintTextTable[RHT_JUNK51] = HintText(CustomMessage("Open your eyes.^Open your eyes.^Wake up, @.",
-                                            /*german*/ "",
+                                            /*german*/ "Öffne die Augen...^Öffne die Augen...^Wach auf, @.",
                                             /*french*/ "Réveille-toi...^Réveille-toi.^Ouvre les yeux, @."));
 
     hintTextTable[RHT_JUNK52] = HintText(CustomMessage("They say that the Nocturne of Shadow can bring you very close to Ganon.",
-                                            /*german*/ "",
-                                            /*french*/ "Selon moi, le nocturne de l'ombre peut t'amener très près de Ganon."));
+                                            /*german*/ "Man erzählt sich, daß die Nocturne des Schattens dich Ganon sehr nahe bringen kann.",
+                                            /*french*/ "Selon moi, le Nocturne de l'Ombre peut t'amener très près de Ganon."));
 
     hintTextTable[RHT_JUNK53] = HintText(CustomMessage("They say that Twinrova always casts the same spell the first three times.",
-                                            /*german*/ "",
-                                            /*french*/ "Selon moi, Twinrova lance toujours les mêmes trois premiers sorts."));
+                                            /*german*/ "Man erzählt sich, daß Twinrova die ersten drei Male immer denselben Zauber benutzt.",
+                                            /*french*/ "Selon moi, le Duo Maléfique lance toujours les mêmes trois premiers sorts."));
 
     hintTextTable[RHT_JUNK54] = HintText(CustomMessage("They say that the nightly builds may be unstable.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß die \"Nightly Builds\" instabil sein könnten.",
                                             /*french*/ "Selon moi, les \"nightly builds\" peuvent être instables."));
 
     hintTextTable[RHT_JUNK55] = HintText(CustomMessage("You're playing a Randomizer. I'm randomized!^Here's a random number:  #4#.&Enjoy your Randomizer!",
-                                            /*german*/ "",
+                                            /*german*/ "Du spielst einen Randomizer. Ich wurde zufällig generiert!^Hier ist eine zufällige Zahl:  #4#.&Viel Spaß mit dem Randomizer!",
                                             /*french*/ "Tu joues à un randomizer. Je suis aléatoire!^Voici un nombre aléatoire: #4#.&Bonne partie!"));
 
     hintTextTable[RHT_JUNK56] = HintText(CustomMessage("They say Ganondorf's bolts can be reflected with glass or steel.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß man Ganondorfs Blitze mit Glas oder Stahl reflektieren kann.",
                                             /*french*/ "Selon moi, les éclairs de Ganon se reflètent sur l'acier et le verre."));
 
     hintTextTable[RHT_JUNK57] = HintText(CustomMessage("They say Ganon's tail is vulnerable to nuts, arrows, swords, explosives, hammers...^...sticks, seeds, "
                                                        "boomerangs...^...rods, shovels, iron balls, angry bees...",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, Ganons Schwanz sei verwundbar durch Nüsse, Pfeile, Schwerter...^...Explosives, Hämmer, "
+													   "Stöcke...^...Kerne, Bumerangs, Schaufeln, Eisenkugeln, wütende Bienen...",
                                             /*french*/ "Selon moi, la queue de Ganon est vulnérable aux noix, flèches, épées, bombes, marteaux...^...bâtons, "
                                                        "graines, boomerangs...^...baguettes, pelles, boulets de fer, abeilles enragées..."));
 
     hintTextTable[RHT_JUNK58] = HintText(CustomMessage("They say that you're wasting time reading this hint, but I disagree. Talk to me again!",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Du deine Zeit mit dem Lesen dieses Hinweises verschwendest, aber ich bin anderer Meinung. Sprich noch einmal mit mir.",
                                             /*french*/ "Selon moi... tu sais quoi? Parle-moi encore, et je te le dirai!"));
 
     hintTextTable[RHT_JUNK59] = HintText(CustomMessage("They say Ganondorf knows where to find the instrument of his doom.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß Ganondorf weiß, wo man das Instrument seines Untergangs finden kann.",
                                             /*french*/ "Selon moi, Ganondorf sait où il a caché son point faible."));
 
     hintTextTable[RHT_JUNK60] = HintText(CustomMessage("I heard @ is pretty good at Zelda.",
-                                            /*german*/ "",
+                                            /*german*/ "Ich habe gehört, daß @ ziemlich gut in Zelda Spielen ist.",
                                             /*french*/ "Apparemment, @ est super bon à Zelda."));
 
     hintTextTable[RHT_JUNK61] = HintText(CustomMessage("Hi @, we've been trying to reach you about your car's extended warranty. ",
-                                            /*german*/ "",
+                                            /*german*/ "Hallo @, wir haben versucht, Dich wegen der erweiterten Garantie für Dein Auto zu erreichen.",
                                             /*french*/ "Bonjour, @. Vous avez une voiture? Vous savez, nous offrons des assurances abordables..."));
 
     hintTextTable[RHT_JUNK62] = HintText(CustomMessage("They say that it's actually possible to beat the running man.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß es tatsächlich möglich sei, den Marathon-Läufer zu besiegen.",
                                             /*french*/ "Selon moi, il est possible de battre le coureur.&Donc, tu prends ton arc, et..."));
 
     hintTextTable[RHT_JUNK63] = HintText(CustomMessage("They say this hint makes more sense in other languages.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß dieser Hinweis in anderen Sprachen mehr Sinn macht.",
                                             /*french*/ "Selon moi, ces indices auraient pu être mieux traduits... Duh!"));
 
     // ^ Junk hints above are from 3drando
@@ -1715,163 +1716,160 @@ void StaticData::HintTable_Init() {
     // Please keep hints to stuff related to ship directly, or to Nintendo/Zelda related stuff.
     // And nothing that's super obscure that no one's going to understand.
 
-#define HINT_TEXT_NEEDS_TRANSLATION_FR \
-    "Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!"
-    
     hintTextTable[RHT_JUNK64] = HintText(CustomMessage("They say Greg is special.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich, daß Greg etwas Besonderes ist.",
+                                            /*french*/ "Selon moi, Greg est spécial."));
 
     hintTextTable[RHT_JUNK65] = HintText(CustomMessage("They say the longer the Goron's neck, the wiser they are.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich, daß ein Gorone umso weiser wird, je länger sein Hals ist.",
+                                            /*french*/ "Selon moi, plus le cou des Gorons est long, plus ils sont sage." ));
 
     hintTextTable[RHT_JUNK66] = HintText(CustomMessage("They say this ship is what all true gamers strive for.",
-                                            /*german*/ "",
+                                            /*german*/ "Man erzählt sich, daß dieses \"Ship\" das ist, wonach alle echten Gamer streben.",
                                             /*french*/ "Selon moi, cette version du port est ce pour quoi luttent tous les vrais gamers."));
-    
+
     hintTextTable[RHT_JUNK67] = HintText(CustomMessage("They say that Glowsticks can be found in the Raveyard.",
-                                            /*german*/ "",
-                                            /*french*/ "On peut trouver des Bâtons Lumineux sur le dancefloor du cimetière."));
+                                            /*german*/ "Man erzählt sich, daß Leuchtstäbe auf dem Partyfriedhof zu finden wären.",
+                                            /*french*/ "Selon moi, on peut trouver des Bâtons Lumineux sur le dancefloor du cimetière."));
 
     hintTextTable[RHT_JUNK68] = HintText(CustomMessage("They say @'s uncle works for Nintendo.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich, daß @'s Onkel bei Nintendo arbeitet.",
+                                            /*french*/ "Selon moi, l'oncle de @ travaille chez Nintendo."));
 
     hintTextTable[RHT_JUNK69] = HintText(CustomMessage("They say pulling all gravestones in the graveyard leads to something magical.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich, daß das Ziehen aller Grabsteine auf dem Friedhof zu etwas Magischem führe.",
+                                            /*french*/ "Selon moi, tirer toutes les tombes du Cimetière déclanche un truc magique."));
 
     hintTextTable[RHT_JUNK70] = HintText(CustomMessage("They say holding L while pausing makes you win the game.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich, daß man das Spiel gewinnt, wenn man L gedrückt hält, während man pausiert.",
+                                            /*french*/ "Selon moi, maintenir L pendant que vous appuyez sur START vous permet de terminer le jeu."));
 
     hintTextTable[RHT_JUNK71] = HintText(CustomMessage("They say @'s body is ready.",
-                                            /*german*/ "",
-                                            /*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR));
+                                            /*german*/ "Man erzählt sich... nein weißt Du was, ich habe keine Lust mehr.",
+                                            /*french*/ "Selon moi, ce junk hint ne se traduirait pas bien en français."));
 
     /*--------------------------
     |     DUNGEON HINT TEXT    |
     ---------------------------*/
 
-    
+
     hintTextTable[RHT_DEKU_TREE] = HintText(CustomMessage("Deku Tree",
-                                               /*german*/ "Deku-Baum",
+                                               /*german*/ "im Deku-Baum",
                                                /*french*/ "l'Arbre Mojo"),
                                             // /*spanish*/el Gran Árbol Deku
                                             {},
                                             {CustomMessage("an ancient tree",
-                                                /*german*/ "ein antiker Baum",
+                                                /*german*/ "in einem antiken Baum",
                                                 /*french*/ "le vieil arbre")});
                                              // /*spanish*/un ancestral árbol
 
     hintTextTable[RHT_DODONGOS_CAVERN] = HintText(CustomMessage("Dodongo's Cavern",
-                                                     /*german*/ "Dodongos Kaverne",
+                                                     /*german*/ "in Dodongos Höhle",
                                                      /*french*/ "la Caverne Dodongo"),
                                                   // /*spanish*/la Cueva de los Dodongos
                                                   {},
                                                   {CustomMessage("an immense cavern",
-                                                      /*german*/ "eine riesige Kaverne",
+                                                      /*german*/ "in einer riesigen Kaverne",
                                                       /*french*/ "l'immense caverne")});
                                                    // /*spanish*/una descomunal cueva
 
     hintTextTable[RHT_JABU_JABUS_BELLY] = HintText(CustomMessage("Jabu-Jabu's Belly",
-                                                      /*german*/ "Jabu-Jabus Bauch",
+                                                      /*german*/ "in Jabu-Jabus Bauch",
                                                       /*french*/ "le Ventre de Jabu-Jabu"),
                                                    // /*spanish*/tripa de Jabu-Jabu
                                                    {},
                                                    {CustomMessage("the belly of a deity",
-                                                       /*german*/ "der Bauch einer Gottheit",
+                                                       /*german*/ "im Bauche einer Gottheit",
                                                        /*french*/ "le ventre d'un gardien")});
                                                     // /*spanish*/la tripa de cierta deidad
 
     hintTextTable[RHT_FOREST_TEMPLE] = HintText(CustomMessage("Forest Temple",
-                                                   /*german*/ "Waldtempel",
+                                                   /*german*/ "im Waldtempel",
                                                    /*french*/ "le Temple de la Forêt"),
                                                 // /*spanish*/el Templo del Bosque
                                                 {},
                                                 {CustomMessage("a deep forest",
-                                                    /*german*/ "ein tiefer Wald",
+                                                    /*german*/ "in dunklen Wäldern",
                                                     /*french*/ "la profonde forêt")});
                                                  // /*spanish*/las profundidades del bosque
 
     hintTextTable[RHT_FIRE_TEMPLE] = HintText(CustomMessage("Fire Temple",
-                                                 /*german*/ "Feuertempel",
+                                                 /*german*/ "im Feuertempel",
                                                  /*french*/ "le Temple du Feu"),
                                               // /*spanish*/el Templo del Fuego
                                               {},
                                               {CustomMessage("a high mountain",
-                                                  /*german*/ "ein hoher Berg",
+                                                  /*german*/ "auf hohem Berge",
                                                   /*french*/ "la grande montagne")});
                                                // /*spanish*/una alta montaña
 
     hintTextTable[RHT_WATER_TEMPLE] = HintText(CustomMessage("Water Temple",
-                                                  /*german*/ "Wassertempel",
+                                                  /*german*/ "im Wassertempel",
                                                   /*french*/ "le Temple de l'Eau"),
                                                // /*spanish*/el Templo del Agua
                                                {},
                                                {CustomMessage("a vast lake",
-                                                   /*german*/ "ein gewaltiger See",
+                                                   /*german*/ "in einem riesigen See",
                                                    /*french*/ "le vaste lac")});
                                                 // /*spanish*/un lago inmenso
 
     hintTextTable[RHT_SPIRIT_TEMPLE] = HintText(CustomMessage("Spirit Temple",
-                                                   /*german*/ "Geistertempel",
+                                                   /*german*/ "im Geistertempel",
                                                    /*french*/ "le Temple de l'Esprit"),
                                                 // /*spanish*/el Templo del Espíritu
                                                 {},
                                                 {CustomMessage("the goddess of the sand",
-                                                    /*german*/ "die Göttin des Sandes",
+                                                    /*german*/ "innerhalb der Göttin des Sandes",
                                                     /*french*/ "la déesse des sables")});
                                                  // /*spanish*/la diosa de las arenas
 
     hintTextTable[RHT_SHADOW_TEMPLE] = HintText(CustomMessage("Shadow Temple",
-                                                   /*german*/ "Schattentempel",
+                                                   /*german*/ "im Schattentempel",
                                                    /*french*/ "le Temple de l'Ombre"),
                                                 // /*spanish*/el Templo de las Sombras
                                                 {},
                                                 {CustomMessage("the house of the dead",
-                                                    /*german*/ "das Haus der Toten",
+                                                    /*german*/ "an der Stätte der Toten",
                                                     /*french*/ "la maison des morts")});
                                                  // /*spanish*/la casa de la muerte
 
     hintTextTable[RHT_ICE_CAVERN] = HintText(CustomMessage("Ice Cavern",
-                                                /*german*/ "Eishöhle",
+                                                /*german*/ "in der Eishöhle",
                                                 /*french*/ "la caverne de glace"),
                                              // /*spanish*/la caverna de hielo
                                              {},
                                              {CustomMessage("a frozen maze",
-                                                 /*german*/ "ein gefrorenes Labyrinth",
+                                                 /*german*/ "in einem gefrorenen Labyrinth",
                                                  /*french*/ "le dédale glacé")});
                                               // /*spanish*/un gélido laberinto
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("Bottom of the Well",
-                                                        /*german*/ "Grund des Brunnens",
+                                                        /*german*/ "auf dem Grund des Brunnens",
                                                         /*french*/ "le fonds du Puits"),
                                                      // /*spanish*/el fondo del pozo
                                                      {},
                                                      {CustomMessage("a shadow\'s prison",
-                                                         /*german*/ "das Gefängnis eines Schattens",
+                                                         /*german*/ "im Gefängnis eines Dämons",
                                                          /*french*/ "la prison d'une ombre")});
                                                       // /*spanish*/la prisión de las sombras
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND] = HintText(CustomMessage("Gerudo Training Ground",
-                                                            /*german*/ "Gerudo-Trainingsgelände",
+                                                            /*german*/ "in der Gerudo-Trainingsarena",
                                                             /*french*/ "le Gymnase Gerudo"),
                                                          // /*spanish*/el Centro de Instrucción Gerudo
                                                          {},
                                                          {CustomMessage("the test of thieves",
-                                                             /*german*/ "die Prüfung der Diebe",
+                                                             /*german*/ "bei der Prüfung der Diebe",
                                                              /*french*/ "l'épreuve des voleurs")});
                                                           // /*spanish*/la prueba de las bandidas
 
     hintTextTable[RHT_GANONS_CASTLE] = HintText(CustomMessage("Inside Ganon's Castle",
-                                                   /*german*/ "In Ganons Schloß",
+                                                   /*german*/ "in Ganons Schloß",
                                                    /*french*/ "l'intérieur du Château de Ganon"),
                                                 // /*spanish*/el interior del Castillo de Ganon
                                                 {},
                                                 {CustomMessage("a conquered citadel",
-                                                    /*german*/ "eine eroberte Zitadelle",
+                                                    /*german*/ "in einer gefallenen Zitadelle",
                                                     /*french*/ "la citadelle assiégée")});
                                                  // /*spanish*/una conquistada ciudadela
 
@@ -1885,7 +1883,7 @@ void StaticData::HintTable_Init() {
                                               // /*spanish*/la #Reina Goma# porta #[[1]]#.
                                               {},
                                               {CustomMessage("They say that the #Parasitic Armored Arachnid# holds #[[1]]#.",
-                                                  /*german*/ "Man erzählt sich, daß die #gepanzerte parasitäre Spinne# #[[1]]# hielte.",
+                                                  /*german*/ "Man erzählt sich, daß der #gepanzerte Spinnenparasit# #[[1]]# hielte.",
                                                   /*french*/ "Selon moi, le #monstre insectoïde géant# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                // /*spanish*/el #arácnido parasitario acorazado# porta #[[1]]#.
 
@@ -1895,7 +1893,7 @@ void StaticData::HintTable_Init() {
                                                // /*spanish*/el #Rey Dodongo# porta #[[1]]#.
                                                {},
                                                {CustomMessage("They say that the #Infernal Dinosaur# holds #[[1]]#.",
-                                                   /*german*/ "Man erzählt sich, daß der #infernalische Dinosaurier# #[[1]]# hielte.",
+                                                   /*german*/ "Man erzählt sich, daß der #Infernosaurus# #[[1]]# hielte.",
                                                    /*french*/ "Selon moi, le #dinosaure infernal# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                 // /*spanish*/el #dinosaurio infernal# porta #[[1]]#.
 
@@ -1905,7 +1903,7 @@ void StaticData::HintTable_Init() {
                                            // /*spanish*/#Barinade# porta #[[1]]#.
                                            {},
                                            {CustomMessage("They say that the #Bio-Electric Anemone# holds #[[1]]#.",
-                                               /*german*/ "Man erzählt sich, daß die #bioelektrische Anemone# #[[1]]# hielte.",
+                                               /*german*/ "Man erzählt sich, daß der #elektroterrestrische Biotentakel# #[[1]]# hielte.",
                                                /*french*/ "Selon moi, l'#anémone bioélectrique# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                             // /*spanish*/la #anémona bioeléctrica# porta #[[1]]#.
 
@@ -1915,7 +1913,7 @@ void StaticData::HintTable_Init() {
                                                 // /*spanish*/#Ganon Fantasma# porta #[[1]]#.
                                                 {},
                                                 {CustomMessage("They say that the #Evil Spirit from Beyond# holds #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #böse Geist aus dem Jenseits# #[[1]]# hielte.",
+                                                    /*german*/ "Man erzählt sich, daß das #reitende Unheil# #[[1]]# hielte.",
                                                     /*french*/ "Selon moi, l'#esprit maléfique de l'au-delà# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                  // /*spanish*/el #espíritu maligno de ultratumba# porta #[[1]]#.
 
@@ -1925,7 +1923,7 @@ void StaticData::HintTable_Init() {
                                            // /*spanish*/#Volvagia# porta #[[1]]#.
                                            {},
                                            {CustomMessage("They say that the #Subterranean Lava Dragon# holds #[[1]]#.",
-                                               /*german*/ "Man erzählt sich, daß der #subterrane Lavadrache# #[[1]]# hielte.",
+                                               /*german*/ "Man erzählt sich, daß der #subterrane Lavadrachoid# #[[1]]# hielte.",
                                                /*french*/ "Selon moi, le #dragon des profondeurs# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                             // /*spanish*/el #dragón de lava subterráneo# porta #[[1]]#.
 
@@ -1935,7 +1933,7 @@ void StaticData::HintTable_Init() {
                                          // /*spanish*/#Morpha# porta #[[1]]#.
                                          {},
                                          {CustomMessage("They say that the #Giant Aquatic Amoeba# holds #[[1]]#.",
-                                             /*german*/ "Man erzählt sich, daß die #gigantische aquatische Amöbe# #[[1]]# hielte.",
+                                             /*german*/ "Man erzählt sich, daß der #aquamöbe Wassertentakel# #[[1]]# hielte.",
                                              /*french*/ "Selon moi, l'#amibe aquatique géante# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                           // /*spanish*/la #ameba acuática gigante# porta #[[1]]#.
 
@@ -1945,7 +1943,7 @@ void StaticData::HintTable_Init() {
                                               // /*spanish*/#Bongo Bongo# porta #[[1]]#.
                                               {},
                                               {CustomMessage("They say that the #Phantom Shadow Beast# holds #[[1]]#.",
-                                                  /*german*/ "Man erzählt sich, daß das #Phantomschattenbiest# #[[1]]# hielte.",
+                                                  /*german*/ "Man erzählt sich, daß die #bestialische Schattenmonstrosität# #[[1]]# hielte.",
                                                   /*french*/ "Selon moi, le #monstre de l'ombre# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                // /*spanish*/la #alimaña oscura espectral# porta #[[1]]#.
 
@@ -1955,7 +1953,7 @@ void StaticData::HintTable_Init() {
                                            // /*spanish*/#Birova# porta #[[1]]#.
                                            {},
                                            {CustomMessage("They say that the #Sorceress Sisters# hold #[[1]]#.",
-                                               /*german*/ "Man erzählt sich, daß die #Hexenschwestern# #[[1]]# hielten.",
+                                               /*german*/ "Man erzählt sich, daß die #höllische Hexenarmada# #[[1]]# hielte.",
                                                /*french*/ "Selon moi, #les sorcières jumelles# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                             // /*spanish*/las #hermanas hechiceras# portan #[[1]]#.
 
@@ -1979,47 +1977,49 @@ void StaticData::HintTable_Init() {
 
 
     hintTextTable[RHT_BRIDGE_VANILLA_HINT] = HintText(CustomMessage("$6The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.^",
-                                                        /*german*/ "$6Die Weisen werden darauf warten, daß der Held das #Amulett des Schattens, Amulett der Geister# und die #Licht-Pfeile# sammelt.^",
+                                                        /*german*/ "$6Die Weisen, die darauf warten,&daß der Held das #Amulett des Schattens, Amulett der Geister#&und die #Licht-Pfeile# sammelt.^",
                                                         /*french*/ "$6Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.^",
                                                                    {QM_RED, QM_YELLOW}));
                                                      // /*spanish*/$6Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto
                                                                 // a la #flecha de luz#.^
 
     hintTextTable[RHT_BRIDGE_STONES_HINT] = HintText(CustomMessage("$0The awakened ones will await for the Hero to collect #[[d]] Spiritual Stone||s|#.^",
-                                                        /*german*/ "$0Die Weisen werden darauf warten, daß der Held #[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
+                                                        /*german*/ "$0Die Weisen werden darauf&warten, daß der Held&#[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
                                                         /*french*/ "$0Les êtres de sagesse attendront le héros muni de #[[d]] |Pierre Ancestrale|Pierres Ancestrales|#.^",
                                                                    {QM_BLUE}));
                                                      // /*spanish*/$0Los sabios aguardarán a que el héroe&obtenga #[[d]] |piedra espiritual|piedras espirituales|#.^
 
     hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText(CustomMessage("$8The awakened ones will await for the Hero to collect #[[d]] Medallion||s|#.^",
-                                                            /*german*/ "$8Die Weisen werden darauf warten, daß der Held #[[d]] Amulett||e|# sammelt.^",
+                                                            /*german*/ "$8Die Weisen werden darauf&warten, daß der Held&#[[d]] Amulett||e|# sammelt.^",
                                                             /*french*/ "$8Les êtres de sagesse attendront le héros muni de #[[d]] Médaillon||s|#.^",
                                                                        {QM_RED}));
                                                          // /*spanish*/$8Los sabios aguardarán a que el héroe&obtenga #[[d]] |medallón|medallones|#.^
 
     hintTextTable[RHT_BRIDGE_REWARDS_HINT] = HintText(CustomMessage("$CThe awakened ones will await for the Hero to collect #[[d]]# |#Spiritual Stone# or #Medallion#|"
-                                                                       "#Spiritual Stones# and #Medallions#|.^",
-                                                            /*german*/ "$CDie Weisen werden darauf warten, daß der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
-                                                                       "#Heilige Steine# oder #Amulette#| sammelt.^",
-                                                            /*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
-                                                                       "|#Pierres Ancestrales# ou #Médaillons#|.^",
-                                                                       {QM_YELLOW, QM_BLUE, QM_RED}));
-                                                         // /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
+                                                                     "#Spiritual Stones# and #Medallions#|.^",
+                                                         /*german*/ "$CDie Weisen werden darauf&warten, daß der Held&#[[d]]# |#Heiligen Stein# oder #Amulett#|"
+                                                                     "#Heilige Steine# oder #Amulette#| sammelt.^",
+                                                         /*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
+                                                                     "|#Pierres Ancestrales# ou #Médaillons#|.^",
+                                                                     {QM_YELLOW, QM_BLUE, QM_RED}));
+                                                      // /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
                                                                     //#piedras espirtuales# y #medallones#|.^
 
     hintTextTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText(CustomMessage("$mThe awakened ones will await for the Hero to conquer #[[d]] Dungeon||s|#.^",
-                                                          /*german*/ "$mDie Weisen werden darauf warten, daß der Held #[[d]] Labyrinth||e|# abschließt.^",
+                                                          /*german*/ "$mDie Weisen werden darauf&warten, daß der Held&#[[d]] Labyrinth||e|# abschließt.^",
                                                           /*french*/ "$mLes êtres de sagesse attendront la conquête de #[[d]] Donjon||s|#.^",
                                                                      {QM_PINK}));
                                                        // /*spanish*/$mLos sabios aguardarán a que el héroe complete #[[d]] mazmorra||s|#.^
 
     hintTextTable[RHT_BRIDGE_TOKENS_HINT] = HintText(CustomMessage("$sThe awakened ones will await for the Hero to collect #[[d]] Gold Skulltula Token||s|#.^",
-                                                        /*german*/ "$sDie Weisen werden darauf warten, daß der Held #[[d]] Skulltula-Symbol||e|# sammelt.^",
+                                                        /*german*/ "$sDie Weisen werden darauf&warten, daß der Held&#[[d]] Skulltula-Symbol||e|# sammelt.^",
                                                         /*french*/ "$sLes êtres de sagesse attendront le héros muni de #[[d]] Symbole||s| de Skulltula d'or#.^",
                                                                    {QM_YELLOW}));
                                                      // /*spanish*/$sLos sabios aguardarán a que el héroe obtenga #[[d]] símbolo||s| de skulltula dorada#.^
 
     hintTextTable[RHT_BRIDGE_GREG_HINT] = HintText(CustomMessage("$gThe awakened ones will await for the Hero to find #Greg#.^",
+	                                                  /*german*/ "$gDie Weisen werden darauf&warten, daß der Held&#Greg# findet.^",
+                                                      /*french*/ "$gLes êtres de sagesse attendront le héros muni de #Greg#.^",
                                                                  {QM_GREEN}));
 
 
@@ -2034,7 +2034,7 @@ void StaticData::HintTable_Init() {
                                                            // /*spanish*/$bY obtendrás la llave del #señor del mal# desde el #inicio#.^
 
     hintTextTable[RHT_GANON_BK_VANILLA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be kept in a big chest #inside its tower#.^",
-                                                           /*german*/ "$bUnd der #Schlüssel des Bösen#, wird in der großen Truhe #im Teufelsturm# zu finden sein.^",
+                                                           /*german*/ "$bUnd der #Schlüssel des Bösen#,&wird in der großen Truhe&#im Teufelsturm# zu finden sein.^",
                                                            /*french*/ "$bAussi, la #clé du Malin# sera encoffrée #dans sa tour#.^",
                                                                       {QM_PINK, QM_LBLUE}));
                                                         // /*spanish*/$bY la llave del #señor del mal# aguardará en un gran cofre de #su torre#.^
@@ -2070,7 +2070,7 @@ void StaticData::HintTable_Init() {
                                                          // /*spanish*/$bY el héroe recibirá la llave del #señor del mal# cuando haya completado la #Trifuerza#.^
 
     hintTextTable[RHT_GANON_BK_SKULLTULA_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by the cursed rich man once #100 Gold Skulltula Tokens# are retrieved.^",
-                                                             /*german*/ "$bUnd der #Schlüssel des Bösen# wird von einem verfluchten reichen Mann verliehen, sobald #100 Goldene Skulltula-Symbole# wiedererlangt wurden.^",
+                                                             /*german*/ "$bUnd der #Schlüssel des Bösen# wird von einem verfluchten reichen Mann verliehen, sobald #100 Skulltula-Symbole# gesammelt wurden.^",
                                                              /*french*/ "$bAussi, la #clé du Malin# sera&donnée par l'homme maudit une fois que #100 Symboles de Skulltula d'or# auront été trouvés.^",
                                                                         {QM_PINK, QM_YELLOW}));
                                                           // /*spanish*/$bY el rico maldito entregará la llave&del #señor de mal# tras obtener&100 símbolos de skulltula dorada#.^
@@ -2100,7 +2100,7 @@ void StaticData::HintTable_Init() {
                                                     // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras obtener #[[d]]# piedra| espiritual o medallón|s espirituales o medallones|#.^
 
     hintTextTable[RHT_LACS_DUNGEONS_HINT] = HintText(CustomMessage("$bAnd the #evil one#'s key will be provided by #Zelda# once #[[d]] Dungeon|# is|s# are| conquered.^",
-                                                        /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Labyrinth|# abgeschlossen wurde|e# abgeschlossen wurden|.^",
+                                                        /*german*/ "$bUnd der #Schlüssel des Bösen# wird von #Zelda# verliehen, sobald #[[d]] Labyrinth|# abgeschloßen wurde|e# abgeschloßen wurden|.^",
                                                         /*french*/ "$bAussi, la #clé du Malin# sera fournie par #Zelda# une fois qu|' #[[d]] donjon #sera conquis|e #[[d]] donjons# seront conquis|.^",
                                                                   {QM_PINK, QM_YELLOW, QM_PINK}));
                                                      // /*spanish*/$bY #Zelda# entregará la llave del #señor del mal# tras completar #[[d]] mazmorra||s|#.^
@@ -2138,32 +2138,32 @@ void StaticData::HintTable_Init() {
                                            // /*spanish*/Según dicen, #[[1]]# protege la torre de Ganon
 
     hintTextTable[RHT_LIGHT_TRIAL] = HintText(CustomMessage("the Light Trial",
-                                                 /*german*/ "die Prüfung des Lichts",
+                                                 /*german*/ "das Licht-Siegel",
                                                  /*french*/ "l'épreuve de la Lumière"));
                                               // /*spanish*/la prueba de la luz
 
     hintTextTable[RHT_FOREST_TRIAL] = HintText(CustomMessage("the Forest Trial",
-                                                  /*german*/ "die Prüfung des Waldes",
+                                                  /*german*/ "das Wald-Siegel",
                                                   /*french*/ "l'épreuve de la Forêt"));
                                                // /*spanish*/la prueba del bosque
 
     hintTextTable[RHT_FIRE_TRIAL] = HintText(CustomMessage("the Fire Trial",
-                                                /*german*/ "die Prüfung des Feuers",
+                                                /*german*/ "das Feuer-Siegel",
                                                 /*french*/ "l'épreuve du Feu"));
                                              // /*spanish*/la prueba del fuego
 
     hintTextTable[RHT_WATER_TRIAL] = HintText(CustomMessage("the Water Trial",
-                                                 /*german*/ "die Prüfung des Wassers",
+                                                 /*german*/ "das Wasser-Siegel",
                                                  /*french*/ "l'épreuve de l'Eau"));
                                               // /*spanish*/la prueba del agua
 
     hintTextTable[RHT_SPIRIT_TRIAL] = HintText(CustomMessage("the Spirit Trial",
-                                                  /*german*/ "die Prüfung der Geister",
+                                                  /*german*/ "das Geister-Siegel",
                                                   /*french*/ "l'épreuve de l'Esprit"));
                                                // /*spanish*/la prueba del espíritu
 
     hintTextTable[RHT_SHADOW_TRIAL] = HintText(CustomMessage("the Shadow Trial",
-                                                  /*german*/ "die Prüfung des Schattens",
+                                                  /*german*/ "das Schatten-Siegel",
                                                   /*french*/ "l'épreuve de l'Ombre"));
                                                // /*spanish*/la prueba de las sombras
 
@@ -2172,7 +2172,7 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_CHILD_ALTAR_STONES] = HintText(CustomMessage("3 Spiritual Stones found in Hyrule...^$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
-                                                        /*german*/ "Drei Heilige Steine, zu finden in Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
+                                                        /*german*/ "Drei Heilige Steine, zu finden in Hyrule...^$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
                                                         /*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
                                                         {QM_GREEN, QM_RED, QM_BLUE}, {true, true, true}));
                                                     // /*spanish*/ Tres piedras espirituales halladas por Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^
@@ -2183,18 +2183,18 @@ void StaticData::HintTable_Init() {
                                                                // /*spanish*/$oPara aquel que se convierta en el héroe...&La puerta al futuro está a su disposición...
 
     hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText(CustomMessage("$cYe who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
-                                                                      /*german*/ "$cJener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
+                                                                      /*german*/ "$cJener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und spiele hier die Hymne der Zeit.",
                                                                       /*french*/ "$cÀ celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps."));
                                                                    // /*spanish*/$cPara aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.
-    
+
     hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText(CustomMessage("$iYe who may become a Hero...&Offer the spiritual stones and&play the Song of Time.",
-                                                                    /*german*/ "$iJener mit den drei Heiligen Steinen&nehme seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
+                                                                    /*german*/ "$iJener mit den drei Heiligen Steinen nehme er seine Okarina zur Hand und spiele hier die Hymne der Zeit.",
                                                                     /*french*/ "$iÀ celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps."));
                                                                  // /*spanish*/$iPara aquel que se convierta en el héroe...&Tome las piedras espirituales y&entone la Canción del Tiempo.
 
     hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS] = HintText(CustomMessage("An awakening voice from the Sacred Realm will call those destined to be Sages, who dwell in the #five temples#.^"
                                                                        "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^" ,
-                                                            /*german*/ "Beherrscht das Böse die Welt, weilen&jene Weisen, die von der Stimme des Heiligen Reiches erweckt werden, noch&in den #fünf Tempeln#.^"
+                                                            /*german*/ "Beherrscht das Böse die Welt, verweilen die Weisen, erweckt von der Stimme des Heiligen Reiches, noch in den #fünf Tempeln#.^"
                                                                        "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^",
                                                             /*french*/ "Quand le mal aura triomphé, une voix du Saint Royaume appellera ceux cachés dans les #cinq temples#, destinés^à être Sages.^"
                                                                        "$8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^",
@@ -2203,7 +2203,7 @@ void StaticData::HintTable_Init() {
                                                                     // $8#[[1]]#...^$3#[[2]]#...^$4#[[3]]#...^$5#[[4]]#...^$6#[[5]]#...^$7#[[6]]#...^
 
     hintTextTable[RHT_ADULT_ALTAR_TEXT_END] = HintText(CustomMessage("$kTogether with the Hero of Time, the awakened ones will return the light of peace to the world...",
-                                                        /*german*/ "$kZusammen mit dem Auserwählten werden diese ihre Kräfte einsetzen, um der Welt den Frieden wiederzugeben.",
+                                                        /*german*/ "$kZusammen mit dem Auserwählten werden diese ihre Kräfte&einsetzen, um der Welt den&Frieden wiederzugeben.",
                                                         /*french*/ "$kEnsemble avec le Héros du Temps, ces Sages emprisonneront le mal et réinstaureront la lumière de paix dans le monde..."));
                                                         // /*spanish*/Con el Héroe del Tiempo, aquellos&que despierten detendrán el mal y&volverán al mundo de luz la paz...
 
@@ -2212,54 +2212,59 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_GANONDORF_HINT_LA_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!",
-                                                            /*german*/ "",
+                                                            /*german*/ "Ha ha ha... Du wirst mich niemals besiegen, indem Du meine Blitze zurückschlägst...^und die Pfeile entfesselst, die #[[1]]# zu finden sind!",
                                                             /*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!",
                                                                        {QM_RED}));
                                                          // /*spanish*/Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de #[[1]]#!
 
     hintTextTable[RHT_GANONDORF_HINT_MS_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never defeat me, drop a castle on me and finish me off with the sacred blade from #[[2]]#!",
-                                                            /*german*/ "",
-                                                            /*french*/ "",
+                                                            /*german*/ "Ha ha ha... Du wirst mich niemals besiegen, ein Schloß auf mich werfen...^und mich mit der legendären Klinge niederstrecken, die #[[2]]# versteckt ist!",
+                                                            /*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans l'Épée de Légende cachée dans #[[2]]#!",
                                                                        {QM_RED}));
 
     hintTextTable[RHT_GANONDORF_HINT_LA_AND_MS] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!"
                                                                          "^And even if you do, you'll never find the legendary blade hidden in #[[2]]#!",
-                                                              /*german*/ "",
+                                                              /*german*/ "Ha ha ha... Du wirst mich niemals besiegen, indem Du meine Blitze zurückschlägst...^und die Pfeile entfesselst, die #[[1]]# zu finden sind!"
+                                                                         "^Und selbst wenn Du es tust,&wirst Du niemals die legendäre&Klinge finden, die #[[2]]# versteckt ist!",
                                                               /*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!"
-                                                                         "^Et même si tu les trouves, tu ne touveras jamais l'épée de légende cachée dans #[[2]]#!",
+                                                                         "^Et même si tu les trouves, tu ne touveras jamais l'Épée de Légende cachée dans #[[2]]#!",
                                                                          {QM_RED, QM_RED}));
                                                            // /*spanish*/Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de #[[1]]#!
                                                                       // ^E incluso si lo haces, nunca encontrarás la espada legendaria escondida en #[[2]]#!
 
     hintTextTable[RHT_SHEIK_HINT_LA_ONLY] = HintText(CustomMessage("I overheard Ganondorf say that he misplaced the #Light Arrows# in #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Ich habe Ganondorf sagen hören, daß er die #Licht-Pfeile# #[[1]]# verlegt hat.",
                                                         /*french*/ "J'ai entendu dire que Ganondorf aurait caché les #Flèches de Lumière# dans #[[1]]#.",
                                                                    {QM_YELLOW, QM_RED}));
 
     hintTextTable[RHT_DAMPE_DIARY] = HintText(CustomMessage("Whoever reads this, please enter #[[1]]#. I will let you have my #stretching, shrinking keepsake#.^I'm waiting for you.&--Dampé",
-                                                 /*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen #dehnenden, schrumpfenden Schatz#.^Ich warte!&Boris", //RANDOTODO color in whatever refers to the hookshot
+                                                 /*german*/ "Wer immer dies liest, der möge #[[1]]# nach meinem #langen, kurzen Schatz# suchen.^Ich warte!&Boris",
                                                  /*french*/ "Toi qui lit ce journal, rends-toi dans #[[1]]#. Et peut-être auras-tu droit à mon précieux #trésor#.^Je t'attends...&--Igor",
                                                             {QM_RED, QM_RED}));
 
     hintTextTable[RHT_GREG_HINT] = HintText(CustomMessage("By the way, if you're interested, I saw the shiniest #Green Rupee# somewhere in #[[1]]#.^It's said to have #mysterious powers#...^But then, it could just be another regular rupee.&Oh well.",
-                                               /*german*/ "",
-                                               /*french*/ "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des #Rubis Verts# quelque part à #[[1]]#. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",//RANDOTODO color in mysterious powers
+                                               /*german*/ "Übrigens, falls es Dich interessiert, ich habe #[[1]]# den glänzendsten #Grünen Rubin# gesehen.^Er soll #mysteriöse Kräfte# haben...^Aber naja, es könnte auch einfach nur ein normaler Rubin sein.",
+                                               /*french*/ "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des #Rubis Verts# quelque part à #[[1]]#.^On dit qu'il possède des #pouvoirs mystérieux#...^Mais bon, ça pourrait juste être un autre rubis ordinaire.",
                                                           {QM_GREEN, QM_RED, QM_RED}));
 
     hintTextTable[RHT_SARIA_TALK_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!",
-                                                /*german*/ "",
-                                                /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit  qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!",
-                                                           {QM_GREEN, QM_RED}));
+                                                     /*german*/ "Hast Du kürzlich den #Magieschub# gespürt? Ein geheimnisvoller Vogel meinte, daß er #[[1]]# am stärksten zu spüren war.^Du solltest Dir diesen Ort mal ansehen, @!",
+                                                     /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#.^Tu devrais aller y jeter un coup d'oeil, @!",
+                                                               {QM_GREEN, QM_RED}));
 
     hintTextTable[RHT_SARIA_SONG_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!\x0B",
-                                                /*german*/ "",
-                                                /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit  qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!\x0B",
-                                                           {QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
+                                                     /*german*/ "Hast Du kürzlich den #Magieschub# gespürt? Ein geheimnisvoller Vogel meinte, daß er #[[1]]# am stärksten zu spüren war.^Du solltest Dir diesen Ort mal ansehen, @!\x0B",
+                                                     /*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#.^Tu devrais aller y jeter un coup d'oeil, @!\x0B",
+                                                                {QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
 
     hintTextTable[RHT_LOACH_HINT] = HintText(CustomMessage("What?^You wanna know about the&%rHyrule Loach%w?^It's a big fish, but it's so rare that I'll give my %g[[1]]%w to anyone who catches it. Seriously!",
-                                                                  {QM_RED}));
+	                                            /*german*/ "Was?^Du willst etwas über die&%rhylianische Forelle%w wissen?&Es ist ein riesiger Fisch,&der unfassbar selten ist!^Wenn Du mir eine bringst, |springt|springen| für Dich&%g[[1]]%w dabei raus.&Ganz im Ernst!",
+                                                /*french*/ "Quoi?&Tu veux en savoir plus sur le&%rBrochet d'Hyrule%w?^C'est un gros poisson, mais il&est si rare que je donne&%g[[1]]%w&à celui qui l'attrape.^Ouais, j'suis sérieux!",
+                                                           {QM_RED}));
 
     hintTextTable[RHT_FISHING_POLE_HINT] = HintText(CustomMessage("^If I remember correctly, I lost it somewhere in #[[1]]#...&Let me know if you find it!",
+	                                                    /*german*/ "Wenn ich mich recht erinnere,&habe ich sie irgendwo&#[[1]]#&verloren...&Sag mir Bescheid, wenn Du sie findest!",
+													    /*french*/ "Si je me souviens bien, il me&semble que je l'ai perdue&quelque part dans&#[[1]]#...^Fais-moi signe si jamais&tu la trouves!",
                                                                   {QM_RED}));
 
     /*--------------------------
@@ -2267,52 +2272,90 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_WARP_SONG] = HintText(CustomMessage("Warp to&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
-                                               /*german*/ "Zu&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
+                                               /*german*/ "Das Ziel liegt&#[[1]]#!&" + TWO_WAY_CHOICE() + "#Ja!&Nein!#",
                                                /*french*/ "Se téléporter vers&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
                                                           {QM_RED, QM_GREEN}));
-                                                          
-    /*--------------------------
+
+   /*--------------------------
     |   STATIC LOCATION HINTS   |
     ---------------------------*/
 
     hintTextTable[RHT_HBA_HINT_SIGN] = HintText(CustomMessage("#Horseback Archery# Range Prizes:&1000: #[[1]]#&1500: #[[2]]#^@'s Record: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
+												   /*german*/ "#Bogenschießen zu Pferde#&Schießstandpreise:&1000: #[[1]]#^1500: #[[2]]#^@'s Rekord: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
+                                                   /*french*/ "Récompenses de l'#Archerie Montée#:&1000: #[[1]]#&1500: #[[2]]#^Record de @: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
                                                               {QM_RED, QM_GREEN, QM_GREEN, QM_GREEN}, {}, TEXTBOX_TYPE_WOODEN));
 
-    hintTextTable[RHT_HBA_HINT_NOT_ON_HORSE] = HintText(CustomMessage("Hey, rookie!&Come back on your #horse# and take on then #Horseback Archery# challenge!^"
-                                                                      "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for my #[[2]]#!",
+    hintTextTable[RHT_HBA_HINT_NOT_ON_HORSE] = HintText(CustomMessage("Hey, rookie!&Come back on your #horse# and take on the #Horseback Archery# challenge!^"
+                                                                      "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for #[[2]]#!",
+                                                           /*german*/ "Hey, Kleiner! Das ist die %rArena für Bogenschießen zu Pferde%w.^"
+                                                                      "Wenn Du reiten kannst, beeindrucke mich mit #1.000 Punkten# und gewinne #[[1]]#!^Knackst Du #1.500 Punkte# gibt es #[[2]]#!",
+                                                           /*french*/ "Hé, l'nouveau!&Reviens avec ton #cheval# et essaie notre #Terrain d'Archerie Montée#^"
+                                                                      "Impressionne-moi avec un score de 1000 pour gagner #[[1]]# ou atteins 1500 pour #[[2]]#!",
                                                                       {QM_RED, QM_RED, QM_GREEN, QM_GREEN}));
 
     hintTextTable[RHT_HBA_HINT_INITIAL] = HintText(CustomMessage("Hey, rookie!&Want to take on the #Horseback Archery# challenge?^"
-                                                                 "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for my #[[2]]#!\x0B",
+                                                                 "Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for #[[2]]#!\x0B",
+                                                      /*german*/ "Hey, Kleiner! Wie wäre es mit einer Runde %rBogenschießen zu Pferde%w!?^"
+                                                                 "Wenn Du mich mit #1.000 Punkten# beeindruckst, erhältst Du #[[1]]#!^Knackst Du #1.500 Punkte# gibt es #[[2]]#!\x0B",
+                                                      /*french*/ "Hé, l'nouveau!&Tu veux essayer notre #Terrain d'Archerie Montée#^"
+                                                                 "Impressionne-moi avec un score de 1000 pour gagner #[[1]]# ou atteins 1500 pour #[[2]]#!\x0B",
                                                                  {QM_RED, QM_GREEN, QM_GREEN}));
 
     hintTextTable[RHT_HBA_HINT_HAVE_1000] = HintText(CustomMessage("Hey, newcomer!&Want to take on the #Horseback Archery# challenge?^"
-                                                                   "Prove yourself to be a horsemaster by scoring 1500 points to win my #[[1]]#!\x0B",
+                                                                   "Prove yourself to be a horsemaster by scoring 1500 points to win #[[2]]#!\x0B",
+                                                        /*german*/ "Hey, Kleiner! Wie wäre es mit einer Runde %rBogenschießen zu Pferde%w!?^"
+                                                                   "Versuche doch jetzt, #1.500 Punkte# zu erreichen für #[[2]]#!\x0B",
+                                                        /*french*/ "Hé, l'nouveau!&Tu veux essayer notre #Terrain d'Archerie Montée#^"
+                                                                   "Prouve que tu es un véritable cavalier en obtenant 1500 points pour gagner #[[2]]#!\x0B",
                                                                    {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_MALON_HINT_HOW_IS_EPONA] = HintText(CustomMessage("@! You should come back with Epona and try to beat my time on the #Obstacle Course#!^"
                                                                         "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
+                                                             /*german*/ "@! Warum kommst Du nicht mit Epona zurück und versuchst Dich an dem #Hindernisparcours#?^"
+                                                                        "Gelingt es Dir den Rekord zu brechen, bekommst Du meine #Lieblingskuh# Elsie^und ihr Lieblingsspielzeug, #[[1]]#!",
+                                                             /*french*/ "@! Tu devrais revenir avec Epona et essayer de battre mon temps sur le #Parcours d'Obstacles#!^"
+                                                                        "Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, ainsi que son jouet #[[1]]#!",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
     hintTextTable[RHT_MALON_HINT_OBSTICLE_COURSE] = HintText(CustomMessage("How about trying the #Obstacle Course?# If you beat my time I'll let you keep my favourite #cow# Elsie and her toy #[[1]]#!^"
                                                                            "Challenge the #Obstacle Course?#&\x1B&#Let's go&No thanks#",
+                                                                /*german*/ "Warum versuchst Du Dich nicht mit Epona an dem #Hindernisparcours#?^"
+                                                                           "Gelingt es Dir den Rekord zu brechen, bekommst Du meine #Lieblingskuh# Elsie^und ihr Lieblingsspielzeug, #[[1]]#!^"
+                                                                           "Wie sieht's aus?&Möchtest Du es versuchen?\x1B&#Ja!&Nein!#",
+                                                                /*french*/ "Que dirais-tu d'essayer le #Parcours d'Obstacles#? Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, et son jouet #[[1]]#!^"
+                                                                           "Tenter le #Parcours d'Obstacles#?&\x1B&#Allons-y&Non merci#",
                                                                            {QM_RED, QM_BLUE, QM_GREEN, QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_MALON_HINT_TURNING_EVIL] = HintText(CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an #Obstacle Course#, and whoever gets the best time would win a #cow#!^"
                                                                         "Elsie loves sharing her #[[1]]# with new people, It'll be fun!^...But Ingo won't let me...",
+                                                             /*german*/ "@? Bist Du das?^Wenn ich die Farm leiten würde, würde ich einen #Hindernisparcours# bauen, und wer die beste Zeit schafft, gewinnt eine #Kuh#!^"
+                                                                        "Elsie würde es lieben, #[[1]]# mit neuen Leuten zu teilen, es würde Spaß machen!^...Aber Basil läßt mich nicht...",
+                                                             /*french*/ "@? C'est toi?^Si je dirigeais le ranch, je construirais un #Parcours d'Obstacles#, et celui qui obtiendrait le meilleur temps gagnerait une #vache#!^"
+                                                                        "Elsie adore partager son #[[1]]# avec de nouvelles personnes, ce serait amusant!^... Mais Ingo ne me laisse pas faire...",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
     hintTextTable[RHT_MALON_HINT_INGO_TEMPTED] = HintText(CustomMessage("@! You should come back in the morning and try to beat my time on the #Obstacle Course#!^"
                                                                         "If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
+                                                             /*german*/ "@! Warum kommst Du nicht morgens wieder und versuchst Dich an dem #Hindernisparcours#?^"
+                                                                        "Gelingt es Dir den Rekord zu brechen, bekommst Du meine #Lieblingskuh# Elsie^und ihr Lieblingsspielzeug, #[[1]]#!",
+                                                             /*french*/ "@! Tu devrais revenir le matin et essayer de battre mon temps sur le #Parcours d'Obstacles#!^"
+                                                                        "Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, ainsi que son jouet #[[1]]#!",
                                                                         {QM_RED, QM_BLUE, QM_GREEN}));
 
     hintTextTable[RHT_CHICKENS_HINT] = HintText(CustomMessage("You! Please!&Bring my Cucco's back to my pen!&I'll give you my #[[1]]#!",
+                                                   /*german*/ "Was soll ich nur tun?! Bitte!&Hilf mir, die Hühner wieder einzusammeln!^Ich gebe Dir auch #[[1]]#, wenn du mir hilfst!",
+                                                   /*french*/ "Mes Cocottes sont perdues!&Dépose toutes les cocottes dans cet enclos!&Je te donnerai #[[1]]#!",
                                                               {QM_GREEN}));
 
     hintTextTable[RHT_BIG_POES_HINT] = HintText(CustomMessage("You have #\x1E\x01 Poe Points#! Reach 1000 and you'll get a #[[1]]#!",
+                                                   /*german*/ "Du hast nun #\x1E\x01 Punkte# auf dem Nachtschwärmer-Konto gut!^"
+                                                              "Hast Du %y1.000 Punkte%w gesammelt dann |wartet|warten| #[[1]]# auf Dich! Hehehe...",
+                                                   /*french*/ "Tu as #\x1E\x01 Points d'Âme#! Atteins 1000 et tu recevras #[[1]]#!",
                                                               {QM_YELLOW, QM_GREEN}));
 
     hintTextTable[RHT_BIGGORON_HINT] = HintText(CustomMessage("Arrrrrre you here to claim my finest #[[1]]#? Shoooooow me your #Claim Check#.",
+                                                   /*german*/ "Arrrrr, bist Du hier, um etwas von mir schmieden zu lassen? Zeig mir das #Zertifikat# und #[[1]]# |gehört|gehören| Dir!",
+                                                   /*french*/ "Eeeeeees-tu ici pour réclaaaaaamer mon plus beau #[[1]]#? Moooooontre-moi ton #Certificat#.",
                                                               {QM_GREEN, QM_RED}));
 
     hintTextTable[RHT_FROGS_HINT] = HintText(CustomMessage("Some frogs holding #[[1]]# are looking at you from underwater...",
@@ -2321,15 +2364,22 @@ void StaticData::HintTable_Init() {
                                                            {QM_GREEN}));
 
     hintTextTable[RHT_OOT_HINT] = HintText(CustomMessage("Bring the #Spiritual Stones# to the past so you can receive #[[1]]# from Zelda and learn #[[2]]#!",
+                                              /*german*/ "Bringe die #Heiligen Steine# in die Vergangenheit, damit Du #[[1]]# von...^"
+                                                         "Prinzessin Zelda erhältst und #[[2]]# lernst, um Hyrule vor dem Untergang zu bewahren!",
+                                              /*french*/ "Amène les #Pierres Spirituelles# dans le passé et Zelda te donnera #[[1]]# et t'apprendra #[[2]]# !",
                                                          {QM_BLUE, QM_GREEN, QM_GREEN}));
 
     hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!",
-                                                 /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du #[[d]] Skulltulas# zerstörst und ich werde Dir dafür #[[1]]# geben!",
+                                                 /*german*/ "Aarrrgh! Ich bin verflucht!^Bitte rette mich, indem Du&#[[d]] Skulltulas# zerstörst und ich&werde Dir dafür #[[1]]# geben!",
                                                  /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#",
                                                             {QM_YELLOW, QM_GREEN}));
 
     hintTextTable[RHT_MASK_SHOP_HINT] = HintText(CustomMessage("Some young scrubs in the #Deku Theatre# love seeing Masks!^"
                                                                "They'll give you #[[1]]# if you show them the #Skull Mask#, and #[[2]]# if you show them the #Mask of Truth#!",
+                                                    /*german*/ "Ein paar junge Dekus in der #Waldbühne# lieben es, Masken anzuschauen!^"
+                                                               "Sie geben Dir #[[1]]#, wenn Du ihnen die #Schädel-Maske# zeigst,^und #[[2]]#, wenn Du ihnen die #Maske des Wissens# zeigst!",
+                                                    /*french*/ "De jeunes Pestes Mojo qui se trouvent dans le #Théâtre Mojo# adorent voir des masques !^"
+                                                               "Elles te donneront #[[1]]# si tu leur montres le #Masque de Mort#, et #[[2]]# si tu leur montres le #Masque de Vérité#.",
                                                                {QM_GREEN, QM_GREEN, QM_RED, QM_GREEN, QM_RED}));
 
     /*--------------------------
@@ -2337,33 +2387,34 @@ void StaticData::HintTable_Init() {
     ---------------------------*/
 
     hintTextTable[RHT_GANON_JOKE01] = HintText(CustomMessage("Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?",
-                                                  /*german*/ "",
+                                                  /*german*/ "Oh! Du bist es @.&Ich habe eigentlich jemanden namens Shiek erwartet. Weißt Du, was mit ihm passiert ist?",
                                                   /*french*/ "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?"));
                                                // /*spanish*/¡Oh! Pero si es @.&Estaba esperando a alguien llamado Sheik. ¿Sabes qué puede haberle pasado?
 
     hintTextTable[RHT_GANON_JOKE02] = HintText(CustomMessage("I knew I shouldn't have put the key on the other side of my door.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Ich wußte, ich hätte den Schlüssel nicht draußen liegen lassen sollen.",
                                                   /*french*/ "J'aurais dû garder la clé ici. Hélas..."));
                                                // /*spanish*/Sabía que no tendría que haber dejado la llave al otro lado de la puerta.
 
     hintTextTable[RHT_GANON_JOKE03] = HintText(CustomMessage("Looks like it's time for a round of tennis.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Sieht so aus, als wäre es Zeit für eine Runde Tennis.",
                                                   /*french*/ "C'est l'heure de jouer au tennis."));
                                                // /*spanish*/Parece que es hora de una pachanga de tenis.
 
     hintTextTable[RHT_GANON_JOKE04] = HintText(CustomMessage("You'll never deflect my bolts of energy with your sword, then shoot me with those Light Arrows you happen to have.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Du wirst mich niemals besiegen, indem Du meine Blitze zurückschlägst und mich dann mit Licht-Pfeilen beschießt!",
                                                   /*french*/ "Ne perds pas ton temps à frapper mes éclairs d'énergie avec ton épée et me tirer avec tes flèches de Lumière!"));
                                                // /*spanish*/Nunca reflejarás mis esferas de energía con tu espada, para después dispararme con las flechas de luz que tendrás.
 
     hintTextTable[RHT_GANON_JOKE05] = HintText(CustomMessage("Why did I leave my trident back in the desert?",
-                                                  /*german*/ "",
+                                                  /*german*/ "Verdammt... Warum habe ich meinen Dreizack in der Wüste gelassen?",
                                                   /*french*/ "Sale bêtise... Et j'ai oublié mon trident dans le désert!"));
                                                // /*spanish*/Santa Hylia... ¿Por qué me habré dejado el tridente en el desierto?
 
     hintTextTable[RHT_GANON_JOKE06] = HintText(CustomMessage("Zelda is probably going to do something stupid, like send you back to your own timeline.^So this is "
                                                              "quite meaningless. Do you really want to save this moron?",
-                                                  /*german*/ "",
+                                                  /*german*/ "Zelda wird wahrscheinlich wieder etwas Dummes tun, wie Dich in Deine eigene Zeit zurück zu schicken."
+												             "^Ziemlich sinnlos wenn Du mich fragst. Willst Du diesen Schwachkopf wirklich retten?",
                                                   /*french*/ "Même si je suis vaincu... Zelda te renverra dans ton ère, et je reviendrai conquérir!^Telle est la "
                                                              "prophécie d'Hyrule Historia!"));
                                                // /*spanish*/Seguro que Zelda trata de hacer alguna tontería, como enviarte de vuelta a tu línea temporal.^No tiene
@@ -2371,30 +2422,31 @@ void StaticData::HintTable_Init() {
 
     hintTextTable[RHT_GANON_JOKE07] = HintText(CustomMessage("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the "
                                                              "hungry,&and my castle floats.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Was an Zelda lässt Dich glauben, sie wäre eine bessere Herrscherin als ich?^"
+                                                             "^Ich habe die Lon Lon-Farm gerettet, den Hungrigen etwas zu Essen gegeben, und mein Schloß schwebt!",
                                                   /*french*/ "Zelda ne sera jamais un meilleur monarque que moi!^J'ai un château volant, mes sujets sont des belles "
                                                              "amazones... et mes Moblins sont clairement plus puissants que jamais!"));
                                                // /*spanish*/¿Qué te hace pensar que Zelda gobierna mejor que yo?^Yo he salvado el Rancho Lon Lon,&he alimentado a
                                                           // los hambrientos&y hasta hago que mi castillo flote.
 
     hintTextTable[RHT_GANON_JOKE08] = HintText(CustomMessage("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!",
-                                                  /*german*/ "",
+                                                  /*german*/ "Zelda weint, das arme Kind, ihr Retter läuft herum wie blind!",
                                                   /*french*/ "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!"));
                                                // /*spanish*/Veamos ahora que harás,&la batalla ha de comenzar,&te enviaré de una vez al más allá,&¿listo para
                                                           // afrontar la verdad?
 
     hintTextTable[RHT_GANON_JOKE09] = HintText(CustomMessage("Many tricks are up my sleeve,&to save yourself&you'd better leave!",
-                                                  /*german*/ "",
+                                                  /*german*/ "Da hilft kein Flehen und kein Flennen, bald wird dieses Weltlein brennen!",
                                                   /*french*/ "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!"));
                                                // /*spanish*/¿No osarás a mí enfrentarte?&Rimas aparte,&¡voy a matarte!
 
     hintTextTable[RHT_GANON_JOKE10] = HintText(CustomMessage("After what you did to Koholint Island, how can you call me the bad guy?",
-                                                  /*german*/ "",
+                                                  /*german*/ "Nach allem was Du auf Kokolint angerichtet hast, wie kannst Du mich den Bösewicht nennen?",
                                                   /*french*/ "J'admire ce que tu as fait à l'Île Koholint... Toi et moi, nous devrions faire équipe!"));
                                                // /*spanish*/Después de lo que le hiciste a la Isla Koholint, ¿cómo te atreves a llamarme malvado?
 
     hintTextTable[RHT_GANON_JOKE11] = HintText(CustomMessage("Today, let's begin down&'The Hero is Defeated' timeline.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Heute beginnen wir die&'Der Held wurde besiegt'-Zeitlinie.",
                                                   /*french*/ "Si tu me vaincs, Hyrule sera englouti... mais si tu meurs, on aura A Link to the Past, le meilleur opus "
                                                              "de la série!"));
                                                // /*spanish*/Hoy daremos lugar a la línea temporal del Héroe Derrotado.&¡Prepárate para el culmen de esta saga!
@@ -2402,21 +2454,24 @@ void StaticData::HintTable_Init() {
    /*--------------------------
    |     Misc utilities       |
    ---------------------------*/
-   
+
     hintTextTable[RHT_YOUR_POCKET] = HintText(CustomMessage("your pocket",
-                                                 /*german*/ "deine Tasche",
+                                                 /*german*/ "in deiner Tasche",
                                                  /*french*/ "tes poches"));
                                               // /*spanish*/tu bolsillo
 
-    hintTextTable[RHT_ISOLATED_PLACE] = HintText(CustomMessage("an Isolated Place"));
+    hintTextTable[RHT_ISOLATED_PLACE] = HintText(CustomMessage("an Isolated Place",
+                                                    /*german*/ "an einem abgelegenen Ort",
+                                                    /*french*/ "un lieu isolé"));
 
-    hintTextTable[RHT_DUNGEON_ORDINARY] = HintText(CustomMessage(" It's ordinary.",
-                                                      /*german*/ "&Sieht aus wie immer.",
-                                                      /*french*/ "&Elle vous semble %rordinaire%w."));
+    hintTextTable[RHT_DUNGEON_ORDINARY] = HintText(CustomMessage("&It's %gordinary%w.",
+                                                      /*german*/ "&Man kann darauf die Worte&%gOcarina of Time%w entziffern...",
+                                                      /*french*/ "&Elle vous semble %gordinaire%w."));
 
-    hintTextTable[RHT_DUNGEON_MASTERFUL] = HintText(CustomMessage(" It's masterful!",
-                                                       /*german*/ "&Man kann darauf die Worte&%r\"Master Quest\"%w entziffern...",
-                                                       /*french*/ "&Étrange... les mots %r\"Master&Quest\"%w sont gravés dessus."));
+    hintTextTable[RHT_DUNGEON_MASTERFUL] = HintText(CustomMessage("&It's %rmasterful%w!",
+                                                       /*german*/ "&Man kann darauf die Worte&%rMaster Quest%w entziffern...",
+                                                       /*french*/ "&Étrange... les mots %r\"Master_Quest\"%w sont gravés dessus."));
 
+    // clang-format on
 }
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
index ed447fe303..aa375716f6 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
@@ -4,66 +4,68 @@
 
 namespace Rando {
 void StaticData::HintTable_Init_Exclude_Dungeon() {
-  /*--------------------------
-  |        DEKU TREE         |
-  ---------------------------*/
-   hintTextTable[RHT_DEKU_TREE_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baums# #[[1]]# läge.",
+    // clang-format off
+
+    /*--------------------------
+    |        DEKU TREE         |
+    ---------------------------*/
+    hintTextTable[RHT_DEKU_TREE_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
+                                                         /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baumes# #[[1]]# |läge|lägen|.",
                                                          /*french*/ "Selon moi, #le centre de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# sei.",
+                                                               /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# |sei|seien|.",
                                                                /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that the #treasure guarded by a scrub# in the Deku Tree is #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# sei.",
+                                                                         /*german*/ "Man erzählt sich, daß ein #von einem Deku bewachter Schatz# im Deku-Baum #[[1]]# |sei|seien|.",
                                                                          /*french*/ "Selon moi, le #trésor protégé par une peste# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_COMPASS_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
+                                                             /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum #[[1]]# versperren würden.",
                                                              /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
+                                                                       /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum #[[1]]# versperren würden.",
                                                                        /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verbergen würden.",
+                                                              /*german*/ "Man erzählt sich, daß #Weben im Deku-Baum# #[[1]]# verbergen würden.",
                                                               /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that in the #center of the Deku Tree# lies #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baums# #[[1]]# läge.",
+                                                            /*german*/ "Man erzählt sich, daß im #Zentrum des Deku-Baumes# #[[1]]# |läge|lägen|.",
                                                             /*french*/ "Selon moi, #le centre de l'Arbre Mojo# recèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, al #centro del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_COMPASS_CHEST] = HintText(CustomMessage("They say that a #treasure guarded by a large spider# in the Deku Tree is #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #von einer großen Spinne bewachter Schatz# im Deku-Baum #[[1]]# sei.",
+                                                                /*german*/ "Man erzählt sich, daß ein #von einer großen Spinne bewachter Schatz#, im Deku-Baum, #[[1]]# |sei|seien|.",
                                                                 /*french*/ "Selon moi, le #trésor protégé par une grosse araignée# dans l'Arbre Mojo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #gran araña del Gran Árbol Deku# esconde #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
+                                                                  /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum #[[1]]# versperren würden.",
                                                                   /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST] = HintText(CustomMessage("They say that #pillars of wood# in the Deku Tree lead to #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum zu #[[1]]# führen würden.",
+                                                                            /*german*/ "Man erzählt sich, daß die #Säulen aus Holz# im Deku-Baum #[[1]]# versperren würden.",
                                                                             /*french*/ "Selon moi, les #piliers de bois# dans l'Arbre Mojo indiquent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, los #salientes del Gran Árbol Deku# conducen a #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_BASEMENT_CHEST] = HintText(CustomMessage("They say that #webs in the Deku Tree# hide #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #Spinnweben im Deku-Baum# #[[1]]# verbergen würden.",
+                                                                 /*german*/ "Man erzählt sich, daß #Weben im Deku-Baum# #[[1]]# verbergen würden.",
                                                                  /*french*/ "Selon moi, les #toiles dans l'Arbre Mojo# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, entre #telarañas del Gran Árbol Deku# yace #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST] = HintText(CustomMessage("They say that #magical fire in the Deku Tree# leads to #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß #magisches Feuer im Deku-Baum# zu #[[1]]# führe.",
+                                                                            /*german*/ "Man erzählt sich, daß #magisches Feuer im Deku-Baum# #[[1]]# blockiere.",
                                                                             /*french*/ "Selon moi, le #feu magique dans l'Arbre Mojo# éclaire #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, el #fuego mágico en el Gran Árbol Deku# conduce a #[[1]]#.
 
@@ -73,59 +75,67 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                               // /*spanish*/ Según dicen, la #Reina Goma# porta #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that the #Parasitic Armored Arachnid# holds #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß das #gepanzerte parasitäre Spinne# #[[1]]# besäße.",
+                                                                  /*german*/ "Man erzählt sich, daß der #gepanzerte Spinnenparasit# #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, le #monstre insectoïde géant# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, el #arácnido parasitario acorazado# porta #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß eine #Spinne tief innerhalb des Deku-Baums# #[[1]]# verstecke.",
+                                                                     /*german*/ "Man erzählt sich, daß eine #Spinne tief im Inneren des Deku-Baumes# #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, une #Skulltula au centre de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_GATE] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß eine #von einer Webe geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
+                                                                /*german*/ "Man erzählt sich, daß eine #von Weben geschützte Spinne# innerhalb des Deku-Baumes #[[1]]# hielte.",
                                                                 /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_BASEMENT_VINES] = HintText(CustomMessage("They say that a #web protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß eine #von einer Webe geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
+                                                                 /*german*/ "Man erzählt sich, daß eine #von Weben geschützte Spinne# innerhalb des Deku-Baumes #[[1]]# hielte.",
                                                                  /*french*/ "Selon moi, une #Skulltula derrière une toile dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #Skulltula protegida por su tela# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_GS_COMPASS_ROOM] = HintText(CustomMessage("They say that a #spider atop the Deku Tree# holds #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß eine #Spinne auf der Spitze des Deku-Baums# #[[1]]# hielte.",
+                                                               /*german*/ "Man erzählt sich, daß eine #Spinne an der Spitze des Deku-Baumes# #[[1]]# hielte.",
                                                                /*french*/ "Selon moi, une #Skulltula au sommet de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #Skulltula en lo alto del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_LOBBY] = HintText(CustomMessage("They say that a #spider in a crate# within the Deku Tree hides #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß eine #Spinne in einer Kiste# innerhalb des Deku-Baums #[[1]]# verstecke.",
+                                                           /*german*/ "Man erzählt sich, daß eine #Spinne in einer Kiste# innerhalb des Deku-Baumes #[[1]]# verstecke.",
                                                            /*french*/ "Selon moi, une #Skulltula dans une boîte dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula bajo una caja# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_PAST_BOULDER_VINES] = HintText(CustomMessage("They say that a #wall of rock protects a spider# within the Deku Tree holding #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß eine #von einer Steinwand geschützte Spinne# innerhalb des Deku-Baums #[[1]]# hielte.",
+                                                                  /*german*/ "Man erzählt sich, daß eine #von einer Steinwand geschützte Spinne# innerhalb des Deku-Baumes #[[1]]# hielte.",
                                                                   /*french*/ "Selon moi, une #Skulltula derrière des rochers dans l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, una #Skulltula protegida por una pared rocosa# del Árbol Deku otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM] = HintText(CustomMessage("They say that a #spider deep within the Deku Tree# hides #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne tief innerhalb des Deku-Baums# #[[1]]# verstecke.",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne tief im Inneren des Deku-Baumes# #[[1]]# verstecke.",
                                                                         /*french*/ "Selon moi, une #Skulltula au centre de l'Arbre Mojo# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #Skulltula en las profundidades del Árbol Deku# otorga #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_MQ_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in the Deku Tree# sells #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß ein #Deku im Deku-Baum# #[[1]]# verkaufe.",
+                                                             /*german*/ "Man erzählt sich, daß ein #Deku-Händler im Deku-Baum# #[[1]]# verkaufe.",
                                                              /*french*/ "Selon moi, la #peste Mojo dans l'Arbre Mojo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, un #deku del Gran Árbol Deku# vende #[[1]]#.
 
     hintTextTable[RHT_DEKU_TREE_HEART] = HintText(CustomMessage("They say that a #heart in the Deku Tree# hides #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß ein #Herz im Deku-Baum# #[[1]]# verstecke.",
                                                      /*french*/ "Selon moi, un #coeur dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_DEKU_TREE_GRASS] = HintText(CustomMessage("They say that some #grass in the Deku Tree# hides #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß etwas #Gras im Deku-Baum# #[[1]]# verstecke.",
+                                                     /*french*/ "Selon moi, de l'#herbe dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_DEKU_TREE] = HintText(CustomMessage("They say that a #crate in the Deku Tree# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Deku-Baum# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans l'Arbre Mojo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |     DODONGOS CAVERN      |
   ---------------------------*/
-hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("They say that #above King Dodongo# lies #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß #auf König Dodongo# #[[1]]# läge.",
+    hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("They say that #above King Dodongo# lies #[[1]]#.",
+                                                                     /*german*/ "Man erzählt sich, daß #überhalb von König Dodongo# #[[1]]# |läge|lägen|.",
                                                                      /*french*/ "Selon moi, #par dessus le Roi Dodongo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, #sobre el Rey Dodongo# yace #[[1]]#.
 
@@ -140,17 +150,17 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                 // /*spanish*/ Según dicen, una #estatua de la Cueva de los Dodongos# esconde #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß auf einem #Labyrinth aus Stein# in Dodongos Höhle #[[1]]# läge.",
+                                                                                /*german*/ "Man erzählt sich, daß überhalb eines #Labyrinths aus Stein# in Dodongos Höhle #[[1]]# |läge|lägen|.",
                                                                                 /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, entre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_BOMB_BAG_CHEST] = HintText(CustomMessage("They say that the #second lizard cavern battle# yields #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß der #zweite Reptilienkampf der Höhle# #[[1]]# brächte.",
+                                                                    /*german*/ "Man erzählt sich, daß der #zweite Reptilienkampf der Kaverne# #[[1]]# einbrächte.",
                                                                     /*french*/ "Selon moi, le #deuxième duel de lézards de caverne# octroie #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #luchar dos veces contra reptiles en una cueva# conduce a #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST] = HintText(CustomMessage("They say that a #chest at the end of a bridge# yields #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß eine #Truhe am Ende der Brücke# #[[1]]# brächte.",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Truhe am Ende einer Brücke# #[[1]]# einbrächte.",
                                                                          /*french*/ "Selon moi, le #trésor à l'extrémité d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, un #cofre al final de un quebrado puente# contiene #[[1]]#.
 
@@ -175,12 +185,12 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                        // /*spanish*/ Según dicen, unas #pequeñas larvas# en la Cueva de los Dodongos esconden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST] = HintText(CustomMessage("They say that above a #maze of stone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß auf einem #Labyrinth aus Stein# in Dodongos Höhle #[[1]]# läge.",
+                                                                                /*german*/ "Man erzählt sich, daß überhalb eines #Labyrinths aus Stein# in Dodongos Höhle #[[1]]# |läge|lägen|.",
                                                                                 /*french*/ "Selon moi, sur #un labyrinthe de pierre# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, sobre un #laberinto de piedra# en la Cueva de los Dodongos yace #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST] = HintText(CustomMessage("They say that #beneath a headstone# in Dodongo's Cavern lies #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß #unterhalb eines Grabsteins# in Dodongos Höhle #[[1]]# läge.",
+                                                                          /*german*/ "Man erzählt sich, daß #unterhalb eines Grabsteins# in Dodongos Höhle #[[1]]# |läge|lägen|.",
                                                                           /*french*/ "Selon moi, #sous une pierre tombale# dans la Caverne Dodongo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, #bajo una lápida# en la Cueva de los Dodongos yace #[[1]]#.
 
@@ -190,7 +200,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                      // /*spanish*/ Según dicen, el #Rey Dodongo# porta #[[1]]#.
                                                                      {}, {
                                                                      CustomMessage("They say that the #Infernal Dinosaur# holds #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß der #infernalische Dinosaurier# #[[1]]# besäße.",
+                                                                         /*german*/ "Man erzählt sich, daß der #Infernosaurus# #[[1]]# besäße.",
                                                                          /*french*/ "Selon moi, le #dinosaure infernal# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                       // /*spanish*/ Según dicen, el #dinosaurio infernal# porta #[[1]]#.
 
@@ -240,61 +250,68 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                   // /*spanish*/ Según dicen, una #Skulltula entre lápidas# en la Cueva de los Dodongos otorga #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                                   /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                                   /*german*/ "Man erzählt sich, daß ein #Deku-Händler Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                    /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
-                                                                                        /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku# #[[1]]# verkaufe.",
+                                                                                        /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku-Händler# #[[1]]# verkaufe.",
                                                                                         /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                                    /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                                    /*german*/ "Man erzählt sich, daß ein #Deku-Händler Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                     /*french*/ "Selon moi, le #duo de peste Mojo dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß ein #Deku in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Deku-Händler in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                       /*french*/ "Selon moi, la #peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                              /*german*/ "Man erzählt sich, daß ein #Deku-Händler Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                               /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT] = HintText(CustomMessage("They say that a pair of #scrubs in Dodongo's Cavern# sells #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                                /*french*/ "Selon moi, le #duo de peste Mojo dans l'entrée de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, un #par de dekus en la Cueva de los Dodongos# venden #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE] = HintText(CustomMessage("They say that a #scrub in Dodongo's Cavern# sells #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß ein #Deku-Paar in Dodongos Höhle# #[[1]]# verkaufe.",
+                                                                             /*german*/ "Man erzählt sich, daß ein #Deku-Händler Paar in Dodongos Höhle# #[[1]]# verkaufe.",
                                                                              /*french*/ "Selon moi, la #peste Mojo au sommet des escaliers dans la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, un #deku en la Cueva de los Dodongos# vende #[[1]]#.
 
     hintTextTable[RHT_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS] = HintText(CustomMessage("They say that a #scrub guarded by Lizalfos# sells #[[1]]#.",
-                                                                                                 /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku# #[[1]]# verkaufe.",
+                                                                                                 /*german*/ "Man erzählt sich, daß ein #von Lizalfos bewachter Deku-Händler# #[[1]]# verkaufe.",
                                                                                                  /*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                               // /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.
 
     hintTextTable[RHT_POT_DODONGOS_CAVERN] = HintText(CustomMessage("They say that a #pot in Dodongo's Cavern# contains #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Krug in Dodongos Höhle# #[[1]]# enthielte.",
                                                          /*french*/ "Selon moi, une #jarre dans la Caverne Dodongo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DODONGOS_CAVERN_HEART] = HintText(CustomMessage("They say that a #heart in Dodongo's Cavern# hides #[[1]]#.",
-                                                           /*german*/ "",
+                                                           /*german*/ "Man erzählt sich, daß ein #Herz in Dodongos Höhle# #[[1]]# verstecke.",
                                                            /*french*/ "Selon moi, un #coeur# dans la Caverne Dodongo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone in Dodongo's Cavern# reveals #[[1]]#.",
-                                                                        /*german*/ "!!!",
+                                                                        /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein in Dodongos Höhle#, #[[1]]# enthülle.",
                                                                         /*french*/ "Selon moi, #jouer un air pour une pierre étrange dans la Caverne Dodongo# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone in Dodongo's Cavern# reveals #[[1]]#.",
-                                                                            /*german*/ "!!!",
-                                                                            /*french*/ "Selon moi, #jouer un air orageux pour une pierre étrange dans la Caverne Dodongo# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein in Dodongos Höhle#, #[[1]]# enthülle.",
+                                                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans la Caverne Dodongo# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_DODONGOS_CAVERN_GRASS] = HintText(CustomMessage("They say that some #grass in Dodongo's Cavern# hides #[[1]]#.",
+                                                                            /*german*/ "Man erzählt sich, daß etwas #Gras in Dodongos Höhle# #[[1]]# verstecke.",
+                                                                            /*french*/ "Selon moi, de l'#herbe dans la Caverne Dodongo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+											
+    hintTextTable[RHT_CRATE_DODONGOS_CAVERN] = HintText(CustomMessage("They say that a #crate in Dodongo's Cavern# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste in Dodongos Höhle# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans la Caverne Dodongo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
   /*--------------------------
   |     JABU JABUS BELLY     |
@@ -305,7 +322,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                              // /*spanish*/ Según dicen, un #tentáculo parasitario# protege #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that #tentacle trouble# in a deity's belly guards #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #Tentakel# im Bauch einer Gottheit #[[1]]# bewachen würden.",
+                                                                 /*german*/ "Man erzählt sich, daß #Tentakel# im Bauche einer Gottheit #[[1]]# bewachen würden.",
                                                                  /*french*/ "Selon moi, la #membrane# dans le ventre du gardien protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, un #problema tentaculoso# en la tripa de cierta deidad esconde #[[1]]#.
 
@@ -315,7 +332,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                  // /*spanish*/ Según dicen, unas #burbujas# protegen #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that #bubble trouble# in a deity's belly guards #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß #Blasen# im Bauch einer Gottheit #[[1]]# bewachen würden.",
+                                                                     /*german*/ "Man erzählt sich, daß #Blasen# im Bauche einer Gottheit #[[1]]# bewachen würden.",
                                                                      /*french*/ "Selon moi, un #horde de bulles# dans le ventre du gardien protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, un #problema burbujesco# en la tripa de cierta deidad esconde #[[1]]#.
 
@@ -325,7 +342,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                             // /*spanish*/ Según dicen, #dispararle a una vaca# revela #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #boulder before cows# hides #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß ein #Findling vor Kühen# #[[1]]# verstecke.",
+                                                                   /*german*/ "Man erzählt sich, daß ein #Felsen vor Kühen# #[[1]]# verstecke.",
                                                                    /*french*/ "Selon moi, des #rochers près des vaches# cachent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, cierta #roca rodeada de vacas# esconde #[[1]]#.
                                                                 {}, {
@@ -339,7 +356,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                  // /*spanish*/ Según dicen, un #paladar explosivo# esconde #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST] = HintText(CustomMessage("They say that near a #spiked elevator# lies #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß in der Nähe eines #stachligen Aufzugs# #[[1]]# läge.",
+                                                                                 /*german*/ "Man erzählt sich, daß in der Nähe eines #stachligen Aufzugs# #[[1]]# |läge|lägen|.",
                                                                                  /*french*/ "Selon moi, près d'un #ascenseur visqueux# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, cerca de un #ascensor puntiagudo# yace #[[1]]#.
 
@@ -349,7 +366,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                     // /*spanish*/ Según dicen, una #vaca sumergida# revela #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST] = HintText(CustomMessage("They say that #moving anatomy# creates a path to #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß eine #sich bewegende Anatomie# einen Pfad zu #[[1]]# kreiere.",
+                                                                                 /*german*/ "Man erzählt sich, daß hinter #sich bewegender Anatomie# #[[1]]# |läge|lägen|.",
                                                                                  /*french*/ "Selon moi, un #organe descendant# mène à #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, un #ser movedizo entre paredes# conduce a #[[1]]#.
 
@@ -364,12 +381,12 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                                 // /*spanish*/ Según dicen, un #par de digeridas vacas# otorgan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that the #final cows' reward# in a deity's belly is #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß die #Belohnung der letzten Kuh# im Bauch einer Gottheit #[[1]]# sei.",
+                                                                         /*german*/ "Man erzählt sich, daß die #Belohnung der letzten Kuh# im Bauche einer Gottheit #[[1]]# |sei|seien|.",
                                                                          /*french*/ "Selon moi, le #cadeau des dernières vaches# estomacales est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, las #vacas al final# de la tripa de cierta deidad otorgan #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST] = HintText(CustomMessage("They say that #cows protected by falling monsters# in a deity's belly guard hide #[[1]]#.",
-                                                                                      /*german*/ "Man erzählt sich, daß #von fallenden Monstern bewachte Kühe# im Bauch einer Gottheit #[[1]]# verstecken würden.",
+                                                                                      /*german*/ "Man erzählt sich, daß #von fallenden Monstern bewachte Kühe# im Bauche einer Gottheit #[[1]]# verstecken würden.",
                                                                                       /*french*/ "Selon moi, des #vaches protégées par des monstres tombants# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, unas #vacas custodiadas por monstruos del techo# de la tripa de cierta deidad otorgan #[[1]]#.
 
@@ -399,7 +416,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                   // /*spanish*/ Según dicen, #Barinade# porta #[[1]]#.
                                                                   {}, {
                                                                   CustomMessage("They say that the #Bio-Electric Anemone# holds #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß die #bioelektrische Anemone# #[[1]]# besäße.",
+                                                                      /*german*/ "Man erzählt sich, daß der #elektroterrestrische Biotentakel# #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, l'#anémone bioélectrique# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/ Según dicen, la #anémona bioeléctrica# porta #[[1]]#.
 
@@ -434,38 +451,45 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                               // /*spanish*/ Según dicen, una #Skulltula protegida por unos stingers# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #spider in a web within Jabu-Jabu's Belly# holds #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß eine #Spinne innerhalb einer Webe in Jabu-Jabus Bauch# #[[1]]# hielte.",
+                                                                      /*german*/ "Man erzählt sich, daß eine #Spinne in Weben innerhalb von Jabu-Jabus Bauch# #[[1]]# hielte.",
                                                                       /*french*/ "Selon moi, une #Skulltula sur une toile dans le Ventre de Jabu-Jabu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, una #Skulltula sobre una red# en la Tripa de Jabu-Jabu otorga #[[1]]#.
 
     hintTextTable[RHT_JABU_JABUS_BELLY_DEKU_SCRUB] = HintText(CustomMessage("They say that a #scrub in a deity# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku in einer Gottheit #[[1]]# verkaufe.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler in einer Gottheit #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, la #peste Mojo dans le ventre du gardien# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #deku dentro de cierta deidad# vende #[[1]]#.
 
     hintTextTable[RHT_POT_JABU_JABUS_BELLY] = HintText(CustomMessage("They say that a #pot in Jabu Jabu's Belly# contains #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß ein #Krug in Jabu-Jabus Bauch# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, une #jarre dans le Ventre de Jabu-Jabu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
-
     hintTextTable[RHT_JABU_JABU_RUPEE] = HintText(CustomMessage("They say that #underwater in Jabu-Jabu's Belly# lies #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß #unter Wasser in Jabu-Jabus Bauch# #[[1]]# |läge|lägen|.",
                                                      /*french*/ "Selon moi, #[[1]]# se trouve #sous l'eau dans le Ventre de Jabu Jabu#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_JABU_JABU_HEART] = HintText(CustomMessage("They say that near a #central lift in Jabu-Jabu's Belly# lies #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß sich #nahe des zentralen Aufzugs in Jabu-Jabus Bauch# #[[1]]# |befände|befänden|.",
                                                      /*french*/ "Selon moi, près d'un #ascenceur central dans le Ventre de Jabu-Jabu# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_JABU_JABUS_BELLY_GRASS] = HintText(CustomMessage("They say that some #grass in Jabu Jabu's Belly# hides #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß etwas #Gras in Jabu-Jabus Bauch# #[[1]]# verstecke.",
+                                                     /*french*/ "Selon moi, de l'#herbe dans le Ventre de Jabu-Jabu# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_JABU_JABU] = HintText(CustomMessage("They say that a #crate in Jabu Jabu's Belly# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste in Jabu-Jabus Bauch# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Ventre de Jabu-Jabu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |      FOREST TEMPLE       |
   ---------------------------*/
- hintTextTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
+    hintTextTable[RHT_FOREST_TEMPLE_FIRST_ROOM_CHEST] = HintText(CustomMessage("They say that a #tree in the Forest Temple# supports #[[1]]#.",
                                                                     /*german*/ "Man erzählt sich, daß ein #Baum im Waldtempel# #[[1]]# unterstütze.",
                                                                     /*french*/ "Selon moi, sur l'#arbre dans le Temple de la Forêt# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FIRST_STALFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern unter einer fallenden Decke# im Waldtempel #[[1]]# brächte.",
+                                                                       /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern, unter einer fallenden Decke# im Waldtempel, #[[1]]# einbrächte.",
                                                                        /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
@@ -480,12 +504,12 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                           // /*spanish*/ Según dicen, una #ardiente calavera# del Templo del Bosque esconde #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß eine ##Truhe auf einer kleinen Insel# im Waldtempel #[[1]]# enthielte.",
+                                                                                 /*german*/ "Man erzählt sich, daß eine ##Truhe, auf einer kleinen Insel# im Waldtempel, #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# läge.",
+                                                                              /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# |läge|lägen|.",
                                                                               /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
@@ -505,7 +529,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                // /*spanish*/ Según dicen, en una #sala con otro punto de vista# se esconde #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_FLOORMASTER_CHEST] = HintText(CustomMessage("They say that deep in the forest #shadows guard a chest# containing #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß tief im Wald, #Schatten eine Truhe bewachen#, welche [[1]]# enthielte.",
+                                                                     /*german*/ "Man erzählt sich, daß tief im Wald, #Schatten eine Truhe bewachen# welche [[1]]# enthielte.",
                                                                      /*french*/ "Selon moi, l'#ombre de la forêt# protège un coffre contenant #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, en lo profundo del bosque #unas sombras# esconden #[[1]]#.
 
@@ -515,7 +539,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                           // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
                                                           {}, {
                                                           CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würden.",
+                                                              /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würde.",
                                                               /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                            // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
@@ -525,7 +549,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                               // /*spanish*/ Según dicen, un #espectro rojo# guarda #[[1]]#.
                                                               {}, {
                                                               CustomMessage("They say that #Joelle# guards #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß #Joelle# #[[1]]# bewachen würde.",
+                                                                  /*german*/ "Man erzählt sich, daß #Hetti# #[[1]]# bewachen würde.",
                                                                   /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
@@ -535,7 +559,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                // /*spanish*/ Según dicen, un #espectro azul# guarda #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that #Beth# guards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #Beth# #[[1]]# bewachen würde.",
+                                                                   /*german*/ "Man erzählt sich, daß #Netti# #[[1]]# bewachen würde.",
                                                                    /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
@@ -550,7 +574,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                     // /*spanish*/ Según dicen, sobre un #árbol del Templo del Bosque# yace #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_WOLFOS_CHEST] = HintText(CustomMessage("They say that #defeating enemies beneath a falling ceiling# in Forest Temple yields #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern unter einer fallenden Decke# im Waldtempel #[[1]]# brächte.",
+                                                                   /*german*/ "Man erzählt sich, daß das #Besiegen von Gegnern, unter einer fallenden Decke# im Waldtempel, #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, #deux squelettes# dans le Temple de la Forêt protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, #derrotar enemigos caídos de lo alto# del Templo del Bosque revela #[[1]]#.
 
@@ -560,17 +584,17 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                              // /*spanish*/ Según dicen, los #Stalfos en lo profundo del Templo del Bosque# guardan #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that an #army of the dead# guards #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würden.",
+                                                                 /*german*/ "Man erzählt sich, daß eine #Armee der Toten# #[[1]]# bewachen würde.",
                                                                  /*french*/ "Selon moi, des #squelettes sylvestres# protègent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, un #ejército de soldados caídos# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST] = HintText(CustomMessage("They say that a #chest on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                                          /*german*/ "Man erzählt sich, daß eine ##Truhe auf einer kleinen Insel# im Waldtempel #[[1]]# enthielte.",
+                                                                                          /*german*/ "Man erzählt sich, daß eine #Truhe, auf einer kleinen Insel# im Waldtempel, #[[1]]# enthielte.",
                                                                                           /*french*/ "Selon moi, le #coffre sur l'îlot# du Temple de la Forêt contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                        // /*spanish*/ Según dicen, un #cofre sobre una isla# del Templo del Bosque contiene #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST] = HintText(CustomMessage("They say that #high in a courtyard# within the Forest Temple is #[[1]]#.",
-                                                                                          /*german*/ "Man erzählt sich, daß #hoch in einem Hof# innerhalb des Waldtempels #[[1]]# sei.",
+                                                                                          /*german*/ "Man erzählt sich, daß #hoch in einem Hof# innerhalb des Waldtempels #[[1]]# |sei|seien|.",
                                                                                           /*french*/ "Selon moi, #haut perché dans le jardin# du Temple de la Forêt gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                        // /*spanish*/ Según dicen, un #cofre en lo alto de un patio# del Templo del Bosque contiene #[[1]]#.
 
@@ -585,7 +609,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                              // /*spanish*/ Según dicen, un #fantasma rojo# guarda #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that #Joelle# guards #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #Joelle# #[[1]]# bewachen würde.",
+                                                                 /*german*/ "Man erzählt sich, daß #Hetti# #[[1]]# bewachen würde.",
                                                                  /*french*/ "Selon moi, #Joelle# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, #Joelle# guarda #[[1]]#.
 
@@ -595,12 +619,12 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                  // /*spanish*/ Según dicen, un #fantasma azul# guarda #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that #Beth# guards #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß #Beth# #[[1]]# bewachen würde.",
+                                                                     /*german*/ "Man erzählt sich, daß #Netti# #[[1]]# bewachen würde.",
                                                                      /*french*/ "Selon moi, #Beth# protège #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, #Beth# guarda #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST] = HintText(CustomMessage("They say that beneath a #checkerboard falling ceiling# lies #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# läge.",
+                                                                                 /*german*/ "Man erzählt sich, daß unter einer #fallenden Schachbrettdecke# #[[1]]# |läge|lägen|.",
                                                                                  /*french*/ "Selon moi, sous #l'échiquier tombant# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, tras un #techo de ajedrez# yace #[[1]]#.
 
@@ -610,7 +634,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                   // /*spanish*/ Según dicen, las #paredes giratorias# del Templo del Bosque conceden #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_REDEAD_CHEST] = HintText(CustomMessage("They say that deep in the forest #undead guard a chest# containing #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß tief im Wald #Untote eine Truhe bewachen#, welche #[[1]]# enthielte.",
+                                                                   /*german*/ "Man erzählt sich, daß tief im Wald, #Untote eine Truhe bewachen#, welche #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, des #revenants dans le Temple de la Forêt# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, en lo profundo del bosque #guardias del más allá# guardan #[[1]]#.
 
@@ -625,17 +649,17 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                     // /*spanish*/ Según dicen, #Ganon Fantasma# porta #[[1]]#.
                                                                     {}, {
                                                                     CustomMessage("They say that the #Evil Spirit from Beyond# holds #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #böse Geist aus dem Jenseits# #[[1]]# besäße.",
+                                                                        /*german*/ "Man erzählt sich, daß #das reitende Unheil# #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, l'#esprit maléfique de l'au-delà# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                      // /*spanish*/ Según dicen, el #espíritu maligno de ultratumba# porta #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a small island# in the Forest Temple holds #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß eine #Spinne auf einer kleinen Insel# im Waldtempel #[[1]]# besäße.",
+                                                                              /*german*/ "Man erzählt sich, daß eine #Spinne, auf einer kleinen Insel# im Waldtempel, #[[1]]# besäße.",
                                                                               /*french*/ "Selon moi, une #Skulltula sur l'îlot du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula sobre una pequeña isla# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_FIRST_ROOM] = HintText(CustomMessage("They say that a #spider high on a wall of vines# in the Forest Temple holds #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne hoch auf einer Wand aus Reben# im Waldtempel #[[1]]# besäße.",
+                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne, hoch auf einer Wand aus Reben# im Waldtempel, #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, une #Skulltula sur un mur de vignes du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #Skulltula en lo alto de una pared de cepas# del Templo del Bosque otorga #[[1]]#.
 
@@ -650,7 +674,7 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                          // /*spanish*/ Según dicen, una #Skulltula rodeada de fantasmas# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_GS_BASEMENT] = HintText(CustomMessage("They say that a #spider within revolving walls# in the Forest Temple holds #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß eine #Spinne inmitten drehender Wände# im Waldtempel #[[1]]# besäße.",
+                                                               /*german*/ "Man erzählt sich, daß eine #Spinne inmitten drehender Wände# innerhalb des Waldtempels #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, une #Skulltula derrière les murs pivotants du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #Skulltula entre paredes giratorias# del Templo del Bosque otorga #[[1]]#.
 
@@ -660,37 +684,41 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
                                                                     // /*spanish*/ Según dicen, una #Skulltula escondida entre cepas# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM] = HintText(CustomMessage("They say that a #spider in a hidden nook# within the Forest Temple holds #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß eine #Spinne in einem versteckten Winkel# im Waldtempel #[[1]]# besäße.",
+                                                                         /*german*/ "Man erzählt sich, daß eine #Spinne in einem versteckten Winkel# innerhalb des Waldtempels #[[1]]# besäße.",
                                                                          /*french*/ "Selon moi, une #Skulltula dans un recoin caché du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, una #Skulltula en una esquina oculta# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on an arch# in the Forest Temple holds #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne auf einem Bogen# im Waldtempel #[[1]]# besäße.",
+                                                                                 /*german*/ "Man erzählt sich, daß eine #Spinne, auf einem Bogen# im Waldtempel, #[[1]]# besäße.",
                                                                                  /*french*/ "Selon moi, une #Skulltula sur une arche du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #Skulltula sobre un arco# del Templo del Bosque otorga #[[1]]#.
 
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD] = HintText(CustomMessage("They say that a #spider on a ledge# in the Forest Temple holds #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne auf einem Vorsprung# im Waldtempel #[[1]]# besäße.",
+                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne, auf einem Vorsprung# im Waldtempel, #[[1]]# besäße.",
                                                                                 /*french*/ "Selon moi, une #Skulltula dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula en un borde# del Templo del Bosque otorga #[[1]]#.
     hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText(CustomMessage("They say that #draining a well# in Forest Temple uncovers a spider with #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß das #Entleeren eines Brunnens# im Waldtempel eine Spinne mit #[[1]]# enthülle.",
+                                                              /*german*/ "Man erzählt sich, daß das #Entleeren eines Brunnens# im Waldtempel, eine Spinne enthülle, welche #[[1]]# besäße.",
                                                               /*french*/ "Selon moi, une #Skulltula au fond du Puits du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, #vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_POT_FOREST_TEMPLE] = HintText(CustomMessage("They say that a #pot in Forest Temple# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug im Waldtempel# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Temple de la Fôret# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
-  hintTextTable[RHT_FOREST_TEMPLE_HEART] = HintText(CustomMessage("They say that a #heart in the Forest Temple# hides #[[1]]#.",
-                                                       /*german*/ "",
-                                                       /*french*/ "Selon moi, un #coeur dans le Temple de la Fôret# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_FOREST_TEMPLE_HEART] = HintText(CustomMessage("They say that a #heart in the Forest Temple# hides #[[1]]#.",
+                                                         /*german*/ "Man erzählt sich, daß ein #Herz im Waldtempel# #[[1]]# verstecke.",
+                                                         /*french*/ "Selon moi, un #coeur dans le Temple de la Fôret# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_FOREST_TEMPLE] = HintText(CustomMessage("They say that a #crate in Forest Temple# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Waldtempel# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Temple de la Fôret# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
   /*--------------------------
   |       FIRE TEMPLE        |
   ---------------------------*/
-hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# sei.",
+    hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
+                                                                 /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# |sei|seien|.",
                                                                  /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
@@ -710,7 +738,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                                // /*spanish*/ Según dicen, los #explosivos en un mar de llamas# revelan #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST] = HintText(CustomMessage("They say that a #Goron trapped near lava# holds #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß ein #nahe der Lava gefangene Gorone# #[[1]]# besäße.",
+                                                                                     /*german*/ "Man erzählt sich, daß ein #nahe der Lava gefangener Gorone# #[[1]]# besäße.",
                                                                                      /*french*/ "Selon moi, le #Goron emprisonné près de la lave# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, un #goron atrapado cerca de un mar de llamas# guarda #[[1]]#.
 
@@ -745,12 +773,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                             // /*spanish*/ Según dicen, un #cofre de un ardiente laberinto# contiene #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_HIGHEST_GORON_CHEST] = HintText(CustomMessage("They say that a #Goron atop the Fire Temple# holds #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß ein #Gorone auf der Spitze des Feuertempels# #[[1]]# besäße.",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Gorone an der Spitze des Feuertempels# #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, le #Goron au sommet du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #goron en lo alto del Templo del Fuego# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST] = HintText(CustomMessage("They say that #near a dragon# is #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# sei.",
+                                                                    /*german*/ "Man erzählt sich, daß #nahe eines Drachens# #[[1]]# |sei|seien|.",
                                                                     /*french*/ "Selon moi, #près d'un dragon# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #cerca de un dragón# yace #[[1]]#.
 
@@ -790,7 +818,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                            // /*spanish*/ Según dicen, usar el #martillo en lo profundo del Templo del Fuego# revela #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that #illuminating a lava pit# reveals the path to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß die #Illumination einer Lavagrube# den Pfad zu #[[1]]# enthülle.",
+                                                                   /*german*/ "Man erzählt sich, daß die #Beleuchtung einer Lavagrube# einen Pfad offenbare, welcher #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, #éclairer le lac de lave# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, #iluminar un mar de llamas# revela #[[1]]#.
 
@@ -805,7 +833,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                                // /*spanish*/ Según dicen, un #goron cerca de un laberinto# guarda #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that hidden #beneath a block of stone# lies #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß versteckt #unter einem Steinblock# #[[1]]# läge.",
+                                                                     /*german*/ "Man erzählt sich, daß versteckt #unter einem Steinblock# #[[1]]# |läge|lägen|.",
                                                                      /*french*/ "Selon moi, caché #derrière un bloc de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, #bajo unos bloques de piedra# yace #[[1]]#.
 
@@ -815,17 +843,17 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                              // /*spanish*/ Según dicen, #Volvagia# porta #[[1]]#.
                                                              {}, {
                                                              CustomMessage("They say that the #Subterranean Lava Dragon# holds #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß der #subterrane Lavadrache# #[[1]]# besäße.",
+                                                                 /*german*/ "Man erzählt sich, daß der #subterrane Lavadrachoid# #[[1]]# besäße.",
                                                                  /*french*/ "Selon moi, le #dragon des profondeurs# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                               // /*spanish*/ Según dicen, el #dragón de lava subterráneo# porta #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM] = HintText(CustomMessage("They say that #eight tiles of malice# guard a spider holding #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß #acht Kacheln der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
+                                                                      /*german*/ "Man erzählt sich, daß #acht Fliesen der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, une #Skulltula protégée par huit tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, #ocho baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_BOSS_KEY_LOOP] = HintText(CustomMessage("They say that #five tiles of malice# guard a spider holding #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß #fünf Kacheln der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
+                                                                  /*german*/ "Man erzählt sich, daß #fünf Fliesen der Arglist# eine Spinne bewachen würden, welche #[[1]]# besäße.",
                                                                   /*french*/ "Selon moi, une #Skulltula protégée par cinq tuiles dans le Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, #cinco baldosas de maldad# custodian una Skulltula que otorga #[[1]]#.
 
@@ -835,27 +863,27 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                               // /*spanish*/ Según dicen, los #explosivos en un laberinto# desvelan una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_TOP] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze des Feuertempels #[[1]]# verstecke.",
+                                                                  /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche#, an der Spitze des Feuertempels, #[[1]]# verstecke.",
                                                                   /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze eines Vulkans #[[1]]# verstecke.",
+                                                                   /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche#, an der Spitze eines Vulkans, #[[1]]# verstecke.",
                                                                    /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_GS_SCARECROW_CLIMB] = HintText(CustomMessage("They say that a #spider-friendly scarecrow# atop the Fire Temple hides #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der der Spitze des Feuertempels #[[1]]# verstecke.",
+                                                                    /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche#, an der der Spitze des Feuertempels, #[[1]]# verstecke.",
                                                                     /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                  // /*spanish*/ Según dicen, un #espantapájaros del Templo del Fuego# custodia una Skulltula que otorga #[[1]]#.
                                                                  {}, {
                                                                  CustomMessage("They say that a #spider-friendly scarecrow# atop a volcano hides #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche# auf der Spitze eines Vulkans #[[1]]# verstecke.",
+                                                                     /*german*/ "Man erzählt sich, daß eine #spinnenfreundliche Vogelscheuche#, an der Spitze eines Vulkans, #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, une #Skulltula repérée par l'épouvantail du volcan# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                   // /*spanish*/ Según dicen, un #espantapájaros en lo alto de un volcán# custodia una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE] = HintText(CustomMessage("They say that a #spider above a fiery maze# holds #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eines feurigen Labyrinths #[[1]]# besäße.",
+                                                                            /*german*/ "Man erzählt sich, daß eine #Spinne, oberhalb eines feurigen Labyrinths#, #[[1]]# besäße.",
                                                                             /*french*/ "Selon moi, une #Skulltula au dessus du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, una #Skulltula sobre un ardiente laberinto# otorga #[[1]]#.
 
@@ -865,31 +893,35 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                           // /*spanish*/ Según dicen, una #Skulltula en el interior de un ardiente laberinto# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR] = HintText(CustomMessage("They say that a #Goron trapped near lava# befriended a spider with #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß ein #nahe der Lava gefangener Gorone# sich mit einer Spinne angefreundet hat, welche #[[1]]# besäße.",
+                                                                               /*german*/ "Man erzählt sich, daß ein #nahe Lava gefangener Gorone# sich mit einer Spinne angefreundet hat, welche #[[1]]# besäße.",
                                                                                /*french*/ "Selon moi, une #Skulltula emprisonnée près du lac de lave du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #Skulltula amiga de un Goron atrapado junto a la lava# otorga #[[1]]#.
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM] = HintText(CustomMessage("They say that a #spider beside a fiery maze# holds #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne neben einem feurigen Labyrinth# #[[1]]# besäße.",
+                                                                                /*german*/ "Man erzählt sich, daß eine #Spinne, neben einem feurigen Labyrinth#, #[[1]]# besäße.",
                                                                                 /*french*/ "Selon moi, une #Skulltula près du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, una #Skulltula junto a un ardiente laberinto# otorga #[[1]]#.
 
     hintTextTable[RHT_POT_FIRE_TEMPLE] = HintText(CustomMessage("They say that a #pot in Fire Temple# contains #[[1]]#.",
-                                                     /*german*/ "",
+                                                     /*german*/ "Man erzählt sich, daß ein #Krug im Feuertempel# #[[1]]# enthielte.",
                                                      /*french*/ "Selon moi, une #jarre dans le Temple du Feu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_FIRE_TEMPLE_HEART] = HintText(CustomMessage("They say that a #heart in the Fire Temple# hides #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Herz im Feuertempel# #[[1]]# verstecke.",
                                                        /*french*/ "Selon moi, un #coeur dans le Temple du Feu# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun in a hot arena# reveals #[[1]]#.",
-                                                                                /*german*/ "!!!",
+                                                                                /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer heißen Arena# #[[1]]# enthülle.",
                                                                                 /*french*/ "Selon moi, #appeler le soleil dans une arène chaude# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun behind a knight's throne in a volcano# reveals #[[1]]#.",
-                                                                                /*german*/ "!!!",
+                                                                                /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne, hinter dem Thron eines Ritters in einem Vulkan#, #[[1]]# enthülle.",
                                                                                 /*french*/ "Selon moi, #appeler le soleil derrière le trône d’un chevalier dans un volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_CRATE_FIRE_TEMPLE] = HintText(CustomMessage("They say that a #crate in Fire Temple# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Feuertempel# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Temple du Feu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |       WATER TEMPLE       |
   ---------------------------*/
@@ -909,22 +941,22 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                              // /*spanish*/ Según dicen, el #fuego en el Templo del Agua# revela #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_DRAGON_CHEST] = HintText(CustomMessage("They say that a #serpent's prize# in the Water Temple is #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Preis einer Schlange# im Wassertempel #[[1]]# sei.",
+                                                               /*german*/ "Man erzählt sich, daß der #Preis einer Schlange# im Wassertempel #[[1]]# |sei|seien|.",
                                                                /*french*/ "Selon moi, la #récompense du dragon submergé# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, el #escamado premio# del Templo del Agua se trata de #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST] = HintText(CustomMessage("They say that #blinding an eye# in the Water Temple leads to #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß das #Erblinden eines Auges# im Wassertempel zu #[[1]]# führe.",
+                                                                           /*german*/ "Man erzählt sich, daß das #Erblinden eines Auges# im Wassertempel #[[1]]# enthülle.",
                                                                            /*french*/ "Selon moi, #l'oeil# du Temple de l'Eau voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, #cegar un ojo# del Templo del Agua conduce a #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# läge.",
+                                                                       /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# |läge|lägen|.",
                                                                        /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_CRACKED_WALL_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß #in einem Spalt# im Wassertempel #[[1]]# sei.",
+                                                                     /*german*/ "Man erzählt sich, daß #hinter einem Spalt# im Wassertempel #[[1]]# |sei|seien|.",
                                                                      /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
@@ -943,17 +975,17 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                // /*spanish*/ Según dicen, el #oscuro reflejo de ti mismo# guarda #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST] = HintText(CustomMessage("They say that in the #depths of the Water Temple# lies #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# läge.",
+                                                                          /*german*/ "Man erzählt sich, daß in den #Tiefen des Wassertempels# #[[1]]# |läge|lägen|.",
                                                                           /*french*/ "Selon moi, le #coeur du Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, en las #profundidades del Templo del Agua# yace #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that fire in the Water Temple unlocks a #vast gate# revealing a chest with #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß Feuer im Wassertempel ein #großes Tor# entschlüssele, welches eine Truhe mit #[[1]]# offenbare.",
+                                                                    /*german*/ "Man erzählt sich, daß Feuer im Wassertempel, ein #großes Tor# entriegele und #[[1]]# in einer Truhe offenbare.",
                                                                     /*french*/ "Selon moi, des #flammes au coeur du Temple de l'Eau# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, el fuego en el Templo del Agua alza una #gran valla# con #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_LONGSHOT_CHEST] = HintText(CustomMessage("They say that #through a crack# in the Water Temple is #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #in einem Spalt# im Wassertempel #[[1]]# sei.",
+                                                                    /*german*/ "Man erzählt sich, daß #hinter einem Spalt# im Wassertempel #[[1]]# |sei|seien|.",
                                                                     /*french*/ "Selon moi, le #mur fragile# du Temple de l'Eau cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, tras una #agrietada pared# del Templo del Agua yace #[[1]]#.
 
@@ -973,12 +1005,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                             // /*spanish*/ Según dicen, #Morpha# porta #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that the #Giant Aquatic Amoeba# holds #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß die #gigantische aquatische Amöbe# #[[1]]# besäße.",
+                                                                /*german*/ "Man erzählt sich, daß der #aquamöbe Wassertentakel# #[[1]]# besäße.",
                                                                 /*french*/ "Selon moi, l'#amibe aquatique géante# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, la #ameba acuática gigante# porta #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM] = HintText(CustomMessage("They say that a #spider over a waterfall# in the Water Temple holds #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß eine #Spinne über einem Wasserfall# im Wassertempel #[[1]]# besäße.",
+                                                                           /*german*/ "Man erzählt sich, daß eine #Spinne, über einem Wasserfall# im Wassertempel, #[[1]]# besäße.",
                                                                            /*french*/ "Selon moi, une #Skulltula au dessus d'une cascade du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula tras una cascada# del Templo del Agua otorga #[[1]]#.
 
@@ -988,17 +1020,17 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                  // /*spanish*/ Según dicen, una #Skulltula en el centro del Templo del Agua# otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a spider protected by #rolling boulders in the Water Temple# hides #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsbrocken im Wassertempel# geschützt werde, #[[1]]# verstecke.",
+                                                                         /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsen im Wassertempel# geschützt werde, #[[1]]# verstecke.",
                                                                          /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                       // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# del Templo del Agua otorga #[[1]]#.
                                                                       {}, {
                                                                       CustomMessage("They say that a spider protected by #rolling boulders under the lake# hides #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsbrocken unterhalb eines Flusses# geschützt werde, #[[1]]# verstecke.",
+                                                                          /*german*/ "Man erzählt sich, daß eine Spinne, welche von #rollenden Felsen unterhalb eines Sees# geschützt werde, #[[1]]# verstecke.",
                                                                           /*french*/ "Selon moi, une #Skulltula derrière les rochers roulants sous le lac# a #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                        // /*spanish*/ Según dicen, una #Skulltula protegida por rocas rodantes# bajo el lago otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß eine #Spinne über einem Fluß# im Wassertempel #[[1]]# besäße.",
+                                                           /*german*/ "Man erzählt sich, daß eine #Spinne, über einem Fluß# im Wassertempel, #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
@@ -1013,35 +1045,39 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                       // /*spanish*/ Según dicen, unos #reptiles custodian una Skulltula# del Templo del Agua que otorga #[[1]]#.
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_GS_RIVER] = HintText(CustomMessage("They say that a #spider over a river# in the Water Temple holds #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß eine #Spinne oberhalb eines Flusses# im Wassertempel #[[1]]# besäße.",
+                                                              /*german*/ "Man erzählt sich, daß eine #Spinne, über einem Fluß# im Wassertempel, #[[1]]# besäße.",
                                                               /*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.
 
     hintTextTable[RHT_POT_WATER_TEMPLE] = HintText(CustomMessage("They say that a #pot in Water Temple# contains #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß ein #Krug im Wassertempel# #[[1]]# enthielte.",
                                                       /*french*/ "Selon moi, une #jarre dans le Temple de l'Eau# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_WATER_TEMPLE_HEART] = HintText(CustomMessage("They say that in a #river in the Water Temple# lies #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß in einem #Fluß im Wassertempel# #[[1]]# |läge|lägen|.",
                                                         /*french*/ "Selon moi, une #rivière dans le Temple de l'Eau# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun atop a small pillar before a duel with one's shadow# reveals #[[1]]#.",
-                                                                               /*german*/ "!!!",
+                                                                               /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne auf einer kleinen Säule, vor einem Duell mit seinem Schatten#, #[[1]]# enthülle.",
                                                                                /*french*/ "Selon moi, #appeler le soleil au sommet d’un petit pilier avant un duel avec son ombre# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY] = HintText(CustomMessage("They say that #calling the rain before a duel with one's shadow# reveals #[[1]]#.",
-                                                                                /*german*/ "!!!",
+                                                                                /*german*/ "Man erzählt sich, daß das #Anrufen des Regens, vor einem Duell mit seinem Schatten#, #[[1]]# enthülle.",
                                                                                 /*french*/ "Selon moi, #appeler la pluie avant un duel avec son ombre# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun before a duel with one's shadow# reveals #[[1]]#.",
-                                                                               /*german*/ "!!!",
+                                                                               /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne, vor einem Duell mit seinem Schatten#, #[[1]]# enthülle.",
                                                                                /*french*/ "Selon moi, #appeler le soleil avant un duel avec son ombre# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_CRATE_WATER_TEMPLE] = HintText(CustomMessage("They say that a #crate in Water Temple# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Wassertempel# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Temple de l'Eau# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |      SPIRIT TEMPLE       |
   ---------------------------*/
- hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText(CustomMessage("They say that a child conquers a #skull in green fire# in the Spirit Temple to reach #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß ein Kind einen #Schädel in grünem Feuer# im Geistertempel erobere, um #[[1]]# zu erreichen.",
+    hintTextTable[RHT_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST] = HintText(CustomMessage("They say that a child conquers a #skull in green fire# in the Spirit Temple to reach #[[1]]#.",
+                                                                      /*german*/ "Man erzählt sich, daß ein Kind einen #Schädel in grünem Feuer# im Geistertempel überwältige, um #[[1]]# zu erreichen.",
                                                                       /*french*/ "Selon moi, le #crâne au halo vert dans le colosse# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, el joven que #baje el puente# del Templo del Espíritu encontrará #[[1]]#.
 
@@ -1051,12 +1087,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                           // /*spanish*/ Según dicen, un joven puede encontrar un #cofre entre rejas# del Templo del Espíritu con #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# läge.",
+                                                                 /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# |läge|lägen|.",
                                                                  /*french*/ "Selon moi, le #trou sableux dans le colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, tras un #pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST] = HintText(CustomMessage("They say that #dodging boulders to collect silver rupees# in the Spirit Temple yields #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß das #Ausweichen von Felsbrocken um silberne Rubine zu sammeln# im Geistertempel #[[1]]# einbrächte.",
+                                                                           /*german*/ "Man erzählt sich, daß das #Ausweichen von Felsen, um im Geistertempel silberne Rubine zu sammeln#, #[[1]]# einbrächte.",
                                                                            /*french*/ "Selon moi, les #pièces argentées entourées de rochers dans le colosse# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, #esquivar rocas y conseguir plateadas rupias# en el Templo del Espíritu conduce a #[[1]]#.
 
@@ -1071,7 +1107,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                          // /*spanish*/ Según dicen, un #círculo de reflectante luz# del Templo del Espíritu guarda #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that #before a giant statue# in the Spirit Temple lies #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß #vor einer riesigen Statue# im Geistertempel #[[1]]# läge.",
+                                                             /*german*/ "Man erzählt sich, daß #vor einer riesigen Statue# im Geistertempel #[[1]]# |läge|lägen|.",
                                                              /*french*/ "Selon moi, #devant la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, #ante una gran estatua# del Templo del Espíritu aguarda #[[1]]#.
 
@@ -1096,7 +1132,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                        // /*spanish*/ Según dicen, una #estatua del Templo del Espíritu# esconde #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST] = HintText(CustomMessage("They say that on a #ledge by a statue# in the Spirit Temple rests #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß auf einem #Vorsprung einer Statue# im Geistertempel #[[1]]# ruhe.",
+                                                                               /*german*/ "Man erzählt sich, daß auf einem #Vorsprung, bei einer Statue# im Geistertempel, #[[1]]# |ruhe|ruhen|.",
                                                                                /*french*/ "Selon moi, #haut perché près de la statue# dans le colosse gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, al #borde de una estatua# del Templo del Espíritu yace #[[1]]#.
 
@@ -1121,12 +1157,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                // /*spanish*/ Según dicen, un #cofre rodeado de llamas# del Templo del Espíritu contiene #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_TOPMOST_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß jene, welche #das Licht auf dem Koloss# zeigen würden, #[[1]]# fänden.",
+                                                                 /*german*/ "Man erzählt sich, daß jene, welche #das Licht oberhalb des Kolosses# zeigen würden, #[[1]]# fänden.",
                                                                  /*french*/ "Selon moi, le #soleil au sommet du colosse# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, aquellos que #iluminen en lo alto del Coloso# encontrarán #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST] = HintText(CustomMessage("They say that #lying unguarded# in the Spirit Temple is #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß #unbewacht liegend# im Geistertempel #[[1]]# sei.",
+                                                                                /*german*/ "Man erzählt sich, daß #unbewacht liegend# im Geistertempel #[[1]]# |sei|seien|.",
                                                                                 /*french*/ "Selon moi, dans #l'entrée du colosse# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, en la #entrada del Templo del Espíritu# yace #[[1]]#.
 
@@ -1136,17 +1172,17 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                              // /*spanish*/ Según dicen, el #interruptor de un pilar# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST] = HintText(CustomMessage("They say that #collecting rupees through a water jet# reveals #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß das #Sammeln von Rubin durch einen Wasserstrom# #[[1]]# enthüllen würde.",
+                                                                                 /*german*/ "Man erzählt sich, daß das #Sammeln von Rubinen durch einen Wasserstrom# #[[1]]# enthüllen würde.",
                                                                                  /*french*/ "Selon moi, les #pièces argentées dans le jet d'eau# du colosse révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, #hacerte con rupias tras un géiser# revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST] = HintText(CustomMessage("They say that an #eye blinded by stone# within the Spirit Temple conceals #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß ein #durch einen Stein erblindetes Auge# im Geistertempel #[[1]]# verberge.",
+                                                                               /*german*/ "Man erzählt sich, daß ein, #durch einen Stein erblindetes, Auge# innerhalb des Geistertempels #[[1]]# verberge.",
                                                                                /*french*/ "Selon moi, #l'oeil derrière le rocher# dans le colosse voit #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, #cegar a un ojo# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MAP_CHEST] = HintText(CustomMessage("They say that surrounded by #fire and wrappings# lies #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß umgeben von #Feuer umhüllt# #[[1]]# läge.",
+                                                                /*german*/ "Man erzählt sich, daß umgeben von #Feuer und Bandagen# #[[1]]# |läge|lägen|.",
                                                                 /*french*/ "Selon moi, près des #pierres tombales dans le colosse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, rodeado de #fuego y vendas# yace #[[1]]#.
 
@@ -1161,7 +1197,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                            // /*spanish*/ Según dicen, una #explosiva luz solar# del Templo del Espíritu revela #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST] = HintText(CustomMessage("They say that #trapped by falling enemies# within the Spirit Temple is #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß sich #gefangen von fallenden Feinden# im Geistertempel #[[1]]# befände.",
+                                                                              /*german*/ "Man erzählt sich, daß sich #gefangen von herabfallenden Feinden# innerhalb des Geistertempels #[[1]]# |befände|befänden|.",
                                                                               /*french*/ "Selon moi, des #ennemis tombants# dans le colosse protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, #rodeado de enemigos del cielo# del Templo del Espíritu yace #[[1]]#.
 
@@ -1176,7 +1212,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                              // /*spanish*/ Según dicen, la #melodía real que despierte al coloso# revelará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# finds the colossus's hidden #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# des Kolosses verborgene #[[1]]# fände.",
+                                                                                  /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit#, Verborgenes im Koloss enthülle und #[[1]]# offenbare.",
                                                                                   /*french*/ "Selon moi, #l'oeil de vérité# verra dans le colosse #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Templo del Espíritu encontrará #[[1]]#.
 
@@ -1191,12 +1227,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                         // /*spanish*/ Según dicen, la #luz solar de un ígneo laberinto# esconde #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST] = HintText(CustomMessage("They say that #across a pit of sand# in the Spirit Temple lies #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# läge.",
+                                                                        /*german*/ "Man erzählt sich, daß #jenseits einer Sandgrube# im Geistertempel #[[1]]# |läge|lägen|.",
                                                                         /*french*/ "Selon moi, le #trou sableux# dans le colosse a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #a través del pozo de arena# del Templo del Espíritu yace #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST] = HintText(CustomMessage("They say that where #temporal stone blocks the path# within the Spirit Temple lies #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß wo #zeitlicher Stein den Pfad blockiere# im Geistertempel #[[1]]# läge.",
+                                                                        /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein, der innerhalb des Geistertempels den Pfad blockiere#, #[[1]]# verstecke.",
                                                                         /*french*/ "Selon moi, les #pierres temporelles# dans le colosse cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, donde los #bloques temporales bloquean# en el Templo del Espíritu yace #[[1]]#.
 
@@ -1206,12 +1242,12 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                       // /*spanish*/ Según dicen, un #cofre de doble uso# contiene #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that a #temporal stone blocks the light# leading to #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein das Licht blockiere#, was zu #[[1]]# führe.",
+                                                                     /*german*/ "Man erzählt sich, daß ein #zeitlicher Stein das Licht blockiere# und deshalb #[[1]]# verstecke.",
                                                                      /*french*/ "Selon moi, la #pierre temporelle# le colosse fait ombre sur #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #bloque temporal bloquea la luz# que conduce a #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST] = HintText(CustomMessage("They say that those who #show the light above the Colossus# find #[[1]]#.",
-                                                                                    /*german*/ "Man erzählt sich, daß jene, welche #das Licht auf dem Koloss# zeigen würden, #[[1]]# fänden.",
+                                                                                    /*german*/ "Man erzählt sich, daß jene, welche #das Licht oberhalb des Kolosses# zeigen würden, #[[1]]# fänden.",
                                                                                     /*french*/ "Selon moi, le trésor invisible #au sommet du colosse# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, aquellos que #revelen la luz sobre el Coloso# encontrarán #[[1]]#.
 
@@ -1221,7 +1257,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                // /*spanish*/ Según dicen, #Birova# porta #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that the #Sorceress Sisters# hold #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß die #Hexenschwestern# #[[1]]# besäßen.",
+                                                                   /*german*/ "Man erzählt sich, daß die #höllische Hexenarmada# #[[1]]# besäße.",
                                                                    /*french*/ "Selon moi, #les sorcières jumelles# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, las #hermanas hechiceras# portan #[[1]]#.
 
@@ -1231,7 +1267,7 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                              // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_BOULDER_ROOM] = HintText(CustomMessage("They say that a #spider behind a temporal stone# in the Spirit Temple yields #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß eine #Spinne hinter einem zeitlichen Stein# im Geistertempel #[[1]]# einbrächte.",
+                                                                   /*german*/ "Man erzählt sich, daß eine #Spinne, hinter einem zeitlichen Stein# im Geistertempel, #[[1]]# einbrächte.",
                                                                    /*french*/ "Selon moi, une #Skulltula derrière une pierre temporelle du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula tras un bloque temporal# del Templo del Espíritu otorga #[[1]]#.
 
@@ -1241,17 +1277,17 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                          // /*spanish*/ Según dicen, una #Skulltula junto a una estatua# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM] = HintText(CustomMessage("They say that a #spider at the top of a deep shaft# in the Spirit Temple holds #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne auf der Spitze eines tiefen Stiels# im Geistertempel #[[1]]# besäße.",
+                                                                        /*german*/ "Man erzählt sich, daß eine #Spinne, an der Spitze eines tiefen Schachts# im Geistertempel, #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula près d'un mur d'escalade du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, una #Skulltula en lo alto de un gran hueco# del Templo del Espíritu otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_GS_METAL_FENCE] = HintText(CustomMessage("They say that a child defeats a #spider among bats# in the Spirit Temple to gain #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß ein Kind #eine Spinne inmitten von Fledermäusen# im Geistertempel besiege und #[[1]]# erhielte.",
+                                                                  /*german*/ "Man erzählt sich, daß ein Kind, #eine Spinne inmitten von Fledermäusen# im Geistertempel, besiege und #[[1]]# erhielte.",
                                                                   /*french*/ "Selon moi, une #Skulltula sur le grillage du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, el joven que derrote la #Skulltula entre murciélagos# del Templo del Espíritu hallará #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM] = HintText(CustomMessage("They say that #above a pit of sand# in the Spirit Temple hides #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß sich #oberhalb einer Sandgrube# im Geistertempel #[[1]]# verstecke.",
+                                                                     /*german*/ "Man erzählt sich, daß sich #über einer Sandgrube# im Geistertempel #[[1]]# |verstecke|verstecken|.",
                                                                      /*french*/ "Selon moi, une #Skulltula au dessus du trou sableux du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #Skulltula sobre un pozo de arena# del Templo del Espíritu otorga #[[1]]#.
 
@@ -1266,32 +1302,36 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
                                                                               // /*spanish*/ Según dicen, una #Skulltula en el salón de un guerrero# otorga #[[1]]#.
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM] = HintText(CustomMessage("They say that #upon a web of glass# in the Spirit Temple sits a spider holding #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #auf einer Webe aus Glas# im Geistertempel eine Spinne säße, welche #[[1]]# besäße.",
+                                                                        /*german*/ "Man erzählt sich, daß #auf einem Weben aus Glas# im Geistertempel eine Spinne säße, welche #[[1]]# besäße.",
                                                                         /*french*/ "Selon moi, une #Skulltula sur une paroi de verre du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #sobre una plataforma de cristal# yace una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_POT_SPIRIT_TEMPLE] = HintText(CustomMessage("They say that a #pot in Spirit Temple# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug im Geistertempel# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Temple de l'Esprit# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SPIRIT_TEMPLE_HEART] = HintText(CustomMessage("They say that on a #small platform# in the Spirit Temple lies #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß auf einer #kleinen Plattform# im Geistertempel #[[1]]# |läge|lägen|.",
                                                          /*french*/ "Selon moi, sur une #petite plateforme# dans le Temple de l'Esprit repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SPIRIT_TEMPLE_MQ_HEART] = HintText(CustomMessage("They say that guarded by a #ring of flame# in the Spirit Temple is #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß sich bewacht von einem #Ring der Flammen#, im Geistertempel #[[1]]# |befände|befänden|.",
                                                          /*french*/ "Selon moi, protégé par un #cercle de flammes# dans le Temple de l'Esprit se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_CRATE_SPIRIT_TEMPLE] = HintText(CustomMessage("They say that a #crate in Spirit Temple# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Geistertempel# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Temple de l'Esprit# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |      SHADOW TEMPLE       |
   ---------------------------*/
-hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
+    hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that the #Eye of Truth# pierces a hall of faces to reveal #[[1]]#.",
                                                              /*german*/ "Man erzählt sich, daß das #Auge der Wahrheit# eine Halle der Gesichter durchdränge und #[[1]]# offenbaren würde.",
                                                              /*french*/ "Selon moi, l'#oeil de vérité# voit dans les couloirs du Temple de l'Ombre #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubrirá un pasillo de facetas con #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß eine #tote Hand im Schattentempel# #[[1]]# hielte.",
+                                                                     /*german*/ "Man erzählt sich, daß der #Hirnsauger im Schattentempel# #[[1]]# hielte.",
                                                                      /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                   // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
                                                                   {}, {
@@ -1301,7 +1341,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                    // /*spanish*/ Según dicen, un #temido morador del Templo de las Sombras# guarda #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_COMPASS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #durch das Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
+                                                                 /*german*/ "Man erzählt sich, daß #vom Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
                                                                  /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
@@ -1321,17 +1361,17 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                  // /*spanish*/ Según dicen, las #hojas invisibles# guardan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
+                                                                              /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                               /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
+                                                                              /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                               /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß #fallende Stacheln# den Pfad zu #[[1]]# blockieren würden.",
+                                                                               /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                                /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
@@ -1346,12 +1386,12 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                 // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
+                                                                          /*german*/ "Man erzählt sich, daß #Mumien die eine Fähre bewachen# #[[1]]# verstecken würden.",
                                                                           /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
+                                                                           /*german*/ "Man erzählt sich, daß #Mumien die eine Fähre bewachen# #[[1]]# verstecken würden.",
                                                                            /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
@@ -1366,7 +1406,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a burning skull# lies #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #innerhalb eines brennenden Schädels# #[[1]]# läge.",
+                                                                    /*german*/ "Man erzählt sich, daß #innerhalb eines brennenden Schädels# #[[1]]# |läge|lägen|.",
                                                                     /*french*/ "Selon moi, #dans un crâne enflammé# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, en el #interior de una calavera en llamas# aguarda #[[1]]#.
 
@@ -1376,12 +1416,12 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                  // /*spanish*/ Según dicen, el #Ojo de la Verdad# descubre un pasillo de facetas con #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST] = HintText(CustomMessage("They say that #Dead Hand in the Shadow Temple# holds #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß eine #tote Hand im Schattentempel# #[[1]]# hielte.",
+                                                                        /*german*/ "Man erzählt sich, daß der #Hirnsauger im Schattentempel# #[[1]]# hielte.",
                                                                         /*french*/ "Selon moi, le #Poigneur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, la #Mano Muerta del Templo de las Sombras# guarda #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST] = HintText(CustomMessage("They say that #mummies revealed by the Eye of Truth# guard #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß #durch das Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
+                                                                         /*german*/ "Man erzählt sich, daß #vom Auge der Wahrheit offenbarte Mumien# #[[1]]# bewachen würden.",
                                                                          /*french*/ "Selon moi, les #Gibdos dans les couloirs# du Temple de l'Ombre protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, las #momias reveladas por el Ojo de la Verdad# guardan #[[1]]#.
 
@@ -1396,17 +1436,17 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                               // /*spanish*/ Según dicen, hacerte con las #rupias en una gran caverna# del Templo de las Sombras revela #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
+                                                                                  /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                                   /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
+                                                                                 /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST] = HintText(CustomMessage("They say that #falling spikes# block the path to #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß #fallende Stachel# den Pfad zu #[[1]]# blockieren würden.",
+                                                                                 /*german*/ "Man erzählt sich, daß ein von #fallenden Stacheln# blockierter Pfad #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, la #pluie de clous# surplombe #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, los #pinchos de un techo# conducen a #[[1]]#.
 
@@ -1426,7 +1466,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                           // /*spanish*/ Según dicen, las #paredes consumidas por una esfera ígnea# revelan #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST] = HintText(CustomMessage("They say that near an #empty pedestal# within the Shadow Temple lies #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß nahe einem #leeren Sockel# im Schattentempel #[[1]]# läge.",
+                                                                         /*german*/ "Man erzählt sich, daß nahe eines #leeren Podests# innerhalb des Schattentempels #[[1]]# |läge|lägen|.",
                                                                          /*french*/ "Selon moi, #près d'un pédestal vide du Temple de l'Ombre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, cerca de un #vacío pedestal# del Templo de las Sombras yace #[[1]]#.
 
@@ -1446,22 +1486,22 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                    // /*spanish*/ Según dicen, un #cofre invisible custodiado por los del más allá# contiene #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
+                                                                              /*german*/ "Man erzählt sich, daß #Mumien die eine Fähre bewachen# #[[1]]# verstecken würden.",
                                                                               /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST] = HintText(CustomMessage("They say that #mummies guarding a ferry# hide #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß #eine Fähre bewachende Mumien# #[[1]]# verstecken würden.",
+                                                                             /*german*/ "Man erzählt sich, daß #Mumien die eine Fähre bewachen# #[[1]]# verstecken würden.",
                                                                              /*french*/ "Selon moi, les #Gibdos qui bloquent le traversier# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, las #momias que protegen un navío# esconden #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #caged near a ship# lies #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß #in der Nähe eines Schiffes eingesperrt# #[[1]]# läge.",
+                                                                                /*german*/ "Man erzählt sich, daß #in der Nähe eines Schiffes eingesperrt# #[[1]]# |läge|lägen|.",
                                                                                 /*french*/ "Selon moi, #dans une cage près du traversier# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, #entre rejas al lado de un navío# yace #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_FREESTANDING_KEY] = HintText(CustomMessage("They say that #behind three burning skulls# lies #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß #hinter drei brennenden Schädeln# #[[1]]# läge.",
+                                                                       /*german*/ "Man erzählt sich, daß #hinter drei brennenden Schädeln# #[[1]]# |läge|lägen|.",
                                                                        /*french*/ "Selon moi, #derrière trois crânes enflammés# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, tras #tres ardientes calaveras# yace #[[1]]#.
 
@@ -1471,7 +1511,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                   // /*spanish*/ Según dicen, #Bongo Bongo# porta #[[1]]#.
                                                                   {}, {
                                                                   CustomMessage("They say that the #Phantom Shadow Beast# holds #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß das #Phantomschattenbiest# #[[1]]# besäße.",
+                                                                      /*german*/ "Man erzählt sich, daß die #bestialische Schattenmonstrosität# #[[1]]# besäße.",
                                                                       /*french*/ "Selon moi, le #monstre de l'ombre# possède #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                    // /*spanish*/ Según dicen, la #alimaña oscura espectral# porta #[[1]]#.
 
@@ -1496,7 +1536,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                   // /*spanish*/ Según dicen, una #Skulltula custodiada por hojas invisibles# otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_GS_NEAR_SHIP] = HintText(CustomMessage("They say that a spider near a #docked ship# hoards #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß eine Spinne nahe eines #geankerten Schiffs# #[[1]]# horte.",
+                                                                /*german*/ "Man erzählt sich, daß eine Spinne nahe eines #geankerten Schiffes# #[[1]]# horte.",
                                                                 /*french*/ "Selon moi, une #Skulltula près du traversier du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #Skulltula cercana a un navío# otorga #[[1]]#.
 
@@ -1511,7 +1551,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                      // /*spanish*/ Según dicen, una #Skulltula entre ventarrones# del Templo de las Sombras otorga #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_AFTER_WIND] = HintText(CustomMessage("They say that a #spider beneath gruesome debris# in the Shadow Temple hides #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß eine #Spinne unterhalb grauenvoller Trümmer# im Schattentempel #[[1]]# verstecke.",
+                                                                    /*german*/ "Man erzählt sich, daß eine #Spinne, unterhalb grauenvoller Trümmer# im Schattentempel, #[[1]]# verstecke.",
                                                                     /*french*/ "Selon moi, une #Skulltula sous des débris du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, una #Skulltula bajo unos horripilantes escombros# del Templo de las Sombras otorga #[[1]]#.
 
@@ -1521,30 +1561,34 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                  // /*spanish*/ Según dicen, una #estatua caída# revelará una Skulltula que otorgue #[[1]]#.
 
     hintTextTable[RHT_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS] = HintText(CustomMessage("They say that a #suspended spider# guards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß eine #hängende Spinne# #[[1]]# bewache.",
+                                                                   /*german*/ "Man erzählt sich, daß eine #schwebende Spinne# #[[1]]# bewache.",
                                                                    /*french*/ "Selon moi, une #Skulltula près du repère du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #Skulltula flotante# del Templo de las Sombras otorga #[[1]]#.
 
     hintTextTable[RHT_POT_SHADOW_TEMPLE] = HintText(CustomMessage("They say that a #pot in Shadow Temple# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug im Schattentempel# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Temple de l'Ombre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SHADOW_TEMPLE_HEART] = HintText(CustomMessage("They say that a #heart in the Shadow Temple# hides #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Herz im Schattentempel# #[[1]]# verstecke.",
                                                          /*french*/ "Selon moi, un #coeur dans le Temple de l'Ombre# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY] = HintText(CustomMessage("They say that an #calling the rain for a sentry guarding a house of the dead# reveals #[[1]]#.",
-                                                                      /*german*/ "!!!",
+                                                                      /*german*/ "Man erzählt sich, daß das #Anrufen des Regens, nahe eines Wachpostens des Hauses der Toten#, #[[1]]# enthülle.",
                                                                       /*french*/ "Selon moi, #appeler la pluie pour une sentinelle gardant une maison des morts# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SHADOW_TEMPLE_PIT_STORM_FAIRY] = HintText(CustomMessage("They say that an #calling the rain on a platform suspended above a bottomless pit# reveals #[[1]]#.",
-                                                                   /*german*/ "!!!",
+                                                                   /*german*/ "Man erzählt sich, daß das #Anrufen des Regens, auf einer Plattform, welche über einer bodenlosen Grube schwebt#, #[[1]]# enthülle.",
                                                                    /*french*/ "Selon moi, #appeler la pluie sur une plateforme suspendue au-dessus d’un gouffre sans fond# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY] = HintText(CustomMessage("They say that an #calling the sun near an invisible chest guarded by the dead# reveals #[[1]]#.",
-                                                                       /*german*/ "!!!",
+                                                                       /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne, nahe einer von Toten bewachten unsichtbaren Truhe#, #[[1]]# enthülle.",
                                                                        /*french*/ "Selon moi, #appeler le soleil près d’un coffre invisible gardé par les morts# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_CRATE_SHADOW_TEMPLE] = HintText(CustomMessage("They say that a #crate in Shadow Temple# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste im Schattentempel# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Temple de l'Ombre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |    BOTTOM OF THE WELL    |
   ---------------------------*/
@@ -1564,72 +1608,72 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                   // /*spanish*/ Según dicen, el #Ojo de la Verdad en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS_CHEST] = HintText(CustomMessage("They say that a #hidden entrance to a cage# in the well leads to #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß ein #verborgener Eingang zu einem Käfig# im Brunnen zu #[[1]]# führe.",
+                                                                      /*german*/ "Man erzählt sich, daß ein #verborgener Eingang zu einem Käfig# im Brunnen #[[1]]# verstecke.",
                                                                       /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, la #entrada oculta de una celda# del pozo conduce a #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST] = HintText(CustomMessage("They say that a #spider guarding a cage# in the well protects #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß eine #einen Käfig schützende Spinne# im Brunnen #[[1]]# schütze.",
+                                                                               /*german*/ "Man erzählt sich, daß eine #Käfig schützende Spinne# im Brunnen #[[1]]# schütze.",
                                                                                /*french*/ "Selon moi, l'#araignée dans la cage du Puits# protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #araña protegiendo una celda# del pozo guarda #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST] = HintText(CustomMessage("They say that #gruesome debris# in the well hides #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß #grauenvolle Trümmer# im Brunnen #[[1]]# verbergen würde.",
+                                                                                 /*german*/ "Man erzählt sich, daß #grauenvolle Trümmer# im Brunnen #[[1]]# verbergen würden.",
                                                                                  /*french*/ "Selon moi, des #débris dans le Puits# cachent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, unos #horripilantes escombros# del pozo esconden #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST] = HintText(CustomMessage("They say that #Dead Hand's invisible secret# is #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß das #unsichtbare Geheimnis der toten Hand# #[[1]]# sei.",
+                                                                        /*german*/ "Man erzählt sich, daß das #unsichtbare Geheimnis des Hirnsaugers# #[[1]]# |sei|seien|.",
                                                                         /*french*/ "Selon moi, le #trésor invisible du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, el #secreto invisible de la Mano Muerta# esconde #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
+                                                                               /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthülle.",
                                                                                /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
+                                                                              /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthülle.",
                                                                               /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP_CHEST] = HintText(CustomMessage("They say that in the #depths of the well# lies #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß in den #Tiefen des Brunnens# #[[1]]# läge.",
+                                                                  /*german*/ "Man erzählt sich, daß in den #Tiefen des Brunnens# #[[1]]# |läge|lägen|.",
                                                                   /*french*/ "Selon moi, #dans le coeur du Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, en las #profundidades del pozo# yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST] = HintText(CustomMessage("They say that #perilous pits# in the well guard the path to #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß #gefährliche Gruben# im Brunnen den Pfad zu #[[1]]# bewachen würden.",
+                                                                         /*german*/ "Man erzählt sich, daß der von #gefährlichen Gruben# bewachte Pfad im Brunnen #[[1]]# enthielte.",
                                                                          /*french*/ "Selon moi, #trois trous# dans le Puits protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, #peligrosos fosos# del pozo conducen a #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST] = HintText(CustomMessage("They say that #locked in a cage# in the well lies #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #in einem Käfig eingeschlossen# im Brunnen #[[1]]# läge.",
+                                                                        /*german*/ "Man erzählt sich, daß #in einem Käfig eingeschlossen#, im Brunnen #[[1]]# |läge|lägen|.",
                                                                         /*french*/ "Selon moi, #dans une cage# du Puits gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #entre rejas# en el pozo yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_FREESTANDING_KEY] = HintText(CustomMessage("They say that #inside a coffin# hides #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß #in einem Sarg# #[[1]]# verborgen läge.",
+                                                                         /*german*/ "Man erzählt sich, daß #in einem Sarg# #[[1]]# verborgen |sei|seien|.",
                                                                          /*french*/ "Selon moi, dans #un cercueil# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, en el #interior de un ataúd# yace #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST] = HintText(CustomMessage("They say that a #royal melody in the well# uncovers #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthüllen würde.",
+                                                                     /*german*/ "Man erzählt sich, daß eine #königliche Melodie im Brunnen# #[[1]]# enthülle.",
                                                                      /*french*/ "Selon moi, la #mélodie royale révèle dans le Puits# #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, una #melodía real en el pozo# revela #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST] = HintText(CustomMessage("They say that an #army of the dead# in the well guards #[[1]]#.",
-                                                                               /*german*/ "Man erzählt sich, daß eine #Armee der Toten# im Brunnen #[[1]]# bewachen würde.",
+                                                                               /*german*/ "Man erzählt sich, daß eine #Armee der Toten# im Brunnen #[[1]]# bewache.",
                                                                                /*french*/ "Selon moi, l'#armée des morts# dans le Puits protège #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                             // /*spanish*/ Según dicen, un #ejército del más allá# del pozo guarda #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY] = HintText(CustomMessage("They say that #Dead Hand's explosive secret# is #[[1]]#.",
-                                                                                      /*german*/ "Man erzählt sich, daß das #explosive Geheimnis der toten Hand# #[[1]]# sei.",
+                                                                                      /*german*/ "Man erzählt sich, daß das #explosive Geheimnis des Hirnsaugers# #[[1]]# |sei|seien|.",
                                                                                       /*french*/ "Selon moi, le #secret explosif du Poigneur# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, el #explosivo secreto de la Mano Muerta# esconde #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
-                                                                                            /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# zu #[[1]]# führe.",
+                                                                                            /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# #[[1]]# verschleiere.",
                                                                                             /*french*/ "Selon moi, dans un #chemin caché dans le Puits# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                          // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a #[[1]]#.
 
@@ -1639,12 +1683,12 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                        // /*spanish*/ Según dicen, una #Skulltula enjaulada# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM] = HintText(CustomMessage("They say that an #invisible path in the well# leads to #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# zu #[[1]]# führe.",
+                                                                           /*german*/ "Man erzählt sich, daß ein #unsichtbarer Pfad im Brunnen# #[[1]]# verschleiere.",
                                                                            /*french*/ "Selon moi, une #Skulltula dans le chemin invisible au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, un #camino invisible del pozo# conduce a una Skulltula que otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# im Brunnen #[[1]]# bewache.",
+                                                                           /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# innerhalb des Brunnens #[[1]]# bewache.",
                                                                            /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
@@ -1659,34 +1703,38 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                        // /*spanish*/ Según dicen, una #Skulltula junto a los muertos# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM] = HintText(CustomMessage("They say that a #spider locked in a crypt# within the well guards #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# im Brunnen #[[1]]# bewache.",
+                                                                              /*german*/ "Man erzählt sich, daß eine #in einer Krypta eingeschlossene Spinne# innerhalb des Brunnens #[[1]]# bewache.",
                                                                               /*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.
 
     hintTextTable[RHT_POT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("They say that a #pot in Bottom of the Well# contains #[[1]]#.",
-                                                            /*german*/ "",
+                                                            /*german*/ "Man erzählt sich, daß ein #Krug auf dem Grund des Brunnens# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, une #jarre dans le Puits# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_HEART] = HintText(CustomMessage("They say that a #heart within the well# hides #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß ein #Herz innerhalb des Brunnens# #[[1]]# verstecke.",
                                                               /*french*/ "Selon moi, un #coeur dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_RUPEE] = HintText(CustomMessage("They say that a #hidden path through the floor# in the well leads to #[[1]]#.",
-                                                              /*german*/ "",
+                                                              /*german*/ "Man erzählt sich, daß ein #im Boden versteckter Pfad# im Brunnen #[[1]]# enthielte.",
                                                               /*french*/ "Selon moi, un #passage caché sous le sol# dans le puits mène à #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY] = HintText(CustomMessage("They say that an #calling the sun a dead end# within the well reveals #[[1]]#.",
-                                                                       /*german*/ "!!!",
+                                                                       /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer Sackgasse# innerhalb des Brunnens #[[1]]# enthülle.",
                                                                        /*french*/ "Selon moi, #appeler le soleil dans une impasse# à l’intérieur du puits révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY] = HintText(CustomMessage("They say that an #calling the sun in an empty cell# within the well reveals #[[1]]#.",
-                                                                       /*german*/ "!!!",
+                                                                       /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer leeren Zelle# innerhalb des Brunnens #[[1]]# enthülle.",
                                                                        /*french*/ "Selon moi, #appeler le soleil dans une cellule vide# à l’intérieur du puits révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY] = HintText(CustomMessage("They say that an #calling the sun a dead end# within the well reveals #[[1]]#.",
-                                                                       /*german*/ "!!!",
+                                                                       /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer Sackgasse# innerhalb des Brunnens #[[1]]# enthülle.",
                                                                        /*french*/ "Selon moi, #appeler le soleil dans une impasse# à l’intérieur du puits révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_GRASS] = HintText(CustomMessage("They say that some #grass in the Bottom of the Well# hides #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß etwas #Gras auf dem Grund des Brunnens# #[[1]]# verstecke.",
+                                                     /*french*/ "Selon moi, de l'#herbe dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
 
   /*--------------------------
   |        ICE CAVERN        |
@@ -1752,7 +1800,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                              // /*spanish*/ Según dicen, una #Skulltula sobre gélidos vacíos# otorga #[[1]]#.
 
     hintTextTable[RHT_ICE_CAVERN_MQ_GS_ICE_BLOCK] = HintText(CustomMessage("They say that a #web of ice# surrounds a spider with #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß eine #Webe aus Eis# eine Spinne umgebe, welche #[[1]]# besäße.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Weben aus Eis# eine Spinne umgebe, welche #[[1]]# besäße.",
                                                                 /*french*/ "Selon moi, une #Skulltula protégée d'une toile glacée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, una #gélida red# rodea a una Skulltula que otorga #[[1]]#.
 
@@ -1762,19 +1810,19 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                            // /*spanish*/ Según dicen, una #Skulltula tras un ardiente hielo# otorga #[[1]]#.
 
     hintTextTable[RHT_POT_ICE_CAVERN] = HintText(CustomMessage("They say that a #pot in Ice Cavern# contains #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Krug in der Eishöhle# #[[1]]# enthielte.",
                                                     /*french*/ "Selon moi, une #jarre dans la Caverne Polaire# contient #[[1]]#.", { QM_RED, QM_GREEN }));
 
     hintTextTable[RHT_ICE_CAVERN_HEART] = HintText(CustomMessage("They say that atop on a #frozen pillar# lies #[[1]]#.",
-                                                      /*german*/ "",
-                                                      /*french*/ "Selon moi, ", {QM_RED, QM_GREEN}));
+                                                      /*german*/ "Man erzählt sich, daß auf einer #gefrorenen Säule# #[[1]]# |läge|lägen|.",
+                                                      /*french*/ "Selon moi, le dessus d'un #pilier de glace# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ICE_CAVERN_RUPEE] = HintText(CustomMessage("They say that a #rupee in a frozen cavern# hides #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß ein #Rubin in einer gefrorenen Kaverne# #[[1]]# verstecke.",
                                                       /*french*/ "Selon moi, un #rubis dans la Caverne Polaire# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ICE_CAVERN_ENTRANCE_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling the rain near the entrance to a frozen cave# reveals #[[1]]#.",
-                                                              /*german*/ "!!!",
+                                                              /*german*/ "Man erzählt sich, daß das #Anrufen des Regens in der Nähe des Eingangs einer gefrorenen Höhle# #[[1]]# enthülle.",
                                                               /*french*/ "Selon moi, #appeler la pluie près de l’entrée d’une grotte gelée# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #Skulltula tras un ardiente hielo# otorga #[[1]]#.
 
@@ -1792,7 +1840,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                            // /*spanish*/ Según dicen, #cegar un ojo en el Centro de Instrucción Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_STALFOS_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Ground guard #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß #auf veränderlichen Sanden laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
+                                                                          /*german*/ "Man erzählt sich, daß #auf Treibsand laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                           /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
@@ -1807,27 +1855,27 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                               // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                  /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                   /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
-                                                                                   /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                   /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                    /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                 // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                  /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                   /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Ground leads to #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
+                                                                                     /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena #[[1]]# gewähre.",
                                                                                      /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Ground leads to #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
+                                                                                  /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena #[[1]]# gewähre.",
                                                                                   /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
@@ -1837,7 +1885,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                  // /*spanish*/ Según dicen, unos #flamígeros enemigos# del Centro de Instrucción Gerudo guardan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# läge.",
+                                                                                     /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# |läge|lägen|.",
                                                                                      /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
@@ -1852,56 +1900,56 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                               // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß #vor einem Block aus Silber# Diebe #[[1]]# finden könnten.",
+                                                                                     /*german*/ "Man erzählt sich, daß Diebe #vor einem Block aus Silber# #[[1]]# finden könnten.",
                                                                                      /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                    /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
+                                                                                    /*german*/ "Man erzählt sich, daß Diebe durch einen #Kraftakt# #[[1]]# plündern könnten.",
                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
+                                                                                     /*german*/ "Man erzählt sich, daß Diebe durch einen #Kraftakt# #[[1]]# plündern könnten.",
                                                                                      /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                    /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
+                                                                                    /*german*/ "Man erzählt sich, daß Diebe durch einen #Kraftakt# #[[1]]# plündern könnten.",
                                                                                     /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                  // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
+                                                                                     /*german*/ "Man erzählt sich, daß Diebe durch einen #Kraftakt# #[[1]]# plündern könnten.",
                                                                                      /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling the rain near the entrance to the Gerudo Training Grounds# reveals #[[1]]#.",
-                                                                                  /*german*/ "!!!",
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling the rain near the entrance to the Gerudo Training Ground# reveals #[[1]]#.",
+                                                                                  /*german*/ "Man erzählt sich, daß das #Anrufen des Regens in der Nähe des Eingangs der Gerudo-Trainingsarena #[[1]]# enthülle.",
                                                                                   /*french*/ "Selon moi, #appeler la pluie près de l’entrée du Gymnase Gerudo# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_FREESTANDING_KEY] = HintText(CustomMessage("They say that the #Song of Time# in the Gerudo Training Ground leads to #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena zu #[[1]]# führe.",
+                                                                             /*german*/ "Man erzählt sich, daß die #Hymne der Zeit# in der Gerudo-Trainingsarena #[[1]]# gewähre.",
                                                                              /*french*/ "Selon moi, le #chant du temps# révèle dans le Gymnase Gerudo #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, la #Canción del Tiempo# en el Centro de Instrucción Gerudo conduce a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß sich #Diebe auf das Training vorbereiteten# mit #[[1]]#.",
+                                                                                 /*german*/ "Man erzählt sich, daß #Diebe sich auf das Training vorbereiteten# und #[[1]]# ergattern.",
                                                                                  /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST] = HintText(CustomMessage("They say that #thieves prepare for training# with #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß sich #Diebe auf das Training vorbereiteten# mit #[[1]]#.",
+                                                                                /*german*/ "Man erzählt sich, daß #Diebe sich auf das Training vorbereiteten# und #[[1]]# ergattern.",
                                                                                 /*french*/ "Selon moi, dans #l'entrée du Gymnase Gerudo# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, las #bandidas se instruyen# con #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST] = HintText(CustomMessage("They say that #soldiers walking on shifting sands# in the Gerudo Training Ground guard #[[1]]#.",
-                                                                                        /*german*/ "Man erzählt sich, daß #auf veränderlichen Sanden laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
+                                                                                        /*german*/ "Man erzählt sich, daß #auf Treibsand laufende Soldaten# in der Gerudo-Trainingsarena #[[1]]# bewachen würden.",
                                                                                         /*french*/ "Selon moi, les #squelettes# du Gymnase Gerudo protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #soldados en resbaladizas arenas# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that #before a block of silver# thieves can find #[[1]]#.",
-                                                                                        /*german*/ "Man erzählt sich, daß #vor einem Block aus Silber# Diebe #[[1]]# finden könnten.",
+                                                                                        /*german*/ "Man erzählt sich, daß Diebe #vor einem Block aus Silber# #[[1]]# finden könnten.",
                                                                                         /*french*/ "Selon moi, #près d'un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, #ante un plateado bloque# las bandidas hallan #[[1]]#.
 
@@ -1911,7 +1959,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                              // /*spanish*/ Según dicen, las bandidas #ciegan cuatro bustos# para hallar #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST] = HintText(CustomMessage("They say that #engulfed in flame# where thieves train lies #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# läge.",
+                                                                                  /*german*/ "Man erzählt sich, daß #von Flammen umschlungen# wo Diebe trainieren #[[1]]# |läge|lägen|.",
                                                                                   /*french*/ "Selon moi, le #trésor enflammé# du Gymnase Gerudo est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, donde entrenan las bandidas #entre llamas# yace #[[1]]#.
 
@@ -1926,27 +1974,27 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                            // /*spanish*/ Según dicen, #unos escamosos guerreros# del Centro de Instrucción Gerudo protegen #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
-                                                                                        /*german*/ "Man erzählt sich, daß der #Pfad des Feuers# Diebe zu #[[1]]# führe.",
+                                                                                        /*german*/ "Man erzählt sich, daß Diebe den #Pfad des Feuers# beschreiten und #[[1]]# finden würden.",
                                                                                         /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                      // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST] = HintText(CustomMessage("They say that the first prize of #the thieves' training# is #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                     /*german*/ "Man erzählt sich, daß der erste Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                      /*french*/ "Selon moi, le #premier trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, el primer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST] = HintText(CustomMessage("They say that a #path of fire# leads thieves to #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß der #Pfad des Feuers# Diebe zu #[[1]]# führe.",
+                                                                                     /*german*/ "Man erzählt sich, daß Diebe den #Pfad des Feuers# beschreiten und #[[1]]# finden würden.",
                                                                                      /*french*/ "Selon moi, dans le #chemin enflammé# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, un #camino de fuego# conduce a las bandidas a #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST] = HintText(CustomMessage("They say that the third prize of #the thieves' training# is #[[1]]#.",
-                                                                                     /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                     /*german*/ "Man erzählt sich, daß der dritte Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                      /*french*/ "Selon moi, le #troisième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                   // /*spanish*/ Según dicen, el tercer premio de la #instrucción bandida# se trata de #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST] = HintText(CustomMessage("They say that the second prize of #the thieves' training# is #[[1]]#.",
-                                                                                      /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# sei.",
+                                                                                      /*german*/ "Man erzählt sich, daß der zweite Preis des #Diebestrainings# #[[1]]# |sei|seien|.",
                                                                                       /*french*/ "Selon moi, le #deuxième trésor du Gymnase Gerudo# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                    // /*spanish*/ Según dicen, el segundo premio de la #instrucción bandida# se trata de #[[1]]#.
 
@@ -1956,19 +2004,23 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                  // /*spanish*/ Según dicen, el #Ojo de la Verdad# en el Centro de Instrucción Gerudo revela #[[1]]#.
 
     hintTextTable[RHT_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST] = HintText(CustomMessage("They say that a #feat of strength# rewards thieves with #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß ein #Meisterstück der Stärke# Diebe mit #[[1]]# belohnen würde.",
+                                                                                 /*german*/ "Man erzählt sich, daß Diebe durch einen #Kraftakt# #[[1]]# plündern könnten.",
                                                                                  /*french*/ "Selon moi, #derrière un bloc argent# dans le Gymnase Gerudo gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, una #hazaña de fuerza# premia a las bandidas con #[[1]]#.
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_HEART] = HintText(CustomMessage("They say that a watching a #trial with Dinalfos# is #[[1]]#.",
-                                                                   /*german*/ "",
-                                                                   /*french*/ "Selon moi, dans #une épreuve avec un Dinalfos# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_GERUDO_TRAINING_GROUNDS_HEART] = HintText(CustomMessage("They say that a watching a #trial with Dinolfos# is #[[1]]#.",
+                                                                   /*german*/ "Man erzählt sich, daß einer #Prüfung mit Dinodorus# zuzuschauen #[[1]]# enthülle.",
+                                                                   /*french*/ "Selon moi, dans #une épreuve avec un Dinolfos# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_GERUDO_TRAINING_GROUND] = HintText(CustomMessage("They say that a #crate in Gerudo Training Ground# contains #[[1]]#.",
+                                                     /*german*/ "Man erzählt sich, daß eine #Kiste in der Gerudo-Trainingsarena# #[[1]]# enthielte.",
+                                                     /*french*/ "Selon moi, une #caisse dans le Gymnase Gerudo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
   /*--------------------------
   |      GANONS CASTLE       |
   ---------------------------*/
     hintTextTable[RHT_GANONS_TOWER_BOSS_KEY_CHEST] = HintText(CustomMessage("They say that the #Evil King# hoards #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß der #böse König# #[[1]]# horte.",
+                                                                 /*german*/ "Man erzählt sich, daß der #Großmeister des Bösen# #[[1]]# horte.",
                                                                  /*french*/ "Selon moi, le #Roi du Mal# possède #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, el #Rey del Mal# acapara #[[1]]#.
 
@@ -1988,7 +2040,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                         // /*spanish*/ Según dicen, la #prueba del mar# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST] = HintText(CustomMessage("They say that #music in the test of darkness# unveils #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Dunkelheit# #[[1]]# enthüllen würde.",
+                                                                            /*german*/ "Man erzählt sich, daß #Musik in der Prüfung der Dunkelheit# #[[1]]# enthüllen würde.",
                                                                             /*french*/ "Selon moi, la #musique dans l'épreuve des ténèbres# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                          // /*spanish*/ Según dicen, la #música en la prueba de la oscuridad# revela #[[1]]#.
 
@@ -2008,51 +2060,51 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                              // /*spanish*/ Según dicen, la #prueba de las arenas# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                 /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                  /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                  /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                   /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                 /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                  /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                               // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST] = HintText(CustomMessage("They say that the #test of radiance# holds #[[1]]#.",
-                                                                                       /*german*/ "Man erzählt sich, daß die #Prüfung des Glanzes# #[[1]]# enthielte.",
+                                                                                       /*german*/ "Man erzählt sich, daß die #Prüfung der Strahlen# #[[1]]# enthielte.",
                                                                                        /*french*/ "Selon moi, l'#épreuve du ciel# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                                     // /*spanish*/ Según dicen, la #prueba del resplandor# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Glanzes# #[[1]]# enthüllen würde.",
+                                                                             /*german*/ "Man erzählt sich, daß #Musik in der Prüfung der Strahlen# #[[1]]# enthüllen würde.",
                                                                              /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun for a sentry in the test of the sands# reveals #[[1]]#.",
-                                                                          /*german*/ "!!!",
+                                                                          /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne, für einen Wachposten in der Prüfung der Sande#, #[[1]]# enthülle.",
                                                                           /*french*/ "Selon moi, #appeler le soleil pour une sentinelle dans l’épreuve des sables# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GANONS_CASTLE_SCRUBS_FAIRY] = HintText(CustomMessage("They say that within a #sanctuary before the final trial# rests #[[1]]#.",
-                                                                /*german*/ "!!!",
+                                                                /*german*/ "Man erzählt sich, daß innerhalb eines #Heiligtums vor der finalen Prüfung# #[[1]]# |ruhe|ruhen|.",
                                                                 /*french*/ "Selon moi, #dans un sanctuaire avant l’épreuve finale# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_WATER_TRIAL_CHEST] = HintText(CustomMessage("They say that the #test of the seas# holds #[[1]]#.",
@@ -2071,7 +2123,7 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                         // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST] = HintText(CustomMessage("They say that #music in the test of radiance# reveals #[[1]]#.",
-                                                                                /*german*/ "Man erzählt sich, daß #Musik in der Prüfung des Glanzes# #[[1]]# enthüllen würde.",
+                                                                                /*german*/ "Man erzählt sich, daß #Musik in der Prüfung der Strahlen# #[[1]]# enthüllen würde.",
                                                                                 /*french*/ "Selon moi, la #musique dans l'épreuve du ciel# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                              // /*spanish*/ Según dicen, la #música en la prueba del resplandor# revela #[[1]]#.
 
@@ -2121,57 +2173,58 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
                                                                                  // /*spanish*/ Según dicen, la #prueba de la naturaleza# brinda #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                          /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                           /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                           /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                            /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                    /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                     /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                   /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                    /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                       /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                       /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                        /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                             /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                             /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                              /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                           // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                        /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                         /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                              /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                              /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                               /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                            // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß #Dekus in Ganons Schloß# #[[1]]# verkaufen würden.",
+                                                                      /*german*/ "Man erzählt sich, daß #Deku-Händler in Ganons Schloß# #[[1]]# verkaufen würden.",
                                                                       /*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
 
     hintTextTable[RHT_POT_GANONS_CASTLE] = HintText(CustomMessage("They say that a #pot in Ganon's Castle# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug in Ganons Schloß# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Château de Ganon# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GANONS_CASTLE_HEART] = HintText(CustomMessage("They say that a #heart in Ganon's Castle# hides #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein #Herz in Ganons Schloß# #[[1]]# verstecke.",
                                                          /*french*/ "Selon moi, un #coeur dans le Château de Ganon# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    // clang-format on
 }
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
index a6c6b99f39..a8afd7cb2b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
@@ -4,14 +4,15 @@
 
 namespace Rando {
 void StaticData::HintTable_Init_Exclude_Overworld() {
+    // clang-format off
 
-   hintTextTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText(CustomMessage("They say that the #hidden treasure of the Kokiri# is #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß der #versteckte Schatz der Kokiri# #[[1]]# sei.",
+    hintTextTable[RHT_KF_KOKIRI_SWORD_CHEST] = HintText(CustomMessage("They say that the #hidden treasure of the Kokiri# is #[[1]]#.",
+                                                           /*german*/ "Man erzählt sich, daß der #versteckte Schatz der Kokiri# #[[1]]# |sei|seien|.",
                                                            /*french*/ "Selon moi, le #trésor des Kokiri# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, el #tesoro oculto de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_TOP_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
+                                                             /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# |sei|seien|.",
                                                              /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                           {}, {
@@ -21,7 +22,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                            // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_TOP_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
+                                                              /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# |sei|seien|.",
                                                               /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                            {}, {
@@ -31,7 +32,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                             // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_BOTTOM_LEFT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
+                                                                /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# |sei|seien|.",
                                                                 /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                              // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                              {}, {
@@ -41,7 +42,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                               // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_KF_MIDOS_BOTTOM_RIGHT_CHEST] = HintText(CustomMessage("They say that #inside Mido's house# is #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# sei.",
+                                                                 /*german*/ "Man erzählt sich, daß #in Midos Haus# #[[1]]# |sei|seien|.",
                                                                  /*french*/ "Selon moi, #dans la maison de Mido# gît #[[1]]#.", {QM_RED, QM_GREEN}),
                                                               // /*spanish*/ Según dicen, en la #casa de Mido# yace #[[1]]#.
                                                               {}, {
@@ -51,22 +52,22 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                                // /*spanish*/ Según dicen, el #líder de los Kokiri# esconde #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE_CHEST] = HintText(CustomMessage("They say that the #treasure of a fallen soldier# is #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß der #Schatz eines gefallenen Soldaten# #[[1]]# sei.",
+                                                                  /*german*/ "Man erzählt sich, daß der #Schatz eines gefallenen Soldaten# #[[1]]# |sei|seien|.",
                                                                   /*french*/ "Selon moi, le #trésor du soldat mort# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, el #tesoro de un soldado caído# esconde #[[1]]#.
 
     hintTextTable[RHT_DMT_CHEST] = HintText(CustomMessage("They say that hidden behind a wall on a #mountain trail# is #[[1]]#.",
-                                               /*german*/ "Man erzählt sich, daß hinter einer Wand des #Gebirgspfads# #[[1]]# sei.",
+                                               /*german*/ "Man erzählt sich, daß hinter einer Wand eines #Gebirgspfades# #[[1]]# |sei|seien|.",
                                                /*french*/ "Selon moi, derrière une façade du #chemin montagneux# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                             // /*spanish*/ Según dicen, tras una pared del #sendero de la montaña# yace #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_RIGHT_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß in #Goronia# Explosionen #[[1]]# freischalten würden.",
+                                                         /*german*/ "Man erzählt sich, daß Explosionen in #Goronia# #[[1]]# freilegen würden.",
                                                          /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
 
     hintTextTable[RHT_GC_MAZE_CENTER_CHEST] = HintText(CustomMessage("They say that in #Goron City# explosives unlock #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß in #Goronia# Explosionen #[[1]]# freischalten würden.",
+                                                          /*german*/ "Man erzählt sich, daß Explosionen in #Goronia# #[[1]]# freilegen würden.",
                                                           /*french*/ "Selon moi, des explosions dans le #village Goron# révèlent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en la #Ciudad Goron# unos explosivos desbloquean #[[1]]#.
 
@@ -76,7 +77,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                            // /*spanish*/ Según dicen, las #llamas tras una una cascada# revelan #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_HOOKSHOT_CHEST] = HintText(CustomMessage("They say that #dead Dampé's first prize# is #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß #Igors erster Preis# #[[1]]# sei.",
+                                                              /*german*/ "Man erzählt sich, daß #Boris' erster Preis# #[[1]]# |sei|seien|.",
                                                               /*french*/ "Selon moi, la #première course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                            // /*spanish*/ Según dicen, el primer premio de #la carrera de Dampé# se trata de #[[1]]#.
                                                            {}, {
@@ -86,136 +87,136 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                             // /*spanish*/ Según dicen, un cofre custodiado por un #espectro veloz# contiene #[[1]]#.
 
     hintTextTable[RHT_GF_CHEST] = HintText(CustomMessage("They say that on a #rooftop in the desert# lies #[[1]]#.",
-                                              /*german*/ "Man erzählt sich, daß auf einem #Dach in der Wüste# #[[1]]# läge.",
+                                              /*german*/ "Man erzählt sich, daß auf einem #Dach in der Wüste# #[[1]]# |läge|lägen|.",
                                               /*french*/ "Selon moi, sur un #toit du désert# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                            // /*spanish*/ Según dicen, en una #azotea del desierto# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_REDEAD_GROTTO_CHEST] = HintText(CustomMessage("They say that #zombies beneath the earth# guard #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß die #Untoten unter der Erde# #[[1]]# bewachen würden.",
+                                                             /*german*/ "Man erzählt sich, daß #Untote unter der Erde# #[[1]]# bewachen würden.",
                                                              /*french*/ "Selon moi, les #revenants sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, unos #zombis subterráneos# esconden #[[1]]#.
 
     hintTextTable[RHT_SFM_WOLFOS_GROTTO_CHEST] = HintText(CustomMessage("They say that #wolves beneath the earth# guard #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß die #Wölfe unter der Erde# #[[1]]# bewachen würden.",
+                                                             /*german*/ "Man erzählt sich, daß #Wölfe unter der Erde# #[[1]]# bewachen würden.",
                                                              /*french*/ "Selon moi, les #loups sous terre# protègent #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, unos #lobos subterráneos# esconden #[[1]]#.
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a field near a drawbridge# holds #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Loch in einem Feld nahe der Zugbrücke# #[[1]]# enthielte.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Erdloch nahe der Zugbrücke in einer Steppe# #[[1]]# enthielte.",
                                                                  /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a field near a drawbridge# holds #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Feld nahe der Zugbrücke# #[[1]]# enthielte.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch nahe der Zugbrücke einer Steppe# #[[1]]# enthielte.",
                                                                 /*french*/ "Selon moi, la #grotte près d'un pont# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, bajo el #hoyo de una llanura cercano a un puente# yace #[[1]]#.
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole amongst trees in a field# holds #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Loch inmitten der Bäume in einem Feld# #[[1]]# enthielte.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Erdloch inmitten von Bäumen einer Steppe# #[[1]]# enthielte.",
                                                                /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole amongst trees in a field# holds #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch inmitten von Bäumen in einem Feld# #[[1]]# enthielte.",
+                                                              /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch inmitten von Bäumen einer Steppe# #[[1]]# enthielte.",
                                                               /*french*/ "Selon moi, la #grotte près des arbres# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, bajo el #hoyo de una llanura rodeado de árboles# yace #[[1]]#.
 
     hintTextTable[RHT_HF_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a field# holds #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß ein #offenes Loch in einem Feld# #[[1]]# enthielte.",
+                                                          /*german*/ "Man erzählt sich, daß ein #offenes Erdloch einer Steppe# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
 
     hintTextTable[RHT_HF_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a field# holds #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem offenen Loch auf einem Feld# #[[1]]# enthielte.",
+                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem offenen Erdloch einer Steppe# #[[1]]# enthielte.",
                                                          /*french*/ "Selon moi, la #grotte dans les plaines# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, bajo el #hoyo descubierto de una llanura# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that an #open hole in a town# holds #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß ein #offenes Loch in einer Stadt# #[[1]]# enthielte.",
+                                                           /*german*/ "Man erzählt sich, daß ein #offenes Erdloch eines Dorfes# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in an open hole in a town# holds #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einer Stadt# #[[1]]# enthielte.",
+                                                          /*german*/ "Man erzählt sich, daß ein #Fisch in einem offenen Erdloch eines Dorfes# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte dans le village# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo el #hoyo descubierto de un pueblo# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole along a river# holds #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß ein #Loch entlang eines Flusses# #[[1]]# enthielte.",
+                                                          /*german*/ "Man erzählt sich, daß ein #Erdloch nahe eines Flußes# #[[1]]# enthielte.",
                                                           /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole along a river# holds #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch entlang eines Flusses# #[[1]]# enthielte.",
+                                                         /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch nahe eines Flußes# #[[1]]# enthielte.",
                                                          /*french*/ "Selon moi, la #grotte près du fleuve# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, bajo un #hoyo junto a un río# yace #[[1]]#.
 
     hintTextTable[RHT_KF_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a forest village# holds #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß ein #Loch in einem Dorf des Waldes# #[[1]]# enthielte.",
+                                                            /*german*/ "Man erzählt sich, daß ein #Erdloch eines Dorfes im Wald# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
 
     hintTextTable[RHT_KF_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a forest village# holds #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Dorf des Waldes# #[[1]]# enthielte.",
+                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch eines Dorfes im Wald# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte inondée de pluie dans le Village Kokiri# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo de una tribu del bosque# yace #[[1]]#.
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a wooded maze# holds #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß ein #Loch in einem hölzernen Labyrinth# #[[1]]# enthielte.",
+                                                                    /*german*/ "Man erzählt sich, daß ein #Erdloch eines hölzernen Labyrinths# #[[1]]# enthielte.",
                                                                     /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a wooded maze# holds #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem hölzernen Labyrinth# #[[1]]# enthielte.",
+                                                                   /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch eines hölzernen Labyrinths# #[[1]]# enthielte.",
                                                                    /*french*/ "Selon moi, la #grotte dans le labyrinthe sylvestre# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, bajo un #hoyo de un laberinto forestal# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_CHEST] = HintText(CustomMessage("They say that #hole flooded with rain on a mountain# holds #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß ein #durch Regen geflutetes Loch auf einem Berg# #[[1]]# enthielte.",
+                                                             /*german*/ "Man erzählt sich, daß ein #durch Regen geflutetes Erdloch eines Berges# #[[1]]# enthielte.",
                                                              /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_FISH] = HintText(CustomMessage("They say that #fish in a hole flooded with rain on a mountain# holds #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß ein #Fisch in einem durch Regen geflutetes Loch auf einem Berg# #[[1]]# enthielte.",
+                                                            /*german*/ "Man erzählt sich, daß ein #Fisch in einem durch Regen geflutetem Erdloch eines Berges# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte inondée de pluie sur la montagne# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo un #hoyo de una montaña inundado de lluvia# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_CHEST] = HintText(CustomMessage("They say that a #hole in a volcano# holds #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß ein #Loch in einem Vulkan# #[[1]]# enthielte.",
+                                                            /*german*/ "Man erzählt sich, daß ein #Erdloch eines Vulkans# #[[1]]# enthielte.",
                                                             /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_FISH] = HintText(CustomMessage("They say that a #fish in a hole in a volcano# holds #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Loch in einem Vulkan# #[[1]]# enthielte.",
+                                                           /*german*/ "Man erzählt sich, daß ein #Fisch in einem Erdloch eines Vulkans# #[[1]]# enthielte.",
                                                            /*french*/ "Selon moi, la #grotte dans le volcan# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, bajo el #hoyo de un volcán# yace #[[1]]#.
 
     hintTextTable[RHT_TOT_MASTER_SWORD] = HintText(CustomMessage("They say that a #pedestal in a temple# holds #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß sich auf einem #Podest in einem Tempel# #[[1]]# befände.",
+                                                      /*german*/ "Man erzählt sich, daß sich auf einem #Podest eines Tempels# #[[1]]# |befände|befänden|.",
                                                       /*french*/ "Selon moi, un #piédestal dans un temple# contient #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, un #pedestal en un templo# sostiene #[[1]]#.
 
     hintTextTable[RHT_TOT_LIGHT_ARROWS_CUTSCENE] = HintText(CustomMessage("They say that the #final gift of a princess# is #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß das #letzte Geschenk einer Prinzessin# #[[1]]# sei.",
+                                                               /*german*/ "Man erzählt sich, daß das #letzte Geschenk einer Prinzessin# #[[1]]# |sei|seien|.",
                                                                /*french*/ "Selon moi, le #cadeau d'adieu de la princesse# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, el #obsequio final de la princesa# se trata de #[[1]]#.
 
     hintTextTable[RHT_LW_GIFT_FROM_SARIA] = HintText(CustomMessage("They say that #Saria's Gift# is #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß #Salias Geschenk# #[[1]]# sei.",
+                                                        /*german*/ "Man erzählt sich, daß #Salias Geschenk# #[[1]]# |sei|seien|.",
                                                         /*french*/ "Selon moi, le #cadeau de Saria# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/ Según dicen, el #regalo de Saria# se trata de #[[1]]#.
                                                      {}, {
                                                      CustomMessage("They say that a #potato hoarder# holds #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß ein #Kartoffelhortender# #[[1]]# besäße.",
+                                                         /*german*/ "Man erzählt sich, daß ein #Kartoffelhorter# #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, le #panini mélodieux# est en fait #[[1]]#.", {QM_RED, QM_GREEN}),
                                                       // /*spanish*/ Según dicen, cierta #jovencita verde# concede #[[1]]#.
                                                      CustomMessage("They say that a rooty tooty #flutey cutey# gifts #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß die #musikalische Kartoffel# #[[1]]# schenke.",
+                                                         /*german*/ "Man erzählt sich, daß die #musikalische Kartoffel# #[[1]]# |sei|seien|.",
                                                          /*french*/ "Selon moi, la #patate musicale# est en fait #[[1]]#.", {QM_RED, QM_GREEN})});
                                                       // /*spanish*/ Según dicen, una #gran amiga# concede #[[1]]#.
 
     hintTextTable[RHT_ZF_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of winds# holds #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß die #Fee der Winde# #[[1]]# besäße.",
+                                                           /*german*/ "Man erzählt sich, daß die #Fee des Sturmes# #[[1]]# besäße.",
                                                            /*french*/ "Selon moi, la #fée du vent# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, el #hada del viento# brinda #[[1]]#.
 
@@ -230,17 +231,17 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                               // /*spanish*/ Según dicen, el #hada del amor# brinda #[[1]]#.
 
     hintTextTable[RHT_DMT_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß eine #magische Fee# #[[1]]# schenke.",
+                                                            /*german*/ "Man erzählt sich, daß die #Fee der Fähigkeiten# #[[1]]# schenke.",
                                                             /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
 
     hintTextTable[RHT_DMC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that a #magical fairy# gifts #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß eine #magische Fee# #[[1]]# schenke.",
+                                                            /*german*/ "Man erzählt sich, daß die #Fee der Weisheit# #[[1]]# schenke.",
                                                             /*french*/ "Selon moi, la #fée de la magie# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, un #hada mágica# brinda #[[1]]#.
 
     hintTextTable[RHT_OGC_GREAT_FAIRY_REWARD] = HintText(CustomMessage("They say that the #fairy of strength# holds #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß die #Fee der Stärke# #[[1]]# besäße.",
+                                                            /*german*/ "Man erzählt sich, daß die #Fee des Mutes# #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, la #fée de la force# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, el #hada de la fuerza# brinda #[[1]]#.
 
@@ -250,7 +251,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                  // /*spanish*/ Según dicen, en el #jardín del castillo Impa enseña# #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_MALON] = HintText(CustomMessage("They say that #a farm girl# sings #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß ein #Mädchen des Landes# #[[1]]# singe.",
+                                                     /*german*/ "Man erzählt sich, daß ein #Mädchen vom Lande# #[[1]]# singe.",
                                                      /*french*/ "Selon moi, la #fillette de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #chica rupestre# canta #[[1]]#.
 
@@ -260,17 +261,17 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                   // /*spanish*/ Según dicen, al #fondo del bosque# Saria enseña #[[1]]#.
 
     hintTextTable[RHT_SONG_FROM_WINDMILL] = HintText(CustomMessage("They say that a man #in a windmill# is obsessed with #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß ein Mann #in einer Windmühle# von #[[1]]# besessen sei.",
+                                                        /*german*/ "Man erzählt sich, daß ein besessener Mann #in einer Windmühle# #[[1]]# lehre.",
                                                         /*french*/ "Selon moi, l'#homme du moulin# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, el #hombre del molino# está obsesionado con #[[1]]#.
 
     hintTextTable[RHT_HC_MALON_EGG] = HintText(CustomMessage("They say that a #girl looking for her father# gives #[[1]]#.",
-                                                  /*german*/ "Man erzählt sich, daß ein #nach ihrem Vater suchenden Mädchen# #[[1]]# gäbe.",
+                                                  /*german*/ "Man erzählt sich, daß ein #nach ihrem Vater suchendes Mädchen# #[[1]]# gäbe.",
                                                   /*french*/ "Selon moi, la #fillette qui cherche son père# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, una #chica en busca de su padre# otorga #[[1]]#.
 
     hintTextTable[RHT_HC_ZELDAS_LETTER] = HintText(CustomMessage("They say that a #princess in a castle# gifts #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß eine #Prinzessin in einem Schloß# #[[1]]# schenke.",
+                                                      /*german*/ "Man erzählt sich, daß eine #Prinzessin eines Schloßes# #[[1]]# schenke.",
                                                       /*french*/ "Selon moi, la #princesse dans le château# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, la #princesa de un castillo# otorga #[[1]]#.
 
@@ -285,7 +286,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                       // /*spanish*/ Según dicen, un #mal modelo de negocio# premia con #[[1]]#.
 
     hintTextTable[RHT_LH_CHILD_FISHING] = HintText(CustomMessage("They say that #fishing in youth# bestows #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß das #Fischen in der Jugend# #[[1]]# verleihe.",
+                                                      /*german*/ "Man erzählt sich, daß das #Fischen der Jugend# #[[1]]# verleihe.",
                                                       /*french*/ "Selon moi, #pêcher dans sa jeunesse# promet #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, #pescar en la juventud# conduce a #[[1]]#.
 
@@ -294,7 +295,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                   /*french*/ "Selon moi, #aller à l'étang# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_HYRULE_LOACH] = HintText(CustomMessage("They say that #fishing the hyrule loach# will give you #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß das #Fischen der hylianischen Schmerle# #[[1]]# einbrächte.",
+                                                     /*german*/ "Man erzählt sich, daß das #Fischen der hylianischen Forelle# #[[1]]# einbrächte.",
                                                      /*french*/ "Selon moi, #pêcher le brochet Hylien# vous donnera #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/ Según dicen, si #pescas a la Locha de Hyrule# encontrarás #[[1]]#.
                                                   {}, {
@@ -304,12 +305,12 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                    // /*spanish*/ Según dicen, #pescar a la leyenda# conduce a #[[1]]#.
 
     hintTextTable[RHT_LH_ADULT_FISHING] = HintText(CustomMessage("They say that #fishing in maturity# bestows #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß das #Fischen im Alter# #[[1]]# verleihe.",
+                                                      /*german*/ "Man erzählt sich, daß das #Fischen des Alters# #[[1]]# verleihe.",
                                                       /*french*/ "Selon moi, #pêcher dans sa maturité# promet #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, #pescar en la madurez# conduce a #[[1]]#.
 
     hintTextTable[RHT_LH_LAB_DIVE] = HintText(CustomMessage("They say that a #diving experiment# is rewarded with #[[1]]#.",
-                                                 /*german*/ "Man erzählt sich, daß ein #Tauchexperiment# mit #[[1]]# belohnt würde.",
+                                                 /*german*/ "Man erzählt sich, daß ein #Tauchexperiment# #[[1]]# einbrächte.",
                                                  /*french*/ "Selon moi, l'#expérience de plongée# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                               // /*spanish*/ Según dicen, #bucear para un experimento# se premia con #[[1]]#.
     // RANDOTODO: needs translation
@@ -318,29 +319,29 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                              /*french*/ "Selon moi, #[[1]]#.", {QM_RED, QM_GREEN}));
                                           // /*spanish*/ Según dicen, #[[1]]#.
 
- 
+
     hintTextTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText(CustomMessage("They say that #reassuring a young Goron# is rewarded with #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß das #Beruhigen eines jungen Goronen# mit #[[1]]# belohnt würde.",
+                                                               /*german*/ "Man erzählt sich, daß das #Beruhigen eines jungen Goronen# #[[1]]# einbrächte.",
                                                                /*french*/ "Selon moi, #rassurer un jeune Goron# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, #calmar a un joven Goron# otorga #[[1]]#.
                                                             {}, {
                                                             CustomMessage("They say that #comforting yourself# provides #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß die #Ermutigung von einem Selbst# #[[1]]# einbrächte.",
+                                                                /*german*/ "Man erzählt sich, daß #sich selbst zu trösten# #[[1]]# einbrächte.",
                                                                 /*french*/ "Selon moi, se #réconforter soi-même# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                              // /*spanish*/ Según dicen, #confrontarte a ti mismo# otorga #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE] = HintText(CustomMessage("They say that the #first explosive prize# is #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß der #erste explosive Preis# #[[1]]# sei.",
+                                                                        /*german*/ "Man erzählt sich, daß der #erste explosive Preis# #[[1]]# |sei|seien|.",
                                                                         /*french*/ "Selon moi, le #premier prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, el #primer premio explosivo# se trata de #[[1]]#.
 
     hintTextTable[RHT_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE] = HintText(CustomMessage("They say that the #second explosive prize# is #[[1]]#.",
-                                                                         /*german*/ "Man erzählt sich, daß der #zweite explosive Preis# #[[1]]# sei.",
+                                                                         /*german*/ "Man erzählt sich, daß der #zweite explosive Preis# #[[1]]# |sei|seien|.",
                                                                          /*french*/ "Selon moi, le #deuxième prix explosif# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                       // /*spanish*/ Según dicen, el #segundo premio explosivo# se trata de #[[1]]#.
 
     hintTextTable[RHT_MARKET_LOST_DOG] = HintText(CustomMessage("They say that #rescuing Richard the Dog# is rewarded with #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß die #Rettung des Hundes Richard# mit #[[1]]# belohnt würde.",
+                                                     /*german*/ "Man erzählt sich, daß die #Rettung des Hundes Richard# #[[1]]# einbrächte.",
                                                      /*french*/ "Selon moi, #retrouver Kiki le chien# promet #[[1]]#.", {QM_RED, QM_GREEN}),
                                                   // /*spanish*/ Según dicen, #rescatar al perrito Ricardo# conduce a #[[1]]#.
                                                   {}, {
@@ -350,12 +351,12 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                    // /*spanish*/ Según dicen, los #amantes caninos# encontrarán #[[1]]#.
 
     hintTextTable[RHT_LW_OCARINA_MEMORY_GAME] = HintText(CustomMessage("They say that #playing an Ocarina in Lost Woods# is rewarded with #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß das #Spielen der Okarina in den verlorenen Wäldern# mit #[[1]]# belohnt würde.",
+                                                            /*german*/ "Man erzählt sich, daß das #Spielen der Okarina in den verlorenen Wäldern# #[[1]]# gewähre.",
                                                             /*french*/ "Selon moi, #jouer l'ocarina dans les Bois Perdus# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, #tocar la ocarina en el Bosque Perdido# otorga #[[1]]#.
                                                          {}, {
                                                          CustomMessage("They say that the prize for a #game of Simon Says# is #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß der Preis für eine Partie #Simon sagt# #[[1]]# sei.",
+                                                             /*german*/ "Man erzählt sich, daß der Preis für eine Partie #Simon sagt# #[[1]]# |sei|seien|.",
                                                              /*french*/ "Selon moi, la #récompense de Jean Dit# est #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, #repetir ciertas melodías# otorga #[[1]]#.
                                                          CustomMessage("They say that a #child sing-a-long# holds #[[1]]#.",
@@ -364,12 +365,12 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, #tocar junto a otros# otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_10_GOLD_SKULLTULA_REWARD] = HintText(CustomMessage("They say that slaying #10 Gold Skulltulas# reveals #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß das Besiegen von #10 Goldenen Skulltulas# #[[1]]# enthüllen würde.",
+                                                                  /*german*/ "Man erzählt sich, daß das Vernichten von #10 Goldenen Skulltulas# #[[1]]# enthülle.",
                                                                   /*french*/ "Selon moi, détruire #10 Skulltulas d'or# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                // /*spanish*/ Según dicen, #exterminar 10 skulltulas doradas# revela #[[1]]#.
                                                                {}, {
                                                                CustomMessage("They say that #10 bug badges# rewards #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #10 Käferabzeichen# mit #[[1]]# belohnt würde.",
+                                                                   /*german*/ "Man erzählt sich, daß die Belohnung für #10 Insektenplaketten# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #10 écussons# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, #10 medallas de insectos# otorgan #[[1]]#.
                                                                CustomMessage("They say that #10 spider souls# yields #[[1]]#.",
@@ -377,7 +378,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                                    /*french*/ "Selon moi, #10 âmes# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                 // /*spanish*/ Según dicen, #10 almas de araña# otorgan #[[1]]#.
                                                                CustomMessage("They say that #10 auriferous arachnids# lead to #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß #10 goldhaltige Arachniden# zu #[[1]]# führen würden.",
+                                                                   /*german*/ "Man erzählt sich, daß #10 goldhaltige Arachniden# #[[1]]# gewähren.",
                                                                    /*french*/ "Selon moi, #10 arachnides aurifères# donnent #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                 // /*spanish*/ Según dicen, #10 arácnidos auríferos# otorgan #[[1]]#.
 
@@ -387,7 +388,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                   // /*spanish*/ Según dicen, #alguien sobre un tejado# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_MAGIC_BEAN_SALESMAN] = HintText(CustomMessage("They say that a #bean seller# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß ein #Bohnenverkäufer# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß ein #Erbsenverkäufer# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, le #marchand de haricots magiques# vend en fait #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, el #vendedor de judías# ofrece #[[1]]#.
                                                          {}, {
@@ -402,7 +403,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                        // /*spanish*/ Según dicen, las #ancas bajo la tormenta# otorgan #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_ZELDAS_LULLABY] = HintText(CustomMessage("They say that after hearing #Zelda's Lullaby, the frogs# gift #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Zeldas Wiegenlied# #[[1]]# schenken würden.",
+                                                             /*german*/ "Man erzählt sich, daß #Frösche die Zeldas Wiegenlied# hören #[[1]]# schenken würden.",
                                                              /*french*/ "Selon moi, à l'écoute de #la berceuse de Zelda, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                           // /*spanish*/ Según dicen, después de escuchar #la Nana de Zelda, las ranas# regalan #[[1]]#.
                                                           {}, {
@@ -416,7 +417,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                            // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la izquierda#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_EPONAS_SONG] = HintText(CustomMessage("They say that after hearing #Epona's Song, the frogs# gift #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Eponas Lied# #[[1]]# schenken würden.",
+                                                          /*german*/ "Man erzählt sich, daß #Frösche die Eponas Lied# hören #[[1]]# schenken würden.",
                                                           /*french*/ "Selon moi, à l'écoute du #chant d'Epona, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                        // /*spanish*/ Según dicen, después de escuchar #la Canción de Epona, las ranas# regalan #[[1]]#.
                                                        {}, {
@@ -430,7 +431,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                         // /*spanish*/ Según dicen, el #Sapo Tenore al fondo, a la derecha#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SARIAS_SONG] = HintText(CustomMessage("They say that after hearing #Saria's Song, the frogs# gift #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören von Salias Lied# #[[1]]# schenken würden.",
+                                                          /*german*/ "Man erzählt sich, daß #Frösche die Salias Lied# hören #[[1]]# schenken würden.",
                                                           /*french*/ "Selon moi, à l'écoute du #chant de Saria, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                        // /*spanish*/ Según dicen, después de escuchar #la Canción de Saria, las ranas# regalan #[[1]]#.
                                                        {}, {
@@ -444,7 +445,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                         // /*spanish*/ Según dicen, el #Sapo Tenore en el centro# regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SUNS_SONG] = HintText(CustomMessage("They say that after hearing #the Sun's Song, the frogs# gift #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören der Hymne der Sonne# #[[1]]# schenken würden.",
+                                                        /*german*/ "Man erzählt sich, daß #Frösche die die Hymne der Sonne# hören #[[1]]# schenken würden.",
                                                         /*french*/ "Selon moi, à l'écoute du #chant du soleil, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                      // /*spanish*/ Según dicen, después de escuchar #la Canción del Sol, las ranas# regalan #[[1]]#.
                                                      {}, {
@@ -458,7 +459,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                       // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la izquierda#, regala #[[1]]#.
 
     hintTextTable[RHT_ZR_FROGS_SONG_OF_TIME] = HintText(CustomMessage("They say that after hearing #the Song of Time, the frogs# gift #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß die #Frösche nach dem Hören der Hymne der Zeit# #[[1]]# schenken würden.",
+                                                           /*german*/ "Man erzählt sich, daß #Frösche die die Hymne der Zeit# hören #[[1]]# schenken würden.",
                                                            /*french*/ "Selon moi, à l'écoute du #chant du temps, les grenouilles# donnent #[[1]]#.", {QM_RED, QM_GREEN}),
                                                         // /*spanish*/ Según dicen, después de escuchar #la Canción del tiempo, las ranas# regalan #[[1]]#.
                                                         {}, {
@@ -472,17 +473,17 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                          // /*spanish*/ Según dicen, el #Sapo Tenore al frente, a la derecha#, regala #[[1]]#.
 
     hintTextTable[RHT_GF_HBA_1000_POINTS] = HintText(CustomMessage("They say that scoring 1000 in #horseback archery# grants #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1000 Punkten beim #Pferdebogenschießen# #[[1]]# einbrächte.",
+                                                        /*german*/ "Man erzählt sich, daß das Erzielen von 1.000 Punkten beim #Bogenschießen zu Pferde# #[[1]]# gewähre.",
                                                         /*french*/ "Selon moi, obtenir 1000 points dans l'#archerie équestre# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, conseguir 1000 puntos en el #tiro con arco a caballo# premia #[[1]]#.
 
     hintTextTable[RHT_MARKET_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in youth# grants #[[1]]#.",
-                                                                    /*german*/ "Man erzählt sich, daß das #Schießen in der Jugend# #[[1]]# einbrächte.",
+                                                                    /*german*/ "Man erzählt sich, daß das #Schießen der Jugend# #[[1]]# einbrächte.",
                                                                     /*french*/ "Selon moi, #faire du tir dans sa jeunesse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                  // /*spanish*/ Según dicen, #disparar en la juventud# otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_SHOOTING_GALLERY_REWARD] = HintText(CustomMessage("They say that #shooting in maturity# grants #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß das #Schießen im Alter# #[[1]]# einbrächte.",
+                                                                 /*german*/ "Man erzählt sich, daß das #Schießen des Alters# #[[1]]# einbrächte.",
                                                                  /*french*/ "Selon moi, #faire du tir dans sa maturité# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #disparar en la madurez# otorga #[[1]]#.
 
@@ -497,27 +498,27 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                     // /*spanish*/ Según dicen, una #cuidadora de emplumados# le ofrece a los mayores #[[1]]#.
 
     hintTextTable[RHT_LLR_TALONS_CHICKENS] = HintText(CustomMessage("They say that #finding Super Cuccos# is rewarded with #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß das #Finden von Superhühnchen# mit #[[1]]# belohnt würde.",
+                                                         /*german*/ "Man erzählt sich, daß das #Finden von Super-Hühnern# #[[1]]# einbrächte.",
                                                          /*french*/ "Selon moi, #trouver des Super Cocottes# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, #hallar los supercucos# conduce a #[[1]]#.
 
     hintTextTable[RHT_GC_ROLLING_GORON_AS_CHILD] = HintText(CustomMessage("They say that the prize offered by a #large rolling Goron# is #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der angebotene Preis eines #großen rollenden Goronen# #[[1]]# sei.",
+                                                               /*german*/ "Man erzählt sich, daß der angebotene Preis eines #großen rollenden Goronen# #[[1]]# |sei|seien|.",
                                                                /*french*/ "Selon moi, la récompense d'un #gros Goron roulant# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #gran Goron rodante# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_UNDERWATER_ITEM] = HintText(CustomMessage("They say that the #sunken treasure in a lake# is #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß der #versunkene Schatz in einem See# #[[1]]# sei.",
+                                                        /*german*/ "Man erzählt sich, daß der #versunkene Schatz eines Sees# #[[1]]# |sei|seien|.",
                                                         /*french*/ "Selon moi, le #trésor au fond du lac# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, el #tesoro hundido del lago# se trata de #[[1]]#.
 
-    hintTextTable[RHT_GF_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("They say that #rescuing captured carpenters# is rewarded with #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß das #Retten gefangener Zimmerleute# mit #[[1]]# belohnt würde.",
-                                                               /*french*/ "Selon moi, #secourir les charpentiers capturés# assure #[[1]]#.", {QM_RED, QM_GREEN}));
-                                                            // /*spanish*/ Según dicen, #rescatar los apresados carpinteros# se premia con #[[1]]#.
+    hintTextTable[RHT_TH_FREED_CARPENTERS] = HintText(CustomMessage("They say that #rescuing captured carpenters# is rewarded with #[[1]]#.",
+                                                         /*german*/ "Man erzählt sich, daß das #Retten gefangener Zimmerleute# #[[1]]# einbrächte.",
+                                                         /*french*/ "Selon moi, #secourir les charpentiers capturés# assure #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                      // /*spanish*/ Según dicen, #rescatar los apresados carpinteros# se premia con #[[1]]#.
 
     hintTextTable[RHT_WASTELAND_BOMBCHU_SALESMAN] = HintText(CustomMessage("They say that a #carpet guru# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Teppichguru# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #fliegender Einsiedler# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, #un marchand du désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, el #genio de una alfombra# vende #[[1]]#.
 
@@ -532,32 +533,32 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                    // /*spanish*/ Según dicen, la #señora de la tienda de pociones# vende #[[1]]#.
 
     hintTextTable[RHT_KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText(CustomMessage("They say that #imprisoned in a house# lies #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß #eingesperrt in einem Haus# #[[1]]# läge.",
+                                                                      /*german*/ "Man erzählt sich, daß #eingesperrt in einem Haus# #[[1]]# |läge|lägen|.",
                                                                       /*french*/ "Selon moi, #encagé dans une maison# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, #en una casa entre rejas# yace #[[1]]#.
 
     hintTextTable[RHT_HF_TEKTITE_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that #deep underwater in a hole# is #[[1]]#.",
-                                                                        /*german*/ "Man erzählt sich, daß #tief unter Wasser in einem Loch# #[[1]]# sei.",
+                                                                        /*german*/ "Man erzählt sich, daß #tief unter Wasser in einem Erdloch# #[[1]]# |sei|seien|.",
                                                                         /*french*/ "Selon moi, #dans les profondeurs d'une grotte# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                      // /*spanish*/ Según dicen, #en lo hondo bajo un hoyo# yace #[[1]]#.
 
     hintTextTable[RHT_KAK_WINDMILL_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #windmill ledge# lies #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß auf einem #Vorsprung in einer Windmühle# #[[1]]# läge.",
+                                                                   /*german*/ "Man erzählt sich, daß auf einem #Vorsprung einer Windmühle# #[[1]]# |läge|lägen|.",
                                                                    /*french*/ "Selon moi, #haut perché dans le moulin# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, al #borde de un molino# yace #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] = HintText(CustomMessage("They say that #dead Dampe's second# prize is #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß der #zweite Preis des toten Boris# #[[1]]# sei.",
+                                                                           /*german*/ "Man erzählt sich, daß der #zweite Preis des toten Boris# #[[1]]# |sei|seien|.",
                                                                            /*french*/ "Selon moi, la #deuxième course d'Igor# donne #[[1]]#.", {QM_RED, QM_GREEN}),
                                                                         // /*spanish*/ Según dicen, el segundo premio de #la carrera de Dampé# se trata de #[[1]]#.
                                                                         {}, {
                                                                         CustomMessage("They say that #racing a ghost# leads to #[[1]]#.",
-                                                                            /*german*/ "Man erzählt sich, daß das #Rennen gegen einen Geist# zu #[[1]]# führen würde.",
+                                                                            /*german*/ "Man erzählt sich, daß der #Wettlauf gegen einen Geist# #[[1]]# gewähre.",
                                                                             /*french*/ "Selon moi, le défi du #revenant rapide# donne #[[1]]#.", {QM_RED, QM_GREEN})});
                                                                          // /*spanish*/ Según dicen, #perseguir a un fantasma# conduce a #[[1]]#.
 
     hintTextTable[RHT_LLR_FREESTANDING_POH] = HintText(CustomMessage("They say that in a #ranch silo# lies #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß in einem #ländlichen Silo# #[[1]]# läge.",
+                                                          /*german*/ "Man erzählt sich, daß in einem #Farmsilo# #[[1]]# |läge|lägen|.",
                                                           /*french*/ "Selon moi, #dans l'entrepôt de la ferme# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en un #granero rupestre# yace #[[1]]#.
 
@@ -572,27 +573,27 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                                     // /*spanish*/ Según dicen, cierto #sepultero desentierra# #[[1]]#.
 
     hintTextTable[RHT_ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of a #pillar in a river# lies #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß auf der Spitze einer #Säule in einem Fluß# #[[1]]# läge.",
+                                                                          /*german*/ "Man erzählt sich, daß auf einer #Säule in einem Fluß# #[[1]]# |läge|lägen|.",
                                                                           /*french*/ "Selon moi, #sur un pilier au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, en lo alto del #pilar de un río# yace #[[1]]#.
 
     hintTextTable[RHT_ZR_NEAR_DOMAIN_FREESTANDING_POH] = HintText(CustomMessage("They say that on a #river ledge by a waterfall# lies #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß auf einem #Vorsprung von einem Fluß nahe eines Wasserfalls# #[[1]]# läge.",
+                                                                     /*german*/ "Man erzählt sich, daß auf einem #Vorsprung eines Flußes nahe eines Wasserfalls# #[[1]]# |läge|lägen|.",
                                                                      /*french*/ "Selon moi, #sur la falaise au dessus du fleuve# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, al borde de #la entrada a una cascada# yace #[[1]]#.
 
     hintTextTable[RHT_LH_FREESTANDING_POH] = HintText(CustomMessage("They say that high on a #lab rooftop# one can find #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß man auf dem #Dach eines Laboratoriums# #[[1]]# finden könne.",
+                                                         /*german*/ "Man erzählt sich, daß man auf dem #Dach eines Labors# #[[1]]# finden könne.",
                                                          /*french*/ "Selon moi, #la tour d'observation du lac# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, en lo #alto de un laboratorio# yace #[[1]]#.
 
     hintTextTable[RHT_ZF_ICEBERG_FREESTANDING_POH] = HintText(CustomMessage("They say that #floating on ice# is #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß sich schwebend auf Eis #[[1]]# befände.",
+                                                                 /*german*/ "Man erzählt sich, daß sich auf einer Eisscholle #[[1]]# |befände|befänden|.",
                                                                  /*french*/ "Selon moi, #gisant sur la glace# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, #flotando sobre hielo# yace #[[1]]#.
 
     hintTextTable[RHT_GV_WATERFALL_FREESTANDING_POH] = HintText(CustomMessage("They say that behind a #valley waterfall# is #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß hinter einem #Wasserfall in einem Tal# #[[1]]# sei.",
+                                                                   /*german*/ "Man erzählt sich, daß hinter einem #Wasserfall eines Tals# #[[1]]# |sei|seien|.",
                                                                    /*french*/ "Selon moi, #derrière la cascade du désert# se cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, tras una #desierta cascada# yace #[[1]]#.
 
@@ -602,47 +603,47 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                             // /*spanish*/ Según dicen, bajo la #caja de un valle# yace #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_FREESTANDING_POH] = HintText(CustomMessage("They say that on top of an #arch of stone# lies #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß auf der Spitze eines #Steinbogens# #[[1]]# läge.",
+                                                               /*german*/ "Man erzählt sich, daß auf einem #Steinbogen# #[[1]]# |läge|lägen|.",
                                                                /*french*/ "Selon moi, #gisant sur une arche de pierre# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, en lo alto de un #arco de piedra# yace #[[1]]#.
 
     hintTextTable[RHT_DMT_FREESTANDING_POH] = HintText(CustomMessage("They say that above a #mountain cavern entrance# is #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß oberhalb eines #Berghöhleneingangs# #[[1]]# sei.",
+                                                          /*german*/ "Man erzählt sich, daß oberhalb eines #Berghöhleneingangs# #[[1]]# |sei|seien|.",
                                                           /*french*/ "Selon moi, gisant #au dessus de la caverne montagneuse# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, en lo alto de la #entrada de una cueva en la montaña# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_WALL_FREESTANDING_POH] = HintText(CustomMessage("They say that nestled in a #volcanic wall# is #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß in einem #vulkanischen Alkoven# #[[1]]# sei.",
+                                                               /*german*/ "Man erzählt sich, daß in einer #vulkanischen Wand# #[[1]]# |sei|seien|.",
                                                                /*french*/ "Selon moi, dans une #alcove volcanique# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, entre unas #murallas volcánicas# yace #[[1]]#.
 
     hintTextTable[RHT_DMC_VOLCANO_FREESTANDING_POH] = HintText(CustomMessage("They say that obscured by #volcanic ash# is #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß #[[1]]# von #Vulkanasche# verdeckt sei.",
+                                                                  /*german*/ "Man erzählt sich, daß #Vulkanasche# #[[1]]# verdecke.",
                                                                   /*french*/ "Selon moi, #recouvert de cendres volcaniques# gît #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, bajo la #ceniza volcánica# yace #[[1]]#.
 
-    hintTextTable[RHT_GF_NORTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
-                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_TH_1_TORCH_CARPENTER] = HintText(CustomMessage("They say that #defeating the Gerudo in a room with 1 torch# reveals #[[1]]#.",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",//TODO_TRANSLATE update to match
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE update to match
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
-    hintTextTable[RHT_GF_NORTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
-                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_TH_DEAD_END_CARPENTER] = HintText(CustomMessage("They say that #defeating the Gerudo in a Dead End# reveals #[[1]]#.",
+                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",//TODO_TRANSLATE update to match
+                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE update to match
                                                         // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
-    hintTextTable[RHT_GF_SOUTH_F1_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
-                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
-                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+    hintTextTable[RHT_TH_DOUBLE_CELL_CARPENTER] = HintText(CustomMessage("They say that #defeating the Gerudo in a large jail# reveals #[[1]]#.",
+                                                              /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",//TODO_TRANSLATE update to match
+                                                              /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE update to match
+                                                           // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
-    hintTextTable[RHT_GF_SOUTH_F2_CARPENTER] = HintText(CustomMessage("They say that #defeating Gerudo guards# reveals #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",
-                                                           /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));
-                                                        // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
+    hintTextTable[RHT_TH_STEEP_SLOPE_CARPENTER] = HintText(CustomMessage("They say that #defeating the Gerudo between steep slopes# reveals #[[1]]#.",
+                                                              /*german*/ "Man erzählt sich, daß das #Besiegen der Gerudo-Wachen# #[[1]]# enthüllen würde.",//TODO_TRANSLATE update to match
+                                                              /*french*/ "Selon moi, les #geôliers Gerudo# détiennent #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE update to match
+                                                           // /*spanish*/ Según dicen, #derrotar a las guardas Gerudo# revela #[[1]]#.
 
     hintTextTable[RHT_HF_GS_NEAR_KAK_GROTTO] = HintText(CustomMessage("They say that a #spider-guarded spider in a hole# hoards #[[1]]#.",
-                                                           /*german*/ "Man erzählt sich, daß eine #spinnenbewachte Spinne in einem Loch #[[1]]# horte.",
+                                                           /*german*/ "Man erzählt sich, daß eine #spinnenbewachte Spinne in einem Erdloch #[[1]]# horte.",
                                                            /*french*/ "Selon moi, une #Skulltula dans un trou d'arachnides# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                         // /*spanish*/ Según dicen, una #Skulltula custodiada por otra# de un hoyo otorga #[[1]]#.
 
@@ -697,17 +698,17 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                       // /*spanish*/ Según dicen, la noche revela una #Skulltula del laberinto forestal# que otorga #[[1]]#.
 
     hintTextTable[RHT_SFM_GS] = HintText(CustomMessage("They say that night reveals a #spider in a forest meadow# holding #[[1]]#.",
-                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Waldwiese# enthülle, welche #[[1]]# besäße.",
+                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne auf einer Waldlichtung# enthülle, welche #[[1]]# besäße.",
                                             /*french*/ "Selon moi, une #Skulltula dans le sanctuaire des bois# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                          // /*spanish*/ Según dicen, la noche revela una #Skulltula de la pradera del bosque# que otorga #[[1]]#.
 
     hintTextTable[RHT_OGC_GS] = HintText(CustomMessage("They say that a #spider outside a tyrant's tower# holds #[[1]]#.",
-                                            /*german*/ "Man erzählt sich, daß eine #Spinne außerhalb eines Turms eines Tyrannen# #[[1]]# besäße.",
+                                            /*german*/ "Man erzählt sich, daß eine #Spinne außerhalb eines Turmes eines Tyrannen# #[[1]]# besäße.",
                                             /*french*/ "Selon moi, une #Skulltula parmi les ruines du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                          // /*spanish*/ Según dicen, una #Skulltula a las afueras de la torre de un tirano# otorga #[[1]]#.
 
     hintTextTable[RHT_HC_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree outside of a castle# holds #[[1]]#.",
-                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum außerhalb von einem Schloß befindliche Spinne# #[[1]]# besäße.",
+                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum außerhalb eines Schloßes befindliche Spinne# #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans l'arbre près du château# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de las afueras de un castillo# otorga #[[1]]#.
 
@@ -717,17 +718,17 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                         // /*spanish*/ Según dicen, una #Skulltula bajo una custodiada caja# otorga #[[1]]#.
 
     hintTextTable[RHT_DMC_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a volcano# holds #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß eine #in einem Vulkan begrabene Spinne# #[[1]]# besäße.",
+                                                       /*german*/ "Man erzählt sich, daß eine #in einem Vulkan vergrabene Spinne# #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula enterrée dans un volcan# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, una #Skulltula enterrada en un volcán# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried outside a cavern# holds #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß eine #außerhalb einer Höhle begrabene Spinne# #[[1]]# besäße.",
+                                                       /*german*/ "Man erzählt sich, daß eine #außerhalb einer Höhle vergrabene Spinne# #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula enterrée près d'une caverne# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, una #Skulltula enterrada a la entrada de una cueva# otorga #[[1]]#.
 
     hintTextTable[RHT_DMT_GS_NEAR_KAK] = HintText(CustomMessage("They say that a #spider hidden in a mountain nook# holds #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß eine #in einem Bergwinkel versteckte Spinne# #[[1]]# besäße.",
+                                                     /*german*/ "Man erzählt sich, daß eine #in einer Bergnische versteckte Spinne# #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #Skulltula cachée dans le flanc d'une montagne# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #Skulltula oculta en el rincón de la montaña# otorga #[[1]]#.
 
@@ -752,32 +753,32 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                      // /*spanish*/ Según dicen, una #Skulltula bajo una caja# de la Ciudad Goron otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_HOUSE_UNDER_CONSTRUCTION] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                                     /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                                      /*french*/ "Selon moi, une #Skulltula dans le chantier de construction# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_SKULLTULA_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                            /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula sur une maison maudite# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_GUARDS_HOUSE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                         /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                          /*french*/ "Selon moi, une #Skulltula sur une maison de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_TREE] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                 /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                 /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                  /*french*/ "Selon moi, une #Skulltula dans un arbre de village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                               // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_WATCHTOWER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a town# holding #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                       /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                        /*french*/ "Selon moi, une #Skulltula sur une échelle dans un village# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
     hintTextTable[RHT_KAK_GS_ABOVE_IMPAS_HOUSE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a town# holding #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einer Stadt# enthülle, welche #[[1]]# besäße.",
+                                                              /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Dorf# enthülle, welche #[[1]]# besäße.",
                                                               /*french*/ "Selon moi, une #Skulltula au dessus d'une grande maison# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del pueblo# que otorga #[[1]]#.
 
@@ -787,32 +788,32 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                     // /*spanish*/ Según dicen, la noche revela una #Skulltula del cementerio# que otorga #[[1]]#.
 
     hintTextTable[RHT_GRAVEYARD_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a graveyard# holds #[[1]]#.",
-                                                             /*german*/ "Man erzählt sich, daß eine #auf einem Friedhof begrabene Spinne# #[[1]]# besäße.",
+                                                             /*german*/ "Man erzählt sich, daß eine #auf einem Friedhof vergrabene Spinne# #[[1]]# besäße.",
                                                              /*french*/ "Selon moi, une #Skulltula enterrée dans le Cimetière# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                           // /*spanish*/ Según dicen, una #Skulltula enterrada en el cementerio# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_LADDER] = HintText(CustomMessage("They say that night in the past reveals a #spider in a river# holding #[[1]]#.",
-                                                  /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                  /*german*/ "Man erzählt sich, daß die Nacht in der Vergangenheit eine #Spinne an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                   /*french*/ "Selon moi, une #Skulltula sur une échelle près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                // /*spanish*/ Según dicen, la noche del pasado revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_TREE] = HintText(CustomMessage("They say that a spider hiding in a #tree by a river# holds #[[1]]#.",
-                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum bei einem Fluß# versteckte Spinne #[[1]]# besäße.",
+                                                /*german*/ "Man erzählt sich, daß eine in einem #Baum an einem Fluß# versteckte Spinne #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans un arbre près du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol de un río# otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_ABOVE_BRIDGE] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                        /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula sur une façade près d'une cascade# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZR_GS_NEAR_RAISED_GROTTOS] = HintText(CustomMessage("They say that night in the future reveals a #spider in a river# holding #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne in einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                               /*german*/ "Man erzählt sich, daß die Nacht in der Zukunft eine #Spinne an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                                /*french*/ "Selon moi, une #Skulltula sur une façade près d'une grotte du fleuve# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, la noche del futuro revela una #Skulltula del río# que otorga #[[1]]#.
 
     hintTextTable[RHT_ZD_GS_FROZEN_WATERFALL] = HintText(CustomMessage("They say that night reveals a #spider by a frozen waterfall# holding #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem gefrorenen Wasserfall# enthülle, welche #[[1]]# besäße.",
+                                                            /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne an einem gefrorenen Wasserfall# enthülle, welche #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula près d'une cascade gelée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a una congelada cascada# que otorga #[[1]]#.
 
@@ -827,32 +828,32 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                              // /*spanish*/ Según dicen, una Skulltula escondida en el #árbol junto a cierta deidad# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried by a lake# holds #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß eine #bei einem Fluß begrabene Spinne# #[[1]]# besäße.",
+                                                      /*german*/ "Man erzählt sich, daß eine #an einem Fluß vergrabene Spinne# #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula enterrée près d'un lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada junto a un lago# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_SMALL_ISLAND] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                        /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                         /*french*/ "Selon moi, une #Skulltula sur un îlot du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_LAB_WALL] = HintText(CustomMessage("They say that night reveals a #spider by a lake# holding #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne bei einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                    /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                     /*french*/ "Selon moi, une #Skulltula sur le mur d'un centre de recherche# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, la noche revela una #Skulltula junto a un lago# que otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_LAB_CRATE] = HintText(CustomMessage("They say that a spider deed underwater in a #lab crate# holds #[[1]]#.",
-                                                     /*german*/ "Man erzählt sich, daß einer Spinne in einer #Laborkiste# unter Wasser #[[1]]# besäße.",
+                                                     /*german*/ "Man erzählt sich, daß eine Spinne in einer #Laborkiste# unter Wasser #[[1]]# besäße.",
                                                      /*french*/ "Selon moi, une #Skulltula dans une boîte au fond d'une cuve d'eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                   // /*spanish*/ Según dicen, una #Skulltula bajo la sumergida caja de un laboratorio# otorga #[[1]]#.
 
     hintTextTable[RHT_LH_GS_TREE] = HintText(CustomMessage("They say that night reveals a #spider by a lake high in a tree# holding #[[1]]#.",
-                                                /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in einem Baum bei einem Fluß# enthülle, welche #[[1]]# besäße.",
+                                                /*german*/ "Man erzählt sich, daß die Nacht eine #Spinne in einem Baum an einem Fluß# enthülle, welche #[[1]]# besäße.",
                                                 /*french*/ "Selon moi, une #Skulltula dans un grand arbre du lac# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                              // /*spanish*/ Según dicen, la noche revela #una Skulltula del lago sobre un árbol# que otorga #[[1]]#.
 
     hintTextTable[RHT_GV_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in a valley# holds #[[1]]#.",
-                                                      /*german*/ "Man erzählt sich, daß eine #in einem Tal begrabene Spinne# #[[1]]# besäße.",
+                                                      /*german*/ "Man erzählt sich, daß eine #in einem Tal vergrabene Spinne# #[[1]]# besäße.",
                                                       /*french*/ "Selon moi, une #Skulltula enterré dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/ Según dicen, una #Skulltula enterrada en un valle# otorga #[[1]]#.
 
@@ -882,7 +883,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                   // /*spanish*/ Según dicen, la noche revela una #Skulltula de una fortaleza# que otorga #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_GS_BEAN_PATCH] = HintText(CustomMessage("They say that a #spider buried in the desert# holds #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß eine #in der Wüste begrabene Spinne# #[[1]]# besäße.",
+                                                            /*german*/ "Man erzählt sich, daß eine #in der Wüste vergrabene Spinne# #[[1]]# besäße.",
                                                             /*french*/ "Selon moi, une #Skulltula enterrée au pied du colosse# a #[[1]]#.", {QM_RED, QM_GREEN}));
                                                          // /*spanish*/ Según dicen, una #Skulltula enterrada en el desierto# otorga #[[1]]#.
 
@@ -897,47 +898,47 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                    // /*spanish*/ Según dicen, la noche revela una #Skulltula en las profundidades del desierto# que otorga #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_1] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_2] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_3] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_4] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_5] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_6] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_7] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KF_SHOP_ITEM_8] = HintText(CustomMessage("They say that a #child shopkeeper# sells #[[1]]#.",
-                                                    /*german*/ "Man erzählt sich, daß der #Inhaber des Kokiri-Ladens# #[[1]]# verkaufe.",
+                                                    /*german*/ "Man erzählt sich, daß ein #kindlicher Ladenbesitzer# #[[1]]# verkaufe.",
                                                     /*french*/ "Selon moi, la #boutique Kokiri# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                  // /*spanish*/ Según dicen, un #joven dependiente# vende #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -947,7 +948,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -957,7 +958,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -967,7 +968,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -977,7 +978,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -987,7 +988,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -997,7 +998,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -1007,7 +1008,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                           // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Potion Shop# offers #[[1]]#.",
-                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden in Kakariko# #[[1]]# offeriere.",
+                                                            /*german*/ "Man erzählt sich, daß der #Magie-Laden von Kakariko# #[[1]]# offeriere.",
                                                             /*french*/ "Selon moi, l'#apothicaire de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                          // /*spanish*/ Según dicen, la #tienda de pociones de Kakariko# ofrece #[[1]]#.
                                                          {}, {
@@ -1057,7 +1058,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #mercader de bombchus# vende #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_1] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1067,7 +1068,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_2] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1077,7 +1078,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_3] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1087,7 +1088,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_4] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1097,7 +1098,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_5] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1107,7 +1108,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_6] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1117,7 +1118,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_7] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1127,7 +1128,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_POTION_SHOP_ITEM_8] = HintText(CustomMessage("They say that the #Market Potion Shop# offers #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden auf dem Markt# #[[1]]# offeriere.",
+                                                               /*german*/ "Man erzählt sich, daß der #Magie-Laden des Marktes# #[[1]]# offeriere.",
                                                                /*french*/ "Selon moi, l'#apothicaire dans la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}),
                                                             // /*spanish*/ Según dicen, la #tienda de pociones del mercado# ofrece #[[1]]#.
                                                             {}, {
@@ -1137,82 +1138,82 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                              // /*spanish*/ Según dicen, un #vendedor de pociones# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_MARKET_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Market Bazaar# offers #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten würde.",
+                                                          /*german*/ "Man erzählt sich, daß auf dem #Marktbasar# #[[1]]# angeboten |würde|würden|.",
                                                           /*french*/ "Selon moi, le #bazar de la Place du Marché# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, el #bazar del mercado# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_1] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_2] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_3] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_4] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_5] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_6] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_7] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
     hintTextTable[RHT_KAK_BAZAAR_ITEM_8] = HintText(CustomMessage("They say that the #Kakariko Bazaar# offers #[[1]]#.",
-                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar in Kakariko# #[[1]]# angeboten würde.",
+                                                       /*german*/ "Man erzählt sich, daß auf dem #Basar von Kakariko# #[[1]]# angeboten |würde|würden|.",
                                                        /*french*/ "Selon moi, le #bazar de Kakariko# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                     // /*spanish*/ Según dicen, el #bazar de Kakariko# ofrece #[[1]]#.
 
@@ -1297,132 +1298,132 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                  // /*spanish*/ Según dicen, el #dependiente Goron# vende #[[1]]#.
 
     hintTextTable[RHT_HF_DEKU_SCRUB_GROTTO] = HintText(CustomMessage("They say that a lonely #scrub in a hole# sells #[[1]]#.",
-                                                          /*german*/ "Man erzählt sich, daß ein #einsamer Deku in einem Loch# #[[1]]# verkaufe.",
+                                                          /*german*/ "Man erzählt sich, daß ein #einsamer Deku-Händler in einem Erdloch# #[[1]]# verkaufe.",
                                                           /*french*/ "Selon moi, la #peste Mojo dans une grotte de la plaine# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, un #singular deku bajo un hoyo# de la llanura vende #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LLR_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                   /*french*/ "Selon moi, le #trio de peste Mojo à la ferme# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, un #trío de dekus# de una granja venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
-                                                                           /*german*/ "Man erzählt sich, daß ein #Deku-Paar in den Wäldern# #[[1]]# verkaufe.",
+                                                                           /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar in den Wäldern# #[[1]]# verkaufe.",
                                                                            /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                         // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT] = HintText(CustomMessage("They say that a pair of #scrubs in the woods# sells #[[1]]#.",
-                                                                          /*german*/ "Man erzählt sich, daß ein #Deku-Paar in den Wäldern# #[[1]]# verkaufe.",
+                                                                          /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar in den Wäldern# #[[1]]# verkaufe.",
                                                                           /*french*/ "Selon moi, le #duo de peste Mojo près du théâtre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                        // /*spanish*/ Según dicen, un par de #dekus del bosque# venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_NEAR_BRIDGE] = HintText(CustomMessage("They say that a #scrub by a bridge# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku bei einer Brücke# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler an einer Brücke# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, la #peste Mojo près du pont dans les bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #deku bajo un puente# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo dans les sous-bois# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del bosque venden #[[1]]#.
 
     hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
-                                                                /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                /*french*/ "Selon moi, le #duo de peste Mojo au coeur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
 
     hintTextTable[RHT_SFM_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
-                                                                 /*french*/ "Selon moi, le #duo de peste Mojo au cœur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                 /*french*/ "Selon moi, le #duo de peste Mojo au coeur du sanctuaire sylvestre# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #par de dekus subterráneos# de la pradera sagrada venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_GC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo dans le village Goron# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# de la Ciudad Goron venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_DMC_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                  /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                   /*french*/ "Selon moi, le #trio de peste Mojo dans le volcan# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                // /*spanish*/ Según dicen, un #trío de dekus# del volcán venden #[[1]]#.
 
     hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
 
     hintTextTable[RHT_ZR_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo près du fleuve# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del río venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_LEFT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_RIGHT] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_LH_DEKU_SCRUB_GROTTO_CENTER] = HintText(CustomMessage("They say that a #trio of scrubs# sells #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Trio# #[[1]]# verkaufe.",
+                                                                 /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Trio# #[[1]]# verkaufe.",
                                                                  /*french*/ "Selon moi, le #trio de peste Mojo près du lac# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, un #trío de dekus# del lago venden #[[1]]#.
 
     hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                               /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
 
     hintTextTable[RHT_GV_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                 /*french*/ "Selon moi, le #duo de peste Mojo près de la vallée# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/ Según dicen, un #par de dekus subterráneos# del valle venden #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                      /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                      /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                       /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                    // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
 
     hintTextTable[RHT_COLOSSUS_DEKU_SCRUB_GROTTO_REAR] = HintText(CustomMessage("They say that a #scrub underground duo# sells #[[1]]#.",
-                                                                     /*german*/ "Man erzählt sich, daß ein #Deku-Paar im Untergrund# #[[1]]# verkaufe.",
+                                                                     /*german*/ "Man erzählt sich, daß ein #Deku-Händler-Paar im Untergrund# #[[1]]# verkaufe.",
                                                                      /*french*/ "Selon moi, le #duo de peste Mojo dans le désert# vend #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                   // /*spanish*/ Según dicen, un #par de dekus subterráneos# del desierto venden #[[1]]#.
 
@@ -1437,12 +1438,12 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                         // /*spanish*/ Según dicen, una #vaca del establo# brinda #[[1]]#.
 
     hintTextTable[RHT_LLR_TOWER_RIGHT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
-                                                         /*german*/ "Man erzählt sich, daß eine #Kuh in einem Silo# #[[1]]# schenke.",
+                                                         /*german*/ "Man erzählt sich, daß eine #Kuh in einem Farmsilo# #[[1]]# schenke.",
                                                          /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
 
     hintTextTable[RHT_LLR_TOWER_LEFT_COW] = HintText(CustomMessage("They say that a #cow in a ranch silo# gifts #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem Silo# #[[1]]# schenke.",
+                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem Farmsilo# #[[1]]# schenke.",
                                                         /*french*/ "Selon moi, la #vache dans le silo de la ferme# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #vaca del granero# brinda #[[1]]#.
 
@@ -1452,507 +1453,634 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
                                                       // /*spanish*/ Según dicen, una #vaca enjaulada de una casa# brinda #[[1]]#.
 
     hintTextTable[RHT_DMT_COW_GROTTO_COW] = HintText(CustomMessage("They say that a #cow in a luxurious hole# offers #[[1]]#.",
-                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem luxuriösen Loch# #[[1]]# offeriere.",
+                                                        /*german*/ "Man erzählt sich, daß eine #Kuh in einem luxuriösen Erdloch# #[[1]]# offeriere.",
                                                         /*french*/ "Selon moi, la #vache dans une grotte luxueuse# donne #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #vaca de un lujoso hoyo# brinda #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_CHEST_GROTTO] = HintText(CustomMessage("They say that a #beehive above a chest# hides #[[1]]#.",
                                                           /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb einer Truhe# #[[1]]# verberge.",
-                                                          /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                          /*french*/ "Selon moi, une #ruche au dessus d'un coffre# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/ Según dicen, una #colmena sobre un cofre# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_LONELY_SCRUB_GROTTO] = HintText(CustomMessage("They say that a #beehive above a lonely scrub# hides #[[1]]#.",
-                                                                 /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines einsamen Deku# #[[1]]# verberge.",
-                                                                 /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                 /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines einsamen Deku-Händlers# #[[1]]# verberge.",
+                                                                 /*french*/ "Selon moi, une #ruche au dessus d'une Peste Mojo solitaire# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/ Según dicen, una #colmena sobre un deku solitario# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_SCRUB_PAIR_GROTTO] = HintText(CustomMessage("They say that a #beehive above a pair of scrubs# hides #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Paars# #[[1]]# verberge.",
-                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Händler-Paars# #[[1]]# verberge.",
+                                                               /*french*/ "Selon moi, une #ruche au dessus d'un duo de Pestes Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #colmena sobre un par de dekus# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_SCRUB_TRIO_GROTTO] = HintText(CustomMessage("They say that a #beehive above a trio of scrubs# hides #[[1]]#.",
-                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Trios# #[[1]]# verberge.",
-                                                               /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                               /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb eines Deku-Händler-Trios# #[[1]]# verberge.",
+                                                               /*french*/ "Selon moi, une #ruche au dessus d'un trio de Pestes Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/ Según dicen, una #colmena sobre un trío de dekus# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_COW_GROTTO] = HintText(CustomMessage("They say that a #beehive above a cow# hides #[[1]]#.",
                                                         /*german*/ "Man erzählt sich, daß ein #Bienenstock oberhalb einer Kuh# #[[1]]# verberge.",
-                                                        /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                        /*french*/ "Selon moi, une #ruche au dessus d'une vache# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/ Según dicen, una #colmena sobre una vaca# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA] = HintText(CustomMessage("They say that a #beehive in front of the king of the zoras# hides #[[1]]#.",
-                                                                   /*german*/ "Man erzählt sich, daß ein #Bienenstock vor dem Zora-König# #[[1]]# verberge.",
-                                                                   /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                                   /*german*/ "Man erzählt sich, daß ein #Bienenstock vor dem König der Zoras# #[[1]]# verberge.",
+                                                                   /*french*/ "Selon moi, une #ruche devant le Roi des Zoras# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                 // /*spanish*/ Según dicen, una #colmena delante del rey de los zoras# esconde #[[1]]#.
 
     hintTextTable[RHT_BEEHIVE_BEHIND_KING_ZORA] = HintText(CustomMessage("They say that a #beehive behind the king of the zoras# hides #[[1]]#.",
-                                                              /*german*/ "Man erzählt sich, daß ein #Bienenstock hinter dem Zora-König# #[[1]]# verberge.",
-                                                              /*french*/ "Selon moi,  #[[1]]#.", {QM_RED, QM_GREEN}));
+                                                              /*german*/ "Man erzählt sich, daß ein #Bienenstock hinter dem König der Zoras# #[[1]]# verberge.",
+                                                              /*french*/ "Selon moi, une #rucheau derrière le Roi des Zoras# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                            // /*spanish*/ Según dicen, una #colmena detrás del rey de los zoras# esconde #[[1]]#.
 
     hintTextTable[RHT_POT_KOKIRI_FOREST] = HintText(CustomMessage("They say that a #pot in Kokiri Forest# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug im Kokiri-Wald# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans la Fôret Kokiri# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_POT_GERUDO_FORTRESS] = HintText(CustomMessage("They say that a #pot in Gerudo Fortress# contains #[[1]]#.",
-                                                         /*german*/ "",
-                                                         /*french*/ "Selon moi, une #jarre dans la Forteresse Gerudo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_TH_BREAK_ROOM_FRONT_POT] = HintText(CustomMessage("They say that the #front pot watched by resting thieves# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_BREAK_ROOM_BACK_POT] = HintText(CustomMessage("They say that the #back pot watched by resting thieves# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_KITCHEN_POT_1] = HintText(CustomMessage("They say that a #Hideout's Kitchen pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_KITCHEN_POT_2] = HintText(CustomMessage("They say that a #Hideout's Kitchen pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_1_TORCH_CELL_RIGHT_POT] = HintText(CustomMessage("They say that the #thieve's right pot, watched by a single torch# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_1_TORCH_CELL_MID_POT] = HintText(CustomMessage("They say that the #thieve's middle pot, watched by a single torch# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_1_TORCH_CELL_LEFT_POT] = HintText(CustomMessage("They say that the #thieve's left pot, watched by a single torch# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_STEEP_SLOPE_RIGHT_POT] = HintText(CustomMessage("They say that a #Gerudo pot, on the right of a sloped corner# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_STEEP_SLOPE_LEFT_POT] = HintText(CustomMessage("They say that a #Gerudo pot, on the left of a sloped corner# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_NEAR_DOUBLE_CELL_RIGHT_POT] = HintText(CustomMessage("They say that the #right pot near 2 jail cells# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_NEAR_DOUBLE_CELL_MID_POT] = HintText(CustomMessage("They say that the #mid pot near 2 jail cells# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_NEAR_DOUBLE_CELL_LEFT_POT] = HintText(CustomMessage("They say that the #left pot near 2 jail cells# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_RIGHTMOST_JAILED_POT] = HintText(CustomMessage("They say that the #rightmost jailed pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_RIGHT_MIDDLE_JAILED_POT] = HintText(CustomMessage("They say that the #right middle jailed pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_LEFT_MIDDLE_JAILED_POT] = HintText(CustomMessage("They say that the #left middle jailed pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
+
+    hintTextTable[RHT_TH_LEFTMOST_JAILED_POT] = HintText(CustomMessage("They say that the #leftmost jailed pot# contains #[[1]]#.", {QM_RED, QM_GREEN}));//TODO_TRANSLATE
 
     hintTextTable[RHT_POT_WASTELAND] = HintText(CustomMessage("They say that a #pot in Haunted Wasteland# contains #[[1]]#.",
-                                                   /*german*/ "",
+                                                   /*german*/ "Man erzählt sich, daß ein #Krug in der Gespensterwüste# #[[1]]# enthielte.",
                                                    /*french*/ "Selon moi, une #jarre dans le Désert Hanté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_MARKET] = HintText(CustomMessage("They say that a #pot in Market# contains #[[1]]#.",
-                                                /*german*/ "",
+                                                /*german*/ "Man erzählt sich, daß ein #Krug auf dem Markt# #[[1]]# enthielte.",
                                                 /*french*/ "Selon moi, une #jarre dans la Place du Marché# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_KAKARIKO] = HintText(CustomMessage("They say that a #pot in Kakariko Village# contains #[[1]]#.",
-                                                  /*german*/ "",
+                                                  /*german*/ "Man erzählt sich, daß ein #Krug in Kakariko# #[[1]]# enthielte.",
                                                   /*french*/ "Selon moi, une #jarre dans le Village de Cocorico# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_GRAVEYARD] = HintText(CustomMessage("They say that a #pot in Graveyard# contains #[[1]]#.",
-                                                   /*german*/ "",
+                                                   /*german*/ "Man erzählt sich, daß ein #Krug auf dem Friedhof# #[[1]]# enthielte.",
                                                    /*french*/ "Selon moi, une #jarre dans le Cimetière# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_GORON_CITY] = HintText(CustomMessage("They say that a #pot in Goron City# contains #[[1]]#.",
-                                                    /*german*/ "",
+                                                    /*german*/ "Man erzählt sich, daß ein #Krug in Goronia# #[[1]]# enthielte.",
                                                     /*french*/ "Selon moi, une #jarre dans le Village Goron# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("They say that a #pot in Death Mountain Crater# contains #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß ein #Krug im Todeskrater# #[[1]]# enthielte.",
                                                                /*french*/ "Selon moi, une #jarre sur le Mont du Péril# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_ZORAS_DOMAIN] = HintText(CustomMessage("They say that a #pot in Zora's Domain# contains #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß ein #Krug in Zoras Reich# #[[1]]# enthielte.",
                                                       /*french*/ "Selon moi, une #jarre dans le Domaine Zora# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_ZORAS_FOUNTAIN] = HintText(CustomMessage("They say that a #pot in Zora's Fountain# contains #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß ein #Krug in Zoras Quelle# #[[1]]# enthielte.",
                                                         /*french*/ "Selon moi, une #jarre dans la Fontaine Zora# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_LON_LON_RANCH] = HintText(CustomMessage("They say that a #pot in Lon Lon Ranch# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug auf der Lon Lon-Farm# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Ranch Lon Lon# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_HYRULE_FIELD] = HintText(CustomMessage("They say that a #pot in Hyrule Field# contains #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß ein #Krug in der Hylianischen Steppe# #[[1]]# enthielte.",
                                                       /*french*/ "Selon moi, une #jarre dans la Plaine d'Hyrule# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_POT_HYRULE_CASTLE] = HintText(CustomMessage("They say that a #pot in Hyrule Castle# contains #[[1]]#.",
-                                                       /*german*/ "",
+                                                       /*german*/ "Man erzählt sich, daß ein #Krug in Schloß Hyrule# #[[1]]# enthielte.",
                                                        /*french*/ "Selon moi, une #jarre dans le Château d'Hyrule# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KOKIRI_FOREST_RUPEE] = HintText(CustomMessage("They say that a rupee in a #tranquil forest# hides #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein Rubin in einem #ruhigen Wald# #[[1]]# verstecke.",
                                                          /*french*/ "Selon moi, un rubis dans une #forêt tranquille# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/
     hintTextTable[RHT_KOKIRI_FOREST_HEART] = HintText(CustomMessage("They say that a heart in a #tranquil forest# hides #[[1]]#.",
-                                                         /*german*/ "",
+                                                         /*german*/ "Man erzählt sich, daß ein Herz in einem #ruhigen Wald# #[[1]]# verstecke.",
                                                          /*french*/ "Selon moi, un cœur dans une #forêt tranquille# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                       // /*spanish*/
     hintTextTable[RHT_SARIAS_HOUSE_HEART] = HintText(CustomMessage("They say that a heart in a #dear friend's home# hides #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß ein Herz #im Heim eines lieben Freundes# #[[1]]# verstecke.",
                                                         /*french*/ "Selon moi, un cœur dans la #maison d'une amie chère# cache #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/
     hintTextTable[RHT_LOST_WOODS_RUPEE] = HintText(CustomMessage("They say that under a #boulder in the woods# lies #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß unter einem #Felsen in den Wäldern# #[[1]]# |läge|lägen|.",
                                                       /*french*/ "Selon moi, sous un #rocher dans les bois# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/
     hintTextTable[RHT_LOST_WOODS_SHORTCUT_RUPEE] = HintText(CustomMessage("They say that in a #pool of water in the woods# lies #[[1]]#.",
-                                                               /*german*/ "",
+                                                               /*german*/ "Man erzählt sich, daß in einem #Wasserbecken in den Wäldern# #[[1]]# |läge|lägen|.",
                                                                /*french*/ "Selon moi, dans une #mare d'eau dans les bois# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                             // /*spanish*/
     hintTextTable[RHT_LAKE_HYLIA_RUPEE] = HintText(CustomMessage("They say that just off the #coast of a lake# lies #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß vor dem #Ufer eines Sees# #[[1]]# |läge|lägen|.",
                                                       /*french*/ "Selon moi, juste au large de la #côte d'un lac# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/
     hintTextTable[RHT_LABORATORY_RUPEE] = HintText(CustomMessage("They say that at the #bottom of a tank# lies #[[1]]#.",
-                                                      /*german*/ "",
+                                                      /*german*/ "Man erzählt sich, daß auf dem #Grund eines Reservoirs# #[[1]]# |läge|lägen|.",
                                                       /*french*/ "Selon moi, au #fond d'un réservoir# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                    // /*spanish*/
     hintTextTable[RHT_DAMPES_GRAVE_RUPEE] = HintText(CustomMessage("They say that within a #quick-footed spirit's grave# lies #[[1]]#.",
-                                                        /*german*/ "",
+                                                        /*german*/ "Man erzählt sich, daß innerhalb eines #Grabes eines leichtfüßigen Geistes# #[[1]]# |läge|lägen|.",
                                                         /*french*/ "Selon moi, dans la #tombe d'un esprit à pieds rapides# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                      // /*spanish*/
     hintTextTable[RHT_GERUDO_VALLEY_GROTTO_RUPEE] = HintText(CustomMessage("They say that an Octarok in an #underground spring# guards #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß ein Oktorok in einer #untergründigen Quelle# #[[1]]# bewache.",
                                                                 /*french*/ "Selon moi, un Octrocher dans une #source souterraine# garde #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/
     hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL_RUPEE] = HintText(CustomMessage("They say that beneath a boulder on a #mountain's cliffside# lies #[[1]]#.",
-                                                                /*german*/ "",
+                                                                /*german*/ "Man erzählt sich, daß unterhalb eines Felsens an der #Klippe eines Berges# #[[1]]# |läge|lägen|.",
                                                                 /*french*/ "Selon moi, sous un rocher sur la #falaise d'une montagne# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                              // /*spanish*/
     hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL_GROTTO_HEART] = HintText(CustomMessage("They say that accompanying a #cow in a small cave# is #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß neben einer #Kuh in einer kleinen Höhle# #[[1]]# |sei|seien|.",
                                                                        /*french*/ "Selon moi, accompagner une #vache dans une petite grotte# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/
     hintTextTable[RHT_DEATH_MOUNTAIN_TRAIL_GROTTO_RUPEE] = HintText(CustomMessage("They say that accompanying a #cow in a small cave# is #[[1]]#.",
-                                                                       /*german*/ "",
+                                                                       /*german*/ "Man erzählt sich, daß neben einer #Kuh in einer kleinen Höhle# #[[1]]# |sei|seien|.",
                                                                        /*french*/ "Selon moi, accompagner une #vache dans une petite grotte# est #[[1]]#.", {QM_RED, QM_GREEN}));
                                                                     // /*spanish*/
     hintTextTable[RHT_DEATH_MOUNTAIN_CRATER_RUPEE] = HintText(CustomMessage("They say that on a #small platform suspended above lava# lies #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß auf einer #auf Lava schwimmenden kleinen Plattform# #[[1]]# |läge|lägen|.",
                                                                  /*french*/ "Selon moi, sur une #petite plateforme suspendue au-dessus de la lave# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/
     hintTextTable[RHT_ZORAS_RIVER_WATERFALL_RUPEE] = HintText(CustomMessage("They say that beneath a #waterfall feeding a narrow river# lies #[[1]]#.",
-                                                                 /*german*/ "",
+                                                                 /*german*/ "Man erzählt sich, daß unterhalb eines #Wasserfalls der einen schmalen Fluß nähre# #[[1]]# |läge|lägen|.",
                                                                  /*french*/ "Selon moi, sous une #cascade alimentant une rivière étroite# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                               // /*spanish*/
     hintTextTable[RHT_ZORAS_FOUNTAIN_RUPEE] = HintText(CustomMessage("They say that at the bottom of a #partially-frozen spring# lies #[[1]]#.",
-                                                          /*german*/ "",
+                                                          /*german*/ "Man erzählt sich, daß auf dem Grund einer #teilweise gefrorenen Quelle# #[[1]]# |läge|lägen|.",
                                                           /*french*/ "Selon moi, au fond d'une #source partiellement gelée# se trouve #[[1]]#.", {QM_RED, QM_GREEN}));
                                                        // /*spanish*/
 
     hintTextTable[RHT_SFM_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath a forest meadow# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens unter einer Waldlichtung# #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine sous un bosquet forestier# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath a river# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens unter einem Fluß# #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine sous une rivière# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_HF_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath a a few trees bordering a wide field# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_HF_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath a few trees bordering a wide field# rests #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens, unter Bäumen auf einer weiten Steppe#, #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine sous quelques arbres bordant un vaste champ# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZD_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath the home of the Zoras# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens unter der Heimat der Zoras# #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine sous la maison des Zora# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GF_FAIRY_GROTTO_FAIRY] = HintText(CustomMessage("They say that within #a fountain beneath the home of thieves# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens unter der Heimat der Diebe# #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine sous la maison des voleurs# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY] = HintText(CustomMessage("They say that within #a fountain behind a wall within a grave# rests #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß innerhalb #eines Brunnens, hinter einer Mauer eines Grabes#, #[[1]]# |ruhe|ruhen|.",
                                             /*french*/ "Selon moi, dans #une fontaine derrière un mur dans une tombe# repose #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_COLOSSUS_OASIS_FAIRY] = HintText(CustomMessage("They say that #restoring water to a dried oasis# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß eine #ausgetrockneten Oase wieder aufzufüllen# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #restaurer l'eau dans un oasis asséché# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout on the riverside# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes am Flußufer# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse au bord de la rivière# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout near a forest shop# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes nahe des Kokiri-Ladens# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse près d'un magasin forestier# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout near the entrance to the forest# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes nahe des Waldeingangs# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse près de l'entrée de la forêt# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout above a sylvan theatre# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes oberhalb eines waldigen Theaters# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse au-dessus d'un théâtre sylvestre# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout on the lakeside# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes am Seeufer# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse au bord du lac# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GV_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout on the side of a canyon# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes an der Seite einer Schlucht# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse sur le côté d'un canyon# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_COLOSSUS_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout near a temple of the sand# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes nahe eines Tempels des Sandes# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse près d'un temple du sable# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GRAVEYARD_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout within a graveyard# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes auf einem Friedhof# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse dans un cimetière# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMC_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout within a volcano# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes innerhalb eines Vulkans# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse dans un volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_DMT_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout on the moutainside# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_DMT_BEAN_SPROUT_FAIRY] = HintText(CustomMessage("They say that #watering a young sprout on the mountainside# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Wässern eines jungen Sproßes an einem Berghang# #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #arroser une jeune pousse sur le flanc d'une montagne# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_TOT_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone in the ouskirts of the market# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_TOT_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone in the outskirts of the market# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein am Rand des Marktes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange en périphérie du marché# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_TOT_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone in the ouskirts of the market# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_TOT_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone in the outskirts of the market# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein am Rand des Marktes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange en périphérie du marché# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMC_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone within a volcano# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein innerhalb eines Vulkans#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange dans un volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMC_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone within a volcano# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein innerhalb eines Vulkans#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans un volcan# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMT_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone on a mountain cliff face# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein an einer Bergklippe#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sur une falaise de montagne# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMT_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone on a mountain cliff face# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein an einer Bergklippe#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sur une falaise de montagne# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_COLOSSUS_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near the temple of the sane# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_COLOSSUS_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near the temple of the sand# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein nahe des Tempels des Sandes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange près du temple du sable# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_COLOSSUS_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near the temple of the sane# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+    hintTextTable[RHT_COLOSSUS_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near the temple of the sand# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein nahe des Tempels des Sandes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange près du temple du sable# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GV_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near a canyon waterfall# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein nahe eines Wasserfalls in einer Schlucht#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange près d'une cascade de canyon# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GV_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near a canyon waterfall# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein nahe eines Wasserfalls in einer Schlucht#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange près d'une cascade de canyon# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GC_MAZE_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone behind a maze of rock# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein hinter einem Felslabyrinth#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange derrière un labyrinthe de roches# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GC_MAZE_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone behind a maze of rock# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein hinter einem Felslabyrinth#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange derrière un labyrinthe de roches# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near a blacksmith# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein nahe eines Schmiedes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange près d'un forgeron# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near a blacksmith# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein nahe eines Schmiedes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange près d'un forgeron# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GRAVEYARD_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overlooking the graveyard# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher den Friedhof überblickt#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant le cimetière# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overlooking the graveyard# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher den Friedhof überblickt#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant le cimetière# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_MALON_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overlooking the path to the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher den Pfad zum Schloß überblickt#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant le chemin du château# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_MALON_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overlooking the path to the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher den Pfad zum Schloß überblickt#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant le chemin du château# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near a secret path to the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein nahe eines geheimen Pfades zum Schloß#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange près d'un chemin secret vers le château# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near a secret path to the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein nahe eines geheimen Pfades zum Schloß#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange près d'un chemin secret vers le château# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb des Schloßes#, #[[1]]# enthülle.",
                                             /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous le château# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath the castle# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous le château révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb des Schloßes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous le château# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone near an ancient tree# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange près d'un arbre ancien révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein nahe eines antiken Baumes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange près d'un arbre ancien# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone near an ancient tree# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange près d'un arbre ancien révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein nahe eines antiken Baumes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange près d'un arbre ancien# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overlooking a forest village# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surplombant un village forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher ein Dorf im Wald überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant un village forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overlooking a forest village# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surplombant un village forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher ein Dorf im Wald überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant un village forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath a forest village# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous un village forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb eines Dorfes im Wald#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous un village forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath a forest village# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous un village forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb eines Dorfes im Wald#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous un village forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_LAB_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overlooking the river feeding a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surplombant la rivière qui alimente un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher einen See nährenden Fluß überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant la rivière qui alimente un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_LAB_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overlooking the river feeding a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surplombant la rivière qui alimente un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher einen See nährenden Fluß überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant la rivière qui alimente un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone at the back of a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange au fond d'un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein am Rücken eines Sees#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange au fond d'un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone at the back of a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange au fond d'un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein am Rücken eines Sees#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange au fond d'un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone at the back of a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange au fond d'un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein am Rücken eines Sees#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange au fond d'un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone at the back of a lake# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange au fond d'un lac révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein am Rücken eines Sees#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange au fond d'un lac# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone within a perplexing wood# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange dans un bois déroutant révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein innerhalb eines verwirrenden Waldes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange dans un bois déroutant# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone within a perplexing wood# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange dans un bois déroutant révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein innerhalb eines verwirrenden Waldes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans un bois déroutant# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SFM_MAZE_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overlooking a forest maze# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surplombant un labyrinthe forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher ein Waldlabyrinth überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant un labyrinthe forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SFM_MAZE_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overlooking a forest maze# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surplombant un labyrinthe forestier révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher ein Waldlabyrinth überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant un labyrinthe forestier# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SFM_SARIA_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone watching a hiding place in the woods# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surveillant une cachette dans les bois révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher ein Versteck im Wald überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surveillant une cachette dans les bois# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone watching a hiding place in the woods# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surveillant une cachette dans les bois révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher ein Versteck im Wald überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surveillant une cachette dans les bois# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZD_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone listening to an aquatic king# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange écoutant un roi aquatique révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher einem aquatischen König zuhört#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange écoutant un roi aquatique# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZD_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone listening to an aquatic king# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange écoutant un roi aquatique révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher einem aquatischen König zuhört#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange écoutant un roi aquatique# révèle [[1]].", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone in the ouskirts of a deap fountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange en périphérie d'une profonde fontaine révèle [[1]].", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone in the outskirts of a deep fountain# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein am Rand eines tiefen Brunnens#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange en périphérie d'une profonde fontaine# révèle [[1]].", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone in the ouskirts of a deap fountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange en périphérie d'une profonde fontaine révèle [[1]].", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone in the outskirts of a deep fountain# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein am Rand eines tiefen Brunnens#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange en périphérie d'une profonde fontaine# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZF_JABU_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone watching a guardian of the sea# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surveillant un gardien de la mer révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher einen Wächter des Meeres beobachtet#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surveillant un gardien de la mer# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZF_JABU_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone watching a guardian of the sea# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surveillant un gardien de la mer révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher einen Wächter des Meeres beobachtet#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surveillant un gardien de la mer# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone overwatching a river# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange surplombant une rivière révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher einen Fluß überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange surplombant une rivière# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone overwatching a river# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange surplombant une rivière révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher einen Fluß überblickt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange surplombant une rivière# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath a waterfall# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous une cascade révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb eines Wasserfalls#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous une cascade# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath a waterfall# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous une cascade révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb eines Wasserfalls#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous une cascade# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone hiding near a cow# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange cachée près d'une vache révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein, welcher sich nahe einer Kuh versteckt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange cachée près d'une vache# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone hiding near a cow# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange cachée près d'une vache révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein, welcher sich nahe einer Kuh versteckt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange cachée près d'une vache# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath the entrance to the market# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous l'entrée du marché révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb des Eingangs zum Markt# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous l'entrée du marché# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath the entrance to the market# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous l'entrée du marché révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb des Eingangs zum Markt#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous l'entrée du marché# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath trees guarded by a Peahat# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous des arbres gardés par un Peahat révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb von Killeranas bewachten Bäumen#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous des arbres gardés par un Peahat# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath trees guarded by a Peahat# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous des arbres gardés par un Peahat révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb von Killeranas bewachten Bäumen#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous des arbres gardés par un Peahat# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath a village at the base of a mountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous un village au pied d'une montagne révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb eines Dorfes am Fuße eines Berges#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous un village au pied d'une montagne# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath a village at the base of a mountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous un village au pied d'une montagne révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb eines Dorfes am Fuße eines Berges#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous un village au pied d'une montagne# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone within a plateau by a river# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange dans un plateau près d'une rivière révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein auf einem Plateau an einem Fluß#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange dans un plateau près d'une rivière# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone within a plateau by a river# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange dans un plateau près d'une rivière révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein auf einem Plateau an einem Fluß#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans un plateau près d'une rivière# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath an escape from the forest# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous une issue de la forêt révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb eines Auswegs des Waldes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous une issue de la forêt# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath an escape from the forest# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous une issue de la forêt révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb eines Auswegs des Waldes#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous une issue de la forêt# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone beneath the entrance to a village within a mountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange sous l'entrée d'un village dans une montagne révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein unterhalb eines Eingangs zu einem Dorf innerhalb eines Berges#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange sous l'entrée d'un village dans une montagne# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone beneath the entrance to a village within a mountain# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange sous l'entrée d'un village dans une montagne révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein unterhalb eines Eingangs zu einem Dorf innerhalb eines Berges#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange sous l'entrée d'un village dans une montagne# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY] = HintText(CustomMessage("They say that #playing a tune for an odd stone within the side of a crater# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie pour une pierre étrange dans le côté d'un cratère révèle [[1]].", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer Melodie, für einen seltsamen Stein innerhalb der Seite eines Kraters#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie pour une pierre étrange dans le côté d'un cratère# révèle [[1]].", {QM_RED, QM_GREEN}));
 
     hintTextTable[RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone within the side of a crater# reveals #[[1]]#.",
-                                            /*german*/ "!!!",
-                                            /*french*/ "Selon moi, jouer une mélodie orageuse pour une pierre étrange dans le côté d'un cratère révèle [[1]].", {QM_RED, QM_GREEN}));
-    
-    hintTextTable[RHT_LH_ISLAND_SUN_FAIRY] = HintText(CustomMessage("They say that #summoning the sun on the lake's island# calls #[[1]]#.", {QM_RED, QM_GREEN}));
+                                            /*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie, für einen seltsamen Stein innerhalb der Seite eines Kraters#, #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans le côté d'un cratère# révèle [[1]].", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_HF_POND_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling rain to the field's pond# summons #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_LH_ISLAND_SUN_FAIRY] = HintText(CustomMessage("They say that #summoning the sun on the lake's island# calls #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Beschwören der Sonne auf der Insel eines Sees# #[[1]]# anrufe.",
+                                            /*french*/ "Selon moi, #appeler le soleil sur l'île du lac # révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_HF_FENCE_GROTTO_STORMS_FAIRY] = HintText(CustomMessage("They say that #making it rain in a scrub's cave# wakes #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_HF_POND_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling rain to the field's pond# summons #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Anrufen des Regens für den Tümpel einer Steppe# #[[1]]# beschwöre.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse dans l'étang d'une plaine# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_DMT_FLAG_SUN_FAIRY] = HintText(CustomMessage("They say that #changing the time in front of the trail's flag# reveals #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_HF_FENCE_GROTTO_STORMS_FAIRY] = HintText(CustomMessage("They say that #making it rain in a scrub's cave# wakes #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Machen von Regen in der Höhle eines Deku-Händlers# #[[1]]# erwecke.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse dans la grotte d'une Peste Mojo# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_DMT_COW_GROTTO_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling a storm for a lonely cow# reveals #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_DMT_FLAG_SUN_FAIRY] = HintText(CustomMessage("They say that #changing the time in front of the trail's flag# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Verändern der Zeit im Angesicht der Flagge eines Pfades# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #appeler le soleil devant un drapeau du Mont du Péril # révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_LW_SHORTCUT_STORMS_FAIRY] = HintText(CustomMessage("They say that #making it rain in the Lost Woods# reveals #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_DMT_COW_GROTTO_STORMS_FAIRY] = HintText(CustomMessage("They say that #calling a storm for a lonely cow# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Anrufen eines Sturms für eine einsame Kuh# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse pour une vache solitaire# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_GF_KITCHEN_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun in a guarded kitchen# exposes #[[1]]#.", {QM_RED, QM_GREEN}));
+    hintTextTable[RHT_LW_SHORTCUT_STORMS_FAIRY] = HintText(CustomMessage("They say that #making it rain in the Lost Woods# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Machen von Regen in den verlorenen Wäldern# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #jouer une mélodie orageuse dans les Bois Perdus# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun for scrubs in the Lost Woods# reveals #[[1]]#.", { QM_RED, QM_GREEN }));
+    hintTextTable[RHT_TH_KITCHEN_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun in a guarded kitchen# exposes #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer bewachten Küche# #[[1]]# freilege.",
+                                            /*french*/ "Selon moi, #appeler le soleil dans une cuisine gardée# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
-    hintTextTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun in a royal tomb# reveals #[[1]]#.", { QM_RED, QM_GREEN }));
+    hintTextTable[RHT_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun for scrubs in the Lost Woods# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne für Deku-Händler in den verlorenen Wäldern# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #appeler le soleil pour les Pestes dans les Bois Perdus # révèle #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY] = HintText(CustomMessage("They say that #calling the sun in a royal tomb# reveals #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß das #Anrufen der Sonne in einer königlichen Gruft# #[[1]]# enthülle.",
+                                            /*french*/ "Selon moi, #appeler le soleil dans une tombe royale# révèle #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_KF_GRASS] = HintText(CustomMessage("They say that #cutting some grass in a forest# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in einem Wald# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans un fôret# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_LW_GRASS] = HintText(CustomMessage("They say that #cutting some grass in the woods# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in den Wäldern# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans des bois# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_MARKET_GRASS] = HintText(CustomMessage("They say that #cutting some grass in the market# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras auf dem Markt# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans un marché# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_HC_GRASS] = HintText(CustomMessage("They say that #cutting some grass near the castle# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in der Nähe des Schloßes# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe près du château# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_KAK_GRASS] = HintText(CustomMessage("They say that #cutting some grass in a village# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in einem Dorf# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans un village# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_GY_GRASS] = HintText(CustomMessage("They say that #cutting some grass in a graveyard# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras auf einem Friedhof# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans un cimetère# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_LH_GRASS] = HintText(CustomMessage("They say that #cutting some grass near a lake# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras nahe eines Sees# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe près d'un lac# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_HF_GRASS] = HintText(CustomMessage("They say that #cutting some grass on a field# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras auf einer Steppe# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe dans une plaine# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_ZR_GRASS] = HintText(CustomMessage("They say that #cutting some grass near a river# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in der Nähe eines Flußes# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe près d'une rivière# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_GROTTO_GRASS] = HintText(CustomMessage("They say that #cutting some grass in a grotto# reveals #[[1]]#.",
+                            /*german*/ "Man erzählt sich, daß das #Mähen von Gras in einer Grotte# #[[1]]# enthülle.",
+                            /*french*/ "Selon moi, de l'#herbe# cache #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_GERUDO_VALLEY] = HintText(CustomMessage("They say that a #crate in Gerudo Valley# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste im Gerudotal# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_GERUDOS_FORTRESS] = HintText(CustomMessage("They say that a #crate in Gerudo Fortress# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste in der Gerudo-Festung# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans la Forteresse Gerudo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_WASTELAND] = HintText(CustomMessage("They say that a #crate in Haunted Wasteland# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste in der Gespensterwüste# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans le Désert Hanté# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_MARKET] = HintText(CustomMessage("They say that a #crate in the Market# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste auf dem Markt# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans la Place du Marché# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_KAKARIKO_VILLAGE] = HintText(CustomMessage("They say that a #crate in Kakariko Village# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste in Kakariko# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans le Village de Cocorico# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_GRAVEYARD] = HintText(CustomMessage("They say that a #crate in the Graveyard# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste auf dem Friedhof# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans le Cimetière# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_GORON_CITY] = HintText(CustomMessage("They say that a #crate in Goron City# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste in Goronia# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans le Village Goron# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("They say that a #crate in Death Mountain Crater# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste im Todeskrater# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse sur le Mont du Péril# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_LON_LON_RANCH] = HintText(CustomMessage("They say that a #crate in Lon Lon Ranch# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste auf der Lon Lon-Farm# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans le Ranch Lon Lon# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    hintTextTable[RHT_CRATE_LAKESIDE_LABORATORY] = HintText(CustomMessage("They say that a #crate in the Laboratory# contains #[[1]]#.",
+                                            /*german*/ "Man erzählt sich, daß eine #Kiste im Labor am See# #[[1]]# enthielte.",
+                                            /*french*/ "Selon moi, une #caisse dans un laboratoire# contient #[[1]]#.", {QM_RED, QM_GREEN}));
+
+    // clang-format on
 }
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
index 867da2b2cd..f5195c91d2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -5,7 +5,8 @@
 namespace Rando {
 
 void StaticData::HintTable_Init_Item() {
-    
+    // clang-format off
+
     hintTextTable[RHT_KOKIRI_SWORD] = HintText(CustomMessage("the Kokiri Sword", /*german*/"das Kokiri-Schwert", /*french*/"l'Épée Kokiri"),
                                                // /*spanish*/la Espada Kokiri
                                                {
@@ -14,9 +15,9 @@ void StaticData::HintTable_Init_Item() {
                                                }, {
                                                CustomMessage("a butter knife", /*german*/"ein Buttermesser", /*french*/"un couteau à beurre"),
                                                 // /*spanish*/un ágil puñal
-                                               CustomMessage("a starter slasher", /*german*/"ein Anfängerschwert", /*french*/"une arme de débutant"),
+                                               CustomMessage("a starter slasher", /*german*/"ein Schlitzer für Anfänger", /*french*/"une arme de débutant"),
                                                 // /*spanish*/una hoja de principiantes
-                                               CustomMessage("a switchblade", /*german*/"ein Stellmesser", /*french*/"un canif")});
+                                               CustomMessage("a switchblade", /*german*/"ein Taschenmesser", /*french*/"un canif")});
                                                 // /*spanish*/una navaja
 
     hintTextTable[RHT_MASTER_SWORD] = HintText(CustomMessage("the Master Sword", /*german*/"das Master-Schwert", /*french*/"l'Épée de Légende"),
@@ -25,7 +26,7 @@ void StaticData::HintTable_Init_Item() {
                                                CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("evil's bane", /*german*/"der böse Fluch", /*french*/"le fléau du mal"),
+                                               CustomMessage("evil's bane", /*german*/"der Ruin des Bösen", /*french*/"le fléau du mal"),
                                                 // /*spanish*/la destructora del mal
                                                CustomMessage("a seven year limbo", /*german*/"eine siebenjährige Erwartung", /*french*/"une stase de sept ans")});
                                                 // /*spanish*/unos siete años de espera
@@ -36,7 +37,7 @@ void StaticData::HintTable_Init_Item() {
                                                CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
                                                }, {
-                                               CustomMessage("a fragile blade", /*german*/"ein fragiles Schwert", /*french*/"une lame fragile"),
+                                               CustomMessage("a fragile blade", /*german*/"eine fragile Klinge", /*french*/"une lame fragile"),
                                                 // /*spanish*/una frágil hoja
                                                CustomMessage("a breakable cleaver", /*german*/"ein brüchiger Spalter", /*french*/"un espadon de verre")});
                                                 // /*spanish*/un rompible acero
@@ -47,7 +48,7 @@ void StaticData::HintTable_Init_Item() {
                                                  CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                   // /*spanish*/una espada
                                                  }, {
-                                                 CustomMessage("the biggest blade", /*german*/"das größte Schwert", /*french*/"une lame gigantesque"),
+                                                 CustomMessage("the biggest blade", /*german*/"die größte Klinge", /*french*/"une lame gigantesque"),
                                                   // /*spanish*/el mayor mandoble
                                                  CustomMessage("a colossal cleaver", /*german*/"ein kolossaler Spalter", /*french*/"un espadon colossal")});
                                                   // /*spanish*/un estoque colosal
@@ -58,7 +59,7 @@ void StaticData::HintTable_Init_Item() {
                                               CustomMessage("a shield", /*german*/"ein Schild", /*french*/"un bouclier")
                                                // /*spanish*/un escudo
                                               }, {
-                                              CustomMessage("a wooden ward", /*german*/"eine hölzerne Abwehr", /*french*/"un écu d'écorce"),
+                                              CustomMessage("a wooden ward", /*german*/"ein hölzerner Schutz", /*french*/"un écu d'écorce"),
                                                // /*spanish*/una protección del bosque
                                               CustomMessage("a burnable barrier", /*german*/"eine brennbare Barriere", /*french*/"une protection inflammable")});
                                                // /*spanish*/una barrera quemable
@@ -74,7 +75,7 @@ void StaticData::HintTable_Init_Item() {
                                                 CustomMessage("Like Like's metal meal", /*german*/"Raubschleims Metallmahlzeit", /*french*/"un amuse-gueule de Pudding")});
                                                  // /*spanish*/un alimento de Like Like
 
-    hintTextTable[RHT_MIRROR_SHIELD] = HintText(CustomMessage("the Mirror Shield", /*german*/"das Spiegelschild", /*french*/"le Bouclier Miroir"),
+    hintTextTable[RHT_MIRROR_SHIELD] = HintText(CustomMessage("the Mirror Shield", /*german*/"der Spiegel-Schild", /*french*/"le Bouclier Miroir"),
                                                 // /*spanish*/el escudo espejo
                                                 {
                                                 CustomMessage("a shield", /*german*/"ein Schild", /*french*/"un bouclier")
@@ -87,23 +88,23 @@ void StaticData::HintTable_Init_Item() {
                                                 CustomMessage("a silvered surface", /*german*/"eine silberne Oberfläche", /*french*/"une surface argentée")});
                                                  // /*spanish*/una superficie plateada
 
-    hintTextTable[RHT_GORON_TUNIC] = HintText(CustomMessage("a Goron Tunic", /*german*/"eine Goronen-Tunika", /*french*/"une Tunique Goron"),
+    hintTextTable[RHT_GORON_TUNIC] = HintText(CustomMessage("a Goron Tunic", /*german*/"eine Goronen-Rüstung", /*french*/"une Tunique Goron"),
                                               // /*spanish*/un sayo goron
                                               {
-                                              CustomMessage("a tunic", /*german*/"eine Tunika", /*french*/"une tunique")
+                                              CustomMessage("a tunic", /*german*/"eine Rüstung", /*french*/"une tunique")
                                                // /*spanish*/un sayo
                                               }, {
-                                              CustomMessage("ruby robes", /*german*/"Rubinroben", /*french*/"un pigment rouge"),
+                                              CustomMessage("ruby robes", /*german*/"Rubinroben€", /*french*/"un pigment rouge"),
                                                // /*spanish*/una vestimenta rubí
                                               CustomMessage("fireproof fabric", /*german*/"feuerfestes Gewebe", /*french*/"un trésor anti-flamme"),
                                                // /*spanish*/una ignífuga prenda
-                                              CustomMessage("cooking clothes", /*german*/"Kochschürze", /*french*/"une tenue de cuisine")});
+                                              CustomMessage("cooking clothes", /*german*/"eine Kochschürze", /*french*/"une tenue de cuisine")});
                                                // /*spanish*/unos abrasantes ropajes
 
-    hintTextTable[RHT_ZORA_TUNIC] = HintText(CustomMessage("a Zora Tunic", /*german*/"eine Zora-Tunika", /*french*/"une Tunique Zora"),
+    hintTextTable[RHT_ZORA_TUNIC] = HintText(CustomMessage("a Zora Tunic", /*german*/"eine Zora-Rüstung", /*french*/"une Tunique Zora"),
                                              // /*spanish*/un sayo zora
                                              {
-                                             CustomMessage("a tunic", /*german*/"eine Tunika", /*french*/"une tunique"),
+                                             CustomMessage("a tunic", /*german*/"eine Rüstung", /*french*/"une tunique"),
                                               // /*spanish*/un sayo
                                              CustomMessage("something expensive", /*german*/"etwas Teures", /*french*/"une chose dispendieuse")
                                               // /*spanish*/algo caro
@@ -115,42 +116,42 @@ void StaticData::HintTable_Init_Item() {
                                              CustomMessage("a swimsuit", /*german*/"ein Badeanzug", /*french*/"un costume de baignade")});
                                               // /*spanish*/unos ropajes sumergibles
 
-    hintTextTable[RHT_IRON_BOOTS] = HintText(CustomMessage("the Iron Boots", /*german*/"die Eisenstiefel", /*french*/"une paire de Bottes de plomb"),
+    hintTextTable[RHT_IRON_BOOTS] = HintText(CustomMessage("the Iron Boots", /*german*/"die Eisenstiefel€", /*french*/"une paire de Bottes de plomb"),
                                              // /*spanish*/las botas de hierro
                                              {
-                                             CustomMessage("some boots", /*german*/"ein paar Stiefel", /*french*/"une paire de bottes"),
+                                             CustomMessage("some boots", /*german*/"ein Paar Stiefel€", /*french*/"une paire de bottes"),
                                               // /*spanish*/un par de botas
                                              CustomMessage("a feature of the Water Temple", /*german*/"ein Merkmal des Wassertempels", /*french*/"une particularité du Temple de l'Eau"),
                                               // /*spanish*/algo particular del Templo del Agua
                                              CustomMessage("something heavy", /*german*/"etwas Schweres", /*french*/"une chose pesante")
                                               // /*spanish*/algo de lo más pesado
                                              }, {
-                                             CustomMessage("sink shoes", /*german*/"Sinkschuhe", /*french*/"un boulet de fer"),
+                                             CustomMessage("sink shoes", /*german*/"Sinkschuhe€", /*french*/"un boulet de fer"),
                                               // /*spanish*/un calzado de las profundidades
-                                             CustomMessage("clank cleats", /*german*/"klirrende Knacken", /*french*/"une paire de talons bruyants")});
+                                             CustomMessage("clank cleats", /*german*/"scheppernde Stollen€", /*french*/"une paire de talons bruyants")});
                                               // /*spanish*/unas suelas férreas
 
-    hintTextTable[RHT_HOVER_BOOTS] = HintText(CustomMessage("the Hover Boots", /*german*/"die Gleitstiefel", /*french*/"une paire de Bottes des airs"),
+    hintTextTable[RHT_HOVER_BOOTS] = HintText(CustomMessage("the Hover Boots", /*german*/"die Gleitstiefel€", /*french*/"une paire de Bottes des airs"),
                                               // /*spanish*/las botas voladoras
                                               {
-                                              CustomMessage("some boots", /*german*/"ein paar Stiefel", /*french*/"une paire de bottes")
+                                              CustomMessage("some boots", /*german*/"ein Paar Stiefel€", /*french*/"une paire de bottes")
                                                // /*spanish*/un par de botas
                                               }, {
-                                              CustomMessage("butter boots", /*german*/"Butterstiefel", /*french*/"une paire de patins de beurre"),
+                                              CustomMessage("butter boots", /*german*/"Butterstiefel€", /*french*/"une paire de patins de beurre"),
                                                // /*spanish*/unas suelas resvaladizas
-                                              CustomMessage("sacred slippers", /*german*/"heilige Pantoffeln", /*french*/"une paire de pantoufles sacrées"),
+                                              CustomMessage("sacred slippers", /*german*/"heilige Pantoffeln€", /*french*/"une paire de pantoufles sacrées"),
                                                // /*spanish*/unos escurridizos botines
-                                              CustomMessage("spacewalkers", /*german*/"Weltraumstiefel", /*french*/"une paire de bottes spatiales")});
+                                              CustomMessage("spacewalkers", /*german*/"Weltraumstiefel€", /*french*/"une paire de bottes spatiales")});
                                                // /*spanish*/un calzado antigravitatorio
 
     hintTextTable[RHT_ZELDAS_LETTER] = HintText(CustomMessage("Zelda's Letter", /*german*/"Zeldas Brief", /*french*/"la Lettre de Zelda"),
                                                 // /*spanish*/la carta de Zelda
                                                 {}, {
-                                                CustomMessage("an autograph", /*german*/"ein Autograph", /*french*/"un autographe"),
+                                                CustomMessage("an autograph", /*german*/"ein Autogramm", /*french*/"un autographe"),
                                                  // /*spanish*/un autógrafo
-                                                CustomMessage("royal stationery", /*german*/"royales Briefpapier", /*french*/"du papier royal"),
+                                                CustomMessage("royal stationery", /*german*/"königliches Briefpapier", /*french*/"du papier royal"),
                                                  // /*spanish*/un escrito real
-                                                CustomMessage("royal snail mail", /*german*/"ein royaler Umschlag", /*french*/"une enveloppe royale")});
+                                                CustomMessage("royal snail mail", /*german*/"königliche Schneckenpost", /*french*/"une enveloppe royale")});
                                                  // /*spanish*/correo de la realeza
 
     hintTextTable[RHT_WEIRD_EGG] = HintText(CustomMessage("the Weird Egg", /*german*/"ein seltsames Ei", /*french*/"l'Oeuf Curieux"),
@@ -162,17 +163,17 @@ void StaticData::HintTable_Init_Item() {
                                             CustomMessage("a chicken dilemma", /*german*/"ein Hühnerdilemma", /*french*/"un drôle d'ovale")});
                                              // /*spanish*/el dilema de la gallina
 
-    hintTextTable[RHT_BOOMERANG] = HintText(CustomMessage("the Boomerang", /*german*/"ein Bumerang", /*french*/"le Boomerang"),
+    hintTextTable[RHT_BOOMERANG] = HintText(CustomMessage("the Boomerang", /*german*/"der Bumerang", /*french*/"le Boomerang"),
                                             // /*spanish*/el bumerán
                                             {
-                                            CustomMessage("something that can grab things", /*german*/"etwas, das Dinge greifen kann", /*french*/"une chose qui peut attraper"),
+                                            CustomMessage("something that can grab things", /*german*/"etwas zum Greifen", /*french*/"une chose qui peut attraper"),
                                              // /*spanish*/algo que pueda agarrar cosas
-                                            CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                            CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                              // /*spanish*/algo que pueda paralizar
                                             }, {
                                             CustomMessage("a banana", /*german*/"eine Banane", /*french*/"une banane"),
                                              // /*spanish*/un plátano
-                                            CustomMessage("a stun stick", /*german*/"ein paralysierender Stab", /*french*/"un bâton étourdissant"),
+                                            CustomMessage("a stun stick", /*german*/"ein Betäubungswerkzeug", /*french*/"un bâton étourdissant"),
                                              // /*spanish*/un palo aturdidor
                                             CustomMessage("a yellow angle", /*german*/"ein gelber Winkel", /*french*/"un angle jaune")});
                                              // /*spanish*/un ángulo amarillo
@@ -195,10 +196,10 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_MEGATON_HAMMER] = HintText(CustomMessage("the Megaton Hammer", /*german*/"der Stahlhammer", /*french*/"la Masse des Titans"),
                                                  // /*spanish*/el martillo Megatón
                                                  {
-                                                 CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
+                                                 CustomMessage("something that can remove boulders", /*german*/"etwas zum Geröll entfernen", /*french*/"une chose qui enlève les rochers")
                                                   // /*spanish*/algo que pueda quitar rocas
                                                  }, {
-                                                 CustomMessage("the dragon smasher", /*german*/"ein Drachenschläger", /*french*/"le tueur de dragons"),
+                                                 CustomMessage("the dragon smasher", /*german*/"der Drachenschläger", /*french*/"le tueur de dragons"),
                                                   // /*spanish*/un destructor de dragones
                                                  CustomMessage("the metal mallet", /*german*/"ein stählerner Schlägel", /*french*/"un outil de construction"),
                                                   // /*spanish*/un mazo de metal
@@ -215,7 +216,7 @@ void StaticData::HintTable_Init_Item() {
                                                  }, {
                                                  CustomMessage("the shake stone", /*german*/"der Schüttelstein", /*french*/"le fragment vibrant"),
                                                   // /*spanish*/el fragmento tintineante
-                                                 CustomMessage("a gray alarm", /*german*/"der graue Alarm", /*french*/"une alerte bleue")});
+                                                 CustomMessage("a gray alarm", /*german*/"ein grauer Alarm", /*french*/"une alerte bleue")});
                                                   // /*spanish*/una azul alarma
 
     hintTextTable[RHT_DINS_FIRE] = HintText(CustomMessage("Din's Fire", /*german*/"Dins Feuerinferno", /*french*/"le Feu de Din"),
@@ -257,47 +258,47 @@ void StaticData::HintTable_Init_Item() {
                                               CustomMessage("a blue barrier", /*german*/"eine blaue Barriere", /*french*/"une toison bleu")});
                                                // /*spanish*/una barrera azul
 
-    hintTextTable[RHT_FIRE_ARROWS] = HintText(CustomMessage("the Fire Arrows", /*german*/"die Feuerpfeile", /*french*/"les Flèches de Feu"),
+    hintTextTable[RHT_FIRE_ARROWS] = HintText(CustomMessage("the Fire Arrows", /*german*/"die Feuer-Pfeile€", /*french*/"les Flèches de Feu"),
                                               // /*spanish*/la flecha de fuego
                                               {
-                                              CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique")
+                                              CustomMessage("a magic arrow", /*german*/"magische Pfeile€", /*french*/"une flèche magique")
                                                // /*spanish*/una flecha mágica
                                               }, {
                                               CustomMessage("the furnace firearm", /*german*/"die Ofenwaffe", /*french*/"une fusée solaire"),
                                                // /*spanish*/el ardiente aguijón
-                                              CustomMessage("the burning bolts", /*german*/"die Brennstifte", /*french*/"un obus enflammé"),
+                                              CustomMessage("the burning bolts", /*german*/"die Brennstifte€", /*french*/"un obus enflammé"),
                                                // /*spanish*/las puntas ígneas
                                               CustomMessage("a magma missile", /*german*/"eine vulkanische Rakete", /*french*/"un missile volcanique")});
                                                // /*spanish*/el misil abrasador
 
-    hintTextTable[RHT_ICE_ARROWS] = HintText(CustomMessage("the Ice Arrows", /*german*/"die Eispfeile", /*french*/"les Flèches de Glace"),
+    hintTextTable[RHT_ICE_ARROWS] = HintText(CustomMessage("the Ice Arrows", /*german*/"die Eis-Pfeile€", /*french*/"les Flèches de Glace"),
                                              // /*spanish*/la flecha de hielo
                                              {
-                                             CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique"),
+                                             CustomMessage("a magic arrow", /*german*/"magische Pfeile€", /*french*/"une flèche magique"),
                                               // /*spanish*/una flecha mágica
-                                             CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                             CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                               // /*spanish*/algo que pueda paralizar
                                              }, {
-                                             CustomMessage("the refrigerator rocket", /*german*/"die Kühlschrankrakete", /*french*/"un missile pétrifiant"),
+                                             CustomMessage("the refrigerator rocket", /*german*/"die Kühlschrankraketen€", /*french*/"un missile pétrifiant"),
                                               // /*spanish*/el misil congelador
-                                             CustomMessage("the frostbite bolts", /*german*/"die Froststifte", /*french*/"un froid mordant"),
+                                             CustomMessage("the frostbite bolts", /*german*/"die Froststifte€", /*french*/"un froid mordant"),
                                               // /*spanish*/las puntas gélidas
                                              CustomMessage("an iceberg maker", /*german*/"ein Eisbergmacher", /*french*/"une aiguille glaciale")});
                                               // /*spanish*/el control de escarcha
 
-    hintTextTable[RHT_LIGHT_ARROWS] = HintText(CustomMessage("the Light Arrows", /*german*/"die Lichtpfeile", /*french*/"les Flèches de Lumière"),
+    hintTextTable[RHT_LIGHT_ARROWS] = HintText(CustomMessage("the Light Arrows", /*german*/"die Licht-Pfeile€", /*french*/"les Flèches de Lumière"),
                                                // /*spanish*/la flecha de luz
                                                {
-                                               CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique")
+                                               CustomMessage("a magic arrow", /*german*/"magische Pfeile€", /*french*/"une flèche magique")
                                                 // /*spanish*/una flecha mágica
                                                }, {
                                                CustomMessage("the shining shot", /*german*/"der strahlende Schuss", /*french*/"l'arme brillante"),
                                                 // /*spanish*/el haz de luz
-                                               CustomMessage("the luminous launcher", /*german*/"der leuchtende Werfer", /*french*/"un jet de lumière"),
+                                               CustomMessage("the luminous launcher", /*german*/"die Scheinwerfer€", /*french*/"un jet de lumière"),
                                                 // /*spanish*/el disparo luminoso
                                                CustomMessage("Ganondorf's bane", /*german*/"Ganondorfs Verderben", /*french*/"le fléau de Ganondorf"),
                                                 // /*spanish*/la perdición de Ganondorf
-                                               CustomMessage("the lighting bolts", /*german*/"die Lichtstifte", /*french*/"l'éclair sacré")});
+                                               CustomMessage("the lighting bolts", /*german*/"die Lichtstifte€", /*french*/"l'éclair sacré")});
                                                 // /*spanish*/las puntas resplandecientes
 
     hintTextTable[RHT_GERUDO_MEMBERSHIP_CARD] = HintText(CustomMessage("the Gerudo Membership Card", /*german*/"der Gerudo-Pass", /*french*/"la Carte Gerudo"),
@@ -314,16 +315,16 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_MAGIC_BEAN] = HintText(CustomMessage("a Magic Bean", /*german*/"eine Wundererbse", /*french*/"un Haricot Magique"),
                                              // /*spanish*/una judía mágica
                                              {
-                                             CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
+                                             CustomMessage("something sometimes buried", /*german*/"etwas gelegentlich Vergrabenes", /*french*/"une chose parfois enterrée")
                                               // /*spanish*/algo a veces enterrado
                                              }, {
                                              CustomMessage("a wizardly legume", /*german*/"eine zauberhafte Hülse", /*french*/"un légume ensorcelé")});
                                               // /*spanish*/una legumbre hechizada
 
-    hintTextTable[RHT_MAGIC_BEAN_PACK] = HintText(CustomMessage("Magic Beans", /*german*/"Wundererbsen", /*french*/"un Paquet de Haricots Magiques"),
+    hintTextTable[RHT_MAGIC_BEAN_PACK] = HintText(CustomMessage("Magic Beans", /*german*/"Wundererbsen-Packung", /*french*/"un Paquet de Haricots Magiques"),
                                                   // /*spanish*/unas judías mágicas
                                                   {
-                                                  CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
+                                                  CustomMessage("something sometimes buried", /*german*/"etwas gelegentlich Vergrabenes", /*french*/"une chose parfois enterrée")
                                                    // /*spanish*/algo a veces enterrado
                                                   }, {
                                                   CustomMessage("wizardly legumes", /*german*/"zauberhafte Hülsen", /*french*/"un paquet de légumes ensorcelés")});
@@ -344,27 +345,27 @@ void StaticData::HintTable_Init_Item() {
                                                  CustomMessage("strengthened love", /*german*/"gestärkte Liebe", /*french*/"un amour coriace")});
                                                   // /*spanish*/un amor fortalecido
 
-    hintTextTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText(CustomMessage("a Gold Skulltula Token", /*german*/"ein goldenes Skulltula-Symbol", /*french*/"un Symbole de Skulltula d'or"),
+    hintTextTable[RHT_GOLD_SKULLTULA_TOKEN] = HintText(CustomMessage("a Gold Skulltula Token", /*german*/"ein Skulltula-Symbol", /*french*/"un Symbole de Skulltula d'or"),
                                                        // /*spanish*/un símbolo de skulltula dorada
                                                        {
                                                        CustomMessage("a token of recognition", /*german*/"ein Zeichen der Anerkennung", /*french*/"une preuve de reconnaissance"),
                                                         // /*spanish*/una prueba de reconocimiento
-                                                       CustomMessage("something sometimes buried", /*german*/"etwas, das manchmal begraben ist", /*french*/"une chose parfois enterrée")
+                                                       CustomMessage("something sometimes buried", /*german*/"etwas gelegentlich Vergrabenes", /*french*/"une chose parfois enterrée")
                                                         // /*spanish*/algo a veces enterrado
                                                        }, {
                                                        CustomMessage("proof of destruction", /*german*/"Nachweis der Zerstörung", /*french*/"un certificat d'élimination"),
                                                         // /*spanish*/una prueba de la destrucción
                                                        CustomMessage("an arachnid chip", /*german*/"ein spinnenartiges Symbol", /*french*/"un symbole cranien"),
                                                         // /*spanish*/una figura arácnida
-                                                       CustomMessage("spider remains", /*german*/"Spinnenüberreste", /*french*/"une dépouille dorée"),
+                                                       CustomMessage("spider remains", /*german*/"Spinnenüberreste€", /*french*/"une dépouille dorée"),
                                                         // /*spanish*/unos restos dorados
-                                                       CustomMessage("one percent of a curse", /*german*/"ein Prozent eines Fluchs", /*french*/"un centième de malédiction")});
+                                                       CustomMessage("one percent of a curse", /*german*/"ein Prozent eines Fluches", /*french*/"un centième de malédiction")});
                                                         // /*spanish*/una centésima de una maldición
 
     hintTextTable[RHT_POCKET_EGG] = HintText(CustomMessage("the Pocket Egg", /*german*/"das Ei", /*french*/"l'Oeuf de Poche"),
                                              // /*spanish*/el huevo de bolsillo
                                              {
-                                             CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges"),
+                                             CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges"),
                                               // /*spanish*/un objeto de una misión secundaria
                                              CustomMessage("an egg", /*german*/"ein Ei", /*french*/"un oeuf")
                                               // /*spanish*/un huevo
@@ -379,7 +380,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_POCKET_CUCCO] = HintText(CustomMessage("the Pocket Cucco", /*german*/"Kiki", /*french*/"la Cocotte de Poche"),
                                                // /*spanish*/el cuco de bolsillo
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
                                                CustomMessage("a little clucker", /*german*/"ein kleiner Gackerer", /*french*/"un petit glousseur")});
@@ -388,38 +389,38 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_COJIRO] = HintText(CustomMessage("Cojiro", /*german*/"Henni", /*french*/"le p'tit poulet"),
                                          // /*spanish*/a Cojiro
                                          {
-                                         CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                         CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                           // /*spanish*/un objeto de una misión secundaria
                                          }, {
-                                         CustomMessage("a cerulean capon", /*german*/"ein coelinblaues Kapaun", /*french*/"un paon azur")});
+                                         CustomMessage("a cerulean capon", /*german*/"ein himmelsblauer Hahn", /*french*/"un paon azur")});
                                           // /*spanish*/un cerúleo capón
 
     hintTextTable[RHT_ODD_MUSHROOM] = HintText(CustomMessage("an Odd Mushroom", /*german*/"ein Schimmelpilz", /*french*/"un Champignon Suspect"),
                                                // /*spanish*/un champiñón extraño
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a powder ingredient", /*german*/"eine Puderingredienz", /*french*/"un ingrédient à poudre")});
+                                               CustomMessage("a powder ingredient", /*german*/"eine Puderzutat", /*french*/"un ingrédient à poudre")});
                                                 // /*spanish*/un oloroso ingrediente
 
     hintTextTable[RHT_ODD_POTION] = HintText(CustomMessage("an Odd Potion", /*german*/"ein Modertrank", /*french*/"une Mixture Suspecte"),
                                              // /*spanish*/una medicina rara
                                              {
-                                             CustomMessage("something that contains medicine", /*german*/"etwas, das Medizin enthält", /*french*/"une chose médicamenteuse"),
+                                             CustomMessage("something that contains medicine", /*german*/"etwas das Medizin enthält", /*french*/"une chose médicamenteuse"),
                                               // /*spanish*/algo que contenga medicina
-                                             CustomMessage("something with a strange smell", /*german*/"etwas, das streng riecht", /*french*/"une chose qui sent bizarre"),
+                                             CustomMessage("something with a strange smell", /*german*/"etwas seltsam Riechendes", /*french*/"une chose qui sent bizarre"),
                                               // /*spanish*/algo con un olor extraño
-                                             CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                             CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                               // /*spanish*/un objeto de una misión secundaria
                                              }, {
-                                             CustomMessage("Granny's goodies", /*german*/"Omas Zuckerwerk", /*french*/"la confiserie de mamie")});
+                                             CustomMessage("Granny's goodies", /*german*/"Omas Leckereien€", /*french*/"la confiserie de mamie")});
                                               // /*spanish*/la especialidad de la abuela
 
     hintTextTable[RHT_POACHERS_SAW] = HintText(CustomMessage("the Poacher's Saw", /*german*/"eine Säge", /*french*/"la Scie du Chasseur"),
                                                // /*spanish*/la sierra del furtivo
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
                                                CustomMessage("a tree killer", /*german*/"ein Baumtöter", /*french*/"un coupeur d'arbres")});
@@ -428,7 +429,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_BROKEN_SWORD] = HintText(CustomMessage("the Broken Goron's Sword", /*german*/"das zerbrochene Goronen-Schwert", /*french*/"l'Épée Brisée de Goron"),
                                                // /*spanish*/la espada goron rota
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges"),
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges"),
                                                 // /*spanish*/un objeto de una misión secundaria
                                                CustomMessage("a sword", /*german*/"ein Schwert", /*french*/"une épée")
                                                 // /*spanish*/una espada
@@ -439,27 +440,27 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_PRESCRIPTION] = HintText(CustomMessage("the Prescription", /*german*/"ein Rezept", /*french*/"une Ordonnance"),
                                                // /*spanish*/la receta
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
-                                               CustomMessage("a pill pamphlet", /*german*/"ein Pillenpamphlet", /*french*/"un document urgent"),
+                                               CustomMessage("a pill pamphlet", /*german*/"eine Pillenbroschüre", /*french*/"un document urgent"),
                                                 // /*spanish*/un instructivo medicinal
-                                               CustomMessage("a doctor's note", /*german*/"eine Notiz eines Doktors", /*french*/"un papier médical")});
+                                               CustomMessage("a doctor's note", /*german*/"ein ärztliches Attest", /*french*/"un papier médical")});
                                                 // /*spanish*/unas notas del doctor
 
-    hintTextTable[RHT_EYEBALL_FROG] = HintText(CustomMessage("the Eyeball Frog", /*german*/"der Glotzfrosch", /*french*/"le Crapaud-qui-louche"),
+    hintTextTable[RHT_EYEBALL_FROG] = HintText(CustomMessage("the Eyeball Frog", /*german*/"ein Glotzfrosch", /*french*/"le Crapaud-qui-louche"),
                                                // /*spanish*/la rana de ojos saltones
                                                {
-                                               CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                               CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                 // /*spanish*/un objeto de una misión secundaria
                                                }, {
                                                CustomMessage("a perceiving polliwog", /*german*/"eine wahrnehmende Kaulquappe", /*french*/"un amphibien")});
                                                 // /*spanish*/un variopinto batracio
 
-    hintTextTable[RHT_EYEDROPS] = HintText(CustomMessage("the Eyedrops", /*german*/"die Augentropfen", /*french*/"une phiole de Super-Gouttes"),
+    hintTextTable[RHT_EYEDROPS] = HintText(CustomMessage("the Eyedrops", /*german*/"Augentropfen", /*french*/"une phiole de Super-Gouttes"),
                                            // /*spanish*/las supergotas oculares
                                            {
-                                           CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                           CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                             // /*spanish*/un objeto de una misión secundaria
                                            }, {
                                            CustomMessage("a vision vial", /*german*/"eine Sichtphiole", /*french*/"une solution oculaire")});
@@ -468,46 +469,46 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_CLAIM_CHECK] = HintText(CustomMessage("the Claim Check", /*german*/"ein Zertifikat", /*french*/"un Certificat"),
                                               // /*spanish*/el recibo
                                               {
-                                              CustomMessage("a trade quest item", /*german*/"ein Gegenstand einer Handelsmission", /*french*/"un objet de quête d'échanges")
+                                              CustomMessage("a trade quest item", /*german*/"ein Handelsgegenstand", /*french*/"un objet de quête d'échanges")
                                                // /*spanish*/un objeto de una misión secundaria
                                               }, {
                                               CustomMessage("a three day wait", /*german*/"eine dreitägige Erwartung", /*french*/"un rendez-vous dans trois jours")});
                                                // /*spanish*/unos tres días de espera
 
-    hintTextTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText(CustomMessage("a Hookshot", /*german*/"ein Enterhaken", /*french*/"un Grappin"),
+    hintTextTable[RHT_PROGRESSIVE_HOOKSHOT] = HintText(CustomMessage("a Hookshot", /*german*/"ein Fanghaken", /*french*/"un Grappin"),
                                                        // /*spanish*/un gancho
                                                        {
-                                                       CustomMessage("something that can grab things", /*german*/"etwas, das Dinge greifen kann", /*french*/"une chose qui peut attraper"),
+                                                       CustomMessage("something that can grab things", /*german*/"etwas zum Greifen", /*french*/"une chose qui peut attraper"),
                                                         // /*spanish*/algo que pueda agarrar cosas
-                                                       CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                                       CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                                         // /*spanish*/algo que pueda paralizar
                                                        }, {
-                                                       CustomMessage("Dampé's keepsake", /*german*/"Dampés Andenken", /*french*/"l'héritage d'Igor"),
+                                                       CustomMessage("Dampé's keepsake", /*german*/"Boris' Andenken", /*french*/"l'héritage d'Igor"),
                                                         // /*spanish*/un recuerdo de Dampé
-                                                       CustomMessage("the Grapple Beam", /*german*/"der Greifstrahl", /*french*/"le rayon grippeur"),
+                                                       CustomMessage("the Grapple Beam", /*german*/"der Grapple Beam", /*french*/"le rayon grippeur"),
                                                         // /*spanish*/una garra metálica
-                                                       CustomMessage("the RHT_BOING! chain", /*german*/"die Kette des RHT_BOING!", /*french*/"la chaîne de RHT_BOING!")});
+                                                       CustomMessage("the BOING! chain", /*german*/"die BOING!-Kette", /*french*/"la chaîne de BOING!")});
                                                         // /*spanish*/una cadena retráctil
 
-    hintTextTable[RHT_PROGRESSIVE_STRENGTH] = HintText(CustomMessage("a Strength Upgrade", /*german*/"eine Stärkeverbesserung", /*french*/"une Amélioration de Force"),
+    hintTextTable[RHT_PROGRESSIVE_STRENGTH] = HintText(CustomMessage("a Strength Upgrade", /*german*/"eine Kraftsteigerung", /*french*/"une Amélioration de Force"),
                                                        // /*spanish*/un aumento de fuerza
                                                        {
-                                                       CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
+                                                       CustomMessage("something that can remove boulders", /*german*/"etwas zum Geröll entfernen", /*french*/"une chose qui enlève les rochers")
                                                         // /*spanish*/algo que pueda quitar rocas
                                                        }, {
-                                                       CustomMessage("power gloves", /*german*/"Krafthandschuhe", /*french*/"une paire de gants de travail"),
+                                                       CustomMessage("power gloves", /*german*/"Krafthandschuhe€", /*french*/"une paire de gants de travail"),
                                                         // /*spanish*/unos poderosos guanteletes
-                                                       CustomMessage("metal mittens", /*german*/"Metallfäustlinge", /*french*/"une paire de mitaines"),
+                                                       CustomMessage("metal mittens", /*german*/"Metall-Fäustlinge€", /*french*/"une paire de mitaines"),
                                                         // /*spanish*/unas manoplas metálicas
                                                        CustomMessage("the heavy lifty", /*german*/"der Schwerlastheber", /*french*/"la puissance de dix hommes")});
                                                         // /*spanish*/un levantamiento pesado
 
-    hintTextTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText(CustomMessage("a Bomb Bag", /*german*/"ein Bombenbeutel", /*french*/"un Sac de Bombes"),
+    hintTextTable[RHT_PROGRESSIVE_BOMB_BAG] = HintText(CustomMessage("a Bomb Bag", /*german*/"eine Bombentasche", /*french*/"un Sac de Bombes"),
                                                        // /*spanish*/un saco de bombas
                                                        {
-                                                       CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs"),
+                                                       CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs"),
                                                         // /*spanish*/un montón de explosivos
-                                                       CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
+                                                       CustomMessage("something that can remove boulders", /*german*/"etwas zum Geröll entfernen", /*french*/"une chose qui enlève les rochers")
                                                         // /*spanish*/algo que pueda quitar rocas
                                                        }, {
                                                        CustomMessage("an explosive container", /*german*/"ein Explosivbehälter", /*french*/"un porte-grenade"),
@@ -526,20 +527,20 @@ void StaticData::HintTable_Init_Item() {
                                                   CustomMessage("a danger dart launcher", /*german*/"ein Pfeilwerfer", /*french*/"un tire-fléchette")});
                                                    // /*spanish*/un peligroso lanzadardos
 
-    hintTextTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText(CustomMessage("a Slingshot", /*german*/"eine Schleuder", /*french*/"un Lance-Pierre"),
+    hintTextTable[RHT_PROGRESSIVE_SLINGSHOT] = HintText(CustomMessage("a Slingshot", /*german*/"eine Feen-Schleuder", /*french*/"un Lance-Pierre"),
                                                         // /*spanish*/una resortera de las hadas
                                                         {
                                                         CustomMessage("a projectile shooter", /*german*/"ein Projektilwerfer", /*french*/"un tire-projectile")
                                                          // /*spanish*/un arma de proyectil
                                                         }, {
-                                                        CustomMessage("a seed shooter", /*german*/"ein Nusswerfer", /*french*/"un lance-noix"),
+                                                        CustomMessage("a seed shooter", /*german*/"ein Kernwerfer", /*french*/"un lance-noix"),
                                                          // /*spanish*/un lanzasemillas
                                                         CustomMessage("a rubberband", /*german*/"ein Gummiband", /*french*/"un élastique"),
                                                          // /*spanish*/un tirachinas
                                                         CustomMessage("a child's catapult", /*german*/"ein Kinderkatapult", /*french*/"un jouet d'enfant")});
                                                          // /*spanish*/una catapulta infantil
 
-    hintTextTable[RHT_PROGRESSIVE_WALLET] = HintText(CustomMessage("a Wallet", /*german*/"eine Börse", /*french*/"une Bourse"),
+    hintTextTable[RHT_PROGRESSIVE_WALLET] = HintText(CustomMessage("a Wallet", /*german*/"eine Geldbörse", /*french*/"une Bourse"),
                                                      // /*spanish*/una bolsa de rupias
                                                      {
                                                      CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas")
@@ -568,10 +569,10 @@ void StaticData::HintTable_Init_Item() {
                                                           {
                                                           CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                            // /*spanish*/un montón de municiones Deku
-                                                          CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                                          CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                                            // /*spanish*/algo que pueda paralizar
                                                           }, {
-                                                          CustomMessage("more nuts", /*german*/"mehr Nüsse", /*french*/"encore plus de noix"),
+                                                          CustomMessage("more nuts", /*german*/"mehr Nüsse€", /*french*/"encore plus de noix"),
                                                            // /*spanish*/más semillas de nogal
                                                           CustomMessage("flashbang storage", /*german*/"Blendgranatenvorrat", /*french*/"un sac à noix")});
                                                            // /*spanish*/más frutos aturdidores
@@ -582,12 +583,12 @@ void StaticData::HintTable_Init_Item() {
                                                             CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo")
                                                              // /*spanish*/un montón de municiones Deku
                                                             }, {
-                                                            CustomMessage("lumber racks", /*german*/"Holzgestelle", /*french*/"un paquet de bois"),
+                                                            CustomMessage("lumber racks", /*german*/"Holzgestelle€", /*french*/"un paquet de bois"),
                                                              // /*spanish*/más bastones
                                                             CustomMessage("more flammable twigs", /*german*/"mehr entflammbare Zweige", /*french*/"beaucoup de branches")});
                                                              // /*spanish*/más varas
 
-    hintTextTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText(CustomMessage("a Magic Meter", /*german*/"ein Magieabmaß", /*french*/"une Jauge de Magie"),
+    hintTextTable[RHT_PROGRESSIVE_MAGIC_METER] = HintText(CustomMessage("a Magic Meter", /*german*/"Magische Kraft", /*french*/"une Jauge de Magie"),
                                                           // /*spanish*/un aumento de poder mágico
                                                           {
                                                           CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée")
@@ -605,7 +606,7 @@ void StaticData::HintTable_Init_Item() {
                                                       {
                                                       CustomMessage("something given by Saria", /*german*/"ein Geschenk von Salia", /*french*/"un cadeau de Saria"),
                                                        // /*spanish*/un obsequio de Saria
-                                                      CustomMessage("something kept by the royal family", /*german*/"etwas, das von der royalen Familie bewahrt wird", /*french*/"une chose qui paralyse")
+                                                      CustomMessage("something kept by the royal family", /*german*/"etwas aus dem Besitz der Königsfamilie", /*french*/"une chose qui paralyse")
                                                        // /*spanish*/algo guardado por la familia real
                                                       }, {
                                                       CustomMessage("a flute", /*german*/"eine Flöte", /*french*/"un bec musical"),
@@ -613,21 +614,21 @@ void StaticData::HintTable_Init_Item() {
                                                       CustomMessage("a music maker", /*german*/"ein Musikmacher", /*french*/"un porteur de chansons")});
                                                        // /*spanish*/un instrumento
 
-    hintTextTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText(CustomMessage("Bombchus", /*german*/"Krabbelminen", /*french*/"un paquet de Missiles"),
+    hintTextTable[RHT_PROGRESSIVE_BOMBCHUS] = HintText(CustomMessage("Bombchus", /*german*/"Krabbelminen€", /*french*/"un paquet de Missiles"),
                                                        // /*spanish*/unos bombchus
                                                        {
                                                        CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                                         // /*spanish*/un obsequio de la Casa Skulltula
-                                                       CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs")
+                                                       CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                                         // /*spanish*/un montón de explosivos
                                                        }, {
-                                                       CustomMessage("mice bombs", /*german*/"Mäusebomben", /*french*/"un adorable explosif"),
+                                                       CustomMessage("mice bombs", /*german*/"Mäusebomben€", /*french*/"un adorable explosif"),
                                                         // /*spanish*/unas bombas roedoras
-                                                       CustomMessage("proximity mice", /*german*/"Näherungsmäuse", /*french*/"une mine anti-rongeur"),
+                                                       CustomMessage("proximity mice", /*german*/"Näherungsmäuse€", /*french*/"une mine anti-rongeur"),
                                                         // /*spanish*/unos explosivos ratoncitos
-                                                       CustomMessage("wall crawlers", /*german*/"Wandkrabbler", /*french*/"un rapide grimpeur"),
+                                                       CustomMessage("wall crawlers", /*german*/"Wandkrabbler€", /*french*/"un rapide grimpeur"),
                                                         // /*spanish*/unos trepaparedes
-                                                       CustomMessage("trail blazers", /*german*/"Vorreiter", /*french*/"un zigzag éclatant")});
+                                                       CustomMessage("trail blazers", /*german*/"Vorreiter€", /*french*/"un zigzag éclatant")});
                                                         // /*spanish*/unas ratas propulsadas
 
     hintTextTable[RHT_PROGRESSIVE_GORONSWORD] = HintText(CustomMessage("a Goron Sword", /*german*/"ein Goronen-Schwert", /*french*/"une épée Goron"),
@@ -641,7 +642,7 @@ void StaticData::HintTable_Init_Item() {
                                                          CustomMessage("a Goron weapon", /*german*/"eine Goronenwaffe", /*french*/"une arme Goron")});
                                                           // /*spanish*/un arma goron
 
-    hintTextTable[RHT_EMPTY_BOTTLE] = HintText(CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon vide"),
+    hintTextTable[RHT_EMPTY_BOTTLE] = HintText(CustomMessage("a bottle", /*german*/"eine leere Flasche", /*french*/"un flacon vide"),
                                                // /*spanish*/una botella
                                                {
                                                CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
@@ -649,12 +650,12 @@ void StaticData::HintTable_Init_Item() {
                                                }, {
                                                CustomMessage("a glass container", /*german*/"ein Glasbehälter", /*french*/"un cylindre de cristal"),
                                                 // /*spanish*/un recipiente de cristal
-                                               CustomMessage("an empty jar", /*german*/"ein leerer Krug", /*french*/"une jarre incassable"),
+                                               CustomMessage("an empty jar", /*german*/"ein leeres Gefäß", /*french*/"une jarre incassable"),
                                                 // /*spanish*/un frasco vacío
                                                CustomMessage("encased air", /*german*/"eingeschlossene Luft", /*french*/"un bocal d'air")});
                                                 // /*spanish*/aire a presión
 
-    hintTextTable[RHT_BOTTLE_WITH_MILK] = HintText(CustomMessage("a Milk Bottle", /*german*/"eine Milchflasche", /*french*/"un flacon de lait"),
+    hintTextTable[RHT_BOTTLE_WITH_MILK] = HintText(CustomMessage("a Milk Bottle", /*german*/"eine Flasche mit Milch", /*french*/"un flacon de lait"),
                                                    // /*spanish*/una botella de leche
                                                    {
                                                    CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
@@ -695,12 +696,12 @@ void StaticData::HintTable_Init_Item() {
                                                           CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                            // /*spanish*/una botella
                                                           }, {
-                                                          CustomMessage("an ailment antidote", /*german*/"ein Krankheitsantidot", /*french*/"l'élixir ultime"),
+                                                          CustomMessage("an ailment antidote", /*german*/"ein Allheilmittel", /*french*/"l'élixir ultime"),
                                                            // /*spanish*/un antídoto para el dolor
                                                           CustomMessage("a blue liquid", /*german*/"eine blaue Flüssigkeit", /*french*/"un liquide bleu")});
                                                            // /*spanish*/un remedio índigo
 
-    hintTextTable[RHT_BOTTLE_WITH_FAIRY] = HintText(CustomMessage("a Fairy Bottle", /*german*/"eine Feenflasche", /*french*/"une fée en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_FAIRY] = HintText(CustomMessage("a Fairy Bottle", /*german*/"eine Flasche mit Fee", /*french*/"une fée en flacon"),
                                                     // /*spanish*/un hada en una botella
                                                     {
                                                     CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
@@ -710,10 +711,10 @@ void StaticData::HintTable_Init_Item() {
                                                      // /*spanish*/un hada atrapada
                                                     CustomMessage("an extra life", /*german*/"ein Extraleben", /*french*/"une vie de rechange"),
                                                      // /*spanish*/una oportunidad más
-                                                    CustomMessage("Navi's cousin", /*german*/"Navis Vetter", /*french*/"le cousin de Navi")});
+                                                    CustomMessage("Navi's cousin", /*german*/"Navis Cousine", /*french*/"le cousin de Navi")});
                                                      // /*spanish*/una prima de Navi
 
-    hintTextTable[RHT_BOTTLE_WITH_FISH] = HintText(CustomMessage("a Fish Bottle", /*german*/"eine Fischflasche", /*french*/"un poisson en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_FISH] = HintText(CustomMessage("a Fish Bottle", /*german*/"eine Flasche mit Fisch", /*french*/"un poisson en flacon"),
                                                    // /*spanish*/un pez en una botella
                                                    {
                                                    CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
@@ -721,7 +722,7 @@ void StaticData::HintTable_Init_Item() {
                                                    }, {
                                                    CustomMessage("an aquarium", /*german*/"ein Aquarium", /*french*/"un aquarium"),
                                                     // /*spanish*/un escamado ser
-                                                   CustomMessage("a deity's snack", /*german*/"ein Gottheitssnack", /*french*/"le repas d'un dieu marin")});
+                                                   CustomMessage("a deity's snack", /*german*/"ein göttlicher Snack", /*french*/"le repas d'un dieu marin")});
                                                     // /*spanish*/un tentempié de cierta deidad
 
     hintTextTable[RHT_BOTTLE_WITH_BLUE_FIRE] = HintText(CustomMessage("a Blue Fire Bottle", /*german*/"eine Flasche mit blauem Feuer", /*french*/"une flamme bleue en flacon"),
@@ -732,10 +733,10 @@ void StaticData::HintTable_Init_Item() {
                                                         }, {
                                                         CustomMessage("a conflagration canteen", /*german*/"eine Brandfeldflasche", /*french*/"une mystérieuse flamme"),
                                                          // /*spanish*/un incendio retenido
-                                                        CustomMessage("an icemelt jar", /*german*/"ein eisschmelzender Krug", /*french*/"un brasier glacial")});
+                                                        CustomMessage("an icemelt jar", /*german*/"ein eisschmelzendes Gefäß", /*french*/"un brasier glacial")});
                                                          // /*spanish*/unas brasas enfrascadas
 
-    hintTextTable[RHT_BOTTLE_WITH_BUGS] = HintText(CustomMessage("a Bug Bottle", /*german*/"eine Wanzenflasche", /*french*/"un insecte en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_BUGS] = HintText(CustomMessage("a Bug Bottle", /*german*/"eine Flasche mit Käfern", /*french*/"un insecte en flacon"),
                                                    // /*spanish*/unos insectos en una botella
                                                    {
                                                    CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
@@ -746,24 +747,24 @@ void StaticData::HintTable_Init_Item() {
                                                    CustomMessage("Skulltula finders", /*german*/"Skulltula-Finder", /*french*/"une poignée de trouve-Skulltula")});
                                                     // /*spanish*/unos rastreadores de skulltulas
 
-    hintTextTable[RHT_BOTTLE_WITH_POE] = HintText(CustomMessage("a Poe Bottle", /*german*/"eine Irrlichtflasche", /*french*/"un Esprit en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_POE] = HintText(CustomMessage("a Poe Bottle", /*german*/"eine Flasche mit Irrlicht", /*french*/"un Esprit en flacon"),
                                                   // /*spanish*/un Poe en una botella
                                                   {
                                                   CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                    // /*spanish*/una botella
                                                   }, {
-                                                  CustomMessage("a spooky ghost", /*german*/"ein spukhafter Geist", /*french*/"un effroyable fantôme"),
+                                                  CustomMessage("a spooky ghost", /*german*/"ein gruseliger Geist", /*french*/"un effroyable fantôme"),
                                                    // /*spanish*/un espantoso espectro
-                                                  CustomMessage("a face in the jar", /*german*/"ein Gesicht im Krug", /*french*/"un visage dans un bocal")});
+                                                  CustomMessage("a face in the jar", /*german*/"ein Gesicht im Gefäß", /*french*/"un visage dans un bocal")});
                                                    // /*spanish*/una expresión enfrascada
 
-    hintTextTable[RHT_BOTTLE_WITH_BIG_POE] = HintText(CustomMessage("a Big Poe Bottle", /*german*/"eine Nachtschwärmerflasche", /*french*/"une Ame en flacon"),
+    hintTextTable[RHT_BOTTLE_WITH_BIG_POE] = HintText(CustomMessage("a Big Poe Bottle", /*german*/"eine Flasche mit Nachtschwärmer", /*french*/"une Ame en flacon"),
                                                       // /*spanish*/un Gran Poe en una botella
                                                       {
                                                       CustomMessage("a bottle", /*german*/"eine Flasche", /*french*/"un flacon")
                                                        // /*spanish*/una botella
                                                       }, {
-                                                      CustomMessage("the spookiest ghost", /*german*/"der spukhafteste Geist", /*french*/"un épouvantable spectre"),
+                                                      CustomMessage("the spookiest ghost", /*german*/"der gruseligste Geist", /*french*/"un épouvantable spectre"),
                                                        // /*spanish*/el espectro más espeluznante
                                                       CustomMessage("a sidequest spirit", /*german*/"ein Nebenmissionsgeist", /*french*/"un précieux esprit")});
                                                        // /*spanish*/un buen valorado espíritu
@@ -778,28 +779,28 @@ void StaticData::HintTable_Init_Item() {
                                                 // /*spanish*/una llamada de auxilio
                                                CustomMessage("the note that Mweeps", /*german*/"eine Notiz, die Mweeps", /*french*/"un message qui fait mwip"),
                                                 // /*spanish*/un escrito mweep
-                                               CustomMessage("an RHT_SOS call", /*german*/"ein RHT_SOS Signal", /*french*/"un signal RHT_SOS"),
+                                               CustomMessage("an SOS call", /*german*/"ein Notrufsignal", /*french*/"un signal SOS"),
                                                 // /*spanish*/una nota de socorro
-                                               CustomMessage("a fishy stationery", /*german*/"ein nasses Papier", /*french*/"un papier mouillé")});
+                                               CustomMessage("a fishy stationery", /*german*/"fischiges Briefpapier", /*french*/"un papier mouillé")});
                                                 // /*spanish*/un mensaje de ayuda
 
     hintTextTable[RHT_ZELDAS_LULLABY] = HintText(CustomMessage("Zelda's Lullaby", /*german*/"Zeldas Wiegenlied", /*french*/"la berceuse de Zelda"),
                                                  // /*spanish*/la Nana de Zelda
                                                  {
-                                                 CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
+                                                 CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale"),
                                                   // /*spanish*/una cancion normal
-                                                 CustomMessage("something kept by the royal family", /*german*/"etwas, das von der royalen Familie bewahrt wird", /*french*/"une chose qui paralyse")
+                                                 CustomMessage("something kept by the royal family", /*german*/"etwas aus dem Besitz der Königsfamilie", /*french*/"une chose qui paralyse")
                                                   // /*spanish*/algo guardado por la familia real
                                                  }, {
-                                                 CustomMessage("a song of royal slumber", /*german*/"ein royales Lied", /*french*/"une chanson royale"),
+                                                 CustomMessage("a song of royal slumber", /*german*/"ein königliches Schlaflied", /*french*/"une chanson royale"),
                                                   // /*spanish*/la canción real
-                                                 CustomMessage("a triforce tune", /*german*/"eine heilige Musik", /*french*/"la musique sacrée")});
+                                                 CustomMessage("a triforce tune", /*german*/"die Melodie des Triforce", /*french*/"la musique sacrée")});
                                                   // /*spanish*/la melodía de la trifuerza
 
     hintTextTable[RHT_EPONAS_SONG] = HintText(CustomMessage("Epona's Song", /*german*/"Eponas Lied", /*french*/"le chant d'Epona"),
                                               // /*spanish*/la Canción de Epona
                                               {
-                                              CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
+                                              CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale")
                                                // /*spanish*/una cancion normal
                                               }, {
                                               CustomMessage("an equestrian etude", /*german*/"eine Reiterhymne", /*french*/"une hymne équestre"),
@@ -812,7 +813,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_SARIAS_SONG] = HintText(CustomMessage("Saria's Song", /*german*/"Salias Lied", /*french*/"le chant de Saria"),
                                               // /*spanish*/la Canción de Saria
                                               {
-                                              CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
+                                              CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale"),
                                                // /*spanish*/una cancion normal
                                               CustomMessage("something given by Saria", /*german*/"ein Geschenk von Salia", /*french*/"un cadeau de Saria")
                                                // /*spanish*/un obsequio de Saria
@@ -822,236 +823,236 @@ void StaticData::HintTable_Init_Item() {
                                               CustomMessage("Saria's phone number", /*german*/"Salias Telefonnummer", /*french*/"le téléphone d'une amie")});
                                                // /*spanish*/una consulta de asistencia
 
-    hintTextTable[RHT_SUNS_SONG] = HintText(CustomMessage("the Sun's Song", /*german*/"Hymne der Sonne", /*french*/"le chant du soleil"),
+    hintTextTable[RHT_SUNS_SONG] = HintText(CustomMessage("the Sun's Song", /*german*/"die Hymne der Sonne", /*french*/"le chant du soleil"),
                                             // /*spanish*/la Canción del Sol
                                             {
-                                            CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale"),
+                                            CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale"),
                                              // /*spanish*/una cancion normal
-                                            CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                            CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                              // /*spanish*/algo que pueda paralizar
                                             }, {
-                                            CustomMessage("Sunny Day", /*german*/"sonniger Tag", /*french*/"Zénith"),
+                                            CustomMessage("Sunny Day", /*german*/"ein sonniger Tag", /*french*/"Zénith"),
                                              // /*spanish*/un día soleado
                                             CustomMessage("the ReDead's bane", /*german*/"das Verderben der Remorts", /*french*/"le fléau des Éffrois"),
                                              // /*spanish*/la destructora de Redeads
                                             CustomMessage("the Gibdo's bane", /*german*/"das Verderben der Gibdos", /*french*/"le fléau des Gibdo")});
                                              // /*spanish*/la destructora de Gibdos
 
-    hintTextTable[RHT_SONG_OF_TIME] = HintText(CustomMessage("the Song of Time", /*german*/"Hymne der Zeit", /*french*/"le chant du temps"),
+    hintTextTable[RHT_SONG_OF_TIME] = HintText(CustomMessage("the Song of Time", /*german*/"die Hymne der Zeit", /*french*/"le chant du temps"),
                                                // /*spanish*/la Canción del tiempo
                                                {
-                                               CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
+                                               CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale")
                                                 // /*spanish*/una cancion normal
                                                }, {
                                                CustomMessage("a song 7 years long", /*german*/"ein sieben Jahre langes Lied", /*french*/"le flot du temps"),
                                                 // /*spanish*/la setenada canción
-                                               CustomMessage("the tune of ages", /*german*/"Hymne des Äons", /*french*/"le Chant des Âges")});
+                                               CustomMessage("the tune of ages", /*german*/"die Melodie der Äonen", /*french*/"le Chant des Âges")});
                                                 // /*spanish*/la melodía eónica
 
-    hintTextTable[RHT_SONG_OF_STORMS] = HintText(CustomMessage("the Song of Storms", /*german*/"Hymne des Sturms", /*french*/"le chant des tempêtes"),
+    hintTextTable[RHT_SONG_OF_STORMS] = HintText(CustomMessage("the Song of Storms", /*german*/"die Hymne des Sturms", /*french*/"le chant des tempêtes"),
                                                  // /*spanish*/la Canción de la Tormenta
                                                  {
-                                                 CustomMessage("a regular song", /*german*/"ein normales Lied", /*french*/"une chanson normale")
+                                                 CustomMessage("a regular song", /*german*/"ein gewöhnliches Lied", /*french*/"une chanson normale")
                                                   // /*spanish*/una cancion normal
                                                  }, {
-                                                 CustomMessage("Rain Dance", /*german*/"Regentanz", /*french*/"Danse Pluie"),
+                                                 CustomMessage("Rain Dance", /*german*/"ein Regentanz", /*french*/"Danse Pluie"),
                                                   // /*spanish*/la danza de la lluvia
-                                                 CustomMessage("a thunderstorm tune", /*german*/"eine Gewitterhymne", /*french*/"une hymne foudroyante"),
+                                                 CustomMessage("a thunderstorm tune", /*german*/"die Melodie des Gewitters", /*french*/"une hymne foudroyante"),
                                                   // /*spanish*/una sonata tormentosa
-                                                 CustomMessage("windmill acceleration", /*german*/"Windmühlenbeschleunigung", /*french*/"l'accélérateur de moulins")});
+                                                 CustomMessage("windmill acceleration", /*german*/"eine Windmühlenbeschleunigung", /*french*/"l'accélérateur de moulins")});
                                                   // /*spanish*/el arranque de molinos
 
-    hintTextTable[RHT_MINUET_OF_FOREST] = HintText(CustomMessage("the Minuet of Forest", /*german*/"Menuett des Waldes", /*french*/"le menuet de la forêt"),
+    hintTextTable[RHT_MINUET_OF_FOREST] = HintText(CustomMessage("the Minuet of Forest", /*german*/"das Menuett des Waldes", /*french*/"le menuet de la forêt"),
                                                    // /*spanish*/el Minueto del bosque
                                                    {
                                                    CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                     // /*spanish*/una canción de teletransportación
                                                    }, {
-                                                   CustomMessage("the song of tall trees", /*german*/"Lied der großen Bäume", /*french*/"le bruit des arbres"),
+                                                   CustomMessage("the song of tall trees", /*german*/"das Lied der großen Bäume", /*french*/"le bruit des arbres"),
                                                     // /*spanish*/la canción de las copas
                                                    CustomMessage("an arboreal anthem", /*german*/"eine baumartige Hymne", /*french*/"l'hymne sylvestre"),
                                                     // /*spanish*/el himno forestal
-                                                   CustomMessage("a green spark trail", /*german*/"ein grüner Komet", /*french*/"une comète verte")});
+                                                   CustomMessage("a green spark trail", /*german*/"grüne Funken€", /*french*/"une comète verte")});
                                                     // /*spanish*/el sendero esmeralda
 
-    hintTextTable[RHT_BOLERO_OF_FIRE] = HintText(CustomMessage("the Bolero of Fire", /*german*/"Bolero des Feuers", /*french*/"le boléro du feu"),
+    hintTextTable[RHT_BOLERO_OF_FIRE] = HintText(CustomMessage("the Bolero of Fire", /*german*/"der Bolero des Feuers", /*french*/"le boléro du feu"),
                                                  // /*spanish*/el Bolero del fuego
                                                  {
                                                  CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                   // /*spanish*/una canción de teletransportación
                                                  }, {
-                                                 CustomMessage("a song of lethal lava", /*german*/"Lied der tödlichen Lava", /*french*/"une musique enflammée"),
+                                                 CustomMessage("a song of lethal lava", /*german*/"das Lied der tödlichen Lava", /*french*/"une musique enflammée"),
                                                   // /*spanish*/la canción de la lava
-                                                 CustomMessage("a red spark trail", /*german*/"ein roter Komet", /*french*/"une comète rouge"),
+                                                 CustomMessage("a red spark trail", /*german*/"rote Funken€", /*french*/"une comète rouge"),
                                                   // /*spanish*/el sendero rubí
                                                  CustomMessage("a volcanic verse", /*german*/"ein vulkanischer Vers", /*french*/"le souffle du volcan")});
                                                   // /*spanish*/el verso volcánico
 
-    hintTextTable[RHT_SERENADE_OF_WATER] = HintText(CustomMessage("the Serenade of Water", /*german*/"Serenade des Wassers", /*french*/"la sérénade de l'eau"),
+    hintTextTable[RHT_SERENADE_OF_WATER] = HintText(CustomMessage("the Serenade of Water", /*german*/"die Serenade des Wassers", /*french*/"la sérénade de l'eau"),
                                                     // /*spanish*/la Serenata del agua
                                                     {
                                                     CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                      // /*spanish*/una canción de teletransportación
                                                     }, {
-                                                    CustomMessage("a song of a damp ditch", /*german*/"die Stille des Wassers", /*french*/"le calme de l'eau"),
+                                                    CustomMessage("a song of a damp ditch", /*german*/"ein Lied der Gewässer", /*french*/"le calme de l'eau"),
                                                      // /*spanish*/la canción del estanque
-                                                    CustomMessage("a blue spark trail", /*german*/"ein blauer Komet", /*french*/"une comète bleue"),
+                                                    CustomMessage("a blue spark trail", /*german*/"blaue Funken€", /*french*/"une comète bleue"),
                                                      // /*spanish*/el sendero zafiro
                                                     CustomMessage("the lake's lyric", /*german*/"die Lyrik des Sees", /*french*/"la voix du lac")});
                                                      // /*spanish*/la letra del lago
 
-    hintTextTable[RHT_REQUIEM_OF_SPIRIT] = HintText(CustomMessage("the Requiem of Spirit", /*german*/"Requiem der Geister", /*french*/"le requiem des esprits"),
+    hintTextTable[RHT_REQUIEM_OF_SPIRIT] = HintText(CustomMessage("the Requiem of Spirit", /*german*/"das Requiem der Geister", /*french*/"le requiem des esprits"),
                                                     // /*spanish*/el Réquiem del espíritu
                                                     {
                                                     CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                      // /*spanish*/una canción de teletransportación
                                                     }, {
-                                                    CustomMessage("a song of sandy statues", /*german*/"Lied der sandigen Statuen", /*french*/"la mélodie d'une grande statue"),
+                                                    CustomMessage("a song of sandy statues", /*german*/"ein Lied der sandigen Statuen", /*french*/"la mélodie d'une grande statue"),
                                                      // /*spanish*/la canción de la gran estatua
-                                                    CustomMessage("an orange spark trail", /*german*/"ein oranger Komet", /*french*/"une comète orange"),
+                                                    CustomMessage("an orange spark trail", /*german*/"orangene Funken€", /*french*/"une comète orange"),
                                                      // /*spanish*/el sendero ámbar
                                                     CustomMessage("the desert ditty", /*german*/"der Wind der Wüste", /*french*/"le vent du désert")});
                                                      // /*spanish*/la estrofa del desierto
 
-    hintTextTable[RHT_NOCTURNE_OF_SHADOW] = HintText(CustomMessage("the Nocturne of Shadow", /*german*/"Nocturne des Schattens", /*french*/"le nocturne de l'ombre"),
+    hintTextTable[RHT_NOCTURNE_OF_SHADOW] = HintText(CustomMessage("the Nocturne of Shadow", /*german*/"die Nocturne des Schattens", /*french*/"le nocturne de l'ombre"),
                                                      // /*spanish*/el Nocturno de la sombra
                                                      {
                                                      CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                       // /*spanish*/una canción de teletransportación
                                                      }, {
-                                                     CustomMessage("a song of spooky spirits", /*german*/"Lied der spukhaften Geister", /*french*/"une hymne de chair de poule"),
+                                                     CustomMessage("a song of spooky spirits", /*german*/"das Lied der spukenden Geister", /*french*/"une hymne de chair de poule"),
                                                       // /*spanish*/la canción de los espectros
                                                      CustomMessage("a graveyard boogie", /*german*/"ein Friedhofsboogie", /*french*/"un boogie de fantômes"),
                                                       // /*spanish*/una honra fúnebre
-                                                     CustomMessage("a haunted hymn", /*german*/"eine Spukhymne", /*french*/"une chanson lugubre"),
+                                                     CustomMessage("a haunted hymn", /*german*/"eine heimgesuchte Hymne", /*french*/"une chanson lugubre"),
                                                       // /*spanish*/una estrofa encantada
-                                                     CustomMessage("a purple spark trail", /*german*/"ein violetter Komet", /*french*/"une comète mauve")});
+                                                     CustomMessage("a purple spark trail", /*german*/"violette Funken€", /*french*/"une comète mauve")});
                                                       // /*spanish*/el sendero malva
 
-    hintTextTable[RHT_PRELUDE_OF_LIGHT] = HintText(CustomMessage("the Prelude of Light", /*german*/"Kantate des Lichts", /*french*/"le prélude de la lumière"),
+    hintTextTable[RHT_PRELUDE_OF_LIGHT] = HintText(CustomMessage("the Prelude of Light", /*german*/"die Kantate des Lichts", /*french*/"le prélude de la lumière"),
                                                    // /*spanish*/el Preludio de la luz
                                                    {
                                                    CustomMessage("a warp song", /*german*/"ein Teleportationslied", /*french*/"une chanson de téléportation")
                                                     // /*spanish*/una canción de teletransportación
                                                    }, {
-                                                   CustomMessage("a luminous prologue melody", /*german*/"eine leuchtende Melodie", /*french*/"une matine illuminée"),
+                                                   CustomMessage("a luminous prologue melody", /*german*/"der leuchtende Prolog", /*french*/"une matine illuminée"),
                                                     // /*spanish*/la melodía refulgente
-                                                   CustomMessage("a yellow spark trail", /*german*/"ein gelber Komet", /*french*/"une comète jaune"),
+                                                   CustomMessage("a yellow spark trail", /*german*/"gelbe Funken€", /*french*/"une comète jaune"),
                                                     // /*spanish*/el sendero resplandeciente
                                                    CustomMessage("the temple traveler", /*german*/"ein Tempelreisender", /*french*/"un chant de sanctuaire")});
                                                     // /*spanish*/la ruta del templo
 
-    hintTextTable[RHT_DEKU_TREE_MAP] = HintText(CustomMessage("the Deku Tree Map", /*german*/"die Karte des Deku-Baums", /*french*/"la carte de l'Arbre Mojo"),
+    hintTextTable[RHT_DEKU_TREE_MAP] = HintText(CustomMessage("the Deku Tree Map", /*german*/"die Labyrinth-Karte des Deku-Baumes", /*french*/"la carte de l'Arbre Mojo"),
                                                 // /*spanish*/el mapa del Gran Árbol Deku
                                                 {
-                                                CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                  // /*spanish*/un mapa
                                                 }, {
                                                 CustomMessage("a mossy atlas", /*german*/"ein moosiger Atlas", /*french*/"un atlas boisé"),
                                                  // /*spanish*/un atlas musgoso
-                                                CustomMessage("some mossy blueprints", /*german*/"einige moosige Blaupausen", /*french*/"un plan boisé")});
+                                                CustomMessage("some mossy blueprints", /*german*/"moosige Baupläne€", /*french*/"un plan boisé")});
                                                  // /*spanish*/unos planos musgosos
 
-    hintTextTable[RHT_DODONGOS_CAVERN_MAP] = HintText(CustomMessage("the Dodongo's Cavern Map", /*german*/"die Karte der Dodongo-Höhle", /*french*/"la carte de la Caverne Dodongo"),
+    hintTextTable[RHT_DODONGOS_CAVERN_MAP] = HintText(CustomMessage("the Dodongo's Cavern Map", /*german*/"die Labyrinth-Karte von Dodongos Höhle", /*french*/"la carte de la Caverne Dodongo"),
                                                       // /*spanish*/el mapa de la Cueva de los Dodongos
                                                       {
-                                                      CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                      CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                        // /*spanish*/un mapa
                                                       }, {
                                                       CustomMessage("a rocky atlas", /*german*/"eine felsiger Atlas", /*french*/"un atlas rocheux"),
                                                        // /*spanish*/un atlas rocoso
-                                                      CustomMessage("some rocky blueprints", /*german*/"einige felsige Blaupausen", /*french*/"un plan rocheux")});
+                                                      CustomMessage("some rocky blueprints", /*german*/"felsige Baupläne€", /*french*/"un plan rocheux")});
                                                        // /*spanish*/unos planos rocosos
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_MAP] = HintText(CustomMessage("the Jabu-Jabu's Belly Map", /*german*/"die Karte des Jabu-Jabu-Bauchs", /*french*/"la carte de Jabu-Jabu"),
+    hintTextTable[RHT_JABU_JABUS_BELLY_MAP] = HintText(CustomMessage("the Jabu-Jabu's Belly Map", /*german*/"die Labyrinth-Karte von Jabu-Jabus Bauch", /*french*/"la carte de Jabu-Jabu"),
                                                        // /*spanish*/el mapa de la Tripa de Jabu-Jabu
                                                        {
-                                                       CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                       CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                         // /*spanish*/un mapa
                                                        }, {
                                                        CustomMessage("a fishy atlas", /*german*/"ein fischiger Atlas", /*french*/"un atlas digéré"),
                                                         // /*spanish*/un atlas digesto
-                                                       CustomMessage("some fishy blueprints", /*german*/"einige fischige Blaupausen", /*french*/"un plan digéré")});
+                                                       CustomMessage("some fishy blueprints", /*german*/"fischige Baupläne€", /*french*/"un plan digéré")});
                                                         // /*spanish*/unos planos digestos
 
-    hintTextTable[RHT_FOREST_TEMPLE_MAP] = HintText(CustomMessage("the Forest Temple Map", /*german*/"die Karte des Waldtempels", /*french*/"la carte du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_MAP] = HintText(CustomMessage("the Forest Temple Map", /*german*/"die Labyrinth-Karte des Waldtempels", /*french*/"la carte du Temple de la Forêt"),
                                                     // /*spanish*/el mapa del Templo del Bosque
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
                                                     CustomMessage("a sylvan atlas", /*german*/"ein waldiger Atlas", /*french*/"un atlas sylvestre"),
                                                      // /*spanish*/un atlas enselvado
-                                                    CustomMessage("some sylvan blueprints", /*german*/"einige waldige Blaupausen", /*french*/"un plan sylvestre")});
+                                                    CustomMessage("some sylvan blueprints", /*german*/"waldige Baupläne€", /*french*/"un plan sylvestre")});
                                                      // /*spanish*/unos planos enselvados
 
-    hintTextTable[RHT_FIRE_TEMPLE_MAP] = HintText(CustomMessage("the Fire Temple Map", /*german*/"die Karte des Feuertempels", /*french*/"la carte du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_MAP] = HintText(CustomMessage("the Fire Temple Map", /*german*/"die Labyrinth-Karte des Feuertempels", /*french*/"la carte du Temple du Feu"),
                                                   // /*spanish*/el mapa del Templo del Fuego
                                                   {
-                                                  CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                  CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                    // /*spanish*/un mapa
                                                   }, {
                                                   CustomMessage("a molten atlas", /*german*/"ein geschmolzener Atlas", /*french*/"un atlas fondu"),
                                                    // /*spanish*/un atlas fundido
-                                                  CustomMessage("some molten blueprints", /*german*/"einige geschmolzene Blaupausen", /*french*/"un plan fondu")});
+                                                  CustomMessage("some molten blueprints", /*german*/"geschmolzene Baupläne€", /*french*/"un plan fondu")});
                                                    // /*spanish*/unos planos fundidos
 
-    hintTextTable[RHT_WATER_TEMPLE_MAP] = HintText(CustomMessage("the Water Temple Map", /*german*/"die Karte des Wassertempels", /*french*/"la carte du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_MAP] = HintText(CustomMessage("the Water Temple Map", /*german*/"die Labyrinth-Karte des Wassertempels", /*french*/"la carte du Temple de l'Eau"),
                                                    // /*spanish*/el mapa del Templo del Agua
                                                    {
-                                                   CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                   CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                     // /*spanish*/un mapa
                                                    }, {
                                                    CustomMessage("a wet atlas", /*german*/"ein nasser Atlas", /*french*/"un atlas humide"),
                                                     // /*spanish*/un atlas mojado
-                                                   CustomMessage("some wet blueprints", /*german*/"einige nasse Blaupausen", /*french*/"un plan humide")});
+                                                   CustomMessage("some wet blueprints", /*german*/"nasse Baupläne€", /*french*/"un plan humide")});
                                                     // /*spanish*/unos planos mojados
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_MAP] = HintText(CustomMessage("the Spirit Temple Map", /*german*/"die Karte des Geistertempels", /*french*/"la carte du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_MAP] = HintText(CustomMessage("the Spirit Temple Map", /*german*/"die Labyrinth-Karte des Geistertempels", /*french*/"la carte du Temple de l'Esprit"),
                                                     // /*spanish*/el mapa del Templo del Espíritu
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
                                                     CustomMessage("a sandy atlas", /*german*/"ein sandiger Atlas", /*french*/"un atlas sableux"),
                                                      // /*spanish*/un atlas arenoso
-                                                    CustomMessage("some sandy blueprints", /*german*/"einige sandige Blaupausen", /*french*/"un plan sableux")});
+                                                    CustomMessage("some sandy blueprints", /*german*/"sandige Baupläne€", /*french*/"un plan sableux")});
                                                      // /*spanish*/unos planos arenosos
 
-    hintTextTable[RHT_SHADOW_TEMPLE_MAP] = HintText(CustomMessage("the Shadow Temple Map", /*german*/"die Karte des Schattentempels", /*french*/"la carte du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_MAP] = HintText(CustomMessage("the Shadow Temple Map", /*german*/"die Labyrinth-Karte des Schattentempels", /*french*/"la carte du Temple de l'Ombre"),
                                                     // /*spanish*/el mapa del Templo de las Sombras
                                                     {
-                                                    CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                    CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                      // /*spanish*/un mapa
                                                     }, {
                                                     CustomMessage("a creepy atlas", /*german*/"eine gruseliger Atlas", /*french*/"un atlas sinistre"),
                                                      // /*spanish*/un atlas siniestra
-                                                    CustomMessage("some creepy blueprints", /*german*/"einige gruselige Blaupausen", /*french*/"un plan sinistre")});
+                                                    CustomMessage("some creepy blueprints", /*german*/"gruselige Baupläne€", /*french*/"un plan sinistre")});
                                                      // /*spanish*/unos planos siniestras
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText(CustomMessage("the Bottom of the Well Map", /*german*/"die Karte des Grund des Brunnens", /*french*/"la carte du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_MAP] = HintText(CustomMessage("the Bottom of the Well Map", /*german*/"die Labyrinth-Karte vom Grund des Brunnens", /*french*/"la carte du fond du Puits"),
                                                          // /*spanish*/el mapa del Fondo del pozo
                                                          {
-                                                         CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                         CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                           // /*spanish*/un mapa
                                                          }, {
                                                          CustomMessage("a moldy atlas", /*german*/"ein schimmeliger Atlas", /*french*/"un atlas moisi"),
                                                           // /*spanish*/un atlas mohoso
-                                                         CustomMessage("some moldy blueprints", /*german*/"einige schimmelige Blaupausen", /*french*/"un plan moisi")});
+                                                         CustomMessage("some moldy blueprints", /*german*/"schimmelige Baupläne€", /*french*/"un plan moisi")});
                                                           // /*spanish*/unos planos mohosos
 
-    hintTextTable[RHT_ICE_CAVERN_MAP] = HintText(CustomMessage("the Ice Cavern Map", /*german*/"die Karte der Eishöhle", /*french*/"la carte de la Caverne Polaire"),
+    hintTextTable[RHT_ICE_CAVERN_MAP] = HintText(CustomMessage("the Ice Cavern Map", /*german*/"die Labyrinth-Karte der Eishöhle", /*french*/"la carte de la Caverne Polaire"),
                                                  // /*spanish*/el mapa de la Caverna de hielo
                                                  {
-                                                 CustomMessage("a dungeon map", /*german*/"eine Karte", /*french*/"une carte")
+                                                 CustomMessage("a dungeon map", /*german*/"eine Labyrinth-Karte", /*french*/"une carte")
                                                   // /*spanish*/un mapa
                                                  }, {
                                                  CustomMessage("a polar atlas", /*german*/"ein polarer Atlas", /*french*/"un atlas polaire"),
                                                   // /*spanish*/un atlas polar
-                                                 CustomMessage("some polar blueprints", /*german*/"einige polare Blaupausen", /*french*/"un plan polaire")});
+                                                 CustomMessage("some polar blueprints", /*german*/"polare Baupläne€", /*french*/"un plan polaire")});
                                                   // /*spanish*/unos planos polars
 
-    hintTextTable[RHT_DEKU_TREE_COMPASS] = HintText(CustomMessage("the Deku Tree Compass", /*german*/"der Kompaß des Deku-Baums", /*french*/"la boussole de l'Arbre Mojo"),
+    hintTextTable[RHT_DEKU_TREE_COMPASS] = HintText(CustomMessage("the Deku Tree Compass", /*german*/"der Kompaß des Deku-Baumes", /*french*/"la boussole de l'Arbre Mojo"),
                                                     // /*spanish*/la brújula del Gran Árbol Deku
                                                     {
                                                     CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
@@ -1062,7 +1063,7 @@ void StaticData::HintTable_Init_Item() {
                                                     CustomMessage("a mossy magnetic needle", /*german*/"eine moosige Magnetnadel", /*french*/"une aimant boisée")});
                                                      // /*spanish*/un imán musgoso
 
-    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText(CustomMessage("the Dodongo's Cavern Compass", /*german*/"der Kompaß der Dodongo-Höhle", /*french*/"la boussole de la Caverne Dodongo"),
+    hintTextTable[RHT_DODONGOS_CAVERN_COMPASS] = HintText(CustomMessage("the Dodongo's Cavern Compass", /*german*/"der Kompaß von Dodongos Höhle", /*french*/"la boussole de la Caverne Dodongo"),
                                                           // /*spanish*/la brújula de la Cueva de los Dodongos
                                                           {
                                                           CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
@@ -1073,7 +1074,7 @@ void StaticData::HintTable_Init_Item() {
                                                           CustomMessage("a rocky magnetic needle", /*german*/"eine felsige Magnetnadel", /*french*/"une aimant rocheux")});
                                                            // /*spanish*/un imán rocoso
 
-    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText(CustomMessage("the Jabu-Jabu's Belly Compass", /*german*/"der Kompaß des Jabu-Jabu-Bauchs", /*french*/"la boussole de Jabu-Jabu"),
+    hintTextTable[RHT_JABU_JABUS_BELLY_COMPASS] = HintText(CustomMessage("the Jabu-Jabu's Belly Compass", /*german*/"der Kompaß von Jabu-Jabus Bauch", /*french*/"la boussole de Jabu-Jabu"),
                                                            // /*spanish*/la brújula de la Tripa de Jabu-Jabu
                                                            {
                                                            CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
@@ -1139,15 +1140,15 @@ void StaticData::HintTable_Init_Item() {
                                                         CustomMessage("a creepy magnetic needle", /*german*/"eine gruselige Magnetnadel", /*french*/"une aimant sinistre")});
                                                          // /*spanish*/un imán siniestra
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText(CustomMessage("the Bottom of the Well Compass", /*german*/"der Kompaß des Grund des Brunnens", /*french*/"la boussole du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_COMPASS] = HintText(CustomMessage("the Bottom of the Well Compass", /*german*/"der Kompaß vom Grund des Brunnens", /*french*/"la boussole du fond du Puits"),
                                                              // /*spanish*/la brújula del Fondo del pozo
                                                              {
                                                              CustomMessage("a compass", /*german*/"ein Kompaß", /*french*/"une boussole")
                                                               // /*spanish*/una brújula
                                                              }, {
-                                                             CustomMessage("a dank treasure tracker", /*german*/"ein feuchter Schatzfinder", /*french*/"un cherche-trésor moisi"),
+                                                             CustomMessage("a dank treasure tracker", /*german*/"ein schimmeliger Schatzfinder", /*french*/"un cherche-trésor moisi"),
                                                               // /*spanish*/un zahorí mohoso
-                                                             CustomMessage("a dank magnetic needle", /*german*/"eine feuchte Magnetnadel", /*french*/"une aimant moisi")});
+                                                             CustomMessage("a dank magnetic needle", /*german*/"eine schimmelige Magnetnadel", /*french*/"une aimant moisi")});
                                                               // /*spanish*/un imán mohoso
 
     hintTextTable[RHT_ICE_CAVERN_COMPASS] = HintText(CustomMessage("the Ice Cavern Compass", /*german*/"der Kompaß der Eishöhle", /*french*/"la Boussole de la Caverne Polaire"),
@@ -1161,207 +1162,208 @@ void StaticData::HintTable_Init_Item() {
                                                      CustomMessage("a polar magnetic needle", /*german*/"eine polare Magnetnadel", /*french*/"une aimant polaire")});
                                                       // /*spanish*/un imán polar
 
-    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Forest Temple Boss Key", /*german*/"der Waldtempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Forest Temple Boss Key", /*german*/"der Master-Schlüssel des Waldtempels", /*french*/"la Clé d'Or du Temple de la Forêt"),
                                                          // /*spanish*/la gran llave del Templo del Bosque
                                                          {
                                                          CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a sylvan master of unlocking", /*german*/"ein waldiger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sylvestre"),
+                                                         CustomMessage("a sylvan master of unlocking", /*german*/"ein waldiger Meister der Entriegelung", /*french*/"un anti-grosse porte sylvestre"),
                                                           // /*spanish*/la clave enselvada de un jefe
-                                                         CustomMessage("a sylvan dungeon's master pass", /*german*/"ein waldiger Dungeon-Meisterpass", /*french*/"une clé maléfique sylvestre")});
+                                                         CustomMessage("a sylvan dungeon's master pass", /*german*/"ein waldiger Labyrinth-Meisterpass", /*french*/"une clé maléfique sylvestre")});
                                                           // /*spanish*/el pase maestro enselvado
 
-    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Fire Temple Boss Key", /*german*/"der Feuertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Fire Temple Boss Key", /*german*/"der Master-Schlüssel des Feuertempels", /*french*/"la Clé d'Or du Temple du Feu"),
                                                        // /*spanish*/la gran llave del Templo del Fuego
                                                        {
                                                        CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                         // /*spanish*/una gran llave
                                                        }, {
-                                                       CustomMessage("a molten master of unlocking", /*german*/"ein geschmolzener Meister des Entschlüsselns", /*french*/"un anti-grosse porte fondu"),
+                                                       CustomMessage("a molten master of unlocking", /*german*/"ein geschmolzener Meister der Entriegelung", /*french*/"un anti-grosse porte fondu"),
                                                         // /*spanish*/la clave fundido de un jefe
-                                                       CustomMessage("a molten dungeon's master pass", /*german*/"ein geschmolzener Dungeon-Meisterpass", /*french*/"une clé maléfique fondu")});
+                                                       CustomMessage("a molten dungeon's master pass", /*german*/"ein geschmolzener Labyrinth-Meisterpass", /*french*/"une clé maléfique fondu")});
                                                         // /*spanish*/el pase maestro fundido
 
-    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Water Temple Boss Key", /*german*/"der Wassertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Water Temple Boss Key", /*german*/"der Master-Schlüssel des Wassertempels", /*french*/"la Clé d'Or du Temple de l'Eau"),
                                                         // /*spanish*/la gran llave del Templo del Agua
                                                         {
                                                         CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                          // /*spanish*/una gran llave
                                                         }, {
-                                                        CustomMessage("a wet master of unlocking", /*german*/"ein nasser Meister des Entschlüsselns", /*french*/"un anti-grosse porte humide"),
+                                                        CustomMessage("a wet master of unlocking", /*german*/"ein nasser Meister der Entriegelung", /*french*/"un anti-grosse porte humide"),
                                                          // /*spanish*/la clave mojado de un jefe
-                                                        CustomMessage("a wet dungeon's master pass", /*german*/"ein nasser Dungeon-Meisterpass", /*french*/"une clé maléfique humide")});
+                                                        CustomMessage("a wet dungeon's master pass", /*german*/"ein nasser Labyrinth-Meisterpass", /*french*/"une clé maléfique humide")});
                                                          // /*spanish*/el pase maestro mojado
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Spirit Temple Boss Key", /*german*/"der Geistertempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Spirit Temple Boss Key", /*german*/"der Master-Schlüssel des Geistertempels", /*french*/"la Clé d'Or du Temple de l'Esprit"),
                                                          // /*spanish*/la gran llave del Templo del Espíritu
                                                          {
                                                          CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a sandy master of unlocking", /*german*/"ein sandiger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sableux"),
+                                                         CustomMessage("a sandy master of unlocking", /*german*/"ein sandiger Meister der Entriegelung", /*french*/"un anti-grosse porte sableux"),
                                                           // /*spanish*/la clave arenoso de un jefe
-                                                         CustomMessage("a sandy dungeon's master pass", /*german*/"ein sandiger Dungeon-Meisterpass", /*french*/"une clé maléfique sableux")});
+                                                         CustomMessage("a sandy dungeon's master pass", /*german*/"ein sandiger Labyrinth-Meisterpass", /*french*/"une clé maléfique sableux")});
                                                           // /*spanish*/el pase maestro arenoso
 
-    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Shadow Temple Boss Key", /*german*/"der Schattentempel-Master-Schlüssel", /*french*/"la Clé d'Or du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_BOSS_KEY] = HintText(CustomMessage("the Shadow Temple Boss Key", /*german*/"der Master-Schlüssel des Schattentempels", /*french*/"la Clé d'Or du Temple de l'Ombre"),
                                                          // /*spanish*/la gran llave del Templo de las Sombras
                                                          {
                                                          CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a creepy master of unlocking", /*german*/"ein gruseliger Meister des Entschlüsselns", /*french*/"un anti-grosse porte sinistre"),
+                                                         CustomMessage("a creepy master of unlocking", /*german*/"ein gruseliger Meister der Entriegelung", /*french*/"un anti-grosse porte sinistre"),
                                                           // /*spanish*/la clave siniestra de un jefe
-                                                         CustomMessage("a creepy dungeon's master pass", /*german*/"ein gruseliger Dungeon-Meisterpass", /*french*/"une clé maléfique sinistre")});
+                                                         CustomMessage("a creepy dungeon's master pass", /*german*/"ein gruseliger Labyrinth-Meisterpass", /*french*/"une clé maléfique sinistre")});
                                                           // /*spanish*/el pase maestro siniestra
 
-    hintTextTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText(CustomMessage("the Ganon's Castle Boss Key", /*german*/"der Master-Schlüssel für Ganons Schloß", /*french*/"la Clé d'Or du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_BOSS_KEY] = HintText(CustomMessage("the Ganon's Castle Boss Key", /*german*/"der Master-Schlüssel von Ganons Schloß", /*french*/"la Clé d'Or du Château de Ganon"),
                                                          // /*spanish*/la gran llave del Castillo de Ganon
                                                          {
                                                          CustomMessage("a boss key", /*german*/"ein Master-Schlüssel", /*french*/"une Clé d'Or")
                                                           // /*spanish*/una gran llave
                                                          }, {
-                                                         CustomMessage("a final master of unlocking", /*german*/"ein finaler Meister des Entschlüsselns", /*french*/"un anti-grosse porte final"),
+                                                         CustomMessage("a final master of unlocking", /*german*/"ein finaler Meister der Entriegelung", /*french*/"un anti-grosse porte final"),
                                                           // /*spanish*/la clave final de un jefe
-                                                         CustomMessage("a final dungeon's master pass", /*german*/"ein finaler Dungeon-Meisterpass", /*french*/"une clé maléfique final")});
+                                                         CustomMessage("a final dungeon's master pass", /*german*/"ein finaler Labyrinth-Meisterpass", /*french*/"une clé maléfique final")});
                                                           // /*spanish*/el pase maestro final
 
-    hintTextTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Forest Temple Small Key", /*german*/"ein kleiner Waldtempel-Schlüssel", /*french*/"une petite clé du Temple de la Forêt"),
+    hintTextTable[RHT_FOREST_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Forest Temple Small Key", /*german*/"ein kleiner Schlüssel des Waldtempels", /*french*/"une petite clé du Temple de la Forêt"),
                                                           // /*spanish*/una llave pequeña del Templo del Bosque
                                                           {
                                                           CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a sylvan tool for unlocking", /*german*/"ein waldiges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sylvestre"),
+                                                          CustomMessage("a sylvan tool for unlocking", /*german*/"ein waldiges Werkzeug zur Entriegelung", /*french*/"un anti-porte sylvestre"),
                                                            // /*spanish*/una clave de una entrada enselvada
-                                                          CustomMessage("a sylvan dungeon pass", /*german*/"ein waldiger Dungeon-Pass", /*french*/"le rêve sylvestre d'un prisonnier"),
+                                                          CustomMessage("a sylvan dungeon pass", /*german*/"ein waldiger Labyrinth-Pass", /*french*/"le rêve sylvestre d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra enselvada
                                                           CustomMessage("a sylvan lock remover", /*german*/"ein waldiger Schlossentferner", /*french*/"un efface-serrure sylvestre"),
                                                            // /*spanish*/un destructor de cerraduras enselvada
                                                           CustomMessage("a sylvan lockpick", /*german*/"ein waldiger Dietrich", /*french*/"un crochet à porte sylvestre")});
                                                            // /*spanish*/una apertura portentosa enselvada
 
-    hintTextTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Fire Temple Small Key", /*german*/"ein kleiner Feuertempel-Schlüssel", /*french*/"une petite clé du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Fire Temple Small Key", /*german*/"ein kleiner Schlüssel des Feuertempels", /*french*/"une petite clé du Temple du Feu"),
                                                         // /*spanish*/una llave pequeña del Templo del Fuego
                                                         {
                                                         CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                          // /*spanish*/una llave pequeña
                                                         }, {
-                                                        CustomMessage("a molten tool for unlocking", /*german*/"ein geschmolzenes Werkzeug zur Entschlüsselung", /*french*/"un anti-porte fondu"),
+                                                        CustomMessage("a molten tool for unlocking", /*german*/"ein geschmolzenes Werkzeug zur Entriegelung", /*french*/"un anti-porte fondu"),
                                                          // /*spanish*/una clave de una entrada fundida
-                                                        CustomMessage("a molten dungeon pass", /*german*/"ein geschmolzener Dungeon-Pass", /*french*/"le rêve fondu d'un prisonnier"),
+                                                        CustomMessage("a molten dungeon pass", /*german*/"ein geschmolzener Labyrinth-Pass", /*french*/"le rêve fondu d'un prisonnier"),
                                                          // /*spanish*/un pase de una mazmorra fundida
                                                         CustomMessage("a molten lock remover", /*german*/"ein geschmolzener Schlossentferner", /*french*/"un efface-serrure fondu"),
                                                          // /*spanish*/un destructor de cerraduras fundida
                                                         CustomMessage("a molten lockpick", /*german*/"ein geschmolzener Dietrich", /*french*/"un crochet à porte fondu")});
                                                          // /*spanish*/una apertura portentosa fundida
 
-    hintTextTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Water Temple Small Key", /*german*/"ein kleiner Wassertempel-Schlüssel", /*french*/"une petite clé du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Water Temple Small Key", /*german*/"ein kleiner Schlüssel des Wassertempels", /*french*/"une petite clé du Temple de l'Eau"),
                                                          // /*spanish*/una llave pequeña del Templo del Agua
                                                          {
                                                          CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                           // /*spanish*/una llave pequeña
                                                          }, {
-                                                         CustomMessage("a wet tool for unlocking", /*german*/"ein nasses Werkzeug zur Entschlüsselung", /*french*/"un anti-porte humide"),
+                                                         CustomMessage("a wet tool for unlocking", /*german*/"ein nasses Werkzeug zur Entriegelung", /*french*/"un anti-porte humide"),
                                                           // /*spanish*/una clave de una entrada mojada
-                                                         CustomMessage("a wet dungeon pass", /*german*/"ein nasser Dungeon-Pass", /*french*/"le rêve humide d'un prisonnier"),
+                                                         CustomMessage("a wet dungeon pass", /*german*/"ein nasser Labyrinth-Pass", /*french*/"le rêve humide d'un prisonnier"),
                                                           // /*spanish*/un pase de una mazmorra mojada
                                                          CustomMessage("a wet lock remover", /*german*/"ein nasser Schlossentferner", /*french*/"un efface-serrure humide"),
                                                           // /*spanish*/un destructor de cerraduras mojada
                                                          CustomMessage("a wet lockpick", /*german*/"ein nasser Dietrich", /*french*/"un crochet à porte humide")});
                                                           // /*spanish*/una apertura portentosa mojada
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Spirit Temple Small Key", /*german*/"ein kleiner Geistertempel-Schlüssel", /*french*/"une petite clé du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Spirit Temple Small Key", /*german*/"ein kleiner Schlüssel des Geistertempels", /*french*/"une petite clé du Temple de l'Esprit"),
                                                           // /*spanish*/una llave pequeña del Templo del Espíritu
                                                           {
                                                           CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a sandy tool for unlocking", /*german*/"ein sandiges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sableux"),
+                                                          CustomMessage("a sandy tool for unlocking", /*german*/"ein sandiges Werkzeug zur Entriegelung", /*french*/"un anti-porte sableux"),
                                                            // /*spanish*/una clave de una entrada arenosa
-                                                          CustomMessage("a sandy dungeon pass", /*german*/"ein sandiger Dungeon-Pass", /*french*/"le rêve sableux d'un prisonnier"),
+                                                          CustomMessage("a sandy dungeon pass", /*german*/"ein sandiger Labyrinth-Pass", /*french*/"le rêve sableux d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra arenosa
                                                           CustomMessage("a sandy lock remover", /*german*/"ein sandiger Schlossentferner", /*french*/"un efface-serrure sableux"),
                                                            // /*spanish*/un destructor de cerraduras arenosa
                                                           CustomMessage("a sandy lockpick", /*german*/"ein sandiger Dietrich", /*french*/"un crochet à porte sableux")});
                                                            // /*spanish*/una apertura portentosa arenosa
 
-    hintTextTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Shadow Temple Small Key", /*german*/"ein kleiner Schattentempel-Schlüssel", /*french*/"une petite clé du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_SMALL_KEY] = HintText(CustomMessage("a Shadow Temple Small Key", /*german*/"ein kleiner Schlüssel des Schattentempels", /*french*/"une petite clé du Temple de l'Ombre"),
                                                           // /*spanish*/una llave pequeña del Templo de las Sombras
                                                           {
                                                           CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a creepy tool for unlocking", /*german*/"ein gruseliges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte sinistre"),
+                                                          CustomMessage("a creepy tool for unlocking", /*german*/"ein gruseliges Werkzeug zur Entriegelung", /*french*/"un anti-porte sinistre"),
                                                            // /*spanish*/una clave de una entrada siniestra:a
-                                                          CustomMessage("a creepy dungeon pass", /*german*/"ein gruseliger Dungeon-Pass", /*french*/"le rêve sinistre d'un prisonnier"),
+                                                          CustomMessage("a creepy dungeon pass", /*german*/"ein gruseliger Labyrinth-Pass", /*french*/"le rêve sinistre d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra siniestra:a
                                                           CustomMessage("a creepy lock remover", /*german*/"ein gruseliger Schlossentferner", /*french*/"un efface-serrure sinistre"),
                                                            // /*spanish*/un destructor de cerraduras siniestra:a
                                                           CustomMessage("a creepy lockpick", /*german*/"ein gruseliger Dietrich", /*french*/"un crochet à porte sinistre")});
                                                            // /*spanish*/una apertura portentosa siniestra:a
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUND_SMALL_KEY] = HintText(CustomMessage("a Gerudo Training Ground Small Key", /*german*/"ein kleiner Schlüssel des Gerudo-Trainingsgeländes", /*french*/"une petite clé du Gymnase Gerudo"),
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_SMALL_KEY] = HintText(CustomMessage("a Gerudo Training Ground Small Key", /*german*/"ein kleiner Schlüssel der Gerudo-Trainingsarena", /*french*/"une petite clé du Gymnase Gerudo"),
                                                                     // /*spanish*/una llave pequeña del Centro de Instrucción Gerudo
                                                                     {
                                                                     CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                                      // /*spanish*/una llave pequeña
                                                                     }, {
-                                                                    CustomMessage("a labyrinthian tool for unlocking", /*german*/"ein labyrinthisches Werkzeug zur Entschlüsselung", /*french*/"un anti-porte labyrinthique"),
+                                                                    CustomMessage("a labyrinthian tool for unlocking", /*german*/"ein verwirrendes Werkzeug zur Entriegelung", /*french*/"un anti-porte labyrinthique"),
                                                                      // /*spanish*/una clave de una entrada laberíntica
-                                                                    CustomMessage("a labyrinthian dungeon pass", /*german*/"ein labyrinthischer Dungeon-Pass", /*french*/"le rêve labyrinthique d'un prisonnier"),
+                                                                    CustomMessage("a labyrinthian dungeon pass", /*german*/"ein verwirrender Labyrinth-Pass", /*french*/"le rêve labyrinthique d'un prisonnier"),
                                                                      // /*spanish*/un pase de una mazmorra laberíntica
-                                                                    CustomMessage("a labyrinthian lock remover", /*german*/"ein labyrinthischer Schlossentferner", /*french*/"un efface-serrure labyrinthique"),
+                                                                    CustomMessage("a labyrinthian lock remover", /*german*/"ein verwirrender Schlossentferner", /*french*/"un efface-serrure labyrinthique"),
                                                                      // /*spanish*/un destructor de cerraduras laberíntica
-                                                                    CustomMessage("a labyrinthian lockpick", /*german*/"ein labyrinthischer Dietrich", /*french*/"un crochet à porte labyrinthique")});
+                                                                    CustomMessage("a labyrinthian lockpick", /*german*/"ein verwirrender Dietrich", /*french*/"un crochet à porte labyrinthique")});
                                                                      // /*spanish*/una apertura portentosa laberíntica
 
-    hintTextTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Fortress Small Key", /*german*/"ein kleiner Schlüssel für die Gerudo-Festung", /*french*/"une petite clé de la Repaire des Voleurs"),
+    hintTextTable[RHT_GERUDO_FORTRESS_SMALL_KEY] = HintText(CustomMessage("a Gerudo Fortress Small Key", /*german*/"ein kleiner Schlüssel des Diebesverstecks", /*french*/"une petite clé de la Repaire des Voleurs"),
                                                             // /*spanish*/una llave pequeña de la Fortaleza Gerudo
                                                             {
                                                             CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                              // /*spanish*/una llave pequeña
                                                             }, {
-                                                            CustomMessage("an imprisoned tool for unlocking", /*german*/"ein gefangenes Werkzeug zur Entschlüsselung", /*french*/"un anti-porte emprisonné"),
+                                                            CustomMessage("an imprisoned tool for unlocking", /*german*/"ein gefangenes Werkzeug zur Entriegelung", /*french*/"un anti-porte emprisonné"),
                                                              // /*spanish*/una clave de una entrada encarcelada
-                                                            CustomMessage("an imprisoned dungeon pass", /*german*/"ein gefangener Dungeon-Pass", /*french*/"le rêve emprisonné d'un prisonnier"),
+                                                            CustomMessage("an imprisoned dungeon pass", /*german*/"ein gefangener Labyrinth-Pass", /*french*/"le rêve emprisonné d'un prisonnier"),
                                                              // /*spanish*/un pase de una mazmorra encarcelada
                                                             CustomMessage("an imprisoned lock remover", /*german*/"ein gefangener Schlossentferner", /*french*/"un efface-serrure emprisonné"),
                                                              // /*spanish*/un destructor de cerraduras encarcelada
                                                             CustomMessage("an imprisoned lockpick", /*german*/"ein gefangener Dietrich", /*french*/"un crochet à porte emprisonné")});
                                                              // /*spanish*/una apertura portentosa encarcelada
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText(CustomMessage("a Bottom of the Well Small Key", /*german*/"ein kleiner Schlüssel des Grund des Brunnens", /*french*/"une petite clé du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_SMALL_KEY] = HintText(CustomMessage("a Bottom of the Well Small Key", /*german*/"ein kleiner Schlüssel vom Grund des Brunnens", /*french*/"une petite clé du fond du Puits"),
                                                                // /*spanish*/una llave pequeña del Fondo del pozo
                                                                {
                                                                CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                                 // /*spanish*/una llave pequeña
                                                                }, {
-                                                               CustomMessage("a moldy tool for unlocking", /*german*/"ein schimmeliges Werkzeug zur Entschlüsselung", /*french*/"un anti-porte moisi"),
+                                                               CustomMessage("a moldy tool for unlocking", /*german*/"ein schimmeliges Werkzeug zur Entriegelung", /*french*/"un anti-porte moisi"),
                                                                 // /*spanish*/una clave de una entrada mohosa
-                                                               CustomMessage("a moldy dungeon pass", /*german*/"ein schimmeliger Dungeon-Pass", /*french*/"le rêve moisi d'un prisonnier"),
+                                                               CustomMessage("a moldy dungeon pass", /*german*/"ein schimmeliger Labyrinth-Pass", /*french*/"le rêve moisi d'un prisonnier"),
                                                                 // /*spanish*/un pase de una mazmorra mohosa
                                                                CustomMessage("a moldy lock remover", /*german*/"ein schimmeliger Schlossentferner", /*french*/"un efface-serrure moisi"),
                                                                 // /*spanish*/un destructor de cerraduras mohosa
                                                                CustomMessage("a moldy lockpick", /*german*/"ein schimmeliger Dietrich", /*french*/"un crochet à porte moisi")});
                                                                 // /*spanish*/una apertura portentosa mohosa
 
-    hintTextTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText(CustomMessage("a Ganon's Castle Small Key", /*german*/"ein kleiner Schlüssel für Ganons Schloß", /*french*/"une petite clé du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_SMALL_KEY] = HintText(CustomMessage("a Ganon's Castle Small Key", /*german*/"ein kleiner Schlüssel von Ganons Schloß", /*french*/"une petite clé du Château de Ganon"),
                                                           // /*spanish*/una llave pequeña del Castillo de Ganon
                                                           {
                                                           CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a final tool for unlocking", /*german*/"ein finales Werkzeug zur Entschlüsselung", /*french*/"un anti-porte final"),
+                                                          CustomMessage("a final tool for unlocking", /*german*/"ein finales Werkzeug zur Entriegelung", /*french*/"un anti-porte final"),
                                                            // /*spanish*/una clave de una entrada final
-                                                          CustomMessage("a final dungeon pass", /*german*/"ein finaler Dungeon-Pass", /*french*/"le rêve final d'un prisonnier"),
+                                                          CustomMessage("a final dungeon pass", /*german*/"ein finaler Labyrinth-Pass", /*french*/"le rêve final d'un prisonnier"),
                                                            // /*spanish*/un pase de una mazmorra final
                                                           CustomMessage("a final lock remover", /*german*/"ein finaler Schlossentferner", /*french*/"un efface-serrure final"),
                                                            // /*spanish*/un destructor de cerraduras final
                                                           CustomMessage("a final lockpick", /*german*/"ein finaler Dietrich", /*french*/"un crochet à porte final")});
                                                            // /*spanish*/una apertura portentosa final
-    hintTextTable[RHT_OVERWORLD_KEY] = HintText(CustomMessage("an Overworld Key", /*german*/"ein Überwelt-Schlüssel", /*french*/"une clé de l'Overworld"),
+
+    hintTextTable[RHT_OVERWORLD_KEY] = HintText(CustomMessage("an Overworld Key", /*german*/"ein Schlüssel der Oberwelt", /*french*/"une clé de l'Overworld"),
                                                 // /*spanish*/una llave del mundo exterior
                                                 {
                                                 CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
@@ -1373,170 +1375,171 @@ void StaticData::HintTable_Init_Item() {
                                                  // /*spanish*/una llave al reino
                                                 CustomMessage("a key to the universe", /*german*/"ein Schlüssel zum Universum", /*french*/"une clé de l'univers")});
                                                  // /*spanish*/una llave al universo
-    hintTextTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText(CustomMessage("a Forest Temple Key Ring", /*german*/"ein Schlüsselbund des Waldtempels", /*french*/"un trousseau de clés du Temple de la Forêt"),
+
+    hintTextTable[RHT_FOREST_TEMPLE_KEY_RING] = HintText(CustomMessage("a Forest Temple Key Ring", /*german*/"das Schlüsselbund des Waldtempels", /*french*/"un trousseau de clés du Temple de la Forêt"),
                                                          // /*spanish*/un llavero del Templo del Bosque
                                                          {
                                                          CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a sylvan toolbox for unlocking", /*german*/"eine waldige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sylvestres"),
+                                                         CustomMessage("a sylvan toolbox for unlocking", /*german*/"eine waldige Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes sylvestres"),
                                                           // /*spanish*/un conjunto silvestre de cerrajero
-                                                         CustomMessage("a sylvan dungeon season pass", /*german*/"ein waldiger Dungeon-Season-Pass", /*french*/"les rêves sylvestres d'un prisonnier"),
+                                                         CustomMessage("a sylvan dungeon season pass", /*german*/"ein waldiger Labyrinth-Season-Pass", /*french*/"les rêves sylvestres d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras silvestre
                                                          CustomMessage("a sylvan jingling ring", /*german*/"ein waldiger Multifunktionsschlüssel", /*french*/"des efface-serrures sylvestres"),
                                                           // /*spanish*/una cadena multiusos silvestre
                                                          CustomMessage("a sylvan skeleton key", /*german*/"ein waldiger Skelettschlüssel", /*french*/"des crochets à porte sylvestres")});
                                                           // /*spanish*/un anillo silvestre contra cerrojos
 
-    hintTextTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText(CustomMessage("a Fire Temple Key Ring", /*german*/"ein Schlüsselbund des Feuertempels", /*french*/"un trousseau de clés du Temple du Feu"),
+    hintTextTable[RHT_FIRE_TEMPLE_KEY_RING] = HintText(CustomMessage("a Fire Temple Key Ring", /*german*/"das Schlüsselbund des Feuertempels", /*french*/"un trousseau de clés du Temple du Feu"),
                                                        // /*spanish*/un llavero del Templo del Fuego
                                                        {
                                                        CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                         // /*spanish*/un llavero
                                                        }, {
-                                                       CustomMessage("a molten toolbox for unlocking", /*german*/"eine geschmolzene Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes fondus"),
+                                                       CustomMessage("a molten toolbox for unlocking", /*german*/"eine geschmolzene Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes fondus"),
                                                         // /*spanish*/un conjunto fundido de cerrajero
-                                                       CustomMessage("a molten dungeon season pass", /*german*/"ein geschmolzener Dungeon-Season-Pass", /*french*/"les rêves fondus d'un prisonnier"),
+                                                       CustomMessage("a molten dungeon season pass", /*german*/"ein geschmolzener Labyrinth-Season-Pass", /*french*/"les rêves fondus d'un prisonnier"),
                                                         // /*spanish*/un pase vip de mazmorras fundido
                                                        CustomMessage("a molten jingling ring", /*german*/"ein geschmolzener Multifunktionsschlüssel", /*french*/"des efface-serrures fondus"),
                                                         // /*spanish*/una cadena multiusos fundida
                                                        CustomMessage("a molten skeleton key", /*german*/"ein geschmolzener Skelettschlüssel", /*french*/"des crochets à porte fondus")});
                                                         // /*spanish*/un anillo fundido contra cerrojos
 
-    hintTextTable[RHT_WATER_TEMPLE_KEY_RING] = HintText(CustomMessage("a Water Temple Key Ring", /*german*/"ein Schlüsselbund des Wassertempels", /*french*/"un trousseau de clés du Temple de l'Eau"),
+    hintTextTable[RHT_WATER_TEMPLE_KEY_RING] = HintText(CustomMessage("a Water Temple Key Ring", /*german*/"das Schlüsselbund des Wassertempels", /*french*/"un trousseau de clés du Temple de l'Eau"),
                                                         // /*spanish*/un llavero del Templo del Agua
                                                         {
                                                         CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                          // /*spanish*/un llavero
                                                         }, {
-                                                        CustomMessage("a wet toolbox for unlocking", /*german*/"eine nasse Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes humides"),
+                                                        CustomMessage("a wet toolbox for unlocking", /*german*/"eine nasse Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes humides"),
                                                          // /*spanish*/un conjunto abisal de cerrajero
-                                                        CustomMessage("a wet dungeon season pass", /*german*/"ein nasser Dungeon-Season-Pass", /*french*/"les rêves humides d'un prisonnier"),
+                                                        CustomMessage("a wet dungeon season pass", /*german*/"ein nasser Labyrinth-Season-Pass", /*french*/"les rêves humides d'un prisonnier"),
                                                          // /*spanish*/un pase vip de mazmorras abisal
                                                         CustomMessage("a wet jingling ring", /*german*/"ein nasser Multifunktionsschlüssel", /*french*/"des efface-serrures humides"),
                                                          // /*spanish*/una cadena multiusos abisal
                                                         CustomMessage("a wet skeleton key", /*german*/"ein nasser Skelettschlüssel", /*french*/"des crochets à porte humides")});
                                                          // /*spanish*/un anillo abisal contra cerrojos
 
-    hintTextTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText(CustomMessage("a Spirit Temple Key Ring", /*german*/"ein Schlüsselbund des Geistertempels", /*french*/"un trousseau de clés du Temple de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_TEMPLE_KEY_RING] = HintText(CustomMessage("a Spirit Temple Key Ring", /*german*/"das Schlüsselbund des Geistertempels", /*french*/"un trousseau de clés du Temple de l'Esprit"),
                                                          // /*spanish*/un llavero del Templo del Espíritu
                                                          {
                                                          CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a sandy toolbox for unlocking", /*german*/"eine sandige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sableux"),
+                                                         CustomMessage("a sandy toolbox for unlocking", /*german*/"eine sandige Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes sableux"),
                                                           // /*spanish*/un conjunto arenoso de cerrajero
-                                                         CustomMessage("a sandy dungeon season pass", /*german*/"ein sandiger Dungeon-Season-Pass", /*french*/"les rêves sableux d'un prisonnier"),
+                                                         CustomMessage("a sandy dungeon season pass", /*german*/"ein sandiger Labyrinth-Season-Pass", /*french*/"les rêves sableux d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras arenoso
                                                          CustomMessage("a sandy jingling ring", /*german*/"ein sandiger Multifunktionsschlüssel", /*french*/"des efface-serrures sableux"),
                                                           // /*spanish*/una cadena multiusos arenosa
                                                          CustomMessage("a sandy skeleton key", /*german*/"ein sandiger Skelettschlüssel", /*french*/"des crochets à porte sableux")});
                                                           // /*spanish*/un anillo arenoso contra cerrojos
 
-    hintTextTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText(CustomMessage("a Shadow Temple Key Ring", /*german*/"ein Schlüsselbund des Schattentempels", /*french*/"un trousseau de clés du Temple de l'Ombre"),
+    hintTextTable[RHT_SHADOW_TEMPLE_KEY_RING] = HintText(CustomMessage("a Shadow Temple Key Ring", /*german*/"das Schlüsselbund des Schattentempels", /*french*/"un trousseau de clés du Temple de l'Ombre"),
                                                          // /*spanish*/un llavero del Templo de las Sombras
                                                          {
                                                          CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a creepy toolbox for unlocking", /*german*/"eine gruselige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes sinistres"),
+                                                         CustomMessage("a creepy toolbox for unlocking", /*german*/"eine gruselige Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes sinistres"),
                                                           // /*spanish*/un conjunto tenebroso de cerrajero
-                                                         CustomMessage("a creepy dungeon season pass", /*german*/"ein gruseliger Dungeon-Season-Pass", /*french*/"les rêves sinistres d'un prisonnier"),
+                                                         CustomMessage("a creepy dungeon season pass", /*german*/"ein gruseliger Labyrinth-Season-Pass", /*french*/"les rêves sinistres d'un prisonnier"),
                                                           // /*spanish*/un pase vip de mazmorras tenebroso
                                                          CustomMessage("a creepy jingling ring", /*german*/"ein gruseliger Multifunktionsschlüssel", /*french*/"des efface-serrures sinistres"),
                                                           // /*spanish*/una cadena multiusos tenebrosa
                                                          CustomMessage("a creepy skeleton key", /*german*/"ein gruseliger Skelettschlüssel", /*french*/"des crochets à porte sinistres")});
                                                           // /*spanish*/un anillo tenebroso contra cerrojos
 
-    hintTextTable[RHT_GERUDO_TRAINING_GROUND_KEY_RING] = HintText(CustomMessage("a Gerudo Training Ground Key Ring", /*german*/"ein Schlüsselbund des Gerudo-Trainingsgeländes", /*french*/"un trousseau de clés du Gymnase Gerudo"),
+    hintTextTable[RHT_GERUDO_TRAINING_GROUND_KEY_RING] = HintText(CustomMessage("a Gerudo Training Ground Key Ring", /*german*/"das Schlüsselbund der Gerudo-Trainingsarena", /*french*/"un trousseau de clés du Gymnase Gerudo"),
                                                                    // /*spanish*/un llavero del Centro de Instrucción Gerudo
                                                                    {
                                                                    CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                                     // /*spanish*/un llavero
                                                                    }, {
-                                                                   CustomMessage("a labyrinthian toolbox for unlocking", /*german*/"eine labyrinthische Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes labyrinthiques"),
+                                                                   CustomMessage("a labyrinthian toolbox for unlocking", /*german*/"eine verwirrende Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes labyrinthiques"),
                                                                     // /*spanish*/un conjunto laberíntico de cerrajero
-                                                                   CustomMessage("a labyrinthian dungeon season pass", /*german*/"ein labyrinthischer Dungeon-Season-Pass", /*french*/"les rêves labyrinthiques d'un prisonnier"),
+                                                                   CustomMessage("a labyrinthian dungeon season pass", /*german*/"ein verwirrender Labyrinth-Season-Pass", /*french*/"les rêves labyrinthiques d'un prisonnier"),
                                                                     // /*spanish*/un pase vip de mazmorras laberíntico
-                                                                   CustomMessage("a labyrinthian jingling ring", /*german*/"ein labyrinthischer Multifunktionsschlüssel", /*french*/"des efface-serrures labyrinthiques"),
+                                                                   CustomMessage("a labyrinthian jingling ring", /*german*/"ein verwirrender Multifunktionsschlüssel", /*french*/"des efface-serrures labyrinthiques"),
                                                                     // /*spanish*/una cadena multiusos laberíntica
-                                                                   CustomMessage("a labyrinthian skeleton key", /*german*/"ein labyrinthischer Skelettschlüssel", /*french*/"des crochets à porte labyrinthiques")});
+                                                                   CustomMessage("a labyrinthian skeleton key", /*german*/"ein verwirrender Skelettschlüssel", /*french*/"des crochets à porte labyrinthiques")});
                                                                     // /*spanish*/un anillo laberíntico contra cerrojos
 
-    hintTextTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText(CustomMessage("a Gerudo Fortress Key Ring", /*german*/"ein Schlüsselbund der Gerudo-Festung", /*french*/"un trousseau de clés de la Repaire des Voleurs"),
+    hintTextTable[RHT_GERUDO_FORTRESS_KEY_RING] = HintText(CustomMessage("a Gerudo Fortress Key Ring", /*german*/"das Schlüsselbund des Diebesverstecks", /*french*/"un trousseau de clés de la Repaire des Voleurs"),
                                                            // /*spanish*/un llavero de la Fortaleza Gerudo
                                                            {
                                                            CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                             // /*spanish*/un llavero
                                                            }, {
-                                                           CustomMessage("an imprisoned toolbox for unlocking", /*german*/"eine gefangene Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes emprisonnés"),
+                                                           CustomMessage("an imprisoned toolbox for unlocking", /*german*/"eine gefangene Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes emprisonnés"),
                                                             // /*spanish*/un conjunto enjaulado de cerrajero
-                                                           CustomMessage("an imprisoned dungeon season pass", /*german*/"ein gefangener Dungeon-Season-Pass", /*french*/"les rêves emprisonnés d'un prisonnier"),
+                                                           CustomMessage("an imprisoned dungeon season pass", /*german*/"ein gefangener Labyrinth-Season-Pass", /*french*/"les rêves emprisonnés d'un prisonnier"),
                                                             // /*spanish*/un pase vip de una mazmorra enjaulado
                                                            CustomMessage("an imprisoned jingling ring", /*german*/"ein gefangener Multifunktionsschlüssel", /*french*/"des efface-serrures emprisonnés"),
                                                             // /*spanish*/una cadena multiusos enjaulada
                                                            CustomMessage("an imprisoned skeleton key", /*german*/"ein gefangener Skelettschlüssel", /*french*/"des crochets à porte emprisonnés")});
                                                             // /*spanish*/un anillo enjaulado contra cerrojos
 
-    hintTextTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText(CustomMessage("a Bottom of the Well Key Ring", /*german*/"ein Schlüsselbund des Grund des Brunnens", /*french*/"un trousseau de clés du fond du Puits"),
+    hintTextTable[RHT_BOTTOM_OF_THE_WELL_KEY_RING] = HintText(CustomMessage("a Bottom of the Well Key Ring", /*german*/"das Schlüsselbund vom Grund des Brunnens", /*french*/"un trousseau de clés du fond du Puits"),
                                                               // /*spanish*/un llavero del Fondo del pozo
                                                               {
                                                               CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                                // /*spanish*/un llavero
                                                               }, {
-                                                              CustomMessage("a moldy toolbox for unlocking", /*german*/"eine schimmelige Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes moisis"),
+                                                              CustomMessage("a moldy toolbox for unlocking", /*german*/"eine schimmelige Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes moisis"),
                                                                // /*spanish*/un conjunto subterráneo de cerrajero
-                                                              CustomMessage("a moldy dungeon season pass", /*german*/"ein schimmeliger Dungeon-Season-Pass", /*french*/"les rêves moisis d'un prisonnier"),
+                                                              CustomMessage("a moldy dungeon season pass", /*german*/"ein schimmeliger Labyrinth-Season-Pass", /*french*/"les rêves moisis d'un prisonnier"),
                                                                // /*spanish*/un pase vip de una mazmorra subterráneo
                                                               CustomMessage("a moldy jingling ring", /*german*/"ein schimmeliger Multifunktionsschlüssel", /*french*/"des efface-serrures moisis"),
                                                                // /*spanish*/una cadena multiusos subterránea
                                                               CustomMessage("a moldy skeleton key", /*german*/"ein schimmeliger Skelettschlüssel", /*french*/"des crochets à porte moisis")});
                                                                // /*spanish*/un anillo subterráneo contra cerrojos
 
-    hintTextTable[RHT_GANONS_CASTLE_KEY_RING] = HintText(CustomMessage("a Ganon's Castle Key Ring", /*german*/"ein Schlüsselbund von Ganons Schloß", /*french*/"un trousseau de clés du Château de Ganon"),
+    hintTextTable[RHT_GANONS_CASTLE_KEY_RING] = HintText(CustomMessage("a Ganon's Castle Key Ring", /*german*/"das Schlüsselbund von Ganons Schloß", /*french*/"un trousseau de clés du Château de Ganon"),
                                                          // /*spanish*/un llavero del Castillo de Ganon
                                                          {
                                                          CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a final toolbox for unlocking", /*german*/"eine finale Werkzeugkiste zur Entschlüsselung", /*french*/"des anti-portes finaux"),
+                                                         CustomMessage("a final toolbox for unlocking", /*german*/"eine finale Werkzeugkiste zur Entriegelung", /*french*/"des anti-portes finaux"),
                                                           // /*spanish*/un conjunto decisivo de cerrajero
-                                                         CustomMessage("a final dungeon season pass", /*german*/"ein finaler Dungeon-Season-Pass", /*french*/"les rêves finaux d'un prisonnier"),
+                                                         CustomMessage("a final dungeon season pass", /*german*/"ein finaler Labyrinth-Season-Pass", /*french*/"les rêves finaux d'un prisonnier"),
                                                           // /*spanish*/un pase vip de una mazmorra decisivo
                                                          CustomMessage("a final jingling ring", /*german*/"ein finaler Multifunktionsschlüssel", /*french*/"des efface-serrures finaux"),
                                                           // /*spanish*/una cadena multiusos decisiva
                                                          CustomMessage("a final skeleton key", /*german*/"ein finaler Skelettschlüssel", /*french*/"des crochets à porte finaux")});
                                                           // /*spanish*/un anillo decisivo multiusos
 
-    hintTextTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText(CustomMessage("a Treasure Chest Shop Small Key", /*german*/"ein kleiner Schlüssel des Schatztruhenladens", /*french*/"une petite clé de la chasse aux trésors"),
+    hintTextTable[RHT_TREASURE_GAME_SMALL_KEY] = HintText(CustomMessage("a Treasure Chest Shop Small Key", /*german*/"ein kleiner Schlüssel der Truhenlotterie", /*french*/"une petite clé de la chasse aux trésors"),
                                                           // /*spanish*/una llave pequeña del Cofre del Tesoro
                                                           {
                                                           CustomMessage("a small key", /*german*/"ein kleiner Schlüssel", /*french*/"une petite clé")
                                                            // /*spanish*/una llave pequeña
                                                           }, {
-                                                          CustomMessage("a gambler's tool for unlocking", /*german*/"ein Spieler-Werkzeug zur Entschlüsselung", /*french*/"un anti-porte de parieur"),
+                                                          CustomMessage("a gambler's tool for unlocking", /*german*/"ein Zocker-Werkzeug zur Entriegelung", /*french*/"un anti-porte de parieur"),
                                                            // /*spanish*/una clave de un juego de azar
-                                                          CustomMessage("a gambler's dungeon pass", /*german*/"ein Spieler-Dungeon-Pass", /*french*/"le rêve d'un prisonnier parieur"),
+                                                          CustomMessage("a gambler's dungeon pass", /*german*/"ein Zocker-Labyrinth-Pass", /*french*/"le rêve d'un prisonnier parieur"),
                                                            // /*spanish*/un pase de un juego de azar
-                                                          CustomMessage("a gambler's lock remover", /*german*/"ein Spieler-Schlossentferner", /*french*/"un efface-serrure de parieur"),
+                                                          CustomMessage("a gambler's lock remover", /*german*/"ein Zocker-Schlossentferner", /*french*/"un efface-serrure de parieur"),
                                                            // /*spanish*/un destructor de cerraduras del juego de azar
-                                                          CustomMessage("a gambler's lockpick", /*german*/"ein Spieler-Dietrich", /*french*/"un crochet à serrure de parieur")});
+                                                          CustomMessage("a gambler's lockpick", /*german*/"ein Zocker-Dietrich", /*french*/"un crochet à serrure de parieur")});
                                                            // /*spanish*/una apertura portentosa del juego de azar
 
-     hintTextTable[RHT_TREASURE_GAME_KEY_RING] = HintText(CustomMessage("a Chest Game Key Ring"),
+     hintTextTable[RHT_TREASURE_GAME_KEY_RING] = HintText(CustomMessage("a Chest Game Key Ring", /*german*/ "das Schlüsselbund der Truhenlotterie", /*french*/ "TRANSLATE THIS"),
                                                          {
                                                          CustomMessage("a key ring", /*german*/"ein Schlüsselbund", /*french*/"un trousseau de clés")
                                                           // /*spanish*/un llavero
                                                          }, {
-                                                         CustomMessage("a gambler's toolbox for unlocking"),
-                                                         CustomMessage("a gambler's season pass"),
-                                                         CustomMessage("a gambler's jingling ring"),
-                                                         CustomMessage("a gambler's skeleton key")});
+                                                         CustomMessage("a gambler's toolbox for unlocking", /*german*/ "eine Zocker-Werkzeugkiste zur Entriegelung", /*french*/ "TRANSLATE THIS"),
+                                                         CustomMessage("a gambler's season pass", /*german*/ "ein Zocker-Labyrinth-Season-Pass", /*french*/ "TRANSLATE THIS"),
+                                                         CustomMessage("a gambler's jingling ring", /*german*/ "ein Zocker-Multifunktionsschlüssel", /*french*/ "TRANSLATE THIS"),
+                                                         CustomMessage("a gambler's skeleton key", /*german*/ "ein Zocker-Skelettschlüssel", /*french*/ "TRANSLATE THIS")});
 
     hintTextTable[RHT_KOKIRI_EMERALD] = HintText(CustomMessage("the Kokiri Emerald", /*german*/"der Kokiri-Smaragd", /*french*/"l'Émeraude Kokiri"),
                                                  // /*spanish*/la Esmeralda de los Kokiri
                                                  {
-                                                 CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
+                                                 CustomMessage("a spiritual stone", /*german*/"ein Heiliger Stein", /*french*/"une Pierre Ancestrale")
                                                   // /*spanish*/una piedra espiritual
                                                  }, {
                                                  CustomMessage("a green stone", /*german*/"ein grüner Stein", /*french*/"une pierre verte"),
@@ -1547,18 +1550,18 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_GORON_RUBY] = HintText(CustomMessage("the Goron Ruby", /*german*/"der Goronen-Rubin", /*french*/"le Rubis Goron"),
                                              // /*spanish*/el Rubí de los Goron
                                              {
-                                             CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
+                                             CustomMessage("a spiritual stone", /*german*/"ein Heiliger Stein", /*french*/"une Pierre Ancestrale")
                                               // /*spanish*/una piedra espiritual
                                              }, {
                                              CustomMessage("a red stone", /*german*/"ein roter Stein", /*french*/"une pierre rouge"),
                                               // /*spanish*/una piedra carmín
-                                             CustomMessage("sworn brotherhood", /*german*/"verschworene Bruderschaft", /*french*/"un serment de fraternité")});
+                                             CustomMessage("sworn brotherhood", /*german*/"die geschworene Bruderschaft", /*french*/"un serment de fraternité")});
                                               // /*spanish*/el juramento de hermanos de sangre
 
     hintTextTable[RHT_ZORA_SAPPHIRE] = HintText(CustomMessage("the Zora Sapphire", /*german*/"der Zora-Saphir", /*french*/"le Saphir Zora"),
                                                 // /*spanish*/el Zafiro de los Zora
                                                 {
-                                                CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale")
+                                                CustomMessage("a spiritual stone", /*german*/"ein Heiliger Stein", /*french*/"une Pierre Ancestrale")
                                                  // /*spanish*/una piedra espiritual
                                                 }, {
                                                 CustomMessage("a blue stone", /*german*/"ein blauer Stein", /*french*/"une pierre bleue"),
@@ -1566,7 +1569,7 @@ void StaticData::HintTable_Init_Item() {
                                                 CustomMessage("an engagement gift", /*german*/"ein Verlobungsgeschenk", /*french*/"un cadeau de mariage")});
                                                  // /*spanish*/un regalo de compromiso
 
-    hintTextTable[RHT_FOREST_MEDALLION] = HintText(CustomMessage("the Forest Medallion", /*german*/"Amulett des Waldes", /*french*/"le Médaillon de la Forêt"),
+    hintTextTable[RHT_FOREST_MEDALLION] = HintText(CustomMessage("the Forest Medallion", /*german*/"das Amulett des Waldes", /*french*/"le Médaillon de la Forêt"),
                                                    // /*spanish*/el Medallón del Bosque
                                                    {
                                                    CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
@@ -1577,7 +1580,7 @@ void StaticData::HintTable_Init_Item() {
                                                    CustomMessage("Saria's friendship", /*german*/"Salias Freundschaft", /*french*/"l'amitié de Saria")});
                                                     // /*spanish*/la amistad de Saria
 
-    hintTextTable[RHT_FIRE_MEDALLION] = HintText(CustomMessage("the Fire Medallion", /*german*/"Amulett des Feuers", /*french*/"le Médaillon du Feu"),
+    hintTextTable[RHT_FIRE_MEDALLION] = HintText(CustomMessage("the Fire Medallion", /*german*/"das Amulett des Feuers", /*french*/"le Médaillon du Feu"),
                                                  // /*spanish*/el Medallón del Fuego
                                                  {
                                                  CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
@@ -1588,7 +1591,7 @@ void StaticData::HintTable_Init_Item() {
                                                  CustomMessage("Darunia's power", /*german*/"Darunias Kraft", /*french*/"la fraternité de Darunia")});
                                                   // /*spanish*/la fraternidad de Darunia
 
-    hintTextTable[RHT_WATER_MEDALLION] = HintText(CustomMessage("the Water Medallion", /*german*/"Amulett des Wassers", /*french*/"le Médaillon de l'Eau"),
+    hintTextTable[RHT_WATER_MEDALLION] = HintText(CustomMessage("the Water Medallion", /*german*/"das Amulett des Wassers", /*french*/"le Médaillon de l'Eau"),
                                                   // /*spanish*/el Medallón del Agua
                                                   {
                                                   CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
@@ -1596,21 +1599,21 @@ void StaticData::HintTable_Init_Item() {
                                                   }, {
                                                   CustomMessage("a blue coin", /*german*/"eine blaue Münze", /*french*/"une pièce bleue"),
                                                    // /*spanish*/una moneda zafiro
-                                                  CustomMessage("Ruto's power", /*german*/"Rutos Macht", /*french*/"l'amour de Ruto")});
+                                                  CustomMessage("Ruto's power", /*german*/"Rutos Liebe", /*french*/"l'amour de Ruto")});
                                                    // /*spanish*/el amor de Ruto
 
-    hintTextTable[RHT_SPIRIT_MEDALLION] = HintText(CustomMessage("the Spirit Medallion", /*german*/"Amulett der Geister", /*french*/"le Médaillon de l'Esprit"),
+    hintTextTable[RHT_SPIRIT_MEDALLION] = HintText(CustomMessage("the Spirit Medallion", /*german*/"das Amulett der Geister", /*french*/"le Médaillon de l'Esprit"),
                                                    // /*spanish*/el Medallón del Espíritu
                                                    {
                                                    CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
                                                     // /*spanish*/un medallón
                                                    }, {
-                                                   CustomMessage("an orange coin", /*german*/"eine orange Münze", /*french*/"une pièce orange"),
+                                                   CustomMessage("an orange coin", /*german*/"eine orangene Münze", /*french*/"une pièce orange"),
                                                     // /*spanish*/una moneda ámbar
-                                                   CustomMessage("Nabooru's power", /*german*/"Naborus Macht", /*french*/"le respect de Nabooru")});
+                                                   CustomMessage("Nabooru's power", /*german*/"Naborus Respekt", /*french*/"le respect de Nabooru")});
                                                     // /*spanish*/el respeto de Nabooru
 
-    hintTextTable[RHT_SHADOW_MEDALLION] = HintText(CustomMessage("the Shadow Medallion", /*german*/"Amulett des Schattens", /*french*/"le Médaillon de l'Ombre"),
+    hintTextTable[RHT_SHADOW_MEDALLION] = HintText(CustomMessage("the Shadow Medallion", /*german*/"das Amulett des Schattens", /*french*/"le Médaillon de l'Ombre"),
                                                    // /*spanish*/el Medallón de la Sombra
                                                    {
                                                    CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
@@ -1618,10 +1621,10 @@ void StaticData::HintTable_Init_Item() {
                                                    }, {
                                                    CustomMessage("a purple coin", /*german*/"eine violette Münze", /*french*/"une pièce pourpre"),
                                                     // /*spanish*/una moneda malva
-                                                   CustomMessage("Impa's power", /*german*/"Impas Macht", /*french*/"la confiance d'Impa")});
+                                                   CustomMessage("Impa's power", /*german*/"Impas Vertrauen", /*french*/"la confiance d'Impa")});
                                                     // /*spanish*/la confianza de Impa
 
-    hintTextTable[RHT_LIGHT_MEDALLION] = HintText(CustomMessage("the Light Medallion", /*german*/"Amulett des Lichts", /*french*/"le Médaillon de la Lumière"),
+    hintTextTable[RHT_LIGHT_MEDALLION] = HintText(CustomMessage("the Light Medallion", /*german*/"das Amulett des Lichts", /*french*/"le Médaillon de la Lumière"),
                                                   // /*spanish*/el Medallón de la Luz
                                                   {
                                                   CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon")
@@ -1629,7 +1632,7 @@ void StaticData::HintTable_Init_Item() {
                                                   }, {
                                                   CustomMessage("a yellow coin", /*german*/"eine gelbe Münze", /*french*/"une pièce jaune"),
                                                    // /*spanish*/una moneda resplandeciente
-                                                  CustomMessage("Rauru's power", /*german*/"Raurus Macht", /*french*/"la foi de Rauru")});
+                                                  CustomMessage("Rauru's power", /*german*/"Raurus Glaube", /*french*/"la foi de Rauru")});
                                                    // /*spanish*/la fe de Rauru
 
     hintTextTable[RHT_RECOVERY_HEART] = HintText(CustomMessage("a Recovery Heart", /*german*/"ein Herz", /*french*/"un coeur de vie"),
@@ -1648,7 +1651,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"ein grüner Rubin", /*french*/"un rubis vert"),
                                               // /*spanish*/una rupia verde
                                               {
-                                              CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                              CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                                // /*spanish*/una cantidad de rupias
                                               }, {
                                               CustomMessage("a unique coin", /*german*/"eine einzigartige Münze", /*french*/"un rubis bien mérité"),
@@ -1672,7 +1675,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_BLUE_RUPEE] = HintText(CustomMessage("a Blue Rupee", /*german*/"ein blauer Rubin", /*french*/"un rubis bleu"),
                                              // /*spanish*/una rupia azul
                                              {
-                                             CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                             CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                               // /*spanish*/una cantidad de rupias
                                              }, {
                                              CustomMessage("a common coin", /*german*/"eine gewöhnliche Münze", /*french*/"quelques sous"),
@@ -1683,7 +1686,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_RED_RUPEE] = HintText(CustomMessage("a Red Rupee", /*german*/"ein roter Rubin", /*french*/"un rubis rouge"),
                                             // /*spanish*/una rupia roja
                                             {
-                                            CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                            CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                              // /*spanish*/una cantidad de rupias
                                             }, {
                                             CustomMessage("couch cash", /*german*/"ein wenig Zaster", /*french*/"un peu de fric"),
@@ -1694,7 +1697,7 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_PURPLE_RUPEE] = HintText(CustomMessage("a Purple Rupee", /*german*/"ein violetter Rubin", /*french*/"un rubis pourpre"),
                                                // /*spanish*/una rupia morada
                                                {
-                                               CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                               CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                                 // /*spanish*/una cantidad de rupias
                                                }, {
                                                CustomMessage("big bucks", /*german*/"ordentlich Zaster", /*french*/"plein de fric"),
@@ -1704,19 +1707,19 @@ void StaticData::HintTable_Init_Item() {
                                                CustomMessage("wealth", /*german*/"Wohlstand", /*french*/"la richesse")});
                                                 // /*spanish*/una buena riqueza
 
-    hintTextTable[RHT_HUGE_RUPEE] = HintText(CustomMessage("a Huge Rupee", /*german*/"ein riesiger Rubin", /*french*/"un énorme rubis"),
+    hintTextTable[RHT_HUGE_RUPEE] = HintText(CustomMessage("a Huge Rupee", /*german*/"ein goldener Rubin", /*french*/"un énorme rubis"),
                                              // /*spanish*/una rupia gigante
                                              {
-                                             CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                             CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                               // /*spanish*/una cantidad de rupias
                                              }, {
                                              CustomMessage("a juicy jackpot", /*german*/"ein saftiger Jackpot", /*french*/"le jackpot"),
                                               // /*spanish*/el premio gordo
-                                             CustomMessage("a yellow gem", /*german*/"ein gelber Edelstein", /*french*/"un joyau doré"),
+                                             CustomMessage("a yellow gem", /*german*/"ein goldener Edelstein", /*french*/"un joyau doré"),
                                               // /*spanish*/una gema amarilla
                                              CustomMessage("a giant gem", /*german*/"ein riesiger Edelstein", /*french*/"un gros joyau"),
                                               // /*spanish*/una gema descomunal
-                                             CustomMessage("great wealth", /*german*/"großer Wohlstand", /*french*/"l'aisance financière")});
+                                             CustomMessage("great wealth", /*german*/"Reichtum", /*french*/"l'aisance financière")});
                                               // /*spanish*/dinero a caudales
 
     hintTextTable[RHT_PIECE_OF_HEART] = HintText(CustomMessage("a Piece of Heart", /*german*/"ein Herzteil", /*french*/"un Quart de Coeur"),
@@ -1748,170 +1751,170 @@ void StaticData::HintTable_Init_Item() {
                                            {
                                            CustomMessage("a Great Fairy's power", /*german*/"eine Kraft einer großen Fee", /*french*/"le pouvoir d'une grande fée"),
                                             // /*spanish*/el poder de una Gran Hada
-                                           CustomMessage("a magic arrow", /*german*/"ein magischer Pfeil", /*french*/"une flèche magique"),
+                                           CustomMessage("a magic arrow", /*german*/"magische Pfeile€", /*french*/"une flèche magique"),
                                             // /*spanish*/una flecha mágica
                                            CustomMessage("a medallion", /*german*/"ein Amulett", /*french*/"un médaillon"),
                                             // /*spanish*/un medallón
-                                           CustomMessage("a spiritual stone", /*german*/"ein spiritueller Stein", /*french*/"une Pierre Ancestrale"),
+                                           CustomMessage("a spiritual stone", /*german*/"ein Heiliger Stein", /*french*/"une Pierre Ancestrale"),
                                             // /*spanish*/una piedra espiritual
-                                           CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                           CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                             // /*spanish*/algo que pueda paralizar
                                            }, {
-                                           CustomMessage("a gift from Ganon", /*german*/"ein Geschenk von Ganon", /*french*/"un cadeau de Ganon"),
+                                           CustomMessage("a gift from Ganon", /*german*/"ein Geschenk Ganons", /*french*/"un cadeau de Ganon"),
                                             // /*spanish*/un regalo de Ganon
-                                           CustomMessage("a chilling discovery", /*german*/"eine fröstelnde Entdeckung", /*french*/"une frissonante découverte"),
+                                           CustomMessage("a chilling discovery", /*german*/"eine kühle Entdeckung", /*french*/"une frissonante découverte"),
                                             // /*spanish*/un escalofriante hallazgo
                                            CustomMessage("frosty fun", /*german*/"frostiger Spaß", /*french*/"une engelure")});
                                             // /*spanish*/una gélida diversión
 
-    hintTextTable[RHT_BOMBS_5] = HintText(CustomMessage("Bombs (5 pieces)", /*german*/"Bomben (5 Stück)", /*french*/"une demi-dizaine de bombes"),
+    hintTextTable[RHT_BOMBS_5] = HintText(CustomMessage("Bombs (5 pieces)", /*german*/"Bomben (5 Stück)€", /*french*/"une demi-dizaine de bombes"),
                                           // /*spanish*/unas (5) bombas
                                           {
-                                          CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                          CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                            // /*spanish*/un montón de explosivos
                                           }, {
-                                          CustomMessage("a few explosives", /*german*/"ein paar Explosivbehälter", /*french*/"une poignée de pétards"),
+                                          CustomMessage("a few explosives", /*german*/"wenig Explosives", /*french*/"une poignée de pétards"),
                                            // /*spanish*/un par de explosivos
-                                          CustomMessage("a few blast balls", /*german*/"ein paar Explosionsbälle", /*french*/"une poignée de boules bleues")});
+                                          CustomMessage("a few blast balls", /*german*/"ein paar Explosionskugeln€", /*french*/"une poignée de boules bleues")});
                                            // /*spanish*/un par de estallidos
 
-    hintTextTable[RHT_BOMBS_10] = HintText(CustomMessage("Bombs (10 pieces)", /*german*/"Bomben (10 Stück)", /*french*/"une dizaine de bombes"),
+    hintTextTable[RHT_BOMBS_10] = HintText(CustomMessage("Bombs (10 pieces)", /*german*/"Bomben (10 Stück)€", /*french*/"une dizaine de bombes"),
                                            // /*spanish*/unas (10) bombas
                                            {
-                                           CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                           CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                             // /*spanish*/un montón de explosivos
                                            }, {
-                                           CustomMessage("some explosives", /*german*/"einige Explosivbehälter", /*french*/"un paquet de pétards"),
+                                           CustomMessage("some explosives", /*german*/"etwas Explosives", /*french*/"un paquet de pétards"),
                                             // /*spanish*/unos cuantos explosivos
-                                           CustomMessage("some blast balls", /*german*/"einige Explosionsbälle", /*french*/"un paquet de boules bleues")});
+                                           CustomMessage("some blast balls", /*german*/"einige Explosionskugeln€", /*french*/"un paquet de boules bleues")});
                                             // /*spanish*/unos cuantos estallidos
 
-    hintTextTable[RHT_BOMBS_20] = HintText(CustomMessage("Bombs (20 pieces)", /*german*/"Bomben (20 Stück)", /*french*/"une vingtaine de bombes"),
+    hintTextTable[RHT_BOMBS_20] = HintText(CustomMessage("Bombs (20 pieces)", /*german*/"Bomben (20 Stück)€", /*french*/"une vingtaine de bombes"),
                                            // /*spanish*/unas (20) bombas
                                            {
-                                           CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                           CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                             // /*spanish*/un montón de explosivos
                                            }, {
-                                           CustomMessage("lots-o-explosives", /*german*/"viele Explosivbehälter", /*french*/"une abondance de pétards"),
+                                           CustomMessage("lots-o-explosives", /*german*/"viel Explosives", /*french*/"une abondance de pétards"),
                                             // /*spanish*/un puñado de explosivos
-                                           CustomMessage("plenty of blast balls", /*german*/"viele Explosionsbälle", /*french*/"une abondance de boules bleues")});
+                                           CustomMessage("plenty of blast balls", /*german*/"viele Explosionskugeln€", /*french*/"une abondance de boules bleues")});
                                             // /*spanish*/bastantes estallidos
 
-    hintTextTable[RHT_BOMBCHUS_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"Krabbelminen (5 Stück)", /*french*/"une demi-dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_5] = HintText(CustomMessage("Bombchus (5 pieces)", /*german*/"Krabbelminen (5 Stück)€", /*french*/"une demi-dizaine de Missiles"),
                                             // /*spanish*/unos (5) bombchus
                                             {
                                             CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                              // /*spanish*/un obsequio de la Casa Skulltula
-                                            CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                            CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                              // /*spanish*/un montón de explosivos
                                             }, {
-                                            CustomMessage("a few mice bombs", /*german*/"ein paar Mäusebomben", /*french*/"une poignée de mignons explosifs"),
+                                            CustomMessage("a few mice bombs", /*german*/"ein paar Mäusebomben€", /*french*/"une poignée de mignons explosifs"),
                                              // /*spanish*/un par de bombas roedoras
-                                            CustomMessage("a few proximity mice", /*german*/"ein paar Näherungsmäuse", /*french*/"une poignée de jouets à remonter"),
+                                            CustomMessage("a few proximity mice", /*german*/"ein paar Näherungsmäuse€", /*french*/"une poignée de jouets à remonter"),
                                              // /*spanish*/un par de explosivos ratoncitos
-                                            CustomMessage("a few wall crawlers", /*german*/"ein paar Wandkrabbler", /*french*/"une poignée de rapides grimpeurs"),
+                                            CustomMessage("a few wall crawlers", /*german*/"ein paar Wandkrabbler€", /*french*/"une poignée de rapides grimpeurs"),
                                              // /*spanish*/un par de trepaparedes
-                                            CustomMessage("a few trail blazers", /*german*/"ein paar Vorreiter", /*french*/"une poignée de zigzags éclatants")});
+                                            CustomMessage("a few trail blazers", /*german*/"ein paar Vorreiter€", /*french*/"une poignée de zigzags éclatants")});
                                              // /*spanish*/un par de ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHUS_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"Krabbelminen (10 Stück)", /*french*/"une dizaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_10] = HintText(CustomMessage("Bombchus (10 pieces)", /*german*/"Krabbelminen (10 Stück)€", /*french*/"une dizaine de Missiles"),
                                              // /*spanish*/unos (10) bombchus
                                              {
                                              CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                               // /*spanish*/un obsequio de la Casa Skulltula
-                                             CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                             CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                               // /*spanish*/un montón de explosivos
                                              }, {
-                                             CustomMessage("some mice bombs", /*german*/"einige Mäusebomben", /*french*/"un paquet de mignons explosifs"),
+                                             CustomMessage("some mice bombs", /*german*/"einige Mäusebomben€", /*french*/"un paquet de mignons explosifs"),
                                               // /*spanish*/unas cuantas bombas roedoras
-                                             CustomMessage("some proximity mice", /*german*/"einige Näherungsmäuse", /*french*/"un paquet de jouets à remonter"),
+                                             CustomMessage("some proximity mice", /*german*/"einige Näherungsmäuse€", /*french*/"un paquet de jouets à remonter"),
                                               // /*spanish*/unos cuantos explosivos ratoncitos
-                                             CustomMessage("some wall crawlers", /*german*/"einige Wandkrabbler", /*french*/"un paquet de rapides grimpeurs"),
+                                             CustomMessage("some wall crawlers", /*german*/"einige Wandkrabbler€", /*french*/"un paquet de rapides grimpeurs"),
                                               // /*spanish*/unos cuantos trepaparedes
-                                             CustomMessage("some trail blazers", /*german*/"einige Vorreiter", /*french*/"un paquet de zigzags éclatants")});
+                                             CustomMessage("some trail blazers", /*german*/"einige Vorreiter€", /*french*/"un paquet de zigzags éclatants")});
                                               // /*spanish*/unas cuantas ratas propulsadas
 
-    hintTextTable[RHT_BOMBCHUS_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"Krabbelminen (20 Stück)", /*french*/"une vingtaine de Missiles"),
+    hintTextTable[RHT_BOMBCHUS_20] = HintText(CustomMessage("Bombchus (20 pieces)", /*german*/"Krabbelminen (20 Stück)€", /*french*/"une vingtaine de Missiles"),
                                              // /*spanish*/unos (20) bombchus
                                              {
                                              CustomMessage("a prize of the House of Skulltulas", /*german*/"ein Preis des Skulltula-Hauses", /*french*/"un prix de la maison des Skulltulas"),
                                               // /*spanish*/un obsequio de la Casa Skulltula
-                                             CustomMessage("explosives", /*german*/"Explosivpakete", /*french*/"un paquet d'explosifs")
+                                             CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs")
                                               // /*spanish*/un montón de explosivos
                                              }, {
-                                             CustomMessage("plenty of mice bombs", /*german*/"viele Mäusebomben", /*french*/"une abondance de mignons explosifs"),
+                                             CustomMessage("plenty of mice bombs", /*german*/"viele Mäusebomben€", /*french*/"une abondance de mignons explosifs"),
                                               // /*spanish*/bastantes bombas roedoras
-                                             CustomMessage("plenty of proximity mice", /*german*/"viele Näherungsmäuse", /*french*/"une abondance de jouets à remonter"),
+                                             CustomMessage("plenty of proximity mice", /*german*/"viele Näherungsmäuse€", /*french*/"une abondance de jouets à remonter"),
                                               // /*spanish*/bastantes explosivos ratoncitos
-                                             CustomMessage("plenty of wall crawlers", /*german*/"viele Wandkrabbler", /*french*/"une abondance de rapides grimpeurs"),
+                                             CustomMessage("plenty of wall crawlers", /*german*/"viele Wandkrabbler€", /*french*/"une abondance de rapides grimpeurs"),
                                               // /*spanish*/bastantes trepaparedes
-                                             CustomMessage("plenty of trail blazers", /*german*/"viele Vorreiter", /*french*/"une abondance de zigzags éclatants")});
+                                             CustomMessage("plenty of trail blazers", /*german*/"viele Vorreiter€", /*french*/"une abondance de zigzags éclatants")});
                                               // /*spanish*/bastantes ratas propulsadas
 
-    hintTextTable[RHT_ARROWS_5] = HintText(CustomMessage("Arrows (5 pieces)", /*german*/"Pfeile (5 Stück)", /*french*/"une demi-dizaine de flèches"),
+    hintTextTable[RHT_ARROWS_5] = HintText(CustomMessage("Arrows (5 pieces)", /*german*/"Pfeile (5 Stück)€", /*french*/"une demi-dizaine de flèches"),
                                            // /*spanish*/unas (5) flechas
                                            {
                                            CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                             // /*spanish*/un proyectil
                                            }, {
-                                           CustomMessage("a few danger darts", /*german*/"ein paar gefährliche Spitzen", /*french*/"une poignée d'obus"),
+                                           CustomMessage("a few danger darts", /*german*/"ein paar gefährliche Spitzen€", /*french*/"une poignée d'obus"),
                                             // /*spanish*/un par de peligrosos dardos
-                                           CustomMessage("a few sharp shafts", /*german*/"ein paar scharfe Stifte", /*french*/"une poignée de piquets")});
+                                           CustomMessage("a few sharp shafts", /*german*/"ein paar scharfe Stifte€", /*french*/"une poignée de piquets")});
                                             // /*spanish*/un par de puntas afiladas
 
-    hintTextTable[RHT_ARROWS_10] = HintText(CustomMessage("Arrows (10 pieces)", /*german*/"Pfeile (10 Stück)", /*french*/"une dizaine de flèches"),
+    hintTextTable[RHT_ARROWS_10] = HintText(CustomMessage("Arrows (10 pieces)", /*german*/"Pfeile (10 Stück)€", /*french*/"une dizaine de flèches"),
                                             // /*spanish*/unas (10) flechas
                                             {
                                             CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                              // /*spanish*/un proyectil
                                             }, {
-                                            CustomMessage("some danger darts", /*german*/"einige gefährliche Spitzen", /*french*/"un paquet d'obus"),
+                                            CustomMessage("some danger darts", /*german*/"einige gefährliche Spitzen€", /*french*/"un paquet d'obus"),
                                              // /*spanish*/unos cuantos peligrosos dardos
-                                            CustomMessage("some sharp shafts", /*german*/"einige scharfe Stifte", /*french*/"un paquet de piquets")});
+                                            CustomMessage("some sharp shafts", /*german*/"einige scharfe Stifte€", /*french*/"un paquet de piquets")});
                                              // /*spanish*/unas cuantas puntas afiladas
 
-    hintTextTable[RHT_ARROWS_30] = HintText(CustomMessage("Arrows (30 pieces)", /*german*/"Pfeile (30 Stück)", /*french*/"une trentaine de flèches"),
+    hintTextTable[RHT_ARROWS_30] = HintText(CustomMessage("Arrows (30 pieces)", /*german*/"Pfeile (30 Stück)€", /*french*/"une trentaine de flèches"),
                                             // /*spanish*/unas (30) flechas
                                             {
                                             CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile")
                                              // /*spanish*/un proyectil
                                             }, {
-                                            CustomMessage("plenty of danger darts", /*german*/"viele gefährliche Spitzen", /*french*/"une abondance d'obus"),
+                                            CustomMessage("plenty of danger darts", /*german*/"viele gefährliche Spitzen€", /*french*/"une abondance d'obus"),
                                              // /*spanish*/bastantes peligrosos dardos
-                                            CustomMessage("plenty of sharp shafts", /*german*/"viele scharfe Stifte", /*french*/"une abondance de piquets")});
+                                            CustomMessage("plenty of sharp shafts", /*german*/"viele scharfe Stifte€", /*french*/"une abondance de piquets")});
                                              // /*spanish*/bastantes puntas afiladas
 
-    hintTextTable[RHT_DEKU_NUTS_5] = HintText(CustomMessage("Deku Nuts (5 pieces)", /*german*/"Deku-Nüsse (5 Stück)", /*french*/"une demi-dizaine de noix Mojo"),
+    hintTextTable[RHT_DEKU_NUTS_5] = HintText(CustomMessage("Deku Nuts (5 pieces)", /*german*/"Deku-Nüsse (5 Stück)€", /*french*/"une demi-dizaine de noix Mojo"),
                                               // /*spanish*/unas (5) nueces deku
                                               {
-                                              CustomMessage("some Deku munitions", /*german*/"ein wenig Deku-Munition", /*french*/"un paquet de munitions Mojo"),
+                                              CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                // /*spanish*/un montón de municiones Deku
-                                              CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                              CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                                // /*spanish*/algo que pueda paralizar
                                               }, {
-                                              CustomMessage("some nuts", /*german*/"ein paar Nüsse", /*french*/"une poignée de noisettes"),
+                                              CustomMessage("some nuts", /*german*/"ein paar Nüsse€", /*french*/"une poignée de noisettes"),
                                                // /*spanish*/un par de nueces
-                                              CustomMessage("some flashbangs", /*german*/"ein paar Blendgranaten", /*french*/"une poignée d'éclats"),
+                                              CustomMessage("some flashbangs", /*german*/"ein paar Blendgranaten€", /*french*/"une poignée d'éclats"),
                                                // /*spanish*/un par de semillas aturdidoras
-                                              CustomMessage("some scrub spit", /*german*/"ein wenig Buschspucke", /*french*/"une poignée de crachats Mojo")});
+                                              CustomMessage("some scrub spit", /*german*/"etwas Deku-Spucke€", /*french*/"une poignée de crachats Mojo")});
                                                // /*spanish*/un par de escupitajos deku
 
-    hintTextTable[RHT_DEKU_NUTS_10] = HintText(CustomMessage("Deku Nuts (10 pieces)", /*german*/"Deku-Nüsse (10 Stück)", /*french*/"une dizaine de noix Mojo"),
+    hintTextTable[RHT_DEKU_NUTS_10] = HintText(CustomMessage("Deku Nuts (10 pieces)", /*german*/"Deku-Nüsse (10 Stück)€", /*french*/"une dizaine de noix Mojo"),
                                                // /*spanish*/unas (10) nueces deku
                                                {
                                                CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo"),
                                                 // /*spanish*/un montón de municiones Deku
-                                               CustomMessage("something that can stun", /*german*/"etwas, das paralysieren kann", /*french*/"une chose qui peut paralyser")
+                                               CustomMessage("something that can stun", /*german*/"etwas zum Betäuben", /*french*/"une chose qui peut paralyser")
                                                 // /*spanish*/algo que pueda paralizar
                                                }, {
-                                               CustomMessage("lots-o-nuts", /*german*/"einige Nüsse", /*french*/"un paquet de noisettes"),
+                                               CustomMessage("lots-o-nuts", /*german*/"einige Nüsse€", /*french*/"un paquet de noisettes"),
                                                 // /*spanish*/un puñado de nueces
-                                               CustomMessage("plenty of flashbangs", /*german*/"einige Blendgranaten", /*french*/"un paquet d'éclats"),
+                                               CustomMessage("plenty of flashbangs", /*german*/"einige Blendgranaten€", /*french*/"un paquet d'éclats"),
                                                 // /*spanish*/unas cuantas semillas aturdidoras
-                                               CustomMessage("plenty of scrub spit", /*german*/"einige Buschspucke", /*french*/"un paquet de crachats Mojo")});
+                                               CustomMessage("plenty of scrub spit", /*german*/"einiges an Deku-Spucke€", /*french*/"un paquet de crachats Mojo")});
                                                 // /*spanish*/unos cuantos escupitajos deku
 
-    hintTextTable[RHT_DEKU_SEEDS_30] = HintText(CustomMessage("Deku Seeds (30 pieces)", /*german*/"Deku-Samen (30 Stück)", /*french*/"une trentaine de graines Mojo"),
+    hintTextTable[RHT_DEKU_SEEDS_30] = HintText(CustomMessage("Deku Seeds (30 pieces)", /*german*/"Deku-Kerne (30 Stück)€", /*french*/"une trentaine de graines Mojo"),
                                                 // /*spanish*/unas (30) semillas deku
                                                 {
                                                 CustomMessage("a projectile", /*german*/"ein Projektil", /*french*/"un projectile"),
@@ -1921,13 +1924,13 @@ void StaticData::HintTable_Init_Item() {
                                                 }, {
                                                 CustomMessage("catapult ammo", /*german*/"Katapultmunition", /*french*/"un paquet de délicieuses munitions"),
                                                  // /*spanish*/un par de munición infantil
-                                                CustomMessage("lots-o-seeds", /*german*/"viele Samen", /*french*/"un paquet de germes séchés")});
+                                                CustomMessage("lots-o-seeds", /*german*/"viele Kerne€", /*french*/"un paquet de germes séchés")});
                                                  // /*spanish*/un puñado de semillas
 
     hintTextTable[RHT_DEKU_STICK_1] = HintText(CustomMessage("a Deku Stick", /*german*/"ein Deku-Stab", /*french*/"un bâton Mojo"),
                                                // /*spanish*/un palo deku
                                                {
-                                               CustomMessage("some Deku munitions", /*german*/"ein wenig Deku-Munition", /*french*/"un paquet de munitions Mojo")
+                                               CustomMessage("some Deku munitions", /*german*/"etwas Deku-Munition", /*french*/"un paquet de munitions Mojo")
                                                 // /*spanish*/un montón de municiones Deku
                                                }, {
                                                CustomMessage("a breakable branch", /*german*/"ein brüchiger Zweig", /*french*/"un bout de bois")});
@@ -1945,87 +1948,87 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_TREASURE_GAME_GREEN_RUPEE] = HintText(CustomMessage("a Green Rupee", /*german*/"ein grüner Rubin", /*french*/"un rubis vert"),
                                                             // /*spanish*/una rupia verde
                                                             {
-                                                            CustomMessage("some rupees", /*german*/"einige Rubine", /*french*/"une quantité de rubis")
+                                                            CustomMessage("some rupees", /*german*/"einige Rubine€", /*french*/"une quantité de rubis")
                                                              // /*spanish*/una cantidad de rupias
                                                             }, {
                                                             CustomMessage("the dollar of defeat", /*german*/"der Rubin der Niederlage", /*french*/"le rubis de la défaite")});
                                                              // /*spanish*/el peso de la derrota
 
-    hintTextTable[RHT_TRIFORCE_PIECE] = HintText(CustomMessage("a Piece of the Triforce", /*german*/"ein Triforce-Fragment", /*french*/"un fragment de la Triforce"),
+    hintTextTable[RHT_TRIFORCE_PIECE] = HintText(CustomMessage("a Piece of the Triforce", /*german*/"ein Triforce-Splitter", /*french*/"un fragment de la Triforce"),
                                                  // /*spanish*/un fragmento de la Trifuerza
                                                  {}, {
                                                  CustomMessage("a triumph fork", /*german*/"ein Dreieck des Triumphs", /*french*/"la Tribosse"),
                                                   // /*spanish*/un trígono del triunfo
                                                  CustomMessage("cheese", /*german*/"Käse", /*french*/"du fromage"),
                                                   // /*spanish*/un porción de queso
-                                                 CustomMessage("a gold fragment", /*german*/"ein goldenes Fragment", /*french*/"un fragment d'or")});
+                                                 CustomMessage("a gold fragment", /*german*/"ein Goldfragment", /*french*/"un fragment d'or")});
                                                   // /*spanish*/un fragmento dorado
 
-    hintTextTable[RHT_GOHMA_SOUL] = HintText(CustomMessage("the soul of Gohma", /*german*/"die Seele Gohmas", /*french*/""),
+    hintTextTable[RHT_GOHMA_SOUL] = HintText(CustomMessage("the soul of Gohma", /*german*/"Gohmas Seele", /*french*/"l'Âme de Gohma"),
                                              {
-                                             CustomMessage("something webbed", /*german*/"etwas Verwobenes", /*french*/"")
+                                             CustomMessage("something webbed", /*german*/"etwas Verwobenes", /*french*/"un truc entoilé")
                                              }, {
-                                             CustomMessage("an invasive soul", /*german*/"eine invasive Seele", /*french*/""),
-                                             CustomMessage("some spider essence", /*german*/"etwas spinnenartige Essenz", /*french*/"")});
+                                             CustomMessage("an invasive soul", /*german*/"eine parasitäre Seele", /*french*/"une âme invasive"),
+                                             CustomMessage("some spider essence", /*german*/"etwas spinnenartige Essenz", /*french*/"une essence d'araignée")});
 
-    hintTextTable[RHT_KING_DODONGO_SOUL] = HintText(CustomMessage("the soul of King Dodongo", /*german*/"die Seele König Dodongos", /*french*/""),
+    hintTextTable[RHT_KING_DODONGO_SOUL] = HintText(CustomMessage("the soul of King Dodongo", /*german*/"König Dodongos Seele", /*french*/"l'Âme du Roi Dodongo"),
                                                     {
-                                                    CustomMessage("something explosive", /*german*/"etwas Explosives", /*french*/"")
+                                                    CustomMessage("something explosive", /*german*/"etwas Explosives", /*french*/"un truc détonnant")
                                                     }, {
-                                                    CustomMessage("a royal soul", /*german*/"eine royale Seele", /*french*/""),
-                                                    CustomMessage("some reptile essence", /*german*/"etwas reptilienartige Essenz", /*french*/"")});
+                                                    CustomMessage("a royal soul", /*german*/"eine königliche Seele", /*french*/"une âme royale"),
+                                                    CustomMessage("some reptile essence", /*german*/"etwas reptilienartige Essenz", /*french*/"une essence de reptile")});
 
-    hintTextTable[RHT_BARINADE_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"die Seele Barinades", /*french*/""),
+    hintTextTable[RHT_BARINADE_SOUL] = HintText(CustomMessage("the soul of Barinade", /*german*/"Barinades Seele", /*french*/"l'Âme de Barinade"),
                                                 {
-                                                CustomMessage("something fishy", /*german*/"etwas Fischiges", /*french*/"")
+                                                CustomMessage("something fishy", /*german*/"etwas Fischiges", /*french*/"un truc gluant")
                                                 }, {
-                                                CustomMessage("an infectuous soul", /*german*/"eine infektiöse Seele", /*french*/""),
-                                                CustomMessage("some parasitic essence", /*german*/"etwas parasitäre Essenz", /*french*/"")});
+                                                CustomMessage("an infectuous soul", /*german*/"eine infektiöse Seele", /*french*/"une âme infectieuse"),
+                                                CustomMessage("some parasitic essence", /*german*/"etwas elektrische Essenz", /*french*/"une essence parasitique")});
 
-    hintTextTable[RHT_PHANTOM_GANON_SOUL] = HintText(CustomMessage("the soul of Phantom Ganon", /*german*/"die Seele Phantom-Ganons", /*french*/""),
+    hintTextTable[RHT_PHANTOM_GANON_SOUL] = HintText(CustomMessage("the soul of Phantom Ganon", /*german*/"Phantom-Ganons Seele", /*french*/"l'Âme de Ganon Spectral"),
                                                      {
-                                                     CustomMessage("something spectral", /*german*/"etwas Spektrales", /*french*/"")
+                                                     CustomMessage("something spectral", /*german*/"etwas Spektrales", /*french*/"un truc spectral")
                                                      }, {
-                                                     CustomMessage("a duplicate soul", /*german*/"eine duplizierte Seele", /*french*/""),
+                                                     CustomMessage("a duplicate soul", /*german*/"eine duplizierte Seele", /*french*/"une âme clonée"),
 
-                                                     CustomMessage("some illusionary essence", /*german*/"etwas illusionäre Essenz", /*french*/"")});
+                                                     CustomMessage("some illusionary essence", /*german*/"etwas illusionäre Essenz", /*french*/"une essence illusoire")});
 
-    hintTextTable[RHT_VOLVAGIA_SOUL] = HintText(CustomMessage("the soul of Volvagia", /*german*/"die Seele Volvagias", /*french*/""),
+    hintTextTable[RHT_VOLVAGIA_SOUL] = HintText(CustomMessage("the soul of Volvagia", /*german*/"Volvagias Seele", /*french*/"l'Âme de Volcania"),
                                                 {
-                                                CustomMessage("something hot", /*german*/"etwas Heißes", /*french*/"")
+                                                CustomMessage("something hot", /*german*/"etwas Heißes", /*french*/"quelque chose de très chaud")
                                                 }, {
-                                                CustomMessage("a draconic soul", /*german*/"eine drakonische Seele", /*french*/""),
-                                                CustomMessage("some magmatic essence", /*german*/"etwas magmatische Essenz", /*french*/"")});
+                                                CustomMessage("a draconic soul", /*german*/"eine drakonische Seele", /*french*/"une essence draconique"),
+                                                CustomMessage("some magmatic essence", /*german*/"etwas magmatische Essenz", /*french*/"une essence magmatique")});
 
-    hintTextTable[RHT_MORPHA_SOUL] = HintText(CustomMessage("the soul of Morpha", /*german*/"die Seele Morphas", /*french*/""),
+    hintTextTable[RHT_MORPHA_SOUL] = HintText(CustomMessage("the soul of Morpha", /*german*/"Morphas Seele", /*french*/"l'Âme de Morpha"),
                                               {
-                                              CustomMessage("something wet", /*german*/"etwas Nasses", /*french*/"")
+                                              CustomMessage("something wet", /*german*/"etwas Nasses", /*french*/"un truc mouillé")
                                               }, {
-                                              CustomMessage("an aquatic soul", /*german*/"eine aquatische Seele", /*french*/""),
-                                              CustomMessage("some liquid essence", /*german*/"etwas flüssige Essenz", /*french*/"")});
+                                              CustomMessage("an aquatic soul", /*german*/"eine aquatische Seele", /*french*/"une âme aquatique"),
+                                              CustomMessage("some liquid essence", /*german*/"etwas flüssige Essenz", /*french*/"une essence liquide")});
 
-    hintTextTable[RHT_BONGO_BONGO_SOUL] = HintText(CustomMessage("the soul of Bongo Bongo", /*german*/"die Seele Bongo Bongos", /*french*/""),
+    hintTextTable[RHT_BONGO_BONGO_SOUL] = HintText(CustomMessage("the soul of Bongo Bongo", /*german*/"Bongo Bongos Seele", /*french*/"l'Âme de Bongo Bongo"),
                                                    {
-                                                   CustomMessage("something dark", /*german*/"etwas Dunkles", /*french*/"")
+                                                   CustomMessage("something dark", /*german*/"etwas Dunkles", /*french*/"quelque chose de sombre")
                                                    }, {
-                                                   CustomMessage("a shadowy soul", /*german*/"eine schattige Seele", /*french*/""),
-                                                   CustomMessage("some handy essence", /*german*/"etwas praktische Essenz", /*french*/"")});
+                                                   CustomMessage("a shadowy soul", /*german*/"eine schattige Seele", /*french*/"une âme ténébreuse"),
+                                                   CustomMessage("some handy essence", /*german*/"etwas bestialische Essenz", /*french*/"l'âme du tape m'en cinq")});
 
-    hintTextTable[RHT_TWINROVA_SOUL] = HintText(CustomMessage("the soul of Twinrova", /*german*/"die Seele Twinrovas", /*french*/""),
+    hintTextTable[RHT_TWINROVA_SOUL] = HintText(CustomMessage("the soul of Twinrova", /*german*/"Twinrovas Seele", /*french*/"l'Âme du Duo Maléfique"),
                                                 {
-                                                CustomMessage("something spiritual", /*german*/"etwas Spirituelles", /*french*/"")
+                                                CustomMessage("something spiritual", /*german*/"etwas Geisterhaftes", /*french*/"un truc spirituel")
                                                 }, {
-                                                CustomMessage("old souls", /*german*/"alte Seelen", /*french*/""),
-                                                CustomMessage("twin essences", /*german*/"Zwillingsessenzen", /*french*/"")});
+                                                CustomMessage("old souls", /*german*/"alte Seelen", /*french*/"deux vieilles âmes"),
+                                                CustomMessage("twin essences", /*german*/"Zwillingsessenzen€", /*french*/"des essences jumelles")});
 
-    hintTextTable[RHT_GANON_SOUL] = HintText(CustomMessage("the soul of Ganon", /*german*/"die Seele Ganons", /*french*/""),
+    hintTextTable[RHT_GANON_SOUL] = HintText(CustomMessage("the soul of Ganon", /*german*/"Ganons Seele", /*french*/"l'Âme de Ganon"),
                                              {
-                                             CustomMessage("something strong", /*german*/"etwas Starkes", /*french*/"")
+                                             CustomMessage("something strong", /*german*/"etwas Starkes", /*french*/"un truc de fort")
                                              }, {
-                                             CustomMessage("an evil soul", /*german*/"eine böse Seele", /*french*/""),
-                                             CustomMessage("some powerful essence", /*german*/"etwas mächtige Essenz", /*french*/"")});
+                                             CustomMessage("an evil soul", /*german*/"eine böse Seele", /*french*/"une âme maléfique"),
+                                             CustomMessage("some powerful essence", /*german*/"etwas mächtige Essenz", /*french*/"une essence incroyablement puissante")});
 
-    hintTextTable[RHT_OCARINA_A_BUTTON] = HintText(CustomMessage("an Ocarina A Button", /*german*/"eine Okarina A Taste", /*french*/"la Touche A de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_A_BUTTON] = HintText(CustomMessage("an Ocarina A Button", /*german*/"die A-Taste der Okarina", /*french*/"la Touche A de l'Ocarina"),
                                                    // /*spanish*/un botón A de Ocarina
                                                    {
                                                    CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
@@ -2034,7 +2037,7 @@ void StaticData::HintTable_Init_Item() {
                                                    CustomMessage("a musical letter", /*german*/"ein musikalischer Brief", /*french*/"une lettre musicale")});
                                                     // /*spanish*/una letra musical
 
-    hintTextTable[RHT_OCARINA_C_UP_BUTTON] = HintText(CustomMessage("an Ocarina C Up Button", /*german*/"eine Okarina C-Oben Taste", /*french*/"la Touche C-Haut de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_UP_BUTTON] = HintText(CustomMessage("an Ocarina C Up Button", /*german*/"die C-Oben-Taste der Okarina", /*french*/"la Touche C-Haut de l'Ocarina"),
                                                       // /*spanish*/un botón C superior de Ocarina
                                                       {
                                                       CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
@@ -2043,7 +2046,7 @@ void StaticData::HintTable_Init_Item() {
                                                       CustomMessage("a high tone", /*german*/"ein hoher Ton", /*french*/"une tonalité élevée")});
                                                        // /*spanish*/un tono alto
 
-    hintTextTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText(CustomMessage("an Ocarina C Down Button", /*german*/"eine Okarina C-Unten Taste", /*french*/"la Touche C-Bas de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_DOWN_BUTTON] = HintText(CustomMessage("an Ocarina C Down Button", /*german*/"die C-Unten-Taste der Okarina", /*french*/"la Touche C-Bas de l'Ocarina"),
                                                         // /*spanish*/un botón C inferior de Ocarina
                                                         {
                                                         CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
@@ -2052,7 +2055,7 @@ void StaticData::HintTable_Init_Item() {
                                                         CustomMessage("a low tone", /*german*/"ein tiefer Ton", /*french*/"une tonalité basse")});
                                                          // /*spanish*/un tono bajo
 
-    hintTextTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText(CustomMessage("an Ocarina C Left Button", /*german*/"eine Okarina C-Links Taste", /*french*/"la Touche C-Gauche de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_LEFT_BUTTON] = HintText(CustomMessage("an Ocarina C Left Button", /*german*/"die C-Links-Taste der Okarina", /*french*/"la Touche C-Gauche de l'Ocarina"),
                                                         // /*spanish*/un botón C izquierdo de Ocarina
                                                         {
                                                         CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
@@ -2061,7 +2064,7 @@ void StaticData::HintTable_Init_Item() {
                                                         CustomMessage("a leftward tone", /*german*/"ein linksseitiger Ton", /*french*/"une tonalité vers la gauche")});
                                                          // /*spanish*/un tono hacia la izquierda
 
-    hintTextTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText(CustomMessage("an Ocarina C Right Button", /*german*/"eine Okarina C-Rechts Taste", /*french*/"la Touche C-Droit de l'Ocarina"),
+    hintTextTable[RHT_OCARINA_C_RIGHT_BUTTON] = HintText(CustomMessage("an Ocarina C Right Button", /*german*/"die C-Rechts-Taste der Okarina", /*french*/"la Touche C-Droit de l'Ocarina"),
                                                          // /*spanish*/un botón C derecho de Ocarina
                                                          {
                                                          CustomMessage("something melodic", /*german*/"etwas Melodisches", /*french*/"quelque chose de mélodieux")
@@ -2070,25 +2073,25 @@ void StaticData::HintTable_Init_Item() {
                                                          CustomMessage("a rightward tone", /*german*/"ein rechtsseitiger Ton", /*french*/"une tonalité vers la droite")});
                                                           // /*spanish*/un tono hacia la derecha
 
-    hintTextTable[RHT_FISHING_POLE] = HintText(CustomMessage("a fishing pole", /*german*/"eine Angelrute", /*french*/"canne à pêche"),
+    hintTextTable[RHT_FISHING_POLE] = HintText(CustomMessage("a fishing pole", /*german*/"eine Angelrute", /*french*/"une canne à pêche"),
                                                // /*spanish*/caña de pescar
                                                {
-                                               CustomMessage("the pond owner's property", /*german*/"der Besitz des Teicheigners", /*french*/"(canne à pêche)")
+                                               CustomMessage("the pond owner's property", /*german*/"das Eigentum des Fischweiherbesitzers", /*french*/"(un truc qui appartient au propriétaire de l'étang)")
                                                 // /*spanish*/(caña de pescar)
                                                }, {
-                                               CustomMessage("a fish-puller", /*german*/"ein Fischzieher", /*french*/"(canne à pêche)")});
+                                               CustomMessage("a fish-puller", /*german*/"ein Fischzieher", /*french*/"(un aimant à poisson)")});
                                                 // /*spanish*/(caña de pescar)
 
-    hintTextTable[RHT_BOMBCHU_BAG] = HintText(CustomMessage("Bombchu Bag", /*german*/"!!!", /*french*/"!!!"),
+    hintTextTable[RHT_BOMBCHU_BAG] = HintText(CustomMessage("a Bombchu Bag", /*german*/"eine Krabbelminentasche", /*french*/"un Sac de Missiles Teigneux"),
                                               {
-                                             CustomMessage("explosives", /*german*/"ein Explosivpaket", /*french*/"un paquet d'explosifs"),
+                                             CustomMessage("explosives", /*german*/"Explosives", /*french*/"un paquet d'explosifs"),
                                                   // /*spanish*/un montón de explosivos
-                                             CustomMessage("something that can remove boulders", /*german*/"etwas, das Geröll entfernen kann", /*french*/"une chose qui enlève les rochers")
+                                             CustomMessage("something that can remove boulders", /*german*/"etwas zum Geröll entfernen", /*french*/"une chose qui enlève les rochers")
                                                   // /*spanish*/algo que pueda quitar rocas
                                               }, {
-                                              CustomMessage("sack of mice", /*german*/"!!!", /*french*/"!!!")});
+                                              CustomMessage("sack of mice", /*german*/"ein Sack Mäuse", /*french*/"un Sac rempli de souris")});
 
-    hintTextTable[RHT_SKELETON_KEY] = HintText(CustomMessage("a Skeleton Key", /*german*/ "ein Universalschlüssel", /*french*/ "une Clé Squelette"),
+    hintTextTable[RHT_SKELETON_KEY] = HintText(CustomMessage("a Skeleton Key", /*german*/ "der Skelettschlüssel", /*french*/ "une Clé Squelette"),
                                                // /*spanish*/una Llave Maestra
                                                {
                                                CustomMessage("a key", /*german*/ "ein Schlüssel", /*french*/ "une clé")
@@ -2096,62 +2099,32 @@ void StaticData::HintTable_Init_Item() {
                                                },
                                                { CustomMessage("a master unlocker", /*german*/ "ein Meisterentsperrer", /*french*/ "un Kit de Déverrouillage") });
                                                 // /*spanish*/un desbloqueador maestro
-    hintTextTable[RHT_QUIVER_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                             {
-                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                             }, {
-                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
 
-    hintTextTable[RHT_BOMB_BAG_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                               {
-                                               CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                               }, {
-                                               CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    //RANDOTODO if these are ever used for anything other than name, they want abscure and ambiguous hints
+    hintTextTable[RHT_QUIVER_INF] = HintText(CustomMessage("an infinite Quiver", /*german*/"der unendliche Köcher", /*french*/"un Carquois Infini"));
 
-    hintTextTable[RHT_BULLET_BAG_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                 {
-                                                 CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                 }, {
-                                                 CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_BOMB_BAG_INF] = HintText(CustomMessage("an infinite Bomb Bag", /*german*/"die unendliche Bombentasche", /*french*/"un Sac de Bombe sans fond"));
 
-    hintTextTable[RHT_STICK_UPGRADE_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                    {
-                                                    CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                    }, {
-                                                    CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_BULLET_BAG_INF] = HintText(CustomMessage("an infinite Bullet Bag", /*german*/"die unendliche Munitionstasche", /*french*/"un Sac de Graine sans fond"));
 
-    hintTextTable[RHT_NUT_UPGRADE_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                  {
-                                                  CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                                  }, {
-                                                  CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_STICK_UPGRADE_INF] = HintText(CustomMessage("infinite Deku Sticks", /*german*/"unendliche Deku-Stab-Kapazität", /*french*/"des Bâtons Mojo illimités"));
 
-    hintTextTable[RHT_MAGIC_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                            {
-                                            CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                            }, {
-                                            CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_NUT_UPGRADE_INF] = HintText(CustomMessage("infinite Deku Nuts", /*german*/"unendliche Deku-Nuß-Kapazität", /*french*/"des Noix Mojo illimitées"));
 
-    hintTextTable[RHT_BOMBCHU_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                              {
-                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                              }, {
-                                              CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_MAGIC_INF] = HintText(CustomMessage("unlimited Magic", /*german*/"unendliche Magische Kraft", /*french*/"de la Magie infinie"));
 
-    hintTextTable[RHT_WALLET_INF] = HintText(CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                             {
-                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!"),
-                                             }, {
-                                             CustomMessage("", /*german*/"!!!", /*french*/"!!!")});
+    hintTextTable[RHT_BOMBCHU_INF] = HintText(CustomMessage("infinite Bombchus", /*german*/"die unendliche Krabbelminentasche", /*french*/"des Missiles Teigneux illimités"));
+
+    hintTextTable[RHT_WALLET_INF] = HintText(CustomMessage("an infinite Wallet", /*german*/"die unendliche Geldbörse", /*french*/"une Bourse sans fond"));
 
     hintTextTable[RHT_EPONA] = HintText(CustomMessage("Epona", /*german*/"Epona", /*french*/"Epona"),
                                     // /*spanish*/a Epona
                                     {
                                     CustomMessage("something from Malon", /*german*/"ein Geschenk von Malon", /*french*/"un cadeau de Malon"),
                                          // /*spanish*/un obsequio de Malon
-                                    CustomMessage("a song sung by frogs", /*german*/"ein von Fröschen gesungenes Lied", /*french*/"une chanson aimée des grenouilles"),
+                                    CustomMessage("a song sung by frogs", /*german*/"ein von Fröschen gesungenes Lied,", /*french*/"une chanson aimée des grenouilles"),
                                          // /*spanish*/una melodía de ranas
-                                    CustomMessage("something to cross a broken bridge", /*german*/"etwas, um eine kaputte Brücke zu überqueren", /*french*/"une chose pour traverser un pont brisé")
+                                    CustomMessage("something to cross a broken bridge", /*german*/"etwas um eine kaputte Brücke zu überqueren,", /*french*/"une chose pour traverser un pont brisé")
                                          // /*spanish*/algo para cruzar un puente roto
                                     }, {
                                     CustomMessage("a horse", /*german*/"ein Pferd", /*french*/"un fidèle destrier"),
@@ -2163,11 +2136,12 @@ void StaticData::HintTable_Init_Item() {
     hintTextTable[RHT_HINT_MYSTERIOUS] = HintText(CustomMessage("something mysterious", /*german*/"etwas Mysteriöses", /*french*/"un sacré mystère"));
                                                   // /*spanish*/algo misterioso
 
-    hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriöser Gegenstand", /*french*/"objet mystérieux"));
+    hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"ein mysteriöser Gegenstand", /*french*/"objet mystérieux"));
                                                   // /*spanish*/algo misterioso
-               
+
      hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL] = HintText(CustomMessage("Mysterious Item", /*german*/"Mysteriöser Gegenstand", /*french*/"Objet Mystérieux"));
                                                   // /*spanish*/Algo Misterioso
 
+    // clang-format on
 }
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 932b97316b..65cc6eb8c0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -13,16 +13,11 @@
 #include "../hint.h"
 #include "../static_data.h"
 
-
 using namespace Rando;
 
-HintDistributionSetting::HintDistributionSetting(std::string _name, 
-                          HintType _type, 
-                          uint32_t _weight, 
-                          uint8_t _fixed, 
-                          uint8_t _copies, 
-                          std::function<bool(RandomizerCheck)> _filter,
-                          uint8_t _dungeonLimit){
+HintDistributionSetting::HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed,
+                                                 uint8_t _copies, std::function<bool(RandomizerCheck)> _filter,
+                                                 uint8_t _dungeonLimit) {
     name = _name;
     type = _type;
     weight = _weight;
@@ -30,10 +25,12 @@ HintDistributionSetting::HintDistributionSetting(std::string _name,
     copies = _copies;
     filter = _filter;
     dungeonLimit = _dungeonLimit;
-  }
+}
 
-HintText::HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_, std::vector<CustomMessage> obscureText_)
-: clearText(std::move(clearText_)), ambiguousText(std::move(ambiguousText_)), obscureText(std::move(obscureText_)){}
+HintText::HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_,
+                   std::vector<CustomMessage> obscureText_)
+    : clearText(std::move(clearText_)), ambiguousText(std::move(ambiguousText_)), obscureText(std::move(obscureText_)) {
+}
 
 const CustomMessage& HintText::GetClear() const {
     return clearText;
@@ -43,8 +40,8 @@ const CustomMessage& HintText::GetObscure() const {
     return obscureText.size() > 0 ? RandomElement(obscureText) : clearText;
 }
 
-const CustomMessage& HintText::GetObscure(uint8_t selection) const {
-    if (obscureText.size() > selection){
+const CustomMessage& HintText::GetObscure(size_t selection) const {
+    if (obscureText.size() > selection) {
         return obscureText[selection];
     } else if (obscureText.size() > 0) {
         return obscureText[0];
@@ -56,8 +53,8 @@ const CustomMessage& HintText::GetAmbiguous() const {
     return ambiguousText.size() > 0 ? RandomElement(ambiguousText) : clearText;
 }
 
-const CustomMessage& HintText::GetAmbiguous(uint8_t selection) const {
-    if (ambiguousText.size() > selection){
+const CustomMessage& HintText::GetAmbiguous(size_t selection) const {
+    if (ambiguousText.size() > selection) {
         return ambiguousText[selection];
     } else if (ambiguousText.size() > 0) {
         return ambiguousText[0];
@@ -65,15 +62,15 @@ const CustomMessage& HintText::GetAmbiguous(uint8_t selection) const {
     return clearText;
 }
 
-uint8_t HintText::GetAmbiguousSize() const{
+size_t HintText::GetAmbiguousSize() const {
     return ambiguousText.size();
 }
 
-uint8_t HintText::GetObscureSize() const{
+size_t HintText::GetObscureSize() const {
     return obscureText.size();
 }
 
-const CustomMessage& HintText::GetHintMessage(uint8_t selection) const {
+const CustomMessage& HintText::GetHintMessage(size_t selection) const {
     auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
         return GetObscure(selection);
@@ -96,66 +93,65 @@ const CustomMessage HintText::GetMessageCopy() const {
 }
 
 bool HintText::operator==(const HintText& right) const {
-    return obscureText == right.obscureText &&
-            ambiguousText == right.ambiguousText &&
-            clearText == right.clearText;
+    return obscureText == right.obscureText && ambiguousText == right.ambiguousText && clearText == right.clearText;
 }
 
 bool HintText::operator!=(const HintText& right) const {
     return !operator==(right);
 }
 
-StaticHintInfo::StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting,
-                               std::variant<bool, uint8_t> _condition, std::vector<RandomizerCheck> _targetChecks,
-                               std::vector<RandomizerGet> _targetItems, std::vector<RandomizerCheck> _hintChecks, bool _yourPocket, int _num):
-                               type(_type), hintKeys(_hintKeys), setting(_setting), condition(_condition), targetChecks(_targetChecks),
-                               targetItems(_targetItems), hintChecks(_hintChecks), yourPocket(_yourPocket), num(_num){}
+StaticHintInfo::StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys,
+                               RandomizerSettingKey _setting, std::variant<bool, uint8_t> _condition,
+                               std::vector<RandomizerCheck> _targetChecks, std::vector<RandomizerGet> _targetItems,
+                               std::vector<RandomizerCheck> _hintChecks, bool _yourPocket, int _num)
+    : type(_type), hintKeys(_hintKeys), setting(_setting), condition(_condition), targetChecks(_targetChecks),
+      targetItems(_targetItems), hintChecks(_hintChecks), yourPocket(_yourPocket), num(_num) {
+}
 
-RandomizerHintTextKey GetRandomJunkHint(){ 
+RandomizerHintTextKey GetRandomJunkHint() {
     // Temp code to handle random junk hints now I work in keys instead of a vector of HintText
     // Will be replaced with a better system once more customisable hint pools are added
     uint32_t range = RHT_JUNK71 - RHT_JUNK01;
     return (RandomizerHintTextKey)(Random(0, range) + RHT_JUNK01);
 }
 
-RandomizerHintTextKey GetRandomGanonJoke(){ 
-  uint32_t range = RHT_GANON_JOKE11 - RHT_GANON_JOKE01;
-  return (RandomizerHintTextKey)(Random(0, range) + RHT_GANON_JOKE01);
+RandomizerHintTextKey GetRandomGanonJoke() {
+    uint32_t range = RHT_GANON_JOKE11 - RHT_GANON_JOKE01;
+    return (RandomizerHintTextKey)(Random(0, range) + RHT_GANON_JOKE01);
 }
 
-
-bool FilterWotHLocations(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return ctx->GetItemLocation(loc)->IsWothCandidate();
+bool FilterWotHLocations(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return ctx->GetItemLocation(loc)->IsWothCandidate();
 }
 
-bool FilterFoolishLocations(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return ctx->GetItemLocation(loc)->IsFoolishCandidate();
+bool FilterFoolishLocations(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return ctx->GetItemLocation(loc)->IsFoolishCandidate();
 }
 
-bool FilterSongLocations(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION;
+bool FilterSongLocations(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return Rando::StaticData::GetLocation(loc)->GetRCType() == RCTYPE_SONG_LOCATION;
 }
 
-bool FilterOverworldLocations(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return Rando::StaticData::GetLocation(loc)->IsOverworld();
+bool FilterOverworldLocations(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return Rando::StaticData::GetLocation(loc)->IsOverworld();
 }
 
-bool FilterDungeonLocations(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return Rando::StaticData::GetLocation(loc)->IsDungeon();
+bool FilterDungeonLocations(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return Rando::StaticData::GetLocation(loc)->IsDungeon();
 }
 
-bool FilterGoodItems(RandomizerCheck loc){
-  auto ctx = Rando::Context::GetInstance();
-  return ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem();
+bool FilterGoodItems(RandomizerCheck loc) {
+    auto ctx = Rando::Context::GetInstance();
+    return ctx->GetItemLocation(loc)->GetPlacedItem().IsMajorItem();
 }
 
-bool NoFilter(RandomizerCheck loc){
-  return true;
+bool NoFilter(RandomizerCheck loc) {
+    return true;
 }
 
 const std::array<HintSetting, 4> hintSettingTable{{
@@ -225,15 +221,16 @@ uint8_t StonesRequiredBySettings() {
         stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Get();
     } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
         stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get() - 6;
-    } else if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) && (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
+    } else if ((ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) &&
+               (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON))) {
         stones = ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get() - 6;
     }
     if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
         stones = std::max<uint8_t>({ stones, ctx->GetOption(RSK_LACS_STONE_COUNT).Get() });
     } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
-        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get() - 6 )});
+        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get() - 6) });
     } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
-        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get() - 6 )});
+        stones = std::max<uint8_t>({ stones, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get() - 6) });
     }
     return stones;
 }
@@ -245,15 +242,17 @@ uint8_t MedallionsRequiredBySettings() {
         medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Get();
     } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
         medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get() - 3;
-    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS) && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS) &&
+               ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
         medallions = ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get() - 3;
     }
     if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
         medallions = std::max({ medallions, ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Get() });
     } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
-        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get() - 3 )});
-    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS) && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
-        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get() - 3 )});
+        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get() - 3) });
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS) &&
+               ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+        medallions = std::max({ medallions, (uint8_t)(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get() - 3) });
     }
     return medallions;
 }
@@ -271,555 +270,601 @@ uint8_t TokensRequiredBySettings() {
 }
 
 std::vector<std::pair<RandomizerCheck, std::function<bool()>>> conditionalAlwaysHints = {
-    std::make_pair(RC_MARKET_10_BIG_POES, []() {
+    std::make_pair(RC_MARKET_10_BIG_POES,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
-                       return ctx->GetOption(RSK_BIG_POE_COUNT).Get() >= 3 && !ctx->GetOption(RSK_BIG_POES_HINT);
-                   }), // Remember, the option's value being 3 means 4 are required
-    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH, []() {
+                       return ctx->GetOption(RSK_BIG_POE_COUNT).Get() > 3 && !ctx->GetOption(RSK_BIG_POES_HINT);
+                   }),
+    std::make_pair(RC_DEKU_THEATER_MASK_OF_TRUTH,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_MASK_SHOP_HINT) && !ctx->GetOption(RSK_COMPLETE_MASK_QUEST);
                    }),
-    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME, []() { 
-                        auto ctx = Rando::Context::GetInstance();
-                        return StonesRequiredBySettings() < 2 && !ctx->GetOption(RSK_OOT_HINT);
+    std::make_pair(RC_SONG_FROM_OCARINA_OF_TIME,
+                   []() {
+                       auto ctx = Rando::Context::GetInstance();
+                       return StonesRequiredBySettings() < 2 && !ctx->GetOption(RSK_OOT_HINT);
                    }),
     std::make_pair(RC_HF_OCARINA_OF_TIME_ITEM, []() { return StonesRequiredBySettings() < 2; }),
     std::make_pair(RC_SHEIK_IN_KAKARIKO, []() { return MedallionsRequiredBySettings() < 5; }),
-    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK, []() {
+    std::make_pair(RC_DMT_TRADE_CLAIM_CHECK,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_BIGGORON_HINT);
                    }),
-    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD, []() {
+    std::make_pair(RC_KAK_30_GOLD_SKULLTULA_REWARD,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_KAK_30_SKULLS_HINT) && TokensRequiredBySettings() < 30;
                    }),
-    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD, []() {
+    std::make_pair(RC_KAK_40_GOLD_SKULLTULA_REWARD,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_KAK_40_SKULLS_HINT) && TokensRequiredBySettings() < 40;
                    }),
-    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD, []() {
+    std::make_pair(RC_KAK_50_GOLD_SKULLTULA_REWARD,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_KAK_50_SKULLS_HINT) && TokensRequiredBySettings() < 50;
                    }),
-    std::make_pair(RC_ZR_FROGS_OCARINA_GAME, []() {
+    std::make_pair(RC_ZR_FROGS_OCARINA_GAME,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_FROGS_HINT);
                    }),
-    std::make_pair(RC_KF_LINKS_HOUSE_COW, []() {
+    std::make_pair(RC_KF_LINKS_HOUSE_COW,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_MALON_HINT);
                    }),
-    std::make_pair(RC_KAK_100_GOLD_SKULLTULA_REWARD, []() {
+    std::make_pair(RC_KAK_100_GOLD_SKULLTULA_REWARD,
+                   []() {
                        auto ctx = Rando::Context::GetInstance();
                        return !ctx->GetOption(RSK_KAK_100_SKULLS_HINT) && TokensRequiredBySettings() < 100;
                    }),
 };
 
 static std::vector<RandomizerCheck> GetEmptyGossipStones() {
-  auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::GetGossipStoneLocations());
-  return emptyGossipStones;
+    auto emptyGossipStones = GetEmptyLocations(Rando::StaticData::GetGossipStoneLocations());
+    return emptyGossipStones;
 }
 
 static std::vector<RandomizerCheck> GetAccessibleGossipStones(const RandomizerCheck hintedLocation = RC_GANON) {
-  auto ctx = Rando::Context::GetInstance();
-  //temporarily remove the hinted location's item, and then perform a
-  //reachability search for gossip stone locations.
-  RandomizerGet originalItem = ctx->GetItemLocation(hintedLocation)->GetPlacedRandomizerGet();
-  ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
+    auto ctx = Rando::Context::GetInstance();
+    // temporarily remove the hinted location's item, and then perform a
+    // reachability search for gossip stone locations.
+    RandomizerGet originalItem = ctx->GetItemLocation(hintedLocation)->GetPlacedRandomizerGet();
+    ctx->GetItemLocation(hintedLocation)->SetPlacedItem(RG_NONE);
 
-  ctx->GetLogic()->Reset();
-  auto accessibleGossipStones = ReachabilitySearch(Rando::StaticData::GetGossipStoneLocations());
-  //Give the item back to the location
-  ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
-
-  return accessibleGossipStones;
-}
-
-bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerCheck excludedCheck, bool resetAfter = true){
-  //temporarily remove the hinted location's item, and then perform a
-  //reachability search for this check RANDOTODO convert excludedCheck to an ItemLocation
-  auto ctx = Rando::Context::GetInstance();
-  RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
-  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
-  ctx->GetLogic()->Reset();
-  const auto rechableWithout = ReachabilitySearch(locsToCheck);
-  ctx->GetItemLocation(excludedCheck)->SetPlacedItem(originalItem);
-  if (resetAfter){
-    //if resetAfter is on, reset logic we are done
     ctx->GetLogic()->Reset();
-  }
-  if (rechableWithout.empty()) {
-    return false;
-  }
-  return true;
+    auto accessibleGossipStones = ReachabilitySearch(Rando::StaticData::GetGossipStoneLocations());
+    // Give the item back to the location
+    ctx->GetItemLocation(hintedLocation)->SetPlacedItem(originalItem);
+
+    return accessibleGossipStones;
 }
 
-static void SetAllInAreaAsHintAccesible(RandomizerArea area, std::vector<RandomizerCheck> locations){
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> locsInArea = FilterFromPool(locations, [area, ctx](const RandomizerCheck loc){
-                                                            return ctx->GetItemLocation(loc)->GetAreas().contains(area);
-                                                          });
-  for(RandomizerCheck loc: locsInArea){
-    ctx->GetItemLocation(loc)->SetHintAccesible();
-  }
+bool IsReachableWithout(std::vector<RandomizerCheck> locsToCheck, RandomizerCheck excludedCheck,
+                        bool resetAfter = true) {
+    // temporarily remove the hinted location's item, and then perform a
+    // reachability search for this check RANDOTODO convert excludedCheck to an ItemLocation
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerGet originalItem = ctx->GetItemLocation(excludedCheck)->GetPlacedRandomizerGet();
+    ctx->GetItemLocation(excludedCheck)->SetPlacedItem(RG_NONE);
+    ctx->GetLogic()->Reset();
+    const auto rechableWithout = ReachabilitySearch(locsToCheck);
+    ctx->GetItemLocation(excludedCheck)->SetPlacedItem(originalItem);
+    if (resetAfter) {
+        // if resetAfter is on, reset logic we are done
+        ctx->GetLogic()->Reset();
+    }
+    if (rechableWithout.empty()) {
+        return false;
+    }
+    return true;
 }
 
-static void AddGossipStoneHint( const RandomizerCheck gossipStone,
-                                const HintType hintType,
-                                const std::string distributionName,
-                                const std::vector<RandomizerHintTextKey> hintKeys,
-                                const std::vector<RandomizerCheck> locations,
-                                const std::vector<RandomizerArea> areas,
-                                const std::vector<TrialKey> trials) {
-  auto ctx = Rando::Context::GetInstance();
-  ctx->AddHint(StaticData::gossipStoneCheckToHint[gossipStone], Hint(StaticData::gossipStoneCheckToHint[gossipStone], hintType, distributionName, hintKeys, locations, areas, trials));
-  ctx->GetItemLocation(gossipStone)->SetPlacedItem(RG_HINT); //RANDOTODO, better gossip stone to location to hint key system
+static void SetAllInAreaAsHintAccesible(RandomizerArea area, std::vector<RandomizerCheck> locations) {
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<RandomizerCheck> locsInArea = FilterFromPool(locations, [area, ctx](const RandomizerCheck loc) {
+        return ctx->GetItemLocation(loc)->GetAreas().contains(area);
+    });
+    for (RandomizerCheck loc : locsInArea) {
+        ctx->GetItemLocation(loc)->SetHintAccesible();
+    }
 }
 
-static void AddGossipStoneHintCopies(uint8_t copies,
-                                     const HintType hintType,
-                                     const std::string distributionName,
+static void AddGossipStoneHint(const RandomizerCheck gossipStone, const HintType hintType,
+                               const std::string distributionName, const std::vector<RandomizerHintTextKey> hintKeys,
+                               const std::vector<RandomizerCheck> locations, const std::vector<RandomizerArea> areas,
+                               const std::vector<TrialKey> trials) {
+    auto ctx = Rando::Context::GetInstance();
+    ctx->AddHint(StaticData::gossipStoneCheckToHint[gossipStone],
+                 Hint(StaticData::gossipStoneCheckToHint[gossipStone], hintType, distributionName, hintKeys, locations,
+                      areas, trials));
+    ctx->GetItemLocation(gossipStone)
+        ->SetPlacedItem(RG_HINT); // RANDOTODO, better gossip stone to location to hint key system
+}
+
+static void AddGossipStoneHintCopies(uint8_t copies, const HintType hintType, const std::string distributionName,
                                      const std::vector<RandomizerHintTextKey> hintKeys = {},
                                      const std::vector<RandomizerCheck> locations = {},
                                      const std::vector<RandomizerArea> areas = {},
                                      const std::vector<TrialKey> trials = {},
-                                     RandomizerCheck firstStone = RC_UNKNOWN_CHECK){
+                                     RandomizerCheck firstStone = RC_UNKNOWN_CHECK) {
 
-  if (firstStone != RC_UNKNOWN_CHECK && copies > 0){
-      AddGossipStoneHint(firstStone, hintType, distributionName, hintKeys, locations, areas, trials);
-      copies -= 1;
-  }
-  for(int c=0; c<copies; c++){
-    //get a random gossip stone
-    auto gossipStones = GetEmptyGossipStones();
-    if (gossipStones.empty()) {
-      SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
-      return;
+    if (firstStone != RC_UNKNOWN_CHECK && copies > 0) {
+        AddGossipStoneHint(firstStone, hintType, distributionName, hintKeys, locations, areas, trials);
+        copies -= 1;
+    }
+    for (int c = 0; c < copies; c++) {
+        // get a random gossip stone
+        auto gossipStones = GetEmptyGossipStones();
+        if (gossipStones.empty()) {
+            SPDLOG_DEBUG("\tNO GOSSIP STONES TO PLACE HINT\n\n");
+            return;
+        }
+        auto gossipStone = RandomElement(gossipStones, false);
+        AddGossipStoneHint(gossipStone, hintType, distributionName, hintKeys, locations, areas, trials);
     }
-    auto gossipStone = RandomElement(gossipStones, false);
-    AddGossipStoneHint(gossipStone, hintType, distributionName, hintKeys, locations, areas, trials);
-  }
 }
 
-static bool CreateHint(RandomizerCheck location, uint8_t copies, HintType type, std::string distribution){
-  auto ctx = Rando::Context::GetInstance();
+static bool CreateHint(RandomizerCheck location, uint8_t copies, HintType type, std::string distribution) {
+    auto ctx = Rando::Context::GetInstance();
 
-  //get a gossip stone accessible without the hinted item
-  std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(location);
-  if (gossipStoneLocations.empty()) {
-      SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n");
-      return false;
-  }
-  RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
-  RandomizerArea area = ctx->GetItemLocation(location)->GetRandomArea();
+    // get a gossip stone accessible without the hinted item
+    std::vector<RandomizerCheck> gossipStoneLocations = GetAccessibleGossipStones(location);
+    if (gossipStoneLocations.empty()) {
+        SPDLOG_DEBUG("\tNO IN LOGIC GOSSIP STONE\n\n");
+        return false;
+    }
+    RandomizerCheck gossipStone = RandomElement(gossipStoneLocations);
+    RandomizerArea area = ctx->GetItemLocation(location)->GetRandomArea();
 
-  //Set that hints are accesible
-  ctx->GetItemLocation(location)->SetHintAccesible();
-  if (type == HINT_TYPE_FOOLISH){
-    SetAllInAreaAsHintAccesible(area, ctx->allLocations);
-  }
+    // Set that hints are accesible
+    ctx->GetItemLocation(location)->SetHintAccesible();
+    if (type == HINT_TYPE_FOOLISH) {
+        SetAllInAreaAsHintAccesible(area, ctx->allLocations);
+    }
 
-  AddGossipStoneHintCopies(copies, type, distribution, {}, {location}, {area}, {}, gossipStone);
-  return true;
+    AddGossipStoneHintCopies(copies, type, distribution, {}, { location }, { area }, {}, gossipStone);
+    return true;
 }
 
+static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations, uint8_t copies,
+                                        HintType type, std::string distributionName) {
+    auto ctx = Rando::Context::GetInstance();
 
-static RandomizerCheck CreateRandomHint(std::vector<RandomizerCheck>& possibleHintLocations,
-                                        uint8_t copies,
-                                        HintType type,
-                                        std::string distributionName) {
-  auto ctx = Rando::Context::GetInstance();
-
-  //return if there aren't any hintable locations or gossip stones available
-  if (GetEmptyGossipStones().size() < copies) {
-    SPDLOG_DEBUG("\tNOT ENOUGH GOSSIP STONES TO PLACE HINTS\n\n");
-    return RC_UNKNOWN_CHECK;
-  }
-
-  RandomizerCheck hintedLocation;
-  bool placed = false;
-  while (!placed){
-    if (possibleHintLocations.empty()) {
-        SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
-      return RC_UNKNOWN_CHECK;
+    // return if there aren't any hintable locations or gossip stones available
+    if (GetEmptyGossipStones().size() < copies) {
+        SPDLOG_DEBUG("\tNOT ENOUGH GOSSIP STONES TO PLACE HINTS\n\n");
+        return RC_UNKNOWN_CHECK;
     }
-    hintedLocation = RandomElement(possibleHintLocations, true); //removing the location to avoid it being hinted again on fail
-   
-    SPDLOG_DEBUG("\tLocation: ");
-    SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
-    SPDLOG_DEBUG("\n");
 
-    SPDLOG_DEBUG("\tItem: ");
-    SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
-    SPDLOG_DEBUG("\n");
+    RandomizerCheck hintedLocation;
+    bool placed = false;
+    while (!placed) {
+        if (possibleHintLocations.empty()) {
+            SPDLOG_DEBUG("\tNO LOCATIONS TO HINT\n\n");
+            return RC_UNKNOWN_CHECK;
+        }
+        hintedLocation =
+            RandomElement(possibleHintLocations, true); // removing the location to avoid it being hinted again on fail
 
-    placed = CreateHint(hintedLocation, copies, type, distributionName);
-  }
-  return hintedLocation;
+        SPDLOG_DEBUG("\tLocation: ");
+        SPDLOG_DEBUG(Rando::StaticData::GetLocation(hintedLocation)->GetName());
+        SPDLOG_DEBUG("\n");
+
+        SPDLOG_DEBUG("\tItem: ");
+        SPDLOG_DEBUG(ctx->GetItemLocation(hintedLocation)->GetPlacedItemName().GetEnglish());
+        SPDLOG_DEBUG("\n");
+
+        placed = CreateHint(hintedLocation, copies, type, distributionName);
+    }
+    return hintedLocation;
 }
 
 static std::vector<RandomizerCheck> FilterHintability(std::vector<RandomizerCheck>& locations,
-                                                      std::function<bool(RandomizerCheck)> extraFilter = NoFilter){
-  auto ctx = Rando::Context::GetInstance();
-  return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
-    return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsAHintAccessible())
-    && extraFilter(loc);
-  });
+                                                      std::function<bool(RandomizerCheck)> extraFilter = NoFilter) {
+    auto ctx = Rando::Context::GetInstance();
+    return FilterFromPool(locations, [extraFilter, ctx](const RandomizerCheck loc) {
+        return ctx->GetItemLocation(loc)->IsHintable() && !(ctx->GetItemLocation(loc)->IsAHintAccessible()) &&
+               extraFilter(loc);
+    });
 }
 
 static void CreateJunkHints(uint8_t numHints) {
-  for(uint8_t c = 0; c < numHints; c++){
-    //duplicate junk hints are possible for now
-    AddGossipStoneHintCopies(1, HINT_TYPE_HINT_KEY, "Junk", {GetRandomJunkHint()});
-  }
+    for (uint8_t c = 0; c < numHints; c++) {
+        // duplicate junk hints are possible for now
+        AddGossipStoneHintCopies(1, HINT_TYPE_HINT_KEY, "Junk", { GetRandomJunkHint() });
+    }
 }
 
 static void CreateTrialHints(uint8_t copies) {
-  if (copies > 0) {
-    auto ctx = Rando::Context::GetInstance();
-    if (ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) {//six trials
-      AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", {RHT_SIX_TRIALS});
-    } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {//zero trials
-      AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", {RHT_ZERO_TRIALS});
-    } else {
-      std::vector<TrialInfo*> trials = ctx->GetTrials()->GetTrialList(); //there's probably a way to remove this assignment
-      if (ctx->GetOption(RSK_TRIAL_COUNT).Get() >= 4) {//4 or 5 required trials, get skipped trials
-        trials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsSkipped();});
-      } else {//1 to 3 trials, get requried trials
-        auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial){return trial->IsRequired();});
-      }
-      for (auto& trial : trials) {//create a hint for each hinted trial
-        AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {}, {trial->GetTrialKey()});
-      }
+    if (copies > 0) {
+        auto ctx = Rando::Context::GetInstance();
+        if (ctx->GetOption(RSK_TRIAL_COUNT).Is(6)) { // six trials
+            AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", { RHT_SIX_TRIALS });
+        } else if (ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) { // zero trials
+            AddGossipStoneHintCopies(copies, HINT_TYPE_HINT_KEY, "Trial", { RHT_ZERO_TRIALS });
+        } else {
+            std::vector<TrialInfo*> trials =
+                ctx->GetTrials()->GetTrialList();             // there's probably a way to remove this assignment
+            if (ctx->GetOption(RSK_TRIAL_COUNT).Get() >= 4) { // 4 or 5 required trials, get skipped trials
+                trials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsSkipped(); });
+            } else { // 1 to 3 trials, get requried trials
+                auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsRequired(); });
+            }
+            for (auto& trial : trials) { // create a hint for each hinted trial
+                AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {}, { trial->GetTrialKey() });
+            }
+        }
     }
-  }
 }
 
 void CreateWarpSongTexts() {
-  auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_WARP_SONG_HINTS)){
-    auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
-    for (auto entrance : warpSongEntrances) {
-      //RANDOTODO make random
-      RandomizerArea destination = entrance->GetConnectedRegion()->GetFirstArea();
-      switch (entrance->GetIndex()) {
-        case 0x0600: // minuet RANDOTODO make into entrance hints when they are added
-          ctx->AddHint(RH_MINUET_WARP_LOC, Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        case 0x04F6: // bolero
-          ctx->AddHint(RH_BOLERO_WARP_LOC, Hint(RH_BOLERO_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        case 0x0604: // serenade
-          ctx->AddHint(RH_SERENADE_WARP_LOC, Hint(RH_SERENADE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        case 0x01F1: // requiem
-          ctx->AddHint(RH_REQUIEM_WARP_LOC, Hint(RH_REQUIEM_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        case 0x0568: // nocturne
-          ctx->AddHint(RH_NOCTURNE_WARP_LOC, Hint(RH_NOCTURNE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        case 0x05F4: // prelude
-          ctx->AddHint(RH_PRELUDE_WARP_LOC, Hint(RH_PRELUDE_WARP_LOC, HINT_TYPE_AREA, "", {RHT_WARP_SONG}, {}, {destination}));
-          break;
-        default:
-          break;
-      }
-    }
-  }
-}
-
-int32_t getRandomWeight(int32_t totalWeight){
-  if (totalWeight <= 1){
-    return 1;
-  }
-  return Random(1,totalWeight);
-}
-
-static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount, std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true){
-  int32_t totalWeight = junkWieght; //Start with our Junk Weight, the natural chance of a junk hint
-
-  for (size_t c=0; c < distTable.size(); c++){ //Gather the weights of each distribution and, if it's the first pass, apply fixed hints
-    totalWeight += distTable[c].weight;         //Note that PlaceHints will set weights of distributions to zero if it can't place anything from them
-    if (addFixed){
-      selected[c] += distTable[c].fixed;
-      stoneCount -= distTable[c].fixed * distTable[c].copies;
-    }
-  }
-  int32_t currentWeight = getRandomWeight(totalWeight); //Initialise with the first random weight from 1 to the total. 
-  while(stoneCount > 0 && totalWeight > 0){//Loop until we run out of stones or have no TotalWeight. 0 totalWeight means junkWeight is 0
-                                           //and that all weights have been 0'd out for another reason, and skips to placing all junk hints
-    for (size_t distribution = 0; distribution < distTable.size(); distribution++){
-      currentWeight -= distTable[distribution].weight; //go over each distribution, subtracting the weight each time. Once we reach zero or less,
-      if (currentWeight <= 0){                         //tell the system to make 1 of that hint, unless not enough stones remain
-        if (stoneCount >= distTable[distribution].copies && distTable[distribution].copies > 0){
-          selected[distribution] += 1; //if we have enough stones, and copies are not zero, assign 1 to this hint type, remove the stones, and break
-          stoneCount -= distTable[distribution].copies;
-          break; //This leaves the whole for loop
-        } else { //If we don't have the stones, or copies is 0 despite there being the wieght to trigger a hit, temporerally set wieght to zero
-          totalWeight -= distTable[distribution].weight; //Unlike PlaceHint, distTable is passed by value here, making this temporary
-          distTable[distribution].weight = 0;            //this is so we can still roll this hint type if more stones free up later 
-          break;
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        auto warpSongEntrances = GetShuffleableEntrances(EntranceType::WarpSong, false);
+        for (auto entrance : warpSongEntrances) {
+            // RANDOTODO make random
+            RandomizerArea destination = entrance->GetConnectedRegion()->GetFirstArea();
+            switch (entrance->GetIndex()) {
+                case 0x0600: // minuet RANDOTODO make into entrance hints when they are added
+                    ctx->AddHint(RH_MINUET_WARP_LOC,
+                                 Hint(RH_MINUET_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG }, {}, { destination }));
+                    break;
+                case 0x04F6: // bolero
+                    ctx->AddHint(RH_BOLERO_WARP_LOC,
+                                 Hint(RH_BOLERO_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG }, {}, { destination }));
+                    break;
+                case 0x0604: // serenade
+                    ctx->AddHint(RH_SERENADE_WARP_LOC, Hint(RH_SERENADE_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG },
+                                                            {}, { destination }));
+                    break;
+                case 0x01F1: // requiem
+                    ctx->AddHint(RH_REQUIEM_WARP_LOC,
+                                 Hint(RH_REQUIEM_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG }, {}, { destination }));
+                    break;
+                case 0x0568: // nocturne
+                    ctx->AddHint(RH_NOCTURNE_WARP_LOC, Hint(RH_NOCTURNE_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG },
+                                                            {}, { destination }));
+                    break;
+                case 0x05F4: // prelude
+                    ctx->AddHint(RH_PRELUDE_WARP_LOC,
+                                 Hint(RH_PRELUDE_WARP_LOC, HINT_TYPE_AREA, "", { RHT_WARP_SONG }, {}, { destination }));
+                    break;
+                default:
+                    break;
+            }
         }
-      }
     }
-    //if there's still weight then it's junk, as the leftover weight is junkWeight
-    if (currentWeight > 0){ //zero TotalWeight breaks the while loop and hits the fallback, so skipping this is fine in that case
-      selected[selected.size()-1] += 1;
-      stoneCount -= 1;
-    }
-    currentWeight = getRandomWeight(totalWeight);
-  }
-  //if stones are left, assign junk to every remaining stone as a fallback.
-  if (stoneCount > 0){
-    selected[selected.size()-1] += stoneCount;
-  }
 }
 
-uint8_t PlaceHints(std::vector<uint8_t>& selectedHints, std::vector<HintDistributionSetting>& distTable){
-  auto ctx = Rando::Context::GetInstance();
-  uint8_t curSlot = 0;
-  for (HintDistributionSetting distribution : distTable){
-    std::vector<RandomizerCheck> hintTypePool = FilterHintability(ctx->allLocations, distribution.filter);
-    for (uint8_t numHint = 0; numHint < selectedHints[curSlot]; numHint++){
-      hintTypePool = FilterHintability(hintTypePool);
-      SPDLOG_DEBUG("Attempting to make hint of type: " + StaticData::hintTypeNames[distribution.type].GetEnglish(MF_CLEAN) + "\n");
-      RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
-
-      hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
-
-      if (hintedLocation == RC_UNKNOWN_CHECK){ //if hint failed to place, remove all wieght and copies then return the number of stones to redistribute
-        uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
-        selectedHints[curSlot] = 0;   //as distTable is passed by refernce here, these changes stick for the rest of this seed generation
-        distTable[curSlot].copies = 0;//and prevent future distribution from choosing this slot
-        distTable[curSlot].weight = 0;
-        return hintsToRemove;
-      }
-      if(Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()){
-        distribution.dungeonLimit -= 1;
-        if (distribution.dungeonLimit == 0){
-          FilterFromPool(hintTypePool, FilterOverworldLocations);
-        }
-      }
+int32_t getRandomWeight(int32_t totalWeight) {
+    if (totalWeight <= 1) {
+        return 1;
     }
-    selectedHints[curSlot] = 0;
-    curSlot += 1;
-  }
-  CreateJunkHints(selectedHints[selectedHints.size() - 1]);
-  return 0;
+    return Random(1, totalWeight);
+}
+
+static void DistributeHints(std::vector<uint8_t>& selected, size_t stoneCount,
+                            std::vector<HintDistributionSetting> distTable, uint8_t junkWieght, bool addFixed = true) {
+    int32_t totalWeight = junkWieght; // Start with our Junk Weight, the natural chance of a junk hint
+
+    for (size_t c = 0; c < distTable.size();
+         c++) { // Gather the weights of each distribution and, if it's the first pass, apply fixed hints
+        totalWeight += distTable[c].weight; // Note that PlaceHints will set weights of distributions to zero if it
+                                            // can't place anything from them
+        if (addFixed) {
+            selected[c] += distTable[c].fixed;
+            stoneCount -= distTable[c].fixed * distTable[c].copies;
+        }
+    }
+    int32_t currentWeight = getRandomWeight(totalWeight); // Initialise with the first random weight from 1 to the
+                                                          // total.
+    while (stoneCount > 0 &&
+           totalWeight >
+               0) { // Loop until we run out of stones or have no TotalWeight. 0 totalWeight means junkWeight is 0
+                    // and that all weights have been 0'd out for another reason, and skips to placing all junk hints
+        for (size_t distribution = 0; distribution < distTable.size(); distribution++) {
+            currentWeight -=
+                distTable[distribution]
+                    .weight; // go over each distribution, subtracting the weight each time. Once we reach zero or less,
+            if (currentWeight <= 0) { // tell the system to make 1 of that hint, unless not enough stones remain
+                if (stoneCount >= distTable[distribution].copies && distTable[distribution].copies > 0) {
+                    selected[distribution] += 1; // if we have enough stones, and copies are not zero, assign 1 to this
+                                                 // hint type, remove the stones, and break
+                    stoneCount -= distTable[distribution].copies;
+                    break; // This leaves the whole for loop
+                } else { // If we don't have the stones, or copies is 0 despite there being the wieght to trigger a hit,
+                         // temporerally set wieght to zero
+                    totalWeight -=
+                        distTable[distribution]
+                            .weight; // Unlike PlaceHint, distTable is passed by value here, making this temporary
+                    distTable[distribution].weight =
+                        0; // this is so we can still roll this hint type if more stones free up later
+                    break;
+                }
+            }
+        }
+        // if there's still weight then it's junk, as the leftover weight is junkWeight
+        if (currentWeight >
+            0) { // zero TotalWeight breaks the while loop and hits the fallback, so skipping this is fine in that case
+            selected[selected.size() - 1] += 1;
+            stoneCount -= 1;
+        }
+        currentWeight = getRandomWeight(totalWeight);
+    }
+    // if stones are left, assign junk to every remaining stone as a fallback.
+    if (stoneCount > 0) {
+        selected[static_cast<uint8_t>(selected.size()) - 1] += static_cast<uint8_t>(stoneCount);
+    }
+}
+
+uint8_t PlaceHints(std::vector<uint8_t>& selectedHints, std::vector<HintDistributionSetting>& distTable) {
+    auto ctx = Rando::Context::GetInstance();
+    uint8_t curSlot = 0;
+    for (HintDistributionSetting distribution : distTable) {
+        std::vector<RandomizerCheck> hintTypePool = FilterHintability(ctx->allLocations, distribution.filter);
+        for (uint8_t numHint = 0; numHint < selectedHints[curSlot]; numHint++) {
+            hintTypePool = FilterHintability(hintTypePool);
+            SPDLOG_DEBUG("Attempting to make hint of type: " +
+                         StaticData::hintTypeNames[distribution.type].GetEnglish(MF_CLEAN) + "\n");
+            RandomizerCheck hintedLocation = RC_UNKNOWN_CHECK;
+
+            hintedLocation = CreateRandomHint(hintTypePool, distribution.copies, distribution.type, distribution.name);
+
+            if (hintedLocation == RC_UNKNOWN_CHECK) { // if hint failed to place, remove all wieght and copies then
+                                                      // return the number of stones to redistribute
+                uint8_t hintsToRemove = (selectedHints[curSlot] - numHint) * distribution.copies;
+                selectedHints[curSlot] = 0; // as distTable is passed by refernce here, these changes stick for the rest
+                                            // of this seed generation
+                distTable[curSlot].copies = 0; // and prevent future distribution from choosing this slot
+                distTable[curSlot].weight = 0;
+                return hintsToRemove;
+            }
+            if (Rando::StaticData::GetLocation(hintedLocation)->IsDungeon()) {
+                distribution.dungeonLimit -= 1;
+                if (distribution.dungeonLimit == 0) {
+                    FilterFromPool(hintTypePool, FilterOverworldLocations);
+                }
+            }
+        }
+        selectedHints[curSlot] = 0;
+        curSlot += 1;
+    }
+    CreateJunkHints(selectedHints[selectedHints.size() - 1]);
+    return 0;
 }
 
 void CreateStoneHints() {
-  auto ctx = Rando::Context::GetInstance();
-  SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
-  const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Get()];
-  std::vector<HintDistributionSetting> distTable = hintSetting.distTable;
+    auto ctx = Rando::Context::GetInstance();
+    SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
+    const HintSetting& hintSetting = hintSettingTable[ctx->GetOption(RSK_HINT_DISTRIBUTION).Get()];
+    std::vector<HintDistributionSetting> distTable = hintSetting.distTable;
 
-  // Apply impa's song exclusions when zelda is skipped
-  if(ctx->GetOption(RSK_SKIP_CHILD_ZELDA)){
-    ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetHintAccesible();
-  }
-
-  // Add 'always' location hints
-  std::vector<RandomizerCheck> alwaysHintLocations = {};
-  if (hintSetting.alwaysCopies > 0) {
-    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)){
-      // If we have Rainbow Bridge set to Greg and the greg hint isn't useful, add a hint for where Greg is
-      // Do we really need this with the greg hint?
-      auto gregLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
-      return (
-              (ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
-               ctx->GetItemLocation(loc)->IsHintable() &&
-               !(ctx->GetOption(RSK_GREG_HINT) && (IsReachableWithout({RC_GREG_HINT}, loc, true)));
-      });
-      if (gregLocations.size() > 0){
-        alwaysHintLocations.push_back(gregLocations[0]);
-      }
+    // Apply impa's song exclusions when zelda is skipped
+    if (ctx->GetOption(RSK_SKIP_CHILD_ZELDA)) {
+        ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetHintAccesible();
     }
 
-    for (auto& hint : conditionalAlwaysHints) {
-        RandomizerCheck loc = hint.first;
-        if (hint.second() && ctx->GetItemLocation(loc)->IsHintable()) {
-            alwaysHintLocations.push_back(loc);
+    // Add 'always' location hints
+    std::vector<RandomizerCheck> alwaysHintLocations = {};
+    if (hintSetting.alwaysCopies > 0) {
+        if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
+            // If we have Rainbow Bridge set to Greg and the greg hint isn't useful, add a hint for where Greg is
+            // Do we really need this with the greg hint?
+            auto gregLocations = FilterFromPool(ctx->allLocations, [ctx](const RandomizerCheck loc) {
+                return ((ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == RG_GREG_RUPEE)) &&
+                       ctx->GetItemLocation(loc)->IsHintable() &&
+                       !(ctx->GetOption(RSK_GREG_HINT) && (IsReachableWithout({ RC_GREG_HINT }, loc, true)));
+            });
+            if (gregLocations.size() > 0) {
+                alwaysHintLocations.push_back(gregLocations[0]);
+            }
+        }
+
+        for (auto& hint : conditionalAlwaysHints) {
+            RandomizerCheck loc = hint.first;
+            if (hint.second() && ctx->GetItemLocation(loc)->IsHintable()) {
+                alwaysHintLocations.push_back(loc);
+            }
+        }
+
+        for (RandomizerCheck location : alwaysHintLocations) {
+            CreateHint(location, hintSetting.alwaysCopies, HINT_TYPE_ITEM, "Always");
         }
     }
 
-    for (RandomizerCheck location : alwaysHintLocations) {
-      CreateHint(location, hintSetting.alwaysCopies, HINT_TYPE_ITEM, "Always");
+    // Add 'trial' location hints
+    if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP)) {
+        CreateTrialHints(hintSetting.trialCopies);
     }
-  }
 
-  //Add 'trial' location hints
-  if (ctx->GetOption(RSK_GANONS_TRIALS).IsNot(RO_GANONS_TRIALS_SKIP)) {
-    CreateTrialHints(hintSetting.trialCopies);
-  }
-
-  size_t totalStones = GetEmptyGossipStones().size();
-  std::vector<uint8_t> selectedHints = {};
-  for (size_t c=0; c < distTable.size(); c++){
+    size_t totalStones = GetEmptyGossipStones().size();
+    std::vector<uint8_t> selectedHints = {};
+    for (size_t c = 0; c < distTable.size(); c++) {
+        selectedHints.push_back(0);
+    }
     selectedHints.push_back(0);
-  }
-  selectedHints.push_back(0);
-  DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight);
-  
-  while(totalStones != 0){
-    totalStones = PlaceHints(selectedHints, distTable);
-    if (totalStones != 0){
-      DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight, false);
-    }
-  }
+    DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight);
 
-  //Getting gossip stone locations temporarily sets one location to not be reachable.
-  //Call the function one last time to get rid of false positives on locations not
-  //being reachable.
-  ReachabilitySearch({});
+    while (totalStones != 0) {
+        totalStones = PlaceHints(selectedHints, distTable);
+        if (totalStones != 0) {
+            DistributeHints(selectedHints, totalStones, distTable, hintSetting.junkWeight, false);
+        }
+    }
+
+    // Getting gossip stone locations temporarily sets one location to not be reachable.
+    // Call the function one last time to get rid of false positives on locations not
+    // being reachable.
+    ReachabilitySearch({});
 }
 
-std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks){
-  std::vector<RandomizerCheck> locations = {};
-  auto ctx = Rando::Context::GetInstance();
-  for (size_t c = 0; c < items.size(); c++){
-    std::vector<RandomizerCheck> found = FilterFromPool(ctx->allLocations, [items, ctx, c](const RandomizerCheck loc) {
-      return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == items[c];});
-    if (found.size() > 0){
-      locations.push_back(found[0]);
-      //RANDOTODO make the called functions of this always return true if empty hintChecks are provided
-      if (!ctx->GetItemLocation(found[0])->IsAHintAccessible() && (hintChecks.size() == 0 || IsReachableWithout(hintChecks, found[0],true))){
-        ctx->GetItemLocation(found[0])->SetHintAccesible();
-      }
-    } else {
-      locations.push_back(RC_UNKNOWN_CHECK);
+std::vector<RandomizerCheck> FindItemsAndMarkHinted(std::vector<RandomizerGet> items,
+                                                    std::vector<RandomizerCheck> hintChecks) {
+    std::vector<RandomizerCheck> locations = {};
+    auto ctx = Rando::Context::GetInstance();
+    for (size_t c = 0; c < items.size(); c++) {
+        std::vector<RandomizerCheck> found =
+            FilterFromPool(ctx->allLocations, [items, ctx, c](const RandomizerCheck loc) {
+                return ctx->GetItemLocation(loc)->GetPlacedRandomizerGet() == items[c];
+            });
+        if (found.size() > 0) {
+            locations.push_back(found[0]);
+            // RANDOTODO make the called functions of this always return true if empty hintChecks are provided
+            if (!ctx->GetItemLocation(found[0])->IsAHintAccessible() &&
+                (hintChecks.size() == 0 || IsReachableWithout(hintChecks, found[0], true))) {
+                ctx->GetItemLocation(found[0])->SetHintAccesible();
+            }
+        } else {
+            locations.push_back(RC_UNKNOWN_CHECK);
+        }
     }
-  }
-  return locations;
+    return locations;
 }
 
 void CreateChildAltarHint() {
-  auto ctx = Rando::Context::GetInstance();
-  if (!ctx->GetHint(RH_ALTAR_CHILD)->IsEnabled() && ctx->GetOption(RSK_TOT_ALTAR_HINT)){
-    std::vector<RandomizerCheck> stoneLocs = {};
-    //force marking the rewards as hinted if they are at the end of dungeons as they can be inferred
-    if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
-      stoneLocs = FindItemsAndMarkHinted({RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE}, {});
-    } else {
-      stoneLocs = FindItemsAndMarkHinted({RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE}, {RC_ALTAR_HINT_CHILD});
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->GetHint(RH_ALTAR_CHILD)->IsEnabled() && ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+        std::vector<RandomizerCheck> stoneLocs = {};
+        // force marking the rewards as hinted if they are at the end of dungeons as they can be inferred
+        if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) ||
+            ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
+            stoneLocs = FindItemsAndMarkHinted({ RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE }, {});
+        } else {
+            stoneLocs =
+                FindItemsAndMarkHinted({ RG_KOKIRI_EMERALD, RG_GORON_RUBY, RG_ZORA_SAPPHIRE }, { RC_ALTAR_HINT_CHILD });
+        }
+        std::vector<RandomizerArea> stoneAreas = {};
+        for (auto loc : stoneLocs) {
+            if (loc != RC_UNKNOWN_CHECK) {
+                stoneAreas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
+            }
+        }
+        ctx->AddHint(RH_ALTAR_CHILD, Hint(RH_ALTAR_CHILD, HINT_TYPE_ALTAR_CHILD, {}, stoneLocs, stoneAreas));
     }
-    std::vector<RandomizerArea> stoneAreas = {};
-    for (auto loc : stoneLocs){
-      if (loc != RC_UNKNOWN_CHECK) {
-        stoneAreas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
-      }
-    }
-    ctx->AddHint(RH_ALTAR_CHILD, Hint(RH_ALTAR_CHILD, HINT_TYPE_ALTAR_CHILD, {}, stoneLocs, stoneAreas));
-  }
 }
 
 void CreateAdultAltarHint() {
-  auto ctx = Rando::Context::GetInstance();
-  if (!ctx->GetHint(RH_ALTAR_ADULT)->IsEnabled()){
-    std::vector<RandomizerCheck> medallionLocs = {};
-    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
-      //force marking the rewards as hinted if they are at the end of dungeons as they can be inferred
-      if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
-        medallionLocs = FindItemsAndMarkHinted({RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION, RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION},
-                                              {});
-      } else {
-        medallionLocs = FindItemsAndMarkHinted({RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION, RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION},
-                                              {RC_ALTAR_HINT_ADULT});
-      }
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->GetHint(RH_ALTAR_ADULT)->IsEnabled()) {
+        std::vector<RandomizerCheck> medallionLocs = {};
+        if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+            // force marking the rewards as hinted if they are at the end of dungeons as they can be inferred
+            if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON) ||
+                ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) {
+                medallionLocs = FindItemsAndMarkHinted({ RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION,
+                                                         RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION },
+                                                       {});
+            } else {
+                medallionLocs = FindItemsAndMarkHinted({ RG_LIGHT_MEDALLION, RG_FOREST_MEDALLION, RG_FIRE_MEDALLION,
+                                                         RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION },
+                                                       { RC_ALTAR_HINT_ADULT });
+            }
+        }
+        std::vector<RandomizerArea> medallionAreas = {};
+        for (auto loc : medallionLocs) {
+            if (loc != RC_UNKNOWN_CHECK) {
+                medallionAreas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
+            }
+        }
+        ctx->AddHint(RH_ALTAR_ADULT, Hint(RH_ALTAR_ADULT, HINT_TYPE_ALTAR_ADULT, {}, medallionLocs, medallionAreas));
     }
-    std::vector<RandomizerArea> medallionAreas = {};
-    for (auto loc : medallionLocs){
-      if (loc != RC_UNKNOWN_CHECK) {
-        medallionAreas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
-      }
-    }
-    ctx->AddHint(RH_ALTAR_ADULT, Hint(RH_ALTAR_ADULT, HINT_TYPE_ALTAR_ADULT, {}, medallionLocs, medallionAreas));
-  }
 }
 
-void CreateStaticHintFromData(RandomizerHint hint, StaticHintInfo staticData){
-  auto ctx = Rando::Context::GetInstance();
-  if (!ctx->GetHint(hint)->IsEnabled()){
-    OptionValue& option = ctx->GetOption(staticData.setting);
-    if ((std::holds_alternative<bool>(staticData.condition) && option.Is(std::get<bool>(staticData.condition))) ||
-        (std::holds_alternative<uint8_t>(staticData.condition) && option.Is(std::get<uint8_t>(staticData.condition)))){
+void CreateStaticHintFromData(RandomizerHint hint, StaticHintInfo staticData) {
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->GetHint(hint)->IsEnabled()) {
+        OptionValue& option = ctx->GetOption(staticData.setting);
+        if ((std::holds_alternative<bool>(staticData.condition) && option.Is(std::get<bool>(staticData.condition))) ||
+            (std::holds_alternative<uint8_t>(staticData.condition) &&
+             option.Is(std::get<uint8_t>(staticData.condition)))) {
 
-      std::vector<RandomizerCheck> locations = {};
-      if (staticData.targetItems.size() > 0){
-        locations = FindItemsAndMarkHinted(staticData.targetItems, staticData.hintChecks);
-      } else {
-        for(auto check: staticData.targetChecks){
-          locations.push_back(check);
+            std::vector<RandomizerCheck> locations = {};
+            if (staticData.targetItems.size() > 0) {
+                locations = FindItemsAndMarkHinted(staticData.targetItems, staticData.hintChecks);
+            } else {
+                for (auto check : staticData.targetChecks) {
+                    locations.push_back(check);
+                }
+            }
+            std::vector<RandomizerArea> areas = {};
+            for (auto loc : locations) {
+                ctx->GetItemLocation(loc)->SetHintAccesible();
+                if (ctx->GetItemLocation(loc)->GetAreas().empty()) {
+                    // If we get to here then it means a location got through with no area assignment, which means
+                    // something went wrong elsewhere.
+                    SPDLOG_DEBUG("Attempted to hint location with no areas: ");
+                    SPDLOG_DEBUG(Rando::StaticData::GetLocation(loc)->GetName());
+                    // assert(false);
+                    areas.push_back(RA_NONE);
+                } else {
+                    areas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
+                }
+            }
+            // hintKeys are defaulted to in the hint object and do not need to be specified
+            ctx->AddHint(hint,
+                         Hint(hint, staticData.type, {}, locations, areas, {}, staticData.yourPocket, staticData.num));
         }
-      }
-      std::vector<RandomizerArea> areas = {};
-      for (auto loc : locations){
-        ctx->GetItemLocation(loc)->SetHintAccesible();
-        if (ctx->GetItemLocation(loc)->GetAreas().empty()){
-          //If we get to here then it means a location got through with no area assignment, which means something went wrong elsewhere.
-          SPDLOG_DEBUG("Attempted to hint location with no areas: ");
-          SPDLOG_DEBUG(Rando::StaticData::GetLocation(loc)->GetName());
-          //assert(false);
-          areas.push_back(RA_NONE);
-        } else {
-          areas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
-        }
-      }
-      //hintKeys are defaulted to in the hint object and do not need to be specified
-      ctx->AddHint(hint, Hint(hint, staticData.type, {}, locations, areas, {}, staticData.yourPocket, staticData.num));
     }
-  }
 }
 
 void CreateStaticItemHint(RandomizerHint hintKey, std::vector<RandomizerHintTextKey> hintTextKeys,
-                          std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks, bool yourPocket = false) {
-  //RANDOTODO choose area in case there are multiple
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<RandomizerCheck> locations = FindItemsAndMarkHinted(items, hintChecks);
-  std::vector<RandomizerArea> areas = {};
-  for (auto loc : locations){
-    areas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
-  }
-  ctx->AddHint(hintKey, Hint(hintKey, HINT_TYPE_AREA, hintTextKeys, locations, areas, {}, yourPocket));
-}
-
-void CreateGanondorfJoke(){
-  auto ctx = Rando::Context::GetInstance();
-  if (!ctx->GetHint(RH_GANONDORF_JOKE)->IsEnabled()){
-    ctx->AddHint(RH_GANONDORF_JOKE, Hint(RH_GANONDORF_JOKE, HINT_TYPE_HINT_KEY, {GetRandomGanonJoke()}));
-  }
-}
-
-void CreateGanondorfHint(){
-  auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_GANONDORF_HINT) && !ctx->GetHint(RH_GANONDORF_HINT)->IsEnabled()){
-    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-      CreateStaticItemHint(RH_GANONDORF_HINT, {RHT_GANONDORF_HINT_LA_ONLY, RHT_GANONDORF_HINT_MS_ONLY, RHT_GANONDORF_HINT_LA_AND_MS}, 
-                           {RG_LIGHT_ARROWS, RG_MASTER_SWORD}, {RC_GANONDORF_HINT}, true);
-    } else {
-      CreateStaticItemHint(RH_GANONDORF_HINT, {RHT_GANONDORF_HINT_LA_ONLY}, {RG_LIGHT_ARROWS}, {RC_GANONDORF_HINT}, true);
+                          std::vector<RandomizerGet> items, std::vector<RandomizerCheck> hintChecks,
+                          bool yourPocket = false) {
+    // RANDOTODO choose area in case there are multiple
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<RandomizerCheck> locations = FindItemsAndMarkHinted(items, hintChecks);
+    std::vector<RandomizerArea> areas = {};
+    for (auto loc : locations) {
+        areas.push_back(ctx->GetItemLocation(loc)->GetRandomArea());
     }
-  }
+    ctx->AddHint(hintKey, Hint(hintKey, HINT_TYPE_AREA, hintTextKeys, locations, areas, {}, yourPocket));
 }
 
-void CreateStaticHints(){
-  CreateChildAltarHint();
-  CreateAdultAltarHint();
-  CreateGanondorfJoke();
-  CreateGanondorfHint();
-  for (auto[hint, staticData] : StaticData::staticHintInfoMap){
-    CreateStaticHintFromData(hint, staticData);
-  }
+void CreateGanondorfJoke() {
+    auto ctx = Rando::Context::GetInstance();
+    if (!ctx->GetHint(RH_GANONDORF_JOKE)->IsEnabled()) {
+        ctx->AddHint(RH_GANONDORF_JOKE, Hint(RH_GANONDORF_JOKE, HINT_TYPE_HINT_KEY, { GetRandomGanonJoke() }));
+    }
 }
 
-void CreateAllHints(){
-  auto ctx = Rando::Context::GetInstance();
-
-  CreateStaticHints();
-
-  if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
-    SPDLOG_INFO("Creating Hints...");
-    CreateStoneHints();
-    SPDLOG_INFO("Creating Hints Done");
-  }
+void CreateGanondorfHint() {
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_GANONDORF_HINT) && !ctx->GetHint(RH_GANONDORF_HINT)->IsEnabled()) {
+        if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD) && ctx->GetOption(RSK_STARTING_MASTER_SWORD).Is(RO_GENERIC_OFF)) {
+            CreateStaticItemHint(
+                RH_GANONDORF_HINT,
+                { RHT_GANONDORF_HINT_LA_ONLY, RHT_GANONDORF_HINT_MS_ONLY, RHT_GANONDORF_HINT_LA_AND_MS },
+                { RG_LIGHT_ARROWS, RG_MASTER_SWORD }, { RC_GANONDORF_HINT }, true);
+        } else {
+            CreateStaticItemHint(RH_GANONDORF_HINT, { RHT_GANONDORF_HINT_LA_ONLY }, { RG_LIGHT_ARROWS },
+                                 { RC_GANONDORF_HINT }, true);
+        }
+    }
+}
+
+void CreateStaticHints() {
+    CreateChildAltarHint();
+    CreateAdultAltarHint();
+    CreateGanondorfJoke();
+    CreateGanondorfHint();
+    for (auto [hint, staticData] : StaticData::staticHintInfoMap) {
+        CreateStaticHintFromData(hint, staticData);
+    }
+}
+
+void CreateAllHints() {
+    auto ctx = Rando::Context::GetInstance();
+
+    CreateStaticHints();
+
+    if (ctx->GetOption(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE)) {
+        SPDLOG_INFO("Creating Hints...");
+        CreateStoneHints();
+        SPDLOG_INFO("Creating Hints Done");
+    }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index 9199c6c818..365904274f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -11,62 +11,64 @@
 #include "../../custom-message/CustomMessageManager.h"
 
 struct HintDistributionSetting {
-  std::string name;
-  HintType type;
-  uint32_t weight;
-  uint8_t fixed;
-  uint8_t copies;
-  std::function<bool(RandomizerCheck)> filter;
-  uint8_t dungeonLimit;
+    std::string name;
+    HintType type;
+    uint32_t weight;
+    uint8_t fixed;
+    uint8_t copies;
+    std::function<bool(RandomizerCheck)> filter;
+    uint8_t dungeonLimit;
 
-  HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies, 
-                          std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
+    HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies,
+                            std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
 };
 
 struct HintSetting {
-  uint8_t alwaysCopies;
-  uint8_t trialCopies;
-  uint8_t junkWeight;
-  std::vector<HintDistributionSetting> distTable;
+    uint8_t alwaysCopies;
+    uint8_t trialCopies;
+    uint8_t junkWeight;
+    std::vector<HintDistributionSetting> distTable;
 };
 
 class HintText {
-public:
+  public:
     HintText() = default;
-    HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {}, std::vector<CustomMessage> obscureText_ = {});
+    HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {},
+             std::vector<CustomMessage> obscureText_ = {});
     const CustomMessage& GetClear() const;
     const CustomMessage& GetObscure() const;
-    const CustomMessage& GetObscure(uint8_t selection) const;
+    const CustomMessage& GetObscure(size_t selection) const;
     const CustomMessage& GetAmbiguous() const;
-    const CustomMessage& GetAmbiguous(uint8_t selection) const;
-    uint8_t GetAmbiguousSize() const;
-    uint8_t GetObscureSize() const;
-    const CustomMessage& GetHintMessage(uint8_t selection = 0) const;
+    const CustomMessage& GetAmbiguous(size_t selection) const;
+    size_t GetAmbiguousSize() const;
+    size_t GetObscureSize() const;
+    const CustomMessage& GetHintMessage(size_t selection = 0) const;
     const CustomMessage GetMessageCopy() const;
     bool operator==(const HintText& right) const;
     bool operator!=(const HintText& right) const;
 
-private:
+  private:
     CustomMessage clearText;
     std::vector<CustomMessage> ambiguousText = {};
     std::vector<CustomMessage> obscureText = {};
 };
 
-struct StaticHintInfo{
-  HintType type;
-  std::vector<RandomizerHintTextKey> hintKeys;
-  RandomizerSettingKey setting;
-  std::variant<bool, uint8_t> condition;
-  std::vector<RandomizerCheck> targetChecks;
-  std::vector<RandomizerGet> targetItems;
-  std::vector<RandomizerCheck> hintChecks;
-  bool yourPocket;
-  int num;
+struct StaticHintInfo {
+    HintType type;
+    std::vector<RandomizerHintTextKey> hintKeys;
+    RandomizerSettingKey setting;
+    std::variant<bool, uint8_t> condition;
+    std::vector<RandomizerCheck> targetChecks;
+    std::vector<RandomizerGet> targetItems;
+    std::vector<RandomizerCheck> hintChecks;
+    bool yourPocket;
+    int num;
 
-  StaticHintInfo() = default;
-  StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting, std::variant<bool, uint8_t> _condition,
-                 std::vector<RandomizerCheck> _targetChecks, std::vector<RandomizerGet> _targetItems = {},
-                 std::vector<RandomizerCheck> _hintChecks = {}, bool _yourPocket = false, int _num = 0);
+    StaticHintInfo() = default;
+    StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting,
+                   std::variant<bool, uint8_t> _condition, std::vector<RandomizerCheck> _targetChecks,
+                   std::vector<RandomizerGet> _targetItems = {}, std::vector<RandomizerCheck> _hintChecks = {},
+                   bool _yourPocket = false, int _num = 0);
 };
 
 RandomizerHintTextKey GetRandomJunkHint();
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index ac79e860aa..c97ae35ce1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -13,1359 +13,1269 @@
 std::vector<RandomizerGet> ItemPool = {};
 std::vector<RandomizerGet> PendingJunkPool = {};
 const std::array<RandomizerGet, 9> dungeonRewards = {
-  RG_KOKIRI_EMERALD,
-  RG_GORON_RUBY,
-  RG_ZORA_SAPPHIRE,
-  RG_FOREST_MEDALLION,
-  RG_FIRE_MEDALLION,
-  RG_WATER_MEDALLION,
-  RG_SPIRIT_MEDALLION,
-  RG_SHADOW_MEDALLION,
-  RG_LIGHT_MEDALLION,
+    RG_KOKIRI_EMERALD,  RG_GORON_RUBY,       RG_ZORA_SAPPHIRE,    RG_FOREST_MEDALLION, RG_FIRE_MEDALLION,
+    RG_WATER_MEDALLION, RG_SPIRIT_MEDALLION, RG_SHADOW_MEDALLION, RG_LIGHT_MEDALLION,
 };
 const std::array<RandomizerGet, 16> JunkPoolItems = {
-  RG_BOMBS_5,
-  RG_BOMBS_10,
-  RG_BOMBS_20,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_STICK_1,
-  RG_DEKU_SEEDS_30,
-  RG_RECOVERY_HEART,
-  RG_ARROWS_5,
-  RG_ARROWS_10,
-  RG_ARROWS_30,
-  RG_BLUE_RUPEE,
-  RG_RED_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_DEKU_NUTS_10,
-  RG_ICE_TRAP,
+    RG_BOMBS_5,        RG_BOMBS_10,   RG_BOMBS_20,     RG_DEKU_NUTS_5, RG_DEKU_STICK_1, RG_DEKU_SEEDS_30,
+    RG_RECOVERY_HEART, RG_ARROWS_5,   RG_ARROWS_10,    RG_ARROWS_30,   RG_BLUE_RUPEE,   RG_RED_RUPEE,
+    RG_PURPLE_RUPEE,   RG_HUGE_RUPEE, RG_DEKU_NUTS_10, RG_ICE_TRAP,
 };
 const std::array<RandomizerGet, 59> alwaysItems = {
-  RG_BIGGORON_SWORD,
-  RG_BOOMERANG,
-  RG_LENS_OF_TRUTH,
-  RG_MEGATON_HAMMER,
-  RG_IRON_BOOTS,
-  RG_GORON_TUNIC,
-  RG_ZORA_TUNIC,
-  RG_HOVER_BOOTS,
-  RG_MIRROR_SHIELD,
-  RG_STONE_OF_AGONY,
-  RG_FIRE_ARROWS,
-  RG_ICE_ARROWS,
-  RG_LIGHT_ARROWS,
-  RG_DINS_FIRE,
-  RG_FARORES_WIND,
-  RG_NAYRUS_LOVE,
-  RG_GREG_RUPEE,
-  RG_PROGRESSIVE_HOOKSHOT,  //2 progressive hookshots
-  RG_PROGRESSIVE_HOOKSHOT,
-  RG_DEKU_SHIELD,
-  RG_HYLIAN_SHIELD,
-  RG_PROGRESSIVE_STRENGTH,  //3 progressive strength upgrades
-  RG_PROGRESSIVE_STRENGTH,
-  RG_PROGRESSIVE_STRENGTH,
-  RG_PROGRESSIVE_SCALE,     //2 progressive scales
-  RG_PROGRESSIVE_SCALE,
-  RG_PROGRESSIVE_BOW,       //3 progressive Bows
-  RG_PROGRESSIVE_BOW,
-  RG_PROGRESSIVE_BOW,
-  RG_PROGRESSIVE_SLINGSHOT, //3 progressive bullet bags
-  RG_PROGRESSIVE_SLINGSHOT,
-  RG_PROGRESSIVE_SLINGSHOT,
-  RG_PROGRESSIVE_BOMB_BAG,   //3 progressive bomb bags
-  RG_PROGRESSIVE_BOMB_BAG,
-  RG_PROGRESSIVE_BOMB_BAG,
-  RG_PROGRESSIVE_WALLET, //2 progressive wallets
-  RG_PROGRESSIVE_WALLET,
-  RG_PROGRESSIVE_MAGIC_METER,  //2 progressive magic meters
-  RG_PROGRESSIVE_MAGIC_METER,
-  RG_DOUBLE_DEFENSE,
-  RG_PROGRESSIVE_STICK_UPGRADE, //2 stick upgrades
-  RG_PROGRESSIVE_STICK_UPGRADE,
-  RG_PROGRESSIVE_NUT_UPGRADE,   //2 nut upgrades
-  RG_PROGRESSIVE_NUT_UPGRADE,
-  RG_RECOVERY_HEART,  //6 recovery hearts
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_BOMBS_5, //2
-  RG_BOMBS_5,
-  RG_BOMBS_10,
-  RG_BOMBS_20,
-  RG_ARROWS_5,
-  RG_ARROWS_10, //5
-  RG_ARROWS_10,
-  RG_ARROWS_10,
-  RG_TREASURE_GAME_HEART,
-};
-const std::array<RandomizerGet, 44> easyItems = {
-  RG_BIGGORON_SWORD,
-  RG_KOKIRI_SWORD,
-  RG_MASTER_SWORD,
-  RG_BOOMERANG,
-  RG_LENS_OF_TRUTH,
-  RG_MEGATON_HAMMER,
-  RG_IRON_BOOTS,
-  RG_GORON_TUNIC,
-  RG_ZORA_TUNIC,
-  RG_HOVER_BOOTS,
-  RG_MIRROR_SHIELD,
-  RG_FIRE_ARROWS,
-  RG_LIGHT_ARROWS,
-  RG_DINS_FIRE,
-  RG_PROGRESSIVE_HOOKSHOT,
-  RG_PROGRESSIVE_STRENGTH,
-  RG_PROGRESSIVE_SCALE,
-  RG_PROGRESSIVE_WALLET,
-  RG_PROGRESSIVE_MAGIC_METER,
-  RG_PROGRESSIVE_STICK_UPGRADE,
-  RG_PROGRESSIVE_NUT_UPGRADE,
-  RG_PROGRESSIVE_BOW,
-  RG_PROGRESSIVE_SLINGSHOT,
-  RG_PROGRESSIVE_BOMB_BAG,
-  RG_DOUBLE_DEFENSE,
-  RG_HEART_CONTAINER, //16 Heart Containers
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_PIECE_OF_HEART,   //3 heart pieces
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-};
-const std::array<RandomizerGet, 43> normalItems = {
-  RG_PIECE_OF_HEART,   //35 pieces of heart
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_PIECE_OF_HEART,
-  RG_HEART_CONTAINER, //8 heart containers
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-  RG_HEART_CONTAINER,
-};
-const std::array<RandomizerGet, 2> DT_Vanilla = {
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-};
-const std::array<RandomizerGet, 3> DT_MQ = {
-  RG_DEKU_SHIELD,
-  RG_DEKU_SHIELD,
-  RG_PURPLE_RUPEE,
-};
-const std::array<RandomizerGet, 1> DC_Vanilla = {
-  RG_RED_RUPEE,
-};
-const std::array<RandomizerGet, 2> DC_MQ = {
-  RG_HYLIAN_SHIELD,
-  RG_BLUE_RUPEE,
-};
-const std::array<RandomizerGet, 7> JB_MQ = {
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_RECOVERY_HEART,
-  RG_DEKU_SHIELD,
-  RG_DEKU_STICK_1,
-};
-const std::array<RandomizerGet, 3> FoT_Vanilla = {
-  RG_RECOVERY_HEART,
-  RG_ARROWS_10,
-  RG_ARROWS_30,
-};
-const std::array<RandomizerGet, 1> FoT_MQ = {
-  RG_ARROWS_5,
-};
-const std::array<RandomizerGet, 1> FiT_Vanilla = {
-  RG_HUGE_RUPEE,
-};
-const std::array<RandomizerGet, 2> FiT_MQ = {
-  RG_BOMBS_20,
-  RG_HYLIAN_SHIELD,
-};
-const std::array<RandomizerGet, 4> SpT_Vanilla = {
-  RG_DEKU_SHIELD,
-  RG_DEKU_SHIELD,
-  RG_RECOVERY_HEART,
-  RG_BOMBS_20,
-};
-const std::array<RandomizerGet, 3> SpT_MQ = {
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_ARROWS_30,
-};
-const std::array<RandomizerGet, 1> ShT_Vanilla = {
-  RG_ARROWS_30,
-};
-const std::array<RandomizerGet, 3> ShT_MQ = {
-  RG_ARROWS_5,
-  RG_ARROWS_5,
-  RG_RED_RUPEE,
-};
-const std::array<RandomizerGet, 7> BW_Vanilla = {
-  RG_RECOVERY_HEART,
-  RG_BOMBS_10,
-  RG_HUGE_RUPEE,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_10,
-  RG_DEKU_SHIELD,
-  RG_HYLIAN_SHIELD,
-};
-const std::array<RandomizerGet, 4> GTG_Vanilla = {
-  RG_ARROWS_30,
-  RG_ARROWS_30,
-  RG_ARROWS_30,
-  RG_HUGE_RUPEE,
-};
-const std::array<RandomizerGet, 5> GTG_MQ = {
-  RG_TREASURE_GAME_GREEN_RUPEE,
-  RG_TREASURE_GAME_GREEN_RUPEE,
-  RG_ARROWS_10,
-  RG_GREEN_RUPEE,
-  RG_PURPLE_RUPEE,
-};
-const std::array<RandomizerGet, 4> GC_Vanilla = {
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_ARROWS_30,
-};
-const std::array<RandomizerGet, 5> GC_MQ = {
-  RG_ARROWS_10,
-  RG_ARROWS_10,
-  RG_BOMBS_5,
-  RG_RED_RUPEE,
-  RG_RECOVERY_HEART,
-};
-const std::array<RandomizerGet, 11> normalBottles = {
-  RG_EMPTY_BOTTLE,
-  RG_BOTTLE_WITH_MILK,
-  RG_BOTTLE_WITH_RED_POTION,
-  RG_BOTTLE_WITH_GREEN_POTION,
-  RG_BOTTLE_WITH_BLUE_POTION,
-  RG_BOTTLE_WITH_FAIRY,
-  RG_BOTTLE_WITH_FISH,
-  RG_BOTTLE_WITH_BUGS,
-  RG_BOTTLE_WITH_POE,
-  RG_BOTTLE_WITH_BIG_POE,
-  RG_BOTTLE_WITH_BLUE_FIRE,
-};
-const std::array<RandomizerGet, 28> normalRupees = {
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-};
-const std::array<RandomizerGet, 28> shopsanityRupees = {
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_RED_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_PURPLE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-  RG_HUGE_RUPEE,
-};
-const std::array<RandomizerGet, 19> dekuScrubItems = {
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_NUTS_5,
-  RG_DEKU_STICK_1,
-  RG_BOMBS_5,
-  RG_BOMBS_5,
-  RG_BOMBS_5,
-  RG_BOMBS_5,
-  RG_BOMBS_5,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_RECOVERY_HEART,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-  RG_BLUE_RUPEE,
-};
-const std::array<RandomizerGet, 12> songList = {
-  RG_ZELDAS_LULLABY,
-  RG_EPONAS_SONG,
-  RG_SUNS_SONG,
-  RG_SARIAS_SONG,
-  RG_SONG_OF_TIME,
-  RG_SONG_OF_STORMS,
-  RG_MINUET_OF_FOREST,
-  RG_PRELUDE_OF_LIGHT,
-  RG_BOLERO_OF_FIRE,
-  RG_SERENADE_OF_WATER,
-  RG_NOCTURNE_OF_SHADOW,
-  RG_REQUIEM_OF_SPIRIT,
-};
-const std::array<RandomizerGet, 10> tradeItems = {
-  RG_POCKET_EGG,
-  //RG_POCKET_CUCCO,
-  RG_COJIRO,
-  RG_ODD_MUSHROOM,
-  RG_POACHERS_SAW,
-  RG_BROKEN_SWORD,
-  RG_PRESCRIPTION,
-  RG_EYEBALL_FROG,
-  RG_EYEDROPS,
-  RG_CLAIM_CHECK,
-};
-
-void AddItemToPool(std::vector<RandomizerGet>& pool, RandomizerGet item, size_t count /*= 1*/) {
-  pool.insert(pool.end(), count, item);
-}
-
-template <typename FromPool>
-static void AddItemsToPool(std::vector<RandomizerGet>& toPool, const FromPool& fromPool) {
-  AddElementsToPool(toPool, fromPool);
-}
-
-static void AddItemToMainPool(const RandomizerGet item, size_t count = 1) {
-  ItemPool.insert(ItemPool.end(), count, item);
-}
-
-static void AddRandomBottle(std::vector<RandomizerGet>& bottlePool) {
-  AddItemToMainPool(RandomElement(bottlePool, true));
-}
-
-RandomizerGet GetJunkItem() {
-  auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_MAYHEM) || ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
-      return RG_ICE_TRAP;
-  } else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_EXTRA)) {
-      return RandomElement(JunkPoolItems);
-  }
-  //Ice Trap is the last item in JunkPoolItems, so subtract 1 to never hit that index
-  uint8_t idx = Random(0, JunkPoolItems.size() - 1);
-  return JunkPoolItems[idx];
-}
-
-static RandomizerGet GetPendingJunkItem() {
-  if (PendingJunkPool.empty()) {
-    return GetJunkItem();
-  }
-
-  return RandomElement(PendingJunkPool, true);
-}
-
-//Replace junk items in the pool with pending junk
-static void ReplaceMaxItem(const RandomizerGet itemToReplace, int max) {
-  int itemCount = 0;
-  for (size_t i = 0; i < ItemPool.size(); i++) {
-    if (ItemPool[i] == itemToReplace) {
-      if (itemCount >= max) {
-        ItemPool[i] = GetJunkItem();
-      }
-      itemCount++;
-    }
-  }
-}
-
-void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
-  //place a non-advancement item in this location
-  auto ctx = Rando::Context::GetInstance();
-  for (size_t i = 0; i < ItemPool.size(); i++) {
-    if (!Rando::StaticData::RetrieveItem(ItemPool[i]).IsAdvancement()) {
-      ctx->PlaceItemInLocation(il, ItemPool[i]);
-      ItemPool.erase(ItemPool.begin() + i);
-      return;
-    }
-  }
-  SPDLOG_ERROR("ERROR: No Junk to Place!!!");
-}
-
-static void PlaceVanillaMapsAndCompasses() {
-  auto ctx = Rando::Context::GetInstance();
-  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    dungeon->PlaceVanillaMap();
-    dungeon->PlaceVanillaCompass();
-  }
-}
-
-static void PlaceVanillaSmallKeys() {
-  auto ctx = Rando::Context::GetInstance();
-  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    dungeon->PlaceVanillaSmallKeys();
-  }
-}
-
-static void PlaceVanillaBossKeys() {
-  auto ctx = Rando::Context::GetInstance();
-  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    dungeon->PlaceVanillaBossKey();
-  }
-}
-
-static void PlaceItemsForType(RandomizerCheckType rctype, bool overworldActive, bool dungeonActive) {
-  if (!(overworldActive || dungeonActive)) {
-    return;
-  }
-  for (RandomizerCheck rc : ctx->GetLocations(ctx->allLocations, rctype)) {
-    auto loc = Rando::StaticData::GetLocation(rc);
-
-    // If item is in the overworld and shuffled, add its item to the pool
-    if (loc->IsOverworld()) {
-      if (overworldActive) {
-        AddItemToMainPool(loc->GetVanillaItem());
-      }
-    } else {
-      if (dungeonActive) {
-        // If the same in MQ and vanilla, add.
-        RandomizerCheckQuest currentQuest = loc->GetQuest();
-        if (currentQuest == RCQUEST_BOTH) {
-          AddItemToMainPool(loc->GetVanillaItem());
-        } else {
-          // Check if current item's dungeon is vanilla or MQ, and only add if quest corresponds to it.
-          SceneID itemScene = loc->GetScene();
-
-          if (itemScene >= SCENE_DEKU_TREE && itemScene <= SCENE_GERUDO_TRAINING_GROUND) {
-            bool isMQ = ctx->GetDungeon(itemScene)->IsMQ();
-
-            if ((isMQ && currentQuest == RCQUEST_MQ) || (!isMQ && currentQuest == RCQUEST_VANILLA)) {
-              AddItemToMainPool(loc->GetVanillaItem());
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-static void SetScarceItemPool() {
-  ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 3);
-  ReplaceMaxItem(RG_BOMBCHU_5, 1);
-  ReplaceMaxItem(RG_BOMBCHU_10, 2);
-  ReplaceMaxItem(RG_BOMBCHU_20, 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
-  ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 2 : 1);
-  ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 2 : 1);
-  ReplaceMaxItem(RG_PROGRESSIVE_BOW, 2);
-  ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 2);
-  ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 2);
-  ReplaceMaxItem(RG_HEART_CONTAINER, 0);
-}
-
-static void SetMinimalItemPool() {
-  auto ctx = Rando::Context::GetInstance();
-  ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 1);
-  ReplaceMaxItem(RG_BOMBCHU_5, 1);
-  ReplaceMaxItem(RG_BOMBCHU_10, 0);
-  ReplaceMaxItem(RG_BOMBCHU_20, 0);
-  ReplaceMaxItem(RG_NAYRUS_LOVE, 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
-  ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 1 : 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 1 : 0);
-  ReplaceMaxItem(RG_PROGRESSIVE_BOW, 1);
-  ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 1);
-  ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 1);
-  ReplaceMaxItem(RG_PIECE_OF_HEART, 0);
-  // Need an extra heart container when starting with 1 heart to be able to reach 3 hearts
-  ReplaceMaxItem(RG_HEART_CONTAINER, (ctx->GetOption(RSK_STARTING_HEARTS).Get() == 18)? 1 : 0);
-}
-
-void GenerateItemPool() {
-  //RANDOTODO proper removal of items not in pool or logically relevant instead of dummy checks.
-  auto ctx = Rando::Context::GetInstance();
-  ItemPool.clear();
-  PendingJunkPool.clear();
-
-  //Initialize ice trap models to always major items
-  ctx->possibleIceTrapModels = {
-    RG_MIRROR_SHIELD,
+    RG_BIGGORON_SWORD,
     RG_BOOMERANG,
     RG_LENS_OF_TRUTH,
     RG_MEGATON_HAMMER,
     RG_IRON_BOOTS,
+    RG_GORON_TUNIC,
+    RG_ZORA_TUNIC,
     RG_HOVER_BOOTS,
+    RG_MIRROR_SHIELD,
     RG_STONE_OF_AGONY,
-    RG_DINS_FIRE,
-    RG_FARORES_WIND,
-    RG_NAYRUS_LOVE,
     RG_FIRE_ARROWS,
     RG_ICE_ARROWS,
     RG_LIGHT_ARROWS,
+    RG_DINS_FIRE,
+    RG_FARORES_WIND,
+    RG_NAYRUS_LOVE,
+    RG_GREG_RUPEE,
+    RG_PROGRESSIVE_HOOKSHOT, // 2 progressive hookshots
+    RG_PROGRESSIVE_HOOKSHOT,
+    RG_DEKU_SHIELD,
+    RG_HYLIAN_SHIELD,
+    RG_PROGRESSIVE_STRENGTH, // 3 progressive strength upgrades
+    RG_PROGRESSIVE_STRENGTH,
+    RG_PROGRESSIVE_STRENGTH,
+    RG_PROGRESSIVE_SCALE, // 2 progressive scales
+    RG_PROGRESSIVE_SCALE,
+    RG_PROGRESSIVE_BOW, // 3 progressive Bows
+    RG_PROGRESSIVE_BOW,
+    RG_PROGRESSIVE_BOW,
+    RG_PROGRESSIVE_SLINGSHOT, // 3 progressive bullet bags
+    RG_PROGRESSIVE_SLINGSHOT,
+    RG_PROGRESSIVE_SLINGSHOT,
+    RG_PROGRESSIVE_BOMB_BAG, // 3 progressive bomb bags
+    RG_PROGRESSIVE_BOMB_BAG,
+    RG_PROGRESSIVE_BOMB_BAG,
+    RG_PROGRESSIVE_WALLET, // 2 progressive wallets
+    RG_PROGRESSIVE_WALLET,
+    RG_PROGRESSIVE_MAGIC_METER, // 2 progressive magic meters
+    RG_PROGRESSIVE_MAGIC_METER,
     RG_DOUBLE_DEFENSE,
-    RG_CLAIM_CHECK,
+    RG_PROGRESSIVE_STICK_UPGRADE, // 2 stick upgrades
+    RG_PROGRESSIVE_STICK_UPGRADE,
+    RG_PROGRESSIVE_NUT_UPGRADE, // 2 nut upgrades
+    RG_PROGRESSIVE_NUT_UPGRADE,
+    RG_RECOVERY_HEART, // 6 recovery hearts
+    RG_RECOVERY_HEART,
+    RG_RECOVERY_HEART,
+    RG_RECOVERY_HEART,
+    RG_RECOVERY_HEART,
+    RG_RECOVERY_HEART,
+    RG_BOMBS_5, // 2
+    RG_BOMBS_5,
+    RG_BOMBS_10,
+    RG_BOMBS_20,
+    RG_ARROWS_5,
+    RG_ARROWS_10, // 5
+    RG_ARROWS_10,
+    RG_ARROWS_10,
+    RG_TREASURE_GAME_HEART,
+};
+const std::array<RandomizerGet, 44> easyItems = {
+    RG_BIGGORON_SWORD,
+    RG_KOKIRI_SWORD,
+    RG_MASTER_SWORD,
+    RG_BOOMERANG,
+    RG_LENS_OF_TRUTH,
+    RG_MEGATON_HAMMER,
+    RG_IRON_BOOTS,
+    RG_GORON_TUNIC,
+    RG_ZORA_TUNIC,
+    RG_HOVER_BOOTS,
+    RG_MIRROR_SHIELD,
+    RG_FIRE_ARROWS,
+    RG_LIGHT_ARROWS,
+    RG_DINS_FIRE,
     RG_PROGRESSIVE_HOOKSHOT,
     RG_PROGRESSIVE_STRENGTH,
-    RG_PROGRESSIVE_BOMB_BAG,
+    RG_PROGRESSIVE_SCALE,
+    RG_PROGRESSIVE_WALLET,
+    RG_PROGRESSIVE_MAGIC_METER,
+    RG_PROGRESSIVE_STICK_UPGRADE,
+    RG_PROGRESSIVE_NUT_UPGRADE,
     RG_PROGRESSIVE_BOW,
     RG_PROGRESSIVE_SLINGSHOT,
-    RG_PROGRESSIVE_WALLET,
-    RG_PROGRESSIVE_SCALE,
-    RG_PROGRESSIVE_MAGIC_METER,
-  };
-  //Check song shuffle and dungeon reward shuffle just for ice traps
-  if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE)) {
-    //Push item ids for songs
-    ctx->possibleIceTrapModels.push_back(RG_ZELDAS_LULLABY);
-    ctx->possibleIceTrapModels.push_back(RG_EPONAS_SONG);
-    ctx->possibleIceTrapModels.push_back(RG_SARIAS_SONG);
-    ctx->possibleIceTrapModels.push_back(RG_SUNS_SONG);
-    ctx->possibleIceTrapModels.push_back(RG_SONG_OF_TIME);
-    ctx->possibleIceTrapModels.push_back(RG_SONG_OF_STORMS);
-    ctx->possibleIceTrapModels.push_back(RG_MINUET_OF_FOREST);
-    ctx->possibleIceTrapModels.push_back(RG_BOLERO_OF_FIRE);
-    ctx->possibleIceTrapModels.push_back(RG_SERENADE_OF_WATER);
-    ctx->possibleIceTrapModels.push_back(RG_REQUIEM_OF_SPIRIT);
-    ctx->possibleIceTrapModels.push_back(RG_NOCTURNE_OF_SHADOW);
-    ctx->possibleIceTrapModels.push_back(RG_PRELUDE_OF_LIGHT);
-  }
-  if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANYWHERE)) {
-    //Push item ids for dungeon rewards
-    ctx->possibleIceTrapModels.push_back(RG_KOKIRI_EMERALD);
-    ctx->possibleIceTrapModels.push_back(RG_GORON_RUBY);
-    ctx->possibleIceTrapModels.push_back(RG_ZORA_SAPPHIRE);
-    ctx->possibleIceTrapModels.push_back(RG_FOREST_MEDALLION);
-    ctx->possibleIceTrapModels.push_back(RG_FIRE_MEDALLION);
-    ctx->possibleIceTrapModels.push_back(RG_WATER_MEDALLION);
-    ctx->possibleIceTrapModels.push_back(RG_SPIRIT_MEDALLION);
-    ctx->possibleIceTrapModels.push_back(RG_SHADOW_MEDALLION);
-    ctx->possibleIceTrapModels.push_back(RG_LIGHT_MEDALLION);
-  }
+    RG_PROGRESSIVE_BOMB_BAG,
+    RG_DOUBLE_DEFENSE,
+    RG_HEART_CONTAINER, // 16 Heart Containers
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_PIECE_OF_HEART, // 3 heart pieces
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+};
+const std::array<RandomizerGet, 43> normalItems = {
+    // 35 pieces of heart
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    RG_PIECE_OF_HEART,
+    // 8 heart containers
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+    RG_HEART_CONTAINER,
+};
+const std::array<RandomizerGet, 2> DT_Vanilla = {
+    RG_RECOVERY_HEART,
+    RG_RECOVERY_HEART,
+};
+const std::array<RandomizerGet, 3> DT_MQ = {
+    RG_DEKU_SHIELD,
+    RG_DEKU_SHIELD,
+    RG_PURPLE_RUPEE,
+};
+const std::array<RandomizerGet, 1> DC_Vanilla = {
+    RG_RED_RUPEE,
+};
+const std::array<RandomizerGet, 2> DC_MQ = {
+    RG_HYLIAN_SHIELD,
+    RG_BLUE_RUPEE,
+};
+const std::array<RandomizerGet, 7> JB_MQ = {
+    RG_DEKU_NUTS_5, RG_DEKU_NUTS_5, RG_DEKU_NUTS_5, RG_DEKU_NUTS_5, RG_RECOVERY_HEART, RG_DEKU_SHIELD, RG_DEKU_STICK_1,
+};
+const std::array<RandomizerGet, 3> FoT_Vanilla = {
+    RG_RECOVERY_HEART,
+    RG_ARROWS_10,
+    RG_ARROWS_30,
+};
+const std::array<RandomizerGet, 1> FoT_MQ = {
+    RG_ARROWS_5,
+};
+const std::array<RandomizerGet, 1> FiT_Vanilla = {
+    RG_HUGE_RUPEE,
+};
+const std::array<RandomizerGet, 2> FiT_MQ = {
+    RG_BOMBS_20,
+    RG_HYLIAN_SHIELD,
+};
+const std::array<RandomizerGet, 4> SpT_Vanilla = {
+    RG_DEKU_SHIELD,
+    RG_DEKU_SHIELD,
+    RG_RECOVERY_HEART,
+    RG_BOMBS_20,
+};
+const std::array<RandomizerGet, 3> SpT_MQ = {
+    RG_PURPLE_RUPEE,
+    RG_PURPLE_RUPEE,
+    RG_ARROWS_30,
+};
+const std::array<RandomizerGet, 1> ShT_Vanilla = {
+    RG_ARROWS_30,
+};
+const std::array<RandomizerGet, 3> ShT_MQ = {
+    RG_ARROWS_5,
+    RG_ARROWS_5,
+    RG_RED_RUPEE,
+};
+const std::array<RandomizerGet, 7> BW_Vanilla = {
+    RG_RECOVERY_HEART, RG_BOMBS_10, RG_HUGE_RUPEE, RG_DEKU_NUTS_5, RG_DEKU_NUTS_10, RG_DEKU_SHIELD, RG_HYLIAN_SHIELD,
+};
+const std::array<RandomizerGet, 4> GTG_Vanilla = {
+    RG_ARROWS_30,
+    RG_ARROWS_30,
+    RG_ARROWS_30,
+    RG_HUGE_RUPEE,
+};
+const std::array<RandomizerGet, 5> GTG_MQ = {
+    RG_TREASURE_GAME_GREEN_RUPEE, RG_TREASURE_GAME_GREEN_RUPEE, RG_ARROWS_10, RG_GREEN_RUPEE, RG_PURPLE_RUPEE,
+};
+const std::array<RandomizerGet, 4> GC_Vanilla = {
+    RG_BLUE_RUPEE,
+    RG_BLUE_RUPEE,
+    RG_BLUE_RUPEE,
+    RG_ARROWS_30,
+};
+const std::array<RandomizerGet, 5> GC_MQ = {
+    RG_ARROWS_10, RG_ARROWS_10, RG_BOMBS_5, RG_RED_RUPEE, RG_RECOVERY_HEART,
+};
+const std::array<RandomizerGet, 11> normalBottles = {
+    RG_EMPTY_BOTTLE,
+    RG_BOTTLE_WITH_MILK,
+    RG_BOTTLE_WITH_RED_POTION,
+    RG_BOTTLE_WITH_GREEN_POTION,
+    RG_BOTTLE_WITH_BLUE_POTION,
+    RG_BOTTLE_WITH_FAIRY,
+    RG_BOTTLE_WITH_FISH,
+    RG_BOTTLE_WITH_BUGS,
+    RG_BOTTLE_WITH_POE,
+    RG_BOTTLE_WITH_BIG_POE,
+    RG_BOTTLE_WITH_BLUE_FIRE,
+};
+const std::array<RandomizerGet, 28> normalRupees = {
+    RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,
+    RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_BLUE_RUPEE,
+    RG_BLUE_RUPEE,   RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,
+    RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE,
+    RG_PURPLE_RUPEE, RG_HUGE_RUPEE,   RG_HUGE_RUPEE,   RG_HUGE_RUPEE,
+};
+const std::array<RandomizerGet, 28> shopsanityRupees = {
+    RG_BLUE_RUPEE,   RG_BLUE_RUPEE,   RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,
+    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,    RG_RED_RUPEE,
+    RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE,
+    RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_PURPLE_RUPEE, RG_HUGE_RUPEE,   RG_HUGE_RUPEE,
+    RG_HUGE_RUPEE,   RG_HUGE_RUPEE,   RG_HUGE_RUPEE,   RG_HUGE_RUPEE,
+};
+const std::array<RandomizerGet, 19> dekuScrubItems = {
+    RG_DEKU_NUTS_5,  RG_DEKU_NUTS_5,    RG_DEKU_NUTS_5,    RG_DEKU_NUTS_5,    RG_DEKU_NUTS_5,
+    RG_DEKU_STICK_1, RG_BOMBS_5,        RG_BOMBS_5,        RG_BOMBS_5,        RG_BOMBS_5,
+    RG_BOMBS_5,      RG_RECOVERY_HEART, RG_RECOVERY_HEART, RG_RECOVERY_HEART, RG_RECOVERY_HEART,
+    RG_BLUE_RUPEE,   RG_BLUE_RUPEE,     RG_BLUE_RUPEE,     RG_BLUE_RUPEE,
+};
+const std::array<RandomizerGet, 12> songList = {
+    RG_ZELDAS_LULLABY, RG_EPONAS_SONG,       RG_SUNS_SONG,          RG_SARIAS_SONG,
+    RG_SONG_OF_TIME,   RG_SONG_OF_STORMS,    RG_MINUET_OF_FOREST,   RG_PRELUDE_OF_LIGHT,
+    RG_BOLERO_OF_FIRE, RG_SERENADE_OF_WATER, RG_NOCTURNE_OF_SHADOW, RG_REQUIEM_OF_SPIRIT,
+};
+const std::array<RandomizerGet, 10> tradeItems = {
+    RG_POCKET_EGG,
+    // RG_POCKET_CUCCO,
+    RG_COJIRO,
+    RG_ODD_MUSHROOM,
+    RG_POACHERS_SAW,
+    RG_BROKEN_SWORD,
+    RG_PRESCRIPTION,
+    RG_EYEBALL_FROG,
+    RG_EYEDROPS,
+    RG_CLAIM_CHECK,
+};
 
-  if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
-    ctx->possibleIceTrapModels.push_back(RG_TRIFORCE_PIECE);
-    AddItemToMainPool(RG_TRIFORCE_PIECE, (ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Get() + 1));
-    ctx->PlaceItemInLocation(RC_TRIFORCE_COMPLETED, RG_TRIFORCE); // Win condition
-    ctx->PlaceItemInLocation(RC_GANON, GetJunkItem(), false, true);
-  } else {
-    ctx->PlaceItemInLocation(RC_GANON, RG_TRIFORCE); // Win condition
-  }
+void AddItemToPool(std::vector<RandomizerGet>& pool, RandomizerGet item, size_t count /*= 1*/) {
+    pool.insert(pool.end(), count, item);
+}
 
-  //Fixed item locations
-  ctx->PlaceItemInLocation(RC_HC_ZELDAS_LETTER, RG_ZELDAS_LETTER);
+template <typename FromPool> static void AddItemsToPool(std::vector<RandomizerGet>& toPool, const FromPool& fromPool) {
+    AddElementsToPool(toPool, fromPool);
+}
 
-  if (ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
-    AddItemToMainPool(RG_KOKIRI_SWORD);
-    ctx->possibleIceTrapModels.push_back(RG_KOKIRI_SWORD);
-  } else {
-      if (!ctx->GetOption(RSK_STARTING_KOKIRI_SWORD)) {
-          ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
-      }
-  }
+static void AddItemToMainPool(const RandomizerGet item, size_t count = 1) {
+    ItemPool.insert(ItemPool.end(), count, item);
+}
 
-  if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-    AddItemToMainPool(RG_MASTER_SWORD);
-    ctx->possibleIceTrapModels.push_back(RG_MASTER_SWORD);
-  } else {
-      if (!ctx->GetOption(RSK_STARTING_MASTER_SWORD)) {
-          ctx->PlaceItemInLocation(RC_TOT_MASTER_SWORD, RG_MASTER_SWORD, false, true);
-      }
-  }
+static void AddRandomBottle(std::vector<RandomizerGet>& bottlePool) {
+    AddItemToMainPool(RandomElement(bottlePool, true));
+}
 
-  if (ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG)) {
-    AddItemToMainPool(RG_WEIRD_EGG);
-    ctx->possibleIceTrapModels.push_back(RG_WEIRD_EGG);
-  } else {
-    ctx->PlaceItemInLocation(RC_HC_MALON_EGG, RG_WEIRD_EGG, false, true);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_OCARINA)) {
-    AddItemToMainPool(RG_PROGRESSIVE_OCARINA, 2);
-    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, RG_PROGRESSIVE_OCARINA);
+RandomizerGet GetJunkItem() {
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_MAYHEM) ||
+        ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
+        return RG_ICE_TRAP;
+    } else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_EXTRA)) {
+        return RandomElement(JunkPoolItems);
     }
-    ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_OCARINA);
-  } else {
-      if (ctx->GetOption(RSK_STARTING_OCARINA).Is(RO_STARTING_OCARINA_OFF)) {
-          ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
-          ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
-      } else {
-          if (ctx->GetOption(RSK_STARTING_OCARINA).IsNot(RO_STARTING_OCARINA_TIME)) {
-              ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
-          }
-      }
-  }
+    // Ice Trap is the last item in JunkPoolItems, so subtract 1 to never hit that index
+    uint8_t idx = Random(0, static_cast<uint32_t>(JunkPoolItems.size()) - 1);
+    return JunkPoolItems[idx];
+}
 
-  if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
-    AddItemToMainPool(RG_OCARINA_A_BUTTON);
-    AddItemToMainPool(RG_OCARINA_C_UP_BUTTON);
-    AddItemToMainPool(RG_OCARINA_C_DOWN_BUTTON);
-    AddItemToMainPool(RG_OCARINA_C_LEFT_BUTTON);
-    AddItemToMainPool(RG_OCARINA_C_RIGHT_BUTTON);
-
-    ctx->possibleIceTrapModels.push_back(RG_OCARINA_A_BUTTON);
-    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_UP_BUTTON);
-    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_DOWN_BUTTON);
-    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_LEFT_BUTTON);
-    ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
-  }
-
-  if (ctx->GetOption(RSK_SKELETON_KEY)) {
-    AddItemToMainPool(RG_SKELETON_KEY);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_SWIM)) {
-    AddItemToMainPool(RG_PROGRESSIVE_SCALE);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {
-    //32 total beehive locations
-    AddItemToMainPool(RG_RED_RUPEE, 23);
-    AddItemToMainPool(RG_BLUE_RUPEE, 9);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_COWS)) {
-    //9 total cow locations
-    for (uint8_t i = 0; i < 9; i++) {
-      AddItemToMainPool(GetJunkItem());
+static RandomizerGet GetPendingJunkItem() {
+    if (PendingJunkPool.empty()) {
+        return GetJunkItem();
     }
-    //extra location for Jabu MQ
-    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
-      AddItemToMainPool(GetJunkItem());
-    }
-  }
 
-  // Shuffle Pots
-  bool overworldPotsActive = ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD) ||
-                             ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_ALL);
-  bool dungeonPotsActive = ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS) ||
-                           ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_ALL);
-  PlaceItemsForType(RCTYPE_POT, overworldPotsActive, dungeonPotsActive);
-  
-  auto fsMode = ctx->GetOption(RSK_FISHSANITY);
-  if (fsMode.IsNot(RO_FISHSANITY_OFF)) {
-    if (fsMode.Is(RO_FISHSANITY_POND) || fsMode.Is(RO_FISHSANITY_BOTH)) {
-      // 17 max child pond fish
-      uint8_t pondCt = ctx->GetOption(RSK_FISHSANITY_POND_COUNT).Get();
-      for (uint8_t i = 0; i < pondCt; i++) {
-        AddItemToMainPool(GetJunkItem());
-      }
+    return RandomElement(PendingJunkPool, true);
+}
 
-      if (ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)) {
-        // 16 max adult pond fish, have to reduce to 16 if every fish is enabled
-        if (pondCt > 16)
-            pondCt = 16;
-        for (uint8_t i = 0; i < pondCt; i++) {
-            AddItemToMainPool(GetJunkItem());
+// Replace junk items in the pool with pending junk
+static void ReplaceMaxItem(const RandomizerGet itemToReplace, int max) {
+    int itemCount = 0;
+    for (size_t i = 0; i < ItemPool.size(); i++) {
+        if (ItemPool[i] == itemToReplace) {
+            if (itemCount >= max) {
+                ItemPool[i] = RG_NONE;
+            }
+            itemCount++;
         }
-      }
-    }
-    // 9 grotto fish, 5 zora's domain fish
-    if (fsMode.Is(RO_FISHSANITY_OVERWORLD) || fsMode.Is(RO_FISHSANITY_BOTH)) {
-      for (uint8_t i = 0; i < Rando::StaticData::GetOverworldFishLocations().size(); i++)
-        AddItemToMainPool(GetJunkItem());
     }
+}
 
-    if (fsMode.Is(RO_FISHSANITY_HYRULE_LOACH)) {
-      AddItemToMainPool(RG_PURPLE_RUPEE);
-    } else {
-      ctx->PlaceItemInLocation(RC_LH_HYRULE_LOACH, RG_PURPLE_RUPEE, false, true);
-    }
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE)) {
-    AddItemToMainPool(RG_FISHING_POLE);
-    ctx->possibleIceTrapModels.push_back(RG_FISHING_POLE);
-  }
-
-  if (ctx->GetOption(RSK_INFINITE_UPGRADES).Is(RO_INF_UPGRADES_PROGRESSIVE)) {
-    AddItemToMainPool(RG_PROGRESSIVE_BOMB_BAG);
-    AddItemToMainPool(RG_PROGRESSIVE_BOW);
-    AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
-    AddItemToMainPool(RG_PROGRESSIVE_SLINGSHOT);
-    AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
-    AddItemToMainPool(RG_PROGRESSIVE_MAGIC_METER);
-    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
-      ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
-    AddItemToMainPool(RG_MAGIC_BEAN_PACK);
-    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, RG_MAGIC_BEAN_PACK);
-    }
-    ctx->possibleIceTrapModels.push_back(RG_MAGIC_BEAN_PACK);
-  } else {
-    ctx->PlaceItemInLocation(RC_ZR_MAGIC_BEAN_SALESMAN, RG_MAGIC_BEAN, false, true);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
-      ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
-    if (/*!ProgressiveGoronSword TODO: Implement Progressive Goron Sword*/true) {
-      AddItemToMainPool(RG_GIANTS_KNIFE);
-    }
-    if (ctx->GetOption(RSK_BOMBCHU_BAG)) {
-      AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS);
-    } else {
-      AddItemToMainPool(RG_BOMBCHU_10);
-    }
-  } else {
-    ctx->PlaceItemInLocation(RC_KAK_GRANNYS_SHOP, RG_BLUE_POTION_REFILL, false, true);
-    ctx->PlaceItemInLocation(RC_GC_MEDIGORON, RG_GIANTS_KNIFE, false, true);
-    ctx->PlaceItemInLocation(RC_WASTELAND_BOMBCHU_SALESMAN, RG_BOMBCHU_10, false, true);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_FROG_SONG_RUPEES)) {
-    AddItemToMainPool(RG_PURPLE_RUPEE, 5);
-  } else {
-    ctx->PlaceItemInLocation(RC_ZR_FROGS_ZELDAS_LULLABY, RG_PURPLE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_ZR_FROGS_EPONAS_SONG, RG_PURPLE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_ZR_FROGS_SARIAS_SONG, RG_PURPLE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_ZR_FROGS_SUNS_SONG, RG_PURPLE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_ZR_FROGS_SONG_OF_TIME, RG_PURPLE_RUPEE, false, true);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)) {
-    AddItemToMainPool(RG_POCKET_EGG);
-    AddItemToMainPool(RG_COJIRO);
-    AddItemToMainPool(RG_ODD_MUSHROOM);
-    AddItemToMainPool(RG_ODD_POTION);
-    AddItemToMainPool(RG_POACHERS_SAW);
-    AddItemToMainPool(RG_BROKEN_SWORD);
-    AddItemToMainPool(RG_PRESCRIPTION);
-    AddItemToMainPool(RG_EYEBALL_FROG);
-    AddItemToMainPool(RG_EYEDROPS);
-  }
-  AddItemToMainPool(RG_CLAIM_CHECK);
-
-  if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS)) {
-    AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY, 6); // 6 individual keys
-  } else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK)) {
-    AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
-  } else {
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, RG_GREEN_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, RG_GREEN_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, RG_BLUE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, RG_BLUE_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, RG_RED_RUPEE, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4, RG_TREASURE_GAME_SMALL_KEY, false, true);
-    ctx->PlaceItemInLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5, RG_TREASURE_GAME_SMALL_KEY, false, true);
-  };
-
-  if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
-      ctx->PlaceItemInLocation(loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
-    }
-  } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
-      if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
-          ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
-      } else {
-        AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
-      }
-    }
-  } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD)) {
-    for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
-      if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
-          ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
-      } else {
-        AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
-      }
-    }
-  } else {
-    AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN, 100);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_100_GS_REWARD)) {
-    if (ctx->GetOption(RSK_SHUFFLE_TOKENS).IsNot(RO_TOKENSANITY_OFF) && ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-      AddItemToPool(PendingJunkPool, RG_GOLD_SKULLTULA_TOKEN, 10);
-    }
-    AddItemToMainPool(RG_HUGE_RUPEE);
-  } else {
-    ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_HUGE_RUPEE, false, true);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
-    AddItemToMainPool(RG_GOHMA_SOUL);
-    AddItemToMainPool(RG_KING_DODONGO_SOUL);
-    AddItemToMainPool(RG_BARINADE_SOUL);
-    AddItemToMainPool(RG_PHANTOM_GANON_SOUL);
-    AddItemToMainPool(RG_VOLVAGIA_SOUL);
-    AddItemToMainPool(RG_MORPHA_SOUL);
-    AddItemToMainPool(RG_BONGO_BONGO_SOUL);
-    AddItemToMainPool(RG_TWINROVA_SOUL);
-
-    ctx->possibleIceTrapModels.push_back(RG_GOHMA_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_KING_DODONGO_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_BARINADE_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_PHANTOM_GANON_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_VOLVAGIA_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_MORPHA_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_BONGO_BONGO_SOUL);
-    ctx->possibleIceTrapModels.push_back(RG_TWINROVA_SOUL);
-    if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
-      AddItemToMainPool(RG_GANON_SOUL);
-      ctx->possibleIceTrapModels.push_back(RG_GANON_SOUL);
-    }
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET)) {
-    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
-  }
-
-  if (ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET)) {
-    AddItemToMainPool(RG_PROGRESSIVE_WALLET);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG)) {
-    AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
-  }
-
-  if (ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG)) {
-    AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
-  }
-
-  if (ctx->GetOption(RSK_BOMBCHU_BAG)) {
-    AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
-  } else {
-    AddItemToMainPool(RG_BOMBCHU_5);
-    AddItemToMainPool(RG_BOMBCHU_10, 3);
-    AddItemToMainPool(RG_BOMBCHU_20);
-  }
-
-  //Ice Traps
-  AddItemToMainPool(RG_ICE_TRAP);
-  if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsVanilla()) {
-    AddItemToMainPool(RG_ICE_TRAP);
-  }
-  if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla()) {
-    AddItemToMainPool(RG_ICE_TRAP, 4);
-  }
-
-  //Gerudo Fortress
-  if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE)) {
-    ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
-    ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-    ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
-    ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-  } else if (ctx->GetOption(RSK_GERUDO_KEYS).IsNot(RO_GERUDO_KEYS_VANILLA)) {
-    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)) {
-      AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY);
-      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-    } else {
-      //Only add key ring if 4 Fortress keys necessary
-      if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS) && ctx->GetOption(RSK_KEYRINGS)) {
-        AddItemToMainPool(RG_GERUDO_FORTRESS_KEY_RING);
-        //Add junk to make up for missing keys
-        for (uint8_t i = 0; i < 3; i++) {
-          AddItemToMainPool(GetJunkItem());
+void PlaceJunkInExcludedLocation(const RandomizerCheck il) {
+    // place a non-advancement item in this location
+    auto ctx = Rando::Context::GetInstance();
+    for (size_t i = 0; i < ItemPool.size(); i++) {
+        if (!Rando::StaticData::RetrieveItem(ItemPool[i]).IsAdvancement()) {
+            ctx->PlaceItemInLocation(il, ItemPool[i]);
+            ItemPool.erase(ItemPool.begin() + i);
+            return;
         }
-      } else {
-        AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY, 4);
-      }
     }
-    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-      if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS) && ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && ctx->GetOption(RSK_KEYRINGS) ) {
-        AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_SMALL_KEY);
-      }
-    }
-  } else {
-    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)) {
-      ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
-      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_RECOVERY_HEART, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_RECOVERY_HEART, false, true);
-    } else {
-      ctx->PlaceItemInLocation(RC_GF_NORTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
-      ctx->PlaceItemInLocation(RC_GF_NORTH_F2_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F1_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
-      ctx->PlaceItemInLocation(RC_GF_SOUTH_F2_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
-    }
-  }
+    SPDLOG_ERROR("ERROR: No Junk to Place!!!");
+}
 
-  //Gerudo Membership Card
-  if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) && ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_CARPENTERS_FREE)) {
-    AddItemToMainPool(RG_GERUDO_MEMBERSHIP_CARD);
-    ctx->possibleIceTrapModels.push_back(RG_GERUDO_MEMBERSHIP_CARD);
-  } else if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
-    AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
-    ctx->PlaceItemInLocation(RC_GF_GERUDO_MEMBERSHIP_CARD, RG_ICE_TRAP, false, true);
-  } else {
-    ctx->PlaceItemInLocation(RC_GF_GERUDO_MEMBERSHIP_CARD, RG_GERUDO_MEMBERSHIP_CARD, false, true);
-  }
-
-  //Keys
-
-  //For key rings, need to add as many junk items as "missing" keys
-  if (ctx->GetOption(RSK_KEYRINGS).IsNot(RO_KEYRINGS_OFF)) {
-    uint8_t ringJunkAmt = 0;
+static void PlaceVanillaMapsAndCompasses() {
+    auto ctx = Rando::Context::GetInstance();
     for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      if (dungeon->HasKeyRing()) {
-        ringJunkAmt += dungeon->GetSmallKeyCount() - 1;
-      }
+        dungeon->PlaceVanillaMap();
+        dungeon->PlaceVanillaCompass();
     }
-    for (uint8_t i = 0; i < ringJunkAmt; i++) {
-        AddItemToMainPool(GetJunkItem());
-    }
-  }
+}
 
-  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-    if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
-      AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
+static void PlaceVanillaSmallKeys() {
+    auto ctx = Rando::Context::GetInstance();
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+        dungeon->PlaceVanillaSmallKeys();
+    }
+}
+
+static void PlaceVanillaBossKeys() {
+    auto ctx = Rando::Context::GetInstance();
+    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+        dungeon->PlaceVanillaBossKey();
+    }
+}
+
+static void PlaceItemsForType(RandomizerCheckType rctype, bool overworldActive, bool dungeonActive) {
+    if (!(overworldActive || dungeonActive)) {
+        return;
+    }
+    for (RandomizerCheck rc : ctx->GetLocations(ctx->allLocations, rctype)) {
+        auto loc = Rando::StaticData::GetLocation(rc);
+
+        // If item is in the overworld and shuffled, add its item to the pool
+        if (loc->IsOverworld()) {
+            if (overworldActive) {
+                AddItemToMainPool(loc->GetVanillaItem());
+            }
+        } else {
+            if (dungeonActive) {
+                // If the same in MQ and vanilla, add.
+                RandomizerCheckQuest currentQuest = loc->GetQuest();
+                if (currentQuest == RCQUEST_BOTH) {
+                    AddItemToMainPool(loc->GetVanillaItem());
+                } else {
+                    // Check if current item's dungeon is vanilla or MQ, and only add if quest corresponds to it.
+                    SceneID itemScene = loc->GetScene();
+
+                    if (itemScene >= SCENE_DEKU_TREE && itemScene <= SCENE_GERUDO_TRAINING_GROUND) {
+                        bool isMQ = ctx->GetDungeon(itemScene)->IsMQ();
+
+                        if ((isMQ && currentQuest == RCQUEST_MQ) || (!isMQ && currentQuest == RCQUEST_VANILLA)) {
+                            AddItemToMainPool(loc->GetVanillaItem());
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+static void SetScarceItemPool() {
+    ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 3);
+    ReplaceMaxItem(RG_BOMBCHU_5, 1);
+    ReplaceMaxItem(RG_BOMBCHU_10, 2);
+    ReplaceMaxItem(RG_BOMBCHU_20, 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
+    ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 2 : 1);
+    ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 2 : 1);
+    ReplaceMaxItem(RG_PROGRESSIVE_BOW, 2);
+    ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 2);
+    ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 2);
+    ReplaceMaxItem(RG_HEART_CONTAINER, 0);
+}
+
+static void SetMinimalItemPool() {
+    auto ctx = Rando::Context::GetInstance();
+    ReplaceMaxItem(RG_PROGRESSIVE_BOMBCHUS, 1);
+    ReplaceMaxItem(RG_BOMBCHU_5, 1);
+    ReplaceMaxItem(RG_BOMBCHU_10, 0);
+    ReplaceMaxItem(RG_BOMBCHU_20, 0);
+    ReplaceMaxItem(RG_NAYRUS_LOVE, 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
+    ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 1 : 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 1 : 0);
+    ReplaceMaxItem(RG_PROGRESSIVE_BOW, 1);
+    ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 1);
+    ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 1);
+    ReplaceMaxItem(RG_PIECE_OF_HEART, 0);
+    // Need an extra heart container when starting with 1 heart to be able to reach 3 hearts
+    ReplaceMaxItem(RG_HEART_CONTAINER, (ctx->GetOption(RSK_STARTING_HEARTS).Get() == 18) ? 1 : 0);
+}
+
+void GenerateItemPool() {
+    // RANDOTODO proper removal of items not in pool or logically relevant instead of dummy checks.
+    auto ctx = Rando::Context::GetInstance();
+    ItemPool.clear();
+    PendingJunkPool.clear();
+
+    // Initialize ice trap models to always major items
+    ctx->possibleIceTrapModels = {
+        RG_MIRROR_SHIELD,
+        RG_BOOMERANG,
+        RG_LENS_OF_TRUTH,
+        RG_MEGATON_HAMMER,
+        RG_IRON_BOOTS,
+        RG_HOVER_BOOTS,
+        RG_STONE_OF_AGONY,
+        RG_DINS_FIRE,
+        RG_FARORES_WIND,
+        RG_NAYRUS_LOVE,
+        RG_FIRE_ARROWS,
+        RG_ICE_ARROWS,
+        RG_LIGHT_ARROWS,
+        RG_DOUBLE_DEFENSE,
+        RG_CLAIM_CHECK,
+        RG_PROGRESSIVE_HOOKSHOT,
+        RG_PROGRESSIVE_STRENGTH,
+        RG_PROGRESSIVE_BOMB_BAG,
+        RG_PROGRESSIVE_BOW,
+        RG_PROGRESSIVE_SLINGSHOT,
+        RG_PROGRESSIVE_WALLET,
+        RG_PROGRESSIVE_SCALE,
+        RG_PROGRESSIVE_MAGIC_METER,
+    };
+    // Check song shuffle and dungeon reward shuffle just for ice traps
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE)) {
+        // Push item ids for songs
+        ctx->possibleIceTrapModels.push_back(RG_ZELDAS_LULLABY);
+        ctx->possibleIceTrapModels.push_back(RG_EPONAS_SONG);
+        ctx->possibleIceTrapModels.push_back(RG_SARIAS_SONG);
+        ctx->possibleIceTrapModels.push_back(RG_SUNS_SONG);
+        ctx->possibleIceTrapModels.push_back(RG_SONG_OF_TIME);
+        ctx->possibleIceTrapModels.push_back(RG_SONG_OF_STORMS);
+        ctx->possibleIceTrapModels.push_back(RG_MINUET_OF_FOREST);
+        ctx->possibleIceTrapModels.push_back(RG_BOLERO_OF_FIRE);
+        ctx->possibleIceTrapModels.push_back(RG_SERENADE_OF_WATER);
+        ctx->possibleIceTrapModels.push_back(RG_REQUIEM_OF_SPIRIT);
+        ctx->possibleIceTrapModels.push_back(RG_NOCTURNE_OF_SHADOW);
+        ctx->possibleIceTrapModels.push_back(RG_PRELUDE_OF_LIGHT);
+    }
+    if (ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_ANYWHERE)) {
+        // Push item ids for dungeon rewards
+        ctx->possibleIceTrapModels.push_back(RG_KOKIRI_EMERALD);
+        ctx->possibleIceTrapModels.push_back(RG_GORON_RUBY);
+        ctx->possibleIceTrapModels.push_back(RG_ZORA_SAPPHIRE);
+        ctx->possibleIceTrapModels.push_back(RG_FOREST_MEDALLION);
+        ctx->possibleIceTrapModels.push_back(RG_FIRE_MEDALLION);
+        ctx->possibleIceTrapModels.push_back(RG_WATER_MEDALLION);
+        ctx->possibleIceTrapModels.push_back(RG_SPIRIT_MEDALLION);
+        ctx->possibleIceTrapModels.push_back(RG_SHADOW_MEDALLION);
+        ctx->possibleIceTrapModels.push_back(RG_LIGHT_MEDALLION);
+    }
+
+    if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+        ctx->possibleIceTrapModels.push_back(RG_TRIFORCE_PIECE);
+        AddItemToMainPool(RG_TRIFORCE_PIECE, (ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_TOTAL).Get() + 1));
+        ctx->PlaceItemInLocation(RC_TRIFORCE_COMPLETED, RG_TRIFORCE); // Win condition
+        ctx->PlaceItemInLocation(RC_GANON, GetJunkItem(), false, true);
+    } else {
+        ctx->PlaceItemInLocation(RC_GANON, RG_TRIFORCE); // Win condition
+    }
+
+    // Fixed item locations
+    ctx->PlaceItemInLocation(RC_HC_ZELDAS_LETTER, RG_ZELDAS_LETTER);
+
+    if (ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
+        AddItemToMainPool(RG_KOKIRI_SWORD);
+        ctx->possibleIceTrapModels.push_back(RG_KOKIRI_SWORD);
+    } else {
+        if (!ctx->GetOption(RSK_STARTING_KOKIRI_SWORD)) {
+            ctx->PlaceItemInLocation(RC_KF_KOKIRI_SWORD_CHEST, RG_KOKIRI_SWORD, false, true);
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
+        AddItemToMainPool(RG_MASTER_SWORD);
+        ctx->possibleIceTrapModels.push_back(RG_MASTER_SWORD);
+    } else {
+        if (!ctx->GetOption(RSK_STARTING_MASTER_SWORD)) {
+            ctx->PlaceItemInLocation(RC_TOT_MASTER_SWORD, RG_MASTER_SWORD, false, true);
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG)) {
+        AddItemToMainPool(RG_WEIRD_EGG);
+        ctx->possibleIceTrapModels.push_back(RG_WEIRD_EGG);
+    } else {
+        ctx->PlaceItemInLocation(RC_HC_MALON_EGG, RG_WEIRD_EGG, false, true);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_OCARINA)) {
+        AddItemToMainPool(RG_PROGRESSIVE_OCARINA, 2);
+        if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+            AddItemToPool(PendingJunkPool, RG_PROGRESSIVE_OCARINA);
+        }
+        ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_OCARINA);
+    } else {
+        if (ctx->GetOption(RSK_STARTING_OCARINA).Is(RO_STARTING_OCARINA_OFF)) {
+            ctx->PlaceItemInLocation(RC_LW_GIFT_FROM_SARIA, RG_PROGRESSIVE_OCARINA, false, true);
+            ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
+        } else {
+            if (ctx->GetOption(RSK_STARTING_OCARINA).IsNot(RO_STARTING_OCARINA_TIME)) {
+                ctx->PlaceItemInLocation(RC_HF_OCARINA_OF_TIME_ITEM, RG_PROGRESSIVE_OCARINA, false, true);
+            }
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS)) {
+        AddItemToMainPool(RG_OCARINA_A_BUTTON);
+        AddItemToMainPool(RG_OCARINA_C_UP_BUTTON);
+        AddItemToMainPool(RG_OCARINA_C_DOWN_BUTTON);
+        AddItemToMainPool(RG_OCARINA_C_LEFT_BUTTON);
+        AddItemToMainPool(RG_OCARINA_C_RIGHT_BUTTON);
+
+        ctx->possibleIceTrapModels.push_back(RG_OCARINA_A_BUTTON);
+        ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_UP_BUTTON);
+        ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_DOWN_BUTTON);
+        ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_LEFT_BUTTON);
+        ctx->possibleIceTrapModels.push_back(RG_OCARINA_C_RIGHT_BUTTON);
+    }
+
+    if (ctx->GetOption(RSK_SKELETON_KEY)) {
+        AddItemToMainPool(RG_SKELETON_KEY);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_SWIM)) {
+        AddItemToMainPool(RG_PROGRESSIVE_SCALE);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {
+        // 32 total beehive locations
+        AddItemToPool(PendingJunkPool, RG_RED_RUPEE, 23);
+        AddItemToPool(PendingJunkPool, RG_BLUE_RUPEE, 9);
+    }
+
+    // Shuffle Pots
+    bool overworldPotsActive = ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD) ||
+                               ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_ALL);
+    bool dungeonPotsActive = ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS) ||
+                             ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_ALL);
+    PlaceItemsForType(RCTYPE_POT, overworldPotsActive, dungeonPotsActive);
+
+    // Shuffle Crates
+    bool overworldCratesActive = ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_OVERWORLD) ||
+                                 ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_ALL);
+    bool overworldNLCratesActive = ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC) &&
+                                   (ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_OVERWORLD) ||
+                                    ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_ALL));
+    bool dungeonCratesActive = ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_DUNGEONS) ||
+                               ctx->GetOption(RSK_SHUFFLE_CRATES).Is(RO_SHUFFLE_CRATES_ALL);
+    PlaceItemsForType(RCTYPE_CRATE, overworldCratesActive, dungeonCratesActive);
+    PlaceItemsForType(RCTYPE_NLCRATE, overworldNLCratesActive, dungeonCratesActive);
+    PlaceItemsForType(RCTYPE_SMALL_CRATE, overworldCratesActive, dungeonCratesActive);
+
+    auto fsMode = ctx->GetOption(RSK_FISHSANITY);
+    if (fsMode.IsNot(RO_FISHSANITY_OFF)) {
+        if (fsMode.Is(RO_FISHSANITY_POND) || fsMode.Is(RO_FISHSANITY_BOTH)) {
+            // 17 max child pond fish
+            uint8_t pondCt = ctx->GetOption(RSK_FISHSANITY_POND_COUNT).Get();
+            for (uint8_t i = 0; i < pondCt; i++) {
+                AddItemToMainPool(GetJunkItem());
+            }
+
+            if (ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT)) {
+                // 16 max adult pond fish, have to reduce to 16 if every fish is enabled
+                if (pondCt > 16)
+                    pondCt = 16;
+                for (uint8_t i = 0; i < pondCt; i++) {
+                    AddItemToMainPool(GetJunkItem());
+                }
+            }
+        }
+        // 9 grotto fish, 5 zora's domain fish
+        if (fsMode.Is(RO_FISHSANITY_OVERWORLD) || fsMode.Is(RO_FISHSANITY_BOTH)) {
+            for (uint8_t i = 0; i < Rando::StaticData::GetOverworldFishLocations().size(); i++)
+                AddItemToMainPool(GetJunkItem());
+        }
+
+        if (fsMode.Is(RO_FISHSANITY_HYRULE_LOACH)) {
+            AddItemToMainPool(RG_PURPLE_RUPEE);
+        } else {
+            ctx->PlaceItemInLocation(RC_LH_HYRULE_LOACH, RG_PURPLE_RUPEE, false, true);
+        }
     }
 
     if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE)) {
-      AddItemToPool(PendingJunkPool, RG_FISHING_POLE);
+        AddItemToMainPool(RG_FISHING_POLE);
+        ctx->possibleIceTrapModels.push_back(RG_FISHING_POLE);
     }
 
-    //Plentiful small keys
-    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
-      if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::WATER_TEMPLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUND_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUND_SMALL_KEY);
-      }
-      if (ctx->GetDungeon(Rando::GANONS_CASTLE)->HasKeyRing()) {
-        AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_KEY_RING);
-      } else {
-        AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_SMALL_KEY);
-      } 
+    if (ctx->GetOption(RSK_INFINITE_UPGRADES).Is(RO_INF_UPGRADES_PROGRESSIVE)) {
+        AddItemToMainPool(RG_PROGRESSIVE_BOMB_BAG);
+        AddItemToMainPool(RG_PROGRESSIVE_BOW);
+        AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
+        AddItemToMainPool(RG_PROGRESSIVE_SLINGSHOT);
+        AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
+        AddItemToMainPool(RG_PROGRESSIVE_MAGIC_METER);
+        AddItemToMainPool(RG_PROGRESSIVE_WALLET);
     }
 
-    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
-      AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_BOSS_KEY);
-      AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_BOSS_KEY);
-    }
-
-    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
-      AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_BOSS_KEY);
-    }
-  }
-
-  if (ctx->GetOption(RSK_LOCK_OVERWORLD_DOORS)) {
-    AddItemToPool(ItemPool, RG_GUARD_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_MARKET_BAZAAR_KEY);
-    AddItemToPool(ItemPool, RG_MARKET_POTION_SHOP_KEY);
-    AddItemToPool(ItemPool, RG_MASK_SHOP_KEY);
-    AddItemToPool(ItemPool, RG_MARKET_SHOOTING_GALLERY_KEY);
-    AddItemToPool(ItemPool, RG_BOMBCHU_BOWLING_KEY);
-    AddItemToPool(ItemPool, RG_TREASURE_CHEST_GAME_BUILDING_KEY);
-    AddItemToPool(ItemPool, RG_BOMBCHU_SHOP_KEY);
-    AddItemToPool(ItemPool, RG_RICHARDS_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_ALLEY_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_KAK_BAZAAR_KEY);
-    AddItemToPool(ItemPool, RG_KAK_POTION_SHOP_KEY);
-    AddItemToPool(ItemPool, RG_BOSS_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_GRANNYS_POTION_SHOP_KEY);
-    AddItemToPool(ItemPool, RG_SKULLTULA_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_IMPAS_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_WINDMILL_KEY);
-    AddItemToPool(ItemPool, RG_KAK_SHOOTING_GALLERY_KEY);
-    AddItemToPool(ItemPool, RG_DAMPES_HUT_KEY);
-    AddItemToPool(ItemPool, RG_TALONS_HOUSE_KEY);
-    AddItemToPool(ItemPool, RG_STABLES_KEY);
-    AddItemToPool(ItemPool, RG_BACK_TOWER_KEY);
-    AddItemToPool(ItemPool, RG_HYLIA_LAB_KEY);
-    AddItemToPool(ItemPool, RG_FISHING_HOLE_KEY);
-  }
-
-  //Shopsanity
-  if (
-    ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
-    (
-      ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
-      ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
-    )
-  ) {
-    AddItemsToPool(ItemPool, normalRupees);
-  } else {
-    AddItemsToPool(ItemPool, shopsanityRupees); //Shopsanity gets extra large rupees
-  }
-
-  // Shuffle Fairies
-  if (ctx->GetOption(RSK_SHUFFLE_FAIRIES)) {
-    for (auto rc : Rando::StaticData::GetOverworldFairyLocations()) {
-      AddItemToMainPool(GetJunkItem());
-    }
-    // 8 extra for Ganon's Castle + 2 Dodongo's Cavern Gossip Stone + 3 Shadow Temple
-    int extra = 13;
-    extra += ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla() ? 0 : 2;
-    extra += ctx->GetDungeon(Rando::WATER_TEMPLE)->IsVanilla() ? 0 : 3;
-    extra += ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsVanilla() ? 2 : 1;
-    extra += ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() ? 1 : 2;
-    extra += ctx->GetDungeon(Rando::ICE_CAVERN)->IsVanilla() ? 1 : 0;
-    extra += ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsVanilla() ? 1 : 0;
-    extra += ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla() ? 1 : 0;
-    for (int i = 0; i < extra; i++) {
-      AddItemToMainPool(GetJunkItem());
-    }
-  }
-
-  //Scrubsanity
-  if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
-    //Deku Tree
-    if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
-      AddItemToMainPool(RG_DEKU_SHIELD);
-    }
-
-    //Dodongos Cavern
-    AddItemToMainPool(RG_DEKU_STICK_1);
-    AddItemToMainPool(RG_DEKU_SHIELD);
-    if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
-      AddItemToMainPool(RG_RECOVERY_HEART);
-    } else {
-      AddItemToMainPool(RG_DEKU_NUTS_5);
-    }
-
-    //Jabu Jabus Belly
-    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsVanilla()) {
-      AddItemToMainPool(RG_DEKU_NUTS_5);
-    }
-
-    //Ganons Castle
-    AddItemToMainPool(RG_BOMBS_5);
-    AddItemToMainPool(RG_RECOVERY_HEART);
-    AddItemToMainPool(RG_BLUE_RUPEE);
-    if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
-      AddItemToMainPool(RG_DEKU_NUTS_5);
-    }
-
-    //Overworld Scrubs
-    AddItemsToPool(ItemPool, dekuScrubItems);
-
-    //Scrubs which sell seeds or arrows sell it based on age, this randomly assigns them
-    for (uint8_t i = 0; i < 7; i++) {
-      if (Random(0, 3)) {
-        AddItemToMainPool(RG_ARROWS_30);
-      } else {
-        AddItemToMainPool(RG_DEKU_SEEDS_30);
-      }
-    }
-  }
-
-  bool overworldFreeStandingActive = ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_OVERWORLD) ||
-                             ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_ALL);
-  bool dungeonFreeStandingActive = ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_DUNGEONS) ||
-                           ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_ALL);
-  PlaceItemsForType(RCTYPE_FREESTANDING, overworldFreeStandingActive, dungeonFreeStandingActive);
-
-  AddItemsToPool(ItemPool, alwaysItems);
-  AddItemsToPool(ItemPool, dungeonRewards);
-
-  //Dungeon pools
-  if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
-    AddItemsToPool(ItemPool, DT_MQ);
-  } else {
-    AddItemsToPool(ItemPool, DT_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
-    AddItemsToPool(ItemPool, DC_MQ);
-  } else {
-    AddItemsToPool(ItemPool, DC_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
-    AddItemsToPool(ItemPool, JB_MQ);
-  }
-  if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->IsMQ()) {
-    AddItemsToPool(ItemPool, FoT_MQ);
-  } else {
-    AddItemsToPool(ItemPool, FoT_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ()) {
-    AddItemsToPool(ItemPool, FiT_MQ);
-  } else {
-    AddItemsToPool(ItemPool, FiT_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
-    AddItemsToPool(ItemPool, SpT_MQ);
-  } else {
-    AddItemsToPool(ItemPool, SpT_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsMQ()) {
-    AddItemsToPool(ItemPool, ShT_MQ);
-  } else {
-    AddItemsToPool(ItemPool, ShT_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
-    AddItemsToPool(ItemPool, BW_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsMQ()) {
-    AddItemsToPool(ItemPool, GTG_MQ);
-  } else {
-    AddItemsToPool(ItemPool, GTG_Vanilla);
-  }
-  if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
-    AddItemsToPool(ItemPool, GC_MQ);
-  } else {
-    AddItemsToPool(ItemPool, GC_Vanilla);
-  }
-
-  uint8_t rutoBottles = 1;
-  if (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN)) {
-    rutoBottles = 0;
-  }
-
-  //Add 4 total bottles
-  uint8_t bottleCount = 4;
-  std::vector<RandomizerGet> bottles;
-  bottles.assign(normalBottles.begin(), normalBottles.end());
-  ctx->possibleIceTrapModels.push_back(
-      Rando::StaticData::RetrieveItem(RandomElement(bottles)).GetRandomizerGet()); // Get one random bottle type for ice traps
-  for (uint8_t i = 0; i < bottleCount; i++) {
-    if (i >= rutoBottles) {
-      if ((i == bottleCount - 1) && 
-          (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
-           ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
-        AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION);
-      } else {
-        AddRandomBottle(bottles);
-      }
-    } else {
-      AddItemToMainPool(RG_RUTOS_LETTER);
-    }
-  }
-
-  //add extra songs only if song shuffle is anywhere
-  AddItemsToPool(ItemPool, songList);
-  if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE) && ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-    AddItemsToPool(PendingJunkPool, songList);
-  }
-
-  /*For item pool generation, dungeon items are either placed in their vanilla
-  | location, or added to the pool now and filtered out later depending on when
-  | they need to get placed or removed in fill.cpp. These items are kept in the
-  | pool until removal because the filling algorithm needs to know all of the
-  | advancement items that haven't been placed yet for placing higher priority
-  | items like stones/medallions.*/
-
-  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
-    PlaceVanillaMapsAndCompasses();
-  } else  {
-    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      if (dungeon->GetMap() != RG_NONE) {
-        AddItemToMainPool(dungeon->GetMap());
-      }
-
-      if (dungeon->GetCompass() != RG_NONE) {
-        AddItemToMainPool(dungeon->GetCompass());
-      }
-    }
-  }
-
-  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
-    PlaceVanillaSmallKeys();
-  } else {
-    for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      if (dungeon->HasKeyRing() && ctx->GetOption(RSK_KEYSANITY).IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
-        AddItemToMainPool(dungeon->GetKeyRing());
-      } else if (dungeon->GetSmallKeyCount() > 0) {
-        AddItemToMainPool(dungeon->GetSmallKey(), dungeon->GetSmallKeyCount());
-      }
-    }
-  }
-
-  if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
-    PlaceVanillaBossKeys();
-  } else {
-    AddItemToMainPool(RG_FOREST_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(RG_FIRE_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(RG_WATER_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(RG_SPIRIT_TEMPLE_BOSS_KEY);
-    AddItemToMainPool(RG_SHADOW_TEMPLE_BOSS_KEY);
-  }
-
-  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
-    ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_GANONS_CASTLE_BOSS_KEY);
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Get() >= RO_GANON_BOSS_KEY_LACS_VANILLA && ctx->GetOption(RSK_GANONS_BOSS_KEY).IsNot(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
-    ctx->PlaceItemInLocation(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_GANONS_CASTLE_BOSS_KEY);
-  } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
-    ctx->PlaceItemInLocation(RC_GANONS_TOWER_BOSS_KEY_CHEST, RG_GANONS_CASTLE_BOSS_KEY);
-  } else {
-    AddItemToMainPool(RG_GANONS_CASTLE_BOSS_KEY);
-  }
-
-  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
-    AddItemsToPool(ItemPool, easyItems);
-  } else {
-    AddItemsToPool(ItemPool, normalItems);
-  }
-
-  if (!ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
-    ReplaceMaxItem(RG_KOKIRI_SWORD, 0);
-  }
-
-  if (!ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
-    ReplaceMaxItem(RG_MASTER_SWORD, 0);
-  }
-
-  if (/*ProgressiveGoronSword TODO: Implement Setting*/false) {
-    ReplaceMaxItem(RG_BIGGORON_SWORD, 0);
-    AddItemToMainPool(RG_PROGRESSIVE_GORONSWORD, 2);
-    ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_GORONSWORD);
-  } else {
-    ctx->possibleIceTrapModels.push_back(RG_BIGGORON_SWORD);
-  }
-
-  //Replace ice traps with junk from the pending junk pool if necessary
-  if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_OFF)) {
-    ReplaceMaxItem(RG_ICE_TRAP, 0);
-  }
-  //Replace all junk items with ice traps for onslaught mode
-  else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
-    for (uint8_t i = 0; i < JunkPoolItems.size() - 3; i++) { // -3 Omits Huge Rupees and Deku Nuts 10
-      ReplaceMaxItem(JunkPoolItems[i], 0);
-    }
-  }
-
-  if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_SCARCE)) {
-    SetScarceItemPool();
-  } else if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_MINIMAL)) {
-    SetMinimalItemPool();
-  } else if (/*RemoveDoubleDefense TODO: Implement setting*/ false) {
-    ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
-  }
-
-  //this feels ugly and there's probably a better way, but
-  //it replaces random junk with pending junk.
-  bool junkSet;
-  for (RandomizerGet pendingJunk : PendingJunkPool) {
-    junkSet = false;
-    for (RandomizerGet& item : ItemPool) {
-      for (RandomizerGet junk : JunkPoolItems) {
-        if (item == junk && item != RG_HUGE_RUPEE && item != RG_DEKU_NUTS_10) {
-          item = pendingJunk;
-          junkSet = true;
-          break;
+    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
+        AddItemToMainPool(RG_MAGIC_BEAN_PACK);
+        if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+            AddItemToPool(PendingJunkPool, RG_MAGIC_BEAN_PACK);
         }
-      }
-      if (junkSet) break;
+        ctx->possibleIceTrapModels.push_back(RG_MAGIC_BEAN_PACK);
+    } else {
+        ctx->PlaceItemInLocation(RC_ZR_MAGIC_BEAN_SALESMAN, RG_MAGIC_BEAN, false, true);
     }
-  }
-  PendingJunkPool.clear();
-}
 
-void AddJunk() {
-  SPDLOG_DEBUG("HAD TO PLACE EXTRA JUNK ");
-  AddItemToMainPool(GetPendingJunkItem());
+    if (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+        ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) {
+        if (/*!ProgressiveGoronSword TODO: Implement Progressive Goron Sword*/ true) {
+            AddItemToMainPool(RG_GIANTS_KNIFE);
+        }
+        if (ctx->GetOption(RSK_BOMBCHU_BAG)) {
+            AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS);
+        } else {
+            AddItemToMainPool(RG_BOMBCHU_10);
+        }
+    } else {
+        ctx->PlaceItemInLocation(RC_KAK_GRANNYS_SHOP, RG_BLUE_POTION_REFILL, false, true);
+        ctx->PlaceItemInLocation(RC_GC_MEDIGORON, RG_GIANTS_KNIFE, false, true);
+        ctx->PlaceItemInLocation(RC_WASTELAND_BOMBCHU_SALESMAN, RG_BOMBCHU_10, false, true);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_FROG_SONG_RUPEES)) {
+        AddItemToMainPool(RG_PURPLE_RUPEE, 5);
+    } else {
+        ctx->PlaceItemInLocation(RC_ZR_FROGS_ZELDAS_LULLABY, RG_PURPLE_RUPEE, false, true);
+        ctx->PlaceItemInLocation(RC_ZR_FROGS_EPONAS_SONG, RG_PURPLE_RUPEE, false, true);
+        ctx->PlaceItemInLocation(RC_ZR_FROGS_SARIAS_SONG, RG_PURPLE_RUPEE, false, true);
+        ctx->PlaceItemInLocation(RC_ZR_FROGS_SUNS_SONG, RG_PURPLE_RUPEE, false, true);
+        ctx->PlaceItemInLocation(RC_ZR_FROGS_SONG_OF_TIME, RG_PURPLE_RUPEE, false, true);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)) {
+        AddItemToMainPool(RG_POCKET_EGG);
+        AddItemToMainPool(RG_COJIRO);
+        AddItemToMainPool(RG_ODD_MUSHROOM);
+        AddItemToMainPool(RG_ODD_POTION);
+        AddItemToMainPool(RG_POACHERS_SAW);
+        AddItemToMainPool(RG_BROKEN_SWORD);
+        AddItemToMainPool(RG_PRESCRIPTION);
+        AddItemToMainPool(RG_EYEBALL_FROG);
+        AddItemToMainPool(RG_EYEDROPS);
+    }
+    AddItemToMainPool(RG_CLAIM_CHECK);
+
+    if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS)) {
+        AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY, 6); // 6 individual keys
+    } else if (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK)) {
+        AddItemToMainPool(RG_TREASURE_GAME_SMALL_KEY); // 1 key which will behave as a pack of 6
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
+        for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
+            ctx->PlaceItemInLocation(loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
+        }
+    } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_DUNGEONS)) {
+        for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
+            if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
+                ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
+            } else {
+                AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
+            }
+        }
+    } else if (ctx->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OVERWORLD)) {
+        for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, RCTYPE_SKULL_TOKEN)) {
+            if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
+                ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GOLD_SKULLTULA_TOKEN, false, true);
+            } else {
+                AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN);
+            }
+        }
+    } else {
+        AddItemToMainPool(RG_GOLD_SKULLTULA_TOKEN, 100);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_100_GS_REWARD)) {
+        if (ctx->GetOption(RSK_SHUFFLE_TOKENS).IsNot(RO_TOKENSANITY_OFF) &&
+            ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+            AddItemToPool(PendingJunkPool, RG_GOLD_SKULLTULA_TOKEN, 10);
+        }
+        AddItemToMainPool(RG_HUGE_RUPEE);
+    } else {
+        ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_HUGE_RUPEE, false, true);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
+        AddItemToMainPool(RG_GOHMA_SOUL);
+        AddItemToMainPool(RG_KING_DODONGO_SOUL);
+        AddItemToMainPool(RG_BARINADE_SOUL);
+        AddItemToMainPool(RG_PHANTOM_GANON_SOUL);
+        AddItemToMainPool(RG_VOLVAGIA_SOUL);
+        AddItemToMainPool(RG_MORPHA_SOUL);
+        AddItemToMainPool(RG_BONGO_BONGO_SOUL);
+        AddItemToMainPool(RG_TWINROVA_SOUL);
+
+        ctx->possibleIceTrapModels.push_back(RG_GOHMA_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_KING_DODONGO_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_BARINADE_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_PHANTOM_GANON_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_VOLVAGIA_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_MORPHA_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_BONGO_BONGO_SOUL);
+        ctx->possibleIceTrapModels.push_back(RG_TWINROVA_SOUL);
+        if (ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON)) {
+            AddItemToMainPool(RG_GANON_SOUL);
+            ctx->possibleIceTrapModels.push_back(RG_GANON_SOUL);
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET)) {
+        AddItemToMainPool(RG_PROGRESSIVE_WALLET);
+    }
+
+    if (ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET)) {
+        AddItemToMainPool(RG_PROGRESSIVE_WALLET);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG)) {
+        AddItemToMainPool(RG_PROGRESSIVE_STICK_UPGRADE);
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG)) {
+        AddItemToMainPool(RG_PROGRESSIVE_NUT_UPGRADE);
+    }
+
+    if (ctx->GetOption(RSK_BOMBCHU_BAG)) {
+        AddItemToMainPool(RG_PROGRESSIVE_BOMBCHUS, 5);
+    } else {
+        AddItemToMainPool(RG_BOMBCHU_5);
+        AddItemToMainPool(RG_BOMBCHU_10, 3);
+        AddItemToMainPool(RG_BOMBCHU_20);
+    }
+
+    // Ice Traps
+    AddItemToMainPool(RG_ICE_TRAP);
+    if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsVanilla()) {
+        AddItemToMainPool(RG_ICE_TRAP);
+    }
+    if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla()) {
+        AddItemToMainPool(RG_ICE_TRAP, 4);
+    }
+
+    // Gerudo Fortress
+    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE)) {
+        ctx->PlaceItemInLocation(RC_TH_1_TORCH_CARPENTER, RG_RECOVERY_HEART, false, true);
+        ctx->PlaceItemInLocation(RC_TH_DEAD_END_CARPENTER, RG_RECOVERY_HEART, false, true);
+        ctx->PlaceItemInLocation(RC_TH_DOUBLE_CELL_CARPENTER, RG_RECOVERY_HEART, false, true);
+        ctx->PlaceItemInLocation(RC_TH_STEEP_SLOPE_CARPENTER, RG_RECOVERY_HEART, false, true);
+    } else if (ctx->GetOption(RSK_GERUDO_KEYS).IsNot(RO_GERUDO_KEYS_VANILLA)) {
+        if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)) {
+            AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY);
+            ctx->PlaceItemInLocation(RC_TH_DEAD_END_CARPENTER, RG_RECOVERY_HEART, false, true);
+            ctx->PlaceItemInLocation(RC_TH_DOUBLE_CELL_CARPENTER, RG_RECOVERY_HEART, false, true);
+            ctx->PlaceItemInLocation(RC_TH_STEEP_SLOPE_CARPENTER, RG_RECOVERY_HEART, false, true);
+        } else {
+            // Only add key ring if 4 Fortress keys necessary
+            if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS) && ctx->GetOption(RSK_KEYRINGS)) {
+                AddItemToMainPool(RG_GERUDO_FORTRESS_KEY_RING);
+                // Add junk to make up for missing keys
+                for (uint8_t i = 0; i < 3; i++) {
+                    AddItemToMainPool(GetJunkItem());
+                }
+            } else {
+                AddItemToMainPool(RG_GERUDO_FORTRESS_SMALL_KEY, 4);
+            }
+        }
+        if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+            if (ctx->GetOption(RSK_KEYRINGS_GERUDO_FORTRESS) &&
+                ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && ctx->GetOption(RSK_KEYRINGS)) {
+                AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_GERUDO_FORTRESS_SMALL_KEY);
+            }
+        }
+    } else {
+        if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)) {
+            ctx->PlaceItemInLocation(RC_TH_1_TORCH_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+            ctx->PlaceItemInLocation(RC_TH_DEAD_END_CARPENTER, RG_RECOVERY_HEART, false, true);
+            ctx->PlaceItemInLocation(RC_TH_DOUBLE_CELL_CARPENTER, RG_RECOVERY_HEART, false, true);
+            ctx->PlaceItemInLocation(RC_TH_STEEP_SLOPE_CARPENTER, RG_RECOVERY_HEART, false, true);
+        } else {
+            ctx->PlaceItemInLocation(RC_TH_1_TORCH_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+            ctx->PlaceItemInLocation(RC_TH_DEAD_END_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+            ctx->PlaceItemInLocation(RC_TH_DOUBLE_CELL_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+            ctx->PlaceItemInLocation(RC_TH_STEEP_SLOPE_CARPENTER, RG_GERUDO_FORTRESS_SMALL_KEY, false, true);
+        }
+    }
+
+    // Gerudo Membership Card
+    if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) &&
+        ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_CARPENTERS_FREE)) {
+        AddItemToMainPool(RG_GERUDO_MEMBERSHIP_CARD);
+        ctx->possibleIceTrapModels.push_back(RG_GERUDO_MEMBERSHIP_CARD);
+    } else if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
+        AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
+        ctx->PlaceItemInLocation(RC_TH_FREED_CARPENTERS, RG_ICE_TRAP, false, true);
+    } else {
+        ctx->PlaceItemInLocation(RC_TH_FREED_CARPENTERS, RG_GERUDO_MEMBERSHIP_CARD, false, true);
+    }
+
+    // Keys
+
+    // For key rings, need to add as many junk items as "missing" keys
+    if (ctx->GetOption(RSK_KEYRINGS).IsNot(RO_KEYRINGS_OFF)) {
+        uint8_t ringJunkAmt = 0;
+        for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            if (dungeon->HasKeyRing()) {
+                ringJunkAmt += dungeon->GetSmallKeyCount() - 1;
+            }
+        }
+        for (uint8_t i = 0; i < ringJunkAmt; i++) {
+            AddItemToMainPool(GetJunkItem());
+        }
+    }
+
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+        if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
+            AddItemToPool(PendingJunkPool, RG_GERUDO_MEMBERSHIP_CARD);
+        }
+
+        if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE)) {
+            AddItemToPool(PendingJunkPool, RG_FISHING_POLE);
+        }
+
+        // Plentiful small keys
+        if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) ||
+            ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) ||
+            ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+            if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_BOTTOM_OF_THE_WELL_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::WATER_TEMPLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUND_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_GERUDO_TRAINING_GROUND_SMALL_KEY);
+            }
+            if (ctx->GetDungeon(Rando::GANONS_CASTLE)->HasKeyRing()) {
+                AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_KEY_RING);
+            } else {
+                AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_SMALL_KEY);
+            }
+        }
+
+        if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) ||
+            ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON) ||
+            ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD)) {
+            AddItemToPool(PendingJunkPool, RG_FOREST_TEMPLE_BOSS_KEY);
+            AddItemToPool(PendingJunkPool, RG_FIRE_TEMPLE_BOSS_KEY);
+            AddItemToPool(PendingJunkPool, RG_WATER_TEMPLE_BOSS_KEY);
+            AddItemToPool(PendingJunkPool, RG_SPIRIT_TEMPLE_BOSS_KEY);
+            AddItemToPool(PendingJunkPool, RG_SHADOW_TEMPLE_BOSS_KEY);
+        }
+
+        if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE) ||
+            ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON) ||
+            ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
+            AddItemToPool(PendingJunkPool, RG_GANONS_CASTLE_BOSS_KEY);
+        }
+    }
+
+    if (ctx->GetOption(RSK_LOCK_OVERWORLD_DOORS)) {
+        AddItemToPool(ItemPool, RG_GUARD_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_MARKET_BAZAAR_KEY);
+        AddItemToPool(ItemPool, RG_MARKET_POTION_SHOP_KEY);
+        AddItemToPool(ItemPool, RG_MASK_SHOP_KEY);
+        AddItemToPool(ItemPool, RG_MARKET_SHOOTING_GALLERY_KEY);
+        AddItemToPool(ItemPool, RG_BOMBCHU_BOWLING_KEY);
+        AddItemToPool(ItemPool, RG_TREASURE_CHEST_GAME_BUILDING_KEY);
+        AddItemToPool(ItemPool, RG_BOMBCHU_SHOP_KEY);
+        AddItemToPool(ItemPool, RG_RICHARDS_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_ALLEY_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_KAK_BAZAAR_KEY);
+        AddItemToPool(ItemPool, RG_KAK_POTION_SHOP_KEY);
+        AddItemToPool(ItemPool, RG_BOSS_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_GRANNYS_POTION_SHOP_KEY);
+        AddItemToPool(ItemPool, RG_SKULLTULA_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_IMPAS_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_WINDMILL_KEY);
+        AddItemToPool(ItemPool, RG_KAK_SHOOTING_GALLERY_KEY);
+        AddItemToPool(ItemPool, RG_DAMPES_HUT_KEY);
+        AddItemToPool(ItemPool, RG_TALONS_HOUSE_KEY);
+        AddItemToPool(ItemPool, RG_STABLES_KEY);
+        AddItemToPool(ItemPool, RG_BACK_TOWER_KEY);
+        AddItemToPool(ItemPool, RG_HYLIA_LAB_KEY);
+        AddItemToPool(ItemPool, RG_FISHING_HOLE_KEY);
+    }
+
+    // Shopsanity
+    if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
+        (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
+         ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS))) {
+        AddItemsToPool(ItemPool, normalRupees);
+    } else {
+        AddItemsToPool(ItemPool, shopsanityRupees); // Shopsanity gets extra large rupees
+    }
+
+    // Shuffle Fairies
+    if (ctx->GetOption(RSK_SHUFFLE_FAIRIES)) {
+        for (auto rc : Rando::StaticData::GetOverworldFairyLocations()) {
+            AddItemToMainPool(GetJunkItem());
+        }
+        // 8 extra for Ganon's Castle + 2 Dodongo's Cavern Gossip Stone + 3 Shadow Temple
+        int extra = 13;
+        extra += ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla() ? 0 : 2;
+        extra += ctx->GetDungeon(Rando::WATER_TEMPLE)->IsVanilla() ? 0 : 3;
+        extra += ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsVanilla() ? 2 : 1;
+        extra += ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() ? 1 : 2;
+        extra += ctx->GetDungeon(Rando::ICE_CAVERN)->IsVanilla() ? 1 : 0;
+        extra += ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsVanilla() ? 1 : 0;
+        extra += ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla() ? 1 : 0;
+        for (int i = 0; i < extra; i++) {
+            AddItemToMainPool(GetJunkItem());
+        }
+    }
+
+    // Scrubsanity
+    if (ctx->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_ALL)) {
+        // Deku Tree
+        if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
+            AddItemToMainPool(RG_DEKU_SHIELD);
+        }
+
+        // Dodongos Cavern
+        AddItemToMainPool(RG_DEKU_STICK_1);
+        AddItemToMainPool(RG_DEKU_SHIELD);
+        if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
+            AddItemToMainPool(RG_RECOVERY_HEART);
+        } else {
+            AddItemToMainPool(RG_DEKU_NUTS_5);
+        }
+
+        // Jabu Jabus Belly
+        if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsVanilla()) {
+            AddItemToMainPool(RG_DEKU_NUTS_5);
+        }
+
+        // Ganons Castle
+        AddItemToMainPool(RG_BOMBS_5);
+        AddItemToMainPool(RG_RECOVERY_HEART);
+        AddItemToMainPool(RG_BLUE_RUPEE);
+        if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
+            AddItemToMainPool(RG_DEKU_NUTS_5);
+        }
+
+        // Overworld Scrubs
+        AddItemsToPool(ItemPool, dekuScrubItems);
+
+        // Scrubs which sell seeds or arrows sell it based on age, this randomly assigns them
+        for (uint8_t i = 0; i < 7; i++) {
+            if (Random(0, 3)) {
+                AddItemToMainPool(RG_ARROWS_30);
+            } else {
+                AddItemToMainPool(RG_DEKU_SEEDS_30);
+            }
+        }
+    }
+
+    bool overworldFreeStandingActive = ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_OVERWORLD) ||
+                                       ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_ALL);
+    bool dungeonFreeStandingActive = ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_DUNGEONS) ||
+                                     ctx->GetOption(RSK_SHUFFLE_FREESTANDING).Is(RO_SHUFFLE_FREESTANDING_ALL);
+    PlaceItemsForType(RCTYPE_FREESTANDING, overworldFreeStandingActive, dungeonFreeStandingActive);
+
+    AddItemsToPool(ItemPool, alwaysItems);
+    AddItemsToPool(ItemPool, dungeonRewards);
+
+    // Dungeon pools
+    if (ctx->GetDungeon(Rando::DEKU_TREE)->IsMQ()) {
+        AddItemsToPool(ItemPool, DT_MQ);
+    } else {
+        AddItemsToPool(ItemPool, DT_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ()) {
+        AddItemsToPool(ItemPool, DC_MQ);
+    } else {
+        AddItemsToPool(ItemPool, DC_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::JABU_JABUS_BELLY)->IsMQ()) {
+        AddItemsToPool(ItemPool, JB_MQ);
+    }
+    if (ctx->GetDungeon(Rando::FOREST_TEMPLE)->IsMQ()) {
+        AddItemsToPool(ItemPool, FoT_MQ);
+    } else {
+        AddItemsToPool(ItemPool, FoT_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsMQ()) {
+        AddItemsToPool(ItemPool, FiT_MQ);
+    } else {
+        AddItemsToPool(ItemPool, FiT_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
+        AddItemsToPool(ItemPool, SpT_MQ);
+    } else {
+        AddItemsToPool(ItemPool, SpT_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsMQ()) {
+        AddItemsToPool(ItemPool, ShT_MQ);
+    } else {
+        AddItemsToPool(ItemPool, ShT_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla()) {
+        AddItemsToPool(ItemPool, BW_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsMQ()) {
+        AddItemsToPool(ItemPool, GTG_MQ);
+    } else {
+        AddItemsToPool(ItemPool, GTG_Vanilla);
+    }
+    if (ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ()) {
+        AddItemsToPool(ItemPool, GC_MQ);
+    } else {
+        AddItemsToPool(ItemPool, GC_Vanilla);
+    }
+
+    uint8_t rutoBottles = 1;
+    if (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN)) {
+        rutoBottles = 0;
+    }
+
+    // Add 4 total bottles
+    uint8_t bottleCount = 4;
+    std::vector<RandomizerGet> bottles;
+    bottles.assign(normalBottles.begin(), normalBottles.end());
+    ctx->possibleIceTrapModels.push_back(Rando::StaticData::RetrieveItem(RandomElement(bottles))
+                                             .GetRandomizerGet()); // Get one random bottle type for ice traps
+    for (uint8_t i = 0; i < bottleCount; i++) {
+        if (i >= rutoBottles) {
+            if ((i == bottleCount - 1) &&
+                (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+                 ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
+                AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION);
+            } else {
+                AddRandomBottle(bottles);
+            }
+        } else {
+            AddItemToMainPool(RG_RUTOS_LETTER);
+        }
+    }
+
+    if (ctx->GetOption(RSK_SHUFFLE_SONGS).IsNot(RO_SONG_SHUFFLE_OFF)) {
+        AddItemsToPool(ItemPool, songList);
+        // add extra songs only if song shuffle is anywhere
+        if (ctx->GetOption(RSK_SHUFFLE_SONGS).Is(RO_SONG_SHUFFLE_ANYWHERE) &&
+            ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+            AddItemsToPool(PendingJunkPool, songList);
+        }
+    } else {
+        ctx->PlaceItemInLocation(RC_SHEIK_IN_FOREST, RG_MINUET_OF_FOREST, false, true);
+        ctx->PlaceItemInLocation(RC_SHEIK_IN_CRATER, RG_BOLERO_OF_FIRE, false, true);
+        ctx->PlaceItemInLocation(RC_SHEIK_IN_ICE_CAVERN, RG_SERENADE_OF_WATER, false, true);
+        ctx->PlaceItemInLocation(RC_SHEIK_AT_COLOSSUS, RG_REQUIEM_OF_SPIRIT, false, true);
+        ctx->PlaceItemInLocation(RC_SHEIK_IN_KAKARIKO, RG_NOCTURNE_OF_SHADOW, false, true);
+        ctx->PlaceItemInLocation(RC_SHEIK_AT_TEMPLE, RG_PRELUDE_OF_LIGHT, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_IMPA, RG_ZELDAS_LULLABY, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_MALON, RG_EPONAS_SONG, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_SARIA, RG_SARIAS_SONG, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, RG_SUNS_SONG, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_OCARINA_OF_TIME, RG_SONG_OF_TIME, false, true);
+        ctx->PlaceItemInLocation(RC_SONG_FROM_WINDMILL, RG_SONG_OF_STORMS, false, true);
+    }
+
+    /*For item pool generation, dungeon items are either placed in their vanilla
+    | location, or added to the pool now and filtered out later depending on when
+    | they need to get placed or removed in fill.cpp. These items are kept in the
+    | pool until removal because the filling algorithm needs to know all of the
+    | advancement items that haven't been placed yet for placing higher priority
+    | items like stones/medallions.*/
+
+    if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
+        PlaceVanillaMapsAndCompasses();
+    } else {
+        for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            if (dungeon->GetMap() != RG_NONE) {
+                AddItemToMainPool(dungeon->GetMap());
+            }
+
+            if (dungeon->GetCompass() != RG_NONE) {
+                AddItemToMainPool(dungeon->GetCompass());
+            }
+        }
+    }
+
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
+        PlaceVanillaSmallKeys();
+    } else {
+        for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            if (dungeon->HasKeyRing() && ctx->GetOption(RSK_KEYSANITY).IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+                AddItemToMainPool(dungeon->GetKeyRing());
+            } else if (dungeon->GetSmallKeyCount() > 0) {
+                AddItemToMainPool(dungeon->GetSmallKey(), dungeon->GetSmallKeyCount());
+            }
+        }
+    }
+
+    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
+        PlaceVanillaBossKeys();
+    } else {
+        AddItemToMainPool(RG_FOREST_TEMPLE_BOSS_KEY);
+        AddItemToMainPool(RG_FIRE_TEMPLE_BOSS_KEY);
+        AddItemToMainPool(RG_WATER_TEMPLE_BOSS_KEY);
+        AddItemToMainPool(RG_SPIRIT_TEMPLE_BOSS_KEY);
+        AddItemToMainPool(RG_SHADOW_TEMPLE_BOSS_KEY);
+    }
+
+    if (!ctx->GetOption(RSK_TRIFORCE_HUNT)) { // Don't add GBK to the pool at all for Triforce Hunt.
+        if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
+            ctx->PlaceItemInLocation(RC_KAK_100_GOLD_SKULLTULA_REWARD, RG_GANONS_CASTLE_BOSS_KEY);
+        } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Get() >= RO_GANON_BOSS_KEY_LACS_VANILLA) {
+            ctx->PlaceItemInLocation(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_GANONS_CASTLE_BOSS_KEY);
+        } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
+            ctx->PlaceItemInLocation(RC_GANONS_TOWER_BOSS_KEY_CHEST, RG_GANONS_CASTLE_BOSS_KEY);
+        } else {
+            AddItemToMainPool(RG_GANONS_CASTLE_BOSS_KEY);
+        }
+    }
+
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_PLENTIFUL)) {
+        AddItemsToPool(ItemPool, easyItems);
+    } else {
+        AddItemsToPool(ItemPool, normalItems);
+    }
+
+    if (!ctx->GetOption(RSK_SHUFFLE_KOKIRI_SWORD)) {
+        ReplaceMaxItem(RG_KOKIRI_SWORD, 0);
+    }
+
+    if (!ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD)) {
+        ReplaceMaxItem(RG_MASTER_SWORD, 0);
+    }
+
+    if (/*ProgressiveGoronSword TODO: Implement Setting*/ false) {
+        ReplaceMaxItem(RG_BIGGORON_SWORD, 0);
+        AddItemToMainPool(RG_PROGRESSIVE_GORONSWORD, 2);
+        ctx->possibleIceTrapModels.push_back(RG_PROGRESSIVE_GORONSWORD);
+    } else {
+        ctx->possibleIceTrapModels.push_back(RG_BIGGORON_SWORD);
+    }
+
+    // Replace ice traps with junk from the pending junk pool if necessary
+    if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_OFF)) {
+        ReplaceMaxItem(RG_ICE_TRAP, 0);
+    }
+    // Replace all junk items with ice traps for onslaught mode
+    else if (ctx->GetOption(RSK_ICE_TRAPS).Is(RO_ICE_TRAPS_ONSLAUGHT)) {
+        PendingJunkPool.clear();
+        for (uint8_t i = 0; i < JunkPoolItems.size() - 3; i++) { // -3 Omits Huge Rupees and Deku Nuts 10
+            ReplaceMaxItem(JunkPoolItems[i], 0);
+        }
+    }
+
+    if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_SCARCE)) {
+        SetScarceItemPool();
+    } else if (ctx->GetOption(RSK_ITEM_POOL).Is(RO_ITEM_POOL_MINIMAL)) {
+        SetMinimalItemPool();
+    } else if (/*RemoveDoubleDefense TODO: Implement setting*/ false) {
+        ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
+    }
+
+    std::erase(ItemPool, RG_NONE);
+
+    if (ItemPool.size() < ctx->allLocations.size()) {
+        Shuffle(PendingJunkPool);
+        size_t junkNeeded = std::min(PendingJunkPool.size(), ctx->allLocations.size() - ItemPool.size());
+        ItemPool.insert(ItemPool.end(), PendingJunkPool.begin(), PendingJunkPool.begin() + junkNeeded);
+        PendingJunkPool.erase(PendingJunkPool.begin(), PendingJunkPool.begin() + junkNeeded);
+    } else if (ItemPool.size() > ctx->allLocations.size()) {
+        // RANDOTODO: all junk should be put in PendingJunkPool so this is never needed
+        size_t remove = ItemPool.size() - ctx->allLocations.size();
+        for (size_t i = 0; remove > 0 && i < ItemPool.size(); i++) {
+            for (size_t j = 0; j < JunkPoolItems.size(); j++) {
+                if (ItemPool[i] == JunkPoolItems[j]) {
+                    ItemPool[i] = RG_NONE;
+                    remove--;
+                    break;
+                }
+            }
+        }
+        std::erase(ItemPool, RG_NONE);
+    }
+
+    // RANDOTODO: Ideally this should be checking for equality, but that is not currently the case and has never been
+    // the case, and isn't even currently the case in the 3drando repo we inherited this from years ago, so it may
+    // be a large undertaking to fix.
+    assert(ItemPool.size() <= ctx->allLocations.size() || !"Item Pool larger than Location Pool");
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
index 4ef5830011..095b417b4c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
@@ -11,6 +11,5 @@ void AddItemToPool(std::vector<RandomizerGet>& pool, const RandomizerGet item, s
 RandomizerGet GetJunkItem();
 void PlaceJunkInExcludedLocation(const RandomizerCheck il);
 void GenerateItemPool();
-void AddJunk();
 
 extern std::vector<RandomizerGet> ItemPool;
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 6bcf21af95..35f21ce20d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -12,7 +12,6 @@
 #include "soh/Enhancements/debugger/performanceTimer.h"
 #include <spdlog/spdlog.h>
 #include "../../randomizer/randomizerTypes.h"
-#include <boost_custom/container_hash/hash_32.hpp>
 
 namespace {
 bool seedChanged;
@@ -22,22 +21,20 @@ Rando::Option* currentSetting;
 } // namespace
 
 bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
-    std::string seedInput) {
+                        std::string seedInput) {
     const auto ctx = Rando::Context::GetInstance();
     ResetPerformanceTimers();
     StartPerformanceTimer(PT_WHOLE_SEED);
 
-    srand(time(NULL));
+    srand(static_cast<uint32_t>(time(NULL)));
     // if a blank seed was entered, make a random one
     if (seedInput.empty()) {
-        seedInput = std::to_string(rand() % 0xFFFFFFFF);
+        seedInput = std::to_string(rand());
     } else if (seedInput.rfind("seed_testing_count", 0) == 0 && seedInput.length() > 18) {
         int count;
         try {
             count = std::stoi(seedInput.substr(18), nullptr);
-        } catch (std::invalid_argument &e) {
-            count = 1;
-        } catch (std::out_of_range &e) {
+        } catch (std::invalid_argument&) { count = 1; } catch (std::out_of_range&) {
             count = 1;
         }
         Playthrough::Playthrough_Repeat(excludedLocations, enabledTricks, count);
@@ -45,8 +42,8 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     }
 
     ctx->SetSeedString(seedInput);
-    uint32_t seedHash = boost::hash_32<std::string>{}(ctx->GetSeedString());
-    ctx->SetSeed(seedHash & 0xFFFFFFFF);
+    uint32_t seedHash = SohUtils::Hash(ctx->GetSeedString());
+    ctx->SetSeed(seedHash);
 
     ctx->ClearItemLocations();
     int ret = Playthrough::Playthrough_Init(ctx->GetSeed(), excludedLocations, enabledTricks);
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
index e0e6e4210e..b40c97c2da 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
@@ -13,4 +13,5 @@
 #define DELETE_PRESET 6
 #define RESET_TO_DEFAULTS 8
 
-bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
\ No newline at end of file
+bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+                        std::string seedInput);
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 144dee80a5..1e4a3db387 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -1,8 +1,6 @@
 #include "playthrough.hpp"
 
 #include <libultraship/libultraship.h>
-#include <boost_custom/container_hash/hash_32.hpp>
-#include "custom_messages.hpp"
 #include "fill.hpp"
 #include "../location_access.h"
 #include "random.hpp"
@@ -16,14 +14,14 @@
 
 namespace Playthrough {
 
-int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks) {
+int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
+                     std::set<RandomizerTrick> enabledTricks) {
     // initialize the RNG with just the seed incase any settings need to be
     // resolved to something random
     Random_Init(seed);
 
     auto ctx = Rando::Context::GetInstance();
     ctx->overrides.clear();
-    CustomMessages::ClearMessages();
     ctx->ItemReset();
     ctx->HintReset();
     ctx->GetLogic()->Reset();
@@ -63,11 +61,10 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
         settingsStr += (char*)gBuildVersion;
     }
 
-    uint32_t finalHash = boost::hash_32<std::string>{}(std::to_string(ctx->GetSeed()) + settingsStr);
+    uint32_t finalHash = SohUtils::Hash(std::to_string(ctx->GetSeed()) + settingsStr);
     Random_Init(finalHash);
     ctx->SetHash(std::to_string(finalHash));
 
-
     if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA)) {
         VanillaFill(); // Just place items in their vanilla locations
     } else {           // Fill locations with logic
@@ -80,8 +77,9 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
     GenerateHash();
 
     if (true) {
-        //TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
-        // write logs
+        // TODO: Handle different types of file output (i.e. Spoiler Log, Plando Template, Patch Files, Race Files,
+        // etc.)
+        //  write logs
         SPDLOG_INFO("Writing Spoiler Log...");
         StartPerformanceTimer(PT_SPOILER_LOG);
         if (SpoilerLog_Write()) {
@@ -99,14 +97,15 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
 }
 
 // used for generating a lot of seeds at once
-int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count /*= 1*/) {
+int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+                       int count /*= 1*/) {
     SPDLOG_INFO("GENERATING {} SEEDS", count);
     auto ctx = Rando::Context::GetInstance();
     uint32_t repeatedSeed = 0;
     for (int i = 0; i < count; i++) {
-        ctx->SetSeedString(std::to_string(rand() % 0xFFFFFFFF));
-        repeatedSeed = boost::hash_32<std::string>{}(ctx->GetSeedString());
-        ctx->SetSeed(repeatedSeed % 0xFFFFFFFF);
+        ctx->SetSeedString(std::to_string(rand()));
+        repeatedSeed = SohUtils::Hash(ctx->GetSeedString());
+        ctx->SetSeed(repeatedSeed);
         SPDLOG_DEBUG("testing seed: %d", repeatedSeed);
         ClearProgress();
         Playthrough_Init(ctx->GetSeed(), excludedLocations, enabledTricks);
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
index 1dbbc78429..52ad6a3ee8 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
@@ -4,6 +4,8 @@
 #include "../context.h"
 
 namespace Playthrough {
-    int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
-    int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count = 1);
-}
+int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
+                     std::set<RandomizerTrick> enabledTricks);
+int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+                       int count = 1);
+} // namespace Playthrough
diff --git a/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp b/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
index 5a83cda5bc..5edcb0fdaa 100644
--- a/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
@@ -5,38 +5,35 @@
 #include <iostream>
 #include <iterator>
 
-template <typename T, typename Predicate>
-static void erase_if(std::vector<T>& vector, Predicate pred) {
-  vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
+template <typename T, typename Predicate> static void erase_if(std::vector<T>& vector, Predicate pred) {
+    vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
 }
 
 template <typename T, typename Predicate>
 std::vector<T> FilterFromPool(std::vector<T>& vector, Predicate pred, bool eraseAfterFilter = false) {
-  std::vector<T> filteredPool = {};
-  std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
+    std::vector<T> filteredPool = {};
+    std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
 
-  if (eraseAfterFilter) {
-    erase_if(vector, pred);
-  }
+    if (eraseAfterFilter) {
+        erase_if(vector, pred);
+    }
 
-  return filteredPool;
+    return filteredPool;
 }
 
 template <typename T, typename Predicate>
 std::vector<T> FilterAndEraseFromPool(std::vector<T>& vector, Predicate pred) {
-  return FilterFromPool(vector, pred, true);
+    return FilterFromPool(vector, pred, true);
 }
 
-template <typename T, typename FromPool>
-void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
-  toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
+template <typename T, typename FromPool> void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
+    toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
 }
 
-template <typename T, typename Container>
-bool ElementInContainer(T& element, const Container& container) {
-  return std::find(container.begin(), container.end(), element) != container.end();
+template <typename T, typename Container> bool ElementInContainer(T& element, const Container& container) {
+    return std::find(container.begin(), container.end(), element) != container.end();
 }
 
 template <typename First, typename... T> bool IsAnyOf(First&& first, T&&... t) {
-  return ((first == t) || ...);
+    return ((first == t) || ...);
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index d26e89adba..51cfdd535f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -11,7 +11,7 @@
 #include "soh/cvar_prefixes.h"
 
 void RandoMain::GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
-    std::string seedString) {
+                              std::string seedString) {
 
     Rando::Context::GetInstance()->SetSeedGenerated(GenerateRandomizer(excludedLocations, enabledTricks, seedString));
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
index 8ac22069bf..b03dd8b88b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
@@ -3,5 +3,6 @@
 
 #include <set>
 namespace RandoMain {
-void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
+void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
+                   std::string seedInput);
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/random.cpp b/soh/soh/Enhancements/randomizer/3drando/random.cpp
index 92cf22b85d..4cac198183 100644
--- a/soh/soh/Enhancements/randomizer/3drando/random.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/random.cpp
@@ -1,36 +1,55 @@
 #include "random.hpp"
 
+#include <bit>
 #include <random>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-#include <boost/random/uniform_real_distribution.hpp>
+#include <cassert>
 
 static bool init = false;
-static boost::random::mt19937 generator;
+static uint64_t state = 0;
+const uint64_t multiplier = 6364136223846793005ULL;
+const uint64_t increment = 11634580027462260723ULL;
 
-//Initialize with seed specified
-void Random_Init(uint32_t seed) {
+// Initialize with seed specified
+void Random_Init(uint64_t seed) {
     init = true;
-    generator = boost::random::mt19937{seed};
+    state = seed;
 }
 
-//Returns a random integer in range [min, max-1]
-uint32_t Random(int min, int max) {
+uint32_t next32() {
     if (!init) {
-        //No seed given, get a random number from device to seed
+        // No seed given, get a random number from device to seed
 #if !defined(__SWITCH__) && !defined(__WIIU__)
-        const auto seed = static_cast<uint32_t>(std::random_device{}());
+        uint64_t seed = static_cast<uint64_t>(std::random_device{}());
 #else
-        uint32_t seed = static_cast<uint32_t>(std::hash<std::string>{}(std::to_string(rand())));
+        uint64_t seed = static_cast<uint64_t>(std::hash<std::string>{}(std::to_string(rand())));
 #endif
         Random_Init(seed);
     }
-    boost::random::uniform_int_distribution<uint32_t> distribution(min, max-1);
-    return distribution(generator);
+
+    state = state * multiplier + increment;
+    uint32_t xorshifted = static_cast<uint32_t>(((state >> 18) ^ state) >> 27);
+    uint32_t rot = static_cast<int>(state >> 59);
+    return std::rotr(xorshifted, rot);
 }
 
-//Returns a random floating point number in [0.0, 1.0]
-double RandomDouble() {
-    boost::random::uniform_real_distribution<double> distribution(0.0, 1.0);
-    return distribution(generator);
+// Returns a random integer in range [min, max-1]
+uint32_t Random(uint32_t min, uint32_t max) {
+    if (min == max) {
+        return min;
+    }
+    assert(max > min);
+
+    uint32_t n = max - min;
+    uint32_t cutoff = UINT32_MAX - UINT32_MAX % static_cast<uint32_t>(n);
+    for (;;) {
+        uint32_t r = next32();
+        if (r <= cutoff) {
+            return min + r % n;
+        }
+    }
+}
+
+// Returns a random floating point number in [0.0, 1.0)
+double RandomDouble() {
+    return ldexp(next32(), -32);
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/random.hpp b/soh/soh/Enhancements/randomizer/3drando/random.hpp
index 24ab78dcdb..5143894710 100644
--- a/soh/soh/Enhancements/randomizer/3drando/random.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/random.hpp
@@ -7,35 +7,31 @@
 #include <vector>
 #include <set>
 
-void Random_Init(uint32_t seed);
-uint32_t Random(int min, int max);
+void Random_Init(uint64_t seed);
+uint32_t Random(uint32_t min, uint32_t max);
 double RandomDouble();
 
-//Get a random element from a vector or array
-template <typename T>
-T RandomElement(std::vector<T>& vector, bool erase) {
-    const auto idx = Random(0, vector.size());
+// Get a random element from a vector or array
+template <typename T> T RandomElement(std::vector<T>& vector, bool erase) {
+    const auto idx = Random(0, static_cast<uint32_t>(vector.size()));
     const T selected = vector[idx];
     if (erase) {
         vector.erase(vector.begin() + idx);
     }
     return selected;
 }
-template <typename Container>
-auto& RandomElement(Container& container) {
-    return container[Random(0, std::size(container))];
+template <typename Container> auto& RandomElement(Container& container) {
+    return container[Random(0, static_cast<uint32_t>(std::size(container)))];
 }
-template <typename Container>
-const auto& RandomElement(const Container& container) {
-    return container[Random(0, std::size(container))];
+template <typename Container> const auto& RandomElement(const Container& container) {
+    return container[Random(0, static_cast<uint32_t>(std::size(container)))];
 }
 
-template <typename T>
-const T RandomElementFromSet(const std::set<T>& set) {
+template <typename T> const T RandomElementFromSet(const std::set<T>& set) {
     if (set.size() == 1) {
         return *set.begin();
     }
-    uint32_t rand = Random(0, set.size());
+    uint32_t rand = Random(0, static_cast<uint32_t>(set.size()));
     auto it = set.begin();
     for (uint32_t i = 0; i < rand; i++) {
         it++;
@@ -44,19 +40,15 @@ const T RandomElementFromSet(const std::set<T>& set) {
     return *it;
 }
 
-//Shuffle items within a vector or array
-//RANDOTODO There's probably a more efficient way to do what this does.
-template <typename T>
-void Shuffle(std::vector<T>& vector) {
-    for (std::size_t i = 0; i + 1 < vector.size(); i++)
-    {
-        std::swap(vector[i], vector[Random(i, vector.size())]);
+// Shuffle items within a vector or array
+// RANDOTODO There's probably a more efficient way to do what this does.
+template <typename T> void Shuffle(std::vector<T>& vector) {
+    for (size_t i = 0; i + 1 < vector.size(); i++) {
+        std::swap(vector[i], vector[Random(static_cast<uint32_t>(i), static_cast<uint32_t>(vector.size()))]);
     }
 }
-template <typename T, std::size_t size>
-void Shuffle(std::array<T, size>& arr) {
-    for (std::size_t i = 0; i + 1 < arr.size(); i++)
-    {
-        std::swap(arr[i], arr[Random(i, arr.size())]);
+template <typename T, size_t size> void Shuffle(std::array<T, size>& arr) {
+    for (size_t i = 0; i + 1 < arr.size(); i++) {
+        std::swap(arr[i], arr[Random(static_cast<uint32_t>(i), static_cast<uint32_t>(arr.size()))]);
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index edaf8aa5d2..441454cd07 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -10,248 +10,200 @@
 #include <spdlog/spdlog.h>
 #include "z64item.h"
 
-PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main,
-                        RandomizerSettingKey _fixedPrice,
-                        RandomizerSettingKey _range1,
-                        RandomizerSettingKey _range2,
-                        RandomizerSettingKey _noWallet,
-                        RandomizerSettingKey _childWallet,
-                        RandomizerSettingKey _adultWallet,
-                        RandomizerSettingKey _giantWallet,
-                        RandomizerSettingKey _tycoonWallet,
-                        RandomizerSettingKey _affordable){
-   main = _main;
-   fixedPrice = _fixedPrice;
-   range1 = _range1;
-   range2 = _range2;
-   noWallet = _noWallet;
-   childWallet = _childWallet;
-   adultWallet = _adultWallet;
-   giantWallet= _giantWallet;
-   tycoonWallet= _tycoonWallet;
-   affordable= _affordable;
+PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice,
+                                         RandomizerSettingKey _range1, RandomizerSettingKey _range2,
+                                         RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet,
+                                         RandomizerSettingKey _adultWallet, RandomizerSettingKey _giantWallet,
+                                         RandomizerSettingKey _tycoonWallet, RandomizerSettingKey _affordable) {
+    main = _main;
+    fixedPrice = _fixedPrice;
+    range1 = _range1;
+    range2 = _range2;
+    noWallet = _noWallet;
+    childWallet = _childWallet;
+    adultWallet = _adultWallet;
+    giantWallet = _giantWallet;
+    tycoonWallet = _tycoonWallet;
+    affordable = _affordable;
 }
 
-
 static std::array<std::vector<Text>, 0xF1> trickNameTable; // Table of trick names for ice traps
-bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
+bool initTrickNames = false; // Indicates if trick ice trap names have been initialized yet
 
-//Set vanilla shop item locations before potentially shuffling
+// Set vanilla shop item locations before potentially shuffling
 void PlaceVanillaShopItems() {
     auto ctx = Rando::Context::GetInstance();
-    //Loop to place vanilla items in each location
+    // Loop to place vanilla items in each location
     for (RandomizerCheck& randomizerCheck : Rando::StaticData::GetShopLocations()) {
         ctx->GetItemLocation(randomizerCheck)->PlaceVanillaItem();
     }
 }
 
-//These are the vanilla shop items, but in a priority order of importance
-//However many shop item slots were cleared, this will return 64 minus that number of vanilla shop items to be placed with assumed fill
-//The first 32 items here will always be present in shops
-//Shopsanity 4 will only have the first 32, shopsanity 1 will have the first 56, etc.
-//Shopsanity random will have anywhere from the first 32 to the first 56, so the order of items after 32 is relevant
+// These are the vanilla shop items, but in a priority order of importance
+// However many shop item slots were cleared, this will return 64 minus that number of vanilla shop items to be placed
+// with assumed fill The first 32 items here will always be present in shops Shopsanity 4 will only have the first 32,
+// shopsanity 1 will have the first 56, etc. Shopsanity random will have anywhere from the first 32 to the first 56, so
+// the order of items after 32 is relevant
 std::vector<RandomizerGet> GetMinVanillaShopItems(int total_replaced) {
     std::vector<RandomizerGet> minShopItems = {
-        RG_BUY_DEKU_SHIELD,
-        RG_BUY_HYLIAN_SHIELD,
-        RG_BUY_GORON_TUNIC,
-        RG_BUY_ZORA_TUNIC,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_BOMBS_20,
-        RG_BUY_BOMBCHUS_10,
-        RG_BUY_DEKU_STICK_1,
+        RG_BUY_DEKU_SHIELD, RG_BUY_HYLIAN_SHIELD, RG_BUY_GORON_TUNIC, RG_BUY_ZORA_TUNIC, RG_BUY_DEKU_NUTS_5,
+        RG_BUY_BOMBS_20, RG_BUY_BOMBCHUS_10, RG_BUY_DEKU_STICK_1,
         //^First 8 items: Exist on shopsanity 7 or less
-        RG_BUY_FAIRYS_SPIRIT,
-        RG_BUY_DEKU_SEEDS_30,
-        RG_BUY_ARROWS_10,
-        RG_BUY_BLUE_FIRE,
-        RG_BUY_RED_POTION_30,
-        RG_BUY_GREEN_POTION,
-        RG_BUY_DEKU_NUTS_10,
-        RG_BUY_BOMBCHUS_10,
+        RG_BUY_FAIRYS_SPIRIT, RG_BUY_DEKU_SEEDS_30, RG_BUY_ARROWS_10, RG_BUY_BLUE_FIRE, RG_BUY_RED_POTION_30,
+        RG_BUY_GREEN_POTION, RG_BUY_DEKU_NUTS_10, RG_BUY_BOMBCHUS_10,
         //^First 16 items: Exist on shopsanity 6 or less
-        RG_BUY_BOMBCHUS_10,
-        RG_BUY_BOMBCHUS_20,
-        RG_BUY_BOMBS_525,
-        RG_BUY_BOMBS_535,
-        RG_BUY_BOMBS_10,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_ARROWS_30,
-        RG_BUY_ARROWS_50,
+        RG_BUY_BOMBCHUS_10, RG_BUY_BOMBCHUS_20, RG_BUY_BOMBS_525, RG_BUY_BOMBS_535, RG_BUY_BOMBS_10, RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_30, RG_BUY_ARROWS_50,
         //^First 24 items: Exist on shopsanity 5 or less
-        RG_BUY_ARROWS_10,
-        RG_BUY_FAIRYS_SPIRIT,
-        RG_BUY_BOTTLE_BUG,
-        RG_BUY_FISH,
+        RG_BUY_ARROWS_10, RG_BUY_FAIRYS_SPIRIT, RG_BUY_BOTTLE_BUG, RG_BUY_FISH,
         //^First 28 items from OoTR
-        RG_BUY_HYLIAN_SHIELD,
-        RG_BUY_BOTTLE_BUG,
-        RG_BUY_DEKU_STICK_1,
-        RG_BUY_DEKU_STICK_1,
+        RG_BUY_HYLIAN_SHIELD, RG_BUY_BOTTLE_BUG, RG_BUY_DEKU_STICK_1, RG_BUY_DEKU_STICK_1,
         //^First 32 items: Exist on shopsanity 4 or less
-        RG_BUY_BLUE_FIRE,
-        RG_BUY_FISH,
-        RG_BUY_BOMBCHUS_10,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_ARROWS_10,
-        RG_BUY_BOMBCHUS_20,
-        RG_BUY_BOMBS_535,
-        RG_BUY_RED_POTION_30,
+        RG_BUY_BLUE_FIRE, RG_BUY_FISH, RG_BUY_BOMBCHUS_10, RG_BUY_DEKU_NUTS_5, RG_BUY_ARROWS_10, RG_BUY_BOMBCHUS_20,
+        RG_BUY_BOMBS_535, RG_BUY_RED_POTION_30,
         //^First 40 items: Exist on shopsanity 3 or less
-        RG_BUY_BOMBS_30,
-        RG_BUY_BOMBCHUS_20,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_ARROWS_10,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_ARROWS_30,
-        RG_BUY_RED_POTION_40,
-        RG_BUY_FISH,
+        RG_BUY_BOMBS_30, RG_BUY_BOMBCHUS_20, RG_BUY_DEKU_NUTS_5, RG_BUY_ARROWS_10, RG_BUY_DEKU_NUTS_5, RG_BUY_ARROWS_30,
+        RG_BUY_RED_POTION_40, RG_BUY_FISH,
         //^First 48 items: Exist on shopsanity 2 or less
-        RG_BUY_BOMBCHUS_20,
-        RG_BUY_ARROWS_30,
-        RG_BUY_RED_POTION_50,
-        RG_BUY_ARROWS_30,
-        RG_BUY_DEKU_NUTS_5,
-        RG_BUY_ARROWS_50,
-        RG_BUY_ARROWS_50,
-        RG_BUY_GREEN_POTION,
+        RG_BUY_BOMBCHUS_20, RG_BUY_ARROWS_30, RG_BUY_RED_POTION_50, RG_BUY_ARROWS_30, RG_BUY_DEKU_NUTS_5,
+        RG_BUY_ARROWS_50, RG_BUY_ARROWS_50, RG_BUY_GREEN_POTION,
         //^First 56 items: Exist on shopsanity 1 or less
-        RG_BUY_POE,
-        RG_BUY_POE,
-        RG_BUY_HEART,
-        RG_BUY_HEART,
-        RG_BUY_HEART,
-        RG_BUY_HEART,
-        RG_BUY_HEART,
-        RG_BUY_HEART,
+        RG_BUY_POE, RG_BUY_POE, RG_BUY_HEART, RG_BUY_HEART, RG_BUY_HEART, RG_BUY_HEART, RG_BUY_HEART, RG_BUY_HEART,
         //^All 64 items: Only exist with shopsanity 0
     };
-    //Now delete however many items there are to replace
+    // Now delete however many items there are to replace
     for (int i = 0; i < total_replaced; i++) {
         minShopItems.pop_back();
     }
     return minShopItems;
 }
 
-//This table contains a cumulative probability for each possible shop price based on
-// a beta distribution with alpha = 1.5, beta = 2, and the result of the distribution, a float in [0.0, 1.0),
-// being mutliplied by 60, casted to an integer, then multiplied by 5 to give a value in range [0, 295] in increments of 5.
-// Meaning the first value is the probability of 0, the next value is the probability of 0 plus the probability of 5, etc.
-//Probabilities generated using a python script with 1 billion trials, so should hopefully be pretty good
-//Average price ~126
+// This table contains a cumulative probability for each possible shop price based on
+//  a beta distribution with alpha = 1.5, beta = 2, and the result of the distribution, a float in [0.0, 1.0),
+//  being mutliplied by 60, casted to an integer, then multiplied by 5 to give a value in range [0, 295] in increments
+//  of 5. Meaning the first value is the probability of 0, the next value is the probability of 0 plus the probability
+//  of 5, etc.
+// Probabilities generated using a python script with 1 billion trials, so should hopefully be pretty good
+// Average price ~126
 //~38% chance of needing no wallet, ~45% chance of needing 1, ~17% chance of needing 2
-static constexpr std::array<double, 60> ShopPriceProbability= {
-    0.005326994, 0.014908518, 0.027114719, 0.041315285, 0.057136304, 0.074325887, 0.092667151, 0.112002061, 0.132198214, 0.153125390,
-    0.174696150, 0.196810540, 0.219388148, 0.242361379, 0.265657012, 0.289205134, 0.312970402, 0.336877590, 0.360881110, 0.384932772,
-    0.408976198, 0.432982176, 0.456902494, 0.480686053, 0.504313389, 0.527746488, 0.550938554, 0.573856910, 0.596465330, 0.618736235,
-    0.640646600, 0.662162782, 0.683240432, 0.703859801, 0.724001242, 0.743631336, 0.762722631, 0.781259986, 0.799198449, 0.816521905,
-    0.833208595, 0.849243398, 0.864579161, 0.879211177, 0.893112051, 0.906263928, 0.918639420, 0.930222611, 0.940985829, 0.950914731,
-    0.959992180, 0.968187000, 0.975495390, 0.981884488, 0.987344345, 0.991851853, 0.995389113, 0.997937921, 0.999481947, 1.000000000,
+static constexpr std::array<double, 60> ShopPriceProbability = {
+    0.005326994, 0.014908518, 0.027114719, 0.041315285, 0.057136304, 0.074325887, 0.092667151, 0.112002061, 0.132198214,
+    0.153125390, 0.174696150, 0.196810540, 0.219388148, 0.242361379, 0.265657012, 0.289205134, 0.312970402, 0.336877590,
+    0.360881110, 0.384932772, 0.408976198, 0.432982176, 0.456902494, 0.480686053, 0.504313389, 0.527746488, 0.550938554,
+    0.573856910, 0.596465330, 0.618736235, 0.640646600, 0.662162782, 0.683240432, 0.703859801, 0.724001242, 0.743631336,
+    0.762722631, 0.781259986, 0.799198449, 0.816521905, 0.833208595, 0.849243398, 0.864579161, 0.879211177, 0.893112051,
+    0.906263928, 0.918639420, 0.930222611, 0.940985829, 0.950914731, 0.959992180, 0.968187000, 0.975495390, 0.981884488,
+    0.987344345, 0.991851853, 0.995389113, 0.997937921, 0.999481947, 1.000000000,
 };
 
 // Generate random number from 5 to wallet max
 int GetPriceFromMax(int max) {
-    return Random(1, max) * 5; // random range of 1 - wallet max / 5, where wallet max is the highest it goes as a multiple of 5
+    // random range of 1 - wallet max / 5, where wallet max is the highest it goes as a multiple of 5
+    return Random(1, max) * 5;
 }
 
-uint16_t GetPriceFromSettings(Rando::Location *loc, PriceSettingsStruct priceSettings) {
-   auto ctx = Rando::Context::GetInstance();
-   switch (ctx->GetOption(priceSettings.main).Get()){
-      case RO_PRICE_VANILLA: 
-         return loc->GetVanillaPrice();
-      case RO_PRICE_CHEAP_BALANCED:
-         return GetCheapBalancedPrice();
-      case RO_PRICE_BALANCED:{
-         double random = RandomDouble(); //Randomly generated probability value
-         for (size_t i = 0; i < ShopPriceProbability.size(); i++) {
-            if (random < ShopPriceProbability[i]) {
-            //The randomly generated value has surpassed the total probability up to this point, so this is the generated price
-                  return  i * 5; //i in range [0, 59], output in range [0, 295] in increments of 5
+uint16_t GetPriceFromSettings(Rando::Location* loc, PriceSettingsStruct priceSettings) {
+    auto ctx = Rando::Context::GetInstance();
+    switch (ctx->GetOption(priceSettings.main).Get()) {
+        case RO_PRICE_VANILLA:
+            return loc->GetVanillaPrice();
+        case RO_PRICE_CHEAP_BALANCED:
+            return GetCheapBalancedPrice();
+        case RO_PRICE_BALANCED: {
+            double random = RandomDouble(); // Randomly generated probability value
+            for (size_t i = 0; i < ShopPriceProbability.size(); i++) {
+                if (random < ShopPriceProbability[i]) {
+                    // The randomly generated value has surpassed the total probability up to this point, so this is the
+                    // generated price i in range [0, 59], output in range [0, 295] in increments of 5
+                    return static_cast<uint16_t>(i) * 5;
+                }
             }
-         }
-         return 150;
-      }
-      case RO_PRICE_FIXED:
-         return (uint16_t)ctx->GetOption(priceSettings.fixedPrice).Get() * 5;
-      case RO_PRICE_RANGE:{
-         uint16_t range1 = (uint16_t)ctx->GetOption(priceSettings.range1).Get() * 5;
-         uint16_t range2 = (uint16_t)ctx->GetOption(priceSettings.range2).Get() * 5;
-         return range1 < range2 ? Random(range1, range2+1) : Random(range2, range1+1);
-      }
-      case RO_PRICE_SET_BY_WALLET:{
-         bool isTycoon = ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET).Get();
-         uint16_t noWeight = ctx->GetOption(priceSettings.noWallet).Get();
-         uint16_t childWeight = ctx->GetOption(priceSettings.childWallet).Get();
-         uint16_t adultWeight = ctx->GetOption(priceSettings.adultWallet).Get();
-         uint16_t giantWeight = ctx->GetOption(priceSettings.giantWallet).Get();
-         uint16_t tycoonWeight = isTycoon ? ctx->GetOption(priceSettings.tycoonWallet).Get() : 0;
-         uint16_t totalWeight = noWeight + childWeight + adultWeight + giantWeight + tycoonWeight;
-         if (totalWeight == 0){ //if no weight, return from sane range
-            return Random(0, 501);
-         }
-         int16_t selected = Random(1, totalWeight + 1);
-         selected = selected - noWeight;
-         if (selected <= 0){
-            return 0;
-         }
-         selected = selected - childWeight;
-         if (selected <= 0){
-            return Random(1, 100);
-         }
-         selected = selected - adultWeight;
-         if (selected <= 0){
-            return Random(100, 201);
-         }
-         selected = selected - giantWeight;
-         if (selected <= 0){
-            return Random(201, 501);
-         }
-         return Random(501, 999);
-      }
-   }
-   SPDLOG_ERROR("GetPriceFromSettings has failed to return a price for location {}, assigning a default value.", loc->GetName());
-   assert(false);
-   return 69; //this should never happen, if it does, EASTER EGG that tells us something is wrong
+            return 150;
+        }
+        case RO_PRICE_FIXED:
+            return (uint16_t)ctx->GetOption(priceSettings.fixedPrice).Get() * 5;
+        case RO_PRICE_RANGE: {
+            uint16_t range1 = (uint16_t)ctx->GetOption(priceSettings.range1).Get() * 5;
+            uint16_t range2 = (uint16_t)ctx->GetOption(priceSettings.range2).Get() * 5;
+            return range1 < range2 ? Random(range1, range2 + 1) : Random(range2, range1 + 1);
+        }
+        case RO_PRICE_SET_BY_WALLET: {
+            bool isTycoon = ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET).Get();
+            uint16_t noWeight = ctx->GetOption(priceSettings.noWallet).Get();
+            uint16_t childWeight = ctx->GetOption(priceSettings.childWallet).Get();
+            uint16_t adultWeight = ctx->GetOption(priceSettings.adultWallet).Get();
+            uint16_t giantWeight = ctx->GetOption(priceSettings.giantWallet).Get();
+            uint16_t tycoonWeight = isTycoon ? ctx->GetOption(priceSettings.tycoonWallet).Get() : 0;
+            uint16_t totalWeight = noWeight + childWeight + adultWeight + giantWeight + tycoonWeight;
+            if (totalWeight == 0) { // if no weight, return from sane range
+                return Random(0, 501);
+            }
+            int16_t selected = Random(1, totalWeight + 1);
+            selected = selected - noWeight;
+            if (selected <= 0) {
+                return 0;
+            }
+            selected = selected - childWeight;
+            if (selected <= 0) {
+                return Random(1, 100);
+            }
+            selected = selected - adultWeight;
+            if (selected <= 0) {
+                return Random(100, 201);
+            }
+            selected = selected - giantWeight;
+            if (selected <= 0) {
+                return Random(201, 501);
+            }
+            return Random(501, 999);
+        }
+    }
+    SPDLOG_ERROR("GetPriceFromSettings has failed to return a price for location {}, assigning a default value.",
+                 loc->GetName());
+    assert(false);
+    return 69; // this should never happen, if it does, EASTER EGG that tells us something is wrong
 }
 
-uint16_t GetRandomPrice(Rando::Location *loc, PriceSettingsStruct priceSettings) {
-   uint16_t initialPrice = GetPriceFromSettings(loc, priceSettings);
-   auto ctx = Rando::Context::GetInstance();
-   if (ctx->GetOption(priceSettings.affordable) && !ctx->GetOption(priceSettings.main).Is(RO_PRICE_FIXED)){
-      if (initialPrice > 500) {
-         return 505;
-      } else if (initialPrice > 200) {
-         return 205;
-      } else if (initialPrice > 99) {
-         return 100;
-      } else if (initialPrice > 0) {
-         return 5;
-      }
-      return 0;
-   } else {
-      return initialPrice;
-   }
+uint16_t GetRandomPrice(Rando::Location* loc, PriceSettingsStruct priceSettings) {
+    uint16_t initialPrice = GetPriceFromSettings(loc, priceSettings);
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(priceSettings.affordable) && !ctx->GetOption(priceSettings.main).Is(RO_PRICE_FIXED)) {
+        if (initialPrice > 500) {
+            return 505;
+        } else if (initialPrice > 200) {
+            return 205;
+        } else if (initialPrice > 99) {
+            return 100;
+        } else if (initialPrice > 0) {
+            return 5;
+        }
+        return 0;
+    } else {
+        return initialPrice;
+    }
 }
 
-//Similar to above, beta distribution with alpha = 1, beta = 2,
-// multiplied by 20 instead of 60 to give values in rage [0, 95] in increments of 5
-//Average price ~31
+// Similar to above, beta distribution with alpha = 1, beta = 2,
+//  multiplied by 20 instead of 60 to give values in rage [0, 95] in increments of 5
+// Average price ~31
 static constexpr std::array<double, 20> CheapPriceProbability = {
-    0.097500187, 0.190002748, 0.277509301, 0.360018376, 0.437522571, 0.510021715, 0.577520272, 0.640029304, 0.697527584, 0.750024535,
-    0.797518749, 0.840011707, 0.877508776, 0.910010904, 0.937504342, 0.960004661, 0.977502132, 0.989998967, 0.997500116, 1.000000000,
+    0.097500187, 0.190002748, 0.277509301, 0.360018376, 0.437522571, 0.510021715, 0.577520272,
+    0.640029304, 0.697527584, 0.750024535, 0.797518749, 0.840011707, 0.877508776, 0.910010904,
+    0.937504342, 0.960004661, 0.977502132, 0.989998967, 0.997500116, 1.000000000,
 };
 
 uint16_t GetCheapBalancedPrice() {
     double random = RandomDouble();
     for (size_t i = 0; i < CheapPriceProbability.size(); i++) {
         if (random < CheapPriceProbability[i]) {
-            return i * 5; // i in range [0, 19], output in range [0, 95] in increments of 5
+            // i in range [0, 19], output in range [0, 95] in increments of 5
+            return static_cast<uint16_t>(i) * 5;
         }
     }
     return -1;
 }
 
-//Get 0 to 7, or a random number from 1-7 depending on shopsanity setting
+// Get 0 to 7, or a random number from 1-7 depending on shopsanity setting
 int GetShopsanityReplaceAmount() {
     auto ctx = Rando::Context::GetInstance();
     if (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
@@ -274,861 +226,947 @@ int GetShopsanityReplaceAmount() {
         } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_SEVEN_ITEMS)) {
             return 7;
         } else if (ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_EIGHT_ITEMS)) {
-            return 8; //temporarily unreachable due to logic limitations
+            return 8; // temporarily unreachable due to logic limitations
+        } else {
+            assert(false);
+            return 0;
         }
-    } else { //Random, get number in [1, 7]
+    } else { // Random, get number in [1, 7]
         return Random(1, 8);
     }
 }
 
-//Initialize the table of trick names with an easy, medium, and hard name for each language
+/* Initialize the table of trick names with an easy, medium, and hard name for each language.
+   english, french, german // spanish */
 void InitTrickNames() {
     trickNameTable[RG_KOKIRI_SWORD] = {
-        Text{"Korok Sword", "Épée Korok", "Espada Korok"},
-        Text{"Hero's Sword", "Épée du Héros", "Espada del héroe"},
-        Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"}
+        Text{ "Korok Sword", "Épée Korok", "Korok-Schwert" },     // "Espada Korok"
+        Text{ "Hero's Sword", "Épée du Héros", "Heroenschwert" }, // "Espada del héroe"
+        Text{ "Razor Sword", "Lame Rasoir", "Elfenschwert" },     // "Espada de esmeril"
     };
     trickNameTable[RG_MASTER_SWORD] = {
-        Text{"Goddess Sword", "Épée de la déesse", "Espada Divina"},
-        Text{"Gilded Sword", "Excalibur", "Espada de los Sabios"},
-        Text{"Magical Sword", "Lame dorée", "Fay"}
+        Text{ "Goddess Sword", "Épée de la déesse", "Schwert der Göttin" }, // "Espada Divina"
+        Text{ "Gilded Sword", "Excalibur", "Schmirgelklinge" },             // "Espada de los Sabios"
+        Text{ "Magical Sword", "Lame dorée", "Magisches Schwert" },         // "Fay"
     };
     trickNameTable[RG_GIANTS_KNIFE] = {
-        Text{"Medigoron's Sword", "l'Épée de Medigoron", "La espada de Medigoron"},
-        Text{"Razor Sword", "Lame Rasoir", "Espada de esmeril"},
-        Text{"Royal Claymore", "Claymore Royale", "Royal Claymore"}
+        Text{ "Medigoron's Sword", "l'Épée de Medigoron", "Medigoron-Schwert" }, // "La espada de Medigoron"
+        Text{ "Razor Sword", "Lame Rasoir", "Elfenschwert" },                    // "Espada de esmeril"
+        Text{ "Royal Claymore", "Claymore Royale", "Königs-Zweihänder" },        // "Royal Claymore"
     };
     trickNameTable[RG_BIGGORON_SWORD] = {
-        Text{"Power Sword", "Épée de Puissance", "Espada de poder"},
-        Text{"Fierce Deity Sword", "Épée du dieu démon", "Espada de la Fiera Deidad"},
-        Text{"Tempered Sword", "Épée de Légende Nv.2", "Espada Maestra mejorada"},
-        Text{"Biggoron's Knife", "Lame de Grogoron", "Daga de Biggoron"}
+        Text{ "Power Sword", "Épée de Puissance", "Schwert der Macht" }, // "Espada de poder",
+        Text{ "Fierce Deity Sword", "Épée du dieu démon",
+              "Schwert der grimmischen Gottheit" },                              // "Espada de la Fiera Deidad"
+        Text{ "Tempered Sword", "Épée de Légende Nv.2", "Master-Schwert Lv.2" }, // "Espada Maestra mejorada"
+        Text{ "Biggoron's Knife", "Lame de Grogoron", "Biggoron-Messer" },       // "Daga de Biggoron"
     };
     trickNameTable[RG_DEKU_SHIELD] = {
-        Text{"Boko Shield", "Bouclier Boko", "Escudo Boko"},
-        Text{"Ordon Shield", "Bouclier de Toal", "Escudo de Ordon"},
-        Text{"Wooden Shield", "Bouclier de Bois", "Escudo de madera"}
+        Text{ "Boko Shield", "Bouclier Boko", "Bokschild" },        // "Escudo Boko"
+        Text{ "Ordon Shield", "Bouclier de Toal", "Ordon-Schild" }, // "Escudo de Ordon"
+        Text{ "Wooden Shield", "Bouclier de Bois", "Holzschild" },  // "Escudo de madera"
     };
     trickNameTable[RG_HYLIAN_SHIELD] = {
-        Text{"Hyrule Shield", "Bouclier d'Hyrule", "Escudo Hylian"},
-        Text{"Goddess Shield", "Bouclier Sacré", "Escudo Divino"},
-        Text{"Hero's Shield", "Bouclier du Héros", "Escudo del héroe"}
+        Text{ "Hyrule Shield", "Bouclier d'Hyrule", "Hyrule-Schild" },   // "Escudo Hylian"
+        Text{ "Goddess Shield", "Bouclier Sacré", "Göttlicher Schild" }, // "Escudo Divino"
+        Text{ "Hero's Shield", "Bouclier du Héros", "Heroenschild" },    // "Escudo del héroe"
     };
     trickNameTable[RG_MIRROR_SHIELD] = {
-        Text{"Magic Mirror", "Miroir Magique", "Escudo mágico"},
-        Text{"Magical Shield", "Bouclier Magique", "Escudo arcano"},
-        Text{"Mirror of Twilight", "Miroir des Ombres", "Espejo del Crepúsculo"}
+        Text{ "Magic Mirror", "Miroir Magique", "Magiespiegel" },             // "Escudo mágico"
+        Text{ "Magical Shield", "Bouclier Magique", "Magischer Schild" },     // "Escudo arcano"
+        Text{ "Mirror of Twilight", "Miroir des Ombres", "Schattenspiegel" }, // "Espejo del Crepúsculo"
     };
     trickNameTable[RG_GORON_TUNIC] = {
-        Text{"Gerudo Top", "Tunique Gerudo", "Pechera gerudo"},
-        Text{"Flamebreaker Armor", "Armure de Pierre", "	Armadura ignífuga"},
-        Text{"Red Mail", "Habits Rouges", "Ropas rojas"}
+        Text{ "Gerudo Top", "Tunique Gerudo", "Damengewand" },                  // "Pechera gerudo"
+        Text{ "Flamebreaker Armor", "Armure de Pierre", "Anti-Feuer-Rüstung" }, // "Armadura ignífuga"
+        Text{ "Red Mail", "Habits Rouges", "Rotes Gewand" },                    // "Ropas rojas"
     };
     trickNameTable[RG_ZORA_TUNIC] = {
-        Text{"Rito Tunic", "Tunique Rito", "Sayo rito"},
-        Text{"Mermaid Suit", "Costume de sirène", "Costume de sirène"},
-        Text{"Zora Armor", "Armure Zora", "Túnica Zora"},
-        Text{"Blue Mail", "Habits Bleus", "Ropas azules"}
+        Text{ "Rito Tunic", "Tunique Rito", "Orni-Gewand" },       // "Sayo rito"
+        Text{ "Mermaid Suit", "Costume de sirène", "Nixenanzug" }, // "Costume de sirène"
+        Text{ "Zora Armor", "Armure Zora", "Zora-Panzer" },        // "Túnica Zora"
+        Text{ "Blue Mail", "Habits Bleus", "Blaues Gewand" },      // "Ropas azules"
     };
     trickNameTable[RG_IRON_BOOTS] = {
-        Text{"Iron Hoofs", "Patins de Plomb", "Botas férreas"},
-        Text{"Snow Boots", "Bottes de Neige", "Botas de nieve"},
-        Text{"Red Boots", "Bottes rouges", "Botas rojas"},
-        Text{"Zora Greaves", "Bottes Zora", "Zora Greaves"},
-        Text{"Boots of Power", "Bottes de Puissance", "Botas de plomo"}
+        Text{ "Iron Hoofs", "Patins de Plomb", "Eisenhufe€" },             // "Botas férreas"
+        Text{ "Snow Boots", "Bottes de Neige", "Schneestiefel€" },         // "Botas de nieve"
+        Text{ "Red Boots", "Bottes rouges", "Rote Stiefel€" },             // "Botas rojas"
+        Text{ "Zora Greaves", "Bottes Zora", "Zora-Beinschutz" },          // "Zora Greaves"
+        Text{ "Boots of Power", "Bottes de Puissance", "Stärkestiefel€" }, // "Botas de plomo"
     };
     trickNameTable[RG_HOVER_BOOTS] = {
-        Text{"Hover Hoofs", "Patins des airs", "Botas flotadoras"},
-        Text{"Golden Boots", "Bottes dorées", "Botas de Oro"},
-        Text{"Pegasus Boots", "Bottes pégase", "Botas de Pegaso"},
-        Text{"Boots of Speed", "Bottes de vitesse", "Botas del desierto"}
+        Text{ "Hover Hoofs", "Patins des airs", "Gleithufe€" },         // "Botas flotadoras"
+        Text{ "Golden Boots", "Bottes dorées", "Goldstiefel€" },        // "Botas de Oro"
+        Text{ "Pegasus Boots", "Bottes pégase", "Pegasus-Stiefel€" },   // "Botas de Pegaso"
+        Text{ "Boots of Speed", "Bottes de vitesse", "Tempostiefel€" }, // "Botas del desierto"
     };
     trickNameTable[RG_WEIRD_EGG] = {
-        Text{"Poached Egg", "Oeuf à la coque", "Huevo pasado"},
-        Text{"Lon Lon Egg", "Oeuf Lon Lon", "Huevo Lon Lon"},
-        Text{"Zora Egg", "Oeuf Zora", "Huevo Zora"}
+        Text{ "Poached Egg", "Oeuf à la coque", "Spiegelei" }, // "Huevo pasado"
+        Text{ "Lon Lon Egg", "Oeuf Lon Lon", "Lon Lon-Ei" },   // "Huevo Lon Lon"
+        Text{ "Zora Egg", "Oeuf Zora", "Zora-Ei" },            // "Huevo Zora"
     };
     trickNameTable[RG_ZELDAS_LETTER] = {
-      Text{"Ruto's Letter", "Lettre de Ruto", "Carta de Ruto"},
-        Text{"Royal Letter", "Lettre Eoyale", "Carta para Kafei"},
-        Text{"Zelda's Business Card", "Carte d'affaires de Zelda", "Carta"},
-        Text{"Letter to Kafei", "Lettre pour Kafei", "Carta para Kafei "},
-        Text{"Goat's Letter", "Lettre de la Chèvre", "Carta de la Cabra"},
-        Text{"Maggie's Letter", "Lettre de Maggy", "Carta de Dolores"}
+        Text{ "Ruto's Letter", "Lettre de Ruto", "Rutos Brief" },                            // "Carta de Ruto"
+        Text{ "Royal Letter", "Lettre Eoyale", "Royaler Brief" },                            // "Carta para Kafei"
+        Text{ "Zelda's Business Card", "Carte d'affaires de Zelda", "Zeldas Visitenkarte" }, // "Carta"
+        Text{ "Letter to Kafei", "Lettre pour Kafei", "Brief an Kafei" },                    // "Carta para Kafei"
+        Text{ "Goat's Letter", "Lettre de la Chèvre", "Brief der Ziege" },                   // "Carta de la Cabra"
+        Text{ "Maggie's Letter", "Lettre de Maggy", "Dolores' Brief" },                      // "Carta de Dolores"
     };
     trickNameTable[RG_BOOMERANG] = {
-        Text{"Banana", "Banane", "Plátano"},
-        Text{"Prank Fetch Toy", "Inséparable Bâtonnet", "Bumerang"},
-        Text{"Gale Boomerang", "Boomerang Tornade", "Bumerán tornado"},
-        Text{"Magic Boomerang", "Boomerang Magique", "Bumerán mágico"}
+        Text{ "Banana", "Banane", "Banane" },                                 // "Plátano"
+        Text{ "Prank Fetch Toy", "Inséparable Bâtonnet", "Boomerang" },       // "Bumerang"
+        Text{ "Gale Boomerang", "Boomerang Tornade", "Sturmbumerang" },       // "Bumerán tornado"
+        Text{ "Magic Boomerang", "Boomerang Magique", "Magischer Bumerang" }, // "Bumerán mágico"
     };
     trickNameTable[RG_LENS_OF_TRUTH] = {
-        Text{"Sheikah-leidoscope", "Sheikah-léidoscope", "Monóculo de la Verdad"},
-        Text{"Sheikah Sensor", "Sonar Sheikah", "Sensor Sheikah"},
-        Text{"Crystal of Vision", "Cristal de Vision", "Cristal de Visión"},
-        Text{"Magnifying Lens", "Loupe", "Lente Aumentadora"}
+        Text{ "Sheikah-leidoscope", "Sheikah-léidoscope", "Shiekah-leidoskop" }, // "Monóculo de la Verdad"
+        Text{ "Sheikah Sensor", "Sonar Sheikah", "Shiekah-Sensor" },             // "Sensor Sheikah"
+        Text{ "Crystal of Vision", "Cristal de Vision", "Kristall der Sicht" },  // "Cristal de Visión"
+        Text{ "Magnifying Lens", "Loupe", "Magische Lupe" },                     // "Lente Aumentadora"
     };
     trickNameTable[RG_MEGATON_HAMMER] = {
-        Text{"Goron Gavel", "Masse Perforatrice", "Mazo Goron"},
-        Text{"Magic Hammer", "Marteau Magique", "Martillo mágico"},
-        Text{"Skull Hammer", "Maillet Ressort", "Martillo de hierro"}
+        Text{ "Goron Gavel", "Masse Perforatrice", "Goronen-Hammer" }, // "Mazo Goron"
+        Text{ "Magic Hammer", "Marteau Magique", "Magischer Hammer" }, // "Martillo mágico"
+        Text{ "Skull Hammer", "Maillet Ressort", "Schädel-Hammer" },   // "Martillo de hierro"
     };
     trickNameTable[RG_STONE_OF_AGONY] = {
-        Text{"Cave Charm", "Charme de grotte", "Amuleto de la cueva"},
-        Text{"Stone of Agahnim", "Fragment d'Agahnim", "Piedra de Agahnim"},
-        Text{"Shard of Agony", "Fragment de Souffrance", "Piedra de la Agonía"},
-        Text{"Pirate's Charm", "Pierre de Pirate", "Amuleto Pirata"}
+        Text{ "Cave Charm", "Charme de grotte", "Höhlenamulett" },                 // "Amuleto de la cueva"
+        Text{ "Stone of Agahnim", "Fragment d'Agahnim", "Stein des Agahnim" },     // "Piedra de Agahnim"
+        Text{ "Shard of Agony", "Fragment de Souffrance", "Scherbe des Wissens" }, // "Piedra de la Agonía"
+        Text{ "Pirate's Charm", "Pierre de Pirate", "Links Talisman" },            // "Amuleto Pirata"
     };
     trickNameTable[RG_DINS_FIRE] = {
-        Text{"Eldin's Fire", "Feu d'Eldin", "Fuego de Eldin"},
-        Text{"Din's Blaze", "Flamme de Din", "Poder de Din"},
-        Text{"Magic Lantern", "Lanterne Magique", "Linterna mágica"},
-        Text{"Ether Medallion", "Médaillon d'Éther", "Medallón de Tesoro"},
-        Text{"Bombos Medallion", "Médaillon des Flammes", "Medallón del Temblor"}
+        Text{ "Eldin's Fire", "Feu d'Eldin", "Eldins Feuerinferno" },           // "Fuego de Eldin"
+        Text{ "Din's Blaze", "Flamme de Din", "Dins Flammen" },                 // "Poder de Din"
+        Text{ "Magic Lantern", "Lanterne Magique", "Magische Laterne" },        // "Linterna mágica"
+        Text{ "Ether Medallion", "Médaillon d'Éther", "Luft-Medaillon" },       // "Medallón de Tesoro"
+        Text{ "Bombos Medallion", "Médaillon des Flammes", "Feuer-Medaillon" }, // "Medallón del Temblor"
     };
     trickNameTable[RG_FARORES_WIND] = {
-        Text{"Faron's Wind", "Vent de Firone", "Viento de Farone"},
-        Text{"Farore's Windfall", "Zéphyr de Farore", "Valor de Farore"},
-        Text{"Tingle Air", "Tingle Air", "Tingle de aire"},
-        Text{"Travel Medallion", "Amulette de téléportation", "Medallón Maligno"},
-        Text{"Irene's Taxi", "Le taxi d'Aëline", "El taxi de Airín"}
+        Text{ "Faron's Wind", "Vent de Firone", "Phirones Donnersturm" },              // "Viento de Farone"
+        Text{ "Farore's Windfall", "Zéphyr de Farore", "Farores Wind" },               // "Valor de Farore"
+        Text{ "Tingle Air", "Tingle de aire", "Tingle Luft" },                         // "Tingle Air"
+        Text{ "Travel Medallion", "Amulette de téléportation", "Teleport-Medaillon" }, // "Medallón Maligno"
+        Text{ "Irene's Taxi", "Le taxi d'Aëline", "Irenes Taxi" },                     // "El taxi de Airín"
     };
     trickNameTable[RG_NAYRUS_LOVE] = {
-        Text{"Lanayru's Love", "Amour de Lanelle", "Amor de Lanayru"},
-        Text{"Nayru's Passion", "Passion de Nayru", "Sabiduría de Nayru"},
-        Text{"Tingle Shield", "Bouclier Tingle", "Escudo de hormigueo"},
-        Text{"Shield Spell", "Bouclier Magique", "Hechizo de Protección"},
-        Text{"Magic Armor", "Armure Magique", "Armadura mágica"}
+        Text{ "Lanayru's Love", "Amour de Lanelle", "Ranelles Umarmung" }, // "Amor de Lanayru"
+        Text{ "Nayru's Passion", "Passion de Nayru", "Nayrus Hingabe" },   // "Sabiduría de Nayru"
+        Text{ "Tingle Shield", "Bouclier Tingle", "Tingleschild" },        // "Escudo de hormigueo"
+        Text{ "Shield Spell", "Bouclier Magique", "Schildzauber" },        // "Hechizo de Protección"
+        Text{ "Magic Armor", "Armure Magique", "Magie-Rüstung" },          // "Armadura mágica"
     };
     trickNameTable[RG_FIRE_ARROWS] = {
-        Text{"Fire Rod", "Baguette de feu", "Cetro de fuego"},
-        Text{"Bomb Arrow", "Flèche-Bombe", "Flecha bomba"},
-        Text{"Red Candle", "Bougie Rouge", "Vela roja"}
+        Text{ "Fire Rod", "Baguette de feu", "Feuerstab" },     // "Cetro de fuego"
+        Text{ "Bomb Arrow", "Flèche-Bombe", "Bomben-Pfeile€" }, // "Flecha bomba"
+        Text{ "Red Candle", "Bougie Rouge", "Rote Kerze" },     // "Vela roja"
     };
     trickNameTable[RG_ICE_ARROWS] = {
-        Text{"Ice Rod", "Baguette des Glaces", "Cetro de Hielo"},
-        Text{"Ancient Arrow", "Flèche Archéonique", "Flecha ancestral"},
-        Text{"Ice Trap Arrow", "Flèche de Piège de Glace", "Cetro de hielo"}
+        Text{ "Ice Rod", "Baguette des Glaces", "Eisstab" },                       // "Cetro de Hielo"
+        Text{ "Ancient Arrow", "Flèche Archéonique", "Antike Pfeile€" },           // "Flecha ancestral"
+        Text{ "Ice Trap Arrow", "Flèche de Piège de Glace", "Eisfallen-Pfeile€" }, // "Cetro de hielo"
     };
     trickNameTable[RG_LIGHT_ARROWS] = {
-        Text{"Wind Arrow", "Flèche de Vent", "Flecha del Viento"},
-        Text{"Wand of Gamelon", "Baguette de Gamelon", "Varita de Gamelón"},
-        Text{"Shock Arrow", "Flèches Électriques", "Flecha eléctrica"},
-        Text{"Silver Arrow", "Flèches d'Argent", "Flecha de plata"}
+        Text{ "Wind Arrow", "Flèche de Vent", "Wind-Pfeile€" },                     // "Flecha del Viento"
+        Text{ "Wand of Gamelon", "Baguette de Gamelon", "Zauberstab von Gamelon" }, // "Varita de Gamelón"
+        Text{ "Shock Arrow", "Flèches Électriques", "Elektro-Pfeile€" },            // "Flecha eléctrica"
+        Text{ "Silver Arrow", "Flèches d'Argent", "Silber-Pfeile€" },               // "Flecha de plata"
     };
     trickNameTable[RG_GERUDO_MEMBERSHIP_CARD] = {
-        Text{"Desert Title Deed", "Abonnement Gerudo", "Escritura del desierto"},
-        Text{"Sickle Moon Flag", "Drapeau du croissant de lune", "Bandera de la Luna Creciente"},
-        Text{"Complimentary ID", "Bon de félicitation", "Cupón especial"},
-        Text{"Gerudo's Card", "Carte Goron", "Tóken Gerudo"},
-        Text{"Gerudo's Membership Card", "Autographe de Nabooru", "Tarjeta Gerudo"}
+        Text{ "Desert Title Deed", "Abonnement Gerudo", "Wüsten-Urkunde" }, // "Escritura del desierto"
+        Text{ "Sickle Moon Flag", "Drapeau du croissant de lune",
+              "Mondsichel-Fahne" },                                           // "Bandera de la Luna Creciente"
+        Text{ "Complimentary ID", "Bon de félicitation", "Laudatio-Schein" }, // "Cupón especial"
+        Text{ "Gerudo's Card", "Carte Goron", "Gerudo-Symbol" },              // "Tóken Gerudo"
+        Text{ "Gerudo's Membership Card", "Autographe de Nabooru", "Gerudo-Mitgliedskarte" }, // "Tarjeta Gerudo"
     };
 
     trickNameTable[RG_MAGIC_BEAN_PACK] = {
-        Text{"Funky Bean Pack", "Paquet de Fèves Magiques", "Lote de frijoles mágicos"},
-        Text{"Grapple Berries", "Baies de grappin", "Bayas de garfio"},
-        Text{"Crenel Bean Pack", "Paquet de Haricots Gonggle", "Lote de alubias mágicas"},
-        Text{"Mystical Seed Pack", "Pack de graines mystiques", "Paquete de semillas místicas"}
+        Text{ "Funky Bean Pack", "Paquet de Fèves Magiques", "Wunderbohnen-Packung" },    // "Lote de frijoles mágicos"
+        Text{ "Grapple Berries", "Baies de grappin", "Grapple-Beeren€" },                 // "Bayas de garfio"
+        Text{ "Crenel Bean Pack", "Paquet de Haricots Gonggle", "Gongolerbsen-Packung" }, // "Lote de alubias mágicas"
+        Text{ "Mystical Seed Pack", "Pack de graines mystiques", "Saatbeutel" }, // "Paquete de semillas místicas"
     };
     trickNameTable[RG_DOUBLE_DEFENSE] = {
-        Text{"Diamond Hearts", "Coeurs de Diamant", "Contenedor de diamante"},
-        Text{"Double Damage", "Double Souffrance", "Doble daño receptivo"},
-        Text{"Quadruple Defence", "Quadruple Défence", "Defensa cuádruple"}
+        Text{ "Diamond Hearts", "Coeurs de Diamant", "Diamantherzen€" },            // "Contenedor de diamante"
+        Text{ "Double Damage", "Double Souffrance", "Doppelte Angriffskraft" },     // "Doble daño receptivo"
+        Text{ "Quadruple Defence", "Quadruple Défence", "Vierfache Verteidigung" }, // "Defensa cuádruple"
     };
 
     trickNameTable[RG_POCKET_EGG] = {
-        Text{"Arpagos Egg", "Oeuf d'Arpagos", "Huevo de Arpagos"},
-        Text{"Lon Lon Egg", "oeuf Lon Lon", "Huevo Lon Lon"},
-        Text{"Zora Egg", "oeuf Zora", "Huevo del Pez Viento"}
+        Text{ "Arpagos Egg", "Oeuf d'Arpagos", "Arpagos-Ei" }, // "Huevo de Arpagos"
+        Text{ "Lon Lon Egg", "oeuf Lon Lon", "Lon Lon-Ei" },   // "Huevo Lon Lon"
+        Text{ "Zora Egg", "oeuf Zora", "Zora-Ei" },            // "Huevo del Pez Viento"
     };
     trickNameTable[RG_POCKET_EGG] = {
-        Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada portátil"},
-        Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
-        Text{"Hatched Cucco", "Cocotte éclose", "Pollo de bolsillo"}
+        Text{ "D.I.Y. Alarm Clock", "Réveille-matin improvisé",
+              "Improvisierter Wecker" },                                 // "Alarma emplumada portátil"
+        Text{ "Kakariko Cucco", "Cocotte Cocorico", "Kakariko-Huhn" },   // "Cuco de Kakariko"
+        Text{ "Hatched Cucco", "Cocotte éclose", "Geschlüpftes Küken" }, // "Pollo de bolsillo"
     };
     trickNameTable[RG_COJIRO] = {
-        Text{"Blucco", "Chair-Qui-Poule", "Cucazul"},
-        Text{"Piyoko", "Piyoko", "Piyoko"},
-        Text{"Dark Cucco", "Cocotte Sombre", "Cucco oscuro"},
-        Text{"Grog's Cucco", "Cocotte de Grog", "Cuco de Grog"}
+        Text{ "Blucco", "Chair-Qui-Poule", "Blenni" },           // "Cucazul"
+        Text{ "Piyoko", "Piyoko", "Piyoko" },                    // "Piyoko"
+        Text{ "Dark Cucco", "Cocotte Sombre", "Dunkles Huhn" },  // "Cucco oscuro"
+        Text{ "Grog's Cucco", "Cocotte de Grog", "Grogs Huhn" }, // "Cuco de Grog"
     };
     trickNameTable[RG_ODD_MUSHROOM] = {
-        Text{"Magic Mushroom", "Champignon magique", "Champiñón mágico"},
-        Text{"Endura Shroom", "Champi Vigueur", "Champiñón del bosque"},
-        Text{"Sleepy Toadstool", "Crapaud Fatigué", "Seta durmiente"},
-        Text{"Mushroom", "Champignon", "Seta"}
+        Text{ "Magic Mushroom", "Champignon magique", "Magischer Pilz" },  // "Champiñón mágico"
+        Text{ "Endura Shroom", "Champi Vigueur", "Fittling" },             // "Champiñón del bosque"
+        Text{ "Sleepy Toadstool", "Crapaud Fatigué", "Schlummermorchel" }, // "Seta durmiente"
+        Text{ "Mushroom", "Champignon", "Pilz" },                          // "Seta"
     };
     trickNameTable[RG_ODD_POTION] = {
-        Text{"Odd Medicine", "Élixir suspect", "Poción rara"},
-        Text{"Granny's Poultice", "Mixture de Granny", "Medicina de la abuela"},
-        Text{"Mushroom Poultice", "Mixture de champignon", "Medicina de champiñones"},
-        Text{"Secret Medicine", "Médicament", "Pócima secreta"},
-        Text{"Mushroom Spores", "Spores de Champignons", "Esporas de hongos"},
-        Text{"Hanyu Spore", "Hanyu Spore", "Espora Hanyu"}
+        Text{ "Odd Medicine", "Élixir suspect", "Moderpaket" },               // "Poción rara"
+        Text{ "Granny's Poultice", "Mixture de Granny", "Omas Mixtur" },      // "Medicina de la abuela"
+        Text{ "Mushroom Poultice", "Mixture de champignon", "Pilzumschlag" }, // "Medicina de champiñones"
+        Text{ "Secret Medicine", "Médicament", "Geheime Medizin" },           // "Pócima secreta"
+        Text{ "Mushroom Spores", "Spores de Champignons", "Pilzsporen" },     // "Esporas de hongos"
+        Text{ "Hanyu Spore", "Hanyu Spore", "Hanyu-Sporen" },                 // "Espora Hanyu"
     };
     trickNameTable[RG_POACHERS_SAW] = {
-        Text{"Carpenter's Saw", "Scie du charpentier", "Sierra del carpintero"},
-        Text{"Poacher's Sword", "Hache du chasseur", "Espada del capataz"},
-        Text{"Ancient Bladesaw", "Longue Épée Archéonique", "Mandoble ancestral"},
-        Text{"Woodcutter's Axe", "Hache du Bûcheron", "Hacha de leñador"},
-        Text{"Grog's Saw", "Scie de Grog", "Sierra del Cazador Furtivo"}
+        Text{ "Carpenter's Saw", "Scie du charpentier", "Zimmermannssäge" },      // "Sierra del carpintero"
+        Text{ "Poacher's Sword", "Hache du chasseur", "Wildererschwert" },        // "Espada del capataz"
+        Text{ "Ancient Bladesaw", "Longue Épée Archéonique", "Antike Großsäge" }, // "Mandoble ancestral"
+        Text{ "Woodcutter's Axe", "Hache du Bûcheron", "Holzfälleraxt" },         // "Hacha de leñador"
+        Text{ "Grog's Saw", "Scie de Grog", "Grogs Säge" },                       // "Sierra del Cazador Furtivo"
     };
     trickNameTable[RG_BROKEN_SWORD] = {
-        Text{"Broken Biggoron's Sword", "Épée brisée de Grogoron", "Espada de Biggoron rota"},
-        Text{"Broken Giant's Knife", "Lame des Géants brisée", "Daga gigante rota"},
-        Text{"Broken Noble Sword", "Épée noble brisée", "Espada noble rota"},
-        Text{"Broken Picori Blade", "Épée Minish brisée", "Espada minish rota"},
-        Text{"Decayed Master Sword", "Épée de légende pourrie", "Espada decadente de leyenda"}
+        Text{ "Broken Biggoron's Sword", "Épée brisée de Grogoron",
+              "zerbr. Biggoron-Schwert" },                                                // "Espada de Biggoron rota"
+        Text{ "Broken Giant's Knife", "Lame des Géants brisée", "zerbr. Langschwert" },   // "Daga gigante rota"
+        Text{ "Broken Noble Sword", "Épée noble brisée", "zerbr. Edelschwert" },          // "Espada noble rota"
+        Text{ "Broken Picori Blade", "Épée Minish brisée", "zerbr. Schwert der Minish" }, // "Espada minish rota"
+        Text{ "Decayed Master Sword", "Épée de légende pourrie",
+              "zerfr. Master-Schwert" }, // "Espada decadente de leyenda"
     };
     trickNameTable[RG_PRESCRIPTION] = {
-        Text{"Biggoron's Prescription", "Ordonnance de Grogoron", "Receta de Biggoron"},
-        Text{"Eyedrop Prescription", "Ordonnance de gouttes", "Receta ocular"},
-        Text{"Urgent Prescription", "Ordonnance urgente", "Prescripción"},
-        Text{"Swordsman's Scroll", "Précis d'escrime", "Esgrimidorium"},
-        Text{"Portrait of Oren", "Portrait d'Orlène", "Retrato de Oren"},
-        Text{"Letter to King Zora", "Lettre au roi Zora", "Carta al Rey Zora"}
+        Text{ "Biggoron's Prescription", "Ordonnance de Grogoron", "Biggorons Rezept" }, // "Receta de Biggoron"
+        Text{ "Eyedrop Prescription", "Ordonnance de gouttes", "Augentropfen-Rezept" },  // "Receta ocular"
+        Text{ "Urgent Prescription", "Ordonnance urgente", "Dringendes Rezept" },        // "Prescripción"
+        Text{ "Swordsman's Scroll", "Précis d'escrime", "Schwert-Rolle" },               // "Esgrimidorium"
+        Text{ "Portrait of Oren", "Portrait d'Orlène", "Portrait von Oreen" },           // "Retrato de Oren"
+        Text{ "Letter to King Zora", "Lettre au roi Zora", "Brief an König Zora" },      // "Carta al Rey Zora"
     };
     trickNameTable[RG_EYEBALL_FROG] = {
-        Text{"Don Gero", "Don Gero", "Don Gero"},
-        Text{"Hot-Footed Frog", "Grenouille à pieds chauds", "Rana de patas calientes"},
-        Text{"Lost Swordsmith", "Forgeron perdu", "Espadachín perdido"},
-        Text{"Eyedrop Frog", "Grenouille-qui-louche", "Globo Ocular de Rana"}
+        Text{ "Don Gero", "Don Gero", "Don Gero" },                             // "Don Gero"
+        Text{ "Hot-Footed Frog", "Grenouille à pieds chauds", "Spurtkröte" },   // "Rana de patas calientes"
+        Text{ "Lost Swordsmith", "Forgeron perdu", "Vermisster Schmied" },      // "Espadachín perdido"
+        Text{ "Eyedrop Frog", "Grenouille-qui-louche", "Augentropfen-Frosch" }, // "Globo Ocular de Rana"
     };
     trickNameTable[RG_EYEDROPS] = {
-        Text{"Biggoron's Eyedrops", "Gouttes de Grogoron", "Gotas de Biggoron"},
-        Text{"Hyrule's Finest Eyedrops", "Eau du Lac Hylia", "Gotas oculares"},
-        Text{"Moon's Tear", "Larme de Lune", "Lágrima de Luna"},
-        Text{"Engine Grease", "Graisse moteur", "Grasa del motor"},
-        Text{"Zora Perfume", "Parfum Zora", "Perfume Zora"}
+        Text{ "Biggoron's Eyedrops", "Gouttes de Grogoron", "Biggorons Augentropfen" },       // "Gotas de Biggoron"
+        Text{ "Hyrule's Finest Eyedrops", "Eau du Lac Hylia", "Hyrules beste Augentropfen" }, // "Gotas oculares"
+        Text{ "Moon's Tear", "Larme de Lune", "Mondträne" },                                  // "Lágrima de Luna"
+        Text{ "Engine Grease", "Graisse moteur", "Schmierfett" },                             // "Grasa del motor"
+        Text{ "Zora Perfume", "Parfum Zora", "Zora-Parfüm" },                                 // "Perfume Zora"
     };
     trickNameTable[RG_CLAIM_CHECK] = {
-        Text{"Clay Check", "Certificat Grogoron", "Comprobante de Reclamación"},
-        Text{"Ancient Tablet", "Stèle ancienne", "Litografía arcana"},
-        Text{"Sheikah Slate", "Tablette Sheikah", "Piedra Sheikah"},
-        Text{"Cyclone Slate", "Ardoise des tornades", "Pizarra de los Torbellinos"}
+        Text{ "Clay Check", "Certificat Grogoron", "Berg-Urkunde" },      // "Comprobant e de Reclamación"
+        Text{ "Ancient Tablet", "Stèle ancienne", "Alte Steintafel" },    // "Litografía arcana"
+        Text{ "Sheikah Slate", "Tablette Sheikah", "Shiekah-Stein" },     // "Piedra Sheikah"
+        Text{ "Cyclone Slate", "Ardoise des tornades", "Froschkompass" }, // "Pizarra de los Torbellinos"
     };
 
     trickNameTable[RG_GOLD_SKULLTULA_TOKEN] = {
-        Text{"Skulltula Token", "Bon de Skulltula dorée", "Símbolo de Skulltula"},
-        Text{"Golden Skulltula Spirit", "Pièce de Skulltula dorée", "Tóken de Skulltula Dorada"},
-        Text{"Gold Walltula Token", "Jeton de Walltula dorée", "Skulltula dorada"},
-        Text{"Maiamai", "Ti'gorneau", "Maimai"},
-        Text{"Gratitude Crystal", "Cristal de gratitude", "Gema de gratitud"},
-        Text{"Korok Seed", "Noix korogu", "Semilla de kolog"}
+        Text{ "Skulltula Token", "Bon de Skulltula dorée", "Skulltula-Beweis" },          // "Símbolo de Skulltula"
+        Text{ "Golden Skulltula Spirit", "Pièce de Skulltula dorée", "Skulltula-Seele" }, // "Tóken de Skulltula Dorada"
+        Text{ "Gold Walltula Token", "Jeton de Walltula dorée", "Walltula-Symbol" },      // "Skulltula dorada"
+        Text{ "Maiamai", "Ti'gorneau", "Maimai" },                                        // "Maimai"
+        Text{ "Gratitude Crystal", "Cristal de gratitude", "Juwel der Güte" },            // "Gema de gratitud"
+        Text{ "Korok Seed", "Noix korogu", "Krog-Samen" },                                // "Semilla de kolog"
     };
 
     trickNameTable[RG_PROGRESSIVE_HOOKSHOT] = {
-        Text{"Progressive Grappling Hook", "Lance-chaîne (prog.)", "Garra progresiva"},
-        Text{"Progressive Clawshot", "Grappin-griffe (prog.)", "Zarpa progresiva"},
-        Text{"Progressive Gripshot", "Grappince (prog.)", "Enganchador progresivo"},
-        Text{"Progressive Rope", "Corde (prog.)", "Cuerda progresivo"}
+        Text{ "Progressive Grappling Hook", "Lance-chaîne (prog.)", "Enterhaken (prog.)" }, // "Garra progresiva"
+        Text{ "Progressive Clawshot", "Grappin-griffe (prog.)", "Greifhaken (prog.)" },     // "Zarpa progresiva"
+        Text{ "Progressive Gripshot", "Grappince (prog.)", "Tauschhaken (prog.)" },         // "Enganchador progresivo"
+        Text{ "Progressive Rope", "Corde (prog.)", "Giftwurm (prog.)" },                    // "Cuerda progresivo"
     };
     trickNameTable[RG_PROGRESSIVE_STRENGTH] = {
-        Text{"Power Glove", "Gant de Puissance (prog.)", "Guanteletes progresivos"},
-        Text{"Power Bracelet", "Bracelet de Force (prog.)", "Brasaletes progresivos"},
-        Text{"Magic Bracelet", "Bracelet Magique (prog.)", "Manoplas progresivas"}
+        Text{ "Power Glove", "Gant de Puissance (prog.)", "Krafthandschuh (prog.)" },  // "Guanteletes progresivos"
+        Text{ "Power Bracelet", "Bracelet de Force (prog.)", "Kraftarmband (prog.)" }, // "Brasaletes progresivos"
+        Text{ "Magic Bracelet", "Bracelet Magique (prog.)", "Magiearmband (prog.)" },  // "Manoplas progresivas"
     };
     trickNameTable[RG_PROGRESSIVE_BOMB_BAG] = {
-        Text{"Progressive Bomb Capacity", "Capacité de bombes (prog.)", "Mayor capacidad de bombas"},
-        Text{"Progressive Bomb Pack", "Paquet de bombes (prog.)", "Zurrón de bombas progresivo"},
-        Text{"Progressive Bomb Box", "Boîte à bombes (prog.)", "Bolsa de bombas progresiva"},
-        Text{"Progressive Blast Mask", "Masque d'Explosion (prog.)", "Máscara explosiva progresiva"},
-        Text{"Progressive Powder Kegs", "Baril de Poudre (prog.)", "Barril de polvo progresivo"},
-        Text{"Progressive Remote Bombs", "Bombes à distance (prog.)", "Bombas remotas progresivas"}
+        Text{ "Progressive Bomb Capacity", "Capacité de bombes (prog.)",
+              "Bomben-Kapazität (prog.)" }, // "Mayor capacidad de bombas"
+        Text{ "Progressive Bomb Pack", "Paquet de bombes (prog.)",
+              "Bombenrucksack (prog.)" }, // "Zurrón de bombas progresivo"
+        Text{ "Progressive Bomb Box", "Boîte à bombes (prog.)",
+              "Bombenschachtel (prog.)" }, // "Bolsa de bombas progresiva"
+        Text{ "Progressive Blast Mask", "Masque d'Explosion (prog.)",
+              "Ka-Bumm-Maske (prog.)" }, // "Máscara explosiva progresiva"
+        Text{ "Progressive Powder Kegs", "Baril de Poudre (prog.)",
+              "Pulverfass (prog.)" }, // "Barril de polvo progresivo"
+        Text{ "Progressive Remote Bombs", "Bombes à distance (prog.)",
+              "Fernzünderbomben (prog.)€" }, // "Bombas remotas progresivas"
     };
     trickNameTable[RG_PROGRESSIVE_BOW] = {
-        Text{"Progressive Arrow Capacity", "Capacité de flèches (prog.)", "Mayor capacidad de flechas"},
-        Text{"Progressive Hero's Bow", "Arc du héros (prog.)", "Arco del héroe progresivo"},
-        Text{"Progressive Arrow Holder", "Arbalète (prog.)", "Ballesta progresiva"},
-        Text{"Progressive Crossbow", "Arbalète (prog.)", "Ballesta progresiva"},
-        Text{"Progressive Sacred Bow", "Arc sacré (prog)", "Arco Sagrado Progresivo"},
-        Text{"Progressive Lynel Bow", "Arc de Lynel (prog.)", "Arco de centaleón Progresivo"}
+        Text{ "Progressive Arrow Capacity", "Capacité de flèches (prog.)",
+              "Pfeil-Kapazität (prog.)" },                                               // "Mayor capacidad de flechas"
+        Text{ "Progressive Hero's Bow", "Arc du héros (prog.)", "Heroenbogen (prog.)" }, // "Arco del héroe progresivo"
+        Text{ "Progressive Arrow Holder", "Arbalète (prog.)", "Köcher (prog.)" },        // "Ballesta progresiva"
+        Text{ "Progressive Crossbow", "Arbalète (prog.)", "Armbrust (prog.)" },          // "Ballesta progresiva"
+        Text{ "Progressive Sacred Bow", "Arc sacré (prog)", "Heiliger Bogen (prog.)" },  // "Arco Sagrado Progresivo"
+        Text{ "Progressive Lynel Bow", "Arc de Lynel (prog.)",
+              "Leunenbogen (prog.)" }, // "Arco de centaleón Progresivo"
     };
     trickNameTable[RG_PROGRESSIVE_SLINGSHOT] = {
-        Text{"Progressive Seed Capacity", "Capacité de graines (prog.)", "Mayor capacidad de semillas"},
-        Text{"Progressive Catapult", "Catapulte (prog.)", "Catapulta progresiva"},
-        Text{"Progressive Scattershot", "Lance-Pierre rafale (prog.)", "Resortera múltiple progresiva"},
-        Text{"Progressive Seed Launcher", "Lanceur de semences (prog.)", "Lanzador de semillas progresivo"},
-        Text{"Progressive Seed Satchel", "Sac de graines (prog.)", "Bolsa de semillas progresiva"}
+        Text{ "Progressive Seed Capacity", "Capacité de graines (prog.)",
+              "Kern-Kapazität (prog.)" },                                        // "Mayor capacidad de semillas"
+        Text{ "Progressive Catapult", "Catapulte (prog.)", "Katapult (prog.)" }, // "Catapulta progresiva"
+        Text{ "Progressive Scattershot", "Lance-Pierre rafale (prog.)",
+              "Streuschleuder (prog.)" }, // "Resortera múltiple progresiva"
+        Text{ "Progressive Seed Launcher", "Lanceur de semences (prog.)",
+              "Blasrohr (prog.)" }, // "Lanzador de semillas progresivo"
+        Text{ "Progressive Seed Satchel", "Sac de graines (prog.)",
+              "Saatbeutel (prog.)" }, // "Bolsa de semillas progresiva"
     };
     trickNameTable[RG_PROGRESSIVE_WALLET] = {
-        Text{"Progressive Rupee Capacity", "Capacité de rubis (prog.)", "Mayor capacidad de rupias"},
-        Text{"Progressive Purse", "Sacoche (prog.)", "Cartera de rupias progresiva"},
-        Text{"Progressive Rupee Bag", "Sac à rubis (prog.)", "Zurrón de rupias progresivo"},
-        Text{"Progressive Rupoor Capacity", "Capacité de Roupir (prog.)", "Capacidad progresiva Rupobre"},
-        Text{"Progressive Spoils Bag", "Sac à Butin (prog.)", "Bolsa de trofeos progresiva"},
-        Text{"Progressive Ruby Bag", "Capacité du sac Ruby (prog.)", "Bolso Ruby progresivo"}
+        Text{ "Progressive Rupee Capacity", "Capacité de rubis (prog.)",
+              "Rubin-Kapazität (prog.)" },                                             // "Mayor capacidad de rupias"
+        Text{ "Progressive Purse", "Sacoche (prog.)", "Portemonnaie (prog.)" },        // "Cartera de rupias progresiva"
+        Text{ "Progressive Rupee Bag", "Sac à rubis (prog.)", "Rubintasche (prog.)" }, // "Zurrón de rupias progresivo"
+        Text{ "Progressive Rupoor Capacity", "Capacité de Roupir (prog.)",
+              "Rubinfalle (prog.)" }, // "Capacidad progresiva Rupobre"
+        Text{ "Progressive Spoils Bag", "Sac à Butin (prog.)", "Beutetasche (prog.)" }, // "Bolsa de trofeos progresiva"
+        Text{ "Progressive Ruby Bag", "Capacité du sac Ruby (prog.)", "Rubytasche (prog.)" }, // "Bolso Ruby progresivo"
     };
     trickNameTable[RG_PROGRESSIVE_SCALE] = {
-        Text{"Progressive Flippers", "Palmes de Zora (prog.)", "Aletas de zora progresiva"},
-        Text{"Progressive Dragon's Scale", "Écaille du dragon d'eau (prog.)", "Escama dragón acuático progresiva"},
-        Text{"Progressive Diving Ability", "Plongée (prog.)", "Buceo progresivo"},
-        Text{"Progressive Pearl", "Perle (prog.)", "Perla progresiva"},
-        Text{"Progressive Scute", "Bulle (prog.)", "Fragmento Zora progresivo"}
+        Text{ "Progressive Flippers", "Palmes de Zora (prog.)",
+              "Schwimmflossen (prog.)€" }, // "Aletas de zora progresiva"
+        Text{ "Progressive Dragon's Scale", "Écaille du dragon d'eau (prog.)",
+              "Drachen-Schuppe (prog.)" }, // "Escama dragón acuático progresiva"
+        Text{ "Progressive Diving Ability", "Plongée (prog.)", "Tauchfähigkeit (prog.)" }, // "Buceo progresivo"
+        Text{ "Progressive Pearl", "Perle (prog.)", "Perle (prog.)" },                     // "Perla progresiva"
+        Text{ "Progressive Scute", "Bulle (prog.)", "Schuppe (prog.)" }, // "Fragmento Zora progresivo"
     };
     trickNameTable[RG_PROGRESSIVE_NUT_UPGRADE] = {
-        Text{"Progressive Nut Pack", "Paquet de noix (prog.)", "Mayor capacidad de semillas"},
-        Text{"Progressive Bait Bag", "Sac à Appâts (prog.)", "Bolsa de cebo progresiva"},
-        Text{"Progressive Pear Capacity", "Capacité de poire (prog.)", "Capacidad progresiva de pera"},
-        Text{"Progressive Nut Bag", "Sac de noix (prog.)", "Bolsa de nueces progresiva"},
-        Text{"Progressive Husk Capacity", "Capacité de noisettes (prog.)", "Mayor capacidad de castañas"}
+        Text{ "Progressive Nut Pack", "Paquet de noix (prog.)",
+              "Nußrucksack (prog.)" },                                                  // "Mayor capacidad de semillas"
+        Text{ "Progressive Bait Bag", "Sac à Appâts (prog.)", "Futtertasche (prog.)" }, // "Bolsa de cebo progresiva"
+        Text{ "Progressive Pear Capacity", "Capacité de poire (prog.)",
+              "Putput-Kapazität (prog.)" },                                        // "Capacidad progresiva de pera"
+        Text{ "Progressive Nut Bag", "Sac de noix (prog.)", "Nußbeutel (prog.)" }, // "Bolsa de nueces progresiva"
+        Text{ "Progressive Husk Capacity", "Capacité de noisettes (prog.)",
+              "Schalen-Kapazität (prog.)€" }, // "Mayor capacidad de castañas"
     };
     trickNameTable[RG_PROGRESSIVE_STICK_UPGRADE] = {
-        Text{"Progressive Stick Bag", "Sac de bâtons (prog.)", "Mayor capacidad de ramas deku"},
-        Text{"Progressive Stick Pack", "Paquet de bâtons Mojo (prog.)", "Mayor capacidad de bastones"},
-        Text{"Progressive Branch Capacity", "Capacité de la succursale (prog.)", "Capacidad progresiva de la sucursal"},
-        Text{"Progressive Rod Capacity", "Capacité de tiges (prog.)", "Mayor capacidad de cetros deku"}
+        Text{ "Progressive Stick Bag", "Sac de bâtons (prog.)",
+              "Stabbeutel (prog.)" }, // "Mayor capacidad de ramas deku"
+        Text{ "Progressive Stick Pack", "Paquet de bâtons Mojo (prog.)",
+              "Stabrucksack (prog.)" }, // "Mayor capacidad de bastones"
+        Text{ "Progressive Branch Capacity", "Capacité de la succursale (prog.)",
+              "Ast-Kapazität (prog.)" }, // "Capacidad progresiva de la sucursal"
+        Text{ "Progressive Rod Capacity", "Capacité de tiges (prog.)",
+              "Stock-Kapazität (prog.)" }, // "Mayor capacidad de cetros deku"
     };
     trickNameTable[RG_PROGRESSIVE_BOMBCHUS] = {
-        Text{"Progressive Bomblings", "Bombinsectes (prog.)", "Bombinsectos progresivos"},
-        Text{"Progressive Sentrobe Bombs", "Bombe de Sphérodrone (prog.)", "Bomba de helicobot progresivo"},
-        Text{"Progressive Bomb-ombs", "Bombe Soldat (prog.)", "Soldado bomba progresivo"},
-        Text{"Progressive Missiles", "Missiles (prog.)", "Misiles progresivos"},
-        Text{"Progressive Bombchu Bag", "Sac à Bombchu (prog.)", "Bombachus progresivos"}
+        Text{ "Progressive Bomblings", "Bombinsectes (prog.)", "Bombenmäuse (prog.)€" }, // "Bombinsectos progresivos"
+        Text{ "Progressive Sentrobe Bombs", "Bombe de Sphérodrone (prog.)",
+              "Rokopterbomben (prog.)€" },                                          // "Bomba de helicobot progresivo"
+        Text{ "Progressive Bomb-ombs", "Bombe Soldat (prog.)", "Bob-omb (prog.)" }, // "Soldado bomba progresivo"
+        Text{ "Progressive Missiles", "Missiles (prog.)", "Missiles (prog.)€" },    // "Misiles progresivos"
+        Text{ "Progressive Bombchu Bag", "Sac à Bombchu (prog.)",
+              "Krabbelminenbeutel (prog.)" }, // "Bombachus progresivos"
     };
     trickNameTable[RG_PROGRESSIVE_MAGIC_METER] = {
-        Text{"Progressive Stamina Meter", "Jauge d'endurance (prog.)", "Medidor de vigor progresivo"},
-        Text{"Progressive Energy Gauge", "Jauge d'énergie (prog.)", "Medidor de energía progresivo"},
-        Text{"Progressive Magic Powder", "Poudre magique (prog.)", "Medidor de carga progresivo"}
+        Text{ "Progressive Stamina Meter", "Jauge d'endurance (prog.)",
+              "Ausdauer (prog.)" }, // "Medidor de vigor progresivo"
+        Text{ "Progressive Energy Gauge", "Jauge d'énergie (prog.)",
+              "Energie (prog.)" }, // "Medidor de energía progresivo"
+        Text{ "Progressive Magic Powder", "Poudre magique (prog.)",
+              "Zauberpulver (prog.)" }, // "Medidor de carga progresivo"
     };
     trickNameTable[RG_PROGRESSIVE_OCARINA] = {
-        Text{"Progressive Memento", "Souvenir (prog.)", "Silbato progresivo"},
-        Text{"Progressive Whistle", "Siffler (prog.)", "Silbido progresivo"},
-        Text{"Progressive Flute", "Flûte (prog.)", "Flauta progresiva"},
-        Text{"Progressive Recorder", "Harmonica (prog.)", "Armónica progresiva"}
+        Text{ "Progressive Memento", "Souvenir (prog.)", "Souvenir (prog.)" },   // "Silbato progresivo"
+        Text{ "Progressive Whistle", "Siffler (prog.)", "Pfeife (prog.)" },      // "Silbido progresivo"
+        Text{ "Progressive Flute", "Flûte (prog.)", "Flöte (prog.)" },           // "Flauta progresiva"
+        Text{ "Progressive Recorder", "Harmonica (prog.)", "Rekorder (prog.)" }, // "Armónica progresiva"
     };
     trickNameTable[RG_PROGRESSIVE_GORONSWORD] = {
-        Text{"Progressive Titan Blade", "Lame des Titans (prog.)", "Hoja del Titán progresiva"},
-        Text{"Progressive Goron Knife", "Lame Goron (prog.)", "Daga Goron progresiva"},
-        Text{"Progressive Giant Sword", "Épée géante (prog.)", "Espada gigante progresiva"},
-        Text{"Progressive Darknut Sword", "Épée de Darknut (prog.)", "Espada Darknut progresiva"},
-        Text{"Progressive Power Sword", "Épée de Puissance (prog.)", "Espada de poder progresiva"},
-        Text{"Progressive Big Stabby", "Gros coup de poignard (prog.)", "Gran puñalada progresiva"}
+        Text{ "Progressive Titan Blade", "Lame des Titans (prog.)",
+              "Titanenklinge (prog.)" }, // "Hoja del Titán progresiva"
+        Text{ "Progressive Goron Knife", "Lame Goron (prog.)", "Goronenmesser (prog.)" }, // "Daga Goron progresiva"
+        Text{ "Progressive Giant Sword", "Épée géante (prog.)",
+              "Riesenschwert (prog.)" }, // "Espada gigante progresiva"
+        Text{ "Progressive Darknut Sword", "Épée de Darknut (prog.)",
+              "Gardeschwert (prog.)" }, // "Espada Darknut progresiva"
+        Text{ "Progressive Power Sword", "Épée de Puissance (prog.)",
+              "Schwert der Macht (prog.)" }, // "Espada de poder progresiva"
+        Text{ "Progressive Big Stabby", "Gros coup de poignard (prog.)",
+              "Großschwert (prog.)" }, // "Gran puñalada progresiva"
     };
 
     trickNameTable[RG_EMPTY_BOTTLE] = {
-        Text{"Empty Canteen", "Cantine vide", "cantimplora vacía"},
-        Text{"Vial of Winds", "Fiole de vents", "Vial de Vientos"},
-        Text{"Tingle Bottle", "Flacon de Tingle", "Botella de Tingle"},
-        Text{"Magic Bottle", "Flacon magique", "Frasco feérico"},
-        Text{"Glass Bottle", "Flacon de verre", "Botella de cristal"},
-        Text{"Bottle with Water", "Flacon d'eau", "Botella Tingle"}
+        Text{ "Empty Canteen", "Cantine vide", "Leere Feldflasche" },    // "cantimplora vacía"
+        Text{ "Vial of Winds", "Fiole de vents", "Phiole der Winde" },   // "Vial de Vientos"
+        Text{ "Tingle Bottle", "Flacon de Tingle", "Tingle-Flasche" },   // "Botella de Tingle"
+        Text{ "Magic Bottle", "Flacon magique", "Magische Flasche" },    // "Frasco feérico"
+        Text{ "Glass Bottle", "Flacon de verre", "Glasflasche" },        // "Botella de cristal"
+        Text{ "Bottle with Water", "Flacon d'eau", "Flasche (Wasser)" }, // "Botella Tingle"
     };
     trickNameTable[RG_BOTTLE_WITH_MILK] = {
-        Text{"Bottle with Chateau Romani", "Flacon de cuvée Romani", "Botella de Reserva Romani"},
-        Text{"Bottle with Premium Milk", "Flacon avec lait de qualité supérieure", "Biberón con leche Premium"},
-        Text{"Bottle with Mystery Milk", "Flacon de lait grand cru", "Botella de leche extra"},
-        Text{"Bottle with Fresh Milk", "Flacon de lait frais", "Botella de leche fresca"},};
+        Text{ "Bottle with Chateau Romani", "Flacon de cuvée Romani",
+              "Flasche (Chateau Romani)" }, // "Botella de Reserva Romani"
+        Text{ "Bottle with Premium Milk", "Flacon avec lait de qualité supérieure",
+              "Flasche (Vollmilch)" }, // "Biberón con leche Premium"
+        Text{ "Bottle with Mystery Milk", "Flacon de lait grand cru",
+              "Flasche (Verdächtige Milch)" }, // "Botella de leche extra"
+        Text{ "Bottle with Fresh Milk", "Flacon de lait frais",
+              "Flasche (Frische Milch)" }, // "Botella de leche fresca"
+    };
     trickNameTable[RG_BOTTLE_WITH_RED_POTION] = {
-        Text{"Bottle with Red Chu Jelly", "Flacon de gelée Chuchu rouge", "Jugo de Chuchu Rojo"},
-        Text{"Bottle with Hibiscus Potion", "Flacon de potion de Hibiscus", "Botella de poción de Hibisco"},
-        Text{"Bottle with Medicine of Life", "Flacon d'élixir rouge", "Botella de medicina de la vida"},
-        Text{"Bottle with Heart Potion", "Flacon de potion de soin", "Botella de poción de salud"}
+        Text{ "Bottle with Red Chu Jelly", "Flacon de gelée Chuchu rouge",
+              "Flasche (Rotes Schleim-Gelee)" }, // "Jugo de Chuchu Rojo"
+        Text{ "Bottle with Hibiscus Potion", "Flacon de potion de Hibiscus",
+              "Flasche (Hibiskus-Trank)" }, // "Botella de poción de Hibisco"
+        Text{ "Bottle with Medicine of Life", "Flacon d'élixir rouge",
+              "Flasche (Roter Trank)" }, // "Botella de medicina de la vida"
+        Text{ "Bottle with Heart Potion", "Flacon de potion de soin",
+              "Flasche (Herztrank)" }, // "Botella de poción de salud"
     };
     trickNameTable[RG_BOTTLE_WITH_GREEN_POTION] = {
-        Text{"Bottle with Green Chu Jelly", "Flacon de gelée Chuchu verte", "Jugo de Chuchu Verde"},
-        Text{"Bottle with Lamp Oil", "Flacon de Huile à lanterne", "Botella de Aceite de candil "},
-        Text{"Bottle with Medicine of Magic", "Flacon d'élixir vert", "Botella de medicina mágica"},
-        Text{"Bottle with Stamina Potion", "Flacon d'Endurol", "Botella de elixir vigorizante"}
+        Text{ "Bottle with Green Chu Jelly", "Flacon de gelée Chuchu verte",
+              "Flasche (Grünes Schleim-Gelee)" }, // "Jugo de Chuchu Verde"
+        Text{ "Bottle with Lamp Oil", "Flacon de Huile à lanterne",
+              "Flasche (Lampenöl)" }, // "Botella de Aceite de candil"
+        Text{ "Bottle with Medicine of Magic", "Flacon d'élixir vert",
+              "Flasche (Grüner Trank)" }, // "Botella de medicina mágica"
+        Text{ "Bottle with Stamina Potion", "Flacon d'Endurol",
+              "Flasche (Ausdauertrank)" }, // "Botella de elixir vigorizante"
     };
     trickNameTable[RG_BOTTLE_WITH_BLUE_POTION] = {
-        Text{"Bottle with Blue Chu Jelly", "Flacon de gelée Chuchu bleue", "Jugo de Chuchu Azul"},
-        Text{"Bottle with Water of Life", "Flacon d'élixir bleu", "Botella de agua de la vida"},
-        Text{"Bottle with Air Potion", "Flacon de potion d'oxygène", "Botella de oxígeno"}
+        Text{ "Bottle with Blue Chu Jelly", "Flacon de gelée Chuchu bleue",
+              "Flasche (Blaues Schleim-Gelee)" }, // "Jugo de Chuchu Azul"
+        Text{ "Bottle with Water of Life", "Flacon d'élixir bleu",
+              "Flasche (Blauer Trank)" }, // "Botella de agua de la vida"
+        Text{ "Bottle with Air Potion", "Flacon de potion d'oxygène", "Flasche (Lufttrank)" }, // "Botella de oxígeno"
     };
     trickNameTable[RG_BOTTLE_WITH_FAIRY] = {
-        Text{"Bottle with Forest Firefly", "Flacon avec une luciole", "Luciérnaga del bosque"},
-        Text{"Bottle with Deku Princess", "Flacon avec Deku Princess", "Botella con Deku Princess"},
-        Text{"Bottle with Stray Fairy", "Flacon avec une fée perdue", "Hada perdida en una botella"}
+        Text{ "Bottle with Forest Firefly", "Flacon avec une luciole",
+              "Flasche (Glühwürmchen)" }, // "Luciérnaga del bosque"
+        Text{ "Bottle with Deku Princess", "Flacon avec Deku Princess",
+              "Flasche (Deku-Prinzessin)" }, // "Botella con Deku Princess"
+        Text{ "Bottle with Stray Fairy", "Flacon avec une fée perdue",
+              "Flasche (Verirrte Fee)" }, // "Hada perdida en una botella"
     };
     trickNameTable[RG_BOTTLE_WITH_FISH] = {
-        Text{"Bottle with Small Jabu-Jabu", "Flacon avec mini Jabu-Jabu", "Lord Chapu-Chapu embotellado"},
-        Text{"Bottle with Reekfish", "Flacon avec Reekfish", "Reekfish embotellada"},
-        Text{"Bottle with Hyrule Bass", "Flacon avec perche d'Hyrule", "Locha de Hyrule embotellada"},
-        Text{"Bottle with Hyrule Loach", "Flacon avec loche d'Hyrule", "Perca de Términa embotellada"}
+        Text{ "Bottle with Small Jabu-Jabu", "Flacon avec mini Jabu-Jabu",
+              "Flasche (Baby Jabu)" }, // "Lord Chapu-Chapu embotellado"
+        Text{ "Bottle with Reekfish", "Flacon avec Reekfish", "Flasche (Dunstforelle)" }, // "Reekfish embotellada"
+        Text{ "Bottle with Hyrule Bass", "Flacon avec perche d'Hyrule",
+              "Flasche (Hyrulebarsch)" }, // "Locha de Hyrule embotellada"
+        Text{ "Bottle with Hyrule Loach", "Flacon avec loche d'Hyrule",
+              "Flasche (Hylianische Forelle)" }, // "Perca de Términa embotellada"
     };
     trickNameTable[RG_BOTTLE_WITH_BLUE_FIRE] = {
-        Text{"Bottle with Will-O-Wisp", "Flacon avec feu follet", "Botella de llama azul"},
-        Text{"Bottle with Ancient Flame", "Flacon de flamme ancienne", "Botella de fuego ancestral"},
-        Text{"Bottle with a Blue Candle", "Flacon avec une bougie bleue", "Botella con una vela azul"},
-        Text{"Bottle with Red Ice", "Flacon de Glace Rouge", "Botella de Hielo rojo"},
-        Text{"Bottle with Nayru's Flame", "Flacon de flamme de Nayru", "Botella de llamas de Nayru"}
+        Text{ "Bottle with Will-O-Wisp", "Flacon avec feu follet", "Flasche (Rotes Feuer)" }, // "Botella de llama azul"
+        Text{ "Bottle with Ancient Flame", "Flacon de flamme ancienne",
+              "Flasche (Antike Flamme)" }, // "Botella de fuego ancestral"
+        Text{ "Bottle with a Blue Candle", "Flacon avec une bougie bleue",
+              "Flasche (Blaue Kerze)" },                                               // "Botella con una vela azul"
+        Text{ "Bottle with Red Ice", "Flacon de Glace Rouge", "Flasche (Rotes Eis)" }, // "Botella de Hielo rojo"
+        Text{ "Bottle with Nayru's Flame", "Flacon de flamme de Nayru",
+              "Flasche (Nayrus Flamme)" }, // "Botella de llamas de Nayru"
     };
     trickNameTable[RG_BOTTLE_WITH_BUGS] = {
-        Text{"Bottle with Baby Tektites", "Flacon de bébé Araknon", "Tektites en una botella"},
-        Text{"Bottle with A Beetle", "Flacon avec un scarabée", "Botella con un escarabajo"},
-        Text{"Bottle with Lanayru Ants", "Flacon de fourmis de Lanelle", "Celestarabajo embotellado"},
-        Text{"Bottle with Insects", "Flacon de bibittes", "Saltabosques embotellados"},
-        Text{"Bottle with a Golden Bee", "Flacon avec une abeille dorée", "Botella con una abeja dorada"}
+        Text{ "Bottle with Baby Tektites", "Flacon de bébé Araknon",
+              "Flasche (Baby Arachno)" },                                             // "Tektites en una botella"
+        Text{ "Bottle with A Beetle", "Flacon avec un scarabée", "Flasche (Wanze)" }, // "Botella con un escarabajo"
+        Text{ "Bottle with Lanayru Ants", "Flacon de fourmis de Lanelle",
+              "Flasche (Ranelle-Ameise)" },                                      // "Celestarabajo embotellado"
+        Text{ "Bottle with Insects", "Flacon de bibittes", "Flasche (Insekt)" }, // "Saltabosques embotellados"
+        Text{ "Bottle with a Golden Bee", "Flacon avec une abeille dorée",
+              "Flasche (Goldene Biene)" }, // "Botella con una abeja dorada"
     };
     trickNameTable[RG_BOTTLE_WITH_POE] = {
-        Text{"Bottle with Ghini", "Flacon avec Ghini", "Ghini en una botella"},
-        Text{"Bottle with Reapling", "Flacon avec Âme Damnée", "Reapling en una botella"},
-        Text{"Bottle with Imp Poe", "Flacon avec Spectre", "Espectro en una botella"},
-        Text{"Bottle with Anti-Fairy", "Flacon avec Tetdoss", "Whisp en una botella"}
+        Text{ "Bottle with Ghini", "Flacon avec Ghini", "Flasche (Ghini)" },                // "Ghini en una botella"
+        Text{ "Bottle with Reapling", "Flacon avec Âme Damnée", "Flasche (Zombie)" },       // "Reapling en una botella"
+        Text{ "Bottle with Imp Poe", "Flacon avec Spectre", "Flasche (Geist)" },            // "Espectro en una botella"
+        Text{ "Bottle with Anti-Fairy", "Flacon avec Tetdoss", "Flasche (Knochenfratze)" }, // "Whisp en una botella"
     };
 
     trickNameTable[RG_RUTOS_LETTER] = {
-        Text{"Bottle with Maggie's Letter", "Flacon avec lettre de Maggy", "Carta de Dolores"},
-        Text{"Bottle with Letter to Kafei", "Flacon avec lettre pour Kafei", "Carta para Kafei"},
-        Text{"Bottle with Zelda's Letter", "Flacon avec Lettre de Zelda", "Carta náutica"}
+        Text{ "Bottle with Maggie's Letter", "Flacon avec lettre de Maggy",
+              "Flasche (Dolores Brief)" }, // "Carta de Dolores"
+        Text{ "Bottle with Letter to Kafei", "Flacon avec lettre pour Kafei",
+              "Flasche (Brief an Kafei)" }, // "Carta para Kafei"
+        Text{ "Bottle with Zelda's Letter", "Flacon avec Lettre de Zelda",
+              "Flasche (Zeldas Brief)" }, // "Carta náutica"
     };
     trickNameTable[RG_BOTTLE_WITH_BIG_POE] = {
-        Text{"Bottle with Composer Brother", "Flacon avec un compositeur", "Hermana Poe embotellada"},
-        Text{"Bottle with Jalhalla", "Flacon avec Jalhalla", "Yaihalla embotellado"},
-        Text{"Bottle with Grim Repoe", "Flacon avec le Faucheur", "Bubble en una botella"}
+        Text{ "Bottle with Composer Brother", "Flacon avec un compositeur",
+              "Flasche (Ludwig Brahmstein)" },                                        // "Hermana Poe embotellada"
+        Text{ "Bottle with Jalhalla", "Flacon avec Jalhalla", "Flasche (Jalhalla)" }, // "Yaihalla embotellado"
+        Text{ "Bottle with Grim Repoe", "Flacon avec le Faucheur",
+              "Flasche (Tagschwärmer)" }, // "Bubble en una botella"
     };
 
     trickNameTable[RG_ZELDAS_LULLABY] = {
-        Text{"Ballad of the Goddess", "Chant de la déesse", "Cántico de la Diosa"},
-        Text{"Song of Healing", "Chant de l'apaisement", "Canción de curación"},
-        Text{"Song of the Hero", "Chant du héros", "Canción del héroe"}
+        Text{ "Ballad of the Goddess", "Chant de la déesse", "Hymne der Göttin" }, // "Cántico de la Diosa"
+        Text{ "Song of Healing", "Chant de l'apaisement", "Lied der Befreiung" },  // "Canción de curación"
+        Text{ "Song of the Hero", "Chant du héros", "Heldenlied" },                // "Canción del héroe"
     };
     trickNameTable[RG_EPONAS_SONG] = {
-        Text{"Song of Birds","Chant des oiseaux","Cantar del ave"},
-        Text{"Song of Soaring", "Chant de l'envol", "Canción del viento"},
-        Text{"Song of Horse", "Chant du cheval", "Chant du cheval"}
+        Text{ "Song of Birds", "Chant des oiseaux", "Vogelruf" },            // "Cantar del ave"
+        Text{ "Song of Soaring", "Chant de l'envol", "Lied der Schwingen" }, // "Canción del viento"
+        Text{ "Song of Horse", "Chant du cheval", "Lied des Pferdes" },      // "Chant du cheval"
     };
     trickNameTable[RG_SARIAS_SONG] = {
-        Text{"Mido's Song", "La chanson de Mido", "La canción de Mido"},
-        Text{"Kass' Theme", "Le thème de Kass", "El tema de Kass"},
-        Text{"Tune of Echoes", "Chant des Échos ", "Melodía del Eco "}
+        Text{ "Mido's Song", "La chanson de Mido", "Midos Lied" },         // "La canción de Mido"
+        Text{ "Kass' Theme", "Le thème de Kass", "Kashiwa Thema" },        // "El tema de Kass"
+        Text{ "Tune of Echoes", "Chant des Échos ", "Melodie des Echos" }, // "Melodía del Eco"
     };
     trickNameTable[RG_SUNS_SONG] = {
-        Text{"Song of Passing", "Mambo de Manbo", "Melodía del transcurrir"},
-        Text{"Command Melody", "Air du marionnettiste", "Cara al Sol"},
-        Text{"Moon's Song", "La chanson de Moon", "La canción de la luna"}
+        Text{ "Song of Passing", "Mambo de Manbo", "Kleine Tag- und Nachtmusik" },      // "Melodía del transcurrir"
+        Text{ "Command Melody", "Air du marionnettiste", "Sonate des Puppenspielers" }, // "Cara al Sol"
+        Text{ "Moon's Song", "La chanson de Moon", "Lied des Mondes" },                 // "La canción de la luna"
     };
     trickNameTable[RG_SONG_OF_TIME] = {
-        Text{"Song of Double Time", "Chant accéléré", "Canción del doble tiempo"},
-        Text{"Inverted Song of Time", "Chant du temps inversé", "Canción del tiempo invertida"},
-        Text{"Tune of Ages", "Chant du Temps", "Melodía del Tiempo"}
+        Text{ "Song of Double Time", "Chant accéléré", "Thema der Zeit im Wind" }, // "Canción del doble tiempo"
+        Text{ "Inverted Song of Time", "Chant du temps inversé",
+              "Ballade des Kronos" },                                 // "Canción del tiempo invertida"
+        Text{ "Tune of Ages", "Chant du Temps", "Melodie der Zeit" }, // "Melodía del Tiempo"
     };
     trickNameTable[RG_SONG_OF_STORMS] = {
-        Text{"Ballad of Gales", "Requiem de la tornade", "Melodía del Tornado"},
-        Text{"Frog's Song of Soul", "Rap des grenouilles", "Canción del alma de la rana"},
-        Text{"Wind's Requiem", "Mélodie du vent", "Melodía del Viento"}
+        Text{ "Ballad of Gales", "Requiem de la tornade", "Kanon des Sturmes" }, // "Melodía del Tornado"
+        Text{ "Frog's Song of Soul", "Rap des grenouilles", "Krötenrap" },       // "Canción del alma de la rana"
+        Text{ "Wind's Requiem", "Mélodie du vent", "Lied des Windes" },          // "Melodía del Viento"
     };
     trickNameTable[RG_MINUET_OF_FOREST] = {
-        Text{"Saria's Karaoke", "Karaoké de Saria", "Dueto del bosque"},
-        Text{"Sonata of Awakening", "Sonate de l'éveil", "Sonata del despertar"},
-        Text{"Wind God's Aria", "Hymne du dieu du vent", "Melodía del Espíritu del Viento"}
+        Text{ "Saria's Karaoke", "Karaoké de Saria", "Salias Karaoke" },            // "Dueto del bosque"
+        Text{ "Sonata of Awakening", "Sonate de l'éveil", "Sonate des Erwachens" }, // "Sonata del despertar"
+        Text{ "Wind God's Aria", "Hymne du dieu du vent",
+              "Hymne des Zephirgottes" }, // "Melodía del Espíritu del Viento"
     };
     trickNameTable[RG_BOLERO_OF_FIRE] = {
-        Text{"Darunia's Tango", "Tango de Darunia", "Coro del fuego"},
-        Text{"Tune of Currents", "Chants des Flux", "Melodía de las Corrientes"},
-        Text{"Goron Lullaby", "Berceuse des Gorons", "Nana goron"}
+        Text{ "Darunia's Tango", "Tango de Darunia", "Darunias Tango" },             // "Coro del fuego"
+        Text{ "Tune of Currents", "Chants des Flux", "Lied des Zeitstroms" },        // "Melodía de las Corrientes"
+        Text{ "Goron Lullaby", "Berceuse des Gorons", "Goronisches Schlummerlied" }, // "Nana goron"
     };
     trickNameTable[RG_SERENADE_OF_WATER] = {
-        Text{"Ruto's Blues", "Blues de Ruto", "Sonata del agua"},
-        Text{"New Wave Bossa Nova", "Bossa-nova des flots", "Bossanova de las olas"},
-        Text{"Manbo's Mambo", "Mambo de Manbo", "Mambo de Manbo"}
+        Text{ "Ruto's Blues", "Blues de Ruto", "Rutos Blues" },                           // "Sonata del agua"
+        Text{ "New Wave Bossa Nova", "Bossa-nova des flots", "Bossa Nova der Kaskaden" }, // "Bossanova de las olas"
+        Text{ "Manbo's Mambo", "Mambo de Manbo", "Manbos Mambo" },                        // "Mambo de Manbo"
     };
     trickNameTable[RG_REQUIEM_OF_SPIRIT] = {
-        Text{"Nabooru's Reggae", "Reggae de Nabooru", "Reggae del espíritu"},
-        Text{"Elegy of Emptiness", "Hymne du vide", "Elegía al vacío"},
-        Text{"Earth God's Lyric", "Hymne du dieu de la terre", "Melodía del Espíritu de la Tierra"}
+        Text{ "Nabooru's Reggae", "Reggae de Nabooru", "Naborus Reggae" },          // "Reggae del espíritu"
+        Text{ "Elegy of Emptiness", "Hymne du vide", "Elegie des leeren Herzens" }, // "Elegía al vacío"
+        Text{ "Earth God's Lyric", "Hymne du dieu de la terre",
+              "Hymne des Terragottes" }, // "Melodía del Espíritu de la Tierra"
     };
     trickNameTable[RG_NOCTURNE_OF_SHADOW] = {
-        Text{"Impa's Death Metal", "Death métal d'Impa", "Diurno de la sombra"},
-        Text{"Oath to Order", "Ode de l'appel", "Oda al orden"},
-        Text{"Song of Discovery", "Chant des secrets", "Canto revelador"}
+        Text{ "Impa's Death Metal", "Death métal d'Impa", "Impas Death Metal" }, // "Diurno de la sombra"
+        Text{ "Oath to Order", "Ode de l'appel", "Gesang des Himmels" },         // "Oda al orden"
+        Text{ "Song of Discovery", "Chant des secrets", "Schatzsucherlied" },    // "Canto revelador"
     };
     trickNameTable[RG_PRELUDE_OF_LIGHT] = {
-        Text{"Rauru's Sing-Along", "Chansonnette de Rauru", "Predulio de luz"},
-        Text{"Ballad of the Wind Fish", "Ballade sur Poisson-Rêve", "Balada del Piez Viento"},
-        Text{"Song of Light", "Chant de la lumière", "Sonidos de la luz"}
+        Text{ "Rauru's Sing-Along", "Chansonnette de Rauru", "Raurus Singalong" }, // "Predulio de luz"
+        Text{ "Ballad of the Wind Fish", "Ballade sur Poisson-Rêve",
+              "Ballade vom Windfisch" },                                   // "Balada del Piez Viento"
+        Text{ "Song of Light", "Chant de la lumière", "Lied des Lichts" }, // "Sonidos de la luz"
     };
 
     trickNameTable[RG_KOKIRI_EMERALD] = {
-        Text{"Pendant of Courage", "Pendentif du courage", "Colgante del valor"},
-        Text{"Farore's Pearl", "Perle de Farore", "Orbe de Farore"},
-        Text{"Aquanine", "Smaragdine", "Yerbánida"},
-        Text{"Farore's Emerald", "Émeraude de Farore", "Esmeralda de Farore"},
-        Text{"Kokiri's Peridot", "Péridot Kokiri", "Ágata de los Kokiri"}
+        Text{ "Pendant of Courage", "Pendentif du courage", "Amulett des Mutes" }, // "Colgante del valor"
+        Text{ "Farore's Pearl", "Perle de Farore", "Farores Deamont" },            // "Orbe de Farore"
+        Text{ "Aquanine", "Smaragdine", "Smaragdstahl" },                          // "Yerbánida"
+        Text{ "Farore's Emerald", "Émeraude de Farore", "Farore-Smaragd" },        // "Esmeralda de Farore"
+        Text{ "Kokiri's Peridot", "Péridot Kokiri", "Kokiri-Peridot" },            // "Ágata de los Kokiri"
     };
     trickNameTable[RG_GORON_RUBY] = {
-        Text{"Pendant of Power", "Pendentif de la force", "Colgante del poder"},
-        Text{"Din's Pearl", "Perle de Din", "Orbe de Din"},
-        Text{"Crimsonine", "Alzanine", "Bermellina"},
-        Text{"Din's Ruby", "Rubis de Din", "Rubí de Din"},
-        Text{"Goron's Garnet", "Grenat Goron", "Topacio de los Goron"}
+        Text{ "Pendant of Power", "Pendentif de la force", "Amulett der Stärke" }, // "Colgante del poder"
+        Text{ "Din's Pearl", "Perle de Din", "Dins Deamont" },                     // "Orbe de Din"
+        Text{ "Crimsonine", "Alzanine", "Scharlachstahl" },                        // "Bermellina"
+        Text{ "Din's Ruby", "Rubis de Din", "Din-Rubin" },                         // "Rubí de Din"
+        Text{ "Goron's Garnet", "Grenat Goron", "Goronen-Granat" },                // "Topacio de los Goron"
     };
     trickNameTable[RG_ZORA_SAPPHIRE] = {
-        Text{"Pendant of Wisdom", "Pendentif de la sagesse", "Colgante de la sabiduría"},
-        Text{"Nayru's Pearl", "Perle de Nayru", "Orbe de Nayru"},
-        Text{"Azurine", "Aquanine", "Azurina"},
-        Text{"Nayru's Sapphire", "Saphir de Nayru", "Zafiro de Nayru"},
-        Text{"Zora's Aquamarine", "Aquamarine Zora", "Lapislázuli de los Zora"}
+        Text{ "Pendant of Wisdom", "Pendentif de la sagesse", "Amulett der Weisheit" }, // "Colgante de la sabiduría"
+        Text{ "Nayru's Pearl", "Perle de Nayru", "Nayrus Deamont" },                    // "Orbe de Nayru"
+        Text{ "Azurine", "Aquanine", "Azurstahl" },                                     // "Azurina"
+        Text{ "Nayru's Sapphire", "Saphir de Nayru", "Nayru-Saphir" },                  // "Zafiro de Nayru"
+        Text{ "Zora's Aquamarine", "Aquamarine Zora", "Zora-Aquamarin" },               // "Lapislázuli de los Zora"
     };
     trickNameTable[RG_FOREST_MEDALLION] = {
-        Text{"Wind Medallion", "Médaillon du vent", "Medallón del Viento"},
-        Text{"Wind Element", "Elément Vent", "Elemento de aire"},
-        Text{"Saria's Medallion", "Médaillon de Saria", "Medallón de Saria"},
-        Text{"Sign of Air", "Glyphe de l'air", "Glifo de aire"},
-        Text{"Medallion of Forest", "Médaillon du Temple de la Forêt", "Medalla del Bosque"}
+        Text{ "Wind Medallion", "Médaillon du vent", "Amulett des Windes" }, // "Medallón del Viento"
+        Text{ "Wind Element", "Elément Vent", "Wind-Element" },              // "Elemento de aire"
+        Text{ "Saria's Medallion", "Médaillon de Saria", "Salias Amulett" }, // "Medallón de Saria"
+        Text{ "Sign of Air", "Glyphe de l'air", "Zeichen der Luft" },        // "Glifo de aire"
+        Text{ "Medallion of Forest", "Médaillon du Temple de la Forêt",
+              "Medaillon des Waldes" }, // "Medalla del Bosque"
     };
     trickNameTable[RG_FIRE_MEDALLION] = {
-        Text{"Fire Element", "Elément Feu", "Elemento de fuego"},
-        Text{"Darunia's Medallion", "Médaillon de Darunia", "Medallón de Darunia"},
-        Text{"Sign of Fire", "Glyphe de feu", "Glifo de fuego"},
-        Text{"Medallion of Fire", "Médaillon du Temple du Feu", "Medalla del Fuego"}
+        Text{ "Fire Element", "Elément Feu", "Flammen-Element" },                          // "Elemento de fuego"
+        Text{ "Darunia's Medallion", "Médaillon de Darunia", "Darunias Amulett" },         // "Medallón de Darunia"
+        Text{ "Sign of Fire", "Glyphe de feu", "Zeichen des Feuers" },                     // "Glifo de fuego"
+        Text{ "Medallion of Fire", "Médaillon du Temple du Feu", "Medaillon des Feuers" }, // "Medalla del Fuego"
     };
     trickNameTable[RG_WATER_MEDALLION] = {
-        Text{"Water Element", "Elément Eau", "Elemento de agua"},
-        Text{"Ice Medallion", "Médaillon de glace", "Medallón Helado"},
-        Text{"Ruto's Medallion", "Médaillon de Ruto", "Medallón de Ruto"},
-        Text{"Sign of Water", "Glyphe de l'eau", "Glifo de agua"},
-        Text{"Medallion of Water", "Médaillon du Temple de l'Eau", "Medalla del Agua"}
+        Text{ "Water Element", "Elément Eau", "Tropfen-Element" },                             // "Elemento de agua"
+        Text{ "Ice Medallion", "Médaillon de glace", "Amulett des Eises" },                    // "Medallón Helado"
+        Text{ "Ruto's Medallion", "Médaillon de Ruto", "Rutos Amulett" },                      // "Medallón de Ruto"
+        Text{ "Sign of Water", "Glyphe de l'eau", "Zeichen des Wassers" },                     // "Glifo de agua"
+        Text{ "Medallion of Water", "Médaillon du Temple de l'Eau", "Medaillon des Wassers" }, // "Medalla del Agua"
     };
     trickNameTable[RG_SPIRIT_MEDALLION] = {
-        Text{"Earth Element", "Elément Terre", "Elemento de tierra"},
-        Text{"Nabooru's Medallion", "Médaillon de Nabooru", "Medallón de Nabooru"},
-        Text{"Sign of Earth", "Glyphe de la Terre", "Glifo de la tierra"},
-        Text{"Medallion of Spirit", "Médaillon du Temple de l'Esprit", "Medalla del Espíritu"}
+        Text{ "Earth Element", "Elément Terre", "Erd-Element" },                  // "Elemento de tierra"
+        Text{ "Nabooru's Medallion", "Médaillon de Nabooru", "Naborus Amulett" }, // "Medallón de Nabooru"
+        Text{ "Sign of Earth", "Glyphe de la Terre", "Zeichen der Erde" },        // "Glifo de la tierra"
+        Text{ "Medallion of Spirit", "Médaillon du Temple de l'Esprit",
+              "Medaillon der Geister" }, // "Medalla del Espíritu"
     };
     trickNameTable[RG_SHADOW_MEDALLION] = {
-        Text{"Fused Shadow", "Cristal d'ombre", "Sombra Fundida"},
-        Text{"Impa's Medallion", "Médaillon d'Impa", "Medallón de Impa"},
-        Text{"Sign of Illusion", "Glyphe de l'illusion", "Glifo de ilusión"},
-        Text{"Medallion of Shadow", "Médaillon du Temple de l'Ombre", "Medalla de la Sombra"}
+        Text{ "Fused Shadow", "Cristal d'ombre", "Schattenkristall" },                // "Sombra Fundida"
+        Text{ "Impa's Medallion", "Médaillon d'Impa", "Impas Amulett" },              // "Medallón de Impa"
+        Text{ "Sign of Illusion", "Glyphe de l'illusion", "Zeichen der Illusionen" }, // "Glifo de ilusión"
+        Text{ "Medallion of Shadow", "Médaillon du Temple de l'Ombre",
+              "Medaillon des Schattens" }, // "Medalla de la Sombra"
     };
     trickNameTable[RG_LIGHT_MEDALLION] = {
-        Text{"Compass of Light", "Boussole de lumière", "Brújula de Luz"},
-        Text{"Rauru's Medallion", "Médaillon de Rauru", "Medallón de Rauru"},
-        Text{"Sign of Destiny", "Glyphe du destin", "Glifo del destino"},
-        Text{"Medallion of Light", "Médaillon du temple de lumière", "Medalla de la Luz"}
+        Text{ "Compass of Light", "Boussole de lumière", "Licht-Kompaß" },                      // "Brújula de Luz"
+        Text{ "Rauru's Medallion", "Médaillon de Rauru", "Raurus Amulett" },                    // "Medallón de Rauru"
+        Text{ "Sign of Destiny", "Glyphe du destin", "Zeichen des Schicksals" },                // "Glifo del destino"
+        Text{ "Medallion of Light", "Médaillon du temple de lumière", "Medaillon des Lichts" }, // "Medalla de la Luz"
     };
 
     trickNameTable[RG_RECOVERY_HEART] = {
-        Text{"Love", "Bisou", "Te amo"},
-        Text{"Life", "Vie", "vida"},
-        Text{"HP", "VP", "VP"}
+        Text{ "Love", "Bisou", "Liebe" }, // "Te amo"
+        Text{ "Life", "Vie", "Leben" },   // "vida"
+        Text{ "HP", "PV", "KP" },         // "VP"
     };
     trickNameTable[RG_GREEN_RUPEE] = {
-        Text{"False Greg", "Faux Greg", "Falso Greg"},
-        Text{"One Ruby", "Un rubis", "Un rubí"},
-        Text{"Rupoor (1)", "Roupir (1)", "Rupobre (1)"},
-        Text{"One Rupee", "Un rubis", "Guaraní hyliano"},
-        Text{"Rupee (1)", "Rubis (1)", "Peso hyliano"}
+        Text{ "Rupee (1)", "Rubis (1)", "Rubin (1)" },        // "Peso hyliano"
+        Text{ "One Ruby", "Un rubis", "ein Ruby" },           // "Un rubí"
+        Text{ "One Rupee", "Un rubis", "ein Rubin" },         // "Guaraní hyliano"
+        Text{ "False Greg", "Faux Greg", "falscher Greg" },   // "Falso Greg"
+        Text{ "Rupoor (1)", "Roupir (1)", "Rubinfalle (1)" }, // "Rupobre (1)"
     };
     trickNameTable[RG_BLUE_RUPEE] = {
-        Text{"Blupee", "Bleubi", "Azupia"},
-        Text{"Five Rubies", "Cinq Rubys", "Cinco rubíes"},
-        Text{"Five Rupees", "Cinq rubis", "Bolívar hyliano"},
-        Text{"Rupee (5)", "Rubis (5)", "Peso hyliano"},
-        Text{"Rupoor (5)", "Roupir (5)", "Rupobre (5)"}
+        Text{ "Blupee", "Bleubi", "Fünfer" },                 // "Azupia"
+        Text{ "Five Rubies", "Cinq Rubys", "fünf Rubies€" },  // "Cinco rubíes"
+        Text{ "Five Rupees", "Cinq rubis", "fünf Rubine€" },  // "Bolívar hyliano"
+        Text{ "Rupee (5)", "Rubis (5)", "Rubin (5)" },        // "Peso hyliano"
+        Text{ "Rupoor (5)", "Roupir (5)", "Rubinfalle (5)" }, // "Rupobre (5)"
     };
     trickNameTable[RG_RED_RUPEE] = {
-        Text{"Big 20", "Grand 20", "Los 20 grandes"},
-        Text{"Twenty Rubies", "vingt rubis", "Veinte rubíes"},
-        Text{"Rupoor (20)", "Roupir (20)", "Rupobre (20)"},
-        Text{"Twenty Rupees", "Vingt rubis", "Colon hyliano"},
-        Text{"Rupee (20)", "Rubis (20)", "Peso hyliano"}
+        Text{ "Big 20", "Grand 20", "Zwanni" },                    // "Los 20 grandes"
+        Text{ "Twenty Rubies", "vingt rubis", "zwanzig Rubies€" }, // "Veinte rubíes"
+        Text{ "Twenty Rupees", "Vingt rubis", "zwanzig Rubine€" }, // "Colon hyliano"
+        Text{ "Rupee (20)", "Rubis (20)", "Rubin (20)" },          // "Peso hyliano"
+        Text{ "Rupoor (20)", "Roupir (20)", "Rubinfalle (20)" },   // "Rupobre (20)"
     };
     trickNameTable[RG_PURPLE_RUPEE] = {
-        Text{"Purpee", "pourbi", "morupiua"},
-        Text{"Fifty Rubies", "cinquante rubis", "Cincuenta rubíes"},
-        Text{"Rupoor (50)", "Roupir (50)", "Rupobre (50)"},
-        Text{"Fifty Rupees", "Cinquante rubis", "Balboa hyliano"},
-        Text{"Rupee (50)", "Rubis (50)", "Peso hyliano"}
+        Text{ "Purpee", "Pourbi", "Fuffi" },                          // "morupiua"
+        Text{ "Fifty Rubies", "Cinquante rubis", "fünfzig Rubies€" }, // "Cincuenta rubíes"
+        Text{ "Fifty Rupees", "Cinquante rubis", "fünfzig Rubine€" }, // "Balboa hyliano"
+        Text{ "Rupee (50)", "Rubis (50)", "Rubin (50)" },             // "Peso hyliano"
+        Text{ "Rupoor (50)", "Roupir (50)", "Rubinfalle (50)" },      // "Rupobre (50)"
     };
     trickNameTable[RG_HUGE_RUPEE] = {
-        Text{"Hugo", "Or Rubi", "Oro Rubi"},
-        Text{"Two Hundred Rubies", "deux cents rubis", "Doscientos rubíes"},
-        Text{"Diamond", "Diamant", "Diamante"},
-        Text{"Huge Ruby", "Énorme rubis", "Rubi gigante"},
-        Text{"Two Hundred Rupees", "Deux cent rubis", "Euro hyliano"},
-        Text{"Rupee (200)", "Rubis (200)", "Dólar hyliano"}
+        Text{ "Hugo", "Or Rubi", "zwei Hunnis€" },                               // "Oro Rubi"
+        Text{ "Two Hundred Rubies", "Deux cents rubis", "zweihundert Rubies€" }, // "Doscientos rubíes"
+        Text{ "Diamond", "Diamant", "Diamant" },                                 // "Diamante"
+        Text{ "Huge Ruby", "Énorme rubis", "großer Ruby" },                      // "Rubi gigante"
+        Text{ "Two Hundred Rupees", "Deux cent rubis", "zweihundert Rubine€" },  // "Euro hyliano"
+        Text{ "Rupee (200)", "Rubis (200)", "Rubin (200)" },                     // "Dólar hyliano"
     };
     trickNameTable[RG_PIECE_OF_HEART] = {
-        Text{"Pizza Heart", "Fromage de cœur", "Pieza de Chorizo"},
-        Text{"Little Bit Of Love", "Un peu d'amour", "Un poco de amor"},
-        Text{"Rare Peach Stone", "Pierre de pêche rare", "Pierre de pêche rare"}
+        Text{ "Pizza Heart", "Fromage de cœur", "Harzteil" },                             // "Pieza de Chorizo"
+        Text{ "Little Bit Of Love", "Un peu d'amour", "etwas Liebe" },                    // "Un poco de amor"
+        Text{ "Rare Peach Stone", "Pierre de pêche rare", "ein seltener Pfirsichstein" }, // "Pierre de pêche rare"
     };
     trickNameTable[RG_HEART_CONTAINER] = {
-        Text{"Crystal Heart", "Cœur de cristal", "Corazón de cristal"},
-        Text{"Life Heart", "Cœur de vie", "Vida Corazón"},
-        Text{"Lots of Love", "Beaucoup d'amour", "Mucho amor"}
+        Text{ "Crystal Heart", "Cœur de cristal", "Kristallherz" }, // "Corazón de cristal"
+        Text{ "Life Heart", "Cœur de vie", "Lebensherz" },          // "Vida Corazón"
+        Text{ "Lots of Love", "Beaucoup d'amour", "viel Liebe" },   // "Mucho amor"
     };
     trickNameTable[RG_TRIFORCE_PIECE] = {
-        Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"},
-        Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"},
-        Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}
+        Text{ "Piece of Cheese", "Morceau de Fromage", "Käseteil" },        // "Piece of Cheese"
+        Text{ "Triforce Shard", "Éclat de Triforce", "Triforce-Fragment" }, // "Triforce Shard"
+        Text{ "Shiny Rock", "Caillou Brillant", "glänzender Stein" },       // "Shiny Rock"
     };
-
     trickNameTable[RG_GOHMA_SOUL] = {
-        Text{"Spider Sense", "", ""},
-        Text{"Deku Spirit", "", ""},
-        Text{"Ghost of Ghoma", "", ""}
+        Text{ "Spider Sense", "Sens de l'Araignée", "Spinnensinn" },
+        Text{ "Deku Spirit", "Parasite Mojo", "Deku Geist" },
+        Text{ "Ghost of Ghoma", "Fantôme de Gohma", "Gohmas Geist" },
     };
     trickNameTable[RG_KING_DODONGO_SOUL] = {
-        Text{"Lizard Soul", "", ""},
-        Text{"Regal Remains", "", ""},
-        Text{"Dodongo's Core", "", ""}
+        Text{ "Lizard Soul", "Âme d'un Lézard", "Reptilienseele" },
+        Text{ "Regal Remains", "Restes Délicieux", "royale Überreste€" },
+        Text{ "Dodongo's Core", "Coeur de Dodongo", "Dodongos Kern" },
     };
     trickNameTable[RG_BARINADE_SOUL] = {
-        Text{"Parasitic Poltergeist", "", ""},
-        Text{"Jabu Insides", "", ""},
-        Text{"Barinade Bacteria", "", ""}
+        Text{ "Parasitic Poltergeist", "Poltergeist Parasite", "infektiöser Poltergeist" },
+        Text{ "Jabu Insides", "Entrailles de Jabu-Jabu", "Jabus Innereien" },
+        Text{ "Barinade Bacteria", "Bactérie de Barinade", "Barinades Bakterien" },
     };
     trickNameTable[RG_PHANTOM_GANON_SOUL] = {
-        Text{"Bigger Poe", "", ""},
-        Text{"Sacred Forest Pine Tree", "", ""},
-        Text{"Ganon's Phantom", "", ""}
+        Text{ "Bigger Poe", "Âme Gigantesque", "ein großer Nachtschwärmer" },
+        Text{ "Sacred Forest Pine Tree", "Grande Perche du Bosquet Sacré", "Kiefer der Heiligen Lichtung" },
+        Text{ "Ganon's Phantom", "Fantôme de Ganon", "Ganons Phantom" },
     };
     trickNameTable[RG_VOLVAGIA_SOUL] = {
-        Text{"Dragon Roast", "", ""},
-        Text{"Hot n' Ready", "", ""},
-        Text{"Volvagia's Vitality", "", ""}
+        Text{ "Dragon Roast", "Friture du Dragon", "Drachenbraten" },
+        Text{ "Hot n' Ready", "Sauce Barbecue", "Barbecue Sauce" },
+        Text{ "Volvagia's Vitality", "Vitalité de Volcania", "Volvagias Vitalität" },
     };
     trickNameTable[RG_MORPHA_SOUL] = {
-        Text{"Dihydrogen Monoxide", "", ""},
-        Text{"Morpha Molecules", "", ""},
-        Text{"Wet Stuff", "", ""}
+        Text{ "Dihydrogen Monoxide", "Monoxyde de Dihydrogène", "Dihydrogenmonoxid" },
+        Text{ "Morpha Molecules", "Molécule de Morpha", "Morphas Molekyle" },
+        Text{ "Wet Stuff", "Truc Mouillé", "nasses Zeug" },
     };
     trickNameTable[RG_BONGO_BONGO_SOUL] = {
-        Text{"Shadow Soul", "", ""},
-        Text{"Dark Essence", "", ""},
-        Text{"Bongo Bongo's Bongo", "", ""}
+        Text{ "Shadow Soul", "Âme de l'Ombre", "Schattenseele" },
+        Text{ "Dark Essence", "Essence Sombre", "Dunkle Essenz" },
+        Text{ "Bongo Bongo's Bongo", "Bongo de Bongo Bongo", "Bongo Bongos Bongo" },
     };
     trickNameTable[RG_TWINROVA_SOUL] = {
-        Text{"Sandy Ashes", "", ""},
-        Text{"Spiritual Spirit", "", ""},
-        Text{"Twin Rovers", "", ""}
+        Text{ "Sandy Ashes", "Cendres des Vieilles", "Sandige Asche" },
+        Text{ "Spiritual Spirit", "Esprit Spirituel", "Geisterhafter Geist" },
+        Text{ "Twin Rovers", "Duo Angélique", "Twinrovas Seile" },
     };
     trickNameTable[RG_GANON_SOUL] = {
-        Text{"Pure Evil", "", ""},
-        Text{"Ganon's Ghost", "", ""},
-        Text{"Pork", "", ""}
+        Text{ "Pure Evil", "Mal Incarné", "Das pure Böse" },
+        Text{ "Ganon's Ghost", "Le Malin", "Ganons Geist" },
+        Text{ "Pork", "Porc", "Schweinefleisch" },
     };
-
     trickNameTable[RG_FISHING_POLE] = {
-        Text{"Fish Tickler", "Fish Tickler", "Fish Tickler"},
-        Text{"Floating Lure", "Floating Lure", "Floating Lure"},
-        Text{"Fishing Reel", "Fishing Reel", "Fishing Reel"}
+        Text{ "Fish Tickler", "Fish Tickler", "Fischkitzler" },
+        Text{ "Floating Lure", "Floating Lure", "Schwimmer" },
+        Text{ "Fishing Reel", "Fishing Reel", "Angelschnur" },
     };
-
     trickNameTable[RG_OCARINA_A_BUTTON] = {
-        Text{"Ocarina J Button", "", ""},
-        Text{"Ocarina Ayy Button", "", ""},
-        Text{"Ocarina A Trigger", "", ""}
+        Text{ "Ocarina J Button", "Touche Ha de l'Ocarina", "J-Taste der Okarina" },
+        Text{ "Ocarina Ayy Button", "Touche Ah de l'Ocarina", "A-Taste der Flöte" },
+        Text{ "Ocarina A Trigger", "Bumper A de l'Ocarina", "A-Trigger der Okarina" },
     };
     trickNameTable[RG_OCARINA_C_UP_BUTTON] = {
-        Text{"Ocarina C North Button", "", ""},
-        Text{"Ocarina C App Button", "", ""},
-        Text{"Ocarina Sup Button", "", ""}
+        Text{ "Ocarina C North Button", "Touche C Nord de l'Ocarina", "C-Nord-Taste der Okarina" },
+        Text{ "Ocarina C App Button", "Touche C'est Haut de l'Ocarina", "C-Oben-Taste des Rekorders" },
+        Text{ "Ocarina Sup Button", "Touche O de l'Ocarina", "C-Oben-Trigger der Okarina" },
     };
     trickNameTable[RG_OCARINA_C_DOWN_BUTTON] = {
-        Text{"Ocarina C South Button", "", ""},
-        Text{"Ocarina Z Down Button", "", ""},
-        Text{"Ocarina See Down Button", "", ""},
-        Text{"Ocarina C Dawn Button", "", ""}
+        Text{ "Ocarina C South Button", "Touche C Sud de l'Ocarina", "C-Süd-Taste der Okarina" },
+        Text{ "Ocarina Z Down Button", "Touche Z Bas de l'Ocarina", "Z-Unten-Taste der Okarina" },
+        Text{ "Ocarina See Down Button", "Touche C'est Bas de l'Ocarina", "C-Unten-Taste der Harfe" },
+        Text{ "Ocarina C Dawn Button", "Touche Séba de l'Ocarina", "C-Unten-Trigger der Okarina" },
     };
     trickNameTable[RG_OCARINA_C_LEFT_BUTTON] = {
-        Text{"Ocarina C West Button", "", ""},
-        Text{"Ocarina Sea Left Button", "", ""},
-        Text{"Ocarina C Lift Button", "", ""},
-        Text{"Ocarina Rewind Button", "", ""}
+        Text{ "Ocarina C West Button", "Touche C Ouest de l'Ocarina", "C-West-Taste der Okarina" },
+        Text{ "Ocarina Sea Left Button", "Touche Cégoche de L'Ocarina", "C-Links-Taste der Nixenglocke" },
+        Text{ "Ocarina C Lift Button", "Touche C'est Gauche de l'Ocarina", "C-Zelda-Taste der Okarina" },
+        Text{ "Ocarina Rewind Button", "Touche Rembobiner de l'Ocarina", "C-Links-Trigger der Okarina" },
     };
     trickNameTable[RG_OCARINA_C_RIGHT_BUTTON] = {
-        Text{"Ocarina C East Button", "", ""},
-        Text{"Ocarina C Wright Button", "", ""},
-        Text{"Overworld C Right Button", "", ""}
+        Text{ "Ocarina C East Button", "Touche C Est de l'Ocarina", "C-Ost-Taste der Okarina" },
+        Text{ "Ocarina C Wright Button", "Touche C'est Droite de l'Ocarina", "C-Rechts-Trigger der Okarina" },
+        Text{ "Overworld C Right Button", "Trou Droit de l'Ocarina", "C-Rechts-Taste der E-Gitarre" },
     };
 
     /*
     //Names for individual upgrades, in case progressive names are replaced
     trickNameTable[GI_HOOKSHOT] = {
-        Text{"Grappling Hook", "Grappin-griffe", "Gancho lanzable"},
-        Text{"Clawshot", "Lance-chaîne", "Zarpa"},
-        Text{"Gripshot", "Grappince", "Enganchador"}
+        Text{"Grappling Hook", "Grappin-griffe", "Enterhaken" }, // "Gancho lanzable"
+        Text{"Clawshot", "Lance-chaîne", "Greifhaken" }, // "Zarpa"
+        Text{"Gripshot", "Grappince", "Tauschhaken" }, // "Enganchador"
     };
     trickNameTable[GI_LONGSHOT] = {
-        Text{"Longshot, no strings attached", "Grappin sans attrape", "Gancho lanzable más largo"},
-        Text{"Double Clawshot", "Double-grappin", "Superzarpa"},
-        Text{"Switch Hook", "Great grappin", "Gancho chulo"}
+        Text{"Longshot, no strings attached", "Grappin sans attrape", "Enterhaken, Umtausch ausgeschloßen"}, // "Gancho
+    lanzable más largo" Text{"Double Clawshot", "Double-grappin", "Doppelhaken" }, // "Superzarpa" Text{"Switch Hook",
+    "Great grappin", "Tauschhaken" }, // "Gancho chulo"
     };
     trickNameTable[GI_BOMB_BAG_1] = {
-        Text{"Bomb Capacity (20)", "Capacité de bombes (20)", "Bolsa de bombas (contiene 20)"},
-        Text{"Bronze Bomb Bag", "Sac de Bombes de bronze", "Saco de bronce de bombas"},
-        Text{"Small Bomb Bag", "Petit Sac de Bombes", "Zurrón de bombas pequeño"}
+        Text{"Bomb Capacity (20)", "Capacité de bombes (20)", "Bomben-Kapazität (20)" }, // "Bolsa de bombas (contiene
+    20)" Text{"Bronze Bomb Bag", "Sac de Bombes de bronze", "Bronzene Bombentasche" }, // "Saco de bronce de bombas"
+        Text{"Small Bomb Bag", "Petit Sac de Bombes", "Kleine Bombentasche" }, // "Zurrón de bombas pequeño"
     };
     trickNameTable[GI_BOMB_BAG_2] = {
-        Text{"Bomb Capacity (30)", "Capacité de bombes (30)", "Bolsa de bombas (contiene 30)"},
-        Text{"Silver Bomb Bag", "Sac de Bombes d'argent", "Saco plateado de bombas"},
-        Text{"Medium Bomb Bag", "Sac de Bombes moyen", "Zurrón de bombas mediano"}
+        Text{"Bomb Capacity (30)", "Capacité de bombes (30)", "Bomben-Kapazität (30)" }, // "Bolsa de bombas (contiene
+    30)" Text{"Silver Bomb Bag", "Sac de Bombes d'argent", "Silberne Bombentasche" }, // "Saco plateado de bombas"
+        Text{"Medium Bomb Bag", "Sac de Bombes moyen", "Mittlere Bombentasche" }, // "Zurrón de bombas mediano"
     };
     trickNameTable[GI_BOMB_BAG_3] = {
-        Text{"Bomb Capacity (40)", "Capacité de bombes (40)", "Bolsa de bombas (contiene 40)"},
-        Text{"Golden Bomb Bag", "Sac de Bombes d'or", "Saco dorado de bombas"},
-        Text{"Large Bomb Bag", "Gros Sac de Bombes", "Zurrón de bombas grande"}
+        Text{"Bomb Capacity (40)", "Capacité de bombes (40)", "Bomben-Kapazität (40)" }, // "Bolsa de bombas (contiene
+    40)" Text{"Golden Bomb Bag", "Sac de Bombes d'or", "Goldene Bombentasche" }, // "Saco dorado de bombas" Text{"Large
+    Bomb Bag", "Gros Sac de Bombes", "Gigantische Bombentasche" }, // "Zurrón de bombas grande"
     };
     trickNameTable[GI_BOW_1] = {
-        Text{"Bow", "Arc", "Arco del Hada"},
-        Text{"Hero's Bow", "Arc du héros", "Arco del héroe"},
-        Text{"Small Quiver", "Petit carquois", "Saco de flechas pequeño"}
+        Text{"Bow", "Arc", "Bogen" }, // "Arco del Hada"
+        Text{"Hero's Bow", "Arc du héros", "Heroenbogen" }, // "Arco del héroe"
+        Text{"Small Quiver", "Petit carquois", "Kleiner Köcher" }, // "Saco de flechas pequeño"
     };
     trickNameTable[GI_BOW_2] = {
-        Text{"Arrow Capacity (40)", "Capacité de flèches (40)", "Capacidad de flechas (40)"},
-        Text{"Silver Quiver", "Carquois d'argent", "Carcaj plateado"},
-        Text{"Medium Quiver", "Carquois moyen", "Saco de flechas mediano"}
+        Text{"Arrow Capacity (40)", "Capacité de flèches (40)", "Pfeil-Kapazität (40)" }, // "Capacidad de flechas (40)"
+        Text{"Silver Quiver", "Carquois d'argent", "Silberner Köcher" }, // "Carcaj plateado"
+        Text{"Medium Quiver", "Carquois moyen", "Mittlerer Köcher" }, // "Saco de flechas mediano"
     };
     trickNameTable[GI_BOW_3] = {
-        Text{"Arrow Capacity (50)", "Capacité de flèches (50)", "Capacidad de flechas (50)"},
-        Text{"Golden Quiver", "Carquois d'or", "Carcaj dorado"},
-        Text{"Large Quiver", "Gros carquois", "Saco de flechas grande"}
+        Text{"Arrow Capacity (50)", "Capacité de flèches (50)", "Pfeil-Kapazität (50)" }, // "Capacidad de flechas (50)"
+        Text{"Golden Quiver", "Carquois d'or", "Goldener Köcher" }, // "Carcaj dorado"
+        Text{"Large Quiver", "Gros carquois", "Gigantischer Köcher" }, // "Saco de flechas grande"
     };
     trickNameTable[GI_SLINGSHOT_1] = {
-        Text{"Slingshot", "Lance-Pierre", "Tirachinas del Hada"},
-        Text{"Scattershot", "Lance-Pierre rafale", "Tirachinas múltiple"},
-        Text{"Small Seed Satchel", "Petit sac de graines", "Bolsa de semillas pequeña"}
+        Text{"Slingshot", "Lance-Pierre", "Schleuder" }, // "Tirachinas del Hada"
+        Text{"Scattershot", "Lance-Pierre rafale", "Streuschleuder" }, // "Tirachinas múltiple"
+        Text{"Small Seed Satchel", "Petit sac de graines", "Kleine Munitionstasche" }, // "Bolsa de semillas pequeña"
     };
     trickNameTable[GI_SLINGSHOT_2] = {
-        Text{"Deku Seed Capacity (40)", "Capacité de graines (40)", "Capacidad de semillas (40)"},
-        Text{"Silver Deku Seed Bullet Bag", "Sac de graines d'argent", "Bolsa de balas (contiene 40)"},
-        Text{"Medium Seed Satchel", "Sac de graines moyen", "Bolsa de semillas mediana"}
+        Text{"Deku Seed Capacity (40)", "Capacité de graines (40)", "Deku-Kern-Kapazität (40)" }, // "Capacidad de
+    semillas (40)" Text{"Silver Deku Seed Bullet Bag", "Sac de graines d'argent", "Silberne Munitionstasche" }, //
+    "Bolsa de balas (contiene 40)" Text{"Medium Seed Satchel", "Sac de graines moyen", "Mittlere Munitionstasche" }, //
+    "Bolsa de semillas mediana"
     };
     trickNameTable[GI_SLINGSHOT_3] = {
-        Text{"Deku Seed Capacity (50)", "Capacité de graines (50)", "Capacidad de semillas (50)"},
-        Text{"Golden Deku Seed Bullet Bag", "Sac de graines d'or", "Bolsa de balas (contiene 50)"},
-        Text{"Large Seed Satchel", "Gros sac de graines", "Bolsa de semillas grande"}
+        Text{"Deku Seed Capacity (50)", "Capacité de graines (50)", "Deku-Kern-Kapazität (50)" }, // "Capacidad de
+    semillas (50)" Text{"Golden Deku Seed Bullet Bag", "Sac de graines d'or", "Goldene Munitionstasche" }, // "Bolsa de
+    balas (contiene 50)" Text{"Large Seed Satchel", "Gros sac de graines", "Gigantische Munitionstasche" }, // "Bolsa de
+    semillas grande"
     };
     trickNameTable[GI_STRENGTH_1] = {
-        Text{"Goron's Gauntlet", "Gantelet Goron", "Brazalete amarillo"},
-        Text{"Power Bracelet", "Bracelet de force", "Brazalete de fuerza"},
-        Text{"Magic Bracelet", "Bracelet de Lavio", "Brazalete de Ravio"}
+        Text{"Goron's Gauntlet", "Gantelet Goron", "Goronen-Handschuhe€" }, // "Brazalete amarillo"
+        Text{"Power Bracelet", "Bracelet de force", "Kraftarmband" }, // "Brazalete de fuerza"
+        Text{"Magic Bracelet", "Bracelet de Lavio", "Magiearmband" }, // "Brazalete de Ravio"
     };
     trickNameTable[GI_STRENGTH_2] = {
-        Text{"Silver Bracelets", "Bracelets d'argent", "Guantes Moguma"},
-        Text{"Power Gloves", "Gant de puissance", "Guante del Poder"},
-        Text{"Magic Gauntlets", "Gantelet magique", "Guante mágico"}
+        Text{"Silver Bracelets", "Bracelets d'argent", "Silberarmband" }, // "Guantes Moguma"
+        Text{"Power Gloves", "Gant de puissance", "Silberhandschuhe€" }, // "Guante del Poder"
+        Text{"Magic Gauntlets", "Gantelet magique", "Magiehandschuhe€" }, // "Guante mágico"
     };
     trickNameTable[GI_STRENGTH_3] = {
-        Text{"Golden Bracelets", "Bracelets d'or", "Guantelete de Thanos"},
-        Text{"Titan's Mitts", "Moufle de titan", "Guantes de Titán"},
-        Text{"Magnetic Gloves", "Magnéto-gants", "Guantes de fuego"}
+        Text{"Golden Bracelets", "Bracelets d'or", "Goldarmband" }, // "Guantelete de Thanos"
+        Text{"Titan's Mitts", "Moufle de titan", "Goldhandschuhe€" }, // "Guantes de Titán"
+        Text{"Magnetic Gloves", "Magnéto-gants", "Magnethandschuhe€" }, // "Guantes de fuego"
     };
     trickNameTable[GI_SCALE_1] = {
-        Text{"Silver Pearl", "Perle d'argent", "Perla de Plata progresiva"},
-        Text{"Adult Scale", "Écaille d'adulte", "Bola de bolos zora"},
-        Text{"Zora Scale", "Écaille Zora", "Escama de Zora"}
+        Text{"Silver Pearl", "Perle d'argent", "Silberne Perle" }, // "Perla de Plata progresiva"
+        Text{"Adult Scale", "Écaille d'adulte", "Große Schuppe" }, // "Bola de bolos zora"
+        Text{"Zora Scale", "Écaille Zora", "Zora-Schuppe" }, // "Escama de Zora"
     };
     trickNameTable[GI_SCALE_2] = {
-        Text{"Golden Pearl", "Perle d'or", "Perla de Oro progresiva"},
-        Text{"Giant Scale", "Écaille de géant", "Escama de Faren"},
-        Text{"Water Dragon Scale", "Écaille du dragon de l'eau", "Escama de dragón acuático"}
+        Text{"Golden Pearl", "Perle d'or", "Goldene Perle" }, // "Perla de Oro progresiva"
+        Text{"Giant Scale", "Écaille de géant", "Riesenschuppe" }, // "Escama de Faren"
+        Text{"Water Dragon Scale", "Écaille du dragon de l'eau", "Wasserdrachenschuppe" }, // "Escama de dragón
+    acuático"
     };
     trickNameTable[GI_WALLET_1] = {
-        Text{"Rupee Capacity (200)", "Capacité de rubis (200)", "Capacidad de rupias (200)"},
-        Text{"Silver Wallet", "Bourse d'argent", "Cartera de rupias de adulto"},
-        Text{"Medium Wallet", "Bourse moyenne", "Zurrón de rupias mediano"}
+        Text{"Rupee Capacity (200)", "Capacité de rubis (200)", "Rubinkapazität (200)" }, // "Capacidad de rupias (200)"
+        Text{"Silver Wallet", "Bourse d'argent", "Silberne Geldbörse" }, // "Cartera de rupias de adulto"
+        Text{"Medium Wallet", "Bourse moyenne", "Mittlere Geldbörse" }, // "Zurrón de rupias mediano"
     };
     trickNameTable[GI_WALLET_2] = {
-        Text{"Rupee Capacity (500)", "Capacité de rubis (500)", "Capacidad de rupias (500)"},
-        Text{"Golden Wallet", "Bourse d'or", "Cartera de rupias gigante"},
-        Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias grande"}
+        Text{"Rupee Capacity (500)", "Capacité de rubis (500)", "Rubin-Kapazität (500)" }, // "Capacidad de rupias
+    (500)" Text{"Golden Wallet", "Bourse d'or", "Riesenportemonnaie" }, // "Cartera de rupias gigante" Text{"Large
+    Wallet", "Grosse Bourse", "Gigantische Geldbörse" }, // "Zurrón de rupias grande"
     };
     trickNameTable[GI_WALLET_3] = {
-        Text{"Rupee Capacity (999)", "Capacité de rubis (999)", "Capacidad de rupias (999)"},
-        Text{"Golden Wallet", "Bourse d'or", "Cartera de ricachón"},
-        Text{"Large Wallet", "Grosse Bourse", "Zurrón de rupias gigante"}
+        Text{"Rupee Capacity (999)", "Capacité de rubis (999)", "Rubin-Kapazität (999) }, // "Capacidad de rupias (999)"
+        Text{"Golden Wallet", "Bourse d'or", "Goldenes Portemonnaie" }, // "Cartera de ricachón"
+        Text{"Large Wallet", "Grosse Bourse", "Gigantische Geldbörse" }, // "Zurrón de rupias gigante"
     };
     trickNameTable[GI_DEKU_NUT_UPGRADE_1] = {
-        Text{"Deku Bomb Capacity (30)", "Capacité de bombes Mojo (30)", "Capacidad de semillas deku (40)"},
-        Text{"Baba Nut Capacity (30)", "Capacité de noix Baba (30)", "Capacidad de nueces baba (40)"},
-        Text{"Deku Nut Pack (30)", "Paquet de noix Mojo (30)", "Capacidad de nueces mojo (40)"}
+        Text{"Deku Bomb Capacity (30)", "Capacité de bombes Mojo (30)", "Deku-Bomben-Kapazität (30)" }, // "Capacidad de
+    semillas deku (40)" Text{"Baba Nut Capacity (30)", "Capacité de noix Baba (30)", "Ranha-Nuß-Kapazität (30)" }, //
+    "Capacidad de nueces baba (40)" Text{"Deku Nut Pack (30)", "Paquet de noix Mojo (30)", "Deku-Nußrucksack (30)" }, //
+    "Capacidad de nueces mojo (40)"
     };
     trickNameTable[GI_DEKU_NUT_UPGRADE_2] = {
-        Text{"Deku Bomb Capacity (40)", "Capacité de bombes Mojo (40)", "Capacidad de semillas deku (50)"},
-        Text{"Baba Nut Capacity (40)", "Capacité de noix Baba (40)", "Capacidad de nueces baba (50)"},
-        Text{"Deku Nut Pack (40)", "Paquet de noix Mojo (40)", "Capacidad de nueces mojo (50)"}
+        Text{"Deku Bomb Capacity (40)", "Capacité de bombes Mojo (40)", "Deku-Bomben-Kapazität (40)" }, // "Capacidad de
+    semillas deku (50)" Text{"Baba Nut Capacity (40)", "Capacité de noix Baba (40)", "Ranha-Nuß-Kapazität (40)" }, //
+    "Capacidad de nueces baba (50)" Text{"Deku Nut Pack (40)", "Paquet de noix Mojo (40)", "Deku-Nußrucksack (40)" }, //
+    "Capacidad de nueces mojo (50)"
     };
     trickNameTable[GI_DEKU_STICK_UPGRADE_1] = {
-        Text{"Deku Rod Capacity (20)", "Capacité de tiges Mojo (20)", "Capacidad de palos mojo (20)"},
-        Text{"Boko Stick Capacity (20)", "Capacité de Bâtons Boko (20)", "Capacidad de palos boko (20)"},
-        Text{"Deku Stick Pack (20)", "Paquet de bâtons Mojo (20)", "Capacidad de bastones deku (20)"}
+        Text{"Deku Rod Capacity (20)", "Capacité de tiges Mojo (20)", "Deku-Stock-Kapazität (20)" }, // "Capacidad de
+    palos mojo (20)" Text{"Boko Stick Capacity (20)", "Capacité de Bâtons Boko (20)", "Bokstock-Kapazität (20)" }, //
+    "Capacidad de palos boko (20)" Text{"Deku Stick Pack (20)", "Paquet de bâtons Mojo (20)", "Deku-Stabrucksack (20)"
+    }, // "Capacidad de bastones deku (20)"
     };
     trickNameTable[GI_DEKU_STICK_UPGRADE_2] = {
-        Text{"Deku Rod Capacity (30)", "Capacité de tiges Mojo (30)", "Capacidad de palos mojo (30)"},
-        Text{"Boko Stick Capacity (30)", "Capacité de Bâtons Boko (30)", "Capacidad de palos boko (30)"},
-        Text{"Deku Stick Pack (30)", "Paquet de bâtons Mojo (30)", "Capacidad de bastones deku (30)"}
+        Text{"Deku Rod Capacity (30)", "Capacité de tiges Mojo (30)", "Deku-Stock-Kapazität (30)" }, // "Capacidad de
+    palos mojo (30)" Text{"Boko Stick Capacity (30)", "Capacité de Bâtons Boko (30)", "Bokstock-Kapazität (30)" }, //
+    "Capacidad de palos boko (30)" Text{"Deku Stick Pack (30)", "Paquet de bâtons Mojo (30)", "Deku-Stabrucksack (30)"
+    }, // "Capacidad de bastones deku (30)"
     };
     trickNameTable[GI_MAGIC_1] = {
-        Text{"Stamina Meter", "Jauge d'endurance", "Medidor de vigor"},
-        Text{"Energy Meter", "Jauge d'énergie", "Medidor de energía"},
-        Text{"Magic Powder", "Poudre magique", "Medidor de carga"}
+        Text{"Stamina Meter", "Jauge d'endurance", "Ausdauerleiste" }, // "Medidor de vigor"
+        Text{"Energy Meter", "Jauge d'énergie", "Energieleiste" }, // "Medidor de energía"
+        Text{"Magic Powder", "Poudre magique", "Zauberpulver" }, // "Medidor de carga"
     };
     trickNameTable[GI_MAGIC_2] = {
-        Text{"Enhanced Stamina Meter", "Jauge d'endurance améliorée", "Medidor de vigor mejorado"},
-        Text{"Enhanced Energy Meter", "Jauge d'énergie améliorée", "Medidor de energía mejorado"},
-        Text{"Enhanced Magic Powder", "Poudre magique améliorée", "Medidor de carga mejorado"}
+        Text{"Enhanced Stamina Meter", "Jauge d'endurance améliorée", "Verb. Ausdauerleiste" }, // "Medidor de vigor
+    mejorado" Text{"Enhanced Energy Meter", "Jauge d'énergie améliorée", "Verb. Energieleiste" }, // "Medidor de energía
+    mejorado" Text{"Enhanced Magic Powder", "Poudre magique améliorée", "Verb. Zauberpulver" }, // "Medidor de carga
+    mejorado"
     };
     trickNameTable[GI_OCARINA_1] = {
-        Text{"Ocarina", "Ocarina", "Ocarina"},
-        Text{"Saria's Ocarina", "Ocarina de Saria", "Ocarina de Saria"},
-        Text{"Wood Ocarina", "Ocarina de bois", "Ocarina del Hada"}
+        Text{"Ocarina", "Ocarina", "Okarina" }, // "Ocarina"
+        Text{"Saria's Ocarina", "Ocarina de Saria", "Salias Okarina" }, // "Ocarina de Saria"
+        Text{"Wood Ocarina", "Ocarina de bois", "Holzokarina" }, // "Ocarina del Hada"
     };
     trickNameTable[GI_OCARINA_2] = {
-        Text{"Flute", "Flûte", "Flauta"},
-        Text{"Zelda's Ocarina", "Ocarina de Zelda", "Ocarina de Zelda"},
-        Text{"Ocarina of Winds", "Ocarina des vents", "Ocarina del Viento"}
+        Text{"Flute", "Flûte", "Flöte" }, // "Flauta"
+        Text{"Zelda's Ocarina", "Ocarina de Zelda", "Zeldas Okarina" }, // "Ocarina de Zelda"
+        Text{"Ocarina of Winds", "Ocarina des vents", "Okarina des Windes" }, // "Ocarina del Viento"
     };
     trickNameTable[GI_CUCCO] = {
-        Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Alarma emplumada"},
-        Text{"Kakariko Cucco", "Cocotte Cocorico", "Cuco de Kakariko"},
-        Text{"Hatched Cucco", "Cocotte éclose", "Pollo"}
+        Text{"D.I.Y. Alarm Clock", "Réveille-matin improvisé", "Improvisierter Wecker"}, // "Alarma emplumada"
+        Text{"Kakariko Cucco", "Cocotte Cocorico", "Kakariko Huhn" }, // "Cuco de Kakariko"
+        Text{"Hatched Cucco", "Cocotte éclose", "Geschlüpftes Küken" }, // "Pollo"
     };
     trickNameTable[GI_MASK_KEATON] = {
-        Text{"Kee... Something Mask", "Masque de Quiche", "Máscara Kealgo"},
-        Text{"Kitsune Mask", "Masque de Kitsune", "Máscara Kitsune"},
-        Text{"Kafei's Mask", "Masque de Kafei", "Máscara de Kafei"}
+        Text{"Kee... Something Mask", "Masque de Quiche", "Keaton-Maske" }, // "Máscara Kealgo"
+        Text{"Kitsune Mask", "Masque de Kitsune", "Kitsune-Maske" }, // "Máscara Kitsune"
+        Text{"Kafei's Mask", "Masque de Kafei", "Kafeis Maske" }, // "Máscara de Kafei"
     };
     trickNameTable[GI_MASK_SKULL] = {
-        Text{"Skull Kid's Mask", "Masque de Skull Kid", "Máscara de Skull Kid"},
-        Text{"Stalfos Mask", "Masque de squelette", "Máscara de Stalfos"},
-        Text{"Captain's Hat", "Heaume du capitaine", "Casco del capitán"}
+        Text{"Skull Kid's Mask", "Masque de Skull Kid", "Horror-Kids-Maske" }, // "Máscara de Skull Kid"
+        Text{"Stalfos Mask", "Masque de squelette", "Stalfos-Maske" }, // "Máscara de Stalfos"
+        Text{"Captain's Hat", "Heaume du capitaine", "Helm des Hauptmanns" }, // "Casco del capitán"
     };
     trickNameTable[GI_MASK_SPOOKY] = {
-        Text{"Skrik Mask", "Masque Skrik", "Máscara Escalofriante"},
-        Text{"ReDead Mask", "Masque de Remort", "Máscara de ReDead"},
-        Text{"Gibdo Mask", "Masque de Gibdo", "Careta de Gibdo"}
+        Text{"Skrik Mask", "Masque Skrik", "Grusel-Maske" }, // "Máscara Escalofriante"
+        Text{"ReDead Mask", "Masque de Remort", "Remort-Maske" }, // "Máscara de ReDead"
+        Text{"Gibdo Mask", "Masque de Gibdo", "Gibdo-Maske" }, // "Careta de Gibdo"
     };
     trickNameTable[GI_MASK_BUNNY] = {
-        Text{"Peppy Mask", "Masque de Peppy", "Capucha de Pascua"},
-        Text{"Bunny Ears", "Oreilles de lapin", "Orejas de conejo"},
-        Text{"Postman's Hat", "Casquette du facteur", "Gorra de cartero"}
+        Text{"Peppy Mask", "Masque de Peppy", "Peppy-Maske" }, // "Capucha de Pascua"
+        Text{"Bunny Ears", "Oreilles de lapin", "Ohrlöffel" }, // "Orejas de conejo"
+        Text{"Postman's Hat", "Casquette du facteur", "Mütze des Postboten" }, // "Gorra de cartero"
     };
     trickNameTable[GI_MASK_GORON] = {
-        Text{"Goro Mask", "Masque Goro", "Máscara Goro"},
-        Text{"Mask of Goron", "Masque des Gorons", "Máscara de los Goron"},
-        Text{"Darunia Mask", "Masque de Darunia", "Máscara de Darmani"}
+        Text{"Goro Mask", "Masque Goro", "Garos Maske" }, // "Máscara Goro"
+        Text{"Mask of Goron", "Masque des Gorons", "Goronen-Haut" }, // "Máscara de los Goron"
+        Text{"Darunia Mask", "Masque de Darunia", }, "Darunias Maske" // "Máscara de Darmani"
     };
     trickNameTable[GI_MASK_ZORA] = {
-        Text{"Zola Mask", "Masque Zola", "Máscara Zola"},
-        Text{"Mask of Zora", "Masque des Zoras", "Máscara de los Zora"},
-        Text{"Ruto Mask", "Masque de Ruto", "Máscara de Mikau"}
+        Text{"Zola Mask", "Masque Zola", "Zola-Maske" }, // "Máscara Zola"
+        Text{"Mask of Zora", "Masque des Zoras", "Zora-Schuppen€" }, // "Máscara de los Zora"
+        Text{"Ruto Mask", "Masque de Ruto", "Rutos Maske" }, // "Máscara de Mikau"
     };
     trickNameTable[GI_MASK_GERUDO] = {
-        Text{"Ganguro Mask", "Masque de Ganguro", "Máscara Canguro"},
-        Text{"Mask of Gerudo", "Masque des Gerudos", "Máscara de las Gerudo"},
-        Text{"Nabooru Mask", "Masque de Nabooru", "Máscara de Nabooru"}
+        Text{"Ganguro Mask", "Masque de Ganguro", "Ganguro-Maske" }, // "Máscara Canguro"
+        Text{"Mask of Gerudo", "Masque des Gerudos", "Gerudo-Perücke" }, // "Máscara de las Gerudo"
+        Text{"Nabooru Mask", "Masque de Nabooru", "Naborus Maske" }, // "Máscara de Nabooru"
     };
     trickNameTable[GI_MASK_TRUTH] = {
-        Text{"Sheikah Mask", "Masque Sheikah", "Máscara Sheikah"},
-        Text{"Mask of Gossip", "Masque de potins", "Máscara chismosa"},
-        Text{"Eye of Truth", "oeil de vérité", "Ojo de la Verdad"}
+        Text{"Sheikah Mask", "Masque Sheikah", "Shiekah-Maske" }, // "Máscara Sheikah"
+        Text{"Mask of Gossip", "Masque de potins", "Maske der Mythen" }, // "Máscara chismosa"
+        Text{"Eye of Truth", "oeil de vérité", "Auge der Wahrheit" }, // "Ojo de la Verdad"
     };
     */
 }
 
-//Generate a fake name for the ice trap based on the item it's displayed as
+// Generate a fake name for the ice trap based on the item it's displayed as
 Text GetIceTrapName(uint8_t id) {
-    //If the trick names table has not been initialized, do so
+    // If the trick names table has not been initialized, do so
     if (!initTrickNames) {
         InitTrickNames();
         initTrickNames = true;
     }
-    //Randomly get the easy, medium, or hard name for the given item id
+    // Randomly get the easy, medium, or hard name for the given item id
     return RandomElement(trickNameTable[id]);
 }
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
index b1f09a9a73..81c4a43582 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -16,16 +16,10 @@ struct PriceSettingsStruct {
     RandomizerSettingKey tycoonWallet;
     RandomizerSettingKey affordable;
 
-    PriceSettingsStruct(RandomizerSettingKey _main,
-                        RandomizerSettingKey _fixedPrice,
-                        RandomizerSettingKey _range1,
-                        RandomizerSettingKey _range2,
-                        RandomizerSettingKey _noWallet,
-                        RandomizerSettingKey _childWallet,
-                        RandomizerSettingKey _adultWallet,
-                        RandomizerSettingKey _giantWallet,
-                        RandomizerSettingKey _tycoonWallet,
-                        RandomizerSettingKey _affordable);
+    PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice, RandomizerSettingKey _range1,
+                        RandomizerSettingKey _range2, RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet,
+                        RandomizerSettingKey _adultWallet, RandomizerSettingKey _giantWallet,
+                        RandomizerSettingKey _tycoonWallet, RandomizerSettingKey _affordable);
 };
 
 extern void PlaceVanillaShopItems();
@@ -34,5 +28,3 @@ extern uint16_t GetRandomPrice(Rando::Location* loc, PriceSettingsStruct priceSe
 extern uint16_t GetCheapBalancedPrice();
 extern int GetShopsanityReplaceAmount();
 extern Text GetIceTrapName(uint8_t id);
-
-
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index da4c3eb438..3c91a1f704 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -66,69 +66,72 @@ static auto GetSpoilerLogPath() {
 }
 
 static auto GetPlacementLogPath() {
-  return GetGeneralPath();
+    return GetGeneralPath();
 }
 
 // Writes the location to the specified node.
-static void WriteLocation(
-    std::string sphere, const RandomizerCheck locationKey, const bool withPadding = false) {
-  Rando::Location* location = Rando::StaticData::GetLocation(locationKey);
-  Rando::ItemLocation* itemLocation = Rando::Context::GetInstance()->GetItemLocation(locationKey);
+static void WriteLocation(std::string sphere, const RandomizerCheck locationKey, const bool withPadding = false) {
+    Rando::Location* location = Rando::StaticData::GetLocation(locationKey);
+    Rando::ItemLocation* itemLocation = Rando::Context::GetInstance()->GetItemLocation(locationKey);
 
-  switch (gSaveContext.language) {
+    switch (gSaveContext.language) {
         case LANGUAGE_ENG:
         default:
             jsonData["playthrough"][sphere][location->GetName()] = itemLocation->GetPlacedItemName().GetEnglish();
             break;
+        case LANGUAGE_GER:
+            jsonData["playthrough"][sphere][location->GetName()] = itemLocation->GetPlacedItemName().GetGerman();
+            break;
         case LANGUAGE_FRA:
             jsonData["playthrough"][sphere][location->GetName()] = itemLocation->GetPlacedItemName().GetFrench();
             break;
     }
 }
 
-//Writes a shuffled entrance to the specified node
+// Writes a shuffled entrance to the specified node
 static void WriteShuffledEntrance(std::string sphereString, Entrance* entrance) {
-  int16_t originalIndex = entrance->GetIndex();
-  int16_t destinationIndex = -1;
-  int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
-  int16_t replacementDestinationIndex = -1;
-  std::string name = GetEntranceData(originalIndex)->source;
-  std::string text = GetEntranceData(replacementIndex)->destination;
+    int16_t originalIndex = entrance->GetIndex();
+    int16_t destinationIndex = -1;
+    int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
+    int16_t replacementDestinationIndex = -1;
+    std::string name = GetEntranceData(originalIndex)->source;
+    std::string text = GetEntranceData(replacementIndex)->destination;
 
-  // Track the reverse destination, useful for savewarp handling
-  if (entrance->GetReverse() != nullptr) {
-    destinationIndex = entrance->GetReverse()->GetIndex();
-    // When decouple is off we track the replacement's reverse destination, useful for recording visited entrances
-    if (!entrance->IsDecoupled()) {
-      replacementDestinationIndex = entrance->GetReplacement()->GetReverse()->GetIndex();
+    // Track the reverse destination, useful for savewarp handling
+    if (entrance->GetReverse() != nullptr) {
+        destinationIndex = entrance->GetReverse()->GetIndex();
+        // When decouple is off we track the replacement's reverse destination, useful for recording visited entrances
+        if (!entrance->IsDecoupled()) {
+            replacementDestinationIndex = entrance->GetReplacement()->GetReverse()->GetIndex();
+        }
     }
-  }
 
-  json entranceJson = json::object({
-    {"type", entrance->GetType()},
-    {"index", originalIndex},
-    {"destination", destinationIndex},
-    {"override", replacementIndex},
-    {"overrideDestination", replacementDestinationIndex},
-  });
-
-  jsonData["entrances"].push_back(entranceJson);
-
-  // When decoupled entrances is off, handle saving reverse entrances
-  if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
-    json reverseEntranceJson = json::object({
-      {"type", entrance->GetReverse()->GetType()},
-      {"index", replacementDestinationIndex},
-      {"destination", replacementIndex},
-      {"override", destinationIndex},
-      {"overrideDestination", originalIndex},
+    json entranceJson = json::object({
+        { "type", entrance->GetType() },
+        { "index", originalIndex },
+        { "destination", destinationIndex },
+        { "override", replacementIndex },
+        { "overrideDestination", replacementDestinationIndex },
     });
 
-    jsonData["entrances"].push_back(reverseEntranceJson);
-  }
+    jsonData["entrances"].push_back(entranceJson);
 
-  switch (gSaveContext.language) {
+    // When decoupled entrances is off, handle saving reverse entrances
+    if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+        json reverseEntranceJson = json::object({
+            { "type", entrance->GetReverse()->GetType() },
+            { "index", replacementDestinationIndex },
+            { "destination", replacementIndex },
+            { "override", destinationIndex },
+            { "overrideDestination", originalIndex },
+        });
+
+        jsonData["entrances"].push_back(reverseEntranceJson);
+    }
+
+    switch (gSaveContext.language) {
         case LANGUAGE_ENG:
+        case LANGUAGE_GER:
         case LANGUAGE_FRA:
         default:
             jsonData["entrancesMap"][sphereString][name] = text;
@@ -141,32 +144,31 @@ static void WriteSettings() {
     auto ctx = Rando::Context::GetInstance();
     std::array<Rando::Option, RSK_MAX> options = Rando::Settings::GetInstance()->GetAllOptions();
     for (const Rando::Option& option : options) {
-      if (option.GetName() != ""){
-        jsonData["settings"][option.GetName()] = option.GetOptionText(ctx->GetOption(option.GetKey()).Get());
-      }
+        if (option.GetName() != "") {
+            jsonData["settings"][option.GetName()] = option.GetOptionText(ctx->GetOption(option.GetKey()).Get());
+        }
     }
 }
 
 // Removes any line breaks from s.
 std::string RemoveLineBreaks(std::string s) {
-  s.erase(std::remove(s.begin(), s.end(), '\n'), s.end());
-  return s;
+    s.erase(std::remove(s.begin(), s.end(), '\n'), s.end());
+    return s;
 }
 
 // Writes the excluded locations to the spoiler log, if there are any.
 static void WriteExcludedLocations() {
-  auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
 
-  for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) {
-    for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) {
-      if (ctx->GetLocationOption(static_cast<RandomizerCheck>(location->GetKey())).Get() == RO_LOCATION_INCLUDE) {
-        continue;
-      }
-
-      jsonData["excludedLocations"].push_back(RemoveLineBreaks(location->GetName()));
+    for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) {
+        for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) {
+            if (ctx->GetLocationOption(static_cast<RandomizerCheck>(location->GetKey())).Get() == RO_LOCATION_INCLUDE) {
+                continue;
+            }
 
+            jsonData["excludedLocations"].push_back(RemoveLineBreaks(location->GetName()));
+        }
     }
-  }
 }
 
 // Writes the starting inventory to the spoiler log, if there is any.
@@ -182,16 +184,16 @@ static void WriteStartingInventory() {
     }
 }
 
-//Writes the enabled tricks to the spoiler log, if there are any.
+// Writes the enabled tricks to the spoiler log, if there are any.
 static void WriteEnabledTricks() {
-  auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
 
-  for (const auto& setting : Rando::Settings::GetInstance()->GetOptionGroup(RSG_TRICKS).GetOptions()) {
-    if (ctx->GetTrickOption(static_cast<RandomizerTrick>(setting->GetKey())).IsNot(RO_GENERIC_ON)) {
-      continue;
+    for (const auto& setting : Rando::Settings::GetInstance()->GetOptionGroup(RSG_TRICKS).GetOptions()) {
+        if (ctx->GetTrickOption(static_cast<RandomizerTrick>(setting->GetKey())).IsNot(RO_GENERIC_ON)) {
+            continue;
+        }
+        jsonData["enabledTricks"].push_back(RemoveLineBreaks(setting->GetName()).c_str());
     }
-    jsonData["enabledTricks"].push_back(RemoveLineBreaks(setting->GetName()).c_str());
-  }
 }
 
 // Writes the Master Quest dungeons to the spoiler log, if there are any.
@@ -208,47 +210,49 @@ static void WriteMasterQuestDungeons() {
 
 // Writes the required trials to the spoiler log, if there are any.
 static void WriteChosenOptions() {
-  auto ctx = Rando::Context::GetInstance();
-  for (const auto& trial : ctx->GetTrials()->GetTrialList()) {
-    if (trial->IsRequired()) {
-      std::string trialName = trial->GetName().GetForCurrentLanguage(MF_CLEAN);
-      jsonData["requiredTrials"].push_back(RemoveLineBreaks(trialName));
+    auto ctx = Rando::Context::GetInstance();
+    for (const auto& trial : ctx->GetTrials()->GetTrialList()) {
+        if (trial->IsRequired()) {
+            std::string trialName = trial->GetName().GetForCurrentLanguage(MF_CLEAN);
+            jsonData["requiredTrials"].push_back(RemoveLineBreaks(trialName));
+        }
+    }
+    if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT)) {
+        jsonData["SelectedStartingAge"] = "Adult";
+    } else {
+        jsonData["SelectedStartingAge"] = "Child";
     }
-  }
-  if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT)){
-    jsonData["SelectedStartingAge"] = "Adult";
-  } else {
-    jsonData["SelectedStartingAge"] = "Child";
-  }
 }
 
 // Writes the intended playthrough to the spoiler log, separated into spheres.
 static void WritePlaythrough() {
-  auto ctx = Rando::Context::GetInstance();
+    auto ctx = Rando::Context::GetInstance();
 
-  for (uint32_t i = 0; i < ctx->playthroughLocations.size(); ++i) {
-    auto sphereNum = std::to_string(i);
-    std::string sphereString =  "sphere ";
-    if (i < 10) sphereString += "0";
-    sphereString += sphereNum;
-    for (const RandomizerCheck key : ctx->playthroughLocations[i]) {
-      WriteLocation(sphereString, key, true);
+    for (uint32_t i = 0; i < ctx->playthroughLocations.size(); ++i) {
+        auto sphereNum = std::to_string(i);
+        std::string sphereString = "sphere ";
+        if (i < 10)
+            sphereString += "0";
+        sphereString += sphereNum;
+        for (const RandomizerCheck key : ctx->playthroughLocations[i]) {
+            WriteLocation(sphereString, key, true);
+        }
     }
-  }
 }
 
-//Write the randomized entrance playthrough to the spoiler log, if applicable
+// Write the randomized entrance playthrough to the spoiler log, if applicable
 static void WriteShuffledEntrances() {
-  auto ctx = Rando::Context::GetInstance();
-  for (uint32_t i = 0; i < ctx->GetEntranceShuffler()->playthroughEntrances.size(); ++i) {
-    auto sphereNum = std::to_string(i);
-    std::string sphereString = "sphere ";
-    if (i < 10) sphereString += "0";
-    sphereString += sphereNum;
-    for (Entrance* entrance : ctx->GetEntranceShuffler()->playthroughEntrances[i]) {
-        WriteShuffledEntrance(sphereString, entrance);
+    auto ctx = Rando::Context::GetInstance();
+    for (uint32_t i = 0; i < ctx->GetEntranceShuffler()->playthroughEntrances.size(); ++i) {
+        auto sphereNum = std::to_string(i);
+        std::string sphereString = "sphere ";
+        if (i < 10)
+            sphereString += "0";
+        sphereString += sphereNum;
+        for (Entrance* entrance : ctx->GetEntranceShuffler()->playthroughEntrances[i]) {
+            WriteShuffledEntrance(sphereString, entrance);
+        }
     }
-  }
 }
 
 Rando::ItemLocation* GetItemLocation(RandomizerGet item) {
@@ -265,52 +269,71 @@ static void WriteAllLocations() {
         std::string placedItemName;
 
         switch (gSaveContext.language) {
-          case 0:
-          default:
-            placedItemName = location->GetPlacedItemName().english;
-            break;
-          case 2:
-            placedItemName = location->GetPlacedItemName().french;
-            break;
+            case 0:
+            default:
+                placedItemName = location->GetPlacedItemName().GetEnglish();
+                break;
+            case 1:
+                placedItemName = location->GetPlacedItemName().GetGerman();
+                break;
+            case 2:
+                placedItemName = location->GetPlacedItemName().GetFrench();
+                break;
         }
 
         // If it's a simple item (not an ice trap, doesn't have a price)
         // just add the name of the item and move on
-        if (!location->HasCustomPrice() &&
-            location->GetPlacedRandomizerGet() != RG_ICE_TRAP) {
-            
-            jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()] = placedItemName;
+        if (!location->HasCustomPrice() && location->GetPlacedRandomizerGet() != RG_ICE_TRAP) {
+
+            jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()] =
+                placedItemName;
             continue;
         }
 
         // We're dealing with a complex item, build out the json object for it
-        jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["item"] = placedItemName;
+        jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["item"] =
+            placedItemName;
 
         if (location->HasCustomPrice()) {
             jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["price"] =
                 location->GetPrice();
         }
         if (location->IsAHintAccessible()) {
-          hintedLocations.emplace(Rando::StaticData::GetLocation(key)->GetHintKey(), location);
+            hintedLocations.emplace(Rando::StaticData::GetLocation(key)->GetHintKey(), location);
         }
 
         if (location->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-          switch (gSaveContext.language) {
-              case 0:
-              default:
-                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
-                      Rando::StaticData::RetrieveItem(ctx->overrides[location->GetRandomizerCheck()].LooksLike()).GetName().english;
-                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] = 
-                      ctx->overrides[location->GetRandomizerCheck()].GetTrickName().english;
-                  break;
-              case 2:
-                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["model"] =
-                      Rando::StaticData::RetrieveItem(ctx->overrides[location->GetRandomizerCheck()].LooksLike()).GetName().french;
-                  jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]["trickName"] =
-                      ctx->overrides[location->GetRandomizerCheck()].GetTrickName().french;
-                  break;
-          }
-      }
+            switch (gSaveContext.language) {
+                case 0:
+                default:
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["model"] = Rando::StaticData::RetrieveItem(
+                                            ctx->overrides[location->GetRandomizerCheck()].LooksLike())
+                                            .GetName()
+                                            .GetEnglish();
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().GetEnglish();
+                    break;
+                case 1:
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["model"] = Rando::StaticData::RetrieveItem(
+                                            ctx->overrides[location->GetRandomizerCheck()].LooksLike())
+                                            .GetName()
+                                            .GetGerman();
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().GetGerman();
+                    break;
+                case 2:
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["model"] = Rando::StaticData::RetrieveItem(
+                                            ctx->overrides[location->GetRandomizerCheck()].LooksLike())
+                                            .GetName()
+                                            .GetFrench();
+                    jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
+                            ["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().GetFrench();
+                    break;
+            }
+        }
     }
 }
 
@@ -319,9 +342,9 @@ const char* SpoilerLog_Write() {
 
     jsonData.clear();
 
-    jsonData["version"] = (char*) gBuildVersion;
-    jsonData["git_branch"] = (char*) gGitBranch;
-    jsonData["git_commit"] = (char*) gGitCommitHash;
+    jsonData["version"] = (char*)gBuildVersion;
+    jsonData["git_branch"] = (char*)gGitBranch;
+    jsonData["git_commit"] = (char*)gGitCommitHash;
     jsonData["seed"] = ctx->GetSeedString();
     jsonData["finalSeed"] = ctx->GetSeed();
 
@@ -335,7 +358,7 @@ const char* SpoilerLog_Write() {
     WriteSettings();
     WriteExcludedLocations();
     WriteStartingInventory();
-    WriteEnabledTricks(); 
+    WriteEnabledTricks();
     WriteMasterQuestDungeons();
     WriteChosenOptions();
     WritePlaythrough();
@@ -353,7 +376,7 @@ const char* SpoilerLog_Write() {
 
     std::string jsonString = jsonData.dump(4);
     std::ostringstream fileNameStream;
-    for (uint8_t i = 0; i < ctx->hashIconIndexes.size(); i ++) {
+    for (uint8_t i = 0; i < ctx->hashIconIndexes.size(); i++) {
         if (i) {
             fileNameStream << '-';
         }
@@ -384,4 +407,3 @@ void PlacementLog_Msg(std::string_view msg) {
 void PlacementLog_Clear() {
     placementtxt = "";
 }
-
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
index c72b5f285c..dda37b18a1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -10,188 +10,188 @@ std::vector<RandomizerGet> StartingInventory;
 uint8_t AdditionalHeartContainers;
 
 static void AddItemToInventory(RandomizerGet item, size_t count = 1) {
-  StartingInventory.insert(StartingInventory.end(), count, item);
+    StartingInventory.insert(StartingInventory.end(), count, item);
 }
 
 void GenerateStartingInventory() {
-  auto ctx = Rando::Context::GetInstance();
-  StartingInventory.clear();
+    auto ctx = Rando::Context::GetInstance();
+    StartingInventory.clear();
 
-  if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
-    for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      if (dungeon->GetMap() != RG_NONE) {
-        AddItemToInventory(dungeon->GetMap());
-      }
+    if (ctx->GetOption(RSK_SHUFFLE_MAPANDCOMPASS).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+        for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            if (dungeon->GetMap() != RG_NONE) {
+                AddItemToInventory(dungeon->GetMap());
+            }
 
-      if (dungeon->GetCompass() != RG_NONE) {
-        AddItemToInventory(dungeon->GetCompass());
-      }
-    }
-  }
-
-  if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
-    for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
-      if (dungeon->GetSmallKeyCount() > 0) {
-        AddItemToInventory(dungeon->GetSmallKey(), dungeon->GetSmallKeyCount());
-      }
-    }
-  } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
-    // Logic cannot handle vanilla key layout in some dungeons
-    // this is because vanilla expects the dungeon major item to be
-    // locked behind the keys, which is not always true in rando.
-    // We can resolve this by starting with some extra keys
-    // - OoT Randomizer
-    if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
-      AddItemToInventory(RG_SPIRIT_TEMPLE_SMALL_KEY, 3);
-    }
-  }
-
-  if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
-    AddItemToInventory(RG_FOREST_TEMPLE_BOSS_KEY);
-    AddItemToInventory(RG_FIRE_TEMPLE_BOSS_KEY);
-    AddItemToInventory(RG_WATER_TEMPLE_BOSS_KEY);
-    AddItemToInventory(RG_SPIRIT_TEMPLE_BOSS_KEY);
-    AddItemToInventory(RG_SHADOW_TEMPLE_BOSS_KEY);
-  }
-
-  // Add Ganon's Boss key with Triforce Hunt so the game thinks it's obtainable from the start.
-  // During save init, the boss key isn't actually given and it's instead given when completing the triforce.
-  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH) ||
-      ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
-      AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
-  }
-
-  if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) && !ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
-    AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD);
-  }
-
-  //Starting Inventory Menu
-  //Values are associated so that the count of items matches the index of
-  //the option selected. If None is selected, the value will be zero and
-  //zero of the item will be added to the starting inventory.
-  // TODO: Uncomment when these options are implemented.
-  // AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value<uint8_t>());
-  // AddItemToInventory((BombchuBag ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value<uint8_t>());
-  // AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value<uint8_t>());
-  // AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value<uint8_t>());
-  // AddItemToInventory(RG_LIGHT_ARROWS, StartingLightArrows.Value<uint8_t>());
-  // AddItemToInventory(RG_DINS_FIRE, StartingDinsFire.Value<uint8_t>());
-  // AddItemToInventory(RG_FARORES_WIND, StartingFaroresWind.Value<uint8_t>());
-  // AddItemToInventory(RG_NAYRUS_LOVE, StartingNayrusLove.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_SLINGSHOT, StartingSlingshot.Value<uint8_t>());
-  // AddItemToInventory(RG_BOOMERANG, StartingBoomerang.Value<uint8_t>());
-  // AddItemToInventory(RG_LENS_OF_TRUTH, StartingLensOfTruth.Value<uint8_t>());
-  // AddItemToInventory(RG_MAGIC_BEAN_PACK, StartingMagicBean.Value<uint8_t>());
-  // AddItemToInventory(RG_MEGATON_HAMMER, StartingMegatonHammer.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_HOOKSHOT, StartingHookshot.Value<uint8_t>());
-  // AddItemToInventory(RG_IRON_BOOTS, StartingIronBoots.Value<uint8_t>());
-  // AddItemToInventory(RG_HOVER_BOOTS, StartingHoverBoots.Value<uint8_t>());
-  //For starting bottles, we need to check if they are a big poe and add that if so
-  // since a big poe bottle is not logically equivalent to an empty bottle.
-  // if (StartingBottle1.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  // } else if (StartingBottle1.Value<uint8_t>()) {
-  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  // }
-  // if (StartingBottle2.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  // } else if (StartingBottle2.Value<uint8_t>()) {
-  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  // }
-  // if (StartingBottle3.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  // } else if (StartingBottle3.Value<uint8_t>()) {
-  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  // }
-  // if (StartingBottle4.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
-  //   AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
-  // } else if (StartingBottle4.Value<uint8_t>()) {
-  //   AddItemToInventory(RG_EMPTY_BOTTLE, 1);
-  // }
-  // AddItemToInventory(RG_RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
-  AddItemToInventory(RG_PROGRESSIVE_OCARINA,       ctx->GetOption(RSK_STARTING_OCARINA).Get());
-  AddItemToInventory(RG_ZELDAS_LULLABY,            ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY) ? 1 : 0);
-  AddItemToInventory(RG_EPONAS_SONG,               ctx->GetOption(RSK_STARTING_EPONAS_SONG) ? 1 : 0);
-  AddItemToInventory(RG_SARIAS_SONG,               ctx->GetOption(RSK_STARTING_SARIAS_SONG) ? 1 : 0);
-  AddItemToInventory(RG_SUNS_SONG,                 ctx->GetOption(RSK_STARTING_SUNS_SONG) ? 1 : 0);
-  AddItemToInventory(RG_SONG_OF_TIME,              ctx->GetOption(RSK_STARTING_SONG_OF_TIME) ? 1 : 0);
-  AddItemToInventory(RG_SONG_OF_STORMS,            ctx->GetOption(RSK_STARTING_SONG_OF_STORMS) ? 1 : 0);
-  AddItemToInventory(RG_MINUET_OF_FOREST,          ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST) ? 1 : 0);
-  AddItemToInventory(RG_BOLERO_OF_FIRE,            ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE) ? 1 : 0);
-  AddItemToInventory(RG_SERENADE_OF_WATER,         ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER) ? 1 : 0);
-  AddItemToInventory(RG_REQUIEM_OF_SPIRIT,         ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT) ? 1 : 0);
-  AddItemToInventory(RG_NOCTURNE_OF_SHADOW,        ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW) ? 1 : 0);
-  AddItemToInventory(RG_PRELUDE_OF_LIGHT,          ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT) ? 1 : 0);
-  AddItemToInventory(RG_KOKIRI_SWORD,              ctx->GetOption(RSK_STARTING_KOKIRI_SWORD) ? 1 : 0);
-  // if (ProgressiveGoronSword) {
-  //   AddItemToInventory(RG_PROGRESSIVE_GORONSWORD, StartingBiggoronSword.Value<uint8_t>());
-  // } else {
-  //   AddItemToInventory(RG_GIANTS_KNIFE, (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
-  //   AddItemToInventory(RG_BIGGORON_SWORD, (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
-  // }
-  AddItemToInventory(RG_MASTER_SWORD,              ctx->GetOption(RSK_STARTING_MASTER_SWORD) ? 1 : 0);
-  AddItemToInventory(RG_DEKU_SHIELD,               ctx->GetOption(RSK_STARTING_DEKU_SHIELD) ? 1 : 0);
-  // AddItemToInventory(RG_HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
-  // AddItemToInventory(RG_MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
-  // AddItemToInventory(RG_GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
-  // AddItemToInventory(RG_ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
-  // AddItemToInventory(RG_PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
-  // AddItemToInventory(RG_STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
-  // AddItemToInventory(RG_DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
-  // AddItemToInventory(RG_KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
-  // AddItemToInventory(RG_GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
-  // AddItemToInventory(RG_ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
-  // AddItemToInventory(RG_FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
-  // AddItemToInventory(RG_FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
-  // AddItemToInventory(RG_WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
-  // AddItemToInventory(RG_SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
-  // AddItemToInventory(RG_SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
-  // AddItemToInventory(RG_LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
-  AddItemToInventory(RG_GOLD_SKULLTULA_TOKEN,      ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Get());
-
-  int8_t hearts = ctx->GetOption(RSK_STARTING_HEARTS).Get() - 2;
-  AdditionalHeartContainers = 0;
-  if (hearts < 0) {
-    AddItemToInventory(RG_PIECE_OF_HEART, 4);
-    // Plentiful and minimal have less than 4 standard pieces of heart so also replace the winner heart
-    if (ctx->GetOption(RSK_ITEM_POOL).Get() == 0 || ctx->GetOption(RSK_ITEM_POOL).Get() == 3) {
-      AddItemToInventory(RG_TREASURE_GAME_HEART);
+            if (dungeon->GetCompass() != RG_NONE) {
+                AddItemToInventory(dungeon->GetCompass());
+            }
+        }
     }
 
-    AdditionalHeartContainers = 1 - hearts;
-  } else if (hearts > 0) {
-    // 16 containers in plentiful, 8 in balanced and 0 in the others
-    uint8_t maxContainers = 8 * std::max(0, 2 - ctx->GetOption(RSK_ITEM_POOL).Get());
-
-    if (hearts <= maxContainers) {
-      AddItemToInventory(RG_HEART_CONTAINER, hearts);
-    } else {
-      AddItemToInventory(RG_HEART_CONTAINER, maxContainers);
-      AddItemToInventory(RG_PIECE_OF_HEART, (hearts - maxContainers) * 4);
+    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+        for (auto* dungeon : ctx->GetDungeons()->GetDungeonList()) {
+            if (dungeon->GetSmallKeyCount() > 0) {
+                AddItemToInventory(dungeon->GetSmallKey(), dungeon->GetSmallKeyCount());
+            }
+        }
+    } else if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA)) {
+        // Logic cannot handle vanilla key layout in some dungeons
+        // this is because vanilla expects the dungeon major item to be
+        // locked behind the keys, which is not always true in rando.
+        // We can resolve this by starting with some extra keys
+        // - OoT Randomizer
+        if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ()) {
+            AddItemToInventory(RG_SPIRIT_TEMPLE_SMALL_KEY, 3);
+        }
     }
 
-    if (hearts == 17) {
-      AddItemToInventory(RG_TREASURE_GAME_HEART);
+    if (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_STARTWITH)) {
+        AddItemToInventory(RG_FOREST_TEMPLE_BOSS_KEY);
+        AddItemToInventory(RG_FIRE_TEMPLE_BOSS_KEY);
+        AddItemToInventory(RG_WATER_TEMPLE_BOSS_KEY);
+        AddItemToInventory(RG_SPIRIT_TEMPLE_BOSS_KEY);
+        AddItemToInventory(RG_SHADOW_TEMPLE_BOSS_KEY);
+    }
+
+    // Add Ganon's Boss key with Triforce Hunt so the game thinks it's obtainable from the start.
+    // During save init, the boss key isn't actually given and it's instead given when completing the triforce.
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH) || ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+        AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
+    }
+
+    if (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) &&
+        !ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) {
+        AddItemToInventory(RG_GERUDO_MEMBERSHIP_CARD);
+    }
+
+    // Starting Inventory Menu
+    // Values are associated so that the count of items matches the index of
+    // the option selected. If None is selected, the value will be zero and
+    // zero of the item will be added to the starting inventory.
+    //  TODO: Uncomment when these options are implemented.
+    //  AddItemToInventory(RG_PROGRESSIVE_STICK_UPGRADE, StartingStickCapacity.Value<uint8_t>());
+    //  AddItemToInventory(RG_PROGRESSIVE_NUT_UPGRADE, StartingNutCapacity.Value<uint8_t>());
+    //  AddItemToInventory(RG_PROGRESSIVE_BOMB_BAG, StartingBombBag.Value<uint8_t>());
+    //  AddItemToInventory((BombchuBag ? RG_PROGRESSIVE_BOMBCHUS : RG_BOMBCHU_20), StartingBombchus.Value<uint8_t>());
+    //  AddItemToInventory(RG_PROGRESSIVE_BOW, StartingBow.Value<uint8_t>());
+    //  AddItemToInventory(RG_FIRE_ARROWS, StartingFireArrows.Value<uint8_t>());
+    //  AddItemToInventory(RG_ICE_ARROWS, StartingIceArrows.Value<uint8_t>());
+    //  AddItemToInventory(RG_LIGHT_ARROWS, StartingLightArrows.Value<uint8_t>());
+    //  AddItemToInventory(RG_DINS_FIRE, StartingDinsFire.Value<uint8_t>());
+    //  AddItemToInventory(RG_FARORES_WIND, StartingFaroresWind.Value<uint8_t>());
+    //  AddItemToInventory(RG_NAYRUS_LOVE, StartingNayrusLove.Value<uint8_t>());
+    //  AddItemToInventory(RG_PROGRESSIVE_SLINGSHOT, StartingSlingshot.Value<uint8_t>());
+    //  AddItemToInventory(RG_BOOMERANG, StartingBoomerang.Value<uint8_t>());
+    //  AddItemToInventory(RG_LENS_OF_TRUTH, StartingLensOfTruth.Value<uint8_t>());
+    //  AddItemToInventory(RG_MAGIC_BEAN_PACK, StartingMagicBean.Value<uint8_t>());
+    //  AddItemToInventory(RG_MEGATON_HAMMER, StartingMegatonHammer.Value<uint8_t>());
+    //  AddItemToInventory(RG_PROGRESSIVE_HOOKSHOT, StartingHookshot.Value<uint8_t>());
+    //  AddItemToInventory(RG_IRON_BOOTS, StartingIronBoots.Value<uint8_t>());
+    //  AddItemToInventory(RG_HOVER_BOOTS, StartingHoverBoots.Value<uint8_t>());
+    // For starting bottles, we need to check if they are a big poe and add that if so
+    //  since a big poe bottle is not logically equivalent to an empty bottle.
+    //  if (StartingBottle1.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+    //    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+    //  } else if (StartingBottle1.Value<uint8_t>()) {
+    //    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+    //  }
+    //  if (StartingBottle2.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+    //    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+    //  } else if (StartingBottle2.Value<uint8_t>()) {
+    //    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+    //  }
+    //  if (StartingBottle3.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+    //    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+    //  } else if (StartingBottle3.Value<uint8_t>()) {
+    //    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+    //  }
+    //  if (StartingBottle4.Value<uint8_t>() == STARTINGBOTTLE_BIG_POE) {
+    //    AddItemToInventory(RG_BOTTLE_WITH_BIG_POE, 1);
+    //  } else if (StartingBottle4.Value<uint8_t>()) {
+    //    AddItemToInventory(RG_EMPTY_BOTTLE, 1);
+    //  }
+    //  AddItemToInventory(RG_RUTOS_LETTER,              StartingRutoBottle.Value<uint8_t>());
+    AddItemToInventory(RG_PROGRESSIVE_OCARINA, ctx->GetOption(RSK_STARTING_OCARINA).Get());
+    AddItemToInventory(RG_ZELDAS_LULLABY, ctx->GetOption(RSK_STARTING_ZELDAS_LULLABY) ? 1 : 0);
+    AddItemToInventory(RG_EPONAS_SONG, ctx->GetOption(RSK_STARTING_EPONAS_SONG) ? 1 : 0);
+    AddItemToInventory(RG_SARIAS_SONG, ctx->GetOption(RSK_STARTING_SARIAS_SONG) ? 1 : 0);
+    AddItemToInventory(RG_SUNS_SONG, ctx->GetOption(RSK_STARTING_SUNS_SONG) ? 1 : 0);
+    AddItemToInventory(RG_SONG_OF_TIME, ctx->GetOption(RSK_STARTING_SONG_OF_TIME) ? 1 : 0);
+    AddItemToInventory(RG_SONG_OF_STORMS, ctx->GetOption(RSK_STARTING_SONG_OF_STORMS) ? 1 : 0);
+    AddItemToInventory(RG_MINUET_OF_FOREST, ctx->GetOption(RSK_STARTING_MINUET_OF_FOREST) ? 1 : 0);
+    AddItemToInventory(RG_BOLERO_OF_FIRE, ctx->GetOption(RSK_STARTING_BOLERO_OF_FIRE) ? 1 : 0);
+    AddItemToInventory(RG_SERENADE_OF_WATER, ctx->GetOption(RSK_STARTING_SERENADE_OF_WATER) ? 1 : 0);
+    AddItemToInventory(RG_REQUIEM_OF_SPIRIT, ctx->GetOption(RSK_STARTING_REQUIEM_OF_SPIRIT) ? 1 : 0);
+    AddItemToInventory(RG_NOCTURNE_OF_SHADOW, ctx->GetOption(RSK_STARTING_NOCTURNE_OF_SHADOW) ? 1 : 0);
+    AddItemToInventory(RG_PRELUDE_OF_LIGHT, ctx->GetOption(RSK_STARTING_PRELUDE_OF_LIGHT) ? 1 : 0);
+    AddItemToInventory(RG_KOKIRI_SWORD, ctx->GetOption(RSK_STARTING_KOKIRI_SWORD) ? 1 : 0);
+    // if (ProgressiveGoronSword) {
+    //   AddItemToInventory(RG_PROGRESSIVE_GORONSWORD, StartingBiggoronSword.Value<uint8_t>());
+    // } else {
+    //   AddItemToInventory(RG_GIANTS_KNIFE, (StartingBiggoronSword.Is(STARTINGBGS_GIANTS_KNIFE)) ? 1 : 0);
+    //   AddItemToInventory(RG_BIGGORON_SWORD, (StartingBiggoronSword.Is(STARTINGBGS_BIGGORON_SWORD)) ? 1 : 0);
+    // }
+    AddItemToInventory(RG_MASTER_SWORD, ctx->GetOption(RSK_STARTING_MASTER_SWORD) ? 1 : 0);
+    AddItemToInventory(RG_DEKU_SHIELD, ctx->GetOption(RSK_STARTING_DEKU_SHIELD) ? 1 : 0);
+    // AddItemToInventory(RG_HYLIAN_SHIELD,             StartingHylianShield.Value<uint8_t>());
+    // AddItemToInventory(RG_MIRROR_SHIELD,             StartingMirrorShield.Value<uint8_t>());
+    // AddItemToInventory(RG_GORON_TUNIC,               StartingGoronTunic.Value<uint8_t>());
+    // AddItemToInventory(RG_ZORA_TUNIC,                StartingZoraTunic.Value<uint8_t>());
+    // AddItemToInventory(RG_PROGRESSIVE_MAGIC_METER,   StartingMagicMeter.Value<uint8_t>());
+    // AddItemToInventory(RG_PROGRESSIVE_STRENGTH,      StartingStrength.Value<uint8_t>());
+    // AddItemToInventory(RG_PROGRESSIVE_SCALE,         StartingScale.Value<uint8_t>());
+    // AddItemToInventory(RG_PROGRESSIVE_WALLET,        StartingWallet.Value<uint8_t>());
+    // AddItemToInventory(RG_STONE_OF_AGONY,            StartingShardOfAgony.Value<uint8_t>());
+    // AddItemToInventory(RG_DOUBLE_DEFENSE,            StartingDoubleDefense.Value<uint8_t>());
+    // AddItemToInventory(RG_KOKIRI_EMERALD,            StartingKokiriEmerald.Value<uint8_t>());
+    // AddItemToInventory(RG_GORON_RUBY,                StartingGoronRuby.Value<uint8_t>());
+    // AddItemToInventory(RG_ZORA_SAPPHIRE,             StartingZoraSapphire.Value<uint8_t>());
+    // AddItemToInventory(RG_FOREST_MEDALLION,          StartingForestMedallion.Value<uint8_t>());
+    // AddItemToInventory(RG_FIRE_MEDALLION,            StartingFireMedallion.Value<uint8_t>());
+    // AddItemToInventory(RG_WATER_MEDALLION,           StartingWaterMedallion.Value<uint8_t>());
+    // AddItemToInventory(RG_SPIRIT_MEDALLION,          StartingSpiritMedallion.Value<uint8_t>());
+    // AddItemToInventory(RG_SHADOW_MEDALLION,          StartingShadowMedallion.Value<uint8_t>());
+    // AddItemToInventory(RG_LIGHT_MEDALLION,           StartingLightMedallion.Value<uint8_t>());
+    AddItemToInventory(RG_GOLD_SKULLTULA_TOKEN, ctx->GetOption(RSK_STARTING_SKULLTULA_TOKEN).Get());
+
+    int8_t hearts = ctx->GetOption(RSK_STARTING_HEARTS).Get() - 2;
+    AdditionalHeartContainers = 0;
+    if (hearts < 0) {
+        AddItemToInventory(RG_PIECE_OF_HEART, 4);
+        // Plentiful and minimal have less than 4 standard pieces of heart so also replace the winner heart
+        if (ctx->GetOption(RSK_ITEM_POOL).Get() == 0 || ctx->GetOption(RSK_ITEM_POOL).Get() == 3) {
+            AddItemToInventory(RG_TREASURE_GAME_HEART);
+        }
+
+        AdditionalHeartContainers = 1 - hearts;
+    } else if (hearts > 0) {
+        // 16 containers in plentiful, 8 in balanced and 0 in the others
+        uint8_t maxContainers = 8 * std::max(0, 2 - ctx->GetOption(RSK_ITEM_POOL).Get());
+
+        if (hearts <= maxContainers) {
+            AddItemToInventory(RG_HEART_CONTAINER, hearts);
+        } else {
+            AddItemToInventory(RG_HEART_CONTAINER, maxContainers);
+            AddItemToInventory(RG_PIECE_OF_HEART, (hearts - maxContainers) * 4);
+        }
+
+        if (hearts == 17) {
+            AddItemToInventory(RG_TREASURE_GAME_HEART);
+        }
     }
-  }
 }
 
 bool StartingInventoryHasBottle() {
-  RandomizerGet bottle = RG_EMPTY_BOTTLE;
-  return ElementInContainer(bottle, StartingInventory);
+    RandomizerGet bottle = RG_EMPTY_BOTTLE;
+    return ElementInContainer(bottle, StartingInventory);
 }
 
 void ApplyStartingInventory() {
     for (RandomizerGet item : StartingInventory) {
-    if (item == RG_PIECE_OF_HEART || item == RG_HEART_CONTAINER || item == RG_TREASURE_GAME_HEART)
-      continue;
+        if (item == RG_PIECE_OF_HEART || item == RG_HEART_CONTAINER || item == RG_TREASURE_GAME_HEART)
+            continue;
 
-    Rando::StaticData::RetrieveItem(item).ApplyEffect();
-  }
+        Rando::StaticData::RetrieveItem(item).ApplyEffect();
+    }
 }
diff --git a/soh/soh/Enhancements/randomizer/3drando/text.hpp b/soh/soh/Enhancements/randomizer/3drando/text.hpp
index 46c0196bbb..6e53ac11b5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/text.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/text.hpp
@@ -7,22 +7,18 @@
 #define SINGULAR 1
 
 class Text {
-public:
+  public:
     Text() = default;
-    Text(std::string english_, std::string french_, std::string spanish_)
-      : english(std::move(english_)),
-        french(std::move(french_)),
-        spanish(std::move(spanish_)),
-        german(std::move("")) {
-            // german defaults to english text until a translation is provided.
-            german = english;
-        }
-    Text(std::string english_, std::string french_, std::string spanish_, std::string german_)
-      : english(std::move(english_)),
-        french(std::move(french_)),
-        spanish(std::move(spanish_)),
-        german(std::move(german_)) {}
-    Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
+    Text(std::string english_, std::string french_, std::string german_)
+        : english(std::move(english_)), french(std::move(french_)), german(std::move(german_)), spanish(std::move("")) {
+        // spanish defaults to english text until a translation is provided.
+        spanish = english;
+    }
+    Text(std::string english_, std::string french_, std::string german_, std::string spanish_)
+        : english(std::move(english_)), french(std::move(french_)), german(std::move(german_)), spanish(std::move("")) {
+    }
+    Text(std::string english_)
+        : english(std::move(english_)), french(std::move("")), german(std::move("")), spanish(std::move("")) {
         // default unprovided languages to english text
         french = spanish = german = english;
     }
@@ -38,6 +34,12 @@ public:
         return english;
     }
 
+    const std::string& GetGerman() const {
+        if (german.length() > 0) {
+            return german;
+        }
+        return english;
+    }
     const std::string& GetSpanish() const {
         if (spanish.length() > 0) {
             return spanish;
@@ -45,33 +47,35 @@ public:
         return english;
     }
 
-    const std::string& GetGerman() const {
-        if (german.length() > 0) {
-            return german;
-        }
-        return english;
-    }
-
     const std::string& GetForLanguage(uint8_t language) const {
         switch (language) {
-            case 0: //LANGUAGE_ENG: changed to resolve #include loops
+            case 0: // LANGUAGE_ENG: changed to resolve #include loops
                 return GetEnglish();
-            case 2: //LANGUAGE_FRA:
+            case 2: // LANGUAGE_FRA:
                 return GetFrench();
-            case 1: //LANGUAGE_GER:
+            case 1: // LANGUAGE_GER:
                 return GetGerman();
             default:
                 return GetEnglish();
         }
     }
 
-    Text operator+ (const Text& right) const {
-        return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
-            german + right.GetGerman()};
+    Text operator+(const Text& right) const {
+        return Text{
+            english + right.GetEnglish(),
+            french + right.GetFrench(),
+            german + right.GetGerman(),
+            spanish + right.GetSpanish(),
+        };
     }
 
-    Text operator+ (const std::string& right) const {
-        return Text{english + right, french + right, spanish + right, german + right};
+    Text operator+(const std::string& right) const {
+        return Text{
+            english + right,
+            french + right,
+            german + right,
+            spanish + right,
+        };
     }
 
     bool operator==(const Text& right) const {
@@ -79,7 +83,7 @@ public:
     }
 
     bool operator==(const std::string& right) const {
-        return english == right || french == right || spanish == right || german == right;
+        return english == right || french == right || german == right || spanish == right;
     }
 
     bool operator!=(const Text& right) const {
@@ -88,11 +92,11 @@ public:
 
     void Replace(std::string oldStr, std::string newStr) {
 
-        for (std::string* str : {&english, &french, &spanish, &german}) {
+        for (std::string* str : { &english, &french, &german, &spanish }) {
             size_t position = str->find(oldStr);
             while (position != std::string::npos) {
-              str->replace(position, oldStr.length(), newStr);
-              position = str->find(oldStr);
+                str->replace(position, oldStr.length(), newStr);
+                position = str->find(oldStr);
             }
         }
     }
@@ -108,30 +112,30 @@ public:
             french.replace(position, oldStr.length(), newText.GetFrench());
             position = french.find(oldStr);
         }
-        position = spanish.find(oldStr);
-        while (position != std::string::npos) {
-            spanish.replace(position, oldStr.length(), newText.GetSpanish());
-            position = spanish.find(oldStr);
-        }
         position = german.find(oldStr);
         while (position != std::string::npos) {
             german.replace(position, oldStr.length(), newText.GetGerman());
             position = german.find(oldStr);
         }
+        position = spanish.find(oldStr);
+        while (position != std::string::npos) {
+            spanish.replace(position, oldStr.length(), newText.GetSpanish());
+            position = spanish.find(oldStr);
+        }
     }
 
     // Convert first char to upper case
     Text Capitalize(void) const {
         Text cap = *this + "";
-        for (std::string* str : {&cap.english, &cap.french, &cap.spanish, &cap.german}) {
+        for (std::string* str : { &cap.english, &cap.french, &cap.german, &cap.spanish }) {
             (*str)[0] = std::toupper((*str)[0]);
         }
         return cap;
     }
 
-    //find the appropriate bars that separate singular from plural
+    // find the appropriate bars that separate singular from plural
     void SetForm(int form) {
-        for (std::string* str : {&english, &french, &spanish, &german}) {
+        for (std::string* str : { &english, &french, &german, &spanish }) {
 
             size_t firstBar = str->find('|');
             if (firstBar != std::string::npos) {
@@ -151,12 +155,12 @@ public:
                 }
             }
         }
-        //remove the remaining bar
+        // remove the remaining bar
         this->Replace("|", "");
     }
 
     std::string english = "";
     std::string french = "";
-    std::string spanish = "";
     std::string german = "";
+    std::string spanish = "";
 };
diff --git a/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp b/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp
new file mode 100644
index 0000000000..6c1db52f7b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp
@@ -0,0 +1,45 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ResourceManagerHelpers.h"
+#include "soh/ShipInit.hpp"
+#include "z64save.h"
+#include "objects/object_gi_compass/object_gi_compass.h"
+#include "objects/object_gi_map/object_gi_map.h"
+
+extern "C" {
+extern SaveContext gSaveContext;
+#include "variables.h"
+#include "macros.h"
+u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
+}
+
+#define CVAR_COLORED_MAPS_AND_COMPASSES_NAME CVAR_RANDOMIZER_ENHANCEMENT("ColoredMapsAndCompasses")
+#define CVAR_COLORED_MAPS_AND_COMPASSES_DEFAULT 1
+#define CVAR_COLORED_MAPS_AND_COMPASSES_VALUE \
+    CVarGetInteger(CVAR_COLORED_MAPS_AND_COMPASSES_NAME, CVAR_COLORED_MAPS_AND_COMPASSES_DEFAULT)
+
+void OnLoadFileColoredMapsAndCompasses(int32_t _) {
+    s8 mapsAndCompassesCanBeOutsideDungeon =
+        IS_RANDO && DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
+    s8 isColoredMapsAndCompassesEnabled = mapsAndCompassesCanBeOutsideDungeon && CVAR_COLORED_MAPS_AND_COMPASSES_VALUE;
+    if (isColoredMapsAndCompassesEnabled) {
+        ResourceMgr_PatchGfxByName(gGiDungeonMapDL, "Map_PrimColor", 5, gsDPNoOp());
+        ResourceMgr_PatchGfxByName(gGiDungeonMapDL, "Map_EnvColor", 6, gsDPNoOp());
+        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_PrimColor", 5, gsDPNoOp());
+        ResourceMgr_PatchGfxByName(gGiCompassDL, "Compass_EnvColor", 6, gsDPNoOp());
+    } else {
+        ResourceMgr_UnpatchGfxByName(gGiDungeonMapDL, "Map_PrimColor");
+        ResourceMgr_UnpatchGfxByName(gGiDungeonMapDL, "Map_EnvColor");
+        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_PrimColor");
+        ResourceMgr_UnpatchGfxByName(gGiCompassDL, "Compass_EnvColor");
+    }
+}
+
+void RegisterColoredMapsAndCompasses() {
+    COND_HOOK(OnLoadFile, CVAR_COLORED_MAPS_AND_COMPASSES_VALUE, OnLoadFileColoredMapsAndCompasses)
+
+    // Also need to call it directly to patch/unpatch on cvar change
+    OnLoadFileColoredMapsAndCompasses(0);
+}
+
+static RegisterShipInitFunc initFunc(RegisterColoredMapsAndCompasses, { CVAR_COLORED_MAPS_AND_COMPASSES_NAME });
diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
index 33e264bd4c..04e0e4ea55 100644
--- a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
+++ b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
@@ -9,10 +9,9 @@ extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 }
 
-#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
-
 using SceneDoorParamsPair = std::pair<int, int>;
 std::map<SceneDoorParamsPair, RandomizerInf> lookupTable = {
+    // clang-format off
     {{ SCENE_MARKET_ENTRANCE_DAY, 447 },         RAND_INF_GUARD_HOUSE_UNLOCKED },
     {{ SCENE_MARKET_ENTRANCE_NIGHT, 447 },       RAND_INF_GUARD_HOUSE_UNLOCKED },
     {{ SCENE_MARKET_ENTRANCE_RUINS, 447 },       RAND_INF_GUARD_HOUSE_UNLOCKED },
@@ -61,13 +60,15 @@ std::map<SceneDoorParamsPair, RandomizerInf> lookupTable = {
     {{ SCENE_LON_LON_RANCH, 447 },               RAND_INF_BACK_TOWER_UNLOCKED },
     {{ SCENE_LAKE_HYLIA, 447 },                  RAND_INF_HYLIA_LAB_UNLOCKED },
     {{ SCENE_LAKE_HYLIA, 1471 },                 RAND_INF_FISHING_HOLE_UNLOCKED },
+
+    // clang-format on
 };
 
 static void OnDoorInit(void* actorRef) {
     EnDoor* enDoor = static_cast<EnDoor*>(actorRef);
     enDoor->randomizerInf = RAND_INF_MAX;
 
-    auto it = lookupTable.find({gPlayState->sceneNum, enDoor->actor.params});
+    auto it = lookupTable.find({ gPlayState->sceneNum, enDoor->actor.params });
     if (it != lookupTable.end()) {
         enDoor->randomizerInf = it->second;
         if (!Flags_GetRandomizerInf(enDoor->randomizerInf)) {
@@ -90,7 +91,8 @@ void RegisterLockOverworldDoors() {
     COND_VB_SHOULD(VB_CONSUME_SMALL_KEY, shouldRegister, {
         EnDoor* enDoor = va_arg(args, EnDoor*);
 
-        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED && enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
+        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED &&
+            enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
             Flags_SetRandomizerInf(enDoor->randomizerInf);
             *should = false;
         }
@@ -99,7 +101,8 @@ void RegisterLockOverworldDoors() {
     COND_VB_SHOULD(VB_NOT_HAVE_SMALL_KEY, shouldRegister, {
         EnDoor* enDoor = va_arg(args, EnDoor*);
 
-        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED && enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
+        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED &&
+            enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
             *should = !Flags_GetRandomizerInf((RandomizerInf)(enDoor->randomizerInf + 1));
         }
     });
@@ -107,21 +110,20 @@ void RegisterLockOverworldDoors() {
     COND_VB_SHOULD(VB_DOOR_BE_LOCKED, shouldRegister, {
         EnDoor* enDoor = va_arg(args, EnDoor*);
 
-        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED && enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
+        if (enDoor->randomizerInf >= RAND_INF_GUARD_HOUSE_UNLOCKED &&
+            enDoor->randomizerInf <= RAND_INF_FISHING_HOLE_KEY_OBTAINED) {
             *should = !Flags_GetRandomizerInf(enDoor->randomizerInf);
         }
     });
 
-    // The door actor uses the same param to indicate if a door should be locked or be a scene transition, so it cannot be both. Here we're 
-    // overriding the check for scene transition to also check if the door is being unlocked and should be a scene transition.
+    // The door actor uses the same param to indicate if a door should be locked or be a scene transition, so it cannot
+    // be both. Here we're overriding the check for scene transition to also check if the door is being unlocked and
+    // should be a scene transition.
     COND_VB_SHOULD(VB_DOOR_PLAY_SCENE_TRANSITION, shouldRegister, {
         EnDoor* enDoor = va_arg(args, EnDoor*);
 
-        if (!*should && (
-            enDoor->actor.id == ACTOR_EN_DOOR &&
-            ((enDoor->actor.params >> 7) & 7) == 1 &&
-            enDoor->randomizerInf != RAND_INF_MAX
-        )) {
+        if (!*should && (enDoor->actor.id == ACTOR_EN_DOOR && ((enDoor->actor.params >> 7) & 7) == 1 &&
+                         enDoor->randomizerInf != RAND_INF_MAX)) {
             *should = true;
         }
     });
diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.cpp b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
index e6c9399b5e..4e03e8b8f2 100644
--- a/soh/soh/Enhancements/randomizer/Plandomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
@@ -1,4 +1,5 @@
 #include "Plandomizer.h"
+#include <soh/SohGui/SohGui.hpp>
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/util.h"
 #include <vector>
@@ -17,10 +18,10 @@
 #include "soh/Enhancements/randomizer/3drando/shops.hpp"
 
 extern "C" {
-    #include "include/z64item.h"
-    #include "objects/gameplay_keep/gameplay_keep.h"
-    extern SaveContext gSaveContext;
-    extern PlayState* gPlayState;
+#include "include/z64item.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
 }
 
 const std::string randomizeButton = ICON_FA_RANDOM;
@@ -33,14 +34,14 @@ std::string shortName = "";
 std::string logTemp = "";
 std::string lastLoadedSpoiler = "";
 int32_t temporaryItemIndex = -1;
-RandomizerCheckArea selectedArea = RCAREA_INVALID; 
+RandomizerCheckArea selectedArea = RCAREA_INVALID;
 
-ImVec4 itemColor = ImVec4( 1.0f, 1.0f, 1.0f, 1.0f );
+ImVec4 itemColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
 ImTextureID textureID;
 ImVec2 imageSize = ImVec2(32.0f, 32.0f);
 float imagePadding = 2.0f;
-ImVec2 textureUV0 = ImVec2( 0, 0 );
-ImVec2 textureUV1 = ImVec2( 1, 1 );
+ImVec2 textureUV0 = ImVec2(0, 0);
+ImVec2 textureUV1 = ImVec2(1, 1);
 
 bool shouldPopup = false;
 bool shouldTrapPopup = false;
@@ -61,208 +62,196 @@ std::vector<SpoilerHintObject> plandoHintData;
 extern std::map<RandomizerCheckArea, std::string> rcAreaNames;
 
 std::unordered_map<RandomizerGet, std::string> bossKeyShortNames = {
-    { RG_FOREST_TEMPLE_BOSS_KEY,     "Frst" },
-    { RG_FIRE_TEMPLE_BOSS_KEY,       "Fire" },
-    { RG_WATER_TEMPLE_BOSS_KEY,      "Watr" },
-    { RG_SPIRIT_TEMPLE_BOSS_KEY,     "Sprt" },
-    { RG_SHADOW_TEMPLE_BOSS_KEY,     "Shdw" },
-    { RG_GANONS_CASTLE_BOSS_KEY,     "Ganon" },
+    { RG_FOREST_TEMPLE_BOSS_KEY, "Frst" }, { RG_FIRE_TEMPLE_BOSS_KEY, "Fire" },
+    { RG_WATER_TEMPLE_BOSS_KEY, "Watr" },  { RG_SPIRIT_TEMPLE_BOSS_KEY, "Sprt" },
+    { RG_SHADOW_TEMPLE_BOSS_KEY, "Shdw" }, { RG_GANONS_CASTLE_BOSS_KEY, "Ganon" },
 };
 
 std::unordered_map<RandomizerGet, std::string> ocarinaButtonNames = {
-    { RG_OCARINA_A_BUTTON,          "A" },
-    { RG_OCARINA_C_UP_BUTTON,       "C-UP" },
-    { RG_OCARINA_C_DOWN_BUTTON,     "C-DWN" },
-    { RG_OCARINA_C_LEFT_BUTTON,     "C-LFT" },
-    { RG_OCARINA_C_RIGHT_BUTTON,    "C-RHT" },
+    { RG_OCARINA_A_BUTTON, "A" },           { RG_OCARINA_C_UP_BUTTON, "C-UP" },
+    { RG_OCARINA_C_DOWN_BUTTON, "C-DWN" },  { RG_OCARINA_C_LEFT_BUTTON, "C-LFT" },
+    { RG_OCARINA_C_RIGHT_BUTTON, "C-RHT" },
 };
 
 std::map<RandomizerGet, ImVec4> bossSoulColorMapping = {
-    { RG_GOHMA_SOUL,          { 0.00f, 1.00f, 0.00f, 1.0f } },
-    { RG_KING_DODONGO_SOUL,   { 1.00f, 0.00f, 0.39f, 1.0f } },
-    { RG_BARINADE_SOUL,       { 0.20f, 1.00f, 1.00f, 1.0f } },
-    { RG_PHANTOM_GANON_SOUL,  { 0.02f, 0.76f, 0.18f, 1.0f } },
-    { RG_VOLVAGIA_SOUL,       { 0.93f, 0.37f, 0.37f, 1.0f } },
-    { RG_MORPHA_SOUL,         { 0.33f, 0.71f, 0.87f, 1.0f } },
-    { RG_BONGO_BONGO_SOUL,    { 0.49f, 0.06f, 0.69f, 1.0f } },
-    { RG_TWINROVA_SOUL,       { 0.87f, 0.62f, 0.18f, 1.0f } },
-    { RG_GANON_SOUL,          { 0.31f, 0.31f, 0.31f, 1.0f } }
+    { RG_GOHMA_SOUL, { 0.00f, 1.00f, 0.00f, 1.0f } },       { RG_KING_DODONGO_SOUL, { 1.00f, 0.00f, 0.39f, 1.0f } },
+    { RG_BARINADE_SOUL, { 0.20f, 1.00f, 1.00f, 1.0f } },    { RG_PHANTOM_GANON_SOUL, { 0.02f, 0.76f, 0.18f, 1.0f } },
+    { RG_VOLVAGIA_SOUL, { 0.93f, 0.37f, 0.37f, 1.0f } },    { RG_MORPHA_SOUL, { 0.33f, 0.71f, 0.87f, 1.0f } },
+    { RG_BONGO_BONGO_SOUL, { 0.49f, 0.06f, 0.69f, 1.0f } }, { RG_TWINROVA_SOUL, { 0.87f, 0.62f, 0.18f, 1.0f } },
+    { RG_GANON_SOUL, { 0.31f, 0.31f, 0.31f, 1.0f } }
 };
 
-
 std::vector<RandomizerGet> infiniteItemList = {
-    RG_GREEN_RUPEE, RG_BLUE_RUPEE, RG_RED_RUPEE, RG_PURPLE_RUPEE, RG_HUGE_RUPEE,
-    RG_ARROWS_5, RG_ARROWS_10, RG_ARROWS_30,
-    RG_DEKU_STICK_1, RG_DEKU_SEEDS_30, RG_DEKU_NUTS_5, RG_DEKU_NUTS_10,
-    RG_BOMBS_5, RG_BOMBS_10, RG_BOMBS_20, RG_BOMBCHU_5, RG_BOMBCHU_10, RG_BOMBCHU_20,
-    RG_RECOVERY_HEART, RG_ICE_TRAP, RG_SOLD_OUT
+    RG_GREEN_RUPEE, RG_BLUE_RUPEE,   RG_RED_RUPEE,     RG_PURPLE_RUPEE, RG_HUGE_RUPEE,     RG_ARROWS_5, RG_ARROWS_10,
+    RG_ARROWS_30,   RG_DEKU_STICK_1, RG_DEKU_SEEDS_30, RG_DEKU_NUTS_5,  RG_DEKU_NUTS_10,   RG_BOMBS_5,  RG_BOMBS_10,
+    RG_BOMBS_20,    RG_BOMBCHU_5,    RG_BOMBCHU_10,    RG_BOMBCHU_20,   RG_RECOVERY_HEART, RG_ICE_TRAP, RG_SOLD_OUT
 };
 
 std::unordered_map<RandomizerGet, std::string> itemImageMap = {
-    { RG_NONE,                      		"ITEM_SOLD_OUT" },
-    { RG_KOKIRI_SWORD,              		"ITEM_SWORD_KOKIRI" },
-    { RG_GIANTS_KNIFE,              		"ITEM_SWORD_KNIFE" },
-    { RG_BIGGORON_SWORD,            		"ITEM_SWORD_BGS" },
-    { RG_DEKU_SHIELD,               		"ITEM_SHIELD_DEKU" },
-    { RG_HYLIAN_SHIELD,             		"ITEM_SHIELD_HYLIAN" },
-    { RG_MIRROR_SHIELD,             		"ITEM_SHIELD_MIRROR" },
-    { RG_GORON_TUNIC,               		"ITEM_TUNIC_GORON" },
-    { RG_ZORA_TUNIC,                		"ITEM_TUNIC_ZORA" },
-    { RG_IRON_BOOTS,                		"ITEM_BOOTS_IRON" },
-    { RG_HOVER_BOOTS,               		"ITEM_BOOTS_HOVER" },
-    { RG_BOOMERANG,                 		"ITEM_BOOMERANG" },
-    { RG_LENS_OF_TRUTH,             		"ITEM_LENS" },
-    { RG_MEGATON_HAMMER,            		"ITEM_HAMMER" },
-    { RG_STONE_OF_AGONY,            		"ITEM_STONE_OF_AGONY" },
-    { RG_DINS_FIRE,                 		"ITEM_DINS_FIRE" },
-    { RG_FARORES_WIND,              		"ITEM_FARORES_WIND" },
-    { RG_NAYRUS_LOVE,               		"ITEM_NAYRUS_LOVE" },
-    { RG_FIRE_ARROWS,               		"ITEM_ARROW_FIRE" },
-    { RG_ICE_ARROWS,                		"ITEM_ARROW_ICE" },
-    { RG_LIGHT_ARROWS,              		"ITEM_ARROW_LIGHT" },
-    { RG_GERUDO_MEMBERSHIP_CARD,    		"ITEM_GERUDO_CARD" },
-    { RG_MAGIC_BEAN,                		"ITEM_BEAN" },
-    { RG_MAGIC_BEAN_PACK,           		"ITEM_BEAN" },
-    { RG_DOUBLE_DEFENSE,            		"ITEM_HEART_CONTAINER" },
-    { RG_WEIRD_EGG,                 		"ITEM_WEIRD_EGG" },
-    { RG_ZELDAS_LETTER,             		"ITEM_LETTER_ZELDA" },
-    { RG_POCKET_EGG,                		"ITEM_POCKET_EGG" },
-    { RG_COJIRO,                    		"ITEM_COJIRO" },
-    { RG_ODD_MUSHROOM,              		"ITEM_ODD_MUSHROOM" },
-    { RG_ODD_POTION,                		"ITEM_ODD_POTION" },
-    { RG_POACHERS_SAW,              		"ITEM_SAW" },
-    { RG_BROKEN_SWORD,              		"ITEM_SWORD_BROKEN" },
-    { RG_PRESCRIPTION,              		"ITEM_PRESCRIPTION" },
-    { RG_EYEBALL_FROG,              		"ITEM_FROG" },
-    { RG_EYEDROPS,                  		"ITEM_EYEDROPS" },
-    { RG_CLAIM_CHECK,               		"ITEM_CLAIM_CHECK" },
-    { RG_GOLD_SKULLTULA_TOKEN,      		"ITEM_SKULL_TOKEN" },
-    { RG_PROGRESSIVE_HOOKSHOT,      		"ITEM_HOOKSHOT" },
-    { RG_PROGRESSIVE_STRENGTH,      		"ITEM_BRACELET" },
-    { RG_PROGRESSIVE_BOMB_BAG,      		"ITEM_BOMB_BAG_30" },
-    { RG_PROGRESSIVE_BOW,           		"ITEM_QUIVER_30" },
-    { RG_PROGRESSIVE_SLINGSHOT,     		"ITEM_SLINGSHOT" },
-    { RG_PROGRESSIVE_WALLET,        		"ITEM_WALLET_ADULT" },
-    { RG_PROGRESSIVE_SCALE,         		"ITEM_SCALE_SILVER" },
-    { RG_PROGRESSIVE_NUT_UPGRADE,   		"ITEM_NUT" },
-    { RG_PROGRESSIVE_STICK_UPGRADE, 		"ITEM_STICK" },
-    { RG_PROGRESSIVE_BOMBCHUS,      		"ITEM_BOMBCHU" },
-    { RG_PROGRESSIVE_MAGIC_METER,   		"ITEM_MAGIC_SMALL" },
-    { RG_MAGIC_SINGLE,              		"ITEM_MAGIC_SMALL" },
-    { RG_MAGIC_DOUBLE,              		"ITEM_MAGIC_LARGE" },
-    { RG_PROGRESSIVE_OCARINA,       		"ITEM_OCARINA_FAIRY" },
-    { RG_PROGRESSIVE_GORONSWORD,    		"ITEM_SWORD_BGS" },
-    { RG_EMPTY_BOTTLE,              		"ITEM_BOTTLE" },
-    { RG_BOTTLE_WITH_MILK,          		"ITEM_MILK_BOTTLE" },
-    { RG_BOTTLE_WITH_RED_POTION,    		"ITEM_POTION_RED" },
-    { RG_BOTTLE_WITH_GREEN_POTION,  		"ITEM_POTION_GREEN" },
-    { RG_BOTTLE_WITH_BLUE_POTION,   		"ITEM_POTION_BLUE" },
-    { RG_BOTTLE_WITH_FAIRY,         		"ITEM_FAIRY" },
-    { RG_BOTTLE_WITH_FISH,          		"ITEM_FISH" },
-    { RG_BOTTLE_WITH_BLUE_FIRE,     		"ITEM_BLUE_FIRE" },
-    { RG_BOTTLE_WITH_BUGS,          		"ITEM_BUG" },
-    { RG_BOTTLE_WITH_POE,           		"ITEM_POE" },
-    { RG_RUTOS_LETTER,              		"ITEM_LETTER_RUTO" },
-    { RG_BOTTLE_WITH_BIG_POE,       		"ITEM_BIG_POE" },
-    { RG_ZELDAS_LULLABY,            		"ITEM_SONG_LULLABY" },
-    { RG_EPONAS_SONG,               		"ITEM_SONG_EPONA" },
-    { RG_SARIAS_SONG,               		"ITEM_SONG_SARIA" },
-    { RG_SUNS_SONG,                 		"ITEM_SONG_SUN" },
-    { RG_SONG_OF_TIME,              		"ITEM_SONG_TIME" },
-    { RG_SONG_OF_STORMS,            		"ITEM_SONG_STORMS" },
-    { RG_MINUET_OF_FOREST,          		"ITEM_SONG_MINUET" },
-    { RG_BOLERO_OF_FIRE,            		"ITEM_SONG_BOLERO" },
-    { RG_SERENADE_OF_WATER,         		"ITEM_SONG_SERENADE" },
-    { RG_REQUIEM_OF_SPIRIT,         		"ITEM_SONG_REQUIEM" },
-    { RG_NOCTURNE_OF_SHADOW,        		"ITEM_SONG_NOCTURNE" },
-    { RG_PRELUDE_OF_LIGHT,          		"ITEM_SONG_PRELUDE" },
-    { RG_DEKU_TREE_MAP,             		"ITEM_DUNGEON_MAP" },
-    { RG_DODONGOS_CAVERN_MAP,       		"ITEM_DUNGEON_MAP" },
-    { RG_JABU_JABUS_BELLY_MAP,      		"ITEM_DUNGEON_MAP" },
-    { RG_FOREST_TEMPLE_MAP,         		"ITEM_DUNGEON_MAP" },
-    { RG_FIRE_TEMPLE_MAP,           		"ITEM_DUNGEON_MAP" },
-    { RG_WATER_TEMPLE_MAP,          		"ITEM_DUNGEON_MAP" },
-    { RG_SPIRIT_TEMPLE_MAP,         		"ITEM_DUNGEON_MAP" },
-    { RG_SHADOW_TEMPLE_MAP,         		"ITEM_DUNGEON_MAP" },
-    { RG_BOTTOM_OF_THE_WELL_MAP,    		"ITEM_DUNGEON_MAP" },
-    { RG_ICE_CAVERN_MAP,            		"ITEM_DUNGEON_MAP" },
-    { RG_DEKU_TREE_COMPASS,         		"ITEM_COMPASS" },
-    { RG_DODONGOS_CAVERN_COMPASS,   		"ITEM_COMPASS" },
-    { RG_JABU_JABUS_BELLY_COMPASS,  		"ITEM_COMPASS" },
-    { RG_FOREST_TEMPLE_COMPASS,     		"ITEM_COMPASS" },
-    { RG_FIRE_TEMPLE_COMPASS,       		"ITEM_COMPASS" },
-    { RG_WATER_TEMPLE_COMPASS,      		"ITEM_COMPASS" },
-    { RG_SPIRIT_TEMPLE_COMPASS,     		"ITEM_COMPASS" },
-    { RG_SHADOW_TEMPLE_COMPASS,     		"ITEM_COMPASS" },
-    { RG_BOTTOM_OF_THE_WELL_COMPASS,		"ITEM_COMPASS" },
-    { RG_ICE_CAVERN_COMPASS,        		"ITEM_COMPASS" },
-    { RG_FOREST_TEMPLE_BOSS_KEY,    		"ITEM_KEY_BOSS" },
-    { RG_FIRE_TEMPLE_BOSS_KEY,      		"ITEM_KEY_BOSS" },
-    { RG_WATER_TEMPLE_BOSS_KEY,     		"ITEM_KEY_BOSS" },
-    { RG_SPIRIT_TEMPLE_BOSS_KEY,    		"ITEM_KEY_BOSS" },
-    { RG_SHADOW_TEMPLE_BOSS_KEY,    		"ITEM_KEY_BOSS" },
-    { RG_GANONS_CASTLE_BOSS_KEY,    		"ITEM_KEY_BOSS" },
-    { RG_FOREST_TEMPLE_SMALL_KEY,   		"ITEM_KEY_SMALL" },
-    { RG_FIRE_TEMPLE_SMALL_KEY,     		"ITEM_KEY_SMALL" },
-    { RG_WATER_TEMPLE_SMALL_KEY,    		"ITEM_KEY_SMALL" },
-    { RG_SPIRIT_TEMPLE_SMALL_KEY,   		"ITEM_KEY_SMALL" },
-    { RG_SHADOW_TEMPLE_SMALL_KEY,   		"ITEM_KEY_SMALL" },
-    { RG_BOTTOM_OF_THE_WELL_SMALL_KEY, 		"ITEM_KEY_SMALL" },
+    { RG_NONE, "ITEM_SOLD_OUT" },
+    { RG_KOKIRI_SWORD, "ITEM_SWORD_KOKIRI" },
+    { RG_GIANTS_KNIFE, "ITEM_SWORD_KNIFE" },
+    { RG_BIGGORON_SWORD, "ITEM_SWORD_BGS" },
+    { RG_DEKU_SHIELD, "ITEM_SHIELD_DEKU" },
+    { RG_HYLIAN_SHIELD, "ITEM_SHIELD_HYLIAN" },
+    { RG_MIRROR_SHIELD, "ITEM_SHIELD_MIRROR" },
+    { RG_GORON_TUNIC, "ITEM_TUNIC_GORON" },
+    { RG_ZORA_TUNIC, "ITEM_TUNIC_ZORA" },
+    { RG_IRON_BOOTS, "ITEM_BOOTS_IRON" },
+    { RG_HOVER_BOOTS, "ITEM_BOOTS_HOVER" },
+    { RG_BOOMERANG, "ITEM_BOOMERANG" },
+    { RG_LENS_OF_TRUTH, "ITEM_LENS" },
+    { RG_MEGATON_HAMMER, "ITEM_HAMMER" },
+    { RG_STONE_OF_AGONY, "ITEM_STONE_OF_AGONY" },
+    { RG_DINS_FIRE, "ITEM_DINS_FIRE" },
+    { RG_FARORES_WIND, "ITEM_FARORES_WIND" },
+    { RG_NAYRUS_LOVE, "ITEM_NAYRUS_LOVE" },
+    { RG_FIRE_ARROWS, "ITEM_ARROW_FIRE" },
+    { RG_ICE_ARROWS, "ITEM_ARROW_ICE" },
+    { RG_LIGHT_ARROWS, "ITEM_ARROW_LIGHT" },
+    { RG_GERUDO_MEMBERSHIP_CARD, "ITEM_GERUDO_CARD" },
+    { RG_MAGIC_BEAN, "ITEM_BEAN" },
+    { RG_MAGIC_BEAN_PACK, "ITEM_BEAN" },
+    { RG_DOUBLE_DEFENSE, "ITEM_HEART_CONTAINER" },
+    { RG_WEIRD_EGG, "ITEM_WEIRD_EGG" },
+    { RG_ZELDAS_LETTER, "ITEM_LETTER_ZELDA" },
+    { RG_POCKET_EGG, "ITEM_POCKET_EGG" },
+    { RG_COJIRO, "ITEM_COJIRO" },
+    { RG_ODD_MUSHROOM, "ITEM_ODD_MUSHROOM" },
+    { RG_ODD_POTION, "ITEM_ODD_POTION" },
+    { RG_POACHERS_SAW, "ITEM_SAW" },
+    { RG_BROKEN_SWORD, "ITEM_SWORD_BROKEN" },
+    { RG_PRESCRIPTION, "ITEM_PRESCRIPTION" },
+    { RG_EYEBALL_FROG, "ITEM_FROG" },
+    { RG_EYEDROPS, "ITEM_EYEDROPS" },
+    { RG_CLAIM_CHECK, "ITEM_CLAIM_CHECK" },
+    { RG_GOLD_SKULLTULA_TOKEN, "ITEM_SKULL_TOKEN" },
+    { RG_PROGRESSIVE_HOOKSHOT, "ITEM_HOOKSHOT" },
+    { RG_PROGRESSIVE_STRENGTH, "ITEM_BRACELET" },
+    { RG_PROGRESSIVE_BOMB_BAG, "ITEM_BOMB_BAG_30" },
+    { RG_PROGRESSIVE_BOW, "ITEM_QUIVER_30" },
+    { RG_PROGRESSIVE_SLINGSHOT, "ITEM_SLINGSHOT" },
+    { RG_PROGRESSIVE_WALLET, "ITEM_WALLET_ADULT" },
+    { RG_PROGRESSIVE_SCALE, "ITEM_SCALE_SILVER" },
+    { RG_PROGRESSIVE_NUT_UPGRADE, "ITEM_NUT" },
+    { RG_PROGRESSIVE_STICK_UPGRADE, "ITEM_STICK" },
+    { RG_PROGRESSIVE_BOMBCHUS, "ITEM_BOMBCHU" },
+    { RG_PROGRESSIVE_MAGIC_METER, "ITEM_MAGIC_SMALL" },
+    { RG_MAGIC_SINGLE, "ITEM_MAGIC_SMALL" },
+    { RG_MAGIC_DOUBLE, "ITEM_MAGIC_LARGE" },
+    { RG_PROGRESSIVE_OCARINA, "ITEM_OCARINA_FAIRY" },
+    { RG_PROGRESSIVE_GORONSWORD, "ITEM_SWORD_BGS" },
+    { RG_EMPTY_BOTTLE, "ITEM_BOTTLE" },
+    { RG_BOTTLE_WITH_MILK, "ITEM_MILK_BOTTLE" },
+    { RG_BOTTLE_WITH_RED_POTION, "ITEM_POTION_RED" },
+    { RG_BOTTLE_WITH_GREEN_POTION, "ITEM_POTION_GREEN" },
+    { RG_BOTTLE_WITH_BLUE_POTION, "ITEM_POTION_BLUE" },
+    { RG_BOTTLE_WITH_FAIRY, "ITEM_FAIRY" },
+    { RG_BOTTLE_WITH_FISH, "ITEM_FISH" },
+    { RG_BOTTLE_WITH_BLUE_FIRE, "ITEM_BLUE_FIRE" },
+    { RG_BOTTLE_WITH_BUGS, "ITEM_BUG" },
+    { RG_BOTTLE_WITH_POE, "ITEM_POE" },
+    { RG_RUTOS_LETTER, "ITEM_LETTER_RUTO" },
+    { RG_BOTTLE_WITH_BIG_POE, "ITEM_BIG_POE" },
+    { RG_ZELDAS_LULLABY, "ITEM_SONG_LULLABY" },
+    { RG_EPONAS_SONG, "ITEM_SONG_EPONA" },
+    { RG_SARIAS_SONG, "ITEM_SONG_SARIA" },
+    { RG_SUNS_SONG, "ITEM_SONG_SUN" },
+    { RG_SONG_OF_TIME, "ITEM_SONG_TIME" },
+    { RG_SONG_OF_STORMS, "ITEM_SONG_STORMS" },
+    { RG_MINUET_OF_FOREST, "ITEM_SONG_MINUET" },
+    { RG_BOLERO_OF_FIRE, "ITEM_SONG_BOLERO" },
+    { RG_SERENADE_OF_WATER, "ITEM_SONG_SERENADE" },
+    { RG_REQUIEM_OF_SPIRIT, "ITEM_SONG_REQUIEM" },
+    { RG_NOCTURNE_OF_SHADOW, "ITEM_SONG_NOCTURNE" },
+    { RG_PRELUDE_OF_LIGHT, "ITEM_SONG_PRELUDE" },
+    { RG_DEKU_TREE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_DODONGOS_CAVERN_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_JABU_JABUS_BELLY_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_FOREST_TEMPLE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_FIRE_TEMPLE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_WATER_TEMPLE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_SPIRIT_TEMPLE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_SHADOW_TEMPLE_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_BOTTOM_OF_THE_WELL_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_ICE_CAVERN_MAP, "ITEM_DUNGEON_MAP" },
+    { RG_DEKU_TREE_COMPASS, "ITEM_COMPASS" },
+    { RG_DODONGOS_CAVERN_COMPASS, "ITEM_COMPASS" },
+    { RG_JABU_JABUS_BELLY_COMPASS, "ITEM_COMPASS" },
+    { RG_FOREST_TEMPLE_COMPASS, "ITEM_COMPASS" },
+    { RG_FIRE_TEMPLE_COMPASS, "ITEM_COMPASS" },
+    { RG_WATER_TEMPLE_COMPASS, "ITEM_COMPASS" },
+    { RG_SPIRIT_TEMPLE_COMPASS, "ITEM_COMPASS" },
+    { RG_SHADOW_TEMPLE_COMPASS, "ITEM_COMPASS" },
+    { RG_BOTTOM_OF_THE_WELL_COMPASS, "ITEM_COMPASS" },
+    { RG_ICE_CAVERN_COMPASS, "ITEM_COMPASS" },
+    { RG_FOREST_TEMPLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_FIRE_TEMPLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_WATER_TEMPLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_SPIRIT_TEMPLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_SHADOW_TEMPLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_GANONS_CASTLE_BOSS_KEY, "ITEM_KEY_BOSS" },
+    { RG_FOREST_TEMPLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_FIRE_TEMPLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_WATER_TEMPLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_SPIRIT_TEMPLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_SHADOW_TEMPLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_BOTTOM_OF_THE_WELL_SMALL_KEY, "ITEM_KEY_SMALL" },
     { RG_GERUDO_TRAINING_GROUND_SMALL_KEY, "ITEM_KEY_SMALL" },
-    { RG_GERUDO_FORTRESS_SMALL_KEY, 		"ITEM_KEY_SMALL" },
-    { RG_GANONS_CASTLE_SMALL_KEY,   		"ITEM_KEY_SMALL" },
-    { RG_TREASURE_GAME_SMALL_KEY,   		"ITEM_KEY_SMALL" },
-    { RG_KOKIRI_EMERALD,            		"ITEM_KOKIRI_EMERALD" },
-    { RG_GORON_RUBY,                		"ITEM_GORON_RUBY" },
-    { RG_ZORA_SAPPHIRE,             		"ITEM_ZORA_SAPPHIRE" },
-    { RG_FOREST_MEDALLION,          		"ITEM_MEDALLION_FOREST" },
-    { RG_FIRE_MEDALLION,            		"ITEM_MEDALLION_FIRE" },
-    { RG_WATER_MEDALLION,           		"ITEM_MEDALLION_WATER" },
-    { RG_SPIRIT_MEDALLION,          		"ITEM_MEDALLION_SPIRIT" },
-    { RG_SHADOW_MEDALLION,          		"ITEM_MEDALLION_SHADOW" },
-    { RG_LIGHT_MEDALLION,           		"ITEM_MEDALLION_LIGHT" },
-    { RG_RECOVERY_HEART,            		"ITEM_HEART_GRAYSCALE" },
-    { RG_GREEN_RUPEE,               		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_GREG_RUPEE,                		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_BLUE_RUPEE,                		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_RED_RUPEE,                 		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_PURPLE_RUPEE,              		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_HUGE_RUPEE,                		"ITEM_RUPEE_GRAYSCALE" },
-    { RG_TREASURE_GAME_GREEN_RUPEE,         "ITEM_RUPEE_GRAYSCALE" },
-    { RG_PIECE_OF_HEART,            		"ITEM_HEART_PIECE" },
-    { RG_HEART_CONTAINER,           		"ITEM_HEART_CONTAINER" },
-    { RG_ICE_TRAP,                  		"ITEM_ICE_TRAP" },
-    { RG_MILK,                              "ITEM_MILK_BOTTLE"},
-    { RG_BOMBS_5,                   		"ITEM_BOMB" },
-    { RG_BOMBS_10,                  		"ITEM_BOMB" },
-    { RG_BOMBS_20,                  		"ITEM_BOMB" },
-    { RG_BUY_BOMBS_525,              		"ITEM_BOMB" },
-    { RG_BUY_BOMBS_535,              		"ITEM_BOMB" },
-    { RG_BUY_BOMBS_10,              		"ITEM_BOMB" },
-    { RG_BUY_BOMBS_20,              		"ITEM_BOMB" },
-    { RG_BUY_BOMBS_30,                      "ITEM_BOMB" },
-    { RG_DEKU_NUTS_5,               		"ITEM_NUT" },
-    { RG_DEKU_NUTS_10,              		"ITEM_NUT" },
-    { RG_BUY_DEKU_NUTS_5,           		"ITEM_NUT" },
-    { RG_BUY_DEKU_NUTS_10,               	"ITEM_NUT" },
-    { RG_BOMBCHU_5,                 		"ITEM_BOMBCHU" },
-    { RG_BOMBCHU_10,                		"ITEM_BOMBCHU" },
-    { RG_BOMBCHU_20,                		"ITEM_BOMBCHU" },
-    { RG_BUY_BOMBCHUS_20,                 	"ITEM_BOMBCHU" },
-    { RG_ARROWS_5,                  		"ITEM_ARROWS_SMALL" },
-    { RG_BUY_ARROWS_10,                  	"ITEM_ARROWS_SMALL" },
-    { RG_ARROWS_10,                 		"ITEM_ARROWS_MEDIUM" },
-    { RG_BUY_ARROWS_30,                 	"ITEM_ARROWS_MEDIUM" },
-    { RG_ARROWS_30,                 		"ITEM_ARROWS_LARGE" },
-    { RG_BUY_ARROWS_50,                 	"ITEM_ARROWS_LARGE" },
-    { RG_TREASURE_GAME_HEART,       		"ITEM_HEART_PIECE" },
-    { RG_DEKU_SEEDS_30,             		"ITEM_SEEDS" },
-    { RG_BUY_DEKU_SEEDS_30,             	"ITEM_SEEDS" },
-    { RG_BUY_HEART,                         "ITEM_HEART_GRAYSCALE" },
-    { RG_FISHING_POLE,             	        "ITEM_FISHING_POLE" },
-    { RG_SOLD_OUT,                  		"ITEM_SOLD_OUT" },
-    { RG_TRIFORCE_PIECE,                  	"TRIFORCE_PIECE" },
-    { RG_SKELETON_KEY,                      "ITEM_KEY_SMALL" }
+    { RG_GERUDO_FORTRESS_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_GANONS_CASTLE_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_TREASURE_GAME_SMALL_KEY, "ITEM_KEY_SMALL" },
+    { RG_KOKIRI_EMERALD, "ITEM_KOKIRI_EMERALD" },
+    { RG_GORON_RUBY, "ITEM_GORON_RUBY" },
+    { RG_ZORA_SAPPHIRE, "ITEM_ZORA_SAPPHIRE" },
+    { RG_FOREST_MEDALLION, "ITEM_MEDALLION_FOREST" },
+    { RG_FIRE_MEDALLION, "ITEM_MEDALLION_FIRE" },
+    { RG_WATER_MEDALLION, "ITEM_MEDALLION_WATER" },
+    { RG_SPIRIT_MEDALLION, "ITEM_MEDALLION_SPIRIT" },
+    { RG_SHADOW_MEDALLION, "ITEM_MEDALLION_SHADOW" },
+    { RG_LIGHT_MEDALLION, "ITEM_MEDALLION_LIGHT" },
+    { RG_RECOVERY_HEART, "ITEM_HEART_GRAYSCALE" },
+    { RG_GREEN_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_GREG_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_BLUE_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_RED_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_PURPLE_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_HUGE_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_TREASURE_GAME_GREEN_RUPEE, "ITEM_RUPEE_GRAYSCALE" },
+    { RG_PIECE_OF_HEART, "ITEM_HEART_PIECE" },
+    { RG_HEART_CONTAINER, "ITEM_HEART_CONTAINER" },
+    { RG_ICE_TRAP, "ITEM_ICE_TRAP" },
+    { RG_MILK, "ITEM_MILK_BOTTLE" },
+    { RG_BOMBS_5, "ITEM_BOMB" },
+    { RG_BOMBS_10, "ITEM_BOMB" },
+    { RG_BOMBS_20, "ITEM_BOMB" },
+    { RG_BUY_BOMBS_525, "ITEM_BOMB" },
+    { RG_BUY_BOMBS_535, "ITEM_BOMB" },
+    { RG_BUY_BOMBS_10, "ITEM_BOMB" },
+    { RG_BUY_BOMBS_20, "ITEM_BOMB" },
+    { RG_BUY_BOMBS_30, "ITEM_BOMB" },
+    { RG_DEKU_NUTS_5, "ITEM_NUT" },
+    { RG_DEKU_NUTS_10, "ITEM_NUT" },
+    { RG_BUY_DEKU_NUTS_5, "ITEM_NUT" },
+    { RG_BUY_DEKU_NUTS_10, "ITEM_NUT" },
+    { RG_BOMBCHU_5, "ITEM_BOMBCHU" },
+    { RG_BOMBCHU_10, "ITEM_BOMBCHU" },
+    { RG_BOMBCHU_20, "ITEM_BOMBCHU" },
+    { RG_BUY_BOMBCHUS_20, "ITEM_BOMBCHU" },
+    { RG_ARROWS_5, "ITEM_ARROWS_SMALL" },
+    { RG_BUY_ARROWS_10, "ITEM_ARROWS_SMALL" },
+    { RG_ARROWS_10, "ITEM_ARROWS_MEDIUM" },
+    { RG_BUY_ARROWS_30, "ITEM_ARROWS_MEDIUM" },
+    { RG_ARROWS_30, "ITEM_ARROWS_LARGE" },
+    { RG_BUY_ARROWS_50, "ITEM_ARROWS_LARGE" },
+    { RG_TREASURE_GAME_HEART, "ITEM_HEART_PIECE" },
+    { RG_DEKU_SEEDS_30, "ITEM_SEEDS" },
+    { RG_BUY_DEKU_SEEDS_30, "ITEM_SEEDS" },
+    { RG_BUY_HEART, "ITEM_HEART_GRAYSCALE" },
+    { RG_FISHING_POLE, "ITEM_FISHING_POLE" },
+    { RG_SOLD_OUT, "ITEM_SOLD_OUT" },
+    { RG_TRIFORCE_PIECE, "TRIFORCE_PIECE" },
+    { RG_SKELETON_KEY, "ITEM_KEY_SMALL" }
 };
 
 Rando::Item plandomizerRandoRetrieveItem(RandomizerGet randoGetItem) {
@@ -270,70 +259,71 @@ Rando::Item plandomizerRandoRetrieveItem(RandomizerGet randoGetItem) {
     return randoGetItemEntry;
 }
 
-void PlandoPushImageButtonStyle(){
+void PlandoPushImageButtonStyle() {
     ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
     ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.2f));
     ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 1.0f, 1.0f, 0.1f));
 }
 
-void PlandoPopImageButtonStyle(){
+void PlandoPopImageButtonStyle() {
     ImGui::PopStyleColor(3);
 }
 
 ImVec4 plandomizerGetItemColor(Rando::Item randoItem) {
-    itemColor = ImVec4( 1.0f, 1.0f, 1.0f, 1.0f );
-    if (randoItem.GetItemType() == ITEMTYPE_SMALLKEY || randoItem.GetItemType() == ITEMTYPE_FORTRESS_SMALLKEY
-        || randoItem.GetItemType() == ITEMTYPE_BOSSKEY) {
-        if (randoItem.GetRandomizerGet() == RG_FOREST_TEMPLE_SMALL_KEY || 
+    itemColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    if (randoItem.GetItemType() == ITEMTYPE_SMALLKEY || randoItem.GetItemType() == ITEMTYPE_FORTRESS_SMALLKEY ||
+        randoItem.GetItemType() == ITEMTYPE_BOSSKEY) {
+        if (randoItem.GetRandomizerGet() == RG_FOREST_TEMPLE_SMALL_KEY ||
             randoItem.GetRandomizerGet() == RG_FOREST_TEMPLE_KEY_RING) {
-            itemColor = ImVec4( 0.02f, 0.76f, 0.18f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_FIRE_TEMPLE_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_FIRE_TEMPLE_KEY_RING) {
-            itemColor = ImVec4( 0.93f, 0.37f, 0.37f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_WATER_TEMPLE_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_WATER_TEMPLE_KEY_RING) {
-            itemColor = ImVec4( 0.33f, 0.71f, 0.87f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_SPIRIT_TEMPLE_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_SPIRIT_TEMPLE_KEY_RING) {
-            itemColor = ImVec4( 0.87f, 0.62f, 0.18f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_SHADOW_TEMPLE_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_SHADOW_TEMPLE_KEY_RING) {
-            itemColor = ImVec4( 0.49f, 0.06f, 0.69f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_BOTTOM_OF_THE_WELL_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_BOTTOM_OF_THE_WELL_KEY_RING) {
-            itemColor = ImVec4( 0.89f, 0.43f, 1.0f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_GERUDO_TRAINING_GROUND_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_GERUDO_TRAINING_GROUND_KEY_RING) {
-            itemColor = ImVec4( 1.0f, 1.0f, 0, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_GERUDO_FORTRESS_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_GERUDO_FORTRESS_KEY_RING) {
-            itemColor = ImVec4( 1.0f, 1.0f, 1.0f, 1.0f );
-        } else if (randoItem.GetRandomizerGet() == RG_GANONS_CASTLE_SMALL_KEY || 
-            randoItem.GetRandomizerGet() == RG_GANONS_CASTLE_KEY_RING) {
-            itemColor = ImVec4( 0.5f, 0.5f, 0.5f, 1.0f );
+            itemColor = ImVec4(0.02f, 0.76f, 0.18f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_FIRE_TEMPLE_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_FIRE_TEMPLE_KEY_RING) {
+            itemColor = ImVec4(0.93f, 0.37f, 0.37f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_WATER_TEMPLE_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_WATER_TEMPLE_KEY_RING) {
+            itemColor = ImVec4(0.33f, 0.71f, 0.87f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_SPIRIT_TEMPLE_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_SPIRIT_TEMPLE_KEY_RING) {
+            itemColor = ImVec4(0.87f, 0.62f, 0.18f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_SHADOW_TEMPLE_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_SHADOW_TEMPLE_KEY_RING) {
+            itemColor = ImVec4(0.49f, 0.06f, 0.69f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_BOTTOM_OF_THE_WELL_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_BOTTOM_OF_THE_WELL_KEY_RING) {
+            itemColor = ImVec4(0.89f, 0.43f, 1.0f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_GERUDO_TRAINING_GROUND_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_GERUDO_TRAINING_GROUND_KEY_RING) {
+            itemColor = ImVec4(1.0f, 1.0f, 0, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_GERUDO_FORTRESS_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_GERUDO_FORTRESS_KEY_RING) {
+            itemColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+        } else if (randoItem.GetRandomizerGet() == RG_GANONS_CASTLE_SMALL_KEY ||
+                   randoItem.GetRandomizerGet() == RG_GANONS_CASTLE_KEY_RING) {
+            itemColor = ImVec4(0.5f, 0.5f, 0.5f, 1.0f);
         }
         return itemColor;
     }
     if (randoItem.GetItemType() == ITEMTYPE_SONG) {
         uint32_t questID = Rando::Logic::RandoGetToQuestItem[randoItem.GetRandomizerGet()];
-        textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(songMapping.at((QuestItem)questID).name);
+        textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+            songMapping.at((QuestItem)questID).name);
         itemColor = songMapping.at((QuestItem)questID).color;
         imageSize = ImVec2(24.0f, 32.0f);
         imagePadding = 6.0f;
         return itemColor;
     }
     if (randoItem.GetRandomizerGet() >= RG_GREEN_RUPEE && randoItem.GetRandomizerGet() <= RG_HUGE_RUPEE) {
-        if (randoItem.GetRandomizerGet() == RG_GREG_RUPEE || randoItem.GetRandomizerGet() == RG_GREEN_RUPEE 
-            || randoItem.GetRandomizerGet() == RG_TREASURE_GAME_GREEN_RUPEE) {
-            itemColor = ImVec4( 0.02f, 0.76f, 0.18f, 1.0f );
+        if (randoItem.GetRandomizerGet() == RG_GREG_RUPEE || randoItem.GetRandomizerGet() == RG_GREEN_RUPEE ||
+            randoItem.GetRandomizerGet() == RG_TREASURE_GAME_GREEN_RUPEE) {
+            itemColor = ImVec4(0.02f, 0.76f, 0.18f, 1.0f);
         } else if (randoItem.GetRandomizerGet() == RG_BLUE_RUPEE) {
-            itemColor = ImVec4( 0.33f, 0.71f, 0.87f, 1.0f );
+            itemColor = ImVec4(0.33f, 0.71f, 0.87f, 1.0f);
         } else if (randoItem.GetRandomizerGet() == RG_RED_RUPEE) {
-            itemColor = ImVec4( 0.93f, 0.37f, 0.37f, 1.0f );
+            itemColor = ImVec4(0.93f, 0.37f, 0.37f, 1.0f);
         } else if (randoItem.GetRandomizerGet() == RG_PURPLE_RUPEE) {
-            itemColor = ImVec4( 0.89f, 0.43f, 1.0f, 1.0f );
+            itemColor = ImVec4(0.89f, 0.43f, 1.0f, 1.0f);
         } else if (randoItem.GetRandomizerGet() == RG_HUGE_RUPEE) {
-            itemColor = ImVec4( 1.0f, 1.0f, 0, 1.0f );
+            itemColor = ImVec4(1.0f, 1.0f, 0, 1.0f);
         }
         return itemColor;
     }
@@ -341,18 +331,17 @@ ImVec4 plandomizerGetItemColor(Rando::Item randoItem) {
     if (randoItem.GetRandomizerGet() >= RG_GOHMA_SOUL && randoItem.GetRandomizerGet() <= RG_GANON_SOUL) {
         itemColor = bossSoulColorMapping.at(randoItem.GetRandomizerGet());
     }
-    
+
     return itemColor;
 }
 
 std::string plandomizerHintsTooltip() {
     std::string hintTootip;
-    hintTootip = 
-        "The following options are available:\n"
-        "- Use \\n to create New Lines.\n"
-        "- Use %g to change the text color to Green,\n"
-        " - %r for Red, %y for Yellow, and %w for White\n"
-        "   can also be used as color examples.";
+    hintTootip = "The following options are available:\n"
+                 "- Use \\n to create New Lines.\n"
+                 "- Use %g to change the text color to Green,\n"
+                 " - %r for Red, %y for Yellow, and %w for White\n"
+                 "   can also be used as color examples.";
 
     return hintTootip;
 }
@@ -382,11 +371,10 @@ void PlandomizerPopulateSeedList() {
 
 void PlandomizerItemImageCorrection(Rando::Item randoItem) {
     textureID = 0;
-    imageSize = ImVec2( 32.0f, 32.0f );
+    imageSize = ImVec2(32.0f, 32.0f);
     imagePadding = 2.0f;
-    textureUV0 = ImVec2( 0, 0 );
-    textureUV1 = ImVec2( 1, 1 );
-    
+    textureUV0 = ImVec2(0, 0);
+    textureUV1 = ImVec2(1, 1);
 
     itemColor = plandomizerGetItemColor(randoItem);
 
@@ -403,12 +391,12 @@ void PlandomizerItemImageCorrection(Rando::Item randoItem) {
         if (map.first == randoItem.GetRandomizerGet()) {
             textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(map.second.c_str());
             if (map.second.find("ITEM_ARROWS") != std::string::npos) {
-                textureUV0 = ImVec2( 0, 1 );
-                textureUV1 = ImVec2( 1, 0 );
+                textureUV0 = ImVec2(0, 1);
+                textureUV1 = ImVec2(1, 0);
             }
             if (map.second == "ITEM_TRIFORCE" || map.first == RG_SKELETON_KEY) {
-                textureUV0 = ImVec2( 1, 1 );
-                textureUV1 = ImVec2( 0, 0 );
+                textureUV0 = ImVec2(1, 1);
+                textureUV1 = ImVec2(0, 0);
             }
             break;
         }
@@ -418,21 +406,25 @@ void PlandomizerItemImageCorrection(Rando::Item randoItem) {
         textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("BOSS_SOUL");
     }
 
-    if (randoItem.GetRandomizerGet() >= RG_OCARINA_A_BUTTON && randoItem.GetRandomizerGet() <= RG_OCARINA_C_RIGHT_BUTTON) {
+    if (randoItem.GetRandomizerGet() >= RG_OCARINA_A_BUTTON &&
+        randoItem.GetRandomizerGet() <= RG_OCARINA_C_RIGHT_BUTTON) {
         textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("ITEM_OCARINA_TIME");
     }
 
     if (textureID == 0) {
-        textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(itemMapping[randoItem.GetGIEntry()->itemId].name);
+        textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+            itemMapping[randoItem.GetGIEntry()->itemId].name);
     }
 }
 
 void PlandomizerRandomizeHint(int32_t status, int32_t index) {
     if (status == HINT_SINGLE) {
-        plandoHintData[index].hintText = Rando::StaticData::hintTextTable[GetRandomJunkHint()].GetHintMessage().GetForCurrentLanguage(MF_ENCODE);
+        plandoHintData[index].hintText =
+            Rando::StaticData::hintTextTable[GetRandomJunkHint()].GetHintMessage().GetForCurrentLanguage(MF_ENCODE);
     } else {
         for (auto& hint : plandoHintData) {
-            hint.hintText = Rando::StaticData::hintTextTable[GetRandomJunkHint()].GetHintMessage().GetForCurrentLanguage(MF_ENCODE);
+            hint.hintText =
+                Rando::StaticData::hintTextTable[GetRandomJunkHint()].GetHintMessage().GetForCurrentLanguage(MF_ENCODE);
         }
     }
 }
@@ -446,15 +438,14 @@ void PlandomizerRemoveAllHints() {
 }
 
 void PlandomizerSortDrawnItems() {
-    std::sort(drawnItemsList.begin(), drawnItemsList.end(),
-      [](const auto& a, const auto& b) {
+    std::sort(drawnItemsList.begin(), drawnItemsList.end(), [](const auto& a, const auto& b) {
         auto typeA = a.first.GetItemType();
         auto typeB = b.first.GetItemType();
-        if (typeA != typeB){
-          return typeA < typeB;
+        if (typeA != typeB) {
+            return typeA < typeB;
         }
         return a.first.GetRandomizerGet() < b.first.GetRandomizerGet();
-      });
+    });
 }
 
 void PlandomizerRemoveAllItems() {
@@ -462,7 +453,8 @@ void PlandomizerRemoveAllItems() {
         drawnItemsList.clear();
     }
     for (auto& remove : plandoLogData) {
-        if (std::find(infiniteItemList.begin(), infiniteItemList.end(), remove.checkRewardItem.GetRandomizerGet()) == infiniteItemList.end()) {
+        if (std::find(infiniteItemList.begin(), infiniteItemList.end(), remove.checkRewardItem.GetRandomizerGet()) ==
+            infiniteItemList.end()) {
             bool itemExists = false;
             for (auto& itemToCheck : drawnItemsList) {
                 if (itemToCheck.first.GetRandomizerGet() == remove.checkRewardItem.GetRandomizerGet()) {
@@ -481,7 +473,8 @@ void PlandomizerRemoveAllItems() {
 }
 
 void PlandomizerRemoveFromItemList(Rando::Item randoItem) {
-    if (std::find(infiniteItemList.begin(), infiniteItemList.end(), randoItem.GetRandomizerGet()) == infiniteItemList.end()) {
+    if (std::find(infiniteItemList.begin(), infiniteItemList.end(), randoItem.GetRandomizerGet()) ==
+        infiniteItemList.end()) {
         uint32_t index = 0;
         for (auto& itemToCheck : drawnItemsList) {
             if (itemToCheck.first.GetRandomizerGet() == randoItem.GetRandomizerGet()) {
@@ -500,7 +493,8 @@ void PlandomizerRemoveFromItemList(Rando::Item randoItem) {
 }
 
 void PlandomizerAddToItemList(Rando::Item randoItem) {
-    if (std::find(infiniteItemList.begin(), infiniteItemList.end(), randoItem.GetRandomizerGet()) == infiniteItemList.end()) {
+    if (std::find(infiniteItemList.begin(), infiniteItemList.end(), randoItem.GetRandomizerGet()) ==
+        infiniteItemList.end()) {
         bool itemExists = false;
         for (auto& itemToCheck : drawnItemsList) {
             if (itemToCheck.first.GetRandomizerGet() == randoItem.GetRandomizerGet()) {
@@ -509,7 +503,7 @@ void PlandomizerAddToItemList(Rando::Item randoItem) {
                 break;
             }
         }
-        
+
         if (!itemExists) {
             drawnItemsList.push_back(std::make_pair(randoItem, 1));
         }
@@ -527,32 +521,24 @@ void PlandomizerSaveSpoilerLog() {
         inputFile.close();
     }
 
-    spoilerSave["file_hash"] = {
-        plandoHash[0], plandoHash[1], plandoHash[2], plandoHash[3], plandoHash[4]
-    };
+    spoilerSave["file_hash"] = { plandoHash[0], plandoHash[1], plandoHash[2], plandoHash[3], plandoHash[4] };
 
     for (auto& import : plandoHintData) {
-        spoilerSave["Gossip Stone Hints"][import.hintName] = {
-            { "type", import.hintType.c_str() },
-            { "message", import.hintText.c_str() }
-        };
+        spoilerSave["Gossip Stone Hints"][import.hintName] = { { "type", import.hintType.c_str() },
+                                                               { "message", import.hintText.c_str() } };
     }
-    
+
     for (auto& import : plandoLogData) {
         if (import.checkRewardItem.GetRandomizerGet() == RG_ICE_TRAP) {
-            spoilerSave["locations"][import.checkName] = {
-                { "item", import.checkRewardItem.GetName().english },
-                { "model", import.iceTrapModel.GetName().english },
-                { "trickName", import.iceTrapName.c_str() }
-            };
+            spoilerSave["locations"][import.checkName] = { { "item", import.checkRewardItem.GetName().english },
+                                                           { "model", import.iceTrapModel.GetName().english },
+                                                           { "trickName", import.iceTrapName.c_str() } };
             if (import.shopPrice > -1) {
                 spoilerSave["locations"][import.checkName]["price"] = import.shopPrice;
             }
         } else if (import.shopPrice > -1) {
-            spoilerSave["locations"][import.checkName] = {
-                { "item", import.checkRewardItem.GetName().english },
-                { "price", import.shopPrice }
-            };
+            spoilerSave["locations"][import.checkName] = { { "item", import.checkRewardItem.GetName().english },
+                                                           { "price", import.shopPrice } };
         } else {
             spoilerSave["locations"][import.checkName] = import.checkRewardItem.GetName().english;
         }
@@ -562,7 +548,7 @@ void PlandomizerSaveSpoilerLog() {
     if (outputFile.is_open()) {
         outputFile << spoilerSave.dump(4);
         outputFile.close();
-    }    
+    }
 }
 
 void PlandomizerLoadSpoilerLog(std::string logFile) {
@@ -620,21 +606,24 @@ void PlandomizerLoadSpoilerLog(std::string logFile) {
                     checkObject.checkName = key;
                     auto type = value;
                     if (value.is_object()) {
-                        checkObject.checkRewardItem = plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value["item"]]);
+                        checkObject.checkRewardItem =
+                            plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value["item"]]);
                         if (value["price"].is_number()) {
                             checkObject.shopPrice = value["price"];
                         } else {
                             checkObject.shopPrice = -1;
                         }
                         if (checkObject.checkRewardItem.GetRandomizerGet() == RG_ICE_TRAP) {
-                            checkObject.iceTrapModel = plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value["model"]]);
+                            checkObject.iceTrapModel =
+                                plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value["model"]]);
                             checkObject.iceTrapName = value["trickName"];
                         }
                     } else {
-                        checkObject.checkRewardItem = plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value.get<std::string>()]);
+                        checkObject.checkRewardItem =
+                            plandomizerRandoRetrieveItem(Rando::StaticData::itemNameToEnum[value.get<std::string>()]);
                         checkObject.shopPrice = -1;
-                        if (checkObject.shopPrice == -1 
-                            && checkObject.checkRewardItem.GetName().english.find("Buy") != std::string::npos) {
+                        if (checkObject.shopPrice == -1 &&
+                            checkObject.checkRewardItem.GetName().english.find("Buy") != std::string::npos) {
                             checkObject.shopPrice = checkObject.checkRewardItem.GetPrice();
                         }
                     }
@@ -643,14 +632,14 @@ void PlandomizerLoadSpoilerLog(std::string logFile) {
                     PlandomizerAddToItemList(plandomizerRandoRetrieveItem(RG_SOLD_OUT));
                 }
             }
-        } catch (nlohmann::json::parse_error& e) {
+        } catch (nlohmann::json::parse_error&) {
             Notification::Emit({ .message = "Invalid Spoiler Log Format", .remainingTime = 10.0f });
         }
     }
     lastLoadedSpoiler = spoilerStr;
 }
 
-void PlandomizerOverlayText(std::pair<Rando::Item, uint32_t> drawObject ) {
+void PlandomizerOverlayText(std::pair<Rando::Item, uint32_t> drawObject) {
     // Overlay the item count text on the existing button
     ImVec2 imageMin = ImGui::GetItemRectMin();
     ImVec2 imageMax = ImGui::GetItemRectMax();
@@ -661,15 +650,15 @@ void PlandomizerOverlayText(std::pair<Rando::Item, uint32_t> drawObject ) {
     ImGui::Text(std::to_string(drawObject.second).c_str());
 
     // Overlay item info
-    if (drawObject.first.GetRandomizerGet() >= RG_PROGRESSIVE_HOOKSHOT && 
+    if (drawObject.first.GetRandomizerGet() >= RG_PROGRESSIVE_HOOKSHOT &&
         drawObject.first.GetRandomizerGet() <= RG_PROGRESSIVE_GORONSWORD) {
         textPos = ImVec2(imageMin.x + 2, imageMin.y + 2);
 
         ImGui::SetCursorScreenPos(textPos);
         ImGui::Text("+");
     }
-    if (extractNumberInParentheses(drawObject.first.GetName().english.c_str()) != "" && 
-        extractNumberInParentheses(drawObject.first.GetName().english.c_str()) != "WINNER" && 
+    if (extractNumberInParentheses(drawObject.first.GetName().english.c_str()) != "" &&
+        extractNumberInParentheses(drawObject.first.GetName().english.c_str()) != "WINNER" &&
         extractNumberInParentheses(drawObject.first.GetName().english.c_str()) != "LOSER") {
         textPos = ImVec2(imageMin.x + 2, imageMin.y + 2);
 
@@ -678,7 +667,7 @@ void PlandomizerOverlayText(std::pair<Rando::Item, uint32_t> drawObject ) {
         overlayText += extractNumberInParentheses(drawObject.first.GetName().english.c_str());
         ImGui::Text(overlayText.c_str());
     }
-    if (drawObject.first.GetRandomizerGet() >= RG_FOREST_TEMPLE_BOSS_KEY && 
+    if (drawObject.first.GetRandomizerGet() >= RG_FOREST_TEMPLE_BOSS_KEY &&
         drawObject.first.GetRandomizerGet() <= RG_GANONS_CASTLE_BOSS_KEY) {
         textPos = ImVec2(imageMin.x + 1, imageMin.y + 1);
         ImGui::SetCursorScreenPos(textPos);
@@ -717,10 +706,12 @@ void PlandomizerDrawItemPopup(uint32_t index) {
             PlandomizerItemImageCorrection(plandomizerRandoRetrieveItem(item));
             auto name = plandomizerRandoRetrieveItem(item).GetName().english;
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
+            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1,
+                                          ImVec4(0, 0, 0, 0), itemColor);
             ImGui::PopStyleVar();
             if (ret) {
-                if (std::find(infiniteItemList.begin(), infiniteItemList.end(), plandoLogData[index].checkRewardItem.GetRandomizerGet()) == infiniteItemList.end()) {
+                if (std::find(infiniteItemList.begin(), infiniteItemList.end(),
+                              plandoLogData[index].checkRewardItem.GetRandomizerGet()) == infiniteItemList.end()) {
                     PlandomizerAddToItemList(plandoLogData[index].checkRewardItem);
                 }
                 plandoLogData[index].checkRewardItem = plandomizerRandoRetrieveItem(item);
@@ -730,8 +721,7 @@ void PlandomizerDrawItemPopup(uint32_t index) {
             PlandomizerOverlayText(std::make_pair(plandomizerRandoRetrieveItem(item), 1));
             ImGui::PopID();
         }
-        
-        
+
         ImGui::EndTable();
         ImGui::SeparatorText("Spoiler Log Rewards");
         ImGui::BeginTable("Item Button Table", 8);
@@ -746,10 +736,11 @@ void PlandomizerDrawItemPopup(uint32_t index) {
             PlandomizerItemImageCorrection(drawSlots.first);
             auto name = drawSlots.first.GetName().english;
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
+            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1,
+                                          ImVec4(0, 0, 0, 0), itemColor);
             ImGui::PopStyleVar();
             if (ret) {
-                if (itemToDraw.GetRandomizerGet() >= RG_PROGRESSIVE_HOOKSHOT && 
+                if (itemToDraw.GetRandomizerGet() >= RG_PROGRESSIVE_HOOKSHOT &&
                     itemToDraw.GetRandomizerGet() <= RG_PROGRESSIVE_GORONSWORD) {
                     plandoLogData[index].checkRewardItem = drawSlots.first;
                 } else {
@@ -795,7 +786,8 @@ void PlandomizerDrawIceTrapPopUp(uint32_t index) {
             auto name = Rando::StaticData::RetrieveItem(items.first).GetName().english;
             PlandomizerItemImageCorrection(Rando::StaticData::RetrieveItem(items.first));
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor); 
+            auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1,
+                                          ImVec4(0, 0, 0, 0), itemColor);
             ImGui::PopStyleVar();
             if (ret) {
                 plandoLogData[index].iceTrapModel = Rando::StaticData::RetrieveItem(items.first);
@@ -820,7 +812,8 @@ void PlandomizerDrawItemSlots(uint32_t index) {
     PlandomizerItemImageCorrection(plandoLogData[index].checkRewardItem);
     auto name = plandoLogData[index].checkRewardItem.GetName().english;
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-    auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
+    auto ret =
+        ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
     ImGui::PopStyleVar();
     if (ret) {
         shouldPopup = true;
@@ -836,21 +829,15 @@ void PlandomizerDrawItemSlots(uint32_t index) {
 
 void PlandomizerDrawShopSlider(uint32_t index) {
     ImGui::PushID(index);
-    ImGui::Text("Price:");
-    ImGui::SameLine();
-    std::string MinusBTNName = " - ##Price";
-    if (ImGui::Button(MinusBTNName.c_str()) && plandoLogData[index].shopPrice > 0) {
-        plandoLogData[index].shopPrice--;
-    }
-    ImGui::SameLine();
-    ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - 40.0f);
-    ImGui::SliderInt("", &plandoLogData[index].shopPrice, 0, 999, "%d Rupees");
-    ImGui::PopItemWidth();
-    ImGui::SameLine();
-    std::string PlusBTNName = " + ##Price";
-    if (ImGui::Button(PlusBTNName.c_str()) && plandoLogData[index].shopPrice < 999) {
-        plandoLogData[index].shopPrice++;
-    }
+    UIWidgets::SliderInt("Price:", &plandoLogData[index].shopPrice,
+                         UIWidgets::IntSliderOptions()
+                             .Color(THEME_COLOR)
+                             .Format("%d Rupees")
+                             .Min(0)
+                             .Max(999)
+                             .LabelPosition(UIWidgets::LabelPositions::Near)
+                             .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                             .Size(UIWidgets::Sizes::Inline));
     ImGui::PopID();
 }
 
@@ -868,7 +855,8 @@ void PlandomizerDrawIceTrapSetup(uint32_t index) {
     PlandoPushImageButtonStyle();
     auto name = plandoLogData[index].iceTrapModel.GetName().english;
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-    auto ret = ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
+    auto ret =
+        ImGui::ImageButton(name.c_str(), textureID, imageSize, textureUV0, textureUV1, ImVec4(0, 0, 0, 0), itemColor);
     ImGui::PopStyleVar();
     if (ret) {
         shouldTrapPopup = true;
@@ -881,58 +869,90 @@ void PlandomizerDrawIceTrapSetup(uint32_t index) {
     ImGui::TableNextColumn();
     ImGui::Text("Name: ");
     ImGui::SameLine();
-    if (plandoLogData[index].iceTrapModel.GetRandomizerGet() != RG_NONE && 
+    if (plandoLogData[index].iceTrapModel.GetRandomizerGet() != RG_NONE &&
         plandoLogData[index].iceTrapModel.GetRandomizerGet() != RG_SOLD_OUT) {
-        if (ImGui::Button(randomizeButton.c_str())) {
-            plandoLogData[index].iceTrapName = 
-                GetIceTrapName(plandoLogData[index].iceTrapModel.GetRandomizerGet()).GetForLanguage(CVarGetInteger(CVAR_SETTING("Languages"), 0)).c_str();
+        if (UIWidgets::Button(randomizeButton.c_str(), UIWidgets::ButtonOptions()
+                                                           .Color(THEME_COLOR)
+                                                           .Size(UIWidgets::Sizes::Inline)
+                                                           .Padding(ImVec2(10.f, 6.f)))) {
+            plandoLogData[index].iceTrapName = GetIceTrapName(plandoLogData[index].iceTrapModel.GetRandomizerGet())
+                                                   .GetForLanguage(CVarGetInteger(CVAR_SETTING("Languages"), 0))
+                                                   .c_str();
         }
         ImGui::SameLine();
     }
-    if (UIWidgets::InputString("##TrapName", &trapTextInput)) {
-            plandoLogData[index].iceTrapName = trapTextInput.c_str();
-        }
-    
+    if (UIWidgets::InputString(
+            "##TrapName", &trapTextInput,
+            UIWidgets::InputOptions().Color(THEME_COLOR).LabelPosition(UIWidgets::LabelPositions::None))) {
+        plandoLogData[index].iceTrapName = trapTextInput.c_str();
+    }
+
     if (plandoLogData[index].shopPrice >= 0) {
         PlandomizerDrawShopSlider(index);
     }
     ImGui::EndTable();
-    
+
     ImGui::PopID();
 }
-
+static std::unordered_map<RandomizerCheckArea, const char*> rcAreaNameMap = {
+    { RCAREA_KOKIRI_FOREST, "Kokiri Forest" },
+    { RCAREA_LOST_WOODS, "Lost Woods" },
+    { RCAREA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow" },
+    { RCAREA_HYRULE_FIELD, "Hyrule Field" },
+    { RCAREA_LAKE_HYLIA, "Lake Hylia" },
+    { RCAREA_GERUDO_VALLEY, "Gerudo Valley" },
+    { RCAREA_GERUDO_FORTRESS, "Gerudo Fortress" },
+    { RCAREA_WASTELAND, "Haunted Wasteland" },
+    { RCAREA_DESERT_COLOSSUS, "Desert Colossus" },
+    { RCAREA_MARKET, "Hyrule Market" },
+    { RCAREA_HYRULE_CASTLE, "Hyrule Castle" },
+    { RCAREA_KAKARIKO_VILLAGE, "Kakariko Village" },
+    { RCAREA_GRAVEYARD, "Graveyard" },
+    { RCAREA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail" },
+    { RCAREA_GORON_CITY, "Goron City" },
+    { RCAREA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater" },
+    { RCAREA_ZORAS_RIVER, "Zora's River" },
+    { RCAREA_ZORAS_DOMAIN, "Zora's Domain" },
+    { RCAREA_ZORAS_FOUNTAIN, "Zora's Fountain" },
+    { RCAREA_LON_LON_RANCH, "Lon Lon Ranch" },
+    { RCAREA_DEKU_TREE, "Deku Tree" },
+    { RCAREA_DODONGOS_CAVERN, "Dodongo's Cavern" },
+    { RCAREA_JABU_JABUS_BELLY, "Jabu Jabu's Belly" },
+    { RCAREA_FOREST_TEMPLE, "Forest Temple" },
+    { RCAREA_FIRE_TEMPLE, "Fire Temple" },
+    { RCAREA_WATER_TEMPLE, "Water Temple" },
+    { RCAREA_SPIRIT_TEMPLE, "Spirit Temple" },
+    { RCAREA_SHADOW_TEMPLE, "Shadow Temple" },
+    { RCAREA_BOTTOM_OF_THE_WELL, "Bottom of the Well" },
+    { RCAREA_ICE_CAVERN, "Ice Cavern" },
+    { RCAREA_GERUDO_TRAINING_GROUND, "Gerudo Training Ground" },
+    { RCAREA_GANONS_CASTLE, "Ganon's Castle" },
+    { RCAREA_INVALID, "All" },
+};
 void PlandomizerDrawOptions() {
     if (ImGui::BeginTable("LoadSpoiler", 2)) {
+        ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
+        ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
         ImGui::TableNextColumn();
         ImGui::SeparatorText("Load/Save Spoiler Log");
         PlandomizerPopulateSeedList();
         static size_t selectedList = 0;
         if (existingSeedList.size() != 0) {
-            if (ImGui::BeginCombo("##JsonFiles", existingSeedList[selectedList].c_str())) {
-                for (size_t i = 0; i < existingSeedList.size(); i++) {
-                    bool isSelected = (selectedList == i);
-                    if (ImGui::Selectable(existingSeedList[i].c_str(), isSelected)) {
-                        selectedList = i;
-                    }
-                    if (isSelected) {
-                        ImGui::SetItemDefaultFocus();
-                    }
-                }
-                ImGui::EndCombo();
-            }
-        }
-        else {
+            UIWidgets::Combobox(
+                "##JsonFiles", &selectedList, existingSeedList,
+                UIWidgets::ComboboxOptions().Color(THEME_COLOR).LabelPosition(UIWidgets::LabelPositions::None));
+        } else {
             ImGui::Text("No Spoiler Logs found.");
         }
         ImGui::BeginDisabled(existingSeedList.empty());
-        if (ImGui::Button("Load")) {
+        if (UIWidgets::Button("Load", UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
             logTemp = existingSeedList[selectedList].c_str();
             PlandomizerLoadSpoilerLog(logTemp.c_str());
         }
         ImGui::EndDisabled();
         ImGui::BeginDisabled(spoilerLogData.empty());
         ImGui::SameLine();
-        if (ImGui::Button("Save")) {
+        if (UIWidgets::Button("Save", UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
             PlandomizerSaveSpoilerLog();
         }
         ImGui::EndDisabled();
@@ -947,33 +967,36 @@ void PlandomizerDrawOptions() {
                 }
                 ImGui::TableNextColumn();
 
-                size_t index = 0;
+                int32_t index = 0;
                 PlandoPushImageButtonStyle();
                 for (auto& hash : plandoHash) {
                     ImGui::PushID(index);
-                    textureID = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(gSeedTextures[hash].tex);
+                    textureID =
+                        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(gSeedTextures[hash].tex);
                     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 2.0f));
-                    auto upRet = ImGui::ImageButton("HASH_ARROW_UP", Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("HASH_ARROW_UP"),
-                                                  ImVec2(35.0f, 18.0f), ImVec2(1, 1), ImVec2(0, 0), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1));
+                    auto upRet = ImGui::ImageButton(
+                        "HASH_ARROW_UP",
+                        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("HASH_ARROW_UP"),
+                        ImVec2(35.0f, 18.0f), ImVec2(1, 1), ImVec2(0, 0), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1));
                     ImGui::PopStyleVar();
                     if (upRet) {
                         if (hash + 1 >= gSeedTextures.size()) {
                             hash = 0;
-                        }
-                        else {
+                        } else {
                             hash++;
                         }
                     }
                     ImGui::Image(textureID, ImVec2(35.0f, 35.0f));
                     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 2.0f));
-                    auto downRet = ImGui::ImageButton("HASH_ARROW_DWN", Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("HASH_ARROW_DWN"),
-                                                  ImVec2(35.0f, 18.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1));
+                    auto downRet = ImGui::ImageButton(
+                        "HASH_ARROW_DWN",
+                        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("HASH_ARROW_DWN"),
+                        ImVec2(35.0f, 18.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1));
                     ImGui::PopStyleVar();
                     if (downRet) {
                         if (hash == 0) {
-                            hash = gSeedTextures.size() - 1;
-                        }
-                        else {
+                            hash = static_cast<int32_t>(gSeedTextures.size()) - 1;
+                        } else {
                             hash--;
                         }
                     }
@@ -986,13 +1009,12 @@ void PlandomizerDrawOptions() {
                 PlandoPopImageButtonStyle();
                 ImGui::EndTable();
             }
-        }
-        else {
+        } else {
             ImGui::Text("No Spoiler Log Loaded");
         }
         ImGui::EndTable();
     }
-    
+
     ImGui::SeparatorText("Options");
     if (plandoLogData.size() == 0) {
         ImGui::Text("Please Load Spoiler Data...");
@@ -1000,44 +1022,28 @@ void PlandomizerDrawOptions() {
     }
 
     if (getTabID == TAB_HINTS) {
-        if (ImGui::Button("Clear All Hints")) {
+        if (UIWidgets::Button("Clear All Hints",
+                              UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
             PlandomizerRemoveAllHints();
         }
         ImGui::SameLine();
-        if (ImGui::Button("Randomize All Hints")) {
+        if (UIWidgets::Button("Randomize All Hints",
+                              UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
             PlandomizerRandomizeHint(HINT_ALL, 0);
         }
     }
     if (getTabID == TAB_LOCATIONS) {
         if (plandoLogData.size() > 0) {
-            const char* comboLabel = rcAreaNames[selectedArea].c_str();
-            if (selectedArea == RCAREA_INVALID) {
-                comboLabel = "All";
-            }
-            ImGui::Text("Filter by Area:");
+            UIWidgets::Combobox("Filter by Area:##AreaFilter", &selectedArea, rcAreaNameMap,
+                                UIWidgets::ComboboxOptions()
+                                    .Color(THEME_COLOR)
+                                    .LabelPosition(UIWidgets::LabelPositions::Near)
+                                    .ComponentAlignment(UIWidgets::ComponentAlignments::Right));
             ImGui::SameLine();
-            ImGui::PushItemWidth(300.0f);
-            if (ImGui::BeginCombo("##AreaFilter", comboLabel)) {
-                for (const auto& [area, name] : rcAreaNames) {
-                    bool isSelected = (selectedArea == area);
-
-                    const char* displayName = name.c_str();
-                    if (area == RCAREA_INVALID) {
-                        displayName = "All";
-                    }
-                    if (ImGui::Selectable(displayName, isSelected)) {
-                        selectedArea = area;
-                    }
-                    if (isSelected) {
-                        ImGui::SetItemDefaultFocus();
-                    }
-                }
-                ImGui::EndCombo();
-            }
-            ImGui::PopItemWidth();
-    
-            ImGui::SameLine();
-            if (ImGui::Button("Empty All Rewards")) {
+            if (UIWidgets::Button("Empty All Rewards", UIWidgets::ButtonOptions()
+                                                           .Color(THEME_COLOR)
+                                                           .Size(UIWidgets::Sizes::Inline)
+                                                           .Padding(ImVec2(10.f, 6.f)))) {
                 PlandomizerRemoveAllItems();
             }
         }
@@ -1067,16 +1073,22 @@ void PlandomizerDrawHintsWindow() {
             }
             ImGui::Text("New Hint:     ");
             ImGui::SameLine();
-            if (ImGui::Button(randomizeButton.c_str())) {
+            if (UIWidgets::Button(randomizeButton.c_str(), UIWidgets::ButtonOptions()
+                                                               .Color(THEME_COLOR)
+                                                               .Padding(ImVec2(10.f, 6.f))
+                                                               .Size(UIWidgets::Sizes::Inline)
+                                                               .Tooltip("Randomize Hint"))) {
                 PlandomizerRandomizeHint(HINT_SINGLE, index);
             }
-            UIWidgets::Tooltip("Randomize Hint");
             ImGui::SameLine();
             ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 10);
-            if (UIWidgets::InputString("##HintMessage", &hintInputText)) {
+            if (UIWidgets::InputString("##HintMessage", &hintInputText,
+                                       UIWidgets::InputOptions()
+                                           .Color(THEME_COLOR)
+                                           .LabelPosition(UIWidgets::LabelPositions::None)
+                                           .Tooltip(plandomizerHintsTooltip().c_str()))) {
                 plandoHintData[index].hintText = hintInputText.c_str();
             }
-            UIWidgets::Tooltip(plandomizerHintsTooltip().c_str());
             index++;
             ImGui::PopID();
         }
@@ -1092,7 +1104,8 @@ void PlandomizerDrawLocationsWindow(RandomizerCheckArea rcArea) {
     if (ImGui::BeginTable("Locations Window", 4, ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_ScrollY)) {
         ImGui::TableSetupColumn("Spoiler Log Check Name", ImGuiTableColumnFlags_WidthFixed, 250.0f);
         ImGui::TableSetupColumn("Spoiler Log Reward", ImGuiTableColumnFlags_WidthFixed, 190.0f);
-        ImGui::TableSetupColumn("New Reward", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 34.0f);
+        ImGui::TableSetupColumn("New Reward", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel,
+                                34.0f);
         ImGui::TableSetupColumn("Additional Options");
         ImGui::TableSetupScrollFreeze(0, 1);
         ImGui::TableHeadersRow();
@@ -1110,8 +1123,7 @@ void PlandomizerDrawLocationsWindow(RandomizerCheckArea rcArea) {
                 if (plandoLogData[index].checkRewardItem.GetRandomizerGet() == RG_ICE_TRAP) {
                     ImGui::TableNextColumn();
                     PlandomizerDrawIceTrapSetup(index);
-                }
-                else if (spoilerData.shopPrice != -1) {
+                } else if (spoilerData.shopPrice != -1) {
                     ImGui::TableNextColumn();
                     ImGui::BeginTable("Shops", 1, ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersInner);
                     ImGui::TableSetupColumn("Shop Price");
@@ -1119,8 +1131,7 @@ void PlandomizerDrawLocationsWindow(RandomizerCheckArea rcArea) {
                     ImGui::TableNextColumn();
                     PlandomizerDrawShopSlider(index);
                     ImGui::EndTable();
-                }
-                else {
+                } else {
                     ImGui::TableNextColumn();
                 }
             }
@@ -1133,6 +1144,7 @@ void PlandomizerDrawLocationsWindow(RandomizerCheckArea rcArea) {
 
 void PlandomizerDrawSpoilerTable() {
     ImGui::BeginChild("Main");
+    UIWidgets::PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("Check Tabs")) {
         if (ImGui::BeginTabItem("Gossip Stones")) {
             getTabID = TAB_HINTS;
@@ -1146,25 +1158,36 @@ void PlandomizerDrawSpoilerTable() {
         }
     }
     ImGui::EndTabBar();
+    UIWidgets::PopStyleTabs();
     ImGui::EndChild();
 }
 
 void PlandomizerWindow::DrawElement() {
     PlandomizerDrawOptions();
-    UIWidgets::PaddedSeparator();
+    UIWidgets::Separator(true, true, 0.f, 0.f);
     PlandomizerDrawSpoilerTable();
 }
 
 void PlandomizerWindow::InitElement() {
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_RUPEE_GRAYSCALE", gRupeeCounterIconTex, ImVec4(1, 1, 1, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_HEART_GRAYSCALE", gHeartFullTex, ImVec4(0.87f, 0.10f, 0.10f, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_SEEDS", gItemIconDekuSeedsTex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_SMALL", gDropArrows1Tex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_MEDIUM", gDropArrows2Tex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_LARGE", gDropArrows3Tex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ICE_TRAP", gMagicArrowEquipEffectTex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("HASH_ARROW_UP", gEmptyCDownArrowTex, ImVec4( 1, 1, 1, 1 ));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("HASH_ARROW_DWN", gEmptyCDownArrowTex, ImVec4( 1, 1, 1, 1 ));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_RUPEE_GRAYSCALE", gRupeeCounterIconTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_HEART_GRAYSCALE", gHeartFullTex,
+                                                                        ImVec4(0.87f, 0.10f, 0.10f, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_SEEDS", gItemIconDekuSeedsTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_SMALL", gDropArrows1Tex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_MEDIUM", gDropArrows2Tex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ARROWS_LARGE", gDropArrows3Tex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("ITEM_ICE_TRAP", gMagicArrowEquipEffectTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("HASH_ARROW_UP", gEmptyCDownArrowTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("HASH_ARROW_DWN", gEmptyCDownArrowTex,
+                                                                        ImVec4(1, 1, 1, 1));
     Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("BOSS_SOUL", gBossSoulTex, ImVec4(1, 1, 1, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("TRIFORCE_PIECE", gTriforcePieceTex, ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("TRIFORCE_PIECE", gTriforcePieceTex,
+                                                                        ImVec4(1, 1, 1, 1));
 }
diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.h b/soh/soh/Enhancements/randomizer/Plandomizer.h
index d337e4da6d..bfb118bbf4 100644
--- a/soh/soh/Enhancements/randomizer/Plandomizer.h
+++ b/soh/soh/Enhancements/randomizer/Plandomizer.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "soh/Enhancements/randomizer/item.h"
 
 #ifdef __cplusplus
-class PlandomizerWindow : public Ship::GuiWindow {
+class PlandomizerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -39,14 +39,14 @@ typedef struct {
     std::string hintText;
 } SpoilerHintObject;
 
-typedef enum {
+typedef enum PlandoTabs {
     TAB_HINTS,
-    TAB_LOCATIONS
-};
+    TAB_LOCATIONS,
+} PlandoTabs;
 
-typedef enum {
+typedef enum PlandoHints {
     HINT_SINGLE,
     HINT_ALL,
-};
+} PlandoHints;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp
new file mode 100644
index 0000000000..c94c68511c
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp
@@ -0,0 +1,141 @@
+#include <soh/OTRGlobals.h>
+#include "static_data.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+
+extern "C" {
+#include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
+extern PlayState* gPlayState;
+}
+
+extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
+
+void ObjComb_RandomizerChooseItemDrop(ObjComb* objComb, PlayState* play) {
+    s16 params = objComb->actor.params & 0x1F;
+    const auto beehiveIdentity = ObjectExtension::GetInstance().Get<BeehiveIdentity>(&objComb->actor);
+
+    if (RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) && beehiveIdentity != nullptr &&
+        !Flags_GetRandomizerInf(beehiveIdentity->randomizerInf)) {
+        EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &objComb->actor.world.pos, ITEM00_SOH_DUMMY);
+        item00->randoInf = beehiveIdentity->randomizerInf;
+        item00->itemEntry =
+            OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(beehiveIdentity->randomizerCheck, GI_NONE);
+        item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+        return;
+    }
+
+    if ((params > 0) || (params < 0x1A)) {
+        if (params == 6) {
+            if (Flags_GetCollectible(play, (objComb->actor.params >> 8) & 0x3F)) {
+                params = -1;
+            } else {
+                params = (params | (((objComb->actor.params >> 8) & 0x3F) << 8));
+            }
+        } else if (Rand_ZeroOne() < 0.5f) {
+            params = -1;
+        }
+        if (params >= 0 && !CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
+            Item_DropCollectible(play, &objComb->actor.world.pos, params);
+        }
+    }
+}
+
+void ObjComb_RandomizerWait(ObjComb* objComb, PlayState* play) {
+    objComb->unk_1B0 -= 50;
+
+    const auto beehiveIdentity = ObjectExtension::GetInstance().Get<BeehiveIdentity>(&objComb->actor);
+    if (RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) && beehiveIdentity == nullptr &&
+        !Flags_GetRandomizerInf(beehiveIdentity->randomizerInf)) {
+        if (objComb->unk_1B0 <= -5000) {
+            objComb->unk_1B0 = 1500;
+        }
+    } else if (objComb->unk_1B0 < 0) {
+        objComb->unk_1B0 = 0;
+    }
+
+    if ((objComb->collider.base.acFlags & AC_HIT) != 0) {
+        objComb->collider.base.acFlags &= ~AC_HIT;
+        s32 dmgFlags = objComb->collider.elements[0].info.acHitInfo->toucher.dmgFlags;
+        if (dmgFlags & 0x4001F866) {
+            objComb->unk_1B0 = 1500;
+        } else {
+            ObjComb_Break(objComb, play);
+            ObjComb_RandomizerChooseItemDrop(objComb, play);
+            Actor_Kill(&objComb->actor);
+        }
+    } else {
+        CollisionCheck_SetAC(play, &play->colChkCtx, &objComb->collider.base);
+    }
+
+    if (objComb->actor.update != NULL) {
+        CollisionCheck_SetOC(play, &play->colChkCtx, &objComb->collider.base);
+    }
+}
+
+void ObjComb_RandomizerInit(void* actor) {
+    ObjComb* objComb = static_cast<ObjComb*>(actor);
+    s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+    auto beehiveIdentity = OTRGlobals::Instance->gRandomizer->IdentifyBeehive(
+        gPlayState->sceneNum, (s16)objComb->actor.world.pos.x, respawnData);
+    ObjectExtension::GetInstance().Set<BeehiveIdentity>(actor, std::move(beehiveIdentity));
+    objComb->actionFunc = (ObjCombActionFunc)ObjComb_RandomizerWait;
+}
+
+void ObjComb_RandomizerUpdate(void* actor) {
+    ObjComb* combActor = reinterpret_cast<ObjComb*>(actor);
+    combActor->actor.shape.rot.x =
+        static_cast<int16_t>(Math_SinS(combActor->unk_1B2)) * CLAMP_MIN(combActor->unk_1B0, 0) +
+        combActor->actor.home.rot.x;
+}
+
+void RegisterShuffleBeehives() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES);
+
+    COND_ID_HOOK(OnActorInit, ACTOR_OBJ_COMB, shouldRegister, ObjComb_RandomizerInit);
+    COND_ID_HOOK(OnActorUpdate, ACTOR_OBJ_COMB, shouldRegister, ObjComb_RandomizerUpdate);
+}
+
+static RegisterShipInitFunc initFunc(RegisterShuffleBeehives, { "IS_RANDO" });
+
+void Rando::StaticData::RegisterBeehiveLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =          Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT));
+    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =         Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =  Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),       "Tunnel Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] = Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),       "Tunnel Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT));
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =           Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO));
+    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =              Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =     Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),       "Near Market Grotto Beehive Left",             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =    Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),       "Near Market Grotto Beehive Right",            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT));
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =            Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT));
+    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =           Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =       Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),       "Southeast Grotto Beehive Left",               RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =      Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),       "Southeast Grotto Beehive Right",              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT));
+    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =         Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO));
+    locationTable[RC_LLR_GROTTO_BEEHIVE] =                     Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO));
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =           Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT));
+    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =          Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT));
+    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                 Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),       "Cow Grotto Beehive",                          RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO));
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =         Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT));
+    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =        Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT));
+    locationTable[RC_GC_GROTTO_BEEHIVE] =                      Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO));
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =          Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),       "Upper Grotto Beehive Left",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT));
+    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =         Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),       "Upper Grotto Beehive Right",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT));
+    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =              Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),       "Hammer Grotto Beehive",                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO));
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =            Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT));
+    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =           Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT));
+    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =               Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),       "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO));
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =  Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),       "In Front of King Zora Beehive Left",          RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT));
+    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] = Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),       "In Front of King Zora Beehive Right",         RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT));
+    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =            Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),       "Behind King Zora Beehive",                    RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA));
+    locationTable[RC_LH_GROTTO_BEEHIVE] =                      Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO));
+    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =           Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO));
+    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO));
+    // clang-format-on
+}
+
+static ObjectExtension::Register<BeehiveIdentity> RegisterBeehiveIdentity;
+static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterBeehiveLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleCows.cpp b/soh/soh/Enhancements/randomizer/ShuffleCows.cpp
index 5fc86f76d2..17ae3a8345 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleCows.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleCows.cpp
@@ -19,7 +19,7 @@ void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
         // Move left cow in lon lon tower
         enCow->actor.world.pos.x = -229.0f;
         enCow->actor.world.pos.z = 157.0f;
-        enCow->actor.shape.rot.y = 15783.0f;
+        enCow->actor.shape.rot.y = 15783;
         moved = true;
     } else if (play->sceneNum == SCENE_STABLE && enCow->actor.world.pos.x == -3 && enCow->actor.world.pos.z == -254) {
         // Move right cow in lon lon stable
@@ -34,11 +34,13 @@ void EnCow_MoveForRandomizer(EnCow* enCow, PlayState* play) {
 }
 
 void RegisterShuffleCows() {
-    bool shouldRegister = IS_RANDO && Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_COWS).Get();
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_COWS);
 
     COND_VB_SHOULD(VB_GIVE_ITEM_FROM_COW, shouldRegister, {
         EnCow* enCow = va_arg(args, EnCow*);
-        CowIdentity cowIdentity = OTRGlobals::Instance->gRandomizer->IdentifyCow(gPlayState->sceneNum, enCow->actor.world.pos.x, enCow->actor.world.pos.z);
+        CowIdentity cowIdentity = OTRGlobals::Instance->gRandomizer->IdentifyCow(
+            gPlayState->sceneNum, static_cast<int32_t>(enCow->actor.world.pos.x),
+            static_cast<int32_t>(enCow->actor.world.pos.z));
         // Has this cow already rewarded an item?
         if (!Flags_GetRandomizerInf(cowIdentity.randomizerInf)) {
             Flags_SetRandomizerInf(cowIdentity.randomizerInf);
@@ -59,6 +61,11 @@ void RegisterShuffleCows() {
 static RegisterShipInitFunc initFunc(RegisterShuffleCows, { "IS_RANDO" });
 
 void Rando::StaticData::RegisterCowLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
     locationTable[RC_KF_LINKS_HOUSE_COW] =      Location::Base(RC_KF_LINKS_HOUSE_COW,      RCQUEST_BOTH, RCTYPE_COW,                              ACTOR_EN_COW, SCENE_LINKS_HOUSE,       0x00,                               "Links House Cow",   RHT_KF_LINKS_HOUSE_COW,      RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW));
     locationTable[RC_HF_COW_GROTTO_COW] =       Location::Base(RC_HF_COW_GROTTO_COW,       RCQUEST_BOTH, RCTYPE_COW, RCAREA_HYRULE_FIELD,         ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(3485, -291),       "Cow Grotto Cow",    RHT_HF_COW_GROTTO_COW,       RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW));
     locationTable[RC_LLR_STABLES_LEFT_COW] =    Location::Base(RC_LLR_STABLES_LEFT_COW,    RCQUEST_BOTH, RCTYPE_COW,                              ACTOR_EN_COW, SCENE_STABLE,            TWO_ACTOR_PARAMS(-122, -254),       "Stables Left Cow",  RHT_LLR_STABLES_LEFT_COW,    RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW));
@@ -69,6 +76,7 @@ void Rando::StaticData::RegisterCowLocations() {
     locationTable[RC_DMT_COW_GROTTO_COW] =      Location::Base(RC_DMT_COW_GROTTO_COW,      RCQUEST_BOTH, RCTYPE_COW, RCAREA_DEATH_MOUNTAIN_TRAIL, ACTOR_EN_COW, SCENE_GROTTOS,           TWO_ACTOR_PARAMS(2444, -471),       "Cow Grotto Cow",    RHT_DMT_COW_GROTTO_COW,      RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW));
     locationTable[RC_GV_COW] =                  Location::Base(RC_GV_COW,                  RCQUEST_BOTH, RCTYPE_COW,                              ACTOR_EN_COW, SCENE_GERUDO_VALLEY,     0x00,                               "Cow",               RHT_GV_COW,                  RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_GV_COW));
     locationTable[RC_JABU_JABUS_BELLY_MQ_COW] = Location::Base(RC_JABU_JABUS_BELLY_MQ_COW, RCQUEST_MQ,   RCTYPE_COW,                              ACTOR_EN_COW, SCENE_JABU_JABU,         0x00,                               "MQ Cow",            RHT_JABU_JABUS_BELLY_MQ_COW, RG_MILK, SpoilerCollectionCheck::RandomizerInf(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW));
+    // clang-format-on
 }
 
-static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterCowLocations);
\ No newline at end of file
+static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterCowLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
new file mode 100644
index 0000000000..53a65df221
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
@@ -0,0 +1,601 @@
+#include <soh/OTRGlobals.h>
+#include "soh_assets.h"
+#include "static_data.h"
+#include <libultraship/libultra.h>
+#include "global.h"
+#include "soh/ResourceManagerHelpers.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+
+extern "C" {
+#include "variables.h"
+#include "overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h"
+#include "objects/object_kibako2/object_kibako2.h"
+#include "overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h"
+#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
+#include "soh/Enhancements/enhancementTypes.h"
+extern PlayState* gPlayState;
+}
+
+extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
+
+extern "C" void ObjKibako2_RandomizerDraw(Actor* thisx, PlayState* play) {
+    GetItemCategory getItemCategory;
+    auto crateActor = ((ObjKibako2*)thisx);
+    int csmc = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED);
+    int requiresStoneAgony = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0);
+
+    int isVanilla =
+        csmc == CSMC_DISABLED || csmc == CSMC_SIZE || (requiresStoneAgony && !CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY));
+
+    if (isVanilla) {
+        Gfx_DrawDListOpa(play, (Gfx*)gLargeRandoCrateDL);
+        return;
+    }
+
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<CrateIdentity>(thisx);
+    if (crateIdentity == nullptr) {
+        Gfx_DrawDListOpa(play, (Gfx*)gLargeRandoCrateDL);
+        return;
+    }
+
+    GetItemEntry crateItem =
+        Rando::Context::GetInstance()->GetFinalGIEntry(crateIdentity->randomizerCheck, true, GI_NONE);
+    getItemCategory = crateItem.getItemCategory;
+
+    // If they have bombchus, don't consider the bombchu item major
+    if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU &&
+        ((crateItem.modIndex == MOD_RANDOMIZER && crateItem.getItemId == RG_PROGRESSIVE_BOMBCHUS) ||
+         (crateItem.modIndex == MOD_NONE &&
+          (crateItem.getItemId == GI_BOMBCHUS_5 || crateItem.getItemId == GI_BOMBCHUS_10 ||
+           crateItem.getItemId == GI_BOMBCHUS_20)))) {
+        getItemCategory = ITEM_CATEGORY_JUNK;
+        // If it's a bottle and they already have one, consider the item lesser
+    } else if ((crateItem.modIndex == MOD_RANDOMIZER && crateItem.getItemId >= RG_BOTTLE_WITH_RED_POTION &&
+                crateItem.getItemId <= RG_BOTTLE_WITH_POE) ||
+               (crateItem.modIndex == MOD_NONE &&
+                (crateItem.getItemId == GI_BOTTLE || crateItem.getItemId == GI_MILK_BOTTLE))) {
+        if (gSaveContext.inventory.items[SLOT_BOTTLE_1] != ITEM_NONE) {
+            getItemCategory = ITEM_CATEGORY_LESSER;
+        }
+    }
+
+    // Change texture
+    switch (getItemCategory) {
+        case ITEM_CATEGORY_MAJOR:
+            Gfx_DrawDListOpa(play, (Gfx*)gLargeMajorCrateDL);
+            break;
+        case ITEM_CATEGORY_SKULLTULA_TOKEN:
+            Gfx_DrawDListOpa(play, (Gfx*)gLargeTokenCrateDL);
+            break;
+        case ITEM_CATEGORY_SMALL_KEY:
+            Gfx_DrawDListOpa(play, (Gfx*)gLargeSmallKeyCrateDL);
+            break;
+        case ITEM_CATEGORY_BOSS_KEY:
+            Gfx_DrawDListOpa(play, (Gfx*)gLargeBossKeyCrateDL);
+            break;
+        case ITEM_CATEGORY_LESSER:
+            switch (crateItem.itemId) {
+                case ITEM_HEART_PIECE:
+                case ITEM_HEART_PIECE_2:
+                case ITEM_HEART_CONTAINER:
+                    Gfx_DrawDListOpa(play, (Gfx*)gLargeHeartCrateDL);
+                    break;
+                default:
+                    Gfx_DrawDListOpa(play, (Gfx*)gLargeMinorCrateDL);
+                    break;
+            }
+            break;
+        case ITEM_CATEGORY_JUNK:
+        default:
+            Gfx_DrawDListOpa(play, (Gfx*)gLargeJunkCrateDL);
+            break;
+    }
+}
+
+extern "C" void ObjKibako_RandomizerDraw(Actor* thisx, PlayState* play) {
+    GetItemCategory getItemCategory;
+    auto smallCrateActor = ((ObjKibako*)thisx);
+    int csmc = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED);
+    int requiresStoneAgony = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0);
+
+    int isVanilla =
+        csmc == CSMC_DISABLED || csmc == CSMC_SIZE || (requiresStoneAgony && !CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY));
+
+    if (isVanilla) {
+        Gfx_DrawDListOpa(play, (Gfx*)gSmallRandoCrateDL);
+        return;
+    }
+
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<SmallCrateIdentity>(thisx);
+    if (crateIdentity == nullptr) {
+        Gfx_DrawDListOpa(play, (Gfx*)gSmallRandoCrateDL);
+        return;
+    }
+
+    GetItemEntry smallCrateItem =
+        Rando::Context::GetInstance()->GetFinalGIEntry(crateIdentity->randomizerCheck, true, GI_NONE);
+    getItemCategory = smallCrateItem.getItemCategory;
+
+    // If they have bombchus, don't consider the bombchu item major
+    if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU &&
+        ((smallCrateItem.modIndex == MOD_RANDOMIZER && smallCrateItem.getItemId == RG_PROGRESSIVE_BOMBCHUS) ||
+         (smallCrateItem.modIndex == MOD_NONE &&
+          (smallCrateItem.getItemId == GI_BOMBCHUS_5 || smallCrateItem.getItemId == GI_BOMBCHUS_10 ||
+           smallCrateItem.getItemId == GI_BOMBCHUS_20)))) {
+        getItemCategory = ITEM_CATEGORY_JUNK;
+        // If it's a bottle and they already have one, consider the item lesser
+    } else if ((smallCrateItem.modIndex == MOD_RANDOMIZER && smallCrateItem.getItemId >= RG_BOTTLE_WITH_RED_POTION &&
+                smallCrateItem.getItemId <= RG_BOTTLE_WITH_POE) ||
+               (smallCrateItem.modIndex == MOD_NONE &&
+                (smallCrateItem.getItemId == GI_BOTTLE || smallCrateItem.getItemId == GI_MILK_BOTTLE))) {
+        if (gSaveContext.inventory.items[SLOT_BOTTLE_1] != ITEM_NONE) {
+            getItemCategory = ITEM_CATEGORY_LESSER;
+        }
+    }
+
+    // Change texture
+    switch (getItemCategory) {
+        case ITEM_CATEGORY_MAJOR:
+            Gfx_DrawDListOpa(play, (Gfx*)gSmallMajorCrateDL);
+            break;
+        case ITEM_CATEGORY_SKULLTULA_TOKEN:
+            Gfx_DrawDListOpa(play, (Gfx*)gSmallTokenCrateDL);
+            break;
+        case ITEM_CATEGORY_SMALL_KEY:
+            Gfx_DrawDListOpa(play, (Gfx*)gSmallSmallKeyCrateDL);
+            break;
+        case ITEM_CATEGORY_BOSS_KEY:
+            Gfx_DrawDListOpa(play, (Gfx*)gSmallBossKeyCrateDL);
+            break;
+        case ITEM_CATEGORY_LESSER:
+            switch (smallCrateItem.itemId) {
+                case ITEM_HEART_PIECE:
+                case ITEM_HEART_PIECE_2:
+                case ITEM_HEART_CONTAINER:
+                    Gfx_DrawDListOpa(play, (Gfx*)gSmallHeartCrateDL);
+                    break;
+                default:
+                    Gfx_DrawDListOpa(play, (Gfx*)gSmallMinorCrateDL);
+                    break;
+            }
+            break;
+        case ITEM_CATEGORY_JUNK:
+        default:
+            Gfx_DrawDListOpa(play, (Gfx*)gSmallJunkCrateDL);
+            break;
+    }
+}
+
+uint8_t ObjKibako2_RandomizerHoldsItem(ObjKibako2* crateActor, PlayState* play) {
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<CrateIdentity>(&crateActor->dyna.actor);
+    if (crateIdentity == nullptr) {
+        return false;
+    }
+
+    RandomizerCheck rc = crateIdentity->randomizerCheck;
+    uint8_t isDungeon = Rando::StaticData::GetLocation(rc)->IsDungeon();
+    uint8_t crateSetting = RAND_GET_OPTION(RSK_SHUFFLE_CRATES);
+
+    // Don't pull randomized item if crate isn't randomized or is already checked
+    if (!IS_RANDO || (crateSetting == RO_SHUFFLE_CRATES_OVERWORLD && isDungeon) ||
+        (crateSetting == RO_SHUFFLE_CRATES_DUNGEONS && !isDungeon) ||
+        Flags_GetRandomizerInf(crateIdentity->randomizerInf) || crateIdentity->randomizerCheck == RC_UNKNOWN_CHECK) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+uint8_t ObjKibako_RandomizerHoldsItem(ObjKibako* smallCrateActor, PlayState* play) {
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<SmallCrateIdentity>(&smallCrateActor->actor);
+    if (crateIdentity == nullptr) {
+        return false;
+    }
+
+    RandomizerCheck rc = crateIdentity->randomizerCheck;
+    uint8_t isDungeon = Rando::StaticData::GetLocation(rc)->IsDungeon();
+    uint8_t crateSetting = RAND_GET_OPTION(RSK_SHUFFLE_CRATES);
+
+    // Don't pull randomized item if crate isn't randomized or is already checked
+    if (!IS_RANDO || (crateSetting == RO_SHUFFLE_CRATES_OVERWORLD && isDungeon) ||
+        (crateSetting == RO_SHUFFLE_CRATES_DUNGEONS && !isDungeon) ||
+        Flags_GetRandomizerInf(crateIdentity->randomizerInf) || crateIdentity->randomizerCheck == RC_UNKNOWN_CHECK) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+void ObjKibako2_RandomizerSpawnCollectible(ObjKibako2* crateActor, PlayState* play) {
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<CrateIdentity>(&crateActor->dyna.actor);
+    if (crateIdentity == nullptr) {
+        return;
+    }
+
+    EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &crateActor->dyna.actor.world.pos, ITEM00_SOH_DUMMY);
+    item00->randoInf = crateIdentity->randomizerInf;
+    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(crateIdentity->randomizerCheck, true, GI_NONE);
+    item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+    item00->actor.velocity.y = 8.0f;
+    item00->actor.speedXZ = 2.0f;
+    item00->actor.world.rot.y = static_cast<int16_t>(Rand_CenteredFloat(65536.0f));
+}
+
+void ObjKibako_RandomizerSpawnCollectible(ObjKibako* smallCrateActor, PlayState* play) {
+    const auto crateIdentity = ObjectExtension::GetInstance().Get<SmallCrateIdentity>(&smallCrateActor->actor);
+    if (crateIdentity == nullptr) {
+        return;
+    }
+
+    EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &smallCrateActor->actor.world.pos, ITEM00_SOH_DUMMY);
+    item00->randoInf = crateIdentity->randomizerInf;
+    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(crateIdentity->randomizerCheck, true, GI_NONE);
+    item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+    item00->actor.velocity.y = 8.0f;
+    item00->actor.speedXZ = 2.0f;
+    item00->actor.world.rot.y = static_cast<int16_t>(Rand_CenteredFloat(65536.0f));
+}
+
+void ObjKibako2_RandomizerInit(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+    uint8_t logicSetting = RAND_GET_OPTION(RSK_LOGIC_RULES);
+
+    // don't shuffle two OOB crates in GF and don't shuffle child GV/GF crates when not in no logic
+    if (actor->id != ACTOR_OBJ_KIBAKO2 ||
+        (gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS && (s16)actor->world.pos.x == -4051 &&
+         (s16)actor->world.pos.z == -3429) ||
+        (gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS && (s16)actor->world.pos.x == -4571 &&
+         (s16)actor->world.pos.z == -3429) ||
+        (logicSetting != RO_LOGIC_NO_LOGIC && ((gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS &&
+                                                (s16)actor->world.pos.x == 3443 && (s16)actor->world.pos.z == -4876) ||
+                                               (gPlayState->sceneNum == SCENE_GERUDO_VALLEY &&
+                                                (s16)actor->world.pos.x == -764 && (s16)actor->world.pos.z == 148) ||
+                                               (gPlayState->sceneNum == SCENE_GERUDO_VALLEY &&
+                                                (s16)actor->world.pos.x == -860 && (s16)actor->world.pos.z == -125) ||
+                                               (gPlayState->sceneNum == SCENE_GERUDO_VALLEY &&
+                                                (s16)actor->world.pos.x == -860 && (s16)actor->world.pos.z == -150) ||
+                                               (gPlayState->sceneNum == SCENE_GERUDO_VALLEY &&
+                                                (s16)actor->world.pos.x == -860 && (s16)actor->world.pos.z == -90))))
+        return;
+
+    ObjKibako2* crateActor = static_cast<ObjKibako2*>(actorRef);
+
+    auto crateIdentity = OTRGlobals::Instance->gRandomizer->IdentifyCrate(gPlayState->sceneNum, (s16)actor->world.pos.x,
+                                                                          (s16)actor->world.pos.z);
+    ObjectExtension::GetInstance().Set<CrateIdentity>(actor, std::move(crateIdentity));
+}
+
+void ObjKibako_RandomizerInit(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+
+    if (actor->id != ACTOR_OBJ_KIBAKO)
+        return;
+
+    ObjKibako* smallCrateActor = static_cast<ObjKibako*>(actorRef);
+
+    auto crateIdentity = OTRGlobals::Instance->gRandomizer->IdentifySmallCrate(
+        gPlayState->sceneNum, (s16)actor->home.pos.x, (s16)actor->home.pos.z);
+    ObjectExtension::GetInstance().Set<SmallCrateIdentity>(actor, std::move(crateIdentity));
+}
+
+void RegisterShuffleCrates() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_CRATES);
+
+    COND_ID_HOOK(OnActorInit, ACTOR_OBJ_KIBAKO2, shouldRegister, ObjKibako2_RandomizerInit);
+
+    COND_VB_SHOULD(VB_CRATE_SETUP_DRAW, shouldRegister, {
+        ObjKibako2* crateActor = va_arg(args, ObjKibako2*);
+        if (ObjKibako2_RandomizerHoldsItem(crateActor, gPlayState)) {
+            crateActor->dyna.actor.draw = (ActorFunc)ObjKibako2_RandomizerDraw;
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_CRATE_DROP_ITEM, shouldRegister, {
+        ObjKibako2* crateActor = va_arg(args, ObjKibako2*);
+        if (ObjKibako2_RandomizerHoldsItem(crateActor, gPlayState)) {
+            ObjKibako2_RandomizerSpawnCollectible(crateActor, gPlayState);
+            *should = false;
+        } else {
+            *should = true;
+        }
+    });
+
+    COND_ID_HOOK(OnActorInit, ACTOR_OBJ_KIBAKO, shouldRegister, ObjKibako_RandomizerInit);
+
+    COND_VB_SHOULD(VB_SMALL_CRATE_SETUP_DRAW, shouldRegister, {
+        ObjKibako* smallCrateActor = va_arg(args, ObjKibako*);
+        if (ObjKibako_RandomizerHoldsItem(smallCrateActor, gPlayState)) {
+            smallCrateActor->actor.draw = (ActorFunc)ObjKibako_RandomizerDraw;
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_SMALL_CRATE_DROP_ITEM, shouldRegister, {
+        ObjKibako* smallCrateActor = va_arg(args, ObjKibako*);
+        if (ObjKibako_RandomizerHoldsItem(smallCrateActor, gPlayState)) {
+            ObjKibako_RandomizerSpawnCollectible(smallCrateActor, gPlayState);
+            *should = false;
+        } else {
+            *should = true;
+        }
+    });
+}
+
+void Rando::StaticData::RegisterCrateLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
+    // Overworld Crates
+    //            Randomizer Check                                 	                        Randomizer Check                                        Quest            Area                           Scene ID                        Params                              Short Name                    	          Hint Text Key                       Vanilla                 Spoiler Collection Check
+    locationTable[RC_GV_FREESTANDING_POH_CRATE]                           = Location::Crate(RC_GV_FREESTANDING_POH_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-350, 1480),       "Freestanding PoH Crate",                 RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_FREESTANDING_POH_CRATE));
+    locationTable[RC_GV_NEAR_COW_CRATE]                                   = Location::Crate(RC_GV_NEAR_COW_CRATE,                                   RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-449, 123),        "Near Cow Crate",                         RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_NEAR_COW_CRATE));
+    locationTable[RC_GF_ABOVE_JAIL_CRATE]                                 = Location::Crate(RC_GF_ABOVE_JAIL_CRATE,                                 RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(51, -2997),        "Above Jail Crate",                       RHT_CRATE_GERUDOS_FORTRESS,         RG_PURPLE_RUPEE,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ABOVE_JAIL_CRATE));
+    locationTable[RC_GF_SOUTHMOST_CENTER_CRATE]                           = Location::Crate(RC_GF_SOUTHMOST_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(315, -1534),       "Southmost Center Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTHMOST_CENTER_CRATE));
+    locationTable[RC_GF_MID_SOUTH_CENTER_CRATE]                           = Location::Crate(RC_GF_MID_SOUTH_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(315, -1594),       "Middle South Center Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_MID_SOUTH_CENTER_CRATE));
+    locationTable[RC_GF_MID_NORTH_CENTER_CRATE]                           = Location::Crate(RC_GF_MID_NORTH_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(310, -1782),       "Middle North Center Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_MID_NORTH_CENTER_CRATE));
+    locationTable[RR_GF_NORTHMOST_CENTER_CRATE]                           = Location::Crate(RR_GF_NORTHMOST_CENTER_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(310, -1842),       "Northmost Center Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTHMOST_CENTER_CRATE));
+    locationTable[RC_GF_OUTSKIRTS_NE_CRATE]                               = Location::Crate(RC_GF_OUTSKIRTS_NE_CRATE,                               RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(-60, -2210),       "Outskirts Northeast Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_OUTSKIRTS_NE_CRATE));
+    locationTable[RC_GF_OUTSKIRTS_NW_CRATE]                               = Location::Crate(RC_GF_OUTSKIRTS_NW_CRATE,                               RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(-120, -2210),      "Outskirts Northwest Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_OUTSKIRTS_NW_CRATE));
+    locationTable[RC_GF_HBA_RANGE_CRATE_2]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_2,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -1780),      "Horseback Archery Range Crate 2",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_2));
+    locationTable[RC_GF_HBA_RANGE_CRATE_3]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_3,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -2020),      "Horseback Archery Range Crate 3",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_3));
+    locationTable[RC_GF_HBA_RANGE_CRATE_4]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_4,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -2260),      "Horseback Archery Range Crate 4",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_4));
+    locationTable[RC_GF_HBA_RANGE_CRATE_1]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_1,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -1540),      "Horseback Archery Range Crate 1",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_1));
+    locationTable[RC_GF_HBA_RANGE_CRATE_5]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_5,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -2500),      "Horseback Archery Range Crate 5",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_5));
+    locationTable[RC_GF_HBA_RANGE_CRATE_6]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_6,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -2740),      "Horseback Archery Range Crate 6",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_6));
+    locationTable[RC_GF_HBA_RANGE_CRATE_7]                                = Location::Crate(RC_GF_HBA_RANGE_CRATE_7,                                RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(4090, -2980),      "Horseback Archery Range Crate 7",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_RANGE_CRATE_7));
+    locationTable[RC_GF_HBA_CANOPY_EAST_CRATE]                            = Location::Crate(RC_GF_HBA_CANOPY_EAST_CRATE,                            RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3727, -243),       "Horseback Archery Canopy East Crate",    RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_CANOPY_EAST_CRATE));
+    locationTable[RC_GF_HBA_CANOPY_WEST_CRATE]                            = Location::Crate(RC_GF_HBA_CANOPY_WEST_CRATE,                            RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3667, -243),       "Horseback Archery Canopy West Crate",    RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_HBA_CANOPY_WEST_CRATE));
+    locationTable[RC_GF_NORTH_TARGET_EAST_CRATE]                          = Location::Crate(RC_GF_NORTH_TARGET_EAST_CRATE,                          RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3446, -4875),      "North Target East Crate",                RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_TARGET_EAST_CRATE));
+    locationTable[RC_GF_NORTH_TARGET_WEST_CRATE]                          = Location::Crate(RC_GF_NORTH_TARGET_WEST_CRATE,                          RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3303, -5018),      "North Target West Crate",                RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_TARGET_WEST_CRATE));
+    locationTable[RC_GF_SOUTH_TARGET_EAST_CRATE]                          = Location::Crate(RC_GF_SOUTH_TARGET_EAST_CRATE,                          RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3406, 414),        "South Target East Crate",                RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_TARGET_EAST_CRATE));
+    locationTable[RC_GF_SOUTH_TARGET_WEST_CRATE]                          = Location::Crate(RC_GF_SOUTH_TARGET_WEST_CRATE,                          RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3330, 406),        "South Target West Crate",                RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_TARGET_WEST_CRATE));
+    locationTable[RC_TH_NEAR_KITCHEN_LEFTMOST_CRATE]                      = Location::Crate(RC_TH_NEAR_KITCHEN_LEFTMOST_CRATE,                      RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1144, -1251),      "Near Kitchen Leftmost Crate",            RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_KITCHEN_LEFTMOST_CRATE));
+    locationTable[RC_TH_NEAR_KITCHEN_MID_LEFT_CRATE]                      = Location::Crate(RC_TH_NEAR_KITCHEN_MID_LEFT_CRATE,                      RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1144, -1191),      "Near Kitchen Middle Left Crate",         RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_KITCHEN_MID_LEFT_CRATE));
+    locationTable[RC_TH_NEAR_KITCHEN_MID_RIGHT_CRATE]                     = Location::Crate(RC_TH_NEAR_KITCHEN_MID_RIGHT_CRATE,                     RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1256, -847),       "Near Kitchen Middle Right Crate",        RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_KITCHEN_MID_RIGHT_CRATE));
+    locationTable[RC_TH_NEAR_KITCHEN_RIGHTMOST_CRATE]                     = Location::Crate(RC_TH_NEAR_KITCHEN_RIGHTMOST_CRATE,                     RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1256, -787),       "Near Kitchen Rightmost Crate",           RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_KITCHEN_RIGHTMOST_CRATE));
+    locationTable[RC_TH_KITCHEN_CRATE]                                    = Location::Crate(RC_TH_KITCHEN_CRATE,                                    RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1610, -624),       "Kitchen Crate",                          RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_KITCHEN_CRATE));
+    locationTable[RC_TH_BREAK_HALLWAY_OUTER_CRATE]                        = Location::Crate(RC_TH_BREAK_HALLWAY_OUTER_CRATE,                        RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1260, -3155),      "Break Hallway Outer Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_HALLWAY_OUTER_CRATE));
+    locationTable[RC_TH_BREAK_ROOM_LEFT_CRATE]                            = Location::Crate(RC_TH_BREAK_ROOM_LEFT_CRATE,                            RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1600, -3550),      "Break Room Left Crate",                  RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_ROOM_LEFT_CRATE));
+    locationTable[RC_TH_BREAK_HALLWAY_INNER_CRATE]                        = Location::Crate(RC_TH_BREAK_HALLWAY_INNER_CRATE,                        RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1360, -3325),      "Break Hallway Inner Crate",              RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_HALLWAY_INNER_CRATE));
+    locationTable[RC_TH_BREAK_ROOM_RIGHT_CRATE]                           = Location::Crate(RC_TH_BREAK_ROOM_RIGHT_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1600, -3502),      "Break Room Right Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_ROOM_RIGHT_CRATE));
+    locationTable[RC_TH_1_TORCH_CELL_CRATE]                               = Location::Crate(RC_TH_1_TORCH_CELL_CRATE,                               RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(-510, -2213),      "1 Torch Cell Crate",                     RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_1_TORCH_CELL_CRATE));
+    locationTable[RC_TH_DEAD_END_CELL_CRATE]                              = Location::Crate(RC_TH_DEAD_END_CELL_CRATE,                              RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(1090, -2210),      "Dead End Cell Crate",                    RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_DEAD_END_CELL_CRATE));
+    locationTable[RC_TH_DOUBLE_CELL_LEFT_CRATE]                           = Location::Crate(RC_TH_DOUBLE_CELL_LEFT_CRATE,                           RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(-49, 11),          "Double Cell Left Crate",                 RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_DOUBLE_CELL_LEFT_CRATE));
+    locationTable[RC_TH_DOUBLE_CELL_RIGHT_CRATE]                          = Location::Crate(RC_TH_DOUBLE_CELL_RIGHT_CRATE,                          RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_THIEVES_HIDEOUT,          TWO_ACTOR_PARAMS(11, 11),           "Double Cell Right Crate",                RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_DOUBLE_CELL_RIGHT_CRATE));
+    locationTable[RC_HW_BEFORE_QUICKSAND_CRATE]                           = Location::Crate(RC_HW_BEFORE_QUICKSAND_CRATE,                           RCQUEST_BOTH,    RCAREA_WASTELAND,              SCENE_HAUNTED_WASTELAND,        TWO_ACTOR_PARAMS(3832, 2840),       "Before Quicksand Crate",                 RHT_CRATE_WASTELAND,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HW_BEFORE_QUICKSAND_CRATE));
+    locationTable[RC_HW_AFTER_QUICKSAND_CRATE_1]                          = Location::Crate(RC_HW_AFTER_QUICKSAND_CRATE_1,                          RCQUEST_BOTH,    RCAREA_WASTELAND,              SCENE_HAUNTED_WASTELAND,        TWO_ACTOR_PARAMS(3235, 2313),       "After Quicksand Crate 1",                RHT_CRATE_WASTELAND,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HW_AFTER_QUICKSAND_CRATE_1));
+    locationTable[RC_HW_AFTER_QUICKSAND_CRATE_2]                          = Location::Crate(RC_HW_AFTER_QUICKSAND_CRATE_2,                          RCQUEST_BOTH,    RCAREA_WASTELAND,              SCENE_HAUNTED_WASTELAND,        TWO_ACTOR_PARAMS(3125, 2459),       "After Quicksand Crate 2",                RHT_CRATE_WASTELAND,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HW_AFTER_QUICKSAND_CRATE_2));
+    locationTable[RC_HW_AFTER_QUICKSAND_CRATE_3]                          = Location::Crate(RC_HW_AFTER_QUICKSAND_CRATE_3,                          RCQUEST_BOTH,    RCAREA_WASTELAND,              SCENE_HAUNTED_WASTELAND,        TWO_ACTOR_PARAMS(3026, 2631),       "After Quicksand Crate 3",                RHT_CRATE_WASTELAND,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HW_AFTER_QUICKSAND_CRATE_3));
+    locationTable[RC_HW_NEAR_COLOSSUS_CRATE]                              = Location::Crate(RC_HW_NEAR_COLOSSUS_CRATE,                              RCQUEST_BOTH,    RCAREA_WASTELAND,              SCENE_HAUNTED_WASTELAND,        TWO_ACTOR_PARAMS(-1531, -976),      "Near Colossus Crate",                    RHT_CRATE_WASTELAND,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HW_NEAR_COLOSSUS_CRATE));
+    locationTable[RC_MK_NEAR_BAZAAR_CRATE_1]                              = Location::Crate(RC_MK_NEAR_BAZAAR_CRATE_1,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_DAY,               TWO_ACTOR_PARAMS(490, 338),         "Near Bazaar Crate 1",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_NEAR_BAZAAR_CRATE_1));
+    locationTable[RC_MK_NEAR_BAZAAR_CRATE_2]                              = Location::Crate(RC_MK_NEAR_BAZAAR_CRATE_2,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_DAY,               TWO_ACTOR_PARAMS(490, 132),         "Near Bazaar Crate 2",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_NEAR_BAZAAR_CRATE_2));
+    locationTable[RC_MK_SHOOTING_GALLERY_CRATE_1]                         = Location::Crate(RC_MK_SHOOTING_GALLERY_CRATE_1,                         RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_DAY,               TWO_ACTOR_PARAMS(-150, -576),       "Shooting Gallery Crate 1",               RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_SHOOTING_GALLERY_CRATE_1));
+    locationTable[RC_MK_SHOOTING_GALLERY_CRATE_2]                         = Location::Crate(RC_MK_SHOOTING_GALLERY_CRATE_2,                         RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_DAY,               TWO_ACTOR_PARAMS(-90, -576),        "Shooting Gallery Crate 2",               RHT_CRATE_MARKET,                   RG_RED_RUPEE,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_SHOOTING_GALLERY_CRATE_2));
+    locationTable[RC_MK_LOST_DOG_HOUSE_CRATE]                             = Location::Crate(RC_MK_LOST_DOG_HOUSE_CRATE,                             RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_DOG_LADY_HOUSE,           TWO_ACTOR_PARAMS(176, 170),         "Lost Dog House Crate",                   RHT_CRATE_MARKET,                   RG_BLUE_RUPEE,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_LOST_DOG_HOUSE_CRATE));
+    locationTable[RC_MK_GUARD_HOUSE_CRATE_1]                              = Location::Crate(RC_MK_GUARD_HOUSE_CRATE_1,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_GUARD_HOUSE,       TWO_ACTOR_PARAMS(76, -210),         "Guard House Crate 1",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CRATE_1));
+    locationTable[RC_MK_GUARD_HOUSE_CRATE_2]                              = Location::Crate(RC_MK_GUARD_HOUSE_CRATE_2,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_GUARD_HOUSE,       TWO_ACTOR_PARAMS(28, -210),         "Guard House Crate 2",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CRATE_2));
+    locationTable[RC_MK_GUARD_HOUSE_CRATE_3]                              = Location::Crate(RC_MK_GUARD_HOUSE_CRATE_3,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_GUARD_HOUSE,       TWO_ACTOR_PARAMS(-90, 120),         "Guard House Crate 3",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CRATE_3));
+    locationTable[RC_MK_GUARD_HOUSE_CRATE_4]                              = Location::Crate(RC_MK_GUARD_HOUSE_CRATE_4,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_GUARD_HOUSE,       TWO_ACTOR_PARAMS(-90, 168),         "Guard House Crate 4",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CRATE_4));
+    locationTable[RC_MK_GUARD_HOUSE_CRATE_5]                              = Location::Crate(RC_MK_GUARD_HOUSE_CRATE_5,                              RCQUEST_BOTH,    RCAREA_MARKET,                 SCENE_MARKET_GUARD_HOUSE,       TWO_ACTOR_PARAMS(-90, 216),         "Guard House Crate 5",                    RHT_CRATE_MARKET,                   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CRATE_5));
+    locationTable[RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1]                  = Location::Crate(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(1039, 10),         "Near Open Grotto Adult Crate 1",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1));
+    locationTable[RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2]                  = Location::Crate(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(1099, 10),         "Near Open Grotto Adult Crate 2",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_RED_RUPEE,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2));
+    locationTable[RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3]                  = Location::Crate(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(506, -358),        "Near Open Grotto Adult Crate 3",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_RED_RUPEE,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3));
+    locationTable[RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4]                  = Location::Crate(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(483, -302),        "Near Open Grotto Adult Crate 4",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4));
+    locationTable[RC_KAK_NEAR_POTION_SHOP_ADULT_CRATE]                    = Location::Crate(RC_KAK_NEAR_POTION_SHOP_ADULT_CRATE,                    RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(186, -758),        "Near Potion Shop Adult Crate",           RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_ADULT_CRATE));
+    locationTable[RC_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE]               = Location::Crate(RC_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE,               RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(185, 776),         "Near Shooting Gallery Adult Crate",      RHT_CRATE_KAKARIKO_VILLAGE,         RG_ARROWS_5,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE));
+    locationTable[RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1]               = Location::Crate(RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1,               RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(92, 348),          "Near Boarding House Adult Crate 1",      RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1));
+    locationTable[RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2]               = Location::Crate(RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2,               RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(32, 348),          "Near Boarding House Adult Crate 2",      RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2));
+    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1]                  = Location::Crate(RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-389, 1518),       "Near Impas House Adult Crate 1",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1));
+    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2]                  = Location::Crate(RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2,                  RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-389, 1470),       "Near Impas House Adult Crate 2",         RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2));
+    locationTable[RC_KAK_NEAR_BAZAAR_ADULT_CRATE_1]                       = Location::Crate(RC_KAK_NEAR_BAZAAR_ADULT_CRATE_1,                       RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-433, -401),       "Near Bazaar Adult Crate 1",              RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_1));
+    locationTable[RC_KAK_NEAR_BAZAAR_ADULT_CRATE_2]                       = Location::Crate(RC_KAK_NEAR_BAZAAR_ADULT_CRATE_2,                       RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-489, -424),       "Near Bazaar Adult Crate 2",              RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_2));
+    locationTable[RC_KAK_BEHIND_GS_HOUSE_ADULT_CRATE]                     = Location::Crate(RC_KAK_BEHIND_GS_HOUSE_ADULT_CRATE,                     RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-724, 871),        "Behind GS House Adult Crate",            RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_BEHIND_GS_HOUSE_ADULT_CRATE));
+    locationTable[RC_KAK_NEAR_GY_CHILD_CRATE]                             = Location::Crate(RC_KAK_NEAR_GY_CHILD_CRATE,                             RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(1732, 1366),       "Near Graveyard Child Crate",             RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GY_CHILD_CRATE));
+    locationTable[RC_KAK_NEAR_WINDMILL_CHILD_CRATE]                       = Location::Crate(RC_KAK_NEAR_WINDMILL_CHILD_CRATE,                       RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(1170, 601),        "Near Windmill Child Crate",              RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_WINDMILL_CHILD_CRATE));
+    locationTable[RC_KAK_NEAR_FENCE_CHILD_CRATE]                          = Location::Crate(RC_KAK_NEAR_FENCE_CHILD_CRATE,                          RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(1170, 111),        "Near Fence Child Crate",                 RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_FENCE_CHILD_CRATE));
+    locationTable[RC_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE]                 = Location::Crate(RC_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE,                 RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-60, -46),         "Near Boarding House Child Crate",        RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE));
+    locationTable[RC_KAK_NEAR_BAZAAR_CHILD_CRATE]                         = Location::Crate(RC_KAK_NEAR_BAZAAR_CHILD_CRATE,                         RCQUEST_BOTH,    RCAREA_KAKARIKO_VILLAGE,       SCENE_KAKARIKO_VILLAGE,         TWO_ACTOR_PARAMS(-636, -478),       "Near Bazaar Child Crate",                RHT_CRATE_KAKARIKO_VILLAGE,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_BAZAAR_CHILD_CRATE));
+    locationTable[RC_GRAVEYARD_CRATE]                                     = Location::Crate(RC_GRAVEYARD_CRATE,                                     RCQUEST_BOTH,    RCAREA_GRAVEYARD,              SCENE_GRAVEYARD,                TWO_ACTOR_PARAMS(-1050, -350),      "Freestanding PoH Crate",                 RHT_CRATE_GRAVEYARD,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_CRATE));
+    locationTable[RC_GC_MAZE_CRATE]                                       = Location::Crate(RC_GC_MAZE_CRATE,                                       RCQUEST_BOTH,    RCAREA_GORON_CITY,             SCENE_GORON_CITY,               TWO_ACTOR_PARAMS(-1124, -1339),     "Maze Crate",                             RHT_CRATE_GORON_CITY,               RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MAZE_CRATE));
+    locationTable[RC_DMC_CRATE]                                           = Location::Crate(RC_DMC_CRATE,                                           RCQUEST_BOTH,    RCAREA_DEATH_MOUNTAIN_CRATER,  SCENE_DEATH_MOUNTAIN_CRATER,    TWO_ACTOR_PARAMS(-950, 1892),       "Crate",                                  RHT_CRATE_DEATH_MOUNTAIN_CRATER,    RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_CRATE));
+    locationTable[RC_LLR_NEAR_TREE_CRATE]                                 = Location::Crate(RC_LLR_NEAR_TREE_CRATE,                                 RCQUEST_BOTH,    RCAREA_LON_LON_RANCH,          SCENE_LON_LON_RANCH,            TWO_ACTOR_PARAMS(1160, -2376),      "Near Tree Crate",                        RHT_CRATE_LON_LON_RANCH,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_NEAR_TREE_CRATE));
+    locationTable[RC_LH_LAB_CRATE]                                        = Location::Crate(RC_LH_LAB_CRATE,                                        RCQUEST_BOTH,    RCAREA_LAKE_HYLIA,             SCENE_LAKESIDE_LABORATORY,      TWO_ACTOR_PARAMS(90, -119),         "Lab Crate",                              RHT_CRATE_LAKESIDE_LABORATORY,      RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_LAB_CRATE));
+
+    // No Logic Crates
+    locationTable[RC_GV_CRATE_BRIDGE_1]                                 = Location::NLCrate(RC_GV_CRATE_BRIDGE_1,                                   RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-764, 148),        "Near Bridge Crate 1",                    RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_1));
+    locationTable[RC_GV_CRATE_BRIDGE_2]                                 = Location::NLCrate(RC_GV_CRATE_BRIDGE_2,                                   RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-860, -125),       "Near Bridge Crate 2",                    RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_2));
+    locationTable[RC_GV_CRATE_BRIDGE_3]                                 = Location::NLCrate(RC_GV_CRATE_BRIDGE_3,                                   RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-860, -150),       "Near Bridge Crate 3",                    RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_3));
+    locationTable[RC_GV_CRATE_BRIDGE_4]                                 = Location::NLCrate(RC_GV_CRATE_BRIDGE_4,                                   RCQUEST_BOTH,    RCAREA_GERUDO_VALLEY,          SCENE_GERUDO_VALLEY,            TWO_ACTOR_PARAMS(-860, -90),        "Near Bridge Crate 4",                    RHT_CRATE_GERUDO_VALLEY,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_4));
+    locationTable[RC_GF_NORTH_TARGET_CHILD_CRATE]                       = Location::NLCrate(RC_GF_NORTH_TARGET_CHILD_CRATE,                         RCQUEST_BOTH,    RCAREA_GERUDO_FORTRESS,        SCENE_GERUDOS_FORTRESS,         TWO_ACTOR_PARAMS(3443, -4876),      "North Target Child Crate",               RHT_CRATE_GERUDOS_FORTRESS,         RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_TARGET_CHILD_CRATE));
+
+    // MQ Crates
+    //            Randomizer Check                                 	                        Randomizer Check                                        Quest            Area                           Scene ID                        Params                              Short Name                    	                Hint Text Key                       Vanilla                 Spoiler Collection Check
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_CRATE]                            = Location::Crate(RC_DEKU_TREE_MQ_LOBBY_CRATE,                            RCQUEST_MQ,      RCAREA_DEKU_TREE,              SCENE_DEKU_TREE,                TWO_ACTOR_PARAMS(279, 333),         "MQ Lobby Crate",                         RHT_CRATE_DEKU_TREE,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_CRATE));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1]                 = Location::Crate(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1,                 RCQUEST_MQ,      RCAREA_DEKU_TREE,              SCENE_DEKU_TREE,                TWO_ACTOR_PARAMS(-805, -62),        "MQ Slingshot Room Crate 1",              RHT_CRATE_DEKU_TREE,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2]                 = Location::Crate(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2,                 RCQUEST_MQ,      RCAREA_DEKU_TREE,              SCENE_DEKU_TREE,                TWO_ACTOR_PARAMS(-805, -2),         "MQ Slingshot Room Crate 2",              RHT_CRATE_DEKU_TREE,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1886, -744),       "MQ Poe Room Crate 1",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1826, -744),       "MQ Poe Room Crate 2",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1536, -1391),      "MQ Poe Room Crate 3",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1536, -1451),      "MQ Poe Room Crate 4",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2267, -1824),      "MQ Poe Room Crate 5",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2267, -1884),      "MQ Poe Room Crate 6",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2232, -1161),      "MQ Poe Room Crate 7",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8]                 = Location::Crate(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8,                 RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2232, -1221),      "MQ Poe Room Crate 8",                    RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-1730, -1836),     "MQ Staircase Lower Crate 1",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-2190, -1835),     "MQ Staircase Lower Crate 2",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-1510, -1837),     "MQ Staircase Upper Crate 1",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-1511, -1084),     "MQ Staircase Upper Crate 2",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-2410, -1084),     "MQ Staircase Upper Crate 3",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4]          = Location::Crate(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4,          RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-2411, -1836),     "MQ Staircase Upper Crate 4",             RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1]               = Location::Crate(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1,               RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3191, -897),       "MQ Two Flames Crate 1",                  RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2]               = Location::Crate(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2,               RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2776, -810),       "MQ Two Flames Crate 2",                  RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2055, -1714),      "MQ Larvae Room Crate 1",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2055, -1774),      "MQ Larvae Room Crate 2",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1871, -1976),      "MQ Larvae Room Crate 3",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1811, -1976),      "MQ Larvae Room Crate 4",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1625, -1721),      "MQ Larvae Room Crate 5",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5));
+    locationTable[RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6]              = Location::Crate(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6,              RCQUEST_MQ,      RCAREA_DODONGOS_CAVERN,        SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1625, -1781),      "MQ Larvae Room Crate 6",                 RHT_CRATE_DODONGOS_CAVERN,          RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1205, 769),       "MQ Outside Boss Crate 1",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1205, 709),       "MQ Outside Boss Crate 2",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1130, -654),      "MQ Outside Boss Crate 3",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1211, -775),      "MQ Outside Boss Crate 4",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1457, -417),      "MQ Outside Boss Crate 5",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6]                 = Location::Crate(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6,                 RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1457, -534),      "MQ Outside Boss Crate 6",                RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2249, -56),        "MQ Shortcut Crate 1",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2189, -56),        "MQ Shortcut Crate 2",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2150, 55),         "MQ Shortcut Crate 3",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2135, -62),        "MQ Shortcut Crate 4",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2090, 55),         "MQ Shortcut Crate 5",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5));
+    locationTable[RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6]                     = Location::Crate(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6,                     RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2030, 55),         "MQ Shortcut Crate 6",                    RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2230, 1147),       "MQ Lizalfos Maze Lower Crate 1",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2230, 1195),       "MQ Lizalfos Maze Lower Crate 2",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2124, 1154),       "MQ Lizalfos Maze Lower Crate 3",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1817, 1330),       "MQ Lizalfos Maze Upper Crate 1",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1710, 1288),       "MQ Lizalfos Maze Upper Crate 2",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3]          = Location::Crate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3,          RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1710, 1336),       "MQ Lizalfos Maze Upper Crate 3",         RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1]                   = Location::Crate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1,                   RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1407, -756),       "MQ Lava Torch Crate 1",                  RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2]                   = Location::Crate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2,                   RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(384, 351),         "MQ Lava Torch Crate 2",                  RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3]                   = Location::Crate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3,                   RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1409, -1176),      "MQ Lava Torch Crate 3",                  RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4]                   = Location::Crate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4,                   RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(999, -402),        "MQ Lava Torch Crate 4",                  RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5]                   = Location::Crate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5,                   RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1210, 163),        "MQ Lava Torch Crate 5",                  RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-150, -336),       "MQ Central Pillar Upper Crate 1",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-210, -336),       "MQ Central Pillar Upper Crate 2",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(299, 485),         "MQ Central Pillar Lower Crate 1",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(215, 486),         "MQ Central Pillar Lower Crate 2",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(222, 204),         "MQ Central Pillar Lower Crate 3",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(455, 425),         "MQ Central Pillar Lower Crate 4",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(455, 365),         "MQ Central Pillar Lower Crate 5",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(215, 426),         "MQ Central Pillar Lower Crate 6",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(215, 366),         "MQ Central Pillar Lower Crate 7",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(162, 204),         "MQ Central Pillar Lower Crate 8",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9]        = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9,        RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(31, 636),          "MQ Central Pillar Lower Crate 9",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10]       = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(151, 636),         "MQ Central Pillar Lower Crate 10",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11]       = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(102, 204),         "MQ Central Pillar Lower Crate 11",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12]       = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(91, 636),          "MQ Central Pillar Lower Crate 12",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13]       = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(25, 522),          "MQ Central Pillar Lower Crate 13",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13));
+    locationTable[RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14]       = Location::Crate(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(25, 582),          "MQ Central Pillar Lower Crate 14",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1]            = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(698, 399),         "MQ Lizalfos Hallway Crate 1",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2]            = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(437, 576),         "MQ Lizalfos Hallway Crate 2",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3]            = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(270, 504),         "MQ Lizalfos Hallway Crate 3",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(686, 1016),        "MQ Lizalfos Hallway Room Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(795, 870),         "MQ Lizalfos Hallway Room Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(795, 810),         "MQ Lizalfos Hallway Room Crate 3",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(524, 839),         "MQ Lizalfos Hallway Room Crate 4",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(525, 954),         "MQ Lizalfos Hallway Room Crate 5",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(816, 570),         "MQ Lizalfos Hallway Gate Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(816, 510),         "MQ Lizalfos Hallway Gate Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1536, -712),       "MQ Storage Room A Crate 2",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1536, -821),       "MQ Storage Room A Crate 3",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1536, -922),       "MQ Storage Room A Crate 4",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1434, -1036),      "MQ Storage Room A Crate 1",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1374, -1036),      "MQ Storage Room A Crate 5",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1265, -1036),      "MQ Storage Room A Crate 6",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1205, -1036),      "MQ Storage Room A Crate 7",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-892, -91),        "MQ GS Storage Room Lower Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1149, 173),       "MQ GS Storage Room Lower Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1157, -221),      "MQ GS Storage Room Lower Crate 3",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-945, -315),       "MQ GS Storage Room Lower Crate 4",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1150, -141),      "MQ GS Storage Room Lower Crate 5",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1103, -315),      "MQ GS Storage Room Lower Crate 6",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-884, 65),         "MQ GS Storage Room Upper Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1150, 56),        "MQ GS Storage Room Upper Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1]         = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2196, -1918),     "MQ Dragon Room Torches Crate 1",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2]         = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2196, -1978),     "MQ Dragon Room Torches Crate 2",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1718, -2006),     "MQ Dragon Room Submerged Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1778, -2006),     "MQ Dragon Room Submerged Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3]       = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1997, -1912),     "MQ Dragon Room Submerged Crate 3",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4]       = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1997, -1972),     "MQ Dragon Room Submerged Crate 4",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1]            = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1092, -1926),     "MQ Dragon Room Door Crate 1",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2]            = Location::Crate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1153, -1926),     "MQ Dragon Room Door Crate 2",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE]                 = Location::Crate(RC_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE,                 RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1257, -1567),     "MQ BK Room Upper Crate",                 RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE));
+    locationTable[RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1]               = Location::Crate(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1,               RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1289, -1205),     "MQ BK Room Lower Crate 1",               RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2]               = Location::Crate(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2,               RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-985, -1333),      "MQ BK Room Lower Crate 2",               RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3]               = Location::Crate(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3,               RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1297, -1300),     "MQ BK Room Lower Crate 3",               RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4]               = Location::Crate(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4,               RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1069, -1402),     "MQ BK Room Lower Crate 4",               RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1]             = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1,             RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-11, -2075),       "MQ Whirlpool Front Crate 1",             RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2]             = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2,             RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-371, -2077),      "MQ Whirlpool Front Crate 2",             RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-455, -2394),      "MQ Whirlpool Submerged Crate 1",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-498, -2661),      "MQ Whirlpool Submerged Crate 2",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(11, -2737),        "MQ Whirlpool Submerged Crate 3",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-251, -2731),      "MQ Whirlpool Submerged Crate 4",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-119, -2481),      "MQ Whirlpool Submerged Crate 5",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6]         = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6,         RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(126, -2485),       "MQ Whirlpool Submerged Crate 6",         RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1]       = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-7, -3126),        "MQ Whirlpool Behind Gate Crate 1",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2]       = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-87, -3126),       "MQ Whirlpool Behind Gate Crate 2",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3]       = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-303, -3126),      "MQ Whirlpool Behind Gate Crate 3",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4]       = Location::Crate(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4,       RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-390, -3126),      "MQ Whirlpool Behind Gate Crate 4",       RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE]            = Location::Crate(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE,            RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-397, -3818),      "MQ Dodongo Room Upper Crate",            RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE));
+    locationTable[RC_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE]             = Location::Crate(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE,             RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(30, -3215),        "MQ Dodongo Room Hall Crate",             RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE));
+    locationTable[RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1]          = Location::Crate(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1,          RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-85, -3460),       "MQ Dodongo Room Lower Crate 1",          RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2]          = Location::Crate(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2,          RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-271, -3826),      "MQ Dodongo Room Lower Crate 2",          RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3]          = Location::Crate(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3,          RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(36, -3700),        "MQ Dodongo Room Lower Crate 3",          RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1436, -2766),     "MQ Storage Room B Crate 1",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1125, -2866),     "MQ Storage Room B Crate 2",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1125, -2926),     "MQ Storage Room B Crate 3",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1435, -2935),     "MQ Storage Room B Crate 4",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5]              = Location::Crate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5,              RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1436, -2875),     "MQ Storage Room B Crate 5",              RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-994, 744),        "MQ Triple Torch Room Submerged Crate 1", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-991, 976),        "MQ Triple Torch Room Submerged Crate 2", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1511, 975),       "MQ Triple Torch Room Submerged Crate 3", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1571, 792),       "MQ Triple Torch Room Submerged Crate 4", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1571, 975),       "MQ Triple Torch Room Submerged Crate 5", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6] = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1571, 744),       "MQ Triple Torch Room Submerged Crate 6", RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1]      = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2183, 977),       "MQ Triple Torch Room Gate Crate 1",      RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3]      = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2260, 744),       "MQ Triple Torch Room Gate Crate 3",      RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2]      = Location::Crate(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2200, 743),       "MQ Triple Torch Room Gate Crate 2",      RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1]                     = Location::Crate(RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1,                     RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(510, -1558),       "MQ Statue Crate 1",                      RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2]                     = Location::Crate(RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2,                     RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(570, -1558),       "MQ Statue Crate 2",                      RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1]                 = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1,                 RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-150, -1138),      "MQ Big Mirror Crate 1",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2]                 = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2,                 RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(270, -1138),       "MQ Big Mirror Crate 2",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3]                 = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3,                 RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-150, -1186),      "MQ Big Mirror Crate 3",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4]                 = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4,                 RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(270, -1186),       "MQ Big Mirror Crate 4",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4));
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE]                = Location::Crate(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE,                RCQUEST_MQ,      RCAREA_GERUDO_TRAINING_GROUND, SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(-59, -1598),       "MQ Maze Crate",                          RHT_CRATE_GERUDO_TRAINING_GROUND,   RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE));
+
+    // Small Crates
+    //            Randomizer Check                                 	            Randomizer Check                                                     Quest            Area                           Scene ID                        Params                              Short Name                    	                Hint Text Key                       Vanilla                 Spoiler Collection Check
+    locationTable[RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1]      = Location::SmallCrate(RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1,      RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-141, -1945),      "Platform Room Small Crate 1",            RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1));
+    locationTable[RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2]      = Location::SmallCrate(RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2,      RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-189, -1925),      "Platform Room Small Crate 2",            RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1]            = Location::SmallCrate(RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1,            RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2030, -1172),     "After Hammer Small Crate 1",             RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2]            = Location::SmallCrate(RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2,            RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2072, -1135),     "After Hammer Small Crate 2",             RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2));
+    locationTable[RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1]    = Location::SmallCrate(RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1,    RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-971, -940),       "Before Child Climb Small Crate 1",       RHT_CRATE_SPIRIT_TEMPLE,            RG_BOMBS_5,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1));
+    locationTable[RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2]    = Location::SmallCrate(RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2,    RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1151, -939),      "Before Child Climb Small Crate 2",       RHT_CRATE_SPIRIT_TEMPLE,            RG_DEKU_NUTS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1]  = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1,  RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-512, -4592),      "MQ Triple Hallway Small Crate 1",        RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2]  = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2,  RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-666, -4671),      "MQ Triple Hallway Small Crate 2",        RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1]        = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1,        RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-1381, -2115),     "MQ Jigglies Small Crate 1",              RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2]        = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2,        RCQUEST_MQ,      RCAREA_JABU_JABUS_BELLY,       SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-1341, -2116),     "MQ Jigglies Small Crate 2",              RHT_CRATE_JABU_JABU,                RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1]  = Location::SmallCrate(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1,  RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,          SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(1599, -1322),      "MQ Frozen Eye Switch Small Crate 1",     RHT_CRATE_FOREST_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2]  = Location::SmallCrate(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2,  RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,          SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(2364, -873),       "MQ Frozen Eye Switch Small Crate 2",     RHT_CRATE_FOREST_TEMPLE,            RG_ARROWS_5,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3]  = Location::SmallCrate(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3,  RCQUEST_MQ,      RCAREA_FOREST_TEMPLE,          SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(2312, -874),       "MQ Frozen Eye Switch Small Crate 3",     RHT_CRATE_FOREST_TEMPLE,            RG_ARROWS_5,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1]  = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1,  RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1699, 1290),       "MQ Lizalfos Maze Upper Small Crate 1",   RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2]  = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2,  RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1699, 1332),       "MQ Lizalfos Maze Upper Small Crate 2",   RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1]           = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(460, 370),         "MQ Lava Torch Small Crate 1",            RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2]           = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1405, -975),       "MQ Lava Torch Small Crate 2",            RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3]           = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(685, 183),         "MQ Lava Torch Small Crate 3",            RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4]           = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1210, 163),        "MQ Lava Torch Small Crate 4",            RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5]           = Location::SmallCrate(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5,           RCQUEST_MQ,      RCAREA_FIRE_TEMPLE,            SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1267, 200),        "MQ Lava Torch Small Crate 5",            RHT_CRATE_FIRE_TEMPLE,              RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1] = Location::SmallCrate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2210, -1952),     "MQ Dragon Room Torches Small Crate 1",   RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2] = Location::SmallCrate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2210, -1911),     "MQ Dragon Room Torches Small Crate 2",   RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3] = Location::SmallCrate(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2210, -1991),     "MQ Dragon Room Torches Small Crate 3",   RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1]      = Location::SmallCrate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1470, -622),       "MQ Storage Room A Small Crate 1",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2]      = Location::SmallCrate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1341, -621),       "MQ Storage Room A Small Crate 2",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3]      = Location::SmallCrate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1393, -621),       "MQ Storage Room A Small Crate 3",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4]      = Location::SmallCrate(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4,      RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1284, -621),       "MQ Storage Room A Small Crate 4",        RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE] = Location::SmallCrate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1166, 97),        "MQ GS Storage Room Lower Small Crate",   RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE] = Location::SmallCrate(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE, RCQUEST_MQ,      RCAREA_WATER_TEMPLE,           SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-992, 382),        "MQ GS Storage Room Upper Small Crate",   RHT_CRATE_WATER_TEMPLE,             RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE));
+    locationTable[RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1]      = Location::SmallCrate(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1,      RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,          SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(365, 52),          "MQ Truth Spinner Small Crate 1",         RHT_CRATE_SHADOW_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2]      = Location::SmallCrate(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2,      RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,          SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(363, -62),         "MQ Truth Spinner Small Crate 2",         RHT_CRATE_SHADOW_TEMPLE,            RG_BOMBS_5,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3]      = Location::SmallCrate(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3,      RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,          SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(363, -7),          "MQ Truth Spinner Small Crate 3",         RHT_CRATE_SHADOW_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3));
+    locationTable[RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4]      = Location::SmallCrate(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4,      RCQUEST_MQ,      RCAREA_SHADOW_TEMPLE,          SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(366, 114),         "MQ Truth Spinner Small Crate 4",         RHT_CRATE_SHADOW_TEMPLE,            RG_ARROWS_10,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE]               = Location::SmallCrate(RC_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE,               RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-271, -983),       "MQ Statue Small Crate",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE]               = Location::SmallCrate(RC_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE,               RCQUEST_MQ,      RCAREA_SPIRIT_TEMPLE,          SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(1382, 190),        "MQ Beamos Small Crate",                  RHT_CRATE_SPIRIT_TEMPLE,            RG_GREEN_RUPEE,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE));
+
+    // clang-format on
+}
+
+static ObjectExtension::Register<CrateIdentity> RegisterCrateIdentity;
+static ObjectExtension::Register<SmallCrateIdentity> RegisterSmallCrateIdentity;
+static RegisterShipInitFunc initFunc(RegisterShuffleCrates, { "IS_RANDO" });
+static RegisterShipInitFunc locFunc(Rando::StaticData::RegisterCrateLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
index d771c58f3a..666ba0a21c 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
@@ -1,18 +1,28 @@
-#include "ShuffleFairies.h"
+#include "soh/OTRGlobals.h"
 #include "randomizer_grotto.h"
 #include "draw.h"
+#include "soh/cvar_prefixes.h"
+#include "static_data.h"
+#include "soh/Enhancements/item-tables/ItemTableTypes.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+
+extern "C" {
 #include "src/overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h"
 #include "src/overlays/actors/ovl_En_Gs/z_en_gs.h"
 #include "src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h"
-#include "../../OTRGlobals.h"
-#include "../../cvar_prefixes.h"
-#include "static_data.h"
+}
 
 #define FAIRY_FLAG_TIMED (1 << 8)
 
 void ShuffleFairies_DrawRandomizedItem(EnElf* enElf, PlayState* play) {
-    GetItemEntry randoGetItem = enElf->sohFairyIdentity.itemEntry;
+    const auto fairyIdentity = ObjectExtension::GetInstance().Get<FairyIdentity>(&enElf->actor);
+    if (fairyIdentity == nullptr) {
+        return;
+    }
+
+    GetItemEntry randoGetItem =
+        Rando::Context::GetInstance()->GetFinalGIEntry(fairyIdentity->randomizerCheck, true, GI_FAIRY);
     if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
         randoGetItem = GET_ITEM_MYSTERY;
     }
@@ -32,8 +42,8 @@ bool ShuffleFairies_FairyExists(FairyIdentity fairyIdentity) {
         if (actor->id != ACTOR_EN_ELF) {
             actor = actor->next;
         } else {
-            EnElf* enElf = (EnElf*)(actor);
-            if (fairyIdentity.randomizerInf == enElf->sohFairyIdentity.randomizerInf) {
+            const auto actorFairyIdentity = ObjectExtension::GetInstance().Get<FairyIdentity>(&actor);
+            if (actorFairyIdentity != nullptr && fairyIdentity.randomizerInf == actorFairyIdentity->randomizerInf) {
                 return true;
             }
             actor = actor->next;
@@ -52,100 +62,108 @@ FairyIdentity ShuffleFairies_GetFairyIdentity(int32_t params) {
         sceneNum = SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY;
     }
 
-    Rando::Location* location = OTRGlobals::Instance->gRandomizer->GetCheckObjectFromActor(ACTOR_EN_ELF, sceneNum, params);
+    Rando::Location* location =
+        OTRGlobals::Instance->gRandomizer->GetCheckObjectFromActor(ACTOR_EN_ELF, sceneNum, params);
 
     if (location->GetRandomizerCheck() == RC_UNKNOWN_CHECK) {
         LUSLOG_WARN("FairyGetIdentity did not receive a valid RC value (%d).", location->GetRandomizerCheck());
         assert(false);
     } else {
         fairyIdentity.randomizerInf = static_cast<RandomizerInf>(location->GetCollectionCheck().flag);
-        fairyIdentity.itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(location->GetRandomizerCheck(), true, GI_FAIRY);
+        fairyIdentity.randomizerCheck = location->GetRandomizerCheck();
     }
 
     return fairyIdentity;
 }
 
-bool ShuffleFairies_SpawnFairy(f32 posX, f32 posY, f32 posZ, int32_t params) {
+static bool SpawnFairy(f32 posX, f32 posY, f32 posZ, int32_t params, FairyType fairyType) {
     FairyIdentity fairyIdentity = ShuffleFairies_GetFairyIdentity(params);
     if (!Flags_GetRandomizerInf(fairyIdentity.randomizerInf)) {
-        EnElf* fairy = (EnElf*)Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_ELF, posX, posY - 30.0f, posZ, 0,
-                                           0, 0, FAIRY_HEAL, true);
-        fairy->sohFairyIdentity = fairyIdentity;
-        fairy->actor.draw = (ActorFunc)ShuffleFairies_DrawRandomizedItem;
+        Actor* fairy = Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_ELF, posX, posY - 30.0f, posZ, 0, 0, 0,
+                                   fairyType, true);
+        ObjectExtension::GetInstance().Set<FairyIdentity>(fairy, std::move(fairyIdentity));
+        fairy->draw = (ActorFunc)ShuffleFairies_DrawRandomizedItem;
         return true;
     }
     return false;
 }
 
-void ShuffleFairies_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
-    va_list args;
-    va_copy(args, originalArgs);
-
-    Actor* actor = va_arg(args, Actor*);
-
-    va_end(args);
+void RegisterShuffleFairies() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_FAIRIES);
 
     // Grant item when picking up fairy.
-    if (id == VB_FAIRY_HEAL) {
-        EnElf* enElf = (EnElf*)(actor);
-        if (enElf->sohFairyIdentity.randomizerInf && enElf->sohFairyIdentity.randomizerInf != RAND_INF_MAX) {
-            Flags_SetRandomizerInf(enElf->sohFairyIdentity.randomizerInf);
+    COND_VB_SHOULD(VB_FAIRY_HEAL, shouldRegister, {
+        EnElf* enElf = va_arg(args, EnElf*);
+
+        const auto fairyIdentity = ObjectExtension::GetInstance().Get<FairyIdentity>(&enElf->actor);
+        if (fairyIdentity == nullptr) {
+            return;
         }
+
+        if (fairyIdentity != nullptr && fairyIdentity->randomizerInf && fairyIdentity->randomizerInf != RAND_INF_MAX) {
+            Flags_SetRandomizerInf(fairyIdentity->randomizerInf);
+        }
+    });
+
     // Spawn fairies in fairy fountains
-    } else if (id == VB_SPAWN_FOUNTAIN_FAIRIES) {
+    COND_VB_SHOULD(VB_SPAWN_FOUNTAIN_FAIRIES, shouldRegister, {
+        Actor* actor = va_arg(args, Actor*);
         bool fairySpawned = false;
         s16 grottoId = (gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN) ? Grotto_CurrentGrotto() : 0;
         for (s16 index = 0; index < 8; index++) {
             int32_t params = (grottoId << 8) | index;
-            if (ShuffleFairies_SpawnFairy(actor->world.pos.x, actor->world.pos.y, actor->world.pos.z,
-                params)) {
+            if (SpawnFairy(actor->world.pos.x, actor->world.pos.y, actor->world.pos.z, params, FAIRY_HEAL)) {
                 fairySpawned = true;
             }
         }
         if (fairySpawned) {
             *should = false;
         }
+    });
+
     // Spawn 3 fairies when playing Song of Storms next to a planted bean
-    } else if (id == VB_SPAWN_BEAN_STALK_FAIRIES) {
-        ObjBean* objBean = (ObjBean*)(actor);
+    COND_VB_SHOULD(VB_SPAWN_BEAN_STALK_FAIRIES, shouldRegister, {
+        ObjBean* objBean = va_arg(args, ObjBean*);
         bool fairySpawned = false;
         for (s16 index = 0; index < 3; index++) {
             int32_t params = ((objBean->dyna.actor.params & 0x3F) << 8) | index;
-            if (ShuffleFairies_SpawnFairy(objBean->dyna.actor.world.pos.x, objBean->dyna.actor.world.pos.y,
-                objBean->dyna.actor.world.pos.z,
-                params)) {
+            if (SpawnFairy(objBean->dyna.actor.world.pos.x, objBean->dyna.actor.world.pos.y,
+                           objBean->dyna.actor.world.pos.z, params, FAIRY_HEAL)) {
                 fairySpawned = true;
             }
         }
         if (fairySpawned) {
             *should = false;
         }
+    });
+
     // Spawn a fairy from a ShotSun when playing the right song near it
-    } else if (id == VB_SPAWN_SONG_FAIRY) {
-        ShotSun* shotSun = (ShotSun*)(actor);
-        if (ShuffleFairies_SpawnFairy(shotSun->actor.world.pos.x, shotSun->actor.world.pos.y,
-            shotSun->actor.world.pos.z,
-            TWO_ACTOR_PARAMS(0x1000, (int32_t)shotSun->actor.world.pos.z))) {
+    COND_VB_SHOULD(VB_SPAWN_SONG_FAIRY, shouldRegister, {
+        ShotSun* shotSun = va_arg(args, ShotSun*);
+        if (SpawnFairy(shotSun->actor.world.pos.x, shotSun->actor.world.pos.y, shotSun->actor.world.pos.z,
+                       TWO_ACTOR_PARAMS(0x1000, (int32_t)shotSun->actor.world.pos.z), FAIRY_HEAL_BIG)) {
             *should = false;
         }
+    });
+
     // Handle playing both misc songs and song of storms in front of a gossip stone.
-    } else if (id == VB_SPAWN_GOSSIP_STONE_FAIRY) {
-        EnGs* gossipStone = (EnGs*)(actor);
+    COND_VB_SHOULD(VB_SPAWN_GOSSIP_STONE_FAIRY, shouldRegister, {
+        EnGs* gossipStone = va_arg(args, EnGs*);
+        FairyType fairyType = FAIRY_HEAL;
 
         // Mimic vanilla behaviour, only go into this path if song played is one of the ones normally spawning a fairy.
         // Otherwise fall back to vanilla behaviour.
         if (gPlayState->msgCtx.ocarinaMode == OCARINA_MODE_04 &&
             (gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_LULLABY ||
-                gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_SARIAS ||
-                gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_EPONAS ||
-                gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_SUNS || 
-                gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_TIME ||
-                gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_STORMS)) {
+             gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_SARIAS || gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_EPONAS ||
+             gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_SUNS || gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_TIME ||
+             gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_STORMS)) {
 
             int32_t params = (gPlayState->sceneNum == SCENE_GROTTOS) ? Grotto_CurrentGrotto() : 0;
             // Distinguish storms fairies from the normal song fairies
             if (gPlayState->msgCtx.unk_E3F2 == OCARINA_SONG_STORMS) {
                 params |= 0x1000;
+                fairyType = FAIRY_HEAL_BIG;
             }
 
             // Combine actor + song params with position to get the right randomizer check
@@ -158,8 +176,8 @@ void ShuffleFairies_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should,
             // collected, the vanilla code will handle that part automatically.
             FairyIdentity fairyIdentity = ShuffleFairies_GetFairyIdentity(params);
             if (!ShuffleFairies_FairyExists(fairyIdentity)) {
-                if (ShuffleFairies_SpawnFairy(gossipStone->actor.world.pos.x, gossipStone->actor.world.pos.y,
-                                                gossipStone->actor.world.pos.z, params)) {
+                if (SpawnFairy(gossipStone->actor.world.pos.x, gossipStone->actor.world.pos.y,
+                               gossipStone->actor.world.pos.z, params, fairyType)) {
                     Audio_PlayActorSound2(&gossipStone->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY);
                     // Set vanilla check for fairy spawned so it doesn't spawn the vanilla fairy afterwards as well.
                     gossipStone->unk_19D = 0;
@@ -169,241 +187,238 @@ void ShuffleFairies_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should,
                 *should = false;
             }
         }
-    }
-}
-
-uint32_t onVanillaBehaviorHook = 0;
-
-void ShuffleFairies_RegisterHooks() {
-    onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(ShuffleFairies_OnVanillaBehaviorHandler);
-}
-
-void ShuffleFairies_UnregisterHooks() {
-    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
-
-    onVanillaBehaviorHook = 0;
+    });
 }
 
 void Rando::StaticData::RegisterFairyLocations() {
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_1] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_1,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1800,                          "Grotto Fairy 1",                                     "SFM Grotto Fairy 1",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_2] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_2,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1801,                          "Grotto Fairy 2",                                     "SFM Grotto Fairy 2",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_3] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_3,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1802,                          "Grotto Fairy 3",                                     "SFM Grotto Fairy 3",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_4] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_4,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1803,                          "Grotto Fairy 4",                                     "SFM Grotto Fairy 4",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_5] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_5,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1804,                          "Grotto Fairy 5",                                     "SFM Grotto Fairy 5",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_6] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_6,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1805,                          "Grotto Fairy 6",                                     "SFM Grotto Fairy 6",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_7] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_7,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1806,                          "Grotto Fairy 7",                                     "SFM Grotto Fairy 7",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7));
-    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_8] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_8,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1807,                          "Grotto Fairy 8",                                     "SFM Grotto Fairy 8",                                 RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0300,                          "Grotto Fairy 1",                                     "ZR Grotto Fairy 1",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0301,                          "Grotto Fairy 2",                                     "ZR Grotto Fairy 2",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0302,                          "Grotto Fairy 3",                                     "ZR Grotto Fairy 3",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0303,                          "Grotto Fairy 4",                                     "ZR Grotto Fairy 4",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0304,                          "Grotto Fairy 5",                                     "ZR Grotto Fairy 5",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0305,                          "Grotto Fairy 6",                                     "ZR Grotto Fairy 6",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0306,                          "Grotto Fairy 7",                                     "ZR Grotto Fairy 7",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7));
-    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0307,                          "Grotto Fairy 8",                                     "ZR Grotto Fairy 8",                                  RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F00,                          "Grotto Fairy 1",                                     "HF Grotto Fairy 1",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_1));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F01,                          "Grotto Fairy 2",                                     "HF Grotto Fairy 2",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_2));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F02,                          "Grotto Fairy 3",                                     "HF Grotto Fairy 3",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_3));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F03,                          "Grotto Fairy 4",                                     "HF Grotto Fairy 4",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_4));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F04,                          "Grotto Fairy 5",                                     "HF Grotto Fairy 5",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_5));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F05,                          "Grotto Fairy 6",                                     "HF Grotto Fairy 6",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_6));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F06,                          "Grotto Fairy 7",                                     "HF Grotto Fairy 7",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_7));
-    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F07,                          "Grotto Fairy 8",                                     "HF Grotto Fairy 8",                                  RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_8));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C00,                          "Grotto Fairy 1",                                     "ZD Grotto Fairy 1",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C01,                          "Grotto Fairy 2",                                     "ZD Grotto Fairy 2",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C02,                          "Grotto Fairy 3",                                     "ZD Grotto Fairy 3",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C03,                          "Grotto Fairy 4",                                     "ZD Grotto Fairy 4",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C04,                          "Grotto Fairy 5",                                     "ZD Grotto Fairy 5",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C05,                          "Grotto Fairy 6",                                     "ZD Grotto Fairy 6",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C06,                          "Grotto Fairy 7",                                     "ZD Grotto Fairy 7",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7));
-    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C07,                          "Grotto Fairy 8",                                     "ZD Grotto Fairy 8",                                  RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D00,                          "Grotto Fairy 1",                                     "GF Grotto Fairy 1",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_1));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D01,                          "Grotto Fairy 2",                                     "GF Grotto Fairy 2",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_2));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D02,                          "Grotto Fairy 3",                                     "GF Grotto Fairy 3",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_3));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D03,                          "Grotto Fairy 4",                                     "GF Grotto Fairy 4",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_4));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D04,                          "Grotto Fairy 5",                                     "GF Grotto Fairy 5",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_5));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D05,                          "Grotto Fairy 6",                                     "GF Grotto Fairy 6",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_6));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D06,                          "Grotto Fairy 7",                                     "GF Grotto Fairy 7",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_7));
-    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D07,                          "Grotto Fairy 8",                                     "GF Grotto Fairy 8",                                  RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_8));
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_1] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_1,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1800,                          "Fairy Grotto Fairy 1",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_2] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_2,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1801,                          "Fairy Grotto Fairy 2",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_3] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_3,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1802,                          "Fairy Grotto Fairy 3",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_4] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_4,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1803,                          "Fairy Grotto Fairy 4",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_5] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_5,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1804,                          "Fairy Grotto Fairy 5",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_6] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_6,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1805,                          "Fairy Grotto Fairy 6",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_7] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_7,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1806,                          "Fairy Grotto Fairy 7",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7));
+    locationTable[RC_SFM_FAIRY_GROTTO_FAIRY_8] =                        Location::Fairy(RC_SFM_FAIRY_GROTTO_FAIRY_8,                        RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_FAIRYS_FOUNTAIN,              0x1807,                          "Fairy Grotto Fairy 8",                               RHT_SFM_FAIRY_GROTTO_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0300,                          "Fairy Grotto Fairy 1",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0301,                          "Fairy Grotto Fairy 2",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0302,                          "Fairy Grotto Fairy 3",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0303,                          "Fairy Grotto Fairy 4",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0304,                          "Fairy Grotto Fairy 5",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0305,                          "Fairy Grotto Fairy 6",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0306,                          "Fairy Grotto Fairy 7",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7));
+    locationTable[RC_ZR_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_ZR_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_FAIRYS_FOUNTAIN,              0x0307,                          "Fairy Grotto Fairy 8",                               RHT_ZR_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F00,                          "Fairy Grotto Fairy 1",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_1));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F01,                          "Fairy Grotto Fairy 2",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_2));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F02,                          "Fairy Grotto Fairy 3",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_3));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F03,                          "Fairy Grotto Fairy 4",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_4));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F04,                          "Fairy Grotto Fairy 5",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_5));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F05,                          "Fairy Grotto Fairy 6",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_6));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F06,                          "Fairy Grotto Fairy 7",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_7));
+    locationTable[RC_HF_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_HF_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_FAIRYS_FOUNTAIN,              0x0F07,                          "Fairy Grotto Fairy 8",                               RHT_HF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FAIRY_GROTTO_FAIRY_8));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C00,                          "Fairy Grotto Fairy 1",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C01,                          "Fairy Grotto Fairy 2",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C02,                          "Fairy Grotto Fairy 3",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C03,                          "Fairy Grotto Fairy 4",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C04,                          "Fairy Grotto Fairy 5",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C05,                          "Fairy Grotto Fairy 6",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C06,                          "Fairy Grotto Fairy 7",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7));
+    locationTable[RC_ZD_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_ZD_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_FAIRYS_FOUNTAIN,              0x1C07,                          "Fairy Grotto Fairy 8",                               RHT_ZD_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_1] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D00,                          "Fairy Grotto Fairy 1",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_1));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_2] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D01,                          "Fairy Grotto Fairy 2",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_2));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_3] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D02,                          "Fairy Grotto Fairy 3",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_3));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_4] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_4,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D03,                          "Fairy Grotto Fairy 4",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_4));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_5] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_5,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D04,                          "Fairy Grotto Fairy 5",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_5));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_6] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_6,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D05,                          "Fairy Grotto Fairy 6",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_6));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_7] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_7,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D06,                          "Fairy Grotto Fairy 7",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_7));
+    locationTable[RC_GF_FAIRY_GROTTO_FAIRY_8] =                         Location::Fairy(RC_GF_FAIRY_GROTTO_FAIRY_8,                         RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_FAIRYS_FOUNTAIN,              0x1D07,                          "Fairy Grotto Fairy 8",                               RHT_GF_FAIRY_GROTTO_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_FAIRY_GROTTO_FAIRY_8));
 
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_1] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_1,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x00,                          "Shield Grave Fairy 1",                               "Shield Grave Fairy 1",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_2] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_2,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x01,                          "Shield Grave Fairy 2",                               "Shield Grave Fairy 2",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_3] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_3,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x02,                          "Shield Grave Fairy 3",                               "Shield Grave Fairy 3",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_4] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_4,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x03,                          "Shield Grave Fairy 4",                               "Shield Grave Fairy 4",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_5] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_5,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x04,                          "Shield Grave Fairy 5",                               "Shield Grave Fairy 5",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_6] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_6,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x05,                          "Shield Grave Fairy 6",                               "Shield Grave Fairy 6",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_7] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_7,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x06,                          "Shield Grave Fairy 7",                               "Shield Grave Fairy 7",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7));
-    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_8] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_8,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x07,                          "Shield Grave Fairy 8",                               "Shield Grave Fairy 8",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_1] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_1,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x00,                          "Scrubs Fairy 1",                                     "Scrubs Fairy 1",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_2] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_2,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x01,                          "Scrubs Fairy 2",                                     "Scrubs Fairy 2",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_3] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_3,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x02,                          "Scrubs Fairy 3",                                     "Scrubs Fairy 3",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_4] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_4,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x03,                          "Scrubs Fairy 4",                                     "Scrubs Fairy 4",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_5] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_5,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x04,                          "Scrubs Fairy 5",                                     "Scrubs Fairy 5",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_6] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_6,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x05,                          "Scrubs Fairy 6",                                     "Scrubs Fairy 6",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_7] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_7,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x06,                          "Scrubs Fairy 7",                                     "Scrubs Fairy 7",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7));
-    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_8] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_8,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x07,                          "Scrubs Fairy 8",                                     "Scrubs Fairy 8",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x00,                          "MQ Scrubs Fairy 1",                                  "MQ Scrubs Fairy 1",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x01,                          "MQ Scrubs Fairy 2",                                  "MQ Scrubs Fairy 2",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x02,                          "MQ Scrubs Fairy 3",                                  "MQ Scrubs Fairy 3",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x03,                          "MQ Scrubs Fairy 4",                                  "MQ Scrubs Fairy 4",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x04,                          "MQ Scrubs Fairy 5",                                  "MQ Scrubs Fairy 5",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x05,                          "MQ Scrubs Fairy 6",                                  "MQ Scrubs Fairy 6",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x06,                          "MQ Scrubs Fairy 7",                                  "MQ Scrubs Fairy 7",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7));
-    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x07,                          "MQ Scrubs Fairy 8",                                  "MQ Scrubs Fairy 8",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_1] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x00,                          "Oasis Fairy 1",                                      "Oasis Fairy 1",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_1));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_2] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x01,                          "Oasis Fairy 2",                                      "Oasis Fairy 2",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_2));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_3] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x02,                          "Oasis Fairy 3",                                      "Oasis Fairy 3",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_3));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_4] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_4,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x03,                          "Oasis Fairy 4",                                      "Oasis Fairy 4",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_4));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_5] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_5,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x04,                          "Oasis Fairy 5",                                      "Oasis Fairy 5",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_5));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_6] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_6,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x05,                          "Oasis Fairy 6",                                      "Oasis Fairy 6",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_6));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_7] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_7,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x06,                          "Oasis Fairy 7",                                      "Oasis Fairy 7",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_7));
-    locationTable[RC_COLOSSUS_OASIS_FAIRY_8] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_8,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x07,                          "Oasis Fairy 8",                                      "Oasis Fairy 8",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_8));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_1] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_1,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x00,                          "Shield Grave Fairy 1",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_2] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_2,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x01,                          "Shield Grave Fairy 2",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_3] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_3,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x02,                          "Shield Grave Fairy 3",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_4] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_4,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x03,                          "Shield Grave Fairy 4",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_5] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_5,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x04,                          "Shield Grave Fairy 5",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_6] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_6,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x05,                          "Shield Grave Fairy 6",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_7] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_7,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x06,                          "Shield Grave Fairy 7",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7));
+    locationTable[RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_8] =                  Location::Fairy(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_8,                  RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,     0x07,                          "Shield Grave Fairy 8",                               RHT_GRAVEYARD_SHIELD_GRAVE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_1] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_1,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x00,                          "Scrubs Fairy 1",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_2] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_2,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x01,                          "Scrubs Fairy 2",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_3] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_3,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x02,                          "Scrubs Fairy 3",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_4] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_4,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x03,                          "Scrubs Fairy 4",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_5] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_5,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x04,                          "Scrubs Fairy 5",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_6] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_6,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x05,                          "Scrubs Fairy 6",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_7] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_7,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x06,                          "Scrubs Fairy 7",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7));
+    locationTable[RC_GANONS_CASTLE_SCRUBS_FAIRY_8] =                    Location::Fairy(RC_GANONS_CASTLE_SCRUBS_FAIRY_8,                    RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x07,                          "Scrubs Fairy 8",                                     RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x00,                          "MQ Scrubs Fairy 1",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x01,                          "MQ Scrubs Fairy 2",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x02,                          "MQ Scrubs Fairy 3",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x03,                          "MQ Scrubs Fairy 4",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x04,                          "MQ Scrubs Fairy 5",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x05,                          "MQ Scrubs Fairy 6",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x06,                          "MQ Scrubs Fairy 7",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7));
+    locationTable[RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8] =                 Location::Fairy(RC_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8,                 RCQUEST_MQ,     RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,           0x07,                          "MQ Scrubs Fairy 8",                                  RHT_GANONS_CASTLE_SCRUBS_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_1] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x00,                          "Oasis Fairy 1",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_1));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_2] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x01,                          "Oasis Fairy 2",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_2));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_3] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x02,                          "Oasis Fairy 3",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_3));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_4] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_4,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x03,                          "Oasis Fairy 4",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_4));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_5] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_5,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x04,                          "Oasis Fairy 5",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_5));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_6] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_6,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x05,                          "Oasis Fairy 6",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_6));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_7] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_7,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x06,                          "Oasis Fairy 7",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_7));
+    locationTable[RC_COLOSSUS_OASIS_FAIRY_8] =                          Location::Fairy(RC_COLOSSUS_OASIS_FAIRY_8,                          RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,                0x07,                          "Oasis Fairy 8",                                      RHT_COLOSSUS_OASIS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_OASIS_FAIRY_8));
 
-    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0300,                          "Bean Sprout Fairy 1",                                "ZR Bean Sprout Fairy 1",                             RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0301,                          "Bean Sprout Fairy 2",                                "ZR Bean Sprout Fairy 2",                             RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0302,                          "Bean Sprout Fairy 3",                                "ZR Bean Sprout Fairy 3",                             RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_KF_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0900,                          "Bean Sprout Fairy 1",                                "KF Bean Sprout Fairy 1",                             RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_KF_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0901,                          "Bean Sprout Fairy 2",                                "KF Bean Sprout Fairy 2",                             RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_KF_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0902,                          "Bean Sprout Fairy 3",                                "KF Bean Sprout Fairy 3",                             RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0400,                          "Bean Sprout Near Bridge Fairy 1",                    "LW Bean Sprout Near Bridge Fairy 1",                 RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0401,                          "Bean Sprout Near Bridge Fairy 2",                    "LW Bean Sprout Near Bridge Fairy 2",                 RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0402,                          "Bean Sprout Near Bridge Fairy 3",                    "LW Bean Sprout Near Bridge Fairy 3",                 RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1200,                          "Bean Sprout Near Theatre Fairy 1",                   "LW Bean Sprout Near Theatre Fairy 1",                RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1201,                          "Bean Sprout Near Theatre Fairy 2",                   "LW Bean Sprout Near Theatre Fairy 2",                RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2));
-    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1202,                          "Bean Sprout Near Theatre Fairy 3",                   "LW Bean Sprout Near Theatre Fairy 3",                RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3));
-    locationTable[RC_LH_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0100,                          "Bean Sprout Fairy 1",                                "LH Bean Sprout Fairy 1",                             RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_LH_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0101,                          "Bean Sprout Fairy 2",                                "LH Bean Sprout Fairy 2",                             RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_LH_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0102,                          "Bean Sprout Fairy 3",                                "LH Bean Sprout Fairy 3",                             RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_GV_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0300,                          "Bean Sprout Fairy 1",                                "GV Bean Sprout Fairy 1",                             RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_GV_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0301,                          "Bean Sprout Fairy 2",                                "GV Bean Sprout Fairy 2",                             RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_GV_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0302,                          "Bean Sprout Fairy 3",                                "GV Bean Sprout Fairy 3",                             RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_1] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_1,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1800,                          "Bean Sprout Fairy 1",                                "Col Bean Sprout Fairy 1",                            RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_2] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_2,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1801,                          "Bean Sprout Fairy 2",                                "Col Bean Sprout Fairy 2",                            RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_3] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_3,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1802,                          "Bean Sprout Fairy 3",                                "Col Bean Sprout Fairy 3",                            RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_1] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_1,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0300,                          "Bean Sprout Fairy 1",                                "GY Bean Sprout Fairy 1",                             RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_2] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_2,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0301,                          "Bean Sprout Fairy 2",                                "GY Bean Sprout Fairy 2",                             RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_3] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_3,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0302,                          "Bean Sprout Fairy 3",                                "GY Bean Sprout Fairy 3",                             RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_1] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0300,                          "Bean Sprout Fairy 1",                                "DMC Bean Sprout Fairy 1",                            RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_2] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0301,                          "Bean Sprout Fairy 2",                                "DMC Bean Sprout Fairy 2",                            RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_3] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0302,                          "Bean Sprout Fairy 3",                                "DMC Bean Sprout Fairy 3",                            RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_3));
-    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_1] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0600,                          "Bean Sprout Fairy 1",                                "DMT Bean Sprout Fairy 1",                            RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_1));
-    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_2] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0601,                          "Bean Sprout Fairy 2",                                "DMT Bean Sprout Fairy 2",                            RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_2));
-    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_3] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0602,                          "Bean Sprout Fairy 3",                                "DMT Bean Sprout Fairy 3",                            RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0300,                          "Bean Sprout Fairy 1",                                RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0301,                          "Bean Sprout Fairy 2",                                RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_ZR_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_ZR_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  0x0302,                          "Bean Sprout Fairy 3",                                RHT_ZR_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_KF_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0900,                          "Bean Sprout Fairy 1",                                RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_KF_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0901,                          "Bean Sprout Fairy 2",                                RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_KF_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_KF_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                0x0902,                          "Bean Sprout Fairy 3",                                RHT_KF_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0400,                          "Bean Sprout Near Bridge Fairy 1",                    RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0401,                          "Bean Sprout Near Bridge Fairy 2",                    RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3] =              Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3,              RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x0402,                          "Bean Sprout Near Bridge Fairy 3",                    RHT_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1200,                          "Bean Sprout Near Theatre Fairy 1",                   RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1201,                          "Bean Sprout Near Theatre Fairy 2",                   RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2));
+    locationTable[RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3] =             Location::Fairy(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3,             RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   0x1202,                          "Bean Sprout Near Theatre Fairy 3",                   RHT_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3));
+    locationTable[RC_LH_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0100,                          "Bean Sprout Fairy 1",                                RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_LH_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0101,                          "Bean Sprout Fairy 2",                                RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_LH_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_LH_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   0x0102,                          "Bean Sprout Fairy 3",                                RHT_LH_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_GV_BEAN_SPROUT_FAIRY_1] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_1,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0300,                          "Bean Sprout Fairy 1",                                RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_GV_BEAN_SPROUT_FAIRY_2] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_2,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0301,                          "Bean Sprout Fairy 2",                                RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_GV_BEAN_SPROUT_FAIRY_3] =                          Location::Fairy(RC_GV_BEAN_SPROUT_FAIRY_3,                          RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                0x0302,                          "Bean Sprout Fairy 3",                                RHT_GV_BEAN_SPROUT_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_1] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_1,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1800,                          "Bean Sprout Fairy 1",                                RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_2] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_2,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1801,                          "Bean Sprout Fairy 2",                                RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_COLOSSUS_BEAN_SPROUT_FAIRY_3] =                    Location::Fairy(RC_COLOSSUS_BEAN_SPROUT_FAIRY_3,                    RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              0x1802,                          "Bean Sprout Fairy 3",                                RHT_COLOSSUS_BEAN_SPROUT_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_1] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_1,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0300,                          "Bean Sprout Fairy 1",                                RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_2] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_2,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0301,                          "Bean Sprout Fairy 2",                                RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_GRAVEYARD_BEAN_SPROUT_FAIRY_3] =                   Location::Fairy(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_3,                   RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    0x0302,                          "Bean Sprout Fairy 3",                                RHT_GRAVEYARD_BEAN_SPROUT_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_1] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0300,                          "Bean Sprout Fairy 1",                                RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_2] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0301,                          "Bean Sprout Fairy 2",                                RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_DMC_BEAN_SPROUT_FAIRY_3] =                         Location::Fairy(RC_DMC_BEAN_SPROUT_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        0x0302,                          "Bean Sprout Fairy 3",                                RHT_DMC_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_BEAN_SPROUT_FAIRY_3));
+    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_1] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_1,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0600,                          "Bean Sprout Fairy 1",                                RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_1));
+    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_2] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_2,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0601,                          "Bean Sprout Fairy 2",                                RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_2));
+    locationTable[RC_DMT_BEAN_SPROUT_FAIRY_3] =                         Location::Fairy(RC_DMT_BEAN_SPROUT_FAIRY_3,                         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         0x0602,                          "Bean Sprout Fairy 3",                                RHT_DMT_BEAN_SPROUT_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_BEAN_SPROUT_FAIRY_3));
 
-    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -680),  "ToT Left Gossip Stone Fairy",                        "ToT Left Gossip Stone Fairy",                        RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY));
-    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -680),  "ToT Left Gossip Stone Big Fairy",                    "ToT Left Gossip Stone Big Fairy",                    RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -615),  "ToT Left Center Gossip Stone Fairy",                 "ToT Left Center Gossip Stone Fairy",                 RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY));
-    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -615),  "ToT Left Center Gossip Stone Big Fairy",             "ToT Left Center Gossip Stone Big Fairy",             RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -550),  "ToT Right Center Gossip Stone Fairy",                "ToT Right Center Gossip Stone Fairy",                RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY));
-    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -550),  "ToT Right Center Gossip Stone Big Fairy",            "ToT Right Center Gossip Stone Big Fairy",            RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY] =                Location::Fairy(RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY,                RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -485),  "ToT Right Gossip Stone Fairy",                       "ToT Right Gossip Stone Fairy",                       RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY));
-    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG] =            Location::Fairy(RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG,            RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -485),  "ToT Right Gossip Stone Big Fairy",                   "ToT Right Gossip Stone Big Fairy",                   RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DMC_GOSSIP_STONE_FAIRY] =                          Location::Fairy(RC_DMC_GOSSIP_STONE_FAIRY,                          RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        TWO_ACTOR_PARAMS(     0, 1656),  "Gossip Stone Fairy",                                 "DMC Gossip Stone Fairy",                             RHT_DMC_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DMC_GOSSIP_STONE_FAIRY_BIG] =                      Location::Fairy(RC_DMC_GOSSIP_STONE_FAIRY_BIG,                      RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        TWO_ACTOR_PARAMS(0x1000, 1656),  "Gossip Stone Big Fairy",                             "DMC Gossip Stone Big Fairy",                         RHT_DMC_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DMT_GOSSIP_STONE_FAIRY] =                          Location::Fairy(RC_DMT_GOSSIP_STONE_FAIRY,                          RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(     0, -3935), "Gossip Stone Fairy",                                 "DMT Gossip Stone Fairy",                             RHT_DMT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DMT_GOSSIP_STONE_FAIRY_BIG] =                      Location::Fairy(RC_DMT_GOSSIP_STONE_FAIRY_BIG,                      RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(0x1000, -3935), "Gossip Stone Big Fairy",                             "DMT Gossip Stone Big Fairy",                         RHT_DMT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_COLOSSUS_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_COLOSSUS_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              TWO_ACTOR_PARAMS(     0, 1320),  "Gossip Stone Fairy",                                 "Col Gossip Stone Fairy",                             RHT_COLOSSUS_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY));
-    locationTable[RC_COLOSSUS_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_COLOSSUS_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              TWO_ACTOR_PARAMS(0x1000, 1320),  "Gossip Stone Big Fairy",                             "Col Gossip Stone Big Fairy",                         RHT_COLOSSUS_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              RCQUEST_VANILLA,RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(     0, -1520), "Gossip Stone Fairy",                                 "DC Gossip Stone Fairy",                              RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_VANILLA,RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(0x1000, -1520), "Gossip Stone Big Fairy",                             "DC Gossip Stone Big Fairy",                          RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY] =           Location::Fairy(RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY,           RCQUEST_MQ,     RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(     0, -916),  "MQ Gossip Stone Fairy",                              "DC MQ Gossip Stone Fairy",                           RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG] =       Location::Fairy(RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG,       RCQUEST_MQ,     RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(0x1000, -916),  "MQ Gossip Stone Big Fairy",                          "DC MQ Gossip Stone Big Fairy",                       RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_GV_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_GV_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                TWO_ACTOR_PARAMS(     0, -2340), "Gossip Stone Fairy",                                 "GV Gossip Stone Fairy",                              RHT_GV_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_GOSSIP_STONE_FAIRY));
-    locationTable[RC_GV_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_GV_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                TWO_ACTOR_PARAMS(0x1000, -2340), "Gossip Stone Big Fairy",                             "GV Gossip Stone Big Fairy",                          RHT_GV_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_GC_MAZE_GOSSIP_STONE_FAIRY] =                      Location::Fairy(RC_GC_MAZE_GOSSIP_STONE_FAIRY,                      RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(     0, -1265), "Maze Gossip Stone Fairy",                            "GC Maze Gossip Stone Fairy",                         RHT_GC_MAZE_GOSSIP_STONE_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY));
-    locationTable[RC_GC_MAZE_GOSSIP_STONE_FAIRY_BIG] =                  Location::Fairy(RC_GC_MAZE_GOSSIP_STONE_FAIRY_BIG,                  RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(0x1000, -1265), "Maze Gossip Stone Big Fairy",                        "GC Maze Gossip Stone Big Fairy",                     RHT_GC_MAZE_GOSSIP_STONE_FAIRY_BIG,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(     0, 1496),  "Medigoron Gossip Stone Fairy",                       "GC Medigoron Gossip Stone Fairy",                    RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY));
-    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(0x1000, 1496),  "Medigoron Gossip Stone Big Fairy",                   "GC Medigoron Gossip Stone Big Fairy",                RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_GRAVEYARD_GOSSIP_STONE_FAIRY] =                    Location::Fairy(RC_GRAVEYARD_GOSSIP_STONE_FAIRY,                    RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    TWO_ACTOR_PARAMS(     0, -75),   "Gossip Stone Fairy",                                 "GY Gossip Stone Fairy",                              RHT_GRAVEYARD_GOSSIP_STONE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY));
-    locationTable[RC_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG] =                Location::Fairy(RC_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG,                RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    TWO_ACTOR_PARAMS(0x1000, -75),   "Gossip Stone Big Fairy",                             "GY Gossip Stone Big Fairy",                          RHT_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HC_MALON_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_HC_MALON_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(     0, 3445),  "Malon Gossip Stone Fairy",                           "HC Malon Gossip Stone Fairy",                        RHT_HC_MALON_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HC_MALON_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_HC_MALON_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(0x1000, 3445),  "Malon Gossip Stone Big Fairy",                       "HC Malon Gossip Stone Big Fairy",                    RHT_HC_MALON_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(     0, 1041),  "Rock Wall Gossip Stone Fairy",                       "HC Rock Wall Gossip Stone Fairy",                    RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(0x1000, 1041),  "Rock Wall Gossip Stone Big Fairy",                   "HC Rock Wall Gossip Stone Big Fairy",                RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0xC, 735),   "Storms Grotto Gossip Stone Fairy",                   "HC Storms Grotto Gossip Stone Fairy",                RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x100C, 735),   "Storms Grotto Gossip Stone Big Fairy",               "HC Storms Grotto Gossip Stone Big Fairy",            RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY] =            Location::Fairy(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY,            RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -2230), "Deku Tree Left Gossip Stone Fairy",                  "KF Deku Tree Left Gossip Stone Fairy",               RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY));
-    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG] =        Location::Fairy(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG,        RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -2230), "Deku Tree Left Gossip Stone Big Fairy",              "KF Deku Tree Left Gossip Stone Big Fairy",           RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY] =           Location::Fairy(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY,           RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -700),  "Deku Tree Right Gossip Stone Fairy",                 "KF Deku Tree Right Gossip Stone Fairy",              RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY));
-    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG] =       Location::Fairy(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG,       RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -700),  "Deku Tree Right Gossip Stone Big Fairy",             "KF Deku Tree Right Gossip Stone Big Fairy",          RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_KF_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_KF_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -1223), "Gossip Stone Fairy",                                 "KF Gossip Stone Fairy",                              RHT_KF_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_GOSSIP_STONE_FAIRY));
-    locationTable[RC_KF_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_KF_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -1223), "Gossip Stone Big Fairy",                             "KF Gossip Stone Big Fairy",                          RHT_KF_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x1B, -236),  "Storms Gossip Stone Fairy",                          "KF Storms Gossip Stone Fairy",                       RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x101B, -236),  "Storms Gossip Stone Big Fairy",                      "KF Storms Gossip Stone Big Fairy",                   RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_LH_LAB_GOSSIP_STONE_FAIRY] =                       Location::Fairy(RC_LH_LAB_GOSSIP_STONE_FAIRY,                       RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 3212),  "Lab Gossip Stone Fairy",                             "LH Lab Gossip Stone Fairy",                          RHT_LH_LAB_GOSSIP_STONE_FAIRY,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY));
-    locationTable[RC_LH_LAB_GOSSIP_STONE_FAIRY_BIG] =                   Location::Fairy(RC_LH_LAB_GOSSIP_STONE_FAIRY_BIG,                   RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 3212),  "Lab Gossip Stone Big Fairy",                         "LH Lab Gossip Stone Big Fairy",                      RHT_LH_LAB_GOSSIP_STONE_FAIRY_BIG,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 8395),  "Southeast Gossip Stone Fairy",                       "LH Southeast Gossip Stone Fairy",                    RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY));
-    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 8395),  "Southeast Gossip Stone Big Fairy",                   "LH Southeast Gossip Stone Big Fairy",                RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 7984),  "Southwest Gossip Stone Fairy",                       "LH Southwest Gossip Stone Fairy",                    RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY));
-    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 7984),  "Southwest Gossip Stone Big Fairy",                   "LH Southwest Gossip Stone Big Fairy",                RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_LW_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_LW_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(     0, 2300),  "Gossip Stone Fairy",                                 "LW Gossip Stone Fairy",                              RHT_LW_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GOSSIP_STONE_FAIRY));
-    locationTable[RC_LW_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_LW_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(0x1000, 2300),  "Gossip Stone Big Fairy",                             "LW Gossip Stone Big Fairy",                          RHT_LW_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, 1370),  "Maze Lower Gossip Stone Fairy",                      "SFM Maze Lower Gossip Stone Fairy",                  RHT_SFM_MAZE_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY));
-    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, 1370),  "Maze Lower Gossip Stone Big Fairy",                  "SFM Maze Lower Gossip Stone Big Fairy",              RHT_SFM_MAZE_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, 740),   "Maze Upper Gossip Stone Fairy",                      "SFM Maze Upper Gossip Stone Fairy",                  RHT_SFM_MAZE_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY));
-    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, 740),   "Maze Upper Gossip Stone Big Fairy",                  "SFM Maze Upper Gossip Stone Big Fairy",              RHT_SFM_MAZE_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE_FAIRY] =                    Location::Fairy(RC_SFM_SARIA_GOSSIP_STONE_FAIRY,                    RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, -2300), "Saria Gossip Stone Fairy",                           "SFM Saria Gossip Stone Fairy",                       RHT_SFM_SARIA_GOSSIP_STONE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY));
-    locationTable[RC_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG] =                Location::Fairy(RC_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG,                RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, -2300), "Saria Gossip Stone Big Fairy",                       "SFM Saria Gossip Stone Big Fairy",                   RHT_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZD_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_ZD_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(     0, -1600), "Gossip Stone Fairy",                                 "ZD Gossip Stone Fairy",                              RHT_ZD_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZD_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_ZD_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(0x1000, -1600), "Gossip Stone Big Fairy",                             "ZD Gossip Stone Big Fairy",                          RHT_ZD_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZF_FAIRY_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(     0, 2205),  "Fairy Gossip Stone Fairy",                           "ZF Fairy Gossip Stone Fairy",                        RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(0x1000, 2205),  "Fairy Gossip Stone Big Fairy",                       "ZF Fairy Gossip Stone Big Fairy",                    RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZF_JABU_GOSSIP_STONE_FAIRY] =                      Location::Fairy(RC_ZF_JABU_GOSSIP_STONE_FAIRY,                      RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(     0, -985),  "Jabu Gossip Stone Fairy",                            "ZF Jabu Gossip Stone Fairy",                         RHT_ZF_JABU_GOSSIP_STONE_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG] =                  Location::Fairy(RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,                  RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(0x1000, -985),  "Jabu Gossip Stone Big Fairy",                        "ZF Jabu Gossip Stone Big Fairy",                     RHT_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(     0, -1070), "Near Grottos Gossip Stone Fairy",                    "ZR Near Grottos Gossip Stone Fairy",                 RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(0x1000, -1070), "Near Grottos Gossip Stone Big Fairy",                "ZR Near Grottos Gossip Stone Big Fairy",             RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(     0, -1650), "Near Domain Gossip Stone Fairy",                     "ZR Near Domain Gossip Stone Fairy",                  RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(0x1000, -1650), "Near Domain Gossip Stone Big Fairy",                 "ZR Near Domain Gossip Stone Big Fairy",              RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY] =                Location::Fairy(RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY,                RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x11, -357),  "Cow Grotto Gossip Stone Fairy",                      "HF Cow Grotto Gossip Stone Fairy",                   RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG] =            Location::Fairy(RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG,            RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1011, -357),  "Cow Grotto Gossip Stone Big Fairy",                  "HF Cow Grotto Gossip Stone Big Fairy",               RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY] =        Location::Fairy(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY,        RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x10, -236),  "Near Market Gossip Stone Fairy",                     "HF Near Market Gossip Stone Fairy",                  RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG] =    Location::Fairy(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG,    RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1010, -236),  "Near Market Gossip Stone Big Fairy",                 "HF Near Market Gossip Stone Big Fairy",              RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY] =          Location::Fairy(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY,          RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x14, -236),  "Southeast Gossip Stone Fairy",                       "HF Southeast Gossip Stone Fairy",                    RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG] =      Location::Fairy(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG,      RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1014, -236),  "Southeast Gossip Stone Big Fairy",                   "HF Southeast Gossip Stone Big Fairy",                RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x13, -236),  "Open Grotto Gossip Stone Fairy",                     "HF Open Grotto Gossip Stone Fairy",                  RHT_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1013, -236),  "Open Grotto Gossip Stone Big Fairy",                 "HF Open Grotto Gossip Stone Big Fairy",              RHT_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0xA, -236),  "Open Grotto Gossip Stone Fairy",                     "Kak Open Grotto Gossip Stone Fairy",                 RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x100A, -236),  "Open Grotto Gossip Stone Big Fairy",                 "Kak Open Grotto Gossip Stone Big Fairy",             RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x4, -236),  "Open Grotto Gossip Stone Fairy",                     "ZR Open Grotto Gossip Stone Fairy",                  RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1004, -236),  "Open Grotto Gossip Stone Big Fairy",                 "ZR Open Grotto Gossip Stone Big Fairy",              RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY] =     Location::Fairy(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY,     RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x1A, -236),  "Near Shortcuts Gossip Stone Fairy",                  "LW Near Shortcuts Gossip Stone Fairy",               RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = Location::Fairy(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG, RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x101A, -236),  "Near Shortcuts Gossip Stone Big Fairy",              "LW Near Shortcuts Gossip Stone Big Fairy",           RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =            Location::Fairy(RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY,            RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x8, -236),  "Storms Grotto Gossip Stone Fairy",                   "DMT Storms Grotto Gossip Stone Fairy",               RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =        Location::Fairy(RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,        RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1008, -236),  "Storms Grotto Gossip Stone Big Fairy",               "DMT Storms Grotto Gossip Stone Big Fairy",           RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x6, -236),  "Upper Grotto Gossip Stone Fairy",                    "DMC Upper Grotto Gossip Stone Fairy",                RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY));
-    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1006, -236),  "Upper Grotto Gossip Stone Big Fairy",                "DMC Upper Grotto Gossip Stone Big Fairy",            RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -680),  "ToT Left Gossip Stone Fairy",                        RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY));
+    locationTable[RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -680),  "ToT Left Gossip Stone Big Fairy",                    RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -615),  "ToT Left Center Gossip Stone Fairy",                 RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY));
+    locationTable[RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -615),  "ToT Left Center Gossip Stone Big Fairy",             RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -550),  "ToT Right Center Gossip Stone Fairy",                RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY));
+    locationTable[RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -550),  "ToT Right Center Gossip Stone Big Fairy",            RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY] =                Location::Fairy(RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY,                RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(     0, -485),  "ToT Right Gossip Stone Fairy",                       RHT_TOT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY));
+    locationTable[RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG] =            Location::Fairy(RC_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG,            RCQUEST_BOTH,   RCAREA_MARKET,                SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY,  TWO_ACTOR_PARAMS(0x1000, -485),  "ToT Right Gossip Stone Big Fairy",                   RHT_TOT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DMC_GOSSIP_STONE_FAIRY] =                          Location::Fairy(RC_DMC_GOSSIP_STONE_FAIRY,                          RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        TWO_ACTOR_PARAMS(     0, 1656),  "Gossip Stone Fairy",                                 RHT_DMC_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DMC_GOSSIP_STONE_FAIRY_BIG] =                      Location::Fairy(RC_DMC_GOSSIP_STONE_FAIRY_BIG,                      RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,        TWO_ACTOR_PARAMS(0x1000, 1656),  "Gossip Stone Big Fairy",                             RHT_DMC_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DMT_GOSSIP_STONE_FAIRY] =                          Location::Fairy(RC_DMT_GOSSIP_STONE_FAIRY,                          RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(     0, -3935), "Gossip Stone Fairy",                                 RHT_DMT_GOSSIP_STONE_FAIRY,                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DMT_GOSSIP_STONE_FAIRY_BIG] =                      Location::Fairy(RC_DMT_GOSSIP_STONE_FAIRY_BIG,                      RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(0x1000, -3935), "Gossip Stone Big Fairy",                             RHT_DMT_GOSSIP_STONE_FAIRY_BIG,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_COLOSSUS_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_COLOSSUS_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              TWO_ACTOR_PARAMS(     0, 1320),  "Gossip Stone Fairy",                                 RHT_COLOSSUS_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY));
+    locationTable[RC_COLOSSUS_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_COLOSSUS_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_DESERT_COLOSSUS,       SCENE_DESERT_COLOSSUS,              TWO_ACTOR_PARAMS(0x1000, 1320),  "Gossip Stone Big Fairy",                             RHT_COLOSSUS_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              RCQUEST_VANILLA,RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(     0, -1520), "Gossip Stone Fairy",                                 RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_VANILLA,RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(0x1000, -1520), "Gossip Stone Big Fairy",                             RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY] =           Location::Fairy(RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY,           RCQUEST_MQ,     RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(     0, -916),  "MQ Gossip Stone Fairy",                              RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG] =       Location::Fairy(RC_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG,       RCQUEST_MQ,     RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,              TWO_ACTOR_PARAMS(0x1000, -916),  "MQ Gossip Stone Big Fairy",                          RHT_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_GV_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_GV_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                TWO_ACTOR_PARAMS(     0, -2340), "Gossip Stone Fairy",                                 RHT_GV_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_GOSSIP_STONE_FAIRY));
+    locationTable[RC_GV_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_GV_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_GERUDO_VALLEY,         SCENE_GERUDO_VALLEY,                TWO_ACTOR_PARAMS(0x1000, -2340), "Gossip Stone Big Fairy",                             RHT_GV_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_GC_MAZE_GOSSIP_STONE_FAIRY] =                      Location::Fairy(RC_GC_MAZE_GOSSIP_STONE_FAIRY,                      RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(     0, -1265), "Maze Gossip Stone Fairy",                            RHT_GC_MAZE_GOSSIP_STONE_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY));
+    locationTable[RC_GC_MAZE_GOSSIP_STONE_FAIRY_BIG] =                  Location::Fairy(RC_GC_MAZE_GOSSIP_STONE_FAIRY_BIG,                  RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(0x1000, -1265), "Maze Gossip Stone Big Fairy",                        RHT_GC_MAZE_GOSSIP_STONE_FAIRY_BIG,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(     0, 1496),  "Medigoron Gossip Stone Fairy",                       RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY));
+    locationTable[RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_GORON_CITY,            SCENE_GORON_CITY,                   TWO_ACTOR_PARAMS(0x1000, 1496),  "Medigoron Gossip Stone Big Fairy",                   RHT_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_GRAVEYARD_GOSSIP_STONE_FAIRY] =                    Location::Fairy(RC_GRAVEYARD_GOSSIP_STONE_FAIRY,                    RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    TWO_ACTOR_PARAMS(     0, -75),   "Gossip Stone Fairy",                                 RHT_GRAVEYARD_GOSSIP_STONE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY));
+    locationTable[RC_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG] =                Location::Fairy(RC_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG,                RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,                    TWO_ACTOR_PARAMS(0x1000, -75),   "Gossip Stone Big Fairy",                             RHT_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HC_MALON_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_HC_MALON_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(     0, 3445),  "Malon Gossip Stone Fairy",                           RHT_HC_MALON_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HC_MALON_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_HC_MALON_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(0x1000, 3445),  "Malon Gossip Stone Big Fairy",                       RHT_HC_MALON_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(     0, 1041),  "Rock Wall Gossip Stone Fairy",                       RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,                TWO_ACTOR_PARAMS(0x1000, 1041),  "Rock Wall Gossip Stone Big Fairy",                   RHT_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0xC, 735),   "Storms Grotto Gossip Stone Fairy",                   RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x100C, 735),   "Storms Grotto Gossip Stone Big Fairy",               RHT_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY] =            Location::Fairy(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY,            RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -2230), "Deku Tree Left Gossip Stone Fairy",                  RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY));
+    locationTable[RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG] =        Location::Fairy(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG,        RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -2230), "Deku Tree Left Gossip Stone Big Fairy",              RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY] =           Location::Fairy(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY,           RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -700),  "Deku Tree Right Gossip Stone Fairy",                 RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY));
+    locationTable[RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG] =       Location::Fairy(RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG,       RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -700),  "Deku Tree Right Gossip Stone Big Fairy",             RHT_KF_DEKU_TREE_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_KF_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_KF_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(     0, -1223), "Gossip Stone Fairy",                                 RHT_KF_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_GOSSIP_STONE_FAIRY));
+    locationTable[RC_KF_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_KF_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(0x1000, -1223), "Gossip Stone Big Fairy",                             RHT_KF_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x1B, -236),  "Storms Gossip Stone Fairy",                          RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x101B, -236),  "Storms Gossip Stone Big Fairy",                      RHT_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_LH_LAB_GOSSIP_STONE_FAIRY] =                       Location::Fairy(RC_LH_LAB_GOSSIP_STONE_FAIRY,                       RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 3212),  "Lab Gossip Stone Fairy",                             RHT_LH_LAB_GOSSIP_STONE_FAIRY,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY));
+    locationTable[RC_LH_LAB_GOSSIP_STONE_FAIRY_BIG] =                   Location::Fairy(RC_LH_LAB_GOSSIP_STONE_FAIRY_BIG,                   RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 3212),  "Lab Gossip Stone Big Fairy",                         RHT_LH_LAB_GOSSIP_STONE_FAIRY_BIG,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 8395),  "Southeast Gossip Stone Fairy",                       RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY));
+    locationTable[RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 8395),  "Southeast Gossip Stone Big Fairy",                   RHT_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY] =                 Location::Fairy(RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY,                 RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(     0, 7984),  "Southwest Gossip Stone Fairy",                       RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY));
+    locationTable[RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG] =             Location::Fairy(RC_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG,             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 7984),  "Southwest Gossip Stone Big Fairy",                   RHT_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_LW_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_LW_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(     0, 2300),  "Gossip Stone Fairy",                                 RHT_LW_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GOSSIP_STONE_FAIRY));
+    locationTable[RC_LW_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_LW_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(0x1000, 2300),  "Gossip Stone Big Fairy",                             RHT_LW_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, 1370),  "Maze Lower Gossip Stone Fairy",                      RHT_SFM_MAZE_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY));
+    locationTable[RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, 1370),  "Maze Lower Gossip Stone Big Fairy",                  RHT_SFM_MAZE_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, 740),   "Maze Upper Gossip Stone Fairy",                      RHT_SFM_MAZE_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY));
+    locationTable[RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, 740),   "Maze Upper Gossip Stone Big Fairy",                  RHT_SFM_MAZE_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE_FAIRY] =                    Location::Fairy(RC_SFM_SARIA_GOSSIP_STONE_FAIRY,                    RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(     0, -2300), "Saria Gossip Stone Fairy",                           RHT_SFM_SARIA_GOSSIP_STONE_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY));
+    locationTable[RC_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG] =                Location::Fairy(RC_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG,                RCQUEST_BOTH,   RCAREA_SACRED_FOREST_MEADOW,  SCENE_SACRED_FOREST_MEADOW,         TWO_ACTOR_PARAMS(0x1000, -2300), "Saria Gossip Stone Big Fairy",                       RHT_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZD_GOSSIP_STONE_FAIRY] =                           Location::Fairy(RC_ZD_GOSSIP_STONE_FAIRY,                           RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(     0, -1600), "Gossip Stone Fairy",                                 RHT_ZD_GOSSIP_STONE_FAIRY,                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZD_GOSSIP_STONE_FAIRY_BIG] =                       Location::Fairy(RC_ZD_GOSSIP_STONE_FAIRY_BIG,                       RCQUEST_BOTH,   RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(0x1000, -1600), "Gossip Stone Big Fairy",                             RHT_ZD_GOSSIP_STONE_FAIRY_BIG,                       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZF_FAIRY_GOSSIP_STONE_FAIRY] =                     Location::Fairy(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY,                     RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(     0, 2205),  "Fairy Gossip Stone Fairy",                           RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG] =                 Location::Fairy(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,                 RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(0x1000, 2205),  "Fairy Gossip Stone Big Fairy",                       RHT_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,                 SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZF_JABU_GOSSIP_STONE_FAIRY] =                      Location::Fairy(RC_ZF_JABU_GOSSIP_STONE_FAIRY,                      RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(     0, -985),  "Jabu Gossip Stone Fairy",                            RHT_ZF_JABU_GOSSIP_STONE_FAIRY,                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG] =                  Location::Fairy(RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,                  RCQUEST_BOTH,   RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,               TWO_ACTOR_PARAMS(0x1000, -985),  "Jabu Gossip Stone Big Fairy",                        RHT_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(     0, -1070), "Near Grottos Gossip Stone Fairy",                    RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(0x1000, -1070), "Near Grottos Gossip Stone Big Fairy",                RHT_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(     0, -1650), "Near Domain Gossip Stone Fairy",                     RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,                  TWO_ACTOR_PARAMS(0x1000, -1650), "Near Domain Gossip Stone Big Fairy",                 RHT_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY] =                Location::Fairy(RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY,                RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x11, -357),  "Cow Grotto Gossip Stone Fairy",                      RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG] =            Location::Fairy(RC_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG,            RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1011, -357),  "Cow Grotto Gossip Stone Big Fairy",                  RHT_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY] =        Location::Fairy(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY,        RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x10, -236),  "Near Market Gossip Stone Fairy",                     RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG] =    Location::Fairy(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG,    RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1010, -236),  "Near Market Gossip Stone Big Fairy",                 RHT_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY] =          Location::Fairy(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY,          RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x14, -236),  "Southeast Gossip Stone Fairy",                       RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG] =      Location::Fairy(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG,      RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1014, -236),  "Southeast Gossip Stone Big Fairy",                   RHT_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x13, -236),  "Open Grotto Gossip Stone Fairy",                     RHT_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1013, -236),  "Open Grotto Gossip Stone Big Fairy",                 RHT_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =              Location::Fairy(RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY,              RCQUEST_BOTH,   RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0xA, -236),  "Open Grotto Gossip Stone Fairy",                     RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =          Location::Fairy(RC_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,          RCQUEST_BOTH,   RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x100A, -236),  "Open Grotto Gossip Stone Big Fairy",                 RHT_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY] =               Location::Fairy(RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x4, -236),  "Open Grotto Gossip Stone Fairy",                     RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG] =           Location::Fairy(RC_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1004, -236),  "Open Grotto Gossip Stone Big Fairy",                 RHT_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY] =     Location::Fairy(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY,     RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(  0x1A, -236),  "Tunnel Grotto Gossip Stone Fairy",                   RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG] = Location::Fairy(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG, RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x101A, -236),  "Tunnel Grotto Gossip Stone Big Fairy",               RHT_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY] =            Location::Fairy(RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY,            RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x8, -236),  "Storms Grotto Gossip Stone Fairy",                   RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG] =        Location::Fairy(RC_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,        RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1008, -236),  "Storms Grotto Gossip Stone Big Fairy",               RHT_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG));
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY] =             Location::Fairy(RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY,             RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(   0x6, -236),  "Upper Grotto Gossip Stone Fairy",                    RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY,             SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY));
+    locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG] =         Location::Fairy(RC_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG,         RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1006, -236),  "Upper Grotto Gossip Stone Big Fairy",                RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG));
 
-    locationTable[RC_LH_ISLAND_SUN_FAIRY] =                             Location::Fairy(RC_LH_ISLAND_SUN_FAIRY,                             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 7319),  "Island Sun's Song Fairy",                            "Island Sun's Song Fairy",                            RHT_LH_ISLAND_SUN_FAIRY,                             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_ISLAND_SUN_FAIRY));
-    locationTable[RC_HF_POND_STORMS_FAIRY] =                            Location::Fairy(RC_HF_POND_STORMS_FAIRY,                            RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,                 TWO_ACTOR_PARAMS(0x1000, 5012),  "Pond Song of Storms Fairy",                          "Pond Song of Storms Fairy",                          RHT_HF_POND_STORMS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_POND_STORMS_FAIRY));
-    locationTable[RC_HF_FENCE_GROTTO_STORMS_FAIRY] =                    Location::Fairy(RC_HF_FENCE_GROTTO_STORMS_FAIRY,                    RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, -308),  "Inside Fence Storms Fairy",                          "Inside Fence Storms Fairy",                          RHT_HF_FENCE_GROTTO_STORMS_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FENCE_GROTTO_STORMS_FAIRY));
-    locationTable[RC_DMT_FLAG_SUN_FAIRY] =                              Location::Fairy(RC_DMT_FLAG_SUN_FAIRY,                              RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(0x1000, 464),   "Flag Sun's Song Fairy",                              "Flag Sun's Song Fairy",                              RHT_DMT_FLAG_SUN_FAIRY,                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_FLAG_SUN_FAIRY));
-    locationTable[RC_DMT_COW_GROTTO_STORMS_FAIRY] =                     Location::Fairy(RC_DMT_COW_GROTTO_STORMS_FAIRY,                     RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, -311),  "Cow Grotto Song of Storms Fairy",                    "Cow Grotto Song of Storms Fairy",                    RHT_DMT_COW_GROTTO_STORMS_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_COW_GROTTO_STORMS_FAIRY));
-    locationTable[RC_LW_SHORTCUT_STORMS_FAIRY] =                        Location::Fairy(RC_LW_SHORTCUT_STORMS_FAIRY,                        RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(0x1000, -795),  "Shortcuts Song of Storms Fairy",                     "Shortcuts Song of Storms Fairy",                     RHT_LW_SHORTCUT_STORMS_FAIRY,                        SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_SHORTCUT_STORMS_FAIRY));
-    locationTable[RC_GF_KITCHEN_SUN_FAIRY] =                            Location::Fairy(RC_GF_KITCHEN_SUN_FAIRY,                            RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,              TWO_ACTOR_PARAMS(0x1000, -621),  "Kitchen Sun's Song Fairy",                           "Kitchen Sun's Song Fairy",                           RHT_GF_KITCHEN_SUN_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_KITCHEN_SUN_FAIRY));
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY] =                  Location::Fairy(RC_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,                  RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, 741),   "Scrub Grotto Sun's Song Fairy",                      "Scrub Grotto Sun's Song Fairy",                      RHT_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY));
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY] =          Location::Fairy(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,          RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_ROYAL_FAMILYS_TOMB,           TWO_ACTOR_PARAMS(0x1000, 1476),  "Composer's Grave Sun's Song Fairy",                  "Composer's Grave Sun's Song Fairy",                  RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY));
+    locationTable[RC_LH_ISLAND_SUN_FAIRY] =                             Location::Fairy(RC_LH_ISLAND_SUN_FAIRY,                             RCQUEST_BOTH,   RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,                   TWO_ACTOR_PARAMS(0x1000, 7319),  "Island Sun's Song Fairy",                            RHT_LH_ISLAND_SUN_FAIRY,                             SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_ISLAND_SUN_FAIRY));
+    locationTable[RC_HF_POND_STORMS_FAIRY] =                            Location::Fairy(RC_HF_POND_STORMS_FAIRY,                            RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,                 TWO_ACTOR_PARAMS(0x1000, 5012),  "Pond Song of Storms Fairy",                          RHT_HF_POND_STORMS_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_POND_STORMS_FAIRY));
+    locationTable[RC_HF_FENCE_GROTTO_STORMS_FAIRY] =                    Location::Fairy(RC_HF_FENCE_GROTTO_STORMS_FAIRY,                    RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, -308),  "Deku Scrub Grotto Storms Fairy",                     RHT_HF_FENCE_GROTTO_STORMS_FAIRY,                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_FENCE_GROTTO_STORMS_FAIRY));
+    locationTable[RC_DMT_FLAG_SUN_FAIRY] =                              Location::Fairy(RC_DMT_FLAG_SUN_FAIRY,                              RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_DEATH_MOUNTAIN_TRAIL,         TWO_ACTOR_PARAMS(0x1000, 464),   "Flag Sun's Song Fairy",                              RHT_DMT_FLAG_SUN_FAIRY,                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_FLAG_SUN_FAIRY));
+    locationTable[RC_DMT_COW_GROTTO_STORMS_FAIRY] =                     Location::Fairy(RC_DMT_COW_GROTTO_STORMS_FAIRY,                     RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, -311),  "Cow Grotto Song of Storms Fairy",                    RHT_DMT_COW_GROTTO_STORMS_FAIRY,                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_COW_GROTTO_STORMS_FAIRY));
+    locationTable[RC_LW_SHORTCUT_STORMS_FAIRY] =                        Location::Fairy(RC_LW_SHORTCUT_STORMS_FAIRY,                        RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,                   TWO_ACTOR_PARAMS(0x1000, -795),  "Shortcuts Song of Storms Fairy",                     RHT_LW_SHORTCUT_STORMS_FAIRY,                        SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_SHORTCUT_STORMS_FAIRY));
+    locationTable[RC_TH_KITCHEN_SUN_FAIRY] =                            Location::Fairy(RC_TH_KITCHEN_SUN_FAIRY,                            RCQUEST_BOTH,   RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,              TWO_ACTOR_PARAMS(0x1000, -621),  "Kitchen Sun's Song Fairy",                           RHT_TH_KITCHEN_SUN_FAIRY,                            SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_KITCHEN_SUN_FAIRY));
+    locationTable[RC_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY] =                  Location::Fairy(RC_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,                  RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x1000, 741),   "Scrub Grotto Sun's Song Fairy",                      RHT_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,                  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY));
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY] =          Location::Fairy(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,          RCQUEST_BOTH,   RCAREA_GRAVEYARD,             SCENE_ROYAL_FAMILYS_TOMB,           TWO_ACTOR_PARAMS(0x1000, 1476),  "Royal Family's Tomb Sun's Song Fairy",               RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,          SpoilerCollectionCheck::RandomizerInf(RAND_INF_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY));
 
-    locationTable[RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY] =            Location::Fairy(RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,            RCQUEST_VANILLA,RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -1896), "After Boulder Room Sun's Song Fairy",                "After Boulder Room Sun's Song Fairy",                RHT_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY));
-    locationTable[RC_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY] =              Location::Fairy(RC_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY,              RCQUEST_VANILLA,RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -220),  "Four Armos Room Sun's Song Fairy",                   "Four Armos Room Sun's Song Fairy",                   RHT_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY] =                Location::Fairy(RC_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 54),    "Beamos Song of Storms Fairy",                        "Beamos Song of Storms Fairy",                        RHT_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_PIT_STORM_FAIRY] =                   Location::Fairy(RC_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 3339),  "Pit Room Song of Storms Fairy",                      "Pit Room Song of Storms Fairy",                      RHT_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY] =               Location::Fairy(RC_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -127),  "Wind Hint Sun's Song Fairy",                         "Wind Hint Sun's Song Fairy",                         RHT_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY] =           Location::Fairy(RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,           RCQUEST_VANILLA,RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -1531), "Basement Sun's Song Fairy",                          "Basement Sun's Song Fairy",                          RHT_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY));
-    locationTable[RC_ICE_CAVERN_ENTRANCE_STORMS_FAIRY] =                Location::Fairy(RC_ICE_CAVERN_ENTRANCE_STORMS_FAIRY,                RCQUEST_VANILLA,RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,                   TWO_ACTOR_PARAMS(0x1000, 1186),  "Entrance Song of Storms Fairy",                      "Ice Cavern Entrance Song of Storms Fairy",           RHT_ICE_CAVERN_ENTRANCE_STORMS_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY));
-    locationTable[RC_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY] =    Location::Fairy(RC_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY,    RCQUEST_VANILLA,RCAREA_GERUDO_TRAINING_GROUND,SCENE_GERUDO_TRAINING_GROUND,       TWO_ACTOR_PARAMS(0x1000, -445),  "Entrance Song of Storms Fairy",                      "GTG Entrance Song of Storms Fairy",                  RHT_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY));
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY] =            Location::Fairy(RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY,            RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,         TWO_ACTOR_PARAMS(0x1000, 587),   "Spirit Trial Beamos Sun's Song Fairy",               "Spirit Trial Beamos Sun's Song Fairy",               RHT_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY));
+    locationTable[RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY] =            Location::Fairy(RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,            RCQUEST_VANILLA,RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -1896), "After Boulder Room Sun's Song Fairy",                RHT_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY));
+    locationTable[RC_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY] =              Location::Fairy(RC_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY,              RCQUEST_VANILLA,RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -220),  "Four Armos Room Sun's Song Fairy",                   RHT_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY,              SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY] =                Location::Fairy(RC_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 54),    "Beamos Song of Storms Fairy",                        RHT_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_PIT_STORM_FAIRY] =                   Location::Fairy(RC_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 3339),  "Pit Room Song of Storms Fairy",                      RHT_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY] =               Location::Fairy(RC_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               RCQUEST_VANILLA,RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -127),  "Wind Hint Sun's Song Fairy",                         RHT_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY] =           Location::Fairy(RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,           RCQUEST_VANILLA,RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -1531), "Basement Sun's Song Fairy",                          RHT_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY));
+    locationTable[RC_ICE_CAVERN_ENTRANCE_STORMS_FAIRY] =                Location::Fairy(RC_ICE_CAVERN_ENTRANCE_STORMS_FAIRY,                RCQUEST_VANILLA,RCAREA_ICE_CAVERN,            SCENE_ICE_CAVERN,                   TWO_ACTOR_PARAMS(0x1000, 1186),  "Entrance Song of Storms Fairy",                      RHT_ICE_CAVERN_ENTRANCE_STORMS_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY));
+    locationTable[RC_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY] =    Location::Fairy(RC_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY,    RCQUEST_VANILLA,RCAREA_GERUDO_TRAINING_GROUND,SCENE_GERUDO_TRAINING_GROUND,       TWO_ACTOR_PARAMS(0x1000, -445),  "Entrance Song of Storms Fairy",                      RHT_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY));
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY] =            Location::Fairy(RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY,            RCQUEST_VANILLA,RCAREA_GANONS_CASTLE,         SCENE_INSIDE_GANONS_CASTLE,         TWO_ACTOR_PARAMS(0x1000, 587),   "Spirit Trial Beamos Sun's Song Fairy",               RHT_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY));
 
-    locationTable[RC_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY] =           Location::Fairy(RC_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY,           RCQUEST_MQ,     RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,                  TWO_ACTOR_PARAMS(0x1000, -551),  "MQ Lower Loop Stalfos Room Sun's Song Fairy",        "MQ Lower Loop Stalfos Room Sun's Song Fairy",        RHT_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY));
-    locationTable[RC_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY] =           Location::Fairy(RC_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY,           RCQUEST_MQ,     RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,                  TWO_ACTOR_PARAMS(0x1000, -1563), "MQ Lower Loop Behind Iron Knuckle Sun's Song Fairy", "MQ Lower Loop Behind Iron Knuckle Sun's Song Fairy", RHT_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY));
-    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY] =       Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY,       RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -540),  "MQ Before Dark Link Pilar Sun's Song Fairy",         "MQ Before Dark Link Pilar Sun's Song Fairy",         RHT_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY));
-    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY] =      Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY,      RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -1501), "MQ Before Dark Link Left Song of Storms Fairy",      "MQ Before Dark Link Left Song of Storms Fairy",      RHT_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY));
-    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY] =       Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY,       RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -1504), "MQ Before Dark Link Right Sun's Song Fairy",         "MQ Before Dark Link Right Sun's Song Fairy",         RHT_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY));
-    locationTable[RC_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY] =        Location::Fairy(RC_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,        RCQUEST_MQ,     RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -220),  "MQ Dinalfos Room Sun's Song Fairy",                  "MQ Dinalfos Room Sun's Song Fairy",                  RHT_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY] =             Location::Fairy(RC_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY,             RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 55),    "MQ Beamos Song of Storms Fairy",                     "MQ Beamos Song of Storms Fairy",                     RHT_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY] =                Location::Fairy(RC_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY,                RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 3342),  "MQ Pit Room Song of Storms Fairy",                   "MQ Pit Room Song of Storms Fairy",                   RHT_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY));
-    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY] =            Location::Fairy(RC_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY,            RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -127),  "MQ Wind Hint Sun's Song Fairy",                      "MQ Wind Hint Sun's Song Fairy",                      RHT_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY));
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY] =            Location::Fairy(RC_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,            RCQUEST_MQ,     RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -437),  "MQ East Cell Sun's Song Fairy",                      "MQ East Cell Sun's Song Fairy",                      RHT_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY));
-    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY] =        Location::Fairy(RC_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,        RCQUEST_MQ,     RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -1458), "MQ Basement Sun's Song Fairy",                       "MQ Basement Sun's Song Fairy",                       RHT_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY));
+    locationTable[RC_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY] =           Location::Fairy(RC_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY,           RCQUEST_MQ,     RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,                  TWO_ACTOR_PARAMS(0x1000, -551),  "MQ Lower Loop Stalfos Room Sun's Song Fairy",        RHT_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY));
+    locationTable[RC_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY] =           Location::Fairy(RC_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY,           RCQUEST_MQ,     RCAREA_FIRE_TEMPLE,           SCENE_FIRE_TEMPLE,                  TWO_ACTOR_PARAMS(0x1000, -1563), "MQ Lower Loop Behind Iron Knuckle Sun's Song Fairy", RHT_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY,           SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY));
+    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY] =       Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY,       RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -540),  "MQ Before Dark Link Pilar Sun's Song Fairy",         RHT_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY));
+    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY] =      Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY,      RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -1501), "MQ Before Dark Link Left Song of Storms Fairy",      RHT_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY));
+    locationTable[RC_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY] =       Location::Fairy(RC_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY,       RCQUEST_MQ,     RCAREA_WATER_TEMPLE,          SCENE_WATER_TEMPLE,                 TWO_ACTOR_PARAMS(0x1000, -1504), "MQ Before Dark Link Right Sun's Song Fairy",         RHT_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY] =        Location::Fairy(RC_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,        RCQUEST_MQ,     RCAREA_SPIRIT_TEMPLE,         SCENE_SPIRIT_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -220),  "MQ Dinalfos Room Sun's Song Fairy",                  RHT_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY] =             Location::Fairy(RC_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY,             RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 55),    "MQ Beamos Song of Storms Fairy",                     RHT_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,                SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY] =                Location::Fairy(RC_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY,                RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, 3342),  "MQ Pit Room Song of Storms Fairy",                   RHT_SHADOW_TEMPLE_PIT_STORM_FAIRY,                   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY));
+    locationTable[RC_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY] =            Location::Fairy(RC_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY,            RCQUEST_MQ,     RCAREA_SHADOW_TEMPLE,         SCENE_SHADOW_TEMPLE,                TWO_ACTOR_PARAMS(0x1000, -127),  "MQ Wind Hint Sun's Song Fairy",                      RHT_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,               SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY] =            Location::Fairy(RC_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,            RCQUEST_MQ,     RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -437),  "MQ East Cell Sun's Song Fairy",                      RHT_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,            SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY] =        Location::Fairy(RC_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,        RCQUEST_MQ,     RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,           TWO_ACTOR_PARAMS(0x1000, -1458), "MQ Basement Sun's Song Fairy",                       RHT_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY));
+
+    // clang-format on
 }
 
-static RegisterShipInitFunc initFunc(Rando::StaticData::RegisterFairyLocations);
+static ObjectExtension::Register<FairyIdentity> RegisterFairyIdentity;
+static RegisterShipInitFunc registerShuffleFairies(RegisterShuffleFairies, { "IS_RANDO" });
+static RegisterShipInitFunc registerShuffleFairiesLocations(Rando::StaticData::RegisterFairyLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.h b/soh/soh/Enhancements/randomizer/ShuffleFairies.h
deleted file mode 100644
index 9fcd9ba52f..0000000000
--- a/soh/soh/Enhancements/randomizer/ShuffleFairies.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <z64.h>
-#include "soh/Enhancements/item-tables/ItemTableTypes.h"
-#include "randomizer_inf.h"
-
-typedef struct FairyIdentity {
-    RandomizerInf randomizerInf;
-    GetItemEntry itemEntry;
-} FairyIdentity;
-
-void ShuffleFairies_RegisterHooks();
-void ShuffleFairies_UnregisterHooks();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp
index c35cab1074..7291fdbefd 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp
@@ -1,17 +1,17 @@
-#include "ShuffleFreestanding.h"
+#include <soh/OTRGlobals.h>
 
 extern "C" {
+#include "variables.h"
 #include "functions.h"
 extern PlayState* gPlayState;
 }
 
 extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
 
-void ShuffleFreestanding_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
-    va_list args;
-    va_copy(args, originalArgs);
+void RegisterShuffleFreestanding() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_FREESTANDING);
 
-    if (id == VB_ITEM00_DESPAWN) {
+    COND_VB_SHOULD(VB_ITEM00_DESPAWN, shouldRegister, {
         EnItem00* item00 = va_arg(args, EnItem00*);
 
         // Heart pieces and small keys are handled by default non-freestanding shuffles.
@@ -20,17 +20,19 @@ void ShuffleFreestanding_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* sh
         }
 
         uint32_t params = TWO_ACTOR_PARAMS((int32_t)item00->actor.world.pos.x, (int32_t)item00->actor.world.pos.z);
-        Rando::Location* loc = OTRGlobals::Instance->gRandomizer->GetCheckObjectFromActor(item00->actor.id, gPlayState->sceneNum, params);
-        uint8_t isDungeon = loc->IsDungeon();
-        uint8_t freestandingSetting =
-            Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_FREESTANDING).Get();
+        Rando::Location* loc =
+            OTRGlobals::Instance->gRandomizer->GetCheckObjectFromActor(item00->actor.id, gPlayState->sceneNum, params);
         RandomizerCheck randomizerCheck = loc->GetRandomizerCheck();
-        bool checkObtained = Rando::Context::GetInstance()->GetItemLocation(randomizerCheck)->HasObtained();
-        
+        if (Rando::Context::GetInstance()->GetItemLocation(randomizerCheck)->HasObtained()) {
+            return;
+        }
+        uint8_t isDungeon = loc->IsDungeon();
+        uint8_t freestandingSetting = RAND_GET_OPTION(RSK_SHUFFLE_FREESTANDING);
+
         // Don't change to randomized item if current freestanding item isn't shuffled or already obtained.
         if ((freestandingSetting == RO_SHUFFLE_FREESTANDING_OVERWORLD && isDungeon) ||
-            (freestandingSetting == RO_SHUFFLE_FREESTANDING_DUNGEONS && !isDungeon) || 
-            checkObtained || randomizerCheck == RC_UNKNOWN_CHECK) {
+            (freestandingSetting == RO_SHUFFLE_FREESTANDING_DUNGEONS && !isDungeon) ||
+            randomizerCheck == RC_UNKNOWN_CHECK) {
             return;
         }
 
@@ -41,10 +43,15 @@ void ShuffleFreestanding_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* sh
         item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
 
         *should = false;
-    }
+    });
 }
 
 void Rando::StaticData::RegisterFreestandingLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
     locationTable[RC_KF_BOULDER_RUPEE_2] =                                    Location::Collectable(RC_KF_BOULDER_RUPEE_2,                                    RCQUEST_BOTH,    RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(-712, 1857),        "Boulder Maze Second Rupee",                   RHT_KOKIRI_FOREST_RUPEE,                                         RG_BLUE_RUPEE,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BOULDER_RUPEE_2));
     locationTable[RC_KF_BOULDER_RUPEE_1] =                                    Location::Collectable(RC_KF_BOULDER_RUPEE_1,                                    RCQUEST_BOTH,    RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(-1009, 1556),       "Boulder Maze First Rupee",                    RHT_KOKIRI_FOREST_RUPEE,                                         RG_BLUE_RUPEE,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BOULDER_RUPEE_1));
     locationTable[RC_KF_BRIDGE_RUPEE] =                                       Location::Collectable(RC_KF_BRIDGE_RUPEE,                                       RCQUEST_BOTH,    RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_KOKIRI_FOREST,                TWO_ACTOR_PARAMS(2, -45),            "Bridge Rupee",                                RHT_KOKIRI_FOREST_RUPEE,                                         RG_BLUE_RUPEE,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BRIDGE_RUPEE));
@@ -275,6 +282,9 @@ void Rando::StaticData::RegisterFreestandingLocations() {
     locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_HEART] =                    Location::Collectable(RC_GANONS_CASTLE_MQ_WATER_TRIAL_HEART,                    RCQUEST_MQ,      RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         TWO_ACTOR_PARAMS(1743, -528),        "MQ Water Trial Heart",                        RHT_GANONS_CASTLE_HEART,                                         RG_RECOVERY_HEART,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_HEART));
     locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART] =              Location::Collectable(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART,              RCQUEST_MQ,      RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         TWO_ACTOR_PARAMS(-2506, -1096),      "MQ Light Trial Right Heart",                  RHT_GANONS_CASTLE_HEART,                                         RG_RECOVERY_HEART,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART));
     locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART] =               Location::Collectable(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART,               RCQUEST_MQ,      RCTYPE_FREESTANDING,                                                     ACTOR_EN_ITEM00,      SCENE_INSIDE_GANONS_CASTLE,         TWO_ACTOR_PARAMS(-2655, -549),       "MQ Light Trial Left Heart",                   RHT_GANONS_CASTLE_HEART,                                         RG_RECOVERY_HEART,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART));
+
+    // clang-format on
 }
 
-static RegisterShipInitFunc initFunc(Rando::StaticData::RegisterFreestandingLocations);
\ No newline at end of file
+static RegisterShipInitFunc registerShuffleFreestanding(RegisterShuffleFreestanding, { "IS_RANDO" });
+static RegisterShipInitFunc registerShuffleFreestandingLocations(Rando::StaticData::RegisterFreestandingLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.h b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.h
deleted file mode 100644
index 9234f76faa..0000000000
--- a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef SHUFFLE_FREESTANDING_H
-#define SHUFFLE_FREESTANDING_H
-
-#include <z64.h>
-#include <soh/OTRGlobals.h>
-
-void ShuffleFreestanding_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs);
-
-#endif
diff --git a/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp b/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp
new file mode 100644
index 0000000000..27d42a148a
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp
@@ -0,0 +1,534 @@
+#include <soh/OTRGlobals.h>
+#include "soh_assets.h"
+#include "static_data.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+#include "soh/Enhancements/enhancementTypes.h"
+
+extern "C" {
+#include "variables.h"
+#include "overlays/actors/ovl_En_Kusa/z_en_kusa.h"
+#include "objects/gameplay_field_keep/gameplay_field_keep.h"
+#include "objects/object_kusa/object_kusa.h"
+extern PlayState* gPlayState;
+}
+
+extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
+
+void DrawTypeOfGrass(EnKusa* grassActor, Gfx* bushDList, Gfx* grassDList, PlayState* play) {
+    // Actor params is -255 for regrowable grass.
+    if (grassActor->actor.params == -255) {
+        Gfx_DrawDListOpa(play, grassDList);
+    } else {
+        Gfx_DrawDListOpa(play, bushDList);
+    }
+}
+
+extern "C" void EnKusa_RandomizerDraw(Actor* thisx, PlayState* play) {
+    // static Gfx* dLists[] = { (Gfx*)gRandoBushDL, (Gfx*)object_kusa_DL_000140, (Gfx*)object_kusa_DL_000140 };
+    static Gfx* dLists[] = { (Gfx*)gRandoBushJunkDL, (Gfx*)gRandoCuttableGrassJunkDL, (Gfx*)gRandoCuttableGrassJunkDL };
+    auto grassActor = ((EnKusa*)thisx);
+
+    const auto grassIdentity = ObjectExtension::GetInstance().Get<GrassIdentity>(thisx);
+
+    OPEN_DISPS(play->state.gfxCtx);
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+
+    if (grassIdentity != nullptr && grassIdentity->randomizerCheck != RC_MAX &&
+        Flags_GetRandomizerInf(grassIdentity->randomizerInf) == 0) {
+        int csmc = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED);
+        int requiresStoneAgony = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0);
+
+        if ((csmc == CSMC_BOTH || csmc == CSMC_TEXTURE) &&
+            (!requiresStoneAgony || (requiresStoneAgony && CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
+            auto itemEntry =
+                Rando::Context::GetInstance()->GetFinalGIEntry(grassIdentity->randomizerCheck, true, GI_NONE);
+            GetItemCategory getItemCategory = itemEntry.getItemCategory;
+
+            switch (getItemCategory) {
+                case ITEM_CATEGORY_JUNK:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushJunkDL, (Gfx*)gRandoCuttableGrassJunkDL, play);
+                    break;
+                case ITEM_CATEGORY_LESSER:
+                    switch (itemEntry.itemId) {
+                        case ITEM_HEART_PIECE:
+                        case ITEM_HEART_PIECE_2:
+                        case ITEM_HEART_CONTAINER:
+                            DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushHeartDL, (Gfx*)gRandoCuttableGrassHeartDL,
+                                            play);
+                            break;
+                        default:
+                            DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushMinorDL, (Gfx*)gRandoCuttableGrassMinorDL,
+                                            play);
+                            break;
+                    }
+                    break;
+                case ITEM_CATEGORY_BOSS_KEY:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushBossKeyDL, (Gfx*)gRandoCuttableGrassBossKeyDL, play);
+                    break;
+                case ITEM_CATEGORY_SMALL_KEY:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushSmallKeyDL, (Gfx*)gRandoCuttableGrassSmallKeyDL, play);
+                    break;
+                case ITEM_CATEGORY_SKULLTULA_TOKEN:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushTokenDL, (Gfx*)gRandoCuttableGrassTokenDL, play);
+                    break;
+                case ITEM_CATEGORY_MAJOR:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushMajorDL, (Gfx*)gRandoCuttableGrassMajorDL, play);
+                    break;
+                default:
+                    DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushDL, (Gfx*)gRandoCuttableGrassDL, play);
+                    break;
+            }
+        } else {
+            DrawTypeOfGrass(grassActor, (Gfx*)gRandoBushDL, (Gfx*)gRandoCuttableGrassDL, play);
+        }
+    } else if (grassActor->actor.flags & ACTOR_FLAG_GRASS_DESTROYED) {
+        Gfx_DrawDListOpa(play, (Gfx*)object_kusa_DL_0002E0);
+    } else {
+        Gfx_DrawDListOpa(play, dLists[thisx->params & 3]);
+    }
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
+uint8_t EnKusa_RandomizerHoldsItem(EnKusa* grassActor, PlayState* play) {
+    const auto grassIdentity = ObjectExtension::GetInstance().Get<GrassIdentity>(&grassActor->actor);
+
+    if (grassIdentity == nullptr || grassIdentity->randomizerCheck == RC_MAX)
+        return false;
+
+    RandomizerCheck rc = grassIdentity->randomizerCheck;
+    uint8_t isDungeon = Rando::StaticData::GetLocation(rc)->IsDungeon();
+    uint8_t grassSetting = RAND_GET_OPTION(RSK_SHUFFLE_GRASS);
+
+    // Don't pull randomized item if grass isn't randomized or is already checked
+    if (!IS_RANDO || (grassSetting == RO_SHUFFLE_GRASS_OVERWORLD && isDungeon) ||
+        (grassSetting == RO_SHUFFLE_GRASS_DUNGEONS && !isDungeon) ||
+        Flags_GetRandomizerInf(grassIdentity->randomizerInf) || rc == RC_UNKNOWN_CHECK) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+void EnKusa_RandomizerSpawnCollectible(EnKusa* grassActor, PlayState* play) {
+    const auto grassIdentity = ObjectExtension::GetInstance().Get<GrassIdentity>(&grassActor->actor);
+    if (grassIdentity == nullptr) {
+        return;
+    }
+
+    EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &grassActor->actor.world.pos, ITEM00_SOH_DUMMY);
+    item00->randoInf = grassIdentity->randomizerInf;
+    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(grassIdentity->randomizerCheck, true, GI_NONE);
+    item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
+    item00->actor.velocity.y = 8.0f;
+    item00->actor.speedXZ = 2.0f;
+    item00->actor.world.rot.y = static_cast<int16_t>(Rand_CenteredFloat(65536.0f));
+}
+
+void EnKusa_RandomizerInit(void* actorRef) {
+    Actor* actor = static_cast<Actor*>(actorRef);
+
+    if (actor->id != ACTOR_EN_KUSA)
+        return;
+
+    EnKusa* grassActor = static_cast<EnKusa*>(actorRef);
+    s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
+
+    auto grassIdentity = OTRGlobals::Instance->gRandomizer->IdentifyGrass(
+        gPlayState->sceneNum, (s16)actor->world.pos.x, (s16)actor->world.pos.z, respawnData, gPlayState->linkAgeOnLoad);
+    ObjectExtension::GetInstance().Set<GrassIdentity>(actor, std::move(grassIdentity));
+}
+
+void RegisterShuffleGrass() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_GRASS);
+
+    COND_ID_HOOK(OnActorInit, ACTOR_EN_KUSA, shouldRegister, EnKusa_RandomizerInit);
+
+    COND_VB_SHOULD(VB_GRASS_SETUP_DRAW, shouldRegister, {
+        EnKusa* grassActor = va_arg(args, EnKusa*);
+        if (EnKusa_RandomizerHoldsItem(grassActor, gPlayState)) {
+            grassActor->actor.draw = (ActorFunc)EnKusa_RandomizerDraw;
+            *should = false;
+        } else {
+            *should = true;
+        }
+    });
+
+    COND_VB_SHOULD(VB_GRASS_DROP_ITEM, shouldRegister, {
+        EnKusa* grassActor = va_arg(args, EnKusa*);
+        if (EnKusa_RandomizerHoldsItem(grassActor, gPlayState)) {
+            EnKusa_RandomizerSpawnCollectible(grassActor, gPlayState);
+            ObjectExtension::GetInstance().Set<GrassIdentity>(&grassActor->actor, std::move(GrassIdentity{
+                                                                                      .randomizerInf = RAND_INF_MAX,
+                                                                                      .randomizerCheck = RC_MAX,
+                                                                                  }));
+            *should = false;
+        } else {
+            *should = true;
+        }
+    });
+}
+
+void Rando::StaticData::RegisterGrassLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
+    // Overworld Grass
+    //            Randomizer Check                                 	       Randomizer Check                                           Quest         Area                          Scene ID                           Params                          Short Name                    	Hint Text Key                     Vanilla             Spoiler Collection Check
+    locationTable[RC_KF_CHILD_GRASS_1]                                 =   Location::Grass(RC_KF_CHILD_GRASS_1,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(678, 596),     "Child Grass 1",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_1));
+    locationTable[RC_KF_CHILD_GRASS_2]                                 =   Location::Grass(RC_KF_CHILD_GRASS_2,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(594, 542),     "Child Grass 2",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_2));
+    locationTable[RC_KF_CHILD_GRASS_3]                                 =   Location::Grass(RC_KF_CHILD_GRASS_3,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(572, 603),     "Child Grass 3",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_3));
+    locationTable[RC_KF_CHILD_GRASS_4]                                 =   Location::Grass(RC_KF_CHILD_GRASS_4,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(385, 643),     "Child Grass 4",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_4));
+    locationTable[RC_KF_CHILD_GRASS_5]                                 =   Location::Grass(RC_KF_CHILD_GRASS_5,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-498, 696),    "Child Grass 5",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_5));
+    locationTable[RC_KF_CHILD_GRASS_6]                                 =   Location::Grass(RC_KF_CHILD_GRASS_6,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-523, 771),    "Child Grass 6",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_6));
+    locationTable[RC_KF_CHILD_GRASS_7]                                 =   Location::Grass(RC_KF_CHILD_GRASS_7,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-612, 737),    "Child Grass 7",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_7));
+    locationTable[RC_KF_CHILD_GRASS_8]                                 =   Location::Grass(RC_KF_CHILD_GRASS_8,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-671, 671),    "Child Grass 8",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_8));
+    locationTable[RC_KF_CHILD_GRASS_9]                                 =   Location::Grass(RC_KF_CHILD_GRASS_9,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-748, 632),    "Child Grass 9",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_9));
+    locationTable[RC_KF_CHILD_GRASS_10]                                =   Location::Grass(RC_KF_CHILD_GRASS_10,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-757, 708),    "Child Grass 10",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_10));
+    locationTable[RC_KF_CHILD_GRASS_11]                                =   Location::Grass(RC_KF_CHILD_GRASS_11,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-823, 666),    "Child Grass 11",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_11));
+    locationTable[RC_KF_CHILD_GRASS_12]                                =   Location::Grass(RC_KF_CHILD_GRASS_12,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-835, 605),    "Child Grass 12",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_12));
+    locationTable[RC_KF_CHILD_GRASS_MAZE_1]                            =   Location::Grass(RC_KF_CHILD_GRASS_MAZE_1,                  RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-995, 1531),   "Child Grass Maze 1",          RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_MAZE_1));
+    locationTable[RC_KF_CHILD_GRASS_MAZE_2]                            =   Location::Grass(RC_KF_CHILD_GRASS_MAZE_2,                  RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-701, 1882),   "Child Grass Maze 2",          RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_MAZE_2));
+    locationTable[RC_KF_CHILD_GRASS_MAZE_3]                            =   Location::Grass(RC_KF_CHILD_GRASS_MAZE_3,                  RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-295, 2297),   "Child Grass Maze 3",          RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_CHILD_GRASS_MAZE_3));
+    locationTable[RC_KF_ADULT_GRASS_1]                                 =   Location::Grass(RC_KF_ADULT_GRASS_1,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(839, 685),     "Adult Grass 1",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_1));
+    locationTable[RC_KF_ADULT_GRASS_2]                                 =   Location::Grass(RC_KF_ADULT_GRASS_2,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(809, 722),     "Adult Grass 2",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_2));
+    locationTable[RC_KF_ADULT_GRASS_3]                                 =   Location::Grass(RC_KF_ADULT_GRASS_3,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(760, 714),     "Adult Grass 3",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_3));
+    locationTable[RC_KF_ADULT_GRASS_4]                                 =   Location::Grass(RC_KF_ADULT_GRASS_4,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(725, 679),     "Adult Grass 4",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_4));
+    locationTable[RC_KF_ADULT_GRASS_5]                                 =   Location::Grass(RC_KF_ADULT_GRASS_5,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(725, 606),     "Adult Grass 5",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_5));
+    locationTable[RC_KF_ADULT_GRASS_6]                                 =   Location::Grass(RC_KF_ADULT_GRASS_6,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(797, 563),     "Adult Grass 6",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_6));
+    locationTable[RC_KF_ADULT_GRASS_7]                                 =   Location::Grass(RC_KF_ADULT_GRASS_7,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(868, 606),     "Adult Grass 7",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_7));
+    locationTable[RC_KF_ADULT_GRASS_8]                                 =   Location::Grass(RC_KF_ADULT_GRASS_8,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(797, 663),     "Adult Grass 8",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_8));
+    locationTable[RC_KF_ADULT_GRASS_9]                                 =   Location::Grass(RC_KF_ADULT_GRASS_9,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(757, 649),     "Adult Grass 9",               RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_9));
+    locationTable[RC_KF_ADULT_GRASS_10]                                =   Location::Grass(RC_KF_ADULT_GRASS_10,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(773, 610),     "Adult Grass 10",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_10));
+    locationTable[RC_KF_ADULT_GRASS_11]                                =   Location::Grass(RC_KF_ADULT_GRASS_11,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(815, 607),     "Adult Grass 11",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_11));
+    locationTable[RC_KF_ADULT_GRASS_12]                                =   Location::Grass(RC_KF_ADULT_GRASS_12,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(836, 636),     "Adult Grass 12",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_12));
+    locationTable[RC_KF_ADULT_GRASS_13]                                =   Location::Grass(RC_KF_ADULT_GRASS_13,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-772, 654),    "Adult Grass 13",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_13));
+    locationTable[RC_KF_ADULT_GRASS_14]                                =   Location::Grass(RC_KF_ADULT_GRASS_14,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-785, 611),    "Adult Grass 14",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_14));
+    locationTable[RC_KF_ADULT_GRASS_15]                                =   Location::Grass(RC_KF_ADULT_GRASS_15,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-805, 691),    "Adult Grass 15",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_15));
+    locationTable[RC_KF_ADULT_GRASS_16]                                =   Location::Grass(RC_KF_ADULT_GRASS_16,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-822, 644),    "Adult Grass 16",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_16));
+    locationTable[RC_KF_ADULT_GRASS_17]                                =   Location::Grass(RC_KF_ADULT_GRASS_17,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-842, 601),    "Adult Grass 17",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_17));
+    locationTable[RC_KF_ADULT_GRASS_18]                                =   Location::Grass(RC_KF_ADULT_GRASS_18,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-867, 674),    "Adult Grass 18",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_18));
+    locationTable[RC_KF_ADULT_GRASS_19]                                =   Location::Grass(RC_KF_ADULT_GRASS_19,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-498, 0xFF),   "Adult Grass 19",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_19));
+    locationTable[RC_KF_ADULT_GRASS_20]                                =   Location::Grass(RC_KF_ADULT_GRASS_20,                      RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KOKIRI_FOREST,    TWO_ACTOR_PARAMS(-523, 0xFF),   "Adult Grass 20",              RHT_KF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_ADULT_GRASS_20));
+    locationTable[RC_LW_GRASS_1]                                       =   Location::Grass(RC_LW_GRASS_1,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(676, -651),    "Near Shortcuts Grass 1",      RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_1));
+    locationTable[RC_LW_GRASS_2]                                       =   Location::Grass(RC_LW_GRASS_2,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(633, -676),    "Near Shortcuts Grass 2",      RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_2));
+    locationTable[RC_LW_GRASS_3]                                       =   Location::Grass(RC_LW_GRASS_3,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(645, -638),    "Near Shortcuts Grass 3",      RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_3));
+    locationTable[RC_LW_GRASS_4]                                       =   Location::Grass(RC_LW_GRASS_4,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(1476, -2251),  "After Mido Grass 1",          RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_4));
+    locationTable[RC_LW_GRASS_5]                                       =   Location::Grass(RC_LW_GRASS_5,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(1433, -2276),  "After Mido Grass 2",          RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_5));
+    locationTable[RC_LW_GRASS_6]                                       =   Location::Grass(RC_LW_GRASS_6,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(1445, -2238),  "After Mido Grass 3",          RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_6));
+    locationTable[RC_LW_GRASS_7]                                       =   Location::Grass(RC_LW_GRASS_7,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(926, -2232),   "Near SFM Grass 1",            RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_7));
+    locationTable[RC_LW_GRASS_8]                                       =   Location::Grass(RC_LW_GRASS_8,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(965, -2241),   "Near SFM Grass 2",            RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_8));
+    locationTable[RC_LW_GRASS_9]                                       =   Location::Grass(RC_LW_GRASS_9,                             RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_LOST_WOODS,       TWO_ACTOR_PARAMS(952, -2275),   "Near SFM Grass 3",            RHT_LW_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_GRASS_9));
+    locationTable[RC_MARKET_GRASS_1]                                   =   Location::Grass(RC_MARKET_GRASS_1,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(-106, 277),    "Market Grass 1",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_1));
+    locationTable[RC_MARKET_GRASS_2]                                   =   Location::Grass(RC_MARKET_GRASS_2,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(-131, 225),    "Market Grass 2",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_2));
+    locationTable[RC_MARKET_GRASS_3]                                   =   Location::Grass(RC_MARKET_GRASS_3,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(504, -546),    "Market Grass 3",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_3));
+    locationTable[RC_MARKET_GRASS_4]                                   =   Location::Grass(RC_MARKET_GRASS_4,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(465, -548),    "Market Grass 4",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_4));
+    locationTable[RC_MARKET_GRASS_5]                                   =   Location::Grass(RC_MARKET_GRASS_5,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(432, -548),    "Market Grass 5",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_5));
+    locationTable[RC_MARKET_GRASS_6]                                   =   Location::Grass(RC_MARKET_GRASS_6,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(73, -428),     "Market Grass 6",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_6));
+    locationTable[RC_MARKET_GRASS_7]                                   =   Location::Grass(RC_MARKET_GRASS_7,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(75, -310),     "Market Grass 7",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_7));
+    locationTable[RC_MARKET_GRASS_8]                                   =   Location::Grass(RC_MARKET_GRASS_8,                         RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_DAY,       TWO_ACTOR_PARAMS(76, -190),     "Market Grass 8",              RHT_MARKET_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MARKET_GRASS_8));
+    locationTable[RC_HC_GRASS_1]                                       =   Location::Grass(RC_HC_GRASS_1,                             RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,    TWO_ACTOR_PARAMS(1035, 882),    "Near Storms Grotto Grass 1",  RHT_HC_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GRASS_1));
+    locationTable[RC_HC_GRASS_2]                                       =   Location::Grass(RC_HC_GRASS_2,                             RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_HYRULE_CASTLE,    TWO_ACTOR_PARAMS(975, 919),     "Near Storms Grotto Grass 2",  RHT_HC_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_GRASS_2));
+    locationTable[RC_KAK_GRASS_1]                                      =   Location::Grass(RC_KAK_GRASS_1,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(1116, 1581),   "Near Graveyard Grass 1",      RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_1));
+    locationTable[RC_KAK_GRASS_2]                                      =   Location::Grass(RC_KAK_GRASS_2,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(1103, 1532),   "Near Graveyard Grass 2",      RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_2));
+    locationTable[RC_KAK_GRASS_3]                                      =   Location::Grass(RC_KAK_GRASS_3,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(1072, 1592),   "Near Graveyard Grass 3",      RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_3));
+    locationTable[RC_KAK_GRASS_4]                                      =   Location::Grass(RC_KAK_GRASS_4,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(-800, 521),    "Tree Grass 1",                RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_4));
+    locationTable[RC_KAK_GRASS_5]                                      =   Location::Grass(RC_KAK_GRASS_5,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(-826, 585),    "Tree Grass 2",                RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_5));
+    locationTable[RC_KAK_GRASS_6]                                      =   Location::Grass(RC_KAK_GRASS_6,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(-827, 465),    "Tree Grass 3",                RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_6));
+    locationTable[RC_KAK_GRASS_7]                                      =   Location::Grass(RC_KAK_GRASS_7,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(-883, 582),    "Tree Grass 4",                RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_7));
+    locationTable[RC_KAK_GRASS_8]                                      =   Location::Grass(RC_KAK_GRASS_8,                            RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE, TWO_ACTOR_PARAMS(-887, 467),    "Tree Grass 5",                RHT_KAK_GRASS,                    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_GRASS_8));
+    locationTable[RC_GY_GRASS_1]                                       =   Location::Grass(RC_GY_GRASS_1,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1059, 732),   "Graveyard Grass 1",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_1));
+    locationTable[RC_GY_GRASS_2]                                       =   Location::Grass(RC_GY_GRASS_2,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1089, 769),   "Graveyard Grass 2",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_2));
+    locationTable[RC_GY_GRASS_3]                                       =   Location::Grass(RC_GY_GRASS_3,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1138, 761),   "Graveyard Grass 3",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_3));
+    locationTable[RC_GY_GRASS_4]                                       =   Location::Grass(RC_GY_GRASS_4,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1173, 726),   "Graveyard Grass 4",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_4));
+    locationTable[RC_GY_GRASS_5]                                       =   Location::Grass(RC_GY_GRASS_5,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1173, 653),   "Graveyard Grass 5",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_5));
+    locationTable[RC_GY_GRASS_6]                                       =   Location::Grass(RC_GY_GRASS_6,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1102, 610),   "Graveyard Grass 6",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_6));
+    locationTable[RC_GY_GRASS_7]                                       =   Location::Grass(RC_GY_GRASS_7,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1030, 653),   "Graveyard Grass 7",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_7));
+    locationTable[RC_GY_GRASS_8]                                       =   Location::Grass(RC_GY_GRASS_8,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1102, 710),   "Graveyard Grass 8",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_8));
+    locationTable[RC_GY_GRASS_9]                                       =   Location::Grass(RC_GY_GRASS_9,                             RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1141, 696),   "Graveyard Grass 9",           RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_9));
+    locationTable[RC_GY_GRASS_10]                                      =   Location::Grass(RC_GY_GRASS_10,                            RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1125, 657),   "Graveyard Grass 10",          RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_10));
+    locationTable[RC_GY_GRASS_11]                                      =   Location::Grass(RC_GY_GRASS_11,                            RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1083, 654),   "Graveyard Grass 11",          RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_11));
+    locationTable[RC_GY_GRASS_12]                                      =   Location::Grass(RC_GY_GRASS_12,                            RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_GRAVEYARD,        TWO_ACTOR_PARAMS(-1062, 683),   "Graveyard Grass 12",          RHT_GY_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_GRASS_12));
+    locationTable[RC_LH_GRASS_1]                                       =   Location::Grass(RC_LH_GRASS_1,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1637, 2796),  "LH Grass 1",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_1));
+    locationTable[RC_LH_GRASS_2]                                       =   Location::Grass(RC_LH_GRASS_2,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1667, 2833),  "LH Grass 2",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_2));
+    locationTable[RC_LH_GRASS_3]                                       =   Location::Grass(RC_LH_GRASS_3,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1716, 2825),  "LH Grass 3",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_3));
+    locationTable[RC_LH_GRASS_4]                                       =   Location::Grass(RC_LH_GRASS_4,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1751, 2790),  "LH Grass 4",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_4));
+    locationTable[RC_LH_GRASS_5]                                       =   Location::Grass(RC_LH_GRASS_5,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1751, 2717),  "LH Grass 5",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_5));
+    locationTable[RC_LH_GRASS_6]                                       =   Location::Grass(RC_LH_GRASS_6,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1680, 2674),  "LH Grass 6",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_6));
+    locationTable[RC_LH_GRASS_7]                                       =   Location::Grass(RC_LH_GRASS_7,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1608, 2717),  "LH Grass 7",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_7));
+    locationTable[RC_LH_GRASS_8]                                       =   Location::Grass(RC_LH_GRASS_8,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1680, 2774),  "LH Grass 8",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_8));
+    locationTable[RC_LH_GRASS_9]                                       =   Location::Grass(RC_LH_GRASS_9,                             RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1719, 2760),  "LH Grass 9",                  RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_9));
+    locationTable[RC_LH_GRASS_10]                                      =   Location::Grass(RC_LH_GRASS_10,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1703, 2721),  "LH Grass 10",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_10));
+    locationTable[RC_LH_GRASS_11]                                      =   Location::Grass(RC_LH_GRASS_11,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1661, 2718),  "LH Grass 11",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_11));
+    locationTable[RC_LH_GRASS_12]                                      =   Location::Grass(RC_LH_GRASS_12,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1640, 2747),  "LH Grass 12",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_12));
+    locationTable[RC_LH_GRASS_13]                                      =   Location::Grass(RC_LH_GRASS_13,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2028, 2542),  "LH Grass 13",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_13));
+    locationTable[RC_LH_GRASS_14]                                      =   Location::Grass(RC_LH_GRASS_14,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2058, 2579),  "LH Grass 14",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_14));
+    locationTable[RC_LH_GRASS_15]                                      =   Location::Grass(RC_LH_GRASS_15,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2107, 2571),  "LH Grass 15",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_15));
+    locationTable[RC_LH_GRASS_16]                                      =   Location::Grass(RC_LH_GRASS_16,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2142, 2536),  "LH Grass 16",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_16));
+    locationTable[RC_LH_GRASS_17]                                      =   Location::Grass(RC_LH_GRASS_17,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2142, 2463),  "LH Grass 17",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_17));
+    locationTable[RC_LH_GRASS_18]                                      =   Location::Grass(RC_LH_GRASS_18,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2071, 2420),  "LH Grass 18",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_18));
+    locationTable[RC_LH_GRASS_19]                                      =   Location::Grass(RC_LH_GRASS_19,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-1999, 2463),  "LH Grass 19",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_19));
+    locationTable[RC_LH_GRASS_20]                                      =   Location::Grass(RC_LH_GRASS_20,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2071, 2520),  "LH Grass 20",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_20));
+    locationTable[RC_LH_GRASS_21]                                      =   Location::Grass(RC_LH_GRASS_21,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2110, 2506),  "LH Grass 21",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_21));
+    locationTable[RC_LH_GRASS_22]                                      =   Location::Grass(RC_LH_GRASS_22,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2094, 2467),  "LH Grass 22",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_22));
+    locationTable[RC_LH_GRASS_23]                                      =   Location::Grass(RC_LH_GRASS_23,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2052, 2464),  "LH Grass 23",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_23));
+    locationTable[RC_LH_GRASS_24]                                      =   Location::Grass(RC_LH_GRASS_24,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2031, 2493),  "LH Grass 24",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_24));
+    locationTable[RC_LH_GRASS_25]                                      =   Location::Grass(RC_LH_GRASS_25,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2204, 3050),  "LH Grass 25",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_25));
+    locationTable[RC_LH_GRASS_26]                                      =   Location::Grass(RC_LH_GRASS_26,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2234, 3087),  "LH Grass 26",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_26));
+    locationTable[RC_LH_GRASS_27]                                      =   Location::Grass(RC_LH_GRASS_27,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2283, 3079),  "LH Grass 27",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_27));
+    locationTable[RC_LH_GRASS_28]                                      =   Location::Grass(RC_LH_GRASS_28,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2318, 3044),  "LH Grass 28",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_28));
+    locationTable[RC_LH_GRASS_29]                                      =   Location::Grass(RC_LH_GRASS_29,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2318, 2971),  "LH Grass 29",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_29));
+    locationTable[RC_LH_GRASS_30]                                      =   Location::Grass(RC_LH_GRASS_30,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2247, 2928),  "LH Grass 30",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_30));
+    locationTable[RC_LH_GRASS_31]                                      =   Location::Grass(RC_LH_GRASS_31,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2175, 2971),  "LH Grass 31",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_31));
+    locationTable[RC_LH_GRASS_32]                                      =   Location::Grass(RC_LH_GRASS_32,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2247, 3028),  "LH Grass 32",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_32));
+    locationTable[RC_LH_GRASS_33]                                      =   Location::Grass(RC_LH_GRASS_33,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2286, 3014),  "LH Grass 33",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_33));
+    locationTable[RC_LH_GRASS_34]                                      =   Location::Grass(RC_LH_GRASS_34,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2270, 2975),  "LH Grass 34",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_34));
+    locationTable[RC_LH_GRASS_35]                                      =   Location::Grass(RC_LH_GRASS_35,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2228, 2972),  "LH Grass 35",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_35));
+    locationTable[RC_LH_GRASS_36]                                      =   Location::Grass(RC_LH_GRASS_36,                            RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-2207, 3001),  "LH Grass 36",                 RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_GRASS_36));
+    locationTable[RC_LH_CHILD_GRASS_1]                                 =   Location::Grass(RC_LH_CHILD_GRASS_1,                       RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(13, 2735),     "LH Child Grass 1",            RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_CHILD_GRASS_1));
+    locationTable[RC_LH_CHILD_GRASS_2]                                 =   Location::Grass(RC_LH_CHILD_GRASS_2,                       RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-77, 2891),    "LH Child Grass 2",            RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_CHILD_GRASS_2));
+    locationTable[RC_LH_CHILD_GRASS_3]                                 =   Location::Grass(RC_LH_CHILD_GRASS_3,                       RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-222, 2888),   "LH Child Grass 3",            RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_CHILD_GRASS_3));
+    locationTable[RC_LH_CHILD_GRASS_4]                                 =   Location::Grass(RC_LH_CHILD_GRASS_4,                       RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-295, 2973),   "LH Child Grass 4",            RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_CHILD_GRASS_4));
+    locationTable[RC_LH_WARP_PAD_GRASS_1]                              =   Location::Grass(RC_LH_WARP_PAD_GRASS_1,                    RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-613, 7369),   "LH Warp Pad Grass 1",         RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_WARP_PAD_GRASS_1));
+    locationTable[RC_LH_WARP_PAD_GRASS_2]                              =   Location::Grass(RC_LH_WARP_PAD_GRASS_2,                    RCQUEST_BOTH, RCAREA_LAKE_HYLIA,            SCENE_LAKE_HYLIA,       TWO_ACTOR_PARAMS(-662, 7352),   "LH Warp Pad Grass 2",         RHT_LH_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_WARP_PAD_GRASS_2));
+    locationTable[RC_HF_NEAR_KF_GRASS_1]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_1,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3186, 7571),   "Near KF Grass 1",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_1));
+    locationTable[RC_HF_NEAR_KF_GRASS_2]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_2,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3156, 7608),   "Near KF Grass 2",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_2));
+    locationTable[RC_HF_NEAR_KF_GRASS_3]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_3,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3107, 7600),   "Near KF Grass 3",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_3));
+    locationTable[RC_HF_NEAR_KF_GRASS_4]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_4,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3072, 7565),   "Near KF Grass 4",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_4));
+    locationTable[RC_HF_NEAR_KF_GRASS_5]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_5,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3072, 7492),   "Near KF Grass 5",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_5));
+    locationTable[RC_HF_NEAR_KF_GRASS_6]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_6,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3144, 7449),   "Near KF Grass 6",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_6));
+    locationTable[RC_HF_NEAR_KF_GRASS_7]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_7,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3215, 7492),   "Near KF Grass 7",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_7));
+    locationTable[RC_HF_NEAR_KF_GRASS_8]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_8,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3144, 7549),   "Near KF Grass 8",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_8));
+    locationTable[RC_HF_NEAR_KF_GRASS_9]                               =   Location::Grass(RC_HF_NEAR_KF_GRASS_9,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3104, 7535),   "Near KF Grass 9",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_9));
+    locationTable[RC_HF_NEAR_KF_GRASS_10]                              =   Location::Grass(RC_HF_NEAR_KF_GRASS_10,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3120, 7496),   "Near KF Grass 10",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_10));
+    locationTable[RC_HF_NEAR_KF_GRASS_11]                              =   Location::Grass(RC_HF_NEAR_KF_GRASS_11,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3162, 7493),   "Near KF Grass 11",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_11));
+    locationTable[RC_HF_NEAR_KF_GRASS_12]                              =   Location::Grass(RC_HF_NEAR_KF_GRASS_12,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(3183, 7522),   "Near KF Grass 12",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_KF_GRASS_12));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_1]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_1,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(950, 3613),    "Near Market Grass 1",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_1));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_2]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_2,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(920, 3650),    "Near Market Grass 2",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_2));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_3]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_3,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(871, 3642),    "Near Market Grass 3",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_3));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_4]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_4,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(836, 3607),    "Near Market Grass 4",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_4));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_5]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_5,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(836, 3534),    "Near Market Grass 5",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_5));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_6]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_6,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(908, 3491),    "Near Market Grass 6",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_6));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_7]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_7,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(979, 3534),    "Near Market Grass 7",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_7));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_8]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_8,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(908, 3591),    "Near Market Grass 8",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_8));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_9]                           =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_9,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(868, 3577),    "Near Market Grass 9",         RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_9));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_10]                          =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_10,                RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(884, 3538),    "Near Market Grass 10",        RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_10));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_11]                          =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_11,                RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(926, 3535),    "Near Market Grass 11",        RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_11));
+    locationTable[RC_HF_NEAR_MARKET_GRASS_12]                          =   Location::Grass(RC_HF_NEAR_MARKET_GRASS_12,                RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(947, 3564),    "Near Market Grass 12",        RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GRASS_12));
+    locationTable[RC_HF_SOUTH_GRASS_1]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_1,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-483, 11329),  "South Grass 1",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_1));
+    locationTable[RC_HF_SOUTH_GRASS_2]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_2,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-518, 11294),  "South Grass 2",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_2));
+    locationTable[RC_HF_SOUTH_GRASS_3]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_3,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-518, 11221),  "South Grass 3",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_3));
+    locationTable[RC_HF_SOUTH_GRASS_4]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_4,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-447, 11178),  "South Grass 4",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_4));
+    locationTable[RC_HF_SOUTH_GRASS_5]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_5,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-375, 11221),  "South Grass 5",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_5));
+    locationTable[RC_HF_SOUTH_GRASS_6]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_6,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-447, 11278),  "South Grass 6",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_6));
+    locationTable[RC_HF_SOUTH_GRASS_7]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_7,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-486, 11264),  "South Grass 7",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_7));
+    locationTable[RC_HF_SOUTH_GRASS_8]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_8,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-470, 11225),  "South Grass 8",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_8));
+    locationTable[RC_HF_SOUTH_GRASS_9]                                 =   Location::Grass(RC_HF_SOUTH_GRASS_9,                       RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-428, 11222),  "South Grass 9",               RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_9));
+    locationTable[RC_HF_SOUTH_GRASS_10]                                =   Location::Grass(RC_HF_SOUTH_GRASS_10,                      RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-407, 11251),  "South Grass 10",              RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_10));
+    locationTable[RC_HF_SOUTH_GRASS_11]                                =   Location::Grass(RC_HF_SOUTH_GRASS_11,                      RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-404, 11300),  "South Grass 11",              RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_11));
+    locationTable[RC_HF_SOUTH_GRASS_12]                                =   Location::Grass(RC_HF_SOUTH_GRASS_12,                      RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-434, 11337),  "South Grass 12",              RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTH_GRASS_12));
+    locationTable[RC_HF_CENTRAL_GRASS_1]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_1,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-948, 9981),   "Central Grass 1",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_1));
+    locationTable[RC_HF_CENTRAL_GRASS_2]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_2,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-978, 10018),  "Central Grass 2",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_2));
+    locationTable[RC_HF_CENTRAL_GRASS_3]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_3,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-1027, 10010), "Central Grass 3",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_3));
+    locationTable[RC_HF_CENTRAL_GRASS_4]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_4,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-1062, 9975),  "Central Grass 4",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_4));
+    locationTable[RC_HF_CENTRAL_GRASS_5]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_5,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-1062, 9902),  "Central Grass 5",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_5));
+    locationTable[RC_HF_CENTRAL_GRASS_6]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_6,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-991, 9859),   "Central Grass 6",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_6));
+    locationTable[RC_HF_CENTRAL_GRASS_7]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_7,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-919, 9902),   "Central Grass 7",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_7));
+    locationTable[RC_HF_CENTRAL_GRASS_8]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_8,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-991, 9959),   "Central Grass 8",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_8));
+    locationTable[RC_HF_CENTRAL_GRASS_9]                               =   Location::Grass(RC_HF_CENTRAL_GRASS_9,                     RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-1030, 9945),  "Central Grass 9",             RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_9));
+    locationTable[RC_HF_CENTRAL_GRASS_10]                              =   Location::Grass(RC_HF_CENTRAL_GRASS_10,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-1014, 9906),  "Central Grass 10",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_10));
+    locationTable[RC_HF_CENTRAL_GRASS_11]                              =   Location::Grass(RC_HF_CENTRAL_GRASS_11,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-972, 9903),   "Central Grass 11",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_11));
+    locationTable[RC_HF_CENTRAL_GRASS_12]                              =   Location::Grass(RC_HF_CENTRAL_GRASS_12,                    RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_HYRULE_FIELD,     TWO_ACTOR_PARAMS(-951, 9932),   "Central Grass 12",            RHT_HF_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_CENTRAL_GRASS_12));
+    locationTable[RC_ZR_GRASS_1]                                       =   Location::Grass(RC_ZR_GRASS_1,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1495, 1022),  "Near Tree Grass 1",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_1));
+    locationTable[RC_ZR_GRASS_2]                                       =   Location::Grass(RC_ZR_GRASS_2,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1465, 985),   "Near Tree Grass 2",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_2));
+    locationTable[RC_ZR_GRASS_3]                                       =   Location::Grass(RC_ZR_GRASS_3,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1544, 1014),  "Near Tree Grass 3",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_3));
+    locationTable[RC_ZR_GRASS_4]                                       =   Location::Grass(RC_ZR_GRASS_4,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1579, 979),   "Near Tree Grass 4",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_4));
+    locationTable[RC_ZR_GRASS_5]                                       =   Location::Grass(RC_ZR_GRASS_5,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1579, 906),   "Near Tree Grass 5",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_5));
+    locationTable[RC_ZR_GRASS_6]                                       =   Location::Grass(RC_ZR_GRASS_6,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1508, 863),   "Near Tree Grass 6",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_6));
+    locationTable[RC_ZR_GRASS_7]                                       =   Location::Grass(RC_ZR_GRASS_7,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1508, 963),   "Near Tree Grass 7",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_7));
+    locationTable[RC_ZR_GRASS_8]                                       =   Location::Grass(RC_ZR_GRASS_8,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1547, 949),   "Near Tree Grass 8",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_8));
+    locationTable[RC_ZR_GRASS_9]                                       =   Location::Grass(RC_ZR_GRASS_9,                             RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1531, 910),   "Near Tree Grass 9",           RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_9));
+    locationTable[RC_ZR_GRASS_10]                                      =   Location::Grass(RC_ZR_GRASS_10,                            RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1489, 907),   "Near Tree Grass 10",          RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_10));
+    locationTable[RC_ZR_GRASS_11]                                      =   Location::Grass(RC_ZR_GRASS_11,                            RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1468, 936),   "Near Tree Grass 11",          RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_11));
+    locationTable[RC_ZR_GRASS_12]                                      =   Location::Grass(RC_ZR_GRASS_12,                            RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(-1436, 906),   "Near Tree Grass 12",          RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_12));
+    locationTable[RC_ZR_NEAR_FREESTANDING_POH_GRASS]                   =   Location::Grass(RC_ZR_NEAR_FREESTANDING_POH_GRASS,         RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_ZORAS_RIVER,      TWO_ACTOR_PARAMS(231, -1478),   "Near Freestanding PoH Grass", RHT_ZR_GRASS,                     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS));
+    // Grotto Grass
+    locationTable[RC_KF_STORMS_GROTTO_GRASS_1]                         =   Location::Grass(RC_KF_STORMS_GROTTO_GRASS_1,               RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x2C),                "Storms Grotto Grass 1",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_1));
+    locationTable[RC_KF_STORMS_GROTTO_GRASS_2]                         =   Location::Grass(RC_KF_STORMS_GROTTO_GRASS_2,               RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x2C),               "Storms Grotto Grass 2",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_2));
+    locationTable[RC_KF_STORMS_GROTTO_GRASS_3]                         =   Location::Grass(RC_KF_STORMS_GROTTO_GRASS_3,               RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x2C),               "Storms Grotto Grass 3",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_3));
+    locationTable[RC_KF_STORMS_GROTTO_GRASS_4]                         =   Location::Grass(RC_KF_STORMS_GROTTO_GRASS_4,               RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x2C),               "Storms Grotto Grass 4",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_4));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1]                 =   Location::Grass(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1,       RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x14),                "Near Shortcuts Grotto Grass 1", RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2]                 =   Location::Grass(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2,       RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x14),               "Near Shortcuts Grotto Grass 2", RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3]                 =   Location::Grass(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3,       RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x14),               "Near Shortcuts Grotto Grass 3", RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3));
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4]                 =   Location::Grass(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4,       RCQUEST_BOTH, RCAREA_LOST_WOODS,            SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x14),               "Near Shortcuts Grotto Grass 4", RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GRASS_1]                    =   Location::Grass(RC_HF_NEAR_MARKET_GROTTO_GRASS_1,          RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x00),                "Near Market Grotto Grass 1",    RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_1));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GRASS_2]                    =   Location::Grass(RC_HF_NEAR_MARKET_GROTTO_GRASS_2,          RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x00),               "Near Market Grotto Grass 2",    RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_2));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GRASS_3]                    =   Location::Grass(RC_HF_NEAR_MARKET_GROTTO_GRASS_3,          RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x00),               "Near Market Grotto Grass 3",    RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_3));
+    locationTable[RC_HF_NEAR_MARKET_GROTTO_GRASS_4]                    =   Location::Grass(RC_HF_NEAR_MARKET_GROTTO_GRASS_4,          RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x00),               "Near Market Grotto Grass 4",    RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_4));
+    locationTable[RC_HF_OPEN_GROTTO_GRASS_1]                           =   Location::Grass(RC_HF_OPEN_GROTTO_GRASS_1,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x03),                "Open Grotto Grass 1",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GRASS_1));
+    locationTable[RC_HF_OPEN_GROTTO_GRASS_2]                           =   Location::Grass(RC_HF_OPEN_GROTTO_GRASS_2,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x03),               "Open Grotto Grass 2",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GRASS_2));
+    locationTable[RC_HF_OPEN_GROTTO_GRASS_3]                           =   Location::Grass(RC_HF_OPEN_GROTTO_GRASS_3,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x03),               "Open Grotto Grass 3",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GRASS_3));
+    locationTable[RC_HF_OPEN_GROTTO_GRASS_4]                           =   Location::Grass(RC_HF_OPEN_GROTTO_GRASS_4,                 RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x03),               "Open Grotto Grass 4",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_OPEN_GROTTO_GRASS_4));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GRASS_1]                      =   Location::Grass(RC_HF_SOUTHEAST_GROTTO_GRASS_1,            RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x22),                "Southeast Grotto Grass 1",      RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_1));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GRASS_2]                      =   Location::Grass(RC_HF_SOUTHEAST_GROTTO_GRASS_2,            RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x22),               "Southeast Grotto Grass 2",      RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_2));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GRASS_3]                      =   Location::Grass(RC_HF_SOUTHEAST_GROTTO_GRASS_3,            RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x22),               "Southeast Grotto Grass 3",      RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_3));
+    locationTable[RC_HF_SOUTHEAST_GROTTO_GRASS_4]                      =   Location::Grass(RC_HF_SOUTHEAST_GROTTO_GRASS_4,            RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x22),               "Southeast Grotto Grass 4",      RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_4));
+    locationTable[RC_HF_COW_GROTTO_GRASS_1]                            =   Location::Grass(RC_HF_COW_GROTTO_GRASS_1,                  RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(3419, 0xE4),             "Cow Grotto Grass 1",            RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GRASS_1));
+    locationTable[RC_HF_COW_GROTTO_GRASS_2]                            =   Location::Grass(RC_HF_COW_GROTTO_GRASS_2,                  RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS, TWO_ACTOR_PARAMS(3518, 0xE4),             "Cow Grotto Grass 2",            RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_GRASS_2));
+    locationTable[RC_KAK_OPEN_GROTTO_GRASS_1]                          =   Location::Grass(RC_KAK_OPEN_GROTTO_GRASS_1,                RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x28),                "Open Grotto Grass 1",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GRASS_1));
+    locationTable[RC_KAK_OPEN_GROTTO_GRASS_2]                          =   Location::Grass(RC_KAK_OPEN_GROTTO_GRASS_2,                RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x28),               "Open Grotto Grass 2",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GRASS_2));
+    locationTable[RC_KAK_OPEN_GROTTO_GRASS_3]                          =   Location::Grass(RC_KAK_OPEN_GROTTO_GRASS_3,                RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x28),               "Open Grotto Grass 3",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GRASS_3));
+    locationTable[RC_KAK_OPEN_GROTTO_GRASS_4]                          =   Location::Grass(RC_KAK_OPEN_GROTTO_GRASS_4,                RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x28),               "Open Grotto Grass 4",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_OPEN_GROTTO_GRASS_4));
+    locationTable[RC_DMT_STORMS_GROTTO_GRASS_1]                        =   Location::Grass(RC_DMT_STORMS_GROTTO_GRASS_1,              RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x57),                "Storms Grotto Grass 1",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GRASS_1));
+    locationTable[RC_DMT_STORMS_GROTTO_GRASS_2]                        =   Location::Grass(RC_DMT_STORMS_GROTTO_GRASS_2,              RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x57),               "Storms Grotto Grass 2",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GRASS_2));
+    locationTable[RC_DMT_STORMS_GROTTO_GRASS_3]                        =   Location::Grass(RC_DMT_STORMS_GROTTO_GRASS_3,              RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x57),               "Storms Grotto Grass 3",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GRASS_3));
+    locationTable[RC_DMT_STORMS_GROTTO_GRASS_4]                        =   Location::Grass(RC_DMT_STORMS_GROTTO_GRASS_4,              RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x57),               "Storms Grotto Grass 4",         RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_STORMS_GROTTO_GRASS_4));
+    locationTable[RC_DMT_COW_GROTTO_GRASS_1]                           =   Location::Grass(RC_DMT_COW_GROTTO_GRASS_1,                 RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(2443, 0xF8),             "Cow Grotto Grass 1",            RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_COW_GROTTO_GRASS_1));
+    locationTable[RC_DMT_COW_GROTTO_GRASS_2]                           =   Location::Grass(RC_DMT_COW_GROTTO_GRASS_2,                 RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS, TWO_ACTOR_PARAMS(2494, 0xF8),             "Cow Grotto Grass 2",            RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMT_COW_GROTTO_GRASS_2));
+    locationTable[RC_DMC_UPPER_GROTTO_GRASS_1]                         =   Location::Grass(RC_DMC_UPPER_GROTTO_GRASS_1,               RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x7A),                "Upper Grotto Grass 1",          RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GRASS_1));
+    locationTable[RC_DMC_UPPER_GROTTO_GRASS_2]                         =   Location::Grass(RC_DMC_UPPER_GROTTO_GRASS_2,               RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x7A),               "Upper Grotto Grass 2",          RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GRASS_2));
+    locationTable[RC_DMC_UPPER_GROTTO_GRASS_3]                         =   Location::Grass(RC_DMC_UPPER_GROTTO_GRASS_3,               RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x7A),               "Upper Grotto Grass 3",          RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GRASS_3));
+    locationTable[RC_DMC_UPPER_GROTTO_GRASS_4]                         =   Location::Grass(RC_DMC_UPPER_GROTTO_GRASS_4,               RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x7A),               "Upper Grotto Grass 4",          RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_UPPER_GROTTO_GRASS_4));
+    locationTable[RC_ZR_OPEN_GROTTO_GRASS_1]                           =   Location::Grass(RC_ZR_OPEN_GROTTO_GRASS_1,                 RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x29),                "Open Grotto Grass 1",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GRASS_1));
+    locationTable[RC_ZR_OPEN_GROTTO_GRASS_2]                           =   Location::Grass(RC_ZR_OPEN_GROTTO_GRASS_2,                 RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x29),               "Open Grotto Grass 2",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GRASS_2));
+    locationTable[RC_ZR_OPEN_GROTTO_GRASS_3]                           =   Location::Grass(RC_ZR_OPEN_GROTTO_GRASS_3,                 RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_GROTTOS, TWO_ACTOR_PARAMS(-3, 0x29),               "Open Grotto Grass 3",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GRASS_3));
+    locationTable[RC_ZR_OPEN_GROTTO_GRASS_4]                           =   Location::Grass(RC_ZR_OPEN_GROTTO_GRASS_4,                 RCQUEST_BOTH, RCAREA_ZORAS_RIVER,           SCENE_GROTTOS, TWO_ACTOR_PARAMS(13, 0x29),               "Open Grotto Grass 4",           RHT_GROTTO_GRASS,                 RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_OPEN_GROTTO_GRASS_4));
+    // Dungeon Grass
+    locationTable[RC_DEKU_TREE_LOBBY_GRASS_1]                          =   Location::Grass(RC_DEKU_TREE_LOBBY_GRASS_1,                                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(391, -156),    "Lobby Grass 1",                 RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_LOBBY_GRASS_1));
+    locationTable[RC_DEKU_TREE_LOBBY_GRASS_2]                          =   Location::Grass(RC_DEKU_TREE_LOBBY_GRASS_2,                                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(355, -233),    "Lobby Grass 2",                 RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_LOBBY_GRASS_2));
+    locationTable[RC_DEKU_TREE_LOBBY_GRASS_3]                          =   Location::Grass(RC_DEKU_TREE_LOBBY_GRASS_3,                                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(307, -289),    "Lobby Grass 3",                 RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_LOBBY_GRASS_3));
+    locationTable[RC_DEKU_TREE_LOBBY_GRASS_4]                          =   Location::Grass(RC_DEKU_TREE_LOBBY_GRASS_4,                                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(80, -414),     "Lobby Grass 4",                 RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_LOBBY_GRASS_4));
+    locationTable[RC_DEKU_TREE_LOBBY_GRASS_5]                          =   Location::Grass(RC_DEKU_TREE_LOBBY_GRASS_5,                                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(142, -399),    "Lobby Grass 5",                 RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_LOBBY_GRASS_5));
+    locationTable[RC_DEKU_TREE_SLINGSHOT_GRASS_1]                      =   Location::Grass(RC_DEKU_TREE_SLINGSHOT_GRASS_1,                               RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1018, 1263),  "Slingshot Grass 1",             RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_1));
+    locationTable[RC_DEKU_TREE_SLINGSHOT_GRASS_2]                      =   Location::Grass(RC_DEKU_TREE_SLINGSHOT_GRASS_2,                               RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1005, 1216),  "Slingshot Grass 2",             RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_2));
+    locationTable[RC_DEKU_TREE_SLINGSHOT_GRASS_3]                      =   Location::Grass(RC_DEKU_TREE_SLINGSHOT_GRASS_3,                               RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1280, 1026),  "Slingshot Grass 3",             RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_3));
+    locationTable[RC_DEKU_TREE_SLINGSHOT_GRASS_4]                      =   Location::Grass(RC_DEKU_TREE_SLINGSHOT_GRASS_4,                               RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1229, 1006),  "Slingshot Grass 4",             RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_4));
+    locationTable[RC_DEKU_TREE_COMPASS_GRASS_1]                        =   Location::Grass(RC_DEKU_TREE_COMPASS_GRASS_1,                                 RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1444, 169),   "Compass Grass 1",               RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_COMPASS_GRASS_1));
+    locationTable[RC_DEKU_TREE_COMPASS_GRASS_2]                        =   Location::Grass(RC_DEKU_TREE_COMPASS_GRASS_2,                                 RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1516, 142),   "Compass Grass 2",               RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_COMPASS_GRASS_2));
+    locationTable[RC_DEKU_TREE_BASEMENT_GRASS_1]                       =   Location::Grass(RC_DEKU_TREE_BASEMENT_GRASS_1,                                RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(48, 130),      "Basement Grass 1",              RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_GRASS_1));
+    locationTable[RC_DEKU_TREE_BASEMENT_GRASS_2]                       =   Location::Grass(RC_DEKU_TREE_BASEMENT_GRASS_2,                                RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(48, 187),      "Basement Grass 2",              RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_GRASS_2));
+    locationTable[RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1]            =   Location::Grass(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1,                     RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-228, 792),    "Eye Switch Grass 1",            RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1));
+    locationTable[RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2]            =   Location::Grass(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2,                     RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-202, 751),    "Eye Switch Grass 2",            RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2));
+    locationTable[RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3]            =   Location::Grass(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3,                     RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(79, 794),      "Eye Switch Grass 3",            RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3));
+    locationTable[RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4]            =   Location::Grass(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4,                     RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(49, 752),      "Eye Switch Grass 4",            RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4));
+    locationTable[RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1]          =   Location::Grass(RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1,                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1310, 840),   "Spike Roller Grass 1",          RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1));
+    locationTable[RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2]          =   Location::Grass(RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2,                   RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1361, 840),   "Spike Roller Grass 2",          RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2));
+    locationTable[RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_1]               =   Location::Grass(RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_1,                        RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1796, 821),   "Torches Grass 1",               RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_1));
+    locationTable[RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_2]               =   Location::Grass(RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_2,                        RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1919, 820),   "Torches Grass 2",               RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_2));
+    locationTable[RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_1]                =   Location::Grass(RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_1,                         RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-1955, -296),  "Larvae Grass 1",                RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_1));
+    locationTable[RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_2]                =   Location::Grass(RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_2,                         RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-2025, -301),  "Larvae Grass 2",                RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_2));
+    locationTable[RC_DEKU_TREE_BEFORE_BOSS_GRASS_1]                    =   Location::Grass(RC_DEKU_TREE_BEFORE_BOSS_GRASS_1,                             RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-273, -515),   "Before Boss Grass 1",           RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_1));
+    locationTable[RC_DEKU_TREE_BEFORE_BOSS_GRASS_2]                    =   Location::Grass(RC_DEKU_TREE_BEFORE_BOSS_GRASS_2,                             RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-273, -577),   "Before Boss Grass 2",           RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_2));
+    locationTable[RC_DEKU_TREE_BEFORE_BOSS_GRASS_3]                    =   Location::Grass(RC_DEKU_TREE_BEFORE_BOSS_GRASS_3,                             RCQUEST_VANILLA, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,               TWO_ACTOR_PARAMS(-269, -643),   "Before Boss Grass 3",           RHT_DEKU_TREE_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_3));
+    locationTable[RC_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS]               =   Location::Grass(RC_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS,                        RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,         TWO_ACTOR_PARAMS(-760, -465),   "First Bridge Grass",            RHT_DODONGOS_CAVERN_GRASS,        RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS));
+    locationTable[RC_DODONGOS_CAVERN_BLADE_GRASS]                      =   Location::Grass(RC_DODONGOS_CAVERN_BLADE_GRASS,                               RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,         TWO_ACTOR_PARAMS(1713, -1246),  "Blade Room Grass",              RHT_DODONGOS_CAVERN_GRASS,        RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BLADE_GRASS));
+    locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_GRASS]                 =   Location::Grass(RC_DODONGOS_CAVERN_SINGLE_EYE_GRASS,                          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,         TWO_ACTOR_PARAMS(3189, -485),   "Single Eye Grass",              RHT_DODONGOS_CAVERN_GRASS,        RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_GRASS));
+    locationTable[RC_DODONGOS_CAVERN_BEFORE_BOSS_GRASS]                =   Location::Grass(RC_DODONGOS_CAVERN_BEFORE_BOSS_GRASS,                         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,         TWO_ACTOR_PARAMS(-249, -2519),  "Before Boss Grass",             RHT_DODONGOS_CAVERN_GRASS,        RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BEFORE_BOSS_GRASS));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-858, -1330),  "Basement Behind Rocks Grass 1", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-870, -1021),  "Basement Behind Rocks Grass 2", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-872, -1383),  "Basement Behind Rocks Grass 3", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-874, -1447),  "Basement Behind Rocks Grass 4", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-886, -1263),  "Basement Behind Rocks Grass 5", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-918, -1131),  "Basement Behind Rocks Grass 6", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-943, -1316),  "Basement Behind Rocks Grass 7", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-956, -1377),  "Basement Behind Rocks Grass 8", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9] =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9,          RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-956, -1463),  "Basement Behind Rocks Grass 9", RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1]              =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1,                       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-619, -627),   "Basement Grass 1",              RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2]              =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2,                       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-565, -654),   "Basement Grass 2",              RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3]              =   Location::Grass(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3,                       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,      TWO_ACTOR_PARAMS(-552, -711),   "Basement Grass 3",              RHT_BOTTOM_OF_THE_WELL_GRASS,     RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3));
+    // MQ Dungeon Grass
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_1]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_1,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(392, -158),    "MQ Lobby Grass 1",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_2]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_2,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(356, -235),    "MQ Lobby Grass 2",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_3]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_3,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(308, -291),    "MQ Lobby Grass 3",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_4]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_4,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(81, -416),     "MQ Lobby Grass 4",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_5]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_5,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(143, -401),    "MQ Lobby Grass 5",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_5));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_6]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_6,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-11, -344),    "MQ Lobby Grass 6",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_6));
+    locationTable[RC_DEKU_TREE_MQ_LOBBY_GRASS_7]                       =   Location::Grass(RC_DEKU_TREE_MQ_LOBBY_GRASS_7,                       RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-159, -302),   "MQ Lobby Grass 7",              RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_7));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_1]                   =   Location::Grass(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_1,                   RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-636, 161),    "MQ Slingshot Grass 1",          RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_2]                   =   Location::Grass(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_2,                   RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-693, 182),    "MQ Slingshot Grass 2",          RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_3]                   =   Location::Grass(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_3,                   RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1443, 167),   "MQ Slingshot Grass 3",          RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_4]                   =   Location::Grass(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_4,                   RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1515, 140),   "MQ Slingshot Grass 4",          RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-753, 614),    "MQ Before Compass Grass 1",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-736, 795),    "MQ Before Compass Grass 2",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-575, 627),    "MQ Before Compass Grass 3",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-572, 727),    "MQ Before Compass Grass 4",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-788, 702),    "MQ Before Compass Grass 5",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-654, 582),    "MQ Before Compass Grass 6",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7]              =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-643, 798),    "MQ Before Compass Grass 7",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7));
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_GRASS_1]                     =   Location::Grass(RC_DEKU_TREE_MQ_COMPASS_GRASS_1,                     RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1279, 1024),  "MQ Compass Grass 1",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_GRASS_2]                     =   Location::Grass(RC_DEKU_TREE_MQ_COMPASS_GRASS_2,                     RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1228, 1004),  "MQ Compass Grass 2",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_GRASS_3]                     =   Location::Grass(RC_DEKU_TREE_MQ_COMPASS_GRASS_3,                     RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1017, 1261),  "MQ Compass Grass 3",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_COMPASS_GRASS_4]                     =   Location::Grass(RC_DEKU_TREE_MQ_COMPASS_GRASS_4,                     RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1004, 1214),  "MQ Compass Grass 4",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-15, -261),    "MQ Basement Lower Grass 1",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-7, -328),     "MQ Basement Lower Grass 2",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(5, 119),       "MQ Basement Lower Grass 3",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-39, 118),     "MQ Basement Lower Grass 4",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-807, -228),   "MQ Basement Upper Grass 1",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-764, 280),    "MQ Basement Upper Grass 2",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3]              =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3,              RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-805, 237),    "MQ Basement Upper Grass 3",     RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1] =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1, RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-466, 865),    "MQ Spike Roller Front Grass 1", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2] =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2, RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-495, 906),    "MQ Spike Roller Front Grass 2", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3] =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3, RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-538, 907),    "MQ Spike Roller Front Grass 3", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1]  =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1,  RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1360, 838),   "MQ Spike Roller Back Grass 1",  RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2]  =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2,  RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1309, 838),   "MQ Spike Roller Back Grass 2",  RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1]            =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1,            RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-227, 790),    "MQ Torches Grass 1",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2]            =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2,            RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-201, 749),    "MQ Torches Grass 2",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3]            =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3,            RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(50, 750),      "MQ Torches Grass 3",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4]            =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4,            RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(80, 792),      "MQ Torches Grass 4",            RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1795, 819),   "MQ Larvae Grass 1",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1918, 818),   "MQ Larvae Grass 2",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1678, -120),  "MQ Graves Grass 1",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1700, 196),   "MQ Graves Grass 2",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-2165, 350),   "MQ Graves Grass 3",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-2215, 56),    "MQ Graves Grass 4",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5]             =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5,             RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-1901, 604),   "MQ Graves Grass 5",             RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1]               =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1,               RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-2708, -522),  "MQ Back Grass 1",               RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2]               =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2,               RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-2395, -587),  "MQ Back Grass 2",               RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3]               =   Location::Grass(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3,               RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-2553, -433),  "MQ Back Grass 3",               RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1]                 =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1,                 RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-272, -517),   "MQ Before Boss Grass 1",        RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2]                 =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2,                 RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-272, -579),   "MQ Before Boss Grass 2",        RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2));
+    locationTable[RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3]                 =   Location::Grass(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3,                 RCQUEST_MQ, RCAREA_DEKU_TREE,             SCENE_DEKU_TREE,                   TWO_ACTOR_PARAMS(-268, -645),   "MQ Before Boss Grass 3",        RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1]               =   Location::Grass(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1721, -579),  "MQ Compass Grass 1",            RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2]               =   Location::Grass(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1731, -45),   "MQ Compass Grass 2",            RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3]               =   Location::Grass(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2218, -56),   "MQ Compass Grass 3",            RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4]               =   Location::Grass(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2230, -556),  "MQ Compass Grass 4",            RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_GRASS]                   =   Location::Grass(RC_DODONGOS_CAVERN_MQ_ARMOS_GRASS,                   RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1765, -3940),  "MQ Armos Grass",                RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_GRASS));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BACK_POE_GRASS]                =   Location::Grass(RC_DODONGOS_CAVERN_MQ_BACK_POE_GRASS,                RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1285, -4693),  "MQ Back Poe Grass",             RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BACK_POE_GRASS));
+    locationTable[RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1]                 =   Location::Grass(RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1,                 RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2644, -3368),  "MQ Scrub Grass 1",              RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2]                 =   Location::Grass(RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2,                 RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,       SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2614, -3387),  "MQ Scrub Grass 2",              RHT_DODONGOS_CAVERN_GRASS,              RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1]                =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1,                RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-219, -61),    "MQ First Grass 1",              RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2]                =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2,                RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(213, -398),    "MQ First Grass 2",              RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_1]                  =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_1,                  RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-192, -3209),  "MQ Pit Grass 1",                RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_2]                  =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_2,                  RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(350, -3534),   "MQ Pit Grass 2",                RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1]             =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1,             RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-91, -2815),   "MQ Basement Grass 1",           RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2]             =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2,             RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(231, -3575),   "MQ Basement Grass 2",           RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3]             =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3,             RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(305, -3481),   "MQ Basement Grass 3",           RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS]               =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS,               RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1089, -1489), "MQ Jigglies Grass",             RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS]      =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS,      RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(652, -5687),   "MQ Like Like Grass",            RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS]     =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS,     RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(1228, -2647),  "MQ Basement Boomerang Grass",   RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1]       =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1,       RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1360, -3606), "MQ After Big Octo Grass 1",     RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2]       =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2,       RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1086, -3346), "MQ After Big Octo Grass 2",     RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1]          =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1,          RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(1477, -1366),  "MQ Before Boss Grass 1",        RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2]          =   Location::Grass(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2,          RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(1691, -1576),  "MQ Before Boss Grass 2",        RHT_JABU_JABUS_BELLY_GRASS,             RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1]          =   Location::Grass(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1,          RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(1604, 3),      "MQ Dead Hand Grass 1",          RHT_BOTTOM_OF_THE_WELL_GRASS,           RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2]          =   Location::Grass(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2,          RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(1529, 2),      "MQ Dead Hand Grass 2",          RHT_BOTTOM_OF_THE_WELL_GRASS,           RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3]          =   Location::Grass(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3,          RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(1492, -49),    "MQ Dead Hand Grass 3",          RHT_BOTTOM_OF_THE_WELL_GRASS,           RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4]          =   Location::Grass(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4,          RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,    SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(1458, -130),   "MQ Dead Hand Grass 4",          RHT_BOTTOM_OF_THE_WELL_GRASS,           RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4));
+    // Shared Dungeon Grass
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_1]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_1,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(545, -75),     "Queen Gohma Grass 1", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_1));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_2]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_2,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(525, -375),    "Queen Gohma Grass 2", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_2));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_3]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_3,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(-646, 108),    "Queen Gohma Grass 3", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_3));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_4]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_4,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(-444, 323),    "Queen Gohma Grass 4", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_4));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_5]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_5,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(-848, -166),   "Queen Gohma Grass 5", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_5));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_6]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_6,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(-855, -596),   "Queen Gohma Grass 6", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_6));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_7]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_7,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(480, -681),    "Queen Gohma Grass 7", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_7));
+    locationTable[RC_DEKU_TREE_QUEEN_GOHMA_GRASS_8]                    =   Location::Grass(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_8,                    RCQUEST_BOTH, RCAREA_DEKU_TREE,           SCENE_DEKU_TREE_BOSS,              TWO_ACTOR_PARAMS(194, -974),    "Queen Gohma Grass 8", RHT_DEKU_TREE_GRASS,                    RG_BLUE_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_8));
+    // End Grass
+    // clang-format on
+}
+
+static ObjectExtension::Register<GrassIdentity> RegisterGrassIdentity;
+static RegisterShipInitFunc registerShuffleGrass(RegisterShuffleGrass, { "IS_RANDO" });
+static RegisterShipInitFunc registerShuffleGrassLocations(Rando::StaticData::RegisterGrassLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.cpp b/soh/soh/Enhancements/randomizer/ShufflePots.cpp
index 91e44a55eb..ad23f9d26e 100644
--- a/soh/soh/Enhancements/randomizer/ShufflePots.cpp
+++ b/soh/soh/Enhancements/randomizer/ShufflePots.cpp
@@ -1,6 +1,7 @@
-#include "ShufflePots.h"
+#include "soh/OTRGlobals.h"
 #include "soh_assets.h"
 #include "static_data.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
 
 extern "C" {
 #include "variables.h"
@@ -11,7 +12,6 @@ extern PlayState* gPlayState;
 
 extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
 
-
 extern "C" void ObjTsubo_RandomizerDraw(Actor* thisx, PlayState* play) {
     float potSize = 1.0f;
 
@@ -19,22 +19,26 @@ extern "C" void ObjTsubo_RandomizerDraw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_Scale(potSize, potSize, potSize, MTXMODE_APPLY);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
+              G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gRandoPotDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
 uint8_t ObjTsubo_RandomizerHoldsItem(ObjTsubo* potActor, PlayState* play) {
-    RandomizerCheck rc = potActor->potIdentity.randomizerCheck;
+    const auto potIdentity = ObjectExtension::GetInstance().Get<PotIdentity>(&potActor->actor);
+    if (potIdentity == nullptr) {
+        return false;
+    }
+
+    RandomizerCheck rc = potIdentity->randomizerCheck;
     uint8_t isDungeon = Rando::StaticData::GetLocation(rc)->IsDungeon();
-    uint8_t potSetting = Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_POTS).Get();
+    uint8_t potSetting = RAND_GET_OPTION(RSK_SHUFFLE_POTS);
 
     // Don't pull randomized item if pot isn't randomized or is already checked
     if (!IS_RANDO || (potSetting == RO_SHUFFLE_POTS_OVERWORLD && isDungeon) ||
-        (potSetting == RO_SHUFFLE_POTS_DUNGEONS && !isDungeon) ||
-        Flags_GetRandomizerInf(potActor->potIdentity.randomizerInf) ||
-        potActor->potIdentity.randomizerCheck == RC_UNKNOWN_CHECK) {
+        (potSetting == RO_SHUFFLE_POTS_DUNGEONS && !isDungeon) || Flags_GetRandomizerInf(potIdentity->randomizerInf) ||
+        potIdentity->randomizerCheck == RC_UNKNOWN_CHECK) {
         return false;
     } else {
         return true;
@@ -42,610 +46,619 @@ uint8_t ObjTsubo_RandomizerHoldsItem(ObjTsubo* potActor, PlayState* play) {
 }
 
 void ObjTsubo_RandomizerSpawnCollectible(ObjTsubo* potActor, PlayState* play) {
+    const auto potIdentity = ObjectExtension::GetInstance().Get<PotIdentity>(&potActor->actor);
+    if (potIdentity == nullptr) {
+        return;
+    }
+
     EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &potActor->actor.world.pos, ITEM00_SOH_DUMMY);
-    item00->randoInf = potActor->potIdentity.randomizerInf;
-    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(potActor->potIdentity.randomizerCheck, true, GI_NONE);
+    item00->randoInf = potIdentity->randomizerInf;
+    item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(potIdentity->randomizerCheck, true, GI_NONE);
     item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
     item00->actor.velocity.y = 8.0f;
     item00->actor.speedXZ = 2.0f;
-    item00->actor.world.rot.y = Rand_CenteredFloat(65536.0f);
+    item00->actor.world.rot.y = static_cast<int16_t>(Rand_CenteredFloat(65536.0f));
 }
 
-void ObjTsubo_RandomizerInit(void* actorRef) {
-    Actor* actor = static_cast<Actor*>(actorRef);
+void RegisterShufflePots() {
+    bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_POTS);
 
-    // Check for Lake Hylia specifically because the game spawns 2 pots out of bounds there for some reason.
-    if (actor->id != ACTOR_OBJ_TSUBO || gPlayState->sceneNum == SCENE_LAKE_HYLIA || gPlayState->sceneNum == SCENE_HYRULE_CASTLE) return;
+    COND_ID_HOOK(OnActorInit, ACTOR_OBJ_TSUBO, shouldRegister, [](void* actorRef) {
+        Actor* actor = static_cast<Actor*>(actorRef);
+        ObjTsubo* potActor = static_cast<ObjTsubo*>(actorRef);
 
-    ObjTsubo* potActor = static_cast<ObjTsubo*>(actorRef);
-
-    potActor->potIdentity = OTRGlobals::Instance->gRandomizer->IdentifyPot(gPlayState->sceneNum, (s16)actor->world.pos.x, (s16)actor->world.pos.z);
-}
-
-void ShufflePots_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
-    va_list args;
-    va_copy(args, originalArgs);
+        auto potIdentity = OTRGlobals::Instance->gRandomizer->IdentifyPot(gPlayState->sceneNum, (s16)actor->world.pos.x,
+                                                                          (s16)actor->world.pos.z);
+        ObjectExtension::GetInstance().Set<PotIdentity>(actor, std::move(potIdentity));
+    });
 
     // Draw custom model for pot to indicate it holding a randomized item.
-    if (id == VB_POT_SETUP_DRAW) {
+    COND_VB_SHOULD(VB_POT_SETUP_DRAW, shouldRegister, {
         ObjTsubo* potActor = va_arg(args, ObjTsubo*);
         if (ObjTsubo_RandomizerHoldsItem(potActor, gPlayState)) {
             potActor->actor.draw = (ActorFunc)ObjTsubo_RandomizerDraw;
             *should = false;
         }
-    }
+    });
 
     // Do not spawn vanilla item from pot, instead spawn the ranomized item.
-    if (id == VB_POT_DROP_ITEM) {
+    COND_VB_SHOULD(VB_POT_DROP_ITEM, shouldRegister, {
         ObjTsubo* potActor = va_arg(args, ObjTsubo*);
         if (ObjTsubo_RandomizerHoldsItem(potActor, gPlayState)) {
             ObjTsubo_RandomizerSpawnCollectible(potActor, gPlayState);
             *should = false;
         }
-    }
+    });
 
     // Unlock early Ganon's Boss Key doors to allow access to the pots there when pots are shuffled in dungeon
-    if (id == VB_LOCK_BOSS_DOOR) {
+    COND_VB_SHOULD(VB_LOCK_BOSS_DOOR, shouldRegister, {
         DoorShutter* doorActor = va_arg(args, DoorShutter*);
-        uint8_t shufflePotSetting = Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_POTS).Get();
+        uint8_t shufflePotSetting = RAND_GET_OPTION(RSK_SHUFFLE_POTS);
         if (gPlayState->sceneNum == SCENE_GANONS_TOWER && doorActor->dyna.actor.world.pos.y == 800 &&
             (shufflePotSetting == RO_SHUFFLE_POTS_DUNGEONS || shufflePotSetting == RO_SHUFFLE_POTS_ALL)) {
             *should = false;
         }
-    }
-
-    va_end(args);
+    });
 }
 
 void Rando::StaticData::RegisterPotLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
     // Overworld Pots
-    //            Randomizer Check                                 	Randomizer Check                                           Quest         Area                          Scene ID                           Params                          Short Name                    	  Spoiler Name                                Hint Text Key                     Vanilla             Spoiler Collection Check
-    locationTable[RC_KF_LINKS_HOUSE_POT]                    	=	Location::Pot(RC_KF_LINKS_HOUSE_POT,                       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_LINKS_HOUSE,                 TWO_ACTOR_PARAMS(-118, 51),     "Links House Pot",                  "KF Links House Pot",                       RHT_POT_KOKIRI_FOREST,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_LINKS_HOUSE_POT));
-    locationTable[RC_KF_TWINS_HOUSE_POT_2]                  	=	Location::Pot(RC_KF_TWINS_HOUSE_POT_2,                     RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(35, 57),       "Twins House Pot 2",                "KF Twins House Pot 2",                     RHT_POT_KOKIRI_FOREST,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_TWINS_HOUSE_POT_2));
-    locationTable[RC_KF_TWINS_HOUSE_POT_1]                  	=	Location::Pot(RC_KF_TWINS_HOUSE_POT_1,                     RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(33, -55),      "Twins House Pot 1",                "KF Twins House Pot 1",                     RHT_POT_KOKIRI_FOREST,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_TWINS_HOUSE_POT_1));
-    locationTable[RC_KF_BROTHERS_HOUSE_POT_1]               	=	Location::Pot(RC_KF_BROTHERS_HOUSE_POT_1,                  RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KNOW_IT_ALL_BROS_HOUSE,      TWO_ACTOR_PARAMS(-134, -29),    "Brothers House Pot 1",             "KF Brothers House Pot 1",                  RHT_POT_KOKIRI_FOREST,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BROTHERS_HOUSE_POT_1));
-    locationTable[RC_KF_BROTHERS_HOUSE_POT_2]               	=	Location::Pot(RC_KF_BROTHERS_HOUSE_POT_2,                  RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KNOW_IT_ALL_BROS_HOUSE,      TWO_ACTOR_PARAMS(-68, 114),     "Brothers House Pot 2",             "KF Brothers House Pot 2",                  RHT_POT_KOKIRI_FOREST,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BROTHERS_HOUSE_POT_2));
-    locationTable[RC_GF_BREAK_ROOM_POT_1]                   	=	Location::Pot(RC_GF_BREAK_ROOM_POT_1,                      RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1438, -3629),  "Break Room Pot 1",                 "GF Break Room Pot 1",                      RHT_POT_GERUDO_FORTRESS,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_BREAK_ROOM_POT_1));
-    locationTable[RC_GF_BREAK_ROOM_POT_2]                   	=	Location::Pot(RC_GF_BREAK_ROOM_POT_2,                      RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1403, -3679),  "Break Room Pot 2",                 "GF Break Room Pot 2",                      RHT_POT_GERUDO_FORTRESS,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_BREAK_ROOM_POT_2));
-    locationTable[RC_GF_KITCHEN_POT_1]                      	=	Location::Pot(RC_GF_KITCHEN_POT_1,                         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1908, -789),   "Kitchen Pot 1",                    "GF Kitchen Pot 1",                         RHT_POT_GERUDO_FORTRESS,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_KITCHEN_POT_1));
-    locationTable[RC_GF_KITCHEN_POT_2]                      	=	Location::Pot(RC_GF_KITCHEN_POT_2,                         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1951, -850),   "Kitchen Pot 2",                    "GF Kitchen Pot 2",                         RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_KITCHEN_POT_2));
-    locationTable[RC_GF_NORTH_F1_CARPENTER_POT_1]           	=	Location::Pot(RC_GF_NORTH_F1_CARPENTER_POT_1,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-475, -2622),  "North F1 Carpenter Pot 1",         "GF North F1 Carpenter Pot 1",              RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_F1_CARPENTER_POT_1));
-    locationTable[RC_GF_NORTH_F1_CARPENTER_POT_2]           	=	Location::Pot(RC_GF_NORTH_F1_CARPENTER_POT_2,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-512, -2621),  "North F1 Carpenter Pot 2",         "GF North F1 Carpenter Pot 2",              RHT_POT_GERUDO_FORTRESS,	        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_F1_CARPENTER_POT_2));
-    locationTable[RC_GF_NORTH_F1_CARPENTER_POT_3]           	=	Location::Pot(RC_GF_NORTH_F1_CARPENTER_POT_3,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-511, -2582),  "North F1 Carpenter Pot 3",         "GF North F1 Carpenter Pot 3",              RHT_POT_GERUDO_FORTRESS,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_F1_CARPENTER_POT_3));
-    locationTable[RC_GF_NORTH_F2_CARPENTER_POT_1]           	=	Location::Pot(RC_GF_NORTH_F2_CARPENTER_POT_1,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(67, -1975),    "North F2 Carpenter Pot 1",         "GF North F2 Carpenter Pot 1",              RHT_POT_GERUDO_FORTRESS,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_F2_CARPENTER_POT_1));
-    locationTable[RC_GF_NORTH_F2_CARPENTER_POT_2]           	=	Location::Pot(RC_GF_NORTH_F2_CARPENTER_POT_2,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(39, -1943),    "North F2 Carpenter Pot 2",         "GF North F2 Carpenter Pot 2",              RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_NORTH_F2_CARPENTER_POT_2));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_POT_1]           	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_POT_1,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(691, 48),      "South F1 Carpenter Pot 1",         "GF South F1 Carpenter Pot 1",              RHT_POT_GERUDO_FORTRESS,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_POT_1));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_POT_2]           	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_POT_2,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(691, 16),      "South F1 Carpenter Pot 2",         "GF South F1 Carpenter Pot 2",              RHT_POT_GERUDO_FORTRESS,	        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_POT_2));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_POT_3]           	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_POT_3,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(661, 16),      "South F1 Carpenter Pot 3",         "GF South F1 Carpenter Pot 3",              RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_POT_3));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_CELL_POT_1]      	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_1,         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(26, 524),      "South F1 Carpenter Cell Pot 1",    "GF South F1 Carpenter Cell Pot 1",         RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_1));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_CELL_POT_2]      	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_2,         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(61, 549),      "South F1 Carpenter Cell Pot 2",    "GF South F1 Carpenter Cell Pot 2",         RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_2));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_CELL_POT_3]      	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_3,         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(215, 549),     "South F1 Carpenter Cell Pot 3",    "GF South F1 Carpenter Cell Pot 3",         RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_3));
-    locationTable[RC_GF_SOUTH_F1_CARPENTER_CELL_POT_4]      	=	Location::Pot(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_4,         RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(254, 529),     "South F1 Carpenter Cell Pot 4",    "GF South F1 Carpenter Cell Pot 4",         RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_4));
-    locationTable[RC_WASTELAND_NEAR_GS_POT_1]               	=	Location::Pot(RC_WASTELAND_NEAR_GS_POT_1,                  RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(488, -2424),   "Near GS Pot 1",                    "Wasteland Near GS Pot 1",                  RHT_POT_GERUDO_FORTRESS,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_1));
-    locationTable[RC_WASTELAND_NEAR_GS_POT_2]               	=	Location::Pot(RC_WASTELAND_NEAR_GS_POT_2,                  RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(485, -2463),   "Near GS Pot 2",                    "Wasteland Near GS Pot 2",                  RHT_POT_GERUDO_FORTRESS,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_2));
-    locationTable[RC_WASTELAND_NEAR_GS_POT_3]               	=	Location::Pot(RC_WASTELAND_NEAR_GS_POT_3,                  RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(806, -2426),   "Near GS Pot 3",                    "Wasteland Near GS Pot 3",                  RHT_POT_GERUDO_FORTRESS,	        RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_3));
-    locationTable[RC_WASTELAND_NEAR_GS_POT_4]               	=	Location::Pot(RC_WASTELAND_NEAR_GS_POT_4,                  RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(801, -2460),   "Near GS Pot 4",                    "Wasteland Near GS Pot 4",                  RHT_POT_GERUDO_FORTRESS,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_4));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_1]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_1,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-60, 27),      "Guard House Child Pot 1",          "MK Guard House Child Pot 1",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_2]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_2,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-89, 28),      "Guard House Child Pot 2",          "MK Guard House Child Pot 2",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_3]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_3,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-110, 6),      "Guard House Child Pot 3",          "MK Guard House Child Pot 3",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_4]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_4,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-58, -7),      "Guard House Child Pot 4",          "MK Guard House Child Pot 4",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_5]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_5,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-80, -7),      "Guard House Child Pot 5",          "MK Guard House Child Pot 5",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_6]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_6,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-65, -45),     "Guard House Child Pot 6",          "MK Guard House Child Pot 6",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_7]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_7,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-85, -41),     "Guard House Child Pot 7",          "MK Guard House Child Pot 7",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_8]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_8,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-107, -45),    "Guard House Child Pot 8",          "MK Guard House Child Pot 8",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_9]            	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_9,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-66, -79),     "Guard House Child Pot 9",          "MK Guard House Child Pot 9",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_10]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_10,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-88, -84),     "Guard House Child Pot 10",         "MK Guard House Child Pot 10",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_11]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_11,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, 215),      "Guard House Child Pot 11",         "MK Guard House Child Pot 11",              RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_12]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_12,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, 148),      "Guard House Child Pot 12",         "MK Guard House Child Pot 12",              RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_13]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_13,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(73, 117),      "Guard House Child Pot 13",         "MK Guard House Child Pot 13",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_14]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_14,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(40, 123),      "Guard House Child Pot 14",         "MK Guard House Child Pot 14",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_15]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_15,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(43, 89),       "Guard House Child Pot 15",         "MK Guard House Child Pot 15",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_16]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_16,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, 81),       "Guard House Child Pot 16",         "MK Guard House Child Pot 16",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_17]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_17,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(21, 73),       "Guard House Child Pot 17",         "MK Guard House Child Pot 17",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_18]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_18,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(64, 45),       "Guard House Child Pot 18",         "MK Guard House Child Pot 18",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_19]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_19,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(84, 31),       "Guard House Child Pot 19",         "MK Guard House Child Pot 19",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_20]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_20,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(42, 26),       "Guard House Child Pot 20",         "MK Guard House Child Pot 20",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_21]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_21,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(20, 34),       "Guard House Child Pot 21",         "MK Guard House Child Pot 21",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_22]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_22,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(89, -2),       "Guard House Child Pot 22",         "MK Guard House Child Pot 22",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_23]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_23,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, -12),      "Guard House Child Pot 23",         "MK Guard House Child Pot 23",              RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_24]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_24,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(42, -5),       "Guard House Child Pot 24",         "MK Guard House Child Pot 24",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_25]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_25,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(16, -6),       "Guard House Child Pot 25",         "MK Guard House Child Pot 25",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_26]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_26,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, -44),      "Guard House Child Pot 26",         "MK Guard House Child Pot 26",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_27]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_27,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(37, -40),      "Guard House Child Pot 27",         "MK Guard House Child Pot 27",              RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_28]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_28,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, -80),      "Guard House Child Pot 28",         "MK Guard House Child Pot 28",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_29]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_29,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(50, -74),      "Guard House Child Pot 29",         "MK Guard House Child Pot 29",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_30]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_30,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(28, -79),      "Guard House Child Pot 30",         "MK Guard House Child Pot 30",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_31]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_31,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(39, -111),     "Guard House Child Pot 31",         "MK Guard House Child Pot 31",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_32]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_32,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(169, 216),     "Guard House Child Pot 32",         "MK Guard House Child Pot 32",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_33]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_33,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(168, 166),     "Guard House Child Pot 33",         "MK Guard House Child Pot 33",              RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_34]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_34,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, 120),     "Guard House Child Pot 34",         "MK Guard House Child Pot 34",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_35]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_35,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(177, 85),      "Guard House Child Pot 35",         "MK Guard House Child Pot 35",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_36]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_36,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(155, 39),      "Guard House Child Pot 36",         "MK Guard House Child Pot 36",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_37]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_37,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(184, 13),      "Guard House Child Pot 37",         "MK Guard House Child Pot 37",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_38]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_38,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(156, -1),      "Guard House Child Pot 38",         "MK Guard House Child Pot 38",              RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_39]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_39,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(181, -33),     "Guard House Child Pot 39",         "MK Guard House Child Pot 39",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_40]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_40,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(156, -45),     "Guard House Child Pot 40",         "MK Guard House Child Pot 40",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_41]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_41,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(172, -82),     "Guard House Child Pot 41",         "MK Guard House Child Pot 41",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_42]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_42,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -120),    "Guard House Child Pot 42",         "MK Guard House Child Pot 42",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_43]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_43,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -166),    "Guard House Child Pot 43",         "MK Guard House Child Pot 43",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43));
-    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_44]           	=	Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_44,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -216),    "Guard House Child Pot 44",         "MK Guard House Child Pot 44",              RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_1]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_1,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(61, 204),      "Guard House Adult Pot 1",          "MK Guard House Adult Pot 1",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_2]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_2,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(71, 132),      "Guard House Adult Pot 2",          "MK Guard House Adult Pot 2",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_3]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_3,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(74, 23),       "Guard House Adult Pot 3",          "MK Guard House Adult Pot 3",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_4]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_4,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(40, 4),        "Guard House Adult Pot 4",          "MK Guard House Adult Pot 4",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_5]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_5,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(71, -22),      "Guard House Adult Pot 5",          "MK Guard House Adult Pot 5",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_6]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_6,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(44, -151),     "Guard House Adult Pot 6",          "MK Guard House Adult Pot 6",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_7]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_7,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(79, -182),     "Guard House Adult Pot 7",          "MK Guard House Adult Pot 7",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_8]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_8,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(44, -198),     "Guard House Adult Pot 8",          "MK Guard House Adult Pot 8",               RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_9]            	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_9,               RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(168, 210),     "Guard House Adult Pot 9",          "MK Guard House Adult Pot 9",               RHT_POT_MARKET,	                RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_10]           	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_10,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(167, -122),    "Guard House Adult Pot 10",         "MK Guard House Adult Pot 10",              RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10));
-    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_11]           	=	Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_11,              RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(167, -210),    "Guard House Adult Pot 11",         "MK Guard House Adult Pot 11",              RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11));
-    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_1]             	=	Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_1,                RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(100, 45),      "Back Alley House Pot 1",           "MK Back Alley House Pot 1",                RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1));
-    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_2]             	=	Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_2,                RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(12, -180),     "Back Alley House Pot 2",           "MK Back Alley House Pot 2",                RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2));
-    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_3]             	=	Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_3,                RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(-54, -180),    "Back Alley House Pot 3",           "MK Back Alley House Pot 3",                RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3));
-    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_1]            	=	Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_1,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(222, -377),    "Near Potion Shop Pot 1",           "Kak Near Potion Shop Pot 1",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_1));
-    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_2]            	=	Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_2,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(255, -366),    "Near Potion Shop Pot 2",           "Kak Near Potion Shop Pot 2",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_2));
-    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_3]            	=	Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_3,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(284, -356),    "Near Potion Shop Pot 3",           "Kak Near Potion Shop Pot 3",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_3));
-    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_1]            	=	Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_1,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1568),   "Near Impas House Pot 1",           "Kak Near Impas House Pot 1",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1));
-    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_2]            	=	Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_2,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1539),   "Near Impas House Pot 2",           "Kak Near Impas House Pot 2",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2));
-    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_3]            	=	Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_3,               RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1510),   "Near Impas House Pot 3",           "Kak Near Impas House Pot 3",               RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3));
-    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_1]           	=	Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_1,              RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-392, -870),   "Near Guards House Pot 1",          "Kak Near Guards House Pot 1",              RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1));
-    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_2]           	=	Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_2,              RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-422, -883),   "Near Guards House Pot 2",          "Kak Near Guards House Pot 2",              RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2));
-    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_3]           	=	Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_3,              RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-450, -895),   "Near Guards House Pot 3",          "Kak Near Guards House Pot 3",              RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3));
-    locationTable[RC_KAK_NEAR_MEDICINE_SHOP_POT_1]          	=	Location::Pot(RC_KAK_NEAR_MEDICINE_SHOP_POT_1,             RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(781, 89),      "Near Medicine Shop Pot 1",         "Kak Near Medicine Shop Pot 1",             RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1));
-    locationTable[RC_KAK_NEAR_MEDICINE_SHOP_POT_2]          	=	Location::Pot(RC_KAK_NEAR_MEDICINE_SHOP_POT_2,             RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(815, 89),      "Near Medicine Shop Pot 2",         "Kak Near Medicine Shop Pot 2",             RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_1]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_1,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-319, -1542),  "Dampes Grave Pot 1",               "GY Dampes Grave Pot 1",                    RHT_POT_GRAVEYARD,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_1));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_2]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_2,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-319, -1600),  "Dampes Grave Pot 2",               "GY Dampes Grave Pot 2",                    RHT_POT_GRAVEYARD,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_2));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_3]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_3,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-364, -1571),  "Dampes Grave Pot 3",               "GY Dampes Grave Pot 3",                    RHT_POT_GRAVEYARD,	            RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_3));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_4]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_4,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(198, -1540),   "Dampes Grave Pot 4",               "GY Dampes Grave Pot 4",                    RHT_POT_GRAVEYARD,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_4));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_5]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_5,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(198, -1608),   "Dampes Grave Pot 5",               "GY Dampes Grave Pot 5",                    RHT_POT_GRAVEYARD,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_5));
-    locationTable[RC_GY_DAMPES_GRAVE_POT_6]                 	=	Location::Pot(RC_GY_DAMPES_GRAVE_POT_6,                    RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(239, -1577),   "Dampes Grave Pot 6",               "GY Dampes Grave Pot 6",                    RHT_POT_GRAVEYARD,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_6));
-    locationTable[RC_GC_LOWER_STAIRCASE_POT_1]              	=	Location::Pot(RC_GC_LOWER_STAIRCASE_POT_1,                 RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-189, 866),    "Lower Staircase Pot 1",            "GC Lower Staircase Pot 1",                 RHT_POT_GORON_CITY,	            RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_LOWER_STAIRCASE_POT_1));
-    locationTable[RC_GC_LOWER_STAIRCASE_POT_2]              	=	Location::Pot(RC_GC_LOWER_STAIRCASE_POT_2,                 RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-271, 825),    "Lower Staircase Pot 2",            "GC Lower Staircase Pot 2",                 RHT_POT_GORON_CITY,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_LOWER_STAIRCASE_POT_2));
-    locationTable[RC_GC_UPPER_STAIRCASE_POT_1]              	=	Location::Pot(RC_GC_UPPER_STAIRCASE_POT_1,                 RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1170, 60),    "Upper Staircase Pot 1",            "GC Upper Staircase Pot 1",                 RHT_POT_GORON_CITY,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_1));
-    locationTable[RC_GC_UPPER_STAIRCASE_POT_2]              	=	Location::Pot(RC_GC_UPPER_STAIRCASE_POT_2,                 RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1185, 95),    "Upper Staircase Pot 2",            "GC Upper Staircase Pot 2",                 RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_2));
-    locationTable[RC_GC_UPPER_STAIRCASE_POT_3]              	=	Location::Pot(RC_GC_UPPER_STAIRCASE_POT_3,                 RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1200, 63),    "Upper Staircase Pot 3",            "GC Upper Staircase Pot 3",                 RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_3));
-    locationTable[RC_GC_MEDIGORON_POT_1]                    	=	Location::Pot(RC_GC_MEDIGORON_POT_1,                       RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-694, 1196),   "Medigoron Pot 1",                  "GC Medigoron Pot 1",                       RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_POT_1));
-    locationTable[RC_GC_DARUNIA_POT_1]                      	=	Location::Pot(RC_GC_DARUNIA_POT_1,                         RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(262, -1210),   "Darunia Pot 1",                    "GC Darunia Pot 1",                         RHT_POT_GORON_CITY,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_1));
-    locationTable[RC_GC_DARUNIA_POT_2]                      	=	Location::Pot(RC_GC_DARUNIA_POT_2,                         RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(261, -1254),   "Darunia Pot 2",                    "GC Darunia Pot 2",                         RHT_POT_GORON_CITY,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_2));
-    locationTable[RC_GC_DARUNIA_POT_3]                      	=	Location::Pot(RC_GC_DARUNIA_POT_3,                         RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(262, -1386),   "Darunia Pot 3",                    "GC Darunia Pot 3",                         RHT_POT_GORON_CITY,	            RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_3));
-    locationTable[RC_DMC_NEAR_GC_POT_2]                     	=	Location::Pot(RC_DMC_NEAR_GC_POT_2,                        RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1546, 141),   "Near GC Pot 2",                    "DMC Near GC Pot 2",                        RHT_POT_DEATH_MOUNTAIN_CRATER,    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_2));
-    locationTable[RC_DMC_NEAR_GC_POT_3]                     	=	Location::Pot(RC_DMC_NEAR_GC_POT_3,                        RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1641, -127),  "Near GC Pot 3",                    "DMC Near GC Pot 3",                        RHT_POT_DEATH_MOUNTAIN_CRATER,    RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_3));
-    locationTable[RC_DMC_NEAR_GC_POT_1]                     	=	Location::Pot(RC_DMC_NEAR_GC_POT_1,                        RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1590, 132),   "Near GC Pot 1",                    "DMC Near GC Pot 1",                        RHT_POT_DEATH_MOUNTAIN_CRATER,    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_1));
-    locationTable[RC_DMC_NEAR_GC_POT_4]                     	=	Location::Pot(RC_DMC_NEAR_GC_POT_4,                        RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1606, -166),  "Near GC Pot 4",                    "DMC Near GC Pot 4",                        RHT_POT_DEATH_MOUNTAIN_CRATER,    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_4));
-    locationTable[RC_ZD_NEAR_SHOP_POT_1]                    	=	Location::Pot(RC_ZD_NEAR_SHOP_POT_1,                       RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(676, 377),     "Near Shop Pot 1",                  "ZD Near Shop Pot 1",                       RHT_POT_ZORAS_DOMAIN,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_1));
-    locationTable[RC_ZD_NEAR_SHOP_POT_2]                    	=	Location::Pot(RC_ZD_NEAR_SHOP_POT_2,                       RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(614, 419),     "Near Shop Pot 2",                  "ZD Near Shop Pot 2",                       RHT_POT_ZORAS_DOMAIN,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_2));
-    locationTable[RC_ZD_NEAR_SHOP_POT_3]                    	=	Location::Pot(RC_ZD_NEAR_SHOP_POT_3,                       RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(289, 415),     "Near Shop Pot 3",                  "ZD Near Shop Pot 3",                       RHT_POT_ZORAS_DOMAIN,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_3));
-    locationTable[RC_ZD_NEAR_SHOP_POT_4]                    	=	Location::Pot(RC_ZD_NEAR_SHOP_POT_4,                       RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(289, 289),     "Near Shop Pot 4",                  "ZD Near Shop Pot 4",                       RHT_POT_ZORAS_DOMAIN,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_4));
-    locationTable[RC_ZD_NEAR_SHOP_POT_5]                    	=	Location::Pot(RC_ZD_NEAR_SHOP_POT_5,                       RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(220, 384),     "Near Shop Pot 5",                  "ZD Near Shop Pot 5",                       RHT_POT_ZORAS_DOMAIN,	            RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_5));
-    locationTable[RC_ZF_HIDDEN_CAVE_POT_1]                  	=	Location::Pot(RC_ZF_HIDDEN_CAVE_POT_1,                     RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(385, 2587),    "Hidden Cave Pot 1",                "ZF Hidden Cave Pot 1",                     RHT_POT_ZORAS_FOUNTAIN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_1));
-    locationTable[RC_ZF_HIDDEN_CAVE_POT_2]                  	=	Location::Pot(RC_ZF_HIDDEN_CAVE_POT_2,                     RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(418, 2609),    "Hidden Cave Pot 2",                "ZF Hidden Cave Pot 2",                     RHT_POT_ZORAS_FOUNTAIN,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_2));
-    locationTable[RC_ZF_HIDDEN_CAVE_POT_3]                  	=	Location::Pot(RC_ZF_HIDDEN_CAVE_POT_3,                     RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(430, 2568),    "Hidden Cave Pot 3",                "ZF Hidden Cave Pot 3",                     RHT_POT_ZORAS_FOUNTAIN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_3));
-    locationTable[RC_ZF_NEAR_JABU_POT_1]                    	=	Location::Pot(RC_ZF_NEAR_JABU_POT_1,                       RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1630, 170),   "Near Jabu Pot 1",                  "ZF Near Jabu Pot 1",                       RHT_POT_ZORAS_FOUNTAIN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_1));
-    locationTable[RC_ZF_NEAR_JABU_POT_2]                    	=	Location::Pot(RC_ZF_NEAR_JABU_POT_2,                       RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1550, 170),   "Near Jabu Pot 2",                  "ZF Near Jabu Pot 2",                       RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_2));
-    locationTable[RC_ZF_NEAR_JABU_POT_3]                    	=	Location::Pot(RC_ZF_NEAR_JABU_POT_3,                       RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1630, -260),  "Near Jabu Pot 3",                  "ZF Near Jabu Pot 3",                       RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_3));
-    locationTable[RC_ZF_NEAR_JABU_POT_4]                    	=	Location::Pot(RC_ZF_NEAR_JABU_POT_4,                       RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1550, -260),  "Near Jabu Pot 4",                  "ZF Near Jabu Pot 4",                       RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_4));
-    locationTable[RC_LLR_FRONT_POT_1]                       	=	Location::Pot(RC_LLR_FRONT_POT_1,                          RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3218),   "Front Pot 1",                      "LLR Front Pot 1",                          RHT_POT_LON_LON_RANCH,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_1));
-    locationTable[RC_LLR_FRONT_POT_2]                       	=	Location::Pot(RC_LLR_FRONT_POT_2,                          RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3186),   "Front Pot 2",                      "LLR Front Pot 2",                          RHT_POT_LON_LON_RANCH,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_2));
-    locationTable[RC_LLR_FRONT_POT_3]                       	=	Location::Pot(RC_LLR_FRONT_POT_3,                          RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3154),   "Front Pot 3",                      "LLR Front Pot 3",                          RHT_POT_LON_LON_RANCH,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_3));
-    locationTable[RC_LLR_FRONT_POT_4]                       	=	Location::Pot(RC_LLR_FRONT_POT_4,                          RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3122),   "Front Pot 4",                      "LLR Front Pot 4",                          RHT_POT_LON_LON_RANCH,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_4));
-    locationTable[RC_LLR_RAIN_SHED_POT_1]                   	=	Location::Pot(RC_LLR_RAIN_SHED_POT_1,                      RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(852, 172),     "Rain Shed Pot 1",                  "LLR Rain Shed Pot 1",                      RHT_POT_LON_LON_RANCH,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_1));
-    locationTable[RC_LLR_RAIN_SHED_POT_2]                   	=	Location::Pot(RC_LLR_RAIN_SHED_POT_2,                      RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(840, 212),     "Rain Shed Pot 2",                  "LLR Rain Shed Pot 2",                      RHT_POT_LON_LON_RANCH,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_2));
-    locationTable[RC_LLR_RAIN_SHED_POT_3]                   	=	Location::Pot(RC_LLR_RAIN_SHED_POT_3,                      RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(872, 219),     "Rain Shed Pot 3",                  "LLR Rain Shed Pot 3",                      RHT_POT_LON_LON_RANCH,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_3));
-    locationTable[RC_LLR_TALONS_HOUSE_POT_1]                	=	Location::Pot(RC_LLR_TALONS_HOUSE_POT_1,                   RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1255, 47),     "Talons House Pot 1",               "LLR Talons House Pot 1",                   RHT_POT_LON_LON_RANCH,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_1));
-    locationTable[RC_LLR_TALONS_HOUSE_POT_2]                	=	Location::Pot(RC_LLR_TALONS_HOUSE_POT_2,                   RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1256, -51),    "Talons House Pot 2",               "LLR Talons House Pot 2",                   RHT_POT_LON_LON_RANCH,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_2));
-    locationTable[RC_LLR_TALONS_HOUSE_POT_3]                	=	Location::Pot(RC_LLR_TALONS_HOUSE_POT_3,                   RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1256, -78),    "Talons House Pot 3",               "LLR Talons House Pot 3",                   RHT_POT_LON_LON_RANCH, 	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_3));
-    locationTable[RC_HF_COW_GROTTO_POT_1]                   	=	Location::Pot(RC_HF_COW_GROTTO_POT_1,                      RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(3410, -223),   "Cow Grotto Pot 1",                 "HF Cow Grotto Pot 1",                      RHT_POT_HYRULE_FIELD,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_POT_1));
-    locationTable[RC_HF_COW_GROTTO_POT_2]                   	=	Location::Pot(RC_HF_COW_GROTTO_POT_2,                      RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(3390, -258),   "Cow Grotto Pot 2",                 "HF Cow Grotto Pot 2",                      RHT_POT_HYRULE_FIELD,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_POT_2));
-    locationTable[RC_HC_STORMS_GROTTO_POT_1]                	=	Location::Pot(RC_HC_STORMS_GROTTO_POT_1,                   RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1843, 1014),   "Storms Grotto Pot 1",              "HC Storms Grotto Pot 1",                   RHT_POT_HYRULE_CASTLE,	        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_1));
-    locationTable[RC_HC_STORMS_GROTTO_POT_2]                	=	Location::Pot(RC_HC_STORMS_GROTTO_POT_2,                   RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1769, 954),    "Storms Grotto Pot 2",              "HC Storms Grotto Pot 2",                   RHT_POT_HYRULE_CASTLE,	        RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_2));
-    locationTable[RC_HC_STORMS_GROTTO_POT_3]                	=	Location::Pot(RC_HC_STORMS_GROTTO_POT_3,                   RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1857, 897),    "Storms Grotto Pot 3",              "HC Storms Grotto Pot 3",                   RHT_POT_HYRULE_CASTLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_3));
-    locationTable[RC_HC_STORMS_GROTTO_POT_4]                	=	Location::Pot(RC_HC_STORMS_GROTTO_POT_4,                   RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1764, 847),    "Storms Grotto Pot 4",              "HC Storms Grotto Pot 4",                   RHT_POT_HYRULE_CASTLE,	        RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_4));
+    //            Randomizer Check                                 	Randomizer Check                  Quest         Area                          Scene ID                           Params                          Short Name                    	     Hint Text Key                  Vanilla             Spoiler Collection Check
+    locationTable[RC_KF_LINKS_HOUSE_POT]            = Location::Pot(RC_KF_LINKS_HOUSE_POT,            RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_LINKS_HOUSE,                 TWO_ACTOR_PARAMS(-118, 51),     "Links House Pot",                  RHT_POT_KOKIRI_FOREST,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_LINKS_HOUSE_POT));
+    locationTable[RC_KF_TWINS_HOUSE_POT_2]          = Location::Pot(RC_KF_TWINS_HOUSE_POT_2,          RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(35, 57),       "Twins House Pot 2",                RHT_POT_KOKIRI_FOREST,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_TWINS_HOUSE_POT_2));
+    locationTable[RC_KF_TWINS_HOUSE_POT_1]          = Location::Pot(RC_KF_TWINS_HOUSE_POT_1,          RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(33, -55),      "Twins House Pot 1",                RHT_POT_KOKIRI_FOREST,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_TWINS_HOUSE_POT_1));
+    locationTable[RC_KF_BROTHERS_HOUSE_POT_1]       = Location::Pot(RC_KF_BROTHERS_HOUSE_POT_1,       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KNOW_IT_ALL_BROS_HOUSE,      TWO_ACTOR_PARAMS(-134, -29),    "Brothers House Pot 1",             RHT_POT_KOKIRI_FOREST,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BROTHERS_HOUSE_POT_1));
+    locationTable[RC_KF_BROTHERS_HOUSE_POT_2]       = Location::Pot(RC_KF_BROTHERS_HOUSE_POT_2,       RCQUEST_BOTH, RCAREA_KOKIRI_FOREST,         SCENE_KNOW_IT_ALL_BROS_HOUSE,      TWO_ACTOR_PARAMS(-68, 114),     "Brothers House Pot 2",             RHT_POT_KOKIRI_FOREST,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_BROTHERS_HOUSE_POT_2));
+    locationTable[RC_TH_BREAK_ROOM_FRONT_POT]       = Location::Pot(RC_TH_BREAK_ROOM_FRONT_POT,       RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1438, -3629),  "Break Room Front Pot",             RHT_TH_BREAK_ROOM_FRONT_POT,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_ROOM_FRONT_POT));
+    locationTable[RC_TH_BREAK_ROOM_BACK_POT]        = Location::Pot(RC_TH_BREAK_ROOM_BACK_POT,        RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1403, -3679),  "Break Room Back Pot",              RHT_TH_BREAK_ROOM_BACK_POT,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_BREAK_ROOM_BACK_POT));
+    locationTable[RC_TH_KITCHEN_POT_1]              = Location::Pot(RC_TH_KITCHEN_POT_1,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1908, -789),   "Kitchen Pot 1",                    RHT_TH_KITCHEN_POT_1,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_KITCHEN_POT_1));
+    locationTable[RC_TH_KITCHEN_POT_2]              = Location::Pot(RC_TH_KITCHEN_POT_2,              RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(1951, -850),   "Kitchen Pot 2",                    RHT_TH_KITCHEN_POT_2,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_KITCHEN_POT_2));
+    locationTable[RC_TH_1_TORCH_CELL_RIGHT_POT]     = Location::Pot(RC_TH_1_TORCH_CELL_RIGHT_POT,     RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-475, -2622),  "1 Torch Cell Right Pot",           RHT_TH_1_TORCH_CELL_RIGHT_POT,    	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_1_TORCH_CELL_RIGHT_POT));
+    locationTable[RC_TH_1_TORCH_CELL_MID_POT]       = Location::Pot(RC_TH_1_TORCH_CELL_MID_POT,       RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-512, -2621),  "1 Torch Cell Middle Pot",          RHT_TH_1_TORCH_CELL_MID_POT,	    RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_1_TORCH_CELL_MID_POT));
+    locationTable[RC_TH_1_TORCH_CELL_LEFT_POT]      = Location::Pot(RC_TH_1_TORCH_CELL_LEFT_POT,      RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(-511, -2582),  "1 Torch Cell Left Pot",            RHT_TH_1_TORCH_CELL_LEFT_POT,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_1_TORCH_CELL_LEFT_POT));
+    locationTable[RC_TH_STEEP_SLOPE_RIGHT_POT]      = Location::Pot(RC_TH_STEEP_SLOPE_RIGHT_POT,      RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(67, -1975),    "Steep Slope Right Pot",            RHT_TH_STEEP_SLOPE_RIGHT_POT,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_STEEP_SLOPE_RIGHT_POT));
+    locationTable[RC_TH_STEEP_SLOPE_LEFT_POT]       = Location::Pot(RC_TH_STEEP_SLOPE_LEFT_POT,       RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(39, -1943),    "Steep Slope Left Pot",             RHT_TH_STEEP_SLOPE_LEFT_POT,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_STEEP_SLOPE_LEFT_POT));
+    locationTable[RC_TH_NEAR_DOUBLE_CELL_RIGHT_POT] = Location::Pot(RC_TH_NEAR_DOUBLE_CELL_RIGHT_POT, RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(691, 48),      "Double Cell Right Pot",            RHT_TH_NEAR_DOUBLE_CELL_RIGHT_POT,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_DOUBLE_CELL_RIGHT_POT));
+    locationTable[RC_TH_NEAR_DOUBLE_CELL_MID_POT]   = Location::Pot(RC_TH_NEAR_DOUBLE_CELL_MID_POT,   RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(691, 16),      "Double Cell Middle Pot",           RHT_TH_NEAR_DOUBLE_CELL_MID_POT,	RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_NEAR_DOUBLE_CELL_MID_POT));
+    locationTable[RC_TH_NEAR_DOUBLE_CELL_LEFT_POT]  = Location::Pot(RC_TH_NEAR_DOUBLE_CELL_LEFT_POT,  RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(661, 16),      "Double Cell Left Pot",             RHT_TH_NEAR_DOUBLE_CELL_LEFT_POT,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_NEAR_DOUBLE_CELL_LEFT_POT));
+    locationTable[RC_TH_RIGHTMOST_JAILED_POT]      	= Location::Pot(RC_TH_RIGHTMOST_JAILED_POT,       RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(26, 524),      "Rightmost Jailed Pot",             RHT_TH_RIGHTMOST_JAILED_POT,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_RIGHTMOST_JAILED_POT));
+    locationTable[RC_TH_RIGHT_MIDDLE_JAILED_POT]    = Location::Pot(RC_TH_RIGHT_MIDDLE_JAILED_POT,    RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(61, 549),      "Right Middle Jailed Pot",          RHT_TH_LEFT_MIDDLE_JAILED_POT,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_RIGHT_MIDDLE_JAILED_POT));
+    locationTable[RC_TH_LEFT_MIDDLE_JAILED_POT]     = Location::Pot(RC_TH_LEFT_MIDDLE_JAILED_POT,     RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(215, 549),     "Left Middle Jailed Pot",           RHT_TH_RIGHT_MIDDLE_JAILED_POT,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_LEFT_MIDDLE_JAILED_POT));
+    locationTable[RC_TH_LEFTMOST_JAILED_POT]      	= Location::Pot(RC_TH_LEFTMOST_JAILED_POT,        RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS,       SCENE_THIEVES_HIDEOUT,             TWO_ACTOR_PARAMS(254, 529),     "Leftmost Jailed Pot",              RHT_TH_LEFTMOST_JAILED_POT,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_LEFTMOST_JAILED_POT));
+    locationTable[RC_WASTELAND_NEAR_GS_POT_1]       = Location::Pot(RC_WASTELAND_NEAR_GS_POT_1,       RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(488, -2424),   "Near GS Pot 1",                    RHT_POT_WASTELAND,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_1));
+    locationTable[RC_WASTELAND_NEAR_GS_POT_2]       = Location::Pot(RC_WASTELAND_NEAR_GS_POT_2,       RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(485, -2463),   "Near GS Pot 2",                    RHT_POT_WASTELAND,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_2));
+    locationTable[RC_WASTELAND_NEAR_GS_POT_3]       = Location::Pot(RC_WASTELAND_NEAR_GS_POT_3,       RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(806, -2426),   "Near GS Pot 3",                    RHT_POT_WASTELAND,	                RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_3));
+    locationTable[RC_WASTELAND_NEAR_GS_POT_4]       = Location::Pot(RC_WASTELAND_NEAR_GS_POT_4,       RCQUEST_BOTH, RCAREA_WASTELAND,             SCENE_HAUNTED_WASTELAND,           TWO_ACTOR_PARAMS(801, -2460),   "Near GS Pot 4",                    RHT_POT_WASTELAND,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WASTELAND_NEAR_GS_POT_4));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_1]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_1,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-60, 27),      "Guard House Child Pot 1",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_2]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_2,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-89, 28),      "Guard House Child Pot 2",          RHT_POT_MARKET,    	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_3]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_3,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-110, 6),      "Guard House Child Pot 3",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_4]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_4,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-58, -7),      "Guard House Child Pot 4",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_5]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_5,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-80, -7),      "Guard House Child Pot 5",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_6]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_6,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-65, -45),     "Guard House Child Pot 6",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_7]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_7,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-85, -41),     "Guard House Child Pot 7",          RHT_POT_MARKET,    	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_8]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_8,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-107, -45),    "Guard House Child Pot 8",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_9]    = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_9,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-66, -79),     "Guard House Child Pot 9",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_10]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_10,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(-88, -84),     "Guard House Child Pot 10",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_11]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_11,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, 215),      "Guard House Child Pot 11",         RHT_POT_MARKET,    	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_12]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_12,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, 148),      "Guard House Child Pot 12",         RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_13]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_13,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(73, 117),      "Guard House Child Pot 13",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_14]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_14,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(40, 123),      "Guard House Child Pot 14",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_15]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_15,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(43, 89),       "Guard House Child Pot 15",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_16]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_16,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, 81),       "Guard House Child Pot 16",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_17]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_17,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(21, 73),       "Guard House Child Pot 17",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_18]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_18,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(64, 45),       "Guard House Child Pot 18",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_19]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_19,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(84, 31),       "Guard House Child Pot 19",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_20]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_20,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(42, 26),       "Guard House Child Pot 20",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_21]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_21,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(20, 34),       "Guard House Child Pot 21",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_22]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_22,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(89, -2),       "Guard House Child Pot 22",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_23]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_23,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, -12),      "Guard House Child Pot 23",         RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_24]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_24,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(42, -5),       "Guard House Child Pot 24",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_25]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_25,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(16, -6),       "Guard House Child Pot 25",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_26]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_26,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(68, -44),      "Guard House Child Pot 26",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_27]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_27,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(37, -40),      "Guard House Child Pot 27",         RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_28]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_28,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(70, -80),      "Guard House Child Pot 28",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_29]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_29,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(50, -74),      "Guard House Child Pot 29",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_30]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_30,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(28, -79),      "Guard House Child Pot 30",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_31]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_31,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(39, -111),     "Guard House Child Pot 31",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_32]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_32,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(169, 216),     "Guard House Child Pot 32",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_33]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_33,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(168, 166),     "Guard House Child Pot 33",         RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_34]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_34,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, 120),     "Guard House Child Pot 34",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_35]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_35,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(177, 85),      "Guard House Child Pot 35",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_36]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_36,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(155, 39),      "Guard House Child Pot 36",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_37]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_37,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(184, 13),      "Guard House Child Pot 37",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_38]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_38,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(156, -1),      "Guard House Child Pot 38",         RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_39]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_39,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(181, -33),     "Guard House Child Pot 39",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_40]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_40,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(156, -45),     "Guard House Child Pot 40",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_41]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_41,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(172, -82),     "Guard House Child Pot 41",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_42]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_42,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -120),    "Guard House Child Pot 42",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_43]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_43,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -166),    "Guard House Child Pot 43",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43));
+    locationTable[RC_MK_GUARD_HOUSE_CHILD_POT_44]   = Location::Pot(RC_MK_GUARD_HOUSE_CHILD_POT_44,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(170, -216),    "Guard House Child Pot 44",         RHT_POT_MARKET,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_1]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_1,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(61, 204),      "Guard House Adult Pot 1",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_2]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_2,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(71, 132),      "Guard House Adult Pot 2",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_3]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_3,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(74, 23),       "Guard House Adult Pot 3",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_4]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_4,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(40, 4),        "Guard House Adult Pot 4",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_5]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_5,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(71, -22),      "Guard House Adult Pot 5",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_6]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_6,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(44, -151),     "Guard House Adult Pot 6",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_7]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_7,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(79, -182),     "Guard House Adult Pot 7",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_8]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_8,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(44, -198),     "Guard House Adult Pot 8",          RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_9]    = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_9,    RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(168, 210),     "Guard House Adult Pot 9",          RHT_POT_MARKET,	                RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_10]   = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_10,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(167, -122),    "Guard House Adult Pot 10",         RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10));
+    locationTable[RC_MK_GUARD_HOUSE_ADULT_POT_11]   = Location::Pot(RC_MK_GUARD_HOUSE_ADULT_POT_11,   RCQUEST_BOTH, RCAREA_MARKET,                SCENE_MARKET_GUARD_HOUSE,          TWO_ACTOR_PARAMS(167, -210),    "Guard House Adult Pot 11",         RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11));
+    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_1]     = Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_1,     RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(100, 45),      "Back Alley House Pot 1",           RHT_POT_MARKET,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1));
+    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_2]     = Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_2,     RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(12, -180),     "Back Alley House Pot 2",           RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2));
+    locationTable[RC_MK_BACK_ALLEY_HOUSE_POT_3]     = Location::Pot(RC_MK_BACK_ALLEY_HOUSE_POT_3,     RCQUEST_BOTH, RCAREA_MARKET,                SCENE_BACK_ALLEY_HOUSE,            TWO_ACTOR_PARAMS(-54, -180),    "Back Alley House Pot 3",           RHT_POT_MARKET,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3));
+    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_1]    = Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_1,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(222, -377),    "Near Potion Shop Pot 1",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_1));
+    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_2]    = Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_2,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(255, -366),    "Near Potion Shop Pot 2",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_2));
+    locationTable[RC_KAK_NEAR_POTION_SHOP_POT_3]    = Location::Pot(RC_KAK_NEAR_POTION_SHOP_POT_3,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(284, -356),    "Near Potion Shop Pot 3",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_POTION_SHOP_POT_3));
+    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_1]    = Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_1,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1568),   "Near Impas House Pot 1",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1));
+    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_2]    = Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_2,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1539),   "Near Impas House Pot 2",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2));
+    locationTable[RC_KAK_NEAR_IMPAS_HOUSE_POT_3]    = Location::Pot(RC_KAK_NEAR_IMPAS_HOUSE_POT_3,    RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-384, 1510),   "Near Impas House Pot 3",           RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3));
+    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_1]   = Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_1,   RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-392, -870),   "Near Guards House Pot 1",          RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1));
+    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_2]   = Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_2,   RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-422, -883),   "Near Guards House Pot 2",          RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2));
+    locationTable[RC_KAK_NEAR_GUARDS_HOUSE_POT_3]   = Location::Pot(RC_KAK_NEAR_GUARDS_HOUSE_POT_3,   RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(-450, -895),   "Near Guards House Pot 3",          RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3));
+    locationTable[RC_KAK_NEAR_MEDICINE_SHOP_POT_1]  = Location::Pot(RC_KAK_NEAR_MEDICINE_SHOP_POT_1,  RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(781, 89),      "Near Medicine Shop Pot 1",         RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1));
+    locationTable[RC_KAK_NEAR_MEDICINE_SHOP_POT_2]  = Location::Pot(RC_KAK_NEAR_MEDICINE_SHOP_POT_2,  RCQUEST_BOTH, RCAREA_KAKARIKO_VILLAGE,      SCENE_KAKARIKO_VILLAGE,            TWO_ACTOR_PARAMS(815, 89),      "Near Medicine Shop Pot 2",         RHT_POT_KAKARIKO,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_1]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_1,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-319, -1542),  "Dampes Grave Pot 1",               RHT_POT_GRAVEYARD,	                RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_1));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_2]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_2,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-319, -1600),  "Dampes Grave Pot 2",               RHT_POT_GRAVEYARD,	                RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_2));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_3]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_3,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(-364, -1571),  "Dampes Grave Pot 3",               RHT_POT_GRAVEYARD,	                RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_3));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_4]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_4,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(198, -1540),   "Dampes Grave Pot 4",               RHT_POT_GRAVEYARD,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_4));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_5]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_5,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(198, -1608),   "Dampes Grave Pot 5",               RHT_POT_GRAVEYARD,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_5));
+    locationTable[RC_GY_DAMPES_GRAVE_POT_6]         = Location::Pot(RC_GY_DAMPES_GRAVE_POT_6,         RCQUEST_BOTH, RCAREA_GRAVEYARD,             SCENE_WINDMILL_AND_DAMPES_GRAVE,   TWO_ACTOR_PARAMS(239, -1577),   "Dampes Grave Pot 6",               RHT_POT_GRAVEYARD,	                RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GY_DAMPES_GRAVE_POT_6));
+    locationTable[RC_GC_LOWER_STAIRCASE_POT_1]      = Location::Pot(RC_GC_LOWER_STAIRCASE_POT_1,      RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-189, 866),    "Lower Staircase Pot 1",            RHT_POT_GORON_CITY,	            RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_LOWER_STAIRCASE_POT_1));
+    locationTable[RC_GC_LOWER_STAIRCASE_POT_2]      = Location::Pot(RC_GC_LOWER_STAIRCASE_POT_2,      RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-271, 825),    "Lower Staircase Pot 2",            RHT_POT_GORON_CITY,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_LOWER_STAIRCASE_POT_2));
+    locationTable[RC_GC_UPPER_STAIRCASE_POT_1]      = Location::Pot(RC_GC_UPPER_STAIRCASE_POT_1,      RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1170, 60),    "Upper Staircase Pot 1",            RHT_POT_GORON_CITY,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_1));
+    locationTable[RC_GC_UPPER_STAIRCASE_POT_2]      = Location::Pot(RC_GC_UPPER_STAIRCASE_POT_2,      RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1185, 95),    "Upper Staircase Pot 2",            RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_2));
+    locationTable[RC_GC_UPPER_STAIRCASE_POT_3]      = Location::Pot(RC_GC_UPPER_STAIRCASE_POT_3,      RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-1200, 63),    "Upper Staircase Pot 3",            RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_UPPER_STAIRCASE_POT_3));
+    locationTable[RC_GC_MEDIGORON_POT_1]            = Location::Pot(RC_GC_MEDIGORON_POT_1,            RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(-694, 1196),   "Medigoron Pot 1",                  RHT_POT_GORON_CITY,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_MEDIGORON_POT_1));
+    locationTable[RC_GC_DARUNIA_POT_1]              = Location::Pot(RC_GC_DARUNIA_POT_1,              RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(262, -1210),   "Darunia Pot 1",                    RHT_POT_GORON_CITY,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_1));
+    locationTable[RC_GC_DARUNIA_POT_2]              = Location::Pot(RC_GC_DARUNIA_POT_2,              RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(261, -1254),   "Darunia Pot 2",                    RHT_POT_GORON_CITY,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_2));
+    locationTable[RC_GC_DARUNIA_POT_3]              = Location::Pot(RC_GC_DARUNIA_POT_3,              RCQUEST_BOTH, RCAREA_GORON_CITY,            SCENE_GORON_CITY,                  TWO_ACTOR_PARAMS(262, -1386),   "Darunia Pot 3",                    RHT_POT_GORON_CITY,	            RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GC_DARUNIA_POT_3));
+    locationTable[RC_DMC_NEAR_GC_POT_2]             = Location::Pot(RC_DMC_NEAR_GC_POT_2,             RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1546, 141),   "Near GC Pot 2",                    RHT_POT_DEATH_MOUNTAIN_CRATER,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_2));
+    locationTable[RC_DMC_NEAR_GC_POT_3]             = Location::Pot(RC_DMC_NEAR_GC_POT_3,             RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1641, -127),  "Near GC Pot 3",                    RHT_POT_DEATH_MOUNTAIN_CRATER,     RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_3));
+    locationTable[RC_DMC_NEAR_GC_POT_1]             = Location::Pot(RC_DMC_NEAR_GC_POT_1,             RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1590, 132),   "Near GC Pot 1",                    RHT_POT_DEATH_MOUNTAIN_CRATER,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_1));
+    locationTable[RC_DMC_NEAR_GC_POT_4]             = Location::Pot(RC_DMC_NEAR_GC_POT_4,             RCQUEST_BOTH, RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_DEATH_MOUNTAIN_CRATER,       TWO_ACTOR_PARAMS(-1606, -166),  "Near GC Pot 4",                    RHT_POT_DEATH_MOUNTAIN_CRATER,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_NEAR_GC_POT_4));
+    locationTable[RC_ZD_NEAR_SHOP_POT_1]            = Location::Pot(RC_ZD_NEAR_SHOP_POT_1,            RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(676, 377),     "Near Shop Pot 1",                  RHT_POT_ZORAS_DOMAIN,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_1));
+    locationTable[RC_ZD_NEAR_SHOP_POT_2]            = Location::Pot(RC_ZD_NEAR_SHOP_POT_2,            RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(614, 419),     "Near Shop Pot 2",                  RHT_POT_ZORAS_DOMAIN,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_2));
+    locationTable[RC_ZD_NEAR_SHOP_POT_3]            = Location::Pot(RC_ZD_NEAR_SHOP_POT_3,            RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(289, 415),     "Near Shop Pot 3",                  RHT_POT_ZORAS_DOMAIN,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_3));
+    locationTable[RC_ZD_NEAR_SHOP_POT_4]            = Location::Pot(RC_ZD_NEAR_SHOP_POT_4,            RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(289, 289),     "Near Shop Pot 4",                  RHT_POT_ZORAS_DOMAIN,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_4));
+    locationTable[RC_ZD_NEAR_SHOP_POT_5]            = Location::Pot(RC_ZD_NEAR_SHOP_POT_5,            RCQUEST_BOTH, RCAREA_ZORAS_DOMAIN,          SCENE_ZORAS_DOMAIN,                TWO_ACTOR_PARAMS(220, 384),     "Near Shop Pot 5",                  RHT_POT_ZORAS_DOMAIN,	            RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZD_NEAR_SHOP_POT_5));
+    locationTable[RC_ZF_HIDDEN_CAVE_POT_1]          = Location::Pot(RC_ZF_HIDDEN_CAVE_POT_1,          RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(385, 2587),    "Hidden Cave Pot 1",                RHT_POT_ZORAS_FOUNTAIN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_1));
+    locationTable[RC_ZF_HIDDEN_CAVE_POT_2]          = Location::Pot(RC_ZF_HIDDEN_CAVE_POT_2,          RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(418, 2609),    "Hidden Cave Pot 2",                RHT_POT_ZORAS_FOUNTAIN,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_2));
+    locationTable[RC_ZF_HIDDEN_CAVE_POT_3]          = Location::Pot(RC_ZF_HIDDEN_CAVE_POT_3,          RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(430, 2568),    "Hidden Cave Pot 3",                RHT_POT_ZORAS_FOUNTAIN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_HIDDEN_CAVE_POT_3));
+    locationTable[RC_ZF_NEAR_JABU_POT_1]            = Location::Pot(RC_ZF_NEAR_JABU_POT_1,            RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1630, 170),   "Near Jabu Pot 1",                  RHT_POT_ZORAS_FOUNTAIN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_1));
+    locationTable[RC_ZF_NEAR_JABU_POT_2]            = Location::Pot(RC_ZF_NEAR_JABU_POT_2,            RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1550, 170),   "Near Jabu Pot 2",                  RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_2));
+    locationTable[RC_ZF_NEAR_JABU_POT_3]            = Location::Pot(RC_ZF_NEAR_JABU_POT_3,            RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1630, -260),  "Near Jabu Pot 3",                  RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_3));
+    locationTable[RC_ZF_NEAR_JABU_POT_4]            = Location::Pot(RC_ZF_NEAR_JABU_POT_4,            RCQUEST_BOTH, RCAREA_ZORAS_FOUNTAIN,        SCENE_ZORAS_FOUNTAIN,              TWO_ACTOR_PARAMS(-1550, -260),  "Near Jabu Pot 4",                  RHT_POT_ZORAS_FOUNTAIN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZF_NEAR_JABU_POT_4));
+    locationTable[RC_LLR_FRONT_POT_1]               = Location::Pot(RC_LLR_FRONT_POT_1,               RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3218),   "Front Pot 1",                      RHT_POT_LON_LON_RANCH,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_1));
+    locationTable[RC_LLR_FRONT_POT_2]               = Location::Pot(RC_LLR_FRONT_POT_2,               RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3186),   "Front Pot 2",                      RHT_POT_LON_LON_RANCH,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_2));
+    locationTable[RC_LLR_FRONT_POT_3]               = Location::Pot(RC_LLR_FRONT_POT_3,               RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3154),   "Front Pot 3",                      RHT_POT_LON_LON_RANCH,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_3));
+    locationTable[RC_LLR_FRONT_POT_4]               = Location::Pot(RC_LLR_FRONT_POT_4,               RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(667, -3122),   "Front Pot 4",                      RHT_POT_LON_LON_RANCH,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_FRONT_POT_4));
+    locationTable[RC_LLR_RAIN_SHED_POT_1]           = Location::Pot(RC_LLR_RAIN_SHED_POT_1,           RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(852, 172),     "Rain Shed Pot 1",                  RHT_POT_LON_LON_RANCH,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_1));
+    locationTable[RC_LLR_RAIN_SHED_POT_2]           = Location::Pot(RC_LLR_RAIN_SHED_POT_2,           RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(840, 212),     "Rain Shed Pot 2",                  RHT_POT_LON_LON_RANCH,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_2));
+    locationTable[RC_LLR_RAIN_SHED_POT_3]           = Location::Pot(RC_LLR_RAIN_SHED_POT_3,           RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_RANCH,               TWO_ACTOR_PARAMS(872, 219),     "Rain Shed Pot 3",                  RHT_POT_LON_LON_RANCH,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_RAIN_SHED_POT_3));
+    locationTable[RC_LLR_TALONS_HOUSE_POT_1]        = Location::Pot(RC_LLR_TALONS_HOUSE_POT_1,        RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1255, 47),     "Talons House Pot 1",               RHT_POT_LON_LON_RANCH,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_1));
+    locationTable[RC_LLR_TALONS_HOUSE_POT_2]        = Location::Pot(RC_LLR_TALONS_HOUSE_POT_2,        RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1256, -51),    "Talons House Pot 2",               RHT_POT_LON_LON_RANCH,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_2));
+    locationTable[RC_LLR_TALONS_HOUSE_POT_3]        = Location::Pot(RC_LLR_TALONS_HOUSE_POT_3,        RCQUEST_BOTH, RCAREA_LON_LON_RANCH,         SCENE_LON_LON_BUILDINGS,           TWO_ACTOR_PARAMS(1256, -78),    "Talons House Pot 3",               RHT_POT_LON_LON_RANCH, 	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_LLR_TALONS_HOUSE_POT_3));
+    locationTable[RC_HF_COW_GROTTO_POT_1]           = Location::Pot(RC_HF_COW_GROTTO_POT_1,           RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(3410, -223),   "Cow Grotto Pot 1",                 RHT_POT_HYRULE_FIELD,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_POT_1));
+    locationTable[RC_HF_COW_GROTTO_POT_2]           = Location::Pot(RC_HF_COW_GROTTO_POT_2,           RCQUEST_BOTH, RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(3390, -258),   "Cow Grotto Pot 2",                 RHT_POT_HYRULE_FIELD,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_HF_COW_GROTTO_POT_2));
+    locationTable[RC_HC_STORMS_GROTTO_POT_1]        = Location::Pot(RC_HC_STORMS_GROTTO_POT_1,        RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1843, 1014),   "Storms Grotto Pot 1",              RHT_POT_HYRULE_CASTLE,	            RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_1));
+    locationTable[RC_HC_STORMS_GROTTO_POT_2]        = Location::Pot(RC_HC_STORMS_GROTTO_POT_2,        RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1769, 954),    "Storms Grotto Pot 2",              RHT_POT_HYRULE_CASTLE,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_2));
+    locationTable[RC_HC_STORMS_GROTTO_POT_3]        = Location::Pot(RC_HC_STORMS_GROTTO_POT_3,        RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1857, 897),    "Storms Grotto Pot 3",              RHT_POT_HYRULE_CASTLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_3));
+    locationTable[RC_HC_STORMS_GROTTO_POT_4]        = Location::Pot(RC_HC_STORMS_GROTTO_POT_4,        RCQUEST_BOTH, RCAREA_HYRULE_CASTLE,         SCENE_GROTTOS,                     TWO_ACTOR_PARAMS(1764, 847),    "Storms Grotto Pot 4",              RHT_POT_HYRULE_CASTLE,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_HC_STORMS_GROTTO_POT_4));
     
     // Dungeon Pots
-    //            Randomizer Check                                 	Randomizer Check                                           Quest            Area                       Scene ID                           Params                          Short Name                          Spoiler Name                                Hint Text Key                 Vanilla             Spoiler Collection Check
-    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_3]          	=	Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_3,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2673, -2060),  "Lizalfos Pot 3",                   "Dodongos Cavern Lizalfos Pot 3",           RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3));
-    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_2]          	=	Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_2,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3526, -2574),  "Lizalfos Pot 2",                   "Dodongos Cavern Lizalfos Pot 2",           RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_1]        	=	Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_1,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3579, -2574),  "Lizalfos Pot 1",                   "Dodongos Cavern Lizalfos Pot 1",           RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_4]          	=	Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_4,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2653, -2031),  "Lizalfos Pot 4",                   "Dodongos Cavern Lizalfos Pot 4",           RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1708, -471),   "Side Room Pot 1",                  "Dodongos Cavern Side Room Pot 1",          RHT_POT_DODONGOS_CAVERN,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1746, -424),   "Side Room Pot 2",                  "Dodongos Cavern Side Room Pot 2",          RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2573, -489),   "Side Room Pot 3",                  "Dodongos Cavern Side Room Pot 3",          RHT_POT_DODONGOS_CAVERN,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2622, -489),   "Side Room Pot 4",                  "Dodongos Cavern Side Room Pot 4",          RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3507, -964),   "Side Room Pot 5",                  "Dodongos Cavern Side Room Pot 5",          RHT_POT_DODONGOS_CAVERN,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5));
-    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6]         	=	Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3617, -911),   "Side Room Pot 6",                  "Dodongos Cavern Side Room Pot 6",          RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6));
-    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1]        	=	Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1846, -1879),  "Torch Room Pot 1",                 "Dodongos Cavern Torch Room Pot 1",         RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2]        	=	Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2050, -1964),  "Torch Room Pot 2",                 "Dodongos Cavern Torch Room Pot 2",         RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3]        	=	Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2281, -1799),  "Torch Room Pot 3",                 "Dodongos Cavern Torch Room Pot 3",         RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3));
-    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4]        	=	Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1836, -1239),  "Torch Room Pot 4",                 "Dodongos Cavern Torch Room Pot 4",         RHT_POT_DODONGOS_CAVERN,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4));
-    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_1]         	=	Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2414, -1823), "Staircase Pot 1",                  "Dodongos Cavern Staircase Pot 1",          RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_2]         	=	Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2368, -1827), "Staircase Pot 2",                  "Dodongos Cavern Staircase Pot 2",          RHT_POT_DODONGOS_CAVERN,	    RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_3]         	=	Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1574, -1831), "Staircase Pot 3",                  "Dodongos Cavern Staircase Pot 3",          RHT_POT_DODONGOS_CAVERN,	    RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3));
-    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_4]         	=	Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1528, -1827), "Staircase Pot 4",                  "Dodongos Cavern Staircase Pot 4",          RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4));
-    locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1]        	=	Location::Pot(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2704, -483),   "Single Eye Pot 1",                 "Dodongos Cavern Single Eye Pot 1",         RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2]        	=	Location::Pot(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3195, -155),   "Single Eye Pot 2",                 "Dodongos Cavern Single Eye Pot 2",         RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_BLADE_POT_1]             	=	Location::Pot(RC_DODONGOS_CAVERN_BLADE_POT_1,              RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1656, -531),   "Blade Pot 1",                      "Dodongos Cavern Blade Pot 1",              RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BLADE_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_BLADE_POT_2]             	=	Location::Pot(RC_DODONGOS_CAVERN_BLADE_POT_2,              RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1831, -593),   "Blade Pot 2",                      "Dodongos Cavern Blade Pot 2",              RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BLADE_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1]        	=	Location::Pot(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3329, -753),   "Double Eye Pot 1",                 "Dodongos Cavern Double Eye Pot 1",         RHT_POT_DODONGOS_CAVERN,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2]        	=	Location::Pot(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2705, -1086),  "Double Eye Pot 2",                 "Dodongos Cavern Double Eye Pot 2",         RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_1]         	=	Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1027, -3704),  "Back Room Pot 1",                  "Dodongos Cavern Back Room Pot 1",          RHT_POT_DODONGOS_CAVERN,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_2]         	=	Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(966, -3704),   "Back Room Pot 2",                  "Dodongos Cavern Back Room Pot 2",          RHT_POT_DODONGOS_CAVERN,	    RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_3]         	=	Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(125, -3854),   "Back Room Pot 3",                  "Dodongos Cavern Back Room Pot 3",          RHT_POT_DODONGOS_CAVERN,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3));
-    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_4]         	=	Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(78, -3835),    "Back Room Pot 4",                  "Dodongos Cavern Back Room Pot 4",          RHT_POT_DODONGOS_CAVERN,	    RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4));
-    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1]   	=	Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1295, -3612), "Above Big Octo Pot 1",             "Jabu Jabus Belly Above Big Octo Pot 1",    RHT_POT_JABU_JABUS_BELLY,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1));
-    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2]   	=	Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1355, -3612), "Above Big Octo Pot 2",             "Jabu Jabus Belly Above Big Octo Pot 2",    RHT_POT_JABU_JABUS_BELLY,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2));
-    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3]   	=	Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1422, -3612), "Above Big Octo Pot 3",             "Jabu Jabus Belly Above Big Octo Pot 3",    RHT_POT_JABU_JABUS_BELLY,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_1]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_1,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-551, 33),     "Barinade Pot 1",                   "Jabu Jabus Belly Barinade Pot 1",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_2]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_2,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(551, 36),      "Barinade Pot 2",                   "Jabu Jabus Belly Barinade Pot 2",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_3]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_3,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(554, -493),    "Barinade Pot 3",                   "Jabu Jabus Belly Barinade Pot 3",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_4]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_4,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-543, -496),   "Barinade Pot 4",                   "Jabu Jabus Belly Barinade Pot 4",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_5]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_5,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-268, -786),   "Barinade Pot 5",                   "Jabu Jabus Belly Barinade Pot 5",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5));
-    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_6]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_6,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(279, -761),    "Barinade Pot 6",                   "Jabu Jabus Belly Barinade Pot 6",          RHT_POT_JABU_JABUS_BELLY,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6));
-    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_1]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_1,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(703, -2371),   "Basement Pot 1",                   "Jabu Jabus Belly Basement Pot 1",          RHT_POT_JABU_JABUS_BELLY,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1));
-    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_2]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_2,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(645, -2408),   "Basement Pot 2",                   "Jabu Jabus Belly Basement Pot 2",          RHT_POT_JABU_JABUS_BELLY,	    RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2));
-    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_3]         	=	Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_3,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(650, -2344),   "Basement Pot 3",                   "Jabu Jabus Belly Basement Pot 3",          RHT_POT_JABU_JABUS_BELLY,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3));
-    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1]      	=	Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1127, -2271), "Two Octorok Pot 1",                "Jabu Jabus Belly Two Octorok Pot 1",       RHT_POT_JABU_JABUS_BELLY,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1));
-    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2]      	=	Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1178, -2272), "Two Octorok Pot 2",                "Jabu Jabus Belly Two Octorok Pot 2",       RHT_POT_JABU_JABUS_BELLY,	    RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2));
-    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3]      	=	Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1150, -2248), "Two Octorok Pot 3",                "Jabu Jabus Belly Two Octorok Pot 3",       RHT_POT_JABU_JABUS_BELLY,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3));
-    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4]      	=	Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1131, -2221), "Two Octorok Pot 4",                "Jabu Jabus Belly Two Octorok Pot 4",       RHT_POT_JABU_JABUS_BELLY,	    RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4));
-    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5]      	=	Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1173, -2227), "Two Octorok Pot 5",                "Jabu Jabus Belly Two Octorok Pot 5",       RHT_POT_JABU_JABUS_BELLY,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_1]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_1,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(720, -1037),   "Lobby Pot 1",                      "Forest Temple Lobby Pot 1",                RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_1));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_2]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_2,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(675, -989),    "Lobby Pot 2",                      "Forest Temple Lobby Pot 2",                RHT_POT_FOREST_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_2));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_3]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_3,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(630, -943),    "Lobby Pot 3",                      "Forest Temple Lobby Pot 3",                RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_3));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_4]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_4,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-384, -937),   "Lobby Pot 4",                      "Forest Temple Lobby Pot 4",                RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_4));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_5]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_5,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-429, -981),   "Lobby Pot 5",                      "Forest Temple Lobby Pot 5",                RHT_POT_FOREST_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_5));
-    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_6]               	=	Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_6,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-477, -1034),  "Lobby Pot 6",                      "Forest Temple Lobby Pot 6",                RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_6));
-    locationTable[RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1]       	=	Location::Pot(RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(90, -3583),    "Lower Stalfos Pot 1",              "Forest Temple Lower Stalfos Pot 1",        RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1));
-    locationTable[RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2]       	=	Location::Pot(RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(142, -3583),   "Lower Stalfos Pot 2",              "Forest Temple Lower Stalfos Pot 2",        RHT_POT_FOREST_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2));
-    locationTable[RC_FOREST_TEMPLE_GREEN_POE_POT_1]           	=	Location::Pot(RC_FOREST_TEMPLE_GREEN_POE_POT_1,            RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(1647, -1529),  "Green Poe Pot 1",                  "Forest Temple Green Poe Pot 1",            RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1));
-    locationTable[RC_FOREST_TEMPLE_GREEN_POE_POT_2]           	=	Location::Pot(RC_FOREST_TEMPLE_GREEN_POE_POT_2,            RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(1645, -1588),  "Green Poe Pot 2",                  "Forest Temple Green Poe Pot 2",            RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2));
-    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1]       	=	Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(32, -3012),    "Upper Stalfos Pot 1",              "Forest Temple Upper Stalfos Pot 1",        RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1));
-    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2]       	=	Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(202, -3012),   "Upper Stalfos Pot 2",              "Forest Temple Upper Stalfos Pot 2",        RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2));
-    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3]       	=	Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(30, -3631),    "Upper Stalfos Pot 3",              "Forest Temple Upper Stalfos Pot 3",        RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3));
-    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4]       	=	Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(206, -3631),   "Upper Stalfos Pot 4",              "Forest Temple Upper Stalfos Pot 4",        RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4));
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_1]            	=	Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_1,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(830, -3639),   "Blue Poe Pot 1",                   "Forest Temple Blue Poe Pot 1",             RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1));
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_2]            	=	Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_2,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(883, -3640),   "Blue Poe Pot 2",                   "Forest Temple Blue Poe Pot 2",             RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2));
-    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_3]            	=	Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_3,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(941, -3640),   "Blue Poe Pot 3",                   "Forest Temple Blue Poe Pot 3",             RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3));
-    locationTable[RC_FOREST_TEMPLE_FROZEN_EYE_POT_1]          	=	Location::Pot(RC_FOREST_TEMPLE_FROZEN_EYE_POT_1,           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(2312, -874),   "Frozen Eye Pot 1",                 "Forest Temple Frozen Eye Pot 1",           RHT_POT_FOREST_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1));
-    locationTable[RC_FOREST_TEMPLE_FROZEN_EYE_POT_2]          	=	Location::Pot(RC_FOREST_TEMPLE_FROZEN_EYE_POT_2,           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(2364, -873),   "Frozen Eye Pot 2",                 "Forest Temple Frozen Eye Pot 2",           RHT_POT_FOREST_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2));
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_1]             	=	Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_1,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1086, -714),  "Near Boss Pot 1",                  "Fire Temple Near Boss Pot 1",              RHT_POT_FIRE_TEMPLE,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1));
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_2]             	=	Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_2,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1138, -713),  "Near Boss Pot 2",                  "Fire Temple Near Boss Pot 2",              RHT_POT_FIRE_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2));
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_3]             	=	Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_3,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1087, -765),  "Near Boss Pot 3",                  "Fire Temple Near Boss Pot 3",              RHT_POT_FIRE_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3));
-    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_4]             	=	Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_4,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1139, -766),  "Near Boss Pot 4",                  "Fire Temple Near Boss Pot 4",              RHT_POT_FIRE_TEMPLE,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4));
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_1]              	=	Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_1,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2226, -754),   "Big Lava Pot 1",                   "Fire Temple Big Lava Pot 1",               RHT_POT_FIRE_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1));
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_2]              	=	Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_2,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2226, -809),   "Big Lava Pot 2",                   "Fire Temple Big Lava Pot 2",               RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2));
-    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_3]              	=	Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_3,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2227, -862),   "Big Lava Pot 3",                   "Fire Temple Big Lava Pot 3",               RHT_POT_FIRE_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1]       	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2388, 953),   "Flame Maze Left Pot 1",            "Fire Temple Flame Maze Left Pot 1",        RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2]       	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2423, 920),   "Flame Maze Left Pot 2",            "Fire Temple Flame Maze Left Pot 2",        RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3]       	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2442, 715),   "Flame Maze Left Pot 3",            "Fire Temple Flame Maze Left Pot 3",        RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4]       	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2408, 680),   "Flame Maze Left Pot 4",            "Fire Temple Flame Maze Left Pot 4",        RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1]      	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2208, -168),  "Flame Maze Right Pot 1",           "Fire Temple Flame Maze Right Pot 1",       RHT_POT_FIRE_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2]      	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2253, -167),  "Flame Maze Right Pot 2",           "Fire Temple Flame Maze Right Pot 2",       RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3]      	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2657, -591),  "Flame Maze Right Pot 3",           "Fire Temple Flame Maze Right Pot 3",       RHT_POT_FIRE_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3));
-    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4]      	=	Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2657, -635),  "Flame Maze Right Pot 4",           "Fire Temple Flame Maze Right Pot 4",       RHT_POT_FIRE_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4));
-    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1]         	=	Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(330, -198),    "Main Level 2 Pot 1",               "Water Temple Main Level 2 Pot 1",          RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1));
-    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2]         	=	Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(331, -168),    "Main Level 2 Pot 2",               "Water Temple Main Level 2 Pot 2",          RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2));
-    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1]         	=	Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-241, -1193),  "Main Level 1 Pot 1",               "Water Temple Main Level 1 Pot 1",          RHT_POT_WATER_TEMPLE,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1));
-    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2]         	=	Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-117, -1192),  "Main Level 1 Pot 2",               "Water Temple Main Level 1 Pot 2",          RHT_POT_WATER_TEMPLE,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2));
-    locationTable[RC_WATER_TEMPLE_TORCH_POT_1]                	=	Location::Pot(RC_WATER_TEMPLE_TORCH_POT_1,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1123, 62),     "Torch Pot 1",                      "Water Temple Torch Pot 1",                 RHT_POT_WATER_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_TORCH_POT_1));
-    locationTable[RC_WATER_TEMPLE_TORCH_POT_2]                	=	Location::Pot(RC_WATER_TEMPLE_TORCH_POT_2,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1123, 293),    "Torch Pot 2",                      "Water Temple Torch Pot 2",                 RHT_POT_WATER_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_TORCH_POT_2));
-    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_1]         	=	Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1222, -617),   "Near Compass Pot 1",               "Water Temple Near Compass Pot 1",          RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1));
-    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_2]         	=	Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1172, -617),   "Near Compass Pot 2",               "Water Temple Near Compass Pot 2",          RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2));
-    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_3]         	=	Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_3,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1122, -617),   "Near Compass Pot 3",               "Water Temple Near Compass Pot 3",          RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3));
-    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_POT_1]          	=	Location::Pot(RC_WATER_TEMPLE_CENTRAL_BOW_POT_1,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(688, 1008),    "Central Bow Pot 1",                "Water Temple Central Bow Pot 1",           RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1));
-    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_POT_2]          	=	Location::Pot(RC_WATER_TEMPLE_CENTRAL_BOW_POT_2,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(631, 1008),    "Central Bow Pot 2",                "Water Temple Central Bow Pot 2",           RHT_POT_WATER_TEMPLE,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2));
-    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_1]          	=	Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_1,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2313, 944),   "Behind Gate Pot 1",                "Water Temple Behind Gate Pot 1",           RHT_POT_WATER_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1));
-    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_2]          	=	Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_2,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2313, 905),   "Behind Gate Pot 2",                "Water Temple Behind Gate Pot 2",           RHT_POT_WATER_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2));
-    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_3]          	=	Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_3,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2314, 808),   "Behind Gate Pot 3",                "Water Temple Behind Gate Pot 3",           RHT_POT_WATER_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3));
-    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_4]          	=	Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_4,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2314, 770),   "Behind Gate Pot 4",                "Water Temple Behind Gate Pot 4",           RHT_POT_WATER_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4));
-    locationTable[RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1]	=	Location::Pot(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-28, -3817),   "Basement Block Puzzle Pot 1",      "Water Temple Basement Block Puzzle Pot 1", RHT_POT_WATER_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1));
-    locationTable[RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2] 	=	Location::Pot(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(28, -3817),    "Basement Block Puzzle Pot 2",      "Water Temple Basement Block Puzzle Pot 2", RHT_POT_WATER_TEMPLE,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2));
-    locationTable[RC_WATER_TEMPLE_RIVER_POT_1]                	=	Location::Pot(RC_WATER_TEMPLE_RIVER_POT_1,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2226, -2487), "River Pot 1",                      "Water Temple River Pot 1",                 RHT_POT_WATER_TEMPLE,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_RIVER_POT_1));
-    locationTable[RC_WATER_TEMPLE_RIVER_POT_2]                	=	Location::Pot(RC_WATER_TEMPLE_RIVER_POT_2,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2184, -2456), "River Pot 2",                      "Water Temple River Pot 2",                 RHT_POT_WATER_TEMPLE,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_RIVER_POT_2));
-    locationTable[RC_WATER_TEMPLE_LIKE_LIKE_POT_1]            	=	Location::Pot(RC_WATER_TEMPLE_LIKE_LIKE_POT_1,             RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-3188, -1628), "Like Like Pot 1",                  "Water Temple Like Like Pot 1",             RHT_POT_WATER_TEMPLE,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1));
-    locationTable[RC_WATER_TEMPLE_LIKE_LIKE_POT_2]            	=	Location::Pot(RC_WATER_TEMPLE_LIKE_LIKE_POT_2,             RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-3056, -1626), "Like Like Pot 2",                  "Water Temple Like Like Pot 2",             RHT_POT_WATER_TEMPLE,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2));
-    locationTable[RC_WATER_TEMPLE_BOSS_KEY_POT_1]            	=	Location::Pot(RC_WATER_TEMPLE_BOSS_KEY_POT_1,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-1150, -3031), "Boss Key Pot 1",                   "Water Temple Boss Key Pot 1",              RHT_POT_WATER_TEMPLE,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1));
-    locationTable[RC_WATER_TEMPLE_BOSS_KEY_POT_2]            	=	Location::Pot(RC_WATER_TEMPLE_BOSS_KEY_POT_2,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-1417, -3025), "Boss Key Pot 2",                   "Water Temple Boss Key Pot 2",              RHT_POT_WATER_TEMPLE,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1]      	=	Location::Pot(RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1806, -344),  "Near Dead Hand Pot 1",             "Shadow Temple Near Dead Hand Pot 1",       RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1]    	=	Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1721, 61),    "Whispering Walls Pot 1",           "Shadow Temple Whispering Walls Pot 1",     RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2]    	=	Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1407, 61),    "Whispering Walls Pot 2",           "Shadow Temple Whispering Walls Pot 2",     RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3]    	=	Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1614, 61),    "Whispering Walls Pot 3",           "Shadow Temple Whispering Walls Pot 3",     RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3));
-    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4]    	=	Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1055, -257),  "Whispering Walls Pot 4",           "Shadow Temple Whispering Walls Pot 4",     RHT_POT_SHADOW_TEMPLE,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4));
-    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5]    	=	Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1050, -130),  "Whispering Walls Pot 5",           "Shadow Temple Whispering Walls Pot 5",     RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5));
-    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST_POT_1]           	=	Location::Pot(RC_SHADOW_TEMPLE_MAP_CHEST_POT_1,            RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-665, -760),   "Map Chest Pot 1",                  "Shadow Temple Map Chest Pot 1",            RHT_POT_SHADOW_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST_POT_2]           	=	Location::Pot(RC_SHADOW_TEMPLE_MAP_CHEST_POT_2,            RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-929, -748),   "Map Chest Pot 2",                  "Shadow Temple Map Chest Pot 2",            RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1]      	=	Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(614, 3579),    "Falling Spikes Pot 1",             "Shadow Temple Falling Spikes Pot 1",       RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2]      	=	Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(798, 3574),    "Falling Spikes Pot 2",             "Shadow Temple Falling Spikes Pot 2",       RHT_POT_SHADOW_TEMPLE,	    RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3]      	=	Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(1173, 3707),   "Falling Spikes Pot 3",             "Shadow Temple Falling Spikes Pot 3",       RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3));
-    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4]      	=	Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(1173, 3605),   "Falling Spikes Pot 4",             "Shadow Temple Falling Spikes Pot 4",       RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_POT_1]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_WIND_POT_1,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(4222, -916),   "After Wind Pot 1",                 "Shadow Temple After Wind Pot 1",           RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_POT_2]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_WIND_POT_2,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(4549, -922),   "After Wind Pot 2",                 "Shadow Temple After Wind Pot 2",           RHT_POT_SHADOW_TEMPLE,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1]         	=	Location::Pot(RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4303, -2657), "Spike Walls Pot 1",                "Shadow Temple Spike Walls Pot 1",          RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_FLOORMASTER_POT_1]         	=	Location::Pot(RC_SHADOW_TEMPLE_FLOORMASTER_POT_1,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4575, -811),  "Floormaster Pot 1",                "Shadow Temple Floormaster Pot 1",          RHT_POT_SHADOW_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_FLOORMASTER_POT_2]         	=	Location::Pot(RC_SHADOW_TEMPLE_FLOORMASTER_POT_2,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4036, -811),  "Floormaster Pot 2",                "Shadow Temple Floormaster Pot 2",          RHT_POT_SHADOW_TEMPLE,	    RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2400, -1470), "After Boat Pot 1",                 "Shadow Temple After Boat Pot 1",           RHT_POT_SHADOW_TEMPLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2230, -1470), "After Boat Pot 2",                 "Shadow Temple After Boat Pot 2",           RHT_POT_SHADOW_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2859, -497),  "After Boat Pot 3",                 "Shadow Temple After Boat Pot 3",           RHT_POT_SHADOW_TEMPLE,	    RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3));
-    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4]          	=	Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2624, -492),  "After Boat Pot 4",                 "Shadow Temple After Boat Pot 4",           RHT_POT_SHADOW_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4));
-    locationTable[RC_SPIRIT_TEMPLE_LOBBY_POT_1]               	=	Location::Pot(RC_SPIRIT_TEMPLE_LOBBY_POT_1,                RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-181, 233),    "Lobby Pot 1",                      "Spirit Temple Lobby Pot 1",                RHT_POT_SPIRIT_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1));
-    locationTable[RC_SPIRIT_TEMPLE_LOBBY_POT_2]               	=	Location::Pot(RC_SPIRIT_TEMPLE_LOBBY_POT_2,                RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(184, 231),     "Lobby Pot 2",                      "Spirit Temple Lobby Pot 2",                RHT_POT_SPIRIT_TEMPLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2));
-    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_1]              	=	Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_1,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-975, -1751),  "Anubis Pot 1",                     "Spirit Temple Anubis Pot 1",               RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1));
-    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_2]              	=	Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_2,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-928, -1827),  "Anubis Pot 2",                     "Spirit Temple Anubis Pot 2",               RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2));
-    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_3]              	=	Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_3,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1211, -1530), "Anubis Pot 3",                     "Spirit Temple Anubis Pot 3",               RHT_POT_SPIRIT_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3));
-    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_4]              	=	Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_4,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1055, -1680), "Anubis Pot 4",                     "Spirit Temple Anubis Pot 4",               RHT_POT_SPIRIT_TEMPLE,	    RG_DEKU_SHIELD,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4));
-    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1]         	=	Location::Pot(RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1,          RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1101, -1305), "Child Climb Pot 1",                "Spirit Temple Child Climb Pot 1",          RHT_POT_SPIRIT_TEMPLE,	    RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1));
-    locationTable[RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1]     	=	Location::Pot(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1781, 830),   "After Sun Block Pot 1",            "Spirit Temple After Sun Block Pot 1",      RHT_POT_SPIRIT_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1));
-    locationTable[RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2]     	=	Location::Pot(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1617, 830),   "After Sun Block Pot 2",            "Spirit Temple After Sun Block Pot 2",      RHT_POT_SPIRIT_TEMPLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-600, -1213),  "Central Chamber Pot 1",            "Spirit Temple Central Chamber Pot 1",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-564, -1180),  "Central Chamber Pot 2",            "Spirit Temple Central Chamber Pot 2",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-526, -1213),  "Central Chamber Pot 3",            "Spirit Temple Central Chamber Pot 3",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(639, -1224),   "Central Chamber Pot 4",            "Spirit Temple Central Chamber Pot 4",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(671, -1179),   "Central Chamber Pot 5",            "Spirit Temple Central Chamber Pot 5",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5));
-    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6]     	=	Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(704, -1224),   "Central Chamber Pot 6",            "Spirit Temple Central Chamber Pot 6",      RHT_POT_SPIRIT_TEMPLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6));
-    locationTable[RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1]         	=	Location::Pot(RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1,          RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(819, -333),    "Beamos Hall Pot 1",                "Spirit Temple Beamos Hall Pot 1",          RHT_POT_SPIRIT_TEMPLE,	    RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1));
-    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_POT_1]        	=	Location::Pot(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1725, 2336),   "Forest Trial Pot 1",               "Ganons Castle Forest Trial Pot 1",         RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_POT_2]        	=	Location::Pot(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1892, 2241),   "Forest Trial Pot 2",               "Ganons Castle Forest Trial Pot 2",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_2]          	=	Location::Pot(RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,           RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1898, -3942), "Fire Trial Pot 2",                 "Ganons Castle Fire Trial Pot 2",           RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_1]          	=	Location::Pot(RC_GANONS_CASTLE_FIRE_TRIAL_POT_1,           RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-2051, -3855), "Fire Trial Pot 1",                 "Ganons Castle Fire Trial Pot 1",           RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_1]         	=	Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_1,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -920),   "Water Trial Pot 1",                "Ganons Castle Water Trial Pot 1",          RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_2]         	=	Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_2,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -761),   "Water Trial Pot 2",                "Ganons Castle Water Trial Pot 2",          RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_3]         	=	Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_3,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2822, -507),   "Water Trial Pot 3",                "Ganons Castle Water Trial Pot 3",          RHT_POT_GANONS_CASTLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3));
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1]        	=	Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1234, -3418),  "Shadow Trial Pot 1",               "Ganons Castle Shadow Trial Pot 1",         RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2]        	=	Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1621, -3203),  "Shadow Trial Pot 2",               "Ganons Castle Shadow Trial Pot 2",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3]        	=	Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2067, -4592),  "Shadow Trial Pot 3",               "Ganons Castle Shadow Trial Pot 3",         RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3));
-    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4]        	=	Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2224, -4506),  "Shadow Trial Pot 4",               "Ganons Castle Shadow Trial Pot 4",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4));
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1]        	=	Location::Pot(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1398, 1402),  "Spirit Trial Pot 1",               "Ganons Castle Spirit Trial Pot 1",         RHT_POT_GANONS_CASTLE,	    RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2]        	=	Location::Pot(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1237, 1494),  "Spirit Trial Pot 2",               "Ganons Castle Spirit Trial Pot 2",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1] 	=	Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,  RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-2581, -839),  "Light Trial Boulder Pot 1",        "Ganons Castle Light Trial Boulder Pot 1",  RHT_POT_GANONS_CASTLE,	    RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1));
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1]         	=	Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-3840, -923),  "Light Trial Pot 1",                "Ganons Castle Light Trial Pot 1",          RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1));
-    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2]         	=	Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-3840, -755),  "Light Trial Pot 2",                "Ganons Castle Light Trial Pot 2",          RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_1]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_1,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-422, -258),   "Ganons Tower Pot 1",               "Ganons Castle Ganons Tower Pot 1",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_2]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_2,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-382, -300),   "Ganons Tower Pot 2",               "Ganons Castle Ganons Tower Pot 2",         RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_3]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_3,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-342, -341),   "Ganons Tower Pot 3",               "Ganons Castle Ganons Tower Pot 3",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_4]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_4,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-298, -383),   "Ganons Tower Pot 4",               "Ganons Castle Ganons Tower Pot 4",         RHT_POT_GANONS_CASTLE,	    RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_5]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_5,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-257, -424),   "Ganons Tower Pot 5",               "Ganons Castle Ganons Tower Pot 5",         RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_6]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_6,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-382, -259),   "Ganons Tower Pot 6",               "Ganons Castle Ganons Tower Pot 6",         RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_7]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_7,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-342, -300),   "Ganons Tower Pot 7",               "Ganons Castle Ganons Tower Pot 7",         RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_8]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_8,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-301, -341),   "Ganons Tower Pot 8",               "Ganons Castle Ganons Tower Pot 8",         RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_9]        	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_9,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-258, -383),   "Ganons Tower Pot 9",               "Ganons Castle Ganons Tower Pot 9",         RHT_POT_GANONS_CASTLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_10]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_10,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(418, -261),    "Ganons Tower Pot 10",              "Ganons Castle Ganons Tower Pot 10",        RHT_POT_GANONS_CASTLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_11]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_11,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(377, -301),    "Ganons Tower Pot 11",              "Ganons Castle Ganons Tower Pot 11",        RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_12]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_12,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(338, -340),    "Ganons Tower Pot 12",              "Ganons Castle Ganons Tower Pot 12",        RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_13]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_13,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(300, -380),    "Ganons Tower Pot 13",              "Ganons Castle Ganons Tower Pot 13",        RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_14]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_14,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(260, -420),    "Ganons Tower Pot 14",              "Ganons Castle Ganons Tower Pot 14",        RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_15]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_15,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(378, -261),    "Ganons Tower Pot 15",              "Ganons Castle Ganons Tower Pot 15",        RHT_POT_GANONS_CASTLE,	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_16]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_16,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(337, -300),    "Ganons Tower Pot 16",              "Ganons Castle Ganons Tower Pot 16",        RHT_POT_GANONS_CASTLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_17]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_17,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(299, -340),    "Ganons Tower Pot 17",              "Ganons Castle Ganons Tower Pot 17",        RHT_POT_GANONS_CASTLE,	    RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17));
-    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_18]       	=	Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_18,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(260, -380),    "Ganons Tower Pot 18",              "Ganons Castle Ganons Tower Pot 18",        RHT_POT_GANONS_CASTLE,	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-95, -673),    "Basement Pot 1",                   "Bottom Of The Well Basement Pot 1",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(75, -598),     "Basement Pot 2",                   "Bottom Of The Well Basement Pot 2",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(270, -1151),   "Basement Pot 3",                   "Bottom Of The Well Basement Pot 3",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(566, -1254),   "Basement Pot 4",                   "Bottom Of The Well Basement Pot 4",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(378, -1089),   "Basement Pot 5",                   "Bottom Of The Well Basement Pot 5",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(665, -1252),   "Basement Pot 6",                   "Bottom Of The Well Basement Pot 6",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(566, -1345),   "Basement Pot 7",                   "Bottom Of The Well Basement Pot 7",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(562, -1304),   "Basement Pot 8",                   "Bottom Of The Well Basement Pot 8",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(313, -1086),   "Basement Pot 9",                   "Bottom Of The Well Basement Pot 9",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(618, -1254),   "Basement Pot 10",                  "Bottom Of The Well Basement Pot 10",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(257, -1099),   "Basement Pot 11",                  "Bottom Of The Well Basement Pot 11",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11));
-    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(296, -1206),   "Basement Pot 12",                  "Bottom Of The Well Basement Pot 12",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12));
-    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-969, 55),     "Left Side Pot 1",                  "Bottom Of The Well Left Side Pot 1",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1));
-    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-966, 9),      "Left Side Pot 2",                  "Bottom Of The Well Left Side Pot 2",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2));
-    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3]      	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-965, -32),    "Left Side Pot 3",                  "Bottom Of The Well Left Side Pot 3",       RHT_POT_BOTTOM_OF_THE_WELL,	RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3));
-    locationTable[RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1]  	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,   RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-41, 389),     "Near Entrance Pot 1",              "Bottom Of The Well Near Entrance Pot 1",   RHT_POT_BOTTOM_OF_THE_WELL,	RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1));
-    locationTable[RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2]  	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,   RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(36, 389),      "Near Entrance Pot 2",              "Bottom Of The Well Near Entrance Pot 2",   RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2));
-    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1]     	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1,      RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(874, -1294),   "Fire Keese Pot 1",                 "Bottom Of The Well Fire Keese Pot 1",      RHT_POT_BOTTOM_OF_THE_WELL,	RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1));
-    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT]       	=	Location::Pot(RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(3, -1641),     "Underwater Pot",                   "Bottom Of The Well Underwater Pot",        RHT_POT_BOTTOM_OF_THE_WELL,	RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT));
-    locationTable[RC_ICE_CAVERN_HALL_POT_1]                   	=	Location::Pot(RC_ICE_CAVERN_HALL_POT_1,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-206, 449),    "Hall Pot 1",                       "Ice Cavern Hall Pot 1",                    RHT_POT_ICE_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_HALL_POT_1));
-    locationTable[RC_ICE_CAVERN_HALL_POT_2]                   	=	Location::Pot(RC_ICE_CAVERN_HALL_POT_2,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-203, 492),    "Hall Pot 2",                       "Ice Cavern Hall Pot 2",                    RHT_POT_ICE_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_HALL_POT_2));
-    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_1]         	=	Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_1,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(433, -732),    "Spinning Blade Pot 1",             "Ice Cavern Spinning Blade Pot 1",          RHT_POT_ICE_CAVERN,	        RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1));
-    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_2]         	=	Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_2,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(569, -175),    "Spinning Blade Pot 2",             "Ice Cavern Spinning Blade Pot 2",          RHT_POT_ICE_CAVERN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2));
-    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_3]         	=	Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_3,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(521, -131),    "Spinning Blade Pot 3",             "Ice Cavern Spinning Blade Pot 3",          RHT_POT_ICE_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3));
-    locationTable[RC_ICE_CAVERN_NEAR_END_POT_1]               	=	Location::Pot(RC_ICE_CAVERN_NEAR_END_POT_1,                RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-1422, 586),   "Near End Pot 1",                   "Ice Cavern Near End Pot 1",                RHT_POT_ICE_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_END_POT_1));
-    locationTable[RC_ICE_CAVERN_NEAR_END_POT_2]               	=	Location::Pot(RC_ICE_CAVERN_NEAR_END_POT_2,                RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-1488, 676),   "Near End Pot 2",                   "Ice Cavern Near End Pot 2",                RHT_POT_ICE_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_END_POT_2));
-    locationTable[RC_ICE_CAVERN_FROZEN_POT_1]                 	=	Location::Pot(RC_ICE_CAVERN_FROZEN_POT_1,                  RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(366, -2036),   "Frozen Pot 1",                     "Ice Cavern Frozen Pot 1",                  RHT_POT_ICE_CAVERN,	        RG_PURPLE_RUPEE,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_FROZEN_POT_1));
-	
-	// MQ Dungeon Pots
-	//            Randomizer Check                                    Randomizer Check                                                  Quest       Area                            Scene ID                        Params                          Short Name                      Spoiler Name                                        Hint Text Key                       Vanilla             Spoiler Collection Check
-	locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(-2391, -1804), "MQ Staircase Pot 1", 			"Dodongos Cavern MQ Staircase Pot 1", 	    	    RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(-2361, -1161), "MQ Staircase Pot 2", 			"Dodongos Cavern MQ Staircase Pot 2", 	    	    RHT_POT_DODONGOS_CAVERN,	        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(-1525, -1800), "MQ Staircase Pot 3", 			"Dodongos Cavern MQ Staircase Pot 3", 	    	    RHT_POT_DODONGOS_CAVERN,	        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3));
-	locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(-1558, -1169), "MQ Staircase Pot 4", 			"Dodongos Cavern MQ Staircase Pot 4", 	    	    RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4));
-	locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT] 	= Location::Pot(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT,      RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1532, -1225), 	"MQ Torch Puzzle Middle Pot", 	"Dodongos Cavern MQ Torch Puzzle Middle Pot", 	    RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1] 	        = Location::Pot(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3195, -155), 	"MQ Big Block Pot 1", 	     	"Dodongos Cavern MQ Big Block Pot 1",   	        RHT_POT_DODONGOS_CAVERN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2] 	        = Location::Pot(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2, 		        RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(2704, -483), 	"MQ Big Block Pot 2", 	    	"Dodongos Cavern MQ Big Block Pot 2",   	        RHT_POT_DODONGOS_CAVERN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1] 	    = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1, 	    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3869, -811), 	"MQ Upper Lizalfos Pot 1", 		"Dodongos Cavern MQ Upper Lizalfos Pot 1",  	    RHT_POT_DODONGOS_CAVERN, 	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2] 	    = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2, 	    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3867, -969), 	"MQ Upper Lizalfos Pot 2", 		"Dodongos Cavern MQ Upper Lizalfos Pot 2",  	    RHT_POT_DODONGOS_CAVERN, 	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3] 	    = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3, 	    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(4687, -1071), 	"MQ Upper Lizalfos Pot 3", 		"Dodongos Cavern MQ Upper Lizalfos Pot 3",      	RHT_POT_DODONGOS_CAVERN, 	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3));
-	locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4] 	    = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4, 	    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(4693, -1194), 	"MQ Upper Lizalfos Pot 4", 		"Dodongos Cavern MQ Upper Lizalfos Pot 4",      	RHT_POT_DODONGOS_CAVERN, 	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4));
-	locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3327, -805), 	"MQ Two Flames Pot 1", 			"Dodongos Cavern MQ Two Flames Pot 1", 		        RHT_POT_DODONGOS_CAVERN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2]   		= Location::Pot(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3326, -753), 	"MQ Two Flames Pot 2", 			"Dodongos Cavern MQ Two Flames Pot 2", 		        RHT_POT_DODONGOS_CAVERN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2));
-    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT]    = Location::Pot(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT,      RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1827, -587), 	"MQ Torch Puzzle Corner Pot", 	"Dodongos Cavern MQ Torch Puzzle Corner Pot",   	RHT_POT_DODONGOS_CAVERN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1));
-    locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1727, -151), 	"MQ Right Side Pot 1", 			"Dodongos Cavern MQ Right Side Pot 1", 		        RHT_POT_DODONGOS_CAVERN,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1815, -154), 	"MQ Right Side Pot 2", 			"Dodongos Cavern MQ Right Side Pot 2", 		        RHT_POT_DODONGOS_CAVERN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3442, -469), 	"MQ Right Side Pot 3", 			"Dodongos Cavern MQ Right Side Pot 3", 		        RHT_POT_DODONGOS_CAVERN,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3));
-	locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(3682, -466), 	"MQ Right Side Pot 4", 			"Dodongos Cavern MQ Right Side Pot 4", 		        RHT_POT_DODONGOS_CAVERN,	        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4));
-	locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1844, -1867), 	"MQ Poe Room Pot 1", 			"Dodongos Cavern MQ Poe Room Pot 1", 		        RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(2272, -2213), 	"MQ Poe Room Pot 2", 			"Dodongos Cavern MQ Poe Room Pot 2", 		        RHT_POT_DODONGOS_CAVERN,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(2240, -1369), 	"MQ Poe Room Pot 3", 			"Dodongos Cavern MQ Poe Room Pot 3", 		        RHT_POT_DODONGOS_CAVERN,	        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3));
-	locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1535, -1299), 	"MQ Poe Room Pot 4", 			"Dodongos Cavern MQ Poe Room Pot 4", 		        RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT] 	    = Location::Pot(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(258, -3055), 	"MQ Before Boss SW Pot", 		"Dodongos Cavern MQ Before Boss SW Pot", 	        RHT_POT_DODONGOS_CAVERN,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT] 		= Location::Pot(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(-265, -2499), 	"MQ Before Boss NE Pot", 		"Dodongos Cavern MQ Before Boss NE Pot", 	        RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1758, -3194), 	"MQ Armos Room SE Pot", 		"Dodongos Cavern MQ Armos SE Pot", 		    	    RHT_POT_DODONGOS_CAVERN,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3));
-	locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1223, -3197), 	"MQ Armos Room SW Pot", 		"Dodongos Cavern MQ Armos SW Pot", 		    	    RHT_POT_DODONGOS_CAVERN,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1] 	    	= Location::Pot(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1663, -4311), 	"MQ Backroom Pot 1", 			"Dodongos Cavern MQ Backroom Pot 1", 		        RHT_POT_DODONGOS_CAVERN,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2] 	    	= Location::Pot(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2, 			    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1648, -4694), 	"MQ Backroom Pot 2", 			"Dodongos Cavern MQ Backroom Pot 2", 		        RHT_POT_DODONGOS_CAVERN,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2));
-	locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1005, -3711), 	"MQ Armos Room NW Pot", 		"Dodongos Cavern MQ Armos NW Pot", 		    	    RHT_POT_DODONGOS_CAVERN,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1));
-	locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT] 		    = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT, 		    RCQUEST_MQ, RCAREA_DODONGOS_CAVERN, 	    SCENE_DODONGOS_CAVERN, 		    TWO_ACTOR_PARAMS(1066, -3711), 	"MQ Armos Room NE Pot", 		"Dodongos Cavern MQ Armos NE Pot", 		    	    RHT_POT_DODONGOS_CAVERN,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1] 	    	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1, 		        RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(-183, -449), 	"MQ Entrance Pot 1", 			"Jabu Jabus Belly MQ Entrance Pot 1", 	    	    RHT_POT_JABU_JABUS_BELLY,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2] 	    	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2, 		        RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(202, -62), 	"MQ Entrance Pot 2", 			"Jabu Jabus Belly MQ Entrance Pot 2", 	    	    RHT_POT_JABU_JABUS_BELLY,	        RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1] 			    = Location::Pot(RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1, 			    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(-689, -1800), 	"MQ Geyser Pot 1", 				"Jabu Jabus Belly MQ Geyser Pot 1", 	    	    RHT_POT_JABU_JABUS_BELLY,	        RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2] 			    = Location::Pot(RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2, 			    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(-693, -1614), 	"MQ Geyser Pot 2", 				"Jabu Jabus Belly MQ Geyser Pot 2", 	    	    RHT_POT_JABU_JABUS_BELLY,	        RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1] 	    	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1, 		    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(697, -2318), 	"MQ Time Block Pot 1", 			"Jabu Jabus Belly MQ Time Block Pot 1",     	    RHT_POT_JABU_JABUS_BELLY,	        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2] 	    	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2, 		    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(699, -2445), 	"MQ Time Block Pot 2", 			"Jabu Jabus Belly MQ Time Block Pot 2",     	    RHT_POT_JABU_JABUS_BELLY,	        RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1] 		    = Location::Pot(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1, 		    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(612, -5932), 	"MQ Like Likes Pot 1", 			"Jabu Jabus Belly MQ Like Likes Pot 1",     	    RHT_POT_JABU_JABUS_BELLY,	        RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2] 	    	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2, 		    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(718, -5929), 	"MQ Like Likes Pot 2", 			"Jabu Jabus Belly MQ Like Likes Pot 2",     	    RHT_POT_JABU_JABUS_BELLY,	        RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2));
-	locationTable[RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1]     	= Location::Pot(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1, 		    RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, 	    SCENE_JABU_JABU, 			    TWO_ACTOR_PARAMS(1305, -2005), 	"MQ Before Boss Pot 1", 		"Jabu Jabus Belly MQ Before Boss Pot 1",    	    RHT_POT_JABU_JABUS_BELLY,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_1] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_1, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(675, -989), 	"MQ Lobby Pot 1", 				"Forest Temple MQ Lobby Pot 1", 			        RHT_POT_FOREST_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_2] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_2, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-429, -981), 	"MQ Lobby Pot 2", 				"Forest Temple MQ Lobby Pot 2", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_3] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_3, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(720, -1037), 	"MQ Lobby Pot 3", 				"Forest Temple MQ Lobby Pot 3", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_4] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_4, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-477, -1034), 	"MQ Lobby Pot 4", 				"Forest Temple MQ Lobby Pot 4", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_5] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_5, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(630, -943), 	"MQ Lobby Pot 5", 				"Forest Temple MQ Lobby Pot 5", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5));
-	locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_6] 			    	= Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_6, 				    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-384, -937), 	"MQ Lobby Pot 6", 				"Forest Temple MQ Lobby Pot 6", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6));
-	locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1] 		        = Location::Pot(RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1, 		            RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(90, -3583), 	"MQ Wolfos Pot 1", 		        "Forest Temple MQ Wolfos Pot 1",              	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2] 		        = Location::Pot(RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2, 	        	    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(142, -3583), 	"MQ Wolfos Pot 2", 		        "Forest Temple MQ Wolfos Pot 2",             	    RHT_POT_FOREST_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1] 	    	= Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1, 		    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(206, -3631), 	"MQ Upper Stalfos Pot 1", 		"Forest Temple MQ Upper Stalfos Pot 1",     	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2] 	    	= Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2, 		    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(32, -3012), 	"MQ Upper Stalfos Pot 2", 		"Forest Temple MQ Upper Stalfos Pot 2",     	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3] 	    	= Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3, 		    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(30, -3631), 	"MQ Upper Stalfos Pot 3", 		"Forest Temple MQ Upper Stalfos Pot 3",     	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3));
-	locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4] 	    	= Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4, 		    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(202, -3012), 	"MQ Upper Stalfos Pot 4", 		"Forest Temple MQ Upper Stalfos Pot 4",     	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4));
-	locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(830, -3639), 	"MQ Blue Poe Pot 1", 			"Forest Temple MQ Blue Poe Pot 1", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(941, -3640), 	"MQ Blue Poe Pot 2", 			"Forest Temple MQ Blue Poe Pot 2", 			        RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(883, -3640), 	"MQ Blue Poe Pot 3", 			"Forest Temple MQ Blue Poe Pot 3", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3));
-	locationTable[RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(1647, -1529), 	"MQ Green Poe Pot 1", 			"Forest Temple MQ Green Poe Pot 1", 	    	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(1645, -1588), 	"MQ Green Poe Pot 2", 			"Forest Temple MQ Green Poe Pot 2", 	    	    RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-461, -1095), 	"MQ Basement Pot 1", 			"Forest Temple MQ Basement Pot 1", 		       	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1));
-	locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-351, -979), 	"MQ Basement Pot 2", 			"Forest Temple MQ Basement Pot 2", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2));
-	locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-387, -1018), 	"MQ Basement Pot 3", 			"Forest Temple MQ Basement Pot 3", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3));
-	locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4] 		    	= Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4, 			    RCQUEST_MQ, RCAREA_FOREST_TEMPLE, 		    SCENE_FOREST_TEMPLE, 		    TWO_ACTOR_PARAMS(-424, -1057), 	"MQ Basement Pot 4", 			"Forest Temple MQ Basement Pot 4", 		    	    RHT_POT_FOREST_TEMPLE,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4));
-	locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1] 		    = Location::Pot(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(1873, 2252), 	"MQ Forest Trial Pot 1", 		"Ganons Castle MQ Forest Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(1726, 2326), 	"MQ Forest Trial Pot 2", 		"Ganons Castle MQ Forest Trial Pot 2", 	    	    RHT_POT_GANONS_CASTLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2));
-	locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1, 		        RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(3544, -931), 	"MQ Water Trial Pot 1", 		"Ganons Castle MQ Water Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2, 		        RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(3541, -755), 	"MQ Water Trial Pot 2", 		"Ganons Castle MQ Water Trial Pot 2", 	    	    RHT_POT_GANONS_CASTLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2));
-	locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(2073, -4592), 	"MQ Shadow Trial Pot 1", 		"Ganons Castle MQ Shadow Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2] 		    = Location::Pot(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(2217, -4516), 	"MQ Shadow Trial Pot 2", 		"Ganons Castle MQ Shadow Trial Pot 2", 	    	    RHT_POT_GANONS_CASTLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2));
-	locationTable[RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1] 		    = Location::Pot(RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1, 			    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1918, -3957), "MQ Fire Trial Pot 1", 			"Ganons Castle MQ Fire Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2, 			    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-2052, -3888), "MQ Fire Trial Pot 2", 			"Ganons Castle MQ Fire Trial Pot 2", 	    	    RHT_POT_GANONS_CASTLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2));
-	locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1] 		    = Location::Pot(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1, 		        RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-3842, -759), 	"MQ Light Trial Pot 1", 		"Ganons Castle MQ Light Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2, 		        RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-3845, -933), 	"MQ Light Trial Pot 2", 		"Ganons Castle MQ Light Trial Pot 2", 	    	    RHT_POT_GANONS_CASTLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2));
-	locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1] 	    	= Location::Pot(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1402, 1414), 	"MQ Spirit Trial Pot 1", 		"Ganons Castle MQ Spirit Trial Pot 1", 	    	    RHT_POT_GANONS_CASTLE,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1));
-	locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2] 		    = Location::Pot(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2, 		    RCQUEST_MQ, RCAREA_GANONS_CASTLE, 		    SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1256, 1500), 	"MQ Spirit Trial Pot 2", 		"Ganons Castle MQ Spirit Trial Pot 2", 		        RHT_POT_GANONS_CASTLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1]   	= Location::Pot(RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-1045, -130), 	"MQ Whispering Walls Pot 1", 	"Shadow Temple MQ Whispering Walls Pot 1",          RHT_POT_SHADOW_TEMPLE, 	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2]   	= Location::Pot(RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-1045, -240), 	"MQ Whispering Walls Pot 2", 	"Shadow Temple MQ Whispering Walls Pot 2",          RHT_POT_SHADOW_TEMPLE, 	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1, 	        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-657, -949), 	"MQ Entrance Redead Pot 1", 	"Shadow Temple MQ Entrance Redead Pot 1", 	        RHT_POT_SHADOW_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2, 	        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-713, -1016), 	"MQ Entrance Redead Pot 2", 	"Shadow Temple MQ Entrance Redead Pot 2", 	        RHT_POT_SHADOW_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(614, 3579), 	"MQ Lower Umbrella W Pot", 		"Shadow Temple MQ Stone Umbrella Lower West Pot",   RHT_POT_SHADOW_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(798, 3574), 	"MQ Lower Umbrella E Pot", 		"Shadow Temple MQ Stone Umbrella Lower East Pot", 	RHT_POT_SHADOW_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT]     = Location::Pot(RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(1173, 3707), 	"MQ Upper Umbrella S Pot", 		"Shadow Temple MQ Stone Umbrella Upper South Pot", 	RHT_POT_SHADOW_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3));
-	locationTable[RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT]     = Location::Pot(RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT, 	    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(1173, 3605), 	"MQ Upper Umbrella N Pot", 		"Shadow Temple MQ Stone Umbrella Upper North Pot", 	RHT_POT_SHADOW_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4));
-	locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1] 	    	= Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1, 		        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(4222, -916), 	"MQ Before Boat Pot 1", 		"Shadow Temple MQ Before Boat Pot 1", 		        RHT_POT_SHADOW_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2] 	    	= Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2, 		        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(4549, -922), 	"MQ Before Boat Pot 2", 		"Shadow Temple MQ Before Boat Pot 2", 	    	    RHT_POT_SHADOW_TEMPLE,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT, 	        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-2400, -1470), "MQ Before Chasm W Pot", 		"Shadow Temple MQ Before Chasm West Pot", 		    RHT_POT_SHADOW_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT, 	        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-2230, -1470), "MQ Before Chasm E Pot", 		"Shadow Temple MQ Before Chasm East Pot", 	    	RHT_POT_SHADOW_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2));
-	locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT] 	    = Location::Pot(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT, 		    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-2859, -497), 	"MQ After Chasm W Pot", 		"Shadow Temple MQ After Chasm West Pot", 	    	RHT_POT_SHADOW_TEMPLE,	            RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3));
-	locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT] 		= Location::Pot(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT, 		    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-2624, -492), 	"MQ After Chasm E Pot", 		"Shadow Temple MQ After Chasm East Pot", 	    	RHT_POT_SHADOW_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4));
-	locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT] 		    = Location::Pot(RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT, 		    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-4303, -2657), "MQ Spike Baricade Pot", 		"Shadow Temple MQ Spike Baricade Pot", 	    	    RHT_POT_SHADOW_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT));
-	locationTable[RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1] 			    = Location::Pot(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1, 			    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-4575, -811), 	"MQ Dead Hand Pot 1", 			"Shadow Temple MQ Dead Hand Pot 1", 		        RHT_POT_SHADOW_TEMPLE,	            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1));
-	locationTable[RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2] 			    = Location::Pot(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2, 			    RCQUEST_MQ, RCAREA_SHADOW_TEMPLE, 		    SCENE_SHADOW_TEMPLE, 		    TWO_ACTOR_PARAMS(-4036, -811), 	"MQ Dead Hand Pot 2", 			"Shadow Temple MQ Dead Hand Pot 2", 		        RHT_POT_SHADOW_TEMPLE,	            RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1]   	= Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1, 	    RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(339, -377), 	"MQ Inner Lobby Pot 1", 		"Bottom Of The Well MQ Inner Lobby Pot 1",  	    RHT_POT_BOTTOM_OF_THE_WELL, 	    RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2] 	    = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2, 	    RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(416, -377), 	"MQ Inner Lobby Pot 2", 		"Bottom Of The Well MQ Inner Lobby Pot 2",  	    RHT_POT_BOTTOM_OF_THE_WELL, 	    RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3] 	    = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3, 	    RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(269, -376), 	"MQ Inner Lobby Pot 3", 		"Bottom Of The Well MQ Inner Lobby Pot 3",  	    RHT_POT_BOTTOM_OF_THE_WELL, 	    RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT]     	= Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT, 		    RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(421, -174), 	"MQ Outer Lobby Pot", 			"Bottom Of The Well MQ Outer Lobby Pot",    	    RHT_POT_BOTTOM_OF_THE_WELL,	        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1]  	= Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(288, -1240), 	"MQ East Inner Pot 1", 			"Bottom Of The Well MQ East Inner Room Pot 1", 	    RHT_POT_BOTTOM_OF_THE_WELL,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2]   = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(438, -1234), 	"MQ East Inner Pot 2", 			"Bottom Of The Well MQ East Inner Room Pot 2",      RHT_POT_BOTTOM_OF_THE_WELL,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2));
-	locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3]   = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL, 	    SCENE_BOTTOM_OF_THE_WELL, 	    TWO_ACTOR_PARAMS(444, -1114), 	"MQ East Inner Pot 3", 			"Bottom Of The Well MQ East Inner Room Pot 3",      RHT_POT_BOTTOM_OF_THE_WELL,	        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3));
-	locationTable[RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1, 				    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-357, 957), 	"MQ Entrance Pot 1", 			"Fire Temple MQ Entrance Pot 1", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2, 				    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(356, 959), 	"MQ Entrance Pot 2", 			"Fire Temple MQ Entrance Pot 2", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(187, -1449), 	"MQ Before Mini Boss Pot 1", 	"Fire Temple MQ Before Mini Boss Pot 1", 	        RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(188, -1514), 	"MQ Before Mini Boss Pot 2", 	"Fire Temple MQ Before Mini Boss Pot 2",    	    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(487, -1450), 	"MQ Before Mini Boss Pot 3", 	"Fire Temple MQ Before Mini Boss Pot 3",    	    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(486, -1515), 	"MQ Before Mini Boss Pot 4", 	"Fire Temple MQ Before Mini Boss Pot 4",    	    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5] 	    = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(38, -1179), 	"MQ Before Mini Boss Pot 5", 	"Fire Temple MQ Before Mini Boss Pot 5", 	        RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(42, -1298), 	"MQ Before Mini Boss Pot 6", 	"Fire Temple MQ Before Mini Boss Pot 6",    	    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7] 	    = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(520, -943), 	"MQ Before Mini Boss Pot 7", 	"Fire Temple MQ Before Mini Boss Pot 7",    	    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7));
-	locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8]     	= Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8, 		    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(35, -946), 	"MQ Before Mini Boss Pot 8", 	"Fire Temple MQ Before Mini Boss Pot 8",    	    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8));
-	locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1] 	    	= Location::Pot(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-1426, -711), 	"MQ Outside Boss Pot 1", 		"Fire Temple MQ Outside Boss Pot 1", 	    	    RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2] 	    	= Location::Pot(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-1425, -660), 	"MQ Outside Boss Pot 2", 		"Fire Temple MQ Outside Boss Pot 2", 	    	    RHT_POT_FIRE_TEMPLE,	            RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT] 			= Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT, 		        RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1646, -1260), 	"MQ Lava Room North Pot", 		"Fire Temple MQ Lava Room North Pot", 			    RHT_POT_FIRE_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT] 			= Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(2226, -809), 	"MQ Lava Room High Pot", 		"Fire Temple MQ Lava Room High Pot", 			    RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT] 			= Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT, 		        RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1634, 1475), 	"MQ Lava Room South Pot", 		"Fire Temple MQ Lava Room South Pot", 		        RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3));
-	locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(845, -1591), 	"MQ Lava Torch Pot 1", 			"Fire Temple MQ Lava Torch Pot 1", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(901, -1593), 	"MQ Lava Torch Pot 2", 			"Fire Temple MQ Lava Torch Pot 2", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1756, -155), 	"MQ Above Lava Pot 1", 			"Fire Temple MQ Above Lava Pot 1", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1819, -82), 	"MQ Above Lava Pot 2", 			"Fire Temple MQ Above Lava Pot 2", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1789, -122), 	"MQ Above Lava Pot 3", 			"Fire Temple MQ Above Lava Pot 3", 		    	    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3));
-	locationTable[RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1493, 386), 	"MQ Flame Wall Pot 1", 			"Fire Temple MQ Flame Wall Pot 1", 	    		    RHT_POT_FIRE_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2] 		    	= Location::Pot(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2, 			    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(1445, 445), 	"MQ Flame Wall Pot 2", 			"Fire Temple MQ Flame Wall Pot 2", 	    		    RHT_POT_FIRE_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT] 		= Location::Pot(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT, 	    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-2217, -163), 	"MQ Past Fire Maze North Pot", 	"Fire Temple MQ Past Fire Maze North Pot",     	    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1));
-	locationTable[RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT] 		= Location::Pot(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT, 	    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-2657, -591), 	"MQ Past Fire Maze South Pot", 	"Fire Temple MQ Past Fire Maze South Pot", 	   	    RHT_POT_FIRE_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2));
-	locationTable[RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT] 		= Location::Pot(RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT, 	        RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-1849, -1114), "MQ Fire Maze Northmost Pot", 	"Fire Temple MQ Fire Maze Northmost Pot", 		    RHT_POT_FIRE_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3));
-	locationTable[RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT] 	    = Location::Pot(RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT, 	        RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-2110, -646), 	"MQ Fire Maze North West Pot", 	"Fire Temple MQ Fire Maze North West Pot", 		    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4));
-	locationTable[RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT] 	    = Location::Pot(RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT, 	    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-2319, 838), 	"MQ South Fire Maze W Pot", 	"Fire Temple MQ South Fire Maze West Pot", 		    RHT_POT_FIRE_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5));
-	locationTable[RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT] 		= Location::Pot(RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT, 	    RCQUEST_MQ, RCAREA_FIRE_TEMPLE, 		    SCENE_FIRE_TEMPLE, 			    TWO_ACTOR_PARAMS(-2285, 803), 	"MQ South Fire Maze E Pot", 	"Fire Temple MQ South Fire Maze East Pot", 		    RHT_POT_FIRE_TEMPLE,	            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6));
-	locationTable[RC_ICE_CAVERN_MQ_ENTRANCE_POT] 			    	= Location::Pot(RC_ICE_CAVERN_MQ_ENTRANCE_POT, 				        RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(248, 2287), 	"MQ Entrance Pot", 				"Ice Cavern MQ Entrance Pot", 			    	    RHT_POT_ICE_CAVERN,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT));
-	locationTable[RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1] 		    = Location::Pot(RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(51, 718), 		"MQ First Crystal Pot 1", 		"Ice Cavern MQ First Crystal Pot 1", 	    	    RHT_POT_ICE_CAVERN,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1));
-	locationTable[RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2] 		    = Location::Pot(RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(52, 768), 		"MQ First Crystal Pot 2", 		"Ice Cavern MQ First Crystal Pot 2", 	    	    RHT_POT_ICE_CAVERN,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2));
-	locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(433, -732), 	"MQ Early Wolfos Pot 1", 		"Ice Cavern MQ Early Wolfos Pot 1", 	    	    RHT_POT_ICE_CAVERN,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1));
-	locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(569, -175), 	"MQ Early Wolfos Pot 2", 		"Ice Cavern MQ Early Wolfos Pot 2", 	    	    RHT_POT_ICE_CAVERN,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2));
-	locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(521, -131), 	"MQ Early Wolfos Pot 3", 		"Ice Cavern MQ Early Wolfos Pot 3", 	    	    RHT_POT_ICE_CAVERN,	                RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3));
-	locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4, 			    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(138, -672), 	"MQ Early Wolfos Pot 4", 		"Ice Cavern MQ Early Wolfos Pot 4", 	    	    RHT_POT_ICE_CAVERN,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4));
-	locationTable[RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1, 			        RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(-1352, 639), 	"MQ Push Block Pot 1", 			"Ice Cavern MQ Push Block Pot 1", 		    	    RHT_POT_ICE_CAVERN,	                RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1));
-	locationTable[RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2] 		    	= Location::Pot(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2, 			        RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(-1396, 596), 	"MQ Push Block Pot 2", 			"Ice Cavern MQ Push Block Pot 2", 		    	    RHT_POT_ICE_CAVERN,	                RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2));
-	locationTable[RC_ICE_CAVERN_MQ_COMPASS_POT_1] 			    	= Location::Pot(RC_ICE_CAVERN_MQ_COMPASS_POT_1, 				    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(902, -2720), 	"MQ Compass Pot 1", 			"Ice Cavern MQ Compass Pot 1", 			    	    RHT_POT_ICE_CAVERN,	                RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1));
-	locationTable[RC_ICE_CAVERN_MQ_COMPASS_POT_2] 			    	= Location::Pot(RC_ICE_CAVERN_MQ_COMPASS_POT_2, 				    RCQUEST_MQ, RCAREA_ICE_CAVERN, 			    SCENE_ICE_CAVERN, 			    TWO_ACTOR_PARAMS(451, -2726), 	"MQ Compass Pot 2", 			"Ice Cavern MQ Compass Pot 2", 		    		    RHT_POT_ICE_CAVERN,	                RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1] 		    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-255, 742), 	"MQ Entrance Pot 1", 			"Spirit Temple MQ Entrance Pot 1", 		    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2] 		    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(306, 682), 	"MQ Entrance Pot 2", 			"Spirit Temple MQ Entrance Pot 2", 		    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3] 		    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-297, 687), 	"MQ Entrance Pot 3", 			"Spirit Temple MQ Entrance Pot 3", 		    	    RHT_POT_SPIRIT_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4] 		    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(260, 735), 	"MQ Entrance Pot 4", 			"Spirit Temple MQ Entrance Pot 4", 		    	    RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-894, -50), 	"MQ Child Slugma Pot", 			"Spirit Temple MQ Child Slugma Pot", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1, 		        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-382, -1256), 	"MQ Child Gibdo Pot 1", 		"Spirit Temple MQ Child Gibdo Pot 1", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2, 		        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-381, -1207), 	"MQ Child Gibdo Pot 2", 		"Spirit Temple MQ Child Gibdo Pot 2", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-1035, -1240), "MQ Child Like Like Pot", 		"Spirit Temple MQ Child Like Like Pot",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-1166, -1931), "MQ Child Stalfos Pot 1", 		"Spirit Temple MQ Child Stalfos Pot 1",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2] 		    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-959, -1930), 	"MQ Child Stalfos Pot 2", 		"Spirit Temple MQ Child Stalfos Pot 2",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3] 		    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-853, -1837), 	"MQ Child Stalfos Pot 3", 		"Spirit Temple MQ Child Stalfos Pot 3",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4] 		    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-1250, -1852), "MQ Child Stalfos Pot 4", 		"Spirit Temple MQ Child Stalfos Pot 4", 	        RHT_POT_SPIRIT_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT]    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT,      RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(639, -1224), 	"MQ Statue Room 2F CE Pot", 	"Spirit Temple MQ Statue 2F Center East Pot",       RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT]    	    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT, 	        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-521, -1576), 	"MQ Statue Room 3F E Pot", 	    "Spirit Temple MQ Statue Room 3F East Pot",   	    RHT_POT_SPIRIT_TEMPLE,	            RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT]    	    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT, 	        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-595, -1576), 	"MQ Statue Room 3F W Pot", 	    "Spirit Temple MQ Statue Room 3F West Pot",   	    RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT] 	        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT, 	        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-559, -1209), 	"MQ Statue Room 2F W Pot", 	    "Spirit Temple MQ Statue 2F West Pot",   	        RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT]    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT, 	    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(704, -1224), 	"MQ Statue Room 2F E Pot", 	    "Spirit Temple MQ Statue 2F Eastmost Pot",          RHT_POT_SPIRIT_TEMPLE,	            RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-1276, 432), 	"MQ Sun Blocks Pot 1", 			"Spirit Temple MQ Sun Blocks Pot 1", 		        RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2] 		    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-1635, -446), 	"MQ Sun Blocks Pot 2", 			"Spirit Temple MQ Sun Blocks Pot 2", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(829, 250), 	"MQ Long Climb Pot 1", 			"Spirit Temple MQ Long Climb Pot 1", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(531, 249), 	"MQ Long Climb Pot 2", 			"Spirit Temple MQ Long Climb Pot 2", 		        RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(244, -893), 	"MQ Big Mirror Pot 1", 			"Spirit Temple MQ Big Mirror Pot 1", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-122, -741), 	"MQ Big Mirror Pot 2", 			"Spirit Temple MQ Big Mirror Pot 2", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(250, -741), 	"MQ Big Mirror Pot 3", 			"Spirit Temple MQ Big Mirror Pot 3", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4] 		    = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4, 			    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(-123, -892), 	"MQ Big Mirror Pot 4", 			"Spirit Temple MQ Big Mirror Pot 4", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(781, -841), 	"MQ Before Mirror Pot 1", 		"Spirit Temple MQ Before Mirror Pot 1",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2, 		    RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(587, -844), 	"MQ Before Mirror Pot 2", 		"Spirit Temple MQ Before Mirror Pot 2",     	    RHT_POT_SPIRIT_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1, 		        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(1204, -910), 	"MQ Early Adult Pot 1", 		"Spirit Temple MQ Early Adult Pot 1", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1));
-	locationTable[RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2] 	    	= Location::Pot(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2, 		        RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, 		    SCENE_SPIRIT_TEMPLE, 		    TWO_ACTOR_PARAMS(1204, -1028), 	"MQ Early Adult Pot 2", 		"Spirit Temple MQ Early Adult Pot 2", 	    	    RHT_POT_SPIRIT_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1] 		    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(1123, 62), 	"MQ Lower Torches Pot 1", 		"Water Temple MQ Lower Torches Pot 1", 		        RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2] 		    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(1123, 293), 	"MQ Lower Torches Pot 2", 		"Water Temple MQ Lower Torches Pot 2", 	    	    RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(1222, -617), 	"MQ Storage Room A Pot 1", 		"Water Temple MQ Storage Room A Pot 1",     	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(1122, -617), 	"MQ Storage Room A Pot 2", 		"Water Temple MQ Storage Room A Pot 2",     	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(1172, -617), 	"MQ Storage Room A Pot 3", 		"Water Temple MQ Storage Room A Pot 3",     	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3));
-	locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-989, 255), 	"MQ GS Storage Room Pot 1", 	"Water Temple MQ GS Storage Room Pot 1",    	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-1026, 257), 	"MQ GS Storage Room Pot 2", 	"Water Temple MQ GS Storage Room Pot 2",    	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-1062, 256), 	"MQ GS Storage Room Pot 3", 	"Water Temple MQ GS Storage Room Pot 3",    	    RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3));
-	locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT] 	= Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT,       RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(512, 579), 	"MQ Lizalfos Hall W Pot", 		"Water Temple MQ Lizalfos Hallway West Pot", 	    RHT_POT_WATER_TEMPLE,	            RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT] 	= Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT,      RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(602, 1022), 	"MQ Lizalfos Hall S Pot", 		"Water Temple MQ Lizalfos Hallway South Pot", 	    RHT_POT_WATER_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT, 	    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(789, 947), 	"MQ Lizalfos Hall SE Pot", 		"Water Temple MQ Lizalfos Hallway SE Pot", 	        RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3));
-	locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT] 		= Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT, 	    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(768, 565), 	"MQ Lizalfos Cage N Pot", 		"Water Temple MQ Lizalfos Cage North Pot", 	        RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4));
-	locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT, 	    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(767, 517), 	"MQ Lizalfos Cage S Pot", 		"Water Temple MQ Lizalfos Cage South Pot", 	        RHT_POT_WATER_TEMPLE,	            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5));
-	locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT]    	= Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT, 	        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3500, -751), 	"MQ Stalfos Pit Middle Pot", 	"Water Temple MQ Stalfos Pit Middle Pot",   	    RHT_POT_WATER_TEMPLE,	            RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3));
-	locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT]    	    = Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT, 	        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3500, -686), 	"MQ Stalfos Pit South Pot", 	"Water Temple MQ Stalfos Pit South Pot",    	    RHT_POT_WATER_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4));
-	locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT,  	        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3500, -810), 	"MQ Stalfos Pit North Pot", 	"Water Temple MQ Stalfos Pit North Pot",    	    RHT_POT_WATER_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5));
-	locationTable[RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1]    	= Location::Pot(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1, 	        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3188, -1628), "MQ Before Dark Link Pot 1", 	"Water Temple MQ Before Dark Link Pot 1",   	    RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2]    	= Location::Pot(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2, 	        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3056, -1626), "MQ Before Dark Link Pot 2", 	"Water Temple MQ Before Dark Link Pot 2",   	    RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1]     	= Location::Pot(RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3072, -4024), "MQ After Dark Link Pot 1", 	"Water Temple MQ After Dark Link Pot 1", 	        RHT_POT_WATER_TEMPLE,	            RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2] 	    = Location::Pot(RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-3169, -4023), "MQ After Dark Link Pot 2", 	"Water Temple MQ After Dark Link Pot 2", 	        RHT_POT_WATER_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_RIVER_POT_1] 			    	= Location::Pot(RC_WATER_TEMPLE_MQ_RIVER_POT_1, 				    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2226, -2487), "MQ River Pot 1", 				"Water Temple MQ River Pot 1", 				        RHT_POT_WATER_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_RIVER_POT_2] 			    	= Location::Pot(RC_WATER_TEMPLE_MQ_RIVER_POT_2, 				    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2184, -2456), "MQ River Pot 2", 				"Water Temple MQ River Pot 2", 				        RHT_POT_WATER_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_POT] 				    = Location::Pot(RC_WATER_TEMPLE_MQ_BOSS_KEY_POT, 				    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-1033, -1569), "MQ Boss Key Pot", 				"Water Temple MQ Boss Key Pot", 		    	    RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT));
-    locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1] 			    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1, 			    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2314, 770), 	"MQ Lowest GS Pot 1", 			"Water Temple MQ Lowest GS Pot 1", 		    	    RHT_POT_WATER_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2] 			    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2, 			    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2314, 808), 	"MQ Lowest GS Pot 2", 			"Water Temple MQ Lowest GS Pot 2", 		    	    RHT_POT_WATER_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3] 			    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3, 			    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2313, 944), 	"MQ Lowest GS Pot 3", 			"Water Temple MQ Lowest GS Pot 3", 		    	    RHT_POT_WATER_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3));
-	locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4] 			    = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4, 			    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-2313, 905), 	"MQ Lowest GS Pot 4", 			"Water Temple MQ Lowest GS Pot 4", 		    	    RHT_POT_WATER_TEMPLE,	            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4));
-	locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1] 		    = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-1417, -3025), "MQ Storage Room B Pot 1", 		"Water Temple MQ Storage Room B Pot 1", 	        RHT_POT_WATER_TEMPLE,	            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2, 		    RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-1150, -3031), "MQ Storage Room B Pot 2", 		"Water Temple MQ Storage Room B Pot 2",     	    RHT_POT_WATER_TEMPLE,	            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2));
-	locationTable[RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1, 		        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(28, -3817), 	"MQ Mini Dodongo Pot 1", 		"Water Temple MQ Mini Dodongo Pot 1", 	    	    RHT_POT_WATER_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1));
-	locationTable[RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2] 	    	= Location::Pot(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2, 		        RCQUEST_MQ, RCAREA_WATER_TEMPLE, 		    SCENE_WATER_TEMPLE, 		    TWO_ACTOR_PARAMS(-28, -3817), 	"MQ Mini Dodongo Pot 2", 		"Water Temple MQ Mini Dodongo Pot 2", 	    	    RHT_POT_WATER_TEMPLE,	            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2));
-	locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1]    = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1,      RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,	SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(-324, -72),    "MQ Lobby Left Pot 1",          "Gerudo Training Ground MQ Lobby Left Pot 1", 	    RHT_POT_GERUDO_TRAINING_GROUND,    RG_BLUE_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1));
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2]    = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2,      RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,	SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(-324, -177),   "MQ Lobby Left Pot 2",          "Gerudo Training Ground MQ Lobby Left Pot 2", 	    RHT_POT_GERUDO_TRAINING_GROUND,    RG_RECOVERY_HEART,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2));
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1]   = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1,     RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,	SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(199, -79),     "MQ Lobby Right Pot 1",         "Gerudo Training Ground MQ Lobby Right Pot 1",      RHT_POT_GERUDO_TRAINING_GROUND,    RG_RECOVERY_HEART,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1));
-    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2]   = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2,     RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,	SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(197, -179),    "MQ Lobby Right Pot 2",         "Gerudo Training Ground MQ Lobby Right Pot 2",      RHT_POT_GERUDO_TRAINING_GROUND,    RG_BLUE_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2));
+    //            Randomizer Check                                             Randomizer Check                             Quest            Area                       Scene ID                           Params                          Short Name                          Hint Text Key                   Vanilla             Spoiler Collection Check
+    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_3]           = Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_3,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2673, -2060),  "Lizalfos Pot 3",                   RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_2]           = Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_2,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3526, -2574),  "Lizalfos Pot 2",                   RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_1]           = Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_1,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3579, -2574),  "Lizalfos Pot 1",                   RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_LIZALFOS_POT_4]           = Location::Pot(RC_DODONGOS_CAVERN_LIZALFOS_POT_4,           RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2653, -2031),  "Lizalfos Pot 4",                   RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1708, -471),   "Side Room Pot 1",                  RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1746, -424),   "Side Room Pot 2",                  RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2573, -489),   "Side Room Pot 3",                  RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2622, -489),   "Side Room Pot 4",                  RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3507, -964),   "Side Room Pot 5",                  RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5));
+    locationTable[RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6]          = Location::Pot(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3617, -911),   "Side Room Pot 6",                  RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6));
+    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1]         = Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1846, -1879),  "Torch Room Pot 1",                 RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2]         = Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2050, -1964),  "Torch Room Pot 2",                 RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3]         = Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2281, -1799),  "Torch Room Pot 3",                 RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4]         = Location::Pot(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1836, -1239),  "Torch Room Pot 4",                 RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_1]          = Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2414, -1823), "Staircase Pot 1",                  RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_2]          = Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-2368, -1827), "Staircase Pot 2",                  RHT_POT_DODONGOS_CAVERN,        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_3]          = Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1574, -1831), "Staircase Pot 3",                  RHT_POT_DODONGOS_CAVERN,        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_STAIRCASE_POT_4]          = Location::Pot(RC_DODONGOS_CAVERN_STAIRCASE_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(-1528, -1827), "Staircase Pot 4",                  RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1]         = Location::Pot(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2704, -483),   "Single Eye Pot 1",                 RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2]         = Location::Pot(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3195, -155),   "Single Eye Pot 2",                 RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_BLADE_POT_1]              = Location::Pot(RC_DODONGOS_CAVERN_BLADE_POT_1,              RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1656, -531),   "Blade Pot 1",                      RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BLADE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_BLADE_POT_2]              = Location::Pot(RC_DODONGOS_CAVERN_BLADE_POT_2,              RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1831, -593),   "Blade Pot 2",                      RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BLADE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1]         = Location::Pot(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(3329, -753),   "Double Eye Pot 1",                 RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2]         = Location::Pot(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2,         RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(2705, -1086),  "Double Eye Pot 2",                 RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_1]          = Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_1,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(1027, -3704),  "Back Room Pot 1",                  RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_2]          = Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_2,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(966, -3704),   "Back Room Pot 2",                  RHT_POT_DODONGOS_CAVERN,        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_3]          = Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_3,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(125, -3854),   "Back Room Pot 3",                  RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_4]          = Location::Pot(RC_DODONGOS_CAVERN_BACK_ROOM_POT_4,          RCQUEST_VANILLA, RCAREA_DODONGOS_CAVERN,    SCENE_DODONGOS_CAVERN,             TWO_ACTOR_PARAMS(78, -3835),    "Back Room Pot 4",                  RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4));
+    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1]    = Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1295, -3612), "Above Big Octo Pot 1",             RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2]    = Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1355, -3612), "Above Big Octo Pot 2",             RHT_POT_JABU_JABUS_BELLY,       RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3]    = Location::Pot(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,    RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1422, -3612), "Above Big Octo Pot 3",             RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_1]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_1,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-551, 33),     "Barinade Pot 1",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_2]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_2,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(551, 36),      "Barinade Pot 2",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_3]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_3,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(554, -493),    "Barinade Pot 3",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_4]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_4,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-543, -496),   "Barinade Pot 4",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_5]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_5,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(-268, -786),   "Barinade Pot 5",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5));
+    locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_6]          = Location::Pot(RC_JABU_JABUS_BELLY_BARINADE_POT_6,          RCQUEST_BOTH, RCAREA_JABU_JABUS_BELLY,      SCENE_JABU_JABU_BOSS,              TWO_ACTOR_PARAMS(279, -761),    "Barinade Pot 6",                   RHT_POT_JABU_JABUS_BELLY,       RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6));
+    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_1]          = Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_1,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(703, -2371),   "Basement Pot 1",                   RHT_POT_JABU_JABUS_BELLY,       RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_2]          = Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_2,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(645, -2408),   "Basement Pot 2",                   RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_3]          = Location::Pot(RC_JABU_JABUS_BELLY_BASEMENT_POT_3,          RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(650, -2344),   "Basement Pot 3",                   RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3));
+    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1]       = Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1127, -2271), "Two Octorok Pot 1",                RHT_POT_JABU_JABUS_BELLY,       RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2]       = Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1178, -2272), "Two Octorok Pot 2",                RHT_POT_JABU_JABUS_BELLY,       RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3]       = Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1150, -2248), "Two Octorok Pot 3",                RHT_POT_JABU_JABUS_BELLY,       RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3));
+    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4]       = Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1131, -2221), "Two Octorok Pot 4",                RHT_POT_JABU_JABUS_BELLY,       RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4));
+    locationTable[RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5]       = Location::Pot(RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5,       RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY,   SCENE_JABU_JABU,                   TWO_ACTOR_PARAMS(-1173, -2227), "Two Octorok Pot 5",                RHT_POT_JABU_JABUS_BELLY,       RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_1]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_1,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(720, -1037),   "Lobby Pot 1",                      RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_1));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_2]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_2,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(675, -989),    "Lobby Pot 2",                      RHT_POT_FOREST_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_2));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_3]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_3,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(630, -943),    "Lobby Pot 3",                      RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_3));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_4]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_4,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-384, -937),   "Lobby Pot 4",                      RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_4));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_5]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_5,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-429, -981),   "Lobby Pot 5",                      RHT_POT_FOREST_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_5));
+    locationTable[RC_FOREST_TEMPLE_LOBBY_POT_6]                = Location::Pot(RC_FOREST_TEMPLE_LOBBY_POT_6,                RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(-477, -1034),  "Lobby Pot 6",                      RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOBBY_POT_6));
+    locationTable[RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1]        = Location::Pot(RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(90, -3583),    "Lower Stalfos Pot 1",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1));
+    locationTable[RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2]        = Location::Pot(RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(142, -3583),   "Lower Stalfos Pot 2",              RHT_POT_FOREST_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2));
+    locationTable[RC_FOREST_TEMPLE_GREEN_POE_POT_1]            = Location::Pot(RC_FOREST_TEMPLE_GREEN_POE_POT_1,            RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(1647, -1529),  "Green Poe Pot 1",                  RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1));
+    locationTable[RC_FOREST_TEMPLE_GREEN_POE_POT_2]            = Location::Pot(RC_FOREST_TEMPLE_GREEN_POE_POT_2,            RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(1645, -1588),  "Green Poe Pot 2",                  RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2));
+    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1]        = Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(32, -3012),    "Upper Stalfos Pot 1",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1));
+    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2]        = Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(202, -3012),   "Upper Stalfos Pot 2",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2));
+    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3]        = Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(30, -3631),    "Upper Stalfos Pot 3",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3));
+    locationTable[RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4]        = Location::Pot(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4,        RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(206, -3631),   "Upper Stalfos Pot 4",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4));
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_1]             = Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_1,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(830, -3639),   "Blue Poe Pot 1",                   RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1));
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_2]             = Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_2,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(883, -3640),   "Blue Poe Pot 2",                   RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2));
+    locationTable[RC_FOREST_TEMPLE_BLUE_POE_POT_3]             = Location::Pot(RC_FOREST_TEMPLE_BLUE_POE_POT_3,             RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(941, -3640),   "Blue Poe Pot 3",                   RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3));
+    locationTable[RC_FOREST_TEMPLE_FROZEN_EYE_POT_1]           = Location::Pot(RC_FOREST_TEMPLE_FROZEN_EYE_POT_1,           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(2312, -874),   "Frozen Eye Pot 1",                 RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1));
+    locationTable[RC_FOREST_TEMPLE_FROZEN_EYE_POT_2]           = Location::Pot(RC_FOREST_TEMPLE_FROZEN_EYE_POT_2,           RCQUEST_VANILLA, RCAREA_FOREST_TEMPLE,      SCENE_FOREST_TEMPLE,               TWO_ACTOR_PARAMS(2364, -873),   "Frozen Eye Pot 2",                 RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2));
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_1]              = Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_1,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1086, -714),  "Near Boss Pot 1",                  RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1));
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_2]              = Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_2,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1138, -713),  "Near Boss Pot 2",                  RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2));
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_3]              = Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_3,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1087, -765),  "Near Boss Pot 3",                  RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3));
+    locationTable[RC_FIRE_TEMPLE_NEAR_BOSS_POT_4]              = Location::Pot(RC_FIRE_TEMPLE_NEAR_BOSS_POT_4,              RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-1139, -766),  "Near Boss Pot 4",                  RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4));
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_1]               = Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_1,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2226, -754),   "Big Lava Pot 1",                   RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1));
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_2]               = Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_2,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2226, -809),   "Big Lava Pot 2",                   RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2));
+    locationTable[RC_FIRE_TEMPLE_BIG_LAVA_POT_3]               = Location::Pot(RC_FIRE_TEMPLE_BIG_LAVA_POT_3,               RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(2227, -862),   "Big Lava Pot 3",                   RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1]        = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2388, 953),   "Flame Maze Left Pot 1",            RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2]        = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2423, 920),   "Flame Maze Left Pot 2",            RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3]        = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2442, 715),   "Flame Maze Left Pot 3",            RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4]        = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4,        RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2408, 680),   "Flame Maze Left Pot 4",            RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1]       = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2208, -168),  "Flame Maze Right Pot 1",           RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2]       = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2253, -167),  "Flame Maze Right Pot 2",           RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3]       = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2657, -591),  "Flame Maze Right Pot 3",           RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3));
+    locationTable[RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4]       = Location::Pot(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4,       RCQUEST_VANILLA, RCAREA_FIRE_TEMPLE,        SCENE_FIRE_TEMPLE,                 TWO_ACTOR_PARAMS(-2657, -635),  "Flame Maze Right Pot 4",           RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4));
+    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1]          = Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(330, -198),    "Main Level 2 Pot 1",               RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1));
+    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2]          = Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(331, -168),    "Main Level 2 Pot 2",               RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2));
+    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1]          = Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-241, -1193),  "Main Level 1 Pot 1",               RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1));
+    locationTable[RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2]          = Location::Pot(RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-117, -1192),  "Main Level 1 Pot 2",               RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2));
+    locationTable[RC_WATER_TEMPLE_TORCH_POT_1]                 = Location::Pot(RC_WATER_TEMPLE_TORCH_POT_1,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1123, 62),     "Torch Pot 1",                      RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_TORCH_POT_1));
+    locationTable[RC_WATER_TEMPLE_TORCH_POT_2]                 = Location::Pot(RC_WATER_TEMPLE_TORCH_POT_2,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1123, 293),    "Torch Pot 2",                      RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_TORCH_POT_2));
+    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_1]          = Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_1,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1222, -617),   "Near Compass Pot 1",               RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1));
+    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_2]          = Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_2,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1172, -617),   "Near Compass Pot 2",               RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2));
+    locationTable[RC_WATER_TEMPLE_NEAR_COMPASS_POT_3]          = Location::Pot(RC_WATER_TEMPLE_NEAR_COMPASS_POT_3,          RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(1122, -617),   "Near Compass Pot 3",               RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3));
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_POT_1]           = Location::Pot(RC_WATER_TEMPLE_CENTRAL_BOW_POT_1,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(688, 1008),    "Central Bow Pot 1",                RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1));
+    locationTable[RC_WATER_TEMPLE_CENTRAL_BOW_POT_2]           = Location::Pot(RC_WATER_TEMPLE_CENTRAL_BOW_POT_2,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(631, 1008),    "Central Bow Pot 2",                RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2));
+    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_1]           = Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_1,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2313, 944),   "Behind Gate Pot 1",                RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1));
+    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_2]           = Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_2,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2313, 905),   "Behind Gate Pot 2",                RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2));
+    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_3]           = Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_3,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2314, 808),   "Behind Gate Pot 3",                RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3));
+    locationTable[RC_WATER_TEMPLE_BEHIND_GATE_POT_4]           = Location::Pot(RC_WATER_TEMPLE_BEHIND_GATE_POT_4,           RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2314, 770),   "Behind Gate Pot 4",                RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4));
+    locationTable[RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1] = Location::Pot(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-28, -3817),   "Basement Block Puzzle Pot 1",      RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1));
+    locationTable[RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2] = Location::Pot(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(28, -3817),    "Basement Block Puzzle Pot 2",      RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2));
+    locationTable[RC_WATER_TEMPLE_RIVER_POT_1]                 = Location::Pot(RC_WATER_TEMPLE_RIVER_POT_1,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2226, -2487), "River Pot 1",                      RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_RIVER_POT_1));
+    locationTable[RC_WATER_TEMPLE_RIVER_POT_2]                 = Location::Pot(RC_WATER_TEMPLE_RIVER_POT_2,                 RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-2184, -2456), "River Pot 2",                      RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_RIVER_POT_2));
+    locationTable[RC_WATER_TEMPLE_LIKE_LIKE_POT_1]             = Location::Pot(RC_WATER_TEMPLE_LIKE_LIKE_POT_1,             RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-3188, -1628), "Like Like Pot 1",                  RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1));
+    locationTable[RC_WATER_TEMPLE_LIKE_LIKE_POT_2]             = Location::Pot(RC_WATER_TEMPLE_LIKE_LIKE_POT_2,             RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-3056, -1626), "Like Like Pot 2",                  RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2));
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_POT_1]              = Location::Pot(RC_WATER_TEMPLE_BOSS_KEY_POT_1,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-1150, -3031), "Boss Key Pot 1",                   RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1));
+    locationTable[RC_WATER_TEMPLE_BOSS_KEY_POT_2]              = Location::Pot(RC_WATER_TEMPLE_BOSS_KEY_POT_2,              RCQUEST_VANILLA, RCAREA_WATER_TEMPLE,       SCENE_WATER_TEMPLE,                TWO_ACTOR_PARAMS(-1417, -3025), "Boss Key Pot 2",                   RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1]       = Location::Pot(RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1806, -344),  "Near Dead Hand Pot 1",             RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1]     = Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1721, 61),    "Whispering Walls Pot 1",           RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2]     = Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1407, 61),    "Whispering Walls Pot 2",           RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3]     = Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1614, 61),    "Whispering Walls Pot 3",           RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3));
+    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4]     = Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1055, -257),  "Whispering Walls Pot 4",           RHT_POT_SHADOW_TEMPLE,          RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4));
+    locationTable[RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5]     = Location::Pot(RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5,     RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-1050, -130),  "Whispering Walls Pot 5",           RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5));
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST_POT_1]            = Location::Pot(RC_SHADOW_TEMPLE_MAP_CHEST_POT_1,            RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-665, -760),   "Map Chest Pot 1",                  RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MAP_CHEST_POT_2]            = Location::Pot(RC_SHADOW_TEMPLE_MAP_CHEST_POT_2,            RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-929, -748),   "Map Chest Pot 2",                  RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1]       = Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(614, 3579),    "Falling Spikes Pot 1",             RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2]       = Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(798, 3574),    "Falling Spikes Pot 2",             RHT_POT_SHADOW_TEMPLE,          RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3]       = Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(1173, 3707),   "Falling Spikes Pot 3",             RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3));
+    locationTable[RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4]       = Location::Pot(RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4,       RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(1173, 3605),   "Falling Spikes Pot 4",             RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_POT_1]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_WIND_POT_1,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(4222, -916),   "After Wind Pot 1",                 RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_WIND_POT_2]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_WIND_POT_2,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(4549, -922),   "After Wind Pot 2",                 RHT_POT_SHADOW_TEMPLE,          RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1]          = Location::Pot(RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4303, -2657), "Spike Walls Pot 1",                RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_FLOORMASTER_POT_1]          = Location::Pot(RC_SHADOW_TEMPLE_FLOORMASTER_POT_1,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4575, -811),  "Floormaster Pot 1",                RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_FLOORMASTER_POT_2]          = Location::Pot(RC_SHADOW_TEMPLE_FLOORMASTER_POT_2,          RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-4036, -811),  "Floormaster Pot 2",                RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2400, -1470), "After Boat Pot 1",                 RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2230, -1470), "After Boat Pot 2",                 RHT_POT_SHADOW_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2859, -497),  "After Boat Pot 3",                 RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3));
+    locationTable[RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4]           = Location::Pot(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4,           RCQUEST_VANILLA, RCAREA_SHADOW_TEMPLE,      SCENE_SHADOW_TEMPLE,               TWO_ACTOR_PARAMS(-2624, -492),  "After Boat Pot 4",                 RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_LOBBY_POT_1]                = Location::Pot(RC_SPIRIT_TEMPLE_LOBBY_POT_1,                RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-181, 233),    "Lobby Pot 1",                      RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_LOBBY_POT_2]                = Location::Pot(RC_SPIRIT_TEMPLE_LOBBY_POT_2,                RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(184, 231),     "Lobby Pot 2",                      RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_1]               = Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_1,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-975, -1751),  "Anubis Pot 1",                     RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_2]               = Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_2,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-928, -1827),  "Anubis Pot 2",                     RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_3]               = Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_3,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1211, -1530), "Anubis Pot 3",                     RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_ANUBIS_POT_4]               = Location::Pot(RC_SPIRIT_TEMPLE_ANUBIS_POT_4,               RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1055, -1680), "Anubis Pot 4",                     RHT_POT_SPIRIT_TEMPLE,          RG_DEKU_SHIELD,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1]          = Location::Pot(RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1,          RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1101, -1305), "Child Climb Pot 1",                RHT_POT_SPIRIT_TEMPLE,          RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1]      = Location::Pot(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1781, 830),   "After Sun Block Pot 1",            RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2]      = Location::Pot(RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-1617, 830),   "After Sun Block Pot 2",            RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-600, -1213),  "Central Chamber Pot 1",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-564, -1180),  "Central Chamber Pot 2",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(-526, -1213),  "Central Chamber Pot 3",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(639, -1224),   "Central Chamber Pot 4",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(671, -1179),   "Central Chamber Pot 5",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5));
+    locationTable[RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6]      = Location::Pot(RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6,      RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(704, -1224),   "Central Chamber Pot 6",            RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6));
+    locationTable[RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1]          = Location::Pot(RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1,          RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE,      SCENE_SPIRIT_TEMPLE,               TWO_ACTOR_PARAMS(819, -333),    "Beamos Hall Pot 1",                RHT_POT_SPIRIT_TEMPLE,          RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1));
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1725, 2336),   "Forest Trial Pot 1",               RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_FOREST_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1892, 2241),   "Forest Trial Pot 2",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_2]           = Location::Pot(RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,           RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1898, -3942), "Fire Trial Pot 2",                 RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_1]           = Location::Pot(RC_GANONS_CASTLE_FIRE_TRIAL_POT_1,           RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-2051, -3855), "Fire Trial Pot 1",                 RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_1]          = Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_1,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -920),   "Water Trial Pot 1",                RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_2]          = Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_2,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -761),   "Water Trial Pot 2",                RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_3]          = Location::Pot(RC_GANONS_CASTLE_WATER_TRIAL_POT_3,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2822, -507),   "Water Trial Pot 3",                RHT_POT_GANONS_CASTLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3));
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1234, -3418),  "Shadow Trial Pot 1",               RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1621, -3203),  "Shadow Trial Pot 2",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3]         = Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2067, -4592),  "Shadow Trial Pot 3",               RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3));
+    locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4]         = Location::Pot(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2224, -4506),  "Shadow Trial Pot 4",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4));
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1398, 1402),  "Spirit Trial Pot 1",               RHT_POT_GANONS_CASTLE,          RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,         RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-1237, 1494),  "Spirit Trial Pot 2",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1]  = Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,  RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-2581, -839),  "Light Trial Boulder Pot 1",        RHT_POT_GANONS_CASTLE,          RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1));
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1]          = Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-3840, -923),  "Light Trial Pot 1",                RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2]          = Location::Pot(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2,          RCQUEST_VANILLA, RCAREA_GANONS_CASTLE,      SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-3840, -755),  "Light Trial Pot 2",                RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_1]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_1,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-422, -258),   "Ganons Tower Pot 1",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_2]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_2,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-382, -300),   "Ganons Tower Pot 2",               RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_3]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_3,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-342, -341),   "Ganons Tower Pot 3",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_4]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_4,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-298, -383),   "Ganons Tower Pot 4",               RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_5]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_5,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-257, -424),   "Ganons Tower Pot 5",               RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_6]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_6,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-382, -259),   "Ganons Tower Pot 6",               RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_7]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_7,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-342, -300),   "Ganons Tower Pot 7",               RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_8]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_8,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-301, -341),   "Ganons Tower Pot 8",               RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_9]         = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_9,         RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(-258, -383),   "Ganons Tower Pot 9",               RHT_POT_GANONS_CASTLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_10]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_10,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(418, -261),    "Ganons Tower Pot 10",              RHT_POT_GANONS_CASTLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_11]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_11,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(377, -301),    "Ganons Tower Pot 11",              RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_12]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_12,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(338, -340),    "Ganons Tower Pot 12",              RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_13]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_13,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(300, -380),    "Ganons Tower Pot 13",              RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_14]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_14,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(260, -420),    "Ganons Tower Pot 14",              RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_15]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_15,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(378, -261),    "Ganons Tower Pot 15",              RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_16]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_16,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(337, -300),    "Ganons Tower Pot 16",              RHT_POT_GANONS_CASTLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_17]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_17,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(299, -340),    "Ganons Tower Pot 17",              RHT_POT_GANONS_CASTLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17));
+    locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_18]        = Location::Pot(RC_GANONS_CASTLE_GANONS_TOWER_POT_18,        RCQUEST_BOTH, RCAREA_GANONS_CASTLE,         SCENE_GANONS_TOWER,                TWO_ACTOR_PARAMS(260, -380),    "Ganons Tower Pot 18",              RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-95, -673),    "Basement Pot 1",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(75, -598),     "Basement Pot 2",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(270, -1151),   "Basement Pot 3",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(566, -1254),   "Basement Pot 4",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(378, -1089),   "Basement Pot 5",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(665, -1252),   "Basement Pot 6",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(566, -1345),   "Basement Pot 7",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(562, -1304),   "Basement Pot 8",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(313, -1086),   "Basement Pot 9",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(618, -1254),   "Basement Pot 10",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(257, -1099),   "Basement Pot 11",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11));
+    locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(296, -1206),   "Basement Pot 12",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12));
+    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-969, 55),     "Left Side Pot 1",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-966, 9),      "Left Side Pot 2",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3,       RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-965, -32),    "Left Side Pot 3",                  RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3));
+    locationTable[RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1]   = Location::Pot(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,   RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(-41, 389),     "Near Entrance Pot 1",              RHT_POT_BOTTOM_OF_THE_WELL,     RG_DEKU_STICK_1,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2]   = Location::Pot(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,   RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(36, 389),      "Near Entrance Pot 2",              RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1]      = Location::Pot(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1,      RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(874, -1294),   "Fire Keese Pot 1",                 RHT_POT_BOTTOM_OF_THE_WELL,     RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT]        = Location::Pot(RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT,        RCQUEST_VANILLA, RCAREA_BOTTOM_OF_THE_WELL, SCENE_BOTTOM_OF_THE_WELL,          TWO_ACTOR_PARAMS(3, -1641),     "Underwater Pot",                   RHT_POT_BOTTOM_OF_THE_WELL,     RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT));
+    locationTable[RC_ICE_CAVERN_HALL_POT_1]                    = Location::Pot(RC_ICE_CAVERN_HALL_POT_1,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-206, 449),    "Hall Pot 1",                       RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_HALL_POT_1));
+    locationTable[RC_ICE_CAVERN_HALL_POT_2]                    = Location::Pot(RC_ICE_CAVERN_HALL_POT_2,                    RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-203, 492),    "Hall Pot 2",                       RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_HALL_POT_2));
+    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_1]          = Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_1,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(433, -732),    "Spinning Blade Pot 1",             RHT_POT_ICE_CAVERN,             RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1));
+    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_2]          = Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_2,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(569, -175),    "Spinning Blade Pot 2",             RHT_POT_ICE_CAVERN,             RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2));
+    locationTable[RC_ICE_CAVERN_SPINNING_BLADE_POT_3]          = Location::Pot(RC_ICE_CAVERN_SPINNING_BLADE_POT_3,          RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(521, -131),    "Spinning Blade Pot 3",             RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3));
+    locationTable[RC_ICE_CAVERN_NEAR_END_POT_1]                = Location::Pot(RC_ICE_CAVERN_NEAR_END_POT_1,                RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-1422, 586),   "Near End Pot 1",                   RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_END_POT_1));
+    locationTable[RC_ICE_CAVERN_NEAR_END_POT_2]                = Location::Pot(RC_ICE_CAVERN_NEAR_END_POT_2,                RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(-1488, 676),   "Near End Pot 2",                   RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_END_POT_2));
+    locationTable[RC_ICE_CAVERN_FROZEN_POT_1]                  = Location::Pot(RC_ICE_CAVERN_FROZEN_POT_1,                  RCQUEST_VANILLA, RCAREA_ICE_CAVERN,         SCENE_ICE_CAVERN,                  TWO_ACTOR_PARAMS(366, -2036),   "Frozen Pot 1",                     RHT_POT_ICE_CAVERN,             RG_PURPLE_RUPEE,    SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_FROZEN_POT_1));
+
+    // MQ Dungeon Pots
+    //            Randomizer Check                                  Randomizer Check                                                  Quest       Area                            Scene ID                        Params                          Short Name                      Hint Text Key                   Vanilla             Spoiler Collection Check
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-2391, -1804), "MQ Staircase Pot 1",           RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-2361, -1161), "MQ Staircase Pot 2",           RHT_POT_DODONGOS_CAVERN,        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-1525, -1800), "MQ Staircase Pot 3",           RHT_POT_DODONGOS_CAVERN,        RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-1558, -1169), "MQ Staircase Pot 4",           RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT]  = Location::Pot(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT,      RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1532, -1225),  "MQ Torch Puzzle Middle Pot",   RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3195, -155),   "MQ Big Block Pot 1",           RHT_POT_DODONGOS_CAVERN,        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2]          = Location::Pot(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2,              RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2704, -483),   "MQ Big Block Pot 2",           RHT_POT_DODONGOS_CAVERN,        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1]     = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1,         RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3869, -811),   "MQ Upper Lizalfos Pot 1",      RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2]     = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2,         RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3867, -969),   "MQ Upper Lizalfos Pot 2",      RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3]     = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3,         RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(4687, -1071),  "MQ Upper Lizalfos Pot 3",      RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4]     = Location::Pot(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4,         RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(4693, -1194),  "MQ Upper Lizalfos Pot 4",      RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3327, -805),   "MQ Two Flames Pot 1",          RHT_POT_DODONGOS_CAVERN,        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3326, -753),   "MQ Two Flames Pot 2",          RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT]  = Location::Pot(RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT,      RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1827, -587),   "MQ Torch Puzzle Corner Pot",   RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1727, -151),   "MQ Right Side Pot 1",          RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1815, -154),   "MQ Right Side Pot 2",          RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3442, -469),   "MQ Right Side Pot 3",          RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4]         = Location::Pot(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4,             RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(3682, -466),   "MQ Right Side Pot 4",          RHT_POT_DODONGOS_CAVERN,        RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1844, -1867),  "MQ Poe Room Pot 1",            RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2272, -2213),  "MQ Poe Room Pot 2",            RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(2240, -1369),  "MQ Poe Room Pot 3",            RHT_POT_DODONGOS_CAVERN,        RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1535, -1299),  "MQ Poe Room Pot 4",            RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT]       = Location::Pot(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT,           RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(258, -3055),   "MQ Before Boss SW Pot",        RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT]       = Location::Pot(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT,           RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(-265, -2499),  "MQ Before Boss NE Pot",        RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT]        = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT,            RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1758, -3194),  "MQ Armos Room SE Pot",         RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3));
+    locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT]        = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT,            RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1223, -3197),  "MQ Armos Room SW Pot",         RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1663, -4311),  "MQ Backroom Pot 1",            RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2]           = Location::Pot(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2,               RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1648, -4694),  "MQ Backroom Pot 2",            RHT_POT_DODONGOS_CAVERN,        RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2));
+    locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT]        = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT,            RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1005, -3711),  "MQ Armos Room NW Pot",         RHT_POT_DODONGOS_CAVERN,        RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1));
+    locationTable[RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT]        = Location::Pot(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT,            RCQUEST_MQ, RCAREA_DODONGOS_CAVERN,         SCENE_DODONGOS_CAVERN,          TWO_ACTOR_PARAMS(1066, -3711),  "MQ Armos Room NE Pot",         RHT_POT_DODONGOS_CAVERN,        RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1]          = Location::Pot(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1,              RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-183, -449),   "MQ Entrance Pot 1",            RHT_POT_JABU_JABUS_BELLY,       RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2]          = Location::Pot(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2,              RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(202, -62),     "MQ Entrance Pot 2",            RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1]            = Location::Pot(RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1,                RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-689, -1800),  "MQ Geyser Pot 1",              RHT_POT_JABU_JABUS_BELLY,       RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2]            = Location::Pot(RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2,                RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(-693, -1614),  "MQ Geyser Pot 2",              RHT_POT_JABU_JABUS_BELLY,       RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1]        = Location::Pot(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,            RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(697, -2318),   "MQ Time Block Pot 1",          RHT_POT_JABU_JABUS_BELLY,       RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2]        = Location::Pot(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,            RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(699, -2445),   "MQ Time Block Pot 2",          RHT_POT_JABU_JABUS_BELLY,       RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1]        = Location::Pot(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,            RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(612, -5932),   "MQ Like Likes Pot 1",          RHT_POT_JABU_JABUS_BELLY,       RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2]        = Location::Pot(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,            RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(718, -5929),   "MQ Like Likes Pot 2",          RHT_POT_JABU_JABUS_BELLY,       RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2));
+    locationTable[RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1]       = Location::Pot(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,           RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY,        SCENE_JABU_JABU,                TWO_ACTOR_PARAMS(1305, -2005),  "MQ Before Boss Pot 1",         RHT_POT_JABU_JABUS_BELLY,       RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_1]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_1,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(675, -989),    "MQ Lobby Pot 1",               RHT_POT_FOREST_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_2]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_2,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-429, -981),   "MQ Lobby Pot 2",               RHT_POT_FOREST_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_3]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_3,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(720, -1037),   "MQ Lobby Pot 3",               RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_4]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_4,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-477, -1034),  "MQ Lobby Pot 4",               RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_5]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_5,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(630, -943),    "MQ Lobby Pot 5",               RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5));
+    locationTable[RC_FOREST_TEMPLE_MQ_LOBBY_POT_6]                = Location::Pot(RC_FOREST_TEMPLE_MQ_LOBBY_POT_6,                    RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-384, -937),   "MQ Lobby Pot 6",               RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6));
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1]               = Location::Pot(RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1,                   RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(90, -3583),    "MQ Wolfos Pot 1",              RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2]               = Location::Pot(RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2,                   RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(142, -3583),   "MQ Wolfos Pot 2",              RHT_POT_FOREST_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1]        = Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1,            RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(206, -3631),   "MQ Upper Stalfos Pot 1",       RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2]        = Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2,            RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(32, -3012),    "MQ Upper Stalfos Pot 2",       RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3]        = Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3,            RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(30, -3631),    "MQ Upper Stalfos Pot 3",       RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3));
+    locationTable[RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4]        = Location::Pot(RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4,            RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(202, -3012),   "MQ Upper Stalfos Pot 4",       RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4));
+    locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(830, -3639),   "MQ Blue Poe Pot 1",            RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(941, -3640),   "MQ Blue Poe Pot 2",            RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(883, -3640),   "MQ Blue Poe Pot 3",            RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3));
+    locationTable[RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1]            = Location::Pot(RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1,                RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(1647, -1529),  "MQ Green Poe Pot 1",           RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2]            = Location::Pot(RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2,                RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(1645, -1588),  "MQ Green Poe Pot 2",           RHT_POT_FOREST_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-461, -1095),  "MQ Basement Pot 1",            RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1));
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-351, -979),   "MQ Basement Pot 2",            RHT_POT_FOREST_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2));
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-387, -1018),  "MQ Basement Pot 3",            RHT_POT_FOREST_TEMPLE,          RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3));
+    locationTable[RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4]             = Location::Pot(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4,                 RCQUEST_MQ, RCAREA_FOREST_TEMPLE,           SCENE_FOREST_TEMPLE,            TWO_ACTOR_PARAMS(-424, -1057),  "MQ Basement Pot 4",            RHT_POT_FOREST_TEMPLE,          RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4));
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(1873, 2252),   "MQ Forest Trial Pot 1",        RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(1726, 2326),   "MQ Forest Trial Pot 2",        RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1]          = Location::Pot(RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1,              RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(3544, -931),   "MQ Water Trial Pot 1",         RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2]          = Location::Pot(RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2,              RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(3541, -755),   "MQ Water Trial Pot 2",         RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(2073, -4592),  "MQ Shadow Trial Pot 1",        RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(2217, -4516),  "MQ Shadow Trial Pot 2",        RHT_POT_GANONS_CASTLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1]           = Location::Pot(RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1,               RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1918, -3957), "MQ Fire Trial Pot 1",          RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2]           = Location::Pot(RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2,               RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-2052, -3888), "MQ Fire Trial Pot 2",          RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1]          = Location::Pot(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1,              RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-3842, -759),  "MQ Light Trial Pot 1",         RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2]          = Location::Pot(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2,              RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-3845, -933),  "MQ Light Trial Pot 2",         RHT_POT_GANONS_CASTLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2));
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1]         = Location::Pot(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1402, 1414),  "MQ Spirit Trial Pot 1",        RHT_POT_GANONS_CASTLE,          RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1));
+    locationTable[RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2]         = Location::Pot(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2,             RCQUEST_MQ, RCAREA_GANONS_CASTLE,           SCENE_INSIDE_GANONS_CASTLE,     TWO_ACTOR_PARAMS(-1256, 1500),  "MQ Spirit Trial Pot 2",        RHT_POT_GANONS_CASTLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1]     = Location::Pot(RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1,         RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-1045, -130),  "MQ Whispering Walls Pot 1",    RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2]     = Location::Pot(RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2,         RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-1045, -240),  "MQ Whispering Walls Pot 2",    RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1]      = Location::Pot(RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1,          RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-657, -949),   "MQ Entrance Redead Pot 1",     RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2]      = Location::Pot(RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2,          RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-713, -1016),  "MQ Entrance Redead Pot 2",     RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT]    = Location::Pot(RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT,        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(614, 3579),    "MQ Lower Umbrella W Pot",      RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT]    = Location::Pot(RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT,        RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(798, 3574),    "MQ Lower Umbrella E Pot",      RHT_POT_SHADOW_TEMPLE,          RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT]   = Location::Pot(RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT,       RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(1173, 3707),   "MQ Upper Umbrella S Pot",      RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3));
+    locationTable[RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT]   = Location::Pot(RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT,       RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(1173, 3605),   "MQ Upper Umbrella N Pot",      RHT_POT_SHADOW_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4));
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1]          = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1,              RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(4222, -916),   "MQ Before Boat Pot 1",         RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2]          = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2,              RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(4549, -922),   "MQ Before Boat Pot 2",         RHT_POT_SHADOW_TEMPLE,          RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT]      = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT,          RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-2400, -1470), "MQ Before Chasm W Pot",        RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT]      = Location::Pot(RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT,          RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-2230, -1470), "MQ Before Chasm E Pot",        RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2));
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT]       = Location::Pot(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT,           RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-2859, -497),  "MQ After Chasm W Pot",         RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3));
+    locationTable[RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT]       = Location::Pot(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT,           RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-2624, -492),  "MQ After Chasm E Pot",         RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4));
+    locationTable[RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT]         = Location::Pot(RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT,             RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-4303, -2657), "MQ Spike Baricade Pot",        RHT_POT_SHADOW_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT));
+    locationTable[RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1]            = Location::Pot(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1,                RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-4575, -811),  "MQ Dead Hand Pot 1",           RHT_POT_SHADOW_TEMPLE,          RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1));
+    locationTable[RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2]            = Location::Pot(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2,                RCQUEST_MQ, RCAREA_SHADOW_TEMPLE,           SCENE_SHADOW_TEMPLE,            TWO_ACTOR_PARAMS(-4036, -811),  "MQ Dead Hand Pot 2",           RHT_POT_SHADOW_TEMPLE,          RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1]     = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1,         RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(339, -377),    "MQ Inner Lobby Pot 1",         RHT_POT_BOTTOM_OF_THE_WELL,     RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2]     = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2,         RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(416, -377),    "MQ Inner Lobby Pot 2",         RHT_POT_BOTTOM_OF_THE_WELL,     RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3]     = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3,         RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(269, -376),    "MQ Inner Lobby Pot 3",         RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT]       = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT,           RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(421, -174),    "MQ Outer Lobby Pot",           RHT_POT_BOTTOM_OF_THE_WELL,     RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1] = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(288, -1240),   "MQ East Inner Pot 1",          RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2] = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(438, -1234),   "MQ East Inner Pot 2",          RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2));
+    locationTable[RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3] = Location::Pot(RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3,     RCQUEST_MQ, RCAREA_BOTTOM_OF_THE_WELL,      SCENE_BOTTOM_OF_THE_WELL,       TWO_ACTOR_PARAMS(444, -1114),   "MQ East Inner Pot 3",          RHT_POT_BOTTOM_OF_THE_WELL,     RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1]               = Location::Pot(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1,                   RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-357, 957),    "MQ Entrance Pot 1",            RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2]               = Location::Pot(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2,                   RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(356, 959),     "MQ Entrance Pot 2",            RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(187, -1449),   "MQ Before Mini Boss Pot 1",    RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(188, -1514),   "MQ Before Mini Boss Pot 2",    RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(487, -1450),   "MQ Before Mini Boss Pot 3",    RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(486, -1515),   "MQ Before Mini Boss Pot 4",    RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(38, -1179),    "MQ Before Mini Boss Pot 5",    RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(42, -1298),    "MQ Before Mini Boss Pot 6",    RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(520, -943),    "MQ Before Mini Boss Pot 7",    RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7));
+    locationTable[RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8]       = Location::Pot(RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8,           RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(35, -946),     "MQ Before Mini Boss Pot 8",    RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1]           = Location::Pot(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1,               RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1426, -711),  "MQ Outside Boss Pot 1",        RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2]           = Location::Pot(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2,               RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1425, -660),  "MQ Outside Boss Pot 2",        RHT_POT_FIRE_TEMPLE,            RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT]          = Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT,              RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1646, -1260),  "MQ Lava Room North Pot",       RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT]           = Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT,               RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(2226, -809),   "MQ Lava Room High Pot",        RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT]          = Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT,              RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1634, 1475),   "MQ Lava Room South Pot",       RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1]             = Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(845, -1591),   "MQ Lava Torch Pot 1",          RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2]             = Location::Pot(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(901, -1593),   "MQ Lava Torch Pot 2",          RHT_POT_FIRE_TEMPLE,            RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1]             = Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1756, -155),   "MQ Above Lava Pot 1",          RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2]             = Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1819, -82),    "MQ Above Lava Pot 2",          RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3]             = Location::Pot(RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1789, -122),   "MQ Above Lava Pot 3",          RHT_POT_FIRE_TEMPLE,            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1]             = Location::Pot(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1493, 386),    "MQ Flame Wall Pot 1",          RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2]             = Location::Pot(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2,                 RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(1445, 445),    "MQ Flame Wall Pot 2",          RHT_POT_FIRE_TEMPLE,            RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT]     = Location::Pot(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT,         RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2217, -163),  "MQ Past Fire Maze North Pot",  RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1));
+    locationTable[RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT]     = Location::Pot(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT,         RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2657, -591),  "MQ Past Fire Maze South Pot",  RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2));
+    locationTable[RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT]      = Location::Pot(RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT,          RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-1849, -1114), "MQ Fire Maze Northmost Pot",   RHT_POT_FIRE_TEMPLE,            RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3));
+    locationTable[RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT]      = Location::Pot(RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT,          RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2110, -646),  "MQ Fire Maze North West Pot",  RHT_POT_FIRE_TEMPLE,            RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4));
+    locationTable[RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT]     = Location::Pot(RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT,         RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2319, 838),   "MQ South Fire Maze W Pot",     RHT_POT_FIRE_TEMPLE,            RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5));
+    locationTable[RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT]     = Location::Pot(RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT,         RCQUEST_MQ, RCAREA_FIRE_TEMPLE,             SCENE_FIRE_TEMPLE,              TWO_ACTOR_PARAMS(-2285, 803),   "MQ South Fire Maze E Pot",     RHT_POT_FIRE_TEMPLE,            RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6));
+    locationTable[RC_ICE_CAVERN_MQ_ENTRANCE_POT]                  = Location::Pot(RC_ICE_CAVERN_MQ_ENTRANCE_POT,                      RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(248, 2287),    "MQ Entrance Pot",              RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT));
+    locationTable[RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1]           = Location::Pot(RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1,               RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(51, 718),      "MQ First Crystal Pot 1",       RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1));
+    locationTable[RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2]           = Location::Pot(RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2,               RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(52, 768),      "MQ First Crystal Pot 2",       RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2));
+    locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1]            = Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1,                RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(433, -732),    "MQ Early Wolfos Pot 1",        RHT_POT_ICE_CAVERN,             RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1));
+    locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2]            = Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2,                RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(569, -175),    "MQ Early Wolfos Pot 2",        RHT_POT_ICE_CAVERN,             RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2));
+    locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3]            = Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3,                RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(521, -131),    "MQ Early Wolfos Pot 3",        RHT_POT_ICE_CAVERN,             RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3));
+    locationTable[RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4]            = Location::Pot(RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4,                RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(138, -672),    "MQ Early Wolfos Pot 4",        RHT_POT_ICE_CAVERN,             RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4));
+    locationTable[RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1]              = Location::Pot(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1,                  RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(-1352, 639),   "MQ Push Block Pot 1",          RHT_POT_ICE_CAVERN,             RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1));
+    locationTable[RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2]              = Location::Pot(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2,                  RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(-1396, 596),   "MQ Push Block Pot 2",          RHT_POT_ICE_CAVERN,             RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2));
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_POT_1]                 = Location::Pot(RC_ICE_CAVERN_MQ_COMPASS_POT_1,                     RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(902, -2720),   "MQ Compass Pot 1",             RHT_POT_ICE_CAVERN,             RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1));
+    locationTable[RC_ICE_CAVERN_MQ_COMPASS_POT_2]                 = Location::Pot(RC_ICE_CAVERN_MQ_COMPASS_POT_2,                     RCQUEST_MQ, RCAREA_ICE_CAVERN,              SCENE_ICE_CAVERN,               TWO_ACTOR_PARAMS(451, -2726),   "MQ Compass Pot 2",             RHT_POT_ICE_CAVERN,             RG_BOMBS_10,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1]             = Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1,                 RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-255, 742),    "MQ Entrance Pot 1",            RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2]             = Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2,                 RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(306, 682),     "MQ Entrance Pot 2",            RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3]             = Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3,                 RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-297, 687),    "MQ Entrance Pot 3",            RHT_POT_SPIRIT_TEMPLE,          RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4]             = Location::Pot(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4,                 RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(260, 735),     "MQ Entrance Pot 4",            RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-894, -50),    "MQ Child Slugma Pot",          RHT_POT_SPIRIT_TEMPLE,          RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1]          = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1,              RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-382, -1256),  "MQ Child Gibdo Pot 1",         RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2]          = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2,              RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-381, -1207),  "MQ Child Gibdo Pot 2",         RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1035, -1240), "MQ Child Like Like Pot",       RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1166, -1931), "MQ Child Stalfos Pot 1",       RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-959, -1930),  "MQ Child Stalfos Pot 2",       RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-853, -1837),  "MQ Child Stalfos Pot 3",       RHT_POT_SPIRIT_TEMPLE,          RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1250, -1852), "MQ Child Stalfos Pot 4",       RHT_POT_SPIRIT_TEMPLE,          RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT]  = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT,      RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(639, -1224),   "MQ Statue Room 2F CE Pot",     RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT]         = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT,             RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-521, -1576),  "MQ Statue Room 3F E Pot",      RHT_POT_SPIRIT_TEMPLE,          RG_ARROWS_5,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT]         = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT,             RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-595, -1576),  "MQ Statue Room 3F W Pot",      RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT]         = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT,             RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-559, -1209),  "MQ Statue Room 2F W Pot",      RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT]     = Location::Pot(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT,         RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(704, -1224),   "MQ Statue Room 2F E Pot",      RHT_POT_SPIRIT_TEMPLE,          RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1276, 432),   "MQ Sun Blocks Pot 1",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-1635, -446),  "MQ Sun Blocks Pot 2",          RHT_POT_SPIRIT_TEMPLE,          RG_DEKU_SEEDS_30,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(829, 250),     "MQ Long Climb Pot 1",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(531, 249),     "MQ Long Climb Pot 2",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(244, -893),    "MQ Big Mirror Pot 1",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-122, -741),   "MQ Big Mirror Pot 2",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(250, -741),    "MQ Big Mirror Pot 3",          RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4]           = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4,               RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(-123, -892),   "MQ Big Mirror Pot 4",          RHT_POT_SPIRIT_TEMPLE,          RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(781, -841),    "MQ Before Mirror Pot 1",       RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2]        = Location::Pot(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2,            RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(587, -844),    "MQ Before Mirror Pot 2",       RHT_POT_SPIRIT_TEMPLE,          RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1]          = Location::Pot(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1,              RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(1204, -910),   "MQ Early Adult Pot 1",         RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1));
+    locationTable[RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2]          = Location::Pot(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2,              RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE,           SCENE_SPIRIT_TEMPLE,            TWO_ACTOR_PARAMS(1204, -1028),  "MQ Early Adult Pot 2",         RHT_POT_SPIRIT_TEMPLE,          RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1]         = Location::Pot(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1,             RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1123, 62),     "MQ Lower Torches Pot 1",       RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2]         = Location::Pot(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2,             RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1123, 293),    "MQ Lower Torches Pot 2",       RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1]        = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1,            RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1222, -617),   "MQ Storage Room A Pot 1",      RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2]        = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2,            RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1122, -617),   "MQ Storage Room A Pot 2",      RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3]        = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3,            RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(1172, -617),   "MQ Storage Room A Pot 3",      RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1]       = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-989, 255),    "MQ GS Storage Room Pot 1",     RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2]       = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1026, 257),   "MQ GS Storage Room Pot 2",     RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3]       = Location::Pot(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1062, 256),   "MQ GS Storage Room Pot 3",     RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT]   = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT,       RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(512, 579),     "MQ Lizalfos Hall W Pot",       RHT_POT_WATER_TEMPLE,           RG_RED_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT]  = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT,      RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(602, 1022),    "MQ Lizalfos Hall S Pot",       RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT]     = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT,         RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(789, 947),     "MQ Lizalfos Hall SE Pot",      RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT]     = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT,         RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(768, 565),     "MQ Lizalfos Cage N Pot",       RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4));
+    locationTable[RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT]     = Location::Pot(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT,         RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(767, 517),     "MQ Lizalfos Cage S Pot",       RHT_POT_WATER_TEMPLE,           RG_RECOVERY_HEART,  SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5));
+    locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT]      = Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT,          RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3500, -751),  "MQ Stalfos Pit Middle Pot",    RHT_POT_WATER_TEMPLE,           RG_DEKU_NUTS_5,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3));
+    locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT]       = Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3500, -686),  "MQ Stalfos Pit South Pot",     RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4));
+    locationTable[RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT]       = Location::Pot(RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3500, -810),  "MQ Stalfos Pit North Pot",     RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5));
+    locationTable[RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1]      = Location::Pot(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1,          RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3188, -1628), "MQ Before Dark Link Pot 1",    RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2]      = Location::Pot(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2,          RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3056, -1626), "MQ Before Dark Link Pot 2",    RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1]       = Location::Pot(RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3072, -4024), "MQ After Dark Link Pot 1",     RHT_POT_WATER_TEMPLE,           RG_ARROWS_30,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2]       = Location::Pot(RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2,           RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-3169, -4023), "MQ After Dark Link Pot 2",     RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_RIVER_POT_1]                 = Location::Pot(RC_WATER_TEMPLE_MQ_RIVER_POT_1,                     RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2226, -2487), "MQ River Pot 1",               RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_RIVER_POT_2]                 = Location::Pot(RC_WATER_TEMPLE_MQ_RIVER_POT_2,                     RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2184, -2456), "MQ River Pot 2",               RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_BOSS_KEY_POT]                = Location::Pot(RC_WATER_TEMPLE_MQ_BOSS_KEY_POT,                    RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1033, -1569), "MQ Boss Key Pot",              RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1]             = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1,                 RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2314, 770),   "MQ Lowest GS Pot 1",           RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2]             = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2,                 RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2314, 808),   "MQ Lowest GS Pot 2",           RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3]             = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3,                 RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2313, 944),   "MQ Lowest GS Pot 3",           RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3));
+    locationTable[RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4]             = Location::Pot(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4,                 RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-2313, 905),   "MQ Lowest GS Pot 4",           RHT_POT_WATER_TEMPLE,           RG_ARROWS_10,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1]        = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1,            RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1417, -3025), "MQ Storage Room B Pot 1",      RHT_POT_WATER_TEMPLE,           RG_GREEN_RUPEE,     SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2]        = Location::Pot(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2,            RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-1150, -3031), "MQ Storage Room B Pot 2",      RHT_POT_WATER_TEMPLE,           RG_BLUE_RUPEE,      SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2));
+    locationTable[RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1]          = Location::Pot(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1,              RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(28, -3817),    "MQ Mini Dodongo Pot 1",        RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1));
+    locationTable[RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2]          = Location::Pot(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2,              RCQUEST_MQ, RCAREA_WATER_TEMPLE,            SCENE_WATER_TEMPLE,             TWO_ACTOR_PARAMS(-28, -3817),   "MQ Mini Dodongo Pot 2",        RHT_POT_WATER_TEMPLE,           RG_BOMBS_5,         SpoilerCollectionCheck::RandomizerInf(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2));
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1]  = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1,      RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,  SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(-324, -72),    "MQ Lobby Left Pot 1",          RHT_POT_GERUDO_TRAINING_GROUND, RG_BLUE_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1));
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2]  = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2,      RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,  SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(-324, -177),   "MQ Lobby Left Pot 2",          RHT_POT_GERUDO_TRAINING_GROUND, RG_RECOVERY_HEART,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2));
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1] = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1,     RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,  SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(199, -79),     "MQ Lobby Right Pot 1",         RHT_POT_GERUDO_TRAINING_GROUND, RG_RECOVERY_HEART,   SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1));
+    locationTable[RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2] = Location::Pot(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2,     RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND,  SCENE_GERUDO_TRAINING_GROUND,   TWO_ACTOR_PARAMS(197, -179),    "MQ Lobby Right Pot 2",         RHT_POT_GERUDO_TRAINING_GROUND, RG_BLUE_RUPEE,       SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2));
+
+    // clang-format on
 }
 
-static RegisterShipInitFunc initFunc(Rando::StaticData::RegisterPotLocations);
\ No newline at end of file
+static ObjectExtension::Register<PotIdentity> RegisterPotIdentity;
+static RegisterShipInitFunc registerShufflePots(RegisterShufflePots, { "IS_RANDO" });
+static RegisterShipInitFunc registerShufflePotLocations(Rando::StaticData::RegisterPotLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.h b/soh/soh/Enhancements/randomizer/ShufflePots.h
deleted file mode 100644
index 28c4e2f4a8..0000000000
--- a/soh/soh/Enhancements/randomizer/ShufflePots.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SHUFFLEPOTS_H
-#define SHUFFLEPOTS_H
-
-#include <z64.h>
-#include <soh/OTRGlobals.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void ObjTsubo_RandomizerInit(void* actorRef);
-#ifdef __cplusplus
-};
-#endif
-
-void ShufflePots_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs);
-
-#endif //SHUFFLEPOTS_H
diff --git a/soh/soh/Enhancements/randomizer/ShuffleSongs.cpp b/soh/soh/Enhancements/randomizer/ShuffleSongs.cpp
new file mode 100644
index 0000000000..8bece13a1b
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/ShuffleSongs.cpp
@@ -0,0 +1,26 @@
+#include "soh/ShipInit.hpp"
+#include "location.h"
+#include "static_data.h"
+
+void Rando::StaticData::RegisterSongLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
+    locationTable[RC_SHEIK_IN_FOREST] =              Location::Base(RC_SHEIK_IN_FOREST,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW,      0x00, "Sheik in Forest",               "Sheik in Forest",               RHT_SHEIK_IN_FOREST,              RG_MINUET_OF_FOREST,   SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST),      true);
+    locationTable[RC_SHEIK_IN_CRATER] =              Location::Base(RC_SHEIK_IN_CRATER,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_DEATH_MOUNTAIN_CRATER,     0x00, "Sheik in Crater",               "Sheik in Crater",               RHT_SHEIK_IN_CRATER,              RG_BOLERO_OF_FIRE,     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE),        true);
+    locationTable[RC_SHEIK_IN_ICE_CAVERN] =          Location::Base(RC_SHEIK_IN_ICE_CAVERN,          RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_ICE_CAVERN,                0x00, "Sheik in Ice Cavern",           "Sheik in Ice Cavern",           RHT_SHEIK_IN_ICE_CAVERN,          RG_SERENADE_OF_WATER,  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER),     true);
+    locationTable[RC_SHEIK_AT_COLOSSUS] =            Location::Base(RC_SHEIK_AT_COLOSSUS,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_DESERT_COLOSSUS,           0x00, "Sheik at Colossus",             "Sheik at Colossus",             RHT_SHEIK_AT_COLOSSUS,            RG_REQUIEM_OF_SPIRIT,  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT),     true);
+    locationTable[RC_SHEIK_IN_KAKARIKO] =            Location::Base(RC_SHEIK_IN_KAKARIKO,            RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_KAKARIKO_VILLAGE,          0x00, "Sheik in Kakariko",             "Sheik in Kakariko",             RHT_SHEIK_IN_KAKARIKO,            RG_NOCTURNE_OF_SHADOW, SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL), true);
+    locationTable[RC_SHEIK_AT_TEMPLE] =              Location::Base(RC_SHEIK_AT_TEMPLE,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_TEMPLE_OF_TIME,            0x00, "Sheik at Temple",               "Sheik at Temple",               RHT_SHEIK_AT_TEMPLE,              RG_PRELUDE_OF_LIGHT,   SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT),      true);
+    locationTable[RC_SONG_FROM_IMPA] =               Location::Base(RC_SONG_FROM_IMPA,               RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_HYRULE_CASTLE,    ACTOR_ID_MAX, SCENE_ID_MAX,                    0x00, "Song from Impa",                "Song from Impa",                RHT_SONG_FROM_IMPA,               RG_ZELDAS_LULLABY,     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY),        true);
+    locationTable[RC_SONG_FROM_MALON] =              Location::Base(RC_SONG_FROM_MALON,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_LON_LON_RANCH,             0x00, "Song from Malon",               "Song from Malon",               RHT_SONG_FROM_MALON,              RG_EPONAS_SONG,        SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),             true);
+    locationTable[RC_SONG_FROM_SARIA] =              Location::Base(RC_SONG_FROM_SARIA,              RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_SACRED_FOREST_MEADOW,      0x00, "Song from Saria",               "Song from Saria",               RHT_SONG_FROM_SARIA,              RG_SARIAS_SONG,        SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG),           true);
+    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] = Location::Base(RC_SONG_FROM_ROYAL_FAMILYS_TOMB, RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_ROYAL_FAMILYS_TOMB,        0x00, "Song from Royal Family's Tomb", "Song from Royal Family's Tomb", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB, RG_SUNS_SONG,          SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),             true);
+    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =    Location::Base(RC_SONG_FROM_OCARINA_OF_TIME,    RCQUEST_BOTH, RCTYPE_SONG_LOCATION,                          ACTOR_ID_MAX, SCENE_HYRULE_FIELD,              0x00, "Song from Ocarina of Time",     "Song from Ocarina of Time",     RHT_SONG_FROM_OCARINA_OF_TIME,    RG_SONG_OF_TIME,       SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_TIME),          true);
+    locationTable[RC_SONG_FROM_WINDMILL] =           Location::Base(RC_SONG_FROM_WINDMILL,           RCQUEST_BOTH, RCTYPE_SONG_LOCATION, RCAREA_KAKARIKO_VILLAGE, ACTOR_ID_MAX, SCENE_WINDMILL_AND_DAMPES_GRAVE, 0x00, "Song from Windmill",            "Song from Windmill",            RHT_SONG_FROM_WINDMILL,           RG_SONG_OF_STORMS,     SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),        true);
+    // clang-format-on
+}
+
+static RegisterShipInitFunc initSongLocations(Rando::StaticData::RegisterSongLocations);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleTradeItems.c b/soh/soh/Enhancements/randomizer/ShuffleTradeItems.c
index 62e0bc9f0f..8b43884e4b 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleTradeItems.c
+++ b/soh/soh/Enhancements/randomizer/ShuffleTradeItems.c
@@ -8,7 +8,7 @@ u8 Randomizer_GetNextChildTradeItem() {
     for (int i = 0; i < numTradeItems; i++) {
         u8 tradeIndex = (currentTradeItemIndex + i + 1) % numTradeItems;
         if (Flags_GetRandomizerInf(tradeIndex + RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG)) {
-			return ITEM_WEIRD_EGG + tradeIndex;
+            return ITEM_WEIRD_EGG + tradeIndex;
         }
     }
     return ITEM_NONE;
@@ -20,7 +20,7 @@ u8 Randomizer_GetPrevChildTradeItem() {
     for (int i = 0; i < numTradeItems; i++) {
         u8 tradeIndex = (currentTradeItemIndex - i - 1 + numTradeItems) % numTradeItems;
         if (Flags_GetRandomizerInf(tradeIndex + RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG)) {
-			return ITEM_WEIRD_EGG + tradeIndex;
+            return ITEM_WEIRD_EGG + tradeIndex;
         }
     }
     return ITEM_NONE;
@@ -32,7 +32,7 @@ u8 Randomizer_GetNextAdultTradeItem() {
     for (int i = 0; i < numTradeItems; i++) {
         u8 tradeIndex = (currentTradeItemIndex + i + 1) % numTradeItems;
         if (Flags_GetRandomizerInf(tradeIndex + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG)) {
-			return ITEM_POCKET_EGG + tradeIndex;
+            return ITEM_POCKET_EGG + tradeIndex;
         }
     }
     return ITEM_NONE;
@@ -44,7 +44,7 @@ u8 Randomizer_GetPrevAdultTradeItem() {
     for (int i = 0; i < numTradeItems; i++) {
         u8 tradeIndex = (currentTradeItemIndex - i - 1 + numTradeItems) % numTradeItems;
         if (Flags_GetRandomizerInf(tradeIndex + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG)) {
-			return ITEM_POCKET_EGG + tradeIndex;
+            return ITEM_POCKET_EGG + tradeIndex;
         }
     }
     return ITEM_NONE;
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 9fcf71d55f..2ee39006d0 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -11,6 +11,7 @@
 #include "fishsanity.h"
 #include "macros.h"
 #include "3drando/hints.hpp"
+#include "soh/util.h"
 #include "../kaleido.h"
 
 #include <fstream>
@@ -45,6 +46,7 @@ Context::Context() {
         &mOptions[RSK_SHUFFLE_BEEHIVES],
         &mOptions[RSK_SHUFFLE_COWS],
         &mOptions[RSK_SHUFFLE_POTS],
+        &mOptions[RSK_SHUFFLE_CRATES],
         &mOptions[RSK_SHUFFLE_FREESTANDING],
         &mOptions[RSK_SHUFFLE_MERCHANTS],
         &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
@@ -87,7 +89,7 @@ Hint* Context::GetHint(const RandomizerHint hintKey) {
 }
 
 void Context::AddHint(const RandomizerHint hintId, const Hint hint) {
-    hintTable[hintId] = hint; //RANDOTODO this should probably be an rvalue
+    hintTable[hintId] = hint; // RANDOTODO this should probably be an rvalue
 }
 
 ItemLocation* Context::GetItemLocation(const RandomizerCheck locKey) {
@@ -116,12 +118,14 @@ ItemOverride& Context::GetItemOverride(size_t locKey) {
     return overrides.at(static_cast<RandomizerCheck>(locKey));
 }
 
-void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately,
-                                  const bool setHidden) {
+void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item,
+                                  const bool applyEffectImmediately, const bool setHidden) {
     const auto loc = GetItemLocation(locKey);
-    SPDLOG_DEBUG(StaticData::RetrieveItem(item).GetName().GetEnglish() + " placed at " + StaticData::GetLocation(locKey)->GetName() + "\n");
-    
-    if (applyEffectImmediately || mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_GLITCHLESS) || mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_VANILLA)) {
+    SPDLOG_DEBUG(StaticData::RetrieveItem(item).GetName().GetEnglish() + " placed at " +
+                 StaticData::GetLocation(locKey)->GetName() + "\n");
+
+    if (applyEffectImmediately || mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_GLITCHLESS) ||
+        mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_VANILLA)) {
         StaticData::RetrieveItem(item).ApplyEffect();
     }
 
@@ -151,43 +155,42 @@ void Context::AddLocations(const Container& locations, std::vector<RandomizerChe
 bool Context::IsQuestOfLocationActive(RandomizerCheck rc) {
     const auto loc = Rando::StaticData::GetLocation(rc);
     return loc->GetQuest() == RCQUEST_BOTH ||
-        loc->GetQuest() == RCQUEST_MQ && mDungeons->GetDungeonFromScene(loc->GetScene())->IsMQ() ||
-        loc->GetQuest() == RCQUEST_VANILLA && mDungeons->GetDungeonFromScene(loc->GetScene())->IsVanilla();
+           loc->GetQuest() == RCQUEST_MQ && mDungeons->GetDungeonFromScene(loc->GetScene())->IsMQ() ||
+           loc->GetQuest() == RCQUEST_VANILLA && mDungeons->GetDungeonFromScene(loc->GetScene())->IsVanilla();
 }
 
 void Context::GenerateLocationPool() {
     allLocations.clear();
-    if (mOptions[RSK_TRIFORCE_HUNT]) {
-        AddLocation(RC_TRIFORCE_COMPLETED);
-    }
     for (Location& location : StaticData::GetLocationTable()) {
         // skip RCs that shouldn't be in the pool for any reason (i.e. settings, unsupported check type, etc.)
         // TODO: Exclude checks for some of the older shuffles from the pool too i.e. Frog Songs, Scrubs, etc.)
         if (location.GetRandomizerCheck() == RC_UNKNOWN_CHECK ||
             location.GetRandomizerCheck() == RC_TRIFORCE_COMPLETED || // already in pool
-            location.GetRCType() == RCTYPE_CHEST_GAME ||              // not supported yet
-            location.GetRCType() == RCTYPE_STATIC_HINT ||             // can't have items
-            location.GetRCType() == RCTYPE_GOSSIP_STONE ||            // can't have items
+            (location.GetRandomizerCheck() == RC_MASTER_SWORD_PEDESTAL &&
+             mOptions[RSK_SHUFFLE_MASTER_SWORD].Is(RO_GENERIC_OFF)) ||
+            (location.GetRandomizerCheck() == RC_KAK_100_GOLD_SKULLTULA_REWARD &&
+             mOptions[RSK_SHUFFLE_100_GS_REWARD].Is(RO_GENERIC_OFF)) ||
+            location.GetRCType() == RCTYPE_CHEST_GAME ||   // not supported yet
+            location.GetRCType() == RCTYPE_STATIC_HINT ||  // can't have items
+            location.GetRCType() == RCTYPE_GOSSIP_STONE || // can't have items
+            (location.GetRCType() == RCTYPE_FROG_SONG && mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES].Is(RO_GENERIC_OFF)) ||
             (location.GetRCType() == RCTYPE_SCRUB && mOptions[RSK_SHUFFLE_SCRUBS].Is(RO_SCRUBS_OFF)) ||
-            (location.GetRCType() == RCTYPE_SCRUB && mOptions[RSK_SHUFFLE_SCRUBS].Is(RO_SCRUBS_ONE_TIME_ONLY) && !(
-                location.GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
-                location.GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE ||
-                location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO
-            )) ||
+            (location.GetRCType() == RCTYPE_SCRUB && mOptions[RSK_SHUFFLE_SCRUBS].Is(RO_SCRUBS_ONE_TIME_ONLY) &&
+             !(location.GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
+               location.GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE ||
+               location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO)) ||
             (location.GetRCType() == RCTYPE_ADULT_TRADE && mOptions[RSK_SHUFFLE_ADULT_TRADE].Is(RO_GENERIC_OFF)) ||
+            (location.GetRCType() == RCTYPE_SONG_LOCATION && mOptions[RSK_SHUFFLE_SONGS].Is(RO_SONG_SHUFFLE_OFF)) ||
             (location.GetRCType() == RCTYPE_COW && mOptions[RSK_SHUFFLE_COWS].Is(RO_GENERIC_OFF)) ||
-            (location.GetRandomizerCheck() == RC_LH_HYRULE_LOACH && mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) ||
-            (location.GetRCType() == RCTYPE_FISH && (
-                mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_OFF) || mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_HYRULE_LOACH) ||
-                (mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_OVERWORLD) && location.GetScene() == SCENE_FISHING_POND) ||
-                (mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_POND) && location.GetScene() != SCENE_FISHING_POND) ||
-                ((mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_POND) || mOptions[RSK_FISHSANITY].Is(RO_FISHSANITY_BOTH)) &&
-                    (mOptions[RSK_FISHSANITY_AGE_SPLIT].Is(RO_GENERIC_OFF) && (
-                        location.GetRandomizerCheck() >= RC_LH_ADULT_FISH_1 && location.GetRandomizerCheck() <= RC_LH_ADULT_LOACH)
-                    )
-                )
-            )) ||
+            (location.GetRandomizerCheck() == RC_LH_HYRULE_LOACH &&
+             mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) ||
+            (location.GetRCType() == RCTYPE_FISH && !mFishsanity->GetFishLocationIncluded(&location)) ||
             (location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_OFF)) ||
+            (location.GetRCType() == RCTYPE_GRASS && mOptions[RSK_SHUFFLE_GRASS].Is(RO_SHUFFLE_GRASS_OFF)) ||
+            (location.GetRCType() == RCTYPE_CRATE && mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OFF)) ||
+            (location.GetRCType() == RCTYPE_NLCRATE && (mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OFF) ||
+                                                        !mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_NO_LOGIC))) ||
+            (location.GetRCType() == RCTYPE_SMALL_CRATE && mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OFF)) ||
             (location.GetRCType() == RCTYPE_FAIRY && !mOptions[RSK_SHUFFLE_FAIRIES]) ||
             (location.GetRCType() == RCTYPE_FREESTANDING &&
              mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_OFF)) ||
@@ -197,8 +200,16 @@ void Context::GenerateLocationPool() {
         if (location.IsOverworld()) {
             // Skip stuff that is shuffled to dungeon only, i.e. tokens, pots, etc., or other checks that
             // should not have a shuffled item.
-            if ((location.GetRCType() == RCTYPE_FREESTANDING && mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_DUNGEONS)) ||
-                (location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_DUNGEONS))) {
+            if ((location.GetRCType() == RCTYPE_FREESTANDING &&
+                 mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_DUNGEONS)) ||
+                (location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_DUNGEONS)) ||
+                (location.GetRCType() == RCTYPE_GRASS && mOptions[RSK_SHUFFLE_GRASS].Is(RO_SHUFFLE_GRASS_DUNGEONS)) ||
+                (location.GetRCType() == RCTYPE_CRATE && mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_DUNGEONS)) ||
+                (location.GetRCType() == RCTYPE_NLCRATE &&
+                 mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_DUNGEONS) &&
+                 mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_NO_LOGIC)) ||
+                (location.GetRCType() == RCTYPE_SMALL_CRATE &&
+                 mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_DUNGEONS))) {
                 continue;
             }
             // If we've gotten past all the conditions where an overworld location should not be
@@ -210,7 +221,16 @@ void Context::GenerateLocationPool() {
             if (location.GetQuest() == RCQUEST_BOTH || (location.GetQuest() == RCQUEST_MQ) == dungeon->IsMQ()) {
                 if ((location.GetRCType() == RCTYPE_FREESTANDING &&
                      mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_OVERWORLD)) ||
-                    (location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_OVERWORLD))) {
+                    (location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_OVERWORLD)) ||
+                    (location.GetRCType() == RCTYPE_GRASS &&
+                     mOptions[RSK_SHUFFLE_GRASS].Is(RO_SHUFFLE_GRASS_OVERWORLD)) ||
+                    (location.GetRCType() == RCTYPE_CRATE &&
+                     mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OVERWORLD)) ||
+                    (location.GetRCType() == RCTYPE_NLCRATE &&
+                     mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OVERWORLD) &&
+                     mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_NO_LOGIC)) ||
+                    (location.GetRCType() == RCTYPE_SMALL_CRATE &&
+                     mOptions[RSK_SHUFFLE_CRATES].Is(RO_SHUFFLE_CRATES_OVERWORLD))) {
                     continue;
                 }
                 // also add to that dungeon's location list.
@@ -224,15 +244,14 @@ void Context::GenerateLocationPool() {
 void Context::AddExcludedOptions() {
     for (auto& loc : StaticData::GetLocationTable()) {
         // Checks of these types don't have items, skip them.
-        if (loc.GetRandomizerCheck() == RC_UNKNOWN_CHECK ||
-            loc.GetRandomizerCheck() == RC_TRIFORCE_COMPLETED || loc.GetRCType() == RCTYPE_CHEST_GAME ||
-            loc.GetRCType() == RCTYPE_STATIC_HINT || loc.GetRCType() == RCTYPE_GOSSIP_STONE) {
+        if (loc.GetRandomizerCheck() == RC_UNKNOWN_CHECK || loc.GetRandomizerCheck() == RC_TRIFORCE_COMPLETED ||
+            loc.GetRCType() == RCTYPE_CHEST_GAME || loc.GetRCType() == RCTYPE_STATIC_HINT ||
+            loc.GetRCType() == RCTYPE_GOSSIP_STONE) {
             continue;
         }
         AddLocation(loc.GetRandomizerCheck(), &everyPossibleLocation);
         bool alreadyAdded = false;
-        for (Option* location : Rando::Settings::GetInstance()->GetExcludeOptionsForArea(loc.GetArea()))
-        {
+        for (Option* location : Rando::Settings::GetInstance()->GetExcludeOptionsForArea(loc.GetArea())) {
             if (location->GetName() == loc.GetExcludedOption()->GetName()) {
                 alreadyAdded = true;
             }
@@ -243,7 +262,8 @@ void Context::AddExcludedOptions() {
     }
 }
 
-std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool, const RandomizerCheckType checkType) {
+std::vector<RandomizerCheck> Context::GetLocations(const std::vector<RandomizerCheck>& locationPool,
+                                                   const RandomizerCheckType checkType) {
     std::vector<RandomizerCheck> locationsOfType;
     for (RandomizerCheck locKey : locationPool) {
         if (StaticData::GetLocation(locKey)->GetRCType() == checkType) {
@@ -282,7 +302,7 @@ void Context::HintReset() {
     for (const RandomizerCheck il : StaticData::GetGossipStoneLocations()) {
         GetItemLocation(il)->ResetVariables();
     }
-    for (Hint& hint : hintTable){
+    for (Hint& hint : hintTable) {
         hint.ResetVariables();
     }
 }
@@ -325,7 +345,8 @@ void Context::SetSpoilerLoaded(const bool spoilerLoaded) {
     mSpoilerLoaded = spoilerLoaded;
 }
 
-GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool checkObtainability, const GetItemID ogItemId) {
+GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool checkObtainability,
+                                      const GetItemID ogItemId) {
     const auto itemLoc = GetItemLocation(rc);
     if (itemLoc->GetPlacedRandomizerGet() == RG_NONE) {
         if (ogItemId != GI_NONE) {
@@ -350,25 +371,8 @@ GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool check
     return giEntry;
 }
 
-std::string sanitize(std::string stringValue) {
-    // Add backslashes.
-    for (auto i = stringValue.begin();;) {
-        auto const pos =
-            std::find_if(i, stringValue.end(), [](char const c) { return '\\' == c || '\'' == c || '"' == c; });
-        if (pos == stringValue.end()) {
-            break;
-        }
-        i = std::next(stringValue.insert(pos, '\\'), 2);
-    }
-
-    // Removes others.
-    std::erase_if(stringValue, [](char const c) { return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; });
-
-    return stringValue;
-}
-
 void Context::ParseSpoiler(const char* spoilerFileName) {
-    std::ifstream spoilerFileStream(sanitize(spoilerFileName));
+    std::ifstream spoilerFileStream(SohUtils::Sanitize(spoilerFileName));
     if (!spoilerFileStream) {
         return;
     }
@@ -377,18 +381,18 @@ void Context::ParseSpoiler(const char* spoilerFileName) {
     try {
         nlohmann::json spoilerFileJson;
         spoilerFileStream >> spoilerFileJson;
+        spoilerFileStream.close();
         ParseHashIconIndexesJson(spoilerFileJson);
         Rando::Settings::GetInstance()->ParseJson(spoilerFileJson);
         ParseItemLocationsJson(spoilerFileJson);
-        ParseHintJson(spoilerFileJson);
+        ParseTricksJson(spoilerFileJson);
         mEntranceShuffler->ParseJson(spoilerFileJson);
+        ParseHintJson(spoilerFileJson);
         mDungeons->ParseJson(spoilerFileJson);
         mTrials->ParseJson(spoilerFileJson);
         mSpoilerLoaded = true;
         mSeedGenerated = false;
-    } catch (...) {
-        LUSLOG_ERROR("Failed to load Spoiler File: %s", spoilerFileName);
-    }
+    } catch (...) { LUSLOG_ERROR("Failed to load Spoiler File: %s", spoilerFileName); }
 }
 
 void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) {
@@ -423,16 +427,16 @@ void Context::ParseItemLocationsJson(nlohmann::json spoilerFileJson) {
     }
 }
 
-void Context::WriteHintJson(nlohmann::ordered_json& spoilerFileJson){
-    for (Hint hint: hintTable){
+void Context::WriteHintJson(nlohmann::ordered_json& spoilerFileJson) {
+    for (Hint hint : hintTable) {
         hint.logHint(spoilerFileJson);
     }
 }
 
-nlohmann::json getValueForMessage(std::unordered_map<std::string, nlohmann::json> map, CustomMessage message){
+nlohmann::json getValueForMessage(std::unordered_map<std::string, nlohmann::json> map, CustomMessage message) {
     std::vector<std::string> strings = message.GetAllMessages();
-    for (uint8_t language = 0; language < LANGUAGE_MAX; language++){
-        if (map.contains(strings[language])){
+    for (uint8_t language = 0; language < LANGUAGE_MAX; language++) {
+        if (map.contains(strings[language])) {
             return strings[language];
         }
     }
@@ -440,17 +444,28 @@ nlohmann::json getValueForMessage(std::unordered_map<std::string, nlohmann::json
 }
 
 void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
-    for (auto hintData : spoilerFileJson["Gossip Stone Hints"].items()){
+    for (auto hintData : spoilerFileJson["Gossip Stone Hints"].items()) {
         RandomizerHint hint = (RandomizerHint)StaticData::hintNameToEnum[hintData.key()];
         AddHint(hint, Hint(hint, hintData.value()));
     }
-    for (auto hintData : spoilerFileJson["Static Hints"].items()){
+    for (auto hintData : spoilerFileJson["Static Hints"].items()) {
         RandomizerHint hint = (RandomizerHint)StaticData::hintNameToEnum[hintData.key()];
         AddHint(hint, Hint(hint, hintData.value()));
     }
     CreateStaticHints();
 }
 
+void Context::ParseTricksJson(nlohmann::json spoilerFileJson) {
+    nlohmann::json enabledTricksJson = spoilerFileJson["enabledTricks"];
+    const auto& settings = Rando::Settings::GetInstance();
+    for (auto it : enabledTricksJson) {
+        int rt = settings->GetRandomizerTrickByName(it);
+        if (rt != -1) {
+            mTrickOptions[rt].Set(RO_GENERIC_ON);
+        }
+    }
+}
+
 std::shared_ptr<EntranceShuffler> Context::GetEntranceShuffler() {
     return mEntranceShuffler;
 }
@@ -506,6 +521,10 @@ RandoOptionLACSCondition Context::LACSCondition() const {
     return mLACSCondition;
 }
 
+void Context::LACSCondition(RandoOptionLACSCondition lacsCondition) {
+    mLACSCondition = lacsCondition;
+}
+
 std::shared_ptr<Kaleido> Context::GetKaleido() {
     if (mKaleido == nullptr) {
         mKaleido = std::make_shared<Kaleido>();
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index bd6bc17358..9689477568 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -14,6 +14,8 @@
 #include <map>
 #include <nlohmann/json.hpp>
 
+#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
+
 /**
  * @brief Singleton for storing and accessing dynamic Randomizer-related data
  *
@@ -53,7 +55,8 @@ class Context {
     void AddLocations(const Container& locations, std::vector<RandomizerCheck>* destination = nullptr);
     bool IsQuestOfLocationActive(RandomizerCheck rc);
     void GenerateLocationPool();
-    static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool, const RandomizerCheckType checkType);
+    static std::vector<RandomizerCheck> GetLocations(const std::vector<RandomizerCheck>& locationPool,
+                                                     const RandomizerCheckType checkType);
     void AddExcludedOptions();
     void LocationReset();
     void ClearItemLocations();
@@ -103,12 +106,22 @@ class Context {
      * @return RandoOptionLACSCondition
      */
     RandoOptionLACSCondition LACSCondition() const;
+
+    /**
+     * @brief Sets the resolved Light Arrow CutScene check condition.
+     * There is no direct option for this, it is inferred based on the value of a few other options.
+     *
+     * @param lacsCondition
+     */
+    void LACSCondition(RandoOptionLACSCondition lacsCondition);
+
     GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE);
     void ParseSpoiler(const char* spoilerFileName);
     void ParseHashIconIndexesJson(nlohmann::json spoilerFileJson);
     void ParseItemLocationsJson(nlohmann::json spoilerFileJson);
     void WriteHintJson(nlohmann::ordered_json& spoilerFileJson);
     void ParseHintJson(nlohmann::json spoilerFileJson);
+    void ParseTricksJson(nlohmann::json spoilerFileJson);
     std::map<RandomizerCheck, ItemOverride> overrides = {};
     std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
     std::vector<RandomizerCheck> everyPossibleLocation = {};
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 0a89e4daeb..b9cc0b10b3 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -11,6 +11,7 @@
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_compass/object_gi_compass.h"
+#include "objects/object_gi_map/object_gi_map.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
 #include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
@@ -39,29 +40,19 @@ extern SaveContext gSaveContext;
 }
 
 const char* SmallBodyCvarValue[10] = {
-    CVAR_COSMETIC("Key.ForestSmallBody.Value"),
-    CVAR_COSMETIC("Key.FireSmallBody.Value"),
-    CVAR_COSMETIC("Key.WaterSmallBody.Value"),
-    CVAR_COSMETIC("Key.SpiritSmallBody.Value"),
-    CVAR_COSMETIC("Key.ShadowSmallBody.Value"),
-    CVAR_COSMETIC("Key.WellSmallBody.Value"),
-    CVAR_COSMETIC("Key.GTGSmallBody.Value"),
-    CVAR_COSMETIC("Key.FortSmallBody.Value"),
-    CVAR_COSMETIC("Key.GanonsSmallBody.Value"),
-    CVAR_COSMETIC("Key.ChestGameSmallBody.Value"),
+    CVAR_COSMETIC("Key.ForestSmallBody.Value"), CVAR_COSMETIC("Key.FireSmallBody.Value"),
+    CVAR_COSMETIC("Key.WaterSmallBody.Value"),  CVAR_COSMETIC("Key.SpiritSmallBody.Value"),
+    CVAR_COSMETIC("Key.ShadowSmallBody.Value"), CVAR_COSMETIC("Key.WellSmallBody.Value"),
+    CVAR_COSMETIC("Key.GTGSmallBody.Value"),    CVAR_COSMETIC("Key.FortSmallBody.Value"),
+    CVAR_COSMETIC("Key.GanonsSmallBody.Value"), CVAR_COSMETIC("Key.ChestGameSmallBody.Value"),
 };
 
 const char* SmallEmblemCvarValue[10] = {
-    CVAR_COSMETIC("Key.ForestSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.FireSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.WaterSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.SpiritSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.ShadowSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.WellSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.GTGSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.FortSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.GanonsSmallEmblem.Value"),
-    CVAR_COSMETIC("Key.ChestGameEmblem.Value"),
+    CVAR_COSMETIC("Key.ForestSmallEmblem.Value"), CVAR_COSMETIC("Key.FireSmallEmblem.Value"),
+    CVAR_COSMETIC("Key.WaterSmallEmblem.Value"),  CVAR_COSMETIC("Key.SpiritSmallEmblem.Value"),
+    CVAR_COSMETIC("Key.ShadowSmallEmblem.Value"), CVAR_COSMETIC("Key.WellSmallEmblem.Value"),
+    CVAR_COSMETIC("Key.GTGSmallEmblem.Value"),    CVAR_COSMETIC("Key.FortSmallEmblem.Value"),
+    CVAR_COSMETIC("Key.GanonsSmallEmblem.Value"), CVAR_COSMETIC("Key.ChestGameEmblem.Value"),
 };
 
 Color_RGB8 SmallEmblemDefaultValue[10] = {
@@ -80,20 +71,15 @@ Color_RGB8 SmallEmblemDefaultValue[10] = {
 extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 
 extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry) {
-    s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 0);
+    s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 1);
     int slot = getItemEntry->drawItemId - RG_FOREST_TEMPLE_SMALL_KEY;
 
     Gfx* customIconDLs[] = {
-        (Gfx*)gSmallKeyIconForestTempleDL,
-        (Gfx*)gSmallKeyIconFireTempleDL,
-        (Gfx*)gSmallKeyIconWaterTempleDL,
-        (Gfx*)gSmallKeyIconSpiritTempleDL,
-        (Gfx*)gSmallKeyIconShadowTempleDL,
-        (Gfx*)gSmallKeyIconBottomoftheWellDL,
-        (Gfx*)gSmallKeyIconGerudoTrainingGroundDL,
-        (Gfx*)gSmallKeyIconGerudoFortressDL,
-        (Gfx*)gSmallKeyIconGanonsCastleDL,
-        (Gfx*)gSmallKeyIconTreasureChestGameDL,
+        (Gfx*)gSmallKeyIconForestTempleDL,         (Gfx*)gSmallKeyIconFireTempleDL,
+        (Gfx*)gSmallKeyIconWaterTempleDL,          (Gfx*)gSmallKeyIconSpiritTempleDL,
+        (Gfx*)gSmallKeyIconShadowTempleDL,         (Gfx*)gSmallKeyIconBottomoftheWellDL,
+        (Gfx*)gSmallKeyIconGerudoTrainingGroundDL, (Gfx*)gSmallKeyIconGerudoFortressDL,
+        (Gfx*)gSmallKeyIconGanonsCastleDL,         (Gfx*)gSmallKeyIconTreasureChestGameDL,
     };
 
     OPEN_DISPS(play->state.gfxCtx);
@@ -116,7 +102,7 @@ extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEn
         emblemColor = CVarGetColor24(SmallEmblemCvarValue[slot], emblemColor);
 
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
+                  G_MTX_MODELVIEW | G_MTX_LOAD);
         gDPSetEnvColor(POLY_XLU_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255);
 
         gSPDisplayList(POLY_XLU_DISP++, customIconDLs[slot]);
@@ -131,15 +117,36 @@ extern "C" void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEn
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" {
-    void GetItem_DrawCompass(PlayState* play, s16 drawId);
-    void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
-    void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
+extern "C" void Randomizer_DrawMap(PlayState* play, GetItemEntry* getItemEntry) {
+    s16 color_slot = getItemEntry->drawItemId - RG_DEKU_TREE_MAP;
+    s16 colors[12][3] = {
+        { 4, 100, 46 },    // Deku Tree
+        { 140, 30, 30 },   // Dodongo's Cavern
+        { 30, 60, 255 },   // Jabu Jabu's Belly
+        { 4, 195, 46 },    // Forest Temple
+        { 237, 95, 95 },   // Fire Temple
+        { 85, 180, 223 },  // Water Temple
+        { 222, 158, 47 },  // Spirit Temple
+        { 126, 16, 177 },  // Shadow Temple
+        { 227, 110, 255 }, // Bottom of the Well
+        { 0, 255, 255 },   // Ice Cavern
+    };
+
+    OPEN_DISPS(play->state.gfxCtx);
+
+    Gfx_SetupDL_25Opa(play->state.gfxCtx);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
+
+    gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiDungeonMapDL);
+
+    CLOSE_DISPS(play->state.gfxCtx);
 }
 
 extern "C" void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEntry) {
-
-    s16 color_slot = getItemEntry->getItemId - RG_DEKU_TREE_COMPASS;
+    s16 color_slot = getItemEntry->drawItemId - RG_DEKU_TREE_COMPASS;
     s16 colors[12][3] = {
         { 4, 100, 46 },    // Deku Tree
         { 140, 30, 30 },   // Dodongo's Cavern
@@ -162,7 +169,8 @@ extern "C" void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEnt
               G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
-    gDPSetEnvColor(POLY_OPA_DISP++, colors[color_slot][0] / 2, colors[color_slot][1] / 2, colors[color_slot][2] / 2, 255);
+    gDPSetEnvColor(POLY_OPA_DISP++, colors[color_slot][0] / 2, colors[color_slot][1] / 2, colors[color_slot][2] / 2,
+                   255);
 
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiCompassDL);
 
@@ -179,21 +187,13 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt
     s16 slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_BOSS_KEY;
 
     std::string CvarValue[6] = {
-        "gCosmetics.Key.ForestBoss",
-        "gCosmetics.Key.FireBoss",
-        "gCosmetics.Key.WaterBoss",
-        "gCosmetics.Key.SpiritBoss",
-        "gCosmetics.Key.ShadowBoss",
-        "gCosmetics.Key.GanonsBoss",
+        "gCosmetics.Key.ForestBoss", "gCosmetics.Key.FireBoss",   "gCosmetics.Key.WaterBoss",
+        "gCosmetics.Key.SpiritBoss", "gCosmetics.Key.ShadowBoss", "gCosmetics.Key.GanonsBoss",
     };
 
     Gfx* CustomdLists[] = {
-        (Gfx*)gBossKeyIconForestTempleDL,
-        (Gfx*)gBossKeyIconFireTempleDL,
-        (Gfx*)gBossKeyIconWaterTempleDL,
-        (Gfx*)gBossKeyIconSpiritTempleDL,
-        (Gfx*)gBossKeyIconShadowTempleDL,
-        (Gfx*)gBossKeyIconGanonsCastleDL,
+        (Gfx*)gBossKeyIconForestTempleDL, (Gfx*)gBossKeyIconFireTempleDL,   (Gfx*)gBossKeyIconWaterTempleDL,
+        (Gfx*)gBossKeyIconSpiritTempleDL, (Gfx*)gBossKeyIconShadowTempleDL, (Gfx*)gBossKeyIconGanonsCastleDL,
     };
 
     OPEN_DISPS(play->state.gfxCtx);
@@ -204,14 +204,14 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt
               G_MTX_MODELVIEW | G_MTX_LOAD);
 
     Color_RGB8 keyColor = { 255, 255, 0 };
-    //Supposed to use CVAR_COSMETIC but I can't figure out the syntax
+    // Supposed to use CVAR_COSMETIC but I can't figure out the syntax
     keyColor = CVarGetColor24((CvarValue[slot] + "Body.Value").c_str(), keyColor);
-    
-    if (isCustomKeysEnabled){
+
+    if (isCustomKeysEnabled) {
         gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255);
         gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gBossKeyCustomDL);
     } else {
-        if (CVarGetInteger((CvarValue[slot] + "Body.Changed").c_str(), false)){
+        if (CVarGetInteger((CvarValue[slot] + "Body.Changed").c_str(), false)) {
             gDPSetGrayscaleColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255);
             gSPGrayscale(POLY_OPA_DISP++, true);
             gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBossKeyDL);
@@ -228,12 +228,12 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt
 
     Color_RGB8 gemColor = { 255, 0, 0 };
     gemColor = CVarGetColor24((CvarValue[slot] + "Gem.Value").c_str(), gemColor);
-    
-    if (isCustomKeysEnabled){
+
+    if (isCustomKeysEnabled) {
         gDPSetEnvColor(POLY_XLU_DISP++, gemColor.r, gemColor.g, gemColor.b, 255);
         gSPDisplayList(POLY_XLU_DISP++, CustomdLists[slot]);
     } else {
-        if (CVarGetInteger((CvarValue[slot] + "Gem.Changed").c_str(), false)){
+        if (CVarGetInteger((CvarValue[slot] + "Gem.Changed").c_str(), false)) {
             gDPSetGrayscaleColor(POLY_XLU_DISP++, gemColor.r, gemColor.g, gemColor.b, 255);
             gSPGrayscale(POLY_XLU_DISP++, true);
             gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL);
@@ -247,61 +247,42 @@ extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEnt
 }
 
 extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry) {
-    s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 0);
+    s8 isCustomKeysEnabled = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), 1);
     int slot = getItemEntry->drawItemId - RG_FOREST_TEMPLE_KEY_RING;
 
     Gfx* CustomIconDLs[] = {
-        (Gfx*)gKeyringIconForestTempleDL,
-        (Gfx*)gKeyringIconFireTempleDL,
-        (Gfx*)gKeyringIconWaterTempleDL,
-        (Gfx*)gKeyringIconSpiritTempleDL,
-        (Gfx*)gKeyringIconShadowTempleDL,
-        (Gfx*)gKeyringIconBottomoftheWellDL,
-        (Gfx*)gKeyringIconGerudoTrainingGroundDL,
-        (Gfx*)gKeyringIconGerudoFortressDL,
-        (Gfx*)gKeyringIconGanonsCastleDL,
-        (Gfx*)gKeyringIconTreasureChestGameDL,
+        (Gfx*)gKeyringIconForestTempleDL,         (Gfx*)gKeyringIconFireTempleDL,
+        (Gfx*)gKeyringIconWaterTempleDL,          (Gfx*)gKeyringIconSpiritTempleDL,
+        (Gfx*)gKeyringIconShadowTempleDL,         (Gfx*)gKeyringIconBottomoftheWellDL,
+        (Gfx*)gKeyringIconGerudoTrainingGroundDL, (Gfx*)gKeyringIconGerudoFortressDL,
+        (Gfx*)gKeyringIconGanonsCastleDL,         (Gfx*)gKeyringIconTreasureChestGameDL,
     };
 
     Gfx* CustomKeysDLs[] = {
-        (Gfx*)gKeyringKeysForestTempleDL,
-        (Gfx*)gKeyringKeysFireTempleDL,
-        (Gfx*)gKeyringKeysWaterTempleDL,
-        (Gfx*)gKeyringKeysSpiritTempleDL,
-        (Gfx*)gKeyringKeysShadowTempleDL,
-        (Gfx*)gKeyringKeysBottomoftheWellDL,
-        (Gfx*)gKeyringKeysGerudoTrainingGroundDL,
-        (Gfx*)gKeyringKeysGerudoFortressDL,
-        (Gfx*)gKeyringKeysGanonsCastleDL,
-        (Gfx*)gKeyringKeysTreasureChestGameDL,
+        (Gfx*)gKeyringKeysForestTempleDL,         (Gfx*)gKeyringKeysFireTempleDL,
+        (Gfx*)gKeyringKeysWaterTempleDL,          (Gfx*)gKeyringKeysSpiritTempleDL,
+        (Gfx*)gKeyringKeysShadowTempleDL,         (Gfx*)gKeyringKeysBottomoftheWellDL,
+        (Gfx*)gKeyringKeysGerudoTrainingGroundDL, (Gfx*)gKeyringKeysGerudoFortressDL,
+        (Gfx*)gKeyringKeysGanonsCastleDL,         (Gfx*)gKeyringKeysTreasureChestGameDL,
     };
 
     Gfx* CustomKeysMQDLs[] = {
-        (Gfx*)gKeyringKeysForestTempleMQDL,
-        (Gfx*)gKeyringKeysFireTempleMQDL,
-        (Gfx*)gKeyringKeysWaterTempleMQDL,
-        (Gfx*)gKeyringKeysSpiritTempleMQDL,
-        (Gfx*)gKeyringKeysShadowTempleMQDL,
-        (Gfx*)gKeyringKeysBottomoftheWellMQDL,
-        (Gfx*)gKeyringKeysGerudoTrainingGroundMQDL,
-        (Gfx*)gKeyringKeysGerudoFortressDL,
-        (Gfx*)gKeyringKeysGanonsCastleMQDL,
-        (Gfx*)gKeyringKeysTreasureChestGameDL,
+        (Gfx*)gKeyringKeysForestTempleMQDL,         (Gfx*)gKeyringKeysFireTempleMQDL,
+        (Gfx*)gKeyringKeysWaterTempleMQDL,          (Gfx*)gKeyringKeysSpiritTempleMQDL,
+        (Gfx*)gKeyringKeysShadowTempleMQDL,         (Gfx*)gKeyringKeysBottomoftheWellMQDL,
+        (Gfx*)gKeyringKeysGerudoTrainingGroundMQDL, (Gfx*)gKeyringKeysGerudoFortressDL,
+        (Gfx*)gKeyringKeysGanonsCastleMQDL,         (Gfx*)gKeyringKeysTreasureChestGameDL,
     };
 
-    //RANDOTODO make DungeonInfo static and vanilla accessible to allow all these key model data vars to be stored there.
-    //(Rando::DungeonKey)0 means the keyring is not tied to a dungeon and should not be checked for an MQ variant
+    // RANDOTODO make DungeonInfo static and vanilla accessible to allow all these key model data vars to be stored
+    // there. (Rando::DungeonKey)0 means the keyring is not tied to a dungeon and should not be checked for an MQ
+    // variant
     Rando::DungeonKey SlotToDungeon[10] = {
-        Rando::FOREST_TEMPLE,
-        Rando::FIRE_TEMPLE,
-        Rando::WATER_TEMPLE,
-        Rando::SPIRIT_TEMPLE,
-        Rando::SHADOW_TEMPLE,
-        Rando::BOTTOM_OF_THE_WELL,
-        Rando::GERUDO_TRAINING_GROUND,
-        (Rando::DungeonKey)0, //Gerudo Fortress
+        Rando::FOREST_TEMPLE, Rando::FIRE_TEMPLE,        Rando::WATER_TEMPLE,           Rando::SPIRIT_TEMPLE,
+        Rando::SHADOW_TEMPLE, Rando::BOTTOM_OF_THE_WELL, Rando::GERUDO_TRAINING_GROUND,
+        (Rando::DungeonKey)0, // Gerudo Fortress
         Rando::GANONS_CASTLE,
-        (Rando::DungeonKey)0, //Treasure Chest Game
+        (Rando::DungeonKey)0, // Treasure Chest Game
     };
 
     OPEN_DISPS(play->state.gfxCtx);
@@ -313,12 +294,12 @@ extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEnt
 
     if (isCustomKeysEnabled) {
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-            G_MTX_MODELVIEW | G_MTX_LOAD);
+                  G_MTX_MODELVIEW | G_MTX_LOAD);
 
         gDPSetEnvColor(POLY_OPA_DISP++, keyColor.r, keyColor.g, keyColor.b, 255);
-        if (SlotToDungeon[slot] != 0 && Rando::Context::GetInstance()->GetDungeon(SlotToDungeon[slot])->IsMQ()){
+        if (SlotToDungeon[slot] != 0 && Rando::Context::GetInstance()->GetDungeon(SlotToDungeon[slot])->IsMQ()) {
             gSPDisplayList(POLY_OPA_DISP++, (Gfx*)CustomKeysMQDLs[slot]);
-        } else  {
+        } else {
             gSPDisplayList(POLY_OPA_DISP++, (Gfx*)CustomKeysDLs[slot]);
         }
 
@@ -332,7 +313,7 @@ extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEnt
 
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-            G_MTX_MODELVIEW | G_MTX_LOAD);
+                  G_MTX_MODELVIEW | G_MTX_LOAD);
         gDPSetEnvColor(POLY_OPA_DISP++, emblemColor.r, emblemColor.g, emblemColor.b, 255);
 
         gSPDisplayList(POLY_OPA_DISP++, CustomIconDLs[slot]);
@@ -351,7 +332,7 @@ extern "C" void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEnt
         Matrix_RotateZ(-(0.20f * 2), MTXMODE_APPLY);
         for (int i = 0; i < 5; i++) {
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-                    G_MTX_MODELVIEW | G_MTX_LOAD);
+                      G_MTX_MODELVIEW | G_MTX_LOAD);
             Matrix_Translate(3.12f, -0.34f, 17.53f, MTXMODE_APPLY);
             Matrix_RotateX(-0.31f, MTXMODE_APPLY);
             Matrix_RotateY(0.19f, MTXMODE_APPLY);
@@ -368,8 +349,9 @@ extern "C" void Randomizer_DrawDoubleDefense(PlayState* play, GetItemEntry* getI
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-   
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gDPSetGrayscaleColor(POLY_XLU_DISP++, 255, 255, 255, 255);
     gSPGrayscale(POLY_XLU_DISP++, true);
@@ -390,8 +372,8 @@ extern "C" void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getIte
 
     gSPSegment(POLY_OPA_DISP++, 0x08,
                (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32));
+                                           0 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 1),
+                                           0 * (play->state.frames * 1), 32, 32));
 
     Matrix_Scale(0.05f, 0.05f, 0.05f, MTXMODE_APPLY);
     Matrix_RotateZ(2.1f, MTXMODE_APPLY);
@@ -400,7 +382,7 @@ extern "C" void Randomizer_DrawMasterSword(PlayState* play, GetItemEntry* getIte
               G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)object_toki_objects_DL_001BD0);
-    
+
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
@@ -463,7 +445,7 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
         } else if (triforcePieceScale < 0.035f) {
             triforcePieceScale += 0.0005f;
         }
-    } else if (triforcePieceScale > 0.00008f && triforcePieceScale < 0.035f) { 
+    } else if (triforcePieceScale > 0.00008f && triforcePieceScale < 0.035f) {
         triforcePieceScale += 0.0005f;
     }
 
@@ -485,7 +467,7 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItemEntry) {
+extern "C" void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry* getItemEntry) {
     Color_RGB8 color = { 0, 60, 100 };
     if (CVarGetInteger(CVAR_COSMETIC("World.MysteryItem.Changed"), 0)) {
         color = CVarGetColor24(CVAR_COSMETIC("World.MysteryItem.Value"), color);
@@ -495,7 +477,8 @@ extern "C" void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItem
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gDPSetGrayscaleColor(POLY_XLU_DISP++, color.r, color.g, color.b, 255);
     gSPGrayscale(POLY_XLU_DISP++, true);
@@ -600,7 +583,8 @@ extern "C" void DrawKingDodongo(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" s32 OverrideLimbDrawBarinade(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+extern "C" s32 OverrideLimbDrawBarinade(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                        void* thisx) {
     OPEN_DISPS(play->state.gfxCtx);
 
     s16 unk_1AC = play->gameplayFrames * 0xC31;
@@ -613,7 +597,7 @@ extern "C" s32 OverrideLimbDrawBarinade(PlayState* play, s32 limbIndex, Gfx** dL
                    (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 8, 16, 1, 0,
                                                (play->gameplayFrames * -2) % 64, 16, 16));
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 200);
-        Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY);
+        Matrix_RotateX(-M_PIf / 2.0f, MTXMODE_APPLY);
     } else if ((limbIndex >= 10) && (limbIndex < 20)) {
         rot->x -= 0x4000;
         *dList = NULL;
@@ -841,7 +825,8 @@ extern "C" void DrawBongoBongo(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" s32 OverrideLimbDrawKotake(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+extern "C" s32 OverrideLimbDrawKotake(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                      void* thisx) {
     if (limbIndex == 21) { // Head
         *dList = (Gfx*)gTwinrovaKotakeHeadDL;
     }
@@ -952,18 +937,18 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
     } else {
         slot = getItemEntry->drawItemId - RG_GOHMA_SOUL;
     }
-    
+
     s16 flameColors[9][3] = {
         { 0, 255, 0 },     // Gohma
         { 255, 0, 100 },   // King Dodongo
-        { 50, 255, 255},   // Barinade
+        { 50, 255, 255 },  // Barinade
         { 4, 195, 46 },    // Phantom Ganon
         { 237, 95, 95 },   // Volvagia
         { 85, 180, 223 },  // Morpha
         { 126, 16, 177 },  // Bongo Bongo
         { 222, 158, 47 },  // Twinrova
         { 150, 150, 150 }, // Ganon/Dorf
-    }; 
+    };
 
     // Draw the blue fire DL but coloured to the boss soul.
     OPEN_DISPS(play->state.gfxCtx);
@@ -997,7 +982,7 @@ extern "C" void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEn
         }
         gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL);
         CLOSE_DISPS(play->state.gfxCtx);
-    // Draw the boss' skeleton
+        // Draw the boss' skeleton
     } else {
         switch (slot) {
             case 0: // Gohma
@@ -1065,26 +1050,20 @@ extern "C" void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getI
     s16 slot = getItemEntry->drawItemId - RG_OCARINA_A_BUTTON;
 
     Gfx* dLists[] = {
-        (Gfx*)gOcarinaAButtonDL,
-        (Gfx*)gOcarinaCUpButtonDL,
-        (Gfx*)gOcarinaCDownButtonDL,
-        (Gfx*)gOcarinaCLeftButtonDL,
-        (Gfx*)gOcarinaCRightButtonDL,
+        (Gfx*)gOcarinaAButtonDL,     (Gfx*)gOcarinaCUpButtonDL,    (Gfx*)gOcarinaCDownButtonDL,
+        (Gfx*)gOcarinaCLeftButtonDL, (Gfx*)gOcarinaCRightButtonDL,
     };
 
     Color_RGB8 colors[] = {
-        aButtonColor,
-        cUpButtonColor,
-        cDownButtonColor,
-        cLeftButtonColor,
-        cRightButtonColor,
+        aButtonColor, cUpButtonColor, cDownButtonColor, cLeftButtonColor, cRightButtonColor,
     };
 
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot].r, colors[slot].g, colors[slot].b, 255);
     gSPGrayscale(POLY_XLU_DISP++, true);
@@ -1116,11 +1095,12 @@ extern "C" void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getIte
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 0x08,
-                (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2),
-                                -1 * (play->state.frames * 2), 64, 64, 1, 1 * (play->state.frames * 4),
-                                1 * -(play->state.frames * 4), 32, 32));
+               (uintptr_t)Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2),
+                                           -1 * (play->state.frames * 2), 64, 64, 1, 1 * (play->state.frames * 4),
+                                           -1 * (play->state.frames * 4), 32, 32));
 
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
 
     gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBronzeScaleColorDL);
     gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiScaleDL);
@@ -1136,7 +1116,7 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
 
     // Draw rod
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    Matrix_Scale(0.2, 0.2, 0.2, MTXMODE_APPLY);
+    Matrix_Scale(0.2f, 0.2f, 0.2f, MTXMODE_APPLY);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingPoleGiDL);
@@ -1146,8 +1126,8 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
     Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY);
     pos = { 0.0f, -25.5f, -4.0f };
     Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_APPLY);
-    Matrix_RotateZ(-M_PI_2, MTXMODE_APPLY);
-    Matrix_RotateY(-M_PI_2 - 0.2f, MTXMODE_APPLY);
+    Matrix_RotateZ(-M_PI_2f, MTXMODE_APPLY);
+    Matrix_RotateY(-M_PI_2f - 0.2f, MTXMODE_APPLY);
     Matrix_Scale(0.006f, 0.006f, 0.006f, MTXMODE_APPLY);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
@@ -1160,7 +1140,7 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
-    Matrix_RotateZ(M_PI_2, MTXMODE_APPLY);
+    Matrix_RotateZ(M_PI_2f, MTXMODE_APPLY);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
@@ -1169,7 +1149,7 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
-    Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
+    Matrix_RotateZ(M_PIf / 2.0f, MTXMODE_APPLY);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL);
@@ -1179,7 +1159,6 @@ extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getI
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-
 extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry) {
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -1196,7 +1175,7 @@ extern "C" void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getIte
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-extern "C" void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry){
+extern "C" void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_26Opa(play->state.gfxCtx);
@@ -1218,13 +1197,13 @@ extern "C" void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItem
 }
 
 extern "C" void Randomizer_DrawBombchuBagInLogic(PlayState* play, GetItemEntry* getItemEntry) {
-    if(IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOMBCHU_BAG)){
+    if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOMBCHU_BAG)) {
         Randomizer_DrawBombchuBag(play, getItemEntry);
     } else {
         OPEN_DISPS(play->state.gfxCtx);
         Gfx_SetupDL_26Opa(play->state.gfxCtx);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+                  G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiBombchuDL);
         CLOSE_DISPS(play->state.gfxCtx);
     }
diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h
index 3fc5c86b4f..8483a7bf96 100644
--- a/soh/soh/Enhancements/randomizer/draw.h
+++ b/soh/soh/Enhancements/randomizer/draw.h
@@ -10,6 +10,7 @@ typedef struct PlayState PlayState;
 extern "C" {
 #endif
 void Randomizer_DrawSmallKey(PlayState* play, GetItemEntry* getItemEntry);
+void Randomizer_DrawMap(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawCompass(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry);
@@ -22,13 +23,16 @@ void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry);
-void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry getItemEntry);
+void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBombchuBagInLogic(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawOverworldKey(PlayState* play, GetItemEntry* getItemEntry);
 
-#define GET_ITEM_MYSTERY \
-    { ITEM_NONE_FE, 0, 0, 0, 0, MOD_RANDOMIZER, MOD_RANDOMIZER, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, ITEM_NONE_FE, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem }
+#define GET_ITEM_MYSTERY                                                                                 \
+    {                                                                                                    \
+        ITEM_NONE_FE, 0, 0, 0, 0, MOD_RANDOMIZER, MOD_RANDOMIZER, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, \
+            ITEM_CATEGORY_JUNK, ITEM_NONE_FE, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem \
+    }
 #ifdef __cplusplus
 };
 #endif
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
index 8b749faf81..1eb88ed73a 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.cpp
+++ b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -6,15 +6,16 @@
 
 namespace Rando {
 DungeonInfo::DungeonInfo(std::string name_, const RandomizerHintTextKey hintKey_, const RandomizerGet map_,
-    const RandomizerGet compass_, const RandomizerGet smallKey_, const RandomizerGet keyRing_,
-    const RandomizerGet bossKey_, RandomizerArea area_, const uint8_t vanillaKeyCount_, const uint8_t mqKeyCount_,
-    const RandomizerSettingKey mqSetting_)
+                         const RandomizerGet compass_, const RandomizerGet smallKey_, const RandomizerGet keyRing_,
+                         const RandomizerGet bossKey_, RandomizerArea area_, const uint8_t vanillaKeyCount_,
+                         const uint8_t mqKeyCount_, const RandomizerSettingKey mqSetting_)
     : name(std::move(name_)), hintKey(hintKey_), map(map_), compass(compass_), smallKey(smallKey_), keyRing(keyRing_),
       bossKey(bossKey_), area(area_), vanillaKeyCount(vanillaKeyCount_), mqKeyCount(mqKeyCount_),
       mqSetting(mqSetting_) {
 }
-DungeonInfo::DungeonInfo() : hintKey(RHT_NONE), map(RG_NONE), compass(RG_NONE), smallKey(RG_NONE), keyRing(RG_NONE),
-    bossKey(RG_NONE) {}
+DungeonInfo::DungeonInfo()
+    : hintKey(RHT_NONE), map(RG_NONE), compass(RG_NONE), smallKey(RG_NONE), keyRing(RG_NONE), bossKey(RG_NONE) {
+}
 DungeonInfo::~DungeonInfo() = default;
 
 const std::string& DungeonInfo::GetName() const {
@@ -145,35 +146,38 @@ std::vector<RandomizerCheck> DungeonInfo::GetDungeonLocations() const {
 }
 
 Dungeons::Dungeons() {
-    dungeonList[DEKU_TREE] =
-        DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DEKU_TREE, 0, 0, RSK_MQ_DEKU_TREE);
-    dungeonList[DODONGOS_CAVERN] = DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP,
-                                               RG_DODONGOS_CAVERN_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_DODONGOS_CAVERN, 0, 0, RSK_MQ_DODONGOS_CAVERN);
-    dungeonList[JABU_JABUS_BELLY] = DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP,
-                                                RG_JABU_JABUS_BELLY_COMPASS, RG_NONE, RG_NONE, RG_NONE, RA_JABU_JABUS_BELLY, 0, 0, RSK_MQ_JABU_JABU);
-    dungeonList[FOREST_TEMPLE] =
-        DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
-                    RG_FOREST_TEMPLE_SMALL_KEY, RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, RA_FOREST_TEMPLE, 5, 6, RSK_MQ_FOREST_TEMPLE);
-    dungeonList[FIRE_TEMPLE] =
-        DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
-                    RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY, RA_FIRE_TEMPLE, 8, 5, RSK_MQ_FIRE_TEMPLE);
-    dungeonList[WATER_TEMPLE] =
-        DungeonInfo("Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS,
-                    RG_WATER_TEMPLE_SMALL_KEY, RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, RA_WATER_TEMPLE, 6, 2, RSK_MQ_WATER_TEMPLE);
-    dungeonList[SPIRIT_TEMPLE] =
-        DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS,
-                    RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, RA_SPIRIT_TEMPLE, 5, 7, RSK_MQ_SPIRIT_TEMPLE);
-    dungeonList[SHADOW_TEMPLE] =
-        DungeonInfo("Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS,
-                    RG_SHADOW_TEMPLE_SMALL_KEY, RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, RA_SHADOW_TEMPLE, 5, 6, RSK_MQ_SHADOW_TEMPLE);
-    dungeonList[BOTTOM_OF_THE_WELL] = DungeonInfo(
-        "Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP, RG_BOTTOM_OF_THE_WELL_COMPASS,
-        RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING, RG_NONE, RA_BOTTOM_OF_THE_WELL, 3, 2, RSK_MQ_BOTTOM_OF_THE_WELL);
+    dungeonList[DEKU_TREE] = DungeonInfo("Deku Tree", RHT_DEKU_TREE, RG_DEKU_TREE_MAP, RG_DEKU_TREE_COMPASS, RG_NONE,
+                                         RG_NONE, RG_NONE, RA_DEKU_TREE, 0, 0, RSK_MQ_DEKU_TREE);
+    dungeonList[DODONGOS_CAVERN] =
+        DungeonInfo("Dodongo's Cavern", RHT_DODONGOS_CAVERN, RG_DODONGOS_CAVERN_MAP, RG_DODONGOS_CAVERN_COMPASS,
+                    RG_NONE, RG_NONE, RG_NONE, RA_DODONGOS_CAVERN, 0, 0, RSK_MQ_DODONGOS_CAVERN);
+    dungeonList[JABU_JABUS_BELLY] =
+        DungeonInfo("Jabu Jabu's Belly", RHT_JABU_JABUS_BELLY, RG_JABU_JABUS_BELLY_MAP, RG_JABU_JABUS_BELLY_COMPASS,
+                    RG_NONE, RG_NONE, RG_NONE, RA_JABU_JABUS_BELLY, 0, 0, RSK_MQ_JABU_JABU);
+    dungeonList[FOREST_TEMPLE] = DungeonInfo(
+        "Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS, RG_FOREST_TEMPLE_SMALL_KEY,
+        RG_FOREST_TEMPLE_KEY_RING, RG_FOREST_TEMPLE_BOSS_KEY, RA_FOREST_TEMPLE, 5, 6, RSK_MQ_FOREST_TEMPLE);
+    dungeonList[FIRE_TEMPLE] = DungeonInfo("Fire Temple", RHT_FIRE_TEMPLE, RG_FIRE_TEMPLE_MAP, RG_FIRE_TEMPLE_COMPASS,
+                                           RG_FIRE_TEMPLE_SMALL_KEY, RG_FIRE_TEMPLE_KEY_RING, RG_FIRE_TEMPLE_BOSS_KEY,
+                                           RA_FIRE_TEMPLE, 8, 5, RSK_MQ_FIRE_TEMPLE);
+    dungeonList[WATER_TEMPLE] = DungeonInfo(
+        "Water Temple", RHT_WATER_TEMPLE, RG_WATER_TEMPLE_MAP, RG_WATER_TEMPLE_COMPASS, RG_WATER_TEMPLE_SMALL_KEY,
+        RG_WATER_TEMPLE_KEY_RING, RG_WATER_TEMPLE_BOSS_KEY, RA_WATER_TEMPLE, 6, 2, RSK_MQ_WATER_TEMPLE);
+    dungeonList[SPIRIT_TEMPLE] = DungeonInfo(
+        "Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS, RG_SPIRIT_TEMPLE_SMALL_KEY,
+        RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, RA_SPIRIT_TEMPLE, 5, 7, RSK_MQ_SPIRIT_TEMPLE);
+    dungeonList[SHADOW_TEMPLE] = DungeonInfo(
+        "Shadow Temple", RHT_SHADOW_TEMPLE, RG_SHADOW_TEMPLE_MAP, RG_SHADOW_TEMPLE_COMPASS, RG_SHADOW_TEMPLE_SMALL_KEY,
+        RG_SHADOW_TEMPLE_KEY_RING, RG_SHADOW_TEMPLE_BOSS_KEY, RA_SHADOW_TEMPLE, 5, 6, RSK_MQ_SHADOW_TEMPLE);
+    dungeonList[BOTTOM_OF_THE_WELL] =
+        DungeonInfo("Bottom of the Well", RHT_BOTTOM_OF_THE_WELL, RG_BOTTOM_OF_THE_WELL_MAP,
+                    RG_BOTTOM_OF_THE_WELL_COMPASS, RG_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_KEY_RING,
+                    RG_NONE, RA_BOTTOM_OF_THE_WELL, 3, 2, RSK_MQ_BOTTOM_OF_THE_WELL);
     dungeonList[ICE_CAVERN] = DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS,
                                           RG_NONE, RG_NONE, RG_NONE, RA_ICE_CAVERN, 0, 0, RSK_MQ_ICE_CAVERN);
-    dungeonList[GERUDO_TRAINING_GROUND] =
-        DungeonInfo("Gerudo Training Ground", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE,
-                    RG_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_KEY_RING, RG_NONE, RA_GERUDO_TRAINING_GROUND, 9, 3, RSK_MQ_GTG);
+    dungeonList[GERUDO_TRAINING_GROUND] = DungeonInfo(
+        "Gerudo Training Ground", RHT_GERUDO_TRAINING_GROUND, RG_NONE, RG_NONE, RG_GERUDO_TRAINING_GROUND_SMALL_KEY,
+        RG_GERUDO_TRAINING_GROUND_KEY_RING, RG_NONE, RA_GERUDO_TRAINING_GROUND, 9, 3, RSK_MQ_GTG);
     dungeonList[GANONS_CASTLE] =
         DungeonInfo("Ganon's Castle", RHT_GANONS_CASTLE, RG_NONE, RG_NONE, RG_GANONS_CASTLE_SMALL_KEY,
                     RG_GANONS_CASTLE_KEY_RING, RG_GANONS_CASTLE_BOSS_KEY, RA_GANONS_CASTLE, 2, 3, RSK_MQ_GANONS_CASTLE);
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
index 5d26036eb3..ba81d289d6 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.h
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -11,7 +11,7 @@ namespace Rando {
 class DungeonInfo {
   public:
     DungeonInfo(std::string name_, RandomizerHintTextKey hintKey_, RandomizerGet map_, RandomizerGet compass_,
-                RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, RandomizerArea area_, 
+                RandomizerGet smallKey_, RandomizerGet keyRing_, RandomizerGet bossKey_, RandomizerArea area_,
                 uint8_t vanillaKeyCount_, uint8_t mqKeyCount_, RandomizerSettingKey mqSetting_);
     DungeonInfo();
     ~DungeonInfo();
@@ -86,11 +86,12 @@ class Dungeons {
     /// this new array can be shuffled for the purposes of randomizing MQ dungeons.
     /// If you want an individual DungeonInfo entry you should use the GetDungeon
     /// function from either here or the Context class.
-    /// @return 
+    /// @return
     std::array<DungeonInfo*, 12> GetDungeonList();
     size_t GetDungeonListSize() const;
     void ParseJson(nlohmann::json spoilerFileJson);
+
   private:
     std::array<DungeonInfo, 12> dungeonList;
 };
-}
\ No newline at end of file
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp
index 81afbf33c3..00a7a5adbf 100644
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@@ -11,7 +11,8 @@ namespace Rando {
 EntranceLinkInfo NO_RETURN_ENTRANCE = { EntranceType::None, RR_NONE, RR_NONE, -1 };
 
 Entrance::Entrance(RandomizerRegion connectedRegion_, ConditionFn condition_function_, bool spreadsAreasWithPriority_)
-    : connectedRegion(connectedRegion_), condition_function(condition_function_),  spreadsAreasWithPriority(spreadsAreasWithPriority_){
+    : connectedRegion(connectedRegion_), condition_function(condition_function_),
+      spreadsAreasWithPriority(spreadsAreasWithPriority_) {
     originalConnectedRegion = connectedRegion_;
 }
 
@@ -20,11 +21,11 @@ void Entrance::SetCondition(ConditionFn newCondition) {
 }
 
 bool Entrance::GetConditionsMet() const {
-  auto ctx = Rando::Context::GetInstance();
-  if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
-    return condition_function();
-  }
-  return true;
+    auto ctx = Rando::Context::GetInstance();
+    if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
+        return condition_function();
+    }
+    return true;
 }
 
 std::string Entrance::to_string() const {
@@ -60,24 +61,24 @@ void Entrance::printAgeTimeAccess() {
 }
 
 bool Entrance::ConditionsMet(bool allAgeTimes) const {
-  auto ctx = Rando::Context::GetInstance();
-  StartPerformanceTimer(PT_ENTRANCE_LOGIC);
-  Region* parent = RegionTable(parentRegion);
-  int conditionsMet = 0;
+    auto ctx = Rando::Context::GetInstance();
+    StartPerformanceTimer(PT_ENTRANCE_LOGIC);
+    Region* parent = RegionTable(parentRegion);
+    int conditionsMet = 0;
 
-  if (allAgeTimes && !parent->AllAccess()) {
-      StopPerformanceTimer(PT_ENTRANCE_LOGIC);
-      return false;
-  }
+    if (allAgeTimes && !parent->AllAccess()) {
+        StopPerformanceTimer(PT_ENTRANCE_LOGIC);
+        return false;
+    }
 
-  // check all possible day/night condition combinations
-  conditionsMet = (parent->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay, allAgeTimes)) +
-                  (parent->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight, allAgeTimes)) +
-                  (parent->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay, allAgeTimes)) +
-                  (parent->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight, allAgeTimes));
+    // check all possible day/night condition combinations
+    conditionsMet = (parent->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay, allAgeTimes)) +
+                    (parent->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight, allAgeTimes)) +
+                    (parent->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay, allAgeTimes)) +
+                    (parent->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight, allAgeTimes));
 
-  StopPerformanceTimer(PT_ENTRANCE_LOGIC);
-  return conditionsMet && (!allAgeTimes || conditionsMet == 4);
+    StopPerformanceTimer(PT_ENTRANCE_LOGIC);
+    return conditionsMet && (!allAgeTimes || conditionsMet == 4);
 }
 
 uint32_t Entrance::Getuint32_t() const {
@@ -227,13 +228,13 @@ Entrance* Entrance::AssumeReachable() {
     return assumed;
 }
 
-bool Entrance::DoesSpreadAreas(){
-  return spreadsAreasWithPriority;
+bool Entrance::DoesSpreadAreas() {
+    return spreadsAreasWithPriority;
 }
 
 EntranceShuffler::EntranceShuffler() {
-  playthroughEntrances = {};
-  entranceOverrides = {};
+    playthroughEntrances = {};
+    entranceOverrides = {};
 }
 
 bool EntranceShuffler::HasNoRandomEntrances() {
@@ -249,7 +250,319 @@ std::string EntranceNameByRegions(RandomizerRegion parentRegion, RandomizerRegio
     return RegionTable(parentRegion)->regionName + " -> " + RegionTable(connectedRegion)->regionName;
 }
 
-void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
+std::unordered_map<int16_t, Entrance*> entranceMap;
+
+void SetAllEntrancesData() {
+    std::vector<EntranceInfoPair> entranceShuffleTable = {
+        // clang-format off
+        // Type                         Parent Region                        Connected Region                      Index
+        { { EntranceType::Dungeon,      RR_KF_OUTSIDE_DEKU_TREE,             RR_DEKU_TREE_ENTRYWAY,                ENTR_DEKU_TREE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_DEKU_TREE_ENTRYWAY,               RR_KF_OUTSIDE_DEKU_TREE,              ENTR_KOKIRI_FOREST_OUTSIDE_DEKU_TREE } },
+        { { EntranceType::Dungeon,      RR_DEATH_MOUNTAIN_TRAIL,             RR_DODONGOS_CAVERN_ENTRYWAY,          ENTR_DODONGOS_CAVERN_ENTRANCE },
+          { EntranceType::Dungeon,      RR_DODONGOS_CAVERN_ENTRYWAY,         RR_DEATH_MOUNTAIN_TRAIL,              ENTR_DEATH_MOUNTAIN_TRAIL_OUTSIDE_DODONGOS_CAVERN } },
+        { { EntranceType::Dungeon,      RR_ZORAS_FOUNTAIN,                   RR_JABU_JABUS_BELLY_ENTRYWAY,         ENTR_JABU_JABU_ENTRANCE },
+          { EntranceType::Dungeon,      RR_JABU_JABUS_BELLY_ENTRYWAY,        RR_ZORAS_FOUNTAIN,                    ENTR_ZORAS_FOUNTAIN_OUTSIDE_JABU_JABU } },
+        { { EntranceType::Dungeon,      RR_SACRED_FOREST_MEADOW,             RR_FOREST_TEMPLE_ENTRYWAY,            ENTR_FOREST_TEMPLE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_FOREST_TEMPLE_ENTRYWAY,           RR_SACRED_FOREST_MEADOW,              ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE } },
+        { { EntranceType::Dungeon,      RR_DMC_CENTRAL_LOCAL,                RR_FIRE_TEMPLE_ENTRYWAY,              ENTR_FIRE_TEMPLE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_FIRE_TEMPLE_ENTRYWAY,             RR_DMC_CENTRAL_LOCAL,                 ENTR_DEATH_MOUNTAIN_CRATER_OUTSIDE_TEMPLE } },
+        { { EntranceType::Dungeon,      RR_LH_FROM_WATER_TEMPLE,             RR_WATER_TEMPLE_ENTRYWAY,             ENTR_WATER_TEMPLE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_WATER_TEMPLE_ENTRYWAY,            RR_LH_FROM_WATER_TEMPLE,              ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE } },
+        { { EntranceType::Dungeon,      RR_DESERT_COLOSSUS,                  RR_SPIRIT_TEMPLE_ENTRYWAY,            ENTR_SPIRIT_TEMPLE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_SPIRIT_TEMPLE_ENTRYWAY,           RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE,    ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE } },
+        { { EntranceType::Dungeon,      RR_GRAVEYARD_WARP_PAD_REGION,        RR_SHADOW_TEMPLE_ENTRYWAY,            ENTR_SHADOW_TEMPLE_ENTRANCE },
+          { EntranceType::Dungeon,      RR_SHADOW_TEMPLE_ENTRYWAY,           RR_GRAVEYARD_WARP_PAD_REGION,         ENTR_GRAVEYARD_OUTSIDE_TEMPLE } },
+        { { EntranceType::Dungeon,      RR_KAK_WELL,                         RR_BOTTOM_OF_THE_WELL_ENTRYWAY,       ENTR_BOTTOM_OF_THE_WELL_ENTRANCE },
+          { EntranceType::Dungeon,      RR_BOTTOM_OF_THE_WELL_ENTRYWAY,      RR_KAK_WELL,                          ENTR_KAKARIKO_VILLAGE_OUTSIDE_BOTTOM_OF_THE_WELL } },
+        { { EntranceType::Dungeon,      RR_ZF_LEDGE,                         RR_ICE_CAVERN_ENTRYWAY,               ENTR_ICE_CAVERN_ENTRANCE },
+          { EntranceType::Dungeon,      RR_ICE_CAVERN_ENTRYWAY,              RR_ZF_LEDGE,                          ENTR_ZORAS_FOUNTAIN_OUTSIDE_ICE_CAVERN } },
+        { { EntranceType::Dungeon,      RR_GF_OUTSIDE_GTG,                   RR_GERUDO_TRAINING_GROUND_ENTRYWAY,   ENTR_GERUDO_TRAINING_GROUND_ENTRANCE },
+          { EntranceType::Dungeon,      RR_GERUDO_TRAINING_GROUND_ENTRYWAY,  RR_GF_OUTSIDE_GTG,                    ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND } },
+        { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE,              RR_GANONS_CASTLE_ENTRYWAY,            ENTR_INSIDE_GANONS_CASTLE_ENTRANCE },
+          { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY,           RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT } },
+        
+        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_MIDOS_HOUSE,                ENTR_MIDOS_HOUSE_0 },
+          { EntranceType::Interior, RR_KF_MIDOS_HOUSE,                RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_MIDOS_HOUSE } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_SARIAS_HOUSE,               ENTR_SARIAS_HOUSE_0 },
+          { EntranceType::Interior, RR_KF_SARIAS_HOUSE,               RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_SARIAS_HOUSE } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_HOUSE_OF_TWINS,             ENTR_TWINS_HOUSE_0 },
+          { EntranceType::Interior, RR_KF_HOUSE_OF_TWINS,             RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_TWINS_HOUSE } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_KNOW_IT_ALL_HOUSE,          ENTR_KNOW_IT_ALL_BROS_HOUSE_0 },
+          { EntranceType::Interior, RR_KF_KNOW_IT_ALL_HOUSE,          RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_KNOW_IT_ALL_HOUSE } },
+        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_KOKIRI_SHOP,                ENTR_KOKIRI_SHOP_0 },
+          { EntranceType::Interior, RR_KF_KOKIRI_SHOP,                RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_SHOP } },
+        { { EntranceType::Interior, RR_LAKE_HYLIA,                    RR_LH_LAB,                        ENTR_LAKESIDE_LABORATORY_0 },
+          { EntranceType::Interior, RR_LH_LAB,                        RR_LAKE_HYLIA,                    ENTR_LAKE_HYLIA_OUTSIDE_LAB } },
+        { { EntranceType::Interior, RR_LH_FISHING_ISLAND,             RR_LH_FISHING_POND,               ENTR_FISHING_POND_0 },
+          { EntranceType::Interior, RR_LH_FISHING_POND,               RR_LH_FISHING_ISLAND,             ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND } },
+        { { EntranceType::Interior, RR_GV_FORTRESS_SIDE,              RR_GV_CARPENTER_TENT,             ENTR_CARPENTERS_TENT_0 },
+          { EntranceType::Interior, RR_GV_CARPENTER_TENT,             RR_GV_FORTRESS_SIDE,              ENTR_GERUDO_VALLEY_OUTSIDE_TENT } },
+        { { EntranceType::Interior, RR_MARKET_ENTRANCE,               RR_MARKET_GUARD_HOUSE,            ENTR_MARKET_GUARD_HOUSE_0 },
+          { EntranceType::Interior, RR_MARKET_GUARD_HOUSE,            RR_MARKET_ENTRANCE,               ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_MASK_SHOP,              ENTR_HAPPY_MASK_SHOP_0 },
+          { EntranceType::Interior, RR_MARKET_MASK_SHOP,              RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_BOMBCHU_BOWLING,        ENTR_BOMBCHU_BOWLING_ALLEY_0 },
+          { EntranceType::Interior, RR_MARKET_BOMBCHU_BOWLING,        RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_POTION_SHOP,            ENTR_POTION_SHOP_MARKET_0 },
+          { EntranceType::Interior, RR_MARKET_POTION_SHOP,            RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_TREASURE_CHEST_GAME,    ENTR_TREASURE_BOX_SHOP_0 },
+          { EntranceType::Interior, RR_MARKET_TREASURE_CHEST_GAME,    RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP } },
+        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY,             RR_MARKET_BOMBCHU_SHOP,           ENTR_BOMBCHU_SHOP_1 },
+          { EntranceType::Interior, RR_MARKET_BOMBCHU_SHOP,           RR_MARKET_BACK_ALLEY,             ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP } },
+        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY,             RR_MARKET_MAN_IN_GREEN_HOUSE,     ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE },
+          { EntranceType::Interior, RR_MARKET_MAN_IN_GREEN_HOUSE,     RR_MARKET_BACK_ALLEY,             ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_CARPENTER_BOSS_HOUSE,      ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 },
+          { EntranceType::Interior, RR_KAK_CARPENTER_BOSS_HOUSE,      RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_CENTER_GUEST_HOUSE } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_HOUSE_OF_SKULLTULA,        ENTR_HOUSE_OF_SKULLTULA_0 },
+          { EntranceType::Interior, RR_KAK_HOUSE_OF_SKULLTULA,        RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_SKULKLTULA_HOUSE } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_IMPAS_HOUSE,               ENTR_IMPAS_HOUSE_FRONT },
+          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE,               RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_FRONT } },
+        { { EntranceType::Interior, RR_KAK_IMPAS_LEDGE,               RR_KAK_IMPAS_HOUSE_BACK,          ENTR_IMPAS_HOUSE_BACK },
+          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE_BACK,          RR_KAK_IMPAS_LEDGE,               ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_BACK } },
+        { { EntranceType::Interior, RR_KAK_BACKYARD,                  RR_KAK_ODD_POTION_BUILDING,       ENTR_POTION_SHOP_GRANNY_0 },
+          { EntranceType::Interior, RR_KAK_ODD_POTION_BUILDING,       RR_KAK_BACKYARD,                  ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY } },
+        { { EntranceType::Interior, RR_THE_GRAVEYARD,                 RR_GRAVEYARD_DAMPES_HOUSE,        ENTR_GRAVEKEEPERS_HUT_0 },
+          { EntranceType::Interior, RR_GRAVEYARD_DAMPES_HOUSE,        RR_THE_GRAVEYARD,                 ENTR_GRAVEYARD_OUTSIDE_DAMPES_HUT } },
+        { { EntranceType::Interior, RR_GORON_CITY,                    RR_GC_SHOP,                       ENTR_GORON_SHOP_0 },
+          { EntranceType::Interior, RR_GC_SHOP,                       RR_GORON_CITY,                    ENTR_GORON_CITY_OUTSIDE_SHOP } },
+        { { EntranceType::Interior, RR_ZORAS_DOMAIN,                  RR_ZD_SHOP,                       ENTR_ZORA_SHOP_0 },
+          { EntranceType::Interior, RR_ZD_SHOP,                       RR_ZORAS_DOMAIN,                  ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_TALONS_HOUSE,              ENTR_LON_LON_BUILDINGS_TALONS_HOUSE },
+          { EntranceType::Interior, RR_LLR_TALONS_HOUSE,              RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_STABLES,                   ENTR_STABLE_0 },
+          { EntranceType::Interior, RR_LLR_STABLES,                   RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_STABLES } },
+        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_TOWER,                     ENTR_LON_LON_BUILDINGS_TOWER },
+          { EntranceType::Interior, RR_LLR_TOWER,                     RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_TOWER } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_BAZAAR,                 ENTR_BAZAAR_1 },
+          { EntranceType::Interior, RR_MARKET_BAZAAR,                 RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_BAZAAR } },
+        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_SHOOTING_GALLERY,       ENTR_SHOOTING_GALLERY_1 },
+          { EntranceType::Interior, RR_MARKET_SHOOTING_GALLERY,       RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_BAZAAR,                    ENTR_BAZAAR_0 },
+          { EntranceType::Interior, RR_KAK_BAZAAR,                    RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_BAZAAR } },
+        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_SHOOTING_GALLERY,          ENTR_SHOOTING_GALLERY_0 },
+          { EntranceType::Interior, RR_KAK_SHOOTING_GALLERY,          RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOOTING_GALLERY } },
+        { { EntranceType::Interior, RR_DESERT_COLOSSUS,               RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS },
+          { EntranceType::Interior, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, RR_DESERT_COLOSSUS,               ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT } },
+        { { EntranceType::Interior, RR_HYRULE_CASTLE_GROUNDS,         RR_HC_GREAT_FAIRY_FOUNTAIN,       ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC },
+          { EntranceType::Interior, RR_HC_GREAT_FAIRY_FOUNTAIN,       RR_CASTLE_GROUNDS,                ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT } },
+        { { EntranceType::Interior, RR_GANONS_CASTLE_GROUNDS,         RR_OGC_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_OGC_DD },
+        // 0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy
+        // fountain exits (normally they both use 0x340)
+          { EntranceType::Interior, RR_OGC_GREAT_FAIRY_FOUNTAIN,      RR_CASTLE_GROUNDS,                ENTR_POTION_SHOP_KAKARIKO_1 } },
+        { { EntranceType::Interior, RR_DMC_LOWER_NEARBY,              RR_DMC_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC },
+          { EntranceType::Interior, RR_DMC_GREAT_FAIRY_FOUNTAIN,      RR_DMC_LOWER_LOCAL,               ENTR_DEATH_MOUNTAIN_CRATER_GREAT_FAIRY_EXIT } },
+        { { EntranceType::Interior, RR_DEATH_MOUNTAIN_SUMMIT,         RR_DMT_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT },
+          { EntranceType::Interior, RR_DMT_GREAT_FAIRY_FOUNTAIN,      RR_DEATH_MOUNTAIN_SUMMIT,         ENTR_DEATH_MOUNTAIN_TRAIL_GREAT_FAIRY_EXIT } },
+        { { EntranceType::Interior, RR_ZORAS_FOUNTAIN,                RR_ZF_GREAT_FAIRY_FOUNTAIN,       ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF },
+          { EntranceType::Interior, RR_ZF_GREAT_FAIRY_FOUNTAIN,       RR_ZORAS_FOUNTAIN,                ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY } },
+        
+        { { EntranceType::SpecialInterior, RR_KOKIRI_FOREST,         RR_KF_LINKS_HOUSE,        ENTR_LINKS_HOUSE_1 },
+          { EntranceType::SpecialInterior, RR_KF_LINKS_HOUSE,        RR_KOKIRI_FOREST,         ENTR_KOKIRI_FOREST_OUTSIDE_LINKS_HOUSE } },
+        { { EntranceType::SpecialInterior, RR_TOT_ENTRANCE,          RR_TEMPLE_OF_TIME,        ENTR_TEMPLE_OF_TIME_ENTRANCE },
+          { EntranceType::SpecialInterior, RR_TEMPLE_OF_TIME,        RR_TOT_ENTRANCE,          ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE } },
+        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE,      RR_KAK_WINDMILL,          ENTR_WINDMILL_AND_DAMPES_GRAVE_WINDMILL },
+          { EntranceType::SpecialInterior, RR_KAK_WINDMILL,          RR_KAKARIKO_VILLAGE,      ENTR_KAKARIKO_VILLAGE_OUTSIDE_WINDMILL } },
+        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE,      RR_KAK_POTION_SHOP_FRONT, ENTR_POTION_SHOP_KAKARIKO_FRONT },
+          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_FRONT, RR_KAKARIKO_VILLAGE,      ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_FRONT } },
+        { { EntranceType::SpecialInterior, RR_KAK_BACKYARD,          RR_KAK_POTION_SHOP_BACK,  ENTR_POTION_SHOP_KAKARIKO_BACK },
+          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_BACK,  RR_KAK_BACKYARD,          ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_BACK } },
+        
+        // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
+        // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+        // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
+        // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
+        { { EntranceType::GrottoGrave, RR_DESERT_COLOSSUS,          RR_COLOSSUS_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_COLOSSUS_GROTTO,          RR_DESERT_COLOSSUS,          ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_LAKE_HYLIA,               RR_LH_GROTTO,                ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET) },
+          { EntranceType::GrottoGrave, RR_LH_GROTTO,                RR_LAKE_HYLIA,               ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_ZR_STORMS_GROTTO,         RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_FAIRY_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET) },
+          { EntranceType::GrottoGrave, RR_ZR_FAIRY_GROTTO,          RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_OPEN_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET) },
+          { EntranceType::GrottoGrave, RR_ZR_OPEN_GROTTO,           RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_DMC_LOWER_NEARBY,         RR_DMC_HAMMER_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_DMC_HAMMER_OFFSET) },
+          { EntranceType::GrottoGrave, RR_DMC_HAMMER_GROTTO,        RR_DMC_LOWER_LOCAL,          ENTRANCE_GROTTO_EXIT(GROTTO_DMC_HAMMER_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_DMC_UPPER_NEARBY,         RR_DMC_UPPER_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_DMC_UPPER_OFFSET) },
+          { EntranceType::GrottoGrave, RR_DMC_UPPER_GROTTO,         RR_DMC_UPPER_LOCAL,          ENTRANCE_GROTTO_EXIT(GROTTO_DMC_UPPER_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_GC_GROTTO_PLATFORM,       RR_GC_GROTTO,                ENTRANCE_GROTTO_LOAD(GROTTO_GORON_CITY_OFFSET) },
+          { EntranceType::GrottoGrave, RR_GC_GROTTO,                RR_GC_GROTTO_PLATFORM,       ENTRANCE_GROTTO_EXIT(GROTTO_GORON_CITY_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_TRAIL,     RR_DMT_STORMS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_DMT_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_DMT_STORMS_GROTTO,        RR_DEATH_MOUNTAIN_TRAIL,     ENTRANCE_GROTTO_EXIT(GROTTO_DMT_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_SUMMIT,    RR_DMT_COW_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_DMT_COW_OFFSET) },
+          { EntranceType::GrottoGrave, RR_DMT_COW_GROTTO,           RR_DEATH_MOUNTAIN_SUMMIT,    ENTRANCE_GROTTO_EXIT(GROTTO_DMT_COW_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_KAK_BACKYARD,             RR_KAK_OPEN_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_KAK_OPEN_OFFSET) },
+          { EntranceType::GrottoGrave, RR_KAK_OPEN_GROTTO,          RR_KAK_BACKYARD,             ENTRANCE_GROTTO_EXIT(GROTTO_KAK_OPEN_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_KAKARIKO_VILLAGE,         RR_KAK_REDEAD_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_KAK_REDEAD_OFFSET) },
+          { EntranceType::GrottoGrave, RR_KAK_REDEAD_GROTTO,        RR_KAKARIKO_VILLAGE,         ENTRANCE_GROTTO_EXIT(GROTTO_KAK_REDEAD_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_CASTLE_GROUNDS,    RR_HC_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_HC_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HC_STORMS_GROTTO,         RR_CASTLE_GROUNDS,           ENTRANCE_GROTTO_EXIT(GROTTO_HC_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_TEKTITE_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_TEKTITE_GROTTO,        RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_NEAR_KAK_GROTTO,       ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_NEAR_KAK_GROTTO,       RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_FAIRY_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_FAIRY_GROTTO,          RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_NEAR_MARKET_GROTTO,    ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_NEAR_MARKET_GROTTO,    RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_COW_GROTTO,            ENTRANCE_GROTTO_LOAD(GROTTO_HF_COW_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_COW_GROTTO,            RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_COW_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_INSIDE_FENCE_GROTTO,   ENTRANCE_GROTTO_LOAD(GROTTO_HF_INSIDE_FENCE_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_INSIDE_FENCE_GROTTO,   RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_INSIDE_FENCE_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_OPEN_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_HF_OPEN_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_OPEN_GROTTO,           RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_OPEN_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_SOUTHEAST_GROTTO,      ENTRANCE_GROTTO_LOAD(GROTTO_HF_SOUTHEAST_OFFSET) },
+          { EntranceType::GrottoGrave, RR_HF_SOUTHEAST_GROTTO,      RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_SOUTHEAST_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_LON_LON_RANCH,            RR_LLR_GROTTO,               ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET) },
+          { EntranceType::GrottoGrave, RR_LLR_GROTTO,               RR_LON_LON_RANCH,            ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_SFM_ENTRYWAY,             RR_SFM_WOLFOS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_SFM_WOLFOS_GROTTO,        RR_SFM_ENTRYWAY,             ENTRANCE_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW,     RR_SFM_STORMS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_SFM_STORMS_GROTTO,        RR_SACRED_FOREST_MEADOW,     ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW,     RR_SFM_FAIRY_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET) },
+          { EntranceType::GrottoGrave, RR_SFM_FAIRY_GROTTO,         RR_SACRED_FOREST_MEADOW,     ENTRANCE_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO,           RR_LW_SCRUBS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_LW_SCRUBS_GROTTO,         RR_LW_BEYOND_MIDO,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_THE_LOST_WOODS,           RR_LW_NEAR_SHORTCUTS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_LW_NEAR_SHORTCUTS_GROTTO, RR_THE_LOST_WOODS,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_KOKIRI_FOREST,            RR_KF_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_KF_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO,         RR_KOKIRI_FOREST,            ENTRANCE_GROTTO_EXIT(GROTTO_KF_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN_ISLAND,      RR_ZD_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO,         RR_ZORAS_DOMAIN_ISLAND,      ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_GF_NEAR_GROTTO,           RR_GF_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO,         RR_GF_NEAR_GROTTO,           ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE,         RR_GV_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET) },
+          { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO,         RR_GV_FORTRESS_SIDE,         ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE,          RR_GV_OCTOROK_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET) },
+          { EntranceType::GrottoGrave, RR_GV_OCTOROK_GROTTO,        RR_GV_GROTTO_LEDGE,          ENTRANCE_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET) } },
+        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO,           RR_DEKU_THEATER,             ENTRANCE_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET) },
+          { EntranceType::GrottoGrave, RR_DEKU_THEATER,             RR_LW_BEYOND_MIDO,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET) } },
+        
+        // Graves have their own specified entrance indices
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_SHIELD_GRAVE,      ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_SHIELD_GRAVE,      RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_SHIELD_GRAVE_EXIT } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_HEART_PIECE_GRAVE, ENTR_REDEAD_GRAVE_0 },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_HEART_PIECE_GRAVE, RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_HEART_PIECE_GRAVE_EXIT } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_COMPOSERS_GRAVE,   ENTR_ROYAL_FAMILYS_TOMB_0 },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_COMPOSERS_GRAVE,   RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_ROYAL_TOMB_EXIT } },
+        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_DAMPES_GRAVE,      ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE },
+          { EntranceType::GrottoGrave, RR_GRAVEYARD_DAMPES_GRAVE,      RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_DAMPES_GRAVE_EXIT } },
+        
+        { { EntranceType::Overworld, RR_KOKIRI_FOREST,           RR_LW_BRIDGE_FROM_FOREST,   ENTR_LOST_WOODS_BRIDGE_EAST_EXIT },
+          { EntranceType::Overworld, RR_LW_BRIDGE,               RR_KOKIRI_FOREST,           ENTR_KOKIRI_FOREST_LOWER_EXIT } },
+        { { EntranceType::Overworld, RR_KOKIRI_FOREST,           RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_SOUTH_EXIT },
+          { EntranceType::Overworld, RR_LW_FOREST_EXIT,          RR_KOKIRI_FOREST,           ENTR_KOKIRI_FOREST_UPPER_EXIT } },
+        { { EntranceType::Overworld, RR_THE_LOST_WOODS,          RR_GC_WOODS_WARP,           ENTR_GORON_CITY_TUNNEL_SHORTCUT },
+          { EntranceType::Overworld, RR_GC_WOODS_WARP,           RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_TUNNEL_SHORTCUT } },
+        { { EntranceType::Overworld, RR_THE_LOST_WOODS,          RR_ZR_FROM_SHORTCUT,        ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT },
+          { EntranceType::Overworld, RR_ZR_FROM_SHORTCUT,        RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_UNDERWATER_SHORTCUT } },
+        { { EntranceType::Overworld, RR_LW_BEYOND_MIDO,          RR_SFM_ENTRYWAY,            ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT },
+          { EntranceType::Overworld, RR_SFM_ENTRYWAY,            RR_LW_BEYOND_MIDO,          ENTR_LOST_WOODS_NORTH_EXIT } },
+        { { EntranceType::Overworld, RR_LW_BRIDGE,               RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_WOODED_EXIT },
+          { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LW_BRIDGE,               ENTR_LOST_WOODS_BRIDGE_WEST_EXIT } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LAKE_HYLIA,              ENTR_LAKE_HYLIA_NORTH_EXIT },
+          { EntranceType::Overworld, RR_LAKE_HYLIA,              RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_FENCE_EXIT } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_GERUDO_VALLEY,           ENTR_GERUDO_VALLEY_EAST_EXIT },
+          { EntranceType::Overworld, RR_GERUDO_VALLEY,           RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_ROCKY_PATH } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_MARKET_ENTRANCE,         ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT },
+          { EntranceType::Overworld, RR_MARKET_ENTRANCE,         RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_KAKARIKO_VILLAGE,        ENTR_KAKARIKO_VILLAGE_FRONT_GATE },
+          { EntranceType::Overworld, RR_KAKARIKO_VILLAGE,        RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_STAIRS_EXIT } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_ZR_FRONT,                ENTR_ZORAS_RIVER_WEST_EXIT },
+          { EntranceType::Overworld, RR_ZR_FRONT,                RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_RIVER_EXIT } },
+        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LON_LON_RANCH,           ENTR_LON_LON_RANCH_ENTRANCE },
+          { EntranceType::Overworld, RR_LON_LON_RANCH,           RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_CENTER_EXIT } },
+        { { EntranceType::Overworld, RR_LH_FROM_SHORTCUT,        RR_ZORAS_DOMAIN,            ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT },
+          { EntranceType::Overworld, RR_ZORAS_DOMAIN,            RR_LH_FROM_SHORTCUT,        ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT } },
+        { { EntranceType::Overworld, RR_GV_FORTRESS_SIDE,        RR_GF_OUTSKIRTS,            ENTR_GERUDOS_FORTRESS_EAST_EXIT },
+          { EntranceType::Overworld, RR_GF_OUTSKIRTS,            RR_GV_FORTRESS_SIDE,        ENTR_GERUDO_VALLEY_WEST_EXIT } },
+        { { EntranceType::Overworld, RR_GF_OUTSIDE_GATE,         RR_WASTELAND_NEAR_FORTRESS, ENTR_HAUNTED_WASTELAND_EAST_EXIT },
+          { EntranceType::Overworld, RR_WASTELAND_NEAR_FORTRESS, RR_GF_OUTSIDE_GATE,         ENTR_GERUDOS_FORTRESS_GATE_EXIT } },
+        { { EntranceType::Overworld, RR_WASTELAND_NEAR_COLOSSUS, RR_DESERT_COLOSSUS,         ENTR_DESERT_COLOSSUS_EAST_EXIT },
+          { EntranceType::Overworld, RR_DESERT_COLOSSUS,         RR_WASTELAND_NEAR_COLOSSUS, ENTR_HAUNTED_WASTELAND_WEST_EXIT } },
+        { { EntranceType::Overworld, RR_MARKET_ENTRANCE,         RR_THE_MARKET,              ENTR_MARKET_SOUTH_EXIT },
+          { EntranceType::Overworld, RR_THE_MARKET,              RR_MARKET_ENTRANCE,         ENTR_MARKET_ENTRANCE_NORTH_EXIT } },
+        { { EntranceType::Overworld, RR_THE_MARKET,              RR_CASTLE_GROUNDS,          ENTR_CASTLE_GROUNDS_SOUTH_EXIT },
+          { EntranceType::Overworld, RR_CASTLE_GROUNDS,          RR_THE_MARKET,              ENTR_MARKET_DAY_CASTLE_EXIT } },
+        { { EntranceType::Overworld, RR_THE_MARKET,              RR_TOT_ENTRANCE,            ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT },
+          { EntranceType::Overworld, RR_TOT_ENTRANCE,            RR_THE_MARKET,              ENTR_MARKET_DAY_TEMPLE_EXIT } },
+        { { EntranceType::Overworld, RR_KAKARIKO_VILLAGE,        RR_THE_GRAVEYARD,           ENTR_GRAVEYARD_ENTRANCE },
+          { EntranceType::Overworld, RR_THE_GRAVEYARD,           RR_KAKARIKO_VILLAGE,        ENTR_KAKARIKO_VILLAGE_SOUTHEAST_EXIT } },
+        { { EntranceType::Overworld, RR_KAK_BEHIND_GATE,         RR_DEATH_MOUNTAIN_TRAIL,    ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT },
+          { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL,    RR_KAK_BEHIND_GATE,         ENTR_KAKARIKO_VILLAGE_GUARD_GATE } },
+        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL,    RR_GORON_CITY,              ENTR_GORON_CITY_UPPER_EXIT },
+          { EntranceType::Overworld, RR_GORON_CITY,              RR_DEATH_MOUNTAIN_TRAIL,    ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT } },
+        { { EntranceType::Overworld, RR_GC_DARUNIAS_CHAMBER,     RR_DMC_LOWER_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT },
+          { EntranceType::Overworld, RR_DMC_LOWER_NEARBY,        RR_GC_DARUNIAS_CHAMBER,     ENTR_GORON_CITY_DARUNIA_ROOM_EXIT } },
+        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_SUMMIT,   RR_DMC_UPPER_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT },
+          { EntranceType::Overworld, RR_DMC_UPPER_NEARBY,        RR_DEATH_MOUNTAIN_SUMMIT,   ENTR_DEATH_MOUNTAIN_TRAIL_SUMMIT_EXIT } },
+        { { EntranceType::Overworld, RR_ZR_BEHIND_WATERFALL,     RR_ZORAS_DOMAIN,            ENTR_ZORAS_DOMAIN_ENTRANCE },
+          { EntranceType::Overworld, RR_ZORAS_DOMAIN,            RR_ZR_BEHIND_WATERFALL,     ENTR_ZORAS_RIVER_WATERFALL_EXIT } },
+        { { EntranceType::Overworld, RR_ZD_BEHIND_KING_ZORA,     RR_ZORAS_FOUNTAIN,          ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT },
+          { EntranceType::Overworld, RR_ZORAS_FOUNTAIN,          RR_ZD_BEHIND_KING_ZORA,     ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT } },
+        
+        { { EntranceType::Overworld, RR_GV_LOWER_STREAM, RR_LAKE_HYLIA,        ENTR_LAKE_HYLIA_RIVER_EXIT },
+          NO_RETURN_ENTRANCE },
+        
+        { { EntranceType::OwlDrop, RR_LH_OWL_FLIGHT,     RR_HYRULE_FIELD,      ENTR_HYRULE_FIELD_OWL_DROP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::OwlDrop, RR_DMT_OWL_FLIGHT,    RR_KAK_IMPAS_ROOFTOP, ENTR_KAKARIKO_VILLAGE_OWL_DROP },
+          NO_RETURN_ENTRANCE },
+        
+        { { EntranceType::Spawn, RR_CHILD_SPAWN,         RR_KF_LINKS_HOUSE,    ENTR_LINKS_HOUSE_CHILD_SPAWN },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::Spawn, RR_ADULT_SPAWN,         RR_TEMPLE_OF_TIME,    ENTR_HYRULE_FIELD_10 },
+          NO_RETURN_ENTRANCE }, // 0x282 is an unused entrance index repurposed to differentiate between
+                                // Adult Spawn and prelude of light (normally they both use 0x5F4)
+        { { EntranceType::WarpSong, RR_MINUET_OF_FOREST_WARP,   RR_SACRED_FOREST_MEADOW,      ENTR_SACRED_FOREST_MEADOW_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_BOLERO_OF_FIRE_WARP,     RR_DMC_CENTRAL_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_SERENADE_OF_WATER_WARP,  RR_LAKE_HYLIA,                ENTR_LAKE_HYLIA_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_REQUIEM_OF_SPIRIT_WARP,  RR_DESERT_COLOSSUS,           ENTR_DESERT_COLOSSUS_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_NOCTURNE_OF_SHADOW_WARP, RR_GRAVEYARD_WARP_PAD_REGION, ENTR_GRAVEYARD_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP,   RR_TEMPLE_OF_TIME,            ENTR_TEMPLE_OF_TIME_WARP_PAD },
+          NO_RETURN_ENTRANCE },
+        
+        { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY,        RR_DEKU_TREE_BOSS_ROOM,         ENTR_DEKU_TREE_BOSS_ENTRANCE },
+          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM,            RR_DEKU_TREE_BOSS_EXIT,         ENTR_DEKU_TREE_BOSS_DOOR } },
+        { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,  RR_DODONGOS_CAVERN_BOSS_ROOM,   ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE },
+          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM,      RR_DODONGOS_CAVERN_BOSS_EXIT,   ENTR_DODONGOS_CAVERN_BOSS_DOOR } },
+        { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM,  ENTR_JABU_JABU_BOSS_ENTRANCE },
+          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM,     RR_JABU_JABUS_BELLY_BOSS_EXIT,  ENTR_JABU_JABU_BOSS_DOOR } },
+        { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY,    RR_FOREST_TEMPLE_BOSS_ROOM,     ENTR_FOREST_TEMPLE_BOSS_ENTRANCE },
+          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM,        RR_FOREST_TEMPLE_BOSS_ENTRYWAY, ENTR_FOREST_TEMPLE_BOSS_DOOR } },
+        { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      RR_FIRE_TEMPLE_BOSS_ROOM,       ENTR_FIRE_TEMPLE_BOSS_ENTRANCE },
+          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM,          RR_FIRE_TEMPLE_BOSS_ENTRYWAY,   ENTR_FIRE_TEMPLE_BOSS_DOOR } },
+        { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY,     RR_WATER_TEMPLE_BOSS_ROOM,      ENTR_WATER_TEMPLE_BOSS_ENTRANCE },
+          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM,         RR_WATER_TEMPLE_BOSS_ENTRYWAY,  ENTR_WATER_TEMPLE_BOSS_DOOR } },
+        { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,    RR_SPIRIT_TEMPLE_BOSS_ROOM,     ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE },
+          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM,        RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, ENTR_SPIRIT_TEMPLE_BOSS_DOOR } },
+        { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,    RR_SHADOW_TEMPLE_BOSS_ROOM,     ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE },
+          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM,        RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, ENTR_SHADOW_TEMPLE_BOSS_DOOR } },
+        
+        { { EntranceType::BlueWarp, RR_DEKU_TREE_BOSS_ROOM,        RR_KF_OUTSIDE_DEKU_TREE,      ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_DODONGOS_CAVERN_BOSS_ROOM,  RR_DEATH_MOUNTAIN_TRAIL,      ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN,            ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FOREST_TEMPLE_BOSS_ROOM,    RR_SACRED_FOREST_MEADOW,      ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FIRE_TEMPLE_BOSS_ROOM,      RR_DMC_CENTRAL_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_WATER_TEMPLE_BOSS_ROOM,     RR_LAKE_HYLIA,                ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SPIRIT_TEMPLE_BOSS_ROOM,    RR_DESERT_COLOSSUS,           ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SHADOW_TEMPLE_BOSS_ROOM,    RR_GRAVEYARD_WARP_PAD_REGION, ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP },
+          NO_RETURN_ENTRANCE },
+        // clang-format on
+    };
+
     auto ctx = Rando::Context::GetInstance();
     for (auto& entrancePair : entranceShuffleTable) {
 
@@ -261,6 +574,7 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
         forwardEntrance->SetIndex(forwardEntry.index);
         forwardEntrance->SetType(forwardEntry.type);
         forwardEntrance->SetAsPrimary();
+        entranceMap[forwardEntry.index] = forwardEntrance;
 
         // When decouple entrances is on, mark the forward entrance
         if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
@@ -272,6 +586,7 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
             returnEntrance->SetIndex(returnEntry.index);
             returnEntrance->SetType(returnEntry.type);
             forwardEntrance->BindTwoWay(returnEntrance);
+            entranceMap[returnEntry.index] = returnEntrance;
 
             // Mark reverse entrance as decoupled
             if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
@@ -351,8 +666,21 @@ std::vector<Entrance*> EntranceShuffler::AssumeEntrancePool(std::vector<Entrance
 static bool AreEntrancesCompatible(Entrance* entrance, Entrance* target, std::vector<EntrancePair>& rollbacks) {
 
     // Entrances shouldn't connect to their own scene, fail in this situation
-    if (entrance->GetParentRegion()->scene != "" &&
-        entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene) {
+    if (
+        // allow "special" areas to connect to eachother
+        entrance->GetParentRegion()->scene != SCENE_ID_MAX &&
+        // allow grottos and fairy fountains to connect to eachother
+        entrance->GetParentRegion()->scene != SCENE_GROTTOS &&
+        entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC &&
+        entrance->GetParentRegion()->scene != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS &&
+
+        (entrance->GetParentRegion()->scene == target->GetConnectedRegion()->scene ||
+
+         // prevent SCENE_HYRULE_CASTLE & SCENE_OUTSIDE_GANONS_CASTLE from connecting to eachother
+         (entrance->GetParentRegion()->scene == SCENE_HYRULE_CASTLE &&
+          target->GetConnectedRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE) ||
+         (entrance->GetParentRegion()->scene == SCENE_OUTSIDE_GANONS_CASTLE &&
+          target->GetConnectedRegion()->scene == SCENE_HYRULE_CASTLE))) {
         auto message = "Entrance " + entrance->GetName() + " attempted to connect with own scene target " +
                        target->to_string() + ". Connection failed.\n";
         SPDLOG_DEBUG(message);
@@ -440,12 +768,6 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
         type = entrancePlaced->GetType();
     }
 
-    bool checkPoeCollectorAccess =
-        (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) ||
-         ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL)) &&
-        (entrancePlaced == nullptr || ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS) || type == EntranceType::Interior ||
-         type == EntranceType::SpecialInterior || type == EntranceType::Overworld || type == EntranceType::Spawn ||
-         type == EntranceType::WarpSong || type == EntranceType::OwlDrop);
     bool checkOtherEntranceAccess =
         (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) ||
          ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES).Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL) ||
@@ -458,7 +780,7 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
     // Conditions will be checked during the search and any that fail will be figured out
     // afterwards
     ctx->GetLogic()->Reset();
-    ValidateEntrances(checkPoeCollectorAccess, checkOtherEntranceAccess);
+    ValidateEntrances(checkOtherEntranceAccess);
 
     if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
         // Unless entrances are decoupled, we don't want the player to end up through certain entrances as the wrong age
@@ -532,7 +854,8 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
 
             // The player should be able to get back to ToT after going through time, without having collected any items
             // This is important to ensure that the player never loses access to the pedestal after going through time
-            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) && !RegionTable(RR_TEMPLE_OF_TIME)->Adult()) {
+            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD) &&
+                !RegionTable(RR_TEMPLE_OF_TIME)->Adult()) {
                 SPDLOG_DEBUG("Path to Temple of Time as adult is not guaranteed\n");
                 return false;
             } else if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT) &&
@@ -542,15 +865,6 @@ static bool ValidateWorld(Entrance* entrancePlaced) {
             }
         }
 
-        // The Big Poe shop should always be accessible as adult without the need to use any bottles
-        // This is important to ensure that players can never lock their only bottles by filling them with Big Poes they
-        // can't sell
-        if (checkPoeCollectorAccess) {
-            if (!RegionTable(RR_MARKET_GUARD_HOUSE)->Adult()) {
-                SPDLOG_DEBUG("Big Poe Shop access is not guarenteed as adult\n");
-                return false;
-            }
-        }
         SPDLOG_DEBUG("All Locations NOT REACHABLE\n");
         return false;
     }
@@ -855,314 +1169,6 @@ int EntranceShuffler::ShuffleAllEntrances() {
     mTotalRandomizableEntrances = 0;
     mCurNumRandomizedEntrances = 0;
 
-    std::vector<EntranceInfoPair> entranceShuffleTable = {
-        // Type                         Parent Region                        Connected Region                      Index
-        { { EntranceType::Dungeon,      RR_KF_OUTSIDE_DEKU_TREE,             RR_DEKU_TREE_ENTRYWAY,                ENTR_DEKU_TREE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_DEKU_TREE_ENTRYWAY,               RR_KF_OUTSIDE_DEKU_TREE,              ENTR_KOKIRI_FOREST_OUTSIDE_DEKU_TREE } },
-        { { EntranceType::Dungeon,      RR_DEATH_MOUNTAIN_TRAIL,             RR_DODONGOS_CAVERN_ENTRYWAY,          ENTR_DODONGOS_CAVERN_ENTRANCE },
-          { EntranceType::Dungeon,      RR_DODONGOS_CAVERN_ENTRYWAY,         RR_DEATH_MOUNTAIN_TRAIL,              ENTR_DEATH_MOUNTAIN_TRAIL_OUTSIDE_DODONGOS_CAVERN } },
-        { { EntranceType::Dungeon,      RR_ZORAS_FOUNTAIN,                   RR_JABU_JABUS_BELLY_ENTRYWAY,         ENTR_JABU_JABU_ENTRANCE },
-          { EntranceType::Dungeon,      RR_JABU_JABUS_BELLY_ENTRYWAY,        RR_ZORAS_FOUNTAIN,                    ENTR_ZORAS_FOUNTAIN_OUTSIDE_JABU_JABU } },
-        { { EntranceType::Dungeon,      RR_SACRED_FOREST_MEADOW,             RR_FOREST_TEMPLE_ENTRYWAY,            ENTR_FOREST_TEMPLE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_FOREST_TEMPLE_ENTRYWAY,           RR_SACRED_FOREST_MEADOW,              ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE } },
-        { { EntranceType::Dungeon,      RR_DMC_CENTRAL_LOCAL,                RR_FIRE_TEMPLE_ENTRYWAY,              ENTR_FIRE_TEMPLE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_FIRE_TEMPLE_ENTRYWAY,             RR_DMC_CENTRAL_LOCAL,                 ENTR_DEATH_MOUNTAIN_CRATER_OUTSIDE_TEMPLE } },
-        { { EntranceType::Dungeon,      RR_LAKE_HYLIA,                       RR_WATER_TEMPLE_ENTRYWAY,             ENTR_WATER_TEMPLE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_WATER_TEMPLE_ENTRYWAY,            RR_LAKE_HYLIA,                        ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE } },
-        { { EntranceType::Dungeon,      RR_DESERT_COLOSSUS,                  RR_SPIRIT_TEMPLE_ENTRYWAY,            ENTR_SPIRIT_TEMPLE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_SPIRIT_TEMPLE_ENTRYWAY,           RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE,    ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE } },
-        { { EntranceType::Dungeon,      RR_GRAVEYARD_WARP_PAD_REGION,        RR_SHADOW_TEMPLE_ENTRYWAY,            ENTR_SHADOW_TEMPLE_ENTRANCE },
-          { EntranceType::Dungeon,      RR_SHADOW_TEMPLE_ENTRYWAY,           RR_GRAVEYARD_WARP_PAD_REGION,         ENTR_GRAVEYARD_OUTSIDE_TEMPLE } },
-        { { EntranceType::Dungeon,      RR_KAK_WELL,                         RR_BOTTOM_OF_THE_WELL_ENTRYWAY,       ENTR_BOTTOM_OF_THE_WELL_ENTRANCE },
-          { EntranceType::Dungeon,      RR_BOTTOM_OF_THE_WELL_ENTRYWAY,      RR_KAK_WELL,                          ENTR_KAKARIKO_VILLAGE_OUTSIDE_BOTTOM_OF_THE_WELL } },
-        { { EntranceType::Dungeon,      RR_ZORAS_FOUNTAIN,                   RR_ICE_CAVERN_ENTRYWAY,               ENTR_ICE_CAVERN_ENTRANCE },
-          { EntranceType::Dungeon,      RR_ICE_CAVERN_ENTRYWAY,              RR_ZORAS_FOUNTAIN,                    ENTR_ZORAS_FOUNTAIN_OUTSIDE_ICE_CAVERN } },
-        { { EntranceType::Dungeon,      RR_GERUDO_FORTRESS,                  RR_GERUDO_TRAINING_GROUND_ENTRYWAY,  ENTR_GERUDO_TRAINING_GROUND_ENTRANCE },
-          { EntranceType::Dungeon,      RR_GERUDO_TRAINING_GROUND_ENTRYWAY, RR_GERUDO_FORTRESS,                   ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND } },
-        { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE,              RR_GANONS_CASTLE_ENTRYWAY,            ENTR_INSIDE_GANONS_CASTLE_ENTRANCE },
-          { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY,           RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT } },
-
-        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_MIDOS_HOUSE,                ENTR_MIDOS_HOUSE_0 },
-          { EntranceType::Interior, RR_KF_MIDOS_HOUSE,                RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_MIDOS_HOUSE } },
-        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_SARIAS_HOUSE,               ENTR_SARIAS_HOUSE_0 },
-          { EntranceType::Interior, RR_KF_SARIAS_HOUSE,               RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_SARIAS_HOUSE } },
-        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_HOUSE_OF_TWINS,             ENTR_TWINS_HOUSE_0 },
-          { EntranceType::Interior, RR_KF_HOUSE_OF_TWINS,             RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_TWINS_HOUSE } },
-        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_KNOW_IT_ALL_HOUSE,          ENTR_KNOW_IT_ALL_BROS_HOUSE_0 },
-          { EntranceType::Interior, RR_KF_KNOW_IT_ALL_HOUSE,          RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_KNOW_IT_ALL_HOUSE } },
-        { { EntranceType::Interior, RR_KOKIRI_FOREST,                 RR_KF_KOKIRI_SHOP,                ENTR_KOKIRI_SHOP_0 },
-          { EntranceType::Interior, RR_KF_KOKIRI_SHOP,                RR_KOKIRI_FOREST,                 ENTR_KOKIRI_FOREST_OUTSIDE_SHOP } },
-        { { EntranceType::Interior, RR_LAKE_HYLIA,                    RR_LH_LAB,                        ENTR_LAKESIDE_LABORATORY_0 },
-          { EntranceType::Interior, RR_LH_LAB,                        RR_LAKE_HYLIA,                    ENTR_LAKE_HYLIA_OUTSIDE_LAB } },
-        { { EntranceType::Interior, RR_LH_FISHING_ISLAND,             RR_LH_FISHING_POND,               ENTR_FISHING_POND_0 },
-          { EntranceType::Interior, RR_LH_FISHING_POND,               RR_LH_FISHING_ISLAND,             ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND } },
-        { { EntranceType::Interior, RR_GV_FORTRESS_SIDE,              RR_GV_CARPENTER_TENT,             ENTR_CARPENTERS_TENT_0 },
-          { EntranceType::Interior, RR_GV_CARPENTER_TENT,             RR_GV_FORTRESS_SIDE,              ENTR_GERUDO_VALLEY_OUTSIDE_TENT } },
-        { { EntranceType::Interior, RR_MARKET_ENTRANCE,               RR_MARKET_GUARD_HOUSE,            ENTR_MARKET_GUARD_HOUSE_0 },
-          { EntranceType::Interior, RR_MARKET_GUARD_HOUSE,            RR_MARKET_ENTRANCE,               ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_MASK_SHOP,              ENTR_HAPPY_MASK_SHOP_0 },
-          { EntranceType::Interior, RR_MARKET_MASK_SHOP,              RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_BOMBCHU_BOWLING,        ENTR_BOMBCHU_BOWLING_ALLEY_0 },
-          { EntranceType::Interior, RR_MARKET_BOMBCHU_BOWLING,        RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_POTION_SHOP,            ENTR_POTION_SHOP_MARKET_0 },
-          { EntranceType::Interior, RR_MARKET_POTION_SHOP,            RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_TREASURE_CHEST_GAME,    ENTR_TREASURE_BOX_SHOP_0 },
-          { EntranceType::Interior, RR_MARKET_TREASURE_CHEST_GAME,    RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP } },
-        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY,             RR_MARKET_BOMBCHU_SHOP,           ENTR_BOMBCHU_SHOP_1 },
-          { EntranceType::Interior, RR_MARKET_BOMBCHU_SHOP,           RR_MARKET_BACK_ALLEY,             ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP } },
-        { { EntranceType::Interior, RR_MARKET_BACK_ALLEY,             RR_MARKET_MAN_IN_GREEN_HOUSE,     ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE },
-          { EntranceType::Interior, RR_MARKET_MAN_IN_GREEN_HOUSE,     RR_MARKET_BACK_ALLEY,             ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE } },
-        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_CARPENTER_BOSS_HOUSE,      ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 },
-          { EntranceType::Interior, RR_KAK_CARPENTER_BOSS_HOUSE,      RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_CENTER_GUEST_HOUSE } },
-        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_HOUSE_OF_SKULLTULA,        ENTR_HOUSE_OF_SKULLTULA_0 },
-          { EntranceType::Interior, RR_KAK_HOUSE_OF_SKULLTULA,        RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_SKULKLTULA_HOUSE } },
-        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_IMPAS_HOUSE,               ENTR_IMPAS_HOUSE_FRONT },
-          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE,               RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_FRONT } },
-        { { EntranceType::Interior, RR_KAK_IMPAS_LEDGE,               RR_KAK_IMPAS_HOUSE_BACK,          ENTR_IMPAS_HOUSE_BACK },
-          { EntranceType::Interior, RR_KAK_IMPAS_HOUSE_BACK,          RR_KAK_IMPAS_LEDGE,               ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_BACK } },
-        { { EntranceType::Interior, RR_KAK_BACKYARD,                  RR_KAK_ODD_POTION_BUILDING,       ENTR_POTION_SHOP_GRANNY_0 },
-          { EntranceType::Interior, RR_KAK_ODD_POTION_BUILDING,       RR_KAK_BACKYARD,                  ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY } },
-        { { EntranceType::Interior, RR_THE_GRAVEYARD,                 RR_GRAVEYARD_DAMPES_HOUSE,        ENTR_GRAVEKEEPERS_HUT_0 },
-          { EntranceType::Interior, RR_GRAVEYARD_DAMPES_HOUSE,        RR_THE_GRAVEYARD,                 ENTR_GRAVEYARD_OUTSIDE_DAMPES_HUT } },
-        { { EntranceType::Interior, RR_GORON_CITY,                    RR_GC_SHOP,                       ENTR_GORON_SHOP_0 },
-          { EntranceType::Interior, RR_GC_SHOP,                       RR_GORON_CITY,                    ENTR_GORON_CITY_OUTSIDE_SHOP } },
-        { { EntranceType::Interior, RR_ZORAS_DOMAIN,                  RR_ZD_SHOP,                       ENTR_ZORA_SHOP_0 },
-          { EntranceType::Interior, RR_ZD_SHOP,                       RR_ZORAS_DOMAIN,                  ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP } },
-        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_TALONS_HOUSE,              ENTR_LON_LON_BUILDINGS_TALONS_HOUSE },
-          { EntranceType::Interior, RR_LLR_TALONS_HOUSE,              RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE } },
-        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_STABLES,                   ENTR_STABLE_0 },
-          { EntranceType::Interior, RR_LLR_STABLES,                   RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_STABLES } },
-        { { EntranceType::Interior, RR_LON_LON_RANCH,                 RR_LLR_TOWER,                     ENTR_LON_LON_BUILDINGS_TOWER },
-          { EntranceType::Interior, RR_LLR_TOWER,                     RR_LON_LON_RANCH,                 ENTR_LON_LON_RANCH_OUTSIDE_TOWER } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_BAZAAR,                 ENTR_BAZAAR_1 },
-          { EntranceType::Interior, RR_MARKET_BAZAAR,                 RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_BAZAAR } },
-        { { EntranceType::Interior, RR_THE_MARKET,                    RR_MARKET_SHOOTING_GALLERY,       ENTR_SHOOTING_GALLERY_1 },
-          { EntranceType::Interior, RR_MARKET_SHOOTING_GALLERY,       RR_THE_MARKET,                    ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY } },
-        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_BAZAAR,                    ENTR_BAZAAR_0 },
-          { EntranceType::Interior, RR_KAK_BAZAAR,                    RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_BAZAAR } },
-        { { EntranceType::Interior, RR_KAKARIKO_VILLAGE,              RR_KAK_SHOOTING_GALLERY,          ENTR_SHOOTING_GALLERY_0 },
-          { EntranceType::Interior, RR_KAK_SHOOTING_GALLERY,          RR_KAKARIKO_VILLAGE,              ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOOTING_GALLERY } },
-        { { EntranceType::Interior, RR_DESERT_COLOSSUS,               RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS },
-          { EntranceType::Interior, RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, RR_DESERT_COLOSSUS,               ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT } },
-        { { EntranceType::Interior, RR_HYRULE_CASTLE_GROUNDS,         RR_HC_GREAT_FAIRY_FOUNTAIN,       ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC },
-          { EntranceType::Interior, RR_HC_GREAT_FAIRY_FOUNTAIN,       RR_CASTLE_GROUNDS,                ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT } },
-        { { EntranceType::Interior, RR_GANONS_CASTLE_GROUNDS,         RR_OGC_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_OGC_DD },
-        // 0x3E8 is an unused entrance index repruposed to differentiate between the HC and OGC fairy
-        // fountain exits (normally they both use 0x340)
-          { EntranceType::Interior, RR_OGC_GREAT_FAIRY_FOUNTAIN,      RR_CASTLE_GROUNDS,                ENTR_POTION_SHOP_KAKARIKO_1 } },
-        { { EntranceType::Interior, RR_DMC_LOWER_NEARBY,              RR_DMC_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC },
-          { EntranceType::Interior, RR_DMC_GREAT_FAIRY_FOUNTAIN,      RR_DMC_LOWER_LOCAL,               ENTR_DEATH_MOUNTAIN_CRATER_GREAT_FAIRY_EXIT } },
-        { { EntranceType::Interior, RR_DEATH_MOUNTAIN_SUMMIT,         RR_DMT_GREAT_FAIRY_FOUNTAIN,      ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT },
-          { EntranceType::Interior, RR_DMT_GREAT_FAIRY_FOUNTAIN,      RR_DEATH_MOUNTAIN_SUMMIT,         ENTR_DEATH_MOUNTAIN_TRAIL_GREAT_FAIRY_EXIT } },
-        { { EntranceType::Interior, RR_ZORAS_FOUNTAIN,                RR_ZF_GREAT_FAIRY_FOUNTAIN,       ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF },
-          { EntranceType::Interior, RR_ZF_GREAT_FAIRY_FOUNTAIN,       RR_ZORAS_FOUNTAIN,                ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY } },
-
-        { { EntranceType::SpecialInterior, RR_KOKIRI_FOREST,         RR_KF_LINKS_HOUSE,        ENTR_LINKS_HOUSE_1 },
-          { EntranceType::SpecialInterior, RR_KF_LINKS_HOUSE,        RR_KOKIRI_FOREST,         ENTR_KOKIRI_FOREST_OUTSIDE_LINKS_HOUSE } },
-        { { EntranceType::SpecialInterior, RR_TOT_ENTRANCE,          RR_TEMPLE_OF_TIME,        ENTR_TEMPLE_OF_TIME_ENTRANCE },
-          { EntranceType::SpecialInterior, RR_TEMPLE_OF_TIME,        RR_TOT_ENTRANCE,          ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE } },
-        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE,      RR_KAK_WINDMILL,          ENTR_WINDMILL_AND_DAMPES_GRAVE_WINDMILL },
-          { EntranceType::SpecialInterior, RR_KAK_WINDMILL,          RR_KAKARIKO_VILLAGE,      ENTR_KAKARIKO_VILLAGE_OUTSIDE_WINDMILL } },
-        { { EntranceType::SpecialInterior, RR_KAKARIKO_VILLAGE,      RR_KAK_POTION_SHOP_FRONT, ENTR_POTION_SHOP_KAKARIKO_FRONT },
-          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_FRONT, RR_KAKARIKO_VILLAGE,      ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_FRONT } },
-        { { EntranceType::SpecialInterior, RR_KAK_BACKYARD,          RR_KAK_POTION_SHOP_BACK,  ENTR_POTION_SHOP_KAKARIKO_BACK },
-          { EntranceType::SpecialInterior, RR_KAK_POTION_SHOP_BACK,  RR_KAK_BACKYARD,          ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_BACK } },
-
-        // Grotto Loads use an entrance index of 0x0700 + their grotto id. The id is used as index for the
-        // grottoLoadTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-        // Grotto Returns use an entrance index of 0x0800 + their grotto id. The id is used as index for the
-        // grottoReturnTable in soh/soh/Enhancements/randomizer/randomizer_grotto.c
-        { { EntranceType::GrottoGrave, RR_DESERT_COLOSSUS,          RR_COLOSSUS_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_COLOSSUS_GROTTO,          RR_DESERT_COLOSSUS,          ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_LAKE_HYLIA,               RR_LH_GROTTO,                ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET) },
-          { EntranceType::GrottoGrave, RR_LH_GROTTO,                RR_LAKE_HYLIA,               ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_ZR_STORMS_GROTTO,         RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_FAIRY_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET) },
-          { EntranceType::GrottoGrave, RR_ZR_FAIRY_GROTTO,          RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_ZORAS_RIVER,              RR_ZR_OPEN_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET) },
-          { EntranceType::GrottoGrave, RR_ZR_OPEN_GROTTO,           RR_ZORAS_RIVER,              ENTRANCE_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_DMC_LOWER_NEARBY,         RR_DMC_HAMMER_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_DMC_HAMMER_OFFSET) },
-          { EntranceType::GrottoGrave, RR_DMC_HAMMER_GROTTO,        RR_DMC_LOWER_LOCAL,          ENTRANCE_GROTTO_EXIT(GROTTO_DMC_HAMMER_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_DMC_UPPER_NEARBY,         RR_DMC_UPPER_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_DMC_UPPER_OFFSET) },
-          { EntranceType::GrottoGrave, RR_DMC_UPPER_GROTTO,         RR_DMC_UPPER_LOCAL,          ENTRANCE_GROTTO_EXIT(GROTTO_DMC_UPPER_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_GC_GROTTO_PLATFORM,       RR_GC_GROTTO,                ENTRANCE_GROTTO_LOAD(GROTTO_GORON_CITY_OFFSET) },
-          { EntranceType::GrottoGrave, RR_GC_GROTTO,                RR_GC_GROTTO_PLATFORM,       ENTRANCE_GROTTO_EXIT(GROTTO_GORON_CITY_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_TRAIL,     RR_DMT_STORMS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_DMT_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_DMT_STORMS_GROTTO,        RR_DEATH_MOUNTAIN_TRAIL,     ENTRANCE_GROTTO_EXIT(GROTTO_DMT_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_DEATH_MOUNTAIN_SUMMIT,    RR_DMT_COW_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_DMT_COW_OFFSET) },
-          { EntranceType::GrottoGrave, RR_DMT_COW_GROTTO,           RR_DEATH_MOUNTAIN_SUMMIT,    ENTRANCE_GROTTO_EXIT(GROTTO_DMT_COW_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_KAK_BACKYARD,             RR_KAK_OPEN_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_KAK_OPEN_OFFSET) },
-          { EntranceType::GrottoGrave, RR_KAK_OPEN_GROTTO,          RR_KAK_BACKYARD,             ENTRANCE_GROTTO_EXIT(GROTTO_KAK_OPEN_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_KAKARIKO_VILLAGE,         RR_KAK_REDEAD_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_KAK_REDEAD_OFFSET) },
-          { EntranceType::GrottoGrave, RR_KAK_REDEAD_GROTTO,        RR_KAKARIKO_VILLAGE,         ENTRANCE_GROTTO_EXIT(GROTTO_KAK_REDEAD_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_CASTLE_GROUNDS,    RR_HC_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_HC_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HC_STORMS_GROTTO,         RR_CASTLE_GROUNDS,           ENTRANCE_GROTTO_EXIT(GROTTO_HC_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_TEKTITE_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_TEKTITE_GROTTO,        RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_NEAR_KAK_GROTTO,       ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_NEAR_KAK_GROTTO,       RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_FAIRY_GROTTO,          ENTRANCE_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_FAIRY_GROTTO,          RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_NEAR_MARKET_GROTTO,    ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_NEAR_MARKET_GROTTO,    RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_COW_GROTTO,            ENTRANCE_GROTTO_LOAD(GROTTO_HF_COW_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_COW_GROTTO,            RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_COW_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_INSIDE_FENCE_GROTTO,   ENTRANCE_GROTTO_LOAD(GROTTO_HF_INSIDE_FENCE_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_INSIDE_FENCE_GROTTO,   RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_INSIDE_FENCE_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_OPEN_GROTTO,           ENTRANCE_GROTTO_LOAD(GROTTO_HF_OPEN_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_OPEN_GROTTO,           RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_OPEN_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_HYRULE_FIELD,             RR_HF_SOUTHEAST_GROTTO,      ENTRANCE_GROTTO_LOAD(GROTTO_HF_SOUTHEAST_OFFSET) },
-          { EntranceType::GrottoGrave, RR_HF_SOUTHEAST_GROTTO,      RR_HYRULE_FIELD,             ENTRANCE_GROTTO_EXIT(GROTTO_HF_SOUTHEAST_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_LON_LON_RANCH,            RR_LLR_GROTTO,               ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET) },
-          { EntranceType::GrottoGrave, RR_LLR_GROTTO,               RR_LON_LON_RANCH,            ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_SFM_ENTRYWAY,             RR_SFM_WOLFOS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_SFM_WOLFOS_GROTTO,        RR_SFM_ENTRYWAY,             ENTRANCE_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW,     RR_SFM_STORMS_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_SFM_STORMS_GROTTO,        RR_SACRED_FOREST_MEADOW,     ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_SACRED_FOREST_MEADOW,     RR_SFM_FAIRY_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET) },
-          { EntranceType::GrottoGrave, RR_SFM_FAIRY_GROTTO,         RR_SACRED_FOREST_MEADOW,     ENTRANCE_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO,           RR_LW_SCRUBS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_LW_SCRUBS_GROTTO,         RR_LW_BEYOND_MIDO,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_THE_LOST_WOODS,           RR_LW_NEAR_SHORTCUTS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_LW_NEAR_SHORTCUTS_GROTTO, RR_THE_LOST_WOODS,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_KOKIRI_FOREST,            RR_KF_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_KF_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO,         RR_KOKIRI_FOREST,            ENTRANCE_GROTTO_EXIT(GROTTO_KF_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN_ISLAND,      RR_ZD_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO,         RR_ZORAS_DOMAIN_ISLAND,      ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_GERUDO_FORTRESS,          RR_GF_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO,         RR_GERUDO_FORTRESS,          ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE,         RR_GV_STORMS_GROTTO,         ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET) },
-          { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO,         RR_GV_FORTRESS_SIDE,         ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE,          RR_GV_OCTOROK_GROTTO,        ENTRANCE_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET) },
-          { EntranceType::GrottoGrave, RR_GV_OCTOROK_GROTTO,        RR_GV_GROTTO_LEDGE,          ENTRANCE_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET) } },
-        { { EntranceType::GrottoGrave, RR_LW_BEYOND_MIDO,           RR_DEKU_THEATER,             ENTRANCE_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET) },
-          { EntranceType::GrottoGrave, RR_DEKU_THEATER,             RR_LW_BEYOND_MIDO,           ENTRANCE_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET) } },
-
-        // Graves have their own specified entrance indices
-        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_SHIELD_GRAVE,      ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
-          { EntranceType::GrottoGrave, RR_GRAVEYARD_SHIELD_GRAVE,      RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_SHIELD_GRAVE_EXIT } },
-        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_HEART_PIECE_GRAVE, ENTR_REDEAD_GRAVE_0 },
-          { EntranceType::GrottoGrave, RR_GRAVEYARD_HEART_PIECE_GRAVE, RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_HEART_PIECE_GRAVE_EXIT } },
-        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_COMPOSERS_GRAVE,   ENTR_ROYAL_FAMILYS_TOMB_0 },
-          { EntranceType::GrottoGrave, RR_GRAVEYARD_COMPOSERS_GRAVE,   RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_ROYAL_TOMB_EXIT } },
-        { { EntranceType::GrottoGrave, RR_THE_GRAVEYARD,               RR_GRAVEYARD_DAMPES_GRAVE,      ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE },
-          { EntranceType::GrottoGrave, RR_GRAVEYARD_DAMPES_GRAVE,      RR_THE_GRAVEYARD,               ENTR_GRAVEYARD_DAMPES_GRAVE_EXIT } },
-
-        { { EntranceType::Overworld, RR_KOKIRI_FOREST,           RR_LW_BRIDGE_FROM_FOREST,   ENTR_LOST_WOODS_BRIDGE_EAST_EXIT },
-          { EntranceType::Overworld, RR_LW_BRIDGE,               RR_KOKIRI_FOREST,           ENTR_KOKIRI_FOREST_LOWER_EXIT } },
-        { { EntranceType::Overworld, RR_KOKIRI_FOREST,           RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_SOUTH_EXIT },
-          { EntranceType::Overworld, RR_LW_FOREST_EXIT,          RR_KOKIRI_FOREST,           ENTR_KOKIRI_FOREST_UPPER_EXIT } },
-        { { EntranceType::Overworld, RR_THE_LOST_WOODS,          RR_GC_WOODS_WARP,           ENTR_GORON_CITY_TUNNEL_SHORTCUT },
-          { EntranceType::Overworld, RR_GC_WOODS_WARP,           RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_TUNNEL_SHORTCUT } },
-        { { EntranceType::Overworld, RR_THE_LOST_WOODS,          RR_ZORAS_RIVER,             ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT },
-          { EntranceType::Overworld, RR_ZORAS_RIVER,             RR_THE_LOST_WOODS,          ENTR_LOST_WOODS_UNDERWATER_SHORTCUT } },
-        { { EntranceType::Overworld, RR_LW_BEYOND_MIDO,          RR_SFM_ENTRYWAY,            ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT },
-          { EntranceType::Overworld, RR_SFM_ENTRYWAY,            RR_LW_BEYOND_MIDO,          ENTR_LOST_WOODS_NORTH_EXIT } },
-        { { EntranceType::Overworld, RR_LW_BRIDGE,               RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_WOODED_EXIT },
-          { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LW_BRIDGE,               ENTR_LOST_WOODS_BRIDGE_WEST_EXIT } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LAKE_HYLIA,              ENTR_LAKE_HYLIA_NORTH_EXIT },
-          { EntranceType::Overworld, RR_LAKE_HYLIA,              RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_FENCE_EXIT } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_GERUDO_VALLEY,           ENTR_GERUDO_VALLEY_EAST_EXIT },
-          { EntranceType::Overworld, RR_GERUDO_VALLEY,           RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_ROCKY_PATH } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_MARKET_ENTRANCE,         ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT },
-          { EntranceType::Overworld, RR_MARKET_ENTRANCE,         RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_KAKARIKO_VILLAGE,        ENTR_KAKARIKO_VILLAGE_FRONT_GATE },
-          { EntranceType::Overworld, RR_KAKARIKO_VILLAGE,        RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_STAIRS_EXIT } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_ZR_FRONT,                ENTR_ZORAS_RIVER_WEST_EXIT },
-          { EntranceType::Overworld, RR_ZR_FRONT,                RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_RIVER_EXIT } },
-        { { EntranceType::Overworld, RR_HYRULE_FIELD,            RR_LON_LON_RANCH,           ENTR_LON_LON_RANCH_ENTRANCE },
-          { EntranceType::Overworld, RR_LON_LON_RANCH,           RR_HYRULE_FIELD,            ENTR_HYRULE_FIELD_CENTER_EXIT } },
-        { { EntranceType::Overworld, RR_LAKE_HYLIA,              RR_ZORAS_DOMAIN,            ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT },
-          { EntranceType::Overworld, RR_ZORAS_DOMAIN,            RR_LAKE_HYLIA,              ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT } },
-        { { EntranceType::Overworld, RR_GV_FORTRESS_SIDE,        RR_GERUDO_FORTRESS,         ENTR_GERUDOS_FORTRESS_EAST_EXIT },
-          { EntranceType::Overworld, RR_GERUDO_FORTRESS,         RR_GV_FORTRESS_SIDE,        ENTR_GERUDO_VALLEY_WEST_EXIT } },
-        { { EntranceType::Overworld, RR_GF_OUTSIDE_GATE,         RR_WASTELAND_NEAR_FORTRESS, ENTR_HAUNTED_WASTELAND_EAST_EXIT },
-          { EntranceType::Overworld, RR_WASTELAND_NEAR_FORTRESS, RR_GF_OUTSIDE_GATE,         ENTR_GERUDOS_FORTRESS_GATE_EXIT } },
-        { { EntranceType::Overworld, RR_WASTELAND_NEAR_COLOSSUS, RR_DESERT_COLOSSUS,         ENTR_DESERT_COLOSSUS_EAST_EXIT },
-          { EntranceType::Overworld, RR_DESERT_COLOSSUS,         RR_WASTELAND_NEAR_COLOSSUS, ENTR_HAUNTED_WASTELAND_WEST_EXIT } },
-        { { EntranceType::Overworld, RR_MARKET_ENTRANCE,         RR_THE_MARKET,              ENTR_MARKET_SOUTH_EXIT },
-          { EntranceType::Overworld, RR_THE_MARKET,              RR_MARKET_ENTRANCE,         ENTR_MARKET_ENTRANCE_NORTH_EXIT } },
-        { { EntranceType::Overworld, RR_THE_MARKET,              RR_CASTLE_GROUNDS,          ENTR_CASTLE_GROUNDS_SOUTH_EXIT },
-          { EntranceType::Overworld, RR_CASTLE_GROUNDS,          RR_THE_MARKET,              ENTR_MARKET_DAY_CASTLE_EXIT } },
-        { { EntranceType::Overworld, RR_THE_MARKET,              RR_TOT_ENTRANCE,            ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT },
-          { EntranceType::Overworld, RR_TOT_ENTRANCE,            RR_THE_MARKET,              ENTR_MARKET_DAY_TEMPLE_EXIT } },
-        { { EntranceType::Overworld, RR_KAKARIKO_VILLAGE,        RR_THE_GRAVEYARD,           ENTR_GRAVEYARD_ENTRANCE },
-          { EntranceType::Overworld, RR_THE_GRAVEYARD,           RR_KAKARIKO_VILLAGE,        ENTR_KAKARIKO_VILLAGE_SOUTHEAST_EXIT } },
-        { { EntranceType::Overworld, RR_KAK_BEHIND_GATE,         RR_DEATH_MOUNTAIN_TRAIL,    ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT },
-          { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL,    RR_KAK_BEHIND_GATE,         ENTR_KAKARIKO_VILLAGE_GUARD_GATE } },
-        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_TRAIL,    RR_GORON_CITY,              ENTR_GORON_CITY_UPPER_EXIT },
-          { EntranceType::Overworld, RR_GORON_CITY,              RR_DEATH_MOUNTAIN_TRAIL,    ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT } },
-        { { EntranceType::Overworld, RR_GC_DARUNIAS_CHAMBER,     RR_DMC_LOWER_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT },
-          { EntranceType::Overworld, RR_DMC_LOWER_NEARBY,        RR_GC_DARUNIAS_CHAMBER,     ENTR_GORON_CITY_DARUNIA_ROOM_EXIT } },
-        { { EntranceType::Overworld, RR_DEATH_MOUNTAIN_SUMMIT,   RR_DMC_UPPER_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT },
-          { EntranceType::Overworld, RR_DMC_UPPER_NEARBY,        RR_DEATH_MOUNTAIN_SUMMIT,   ENTR_DEATH_MOUNTAIN_TRAIL_SUMMIT_EXIT } },
-        { { EntranceType::Overworld, RR_ZR_BEHIND_WATERFALL,     RR_ZORAS_DOMAIN,            ENTR_ZORAS_DOMAIN_ENTRANCE },
-          { EntranceType::Overworld, RR_ZORAS_DOMAIN,            RR_ZR_BEHIND_WATERFALL,     ENTR_ZORAS_RIVER_WATERFALL_EXIT } },
-        { { EntranceType::Overworld, RR_ZD_BEHIND_KING_ZORA,     RR_ZORAS_FOUNTAIN,          ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT },
-          { EntranceType::Overworld, RR_ZORAS_FOUNTAIN,          RR_ZD_BEHIND_KING_ZORA,     ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT } },
-
-        { { EntranceType::Overworld, RR_GV_LOWER_STREAM, RR_LAKE_HYLIA,        ENTR_LAKE_HYLIA_RIVER_EXIT },
-          NO_RETURN_ENTRANCE },
-
-        { { EntranceType::OwlDrop, RR_LH_OWL_FLIGHT,     RR_HYRULE_FIELD,      ENTR_HYRULE_FIELD_OWL_DROP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::OwlDrop, RR_DMT_OWL_FLIGHT,    RR_KAK_IMPAS_ROOFTOP, ENTR_KAKARIKO_VILLAGE_OWL_DROP },
-          NO_RETURN_ENTRANCE },
-
-        { { EntranceType::Spawn, RR_CHILD_SPAWN,         RR_KF_LINKS_HOUSE,    ENTR_LINKS_HOUSE_CHILD_SPAWN },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::Spawn, RR_ADULT_SPAWN,         RR_TEMPLE_OF_TIME,    ENTR_HYRULE_FIELD_10 },
-          NO_RETURN_ENTRANCE }, // 0x282 is an unused entrance index repurposed to differentiate between
-                                // Adult Spawn and prelude of light (normally they both use 0x5F4)
-        { { EntranceType::WarpSong, RR_MINUET_OF_FOREST_WARP,   RR_SACRED_FOREST_MEADOW,      ENTR_SACRED_FOREST_MEADOW_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::WarpSong, RR_BOLERO_OF_FIRE_WARP,     RR_DMC_CENTRAL_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::WarpSong, RR_SERENADE_OF_WATER_WARP,  RR_LAKE_HYLIA,                ENTR_LAKE_HYLIA_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::WarpSong, RR_REQUIEM_OF_SPIRIT_WARP,  RR_DESERT_COLOSSUS,           ENTR_DESERT_COLOSSUS_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::WarpSong, RR_NOCTURNE_OF_SHADOW_WARP, RR_GRAVEYARD_WARP_PAD_REGION, ENTR_GRAVEYARD_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP,   RR_TEMPLE_OF_TIME,            ENTR_TEMPLE_OF_TIME_WARP_PAD },
-          NO_RETURN_ENTRANCE },
-
-        { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY,        RR_DEKU_TREE_BOSS_ROOM,            ENTR_DEKU_TREE_BOSS_ENTRANCE },
-          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM,            RR_DEKU_TREE_BOSS_ENTRYWAY,        ENTR_DEKU_TREE_BOSS_DOOR } },
-        { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,  RR_DODONGOS_CAVERN_BOSS_ROOM,      ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE },
-          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM,      RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,  ENTR_DODONGOS_CAVERN_BOSS_DOOR } },
-        { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM,     ENTR_JABU_JABU_BOSS_ENTRANCE },
-          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM,     RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, ENTR_JABU_JABU_BOSS_DOOR } },
-        { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY,    RR_FOREST_TEMPLE_BOSS_ROOM,        ENTR_FOREST_TEMPLE_BOSS_ENTRANCE },
-          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM,        RR_FOREST_TEMPLE_BOSS_ENTRYWAY,    ENTR_FOREST_TEMPLE_BOSS_DOOR } },
-        { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      RR_FIRE_TEMPLE_BOSS_ROOM,          ENTR_FIRE_TEMPLE_BOSS_ENTRANCE },
-          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM,          RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      ENTR_FIRE_TEMPLE_BOSS_DOOR } },
-        { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY,     RR_WATER_TEMPLE_BOSS_ROOM,         ENTR_WATER_TEMPLE_BOSS_ENTRANCE },
-          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM,         RR_WATER_TEMPLE_BOSS_ENTRYWAY,     ENTR_WATER_TEMPLE_BOSS_DOOR } },
-        { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,    RR_SPIRIT_TEMPLE_BOSS_ROOM,        ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE },
-          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM,        RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,    ENTR_SPIRIT_TEMPLE_BOSS_DOOR } },
-        { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,    RR_SHADOW_TEMPLE_BOSS_ROOM,        ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE },
-          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM,        RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,    ENTR_SHADOW_TEMPLE_BOSS_DOOR } },
-
-        { { EntranceType::BlueWarp, RR_DEKU_TREE_BOSS_ROOM,        RR_KF_OUTSIDE_DEKU_TREE,      ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_DODONGOS_CAVERN_BOSS_ROOM,  RR_DEATH_MOUNTAIN_TRAIL,      ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN,            ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_FOREST_TEMPLE_BOSS_ROOM,    RR_SACRED_FOREST_MEADOW,      ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_FIRE_TEMPLE_BOSS_ROOM,      RR_DMC_CENTRAL_LOCAL,         ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_WATER_TEMPLE_BOSS_ROOM,     RR_LAKE_HYLIA,                ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_SPIRIT_TEMPLE_BOSS_ROOM,    RR_DESERT_COLOSSUS,           ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-        { { EntranceType::BlueWarp, RR_SHADOW_TEMPLE_BOSS_ROOM,    RR_GRAVEYARD_WARP_PAD_REGION, ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP },
-          NO_RETURN_ENTRANCE },
-    };
-
     std::map<std::string, PriorityEntrance> priorityEntranceTable = {
         { "Bolero", { { RR_DMC_CENTRAL_LOCAL }, { EntranceType::OwlDrop, EntranceType::WarpSong } } },
         { "Nocturne",
@@ -1174,7 +1180,7 @@ int EntranceShuffler::ShuffleAllEntrances() {
     };
 
     mEntranceShuffleFailure = false;
-    SetAllEntrancesData(entranceShuffleTable);
+    SetAllEntrancesData();
 
     EntrancePools oneWayEntrancePools = {};
     EntrancePools entrancePools = {};
@@ -1484,63 +1490,63 @@ int EntranceShuffler::ShuffleAllEntrances() {
     if (true /* ctx->GetOption(RSK_SHUFFLE_BLUEWARP_ENTRANCES).Is(RO_BLUEWARP_ENTRANCE_SHUFFLE_DUNGEON) */) {
         // If a boss room is inside a boss door, make the blue warp go outside the dungeon's entrance
         std::map<std::string, Entrance*> bossExits = {
-            { EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE)) },
-            { EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL)) },
-            { EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN)) },
+            { EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_EXIT),
+              GetEntrance(RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE) },
+            { EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_EXIT),
+              GetEntrance(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL) },
+            { EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_EXIT),
+              GetEntrance(RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN) },
             { EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW)) },
+              GetEntrance(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW) },
             { EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL)) },
+              GetEntrance(RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL) },
             { EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA)) },
+              GetEntrance(RR_WATER_TEMPLE_ENTRYWAY, RR_LH_FROM_WATER_TEMPLE) },
             { EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE)) },
+              GetEntrance(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE) },
             { EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY),
-              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION)) },
+              GetEntrance(RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION) },
         };
 
         // If a boss room is inside a dungeon entrance (or inside a dungeon which is inside a dungeon entrance), make
         // the blue warp go to that dungeon's blue warp target
         std::map<std::string, Entrance*> dungeonExits = {
             { EntranceNameByRegions(RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE),
-              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE)) },
+              GetEntrance(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE) },
             { EntranceNameByRegions(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL),
-              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL)) },
+              GetEntrance(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL) },
             { EntranceNameByRegions(RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN),
-              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN)) },
+              GetEntrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN) },
             { EntranceNameByRegions(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW),
-              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW)) },
+              GetEntrance(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW) },
             { EntranceNameByRegions(RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL),
-              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL)) },
-            { EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA),
-              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA)) },
+              GetEntrance(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL) },
+            { EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LH_FROM_WATER_TEMPLE),
+              GetEntrance(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA) },
             { EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE),
-              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS)) },
+              GetEntrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS) },
             { EntranceNameByRegions(RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION),
-              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION)) },
+              GetEntrance(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION) },
         };
 
         // Pair <BlueWarp exit, BossRoom reverse exit>
         std::vector<EntrancePair> bossRoomExitPairs = {
-            { GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE)),
-              GetEntrance(EntranceNameByRegions(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL)),
-              GetEntrance(EntranceNameByRegions(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN)),
-              GetEntrance(EntranceNameByRegions(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW)),
-              GetEntrance(EntranceNameByRegions(RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL)),
-              GetEntrance(EntranceNameByRegions(RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA)),
-              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS)),
-              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY)) },
-            { GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION)),
-              GetEntrance(EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY)) },
+            { GetEntrance(RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE),
+              GetEntrance(RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_EXIT) },
+            { GetEntrance(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL),
+              GetEntrance(RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_EXIT) },
+            { GetEntrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN),
+              GetEntrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_EXIT) },
+            { GetEntrance(RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW),
+              GetEntrance(RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY) },
+            { GetEntrance(RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL),
+              GetEntrance(RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY) },
+            { GetEntrance(RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA),
+              GetEntrance(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY) },
+            { GetEntrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS),
+              GetEntrance(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY) },
+            { GetEntrance(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION),
+              GetEntrance(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY) },
         };
 
         for (EntrancePair pair : bossRoomExitPairs) {
@@ -1572,7 +1578,7 @@ int EntranceShuffler::ShuffleAllEntrances() {
 
 void EntranceShuffler::CreateEntranceOverrides() {
     auto ctx = Rando::Context::GetInstance();
-    entranceOverrides.fill({0, 0, 0, 0, 0});
+    entranceOverrides.fill({ 0, 0, 0, 0, 0 });
     if (mNoRandomEntrances) {
         return;
     }
@@ -1641,7 +1647,7 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
     try {
         nlohmann::json entrancesJson = spoilerFileJson["entrances"];
         size_t i = 0;
-        for (auto it = entrancesJson.begin(); it != entrancesJson.end(); ++it, i++) {
+        for (auto it = entrancesJson.begin(); it != entrancesJson.end() && i < entranceOverrides.size(); ++it, i++) {
             nlohmann::json entranceJson = *it;
             for (auto entranceIt = entranceJson.begin(); entranceIt != entranceJson.end(); ++entranceIt) {
                 if (entranceIt.key() == "type") {
@@ -1658,6 +1664,30 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
             }
         }
     } catch (const std::exception& e) { throw e; }
+    // We may need to reset more things here or elsewhere in spoiler loading
+    RegionTable_Init();
+    ApplyEntranceOverrides();
+    SetAreas();
+}
+
+void EntranceShuffler::ApplyEntranceOverrides() {
+    SetAllEntrancesData();
+
+    for (size_t i = 0; i < entranceOverrides.size(); i++) {
+        EntranceOverride entranceOverride = entranceOverrides[i];
+
+        if (entranceOverride.index == 0 && entranceOverride.destination == 0 && entranceOverride.override == 0 &&
+            entranceOverride.overrideDestination == 0) {
+            continue;
+        }
+
+        Entrance* entrance = entranceMap[entranceOverride.index];
+        Entrance* overrideEntrance = entranceMap[entranceOverride.override];
+
+        entrance->Disconnect();
+        entrance->Connect(overrideEntrance->GetOriginalConnectedRegionKey());
+        entrance->SetAsShuffled();
+    }
 }
 } // namespace Rando
 
diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
index 48a80c5502..5b14611fe8 100644
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@@ -90,14 +90,14 @@ class Entrance {
     Entrance* reverse = nullptr;
     Entrance* assumed = nullptr;
     Entrance* replacement = nullptr;
-    int16_t index = 0xFFFF;
+    int16_t index = -1;
     bool shuffled = false;
     bool primary = false;
     bool addedToPool = false;
     bool decoupled = false;
     std::string name = "";
-    //If this is false, areas only spread to interiors through this entrance if there is no other choice
-    //Set to false for owl drops, the windmill path between dampe's grave and windmill and blue warps
+    // If this is false, areas only spread to interiors through this entrance if there is no other choice
+    // Set to false for owl drops, the windmill path between dampe's grave and windmill and blue warps
     bool spreadsAreasWithPriority = true;
 };
 
@@ -128,6 +128,8 @@ class EntranceShuffler {
     void CreateEntranceOverrides();
     void UnshuffleAllEntrances();
     void ParseJson(nlohmann::json spoilerFileJson);
+    void ApplyEntranceOverrides();
+
   private:
     std::vector<Entrance*> AssumeEntrancePool(std::vector<Entrance*>& entrancePool);
     bool ShuffleOneWayPriorityEntrances(std::map<std::string, PriorityEntrance>& oneWayPriorities,
@@ -150,7 +152,7 @@ class EntranceShuffler {
 
 extern "C" {
 #endif
-  EntranceOverride* Randomizer_GetEntranceOverrides();
+EntranceOverride* Randomizer_GetEntranceOverrides();
 #ifdef __cplusplus
 }
 #endif
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index 9da52ddc21..e347991561 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -15,24 +15,20 @@ extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
 
-#define FSi OTRGlobals::Instance->gRandoContext->GetFishsanity()
-
-#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
-
 /**
  * @brief Parallel list of pond fish checks for both ages
-*/
+ */
 std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> Rando::StaticData::randomizerFishingPondFish = {
     { /*   Child Check           Adult Check    */
-      { RC_LH_CHILD_FISH_1,  RC_LH_ADULT_FISH_1 },
-      { RC_LH_CHILD_FISH_2,  RC_LH_ADULT_FISH_2 },
-      { RC_LH_CHILD_FISH_3,  RC_LH_ADULT_FISH_3 },
-      { RC_LH_CHILD_FISH_4,  RC_LH_ADULT_FISH_4 },
-      { RC_LH_CHILD_FISH_5,  RC_LH_ADULT_FISH_5 },
-      { RC_LH_CHILD_FISH_6,  RC_LH_ADULT_FISH_6 },
-      { RC_LH_CHILD_FISH_7,  RC_LH_ADULT_FISH_7 },
-      { RC_LH_CHILD_FISH_8,  RC_LH_ADULT_FISH_8 },
-      { RC_LH_CHILD_FISH_9,  RC_LH_ADULT_FISH_9 },
+      { RC_LH_CHILD_FISH_1, RC_LH_ADULT_FISH_1 },
+      { RC_LH_CHILD_FISH_2, RC_LH_ADULT_FISH_2 },
+      { RC_LH_CHILD_FISH_3, RC_LH_ADULT_FISH_3 },
+      { RC_LH_CHILD_FISH_4, RC_LH_ADULT_FISH_4 },
+      { RC_LH_CHILD_FISH_5, RC_LH_ADULT_FISH_5 },
+      { RC_LH_CHILD_FISH_6, RC_LH_ADULT_FISH_6 },
+      { RC_LH_CHILD_FISH_7, RC_LH_ADULT_FISH_7 },
+      { RC_LH_CHILD_FISH_8, RC_LH_ADULT_FISH_8 },
+      { RC_LH_CHILD_FISH_9, RC_LH_ADULT_FISH_9 },
       { RC_LH_CHILD_FISH_10, RC_LH_ADULT_FISH_10 },
       { RC_LH_CHILD_FISH_11, RC_LH_ADULT_FISH_11 },
       { RC_LH_CHILD_FISH_12, RC_LH_ADULT_FISH_12 },
@@ -53,282 +49,288 @@ std::unordered_map<int8_t, RandomizerCheck> Rando::StaticData::randomizerGrottoF
 
 ActorFunc drawFishing = NULL;
 ActorFunc drawEnFish = NULL;
-Color_RGBA16 fsPulseColor = { 30, 240, 200 };
+Color_RGB8 fsPulseColor = { 30, 240, 200 };
 
 namespace Rando {
-    const FishIdentity Fishsanity::defaultIdentity = { RAND_INF_MAX, RC_UNKNOWN_CHECK };
-    bool Fishsanity::fishsanityHelpersInit = false;
-    s16 Fishsanity::fishGroupCounter = 0;
-    bool Fishsanity::enableAdvance = false;
-    std::unordered_map<RandomizerCheck, LinkAge> Fishsanity::pondFishAgeMap;
-    std::vector<RandomizerCheck> Fishsanity::childPondFish;
-    std::vector<RandomizerCheck> Fishsanity::adultPondFish;
+const FishIdentity Fishsanity::defaultIdentity = { RAND_INF_MAX, RC_UNKNOWN_CHECK };
+bool Fishsanity::fishsanityHelpersInit = false;
+s16 Fishsanity::fishGroupCounter = 0;
+bool Fishsanity::enableAdvance = false;
+std::unordered_map<RandomizerCheck, LinkAge> Fishsanity::pondFishAgeMap;
+std::vector<RandomizerCheck> Fishsanity::childPondFish;
+std::vector<RandomizerCheck> Fishsanity::adultPondFish;
 
-    Fishsanity::Fishsanity() {
-        InitializeHelpers();
-    }
+Fishsanity::Fishsanity() {
+    InitializeHelpers();
+}
 
-    Fishsanity::~Fishsanity() {
-    
-    }
+Fishsanity::~Fishsanity() {
+}
 
-    bool Fishsanity::GetFishLocationIncluded(Rando::Location* loc,
-                                             FishsanityOptionsSource optionsSource) {
-        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+bool Fishsanity::GetFishLocationIncluded(Rando::Location* loc, FishsanityOptionsSource optionsSource) {
+    auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
 
-        if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF) {
-            return false;
-        }
-        RandomizerCheck rc = loc->GetRandomizerCheck();
-        // Are pond fish enabled, and is this a pond fish location?
-        if (mode != RO_FISHSANITY_OVERWORLD && numFish > 0 && loc->GetScene() == SCENE_FISHING_POND &&
-            loc->GetActorID() == ACTOR_FISHING) {
-            // Is this a child fish location? If so, is it within the defined number of pond fish checks?
-            if (rc >= RC_LH_CHILD_FISH_1 && rc <= RC_LH_CHILD_LOACH_2 && numFish > (loc->GetActorParams() - 100)) {
-                return true;
-            }
-            // Are adult fish available, and is this an adult fish location? If so, is it within the defined number of pond
-            // fish checks?
-            if (ageSplit && rc >= RC_LH_ADULT_FISH_1 && rc <= RC_LH_ADULT_LOACH && numFish > (loc->GetActorParams() - 100)) {
-                return true;
-            }
-        }
-        // Are overworld fish enabled, and is this an overworld fish location?
-        if (mode != RO_FISHSANITY_POND && (loc->GetScene() == SCENE_GROTTOS || loc->GetScene() == SCENE_ZORAS_DOMAIN)
-            && loc->GetActorID() == ACTOR_EN_FISH && (loc->GetActorParams() >> 8)) {
-            return true;
-        }
-        // Must not be an included fish location!
+    if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF || mode == RO_FISHSANITY_HYRULE_LOACH) {
         return false;
     }
-
-    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
-    Fishsanity::GetFishingPondLocations(FishsanityOptionsSource optionsSource) {
-        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
-        std::vector<RandomizerCheck> activeFish;
-        std::vector<RandomizerCheck> remainingFish;
-        std::vector<RandomizerCheck> pondFish = Rando::StaticData::GetPondFishLocations();
-
-        // Fishsanity_InitializeHelpers();
-        remainingFish.insert(remainingFish.end(), pondFish.begin(), pondFish.end());
-
-        // No pond fish shuffled
-        if (numFish == 0) {
-            return std::make_pair(activeFish, remainingFish);
+    RandomizerCheck rc = loc->GetRandomizerCheck();
+    // Are pond fish enabled, and is this a pond fish location?
+    if (mode != RO_FISHSANITY_OVERWORLD && numFish > 0 && loc->GetScene() == SCENE_FISHING_POND &&
+        loc->GetActorID() == ACTOR_FISHING) {
+        // Is this a child fish location? If so, is it within the defined number of pond fish checks?
+        if (rc >= RC_LH_CHILD_FISH_1 && rc <= RC_LH_CHILD_LOACH_2 && numFish > (loc->GetActorParams() - 100)) {
+            return true;
         }
-        // Every pond fish is shuffled, so we can save some time
-        if (numFish > 16) {
-            // Child and adult pond fish are both shuffled, set activeFish to remainingFish and return an empty vector for
-            // inactive fish.
-            if (ageSplit) {
-                return std::make_pair(remainingFish, activeFish);
-            }
-            // Activate all child fish only
-            activeFish = FilterAndEraseFromPool(
-                remainingFish, [](const RandomizerCheck loc) { return pondFishAgeMap[loc] == LINK_AGE_CHILD; });
-            return std::make_pair(activeFish, remainingFish);
+        // Are adult fish available, and is this an adult fish location? If so, is it within the defined number of pond
+        // fish checks?
+        if (ageSplit && rc >= RC_LH_ADULT_FISH_1 && rc <= RC_LH_ADULT_LOACH &&
+            numFish > (loc->GetActorParams() - 100)) {
+            return true;
         }
-        // Only some pond fish are shuffled, so we have to only activate the requested number.
-        activeFish.insert(activeFish.end(), childPondFish.begin(), childPondFish.begin() + numFish);
-        // If pond is split, also add the requested number of adult fish.
+    }
+    // Are overworld fish enabled, and is this an overworld fish location?
+    if (mode != RO_FISHSANITY_POND && (loc->GetScene() == SCENE_GROTTOS || loc->GetScene() == SCENE_ZORAS_DOMAIN) &&
+        loc->GetActorID() == ACTOR_EN_FISH && (loc->GetActorParams() >> 8)) {
+        return true;
+    }
+    // Must not be an included fish location!
+    return false;
+}
+
+std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+Fishsanity::GetFishingPondLocations(FishsanityOptionsSource optionsSource) {
+    auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+    std::vector<RandomizerCheck> activeFish;
+    std::vector<RandomizerCheck> remainingFish;
+    std::vector<RandomizerCheck> pondFish = Rando::StaticData::GetPondFishLocations();
+
+    // Fishsanity_InitializeHelpers();
+    remainingFish.insert(remainingFish.end(), pondFish.begin(), pondFish.end());
+
+    // No pond fish shuffled
+    if (numFish == 0) {
+        return std::make_pair(activeFish, remainingFish);
+    }
+    // Every pond fish is shuffled, so we can save some time
+    if (numFish > 16) {
+        // Child and adult pond fish are both shuffled, set activeFish to remainingFish and return an empty vector for
+        // inactive fish.
         if (ageSplit) {
-            activeFish.insert(activeFish.end(), adultPondFish.begin(),
-                              adultPondFish.begin() + std::min<uint8_t>(numFish, 16));
+            return std::make_pair(remainingFish, activeFish);
         }
-        // NOTE: This only works because we can assume activeFish is already sorted; changes that break this assumption will
-        // also break this
-        FilterAndEraseFromPool(remainingFish,
-                               [&](uint32_t loc) { return std::binary_search(activeFish.begin(), activeFish.end(), loc); });
-
+        // Activate all child fish only
+        activeFish = FilterAndEraseFromPool(
+            remainingFish, [](const RandomizerCheck loc) { return pondFishAgeMap[loc] == LINK_AGE_CHILD; });
         return std::make_pair(activeFish, remainingFish);
     }
+    // Only some pond fish are shuffled, so we have to only activate the requested number.
+    activeFish.insert(activeFish.end(), childPondFish.begin(), childPondFish.begin() + numFish);
+    // If pond is split, also add the requested number of adult fish.
+    if (ageSplit) {
+        activeFish.insert(activeFish.end(), adultPondFish.begin(),
+                          adultPondFish.begin() + std::min<uint8_t>(numFish, 16));
+    }
+    // NOTE: This only works because we can assume activeFish is already sorted; changes that break this assumption will
+    // also break this
+    FilterAndEraseFromPool(remainingFish, [&](RandomizerCheck loc) {
+        return std::binary_search(activeFish.begin(), activeFish.end(), loc);
+    });
 
-    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
-    Fishsanity::GetFishsanityLocations(FishsanityOptionsSource optionsSource) {
-        auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
-        std::vector<RandomizerCheck> activeFish;
-        std::vector<RandomizerCheck> remainingFish;
+    return std::make_pair(activeFish, remainingFish);
+}
 
-        // Add pond fish
-        if (mode == RO_FISHSANITY_POND || mode == RO_FISHSANITY_BOTH) {
-            auto pondLocations = GetFishingPondLocations(optionsSource);
-            activeFish.insert(activeFish.end(), pondLocations.first.begin(), pondLocations.first.end());
-            remainingFish.insert(remainingFish.end(), pondLocations.second.begin(), pondLocations.second.end());
-        }
+std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+Fishsanity::GetFishsanityLocations(FishsanityOptionsSource optionsSource) {
+    auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
+    std::vector<RandomizerCheck> activeFish;
+    std::vector<RandomizerCheck> remainingFish;
 
-        // Add overworld fish
-        if (mode == RO_FISHSANITY_OVERWORLD || mode == RO_FISHSANITY_BOTH) {
-            std::vector<RandomizerCheck> overworldFish = Rando::StaticData::GetOverworldFishLocations();
-            activeFish.insert(activeFish.end(), overworldFish.begin(), overworldFish.end());
-        }
-
-        return std::make_pair(activeFish, remainingFish);
+    // Add pond fish
+    if (mode == RO_FISHSANITY_POND || mode == RO_FISHSANITY_BOTH) {
+        auto pondLocations = GetFishingPondLocations(optionsSource);
+        activeFish.insert(activeFish.end(), pondLocations.first.begin(), pondLocations.first.end());
+        remainingFish.insert(remainingFish.end(), pondLocations.second.begin(), pondLocations.second.end());
     }
 
-    FishIdentity Fishsanity::IdentifyPondFish(u8 fishParams) {
-        auto [mode, pondCount, ageSplit] = GetOptions();
-        FishIdentity identity = defaultIdentity;
+    // Add overworld fish
+    if (mode == RO_FISHSANITY_OVERWORLD || mode == RO_FISHSANITY_BOTH) {
+        std::vector<RandomizerCheck> overworldFish = Rando::StaticData::GetOverworldFishLocations();
+        activeFish.insert(activeFish.end(), overworldFish.begin(), overworldFish.end());
+    }
 
-        if (!GetPondFishShuffled()) {
-            return identity;
-        }
+    return std::make_pair(activeFish, remainingFish);
+}
 
-        if (pondCount > 16) {
-            identity = GetPondFish(fishParams, IsAdultPond());
-        } else {
-            identity = LINK_IS_ADULT ? mCurrPondFish.second : mCurrPondFish.first;
-        }
+FishIdentity Fishsanity::IdentifyPondFish(u8 fishParams) {
+    auto [mode, pondCount, ageSplit] = GetOptions();
+    FishIdentity identity = defaultIdentity;
 
+    if (!GetPondFishShuffled()) {
         return identity;
     }
 
-    FishsanityPondOptions Fishsanity::GetOptions(FishsanityOptionsSource optionsSource) {
-        FishsanityPondOptions options{};
-        switch (optionsSource) {
-            // Used in check tracker
-            case FSO_SOURCE_CVARS:
-                options.mode = CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF);
-                options.numFish = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), 0);
-                options.ageSplit = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), 0) == 1;
-                break;
-            case FSO_SOURCE_RANDO:
-            default:
-                options.mode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
-                options.numFish = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT);
-                options.ageSplit = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
-                break;
-        }
-        return options;
+    if (pondCount > 16) {
+        identity = GetPondFish(fishParams, IsAdultPond());
+    } else {
+        identity = LINK_IS_ADULT ? mCurrPondFish.second : mCurrPondFish.first;
     }
 
-    void Fishsanity::UpdateCurrentPondFish() {
-        auto [mode, pondCount, ageSplit] = GetOptions();
-        mCurrPondFish = std::pair<FishIdentity, FishIdentity>();
-        mCurrPondFish.first = defaultIdentity;
-        mCurrPondFish.second = defaultIdentity;
+    return identity;
+}
 
-        // Initialize mCurrPondFish if we're shuffling pond fish, but if all fish are shuffled, we don't need to use this.
-        if ((mode == RO_FISHSANITY_BOTH || mode == RO_FISHSANITY_POND) && pondCount < 17) {
-            // find the first inf that isn't set yet for each age
-            // but don't go past the max number
-            std::pair<RandomizerCheck, RandomizerCheck> tableEntry;
-            for (s16 i = 0, params = 100; i < pondCount; i++, params++) {
-                tableEntry = Rando::StaticData::randomizerFishingPondFish[i];
-                if (!Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.first)) || i == pondCount - 1) {
-                    // Found first child check
-                    if (!IsFish(&mCurrPondFish.first)) {
-                        mCurrPondFish.first = GetPondFish(params, false);
-                    }
+FishsanityPondOptions Fishsanity::GetOptions(FishsanityOptionsSource optionsSource) {
+    FishsanityPondOptions options{};
+    switch (optionsSource) {
+        // Used in check tracker
+        case FSO_SOURCE_CVARS:
+            options.mode = CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF);
+            options.numFish = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityPondCount"), 0);
+            options.ageSplit = CVarGetInteger(CVAR_RANDOMIZER_SETTING("FishsanityAgeSplit"), 0) == 1;
+            break;
+        case FSO_SOURCE_RANDO:
+        default:
+            options.mode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+            options.numFish = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT);
+            options.ageSplit = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
+            break;
+    }
+    return options;
+}
 
-                    if (!ageSplit && !IsFish(&mCurrPondFish.second)) {
-                        mCurrPondFish.second = GetPondFish(params, false);
-                        // both ages are resolved! we can quit here
-                        break;
-                    }
+void Fishsanity::UpdateCurrentPondFish() {
+    auto [mode, pondCount, ageSplit] = GetOptions();
+    mCurrPondFish = std::pair<FishIdentity, FishIdentity>();
+    mCurrPondFish.first = defaultIdentity;
+    mCurrPondFish.second = defaultIdentity;
+
+    // Initialize mCurrPondFish if we're shuffling pond fish, but if all fish are shuffled, we don't need to use this.
+    if ((mode == RO_FISHSANITY_BOTH || mode == RO_FISHSANITY_POND) && pondCount < 17) {
+        // find the first inf that isn't set yet for each age
+        // but don't go past the max number
+        std::pair<RandomizerCheck, RandomizerCheck> tableEntry;
+        for (s16 i = 0, params = 100; i < pondCount; i++, params++) {
+            tableEntry = Rando::StaticData::randomizerFishingPondFish[i];
+            if (!Flags_GetRandomizerInf(
+                    OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.first)) ||
+                i == pondCount - 1) {
+                // Found first child check
+                if (!IsFish(&mCurrPondFish.first)) {
+                    mCurrPondFish.first = GetPondFish(params, false);
                 }
 
-                if (ageSplit && !IsFish(&mCurrPondFish.second) && tableEntry.second != RC_UNKNOWN_CHECK &&
-                    (!Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.second)) || i == pondCount - 1)) {
-                    mCurrPondFish.second = GetPondFish(params, true);
+                if (!ageSplit && !IsFish(&mCurrPondFish.second)) {
+                    mCurrPondFish.second = GetPondFish(params, false);
+                    // both ages are resolved! we can quit here
+                    break;
                 }
             }
+
+            if (ageSplit && !IsFish(&mCurrPondFish.second) && tableEntry.second != RC_UNKNOWN_CHECK &&
+                (!Flags_GetRandomizerInf(
+                     OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(tableEntry.second)) ||
+                 i == pondCount - 1)) {
+                mCurrPondFish.second = GetPondFish(params, true);
+            }
         }
     }
+}
 
-    void Fishsanity::InitializeFromSave() {
-        UpdateCurrentPondFish();
-    }
+void Fishsanity::InitializeFromSave() {
+    UpdateCurrentPondFish();
+}
 
-    bool Fishsanity::GetPondFishShuffled() {
-        u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
-        return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 0 &&
-            (fsMode == RO_FISHSANITY_POND || fsMode == RO_FISHSANITY_BOTH);
-    }
+bool Fishsanity::GetPondFishShuffled() {
+    u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+    return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_POND_COUNT) > 0 &&
+           (fsMode == RO_FISHSANITY_POND || fsMode == RO_FISHSANITY_BOTH);
+}
 
-    bool Fishsanity::GetOverworldFishShuffled() {
-        u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
-        return fsMode == RO_FISHSANITY_OVERWORLD || fsMode == RO_FISHSANITY_BOTH;
-    }
+bool Fishsanity::GetOverworldFishShuffled() {
+    u8 fsMode = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY);
+    return fsMode == RO_FISHSANITY_OVERWORLD || fsMode == RO_FISHSANITY_BOTH;
+}
 
-    bool Fishsanity::IsAdultPond() {
-        return LINK_IS_ADULT && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
-    }
+bool Fishsanity::IsAdultPond() {
+    return LINK_IS_ADULT && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY_AGE_SPLIT);
+}
 
-    bool Fishsanity::GetPondCleared() {
-        auto [mode, pondCount, ageSplit] = GetOptions();
-        // no fish shuffled, so pond is always cleared :thumbsup:
-        if (pondCount == 0) {
-            return true;
-        }
-
-        bool adultPond = LINK_IS_ADULT && ageSplit;
-        // if we've collected the final shuffled fish, pond is complete
-        if (pondCount <= 16) {
-            auto tableEntry = Rando::StaticData::randomizerFishingPondFish[pondCount - 1];
-            return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(adultPond ? tableEntry.second : tableEntry.first));
-        }
-
-        // the last two checks actually don't matter because logically they will never be true, but maybe one day they will
-        // if every fish is shuffled, check if we've collected every fish
-        for (auto tableEntry : Rando::StaticData::randomizerFishingPondFish) {
-            RandomizerCheck rc = adultPond ? tableEntry.second : tableEntry.first;
-            // if we haven't collected this fish, then we're not done yet! get back in there, soldier
-            if (rc != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc))) {
-                return false;
-            }
-        }
+bool Fishsanity::GetPondCleared() {
+    auto [mode, pondCount, ageSplit] = GetOptions();
+    // no fish shuffled, so pond is always cleared :thumbsup:
+    if (pondCount == 0) {
         return true;
     }
 
-    bool Fishsanity::GetDomainCleared() {
-        for (RandomizerInf i = RAND_INF_ZD_FISH_1; i <= RAND_INF_ZD_FISH_5; i = (RandomizerInf)(i + 1)) {
-            if (!Flags_GetRandomizerInf(i)) {
-                return false;
-            }
-        }
-        return true;
+    bool adultPond = LINK_IS_ADULT && ageSplit;
+    // if we've collected the final shuffled fish, pond is complete
+    if (pondCount <= 16) {
+        auto tableEntry = Rando::StaticData::randomizerFishingPondFish[pondCount - 1];
+        return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(
+            adultPond ? tableEntry.second : tableEntry.first));
     }
 
-    void Fishsanity::InitializeHelpers() {
-        if (fishsanityHelpersInit) {
-            return;
-        }
-
-        for (auto pair : Rando::StaticData::randomizerFishingPondFish) {
-            pondFishAgeMap[pair.first] = LINK_AGE_CHILD;
-            pondFishAgeMap[pair.second] = LINK_AGE_ADULT;
-            childPondFish.push_back(pair.first);
-            adultPondFish.push_back(pair.second);
+    // the last two checks actually don't matter because logically they will never be true, but maybe one day they will
+    // if every fish is shuffled, check if we've collected every fish
+    for (auto tableEntry : Rando::StaticData::randomizerFishingPondFish) {
+        RandomizerCheck rc = adultPond ? tableEntry.second : tableEntry.first;
+        // if we haven't collected this fish, then we're not done yet! get back in there, soldier
+        if (rc != RC_UNKNOWN_CHECK &&
+            !Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc))) {
+            return false;
         }
     }
+    return true;
+}
 
-    FishIdentity Fishsanity::GetPondFish(s16 params, bool adultPond) {
-        auto pair = Rando::StaticData::randomizerFishingPondFish[params - 100];
-        RandomizerCheck rc = adultPond ? pair.second : pair.first;
-        return { OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc), rc };
+bool Fishsanity::GetDomainCleared() {
+    for (RandomizerInf i = RAND_INF_ZD_FISH_1; i <= RAND_INF_ZD_FISH_5; i = (RandomizerInf)(i + 1)) {
+        if (!Flags_GetRandomizerInf(i)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void Fishsanity::InitializeHelpers() {
+    if (fishsanityHelpersInit) {
+        return;
     }
 
-    FishIdentity Fishsanity::AdvancePond() {
-        auto [mode, pondCount, ageSplit] = GetOptions();
+    for (auto pair : Rando::StaticData::randomizerFishingPondFish) {
+        pondFishAgeMap[pair.first] = LINK_AGE_CHILD;
+        pondFishAgeMap[pair.second] = LINK_AGE_ADULT;
+        childPondFish.push_back(pair.first);
+        adultPondFish.push_back(pair.second);
+    }
+}
 
-        // No need to update state with full pond shuffle
-        if (pondCount > 16) {
-            return defaultIdentity;
-        }
+FishIdentity Fishsanity::GetPondFish(s16 params, bool adultPond) {
+    auto pair = Rando::StaticData::randomizerFishingPondFish[params - 100];
+    RandomizerCheck rc = adultPond ? pair.second : pair.first;
+    return { OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc), rc };
+}
 
-        UpdateCurrentPondFish();
+FishIdentity Fishsanity::AdvancePond() {
+    auto [mode, pondCount, ageSplit] = GetOptions();
 
-        return IsAdultPond() ? mCurrPondFish.second : mCurrPondFish.first;
+    // No need to update state with full pond shuffle
+    if (pondCount > 16) {
+        return defaultIdentity;
     }
 
-    FishsanityCheckType Fishsanity::GetCheckType(RandomizerCheck rc) {
-        // if it's not RCTYPE_FISH, obviously it's not a fish
-        if (Rando::StaticData::GetLocation(rc)->GetRCType() != RCTYPE_FISH) {
-            return FSC_NONE;
-        }
+    UpdateCurrentPondFish();
 
-        auto loc = Rando::StaticData::GetLocation(rc);
-        switch (loc->GetScene()) {
+    return IsAdultPond() ? mCurrPondFish.second : mCurrPondFish.first;
+}
+
+FishsanityCheckType Fishsanity::GetCheckType(RandomizerCheck rc) {
+    // if it's not RCTYPE_FISH, obviously it's not a fish
+    if (Rando::StaticData::GetLocation(rc)->GetRCType() != RCTYPE_FISH) {
+        return FSC_NONE;
+    }
+
+    auto loc = Rando::StaticData::GetLocation(rc);
+    switch (loc->GetScene()) {
         case SCENE_FISHING_POND:
             return FSC_POND;
         case SCENE_ZORAS_DOMAIN:
@@ -337,249 +339,248 @@ namespace Rando {
             return FSC_GROTTO;
         default:
             return FSC_NONE;
-        }
+    }
+}
+
+bool Fishsanity::IsFish(FishIdentity* fish) {
+    if (fish->randomizerCheck == RC_UNKNOWN_CHECK || fish->randomizerInf == RAND_INF_MAX) {
+        return false;
     }
 
-    bool Fishsanity::IsFish(FishIdentity* fish) {
-        if (fish->randomizerCheck == RC_UNKNOWN_CHECK || fish->randomizerInf == RAND_INF_MAX) {
-            return false;
+    return GetCheckType(fish->randomizerCheck) != FSC_NONE;
+}
+
+void Fishsanity::OnActorInitHandler(void* refActor) {
+    Actor* actor = static_cast<Actor*>(refActor);
+
+    auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+    FishIdentity fish;
+
+    if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+        // Set fish ID for ZD fish
+        if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && actor->params == -1) {
+            actor->params ^= fishGroupCounter++;
+        } else if (gPlayState->sceneNum == SCENE_GROTTOS && actor->params == 1) {
+            actor->params = 0x100 | gSaveContext.respawn[RESPAWN_MODE_RETURN].data;
         }
 
-        return GetCheckType(fish->randomizerCheck) != FSC_NONE;
-    }
-
-    void Fishsanity::OnActorInitHandler(void* refActor) {
-        Actor* actor = static_cast<Actor*>(refActor);
-
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-        FishIdentity fish;
-
-        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
-            // Set fish ID for ZD fish
-            if (gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && actor->params == -1) {
-                actor->params ^= fishGroupCounter++;
-            } else if (gPlayState->sceneNum == SCENE_GROTTOS && actor->params == 1) {
-                actor->params = 0x100 | gSaveContext.respawn[RESPAWN_MODE_RETURN].data;
+        fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+        // Render fish as randomized item
+        if (Rando::Fishsanity::IsFish(&fish) && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+            if (!drawEnFish) {
+                drawEnFish = actor->draw;
             }
+            actor->draw = Fishsanity_DrawEnFish;
+        }
+        return;
+    }
 
-            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-            // Render fish as randomized item
-            if (Rando::Fishsanity::IsFish(&fish) && !Flags_GetRandomizerInf(fish.randomizerInf)) {
-                if (!drawEnFish) {
-                    drawEnFish = actor->draw;
+    if (actor->id == ACTOR_FISHING && gPlayState->sceneNum == SCENE_FISHING_POND && actor->params >= 100 &&
+        actor->params <= 117 && fs->GetPondFishShuffled()) {
+        // Initialize pond fish for fishsanity
+        // Initialize fishsanity metadata on this actor
+        Fishing* fishActor = static_cast<Fishing*>(refActor);
+        // fishActor->fishsanityParams = actor->params;
+        fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+
+        // With every pond fish shuffled, caught fish will not spawn unless all fish have been caught.
+        if (RAND_GET_OPTION(RSK_FISHSANITY_POND_COUNT) > 16 && !fs->GetPondCleared()) {
+            // Create effect for uncaught fish
+            if (!Flags_GetRandomizerInf(fish.randomizerInf)) {
+                actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
+                if (!drawFishing) {
+                    drawFishing = actor->draw;
                 }
-                actor->draw = Fishsanity_DrawEnFish;
+                actor->draw = Fishsanity_DrawFishing;
             }
-            return;
         }
+    }
+}
 
-        if (actor->id == ACTOR_FISHING && gPlayState->sceneNum == SCENE_FISHING_POND && actor->params >= 100 &&
-            actor->params <= 117 && fs->GetPondFishShuffled()) {
-            // Initialize pond fish for fishsanity
-            // Initialize fishsanity metadata on this actor
-            Fishing* fishActor = static_cast<Fishing*>(refActor);
-            //fishActor->fishsanityParams = actor->params;
-            fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+void Fishsanity::OnActorUpdateHandler(void* refActor) {
+    if (gPlayState->sceneNum != SCENE_GROTTOS && gPlayState->sceneNum != SCENE_ZORAS_DOMAIN &&
+        gPlayState->sceneNum != SCENE_FISHING_POND) {
+        return;
+    }
 
-            // With every pond fish shuffled, caught fish will not spawn unless all fish have been caught.
-            if (RAND_GET_OPTION(RSK_FISHSANITY_POND_COUNT) > 16 &&
-                !fs->GetPondCleared()) {
-                // Create effect for uncaught fish
-                if (!Flags_GetRandomizerInf(fish.randomizerInf)) {
-                    actor->shape.shadowDraw = Fishsanity_DrawEffShadow;
-                    if (!drawFishing) {
-                        drawFishing = actor->draw;
-                    }
-                    actor->draw = Fishsanity_DrawFishing;
+    Actor* actor = static_cast<Actor*>(refActor);
+    auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+
+    // Detect fish catch
+    if (actor->id == ACTOR_FISHING && fs->GetPondFishShuffled()) {
+        Fishing* fish = static_cast<Fishing*>(refActor);
+
+        // State 6 -> Fish caught and hoisted
+        if (fish->fishState == 6) {
+            FishIdentity identity =
+                OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+            if (identity.randomizerCheck != RC_UNKNOWN_CHECK) {
+                Flags_SetRandomizerInf(identity.randomizerInf);
+                enableAdvance = true;
+                // Remove uncaught effect
+                if (actor->shape.shadowDraw != NULL) {
+                    actor->shape.shadowDraw = NULL;
+                    actor->draw = drawFishing;
                 }
             }
         }
     }
 
-    void Fishsanity::OnActorUpdateHandler(void* refActor) {
-        if (gPlayState->sceneNum != SCENE_GROTTOS && gPlayState->sceneNum != SCENE_ZORAS_DOMAIN && gPlayState->sceneNum != SCENE_FISHING_POND) {
-            return;
-        }
-
-        Actor* actor = static_cast<Actor*>(refActor);
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-
-        // Detect fish catch
-        if (actor->id == ACTOR_FISHING && fs->GetPondFishShuffled()) {
-            Fishing* fish = static_cast<Fishing*>(refActor);
-
-            // State 6 -> Fish caught and hoisted
-            if (fish->fishState == 6) {
-                FishIdentity identity = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-                if (identity.randomizerCheck != RC_UNKNOWN_CHECK) {
-                    Flags_SetRandomizerInf(identity.randomizerInf);
-                    enableAdvance = true;
-                    // Remove uncaught effect
-                    if (actor->shape.shadowDraw != NULL) {
-                        actor->shape.shadowDraw = NULL;
-                        actor->draw = drawFishing;
-                    }
-                }
+    if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+        FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+        EnFish* fishActor = static_cast<EnFish*>(refActor);
+        if (Rando::Fishsanity::IsFish(&fish) && Flags_GetRandomizerInf(fish.randomizerInf)) {
+            // Reset draw method
+            if (actor->draw == Fishsanity_DrawEnFish) {
+                actor->draw = drawEnFish;
             }
         }
 
-        if (actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
-            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-            EnFish* fishActor = static_cast<EnFish*>(refActor);
-            if (Rando::Fishsanity::IsFish(&fish) && Flags_GetRandomizerInf(fish.randomizerInf)) {
-                // Reset draw method
-                if (actor->draw == Fishsanity_DrawEnFish) {
-                    actor->draw = drawEnFish;
-                }
-            }
-
-            if (((actor->params >> 8) > 0) && fishActor->respawnTimer > 0) {
-                Actor_Kill(actor);
-            }
-        }
-
-        // Reset fish group counter when the group gets culled
-        if (actor->id == ACTOR_OBJ_MURE && gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && fishGroupCounter > 0 &&
-            !(actor->flags & ACTOR_FLAG_UPDATE_CULLING_DISABLED) && fs->GetOverworldFishShuffled()) {
-            fishGroupCounter = 0;
+        if (((actor->params >> 8) > 0) && fishActor->respawnTimer > 0) {
+            Actor_Kill(actor);
         }
     }
 
-    void Fishsanity::OnSceneInitHandler(int16_t sceneNum) {
-        if (sceneNum == SCENE_ZORAS_DOMAIN) {
-            fishGroupCounter = 0;
+    // Reset fish group counter when the group gets culled
+    if (actor->id == ACTOR_OBJ_MURE && gPlayState->sceneNum == SCENE_ZORAS_DOMAIN && fishGroupCounter > 0 &&
+        !(actor->flags & ACTOR_FLAG_UPDATE_CULLING_DISABLED) && fs->GetOverworldFishShuffled()) {
+        fishGroupCounter = 0;
+    }
+}
+
+void Fishsanity::OnSceneInitHandler(int16_t sceneNum) {
+    if (sceneNum == SCENE_ZORAS_DOMAIN) {
+        fishGroupCounter = 0;
+    }
+}
+
+void Fishsanity::OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
+    va_list args;
+    va_copy(args, originalArgs);
+
+    Actor* actor = va_arg(args, Actor*);
+    auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
+
+    va_end(args);
+
+    if (id == VB_BOTTLE_ACTOR && actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
+        FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
+        if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
+            Flags_SetRandomizerInf(fish.randomizerInf);
+            actor->parent = &GET_PLAYER(gPlayState)->actor;
+            *should = false;
         }
     }
+}
 
-    void Fishsanity::OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs) {
-        va_list args;
-        va_copy(args, originalArgs);
-
-        Actor* actor = va_arg(args, Actor*);
-        auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
-
-        va_end(args);
-
-        if (id == VB_BOTTLE_ACTOR && actor->id == ACTOR_EN_FISH && fs->GetOverworldFishShuffled()) {
-            FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(gPlayState->sceneNum, actor->params);
-            if (fish.randomizerCheck != RC_UNKNOWN_CHECK && !Flags_GetRandomizerInf(fish.randomizerInf)) {
-                Flags_SetRandomizerInf(fish.randomizerInf);
-                actor->parent = &GET_PLAYER(gPlayState)->actor;
-                *should = false;
-            }
-        }
-    }
-
-    void Fishsanity::OnItemReceiveHandler(GetItemEntry itemEntry) {
-        if (enableAdvance) {
-            enableAdvance = false;
-            OTRGlobals::Instance->gRandoContext->GetFishsanity()->AdvancePond();
-        }
+void Fishsanity::OnItemReceiveHandler(GetItemEntry itemEntry) {
+    if (enableAdvance) {
+        enableAdvance = false;
+        OTRGlobals::Instance->gRandoContext->GetFishsanity()->AdvancePond();
     }
+}
 } // namespace Rando
 
 // C interface
 extern "C" {
-    bool Randomizer_GetPondFishShuffled() {
-        return FSi->GetPondFishShuffled();
+bool Randomizer_GetPondFishShuffled() {
+    return Rando::Context::GetInstance()->GetFishsanity()->GetPondFishShuffled();
+}
+
+bool Randomizer_GetOverworldFishShuffled() {
+    return Rando::Context::GetInstance()->GetFishsanity()->GetOverworldFishShuffled();
+}
+
+bool Randomizer_IsAdultPond() {
+    return Rando::Context::GetInstance()->GetFishsanity()->IsAdultPond();
+}
+
+void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play) {
+    Vec3f pos, ripplePos;
+    static Vec3f velocity = { 0.0f, 0.0f, 0.0f };
+    static Vec3f accel = { 0.0f, 0.0f, 0.0f };
+    Color_RGBA8 primColor;
+    Color_RGBA8 envColor;
+
+    // Color of the circle for the particles
+    static Color_RGBA8 mainColors[5][4] = { { 240, 154, 137, 200 },
+                                            { 240, 190, 137, 200 },
+                                            { 240, 171, 137, 200 },
+                                            { 240, 141, 146, 200 },
+                                            { 240, 204, 137, 200 } };
+
+    // Color of the faded flares stretching off the particles
+    static Color_RGBA8 flareColors[5][3] = {
+        { 128, 85, 82, 200 }, { 128, 101, 82, 200 }, { 128, 93, 82, 200 }, { 128, 82, 98, 200 }, { 128, 108, 82, 200 }
+    };
+
+    Color_RGBA8_Copy(&primColor, mainColors[ABS(actor->params) % 5]);
+    Color_RGBA8_Copy(&envColor, flareColors[ABS(actor->params) % 5]);
+
+    // Spawn sparkles
+    pos.x = Rand_CenteredFloat(23.0f) + actor->world.pos.x;
+    pos.y = (Rand_Centered() * 12.0f) + actor->world.pos.y;
+    pos.z = Rand_CenteredFloat(23.0f) + actor->world.pos.z;
+    velocity.y = 0.05f;
+    accel.y = 0.025f;
+    Math_Vec3f_Copy(&ripplePos, &pos);
+    ripplePos.y += actor->yDistToWater;
+
+    if (Rand_ZeroOne() < 0.3f) {
+        EffectSsKiraKira_SpawnDispersed(play, &pos, &velocity, &accel, &primColor, &envColor, 1800, 10);
     }
 
-    bool Randomizer_GetOverworldFishShuffled() {
-        return FSi->GetOverworldFishShuffled();
-    }
-
-    bool Randomizer_IsAdultPond() {
-        return FSi->IsAdultPond();
-    }
-
-    void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play) {
-        Vec3f pos, ripplePos;
-        static Vec3f velocity = { 0.0f, 0.0f, 0.0f };
-        static Vec3f accel = { 0.0f, 0.0f, 0.0f };
-        Color_RGBA8 primColor;
-        Color_RGBA8 envColor;
-
-        // Color of the circle for the particles
-        static Color_RGBA8 mainColors[5][4] = {
-            { 240, 154, 137, 200 },
-            { 240, 190, 137, 200 },
-            { 240, 171, 137, 200 },
-            { 240, 141, 146, 200 },
-            { 240, 204, 137, 200 }
-        };
-
-        // Color of the faded flares stretching off the particles
-        static Color_RGBA8 flareColors[5][3] = {
-            { 128, 85, 82, 200 },
-            { 128, 101, 82, 200 },
-            { 128, 93, 82, 200 },
-            { 128, 82, 98, 200 },
-            { 128, 108, 82, 200 }
-        };
-
-        Color_RGBA8_Copy(&primColor, mainColors[ABS(actor->params) % 5]);
-        Color_RGBA8_Copy(&envColor, flareColors[ABS(actor->params) % 5]);
-
-        // Spawn sparkles
-        pos.x = Rand_CenteredFloat(23.0f) + actor->world.pos.x;
-        pos.y = (Rand_Centered() * 12.0f) + actor->world.pos.y;
-        pos.z = Rand_CenteredFloat(23.0f) + actor->world.pos.z;
-        velocity.y = 0.05f;
-        accel.y = 0.025f;
-        Math_Vec3f_Copy(&ripplePos, &pos);
-        ripplePos.y += actor->yDistToWater;
-
-        if (Rand_ZeroOne() < 0.3f) {
-            EffectSsKiraKira_SpawnDispersed(play, &pos, &velocity, &accel, &primColor, &envColor, 1800, 10);
-        }
-
-        if (actor->bgCheckFlags & 0x20 && Rand_ZeroOne() < 0.15f) {
-            EffectSsGRipple_Spawn(play, &ripplePos, 100, 200, 2);
-        }
-    }
-
-    void Fishsanity_DrawEnFish(struct Actor* actor, struct PlayState* play) {
-        FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(play->sceneNum, actor->params);
-        GetItemEntry randoItem = Rando::Context::GetInstance()->GetFinalGIEntry(fish.randomizerCheck, true, GI_FISH);
-        if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
-            randoItem = GET_ITEM_MYSTERY;
-        }
-
-        Matrix_Push();
-        Matrix_Scale(30.0, 30.0, 30.0, MTXMODE_APPLY);
-
-        func_8002EBCC(actor, play, 0);
-        func_8002ED80(actor, play, 0);
-        EnItem00_CustomItemsParticles(actor, play, randoItem);
-        GetItemEntry_Draw(play, randoItem);
-
-        Matrix_Pop();
-    }
-
-    void Fishsanity_DrawFishing(struct Actor* actor, struct PlayState* play) {
-        Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (actor->params - 100) * 20);
-        drawFishing(actor, play);
-        Fishsanity_CloseGreyscaleColor(play);
-    }
-
-    void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset) {
-        OPEN_DISPS(play->state.gfxCtx);
-        gDPSetGrayscaleColor(
-            POLY_OPA_DISP++, color->r, color->g, color->b,
-            // Make color pulse, offset a bit by the actor params
-            ABS(255.0f * Math_CosS((play->gameplayFrames + frameOffset) * 1000)));
-        gSPGrayscale(POLY_OPA_DISP++, true);
-        CLOSE_DISPS(play->state.gfxCtx);
-    }
-
-    void Fishsanity_CloseGreyscaleColor(PlayState* play) {
-        OPEN_DISPS(play->state.gfxCtx);
-        gSPGrayscale(POLY_OPA_DISP++, false);
-        CLOSE_DISPS(play->state.gfxCtx);
+    if (actor->bgCheckFlags & 0x20 && Rand_ZeroOne() < 0.15f) {
+        EffectSsGRipple_Spawn(play, &ripplePos, 100, 200, 2);
     }
 }
 
+void Fishsanity_DrawEnFish(struct Actor* actor, struct PlayState* play) {
+    FishIdentity fish = OTRGlobals::Instance->gRandomizer->IdentifyFish(play->sceneNum, actor->params);
+    GetItemEntry randoItem = Rando::Context::GetInstance()->GetFinalGIEntry(fish.randomizerCheck, true, GI_FISH);
+    if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
+        randoItem = GET_ITEM_MYSTERY;
+    }
+
+    Matrix_Push();
+    Matrix_Scale(30.0, 30.0, 30.0, MTXMODE_APPLY);
+
+    func_8002EBCC(actor, play, 0);
+    func_8002ED80(actor, play, 0);
+    EnItem00_CustomItemsParticles(actor, play, randoItem);
+    GetItemEntry_Draw(play, randoItem);
+
+    Matrix_Pop();
+}
+
+void Fishsanity_DrawFishing(struct Actor* actor, struct PlayState* play) {
+    Fishsanity_OpenGreyscaleColor(play, &fsPulseColor, (actor->params - 100) * 20);
+    drawFishing(actor, play);
+    Fishsanity_CloseGreyscaleColor(play);
+}
+
+void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGB8* color, int16_t frameOffset) {
+    OPEN_DISPS(play->state.gfxCtx);
+    gDPSetGrayscaleColor(POLY_OPA_DISP++, color->r, color->g, color->b,
+                         // Make color pulse, offset a bit by the actor params
+                         ABS(255.0f * Math_CosS((play->gameplayFrames + frameOffset) * 1000)));
+    gSPGrayscale(POLY_OPA_DISP++, true);
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
+void Fishsanity_CloseGreyscaleColor(PlayState* play) {
+    OPEN_DISPS(play->state.gfxCtx);
+    gSPGrayscale(POLY_OPA_DISP++, false);
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+}
+
 void Rando::StaticData::RegisterFishLocations() {
+    static bool registered = false;
+    if (registered)
+        return;
+    registered = true;
+    // clang-format off
     // Fishing Pond
     locationTable[RC_LH_CHILD_FISH_1] =                                                Location::Fish(RC_LH_CHILD_FISH_1,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 100,      RAND_INF_CHILD_FISH_1,                         "Child Pond Fish 1",           RHT_LH_POND_FISH,                  RG_NONE);
     locationTable[RC_LH_CHILD_FISH_2] =                                                Location::Fish(RC_LH_CHILD_FISH_2,                                              RCQUEST_BOTH,                                                                             ACTOR_FISHING,        SCENE_FISHING_POND,                 101,      RAND_INF_CHILD_FISH_2,                         "Child Pond Fish 2",           RHT_LH_POND_FISH,                  RG_NONE);
@@ -630,6 +631,7 @@ void Rando::StaticData::RegisterFishLocations() {
     locationTable[RC_ZD_FISH_3] =                                                      Location::Fish(RC_ZD_FISH_3,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 2,   RAND_INF_ZD_FISH_3,                            "Fish 3",                      RHT_ZD_FISH,                       RG_FISH);
     locationTable[RC_ZD_FISH_4] =                                                      Location::Fish(RC_ZD_FISH_4,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 3,   RAND_INF_ZD_FISH_4,                            "Fish 4",                      RHT_ZD_FISH,                       RG_FISH);
     locationTable[RC_ZD_FISH_5] =                                                      Location::Fish(RC_ZD_FISH_5,                                                    RCQUEST_BOTH,                                                                             ACTOR_EN_FISH,        SCENE_ZORAS_DOMAIN,                 -1 ^ 4,   RAND_INF_ZD_FISH_5,                            "Fish 5",                      RHT_ZD_FISH,                       RG_FISH);
+    // clang-format on
 }
 
 static RegisterShipInitFunc initFunc(Rando::StaticData::RegisterFishLocations);
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
index 91d0211570..16271f28fd 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.h
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -14,7 +14,7 @@ typedef struct {
 
 typedef enum {
     FSO_SOURCE_RANDO,
-    FSO_SOURCE_CVARS
+    FSO_SOURCE_CVARS,
 } FishsanityOptionsSource;
 
 typedef enum {
@@ -29,7 +29,7 @@ namespace Rando {
 
 /**
  * @brief Class to provide an interface for and direct Fishsanity features
-*/
+ */
 class Fishsanity {
   public:
     Fishsanity();
@@ -47,110 +47,114 @@ class Fishsanity {
     /**
      * @brief Returns true if the given FishIdentity represents an actual fish
      * @param fish The fish to check
-    */
+     */
     static bool IsFish(FishIdentity* fish);
 
     /**
      * @brief Returns true if the given fish location is active
-     * 
+     *
      * @param loc The Location to check
      * @param optionsSource Optionally declare from which source to pull settings
-    */
+     */
     bool GetFishLocationIncluded(Rando::Location* loc, FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
 
     /**
      * @brief Get the active and inactive locations in the fishing pond.
-     * 
+     *
      * @param optionsSource Optionally declare from which source to pull settings
-     * @return A pair of vectors, where the fist is all active pond fish checks, and the second is all inactive pond fish checks.
-    */
-    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>> GetFishingPondLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+     * @return A pair of vectors, where the fist is all active pond fish checks, and the second is all inactive pond
+     * fish checks.
+     */
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+    GetFishingPondLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
 
     /**
      * @brief Get all active fishsanity locations, and all inactive fishing pond locations.
-     * 
-     * @param optionsSource Optionally declare from which source to pull settings 
-     * @return A pair of vectors, where the first is all active fishsanity checks, and the second is all inactive fishsanity checks.
-    */
-    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>> GetFishsanityLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
+     *
+     * @param optionsSource Optionally declare from which source to pull settings
+     * @return A pair of vectors, where the first is all active fishsanity checks, and the second is all inactive
+     * fishsanity checks.
+     */
+    std::pair<std::vector<RandomizerCheck>, std::vector<RandomizerCheck>>
+    GetFishsanityLocations(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
 
     /**
      * @brief Returns the identity for a caught pond fish given its params.
      * Not for use externally from rando, use Randomizer::IdentifyFish or Randomizer_IdentifyFish for that
-     * 
+     *
      * @param fishParams Actor parameters for the fish to identify
-    */
+     */
     FishIdentity IdentifyPondFish(u8 fishParams);
 
     /**
      * @brief Get fishsanity fishing pond options from the requested source
-    */
+     */
     FishsanityPondOptions GetOptions(FishsanityOptionsSource optionsSource = FSO_SOURCE_RANDO);
-    
+
     /**
      * @brief Updates current pond fish according to save data
-    */
+     */
     void UpdateCurrentPondFish();
-    
+
     /**
      * @brief Initializes internal state from save
-    */
+     */
     void InitializeFromSave();
 
     /**
      * @brief Returns true if the fishing pond is shuffled
-    */
+     */
     bool GetPondFishShuffled();
 
     /**
-     * @brief Returns true if overworld fish are shuffled 
-    */
+     * @brief Returns true if overworld fish are shuffled
+     */
     bool GetOverworldFishShuffled();
 
     /**
      * @brief Returns true if the fishing pond is currently adult (i.e., age split is enabled and Link is adult)
-    */
+     */
     bool IsAdultPond();
 
     /**
      * @brief Returns true if all available pond fish checks have been collected for the current age
-    */
+     */
     bool GetPondCleared();
 
     /**
      * @brief Returns true if all available Zora's Domain fish checks have been collected
-    */
+     */
     bool GetDomainCleared();
 
     /**
      * @brief Advances current fishing pond check; no effect if every fish is shuffled
      * @return The new FishIdentity for the current pond, or default identity if every fish is shuffled
-    */
+     */
     FishIdentity AdvancePond();
 
     /**
      * @brief ActorInit hook handler for fishsanity
-    */
+     */
     static void OnActorInitHandler(void* refActor);
 
     /**
      * @brief PlayerUpdate hook handler for fishsanity
-    */
+     */
     static void OnPlayerUpdateHandler();
 
     /**
      * @brief ActorUpdate hook handler for fishsanity
-    */
+     */
     static void OnActorUpdateHandler(void* refActor);
 
     /**
      * @brief SceneInit hook handler for fishsanity
-    */
+     */
     static void OnSceneInitHandler(int16_t sceneNum);
 
     /**
      * @brief VB hook handler for fishsanity
-    */
+     */
     static void OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list originalArgs);
 
     static void OnItemReceiveHandler(GetItemEntry itemEntry);
@@ -158,26 +162,26 @@ class Fishsanity {
   private:
     /**
      * @brief Initialize helper statics if they have not been initialized yet
-    */
+     */
     void InitializeHelpers();
-    
+
     /**
      * @brief Resolves a pond fish's FishIdentity directly from params & pond age
-     * 
+     *
      * @param params Params for Fishing actor
      * @param adultPond Whether to resolve this fish as an adult check
      * @return The FishIdentity for the described fish
-    */
+     */
     static FishIdentity GetPondFish(s16 params, bool adultPond);
 
     /**
      * @brief Current pond fish when all pond fish are not randomized
-    */
+     */
     std::pair<FishIdentity, FishIdentity> mCurrPondFish;
-    
+
     /**
      * @brief True if fishsanity helpers have been initialized
-    */
+     */
     static bool fishsanityHelpersInit;
 
     static s16 fishGroupCounter;
@@ -189,20 +193,20 @@ class Fishsanity {
 
     /**
      * @brief Mapping from pond fish check to the age where that check can be collected
-    */
+     */
     static std::unordered_map<RandomizerCheck, LinkAge> pondFishAgeMap;
 
     /**
      * @brief List of child pond fish checks
-    */
+     */
     static std::vector<RandomizerCheck> childPondFish;
 
     /**
      * @brief List of adult pond fish checks
-    */
+     */
     static std::vector<RandomizerCheck> adultPondFish;
 };
-}
+} // namespace Rando
 
 extern "C" {
 #endif
@@ -218,7 +222,7 @@ void Fishsanity_DrawEffShadow(Actor* actor, Lights* lights, PlayState* play);
 void Fishsanity_DrawEnFish(struct Actor* actor, struct PlayState* play);
 /// Overriden actor draw function for the fishing pond
 void Fishsanity_DrawFishing(struct Actor* actor, struct PlayState* play);
-void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGBA16* color, int16_t frameOffset);
+void Fishsanity_OpenGreyscaleColor(PlayState* play, Color_RGB8* color, int16_t frameOffset);
 void Fishsanity_CloseGreyscaleColor(PlayState* play);
 #ifdef __cplusplus
 }
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 29a9a969f3..c98ecea150 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -6,638 +6,625 @@
 #include "static_data.h"
 
 namespace Rando {
-Hint::Hint(){}
-
-Hint::Hint(RandomizerHint ownKey_, 
-           HintType hintType_,
-           std::string distribution_,
-           std::vector<RandomizerHintTextKey> hintKeys_,
-           std::vector<RandomizerCheck> locations_,
-           std::vector<RandomizerArea> areas_,
-           std::vector<TrialKey> trials_)
-    : ownKey(ownKey_), hintType(hintType_), distribution(std::move(distribution_)), hintKeys(hintKeys_), locations(locations_), areas(areas_), trials(trials_) {
-  FillGapsInData();
-  SetLocationsAsHinted();
-  NamesChosen();
-  enabled = true;
+Hint::Hint() {
 }
 
-Hint::Hint(RandomizerHint ownKey_, 
-           HintType hintType_,
-           std::vector<RandomizerHintTextKey> hintKeys_,
-           std::vector<RandomizerCheck> locations_,
-           std::vector<RandomizerArea> areas_,
-           std::vector<TrialKey> trials_,
-           bool yourPocket_,
-           int num_)
-    : ownKey(ownKey_), hintType(hintType_), hintKeys(hintKeys_), locations(locations_), areas(areas_), trials(trials_), yourPocket(yourPocket_), num(num_) {
-  FillGapsInData();
-  SetLocationsAsHinted();
-  NamesChosen();
-  enabled = true;
+Hint::Hint(RandomizerHint ownKey_, HintType hintType_, std::string distribution_,
+           std::vector<RandomizerHintTextKey> hintKeys_, std::vector<RandomizerCheck> locations_,
+           std::vector<RandomizerArea> areas_, std::vector<TrialKey> trials_)
+    : ownKey(ownKey_), hintType(hintType_), distribution(std::move(distribution_)), hintKeys(hintKeys_),
+      locations(locations_), areas(areas_), trials(trials_) {
+    FillGapsInData();
+    SetLocationsAsHinted();
+    NamesChosen();
+    enabled = true;
 }
 
-Hint::Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_) 
-: ownKey(ownKey_), messages(messages_){
-  hintType = HINT_TYPE_MESSAGE;
-  enabled = true;
+Hint::Hint(RandomizerHint ownKey_, HintType hintType_, std::vector<RandomizerHintTextKey> hintKeys_,
+           std::vector<RandomizerCheck> locations_, std::vector<RandomizerArea> areas_, std::vector<TrialKey> trials_,
+           bool yourPocket_, int num_)
+    : ownKey(ownKey_), hintType(hintType_), hintKeys(hintKeys_), locations(locations_), areas(areas_), trials(trials_),
+      yourPocket(yourPocket_), num(num_) {
+    FillGapsInData();
+    SetLocationsAsHinted();
+    NamesChosen();
+    enabled = true;
 }
 
-Hint::Hint(RandomizerHint ownKey_, nlohmann::json json_){
-  ownKey = ownKey_;
-  if (json_.contains("enabled") && !json_["enabled"].get<bool>()){
-    return;
-  }
-  enabled = true;
-
-  if (json_.contains("type")){
-    hintType = (HintType)StaticData::hintTypeNameToEnum[json_["type"].get<std::string>()];
-  }
-
-  if (hintType == HINT_TYPE_MESSAGE){
-    if (json_.contains("messages")){
-      for (auto message: json_["messages"]){
-        messages.push_back(CustomMessage(message.get<std::string>()));
-      }
-    } else if (json_.contains("message")){
-      messages.push_back(CustomMessage(json_["message"].get<std::string>()));
-    }
-  }
-  
-  if (json_.contains("distribution")){
-    distribution = json_["distribution"].get<std::string>();
-  }
-
-  if (json_.contains("locations")){
-    for (auto loc: json_["locations"]){
-      locations.push_back(StaticData::locationNameToEnum[loc.get<std::string>()]);
-    }
-  } else if (json_.contains("location")){
-    locations.push_back(StaticData::locationNameToEnum[json_["location"].get<std::string>()]);
-  }
-
-  if (json_.contains("itemNamesChosen")){
-    for (auto name: json_["itemNamesChosen"]){
-      itemNamesChosen.push_back(name.get<uint8_t>());
-    }
-  } else if (json_.contains("itemNameChosen")){
-    itemNamesChosen.push_back(json_["itemNameChosen"].get<uint8_t>());
-  }
-
-  if (json_.contains("areas")){
-    for (auto area: json_["areas"]){
-      areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[area]);
-    }
-  } else if (json_.contains("area")){
-    areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[json_["area"]]);
-  }
-
-  if (json_.contains("areaNamesChosen")){
-    for (auto name: json_["areaNamesChosen"]){
-      areaNamesChosen.push_back(name.get<uint8_t>());
-    }
-  } else if (json_.contains("areaNameChosen")){
-    areaNamesChosen.push_back(json_["areaNameChosen"].get<uint8_t>());
-  }
-
-  if (json_.contains("trials")){
-    for (auto trial: json_["trials"]){
-      trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[trial]);
-    }
-  } else if (json_.contains("trial")){
-    trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[json_["trial"]]);
-  }
-
-  if (json_.contains("hintKeys")){
-    for (auto hintKey: json_["hintKeys"]){
-      hintKeys.push_back((RandomizerHintTextKey)hintKey.get<uint32_t>());
-    }
-  } else if (json_.contains("hintKey")){
-    hintKeys.push_back((RandomizerHintTextKey)json_["hintKey"].get<uint32_t>());
-  }
-
-  if (json_.contains("hintTextsChosen")){
-    for (auto name: json_["hintTextsChosen"]){
-      hintTextsChosen.push_back(name.get<uint8_t>());
-    }
-  } else if (json_.contains("hintTextChosen")){
-    hintTextsChosen.push_back(json_["hintTextChosen"].get<uint8_t>());
-  }
-
-  if (json_.contains("num")){
-    num = json_["num"].get<int>();
-  }
-
-  FillGapsInData();
-  SetLocationsAsHinted();
+Hint::Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_) : ownKey(ownKey_), messages(messages_) {
+    hintType = HINT_TYPE_MESSAGE;
+    enabled = true;
 }
 
-void Hint::FillGapsInData(){
-  auto ctx = Rando::Context::GetInstance();
-  if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)){
-    locations = StaticData::staticHintInfoMap[ownKey].targetChecks;
-  }
-  bool fillAreas = true;
-  bool fillItems = true;
-  if (areas.size() > 0){
-    fillAreas = false;
-  }
-  if (items.size() > 0){
-    fillItems = false;
-  }
-  for(uint8_t c = 0; c < locations.size(); c++){
-    //if area matters for the hint, it should be specified and not left to this
-    if (fillAreas){
-      areas.push_back(ctx->GetItemLocation(locations[c])->GetFirstArea());
+Hint::Hint(RandomizerHint ownKey_, nlohmann::json json_) {
+    ownKey = ownKey_;
+    if (json_.contains("enabled") && !json_["enabled"].get<bool>()) {
+        return;
     }
-    if (fillItems){
-      items.push_back(ctx->GetItemLocation(locations[c])->GetPlacedRandomizerGet());
+    enabled = true;
+
+    if (json_.contains("type")) {
+        hintType = (HintType)StaticData::hintTypeNameToEnum[json_["type"].get<std::string>()];
+    }
+
+    if (hintType == HINT_TYPE_MESSAGE) {
+        if (json_.contains("messages")) {
+            for (auto message : json_["messages"]) {
+                messages.push_back(CustomMessage(message.get<std::string>()));
+            }
+        } else if (json_.contains("message")) {
+            messages.push_back(CustomMessage(json_["message"].get<std::string>()));
+        }
+    }
+
+    if (json_.contains("distribution")) {
+        distribution = json_["distribution"].get<std::string>();
+    }
+
+    if (json_.contains("locations")) {
+        for (auto loc : json_["locations"]) {
+            locations.push_back(StaticData::locationNameToEnum[loc.get<std::string>()]);
+        }
+    } else if (json_.contains("location")) {
+        locations.push_back(StaticData::locationNameToEnum[json_["location"].get<std::string>()]);
+    }
+
+    if (json_.contains("itemNamesChosen")) {
+        for (auto name : json_["itemNamesChosen"]) {
+            itemNamesChosen.push_back(name.get<uint8_t>());
+        }
+    } else if (json_.contains("itemNameChosen")) {
+        itemNamesChosen.push_back(json_["itemNameChosen"].get<uint8_t>());
+    }
+
+    if (json_.contains("areas")) {
+        for (auto area : json_["areas"]) {
+            areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[area]);
+        }
+    } else if (json_.contains("area")) {
+        areas.push_back((RandomizerArea)Rando::StaticData::areaNameToEnum[json_["area"]]);
+    }
+
+    if (json_.contains("areaNamesChosen")) {
+        for (auto name : json_["areaNamesChosen"]) {
+            areaNamesChosen.push_back(name.get<uint8_t>());
+        }
+    } else if (json_.contains("areaNameChosen")) {
+        areaNamesChosen.push_back(json_["areaNameChosen"].get<uint8_t>());
+    }
+
+    if (json_.contains("trials")) {
+        for (auto trial : json_["trials"]) {
+            trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[trial]);
+        }
+    } else if (json_.contains("trial")) {
+        trials.push_back((TrialKey)Rando::StaticData::trialNameToEnum[json_["trial"]]);
+    }
+
+    if (json_.contains("hintKeys")) {
+        for (auto hintKey : json_["hintKeys"]) {
+            hintKeys.push_back((RandomizerHintTextKey)hintKey.get<uint32_t>());
+        }
+    } else if (json_.contains("hintKey")) {
+        hintKeys.push_back((RandomizerHintTextKey)json_["hintKey"].get<uint32_t>());
+    }
+
+    if (json_.contains("hintTextsChosen")) {
+        for (auto name : json_["hintTextsChosen"]) {
+            hintTextsChosen.push_back(name.get<uint8_t>());
+        }
+    } else if (json_.contains("hintTextChosen")) {
+        hintTextsChosen.push_back(json_["hintTextChosen"].get<uint8_t>());
+    }
+
+    if (json_.contains("num")) {
+        num = json_["num"].get<int>();
+    }
+
+    FillGapsInData();
+    SetLocationsAsHinted();
+}
+
+void Hint::FillGapsInData() {
+    auto ctx = Rando::Context::GetInstance();
+    if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)) {
+        locations = StaticData::staticHintInfoMap[ownKey].targetChecks;
+    }
+    bool fillAreas = true;
+    bool fillItems = true;
+    if (areas.size() > 0) {
+        fillAreas = false;
+    }
+    if (items.size() > 0) {
+        fillItems = false;
+    }
+    for (uint8_t c = 0; c < locations.size(); c++) {
+        // if area matters for the hint, it should be specified and not left to this
+        if (fillAreas) {
+            areas.push_back(ctx->GetItemLocation(locations[c])->GetFirstArea());
+        }
+        if (fillItems) {
+            items.push_back(ctx->GetItemLocation(locations[c])->GetPlacedRandomizerGet());
+        }
     }
-  }
 }
 
 void Hint::SetLocationsAsHinted() const {
-  auto ctx = Rando::Context::GetInstance();
-  for (uint8_t count = 0; count < locations.size(); count++){
-      ctx->GetItemLocation(locations[count])->AddHintedBy(ownKey);
-  }
-}
-
-uint8_t GetRandomHintTextEntry(const HintText hintText){
-  auto ctx = Rando::Context::GetInstance();
-  uint8_t size = 0;
-  if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)){
-    size = hintText.GetAmbiguousSize();
-  } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)){
-    size = hintText.GetObscureSize();
-  }
-  if (size > 0){
-    return Random(0, size);
-  }
-  return 0;
-}
-
-void Hint::NamesChosen(){
-  auto ctx = Rando::Context::GetInstance();
-  std::vector<uint8_t> namesTemp = {};
-  bool saveNames = false;
-  uint8_t numMessages = GetNumberOfMessages();
-  for (uint8_t c = 0; c < numMessages; c++){
-    uint8_t selection = GetRandomHintTextEntry(GetHintText(c));
-    if (selection > 0){
-      saveNames = true;
+    auto ctx = Rando::Context::GetInstance();
+    for (uint8_t count = 0; count < locations.size(); count++) {
+        ctx->GetItemLocation(locations[count])->AddHintedBy(ownKey);
     }
-    namesTemp.push_back(selection);
-  }
-  if (saveNames) {
-    hintTextsChosen = namesTemp;
-  }
+}
 
-  if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA){
-    for(uint8_t c = 0; c < locations.size(); c++){
-      namesTemp = {};
-      saveNames = false;
-      uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c));
-      if (selection > 0){
-        saveNames = true;
-      }
-      namesTemp.push_back(selection);
+uint8_t GetRandomHintTextEntry(const HintText hintText) {
+    auto ctx = Rando::Context::GetInstance();
+    uint8_t size = 0;
+    if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS)) {
+        size = hintText.GetAmbiguousSize();
+    } else if (ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_OBSCURE)) {
+        size = hintText.GetObscureSize();
+    }
+    if (size > 0) {
+        return Random(0, size);
+    }
+    return 0;
+}
+
+void Hint::NamesChosen() {
+    auto ctx = Rando::Context::GetInstance();
+    std::vector<uint8_t> namesTemp = {};
+    bool saveNames = false;
+    size_t numMessages = GetNumberOfMessages();
+    for (size_t c = 0; c < numMessages; c++) {
+        uint8_t selection = GetRandomHintTextEntry(GetHintText(c));
+        if (selection > 0) {
+            saveNames = true;
+        }
+        namesTemp.push_back(selection);
     }
     if (saveNames) {
-      itemNamesChosen = namesTemp;
+        hintTextsChosen = namesTemp;
     }
-  }
 
-  if (hintType == HINT_TYPE_FOOLISH || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH ||
-      hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT){
-    namesTemp = {};
-    saveNames = false;
-    for(uint8_t c = 0; c < areas.size(); c++){
-      uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c));
-      if (selection > 0){
-        saveNames = true;
-      }
-      namesTemp.push_back(selection);
+    if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA) {
+        for (size_t c = 0; c < locations.size(); c++) {
+            namesTemp = {};
+            saveNames = false;
+            uint8_t selection = GetRandomHintTextEntry(GetItemHintText(c));
+            if (selection > 0) {
+                saveNames = true;
+            }
+            namesTemp.push_back(selection);
+        }
+        if (saveNames) {
+            itemNamesChosen = namesTemp;
+        }
     }
-    if (saveNames) {
-      areaNamesChosen = namesTemp;
+
+    if (hintType == HINT_TYPE_FOOLISH || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH ||
+        hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) {
+        namesTemp = {};
+        saveNames = false;
+        for (uint8_t c = 0; c < areas.size(); c++) {
+            uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c));
+            if (selection > 0) {
+                saveNames = true;
+            }
+            namesTemp.push_back(selection);
+        }
+        if (saveNames) {
+            areaNamesChosen = namesTemp;
+        }
     }
-  }
 }
 
-uint8_t Hint::GetNumberOfMessages() const {
-  size_t numMessages = std::max(messages.size(), hintKeys.size());
-  if (StaticData::staticHintInfoMap.contains(ownKey)){
-    numMessages = std::max(StaticData::staticHintInfoMap[ownKey].hintKeys.size(), numMessages);
-  }
-  if (numMessages == 0){
-      numMessages = 1; //RANDOTODO make std::max actually fucking work for 3 arguments
-  }
-  return numMessages;
+size_t Hint::GetNumberOfMessages() const {
+    size_t numMessages = std::max(messages.size(), hintKeys.size());
+    if (StaticData::staticHintInfoMap.contains(ownKey)) {
+        numMessages = std::max(StaticData::staticHintInfoMap[ownKey].hintKeys.size(), numMessages);
+    }
+    if (numMessages == 0) {
+        numMessages = 1; // RANDOTODO make std::max actually fucking work for 3 arguments
+    }
+    return numMessages;
 }
 
 const std::vector<std::string> Hint::GetAllMessageStrings(MessageFormat format) const {
-  std::vector<std::string> hintMessages = {};
-  uint8_t numMessages = GetNumberOfMessages();
-  for (int c = 0; c < numMessages; c++){
-    hintMessages.push_back(GetHintMessage(format, c).GetForCurrentLanguage(format));
-  }
-  return hintMessages;
+    std::vector<std::string> hintMessages = {};
+    size_t numMessages = GetNumberOfMessages();
+    for (size_t c = 0; c < numMessages; c++) {
+        hintMessages.push_back(GetHintMessage(format, c).GetForCurrentLanguage(format));
+    }
+    return hintMessages;
 }
 
-const HintText Hint::GetHintText(uint8_t id) const {
-  auto ctx = Rando::Context::GetInstance();
-  if (hintKeys.size() > id){
-    return StaticData::hintTextTable[hintKeys[id]];
-  }
-// If a static hint, load default from staticHintInfoMap
-  if (StaticData::staticHintInfoMap.contains(ownKey) && StaticData::staticHintInfoMap[ownKey].hintKeys.size() > id){
-    return StaticData::hintTextTable[StaticData::staticHintInfoMap[ownKey].hintKeys[id]];
-  }
+const HintText Hint::GetHintText(size_t id) const {
+    auto ctx = Rando::Context::GetInstance();
+    if (hintKeys.size() > id) {
+        return StaticData::hintTextTable[hintKeys[id]];
+    }
+    // If a static hint, load default from staticHintInfoMap
+    if (StaticData::staticHintInfoMap.contains(ownKey) && StaticData::staticHintInfoMap[ownKey].hintKeys.size() > id) {
+        return StaticData::hintTextTable[StaticData::staticHintInfoMap[ownKey].hintKeys[id]];
+    }
 
-  switch (hintType){
-    case HINT_TYPE_HINT_KEY:
-      return StaticData::hintTextTable[0]; 
-      break;
-    case HINT_TYPE_TRIAL:
-      if (ctx->GetTrial(trials[0])->IsRequired()) {
-        return StaticData::hintTextTable[RHT_TRIAL_ON];
-      } else {
-        return StaticData::hintTextTable[RHT_TRIAL_OFF];
-      }
-    case HINT_TYPE_WOTH:
-      return StaticData::hintTextTable[RHT_WAY_OF_THE_HERO];
-    case HINT_TYPE_FOOLISH:
-      return StaticData::hintTextTable[RHT_FOOLISH];
-    case HINT_TYPE_ITEM:
-      if (locations.size() > 0) {
-        return *StaticData::GetLocation(locations[0])->GetHint();
-      } else {
-        return CustomMessage("ERROR: ITEM HINT WITH NO LOCATIONS OR HINT KEY");
-      }
-    case HINT_TYPE_ITEM_AREA:
-      if (locations.size() > 0) {
-        if (StaticData::GetLocation(locations[0])->IsDungeon()) {
-          return StaticData::hintTextTable[RHT_HOARDS];
-        } else {
-          return StaticData::hintTextTable[RHT_CAN_BE_FOUND_AT];
+    switch (hintType) {
+        case HINT_TYPE_HINT_KEY:
+            return StaticData::hintTextTable[0];
+            break;
+        case HINT_TYPE_TRIAL:
+            if (ctx->GetTrial(trials[0])->IsRequired()) {
+                return StaticData::hintTextTable[RHT_TRIAL_ON];
+            } else {
+                return StaticData::hintTextTable[RHT_TRIAL_OFF];
+            }
+        case HINT_TYPE_WOTH:
+            return StaticData::hintTextTable[RHT_WAY_OF_THE_HERO];
+        case HINT_TYPE_FOOLISH:
+            return StaticData::hintTextTable[RHT_FOOLISH];
+        case HINT_TYPE_ITEM:
+            if (locations.size() > 0) {
+                return *StaticData::GetLocation(locations[0])->GetHint();
+            } else {
+                return CustomMessage("ERROR: ITEM HINT WITH NO LOCATIONS OR HINT KEY");
+            }
+        case HINT_TYPE_ITEM_AREA:
+            if (locations.size() > 0) {
+                if (StaticData::GetLocation(locations[0])->IsDungeon()) {
+                    return StaticData::hintTextTable[RHT_HOARDS];
+                } else {
+                    return StaticData::hintTextTable[RHT_CAN_BE_FOUND_AT];
+                }
+            } else {
+                return CustomMessage("ERROR: ITEM AREA HINT WITH NO LOCATION"); // RANDOTODO get isDungeon from area?
+            }
+        default:
+            return CustomMessage("ERROR: NO HINTKEY PROVIDED AND HINT TYPE HAS NO DEFAULT");
+    }
+}
+
+const CustomMessage Hint::GetHintMessage(MessageFormat format, size_t id) const {
+    auto ctx = Rando::Context::GetInstance();
+    CustomMessage hintText = CustomMessage("");
+
+    size_t chosenMessage = 0;
+    if (hintTextsChosen.size() > id) {
+        chosenMessage = id;
+    }
+
+    if (hintType == HINT_TYPE_MESSAGE) {
+        if (id < messages.size()) {
+            hintText = messages[id];
         }
-      } else {
-        return CustomMessage("ERROR: ITEM AREA HINT WITH NO LOCATION"); //RANDOTODO get isDungeon from area?
-      }
-    default:
-      return CustomMessage("ERROR: NO HINTKEY PROVIDED AND HINT TYPE HAS NO DEFAULT");
-  }
-}
-
-const CustomMessage Hint::GetHintMessage(MessageFormat format, uint8_t id) const {
-  auto ctx = Rando::Context::GetInstance();
-  CustomMessage hintText = CustomMessage("");
-
-  uint8_t chosenMessage = 0;
-  if (hintTextsChosen.size() > id){
-    chosenMessage = id;
-  }
-
-  if (hintType == HINT_TYPE_MESSAGE){
-    if (id < messages.size()){
-      hintText = messages[id];
-    }
-  } else if (hintType == HINT_TYPE_ALTAR_CHILD){
-    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)){
-      hintText = StaticData::hintTextTable[RHT_CHILD_ALTAR_STONES].GetHintMessage();
-    }
-    if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN)) {
-        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN].GetHintMessage());
-    } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY)) {
-        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY].GetHintMessage());
+    } else if (hintType == HINT_TYPE_ALTAR_CHILD) {
+        if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+            hintText = StaticData::hintTextTable[RHT_CHILD_ALTAR_STONES].GetHintMessage();
+        }
+        if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN)) {
+            hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN].GetHintMessage());
+        } else if (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY)) {
+            hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY].GetHintMessage());
+        } else {
+            hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED].GetHintMessage());
+        }
+    } else if (hintType == HINT_TYPE_ALTAR_ADULT) {
+        if (ctx->GetOption(RSK_TOT_ALTAR_HINT)) {
+            hintText = StaticData::hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS].GetHintMessage();
+        }
+        hintText += GetBridgeReqsText() + GetGanonBossKeyText() +
+                    StaticData::hintTextTable[RHT_ADULT_ALTAR_TEXT_END].GetHintMessage();
     } else {
-        hintText += CustomMessage(StaticData::hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED].GetHintMessage());
+        hintText = GetHintText(id).GetHintMessage(chosenMessage);
     }
-  } else if (hintType == HINT_TYPE_ALTAR_ADULT){
-    if (ctx->GetOption(RSK_TOT_ALTAR_HINT)){
-      hintText = StaticData::hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS].GetHintMessage();
+
+    std::vector<CustomMessage> toInsert = {};
+
+    switch (hintType) {
+        case HINT_TYPE_ITEM: {
+            // if we write items
+            for (uint8_t b = 0; b < locations.size(); b++) {
+                toInsert.push_back(GetItemName(b));
+            }
+            break;
+        }
+        case HINT_TYPE_TRIAL: {
+            // If we write trials
+            for (uint8_t b = 0; b < trials.size(); b++) {
+                toInsert.push_back(ctx->GetTrial(trials[b])->GetName());
+            }
+            break;
+        }
+        case HINT_TYPE_ITEM_AREA: {
+            // If we write items and areas
+            for (uint8_t b = 0; b < items.size(); b++) {
+                toInsert.push_back(GetItemName(b));
+                toInsert.push_back(GetAreaName(b));
+            }
+            break;
+        }
+        case HINT_TYPE_ALTAR_CHILD:
+        case HINT_TYPE_ALTAR_ADULT:
+        case HINT_TYPE_AREA:
+        case HINT_TYPE_WOTH:
+        case HINT_TYPE_FOOLISH: {
+            // If we write areas
+            for (uint8_t b = 0; b < areas.size(); b++) {
+                toInsert.push_back(GetAreaName(b));
+            }
+            break;
+        }
+        default:
+            break;
     }
-    hintText += GetBridgeReqsText() + GetGanonBossKeyText() + StaticData::hintTextTable[RHT_ADULT_ALTAR_TEXT_END].GetHintMessage();
-  } else {
-    hintText = GetHintText(id).GetHintMessage(chosenMessage);
-  }
 
-  std::vector<CustomMessage> toInsert = {};
+    hintText.InsertNames(toInsert);
+    hintText.SetSingularPlural();
 
-  switch (hintType){
-    case HINT_TYPE_ITEM:{
-      //if we write items
-      for(uint8_t b = 0; b < locations.size(); b++){
-        toInsert.push_back(GetItemName(b)); 
-      }
-      break;}
-    case HINT_TYPE_TRIAL:{
-      //If we write trials
-      for(uint8_t b = 0; b < trials.size(); b++){
-        toInsert.push_back(ctx->GetTrial(trials[b])->GetName());
-      }
-      break;}
-    case HINT_TYPE_ITEM_AREA:{
-      //If we write items and areas
-      for(uint8_t b = 0; b < items.size(); b++){
-        toInsert.push_back(GetItemName(b));
-        toInsert.push_back(GetAreaName(b));
-      }
-      break;}
-    case HINT_TYPE_ALTAR_CHILD:
-    case HINT_TYPE_ALTAR_ADULT:
-    case HINT_TYPE_AREA:
-    case HINT_TYPE_WOTH:
-    case HINT_TYPE_FOOLISH:{
-      //If we write areas
-      for(uint8_t b = 0; b < areas.size(); b++){
-        toInsert.push_back(GetAreaName(b));
-      }
-      break;}
-    default:
-      break;
-  }
+    if (num != 0) {
+        hintText.InsertNumber(num);
+    }
 
-  hintText.InsertNames(toInsert);
+    if (format == MF_FORMATTED) {
+        hintText.Format();
+    } else if (format == MF_AUTO_FORMAT) {
+        hintText.AutoFormat();
+    } else if (format == MF_CLEAN) {
+        hintText.Clean();
+    }
 
-  if (num != 0){
-    hintText.InsertNumber(num);
-  }
-
-  if (format == MF_FORMATTED){
-    hintText.Format();
-  } else if (format == MF_AUTO_FORMAT){
-    hintText.AutoFormat();
-  } else if (format == MF_CLEAN){
-    hintText.Clean();
-  }
-
-  return hintText;
+    return hintText;
 }
 
 oJson Hint::toJSON() {
-  auto ctx = Rando::Context::GetInstance();
-  nlohmann::ordered_json log = {};
-  if (enabled){
-    log["type"] = StaticData::hintTypeNames[hintType].GetForCurrentLanguage(MF_CLEAN);
-    
-    std::vector<std::string> hintMessages = GetAllMessageStrings(MF_CLEAN);
-    if (hintMessages.size() == 1){
-      log["message"] = hintMessages[0];
-    } else if (hintMessages.size() > 1){
-      log["messages"] = hintMessages;
-    }
+    auto ctx = Rando::Context::GetInstance();
+    nlohmann::ordered_json log = {};
+    if (enabled) {
+        log["type"] = StaticData::hintTypeNames[hintType].GetForCurrentLanguage(MF_CLEAN);
 
-    if (distribution != ""){
-      log["distribution"] = distribution;
-    }
-    
-    if (hintType != HINT_TYPE_FOOLISH){
-      if (!(StaticData::staticHintInfoMap.contains(ownKey) && 
-          StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)){
-        if (locations.size() == 1){
-          log["location"] = StaticData::GetLocation(locations[0])->GetName();//RANDOTODO change to CustomMessage when VB is done;
-        } else if (locations.size() > 1){
-          //If we have defaults, no need to write more
-          std::vector<std::string> locStrings = {};
-          for (size_t c = 0; c < locations.size(); c++){
-            locStrings.push_back(StaticData::GetLocation(locations[c])->GetName());//RANDOTODO change to CustomMessage when VB is done
-          }
-          log["locations"] = locStrings;
+        std::vector<std::string> hintMessages = GetAllMessageStrings(MF_CLEAN);
+        if (hintMessages.size() == 1) {
+            log["message"] = hintMessages[0];
+        } else if (hintMessages.size() > 1) {
+            log["messages"] = hintMessages;
         }
-      }
-      
-      if (!(StaticData::staticHintInfoMap.contains(ownKey) &&
-          StaticData::staticHintInfoMap[ownKey].targetItems.size() > 0)){
-        if (items.size() == 1){
-          log["item"] = StaticData::GetItemTable()[items[0]].GetName().GetEnglish();//RANDOTODO change to CustomMessage;
-        } else if (items.size() > 1){
-          std::vector<std::string> itemStrings = {};
-          for (size_t c = 0; c < items.size(); c++){
-            itemStrings.push_back(StaticData::GetItemTable()[items[c]].GetName().GetEnglish());//RANDOTODO change to CustomMessage
-          }
-          log["items"] = itemStrings;
+
+        if (distribution != "") {
+            log["distribution"] = distribution;
         }
-      }
 
-      if (itemNamesChosen.size() == 1){
-        log["itemNameChosen"] = itemNamesChosen[0];
-      } else if (itemNamesChosen.size() > 1){
-        std::vector<uint8_t> nameNums = {};
-        for (size_t c = 0; c < itemNamesChosen.size(); c++){
-          nameNums.push_back(itemNamesChosen[c]);
+        if (hintType != HINT_TYPE_FOOLISH) {
+            if (!(StaticData::staticHintInfoMap.contains(ownKey) &&
+                  StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)) {
+                if (locations.size() == 1) {
+                    log["location"] = StaticData::GetLocation(locations[0])
+                                          ->GetName(); // RANDOTODO change to CustomMessage when VB is done;
+                } else if (locations.size() > 1) {
+                    // If we have defaults, no need to write more
+                    std::vector<std::string> locStrings = {};
+                    for (size_t c = 0; c < locations.size(); c++) {
+                        locStrings.push_back(StaticData::GetLocation(locations[c])
+                                                 ->GetName()); // RANDOTODO change to CustomMessage when VB is done
+                    }
+                    log["locations"] = locStrings;
+                }
+            }
+
+            if (!(StaticData::staticHintInfoMap.contains(ownKey) &&
+                  StaticData::staticHintInfoMap[ownKey].targetItems.size() > 0)) {
+                if (items.size() == 1) {
+                    log["item"] = StaticData::GetItemTable()[items[0]]
+                                      .GetName()
+                                      .GetEnglish(); // RANDOTODO change to CustomMessage;
+                } else if (items.size() > 1) {
+                    std::vector<std::string> itemStrings = {};
+                    for (size_t c = 0; c < items.size(); c++) {
+                        itemStrings.push_back(StaticData::GetItemTable()[items[c]]
+                                                  .GetName()
+                                                  .GetEnglish()); // RANDOTODO change to CustomMessage
+                    }
+                    log["items"] = itemStrings;
+                }
+            }
+
+            if (itemNamesChosen.size() == 1) {
+                log["itemNameChosen"] = itemNamesChosen[0];
+            } else if (itemNamesChosen.size() > 1) {
+                std::vector<uint8_t> nameNums = {};
+                for (size_t c = 0; c < itemNamesChosen.size(); c++) {
+                    nameNums.push_back(itemNamesChosen[c]);
+                }
+                log["itemNamesChosen"] = nameNums;
+            }
+        }
+        if (areas.size() == 1) {
+            log["area"] =
+                StaticData::hintTextTable[StaticData::areaNames[areas[0]]].GetClear().GetForCurrentLanguage(MF_CLEAN);
+        } else if (areas.size() > 0 && !(StaticData::staticHintInfoMap.contains(ownKey) &&
+                                         StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)) {
+            // If we got locations from defaults, areas are derived from them and don't need logging
+            std::vector<std::string> areaStrings = {};
+            for (size_t c = 0; c < areas.size(); c++) {
+                areaStrings.push_back(
+                    StaticData::hintTextTable[StaticData::areaNames[areas[c]]].GetClear().GetForCurrentLanguage(
+                        MF_CLEAN));
+            }
+            log["areas"] = areaStrings;
         }
-        log["itemNamesChosen"] = nameNums;
-      }
-    }
-    if (areas.size() == 1){
-      log["area"] = StaticData::hintTextTable[StaticData::areaNames[areas[0]]].GetClear().GetForCurrentLanguage(MF_CLEAN);
-    } else if (areas.size() > 0 && 
-          !(StaticData::staticHintInfoMap.contains(ownKey) && StaticData::staticHintInfoMap[ownKey].targetChecks.size() > 0)){
-      // If we got locations from defaults, areas are derived from them and don't need logging
-      std::vector<std::string> areaStrings = {};
-      for (size_t c = 0; c < areas.size(); c++){
-        areaStrings.push_back(StaticData::hintTextTable[StaticData::areaNames[areas[c]]].GetClear().GetForCurrentLanguage(MF_CLEAN));
-      }
-      log["areas"] = areaStrings;
-    }
 
-    if (areaNamesChosen.size() == 1){
-      log["areaNameChosen"] = areaNamesChosen[0];
-    } else if (areaNamesChosen.size() > 1){
-      std::vector<uint8_t> nameNums = {};
-      for (size_t c = 0; c < areaNamesChosen.size(); c++){
-        nameNums.push_back(areaNamesChosen[c]);
-      }
-      log["areaNamesChosen"] = nameNums;
-    }
+        if (areaNamesChosen.size() == 1) {
+            log["areaNameChosen"] = areaNamesChosen[0];
+        } else if (areaNamesChosen.size() > 1) {
+            std::vector<uint8_t> nameNums = {};
+            for (size_t c = 0; c < areaNamesChosen.size(); c++) {
+                nameNums.push_back(areaNamesChosen[c]);
+            }
+            log["areaNamesChosen"] = nameNums;
+        }
 
-    if (trials.size() == 1){
-      log["trial"] = ctx->GetTrial(trials[0])->GetName().GetForCurrentLanguage(MF_CLEAN);
-    } else if (trials.size() > 0){
-      std::vector<std::string> trialStrings = {};
-      for (size_t c = 0; c < trials.size(); c++){
-        trialStrings.push_back(ctx->GetTrial(trials[c])->GetName().GetForCurrentLanguage(MF_CLEAN));
-      }
-      log["trials"] = trialStrings;
-    }
+        if (trials.size() == 1) {
+            log["trial"] = ctx->GetTrial(trials[0])->GetName().GetForCurrentLanguage(MF_CLEAN);
+        } else if (trials.size() > 0) {
+            std::vector<std::string> trialStrings = {};
+            for (size_t c = 0; c < trials.size(); c++) {
+                trialStrings.push_back(ctx->GetTrial(trials[c])->GetName().GetForCurrentLanguage(MF_CLEAN));
+            }
+            log["trials"] = trialStrings;
+        }
 
-    if (hintKeys.size() == 1){
-      log["hintKey"] = hintKeys[0];
-    } else if (hintKeys.size() > 1){
-      std::vector<uint32_t> hintKeyNums = {};
-      for (size_t c = 0; c < hintKeys.size(); c++){
-        hintKeyNums.push_back(hintKeys[c]);
-      }
-      log["hintKeys"] = hintKeyNums;
-    }
+        if (hintKeys.size() == 1) {
+            log["hintKey"] = hintKeys[0];
+        } else if (hintKeys.size() > 1) {
+            std::vector<uint32_t> hintKeyNums = {};
+            for (size_t c = 0; c < hintKeys.size(); c++) {
+                hintKeyNums.push_back(hintKeys[c]);
+            }
+            log["hintKeys"] = hintKeyNums;
+        }
 
-    if (hintTextsChosen.size() == 1){
-      log["hintTextChosen"] = hintTextsChosen[0];
-    } else if (hintTextsChosen.size() > 1){
-      std::vector<uint8_t> nameNums = {};
-      for (size_t c = 0; c < hintTextsChosen.size(); c++){
-        nameNums.push_back(hintTextsChosen[c]);
-      }
-      log["hintTextsChosen"] = nameNums;
-    }
+        if (hintTextsChosen.size() == 1) {
+            log["hintTextChosen"] = hintTextsChosen[0];
+        } else if (hintTextsChosen.size() > 1) {
+            std::vector<uint8_t> nameNums = {};
+            for (size_t c = 0; c < hintTextsChosen.size(); c++) {
+                nameNums.push_back(hintTextsChosen[c]);
+            }
+            log["hintTextsChosen"] = nameNums;
+        }
 
-    if (num != 0){
-      log["num"] = num;
+        if (num != 0) {
+            log["num"] = num;
+        }
     }
-
-  }
-  return log;
+    return log;
 }
 
-void Hint::logHint(oJson& jsonData){
-  auto ctx = Rando::Context::GetInstance();
-  std::string logMap = "Static Hints";
-  bool staticHint = true;
-  if (ownKey < RH_GANONDORF_HINT){
-    logMap = "Gossip Stone Hints";
-    staticHint = false;
-  }
-  if (enabled &&
-      (!(staticHint && (hintType == HINT_TYPE_ITEM) && ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_CLEAR)))){
-      //skip if not enabled or if a static hint with no possible variance
-    jsonData[logMap][Rando::StaticData::hintNames[ownKey].GetForCurrentLanguage(MF_CLEAN)] = toJSON();
-  }
+void Hint::logHint(oJson& jsonData) {
+    auto ctx = Rando::Context::GetInstance();
+    std::string logMap = "Static Hints";
+    bool staticHint = true;
+    if (ownKey < RH_GANONDORF_HINT) {
+        logMap = "Gossip Stone Hints";
+        staticHint = false;
+    }
+    if (enabled &&
+        (!(staticHint && (hintType == HINT_TYPE_ITEM) && ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_CLEAR)))) {
+        // skip if not enabled or if a static hint with no possible variance
+        jsonData[logMap][Rando::StaticData::hintNames[ownKey].GetForCurrentLanguage(MF_CLEAN)] = toJSON();
+    }
 }
 
 const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const {
-  //RANDOTODO make unreliant on locations, or make Hint accept ItemLocation
-  auto ctx = Rando::Context::GetInstance();
-  RandomizerCheck hintedCheck = locations[slot];
-  RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
-  if (mysterious){
-    return StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM];
-  } else if (!ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS) && targetRG == RG_ICE_TRAP) { //RANDOTODO store in item hint instead of item
-      return HintText(CustomMessage({ctx->overrides[hintedCheck].GetTrickName()}));
-  } else {
-    return ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetHint();
-  }
+    // RANDOTODO make unreliant on locations, or make Hint accept ItemLocation
+    auto ctx = Rando::Context::GetInstance();
+    RandomizerCheck hintedCheck = locations[slot];
+    RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
+    if (mysterious) {
+        return StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM];
+    } else if (!ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS) &&
+               targetRG == RG_ICE_TRAP) { // RANDOTODO store in item hint instead of item
+        return HintText(CustomMessage({ ctx->overrides[hintedCheck].GetTrickName() }));
+    } else {
+        return ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetHint();
+    }
 }
 
-const HintText Hint::GetAreaHintText(uint8_t slot) const { 
-  CustomMessage areaText;
-  if (yourPocket && areas[slot] == RA_LINKS_POCKET){
-    return StaticData::hintTextTable[RHT_YOUR_POCKET];
-  } else {
-    return StaticData::hintTextTable[Rando::StaticData::areaNames[areas[slot]]];
-  }
+const HintText Hint::GetAreaHintText(uint8_t slot) const {
+    CustomMessage areaText;
+    if (yourPocket && areas[slot] == RA_LINKS_POCKET) {
+        return StaticData::hintTextTable[RHT_YOUR_POCKET];
+    } else {
+        return StaticData::hintTextTable[Rando::StaticData::areaNames[areas[slot]]];
+    }
 }
 
-
-const CustomMessage Hint::GetItemName(uint8_t slot, bool mysterious) const { 
-  uint8_t nameNum = 0;
-  if (itemNamesChosen.size() > slot){
-    nameNum = itemNamesChosen[slot];
-  }
-  return GetItemHintText(slot, mysterious).GetHintMessage(nameNum);
+const CustomMessage Hint::GetItemName(uint8_t slot, bool mysterious) const {
+    uint8_t nameNum = 0;
+    if (itemNamesChosen.size() > slot) {
+        nameNum = itemNamesChosen[slot];
+    }
+    return GetItemHintText(slot, mysterious).GetHintMessage(nameNum);
 }
 
-const CustomMessage Hint::GetAreaName(uint8_t slot) const { 
-  uint8_t nameNum = 0;
-  if (areaNamesChosen.size() > slot){
-    nameNum = areaNamesChosen[slot];
-  }
-  return GetAreaHintText(slot).GetHintMessage(nameNum);
+const CustomMessage Hint::GetAreaName(uint8_t slot) const {
+    uint8_t nameNum = 0;
+    if (areaNamesChosen.size() > slot) {
+        nameNum = areaNamesChosen[slot];
+    }
+    return GetAreaHintText(slot).GetHintMessage(nameNum);
 }
 
-
 CustomMessage Hint::GetBridgeReqsText() {
-  auto ctx = Rando::Context::GetInstance();
-  CustomMessage bridgeMessage;
+    auto ctx = Rando::Context::GetInstance();
+    CustomMessage bridgeMessage;
 
-  if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)) {
-    return StaticData::hintTextTable[RHT_BRIDGE_OPEN_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)) {
-    return StaticData::hintTextTable[RHT_BRIDGE_VANILLA_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
-    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_STONES_HINT].GetHintMessage();
-    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
-    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT].GetHintMessage();
-    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
-    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_REWARDS_HINT].GetHintMessage();
-    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) {
-    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_DUNGEONS_HINT].GetHintMessage();
-    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
-    bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_TOKENS_HINT].GetHintMessage();
-    bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
-    return  StaticData::hintTextTable[RHT_BRIDGE_GREG_HINT].GetHintMessage();
-  }
-  return bridgeMessage;
+    if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)) {
+        return StaticData::hintTextTable[RHT_BRIDGE_OPEN_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)) {
+        return StaticData::hintTextTable[RHT_BRIDGE_VANILLA_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)) {
+        bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_STONES_HINT].GetHintMessage();
+        bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Get());
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)) {
+        bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT].GetHintMessage();
+        bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Get());
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS)) {
+        bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_REWARDS_HINT].GetHintMessage();
+        bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get());
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)) {
+        bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_DUNGEONS_HINT].GetHintMessage();
+        bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get());
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)) {
+        bridgeMessage = StaticData::hintTextTable[RHT_BRIDGE_TOKENS_HINT].GetHintMessage();
+        bridgeMessage.InsertNumber(ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get());
+    } else if (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)) {
+        return StaticData::hintTextTable[RHT_BRIDGE_GREG_HINT].GetHintMessage();
+    }
+    return bridgeMessage;
 }
 
 CustomMessage Hint::GetGanonBossKeyText() {
-  auto ctx = Rando::Context::GetInstance();
-  CustomMessage ganonBossKeyMessage;
+    auto ctx = Rando::Context::GetInstance();
+    CustomMessage ganonBossKeyMessage;
 
-  if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_START_WITH_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_VANILLA_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_OWN_DUNGEON_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_ANY_DUNGEON_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_OVERWORLD_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_ANYWHERE_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_SKULLTULA_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_VANILLA)) {
-    return StaticData::hintTextTable[RHT_LACS_VANILLA_HINT].GetHintMessage();
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
-    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_STONES_HINT].GetHintMessage();
-    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_STONE_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
-    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_MEDALLIONS_HINT].GetHintMessage();
-    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Get());
-  }
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
-    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_REWARDS_HINT].GetHintMessage();
-    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
-    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_DUNGEONS_HINT].GetHintMessage();
-    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get());
-  } 
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
-    ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_TOKENS_HINT].GetHintMessage();
-    ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get());
-  }
-  else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_TRIFORCE_HUNT)) {
-    return StaticData::hintTextTable[RHT_GANON_BK_TRIFORCE_HINT].GetHintMessage();
-  }
-  return ganonBossKeyMessage;
+    if (ctx->GetOption(RSK_TRIFORCE_HUNT)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_TRIFORCE_HINT].GetHintMessage();
+    }
+
+    if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_START_WITH_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_VANILLA_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_OWN_DUNGEON_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANY_DUNGEON)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_ANY_DUNGEON_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OVERWORLD)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_OVERWORLD_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_ANYWHERE)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_ANYWHERE_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
+        return StaticData::hintTextTable[RHT_GANON_BK_SKULLTULA_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_VANILLA)) {
+        return StaticData::hintTextTable[RHT_LACS_VANILLA_HINT].GetHintMessage();
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_STONES)) {
+        ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_STONES_HINT].GetHintMessage();
+        ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_STONE_COUNT).Get());
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_MEDALLIONS)) {
+        ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_MEDALLIONS_HINT].GetHintMessage();
+        ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Get());
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_REWARDS)) {
+        ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_REWARDS_HINT].GetHintMessage();
+        ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_REWARD_COUNT).Get());
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_DUNGEONS)) {
+        ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_DUNGEONS_HINT].GetHintMessage();
+        ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get());
+    } else if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_LACS_TOKENS)) {
+        ganonBossKeyMessage = StaticData::hintTextTable[RHT_LACS_TOKENS_HINT].GetHintMessage();
+        ganonBossKeyMessage.InsertNumber(ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get());
+    }
+    return ganonBossKeyMessage;
 }
 
-
 void Hint::AddHintedLocation(RandomizerCheck location) {
     locations.push_back(location);
 }
@@ -670,53 +657,53 @@ const std::string& Hint::GetDistribution() const {
     return distribution;
 }
 
-bool Hint::IsEnabled() const{
-  return enabled;
+bool Hint::IsEnabled() const {
+    return enabled;
 }
 
-std::vector<RandomizerHintTextKey> Hint::GetHintTextKeys() const{
-  return hintKeys;
+std::vector<RandomizerHintTextKey> Hint::GetHintTextKeys() const {
+    return hintKeys;
 }
 
-std::vector<RandomizerGet> Hint::GetHintedItems() const{
-  return items;
+std::vector<RandomizerGet> Hint::GetHintedItems() const {
+    return items;
 }
 
-std::vector<uint8_t> Hint::GetItemNamesChosen() const{
-  return itemNamesChosen;
+std::vector<uint8_t> Hint::GetItemNamesChosen() const {
+    return itemNamesChosen;
 }
 
-std::vector<uint8_t> Hint::GetHintTextsChosen() const{
-  return hintTextsChosen;
+std::vector<uint8_t> Hint::GetHintTextsChosen() const {
+    return hintTextsChosen;
 }
-std::vector<uint8_t> Hint::GetAreaTextsChosen() const{
-  return areaNamesChosen;
+std::vector<uint8_t> Hint::GetAreaTextsChosen() const {
+    return areaNamesChosen;
 }
 
-std::vector<TrialKey> Hint::GetHintedTrials() const{
-  return trials;
+std::vector<TrialKey> Hint::GetHintedTrials() const {
+    return trials;
 }
 
-int Hint::GetNum(){
-  return num;
+int Hint::GetNum() {
+    return num;
 }
 
 void Hint::ResetVariables() {
-  ownKey = RH_NONE;
-  num = 0;
-  yourPocket = false;
-  messages = {};
-  hintKeys = {};
-  locations = {};
-  items = {};
-  trials = {};
-  hintType = HINT_TYPE_HINT_KEY;
-  areas = {};
-  distribution = "";
-  enabled = false;
-  itemNamesChosen = {};
-  hintTextsChosen = {};
-  areaNamesChosen = {};
+    ownKey = RH_NONE;
+    num = 0;
+    yourPocket = false;
+    messages = {};
+    hintKeys = {};
+    locations = {};
+    items = {};
+    trials = {};
+    hintType = HINT_TYPE_HINT_KEY;
+    areas = {};
+    distribution = "";
+    enabled = false;
+    itemNamesChosen = {};
+    hintTextsChosen = {};
+    areaNamesChosen = {};
 }
 
-}
\ No newline at end of file
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index 03e1af850e..7ff46a104a 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -10,73 +10,64 @@ using oJson = nlohmann::ordered_json;
 
 namespace Rando {
 class Hint {
-     public:
-     Hint();
-     Hint(RandomizerHint ownKey_, 
-          HintType hintType_,
-          std::string distributionName_,
-          std::vector<RandomizerHintTextKey> hintKeys_,
-          std::vector<RandomizerCheck> locations_,
-          std::vector<RandomizerArea> areas_ = {},
-          std::vector<TrialKey> trials_ = {});
-     Hint(RandomizerHint ownKey_, 
-          HintType hintType_,
-          std::vector<RandomizerHintTextKey> hintKeys_,
-          std::vector<RandomizerCheck> locations_ = {},
-          std::vector<RandomizerArea> areas_ = {},
-          std::vector<TrialKey> trials_ = {},
-          bool yourPocket_ = false, 
-          int num_ = 0);
-     Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_);
-     Hint(RandomizerHint ownKey_, nlohmann::json json_);
-     void FillGapsInData();
-     void SetLocationsAsHinted() const;
-     void NamesChosen();
-     uint8_t GetNumberOfMessages() const;
-     const std::vector<std::string> GetAllMessageStrings(MessageFormat format = MF_AUTO_FORMAT) const ;
-     const CustomMessage GetHintMessage(MessageFormat format = MF_AUTO_FORMAT, uint8_t id = 0) const ;
-     const HintText GetHintText(uint8_t id = 0) const;
-     oJson toJSON();
-     void logHint(oJson& jsonData);
-     const HintText GetItemHintText(uint8_t slot, bool mysterious = false) const;
-     const HintText GetAreaHintText(uint8_t slot) const;
-     const CustomMessage GetItemName(uint8_t slot, bool mysterious = false) const;
-     const CustomMessage GetAreaName(uint8_t slot) const;
-     static CustomMessage GetBridgeReqsText();
-     static CustomMessage GetGanonBossKeyText();
-     void AddHintedLocation (RandomizerCheck location);
-     std::vector<RandomizerCheck> GetHintedLocations() const;
-     void SetHintType (HintType type);
-     HintType GetHintType() const;
-     void AddHintedArea (RandomizerArea area);
-     std::vector<RandomizerArea> GetHintedAreas() const;
-     void SetDistribution (std::string distribution);
-     const std::string& GetDistribution() const;
-     bool IsEnabled() const;
-     std::vector<RandomizerHintTextKey> GetHintTextKeys() const;
-     std::vector<RandomizerGet> GetHintedItems() const;
-     std::vector<uint8_t> GetItemNamesChosen() const;
-     std::vector<uint8_t> GetHintTextsChosen() const;
-     std::vector<uint8_t> GetAreaTextsChosen() const;
-     std::vector<TrialKey> GetHintedTrials() const;
-     int GetNum();
-     void ResetVariables();
+  public:
+    Hint();
+    Hint(RandomizerHint ownKey_, HintType hintType_, std::string distributionName_,
+         std::vector<RandomizerHintTextKey> hintKeys_, std::vector<RandomizerCheck> locations_,
+         std::vector<RandomizerArea> areas_ = {}, std::vector<TrialKey> trials_ = {});
+    Hint(RandomizerHint ownKey_, HintType hintType_, std::vector<RandomizerHintTextKey> hintKeys_,
+         std::vector<RandomizerCheck> locations_ = {}, std::vector<RandomizerArea> areas_ = {},
+         std::vector<TrialKey> trials_ = {}, bool yourPocket_ = false, int num_ = 0);
+    Hint(RandomizerHint ownKey_, std::vector<CustomMessage> messages_);
+    Hint(RandomizerHint ownKey_, nlohmann::json json_);
+    void FillGapsInData();
+    void SetLocationsAsHinted() const;
+    void NamesChosen();
+    size_t GetNumberOfMessages() const;
+    const std::vector<std::string> GetAllMessageStrings(MessageFormat format = MF_AUTO_FORMAT) const;
+    const CustomMessage GetHintMessage(MessageFormat format = MF_AUTO_FORMAT, size_t id = 0) const;
+    const HintText GetHintText(size_t id = 0) const;
+    oJson toJSON();
+    void logHint(oJson& jsonData);
+    const HintText GetItemHintText(uint8_t slot, bool mysterious = false) const;
+    const HintText GetAreaHintText(uint8_t slot) const;
+    const CustomMessage GetItemName(uint8_t slot, bool mysterious = false) const;
+    const CustomMessage GetAreaName(uint8_t slot) const;
+    static CustomMessage GetBridgeReqsText();
+    static CustomMessage GetGanonBossKeyText();
+    void AddHintedLocation(RandomizerCheck location);
+    std::vector<RandomizerCheck> GetHintedLocations() const;
+    void SetHintType(HintType type);
+    HintType GetHintType() const;
+    void AddHintedArea(RandomizerArea area);
+    std::vector<RandomizerArea> GetHintedAreas() const;
+    void SetDistribution(std::string distribution);
+    const std::string& GetDistribution() const;
+    bool IsEnabled() const;
+    std::vector<RandomizerHintTextKey> GetHintTextKeys() const;
+    std::vector<RandomizerGet> GetHintedItems() const;
+    std::vector<uint8_t> GetItemNamesChosen() const;
+    std::vector<uint8_t> GetHintTextsChosen() const;
+    std::vector<uint8_t> GetAreaTextsChosen() const;
+    std::vector<TrialKey> GetHintedTrials() const;
+    int GetNum();
+    void ResetVariables();
 
-     private:
-     RandomizerHint ownKey = RH_NONE;
-     HintType hintType = HINT_TYPE_HINT_KEY;
-     std::string distribution = "";
-     std::vector<RandomizerHintTextKey> hintKeys = {};
-     std::vector<RandomizerCheck> locations = {};
-     std::vector<RandomizerArea> areas = {};
-     std::vector<TrialKey> trials = {};
-     bool yourPocket = false;
-     int num = 0;
-     std::vector<CustomMessage> messages = {};
-     std::vector<RandomizerGet> items = {};
-     bool enabled = false;
-     std::vector<uint8_t> itemNamesChosen = {};
-     std::vector<uint8_t> hintTextsChosen = {};
-     std::vector<uint8_t> areaNamesChosen = {};
+  private:
+    RandomizerHint ownKey = RH_NONE;
+    HintType hintType = HINT_TYPE_HINT_KEY;
+    std::string distribution = "";
+    std::vector<RandomizerHintTextKey> hintKeys = {};
+    std::vector<RandomizerCheck> locations = {};
+    std::vector<RandomizerArea> areas = {};
+    std::vector<TrialKey> trials = {};
+    bool yourPocket = false;
+    int num = 0;
+    std::vector<CustomMessage> messages = {};
+    std::vector<RandomizerGet> items = {};
+    bool enabled = false;
+    std::vector<uint8_t> itemNamesChosen = {};
+    std::vector<uint8_t> hintTextsChosen = {};
+    std::vector<uint8_t> areaNamesChosen = {};
 };
-}
\ No newline at end of file
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index f48b7da5a9..92d210300d 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -8,14 +8,11 @@
 #include "soh/Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/Enhancements/randomizer/static_data.h"
-#include "soh/Enhancements/randomizer/ShufflePots.h"
-#include "soh/Enhancements/randomizer/ShuffleFreestanding.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Notification/Notification.h"
 #include "soh/SaveManager.h"
-#include "soh/Enhancements/randomizer/ShuffleFairies.h"
 
 extern "C" {
 #include "macros.h"
@@ -29,6 +26,7 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h"
 #include "src/overlays/actors/ovl_En_Dns/z_en_dns.h"
 #include "src/overlays/actors/ovl_En_Gb/z_en_gb.h"
+#include "src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h"
 #include "src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
 #include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
 #include "src/overlays/actors/ovl_En_Mk/z_en_mk.h"
@@ -43,9 +41,9 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 #include "src/overlays/actors/ovl_En_Hy/z_en_hy.h"
-#include "src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h"
 #include "src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
+#include "src/overlays/actors/ovl_En_Ge2/z_en_ge2.h"
 #include "src/overlays/actors/ovl_En_Ds/z_en_ds.h"
 #include "src/overlays/actors/ovl_En_Gm/z_en_gm.h"
 #include "src/overlays/actors/ovl_En_Js/z_en_js.h"
@@ -60,34 +58,38 @@ extern "C" {
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 extern void func_8084DFAC(PlayState* play, Player* player);
-extern void Player_SetupActionPreserveAnimMovement(PlayState* play, Player* player, PlayerActionFunc actionFunc, s32 flags);
+extern void Player_SetupActionPreserveAnimMovement(PlayState* play, Player* player, PlayerActionFunc actionFunc,
+                                                   s32 flags);
 extern s32 Player_SetupWaitForPutAway(PlayState* play, Player* player, AfterPutAwayFunc func);
-extern void Play_InitEnvironment(PlayState * play, s16 skyboxId);
+extern void Play_InitEnvironment(PlayState* play, s16 skyboxId);
 extern void EnMk_Wait(EnMk* enMk, PlayState* play);
 extern void func_80ABA778(EnNiwLady* enNiwLady, PlayState* play);
+extern void EnGe1_Wait_Archery(EnGe1* enGe1, PlayState* play);
+extern void EnGe1_SetAnimationIdle(EnGe1* enGe1);
+extern void EnGe1_SetAnimationIdle(EnGe1* enGe1);
+extern void EnGe2_SetupCapturePlayer(EnGe2* enGe2, PlayState* play);
 }
 
-#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
-
 bool LocMatchesQuest(Rando::Location loc) {
     if (loc.GetQuest() == RCQUEST_BOTH) {
         return true;
     } else {
         auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene());
-        return (dungeon->IsMQ() && loc.GetQuest() == RCQUEST_MQ) || (dungeon->IsVanilla() && loc.GetQuest() == RCQUEST_VANILLA);
+        return (dungeon->IsMQ() && loc.GetQuest() == RCQUEST_MQ) ||
+               (dungeon->IsVanilla() && loc.GetQuest() == RCQUEST_VANILLA);
     }
 }
 
 RandomizerCheck GetRandomizerCheckFromFlag(int16_t flagType, int16_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
-        if ((loc.GetCollectionCheck().flag == flag && (
-                (flagType == FLAG_INF_TABLE && loc.GetCollectionCheck().type == SPOILER_CHK_INF_TABLE) ||
-                (flagType == FLAG_EVENT_CHECK_INF && loc.GetCollectionCheck().type == SPOILER_CHK_EVENT_CHK_INF) ||
-                (flagType == FLAG_ITEM_GET_INF && loc.GetCollectionCheck().type == SPOILER_CHK_ITEM_GET_INF) ||
-                (flagType == FLAG_RANDOMIZER_INF && loc.GetCollectionCheck().type == SPOILER_CHK_RANDOMIZER_INF)
-            ) ||
-            (loc.GetActorParams() == flag && flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
-        ) && LocMatchesQuest(loc)) {
+        if ((loc.GetCollectionCheck().flag == flag &&
+                 ((flagType == FLAG_INF_TABLE && loc.GetCollectionCheck().type == SPOILER_CHK_INF_TABLE) ||
+                  (flagType == FLAG_EVENT_CHECK_INF && loc.GetCollectionCheck().type == SPOILER_CHK_EVENT_CHK_INF) ||
+                  (flagType == FLAG_ITEM_GET_INF && loc.GetCollectionCheck().type == SPOILER_CHK_ITEM_GET_INF) ||
+                  (flagType == FLAG_RANDOMIZER_INF && loc.GetCollectionCheck().type == SPOILER_CHK_RANDOMIZER_INF)) ||
+             (loc.GetActorParams() == flag && flagType == FLAG_GS_TOKEN &&
+              loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)) &&
+            LocMatchesQuest(loc)) {
             return loc.GetRandomizerCheck();
         }
     }
@@ -97,11 +99,11 @@ RandomizerCheck GetRandomizerCheckFromFlag(int16_t flagType, int16_t flag) {
 
 RandomizerCheck GetRandomizerCheckFromSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
-        if (loc.GetCollectionCheck().scene == sceneNum && loc.GetCollectionCheck().flag == flag && (
-            (flagType == FLAG_SCENE_TREASURE && loc.GetCollectionCheck().type == SPOILER_CHK_CHEST) ||
-            (flagType == FLAG_SCENE_COLLECTIBLE && loc.GetCollectionCheck().type == SPOILER_CHK_COLLECTABLE) ||
-            (flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)
-        ) && LocMatchesQuest(loc)) {
+        if (loc.GetCollectionCheck().scene == sceneNum && loc.GetCollectionCheck().flag == flag &&
+            ((flagType == FLAG_SCENE_TREASURE && loc.GetCollectionCheck().type == SPOILER_CHK_CHEST) ||
+             (flagType == FLAG_SCENE_COLLECTIBLE && loc.GetCollectionCheck().type == SPOILER_CHK_COLLECTABLE) ||
+             (flagType == FLAG_GS_TOKEN && loc.GetCollectionCheck().type == SPOILER_CHK_GOLD_SKULLTULA)) &&
+            LocMatchesQuest(loc)) {
             return loc.GetRandomizerCheck();
         }
     }
@@ -122,7 +124,8 @@ bool MeetsLACSRequirements() {
             }
             break;
         case RO_GANON_BOSS_KEY_LACS_REWARDS:
-            if ((CheckMedallionCount() + CheckStoneCount() + CheckLACSRewardCount()) >= RAND_GET_OPTION(RSK_LACS_REWARD_COUNT)) {
+            if ((CheckMedallionCount() + CheckStoneCount() + CheckLACSRewardCount()) >=
+                RAND_GET_OPTION(RSK_LACS_REWARD_COUNT)) {
                 return true;
             }
             break;
@@ -171,13 +174,15 @@ bool MeetsRainbowBridgeRequirements() {
             break;
         }
         case RO_BRIDGE_MEDALLIONS: {
-            if ((CheckMedallionCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT)) {
+            if ((CheckMedallionCount() + CheckBridgeRewardCount()) >=
+                RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT)) {
                 return true;
             }
             break;
         }
         case RO_BRIDGE_DUNGEON_REWARDS: {
-            if ((CheckMedallionCount() + CheckStoneCount() + CheckBridgeRewardCount()) >= RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_REWARD_COUNT)) {
+            if ((CheckMedallionCount() + CheckStoneCount() + CheckBridgeRewardCount()) >=
+                RAND_GET_OPTION(RSK_RAINBOW_BRIDGE_REWARD_COUNT)) {
                 return true;
             }
             break;
@@ -229,15 +234,24 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
     }
 
     if (flagType == FLAG_EVENT_CHECK_INF && flag == EVENTCHKINF_TALON_WOKEN_IN_CASTLE) {
-        //remove chicken as this is the only use for it
+        // remove chicken as this is the only use for it
         Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_CHICKEN);
     }
 
-    RandomizerCheck rc = GetRandomizerCheckFromFlag(flagType, flag);
-    if (rc == RC_UNKNOWN_CHECK) return;
+    if (flagType == FLAG_EVENT_CHECK_INF && flag == EVENTCHKINF_OBTAINED_ZELDAS_LETTER) {
+        Flags_SetRandomizerInf(RAND_INF_ZELDAS_LETTER);
+    }
 
+    RandomizerCheck rc = GetRandomizerCheckFromFlag(flagType, flag);
+    if (rc == RC_UNKNOWN_CHECK)
+        return;
+
+    if (flagType == FLAG_GS_TOKEN &&
+        Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF))
+        return;
     auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
-    if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) return;
+    if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE)
+        return;
 
     SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
     randomizerQueuedChecks.push(rc);
@@ -245,17 +259,17 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
 
 void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t flag) {
     if (RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
-        sceneNum == SCENE_GERUDOS_FORTRESS &&
-        flagType == FLAG_SCENE_SWITCH &&
-        flag == 0x3A) {
+        sceneNum == SCENE_GERUDOS_FORTRESS && flagType == FLAG_SCENE_SWITCH && flag == 0x3A) {
         Flags_SetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN);
     }
 
     RandomizerCheck rc = GetRandomizerCheckFromSceneFlag(sceneNum, flagType, flag);
-    if (rc == RC_UNKNOWN_CHECK) return;
+    if (rc == RC_UNKNOWN_CHECK)
+        return;
 
     auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
-    if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) return;
+    if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE)
+        return;
 
     SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
     randomizerQueuedChecks.push(rc);
@@ -265,14 +279,17 @@ static Vec3f spawnPos = { 0.0f, -999.0f, 0.0f };
 
 void RandomizerOnPlayerUpdateForRCQueueHandler() {
     // If we're already queued, don't queue again
-    if (randomizerQueuedCheck != RC_UNKNOWN_CHECK) return;
+    if (randomizerQueuedCheck != RC_UNKNOWN_CHECK)
+        return;
 
     // If there's nothing to queue, don't queue
-    if (randomizerQueuedChecks.size() < 1) return;
+    if (randomizerQueuedChecks.size() < 1)
+        return;
 
     // If we're in a cutscene, don't queue
     Player* player = GET_PLAYER(gPlayState);
-    if (Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
+    if (Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS ||
+        player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
         return;
     }
 
@@ -280,7 +297,8 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
     auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
     RandomizerGet vanillaRandomizerGet = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
     GetItemID vanillaItem = (GetItemID)Rando::StaticData::RetrieveItem(vanillaRandomizerGet).GetItemID();
-    GetItemEntry getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
+    GetItemEntry getItemEntry =
+        Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
 
     if (loc->HasObtained()) {
         SPDLOG_INFO("RC {} already obtained, skipping", static_cast<uint32_t>(rc));
@@ -288,28 +306,26 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
         iceTrapScale = 0.0f;
         randomizerQueuedCheck = rc;
         randomizerQueuedItemEntry = getItemEntry;
-        SPDLOG_INFO("Queueing Item mod {} item {} from RC {}", getItemEntry.modIndex, getItemEntry.itemId, static_cast<uint32_t>(rc));
+        SPDLOG_INFO("Queueing Item mod {} item {} from RC {}", getItemEntry.modIndex, getItemEntry.itemId,
+                    static_cast<uint32_t>(rc));
         if (
             // Skipping ItemGet animation incompatible with checks that require closing a text box to finish
-            rc != RC_HF_OCARINA_OF_TIME_ITEM &&
-            rc != RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
-            rc != RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE &&
-            rc != RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE &&
+            rc != RC_HF_OCARINA_OF_TIME_ITEM && rc != RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
+            rc != RC_MARKET_BOMBCHU_BOWLING_FIRST_PRIZE && rc != RC_MARKET_BOMBCHU_BOWLING_SECOND_PRIZE &&
             // Always show ItemGet animation for ice traps
             !(getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId == RG_ICE_TRAP) &&
-            (
-                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) == SGIA_ALL ||
-                (
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) == SGIA_JUNK &&
-                    (
-                        getItemEntry.getItemCategory == ITEM_CATEGORY_JUNK ||
-                        getItemEntry.getItemCategory == ITEM_CATEGORY_SKULLTULA_TOKEN ||
-                        getItemEntry.getItemCategory == ITEM_CATEGORY_LESSER
-                    )
-                )
-            )
-        ) {
-            Item_DropCollectible(gPlayState, &spawnPos, ITEM00_SOH_GIVE_ITEM_ENTRY | 0x8000);
+            // Always show ItemGet animation outside of randomizer to keep behaviour consistent in vanilla
+            IS_RANDO &&
+            (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_JUNK) == SGIA_ALL ||
+             (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_JUNK) == SGIA_JUNK &&
+              (
+                  // crude fix to ensure map hints are readable. Ideally replace with better hint tracking.
+                  !(getItemEntry.getItemId >= RG_DEKU_TREE_MAP && getItemEntry.getItemId <= RG_ICE_CAVERN_MAP &&
+                    getItemEntry.modIndex == MOD_RANDOMIZER) &&
+                  (getItemEntry.getItemCategory == ITEM_CATEGORY_JUNK ||
+                   getItemEntry.getItemCategory == ITEM_CATEGORY_SKULLTULA_TOKEN ||
+                   getItemEntry.getItemCategory == ITEM_CATEGORY_LESSER))))) {
+            Item_DropCollectible(gPlayState, &spawnPos, static_cast<int16_t>(ITEM00_SOH_GIVE_ITEM_ENTRY | 0x8000));
         }
     }
 
@@ -317,14 +333,18 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
 }
 
 void RandomizerOnPlayerUpdateForItemQueueHandler() {
-    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK) return;
+    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK)
+        return;
 
     Player* player = GET_PLAYER(gPlayState);
-    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
+    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) ||
+        player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM ||
+        player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
         return;
     }
 
-    SPDLOG_INFO("Attempting to give Item mod {} item {} from RC {}", randomizerQueuedItemEntry.modIndex, randomizerQueuedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
+    SPDLOG_INFO("Attempting to give Item mod {} item {} from RC {}", randomizerQueuedItemEntry.modIndex,
+                randomizerQueuedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
     GiveItemEntryWithoutActor(gPlayState, randomizerQueuedItemEntry);
     if (player->stateFlags1 & PLAYER_STATE1_IN_WATER) {
         // Allow the player to receive the item while swimming
@@ -334,26 +354,26 @@ void RandomizerOnPlayerUpdateForItemQueueHandler() {
 }
 
 void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
-    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK) return;
+    if (randomizerQueuedCheck == RC_UNKNOWN_CHECK)
+        return;
 
     auto loc = Rando::Context::GetInstance()->GetItemLocation(randomizerQueuedCheck);
-    if (randomizerQueuedItemEntry.modIndex == receivedItemEntry.modIndex && randomizerQueuedItemEntry.itemId == receivedItemEntry.itemId) {
-        SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId, static_cast<uint32_t>(randomizerQueuedCheck));
+    if (randomizerQueuedItemEntry.modIndex == receivedItemEntry.modIndex &&
+        randomizerQueuedItemEntry.itemId == receivedItemEntry.itemId) {
+        SPDLOG_INFO("Item received mod {} item {} from RC {}", receivedItemEntry.modIndex, receivedItemEntry.itemId,
+                    static_cast<uint32_t>(randomizerQueuedCheck));
         loc->SetCheckStatus(RCSHOW_COLLECTED);
         CheckTracker::SpoilAreaFromCheck(randomizerQueuedCheck);
         CheckTracker::RecalculateAllAreaTotals();
+        CheckTracker::RecalculateAvailableChecks();
         SaveManager::Instance->SaveSection(gSaveContext.fileNum, SECTION_ID_TRACKER_DATA, true);
         randomizerQueuedCheck = RC_UNKNOWN_CHECK;
         randomizerQueuedItemEntry = GET_ITEM_NONE;
     }
 
-    if (
-        receivedItemEntry.modIndex == MOD_NONE && (
-            receivedItemEntry.itemId == ITEM_HEART_PIECE ||
-            receivedItemEntry.itemId == ITEM_HEART_PIECE_2 ||
-            receivedItemEntry.itemId == ITEM_HEART_CONTAINER
-        )
-    ) {
+    if (receivedItemEntry.modIndex == MOD_NONE &&
+        (receivedItemEntry.itemId == ITEM_HEART_PIECE || receivedItemEntry.itemId == ITEM_HEART_PIECE_2 ||
+         receivedItemEntry.itemId == ITEM_HEART_CONTAINER)) {
         gSaveContext.healthAccumulator = 0x140; // Refill 20 hearts
         if ((s32)(gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000) {
             gSaveContext.inventory.questItems ^= 0x40000000;
@@ -362,11 +382,14 @@ void RandomizerOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
         }
     }
 
-    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
+    if (loc->GetRandomizerCheck() == RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST &&
+        !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         static uint32_t updateHook;
         updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
             Player* player = GET_PLAYER(gPlayState);
-            if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
+            if (player == NULL || Player_InBlockingCsMode(gPlayState, player) ||
+                player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM ||
+                player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
                 return;
             }
 
@@ -397,7 +420,7 @@ void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
     if (Object_IsLoaded(&play->objectCtx, enExItem->objectIdx)) {
         enExItem->actor.draw = (ActorFunc)EnExItem_DrawRandomizedItem;
         Actor_SetScale(&enExItem->actor, enExItem->scale);
-        
+
         // for now we're just using this to not have items float
         // below the bowling counter, but it would be nice to use
         // this to not draw gigantic skull tokens etc.
@@ -411,7 +434,7 @@ void EnExItem_WaitForObjectRandomized(EnExItem* enExItem, PlayState* play) {
 }
 
 void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play) {
-    f32 mtxScale = CVarGetFloat(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 10.0f);
+    f32 mtxScale = CVarGetFloat(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 10.0f);
     Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
     GetItemEntry randoItem = enItem00->itemEntry;
     if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) &&
@@ -464,8 +487,7 @@ void ItemEtcetera_DrawRandomizedItemThroughLens(ItemEtcetera* itemEtcetera, Play
 }
 
 void ItemEtcetera_func_80B858B4_Randomized(ItemEtcetera* itemEtcetera, PlayState* play) {
-    if (itemEtcetera->actor.xzDistToPlayer < 30.0f &&
-        fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
+    if (itemEtcetera->actor.xzDistToPlayer < 30.0f && fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
         if ((itemEtcetera->actor.params & 0xFF) == 1) {
             Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
             Flags_SetSwitch(play, 0xB);
@@ -484,8 +506,7 @@ void ItemEtcetera_func_80B85824_Randomized(ItemEtcetera* itemEtcetera, PlayState
         return;
     }
 
-    if (itemEtcetera->actor.xzDistToPlayer < 30.0f &&
-        fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
+    if (itemEtcetera->actor.xzDistToPlayer < 30.0f && fabsf(itemEtcetera->actor.yDistToPlayer) < 50.0f) {
 
         Flags_SetTreasure(play, 0x1F);
         Actor_Kill(&itemEtcetera->actor);
@@ -524,43 +545,21 @@ u8 EnDs_RandoCanGetGrannyItem() {
            // Traded odd mushroom when adult trade is on
            ((RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) && Flags_GetItemGetInf(ITEMGETINF_30)) ||
             // Found claim check when adult trade is off
-            (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) &&
-             INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK));
+            (!RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE) && INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK));
 }
 
 u8 EnJs_RandoCanGetCarpetMerchantItem() {
-    return  (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
-             RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
-            // If the rando check has already been awarded, use vanilla behavior.
-            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
+    return (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
+            RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
+           // If the rando check has already been awarded, use vanilla behavior.
+           !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN);
 }
 
 u8 EnGm_RandoCanGetMedigoronItem() {
-    return  (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
-             RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
-            // If the rando check has already been awarded, use vanilla behavior.
-            !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
-}
-
-RandomizerCheck EnFr_RandomizerCheckFromSongIndex(u16 songIndex) {
-    switch (songIndex) {
-        case FROG_ZL:
-            return RC_ZR_FROGS_ZELDAS_LULLABY;
-        case FROG_EPONA:
-            return RC_ZR_FROGS_EPONAS_SONG;
-        case FROG_SARIA:
-            return RC_ZR_FROGS_SARIAS_SONG;
-        case FROG_SUNS:
-            return RC_ZR_FROGS_SUNS_SONG;
-        case FROG_SOT:
-            return RC_ZR_FROGS_SONG_OF_TIME;
-        case FROG_STORMS:
-            return RC_ZR_FROGS_IN_THE_RAIN;
-        case FROG_CHOIR_SONG:
-            return RC_ZR_FROGS_OCARINA_GAME;
-        default:
-            return RC_UNKNOWN_CHECK;
-    }
+    return (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL ||
+            RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) &&
+           // If the rando check has already been awarded, use vanilla behavior.
+           !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
 }
 
 void RandomizerSetChestGameRandomizerInf(RandomizerCheck rc) {
@@ -611,44 +610,50 @@ void func_8083A434_override(PlayState* play, Player* player) {
     player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_CUTSCENE;
 }
 
-bool ShouldGiveFishingPrize(f32 sFishOnHandLength){
+bool ShouldGiveFishingPrize(f32 sFishOnHandLength) {
     // RANDOTODO: update the enhancement sliders to not allow
     // values above rando fish weight values when rando'd
-    if(LINK_IS_CHILD) {
-        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 10) : 10;
+    if (LINK_IS_CHILD) {
+        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0)
+                             ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 10)
+                             : 10;
         f32 score = sqrt(((f32)weight - 0.5f) / 0.0036f);
-        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING) : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD));
-    } else
-    {
-        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 13) : 13;
+        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING)
+                                                       : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD));
+    } else {
+        int32_t weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0)
+                             ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 13)
+                             : 13;
         f32 score = sqrt(((f32)weight - 0.5f) / 0.0036f);
-        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING) : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT));
+        return sFishOnHandLength >= score && (IS_RANDO ? !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING)
+                                                       : !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT));
     }
 }
 
 void RandomizerOnDialogMessageHandler() {
-    MessageContext *msgCtx = &gPlayState->msgCtx;
-    Actor *actor = msgCtx->talkActor;
+    MessageContext* msgCtx = &gPlayState->msgCtx;
+    Actor* actor = msgCtx->talkActor;
     auto ctx = Rando::Context::GetInstance();
     bool revealMerchant = ctx->GetOption(RSK_MERCHANT_TEXT_HINT).Get() != RO_GENERIC_OFF;
     bool nonBeanMerchants = ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
-                             ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL);
+                            ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL);
 
     RandomizerCheck reveal = RC_UNKNOWN_CHECK;
-    if (ctx->GetOption(RSK_CHICKENS_HINT) && (msgCtx->textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && msgCtx->textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
+    if (ctx->GetOption(RSK_CHICKENS_HINT) &&
+        (msgCtx->textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && msgCtx->textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
         reveal = RC_KAK_ANJU_AS_CHILD;
     } else {
         switch (msgCtx->textId) {
             case TEXT_SKULLTULA_PEOPLE_IM_CURSED:
-                if (actor->params == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
+                if (actor->params == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)) {
                     reveal = RC_KAK_10_GOLD_SKULLTULA_REWARD;
-                } else if (actor->params == 2 && ctx->GetOption(RSK_KAK_20_SKULLS_HINT)){
+                } else if (actor->params == 2 && ctx->GetOption(RSK_KAK_20_SKULLS_HINT)) {
                     reveal = RC_KAK_20_GOLD_SKULLTULA_REWARD;
-                } else if (actor->params == 3 && ctx->GetOption(RSK_KAK_30_SKULLS_HINT)){
+                } else if (actor->params == 3 && ctx->GetOption(RSK_KAK_30_SKULLS_HINT)) {
                     reveal = RC_KAK_30_GOLD_SKULLTULA_REWARD;
-                } else if (actor->params == 4 && ctx->GetOption(RSK_KAK_40_SKULLS_HINT)){
+                } else if (actor->params == 4 && ctx->GetOption(RSK_KAK_40_SKULLS_HINT)) {
                     reveal = RC_KAK_40_GOLD_SKULLTULA_REWARD;
-                } else if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)){
+                } else if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)) {
                     reveal = RC_KAK_50_GOLD_SKULLTULA_REWARD;
                 }
                 break;
@@ -701,20 +706,21 @@ void RandomizerOnDialogMessageHandler() {
             case TEXT_SCRUB_RANDOM:
                 if (ctx->GetOption(RSK_SCRUB_TEXT_HINT).Get() != RO_GENERIC_OFF) {
                     EnDns* enDns = (EnDns*)actor;
-                    reveal = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)enDns->sohScrubIdentity.randomizerInf);
+                    reveal = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+                        (RandomizerInf)enDns->sohScrubIdentity.randomizerInf);
                 }
                 break;
             case TEXT_BEAN_SALESMAN_BUY_FOR_10:
                 if (revealMerchant && (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
-                  ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
+                                       ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
                     reveal = RC_ZR_MAGIC_BEAN_SALESMAN;
                 }
                 break;
             case TEXT_GRANNYS_SHOP:
                 if (revealMerchant && nonBeanMerchants &&
-                  (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) {
-                     reveal = RC_KAK_GRANNYS_SHOP;
-                 }
+                    (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) {
+                    reveal = RC_KAK_GRANNYS_SHOP;
+                }
                 break;
             case TEXT_MEDIGORON:
                 if (revealMerchant && nonBeanMerchants) {
@@ -737,7 +743,7 @@ void RandomizerOnDialogMessageHandler() {
             case TEXT_SHEIK_NEED_HOOK:
             case TEXT_SHEIK_HAVE_HOOK:
                 if (ctx->GetOption(RSK_OOT_HINT) && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME &&
-                  !ctx->GetItemLocation(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()) {
+                    !ctx->GetItemLocation(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()) {
                     auto itemoot_loc = ctx->GetItemLocation(RC_HF_OCARINA_OF_TIME_ITEM);
                     if (itemoot_loc->GetCheckStatus() == RCSHOW_UNCHECKED) {
                         itemoot_loc->SetCheckStatus(RCSHOW_IDENTIFIED);
@@ -782,15 +788,17 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_PLAY_SLOW_CHEST_CS: {
-            // We force fast chests if SkipGetItemAnimation is enabled because the camera in the CS looks pretty wonky otherwise
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED)) {
+            // We force fast chests if SkipGetItemAnimation is enabled because the camera in the CS looks pretty wonky
+            // otherwise
+            if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_JUNK)) {
                 *should = false;
             }
             break;
         }
         case VB_GIVE_ITEM_FROM_CHEST: {
             EnBox* chest = va_arg(args, EnBox*);
-            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(
+                chest->dyna.actor.id, gPlayState->sceneNum, chest->dyna.actor.params);
             if (!OTRGlobals::Instance->gRandoContext->IsLocationShuffled(rc)) {
                 break;
             }
@@ -812,17 +820,21 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = false;
             break;
         case VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER: {
-            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && !Flags_GetTreasure(gPlayState, 0x2);
+            *should =
+                !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && !Flags_GetTreasure(gPlayState, 0x2);
             break;
         }
         case VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER:
-            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && Flags_GetTreasure(gPlayState, 0x2);
+            *should =
+                !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER) && Flags_GetTreasure(gPlayState, 0x2);
             break;
         case VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT:
-            *should = !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST);
+            *should =
+                !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST);
             break;
         case VB_MIDO_SPAWN:
-            if (RAND_GET_OPTION(RSK_FOREST) != RO_CLOSED_FOREST_OFF && !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) {
+            if (RAND_GET_OPTION(RSK_FOREST) != RO_CLOSED_FOREST_OFF &&
+                !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) {
                 *should = true;
             }
             break;
@@ -835,26 +847,22 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
             break;
         case VB_OPEN_KOKIRI_FOREST:
-            *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD) || RAND_GET_OPTION(RSK_FOREST) != RO_CLOSED_FOREST_ON;
+            *should = Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD) ||
+                      RAND_GET_OPTION(RSK_FOREST) != RO_CLOSED_FOREST_ON;
             break;
         case VB_BE_ELIGIBLE_FOR_DARUNIAS_JOY_REWARD:
             *should = !Flags_GetRandomizerInf(RAND_INF_DARUNIAS_JOY);
             break;
         case VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS:
-            *should =
-                LINK_IS_ADULT &&
-                (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_TEMPLE_OF_TIME) &&
-                !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
-                MeetsLACSRequirements();
+            *should = LINK_IS_ADULT && (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_TEMPLE_OF_TIME) &&
+                      !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
+                      MeetsLACSRequirements();
             break;
         case VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW:
-            *should =
-                    !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL) &&
-                    LINK_IS_ADULT &&
-                    gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_KAKARIKO_VILLAGE &&
-                    CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) &&
-                    CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) &&
-                    CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER);
+            *should = !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL) && LINK_IS_ADULT &&
+                      gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_KAKARIKO_VILLAGE &&
+                      CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) &&
+                      CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER);
             break;
         case VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD: {
             // Don't require a bomb bag to get prize in rando
@@ -864,7 +872,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE: {
             if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
                 RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) {
-                *should = gSaveContext.rupees >= OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice();
+                *should = gSaveContext.rupees >=
+                          OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice();
             }
             break;
         }
@@ -900,9 +909,11 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         }
         case VB_ITEM_B_HEART_DESPAWN: {
             ItemBHeart* itemBHeart = va_arg(args, ItemBHeart*);
-            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(
+                itemBHeart->actor.id, gPlayState->sceneNum, itemBHeart->actor.params);
             if (rc != RC_UNKNOWN_CHECK) {
-                itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+                itemBHeart->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(
+                    rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
                 itemBHeart->actor.draw = (ActorFunc)ItemBHeart_DrawRandomizedItem;
                 itemBHeart->actor.update = (ActorFunc)ItemBHeart_UpdateRandomizedItem;
                 *should = Rando::Context::GetInstance()->GetItemLocation(rc)->HasObtained();
@@ -913,13 +924,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = Flags_GetRandomizerInf(RAND_INF_LEARNED_EPONA_SONG);
             break;
         }
-        case VB_SET_CUCCO_COUNT: {
-            EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
-            // Override starting Cucco count using setting value
-            enNiwLady->cuccosInPen = 7 - RAND_GET_OPTION(RSK_CUCCO_COUNT);
-            *should = false;
-            break;
-        }
         case VB_KING_ZORA_THANK_CHILD: {
             // Allow turning in Ruto's letter even if you have already rescued her
             if (!Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
@@ -964,8 +968,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
-            // This being true will prevent other biggoron trades, there are already safegaurds in place to prevent
-            // claim check from being traded multiple times, so we don't really need the quest to ever be considered "complete"
+            // This being true will prevent other biggoron trades, there are already safeguards in place to prevent
+            // claim check from being traded multiple times, so we don't really need the quest to ever be considered
+            // "complete"
             *should = false;
             break;
         }
@@ -992,12 +997,13 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
                 Actor_Kill(&item00->actor);
                 *should = false;
             } else if (item00->actor.params == ITEM00_SOH_GIVE_ITEM_ENTRY) {
-                Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (item00->itemEntry.modIndex == MOD_NONE) {
                     if (item00->itemEntry.getItemId == GI_SWORD_BGS) {
                         gSaveContext.bgsFlag = true;
                     }
-                    Item_Give(gPlayState, item00->itemEntry.itemId);
+                    Item_Give(gPlayState, static_cast<uint8_t>(item00->itemEntry.itemId));
                 } else if (item00->itemEntry.modIndex == MOD_RANDOMIZER) {
                     if (item00->itemEntry.getItemId == RG_ICE_TRAP) {
                         gSaveContext.ship.pendingIceTrapCount++;
@@ -1015,7 +1021,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
                 } else if (item00->itemEntry.modIndex == MOD_RANDOMIZER) {
                     Notification::Emit({
                         .message = "You found ",
-                        .suffix = Rando::StaticData::RetrieveItem((RandomizerGet)item00->itemEntry.getItemId).GetName().english,
+                        .suffix = Rando::StaticData::RetrieveItem((RandomizerGet)item00->itemEntry.getItemId)
+                                      .GetName()
+                                      .english,
                     });
                 }
 
@@ -1062,26 +1070,53 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = false;
             break;
         }
+        case VB_BOTTLE_BIG_POE: {
+            EnPoField* enPoe = va_arg(args, EnPoField*);
+            enPoe->actor.textId = 0x5090;
+            Flags_SetSwitch(gPlayState, enPoe->actor.params & 0xFF);
+            HIGH_SCORE(HS_POE_POINTS) += 100;
+            if (HIGH_SCORE(HS_POE_POINTS) > 1100) {
+                HIGH_SCORE(HS_POE_POINTS) = 1100;
+            }
+            *should = false;
+            break;
+        }
+        case VB_SELL_POES_TO_POE_COLLECTOR: {
+            if (!Flags_GetRandomizerInf(RAND_INF_10_BIG_POES) && HIGH_SCORE(HS_POE_POINTS) >= 1000) {
+                EnGb* enGb = va_arg(args, EnGb*);
+                enGb->textId = 0x70F8;
+                Message_ContinueTextbox(gPlayState, enGb->textId);
+                enGb->actionFunc = func_80A2FB40;
+                *should = false;
+            }
+            break;
+        }
         case VB_GIVE_ITEM_FROM_POE_COLLECTOR: {
             EnGb* enGb = va_arg(args, EnGb*);
             if (!Flags_GetRandomizerInf(RAND_INF_10_BIG_POES)) {
+                Flags_SetInfTable(INFTABLE_SPOKE_TO_POE_COLLECTOR_IN_RUINED_MARKET);
                 Flags_SetRandomizerInf(RAND_INF_10_BIG_POES);
+                enGb->textId = 0x70F5;
                 enGb->dyna.actor.parent = NULL;
-                enGb->actionFunc = func_80A2FC0C;
+                enGb->actionFunc = func_80A2F83C;
                 *should = false;
             }
             break;
         }
         case VB_CHECK_RANDO_PRICE_OF_CARPET_SALESMAN: {
-            if (EnJs_RandoCanGetCarpetMerchantItem()){
-                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice();
+            if (EnJs_RandoCanGetCarpetMerchantItem()) {
+                *should =
+                    gSaveContext.rupees <
+                    OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice();
             }
             break;
         }
         case VB_GIVE_ITEM_FROM_CARPET_SALESMAN: {
             EnJs* enJs = va_arg(args, EnJs*);
-            if (EnJs_RandoCanGetCarpetMerchantItem()){
-                Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice() * -1);
+            if (EnJs_RandoCanGetCarpetMerchantItem()) {
+                Rupees_ChangeBy(
+                    OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_WASTELAND_BOMBCHU_SALESMAN)->GetPrice() *
+                    -1);
                 enJs->actor.parent = NULL;
                 enJs->actor.textId = TEXT_CARPET_SALESMAN_ARMS_DEALER;
                 enJs->actionFunc = (EnJsActionFunc)func_80A890C0;
@@ -1096,15 +1131,15 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_CHECK_RANDO_PRICE_OF_MEDIGORON: {
-            if (EnGm_RandoCanGetMedigoronItem()){
-                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice();
+            if (EnGm_RandoCanGetMedigoronItem()) {
+                *should = gSaveContext.rupees <
+                          OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice();
             }
             break;
         }
 
-        case VB_GIVE_ITEM_FROM_MEDIGORON: {
-            // fallthrough
-        case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE:
+        case VB_GIVE_ITEM_FROM_MEDIGORON:
+        case VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE: {
             if (EnGm_RandoCanGetMedigoronItem()) {
                 if (id == VB_GIVE_ITEM_FROM_MEDIGORON) {
                     EnGm* enGm = va_arg(args, EnGm*);
@@ -1112,7 +1147,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
                     Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MEDIGORON);
                     enGm->actor.parent = NULL;
                     enGm->actionFunc = (EnGmActionFunc)func_80A3DC44;
-                    Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice() * -1);
+                    Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_GC_MEDIGORON)->GetPrice() *
+                                    -1);
                     *should = false;
                 } else {
                     // Resets "Talked to Medigoron" flag in infTable to restore initial conversation state
@@ -1126,7 +1162,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             EnMs* enMs = va_arg(args, EnMs*);
             if (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
                 RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL) {
-                Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice() * -1);
+                Rupees_ChangeBy(
+                    OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_ZR_MAGIC_BEAN_SALESMAN)->GetPrice() * -1);
                 BEANS_BOUGHT = 10;
                 // Only set inf for buying rando check
                 Flags_SetRandomizerInf(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN);
@@ -1138,10 +1175,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_FROGS_GO_TO_IDLE: {
             EnFr* enFr = va_arg(args, EnFr*);
 
-            if (
-                (enFr->songIndex >= FROG_STORMS && enFr->reward == GI_HEART_PIECE) ||
-                (enFr->songIndex < FROG_STORMS && enFr->reward == GI_RUPEE_PURPLE)
-            ) {
+            if ((enFr->songIndex >= FROG_STORMS && enFr->reward == GI_HEART_PIECE) ||
+                (enFr->songIndex < FROG_STORMS && enFr->reward == GI_RUPEE_PURPLE)) {
                 *should = true;
             }
             break;
@@ -1229,7 +1264,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_BUSINESS_SCRUB_DESPAWN: {
             EnShopnuts* enShopnuts = va_arg(args, EnShopnuts*);
             s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-            ScrubIdentity scrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enShopnuts->actor.params, respawnData);
+            ScrubIdentity scrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(
+                gPlayState->sceneNum, enShopnuts->actor.params, respawnData);
 
             if (scrubIdentity.isShuffled) {
                 *should = Flags_GetRandomizerInf(scrubIdentity.randomizerInf);
@@ -1284,16 +1320,18 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_GRANNY_SAY_INSUFFICIENT_RUPEES: {
-            if (EnDs_RandoCanGetGrannyItem()){
-                *should = gSaveContext.rupees < OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice();
+            if (EnDs_RandoCanGetGrannyItem()) {
+                *should = gSaveContext.rupees <
+                          OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice();
             }
             break;
         }
         case VB_GRANNY_TAKE_MONEY: {
-            if (EnDs_RandoCanGetGrannyItem()){
-                    *should = false;
-                    Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice() * -1);
-                }
+            if (EnDs_RandoCanGetGrannyItem()) {
+                *should = false;
+                Rupees_ChangeBy(OTRGlobals::Instance->gRandoContext->GetItemLocation(RC_KAK_GRANNYS_SHOP)->GetPrice() *
+                                -1);
+            }
             break;
         }
         case VB_NEED_BOTTLE_FOR_GRANNYS_ITEM: {
@@ -1322,20 +1360,26 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_BE_ELIGIBLE_TO_OPEN_DOT: {
-            bool eligible = RAND_GET_OPTION(RSK_DOOR_OF_TIME) != RO_DOOROFTIME_CLOSED || (
-                INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_TIME &&
-                CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) &&
-                CHECK_QUEST_ITEM(QUEST_GORON_RUBY) &&
-                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
-            );
+            bool eligible =
+                RAND_GET_OPTION(RSK_DOOR_OF_TIME) != RO_DOOROFTIME_CLOSED ||
+                (INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_TIME && CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) &&
+                 CHECK_QUEST_ITEM(QUEST_GORON_RUBY) && CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE));
             *should = eligible;
             break;
         }
         case VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY: {
+            EnGe1* enGe1 = va_arg(args, EnGe1*);
             // give both rewards at the same time
+            if (gSaveContext.minigameScore >= 1000) {
+                Flags_SetInfTable(INFTABLE_190);
+            }
             if (gSaveContext.minigameScore >= 1500) {
                 Flags_SetItemGetInf(ITEMGETINF_0F);
             }
+            // move gerudo actor onto her wait loop
+            enGe1->actionFunc = EnGe1_Wait_Archery;
+            EnGe1_SetAnimationIdle(enGe1);
+            // skip the vanilla gives.
             *should = false;
             break;
         }
@@ -1357,7 +1401,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
 
                 // we're giving the 100 GS rando reward! set the rando inf
                 Flags_SetRandomizerInf(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD);
-                
+
                 // also set the actionfunc so this doesn't immediately get
                 // called again (and lead to a vanilla+rando item give
                 // because the flag check will pass next time)
@@ -1384,11 +1428,19 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         }
         case VB_GIVE_ITEM_FROM_BOMBCHU_BOWLING: {
             EnBomBowlPit* enBomBowlPit = va_arg(args, EnBomBowlPit*);
-            if (enBomBowlPit->prizeIndex == EXITEM_BOMB_BAG_BOWLING || enBomBowlPit->prizeIndex == EXITEM_HEART_PIECE_BOWLING) {
+            if (enBomBowlPit->prizeIndex == EXITEM_BOMB_BAG_BOWLING ||
+                enBomBowlPit->prizeIndex == EXITEM_HEART_PIECE_BOWLING) {
                 *should = false;
             }
             break;
         }
+        case VB_GERUDO_GUARD_SET_ACTION_AFTER_TALK:
+            if (gPlayState->msgCtx.choiceIndex == 0) {
+                EnGe2* enGe2 = va_arg(args, EnGe2*);
+                EnGe2_SetupCapturePlayer(enGe2, gPlayState);
+                *should = false;
+            }
+            break;
         case VB_GERUDOS_BE_FRIENDLY: {
             *should = CHECK_QUEST_ITEM(QUEST_GERUDO_CARD);
             break;
@@ -1400,7 +1452,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD: {
-            Flags_SetRandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS);
+            Flags_SetRandomizerInf(RAND_INF_TH_ITEM_FROM_LEADER_OF_FORTRESS);
             *should = false;
             break;
         }
@@ -1420,17 +1472,17 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_DRAW_AMMO_COUNT: {
             s16 item = *va_arg(args, s16*);
             // don't draw ammo count if you have the infinite upgrade
-            if (
-                (item == ITEM_NUT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) ||
+            if ((item == ITEM_NUT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) ||
                 (item == ITEM_STICK && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) ||
                 (item == ITEM_BOMB && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) ||
-                (
-                    (item == ITEM_BOW || item == ITEM_BOW_ARROW_FIRE || item == ITEM_BOW_ARROW_ICE || item == ITEM_BOW_ARROW_LIGHT) &&
-                    Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER) && gPlayState->shootingGalleryStatus < 2 && gSaveContext.minigameState != 1
-                ) ||
-                (item == ITEM_SLINGSHOT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG) && gPlayState->shootingGalleryStatus < 2) ||
-                (item == ITEM_BOMBCHU && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS) && gPlayState->bombchuBowlingStatus < 1)
-            ) {
+                ((item == ITEM_BOW || item == ITEM_BOW_ARROW_FIRE || item == ITEM_BOW_ARROW_ICE ||
+                  item == ITEM_BOW_ARROW_LIGHT) &&
+                 Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER) && gPlayState->shootingGalleryStatus < 2 &&
+                 gSaveContext.minigameState != 1) ||
+                (item == ITEM_SLINGSHOT && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG) &&
+                 gPlayState->shootingGalleryStatus < 2) ||
+                (item == ITEM_BOMBCHU && Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS) &&
+                 gPlayState->bombchuBowlingStatus < 1)) {
                 *should = false;
             }
             break;
@@ -1516,7 +1568,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_SHOULD_SET_FISHING_RECORD: {
             VBFishingData* fishData = va_arg(args, VBFishingData*);
             *should = (s16)fishData->sFishingRecordLength < (s16)fishData->fishWeight;
-            if (!*should){
+            if (!*should) {
                 *fishData->sFishOnHandLength = 0.0f;
             }
             break;
@@ -1527,19 +1579,20 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             break;
         }
         case VB_GIVE_RANDO_FISHING_PRIZE: {
-            if (IS_RANDO){
+            if (IS_RANDO) {
                 VBFishingData* fishData = va_arg(args, VBFishingData*);
                 if (*fishData->sFishOnHandIsLoach) {
                     if (!Flags_GetRandomizerInf(RAND_INF_CAUGHT_LOACH) &&
-                        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH){
+                        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) ==
+                            RO_FISHSANITY_HYRULE_LOACH) {
                         Flags_SetRandomizerInf(RAND_INF_CAUGHT_LOACH);
                         Message_StartTextbox(gPlayState, TEXT_FISHING_RELEASE_THIS_ONE, NULL);
                         *should = true;
                         fishData->actor->stateAndTimer = 20;
                     }
                 } else {
-                    if (ShouldGiveFishingPrize(fishData->fishWeight)){
-                        if (LINK_IS_CHILD){
+                    if (ShouldGiveFishingPrize(fishData->fishWeight)) {
+                        if (LINK_IS_CHILD) {
                             Flags_SetRandomizerInf(RAND_INF_CHILD_FISHING);
                             HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
                         } else {
@@ -1554,7 +1607,18 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             }
             break;
         }
-        case VB_TRADE_TIMER_EYEDROPS:{
+        case VB_GIVE_RANDO_GLITCH_FISHING_PRIZE: {
+            if (IS_RANDO) {
+                Fishing* fishing = va_arg(args, Fishing*);
+                if (!Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING)) {
+                    Flags_SetRandomizerInf(RAND_INF_ADULT_FISHING);
+                }
+                *should = true;
+                fishing->stateAndTimer = 0;
+            }
+            break;
+        }
+        case VB_TRADE_TIMER_EYEDROPS: {
             EnMk* enMk = va_arg(args, EnMk*);
             Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LH_TRADE_FROG);
             enMk->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
@@ -1563,8 +1627,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = false;
             break;
         }
-        // We need to override the vanilla behavior here because the player might sequence break and get Ruto kidnapped before accessing other 
-        // checks that require Ruto. So if she's kidnapped we allow her to spawn again
+        // We need to override the vanilla behavior here because the player might sequence break and get Ruto kidnapped
+        // before accessing other checks that require Ruto. So if she's kidnapped we allow her to spawn again
         case VB_RUTO_BE_CONSIDERED_NOT_KIDNAPPED: {
             *should = !Flags_GetInfTable(INFTABLE_145) || Flags_GetInfTable(INFTABLE_146);
             break;
@@ -1586,7 +1650,8 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             if (*should == true && RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES)) {
                 // Check for dungeon special entrances that are randomized to a new location
                 if (std::find(entrPersistTempFlags.begin(), entrPersistTempFlags.end(), originalEntrance) !=
-                    entrPersistTempFlags.end() && originalEntrance != gPlayState->nextEntranceIndex) {
+                        entrPersistTempFlags.end() &&
+                    originalEntrance != gPlayState->nextEntranceIndex) {
                     // Normally dungeons use a special voidout between scenes so that entering/exiting a boss room,
                     // or leaving via Spirit Hands and going back in persist temp flags across scenes.
                     // For ER, the temp flags should be wiped out so that they aren't transferred to the new location.
@@ -1594,7 +1659,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
                     gPlayState->actorCtx.flags.tempCollect = 0;
 
                     // If the respawnFlag is set for a grotto return, we don't want the void out to happen.
-                    // Set the data flag to one to prevent the respawn point from being overriden by dungeon doors.
+                    // Set the data flag to one to prevent the respawn point from being overridden by dungeon doors.
                     if (gSaveContext.respawnFlag == 2) {
                         gSaveContext.respawn[RESPAWN_MODE_DOWN].data = 1;
                         *should = false;
@@ -1611,7 +1676,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         }
         case VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER: {
             if (*should) {
-                //remove zelda's letter as this is the only use for it
+                // remove zelda's letter as this is the only use for it
                 Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
             }
             break;
@@ -1626,7 +1691,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_GIVE_ITEM_FROM_LAB_DIVE:
         case VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG:
         case VB_GIVE_ITEM_FROM_MAN_ON_ROOF:
-        case VB_GIVE_ITEM_SKULL_TOKEN:
         case VB_GIVE_ITEM_FROM_BLUE_WARP:
         case VB_GIVE_ITEM_FAIRY_OCARINA:
         case VB_GIVE_ITEM_WEIRD_EGG:
@@ -1642,6 +1706,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_GIVE_ITEM_SHADOW_MEDALLION:
             *should = false;
             break;
+        case VB_GIVE_ITEM_SKULL_TOKEN:
+            *should = (Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF));
+            break;
         default:
             break;
     }
@@ -1655,25 +1722,45 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
     //       probably need to do something different when we implement shuffle
     if (sceneNum == SCENE_TREASURE_BOX_SHOP) {
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_1)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_2)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_3)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_4)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         Flags_UnsetRandomizerInf(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5);
-        Rando::Context::GetInstance()->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5)->SetCheckStatus(RCSHOW_UNCHECKED);
+        Rando::Context::GetInstance()
+            ->GetItemLocation(RC_MARKET_TREASURE_CHEST_GAME_KEY_5)
+            ->SetCheckStatus(RCSHOW_UNCHECKED);
         CheckTracker::RecalculateAllAreaTotals();
     }
 
@@ -1694,10 +1781,6 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
 
         // Handle updated link spawn positions
         Entrance_OverrideSpawnScene(sceneNum, gPlayState->curSpawn);
-
-        Entrance_OverrideWeatherState();
-        // Need to reinitialize the environment after replacing the weather mode
-        Play_InitEnvironment(gPlayState, gPlayState->skyboxId);
     }
 
     // LACs & Prelude checks
@@ -1708,17 +1791,16 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
         updateHook = 0;
     }
 
-    // If we're not in the Temple of Time or we've already learned the Prelude of Light and received LACs, we don't need to do anything
-    if (
-        sceneNum != SCENE_TEMPLE_OF_TIME || 
-        (
-            Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
-            Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)
-        )
-    ) return;
+    // If we're not in the Temple of Time or we've already learned the Prelude of Light and received LACs, we don't need
+    // to do anything
+    if (sceneNum != SCENE_TEMPLE_OF_TIME ||
+        (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+         Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)))
+        return;
 
     updateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>([]() {
-        if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && LINK_IS_ADULT && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && gPlayState->roomCtx.curRoom.num == 0) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && LINK_IS_ADULT &&
+            CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && gPlayState->roomCtx.curRoom.num == 0) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
         }
 
@@ -1727,17 +1809,23 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
             Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
         }
 
-        // If both awards have been given, we can unregister the hook, otherwise it will get unregistered when the player leaves the area
-        if (
-            Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
-            Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)
-        ) {
+        // If both awards have been given, we can unregister the hook, otherwise it will get unregistered when the
+        // player leaves the area
+        if (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+            Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS)) {
             GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(updateHook);
             updateHook = 0;
         }
     });
 }
 
+void RandomizerAfterSceneCommandsHandler(int16_t sceneNum) {
+    // ENTRTODO: Move all entrance rando handling to a dedicated file
+    if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES)) {
+        Entrance_OverrideWeatherState();
+    }
+}
+
 void EnSi_DrawRandomizedItem(EnSi* enSi, PlayState* play) {
     GetItemEntry randoItem = enSi->sohGetItemEntry;
     if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
@@ -1764,78 +1852,16 @@ void EnDns_RandomizerPurchase(EnDns* enDns) {
     Flags_SetRandomizerInf(enDns->sohScrubIdentity.randomizerInf);
 }
 
-void ObjComb_RandomizerChooseItemDrop(ObjComb* objComb, PlayState* play) {
-    s16 params = objComb->actor.params & 0x1F;
-
-    if (
-        RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) &&
-        !Flags_GetRandomizerInf(objComb->beehiveIdentity.randomizerInf)
-    ) {
-        EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &objComb->actor.world.pos, ITEM00_SOH_DUMMY);
-        item00->randoInf = objComb->beehiveIdentity.randomizerInf;
-        item00->itemEntry = OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(objComb->beehiveIdentity.randomizerCheck, GI_NONE);
-        item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem;
-        return;
-    }
-
-    if ((params > 0) || (params < 0x1A)) {
-        if (params == 6) {
-            if (Flags_GetCollectible(play, (objComb->actor.params >> 8) & 0x3F)) {
-                params = -1;
-            } else {
-                params = (params | (((objComb->actor.params >> 8) & 0x3F) << 8));
-            }
-        } else if (Rand_ZeroOne() < 0.5f) {
-            params = -1;
-        }
-        if (params >= 0 && !CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
-            Item_DropCollectible(play, &objComb->actor.world.pos, params);
-        }
-    }
-}
-
-void ObjComb_RandomizerWait(ObjComb* objComb, PlayState* play) {
-    s32 dmgFlags;
-
-    objComb->unk_1B0 -= 50;
-    if (
-        RAND_GET_OPTION(RSK_SHUFFLE_BEEHIVES) &&
-        !Flags_GetRandomizerInf(objComb->beehiveIdentity.randomizerInf)
-    ) {
-        if (objComb->unk_1B0 <= -5000) {
-            objComb->unk_1B0 = 1500;
-        }
-    } else if (objComb->unk_1B0 < 0) {
-        objComb->unk_1B0 = 0;
-    }
-
-    if ((objComb->collider.base.acFlags & AC_HIT) != 0) {
-        objComb->collider.base.acFlags &= ~AC_HIT;
-        dmgFlags = objComb->collider.elements[0].info.acHitInfo->toucher.dmgFlags;
-        if (dmgFlags & 0x4001F866) {
-            objComb->unk_1B0 = 1500;
-        } else {
-            ObjComb_Break(objComb, play);
-            ObjComb_RandomizerChooseItemDrop(objComb, play);
-            Actor_Kill(&objComb->actor);
-        }
-    } else {
-        CollisionCheck_SetAC(play, &play->colChkCtx, &objComb->collider.base);
-    }
-
-    if (objComb->actor.update != NULL) {
-        CollisionCheck_SetOC(play, &play->colChkCtx, &objComb->collider.base);
-    }    
-}
-
 void RandomizerOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
     if (actor->id == ACTOR_EN_SI) {
-        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(actor->id, gPlayState->sceneNum, actor->params);
+        RandomizerCheck rc =
+            OTRGlobals::Instance->gRandomizer->GetCheckFromActor(actor->id, gPlayState->sceneNum, actor->params);
         if (rc != RC_UNKNOWN_CHECK) {
             EnSi* enSi = static_cast<EnSi*>(actorRef);
-            enSi->sohGetItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            enSi->sohGetItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(
+                rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
             actor->draw = (ActorFunc)EnSi_DrawRandomizedItem;
         }
     }
@@ -1843,15 +1869,13 @@ void RandomizerOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_EN_DNS) {
         EnDns* enDns = static_cast<EnDns*>(actorRef);
         s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-        enDns->sohScrubIdentity = OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enDns->actor.params, respawnData);
+        enDns->sohScrubIdentity =
+            OTRGlobals::Instance->gRandomizer->IdentifyScrub(gPlayState->sceneNum, enDns->actor.params, respawnData);
 
         if (enDns->sohScrubIdentity.isShuffled) {
             // DNS uses pointers so we're creating our own entry instead of modifying the original
             enDns->sohDnsItemEntry = {
-                enDns->dnsItemEntry->itemPrice,
-                1,
-                enDns->sohScrubIdentity.getItemId,
-                EnDns_RandomizerPurchaseableCheck,
+                enDns->dnsItemEntry->itemPrice, 1, enDns->sohScrubIdentity.getItemId, EnDns_RandomizerPurchaseableCheck,
                 EnDns_RandomizerPurchase,
             };
             enDns->dnsItemEntry = &enDns->sohDnsItemEntry;
@@ -1865,30 +1889,34 @@ void RandomizerOnActorInitHandler(void* actorRef) {
             static uint32_t enDnsUpdateHook = 0;
             static uint32_t enDnsKillHook = 0;
             if (!enDnsUpdateHook) {
-                enDnsUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) {
-                    Actor* innerActor = static_cast<Actor*>(innerActorRef);
-                    if (innerActor->id == ACTOR_EN_DNS) {
-                        EnDns* innerEnDns = static_cast<EnDns*>(innerActorRef);
-                        if (innerEnDns->sohScrubIdentity.isShuffled) {
-                            innerActor->textId = TEXT_SCRUB_RANDOM;
+                enDnsUpdateHook =
+                    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) {
+                        Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                        if (innerActor->id == ACTOR_EN_DNS) {
+                            EnDns* innerEnDns = static_cast<EnDns*>(innerActorRef);
+                            if (innerEnDns->sohScrubIdentity.isShuffled) {
+                                innerActor->textId = TEXT_SCRUB_RANDOM;
+                            }
                         }
-                    }
-                });
-                enDnsKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enDnsUpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enDnsKillHook);
-                    enDnsUpdateHook = 0;
-                    enDnsKillHook = 0;
-                });
+                    });
+                enDnsKillHook =
+                    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enDnsUpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enDnsKillHook);
+                        enDnsUpdateHook = 0;
+                        enDnsKillHook = 0;
+                    });
             }
         }
     }
 
     if (actor->id == ACTOR_ITEM_ETCETERA) {
         ItemEtcetera* itemEtcetera = static_cast<ItemEtcetera*>(actorRef);
-        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(itemEtcetera->actor.id, gPlayState->sceneNum, itemEtcetera->actor.params);
+        RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(
+            itemEtcetera->actor.id, gPlayState->sceneNum, itemEtcetera->actor.params);
         if (rc != RC_UNKNOWN_CHECK) {
-            itemEtcetera->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            itemEtcetera->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(
+                rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
             itemEtcetera->drawFunc = (ActorFunc)ItemEtcetera_DrawRandomizedItem;
         }
 
@@ -1916,16 +1944,9 @@ void RandomizerOnActorInitHandler(void* actorRef) {
         }
     }
 
-    if (actor->id == ACTOR_OBJ_COMB) {
-        ObjComb* objComb = static_cast<ObjComb*>(actorRef);
-        s16 respawnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data & ((1 << 8) - 1);
-        objComb->beehiveIdentity = OTRGlobals::Instance->gRandomizer->IdentifyBeehive(gPlayState->sceneNum, (s16)actor->world.pos.x, respawnData);
-        objComb->actionFunc = (ObjCombActionFunc)ObjComb_RandomizerWait;
-    }
-
     if (actor->id == ACTOR_EN_EX_ITEM) {
         EnExItem* enExItem = static_cast<EnExItem*>(actorRef);
-        
+
         RandomizerCheck rc = RC_UNKNOWN_CHECK;
         switch (enExItem->type) {
             case EXITEM_BOMB_BAG_COUNTER:
@@ -1938,14 +1959,16 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 break;
             case EXITEM_BOMBCHUS_COUNTER:
             case EXITEM_BOMBCHUS_BOWLING:
-                //RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS was removed as a 3DS holdover not in anyones near term plans due to being pretty useless.
+                // RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS was removed as a 3DS holdover not in anyones near term plans due
+                // to being pretty useless.
                 break;
             case EXITEM_BULLET_BAG:
                 rc = RC_LW_TARGET_IN_WOODS;
                 break;
         }
         if (rc != RC_UNKNOWN_CHECK) {
-            enExItem->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
+            enExItem->sohItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(
+                rc, true, (GetItemID)Rando::StaticData::GetLocation(rc)->GetVanillaItem());
             enExItem->actionFunc = (EnExItemActionFunc)EnExItem_WaitForObjectRandomized;
         }
     }
@@ -1956,6 +1979,10 @@ void RandomizerOnActorInitHandler(void* actorRef) {
         if (ge1Type == GE1_TYPE_TRAINING_GROUND_GUARD &&
             Flags_GetRandomizerInf(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)) {
             enGe1->actionFunc = (EnGe1ActionFunc)EnGe1_SetNormalText;
+        } else if (ge1Type == GE1_TYPE_GATE_OPERATOR && enGe1->actor.world.pos.x != -1358.0f) {
+            // When spawning the gate operator, also spawn an extra gate operator on the wasteland side
+            Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_GE1, -1358.0f, 88.0f, -3018.0f, 0, 0x95B0, 0,
+                        0x0300 | GE1_TYPE_GATE_OPERATOR, true);
         }
     }
 
@@ -1968,34 +1995,23 @@ void RandomizerOnActorInitHandler(void* actorRef) {
     if (actor->id == ACTOR_BG_TREEMOUTH && LINK_IS_ADULT &&
         RAND_GET_OPTION(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
         (RAND_GET_OPTION(RSK_FOREST) == RO_CLOSED_FOREST_OFF ||
-            Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD))) {
+         Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD))) {
         BgTreemouth* bgTreemouth = static_cast<BgTreemouth*>(actorRef);
         bgTreemouth->unk_168 = 1.0f;
     }
 
-    //consumable bags
-    if (
-        actor->id == ACTOR_EN_ITEM00 &&
-        (
-            (
-                RAND_GET_OPTION(RSK_SHUFFLE_DEKU_STICK_BAG) &&
-                CUR_UPG_VALUE(UPG_STICKS) == 0 &&
-                actor->params == ITEM00_STICK
-            ) ||
-            (
-                RAND_GET_OPTION(RSK_SHUFFLE_DEKU_NUT_BAG) &&
-                CUR_UPG_VALUE(UPG_NUTS) == 0 &&
-                actor->params == ITEM00_NUTS
-            )
-        )
-    ) {
+    // consumable bags
+    if (actor->id == ACTOR_EN_ITEM00 &&
+        ((RAND_GET_OPTION(RSK_SHUFFLE_DEKU_STICK_BAG) && CUR_UPG_VALUE(UPG_STICKS) == 0 &&
+          actor->params == ITEM00_STICK) ||
+         (RAND_GET_OPTION(RSK_SHUFFLE_DEKU_NUT_BAG) && CUR_UPG_VALUE(UPG_NUTS) == 0 && actor->params == ITEM00_NUTS))) {
         Actor_Kill(actor);
     }
 
     if (RAND_GET_OPTION(RSK_SHUFFLE_BOSS_SOULS)) {
-        //Boss souls require an additional item (represented by a RAND_INF) to spawn a boss in a particular lair
+        // Boss souls require an additional item (represented by a RAND_INF) to spawn a boss in a particular lair
         RandomizerInf currentBossSoulRandInf = RAND_INF_MAX;
-        switch (gPlayState->sceneNum){
+        switch (gPlayState->sceneNum) {
             case SCENE_DEKU_TREE_BOSS:
                 currentBossSoulRandInf = RAND_INF_GOHMA_SOUL;
                 break;
@@ -2030,15 +2046,17 @@ void RandomizerOnActorInitHandler(void* actorRef) {
                 break;
         }
 
-        //Deletes all actors in the boss category if the soul isn't found.
-        //Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses,
-        //so ignore any "boss" if `currentBossSoulRandInf` doesn't change from RAND_INF_MAX.
+        // Deletes all actors in the boss category if the soul isn't found.
+        // Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual
+        // bosses, so ignore any "boss" if `currentBossSoulRandInf` doesn't change from RAND_INF_MAX. Iron Knuckle
+        // (Nabooru) in Twinrova's room is a special exception, so exclude knuckles too.
         if (currentBossSoulRandInf != RAND_INF_MAX) {
-            if (!Flags_GetRandomizerInf(currentBossSoulRandInf) && actor->category == ACTORCAT_BOSS) {
+            if (!Flags_GetRandomizerInf(currentBossSoulRandInf) && actor->category == ACTORCAT_BOSS &&
+                actor->id != ACTOR_EN_IK) {
                 Actor_Delete(&gPlayState->actorCtx, actor, gPlayState);
             }
-            //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",
-            //but still control the boss fight flow.
+            // Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",
+            // but still control the boss fight flow.
             if (!Flags_GetRandomizerInf(RAND_INF_PHANTOM_GANON_SOUL) && actor->id == ACTOR_EN_FHG) {
                 Actor_Delete(&gPlayState->actorCtx, actor, gPlayState);
             }
@@ -2047,26 +2065,23 @@ void RandomizerOnActorInitHandler(void* actorRef) {
 
     // In MQ Spirit, remove the large silver block in the hole as child so the chest in the silver block hallway
     // can be guaranteed accessible
-    if (
-        actor->id == ACTOR_OBJ_OSHIHIKI &&
-        LINK_IS_CHILD &&
-        ResourceMgr_IsGameMasterQuest() &&
+    if (actor->id == ACTOR_OBJ_OSHIHIKI && LINK_IS_CHILD && ResourceMgr_IsGameMasterQuest() &&
         gPlayState->sceneNum == SCENE_SPIRIT_TEMPLE && actor->room == 6 && // Spirit Temple silver block hallway
-        actor->params == 0x9C7 // Silver block that is marked as in the hole
+        actor->params == 0x9C7                                             // Silver block that is marked as in the hole
     ) {
         Actor_Kill(actor);
         return;
     }
 
-    if (
-        // If child is in the adult shooting gallery or adult in the child shooting gallery, then despawn the shooting gallery man
-        actor->id == ACTOR_EN_SYATEKI_MAN &&
-        RAND_GET_OPTION(RSK_SHUFFLE_INTERIOR_ENTRANCES) &&
-        (
-            (LINK_IS_CHILD && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x00)) || //Kakariko Village -> Adult Shooting Gallery, index 003B in the entrance table
-            (LINK_IS_ADULT && Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x01)) //Market -> Child Shooting Gallery,              index 016D in the entrance table
-        )
-    ) {
+    // If child is in the adult shooting gallery or adult in the child shooting gallery, then despawn the shooting
+    // gallery man
+    if (actor->id == ACTOR_EN_SYATEKI_MAN && RAND_GET_OPTION(RSK_SHUFFLE_INTERIOR_ENTRANCES) &&
+        ((LINK_IS_CHILD &&
+          // Kakariko Village -> Adult Shooting Gallery, index 003B in the entrance table
+          Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x00)) ||
+         (LINK_IS_ADULT &&
+          // Market -> Child Shooting Gallery,           index 016D in the entrance table
+          Entrance_SceneAndSpawnAre(SCENE_SHOOTING_GALLERY, 0x01)))) {
         Actor_Kill(actor);
         return;
     }
@@ -2079,27 +2094,27 @@ void RandomizerOnActorInitHandler(void* actorRef) {
 
 void RandomizerOnGameFrameUpdateHandler() {
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER)) {
-        AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+        AMMO(ITEM_BOW) = static_cast<int8_t>(CUR_CAPACITY(UPG_QUIVER));
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG)) {
-        AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+        AMMO(ITEM_BOMB) = static_cast<int8_t>(CUR_CAPACITY(UPG_BOMB_BAG));
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG)) {
-        AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
+        AMMO(ITEM_SLINGSHOT) = static_cast<int8_t>(CUR_CAPACITY(UPG_BULLET_BAG));
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE)) {
-        AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+        AMMO(ITEM_STICK) = static_cast<int8_t>(CUR_CAPACITY(UPG_STICKS));
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE)) {
-        AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+        AMMO(ITEM_NUT) = static_cast<int8_t>(CUR_CAPACITY(UPG_NUTS));
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
-        gSaveContext.magic = gSaveContext.magicCapacity;
+        gSaveContext.magic = static_cast<int8_t>(gSaveContext.magicCapacity);
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMBCHUS)) {
@@ -2107,7 +2122,7 @@ void RandomizerOnGameFrameUpdateHandler() {
     }
 
     if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MONEY)) {
-        gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
+        gSaveContext.rupees = static_cast<s16>(CUR_CAPACITY(UPG_WALLET));
     }
 
     if (!Flags_GetRandomizerInf(RAND_INF_HAS_WALLET)) {
@@ -2130,92 +2145,62 @@ void RandomizerOnActorUpdateHandler(void* refActor) {
                 shutterDoor->unk_16E = 0;
             }
         } else if (actor->id == ACTOR_DOOR_GERUDO) {
-            DoorGerudo* gerudoDoor = (DoorGerudo*)actor;
+            DoorGerudo* gerudoDoor = reinterpret_cast<DoorGerudo*>(actor);
             gerudoDoor->actionFunc = func_8099485C;
             gerudoDoor->dyna.actor.world.pos.y = gerudoDoor->dyna.actor.home.pos.y + 200.0f;
         }
     }
 
     // In ER, override the warp song locations. Also removes the warp song cutscene
-    if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES) && actor->id == ACTOR_DEMO_KANKYO && actor->params == 0x000F) { // Warp Song particles
+    if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES) && actor->id == ACTOR_DEMO_KANKYO &&
+        actor->params == 0x000F) { // Warp Song particles
         Entrance_SetWarpSongEntrance();
     }
-
-    if (actor->id == ACTOR_OBJ_COMB) {
-        ObjComb* combActor = reinterpret_cast<ObjComb*>(actor);
-        combActor->actor.shape.rot.x = Math_SinS(combActor->unk_1B2) * CLAMP_MIN(combActor->unk_1B0, 0) + combActor->actor.home.rot.x;
-    }
 }
 
-//from z_player.c
+// from z_player.c
 typedef struct {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ s16 yaw;
 } SpecialRespawnInfo; // size = 0x10
 
-//special respawns used when voided out without swim to prevent infinite loops
+// special respawns used when voided out without swim to prevent infinite loops
 std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
-    {
-        ENTR_ZORAS_RIVER_3,//hf to zr in water
-        { { -1455.443, -20, 1384.826 }, 28761 }
-    },
-    {
-        ENTR_HYRULE_FIELD_14,//zr to hf in water
-        { { 5730.209, -20, 3725.911 }, -20025 }
-    },
-    {
-        ENTR_LOST_WOODS_UNDERWATER_SHORTCUT,//zr to lw
-        { { 1978.718, -36.908, -855 }, -16384 }
-    },
-    {
-        ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT,//lw to zr
-        { { 4082.366, 860.442, -1018.949 }, -32768 }
-    },
-    {
-        ENTR_LAKE_HYLIA_RIVER_EXIT,//gv to lh
-        { { -3276.416, -1033, 2908.421 }, 11228 }
-    },
-    {
-        ENTR_WATER_TEMPLE_ENTRANCE,//lh to water temple
-        { { -182, 780, 759.5 }, -32768 }
-    },
-    {
-        ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE,//water temple to lh
-        { { -955.028, -1306.9, 6768.954 }, -32768 }
-    },
-    {
-        ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT,//lh to zd
-        { { -109.86, 11.396, -9.933 }, -29131 }
-    },
-    {
-        ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT,//zd to lh
-        { { -912, -1326.967, 3391 }, 0 }
-    },
-    {
-        ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
-        { { -424, -2051, -74 }, 16384 }
-    },
-    {
-        ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN,//mk to hf (can be a problem when it then turns night)
-        { { 0, 0, 1100 }, 0 }
-    },
-    {
-        ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP,//jabu blue warp to zf
-        { { -1580, 150, 1670 }, 8000 }
-    },
+    { ENTR_ZORAS_RIVER_3, // hf to zr in water
+      { { -1455.443f, -20.0f, 1384.826f }, 28761 } },
+    { ENTR_HYRULE_FIELD_14, // zr to hf in water
+      { { 5730.209f, -20.0f, 3725.911f }, -20025 } },
+    { ENTR_LOST_WOODS_UNDERWATER_SHORTCUT, // zr to lw
+      { { 1978.718f, -36.908f, -855.0f }, -16384 } },
+    { ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT, // lw to zr
+      { { 4082.366f, 860.442f, -1018.949f }, -32768 } },
+    { ENTR_LAKE_HYLIA_RIVER_EXIT, // gv to lh
+      { { -3276.416f, -1033.0f, 2908.421f }, 11228 } },
+    { ENTR_WATER_TEMPLE_ENTRANCE, // lh to water temple
+      { { -182.0f, 780.0f, 759.5f }, -32768 } },
+    { ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE, // water temple to lh
+      { { -955.028f, -1306.9f, 6768.954f }, -32768 } },
+    { ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT, // lh to zd
+      { { -109.86f, 11.396f, -9.933f }, -29131 } },
+    { ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT, // zd to lh
+      { { -912.0f, -1326.967f, 3391.0f }, 0 } },
+    { ENTR_GERUDO_VALLEY_1, // caught by gerudos as child
+      { { -424.0f, -2051.0f, -74.0f }, 16384 } },
+    { ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN, // mk to hf (can be a problem when it then turns night)
+      { { 0.0f, 0.0f, 1100.0f }, 0 } },
+    { ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP, // jabu blue warp to zf
+      { { -1580.0f, 150.0f, 1670.0f }, 8000 } },
 };
 
 f32 triforcePieceScale;
 
 void RandomizerOnPlayerUpdateHandler() {
-    if (
-        (GET_PLAYER(gPlayState)->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
-        !Flags_GetRandomizerInf(RAND_INF_CAN_SWIM) &&
-        CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) != EQUIP_VALUE_BOOTS_IRON
-    ) {
-        //if you void out in water temple without swim you get instantly kicked out to prevent softlocks
+    if ((GET_PLAYER(gPlayState)->stateFlags1 & PLAYER_STATE1_IN_WATER) && !Flags_GetRandomizerInf(RAND_INF_CAN_SWIM) &&
+        CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) != EQUIP_VALUE_BOOTS_IRON) {
+        // if you void out in water temple without swim you get instantly kicked out to prevent softlocks
         if (gPlayState->sceneNum == SCENE_WATER_TEMPLE) {
-            GameInteractor::RawAction::TeleportPlayer(Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE));//lake hylia from water temple
+            GameInteractor::RawAction::TeleportPlayer(
+                Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE)); // lake hylia from water temple
         } else {
             if (swimSpecialRespawnInfo.find(gSaveContext.entranceIndex) != swimSpecialRespawnInfo.end()) {
                 SpecialRespawnInfo* respawnInfo = &swimSpecialRespawnInfo.at(gSaveContext.entranceIndex);
@@ -2230,19 +2215,14 @@ void RandomizerOnPlayerUpdateHandler() {
     }
 
     // Triforce Hunt needs the check if the player isn't being teleported to the credits scene.
-    if (
-        !GameInteractor::IsGameplayPaused() &&
-        Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) &&
+    if (!GameInteractor::IsGameplayPaused() && Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) &&
         gPlayState->transitionTrigger != TRANS_TRIGGER_START &&
-        (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0
-    ) {
-        GiveItemEntryWithoutActor(gPlayState, *Rando::StaticData::GetItemTable().at(RG_GANONS_CASTLE_BOSS_KEY).GetGIEntry());
+        (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) {
+        GiveItemEntryWithoutActor(gPlayState,
+                                  *Rando::StaticData::GetItemTable().at(RG_GANONS_CASTLE_BOSS_KEY).GetGIEntry());
     }
 
-    if (
-        !GameInteractor::IsGameplayPaused() &&
-        RAND_GET_OPTION(RSK_TRIFORCE_HUNT)
-    ) {
+    if (!GameInteractor::IsGameplayPaused() && RAND_GET_OPTION(RSK_TRIFORCE_HUNT)) {
         // Warp to credits
         if (GameInteractor::State::TriforceHuntCreditsWarpActive) {
             gPlayState->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
@@ -2269,12 +2249,14 @@ void RandomizerOnSceneSpawnActorsHandler() {
         switch (gPlayState->sceneNum) {
             case SCENE_TEMPLE_OF_TIME:
                 if (gPlayState->roomCtx.curRoom.num == 1) {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, -104, -40, 2382, 0, 0x8000, 0, SHEIK_TYPE_RANDO, false);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, -104, -40, 2382, 0,
+                                static_cast<int16_t>(0x8000), 0, SHEIK_TYPE_RANDO, false);
                 }
                 break;
             case SCENE_INSIDE_GANONS_CASTLE:
                 if (gPlayState->roomCtx.curRoom.num == 1) {
-                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, 101, 150, 137, 0, 0, 0, SHEIK_TYPE_RANDO, false);
+                    Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_XC, 101, 150, 137, 0, 0, 0,
+                                SHEIK_TYPE_RANDO, false);
                 }
                 break;
             default:
@@ -2330,6 +2312,7 @@ void RandomizerRegisterHooks() {
     static uint32_t onDialogMessageHook = 0;
     static uint32_t onVanillaBehaviorHook = 0;
     static uint32_t onSceneInitHook = 0;
+    static uint32_t afterSceneCommandsHook = 0;
     static uint32_t onActorInitHook = 0;
     static uint32_t onActorUpdateHook = 0;
     static uint32_t onPlayerUpdateHook = 0;
@@ -2346,11 +2329,6 @@ void RandomizerRegisterHooks() {
     static uint32_t fishsanityOnVanillaBehaviorHook = 0;
     static uint32_t fishsanityOnItemReceiveHook = 0;
 
-    static uint32_t shufflePotsOnActorInitHook = 0;
-    static uint32_t shufflePotsOnVanillaBehaviorHook = 0;
-
-    static uint32_t shuffleFreestandingOnVanillaBehaviorHook = 0;
-
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
         ShipInit::Init("IS_RANDO");
 
@@ -2366,6 +2344,7 @@ void RandomizerRegisterHooks() {
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnItemReceive>(onDialogMessageHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::AfterSceneCommands>(afterSceneCommandsHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(onActorUpdateHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateHook);
@@ -2379,14 +2358,10 @@ void RandomizerRegisterHooks() {
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(fishsanityOnActorInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(fishsanityOnActorUpdateHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(fishsanityOnSceneInitHook);
-        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(fishsanityOnVanillaBehaviorHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(
+            fishsanityOnVanillaBehaviorHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnItemReceive>(fishsanityOnItemReceiveHook);
 
-        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(shufflePotsOnActorInitHook);
-        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(shufflePotsOnVanillaBehaviorHook);
-
-        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(shuffleFreestandingOnVanillaBehaviorHook);
-
         onFlagSetHook = 0;
         onSceneFlagSetHook = 0;
         onPlayerUpdateForRCQueueHook = 0;
@@ -2395,6 +2370,7 @@ void RandomizerRegisterHooks() {
         onDialogMessageHook = 0;
         onVanillaBehaviorHook = 0;
         onSceneInitHook = 0;
+        afterSceneCommandsHook = 0;
         onActorInitHook = 0;
         onActorUpdateHook = 0;
         onPlayerUpdateHook = 0;
@@ -2411,14 +2387,8 @@ void RandomizerRegisterHooks() {
         fishsanityOnVanillaBehaviorHook = 0;
         fishsanityOnItemReceiveHook = 0;
 
-        shufflePotsOnActorInitHook = 0;
-        shufflePotsOnVanillaBehaviorHook = 0;
-
-        shuffleFreestandingOnVanillaBehaviorHook = 0;
-
-        ShuffleFairies_UnregisterHooks();
-
-        if (!IS_RANDO) return;
+        if (!IS_RANDO)
+            return;
 
         // ENTRTODO: Move all entrance rando handling to a dedicated file
         // Setup the modified entrance table and entrance shuffle table for rando
@@ -2429,45 +2399,57 @@ void RandomizerRegisterHooks() {
             Entrance_SetSavewarpEntrance();
         }
 
-        onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(RandomizerOnFlagSetHandler);
-        onSceneFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(RandomizerOnSceneFlagSetHandler);
-        onPlayerUpdateForRCQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateForRCQueueHandler);
-        onPlayerUpdateForItemQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateForItemQueueHandler);
-        onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(RandomizerOnItemReceiveHandler);
-        onDialogMessageHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnDialogMessage>(RandomizerOnDialogMessageHandler);
-        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(RandomizerOnVanillaBehaviorHandler);
-        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
-        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
-        onActorUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(RandomizerOnActorUpdateHandler);
-        onPlayerUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateHandler);
-        onGameFrameUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(RandomizerOnGameFrameUpdateHandler);
-        onSceneSpawnActorsHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>(RandomizerOnSceneSpawnActorsHandler);
-        onPlayDestroyHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDestroy>(RandomizerOnPlayDestroyHandler);
-        onExitGameHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>(RandomizerOnExitGameHandler);
-        onKaleidoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>(RandomizerOnKaleidoscopeUpdateHandler);
-        onCuccoOrChickenHatchHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnCuccoOrChickenHatch>(RandomizerOnCuccoOrChickenHatch);
+        onFlagSetHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(RandomizerOnFlagSetHandler);
+        onSceneFlagSetHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(RandomizerOnSceneFlagSetHandler);
+        onPlayerUpdateForRCQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(
+            RandomizerOnPlayerUpdateForRCQueueHandler);
+        onPlayerUpdateForItemQueueHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(
+            RandomizerOnPlayerUpdateForItemQueueHandler);
+        onItemReceiveHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(RandomizerOnItemReceiveHandler);
+        onDialogMessageHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnDialogMessage>(
+            RandomizerOnDialogMessageHandler);
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(
+            RandomizerOnVanillaBehaviorHandler);
+        onSceneInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
+        afterSceneCommandsHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::AfterSceneCommands>(
+            RandomizerAfterSceneCommandsHandler);
+        onActorInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
+        onActorUpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(RandomizerOnActorUpdateHandler);
+        onPlayerUpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(RandomizerOnPlayerUpdateHandler);
+        onGameFrameUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(
+            RandomizerOnGameFrameUpdateHandler);
+        onSceneSpawnActorsHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>(
+            RandomizerOnSceneSpawnActorsHandler);
+        onPlayDestroyHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayDestroy>(RandomizerOnPlayDestroyHandler);
+        onExitGameHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>(RandomizerOnExitGameHandler);
+        onKaleidoUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>(
+            RandomizerOnKaleidoscopeUpdateHandler);
+        onCuccoOrChickenHatchHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnCuccoOrChickenHatch>(
+            RandomizerOnCuccoOrChickenHatch);
 
         if (RAND_GET_OPTION(RSK_FISHSANITY) != RO_FISHSANITY_OFF) {
             OTRGlobals::Instance->gRandoContext->GetFishsanity()->InitializeFromSave();
 
-            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(Rando::Fishsanity::OnActorInitHandler);
-            fishsanityOnActorUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(Rando::Fishsanity::OnActorUpdateHandler);
-            fishsanityOnSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(Rando::Fishsanity::OnSceneInitHandler);
-            fishsanityOnVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(Rando::Fishsanity::OnVanillaBehaviorHandler);
-            fishsanityOnItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(Rando::Fishsanity::OnItemReceiveHandler);
-        }
-
-        if (RAND_GET_OPTION(RSK_SHUFFLE_POTS) != RO_SHUFFLE_POTS_OFF) {
-            shufflePotsOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(ObjTsubo_RandomizerInit);
-            shufflePotsOnVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(ShufflePots_OnVanillaBehaviorHandler);
-        }
-
-        if (RAND_GET_OPTION(RSK_SHUFFLE_FREESTANDING) != RO_SHUFFLE_FREESTANDING_OFF) {
-            shuffleFreestandingOnVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(ShuffleFreestanding_OnVanillaBehaviorHandler);
-        }
-        
-        if (RAND_GET_OPTION(RSK_SHUFFLE_FAIRIES)) {
-            ShuffleFairies_RegisterHooks();
+            fishsanityOnActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(
+                Rando::Fishsanity::OnActorInitHandler);
+            fishsanityOnActorUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(
+                Rando::Fishsanity::OnActorUpdateHandler);
+            fishsanityOnSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(
+                Rando::Fishsanity::OnSceneInitHandler);
+            fishsanityOnVanillaBehaviorHook =
+                GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(
+                    Rando::Fishsanity::OnVanillaBehaviorHandler);
+            fishsanityOnItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(
+                Rando::Fishsanity::OnItemReceiveHandler);
         }
     });
 }
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 6f03092239..3b75a0c954 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -11,42 +11,55 @@
 #include "../../OTRGlobals.h"
 
 namespace Rando {
-Item::Item() : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE),
-               progressive(false), price(0) {}
+Item::Item()
+    : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE),
+      progressive(false), price(0) {
+}
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-    const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
-    const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
-    const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
-    const bool progressive_, const uint16_t price_)
+           const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
+           const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
+           const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_,
+           const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-    advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
     if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{ itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, static_cast<uint16_t>(randomizerGet_), MOD_RANDOMIZER, NULL });
-    }
-    else {
-        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{ itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_, NULL });
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{
+            itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_,
+            objectId_, modIndex_, TABLE_RANDOMIZER, static_cast<int16_t>(randomizerGet_), gid_, true, ITEM_FROM_NPC,
+            category_, static_cast<uint16_t>(randomizerGet_), MOD_RANDOMIZER, NULL });
+    } else {
+        giEntry = std::make_shared<GetItemEntry>(GetItemEntry{
+            itemId_, field_, static_cast<int16_t>((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_,
+            objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, itemId_, modIndex_,
+            NULL });
     }
 }
 
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-    const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const bool progressive_,
-    const uint16_t price_)
+           const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const bool progressive_,
+           const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-    advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
 }
 
-    Item::~Item() = default;
+Item::~Item() = default;
 
 void Item::ApplyEffect() const {
     auto ctx = Rando::Context::GetInstance();
-    ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
-    ctx->GetLogic()->SetInLogic(logicVal, true);
+    auto logic = ctx->GetLogic();
+    if (!logic->CalculatingAvailableChecks) {
+        logic->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), true);
+    }
+    logic->SetInLogic(logicVal, true);
 }
 
 void Item::UndoEffect() const {
     auto ctx = Rando::Context::GetInstance();
-    ctx->GetLogic()->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
-    ctx->GetLogic()->SetInLogic(logicVal, false);
+    auto logic = ctx->GetLogic();
+    if (!logic->CalculatingAvailableChecks) {
+        logic->ApplyItemEffect(StaticData::RetrieveItem(randomizerGet), false);
+    }
+    logic->SetInLogic(logicVal, false);
 }
 
 const Text& Item::GetName() const {
@@ -94,6 +107,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                         actual = RG_DEKU_STICK_BAG;
                         break;
                     }
+                    [[fallthrough]];
                 case 1:
                     if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
                         actual = RG_STICK_UPGRADE_INF;
@@ -123,6 +137,7 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                         actual = RG_DEKU_NUT_BAG;
                         break;
                     }
+                    [[fallthrough]];
                 case 1:
                     if (infiniteUpgrades == RO_INF_UPGRADES_CONDENSED_PROGRESSIVE) {
                         actual = RG_NUT_UPGRADE_INF;
@@ -281,11 +296,11 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
                     actual = RG_GIANT_WALLET;
                     break;
                 case 2:
-                    if(tycoonWallet){
+                    if (tycoonWallet) {
                         actual = RG_TYCOON_WALLET;
                         break;
                     }
-                    //fallthrough
+                    // fallthrough
                 case 3:
                 case 4:
                     if (infiniteUpgrades != RO_INF_UPGRADES_OFF) {
@@ -336,8 +351,8 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
             }
             break;
         case RG_PROGRESSIVE_GORONSWORD: // todo progressive?
-           actual = RG_BIGGORON_SWORD;
-           break;
+            actual = RG_BIGGORON_SWORD;
+            break;
         case RG_PROGRESSIVE_BOMBCHUS:
             if (logic->CurrentInventory(ITEM_BOMBCHU) == ITEM_NONE) {
                 actual = RG_BOMBCHU_BAG;
@@ -391,7 +406,8 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if (type == ITEMTYPE_DUNGEONREWARD && ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
+    if (type == ITEMTYPE_DUNGEONREWARD &&
+        ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_END_OF_DUNGEON)) {
         return false;
     }
 
@@ -405,7 +421,8 @@ bool Item::IsMajorItem() const {
         return false;
     }
 
-    if (type == ITEMTYPE_SMALLKEY && (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) || ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
+    if (type == ITEMTYPE_SMALLKEY && (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) ||
+                                      ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
         return false;
     }
 
@@ -414,11 +431,13 @@ bool Item::IsMajorItem() const {
     }
 
     if (type == ITEMTYPE_BOSSKEY && getItemId != 0xAD &&
-        (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) || ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
+        (ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_VANILLA) ||
+         ctx->GetOption(RSK_BOSS_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))) {
         return false;
     }
     // Ganons Castle Boss Key
-    if (getItemId == 0xAD && (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA) || ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON))) {
+    if (getItemId == 0xAD && (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_VANILLA) ||
+                              ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_OWN_DUNGEON))) {
         return false;
     }
 
@@ -444,4 +463,4 @@ bool Item::operator==(const Item& right) const {
 bool Item::operator!=(const Item& right) const {
     return !operator==(right);
 }
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index f0df0f1bf0..da86321518 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -31,17 +31,16 @@ class Item {
   public:
     Item();
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-        LogicVal logicVal_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
-        uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
-        bool progressive_ = false, uint16_t price_ = 0);
+         LogicVal logicVal_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_,
+         uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_,
+         bool progressive_ = false, uint16_t price_ = 0);
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-        LogicVal logicVal_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
+         LogicVal logicVal_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
     ~Item();
 
     void ApplyEffect() const;
     void UndoEffect() const;
 
-    
     const Text& GetName() const;
     bool IsAdvancement() const;
     int GetItemID() const;
@@ -75,4 +74,4 @@ class Item {
     bool playthrough = false;
     std::shared_ptr<GetItemEntry> giEntry;
 };
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 0b94aab39d..786717c809 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -12,18 +12,20 @@ std::unordered_map<std::string, RandomizerGet> Rando::StaticData::itemNameToEnum
 
 void Rando::StaticData::InitItemTable() {
     auto logic = Context::GetInstance()->GetLogic();
+
+    // clang-format off
     itemTable[RG_NONE] =                                Item(RG_NONE,                             Text{ "No Item", "Rien", "Kein Artikel" },                                                                                           ITEMTYPE_EVENT,             GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_NONE,                            0,                       0,                   0,                           0,    0,                ITEM_CATEGORY_JUNK,   MOD_NONE);
     //        Randomizer Get                                 Randomizer Get                       Name Text                                                                                                                            Type                        Get Item ID           Adv.   Logic Value                         Hint Text Key                          Item ID                               Object ID                Draw ID              Text ID                      field Chest Animation   Item Category         Mod Index
     itemTable[RG_KOKIRI_SWORD] =                        Item(RG_KOKIRI_SWORD,                     Text{ "Kokiri Sword", "Épée Kokiri", "Kokiri-Schwert" },                                                                             ITEMTYPE_EQUIP,             GI_SWORD_KOKIRI,      true,  LOGIC_KOKIRI_SWORD,                 RHT_KOKIRI_SWORD,                      ITEM_SWORD_KOKIRI,                    OBJECT_GI_SWORD_1,       GID_SWORD_KOKIRI,    0xA4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Master-Schwert"},                                                                          ITEMTYPE_EQUIP,             0xE0,                 true,  LOGIC_MASTER_SWORD,                 RHT_MASTER_SWORD,                      ITEM_SWORD_MASTER,                    OBJECT_TOKI_OBJECTS,     GID_SWORD_BGS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MASTER_SWORD] =                        Item(RG_MASTER_SWORD,                     Text{ "Master Sword", "Épée de Legende", "Master-Schwert" },                                                                         ITEMTYPE_EQUIP,             0xE0,                 true,  LOGIC_MASTER_SWORD,                 RHT_MASTER_SWORD,                      ITEM_SWORD_MASTER,                    OBJECT_TOKI_OBJECTS,     GID_SWORD_BGS,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
     itemTable[RG_GIANTS_KNIFE] =                        Item(RG_GIANTS_KNIFE,                     Text{ "Giant's Knife", "Lame des Géants", "Langschwert" },                                                                           ITEMTYPE_EQUIP,             GI_SWORD_KNIFE,       true,  LOGIC_NONE,                         RHT_GIANTS_KNIFE,                      ITEM_SWORD_BGS,                       OBJECT_GI_LONGSWORD,     GID_SWORD_BGS,       0x4B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BIGGORON_SWORD] =                      Item(RG_BIGGORON_SWORD,                   Text{ "Biggoron's Sword", "Épée de Biggoron", "Biggoron-Schwert" },                                                                  ITEMTYPE_EQUIP,             GI_SWORD_BGS,         true,  LOGIC_BIGGORON_SWORD,               RHT_BIGGORON_SWORD,                    ITEM_SWORD_BGS,                       OBJECT_GI_LONGSWORD,     GID_SWORD_BGS,       0x0C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_DEKU_SHIELD] =                         Item(RG_DEKU_SHIELD,                      Text{ "Deku Shield", "Bouclier Mojo", "Deku-Schild" },                                                                               ITEMTYPE_EQUIP,             GI_SHIELD_DEKU,       false, LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,                     OBJECT_GI_SHIELD_1,      GID_SHIELD_DEKU,     0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_HYLIAN_SHIELD] =                       Item(RG_HYLIAN_SHIELD,                    Text{ "Hylian Shield", "Bouclier Hylien", "Hylia-Schild" },                                                                          ITEMTYPE_EQUIP,             GI_SHIELD_HYLIAN,     false, LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,                   OBJECT_GI_SHIELD_2,      GID_SHIELD_HYLIAN,   0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegelschild" },                                                                         ITEMTYPE_EQUIP,             GI_SHIELD_MIRROR,     true,  LOGIC_MIRROR_SHIELD,                RHT_MIRROR_SHIELD,                     ITEM_SHIELD_MIRROR,                   OBJECT_GI_SHIELD_3,      GID_SHIELD_MIRROR,   0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Tunika" },                                                                            ITEMTYPE_EQUIP,             GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,       GID_TUNIC_GORON,     0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Tunika" },                                                                                 ITEMTYPE_EQUIP,             GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,       GID_TUNIC_ZORA,      0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_MIRROR_SHIELD] =                       Item(RG_MIRROR_SHIELD,                    Text{ "Mirror Shield", "Bouclier Miroir", "Spiegel-Schild" },                                                                        ITEMTYPE_EQUIP,             GI_SHIELD_MIRROR,     true,  LOGIC_MIRROR_SHIELD,                RHT_MIRROR_SHIELD,                     ITEM_SHIELD_MIRROR,                   OBJECT_GI_SHIELD_3,      GID_SHIELD_MIRROR,   0x4E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GORON_TUNIC] =                         Item(RG_GORON_TUNIC,                      Text{ "Goron Tunic", "Tunique Goron", "Goronen-Rüstung" },                                                                           ITEMTYPE_EQUIP,             GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,       GID_TUNIC_GORON,     0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_ZORA_TUNIC] =                          Item(RG_ZORA_TUNIC,                       Text{ "Zora Tunic", "Tunique Zora", "Zora-Rüstung" },                                                                                ITEMTYPE_EQUIP,             GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,       GID_TUNIC_ZORA,      0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_IRON_BOOTS] =                          Item(RG_IRON_BOOTS,                       Text{ "Iron Boots", "Bottes de plomb", "Eisenstiefel" },                                                                             ITEMTYPE_EQUIP,             GI_BOOTS_IRON,        true,  LOGIC_IRON_BOOTS,                   RHT_IRON_BOOTS,                        ITEM_BOOTS_IRON,                      OBJECT_GI_BOOTS_2,       GID_BOOTS_IRON,      0x53,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_HOVER_BOOTS] =                         Item(RG_HOVER_BOOTS,                      Text{ "Hover Boots", "Bottes de airs", "Gleitstiefel" },                                                                             ITEMTYPE_EQUIP,             GI_BOOTS_HOVER,       true,  LOGIC_HOVER_BOOTS,                  RHT_HOVER_BOOTS,                       ITEM_BOOTS_HOVER,                     OBJECT_GI_HOVERBOOTS,    GID_BOOTS_HOVER,     0x54,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BOOMERANG] =                           Item(RG_BOOMERANG,                        Text{ "Boomerang", "Boomerang", "Bumerang" },                                                                                        ITEMTYPE_ITEM,              GI_BOOMERANG,         true,  LOGIC_BOOMERANG,                    RHT_BOOMERANG,                         ITEM_BOOMERANG,                       OBJECT_GI_BOOMERANG,     GID_BOOMERANG,       0x35,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
@@ -33,9 +35,9 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_DINS_FIRE] =                           Item(RG_DINS_FIRE,                        Text{ "Din's Fire", "Feu de Din", "Dins Feuerinferno" },                                                                             ITEMTYPE_ITEM,              GI_DINS_FIRE,         true,  LOGIC_DINS_FIRE,                    RHT_DINS_FIRE,                         ITEM_DINS_FIRE,                       OBJECT_GI_GODDESS,       GID_DINS_FIRE,       0xAD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_FARORES_WIND] =                        Item(RG_FARORES_WIND,                     Text{ "Farore's Wind", "Vent de Farore", "Farores Donnersturm" },                                                                    ITEMTYPE_ITEM,              GI_FARORES_WIND,      true,  LOGIC_FARORES_WIND,                 RHT_FARORES_WIND,                      ITEM_FARORES_WIND,                    OBJECT_GI_GODDESS,       GID_FARORES_WIND,    0xAE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_NAYRUS_LOVE] =                         Item(RG_NAYRUS_LOVE,                      Text{ "Nayru's Love", "Amour de Nayru", "Nayrus Umarmung" },                                                                         ITEMTYPE_ITEM,              GI_NAYRUS_LOVE,       true,  LOGIC_NAYRUS_LOVE,                  RHT_NAYRUS_LOVE,                       ITEM_NAYRUS_LOVE,                     OBJECT_GI_GODDESS,       GID_NAYRUS_LOVE,     0xAF,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuerpfeil" },                                                                                 ITEMTYPE_ITEM,              GI_ARROW_FIRE,        true,  LOGIC_FIRE_ARROWS,                  RHT_FIRE_ARROWS,                       ITEM_ARROW_FIRE,                      OBJECT_GI_M_ARROW,       GID_ARROW_FIRE,      0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eispfeil" },                                                                                  ITEMTYPE_ITEM,              GI_ARROW_ICE,         true,  LOGIC_ICE_ARROWS,                   RHT_ICE_ARROWS,                        ITEM_ARROW_ICE,                       OBJECT_GI_M_ARROW,       GID_ARROW_ICE,       0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Lichtpfeil" },                                                                            ITEMTYPE_ITEM,              GI_ARROW_LIGHT,       true,  LOGIC_LIGHT_ARROWS,                 RHT_LIGHT_ARROWS,                      ITEM_ARROW_LIGHT,                     OBJECT_GI_M_ARROW,       GID_ARROW_LIGHT,     0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrow", "Flèche de Feu", "Feuer-Pfeile" },                                                                               ITEMTYPE_ITEM,              GI_ARROW_FIRE,        true,  LOGIC_FIRE_ARROWS,                  RHT_FIRE_ARROWS,                       ITEM_ARROW_FIRE,                      OBJECT_GI_M_ARROW,       GID_ARROW_FIRE,      0x70,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrow", "Flèche de Glace", "Eis-Pfeile" },                                                                                ITEMTYPE_ITEM,              GI_ARROW_ICE,         true,  LOGIC_ICE_ARROWS,                   RHT_ICE_ARROWS,                        ITEM_ARROW_ICE,                       OBJECT_GI_M_ARROW,       GID_ARROW_ICE,       0x71,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrow", "Flèche de Lumière", "Licht-Pfeile" },                                                                          ITEMTYPE_ITEM,              GI_ARROW_LIGHT,       true,  LOGIC_LIGHT_ARROWS,                 RHT_LIGHT_ARROWS,                      ITEM_ARROW_LIGHT,                     OBJECT_GI_M_ARROW,       GID_ARROW_LIGHT,     0x72,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_GERUDO_MEMBERSHIP_CARD] =              Item(RG_GERUDO_MEMBERSHIP_CARD,           Text{ "Gerudo Membership Card", "Carte Gerudo", "Gerudo-Pass" },                                                                     ITEMTYPE_ITEM,              GI_GERUDO_CARD,       true,  LOGIC_GERUDO_CARD,                  RHT_GERUDO_MEMBERSHIP_CARD,            ITEM_GERUDO_CARD,                     OBJECT_GI_GERUDO,        GID_GERUDO_CARD,     0x7B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_MAGIC_BEAN] =                          Item(RG_MAGIC_BEAN,                       Text{ "Magic Bean", "Haricots Magiques", "Wundererbse" },                                                                            ITEMTYPE_ITEM,              GI_BEAN,              true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN,                        ITEM_BEAN,                            OBJECT_GI_BEAN,          GID_BEAN,            0x48,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_MAGIC_BEAN_PACK] =                     Item(RG_MAGIC_BEAN_PACK,                  Text{ "Magic Bean Pack", "Paquet de Haricots Magiques", "Wundererbsen-Packung" },                                                    ITEMTYPE_ITEM,              RG_MAGIC_BEAN_PACK,   true,  LOGIC_MAGIC_BEAN,                   RHT_MAGIC_BEAN_PACK,                   RG_MAGIC_BEAN_PACK,                   OBJECT_GI_BEAN,          GID_BEAN,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
@@ -49,40 +51,40 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_ODD_MUSHROOM] =                        Item(RG_ODD_MUSHROOM,                     Text{ "Odd Mushroom", "Champigon Suspect", "Schimmelpilz" },                                                                         ITEMTYPE_ITEM,              GI_ODD_MUSHROOM,      true,  LOGIC_ODD_MUSHROOM,                 RHT_ODD_MUSHROOM,                      ITEM_ODD_MUSHROOM,                    OBJECT_GI_MUSHROOM,      GID_ODD_MUSHROOM,    0x03,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_ODD_POTION] =                          Item(RG_ODD_POTION,                       Text{ "Odd Potion", "Mixture Suspecte", "Modertrank" },                                                                              ITEMTYPE_ITEM,              GI_ODD_POTION,        true,  LOGIC_ODD_POULTICE,                 RHT_ODD_POTION,                        ITEM_ODD_POTION,                      OBJECT_GI_POWDER,        GID_ODD_POTION,      0x04,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_POACHERS_SAW] =                        Item(RG_POACHERS_SAW,                     Text{ "Poacher's Saw", "Scie du Chasseur", "Säge" },                                                                                 ITEMTYPE_ITEM,              GI_SAW,               true,  LOGIC_POACHERS_SAW,                 RHT_POACHERS_SAW,                      ITEM_SAW,                             OBJECT_GI_SAW,           GID_SAW,             0x05,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "Zerbrochenes Goronen-Schwert" },                                              ITEMTYPE_ITEM,              GI_SWORD_BROKEN,      true,  LOGIC_BROKEN_SWORD,                 RHT_BROKEN_SWORD,                      ITEM_SWORD_BROKEN,                    OBJECT_GI_BROKENSWORD,   GID_SWORD_BROKEN,    0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BROKEN_SWORD] =                        Item(RG_BROKEN_SWORD,                     Text{ "Broken Goron's Sword", "Épée Brisée de Goron", "zerbr. Goronen-Schwert" },                                                    ITEMTYPE_ITEM,              GI_SWORD_BROKEN,      true,  LOGIC_BROKEN_SWORD,                 RHT_BROKEN_SWORD,                      ITEM_SWORD_BROKEN,                    OBJECT_GI_BROKENSWORD,   GID_SWORD_BROKEN,    0x08,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_PRESCRIPTION] =                        Item(RG_PRESCRIPTION,                     Text{ "Prescription", "Ordonnance", "Rezept" },                                                                                      ITEMTYPE_ITEM,              GI_PRESCRIPTION,      true,  LOGIC_PRESCRIPTION,                 RHT_PRESCRIPTION,                      ITEM_PRESCRIPTION,                    OBJECT_GI_PRESCRIPTION,  GID_PRESCRIPTION,    0x09,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_EYEBALL_FROG] =                        Item(RG_EYEBALL_FROG,                     Text{ "Eyeball Frog", "Crapaud-qui-louche", "Glotzfrosch" },                                                                         ITEMTYPE_ITEM,              GI_FROG,              true,  LOGIC_EYEBALL_FROG,                 RHT_EYEBALL_FROG,                      ITEM_FROG,                            OBJECT_GI_FROG,          GID_FROG,            0x0D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_EYEDROPS] =                            Item(RG_EYEDROPS,                         Text{ "World's Finest Eyedrops", "Super Gouttes", "Augentropfen" },                                                                  ITEMTYPE_ITEM,              GI_EYEDROPS,          true,  LOGIC_EYEDROPS,                     RHT_EYEDROPS,                          ITEM_EYEDROPS,                        OBJECT_GI_EYE_LOTION,    GID_EYEDROPS,        0x0E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_CLAIM_CHECK] =                         Item(RG_CLAIM_CHECK,                      Text{ "Claim Check", "Certificat", "Zertifikat" },                                                                                   ITEMTYPE_ITEM,              GI_CLAIM_CHECK,       true,  LOGIC_CLAIM_CHECK,                  RHT_CLAIM_CHECK,                       ITEM_CLAIM_CHECK,                     OBJECT_GI_TICKETSTONE,   GID_CLAIM_CHECK,     0x0A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Skulltula Token
-    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Goldenes Skulltula-Symbol" },                                            ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,       true,  LOGIC_GOLD_SKULLTULA_TOKENS,        RHT_GOLD_SKULLTULA_TOKEN,              ITEM_SKULL_TOKEN,                     OBJECT_GI_SUTARU,        GID_SKULL_TOKEN,     0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
+    itemTable[RG_GOLD_SKULLTULA_TOKEN] =                Item(RG_GOLD_SKULLTULA_TOKEN,             Text{ "Gold Skulltula Token", "Symbole de Skulltula d'Or", "Skulltula-Symbol" },                                                     ITEMTYPE_TOKEN,             GI_SKULL_TOKEN,       true,  LOGIC_GOLD_SKULLTULA_TOKENS,        RHT_GOLD_SKULLTULA_TOKEN,              ITEM_SKULL_TOKEN,                     OBJECT_GI_SUTARU,        GID_SKULL_TOKEN,     0xB4,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SKULLTULA_TOKEN, MOD_NONE);
     // Progressive Items
-    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                                         ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, true);
-    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Progressives Kraft-Upgrade" },                                           ITEMTYPE_ITEM,              0x81,                 true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_PROGRESSIVE_STRENGTH, true);
-    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Progressive Bombentasche" },                                                 ITEMTYPE_ITEM,              0x82,                 true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_PROGRESSIVE_BOMB_BAG, true);
-    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                                      ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, true);
-    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                                               ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, true);
-    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Geldbörse" },                                                             ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, true);
-    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Schuppe" },                                                               ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, true);
-    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Progressive Nuß-Kapazität" },                                         ITEMTYPE_ITEM,              0x87,                 true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Progressive Stab-Kapazität" },                                    ITEMTYPE_ITEM,              0x88,                 true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_PROGRESSIVE_STICK_UPGRADE, true);
-    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Progressive Krabbelminen" },                                                       ITEMTYPE_ITEM,              0x89,                 true,  LOGIC_BOMBCHUS,                     RHT_PROGRESSIVE_BOMBCHUS, true);
-    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Progressives Magisches Maß" },                                           ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_PROGRESSIVE_MAGIC_METER, true);
-    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                                             ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, true);
-    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Progressives Goronen-Schwert" },                                             ITEMTYPE_ITEM,              0xD4,                 true,  LOGIC_PROGRESSIVE_GIANT_KNIFE,      RHT_PROGRESSIVE_GORONSWORD, true);
+    itemTable[RG_PROGRESSIVE_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Fanghaken (prog.)" },                                                              ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, true);
+    itemTable[RG_PROGRESSIVE_STRENGTH] =                Item(RG_PROGRESSIVE_STRENGTH,             Text{ "Strength Upgrade", "Amélioration de Force (prog.)", "Stärke (prog.)" },                                                       ITEMTYPE_ITEM,              0x81,                 true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_PROGRESSIVE_STRENGTH, true);
+    itemTable[RG_PROGRESSIVE_BOMB_BAG] =                Item(RG_PROGRESSIVE_BOMB_BAG,             Text{ "Progressive Bomb Bag", "Sac de Bombes (prog.)", "Bombentasche (prog.)" },                                                     ITEMTYPE_ITEM,              0x82,                 true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_PROGRESSIVE_BOMB_BAG, true);
+    itemTable[RG_PROGRESSIVE_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Bogen (prog.)" },                                                                           ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, true);
+    itemTable[RG_PROGRESSIVE_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Schleuder (prog.)" },                                                        ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, true);
+    itemTable[RG_PROGRESSIVE_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Geldbörse (prog.)" },                                                                 ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, true);
+    itemTable[RG_PROGRESSIVE_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Zora-Schuppe (prog.)" },                                                              ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, true);
+    itemTable[RG_PROGRESSIVE_NUT_UPGRADE] =             Item(RG_PROGRESSIVE_NUT_UPGRADE,          Text{ "Progressive Nut Capacity", "Capacité de Noix (prog.)", "Nuß-Kapazität (prog.)" },                                             ITEMTYPE_ITEM,              0x87,                 true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_PROGRESSIVE_NUT_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_STICK_UPGRADE] =           Item(RG_PROGRESSIVE_STICK_UPGRADE,        Text{ "Progressive Stick Capacity", "Capacité de Bâtons (prog.)", "Stab-Kapazität (prog.)" },                                        ITEMTYPE_ITEM,              0x88,                 true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_PROGRESSIVE_STICK_UPGRADE, true);
+    itemTable[RG_PROGRESSIVE_BOMBCHUS] =                Item(RG_PROGRESSIVE_BOMBCHUS,             Text{ "Progressive Bombchu", "Missiles (prog.)", "Krabbelminen (prog.)" },                                                           ITEMTYPE_ITEM,              0x89,                 true,  LOGIC_BOMBCHUS,                     RHT_PROGRESSIVE_BOMBCHUS, true);
+    itemTable[RG_PROGRESSIVE_MAGIC_METER] =             Item(RG_PROGRESSIVE_MAGIC_METER,          Text{ "Progressive Magic Meter", "Jauge de Magie (prog.)", "Magische Kraft (prog.)" },                                               ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_PROGRESSIVE_MAGIC_METER, true);
+    itemTable[RG_PROGRESSIVE_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Okarina (prog.)" },                                                                 ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, true);
+    itemTable[RG_PROGRESSIVE_GORONSWORD] =              Item(RG_PROGRESSIVE_GORONSWORD,           Text{ "Progressive Goron Sword", "Épée Goron (prog.)", "Goronen-Schwert (prog.)" },                                                  ITEMTYPE_ITEM,              0xD4,                 true,  LOGIC_PROGRESSIVE_GIANT_KNIFE,      RHT_PROGRESSIVE_GORONSWORD, true);
     // Bottles
     itemTable[RG_EMPTY_BOTTLE] =                        Item(RG_EMPTY_BOTTLE,                     Text{ "Empty Bottle", "Bouteille Vide", "Leere Flasche" },                                                                           ITEMTYPE_ITEM,              GI_BOTTLE,            true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_BOTTLE,                          OBJECT_GI_BOTTLE,        GID_BOTTLE,          0x42,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche mit Milch" },                                                           ITEMTYPE_ITEM,              GI_MILK_BOTTLE,       true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_MILK_BOTTLE,                     OBJECT_GI_MILK,          GID_MILK,            0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche mit rotem Elixier" },                                    ITEMTYPE_ITEM,              0x8C,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_RED_POTION,            RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,        GID_POTION_RED,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche mit grünem Elixier" },                                 ITEMTYPE_ITEM,              0x8D,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_GREEN_POTION,          RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,        GID_POTION_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche mit blauem Elixier" },                                  ITEMTYPE_ITEM,              0x8E,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_POTION,           RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,        GID_POTION_BLUE,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche mit Fee" },                                                            ITEMTYPE_ITEM,              0x8F,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FAIRY,                 RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,        GID_BOTTLE,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche mit Fisch" },                                                        ITEMTYPE_ITEM,              0x90,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FISH,                  RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,          GID_FISH,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche mit blauem Feuer" },                                      ITEMTYPE_ITEM,              0x91,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_FIRE,             RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,          GID_BLUE_FIRE,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche mit Wanzen" },                                                     ITEMTYPE_ITEM,              0x92,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BUGS,                  RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,        GID_BUG,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche mit einem Geist" },                                                    ITEMTYPE_ITEM,              0x94,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_POE,                   RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,         GID_POE,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche mit Rutos Brief" },                                  ITEMTYPE_ITEM,              GI_LETTER_RUTO,       true,  LOGIC_RUTOS_LETTER,                 RHT_RUTOS_LETTER,                      ITEM_LETTER_RUTO,                     OBJECT_GI_BOTTLE_LETTER, GID_LETTER_RUTO,     0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche mit Seele" },                                                        ITEMTYPE_ITEM,              0x93,                 true,  LOGIC_BOTTLE_WITH_BIG_POE,          RHT_BOTTLE_WITH_BIG_POE,               RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,         GID_BIG_POE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_MILK] =                    Item(RG_BOTTLE_WITH_MILK,                 Text{ "Bottle with Milk", "Bouteille avec du Lait", "Flasche (Milch)" },                                                             ITEMTYPE_ITEM,              GI_MILK_BOTTLE,       true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_MILK,                  ITEM_MILK_BOTTLE,                     OBJECT_GI_MILK,          GID_MILK,            0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_RED_POTION] =              Item(RG_BOTTLE_WITH_RED_POTION,           Text{ "Bottle with Red Potion", "Bouteille avec une Potion Rouge", "Flasche (Rotes Elixier)" },                                      ITEMTYPE_ITEM,              0x8C,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_RED_POTION,            RG_BOTTLE_WITH_RED_POTION,            OBJECT_GI_LIQUID,        GID_POTION_RED,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_GREEN_POTION] =            Item(RG_BOTTLE_WITH_GREEN_POTION,         Text{ "Bottle with Green Potion", "Bouteille avec une Potion Verte", "Flasche (Grünes Elixier)" },                                   ITEMTYPE_ITEM,              0x8D,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_GREEN_POTION,          RG_BOTTLE_WITH_GREEN_POTION,          OBJECT_GI_LIQUID,        GID_POTION_GREEN,    TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_POTION] =             Item(RG_BOTTLE_WITH_BLUE_POTION,          Text{ "Bottle with Blue Potion", "Bouteille avec une Potion Bleue", "Flasche (Blaues Elixier)" },                                    ITEMTYPE_ITEM,              0x8E,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_POTION,           RG_BOTTLE_WITH_BLUE_POTION,           OBJECT_GI_LIQUID,        GID_POTION_BLUE,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FAIRY] =                   Item(RG_BOTTLE_WITH_FAIRY,                Text{ "Bottle with Fairy", "Bouteille avec une Fée", "Flasche (Fee)" },                                                              ITEMTYPE_ITEM,              0x8F,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FAIRY,                 RG_BOTTLE_WITH_FAIRY,                 OBJECT_GI_BOTTLE,        GID_BOTTLE,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_FISH] =                    Item(RG_BOTTLE_WITH_FISH,                 Text{ "Bottle with Fish", "Bouteille avec un Poisson", "Flasche (Fisch)" },                                                          ITEMTYPE_ITEM,              0x90,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_FISH,                  RG_BOTTLE_WITH_FISH,                  OBJECT_GI_FISH,          GID_FISH,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BLUE_FIRE] =               Item(RG_BOTTLE_WITH_BLUE_FIRE,            Text{ "Bottle with Blue Fire", "Bouteille avec une Flamme Bleue", "Flasche (Blaues Feuer)" },                                        ITEMTYPE_ITEM,              0x91,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BLUE_FIRE,             RG_BOTTLE_WITH_BLUE_FIRE,             OBJECT_GI_FIRE,          GID_BLUE_FIRE,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_BUGS] =                    Item(RG_BOTTLE_WITH_BUGS,                 Text{ "Bottle with Bugs", "Bouteille avec des Insectes", "Flasche (Käfer)" },                                                        ITEMTYPE_ITEM,              0x92,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_BUGS,                  RG_BOTTLE_WITH_BUGS,                  OBJECT_GI_INSECT,        GID_BUG,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BOTTLE_WITH_POE] =                     Item(RG_BOTTLE_WITH_POE,                  Text{ "Bottle with Poe", "Bouteille avec un Esprit", "Flasche (Irrlicht)" },                                                         ITEMTYPE_ITEM,              0x94,                 true,  LOGIC_BOTTLES,                      RHT_BOTTLE_WITH_POE,                   RG_BOTTLE_WITH_POE,                   OBJECT_GI_GHOST,         GID_POE,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_RUTOS_LETTER] =                        Item(RG_RUTOS_LETTER,                     Text{ "Bottle with Ruto's Letter", "Bouteille avec la Lettre de Ruto", "Flasche (Rutos Brief)" },                                    ITEMTYPE_ITEM,              GI_LETTER_RUTO,       true,  LOGIC_RUTOS_LETTER,                 RHT_RUTOS_LETTER,                      ITEM_LETTER_RUTO,                     OBJECT_GI_BOTTLE_LETTER, GID_LETTER_RUTO,     0x99,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_BOTTLE_WITH_BIG_POE] =                 Item(RG_BOTTLE_WITH_BIG_POE,              Text{ "Bottle with Big Poe", "Bouteille avec une Âme", "Flasche (Nachtschwärmer)" },                                                 ITEMTYPE_ITEM,              0x93,                 true,  LOGIC_BOTTLE_WITH_BIG_POE,          RHT_BOTTLE_WITH_BIG_POE,               RG_BOTTLE_WITH_BIG_POE,               OBJECT_GI_GHOST,         GID_BIG_POE,         TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     // Songs
     itemTable[RG_ZELDAS_LULLABY] =                      Item(RG_ZELDAS_LULLABY,                   Text{ "Zelda's Lullaby", "Berceuse de Zelda", "Zeldas Wiegenlied" },                                                                 ITEMTYPE_SONG,              0xC1,                 true,  LOGIC_ZELDAS_LULLABY,               RHT_ZELDAS_LULLABY,                    ITEM_SONG_LULLABY,                    OBJECT_GI_MELODY,        GID_SONG_ZELDA,      0xD4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_EPONAS_SONG] =                         Item(RG_EPONAS_SONG,                      Text{ "Epona's Song", "Chant d'Epona", "Eponas Lied" },                                                                              ITEMTYPE_SONG,              0xC2,                 true,  LOGIC_EPONAS_SONG,                  RHT_EPONAS_SONG,                       ITEM_SONG_EPONA,                      OBJECT_GI_MELODY,        GID_SONG_EPONA,      0xD2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
@@ -97,136 +99,147 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_REQUIEM_OF_SPIRIT] =                   Item(RG_REQUIEM_OF_SPIRIT,                Text{ "Requiem of Spirit", "Requiem des Esprits", "Requiem der Geister" },                                                           ITEMTYPE_SONG,              0xBE,                 true,  LOGIC_REQUIEM_OF_SPIRIT,            RHT_REQUIEM_OF_SPIRIT,                 ITEM_SONG_REQUIEM,                    OBJECT_GI_MELODY,        GID_SONG_REQUIEM,    0x76,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_PRELUDE_OF_LIGHT] =                    Item(RG_PRELUDE_OF_LIGHT,                 Text{ "Prelude of Light", "Prélude de la Lumière", "Kantate des Lichts" },                                                           ITEMTYPE_SONG,              0xC0,                 true,  LOGIC_PRELUDE_OF_LIGHT,             RHT_PRELUDE_OF_LIGHT,                  ITEM_SONG_PRELUDE,                    OBJECT_GI_MELODY,        GID_SONG_PRELUDE,    0x78,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Maps and Compasses
-    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte des Deku-Baums" },                                                      ITEMTYPE_MAP,               0xA5,                 false, LOGIC_MAP_DEKU_TREE,                RHT_DEKU_TREE_MAP,                     RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte der Dodongo-Höhle" },                                            ITEMTYPE_MAP,               0xA6,                 false, LOGIC_MAP_DODONGOS_CAVERN,          RHT_DODONGOS_CAVERN_MAP,               RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte des Jabu-Jabu-Bauchs" },                                       ITEMTYPE_MAP,               0xA7,                 false, LOGIC_MAP_JABU_JABUS_BELLY,         RHT_JABU_JABUS_BELLY_MAP,              RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Karte des Waldtempels" },                                                 ITEMTYPE_MAP,               0xA8,                 false, LOGIC_MAP_FOREST_TEMPLE,            RHT_FOREST_TEMPLE_MAP,                 RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Karte des Feuertempels" },                                                      ITEMTYPE_MAP,               0xA9,                 false, LOGIC_MAP_FIRE_TEMPLE,              RHT_FIRE_TEMPLE_MAP,                   RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Karte des Wassertempels" },                                                   ITEMTYPE_MAP,               0xAA,                 false, LOGIC_MAP_WATER_TEMPLE,             RHT_WATER_TEMPLE_MAP,                  RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Karte des Geistertempels" },                                             ITEMTYPE_MAP,               0xAB,                 false, LOGIC_MAP_SPIRIT_TEMPLE,            RHT_SPIRIT_TEMPLE_MAP,                 RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte des Schattentempels" },                                              ITEMTYPE_MAP,               0xAC,                 false, LOGIC_MAP_SHADOW_TEMPLE,            RHT_SHADOW_TEMPLE_MAP,                 RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Karte des Grund des Brunnens" },                                                  ITEMTYPE_MAP,               0xAD,                 false, LOGIC_MAP_BOTTOM_OF_THE_WELL,       RHT_BOTTOM_OF_THE_WELL_MAP,            RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Karte der Eishöhle" },                                                       ITEMTYPE_MAP,               0xAE,                 false, LOGIC_MAP_ICE_CAVERN,               RHT_ICE_CAVERN_MAP,                    RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompaß des Deku-Baums" },                                              ITEMTYPE_COMPASS,           0x9B,                 false, LOGIC_COMPASS_DEKU_TREE,            RHT_DEKU_TREE_COMPASS,                 RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP] =                       Item(RG_DEKU_TREE_MAP,                    Text{ "Great Deku Tree Map", "Carte de l'Arbre Mojo", "Karte (Deku-Baum)" },                                                         ITEMTYPE_MAP,               0xA5,                 false, LOGIC_MAP_DEKU_TREE,                RHT_DEKU_TREE_MAP,                     RG_DEKU_TREE_MAP,                     OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DEKU_TREE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_DODONGOS_CAVERN_MAP] =                 Item(RG_DODONGOS_CAVERN_MAP,              Text{ "Dodongo's Cavern Map", "Carte de la Caverne Dodongo", "Karte (Dodongos Höhle)" },                                             ITEMTYPE_MAP,               0xA6,                 false, LOGIC_MAP_DODONGOS_CAVERN,          RHT_DODONGOS_CAVERN_MAP,               RG_DODONGOS_CAVERN_MAP,               OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_JABU_JABUS_BELLY_MAP] =                Item(RG_JABU_JABUS_BELLY_MAP,             Text{ "Jabu-Jabu's Belly Map", "Carte du Ventre de Jabu-Jabu", "Karte (Jabu-Jabus Bauch)" },                                         ITEMTYPE_MAP,               0xA7,                 false, LOGIC_MAP_JABU_JABUS_BELLY,         RHT_JABU_JABUS_BELLY_MAP,              RG_JABU_JABUS_BELLY_MAP,              OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_FOREST_TEMPLE_MAP] =                   Item(RG_FOREST_TEMPLE_MAP,                Text{ "Forest Temple Map", "Carte du Temple de la Forêt", "Karte (Waldtempel)" },                                                    ITEMTYPE_MAP,               0xA8,                 false, LOGIC_MAP_FOREST_TEMPLE,            RHT_FOREST_TEMPLE_MAP,                 RG_FOREST_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_FIRE_TEMPLE_MAP] =                     Item(RG_FIRE_TEMPLE_MAP,                  Text{ "Fire Temple Map", "Carte due Temple de Feu", "Karte (Feuertempel)" },                                                         ITEMTYPE_MAP,               0xA9,                 false, LOGIC_MAP_FIRE_TEMPLE,              RHT_FIRE_TEMPLE_MAP,                   RG_FIRE_TEMPLE_MAP,                   OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_WATER_TEMPLE_MAP] =                    Item(RG_WATER_TEMPLE_MAP,                 Text{ "Water Temple Map", "Carte du Temple de l'Eau", "Karte (Wassertempel)" },                                                      ITEMTYPE_MAP,               0xAA,                 false, LOGIC_MAP_WATER_TEMPLE,             RHT_WATER_TEMPLE_MAP,                  RG_WATER_TEMPLE_MAP,                  OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_SPIRIT_TEMPLE_MAP] =                   Item(RG_SPIRIT_TEMPLE_MAP,                Text{ "Spirit Temple Map", "Carte due Temple de l'Esprit", "Karte (Geistertempel)" },                                                ITEMTYPE_MAP,               0xAB,                 false, LOGIC_MAP_SPIRIT_TEMPLE,            RHT_SPIRIT_TEMPLE_MAP,                 RG_SPIRIT_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_SHADOW_TEMPLE_MAP] =                   Item(RG_SHADOW_TEMPLE_MAP,                Text{ "Shadow Temple Map", "Carte du Temple de l'Ombre", "Karte (Schattentempel)" },                                                 ITEMTYPE_MAP,               0xAC,                 false, LOGIC_MAP_SHADOW_TEMPLE,            RHT_SHADOW_TEMPLE_MAP,                 RG_SHADOW_TEMPLE_MAP,                 OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Karte (Grund des Brunnens)" },                                                    ITEMTYPE_MAP,               0xAD,                 false, LOGIC_MAP_BOTTOM_OF_THE_WELL,       RHT_BOTTOM_OF_THE_WELL_MAP,            RG_BOTTOM_OF_THE_WELL_MAP,            OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_ICE_CAVERN_MAP] =                      Item(RG_ICE_CAVERN_MAP,                   Text{ "Ice Cavern Map", "Carte de la Caverne Polaire", "Karte (Eishöhle)" },                                                         ITEMTYPE_MAP,               0xAE,                 false, LOGIC_MAP_ICE_CAVERN,               RHT_ICE_CAVERN_MAP,                    RG_ICE_CAVERN_MAP,                    OBJECT_GI_MAP,           GID_DUNGEON_MAP,     TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    itemTable[RG_DEKU_TREE_COMPASS] =                   Item(RG_DEKU_TREE_COMPASS,                Text{ "Great Deku Tree Compass", "Boussole de l'Arbre Mojo", "Kompaß (Deku-Baum)" },                                                 ITEMTYPE_COMPASS,           0x9B,                 false, LOGIC_COMPASS_DEKU_TREE,            RHT_DEKU_TREE_COMPASS,                 RG_DEKU_TREE_COMPASS,                 OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_DUNGEON_MAP,       0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DEKU_TREE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompaß der Dodongo-Höhle" },                                    ITEMTYPE_COMPASS,           0x9C,                 false, LOGIC_COMPASS_DODONGOS_CAVERN,      RHT_DODONGOS_CAVERN_COMPASS,           RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_DODONGOS_CAVERN_COMPASS] =             Item(RG_DODONGOS_CAVERN_COMPASS,          Text{ "Dodongo's Cavern Compass", "Boussole de la Caverne Dodongo", "Kompaß (Dodongos Höhle)" },                                     ITEMTYPE_COMPASS,           0x9C,                 false, LOGIC_COMPASS_DODONGOS_CAVERN,      RHT_DODONGOS_CAVERN_COMPASS,           RG_DODONGOS_CAVERN_COMPASS,           OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_DODONGOS_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompaß des Jabu-Jabu-Bauchs" },                               ITEMTYPE_COMPASS,           0x9D,                 false, LOGIC_COMPASS_JABU_JABUS_BELLY,     RHT_JABU_JABUS_BELLY_COMPASS,          RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_JABU_JABUS_BELLY_COMPASS] =            Item(RG_JABU_JABUS_BELLY_COMPASS,         Text{ "Jabu-Jabu's Belly Compass", "Boussole du Ventre de Jabu-Jabu", "Kompaß (Jabu-Jabus Bauch)" },                                 ITEMTYPE_COMPASS,           0x9D,                 false, LOGIC_COMPASS_JABU_JABUS_BELLY,     RHT_JABU_JABUS_BELLY_COMPASS,          RG_JABU_JABUS_BELLY_COMPASS,          OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_JABU_JABUS_BELLY_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Kompaß des Waldtempels" },                                         ITEMTYPE_COMPASS,           0x9E,                 false, LOGIC_COMPASS_FOREST_TEMPLE,        RHT_FOREST_TEMPLE_COMPASS,             RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_COMPASS] =               Item(RG_FOREST_TEMPLE_COMPASS,            Text{ "Forest Temple Compass", "Boussole du Temple de la Forêt", "Kompaß (Waldtempel)" },                                            ITEMTYPE_COMPASS,           0x9E,                 false, LOGIC_COMPASS_FOREST_TEMPLE,        RHT_FOREST_TEMPLE_COMPASS,             RG_FOREST_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Kompaß des Feuertempels" },                                               ITEMTYPE_COMPASS,           0x9F,                 false, LOGIC_COMPASS_FIRE_TEMPLE,          RHT_FIRE_TEMPLE_COMPASS,               RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_COMPASS] =                 Item(RG_FIRE_TEMPLE_COMPASS,              Text{ "Fire Temple Compass", "Boussole du Temple du Feu", "Kompaß (Feuertempel)" },                                                  ITEMTYPE_COMPASS,           0x9F,                 false, LOGIC_COMPASS_FIRE_TEMPLE,          RHT_FIRE_TEMPLE_COMPASS,               RG_FIRE_TEMPLE_COMPASS,               OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Kompaß des Wassertempels" },                                           ITEMTYPE_COMPASS,           0xA0,                 false, LOGIC_COMPASS_WATER_TEMPLE,         RHT_WATER_TEMPLE_COMPASS,              RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_COMPASS] =                Item(RG_WATER_TEMPLE_COMPASS,             Text{ "Water Temple Compass", "Boussole du Temple de l'Eau", "Kompaß (Wassertempel)" },                                              ITEMTYPE_COMPASS,           0xA0,                 false, LOGIC_COMPASS_WATER_TEMPLE,         RHT_WATER_TEMPLE_COMPASS,              RG_WATER_TEMPLE_COMPASS,              OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Kompaß des Geistertempels" },                                     ITEMTYPE_COMPASS,           0xA1,                 false, LOGIC_COMPASS_SPIRIT_TEMPLE,        RHT_SPIRIT_TEMPLE_COMPASS,             RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_COMPASS] =               Item(RG_SPIRIT_TEMPLE_COMPASS,            Text{ "Spirit Temple Compass", "Boussole due Temple de l'Esprit", "Kompaß (Geistertempel)" },                                        ITEMTYPE_COMPASS,           0xA1,                 false, LOGIC_COMPASS_SPIRIT_TEMPLE,        RHT_SPIRIT_TEMPLE_COMPASS,             RG_SPIRIT_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompaß des Schattentempels" },                                      ITEMTYPE_COMPASS,           0xA2,                 false, LOGIC_COMPASS_SHADOW_TEMPLE,        RHT_SHADOW_TEMPLE_COMPASS,             RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_COMPASS] =               Item(RG_SHADOW_TEMPLE_COMPASS,            Text{ "Shadow Temple Compass", "Boussole du Temple de l'Ombre", "Kompaß (Schattentempel)" },                                         ITEMTYPE_COMPASS,           0xA2,                 false, LOGIC_COMPASS_SHADOW_TEMPLE,        RHT_SHADOW_TEMPLE_COMPASS,             RG_SHADOW_TEMPLE_COMPASS,             OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Kompaß des Grund des Brunnens" },                                          ITEMTYPE_COMPASS,           0xA3,                 false, LOGIC_COMPASS_BOTTOM_OF_THE_WELL,   RHT_BOTTOM_OF_THE_WELL_COMPASS,        RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS] =          Item(RG_BOTTOM_OF_THE_WELL_COMPASS,       Text{ "Bottom of the Well Compass", "Boussole du Puits", "Kompaß (Grund des Brunnens)" },                                            ITEMTYPE_COMPASS,           0xA3,                 false, LOGIC_COMPASS_BOTTOM_OF_THE_WELL,   RHT_BOTTOM_OF_THE_WELL_COMPASS,        RG_BOTTOM_OF_THE_WELL_COMPASS,        OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);
-    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Kompaß der Eishöhle" },                                               ITEMTYPE_COMPASS,           0xA4,                 false, LOGIC_COMPASS_ICE_CAVERN,           RHT_ICE_CAVERN_COMPASS,                RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_ICE_CAVERN_COMPASS] =                  Item(RG_ICE_CAVERN_COMPASS,               Text{ "Ice Cavern Compass", "Boussole de la Caverne Polaire", "Kompaß (Eishöhle)" },                                                 ITEMTYPE_COMPASS,           0xA4,                 false, LOGIC_COMPASS_ICE_CAVERN,           RHT_ICE_CAVERN_COMPASS,                RG_ICE_CAVERN_COMPASS,                OBJECT_GI_COMPASS,       GID_COMPASS,         TEXT_ITEM_COMPASS,           0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
     itemTable[RG_ICE_CAVERN_COMPASS].SetCustomDrawFunc(Randomizer_DrawCompass);          
     // Boss Keys
-    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Master-Schlüssel des Waldtempels" },                              ITEMTYPE_BOSSKEY,           0x95,                 true,  LOGIC_BOSS_KEY_FOREST_TEMPLE,       RHT_FOREST_TEMPLE_BOSS_KEY,            RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_BOSS_KEY] =              Item(RG_FOREST_TEMPLE_BOSS_KEY,           Text{ "Forest Temple Boss Key", "Clé d'Or du Temple de la Forêt", "Master-Schlüssel (Waldtempel)" },                                 ITEMTYPE_BOSSKEY,           0x95,                 true,  LOGIC_BOSS_KEY_FOREST_TEMPLE,       RHT_FOREST_TEMPLE_BOSS_KEY,            RG_FOREST_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Master-Schlüssel des Feuertempels" },                                    ITEMTYPE_BOSSKEY,           0x96,                 true,  LOGIC_BOSS_KEY_FIRE_TEMPLE,         RHT_FIRE_TEMPLE_BOSS_KEY,              RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_BOSS_KEY] =                Item(RG_FIRE_TEMPLE_BOSS_KEY,             Text{ "Fire Temple Boss Key", "Clé d'Or du Temple du Feu", "Master-Schlüssel (Feuertempel)" },                                       ITEMTYPE_BOSSKEY,           0x96,                 true,  LOGIC_BOSS_KEY_FIRE_TEMPLE,         RHT_FIRE_TEMPLE_BOSS_KEY,              RG_FIRE_TEMPLE_BOSS_KEY,              OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Master-Schlüssel des Wassertempels" },                                ITEMTYPE_BOSSKEY,           0x97,                 true,  LOGIC_BOSS_KEY_WATER_TEMPLE,        RHT_WATER_TEMPLE_BOSS_KEY,             RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_BOSS_KEY] =               Item(RG_WATER_TEMPLE_BOSS_KEY,            Text{ "Water Temple Boss Key", "Clé d'Or du Temple de l'Eau", "Master-Schlüssel (Wassertempel)" },                                   ITEMTYPE_BOSSKEY,           0x97,                 true,  LOGIC_BOSS_KEY_WATER_TEMPLE,        RHT_WATER_TEMPLE_BOSS_KEY,             RG_WATER_TEMPLE_BOSS_KEY,             OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Master-Schlüssel des Geistertempels" },                           ITEMTYPE_BOSSKEY,           0x98,                 true,  LOGIC_BOSS_KEY_SPIRIT_TEMPLE,       RHT_SPIRIT_TEMPLE_BOSS_KEY,            RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY] =              Item(RG_SPIRIT_TEMPLE_BOSS_KEY,           Text{ "Spirit Temple Boss Key", "Clé d'Or du Temple de l'Esprit", "Master-Schlüssel (Geistertempel)" },                              ITEMTYPE_BOSSKEY,           0x98,                 true,  LOGIC_BOSS_KEY_SPIRIT_TEMPLE,       RHT_SPIRIT_TEMPLE_BOSS_KEY,            RG_SPIRIT_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Master-Schlüssel des Schattentempels" },                           ITEMTYPE_BOSSKEY,           0x99,                 true,  LOGIC_BOSS_KEY_SHADOW_TEMPLE,       RHT_SHADOW_TEMPLE_BOSS_KEY,            RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_BOSS_KEY] =              Item( RG_SHADOW_TEMPLE_BOSS_KEY,          Text{ "Shadow Temple Boss Key", "Clé d'Or du Temple de l'Ombre", "Master-Schlüssel (Schattentempel)" },                              ITEMTYPE_BOSSKEY,           0x99,                 true,  LOGIC_BOSS_KEY_SHADOW_TEMPLE,       RHT_SHADOW_TEMPLE_BOSS_KEY,            RG_SHADOW_TEMPLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Master-Schlüssel von Ganons Schloß" },                             ITEMTYPE_BOSSKEY,           0x9A,                 true,  LOGIC_BOSS_KEY_GANONS_CASTLE,       RHT_GANONS_CASTLE_BOSS_KEY,            RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_BOSS_KEY] =              Item(RG_GANONS_CASTLE_BOSS_KEY,           Text{ "Ganon's Castle Boss Key", "Clé d'Or du Château de Ganon", "Master-Schlüssel (Ganons Schloß)" },                               ITEMTYPE_BOSSKEY,           0x9A,                 true,  LOGIC_BOSS_KEY_GANONS_CASTLE,       RHT_GANONS_CASTLE_BOSS_KEY,            RG_GANONS_CASTLE_BOSS_KEY,            OBJECT_GI_BOSSKEY,       GID_KEY_BOSS,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_BOSS_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_BOSS_KEY].SetCustomDrawFunc(Randomizer_DrawBossKey);
-    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Kleiner Schlüssel für den Waldtempel" },                       ITEMTYPE_SMALLKEY,          0xAF,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_SMALL_KEY,           RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_SMALL_KEY] =             Item(RG_FOREST_TEMPLE_SMALL_KEY,          Text{ "Forest Temple Small Key", "Petite Clé du Temple de la Forêt", "Kleiner Schlüssel (Waldtempel)" },                             ITEMTYPE_SMALLKEY,          0xAF,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_SMALL_KEY,           RG_FOREST_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Kleiner Schlüssel für den Feuertempel" },                             ITEMTYPE_SMALLKEY,          0xB0,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_SMALL_KEY,             RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_SMALL_KEY] =               Item(RG_FIRE_TEMPLE_SMALL_KEY,            Text{ "Fire Temple Small Key", "Petite Clé du Temple du Feu", "Kleiner Schlüssel (Feuertempel)" },                                   ITEMTYPE_SMALLKEY,          0xB0,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_SMALL_KEY,             RG_FIRE_TEMPLE_SMALL_KEY,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Kleiner Schlüssel für den Wassertempel" },                         ITEMTYPE_SMALLKEY,          0xB1,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_SMALL_KEY,            RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_SMALL_KEY] =              Item(RG_WATER_TEMPLE_SMALL_KEY,           Text{ "Water Temple Small Key", "Petite Clé du Temple de l'Eau", "Kleiner Schlüssel (Wassertempel)" },                               ITEMTYPE_SMALLKEY,          0xB1,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_SMALL_KEY,            RG_WATER_TEMPLE_SMALL_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Kleiner Schlüssel für den Geistertempel" },                    ITEMTYPE_SMALLKEY,          0xB2,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_SMALL_KEY,           RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY] =             Item(RG_SPIRIT_TEMPLE_SMALL_KEY,          Text{ "Spirit Temple Small Key", "Petite Clé du Temple de l'Esprit", "Kleiner Schlüssel (Geistertempel)" },                          ITEMTYPE_SMALLKEY,          0xB2,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_SMALL_KEY,           RG_SPIRIT_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Kleiner Schlüssel für den Schattentempel" },                    ITEMTYPE_SMALLKEY,          0xB3,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_SMALL_KEY,           RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_SMALL_KEY] =             Item(RG_SHADOW_TEMPLE_SMALL_KEY,          Text{ "Shadow Temple Small Key", "Petite Clé du Temple de l'Ombre", "Kleiner Schlüssel (Schattentempel)" },                          ITEMTYPE_SMALLKEY,          0xB3,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_SMALL_KEY,           RG_SHADOW_TEMPLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Kleiner Schlüssel für den Grund des Brunnens" },                       ITEMTYPE_SMALLKEY,          0xB4,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] =        Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY,     Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Kleiner Schlüssel (Grund des Brunnens)" },                             ITEMTYPE_SMALLKEY,          0xB4,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_SMALL_KEY,      RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY,  Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" },            ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_SMALL_KEY, OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY,  Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel (Gerudo-Trainingsarena)" },                    ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_SMALL_KEY, OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Kleiner Schlüssel für die Gerudo-Festung" },                ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_SMALL_KEY,         RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] =           Item(RG_GERUDO_FORTRESS_SMALL_KEY,        Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Kleiner Schlüssel (Diebesversteck)" },                      ITEMTYPE_FORTRESS_SMALLKEY, 0xB6,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_SMALL_KEY,         RG_GERUDO_FORTRESS_SMALL_KEY,         OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Kleiner Schlüssel für Ganons Schloß" },                         ITEMTYPE_SMALLKEY,          0xB7,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_SMALL_KEY,           RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_SMALL_KEY] =             Item(RG_GANONS_CASTLE_SMALL_KEY,          Text{ "Ganon's Castle Small Key", "Petite Clé du Château de Ganon", "Kleiner Schlüssel (Ganons Schloß)" },                           ITEMTYPE_SMALLKEY,          0xB7,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_SMALL_KEY,           RG_GANONS_CASTLE_SMALL_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);      
-    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Kleiner Schlüssel für das Truhenspiel" },                  ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,          true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_SMALL_KEY,           ITEM_KEY_SMALL,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
-    itemTable[RG_GUARD_HOUSE_KEY] =                     Item(RG_GUARD_HOUSE_KEY,                  Text{ "Guard House Key", "", "Schlüssel für das Haus der Wachen" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GUARD_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_GUARD_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY] =             Item(RG_TREASURE_GAME_SMALL_KEY,          Text{ "Chest Game Small Key", "Petite Clé du jeu la Chasse-aux-Trésors", "Kleiner Schlüssel (Truhenlotterie)" },                     ITEMTYPE_SMALLKEY,          GI_DOOR_KEY,          true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_SMALL_KEY,           ITEM_KEY_SMALL,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       0xF3,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_NONE);
+    itemTable[RG_TREASURE_GAME_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_GUARD_HOUSE_KEY] =                     Item(RG_GUARD_HOUSE_KEY,                  Text{ "Guard House Key", "Clé de la Maison des Gardes", "Schlüssel (Wachhaus)" },                                                    ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GUARD_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_GUARD_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GUARD_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_BAZAAR_KEY] =                   Item(RG_MARKET_BAZAAR_KEY,                Text{ "Market Bazaar Key", "", "Schlüssel für den Basar des Marktes" },                                                              ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_BAZAAR_KEY,            RHT_OVERWORLD_KEY,                     RG_MARKET_BAZAAR_KEY,                 OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_BAZAAR_KEY] =                   Item(RG_MARKET_BAZAAR_KEY,                Text{ "Market Bazaar Key", "Clé du Bazar de la Place du Marché", "Schlüssel (Basar des Marktes)" },                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_BAZAAR_KEY,            RHT_OVERWORLD_KEY,                     RG_MARKET_BAZAAR_KEY,                 OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_MARKET_BAZAAR_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_POTION_SHOP_KEY] =              Item(RG_MARKET_POTION_SHOP_KEY,           Text{ "Market Potion Shop Key", "", "Schlüssel für den Magie-Laden des Marktes" },                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_POTION_SHOP_KEY,       RHT_OVERWORLD_KEY,                     RG_MARKET_POTION_SHOP_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_POTION_SHOP_KEY] =              Item(RG_MARKET_POTION_SHOP_KEY,           Text{ "Market Potion Shop Key", "Clé du Magasin de Potions de la Place du Marché", "Schlüssel (Magie-Laden des Marktes)" },          ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_POTION_SHOP_KEY,       RHT_OVERWORLD_KEY,                     RG_MARKET_POTION_SHOP_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_MARKET_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MASK_SHOP_KEY] =                       Item(RG_MASK_SHOP_KEY,                    Text{ "Mask Shop Key", "", "Schlüssel für den Maskenladen" },                                                                        ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MASK_SHOP_KEY,                RHT_OVERWORLD_KEY,                     RG_MASK_SHOP_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MASK_SHOP_KEY] =                       Item(RG_MASK_SHOP_KEY,                    Text{ "Mask Shop Key", "Clé de la Foire aux Masques", "Schlüssel (Maskenladen)" },                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MASK_SHOP_KEY,                RHT_OVERWORLD_KEY,                     RG_MASK_SHOP_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_MASK_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_SHOOTING_GALLERY_KEY] =         Item(RG_MARKET_SHOOTING_GALLERY_KEY,      Text{ "Market Shooting Gallery Key", "", "Schlüssel für die Schießbude des Marktes" },                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_SHOOTING_GALLERY_KEY,  RHT_OVERWORLD_KEY,                     RG_MARKET_SHOOTING_GALLERY_KEY,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_SHOOTING_GALLERY_KEY] =         Item(RG_MARKET_SHOOTING_GALLERY_KEY,      Text{ "Market Shooting Gallery Key", "Clé du Stand de Tir de la Place du Marché", "Schlüssel (Schießbude des Marktes)" },            ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_SHOOTING_GALLERY_KEY,  RHT_OVERWORLD_KEY,                     RG_MARKET_SHOOTING_GALLERY_KEY,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_MARKET_SHOOTING_GALLERY_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOMBCHU_BOWLING_KEY] =                 Item(RG_BOMBCHU_BOWLING_KEY,              Text{ "Bombchu Bowling Alley Key", "", "Schlüssel für die Minenbowlingbahn" },                                                       ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_BOWLING_KEY,          RHT_OVERWORLD_KEY,                     RG_BOMBCHU_BOWLING_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_BOWLING_KEY] =                 Item(RG_BOMBCHU_BOWLING_KEY,              Text{ "Bombchu Bowling Alley Key", "Clé du Bowling Teigneux", "Schlüssel (Minenbowlingbahn)" },                                      ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_BOWLING_KEY,          RHT_OVERWORLD_KEY,                     RG_BOMBCHU_BOWLING_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOMBCHU_BOWLING_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY] =    Item(RG_TREASURE_CHEST_GAME_BUILDING_KEY, Text{ "Treasure Chest Game Building Key", "", "Schlüssel für das Haus des Schatzkisten-Pokers" },                                    ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TREASURE_CHEST_GAME_BUILDING_KEY,RHT_OVERWORLD_KEY,                  RG_TREASURE_CHEST_GAME_BUILDING_KEY,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY] =    Item(RG_TREASURE_CHEST_GAME_BUILDING_KEY, Text{ "Treasure Chest Game Building Key", "Clé de la Chasse au Trésor", "Schlüssel (Haus der Truhenlotterie)" },                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TREASURE_CHEST_GAME_BUILDING_KEY,RHT_OVERWORLD_KEY,                  RG_TREASURE_CHEST_GAME_BUILDING_KEY,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOMBCHU_SHOP_KEY] =                    Item(RG_BOMBCHU_SHOP_KEY,                 Text{ "Bombchu Shop Key", "", "Schlüssel für den Krabbelminenladen" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_SHOP_KEY,             RHT_OVERWORLD_KEY,                     RG_BOMBCHU_SHOP_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_SHOP_KEY] =                    Item(RG_BOMBCHU_SHOP_KEY,                 Text{ "Bombchu Shop Key", "Clé du Magasin de Missiles", "Schlüssel (Krabbelminenladen)" },                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_SHOP_KEY,             RHT_OVERWORLD_KEY,                     RG_BOMBCHU_SHOP_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOMBCHU_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_RICHARDS_HOUSE_KEY] =                  Item(RG_RICHARDS_HOUSE_KEY,               Text{ "Richard's House Key", "", "Schlüssel für das Haus von Richard" },                                                             ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_RICHARDS_HOUSE_KEY,           RHT_OVERWORLD_KEY,                     RG_RICHARDS_HOUSE_KEY,                OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_RICHARDS_HOUSE_KEY] =                  Item(RG_RICHARDS_HOUSE_KEY,               Text{ "Richard's House Key", "Clé de la Maison de Kiki", "Schlüssel (Richards Haus)" },                                              ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_RICHARDS_HOUSE_KEY,           RHT_OVERWORLD_KEY,                     RG_RICHARDS_HOUSE_KEY,                OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_RICHARDS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_ALLEY_HOUSE_KEY] =                     Item(RG_ALLEY_HOUSE_KEY,                  Text{ "Alley House Key", "", "Schlüssel für das Gäßchenhaus" },                                                                      ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_ALLEY_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_ALLEY_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_ALLEY_HOUSE_KEY] =                     Item(RG_ALLEY_HOUSE_KEY,                  Text{ "Alley House Key", "Clé de la Maison de la Ruelle", "Schlüssel (Haus in der Gasse)" },                                         ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_ALLEY_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_ALLEY_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_ALLEY_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_BAZAAR_KEY] =                      Item(RG_KAK_BAZAAR_KEY,                   Text{ "Kakariko Bazaar Key", "", "Schlüssel für den Basar von Kakariko" },                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_BAZAAR_KEY,               RHT_OVERWORLD_KEY,                     RG_KAK_BAZAAR_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_BAZAAR_KEY] =                      Item(RG_KAK_BAZAAR_KEY,                   Text{ "Kakariko Bazaar Key", "Clé du Bazar de Cocorico", "Schlüssel (Basar von Kakariko)" },                                         ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_BAZAAR_KEY,               RHT_OVERWORLD_KEY,                     RG_KAK_BAZAAR_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_KAK_BAZAAR_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_POTION_SHOP_KEY] =                 Item(RG_KAK_POTION_SHOP_KEY,              Text{ "Kakariko Potion Shop Key", "", "Schlüssel für den Magie-Laden von Kakariko" },                                                ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_POTION_SHOP_KEY,          RHT_OVERWORLD_KEY,                     RG_KAK_POTION_SHOP_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_POTION_SHOP_KEY] =                 Item(RG_KAK_POTION_SHOP_KEY,              Text{ "Kakariko Potion Shop Key", "Clé du Magasin de Potions de Cocorico", "Schlüssel (Magie-Laden von Kakariko)" },                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_POTION_SHOP_KEY,          RHT_OVERWORLD_KEY,                     RG_KAK_POTION_SHOP_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_KAK_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOSS_HOUSE_KEY] =                      Item(RG_BOSS_HOUSE_KEY,                   Text{ "Boss's House Key", "", "Schlüssel für das Haus des Chefs" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOSS_HOUSE_KEY,               RHT_OVERWORLD_KEY,                     RG_BOSS_HOUSE_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOSS_HOUSE_KEY] =                      Item(RG_BOSS_HOUSE_KEY,                   Text{ "Boss's House Key", "Clé de la Maison du Chef des Ouvriers", "Schlüssel (Haus des Chefs)" },                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOSS_HOUSE_KEY,               RHT_OVERWORLD_KEY,                     RG_BOSS_HOUSE_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOSS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_GRANNYS_POTION_SHOP_KEY] =             Item(RG_GRANNYS_POTION_SHOP_KEY,          Text{ "Granny's Potion Shop Key", "", "Schlüssel für Asas Hexenladen" },                                                             ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GRANNYS_POTION_SHOP_KEY,      RHT_OVERWORLD_KEY,                     RG_GRANNYS_POTION_SHOP_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GRANNYS_POTION_SHOP_KEY] =             Item(RG_GRANNYS_POTION_SHOP_KEY,          Text{ "Granny's Potion Shop Key", "Clé de l'Apothicaire", "Schlüssel (Asas Hexenladen)" },                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GRANNYS_POTION_SHOP_KEY,      RHT_OVERWORLD_KEY,                     RG_GRANNYS_POTION_SHOP_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GRANNYS_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_SKULLTULA_HOUSE_KEY] =                 Item(RG_SKULLTULA_HOUSE_KEY,              Text{ "Skulltula House Key", "", "Schlüssel für das Skulltula-Haus" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_SKULLTULA_HOUSE_KEY,          RHT_OVERWORLD_KEY,                     RG_SKULLTULA_HOUSE_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SKULLTULA_HOUSE_KEY] =                 Item(RG_SKULLTULA_HOUSE_KEY,              Text{ "Skulltula House Key", "Clé de la Maison des Araignées", "Schlüssel (Skulltula-Haus)" },                                       ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_SKULLTULA_HOUSE_KEY,          RHT_OVERWORLD_KEY,                     RG_SKULLTULA_HOUSE_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SKULLTULA_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_IMPAS_HOUSE_KEY] =                     Item(RG_IMPAS_HOUSE_KEY,                  Text{ "Impa's House Key", "", "Schlüssel für das Haus von Impa" },                                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_IMPAS_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_IMPAS_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_IMPAS_HOUSE_KEY] =                     Item(RG_IMPAS_HOUSE_KEY,                  Text{ "Impa's House Key", "Clé de la Maison d'Impa", "Schlüssel (Impas Haus)" },                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_IMPAS_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_IMPAS_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_IMPAS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_WINDMILL_KEY] =                        Item(RG_WINDMILL_KEY,                     Text{ "Windmill Key", "", "Schlüssel für die Windmühle" },                                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_WINDMILL_KEY,                 RHT_OVERWORLD_KEY,                     RG_WINDMILL_KEY,                      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WINDMILL_KEY] =                        Item(RG_WINDMILL_KEY,                     Text{ "Windmill Key", "Clé du Moulin", "Schlüssel (Windmühle)" },                                                                    ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_WINDMILL_KEY,                 RHT_OVERWORLD_KEY,                     RG_WINDMILL_KEY,                      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WINDMILL_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_SHOOTING_GALLERY_KEY] =            Item(RG_KAK_SHOOTING_GALLERY_KEY,         Text{ "Kakariko Shooting Gallery Key", "", "Schlüssel für die Schießbude von Kakariko" },                                            ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_SHOOTING_GALLERY_KEY,     RHT_OVERWORLD_KEY,                     RG_KAK_SHOOTING_GALLERY_KEY,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_SHOOTING_GALLERY_KEY] =            Item(RG_KAK_SHOOTING_GALLERY_KEY,         Text{ "Kakariko Shooting Gallery Key", "Clé du Stand de Tir de Cocorico", "Schlüssel (Schießbude von Kakariko)" },                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_SHOOTING_GALLERY_KEY,     RHT_OVERWORLD_KEY,                     RG_KAK_SHOOTING_GALLERY_KEY,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_KAK_SHOOTING_GALLERY_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_DAMPES_HUT_KEY] =                      Item(RG_DAMPES_HUT_KEY,                   Text{ "Dampe's Hut Key", "", "Schlüssel für die Hütte von Boris" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_DAMPES_HUT_KEY,               RHT_OVERWORLD_KEY,                     RG_DAMPES_HUT_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_DAMPES_HUT_KEY] =                      Item(RG_DAMPES_HUT_KEY,                   Text{ "Dampe's Hut Key", "Clé de la Cabane d'Igor", "Schlüssel (Hütte des Totengräbers)" },                                          ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_DAMPES_HUT_KEY,               RHT_OVERWORLD_KEY,                     RG_DAMPES_HUT_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_DAMPES_HUT_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_TALONS_HOUSE_KEY] =                    Item(RG_TALONS_HOUSE_KEY,                 Text{ "Talon's House Key", "", "Schlüssel für das Haus von Talon" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TALONS_HOUSE_KEY,             RHT_OVERWORLD_KEY,                     RG_TALONS_HOUSE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TALONS_HOUSE_KEY] =                    Item(RG_TALONS_HOUSE_KEY,                 Text{ "Talon's House Key", "Clé de la Maison de Talon", "Schlüssel (Talons Haus)" },                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TALONS_HOUSE_KEY,             RHT_OVERWORLD_KEY,                     RG_TALONS_HOUSE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_TALONS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_STABLES_KEY] =                         Item(RG_STABLES_KEY,                      Text{ "Stables Key", "", "Schlüssel für die Ställe" },                                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_STABLES_KEY,                  RHT_OVERWORLD_KEY,                     RG_STABLES_KEY,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_STABLES_KEY] =                         Item(RG_STABLES_KEY,                      Text{ "Stables Key", "Clé des Écuries", "Schlüssel (Ställe)" },                                                                      ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_STABLES_KEY,                  RHT_OVERWORLD_KEY,                     RG_STABLES_KEY,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_STABLES_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BACK_TOWER_KEY] =                      Item(RG_BACK_TOWER_KEY,                   Text{ "Back Tower Key", "", "Schlüssel für den hinteren Turm" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BACK_TOWER_KEY,               RHT_OVERWORLD_KEY,                     RG_BACK_TOWER_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BACK_TOWER_KEY] =                      Item(RG_BACK_TOWER_KEY,                   Text{ "Back Tower Key", "Clé du Silo", "Schlüssel (Lon Lon-Turm)" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BACK_TOWER_KEY,               RHT_OVERWORLD_KEY,                     RG_BACK_TOWER_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BACK_TOWER_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_HYLIA_LAB_KEY] =                       Item(RG_HYLIA_LAB_KEY,                    Text{ "Hylia Laboratory Key", "", "Schlüssel für das Hylia-Labor" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_HYLIA_LAB_KEY,                RHT_OVERWORLD_KEY,                     RG_HYLIA_LAB_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_HYLIA_LAB_KEY] =                       Item(RG_HYLIA_LAB_KEY,                    Text{ "Hylia Laboratory Key", "Clé du Laboratoire du Lac Hylia", "Schlüssel (Hylia-Labor)" },                                        ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_HYLIA_LAB_KEY,                RHT_OVERWORLD_KEY,                     RG_HYLIA_LAB_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_HYLIA_LAB_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_FISHING_HOLE_KEY] =                    Item(RG_FISHING_HOLE_KEY,                 Text{ "Fishing Hole Key", "", "Schlüssel für den Fischweiher" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_FISHING_HOLE_KEY,             RHT_OVERWORLD_KEY,                     RG_FISHING_HOLE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FISHING_HOLE_KEY] =                    Item(RG_FISHING_HOLE_KEY,                 Text{ "Fishing Hole Key", "Clé de l'Étang", "Schlüssel (Fischweiher)" },                                                             ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_FISHING_HOLE_KEY,             RHT_OVERWORLD_KEY,                     RG_FISHING_HOLE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FISHING_HOLE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     // Key Rings
-    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Schlüsselbund für den Waldtempel" },                             ITEMTYPE_SMALLKEY,          0xD5,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_KEY_RING,            RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FOREST_TEMPLE_KEY_RING] =              Item(RG_FOREST_TEMPLE_KEY_RING,           Text{ "Forest Temple Key Ring", "Trousseau du Temple de la Forêt", "Schlüsselbund (Waldtempel)" },                                   ITEMTYPE_SMALLKEY,          0xD5,                 true,  LOGIC_FOREST_TEMPLE_KEYS,           RHT_FOREST_TEMPLE_KEY_RING,            RG_FOREST_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FOREST_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Schlüsselbund für den Feuertempel" },                                   ITEMTYPE_SMALLKEY,          0xD6,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_KEY_RING,              RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FIRE_TEMPLE_KEY_RING] =                Item(RG_FIRE_TEMPLE_KEY_RING,             Text{ "Fire Temple Key Ring", "Trousseau du Temple du Feu", "Schlüsselbund (Feuertempel)" },                                         ITEMTYPE_SMALLKEY,          0xD6,                 true,  LOGIC_FIRE_TEMPLE_KEYS,             RHT_FIRE_TEMPLE_KEY_RING,              RG_FIRE_TEMPLE_KEY_RING,              OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_FIRE_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Schlüsselbund für den Wassertempel" },                               ITEMTYPE_SMALLKEY,          0xD7,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_KEY_RING,             RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WATER_TEMPLE_KEY_RING] =               Item(RG_WATER_TEMPLE_KEY_RING,            Text{ "Water Temple Key Ring", "Trousseau du Temple de l'Eau", "Schlüsselbund (Wassertempel)" },                                     ITEMTYPE_SMALLKEY,          0xD7,                 true,  LOGIC_WATER_TEMPLE_KEYS,            RHT_WATER_TEMPLE_KEY_RING,             RG_WATER_TEMPLE_KEY_RING,             OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_WATER_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Schlüsselbund für den Geistertempel" },                          ITEMTYPE_SMALLKEY,          0xD8,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_KEY_RING,            RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SPIRIT_TEMPLE_KEY_RING] =              Item(RG_SPIRIT_TEMPLE_KEY_RING,           Text{ "Spirit Temple Key Ring", "Trousseau du Temple de l'Esprit", "Schlüsselbund (Geistertempel)" },                                ITEMTYPE_SMALLKEY,          0xD8,                 true,  LOGIC_SPIRIT_TEMPLE_KEYS,           RHT_SPIRIT_TEMPLE_KEY_RING,            RG_SPIRIT_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SPIRIT_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing); 
-    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schlüsselbund für den Schattentempel" },                          ITEMTYPE_SMALLKEY,          0xD9,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_KEY_RING,            RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SHADOW_TEMPLE_KEY_RING] =              Item(RG_SHADOW_TEMPLE_KEY_RING,           Text{ "Shadow Temple Key Ring", "Trousseau du Temple de l'Ombre", "Schlüsselbund (Schattentempel)" },                                ITEMTYPE_SMALLKEY,          0xD9,                 true,  LOGIC_SHADOW_TEMPLE_KEYS,           RHT_SHADOW_TEMPLE_KEY_RING,            RG_SHADOW_TEMPLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_SHADOW_TEMPLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Schlüsselbund für den Grund des Brunnens" },                             ITEMTYPE_SMALLKEY,          0xDA,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_KEY_RING,       RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING] =         Item(RG_BOTTOM_OF_THE_WELL_KEY_RING,      Text{ "Bottom of the Well Key Ring", "Trousseau du Puits", "Schlüsselbund (Grund des Brunnens)" },                                   ITEMTYPE_SMALLKEY,          0xDA,                 true,  LOGIC_BOTTOM_OF_THE_WELL_KEYS,      RHT_BOTTOM_OF_THE_WELL_KEY_RING,       RG_BOTTOM_OF_THE_WELL_KEY_RING,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_TRAINING_GROUND_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUND_KEY_RING,   Text{ "Training Ground Key Ring", "Trousseau du Gymnase Gerudo", "Schlüsselbund für das Gerudo-Trainingsgelände" },                 ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_KEY_RING,  RG_GERUDO_TRAINING_GROUND_KEY_RING,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_TRAINING_GROUND_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUND_KEY_RING,   Text{ "Training Ground Key Ring", "Trousseau du Gymnase Gerudo", "Schlüsselbund (Gerudo-Trainingsarena)" },                          ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_KEY_RING,  RG_GERUDO_TRAINING_GROUND_KEY_RING,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_TRAINING_GROUND_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Schlüsselbund für die Gerudo-Festung" },                      ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_KEY_RING,          RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GERUDO_FORTRESS_KEY_RING] =            Item(RG_GERUDO_FORTRESS_KEY_RING,         Text{ "Gerudo Fortress Key Ring", "Trousseau du Repaire des Voleurs", "Schlüsselbund (Diebesversteck)" },                            ITEMTYPE_FORTRESS_SMALLKEY, 0xDC,                 true,  LOGIC_GERUDO_FORTRESS_KEYS,         RHT_GERUDO_FORTRESS_KEY_RING,          RG_GERUDO_FORTRESS_KEY_RING,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GERUDO_FORTRESS_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Schlüsselbund für Ganons Schloß" },                               ITEMTYPE_SMALLKEY,          0xDD,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_KEY_RING,            RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_GANONS_CASTLE_KEY_RING] =              Item(RG_GANONS_CASTLE_KEY_RING,           Text{ "Ganon's Castle Key Ring", "Trousseau du Château de Ganon", "Schlüsselbund (Ganons Schloß)" },                                 ITEMTYPE_SMALLKEY,          0xDD,                 true,  LOGIC_GANONS_CASTLE_KEYS,           RHT_GANONS_CASTLE_KEY_RING,            RG_GANONS_CASTLE_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_TREASURE_GAME_KEY_RING] =              Item(RG_TREASURE_GAME_KEY_RING,           Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund für das Truhenspiel" },                        ITEMTYPE_SMALLKEY,          0xDE,                 true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_KEY_RING,            RG_TREASURE_GAME_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_GAME_KEY_RING] =              Item(RG_TREASURE_GAME_KEY_RING,           Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund (Truhenlotterie)" },                           ITEMTYPE_SMALLKEY,          0xDE,                 true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_KEY_RING,            RG_TREASURE_GAME_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_TREASURE_GAME_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
     // Dungeon Rewards
     itemTable[RG_KOKIRI_EMERALD] =                      Item(RG_KOKIRI_EMERALD,                   Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" },                                                                     ITEMTYPE_DUNGEONREWARD,     0xCB,                 true,  LOGIC_KOKIRI_EMERALD,               RHT_KOKIRI_EMERALD,                    ITEM_KOKIRI_EMERALD,                  OBJECT_GI_JEWEL,        GID_KOKIRI_EMERALD,   0x80,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
@@ -241,15 +254,15 @@ void Rando::StaticData::InitItemTable() {
     // Generic Items
     itemTable[RG_RECOVERY_HEART] =                      Item(RG_RECOVERY_HEART,                   Text{ "Recovery Heart", "Coeur de Vie", "Herz" },                                                                                    ITEMTYPE_ITEM,              GI_HEART,             false, LOGIC_NONE,                         RHT_RECOVERY_HEART,                    ITEM_HEART,                           OBJECT_GI_HEART,        GID_HEART,            0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_GREEN_RUPEE] =                         Item(RG_GREEN_RUPEE,                      Text{ "Green Rupee", "Rubis Vert", "Grüner Rubin" },                                                                                 ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       false, LOGIC_NONE,                         RHT_GREEN_RUPEE,                       ITEM_RUPEE_GREEN,                     OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      0x6F,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg Rubin" },                                                                          ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       true,  LOGIC_GREG,                         RHT_GREG_RUPEE,                        RG_GREG_RUPEE,                        OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GREG_RUPEE] =                          Item(RG_GREG_RUPEE,                       Text{ "Greg the Green Rupee", "Rubis Greg", "Greg der grüne Rubin" },                                                                ITEMTYPE_ITEM,              GI_RUPEE_GREEN,       true,  LOGIC_GREG,                         RHT_GREG_RUPEE,                        RG_GREG_RUPEE,                        OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BLUE_RUPEE] =                          Item(RG_BLUE_RUPEE,                       Text{ "Blue Rupee", "Rubis Bleu", "Blauer Rubin" },                                                                                  ITEMTYPE_ITEM,              GI_RUPEE_BLUE,        false, LOGIC_NONE,                         RHT_BLUE_RUPEE,                        ITEM_RUPEE_BLUE,                      OBJECT_GI_RUPY,         GID_RUPEE_BLUE,       0xCC,                        0x01, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_RED_RUPEE] =                           Item(RG_RED_RUPEE,                        Text{ "Red Rupee", "Rubis Rouge", "Roter Rubin" },                                                                                   ITEMTYPE_ITEM,              GI_RUPEE_RED,         false, LOGIC_NONE,                         RHT_RED_RUPEE,                         ITEM_RUPEE_RED,                       OBJECT_GI_RUPY,         GID_RUPEE_RED,        0xF0,                        0x02, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_PURPLE_RUPEE] =                        Item(RG_PURPLE_RUPEE,                     Text{ "Purple Rupee", "Rubis Pourpre", "Violetter Rubin" },                                                                          ITEMTYPE_ITEM,              GI_RUPEE_PURPLE,      false, LOGIC_NONE,                         RHT_PURPLE_RUPEE,                      ITEM_RUPEE_PURPLE,                    OBJECT_GI_RUPY,         GID_RUPEE_PURPLE,     0xF1,                        0x14, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Riesiger Rubin" },                                                                              ITEMTYPE_ITEM,              GI_RUPEE_GOLD,        false, LOGIC_NONE,                         RHT_HUGE_RUPEE,                        ITEM_RUPEE_GOLD,                      OBJECT_GI_RUPY,         GID_RUPEE_GOLD,       0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzstück" },                                                                             ITEMTYPE_ITEM,              GI_HEART_PIECE,       true,  LOGIC_PIECE_OF_HEART,               RHT_PIECE_OF_HEART,                    ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_HUGE_RUPEE] =                          Item(RG_HUGE_RUPEE,                       Text{ "Huge Rupee", "Énorme Rubis", "Goldener Rubin" },                                                                              ITEMTYPE_ITEM,              GI_RUPEE_GOLD,        false, LOGIC_NONE,                         RHT_HUGE_RUPEE,                        ITEM_RUPEE_GOLD,                      OBJECT_GI_RUPY,         GID_RUPEE_GOLD,       0xF2,                        0x13, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_PIECE_OF_HEART] =                      Item(RG_PIECE_OF_HEART,                   Text{ "Piece of Heart", "Quart de Coeur", "Herzteil" },                                                                              ITEMTYPE_ITEM,              GI_HEART_PIECE,       true,  LOGIC_PIECE_OF_HEART,               RHT_PIECE_OF_HEART,                    ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xC2,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_HEART_CONTAINER] =                     Item(RG_HEART_CONTAINER,                  Text{ "Heart Container", "Réceptacle de Coeur", "Herzcontainer" },                                                                   ITEMTYPE_ITEM,              GI_HEART_CONTAINER_2, true,  LOGIC_HEART_CONTAINER,              RHT_HEART_CONTAINER,                   ITEM_HEART_CONTAINER,                 OBJECT_GI_HEARTS,       GID_HEART_CONTAINER,  0xC6,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_ICE_TRAP] =                            Item(RG_ICE_TRAP,                         Text{ "Ice Trap", "Piège de Glace", "Eisfalle" },                                                                                    ITEMTYPE_ITEM,              RG_ICE_TRAP,          false, LOGIC_NONE,                         RHT_ICE_TRAP,                          RG_ICE_TRAP,                          OBJECT_GI_RUPY,         GID_RUPEE_GOLD,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Milch" },                                                                                                     ITEMTYPE_ITEM,              GI_MILK,              false, LOGIC_NONE,                         RHT_NONE,                              ITEM_MILK,                            OBJECT_GI_MILK,         GID_MILK,             0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_MILK] =                                Item(RG_MILK,                             Text{ "Milk", "Lait", "Lon Lon-Milch" },                                                                                             ITEMTYPE_ITEM,              GI_MILK,              false, LOGIC_NONE,                         RHT_NONE,                              ITEM_MILK,                            OBJECT_GI_MILK,         GID_MILK,             0x98,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_FISH] =                                Item(RG_FISH,                             Text{ "Fish", "Poisson", "Fisch" },                                                                                                  ITEMTYPE_ITEM,              GI_FISH,              false, LOGIC_NONE,                         RHT_NONE,                              ITEM_FISH,                            OBJECT_GI_FISH,         GID_FISH,             0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Refills
     itemTable[RG_BOMBS_5] =                             Item(RG_BOMBS_5,                          Text{ "Bombs (5)", "Bombes (5)", "Bomben (5)" },                                                                                     ITEMTYPE_REFILL,            GI_BOMBS_5,           false, LOGIC_NONE,                         RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
@@ -264,21 +277,21 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_ARROWS_30] =                           Item(RG_ARROWS_30,                        Text{ "Arrows (30)", "Flèches (30)", "Pfeile (30)" },                                                                                ITEMTYPE_REFILL,            GI_ARROWS_LARGE,      false, LOGIC_NONE,                         RHT_ARROWS_30,                         ITEM_ARROWS_LARGE,                    OBJECT_GI_ARROW,        GID_ARROWS_LARGE,     0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_DEKU_NUTS_5] =                         Item(RG_DEKU_NUTS_5,                      Text{ "Deku Nuts (5)", "Noix Mojo (5)", "Deku-Nüsse (5)" },                                                                          ITEMTYPE_REFILL,            GI_NUTS_5,            false, LOGIC_NONE,                         RHT_DEKU_NUTS_5,                       ITEM_NUTS_5,                          OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_DEKU_NUTS_10] =                        Item(RG_DEKU_NUTS_10,                     Text{ "Deku Nuts (10)", "Noix Mojo (10)", "Deku-Nüsse (10)" },                                                                       ITEMTYPE_REFILL,            GI_NUTS_10,           false, LOGIC_NONE,                         RHT_DEKU_NUTS_10,                      ITEM_NUTS_10,                         OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Samen (30)" },                                                                   ITEMTYPE_REFILL,            GI_SEEDS_30,          false, LOGIC_NONE,                         RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_DEKU_SEEDS_30] =                       Item(RG_DEKU_SEEDS_30,                    Text{ "Deku Seeds (30)", "Graines Mojo (30)", "Deku-Kerne (30)" },                                                                   ITEMTYPE_REFILL,            GI_SEEDS_30,          false, LOGIC_NONE,                         RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
     itemTable[RG_DEKU_STICK_1] =                        Item(RG_DEKU_STICK_1,                     Text{ "Deku Stick (1)", "Bâton Mojo (1)", "Deku-Stab (1)" },                                                                         ITEMTYPE_REFILL,            GI_STICKS_1,          false, LOGIC_NONE,                         RHT_DEKU_STICK_1,                      ITEM_STICK,                           OBJECT_GI_STICK,        GID_STICK,            0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Nachfüllpackung des roten Elixiers" },                                       ITEMTYPE_REFILL,            GI_POTION_RED,        false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Nachfüllpackung des grünen Elixiers" },                                    ITEMTYPE_REFILL,            GI_POTION_GREEN,      false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_GREEN,                    OBJECT_GI_LIQUID,       GID_POTION_GREEN,     0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
-    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Nachfüllpackung des blauen Elixiers" },                                     ITEMTYPE_REFILL,            GI_POTION_BLUE,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_BLUE,                     OBJECT_GI_LIQUID,       GID_POTION_BLUE,      0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_RED_POTION_REFILL] =                   Item(RG_RED_POTION_REFILL,                Text{ "Red Potion Refill", "Recharge de Potion Rouge", "Rotes Elixier" },                                                            ITEMTYPE_REFILL,            GI_POTION_RED,        false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_GREEN_POTION_REFILL] =                 Item(RG_GREEN_POTION_REFILL,              Text{ "Green Potion Refill", "Recharge de Potion Verte", "Grünes Elixier" },                                                         ITEMTYPE_REFILL,            GI_POTION_GREEN,      false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_GREEN,                    OBJECT_GI_LIQUID,       GID_POTION_GREEN,     0x44,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
+    itemTable[RG_BLUE_POTION_REFILL] =                  Item(RG_BLUE_POTION_REFILL,               Text{ "Blue Potion Refill", "Recharge de Potion Bleue", "Blaues Elixier" },                                                          ITEMTYPE_REFILL,            GI_POTION_BLUE,       false, LOGIC_NONE,                         RHT_NONE,                              ITEM_POTION_BLUE,                     OBJECT_GI_LIQUID,       GID_POTION_BLUE,      0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE);
     // Treasure Game
-    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzstück (Schatztruhenminispiel)" },                       ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN,   true,  LOGIC_PIECE_OF_HEART,               RHT_TREASURE_GAME_HEART,               ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüner Rubin (Schatztruhenminispiel)" },                            ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,  false, LOGIC_NONE,                         RHT_TREASURE_GAME_GREEN_RUPEE,         ITEM_RUPEE_GREEN,                     OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_TREASURE_GAME_HEART] =                 Item(RG_TREASURE_GAME_HEART,              Text{ "Piece of Heart (WINNER)", "Quart de Coeur (Chasse-aux-Trésors)", "Herzteil (Truhenlotterie)" },                               ITEMTYPE_ITEM,              GI_HEART_PIECE_WIN,   true,  LOGIC_PIECE_OF_HEART,               RHT_TREASURE_GAME_HEART,               ITEM_HEART_PIECE_2,                   OBJECT_GI_HEARTS,       GID_HEART_PIECE,      0xFA,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_TREASURE_GAME_GREEN_RUPEE] =           Item(RG_TREASURE_GAME_GREEN_RUPEE,        Text{ "Green Rupee (LOSER)", "Rubis Vert (Chasse-aux-Trésors)", "Grüner Rubin (Truhenlotterie)" },                                   ITEMTYPE_ITEM,              GI_RUPEE_GREEN_LOSE,  false, LOGIC_NONE,                         RHT_TREASURE_GAME_GREEN_RUPEE,         ITEM_RUPEE_GREEN,                     OBJECT_GI_RUPY,         GID_RUPEE_GREEN,      0xF4,                        0x00, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,  MOD_NONE);
     // Shop
-    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nuß kaufen (5)" },                                                         ITEMTYPE_SHOP,              GI_NUTS_5_2,          true,  LOGIC_NUTS,                         RHT_DEKU_NUTS_5,                       ITEM_NUTS_5,                          OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
+    itemTable[RG_BUY_DEKU_NUTS_5] =                     Item(RG_BUY_DEKU_NUTS_5,                  Text{ "Buy Deku Nut (5)", "Acheter: Noix Mojo (5)", "Deku-Nüsse kaufen (5)" },                                                       ITEMTYPE_SHOP,              GI_NUTS_5_2,          true,  LOGIC_BUY_NUTS,                     RHT_DEKU_NUTS_5,                       ITEM_NUTS_5,                          OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 15);
     itemTable[RG_BUY_ARROWS_30] =                       Item(RG_BUY_ARROWS_30,                    Text{ "Buy Arrows (30)", "Acheter: Flèches (30)", "Pfeile kaufen (30)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_MEDIUM,     true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_30,                         ITEM_ARROWS_MEDIUM,                   OBJECT_GI_ARROW,        GID_ARROWS_MEDIUM,    0xE6,                        0x49, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 60);
     itemTable[RG_BUY_ARROWS_50] =                       Item(RG_BUY_ARROWS_50,                    Text{ "Buy Arrows (50)", "Acheter: Flèches (50)", "Pfeile kaufen (50)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_LARGE,      true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_30,                         ITEM_ARROWS_LARGE,                    OBJECT_GI_ARROW,        GID_ARROWS_LARGE,     0xE6,                        0x4A, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 90);
     itemTable[RG_BUY_BOMBS_525] =                       Item(RG_BUY_BOMBS_525,                    Text{ "Buy Bombs (5) [25]", "Acheter: Bombes (5) [25]", "Bomben kaufen (5) [25]" },                                                  ITEMTYPE_SHOP,              GI_BOMBS_5,           true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_5,                           ITEM_BOMBS_5,                         OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 25);
-    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nuß kaufen (10)" },                                                      ITEMTYPE_SHOP,              GI_NUTS_10,           true,  LOGIC_NUTS,                         RHT_DEKU_NUTS_10,                      ITEM_NUTS_10,                         OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stab kaufen (1)" },                                                     ITEMTYPE_SHOP,              GI_STICKS_1,          true,  LOGIC_STICKS,                       RHT_DEKU_STICK_1,                      ITEM_STICK,                           OBJECT_GI_STICK,        GID_STICK,            0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
+    itemTable[RG_BUY_DEKU_NUTS_10] =                    Item(RG_BUY_DEKU_NUTS_10,                 Text{ "Buy Deku Nut (10)", "Acheter: Noix Mojo (10)", "Deku-Nüsse kaufen (10)" },                                                    ITEMTYPE_SHOP,              GI_NUTS_10,           true,  LOGIC_BUY_NUTS,                     RHT_DEKU_NUTS_10,                      ITEM_NUTS_10,                         OBJECT_GI_NUTS,         GID_NUTS,             0x34,                        0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_STICK_1] =                    Item(RG_BUY_DEKU_STICK_1,                 Text{ "Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Deku-Stab kaufen (1)" },                                                     ITEMTYPE_SHOP,              GI_STICKS_1,          true,  LOGIC_BUY_STICKS,                   RHT_DEKU_STICK_1,                      ITEM_STICK,                           OBJECT_GI_STICK,        GID_STICK,            0x37,                        0x0D, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
     itemTable[RG_BUY_BOMBS_10] =                        Item(RG_BUY_BOMBS_10,                     Text{ "Buy Bombs (10)", "Acheter: Bombes (10)", "Bomben kaufen (10)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_10,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_10,                          ITEM_BOMBS_10,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     itemTable[RG_BUY_FISH] =                            Item(RG_BUY_FISH,                         Text{ "Buy Fish", "Acheter: Poisson", "Fisch kaufen" },                                                                              ITEMTYPE_SHOP,              GI_FISH,              true,  LOGIC_FISH_ACCESS,                  RHT_BOTTLE_WITH_FISH,                  ITEM_FISH,                            OBJECT_GI_FISH,         GID_FISH,             0x47,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 200);
     itemTable[RG_BUY_RED_POTION_30] =                   Item(RG_BUY_RED_POTION_30,                Text{ "Buy Red Potion [30]", "Acheter: Potion Rouge [30]", "Rotes Elixier kaufen [30]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
@@ -286,17 +299,17 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_BLUE_POTION] =                     Item(RG_BUY_BLUE_POTION,                  Text{ "Buy Blue Potion", "Acheter: Potion Bleue", "Blaues Elixier kaufen" },                                                         ITEMTYPE_SHOP,              GI_POTION_BLUE,       true,  LOGIC_BUY_MAGIC_POTION,             RHT_BOTTLE_WITH_BLUE_POTION,           ITEM_POTION_BLUE,                     OBJECT_GI_LIQUID,       GID_POTION_BLUE,      0x45,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 100);
     itemTable[RG_BUY_HYLIAN_SHIELD] =                   Item(RG_BUY_HYLIAN_SHIELD,                Text{ "Buy Hylian Shield", "Acheter: Bouclier Hylien", "Hylia-Schild kaufen" },                                                      ITEMTYPE_SHOP,              GI_SHIELD_HYLIAN,     true,  LOGIC_HYLIAN_SHIELD,                RHT_HYLIAN_SHIELD,                     ITEM_SHIELD_HYLIAN,                   OBJECT_GI_SHIELD_2,     GID_SHIELD_HYLIAN,    0x4D,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 80);
     itemTable[RG_BUY_DEKU_SHIELD] =                     Item(RG_BUY_DEKU_SHIELD,                  Text{ "Buy Deku Shield", "Acheter: Bouclier Mojo", "Deku-Schild kaufen" },                                                           ITEMTYPE_SHOP,              GI_SHIELD_DEKU,       true,  LOGIC_DEKU_SHIELD,                  RHT_DEKU_SHIELD,                       ITEM_SHIELD_DEKU,                     OBJECT_GI_SHIELD_1,     GID_SHIELD_DEKU,      0x4C,                        0xA0, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE, false, 40);
-    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Tunika kaufen" },                                                        ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,      0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
-    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Tunika kaufen" },                                                             ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,       0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
+    itemTable[RG_BUY_GORON_TUNIC] =                     Item(RG_BUY_GORON_TUNIC,                  Text{ "Buy Goron Tunic", "Acheter: Tunique Goron", "Goronen-Rüstung kaufen" },                                                       ITEMTYPE_SHOP,              GI_TUNIC_GORON,       true,  LOGIC_GORON_TUNIC,                  RHT_GORON_TUNIC,                       ITEM_TUNIC_GORON,                     OBJECT_GI_CLOTHES,      GID_TUNIC_GORON,      0x50,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 200);
+    itemTable[RG_BUY_ZORA_TUNIC] =                      Item(RG_BUY_ZORA_TUNIC,                   Text{ "Buy Zora Tunic", "Acheter: Tunique Zora", "Zora-Rüstung kaufen" },                                                            ITEMTYPE_SHOP,              GI_TUNIC_ZORA,        true,  LOGIC_ZORA_TUNIC,                   RHT_ZORA_TUNIC,                        ITEM_TUNIC_ZORA,                      OBJECT_GI_CLOTHES,      GID_TUNIC_ZORA,       0x51,                        0xA0, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE, false, 300);
     itemTable[RG_BUY_HEART] =                           Item(RG_BUY_HEART,                        Text{ "Buy Heart", "Acheter: Coeur de Vie", "Herz kaufen" },                                                                         ITEMTYPE_SHOP,              GI_HEART,             false, LOGIC_NONE,                         RHT_RECOVERY_HEART,                    ITEM_HEART,                           OBJECT_GI_HEART,        GID_HEART,            0x55,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 10);
     itemTable[RG_BUY_BOMBCHUS_10] =                     Item(RG_BUY_BOMBCHUS_10,                  Text{ "Buy Bombchu (10)", "Acheter: Missiles (10)", "Krabbelminen kaufen (10)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_10,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHUS_10,                       ITEM_BOMBCHU,                         OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 99);
     itemTable[RG_BUY_BOMBCHUS_20] =                     Item(RG_BUY_BOMBCHUS_20,                  Text{ "Buy Bombchu (20)", "Acheter: Missiles (20)", "Krabbelminen kaufen (20)" },                                                    ITEMTYPE_SHOP,              GI_BOMBCHUS_20,       true,  LOGIC_BUY_BOMBCHUS,                 RHT_BOMBCHUS_20,                       ITEM_BOMBCHUS_20,                     OBJECT_GI_BOMB_2,       GID_BOMBCHU,          0x33,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 180);
-    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Samen kaufen (30)" },                                               ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                     RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_DEKU_SEEDS_30] =                   Item(RG_BUY_DEKU_SEEDS_30,                Text{ "Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Deku-Kerne kaufen (30)" },                                               ITEMTYPE_SHOP,              GI_SEEDS_30,          true,  LOGIC_BUY_SEED,                     RHT_DEKU_SEEDS_30,                     ITEM_SEEDS_30,                        OBJECT_GI_SEED,         GID_SEEDS,            0xDC,                        0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
     itemTable[RG_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                                               ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                         RHT_NONE, false, 0);
     itemTable[RG_BUY_BLUE_FIRE] =                       Item(RG_BUY_BLUE_FIRE,                    Text{ "Buy Blue Fire", "Acheter: Flamme Bleue", "Blaues Feuer kaufen" },                                                             ITEMTYPE_SHOP,              GI_BLUE_FIRE,         true,  LOGIC_BLUE_FIRE_ACCESS,             RHT_BOTTLE_WITH_BLUE_FIRE,             ITEM_BLUE_FIRE,                       OBJECT_GI_FIRE,         GID_BLUE_FIRE,        0x5D,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 300);
-    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Flaschenkäfer kaufen" },                                                   ITEMTYPE_SHOP,              GI_BUGS,              true,  LOGIC_BUGS_ACCESS,                  RHT_BOTTLE_WITH_BUGS,                  ITEM_BUG,                             OBJECT_GI_INSECT,       GID_BUG,              0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
-    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Geist kaufen" },                                                                                ITEMTYPE_SHOP,              RG_BUY_POE,           false, LOGIC_NONE,                         RHT_BOTTLE_WITH_BIG_POE,               ITEM_POE,                             OBJECT_GI_GHOST,        GID_POE,              0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
-    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Feengeist kaufen" },                                                          ITEMTYPE_SHOP,              GI_FAIRY,             true,  LOGIC_FAIRY_ACCESS,                 RHT_BOTTLE_WITH_FAIRY,                 ITEM_FAIRY,                           OBJECT_GI_BOTTLE,       GID_BOTTLE,           0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_BOTTLE_BUG] =                      Item(RG_BUY_BOTTLE_BUG,                   Text{ "Buy Bottle Bug", "Acheter: Insecte en bouteille", "Käfer kaufen" },                                                           ITEMTYPE_SHOP,              GI_BUGS,              true,  LOGIC_BUGS_ACCESS,                  RHT_BOTTLE_WITH_BUGS,                  ITEM_BUG,                             OBJECT_GI_INSECT,       GID_BUG,              0x7A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
+    itemTable[RG_BUY_POE] =                             Item(RG_BUY_POE,                          Text{ "Buy Poe", "Acheter: Esprit", "Irrlicht kaufen" },                                                                             ITEMTYPE_SHOP,              RG_BUY_POE,           false, LOGIC_NONE,                         RHT_BOTTLE_WITH_BIG_POE,               ITEM_POE,                             OBJECT_GI_GHOST,        GID_POE,              0x97,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 30);
+    itemTable[RG_BUY_FAIRYS_SPIRIT] =                   Item(RG_BUY_FAIRYS_SPIRIT,                Text{ "Buy Fairy's Spirit", "Acheter: Esprit de Fée", "Fee kaufen" },                                                                ITEMTYPE_SHOP,              GI_FAIRY,             true,  LOGIC_FAIRY_ACCESS,                 RHT_BOTTLE_WITH_FAIRY,                 ITEM_FAIRY,                           OBJECT_GI_BOTTLE,       GID_BOTTLE,           0x46,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     itemTable[RG_BUY_ARROWS_10] =                       Item(RG_BUY_ARROWS_10,                    Text{ "Buy Arrows (10)", "Acheter: Flèches (10)", "Pfeile kaufen (10)" },                                                            ITEMTYPE_SHOP,              GI_ARROWS_SMALL,      true,  LOGIC_BUY_ARROW,                    RHT_ARROWS_10,                         ITEM_ARROWS_SMALL,                    OBJECT_GI_ARROW,        GID_ARROWS_SMALL,     0xE6,                        0x48, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 20);
     itemTable[RG_BUY_BOMBS_20] =                        Item(RG_BUY_BOMBS_20,                     Text{ "Buy Bombs (20)", "Acheter: Bombes (20)", "Bomben kaufen (20)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_20,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_20,                          ITEM_BOMBS_20,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 80);
     itemTable[RG_BUY_BOMBS_30] =                        Item(RG_BUY_BOMBS_30,                     Text{ "Buy Bombs (30)", "Acheter: Bombes (30)", "Bomben kaufen (30)" },                                                              ITEMTYPE_SHOP,              GI_BOMBS_30,          true,  LOGIC_BUY_BOMB,                     RHT_BOMBS_20,                          ITEM_BOMBS_30,                        OBJECT_GI_BOMB_1,       GID_BOMB,             0x32,                        0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,   MOD_NONE, false, 120);
@@ -304,60 +317,60 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_BUY_RED_POTION_40] =                   Item(RG_BUY_RED_POTION_40,                Text{ "Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Rotes Elixier kaufen [40]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 40);
     itemTable[RG_BUY_RED_POTION_50] =                   Item(RG_BUY_RED_POTION_50,                Text{ "Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Rotes Elixier kaufen [50]" },                                            ITEMTYPE_SHOP,              GI_POTION_RED,        false, LOGIC_NONE,                         RHT_BOTTLE_WITH_RED_POTION,            ITEM_POTION_RED,                      OBJECT_GI_LIQUID,       GID_POTION_RED,       0x43,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,   MOD_NONE, false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "Âme de Gohma", "Gohmas Seele" },                                                                                          ITEMTYPE_ITEM,              0xE0,                 true,  LOGIC_CAN_SUMMON_GOHMA,             RHT_GOHMA_SOUL,                        RG_GOHMA_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "Âme de Gohma", "Gohmas Seele" },                                                                              ITEMTYPE_ITEM,              0xE0,                 true,  LOGIC_CAN_SUMMON_GOHMA,             RHT_GOHMA_SOUL,                        RG_GOHMA_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "Âme du Roi Dodongo", "König Dodongos Seele" },                                                                           ITEMTYPE_ITEM,              0xE1,                 true,  LOGIC_CAN_SUMMON_KINGDODONGO,       RHT_KING_DODONGO_SOUL,                 RG_KING_DODONGO_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "Âme du Roi Dodongo", "König Dodongos Seele" },                                                         ITEMTYPE_ITEM,              0xE1,                 true,  LOGIC_CAN_SUMMON_KINGDODONGO,       RHT_KING_DODONGO_SOUL,                 RG_KING_DODONGO_SOUL,                 OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "Âme de Barinade", "Barinades Seele" },                                                                                    ITEMTYPE_ITEM,              0xE2,                 true,  LOGIC_CAN_SUMMON_BARINADE,          RHT_BARINADE_SOUL,                     RG_BARINADE_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "Âme de Barinade", "Barinades Seele" },                                                                     ITEMTYPE_ITEM,              0xE2,                 true,  LOGIC_CAN_SUMMON_BARINADE,          RHT_BARINADE_SOUL,                     RG_BARINADE_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "Âme de Ganon Spectral", "Phantom-Ganons Seele" },                                                                          ITEMTYPE_ITEM,              0xE3,                 true,  LOGIC_CAN_SUMMON_PHANTOMGANON,      RHT_PHANTOM_GANON_SOUL,                RG_PHANTOM_GANON_SOUL,                OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "Âme de Ganon Spectral", "Phantom-Ganons Seele" },                                                     ITEMTYPE_ITEM,              0xE3,                 true,  LOGIC_CAN_SUMMON_PHANTOMGANON,      RHT_PHANTOM_GANON_SOUL,                RG_PHANTOM_GANON_SOUL,                OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "Âme de Vulcania", "Volvagias Seele" },                                                                                    ITEMTYPE_ITEM,              0xE4,                 true,  LOGIC_CAN_SUMMON_VOLVAGIA,          RHT_VOLVAGIA_SOUL,                     RG_VOLVAGIA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "Âme de Volcania", "Volvagias Seele" },                                                                     ITEMTYPE_ITEM,              0xE4,                 true,  LOGIC_CAN_SUMMON_VOLVAGIA,          RHT_VOLVAGIA_SOUL,                     RG_VOLVAGIA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "Âme de Morpha", "Morphas Seele" },                                                                                        ITEMTYPE_ITEM,              0xE5,                 true,  LOGIC_CAN_SUMMON_MORPHA,            RHT_MORPHA_SOUL,                       RG_MORPHA_SOUL,                       OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "Âme de Morpha", "Morphas Seele" },                                                                           ITEMTYPE_ITEM,              0xE5,                 true,  LOGIC_CAN_SUMMON_MORPHA,            RHT_MORPHA_SOUL,                       RG_MORPHA_SOUL,                       OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "Âme de Bongo Bongo", "Bongo Bongos Seele" },                                                                              ITEMTYPE_ITEM,              0xE6,                 true,  LOGIC_CAN_SUMMON_BONGOBONGO,        RHT_BONGO_BONGO_SOUL,                  RG_BONGO_BONGO_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "Âme de Bongo Bongo", "Bongo Bongos Seele" },                                                            ITEMTYPE_ITEM,              0xE6,                 true,  LOGIC_CAN_SUMMON_BONGOBONGO,        RHT_BONGO_BONGO_SOUL,                  RG_BONGO_BONGO_SOUL,                  OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "Âme du Duo Maléfique", "Twinrovas Seele" },                                                                                    ITEMTYPE_ITEM,              0xE7,                 true,  LOGIC_CAN_SUMMON_TWINROVA,          RHT_TWINROVA_SOUL,                     RG_TWINROVA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "Âme du Duo Maléfique", "Twinrovas Seele" },                                                                ITEMTYPE_ITEM,              0xE7,                 true,  LOGIC_CAN_SUMMON_TWINROVA,          RHT_TWINROVA_SOUL,                     RG_TWINROVA_SOUL,                     OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "Âme de Ganon", "Ganons Seele" },                                                                                          ITEMTYPE_ITEM,              0xE8,                 true,  LOGIC_CAN_SUMMON_GANON,             RHT_GANON_SOUL,                        RG_GANON_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "Âme de Ganon", "Ganons Seele" },                                                                              ITEMTYPE_ITEM,              0xE8,                 true,  LOGIC_CAN_SUMMON_GANON,             RHT_GANON_SOUL,                        RG_GANON_SOUL,                        OBJECT_GI_SUTARU,       GID_SKULL_TOKEN,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
     itemTable[RG_FISHING_POLE] =                        Item(RG_FISHING_POLE,                     Text{ "Fishing Pole", "Canne à Pêche", "Angelrute" },                                                                                ITEMTYPE_ITEM,              RG_FISHING_POLE,      true,  LOGIC_FISHING_POLE,                 RHT_FISHING_POLE,                      RG_FISHING_POLE,                      OBJECT_GI_FISH,         GID_FISHING_POLE,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_FISHING_POLE].SetCustomDrawFunc(Randomizer_DrawFishingPoleGI);
 
-    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                 Text{ "Ocarina A Button", "Touche A de l'Ocarina", "Taste A der Okarina" },                                                          ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_A_BUTTON,             RHT_OCARINA_A_BUTTON,                  RG_OCARINA_A_BUTTON,                  OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_A_BUTTON] =                    Item(RG_OCARINA_A_BUTTON,                 Text{ "Ocarina A Button", "Touche A de l'Ocarina", "A-Taste der Okarina" },                                                          ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_A_BUTTON,             RHT_OCARINA_A_BUTTON,                  RG_OCARINA_A_BUTTON,                  OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_A_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,              Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "Taste C-Oben der Okarina" },                                             ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_UP_BUTTON,          RHT_OCARINA_C_UP_BUTTON,               RG_OCARINA_C_UP_BUTTON,               OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_UP_BUTTON] =                 Item(RG_OCARINA_C_UP_BUTTON,              Text{ "Ocarina C Up Button", "Touche C-Haut de l'Ocarina", "C-Oben-Taste der Okarina" },                                             ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_UP_BUTTON,          RHT_OCARINA_C_UP_BUTTON,               RG_OCARINA_C_UP_BUTTON,               OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_UP_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,            Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "Taste C-Unten der Okarina" },                                           ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_DOWN_BUTTON,        RHT_OCARINA_C_DOWN_BUTTON,             RG_OCARINA_C_DOWN_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_DOWN_BUTTON] =               Item(RG_OCARINA_C_DOWN_BUTTON,            Text{ "Ocarina C Down Button", "Touche C-Bas de l'Ocarina", "C-Unten-Taste der Okarina" },                                           ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_DOWN_BUTTON,        RHT_OCARINA_C_DOWN_BUTTON,             RG_OCARINA_C_DOWN_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_DOWN_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,            Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "Taste C-Links der Okarina" },                                        ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_LEFT_BUTTON,        RHT_OCARINA_C_LEFT_BUTTON,             RG_OCARINA_C_LEFT_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_LEFT_BUTTON] =               Item(RG_OCARINA_C_LEFT_BUTTON,            Text{ "Ocarina C Left Button", "Touche C-Gauche de l'Ocarina", "C-Links-Taste der Okarina" },                                        ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_LEFT_BUTTON,        RHT_OCARINA_C_LEFT_BUTTON,             RG_OCARINA_C_LEFT_BUTTON,             OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_LEFT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
-    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,           Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "Taste C-Rechts der Okarina" },                                       ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_RIGHT_BUTTON,       RHT_OCARINA_C_RIGHT_BUTTON,            RG_OCARINA_C_RIGHT_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_OCARINA_C_RIGHT_BUTTON] =              Item(RG_OCARINA_C_RIGHT_BUTTON,           Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "C-Rechts-Taste der Okarina" },                                       ITEMTYPE_ITEM,              GI_MAP,               true,  LOGIC_OCARINA_C_RIGHT_BUTTON,       RHT_OCARINA_C_RIGHT_BUTTON,            RG_OCARINA_C_RIGHT_BUTTON,            OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
-    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "Écaille de Bronze", "Bronzene Schuppe" },                                                                                   ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_BRONZE_SCALE,                      RG_BRONZE_SCALE,                      OBJECT_GI_SCALE,        GID_SCALE_SILVER,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "Écaille de Bronze", "Bronzene Schuppe" },                                                                     ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_BRONZE_SCALE,                      RG_BRONZE_SCALE,                      OBJECT_GI_SCALE,        GID_SCALE_SILVER,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
-    itemTable[RG_BOMBCHU_BAG] =                         Item(RG_BOMBCHU_BAG,                      Text{ "Bombchu Bag", "!!!", "!!!" },                                                                                                 ITEMTYPE_ITEM,              RG_BOMBCHU_BAG,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_BAG,                       RG_BOMBCHU_BAG,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_BAG] =                         Item(RG_BOMBCHU_BAG,                      Text{ "Bombchu Bag", "Sac de Missiles Teigneux", "Krabbelminentasche" },                                                             ITEMTYPE_ITEM,              RG_BOMBCHU_BAG,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_BAG,                       RG_BOMBCHU_BAG,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
-    
-    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "Carquois Infini", "Unendlicher Köcher" },                                                                              ITEMTYPE_ITEM,              RG_QUIVER_INF,        true,  LOGIC_PROGRESSIVE_BOW,              RHT_QUIVER_INF,                        RG_QUIVER_INF,                        OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "Unendliche Bombentasche" },                                                                       ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BOMB_BAG_INF,                      RG_BOMB_BAG_INF,                      OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "Unendliche Samentasche" },                                                                      ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BULLET_BAG_INF,                    RG_BULLET_BAG_INF,                    OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "Bâtons Mojo Infinis", "Unendliche Stab-Kapazität" },                                                               ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_STICK_UPGRADE_INF,                 RG_STICK_UPGRADE_INF,                 OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "Noix Mojo Infinies", "Unendliche Nuß-Kapazität" },                                                                  ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NUT_UPGRADE_INF,                   RG_NUT_UPGRADE_INF,                   OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "Magie Infinie", "Unendliches Magisches Maß" },                                                                  ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_INF,                         RG_MAGIC_INF,                         OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "Missiles Teigneux Infinis", "Unendliche Krabbelminen" },                                                                       ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_INF,                       RG_BOMBCHU_INF,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_BOMBCHU_INF].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
-    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "Bourse Infinie", "Unendliche Geldbörse" },                                                                            ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,           RHT_WALLET_INF,                        RG_WALLET_INF,                        OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
 
-    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "Clé Squelette", "Skelettschlüssel" },                                                                                   ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_SKELETON_KEY,                 RHT_SKELETON_KEY,                      RG_SKELETON_KEY,                      OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "Carquois Infini", "Unendlicher Köcher" },                                                                  ITEMTYPE_ITEM,              RG_QUIVER_INF,        true,  LOGIC_PROGRESSIVE_BOW,              RHT_QUIVER_INF,                        RG_QUIVER_INF,                        OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "Unendliche Bombentasche" },                                                      ITEMTYPE_ITEM,              RG_BOMB_BAG_INF,      true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BOMB_BAG_INF,                      RG_BOMB_BAG_INF,                      OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "Unendliche Munitionstasche" },                                               ITEMTYPE_ITEM,              RG_BULLET_BAG_INF,    true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BULLET_BAG_INF,                    RG_BULLET_BAG_INF,                    OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "Bâtons Mojo Infinis", "Unendliche Deku-Stab-Kapazität" },                                          ITEMTYPE_ITEM,              RG_STICK_UPGRADE_INF, true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_STICK_UPGRADE_INF,                 RG_STICK_UPGRADE_INF,                 OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "Noix Mojo Infinies", "Unendliche Deku-Nuß-Kapazität" },                                              ITEMTYPE_ITEM,              RG_NUT_UPGRADE_INF,   true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NUT_UPGRADE_INF,                   RG_NUT_UPGRADE_INF,                   OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "Magie Infinie", "Unendliche Magische Kraft" },                                                        ITEMTYPE_ITEM,              RG_MAGIC_INF,         true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_INF,                         RG_MAGIC_INF,                         OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "Missiles Teigneux Infinis", "Unendliche Krabbelminentasche" },                                           ITEMTYPE_ITEM,              RG_BOMBCHU_INF,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_INF,                       RG_BOMBCHU_INF,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_INF].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
+    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "Bourse Infinie", "Unendliche Geldbörse" },                                                                 ITEMTYPE_ITEM,              RG_WALLET_INF,        true,  LOGIC_PROGRESSIVE_WALLET,           RHT_WALLET_INF,                        RG_WALLET_INF,                        OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+
+    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "Clé Squelette", "Skelettschlüssel" },                                                                         ITEMTYPE_ITEM,              GI_STONE_OF_AGONY,    true,  LOGIC_SKELETON_KEY,                 RHT_SKELETON_KEY,                      RG_SKELETON_KEY,                      OBJECT_GI_MAP,          GID_STONE_OF_AGONY,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
 
-    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "Sac de Bâton Mojo", "Deku-Stab-Tasche" },                                                                                 ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_NONE,                              RG_DEKU_STICK_BAG,                    OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "Sac de Bâton Mojo", "Deku-Stab-Tasche" },                                                                   ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_NONE,                              RG_DEKU_STICK_BAG,                    OBJECT_GI_STICK,        GID_STICK,            TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
-    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "Sac de Noix Mojo", "Deku-Nuß-Tasche" },                                                                                    ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NONE,                              RG_DEKU_NUT_BAG,                      OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "Sac de Noix Mojo", "Deku-Nuß-Tasche" },                                                                       ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_NONE,                              RG_DEKU_NUT_BAG,                      OBJECT_GI_NUTS,         GID_NUTS,             TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
 
     itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                                          ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                         RHT_NONE);
     itemTable[RG_HINT] =                                Item(RG_HINT,                             Text{ "Hint", "Indice", "Hinweis" },                                                                                                 ITEMTYPE_EVENT,             RG_HINT,              false, LOGIC_NONE,                         RHT_NONE);
@@ -368,29 +381,31 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_OCARINA_OF_TIME] =                     Item(RG_OCARINA_OF_TIME,                  Text{ "Ocarina of Time", "Ocarina du Temps", "Okarina der Zeit" },                                                                   ITEMTYPE_ITEM,              GI_OCARINA_OOT,       true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_OCARINA_OF_TIME,                   ITEM_OCARINA_TIME,                    OBJECT_GI_OCARINA,      GID_OCARINA_TIME,     0x3A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BOMB_BAG] =                            Item(RG_BOMB_BAG,                         Text{ "Bomb Bag", "Sac de Bombes", "Bombentasche" },                                                                                 ITEMTYPE_ITEM,              GI_BOMB_BAG_20,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BOMB_BAG,                          ITEM_BOMB_BAG_20,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_20,      0x58,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BIG_BOMB_BAG] =                        Item(RG_BIG_BOMB_BAG,                     Text{ "Big Bomb Bag", "Grand Sac de Bombes", "Große Bombentasche" },                                                                 ITEMTYPE_ITEM,              GI_BOMB_BAG_30,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BIG_BOMB_BAG,                      ITEM_BOMB_BAG_30,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_30,      0x59,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Größte Bombentasche" },                                                           ITEMTYPE_ITEM,              GI_BOMB_BAG_40,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BIGGEST_BOMB_BAG,                  ITEM_BOMB_BAG_40,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BOMB_BAG] =                    Item(RG_BIGGEST_BOMB_BAG,                 Text{ "Biggest Bomb Bag", "Énorme Sac de Bombes", "Riesen-Bombentasche" },                                                           ITEMTYPE_ITEM,              GI_BOMB_BAG_40,       true,  LOGIC_PROGRESSIVE_BOMB_BAG,         RHT_BIGGEST_BOMB_BAG,                  ITEM_BOMB_BAG_40,                     OBJECT_GI_BOMBPOUCH,    GID_BOMB_BAG_40,      0x5A,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_FAIRY_BOW] =                           Item(RG_FAIRY_BOW,                        Text{ "Fairy Bow", "Arc des Fées", "Feen-Bogen" },                                                                                   ITEMTYPE_ITEM,              GI_BOW,               true,  LOGIC_PROGRESSIVE_BOW,              RHT_FAIRY_BOW,                         ITEM_BOW,                             OBJECT_GI_BOW,          GID_BOW,              0x31,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_BIG_QUIVER] =                          Item(RG_BIG_QUIVER,                       Text{ "Big Quiver", "Grand carquois", "Großer Köcher" },                                                                             ITEMTYPE_ITEM,              GI_QUIVER_40,         true,  LOGIC_PROGRESSIVE_BOW,              RHT_BIG_QUIVER,                        ITEM_QUIVER_40,                       OBJECT_GI_ARROWCASE,    GID_QUIVER_40,        0x56,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Größter Köcher" },                                                                       ITEMTYPE_ITEM,              GI_QUIVER_50,         true,  LOGIC_PROGRESSIVE_BOW,              RHT_BIGGEST_QUIVER,                    ITEM_QUIVER_50,                       OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_QUIVER] =                      Item(RG_BIGGEST_QUIVER,                   Text{ "Biggest Quiver", "Énorme carquois", "Riesenköcher" },                                                                         ITEMTYPE_ITEM,              GI_QUIVER_50,         true,  LOGIC_PROGRESSIVE_BOW,              RHT_BIGGEST_QUIVER,                    ITEM_QUIVER_50,                       OBJECT_GI_ARROWCASE,    GID_QUIVER_50,        0x57,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_FAIRY_SLINGSHOT] =                     Item(RG_FAIRY_SLINGSHOT,                  Text{ "Fairy Slingshot", "Lance-Pierre des Fées", "Feen-Schleuder" },                                                                ITEMTYPE_ITEM,              GI_SLINGSHOT,         true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_FAIRY_SLINGSHOT,                   ITEM_SLINGSHOT,                       OBJECT_GI_PACHINKO,     GID_SLINGSHOT,        0x30,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Große Deku-Samentasche" },                                           ITEMTYPE_ITEM,              GI_BULLET_BAG_40,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIG_BULLET_BAG,                    ITEM_BULLET_BAG_40,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Größte Deku-Samentasche" },                                     ITEMTYPE_ITEM,              GI_BULLET_BAG_50,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIGGEST_BULLET_BAG,                ITEM_BULLET_BAG_50,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIG_BULLET_BAG] =                      Item(RG_BIG_BULLET_BAG,                   Text{ "Big Deku Seed Bullet Bag", "Grand sac de graines mojo", "Große Munitionstasche" },                                            ITEMTYPE_ITEM,              GI_BULLET_BAG_40,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIG_BULLET_BAG,                    ITEM_BULLET_BAG_40,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
+    itemTable[RG_BIGGEST_BULLET_BAG] =                  Item(RG_BIGGEST_BULLET_BAG,               Text{ "Biggest Deku Seed Bullet Bag", "Énorme sac de graines mojo", "Riesen-Munitionstasche" },                                      ITEMTYPE_ITEM,              GI_BULLET_BAG_50,     true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_BIGGEST_BULLET_BAG,                ITEM_BULLET_BAG_50,                   OBJECT_GI_DEKUPOUCH,    GID_BULLET_BAG,       0x07,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_GORONS_BRACELET] =                     Item(RG_GORONS_BRACELET,                  Text{ "Goron's Bracelet", "Bracelet Goron", "Goronen-Armband" },                                                                     ITEMTYPE_ITEM,              GI_BRACELET,          true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GORONS_BRACELET,                   ITEM_BRACELET,                        OBJECT_GI_BRACELET,     GID_BRACELET,         0x79,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Silberhandschuhe" },                                                                ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_SILVER_GAUNTLETS,                  ITEM_GAUNTLETS_SILVER,                OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Goldhandschuhe" },                                                                      ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GOLDEN_GAUNTLETS,                  ITEM_GAUNTLETS_GOLD,                  OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_SILVER_GAUNTLETS] =                    Item(RG_SILVER_GAUNTLETS,                 Text{ "Silver Gauntlets", "Gantelets d'argent", "Krafthandschuhe" },                                                                 ITEMTYPE_ITEM,              GI_GAUNTLETS_SILVER,  true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_SILVER_GAUNTLETS,                  ITEM_GAUNTLETS_SILVER,                OBJECT_GI_GLOVES,       GID_GAUNTLETS_SILVER, 0x5B,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_GAUNTLETS] =                    Item(RG_GOLDEN_GAUNTLETS,                 Text{ "Golden Gauntlets", "Gantelets d'or", "Titanhandschuhe" },                                                                     ITEMTYPE_ITEM,              GI_GAUNTLETS_GOLD,    true,  LOGIC_PROGRESSIVE_STRENGTH,         RHT_GOLDEN_GAUNTLETS,                  ITEM_GAUNTLETS_GOLD,                  OBJECT_GI_GLOVES,       GID_GAUNTLETS_GOLD,   0x5C,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_SILVER_SCALE] =                        Item(RG_SILVER_SCALE,                     Text{ "Silver Scale", "Écaille d'argent", "Silberne Schuppe" },                                                                      ITEMTYPE_ITEM,              GI_SCALE_SILVER,      true,  LOGIC_PROGRESSIVE_SCALE,            RHT_SILVER_SCALE,                      ITEM_SCALE_SILVER,                    OBJECT_GI_SCALE,        GID_SCALE_SILVER,     0xCD,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Schuppe" },                                                                           ITEMTYPE_ITEM,              GI_SCALE_GOLDEN,        true,  LOGIC_PROGRESSIVE_SCALE,            RHT_GOLDEN_SCALE,                      ITEM_SCALE_GOLDEN,                    OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Erwachsenengeldbörse" },                                                                     ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_ADULT_WALLET,                      ITEM_WALLET_ADULT,                    OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
-    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesige Geldbörse" },                                                                      ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_GIANT_WALLET,                      ITEM_WALLET_GIANT,                    OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GOLDEN_SCALE] =                        Item(RG_GOLDEN_SCALE,                     Text{ "Golden Scale", "Écaille d'or", "Goldene Schuppe" },                                                                           ITEMTYPE_ITEM,              GI_SCALE_GOLDEN,      true,  LOGIC_PROGRESSIVE_SCALE,            RHT_GOLDEN_SCALE,                      ITEM_SCALE_GOLDEN,                    OBJECT_GI_SCALE,        GID_SCALE_GOLDEN,     0xCE,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_ADULT_WALLET] =                        Item(RG_ADULT_WALLET,                     Text{ "Adult Wallet", "Grande Bourse", "Große Geldbörse" },                                                                          ITEMTYPE_ITEM,              GI_WALLET_ADULT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_ADULT_WALLET,                      ITEM_WALLET_ADULT,                    OBJECT_GI_PURSE,        GID_WALLET_ADULT,     0x5E,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
+    itemTable[RG_GIANT_WALLET] =                        Item(RG_GIANT_WALLET,                     Text{ "Giant Wallet", "Bourse de Géant", "Riesengeldbörse" },                                                                        ITEMTYPE_ITEM,              GI_WALLET_GIANT,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_GIANT_WALLET,                      ITEM_WALLET_GIANT,                    OBJECT_GI_PURSE,        GID_WALLET_GIANT,     0x5F,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_NONE);
     itemTable[RG_TYCOON_WALLET] =                       Item(RG_TYCOON_WALLET,                    Text{ "Tycoon Wallet", "Bourse de Magnat", "Goldene Geldbörse" },                                                                    ITEMTYPE_ITEM,              RG_TYCOON_WALLET,     true,  LOGIC_PROGRESSIVE_WALLET,           RHT_TYCOON_WALLET,                     RG_TYCOON_WALLET,                     OBJECT_GI_PURSE,        GID_WALLET_GIANT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Petite Bourse", "Kindergeldbörse" },                                                                        ITEMTYPE_ITEM,              RG_CHILD_WALLET,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_CHILD_WALLET,                      RG_CHILD_WALLET,                      OBJECT_GI_PURSE,        GID_WALLET_ADULT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Petite Bourse", "Kindergeldbörse" },                                                                          ITEMTYPE_ITEM,              RG_CHILD_WALLET,      true,  LOGIC_PROGRESSIVE_WALLET,           RHT_CHILD_WALLET,                      RG_CHILD_WALLET,                      OBJECT_GI_PURSE,        GID_WALLET_ADULT,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_DEKU_NUT_CAPACITY_30] =                Item(RG_DEKU_NUT_CAPACITY_30,             Text{ "Deku Nut Capacity (30)", "Capacité de noix Mojo (30)", "Deku-Nuß-Kapazität (30)" },                                           ITEMTYPE_ITEM,              GI_NUT_UPGRADE_30,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_DEKU_NUT_CAPACITY_30,              ITEM_NUT_UPGRADE_30,                  OBJECT_GI_NUTS,         GID_NUTS,             0xA7,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_DEKU_NUT_CAPACITY_40] =                Item(RG_DEKU_NUT_CAPACITY_40,             Text{ "Deku Nut Capacity (40)", "Capacité de noix Mojo (40)", "Deku-Nuß-Kapazität (40)" },                                           ITEMTYPE_ITEM,              GI_NUT_UPGRADE_40,    true,  LOGIC_PROGRESSIVE_NUT_BAG,          RHT_DEKU_NUT_CAPACITY_40,              ITEM_NUT_UPGRADE_40,                  OBJECT_GI_NUTS,         GID_NUTS,             0xA8,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_DEKU_STICK_CAPACITY_20] =              Item(RG_DEKU_STICK_CAPACITY_20,           Text{ "Deku Stick Capacity (20)", "Capacité de Bâtons Mojo (20)", "Deku-Stab-Kapazität (20)" },                                      ITEMTYPE_ITEM,              GI_STICK_UPGRADE_20,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_DEKU_STICK_CAPACITY_20,            ITEM_STICK_UPGRADE_20,                OBJECT_GI_STICK,        GID_STICK,            0x90,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
     itemTable[RG_DEKU_STICK_CAPACITY_30] =              Item(RG_DEKU_STICK_CAPACITY_30,           Text{ "Deku Stick Capacity (30)", "Capacité de Bâtons Mojo (30)", "Deku-Stab-Kapazität (30)" },                                      ITEMTYPE_ITEM,              GI_STICK_UPGRADE_30,  true,  LOGIC_PROGRESSIVE_STICK_BAG,        RHT_DEKU_STICK_CAPACITY_30,            ITEM_STICK_UPGRADE_30,                OBJECT_GI_STICK,        GID_STICK,            0x91,                        0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_LESSER, MOD_NONE);
-    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magisches Maß" },                                                                            ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_SINGLE,                      RG_MAGIC_SINGLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
-    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verbessertes Magisches Maß" },                                            ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_DOUBLE,                      RG_MAGIC_DOUBLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
-    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce-Fragment" },                                                                     ITEMTYPE_ITEM,              0xDF,                 true,  LOGIC_TRIFORCE_PIECES,              RHT_TRIFORCE_PIECE,                    RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_SINGLE] =                        Item(RG_MAGIC_SINGLE,                     Text{ "Magic Meter", "Jauge de Magie", "Magische Kraft" },                                                                           ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_SINGLE,                      RG_MAGIC_SINGLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_SMALL,      0xE4,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_MAGIC_DOUBLE] =                        Item(RG_MAGIC_DOUBLE,                     Text{ "Enhanced Magic Meter", "Jauge de Magie améliorée", "Verb. Magische Kraft" },                                                  ITEMTYPE_ITEM,              0x8A,                 true,  LOGIC_PROGRESSIVE_MAGIC,            RHT_MAGIC_DOUBLE,                      RG_MAGIC_DOUBLE,                      OBJECT_GI_MAGICPOT,     GID_MAGIC_LARGE,      0xE8,                        0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
+    itemTable[RG_TRIFORCE_PIECE] =                      Item(RG_TRIFORCE_PIECE,                   Text{ "Triforce Piece", "Triforce Piece", "Triforce-Splitter" },                                                                     ITEMTYPE_ITEM,              0xDF,                 true,  LOGIC_TRIFORCE_PIECES,              RHT_TRIFORCE_PIECE,                    RG_TRIFORCE_PIECE,                    OBJECT_GI_BOMB_2,       GID_TRIFORCE_PIECE,   TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+
+    // clang-format on
 
     // Init itemNameToEnum
     for (auto& item : itemTable) {
@@ -401,6 +416,7 @@ void Rando::StaticData::InitItemTable() {
         }
         itemNameToEnum[item.GetName().english] = item.GetRandomizerGet();
         itemNameToEnum[item.GetName().french] = item.GetRandomizerGet();
+        itemNameToEnum[item.GetName().german] = item.GetRandomizerGet();
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index 00e0366abb..f7587ec5e6 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -3,8 +3,10 @@
 #include "logic.h"
 
 namespace Rando {
-ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {}
-ItemLocation::ItemLocation(const RandomizerCheck rc_) : rc(rc_) {}
+ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {
+}
+ItemLocation::ItemLocation(const RandomizerCheck rc_) : rc(rc_) {
+}
 
 RandomizerCheck ItemLocation::GetRandomizerCheck() const {
     return rc;
@@ -40,14 +42,14 @@ RandomizerGet ItemLocation::GetPlacedRandomizerGet() const {
 
 void ItemLocation::SetPlacedItem(const RandomizerGet item) {
     placedItem = item;
-    SetPrice (StaticData::RetrieveItem(placedItem).GetPrice());
+    SetPrice(StaticData::RetrieveItem(placedItem).GetPrice());
 }
 
 void ItemLocation::SetDelayedItem(const RandomizerGet item) {
     delayedItem = item;
 }
 
-void ItemLocation::SaveDelayedItem () {
+void ItemLocation::SaveDelayedItem() {
     placedItem = delayedItem;
     delayedItem = RG_NONE;
 }
@@ -56,15 +58,16 @@ void ItemLocation::SetParentRegion(const RandomizerRegion region) {
     parentRegion = region;
 }
 
-//RANDOTODO only used in tracker now, could possibly be removed
+// RANDOTODO only used in tracker now, could possibly be removed
 RandomizerRegion ItemLocation::GetParentRegionKey() const {
     return parentRegion;
 }
 
 void ItemLocation::MergeAreas(std::set<RandomizerArea> newAreas) {
     areas.merge(newAreas);
-    if (areas.size() >= 2){
-        //if we have more than 1 area, remove any RA_NONE as that's not a real area. can happen if an entrance is in 2 regions and 1 is disconnected
+    if (areas.size() >= 2) {
+        // if we have more than 1 area, remove any RA_NONE as that's not a real area. can happen if an entrance is in 2
+        // regions and 1 is disconnected
         areas.erase(RA_NONE);
     }
 }
@@ -74,7 +77,7 @@ std::set<RandomizerArea> ItemLocation::GetAreas() const {
 }
 
 RandomizerArea ItemLocation::GetFirstArea() const {
-    if (areas.empty()){
+    if (areas.empty()) {
         assert(false);
         return RA_NONE;
     } else {
@@ -83,7 +86,7 @@ RandomizerArea ItemLocation::GetFirstArea() const {
 }
 
 RandomizerArea ItemLocation::GetRandomArea() const {
-    if (areas.empty()){
+    if (areas.empty()) {
         SPDLOG_DEBUG("Attempted to get random area of location with no areas: ");
         SPDLOG_DEBUG(Rando::StaticData::GetLocation(rc)->GetName());
         assert(false);
@@ -102,7 +105,7 @@ void ItemLocation::ApplyPlacedItemEffect() const {
 }
 
 uint16_t ItemLocation::GetPrice() const {
-    //RANDOTODO if we ever change price of shop items, this needs replacing with proper price assignment in Fill
+    // RANDOTODO if we ever change price of shop items, this needs replacing with proper price assignment in Fill
     if (StaticData::RetrieveItem(placedItem).GetItemType() == ITEMTYPE_SHOP) {
         return StaticData::RetrieveItem(placedItem).GetPrice();
     }
@@ -167,7 +170,7 @@ const std::vector<RandomizerHint>& ItemLocation::GetHintedBy() const {
 
 void ItemLocation::AddHintedBy(const RandomizerHint hintKey) {
     hintedBy.push_back(hintKey);
-} 
+}
 
 bool ItemLocation::IsHidden() const {
     return hidden;
@@ -194,7 +197,6 @@ bool ItemLocation::IsVisible() const {
 }
 void ItemLocation::SetVisible(const bool visibleInImGui_) {
     visibleInImGui = visibleInImGui_;
-
 }
 
 bool ItemLocation::IsWothCandidate() const {
@@ -228,5 +230,14 @@ void ItemLocation::ResetVariables() {
     areas = {};
     status = RCSHOW_UNCHECKED;
     isSkipped = false;
+    isAvailable = false;
 }
-}
\ No newline at end of file
+
+bool ItemLocation::IsAvailable() const {
+    return isAvailable;
+}
+
+void ItemLocation::SetAvailable(bool isAvailable_) {
+    isAvailable = isAvailable_;
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 142ac1c0b5..a04f5c2cf9 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -21,11 +21,11 @@ class ItemLocation {
     RandomizerGet& RefPlacedItem();
     void SetDelayedItem(RandomizerGet item);
     RandomizerRegion GetParentRegionKey() const;
-    void SetParentRegion (RandomizerRegion region);
+    void SetParentRegion(RandomizerRegion region);
     std::set<RandomizerArea> GetAreas() const;
     RandomizerArea GetFirstArea() const;
     RandomizerArea GetRandomArea() const;
-    void MergeAreas (std::set<RandomizerArea> newAreas);
+    void MergeAreas(std::set<RandomizerArea> newAreas);
     void PlaceVanillaItem();
     void ApplyPlacedItemEffect() const;
     void SaveDelayedItem();
@@ -56,6 +56,8 @@ class ItemLocation {
     bool IsFoolishCandidate() const;
     void SetBarrenCandidate();
     void ResetVariables();
+    bool IsAvailable() const;
+    void SetAvailable(bool isAvailable_);
 
   private:
     RandomizerCheck rc;
@@ -76,5 +78,6 @@ class ItemLocation {
     bool barrenCandidate = false;
     RandomizerCheckStatus status = RCSHOW_UNCHECKED;
     bool isSkipped = false;
+    bool isAvailable = false;
 };
 } // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/item_override.cpp b/soh/soh/Enhancements/randomizer/item_override.cpp
index 58789c579a..cc25c8836a 100644
--- a/soh/soh/Enhancements/randomizer/item_override.cpp
+++ b/soh/soh/Enhancements/randomizer/item_override.cpp
@@ -3,9 +3,11 @@
 #include <utility>
 
 namespace Rando {
-ItemOverride::ItemOverride() : mLocation(RC_UNKNOWN_CHECK), mLooksLike(RG_NONE) {}
+ItemOverride::ItemOverride() : mLocation(RC_UNKNOWN_CHECK), mLooksLike(RG_NONE) {
+}
 ItemOverride::ItemOverride(const RandomizerCheck location, const RandomizerGet looksLike)
-    : mLocation(location), mLooksLike(looksLike) {}
+    : mLocation(location), mLooksLike(looksLike) {
+}
 
 RandomizerCheck ItemOverride::GetLocation() const {
     return mLocation;
diff --git a/soh/soh/Enhancements/randomizer/item_override.h b/soh/soh/Enhancements/randomizer/item_override.h
index 98a1f3d42b..355d1e51e1 100644
--- a/soh/soh/Enhancements/randomizer/item_override.h
+++ b/soh/soh/Enhancements/randomizer/item_override.h
@@ -14,7 +14,8 @@ class ItemOverride {
     RandomizerGet LooksLike() const;
     RandomizerGet& RefLooksLike();
     Text& GetTrickName();
-    void SetTrickName (Text trickName);
+    void SetTrickName(Text trickName);
+
   private:
     RandomizerCheck mLocation;
     RandomizerGet mLooksLike;
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index f5c78884ba..f474397aa4 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -252,144 +252,339 @@ RandomizerCheckArea GetAreaFromScene(uint8_t scene) {
     }
 }
 
-
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                      std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem,
-                    isVanillaCompletion_, collectionCheck, vanillaPrice_ };
-}
-
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                      int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck, vanillaPrice_ };
-}
-
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                      std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                      std::string&& spoilerName_, const RandomizerHintTextKey hintKey,
+                                      const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
                                       bool isVanillaCompletion_, uint16_t vanillaPrice_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck , vanillaPrice_ };
+    return { rc,
+             quest_,
+             checkType_,
+             GetAreaFromScene(scene_),
+             actorId_,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             std::move(spoilerName_),
+             hintKey,
+             vanillaItem,
+             isVanillaCompletion_,
+             collectionCheck,
+             vanillaPrice_ };
 }
 
-Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                      int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
-                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_, uint16_t vanillaPrice_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck, vanillaPrice_  };
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                      std::string&& shortName_, std::string&& spoilerName_,
+                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_,
+                                      uint16_t vanillaPrice_) {
+    return { rc,
+             quest_,
+             checkType_,
+             area_,
+             actorId_,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             std::move(spoilerName_),
+             hintKey,
+             vanillaItem,
+             isVanillaCompletion_,
+             collectionCheck,
+             vanillaPrice_ };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                       uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                      const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                      SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_,
+                                      uint16_t vanillaPrice_) {
+    return { rc,           quest_,      checkType_,           GetAreaFromScene(scene_),
+             actorId_,     scene_,      actorParams_,         std::move(shortName_),
+             hintKey,      vanillaItem, isVanillaCompletion_, collectionCheck,
+             vanillaPrice_ };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+Rando::Location Rando::Location::Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                      RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                      std::string&& shortName_, const RandomizerHintTextKey hintKey,
+                                      const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                                      bool isVanillaCompletion_, uint16_t vanillaPrice_) {
+    return { rc,           quest_,      checkType_,           area_,
+             actorId_,     scene_,      actorParams_,         std::move(shortName_),
+             hintKey,      vanillaItem, isVanillaCompletion_, collectionCheck,
+             vanillaPrice_ };
+}
+
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                                       std::string&& shortName_, const RandomizerHintTextKey hintKey,
+                                       const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
+    return { rc,       quest_,      checkType_,           GetAreaFromScene(scene_),
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
+}
+
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                       int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                       const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                        bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
+    return { rc,       quest_,      checkType_,           area_,
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, SpoilerCollectionCheck(SPOILER_CHK_CHEST, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                       std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
-                                       bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
-}
-
-Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                       int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                       const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                        SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+    return { rc,       quest_,      checkType_,           GetAreaFromScene(scene_),
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                             uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_) };
+Rando::Location Rando::Location::Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                       RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
+                                       int32_t actorParams_, std::string&& shortName_,
+                                       const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+                                       SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
+    return { rc,       quest_,      checkType_,           area_,
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                             int32_t actorParams_, uint8_t flag_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_,
+                                             int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                              bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_,
-                    SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_) };
+    return {
+        rc,       quest_,      checkType_,           GetAreaFromScene(scene_),
+        actorId_, scene_,      actorParams_,         std::move(shortName_),
+        hintKey,  vanillaItem, isVanillaCompletion_, SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_)
+    };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                             std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
-                                             bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                                             std::string&& shortName_, const RandomizerHintTextKey hintKey,
+                                             const RandomizerGet vanillaItem, bool isVanillaCompletion_) {
+    return {
+        rc,       quest_,      checkType_,           area_,
+        actorId_, scene_,      actorParams_,         std::move(shortName_),
+        hintKey,  vanillaItem, isVanillaCompletion_, SpoilerCollectionCheck(SPOILER_CHK_COLLECTABLE, scene_, flag_)
+    };
 }
 
-Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                             int32_t actorParams_, std::string&& shortName_, const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_,
+                                             int32_t actorParams_, std::string&& shortName_,
+                                             const RandomizerHintTextKey hintKey, const RandomizerGet vanillaItem,
                                              SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_) {
-    return { rc, quest_, checkType_, area_, actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, isVanillaCompletion_, collectionCheck };
+    return { rc,       quest_,      checkType_,           GetAreaFromScene(scene_),
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, collectionCheck };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+Rando::Location Rando::Location::Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_,
+                                             RandomizerCheckType checkType_, RandomizerCheckArea area_,
+                                             ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                             std::string&& shortName_, const RandomizerHintTextKey hintKey,
+                                             const RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+                                             bool isVanillaCompletion_) {
+    return { rc,       quest_,      checkType_,           area_,
+             actorId_, scene_,      actorParams_,         std::move(shortName_),
+             hintKey,  vanillaItem, isVanillaCompletion_, collectionCheck };
+}
+
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_,
+                                         int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                                          const RandomizerHintTextKey hintKey) {
-    return { rc, quest_, RCTYPE_SKULL_TOKEN, GetAreaFromScene(scene_), ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_) };
+    return { rc,
+             quest_,
+             RCTYPE_SKULL_TOKEN,
+             GetAreaFromScene(scene_),
+             ACTOR_EN_SI,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             hintKey,
+             RG_GOLD_SKULLTULA_TOKEN,
+             true,
+             SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_,
+                                         int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                                          const RandomizerHintTextKey hintKey, const uint8_t skullScene_) {
-    return { rc, quest_, RCTYPE_SKULL_TOKEN, GetAreaFromScene(scene_), ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
+    return { rc,
+             quest_,
+             RCTYPE_SKULL_TOKEN,
+             GetAreaFromScene(scene_),
+             ACTOR_EN_SI,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             hintKey,
+             RG_GOLD_SKULLTULA_TOKEN,
+             true,
+             SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
 }
 
-Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
-                                         std::string&& shortName_, const RandomizerHintTextKey hintKey, const uint8_t skullScene_) {
-    return { rc, quest_, RCTYPE_SKULL_TOKEN, area_, ACTOR_EN_SI, scene_, actorParams_, std::move(shortName_), hintKey, RG_GOLD_SKULLTULA_TOKEN, true,
-                    SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
+Rando::Location Rando::Location::GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+                                         const RandomizerHintTextKey hintKey, const uint8_t skullScene_) {
+    return { rc,
+             quest_,
+             RCTYPE_SKULL_TOKEN,
+             area_,
+             ACTOR_EN_SI,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             hintKey,
+             RG_GOLD_SKULLTULA_TOKEN,
+             true,
+             SpoilerCollectionCheck(SPOILER_CHK_GOLD_SKULLTULA, skullScene_, flag_) };
 }
 
-Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_,
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                           ActorID actorId_, SceneID scene_, std::string&& shortName_,
                                            std::string&& spoilerName_) {
-    return { rc, quest_, RCTYPE_STATIC_HINT, area_, actorId_, scene_, 0x00, std::move(shortName_), std::move(spoilerName_), RHT_NONE, RG_NONE, false };
+    return { rc,
+             quest_,
+             RCTYPE_STATIC_HINT,
+             area_,
+             actorId_,
+             scene_,
+             0x00,
+             std::move(shortName_),
+             std::move(spoilerName_),
+             RHT_NONE,
+             RG_NONE,
+             false };
 }
 
-Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, std::string&& shortName_) {
-    return { rc, quest_, RCTYPE_STATIC_HINT, GetAreaFromScene(scene_), actorId_, scene_, 0x00, std::move(shortName_), RHT_NONE, RG_NONE, false };
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_,
+                                           SceneID scene_, std::string&& shortName_) {
+    return { rc,
+             quest_,
+             RCTYPE_STATIC_HINT,
+             GetAreaFromScene(scene_),
+             actorId_,
+             scene_,
+             0x00,
+             std::move(shortName_),
+             RHT_NONE,
+             RG_NONE,
+             false };
 }
 
-Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_) {
-    return { rc, quest_, RCTYPE_STATIC_HINT, area_, actorId_, scene_, 0x00, std::move(shortName_), RHT_NONE, RG_NONE, false };
+Rando::Location Rando::Location::OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                           ActorID actorId_, SceneID scene_, std::string&& shortName_) {
+    return { rc,      quest_, RCTYPE_STATIC_HINT, area_, actorId_, scene_, 0x00, std::move(shortName_), RHT_NONE,
+             RG_NONE, false };
 }
 
-Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
-    return { rc, quest_, RCTYPE_GOSSIP_STONE, GetAreaFromScene(scene_), ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_,
+                                           int32_t actorParams_, std::string&& shortName_) {
+    return { rc,
+             quest_,
+             RCTYPE_GOSSIP_STONE,
+             GetAreaFromScene(scene_),
+             ACTOR_EN_GS,
+             scene_,
+             actorParams_,
+             std::move(shortName_),
+             RHT_NONE,
+             RG_NONE,
+             false };
 }
 
-Rando::Location Rando::Location::Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, int32_t actorParams_, RandomizerInf flag_,
-                                      std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem) {
-    return {rc, quest_, RCTYPE_FISH, GetAreaFromScene(scene_), actorId_, scene_, actorParams_, std::move(shortName_), hintKey, vanillaItem, false,
-            SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, scene_, flag_)};
+Rando::Location Rando::Location::Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_,
+                                      int32_t actorParams_, RandomizerInf flag_, std::string&& shortName_,
+                                      RandomizerHintTextKey hintKey, RandomizerGet vanillaItem) {
+    return { rc,       quest_,      RCTYPE_FISH,  GetAreaFromScene(scene_),
+             actorId_, scene_,      actorParams_, std::move(shortName_),
+             hintKey,  vanillaItem, false,        SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, scene_, flag_) };
 }
 
-Rando::Location Rando::Location::GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, int32_t actorParams_, RandomizerInf flag_,
-                                      std::string&& shortName_, RandomizerHintTextKey hintKey) {
-    return {rc, quest_, RCTYPE_FISH, area_, ACTOR_EN_FISH, SCENE_GROTTOS, actorParams_, std::move(shortName_), hintKey, RG_FISH, false,
-            SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, SCENE_GROTTOS, flag_)};
+Rando::Location Rando::Location::GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                            int32_t actorParams_, RandomizerInf flag_, std::string&& shortName_,
+                                            RandomizerHintTextKey hintKey) {
+    return { rc,
+             quest_,
+             RCTYPE_FISH,
+             area_,
+             ACTOR_EN_FISH,
+             SCENE_GROTTOS,
+             actorParams_,
+             std::move(shortName_),
+             hintKey,
+             RG_FISH,
+             false,
+             SpoilerCollectionCheck(SPOILER_CHK_RANDOMIZER_INF, SCENE_GROTTOS, flag_) };
 }
 
 Rando::Location Rando::Location::Pot(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
                                      SceneID scene_, int32_t actorParams_, std::string&& shortName_,
-                                     std::string&& spoilerName_, RandomizerHintTextKey hintKey,
-                                     RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck) {
-    return {rc, quest_, RCTYPE_POT, area_, ACTOR_OBJ_TSUBO, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, vanillaItem, false,
-            collectionCheck };
+                                     RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                     SpoilerCollectionCheck collectionCheck) {
+    return {
+        rc,      quest_,      RCTYPE_POT, area_,          ACTOR_OBJ_TSUBO, scene_, actorParams_, std::move(shortName_),
+        hintKey, vanillaItem, false,      collectionCheck
+    };
 }
 
-Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
-    return { rc, quest_, RCTYPE_GOSSIP_STONE, area_, ACTOR_EN_GS, scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE, false };
+Rando::Location Rando::Location::Crate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                       SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                       RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                       SpoilerCollectionCheck collectionCheck) {
+    return { rc,     quest_,         RCTYPE_CRATE,          area_,   ACTOR_OBJ_KIBAKO2,
+             scene_, actorParams_,   std::move(shortName_), hintKey, vanillaItem,
+             false,  collectionCheck };
 }
 
-Rando::Location Rando::Location::Fairy(RandomizerCheck rc, RandomizerCheckQuest quest_,
-                                        RandomizerCheckArea area_, SceneID scene_,
-                                        int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_,
-                                        RandomizerHintTextKey hintKey, SpoilerCollectionCheck collectionCheck) {
-    return {rc, quest_, RCTYPE_FAIRY, area_, ACTOR_EN_ELF, scene_, actorParams_, std::move(shortName_), std::move(spoilerName_), hintKey, RG_NONE, false, collectionCheck};
+Rando::Location Rando::Location::NLCrate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                         SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                         SpoilerCollectionCheck collectionCheck) {
+    return { rc,     quest_,         RCTYPE_NLCRATE,        area_,   ACTOR_OBJ_KIBAKO2,
+             scene_, actorParams_,   std::move(shortName_), hintKey, vanillaItem,
+             false,  collectionCheck };
+}
+
+Rando::Location Rando::Location::SmallCrate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                            SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                            RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                            SpoilerCollectionCheck collectionCheck) {
+    return { rc,     quest_,         RCTYPE_SMALL_CRATE,    area_,   ACTOR_OBJ_KIBAKO,
+             scene_, actorParams_,   std::move(shortName_), hintKey, vanillaItem,
+             false,  collectionCheck };
+}
+
+Rando::Location Rando::Location::HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                           SceneID scene_, int32_t actorParams_, std::string&& shortName_) {
+    return { rc,     quest_,       RCTYPE_GOSSIP_STONE,   area_,    ACTOR_EN_GS,
+             scene_, actorParams_, std::move(shortName_), RHT_NONE, RG_NONE,
+             false };
+}
+
+Rando::Location Rando::Location::Fairy(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                       SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                       RandomizerHintTextKey hintKey, SpoilerCollectionCheck collectionCheck) {
+    return { rc,      quest_,  RCTYPE_FAIRY, area_,          ACTOR_EN_ELF, scene_, actorParams_, std::move(shortName_),
+             hintKey, RG_NONE, false,        collectionCheck };
+}
+
+Rando::Location Rando::Location::Grass(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                                       SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                       RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                       SpoilerCollectionCheck collectionCheck) {
+    return { rc,     quest_,         RCTYPE_GRASS,          area_,   ACTOR_EN_KUSA,
+             scene_, actorParams_,   std::move(shortName_), hintKey, vanillaItem,
+             false,  collectionCheck };
 }
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index bd96c3ae13..f994996524 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -20,7 +20,9 @@ class SpoilerCollectionCheck {
     uint16_t flag = 0;
 
     SpoilerCollectionCheck() = default;
-    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint16_t flag_) : type(type_), scene(scene_), flag(flag_) {}
+    SpoilerCollectionCheck(const SpoilerCollectionCheckType type_, const uint8_t scene_, const uint16_t flag_)
+        : type(type_), scene(scene_), flag(flag_) {
+    }
 
     static auto ItemGetInf(const uint8_t slot) {
         return SpoilerCollectionCheck(SPOILER_CHK_ITEM_GET_INF, 0x00, slot);
@@ -49,46 +51,52 @@ class SpoilerCollectionCheck {
 
 class Location {
   public:
-  //RANDOTODO fix wacky ordering
-    Location() : rc(RC_UNKNOWN_CHECK), quest(RCQUEST_BOTH), checkType(RCTYPE_STANDARD), area(RCAREA_INVALID), actorId(ACTOR_ID_MAX), scene(SCENE_ID_MAX), actorParams(0),
-                 hintKey(RHT_NONE), vanillaItem(RG_NONE), isVanillaCompletion(false), collectionCheck(SpoilerCollectionCheck()) {}
+    // RANDOTODO fix wacky ordering
+    Location()
+        : rc(RC_UNKNOWN_CHECK), quest(RCQUEST_BOTH), checkType(RCTYPE_STANDARD), area(RCAREA_INVALID),
+          actorId(ACTOR_ID_MAX), scene(SCENE_ID_MAX), actorParams(0), hintKey(RHT_NONE), vanillaItem(RG_NONE),
+          isVanillaCompletion(false), collectionCheck(SpoilerCollectionCheck()) {
+    }
 
-    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
-             const SceneID scene_, const int32_t actorParams_, std::string shortName_, std::string spoilerName_, const RandomizerHintTextKey hintKey_,
-             const RandomizerGet vanillaItem_, const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
-             const int vanillaPrice_ = 0)
-        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_),
-          scene(scene_), actorParams(actorParams_), shortName(std::move(shortName_)),
-          spoilerName(std::move(spoilerName_)), hintKey(hintKey_), vanillaItem(vanillaItem_),
-          isVanillaCompletion(isVanillaCompletion_), collectionCheck(collectionCheck_), vanillaPrice(vanillaPrice_) {
-            if (spoilerName.length() < 23) {
-                excludedOption = LocationOption(rc, spoilerName);
-            } else {
-                const size_t lastSpace = spoilerName.rfind(' ', 23);
-                std::string settingText = spoilerName;
-                settingText.replace(lastSpace, 1, "\n ");
-
-                excludedOption = LocationOption(rc, spoilerName);
-            }
-        }
-
-    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_, const RandomizerCheckArea area_, const ActorID actorId_,
-             const SceneID scene_, const int32_t actorParams_, std::string shortName_, const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_,
-             const bool isVanillaCompletion_ = false, const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(),
-             const int vanillaPrice_ = 0)
-        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_), scene(scene_), actorParams(actorParams_), shortName(shortName_),
-          spoilerName(SpoilerNameFromShortName(shortName_, area_)), hintKey(hintKey_), vanillaItem(vanillaItem_), isVanillaCompletion(isVanillaCompletion_),
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
+             const RandomizerCheckArea area_, const ActorID actorId_, const SceneID scene_, const int32_t actorParams_,
+             std::string shortName_, std::string spoilerName_, const RandomizerHintTextKey hintKey_,
+             const RandomizerGet vanillaItem_, const bool isVanillaCompletion_ = false,
+             const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(), const int vanillaPrice_ = 0)
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_), scene(scene_),
+          actorParams(actorParams_), shortName(std::move(shortName_)), spoilerName(std::move(spoilerName_)),
+          hintKey(hintKey_), vanillaItem(vanillaItem_), isVanillaCompletion(isVanillaCompletion_),
           collectionCheck(collectionCheck_), vanillaPrice(vanillaPrice_) {
-            if (spoilerName.length() < 23) {
-                excludedOption = LocationOption(rc, spoilerName);
-            } else {
-                const size_t lastSpace = spoilerName.rfind(' ', 23);
-                std::string settingText = spoilerName;
-                settingText.replace(lastSpace, 1, "\n ");
+        if (spoilerName.length() < 23) {
+            excludedOption = LocationOption(rc, spoilerName);
+        } else {
+            const size_t lastSpace = spoilerName.rfind(' ', 23);
+            std::string settingText = spoilerName;
+            settingText.replace(lastSpace, 1, "\n ");
 
-                excludedOption = LocationOption(rc, spoilerName);
-            }
+            excludedOption = LocationOption(rc, spoilerName);
         }
+    }
+
+    Location(const RandomizerCheck rc_, const RandomizerCheckQuest quest_, const RandomizerCheckType checkType_,
+             const RandomizerCheckArea area_, const ActorID actorId_, const SceneID scene_, const int32_t actorParams_,
+             std::string shortName_, const RandomizerHintTextKey hintKey_, const RandomizerGet vanillaItem_,
+             const bool isVanillaCompletion_ = false,
+             const SpoilerCollectionCheck collectionCheck_ = SpoilerCollectionCheck(), const int vanillaPrice_ = 0)
+        : rc(rc_), quest(quest_), checkType(checkType_), area(area_), actorId(actorId_), scene(scene_),
+          actorParams(actorParams_), shortName(shortName_), spoilerName(SpoilerNameFromShortName(shortName_, area_)),
+          hintKey(hintKey_), vanillaItem(vanillaItem_), isVanillaCompletion(isVanillaCompletion_),
+          collectionCheck(collectionCheck_), vanillaPrice(vanillaPrice_) {
+        if (spoilerName.length() < 23) {
+            excludedOption = LocationOption(rc, spoilerName);
+        } else {
+            const size_t lastSpace = spoilerName.rfind(' ', 23);
+            std::string settingText = spoilerName;
+            settingText.replace(lastSpace, 1, "\n ");
+
+            excludedOption = LocationOption(rc, spoilerName);
+        }
+    }
 
     static std::string SpoilerNameFromShortName(std::string shortName, RandomizerCheckArea area) {
         if (area < 0 || area >= RCAREA_INVALID) {
@@ -119,98 +127,143 @@ class Location {
     int16_t GetVanillaPrice() const;
     Option* GetExcludedOption();
 
-        static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
-                             ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
-                             std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                             SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
-                             bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
-
-    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                         std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                         std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
                          bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
-    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                         int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                         bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
-    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                         int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                         std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey,
+                         RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                         bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
-    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                          int32_t actorParams_, uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
+    static Location Base(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                         RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                         std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                         SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                         bool isVanillaCompletion_ = false, uint16_t vanillaPrice_ = 0);
 
-    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                          RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                          uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                          RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
+
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                          RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                          SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_ = false);
+
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                          ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
                           bool isVanillaCompletion_ = false);
 
-    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
-                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
+    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                          ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                          RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                          SpoilerCollectionCheck collectionCheck, bool isVanillaCompletion_ = false);
 
-    static Location Chest(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                          std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck,
-                          bool isVanillaCompletion_ = false);
-
-    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
-                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
-
-    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_,
-                                int32_t actorParams_, uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                ActorID actorId_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
+                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
                                 bool isVanillaCompletion_ = false);
 
-    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                                RandomizerGet vanillaItem, bool isVanillaCompletion_ = false);
+
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                ActorID actorId_, SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                                RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
                                 bool isVanillaCompletion_ = false);
 
-    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_, RandomizerCheckArea area_, ActorID actorId_,
-                                SceneID scene_, int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(), bool isVanillaCompletion_ = false);
+    static Location Collectable(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckType checkType_,
+                                RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
+                                std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                                SpoilerCollectionCheck collectionCheck = SpoilerCollectionCheck(),
+                                bool isVanillaCompletion_ = false);
 
-    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
-                            RandomizerHintTextKey hintKey);
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_,
+                            uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey);
 
     /// @brief For certain scenes, the sceneId and the "Scene" in spoiler collection check later used to check the
-    /// GS flags don't necessarily match. Use this constructor (or the next one) for those. scene_ should be the actual scene where
-    /// the GS is located, skullScene_ is the value passed to GET_GS_FLAGS to get the correct skulltula. It is normal
-    /// and expected that these don't always match, and the naming is a holdover from 3drando.
-    /// @param rc 
-    /// @param quest_ 
-    /// @param scene_ 
-    /// @param actorParams_ 
-    /// @param flag_ 
-    /// @param shortName_ 
-    /// @param hintKey 
-    /// @param skullScene_ 
+    /// GS flags don't necessarily match. Use this constructor (or the next one) for those. scene_ should be the actual
+    /// scene where the GS is located, skullScene_ is the value passed to GET_GS_FLAGS to get the correct skulltula. It
+    /// is normal and expected that these don't always match, and the naming is a holdover from 3drando.
+    /// @param rc
+    /// @param quest_
+    /// @param scene_
+    /// @param actorParams_
+    /// @param flag_
+    /// @param shortName_
+    /// @param hintKey
+    /// @param skullScene_
     /// @return
-    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_,
+                            uint8_t flag_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                            uint8_t skullScene_);
+
+    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
+                            int32_t actorParams_, uint8_t flag_, std::string&& shortName_,
                             RandomizerHintTextKey hintKey, uint8_t skullScene_);
 
-    static Location GSToken(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, uint8_t flag_,
-                            std::string&& shortName_, RandomizerHintTextKey hintKey, uint8_t skullScene_);
+    static Location Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_,
+                         int32_t actorParams_, RandomizerInf flag_, std::string&& shortName_,
+                         RandomizerHintTextKey hintKey, RandomizerGet vanillaItem);
 
-    static Location Fish(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, int32_t actorParams_,
-                         RandomizerInf flag_, std::string&& shortName_, RandomizerHintTextKey hintKey, RandomizerGet vanillaItem);
-
-    static Location GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, int32_t actorParams_,
-                         RandomizerInf flag_, std::string&& shortName_, RandomizerHintTextKey hintKey);
+    static Location GrottoFish(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                               int32_t actorParams_, RandomizerInf flag_, std::string&& shortName_,
+                               RandomizerHintTextKey hintKey);
 
     static Location Pot(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
-                        int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_,
-                        RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
-                        SpoilerCollectionCheck collectionCheck);
+                        int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                        RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck);
 
-    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_,
-                              std::string&& spoilerName_);
+    static Location Grass(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
+                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                          RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck);
 
-    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_, std::string&& shortName_);
+    static Location Crate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
+                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                          RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck);
 
-    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, ActorID actorId_, SceneID scene_, std::string&& shortName_);
+    static Location NLCrate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
+                            int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                            RandomizerGet vanillaItem, SpoilerCollectionCheck collectionCheck);
 
-    static Location Fairy(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_, std::string&& spoilerName_, RandomizerHintTextKey hintKey, SpoilerCollectionCheck collectionCheck);
+    static Location SmallCrate(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                               SceneID scene_, int32_t actorParams_, std::string&& shortName_,
+                               RandomizerHintTextKey hintKey, RandomizerGet vanillaItem,
+                               SpoilerCollectionCheck collectionCheck);
 
-    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_, std::string&& shortName_);
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                              ActorID actorId_, SceneID scene_, std::string&& shortName_, std::string&& spoilerName_);
 
-    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_, int32_t actorParams_, std::string&& shortName_);
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, ActorID actorId_, SceneID scene_,
+                              std::string&& shortName_);
+
+    static Location OtherHint(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                              ActorID actorId_, SceneID scene_, std::string&& shortName_);
+
+    static Location Fairy(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_, SceneID scene_,
+                          int32_t actorParams_, std::string&& shortName_, RandomizerHintTextKey hintKey,
+                          SpoilerCollectionCheck collectionCheck);
+
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, SceneID scene_, int32_t actorParams_,
+                              std::string&& shortName_);
+
+    static Location HintStone(RandomizerCheck rc, RandomizerCheckQuest quest_, RandomizerCheckArea area_,
+                              SceneID scene_, int32_t actorParams_, std::string&& shortName_);
 
   private:
     RandomizerCheck rc;
diff --git a/soh/soh/Enhancements/randomizer/location_access.cpp b/soh/soh/Enhancements/randomizer/location_access.cpp
index a45e27cd03..2fb04dccdb 100644
--- a/soh/soh/Enhancements/randomizer/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access.cpp
@@ -10,15 +10,21 @@
 #include "soh/Enhancements/debugger/performanceTimer.h"
 
 #include <fstream>
+#include <soh/OTRGlobals.h>
 
-//generic grotto event list
+#include "3drando/shops.hpp"
+extern "C" {
+extern PlayState* gPlayState;
+}
+
+// generic grotto event list
 std::vector<EventAccess> grottoEvents;
 
-//set the logic to be a specific age and time of day and see if the condition still holds
+// set the logic to be a specific age and time of day and see if the condition still holds
 bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
     logic->IsChild = false;
     logic->IsAdult = false;
-    logic->AtDay   = false;
+    logic->AtDay = false;
     logic->AtNight = false;
 
     time = true;
@@ -27,31 +33,84 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
     return GetConditionsMet();
 }
 
-bool LocationAccess::ConditionsMet(Region* parentRegion) const {
-    //WARNING enterance validation can run this after resetting the access for sphere 0 validation
-    //When refactoring ToD access, either fix the above or do not assume that we
-    //have any access at all just because this is being run
+bool LocationAccess::ConditionsMet(Region* parentRegion, bool calculatingAvailableChecks) const {
+    // WARNING enterance validation can run this after resetting the access for sphere 0 validation
+    // When refactoring ToD access, either fix the above or do not assume that we
+    // have any access at all just because this is being run
     bool conditionsMet = false;
 
-    if (
-        (parentRegion->childDay   && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay))   ||
+    if ((parentRegion->childDay && CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) ||
         (parentRegion->childNight && CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) ||
-        (parentRegion->adultDay   && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay))   ||
-        (parentRegion->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))
-    ) {
+        (parentRegion->adultDay && CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) ||
+        (parentRegion->adultNight && CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))) {
         conditionsMet = true;
     }
 
-    return conditionsMet && CanBuy();
+    return conditionsMet && CanBuy(calculatingAvailableChecks);
 }
 
-bool LocationAccess::CanBuy() const {
-    return CanBuyAnother(location);
+static uint16_t GetMinimumPrice(const Rando::Location* loc) {
+    extern PriceSettingsStruct shopsanityPrices;
+    extern PriceSettingsStruct scrubPrices;
+    extern PriceSettingsStruct merchantPrices;
+    PriceSettingsStruct priceSettings = loc->GetRCType() == RCTYPE_SHOP    ? shopsanityPrices
+                                        : loc->GetRCType() == RCTYPE_SCRUB ? scrubPrices
+                                                                           : merchantPrices;
+
+    auto ctx = Rando::Context::GetInstance();
+    switch (ctx->GetOption(priceSettings.main).Get()) {
+        case RO_PRICE_VANILLA:
+            return loc->GetVanillaPrice();
+        case RO_PRICE_CHEAP_BALANCED:
+            return 0;
+        case RO_PRICE_BALANCED:
+            return 0;
+        case RO_PRICE_FIXED:
+            return ctx->GetOption(priceSettings.fixedPrice).Get() * 5;
+        case RO_PRICE_RANGE: {
+            uint16_t range1 = ctx->GetOption(priceSettings.range1).Get() * 5;
+            uint16_t range2 = ctx->GetOption(priceSettings.range1).Get() * 5;
+            return range1 < range2 ? range1 : range2;
+        }
+        case RO_PRICE_SET_BY_WALLET: {
+            if (ctx->GetOption(priceSettings.noWallet).Get()) {
+                return 0;
+            } else if (ctx->GetOption(priceSettings.childWallet).Get()) {
+                return 1;
+            } else if (ctx->GetOption(priceSettings.adultWallet).Get()) {
+                return 100;
+            } else if (ctx->GetOption(priceSettings.giantWallet).Get()) {
+                return 201;
+            } else {
+                return 501;
+            }
+        }
+        default:
+            return 0;
+    }
+}
+
+bool LocationAccess::CanBuy(bool calculatingAvailableChecks) const {
+    const auto& loc = Rando::StaticData::GetLocation(location);
+    const auto& itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(location);
+
+    if (loc->GetRCType() == RCTYPE_SHOP || loc->GetRCType() == RCTYPE_SCRUB || loc->GetRCType() == RCTYPE_MERCHANT) {
+        // Checks should only be identified while playing
+        if (calculatingAvailableChecks && itemLoc->GetCheckStatus() != RCSHOW_IDENTIFIED) {
+            return CanBuyAnother(GetMinimumPrice(loc));
+        } else {
+            return CanBuyAnother(itemLoc->GetPrice());
+        }
+    }
+
+    return true;
 }
 
 bool CanBuyAnother(RandomizerCheck rc) {
-    uint16_t price = ctx->GetItemLocation(rc)->GetPrice();
+    return CanBuyAnother(ctx->GetItemLocation(rc)->GetPrice());
+}
 
+bool CanBuyAnother(uint16_t price) {
     if (price > 500) {
         return logic->HasItem(RG_TYCOON_WALLET);
     } else if (price > 200) {
@@ -64,27 +123,310 @@ bool CanBuyAnother(RandomizerCheck rc) {
     return true;
 }
 
+std::set<RandomizerArea> CalculateAreas(SceneID scene) {
+    switch (scene) {
+        case SCENE_DEKU_TREE:
+            return { RA_DEKU_TREE };
+        case SCENE_DODONGOS_CAVERN:
+            return { RA_DODONGOS_CAVERN };
+        case SCENE_JABU_JABU:
+            return { RA_JABU_JABUS_BELLY };
+        case SCENE_FOREST_TEMPLE:
+            return { RA_FOREST_TEMPLE };
+        case SCENE_FIRE_TEMPLE:
+            return { RA_FIRE_TEMPLE };
+        case SCENE_WATER_TEMPLE:
+            return { RA_WATER_TEMPLE };
+        case SCENE_SPIRIT_TEMPLE:
+            return { RA_SPIRIT_TEMPLE };
+        case SCENE_SHADOW_TEMPLE:
+            return { RA_SHADOW_TEMPLE };
+        case SCENE_BOTTOM_OF_THE_WELL:
+            return { RA_BOTTOM_OF_THE_WELL };
+        case SCENE_ICE_CAVERN:
+            return { RA_ICE_CAVERN };
+        case SCENE_INSIDE_GANONS_CASTLE:
+            return { RA_GANONS_CASTLE };
+        case SCENE_GERUDO_TRAINING_GROUND:
+            return { RA_GERUDO_TRAINING_GROUND };
+        case SCENE_THIEVES_HIDEOUT:
+        case SCENE_GERUDOS_FORTRESS:
+            return { RA_GERUDO_FORTRESS };
+        case SCENE_MARKET_ENTRANCE_DAY:
+        case SCENE_MARKET_ENTRANCE_NIGHT:
+        case SCENE_MARKET_ENTRANCE_RUINS:
+        case SCENE_BACK_ALLEY_DAY:
+        case SCENE_BACK_ALLEY_NIGHT:
+        case SCENE_MARKET_DAY:
+        case SCENE_MARKET_NIGHT:
+        case SCENE_MARKET_RUINS:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS:
+            return { RA_THE_MARKET };
+        case SCENE_TEMPLE_OF_TIME:
+            return { RA_TEMPLE_OF_TIME };
+        case SCENE_HYRULE_FIELD:
+            return { RA_HYRULE_FIELD };
+        case SCENE_KAKARIKO_VILLAGE:
+            return { RA_KAKARIKO_VILLAGE };
+        case SCENE_GRAVEYARD:
+            return { RA_THE_GRAVEYARD };
+        case SCENE_ZORAS_RIVER:
+            return { RA_ZORAS_RIVER };
+        case SCENE_KOKIRI_FOREST:
+            return { RA_KOKIRI_FOREST };
+        case SCENE_SACRED_FOREST_MEADOW:
+            return { RA_SACRED_FOREST_MEADOW };
+        case SCENE_LAKE_HYLIA:
+            return { RA_LAKE_HYLIA };
+        case SCENE_ZORAS_DOMAIN:
+            return { RA_ZORAS_DOMAIN };
+        case SCENE_ZORAS_FOUNTAIN:
+            return { RA_ZORAS_FOUNTAIN };
+        case SCENE_GERUDO_VALLEY:
+            return { RA_GERUDO_VALLEY };
+        case SCENE_LOST_WOODS:
+            return { RA_THE_LOST_WOODS };
+        case SCENE_DESERT_COLOSSUS:
+            return { RA_DESERT_COLOSSUS };
+        case SCENE_HAUNTED_WASTELAND:
+            return { RA_HAUNTED_WASTELAND };
+        case SCENE_HYRULE_CASTLE:
+            return { RA_HYRULE_CASTLE };
+        case SCENE_DEATH_MOUNTAIN_TRAIL:
+            return { RA_DEATH_MOUNTAIN_TRAIL };
+        case SCENE_DEATH_MOUNTAIN_CRATER:
+            return { RA_DEATH_MOUNTAIN_CRATER };
+        case SCENE_GORON_CITY:
+            return { RA_GORON_CITY };
+        case SCENE_LON_LON_RANCH:
+            return { RA_LON_LON_RANCH };
+        case SCENE_OUTSIDE_GANONS_CASTLE:
+            return { RA_OUTSIDE_GANONS_CASTLE };
+        case SCENE_TREASURE_BOX_SHOP:
+        case SCENE_DEKU_TREE_BOSS:
+        case SCENE_DODONGOS_CAVERN_BOSS:
+        case SCENE_JABU_JABU_BOSS:
+        case SCENE_FOREST_TEMPLE_BOSS:
+        case SCENE_FIRE_TEMPLE_BOSS:
+        case SCENE_WATER_TEMPLE_BOSS:
+        case SCENE_SPIRIT_TEMPLE_BOSS:
+        case SCENE_SHADOW_TEMPLE_BOSS:
+        case SCENE_GANONS_TOWER:
+        case SCENE_GANONDORF_BOSS:
+        case SCENE_KNOW_IT_ALL_BROS_HOUSE:
+        case SCENE_TWINS_HOUSE:
+        case SCENE_MIDOS_HOUSE:
+        case SCENE_SARIAS_HOUSE:
+        case SCENE_KAKARIKO_CENTER_GUEST_HOUSE:
+        case SCENE_BACK_ALLEY_HOUSE:
+        case SCENE_BAZAAR:
+        case SCENE_KOKIRI_SHOP:
+        case SCENE_GORON_SHOP:
+        case SCENE_ZORA_SHOP:
+        case SCENE_POTION_SHOP_KAKARIKO:
+        case SCENE_POTION_SHOP_MARKET:
+        case SCENE_BOMBCHU_SHOP:
+        case SCENE_HAPPY_MASK_SHOP:
+        case SCENE_LINKS_HOUSE:
+        case SCENE_DOG_LADY_HOUSE:
+        case SCENE_STABLE:
+        case SCENE_IMPAS_HOUSE:
+        case SCENE_LAKESIDE_LABORATORY:
+        case SCENE_CARPENTERS_TENT:
+        case SCENE_GRAVEKEEPERS_HUT:
+        case SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC:
+        case SCENE_FAIRYS_FOUNTAIN:
+        case SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS:
+        case SCENE_GROTTOS:
+        case SCENE_REDEAD_GRAVE:
+        case SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN:
+        case SCENE_ROYAL_FAMILYS_TOMB:
+        case SCENE_SHOOTING_GALLERY:
+        case SCENE_CASTLE_COURTYARD_GUARDS_DAY:
+        case SCENE_CASTLE_COURTYARD_GUARDS_NIGHT:
+        case SCENE_WINDMILL_AND_DAMPES_GRAVE:
+        case SCENE_FISHING_POND:
+        case SCENE_CASTLE_COURTYARD_ZELDA:
+        case SCENE_BOMBCHU_BOWLING_ALLEY:
+        case SCENE_LON_LON_BUILDINGS:
+        case SCENE_MARKET_GUARD_HOUSE:
+        case SCENE_POTION_SHOP_GRANNY:
+        case SCENE_HOUSE_OF_SKULLTULA:
+        case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
+        case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
+        case SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR:
+        case SCENE_GANON_BOSS:
+        case SCENE_ID_MAX:
+            return {};
+        case SCENE_CHAMBER_OF_THE_SAGES:
+        case SCENE_CUTSCENE_MAP:
+        case SCENE_TEST01:
+        case SCENE_BESITU:
+        case SCENE_DEPTH_TEST:
+        case SCENE_SYOTES:
+        case SCENE_SYOTES2:
+        case SCENE_SUTARU:
+        case SCENE_HAIRAL_NIWA2:
+        case SCENE_SASATEST:
+        case SCENE_TESTROOM:
+        default:
+            assert(false);
+            return {};
+    }
+}
+
+bool GetTimePassFromScene(SceneID scene) {
+    switch (scene) {
+        case SCENE_DEKU_TREE:
+        case SCENE_DODONGOS_CAVERN:
+        case SCENE_JABU_JABU:
+        case SCENE_FOREST_TEMPLE:
+        case SCENE_FIRE_TEMPLE:
+        case SCENE_WATER_TEMPLE:
+        case SCENE_SPIRIT_TEMPLE:
+        case SCENE_SHADOW_TEMPLE:
+        case SCENE_BOTTOM_OF_THE_WELL:
+        case SCENE_ICE_CAVERN:
+        case SCENE_GANONS_TOWER:
+        case SCENE_GERUDO_TRAINING_GROUND:
+        case SCENE_THIEVES_HIDEOUT:
+        case SCENE_INSIDE_GANONS_CASTLE:
+        case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR:
+        case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE:
+        case SCENE_TREASURE_BOX_SHOP:
+        case SCENE_DEKU_TREE_BOSS:
+        case SCENE_DODONGOS_CAVERN_BOSS:
+        case SCENE_JABU_JABU_BOSS:
+        case SCENE_FOREST_TEMPLE_BOSS:
+        case SCENE_FIRE_TEMPLE_BOSS:
+        case SCENE_WATER_TEMPLE_BOSS:
+        case SCENE_SPIRIT_TEMPLE_BOSS:
+        case SCENE_SHADOW_TEMPLE_BOSS:
+        case SCENE_GANONDORF_BOSS:
+        case SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR:
+        case SCENE_MARKET_ENTRANCE_DAY:
+        case SCENE_MARKET_ENTRANCE_NIGHT:
+        case SCENE_MARKET_ENTRANCE_RUINS:
+        case SCENE_BACK_ALLEY_DAY:
+        case SCENE_BACK_ALLEY_NIGHT:
+        case SCENE_MARKET_DAY:
+        case SCENE_MARKET_NIGHT:
+        case SCENE_MARKET_RUINS:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT:
+        case SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS:
+        case SCENE_KNOW_IT_ALL_BROS_HOUSE:
+        case SCENE_TWINS_HOUSE:
+        case SCENE_MIDOS_HOUSE:
+        case SCENE_SARIAS_HOUSE:
+        case SCENE_KAKARIKO_CENTER_GUEST_HOUSE:
+        case SCENE_BACK_ALLEY_HOUSE:
+        case SCENE_BAZAAR:
+        case SCENE_KOKIRI_SHOP:
+        case SCENE_GORON_SHOP:
+        case SCENE_ZORA_SHOP:
+        case SCENE_POTION_SHOP_KAKARIKO:
+        case SCENE_POTION_SHOP_MARKET:
+        case SCENE_BOMBCHU_SHOP:
+        case SCENE_HAPPY_MASK_SHOP:
+        case SCENE_LINKS_HOUSE:
+        case SCENE_DOG_LADY_HOUSE:
+        case SCENE_STABLE:
+        case SCENE_IMPAS_HOUSE:
+        case SCENE_LAKESIDE_LABORATORY:
+        case SCENE_CARPENTERS_TENT:
+        case SCENE_GRAVEKEEPERS_HUT:
+        case SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC:
+        case SCENE_FAIRYS_FOUNTAIN:
+        case SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS:
+        case SCENE_GROTTOS:
+        case SCENE_REDEAD_GRAVE:
+        case SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN:
+        case SCENE_ROYAL_FAMILYS_TOMB:
+        case SCENE_SHOOTING_GALLERY:
+        case SCENE_TEMPLE_OF_TIME:
+        case SCENE_CHAMBER_OF_THE_SAGES:
+        case SCENE_CASTLE_COURTYARD_GUARDS_DAY:
+        case SCENE_CASTLE_COURTYARD_GUARDS_NIGHT:
+        case SCENE_CUTSCENE_MAP:
+        case SCENE_WINDMILL_AND_DAMPES_GRAVE:
+        case SCENE_CASTLE_COURTYARD_ZELDA:
+        case SCENE_BOMBCHU_BOWLING_ALLEY:
+        case SCENE_LON_LON_BUILDINGS:
+        case SCENE_MARKET_GUARD_HOUSE:
+        case SCENE_POTION_SHOP_GRANNY:
+        case SCENE_GANON_BOSS:
+        case SCENE_HOUSE_OF_SKULLTULA:
+        case SCENE_KOKIRI_FOREST:
+        case SCENE_SACRED_FOREST_MEADOW:
+        case SCENE_LOST_WOODS:
+        case SCENE_GORON_CITY:
+        case SCENE_OUTSIDE_GANONS_CASTLE:
+        case SCENE_GRAVEYARD:
+        case SCENE_ZORAS_DOMAIN:
+        case SCENE_ZORAS_FOUNTAIN:
+        case SCENE_GERUDOS_FORTRESS:
+        case SCENE_HAUNTED_WASTELAND:
+        case SCENE_DEATH_MOUNTAIN_CRATER:
+        case SCENE_ID_MAX:
+            return false;
+
+        // Time does pass in the fishing pond but it's
+        // extremely slow (more than 2 IRL seconds per in-game minute)
+        // maybe in the future there could be a trick to count it
+        case SCENE_FISHING_POND:
+            return false;
+
+        case SCENE_HYRULE_FIELD:
+        case SCENE_KAKARIKO_VILLAGE:
+        case SCENE_ZORAS_RIVER:
+        case SCENE_LAKE_HYLIA:
+        case SCENE_GERUDO_VALLEY:
+        case SCENE_DESERT_COLOSSUS:
+        case SCENE_HYRULE_CASTLE:
+        case SCENE_DEATH_MOUNTAIN_TRAIL:
+        case SCENE_LON_LON_RANCH:
+            return true;
+
+        case SCENE_TEST01:
+        case SCENE_BESITU:
+        case SCENE_DEPTH_TEST:
+        case SCENE_SYOTES:
+        case SCENE_SYOTES2:
+        case SCENE_SUTARU:
+        case SCENE_HAIRAL_NIWA2:
+        case SCENE_SASATEST:
+        case SCENE_TESTROOM:
+        default:
+            assert(false);
+            return false;
+    }
+}
+
 Region::Region() = default;
-Region::Region(
-    std::string regionName_,
-    std::string scene_,
-    std::set<RandomizerArea> areas,
-    bool timePass_,
-    std::vector<EventAccess> events_,
-    std::vector<LocationAccess> locations_,
-    std::list<Rando::Entrance> exits_
-) : regionName(std::move(regionName_)),
-    scene(std::move(scene_)),
-    areas(areas),
-    timePass(timePass_),
-    events(std::move(events_)),
-    locations(std::move(locations_)),
-    exits(std::move(exits_)) {}
+Region::Region(std::string regionName_, SceneID scene_, bool timePass_, std::set<RandomizerArea> areas,
+               std::vector<EventAccess> events_, std::vector<LocationAccess> locations_,
+               std::list<Rando::Entrance> exits_)
+    : regionName(std::move(regionName_)), scene(scene_), timePass(timePass_), areas(areas), events(std::move(events_)),
+      locations(std::move(locations_)), exits(std::move(exits_)) {
+}
+Region::Region(std::string regionName_, SceneID scene_, std::vector<EventAccess> events_,
+               std::vector<LocationAccess> locations_, std::list<Rando::Entrance> exits_)
+    : regionName(std::move(regionName_)), scene(scene_), timePass(GetTimePassFromScene(scene_)),
+      areas(CalculateAreas(scene_)), events(std::move(events_)), locations(std::move(locations_)),
+      exits(std::move(exits_)) {
+}
 
 Region::~Region() = default;
 
-void Region::ApplyTimePass(){
-    if (timePass) {
+bool Region::TimePass() {
+    return timePass;
+}
+
+void Region::ApplyTimePass() {
+    if (TimePass()) {
         StartPerformanceTimer(PT_TOD_ACCESS);
         if (Child()) {
             childDay = true;
@@ -103,20 +445,18 @@ void Region::ApplyTimePass(){
 }
 
 bool Region::UpdateEvents() {
-    bool eventsUpdated =  false;
+    bool eventsUpdated = false;
     StartPerformanceTimer(PT_EVENT_ACCESS);
     for (EventAccess& event : events) {
-        //If the event has already happened, there's no reason to check it
+        // If the event has already happened, there's no reason to check it
         if (event.GetEvent()) {
             continue;
         }
 
-        if (
-            (childDay   && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay))    ||
-            (childNight && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtNight))  ||
-            (adultDay   && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay))    ||
-            (adultNight && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))
-        ) {
+        if ((childDay && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)) ||
+            (childNight && event.CheckConditionAtAgeTime(logic->IsChild, logic->AtNight)) ||
+            (adultDay && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)) ||
+            (adultNight && event.CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight))) {
             event.EventOccurred();
             eventsUpdated = true;
         }
@@ -126,14 +466,14 @@ bool Region::UpdateEvents() {
 }
 
 void Region::AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition) {
-    Rando::Entrance newExit = Rando::Entrance(newExitKey, {condition});
+    Rando::Entrance newExit = Rando::Entrance(newExitKey, { condition });
     newExit.SetParentRegion(parentKey);
     exits.push_front(newExit);
 }
 
-//The exit will be completely removed from this region
+// The exit will be completely removed from this region
 void Region::RemoveExit(Rando::Entrance* exitToRemove) {
-    exits.remove_if([exitToRemove](const auto exit){return &exit == exitToRemove;});
+    exits.remove_if([exitToRemove](const auto exit) { return &exit == exitToRemove; });
 }
 
 void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
@@ -152,7 +492,8 @@ Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) {
         }
     }
 
-    LUSLOG_ERROR("ERROR: EXIT \"%s\" DOES NOT EXIST IN \"%s\"", RegionTable(exitToReturn)->regionName.c_str(), this->regionName.c_str());
+    LUSLOG_ERROR("ERROR: EXIT \"%s\" DOES NOT EXIST IN \"%s\"", RegionTable(exitToReturn)->regionName.c_str(),
+                 this->regionName.c_str());
     assert(false);
     return nullptr;
 }
@@ -190,9 +531,9 @@ bool Region::CheckAllAccess(const RandomizerRegion exitKey) {
 
     for (Rando::Entrance& exit : exits) {
         if (exit.GetConnectedRegionKey() == exitKey) {
-            return exit.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay)   &&
+            return exit.CheckConditionAtAgeTime(logic->IsChild, logic->AtDay) &&
                    exit.CheckConditionAtAgeTime(logic->IsChild, logic->AtNight) &&
-                   exit.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay)   &&
+                   exit.CheckConditionAtAgeTime(logic->IsAdult, logic->AtDay) &&
                    exit.CheckConditionAtAgeTime(logic->IsAdult, logic->AtNight);
         }
     }
@@ -224,8 +565,74 @@ bool MQSpiritSharedBrokenWallRoom(const RandomizerRegion region, ConditionFn con
     return areaTable[region].MQSpiritShared(condition, true, anyAge);
 }
 
+bool BeanPlanted(const RandomizerRegion region) {
+    // swchFlag found using the Actor Viewer to get the Obj_Bean parameters & 0x3F
+    // not tested with multiple OTRs, but can be automated similarly to GetDungeonSmallKeyDoors
+    SceneID sceneID;
+    uint8_t swchFlag;
+    switch (region) {
+        case RR_ZORAS_RIVER:
+            sceneID = SceneID::SCENE_ZORAS_RIVER;
+            swchFlag = 3;
+            break;
+        case RR_THE_GRAVEYARD:
+            sceneID = SceneID::SCENE_GRAVEYARD;
+            swchFlag = 3;
+            break;
+        case RR_KOKIRI_FOREST:
+            sceneID = SceneID::SCENE_KOKIRI_FOREST;
+            swchFlag = 9;
+            break;
+        case RR_THE_LOST_WOODS:
+            sceneID = SceneID::SCENE_LOST_WOODS;
+            swchFlag = 4;
+            break;
+        case RR_LW_BEYOND_MIDO:
+            sceneID = SceneID::SCENE_LOST_WOODS;
+            swchFlag = 18;
+            break;
+        case RR_DEATH_MOUNTAIN_TRAIL:
+            sceneID = SceneID::SCENE_DEATH_MOUNTAIN_TRAIL;
+            swchFlag = 6;
+            break;
+        case RR_LAKE_HYLIA:
+            sceneID = SceneID::SCENE_LAKE_HYLIA;
+            swchFlag = 1;
+            break;
+        case RR_GERUDO_VALLEY:
+            sceneID = SceneID::SCENE_GERUDO_VALLEY;
+            swchFlag = 3;
+            break;
+        case RR_DMC_CENTRAL_LOCAL:
+            sceneID = SceneID::SCENE_DEATH_MOUNTAIN_CRATER;
+            swchFlag = 3;
+            break;
+        case RR_DESERT_COLOSSUS:
+            sceneID = SceneID::SCENE_DESERT_COLOSSUS;
+            swchFlag = 24;
+            break;
+        default:
+            sceneID = SCENE_ID_MAX;
+            swchFlag = 0;
+            assert(false);
+            break;
+    }
+
+    // Get the swch value for the scene
+    uint32_t swch;
+    if (gPlayState != nullptr && gPlayState->sceneNum == sceneID) {
+        swch = gPlayState->actorCtx.flags.swch;
+    } else if (sceneID != SCENE_ID_MAX) {
+        swch = Rando::Context::GetInstance()->GetLogic()->GetSaveContext()->sceneFlags[sceneID].swch;
+    } else {
+        swch = 0;
+    }
+
+    return swch >> swchFlag & 1;
+}
+
 bool CanPlantBean(const RandomizerRegion region) {
-    return areaTable[region].CanPlantBeanCheck();
+    return areaTable[region].CanPlantBeanCheck() || BeanPlanted(region);
 }
 
 bool BothAges(const RandomizerRegion region) {
@@ -250,20 +657,26 @@ std::shared_ptr<Rando::Logic> logic;
 void RegionTable_Init() {
     using namespace Rando;
     ctx = Context::GetInstance().get();
-    logic = ctx->GetLogic(); //RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
+    logic = ctx->GetLogic(); // RANDOTODO do not hardcode, instead allow accepting a Logic class somehow
     grottoEvents = {
-        EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
-        EventAccess(&logic->ButterflyFairy,   []{return logic->ButterflyFairy || (logic->CanUse(RG_STICKS));}),
-        EventAccess(&logic->BugShrub,         []{return logic->CanCutShrubs();}),
-        EventAccess(&logic->LoneFish,         []{return true;}),
+        EventAccess(&logic->GossipStoneFairy, [] { return logic->CallGossipFairy(); }),
+        EventAccess(&logic->ButterflyFairy, [] { return logic->CanUse(RG_STICKS); }),
+        EventAccess(&logic->BugShrub, [] { return logic->CanCutShrubs(); }),
+        EventAccess(&logic->LoneFish, [] { return true; }),
     };
-    //Clear the array from any previous playthrough attempts. This is important so that
-    //locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
-    areaTable.fill(Region("Invalid Region", "Invalid Region", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {}));
+    // Clear the array from any previous playthrough attempts. This is important so that
+    // locations which appear in both MQ and Vanilla dungeons don't get set in both areas.
+    areaTable.fill(Region("Invalid Region", SCENE_ID_MAX, {}, {}, {}));
 
-    areaTable[RR_ROOT] = Region("Root", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_ROOT] = Region("Root", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {
         //Events
-        EventAccess(&logic->KakarikoVillageGateOpen, []{return ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}),
+        EventAccess(&logic->KakarikoVillageGateOpen,        []{return ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}),
+        EventAccess(&logic->THCouldFree1TorchCarpenter,     []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE);}),
+        EventAccess(&logic->THCouldFreeDoubleCellCarpenter, []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST);}),
+        EventAccess(&logic->TH_CouldFreeDeadEndCarpenter,   []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST);}),
+        EventAccess(&logic->THCouldRescueSlopeCarpenter,    []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST);}),
+        EventAccess(&logic->THRescuedAllCarpenters,         []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE);}),
     }, {
         //Locations
         LOCATION(RC_LINKS_POCKET,       true),
@@ -274,7 +687,7 @@ void RegionTable_Init() {
         Entrance(RR_ROOT_EXITS, []{return true;}),
     });
 
-    areaTable[RR_ROOT_EXITS] = Region("Root Exits", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_ROOT_EXITS] = Region("Root Exits", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_CHILD_SPAWN,             []{return logic->IsChild;}),
         Entrance(RR_ADULT_SPAWN,             []{return logic->IsAdult;}),
@@ -286,46 +699,48 @@ void RegionTable_Init() {
         Entrance(RR_PRELUDE_OF_LIGHT_WARP,   []{return logic->CanUse(RG_PRELUDE_OF_LIGHT)   && logic->CanLeaveForest();}),
     });
 
-    areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_CHILD_SPAWN] = Region("Child Spawn", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_KF_LINKS_HOUSE, []{return true;}),
     });
 
-    areaTable[RR_ADULT_SPAWN] = Region("Adult Spawn", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_ADULT_SPAWN] = Region("Adult Spawn", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_TEMPLE_OF_TIME, []{return true;}),
     });
 
-    areaTable[RR_MINUET_OF_FOREST_WARP] = Region("Minuet of Forest Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_MINUET_OF_FOREST_WARP] = Region("Minuet of Forest Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_SACRED_FOREST_MEADOW, []{return true;}),
     });
 
-    areaTable[RR_BOLERO_OF_FIRE_WARP] = Region("Bolero of Fire Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_BOLERO_OF_FIRE_WARP] = Region("Bolero of Fire Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_DMC_CENTRAL_LOCAL, []{return true;}),
     });
 
-    areaTable[RR_SERENADE_OF_WATER_WARP] = Region("Serenade of Water Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SERENADE_OF_WATER_WARP] = Region("Serenade of Water Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_LAKE_HYLIA, []{return true;}),
     });
 
-    areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Region("Requiem of Spirit Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_REQUIEM_OF_SPIRIT_WARP] = Region("Requiem of Spirit Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_DESERT_COLOSSUS, []{return true;}),
     });
 
-    areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Region("Nocturne of Shadow Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_NOCTURNE_OF_SHADOW_WARP] = Region("Nocturne of Shadow Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_GRAVEYARD_WARP_PAD_REGION, []{return true;}),
     });
 
-    areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Region("Prelude of Light Warp", "", {RA_LINKS_POCKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_PRELUDE_OF_LIGHT_WARP] = Region("Prelude of Light Warp", SCENE_ID_MAX, TIME_DOESNT_PASS, {RA_LINKS_POCKET}, {}, {}, {
         //Exits
         Entrance(RR_TEMPLE_OF_TIME, []{return true;}),
     });
 
+    // clang-format on
+
     // Overworld
     RegionTable_Init_KokiriForest();
     RegionTable_Init_LostWoods();
@@ -346,6 +761,7 @@ void RegionTable_Init() {
     RegionTable_Init_ZorasFountain();
     RegionTable_Init_GerudoValley();
     RegionTable_Init_GerudoFortress();
+    RegionTable_Init_ThievesHideout();
     RegionTable_Init_HauntedWasteland();
     RegionTable_Init_DesertColossus();
     // Dungeons
@@ -362,7 +778,7 @@ void RegionTable_Init() {
     RegionTable_Init_GerudoTrainingGround();
     RegionTable_Init_GanonsCastle();
 
-    //Set parent regions
+    // Set parent regions
     for (uint32_t i = RR_ROOT; i <= RR_GANONS_CASTLE; i++) {
         for (LocationAccess& locPair : areaTable[i].locations) {
             RandomizerCheck location = locPair.GetLocation();
@@ -415,130 +831,131 @@ std::string CleanCheckConditionString(std::string condition) {
 }
 
 namespace Regions {
-    const auto GetAllRegions() {
-        static const size_t regionCount = RR_MAX - (RR_NONE + 1);
+auto GetAllRegions() {
+    static const size_t regionCount = RR_MAX - (RR_NONE + 1);
 
-        static std::array<RandomizerRegion, regionCount> allRegions = {};
+    static std::array<RandomizerRegion, regionCount> allRegions = {};
 
-        static bool intialized = false;
-        if (!intialized) {
-            for (size_t i = 0; i < regionCount; i++) {
-                allRegions[i] = (RandomizerRegion)((RR_NONE + 1) + i);
-            }
-            intialized = true;
+    static bool initialized = false;
+    if (!initialized) {
+        for (size_t i = 0; i < regionCount; i++) {
+            allRegions[i] = (RandomizerRegion)((RR_NONE + 1) + i);
         }
-
-        return allRegions;
+        initialized = true;
     }
 
-    void AccessReset() {
-        auto ctx = Rando::Context::GetInstance();
-        for (const RandomizerRegion region : GetAllRegions()) {
-            RegionTable(region)->ResetVariables();
-        }
+    return allRegions;
+}
 
-        if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
-            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
-                RegionTable(RR_ROOT)->childNight = true;
-            } else {
-                RegionTable(RR_ROOT)->adultNight = true;
-            }
+void AccessReset() {
+    auto ctx = Rando::Context::GetInstance();
+    for (const RandomizerRegion region : GetAllRegions()) {
+        RegionTable(region)->ResetVariables();
+    }
+
+    if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            RegionTable(RR_ROOT)->childNight = true;
         } else {
-            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
-                RegionTable(RR_ROOT)->childDay = true;
-            } else {
-                RegionTable(RR_ROOT)->adultDay = true;
-            }
+            RegionTable(RR_ROOT)->adultNight = true;
         }
-    }
-
-    //Reset exits and clear items from locations
-    void ResetAllLocations() {
-        auto ctx = Rando::Context::GetInstance();
-        for (const RandomizerRegion region : GetAllRegions()) {
-            RegionTable(region)->ResetVariables();
-            //Erase item from every location in this exit
-            for (LocationAccess& locPair : RegionTable(region)->locations) {
-                RandomizerCheck location = locPair.GetLocation();
-                Rando::Context::GetInstance()->GetItemLocation(location)->ResetVariables();
-            }
-        }
-
-        if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
-            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
-                RegionTable(RR_ROOT)->childNight = true;
-            } else {
-                RegionTable(RR_ROOT)->adultNight = true;
-            }
+    } else {
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            RegionTable(RR_ROOT)->childDay = true;
         } else {
-            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
-                RegionTable(RR_ROOT)->childDay = true;
-            } else {
-                RegionTable(RR_ROOT)->adultDay = true;
-            }
+            RegionTable(RR_ROOT)->adultDay = true;
+        }
+    }
+}
+
+// Reset exits and clear items from locations
+void ResetAllLocations() {
+    auto ctx = Rando::Context::GetInstance();
+    for (const RandomizerRegion region : GetAllRegions()) {
+        RegionTable(region)->ResetVariables();
+        // Erase item from every location in this exit
+        for (LocationAccess& locPair : RegionTable(region)->locations) {
+            RandomizerCheck location = locPair.GetLocation();
+            Rando::Context::GetInstance()->GetItemLocation(location)->ResetVariables();
         }
     }
 
-    bool HasTimePassAccess(uint8_t age) {
-        for (const RandomizerRegion regionKey : GetAllRegions()) {
-            auto region = RegionTable(regionKey);
-            if (region->timePass && ((age == RO_AGE_CHILD && region->Child()) || (age == RO_AGE_ADULT && region->Adult()))) {
-                return true;
-            }
+    if (/*Settings::HasNightStart TODO:: Randomize Starting Time*/ false) {
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            RegionTable(RR_ROOT)->childNight = true;
+        } else {
+            RegionTable(RR_ROOT)->adultNight = true;
+        }
+    } else {
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            RegionTable(RR_ROOT)->childDay = true;
+        } else {
+            RegionTable(RR_ROOT)->adultDay = true;
         }
-        return false;
     }
+}
 
-    // Will dump a file which can be turned into a visual graph using graphviz
-    // https://graphviz.org/download/
-    // Use command: dot -Tsvg <filename> -o world.svg
-    // Then open in a browser and CTRL + F to find the area of interest
-    void DumpWorldGraph(std::string str) {
-        std::ofstream worldGraph;
-        worldGraph.open (str + ".dot");
-        worldGraph << "digraph {\n\tcenter=true;\n";
+bool HasTimePassAccess(uint8_t age) {
+    for (const RandomizerRegion regionKey : GetAllRegions()) {
+        auto region = RegionTable(regionKey);
+        if (region->TimePass() &&
+            ((age == RO_AGE_CHILD && region->Child()) || (age == RO_AGE_ADULT && region->Adult()))) {
+            return true;
+        }
+    }
+    return false;
+}
 
-        for (const RandomizerRegion regionKey : GetAllRegions()) {
-            auto region = RegionTable(regionKey);
-            for (auto exit : region->exits) {
-                if (exit.GetConnectedRegion()->regionName != "Invalid Region") {
-                    std::string parent = exit.GetParentRegion()->regionName;
-                    if (region->childDay) {
-                        parent += " CD";
-                    }
-                    if (region->childNight) {
-                        parent += " CN";
-                    }
-                    if (region->adultDay) {
-                        parent += " AD";
-                    }
-                    if (region->adultNight) {
-                        parent += " AN";
-                    }
-                    Region* connected = exit.GetConnectedRegion();
-                    auto connectedStr = connected->regionName;
-                    if (connected->childDay) {
-                        connectedStr += " CD";
-                    }
-                    if (connected->childNight) {
-                        connectedStr += " CN";
-                    }
-                    if (connected->adultDay) {
-                        connectedStr += " AD";
-                    }
-                    if (connected->adultNight) {
-                        connectedStr += " AN";
-                    }
-                    worldGraph << "\t\"" + parent + "\"[shape=\"plain\"];\n";
-                    worldGraph << "\t\"" + connectedStr + "\"[shape=\"plain\"];\n";
-                    worldGraph << "\t\"" + parent + "\" -> \"" + connectedStr + "\"\n";
+// Will dump a file which can be turned into a visual graph using graphviz
+// https://graphviz.org/download/
+// Use command: dot -Tsvg <filename> -o world.svg
+// Then open in a browser and CTRL + F to find the area of interest
+void DumpWorldGraph(std::string str) {
+    std::ofstream worldGraph;
+    worldGraph.open(str + ".dot");
+    worldGraph << "digraph {\n\tcenter=true;\n";
+
+    for (const RandomizerRegion regionKey : GetAllRegions()) {
+        auto region = RegionTable(regionKey);
+        for (auto exit : region->exits) {
+            if (exit.GetConnectedRegion()->regionName != "Invalid Region") {
+                std::string parent = exit.GetParentRegion()->regionName;
+                if (region->childDay) {
+                    parent += " CD";
                 }
+                if (region->childNight) {
+                    parent += " CN";
+                }
+                if (region->adultDay) {
+                    parent += " AD";
+                }
+                if (region->adultNight) {
+                    parent += " AN";
+                }
+                Region* connected = exit.GetConnectedRegion();
+                auto connectedStr = connected->regionName;
+                if (connected->childDay) {
+                    connectedStr += " CD";
+                }
+                if (connected->childNight) {
+                    connectedStr += " CN";
+                }
+                if (connected->adultDay) {
+                    connectedStr += " AD";
+                }
+                if (connected->adultNight) {
+                    connectedStr += " AN";
+                }
+                worldGraph << "\t\"" + parent + "\"[shape=\"plain\"];\n";
+                worldGraph << "\t\"" + connectedStr + "\"[shape=\"plain\"];\n";
+                worldGraph << "\t\"" + parent + "\" -> \"" + connectedStr + "\"\n";
             }
         }
-        worldGraph << "}";
-        worldGraph.close();
     }
-} //namespace Regions
+    worldGraph << "}";
+    worldGraph.close();
+}
+} // namespace Regions
 
 Region* RegionTable(const RandomizerRegion regionKey) {
     if (regionKey > RR_MAX) {
@@ -547,12 +964,13 @@ Region* RegionTable(const RandomizerRegion regionKey) {
     return &(areaTable[regionKey]);
 }
 
-//Retrieve all the shuffable entrances of a specific type
+// Retrieve all the shuffable entrances of a specific type
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary /*= true*/) {
     std::vector<Rando::Entrance*> entrancesToShuffle = {};
     for (RandomizerRegion region : Regions::GetAllRegions()) {
         for (auto& exit : RegionTable(region)->exits) {
-            if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != Rando::EntranceType::None) {
+            if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) &&
+                exit.GetType() != Rando::EntranceType::None) {
                 entrancesToShuffle.push_back(&exit);
             }
         }
@@ -560,15 +978,12 @@ std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type,
     return entrancesToShuffle;
 }
 
-// Get the specific entrance by name
-Rando::Entrance* GetEntrance(const std::string name) {
-    for (RandomizerRegion region : Regions::GetAllRegions()) {
-        for (auto& exit : RegionTable(region)->exits) {
-            if (exit.GetName() == name) {
-                return &exit;
-            }
+Rando::Entrance* GetEntrance(RandomizerRegion source, RandomizerRegion destination) {
+    for (auto& exit : RegionTable(source)->exits) {
+        if (exit.GetOriginalConnectedRegionKey() == destination) {
+            return &exit;
         }
     }
 
     return nullptr;
-}
\ No newline at end of file
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access.h b/soh/soh/Enhancements/randomizer/location_access.h
index 986d08d6a3..547000ce51 100644
--- a/soh/soh/Enhancements/randomizer/location_access.h
+++ b/soh/soh/Enhancements/randomizer/location_access.h
@@ -9,6 +9,9 @@
 #include "soh/Enhancements/randomizer/context.h"
 #include "soh/Enhancements/randomizer/logic.h"
 
+#define TIME_PASSES true
+#define TIME_DOESNT_PASS false
+
 typedef bool (*ConditionFn)();
 
 // I hate this but every alternative I can think of right now is worse
@@ -18,287 +21,321 @@ extern std::shared_ptr<Rando::Logic> logic;
 class Region;
 
 class EventAccess {
-    public:
-        explicit EventAccess(bool* event_, ConditionFn condition_function_) : event(event_), condition_function(condition_function_) {}
+  public:
+    explicit EventAccess(bool* event_, ConditionFn condition_function_)
+        : event(event_), condition_function(condition_function_) {
+    }
 
-        bool ConditionsMet() const {
-            auto ctx = Rando::Context::GetInstance();
-            if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
-                return condition_function();
-            }
-            return true;
+    bool ConditionsMet() const {
+        auto ctx = Rando::Context::GetInstance();
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
+            return condition_function();
         }
+        return true;
+    }
 
-        bool CheckConditionAtAgeTime(bool& age, bool& time) {
-            logic->IsChild = false;
-            logic->IsAdult = false;
-            logic->AtDay   = false;
-            logic->AtNight = false;
+    bool CheckConditionAtAgeTime(bool& age, bool& time) {
+        logic->IsChild = false;
+        logic->IsAdult = false;
+        logic->AtDay = false;
+        logic->AtNight = false;
 
-            time = true;
-            age = true;
+        time = true;
+        age = true;
 
-            return ConditionsMet();
-        }
+        return ConditionsMet();
+    }
 
-        void EventOccurred() {
-            *event = true;
-        }
+    void EventOccurred() {
+        *event = true;
+    }
 
-        bool GetEvent() const {
-            return *event;
-        }
+    bool GetEvent() const {
+        return *event;
+    }
 
-    private:
-        bool* event;
-        ConditionFn condition_function;
+  private:
+    bool* event;
+    ConditionFn condition_function;
 };
 
 std::string CleanCheckConditionString(std::string condition);
 
-#define LOCATION(check, condition) LocationAccess(check, []{return condition;}, CleanCheckConditionString(#condition))
+#define LOCATION(check, condition) \
+    LocationAccess(                \
+        check, [] { return condition; }, CleanCheckConditionString(#condition))
 
-//this class is meant to hold an item location with a boolean function to determine its accessibility from a specific area
+// this class is meant to hold an item location with a boolean function to determine its accessibility from a specific
+// area
 class LocationAccess {
-    public:
-        explicit LocationAccess(RandomizerCheck location_, ConditionFn condition_function_) : location(location_), condition_function(condition_function_), condition_str("") {}
+  public:
+    explicit LocationAccess(RandomizerCheck location_, ConditionFn condition_function_)
+        : location(location_), condition_function(condition_function_), condition_str("") {
+    }
 
-        explicit LocationAccess(RandomizerCheck location_, ConditionFn condition_function_, std::string condition_str_) : location(location_), condition_function(condition_function_), condition_str(condition_str_) {}
+    explicit LocationAccess(RandomizerCheck location_, ConditionFn condition_function_, std::string condition_str_)
+        : location(location_), condition_function(condition_function_), condition_str(condition_str_) {
+    }
 
-        bool GetConditionsMet() const {
-            auto ctx = Rando::Context::GetInstance();
-            if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
-                return condition_function();
-            }
-            return true;
+    bool GetConditionsMet() const {
+        auto ctx = Rando::Context::GetInstance();
+        if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_GLITCHLESS)) {
+            return condition_function();
         }
+        return true;
+    }
 
-        bool CheckConditionAtAgeTime(bool& age, bool& time) const;
+    bool CheckConditionAtAgeTime(bool& age, bool& time) const;
 
-        bool ConditionsMet(Region* parentRegion) const;
+    bool ConditionsMet(Region* parentRegion, bool calculatingAvailableChecks) const;
 
-        RandomizerCheck GetLocation() const {
-            return location;
-        }
+    RandomizerCheck GetLocation() const {
+        return location;
+    }
 
-        std::string GetConditionStr() const {
-            return condition_str;
-        }
+    std::string GetConditionStr() const {
+        return condition_str;
+    }
 
-    protected:
-        RandomizerCheck location;
-        ConditionFn condition_function;
-        std::string condition_str;
+  protected:
+    RandomizerCheck location;
+    ConditionFn condition_function;
+    std::string condition_str;
 
-        //Makes sure shop locations are buyable
-        bool CanBuy() const;
+    // Makes sure shop locations are buyable
+    bool CanBuy(bool calculatingAvailableChecks) const;
 };
 
+bool CanBuyAnother(uint16_t price);
 bool CanBuyAnother(RandomizerCheck rc);
 
 namespace Rando {
-    class Entrance;
-    enum class EntranceType;
-}
+class Entrance;
+enum class EntranceType;
+} // namespace Rando
 
 class Region {
-    public:
-        Region();
-        Region(
-            std::string regionName_,
-            std::string scene_,
-            std::set<RandomizerArea> areas,
-            bool timePass_,
-            std::vector<EventAccess> events_,
-            std::vector<LocationAccess> locations_,
-            std::list<Rando::Entrance> exits_
-        );
-        ~Region();
+  public:
+    Region();
+    Region(std::string regionName_, SceneID scene_, bool timePass, std::set<RandomizerArea> areas,
+           std::vector<EventAccess> events_, std::vector<LocationAccess> locations_, std::list<Rando::Entrance> exits_);
+    Region(std::string regionName_, SceneID scene_, std::vector<EventAccess> events_,
+           std::vector<LocationAccess> locations_, std::list<Rando::Entrance> exits_);
+    ~Region();
 
-        std::string regionName;
-        std::string scene;
-        std::set<RandomizerArea> areas;
-        bool timePass;
-        std::vector<EventAccess> events;
-        std::vector<LocationAccess> locations;
-        std::list<Rando::Entrance> exits;
-        std::list<Rando::Entrance*> entrances;
-        //^ The above exits are now stored in a list instead of a vector because
-        //the entrance randomization algorithm plays around with pointers to these
-        //entrances a lot. By putting the entrances in a list, we don't have to
-        //worry about a vector potentially reallocating itself and invalidating all our
-        //entrance pointers.
+    std::string regionName;
+    SceneID scene;
+    bool timePass;
+    std::set<RandomizerArea> areas;
+    std::vector<EventAccess> events;
+    std::vector<LocationAccess> locations;
+    std::list<Rando::Entrance> exits;
+    std::list<Rando::Entrance*> entrances;
+    //^ The above exits are now stored in a list instead of a vector because
+    // the entrance randomization algorithm plays around with pointers to these
+    // entrances a lot. By putting the entrances in a list, we don't have to
+    // worry about a vector potentially reallocating itself and invalidating all our
+    // entrance pointers.
 
-        bool childDay = false;
-        bool childNight = false;
-        bool adultDay = false;
-        bool adultNight = false;
-        bool addedToPool = false;;
+    bool childDay = false;
+    bool childNight = false;
+    bool adultDay = false;
+    bool adultNight = false;
+    bool addedToPool = false;
 
-        void ApplyTimePass();
+    bool TimePass();
 
-        bool UpdateEvents();
+    void ApplyTimePass();
 
-        void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
+    bool UpdateEvents();
 
-        void RemoveExit(Rando::Entrance* exitToRemove);
+    void AddExit(RandomizerRegion parentKey, RandomizerRegion newExitKey, ConditionFn condition);
 
-        void SetAsPrimary(RandomizerRegion exitToBePrimary);
+    void RemoveExit(Rando::Entrance* exitToRemove);
 
-        Rando::Entrance* GetExit(RandomizerRegion exit);
+    void SetAsPrimary(RandomizerRegion exitToBePrimary);
 
-        bool Child() const {
-            return childDay || childNight;
+    Rando::Entrance* GetExit(RandomizerRegion exit);
+
+    bool Child() const {
+        return childDay || childNight;
+    }
+
+    bool Adult() const {
+        return adultDay || adultNight;
+    }
+
+    bool BothAgesCheck() const {
+        return Child() && Adult();
+    }
+
+    bool HasAccess() const {
+        return Child() || Adult();
+    }
+
+    bool AllAccess() const {
+        return childDay && childNight && adultDay && adultNight;
+    }
+
+    // Check to see if an exit can be access as both ages at both times of day
+    bool CheckAllAccess(RandomizerRegion exitKey);
+
+    std::set<RandomizerArea> GetAllAreas() const {
+        return areas;
+    }
+
+    RandomizerArea GetFirstArea() const {
+        if (areas.empty()) {
+            assert(false);
+            return RA_NONE;
+        } else {
+            return *areas.begin();
         }
+    }
 
-        bool Adult() const {
-            return adultDay || adultNight;
-        }
+    void ReplaceAreas(std::set<RandomizerArea> newAreas) {
+        areas = newAreas;
+    }
 
-        bool BothAgesCheck() const {
-            return Child() && Adult();
-        }
+    // Here checks conditional access based on whether or not both ages have
+    // access to this area. For example: if there are rocks that block a path
+    // which both child and adult can access, adult having hammer can give
+    // both child and adult access to the path.
+    bool Here(ConditionFn condition) {
+        // store current age variables
+        bool pastAdult = logic->IsAdult;
+        bool pastChild = logic->IsChild;
 
-        bool HasAccess() const {
-            return Child() || Adult();
-        }
+        // set age access as this areas ages
+        logic->IsChild = Child();
+        logic->IsAdult = Adult();
 
-        bool AllAccess() const {
-            return childDay && childNight && adultDay && adultNight;
-        }
+        // heck condition as well as having at least child or adult access
+        bool hereVal = condition() && (logic->IsAdult || logic->IsChild);
 
-        //Check to see if an exit can be access as both ages at both times of day
-        bool CheckAllAccess(RandomizerRegion exitKey);
+        // set back age variables
+        logic->IsChild = pastChild;
+        logic->IsAdult = pastAdult;
 
-        std::set<RandomizerArea> GetAllAreas() const{
-            return areas;
-        }
+        return hereVal;
+    }
 
-        RandomizerArea GetFirstArea() const{
-            if (areas.empty()){
-                assert(false);
-                return RA_NONE;
-            } else {
-                return *areas.begin();
+    bool CanPlantBeanCheck() const;
+    bool AllAccountedFor() const;
+
+    void ResetVariables();
+
+    void printAgeTimeAccess() const {
+        auto message = "Child Day:   " + std::to_string(childDay) +
+                       "\t"
+                       "Child Night: " +
+                       std::to_string(childNight) +
+                       "\t"
+                       "Adult Day:   " +
+                       std::to_string(adultDay) +
+                       "\t"
+                       "Adult Night: " +
+                       std::to_string(adultNight);
+    }
+
+    /*
+     * This logic covers checks that exist in the shared areas of MQ spirit from a glitchless standpoint.
+     * This room has Quantum logic that I am currently handling with this function, however this is NOT suitable for
+     glitch logic as it relies on specific ages
+     * In this chunk there are 3 possibilities for passing a check, but first I have to talk about parallel universes.
+
+     * In MQ Spirit key logic, we mostly care about 2 possibilities for how the player can spend keys, creating 2
+     Parralel universes
+     * In the first universe, the player did not enter spirit as adult until after climbing as child, thus child spends
+     keys linearly, only needing 2 to reach statue room.
+     * In the second universe, the player went in as adult, possibly out of logic, and started wasting the keys to lock
+     child out.
+     * These Universes converge when the player has 7 keys (meaning adult can no longer lock child out) and adult is
+     known to be able to reach Statue room. This creates "Certain Access", which is tracked seperatly for each age.
+     * Child Certain Access is simple, if we have 7 keys and child access, it's Certain Access.
+     * Adult Certain Access is also simple, adult is not key locked, so if they make it to a location, it's Certain
+     Access.
+     * Things get complicated when we handle the overlap of the 2 universes,
+     * though an important detail is that if we have Certain Access as either age, we don't need to checked the overlap
+     because overlap logic is strictly stricter than either Certain Access.
+
+     * In order to track the first universe, the logic allows technical child access with the minimum number of keys,
+     and then checks in this function for if we have 7 keys to determine if that is Certain or not.
+     * This is for technical reasons, as areas with no access at all will simply not be checked.
+     * Normally we would need to do similar shenanigans to track the second universe, however adult must have go through
+     statue room to waste keys,
+     * so can go back there and get new keys for Child to use if they do, and the navigation logic for shared MQ spirit
+     from Statue Room is very simple for Adult.
+     * Additionally, we don't need to know if adult can actually reach spirit temple or climb to statue room, because if
+     the player can't do that, then universe 2 can't happen anyway,
+     * and if the player does so out of logic, they can do it again, as the only consumable used sets a permanent flag.
+
+     * The Adult Navigation logic is as such:
+     * - Broken Wall room is 6 key locked, because if the player tries to spend 6 keys in a way that would block adults
+     access, they would have to give child access instead.
+     * - The child side hammer switch for the time travelling chest is 7 key locked for adult
+     * - Reaching gauntlets hand is 7 key locked
+     * - Going back into big block room is complex, but the only check there is child only so not a concern
+     * - Everything else is possible with basic adult movement, or is impossible for child to reach glitchlessly
+     * Anything 7 key locked does not need to be checked as shared, as all child access is Certain and because of this
+     workaround we don't need to fake Adult access, meaning that is also Certain.
+     * All of this combined means that when checking if adult can reach a location in universe 2, we only have to ask if
+     it is a 6 key locked location or not.
+
+     * Knowing all of this this, we can confirm things are logical in 3 different ways:
+     * - If we have Adult Access, we know it is Certain Access, so they can get checks alone.
+     * - If we have 7 keys, child has Certain Access as we know they cannot be locked out, so can get checks alone,
+     otherwise we check the logical overlap
+     * - If Child and Adult can get the check (ignoring actual adult access to the location), and the location is either
+     not 6 key locked or we have 6 keys, we can get the check with the overlap
+     */
+    bool MQSpiritShared(ConditionFn condition, bool IsBrokenWall, bool anyAge = false) {
+        // if we have Certain Access as child, we can check anyAge and if true, resolve a condition with Here as if
+        // adult is here it's also Certain Access
+        if (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)) {
+            if (anyAge) {
+                return Here(condition);
             }
-        }
-
-        void ReplaceAreas(std::set<RandomizerArea> newAreas) {
-            areas = newAreas;
-        }
-
-        //Here checks conditional access based on whether or not both ages have
-        //access to this area. For example: if there are rocks that block a path
-        //which both child and adult can access, adult having hammer can give
-        //both child and adult access to the path.
-        bool Here(ConditionFn condition) {
-            //store current age variables
+            return condition();
+            // else, if we are here as adult, we have Certain Access from that and don't need special handling for
+            // checking adult
+        } else if (Adult() && logic->IsAdult) {
+            return condition();
+            // if we do not have Certain Access, we need to check the overlap by seeing if we are both here as child and
+            // meet the adult universe's access condition We only need to do it as child, as only child access matters
+            // for this check, as adult access is assumed based on keys
+        } else if (Child() && logic->IsChild && (!IsBrokenWall || logic->SmallKeys(RR_SPIRIT_TEMPLE, 6))) {
+            bool result = false;
+            // store current age variables
             bool pastAdult = logic->IsAdult;
             bool pastChild = logic->IsChild;
 
-            //set age access as this areas ages
-            logic->IsChild = Child();
-            logic->IsAdult = Adult();
+            // First check if the check is possible as child
+            logic->IsChild = true;
+            logic->IsAdult = false;
+            result = condition();
+            // If so, check again as adult. both have to be true for result to be true
+            if (result) {
+                logic->IsChild = false;
+                logic->IsAdult = true;
+                result = condition();
+            }
 
-            //heck condition as well as having at least child or adult access
-            bool hereVal = condition() && (logic->IsAdult || logic->IsChild);
-
-            //set back age variables
+            // set back age variables
             logic->IsChild = pastChild;
             logic->IsAdult = pastAdult;
-
-            return hereVal;
-        }
-
-        bool CanPlantBeanCheck() const;
-        bool AllAccountedFor() const;
-
-        void ResetVariables();
-
-        void printAgeTimeAccess() const {
-            auto message = "Child Day:   " + std::to_string(childDay)   + "\t"
-                                            "Child Night: " + std::to_string(childNight) + "\t"
-                                            "Adult Day:   " + std::to_string(adultDay)   + "\t"
-                                            "Adult Night: " + std::to_string(adultNight);
-        }
-
-        /*
-         * This logic covers checks that exist in the shared areas of MQ spirit from a glitchless standpoint.
-         * This room has Quantum logic that I am currently handling with this function, however this is NOT suitable for glitch logic as it relies on specific ages
-         * In this chunk there are 3 possibilities for passing a check, but first I have to talk about parallel universes.
-
-         * In MQ Spirit key logic, we mostly care about 2 possibilities for how the player can spend keys, creating 2 Parralel universes
-         * In the first universe, the player did not enter spirit as adult until after climbing as child, thus child spends keys linearly, only needing 2 to reach statue room.
-         * In the second universe, the player went in as adult, possibly out of logic, and started wasting the keys to lock child out.
-         * These Universes converge when the player has 7 keys (meaning adult can no longer lock child out) and adult is known to be able to reach Statue room. This creates "Certain Access", which is tracked seperatly for each age.
-         * Child Certain Access is simple, if we have 7 keys and child access, it's Certain Access.
-         * Adult Certain Access is also simple, adult is not key locked, so if they make it to a location, it's Certain Access.
-         * Things get complicated when we handle the overlap of the 2 universes,
-         * though an important detail is that if we have Certain Access as either age, we don't need to checked the overlap because overlap logic is strictly stricter than either Certain Access.
-
-         * In order to track the first universe, the logic allows technical child access with the minimum number of keys, and then checks in this function for if we have 7 keys to determine if that is Certain or not.
-         * This is for technical reasons, as areas with no access at all will simply not be checked.
-         * Normally we would need to do similar shenanigans to track the second universe, however adult must have go through statue room to waste keys, 
-         * so can go back there and get new keys for Child to use if they do, and the navigation logic for shared MQ spirit from Statue Room is very simple for Adult.
-         * Additionally, we don't need to know if adult can actually reach spirit temple or climb to statue room, because if the player can't do that, then universe 2 can't happen anyway,
-         * and if the player does so out of logic, they can do it again, as the only consumable used sets a permanent flag.
-
-         * The Adult Navigation logic is as such:
-         * - Broken Wall room is 6 key locked, because if the player tries to spend 6 keys in a way that would block adults access, they would have to give child access instead.
-         * - The child side hammer switch for the time travelling chest is 7 key locked for adult
-         * - Reaching gauntlets hand is 7 key locked
-         * - Going back into big block room is complex, but the only check there is child only so not a concern
-         * - Everything else is possible with basic adult movement, or is impossible for child to reach glitchlessly
-         * Anything 7 key locked does not need to be checked as shared, as all child access is Certain and because of this workaround we don't need to fake Adult access, meaning that is also Certain.
-         * All of this combined means that when checking if adult can reach a location in universe 2, we only have to ask if it is a 6 key locked location or not.
-
-         * Knowing all of this this, we can confirm things are logical in 3 different ways:
-         * - If we have Adult Access, we know it is Certain Access, so they can get checks alone.
-         * - If we have 7 keys, child has Certain Access as we know they cannot be locked out, so can get checks alone, otherwise we check the logical overlap
-         * - If Child and Adult can get the check (ignoring actual adult access to the location), and the location is either not 6 key locked or we have 6 keys, we can get the check with the overlap
-         */
-        bool MQSpiritShared(ConditionFn condition, bool IsBrokenWall, bool anyAge = false) {
-            //if we have Certain Access as child, we can check anyAge and if true, resolve a condition with Here as if adult is here it's also Certain Access
-            if (logic->SmallKeys(RR_SPIRIT_TEMPLE, 7)){
-                if (anyAge){
-                    return Here(condition);
-                }
-                return condition();
-            //else, if we are here as adult, we have Certain Access from that and don't need special handling for checking adult
-            } else if (Adult() && logic->IsAdult){
-                return condition();
-            //if we do not have Certain Access, we need to check the overlap by seeing if we are both here as child and meet the adult universe's access condition
-            //We only need to do it as child, as only child access matters for this check, as adult access is assumed based on keys
-            } else if (Child() && logic->IsChild && (!IsBrokenWall || logic->SmallKeys(RR_SPIRIT_TEMPLE, 6))) {
-                bool result = false;
-                //store current age variables
-                bool pastAdult = logic->IsAdult;
-                bool pastChild = logic->IsChild;
-
-                //First check if the check is possible as child
-                logic->IsChild = true;
-                logic->IsAdult = false;
-                result = condition();
-                //If so, check again as adult. both have to be true for result to be true
-                if (result) {
-                    logic->IsChild = false;
-                    logic->IsAdult = true;
-                    result = condition();
-                }
-
-                //set back age variables
-                logic->IsChild = pastChild;
-                logic->IsAdult = pastAdult;
-                return result;
-            }
-            return false;
+            return result;
         }
+        return false;
+    }
 };
 
 extern std::array<Region, RR_MAX> areaTable;
 extern std::vector<EventAccess> grottoEvents;
 
-bool Here(const RandomizerRegion region, ConditionFn condition); //RANDOTODO make a less stupid way to check own at either age than self referencing with this
+bool Here(const RandomizerRegion region,
+          ConditionFn
+              condition); // RANDOTODO make a less stupid way to check own at either age than self referencing with this
 bool MQSpiritSharedStatueRoom(const RandomizerRegion region, ConditionFn condition, bool anyAge = false);
 bool MQSpiritSharedBrokenWallRoom(const RandomizerRegion region, ConditionFn condition, bool anyAge = false);
 bool CanPlantBean(const RandomizerRegion region);
@@ -307,20 +344,17 @@ bool ChildCanAccess(const RandomizerRegion region);
 bool AdultCanAccess(const RandomizerRegion region);
 bool HasAccessTo(const RandomizerRegion region);
 
-#define DAY_NIGHT_CYCLE true
-#define NO_DAY_NIGHT_CYCLE false
-
 namespace Regions {
-    extern void AccessReset();
-    extern void ResetAllLocations();
-    extern bool HasTimePassAccess(uint8_t age);
-    extern void DumpWorldGraph(std::string str);
-} //namespace Exits
+extern void AccessReset();
+extern void ResetAllLocations();
+extern bool HasTimePassAccess(uint8_t age);
+extern void DumpWorldGraph(std::string str);
+} // namespace Regions
 
-void  RegionTable_Init();
+void RegionTable_Init();
 Region* RegionTable(const RandomizerRegion regionKey);
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary = true);
-Rando::Entrance* GetEntrance(const std::string name);
+Rando::Entrance* GetEntrance(RandomizerRegion source, RandomizerRegion destination);
 
 // Overworld
 void RegionTable_Init_KokiriForest();
@@ -355,5 +389,6 @@ void RegionTable_Init_SpiritTemple();
 void RegionTable_Init_ShadowTemple();
 void RegionTable_Init_BottomOfTheWell();
 void RegionTable_Init_IceCavern();
+void RegionTable_Init_ThievesHideout();
 void RegionTable_Init_GerudoTrainingGround();
 void RegionTable_Init_GanonsCastle();
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp
index 171542ea35..001ad5d81d 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_BottomOfTheWell() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_ENTRYWAY] = Region("Bottom of the Well Entryway", SCENE_BOTTOM_OF_THE_WELL, {}, {}, {
         //Exits
         //Technically involves an fake wall, but passing it lensless is intended in vanilla and it is well telegraphed
         Entrance(RR_BOTTOM_OF_THE_WELL_PERIMETER,    []{return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla() && logic->IsChild && logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
@@ -16,7 +17,7 @@ void RegionTable_Init_BottomOfTheWell() {
 
 #pragma region Vanilla
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_PERIMETER] = Region("Bottom of the Well Perimeter", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_PERIMETER] = Region("Bottom of the Well Perimeter", SCENE_BOTTOM_OF_THE_WELL, {
         //Events
         EventAccess(&logic->StickPot,               []{return true;}),
         EventAccess(&logic->NutPot,                 []{return true;}),
@@ -24,9 +25,8 @@ void RegionTable_Init_BottomOfTheWell() {
     }, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,  logic->HasExplosives()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,             (logic->HasItem(RG_BRONZE_SCALE) || logic->LoweredWaterInsideBotw) && logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE)),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       logic->LoweredWaterInsideBotw),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        logic->LoweredWaterInsideBotw),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,       logic->LoweredWaterInsideBotw || logic->CanOpenUnderwaterChest()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,        logic->LoweredWaterInsideBotw || logic->CanOpenUnderwaterChest()),
         LOCATION(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,          logic->CanBreakPots()),
         LOCATION(RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,          logic->CanBreakPots()),
         LOCATION(RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT,               (logic->CanBreakPots() && logic->LoweredWaterInsideBotw) || logic->CanUse(RG_BOOMERANG)),
@@ -44,12 +44,12 @@ void RegionTable_Init_BottomOfTheWell() {
     });
 
     //This region combines the Middle with the perimeter's hidden areas. If a warp puts link into the middle without crossing the perimeter or using lens, it will need it's own region
-    areaTable[RR_BOTTOM_OF_THE_WELL_BEHIND_FAKE_WALLS] = Region("Bottom of the Well Behind Fake Walls", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_BEHIND_FAKE_WALLS] = Region("Bottom of the Well Behind Fake Walls", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,   true),
         LOCATION(RC_BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST, true),
         LOCATION(RC_BOTTOM_OF_THE_WELL_COMPASS_CHEST,                true),
-        //N64 has no extra check here, but I can't get past without dealing with the spider or taking a hit, they probably assume sticks
+        //You can just barely pass the spider on the right side without damage or items, but it's probably tight enough to count as as a trick
         LOCATION(RC_BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,       logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->TakeDamage()),
         //Not technically behind a wall, but still logically needs lens due to pits
         LOCATION(RC_BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,     logic->HasExplosives()),
@@ -62,7 +62,7 @@ void RegionTable_Init_BottomOfTheWell() {
     });
 
     //This area can be reached without lens in logic from basement, but that could require silver rupees if they are shuffled.
-    areaTable[RR_BOTTOM_OF_THE_WELL_SOUTHWEST_ROOM] = Region("Bottom of the Well Southwest Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_SOUTHWEST_ROOM] = Region("Bottom of the Well Southwest Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2, logic->CanBreakPots()),
@@ -73,7 +73,7 @@ void RegionTable_Init_BottomOfTheWell() {
     });
 
     //Passing through this area needs lens, but entering doesn't, so that the fire keese can be killed without crossing the pits if enemy drops are ever shuffled
-    areaTable[RR_BOTTOM_OF_THE_WELL_KEESE_BEAMOS_ROOM] = Region("Bottom of the Well Keese-Beamos Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_KEESE_BEAMOS_ROOM] = Region("Bottom of the Well Keese-Beamos Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST, ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH)),
         LOCATION(RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1, logic->CanBreakPots() && (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
@@ -85,7 +85,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_BASEMENT_USEFUL_BOMB_FLOWERS, []{return ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_LIKE_LIKE_CAGE] = Region("Bottom of the Well Like-Like Cage", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_LIKE_LIKE_CAGE] = Region("Bottom of the Well Like-Like Cage", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,   true),
         LOCATION(RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -95,7 +95,7 @@ void RegionTable_Init_BottomOfTheWell() {
     });
 
     //If the player can voidwarp into one of these rooms they will need splitting up, and Fake walls will need specifying into middle and the rest moved to perimeter
-    areaTable[RR_BOTTOM_OF_THE_WELL_INNER_ROOMS] = Region("Bottom of the Well Inner Rooms", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_INNER_ROOMS] = Region("Bottom of the Well Inner Rooms", SCENE_BOTTOM_OF_THE_WELL, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -108,7 +108,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_BEHIND_FAKE_WALLS, []{return logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 3);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_COFFIN_ROOM] = Region("Bottom of the Well Coffin Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_COFFIN_ROOM] = Region("Bottom of the Well Coffin Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_FREESTANDING_KEY,                logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW)),
         LOCATION(RC_BOTTOM_OF_THE_WELL_COFFIN_ROOM_FRONT_LEFT_HEART,    true),
@@ -118,7 +118,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_PERIMETER, []{return logic->LoweredWaterInsideBotw || logic->HasItem(RG_BRONZE_SCALE);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_DEAD_HAND_ROOM] = Region("Bottom of the Well Dead Hand Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_DEAD_HAND_ROOM] = Region("Bottom of the Well Dead Hand Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST, logic->CanKillEnemy(RE_DEAD_HAND)),
         LOCATION(RC_BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,     (ctx->GetTrickOption(RT_LENS_BOTW) || logic->CanUse(RG_LENS_OF_TRUTH))),
@@ -128,31 +128,43 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_PERIMETER, []{return logic->IsChild && logic->CanKillEnemy(RE_DEAD_HAND);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT] = Region("Bottom of the Well Basement", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT] = Region("Bottom of the Well Basement", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
-        LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,          logic->BlastOrSmash()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,     logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,    logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,    logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,    logic->CanBreakPots()),
-        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST,                     logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,                logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,               logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,               logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,               logic->CanBreakPots()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,            logic->CanUse(RG_SUNS_SONG)),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1,              logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2,              logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3,              logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8, logic->CanCutShrubs() && logic->BlastOrSmash()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9, logic->CanCutShrubs() && logic->BlastOrSmash()),
     }, {
         //Exits
         Entrance(RR_BOTTOM_OF_THE_WELL_SOUTHWEST_ROOM,               []{return logic->IsChild && logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
-        //It's possible top abuse boulder's limited range of collision detection to detonate the flowers through the boulder with bow, but this is a glitch
+        //It's possible to abuse boulder's limited range of collision detection to detonate the flowers through the boulder with bow, but this is a glitch
         //the exact range is just past the furthest away plank in the green goo section
         Entrance(RR_BOTTOM_OF_THE_WELL_BASEMENT_USEFUL_BOMB_FLOWERS, []{return Here(RR_BOTTOM_OF_THE_WELL_BASEMENT, []{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE) || (logic->CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_BASEMENT));});}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT_USEFUL_BOMB_FLOWERS] = Region("Bottom of the Well Basement Useful Bomb Flowers", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT_USEFUL_BOMB_FLOWERS] = Region("Bottom of the Well Basement Useful Bomb Flowers", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         //Assumes RR_BOTTOM_OF_THE_WELL_BASEMENT access
         LOCATION(RC_BOTTOM_OF_THE_WELL_MAP_CHEST, logic->HasItem(RG_GORONS_BRACELET)),
@@ -161,7 +173,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_BASEMENT, []{return logic->CanDetonateUprightBombFlower();}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM] = Region("Bottom of the Well Basement Platform", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM] = Region("Bottom of the Well Basement Platform", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_LEFT_RUPEE,        true),
         LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_BACK_LEFT_RUPEE,   true),
@@ -177,7 +189,7 @@ void RegionTable_Init_BottomOfTheWell() {
 
 #pragma region MQ
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER] = Region("Bottom of the Well MQ Perimeter", SCENE_BOTTOM_OF_THE_WELL, {
         //Events
         //technically obsolete due to a wonder item fairy which only needs a projectile, but we don't have an event var for it yet
         EventAccess(&logic->FairyPot,               []{return Here(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, []{return logic->BlastOrSmash();}) && logic->CanHitEyeTargets();}),
@@ -202,7 +214,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT,         []{return true;}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_WEST_ROOM_SWITCH] = Region("Bottom of the Well MQ West Room Switch", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_WEST_ROOM_SWITCH] = Region("Bottom of the Well MQ West Room Switch", SCENE_BOTTOM_OF_THE_WELL, {
         //Events
         EventAccess(&logic->OpenedWestRoomMQBotw, []{return true;}),
     }, {}, {
@@ -212,7 +224,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT,  []{return true;}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM] = Region("Bottom of the Well MQ Coffin Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM] = Region("Bottom of the Well MQ Coffin Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,                 logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_FRONT_RIGHT_HEART,  logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW)),
@@ -222,7 +234,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER,  []{return (logic->LoweredWaterInsideBotw || logic->HasItem(RG_BRONZE_SCALE)) && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_LOCKED_CAGE] = Region("Bottom of the Well MQ Locked Cage", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_LOCKED_CAGE] = Region("Bottom of the Well MQ Locked Cage", SCENE_BOTTOM_OF_THE_WELL, {
         //Events
         EventAccess(&logic->OpenedMiddleHoleMQBotw, []{return logic->HasExplosives();}),
     }, {}, {
@@ -230,17 +242,21 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, []{return logic->IsChild && logic->SmallKeys(RR_BOTTOM_OF_THE_WELL, 2);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_ROOM] = Region("Bottom of the Well MQ Dead Hand Room", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_ROOM] = Region("Bottom of the Well MQ Dead Hand Room", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,              logic->CanKillEnemy(RE_DEAD_HAND)),
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY, logic->HasExplosives() || (ctx->GetTrickOption(RT_BOTW_MQ_DEADHAND_KEY) && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1,          logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2,          logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3,          logic->CanCutShrubs()),
+        LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4,          logic->CanCutShrubs()),
     }, {
         //Exits
         //This assumes we spawned in dead hand's room, if whatever trick made this relevant instead puts us in the previous room, remove the kill Dead Hand check.
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, []{return logic->IsChild && logic->CanKillEnemy(RE_DEAD_HAND);}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_MIDDLE] = Region("Bottom of the Well MQ Middle", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,                        true),
         //This location technically involves an invisible platform, but it's intended to do lensless in vanilla and is clearly signposted by pots.
@@ -267,7 +283,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT,                 []{return true;}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT] = Region("Bottom of the Well MQ Basement", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT] = Region("Bottom of the Well MQ Basement", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         //behind invisible big skulltulas, but with navi spotting it's easy to avoid them, or at worst, tank your way through as they do not block the path
         LOCATION(RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,                  logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
@@ -280,7 +296,7 @@ void RegionTable_Init_BottomOfTheWell() {
         Entrance(RR_BOTTOM_OF_THE_WELL_MQ_PERIMETER, []{return true;}),
     });
 
-    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SWITCH_PLATFORM] = Region("Bottom of the Well MQ Basement Switch Platform", "Bottom of the Well", {RA_BOTTOM_OF_THE_WELL}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SWITCH_PLATFORM] = Region("Bottom of the Well MQ Basement Switch Platform", SCENE_BOTTOM_OF_THE_WELL, {}, {
         //Locations
         //Assumes RR_BOTTOM_OF_THE_WELL_MQ_BASEMENT access
         //it is technically possible to get the chest before you get screamed at without rolling, but hard enough to be a trick if that is the requirement for something to be logical
@@ -293,4 +309,5 @@ void RegionTable_Init_BottomOfTheWell() {
     });
 
 #pragma endregion
-}
\ No newline at end of file
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/deku_tree.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/deku_tree.cpp
index 2500e49969..1d98e861a7 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/deku_tree.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_DekuTree() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_ENTRYWAY] = Region("Deku Tree Entryway", SCENE_DEKU_TREE, {}, {}, {
         //Exits
         Entrance(RR_DEKU_TREE_LOBBY,      []{return ctx->GetDungeon(DEKU_TREE)->IsVanilla();}),
         Entrance(RR_DEKU_TREE_MQ_1F,      []{return ctx->GetDungeon(DEKU_TREE)->IsMQ();}),
@@ -15,7 +16,7 @@ void RegionTable_Init_DekuTree() {
 
 #pragma region Vanilla
 
-    areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_LOBBY] = Region("Deku Tree Lobby", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -24,6 +25,11 @@ void RegionTable_Init_DekuTree() {
         LOCATION(RC_DEKU_TREE_MAP_CHEST,         true),
         LOCATION(RC_DEKU_TREE_LOBBY_LOWER_HEART, true),
         LOCATION(RC_DEKU_TREE_LOBBY_UPPER_HEART, logic->CanPassEnemy(RE_BIG_SKULLTULA)),
+        LOCATION(RC_DEKU_TREE_LOBBY_GRASS_1,     logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_LOBBY_GRASS_2,     logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_LOBBY_GRASS_3,     logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_LOBBY_GRASS_4,     logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_LOBBY_GRASS_5,     logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_ENTRYWAY,          []{return true;}),
@@ -34,22 +40,26 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY,     []{return false;}),
     });
 
-    areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_2F_MIDDLE_ROOM] = Region("Deku Tree 2F Middle Room", SCENE_DEKU_TREE, {}, {}, {
         //Exits
         Entrance(RR_DEKU_TREE_LOBBY,          []{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}),
         Entrance(RR_DEKU_TREE_SLINGSHOT_ROOM, []{return Here(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanReflectNuts() || logic->CanUse(RG_MEGATON_HAMMER);});}),
     });
 
-    areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_SLINGSHOT_ROOM] = Region("Deku Tree Slingshot Room", SCENE_DEKU_TREE, {}, {
         //Locations
         LOCATION(RC_DEKU_TREE_SLINGSHOT_CHEST,           true),
         LOCATION(RC_DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST, true),
+        LOCATION(RC_DEKU_TREE_SLINGSHOT_GRASS_1,         logic->CanCutShrubs() && logic->CanReflectNuts()),
+        LOCATION(RC_DEKU_TREE_SLINGSHOT_GRASS_2,         logic->CanCutShrubs() && logic->CanReflectNuts()),
+        LOCATION(RC_DEKU_TREE_SLINGSHOT_GRASS_3,         logic->CanCutShrubs() && logic->CanReflectNuts()),
+        LOCATION(RC_DEKU_TREE_SLINGSHOT_GRASS_4,         logic->CanCutShrubs() && logic->CanReflectNuts()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_2F_MIDDLE_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_COMPASS_ROOM] = Region("Deku Tree Compass Room", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -58,21 +68,25 @@ void RegionTable_Init_DekuTree() {
         LOCATION(RC_DEKU_TREE_COMPASS_CHEST,           true),
         LOCATION(RC_DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, true),
         LOCATION(RC_DEKU_TREE_GS_COMPASS_ROOM,         logic->CanAttack()),
+        LOCATION(RC_DEKU_TREE_COMPASS_GRASS_1,         logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_COMPASS_GRASS_2,         logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_LOBBY,         []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}),
         Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, []{return false;}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_BASEMENT_LOWER] = Region("Deku Tree Basement Lower", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
     }, {
         //Locations
         LOCATION(RC_DEKU_TREE_BASEMENT_CHEST,    true),
-        LOCATION(RC_DEKU_TREE_GS_BASEMENT_GATE,  logic->CanJumpslashExceptHammer() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
-        LOCATION(RC_DEKU_TREE_GS_BASEMENT_VINES, logic->CanUseProjectile() || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) && logic->CanJumpslashExceptHammer())),
+        LOCATION(RC_DEKU_TREE_GS_BASEMENT_GATE,  logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_SHORT_JUMPSLASH)),
+        LOCATION(RC_DEKU_TREE_GS_BASEMENT_VINES, logic->CanKillEnemy(RE_GOLD_SKULLTULA, ctx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS) ? ED_SHORT_JUMPSLASH : ED_BOMB_THROW)),
+        LOCATION(RC_DEKU_TREE_BASEMENT_GRASS_1,  logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_GRASS_2,  logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_LOBBY,               []{return true;}),
@@ -81,46 +95,64 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   []{return false;}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Region("Deku Tree Basement Scrub Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_BASEMENT_SCRUB_ROOM] = Region("Deku Tree Basement Scrub Room", SCENE_DEKU_TREE, {}, {
+        //Location
+        LOCATION(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_LOWER,            []{return true;}),
-        Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, []{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);});}),
+        Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, []{return Here(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM, []{return logic->CanHitEyeTargets();});}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree Basement Water Room Front", SCENE_DEKU_TREE, {}, {}, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_SCRUB_ROOM,      []{return true;}),
         Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, []{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree Basement Water Room Back", SCENE_DEKU_TREE, {}, {
+        //Locations
+        LOCATION(RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_FRONT, []{return logic->HasItem(RG_BRONZE_SCALE) || ctx->GetTrickOption(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG);}),
         Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM,       []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_BASEMENT_TORCH_ROOM] = Region("Deku Tree Basement Torch Room", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
-    }, {}, {
+    }, {
+        //Locations
+        LOCATION(RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_2, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_WATER_ROOM_BACK, []{return true;}),
         Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY,      []{return Here(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_BASEMENT_BACK_LOBBY] = Region("Deku Tree Basement Back Lobby", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
-    }, {}, {
+    }, {
+        //Location
+        LOCATION(RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_2, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_TORCH_ROOM, []{return true;}),
         Entrance(RR_DEKU_TREE_BASEMENT_BACK_ROOM,  []{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) && Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->BlastOrSmash();});}),
         Entrance(RR_DEKU_TREE_BASEMENT_UPPER,      []{return Here(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);}) && logic->IsChild;}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_BASEMENT_BACK_ROOM] = Region("Deku Tree Basement Back Room", SCENE_DEKU_TREE, {}, {
         //Locations
         LOCATION(RC_DEKU_TREE_GS_BASEMENT_BACK_ROOM, logic->HookshotOrBoomerang()),
     }, {
@@ -128,7 +160,7 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_BASEMENT_BACK_LOBBY, []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_BASEMENT_UPPER] = Region("Deku Tree Basement Upper", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -139,11 +171,14 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,   []{return Here(RR_DEKU_TREE_BASEMENT_UPPER, []{return logic->HasFireSourceWithTorch() || (ctx->GetTrickOption(RT_DEKU_B1_BOW_WEBS) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));});}),
     });
 
-    areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_OUTSIDE_BOSS_ROOM] = Region("Deku Tree Outside Boss Room", SCENE_DEKU_TREE, {}, {
         //Locations
-        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_LEFT_HEART,   logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
-        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART, logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
-        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART,  logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_LEFT_HEART,       logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART,     logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART,      logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_GRASS_1,          logic->CanCutShrubs() && logic->HasFireSourceWithTorch()),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_GRASS_2,          logic->CanCutShrubs() && logic->HasFireSourceWithTorch()),
+        LOCATION(RC_DEKU_TREE_BEFORE_BOSS_GRASS_3,          logic->CanCutShrubs() && logic->HasFireSourceWithTorch()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_BASEMENT_UPPER, []{return true;}),
@@ -154,11 +189,18 @@ void RegionTable_Init_DekuTree() {
 
 #pragma region MQ
 
-    areaTable[RR_DEKU_TREE_MQ_1F] = Region("Deku Tree MQ 1F", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_1F] = Region("Deku Tree MQ 1F", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanKillEnemy(RE_WITHERED_DEKU_BABA);}),
         EventAccess(&logic->BrokeDeku1FWeb, []{return logic->HasFireSource();}),
-    }, {}, {
+    }, {
+        //Locations
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_4, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_5, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_ENTRYWAY,    []{return true;}),
         //may need canAvoid logic with enemy shuffle
@@ -170,11 +212,14 @@ void RegionTable_Init_DekuTree() {
         //is it possible to recoil from here to the ledge with a trick?
     });
 
-    areaTable[RR_DEKU_TREE_MQ_2F] = Region("Deku Tree MQ 2F", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_2F] = Region("Deku Tree MQ 2F", SCENE_DEKU_TREE, {}, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_MAP_CHEST,   true),
-        LOCATION(RC_DEKU_TREE_MQ_GS_LOBBY,    logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
-        LOCATION(RC_DEKU_TREE_MQ_LOBBY_HEART, true),
+        LOCATION(RC_DEKU_TREE_MQ_MAP_CHEST,     true),
+        LOCATION(RC_DEKU_TREE_MQ_GS_LOBBY,      logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_HEART,   true),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_6, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_GRASS_7, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_LOBBY_CRATE,   logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_1F,              []{return true;}),
@@ -183,7 +228,7 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_EYE_TARGET_ROOM, []{return Here(RR_DEKU_TREE_MQ_2F, []{return logic->HasFireSource();});}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_3F] = Region("Deku Tree MQ 3F", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_3F] = Region("Deku Tree MQ 3F", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks,    []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,      []{return logic->CanGetDekuBabaNuts();}),
@@ -194,6 +239,12 @@ void RegionTable_Init_DekuTree() {
         LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_CHEST,           logic->CanKillEnemy(RE_DEKU_BABA)),
         LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, logic->HasFireSourceWithTorch() || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW))),
         LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_HEART,      true),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_1,         logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_2,         logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_3,         logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_4,         logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1,    logic->CanBreakCrates()),
+        LOCATION(RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2,    logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_2F,              []{return true;}),
@@ -202,25 +253,36 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_BASEMENT,        []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_EYE_TARGET_ROOM] = Region("Deku Tree MQ Eye Target Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_EYE_TARGET_ROOM] = Region("Deku Tree MQ Eye Target Room", SCENE_DEKU_TREE, {}, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_DEKU_BABA_HEART, true),
+        LOCATION(RC_DEKU_TREE_MQ_DEKU_BABA_HEART,        true),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return Here(RR_DEKU_TREE_MQ_EYE_TARGET_ROOM, []{return logic->CanHitEyeTargets();});}),
         Entrance(RR_DEKU_TREE_MQ_2F,           []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_COMPASS_ROOM] = Region("Deku Tree MQ Compass Room", SCENE_DEKU_TREE, {}, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST, true),
+        LOCATION(RC_DEKU_TREE_MQ_COMPASS_CHEST,   true),
+        LOCATION(RC_DEKU_TREE_MQ_COMPASS_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_COMPASS_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_COMPASS_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_COMPASS_GRASS_4, logic->CanCutShrubs()),
     }, {
         //Exits
-        Entrance(RR_DEKU_TREE_MQ_EYE_TARGET_ROOM,    []{return true;}),
+        Entrance(RR_DEKU_TREE_MQ_EYE_TARGET_ROOM,    []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}),
         Entrance(RR_DEKU_TREE_MQ_PAST_BOULDER_VINES, []{return Here(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->CanUse(RG_BOMBCHU_5) || (logic->CanUse(RG_BOMB_BAG) && (logic->CanUse(RG_SONG_OF_TIME) || logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS))) || (logic->CanUse(RG_MEGATON_HAMMER) && (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_DEKU_MQ_COMPASS_GS)));});}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_PAST_BOULDER_VINES] = Region("Deku Tree MQ Past Boulder Vines", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_PAST_BOULDER_VINES] = Region("Deku Tree MQ Past Boulder Vines", SCENE_DEKU_TREE, {}, {
         //Locations
         LOCATION(RC_DEKU_TREE_MQ_GS_PAST_BOULDER_VINES, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
         LOCATION(RC_DEKU_TREE_MQ_COMPASS_ROOM_HEART,    true),
@@ -229,13 +291,17 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_COMPASS_ROOM, []{return logic->BlastOrSmash();}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT] = Region("Deku Tree MQ Basement", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT] = Region("Deku Tree MQ Basement", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
     }, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_CHEST, logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW)),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_CHEST,         logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW)),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_1F,                        []{return true;}),
@@ -245,57 +311,77 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,            []{return ctx->GetTrickOption(RT_DEKU_B1_SKIP) || logic->PushedDekuBasementBlock || logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_SOUTHEAST_ROOM] = Region("Deku Tree MQ Southeast Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_SOUTHEAST_ROOM] = Region("Deku Tree MQ Southeast Room", SCENE_DEKU_TREE, {
         //Events
         //Implies CanKillEnemy(RE_GOHMA_LARVA)
         EventAccess(&logic->ClearedMQDekuSERoom, []{return logic->CanKillEnemy(RE_MAD_SCRUB);}),
-    }, {}, {
+    }, {
+        //Locations
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return logic->HasFireSource();}),
         Entrance(RR_DEKU_TREE_MQ_BASEMENT,                  []{return logic->ClearedMQDekuSERoom;}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree MQ Basement Water Room Front", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT] = Region("Deku Tree MQ Basement Water Room Front", SCENE_DEKU_TREE, {
         //Events
         //It's possible to get this with bow if you have move while in first person and one-point skips on, noticeably harder and jankier as child, but that's a trick
         EventAccess(&logic->MQDekuWaterRoomTorches, []{return logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_STICKS) && (ctx->GetTrickOption(RT_DEKU_MQ_LOG) || (logic->IsChild && logic->CanShield())));}),
     }, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST, true),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,           true),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return ctx->GetTrickOption(RT_DEKU_MQ_LOG) || (logic->IsChild && logic->CanShield()) || logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS));}),
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_SOUTHEAST_ROOM,  []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree MQ Basement Water Room Back", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK] = Region("Deku Tree MQ Basement Water Room Back", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks,         []{return logic->CanKillEnemy(RE_WITHERED_DEKU_BABA);}),
         EventAccess(&logic->MQDekuWaterRoomTorches, []{return logic->HasFireSource();}),
     }, {
         //Locations
         //it blocks the chest while stunned unless you stun it from afar while it's slightly off the ground
-        LOCATION(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST, logic->CanUse(RG_SONG_OF_TIME) && logic->CanPassEnemy(RE_BIG_SKULLTULA)),
+        LOCATION(RC_DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,           logic->CanUse(RG_SONG_OF_TIME) && logic->CanPassEnemy(RE_BIG_SKULLTULA)),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_SOUTHWEST_ROOM,   []{return logic->MQDekuWaterRoomTorches && logic->CanPassEnemy(RE_BIG_SKULLTULA, logic->CanUse(RG_SONG_OF_TIME) ? ED_CLOSE : ED_SHORT_JUMPSLASH);}),
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return ctx->GetTrickOption(RT_DEKU_MQ_LOG) || (logic->IsChild && logic->CanShield()) || logic->CanUse(RG_LONGSHOT) || logic->HasItem(RG_BRONZE_SCALE) || (logic->CanUse(RG_IRON_BOOTS) && (logic->IsAdult || logic->CanUse(RG_HOOKSHOT)));}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_SOUTHWEST_ROOM] = Region("Deku Tree MQ Basement Southwest Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_SOUTHWEST_ROOM] = Region("Deku Tree MQ Basement Southwest Room", SCENE_DEKU_TREE, {}, {
+        //Locations
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2, logic->CanCutShrubs()),
+        }, {
         //Exits
         //both imply CanKillEnemy(RE_GOHMA_LARVA)
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM,      []{return Here(RR_DEKU_TREE_MQ_BASEMENT_SOUTHWEST_ROOM, []{return logic->CanKillEnemy(RE_MAD_SCRUB) && logic->CanKillEnemy(RE_KEESE);});}),
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return Here(RR_DEKU_TREE_MQ_BASEMENT_SOUTHWEST_ROOM, []{return logic->CanKillEnemy(RE_MAD_SCRUB) && logic->CanKillEnemy(RE_KEESE);});}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM] = Region("Deku Tree MQ Basement Grave Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM] = Region("Deku Tree MQ Basement Grave Room", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();})
     }, {
         //Locations
         LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM, logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_SONG_OF_TIME) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG))),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE,          []{return logic->IsChild && Here(RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}),
@@ -304,20 +390,26 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM,      []{return Here(RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM, []{return logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW);});}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_BACK_ROOM] = Region("Deku Tree MQ Basement Back Room", SCENE_DEKU_TREE, {}, {
         //Locations
         LOCATION(RC_DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM, []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_MQ_BASEMENT_LEDGE] = Region("Deku Tree MQ Basement Ledge", SCENE_DEKU_TREE, {
         //Events
         EventAccess(&logic->PushedDekuBasementBlock, []{return true;}),
     }, {
         //Locations
-        LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB, logic->CanStunDeku()),
+        LOCATION(RC_DEKU_TREE_MQ_DEKU_SCRUB,             logic->CanStunDeku()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_GRAVE_ROOM, []{return logic->IsChild;}),
@@ -327,11 +419,14 @@ void RegionTable_Init_DekuTree() {
         Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,   []{return Here(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, []{return logic->HasFireSource() || (/*logic->PushedDekuBasementBlock && */logic->CanUse(RG_STICKS));}) && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
     });
 
-    areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] = Region("Deku Tree MQ Outside Boss Room", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM] = Region("Deku Tree MQ Outside Boss Room", SCENE_DEKU_TREE, {}, {
         //Locations
         LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_LEFT_HEART,   logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
         LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_MIDDLE_HEART, logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
         LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_RIGHT_HEART,  logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1,      logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2,      logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3,      logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEKU_TREE_MQ_BASEMENT_LEDGE, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_HOOKSHOT);}),
@@ -341,23 +436,37 @@ void RegionTable_Init_DekuTree() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] = Region("Deku Tree Boss Entryway", "Deku Tree", {RA_DEKU_TREE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DEKU_TREE_BOSS_ENTRYWAY] = Region("Deku Tree Boss Entryway", SCENE_DEKU_TREE, {}, {}, {
+        // Exits
+        Entrance(RR_DEKU_TREE_BOSS_ROOM, []{return true;}),
+    });
+
+    areaTable[RR_DEKU_TREE_BOSS_EXIT] = Region("Deku Tree Boss Exit", SCENE_DEKU_TREE, {}, {}, {
         // Exits
         Entrance(RR_DEKU_TREE_OUTSIDE_BOSS_ROOM,    []{return ctx->GetDungeon(DEKU_TREE)->IsVanilla();}),
         Entrance(RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM, []{return ctx->GetDungeon(DEKU_TREE)->IsMQ();}),
-        Entrance(RR_DEKU_TREE_BOSS_ROOM,            []{return true;}),
     });
 
-    areaTable[RR_DEKU_TREE_BOSS_ROOM] = Region("Deku Tree Boss Room", "Deku Tree", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEKU_TREE_BOSS_ROOM] = Region("Deku Tree Boss Room", SCENE_DEKU_TREE_BOSS, {
         // Events
-        EventAccess(&logic->DekuTreeClear, []{return logic->DekuTreeClear || logic->CanKillEnemy(RE_GOHMA);}),
+        EventAccess(&logic->DekuTreeClear, []{return logic->CanKillEnemy(RE_GOHMA);}),
     }, {
         // Locations
-        LOCATION(RC_QUEEN_GOHMA,                 logic->DekuTreeClear),
-        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_HEART, logic->DekuTreeClear),
+        LOCATION(RC_QUEEN_GOHMA,                   logic->DekuTreeClear),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_HEART,   logic->DekuTreeClear),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_4, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_5, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_6, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_7, logic->CanCutShrubs()),
+        LOCATION(RC_DEKU_TREE_QUEEN_GOHMA_GRASS_8, logic->CanCutShrubs()),
     }, {
         // Exits
-        Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, []{return true;}),
-        Entrance(RR_KF_OUTSIDE_DEKU_TREE,    []{return logic->DekuTreeClear;}, false),
+        Entrance(RR_DEKU_TREE_BOSS_EXIT,  []{return true;}),
+        Entrance(RR_KF_OUTSIDE_DEKU_TREE, []{return logic->DekuTreeClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp
index bb5e1754f0..d8e64f9969 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_DodongosCavern() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_ENTRYWAY] = Region("Dodongos Cavern Entryway", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_BEGINNING,    []{return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}),
         Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}),
@@ -15,13 +16,13 @@ void RegionTable_Init_DodongosCavern() {
 
 #pragma region Vanilla
 
-    areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_BEGINNING] = Region("Dodongos Cavern Beginning", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_LOBBY,    []{return Here(RR_DODONGOS_CAVERN_BEGINNING, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_LOBBY] = Region("Dodongos Cavern Lobby", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return (Here(RR_DODONGOS_CAVERN_LOBBY, []{return logic->CanBreakMudWalls();}) || logic->HasItem(RG_GORONS_BRACELET)) && logic->CallGossipFairy();}),
     }, {
@@ -42,13 +43,13 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, []{return false;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Region("Dodongos Cavern Lobby Switch", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_LOBBY_SWITCH] = Region("Dodongos Cavern Lobby Switch", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_LOBBY,        []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_SE_CORRIDOR] = Region("Dodongos Cavern SE Corridor", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_GS_SCARECROW,    logic->CanUse(RG_SCARECROW) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_DC_SCARECROW_GS) && (logic->CanAttack()))),
         LOCATION(RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1, logic->CanBreakPots()),
@@ -65,7 +66,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_SE_ROOM] = Region("Dodongos Cavern SE Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, logic->CanAttack()),
     }, {
@@ -73,13 +74,13 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Region("Dodongos Cavern Near Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS] = Region("Dodongos Cavern Near Lower Lizalfos", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_SE_CORRIDOR,    []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_LOWER_LIZALFOS] = Region("Dodongos Cavern Lower Lizalfos", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_LIZALFOS_POT_1,       logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_LIZALFOS_POT_2,       logic->CanBreakPots()),
@@ -92,7 +93,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM,        []{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_DODONGO_ROOM] = Region("Dodongos Cavern Dodongo Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2, logic->CanBreakPots()),
@@ -105,7 +106,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM, []{return Here(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_NEAR_DODONGO_ROOM] = Region("Dodongos Cavern Near Dodongo Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS, logic->CanStunDeku()),
     }, {
@@ -113,14 +114,14 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_DODONGO_ROOM, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_STAIRS_LOWER] = Region("Dodongos Cavern Stairs Lower", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_LOBBY,        []{return true;}),
-        Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, []{return logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}),
+        Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER, []{return logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRS_WITH_BOW) && logic->CanUse(RG_FAIRY_BOW));}),
         Entrance(RR_DODONGOS_CAVERN_COMPASS_ROOM, []{return Here(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_STAIRS_UPPER] = Region("Dodongos Cavern Stairs Upper", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->HookshotOrBoomerang();}) || logic->CanUse(RG_LONGSHOT)),
         LOCATION(RC_DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,  logic->IsAdult || logic->CanAttack() || (HasAccessTo(RR_DODONGOS_CAVERN_STAIRS_LOWER) && logic->CanUse(RG_LONGSHOT) && ctx->GetTrickOption(RT_DC_VINES_GS))),
@@ -134,7 +135,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,   []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Region("Dodongos Cavern Compass Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_COMPASS_ROOM] = Region("Dodongos Cavern Compass Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_COMPASS_CHEST, true),
     }, {
@@ -142,24 +143,27 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_STAIRS_LOWER, []{return logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET);}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_ARMOS_ROOM] = Region("Dodongos Cavern Armos Room", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_STAIRS_UPPER,    []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Region("Dodongos Cavern Bomb Room Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER] = Region("Dodongos Cavern Bomb Room Lower", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST, true),
         LOCATION(RC_DODONGOS_CAVERN_BLADE_ROOM_HEART,           true),
+        LOCATION(RC_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS,         logic->CanCutShrubs()),
+        LOCATION(RC_DODONGOS_CAVERN_BLADE_GRASS,                logic->CanCutShrubs()),
     }, {
         //Exits
+        Entrance(RR_DODONGOS_CAVERN_ARMOS_ROOM,           []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_2F_SIDE_ROOM,         []{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBreakMudWalls() || (ctx->GetTrickOption(RT_DC_SCRUB_ROOM) && logic->HasItem(RG_GORONS_BRACELET));});}),
         Entrance(RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, []{return Here(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER,      []{return (logic->IsAdult && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanJumpslash());}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_2F_SIDE_ROOM] = Region("Dodongos Cavern 2F Side Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,  logic->CanStunDeku()),
         LOCATION(RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT, logic->CanStunDeku()),
@@ -168,17 +172,18 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM] = Region("Dodongos Cavern First Slingshot Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_SINGLE_EYE_GRASS, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_LOWER, []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_UPPER_LIZALFOS,  []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_UPPER_LIZALFOS] = Region("Dodongos Cavern Upper Lizalfos", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_LOWER_LIZALFOS_HEART,       true),
         LOCATION(RC_DODONGOS_CAVERN_UPPER_LIZALFOS_LEFT_HEART,  true),
@@ -190,7 +195,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, []{return Here(RR_DODONGOS_CAVERN_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Region("Dodongos Cavern Second Slingshot Room", SCENE_DODONGOS_CAVERN, {}, {
         //Location
         LOCATION(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2, logic->CanBreakPots()),
@@ -200,7 +205,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || ctx->GetTrickOption(RT_DC_SLINGSHOT_SKIP);}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER] = Region("Dodongos Cavern Bomb Room Upper", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_BOMB_BAG_CHEST, true),
         LOCATION(RC_DODONGOS_CAVERN_BLADE_POT_1,    logic->CanBreakPots()),
@@ -212,7 +217,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_FAR_BRIDGE,            []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_FAR_BRIDGE] = Region("Dodongos Cavern Far Bridge", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_END_OF_BRIDGE_CHEST, Here(RR_DODONGOS_CAVERN_FAR_BRIDGE, []{return logic->CanBreakMudWalls();})),
     }, {
@@ -221,17 +226,20 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_BOMB_ROOM_UPPER, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Region("Dodongos Cavern Boss Region", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_BOSS_AREA] = Region("Dodongos Cavern Boss Region", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
-    }, {}, {
+    }, {
+        //Location
+        LOCATION(RC_DODONGOS_CAVERN_BEFORE_BOSS_GRASS, logic->CanCutShrubs()),
+    }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_LOBBY,         []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_BACK_ROOM,     []{return Here(RR_DODONGOS_CAVERN_BOSS_AREA, []{return logic->CanBreakMudWalls();});}),
         Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_BACK_ROOM] = Region("Dodongos Cavern Back Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_GS_BACK_ROOM,    logic->CanAttack()),
         LOCATION(RC_DODONGOS_CAVERN_BACK_ROOM_POT_1, logic->CanBreakPots()),
@@ -247,19 +255,20 @@ void RegionTable_Init_DodongosCavern() {
 
 #pragma region MQ
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_BEGINNING] = Region("Dodongos Cavern MQ Beginning", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_ENTRYWAY, []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return Here(RR_DODONGOS_CAVERN_MQ_BEGINNING, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_LOBBY] = Region("Dodongos Cavern MQ Lobby", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_MAP_CHEST,              logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET)),
         LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,  logic->CanStunDeku()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT, logic->CanStunDeku()),
     }, {
         //Exits
+        Entrance(RR_DODONGOS_CAVERN_MQ_BEGINNING,         []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_MQ_GOSSIP_STONE,      []{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET);});}),
         Entrance(RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE, []{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}),
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER,      []{return Here(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return logic->BlastOrSmash() || logic->HasItem(RG_GORONS_BRACELET);});}),
@@ -268,7 +277,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,      []{return Here(RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE, []{return logic->HasExplosives() || (logic->ClearMQDCUpperLobbyRocks && logic->HasItem(RG_GORONS_BRACELET) && ((logic->IsAdult && ctx->GetTrickOption(RT_DC_MQ_ADULT_EYES)) || (logic->IsChild && ctx->GetTrickOption(RT_DC_MQ_CHILD_EYES))));});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_GOSSIP_STONE] = Region("Dodongos Cavern MQ Gossip Stone", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_GOSSIP_STONE] = Region("Dodongos Cavern MQ Gossip Stone", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
     }, {
@@ -281,7 +290,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE] = Region("Dodongos Cavern MQ Mouth Side Bridge", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_MOUTH_SIDE_BRIDGE] = Region("Dodongos Cavern MQ Mouth Side Bridge", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->ClearMQDCUpperLobbyRocks, []{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE);}),
     }, {}, {
@@ -293,23 +302,26 @@ void RegionTable_Init_DodongosCavern() {
         //it is possible to use bunny hood speed, hovers and a jumpslash to go between here and the other bridge (included with TORCH_ROOM_LOWER), but this would be a trick
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER] = Region("Dodongos Cavern MQ Stairs Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER] = Region("Dodongos Cavern MQ Stairs Lower", SCENE_DODONGOS_CAVERN, {
         //Events
-        //EventAccess(&logic->CanClimbDCStairs, []{return logic->HasExplosives || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));}),
+        //EventAccess(&logic->CanClimbDCStairs, []{return logic->HasExplosives || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRS_WITH_BOW) && logic->CanUse(RG_FAIRY_BOW));}),
     }, {
         //Locations
-        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4, logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1,         logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2,         logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3,         logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4,         logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2, logic->CanBreakCrates()),
     }, {
         //Exits
+        Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,               []{return true;}),
         //This is possible with sticks and shield, igniting a first flower by "touch" then very quickly crouch stabbing in a way that cuts the corner to light the 3rd bomb on the other side, but that's a trick
-        Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER,         []{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRCASE) && logic->CanUse(RG_FAIRY_BOW));});}),
+        Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER,         []{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->HasExplosives() || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRS_WITH_BOW) && logic->CanUse(RG_FAIRY_BOW));});}),
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL, []{return Here(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->CanBreakMudWalls();});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL] = Region("Dodongos Cavern MQ Stairs Past Mud Wall", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_MUD_WALL] = Region("Dodongos Cavern MQ Stairs Past Mud Wall", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         //EventAccess(&logic->CanClimbDCStairs, []{return logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS));}),
@@ -318,20 +330,24 @@ void RegionTable_Init_DodongosCavern() {
         LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, logic->CanUse(RG_SONG_OF_TIME) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
     }, {
         //Exits
-        Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, []{return logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS));}),
+        Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, []{return logic->HasExplosives() || (logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_STICKS) || ctx->GetTrickOption(RT_DC_MQ_STAIRS_WITH_ONLY_STRENGTH))) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_DC_STAIRS_WITH_BOW) && logic->CanUse(RG_FAIRY_BOW));}),
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
-        LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, logic->CanStunDeku()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,    logic->CanStunDeku()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER,               []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, []{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", SCENE_DODONGOS_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, []{return logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS);}),
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, []{return logic->TakeDamage();}),
@@ -341,16 +357,20 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, []{return true;}),//if we add BONKO or other crate logic, logic for silver rupees goes here
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
-        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST, logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET)),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_CHEST,   logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET)),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3, logic->CanCutShrubs()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER,         []{return Here(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, []{return logic->CanKillEnemy(RE_DODONGO) || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER] = Region("Dodongos Cavern MQ Torch Puzzle Lower", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->ClearMQDCUpperLobbyRocks, []{return (((logic->IsAdult /*or bunny hood jump*/) && ctx->GetTrickOption(RT_DC_JUMP)) || logic->CanUse(RG_HOVER_BOOTS)) && logic->CanUse(RG_STICKS);}),
     }, {
@@ -367,7 +387,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     []{return logic->CanUse(RG_STICKS) && logic->HasItem(RG_GORONS_BRACELET);}), //Implies access to RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM from here
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM] = Region("Dodongos Cavern MQ Torch Puzzle Lower", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_BIG_BLOCK_ROOM] = Region("Dodongos Cavern MQ Torch Puzzle Lower", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2, logic->CanBreakPots()),
@@ -377,16 +397,22 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     []{return (logic->HasFireSource() && logic->HasItem(RG_GORONS_BRACELET)) || logic->CanBreakMudWalls();}), //Requires stregnth 0, If you can somehow warp into this room, add logic->CanPassEnemy(RE_BIG_SKULLTULA)
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM] = Region("Dodongos Cavern MQ Larvae Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_LARVAE_ROOM] = Region("Dodongos Cavern MQ Larvae Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
-        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, true), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
-        LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,    true), //implied logic->CanKillEnemy(RE_GOLD_SKULTULLA) based on entry reqs. Add crate logic when BONKO is added
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,   true), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
+        LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,      logic->CanBreakCrates()), //implied logic->CanKillEnemy(RE_GOLD_SKULTULLA) based on entry reqs. Add crate logic when BONKO is added
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5, logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_LOWER, []{return true;}), //implied logic->CanKillEnemy(RE_GOHMA_LARVA) based on entry reqs with a trick to kill with nuts
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS] = Region("Dodongos Cavern MQ Before Upper Lizalfos", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,     logic->BlastOrSmash()), //Implied CanGetEnemyDrop(RE_GOLD_SKULLTULA)
         LOCATION(RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1, logic->CanBreakPots()),
@@ -401,17 +427,19 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, []{return Here(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM] = Region("Dodongos Cavern MQ Before Upper Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM] = Region("Dodongos Cavern MQ Before Upper Lizalfos", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
-        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1,    logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2,    logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1,  logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2,  logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS,     []{return true;}),
         Entrance(RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER, []{return logic->IsAdult || (Here(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM, []{return logic->BlastOrSmash() || (logic->CanAttack() && logic->HasItem(RG_GORONS_BRACELET));}));}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER] = Region("Dodongos Cavern MQ Torch Puzzle Upper", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_UPPER] = Region("Dodongos Cavern MQ Torch Puzzle Upper", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->ClearMQDCUpperLobbyRocks, []{return logic->CanDetonateUprightBombFlower() || logic->CanUse(RG_MEGATON_HAMMER);}),
     }, {
@@ -426,7 +454,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_TWO_FIRES_ROOM,     []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE] = Region("Dodongos Cavern MQ Lower Right Side", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, (logic->CanBreakMudWalls() || logic->HasItem(RG_GORONS_BRACELET)) && logic->CanStunDeku()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1,                         logic->CanBreakPots()),
@@ -439,7 +467,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && logic->CanHitEyeTargets();}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS] = Region("Dodongos Cavern MQ Lower Lizalfos", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS] = Region("Dodongos Cavern MQ Lower Lizalfos", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_LIZALFOS_ROOM_HEART, true),
     }, {
@@ -448,33 +476,43 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM,        []{return Here(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return logic->CanKillEnemy(RE_LIZALFOS);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_POES_ROOM] = Region("Dodongos Cavern MQ Poes Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_POES_ROOM] = Region("Dodongos Cavern MQ Poes Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST, true), //If you can get to the locked part of POES_ROOM without a way to open it or passing the chest, this will need it's own room
         LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,  (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);}) && //could be a seperate room if it gets busy
                                                                                                         logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG, true))), //Implies you can avoid/kill the enemies with what you use on the skull, if this assumption is broken, add
                                                                                                     //&& (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);}) || (logic->CanAvoidEnemy(RE_FIRE_KEESE) && logic->CanAvoidEnemy(RE_MAD_SCRUB)))
-        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3, logic->CanBreakPots()),
-        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4, logic->CanBreakPots()),
-    }, {
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1,      logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2,      logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3,      logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4,      logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7,    logic->CanBreakCrates()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8,    logic->CanBreakCrates()),
+        }, {
         //Exits
-        Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_RIGHT_SIDE, []{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}),
-        Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS,   []{return true;}),
-        Entrance(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM,   []{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}),
+        Entrance(RR_DODONGOS_CAVERN_MQ_LOBBY,          []{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}),
+        Entrance(RR_DODONGOS_CAVERN_MQ_LOWER_LIZALFOS, []{return true;}),
+        Entrance(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM, []{return Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM] = Region("Dodongos Cavern Mad Scrub Room", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM] = Region("Dodongos Cavern Mad Scrub Room", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM, (logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG, true))), //Implies you can avoid/kill the enemies with what you use on the skull, if this assumption is broken, add
                                                                                                     //&& (Here(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);}) || (logic->CanAvoidEnemy(RE_FIRE_KEESE) && logic->CanAvoidEnemy(RE_MAD_SCRUB)))
+        LOCATION(RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_POES_ROOM, []{return Here(RR_DODONGOS_CAVERN_MQ_MAD_SCRUB_ROOM, []{return logic->CanKillEnemy(RE_FIRE_KEESE) && logic->CanKillEnemy(RE_MAD_SCRUB);});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH] = Region("Dodongos Cavern MQ Behind Mouth", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH] = Region("Dodongos Cavern MQ Behind Mouth", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT, logic->CanBreakPots()),
@@ -489,11 +527,12 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE, []{return logic->IsAdult;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE] = Region("Dodongos Cavern MQ Back Behind Fire", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE] = Region("Dodongos Cavern MQ Back Behind Fire", SCENE_DODONGOS_CAVERN, {}, {
         //Locations
         LOCATION(RC_DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST, true), //pulling the grave isn't required, as you can open the chest through it
         LOCATION(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1,    logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2,    logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_BACK_POE_GRASS,    logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,      []{return logic->CanAttack();}),
@@ -501,7 +540,7 @@ void RegionTable_Init_DodongosCavern() {
         Entrance(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE, []{return Here(RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE, []{return logic->CanDetonateBombFlowers();}) || Here(RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE, []{return logic->CanAttack();});}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE] = Region("Dodongos Cavern MQ BossArea", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE] = Region("Dodongos Cavern MQ BossArea", SCENE_DODONGOS_CAVERN, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -510,6 +549,7 @@ void RegionTable_Init_DodongosCavern() {
                                                                                                         Here(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH, []{return (logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) /* || bunny jumps*/);})),
         LOCATION(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT, logic->CanBreakPots()),
         LOCATION(RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT, logic->CanBreakPots()),
+        LOCATION(RC_DODONGOS_CAVERN_MQ_ARMOS_GRASS,       logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE, []{return true;}),
@@ -519,16 +559,24 @@ void RegionTable_Init_DodongosCavern() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] = Region("Dodongos Cavern Boss Entryway", "Dodongos Cavern", {RA_DODONGOS_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DODONGOS_CAVERN_BOSS_ENTRYWAY] = Region("Dodongos Cavern Boss Entryway", SCENE_DODONGOS_CAVERN, {}, {}, {
+        // Exits
+        Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM, []{return true;}),
+    });
+
+    areaTable[RR_DODONGOS_CAVERN_BOSS_EXIT] = Region("Dodongos Cavern Boss Exit", SCENE_DODONGOS_CAVERN, {}, {}, {
         // Exits
         Entrance(RR_DODONGOS_CAVERN_BOSS_AREA,       []{return ctx->GetDungeon(DODONGOS_CAVERN)->IsVanilla();}),
         Entrance(RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH, []{return ctx->GetDungeon(DODONGOS_CAVERN)->IsMQ();}),
-        Entrance(RR_DODONGOS_CAVERN_BOSS_ROOM,       []{return true;}),
     });
 
-    areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] = Region("Dodongos Cavern Boss Room", "Dodongos Cavern", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DODONGOS_CAVERN_BOSS_ROOM] = Region("Dodongos Cavern Boss Room", SCENE_DODONGOS_CAVERN_BOSS, {
         // Events
-        EventAccess(&logic->DodongosCavernClear, []{return logic->DodongosCavernClear || (Here(RR_DODONGOS_CAVERN_BOSS_ROOM, []{return logic->HasExplosives() || (logic->CanUse(RG_MEGATON_HAMMER) && ctx->GetTrickOption(RT_DC_HAMMER_FLOOR));}) && logic->CanKillEnemy(RE_KING_DODONGO)); /*todo add chu kill to tricks*/}),
+        // Blue Fire Arrows need similar accuracy as hammer trick, only put in logic when both hammer & blue fire tricks enabled
+        EventAccess(&logic->DodongosCavernClear, []{return Here(RR_DODONGOS_CAVERN_BOSS_ROOM, []{return logic->HasExplosives() ||
+                                                                                                         (ctx->GetTrickOption(RT_DC_HAMMER_FLOOR) ? logic->CanUse(RG_MEGATON_HAMMER) || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && logic->BlueFire()) :
+                                                                                                                                                    ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && logic->CanUse(RG_BOTTLE_WITH_BLUE_FIRE));})
+                                                                                                         && logic->CanKillEnemy(RE_KING_DODONGO);}),
     }, {
         // Locations
         LOCATION(RC_DODONGOS_CAVERN_BOSS_ROOM_CHEST,    true),
@@ -536,7 +584,9 @@ void RegionTable_Init_DodongosCavern() {
         LOCATION(RC_KING_DODONGO,                       logic->DodongosCavernClear),
     }, {
         // Exits
-        Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, []{return true;}),
-        Entrance(RR_DEATH_MOUNTAIN_TRAIL,          []{return logic->DodongosCavernClear;}, false),
+        Entrance(RR_DODONGOS_CAVERN_BOSS_EXIT, []{return true;}),
+        Entrance(RR_DEATH_MOUNTAIN_TRAIL,      []{return logic->DodongosCavernClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/fire_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/fire_temple.cpp
index 1e7214a3d9..f57d6bd218 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/fire_temple.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_FireTemple() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_ENTRYWAY] = Region("Fire Temple Entryway", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,          []{return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla();}),
         Entrance(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER, []{return ctx->GetDungeon(FIRE_TEMPLE)->IsMQ();}),
@@ -15,18 +16,18 @@ void RegionTable_Init_FireTemple() {
 
 #pragma region Vanilla
 
-    areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRST_ROOM] = Region("Fire Temple First Room", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_ENTRYWAY,       []{return true;}),
         Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, []{return logic->FireTimer() >= 24;}),
-        Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   []{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER);}) && (logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity);}),
+        Entrance(RR_FIRE_TEMPLE_LOOP_ENEMIES,   []{return Here(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER);}) && (logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsFireLoopLocked);}),
         Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,      []{return true;}),
         Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM,  []{return logic->SmallKeys(RR_FIRE_TEMPLE, 2) && logic->FireTimer() >= 24;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_NEAR_BOSS_ROOM] = Region("Fire Temple Near Boss Room", SCENE_FIRE_TEMPLE, {
         //Events
-        EventAccess(&logic->FairyPot, []{return logic->FairyPot || (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}),
+        EventAccess(&logic->FairyPot, []{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}),
     }, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_NEAR_BOSS_CHEST, true),
@@ -37,16 +38,16 @@ void RegionTable_Init_FireTemple() {
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,    []{return true;}),
-        Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, []{return logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY) && ((logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}))) || logic->CanUse(RG_HOVER_BOOTS));}),
+        Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, []{return logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || Here(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}) || logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_ENEMIES] = Region("Fire Temple Loop Enemies", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
-        Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsKeysanity;}),
+        Entrance(RR_FIRE_TEMPLE_FIRST_ROOM, []{return logic->SmallKeys(RR_FIRE_TEMPLE, 8) || !logic->IsFireLoopLocked;}),
         Entrance(RR_FIRE_TEMPLE_LOOP_TILES, []{return Here(RR_FIRE_TEMPLE_LOOP_ENEMIES, []{return logic->CanKillEnemy(RE_TORCH_SLUG) && logic->CanKillEnemy(RE_FIRE_KEESE);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_TILES] = Region("Fire Temple Loop Tiles", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_GS_BOSS_KEY_LOOP, logic->CanAttack()),
     }, {
@@ -55,7 +56,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_FLARE_DANCER] = Region("Fire Temple Loop Flare Dancer", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_FLARE_DANCER_CHEST, (logic->HasExplosives() || logic->CanUse(RG_MEGATON_HAMMER)) && logic->IsAdult),
     }, {
@@ -64,16 +65,16 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH, []{return Here(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return logic->CanKillEnemy(RE_FLARE_DANCER);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Region("Fire Temple Loop Hammer Switch", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Region("Fire Temple Loop Hammer Switch", SCENE_FIRE_TEMPLE, {
         //Events
-        EventAccess(&logic->FireLoopSwitch, []{return logic->FireLoopSwitch || logic->CanUse(RG_MEGATON_HAMMER);}),
+        EventAccess(&logic->FireLoopSwitch, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     }, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return true;}),
         Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM,   []{return logic->FireLoopSwitch;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Region("Fire Temple Loop Goron Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_GORON_ROOM] = Region("Fire Temple Loop Goron Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BOSS_KEY_CHEST, true),
     }, {
@@ -82,13 +83,13 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_LOOP_EXIT,          []{return logic->FireLoopSwitch;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Region("Fire Temple Loop Exit", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_LOOP_EXIT] = Region("Fire Temple Loop Exit", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_FIRST_ROOM,      []{return true;}),
         Entrance(RR_FIRE_TEMPLE_LOOP_GORON_ROOM, []{return logic->FireLoopSwitch;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Region("Fire Temple Big Lava Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM] = Region("Fire Temple Big Lava Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_POT_2, logic->CanBreakPots()),
@@ -102,7 +103,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM,          []{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Region("Fire Temple Big Lava Room North Goron", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_GORON] = Region("Fire Temple Big Lava Room North Goron", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST, true),
     }, {
@@ -110,7 +111,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Region("Fire Temple Big Lava Room North Tiles", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //RANDOTODO check if child can reach
         LOCATION(RC_FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, (logic->IsAdult && logic->CanAttack()) || logic->HookshotOrBoomerang()),
@@ -119,7 +120,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Region("Fire Temple Big Lava Room South Goron", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BIG_LAVA_ROOM_SOUTH_GORON] = Region("Fire Temple Big Lava Room South Goron", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, true),
     }, {
@@ -127,7 +128,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BIG_LAVA_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRE_PILLAR_ROOM] = Region("Fire Temple Fire Pillar Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_FIRE_PILLAR_LEFT_HEART,  logic->FireTimer() >= 56),
         LOCATION(RC_FIRE_TEMPLE_FIRE_PILLAR_RIGHT_HEART, logic->FireTimer() >= 56),
@@ -138,7 +139,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM, []{return logic->FireTimer() >= 56 && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_SHORTCUT_ROOM] = Region("Fire Temple Shortcut Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST, Here(RR_FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;})),
     }, {
@@ -148,13 +149,13 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, []{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || ctx->GetTrickOption(RT_FIRE_STRENGTH)) && (logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_SHORTCUT_CLIMB] = Region("Fire Temple Shortcut Climb", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_SHORTCUT_ROOM,      []{return true;}),
         Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Region("Fire Temple Boulder Maze Lower", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, true),
         LOCATION(RC_FIRE_TEMPLE_GS_BOULDER_MAZE,          logic->HasExplosives() && (logic->IsAdult || logic->HookshotOrBoomerang())),
@@ -166,7 +167,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER,           []{return false;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Region("Fire Temple Boulder Maze Lower Side Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER_SIDE_ROOM] = Region("Fire Temple Boulder Maze Lower Side Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST, true),
     }, {
@@ -174,7 +175,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BOULDER_MAZE_LOWER, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM] = Region("Fire Temple East Central Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_EAST_CENTRAL_LEFT_HEART,   true),
         LOCATION(RC_FIRE_TEMPLE_EAST_CENTRAL_RIGHT_HEART,  true),
@@ -187,7 +188,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MAP_AREA,           []{return logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRE_WALL_CHASE] = Region("Fire Temple Fire Wall Chase", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_FIRE_WALL_EAST_HEART, logic->FireTimer() >= 24 && (logic->IsAdult || logic->CanUse(RG_BOOMERANG))),
         LOCATION(RC_FIRE_TEMPLE_FIRE_WALL_WEST_HEART, logic->FireTimer() >= 24 && (logic->IsAdult || logic->CanUse(RG_BOOMERANG))),
@@ -200,7 +201,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_CORRIDOR,           []{return logic->FireTimer() >= 24 && logic->IsAdult && logic->SmallKeys(RR_FIRE_TEMPLE, 7);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MAP_AREA] = Region("Fire Temple Map Region", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MAP_CHEST, true),
     }, {
@@ -208,7 +209,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Region("Fire Temple Boulder Maze Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_BOULDER_MAZE_UPPER] = Region("Fire Temple Boulder Maze Upper", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST, true),
     }, {
@@ -219,7 +220,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_SCARECROW_ROOM,     []{return logic->CanUse(RG_SCARECROW) || (ctx->GetTrickOption(RT_FIRE_SCARECROW) && logic->IsAdult && logic->CanUse(RG_LONGSHOT));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_SCARECROW_ROOM] = Region("Fire Temple Scarecrow Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB, logic->CanJumpslashExceptHammer() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)),
     }, {
@@ -228,7 +229,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_EAST_PEAK,          []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_EAST_PEAK] = Region("Fire Temple East Peak", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_SCARECROW_CHEST,  true),
         LOCATION(RC_FIRE_TEMPLE_GS_SCARECROW_TOP, logic->CanUseProjectile()),
@@ -238,13 +239,13 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_EAST_CENTRAL_ROOM, []{return logic->TakeDamage();}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_CORRIDOR] = Region("Fire Temple Corridor", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_FIRE_WALL_CHASE, []{return logic->SmallKeys(RR_FIRE_TEMPLE, 7);}),
         Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,  []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Region("Fire Temple Fire Maze Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_ROOM] = Region("Fire Temple Fire Maze Room", SCENE_FIRE_TEMPLE, {}, {
         // Locations
         LOCATION(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2, logic->CanBreakPots()),
@@ -259,14 +260,14 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,      []{return ctx->GetTrickOption(RT_FIRE_FLAME_MAZE) || false;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_UPPER] = Region("Fire Temple Fire Maze Upper", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,     []{return logic->CanUse(RG_MEGATON_HAMMER);}),
         Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM,     []{return true;}),
         Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Region("Fire Temple Fire Maze Side Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_FIRE_MAZE_SIDE_ROOM] = Region("Fire Temple Fire Maze Side Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_COMPASS_CHEST, true),
     }, {
@@ -274,7 +275,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER] = Region("Fire Temple West Central Lower", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_HIGHEST_GORON_CHEST, Here(RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER, []{return (logic->CanUse(RG_SONG_OF_TIME) || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);})),
     }, {
@@ -284,14 +285,14 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE,     []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Region("Fire Temple West Central Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_WEST_CENTRAL_UPPER] = Region("Fire Temple West Central Upper", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,      []{return false;}),
         Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    []{return true;}),
         Entrance(RR_FIRE_TEMPLE_WEST_CENTRAL_LOWER, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Region("Fire Temple Late Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_LATE_FIRE_MAZE] = Region("Fire Temple Late Fire Maze", SCENE_FIRE_TEMPLE, {}, {
         // Locations
         LOCATION(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2, logic->CanBreakPots()),
@@ -304,19 +305,19 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->HasExplosives();}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_UPPER_FLARE_DANCER] = Region("Fire Temple Upper Flare Dancer", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_LATE_FIRE_MAZE, []{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanKillEnemy(RE_FLARE_DANCER);});}),
         Entrance(RR_FIRE_TEMPLE_WEST_CLIMB,     []{return Here(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return logic->CanKillEnemy(RE_FLARE_DANCER);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_WEST_CLIMB] = Region("Fire Temple West Climb", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return true;}),
         Entrance(RR_FIRE_TEMPLE_WEST_PEAK,          []{return logic->CanUseProjectile();}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_WEST_PEAK] = Region("Fire Temple West Peak", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MEGATON_HAMMER_CHEST, true),
     }, {
@@ -326,12 +327,17 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Region("Fire Temple Hammer Return Path", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_HAMMER_RETURN_PATH] = Region("Fire Temple Hammer Return Path", SCENE_FIRE_TEMPLE, {}, {
+        // Locations
+        LOCATION(RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1, logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2, logic->CanBreakSmallCrates()),
+    },
+    {
         //Exits
         Entrance(RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Region("Fire Temple Above Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_ABOVE_FIRE_MAZE] = Region("Fire Temple Above Fire Maze", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_HAMMER_RETURN_PATH, []{return true;}),
         Entrance(RR_FIRE_TEMPLE_FIRE_MAZE_UPPER,    []{return logic->CanUse(RG_MEGATON_HAMMER);}),
@@ -342,7 +348,7 @@ void RegionTable_Init_FireTemple() {
 #pragma region MQ
 
     //potentially dangerous temp flag on the first room's torches, should be made permanent if possible
-    areaTable[RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER] = Region("Fire Temple MQ First Room Lower", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER] = Region("Fire Temple MQ First Room Lower", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2, logic->CanBreakPots()),
@@ -354,14 +360,14 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_STALFOS_ROOM,     []{return logic->SmallKeys(RR_FIRE_TEMPLE, 5);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_FIRST_ROOM_UPPER] = Region("Fire Temple MQ First Room Upper", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_FIRST_ROOM_UPPER] = Region("Fire Temple MQ First Room Upper", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER, []{return true;}),
-        Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,      []{return logic->HasFireSource();}),
+        Entrance(RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM,   []{return logic->HasFireSource();}),
         Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM,    []{return Here(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_UPPER, []{return logic->CanUse(RG_MEGATON_HAMMER);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_SOUTH] = Region("Fire Temple MQ Map Room South", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_SOUTH] = Region("Fire Temple MQ Map Room South", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, logic->CanKillEnemy(RE_LIKE_LIKE)),
     }, {
@@ -370,7 +376,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_MAP_ROOM_CAGE,    []{return logic->OpenedLowestGoronCage;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_STALFOS_ROOM] = Region("Fire Temple MQ Stalfos Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_STALFOS_ROOM] = Region("Fire Temple MQ Stalfos Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
     }, {
@@ -379,7 +385,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_IRON_KNUCKLE_ROOM, []{return Here(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_IRON_KNUCKLE_ROOM] = Region("Fire Temple MQ Iron Knuckle Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_IRON_KNUCKLE_ROOM] = Region("Fire Temple MQ Iron Knuckle Room", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -399,7 +405,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_LOWER_FLARE_DANCER, []{return Here(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_LOWER, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_FLARE_DANCER] = Region("Fire Temple MQ Lower Flare Dancer", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_FLARE_DANCER] = Region("Fire Temple MQ Lower Flare Dancer", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, (logic->IsAdult || logic->CanUse(RG_HOOKSHOT)) && Here(RR_FIRE_TEMPLE_MQ_LOWER_FLARE_DANCER, []{return logic->CanKillEnemy(RE_FLARE_DANCER);})),
     }, {
@@ -408,7 +414,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_MAP_ROOM_NORTH,    []{return Here(RR_FIRE_TEMPLE_MQ_LOWER_FLARE_DANCER, []{return logic->CanKillEnemy(RE_FLARE_DANCER);});}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_NORTH] = Region("Fire Temple MQ Map Room North", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_NORTH] = Region("Fire Temple MQ Map Room North", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->OpenedLowestGoronCage, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     }, {}, {
@@ -417,7 +423,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_MAP_ROOM_CAGE,      []{return logic->OpenedLowestGoronCage;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_CAGE] = Region("Fire Temple MQ Map Room Cage", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_MAP_ROOM_CAGE] = Region("Fire Temple MQ Map Room Cage", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_MAP_CHEST, true),
     }, {
@@ -426,21 +432,24 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_MAP_ROOM_SOUTH, []{return logic->OpenedLowestGoronCage;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM] = Region("Fire Temple MQ Near Boss Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM] = Region("Fire Temple MQ Near Boss Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //If we're using the south torch as the initial torch, or using FAs, we either have to cross to the north to remove the crate, or use a trick to ignore it
-        LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, logic->FireTimer() > 25 && ctx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && (logic->CanUse(RG_FIRE_ARROWS) || (logic->IsAdult && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_FAIRY_BOW))))
+        LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,      logic->FireTimer() > 25 && ctx->GetTrickOption(RT_FIRE_MQ_NEAR_BOSS) && (logic->CanUse(RG_FIRE_ARROWS) || (logic->IsAdult && logic->CanUse(RG_DINS_FIRE) && logic->CanUse(RG_FAIRY_BOW)))),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1, logic->FireTimer() > 25 && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2, logic->FireTimer() > 25 && logic->CanBreakCrates()),
+
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_FIRST_ROOM_UPPER,     []{return true;}),
         //Child cannot make it to the north side torches without a hook without specifically bunny hood speed + hover boots
         Entrance(RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM_NORTH, []{return logic->FireTimer() > 32 && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));}),
-        Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,           []{return logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY) && logic->FireTimer() >= 15 && ((logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->IsAdult && logic->HitFireTemplePlatform) || (logic->HitFireTemplePlatform && logic->CanUse(RG_HOVER_BOOTS)));}),
+        Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY,           []{return logic->FireTimer() >= 15 && ((logic->IsAdult && (ctx->GetTrickOption(RT_FIRE_BOSS_DOOR_JUMP) || logic->CanUse(RG_HOVER_BOOTS))) || (logic->IsAdult && logic->HitFireTemplePlatform) || (logic->HitFireTemplePlatform && logic->CanUse(RG_HOVER_BOOTS)));}),
     });
 
     //This room assumes tunic logic is handled on entry.
     //Covers the upper section too, as all methods to reach this can climb up somehow
-    areaTable[RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM_NORTH] = Region("Fire Temple MQ Near Boss Room North", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM_NORTH] = Region("Fire Temple MQ Near Boss Room North", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //If we have FAs, we can just remove the crate and use those to light the torches.
         //otherwise, with Dins, we first light them with dins and then either use a bow shot or to cross back over to light the other torch
@@ -449,15 +458,21 @@ void RegionTable_Init_FireTemple() {
         //Fairies cannot be used for this as it is time sensetive, and NL is only useful with sticks as it disables other magic while in use, so it's tunic or raw damage taking ability.
         //testing tells me you take 3 ticks of lava damage, which is 12 internal damage or 3/4 of a heart at x1 damage multiplier, performing this run
         //logic->EffectiveHealth() works in half hearts for whatever reason, meaning this needs a deeper refactor to be perfect, but it should be good enough for now
-        LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,    logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->EffectiveHealth() >= 2 || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_STICKS))))))),
-        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,      logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_LONGSHOT) || (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->EffectiveHealth() >= 2 || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_STICKS))))))),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1,   logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2,   logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1, logic->FireTimer() > 25 && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2, logic->FireTimer() > 25 && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4, logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5, logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM] = Region("Fire Temple MQ Big Lava Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //I'm currently assuming the oversight version of RT_FIRE_MQ_BK_CHEST for the fire timer logic
         LOCATION(RC_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST, logic->FireTimer() >= 40 && logic->HasFireSource() && logic->HasExplosives() && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && ctx->GetTrickOption(RT_FIRE_MQ_BLOCKED_CHEST)))),
@@ -474,7 +489,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_TORCH_FIREWALL_ROOM, []{return logic->HasFireSource() && ((logic->CanUse(RG_FAIRY_BOW) && logic->FireTimer() >= 25) || (ctx->GetTrickOption(RT_FIRE_MQ_BK_CHEST) && logic->FireTimer() >= 50)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && ctx->GetTrickOption(RT_FIRE_SOT)));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_TORCH_FIREWALL_ROOM] = Region("Fire Temple MQ Torch Firewall Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_TORCH_FIREWALL_ROOM] = Region("Fire Temple MQ Torch Firewall Room", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return logic->CanUse(RG_HOOKSHOT);}),
     }, {
@@ -488,7 +503,7 @@ void RegionTable_Init_FireTemple() {
     });
 
     //This room assumes Goron Tunic until looser tunic requirements tricks are made
-    areaTable[RR_FIRE_TEMPLE_MQ_ELEVATOR_ROOM] = Region("Fire Temple MQ Elevator Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_ELEVATOR_ROOM] = Region("Fire Temple MQ Elevator Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_FIRE_PILLAR_LEFT_HEART,  true),
         LOCATION(RC_FIRE_TEMPLE_MQ_FIRE_PILLAR_RIGHT_HEART, true),
@@ -499,14 +514,14 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_BIG_TORCH_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_BIG_TORCH_ROOM] = Region("Fire Temple MQ Big Torch Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_BIG_TORCH_ROOM] = Region("Fire Temple MQ Big Torch Room", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE,         []{return (logic->HasFireSource() && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_FIRE_MQ_CLIMB) && logic->CanUse(RG_HOVER_BOOTS));}),
         Entrance(RR_FIRE_TEMPLE_MQ_ELEVATOR_ROOM,      []{return logic->CanUse(RG_GORON_TUNIC);}),
         Entrance(RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT_CAGE, []{return logic->OpenedUpperFireShortcut;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE] = Region("Fire Temple MQ Lower Maze", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //Check handled on both floors
         LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives() && ctx->GetTrickOption(RT_FIRE_MQ_MAZE_SIDE_ROOM)),
@@ -519,9 +534,12 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE,            []{return logic->HasExplosives() && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE_CRATE_CAGE] = Region("Fire Temple MQ Lower Maze Crate Cage", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_LOWER_MAZE_CRATE_CAGE] = Region("Fire Temple MQ Lower Maze Crate Cage", SCENE_FIRE_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, true),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,   true),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE, []{return true;}),
@@ -529,7 +547,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, []{return logic->IsAdult && ((ctx->GetTrickOption(RT_FIRE_MQ_MAZE_HOVERS) && logic->CanUse(RG_HOVER_BOOTS)) || ctx->GetTrickOption(RT_FIRE_MQ_MAZE_JUMP));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE] = Region("Fire Temple MQ Upper Maze", SCENE_FIRE_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_LOWER_MAZE,          []{return true;}),
         //this cage is much more lenient than the lower cage as the switch is close to the front. sling, rang and bow all hit the switch easily, though might be too unintuitive for default logic
@@ -541,9 +559,14 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_HIGH_TORCH_ROOM,     []{return logic->SmallKeys(RR_FIRE_TEMPLE, 3) && logic->CanUse(RG_GORON_TUNIC);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE_BOX_CAGE] = Region("Fire Temple MQ Upper Maze Box Cage", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_MAZE_BOX_CAGE] = Region("Fire Temple MQ Upper Maze Box Cage", SCENE_FIRE_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,     true),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,           true),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1,         logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2,         logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3,         logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1,   logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2,   logic->CanBreakSmallCrates()),
         //Assumes maze access
         LOCATION(RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, logic->HasExplosives()),
     }, {
@@ -551,7 +574,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT] = Region("Fire Temple MQ Maze Shortcut", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT] = Region("Fire Temple MQ Maze Shortcut", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->OpenedUpperFireShortcut,  []{return logic->CanUse(RG_MEGATON_HAMMER);}),
     }, {}, {
@@ -560,9 +583,15 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT_CAGE, []{return logic->OpenedUpperFireShortcut;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT_CAGE] = Region("Fire Temple MQ Maze Shortcut Cage", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT_CAGE] = Region("Fire Temple MQ Maze Shortcut Cage", SCENE_FIRE_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,  logic->OpenedUpperFireShortcut;),
+        LOCATION(RC_FIRE_TEMPLE_MQ_COMPASS_CHEST,    logic->OpenedUpperFireShortcut;),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6, logic->OpenedUpperFireShortcut && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_MAZE_SHORTCUT,  []{return logic->OpenedUpperFireShortcut;}),
@@ -570,7 +599,7 @@ void RegionTable_Init_FireTemple() {
     });
 
 
-    areaTable[RR_FIRE_TEMPLE_MQ_BURNING_BLOCK_CLIMB] = Region("Fire Temple MQ Burning Block Climb", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_BURNING_BLOCK_CLIMB] = Region("Fire Temple MQ Burning Block Climb", SCENE_FIRE_TEMPLE, {
         //Events
         //EventAccess(&WallFairy, []{return logic->CanUse(RG_HOOKSHOT);}),
     }, {
@@ -583,7 +612,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_NARROW_PATH_ROOM,  []{return logic->TakeDamage();}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_NARROW_PATH_ROOM] = Region("Fire Temple MQ Narrow Path Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_NARROW_PATH_ROOM] = Region("Fire Temple MQ Narrow Path Room", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -597,10 +626,20 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_BIG_LAVA_ROOM, []{return logic->TakeDamage();}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_HIGH_TORCH_ROOM] = Region("Fire Temple MQ High Torch Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_HIGH_TORCH_ROOM] = Region("Fire Temple MQ High Torch Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1,            logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2,            logic->CanBreakPots()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1,          logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2,          logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3,          logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4,          logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5,          logic->CanBreakCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1,    logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2,    logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3,    logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4,    logic->CanBreakSmallCrates()),
+        LOCATION(RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5,    logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_FIRE_TEMPLE_MQ_UPPER_MAZE,       []{return logic->SmallKeys(RR_FIRE_TEMPLE, 3);}),
@@ -609,7 +648,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE,  []{return Here(RR_FIRE_TEMPLE_MQ_HIGH_TORCH_ROOM, []{return logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT));}) && (logic->IsAdult || logic->CanUse(RG_HOOKSHOT));}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE] = Region("Fire Temple MQ South Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE] = Region("Fire Temple MQ South Fire Maze", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER, logic->HasExplosives()),
         LOCATION(RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT, logic->CanBreakPots()),
@@ -624,7 +663,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_WEST_FIRE_MAZE,      []{return logic->OpenedFireMQFireMazeDoor;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_FIRE_MAZE_PLATFORMS] = Region("Fire Temple MQ Fire Maze Platforms", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_MQ_FIRE_MAZE_PLATFORMS] = Region("Fire Temple MQ Fire Maze Platforms", SCENE_FIRE_TEMPLE, {
         //Events
         EventAccess(&logic->HitFireTemplePlatform,    []{return logic->CanUse(RG_MEGATON_HAMMER);}),
         EventAccess(&logic->OpenedFireMQFireMazeDoor, []{return logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_HOOKSHOT);}),
@@ -634,7 +673,7 @@ void RegionTable_Init_FireTemple() {
         //trick to get to RR_FIRE_TEMPLE_MQ_WEST_FIRE_MAZE with hovers + taking damage is plausible
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_NORTH_FIRE_MAZE] = Region("Fire Temple MQ North Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_NORTH_FIRE_MAZE] = Region("Fire Temple MQ North Fire Maze", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
         LOCATION(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT,    logic->CanUse(RG_BOOMERANG)),
@@ -646,13 +685,13 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_WEST_FIRE_MAZE,  []{return (bool)ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_WEST_FIRE_MAZE] = Region("Fire Temple MQ West Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_WEST_FIRE_MAZE] = Region("Fire Temple MQ West Fire Maze", SCENE_FIRE_TEMPLE, {}, {}, {
         Entrance(RR_FIRE_TEMPLE_MQ_FIRE_MAZE_PAST_WALL, []{return true;}),
         Entrance(RR_FIRE_TEMPLE_MQ_NORTH_FIRE_MAZE,     []{return (bool)ctx->GetTrickOption(RT_FIRE_MQ_FLAME_MAZE);}),
     });
 
     //this area exists for the pots in case we void warp to the top of fire somehow, because there's no way to get back the way we came
-    areaTable[RR_FIRE_TEMPLE_MQ_FIRE_MAZE_PAST_WALL] = Region("Fire Temple MQ Fire Maze Past Wall", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_FIRE_MAZE_PAST_WALL] = Region("Fire Temple MQ Fire Maze Past Wall", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT, logic->CanBreakPots()),
         LOCATION(RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT, logic->CanBreakPots()),
@@ -661,7 +700,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_UPPER_FLARE_DANCER, []{return true;}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_FLARE_DANCER] = Region("Fire Temple MQ North Fire Maze", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_UPPER_FLARE_DANCER] = Region("Fire Temple MQ North Fire Maze", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FIRE_TEMPLE_MQ_FREESTANDING_KEY, logic->CanKillEnemy(RE_FLARE_DANCER)),
     }, {
@@ -669,7 +708,7 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_MQ_SCARECROW_ROOM,      []{return logic->CanKillEnemy(RE_FLARE_DANCER) && logic->SmallKeys(RR_FIRE_TEMPLE, 4);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_MQ_SCARECROW_ROOM] = Region("Fire Temple MQ Scarecrow Room", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_SCARECROW_ROOM] = Region("Fire Temple MQ Scarecrow Room", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //This requires nothing in N64 logic, but is tight enough to need rollspam with the one-point on which is stricter than I would normally consider in logic
         //Child basically needs the scarecrow or a bunny hood though due to a worse ledge grab.
@@ -684,7 +723,7 @@ void RegionTable_Init_FireTemple() {
     });
 
     //The peg knocked down from here could have logical implications for child in the fire maze if tricks to gain height like bomb jumps exist
-    areaTable[RR_FIRE_TEMPLE_MQ_COLLAPSED_STAIRS] = Region("Fire Temple MQ Collapsed Stairs", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FIRE_TEMPLE_MQ_COLLAPSED_STAIRS] = Region("Fire Temple MQ Collapsed Stairs", SCENE_FIRE_TEMPLE, {}, {
         //Locations
         //If someone manages to make a trick to get here from fire maze, this needs to be in a separate room as the door back is barred
         LOCATION(RC_FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_MAZE, logic->CanUse(RG_HOOKSHOT)),
@@ -696,16 +735,16 @@ void RegionTable_Init_FireTemple() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] = Region("Fire Temple Boss Entryway", "Fire Temple", {RA_FIRE_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FIRE_TEMPLE_BOSS_ENTRYWAY] = Region("Fire Temple Boss Entryway", SCENE_FIRE_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_FIRE_TEMPLE_NEAR_BOSS_ROOM,    []{return ctx->GetDungeon(FIRE_TEMPLE)->IsVanilla() && false;}),
         Entrance(RR_FIRE_TEMPLE_MQ_NEAR_BOSS_ROOM, []{return ctx->GetDungeon(FIRE_TEMPLE)->IsMQ() && false;}),
-        Entrance(RR_FIRE_TEMPLE_BOSS_ROOM,         []{return true;}),
+        Entrance(RR_FIRE_TEMPLE_BOSS_ROOM,         []{return logic->HasItem(RG_FIRE_TEMPLE_BOSS_KEY);}),
     });
 
-    areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] = Region("Fire Temple Boss Room", "Fire Temple", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FIRE_TEMPLE_BOSS_ROOM] = Region("Fire Temple Boss Room", SCENE_FIRE_TEMPLE_BOSS, {
         // Events
-        EventAccess(&logic->FireTempleClear, []{return logic->FireTempleClear || (logic->FireTimer() >= 64 && logic->CanKillEnemy(RE_VOLVAGIA));}),
+        EventAccess(&logic->FireTempleClear, []{return logic->FireTimer() >= 64 && logic->CanKillEnemy(RE_VOLVAGIA);}),
     }, {
         // Locations
         LOCATION(RC_FIRE_TEMPLE_VOLVAGIA_HEART, logic->FireTempleClear),
@@ -715,4 +754,6 @@ void RegionTable_Init_FireTemple() {
         Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, []{return false;}),
         Entrance(RR_DMC_CENTRAL_LOCAL,         []{return logic->FireTempleClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/forest_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/forest_temple.cpp
index c9f4ebc23e..a4a5582979 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/forest_temple.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_ForestTemple() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_ENTRYWAY] = Region("Forest Temple Entryway", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, []{return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla();}),
         Entrance(RR_FOREST_TEMPLE_MQ_LOBBY,   []{return ctx->GetDungeon(FOREST_TEMPLE)->IsMQ();}),
@@ -15,7 +16,7 @@ void RegionTable_Init_ForestTemple() {
 
 #pragma region Vanilla
 
-    areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_FIRST_ROOM] = Region("Forest Temple First Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_FIRST_ROOM_CHEST, true),
         LOCATION(RC_FOREST_TEMPLE_GS_FIRST_ROOM,    (logic->IsAdult && logic->CanUse(RG_BOMB_BAG)) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOMBCHU_5) || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_FOREST_FIRST_GS) && (logic->CanJumpslashExceptHammer() || (logic->IsChild && logic->CanUse(RG_BOMB_BAG))))),
@@ -25,15 +26,15 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_SOUTH_CORRIDOR, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_SOUTH_CORRIDOR] = Region("Forest Temple South Corridor", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_FIRST_ROOM, []{return true;}),
-        Entrance(RR_FOREST_TEMPLE_LOBBY,      []{return logic->CanAttack() || logic->CanUse(RG_NUTS);}),
+        Entrance(RR_FOREST_TEMPLE_LOBBY,      []{return logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_LOBBY] = Region("Forest Temple Lobby", SCENE_FOREST_TEMPLE, {
         //Events
-        EventAccess(&logic->ForestTempleMeg, []{return logic->ForestTempleMeg || (logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW));}),
+        EventAccess(&logic->ForestTempleMeg, []{return logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanUse(RG_FAIRY_BOW);}),
     }, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_GS_LOBBY,    logic->HookshotOrBoomerang()),
@@ -55,13 +56,13 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     []{return false;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Region("Forest Temple North Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_NORTH_CORRIDOR] = Region("Forest Temple North Corridor", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_LOBBY,         []{return true;}),
         Entrance(RR_FOREST_TEMPLE_LOWER_STALFOS, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Region("Forest Temple Lower Stalfos", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_LOWER_STALFOS] = Region("Forest Temple Lower Stalfos", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -74,7 +75,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NORTH_CORRIDOR, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Region("Forest Temple NW Outdoors Lower", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -92,7 +93,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY,     []{return false;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Region("Forest Temple NW Outdoors Upper", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -108,7 +109,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Region("Forest Temple NE Outdoors Lower", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -124,7 +125,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      []{return false;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Region("Forest Temple NE Outdoors Upper", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
@@ -135,7 +136,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,      []{return ctx->GetTrickOption(RT_FOREST_DOORFRAME) && logic->CanJumpslashExceptHammer() && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_SCARECROW);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MAP_ROOM] = Region("Forest Temple Map Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MAP_CHEST, logic->CanKillEnemy(RE_BLUE_BUBBLE)),
     }, {
@@ -144,9 +145,9 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER, []{return Here(RR_FOREST_TEMPLE_MAP_ROOM, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_SEWER] = Region("Forest Temple Sewer", SCENE_FOREST_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_FOREST_TEMPLE_WELL_CHEST,      HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER)),
+        LOCATION(RC_FOREST_TEMPLE_WELL_CHEST,      HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) || (logic->CanOpenUnderwaterChest() && logic->WaterTimer() >= 8)),
         LOCATION(RC_FOREST_TEMPLE_WELL_WEST_HEART, HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8)),
         LOCATION(RC_FOREST_TEMPLE_WELL_EAST_HEART, HasAccessTo(RR_FOREST_TEMPLE_NE_OUTDOORS_UPPER) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8)),
     }, {
@@ -155,12 +156,12 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NE_OUTDOORS_LOWER, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Region("Forest Temple Below Boss Key Chest", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return Here(RR_FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return logic->CanKillEnemy(RE_BLUE_BUBBLE);});}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_FLOORMASTER_ROOM] = Region("Forest Temple Floormaster Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_FLOORMASTER_CHEST, logic->CanDamage()),
     }, {
@@ -168,13 +169,13 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_WEST_CORRIDOR] = Region("Forest Temple West Corridor", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_LOBBY,           []{return logic->SmallKeys(RR_FOREST_TEMPLE, 1, 5);}),
         Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, []{return logic->CanAttack() || logic->CanUse(RG_NUTS);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Region("Forest Temple Block Push Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_EYE_SWITCH_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT))),
     }, {
@@ -185,13 +186,13 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, []{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->HasItem(RG_GORONS_BRACELET) && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Region("Forest Temple NW Corridor Twisted", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM, []{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}),
         Entrance(RR_FOREST_TEMPLE_RED_POE_ROOM,    []{return logic->SmallKeys(RR_FOREST_TEMPLE, 3);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NW Corridor Straightened", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NW Corridor Straightened", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_BOSS_KEY_CHEST, true),
     }, {
@@ -200,9 +201,9 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BLOCK_PUSH_ROOM,      []{return logic->SmallKeys(RR_FOREST_TEMPLE, 2);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Region("Forest Temple Red Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_RED_POE_ROOM] = Region("Forest Temple Red Poe Room", SCENE_FOREST_TEMPLE, {
         //Events
-        EventAccess(&logic->ForestTempleJoelle, []{return logic->ForestTempleJoelle || logic->CanUse(RG_FAIRY_BOW);}),
+        EventAccess(&logic->ForestTempleJoelle, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_RED_POE_CHEST, logic->ForestTempleJoelle),
@@ -212,7 +213,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_UPPER_STALFOS,       []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Region("Forest Temple Upper Stalfos", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_UPPER_STALFOS] = Region("Forest Temple Upper Stalfos", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_BOW_CHEST,           logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 3)),
         LOCATION(RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1, logic->CanBreakPots()),
@@ -225,9 +226,9 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 3);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Region("Forest Temple Blue Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_BLUE_POE_ROOM] = Region("Forest Temple Blue Poe Room", SCENE_FOREST_TEMPLE, {
         //Events
-        EventAccess(&logic->ForestTempleBeth, []{return logic->ForestTempleBeth || logic->CanUse(RG_FAIRY_BOW);}),
+        EventAccess(&logic->ForestTempleBeth, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_BLUE_POE_CHEST, logic->ForestTempleBeth),
@@ -240,19 +241,19 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED, []{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NE Corridor Straightened", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_STRAIGHTENED] = Region("Forest Temple NE Corridor Straightened", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_BLUE_POE_ROOM,   []{return logic->SmallKeys(RR_FOREST_TEMPLE, 4);}),
         Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, []{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Region("Forest Temple NE Corridor Twisted", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED] = Region("Forest Temple NE Corridor Twisted", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_FROZEN_EYE_ROOM, []{return logic->SmallKeys(RR_FOREST_TEMPLE, 5);}),
         Entrance(RR_FOREST_TEMPLE_FALLING_ROOM,    []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Region("Forest Temple Frozen Eye Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_FROZEN_EYE_ROOM] = Region("Forest Temple Frozen Eye Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_FROZEN_EYE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FOREST_TEMPLE_FROZEN_EYE_POT_2, logic->CanBreakPots()),
@@ -262,7 +263,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_NE_CORRIDOR_TWISTED,      []{return logic->SmallKeys(RR_FOREST_TEMPLE, 5) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE));}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Region("Forest Temple Falling Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_FALLING_ROOM] = Region("Forest Temple Falling Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST, true),
     }, {
@@ -271,9 +272,9 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM,    []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Region("Forest Temple Green Poe Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_GREEN_POE_ROOM] = Region("Forest Temple Green Poe Room", SCENE_FOREST_TEMPLE, {
         //Events
-        EventAccess(&logic->ForestTempleAmy, []{return logic->ForestTempleAmy || logic->CanUse(RG_FAIRY_BOW);}),
+        EventAccess(&logic->ForestTempleAmy, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_GREEN_POE_POT_1, logic->CanBreakPots()),
@@ -284,27 +285,27 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_EAST_CORRIDOR, []{return logic->ForestTempleAmy;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_EAST_CORRIDOR] = Region("Forest Temple East Corridor", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_LOBBY,          []{return logic->CanAttack() || logic->CanUse(RG_NUTS);}),
         Entrance(RR_FOREST_TEMPLE_GREEN_POE_ROOM, []{return logic->CanAttack() || logic->CanUse(RG_NUTS);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_BOSS_REGION] = Region("Forest Temple Boss Region", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_BASEMENT_CHEST, true),
         LOCATION(RC_FOREST_TEMPLE_GS_BASEMENT,    logic->HookshotOrBoomerang()),
     }, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_LOBBY,         []{return true;}),
-        Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, []{return logic->HasItem(RG_FOREST_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, []{return true;}),
     });
 
 #pragma endregion
 
 #pragma region MQ
 
-    areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_LOBBY] = Region("Forest Temple MQ Lobby", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, logic->CanPassEnemy(RE_BIG_SKULLTULA, ED_SHORT_JUMPSLASH, false) || logic->CanUse(RG_HOVER_BOOTS)),
         //Implies CanPassEnemy(RE_BIG_SKULLTULA)
@@ -315,7 +316,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, []{return logic->SmallKeys(RR_FOREST_TEMPLE, 1) && logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_CENTRAL_AREA] = Region("Forest Temple MQ Central Region", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->ForestTempleMeg, []{return logic->ForestTempleJoelle && logic->ForestTempleBeth && logic->ForestTempleAmy && logic->CanKillEnemy(RE_MEG);}),
     }, {
@@ -336,7 +337,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_BASEMENT,           []{return logic->ForestTempleMeg;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_WOLFOS_ROOM] = Region("Forest Temple MQ Wolfos Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_WOLFOS_ROOM] = Region("Forest Temple MQ Wolfos Room", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot,                 []{return true;}),
         EventAccess(&logic->ForestClearBelowBowChest, []{return logic->CanKillEnemy(RE_WOLFOS);}),
@@ -350,7 +351,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_CENTRAL_AREA, []{return logic->ForestClearBelowBowChest && (logic->IsChild || logic->CanUse(RG_SONG_OF_TIME));}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_LOWER_BLOCK_PUZZLE] = Region("Forest Temple MQ Lower Block Puzzle", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_LOWER_BLOCK_PUZZLE] = Region("Forest Temple MQ Lower Block Puzzle", SCENE_FOREST_TEMPLE, {
         //longshot is capable of hitting the switch, but some invisible collision makes the shot harder than you would think, so it may be trickworthy
         EventAccess(&logic->MQForestBlockRoomTargets, []{return (ctx->GetTrickOption(RT_FOREST_MQ_BLOCK_PUZZLE) && logic->CanUse(RG_BOMBCHU_5));}),
         //It is barely possible to get this as child with master + hovers, but it's tight without bunny speed
@@ -367,7 +368,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,       []{return logic->ForestCanTwistHallway && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_MIDDLE_BLOCK_PUZZLE] = Region("Forest Temple MQ Middle Block Puzzle", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_MIDDLE_BLOCK_PUZZLE] = Region("Forest Temple MQ Middle Block Puzzle", SCENE_FOREST_TEMPLE, {
         //longshot is capable of hitting the switch, but some invisible collision makes the shot more annoying than you would think, so it may be trickworthy
         EventAccess(&logic->MQForestBlockRoomTargets, []{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_LONGSHOT));}),
         EventAccess(&logic->ForestCanTwistHallway,    []{return ctx->GetTrickOption(RT_FOREST_MQ_JS_HALLWAY_SWITCH) && (logic->IsAdult && logic->CanJumpslash()) || (logic->CanUse(RG_HOVER_BOOTS) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MASTER_SWORD)));}),
@@ -379,7 +380,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE,      []{return logic->ForestCanTwistHallway && logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && (logic->CanJumpslashExceptHammer() || (logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER))));}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_UPPER_BLOCK_PUZZLE] = Region("Forest Temple MQ After Block Puzzle", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_UPPER_BLOCK_PUZZLE] = Region("Forest Temple MQ After Block Puzzle", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, logic->SmallKeys(RR_FOREST_TEMPLE, 3)),
     }, {
@@ -393,7 +394,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS,      []{return logic->SmallKeys(RR_FOREST_TEMPLE, 2) && Here(RR_FOREST_TEMPLE_MQ_UPPER_BLOCK_PUZZLE, []{return logic->CanKillEnemy(RE_FLOORMASTER);});}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_STRAIGHT_HALLWAY] = Region("Forest Temple MQ Straight Hallway", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_STRAIGHT_HALLWAY] = Region("Forest Temple MQ Straight Hallway", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_BOSS_KEY_CHEST, logic->SmallKeys(RR_FOREST_TEMPLE, 3)),
     }, {
@@ -401,12 +402,12 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_FLOORMASTER_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_FLOORMASTER_ROOM] = Region("Forest Temple MQ Floormaster Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_FLOORMASTER_ROOM] = Region("Forest Temple MQ Floormaster Room", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, []{return Here(RR_FOREST_TEMPLE_MQ_FLOORMASTER_ROOM, []{return logic->CanKillEnemy(RE_FLOORMASTER);});}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Region("Forest Temple MQ Outdoor Ledge", SCENE_FOREST_TEMPLE, {
         EventAccess(&logic->ForestCanTwistHallway, []{return logic->CanHitSwitch();}),
     }, {
         //Locations
@@ -419,7 +420,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_NW_OUTDOORS, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_NW_OUTDOORS] = Region("Forest Temple MQ NW Outdoors", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
         //the well checks are considered from both areas instead of being a region because the draining is a temp flag and the skull (as well as the chest with hook glitch) has different breath timers from each side
@@ -437,13 +438,13 @@ void RegionTable_Init_ForestTemple() {
     });
 
     //The well only coniders the eye target here because the eye target is a temp flag, making it unwieldy to use as an EventAccess to make it it's own room
-    areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS] = Region("Forest Temple MQ NE Outdoors", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->DekuBabaSticks, []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,   []{return logic->CanGetDekuBabaNuts();}),
     }, {
         //Locations
-        LOCATION(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 logic->CanHitEyeTargets()),
+        LOCATION(RC_FOREST_TEMPLE_MQ_WELL_CHEST,                 logic->CanHitEyeTargets() || (logic->CanOpenUnderwaterChest() && logic->WaterTimer() >= 8)),
         LOCATION(RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
         //implies logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)
         LOCATION(RC_FOREST_TEMPLE_MQ_GS_WELL,                    logic->CanHitEyeTargets() || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
@@ -457,7 +458,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE,   []{return logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Region("Forest Temple MQ Outdoors Top Ledges", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_OUTDOORS_TOP_LEDGES] = Region("Forest Temple MQ Outdoors Top Ledges", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST, true),
         //Actually killing the skull from the doorframe with melee is annoying. Hammer swing hits low enough unaided, other swords need to crouch stab but the spot is precise based on range. kokiri sword doesn't reach at all for adult.
@@ -470,7 +471,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE, []{return ctx->GetTrickOption(RT_FOREST_OUTDOORS_LEDGE) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanJumpslash() && logic->TakeDamage();}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Region("Forest Temple MQ NE Outdoors Ledge", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_NE_OUTDOORS_LEDGE] = Region("Forest Temple MQ NE Outdoors Ledge", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST, true),
     }, {
@@ -480,7 +481,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, []{return logic->CanUse(RG_SONG_OF_TIME);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_JOELLE_ROOM] = Region("Forest Temple MQ Joelle room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_JOELLE_ROOM] = Region("Forest Temple MQ Joelle room", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->ForestTempleJoelle, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
@@ -492,7 +493,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_3_STALFOS_ROOM,     []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_3_STALFOS_ROOM] = Region("Forest Temple MQ 3 Stalfos Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_3_STALFOS_ROOM] = Region("Forest Temple MQ 3 Stalfos Room", SCENE_FOREST_TEMPLE, {
         //Events
         //technically happens in RR_FOREST_TEMPLE_MQ_WOLFOS_ROOM, but the way this room blocks the hole means it cannot be logical to do anything else there.
         EventAccess(&logic->ForestClearBelowBowChest, []{return logic->CanKillEnemy(RE_WOLFOS);}),
@@ -509,7 +510,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_BETH_ROOM,   []{return logic->ForestClearBelowBowChest && logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 3);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_BETH_ROOM] = Region("Forest Temple MQ Beth Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_BETH_ROOM] = Region("Forest Temple MQ Beth Room", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->ForestTempleBeth, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
@@ -529,13 +530,18 @@ void RegionTable_Init_ForestTemple() {
     });
 
     //This room exists to show the actual map layout, and for when the crates get added to logic
-    areaTable[RR_FOREST_TEMPLE_MQ_TORCH_SHOT_ROOM] = Region("Forest Temple MQ Torch Shot Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_TORCH_SHOT_ROOM] = Region("Forest Temple MQ Torch Shot Room", SCENE_FOREST_TEMPLE, {}, {
+        // Locations
+        LOCATION(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1, logic->CanBreakSmallCrates()),
+        LOCATION(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2, logic->CanBreakSmallCrates()),
+        LOCATION(RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3, logic->CanBreakSmallCrates()),
+    }, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, []{return logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE);}),
         Entrance(RR_FOREST_TEMPLE_MQ_BETH_ROOM,    []{return logic->SmallKeys(RR_FOREST_TEMPLE, 6);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Region("Forest Temple MQ Falling Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_FALLING_ROOM] = Region("Forest Temple MQ Falling Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST, true),
     }, {
@@ -544,7 +550,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_AMY_ROOM,          []{return logic->SmallKeys(RR_FOREST_TEMPLE, 6);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_AMY_ROOM] = Region("Forest Temple MQ Amy Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_AMY_ROOM] = Region("Forest Temple MQ Amy Room", SCENE_FOREST_TEMPLE, {
         //Events
         EventAccess(&logic->ForestTempleAmy, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
@@ -557,7 +563,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_FALLING_ROOM, []{return true;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_BASEMENT] = Region("Forest Temple MQ Basement", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_MQ_BASEMENT] = Region("Forest Temple MQ Basement", SCENE_FOREST_TEMPLE, {
         //Events
         //Implies CanHitSwitch()
         EventAccess(&logic->ForestOpenBossCorridor, []{return logic->CanHitEyeTargets();}),
@@ -571,7 +577,7 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION,       []{return logic->ForestOpenBossCorridor;}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_BASEMENT_POT_ROOM] = Region("Forest Temple MQ Basement Pot Room", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_BASEMENT_POT_ROOM] = Region("Forest Temple MQ Basement Pot Room", SCENE_FOREST_TEMPLE, {}, {
         //Locations
         LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1, logic->CanBreakPots()),
         LOCATION(RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2, logic->CanBreakPots()),
@@ -582,25 +588,25 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_MQ_BASEMENT, []{return logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Region("Forest Temple MQ Boss Region", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_MQ_BOSS_REGION] = Region("Forest Temple MQ Boss Region", SCENE_FOREST_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_FOREST_TEMPLE_MQ_BASEMENT,   []{return logic->ForestOpenBossCorridor;}),
-        Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, []{return logic->HasItem(RG_FOREST_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, []{return true;}),
     });
 
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] = Region("Forest Temple Boss Entryway", "Forest Temple", {RA_FOREST_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_FOREST_TEMPLE_BOSS_ENTRYWAY] = Region("Forest Temple Boss Entryway", SCENE_FOREST_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_FOREST_TEMPLE_BOSS_REGION,    []{return ctx->GetDungeon(FOREST_TEMPLE)->IsVanilla() && false;}),
         Entrance(RR_FOREST_TEMPLE_MQ_BOSS_REGION, []{return ctx->GetDungeon(FOREST_TEMPLE)->IsMQ() && false;}),
-        Entrance(RR_FOREST_TEMPLE_BOSS_ROOM,      []{return true;}),
+        Entrance(RR_FOREST_TEMPLE_BOSS_ROOM,      []{return logic->HasItem(RG_FOREST_TEMPLE_BOSS_KEY);}),
     });
 
-    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Region("Forest Temple Boss Room", "Forest Temple", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_FOREST_TEMPLE_BOSS_ROOM] = Region("Forest Temple Boss Room", SCENE_FOREST_TEMPLE_BOSS, {
         // Events
-        EventAccess(&logic->ForestTempleClear, []{return logic->ForestTempleClear || logic->CanKillEnemy(RE_PHANTOM_GANON);}),
+        EventAccess(&logic->ForestTempleClear, []{return logic->CanKillEnemy(RE_PHANTOM_GANON);}),
     }, {
         // Locations
         LOCATION(RC_FOREST_TEMPLE_PHANTOM_GANON_HEART, logic->ForestTempleClear),
@@ -610,4 +616,6 @@ void RegionTable_Init_ForestTemple() {
         Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, []{return false;}),
         Entrance(RR_SACRED_FOREST_MEADOW,        []{return logic->ForestTempleClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp
index 2a73017011..8571ba3844 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp
@@ -6,8 +6,9 @@
 using namespace Rando;
 
 void RegionTable_Init_GanonsCastle() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_ENTRYWAY] = Region("Ganon's Castle Entryway", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_LOBBY,               []{return ctx->GetDungeon(GANONS_CASTLE)->IsVanilla();}),
         Entrance(RR_GANONS_CASTLE_MQ_LOBBY,            []{return ctx->GetDungeon(GANONS_CASTLE)->IsMQ();}),
@@ -16,7 +17,7 @@ void RegionTable_Init_GanonsCastle() {
 
 #pragma region Vanilla
 
-    areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_LOBBY] = Region("Ganon's Castle Lobby", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_SHEIK_HINT_GC, true),
     }, {
@@ -28,16 +29,11 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_SHADOW_TRIAL, []{return true;}),
         Entrance(RR_GANONS_CASTLE_SPIRIT_TRIAL, []{return true;}),
         Entrance(RR_GANONS_CASTLE_LIGHT_TRIAL,  []{return logic->CanUse(RG_GOLDEN_GAUNTLETS);}),
-        Entrance(RR_GANONS_TOWER_FLOOR_1,       []{return (logic->ForestTrialClear || ctx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
-                                                          (logic->FireTrialClear   || ctx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
-                                                          (logic->WaterTrialClear  || ctx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
-                                                          (logic->ShadowTrialClear || ctx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
-                                                          (logic->SpiritTrialClear || ctx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
-                                                          (logic->LightTrialClear  || ctx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}),
+        Entrance(RR_GANONS_TOWER_ENTRYWAY,      []{return true;}),
         Entrance(RR_GANONS_CASTLE_DEKU_SCRUBS,  []{return ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_DEKU_SCRUBS] = Region("Ganon's Castle Deku Scrubs", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -56,17 +52,17 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_SCRUBS_FAIRY_8,          true),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_FOREST_TRIAL] = Region("Ganon's Castle Forest Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ForestTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE));}),
     }, {
         //Locations
-        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanDamage()),
-        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE))),
-        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE))),
+        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanKillEnemy(RE_WOLFOS)),
+        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))))),
+        LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))))),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->FireTrialClear, []{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS) && logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_LONGSHOT);}),
     }, {
@@ -76,10 +72,10 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_FIRE_TRIAL_HEART, logic->CanUse(RG_GORON_TUNIC)),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_WATER_TRIAL] = Region("Ganon's Castle Water Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
-        EventAccess(&logic->BlueFireAccess,  []{return logic->BlueFireAccess || logic->HasBottle();}),
-        EventAccess(&logic->FairyPot,        []{return logic->FairyPot || (logic->BlueFire() && logic->CanKillEnemy(RE_FREEZARD));}),
+        EventAccess(&logic->BlueFireAccess,  []{return true;}),
+        EventAccess(&logic->FairyPot,        []{return logic->BlueFire() && logic->CanKillEnemy(RE_FREEZARD);}),
         EventAccess(&logic->WaterTrialClear, []{return logic->BlueFire() && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_LIGHT_ARROWS);}),
     }, {
         //Locations
@@ -90,7 +86,7 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_WATER_TRIAL_POT_3,       logic->CanBreakPots() && logic->BlueFire() && logic->CanKillEnemy(RE_FREEZARD)),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_SHADOW_TRIAL] = Region("Ganon's Castle Shadow Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ShadowTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_MEGATON_HAMMER) && ((logic->CanUse(RG_FIRE_ARROWS) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->CanUse(RG_DINS_FIRE) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))))));}),
     }, {
@@ -106,13 +102,13 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_SHADOW_TRIAL_HEART_3,                (logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_DINS_FIRE)))) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_BOOMERANG))),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL] = Region("Ganon's Castle Spirit Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
-        EventAccess(&logic->NutPot,           []{return logic->NutPot || (((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslashExceptHammer()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))));}),
+        EventAccess(&logic->NutPot,           []{return ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslashExceptHammer()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)));}),
         EventAccess(&logic->SpiritTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS) && (logic->CanUse(RG_MIRROR_SHIELD) || ctx->GetOption(RSK_SUNLIGHT_ARROWS)) && logic->CanUse(RG_BOMBCHU_5) && ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslashExceptHammer()) || logic->CanUse(RG_HOOKSHOT));}),
     }, {
         //Locations
-        LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanJumpslashExceptHammer()),
+        LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && (logic->CanJumpslashExceptHammer() || logic->CanUse(RG_BOMBCHU_5))),
         LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,      (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH))),
         LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,                ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslashExceptHammer()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
         LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,                ((ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslashExceptHammer()) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_BOMBCHU_5) && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS)))),
@@ -120,7 +116,7 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_HEART,                true),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL] = Region("Ganon's Castle Light Trial", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->LightTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_GANONS_CASTLE, 2) && (ctx->GetTrickOption(RT_LENS_GANON) || logic->CanUse(RG_LENS_OF_TRUTH));}),
     }, {
@@ -142,14 +138,14 @@ void RegionTable_Init_GanonsCastle() {
 
 #pragma region MQ
 
-    areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_LOBBY] = Region("Ganon's Castle MQ Lobby", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_ENTRYWAY, []{return logic->CanPassEnemy(RE_GREEN_BUBBLE) || Here(RR_GANONS_CASTLE_MQ_LOBBY, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE) && logic->CanKillEnemy(RE_ARMOS);});}),
         //Implies CanKillEnemy(RE_GREEN_BUBBLE)
         Entrance(RR_GANONS_CASTLE_MQ_MAIN,  []{return Here(RR_GANONS_CASTLE_MQ_LOBBY, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE) && logic->CanKillEnemy(RE_ARMOS);});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Region("Ganon's Castle MQ Main", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Region("Ganon's Castle MQ Main", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_SHEIK_HINT_MQ_GC,  true),
     }, {
@@ -161,17 +157,11 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE, []{return true;}),
         Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM,    []{return true;}),
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_DINOLFOS_ROOM,   []{return Here(RR_GANONS_CASTLE_MQ_MAIN, []{return logic->CanUse(RG_GOLDEN_GAUNTLETS);});}),
-        //RANDOTODO could we just set these events automatically based on the setting?
-        Entrance(RR_GANONS_TOWER_FLOOR_1,                         []{return (logic->ForestTrialClear || ctx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
-                                                                            (logic->FireTrialClear   || ctx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
-                                                                            (logic->WaterTrialClear  || ctx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
-                                                                            (logic->ShadowTrialClear || ctx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
-                                                                            (logic->SpiritTrialClear || ctx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
-                                                                            (logic->LightTrialClear  || ctx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}),
+        Entrance(RR_GANONS_TOWER_ENTRYWAY,                        []{return true;}),
         Entrance(RR_GANONS_CASTLE_MQ_DEKU_SCRUBS,                 []{return ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_DEKU_SCRUBS] = Region("Ganon's Castle MQ Deku Scrubs", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -194,7 +184,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_MAIN, []{return true;}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_STALFOS_ROOM] = Region("Ganon's Castle MQ Forest Trial Stalfos Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_STALFOS_ROOM] = Region("Ganon's Castle MQ Forest Trial Stalfos Room", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, logic->HookshotOrBoomerang()),
     }, {
@@ -204,7 +194,7 @@ void RegionTable_Init_GanonsCastle() {
     });
 
     //If it is ever possible to warp into the RR_GANONS_CASTLE_MQ_FOREST_TRIAL_FINAL_ROOM, this needs splitting up as the requirements to reach things from the other side are more complex
-    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_BEAMOS_ROOM] = Region("Ganon's Castle MQ Forest Trial Beamos Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_BEAMOS_ROOM] = Region("Ganon's Castle MQ Forest Trial Beamos Room", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,        logic->CanHitEyeTargets()),
         LOCATION(RC_GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, logic->HasFireSource()),
@@ -214,7 +204,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL_FINAL_ROOM,   []{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Forest Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_FOREST_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Forest Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ForestTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
     }, {
@@ -226,14 +216,14 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL_BEAMOS_ROOM, []{return true;}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_MAIN_ROOM] = Region("Ganon's Castle MQ Fire Trial Main Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_MAIN_ROOM] = Region("Ganon's Castle MQ Fire Trial Main Room", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_MAIN,                  []{return true;}),
                                                                                                                                     //2 checks, 1 for the rupees, 1 for actually making it, as the rupees are permanent but throwing a pillar is not
         Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM, []{return Here(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_MAIN_ROOM, []{return logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_GOLDEN_GAUNTLETS);}) && logic->CanUse(RG_GORON_TUNIC) && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_GOLDEN_GAUNTLETS) && (logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_GANON_MQ_FIRE_TRIAL) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT)))));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Fire Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Fire Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->FireTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
         //There's no way back across the lava without glitches
@@ -243,7 +233,7 @@ void RegionTable_Init_GanonsCastle() {
         LOCATION(RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2, logic->CanBreakPots()),
     }, {});
 
-    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM] = Region("Ganon's Castle MQ Water Trial Geyser Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM] = Region("Ganon's Castle MQ Water Trial Geyser Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->BlueFireAccess,  []{return logic->CanJumpslash() || logic->HasExplosives();}),
     }, {
@@ -256,14 +246,14 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM, []{return logic->SmallKeys(RR_GANONS_CASTLE, 3) && Here(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM, []{return logic->BlueFire();});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM] = Region("Ganon's Castle MQ Water Trial Block Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, { 
+    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM] = Region("Ganon's Castle MQ Water Trial Block Room", SCENE_INSIDE_GANONS_CASTLE, {}, {}, { 
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM, []{return logic->SmallKeys(RR_GANONS_CASTLE, 3);}),
         //This assumes there's no way for child to have blue fire and not adult.
         Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM,  []{return logic->IsAdult && logic->BlueFire();}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Water Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Water Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->WaterTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
     }, {
@@ -275,7 +265,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM, []{return Here(RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM, []{return logic->BlueFire();});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE] = Region("Ganon's Castle MQ Shadow Trial Starting Ledge", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE] = Region("Ganon's Castle MQ Shadow Trial Starting Ledge", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ShadowTrialFirstChest, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {}, {
@@ -284,7 +274,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_CHEST_PLATFORM, []{return (logic->ShadowTrialFirstChest && logic->CanUse(RG_HOOKSHOT)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_CHEST_PLATFORM] = Region("Ganon's Castle MQ Shadow Trial Chest Platform", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_CHEST_PLATFORM] = Region("Ganon's Castle MQ Shadow Trial Chest Platform", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ShadowTrialFirstChest, []{return logic->CanUse(RG_FAIRY_BOW);}),
     }, {
@@ -297,7 +287,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM, []{return (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM] = Region("Ganon's Castle MQ Shadow Trial Moving Platform", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM] = Region("Ganon's Castle MQ Shadow Trial Moving Platform", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         //A torch run from RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE is possible but tight, so would be a trick
         EventAccess(&logic->ShadowTrialFirstChest, []{return logic->CanDetonateUprightBombFlower();}),
@@ -308,7 +298,7 @@ void RegionTable_Init_GanonsCastle() {
     });
 
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH] = Region("Ganon's Castle MQ Shadow Trial Beamos Torch", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH] = Region("Ganon's Castle MQ Shadow Trial Beamos Torch", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM, []{return ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}),
         //A torch run from RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE is possible but very tight, so would be a trick
@@ -317,7 +307,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE,        []{return logic->HasFireSource() || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL) && logic->CanUse(RG_FAIRY_BOW));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE] = Region("Ganon's Castle MQ Shadow Trial Far Side", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE] = Region("Ganon's Castle MQ Shadow Trial Far Side", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,  logic->CanHitEyeTargets()),
     }, {
@@ -331,7 +321,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM,   []{return (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Shadow Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Shadow Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->ShadowTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
     }, {
@@ -343,13 +333,13 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE, []{return (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM] = Region("Ganon's Castle MQ Spirit Trial Chairs Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM] = Region("Ganon's Castle MQ Spirit Trial Chairs Room", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_MAIN,                       []{return true;}),
         Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_BEFORE_SWITCH, []{return Here(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM, []{return (logic->CanHitEyeTargets() || ctx->GetTrickOption(RT_RUSTED_SWITCHES)) && logic->CanUse(RG_MEGATON_HAMMER);});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_BEFORE_SWITCH] = Region("Ganon's Castle MQ Spirit Trial Before Switch", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_BEFORE_SWITCH] = Region("Ganon's Castle MQ Spirit Trial Before Switch", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST, logic->CanPassEnemy(RE_GREEN_BUBBLE)),
     }, {
@@ -358,7 +348,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_AFTER_SWITCH, []{return Here(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_BEFORE_SWITCH, []{return logic->CanUse(RG_BOMBCHU_5);});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_AFTER_SWITCH] = Region("Ganon's Castle MQ Spirit Trial After Switch", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_AFTER_SWITCH] = Region("Ganon's Castle MQ Spirit Trial After Switch", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,         ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
         //better names for these would be nice.
@@ -373,7 +363,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FINAL_ROOM,    []{return Here(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_AFTER_SWITCH, []{return (logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_MIRROR_SHIELD));}) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Spirit Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Spirit Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->SpiritTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
         EventAccess(&logic->NutPot,           []{return true;}),
@@ -386,13 +376,13 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_AFTER_SWITCH, []{return true;}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_DINOLFOS_ROOM] = Region("Ganon's Castle MQ Light Trial Dinolfos Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_DINOLFOS_ROOM] = Region("Ganon's Castle MQ Light Trial Dinolfos Room", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_MAIN,                      []{return true;}),
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_TRIFORCE_ROOM, []{return Here(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_DINOLFOS_ROOM, []{return logic->CanKillEnemy(RE_DINOLFOS) && logic->CanKillEnemy(RE_TORCH_SLUG);});}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_TRIFORCE_ROOM] = Region("Ganon's Castle MQ Light Trial Triforce Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_TRIFORCE_ROOM] = Region("Ganon's Castle MQ Light Trial Triforce Room", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
@@ -401,13 +391,13 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_FRONT, []{return logic->SmallKeys(RR_GANONS_CASTLE, 2);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_FRONT] = Region("Ganon's Castle MQ Light Trial Boulder Room Front", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_FRONT] = Region("Ganon's Castle MQ Light Trial Boulder Room Front", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_TRIFORCE_ROOM,     []{return logic->SmallKeys(RR_GANONS_CASTLE, 2);}),
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_BACK, []{return logic->CanUse(RG_HOOKSHOT) || ctx->GetTrickOption(RT_GANON_MQ_LIGHT_TRIAL);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_BACK] = Region("Ganon's Castle MQ Light Trial Boulder Room Back", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_BACK] = Region("Ganon's Castle MQ Light Trial Boulder Room Back", SCENE_INSIDE_GANONS_CASTLE, {}, {
         //Locations
         LOCATION(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART,  true),
         LOCATION(RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART, true),
@@ -418,7 +408,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_FINAL_ROOM,         []{return logic->SmallKeys(RR_GANONS_CASTLE, 3) && (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanJumpslash() || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOOMERANG));}),
     });
 
-    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Light Trial Final Room", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Light Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->LightTrialClear, []{return logic->CanUse(RG_LIGHT_ARROWS);}),
     }, {
@@ -431,13 +421,26 @@ void RegionTable_Init_GanonsCastle() {
 
 #pragma region Tower and Escape
 
-    areaTable[RR_GANONS_TOWER_FLOOR_1] = Region("Ganon's Tower Floor 1", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_TOWER_ENTRYWAY] = Region("Ganon's Tower Entryway", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
         //Exits
-        Entrance(RR_GANONS_CASTLE_LOBBY,  []{return Here(RR_GANONS_TOWER_FLOOR_1, []{return logic->CanKillEnemy(RE_DINOLFOS, ED_CLOSE, true, 2);});}),
-        Entrance(RR_GANONS_TOWER_FLOOR_2, []{return Here(RR_GANONS_TOWER_FLOOR_1, []{return logic->CanKillEnemy(RE_DINOLFOS, ED_CLOSE, true, 2);});}),
+        Entrance(RR_GANONS_CASTLE_LOBBY,   []{return ctx->GetDungeon(GANONS_CASTLE)->IsVanilla();}),
+        Entrance(RR_GANONS_CASTLE_MQ_MAIN, []{return ctx->GetDungeon(GANONS_CASTLE)->IsMQ();}),
+        //RANDOTODO could we just set these events automatically based on the setting?
+        Entrance(RR_GANONS_TOWER_FLOOR_1,  []{return (logic->ForestTrialClear || ctx->GetTrial(TK_FOREST_TRIAL)->IsSkipped()) &&
+                                                     (logic->FireTrialClear   || ctx->GetTrial(TK_FIRE_TRIAL)->IsSkipped())   &&
+                                                     (logic->WaterTrialClear  || ctx->GetTrial(TK_WATER_TRIAL)->IsSkipped())  &&
+                                                     (logic->ShadowTrialClear || ctx->GetTrial(TK_SHADOW_TRIAL)->IsSkipped()) &&
+                                                     (logic->SpiritTrialClear || ctx->GetTrial(TK_SPIRIT_TRIAL)->IsSkipped()) &&
+                                                     (logic->LightTrialClear  || ctx->GetTrial(TK_LIGHT_TRIAL)->IsSkipped());}),
     });
 
-    areaTable[RR_GANONS_TOWER_FLOOR_2] = Region("Ganon's Tower Floor 2", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_TOWER_FLOOR_1] = Region("Ganon's Tower Floor 1", SCENE_GANONS_TOWER, {}, {}, {
+        //Exits
+        Entrance(RR_GANONS_TOWER_ENTRYWAY, []{return Here(RR_GANONS_TOWER_FLOOR_1, []{return logic->CanKillEnemy(RE_DINOLFOS, ED_CLOSE, true, 2);});}),
+        Entrance(RR_GANONS_TOWER_FLOOR_2,  []{return Here(RR_GANONS_TOWER_FLOOR_1, []{return logic->CanKillEnemy(RE_DINOLFOS, ED_CLOSE, true, 2);});}),
+    });
+
+    areaTable[RR_GANONS_TOWER_FLOOR_2] = Region("Ganon's Tower Floor 2", SCENE_GANONS_TOWER, {}, {
         //Locations
         LOCATION(RC_GANONS_TOWER_BOSS_KEY_CHEST, logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2)),
     }, {
@@ -446,13 +449,13 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_TOWER_FLOOR_3, []{return Here(RR_GANONS_TOWER_FLOOR_2, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_GANONS_TOWER_FLOOR_3] = Region("Ganon's Tower Floor 3", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_TOWER_FLOOR_3] = Region("Ganon's Tower Floor 3", SCENE_GANONS_TOWER, {}, {}, {
         //Exits
         Entrance(RR_GANONS_TOWER_FLOOR_2,               []{return Here(RR_GANONS_TOWER_FLOOR_3, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE, ED_CLOSE, true, 2);});}),
         Entrance(RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR, []{return Here(RR_GANONS_TOWER_FLOOR_3, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR] = Region("Ganon's Tower Before Ganondorf's Lair", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR] = Region("Ganon's Tower Before Ganondorf's Lair", SCENE_GANONS_TOWER, {}, {
         // Locations
         LOCATION(RC_GANONS_CASTLE_GANONS_TOWER_POT_1,  logic->CanBreakPots()),
         LOCATION(RC_GANONS_CASTLE_GANONS_TOWER_POT_2,  logic->CanBreakPots()),
@@ -478,7 +481,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_TOWER_GANONDORF_LAIR, []{return Here(RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR, []{return logic->HasItem(RG_GANONS_CASTLE_BOSS_KEY);});}),
     });
 
-    areaTable[RR_GANONS_TOWER_GANONDORF_LAIR] = Region("Ganondorf's Lair", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_TOWER_GANONDORF_LAIR] = Region("Ganondorf's Lair", SCENE_GANONDORF_BOSS, {}, {
         //Locations
         LOCATION(RC_GANONDORF_HINT, logic->HasBossSoul(RG_GANON_SOUL)),
     }, {
@@ -486,7 +489,7 @@ void RegionTable_Init_GanonsCastle() {
         Entrance(RR_GANONS_CASTLE_ESCAPE, []{return logic->CanKillEnemy(RE_GANONDORF);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_ESCAPE] = Region("Ganon's Castle Escape", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_ESCAPE] = Region("Ganon's Castle Escape", SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, {}, {
         //Locations
         //10 pots
         //RANDOTODO hook potsanity pots up to escape.
@@ -498,10 +501,11 @@ void RegionTable_Init_GanonsCastle() {
         //Entrance(RR_GANONS_CASTLE_GANON_ARENA, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2, true);}),
     });
 
-    areaTable[RR_GANONS_CASTLE_GANON_ARENA] = Region("Ganon's Arena", "Ganons Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GANONS_CASTLE_GANON_ARENA] = Region("Ganon's Arena", SCENE_GANON_BOSS, {}, {
         //Locations
         LOCATION(RC_GANON, logic->CanKillEnemy(RE_GANON)),
     }, {});
 
 #pragma endregion
-}
\ No newline at end of file
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp
index f0b9de5c3e..2eb8764e13 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp
@@ -5,20 +5,21 @@
 using namespace Rando;
 
 void RegionTable_Init_GerudoTrainingGround() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_GERUDO_TRAINING_GROUND_ENTRYWAY] = Region("Gerudo Training Ground Entryway", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_ENTRYWAY] = Region("Gerudo Training Ground Entryway", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
         //Exits
         Entrance(RR_GERUDO_TRAINING_GROUND_LOBBY,    []{return ctx->GetDungeon(GERUDO_TRAINING_GROUND)->IsVanilla();}),
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_LOBBY, []{return ctx->GetDungeon(GERUDO_TRAINING_GROUND)->IsMQ();}),
-        Entrance(RR_GERUDO_FORTRESS,                 []{return true;}),
+        Entrance(RR_GF_OUTSIDE_GTG,                  []{return true;}),
     });
 
 #pragma region Vanilla
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_LOBBY] = Region("Gerudo Training Ground Lobby", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_LOBBY] = Region("Gerudo Training Ground Lobby", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
-        LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,      logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
-        LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,     logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)),
+        LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,      logic->CanHitEyeTargets()),
+        LOCATION(RC_GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,     logic->CanHitEyeTargets()),
         LOCATION(RC_GERUDO_TRAINING_GROUND_STALFOS_CHEST,         logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2, true)),
         LOCATION(RC_GERUDO_TRAINING_GROUND_BEAMOS_CHEST,          logic->CanKillEnemy(RE_BEAMOS) && logic->CanKillEnemy(RE_DINOLFOS, ED_CLOSE, true, 2, true)),
         LOCATION(RC_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY, logic->CanUse(RG_SONG_OF_STORMS)),
@@ -32,7 +33,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE,     []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE] = Region("Gerudo Training Ground Central Maze", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE] = Region("Gerudo Training Ground Central Maze", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,   logic->SmallKeys(RR_GERUDO_TRAINING_GROUND, 3) && (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH))),
         LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,  logic->SmallKeys(RR_GERUDO_TRAINING_GROUND, 4)),
@@ -44,7 +45,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE_RIGHT, []{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUND, 9);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Ground Central Maze Right", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE_RIGHT] = Region("Gerudo Training Ground Central Maze Right", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, true),
         LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,    true),
@@ -55,7 +56,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM,   []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_LAVA_ROOM] = Region("Gerudo Training Ground Lava Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_LAVA_ROOM] = Region("Gerudo Training Ground Lava Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24),
     }, {
@@ -64,7 +65,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_HAMMER_ROOM,        []{return logic->CanUse(RG_LONGSHOT)  || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_HOOKSHOT));}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_HAMMER_ROOM] = Region("Gerudo Training Ground Hammer Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_HAMMER_ROOM] = Region("Gerudo Training Ground Hammer Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,  logic->CanAttack()),
         LOCATION(RC_GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST, logic->CanUse(RG_MEGATON_HAMMER) || (logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS))),
@@ -74,7 +75,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM,        []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_LOWER] = Region("Gerudo Training Ground Eye Statue Lower", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_LOWER] = Region("Gerudo Training Ground Eye Statue Lower", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST, logic->CanUse(RG_FAIRY_BOW)),
     }, {
@@ -82,7 +83,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_HAMMER_ROOM, []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_UPPER] = Region("Gerudo Training Ground Eye Statue Upper", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_UPPER] = Region("Gerudo Training Ground Eye Statue Upper", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST, logic->CanUse(RG_FAIRY_BOW)),
     }, {
@@ -90,7 +91,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_EYE_STATUE_LOWER, []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Ground Heavy Block Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_ROOM] = Region("Gerudo Training Ground Heavy Block Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST, logic->CanKillEnemy(RE_WOLFOS, ED_CLOSE, true, 4, true)),
     }, {
@@ -99,7 +100,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_LIKE_LIKE_ROOM,   []{return (ctx->GetTrickOption(RT_LENS_GTG) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS))) && logic->CanUse(RG_SILVER_GAUNTLETS);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_LIKE_LIKE_ROOM] = Region("Gerudo Training Ground Like Like Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_LIKE_LIKE_ROOM] = Region("Gerudo Training Ground Like Like Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,  logic->CanJumpslashExceptHammer()),
         LOCATION(RC_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST, logic->CanJumpslashExceptHammer()),
@@ -111,7 +112,7 @@ void RegionTable_Init_GerudoTrainingGround() {
 
 #pragma region MQ
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LOBBY] = Region("Gerudo Training Ground MQ Lobby", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LOBBY] = Region("Gerudo Training Ground MQ Lobby", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,       true),
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,      true),
@@ -131,7 +132,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_ROOM,    []{return Here(RR_GERUDO_TRAINING_GROUND_MQ_LOBBY, []{return (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)) || (logic->IsChild && logic->CanUse(RG_FAIRY_SLINGSHOT));});}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_HIDDEN_ROOM] = Region("Gerudo Training Ground MQ Maze Hidden Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_HIDDEN_ROOM] = Region("Gerudo Training Ground MQ Maze Hidden Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST, true),
     }, {
@@ -139,7 +140,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_LOBBY, []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_FIRST_LOCK] = Region("Gerudo Training Ground MQ Maze First Lock", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_FIRST_LOCK] = Region("Gerudo Training Ground MQ Maze First Lock", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST, true),
     }, {
@@ -148,15 +149,19 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_MAZE_CENTER, []{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUND, 3);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_CENTER] = Region("Gerudo Training Ground MQ Center", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_CENTER] = Region("Gerudo Training Ground MQ Center", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         EventAccess(&logic->MQGTGMazeSwitch, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
-    }, {}, {
+    }, 
+    {   //Locations
+        LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE, logic->CanBreakCrates()),
+    },
+    {
         //Exits
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_MAZE_FIRST_LOCK, []{return logic->SmallKeys(RR_GERUDO_TRAINING_GROUND, 3);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_SAND_ROOM] = Region("Gerudo Training Ground MQ Sand Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_SAND_ROOM] = Region("Gerudo Training Ground MQ Sand Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST, logic->CanKillEnemy(RE_IRON_KNUCKLE)),
     }, {
@@ -165,13 +170,13 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_LEFT_SIDE, []{return Here(RR_GERUDO_TRAINING_GROUND_MQ_SAND_ROOM, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE);});}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEFT_SIDE] = Region("Gerudo Training Ground MQ Left Side", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEFT_SIDE] = Region("Gerudo Training Ground MQ Left Side", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
         //Exits
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_SAND_ROOM,    []{return true;}),
-        Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, []{return Here(RR_GERUDO_TRAINING_GROUND_MQ_LEFT_SIDE, []{return logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_MQ_WIHTOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_HOOKSHOT));});}),
+        Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, []{return Here(RR_GERUDO_TRAINING_GROUND_MQ_LEFT_SIDE, []{return logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_MQ_WITHOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_HOOKSHOT));});}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM] = Region("Gerudo Training Ground MQ Stalfos Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM] = Region("Gerudo Training Ground MQ Stalfos Room", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         EventAccess(&logic->BlueFireAccess, []{return true;}),
     }, {
@@ -184,13 +189,13 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE, []{return logic->IsAdult && Here(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2, true);}) && (ctx->GetTrickOption(RT_LENS_GTG_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->BlueFire() && (logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_GTG_FAKE_WALL) && logic->CanUse(RG_HOVER_BOOTS)));}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_BEHIND_BLOCK] = Region("Gerudo Training Ground MQ Behind Block", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_BEHIND_BLOCK] = Region("Gerudo Training Ground MQ Behind Block", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         //implies logic->CanKillEnemy(RE_SPIKE)
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST, logic->CanKillEnemy(RE_FREEZARD)),
     }, {});
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE] = Region("Gerudo Training Ground MQ Statue Room Ledge", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE] = Region("Gerudo Training Ground MQ Statue Room Ledge", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
         //Exits
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM,      []{return true;}),
         //implies dropping down to hit the switch. Using swords, especially master, is a bit awkward, may be trick worthy, but is only relevant with other tricks
@@ -198,7 +203,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM,       []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAGENTA_FIRE_ROOM] = Region("Gerudo Training Ground MQ Magenta Fire Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAGENTA_FIRE_ROOM] = Region("Gerudo Training Ground MQ Magenta Fire Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST, logic->MQGTGMazeSwitch),
     }, {
@@ -206,7 +211,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE,  []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM] = Region("Gerudo Training Ground MQ Statue ROom", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM] = Region("Gerudo Training Ground MQ Statue ROom", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST, logic->CanUse(RG_FAIRY_BOW)),
     }, {
@@ -215,7 +220,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SLUG_ROOM,   []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SLUG_ROOM] = Region("Gerudo Training Ground MQ Torch Slug Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SLUG_ROOM] = Region("Gerudo Training Ground MQ Torch Slug Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         //implies logic->CanKillEnemy(RE_TORCH_SLUG)
         LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST, logic->CanKillEnemy(RE_IRON_KNUCKLE)),
@@ -226,7 +231,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE, []{return Here(RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SLUG_ROOM, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE);});}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE] = Region("Gerudo Training Ground MQ Switch Ledge", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE] = Region("Gerudo Training Ground MQ Switch Ledge", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         EventAccess(&logic->MQGTGRightSideSwitch,    []{return logic->CanUse(RG_MEGATON_HAMMER);}),
         EventAccess(&logic->GTGPlatformSilverRupees, []{return logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS);}),
@@ -241,7 +246,7 @@ void RegionTable_Init_GerudoTrainingGround() {
     //this region exists to place silver rupee items on later, normally it's all on fire and cannot be stood on without access from another area
     //This covers the 2 platforms that can be jumped to directly from RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE
     //the unshuffled rupee collection is handled by the event GTGPlatformSilverRupees
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS] = Region("Gerudo Training Ground MQ Ledge Side Platforms", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS] = Region("Gerudo Training Ground MQ Ledge Side Platforms", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
         //Exits
         //This is merely to extend this region's logic if you have hovers
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM, []{return logic->CanUse(RG_HOVER_BOOTS);}),
@@ -250,13 +255,13 @@ void RegionTable_Init_GerudoTrainingGround() {
     //this region exists to place silver rupee items on later, normally it's all on fire and cannot be stood on without access from another area
     //This covers the platform that needs hover boots or the spawned targets to reach from any starting point other than RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT
     //the unshuffled rupee collection is handled by the event GTGPlatformSilverRupees
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM] = Region("Gerudo Training Ground MQ Furthest Platform", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM] = Region("Gerudo Training Ground MQ Furthest Platform", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
         //Exits
         //This is merely to extend this region's logic if you have hovers
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, []{return logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH] = Region("Gerudo Training Ground MQ Platforms Unlit Torch", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH] = Region("Gerudo Training Ground MQ Platforms Unlit Torch", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         EventAccess(&logic->GTGPlatformSilverRupees, []{return logic->HasFireSource() && logic->CanUse(RG_HOVER_BOOTS);}),
     }, {}, {
@@ -267,7 +272,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT,           []{return logic->MQGTGRightSideSwitch && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->HasFireSource()));}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SIDE_PLATFORMS] = Region("Gerudo Training Ground Torch Side Platforms", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SIDE_PLATFORMS] = Region("Gerudo Training Ground Torch Side Platforms", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         //this torch shot is possible as child but tight and obtuse enough to be a trick
         EventAccess(&logic->GTGPlatformSilverRupees, []{return ((logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)) && logic->CanUse(RG_HOVER_BOOTS);}),
@@ -279,17 +284,17 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_ROOM,         []{return true;}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER] = Region("Gerudo Training Ground MQ Underwater", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER] = Region("Gerudo Training Ground MQ Underwater", SCENE_GERUDO_TRAINING_GROUND, {}, {
         //Locations
         //it is possible to snipe the stingers with bow or sling before dropping in, or just get really lucky, and avoid needing to take damage, but that might be trick worthy
-        LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource() && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
+        LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasFireSource() && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->HasItem(RG_BRONZE_SCALE) && logic->TakeDamage()),
     }, {
         //Exits
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, []{return true;}),
     });
 
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT] = Region("Gerudo Training Ground MQ Maze Right", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT] = Region("Gerudo Training Ground MQ Maze Right", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         EventAccess(&logic->GTGPlatformSilverRupees, []{return logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS);}),
     }, {
@@ -305,7 +310,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         Entrance(RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM,     []{return logic->CanUse(RG_FIRE_ARROWS);}),
     });
 
-    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_ROOM] = Region("Gerudo Training Ground MQ Dinolfos Room", "Gerudo Training Ground", {RA_GERUDO_TRAINING_GROUND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_ROOM] = Region("Gerudo Training Ground MQ Dinolfos Room", SCENE_GERUDO_TRAINING_GROUND, {
         //Events
         //EventAccess(&WallFairy, []{return WallFairy || (logic->IsAdult && logic->CanUse(RG_FAIRY_BOW));}),
     }, {
@@ -321,4 +326,5 @@ void RegionTable_Init_GerudoTrainingGround() {
     });
 
 #pragma endregion
-}
\ No newline at end of file
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp
index ff9b171c82..5151377ce2 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp
@@ -5,34 +5,35 @@
 using namespace Rando;
 
 void RegionTable_Init_IceCavern() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_ICE_CAVERN_ENTRYWAY] = Region("Ice Cavern Entryway", SCENE_ICE_CAVERN, {}, {}, {
         //Exits
         Entrance(RR_ICE_CAVERN_BEGINNING,    []{return ctx->GetDungeon(ICE_CAVERN)->IsVanilla();}),
         Entrance(RR_ICE_CAVERN_MQ_BEGINNING, []{return ctx->GetDungeon(ICE_CAVERN)->IsMQ() && logic->CanUseProjectile();}),
-        Entrance(RR_ZORAS_FOUNTAIN,          []{return true;}),
+        Entrance(RR_ZF_LEDGE,                []{return true;}),
     });
 
 #pragma region Vanilla
 
-    areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ICE_CAVERN_BEGINNING] = Region("Ice Cavern Beginning", SCENE_ICE_CAVERN, {}, {
         //Locations
         LOCATION(RC_ICE_CAVERN_ENTRANCE_STORMS_FAIRY, logic->CanUse(RG_SONG_OF_STORMS)),
     }, {
         //Exits
         Entrance(RR_ICE_CAVERN_ENTRYWAY, []{return true;}),
-        Entrance(RR_ICE_CAVERN_MAIN,     []{return Here(RR_ICE_CAVERN_BEGINNING, []{return (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD)) || logic->CanUse(RG_MEGATON_HAMMER) || logic->HasExplosives() || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE);});}),
+        Entrance(RR_ICE_CAVERN_MAIN,     []{return Here(RR_ICE_CAVERN_BEGINNING, []{return logic->CanKillEnemy(RE_FREEZARD, ED_CLOSE, true, 4);});}),
     });
 
-    areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ICE_CAVERN_MAIN] = Region("Ice Cavern", SCENE_ICE_CAVERN, {
         //Events
-        EventAccess(&logic->BlueFireAccess, []{return logic->BlueFireAccess || (logic->IsAdult && logic->HasBottle());}),
+        EventAccess(&logic->BlueFireAccess, []{return logic->IsAdult;}),
     }, {
         //Locations
         LOCATION(RC_ICE_CAVERN_MAP_CHEST,               logic->BlueFire() && logic->IsAdult),
         LOCATION(RC_ICE_CAVERN_COMPASS_CHEST,           logic->BlueFire()),
-        LOCATION(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE))),
-        LOCATION(RC_SHEIK_IN_ICE_CAVERN,                logic->BlueFire() && (logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE)) && logic->IsAdult),
+        LOCATION(RC_ICE_CAVERN_IRON_BOOTS_CHEST,        logic->BlueFire() && logic->CanKillEnemy(RE_WOLFOS)),
+        LOCATION(RC_SHEIK_IN_ICE_CAVERN,                logic->BlueFire() && logic->CanKillEnemy(RE_WOLFOS) && logic->IsAdult),
         LOCATION(RC_ICE_CAVERN_FREESTANDING_POH,        logic->BlueFire()),
         LOCATION(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, logic->HookshotOrBoomerang()),
         LOCATION(RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,     logic->BlueFire() && logic->HookshotOrBoomerang()),
@@ -58,7 +59,7 @@ void RegionTable_Init_IceCavern() {
 
 #pragma region MQ
 
-    areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ICE_CAVERN_MQ_BEGINNING] = Region("Ice Cavern MQ Beginning", SCENE_ICE_CAVERN, {}, {
         //Locations
         LOCATION(RC_ICE_CAVERN_MQ_ENTRANCE_POT, logic->CanBreakPots()),
     }, {
@@ -68,7 +69,7 @@ void RegionTable_Init_IceCavern() {
         Entrance(RR_ICE_CAVERN_MQ_HUB,   []{return true;}),
     });
 
-    areaTable[RR_ICE_CAVERN_MQ_HUB] = Region("Ice Cavern MQ Hub", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ICE_CAVERN_MQ_HUB] = Region("Ice Cavern MQ Hub", SCENE_ICE_CAVERN, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -83,13 +84,13 @@ void RegionTable_Init_IceCavern() {
         //Exits
         //the switch for the glass blocking the entrance is linked to the switch that controls the glass around the skulltulla in RR_ICE_CAVERN_MQ_SCARECROW_ROOM
         //if you clear the ice, you can hit it with a pot from here.
-        Entrance(RR_ICE_CAVERN_BEGINNING,         []{return logic->BlueFire();}),
+        Entrance(RR_ICE_CAVERN_MQ_BEGINNING,      []{return logic->BlueFire();}),
         Entrance(RR_ICE_CAVERN_MQ_MAP_ROOM,       []{return Here(RR_ICE_CAVERN_MQ_BEGINNING, []{return logic->CanKillEnemy(RE_WHITE_WOLFOS) && logic->CanKillEnemy(RE_FREEZARD);});}),
         Entrance(RR_ICE_CAVERN_MQ_COMPASS_ROOM,   []{return logic->IsAdult && logic->BlueFire();}),
         Entrance(RR_ICE_CAVERN_MQ_SCARECROW_ROOM, []{return logic->BlueFire();}),
     });
 
-    areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ICE_CAVERN_MQ_MAP_ROOM] = Region("Ice Cavern MQ Map Room", SCENE_ICE_CAVERN, {
         //Events
         //Child can fit between the stalagmites on the left hand side
         EventAccess(&logic->BlueFireAccess,  []{return logic->IsChild || logic->CanJumpslash() || logic->HasExplosives();}),
@@ -98,7 +99,7 @@ void RegionTable_Init_IceCavern() {
         LOCATION(RC_ICE_CAVERN_MQ_MAP_CHEST, logic->BlueFire() && Here(RR_ICE_CAVERN_MQ_MAP_ROOM, []{return logic->CanHitSwitch();})),
     }, {});
 
-    areaTable[RR_ICE_CAVERN_MQ_SCARECROW_ROOM] = Region("Ice Cavern MQ Scarecrow Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ICE_CAVERN_MQ_SCARECROW_ROOM] = Region("Ice Cavern MQ Scarecrow Room", SCENE_ICE_CAVERN, {}, {
         //Locations
         LOCATION(RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,     (logic->BlueFire() && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)) || (logic->IsAdult && logic->CanHitSwitch(ED_LONG_JUMPSLASH))),
         LOCATION(RC_ICE_CAVERN_MQ_GS_SCARECROW,     logic->CanUse(RG_SCARECROW) || (logic->IsAdult && (logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_ICE_MQ_SCARECROW)))),
@@ -109,7 +110,7 @@ void RegionTable_Init_IceCavern() {
         Entrance(RR_ICE_CAVERN_MQ_WEST_CORRIDOR, []{return logic->IsAdult && logic->BlueFire();}),
     });
 
-    areaTable[RR_ICE_CAVERN_MQ_WEST_CORRIDOR] = Region("Ice Cavern MQ West Corridor", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ICE_CAVERN_MQ_WEST_CORRIDOR] = Region("Ice Cavern MQ West Corridor", SCENE_ICE_CAVERN, {}, {
         //Locations
         LOCATION(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1, logic->CanBreakPots()),
         LOCATION(RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2, logic->CanBreakPots()),
@@ -119,17 +120,17 @@ void RegionTable_Init_IceCavern() {
         Entrance(RR_ICE_CAVERN_MQ_STALFOS_ROOM,   []{return true;}),
     });
 
-    areaTable[RR_ICE_CAVERN_MQ_STALFOS_ROOM] = Region("Ice Cavern MQ Stalfos Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ICE_CAVERN_MQ_STALFOS_ROOM] = Region("Ice Cavern MQ Stalfos Room", SCENE_ICE_CAVERN, {}, {
         //Locations
         LOCATION(RC_ICE_CAVERN_MQ_IRON_BOOTS_CHEST, logic->CanKillEnemy(RE_STALFOS)),
         LOCATION(RC_SHEIK_IN_ICE_CAVERN,            logic->CanKillEnemy(RE_STALFOS)),
     }, {
         //Exits
-        Entrance(RR_ICE_CAVERN_MQ_SCARECROW_ROOM, []{return logic->BlueFire() && Here(RR_ICE_CAVERN_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
-        Entrance(RR_ICE_CAVERN_MQ_BEGINNING,      []{return logic->CanUse(RG_IRON_BOOTS) && Here(RR_ICE_CAVERN_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
+        Entrance(RR_ICE_CAVERN_MQ_WEST_CORRIDOR, []{return Here(RR_ICE_CAVERN_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
+        Entrance(RR_ICE_CAVERN_MQ_BEGINNING,     []{return logic->CanUse(RG_IRON_BOOTS) && Here(RR_ICE_CAVERN_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
     });
 
-    areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", "Ice Cavern", {RA_ICE_CAVERN}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ICE_CAVERN_MQ_COMPASS_ROOM] = Region("Ice Cavern MQ Compass Room", SCENE_ICE_CAVERN, {
         //Events
         EventAccess(&logic->BlueFireAccess, []{return true;}),
     }, {
@@ -144,4 +145,5 @@ void RegionTable_Init_IceCavern() {
     }, {});
 
 #pragma endregion
-}
\ No newline at end of file
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
index fa9c7b085e..c40ccf8055 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_JabuJabusBelly() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_ENTRYWAY] = Region("Jabu Jabus Belly Entryway", SCENE_JABU_JABU, {}, {}, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_BEGINNING,    []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}),
         Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}),
@@ -15,23 +16,24 @@ void RegionTable_Init_JabuJabusBelly() {
 
 #pragma region Vanilla
 
-    areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_BEGINNING] = Region("Jabu Jabus Belly Beginning", SCENE_JABU_JABU, {}, {}, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, []{return true;}),
         Entrance(RR_JABU_JABUS_BELLY_MAIN,     []{return logic->CanUseProjectile();}),
     });
 
     //Combines Lift room middle and lower, 1F holes room, the forked corridor, and it's side rooms
-    areaTable[RR_JABU_JABUS_BELLY_MAIN] = Region("Jabu Jabus Belly Main", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MAIN] = Region("Jabu Jabus Belly Main", SCENE_JABU_JABU, {
         //Events
-        EventAccess(&logic->JabuRutoInB1,     []{return true;}),
         EventAccess(&logic->JabuWestTentacle, []{return logic->JabuRutoIn1F && logic->CanKillEnemy(RE_TENTACLE, ED_BOOMERANG);}),
     }, {
         //Locations
-        LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB,      logic->HasItem(RG_BRONZE_SCALE) && (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || ctx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku()),
+        LOCATION(RC_JABU_JABUS_BELLY_DEKU_SCRUB,                    logic->HasItem(RG_BRONZE_SCALE) && (logic->IsChild || logic->HasItem(RG_SILVER_SCALE) || ctx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE) || logic->CanUse(RG_IRON_BOOTS)) && logic->CanStunDeku()),
         //We can kill the Stingers with ruto
-        LOCATION(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST, logic->JabuRutoIn1F),
-        LOCATION(RC_JABU_JABUS_BELLY_MAP_CHEST,       logic->JabuWestTentacle),
+        LOCATION(RC_JABU_JABUS_BELLY_BOOMERANG_CHEST,               logic->JabuRutoIn1F),
+        LOCATION(RC_JABU_JABUS_BELLY_MAP_CHEST,                     logic->JabuWestTentacle),
+        LOCATION(RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1,   logic->CanBreakSmallCrates()),
+        LOCATION(RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2,   logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_BEGINNING,      []{return true;}),
@@ -44,7 +46,7 @@ void RegionTable_Init_JabuJabusBelly() {
     });
 
     //contains B1 of hole room (aside from the ledge leading to big octo), 2 octorock room and north water switch room
-    areaTable[RR_JABU_JABUS_BELLY_B1_NORTH] = Region("Jabu Jabus Belly B1 North", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_B1_NORTH] = Region("Jabu Jabus Belly B1 North", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->JabuRutoIn1F, []{return logic->IsAdult || logic->HasItem(RG_BRONZE_SCALE);}),
         EventAccess(&logic->FairyPot,     []{return logic->CanUse(RG_BOOMERANG) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanKillEnemy(RE_OCTOROK));}),
@@ -66,7 +68,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_SOUTH, []{return logic->IsAdult || logic->HasItem(RG_BRONZE_SCALE);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_LEDGE] = Region("Jabu Jabus Belly Water Switch Room Ledge", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_LEDGE] = Region("Jabu Jabus Belly Water Switch Room Ledge", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -82,7 +84,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_SOUTH, []{return true;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_SOUTH] = Region("Jabu Jabus Belly Water Switch Room South", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_WATER_SWITCH_ROOM_SOUTH] = Region("Jabu Jabus Belly Water Switch Room South", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM, logic->HookshotOrBoomerang()),
     }, {
@@ -92,7 +94,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MAIN,                    []{return logic->CanUseProjectile();}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_COMPASS_ROOM] = Region("Jabu Jabus Belly Compass Room", SCENE_JABU_JABU, {}, {
         //Locations
         //ruto could theoretically clear this room, but it's hard because of the timer and she doesn't appear with you when you respawn after failing, which would force a savewarp
         LOCATION(RC_JABU_JABUS_BELLY_COMPASS_CHEST, logic->CanKillEnemy(RE_SHABOM)),
@@ -101,7 +103,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MAIN, []{return Here(RR_JABU_JABUS_BELLY_COMPASS_ROOM, []{return logic->CanKillEnemy(RE_SHABOM);});}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Region("Jabu Jabus Belly Blue Tentacle", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_BLUE_TENTACLE] = Region("Jabu Jabus Belly Blue Tentacle", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->JabuEastTentacle, []{return logic->CanKillEnemy(RE_TENTACLE, ED_BOOMERANG);}),
     }, {}, {
@@ -109,7 +111,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MAIN, []{return logic->JabuEastTentacle;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Region("Jabu Jabus Belly Green Tentacle", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_GREEN_TENTACLE] = Region("Jabu Jabus Belly Green Tentacle", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->JabuNorthTentacle, []{return logic->CanKillEnemy(RE_TENTACLE, ED_BOOMERANG);}),
     }, {}, {
@@ -118,7 +120,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MAIN, []{return logic->JabuNorthTentacle;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_LEDGE] = Region("Jabu Jabus Belly Bigocto Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_BIGOCTO_LEDGE] = Region("Jabu Jabus Belly Bigocto Room", SCENE_JABU_JABU, {}, {
         //Locations
         //Only adult can get the token without assistance
         LOCATION(RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_SHORT_JUMPSLASH)),
@@ -129,7 +131,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO, []{return logic->JabuRutoIn1F && Here(RR_JABU_JABUS_BELLY_BIGOCTO_LEDGE, []{return logic->CanKillEnemy(RE_BIG_OCTO);});}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Region("Jabu Jabus Belly Above Bigocto", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_ABOVE_BIGOCTO] = Region("Jabu Jabus Belly Above Bigocto", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
         EventAccess(&logic->NutPot,   []{return true;}),
@@ -143,7 +145,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_LIFT_UPPER, []{return logic->CanUse(RG_BOOMERANG);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Region("Jabu Jabus Belly Lift Upper", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_LIFT_UPPER] = Region("Jabu Jabus Belly Lift Upper", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->LoweredJabuPath, []{return true;}),
     }, {}, {
@@ -151,7 +153,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MAIN, []{return true;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly Near Boss Room", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_GS_NEAR_BOSS, logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_BOMB_THROW)),
     }, {
@@ -164,7 +166,7 @@ void RegionTable_Init_JabuJabusBelly() {
 
 #pragma region MQ
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_BEGINNING] = Region("Jabu Jabus Belly MQ Beginning", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->NutPot, []{return true;}),
     }, {
@@ -173,13 +175,15 @@ void RegionTable_Init_JabuJabusBelly() {
         LOCATION(RC_JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
         LOCATION(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1,        logic->CanBreakPots()),
         LOCATION(RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2,        logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1,         logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2,         logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, []{return true;}),
         Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM,  []{return Here(RR_JABU_JABUS_BELLY_MQ_BEGINNING, []{return logic->CanUse(RG_FAIRY_SLINGSHOT);});}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM] = Region("Jabu Jabus Belly MQ Lift Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM] = Region("Jabu Jabus Belly MQ Lift Room", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->MQJabuLiftRoomCow, []{return logic->CanUse(RG_FAIRY_SLINGSHOT);}),
     }, {
@@ -199,7 +203,7 @@ void RegionTable_Init_JabuJabusBelly() {
         //If opening RR_JABU_JABUS_BELLY_MQ_WATER_SWITCH_ROOM by lowering the geyser as 1 age is to let the other through is relevant, it needs an eventAccess
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_UNDERWATER_ALCOVE] = Region("Jabu Jabus Belly MQ Underwater Alcove", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_UNDERWATER_ALCOVE] = Region("Jabu Jabus Belly MQ Underwater Alcove", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->MQJabuHolesRoomDoor, []{return true;}),
     }, {
@@ -216,10 +220,15 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM, []{return logic->HasItem(RG_BRONZE_SCALE);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM] = Region("Jabu Jabus Belly MQ Holes Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM] = Region("Jabu Jabus Belly MQ Holes Room", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    logic->CanUse(RG_FAIRY_SLINGSHOT)),
         LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_1,                  logic->CanCutShrubs() && logic->HasExplosives()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_2,                  logic->CanCutShrubs() && logic->HasExplosives()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1,             logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2,             logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3,             logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM,            []{return true;}),
@@ -229,14 +238,15 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_PAST_OCTO,            []{return logic->JabuWestTentacle && Here(RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM, []{return logic->CanKillEnemy(RE_BIG_OCTO);}) && logic->CanUse(RG_FAIRY_SLINGSHOT);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_WATER_SWITCH_ROOM] = Region("Jabu Jabus Belly MQ Water Switch Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_WATER_SWITCH_ROOM] = Region("Jabu Jabus Belly MQ Water Switch Room", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST, true),
                                                                                                                                 //Implies logic->CanKillEnemy(RE_LIKE_LIKE) && logic->CanKillEnemy(RE_STINGER). Without swim, jump from the song of time block to the vines.
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,         logic->CanKillEnemy(RE_LIZALFOS)),
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM, (logic->CanUse(RG_SONG_OF_TIME) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)) || (ctx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->CanUse(RG_BOOMERANG))),
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,        logic->CanBreakPots()),
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,        logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,          logic->CanKillEnemy(RE_LIZALFOS)),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,  (logic->CanUse(RG_SONG_OF_TIME) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)) || (ctx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,         logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,         logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS, logic->CanCutShrubs()),
     }, {
         //Exits
         //without swim, jump from rang chest to the other side
@@ -245,7 +255,7 @@ void RegionTable_Init_JabuJabusBelly() {
     });
 
     //Includes Like Like room
-    areaTable[RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR] = Region("Jabu Jabus Belly MQ Forked Corridor", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR] = Region("Jabu Jabus Belly MQ Forked Corridor", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->JabuNorthTentacle, []{return Here(RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR, []{return logic->BlastOrSmash();}) && logic->CanUse(RG_BOOMERANG);}),
     }, {
@@ -254,6 +264,9 @@ void RegionTable_Init_JabuJabusBelly() {
         LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST, logic->CanUse(RG_FAIRY_SLINGSHOT)),
         LOCATION(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,             logic->CanBreakPots()),
         LOCATION(RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,             logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS,      logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1, logic->CanBreakSmallCrates()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2, logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM,        []{return logic->CanUse(RG_BOOMERANG);}),
@@ -261,9 +274,9 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_WEST_FORKED_ROOMS, []{return Here(RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR, []{return logic->CanUse(RG_BOOMERANG);}) && (Here(RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR, []{return logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_STICKS);}) || Here(RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR, []{return logic->HasFireSource();}));}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_WEST_FORKED_ROOMS] = Region("Jabu Jabus Belly MQ West Forked Rooms", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_WEST_FORKED_ROOMS] = Region("Jabu Jabus Belly MQ West Forked Rooms", SCENE_JABU_JABU, {
         //Events
-        EventAccess(&logic->JabuWestTentacle, []{return logic->CanUse(RG_BOOMERANG);}),
+        EventAccess(&logic->JabuWestTentacle, []{return logic->CanKillEnemy(RE_TENTACLE, ED_BOOMERANG);}),
     }, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM, Here(RR_JABU_JABUS_BELLY_MQ_WEST_FORKED_ROOMS, []{return logic->HasExplosives();}) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -272,7 +285,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_FORKED_CORRIDOR, []{return true;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_INVISIBLE_KEESE_ROOM] = Region("Jabu Jabus Belly MQ Invisible Keese Room", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_INVISIBLE_KEESE_ROOM] = Region("Jabu Jabus Belly MQ Invisible Keese Room", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM, //firstly, we can just use FAs to clear the web and then longshot the skull
                                                                    logic->CanUse(RG_FIRE_ARROWS) && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_LONGSHOT) ||
@@ -292,13 +305,18 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM, []{return (logic->JabuNorthTentacle || logic->TakeDamage()) && logic->HasItem(RG_BRONZE_SCALE);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_PAST_OCTO] = Region("Jabu Jabus Belly MQ Past Octo", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_PAST_OCTO] = Region("Jabu Jabus Belly MQ Past Octo", SCENE_JABU_JABU, {
         //Events
         //if a hover up to the path is added, this will want it's own room
         EventAccess(&logic->LoweredJabuPath, []{return logic->CanUse(RG_BOOMERANG) && logic->CanUse(RG_FAIRY_SLINGSHOT);}),
     }, {
         //Locations
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_COW, logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_FAIRY_SLINGSHOT)),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_COW,                    logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_FAIRY_SLINGSHOT)),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS,         logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2, logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1, logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanBreakSmallCrates()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2, logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM,  []{return logic->CanUse(RG_BOOMERANG) && logic->CanUse(RG_FAIRY_SLINGSHOT);}),
@@ -306,7 +324,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_HOLES_ROOM, []{return logic->TakeDamage() && Here(RR_JABU_JABUS_BELLY_MQ_PAST_OCTO, []{return logic->CanKillEnemy(RE_BIG_OCTO);});}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM_EAST_LEDGE] = Region("Jabu Jabus Belly MQ Lift Room East Ledge", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM_EAST_LEDGE] = Region("Jabu Jabus Belly MQ Lift Room East Ledge", SCENE_JABU_JABU, {}, {
         //Locations
         LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,  logic->MQJabuLiftRoomCow),
     }, {
@@ -315,14 +333,16 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_EAST_ROOM, []{return logic->JabuNorthTentacle;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_EAST_ROOM] = Region("Jabu Jabus Belly MQ Boss Region", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_EAST_ROOM] = Region("Jabu Jabus Belly MQ Boss Region", SCENE_JABU_JABU, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
         //Locations
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,   logic->CanUse(RG_FAIRY_SLINGSHOT)),
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,      logic->CanUse(RG_BOOMERANG) || (ctx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT))),
-        LOCATION(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1, logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,     logic->CanUse(RG_FAIRY_SLINGSHOT)),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,        logic->CanUse(RG_BOOMERANG) || (ctx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT))),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,   logic->CanBreakPots()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1, logic->CanCutShrubs()),
+        LOCATION(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM_EAST_LEDGE, []{return true;}),
@@ -332,16 +352,20 @@ void RegionTable_Init_JabuJabusBelly() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] = Region("Jabu Jabus Belly Boss Entryway", "Jabu Jabus Belly", {RA_JABU_JABUS_BELLY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY] = Region("Jabu Jabus Belly Boss Entryway", SCENE_JABU_JABU, {}, {}, {
+        // Exits
+        Entrance(RR_JABU_JABUS_BELLY_BOSS_ROOM, []{return true;}),
+    });
+
+    areaTable[RR_JABU_JABUS_BELLY_BOSS_EXIT] = Region("Jabu Jabus Belly Boss Exit", SCENE_JABU_JABU, {}, {}, {
         // Exits
         Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}),
         Entrance(RR_JABU_JABUS_BELLY_MQ_EAST_ROOM,   []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}),
-        Entrance(RR_JABU_JABUS_BELLY_BOSS_ROOM,      []{return true;}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] = Region("Jabu Jabus Belly Boss Room", "Jabu Jabus Belly", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] = Region("Jabu Jabus Belly Boss Room", SCENE_JABU_JABU_BOSS, {
         // Events //todo: add pot kill trick
-        EventAccess(&logic->JabuJabusBellyClear, []{return logic->JabuJabusBellyClear || logic->CanKillEnemy(RE_BARINADE);}),
+        EventAccess(&logic->JabuJabusBellyClear, []{return logic->CanKillEnemy(RE_BARINADE);}),
     }, {
         // Locations
         LOCATION(RC_JABU_JABUS_BELLY_BARINADE_POT_1, logic->CanBreakPots()),
@@ -354,7 +378,9 @@ void RegionTable_Init_JabuJabusBelly() {
         LOCATION(RC_BARINADE,                        logic->JabuJabusBellyClear),
     }, {
         // Exits
-        Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, []{return false;}),
-        Entrance(RR_ZORAS_FOUNTAIN,                 []{return logic->JabuJabusBellyClear;}, false),
+        Entrance(RR_JABU_JABUS_BELLY_BOSS_EXIT, []{return false;}),
+        Entrance(RR_ZORAS_FOUNTAIN,             []{return logic->JabuJabusBellyClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
index bdcf8a4fa0..d276fc4189 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_ShadowTemple() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_ENTRYWAY] = Region("Shadow Temple Entryway", SCENE_SHADOW_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_BEGINNING,    []{return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}),
         Entrance(RR_SHADOW_TEMPLE_MQ_BEGINNING, []{return ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ();}),
@@ -15,7 +16,7 @@ void RegionTable_Init_ShadowTemple() {
 
 #pragma region Vanilla
 
-    areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_BEGINNING] = Region("Shadow Temple Beginning", SCENE_SHADOW_TEMPLE, {
         //Events
         EventAccess(&logic->NutPot, []{return true;}),
     }, {
@@ -36,7 +37,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_FIRST_BEAMOS, []{return logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Region("Shadow Temple First Beamos", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_FIRST_BEAMOS] = Region("Shadow Temple First Beamos", SCENE_SHADOW_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}), //This fairy pot is only on 3DS
     }, {
@@ -51,7 +52,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, []{return false;}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_HUGE_PIT] = Region("Shadow Temple Huge Pit", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,   logic->CanJumpslashExceptHammer()),
         LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->CanJumpslashExceptHammer()),
@@ -76,11 +77,11 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_WIND_TUNNEL, []{return ((ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3, 4);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_WIND_TUNNEL] = Region("Shadow Temple Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_CHEST,         true),
-        LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanJumpslashExceptHammer()),
-        LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, true),
+        LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,  logic->CanKillEnemy(RE_GIBDO, ED_CLOSE, true, 2)),
+        LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, logic->HasExplosives()),
         LOCATION(RC_SHADOW_TEMPLE_GS_NEAR_SHIP,            logic->CanUse(RG_LONGSHOT) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5)),
         LOCATION(RC_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,     logic->CanUse(RG_SUNS_SONG)),
         LOCATION(RC_SHADOW_TEMPLE_AFTER_WIND_POT_1,        logic->CanBreakPots()),
@@ -92,11 +93,11 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT, []{return logic->CanJumpslashExceptHammer() && logic->CanUse(RG_ZELDAS_LULLABY) && logic->SmallKeys(RR_SHADOW_TEMPLE, 4, 5);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_BEYOND_BOAT] = Region("Shadow Temple Beyond Boat", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,       logic->CanUse(RG_DINS_FIRE)),
         LOCATION(RC_SHADOW_TEMPLE_BOSS_KEY_CHEST,               logic->CanUse(RG_DINS_FIRE)),
-        LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,  logic->CanJumpslashExceptHammer()),
+        LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,  logic->CanKillEnemy(RE_FLOORMASTER)),
         //RANDOTODO check if child can reach the token
         LOCATION(RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,          logic->IsAdult && logic->CanAttack()),
         LOCATION(RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1,             logic->CanBreakPots()),
@@ -111,7 +112,7 @@ void RegionTable_Init_ShadowTemple() {
         LOCATION(RC_SHADOW_TEMPLE_AFTER_SHIP_LOWER_HEART,       (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->CanUse(RG_SONG_OF_TIME) || (logic->CanUse(RG_DISTANT_SCARECROW) && logic->CanUse(RG_HOVER_BOOTS))),
     }, {
         //Exits
-        Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, []{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS) && logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);})
+        Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, []{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DISTANT_SCARECROW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5))) && logic->SmallKeys(RR_SHADOW_TEMPLE, 5) && logic->CanUse(RG_HOVER_BOOTS);})
     });
 
 #pragma endregion
@@ -119,13 +120,21 @@ void RegionTable_Init_ShadowTemple() {
 #pragma region MQ
 
     //RANDOTODO doublecheck CanAttack when rewriting, as I assumed it only checked adult due to the entrance
-    areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_BEGINNING] = Region("Shadow Temple MQ Beginning", SCENE_SHADOW_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,         []{return true;}),
         Entrance(RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM,  []{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM] = Region("Shadow Temple MQ Spinner Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM] = Region("Shadow Temple MQ Spinner Room", SCENE_SHADOW_TEMPLE, {}, 
+    {
+        // Locations
+        LOCATION(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1, logic->CanBreakSmallCrates()),
+        LOCATION(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2, logic->CanBreakSmallCrates()),
+        LOCATION(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3, logic->CanBreakSmallCrates()),
+        LOCATION(RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4, logic->CanBreakSmallCrates()),
+    }, 
+    {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_ENTRYWAY,          []{return true;}),
         Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   []{return Here(RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM, []{return logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}) && (logic->CanUse(RG_HOVER_BOOTS) || Here(RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM, []{return logic->CanUse(RG_FIRE_ARROWS);}) || (ctx->GetTrickOption(RT_SHADOW_MQ_GAP) && logic->CanUse(RG_LONGSHOT) && logic->CanJumpslashExceptHammer()));}),
@@ -133,7 +142,7 @@ void RegionTable_Init_ShadowTemple() {
     });
 
     //Assumes we're in the "main" area and needed lens to enter. logic will need changes if a void warp puts us somewhere weird
-    areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Region("Shadow Temple MQ Dead Hand Region", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_COMPASS_CHEST,          logic->CanKillEnemy(RE_REDEAD)),
         //There's a shared flag tied to some glass here. eye target here and killing an enemy group later in the dungeon toggles. I'm building the logic as "intended", assuming the switch needs flipping
@@ -148,7 +157,7 @@ void RegionTable_Init_ShadowTemple() {
     });
 
     //also includes the B2 gibdo room
-    areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Region("Shadow Temple MQ First Beamos", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         //Doing this sets the shared flag for the glass in RR_SHADOW_TEMPLE_MQ_DEAD_HAND_AREA, but doesn't seem to affect the chest
         LOCATION(RC_SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, logic->CanKillEnemy(RE_GIBDO) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
@@ -159,7 +168,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_B2_SPINNING_BLADE_ROOM, []{return ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_B2_SPINNING_BLADE_ROOM] = Region("Shadow Temple MQ B2 Spinning Blade Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_B2_SPINNING_BLADE_ROOM] = Region("Shadow Temple MQ B2 Spinning Blade Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST, logic->CanPassEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
     }, {
@@ -168,7 +177,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_SHORTCUT_PATH, []{return logic->CanPassEnemy(RE_BIG_SKULLTULA);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_SHORTCUT_PATH] = Region("Shadow Temple MQ Shortcut Path", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_SHORTCUT_PATH] = Region("Shadow Temple MQ Shortcut Path", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
     }, {
@@ -179,14 +188,14 @@ void RegionTable_Init_ShadowTemple() {
     });
 
     //Room exists for if it's ever possible to go backwards or void warp into the middle of shadow
-    areaTable[RR_SHADOW_TEMPLE_MQ_B2_TO_B3_CORRIDOR] = Region("Shadow Temple MQ B2 to B3 Corridor", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_B2_TO_B3_CORRIDOR] = Region("Shadow Temple MQ B2 to B3 Corridor", SCENE_SHADOW_TEMPLE, {}, {}, {
         //Exits
-        Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   []{return logic->HasExplosives() && logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}),
+        Entrance(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS,   []{return logic->SmallKeys(RR_SHADOW_TEMPLE, 2);}),
         Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, []{return true;}),
         //bunnyhovers + lens lets you go from the very top of upper pit to the stationary invisible platform below quite easily
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT] = Region("Shadow Temple MQ Upper Huge Pit", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY, logic->CanUse(RG_SONG_OF_STORMS)),
     }, {
@@ -195,7 +204,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM, []{return ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM] = Region("Shadow Temple MQ Invisible Blades Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM] = Region("Shadow Temple MQ Invisible Blades Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         //RT_SHADOW_MQ_INVISIBLE_BLADES does not work with NL as like-likes will not swallow you, likewise like-likes will not spit you with a fairy revive
         //you take half a heart base from a spit out, double check EffectiveHealth when damage logic gets reworked
@@ -211,7 +220,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, []{return true;}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, logic->CanUse(RG_LONGSHOT)),
     }, {
@@ -220,7 +229,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM,   []{return logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->SmallKeys(RR_SHADOW_TEMPLE, 3);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_STONE_UMBRELLA_ROOM] = Region("Shadow Temple MQ Stone Umbrella Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_STONE_UMBRELLA_ROOM] = Region("Shadow Temple MQ Stone Umbrella Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, true),
         //Assuming the known setup for RT_SHADOW_UMBRELLA and RT_SHADOW_UMBRELLA_GS, probably possible without sword + shield.
@@ -237,7 +246,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_UPPER_STONE_UMBRELLA, []{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || (ctx->GetTrickOption(RT_SHADOW_UMBRELLA) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanStandingShield() && logic->CanUse(RG_MASTER_SWORD)));}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_STONE_UMBRELLA] = Region("Shadow Temple MQ Upper Stone Umbrella", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_STONE_UMBRELLA] = Region("Shadow Temple MQ Upper Stone Umbrella", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,  true),
         LOCATION(RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, true),
@@ -249,7 +258,7 @@ void RegionTable_Init_ShadowTemple() {
     });
 
     //while the spikes here are annoying, they don't really stop you doing anything, so I'll assume either lens trick, lens to see them, or taking damage from them. Not hovers though as a new player won't see the threat without lens to react properly
-    areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM] = Region("Shadow Temple MQ Floor Spikes Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM] = Region("Shadow Temple MQ Floor Spikes Room", SCENE_SHADOW_TEMPLE, {
         //Events                                        //lens or trick is always required for hookshot targets. We handle it here to not complicate the RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_UPPER_DOOR logic
         EventAccess(&logic->MQShadowFloorSpikeRupees, []{return (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) &&
                                                                 //Upper door side high rupee needs (hookshot and redead kill(as either age) for chest and adult) or longshot. hovers can cross from the left side with a backflip but that would be a trick
@@ -268,7 +277,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL,  []{return logic->SmallKeys(RR_SHADOW_TEMPLE, 4) && (logic->CanUse(RG_LONGSHOT) || (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && (logic->MQShadowFloorSpikeRupees || Here(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, []{return logic->CanKillEnemy(RE_REDEAD);})))) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM] = Region("Shadow Temple MQ Stalfos Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM] = Region("Shadow Temple MQ Stalfos Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2)),
     }, {
@@ -276,14 +285,14 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, []{return Here(RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM, []{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2);});}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL] = Region("Shadow Temple MQ Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, []{return logic->SmallKeys(RR_SHADOW_TEMPLE, 4) && logic->CanPassEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT));}),
         Entrance(RR_SHADOW_TEMPLE_MQ_WIND_HINT_ROOM,    []{return logic->CanPassEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS));}),
         Entrance(RR_SHADOW_TEMPLE_MQ_B4_GIBDO_ROOM,     []{return logic->CanPassEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_WIND_HINT_ROOM] = Region("Shadow Temple MQ Wind Hint Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_WIND_HINT_ROOM] = Region("Shadow Temple MQ Wind Hint Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,     (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanPassEnemy(RE_REDEAD)),
         LOCATION(RC_SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,   logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -293,7 +302,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_WIND_TUNNEL, []{return true;}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_B4_GIBDO_ROOM] = Region("Shadow Temple MQ B4 Gibdo Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_B4_GIBDO_ROOM] = Region("Shadow Temple MQ B4 Gibdo Room", SCENE_SHADOW_TEMPLE, {
         //Events
         EventAccess(&logic->NutPot, []{return true;}),
     }, {
@@ -310,7 +319,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_DOCK,        []{return logic->SmallKeys(RR_SHADOW_TEMPLE, 5);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_DOCK] = Region("Shadow Temple MQ Dock", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_DOCK] = Region("Shadow Temple MQ Dock", SCENE_SHADOW_TEMPLE, {
         //Events
         EventAccess(&logic->ShadowShortcutBlock, []{return logic->HasItem(RG_GORONS_BRACELET);}),
     }, {
@@ -325,7 +334,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT,   []{return (logic->IsAdult || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_ZELDAS_LULLABY);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT] = Region("Shadow Temple MQ Beyond Boat", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         //It's a trick on N64 to kill this and drop down to collect this with normal weapons, as doing so without the statue being dropped voids you to before the boat
         //hilariously, you can also hit this with a pot before you bring down the statue, but there's no great way to reset it without crossing. the statues collision is very inconvenient afterwards
@@ -337,7 +346,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM,   []{return Here(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, []{return logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_SHADOW_STATUE) && logic->CanUse(RG_BOMBCHU_5));});}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM] = Region("Shadow Temple MQ Across Chasm", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM] = Region("Shadow Temple MQ Across Chasm", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT,         logic->CanBreakPots()),
         LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT,         logic->CanBreakPots()),
@@ -354,20 +363,21 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_BOSS_DOOR,      []{return logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_BOSS_DOOR] = Region("Shadow Temple MQ Boss Door", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_BOSS_DOOR] = Region("Shadow Temple MQ Boss Door", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         //you can drop onto this and the respawn is reasonable
         LOCATION(RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,  (logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_BOMB_THROW) || logic->CanUse(RG_MEGATON_HAMMER)) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
     }, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM, []{return logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH));}),
-        Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,   []{return logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY,   []{return true;}),
     });
 
     //Assumes lens is checked on entry
-    areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE] = Region("Shadow Temple MQ Invisible Maze", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, (logic->CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND)) && logic->CanKillEnemy(RE_DEAD_HAND) && logic->CanDetonateUprightBombFlower()),
+        //don't use CanDetonateUprightBombFlower as blue fire logic would need to account for player having multiple bottles & taking damage multiple times
+        LOCATION(RC_SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST, (logic->CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_SHADOW_MQ_DEADHAND)) && logic->CanKillEnemy(RE_DEAD_HAND) && (logic->CanDetonateBombFlowers() || logic->HasItem(RG_GORONS_BRACELET))),
         LOCATION(RC_SHADOW_TEMPLE_MQ_FREESTANDING_KEY,  true),
         LOCATION(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1,   logic->CanBreakPots()),
         LOCATION(RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2,   logic->CanBreakPots()),
@@ -377,7 +387,7 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_MQ_SPIKE_WALLS_ROOM,   []{return logic->SmallKeys(RR_SHADOW_TEMPLE, 6);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_MQ_SPIKE_WALLS_ROOM] = Region("Shadow Temple MQ Spike Walls Room", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SHADOW_TEMPLE_MQ_SPIKE_WALLS_ROOM] = Region("Shadow Temple MQ Spike Walls Room", SCENE_SHADOW_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST, logic->CanUse(RG_DINS_FIRE)),
         LOCATION(RC_SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,         logic->CanUse(RG_DINS_FIRE)),
@@ -390,16 +400,16 @@ void RegionTable_Init_ShadowTemple() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] = Region("Shadow Temple Boss Entryway", "Shadow Temple", {RA_SHADOW_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SHADOW_TEMPLE_BOSS_ENTRYWAY] = Region("Shadow Temple Boss Entryway", SCENE_SHADOW_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_SHADOW_TEMPLE_BEYOND_BOAT,    []{return ctx->GetDungeon(SHADOW_TEMPLE)->IsVanilla() && false;}),
         Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT, []{return ctx->GetDungeon(SHADOW_TEMPLE)->IsMQ() && false;}),
-        Entrance(RR_SHADOW_TEMPLE_BOSS_ROOM,      []{return true;}),
+        Entrance(RR_SHADOW_TEMPLE_BOSS_ROOM,      []{return logic->HasItem(RG_SHADOW_TEMPLE_BOSS_KEY);}),
     });
 
-    areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] = Region("Shadow Temple Boss Room", "Shadow Temple", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SHADOW_TEMPLE_BOSS_ROOM] = Region("Shadow Temple Boss Room", SCENE_SHADOW_TEMPLE_BOSS, {
         // Events
-        EventAccess(&logic->ShadowTempleClear, []{return logic->ShadowTempleClear || logic->CanKillEnemy(RE_BONGO_BONGO);}),
+        EventAccess(&logic->ShadowTempleClear, []{return logic->CanKillEnemy(RE_BONGO_BONGO);}),
     }, {
         // Locations
         LOCATION(RC_SHADOW_TEMPLE_BONGO_BONGO_HEART, logic->ShadowTempleClear),
@@ -409,4 +419,6 @@ void RegionTable_Init_ShadowTemple() {
         Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, []{return false;}),
         Entrance(RR_GRAVEYARD_WARP_PAD_REGION,   []{return logic->ShadowTempleClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp
index e3d00ccf36..2755fe453b 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp
@@ -5,8 +5,9 @@
 using namespace Rando;
 
 void RegionTable_Init_SpiritTemple() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_ENTRYWAY] = Region("Spirit Temple Entryway", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_LOBBY,            []{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla();}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,         []{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ();}),
@@ -15,7 +16,7 @@ void RegionTable_Init_SpiritTemple() {
 
 #pragma region Vanilla
 
-    areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_LOBBY] = Region("Spirit Temple Lobby", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_LOBBY_POT_1, logic->CanBreakPots()),
         LOCATION(RC_SPIRIT_TEMPLE_LOBBY_POT_2, logic->CanBreakPots()),
@@ -26,24 +27,26 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_EARLY_ADULT, []{return logic->CanUse(RG_SILVER_GAUNTLETS);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_CHILD] = Region("Child Spirit Temple", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_CHILD] = Region("Child Spirit Temple", SCENE_SPIRIT_TEMPLE, {
         //Events
         EventAccess(&logic->NutCrate, []{return true;}),
     }, {
         //Locations
-        LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,        (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
-        LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT)))) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
-        LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,            (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
-        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_1,              (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
-        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_2,              (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
-        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_3,              (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
-        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_4,              (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,               (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,        (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT)))) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_DINS_FIRE))),
+        LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE,                   (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_1,                     (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_2,                     (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_3,                     (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_ANUBIS_POT_4,                     (logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_FAIRY_SLINGSHOT) || (logic->CanUse(RG_BOMBCHU_5) && ctx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives() || ((logic->CanUse(RG_NUTS) || logic->CanUse(RG_BOOMERANG)) && (logic->CanUse(RG_STICKS) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_FAIRY_SLINGSHOT))))),
+        LOCATION(RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1, logic->CanBreakSmallCrates()),
+        LOCATION(RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2, logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_CHILD_CLIMB, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_CHILD_CLIMB] = Region("Child Spirit Temple Climb", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
         LOCATION(RC_SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,  logic->HasProjectile(HasProjectileAge::Both) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasProjectile(HasProjectileAge::Adult)) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->IsChild && logic->HasProjectile(HasProjectileAge::Child))),
@@ -57,7 +60,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, []{return logic->HasExplosives() || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_EARLY_ADULT] = Region("Early Adult Spirit Temple", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_COMPASS_CHEST,            logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY)),
         LOCATION(RC_SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,  (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5) || (logic->CanUse(RG_BOMB_BAG) && logic->IsAdult && ctx->GetTrickOption(RT_SPIRIT_LOWER_ADULT_SWITCH))) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslashExceptHammer())),
@@ -70,7 +73,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER] = Region("Spirit Temple Central Chamber", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MAP_CHEST,                    ((logic->HasExplosives() || logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) &&
                                                                     (logic->CanUse(RG_DINS_FIRE) || ((logic->CanUse(RG_FIRE_ARROWS) || ctx->GetTrickOption(RT_SPIRIT_MAP_CHEST)) && logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_STICKS) ))) ||
@@ -107,7 +110,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD,         []{return ctx->GetTrickOption(RT_SPIRIT_PLATFORM_HOOKSHOT) && logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_OUTDOOR_HANDS] = Region("Spirit Temple Outdoor Hands", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, (logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->CanUse(RG_LONGSHOT) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)),
         LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,    logic->SmallKeys(RR_SPIRIT_TEMPLE, 4) && logic->CanUse(RG_SILVER_GAUNTLETS) && logic->HasExplosives()),
@@ -116,7 +119,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_DESERT_COLOSSUS, []{return (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)) || (logic->CanUse(RG_SILVER_GAUNTLETS) && ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) && logic->HasExplosives()) || logic->SmallKeys(RR_SPIRIT_TEMPLE, 5)));}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Central Locked Door", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,         (logic->CanUse(RG_MIRROR_SHIELD) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))) && logic->HasExplosives()),
         LOCATION(RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,  (ctx->GetTrickOption(RT_LENS_SPIRIT) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasExplosives()),
@@ -128,7 +131,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && (ctx->GetTrickOption(RT_SPIRIT_WALL) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_BOMBCHU_5) || ((logic->CanUse(RG_BOMB_BAG) || logic->CanUse(RG_NUTS) || logic->CanUse(RG_DINS_FIRE)) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_MEGATON_HAMMER))));}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Region("Spirit Temple Beyond Final Locked Door", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_BOSS_KEY_CHEST,           logic->CanUse(RG_ZELDAS_LULLABY) && ((logic->TakeDamage() && ctx->GetTrickOption(RT_FLAMING_CHESTS)) || (logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_HOOKSHOT)))),
         LOCATION(RC_SPIRIT_TEMPLE_TOPMOST_CHEST,            (logic->CanUse(RG_MIRROR_SHIELD) && logic->CanAttack()) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS))),
@@ -139,17 +142,17 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, []{return logic->CanUse(RG_MIRROR_SHIELD) && logic->HasExplosives() && logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] = Region("Spirit Temple Inside Statue Head", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD] = Region("Spirit Temple Inside Statue Head", SCENE_SPIRIT_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, []{return true;}),
-        Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,   []{return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY,   []{return true;}),
     });
 
 #pragma endregion
 
 #pragma region MQ
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_LOBBY] = Region("Spirit Temple MQ Lobby", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,  true),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,   Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->BlastOrSmash();}) && logic->CanHitEyeTargets()),
@@ -166,7 +169,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_SOUTH, []{return logic->CanUse(RG_LONGSHOT) && logic->CanUse(RG_BOMBCHU_5);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_WEST] = Region("Spirit Temple MQ 1F West", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_WEST] = Region("Spirit Temple MQ 1F West", SCENE_SPIRIT_TEMPLE, {
         //Events
         //not technically a rusted switch, but a boulder through a wall, but is part of the same trick on N64
         EventAccess(&logic->MQSpiritCrawlBoulder, []{return logic->CanUse(RG_BOMBCHU_5) || (ctx->GetTrickOption(RT_RUSTED_SWITCHES) && logic->CanUse(RG_MEGATON_HAMMER));}),
@@ -183,7 +186,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_WEST_1F_RUSTED_SWITCH, []{return logic->IsChild && logic->MQSpiritCrawlBoulder;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_GIBDO_ROOM_SOUTH] = Region("Spirit Temple MQ 1F Gibdo Room South", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_GIBDO_ROOM_SOUTH] = Region("Spirit Temple MQ 1F Gibdo Room South", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_WEST,             []{return true;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_GIBDO_ROOM_NORTH, []{return logic->CanUse(RG_BOMBCHU_5) && logic->CanHitEyeTargets();}),
@@ -191,13 +194,13 @@ void RegionTable_Init_SpiritTemple() {
     });
 
     // Room to store the 2 pots in to handle glitch logic going backwards around the loop later
-    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_GIBDO_ROOM_NORTH] = Region("Spirit Temple MQ Gibdo Room North", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_GIBDO_ROOM_NORTH] = Region("Spirit Temple MQ Gibdo Room North", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1, logic->CanBreakPots()),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2, logic->CanBreakPots()),
     }, {});
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_TURNTABLE_ROOM] = Region("Spirit Temple Turntable Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_TURNTABLE_ROOM] = Region("Spirit Temple Turntable Room", SCENE_SPIRIT_TEMPLE, {
         //Events
         //For non-fairy pot items, you can also get them with rang without killing the stalfos
         EventAccess(&logic->FairyPot, []{return Here(RR_SPIRIT_TEMPLE_MQ_TURNTABLE_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
@@ -214,7 +217,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_NORTH,      []{return Here(RR_SPIRIT_TEMPLE_MQ_TURNTABLE_ROOM, []{return logic->CanKillEnemy(RE_STALFOS);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_NORTH] = Region("Spirit Temple MQ Map Room North", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_NORTH] = Region("Spirit Temple MQ Map Room North", SCENE_SPIRIT_TEMPLE, {
         //Events
         EventAccess(&logic->MQSpiritMapRoomEnemies, []{return logic->CanKillEnemy(RE_ANUBIS) && logic->CanKillEnemy(RE_KEESE);}),
     }, {
@@ -226,7 +229,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_SOUTH, []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_SOUTH] = Region("Spirit Temple MQ Map Room South", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_MAP_ROOM_SOUTH] = Region("Spirit Temple MQ Map Room South", SCENE_SPIRIT_TEMPLE, {
         //Events
         //You can lure the keese over by aggroing them with dins if you use it as close to the torch keese as possible, but it's a trick as it's not intuitive and basically never comes up
         EventAccess(&logic->MQSpiritMapRoomEnemies, []{return logic->CanKillEnemy(RE_ANUBIS) && logic->CanKillEnemy(RE_KEESE, ED_BOOMERANG);}),
@@ -240,7 +243,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_WEST,        []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_WEST_1F_RUSTED_SWITCH] = Region("Spirit Temple MQ West 1F Rusted Switch", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_WEST_1F_RUSTED_SWITCH] = Region("Spirit Temple MQ West 1F Rusted Switch", SCENE_SPIRIT_TEMPLE, {
         //Events
         EventAccess(&logic->MQSpiritTimeTravelChest, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
         EventAccess(&logic->MQSpiritCrawlBoulder,    []{return logic->CanUse(RG_BOMBCHU_5) || (ctx->GetTrickOption(RT_RUSTED_SWITCHES) && logic->CanUse(RG_MEGATON_HAMMER));}),
@@ -251,7 +254,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_UNDER_LIKE_LIKE, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 1);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_UNDER_LIKE_LIKE] = Region("Spirit Temple MQ Under Like Like", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_UNDER_LIKE_LIKE] = Region("Spirit Temple MQ Under Like Like", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT, MQSpiritSharedBrokenWallRoom(RR_SPIRIT_TEMPLE_MQ_UNDER_LIKE_LIKE, []{return logic->CanBreakPots();})),
     }, {
@@ -261,7 +264,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_BROKEN_WALL_ROOM,      []{return logic->CanHitSwitch();}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BROKEN_WALL_ROOM] = Region("Spirit Temple MQ Broken Wall Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BROKEN_WALL_ROOM] = Region("Spirit Temple MQ Broken Wall Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         //Implies CanKillEnemy(RE_LIKE_LIKE)
         LOCATION(RC_SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST, MQSpiritSharedBrokenWallRoom(RR_SPIRIT_TEMPLE_MQ_BROKEN_WALL_ROOM, []{return logic->CanKillEnemy(RE_BEAMOS);})),
@@ -275,7 +278,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM,     []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 2);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM] = Region("Spirit Temple MQ Statue Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM] = Region("Spirit Temple MQ Statue Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_COMPASS_CHEST,             MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanHitEyeTargets();})),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT,        MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return ((logic->IsAdult || logic->CanJumpslash()) && logic->CanUse(RG_BOOMERANG)) || ((logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || (logic->IsAdult && ctx->GetTrickOption(RT_SPIRIT_LOBBY_JUMP))) && logic->CanBreakPots());})),
@@ -283,6 +286,10 @@ void RegionTable_Init_SpiritTemple() {
         LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT, MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakPots();})),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT,        MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakPots();})),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT,    MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakPots();})),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1,            MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakCrates();})),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2,            MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakCrates();})),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE,        MQSpiritSharedStatueRoom(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return logic->CanBreakSmallCrates();})),
+
     }, {
         //Exits
         //we check possible adult access directly in MQSpiritSharedBrokenWallRoom, so this exit only covers Certain Access
@@ -294,7 +301,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM_EAST,     []{return logic->IsAdult && logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM] = Region("Spirit Temple MQ Sun Block Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM] = Region("Spirit Temple MQ Sun Block Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         //We don't need Shared here because If we are checking as child, universe 2 adult access needs nothing so it always passes, and if we are checking as adult, it is Certain Access
         LOCATION(RC_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST, true),
@@ -308,13 +315,13 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_WEST_IRON_KNUCKLE, []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_WEST_IRON_KNUCKLE] = Region("Spirit Temple MQ East Iron Knuckle", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_WEST_IRON_KNUCKLE] = Region("Spirit Temple MQ East Iron Knuckle", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM,        []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Region("Spirit Temple MQ Silver Gauntlets Hand", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND] = Region("Spirit Temple MQ Silver Gauntlets Hand", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST, true),
     }, {
@@ -324,7 +331,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_DESERT_COLOSSUS,                    []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_SOUTH] = Region("Spirit Temple MQ Block Room South", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_SOUTH] = Region("Spirit Temple MQ Block Room South", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,                []{return true;}),
         //The block here is unusual in that it is a permanent flag, but reset anyway as child. This is because there's a check that would be blocked off by pushing them otherwise
@@ -332,7 +339,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_NORTH, []{return logic->IsChild ? logic->CanUse(RG_SILVER_GAUNTLETS) : Here(RR_SPIRIT_TEMPLE_MQ_LOBBY, []{return logic->CanUse(RG_SILVER_GAUNTLETS);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_NORTH] = Region("Spirit Temple MQ Block Room North", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_BLOCK_ROOM_NORTH] = Region("Spirit Temple MQ Block Room North", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         //Does not need to be shared as it's hard child locked, because adult pushing the block is a permanent flag that blocks the eye target and cannot be undone
         LOCATION(RC_SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST, logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 7) && logic->CanHitEyeTargets()),
@@ -342,9 +349,9 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM, []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM_EAST] = Region("Spirit Temple MQ Statue Room East", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM_EAST] = Region("Spirit Temple MQ Statue Room East", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_HOOKSHOT) & logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,   logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_ZELDAS_LULLABY) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))),
     }, {
         //Exits
@@ -363,7 +370,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_2F,    []{return logic->CanUse(RG_FIRE_ARROWS) || (ctx->GetTrickOption(RT_SPIRIT_MQ_LOWER_ADULT) && logic->CanUse(RG_DINS_FIRE));}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_2F] = Region("Spirit Temple MQ Three Suns Room 2F", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_2F] = Region("Spirit Temple MQ Three Suns Room 2F", SCENE_SPIRIT_TEMPLE, {
         //Events
         //implies logic->CanKillEnemy(RE_WALLMASTER). If we have lights, we can kill stalfos and wallmasters with bow
         EventAccess(&logic->MQSpirit3SunsEnemies, []{return (logic->CanUse(RG_MIRROR_SHIELD) && logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2)) || (ctx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}),
@@ -373,13 +380,13 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_1F, []{return logic->MQSpirit3SunsEnemies;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_1F] = Region("Spirit Temple MQ Three Suns Room 1F", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_1F] = Region("Spirit Temple MQ Three Suns Room 1F", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_THREE_SUNS_ROOM_2F, []{return logic->MQSpirit3SunsEnemies;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_EAST,            []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_EAST] = Region("Spirit Temple MQ 1F East", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_1F_EAST] = Region("Spirit Temple MQ 1F East", SCENE_SPIRIT_TEMPLE, {
         //Events
         //Assumes RR_SPIRIT_TEMPLE_MQ_LOBBY access
         EventAccess(&logic->Spirit1FSilverRupees, []{return logic->CanUse(RG_MEGATON_HAMMER);}),
@@ -395,7 +402,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM,      []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_LEEVER_ROOM] = Region("Spirit Temple MQ Leever Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_LEEVER_ROOM] = Region("Spirit Temple MQ Leever Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST, logic->CanKillEnemy(RE_PURPLE_LEEVER) && logic->CanUse(RG_HOOKSHOT)),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,    logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -404,14 +411,14 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_EAST, []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM] = Region("Spirit Temple MQ Symphony Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM] = Region("Spirit Temple MQ Symphony Room", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_1F_EAST,             []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 7);}),
         //Implies CanPassEnemy(RE_MOBLIN_CHIEF)
         Entrance(RR_SPIRIT_TEMPLE_MQ_AFTER_SYMPHONY_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_EPONAS_SONG) && logic->CanUse(RG_SUNS_SONG) && logic->CanUse(RG_SONG_OF_STORMS) && logic->CanUse(RG_ZELDAS_LULLABY);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_AFTER_SYMPHONY_ROOM] = Region("Spirit Temple MQ After Symphony Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_AFTER_SYMPHONY_ROOM] = Region("Spirit Temple MQ After Symphony Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST, logic->CanPassEnemy(RE_BIG_SKULLTULA)),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,    logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -420,9 +427,10 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM, []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_FOUR_BEAMOS_ROOM] = Region("Spirit Temple MQ Four Beamos Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_FOUR_BEAMOS_ROOM] = Region("Spirit Temple MQ Four Beamos Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,  logic->CanKillEnemy(RE_BEAMOS)),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE, logic->CanKillEnemy(RE_BEAMOS) && logic->CanUse(RG_SONG_OF_TIME) && logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM_EAST,   []{return logic->CanAvoidEnemy(RE_BEAMOS, true, 4) && logic->CanUse(RG_SONG_OF_TIME) && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->CanUse(RG_HOOKSHOT);}),
@@ -430,7 +438,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_WALL,           []{return logic->SmallKeys(RR_SPIRIT_TEMPLE, 6);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_SOT_SUN_ROOM] = Region("Spirit Temple MQ SoT Sun Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_SOT_SUN_ROOM] = Region("Spirit Temple MQ SoT Sun Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,      true),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
@@ -441,19 +449,19 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_3F_GIBDO_ROOM,       []{return Here(RR_SPIRIT_TEMPLE_MQ_SOT_SUN_ROOM, []{return (logic->IsAdult || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_MIRROR_SHIELD);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_EAST_STAIRS_TO_HAND] = Region("Spirit Temple MQ East Stairs to Hand", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_EAST_STAIRS_TO_HAND] = Region("Spirit Temple MQ East Stairs to Hand", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_SOT_SUN_ROOM,      []{return true;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_EAST_IRON_KNUCKLE, []{return (ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && Here(RR_SPIRIT_TEMPLE_MQ_EAST_STAIRS_TO_HAND, []{return logic->CanKillEnemy(RE_FLOORMASTER);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_EAST_IRON_KNUCKLE] = Region("Spirit Temple MQ East Iron Knuckle", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_EAST_IRON_KNUCKLE] = Region("Spirit Temple MQ East Iron Knuckle", SCENE_SPIRIT_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_EAST_STAIRS_TO_HAND, []{return true;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND,  []{return Here(RR_SPIRIT_TEMPLE_MQ_EAST_STAIRS_TO_HAND, []{return logic->CanKillEnemy(RE_IRON_KNUCKLE);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND] = Region("Spirit Temple MQ Mirror Shield Hand", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST, true),
     }, {
@@ -463,7 +471,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_DESERT_COLOSSUS,                        []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_3F_GIBDO_ROOM] = Region("Spirit Temple MQ 3F Gibdo Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_3F_GIBDO_ROOM] = Region("Spirit Temple MQ 3F Gibdo Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST, true),
     }, {
@@ -471,7 +479,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_SOT_SUN_ROOM, []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_WALL] = Region("Spirit Temple MQ Big Wall", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_WALL] = Region("Spirit Temple MQ Big Wall", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, logic->CanBreakPots()),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, logic->CanBreakPots()),
@@ -483,7 +491,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL,       []{return logic->CanKillEnemy(RE_KEESE);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL] = Region("Spirit Temple MQ 4F Central", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL] = Region("Spirit Temple MQ 4F Central", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1, logic->CanBreakPots()),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2, logic->CanBreakPots()),
@@ -494,7 +502,7 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_ROOM,  []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_NINE_CHAIRS_ROOM] = Region("Spirit Temple MQ Nine Chairs Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_NINE_CHAIRS_ROOM] = Region("Spirit Temple MQ Nine Chairs Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         //These skulls rely on the iron knuckle existing without a trick to shoot through the chairs
         LOCATION(RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,   logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
@@ -504,19 +512,23 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL, []{return true;}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_ROOM] = Region("Spirit Temple MQ Big Mirror Room", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_ROOM] = Region("Spirit Temple MQ Big Mirror Room", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3, logic->CanBreakPots()),
-        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4, logic->CanBreakPots()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1,   logic->CanBreakPots()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2,   logic->CanBreakPots()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3,   logic->CanBreakPots()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4,   logic->CanBreakPots()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4, logic->CanBreakCrates()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL,      []{return true;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CAVE, []{return Here(RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_ROOM, []{return logic->CanUse(RG_MEGATON_HAMMER);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CAVE] = Region("Spirit Temple MQ Big Mirror Cave", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CAVE] = Region("Spirit Temple MQ Big Mirror Cave", SCENE_SPIRIT_TEMPLE, {}, {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST, ctx->GetTrickOption(RT_LENS_SPIRIT_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
     }, {
@@ -526,25 +538,25 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_MQ_STATUE_ROOM,        []{return Here(RR_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CAVE, []{return logic->CanUse(RG_MIRROR_SHIELD);});}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] = Region("Spirit Temple MQ Inside Statue Head", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD] = Region("Spirit Temple MQ Inside Statue Head", SCENE_SPIRIT_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_LOBBY,      []{return true;}),
-        Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, []{return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, []{return true;}),
     });
 
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Region("Spirit Temple Boss Entryway", "Spirit Temple", {RA_SPIRIT_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY] = Region("Spirit Temple Boss Entryway", SCENE_SPIRIT_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_SPIRIT_TEMPLE_INSIDE_STATUE_HEAD,    []{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsVanilla() && false;}),
         Entrance(RR_SPIRIT_TEMPLE_MQ_INSIDE_STATUE_HEAD, []{return ctx->GetDungeon(SPIRIT_TEMPLE)->IsMQ() && false;}),
-        Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM,             []{return true;}),
+        Entrance(RR_SPIRIT_TEMPLE_BOSS_ROOM,             []{return logic->HasItem(RG_SPIRIT_TEMPLE_BOSS_KEY);}),
     });
 
-    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Region("Spirit Temple Boss Room", "Spirit Temple", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SPIRIT_TEMPLE_BOSS_ROOM] = Region("Spirit Temple Boss Room", SCENE_SPIRIT_TEMPLE_BOSS, {
         // Events
-        EventAccess(&logic->SpiritTempleClear, []{return logic->SpiritTempleClear || logic->CanKillEnemy(RE_TWINROVA);}),
+        EventAccess(&logic->SpiritTempleClear, []{return logic->CanKillEnemy(RE_TWINROVA);}),
     }, {
         // Locations
         LOCATION(RC_SPIRIT_TEMPLE_TWINROVA_HEART, logic->SpiritTempleClear),
@@ -554,4 +566,6 @@ void RegionTable_Init_SpiritTemple() {
         Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, []{return false;}),
         Entrance(RR_DESERT_COLOSSUS,             []{return logic->SpiritTempleClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/water_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/water_temple.cpp
index 4d2fbb9bf6..03cc446458 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/water_temple.cpp
@@ -5,18 +5,19 @@
 using namespace Rando;
 
 void RegionTable_Init_WaterTemple() {
+    // clang-format off
     // Vanilla/MQ Decider
-    areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_ENTRYWAY] = Region("Water Temple Entryway", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,         []{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsVanilla();}),
         Entrance(RR_WATER_TEMPLE_MQ_3F_CENTRAL, []{return logic->HasItem(RG_BRONZE_SCALE) && ctx->GetDungeon(WATER_TEMPLE)->IsMQ();}),
-        Entrance(RR_LAKE_HYLIA,                 []{return true;}),
+        Entrance(RR_LH_FROM_WATER_TEMPLE,       []{return true;}),
     });
 
 #pragma region Vanilla
 
     //Water Temple logic currently assumes that the locked door leading to the upper water raising location is unlocked from the start
-    areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_LOBBY] = Region("Water Temple Lobby", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1, logic->CanBreakPots() && (logic->CanWaterTempleLowFromHigh || logic->CanWaterTempleMiddle || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)))),
         LOCATION(RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2, logic->CanBreakPots() && (logic->CanWaterTempleLowFromHigh || logic->CanWaterTempleMiddle || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)))),
@@ -37,9 +38,9 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM,         []{return (logic->CanWaterTempleHigh && logic->CanUse(RG_LONGSHOT)) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Region("Water Temple East Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_EAST_LOWER] = Region("Water Temple East Lower", SCENE_WATER_TEMPLE, {
         //Events
-        EventAccess(&logic->CanWaterTempleLowFromHigh, []{return logic->CanWaterTempleLowFromHigh || logic->CanUse(RG_ZELDAS_LULLABY);}),
+        EventAccess(&logic->CanWaterTempleLowFromHigh, []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
     }, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_TORCH_POT_1, logic->CanBreakPots() && (logic->CanWaterTempleLowFromHigh || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)))),
@@ -52,7 +53,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_TORCH_ROOM,   []{return logic->CanWaterTempleLowFromHigh && (logic->HasFireSourceWithTorch() || logic->CanUse(RG_FAIRY_BOW));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MAP_ROOM] = Region("Water Temple Map Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MAP_CHEST, logic->CanKillEnemy(RE_SPIKE, ED_CLOSE, true, 3)),
     }, {
@@ -60,7 +61,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_EAST_LOWER, []{return logic->CanKillEnemy(RE_SPIKE, ED_CLOSE, true, 3);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_CRACKED_WALL] = Region("Water Temple Cracked Wall", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_CRACKED_WALL_CHEST, logic->HasExplosives()),
     }, {
@@ -68,7 +69,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_EAST_LOWER, []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_TORCH_ROOM] = Region("Water Temple Torch Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_TORCHES_CHEST, logic->CanKillEnemy(RE_SHELL_BLADE, ED_CLOSE, true, 3)),
     }, {
@@ -76,13 +77,13 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_EAST_LOWER, []{return logic->CanKillEnemy(RE_SHELL_BLADE, ED_CLOSE, true, 3);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_NORTH_LOWER] = Region("Water Temple North Lower", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,          []{return true;}),
         Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, []{return (logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_BK_REGION) && logic->CanUse(RG_HOVER_BOOTS))) && logic->SmallKeys(RR_WATER_TEMPLE, 4);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_BOULDERS_LOWER] = Region("Water Temple Boulders Lower", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST, logic->CanUse(RG_LONGSHOT) || Here(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && logic->HookshotOrBoomerang()) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));})),
     }, {
@@ -92,7 +93,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP))) || (logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_IRON_BOOTS));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_BLOCK_ROOM] = Region("Water Temple Block Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, logic->CanBreakPots()),
@@ -102,20 +103,20 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_JETS_ROOM,      []{return (logic->HasItem(RG_GORONS_BRACELET) && logic->HasExplosives()) || (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_HOVER_BOOTS));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_JETS_ROOM] = Region("Water Temple Jets Room", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_BLOCK_ROOM,     []{return logic->CanUse(RG_HOOKSHOT);}),
         Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Region("Water Temple Boulders Upper", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_BOULDERS_UPPER] = Region("Water Temple Boulders Upper", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_BOULDERS_LOWER, []{return true;}),
         Entrance(RR_WATER_TEMPLE_JETS_ROOM,      []{return logic->IsAdult;}),
         Entrance(RR_WATER_TEMPLE_BOSS_KEY_ROOM,  []{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE))) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_BOSS_KEY_ROOM] = Region("Water Temple Boss Key Room", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -128,7 +129,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_BOULDERS_UPPER, []{return (logic->CanUse(RG_IRON_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_WATER_BK_JUMP_DIVE)) || logic->IsChild || logic->HasItem(RG_SILVER_SCALE)) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_SOUTH_LOWER] = Region("Water Temple South Lower", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_GS_BEHIND_GATE,    logic->CanJumpslash() && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
         LOCATION(RC_WATER_TEMPLE_BEHIND_GATE_POT_1, logic->CanJumpslash() && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)))),
@@ -140,13 +141,13 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_LOBBY, []{return logic->CanUse(RG_IRON_BOOTS);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_WEST_LOWER] = Region("Water Temple West Lower", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,       []{return logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_GORONS_BRACELET);}),
         Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, []{return logic->CanJumpslashExceptHammer() || logic->CanUseProjectile();}),
     });
 
-    areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_DRAGON_ROOM] = Region("Water Temple Dragon Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_DRAGON_CHEST, (logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS)) || (((logic->IsAdult && ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_BOMBCHU_5))) || (logic->IsChild && ctx->GetTrickOption(RT_WATER_CHILD_DRAGON) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->CanUse(RG_BOMBCHU_5)))) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) ||
                                                                                                                  Here(RR_WATER_TEMPLE_RIVER, []{return logic->IsAdult && logic->CanUse(RG_FAIRY_BOW) && ((ctx->GetTrickOption(RT_WATER_ADULT_DRAGON) && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS))) || ctx->GetTrickOption(RT_WATER_DRAGON_JUMP_DIVE));})),
@@ -155,16 +156,16 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_WEST_LOWER, []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Region("Water Temple Central Pillar Lower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER] = Region("Water Temple Central Pillar Lower", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,                   []{return logic->SmallKeys(RR_WATER_TEMPLE, 5);}),
         Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,    []{return logic->CanUse(RG_HOOKSHOT);}),
         Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT, []{return logic->CanWaterTempleMiddle && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER] = Region("Water Temple Central Pillar Upper", SCENE_WATER_TEMPLE, {
         //Events
-        EventAccess(&logic->CanWaterTempleMiddle, []{return logic->CanWaterTempleMiddle || logic->CanUse(RG_ZELDAS_LULLABY);}),
+        EventAccess(&logic->CanWaterTempleMiddle, []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
     }, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_GS_CENTRAL_PILLAR, logic->CanUse(RG_LONGSHOT) || (((ctx->GetTrickOption(RT_WATER_FW_CENTRAL_GS) && logic->CanUse(RG_FARORES_WIND) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE) || logic->SmallKeys(RR_WATER_TEMPLE, 5))) || (ctx->GetTrickOption(RT_WATER_IRONS_CENTRAL_GS) && logic->CanUse(RG_IRON_BOOTS) && ((logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_FAIRY_BOW)) || (logic->CanUse(RG_DINS_FIRE))))) && logic->CanWaterTempleHigh && logic->HookshotOrBoomerang())),
@@ -174,7 +175,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT] = Region("Water Temple Central Pillar Basement", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40),
     }, {
@@ -182,7 +183,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER, []{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_EAST_MIDDLE] = Region("Water Temple East Middle", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_COMPASS_CHEST,      logic->CanUseProjectile()),
         LOCATION(RC_WATER_TEMPLE_NEAR_COMPASS_POT_1, logic->CanBreakPots()),
@@ -193,21 +194,21 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_LOBBY, []{return logic->CanUse(RG_IRON_BOOTS);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_WEST_MIDDLE] = Region("Water Temple West Middle", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,      []{return true;}),
         Entrance(RR_WATER_TEMPLE_HIGH_WATER, []{return logic->CanUseProjectile();}),
     });
 
-    areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_HIGH_WATER] = Region("Water Temple High Water", SCENE_WATER_TEMPLE, {
         //Events
-        EventAccess(&logic->CanWaterTempleHigh, []{return logic->CanWaterTempleHigh || logic->CanUse(RG_ZELDAS_LULLABY);}),
+        EventAccess(&logic->CanWaterTempleHigh, []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
     }, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY, []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_BLOCK_CORRIDOR] = Region("Water Temple Block Corridor", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST, logic->HasItem(RG_GORONS_BRACELET) && (logic->CanWaterTempleLowFromHigh || logic->CanWaterTempleMiddle)),
         LOCATION(RC_WATER_TEMPLE_CENTRAL_BOW_POT_1,        logic->CanBreakPots() && logic->HasItem(RG_GORONS_BRACELET) && (logic->CanWaterTempleLowFromHigh || logic->CanWaterTempleMiddle)),
@@ -217,7 +218,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_LOBBY, []{return logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM] = Region("Water Temple Falling Platform Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM, logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_WATER_RANG_FALLING_PLATFORM_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG)) || (ctx->GetTrickOption(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS) && logic->IsAdult && logic->CanUse(RG_HOOKSHOT))),
     }, {
@@ -226,7 +227,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, []{return logic->CanUse(RG_HOOKSHOT) && logic->SmallKeys(RR_WATER_TEMPLE, 5);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM] = Region("Water Temple Dragon Pillars Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_LIKE_LIKE_POT_1, logic->CanUse(RG_HOOKSHOT)),
         LOCATION(RC_WATER_TEMPLE_LIKE_LIKE_POT_2, logic->CanUse(RG_HOOKSHOT)),
@@ -236,13 +237,13 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_DARK_LINK_ROOM,        []{return logic->CanUse(RG_HOOKSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Region("Water Temple Dark Link Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_DARK_LINK_ROOM] = Region("Water Temple Dark Link Room", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM, []{return logic->CanKillEnemy(RE_DARK_LINK);}),
         Entrance(RR_WATER_TEMPLE_LONGSHOT_ROOM,       []{return logic->CanKillEnemy(RE_DARK_LINK);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Region("Water Temple Longshot Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_LONGSHOT_ROOM] = Region("Water Temple Longshot Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_LONGSHOT_CHEST, true),
     }, {
@@ -251,7 +252,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_RIVER,          []{return logic->IsChild || logic->CanUse(RG_SONG_OF_TIME);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_RIVER] = Region("Water Temple River", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_RIVER_CHEST,   (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))),
         LOCATION(RC_WATER_TEMPLE_GS_RIVER,      (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)) || (ctx->GetTrickOption(RT_WATER_RIVER_GS) && logic->CanUse(RG_LONGSHOT))),
@@ -266,7 +267,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_DRAGON_ROOM, []{return (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW)) && (logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Region("Water Temple Pre Boss Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_PRE_BOSS_ROOM] = Region("Water Temple Pre Boss Room", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -276,14 +277,14 @@ void RegionTable_Init_WaterTemple() {
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_LOBBY,         []{return true;}),
-        Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, []{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, []{return true;}),
     });
 
 #pragma endregion
 
 #pragma region MQ
 
-    areaTable[RR_WATER_TEMPLE_MQ_3F_SOUTH_LEDGE] = Region("Water Temple MQ 3F South Ledge", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_3F_SOUTH_LEDGE] = Region("Water Temple MQ 3F South Ledge", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_ENTRYWAY,      []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,       []{return true;}),
@@ -296,7 +297,7 @@ void RegionTable_Init_WaterTemple() {
     //Entry should only include being in the correct area, taking any possible fall damage, and floating up to the surface of WL_HIGH if coming from below
     //This area then leads to others based on level and worst-case water timers for follow-up exits from the water's surface
     //remember that any solution that works for any level doesn't need to be given a level, even if that solution is overkill for a lower level
-    areaTable[RR_WATER_TEMPLE_MQ_MAIN] = Region("Water Temple MQ Main", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_MAIN] = Region("Water Temple MQ Main", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_3F_SOUTH_LEDGE,         []{return logic->HasItem(RG_BRONZE_SCALE) && logic->MQWaterLevel(WL_HIGH);}),
         //Jumping across is possible but a trick due to the janky ledge
@@ -316,7 +317,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //This region specifically covers the topmost platform around central pillar
-    areaTable[RR_WATER_TEMPLE_MQ_3F_CENTRAL] = Region("Water Temple MQ 3F Central", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_3F_CENTRAL] = Region("Water Temple MQ 3F Central", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                []{return true;}),
         Entrance(RR_WATER_TEMPLE_MQ_3F_SOUTH_LEDGE,      []{return logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS);}),
@@ -333,7 +334,7 @@ void RegionTable_Init_WaterTemple() {
 
     //This region specifically covers walking on the lower platform around central pillar. This is underwater when WL_HIGH
     //RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_HIGH should be accessed directly to use the central pillar door while at WL_HIGH
-    areaTable[RR_WATER_TEMPLE_MQ_2F_CENTRAL] = Region("Water Temple MQ 2F Central", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_2F_CENTRAL] = Region("Water Temple MQ 2F Central", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                  []{return true;}),
         Entrance(RR_WATER_TEMPLE_MQ_3F_CENTRAL,            []{return logic->CanUse(RG_HOOKSHOT);}),
@@ -343,7 +344,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY,      []{return logic->MQWaterLevel(WL_LOW_OR_MID) && logic->CanUse(RG_HOVER_BOOTS);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_HIGH_EMBLEM] = Region("Water Temple MQ High Emblem", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_HIGH_EMBLEM] = Region("Water Temple MQ High Emblem", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->ReachedWaterHighEmblem, []{return true;}),
         EventAccess(&logic->CanWaterTempleHigh,     []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
@@ -353,7 +354,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,       []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_3F_NORTH_LEDGE] = Region("Water Temple MQ 3F North Ledge", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_3F_NORTH_LEDGE] = Region("Water Temple MQ 3F North Ledge", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         //what we need if WL_LOW, we can't guarantee repeated access otherwise.
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,       []{return logic->HasItem(RG_BRONZE_SCALE) || logic->TakeDamage();}),
@@ -361,13 +362,13 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_BOSS_DOOR,  []{return logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_ICE_ARROWS) || logic->CanUse(RG_NAYRUS_LOVE);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_BOSS_DOOR] = Region("Water Temple MQ Main", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BOSS_DOOR] = Region("Water Temple MQ Main", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_3F_NORTH_LEDGE, []{return logic->CanUse(RG_ICE_ARROWS) || logic->TakeDamage();}),
-        Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,     []{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY);}),
+        Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY,     []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_EAST_TOWER] = Region("Water Temple MQ East Tower", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_EAST_TOWER] = Region("Water Temple MQ East Tower", SCENE_WATER_TEMPLE, {
         //Events
         //if we can't reach these, we can't move the water at all, so no need to specify level or account for WL_LOW access here
         //review is some way to play ocarina underwater exists
@@ -378,8 +379,7 @@ void RegionTable_Init_WaterTemple() {
     }, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_MAP_CHEST,           logic->MQWaterLevel(WL_HIGH) && logic->HasFireSource() && logic->CanUse(RG_HOOKSHOT)),
-        //easy to get at WL_HIGH with the hook-the-underwater-chest glitch
-        LOCATION(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,      logic->MQWaterLevel(WL_MID) && logic->CanUse(RG_HOOKSHOT)),
+        LOCATION(RC_WATER_TEMPLE_MQ_LONGSHOT_CHEST,      (logic->MQWaterLevel(WL_MID) && logic->CanUse(RG_HOOKSHOT)) || (logic->MQWaterLevel(WL_HIGH_OR_MID) && logic->CanOpenUnderwaterChest())),
         LOCATION(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1, (logic->MQWaterLevel(WL_LOW) && logic->CanBreakPots()) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT) && logic->WaterTimer() >= 16)),
         LOCATION(RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2, (logic->MQWaterLevel(WL_LOW) && logic->CanBreakPots()) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT) && logic->WaterTimer() >= 16)),
     }, {
@@ -387,7 +387,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //Raising the targets by clearing this room achieves nothing logically because it requires WL_LOW to do and hookshot to use, which implies access to WL_MID and WL_HIGH already
-    areaTable[RR_WATER_TEMPLE_MQ_EAST_TOWER_1F_ROOM] = Region("Water Temple MQ East Tower 1F Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_EAST_TOWER_1F_ROOM] = Region("Water Temple MQ East Tower 1F Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_COMPASS_CHEST, logic->CanKillEnemy(RE_LIZALFOS) && logic->CanKillEnemy(RE_SPIKE)),
     }, {
@@ -395,7 +395,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //This area assumes we entered through the lower door, so water is low and cannot be changed without leaving.
-    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_1F] = Region("Water Temple MQ Central Pillar 1F", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_1F] = Region("Water Temple MQ Central Pillar 1F", SCENE_WATER_TEMPLE, {
         //Events
         //This is harder than the other possibilities as you have to move between shots on top of the extra range, but there's basically no universe this should matter.
         EventAccess(&logic->MQWaterB1Switch, []{return ctx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS);}),
@@ -409,7 +409,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //If we enter here in WL_HIGH, go to RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_HIGH instead, Assumes WL_MID_OR_LOW
-    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_2F] = Region("Water Temple MQ Central Pillar 2F", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_2F] = Region("Water Temple MQ Central Pillar 2F", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->CouldWaterTempleMiddle, []{return true;}),
         EventAccess(&logic->CanWaterTempleMiddle,   []{return logic->CanUse(RG_ZELDAS_LULLABY);}),
@@ -423,16 +423,20 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1,   []{return logic->MQWaterOpenedPillarB1 && logic->MQWaterLevel(WL_MID) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_ZORA_TUNIC);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_HIGH] = Region("Water Temple MQ Central Pillar High", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_HIGH] = Region("Water Temple MQ Central Pillar High", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->MQWaterOpenedPillarB1, []{return ((logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_DINS_FIRE)) || (ctx->GetTrickOption(RT_WATER_MQ_CENTRAL_PILLAR) && logic->CanUse(RG_FIRE_ARROWS))) && (logic->HasItem(RG_BRONZE_SCALE) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_LONGSHOT) && logic->CanJumpslash()));}),
-    }, {}, {
+    }, {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2, logic->CanBreakCrates()),
+    }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1, []{return logic->MQWaterB1Switch && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_ZORA_TUNIC);}),
     });
 
     //Assuming tunic and irons was checked on entry
-    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1] = Region("Water Temple MQ Central Pillar B1", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1] = Region("Water Temple MQ Central Pillar B1", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         //Can't know water level, so we'll just assume any possibility and skip to MAIN
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                    []{return logic->MQWaterOpenedPillarB1 && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE);}),
@@ -440,34 +444,69 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1_FINAL, []{return ((logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_HOOKSHOT) && logic->HasItem(RG_BRONZE_SCALE)));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1_FINAL] = Region("Water Temple MQ Central Pillar B1 Final", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1_FINAL] = Region("Water Temple MQ Central Pillar B1 Final", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST, logic->CanUse(RG_HOOKSHOT)),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,          logic->CanUse(RG_HOOKSHOT)),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14, logic->CanBreakCrates()),
     }, {});
 
     //Region exists to add crate/pot/box locations
-    areaTable[RR_WATER_TEMPLE_MQ_STORAGE_ROOM] = Region("Water Temple MQ Storage Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_STORAGE_ROOM] = Region("Water Temple MQ Storage Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1,           logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2,           logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3,           logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7,         logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1,   logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2,   logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3,   logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4,   logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN, []{return logic->MQWaterLevel(WL_LOW_OR_MID) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_2F] = Region("Water Temple MQ Behind Blue Switch 2F", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_2F] = Region("Water Temple MQ Behind Blue Switch 2F", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1,              logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2,              logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3,              logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE,  logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE,  logic->CanBreakSmallCrates()),
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                  []{return true;}),
         Entrance(RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_3F, []{return logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_3F] = Region("Water Temple MQ Behind Blue Switch 2F", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_3F] = Region("Water Temple MQ Behind Blue Switch 2F", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
     }, {
@@ -476,11 +515,19 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_HIGH_EMBLEM,           []{return true;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY] = Region("Water Temple MQ Lizalfos Hallway", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY] = Region("Water Temple MQ Lizalfos Hallway", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT,  logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT,    logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT,     logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT,    logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT,       logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3,      logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_LIZALFOS_CAGE, []{return logic->MQWaterLevel(WL_LOW_OR_MID) && logic->CanUse(RG_DINS_FIRE);}),
@@ -488,21 +535,23 @@ void RegionTable_Init_WaterTemple() {
         /*Entrance(RR_WATER_TEMPLE_MQ_3F_EAST_LEDGE, []{return (logic->CanUse(RG_HOOKSHOT) && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS))) || (logic->MQWaterLevel(WL_LOW_OR_MID) && logic->CanUse(RG_HOOKSHOT)) || logic->MQWaterLevel(WL_HIGH) && (logic->HasItem(RG_BRONZE_SCALE));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_3F_EAST_LEDGE] = Region("Water Temple MQ 3F East Ledge", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_3F_EAST_LEDGE] = Region("Water Temple MQ 3F East Ledge", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,       []{return true;}),
         Entrance(RR_WATER_TEMPLE_MQ_3F_CENTRAL, []{return logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS);}),*/
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_LIZALFOS_CAGE] = Region("Water Temple MQ Lizalfos Cage", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_LIZALFOS_CAGE] = Region("Water Temple MQ Lizalfos Cage", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,     logic->CanKillEnemy(RE_GOLD_SKULLTULA)),
-        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,           logic->CanKillEnemy(RE_GOLD_SKULLTULA)),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT,       logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT,       logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2, logic->CanBreakCrates()),
     }, {});
 
     //This room exists to hold the wonderitems that drop from the emblems here. Specifically this assumes you are standing on the final ledge
-    areaTable[RR_WATER_TEMPLE_MQ_WATERFALL] = Region("Water Temple Waterfall", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_WATERFALL] = Region("Water Temple Waterfall", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_3F_CENTRAL,        []{return logic->SmallKeys(RR_WATER_TEMPLE, 1) && logic->CanUse(RG_LONGSHOT);}),
         Entrance(RR_WATER_TEMPLE_MQ_STALFOS_PIT,       []{return true;}),
@@ -510,7 +559,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_STALFOS_PIT_UPPER, []{return logic->MQWaterStalfosPit && logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT] = Region("Water Temple MQ Stalfos Pit", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT] = Region("Water Temple MQ Stalfos Pit", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->MQWaterStalfosPit, []{return ((logic->IsAdult && logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 3, false, true)) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT) && logic->CanKillEnemy(RE_STALFOS, ED_BOMB_THROW, true, 3, false, true)));}),
     }, {}, {
@@ -521,7 +570,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //also includes the suns fairy in the middle
-    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT_POTS] = Region("Water Temple MQ Stalfos Pit Pots", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT_POTS] = Region("Water Temple MQ Stalfos Pit Pots", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
         EventAccess(&logic->NutPot,   []{return true;}),
@@ -539,7 +588,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //specifically the area past the spikes
-    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT_UPPER] = Region("Water Temple MQ Stalfos Pit Upper", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_STALFOS_PIT_UPPER] = Region("Water Temple MQ Stalfos Pit Upper", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1,     logic->CanBreakPots()),
         LOCATION(RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2,     logic->CanBreakPots()),
@@ -552,7 +601,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_AFTER_DARK_LINK,  []{return logic->CanKillEnemy(RE_DARK_LINK);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_AFTER_DARK_LINK] = Region("Water Temple MQ After Dark Link", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_AFTER_DARK_LINK] = Region("Water Temple MQ After Dark Link", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -566,7 +615,7 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //if we can use hookshot, we are standing on the targets, otherwise assume we're in the water
-    areaTable[RR_WATER_TEMPLE_MQ_RIVER_SKULL] = Region("Water Temple MQ River Skull", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_RIVER_SKULL] = Region("Water Temple MQ River Skull", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_GS_RIVER, logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
     }, {
@@ -574,7 +623,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_RIVER_POTS, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_RIVER_POTS] = Region("Water Temple MQ River Pots", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_RIVER_POTS] = Region("Water Temple MQ River Pots", SCENE_WATER_TEMPLE, {
         //Events
         EventAccess(&logic->FairyPot, []{return true;}),
     }, {
@@ -591,23 +640,46 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //This region assumes Iron boots to access
-    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_TUNNEL] = Region("Water Temple MQ Dragon Room Tunnel", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_TUNNEL] = Region("Water Temple MQ Dragon Room Tunnel", SCENE_WATER_TEMPLE, {}, 
+    {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4, logic->CanBreakCrates()),
+    },
+    {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_RIVER_POTS,         []{return logic->CanUse(RG_LONGSHOT);}),
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_ALCOVE, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_HOOKSHOT);}),
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR,   []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_ALCOVE] = Region("Water Temple MQ Dragon Room Alcove", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_ALCOVE] = Region("Water Temple MQ Dragon Room Alcove", SCENE_WATER_TEMPLE, {
         //Events
-        EventAccess(&logic->MQWaterDragonTorches, []{return true;}),
-    }, {}, {
+        EventAccess(&logic->MQWaterDragonTorches, []{return logic->HasFireSource();}),
+    }, 
+    {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1,        logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2,        logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1,  logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2,  logic->CanBreakSmallCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3,  logic->CanBreakSmallCrates()),
+    }, 
+    {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_TUNNEL, []{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16;}),
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR,   []{return logic->HasItem(RG_SILVER_SCALE);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR] = Region("Water Temple MQ Dragon Room Door", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR] = Region("Water Temple MQ Dragon Room Door", SCENE_WATER_TEMPLE, {}, 
+    {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2, logic->CanBreakCrates()),
+    }, 
+    {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_RIVER_POTS,            []{return logic->CanUse(RG_LONGSHOT);}),
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_TUNNEL,    []{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanUse(RG_HOOKSHOT);}),
@@ -615,9 +687,10 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_SWITCH,  []{return logic->MQWaterDragonTorches;}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_SWITCH] = Region("Water Temple MQ Boss Key Room Switch", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_SWITCH] = Region("Water Temple MQ Boss Key Room Switch", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_POT, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_POT,           logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE,    logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR,    []{return true;}),
@@ -626,12 +699,20 @@ void RegionTable_Init_WaterTemple() {
     });
 
     //this exists for the crates in preparation for clips through the grate
-    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_PIT] = Region("Water Temple MQ Boss Key Room Pit", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_PIT] = Region("Water Temple MQ Boss Key Room Pit", SCENE_WATER_TEMPLE, {}, 
+    {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4, logic->CanBreakCrates()),
+    }, 
+    {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_SWITCH, []{return logic->CanHitSwitch(ED_BOOMERANG);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_CHEST] = Region("Water Temple MQ Boss Key Room Chest", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_CHEST] = Region("Water Temple MQ Boss Key Room Chest", SCENE_WATER_TEMPLE, {}, {
         //Locations
         LOCATION(RC_WATER_TEMPLE_MQ_BOSS_KEY_CHEST, true),
     }, {
@@ -641,7 +722,7 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_B1_GATE_SWITCH,       []{return logic->HasItem(RG_SILVER_SCALE) || (logic->CanUse(RG_IRON_BOOTS) && (logic->HasItem(RG_BRONZE_SCALE) || (logic->WaterTimer() >= 24 && logic->CanUse(RG_LONGSHOT))));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_B1_GATE_SWITCH] = Region("Water Temple MQ B1 Gate Switch", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_MQ_B1_GATE_SWITCH] = Region("Water Temple MQ B1 Gate Switch", SCENE_WATER_TEMPLE, {
         //Events
         //If the water is low, the switch is underwater and needs irons to press, otherwise, the water is too low to climb up and you need irons to hookshot a target
         //If a glitch clips through the gate on low, have it logically press the switch and let entrance logic enter
@@ -652,22 +733,48 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_CHEST, []{return logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE) && (logic->MQWaterLevel(WL_LOW) || logic->WaterTimer() >= 24);})
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_ROOM] = Region("Water Temple MQ Triangle Torch Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_ROOM] = Region("Water Temple MQ Triangle Torch Room", SCENE_WATER_TEMPLE, {}, 
+    {
+        //Locations
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+                 LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+    }, 
+    {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                []{return logic->MQWaterB1Switch && ((logic->MQWaterLevel(WL_LOW) && logic->HasItem(RG_GOLDEN_SCALE)) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 40 && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_LONGSHOT))));}),
         Entrance(RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_CAGE, []{return logic->CanUse(RG_FIRE_ARROWS) && ((logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)) || (logic->CanUse(RG_LONGSHOT) && Here(RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_CAGE, []{return logic->ScarecrowsSong();})));})
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_CAGE] = Region("Water Temple MQ Triangle Torch Cage", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_CAGE] = Region("Water Temple MQ Triangle Torch Cage", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
-        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,           logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG)),
+        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1,                logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2,                logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3,                logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4,                logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2, logic->CanBreakCrates()),
     }, {});
 
-    areaTable[RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM] = Region("Water Temple MQ Crates Whirlpools Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM] = Region("Water Temple MQ Crates Whirlpools Room", SCENE_WATER_TEMPLE, {}, 
+    {
+        //Locations
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1,     logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2,     logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
+
+    }, 
+    {
         //Exits
         //we can backflip over the spikes, but land in water.
         Entrance(RR_WATER_TEMPLE_MQ_MAIN,                   []{return logic->MQWaterB1Switch && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && (logic->CanUse(RG_LONGSHOT) || logic->HasItem(RG_BRONZE_SCALE));}),
@@ -680,35 +787,50 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_CAGE, []{return ctx->GetTrickOption(RT_WATER_MQ_LOCKED_GS) && (logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT));}),
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_SINGLE_STALFOS_ROOM] = Region("Water Temple MQ Single Stalfos Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_SINGLE_STALFOS_ROOM] = Region("Water Temple MQ Single Stalfos Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,     true),
-        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_FREESTANDING_KEY,       logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1,   logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2,   logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5, logic->CanBreakCrates()),
+
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM, []{return logic->HasItem(RG_SILVER_SCALE) || (logic->IsChild && logic->HasItem(RG_BRONZE_SCALE)) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8 && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_HOOKSHOT)));})
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_4_TORCH_ROOM] = Region("Water Temple MQ 4 Torch Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_4_TORCH_ROOM] = Region("Water Temple MQ 4 Torch Room", SCENE_WATER_TEMPLE, {}, {}, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM, []{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash())) || (logic->HasItem(RG_BRONZE_SCALE) || (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8 && logic->CanUse(RG_HOOKSHOT) ));}),
         Entrance(RR_WATER_TEMPLE_MQ_DODONGO_ROOM,           []{return logic->CanHitSwitch() && logic->HasFireSource();})
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_DODONGO_ROOM] = Region("Water Temple MQ Dodongo Room", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_DODONGO_ROOM] = Region("Water Temple MQ Dodongo Room", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1,         logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2,         logic->CanBreakPots()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE,   logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE,    logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_WATER_TEMPLE_MQ_4_TORCH_ROOM,           []{return (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS)) && Here(RR_WATER_TEMPLE_MQ_DODONGO_ROOM, []{return logic->CanKillEnemy(RE_DODONGO, ED_CLOSE, true, 5);});}),
         Entrance(RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_CAGE, []{return (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS)) && Here(RR_WATER_TEMPLE_MQ_DODONGO_ROOM, []{return logic->CanKillEnemy(RE_DODONGO, ED_CLOSE, true, 5);});})
     });
 
-    areaTable[RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_CAGE] = Region("Water Temple MQ Basement Gated Areas", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_CAGE] = Region("Water Temple MQ Basement Gated Areas", SCENE_WATER_TEMPLE, {}, {
         //Locations
-        LOCATION(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA)),
+        LOCATION(RC_WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,       logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA) && logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3,  logic->CanBreakCrates()),
+        LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4,  logic->CanBreakCrates()),
     }, {
         Entrance(RR_WATER_TEMPLE_MQ_DODONGO_ROOM, []{return true;})
     });
@@ -716,16 +838,16 @@ void RegionTable_Init_WaterTemple() {
 #pragma endregion
 
     // Boss Room
-    areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] = Region("Water Temple Boss Entryway", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WATER_TEMPLE_BOSS_ENTRYWAY] = Region("Water Temple Boss Entryway", SCENE_WATER_TEMPLE, {}, {}, {
         // Exits
         Entrance(RR_WATER_TEMPLE_PRE_BOSS_ROOM, []{return ctx->GetDungeon(WATER_TEMPLE)->IsVanilla() && false;}),
         Entrance(RR_WATER_TEMPLE_MQ_BOSS_DOOR,  []{return ctx->GetDungeon(WATER_TEMPLE)->IsMQ() && false;}),
-        Entrance(RR_WATER_TEMPLE_BOSS_ROOM,     []{return true;}),
+        Entrance(RR_WATER_TEMPLE_BOSS_ROOM,     []{return logic->HasItem(RG_WATER_TEMPLE_BOSS_KEY);}),
     });
 
-    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Region("Water Temple Boss Room", "Water Temple", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_WATER_TEMPLE_BOSS_ROOM] = Region("Water Temple Boss Room", SCENE_WATER_TEMPLE_BOSS, {
         // Events
-        EventAccess(&logic->WaterTempleClear, []{return logic->WaterTempleClear || logic->CanKillEnemy(RE_MORPHA);}),
+        EventAccess(&logic->WaterTempleClear, []{return logic->CanKillEnemy(RE_MORPHA);}),
     }, {
         // Locations
         LOCATION(RC_WATER_TEMPLE_MORPHA_HEART, logic->WaterTempleClear),
@@ -735,4 +857,6 @@ void RegionTable_Init_WaterTemple() {
         Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, []{return false;}),
         Entrance(RR_LAKE_HYLIA,                 []{return logic->WaterTempleClear;}, false),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/gerudo_fortress.cpp b/soh/soh/Enhancements/randomizer/location_access/gerudo_fortress.cpp
deleted file mode 100644
index 6af0551e07..0000000000
--- a/soh/soh/Enhancements/randomizer/location_access/gerudo_fortress.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "soh/Enhancements/randomizer/location_access.h"
-#include "soh/Enhancements/randomizer/entrance.h"
-
-using namespace Rando;
-
-/*
- * This file should be split into "gerudo_fortress.cpp" (overworld) & "thieves_hideout.cpp" (dungeons)
- * when the gerudo fortress refactor is done
- */
-
-void RegionTable_Init_GerudoFortress() {
-    areaTable[RR_GERUDO_FORTRESS] = Region("Gerudo Fortress", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
-        //Events
-        EventAccess(&logic->CarpenterRescue, []{return logic->CanFinishGerudoFortress();}),
-        EventAccess(&logic->GF_GateOpen,     []{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}),
-        EventAccess(&logic->GtG_GateOpen,    []{return logic->GtG_GateOpen || (logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->HasItem(RG_CHILD_WALLET));}),
-    }, {
-        //Locations
-        LOCATION(RC_GF_CHEST,                         logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW)) || logic->CanUse(RG_LONGSHOT)),
-        LOCATION(RC_GF_HBA_1000_POINTS,               logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
-        LOCATION(RC_GF_HBA_1500_POINTS,               logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
-        LOCATION(RC_GF_NORTH_F1_CARPENTER,            logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
-        LOCATION(RC_GF_NORTH_F2_CARPENTER,            (logic->CanKillEnemy(RE_GERUDO_WARRIOR)) && (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER,            logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
-        LOCATION(RC_GF_SOUTH_F2_CARPENTER,            logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
-        LOCATION(RC_GF_GERUDO_MEMBERSHIP_CARD,        logic->CanFinishGerudoFortress()),
-        LOCATION(RC_GF_GS_ARCHERY_RANGE,              logic->IsAdult && logic->HookshotOrBoomerang() && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanGetNightTimeGS()),
-        LOCATION(RC_GF_GS_TOP_FLOOR,                  logic->IsAdult && (logic->CanJumpslashExceptHammer() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN) || ctx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS()),
-        LOCATION(RC_GF_BREAK_ROOM_POT_1,              logic->CanBreakPots()),
-        LOCATION(RC_GF_BREAK_ROOM_POT_2,              logic->CanBreakPots()),
-        LOCATION(RC_GF_KITCHEN_POT_1,                 (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT)) && logic->CanBreakPots()),
-        LOCATION(RC_GF_KITCHEN_POT_2,                 (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT)) && logic->CanBreakPots()),
-        LOCATION(RC_GF_NORTH_F1_CARPENTER_POT_1,      logic->CanBreakPots()),
-        LOCATION(RC_GF_NORTH_F1_CARPENTER_POT_2,      logic->CanBreakPots()),
-        LOCATION(RC_GF_NORTH_F1_CARPENTER_POT_3,      logic->CanBreakPots()),
-        LOCATION(RC_GF_NORTH_F2_CARPENTER_POT_1,      logic->CanBreakPots()),
-        LOCATION(RC_GF_NORTH_F2_CARPENTER_POT_2,      logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_POT_1,      logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_POT_2,      logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_POT_3,      logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_3, logic->CanBreakPots()),
-        LOCATION(RC_GF_SOUTH_F1_CARPENTER_CELL_POT_4, logic->CanBreakPots()),
-        //RANDOTODO doublecheck when GF isn't a blob
-        LOCATION(RC_GF_KITCHEN_SUN_FAIRY,             (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT)) && logic->CanUse(RG_SUNS_SONG)),
-    }, {
-        //Exits
-        Entrance(RR_GV_FORTRESS_SIDE,                []{return true;}),
-        Entrance(RR_GF_OUTSIDE_GATE,                 []{return logic->GF_GateOpen;}),
-        Entrance(RR_GERUDO_TRAINING_GROUND_ENTRYWAY, []{return logic->GtG_GateOpen && (logic->IsAdult || ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}),
-        Entrance(RR_GF_STORMS_GROTTO,                []{return logic->IsAdult && logic->CanOpenStormsGrotto();}),
-    });
-
-    areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
-        //Events
-        EventAccess(&logic->GF_GateOpen, []{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES) /*|| ShuffleSpecialIndoorEntrances*/);}),
-    }, {}, {
-        //Exits
-        Entrance(RR_GERUDO_FORTRESS,         []{return (logic->IsAdult && (logic->CanUse(RG_HOOKSHOT) || !ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES))) || logic->GF_GateOpen;}),
-        Entrance(RR_WASTELAND_NEAR_FORTRESS, []{return true;}),
-    });
-
-    areaTable[RR_GF_STORMS_GROTTO] = Region("GF Storms Grotto", "GF Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
-        //Events
-        EventAccess(&logic->FreeFairies, []{return true;}),
-    }, {
-        //Locations
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_1, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_2, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_3, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_4, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_5, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_6, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_7, true),
-        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_8, true),
-    }, {
-        //Exits
-        Entrance(RR_GERUDO_FORTRESS, []{return true;}),
-    });
-}
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/castle_grounds.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/castle_grounds.cpp
index c4dcf4f027..b9525386ca 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/castle_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/castle_grounds.cpp
@@ -4,39 +4,44 @@
 using namespace Rando;
 
 void RegionTable_Init_CastleGrounds() {
+    // clang-format off
     //With multi-area support {RA_CASTLE_GROUNDS} is not strictly required anymore, as any interior here could inherit both
     //{RA_HYRULE_CASTLE} and {RA_OUTSIDE_GANONS_CASTLE}, but a setting to merge the latter 2 into the former may be preferred
-    areaTable[RR_CASTLE_GROUNDS] = Region("Castle Grounds", "Castle Grounds", {RA_CASTLE_GROUNDS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    //
+    //Temporarily uses SCENE_OUTSIDE_GANONS_CASTLE to avoid self connection between ages
+    areaTable[RR_CASTLE_GROUNDS] = Region("Castle Grounds", SCENE_OUTSIDE_GANONS_CASTLE, TIME_DOESNT_PASS, {RA_CASTLE_GROUNDS}, {}, {}, {
         //Exits
         Entrance(RR_THE_MARKET,            []{return true;}),
         Entrance(RR_HYRULE_CASTLE_GROUNDS, []{return logic->IsChild;}),
         Entrance(RR_GANONS_CASTLE_GROUNDS, []{return logic->IsAdult;}),
     });
 
-    areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", "Castle Grounds", {RA_HYRULE_CASTLE}, DAY_NIGHT_CYCLE, {
+    areaTable[RR_HYRULE_CASTLE_GROUNDS] = Region("Hyrule Castle Grounds", SCENE_HYRULE_CASTLE, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
-        EventAccess(&logic->ButterflyFairy,   []{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}),
+        EventAccess(&logic->ButterflyFairy,   []{return logic->CanUse(RG_STICKS);}),
         EventAccess(&logic->BugRock,          []{return true;}),
     }, {
         //Locations
         LOCATION(RC_HC_MALON_EGG,                        true),
-        LOCATION(RC_HC_GS_TREE,                          logic->IsChild && logic->CanAttack()),
+        LOCATION(RC_HC_GS_TREE,                          logic->IsChild && logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_CLOSE)),
         LOCATION(RC_HC_MALON_GOSSIP_STONE_FAIRY,         logic->CallGossipFairy()),
         LOCATION(RC_HC_MALON_GOSSIP_STONE_FAIRY_BIG,     logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,     logic->CallGossipFairy()),
         LOCATION(RC_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG, logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_HC_MALON_GOSSIP_STONE,               true),
         LOCATION(RC_HC_ROCK_WALL_GOSSIP_STONE,           true),
+        LOCATION(RC_HC_GRASS_1,                          logic->CanCutShrubs()),
+        LOCATION(RC_HC_GRASS_2,                          logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_CASTLE_GROUNDS,          []{return true;}),
-        Entrance(RR_HC_GARDEN,               []{return logic->CanUse(RG_WEIRD_EGG) || !ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanJumpslash());}),
+        Entrance(RR_HC_GARDEN,               []{return logic->CanUse(RG_WEIRD_EGG) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanJumpslash());}),
         Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, []{return logic->BlastOrSmash();}),
         Entrance(RR_HC_STORMS_GROTTO,        []{return logic->CanOpenStormsGrotto();}),
     });
 
-    areaTable[RR_HC_GARDEN] = Region("HC Garden", "Castle Grounds", {RA_HYRULE_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HC_GARDEN] = Region("HC Garden", SCENE_CASTLE_COURTYARD_ZELDA, {}, {
         //Locations
         LOCATION(RC_HC_ZELDAS_LETTER, true),
         LOCATION(RC_SONG_FROM_IMPA,   true),
@@ -45,7 +50,7 @@ void RegionTable_Init_CastleGrounds() {
         Entrance(RR_HYRULE_CASTLE_GROUNDS, []{return true;}),
     });
 
-    areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, {}, {
         //Locations
         LOCATION(RC_HC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
@@ -53,7 +58,7 @@ void RegionTable_Init_CastleGrounds() {
         Entrance(RR_CASTLE_GROUNDS, []{return true;}),
     });
 
-    areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", "HC Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HC_STORMS_GROTTO] = Region("HC Storms Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_HC_GS_STORMS_GROTTO, logic->CanUse(RG_BOOMERANG) && ctx->GetTrickOption(RT_HC_STORMS_GS)),
     }, {
@@ -62,7 +67,7 @@ void RegionTable_Init_CastleGrounds() {
         Entrance(RR_HC_STORMS_GROTTO_BEHIND_WALLS, []{return logic->CanBreakMudWalls();}),
     });
 
-    areaTable[RR_HC_STORMS_GROTTO_BEHIND_WALLS] = Region("HC Storms Grotto Behind Walls", "HC Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_HC_STORMS_GROTTO_BEHIND_WALLS] = Region("HC Storms Grotto Behind Walls", SCENE_GROTTOS, {
         //Events
         EventAccess(&logic->NutPot,           []{return true;}),
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
@@ -79,10 +84,10 @@ void RegionTable_Init_CastleGrounds() {
         LOCATION(RC_HC_STORMS_GROTTO_POT_4,                  logic->CanBreakPots()),
     }, {
         //Exits
-        Entrance(RR_CASTLE_GROUNDS, []{return true;}),
+        Entrance(RR_HC_STORMS_GROTTO, []{return true;}),
     });
 
-    areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", "Castle Grounds", {RA_OUTSIDE_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GANONS_CASTLE_GROUNDS] = Region("Ganon's Castle Grounds", SCENE_OUTSIDE_GANONS_CASTLE, {
         //Events
         EventAccess(&logic->BuiltRainbowBridge, []{return logic->CanBuildRainbowBridge();}),
     }, {
@@ -95,7 +100,7 @@ void RegionTable_Init_CastleGrounds() {
         Entrance(RR_GANONS_CASTLE_LEDGE,      []{return logic->BuiltRainbowBridge;}),
     });
 
-    areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Region("OGC Great Fairy Fountain", "OGC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_OGC_GREAT_FAIRY_FOUNTAIN] = Region("OGC Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, {}, {
         //Locations
         LOCATION(RC_OGC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
@@ -103,15 +108,17 @@ void RegionTable_Init_CastleGrounds() {
         Entrance(RR_CASTLE_GROUNDS, []{return true;}),
     });
 
-    areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Region("Castle Grounds From Ganon's Castle", "Castle Grounds From Ganon's Castle", {RA_CASTLE_GROUNDS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE] = Region("Castle Grounds From Ganon's Castle", SCENE_OUTSIDE_GANONS_CASTLE, {}, {}, {
         // Exits
         Entrance(RR_HYRULE_CASTLE_GROUNDS, []{return logic->IsChild;}),
         Entrance(RR_GANONS_CASTLE_LEDGE,   []{return logic->IsAdult;}),
     });
 
-    areaTable[RR_GANONS_CASTLE_LEDGE] = Region("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", {RA_OUTSIDE_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GANONS_CASTLE_LEDGE] = Region("Ganon's Castle Ledge", SCENE_OUTSIDE_GANONS_CASTLE, {}, {}, {
         // Exits
         Entrance(RR_GANONS_CASTLE_GROUNDS,  []{return logic->BuiltRainbowBridge;}),
         Entrance(RR_GANONS_CASTLE_ENTRYWAY, []{return logic->IsAdult;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_crater.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_crater.cpp
index 6ba8bfc6ed..be1b2043af 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_crater.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_crater.cpp
@@ -4,23 +4,26 @@
 using namespace Rando;
 
 void RegionTable_Init_DeathMountainCrater() {
-    areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    // clang-format off
+    areaTable[RR_DMC_UPPER_NEARBY] = Region("DMC Upper Nearby", SCENE_DEATH_MOUNTAIN_CRATER, {}, {}, {
         //Exits
         Entrance(RR_DMC_UPPER_LOCAL,       []{return logic->FireTimer() >= 48;}),
         Entrance(RR_DEATH_MOUNTAIN_SUMMIT, []{return true;}),
         Entrance(RR_DMC_UPPER_GROTTO,      []{return Here(RR_DMC_UPPER_NEARBY, []{return logic->BlastOrSmash() && (logic->FireTimer() >= 8 || logic->Hearts() >= 3);});})
     });
 
-    areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DMC_UPPER_LOCAL] = Region("DMC Upper Local", SCENE_DEATH_MOUNTAIN_CRATER, {
         //Events
-        EventAccess(&logic->GossipStoneFairy, []{return logic->GossipStoneFairy || (logic->HasExplosives() && logic->CallGossipFairyExceptSuns() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3));}),
+        EventAccess(&logic->GossipStoneFairy, []{return logic->HasExplosives() && logic->CallGossipFairyExceptSuns() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3);}),
     }, {
         //Locations
         LOCATION(RC_DMC_WALL_FREESTANDING_POH,  logic->FireTimer() >= 16 || logic->Hearts() >= 3),
-        LOCATION(RC_DMC_GS_CRATE,               (logic->FireTimer() >= 8 || logic->Hearts() >= 3) && logic->IsChild && logic->CanAttack()),
+        LOCATION(RC_DMC_GS_CRATE,               (logic->FireTimer() >= 8 || logic->Hearts() >= 3) && logic->IsChild && logic->CanAttack() && logic->CanBreakCrates()),
         LOCATION(RC_DMC_GOSSIP_STONE_FAIRY,     logic->CallGossipFairyExceptSuns() && logic->HasExplosives() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3)),
         LOCATION(RC_DMC_GOSSIP_STONE_FAIRY_BIG, logic->CanUse(RG_SONG_OF_STORMS) && logic->HasExplosives() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3)),
         LOCATION(RC_DMC_GOSSIP_STONE,           logic->HasExplosives() && (logic->FireTimer() >= 16 || logic->Hearts() >= 3)),
+        LOCATION(RC_DMC_CRATE,                  (logic->FireTimer() >= 8 || logic->Hearts() >= 3) && logic->IsChild && logic->CanBreakCrates()),
+
     }, {
         //Exits
         Entrance(RR_DMC_UPPER_NEARBY,       []{return true;}),
@@ -30,7 +33,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_DISTANT_PLATFORM,   []{return (logic->FireTimer() >= 48 && logic->Hearts() >= 2) || logic->Hearts() >= 3;}),
     });
 
-    areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_LADDER_AREA_NEARBY] = Region("DMC Ladder Region Nearby", SCENE_DEATH_MOUNTAIN_CRATER, {}, {
         //Locations
         LOCATION(RC_DMC_DEKU_SCRUB, logic->IsChild && logic->CanStunDeku()),
     }, {
@@ -39,7 +42,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_LOWER_NEARBY, []{return logic->Hearts() >= 3 && (logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_DMC_BOULDER_JS) && logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)) || (ctx->GetTrickOption(RT_DMC_BOULDER_SKIP) && logic->IsAdult));}),
     });
 
-    areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_LOWER_NEARBY] = Region("DMC Lower Nearby", SCENE_DEATH_MOUNTAIN_CRATER, {}, {
         // Locations
         LOCATION(RC_DMC_NEAR_GC_POT_1, logic->CanBreakPots()),
         LOCATION(RC_DMC_NEAR_GC_POT_2, logic->CanBreakPots()),
@@ -53,7 +56,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_HAMMER_GROTTO,        []{return logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER);}),
     });
 
-    areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DMC_LOWER_LOCAL] = Region("DMC Lower Local", SCENE_DEATH_MOUNTAIN_CRATER, {}, {}, {
         //Exits
         Entrance(RR_DMC_LOWER_NEARBY,       []{return true;}),
         Entrance(RR_DMC_LADDER_AREA_NEARBY, []{return logic->FireTimer() >= 8 || logic->Hearts() >= 3;}),
@@ -61,7 +64,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_CENTRAL_LOCAL,      []{return (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanShield() && ctx->GetTrickOption(RT_DMC_BOLERO_JUMP))) && logic->FireTimer() >= 24;}),
     });
 
-    areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_CENTRAL_NEARBY] = Region("DMC Central Nearby", SCENE_DEATH_MOUNTAIN_CRATER, {}, {
         //Locations
         LOCATION(RC_DMC_VOLCANO_FREESTANDING_POH, logic->IsAdult && logic->Hearts() >= 3 && (CanPlantBean(RR_DMC_CENTRAL_LOCAL) || (ctx->GetTrickOption(RT_DMC_HOVER_BEAN_POH) && logic->CanUse(RG_HOVER_BOOTS)))),
         LOCATION(RC_SHEIK_IN_CRATER,              logic->IsAdult && (logic->FireTimer() >= 8 || logic->Hearts() >= 3)),
@@ -70,7 +73,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_CENTRAL_LOCAL, []{return logic->FireTimer() >= 48;}),
     });
 
-    areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_DMC_CENTRAL_LOCAL] = Region("DMC Central Local", SCENE_DEATH_MOUNTAIN_CRATER, {
         //Events
         EventAccess(&logic->BeanPlantFairy, []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->FireTimer() >= 8 || logic->Hearts() >= 3);}),
     }, {
@@ -96,7 +99,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_DISTANT_PLATFORM, []{return logic->FireTimer() >= 48 && logic->CanUse(RG_DISTANT_SCARECROW);}),
     });
 
-    areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", "DMC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_GREAT_FAIRY_FOUNTAIN] = Region("DMC Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, {}, {
         //Locations
         LOCATION(RC_DMC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
@@ -104,7 +107,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_LOWER_LOCAL, []{return true;}),
     });
 
-    areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", "DMC Upper Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_DMC_UPPER_GROTTO] = Region("DMC Upper Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_DMC_UPPER_GROTTO_CHEST,                  true),
         LOCATION(RC_DMC_UPPER_GROTTO_FISH,                   logic->HasBottle()),
@@ -113,12 +116,16 @@ void RegionTable_Init_DeathMountainCrater() {
         LOCATION(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_DMC_UPPER_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_DMC_UPPER_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_DMC_UPPER_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_DMC_UPPER_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DMC_UPPER_LOCAL, []{return true;}),
     });
 
-    areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", "DMC Hammer Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_HAMMER_GROTTO] = Region("DMC Hammer Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
         LOCATION(RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -129,7 +136,7 @@ void RegionTable_Init_DeathMountainCrater() {
         Entrance(RR_DMC_LOWER_LOCAL, []{return true;}),
     });
 
-    areaTable[RR_DMC_DISTANT_PLATFORM] = Region("DMC Distant Platform", "Death Mountain Crater", {RA_DEATH_MOUNTAIN_CRATER}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMC_DISTANT_PLATFORM] = Region("DMC Distant Platform", SCENE_DEATH_MOUNTAIN_CRATER, {}, {
         //Locations
         LOCATION(RC_DMC_DISTANT_PLATFORM_GREEN_RUPEE_1, logic->IsAdult),
         LOCATION(RC_DMC_DISTANT_PLATFORM_GREEN_RUPEE_2, logic->IsAdult),
@@ -142,4 +149,6 @@ void RegionTable_Init_DeathMountainCrater() {
         //Exits
         Entrance(RR_DMC_CENTRAL_LOCAL, []{return logic->FireTimer() >= 48 && logic->CanUse(RG_DISTANT_SCARECROW);}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp
index bd0362598b..dbf2189476 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/death_mountain_trail.cpp
@@ -4,7 +4,8 @@
 using namespace Rando;
 
 void RegionTable_Init_DeathMountainTrail() {
-    areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_DEATH_MOUNTAIN_TRAIL] = Region("Death Mountain", SCENE_DEATH_MOUNTAIN_TRAIL, {
         //Events
         EventAccess(&logic->BeanPlantFairy, []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasExplosives() || logic->HasItem(RG_GORONS_BRACELET));}),
     }, {
@@ -29,10 +30,10 @@ void RegionTable_Init_DeathMountainTrail() {
         Entrance(RR_DMT_STORMS_GROTTO,        []{return logic->CanOpenStormsGrotto();}),
     });
 
-    areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, DAY_NIGHT_CYCLE, {
+    areaTable[RR_DEATH_MOUNTAIN_SUMMIT] = Region("Death Mountain Summit", SCENE_DEATH_MOUNTAIN_TRAIL, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
-        EventAccess(&logic->BugRock,          []{return logic->BugRock            || logic->IsChild;}),
+        EventAccess(&logic->BugRock,          []{return logic->IsChild;}),
     }, {
         //Locations
         LOCATION(RC_DMT_TRADE_BROKEN_SWORD,     logic->IsAdult && logic->CanUse(RG_BROKEN_SWORD)),
@@ -51,12 +52,12 @@ void RegionTable_Init_DeathMountainTrail() {
         Entrance(RR_DMT_GREAT_FAIRY_FOUNTAIN, []{return Here(RR_DEATH_MOUNTAIN_SUMMIT, []{return logic->BlastOrSmash();});}),
     });
 
-    areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", "Death Mountain", {RA_DEATH_MOUNTAIN_TRAIL}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_DMT_OWL_FLIGHT] = Region("DMT Owl Flight", SCENE_DEATH_MOUNTAIN_TRAIL, {}, {}, {
         //Exits
         Entrance(RR_KAK_IMPAS_ROOFTOP, []{return true;}),
     });
 
-    areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", "DMT Cow Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMT_COW_GROTTO] = Region("DMT Cow Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_DMT_COW_GROTTO_COW,                logic->CanUse(RG_EPONAS_SONG)),
         LOCATION(RC_DMT_COW_GROTTO_BEEHIVE,            logic->CanBreakLowerBeehives()),
@@ -72,12 +73,14 @@ void RegionTable_Init_DeathMountainTrail() {
         LOCATION(RC_DMT_COW_GROTTO_RUPEE_6,            true),
         LOCATION(RC_DMT_COW_GROTTO_RED_RUPEE,          true),
         LOCATION(RC_DMT_COW_GROTTO_STORMS_FAIRY,       logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_DMT_COW_GROTTO_GRASS_1,            logic->CanCutShrubs()),
+        LOCATION(RC_DMT_COW_GROTTO_GRASS_2,            logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEATH_MOUNTAIN_SUMMIT, []{return true;}),
     });
 
-    areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", "DMT Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_DMT_STORMS_GROTTO] = Region("DMT Storms Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_DMT_STORMS_GROTTO_CHEST,                  true),
         LOCATION(RC_DMT_STORMS_GROTTO_FISH,                   logic->HasBottle()),
@@ -86,16 +89,22 @@ void RegionTable_Init_DeathMountainTrail() {
         LOCATION(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_DMT_STORMS_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_DMT_STORMS_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_DMT_STORMS_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_DMT_STORMS_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_DEATH_MOUNTAIN_TRAIL, []{return true;}),
     });
 
-    areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Region("DMT Great Fairy Fountain", "DMT Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DMT_GREAT_FAIRY_FOUNTAIN] = Region("DMT Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, {}, {
         //Locations
         LOCATION(RC_DMT_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
         //Exits
         Entrance(RR_DEATH_MOUNTAIN_SUMMIT, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/desert_colossus.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/desert_colossus.cpp
index 0ef2bbdfc7..f4b8b01c34 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/desert_colossus.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/desert_colossus.cpp
@@ -4,9 +4,10 @@
 using namespace Rando;
 
 void RegionTable_Init_DesertColossus() {
-    areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", "Desert Colossus", {RA_DESERT_COLOSSUS}, DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_DESERT_COLOSSUS] = Region("Desert Colossus", SCENE_DESERT_COLOSSUS, {
         //Events
-        EventAccess(&logic->FairyPond, []{return logic->FairyPond || logic->CanUse(RG_SONG_OF_STORMS);}),
+        EventAccess(&logic->FairyPond, []{return logic->CanUse(RG_SONG_OF_STORMS);}),
         EventAccess(&logic->BugRock,   []{return true;}),
     }, {
         //Locations
@@ -31,7 +32,7 @@ void RegionTable_Init_DesertColossus() {
     });
 
     //specifically the full oasis, after the fairies have spawned
-    areaTable[RR_DESERT_COLOSSUS_OASIS] = Region("Desert Colossus Oasis", "Desert Colossus", {RA_DESERT_COLOSSUS}, DAY_NIGHT_CYCLE, {
+    areaTable[RR_DESERT_COLOSSUS_OASIS] = Region("Desert Colossus Oasis", SCENE_DESERT_COLOSSUS, {
         //Events
         EventAccess(&logic->FairyPond, []{return true;}),
     }, {
@@ -49,7 +50,7 @@ void RegionTable_Init_DesertColossus() {
         Entrance(RR_DESERT_COLOSSUS, []{return true;}),
     });
 
-    areaTable[RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE] = Region("Desert Colossus From Spirit Entryway", "Desert Colossus", {RA_DESERT_COLOSSUS}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DESERT_COLOSSUS_OUTSIDE_TEMPLE] = Region("Desert Colossus From Spirit Entryway", SCENE_DESERT_COLOSSUS, {}, {
         //Locations
         LOCATION(RC_SHEIK_AT_COLOSSUS, true),
     }, {
@@ -57,7 +58,7 @@ void RegionTable_Init_DesertColossus() {
         Entrance(RR_DESERT_COLOSSUS, []{return true;}),
     });
 
-    areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Region("Colossus Great Fairy Fountain", "Colossus Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN] = Region("Colossus Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, {}, {
         //Locations
         LOCATION(RC_COLOSSUS_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
@@ -65,7 +66,7 @@ void RegionTable_Init_DesertColossus() {
         Entrance(RR_DESERT_COLOSSUS, []{return true;}),
     });
 
-    areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", "Colossus Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_COLOSSUS_GROTTO] = Region("Colossus Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
         LOCATION(RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
@@ -74,4 +75,6 @@ void RegionTable_Init_DesertColossus() {
         //Exits
         Entrance(RR_DESERT_COLOSSUS, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp
new file mode 100644
index 0000000000..e26e841f0d
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp
@@ -0,0 +1,249 @@
+#include "soh/Enhancements/randomizer/location_access.h"
+#include "soh/Enhancements/randomizer/entrance.h"
+
+using namespace Rando;
+
+// clang-format off
+void RegionTable_Init_GerudoFortress() {
+#pragma region Ground
+
+    areaTable[RR_GF_OUTSKIRTS] = Region("Gerudo Fortress Outskirts", SCENE_GERUDOS_FORTRESS, {
+        //Events
+        EventAccess(&logic->GF_GateOpen,  []{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}), //needs climb
+    }, {
+        //Locations
+        LOCATION(RC_GF_OUTSKIRTS_NE_CRATE, (logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD)) && logic->CanBreakCrates()),
+        LOCATION(RC_GF_OUTSKIRTS_NW_CRATE, logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD)),
+    }, {
+        //Exits
+        Entrance(RR_GV_FORTRESS_SIDE, []{return true;}),
+        Entrance(RR_TH_1_TORCH_CELL,  []{return true;}),
+        Entrance(RR_GF_OUTSIDE_GATE,  []{return logic->GF_GateOpen;}),
+        Entrance(RR_GF_NEAR_GROTTO,   []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        Entrance(RR_GF_OUTSIDE_GTG,   []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        //You can talk to the guards to get yourself thrown in jail, so long as you have a hookshot to actually end up there
+        Entrance(RR_GF_JAIL_WINDOW,   []{return logic->CanUse(RG_HOOKSHOT);}),
+    });
+
+    areaTable[RR_GF_NEAR_GROTTO] = Region("GF Near Grotto", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_SOUTHMOST_CENTER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_GF_MID_SOUTH_CENTER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_GF_MID_NORTH_CENTER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RR_GF_NORTHMOST_CENTER_CRATE, logic->CanBreakCrates()),
+    }, {
+        //Exits
+        Entrance(RR_TH_1_TORCH_CELL,       []{return true;}),
+        Entrance(RR_TH_STEEP_SLOPE_CELL,   []{return true;}),
+        Entrance(RR_TH_KITCHEN_CORRIDOR,   []{return true;}),
+        //Jail
+        Entrance(RR_GF_OUTSKIRTS,          []{return true;}),
+        Entrance(RR_GF_JAIL_WINDOW,        []{return logic->CanUse(RG_HOOKSHOT);}),
+        Entrance(RR_GF_OUTSIDE_GTG,        []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        Entrance(RR_GF_TOP_OF_UPPER_VINES, []{return logic->CanUse(RG_LONGSHOT);}),
+        Entrance(RR_GF_STORMS_GROTTO,      []{return logic->IsAdult && logic->CanOpenStormsGrotto();}),
+    });
+
+    areaTable[RR_GF_OUTSIDE_GTG] = Region("GF Outside GTG", SCENE_GERUDOS_FORTRESS, {
+        //Events
+        EventAccess(&logic->GtG_GateOpen, []{return (logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->HasItem(RG_CHILD_WALLET));}),
+    }, {}, {
+        //Exits
+        Entrance(RR_GERUDO_TRAINING_GROUND_ENTRYWAY, []{return logic->GtG_GateOpen && (logic->IsAdult || ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES));}),
+        //Jail
+        Entrance(RR_GF_JAIL_WINDOW,                  []{return logic->CanUse(RG_HOOKSHOT);}),
+        Entrance(RR_GF_OUTSKIRTS,                    []{return true;}),
+        Entrance(RR_GF_NEAR_GROTTO,                  []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        // RANDTODO: Add tricks for getting past the gerudo guarding the hba range
+        Entrance(RR_GF_ABOVE_GTG,                    []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        Entrance(RR_GF_TOP_OF_UPPER_VINES,           []{return logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_LONGSHOT);}),
+        Entrance(RR_GF_HBA_RANGE,                    []{return logic->IsChild || logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}),
+    });
+
+#pragma endregion
+
+#pragma region Rooftops
+
+    areaTable[RR_GF_ABOVE_GTG] = Region("GF Above GTG", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_TH_DOUBLE_CELL,           []{return true;}),
+        Entrance(RR_TH_KITCHEN_CORRIDOR,      []{return true;}),
+        //Jail
+        Entrance(RR_GF_JAIL_WINDOW,           []{return logic->CanUse(RG_HOOKSHOT);}),
+        Entrance(RR_GF_OUTSKIRTS,             []{return true;}),
+        Entrance(RR_GF_NEAR_GROTTO,           []{return true;}),
+        Entrance(RR_GF_OUTSIDE_GTG,           []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        // need to explicitly convert it into a bool
+        Entrance(RR_GF_BOTTOM_OF_LOWER_VINES, []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0 ;}),
+    });
+
+    areaTable[RR_GF_BOTTOM_OF_LOWER_VINES] = Region("GF Bottom of Lower Vines", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_TH_STEEP_SLOPE_CELL,   []{return true;}),
+        Entrance(RR_GF_NEAR_GROTTO,        []{return true;}),
+        Entrance(RR_GF_TOP_OF_LOWER_VINES, []{return true /* logic->CanClimb() */;}),
+        Entrance(RR_GF_ABOVE_GTG,          []{return true;}),
+    });
+
+    areaTable[RR_GF_TOP_OF_LOWER_VINES] = Region("GF Top of Lower Vines", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_TH_KITCHEN_TOP,           []{return true;}),
+        Entrance(RR_TH_DOUBLE_CELL,           []{return true;}),
+        Entrance(RR_GF_ABOVE_GTG,             []{return true;}),
+        Entrance(RR_GF_BOTTOM_OF_LOWER_VINES, []{return true;}),
+        // need to explicitly convert it into a bool
+        Entrance(RR_GF_BOTTOM_OF_UPPER_VINES, []{return logic->IsAdult && ctx->GetTrickOption(RT_GF_JUMP).Get();}),
+    });
+
+    areaTable[RR_GF_NEAR_GS] = Region("GF Near GS", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOMB_THROW) && logic->CanGetNightTimeGS()),
+    }, {
+        //Exits
+        Entrance(RR_TH_KITCHEN_TOP,           []{return true;}),
+        Entrance(RR_GF_BOTTOM_OF_LOWER_VINES, []{return true;}),
+        Entrance(RR_GF_TOP_OF_LOWER_VINES,    []{return true;}),
+        Entrance(RR_GF_SLOPED_ROOF,           []{return logic->IsAdult;}),
+        Entrance(RR_GF_LONG_ROOF,             []{return logic->CanUse(RG_HOVER_BOOTS) /* || bunny hood jump */ || logic->IsAdult && ctx->GetTrickOption(RT_GF_JUMP);}),
+        Entrance(RR_GF_NEAR_CHEST,            []{return logic->CanUse(RG_LONGSHOT);}),
+        Entrance(RR_GF_BELOW_GS,              []{return true;}),
+    });
+
+    areaTable[RR_GF_SLOPED_ROOF] = Region("GF Sloped Roof", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_GF_TOP_OF_LOWER_VINES,    []{return true;}),
+        Entrance(RR_GF_NEAR_GS,               []{return true;}),
+        Entrance(RR_GF_BOTTOM_OF_UPPER_VINES, []{return true;}),
+        Entrance(RR_GF_TOP_OF_UPPER_VINES,    []{return logic->IsAdult && ctx->GetTrickOption(RT_GF_JUMP).Get();}),
+    });
+
+    areaTable[RR_GF_BOTTOM_OF_UPPER_VINES] = Region("GF Bottom of Upper Vines", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_GF_OUTSIDE_GTG,        []{return true;}),
+        Entrance(RR_GF_TOP_OF_LOWER_VINES, []{return true;}),
+        Entrance(RR_GF_SLOPED_ROOF,        []{return logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS);}),
+        Entrance(RR_GF_TOP_OF_UPPER_VINES, []{return true /* logic->CanClimb() */;}),
+    });
+
+    areaTable[RR_GF_TOP_OF_UPPER_VINES] = Region("GF Top of Upper Vines", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        //if RR_GF_SLOPED_ROOF > RR_GF_TOP_OF_UPPER_VINES is ever made part of RT_GF_JUMP, climb is needed to get back up
+        LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_SHORT_JUMPSLASH) && logic->CanGetNightTimeGS()),
+    }, {
+        //Exits
+        Entrance(RR_GF_TOP_OF_LOWER_VINES,    []{return true;}),
+        Entrance(RR_GF_SLOPED_ROOF,           []{return true;}),
+        Entrance(RR_GF_BOTTOM_OF_UPPER_VINES, []{return true;}),
+        Entrance(RR_GF_NEAR_CHEST,            []{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_LONGSHOT);}),
+    });
+
+    areaTable[RR_GF_NEAR_CHEST] = Region("GF Near Chest", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_CHEST,        true),
+        LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG) && logic->CanGetNightTimeGS()),
+    }, {
+        //Exits
+        Entrance(RR_GF_NEAR_GS,     []{return true;}),
+        Entrance(RR_GF_LONG_ROOF,   []{return true;}),
+    });
+
+    areaTable[RR_GF_LONG_ROOF] = Region("GF Long Roof", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_GF_BOTTOM_OF_LOWER_VINES, []{return true;}),
+        Entrance(RR_GF_NEAR_GS,               []{return (logic->IsAdult && ctx->GetTrickOption(RT_GF_JUMP)) || logic->CanUse(RG_HOVER_BOOTS);}),
+        Entrance(RR_GF_BELOW_GS,              []{return true;}),
+        Entrance(RR_GF_NEAR_CHEST,            []{return logic->CanUse(RG_LONGSHOT);}),
+        Entrance(RR_GF_BELOW_CHEST,           []{return true;}),
+    });
+
+    areaTable[RR_GF_BELOW_GS] = Region("GF Below GS", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_LONGSHOT) && logic->CanGetNightTimeGS()),
+    }, {
+        //Exits
+        Entrance(RR_TH_DEAD_END_CELL,         []{return true;}),
+        Entrance(RR_GF_BOTTOM_OF_LOWER_VINES, []{return true;}),
+    });
+
+    areaTable[RR_GF_BELOW_CHEST] = Region("GF Below Chest", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        Entrance(RR_TH_BREAK_ROOM, []{return true;}),
+        Entrance(RR_GF_OUTSKIRTS,  []{return true;}),
+    });
+
+
+#pragma endregion
+
+    areaTable[RR_GF_ABOVE_JAIL] = Region("GF Above Jail", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_ABOVE_JAIL_CRATE, true),
+    }, {
+        //Exits
+        //you don't take fall damage if you land on the rock with the flag on for some reason
+        //there's a trick to reach RR_GF_LONG_ROOF but that's too intricate for GF_JUMP
+        Entrance(RR_GF_OUTSKIRTS,   []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0;}),
+        Entrance(RR_GF_NEAR_CHEST,  []{return logic->CanUse(RG_LONGSHOT);}),
+        Entrance(RR_GF_BELOW_CHEST, []{return logic->TakeDamage();}),
+        Entrance(RR_GF_JAIL_WINDOW, []{return logic->CanUse(RG_HOOKSHOT);}),
+    });
+
+    areaTable[RR_GF_JAIL_WINDOW] = Region("GF Jail Window", SCENE_GERUDOS_FORTRESS, {}, {}, {
+        //Exits
+        //There's a trick where hovers backwalk into backflip gives access to RR_GF_LONG_ROOF from here
+        Entrance(RR_GF_OUTSKIRTS,   []{return true;}),
+        Entrance(RR_GF_BELOW_CHEST, []{return true;}),
+    });
+
+    areaTable[RR_GF_HBA_RANGE] = Region("GF HBA Range", SCENE_GERUDOS_FORTRESS, {}, {
+        //Locations
+        LOCATION(RC_GF_HBA_1000_POINTS,          logic->IsAdult && logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
+        LOCATION(RC_GF_HBA_1500_POINTS,          logic->IsAdult && logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->CanUse(RG_EPONA) && logic->CanUse(RG_FAIRY_BOW) && logic->AtDay),
+        LOCATION(RC_GF_HBA_RANGE_GS,             logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG) && logic->CanGetNightTimeGS()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_1,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_2,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_3,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_4,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_5,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_6,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_RANGE_CRATE_7,        logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_CANOPY_EAST_CRATE,    logic->CanBreakCrates()),
+        LOCATION(RC_GF_HBA_CANOPY_WEST_CRATE,    logic->CanBreakCrates()),
+        LOCATION(RC_GF_NORTH_TARGET_EAST_CRATE,  logic->CanBreakCrates()),
+        LOCATION(RC_GF_NORTH_TARGET_WEST_CRATE,  logic->IsAdult || (logic->BlastOrSmash() || logic->HookshotOrBoomerang() || logic->CanUse(RG_HOVER_BOOTS))),
+        //implies logic->CanBreakCrates()
+        LOCATION(RC_GF_NORTH_TARGET_CHILD_CRATE, logic->IsChild && logic->BlastOrSmash()),
+        LOCATION(RC_GF_SOUTH_TARGET_EAST_CRATE,  logic->CanBreakCrates()),
+        LOCATION(RC_GF_SOUTH_TARGET_WEST_CRATE,  logic->CanBreakCrates()),
+    }, {
+        //Exits
+        Entrance(RR_GF_OUTSIDE_GTG, []{return logic->IsChild || logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}),
+    });
+
+    areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", SCENE_GERUDOS_FORTRESS, {
+        //Events
+        EventAccess(&logic->GF_GateOpen, []{return logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}),
+    }, {}, {
+        //Exits
+        Entrance(RR_GF_OUTSKIRTS,            []{return logic->GF_GateOpen;}),
+        Entrance(RR_WASTELAND_NEAR_FORTRESS, []{return true;}),
+    });
+
+    areaTable[RR_GF_STORMS_GROTTO] = Region("GF Storms Grotto", SCENE_GROTTOS, {
+        //Events
+        EventAccess(&logic->FreeFairies, []{return true;}),
+    }, {
+        //Locations
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_1, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_2, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_3, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_4, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_5, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_6, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_7, true),
+        LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_8, true),
+    }, {
+        //Exits
+        Entrance(RR_GF_NEAR_GROTTO, []{return true;}),
+    });
+}
+// clang-format on
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
index 1c4714e52f..a9f0299ba9 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
@@ -4,22 +4,24 @@
 using namespace Rando;
 
 void RegionTable_Init_GerudoValley() {
-    areaTable[RR_GERUDO_VALLEY] = Region("Gerudo Valley", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_GERUDO_VALLEY] = Region("Gerudo Valley", SCENE_GERUDO_VALLEY, {
         //Events
-        EventAccess(&logic->BugRock, []{return logic->BugRock || logic->IsChild;}),
+        EventAccess(&logic->BugRock, []{return logic->IsChild;}),
     }, {
         //Locations
         LOCATION(RC_GV_GS_SMALL_BRIDGE, logic->IsChild && logic->HookshotOrBoomerang() && logic->CanGetNightTimeGS()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD,     []{return true;}),
-        Entrance(RR_GV_UPPER_STREAM,  []{return true;}),
+        Entrance(RR_GV_UPPER_STREAM,  []{return logic->IsChild || logic->HasItem(RG_BRONZE_SCALE) || logic->TakeDamage();}),
         Entrance(RR_GV_CRATE_LEDGE,   []{return logic->IsChild || logic->CanUse(RG_LONGSHOT);}),
         Entrance(RR_GV_GROTTO_LEDGE,  []{return true;}),
-        Entrance(RR_GV_FORTRESS_SIDE, []{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}),
+        Entrance(RR_GV_FORTRESS_SIDE, []{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->THRescuedAllCarpenters)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}),
+        Entrance(RR_GV_LOWER_STREAM,  []{return logic->IsChild;}), //can use cucco as child
     });
 
-    areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {
+    areaTable[RR_GV_UPPER_STREAM] = Region("GV Upper Stream", SCENE_GERUDO_VALLEY, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
         EventAccess(&logic->BeanPlantFairy,   []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
@@ -34,54 +36,62 @@ void RegionTable_Init_GerudoValley() {
         LOCATION(RC_GV_GOSSIP_STONE_FAIRY,         logic->CallGossipFairy()),
         LOCATION(RC_GV_GOSSIP_STONE_FAIRY_BIG,     logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_GV_GOSSIP_STONE,               true),
+        LOCATION(RC_GV_NEAR_COW_CRATE,             logic->IsChild && logic->CanBreakCrates()),
     }, {
         //Exits
-        Entrance(RR_GV_LOWER_STREAM, []{return true;}),
+        Entrance(RR_GV_LOWER_STREAM, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
     });
 
-    areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {}, {
+    // scale/boots logic is outside lower stream, as lower stream combines access to lake hylia for entrance randomizer's sake
+    areaTable[RR_GV_LOWER_STREAM] = Region("GV Lower Stream", SCENE_GERUDO_VALLEY, {}, {}, {
         //Exits
-        Entrance(RR_LAKE_HYLIA, []{return logic->IsChild || logic->HasItem(RG_BRONZE_SCALE);}),//can use cucco as child
+        Entrance(RR_LAKE_HYLIA, []{return true;}),
     });
 
-    areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GV_GROTTO_LEDGE] = Region("GV Grotto Ledge", SCENE_GERUDO_VALLEY, {}, {}, {
         //Exits
-        Entrance(RR_GV_LOWER_STREAM,   []{return true;}),
+        Entrance(RR_GV_UPPER_STREAM,   []{return ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives();}),
+        Entrance(RR_GV_LOWER_STREAM,   []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
         Entrance(RR_GV_OCTOROK_GROTTO, []{return logic->CanUse(RG_SILVER_GAUNTLETS);}),
         Entrance(RR_GV_CRATE_LEDGE,    []{return logic->CanUse(RG_LONGSHOT);}),
     });
 
-    areaTable[RR_GV_CRATE_LEDGE] = Region("GV Crate Ledge", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GV_CRATE_LEDGE] = Region("GV Crate Ledge", SCENE_GERUDO_VALLEY, {}, {
         //Locations
-        LOCATION(RC_GV_CRATE_FREESTANDING_POH, true),
+        LOCATION(RC_GV_CRATE_FREESTANDING_POH, logic->CanBreakCrates()),
+        LOCATION(RC_GV_FREESTANDING_POH_CRATE, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_GV_UPPER_STREAM, []{return ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives();}),
-        Entrance(RR_GV_LOWER_STREAM, []{return true;}),
+        Entrance(RR_GV_LOWER_STREAM, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
     });
 
-    areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", "Gerudo Valley", {RA_GERUDO_VALLEY}, DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GV_FORTRESS_SIDE] = Region("GV Fortress Side", SCENE_GERUDO_VALLEY, {}, {
         //Locations
         LOCATION(RC_GV_CHEST,          logic->IsAdult && logic->CanUse(RG_MEGATON_HAMMER)),
         LOCATION(RC_GV_TRADE_SAW,      logic->IsAdult && logic->CanUse(RG_POACHERS_SAW)),
         LOCATION(RC_GV_GS_BEHIND_TENT, logic->IsAdult && logic->HookshotOrBoomerang() && logic->CanGetNightTimeGS()),
         LOCATION(RC_GV_GS_PILLAR,      logic->IsAdult && logic->HookshotOrBoomerang() && logic->CanGetNightTimeGS()),
+        LOCATION(RC_GV_CRATE_BRIDGE_1, logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_GV_CRATE_BRIDGE_2, logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_GV_CRATE_BRIDGE_3, logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_GV_CRATE_BRIDGE_4, logic->IsChild && logic->CanBreakCrates()),
     }, {
         //Exits
-        Entrance(RR_GERUDO_FORTRESS,   []{return true;}),
+        Entrance(RR_GF_OUTSKIRTS,  []{return true;}),
         Entrance(RR_GV_UPPER_STREAM,   []{return true;}),
-        Entrance(RR_GERUDO_VALLEY,     []{return logic->IsChild || logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CarpenterRescue;}),
+        Entrance(RR_GERUDO_VALLEY,     []{return logic->IsChild || logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->THRescuedAllCarpenters;}),
         Entrance(RR_GV_CARPENTER_TENT, []{return logic->IsAdult;}),
         Entrance(RR_GV_STORMS_GROTTO,  []{return logic->IsAdult && logic->CanOpenStormsGrotto();}),
         Entrance(RR_GV_CRATE_LEDGE,    []{return ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives();}),
     });
 
-    areaTable[RR_GV_CARPENTER_TENT] = Region("GV Carpenter Tent", "GV Carpenter Tent", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GV_CARPENTER_TENT] = Region("GV Carpenter Tent", SCENE_CARPENTERS_TENT, {}, {}, {
         //Exits
         Entrance(RR_GV_FORTRESS_SIDE, []{return true;}),
     });
 
-    areaTable[RR_GV_OCTOROK_GROTTO] = Region("GV Octorok Grotto", "GV Octorok Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GV_OCTOROK_GROTTO] = Region("GV Octorok Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_GV_OCTOROK_GROTTO_FRONT_LEFT_BLUE_RUPEE,   logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
         LOCATION(RC_GV_OCTOROK_GROTTO_FRONT_RIGHT_BLUE_RUPEE,  logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG)),
@@ -96,7 +106,7 @@ void RegionTable_Init_GerudoValley() {
         Entrance(RR_GV_GROTTO_LEDGE, []{return true;}),
     });
 
-    areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", "GV Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GV_STORMS_GROTTO] = Region("GV Storms Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_GV_DEKU_SCRUB_GROTTO_REAR,    logic->CanStunDeku()),
         LOCATION(RC_GV_DEKU_SCRUB_GROTTO_FRONT,   logic->CanStunDeku()),
@@ -105,4 +115,6 @@ void RegionTable_Init_GerudoValley() {
         //Exits
         Entrance(RR_GV_FORTRESS_SIDE, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/goron_city.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/goron_city.cpp
index 722402ae9f..7027ab6c6f 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/goron_city.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/goron_city.cpp
@@ -4,15 +4,18 @@
 using namespace Rando;
 
 void RegionTable_Init_GoronCity() {
-    areaTable[RR_GORON_CITY] = Region("Goron City", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_GORON_CITY] = Region("Goron City", SCENE_GORON_CITY, {
         //Events
         EventAccess(&logic->GossipStoneFairy,          []{return logic->CallGossipFairyExceptSuns();}),
-        EventAccess(&logic->StickPot,                  []{return logic->StickPot                  || logic->IsChild;}),
-        EventAccess(&logic->BugRock,                   []{return logic->BugRock                   || (logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS));}),
-        EventAccess(&logic->GoronCityChildFire,        []{return logic->GoronCityChildFire        || (logic->IsChild && logic->CanUse(RG_DINS_FIRE));}),
-        EventAccess(&logic->GCWoodsWarpOpen,           []{return logic->GCWoodsWarpOpen           || (logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE) || logic->CanUse(RG_FAIRY_BOW) || logic->HasItem(RG_GORONS_BRACELET) || logic->GoronCityChildFire);}),
-        EventAccess(&logic->GCDaruniasDoorOpenChild,   []{return logic->GCDaruniasDoorOpenChild   || (logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY));}),
-        EventAccess(&logic->StopGCRollingGoronAsAdult, []{return logic->StopGCRollingGoronAsAdult || (logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_GC_LINK_GORON_DINS) && logic->CanUse(RG_DINS_FIRE))));}),
+        EventAccess(&logic->StickPot,                  []{return logic->IsChild;}),
+        EventAccess(&logic->BugRock,                   []{return logic->BlastOrSmash() || logic->CanUse(RG_SILVER_GAUNTLETS);}),
+        EventAccess(&logic->GoronCityChildFire,        []{return logic->IsChild && logic->CanUse(RG_DINS_FIRE);}),
+        EventAccess(&logic->GCWoodsWarpOpen,           []{return logic->CanDetonateUprightBombFlower() || logic->CanUse(RG_MEGATON_HAMMER) || logic->GoronCityChildFire;}),
+        EventAccess(&logic->GCDaruniasDoorOpenChild,   []{return logic->IsChild && logic->CanUse(RG_ZELDAS_LULLABY);}),
+        // bottle animation causes similar complications as stopping goron with Din's Fire, only put in logic when both din's & blue fire tricks enabled
+        EventAccess(&logic->StopGCRollingGoronAsAdult, []{return logic->IsAdult && (logic->HasItem(RG_GORONS_BRACELET) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) ||
+                                                                                   (ctx->GetTrickOption(RT_GC_LINK_GORON_DINS) && (logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && logic->CanUse(RG_BOTTLE_WITH_BLUE_FIRE)))));}),
     }, {
         //Locations
         LOCATION(RC_GC_MAZE_LEFT_CHEST,             logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_SILVER_GAUNTLETS) || (ctx->GetTrickOption(RT_GC_LEFTMOST) && logic->HasExplosives() && logic->CanUse(RG_HOVER_BOOTS))),
@@ -32,6 +35,8 @@ void RegionTable_Init_GoronCity() {
         LOCATION(RC_GC_UPPER_STAIRCASE_POT_1,       logic->CanBreakPots()),
         LOCATION(RC_GC_UPPER_STAIRCASE_POT_2,       logic->CanBreakPots()),
         LOCATION(RC_GC_UPPER_STAIRCASE_POT_3,       logic->CanBreakPots()),
+        LOCATION(RC_GC_MAZE_CRATE,                  logic->BlastOrSmash()  || (logic->CanUse(RG_SILVER_GAUNTLETS) && logic->CanBreakCrates())),
+
     }, {
         //Exits
         Entrance(RR_DEATH_MOUNTAIN_TRAIL, []{return true;}),
@@ -42,7 +47,7 @@ void RegionTable_Init_GoronCity() {
         Entrance(RR_GC_GROTTO_PLATFORM,   []{return logic->IsAdult && ((logic->CanUse(RG_SONG_OF_TIME) && ((logic->EffectiveHealth() > 2) || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_NAYRUS_LOVE))) || (logic->EffectiveHealth() > 1 && logic->CanUse(RG_GORON_TUNIC) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_NAYRUS_LOVE) && logic->CanUse(RG_HOOKSHOT)) || (logic->EffectiveHealth() > 2 && logic->CanUse(RG_HOOKSHOT) && ctx->GetTrickOption(RT_GC_GROTTO)));}),
     });
 
-    areaTable[RR_GC_MEDIGORON] = Region("GC Medigoron", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GC_MEDIGORON] = Region("GC Medigoron", SCENE_GORON_CITY, {}, {
         //Locations
         LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY,     logic->CallGossipFairyExceptSuns()),
         LOCATION(RC_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG, logic->CanUse(RG_SONG_OF_STORMS)),
@@ -53,18 +58,18 @@ void RegionTable_Init_GoronCity() {
         Entrance(RR_GORON_CITY, []{return true;}),
     });
 
-    areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GC_WOODS_WARP] = Region("GC Woods Warp", SCENE_GORON_CITY, {
         //Events
-        EventAccess(&logic->GCWoodsWarpOpen, []{return logic->GCWoodsWarpOpen || (logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE));}),
+        EventAccess(&logic->GCWoodsWarpOpen, []{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE);}),
     }, {}, {
         //Exits
         Entrance(RR_GORON_CITY,     []{return logic->CanLeaveForest() && logic->GCWoodsWarpOpen;}),
         Entrance(RR_THE_LOST_WOODS, []{return true;}),
     });
 
-    areaTable[RR_GC_DARUNIAS_CHAMBER] = Region("GC Darunias Chamber", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GC_DARUNIAS_CHAMBER] = Region("GC Darunias Chamber", SCENE_GORON_CITY, {
         //Events
-        EventAccess(&logic->GoronCityChildFire, []{return logic->GoronCityChildFire || (logic->IsChild && logic->CanUse(RG_STICKS));}),
+        EventAccess(&logic->GoronCityChildFire, []{return logic->IsChild && logic->CanUse(RG_STICKS);}),
     }, {
         //Locations
         LOCATION(RC_GC_DARUNIAS_JOY,  logic->IsChild && logic->CanUse(RG_SARIAS_SONG)),
@@ -77,13 +82,13 @@ void RegionTable_Init_GoronCity() {
         Entrance(RR_DMC_LOWER_LOCAL, []{return logic->IsAdult;}),
     });
 
-    areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", "Goron City", {RA_GORON_CITY}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_GC_GROTTO_PLATFORM] = Region("GC Grotto Platform", SCENE_GORON_CITY, {}, {}, {
         //Exits
         Entrance(RR_GC_GROTTO,  []{return true;}),
         Entrance(RR_GORON_CITY, []{return logic->EffectiveHealth() > 2 || logic->CanUse(RG_GORON_TUNIC) || logic->CanUse(RG_NAYRUS_LOVE) || ((logic->IsChild || logic->CanUse(RG_SONG_OF_TIME)) && logic->CanUse(RG_LONGSHOT));}),
     });
 
-    areaTable[RR_GC_SHOP] = Region("GC Shop", "GC Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GC_SHOP] = Region("GC Shop", SCENE_GORON_SHOP, {}, {
         //Locations
         LOCATION(RC_GC_SHOP_ITEM_1, true),
         LOCATION(RC_GC_SHOP_ITEM_2, true),
@@ -98,7 +103,7 @@ void RegionTable_Init_GoronCity() {
         Entrance(RR_GORON_CITY, []{return true;}),
     });
 
-    areaTable[RR_GC_GROTTO] = Region("GC Grotto", "GC Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GC_GROTTO] = Region("GC Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_GC_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
         LOCATION(RC_GC_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -108,4 +113,6 @@ void RegionTable_Init_GoronCity() {
         //Exits
         Entrance(RR_GC_GROTTO_PLATFORM, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/graveyard.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/graveyard.cpp
index 87a2e3b48d..763d125757 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/graveyard.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/graveyard.cpp
@@ -4,20 +4,34 @@
 using namespace Rando;
 
 void RegionTable_Init_Graveyard() {
-    areaTable[RR_THE_GRAVEYARD] = Region("The Graveyard", "The Graveyard", {RA_THE_GRAVEYARD}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_THE_GRAVEYARD] = Region("The Graveyard", SCENE_GRAVEYARD, {
         //Events
-        EventAccess(&logic->ButterflyFairy, []{return logic->ButterflyFairy || (logic->CanUse(RG_STICKS) && logic->AtDay);}),
+        EventAccess(&logic->ButterflyFairy, []{return logic->CanUse(RG_STICKS) && logic->AtDay;}),
         EventAccess(&logic->BeanPlantFairy, []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
         EventAccess(&logic->BugRock,        []{return true;}),
     }, {
         //Locations
-        LOCATION(RC_GRAVEYARD_FREESTANDING_POH,        (logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_GRAVEYARD_FREESTANDING_POH,        (((logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT)) && logic->CanBreakCrates()) || (ctx->GetTrickOption(RT_GY_POH) && logic->CanUse(RG_BOOMERANG))),
         LOCATION(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR, logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtNight), //TODO: This needs to change
         LOCATION(RC_GRAVEYARD_GS_WALL,                 logic->IsChild && logic->HookshotOrBoomerang() && logic->AtNight && logic->CanGetNightTimeGS()),
         LOCATION(RC_GRAVEYARD_GS_BEAN_PATCH,           logic->CanSpawnSoilSkull() && logic->CanAttack()),
         LOCATION(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_1,     logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_2,     logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_GRAVEYARD_BEAN_SPROUT_FAIRY_3,     logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_GY_GRASS_1,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_2,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_3,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_4,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_5,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_6,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_7,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_8,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_9,                        logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_10,                       logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_11,                       logic->CanCutShrubs()),
+        LOCATION(RC_GY_GRASS_12,                       logic->CanCutShrubs()),
+        LOCATION(RC_GRAVEYARD_CRATE,                   ((logic->IsAdult && CanPlantBean(RR_THE_GRAVEYARD)) || logic->CanUse(RG_LONGSHOT)) && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_GRAVEYARD_SHIELD_GRAVE,       []{return logic->IsAdult || logic->AtNight;}),
@@ -29,7 +43,7 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_GRAVEYARD_WARP_PAD_REGION,    []{return false;}),
     });
 
-    areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Region("Graveyard Shield Grave", "Graveyard Shield Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GRAVEYARD_SHIELD_GRAVE] = Region("Graveyard Shield Grave", SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, {}, {
         //Locations
         LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_CHEST, true),
     }, {
@@ -38,7 +52,7 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_GRAVEYARD_SHIELD_GRAVE_BACK, []{return Here(RR_GRAVEYARD_SHIELD_GRAVE, []{return logic->CanBreakMudWalls();});}),
     });
 
-    areaTable[RR_GRAVEYARD_SHIELD_GRAVE_BACK] = Region("Graveyard Shield Grave Back", "Graveyard Shield Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GRAVEYARD_SHIELD_GRAVE_BACK] = Region("Graveyard Shield Grave Back", SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, {}, {
         //Locations
         LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_1, true),
         LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_2, true),
@@ -50,10 +64,10 @@ void RegionTable_Init_Graveyard() {
         LOCATION(RC_GRAVEYARD_SHIELD_GRAVE_FAIRY_8, true),
     }, {
         //Exits
-        Entrance(RR_THE_GRAVEYARD, []{return true;}),
+        Entrance(RR_GRAVEYARD_SHIELD_GRAVE, []{return true;}),
     });
 
-    areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Region("Graveyard Heart Piece Grave", "Graveyard Heart Piece Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GRAVEYARD_HEART_PIECE_GRAVE] = Region("Graveyard Heart Piece Grave", SCENE_REDEAD_GRAVE, {}, {
         //Locations
         LOCATION(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST, logic->CanUse(RG_SUNS_SONG)),
     }, {
@@ -61,20 +75,20 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_THE_GRAVEYARD, []{return true;}),
     });
 
-    areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", "Graveyard Composers Grave", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GRAVEYARD_COMPOSERS_GRAVE] = Region("Graveyard Composers Grave", SCENE_ROYAL_FAMILYS_TOMB, {}, {
         //Locations
         LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,     logic->HasFireSource()),
-        LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,           logic->CanUseProjectile() || logic->CanJumpslash()), 
+        LOCATION(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,           logic->CanUseProjectile() || logic->CanJumpslash()),
         LOCATION(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
     }, {
         //Exits
         Entrance(RR_THE_GRAVEYARD, []{return true;}),
     });
 
-    areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Region("Graveyard Dampes Grave", "Windmill and Dampes Grave", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GRAVEYARD_DAMPES_GRAVE] = Region("Graveyard Dampes Grave", SCENE_WINDMILL_AND_DAMPES_GRAVE, {
         //Events
         EventAccess(&logic->NutPot,               []{return true;}),
-        EventAccess(&logic->DampesWindmillAccess, []{return logic->DampesWindmillAccess || (logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME));}),
+        EventAccess(&logic->DampesWindmillAccess, []{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}),
     }, {
         //Locations
         LOCATION(RC_GRAVEYARD_HOOKSHOT_CHEST,              true),
@@ -99,7 +113,7 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_KAK_WINDMILL,  []{return logic->IsAdult && logic->CanUse(RG_SONG_OF_TIME);}, false),
     });
 
-    areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Region("Graveyard Dampes House", "Graveyard Dampes House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_GRAVEYARD_DAMPES_HOUSE] = Region("Graveyard Dampes House", SCENE_GRAVEKEEPERS_HUT, {}, {
         //Locations
         LOCATION(RC_DAMPE_HINT, logic->IsAdult),
     }, {
@@ -107,7 +121,7 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_THE_GRAVEYARD, []{return true;}),
     });
 
-    areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", "Graveyard", {RA_THE_GRAVEYARD}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_GRAVEYARD_WARP_PAD_REGION] = Region("Graveyard Warp Pad Region", SCENE_GRAVEYARD, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairyExceptSuns();}),
     }, {
@@ -120,4 +134,6 @@ void RegionTable_Init_Graveyard() {
         Entrance(RR_THE_GRAVEYARD,          []{return true;}),
         Entrance(RR_SHADOW_TEMPLE_ENTRYWAY, []{return logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_GY_SHADOW_FIRE_ARROWS) && logic->IsAdult && logic->CanUse(RG_FIRE_ARROWS));}),
     });
+
+    // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/haunted_wasteland.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/haunted_wasteland.cpp
index abedcc571c..930ffcb4f6 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/haunted_wasteland.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/haunted_wasteland.cpp
@@ -4,13 +4,18 @@
 using namespace Rando;
 
 void RegionTable_Init_HauntedWasteland() {
-    areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    // clang-format off
+    areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", SCENE_HAUNTED_WASTELAND, {},
+    {
+        //Locations
+        LOCATION(RC_HW_BEFORE_QUICKSAND_CRATE, logic->CanBreakCrates()),
+    }, {
         //Exits
         Entrance(RR_GF_OUTSIDE_GATE,   []{return true;}),
         Entrance(RR_HAUNTED_WASTELAND, []{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}),
     });
 
-    areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", SCENE_HAUNTED_WASTELAND, {
         //Events
         EventAccess(&logic->FairyPot,       []{return true;}),
         EventAccess(&logic->NutPot,         []{return true;}),
@@ -24,15 +29,23 @@ void RegionTable_Init_HauntedWasteland() {
         LOCATION(RC_WASTELAND_NEAR_GS_POT_2,    logic->CanBreakPots()),
         LOCATION(RC_WASTELAND_NEAR_GS_POT_3,    logic->CanBreakPots()),
         LOCATION(RC_WASTELAND_NEAR_GS_POT_4,    logic->CanBreakPots()),
+        LOCATION(RC_HW_AFTER_QUICKSAND_CRATE_1, logic->CanBreakCrates()),
+        LOCATION(RC_HW_AFTER_QUICKSAND_CRATE_2, logic->CanBreakCrates()),
+        LOCATION(RC_HW_AFTER_QUICKSAND_CRATE_3, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_WASTELAND_NEAR_COLOSSUS, []{return ctx->GetTrickOption(RT_LENS_HW) || logic->CanUse(RG_LENS_OF_TRUTH);}),
         Entrance(RR_WASTELAND_NEAR_FORTRESS, []{return logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_HW_CROSSING);}),
     });
 
-    areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", "Haunted Wasteland", {RA_HAUNTED_WASTELAND}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_WASTELAND_NEAR_COLOSSUS] = Region("Wasteland Near Colossus", SCENE_HAUNTED_WASTELAND, {}, {
+        //Locations
+        LOCATION(RC_HW_NEAR_COLOSSUS_CRATE, logic->CanBreakCrates()),
+    }, {
         //Exits
         Entrance(RR_DESERT_COLOSSUS,   []{return true;}),
         Entrance(RR_HAUNTED_WASTELAND, []{return ctx->GetTrickOption(RT_HW_REVERSE) || false;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/hyrule_field.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/hyrule_field.cpp
index d73c091628..5bc3aeb269 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/hyrule_field.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/hyrule_field.cpp
@@ -4,14 +4,63 @@
 using namespace Rando;
 
 void RegionTable_Init_HyruleField() {
-    areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", "Hyrule Field", {RA_HYRULE_FIELD}, DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_HYRULE_FIELD] = Region("Hyrule Field", SCENE_HYRULE_FIELD, {
         //Events
-        EventAccess(&logic->BigPoeKill, []{return logic->CanUse(RG_FAIRY_BOW) && logic->CanUse(RG_EPONA) && logic->HasBottle();}),
+        EventAccess(&logic->BigPoeKill, []{return logic->HasBottle() && logic->CanUse(RG_FAIRY_BOW) && (logic->CanUse(RG_EPONA) || ctx->GetTrickOption(RT_HF_BIG_POE_WITHOUT_EPONA));}),
     }, {
         //Locations
         LOCATION(RC_HF_OCARINA_OF_TIME_ITEM,   logic->IsChild && logic->StoneCount() == 3 && logic->HasItem(RG_BRONZE_SCALE)),
         LOCATION(RC_SONG_FROM_OCARINA_OF_TIME, logic->IsChild && logic->StoneCount() == 3 && logic->HasItem(RG_BRONZE_SCALE)),
         LOCATION(RC_HF_POND_STORMS_FAIRY,      logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_HF_CENTRAL_GRASS_1,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_2,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_3,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_4,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_5,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_6,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_7,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_8,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_9,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_10,       logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_11,       logic->CanCutShrubs()),
+        LOCATION(RC_HF_CENTRAL_GRASS_12,       logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_1,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_2,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_3,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_4,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_5,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_6,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_7,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_8,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_9,          logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_10,         logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_11,         logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTH_GRASS_12,         logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_1,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_2,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_3,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_4,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_5,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_6,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_7,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_8,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_9,    logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_10,   logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_11,   logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GRASS_12,   logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_1,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_2,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_3,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_4,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_5,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_6,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_7,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_8,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_9,        logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_10,       logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_11,       logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_KF_GRASS_12,       logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_LW_BRIDGE,              []{return true;}),
@@ -31,7 +80,7 @@ void RegionTable_Init_HyruleField() {
         Entrance(RR_HF_TEKTITE_GROTTO,      []{return logic->CanOpenBombGrotto();}),
     });
 
-    areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", "HF Southeast Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_HF_SOUTHEAST_GROTTO] = Region("HF Southeast Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_HF_SOUTHEAST_GROTTO_CHEST,                  true),
         LOCATION(RC_HF_SOUTHEAST_GROTTO_FISH,                   logic->HasBottle()),
@@ -40,12 +89,16 @@ void RegionTable_Init_HyruleField() {
         LOCATION(RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_HF_SOUTHEAST_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTHEAST_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTHEAST_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_SOUTHEAST_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", "HF Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_HF_OPEN_GROTTO] = Region("HF Open Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_HF_OPEN_GROTTO_CHEST,                   true),
         LOCATION(RC_HF_OPEN_GROTTO_FISH,                    logic->HasBottle()),
@@ -54,12 +107,16 @@ void RegionTable_Init_HyruleField() {
         LOCATION(RC_HF_OPEN_GROTTO_GOSSIP_STONE,            true),
         LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,            logic->CanBreakLowerBeehives()),
         LOCATION(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,           logic->CanBreakLowerBeehives()),
+        LOCATION(RC_HF_OPEN_GROTTO_GRASS_1,                 logic->CanCutShrubs()),
+        LOCATION(RC_HF_OPEN_GROTTO_GRASS_2,                 logic->CanCutShrubs()),
+        LOCATION(RC_HF_OPEN_GROTTO_GRASS_3,                 logic->CanCutShrubs()),
+        LOCATION(RC_HF_OPEN_GROTTO_GRASS_4,                 logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", "HF Inside Fence Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HF_INSIDE_FENCE_GROTTO] = Region("HF Inside Fence Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_HF_DEKU_SCRUB_GROTTO,           logic->CanStunDeku()),
         LOCATION(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, logic->CanBreakLowerBeehives()),
@@ -69,13 +126,13 @@ void RegionTable_Init_HyruleField() {
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", "HF Cow Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_HF_COW_GROTTO] = Region("HF Cow Grotto", SCENE_GROTTOS, {}, {}, {
         //Exits
         Entrance(RR_HYRULE_FIELD,              []{return true;}),
         Entrance(RR_HF_COW_GROTTO_BEHIND_WEBS, []{return logic->HasFireSource();}),
     });
 
-    areaTable[RR_HF_COW_GROTTO_BEHIND_WEBS] = Region("HF Cow Grotto Behind Webs", "HF Cow Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_HF_COW_GROTTO_BEHIND_WEBS] = Region("HF Cow Grotto Behind Webs", SCENE_GROTTOS, {
         //Events
         EventAccess(&logic->BugShrub,         []{return logic->CanCutShrubs();}),
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
@@ -88,12 +145,14 @@ void RegionTable_Init_HyruleField() {
         LOCATION(RC_HF_COW_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_HF_COW_GROTTO_POT_1,                  logic->CanBreakPots()),
         LOCATION(RC_HF_COW_GROTTO_POT_2,                  logic->CanBreakPots()),
+        LOCATION(RC_HF_COW_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_COW_GROTTO_GRASS_2,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_HF_COW_GROTTO, []{return true;}),
     });
 
-    areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", "HF Near Market Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_HF_NEAR_MARKET_GROTTO] = Region("HF Near Market Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_HF_NEAR_MARKET_GROTTO_CHEST,                  true),
         LOCATION(RC_HF_NEAR_MARKET_GROTTO_FISH,                   logic->HasBottle()),
@@ -102,12 +161,16 @@ void RegionTable_Init_HyruleField() {
         LOCATION(RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_HF_NEAR_MARKET_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_HF_NEAR_MARKET_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_FAIRY_GROTTO] = Region("HF Fairy Grotto", "HF Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_HF_FAIRY_GROTTO] = Region("HF Fairy Grotto", SCENE_GROTTOS, {
         //Events
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -125,7 +188,7 @@ void RegionTable_Init_HyruleField() {
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", "HF Near Kak Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HF_NEAR_KAK_GROTTO] = Region("HF Near Kak Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_HF_GS_NEAR_KAK_GROTTO, logic->HookshotOrBoomerang()),
     }, {
@@ -133,11 +196,13 @@ void RegionTable_Init_HyruleField() {
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", "HF Tektite Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_HF_TEKTITE_GROTTO] = Region("HF Tektite Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_HF_TEKTITE_GROTTO_FREESTANDING_POH, logic->HasItem(RG_GOLDEN_SCALE) || logic->CanUse(RG_IRON_BOOTS)),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/kakariko.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/kakariko.cpp
index aff90914e1..13490c9a44 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/kakariko.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/kakariko.cpp
@@ -4,32 +4,59 @@
 using namespace Rando;
 
 void RegionTable_Init_Kakariko() {
-    areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_KAKARIKO_VILLAGE] = Region("Kakariko Village", SCENE_KAKARIKO_VILLAGE, {
         //Events
         EventAccess(&logic->BugRock,                 []{return true;}),
-        //Open Gate setting is applies in RR_ROOT
+        //Open Gate setting is applied in RR_ROOT
         EventAccess(&logic->KakarikoVillageGateOpen, []{return logic->IsChild && logic->HasItem(RG_ZELDAS_LETTER);}),
     }, {
         //Locations
-        LOCATION(RC_SHEIK_IN_KAKARIKO,               logic->IsAdult && logic->HasItem(RG_FOREST_MEDALLION) && logic->HasItem(RG_FIRE_MEDALLION) && logic->HasItem(RG_WATER_MEDALLION)),
-        LOCATION(RC_KAK_ANJU_AS_CHILD,               logic->IsChild && logic->AtDay),
-        LOCATION(RC_KAK_ANJU_AS_ADULT,               logic->IsAdult && logic->AtDay),
-        LOCATION(RC_KAK_TRADE_POCKET_CUCCO,          logic->IsAdult && logic->AtDay && (logic->CanUse(RG_POCKET_EGG) && logic->WakeUpAdultTalon)),
+        LOCATION(RC_SHEIK_IN_KAKARIKO,                     logic->IsAdult && logic->HasItem(RG_FOREST_MEDALLION) && logic->HasItem(RG_FIRE_MEDALLION) && logic->HasItem(RG_WATER_MEDALLION)),
+        LOCATION(RC_KAK_ANJU_AS_CHILD,                     logic->IsChild && logic->AtDay),
+        LOCATION(RC_KAK_ANJU_AS_ADULT,                     logic->IsAdult && logic->AtDay),
+        LOCATION(RC_KAK_TRADE_POCKET_CUCCO,                logic->IsAdult && logic->AtDay && (logic->CanUse(RG_POCKET_EGG) && logic->WakeUpAdultTalon)),
         //Can kill lower kak skulls with pots
-        LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION, logic->IsChild && logic->CanGetNightTimeGS()),
-        LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,          logic->IsChild && logic->CanGetNightTimeGS()),
-        LOCATION(RC_KAK_GS_GUARDS_HOUSE,             logic->IsChild && logic->CanGetNightTimeGS()),
-        LOCATION(RC_KAK_GS_TREE,                     logic->IsChild && logic->CanGetNightTimeGS()),
-        LOCATION(RC_KAK_GS_WATCHTOWER,               logic->IsChild && (logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_LONGSHOT) || (ctx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslashExceptHammer())) && logic->CanGetNightTimeGS()),
-        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_1,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_2,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_3,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_1,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_2,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_3,      logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_1,     logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_2,     logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_3,     logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_GS_HOUSE_UNDER_CONSTRUCTION,       logic->IsChild && logic->CanGetNightTimeGS()),
+        LOCATION(RC_KAK_GS_SKULLTULA_HOUSE,                logic->IsChild && logic->CanGetNightTimeGS()),
+        LOCATION(RC_KAK_GS_GUARDS_HOUSE,                   logic->IsChild && logic->CanGetNightTimeGS()),
+        LOCATION(RC_KAK_GS_TREE,                           logic->IsChild && logic->CanGetNightTimeGS()),
+        LOCATION(RC_KAK_GS_WATCHTOWER,                     logic->IsChild && (logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_LONGSHOT) || (ctx->GetTrickOption(RT_KAK_TOWER_GS) && logic->CanJumpslashExceptHammer())) && logic->CanGetNightTimeGS()),
+        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_1,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_2,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_POTION_SHOP_POT_3,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_1,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_2,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_POT_3,            logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_1,           logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_2,           logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_NEAR_GUARDS_HOUSE_POT_3,           logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_KAK_GRASS_1,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_2,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_3,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_4,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_5,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_6,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_7,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_GRASS_8,                           logic->CanCutShrubs()),
+        LOCATION(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_POTION_SHOP_ADULT_CRATE,      logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE, logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1, logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2, logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2,    logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BAZAAR_ADULT_CRATE_1,         logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BAZAAR_ADULT_CRATE_2,         logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_BEHIND_GS_HOUSE_ADULT_CRATE,       logic->IsAdult && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_GY_CHILD_CRATE,               logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_WINDMILL_CHILD_CRATE,         logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_FENCE_CHILD_CRATE,            logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE,   logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_KAK_NEAR_BAZAAR_CHILD_CRATE,           logic->IsChild && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD,             []{return true;}),
@@ -39,7 +66,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_WINDMILL,             []{return logic->CanOpenOverworldDoor(RG_WINDMILL_KEY);}),
         Entrance(RR_KAK_BAZAAR,               []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_BAZAAR_KEY);}),
         Entrance(RR_KAK_SHOOTING_GALLERY,     []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_SHOOTING_GALLERY_KEY);}),
-        Entrance(RR_KAK_WELL,                 []{return logic->IsAdult || logic->DrainWell || logic->CanUse(RG_IRON_BOOTS);}),
+        Entrance(RR_KAK_WELL,                 []{return logic->IsAdult || logic->DrainWell || logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_BOTTOM_OF_THE_WELL_NAVI_DIVE) && logic->IsChild && logic->HasItem(RG_BRONZE_SCALE) && logic->CanJumpslash());}),
         Entrance(RR_KAK_POTION_SHOP_FRONT,    []{return (logic->AtDay || logic->IsChild) && logic->CanOpenOverworldDoor(RG_KAK_POTION_SHOP_KEY);}),
         Entrance(RR_KAK_REDEAD_GROTTO,        []{return logic->CanOpenBombGrotto();}),
         Entrance(RR_KAK_IMPAS_LEDGE,          []{return (logic->IsChild && logic->AtDay) || (logic->IsAdult && ctx->GetTrickOption(RT_VISIBLE_COLLISION));}),
@@ -52,13 +79,13 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_BACKYARD,             []{return logic->IsAdult || logic->AtDay;}),
     });
 
-    areaTable[RR_KAK_IMPAS_LEDGE] = Region("Kak Impas Ledge", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_KAK_IMPAS_LEDGE] = Region("Kak Impas Ledge", SCENE_KAKARIKO_VILLAGE, {}, {}, {
         //Exits
         Entrance(RR_KAK_IMPAS_HOUSE_BACK, []{return true;}),
         Entrance(RR_KAKARIKO_VILLAGE,     []{return true;}),
     });
 
-    areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_IMPAS_ROOFTOP] = Region("Kak Impas Rooftop", SCENE_KAKARIKO_VILLAGE, {}, {
         //Locations
         LOCATION(RC_KAK_GS_ABOVE_IMPAS_HOUSE, logic->IsAdult && logic->CanGetNightTimeGS() && logic->CanKillEnemy(RE_GOLD_SKULLTULA)),
     }, {
@@ -67,7 +94,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_WATCHTOWER] = Region("Kak Watchtower", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_WATCHTOWER] = Region("Kak Watchtower", SCENE_KAKARIKO_VILLAGE, {}, {
         //Locations
         //exists for when age change is in logic.
         LOCATION(RC_KAK_GS_WATCHTOWER, logic->IsChild && logic->CanUse(RG_DINS_FIRE) && logic->CanGetNightTimeGS()),
@@ -77,7 +104,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_ROOFTOP,      []{return ctx->GetTrickOption(RT_KAK_MAN_ON_ROOF) && logic->IsChild;}),
     });
 
-    areaTable[RR_KAK_ROOFTOP] = Region("Kak Rooftop", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_ROOFTOP] = Region("Kak Rooftop", SCENE_KAKARIKO_VILLAGE, {}, {
         //Locations
         LOCATION(RC_KAK_MAN_ON_ROOF, true),
     }, {
@@ -86,7 +113,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_BACKYARD] = Region("Kak Backyard", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_BACKYARD] = Region("Kak Backyard", SCENE_KAKARIKO_VILLAGE, {}, {
         //Locations
         //There's probably a trick to get these with rang from the main region
         LOCATION(RC_KAK_NEAR_MEDICINE_SHOP_POT_1, logic->IsChild && logic->CanBreakPots()),
@@ -99,7 +126,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_POTION_SHOP_BACK,    []{return logic->IsAdult && logic->AtDay && logic->CanOpenOverworldDoor(RG_KAK_POTION_SHOP_KEY);}),
     });
 
-    areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", "Kak Carpenter Boss House", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_KAK_CARPENTER_BOSS_HOUSE] = Region("Kak Carpenter Boss House", SCENE_KAKARIKO_CENTER_GUEST_HOUSE, {
         //Events
         EventAccess(&logic->WakeUpAdultTalon, []{return logic->IsAdult && logic->CanUse(RG_POCKET_EGG);}),
     }, {}, {
@@ -107,7 +134,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", "Kak House of Skulltula", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_HOUSE_OF_SKULLTULA] = Region("Kak House of Skulltula", SCENE_HOUSE_OF_SKULLTULA, {}, {
         //Locations
         LOCATION(RC_KAK_10_GOLD_SKULLTULA_REWARD,  logic->GetGSCount() >= 10),
         LOCATION(RC_KAK_20_GOLD_SKULLTULA_REWARD,  logic->GetGSCount() >= 20),
@@ -120,7 +147,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_IMPAS_HOUSE] = Region("Kak Impas House", "Kak Impas House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_IMPAS_HOUSE] = Region("Kak Impas House", SCENE_IMPAS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KAK_IMPAS_HOUSE_COW, logic->CanUse(RG_EPONAS_SONG)),
     }, {
@@ -128,7 +155,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Region("Kak Impas House Back", "Kak Impas House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_IMPAS_HOUSE_BACK] = Region("Kak Impas House Back", SCENE_IMPAS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KAK_IMPAS_HOUSE_FREESTANDING_POH, true),
         LOCATION(RC_KAK_IMPAS_HOUSE_COW,              logic->CanUse(RG_EPONAS_SONG)),
@@ -137,9 +164,9 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_IMPAS_LEDGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_WINDMILL] = Region("Kak Windmill", "Windmill and Dampes Grave", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_KAK_WINDMILL] = Region("Kak Windmill", SCENE_WINDMILL_AND_DAMPES_GRAVE, {
         //Events
-        EventAccess(&logic->DrainWell, []{return logic->DrainWell || (logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS));}),
+        EventAccess(&logic->DrainWell, []{return logic->IsChild && logic->CanUse(RG_SONG_OF_STORMS);}),
     }, {
         //Locations
         LOCATION(RC_KAK_WINDMILL_FREESTANDING_POH, logic->CanUse(RG_BOOMERANG) || logic->DampesWindmillAccess || (logic->IsAdult && ctx->GetTrickOption(RT_KAK_ADULT_WINDMILL_POH)) || (logic->IsChild && logic->CanJumpslashExceptHammer() && ctx->GetTrickOption(RT_KAK_CHILD_WINDMILL_POH))),
@@ -149,7 +176,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_BAZAAR] = Region("Kak Bazaar", "Kak Bazaar", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_BAZAAR] = Region("Kak Bazaar", SCENE_BAZAAR, {}, {
         //Locations
         LOCATION(RC_KAK_BAZAAR_ITEM_1, true),
         LOCATION(RC_KAK_BAZAAR_ITEM_2, true),
@@ -164,7 +191,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", "Kak Shooting Gallery", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_SHOOTING_GALLERY] = Region("Kak Shooting Gallery", SCENE_SHOOTING_GALLERY, {}, {
         //Locations
         LOCATION(RC_KAK_SHOOTING_GALLERY_REWARD, logic->HasItem(RG_CHILD_WALLET) && logic->IsAdult && logic->CanUse(RG_FAIRY_BOW)),
     }, {
@@ -172,7 +199,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_POTION_SHOP_FRONT] = Region("Kak Potion Shop Front", "Kak Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_POTION_SHOP_FRONT] = Region("Kak Potion Shop Front", SCENE_POTION_SHOP_KAKARIKO, {}, {
         //Locations
         LOCATION(RC_KAK_POTION_SHOP_ITEM_1, logic->IsAdult),
         LOCATION(RC_KAK_POTION_SHOP_ITEM_2, logic->IsAdult),
@@ -188,13 +215,13 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_POTION_SHOP_BACK, []{return logic->IsAdult;}),
     });
 
-    areaTable[RR_KAK_POTION_SHOP_BACK] = Region("Kak Potion Shop Back", "Kak Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_KAK_POTION_SHOP_BACK] = Region("Kak Potion Shop Back", SCENE_POTION_SHOP_KAKARIKO, {}, {}, {
         //Exits
         Entrance(RR_KAK_BACKYARD,          []{return logic->IsAdult;}),
         Entrance(RR_KAK_POTION_SHOP_FRONT, []{return true;}),
     });
 
-    areaTable[RR_KAK_ODD_POTION_BUILDING] = Region("Kak Granny's Potion Shop", "Kak Granny's Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_KAK_ODD_POTION_BUILDING] = Region("Kak Granny's Potion Shop", SCENE_POTION_SHOP_GRANNY, {
         //Events
         // RANDOTODO blue pot access
     }, {
@@ -206,7 +233,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAK_BACKYARD, []{return true;}),
     });
 
-    areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", "Kak Redead Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KAK_REDEAD_GROTTO] = Region("Kak Redead Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_KAK_REDEAD_GROTTO_CHEST, logic->CanKillEnemy(RE_REDEAD, ED_CLOSE, true, 2)),
     }, {
@@ -214,7 +241,7 @@ void RegionTable_Init_Kakariko() {
         Entrance(RR_KAKARIKO_VILLAGE, []{return true;}),
     });
 
-    areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", "Kak Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_KAK_OPEN_GROTTO] = Region("Kak Open Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_KAK_OPEN_GROTTO_CHEST,                  true),
         LOCATION(RC_KAK_OPEN_GROTTO_FISH,                   logic->HasBottle()),
@@ -223,20 +250,26 @@ void RegionTable_Init_Kakariko() {
         LOCATION(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_KAK_OPEN_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_KAK_OPEN_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_KAK_OPEN_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_KAK_OPEN_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_KAK_BACKYARD, []{return true;}),
     });
 
-    areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_KAK_BEHIND_GATE] = Region("Kak Behind Gate", SCENE_KAKARIKO_VILLAGE, {}, {}, {
         //Exits
         Entrance(RR_KAKARIKO_VILLAGE,     []{return logic->IsAdult || ctx->GetTrickOption(RT_VISIBLE_COLLISION) || logic->KakarikoVillageGateOpen;}),
         Entrance(RR_DEATH_MOUNTAIN_TRAIL, []{return true;}),
     });
 
-    areaTable[RR_KAK_WELL] = Region("Kak Behind Gate", "Kakariko Village", {RA_KAKARIKO_VILLAGE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_KAK_WELL] = Region("Kak Well", SCENE_KAKARIKO_VILLAGE, {}, {}, {
         //Exits
         Entrance(RR_KAKARIKO_VILLAGE,            []{return logic->IsAdult || logic->HasItem(RG_BRONZE_SCALE) || logic->DrainWell;}),
         Entrance(RR_BOTTOM_OF_THE_WELL_ENTRYWAY, []{return logic->IsChild || (logic->DrainWell && ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF));}),
     });
+
+    // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp
index fd7c340deb..525e222009 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp
@@ -4,11 +4,12 @@
 using namespace Rando;
 
 void RegionTable_Init_KokiriForest() {
-    areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", "Kokiri Forest", {RA_KOKIRI_FOREST}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_KOKIRI_FOREST] = Region("Kokiri Forest", SCENE_KOKIRI_FOREST, {
         //Events
         EventAccess(&logic->BeanPlantFairy,           []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
         EventAccess(&logic->GossipStoneFairy,         []{return logic->CallGossipFairyExceptSuns();}),
-        EventAccess(&logic->ShowedMidoSwordAndShield, []{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD));}),
+        EventAccess(&logic->ShowedMidoSwordAndShield, []{return logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD);}),
     }, {
         //Locations
         LOCATION(RC_KF_KOKIRI_SWORD_CHEST,      logic->IsChild),
@@ -39,6 +40,41 @@ void RegionTable_Init_KokiriForest() {
         LOCATION(RC_KF_SARIAS_ROOF_EAST_HEART,  logic->IsChild),
         LOCATION(RC_KF_SARIAS_ROOF_NORTH_HEART, logic->IsChild),
         LOCATION(RC_KF_GOSSIP_STONE,            true),
+        LOCATION(RC_KF_CHILD_GRASS_1,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_2,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_3,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_4,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_5,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_6,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_7,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_8,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_9,           logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_10,          logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_11,          logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_12,          logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_MAZE_1,      logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_MAZE_2,      logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_CHILD_GRASS_MAZE_3,      logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_1,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_2,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_3,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_4,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_5,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_6,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_7,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_8,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_9,           logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_10,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_11,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_12,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_13,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_14,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_15,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_16,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_17,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_18,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_19,          logic->IsAdult && logic->CanCutShrubs()),
+        LOCATION(RC_KF_ADULT_GRASS_20,          logic->IsAdult && logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_KF_LINKS_HOUSE,        []{return true;}),
@@ -53,11 +89,11 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KF_STORMS_GROTTO,      []{return logic->CanOpenStormsGrotto();}),
     });
 
-    areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", "Kokiri Forest", {RA_KOKIRI_FOREST}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_KF_OUTSIDE_DEKU_TREE] = Region("KF Outside Deku Tree", SCENE_KOKIRI_FOREST, {
         //Events
         EventAccess(&logic->DekuBabaSticks,           []{return logic->CanGetDekuBabaSticks();}),
         EventAccess(&logic->DekuBabaNuts,             []{return logic->CanGetDekuBabaNuts();}),
-        EventAccess(&logic->ShowedMidoSwordAndShield, []{return logic->ShowedMidoSwordAndShield || (logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD));}),
+        EventAccess(&logic->ShowedMidoSwordAndShield, []{return logic->IsChild && logic->CanUse(RG_KOKIRI_SWORD) && logic->CanUse(RG_DEKU_SHIELD);}),
     }, {
         //Locations
         LOCATION(RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY,      logic->CallGossipFairyExceptSuns()),
@@ -72,7 +108,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST,      []{return (logic->IsAdult && (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->ForestTempleClear)) || ctx->GetOption(RSK_FOREST).Is(RO_CLOSED_FOREST_OFF) || logic->ShowedMidoSwordAndShield;}),
     });
 
-    areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", SCENE_LINKS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow),
         LOCATION(RC_KF_LINKS_HOUSE_POT, logic->CanBreakPots()),
@@ -81,7 +117,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;})
     });
 
-    areaTable[RR_KF_MIDOS_HOUSE] = Region("KF Mido's House", "KF Mido's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_MIDOS_HOUSE] = Region("KF Mido's House", SCENE_MIDOS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KF_MIDOS_TOP_LEFT_CHEST,     true),
         LOCATION(RC_KF_MIDOS_TOP_RIGHT_CHEST,    true),
@@ -92,7 +128,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
-    areaTable[RR_KF_SARIAS_HOUSE] = Region("KF Saria's House", "KF Saria's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_SARIAS_HOUSE] = Region("KF Saria's House", SCENE_SARIAS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KF_SARIAS_TOP_LEFT_HEART,     true),
         LOCATION(RC_KF_SARIAS_TOP_RIGHT_HEART,    true),
@@ -103,7 +139,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
-    areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", "KF House of Twins", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", SCENE_TWINS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KF_TWINS_HOUSE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_KF_TWINS_HOUSE_POT_2, logic->CanBreakPots()),
@@ -112,7 +148,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
-    areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", "KF Know It All House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", SCENE_KNOW_IT_ALL_BROS_HOUSE, {}, {
         // Locations
         LOCATION(RC_KF_BROTHERS_HOUSE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_KF_BROTHERS_HOUSE_POT_2, logic->CanBreakPots()),
@@ -121,7 +157,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
-    areaTable[RR_KF_KOKIRI_SHOP] = Region("KF Kokiri Shop", "KF Kokiri Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_KF_KOKIRI_SHOP] = Region("KF Kokiri Shop", SCENE_KOKIRI_SHOP, {}, {
         //Locations
         LOCATION(RC_KF_SHOP_ITEM_1, true),
         LOCATION(RC_KF_SHOP_ITEM_2, true),
@@ -136,7 +172,7 @@ void RegionTable_Init_KokiriForest() {
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
-    areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", "KF Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_KF_STORMS_GROTTO] = Region("KF Storms Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_KF_STORMS_GROTTO_CHEST,                  true),
         LOCATION(RC_KF_STORMS_GROTTO_FISH,                   logic->HasBottle()),
@@ -145,8 +181,14 @@ void RegionTable_Init_KokiriForest() {
         LOCATION(RC_KF_STORMS_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_KF_STORMS_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_KF_STORMS_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_KF_STORMS_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_KF_STORMS_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_KOKIRI_FOREST, []{return true;})
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/lake_hylia.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/lake_hylia.cpp
index 447d039d25..964b781cee 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/lake_hylia.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/lake_hylia.cpp
@@ -4,14 +4,15 @@
 using namespace Rando;
 
 void RegionTable_Init_LakeHylia() {
-    areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", "Lake Hylia", {RA_LAKE_HYLIA}, DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_LAKE_HYLIA] = Region("Lake Hylia", SCENE_LAKE_HYLIA, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
         EventAccess(&logic->BeanPlantFairy,   []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
-        EventAccess(&logic->ButterflyFairy,   []{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}),
-        EventAccess(&logic->BugShrub,         []{return logic->BugShrub         || (logic->IsChild && logic->CanCutShrubs());}),
-        EventAccess(&logic->ChildScarecrow,   []{return logic->ChildScarecrow   || (logic->IsChild && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2);}),
-        EventAccess(&logic->AdultScarecrow,   []{return logic->AdultScarecrow   || (logic->IsAdult && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2);}),
+        EventAccess(&logic->ButterflyFairy,   []{return logic->CanUse(RG_STICKS);}),
+        EventAccess(&logic->BugShrub,         []{return logic->IsChild && logic->CanCutShrubs();}),
+        EventAccess(&logic->ChildScarecrow,   []{return logic->IsChild && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2;}),
+        EventAccess(&logic->AdultScarecrow,   []{return logic->IsAdult && logic->HasItem(RG_FAIRY_OCARINA) && logic->OcarinaButtons() >= 2;}),
     }, {
         //Locations
         LOCATION(RC_LH_UNDERWATER_ITEM,                  logic->IsChild && logic->HasItem(RG_SILVER_SCALE)),
@@ -38,43 +39,98 @@ void RegionTable_Init_LakeHylia() {
         LOCATION(RC_LH_LAB_GOSSIP_STONE,                 true),
         LOCATION(RC_LH_SOUTHEAST_GOSSIP_STONE,           true),
         LOCATION(RC_LH_SOUTHWEST_GOSSIP_STONE,           true),
+        LOCATION(RC_LH_GRASS_1,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_2,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_3,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_4,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_5,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_6,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_7,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_8,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_9,                          logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_10,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_11,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_12,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_13,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_14,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_15,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_16,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_17,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_18,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_19,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_20,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_21,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_22,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_23,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_24,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_25,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_26,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_27,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_28,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_29,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_30,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_31,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_32,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_33,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_34,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_35,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_GRASS_36,                         logic->CanCutShrubs()),
+        LOCATION(RC_LH_CHILD_GRASS_1,                    logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_LH_CHILD_GRASS_2,                    logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_LH_CHILD_GRASS_3,                    logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_LH_CHILD_GRASS_4,                    logic->IsChild && logic->CanCutShrubs()),
+        LOCATION(RC_LH_WARP_PAD_GRASS_1,                 logic->CanCutShrubs()),
+        LOCATION(RC_LH_WARP_PAD_GRASS_2,                 logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD,          []{return true;}),
-        Entrance(RR_ZORAS_DOMAIN,          []{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
+        Entrance(RR_LH_FROM_SHORTCUT,      []{return true;}),
         Entrance(RR_LH_OWL_FLIGHT,         []{return logic->IsChild;}),
         Entrance(RR_LH_FISHING_ISLAND,     []{return ((logic->IsChild || logic->WaterTempleClear) && logic->HasItem(RG_BRONZE_SCALE)) || (logic->IsAdult && (logic->CanUse(RG_SCARECROW) || CanPlantBean(RR_LAKE_HYLIA)));}),
         Entrance(RR_LH_LAB,                []{return logic->CanOpenOverworldDoor(RG_HYLIA_LAB_KEY);}),
-        Entrance(RR_WATER_TEMPLE_ENTRYWAY, []{return logic->CanUse(RG_HOOKSHOT) && ((logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && logic->HasItem(RG_GOLDEN_SCALE))) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->HasItem(RG_GOLDEN_SCALE)));}),
+        Entrance(RR_LH_FROM_WATER_TEMPLE,  []{return true;}),
         Entrance(RR_LH_GROTTO,             []{return true;}),
     });
 
-    areaTable[RR_LH_FISHING_ISLAND] = Region("LH Fishing Island", "Lake Hylia", {RA_LAKE_HYLIA}, DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_LH_FROM_SHORTCUT] = Region("LH From Shortcut", SCENE_LAKE_HYLIA, TIME_DOESNT_PASS, {RA_LAKE_HYLIA}, {}, {}, {
+        //Exits
+        Entrance(RR_LAKE_HYLIA,   []{return logic->Hearts() > 1 || logic->HasItem(RG_BOTTLE_WITH_FAIRY) || logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
+        Entrance(RR_ZORAS_DOMAIN, []{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
+    });
+
+    areaTable[RR_LH_FROM_WATER_TEMPLE] = Region("LH From Water Temple", SCENE_LAKE_HYLIA, TIME_DOESNT_PASS, {RA_LAKE_HYLIA}, {}, {}, {
+        //Exits
+        Entrance(RR_LAKE_HYLIA,            []{return logic->HasItem(RG_BRONZE_SCALE) || logic->HasItem(RG_BOTTLE_WITH_FAIRY) || logic->CanUse(RG_IRON_BOOTS);}),
+        Entrance(RR_WATER_TEMPLE_ENTRYWAY, []{return logic->CanUse(RG_HOOKSHOT) && ((logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_LH_WATER_HOOKSHOT) && logic->HasItem(RG_GOLDEN_SCALE))) || (logic->IsAdult && logic->CanUse(RG_LONGSHOT) && logic->HasItem(RG_GOLDEN_SCALE)));}),
+    });
+
+    areaTable[RR_LH_FISHING_ISLAND] = Region("LH Fishing Island", SCENE_LAKE_HYLIA, {}, {}, {
         //Exits
         Entrance(RR_LAKE_HYLIA,      []{return logic->HasItem(RG_BRONZE_SCALE);}),
         Entrance(RR_LH_FISHING_POND, []{return logic->CanOpenOverworldDoor(RG_FISHING_HOLE_KEY);}),
     });
 
-    areaTable[RR_LH_OWL_FLIGHT] = Region("LH Owl Flight", "Lake Hylia", {RA_LAKE_HYLIA}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_LH_OWL_FLIGHT] = Region("LH Owl Flight", SCENE_LAKE_HYLIA, {}, {}, {
         //Exits
         Entrance(RR_HYRULE_FIELD, []{return true;}, false),
     });
 
-    areaTable[RR_LH_LAB] = Region("LH Lab", "LH Lab", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LH_LAB] = Region("LH Lab", SCENE_LAKESIDE_LABORATORY, {}, {
         //Locations
-        LOCATION(RC_LH_LAB_DIVE,        logic->HasItem(RG_GOLDEN_SCALE) || (ctx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT))),
+        LOCATION(RC_LH_LAB_DIVE,        logic->HasItem(RG_GOLDEN_SCALE) || (ctx->GetTrickOption(RT_LH_LAB_DIVING) && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT) && logic->HasItem(RG_BRONZE_SCALE))),
         LOCATION(RC_LH_TRADE_FROG,      logic->IsAdult && logic->CanUse(RG_EYEBALL_FROG)),
-        LOCATION(RC_LH_GS_LAB_CRATE,    logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT)),
+        LOCATION(RC_LH_GS_LAB_CRATE,    logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_HOOKSHOT) && logic->CanBreakCrates()),
         LOCATION(RC_LH_LAB_FRONT_RUPEE, logic->CanUse(RG_IRON_BOOTS) || logic->HasItem(RG_GOLDEN_SCALE)),
         LOCATION(RC_LH_LAB_LEFT_RUPEE,  logic->CanUse(RG_IRON_BOOTS) || logic->HasItem(RG_GOLDEN_SCALE)),
         LOCATION(RC_LH_LAB_RIGHT_RUPEE, logic->CanUse(RG_IRON_BOOTS) || logic->HasItem(RG_GOLDEN_SCALE)),
+        LOCATION(RC_LH_LAB_CRATE,       logic->CanUse(RG_IRON_BOOTS) && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_LAKE_HYLIA, []{return true;}),
     });
 
     // TODO: should some of these helpers be done via events instead?
-    areaTable[RR_LH_FISHING_POND] = Region("LH Fishing Hole", "LH Fishing Hole", {}, DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LH_FISHING_POND] = Region("LH Fishing Hole", SCENE_FISHING_POND, {}, {
         //Locations
         LOCATION(RC_LH_CHILD_FISHING,  logic->CanUse(RG_FISHING_POLE) && logic->IsChild),
         LOCATION(RC_LH_CHILD_FISH_1,   logic->CanUse(RG_FISHING_POLE) && (logic->IsChild || !ctx->GetOption(RSK_FISHSANITY_AGE_SPLIT))),
@@ -118,7 +174,7 @@ void RegionTable_Init_LakeHylia() {
         Entrance(RR_LH_FISHING_ISLAND, []{return true;}),
     });
 
-    areaTable[RR_LH_GROTTO] = Region("LH Grotto", "LH Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LH_GROTTO] = Region("LH Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_LH_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
         LOCATION(RC_LH_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -128,4 +184,6 @@ void RegionTable_Init_LakeHylia() {
         //Exits
         Entrance(RR_LAKE_HYLIA, []{return true;}),
     });
+
+    // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp
index 2831504155..c29a5924eb 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp
@@ -4,10 +4,11 @@
 using namespace Rando;
 
 void RegionTable_Init_LonLonRanch() {
-    areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", "Lon Lon Ranch", {RA_LON_LON_RANCH}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_LON_LON_RANCH] = Region("Lon Lon Ranch", SCENE_LON_LON_RANCH, {
         //Events
-        EventAccess(&logic->FreedEpona, []{return logic->FreedEpona || ((logic->HasItem(RG_CHILD_WALLET) || ctx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}),
-        EventAccess(&logic->LinksCow,   []{return logic->LinksCow || (logic->HasItem(RG_CHILD_WALLET) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay);}),
+        EventAccess(&logic->FreedEpona, []{return (logic->HasItem(RG_CHILD_WALLET) || ctx->GetOption(RSK_SKIP_EPONA_RACE)) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay;}),
+        EventAccess(&logic->LinksCow,   []{return logic->HasItem(RG_CHILD_WALLET) && logic->CanUse(RG_EPONAS_SONG) && logic->IsAdult && logic->AtDay;}),
     }, {
         //Locations
         LOCATION(RC_SONG_FROM_MALON,     logic->IsChild && logic->HasItem(RG_ZELDAS_LETTER) && logic->HasItem(RG_FAIRY_OCARINA) && logic->AtDay),
@@ -22,6 +23,7 @@ void RegionTable_Init_LonLonRanch() {
         LOCATION(RC_LLR_RAIN_SHED_POT_1, logic->IsChild && logic->CanBreakPots()),
         LOCATION(RC_LLR_RAIN_SHED_POT_2, logic->IsChild && logic->CanBreakPots()),
         LOCATION(RC_LLR_RAIN_SHED_POT_3, logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_LLR_NEAR_TREE_CRATE, logic->IsChild && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_HYRULE_FIELD,     []{return true;}),
@@ -31,7 +33,7 @@ void RegionTable_Init_LonLonRanch() {
         Entrance(RR_LLR_GROTTO,       []{return logic->IsChild;}),
     });
 
-    areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", "LLR Talons House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", SCENE_LON_LON_BUILDINGS, {}, {
         //Locations
         LOCATION(RC_LLR_TALONS_CHICKENS,    logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER)),
         LOCATION(RC_LLR_TALONS_HOUSE_POT_1, logic->CanBreakPots()),
@@ -42,7 +44,7 @@ void RegionTable_Init_LonLonRanch() {
         Entrance(RR_LON_LON_RANCH, []{return true;}),
     });
 
-    areaTable[RR_LLR_STABLES] = Region("LLR Stables", "LLR Stables", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LLR_STABLES] = Region("LLR Stables", SCENE_STABLE, {}, {
         //Locations
         LOCATION(RC_LLR_STABLES_LEFT_COW,  logic->CanUse(RG_EPONAS_SONG)),
         LOCATION(RC_LLR_STABLES_RIGHT_COW, logic->CanUse(RG_EPONAS_SONG)),
@@ -51,7 +53,7 @@ void RegionTable_Init_LonLonRanch() {
         Entrance(RR_LON_LON_RANCH, []{return true;}),
     });
 
-    areaTable[RR_LLR_TOWER] = Region("LLR Tower", "LLR Tower", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LLR_TOWER] = Region("LLR Tower", SCENE_LON_LON_BUILDINGS, {}, {
         //Locations
         LOCATION(RC_LLR_FREESTANDING_POH, logic->IsChild),
         LOCATION(RC_LLR_TOWER_LEFT_COW,   logic->CanUse(RG_EPONAS_SONG)),
@@ -61,7 +63,7 @@ void RegionTable_Init_LonLonRanch() {
         Entrance(RR_LON_LON_RANCH, []{return true;}),
     });
 
-    areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", "LLR Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LLR_GROTTO] = Region("LLR Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_LEFT,   logic->CanStunDeku()),
         LOCATION(RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,  logic->CanStunDeku()),
@@ -71,4 +73,6 @@ void RegionTable_Init_LonLonRanch() {
         //Exits
         Entrance(RR_LON_LON_RANCH, []{return true;}),
     });
+
+    // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/lost_woods.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/lost_woods.cpp
index 17aaff6391..e949a7b1e5 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/lost_woods.cpp
@@ -4,12 +4,13 @@
 using namespace Rando;
 
 void RegionTable_Init_LostWoods() {
-    areaTable[RR_LW_FOREST_EXIT] = Region("LW Forest Exit", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    // clang-format off
+    areaTable[RR_LW_FOREST_EXIT] = Region("LW Forest Exit", SCENE_LOST_WOODS, {}, {}, {
         //Exits
         Entrance(RR_KOKIRI_FOREST, []{return true;})
     });
 
-    areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_THE_LOST_WOODS] = Region("Lost Woods", SCENE_LOST_WOODS, {
         //Events
         EventAccess(&logic->GossipStoneFairy,  []{return logic->CallGossipFairyExceptSuns();}),
         EventAccess(&logic->BeanPlantFairy,    []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
@@ -48,19 +49,22 @@ void RegionTable_Init_LostWoods() {
         LOCATION(RC_LW_GOSSIP_STONE_FAIRY_BIG,          logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_LW_SHORTCUT_STORMS_FAIRY,           logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_LW_GOSSIP_STONE,                    true),
+        LOCATION(RC_LW_GRASS_1,                         logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_2,                         logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_3,                         logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_LW_FOREST_EXIT,           []{return true;}),
         Entrance(RR_GC_WOODS_WARP,            []{return true;}),
         Entrance(RR_LW_BRIDGE,                []{return logic->CanLeaveForest() && ((logic->IsAdult && (CanPlantBean(RR_THE_LOST_WOODS) || ctx->GetTrickOption(RT_LW_BRIDGE))) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_LONGSHOT));}),
-        Entrance(RR_ZORAS_RIVER,              []{return logic->CanLeaveForest() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
+        Entrance(RR_ZR_FROM_SHORTCUT,         []{return logic->CanLeaveForest() && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS) || (ctx->GetTrickOption(RT_LOST_WOOD_NAVI_DIVE) && logic->IsChild && logic->HasItem(RG_BRONZE_SCALE) && logic->CanJumpslash()));}),
         Entrance(RR_LW_BEYOND_MIDO,           []{return logic->IsChild || logic->CanUse(RG_SARIAS_SONG) || ctx->GetTrickOption(RT_LW_MIDO_BACKFLIP);}),
         Entrance(RR_LW_NEAR_SHORTCUTS_GROTTO, []{return Here(RR_THE_LOST_WOODS, []{return logic->BlastOrSmash();});}),
     });
 
-    areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_LW_BEYOND_MIDO] = Region("LW Beyond Mido", SCENE_LOST_WOODS, {
         //Events
-        EventAccess(&logic->ButterflyFairy, []{return logic->ButterflyFairy || logic->CanUse(RG_STICKS);}),
+        EventAccess(&logic->ButterflyFairy, []{return logic->CanUse(RG_STICKS);}),
     }, {
         //Locations
         LOCATION(RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, logic->IsChild && logic->CanStunDeku()),
@@ -71,6 +75,12 @@ void RegionTable_Init_LostWoods() {
         LOCATION(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1,   logic->IsChild && logic->HasItem(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2,   logic->IsChild && logic->HasItem(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3,   logic->IsChild && logic->HasItem(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_LW_GRASS_4,                            logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_5,                            logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_6,                            logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_7,                            logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_8,                            logic->CanCutShrubs()),
+        LOCATION(RC_LW_GRASS_9,                            logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_LW_FOREST_EXIT,   []{return true;}),
@@ -80,7 +90,7 @@ void RegionTable_Init_LostWoods() {
         Entrance(RR_LW_SCRUBS_GROTTO, []{return Here(RR_LW_BEYOND_MIDO, []{return logic->BlastOrSmash();});}),
     });
 
-    areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", "LW Near Shortcuts Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_LW_NEAR_SHORTCUTS_GROTTO] = Region("LW Near Shortcuts Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_CHEST,                  true),
         LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                   logic->HasBottle()),
@@ -89,12 +99,16 @@ void RegionTable_Init_LostWoods() {
         LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_THE_LOST_WOODS, []{return true;}),
     });
 
-    areaTable[RR_DEKU_THEATER] = Region("Deku Theater", "Deku Theater", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_DEKU_THEATER] = Region("Deku Theater", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_DEKU_THEATER_SKULL_MASK,    logic->IsChild && logic->SkullMask),
         LOCATION(RC_DEKU_THEATER_MASK_OF_TRUTH, logic->IsChild && logic->MaskOfTruth),
@@ -103,7 +117,7 @@ void RegionTable_Init_LostWoods() {
         Entrance(RR_LW_BEYOND_MIDO, []{return true;}),
     });
 
-    areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", "LW Scrubs Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LW_SCRUBS_GROTTO] = Region("LW Scrubs Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_LW_DEKU_SCRUB_GROTTO_REAR,      logic->CanStunDeku()),
         LOCATION(RC_LW_DEKU_SCRUB_GROTTO_FRONT,     logic->CanStunDeku()),
@@ -114,7 +128,7 @@ void RegionTable_Init_LostWoods() {
         Entrance(RR_LW_BEYOND_MIDO, []{return true;}),
     });
 
-    areaTable[RR_LW_BRIDGE_FROM_FOREST] = Region("LW Bridge From Forest", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_LW_BRIDGE_FROM_FOREST] = Region("LW Bridge From Forest", SCENE_LOST_WOODS, {}, {
         //Locations
         LOCATION(RC_LW_GIFT_FROM_SARIA, true),
     }, {
@@ -122,10 +136,12 @@ void RegionTable_Init_LostWoods() {
         Entrance(RR_LW_BRIDGE, []{return true;}),
     });
 
-    areaTable[RR_LW_BRIDGE] = Region("LW Bridge", "Lost Woods", {RA_THE_LOST_WOODS}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_LW_BRIDGE] = Region("LW Bridge", SCENE_LOST_WOODS, {}, {}, {
         //Exits
         Entrance(RR_KOKIRI_FOREST,  []{return true;}),
         Entrance(RR_HYRULE_FIELD,   []{return true;}),
         Entrance(RR_THE_LOST_WOODS, []{return logic->CanUse(RG_LONGSHOT);}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/market.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/market.cpp
index af406f8bfb..7d7655ef08 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/market.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/market.cpp
@@ -4,14 +4,30 @@
 using namespace Rando;
 
 void RegionTable_Init_Market() {
-    areaTable[RR_MARKET_ENTRANCE] = Region("Market Entrance", "Market Entrance", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    // clang-format off
+    areaTable[RR_MARKET_ENTRANCE] = Region("Market Entrance", SCENE_MARKET_ENTRANCE_DAY, {}, {}, {
         //Exits
         Entrance(RR_HYRULE_FIELD,       []{return logic->IsAdult || logic->AtDay;}),
         Entrance(RR_THE_MARKET,         []{return true;}),
         Entrance(RR_MARKET_GUARD_HOUSE, []{return logic->CanOpenOverworldDoor(RG_GUARD_HOUSE_KEY);}),
     });
 
-    areaTable[RR_THE_MARKET] = Region("Market", "Market", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_THE_MARKET] = Region("Market", SCENE_MARKET_DAY, {}, {
+        //Locations
+        //RANDOTODO add item avalibility to regions to remove need to hardcode logic in limited item use situations
+        LOCATION(RC_MARKET_GRASS_1,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_2,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_3,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_4,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_5,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_6,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_7,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MARKET_GRASS_8,              logic->IsChild && (logic->CanUseSword() || logic->HasItem(RG_GORONS_BRACELET))),
+        LOCATION(RC_MK_NEAR_BAZAAR_CRATE_1,      logic->IsChild /*&& logic->CanRoll()*/),
+        LOCATION(RC_MK_NEAR_BAZAAR_CRATE_2,      logic->IsChild /*&& logic->CanRoll()*/),
+        LOCATION(RC_MK_SHOOTING_GALLERY_CRATE_1, logic->IsChild /*&& logic->CanRoll()*/),
+        LOCATION(RC_MK_SHOOTING_GALLERY_CRATE_2, logic->IsChild /*&& logic->CanRoll()*/),
+    }, {
         //Exits
         Entrance(RR_MARKET_ENTRANCE,            []{return true;}),
         Entrance(RR_TOT_ENTRANCE,               []{return true;}),
@@ -25,7 +41,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_MARKET_BACK_ALLEY,          []{return logic->IsChild;}),
     });
 
-    areaTable[RR_MARKET_BACK_ALLEY] = Region("Market Back Alley", "Market", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_MARKET_BACK_ALLEY] = Region("Market Back Alley", SCENE_BACK_ALLEY_DAY, {}, {}, {
         //Exits
         Entrance(RR_THE_MARKET,                []{return true;}),
         Entrance(RR_MARKET_BOMBCHU_SHOP,       []{return logic->AtNight && logic->CanOpenOverworldDoor(RG_BOMBCHU_SHOP_KEY);}),
@@ -33,13 +49,12 @@ void RegionTable_Init_Market() {
         Entrance(RR_MARKET_MAN_IN_GREEN_HOUSE, []{return logic->AtNight && logic->CanOpenOverworldDoor(RG_ALLEY_HOUSE_KEY);}),
     });
 
-    areaTable[RR_MARKET_GUARD_HOUSE] = Region("Market Guard House", "Market Guard House", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_MARKET_GUARD_HOUSE] = Region("Market Guard House", SCENE_MARKET_GUARD_HOUSE, {
         //Events
-        EventAccess(&logic->CouldEmptyBigPoes, []{return logic->IsAdult;}),
         EventAccess(&logic->CanEmptyBigPoes,   []{return logic->IsAdult;}),
     }, {
         //Locations
-        LOCATION(RC_MARKET_10_BIG_POES,          logic->IsAdult && (logic->BigPoeKill || logic->BigPoes > ctx->GetOption(RSK_BIG_POE_COUNT).Get())),
+        LOCATION(RC_MARKET_10_BIG_POES,          logic->IsAdult && (logic->BigPoeKill || logic->BigPoes >= ctx->GetOption(RSK_BIG_POE_COUNT).Get())),
         LOCATION(RC_MARKET_GS_GUARD_HOUSE,       logic->IsChild),
         LOCATION(RC_MK_GUARD_HOUSE_CHILD_POT_1,  logic->IsChild && logic->CanBreakPots()),
         LOCATION(RC_MK_GUARD_HOUSE_CHILD_POT_2,  logic->IsChild && logic->CanBreakPots()),
@@ -96,12 +111,17 @@ void RegionTable_Init_Market() {
         LOCATION(RC_MK_GUARD_HOUSE_ADULT_POT_9,  logic->IsAdult && logic->CanBreakPots()),
         LOCATION(RC_MK_GUARD_HOUSE_ADULT_POT_10, logic->IsAdult && logic->CanBreakPots()),
         LOCATION(RC_MK_GUARD_HOUSE_ADULT_POT_11, logic->IsAdult && logic->CanBreakPots()),
+        LOCATION(RC_MK_GUARD_HOUSE_CRATE_1,      logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_MK_GUARD_HOUSE_CRATE_2,      logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_MK_GUARD_HOUSE_CRATE_3,      logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_MK_GUARD_HOUSE_CRATE_4,      logic->IsChild && logic->CanBreakCrates()),
+        LOCATION(RC_MK_GUARD_HOUSE_CRATE_5,      logic->IsChild && logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_MARKET_ENTRANCE, []{return true;}),
     });
 
-    areaTable[RR_MARKET_BAZAAR] = Region("Market Bazaar", "Market Bazaar", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_BAZAAR] = Region("Market Bazaar", SCENE_BAZAAR, {}, {
         //Locations
         LOCATION(RC_MARKET_BAZAAR_ITEM_1, true),
         LOCATION(RC_MARKET_BAZAAR_ITEM_2, true),
@@ -116,10 +136,10 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", "Market Mask Shop", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_MARKET_MASK_SHOP] = Region("Market Mask Shop", SCENE_HAPPY_MASK_SHOP, {
         //Events
-        EventAccess(&logic->SkullMask,   []{return logic->SkullMask   || (logic->HasItem(RG_ZELDAS_LETTER) && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) ||  ChildCanAccess(RR_KAKARIKO_VILLAGE)));}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link's pocket
-        EventAccess(&logic->MaskOfTruth, []{return logic->MaskOfTruth || (logic->SkullMask && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->StoneCount() == 3)));}),
+        EventAccess(&logic->SkullMask,   []{return logic->HasItem(RG_ZELDAS_LETTER) && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) || ChildCanAccess(RR_KAKARIKO_VILLAGE));}), //RANDOTODO Complete mask quest does not need this location, so should be tied to link's pocket
+        EventAccess(&logic->MaskOfTruth, []{return logic->SkullMask && (ctx->GetOption(RSK_COMPLETE_MASK_QUEST) || (ChildCanAccess(RR_THE_LOST_WOODS) && logic->CanUse(RG_SARIAS_SONG) && RegionTable(RR_THE_GRAVEYARD)->childDay && ChildCanAccess(RR_HYRULE_FIELD) && logic->StoneCount() == 3));}),
     }, {
         //Locations
         LOCATION(RC_MASK_SHOP_HINT, true),
@@ -128,7 +148,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", "Market Shooting Gallery", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_SHOOTING_GALLERY] = Region("Market Shooting Gallery", SCENE_SHOOTING_GALLERY, {}, {
         //Locations
         LOCATION(RC_MARKET_SHOOTING_GALLERY_REWARD, logic->IsChild && logic->HasItem(RG_CHILD_WALLET)),
     }, {
@@ -136,7 +156,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", "Market Bombchu Bowling", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_MARKET_BOMBCHU_BOWLING] = Region("Market Bombchu Bowling", SCENE_BOMBCHU_BOWLING_ALLEY, {
         //Events
         EventAccess(&logic->CouldPlayBowling, []{return (logic->HasItem(RG_CHILD_WALLET));}),
     }, {
@@ -148,7 +168,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_POTION_SHOP] = Region("Market Potion Shop", "Market Potion Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_POTION_SHOP] = Region("Market Potion Shop", SCENE_POTION_SHOP_MARKET, {}, {
         //Locations
         LOCATION(RC_MARKET_POTION_SHOP_ITEM_1, true),
         LOCATION(RC_MARKET_POTION_SHOP_ITEM_2, true),
@@ -163,7 +183,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", "Market Treasure Chest Game", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_TREASURE_CHEST_GAME] = Region("Market Treasure Chest Game", SCENE_TREASURE_BOX_SHOP, {}, {
         //Locations
         LOCATION(RC_GREG_HINT,                         logic->HasItem(RG_CHILD_WALLET)),
         LOCATION(RC_MARKET_TREASURE_CHEST_GAME_REWARD, logic->HasItem(RG_CHILD_WALLET) && ((logic->CanUse(RG_LENS_OF_TRUTH) && !ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_SINGLE_KEYS) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 6)) || (ctx->GetOption(RSK_SHUFFLE_CHEST_MINIGAME).Is(RO_CHEST_GAME_PACK) && logic->SmallKeys(RR_MARKET_TREASURE_CHEST_GAME, 1)))),
@@ -182,7 +202,7 @@ void RegionTable_Init_Market() {
         Entrance(RR_THE_MARKET, []{return true;}),
     });
 
-    areaTable[RR_MARKET_BOMBCHU_SHOP] = Region("Market Bombchu Shop", "Market Bombchu Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_BOMBCHU_SHOP] = Region("Market Bombchu Shop", SCENE_BOMBCHU_SHOP, {}, {
         //Locations
         LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_1, true),
         LOCATION(RC_MARKET_BOMBCHU_SHOP_ITEM_2, true),
@@ -197,15 +217,16 @@ void RegionTable_Init_Market() {
         Entrance(RR_MARKET_BACK_ALLEY, []{return true;}),
     });
 
-    areaTable[RR_MARKET_DOG_LADY_HOUSE] = Region("Market Dog Lady House", "Market Dog Lady House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_DOG_LADY_HOUSE] = Region("Market Dog Lady House", SCENE_DOG_LADY_HOUSE, {}, {
         //Locations
-        LOCATION(RC_MARKET_LOST_DOG, logic->IsChild && logic->AtNight),
+        LOCATION(RC_MARKET_LOST_DOG,         logic->IsChild && logic->AtNight),
+        LOCATION(RC_MK_LOST_DOG_HOUSE_CRATE, logic->CanBreakCrates()),
     }, {
         //Exits
         Entrance(RR_MARKET_BACK_ALLEY, []{return true;}),
     });
 
-    areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", "Market Man in Green House", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", SCENE_BACK_ALLEY_HOUSE, {}, {
         // Locations
         LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_1, logic->CanBreakPots()),
         LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_2, logic->CanBreakPots()),
@@ -214,4 +235,6 @@ void RegionTable_Init_Market() {
         //Exits
         Entrance(RR_MARKET_BACK_ALLEY, []{return true;}),
     });
+
+    // clang-format on
 }
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/sacred_forest_meadow.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/sacred_forest_meadow.cpp
index ecc0577e29..9d641ac980 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/sacred_forest_meadow.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/sacred_forest_meadow.cpp
@@ -4,14 +4,15 @@
 using namespace Rando;
 
 void RegionTable_Init_SacredForestMeadow() {
-    areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", "Sacred Forest Meadow", {RA_SACRED_FOREST_MEADOW}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    // clang-format off
+    areaTable[RR_SFM_ENTRYWAY] = Region("SFM Entryway", SCENE_SACRED_FOREST_MEADOW, {}, {}, {
         //Exits
         Entrance(RR_LW_BEYOND_MIDO,       []{return true;}),
-        Entrance(RR_SACRED_FOREST_MEADOW, []{return logic->CanJumpslash() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_DINS_FIRE);}),
+        Entrance(RR_SACRED_FOREST_MEADOW, []{return logic->IsAdult || logic->CanKillEnemy(RE_WOLFOS);}),
         Entrance(RR_SFM_WOLFOS_GROTTO,    []{return logic->CanOpenBombGrotto();}),
     });
 
-    areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", "Sacred Forest Meadow", {RA_SACRED_FOREST_MEADOW}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SACRED_FOREST_MEADOW] = Region("Sacred Forest Meadow", SCENE_SACRED_FOREST_MEADOW, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairyExceptSuns();}),
     }, {
@@ -36,7 +37,7 @@ void RegionTable_Init_SacredForestMeadow() {
         Entrance(RR_SFM_STORMS_GROTTO,      []{return logic->CanOpenStormsGrotto();}),
     });
 
-    areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", "SFM Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_SFM_FAIRY_GROTTO] = Region("SFM Fairy Grotto", SCENE_GROTTOS, {
         //Events
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -54,7 +55,7 @@ void RegionTable_Init_SacredForestMeadow() {
         Entrance(RR_SACRED_FOREST_MEADOW, []{return true;}),
     });
 
-    areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", "SFM Wolfos Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SFM_WOLFOS_GROTTO] = Region("SFM Wolfos Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_SFM_WOLFOS_GROTTO_CHEST, logic->CanKillEnemy(RE_WOLFOS, ED_CLOSE, true, 2)),
     }, {
@@ -62,7 +63,7 @@ void RegionTable_Init_SacredForestMeadow() {
         Entrance(RR_SFM_ENTRYWAY, []{return true;}),
     });
 
-    areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", "SFM Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_SFM_STORMS_GROTTO] = Region("SFM Storms Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
         LOCATION(RC_SFM_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
@@ -71,4 +72,6 @@ void RegionTable_Init_SacredForestMeadow() {
         //Exits
         Entrance(RR_SACRED_FOREST_MEADOW, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/temple_of_time.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/temple_of_time.cpp
index 06865772da..07efc4326a 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/temple_of_time.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/temple_of_time.cpp
@@ -4,7 +4,8 @@
 using namespace Rando;
 
 void RegionTable_Init_TempleOfTime() {
-    areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", "ToT Entrance", {RA_THE_MARKET}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_TOT_ENTRANCE] = Region("ToT Entrance", SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairyExceptSuns();}),
     }, {
@@ -27,7 +28,7 @@ void RegionTable_Init_TempleOfTime() {
         Entrance(RR_TEMPLE_OF_TIME, []{return true;}),
     });
 
-    areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", "Temple of Time", {RA_TEMPLE_OF_TIME}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_TEMPLE_OF_TIME] = Region("Temple of Time", SCENE_TEMPLE_OF_TIME, {}, {
         //Locations
         LOCATION(RC_TOT_LIGHT_ARROWS_CUTSCENE, logic->IsAdult && logic->CanTriggerLACS()),
         LOCATION(RC_ALTAR_HINT_CHILD,          logic->IsChild),
@@ -39,7 +40,7 @@ void RegionTable_Init_TempleOfTime() {
         Entrance(RR_TOT_BEYOND_DOOR_OF_TIME, []{return ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_OPEN) || (logic->CanUse(RG_SONG_OF_TIME) && (ctx->GetOption(RSK_DOOR_OF_TIME).Is(RO_DOOROFTIME_SONGONLY) || (logic->StoneCount() == 3 && logic->HasItem(RG_OCARINA_OF_TIME))));}),
     });
 
-    areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", "Beyond Door of Time", {RA_TEMPLE_OF_TIME}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_TOT_BEYOND_DOOR_OF_TIME] = Region("Beyond Door of Time", SCENE_TEMPLE_OF_TIME, {
         //Events
         //EventAccess(&logic->TimeTravel, []{return true;}),
     }, {
@@ -51,4 +52,6 @@ void RegionTable_Init_TempleOfTime() {
         //Exits
         Entrance(RR_TEMPLE_OF_TIME, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
new file mode 100644
index 0000000000..0a70e77e84
--- /dev/null
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
@@ -0,0 +1,142 @@
+#include "soh/Enhancements/randomizer/location_access.h"
+#include "soh/Enhancements/randomizer/entrance.h"
+
+using namespace Rando;
+
+// clang-format off
+// When Thieve's hideout entrances are shuffled, getting caught by guards should behave like void outs to avoid logic headaches.
+void RegionTable_Init_ThievesHideout() {
+    areaTable[RR_TH_1_TORCH_CELL] = Region("Thieves Hideout 1 Torch Cell", SCENE_THIEVES_HIDEOUT, {
+        //Events
+        EventAccess(&logic->THCouldFree1TorchCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->THRescuedAllCarpenters,     []{return logic->SmallKeys(RR_GF_OUTSKIRTS, ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) ? 4 : 1) && logic->THCouldFree1TorchCarpenter && logic->THCouldFreeDoubleCellCarpenter && logic->TH_CouldFreeDeadEndCarpenter && logic->THCouldRescueSlopeCarpenter;}),
+    }, {
+        //Locations
+        LOCATION(RC_TH_1_TORCH_CARPENTER,      logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
+        LOCATION(RC_TH_1_TORCH_CELL_RIGHT_POT, logic->CanBreakPots()),
+        LOCATION(RC_TH_1_TORCH_CELL_MID_POT,   logic->CanBreakPots()),
+        LOCATION(RC_TH_1_TORCH_CELL_LEFT_POT,  logic->CanBreakPots()),
+        LOCATION(RC_TH_1_TORCH_CELL_CRATE,     logic->CanBreakCrates()),
+        LOCATION(RC_TH_FREED_CARPENTERS,       logic->THRescuedAllCarpenters),
+    }, {
+        //Exits
+        Entrance(RR_GF_OUTSKIRTS,   []{return true;}),
+        Entrance(RR_GF_NEAR_GROTTO, []{return true;}),
+    });
+
+    areaTable[RR_TH_DOUBLE_CELL] = Region("Thieves Hideout Double Cell", SCENE_THIEVES_HIDEOUT, {
+        //Events
+        EventAccess(&logic->THCouldFreeDoubleCellCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->THRescuedAllCarpenters,         []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && logic->SmallKeys(RR_GF_OUTSKIRTS, 4) && logic->THCouldFree1TorchCarpenter && logic->THCouldFreeDoubleCellCarpenter && logic->TH_CouldFreeDeadEndCarpenter && logic->THCouldRescueSlopeCarpenter;}),
+    }, {
+        //Locations
+        LOCATION(RC_TH_DOUBLE_CELL_CARPENTER,      logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
+        LOCATION(RC_TH_NEAR_DOUBLE_CELL_RIGHT_POT, logic->CanBreakPots()),
+        LOCATION(RC_TH_NEAR_DOUBLE_CELL_MID_POT,   logic->CanBreakPots()),
+        LOCATION(RC_TH_NEAR_DOUBLE_CELL_LEFT_POT,  logic->CanBreakPots()),
+        LOCATION(RC_TH_RIGHTMOST_JAILED_POT,       logic->CanBreakPots()),
+        LOCATION(RC_TH_RIGHT_MIDDLE_JAILED_POT,    logic->CanBreakPots()),
+        LOCATION(RC_TH_LEFT_MIDDLE_JAILED_POT,     logic->CanBreakPots()),
+        LOCATION(RC_TH_LEFTMOST_JAILED_POT,        logic->CanBreakPots()),
+        LOCATION(RC_TH_DOUBLE_CELL_LEFT_CRATE,     logic->CanBreakCrates()),
+        LOCATION(RC_TH_DOUBLE_CELL_RIGHT_CRATE,    logic->CanBreakCrates()),
+        LOCATION(RC_TH_FREED_CARPENTERS,           logic->THRescuedAllCarpenters),
+    }, {
+        //Exits
+        Entrance(RR_GF_OUTSKIRTS,   []{return true;}),
+        Entrance(RR_GF_NEAR_GROTTO, []{return true;}),
+    });
+
+    areaTable[RR_TH_DEAD_END_CELL] = Region("Thieves Hideout Dead End Cell", SCENE_THIEVES_HIDEOUT, {
+        //Events
+        EventAccess(&logic->TH_CouldFreeDeadEndCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->THRescuedAllCarpenters,       []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && logic->SmallKeys(RR_GF_OUTSKIRTS, 4) && logic->THCouldFree1TorchCarpenter && logic->THCouldFreeDoubleCellCarpenter && logic->TH_CouldFreeDeadEndCarpenter && logic->THCouldRescueSlopeCarpenter;}),
+    }, {
+        //Locations
+        LOCATION(RC_TH_DEAD_END_CARPENTER,  logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
+        LOCATION(RC_TH_DEAD_END_CELL_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_TH_FREED_CARPENTERS,    logic->THRescuedAllCarpenters),
+    }, {
+        //Exits
+        Entrance(RR_GF_BELOW_GS, []{return true;}),
+    });
+
+    areaTable[RR_TH_STEEP_SLOPE_CELL] = Region("Thieves Hideout Steep Slope Cell", SCENE_THIEVES_HIDEOUT, {
+        //Events
+        EventAccess(&logic->THCouldRescueSlopeCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->THRescuedAllCarpenters,      []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && logic->SmallKeys(RR_GF_OUTSKIRTS, 4) && logic->THCouldFree1TorchCarpenter && logic->THCouldFreeDoubleCellCarpenter && logic->TH_CouldFreeDeadEndCarpenter && logic->THCouldRescueSlopeCarpenter;}),
+    }, {
+        //Locations
+        LOCATION(RC_TH_STEEP_SLOPE_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
+        LOCATION(RC_TH_STEEP_SLOPE_RIGHT_POT, logic->CanBreakPots()),
+        LOCATION(RC_TH_STEEP_SLOPE_LEFT_POT,  logic->CanBreakPots()),
+        LOCATION(RC_TH_FREED_CARPENTERS,      logic->THRescuedAllCarpenters),
+    }, {
+        //Exits
+        Entrance(RR_GF_ABOVE_GTG,          []{return true;}),
+        Entrance(RR_GF_TOP_OF_LOWER_VINES, []{return true;}),
+    });
+
+    areaTable[RR_TH_KITCHEN_CORRIDOR] = Region("Thieves Hideout Kitchen Corridor", SCENE_THIEVES_HIDEOUT, {}, {
+        //Locations
+        LOCATION(RC_TH_NEAR_KITCHEN_LEFTMOST_CRATE,  logic->CanBreakCrates()),
+        LOCATION(RC_TH_NEAR_KITCHEN_MID_LEFT_CRATE,  logic->CanBreakCrates()),
+        LOCATION(RC_TH_NEAR_KITCHEN_MID_RIGHT_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_TH_NEAR_KITCHEN_RIGHTMOST_CRATE, logic->CanBreakCrates()),
+    }, {
+        //Exits
+        Entrance(RR_GF_NEAR_GROTTO,  []{return true;}),
+        Entrance(RR_GF_ABOVE_GTG,    []{return true;}),
+        Entrance(RR_TH_KITCHEN_MAIN, []{return logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+    });
+
+    areaTable[RR_TH_KITCHEN_MAIN] = Region("Thieves Hideout Kitchen Bottom", SCENE_THIEVES_HIDEOUT, {}, {
+        //Locations
+        LOCATION(RC_TH_KITCHEN_POT_1,     logic->CanBreakPots() && logic->CanPassEnemy(RE_GERUDO_GUARD)),
+        LOCATION(RC_TH_KITCHEN_POT_2,     logic->CanBreakPots() && logic->CanPassEnemy(RE_GERUDO_GUARD)),
+        LOCATION(RC_TH_KITCHEN_CRATE,     logic->CanBreakCrates() && logic->CanPassEnemy(RE_GERUDO_GUARD)),
+        LOCATION(RC_TH_KITCHEN_SUN_FAIRY, logic->CanPassEnemy(RE_GERUDO_GUARD) && logic->CanUse(RG_SUNS_SONG)),
+    }, {
+        //Exits
+        Entrance(RR_TH_KITCHEN_CORRIDOR, []{return logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        Entrance(RR_TH_KITCHEN_TOP,      []{return logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+    });
+
+    areaTable[RR_TH_KITCHEN_TOP] = Region("Thieves Hideout Kitchen Top", SCENE_THIEVES_HIDEOUT, {}, {
+        //Locations
+        LOCATION(RC_TH_KITCHEN_POT_1, logic->CanUse(RG_BOOMERANG)),
+        LOCATION(RC_TH_KITCHEN_POT_2, logic->CanUse(RG_BOOMERANG)),
+    }, {
+        //Exits
+        Entrance(RR_TH_KITCHEN_MAIN,       []{return true;}),
+        //hookshot to cross using the rafters is implied in logic->CanPassEnemy(RE_GERUDO_GUARD)
+        Entrance(RR_GF_NEAR_GS,            []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS);}),
+        Entrance(RR_GF_TOP_OF_LOWER_VINES, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS);}),
+    });
+
+    areaTable[RR_TH_BREAK_ROOM] = Region("Thieves Hideout Break Room", SCENE_THIEVES_HIDEOUT, {}, {
+        //Locations
+        LOCATION(RC_TH_BREAK_ROOM_FRONT_POT,      (logic->CanPassEnemy(RE_BREAK_ROOM_GUARD) && logic->CanBreakPots()) ||
+                                                  (logic->CanPassEnemy(RE_GERUDO_GUARD) && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_TH_BREAK_ROOM_BACK_POT,       (logic->CanPassEnemy(RE_BREAK_ROOM_GUARD) && logic->CanBreakPots()) ||
+                                                  (logic->CanPassEnemy(RE_GERUDO_GUARD) && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_TH_BREAK_HALLWAY_OUTER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_TH_BREAK_HALLWAY_INNER_CRATE, logic->CanBreakCrates()),
+        LOCATION(RC_TH_BREAK_ROOM_RIGHT_CRATE,    (logic->CanPassEnemy(RE_BREAK_ROOM_GUARD) && logic->CanBreakCrates()) || 
+                                                   (logic->CanPassEnemy(RE_GERUDO_GUARD) && logic->HasExplosives() && logic->CanUse(RG_BOOMERANG))),
+        LOCATION(RC_TH_BREAK_ROOM_LEFT_CRATE,     (logic->CanPassEnemy(RE_BREAK_ROOM_GUARD) && logic->CanBreakCrates()) || 
+                                                   (logic->CanPassEnemy(RE_GERUDO_GUARD) && logic->HasExplosives() && logic->CanUse(RG_BOOMERANG))),
+    }, {
+        //Exits
+        Entrance(RR_GF_BELOW_CHEST,         []{return logic->CanPassEnemy(RE_GERUDO_GUARD);}),
+        //Implies logic->CanPassEnemy(RE_GERUDO_GUARD)
+        Entrance(RR_TH_BREAK_ROOM_CORRIDOR, []{return logic->CanUse(RG_HOOKSHOT);}),
+    });
+
+    areaTable[RR_TH_BREAK_ROOM_CORRIDOR] = Region("Thieves Hideout Break Room", SCENE_THIEVES_HIDEOUT, {}, {}, {
+        //Exits
+        Entrance(RR_TH_BREAK_ROOM, []{return logic->CanUse(RG_HOOKSHOT);}),
+        Entrance(RR_GF_ABOVE_JAIL, []{return true;}),
+    });
+}
+// clang-format on
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_domain.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_domain.cpp
index 0bf91e43ae..3a626a2f93 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_domain.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_domain.cpp
@@ -4,20 +4,21 @@
 using namespace Rando;
 
 void RegionTable_Init_ZorasDomain() {
-    areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", "Zoras Domain", {RA_ZORAS_DOMAIN}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_ZORAS_DOMAIN] = Region("Zoras Domain", SCENE_ZORAS_DOMAIN, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairyExceptSuns();}),
         EventAccess(&logic->NutPot,           []{return true;}),
-        EventAccess(&logic->StickPot,         []{return logic->StickPot          || logic->IsChild;}),
-        EventAccess(&logic->FishGroup,        []{return logic->FishGroup         || logic->IsChild;}),
-        EventAccess(&logic->KingZoraThawed,   []{return logic->KingZoraThawed    || (logic->IsAdult     && logic->BlueFire());}),
-        EventAccess(&logic->DeliverLetter,    []{return logic->DeliverLetter     || (logic->CanUse(RG_RUTOS_LETTER) && logic->IsChild && ctx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN));}),
+        EventAccess(&logic->StickPot,         []{return logic->IsChild;}),
+        EventAccess(&logic->FishGroup,        []{return logic->IsChild;}),
+        EventAccess(&logic->KingZoraThawed,   []{return logic->IsAdult && logic->BlueFire();}),
+        EventAccess(&logic->DeliverLetter,    []{return logic->CanUse(RG_RUTOS_LETTER) && logic->IsChild && ctx->GetOption(RSK_ZORAS_FOUNTAIN).IsNot(RO_ZF_OPEN);}),
     }, {
         //Locations
         LOCATION(RC_ZD_DIVING_MINIGAME,                     logic->HasItem(RG_BRONZE_SCALE) && logic->HasItem(RG_CHILD_WALLET) && logic->IsChild),
         LOCATION(RC_ZD_CHEST,                               logic->IsChild && logic->CanUse(RG_STICKS)),
-        LOCATION(RC_ZD_KING_ZORA_THAWED,                    logic->KingZoraThawed),
-        LOCATION(RC_ZD_TRADE_PRESCRIPTION,                  logic->KingZoraThawed && logic->CanUse(RG_PRESCRIPTION)),
+        LOCATION(RC_ZD_KING_ZORA_THAWED,                    logic->IsAdult && logic->KingZoraThawed),
+        LOCATION(RC_ZD_TRADE_PRESCRIPTION,                  logic->IsAdult && logic->KingZoraThawed && logic->CanUse(RG_PRESCRIPTION)),
         LOCATION(RC_ZD_GS_FROZEN_WATERFALL,                 logic->IsAdult && (logic->HookshotOrBoomerang() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || (logic->CanUse(RG_MAGIC_SINGLE) && (logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_BIGGORON_SWORD))) || (ctx->GetTrickOption(RT_ZD_GS) && logic->CanJumpslashExceptHammer())) && logic->CanGetNightTimeGS()),
         LOCATION(RC_ZD_FISH_1,                              logic->IsChild && logic->HasBottle()),
         LOCATION(RC_ZD_FISH_2,                              logic->IsChild && logic->HasBottle()),
@@ -27,8 +28,8 @@ void RegionTable_Init_ZorasDomain() {
         LOCATION(RC_ZD_GOSSIP_STONE_FAIRY,                  logic->CallGossipFairyExceptSuns()),
         LOCATION(RC_ZD_GOSSIP_STONE_FAIRY_BIG,              logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_ZD_GOSSIP_STONE,                        true),
-        LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  logic->CanBreakUpperBeehives()),
-        LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, logic->CanBreakUpperBeehives()),
+        LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,  logic->IsChild && logic->CanBreakUpperBeehives()),
+        LOCATION(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, logic->IsChild && logic->CanBreakUpperBeehives()),
         LOCATION(RC_ZD_NEAR_SHOP_POT_1,                     logic->CanBreakPots()),
         LOCATION(RC_ZD_NEAR_SHOP_POT_2,                     logic->CanBreakPots()),
         LOCATION(RC_ZD_NEAR_SHOP_POT_3,                     logic->CanBreakPots()),
@@ -37,28 +38,31 @@ void RegionTable_Init_ZorasDomain() {
     }, {
         //Exits
         Entrance(RR_ZR_BEHIND_WATERFALL, []{return true;}),
-        Entrance(RR_LAKE_HYLIA,          []{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
+        Entrance(RR_LH_FROM_SHORTCUT,    []{return logic->IsChild && (logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS));}),
         Entrance(RR_ZD_BEHIND_KING_ZORA, []{return logic->DeliverLetter || ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult) || (ctx->GetTrickOption(RT_ZD_KING_ZORA_SKIP) && logic->IsAdult);}),
         Entrance(RR_ZD_SHOP,             []{return logic->IsChild || logic->BlueFire();}),
         Entrance(RR_ZORAS_DOMAIN_ISLAND, []{return true;}),
     });
 
-    areaTable[RR_ZORAS_DOMAIN_ISLAND] = Region("Zoras Domain Island", "Zoras Domain", {RA_ZORAS_DOMAIN}, NO_DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_ZORAS_DOMAIN_ISLAND] = Region("Zoras Domain Island", SCENE_ZORAS_DOMAIN, {}, {}, {
         //Exits
         Entrance(RR_ZORAS_DOMAIN,     []{return logic->IsAdult || logic->HasItem(RG_BRONZE_SCALE);}),
         Entrance(RR_ZD_STORMS_GROTTO, []{return logic->CanOpenStormsGrotto();}),
     });
 
-    areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", "Zoras Domain", {RA_ZORAS_DOMAIN}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ZD_BEHIND_KING_ZORA] = Region("ZD Behind King Zora", SCENE_ZORAS_DOMAIN, {
+        //Events
+        EventAccess(&logic->KingZoraThawed, []{return logic->IsAdult && logic->BlueFire();}),
+    }, {
         //Locations
-        LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->CanBreakUpperBeehives()),
+        LOCATION(RC_ZD_BEHIND_KING_ZORA_BEEHIVE, logic->IsChild && logic->CanBreakUpperBeehives()),
     }, {
         //Exits
         Entrance(RR_ZORAS_DOMAIN,   []{return logic->DeliverLetter || ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_OPEN) || (ctx->GetOption(RSK_ZORAS_FOUNTAIN).Is(RO_ZF_CLOSED_CHILD) && logic->IsAdult);}),
         Entrance(RR_ZORAS_FOUNTAIN, []{return true;}),
     });
 
-    areaTable[RR_ZD_SHOP] = Region("ZD Shop", "ZD Shop", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ZD_SHOP] = Region("ZD Shop", SCENE_ZORA_SHOP, {}, {
         //Locations
         LOCATION(RC_ZD_SHOP_ITEM_1, true),
         LOCATION(RC_ZD_SHOP_ITEM_2, true),
@@ -73,7 +77,7 @@ void RegionTable_Init_ZorasDomain() {
         Entrance(RR_ZORAS_DOMAIN, []{return true;}),
     });
 
-    areaTable[RR_ZD_STORMS_GROTTO] = Region("ZD Storms Grotto", "ZD Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ZD_STORMS_GROTTO] = Region("ZD Storms Grotto", SCENE_GROTTOS, {
         //Events
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -90,4 +94,6 @@ void RegionTable_Init_ZorasDomain() {
         //Exits
         Entrance(RR_ZORAS_DOMAIN_ISLAND, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_fountain.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_fountain.cpp
index ccdca0ecaa..cfd2125c1d 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_fountain.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_fountain.cpp
@@ -4,24 +4,51 @@
 using namespace Rando;
 
 void RegionTable_Init_ZorasFountain() {
-    areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", "Zoras Fountain", {RA_ZORAS_FOUNTAIN}, NO_DAY_NIGHT_CYCLE, {
+    // clang-format off
+    areaTable[RR_ZORAS_FOUNTAIN] = Region("Zoras Fountain", SCENE_ZORAS_FOUNTAIN, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairyExceptSuns();}),
-        EventAccess(&logic->ButterflyFairy,   []{return logic->ButterflyFairy   || (logic->CanUse(RG_STICKS) && logic->AtDay);}),
+        EventAccess(&logic->ButterflyFairy,   []{return logic->CanUse(RG_STICKS) && logic->AtDay;}),
     }, {
         //Locations
-        LOCATION(RC_ZF_ICEBERG_FREESTANDING_POH,      logic->IsAdult),
+        LOCATION(RC_ZF_GS_TREE,                      logic->IsChild),
+        LOCATION(RC_ZF_GS_ABOVE_THE_LOG,             logic->IsChild && logic->HookshotOrBoomerang() && logic->CanGetNightTimeGS()),
+        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY,     logic->CallGossipFairyExceptSuns()),
+        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG, logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_ZF_JABU_GOSSIP_STONE_FAIRY,      logic->CallGossipFairyExceptSuns()),
+        LOCATION(RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,  logic->CanUse(RG_SONG_OF_STORMS)),
+        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE,           true),
+        LOCATION(RC_ZF_JABU_GOSSIP_STONE,            true),
+        LOCATION(RC_ZF_NEAR_JABU_POT_1,              logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_ZF_NEAR_JABU_POT_2,              logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_ZF_NEAR_JABU_POT_3,              logic->IsChild && logic->CanBreakPots()),
+        LOCATION(RC_ZF_NEAR_JABU_POT_4,              logic->IsChild && logic->CanBreakPots()),
+    }, {
+        //Exits
+        Entrance(RR_ZD_BEHIND_KING_ZORA,       []{return true;}),
+        Entrance(RR_ZF_ICEBERGS,               []{return logic->IsAdult;}),
+        Entrance(RR_ZF_LAKEBED,                []{return logic->CanUse(RG_IRON_BOOTS);}),
+        //child can break the brown rock without lifting the silver rock and it stays gone for adult, but it's not intuitive and there's no reasonable case where it matters.
+        Entrance(RR_ZF_HIDDEN_CAVE,            []{return logic->CanUse(RG_SILVER_GAUNTLETS) && logic->BlastOrSmash();}),
+        Entrance(RR_ZF_ROCK,                   []{return logic->IsAdult && logic->CanUse(RG_SCARECROW);}),
+        Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, []{return (logic->IsChild && logic->CanUse(RG_BOTTLE_WITH_FISH));}),
+        Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   []{return logic->HasExplosives() || (ctx->GetTrickOption(RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SILVER_GAUNTLETS));}),
+    });
+
+    areaTable[RR_ZF_ICEBERGS] = Region("ZF Icebergs", SCENE_ZORAS_FOUNTAIN, {}, {
+        //Locations
+        LOCATION(RC_ZF_ICEBERG_FREESTANDING_POH, logic->IsAdult),
+    }, {
+        //Exits
+        //This hover is pretty tight, come at it with momentum and aim for the small corner polygon of the big iceburg while spamming roll
+        Entrance(RR_ZORAS_FOUNTAIN, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->HasItem(RG_HOVER_BOOTS);}),
+        Entrance(RR_ZF_LAKEBED,     []{return logic->CanUse(RG_IRON_BOOTS);}),
+        Entrance(RR_ZF_LEDGE,       []{return true;}),
+    });
+
+    areaTable[RR_ZF_LAKEBED] = Region("ZF Lakebed", SCENE_ZORAS_FOUNTAIN, {}, {
+        //Locations
         LOCATION(RC_ZF_BOTTOM_FREESTANDING_POH,       logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
-        LOCATION(RC_ZF_GS_TREE,                       logic->IsChild),
-        LOCATION(RC_ZF_GS_ABOVE_THE_LOG,              logic->IsChild && logic->HookshotOrBoomerang() && logic->CanGetNightTimeGS()),
-        LOCATION(RC_ZF_GS_HIDDEN_CAVE,                logic->CanUse(RG_SILVER_GAUNTLETS) && logic->BlastOrSmash() && logic->HookshotOrBoomerang() && logic->IsAdult && logic->CanGetNightTimeGS()),
-        LOCATION(RC_ZF_HIDDEN_CAVE_POT_1,             logic->CanUse(RG_SILVER_GAUNTLETS) && logic->IsAdult && logic->BlastOrSmash() && logic->CanBreakPots()),
-        LOCATION(RC_ZF_HIDDEN_CAVE_POT_2,             logic->CanUse(RG_SILVER_GAUNTLETS) && logic->IsAdult && logic->BlastOrSmash() && logic->CanBreakPots()),
-        LOCATION(RC_ZF_HIDDEN_CAVE_POT_3,             logic->CanUse(RG_SILVER_GAUNTLETS) && logic->IsAdult && logic->BlastOrSmash() && logic->CanBreakPots()),
-        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY,      logic->CallGossipFairyExceptSuns()),
-        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,  logic->CanUse(RG_SONG_OF_STORMS)),
-        LOCATION(RC_ZF_JABU_GOSSIP_STONE_FAIRY,       logic->CallGossipFairyExceptSuns()),
-        LOCATION(RC_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,   logic->CanUse(RG_SONG_OF_STORMS)),
         LOCATION(RC_ZF_BOTTOM_NORTH_INNER_RUPEE,      logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
         LOCATION(RC_ZF_BOTTOM_NORTHEAST_INNER_RUPEE,  logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
         LOCATION(RC_ZF_BOTTOM_SOUTHEAST_INNER_RUPEE,  logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
@@ -40,25 +67,56 @@ void RegionTable_Init_ZorasFountain() {
         LOCATION(RC_ZF_BOTTOM_SOUTH_OUTER_RUPEE,      logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
         LOCATION(RC_ZF_BOTTOM_SOUTHWEST_OUTER_RUPEE,  logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
         LOCATION(RC_ZF_BOTTOM_NORTHWEST_OUTER_RUPEE,  logic->IsAdult && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
-        LOCATION(RC_ZF_FAIRY_GOSSIP_STONE,            true),
-        LOCATION(RC_ZF_JABU_GOSSIP_STONE,             true),
-        LOCATION(RC_ZF_NEAR_JABU_POT_1,               logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_ZF_NEAR_JABU_POT_2,               logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_ZF_NEAR_JABU_POT_3,               logic->IsChild && logic->CanBreakPots()),
-        LOCATION(RC_ZF_NEAR_JABU_POT_4,               logic->IsChild && logic->CanBreakPots()),
     }, {
         //Exits
-        Entrance(RR_ZD_BEHIND_KING_ZORA,       []{return true;}),
-        Entrance(RR_JABU_JABUS_BELLY_ENTRYWAY, []{return (logic->IsChild && logic->CanUse(RG_BOTTLE_WITH_FISH));}),
-        Entrance(RR_ICE_CAVERN_ENTRYWAY,       []{return logic->IsAdult;}),
-        Entrance(RR_ZF_GREAT_FAIRY_FOUNTAIN,   []{return logic->HasExplosives() || (ctx->GetTrickOption(RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES) && logic->CanUse(RG_MEGATON_HAMMER) && logic->CanUse(RG_SILVER_GAUNTLETS));}),
+        Entrance(RR_ZORAS_FOUNTAIN, []{return logic->HasItem(RG_BRONZE_SCALE);}),
     });
 
-    areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", "ZF Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ZF_LEDGE] = Region("ZF Ledge", SCENE_ZORAS_FOUNTAIN, {}, {}, {
+        //Exits
+        Entrance(RR_ZORAS_FOUNTAIN,      []{return logic->HasItem(RG_BRONZE_SCALE);}),
+        Entrance(RR_ZF_ICEBERGS,         []{return logic->IsAdult;}),
+        Entrance(RR_ZF_LAKEBED,          []{return logic->CanUse(RG_IRON_BOOTS);}),
+        Entrance(RR_ICE_CAVERN_ENTRYWAY, []{return true;}),
+    });
+
+    areaTable[RR_ZF_HIDDEN_CAVE] = Region("ZF Hidden Cave", SCENE_ZORAS_FOUNTAIN, {}, {
+        //Locations
+        LOCATION(RC_ZF_HIDDEN_CAVE_POT_1, logic->IsAdult && logic->CanBreakPots()),
+        LOCATION(RC_ZF_HIDDEN_CAVE_POT_2, logic->IsAdult && logic->CanBreakPots()),
+        LOCATION(RC_ZF_HIDDEN_CAVE_POT_3, logic->IsAdult && logic->CanBreakPots()),
+    }, {
+        //Exits
+        //There are invisible big skultullas here as adult but they do not block the path and can be "seen" with Z-target
+        //Lens is not currently needed for this either, implying they are not considered blocking, but it's open for discussion long-term
+        Entrance(RR_ZF_HIDDEN_LEDGE, []{return true;}),
+    });
+
+    areaTable[RR_ZF_HIDDEN_LEDGE] = Region("ZF Hidden Ledge", SCENE_ZORAS_FOUNTAIN, {}, {
+        //Locations
+        LOCATION(RC_ZF_GS_HIDDEN_CAVE, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOMB_THROW) && logic->CanGetNightTimeGS()),
+    }, {
+        //Exits
+        //It is possible to avoid fall damage by jumping towards the right and landing in deeper water, but this is basically never relevent
+        Entrance(RR_ZORAS_FOUNTAIN, []{return logic->HasItem(RG_BRONZE_SCALE) || logic->TakeDamage();}),
+        Entrance(RR_ZF_HIDDEN_CAVE, []{return true;}),
+    });
+
+    areaTable[RR_ZF_ROCK] = Region("ZF Rock", SCENE_ZORAS_FOUNTAIN, {}, {
+        //Locations
+        //Has a wonder item
+    }, {
+        //Exits
+        Entrance(RR_ZORAS_FOUNTAIN, []{return true;}),
+    });
+
+    areaTable[RR_ZF_GREAT_FAIRY_FOUNTAIN] = Region("ZF Great Fairy Fountain", SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, {}, {
         //Locations
         LOCATION(RC_ZF_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)),
     }, {
         //Exits
         Entrance(RR_ZORAS_FOUNTAIN, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/zora_river.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp
similarity index 75%
rename from soh/soh/Enhancements/randomizer/location_access/overworld/zora_river.cpp
rename to soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp
index 16ac1b2710..5473ee2caa 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/zora_river.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp
@@ -4,21 +4,34 @@
 using namespace Rando;
 
 void RegionTable_Init_ZoraRiver() {
-    areaTable[RR_ZR_FRONT] = Region("ZR Front", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {
+    // clang-format off
+    areaTable[RR_ZR_FRONT] = Region("ZR Front", SCENE_ZORAS_RIVER, {}, {
         //Locations
-        LOCATION(RC_ZR_GS_TREE, logic->IsChild && logic->CanAttack()),
+        LOCATION(RC_ZR_GS_TREE,  logic->IsChild && logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_CLOSE)),
+        LOCATION(RC_ZR_GRASS_1,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_2,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_3,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_4,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_5,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_6,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_7,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_8,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_9,  logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_10, logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_11, logic->CanCutShrubs()),
+        LOCATION(RC_ZR_GRASS_12, logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_ZORAS_RIVER,  []{return logic->IsAdult || logic->BlastOrSmash();}),
         Entrance(RR_HYRULE_FIELD, []{return true;}),
     });
 
-    areaTable[RR_ZORAS_RIVER] = Region("Zora River", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {
+    areaTable[RR_ZORAS_RIVER] = Region("Zora River", SCENE_ZORAS_RIVER, {
         //Events
         EventAccess(&logic->GossipStoneFairy, []{return logic->CallGossipFairy();}),
         EventAccess(&logic->BeanPlantFairy,   []{return logic->IsChild && logic->CanUse(RG_MAGIC_BEAN) && logic->CanUse(RG_SONG_OF_STORMS);}),
-        EventAccess(&logic->ButterflyFairy,   []{return logic->ButterflyFairy   || logic->CanUse(RG_STICKS);}),
-        EventAccess(&logic->BugShrub,         []{return logic->BugShrub         || logic->CanCutShrubs();}),
+        EventAccess(&logic->ButterflyFairy,   []{return logic->CanUse(RG_STICKS);}),
+        EventAccess(&logic->BugShrub,         []{return logic->CanCutShrubs();}),
     }, {
         //Locations
         LOCATION(RC_ZR_MAGIC_BEAN_SALESMAN,                  logic->HasItem(RG_CHILD_WALLET) && logic->IsChild),
@@ -47,6 +60,7 @@ void RegionTable_Init_ZoraRiver() {
         LOCATION(RC_ZR_BENEATH_WATERFALL_RIGHT_RUPEE,        logic->IsAdult && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG))),
         LOCATION(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,            true),
         LOCATION(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,             true),
+        LOCATION(RC_ZR_NEAR_FREESTANDING_POH_GRASS,          logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_ZR_FRONT,            []{return true;}),
@@ -57,13 +71,19 @@ void RegionTable_Init_ZoraRiver() {
         Entrance(RR_ZR_BEHIND_WATERFALL, []{return ctx->GetOption(RSK_SLEEPING_WATERFALL).Is(RO_WATERFALL_OPEN) || Here(RR_ZORAS_RIVER, []{return logic->CanUse(RG_ZELDAS_LULLABY);}) || (logic->IsChild && ctx->GetTrickOption(RT_ZR_CUCCO)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS) && ctx->GetTrickOption(RT_ZR_HOVERS));}),
     });
 
-    areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", "Zora River", {RA_ZORAS_RIVER}, DAY_NIGHT_CYCLE, {}, {}, {
+    areaTable[RR_ZR_FROM_SHORTCUT] = Region("ZR From Shortcut", SCENE_ZORAS_RIVER, TIME_DOESNT_PASS, {RA_ZORAS_RIVER}, {}, {}, {
+        //Exits
+        Entrance(RR_ZORAS_RIVER,    []{return logic->Hearts() > 1 || logic->HasItem(RG_BOTTLE_WITH_FAIRY) || logic->HasItem(RG_BRONZE_SCALE);}),
+        Entrance(RR_THE_LOST_WOODS, []{return logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS);}),
+    });
+
+    areaTable[RR_ZR_BEHIND_WATERFALL] = Region("ZR Behind Waterfall", SCENE_ZORAS_RIVER, {}, {}, {
         //Exits
         Entrance(RR_ZORAS_RIVER,  []{return true;}),
         Entrance(RR_ZORAS_DOMAIN, []{return true;}),
     });
 
-    areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", "ZR Open Grotto", {}, NO_DAY_NIGHT_CYCLE, grottoEvents, {
+    areaTable[RR_ZR_OPEN_GROTTO] = Region("ZR Open Grotto", SCENE_GROTTOS, grottoEvents, {
         //Locations
         LOCATION(RC_ZR_OPEN_GROTTO_CHEST,                  true),
         LOCATION(RC_ZR_OPEN_GROTTO_FISH,                   logic->HasBottle()),
@@ -72,12 +92,16 @@ void RegionTable_Init_ZoraRiver() {
         LOCATION(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,           true),
         LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,           logic->CanBreakLowerBeehives()),
         LOCATION(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,          logic->CanBreakLowerBeehives()),
+        LOCATION(RC_ZR_OPEN_GROTTO_GRASS_1,                logic->CanCutShrubs()),
+        LOCATION(RC_ZR_OPEN_GROTTO_GRASS_2,                logic->CanCutShrubs()),
+        LOCATION(RC_ZR_OPEN_GROTTO_GRASS_3,                logic->CanCutShrubs()),
+        LOCATION(RC_ZR_OPEN_GROTTO_GRASS_4,                logic->CanCutShrubs()),
     }, {
         //Exits
         Entrance(RR_ZORAS_RIVER, []{return true;}),
     });
 
-    areaTable[RR_ZR_FAIRY_GROTTO] = Region("ZR Fairy Grotto", "ZR Fairy Grotto", {}, NO_DAY_NIGHT_CYCLE, {
+    areaTable[RR_ZR_FAIRY_GROTTO] = Region("ZR Fairy Grotto", SCENE_GROTTOS, {
         //Event
         EventAccess(&logic->FreeFairies, []{return true;}),
     }, {
@@ -95,7 +119,7 @@ void RegionTable_Init_ZoraRiver() {
         Entrance(RR_ZORAS_RIVER, []{return true;}),
     });
 
-    areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", "ZR Storms Grotto", {}, NO_DAY_NIGHT_CYCLE, {}, {
+    areaTable[RR_ZR_STORMS_GROTTO] = Region("ZR Storms Grotto", SCENE_GROTTOS, {}, {
         //Locations
         LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_REAR,  logic->CanStunDeku()),
         LOCATION(RC_ZR_DEKU_SCRUB_GROTTO_FRONT, logic->CanStunDeku()),
@@ -104,4 +128,6 @@ void RegionTable_Init_ZoraRiver() {
         //Exits
         Entrance(RR_ZORAS_RIVER, []{return true;}),
     });
-}
\ No newline at end of file
+
+    // clang-format on
+}
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index 1e0b3a7d18..2fea752ccb 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -8,8 +8,7 @@ std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> Rando::StaticData::Che
 
 std::vector<RandomizerCheck> Rando::StaticData::dungeonRewardLocations = {
     // Bosses
-    RC_QUEEN_GOHMA,   RC_KING_DODONGO, RC_BARINADE,
-    RC_PHANTOM_GANON, RC_VOLVAGIA,     RC_MORPHA,   RC_TWINROVA, RC_BONGO_BONGO,
+    RC_QUEEN_GOHMA, RC_KING_DODONGO, RC_BARINADE, RC_PHANTOM_GANON, RC_VOLVAGIA, RC_MORPHA, RC_TWINROVA, RC_BONGO_BONGO,
 };
 
 using namespace Rando;
@@ -17,7 +16,8 @@ using namespace Rando;
 std::vector<RandomizerCheck> Rando::StaticData::GetPondFishLocations() {
     std::vector<RandomizerCheck> pondFishLocations = {};
     for (Location& location : locationTable) {
-        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() == SCENE_FISHING_POND && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() == SCENE_FISHING_POND &&
+            location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
             pondFishLocations.push_back(location.GetRandomizerCheck());
         }
     }
@@ -26,7 +26,8 @@ std::vector<RandomizerCheck> Rando::StaticData::GetPondFishLocations() {
 std::vector<RandomizerCheck> Rando::StaticData::GetOverworldFishLocations() {
     std::vector<RandomizerCheck> overworldFishLocations = {};
     for (Location& location : locationTable) {
-        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() != SCENE_FISHING_POND && location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        if (location.GetRCType() == RCTYPE_FISH && location.GetScene() != SCENE_FISHING_POND &&
+            location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
             overworldFishLocations.push_back(location.GetRandomizerCheck());
         }
     }
@@ -113,8 +114,9 @@ std::vector<RandomizerCheck> Rando::StaticData::GetOverworldFairyLocations() {
     return fairyLocations;
 }
 
-void Rando::StaticData::InitLocationTable() { //                                                      Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                        Flags Short Name                                     Hint Text Key                                                    Vanilla Item                                                        Spoiler Collection Check                                                                                                      Vanilla Progression  Price
+void Rando::StaticData::InitLocationTable() {
     // clang-format off
+    //                                                                                                Randomizer Check                                                 Quest            Type                                Area                                 Actor ID              Scene ID                            Params                        Flags Short Name                                     Hint Text Key                                                    Vanilla Item                                                        Spoiler Collection Check                                                                                                      Vanilla Progression  Price
     locationTable[RC_UNKNOWN_CHECK] =                                                  Location::Base(RC_UNKNOWN_CHECK,                                                RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_INVALID,                      ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Invalid Location", "Invalid Location",        RHT_NONE,                                                        RG_NONE);
     // Kokiri Forest
     locationTable[RC_KF_KOKIRI_SWORD_CHEST] =                                         Location::Chest(RC_KF_KOKIRI_SWORD_CHEST,                                        RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_KOKIRI_FOREST,                1248,                         0x00, "Kokiri Sword Chest",                          RHT_KF_KOKIRI_SWORD_CHEST,                                       RG_KOKIRI_SWORD,                                                                                                                                                                                  true);
@@ -169,14 +171,14 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GV_DEKU_SCRUB_GROTTO_FRONT] =                                     Location::Base(RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                   RCQUEST_BOTH,    RCTYPE_SCRUB,                       RCAREA_GERUDO_VALLEY,                ACTOR_EN_DNS,         SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(0x08, 0xF0),       "Deku Scrub Grotto Front",                     RHT_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RG_BUY_GREEN_POTION,                                    SpoilerCollectionCheck::RandomizerInf(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT),                                  false, 40);
     // Gerudo Fortress
     locationTable[RC_GF_CHEST] =                                                      Location::Chest(RC_GF_CHEST,                                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_GERUDOS_FORTRESS,             1984,                         0x00, "Chest",                                       RHT_GF_CHEST,                                                    RG_PIECE_OF_HEART,                                                                                                                                                                    true);
-    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "GF HBA 1000 Points",                          RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                                      SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               true);
-    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "GF HBA 1500 Points",                          RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       true);
-    // RandoTodo: Do we replace these with the RC_HIDEOUT keys or keep these?
-    locationTable[RC_GF_GERUDO_MEMBERSHIP_CARD] =                                      Location::Base(RC_GF_GERUDO_MEMBERSHIP_CARD,                                    RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                               "GF Gerudo Membership Card",                   RHT_GF_GERUDO_MEMBERSHIP_CARD,                                   RG_GERUDO_MEMBERSHIP_CARD,                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS),                                              true);
-    locationTable[RC_GF_NORTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                         0x0C, "GF North F1 Carpenter",                       RHT_GF_NORTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
-    locationTable[RC_GF_NORTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_NORTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                         0x0A, "GF North F2 Carpenter",                       RHT_GF_NORTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
-    locationTable[RC_GF_SOUTH_F1_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F1_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                         0x0E, "GF South F1 Carpenter",                       RHT_GF_SOUTH_F1_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
-    locationTable[RC_GF_SOUTH_F2_CARPENTER] =                                   Location::Collectable(RC_GF_SOUTH_F2_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                         0x0F, "GF South F2 Carpenter",                       RHT_GF_SOUTH_F2_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
+    locationTable[RC_GF_HBA_1000_POINTS] =                                             Location::Base(RC_GF_HBA_1000_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "HBA 1000 Points",                             RHT_GF_HBA_1000_POINTS,                                          RG_PIECE_OF_HEART,                                      SpoilerCollectionCheck::InfTable(INFTABLE_190),                                                                               true);
+    locationTable[RC_GF_HBA_1500_POINTS] =                                             Location::Base(RC_GF_HBA_1500_POINTS,                                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_GERUDOS_FORTRESS,             0x00,                               "HBA 1500 Points",                             RHT_GF_HBA_1500_POINTS,                                          RG_PROGRESSIVE_BOW,                                     SpoilerCollectionCheck::ItemGetInf(15),                                                                                       true);
+    // Thieves Hideout
+    locationTable[RC_TH_FREED_CARPENTERS] =                                            Location::Base(RC_TH_FREED_CARPENTERS,                                          RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_ID_MAX,         SCENE_THIEVES_HIDEOUT,              0x00,                               "Freed All Carpenters",                        RHT_TH_FREED_CARPENTERS,                                         RG_GERUDO_MEMBERSHIP_CARD,                              SpoilerCollectionCheck::RandomizerInf(RAND_INF_TH_ITEM_FROM_LEADER_OF_FORTRESS),                                              true);
+    locationTable[RC_TH_1_TORCH_CARPENTER] =                                    Location::Collectable(RC_TH_1_TORCH_CARPENTER,                                         RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3089,                         0x0C, "1 Torch Carpenter",                           RHT_TH_1_TORCH_CARPENTER,                                        RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
+    locationTable[RC_TH_DEAD_END_CARPENTER] =                                   Location::Collectable(RC_TH_DEAD_END_CARPENTER,                                        RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              2577,                         0x0A, "Dead End Carpenter",                          RHT_TH_DEAD_END_CARPENTER,                                       RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
+    locationTable[RC_TH_DOUBLE_CELL_CARPENTER] =                                Location::Collectable(RC_TH_DOUBLE_CELL_CARPENTER,                                     RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3601,                         0x0E, "Double Cell Carpenter",                       RHT_TH_DOUBLE_CELL_CARPENTER,                                    RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
+    locationTable[RC_TH_STEEP_SLOPE_CARPENTER] =                                Location::Collectable(RC_TH_STEEP_SLOPE_CARPENTER,                                     RCQUEST_BOTH,    RCTYPE_GF_KEY,                                                           ACTOR_EN_ITEM00,      SCENE_THIEVES_HIDEOUT,              3857,                         0x0F, "Steep Slope Carpenter",                       RHT_TH_STEEP_SLOPE_CARPENTER,                                    RG_GERUDO_FORTRESS_SMALL_KEY,                                                                                                                                                         true);
     // Haunted Wasteland
     locationTable[RC_WASTELAND_CHEST] =                                               Location::Chest(RC_WASTELAND_CHEST,                                              RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_WASTELAND,                    ACTOR_EN_BOX,         SCENE_HAUNTED_WASTELAND,            -30048,                       0x00, "Chest",                                       RHT_WASTELAND_CHEST,                                             RG_PURPLE_RUPEE);
     locationTable[RC_WASTELAND_BOMBCHU_SALESMAN] =                                     Location::Base(RC_WASTELAND_BOMBCHU_SALESMAN,                                   RCQUEST_BOTH,    RCTYPE_MERCHANT,                    RCAREA_WASTELAND,                    ACTOR_ID_MAX,         SCENE_HAUNTED_WASTELAND,            0x00,                               "Carpet Salesman",                             RHT_WASTELAND_BOMBCHU_SALESMAN,                                  RG_BUY_BOMBCHUS_10,                                     SpoilerCollectionCheck::RandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN),                                                    false, 200);
@@ -225,7 +227,7 @@ void Rando::StaticData::InitLocationTable() { //
     // Graveyard
     locationTable[RC_GRAVEYARD_SHIELD_GRAVE_CHEST] =                                  Location::Chest(RC_GRAVEYARD_SHIELD_GRAVE_CHEST,                                 RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN,   21824,                        0x00, "Shield Grave Chest",                          RHT_GRAVEYARD_SHIELD_GRAVE_CHEST,                                RG_HYLIAN_SHIELD);
     locationTable[RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST] =                             Location::Chest(RC_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                            RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_REDEAD_GRAVE,                 -22592,                       0x00, "Heart Piece Grave Chest",                     RHT_GRAVEYARD_HEART_PIECE_GRAVE_CHEST,                           RG_PIECE_OF_HEART,                                                                                                                                                                    true);
-    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                       0x00, "Composers Grave Chest",                       RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5);
+    locationTable[RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST] =                            Location::Chest(RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                           RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_BOX,         SCENE_ROYAL_FAMILYS_TOMB,           -32736,                       0x00, "Royal Family's Tomb Chest",                   RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,                          RG_BOMBS_5);
     locationTable[RC_GRAVEYARD_HOOKSHOT_CHEST] =                                      Location::Chest(RC_GRAVEYARD_HOOKSHOT_CHEST,                                     RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_BOX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    4352,                         0x00, "Hookshot Chest",                              RHT_GRAVEYARD_HOOKSHOT_CHEST,                                    RG_PROGRESSIVE_HOOKSHOT,                                                                                                                                                              true);
     locationTable[RC_GRAVEYARD_FREESTANDING_POH] =                              Location::Collectable(RC_GRAVEYARD_FREESTANDING_POH,                                   RCQUEST_BOTH,    RCTYPE_STANDARD,                                                         ACTOR_EN_ITEM00,      SCENE_GRAVEYARD,                    1030,                         0x04, "Freestanding PoH",                            RHT_GRAVEYARD_FREESTANDING_POH,                                  RG_PIECE_OF_HEART,                                                                                                                                                                    true);
     locationTable[RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH] =                   Location::Collectable(RC_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                        RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_GRAVEYARD,                    ACTOR_EN_ITEM00,      SCENE_WINDMILL_AND_DAMPES_GRAVE,    1798,                         0x07, "Dampe Race Freestanding PoH",                 RHT_GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,                       RG_PIECE_OF_HEART,                                                                                                                                                                    true);
@@ -733,7 +735,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_SFM_GS] =                                                      Location::GSToken(RC_SFM_GS,                                                       RCQUEST_BOTH,                                                                      SCENE_SACRED_FOREST_MEADOW,         19720,                        0x08, "GS",                                          RHT_SFM_GS,                                                                                            0x0D);
     // Hyrule Field
     locationTable[RC_HF_GS_COW_GROTTO] =                                            Location::GSToken(RC_HF_GS_COW_GROTTO,                                             RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      10753,                        0x01, "GS Cow Grotto",                               RHT_HF_GS_COW_GROTTO,                                                                                  0x0A);
-    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      10754,                        0x02, "GS Near Kak Grotto",                          RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             0x0A);
+    locationTable[RC_HF_GS_NEAR_KAK_GROTTO] =                                       Location::GSToken(RC_HF_GS_NEAR_KAK_GROTTO,                                        RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      10754,                        0x02, "GS Stone Bridge Tree Grotto",                 RHT_HF_GS_NEAR_KAK_GROTTO,                                                                             0x0A);
     // Lake Hylia
     locationTable[RC_LH_GS_BEAN_PATCH] =                                            Location::GSToken(RC_LH_GS_BEAN_PATCH,                                             RCQUEST_BOTH,                                                                      SCENE_LAKE_HYLIA,                   29185,                        0x01, "GS Bean Patch",                               RHT_LH_GS_BEAN_PATCH,                                                                                  0x12);
     locationTable[RC_LH_GS_SMALL_ISLAND] =                                          Location::GSToken(RC_LH_GS_SMALL_ISLAND,                                           RCQUEST_BOTH,                                                                      SCENE_LAKE_HYLIA,                   20994,                        0x02, "GS Small Island",                             RHT_LH_GS_SMALL_ISLAND,                                                                                0x12);
@@ -746,7 +748,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_GV_GS_PILLAR] =                                                Location::GSToken(RC_GV_GS_PILLAR,                                                 RCQUEST_BOTH,                                                                      SCENE_GERUDO_VALLEY,                21252,                        0x04, "GS Pillar",                                   RHT_GV_GS_PILLAR,                                                                                      0x13);
     locationTable[RC_GV_GS_BEHIND_TENT] =                                           Location::GSToken(RC_GV_GS_BEHIND_TENT,                                            RCQUEST_BOTH,                                                                      SCENE_GERUDO_VALLEY,                21256,                        0x08, "GS Behind Tent",                              RHT_GV_GS_BEHIND_TENT,                                                                                 0x13);
     // Gerudo Fortress
-    locationTable[RC_GF_GS_ARCHERY_RANGE] =                                         Location::GSToken(RC_GF_GS_ARCHERY_RANGE,                                          RCQUEST_BOTH,                                                                      SCENE_GERUDOS_FORTRESS,             21505,                        0x01, "GS Archery Range",                            RHT_GF_GS_ARCHERY_RANGE,                                                                               0x14);
+    locationTable[RC_GF_HBA_RANGE_GS] =                                         Location::GSToken(RC_GF_HBA_RANGE_GS,                                          RCQUEST_BOTH,                                                                      SCENE_GERUDOS_FORTRESS,             21505,                        0x01, "GS Archery Range",                            RHT_GF_GS_ARCHERY_RANGE,                                                                               0x14);
     locationTable[RC_GF_GS_TOP_FLOOR] =                                             Location::GSToken(RC_GF_GS_TOP_FLOOR,                                              RCQUEST_BOTH,                                                                      SCENE_GERUDOS_FORTRESS,             21506,                        0x02, "GS Top Floor",                                RHT_GF_GS_TOP_FLOOR,                                                                                   0x14);
     // Wasteland & Desert Colossus
     locationTable[RC_WASTELAND_GS] =                                                Location::GSToken(RC_WASTELAND_GS,                                                 RCQUEST_BOTH,                                                                      SCENE_HAUNTED_WASTELAND,            13570,                        0x02, "GS",                                          RHT_WASTELAND_GS,                                                                                      0x15);
@@ -826,54 +828,6 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_DMC_GREAT_FAIRY_REWARD] =                                         Location::Base(RC_DMC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  2,                                  "Great Fairy Reward",                          RHT_DMC_GREAT_FAIRY_REWARD,                                      RG_PROGRESSIVE_MAGIC_METER,                             SpoilerCollectionCheck::RandomizerInf(RAND_INF_DMC_GREAT_FAIRY_REWARD),                                                       true);
     locationTable[RC_OGC_GREAT_FAIRY_REWARD] =                                         Location::Base(RC_OGC_GREAT_FAIRY_REWARD,                                       RCQUEST_BOTH,    RCTYPE_STANDARD,                    RCAREA_HYRULE_CASTLE,                ACTOR_BG_DY_YOSEIZO,  SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC,  3,                                  "OGC Great Fairy Reward", "OGC Great Fairy Reward", RHT_OGC_GREAT_FAIRY_REWARD,                                 RG_DOUBLE_DEFENSE,                                      SpoilerCollectionCheck::RandomizerInf(RAND_INF_OGC_GREAT_FAIRY_REWARD),                                                       true);
 
-    // Songs
-    locationTable[RC_SHEIK_IN_FOREST] =                                                Location::Base(RC_SHEIK_IN_FOREST,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                               "Sheik in Forest",           "Sheik in Forest",           RHT_SHEIK_IN_FOREST,                                  RG_MINUET_OF_FOREST,                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_MINUET_OF_FOREST),                                                    true);
-    locationTable[RC_SHEIK_IN_CRATER] =                                                Location::Base(RC_SHEIK_IN_CRATER,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_DEATH_MOUNTAIN_CRATER,        0x00,                               "Sheik in Crater",           "Sheik in Crater",           RHT_SHEIK_IN_CRATER,                                  RG_BOLERO_OF_FIRE,                                      SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_BOLERO_OF_FIRE),                                                      true);
-    locationTable[RC_SHEIK_IN_ICE_CAVERN] =                                            Location::Base(RC_SHEIK_IN_ICE_CAVERN,                                          RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_ICE_CAVERN,                   0x00,                               "Sheik in Ice Cavern",       "Sheik in Ice Cavern",       RHT_SHEIK_IN_ICE_CAVERN,                              RG_SERENADE_OF_WATER,                                   SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER),                                                   true);
-    locationTable[RC_SHEIK_AT_COLOSSUS] =                                              Location::Base(RC_SHEIK_AT_COLOSSUS,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_DESERT_COLOSSUS,              0x00,                               "Sheik at Colossus",         "Sheik at Colossus",         RHT_SHEIK_AT_COLOSSUS,                                RG_REQUIEM_OF_SPIRIT,                                   SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT),                                                   true);
-    locationTable[RC_SHEIK_IN_KAKARIKO] =                                              Location::Base(RC_SHEIK_IN_KAKARIKO,                                            RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_KAKARIKO_VILLAGE,             0x00,                               "Sheik in Kakariko",         "Sheik in Kakariko",         RHT_SHEIK_IN_KAKARIKO,                                RG_NOCTURNE_OF_SHADOW,                                  SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL),                                               true);
-    locationTable[RC_SHEIK_AT_TEMPLE] =                                                Location::Base(RC_SHEIK_AT_TEMPLE,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_TEMPLE_OF_TIME,               0x00,                               "Sheik at Temple",           "Sheik at Temple",           RHT_SHEIK_AT_TEMPLE,                                  RG_PRELUDE_OF_LIGHT,                                    SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT),                                                    true);
-    locationTable[RC_SONG_FROM_IMPA] =                                                 Location::Base(RC_SONG_FROM_IMPA,                                               RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_HYRULE_CASTLE,                ACTOR_ID_MAX,         SCENE_ID_MAX,                       0x00,                               "Song from Impa",            "Song from Impa",            RHT_SONG_FROM_IMPA,                                   RG_ZELDAS_LULLABY,                                      SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY),                                                      true);
-    locationTable[RC_SONG_FROM_MALON] =                                                Location::Base(RC_SONG_FROM_MALON,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_LON_LON_RANCH,                0x00,                               "Song from Malon",           "Song from Malon",           RHT_SONG_FROM_MALON,                                  RG_EPONAS_SONG,                                         SpoilerCollectionCheck::RandomizerInf(RAND_INF_LEARNED_EPONA_SONG),                                                           true);
-    locationTable[RC_SONG_FROM_SARIA] =                                                Location::Base(RC_SONG_FROM_SARIA,                                              RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_SACRED_FOREST_MEADOW,         0x00,                               "Song from Saria",           "Song from Saria",           RHT_SONG_FROM_SARIA,                                  RG_SARIAS_SONG,                                         SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG),                                                         true);
-    locationTable[RC_SONG_FROM_ROYAL_FAMILYS_TOMB] =                                   Location::Base(RC_SONG_FROM_ROYAL_FAMILYS_TOMB,                                 RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_ROYAL_FAMILYS_TOMB,           0x00,                               "Song from Composers Grave", "Song from Composers Grave", RHT_SONG_FROM_ROYAL_FAMILYS_TOMB,                     RG_SUNS_SONG,                                           SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SUNS_SONG),                                                           true);
-    locationTable[RC_SONG_FROM_OCARINA_OF_TIME] =                                      Location::Base(RC_SONG_FROM_OCARINA_OF_TIME,                                    RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,                                                    ACTOR_ID_MAX,         SCENE_HYRULE_FIELD,                 0x00,                               "Song from Ocarina of Time", "Song from Ocarina of Time", RHT_SONG_FROM_OCARINA_OF_TIME,                        RG_SONG_OF_TIME,                                        SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_TIME),                                                        true);
-    locationTable[RC_SONG_FROM_WINDMILL] =                                             Location::Base(RC_SONG_FROM_WINDMILL,                                           RCQUEST_BOTH,    RCTYPE_SONG_LOCATION,               RCAREA_KAKARIKO_VILLAGE,             ACTOR_ID_MAX,         SCENE_WINDMILL_AND_DAMPES_GRAVE,    0x00,                               "Song from Windmill",        "Song from Windmill",        RHT_SONG_FROM_WINDMILL,                               RG_SONG_OF_STORMS,                                      SpoilerCollectionCheck::EventChkInf(EVENTCHKINF_LEARNED_SONG_OF_STORMS),                                                      true);
-
-    //Beehives
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x2C),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT));
-    locationTable[RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KOKIRI_FOREST,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x2C),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT));
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT] =                          Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x14),       "Near Shortcuts Grotto Beehive Left",          RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT));
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT] =                         Location::Base(RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x14),       "Near Shortcuts Grotto Beehive Right",         RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT));
-    locationTable[RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LOST_WOODS,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(747,  0xF5),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO));
-    locationTable[RC_SFM_STORMS_GROTTO_BEEHIVE] =                                      Location::Base(RC_SFM_STORMS_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_SACRED_FOREST_MEADOW,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEE),       "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO));
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT] =                             Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x00),       "Near Market Grotto Beehive Left",             RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT));
-    locationTable[RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT] =                            Location::Base(RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                          RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x00),       "Near Market Grotto Beehive Right",            RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT));
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x03),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT));
-    locationTable[RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x03),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT));
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT] =                               Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                             RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x22),       "Southeast Grotto Beehive Left",               RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT));
-    locationTable[RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT] =                              Location::Base(RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x22),       "Southeast Grotto Beehive Right",              RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT));
-    locationTable[RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE] =                                 Location::Base(RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_HYRULE_FIELD,                 ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(1410, 0xE6),       "Inside Fence Grotto Beehive",                 RHT_BEEHIVE_LONELY_SCRUB_GROTTO,                                 RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO));
-    locationTable[RC_LLR_GROTTO_BEEHIVE] =                                             Location::Base(RC_LLR_GROTTO_BEEHIVE,                                           RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LON_LON_RANCH,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFC),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LLR_GROTTO));
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT] =                                   Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x28),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT));
-    locationTable[RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT] =                                  Location::Base(RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_KAKARIKO_VILLAGE,             ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x28),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT));
-    locationTable[RC_DMT_COW_GROTTO_BEEHIVE] =                                         Location::Base(RC_DMT_COW_GROTTO_BEEHIVE,                                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2617, 0xF8),       "Cow Grotto Beehive",                          RHT_BEEHIVE_COW_GROTTO,                                          RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_COW_GROTTO));
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT] =                                 Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x57),       "Storms Grotto Beehive Left",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT));
-    locationTable[RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT] =                                Location::Base(RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                              RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_TRAIL,         ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x57),       "Storms Grotto Beehive Right",                 RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT));
-    locationTable[RC_GC_GROTTO_BEEHIVE] =                                              Location::Base(RC_GC_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GORON_CITY,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xFB),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GC_GROTTO));
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT] =                                  Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                                RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x7A),       "Upper Grotto Beehive Left",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT));
-    locationTable[RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT] =                                 Location::Base(RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                               RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x7A),       "Upper Grotto Beehive Right",                  RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT));
-    locationTable[RC_DMC_HAMMER_GROTTO_BEEHIVE] =                                      Location::Base(RC_DMC_HAMMER_GROTTO_BEEHIVE,                                    RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DEATH_MOUNTAIN_CRATER,        ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xF9),       "Hammer Grotto Beehive",                       RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO));
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT] =                                    Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(-144, 0x29),       "Open Grotto Beehive Left",                    RHT_BEEHIVE_CHEST_GROTTO,                                        RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT));
-    locationTable[RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT] =                                   Location::Base(RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(121,  0x29),       "Open Grotto Beehive Right",                   RHT_BEEHIVE_CHEST_GROTTO,                                        RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT));
-    locationTable[RC_ZR_STORMS_GROTTO_BEEHIVE] =                                       Location::Base(RC_ZR_STORMS_GROTTO_BEEHIVE,                                     RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_ZORAS_RIVER,                  ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xEB),       "Storms Grotto Beehive",                       RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO));
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT] =                          Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                        RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(382,  0x00),       "In Front of King Zora Beehive Left",          RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_BLUE_RUPEE,                                          SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT));
-    locationTable[RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT] =                         Location::Base(RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                       RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(948,  0x00),       "In Front of King Zora Beehive Right",         RHT_BEEHIVE_IN_FRONT_OF_KING_ZORA,                               RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT));
-    locationTable[RC_ZD_BEHIND_KING_ZORA_BEEHIVE] =                                    Location::Base(RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                  RCQUEST_BOTH,    RCTYPE_BEEHIVE,                                                          ACTOR_OBJ_COMB,       SCENE_ZORAS_DOMAIN,                 TWO_ACTOR_PARAMS(701,  0x00),       "Behind King Zora Beehive",                    RHT_BEEHIVE_BEHIND_KING_ZORA,                                    RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA));
-    locationTable[RC_LH_GROTTO_BEEHIVE] =                                              Location::Base(RC_LH_GROTTO_BEEHIVE,                                            RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_LAKE_HYLIA,                   ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(5144, 0xEF),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_TRIO_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_LH_GROTTO));
-    locationTable[RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE] =                                   Location::Base(RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                 RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_GERUDO_VALLEY,                ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xF0),       "Deku Scrub Grotto Beehive",                   RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO));
-    locationTable[RC_COLOSSUS_GROTTO_BEEHIVE] =                                        Location::Base(RC_COLOSSUS_GROTTO_BEEHIVE,                                      RCQUEST_BOTH,    RCTYPE_BEEHIVE,                     RCAREA_DESERT_COLOSSUS,              ACTOR_OBJ_COMB,       SCENE_GROTTOS,                      TWO_ACTOR_PARAMS(2262, 0xFD),       "Grotto Beehive",                              RHT_BEEHIVE_SCRUB_PAIR_GROTTO,                                   RG_RED_RUPEE,                                           SpoilerCollectionCheck::RandomizerInf(RAND_INF_BEEHIVE_COLOSSUS_GROTTO));
-
     /*-------------------------------
               --- SHOPS ---
       8     6               2     4
@@ -992,7 +946,7 @@ void Rando::StaticData::InitLocationTable() { //
     locationTable[RC_HF_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_HF_OPEN_GROTTO_GOSSIP_STONE,                      RCQUEST_BOTH,   RCAREA_HYRULE_FIELD,          SCENE_GROTTOS,                      -22947,                             "Open Grotto Gossip Stone");
     locationTable[RC_KAK_OPEN_GROTTO_GOSSIP_STONE] =                              Location::HintStone(RC_KAK_OPEN_GROTTO_GOSSIP_STONE,                     RCQUEST_BOTH,   RCAREA_KAKARIKO_VILLAGE,      SCENE_GROTTOS,                      -22984,                             "Open Grotto Gossip Stone");
     locationTable[RC_ZR_OPEN_GROTTO_GOSSIP_STONE] =                               Location::HintStone(RC_ZR_OPEN_GROTTO_GOSSIP_STONE,                      RCQUEST_BOTH,   RCAREA_ZORAS_RIVER,           SCENE_GROTTOS,                      -22985,                             "Open Grotto Gossip Stone");
-    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,            RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      -22964,                             "Near Shortcuts Gossip Stone");
+    locationTable[RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE] =                     Location::HintStone(RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE,            RCQUEST_BOTH,   RCAREA_LOST_WOODS,            SCENE_GROTTOS,                      -22964,                             "Near Shortcuts Grotto Gossip Stone");
     locationTable[RC_DMT_STORMS_GROTTO_GOSSIP_STONE] =                            Location::HintStone(RC_DMT_STORMS_GROTTO_GOSSIP_STONE,                   RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_TRAIL,  SCENE_GROTTOS,                      -23255,                             "Storms Grotto Gossip Stone");
     locationTable[RC_DMC_UPPER_GROTTO_GOSSIP_STONE] =                             Location::HintStone(RC_DMC_UPPER_GROTTO_GOSSIP_STONE,                    RCQUEST_BOTH,   RCAREA_DEATH_MOUNTAIN_CRATER, SCENE_GROTTOS,                      -23802,                             "Upper Grotto Gossip Stone");
 
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 408ded72e2..442f2b23b3 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -13,795 +13,867 @@
 #include "macros.h"
 #include "variables.h"
 #include <spdlog/spdlog.h>
+#include "StringHelper.h"
+#include "soh/resource/type/Scene.h"
+#include "soh/resource/type/scenecommand/SetTransitionActorList.h"
+#include "src/overlays/actors/ovl_En_Door/z_en_door.h"
+#include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
 
 namespace Rando {
 
-    bool Logic::HasItem(RandomizerGet itemName) {
-        switch (itemName) {
-            case RG_FAIRY_OCARINA:
-                return CheckInventory(ITEM_OCARINA_FAIRY, false);
-            case RG_OCARINA_OF_TIME:
-                return CheckInventory(ITEM_OCARINA_TIME, true);
-            case RG_DINS_FIRE:
-                return CheckInventory(ITEM_DINS_FIRE, true);
-            case RG_FARORES_WIND:
-                return CheckInventory(ITEM_FARORES_WIND, true);
-            case RG_NAYRUS_LOVE:
-                return CheckInventory(ITEM_NAYRUS_LOVE, true);
-            case RG_LENS_OF_TRUTH:
-                return CheckInventory(ITEM_LENS, true);
-            case RG_FAIRY_BOW:
-                return CheckInventory(ITEM_BOW, true);
-            case RG_MEGATON_HAMMER:
-                return CheckInventory(ITEM_HAMMER, true);
-            case RG_HOOKSHOT:
-                return CheckInventory(ITEM_HOOKSHOT, false);
-            case RG_LONGSHOT:
-                return CheckInventory(ITEM_LONGSHOT, true);
-            case RG_PROGRESSIVE_STICK_UPGRADE:
-            case RG_STICKS:
-                return CurrentUpgrade(UPG_STICKS);
-            case RG_FIRE_ARROWS:
-                return CheckInventory(ITEM_ARROW_FIRE, true);
-            case RG_ICE_ARROWS:
-                return CheckInventory(ITEM_ARROW_ICE, true);
-            case RG_LIGHT_ARROWS:
-                return CheckInventory(ITEM_ARROW_LIGHT, true);
-            case RG_PROGRESSIVE_BOMBCHUS:
-            case RG_BOMBCHU_5:
-            case RG_BOMBCHU_10:
-            case RG_BOMBCHU_20:
-                return (BombchusEnabled() && (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant)) || CheckInventory(ITEM_BOMBCHU, true);
-            case RG_FAIRY_SLINGSHOT:
-                return CheckInventory(ITEM_SLINGSHOT, true);
-            case RG_BOOMERANG:
-                return CheckInventory(ITEM_BOOMERANG, true);
-            case RG_PROGRESSIVE_NUT_UPGRADE:
-            case RG_NUTS:
-                return CurrentUpgrade(UPG_NUTS);
-            //RANDOTODO handle cases where the scarecrow is persistent between age better when OI is added
-            case RG_SCARECROW:
-                return ScarecrowsSong() && CanUse(RG_HOOKSHOT);
-            case RG_DISTANT_SCARECROW:
-                return ScarecrowsSong() && CanUse(RG_LONGSHOT);
-            case RG_MAGIC_BEAN:
-                return GetAmmo(ITEM_BEAN) > 0;
-            case RG_KOKIRI_SWORD:
-            case RG_DEKU_SHIELD:
-            case RG_GORON_TUNIC:
-            case RG_ZORA_TUNIC:
-            case RG_HYLIAN_SHIELD:
-            case RG_MIRROR_SHIELD:
-            case RG_MASTER_SWORD:
-            case RG_BIGGORON_SWORD:
-            case RG_IRON_BOOTS:
-            case RG_HOVER_BOOTS:
-                return CheckEquipment(RandoGetToEquipFlag.at(itemName));
-            case RG_GORONS_BRACELET:
-                return CurrentUpgrade(UPG_STRENGTH);
-            case RG_SILVER_GAUNTLETS:
-                return CurrentUpgrade(UPG_STRENGTH) >= 2;
-            case RG_GOLDEN_GAUNTLETS:
-                return CurrentUpgrade(UPG_STRENGTH) >= 3;
-            case RG_PROGRESSIVE_BOMB_BAG:
-            case RG_BOMB_BAG:
-                return CurrentUpgrade(UPG_BOMB_BAG);
-            case RG_MAGIC_SINGLE:
-                return GetSaveContext()->magicLevel >= 1;
-                // Songs
-            case RG_ZELDAS_LULLABY:
-            case RG_EPONAS_SONG:
-            case RG_SARIAS_SONG:
-            case RG_SUNS_SONG:
-            case RG_SONG_OF_TIME:
-            case RG_SONG_OF_STORMS:
-            case RG_MINUET_OF_FOREST:
-            case RG_BOLERO_OF_FIRE:
-            case RG_SERENADE_OF_WATER:
-            case RG_REQUIEM_OF_SPIRIT:
-            case RG_NOCTURNE_OF_SHADOW:
-            case RG_PRELUDE_OF_LIGHT:
-                // Dungeon Rewards
-            case RG_KOKIRI_EMERALD:
-            case RG_GORON_RUBY:
-            case RG_ZORA_SAPPHIRE:
-            case RG_FOREST_MEDALLION:
-            case RG_FIRE_MEDALLION:
-            case RG_WATER_MEDALLION:
-            case RG_SPIRIT_MEDALLION:
-            case RG_SHADOW_MEDALLION:
-            case RG_LIGHT_MEDALLION:
-                // Misc Quest Items
-            case RG_STONE_OF_AGONY:
-            case RG_GERUDO_MEMBERSHIP_CARD:
-                return CheckQuestItem(RandoGetToQuestItem.at(itemName));
-            case RG_RUTOS_LETTER:
-                return CheckEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
-            case RG_DOUBLE_DEFENSE:
-                return GetSaveContext()->isDoubleDefenseAcquired;
-            case RG_FISHING_POLE:
-            case RG_ZELDAS_LETTER:
-            case RG_WEIRD_EGG:
-            case RG_GREG_RUPEE:
-                // Ocarina Buttons
-            case RG_OCARINA_A_BUTTON:
-            case RG_OCARINA_C_LEFT_BUTTON:
-            case RG_OCARINA_C_RIGHT_BUTTON:
-            case RG_OCARINA_C_DOWN_BUTTON:
-            case RG_OCARINA_C_UP_BUTTON:
-                // Boss Souls
-            case RG_GOHMA_SOUL:
-            case RG_KING_DODONGO_SOUL:
-            case RG_BARINADE_SOUL:
-            case RG_PHANTOM_GANON_SOUL:
-            case RG_VOLVAGIA_SOUL:
-            case RG_MORPHA_SOUL:
-            case RG_BONGO_BONGO_SOUL:
-            case RG_TWINROVA_SOUL:
-            case RG_GANON_SOUL:
-            case RG_SKELETON_KEY:
-                // Overworld Keys
-            case RG_GUARD_HOUSE_KEY:
-            case RG_MARKET_BAZAAR_KEY:
-            case RG_MARKET_POTION_SHOP_KEY:
-            case RG_MASK_SHOP_KEY:
-            case RG_MARKET_SHOOTING_GALLERY_KEY:
-            case RG_BOMBCHU_BOWLING_KEY:
-            case RG_TREASURE_CHEST_GAME_BUILDING_KEY:
-            case RG_BOMBCHU_SHOP_KEY:
-            case RG_RICHARDS_HOUSE_KEY:
-            case RG_ALLEY_HOUSE_KEY:
-            case RG_KAK_BAZAAR_KEY:
-            case RG_KAK_POTION_SHOP_KEY:
-            case RG_BOSS_HOUSE_KEY:
-            case RG_GRANNYS_POTION_SHOP_KEY:
-            case RG_SKULLTULA_HOUSE_KEY:
-            case RG_IMPAS_HOUSE_KEY:
-            case RG_WINDMILL_KEY:
-            case RG_KAK_SHOOTING_GALLERY_KEY:
-            case RG_DAMPES_HUT_KEY:
-            case RG_TALONS_HOUSE_KEY:
-            case RG_STABLES_KEY:
-            case RG_BACK_TOWER_KEY:
-            case RG_HYLIA_LAB_KEY:
-            case RG_FISHING_HOLE_KEY:
-                return CheckRandoInf(RandoGetToRandInf.at(itemName));
-                // Boss Keys
-            case RG_EPONA:
-                return FreedEpona;
-            case RG_FOREST_TEMPLE_BOSS_KEY:
-            case RG_FIRE_TEMPLE_BOSS_KEY:
-            case RG_WATER_TEMPLE_BOSS_KEY:
-            case RG_SPIRIT_TEMPLE_BOSS_KEY:
-            case RG_SHADOW_TEMPLE_BOSS_KEY:
-            case RG_GANONS_CASTLE_BOSS_KEY:
-                return CheckDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.at(itemName));
-                // Maps
-            case RG_DEKU_TREE_MAP:
-            case RG_DODONGOS_CAVERN_MAP:
-            case RG_JABU_JABUS_BELLY_MAP:
-            case RG_FOREST_TEMPLE_MAP:
-            case RG_FIRE_TEMPLE_MAP:
-            case RG_WATER_TEMPLE_MAP:
-            case RG_SPIRIT_TEMPLE_MAP:
-            case RG_SHADOW_TEMPLE_MAP:
-            case RG_BOTTOM_OF_THE_WELL_MAP:
-            case RG_ICE_CAVERN_MAP:
-                return CheckDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.at(itemName));
-                // Compasses
-            case RG_DEKU_TREE_COMPASS:
-            case RG_DODONGOS_CAVERN_COMPASS:
-            case RG_JABU_JABUS_BELLY_COMPASS:
-            case RG_FOREST_TEMPLE_COMPASS:
-            case RG_FIRE_TEMPLE_COMPASS:
-            case RG_WATER_TEMPLE_COMPASS:
-            case RG_SPIRIT_TEMPLE_COMPASS:
-            case RG_SHADOW_TEMPLE_COMPASS:
-            case RG_BOTTOM_OF_THE_WELL_COMPASS:
-            case RG_ICE_CAVERN_COMPASS:
-                return CheckDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.at(itemName));
-                // Wallets
-            case RG_CHILD_WALLET:
-                return CheckRandoInf(RAND_INF_HAS_WALLET);
-            case RG_ADULT_WALLET:
-                return CurrentUpgrade(UPG_WALLET) >= 1;
-            case RG_GIANT_WALLET:
-                return CurrentUpgrade(UPG_WALLET) >= 2;
-            case RG_TYCOON_WALLET:
-                return CurrentUpgrade(UPG_WALLET) >= 3;
-                // Scales
-            case RG_BRONZE_SCALE:
-                return CheckRandoInf(RAND_INF_CAN_SWIM);
-            case RG_SILVER_SCALE:
-                return CurrentUpgrade(UPG_SCALE) >= 1;
-            case RG_GOLDEN_SCALE:
-                return CurrentUpgrade(UPG_SCALE) >= 2;
-            case RG_POCKET_EGG:
-            case RG_COJIRO:
-            case RG_ODD_MUSHROOM:
-            case RG_ODD_POTION:
-            case RG_POACHERS_SAW:
-            case RG_BROKEN_SWORD:
-            case RG_PRESCRIPTION:
-            case RG_EYEBALL_FROG:
-            case RG_EYEDROPS:
-            case RG_CLAIM_CHECK:
-                return CheckRandoInf(itemName - RG_POCKET_EGG + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG);
-            case RG_BOTTLE_WITH_BIG_POE:
-            case RG_BOTTLE_WITH_BLUE_FIRE:
-            case RG_BOTTLE_WITH_BLUE_POTION:
-            case RG_BOTTLE_WITH_BUGS:
-            case RG_BOTTLE_WITH_FAIRY:
-            case RG_BOTTLE_WITH_FISH:
-            case RG_BOTTLE_WITH_GREEN_POTION:
-            case RG_BOTTLE_WITH_MILK:
-            case RG_BOTTLE_WITH_POE:
-            case RG_BOTTLE_WITH_RED_POTION:
-            case RG_EMPTY_BOTTLE:
-                return HasBottle();
-            default:
-                break;
-        }
-        SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(itemName));
-        assert(false);
-        return false;
-    }
-
-    //Can the passed in item be used?
-    //RANDOTODO catch magic items explicitly and add an assert on miss.
-    bool Logic::CanUse(RandomizerGet itemName) {
-        if (!HasItem(itemName))
-            return false;
-
-        switch (itemName) {
-            // Magic items
-            case RG_MAGIC_SINGLE:
-                return AmmoCanDrop || (HasBottle() && GetInLogic(LOGIC_BUY_MAGIC_POTION));
-            case RG_DINS_FIRE:
-            case RG_FARORES_WIND:
-            case RG_NAYRUS_LOVE:
-            case RG_LENS_OF_TRUTH:
-                return CanUse(RG_MAGIC_SINGLE);
-            case RG_FIRE_ARROWS:
-            case RG_ICE_ARROWS:
-            case RG_LIGHT_ARROWS:
-                return CanUse(RG_MAGIC_SINGLE) && CanUse(RG_FAIRY_BOW);
-
-            // Adult items
-            // TODO: Uncomment those if we ever implement more item usability settings
-            case RG_FAIRY_BOW:
-                return IsAdult && (AmmoCanDrop || GetInLogic(LOGIC_BUY_ARROW));// || BowAsChild;
-            case RG_MEGATON_HAMMER:
-                return IsAdult;// || HammerAsChild;
-            case RG_IRON_BOOTS:
-                return IsAdult;// || IronBootsAsChild;
-            case RG_HOVER_BOOTS:
-                return IsAdult;// || HoverBootsAsChild;
-            case RG_HOOKSHOT:
-            case RG_LONGSHOT:
-            case RG_SCARECROW:
-            case RG_DISTANT_SCARECROW:
-                return IsAdult;// || HookshotAsChild;
-            case RG_GORON_TUNIC:
-                return IsAdult;// || GoronTunicAsChild;
-            case RG_ZORA_TUNIC:
-                return IsAdult;// || ZoraTunicAsChild;
-            case RG_MIRROR_SHIELD:
-                return IsAdult;// || MirrorShieldAsChild;
-            case RG_MASTER_SWORD:
-                return IsAdult;// || MasterSwordAsChild;
-            case RG_BIGGORON_SWORD:
-                return IsAdult;// || BiggoronSwordAsChild;
-            case RG_SILVER_GAUNTLETS:
-            case RG_GOLDEN_GAUNTLETS:
-            // Adult Trade
-            case RG_POCKET_EGG:
-            case RG_COJIRO:
-            case RG_ODD_MUSHROOM:
-            case RG_ODD_POTION:
-            case RG_POACHERS_SAW:
-            case RG_BROKEN_SWORD:
-            case RG_PRESCRIPTION:
-            case RG_EYEBALL_FROG:
-            case RG_EYEDROPS:
-            case RG_CLAIM_CHECK:
-                return IsAdult;
-
-            // Child items
-            case RG_FAIRY_SLINGSHOT:
-                return IsChild && (AmmoCanDrop || GetInLogic(LOGIC_BUY_SEED));// || SlingshotAsAdult;
-            case RG_BOOMERANG:
-                return IsChild;// || BoomerangAsAdult;
-            case RG_KOKIRI_SWORD:
-                return IsChild;// || KokiriSwordAsAdult;
-            case RG_NUTS:
-                return (NutPot  || NutCrate || DekuBabaNuts) && AmmoCanDrop; //RANDOTODO BuyNuts currently mixed in with Nuts, should be seperate as BuyNuts are also a Nuts source
-            case RG_STICKS:
-                return IsChild /* || StickAsAdult;*/&& (StickPot || DekuBabaSticks);
-            case RG_DEKU_SHIELD:
-                return IsChild;// || DekuShieldAsAdult;
-            case RG_PROGRESSIVE_BOMB_BAG:
-            case RG_BOMB_BAG:
-                return AmmoCanDrop || GetInLogic(LOGIC_BUY_BOMB);
-            case RG_PROGRESSIVE_BOMBCHUS:
-            case RG_BOMBCHU_5:
-            case RG_BOMBCHU_10:
-            case RG_BOMBCHU_20:
-                return BombchuRefill() && BombchusEnabled();
-            case RG_WEIRD_EGG:
-            case RG_RUTOS_LETTER:
-                return IsChild;
-            case RG_MAGIC_BEAN:
-                return IsChild;
-
+bool Logic::HasItem(RandomizerGet itemName) {
+    switch (itemName) {
+        case RG_FAIRY_OCARINA:
+            return CheckInventory(ITEM_OCARINA_FAIRY, false);
+        case RG_OCARINA_OF_TIME:
+            return CheckInventory(ITEM_OCARINA_TIME, true);
+        case RG_DINS_FIRE:
+            return CheckInventory(ITEM_DINS_FIRE, true);
+        case RG_FARORES_WIND:
+            return CheckInventory(ITEM_FARORES_WIND, true);
+        case RG_NAYRUS_LOVE:
+            return CheckInventory(ITEM_NAYRUS_LOVE, true);
+        case RG_LENS_OF_TRUTH:
+            return CheckInventory(ITEM_LENS, true);
+        case RG_FAIRY_BOW:
+            return CheckInventory(ITEM_BOW, true);
+        case RG_MEGATON_HAMMER:
+            return CheckInventory(ITEM_HAMMER, true);
+        case RG_HOOKSHOT:
+            return CheckInventory(ITEM_HOOKSHOT, false);
+        case RG_LONGSHOT:
+            return CheckInventory(ITEM_LONGSHOT, true);
+        case RG_PROGRESSIVE_STICK_UPGRADE:
+        case RG_STICKS:
+            return CurrentUpgrade(UPG_STICKS);
+        case RG_FIRE_ARROWS:
+            return CheckInventory(ITEM_ARROW_FIRE, true);
+        case RG_ICE_ARROWS:
+            return CheckInventory(ITEM_ARROW_ICE, true);
+        case RG_LIGHT_ARROWS:
+            return CheckInventory(ITEM_ARROW_LIGHT, true);
+        case RG_PROGRESSIVE_BOMBCHUS:
+        case RG_BOMBCHU_5:
+        case RG_BOMBCHU_10:
+        case RG_BOMBCHU_20:
+            return (BombchusEnabled() && (GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant)) ||
+                   CheckInventory(ITEM_BOMBCHU, true);
+        case RG_FAIRY_SLINGSHOT:
+            return CheckInventory(ITEM_SLINGSHOT, true);
+        case RG_BOOMERANG:
+            return CheckInventory(ITEM_BOOMERANG, true);
+        case RG_PROGRESSIVE_NUT_UPGRADE:
+        case RG_NUTS:
+            return CurrentUpgrade(UPG_NUTS);
+        // RANDOTODO handle cases where the scarecrow is persistent between age better when OI is added
+        case RG_SCARECROW:
+            return ScarecrowsSong() && CanUse(RG_HOOKSHOT);
+        case RG_DISTANT_SCARECROW:
+            return ScarecrowsSong() && CanUse(RG_LONGSHOT);
+        case RG_MAGIC_BEAN:
+            return GetAmmo(ITEM_BEAN) > 0 || CheckInventory(ITEM_BEAN, true);
+        case RG_KOKIRI_SWORD:
+        case RG_DEKU_SHIELD:
+        case RG_GORON_TUNIC:
+        case RG_ZORA_TUNIC:
+        case RG_HYLIAN_SHIELD:
+        case RG_MIRROR_SHIELD:
+        case RG_MASTER_SWORD:
+        case RG_BIGGORON_SWORD:
+        case RG_IRON_BOOTS:
+        case RG_HOVER_BOOTS:
+            return CheckEquipment(RandoGetToEquipFlag.at(itemName));
+        case RG_GORONS_BRACELET:
+            return CurrentUpgrade(UPG_STRENGTH);
+        case RG_SILVER_GAUNTLETS:
+            return CurrentUpgrade(UPG_STRENGTH) >= 2;
+        case RG_GOLDEN_GAUNTLETS:
+            return CurrentUpgrade(UPG_STRENGTH) >= 3;
+        case RG_PROGRESSIVE_BOMB_BAG:
+        case RG_BOMB_BAG:
+            return CurrentUpgrade(UPG_BOMB_BAG);
+        case RG_MAGIC_SINGLE:
+            return GetSaveContext()->magicLevel >= 1 || GetSaveContext()->isMagicAcquired;
             // Songs
-            case RG_ZELDAS_LULLABY:
-            case RG_EPONAS_SONG:
-            case RG_PRELUDE_OF_LIGHT:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
-            case RG_SARIAS_SONG:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
-            case RG_SUNS_SONG:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
-            case RG_SONG_OF_TIME:
-            case RG_BOLERO_OF_FIRE:
-            case RG_REQUIEM_OF_SPIRIT:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
-            case RG_SONG_OF_STORMS:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
-            case RG_MINUET_OF_FOREST:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
-            case RG_SERENADE_OF_WATER:
-            case RG_NOCTURNE_OF_SHADOW:
-                return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
-            
-            // Misc. Items
-            case RG_FISHING_POLE:
-                return HasItem(RG_CHILD_WALLET); // as long as you have enough rubies
-            case RG_EPONA:
-                return IsAdult && CanUse(RG_EPONAS_SONG);
-
-            // Bottle Items
-            case RG_BOTTLE_WITH_BUGS:
-                return BugShrub || WanderingBugs || BugRock || GetInLogic(LOGIC_BUGS_ACCESS);
-            case RG_BOTTLE_WITH_FISH:
-                return LoneFish || FishGroup || GetInLogic(LOGIC_FISH_ACCESS); //is there any need to care about lone vs group?
-            case RG_BOTTLE_WITH_BLUE_FIRE: //RANDOTODO should probably be better named
-                return BlueFireAccess || GetInLogic(LOGIC_BLUE_FIRE_ACCESS);
-            case RG_BOTTLE_WITH_FAIRY:
-                return FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond || GetInLogic(LOGIC_FAIRY_ACCESS);
-
-            default:
-                SPDLOG_ERROR("CanUse reached `default` for {}. Assuming intention is no extra requirements for use so returning true, but HasItem should be used instead.", static_cast<uint32_t>(itemName));
-                assert(false);
-                return true;
-        }
+        case RG_ZELDAS_LULLABY:
+        case RG_EPONAS_SONG:
+        case RG_SARIAS_SONG:
+        case RG_SUNS_SONG:
+        case RG_SONG_OF_TIME:
+        case RG_SONG_OF_STORMS:
+        case RG_MINUET_OF_FOREST:
+        case RG_BOLERO_OF_FIRE:
+        case RG_SERENADE_OF_WATER:
+        case RG_REQUIEM_OF_SPIRIT:
+        case RG_NOCTURNE_OF_SHADOW:
+        case RG_PRELUDE_OF_LIGHT:
+            // Dungeon Rewards
+        case RG_KOKIRI_EMERALD:
+        case RG_GORON_RUBY:
+        case RG_ZORA_SAPPHIRE:
+        case RG_FOREST_MEDALLION:
+        case RG_FIRE_MEDALLION:
+        case RG_WATER_MEDALLION:
+        case RG_SPIRIT_MEDALLION:
+        case RG_SHADOW_MEDALLION:
+        case RG_LIGHT_MEDALLION:
+            // Misc Quest Items
+        case RG_STONE_OF_AGONY:
+        case RG_GERUDO_MEMBERSHIP_CARD:
+            return CheckQuestItem(RandoGetToQuestItem.at(itemName));
+        case RG_DOUBLE_DEFENSE:
+            return GetSaveContext()->isDoubleDefenseAcquired;
+        case RG_FISHING_POLE:
+        case RG_ZELDAS_LETTER:
+        case RG_WEIRD_EGG:
+        case RG_GREG_RUPEE:
+            // Ocarina Buttons
+        case RG_OCARINA_A_BUTTON:
+        case RG_OCARINA_C_LEFT_BUTTON:
+        case RG_OCARINA_C_RIGHT_BUTTON:
+        case RG_OCARINA_C_DOWN_BUTTON:
+        case RG_OCARINA_C_UP_BUTTON:
+            // Boss Souls
+        case RG_GOHMA_SOUL:
+        case RG_KING_DODONGO_SOUL:
+        case RG_BARINADE_SOUL:
+        case RG_PHANTOM_GANON_SOUL:
+        case RG_VOLVAGIA_SOUL:
+        case RG_MORPHA_SOUL:
+        case RG_BONGO_BONGO_SOUL:
+        case RG_TWINROVA_SOUL:
+        case RG_GANON_SOUL:
+        case RG_SKELETON_KEY:
+            // Overworld Keys
+        case RG_GUARD_HOUSE_KEY:
+        case RG_MARKET_BAZAAR_KEY:
+        case RG_MARKET_POTION_SHOP_KEY:
+        case RG_MASK_SHOP_KEY:
+        case RG_MARKET_SHOOTING_GALLERY_KEY:
+        case RG_BOMBCHU_BOWLING_KEY:
+        case RG_TREASURE_CHEST_GAME_BUILDING_KEY:
+        case RG_BOMBCHU_SHOP_KEY:
+        case RG_RICHARDS_HOUSE_KEY:
+        case RG_ALLEY_HOUSE_KEY:
+        case RG_KAK_BAZAAR_KEY:
+        case RG_KAK_POTION_SHOP_KEY:
+        case RG_BOSS_HOUSE_KEY:
+        case RG_GRANNYS_POTION_SHOP_KEY:
+        case RG_SKULLTULA_HOUSE_KEY:
+        case RG_IMPAS_HOUSE_KEY:
+        case RG_WINDMILL_KEY:
+        case RG_KAK_SHOOTING_GALLERY_KEY:
+        case RG_DAMPES_HUT_KEY:
+        case RG_TALONS_HOUSE_KEY:
+        case RG_STABLES_KEY:
+        case RG_BACK_TOWER_KEY:
+        case RG_HYLIA_LAB_KEY:
+        case RG_FISHING_HOLE_KEY:
+        case RG_RUTOS_LETTER:
+            return CheckRandoInf(RandoGetToRandInf.at(itemName));
+            // Boss Keys
+        case RG_EPONA:
+            return FreedEpona;
+        case RG_FOREST_TEMPLE_BOSS_KEY:
+        case RG_FIRE_TEMPLE_BOSS_KEY:
+        case RG_WATER_TEMPLE_BOSS_KEY:
+        case RG_SPIRIT_TEMPLE_BOSS_KEY:
+        case RG_SHADOW_TEMPLE_BOSS_KEY:
+        case RG_GANONS_CASTLE_BOSS_KEY:
+            return CheckDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.at(itemName));
+            // Maps
+        case RG_DEKU_TREE_MAP:
+        case RG_DODONGOS_CAVERN_MAP:
+        case RG_JABU_JABUS_BELLY_MAP:
+        case RG_FOREST_TEMPLE_MAP:
+        case RG_FIRE_TEMPLE_MAP:
+        case RG_WATER_TEMPLE_MAP:
+        case RG_SPIRIT_TEMPLE_MAP:
+        case RG_SHADOW_TEMPLE_MAP:
+        case RG_BOTTOM_OF_THE_WELL_MAP:
+        case RG_ICE_CAVERN_MAP:
+            return CheckDungeonItem(DUNGEON_MAP, RandoGetToDungeonScene.at(itemName));
+            // Compasses
+        case RG_DEKU_TREE_COMPASS:
+        case RG_DODONGOS_CAVERN_COMPASS:
+        case RG_JABU_JABUS_BELLY_COMPASS:
+        case RG_FOREST_TEMPLE_COMPASS:
+        case RG_FIRE_TEMPLE_COMPASS:
+        case RG_WATER_TEMPLE_COMPASS:
+        case RG_SPIRIT_TEMPLE_COMPASS:
+        case RG_SHADOW_TEMPLE_COMPASS:
+        case RG_BOTTOM_OF_THE_WELL_COMPASS:
+        case RG_ICE_CAVERN_COMPASS:
+            return CheckDungeonItem(DUNGEON_COMPASS, RandoGetToDungeonScene.at(itemName));
+            // Wallets
+        case RG_CHILD_WALLET:
+            return CheckRandoInf(RAND_INF_HAS_WALLET);
+        case RG_ADULT_WALLET:
+            return CurrentUpgrade(UPG_WALLET) >= 1;
+        case RG_GIANT_WALLET:
+            return CurrentUpgrade(UPG_WALLET) >= 2;
+        case RG_TYCOON_WALLET:
+            return CurrentUpgrade(UPG_WALLET) >= 3;
+            // Scales
+        case RG_BRONZE_SCALE:
+            return CheckRandoInf(RAND_INF_CAN_SWIM);
+        case RG_SILVER_SCALE:
+            return CurrentUpgrade(UPG_SCALE) >= 1;
+        case RG_GOLDEN_SCALE:
+            return CurrentUpgrade(UPG_SCALE) >= 2;
+        case RG_POCKET_EGG:
+            return CheckRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG);
+        case RG_COJIRO:
+        case RG_ODD_MUSHROOM:
+        case RG_ODD_POTION:
+        case RG_POACHERS_SAW:
+        case RG_BROKEN_SWORD:
+        case RG_PRESCRIPTION:
+        case RG_EYEBALL_FROG:
+        case RG_EYEDROPS:
+        case RG_CLAIM_CHECK:
+            return CheckRandoInf(itemName - RG_COJIRO + RAND_INF_ADULT_TRADES_HAS_COJIRO);
+        case RG_BOTTLE_WITH_BIG_POE:
+        case RG_BOTTLE_WITH_BLUE_FIRE:
+        case RG_BOTTLE_WITH_BLUE_POTION:
+        case RG_BOTTLE_WITH_BUGS:
+        case RG_BOTTLE_WITH_FAIRY:
+        case RG_BOTTLE_WITH_FISH:
+        case RG_BOTTLE_WITH_GREEN_POTION:
+        case RG_BOTTLE_WITH_MILK:
+        case RG_BOTTLE_WITH_POE:
+        case RG_BOTTLE_WITH_RED_POTION:
+        case RG_EMPTY_BOTTLE:
+            return HasBottle();
+        default:
+            break;
     }
+    SPDLOG_ERROR("HasItem reached `return false;`. Missing case for RandomizerGet of {}",
+                 static_cast<uint32_t>(itemName));
+    assert(false);
+    return false;
+}
 
-    bool Logic::HasProjectile(HasProjectileAge age) {
-        return HasExplosives() ||
-               (age == HasProjectileAge::Child  && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))) ||
-               (age == HasProjectileAge::Adult  && (CanUse(RG_HOOKSHOT)  || CanUse(RG_FAIRY_BOW)      )) ||
-               (age == HasProjectileAge::Both   && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))  && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) ||
-               (age == HasProjectileAge::Either && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)   ||  CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW)));
-    }
-
-    bool Logic::HasBossSoul(RandomizerGet itemName) {
-        if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
-            return true;
-        }
-        switch(itemName) {
-            case RG_GOHMA_SOUL:
-            case RG_KING_DODONGO_SOUL:
-            case RG_BARINADE_SOUL:
-            case RG_PHANTOM_GANON_SOUL:
-            case RG_VOLVAGIA_SOUL:
-            case RG_MORPHA_SOUL:
-            case RG_BONGO_BONGO_SOUL:
-            case RG_TWINROVA_SOUL:
-                return HasItem(itemName);
-            case RG_GANON_SOUL:
-                return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? HasItem(RG_GANON_SOUL) : true;
-            default:
-                return false;
-        }
-    }
-
-    bool Logic::CanOpenOverworldDoor(RandomizerGet key) {
-        if (!ctx->GetOption(RSK_LOCK_OVERWORLD_DOORS)) {
-            return true;
-        }
-
-        if (HasItem(RG_SKELETON_KEY)) {
-            return true;
-        }
-
-        return HasItem(key);
-    }
-
-    uint8_t GetDifficultyValueFromString(Rando::Option& glitchOption) {
-        return 0;
-    }
-
-    //todo rewrite glitch section
-
-    bool Logic::CanEquipSwap(RandomizerGet itemName) {
-        if (!HasItem(itemName))
-            return false;
-    
-        if (CanDoGlitch(GlitchType::EquipSwapDins) || CanDoGlitch(GlitchType::EquipSwap))
-            return true;
-
+// Can the passed in item be used?
+// RANDOTODO catch magic items explicitly and add an assert on miss.
+bool Logic::CanUse(RandomizerGet itemName) {
+    if (!HasItem(itemName))
         return false;
-    }
 
-    bool Logic::CanDoGlitch(GlitchType glitch) {
-        // TODO: Uncomment when glitches are implemented
-        switch(glitch) {
-            case GlitchType::EquipSwapDins:
-                return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) && false; //GlitchEquipSwapDins;
-            case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child item equippable list
-                return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) || (IsChild && (HasItem(RG_STICKS) || 
-                    HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) || HasBottle() || CanUse(RG_NUTS) || HasItem(RG_FAIRY_OCARINA) || HasItem(RG_LENS_OF_TRUTH) || HasExplosives() ||
-                    GetAmmo(ITEM_BEAN) > 0 || HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) && false; //GlitchEquipSwap;
-        }
+    switch (itemName) {
+        // Magic items
+        case RG_MAGIC_SINGLE:
+            return AmmoCanDrop || (HasBottle() && GetInLogic(LOGIC_BUY_MAGIC_POTION));
+        case RG_DINS_FIRE:
+        case RG_FARORES_WIND:
+        case RG_NAYRUS_LOVE:
+        case RG_LENS_OF_TRUTH:
+            return CanUse(RG_MAGIC_SINGLE);
+        case RG_FIRE_ARROWS:
+        case RG_ICE_ARROWS:
+        case RG_LIGHT_ARROWS:
+            return CanUse(RG_MAGIC_SINGLE) && CanUse(RG_FAIRY_BOW);
 
-        //Shouldn't be reached
-        return false;
-    }
+        // Adult items
+        // TODO: Uncomment those if we ever implement more item usability settings
+        case RG_FAIRY_BOW:
+            return IsAdult && (AmmoCanDrop || GetInLogic(LOGIC_BUY_ARROW)); // || BowAsChild;
+        case RG_MEGATON_HAMMER:
+            return IsAdult; // || HammerAsChild;
+        case RG_IRON_BOOTS:
+            return IsAdult; // || IronBootsAsChild;
+        case RG_HOVER_BOOTS:
+            return IsAdult; // || HoverBootsAsChild;
+        case RG_HOOKSHOT:
+        case RG_LONGSHOT:
+        case RG_SCARECROW:
+        case RG_DISTANT_SCARECROW:
+            return IsAdult; // || HookshotAsChild;
+        case RG_GORON_TUNIC:
+            return IsAdult; // || GoronTunicAsChild;
+        case RG_ZORA_TUNIC:
+            return IsAdult; // || ZoraTunicAsChild;
+        case RG_MIRROR_SHIELD:
+            return IsAdult; // || MirrorShieldAsChild;
+        case RG_MASTER_SWORD:
+            return IsAdult; // || MasterSwordAsChild;
+        case RG_BIGGORON_SWORD:
+            return IsAdult; // || BiggoronSwordAsChild;
+        case RG_SILVER_GAUNTLETS:
+        case RG_GOLDEN_GAUNTLETS:
+        // Adult Trade
+        case RG_POCKET_EGG:
+        case RG_COJIRO:
+        case RG_ODD_MUSHROOM:
+        case RG_ODD_POTION:
+        case RG_POACHERS_SAW:
+        case RG_BROKEN_SWORD:
+        case RG_PRESCRIPTION:
+        case RG_EYEBALL_FROG:
+        case RG_EYEDROPS:
+        case RG_CLAIM_CHECK:
+            return IsAdult;
 
-//RANDOTODO quantity is a placeholder for proper ammo use calculation logic. in time will want updating to account for ammo capacity
-//Can we kill this enemy
-    bool Logic::CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wallOrFloor, uint8_t quantity, bool timer, bool inWater) {
-        bool killed = false;
-        switch(enemy) {
-            case RE_GOLD_SKULLTULA:
-                switch (distance){
-                    case ED_CLOSE:
-                        //hammer jumpslash cannot damage these, but hammer swing can
-                        killed = CanUse(RG_MEGATON_HAMMER);
-                        [[fallthrough]];
-                    case ED_SHORT_JUMPSLASH:
-                        killed = killed || CanUse(RG_KOKIRI_SWORD);
-                        [[fallthrough]];
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                        killed = killed || CanUse(RG_MASTER_SWORD);
-                        [[fallthrough]];
-                    case ED_LONG_JUMPSLASH:
-                        killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
-                        [[fallthrough]];
-                    case ED_BOMB_THROW:
-                        killed = killed || CanUse(RG_BOMB_BAG);
-                        [[fallthrough]];
-                    case ED_BOOMERANG:
-                        killed = killed || CanUse(RG_BOOMERANG) || CanUse(RG_DINS_FIRE);
-                        [[fallthrough]];
-                    case ED_HOOKSHOT:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || CanUse(RG_HOOKSHOT);
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                        killed = killed || CanUse(RG_LONGSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-                        [[fallthrough]];
-                    case ED_FAR:
-                        killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-                        break;
-                }
-                return killed;
-            case RE_GOHMA_LARVA:
-            case RE_MAD_SCRUB:
-            case RE_DEKU_BABA:
-                return CanAttack();
-            case RE_BIG_SKULLTULA:
-                switch (distance){
-                    case ED_CLOSE:
-                        //hammer jumpslash cannot damage these, but hammer swing can
-                        killed = CanUse(RG_MEGATON_HAMMER);
-                        [[fallthrough]];
-                    case ED_SHORT_JUMPSLASH:
-                        killed = killed || CanUse(RG_KOKIRI_SWORD);
-                        [[fallthrough]];
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                        killed = killed || CanUse(RG_MASTER_SWORD);
-                        [[fallthrough]];
-                    case ED_LONG_JUMPSLASH:
-                        killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
-                        [[fallthrough]];
-                    case ED_BOMB_THROW:
-                        killed = killed || CanUse(RG_BOMB_BAG);
-                        [[fallthrough]];
-                    case ED_BOOMERANG:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || CanUse(RG_DINS_FIRE);
-                        [[fallthrough]];
-                    case ED_HOOKSHOT:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                        killed = killed || CanUse(RG_LONGSHOT);
-                        [[fallthrough]];
-                    case ED_FAR:
-                        killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-                        break;
-                }
-                return killed;
-            case RE_DODONGO:
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || (quantity <= 5 && CanUse(RG_STICKS)) || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-            case RE_LIZALFOS:
-                return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-            case RE_KEESE:
-            case RE_FIRE_KEESE:
-                switch (distance){
-                    case ED_CLOSE:
-                    case ED_SHORT_JUMPSLASH:
-                        killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
-                        [[fallthrough]];
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                        killed = killed || CanUse(RG_MASTER_SWORD);
-                        [[fallthrough]];
-                    case ED_LONG_JUMPSLASH:
-                        killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
-                        [[fallthrough]];
-                    case ED_BOMB_THROW:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || (!inWater && CanUse(RG_BOMB_BAG));
-                        [[fallthrough]];
-                    case ED_BOOMERANG:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || CanUse(RG_BOOMERANG);
-                        [[fallthrough]];
-                    case ED_HOOKSHOT:
-                        //RANDOTODO test dins, bomb and chu range in a practical example
-                        killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                        killed = killed || CanUse(RG_LONGSHOT);
-                        [[fallthrough]];
-                    case ED_FAR:
-                        killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-                        break;
-                }
-                return killed;
-            case RE_BLUE_BUBBLE:
-                //RANDOTODO Trick to use shield hylian shield as child to stun these guys
-                //RANDOTODO check hammer damage
-                return BlastOrSmash() || CanUse(RG_FAIRY_BOW) || ((CanJumpslashExceptHammer() || CanUse(RG_FAIRY_SLINGSHOT)) && (CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield()));
-            case RE_DEAD_HAND:
-                //RANDOTODO change Dead Hand trick to be sticks Dead Hand
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || (CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));
-            case RE_WITHERED_DEKU_BABA:
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG);
-            case RE_LIKE_LIKE:
-            case RE_FLOORMASTER:
-                return CanDamage();
-            case RE_STALFOS:
-                //RANDOTODO Add trick to kill stalfos with sticks, and a second one for bombs without stunning. Higher ammo logic for bombs is also plausible
-                switch (distance){
-                    case ED_CLOSE:
-                    case ED_SHORT_JUMPSLASH:
-                        killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
-                        [[fallthrough]];
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                        killed = killed || CanUse(RG_MASTER_SWORD);
-                        [[fallthrough]];
-                    case ED_LONG_JUMPSLASH:
-                        killed = killed || CanUse(RG_BIGGORON_SWORD) || (quantity <= 1 && CanUse(RG_STICKS));
-                        [[fallthrough]];
-                    case ED_BOMB_THROW:
-                        killed = killed || (quantity <= 2 && !timer && !inWater && (CanUse(RG_NUTS) || HookshotOrBoomerang()) && CanUse(RG_BOMB_BAG));
-                        [[fallthrough]];
-                    case ED_BOOMERANG:
-                    case ED_HOOKSHOT:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                    case ED_FAR:
-                        killed = killed || CanUse(RG_FAIRY_BOW);
-                        break;
-                }
-                return killed;
-            //Needs 16 bombs, but is in default logic in N64, probably because getting the hits is quite easy.
-            //bow and sling can wake them and damage after they shed their armour, so could reduce ammo requirements for explosives to 10.
-            //requires 8 sticks to kill so would be a trick unless we apply higher stick bag logic
-            case RE_IRON_KNUCKLE:
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || HasExplosives();
-            //To stun flare dancer with chus, you have to hit the flame under it while it is spinning. It should eventually return to spinning after dashing for a while if you miss the window
-            //it is possible to damage the core with explosives, but difficult to get all 4 hits in even with chus, and if it reconstructs the core heals, so it would be a trick.
-            //the core takes damage from hookshot even if it doesn't show
-            //Dins killing isn't hard, but is obscure and tight on single magic, so is a trick
-            case RE_FLARE_DANCER:
-                return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || (HasExplosives() && (CanJumpslashExceptHammer() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));
-            case RE_WOLFOS:
-            case RE_WHITE_WOLFOS:
-            case RE_WALLMASTER:
-                return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMBCHU_5) || CanUse(RG_DINS_FIRE) || (CanUse(RG_BOMB_BAG) && (CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG)));
-            case RE_GERUDO_WARRIOR:
-                return CanJumpslash() || CanUse(RG_FAIRY_BOW) || (ctx->GetTrickOption(RT_GF_WARRIOR_WITH_DIFFICULT_WEAPON) && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMBCHU_5)));
-            case RE_GIBDO:
-            case RE_REDEAD:
-                return CanJumpslash() || CanUse(RG_DINS_FIRE);
-            case RE_MEG:
-                return CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || HasExplosives();
-            case RE_ARMOS:
-                return BlastOrSmash() || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS) || CanUse(RG_FAIRY_BOW) || ((CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG)) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_FAIRY_SLINGSHOT)));
-            case RE_GREEN_BUBBLE:
-                //does not technically need to be stunned to kill with dins, but the flame must be off and timing it is awkward
-                //Also they don't trigger the kill room in ganons MQ if they die from dins? Vanilla bug?
-                return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || HasExplosives()/* || (CanUse(RG_DINS_FIRE) && (CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG)))*/;
-            case RE_DINOLFOS:
-                //stunning + bombs is possible but painful, as it loves to dodge the bombs and hookshot. it also dodges chus but if you cook it so it detonates under the dodge it usually gets caught on landing
-                return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || (!timer && CanUse(RG_BOMBCHU_5));
-            case RE_TORCH_SLUG:
-                return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_BOW);
-            case RE_FREEZARD:
-                return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_STICKS) || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
-            case RE_SHELL_BLADE:
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_STICKS) || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE);
-            case RE_SPIKE:
-                return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_STICKS) || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_DINS_FIRE);
-            case RE_STINGER:
-                switch (distance){
-                    case ED_CLOSE:
-                    case ED_SHORT_JUMPSLASH:
-                        killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
-                        [[fallthrough]];
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                        killed = killed || CanUse(RG_MASTER_SWORD);
-                        [[fallthrough]];
-                    case ED_LONG_JUMPSLASH:
-                        killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
-                        [[fallthrough]];
-                    case ED_BOMB_THROW:
-                        //RANDOTODO test dins and chu range in a practical example
-                        killed = killed || (!inWater && CanUse(RG_BOMB_BAG));
-                        [[fallthrough]];
-                    case ED_BOOMERANG:
-                    case ED_HOOKSHOT:
-                        //RANDOTODO test dins, bomb and chu range in a practical example
-                        killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                        killed = killed || CanUse(RG_LONGSHOT);
-                        [[fallthrough]];
-                    case ED_FAR:
-                        killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-                        break;
-                }
-                return killed;
-            case RE_BIG_OCTO:
-                //If chasing octo is annoying but with rolls you can catch him, and you need rang to get into this room without shenanigains anyway. Bunny makes it free
-                return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS) || CanUse(RG_MASTER_SWORD);
-            case RE_GOHMA:
-                return HasBossSoul(RG_GOHMA_SOUL) && CanJumpslash() &&
-                    (CanUse(RG_NUTS) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || HookshotOrBoomerang());
-            case RE_KING_DODONGO:
-                return HasBossSoul(RG_KING_DODONGO_SOUL) && CanJumpslash() &&
-                    (CanUse(RG_BOMB_BAG) || HasItem(RG_GORONS_BRACELET));
-            case RE_BARINADE:
-                return HasBossSoul(RG_BARINADE_SOUL) && CanUse(RG_BOOMERANG) && CanJumpslashExceptHammer();
-            case RE_PHANTOM_GANON:
-                return HasBossSoul(RG_PHANTOM_GANON_SOUL) &&
-                    (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
-                    (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));
-            case RE_VOLVAGIA:
-                return HasBossSoul(RG_VOLVAGIA_SOUL) && CanUse(RG_MEGATON_HAMMER);
-            case RE_MORPHA:
-                return HasBossSoul(RG_MORPHA_SOUL) && CanUse(RG_HOOKSHOT) &&
-                    (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER));
-            case RE_BONGO_BONGO:
-                return HasBossSoul(RG_BONGO_BONGO_SOUL) &&
-                    (CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_BONGO)) &&
-                    (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) &&
-                    (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || ctx->GetTrickOption(RT_SHADOW_BONGO));
-            case RE_TWINROVA:
-                return HasBossSoul(RG_TWINROVA_SOUL) && CanUse(RG_MIRROR_SHIELD) &&
-                    (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER));
-            case RE_GANONDORF:
-                // RANDOTODO: Trick to use hammer (no jumpslash) or stick (only jumpslash) instead of a sword to reflect the energy ball
-                // and either of them regardless of jumpslashing to damage and kill ganondorf
+        // Child items
+        case RG_FAIRY_SLINGSHOT:
+            return IsChild && (AmmoCanDrop || GetInLogic(LOGIC_BUY_SEED)); // || SlingshotAsAdult;
+        case RG_BOOMERANG:
+            return IsChild; // || BoomerangAsAdult;
+        case RG_KOKIRI_SWORD:
+            return IsChild; // || KokiriSwordAsAdult;
+        case RG_NUTS:
+            return ((NutPot || NutCrate || DekuBabaNuts) && AmmoCanDrop) || GetInLogic(LOGIC_BUY_NUTS);
+        case RG_STICKS:
+            return IsChild /* || StickAsAdult;*/ && (StickPot || DekuBabaSticks || GetInLogic(LOGIC_BUY_STICKS));
+        case RG_DEKU_SHIELD:
+            return IsChild; // || DekuShieldAsAdult;
+        case RG_PROGRESSIVE_BOMB_BAG:
+        case RG_BOMB_BAG:
+            return AmmoCanDrop || GetInLogic(LOGIC_BUY_BOMB);
+        case RG_PROGRESSIVE_BOMBCHUS:
+        case RG_BOMBCHU_5:
+        case RG_BOMBCHU_10:
+        case RG_BOMBCHU_20:
+            return BombchuRefill() && BombchusEnabled();
+        case RG_WEIRD_EGG:
+        case RG_RUTOS_LETTER:
+            return IsChild;
+        case RG_MAGIC_BEAN:
+            return IsChild;
 
-                // Bottle is not taken into account since a sword, hammer or stick are required
-                // for killing ganondorf and all of those can reflect the energy ball
-                // This will not be the case once ammo logic in taken into account as
-                // sticks are limited and using a bottle might become a requirement in that case
-                return HasBossSoul(RG_GANON_SOUL) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));
-            case RE_GANON:
-                return HasBossSoul(RG_GANON_SOUL) && CanUse(RG_MASTER_SWORD);
-            case RE_DARK_LINK:
-            //RANDOTODO Dark link is buggy right now, retest when he is not
-                return CanJumpslash() || CanUse(RG_FAIRY_BOW);
-            case RE_ANUBIS:
-                //there's a restoration that allows beating them with mirror shield + some way to trigger their attack
-                return HasFireSource();
-            case RE_BEAMOS:
-                return HasExplosives();
-            case RE_PURPLE_LEEVER:
-              //dies on it's own, so this is the conditions to spawn it (killing 10 normal leevers)
-              //Sticks and Ice arrows work but will need ammo capacity logic
-              //other methods can damage them but not kill them, and they run when hit, making them impractical
-                return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
-            case RE_TENTACLE:
-                return CanUse(RG_BOOMERANG);
-            case RE_BARI:
-                return HookshotOrBoomerang() || CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_STICKS) || CanUse(RG_DINS_FIRE) || (TakeDamage() && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)));
-            case RE_SHABOM:
-            //RANDOTODO when you add better damage logic, you can kill this by taking hits
-                return CanUse(RG_BOOMERANG) || CanUse(RG_NUTS) || CanJumpslash() || CanUse(RG_DINS_FIRE) || CanUse(RG_ICE_ARROWS);
-            case RE_OCTOROK:
-                return CanReflectNuts() || HookshotOrBoomerang() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMB_BAG) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
-            default:
-                SPDLOG_ERROR("CanKillEnemy reached `default`.");
-                assert(false);
-                return false;
-        }
-    }
+        // Songs
+        case RG_ZELDAS_LULLABY:
+        case RG_EPONAS_SONG:
+        case RG_PRELUDE_OF_LIGHT:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) &&
+                   HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+        case RG_SARIAS_SONG:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_LEFT_BUTTON) &&
+                   HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
+        case RG_SUNS_SONG:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) &&
+                   HasItem(RG_OCARINA_C_DOWN_BUTTON);
+        case RG_SONG_OF_TIME:
+        case RG_BOLERO_OF_FIRE:
+        case RG_REQUIEM_OF_SPIRIT:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_RIGHT_BUTTON) &&
+                   HasItem(RG_OCARINA_C_DOWN_BUTTON);
+        case RG_SONG_OF_STORMS:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON) &&
+                   HasItem(RG_OCARINA_C_DOWN_BUTTON);
+        case RG_MINUET_OF_FOREST:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) &&
+                   HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
+        case RG_SERENADE_OF_WATER:
+        case RG_NOCTURNE_OF_SHADOW:
+            return HasItem(RG_FAIRY_OCARINA) && HasItem(RG_OCARINA_A_BUTTON) && HasItem(RG_OCARINA_C_LEFT_BUTTON) &&
+                   HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_DOWN_BUTTON);
 
-//It is rare for Pass Enemy to need distance, this only happens when the enemy blocks a platform and you can't reach it before it blocks you
-//an example is the Big Skulltula in water room of MQ deku, which is out of sword swing height but blocks off the whole SoT block
-//Can we get past this enemy in a tight space?
-    bool Logic::CanPassEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wallOrFloor) {
-        if (CanKillEnemy(enemy, distance, wallOrFloor)){
+        // Misc. Items
+        case RG_FISHING_POLE:
+            return HasItem(RG_CHILD_WALLET); // as long as you have enough rubies
+        case RG_EPONA:
+            return IsAdult && CanUse(RG_EPONAS_SONG);
+
+        // Bottle Items
+        case RG_BOTTLE_WITH_BUGS:
+            return BugShrub || WanderingBugs || BugRock || GetInLogic(LOGIC_BUGS_ACCESS);
+        case RG_BOTTLE_WITH_FISH:
+            return LoneFish || FishGroup ||
+                   GetInLogic(LOGIC_FISH_ACCESS); // is there any need to care about lone vs group?
+        case RG_BOTTLE_WITH_BLUE_FIRE:            // RANDOTODO should probably be better named
+            return BlueFireAccess || GetInLogic(LOGIC_BLUE_FIRE_ACCESS);
+        case RG_BOTTLE_WITH_FAIRY:
+            return FairyPot || GossipStoneFairy || BeanPlantFairy || ButterflyFairy || FreeFairies || FairyPond ||
+                   GetInLogic(LOGIC_FAIRY_ACCESS);
+
+        default:
+            SPDLOG_ERROR("CanUse reached `default` for {}. Assuming intention is no extra requirements for use so "
+                         "returning true, but HasItem should be used instead.",
+                         static_cast<uint32_t>(itemName));
+            assert(false);
             return true;
-        }
-        switch(enemy) {
-            case RE_GOLD_SKULLTULA: 
-            case RE_GOHMA_LARVA:
-            case RE_LIZALFOS:
-            case RE_DODONGO: //RANDOTODO do dodongos block the way in tight corridors?
-            case RE_MAD_SCRUB:
-            case RE_KEESE:
-            case RE_FIRE_KEESE:
-            case RE_BLUE_BUBBLE:
-            case RE_DEAD_HAND:
-            case RE_DEKU_BABA:
-            case RE_WITHERED_DEKU_BABA:
-            case RE_STALFOS:
-            case RE_FLARE_DANCER:
-            case RE_WOLFOS:
-            case RE_WHITE_WOLFOS:
-            case RE_FLOORMASTER:
-            case RE_MEG:
-            case RE_ARMOS:
-            case RE_FREEZARD:
-            case RE_SPIKE:
-            case RE_DARK_LINK:
-            case RE_ANUBIS:
-            case RE_WALLMASTER:
-            case RE_PURPLE_LEEVER:
-            case RE_OCTOROK:
-                return true;
-            case RE_BIG_SKULLTULA:
-                //hammer jumpslash can pass, but only on flat land where you can kill with hammer swing
-                return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
-            case RE_LIKE_LIKE:
-                return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-            case RE_GIBDO:
-            case RE_REDEAD:
-                // we need a way to check if suns won't force a reload
-                return CanUse(RG_HOOKSHOT) || CanUse(RG_SUNS_SONG);
-            case RE_IRON_KNUCKLE:
-            case RE_BIG_OCTO:
-                return false;
-            case RE_GREEN_BUBBLE:
-                return TakeDamage() || CanUse(RG_NUTS) || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT);
-            default:
-                SPDLOG_ERROR("CanPassEnemy reached `default`.");
-                assert(false);
-                return false;
-        }
     }
+}
 
-//Can we avoid this enemy while climbing up a wall, or doing a difficult platforming challenge?
-//use grounded if the challenge is such that the enemy interfears even if it cannot hit link out of the air
-    bool Logic::CanAvoidEnemy(RandomizerEnemy enemy, bool grounded, uint8_t quantity) {
-      //DISTANCE AND WALL ASSUMED, add more arguments later if needed
-      if (CanKillEnemy(enemy, ED_CLOSE, true, quantity)){
+bool Logic::HasProjectile(HasProjectileAge age) {
+    return HasExplosives() ||
+           (age == HasProjectileAge::Child && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG))) ||
+           (age == HasProjectileAge::Adult && (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) ||
+           (age == HasProjectileAge::Both && (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)) &&
+            (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW))) ||
+           (age == HasProjectileAge::Either &&
+            (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW)));
+}
+
+bool Logic::HasBossSoul(RandomizerGet itemName) {
+    if (!ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS)) {
         return true;
-      }
-      switch(enemy) {
-        case RE_GOLD_SKULLTULA: 
+    }
+    switch (itemName) {
+        case RG_GOHMA_SOUL:
+        case RG_KING_DODONGO_SOUL:
+        case RG_BARINADE_SOUL:
+        case RG_PHANTOM_GANON_SOUL:
+        case RG_VOLVAGIA_SOUL:
+        case RG_MORPHA_SOUL:
+        case RG_BONGO_BONGO_SOUL:
+        case RG_TWINROVA_SOUL:
+            return HasItem(itemName);
+        case RG_GANON_SOUL:
+            return ctx->GetOption(RSK_SHUFFLE_BOSS_SOULS).Is(RO_BOSS_SOULS_ON_PLUS_GANON) ? HasItem(RG_GANON_SOUL)
+                                                                                          : true;
+        default:
+            return false;
+    }
+}
+
+// RANDOMISERTODO intergrate into HasItem
+bool Logic::CanOpenOverworldDoor(RandomizerGet key) {
+    if (!ctx->GetOption(RSK_LOCK_OVERWORLD_DOORS)) {
+        return true;
+    }
+
+    if (HasItem(RG_SKELETON_KEY)) {
+        return true;
+    }
+
+    return HasItem(key);
+}
+
+bool Logic::CanOpenUnderwaterChest() {
+    return ctx->GetTrickOption(RT_OPEN_UNDERWATER_CHEST) && CanUse(RG_IRON_BOOTS) && CanUse(RG_HOOKSHOT);
+}
+
+uint8_t GetDifficultyValueFromString(Rando::Option& glitchOption) {
+    return 0;
+}
+
+// todo rewrite glitch section
+
+bool Logic::CanEquipSwap(RandomizerGet itemName) {
+    if (!HasItem(itemName))
+        return false;
+
+    if (CanDoGlitch(GlitchType::EquipSwapDins) || CanDoGlitch(GlitchType::EquipSwap))
+        return true;
+
+    return false;
+}
+
+bool Logic::CanDoGlitch(GlitchType glitch) {
+    // TODO: Uncomment when glitches are implemented
+    switch (glitch) {
+        case GlitchType::EquipSwapDins:
+            return ((IsAdult && HasItem(RG_DINS_FIRE)) || (IsChild && (HasItem(RG_STICKS) || HasItem(RG_DINS_FIRE)))) &&
+                   false;           // GlitchEquipSwapDins;
+        case GlitchType::EquipSwap: // todo: add bunny hood to adult item equippable list and child trade item to child
+                                    // item equippable list
+            return ((IsAdult && (HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE))) ||
+                    (IsChild && (HasItem(RG_STICKS) || HasItem(RG_FAIRY_SLINGSHOT) || HasItem(RG_BOOMERANG) ||
+                                 HasBottle() || CanUse(RG_NUTS) || HasItem(RG_FAIRY_OCARINA) ||
+                                 HasItem(RG_LENS_OF_TRUTH) || HasExplosives() || GetAmmo(ITEM_BEAN) > 0 ||
+                                 HasItem(RG_DINS_FIRE) || HasItem(RG_FARORES_WIND) || HasItem(RG_NAYRUS_LOVE)))) &&
+                   false; // GlitchEquipSwap;
+    }
+
+    // Shouldn't be reached
+    return false;
+}
+
+// RANDOTODO quantity is a placeholder for proper ammo use calculation logic. in time will want updating to account for
+// ammo capacity Can we kill this enemy
+bool Logic::CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wallOrFloor, uint8_t quantity, bool timer,
+                         bool inWater) {
+    bool killed = false;
+    switch (enemy) {
+        case RE_GERUDO_GUARD:
+        case RE_BREAK_ROOM_GUARD:
+            return false;
+        case RE_GOLD_SKULLTULA:
+            switch (distance) {
+                case ED_CLOSE:
+                    // hammer jumpslash cannot damage these, but hammer swing can
+                    killed = CanUse(RG_MEGATON_HAMMER);
+                    [[fallthrough]];
+                case ED_SHORT_JUMPSLASH:
+                    killed = killed || CanUse(RG_KOKIRI_SWORD);
+                    [[fallthrough]];
+                case ED_MASTER_SWORD_JUMPSLASH:
+                    killed = killed || CanUse(RG_MASTER_SWORD);
+                    [[fallthrough]];
+                case ED_LONG_JUMPSLASH:
+                    killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
+                    [[fallthrough]];
+                case ED_BOMB_THROW:
+                    killed = killed || CanUse(RG_BOMB_BAG);
+                    [[fallthrough]];
+                case ED_BOOMERANG:
+                    killed = killed || CanUse(RG_BOOMERANG) || CanUse(RG_DINS_FIRE);
+                    [[fallthrough]];
+                case ED_HOOKSHOT:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || CanUse(RG_HOOKSHOT);
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                    killed = killed || CanUse(RG_LONGSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+                    [[fallthrough]];
+                case ED_FAR:
+                    killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+                    break;
+            }
+            return killed;
+        case RE_GOHMA_LARVA:
+        case RE_MAD_SCRUB:
+        case RE_DEKU_BABA:
+            return CanAttack();
+        case RE_BIG_SKULLTULA:
+            switch (distance) {
+                case ED_CLOSE:
+                    // hammer jumpslash cannot damage these, but hammer swing can
+                    killed = CanUse(RG_MEGATON_HAMMER);
+                    [[fallthrough]];
+                case ED_SHORT_JUMPSLASH:
+                    killed = killed || CanUse(RG_KOKIRI_SWORD);
+                    [[fallthrough]];
+                case ED_MASTER_SWORD_JUMPSLASH:
+                    killed = killed || CanUse(RG_MASTER_SWORD);
+                    [[fallthrough]];
+                case ED_LONG_JUMPSLASH:
+                    killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
+                    [[fallthrough]];
+                case ED_BOMB_THROW:
+                    killed = killed || CanUse(RG_BOMB_BAG);
+                    [[fallthrough]];
+                case ED_BOOMERANG:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || CanUse(RG_DINS_FIRE);
+                    [[fallthrough]];
+                case ED_HOOKSHOT:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                    killed = killed || CanUse(RG_LONGSHOT);
+                    [[fallthrough]];
+                case ED_FAR:
+                    killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+                    break;
+            }
+            return killed;
+        case RE_DODONGO:
+            return CanUseSword() || CanUse(RG_MEGATON_HAMMER) || (quantity <= 5 && CanUse(RG_STICKS)) ||
+                   HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+        case RE_LIZALFOS:
+            return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+        case RE_KEESE:
+        case RE_FIRE_KEESE:
+            switch (distance) {
+                case ED_CLOSE:
+                case ED_SHORT_JUMPSLASH:
+                    killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
+                    [[fallthrough]];
+                case ED_MASTER_SWORD_JUMPSLASH:
+                    killed = killed || CanUse(RG_MASTER_SWORD);
+                    [[fallthrough]];
+                case ED_LONG_JUMPSLASH:
+                    killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
+                    [[fallthrough]];
+                case ED_BOMB_THROW:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || (!inWater && CanUse(RG_BOMB_BAG));
+                    [[fallthrough]];
+                case ED_BOOMERANG:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || CanUse(RG_BOOMERANG);
+                    [[fallthrough]];
+                case ED_HOOKSHOT:
+                    // RANDOTODO test dins, bomb and chu range in a practical example
+                    killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                    killed = killed || CanUse(RG_LONGSHOT);
+                    [[fallthrough]];
+                case ED_FAR:
+                    killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+                    break;
+            }
+            return killed;
+        case RE_BLUE_BUBBLE:
+            // RANDOTODO Trick to use shield hylian shield as child to stun these guys
+            // RANDOTODO check hammer damage
+            return BlastOrSmash() || CanUse(RG_FAIRY_BOW) ||
+                   ((CanJumpslashExceptHammer() || CanUse(RG_FAIRY_SLINGSHOT)) &&
+                    (CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield()));
+        case RE_DEAD_HAND:
+            // RANDOTODO change Dead Hand trick to be sticks Dead Hand
+            return CanUseSword() || (CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_CHILD_DEADHAND));
+        case RE_WITHERED_DEKU_BABA:
+            return CanUseSword() || CanUse(RG_BOOMERANG);
+        case RE_LIKE_LIKE:
+        case RE_FLOORMASTER:
+            return CanDamage();
+        case RE_STALFOS:
+            // RANDOTODO Add trick to kill stalfos with sticks, and a second one for bombs without stunning. Higher ammo
+            // logic for bombs is also plausible
+            switch (distance) {
+                case ED_CLOSE:
+                case ED_SHORT_JUMPSLASH:
+                    killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
+                    [[fallthrough]];
+                case ED_MASTER_SWORD_JUMPSLASH:
+                    killed = killed || CanUse(RG_MASTER_SWORD);
+                    [[fallthrough]];
+                case ED_LONG_JUMPSLASH:
+                    killed = killed || CanUse(RG_BIGGORON_SWORD) || (quantity <= 1 && CanUse(RG_STICKS));
+                    [[fallthrough]];
+                case ED_BOMB_THROW:
+                    killed = killed || (quantity <= 2 && !timer && !inWater &&
+                                        (CanUse(RG_NUTS) || HookshotOrBoomerang()) && CanUse(RG_BOMB_BAG));
+                    [[fallthrough]];
+                case ED_BOOMERANG:
+                case ED_HOOKSHOT:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                case ED_FAR:
+                    killed = killed || CanUse(RG_FAIRY_BOW);
+                    break;
+            }
+            return killed;
+        // Needs 16 bombs, but is in default logic in N64, probably because getting the hits is quite easy.
+        // bow and sling can wake them and damage after they shed their armour, so could reduce ammo requirements for
+        // explosives to 10. requires 8 sticks to kill so would be a trick unless we apply higher stick bag logic
+        case RE_IRON_KNUCKLE:
+            return CanUseSword() || CanUse(RG_MEGATON_HAMMER) || HasExplosives();
+        // To stun flare dancer with chus, you have to hit the flame under it while it is spinning. It should eventually
+        // return to spinning after dashing for a while if you miss the window it is possible to damage the core with
+        // explosives, but difficult to get all 4 hits in even with chus, and if it reconstructs the core heals, so it
+        // would be a trick. the core takes damage from hookshot even if it doesn't show Dins killing isn't hard, but is
+        // obscure and tight on single magic, so is a trick
+        case RE_FLARE_DANCER:
+            return CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) ||
+                   (HasExplosives() && (CanJumpslashExceptHammer() || CanUse(RG_FAIRY_BOW) ||
+                                        CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG)));
+        case RE_WOLFOS:
+        case RE_WHITE_WOLFOS:
+        case RE_WALLMASTER:
+            return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMBCHU_5) ||
+                   CanUse(RG_DINS_FIRE) ||
+                   (CanUse(RG_BOMB_BAG) && (CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG)));
+        case RE_GERUDO_WARRIOR:
+            return CanJumpslash() || CanUse(RG_FAIRY_BOW) ||
+                   (ctx->GetTrickOption(RT_GF_WARRIOR_WITH_DIFFICULT_WEAPON) &&
+                    (CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMBCHU_5)));
+        case RE_GIBDO:
+        case RE_REDEAD:
+            return CanJumpslash() || CanUse(RG_DINS_FIRE);
+        case RE_MEG:
+            return CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || HasExplosives();
+        case RE_ARMOS:
+            return BlastOrSmash() || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS) ||
+                   CanUse(RG_FAIRY_BOW) ||
+                   ((CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG)) &&
+                    (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_FAIRY_SLINGSHOT)));
+        case RE_GREEN_BUBBLE:
+            // does not technically need to be stunned to kill with dins, but the flame must be off and timing it is
+            // awkward Also they don't trigger the kill room in ganons MQ if they die from dins? Vanilla bug?
+            return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) ||
+                   HasExplosives() /* || (CanUse(RG_DINS_FIRE) && (CanUse(RG_NUTS) || CanUse(RG_HOOKSHOT) ||
+                                      CanUse(RG_BOOMERANG)))*/
+                ;
+        case RE_DINOLFOS:
+            // stunning + bombs is possible but painful, as it loves to dodge the bombs and hookshot. it also dodges
+            // chus but if you cook it so it detonates under the dodge it usually gets caught on landing
+            return CanJumpslash() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) ||
+                   (!timer && CanUse(RG_BOMBCHU_5));
+        case RE_TORCH_SLUG:
+            return CanJumpslash() || HasExplosives() || CanUse(RG_FAIRY_BOW);
+        case RE_FREEZARD:
+            return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) ||
+                   CanUse(RG_STICKS) || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) ||
+                   CanUse(RG_FIRE_ARROWS);
+        case RE_SHELL_BLADE:
+            return CanJumpslash() || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) ||
+                   CanUse(RG_DINS_FIRE);
+        case RE_SPIKE:
+            return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER) ||
+                   CanUse(RG_STICKS) || HasExplosives() || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) ||
+                   CanUse(RG_DINS_FIRE);
+        case RE_STINGER:
+            switch (distance) {
+                case ED_CLOSE:
+                case ED_SHORT_JUMPSLASH:
+                    killed = CanUse(RG_MEGATON_HAMMER) || CanUse(RG_KOKIRI_SWORD);
+                    [[fallthrough]];
+                case ED_MASTER_SWORD_JUMPSLASH:
+                    killed = killed || CanUse(RG_MASTER_SWORD);
+                    [[fallthrough]];
+                case ED_LONG_JUMPSLASH:
+                    killed = killed || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
+                    [[fallthrough]];
+                case ED_BOMB_THROW:
+                    // RANDOTODO test dins and chu range in a practical example
+                    killed = killed || (!inWater && CanUse(RG_BOMB_BAG));
+                    [[fallthrough]];
+                case ED_BOOMERANG:
+                case ED_HOOKSHOT:
+                    // RANDOTODO test dins, bomb and chu range in a practical example
+                    killed = killed || CanUse(RG_HOOKSHOT) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                    killed = killed || CanUse(RG_LONGSHOT);
+                    [[fallthrough]];
+                case ED_FAR:
+                    killed = killed || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+                    break;
+            }
+            return killed;
+        case RE_BIG_OCTO:
+            // If chasing octo is annoying but with rolls you can catch him, and you need rang to get into this room
+            // without shenanigans anyway. Bunny makes it free
+            return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_STICKS) || CanUse(RG_MASTER_SWORD);
+        case RE_GOHMA:
+            return HasBossSoul(RG_GOHMA_SOUL) && CanJumpslash() &&
+                   (CanUse(RG_NUTS) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || HookshotOrBoomerang());
+        case RE_KING_DODONGO:
+            return HasBossSoul(RG_KING_DODONGO_SOUL) && CanJumpslash() &&
+                   (CanUse(RG_BOMB_BAG) || HasItem(RG_GORONS_BRACELET) ||
+                    (ctx->GetTrickOption(RT_DC_DODONGO_CHU) && IsAdult && CanUse(RG_BOMBCHU_5)));
+        case RE_BARINADE:
+            return HasBossSoul(RG_BARINADE_SOUL) && CanUse(RG_BOOMERANG) && CanJumpslashExceptHammer();
+        case RE_PHANTOM_GANON:
+            return HasBossSoul(RG_PHANTOM_GANON_SOUL) && CanUseSword() &&
+                   (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT));
+        case RE_VOLVAGIA:
+            return HasBossSoul(RG_VOLVAGIA_SOUL) && CanUse(RG_MEGATON_HAMMER);
+        case RE_MORPHA:
+            return HasBossSoul(RG_MORPHA_SOUL) &&
+                   (CanUse(RG_HOOKSHOT) ||
+                    (ctx->GetTrickOption(RT_WATER_MORPHA_WITHOUT_HOOKSHOT) && HasItem(RG_BRONZE_SCALE))) &&
+                   (CanUseSword() || CanUse(RG_MEGATON_HAMMER));
+        case RE_BONGO_BONGO:
+            return HasBossSoul(RG_BONGO_BONGO_SOUL) &&
+                   (CanUse(RG_LENS_OF_TRUTH) || ctx->GetTrickOption(RT_LENS_BONGO)) && CanUseSword() &&
+                   (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) ||
+                    ctx->GetTrickOption(RT_SHADOW_BONGO));
+        case RE_TWINROVA:
+            return HasBossSoul(RG_TWINROVA_SOUL) && CanUse(RG_MIRROR_SHIELD) &&
+                   (CanUseSword() || CanUse(RG_MEGATON_HAMMER));
+        case RE_GANONDORF:
+            // RANDOTODO: Trick to use hammer (no jumpslash) or stick (only jumpslash) instead of a sword to reflect the
+            // energy ball and either of them regardless of jumpslashing to damage and kill ganondorf
+
+            // Bottle is not taken into account since a sword, hammer or stick are required
+            // for killing ganondorf and all of those can reflect the energy ball
+            // This will not be the case once ammo logic in taken into account as
+            // sticks are limited and using a bottle might become a requirement in that case
+            return HasBossSoul(RG_GANON_SOUL) && CanUse(RG_LIGHT_ARROWS) && CanUseSword();
+        case RE_GANON:
+            return HasBossSoul(RG_GANON_SOUL) && CanUse(RG_MASTER_SWORD);
+        case RE_DARK_LINK:
+            // RANDOTODO Dark link is buggy right now, retest when he is not
+            return CanJumpslash() || CanUse(RG_FAIRY_BOW);
+        case RE_ANUBIS:
+            // there's a restoration that allows beating them with mirror shield + some way to trigger their attack
+            return HasFireSource();
+        case RE_BEAMOS:
+            return HasExplosives();
+        case RE_PURPLE_LEEVER:
+            // dies on it's own, so this is the conditions to spawn it (killing 10 normal leevers)
+            // Sticks and Ice arrows work but will need ammo capacity logic
+            // other methods can damage them but not kill them, and they run when hit, making them impractical
+            return CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
+        case RE_TENTACLE:
+            return CanUse(RG_BOOMERANG);
+        case RE_BARI:
+            return HookshotOrBoomerang() || CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_MEGATON_HAMMER) ||
+                   CanUse(RG_STICKS) || CanUse(RG_DINS_FIRE) || (TakeDamage() && CanUseSword());
+        case RE_SHABOM:
+            // RANDOTODO when you add better damage logic, you can kill this by taking hits
+            return CanUse(RG_BOOMERANG) || CanUse(RG_NUTS) || CanJumpslash() || CanUse(RG_DINS_FIRE) ||
+                   CanUse(RG_ICE_ARROWS);
+        case RE_OCTOROK:
+            return CanReflectNuts() || HookshotOrBoomerang() || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) ||
+                   CanUse(RG_BOMB_BAG) || (wallOrFloor && CanUse(RG_BOMBCHU_5));
+        default:
+            SPDLOG_ERROR("CanKillEnemy reached `default`.");
+            assert(false);
+            return false;
+    }
+}
+
+// It is rare for Pass Enemy to need distance, this only happens when the enemy blocks a platform and you can't reach it
+// before it blocks you an example is the Big Skulltula in water room of MQ deku, which is out of sword swing height but
+// blocks off the whole SoT block Can we get past this enemy in a tight space?
+bool Logic::CanPassEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wallOrFloor) {
+    if (CanKillEnemy(enemy, distance, wallOrFloor)) {
+        return true;
+    }
+    switch (enemy) {
+        case RE_GOLD_SKULLTULA:
+        case RE_GOHMA_LARVA:
+        case RE_LIZALFOS:
+        case RE_DODONGO: // RANDOTODO do dodongos block the way in tight corridors?
+        case RE_MAD_SCRUB:
+        case RE_KEESE:
+        case RE_FIRE_KEESE:
+        case RE_BLUE_BUBBLE:
+        case RE_DEAD_HAND:
+        case RE_DEKU_BABA:
+        case RE_WITHERED_DEKU_BABA:
+        case RE_STALFOS:
+        case RE_FLARE_DANCER:
+        case RE_WOLFOS:
+        case RE_WHITE_WOLFOS:
+        case RE_FLOORMASTER:
+        case RE_MEG:
+        case RE_ARMOS:
+        case RE_FREEZARD:
+        case RE_SPIKE:
+        case RE_DARK_LINK:
+        case RE_ANUBIS:
+        case RE_WALLMASTER:
+        case RE_PURPLE_LEEVER:
+        case RE_OCTOROK:
+            return true;
+        case RE_GERUDO_GUARD:
+            return ctx->GetTrickOption(RT_PASS_GUARDS_WITH_NOTHING) || HasItem(RG_GERUDO_MEMBERSHIP_CARD) ||
+                   CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT);
+        case RE_BREAK_ROOM_GUARD:
+            return HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT);
+        case RE_BIG_SKULLTULA:
+            // hammer jumpslash can pass, but only on flat land where you can kill with hammer swing
+            return CanUse(RG_NUTS) || CanUse(RG_BOOMERANG);
+        case RE_LIKE_LIKE:
+            return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+        case RE_GIBDO:
+        case RE_REDEAD:
+            // we need a way to check if suns won't force a reload
+            // RANDOTODO: check if stealthing past these guys works everywhere
+            return CanUse(RG_HOOKSHOT) || CanUse(RG_SUNS_SONG);
+        case RE_IRON_KNUCKLE:
+        case RE_BIG_OCTO:
+            return false;
+        case RE_GREEN_BUBBLE:
+            return TakeDamage() || CanUse(RG_NUTS) || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT);
+        default:
+            SPDLOG_ERROR("CanPassEnemy reached `default`.");
+            assert(false);
+            return false;
+    }
+}
+
+// Can we avoid this enemy while climbing up a wall, or doing a difficult platforming challenge?
+// use grounded if the challenge is such that the enemy interfears even if it cannot hit link out of the air
+bool Logic::CanAvoidEnemy(RandomizerEnemy enemy, bool grounded, uint8_t quantity) {
+    // DISTANCE AND WALL ASSUMED, add more arguments later if needed
+    if (CanKillEnemy(enemy, ED_CLOSE, true, quantity)) {
+        return true;
+    }
+    switch (enemy) {
+        case RE_GOLD_SKULLTULA:
         case RE_GOHMA_LARVA:
         case RE_LIZALFOS:
         case RE_DODONGO:
@@ -829,963 +901,989 @@ namespace Rando {
         case RE_WALLMASTER:
         case RE_ANUBIS:
         case RE_PURPLE_LEEVER:
-          return true;
+            return true;
         case RE_BEAMOS:
-          return !grounded || CanUse(RG_NUTS) || (quantity == 1 && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)));
+            return !grounded || CanUse(RG_NUTS) ||
+                   (quantity == 1 && (CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)));
         case RE_MAD_SCRUB:
-          return !grounded || CanUse(RG_NUTS);
+            return !grounded || CanUse(RG_NUTS);
         case RE_KEESE:
         case RE_FIRE_KEESE:
-          return CanUse(RG_NUTS);
+            return CanUse(RG_NUTS);
         case RE_BLUE_BUBBLE:
-          //RANDOTODO Trick to use shield hylian shield as child to stun these guys
-          return !grounded || CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield();
+            // RANDOTODO Trick to use shield hylian shield as child to stun these guys
+            return !grounded || CanUse(RG_NUTS) || HookshotOrBoomerang() || CanStandingShield();
         default:
-          SPDLOG_ERROR("CanPassEnemy reached `default`.");
-          assert(false);
-          return false;
-      }
-    }
-
-    bool Logic::CanGetEnemyDrop(RandomizerEnemy enemy, EnemyDistance distance, bool aboveLink) {
-        if (!CanKillEnemy(enemy, distance)){
+            SPDLOG_ERROR("CanPassEnemy reached `default`.");
+            assert(false);
             return false;
-        }
-        if (distance <= ED_MASTER_SWORD_JUMPSLASH){
-            return true;
-        }
-        bool drop = false;
-        switch(enemy) {
-            case RE_GOLD_SKULLTULA:
-                switch(distance){
-                    case ED_CLOSE:
-                    case ED_SHORT_JUMPSLASH:
-                    case ED_MASTER_SWORD_JUMPSLASH:
-                    case ED_LONG_JUMPSLASH:
-                    case ED_BOMB_THROW:
-                    case ED_BOOMERANG:
-                        drop = drop || CanUse(RG_BOOMERANG);
-                        [[fallthrough]];
-                    case ED_HOOKSHOT:
-                        drop = drop || CanUse(RG_HOOKSHOT);
-                        [[fallthrough]];
-                    case ED_LONGSHOT:
-                        drop = drop || CanUse(RG_LONGSHOT);
-                        [[fallthrough]];
-                    case ED_FAR:
-                        break;
-                        //RANDOTODO double check all jumpslash kills that might be out of jump/backflip range
-                }
-                return drop;
-                break;
-            case RE_KEESE:
-            case RE_FIRE_KEESE:
-                return true;
-            default:
-                return aboveLink || (distance <= ED_BOOMERANG && CanUse(RG_BOOMERANG));
-        }
     }
+}
 
-    bool Logic::CanBreakMudWalls() {
-        return BlastOrSmash() || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && BlueFire());
-    }
-
-    bool Logic::CanGetDekuBabaSticks() {
-        return (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_BOOMERANG));
-    }
-
-    bool Logic::CanGetDekuBabaNuts() {
-        return CanJumpslash() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_DINS_FIRE);
-    }
-
-    bool Logic::CanHitEyeTargets() {
-        return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);
-    }
-
-    bool Logic::CanDetonateBombFlowers() {
-        return CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_DINS_FIRE);
-    }
-
-    bool Logic::CanDetonateUprightBombFlower() {
-        return CanDetonateBombFlowers() || HasItem(RG_GORONS_BRACELET);
-    }
-
-    bool Logic::MQWaterLevel(RandoWaterLevel level) {
-        //For ease of reading, I will call the triforce emblem that sets the water to WL_LOW the "Low Emblem", the one that sets it to WL_MID the "Mid Emblem", and the one that sets it to WL_HIGH the "High Emblem"
-        switch(level){
-            //While you have to go through WL_LOW to get to Mid, the requirements for WL_LOW are stricter than WL_MID because you can always go up to WL_MID and then could need to go back to WL_HIGH to reach the Low Emblem again
-            //Thanks to this caveat you need to be able to reach and play ZL to both the High and Low Emblems to have WL_LOW in logic.
-            //Alternativly a way to reach WL_LOW from WL_MID could exist, but all glitchless methods need you to do a Low-locked action
-            case WL_LOW:
-                return (CanWaterTempleHigh && CanWaterTempleLowFromHigh) || (CanWaterTempleLowFromMid && CanWaterTempleLowFromHigh);
-            case WL_LOW_OR_MID:
-                return (CanWaterTempleHigh && CanWaterTempleLowFromHigh) || (CanWaterTempleLowFromHigh && CanWaterTempleMiddle) || (CanWaterTempleLowFromMid && CanWaterTempleLowFromHigh);
-            //If we can set it to High out of logic we can just repeat what we did to lower the water in the first place as High is the default. 
-            //Because of this you only need to be able to use the Low and Mid Emblems, WL_LOW could be skipped if it was ever possible to play ZL underwater.
-            case WL_MID:
-                return CanWaterTempleLowFromHigh && CanWaterTempleMiddle;
-            //Despite being the initial state of water temple, WL_HIGH has the extra requirement of making sure that, if we were to lower the water out of logic, we could put it back to WL_HIGH
-            //However because it is the default state, we do not need to check if we can actually change the water level, only to make sure we can return to WL_HIGH if we found the means to play ZL out of logic.
-            //There are 2 methods to lock yourself out after playing ZL already: Not being able to reach the High Emblem and being unable to replay ZL. (I will be ignoring other-age-access shenanigains)
-            //The former check would simply be a check to see if we can reach High Emblem, but we assume the water is WL_MID (as if we can set it to WL_LOW, we can set it to WL_MID, as Mid Emblem has no requirements)
-            //The latter check can be assumed for now but will want a revisit once OI tricks are added.
-            case WL_HIGH:
-                return ReachedWaterHighEmblem;
-            case WL_HIGH_OR_MID:
-                return ReachedWaterHighEmblem || (CanWaterTempleLowFromHigh && CanWaterTempleMiddle);
-        }
-        SPDLOG_ERROR("MQWaterLevel reached `return false;`. Missing case for a Water Level");
-        assert(false);
+bool Logic::CanGetEnemyDrop(RandomizerEnemy enemy, EnemyDistance distance, bool aboveLink) {
+    if (!CanKillEnemy(enemy, distance)) {
         return false;
     }
-
-    Logic::Logic() {
-        
-    }
-
-    uint8_t Logic::BottleCount() {
-        uint8_t count = 0;
-        if (CouldEmptyBigPoes){
-            for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_4; i++) {
-                uint8_t item = GetSaveContext()->inventory.items[i];
-                switch (item) {
-                    case ITEM_LETTER_RUTO:
-                        if (DeliverLetter) {
-                            count++;
-                        }
-                        break;
-                    case ITEM_BIG_POE:
-                        if (CanEmptyBigPoes) {
-                            count++;
-                        }
-                        break;
-                    case ITEM_NONE:
-                        break;
-                    default:
-                        count++;
-                        break;
-                }
-            }
-        }
-        return count;
-    }
-
-    uint8_t Logic::OcarinaButtons(){
-        return HasItem(RG_OCARINA_A_BUTTON) + HasItem(RG_OCARINA_C_LEFT_BUTTON) + HasItem(RG_OCARINA_C_RIGHT_BUTTON) + HasItem(RG_OCARINA_C_UP_BUTTON) + HasItem(RG_OCARINA_C_DOWN_BUTTON);
-    }
-
-    bool Logic::HasBottle(){
-        return BottleCount() >= 1;
-    }
-
-    bool Logic::CanJumpslashExceptHammer() {
-        // Not including hammer as hammer jump attacks can be weird;
-        return CanUse(RG_STICKS) || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
-    }
-
-    bool Logic::CanJumpslash() {
-        return CanJumpslashExceptHammer() || CanUse(RG_MEGATON_HAMMER);
-    }
-
-    bool Logic::CanHitSwitch(EnemyDistance distance, bool inWater) {
-        bool hit = false;
-        switch (distance){
-            case ED_CLOSE:
-            case ED_SHORT_JUMPSLASH:
-                hit = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MEGATON_HAMMER);
-                [[fallthrough]];
-            case ED_MASTER_SWORD_JUMPSLASH:
-                hit = hit || CanUse(RG_MASTER_SWORD);
-                [[fallthrough]];
-            case ED_LONG_JUMPSLASH:
-                hit = hit || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
-                [[fallthrough]];
-            case ED_BOMB_THROW:
-                hit = hit || (!inWater && CanUse(RG_BOMB_BAG));
-                [[fallthrough]];
-            case ED_BOOMERANG:
-                hit = hit || CanUse(RG_BOOMERANG);
-                [[fallthrough]];
-            case ED_HOOKSHOT:
-                //RANDOTODO test chu range in a practical example
-                hit = hit || CanUse(RG_HOOKSHOT) || CanUse(RG_BOMBCHU_5) ;
-                [[fallthrough]];
-            case ED_LONGSHOT:
-                hit = hit || CanUse(RG_LONGSHOT);
-                [[fallthrough]];
-            case ED_FAR:
-                hit = hit || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
-                break;
-        }
-        return hit;
-    }
-
-    bool Logic::CanDamage() {
-        return CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash() || HasExplosives() || CanUse(RG_DINS_FIRE) || CanUse(RG_FAIRY_BOW);
-    }
-
-    bool Logic::CanAttack() {
-        return CanDamage() || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT);
-    }
-
-    bool Logic::BombchusEnabled(){
-        return ctx->GetOption(RSK_BOMBCHU_BAG) ? CheckInventory(ITEM_BOMBCHU, true) : HasItem(RG_BOMB_BAG);
-    }
-
-    // TODO: Implement Ammo Drop Setting in place of bombchu drops
-    bool Logic::BombchuRefill(){
-        return GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant || (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON/*_PLUS_BOMBCHU*/));
-    }
-
-    bool Logic::HookshotOrBoomerang(){
-        return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
-    }
-
-    bool Logic::ScarecrowsSong(){
-        return (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && HasItem(RG_FAIRY_OCARINA) && OcarinaButtons() >= 2)
-                || (ChildScarecrow && AdultScarecrow);
-    }
-
-    bool Logic::BlueFire(){
-        return CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
-    }
-
-    bool Logic::CanBreakPots(){
+    if (distance <= ED_MASTER_SWORD_JUMPSLASH) {
         return true;
     }
-
-    bool Logic::HasExplosives(){
-        return CanUse(RG_BOMB_BAG) || CanUse(RG_BOMBCHU_5);
-    }
-
-    bool Logic::BlastOrSmash(){
-        return HasExplosives() || CanUse(RG_MEGATON_HAMMER);
-    }
-
-    bool Logic::CanSpawnSoilSkull(){
-        return IsChild && CanUse(RG_BOTTLE_WITH_BUGS);
-    }
-
-    bool Logic::CanReflectNuts(){
-        return CanUse(RG_DEKU_SHIELD) || (IsAdult && HasItem(RG_HYLIAN_SHIELD));
-    }
-
-    bool Logic::CanCutShrubs(){
-        return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives() || CanUse(RG_MASTER_SWORD) || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD);
-    }
-
-    bool Logic::CanStunDeku(){
-        return CanAttack() || CanUse(RG_NUTS) || CanReflectNuts();
-    }
-
-    bool Logic::CanLeaveForest(){
-        return ctx->GetOption(RSK_FOREST).IsNot(RO_CLOSED_FOREST_ON) || IsAdult || DekuTreeClear || ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
-    }
-
-    bool Logic::CallGossipFairyExceptSuns(){
-        return CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
-    }
-
-    bool Logic::CallGossipFairy(){
-        return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
-    }
-
-    //the number returned by this is in half heart hits taken.
-    //RANDOTODO work in OoT side health instead for greater applicability (16 per heart)
-    uint8_t Logic::EffectiveHealth(){
-        /* Multiplier will be:
-        0 for half daamge
-        1 for normal damage
-        2 for double damage
-        3 for quad damage
-        4 for 8* damage
-        5 for 16* damage
-        10 for OHKO.
-        This is the number of shifts to apply, not a real multiplier
-        */
-        uint8_t Multiplier = (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Get() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Get() : 10;
-        //(Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) is quarter hearts after DD
-        //>> Multiplier halves on normal and does nothing on half, meaning we're working with half hearts on normal damage 
-        return ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) >> Multiplier) + 
-                //As 1 is a quarter heart, (1 << Multiplier) is effectivly half-hearts of unmodified damage
-                //Adds an extra hit if the damage is not exact lethal
-                ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) % (1 << Multiplier) > 0);
-    }
-
-    uint8_t Logic::Hearts(){
-        return GetSaveContext()->healthCapacity / 16;
-    }
-
-    uint8_t Logic::DungeonCount(){
-        return DekuTreeClear + DodongosCavernClear + JabuJabusBellyClear + ForestTempleClear + FireTempleClear + WaterTempleClear + SpiritTempleClear + ShadowTempleClear;
-    }
-
-    uint8_t Logic::StoneCount(){
-        return HasItem(RG_KOKIRI_EMERALD) + HasItem(RG_GORON_RUBY) + HasItem(RG_ZORA_SAPPHIRE);
-    }
-
-    uint8_t Logic::MedallionCount(){
-        return HasItem(RG_FOREST_MEDALLION) + HasItem(RG_FIRE_MEDALLION) + HasItem(RG_WATER_MEDALLION) + HasItem(RG_SPIRIT_MEDALLION) + HasItem(RG_SHADOW_MEDALLION) + HasItem(RG_LIGHT_MEDALLION);
-    }
-
-    uint8_t Logic::FireTimer(){
-        return CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
-    }
-    
-    //Tunic is not required if you are using irons to do something that a simple gold scale dive could do, and you are not in water temple. (celing swimming and long walks through water do not count)
-    uint8_t Logic::WaterTimer(){
-        return CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
-    }
-
-    bool Logic::TakeDamage(){
-        return CanUse(RG_BOTTLE_WITH_FAIRY) || EffectiveHealth() != 1 || CanUse(RG_NAYRUS_LOVE);
-    }
-
-    bool Logic::CanOpenBombGrotto(){
-        return BlastOrSmash() && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-    }
-
-    bool Logic::CanOpenStormsGrotto(){
-        return CanUse(RG_SONG_OF_STORMS) && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
-    }
-
-    bool Logic::CanGetNightTimeGS(){
-        return AtNight && (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
-    }
-
-    bool Logic::CanBreakUpperBeehives(){
-        return HookshotOrBoomerang() || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && CanUse(RG_BOMBCHU_5));
-    }
-
-    bool Logic::CanBreakLowerBeehives(){
-        return CanBreakUpperBeehives() || CanUse(RG_BOMB_BAG);
-    }
-
-    bool Logic::HasFireSource(){
-        return CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
-    }
-
-    bool Logic::HasFireSourceWithTorch(){
-        return HasFireSource() || CanUse(RG_STICKS);
-    }
-
-//Is this best off signaling what you have already traded, or what step you are currently on?
-    bool Logic::TradeQuestStep(RandomizerGet rg){
-        if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)){
-            return false; //This does not apply when we are shuffling trade items
-        }
-        bool hasState = false;
-        //Falling through each case to test each possibility
-        switch (rg){
-            case RG_POCKET_EGG:
-                hasState = hasState || HasItem(RG_POCKET_EGG);
-                [[fallthrough]];
-            case RG_COJIRO:
-                hasState = hasState || HasItem(RG_COJIRO);
-                [[fallthrough]];
-            case RG_ODD_MUSHROOM:
-                hasState = hasState || HasItem(RG_ODD_MUSHROOM);
-                [[fallthrough]];
-            case RG_ODD_POTION:
-                hasState = hasState || HasItem(RG_ODD_POTION);
-                [[fallthrough]];
-            case RG_POACHERS_SAW:
-                hasState = hasState || HasItem(RG_POACHERS_SAW);
-                [[fallthrough]];
-            case RG_BROKEN_SWORD:
-                hasState = hasState || HasItem(RG_BROKEN_SWORD);
-                [[fallthrough]];
-            case RG_PRESCRIPTION:
-                hasState = hasState || HasItem(RG_PRESCRIPTION);
-                [[fallthrough]];
-            case RG_EYEDROPS:
-                hasState = hasState || HasItem(RG_EYEDROPS);
-                [[fallthrough]];
-            case RG_CLAIM_CHECK:
-                hasState = hasState || HasItem(RG_CLAIM_CHECK);
-                break;
-            default:
-                SPDLOG_ERROR("TradeQuestStep reached `return false;`. Missing case for RandomizerGet of {}", static_cast<uint32_t>(rg));
-                assert(false);
-                return false;
-        }
-        return hasState;
-    }
-
-    bool Logic::CanFinishGerudoFortress(){
-        return (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && SmallKeys(RR_GERUDO_FORTRESS, 4) && CanKillEnemy(RE_GERUDO_WARRIOR) && (HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN))) ||
-               (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)   && SmallKeys(RR_GERUDO_FORTRESS, 1) && CanKillEnemy(RE_GERUDO_WARRIOR)) ||
-               ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE);
-    }
-
-    bool Logic::CanStandingShield(){
-        return CanUse(RG_MIRROR_SHIELD) || (IsAdult && HasItem(RG_HYLIAN_SHIELD)) || CanUse(RG_DEKU_SHIELD);
-    }
-
-    bool Logic::CanShield(){
-        return CanUse(RG_MIRROR_SHIELD) || HasItem(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD);
-    }
-
-    bool Logic::CanUseProjectile(){
-        return HasExplosives() || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOOMERANG);
-    }
-
-    bool Logic::CanBuildRainbowBridge(){
-        return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN)      ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA)         && HasItem(RG_SHADOW_MEDALLION) && HasItem(RG_SPIRIT_MEDALLION) && CanUse(RG_LIGHT_ARROWS)) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES)          && StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Get()) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS)      && MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Get()) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS) && StoneCount() + MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get()) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS)        && DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >= ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get()) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS)          && GetGSCount() >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get()) ||
-               (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG)            && HasItem(RG_GREG_RUPEE));
-    }
-
-    bool Logic::CanTriggerLACS(){
-        return (ctx->LACSCondition() == RO_LACS_VANILLA    && HasItem(RG_SHADOW_MEDALLION) && HasItem(RG_SPIRIT_MEDALLION)) ||
-               (ctx->LACSCondition() == RO_LACS_STONES     && StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_STONE_COUNT).Get()) ||
-               (ctx->LACSCondition() == RO_LACS_MEDALLIONS && MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Get()) ||
-               (ctx->LACSCondition() == RO_LACS_REWARDS    && StoneCount() + MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_REWARD_COUNT).Get()) ||
-               (ctx->LACSCondition() == RO_LACS_DUNGEONS   && DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >= ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get()) ||
-               (ctx->LACSCondition() == RO_LACS_TOKENS     && GetGSCount() >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get());
-    }
-
-    bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
-        return SmallKeys(dungeon, requiredAmount, requiredAmount);
-    }
-
-    bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
-        if (HasItem(RG_SKELETON_KEY)) {
-            return true;
-        }
-        switch (dungeon) {
-            case RR_FOREST_TEMPLE:
-                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) ||
-                                    (GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) {
-                    return ForestTempleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_FOREST_TEMPLE) >= requiredAmountGlitchless;
-
-            case RR_FIRE_TEMPLE:
-                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >= static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) {
-                    return FireTempleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_FIRE_TEMPLE) >= requiredAmountGlitchless;
-
-            case RR_WATER_TEMPLE:
-                /*if (IsGlitched && (false)) {
-                    return WaterTempleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_WATER_TEMPLE) >= requiredAmountGlitchless;
-
-            case RR_SPIRIT_TEMPLE:
-                /*if (IsGlitched && (false)) {
-                    return SpiritTempleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_SPIRIT_TEMPLE) >= requiredAmountGlitchless;
-
-            case RR_SHADOW_TEMPLE:
-                /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >= static_cast<uint8_t>(GlitchDifficulty::NOVICE))) {
-                    return ShadowTempleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_SHADOW_TEMPLE) >= requiredAmountGlitchless;
-
-            case RR_BOTTOM_OF_THE_WELL:
-                /*if (IsGlitched && (false)) {
-                    return BottomOfTheWellKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_BOTTOM_OF_THE_WELL) >= requiredAmountGlitchless;
-
-            case RR_GERUDO_TRAINING_GROUND:
-                /*if (IsGlitched && (false)) {
-                    return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_GERUDO_TRAINING_GROUND) >= requiredAmountGlitchless;
-
-            case RR_GANONS_CASTLE:
-                /*if (IsGlitched && (false)) {
-                    return GanonsCastleKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_INSIDE_GANONS_CASTLE) >= requiredAmountGlitchless;
-
-            case RR_MARKET_TREASURE_CHEST_GAME:
-                /*if (IsGlitched && (false)) {
-                    return TreasureGameKeys >= requiredAmountGlitched;
-                }*/
-                return GetSmallKeyCount(SCENE_TREASURE_BOX_SHOP) >= requiredAmountGlitchless;
-
-            case RR_GERUDO_FORTRESS:
-                return GetSmallKeyCount(SCENE_THIEVES_HIDEOUT) >= requiredAmountGlitchless;
-
-            default:
-                return false;
-        }
-    }
-
-    std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
-        { RG_KOKIRI_SWORD,           EQUIP_FLAG_SWORD_KOKIRI },
-        { RG_MASTER_SWORD,           EQUIP_FLAG_SWORD_MASTER },
-        { RG_BIGGORON_SWORD,         EQUIP_FLAG_SWORD_BGS },
-        { RG_DEKU_SHIELD,            EQUIP_FLAG_SHIELD_DEKU },
-        { RG_HYLIAN_SHIELD,          EQUIP_FLAG_SHIELD_HYLIAN },
-        { RG_MIRROR_SHIELD,          EQUIP_FLAG_SHIELD_MIRROR },
-        { RG_GORON_TUNIC,            EQUIP_FLAG_TUNIC_GORON },
-        { RG_ZORA_TUNIC,             EQUIP_FLAG_TUNIC_ZORA },
-        { RG_BUY_DEKU_SHIELD,        EQUIP_FLAG_SHIELD_DEKU },
-        { RG_BUY_HYLIAN_SHIELD,      EQUIP_FLAG_SHIELD_HYLIAN },
-        { RG_BUY_GORON_TUNIC,        EQUIP_FLAG_TUNIC_GORON },
-        { RG_BUY_ZORA_TUNIC,         EQUIP_FLAG_TUNIC_ZORA },
-        { RG_IRON_BOOTS,             EQUIP_FLAG_BOOTS_IRON },
-        { RG_HOVER_BOOTS,            EQUIP_FLAG_BOOTS_HOVER }
-    };
-
-    std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
-        { RG_ZELDAS_LETTER,          RAND_INF_ZELDAS_LETTER },
-        { RG_WEIRD_EGG,              RAND_INF_WEIRD_EGG },
-        { RG_GOHMA_SOUL,             RAND_INF_GOHMA_SOUL },
-        { RG_KING_DODONGO_SOUL,      RAND_INF_KING_DODONGO_SOUL },
-        { RG_BARINADE_SOUL,          RAND_INF_BARINADE_SOUL },
-        { RG_PHANTOM_GANON_SOUL,     RAND_INF_PHANTOM_GANON_SOUL },
-        { RG_VOLVAGIA_SOUL,          RAND_INF_VOLVAGIA_SOUL },
-        { RG_MORPHA_SOUL,            RAND_INF_MORPHA_SOUL },
-        { RG_BONGO_BONGO_SOUL,       RAND_INF_BONGO_BONGO_SOUL },
-        { RG_TWINROVA_SOUL,          RAND_INF_TWINROVA_SOUL },
-        { RG_GANON_SOUL,             RAND_INF_GANON_SOUL },
-        { RG_OCARINA_A_BUTTON,       RAND_INF_HAS_OCARINA_A },
-        { RG_OCARINA_C_UP_BUTTON,    RAND_INF_HAS_OCARINA_C_UP },
-        { RG_OCARINA_C_DOWN_BUTTON,  RAND_INF_HAS_OCARINA_C_DOWN },
-        { RG_OCARINA_C_LEFT_BUTTON,  RAND_INF_HAS_OCARINA_C_LEFT },
-        { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
-        { RG_SKELETON_KEY,           RAND_INF_HAS_SKELETON_KEY },
-        { RG_GREG_RUPEE,             RAND_INF_GREG_FOUND },
-        { RG_FISHING_POLE,           RAND_INF_FISHING_POLE_FOUND },
-        { RG_GUARD_HOUSE_KEY,                  RAND_INF_GUARD_HOUSE_KEY_OBTAINED },
-        { RG_MARKET_BAZAAR_KEY,                RAND_INF_MARKET_BAZAAR_KEY_OBTAINED },
-        { RG_MARKET_POTION_SHOP_KEY,           RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED },
-        { RG_MASK_SHOP_KEY,                    RAND_INF_MASK_SHOP_KEY_OBTAINED },
-        { RG_MARKET_SHOOTING_GALLERY_KEY,      RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED },
-        { RG_BOMBCHU_BOWLING_KEY,              RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED },
-        { RG_TREASURE_CHEST_GAME_BUILDING_KEY, RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED },
-        { RG_BOMBCHU_SHOP_KEY,                 RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED },
-        { RG_RICHARDS_HOUSE_KEY,               RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED },
-        { RG_ALLEY_HOUSE_KEY,                  RAND_INF_ALLEY_HOUSE_KEY_OBTAINED },
-        { RG_KAK_BAZAAR_KEY,                   RAND_INF_KAK_BAZAAR_KEY_OBTAINED },
-        { RG_KAK_POTION_SHOP_KEY,              RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED },
-        { RG_BOSS_HOUSE_KEY,                   RAND_INF_BOSS_HOUSE_KEY_OBTAINED },
-        { RG_GRANNYS_POTION_SHOP_KEY,          RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED },
-        { RG_SKULLTULA_HOUSE_KEY,              RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED },
-        { RG_IMPAS_HOUSE_KEY,                  RAND_INF_IMPAS_HOUSE_KEY_OBTAINED },
-        { RG_WINDMILL_KEY,                     RAND_INF_WINDMILL_KEY_OBTAINED },
-        { RG_KAK_SHOOTING_GALLERY_KEY,         RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED },
-        { RG_DAMPES_HUT_KEY,                   RAND_INF_DAMPES_HUT_KEY_OBTAINED },
-        { RG_TALONS_HOUSE_KEY,                 RAND_INF_TALONS_HOUSE_KEY_OBTAINED },
-        { RG_STABLES_KEY,                      RAND_INF_STABLES_KEY_OBTAINED },
-        { RG_BACK_TOWER_KEY,                   RAND_INF_BACK_TOWER_KEY_OBTAINED },
-        { RG_HYLIA_LAB_KEY,                    RAND_INF_HYLIA_LAB_KEY_OBTAINED },
-        { RG_FISHING_HOLE_KEY,                 RAND_INF_FISHING_HOLE_KEY_OBTAINED },
-    };
-
-    std::map<uint32_t, uint32_t> Logic::RandoGetToDungeonScene = {
-        { RG_FOREST_TEMPLE_SMALL_KEY,           SCENE_FOREST_TEMPLE },
-        { RG_FIRE_TEMPLE_SMALL_KEY,             SCENE_FIRE_TEMPLE },
-        { RG_WATER_TEMPLE_SMALL_KEY,            SCENE_WATER_TEMPLE },
-        { RG_SPIRIT_TEMPLE_SMALL_KEY,           SCENE_SPIRIT_TEMPLE },
-        { RG_SHADOW_TEMPLE_SMALL_KEY,           SCENE_SHADOW_TEMPLE },
-        { RG_BOTTOM_OF_THE_WELL_SMALL_KEY,      SCENE_BOTTOM_OF_THE_WELL },
-        { RG_GERUDO_TRAINING_GROUND_SMALL_KEY, SCENE_GERUDO_TRAINING_GROUND },
-        { RG_GERUDO_FORTRESS_SMALL_KEY,         SCENE_THIEVES_HIDEOUT },
-        { RG_GANONS_CASTLE_SMALL_KEY,           SCENE_INSIDE_GANONS_CASTLE },
-        { RG_FOREST_TEMPLE_KEY_RING,            SCENE_FOREST_TEMPLE },
-        { RG_FIRE_TEMPLE_KEY_RING,              SCENE_FIRE_TEMPLE },
-        { RG_WATER_TEMPLE_KEY_RING,             SCENE_WATER_TEMPLE },
-        { RG_SPIRIT_TEMPLE_KEY_RING,            SCENE_SPIRIT_TEMPLE },
-        { RG_SHADOW_TEMPLE_KEY_RING,            SCENE_SHADOW_TEMPLE },
-        { RG_BOTTOM_OF_THE_WELL_KEY_RING,       SCENE_BOTTOM_OF_THE_WELL },
-        { RG_GERUDO_TRAINING_GROUND_KEY_RING,  SCENE_GERUDO_TRAINING_GROUND },
-        { RG_GERUDO_FORTRESS_KEY_RING,          SCENE_THIEVES_HIDEOUT },
-        { RG_GANONS_CASTLE_KEY_RING,            SCENE_INSIDE_GANONS_CASTLE },
-        { RG_FOREST_TEMPLE_BOSS_KEY,            SCENE_FOREST_TEMPLE },
-        { RG_FIRE_TEMPLE_BOSS_KEY,              SCENE_FIRE_TEMPLE },
-        { RG_WATER_TEMPLE_BOSS_KEY,             SCENE_WATER_TEMPLE },
-        { RG_SPIRIT_TEMPLE_BOSS_KEY,            SCENE_SPIRIT_TEMPLE },
-        { RG_SHADOW_TEMPLE_BOSS_KEY,            SCENE_SHADOW_TEMPLE },
-        { RG_GANONS_CASTLE_BOSS_KEY,            SCENE_INSIDE_GANONS_CASTLE },
-        { RG_DEKU_TREE_MAP,                     SCENE_DEKU_TREE },
-        { RG_DODONGOS_CAVERN_MAP,               SCENE_DODONGOS_CAVERN },
-        { RG_JABU_JABUS_BELLY_MAP,              SCENE_JABU_JABU },
-        { RG_FOREST_TEMPLE_MAP,                 SCENE_FOREST_TEMPLE },
-        { RG_FIRE_TEMPLE_MAP,                   SCENE_FIRE_TEMPLE },
-        { RG_WATER_TEMPLE_MAP,                  SCENE_WATER_TEMPLE },
-        { RG_SPIRIT_TEMPLE_MAP,                 SCENE_SPIRIT_TEMPLE },
-        { RG_SHADOW_TEMPLE_MAP,                 SCENE_SHADOW_TEMPLE },
-        { RG_BOTTOM_OF_THE_WELL_MAP,            SCENE_BOTTOM_OF_THE_WELL },
-        { RG_ICE_CAVERN_MAP,                    SCENE_ICE_CAVERN },
-        { RG_DEKU_TREE_COMPASS,                 SCENE_DEKU_TREE },
-        { RG_DODONGOS_CAVERN_COMPASS,           SCENE_DODONGOS_CAVERN },
-        { RG_JABU_JABUS_BELLY_COMPASS,          SCENE_JABU_JABU },
-        { RG_FOREST_TEMPLE_COMPASS,             SCENE_FOREST_TEMPLE },
-        { RG_FIRE_TEMPLE_COMPASS,               SCENE_FIRE_TEMPLE },
-        { RG_WATER_TEMPLE_COMPASS,              SCENE_WATER_TEMPLE },
-        { RG_SPIRIT_TEMPLE_COMPASS,             SCENE_SPIRIT_TEMPLE },
-        { RG_SHADOW_TEMPLE_COMPASS,             SCENE_SHADOW_TEMPLE },
-        { RG_BOTTOM_OF_THE_WELL_COMPASS,        SCENE_BOTTOM_OF_THE_WELL },
-        { RG_ICE_CAVERN_COMPASS,                SCENE_ICE_CAVERN },
-        { RG_TREASURE_GAME_SMALL_KEY,           SCENE_TREASURE_BOX_SHOP }
-    };
-
-    std::map<uint32_t, uint32_t> Logic::RandoGetToQuestItem = {
-        { RG_FOREST_MEDALLION,       QUEST_MEDALLION_FOREST },
-        { RG_FIRE_MEDALLION,         QUEST_MEDALLION_FIRE },
-        { RG_WATER_MEDALLION,        QUEST_MEDALLION_WATER },
-        { RG_SPIRIT_MEDALLION,       QUEST_MEDALLION_SPIRIT },
-        { RG_SHADOW_MEDALLION,       QUEST_MEDALLION_SHADOW },
-        { RG_LIGHT_MEDALLION,        QUEST_MEDALLION_LIGHT },
-        { RG_MINUET_OF_FOREST,       QUEST_SONG_MINUET },
-        { RG_BOLERO_OF_FIRE,         QUEST_SONG_BOLERO },
-        { RG_SERENADE_OF_WATER,      QUEST_SONG_SERENADE },
-        { RG_REQUIEM_OF_SPIRIT,      QUEST_SONG_REQUIEM },
-        { RG_NOCTURNE_OF_SHADOW,     QUEST_SONG_NOCTURNE },
-        { RG_PRELUDE_OF_LIGHT,       QUEST_SONG_PRELUDE },
-        { RG_ZELDAS_LULLABY,         QUEST_SONG_LULLABY },
-        { RG_EPONAS_SONG,            QUEST_SONG_EPONA },
-        { RG_SARIAS_SONG,            QUEST_SONG_SARIA },
-        { RG_SUNS_SONG,              QUEST_SONG_SUN },
-        { RG_SONG_OF_TIME,           QUEST_SONG_TIME },
-        { RG_SONG_OF_STORMS,         QUEST_SONG_STORMS },
-        { RG_KOKIRI_EMERALD,         QUEST_KOKIRI_EMERALD },
-        { RG_GORON_RUBY,             QUEST_GORON_RUBY },
-        { RG_ZORA_SAPPHIRE,          QUEST_ZORA_SAPPHIRE },
-        { RG_STONE_OF_AGONY,         QUEST_STONE_OF_AGONY },
-        { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
-    };
-
-    std::map<uint32_t, uint32_t> BottleRandomizerGetToItemID = {
-        { RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED },
-        { RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN },
-        { RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE },
-        { RG_BOTTLE_WITH_FAIRY, ITEM_FAIRY },
-        { RG_BOTTLE_WITH_FISH, ITEM_FISH },
-        { RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE },
-        { RG_BOTTLE_WITH_BUGS, ITEM_BUG },
-        { RG_BOTTLE_WITH_POE, ITEM_POE },
-        { RG_BOTTLE_WITH_BIG_POE, ITEM_BIG_POE },
-    };
-
-    uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
-    uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
-
-    void Logic::ApplyItemEffect(Item& item, bool state) {
-        auto randoGet = item.GetRandomizerGet();
-        if (item.GetGIEntry()->objectId == OBJECT_GI_STICK) {
-            SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-        }
-        if (item.GetGIEntry()->objectId == OBJECT_GI_NUTS) {
-            SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-        }
-        switch (item.GetItemType()) {
-        case ITEMTYPE_ITEM:
-        {
-            switch (randoGet) {
-            case RG_STONE_OF_AGONY:
-            case RG_GERUDO_MEMBERSHIP_CARD:
-                SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
-                break;
-            case RG_WEIRD_EGG:
-                SetRandoInf(RAND_INF_WEIRD_EGG, state);
-                break;
-            case RG_ZELDAS_LETTER:
-                SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
-                break;
-            case RG_DOUBLE_DEFENSE:
-                mSaveContext->isDoubleDefenseAcquired = state;
-                break;
-            case RG_POCKET_EGG:
-            case RG_COJIRO:
-            case RG_ODD_MUSHROOM:
-            case RG_ODD_POTION:
-            case RG_POACHERS_SAW:
-            case RG_BROKEN_SWORD:
-            case RG_PRESCRIPTION:
-            case RG_EYEBALL_FROG:
-            case RG_EYEDROPS:
-            case RG_CLAIM_CHECK:
-                SetRandoInf(randoGet - RG_POCKET_EGG + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG, state);
-                break;
-            case RG_PROGRESSIVE_HOOKSHOT:
-            {
-                uint8_t i;
-                for (i = 0; i < 3; i++) {
-                    if (CurrentInventory(ITEM_HOOKSHOT) == HookshotLookup[i]) {
-                        break;
-                    }
-                }
-                auto newItem = i + (!state ? -1 : 1);
-                if (newItem < 0) {
-                    newItem = 0;
-                }
-                else if (newItem > 2) {
-                    newItem = 2;
-                }
-                SetInventory(ITEM_HOOKSHOT, HookshotLookup[newItem]);
-            }   break;
-            case RG_PROGRESSIVE_STRENGTH:
-            {
-                auto currentLevel = CurrentUpgrade(UPG_STRENGTH);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                SetUpgrade(UPG_STRENGTH, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOMB_BAG:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BOMB_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMB_BAG, true);
+    bool drop = false;
+    switch (enemy) {
+        case RE_GOLD_SKULLTULA:
+            switch (distance) {
+                case ED_CLOSE:
+                case ED_SHORT_JUMPSLASH:
+                case ED_MASTER_SWORD_JUMPSLASH:
+                case ED_LONG_JUMPSLASH:
+                case ED_BOMB_THROW:
+                case ED_BOOMERANG:
+                    drop = drop || CanUse(RG_BOOMERANG);
+                    [[fallthrough]];
+                case ED_HOOKSHOT:
+                    drop = drop || CanUse(RG_HOOKSHOT);
+                    [[fallthrough]];
+                case ED_LONGSHOT:
+                    drop = drop || CanUse(RG_LONGSHOT);
+                    [[fallthrough]];
+                case ED_FAR:
                     break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_BOMB_BAG);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_BOMB, (!state ? ITEM_NONE : ITEM_BOMB));
-                }
-                SetUpgrade(UPG_BOMB_BAG, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOW:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_QUIVER_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_QUIVER, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_QUIVER);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_BOW, (!state ? ITEM_NONE : ITEM_BOW));
-                }
-                SetUpgrade(UPG_QUIVER, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_SLINGSHOT:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BULLET_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BULLET_BAG, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_BULLET_BAG);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_SLINGSHOT, (!state ? ITEM_NONE : ITEM_SLINGSHOT));
-                }
-                SetUpgrade(UPG_BULLET_BAG, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_WALLET:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_WALLET_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_MONEY, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_WALLET);
-                if (!CheckRandoInf(RAND_INF_HAS_WALLET) && state) {
-                    SetRandoInf(RAND_INF_HAS_WALLET, true);
-                }
-                else if (currentLevel == 0 && !state) {
-                    SetRandoInf(RAND_INF_HAS_WALLET, false);
-                }
-                else {
-                    auto newLevel = currentLevel + (!state ? -1 : 1);
-                    SetUpgrade(UPG_WALLET, newLevel);
-                }
-            }   break;
-            case RG_PROGRESSIVE_SCALE:
-            {
-                auto currentLevel = CurrentUpgrade(UPG_SCALE);
-                if (!CheckRandoInf(RAND_INF_CAN_SWIM) && state) {
-                    SetRandoInf(RAND_INF_CAN_SWIM, true);
-                }
-                else if (currentLevel == 0 && !state) {
-                    SetRandoInf(RAND_INF_CAN_SWIM, false);
-                }
-                else {
-                    auto newLevel = currentLevel + (!state ? -1 : 1);
-                    SetUpgrade(UPG_SCALE, newLevel);
-                }
-            }   break;
-            case RG_PROGRESSIVE_NUT_UPGRADE:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_NUT_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_NUTS);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-                }
-                SetUpgrade(UPG_NUTS, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_STICK_UPGRADE:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_STICK_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE, true);
-                    break;
-                }
-                auto currentLevel = CurrentUpgrade(UPG_STICKS);
-                auto newLevel = currentLevel + (!state ? -1 : 1);
-                if (currentLevel == 0 && state || currentLevel == 1 && !state) {
-                    SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-                }
-                SetUpgrade(UPG_STICKS, newLevel);
-            }   break;
-            case RG_PROGRESSIVE_BOMBCHUS:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_BOMBCHU_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_BOMBCHUS, true);
-                    break;
-                }
-                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-            } break;
-            case RG_PROGRESSIVE_MAGIC_METER:
-            {
-                auto realGI = item.GetGIEntry();
-                if (realGI->itemId == RG_MAGIC_INF && realGI->modIndex == MOD_RANDOMIZER) {
-                    SetRandoInf(RAND_INF_HAS_INFINITE_MAGIC_METER, true);
-                    break;
-                }
-                mSaveContext->magicLevel += (!state ? -1 : 1);
-            } break;
-            case RG_PROGRESSIVE_OCARINA:
-            {
-                uint8_t i;
-                for (i = 0; i < 3; i++) {
-                    if (CurrentInventory(ITEM_OCARINA_FAIRY) == OcarinaLookup[i]) {
-                        break;
-                    }
-                }
-                i += (!state ? -1 : 1);
-                if (i < 0) {
-                    i = 0;
-                }
-                else if (i > 2) {
-                    i = 2;
-                }
-                SetInventory(ITEM_OCARINA_FAIRY, OcarinaLookup[i]);
-            }   break;
-            case RG_HEART_CONTAINER:
-                mSaveContext->healthCapacity += (!state ? -16 : 16);
-                break;
-            case RG_PIECE_OF_HEART:
-                mSaveContext->healthCapacity += (!state ? -4 : 4);
-                break;
-            case RG_BOOMERANG:
-            case RG_LENS_OF_TRUTH:
-            case RG_MEGATON_HAMMER:
-            case RG_DINS_FIRE:
-            case RG_FARORES_WIND:
-            case RG_NAYRUS_LOVE:
-            case RG_FIRE_ARROWS:
-            case RG_ICE_ARROWS:
-            case RG_LIGHT_ARROWS:
-                SetInventory(item.GetGIEntry()->itemId, (!state ? ITEM_NONE : item.GetGIEntry()->itemId));
-                break;
-            case RG_MAGIC_BEAN:
-            case RG_MAGIC_BEAN_PACK:
-            {
-                auto change = (item.GetRandomizerGet() == RG_MAGIC_BEAN ? 1 : 10);
-                auto current = GetAmmo(ITEM_BEAN);
-                SetAmmo(ITEM_BEAN, current + (!state ? -change : change));
-            }   break;
-            case RG_EMPTY_BOTTLE:
-            case RG_BOTTLE_WITH_MILK:
-            case RG_BOTTLE_WITH_RED_POTION:
-            case RG_BOTTLE_WITH_GREEN_POTION:
-            case RG_BOTTLE_WITH_BLUE_POTION:
-            case RG_BOTTLE_WITH_FAIRY:
-            case RG_BOTTLE_WITH_FISH:
-            case RG_BOTTLE_WITH_BLUE_FIRE:
-            case RG_BOTTLE_WITH_BUGS:
-            case RG_BOTTLE_WITH_POE:
-            case RG_BOTTLE_WITH_BIG_POE:
-            {
-                uint8_t slot = SLOT_BOTTLE_1;
-                while (slot != SLOT_BOTTLE_4) {
-                    if (mSaveContext->inventory.items[slot] == ITEM_NONE) {
-                        break;
-                    }
-                    slot++;
-                }
-                uint16_t itemId = item.GetGIEntry()->itemId;
-                if (BottleRandomizerGetToItemID.contains(randoGet)) {
-                    itemId = BottleRandomizerGetToItemID[randoGet];
-                }
-                if (randoGet == RG_BOTTLE_WITH_BIG_POE) {
-                    BigPoes++;
-                }
-                mSaveContext->inventory.items[slot] = itemId;
-            }   break;
-            case RG_RUTOS_LETTER:
-                SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
-                break;
-            case RG_GOHMA_SOUL:
-            case RG_KING_DODONGO_SOUL:
-            case RG_BARINADE_SOUL:
-            case RG_PHANTOM_GANON_SOUL:
-            case RG_VOLVAGIA_SOUL:
-            case RG_MORPHA_SOUL:
-            case RG_BONGO_BONGO_SOUL:
-            case RG_TWINROVA_SOUL:
-            case RG_GANON_SOUL:
-            case RG_OCARINA_A_BUTTON:
-            case RG_OCARINA_C_UP_BUTTON:
-            case RG_OCARINA_C_DOWN_BUTTON:
-            case RG_OCARINA_C_LEFT_BUTTON:
-            case RG_OCARINA_C_RIGHT_BUTTON:
-            case RG_GREG_RUPEE:
-            case RG_FISHING_POLE:
-            case RG_GUARD_HOUSE_KEY:
-            case RG_MARKET_BAZAAR_KEY:
-            case RG_MARKET_POTION_SHOP_KEY:
-            case RG_MASK_SHOP_KEY:
-            case RG_MARKET_SHOOTING_GALLERY_KEY:
-            case RG_BOMBCHU_BOWLING_KEY:
-            case RG_TREASURE_CHEST_GAME_BUILDING_KEY:
-            case RG_BOMBCHU_SHOP_KEY:
-            case RG_RICHARDS_HOUSE_KEY:
-            case RG_ALLEY_HOUSE_KEY:
-            case RG_KAK_BAZAAR_KEY:
-            case RG_KAK_POTION_SHOP_KEY:
-            case RG_BOSS_HOUSE_KEY:
-            case RG_GRANNYS_POTION_SHOP_KEY:
-            case RG_SKULLTULA_HOUSE_KEY:
-            case RG_IMPAS_HOUSE_KEY:
-            case RG_WINDMILL_KEY:
-            case RG_KAK_SHOOTING_GALLERY_KEY:
-            case RG_DAMPES_HUT_KEY:
-            case RG_TALONS_HOUSE_KEY:
-            case RG_STABLES_KEY:
-            case RG_BACK_TOWER_KEY:
-            case RG_HYLIA_LAB_KEY:
-            case RG_FISHING_HOLE_KEY:
-                SetRandoInf(RandoGetToRandInf.at(randoGet), state);
-                break;
-            case RG_TRIFORCE_PIECE:
-                mSaveContext->ship.quest.data.randomizer.triforcePiecesCollected += (!state ? -1 : 1);
-                break;
-            case RG_BOMBCHU_5:
-            case RG_BOMBCHU_10:
-            case RG_BOMBCHU_20:
-                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-                break;
-            default:
-                break;
+                    // RANDOTODO double check all jumpslash kills that might be out of jump/backflip range
             }
+            return drop;
+            break;
+        case RE_KEESE:
+        case RE_FIRE_KEESE:
+            return true;
+        default:
+            return aboveLink || (distance <= ED_BOOMERANG && CanUse(RG_BOOMERANG));
+    }
+}
+
+bool Logic::CanBreakMudWalls() {
+    return BlastOrSmash() || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && BlueFire());
+}
+
+bool Logic::CanGetDekuBabaSticks() {
+    return CanUseSword() || CanUse(RG_BOOMERANG);
+}
+
+bool Logic::CanGetDekuBabaNuts() {
+    return CanJumpslash() || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW) || HasExplosives() ||
+           CanUse(RG_DINS_FIRE);
+}
+
+bool Logic::CanHitEyeTargets() {
+    return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT);
+}
+
+bool Logic::CanDetonateBombFlowers() {
+    return CanUse(RG_FAIRY_BOW) || HasExplosives() || CanUse(RG_DINS_FIRE);
+}
+
+bool Logic::CanDetonateUprightBombFlower() {
+    return CanDetonateBombFlowers() || HasItem(RG_GORONS_BRACELET) ||
+           (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && CanUse(RG_BOTTLE_WITH_BLUE_FIRE) &&
+            (EffectiveHealth() != 1 || CanUse(RG_NAYRUS_LOVE)));
+}
+
+bool Logic::MQWaterLevel(RandoWaterLevel level) {
+    // For ease of reading, I will call the triforce emblem that sets the water to WL_LOW the "Low Emblem", the one that
+    // sets it to WL_MID the "Mid Emblem", and the one that sets it to WL_HIGH the "High Emblem"
+    switch (level) {
+        // While you have to go through WL_LOW to get to Mid, the requirements for WL_LOW are stricter than WL_MID
+        // because you can always go up to WL_MID and then could need to go back to WL_HIGH to reach the Low Emblem
+        // again Thanks to this caveat you need to be able to reach and play ZL to both the High and Low Emblems to have
+        // WL_LOW in logic. Alternativly a way to reach WL_LOW from WL_MID could exist, but all glitchless methods need
+        // you to do a Low-locked action
+        case WL_LOW:
+            return (CanWaterTempleHigh && CanWaterTempleLowFromHigh) ||
+                   (CanWaterTempleLowFromMid && CanWaterTempleLowFromHigh);
+        case WL_LOW_OR_MID:
+            return (CanWaterTempleHigh && CanWaterTempleLowFromHigh) ||
+                   (CanWaterTempleLowFromHigh && CanWaterTempleMiddle) ||
+                   (CanWaterTempleLowFromMid && CanWaterTempleLowFromHigh);
+        // If we can set it to High out of logic we can just repeat what we did to lower the water in the first place as
+        // High is the default. Because of this you only need to be able to use the Low and Mid Emblems, WL_LOW could be
+        // skipped if it was ever possible to play ZL underwater.
+        case WL_MID:
+            return CanWaterTempleLowFromHigh && CanWaterTempleMiddle;
+        // Despite being the initial state of water temple, WL_HIGH has the extra requirement of making sure that, if we
+        // were to lower the water out of logic, we could put it back to WL_HIGH However because it is the default
+        // state, we do not need to check if we can actually change the water level, only to make sure we can return to
+        // WL_HIGH if we found the means to play ZL out of logic. There are 2 methods to lock yourself out after playing
+        // ZL already: Not being able to reach the High Emblem and being unable to replay ZL. (I will be ignoring
+        // other-age-access shenanigains) The former check would simply be a check to see if we can reach High Emblem,
+        // but we assume the water is WL_MID (as if we can set it to WL_LOW, we can set it to WL_MID, as Mid Emblem has
+        // no requirements) The latter check can be assumed for now but will want a revisit once OI tricks are added.
+        case WL_HIGH:
+            return ReachedWaterHighEmblem;
+        case WL_HIGH_OR_MID:
+            return ReachedWaterHighEmblem || (CanWaterTempleLowFromHigh && CanWaterTempleMiddle);
+    }
+    SPDLOG_ERROR("MQWaterLevel reached `return false;`. Missing case for a Water Level");
+    assert(false);
+    return false;
+}
+
+Logic::Logic() {
+}
+
+uint8_t Logic::BottleCount() {
+    uint8_t count = 0;
+    for (int i = SLOT_BOTTLE_1; i <= SLOT_BOTTLE_4; i++) {
+        uint8_t item = GetSaveContext()->inventory.items[i];
+        switch (item) {
+            case ITEM_LETTER_RUTO:
+                if (DeliverLetter) {
+                    count++;
+                }
+                break;
+            case ITEM_BIG_POE:
+                if (CanEmptyBigPoes) {
+                    count++;
+                }
+                break;
+            case ITEM_NONE:
+                break;
+            default:
+                count++;
+                break;
         }
-        break;
-        case ITEMTYPE_EQUIP:
-        {
+    }
+    return count;
+}
+
+uint8_t Logic::OcarinaButtons() {
+    return HasItem(RG_OCARINA_A_BUTTON) + HasItem(RG_OCARINA_C_LEFT_BUTTON) + HasItem(RG_OCARINA_C_RIGHT_BUTTON) +
+           HasItem(RG_OCARINA_C_UP_BUTTON) + HasItem(RG_OCARINA_C_DOWN_BUTTON);
+}
+
+bool Logic::HasBottle() {
+    return BottleCount() >= 1;
+}
+
+bool Logic::CanUseSword() {
+    return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
+}
+
+bool Logic::CanJumpslashExceptHammer() {
+    // Not including hammer as hammer jump attacks can be weird;
+    return CanUse(RG_STICKS) || CanUseSword();
+}
+
+bool Logic::CanJumpslash() {
+    return CanJumpslashExceptHammer() || CanUse(RG_MEGATON_HAMMER);
+}
+
+bool Logic::CanHitSwitch(EnemyDistance distance, bool inWater) {
+    bool hit = false;
+    switch (distance) {
+        case ED_CLOSE:
+        case ED_SHORT_JUMPSLASH:
+            hit = CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MEGATON_HAMMER);
+            [[fallthrough]];
+        case ED_MASTER_SWORD_JUMPSLASH:
+            hit = hit || CanUse(RG_MASTER_SWORD);
+            [[fallthrough]];
+        case ED_LONG_JUMPSLASH:
+            hit = hit || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
+            [[fallthrough]];
+        case ED_BOMB_THROW:
+            hit = hit || (!inWater && CanUse(RG_BOMB_BAG));
+            [[fallthrough]];
+        case ED_BOOMERANG:
+            hit = hit || CanUse(RG_BOOMERANG);
+            [[fallthrough]];
+        case ED_HOOKSHOT:
+            // RANDOTODO test chu range in a practical example
+            hit = hit || CanUse(RG_HOOKSHOT) || CanUse(RG_BOMBCHU_5);
+            [[fallthrough]];
+        case ED_LONGSHOT:
+            hit = hit || CanUse(RG_LONGSHOT);
+            [[fallthrough]];
+        case ED_FAR:
+            hit = hit || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
+            break;
+    }
+    return hit;
+}
+
+bool Logic::CanDamage() {
+    return CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash() || HasExplosives() || CanUse(RG_DINS_FIRE) ||
+           CanUse(RG_FAIRY_BOW);
+}
+
+bool Logic::CanAttack() {
+    return CanDamage() || CanUse(RG_BOOMERANG) || CanUse(RG_HOOKSHOT);
+}
+
+bool Logic::BombchusEnabled() {
+    return ctx->GetOption(RSK_BOMBCHU_BAG) ? CheckInventory(ITEM_BOMBCHU, true) : HasItem(RG_BOMB_BAG);
+}
+
+// TODO: Implement Ammo Drop Setting in place of bombchu drops
+bool Logic::BombchuRefill() {
+    return GetInLogic(LOGIC_BUY_BOMBCHUS) || CouldPlayBowling || CarpetMerchant ||
+           (ctx->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_AMMO_DROPS_ON /*_PLUS_BOMBCHU*/));
+}
+
+bool Logic::HookshotOrBoomerang() {
+    return CanUse(RG_HOOKSHOT) || CanUse(RG_BOOMERANG);
+}
+
+bool Logic::ScarecrowsSong() {
+    return (ctx->GetOption(RSK_SKIP_SCARECROWS_SONG) && HasItem(RG_FAIRY_OCARINA) && OcarinaButtons() >= 2) ||
+           (ChildScarecrow && AdultScarecrow);
+}
+
+bool Logic::BlueFire() {
+    return CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
+}
+
+bool Logic::CanBreakPots() {
+    return true;
+}
+
+bool Logic::CanBreakCrates() {
+    return true;
+}
+
+bool Logic::CanBreakSmallCrates() {
+    return true;
+}
+
+bool Logic::HasExplosives() {
+    return CanUse(RG_BOMB_BAG) || CanUse(RG_BOMBCHU_5);
+}
+
+bool Logic::BlastOrSmash() {
+    return HasExplosives() || CanUse(RG_MEGATON_HAMMER);
+}
+
+bool Logic::CanSpawnSoilSkull() {
+    return IsChild && CanUse(RG_BOTTLE_WITH_BUGS);
+}
+
+bool Logic::CanReflectNuts() {
+    return CanUse(RG_DEKU_SHIELD) || (IsAdult && HasItem(RG_HYLIAN_SHIELD));
+}
+
+bool Logic::CanCutShrubs() {
+    return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_BOOMERANG) || HasExplosives() || CanUse(RG_MASTER_SWORD) ||
+           CanUse(RG_MEGATON_HAMMER) || CanUse(RG_BIGGORON_SWORD) || HasItem(RG_GORONS_BRACELET);
+}
+
+bool Logic::CanStunDeku() {
+    return CanAttack() || CanUse(RG_NUTS) || CanReflectNuts();
+}
+
+bool Logic::CanLeaveForest() {
+    return ctx->GetOption(RSK_FOREST).IsNot(RO_CLOSED_FOREST_ON) || IsAdult || DekuTreeClear ||
+           ctx->GetOption(RSK_SHUFFLE_INTERIOR_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES);
+}
+
+bool Logic::CallGossipFairyExceptSuns() {
+    return CanUse(RG_ZELDAS_LULLABY) || CanUse(RG_EPONAS_SONG) || CanUse(RG_SONG_OF_TIME);
+}
+
+bool Logic::CallGossipFairy() {
+    return CallGossipFairyExceptSuns() || CanUse(RG_SUNS_SONG);
+}
+
+// the number returned by this is in half heart hits taken.
+// RANDOTODO work in OoT side health instead for greater applicability (16 per heart)
+uint8_t Logic::EffectiveHealth() {
+    /* Multiplier will be:
+    0 for half daamge
+    1 for normal damage
+    2 for double damage
+    3 for quad damage
+    4 for 8* damage
+    5 for 16* damage
+    10 for OHKO.
+    This is the number of shifts to apply, not a real multiplier
+    */
+    uint8_t Multiplier =
+        (ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Get() < 6) ? ctx->GetOption(RSK_DAMAGE_MULTIPLIER).Get() : 10;
+    //(Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) is quarter hearts after DD
+    //>> Multiplier halves on normal and does nothing on half, meaning we're working with half hearts on normal damage
+    return ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) >> Multiplier) +
+           // As 1 is a quarter heart, (1 << Multiplier) is effectivly half-hearts of unmodified damage
+           // Adds an extra hit if the damage is not exact lethal
+           ((Hearts() << (2 + HasItem(RG_DOUBLE_DEFENSE))) % (1 << Multiplier) > 0);
+}
+
+uint8_t Logic::Hearts() {
+    return GetSaveContext()->healthCapacity / 16;
+}
+
+uint8_t Logic::DungeonCount() {
+    return DekuTreeClear + DodongosCavernClear + JabuJabusBellyClear + ForestTempleClear + FireTempleClear +
+           WaterTempleClear + SpiritTempleClear + ShadowTempleClear;
+}
+
+uint8_t Logic::StoneCount() {
+    return HasItem(RG_KOKIRI_EMERALD) + HasItem(RG_GORON_RUBY) + HasItem(RG_ZORA_SAPPHIRE);
+}
+
+uint8_t Logic::MedallionCount() {
+    return HasItem(RG_FOREST_MEDALLION) + HasItem(RG_FIRE_MEDALLION) + HasItem(RG_WATER_MEDALLION) +
+           HasItem(RG_SPIRIT_MEDALLION) + HasItem(RG_SHADOW_MEDALLION) + HasItem(RG_LIGHT_MEDALLION);
+}
+
+uint8_t Logic::FireTimer() {
+    return CanUse(RG_GORON_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
+}
+
+// Tunic is not required if you are using irons to do something that a simple gold scale dive could do, and you are not
+// in water temple. (celing swimming and long walks through water do not count)
+uint8_t Logic::WaterTimer() {
+    return CanUse(RG_ZORA_TUNIC) ? 255 : (ctx->GetTrickOption(RT_FEWER_TUNIC_REQUIREMENTS)) ? (Hearts() * 8) : 0;
+}
+
+bool Logic::TakeDamage() {
+    return CanUse(RG_BOTTLE_WITH_FAIRY) || EffectiveHealth() != 1 || CanUse(RG_NAYRUS_LOVE);
+}
+
+bool Logic::CanOpenBombGrotto() {
+    return BlastOrSmash() && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+}
+
+bool Logic::CanOpenStormsGrotto() {
+    return CanUse(RG_SONG_OF_STORMS) && (HasItem(RG_STONE_OF_AGONY) || ctx->GetTrickOption(RT_GROTTOS_WITHOUT_AGONY));
+}
+
+bool Logic::CanGetNightTimeGS() {
+    return AtNight && (CanUse(RG_SUNS_SONG) || !ctx->GetOption(RSK_SKULLS_SUNS_SONG));
+}
+
+bool Logic::CanBreakUpperBeehives() {
+    return HookshotOrBoomerang() || (ctx->GetTrickOption(RT_BOMBCHU_BEEHIVES) && CanUse(RG_BOMBCHU_5));
+}
+
+bool Logic::CanBreakLowerBeehives() {
+    return CanBreakUpperBeehives() || CanUse(RG_BOMB_BAG);
+}
+
+bool Logic::HasFireSource() {
+    return CanUse(RG_DINS_FIRE) || CanUse(RG_FIRE_ARROWS);
+}
+
+bool Logic::HasFireSourceWithTorch() {
+    return HasFireSource() || CanUse(RG_STICKS);
+}
+
+// Is this best off signaling what you have already traded, or what step you are currently on?
+bool Logic::TradeQuestStep(RandomizerGet rg) {
+    if (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE)) {
+        return false; // This does not apply when we are shuffling trade items
+    }
+    bool hasState = false;
+    // Falling through each case to test each possibility
+    switch (rg) {
+        case RG_POCKET_EGG:
+            hasState = hasState || HasItem(RG_POCKET_EGG);
+            [[fallthrough]];
+        case RG_COJIRO:
+            hasState = hasState || HasItem(RG_COJIRO);
+            [[fallthrough]];
+        case RG_ODD_MUSHROOM:
+            hasState = hasState || HasItem(RG_ODD_MUSHROOM);
+            [[fallthrough]];
+        case RG_ODD_POTION:
+            hasState = hasState || HasItem(RG_ODD_POTION);
+            [[fallthrough]];
+        case RG_POACHERS_SAW:
+            hasState = hasState || HasItem(RG_POACHERS_SAW);
+            [[fallthrough]];
+        case RG_BROKEN_SWORD:
+            hasState = hasState || HasItem(RG_BROKEN_SWORD);
+            [[fallthrough]];
+        case RG_PRESCRIPTION:
+            hasState = hasState || HasItem(RG_PRESCRIPTION);
+            [[fallthrough]];
+        case RG_EYEDROPS:
+            hasState = hasState || HasItem(RG_EYEDROPS);
+            [[fallthrough]];
+        case RG_CLAIM_CHECK:
+            hasState = hasState || HasItem(RG_CLAIM_CHECK);
+            break;
+        default:
+            SPDLOG_ERROR("TradeQuestStep reached `return false;`. Missing case for RandomizerGet of {}",
+                         static_cast<uint32_t>(rg));
+            assert(false);
+            return false;
+    }
+    return hasState;
+}
+
+bool Logic::CanStandingShield() {
+    return CanUse(RG_MIRROR_SHIELD) || (IsAdult && HasItem(RG_HYLIAN_SHIELD)) || CanUse(RG_DEKU_SHIELD);
+}
+
+bool Logic::CanShield() {
+    return CanUse(RG_MIRROR_SHIELD) || HasItem(RG_HYLIAN_SHIELD) || CanUse(RG_DEKU_SHIELD);
+}
+
+bool Logic::CanUseProjectile() {
+    return HasExplosives() || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_SLINGSHOT) ||
+           CanUse(RG_BOOMERANG);
+}
+
+bool Logic::CanBuildRainbowBridge() {
+    return ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_ALWAYS_OPEN) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_VANILLA) && HasItem(RG_SHADOW_MEDALLION) &&
+            HasItem(RG_SPIRIT_MEDALLION) && CanUse(RG_LIGHT_ARROWS)) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_STONES) &&
+            StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >=
+                ctx->GetOption(RSK_RAINBOW_BRIDGE_STONE_COUNT).Get()) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_MEDALLIONS) &&
+            MedallionCount() +
+                    (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >=
+                ctx->GetOption(RSK_RAINBOW_BRIDGE_MEDALLION_COUNT).Get()) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEON_REWARDS) &&
+            StoneCount() + MedallionCount() +
+                    (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >=
+                ctx->GetOption(RSK_RAINBOW_BRIDGE_REWARD_COUNT).Get()) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_DUNGEONS) &&
+            DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_BRIDGE_OPTIONS).Is(RO_BRIDGE_GREG_REWARD)) >=
+                ctx->GetOption(RSK_RAINBOW_BRIDGE_DUNGEON_COUNT).Get()) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_TOKENS) &&
+            GetGSCount() >= ctx->GetOption(RSK_RAINBOW_BRIDGE_TOKEN_COUNT).Get()) ||
+           (ctx->GetOption(RSK_RAINBOW_BRIDGE).Is(RO_BRIDGE_GREG) && HasItem(RG_GREG_RUPEE));
+}
+
+bool Logic::CanTriggerLACS() {
+    return (ctx->LACSCondition() == RO_LACS_VANILLA && HasItem(RG_SHADOW_MEDALLION) && HasItem(RG_SPIRIT_MEDALLION)) ||
+           (ctx->LACSCondition() == RO_LACS_STONES &&
+            StoneCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >=
+                ctx->GetOption(RSK_LACS_STONE_COUNT).Get()) ||
+           (ctx->LACSCondition() == RO_LACS_MEDALLIONS &&
+            MedallionCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >=
+                ctx->GetOption(RSK_LACS_MEDALLION_COUNT).Get()) ||
+           (ctx->LACSCondition() == RO_LACS_REWARDS &&
+            StoneCount() + MedallionCount() +
+                    (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >=
+                ctx->GetOption(RSK_LACS_REWARD_COUNT).Get()) ||
+           (ctx->LACSCondition() == RO_LACS_DUNGEONS &&
+            DungeonCount() + (HasItem(RG_GREG_RUPEE) && ctx->GetOption(RSK_LACS_OPTIONS).Is(RO_LACS_GREG_REWARD)) >=
+                ctx->GetOption(RSK_LACS_DUNGEON_COUNT).Get()) ||
+           (ctx->LACSCondition() == RO_LACS_TOKENS && GetGSCount() >= ctx->GetOption(RSK_LACS_TOKEN_COUNT).Get());
+}
+
+bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount) {
+    return SmallKeys(dungeon, requiredAmount, requiredAmount);
+}
+
+bool Logic::SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched) {
+    if (HasItem(RG_SKELETON_KEY)) {
+        return true;
+    }
+    switch (dungeon) {
+        case RR_FOREST_TEMPLE:
+            /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotJump_Boots) >=
+            static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHoverBoost) >=
+            static_cast<uint8_t>(GlitchDifficulty::NOVICE) || (GetDifficultyValueFromString(GlitchHover) >=
+            static_cast<uint8_t>(GlitchDifficulty::NOVICE) && GetDifficultyValueFromString(GlitchISG) >=
+            static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE)))) { return ForestTempleKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_FOREST_TEMPLE) >= requiredAmountGlitchless;
+
+        case RR_FIRE_TEMPLE:
+            /*if (IsGlitched && (GetDifficultyValueFromString(GlitchLedgeClip) >=
+            static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE) || GetDifficultyValueFromString(GlitchHover) >=
+            static_cast<uint8_t>(GlitchDifficulty::INTERMEDIATE))) { return FireTempleKeys >= requiredAmountGlitched;
+            }*/
+            // If the Fire Temple loop lock is removed, Small key Count is set to 1 before starting
+            return GetSmallKeyCount(SCENE_FIRE_TEMPLE) >= requiredAmountGlitchless;
+
+        case RR_WATER_TEMPLE:
+            /*if (IsGlitched && (false)) {
+                return WaterTempleKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_WATER_TEMPLE) >= requiredAmountGlitchless;
+
+        case RR_SPIRIT_TEMPLE:
+            /*if (IsGlitched && (false)) {
+                return SpiritTempleKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_SPIRIT_TEMPLE) >= requiredAmountGlitchless;
+
+        case RR_SHADOW_TEMPLE:
+            /*if (IsGlitched && (GetDifficultyValueFromString(GlitchHookshotClip) >=
+            static_cast<uint8_t>(GlitchDifficulty::NOVICE))) { return ShadowTempleKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_SHADOW_TEMPLE) >= requiredAmountGlitchless;
+
+        case RR_BOTTOM_OF_THE_WELL:
+            /*if (IsGlitched && (false)) {
+                return BottomOfTheWellKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_BOTTOM_OF_THE_WELL) >= requiredAmountGlitchless;
+
+        case RR_GERUDO_TRAINING_GROUND:
+            /*if (IsGlitched && (false)) {
+                return GerudoTrainingGroundsKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_GERUDO_TRAINING_GROUND) >= requiredAmountGlitchless;
+
+        case RR_GANONS_CASTLE:
+            /*if (IsGlitched && (false)) {
+                return GanonsCastleKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_INSIDE_GANONS_CASTLE) >= requiredAmountGlitchless;
+
+        case RR_MARKET_TREASURE_CHEST_GAME:
+            /*if (IsGlitched && (false)) {
+                return TreasureGameKeys >= requiredAmountGlitched;
+            }*/
+            return GetSmallKeyCount(SCENE_TREASURE_BOX_SHOP) >= requiredAmountGlitchless;
+
+        case RR_GF_OUTSKIRTS:
+            return GetSmallKeyCount(SCENE_THIEVES_HIDEOUT) >= requiredAmountGlitchless;
+
+        default:
+            return false;
+    }
+}
+
+std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
+    { RG_KOKIRI_SWORD, EQUIP_FLAG_SWORD_KOKIRI },   { RG_MASTER_SWORD, EQUIP_FLAG_SWORD_MASTER },
+    { RG_BIGGORON_SWORD, EQUIP_FLAG_SWORD_BGS },    { RG_DEKU_SHIELD, EQUIP_FLAG_SHIELD_DEKU },
+    { RG_HYLIAN_SHIELD, EQUIP_FLAG_SHIELD_HYLIAN }, { RG_MIRROR_SHIELD, EQUIP_FLAG_SHIELD_MIRROR },
+    { RG_GORON_TUNIC, EQUIP_FLAG_TUNIC_GORON },     { RG_ZORA_TUNIC, EQUIP_FLAG_TUNIC_ZORA },
+    { RG_BUY_DEKU_SHIELD, EQUIP_FLAG_SHIELD_DEKU }, { RG_BUY_HYLIAN_SHIELD, EQUIP_FLAG_SHIELD_HYLIAN },
+    { RG_BUY_GORON_TUNIC, EQUIP_FLAG_TUNIC_GORON }, { RG_BUY_ZORA_TUNIC, EQUIP_FLAG_TUNIC_ZORA },
+    { RG_IRON_BOOTS, EQUIP_FLAG_BOOTS_IRON },       { RG_HOVER_BOOTS, EQUIP_FLAG_BOOTS_HOVER }
+};
+
+std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
+    { RG_ZELDAS_LETTER, RAND_INF_ZELDAS_LETTER },
+    { RG_WEIRD_EGG, RAND_INF_WEIRD_EGG },
+    { RG_RUTOS_LETTER, RAND_INF_OBTAINED_RUTOS_LETTER },
+    { RG_GOHMA_SOUL, RAND_INF_GOHMA_SOUL },
+    { RG_KING_DODONGO_SOUL, RAND_INF_KING_DODONGO_SOUL },
+    { RG_BARINADE_SOUL, RAND_INF_BARINADE_SOUL },
+    { RG_PHANTOM_GANON_SOUL, RAND_INF_PHANTOM_GANON_SOUL },
+    { RG_VOLVAGIA_SOUL, RAND_INF_VOLVAGIA_SOUL },
+    { RG_MORPHA_SOUL, RAND_INF_MORPHA_SOUL },
+    { RG_BONGO_BONGO_SOUL, RAND_INF_BONGO_BONGO_SOUL },
+    { RG_TWINROVA_SOUL, RAND_INF_TWINROVA_SOUL },
+    { RG_GANON_SOUL, RAND_INF_GANON_SOUL },
+    { RG_OCARINA_A_BUTTON, RAND_INF_HAS_OCARINA_A },
+    { RG_OCARINA_C_UP_BUTTON, RAND_INF_HAS_OCARINA_C_UP },
+    { RG_OCARINA_C_DOWN_BUTTON, RAND_INF_HAS_OCARINA_C_DOWN },
+    { RG_OCARINA_C_LEFT_BUTTON, RAND_INF_HAS_OCARINA_C_LEFT },
+    { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
+    { RG_SKELETON_KEY, RAND_INF_HAS_SKELETON_KEY },
+    { RG_GREG_RUPEE, RAND_INF_GREG_FOUND },
+    { RG_FISHING_POLE, RAND_INF_FISHING_POLE_FOUND },
+    { RG_GUARD_HOUSE_KEY, RAND_INF_GUARD_HOUSE_KEY_OBTAINED },
+    { RG_MARKET_BAZAAR_KEY, RAND_INF_MARKET_BAZAAR_KEY_OBTAINED },
+    { RG_MARKET_POTION_SHOP_KEY, RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED },
+    { RG_MASK_SHOP_KEY, RAND_INF_MASK_SHOP_KEY_OBTAINED },
+    { RG_MARKET_SHOOTING_GALLERY_KEY, RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED },
+    { RG_BOMBCHU_BOWLING_KEY, RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED },
+    { RG_TREASURE_CHEST_GAME_BUILDING_KEY, RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED },
+    { RG_BOMBCHU_SHOP_KEY, RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED },
+    { RG_RICHARDS_HOUSE_KEY, RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED },
+    { RG_ALLEY_HOUSE_KEY, RAND_INF_ALLEY_HOUSE_KEY_OBTAINED },
+    { RG_KAK_BAZAAR_KEY, RAND_INF_KAK_BAZAAR_KEY_OBTAINED },
+    { RG_KAK_POTION_SHOP_KEY, RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED },
+    { RG_BOSS_HOUSE_KEY, RAND_INF_BOSS_HOUSE_KEY_OBTAINED },
+    { RG_GRANNYS_POTION_SHOP_KEY, RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED },
+    { RG_SKULLTULA_HOUSE_KEY, RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED },
+    { RG_IMPAS_HOUSE_KEY, RAND_INF_IMPAS_HOUSE_KEY_OBTAINED },
+    { RG_WINDMILL_KEY, RAND_INF_WINDMILL_KEY_OBTAINED },
+    { RG_KAK_SHOOTING_GALLERY_KEY, RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED },
+    { RG_DAMPES_HUT_KEY, RAND_INF_DAMPES_HUT_KEY_OBTAINED },
+    { RG_TALONS_HOUSE_KEY, RAND_INF_TALONS_HOUSE_KEY_OBTAINED },
+    { RG_STABLES_KEY, RAND_INF_STABLES_KEY_OBTAINED },
+    { RG_BACK_TOWER_KEY, RAND_INF_BACK_TOWER_KEY_OBTAINED },
+    { RG_HYLIA_LAB_KEY, RAND_INF_HYLIA_LAB_KEY_OBTAINED },
+    { RG_FISHING_HOLE_KEY, RAND_INF_FISHING_HOLE_KEY_OBTAINED },
+};
+
+std::map<uint32_t, uint32_t> Logic::RandoGetToDungeonScene = {
+    { RG_FOREST_TEMPLE_SMALL_KEY, SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_SMALL_KEY, SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_SMALL_KEY, SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_SMALL_KEY, SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_SMALL_KEY, SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_SMALL_KEY, SCENE_BOTTOM_OF_THE_WELL },
+    { RG_GERUDO_TRAINING_GROUND_SMALL_KEY, SCENE_GERUDO_TRAINING_GROUND },
+    { RG_GERUDO_FORTRESS_SMALL_KEY, SCENE_THIEVES_HIDEOUT },
+    { RG_GANONS_CASTLE_SMALL_KEY, SCENE_INSIDE_GANONS_CASTLE },
+    { RG_FOREST_TEMPLE_KEY_RING, SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_KEY_RING, SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_KEY_RING, SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_KEY_RING, SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_KEY_RING, SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_KEY_RING, SCENE_BOTTOM_OF_THE_WELL },
+    { RG_GERUDO_TRAINING_GROUND_KEY_RING, SCENE_GERUDO_TRAINING_GROUND },
+    { RG_GERUDO_FORTRESS_KEY_RING, SCENE_THIEVES_HIDEOUT },
+    { RG_GANONS_CASTLE_KEY_RING, SCENE_INSIDE_GANONS_CASTLE },
+    { RG_FOREST_TEMPLE_BOSS_KEY, SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_BOSS_KEY, SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_BOSS_KEY, SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_BOSS_KEY, SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_BOSS_KEY, SCENE_SHADOW_TEMPLE },
+    { RG_GANONS_CASTLE_BOSS_KEY, SCENE_INSIDE_GANONS_CASTLE },
+    { RG_DEKU_TREE_MAP, SCENE_DEKU_TREE },
+    { RG_DODONGOS_CAVERN_MAP, SCENE_DODONGOS_CAVERN },
+    { RG_JABU_JABUS_BELLY_MAP, SCENE_JABU_JABU },
+    { RG_FOREST_TEMPLE_MAP, SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_MAP, SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_MAP, SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_MAP, SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_MAP, SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_MAP, SCENE_BOTTOM_OF_THE_WELL },
+    { RG_ICE_CAVERN_MAP, SCENE_ICE_CAVERN },
+    { RG_DEKU_TREE_COMPASS, SCENE_DEKU_TREE },
+    { RG_DODONGOS_CAVERN_COMPASS, SCENE_DODONGOS_CAVERN },
+    { RG_JABU_JABUS_BELLY_COMPASS, SCENE_JABU_JABU },
+    { RG_FOREST_TEMPLE_COMPASS, SCENE_FOREST_TEMPLE },
+    { RG_FIRE_TEMPLE_COMPASS, SCENE_FIRE_TEMPLE },
+    { RG_WATER_TEMPLE_COMPASS, SCENE_WATER_TEMPLE },
+    { RG_SPIRIT_TEMPLE_COMPASS, SCENE_SPIRIT_TEMPLE },
+    { RG_SHADOW_TEMPLE_COMPASS, SCENE_SHADOW_TEMPLE },
+    { RG_BOTTOM_OF_THE_WELL_COMPASS, SCENE_BOTTOM_OF_THE_WELL },
+    { RG_ICE_CAVERN_COMPASS, SCENE_ICE_CAVERN },
+    { RG_TREASURE_GAME_SMALL_KEY, SCENE_TREASURE_BOX_SHOP }
+};
+
+std::map<uint32_t, uint32_t> Logic::RandoGetToQuestItem = {
+    { RG_FOREST_MEDALLION, QUEST_MEDALLION_FOREST },
+    { RG_FIRE_MEDALLION, QUEST_MEDALLION_FIRE },
+    { RG_WATER_MEDALLION, QUEST_MEDALLION_WATER },
+    { RG_SPIRIT_MEDALLION, QUEST_MEDALLION_SPIRIT },
+    { RG_SHADOW_MEDALLION, QUEST_MEDALLION_SHADOW },
+    { RG_LIGHT_MEDALLION, QUEST_MEDALLION_LIGHT },
+    { RG_MINUET_OF_FOREST, QUEST_SONG_MINUET },
+    { RG_BOLERO_OF_FIRE, QUEST_SONG_BOLERO },
+    { RG_SERENADE_OF_WATER, QUEST_SONG_SERENADE },
+    { RG_REQUIEM_OF_SPIRIT, QUEST_SONG_REQUIEM },
+    { RG_NOCTURNE_OF_SHADOW, QUEST_SONG_NOCTURNE },
+    { RG_PRELUDE_OF_LIGHT, QUEST_SONG_PRELUDE },
+    { RG_ZELDAS_LULLABY, QUEST_SONG_LULLABY },
+    { RG_EPONAS_SONG, QUEST_SONG_EPONA },
+    { RG_SARIAS_SONG, QUEST_SONG_SARIA },
+    { RG_SUNS_SONG, QUEST_SONG_SUN },
+    { RG_SONG_OF_TIME, QUEST_SONG_TIME },
+    { RG_SONG_OF_STORMS, QUEST_SONG_STORMS },
+    { RG_KOKIRI_EMERALD, QUEST_KOKIRI_EMERALD },
+    { RG_GORON_RUBY, QUEST_GORON_RUBY },
+    { RG_ZORA_SAPPHIRE, QUEST_ZORA_SAPPHIRE },
+    { RG_STONE_OF_AGONY, QUEST_STONE_OF_AGONY },
+    { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
+};
+
+std::map<uint32_t, uint32_t> BottleRandomizerGetToItemID = {
+    { RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED },
+    { RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN },
+    { RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE },
+    { RG_BOTTLE_WITH_FAIRY, ITEM_FAIRY },
+    { RG_BOTTLE_WITH_FISH, ITEM_FISH },
+    { RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE },
+    { RG_BOTTLE_WITH_BUGS, ITEM_BUG },
+    { RG_BOTTLE_WITH_POE, ITEM_POE },
+    { RG_BOTTLE_WITH_BIG_POE, ITEM_BIG_POE },
+};
+
+uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
+uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
+
+void Logic::ApplyItemEffect(Item& item, bool state) {
+    auto randoGet = item.GetRandomizerGet();
+    if (item.GetGIEntry()->objectId == OBJECT_GI_STICK) {
+        SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+    }
+    if (item.GetGIEntry()->objectId == OBJECT_GI_NUTS) {
+        SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+    }
+    switch (item.GetItemType()) {
+        case ITEMTYPE_ITEM: {
+            switch (randoGet) {
+                case RG_STONE_OF_AGONY:
+                case RG_GERUDO_MEMBERSHIP_CARD:
+                    SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
+                    break;
+                case RG_WEIRD_EGG:
+                    SetRandoInf(RAND_INF_WEIRD_EGG, state);
+                    break;
+                case RG_ZELDAS_LETTER:
+                    SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
+                    break;
+                case RG_DOUBLE_DEFENSE:
+                    mSaveContext->isDoubleDefenseAcquired = state;
+                    break;
+                case RG_POCKET_EGG:
+                    SetRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG, state);
+                    break;
+                case RG_COJIRO:
+                case RG_ODD_MUSHROOM:
+                case RG_ODD_POTION:
+                case RG_POACHERS_SAW:
+                case RG_BROKEN_SWORD:
+                case RG_PRESCRIPTION:
+                case RG_EYEBALL_FROG:
+                case RG_EYEDROPS:
+                case RG_CLAIM_CHECK:
+                    SetRandoInf(randoGet - RG_COJIRO + RAND_INF_ADULT_TRADES_HAS_COJIRO, state);
+                    break;
+                case RG_PROGRESSIVE_HOOKSHOT: {
+                    uint8_t i;
+                    for (i = 0; i < 3; i++) {
+                        if (CurrentInventory(ITEM_HOOKSHOT) == HookshotLookup[i]) {
+                            break;
+                        }
+                    }
+                    auto newItem = i + (!state ? -1 : 1);
+                    if (newItem < 0) {
+                        newItem = 0;
+                    } else if (newItem > 2) {
+                        newItem = 2;
+                    }
+                    SetInventory(ITEM_HOOKSHOT, HookshotLookup[newItem]);
+                } break;
+                case RG_PROGRESSIVE_STRENGTH: {
+                    auto currentLevel = CurrentUpgrade(UPG_STRENGTH);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    SetUpgrade(UPG_STRENGTH, newLevel);
+                } break;
+                case RG_PROGRESSIVE_BOMB_BAG: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_BOMB_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_BOMB_BAG, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_BOMB_BAG);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                        SetInventory(ITEM_BOMB, (!state ? ITEM_NONE : ITEM_BOMB));
+                    }
+                    SetUpgrade(UPG_BOMB_BAG, newLevel);
+                } break;
+                case RG_PROGRESSIVE_BOW: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_QUIVER_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_QUIVER, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_QUIVER);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                        SetInventory(ITEM_BOW, (!state ? ITEM_NONE : ITEM_BOW));
+                    }
+                    SetUpgrade(UPG_QUIVER, newLevel);
+                } break;
+                case RG_PROGRESSIVE_SLINGSHOT: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_BULLET_BAG_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_BULLET_BAG, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_BULLET_BAG);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                        SetInventory(ITEM_SLINGSHOT, (!state ? ITEM_NONE : ITEM_SLINGSHOT));
+                    }
+                    SetUpgrade(UPG_BULLET_BAG, newLevel);
+                } break;
+                case RG_PROGRESSIVE_WALLET: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_WALLET_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_MONEY, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_WALLET);
+                    if (!CheckRandoInf(RAND_INF_HAS_WALLET) && state) {
+                        SetRandoInf(RAND_INF_HAS_WALLET, true);
+                    } else if (currentLevel == 0 && !state) {
+                        SetRandoInf(RAND_INF_HAS_WALLET, false);
+                    } else {
+                        auto newLevel = currentLevel + (!state ? -1 : 1);
+                        SetUpgrade(UPG_WALLET, newLevel);
+                    }
+                } break;
+                case RG_PROGRESSIVE_SCALE: {
+                    auto currentLevel = CurrentUpgrade(UPG_SCALE);
+                    if (!CheckRandoInf(RAND_INF_CAN_SWIM) && state) {
+                        SetRandoInf(RAND_INF_CAN_SWIM, true);
+                    } else if (currentLevel == 0 && !state) {
+                        SetRandoInf(RAND_INF_CAN_SWIM, false);
+                    } else {
+                        auto newLevel = currentLevel + (!state ? -1 : 1);
+                        SetUpgrade(UPG_SCALE, newLevel);
+                    }
+                } break;
+                case RG_PROGRESSIVE_NUT_UPGRADE: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_NUT_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_NUTS);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                        SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+                    }
+                    SetUpgrade(UPG_NUTS, newLevel);
+                } break;
+                case RG_PROGRESSIVE_STICK_UPGRADE: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_STICK_UPGRADE_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE, true);
+                        break;
+                    }
+                    auto currentLevel = CurrentUpgrade(UPG_STICKS);
+                    auto newLevel = currentLevel + (!state ? -1 : 1);
+                    if (currentLevel == 0 && state || currentLevel == 1 && !state) {
+                        SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+                    }
+                    SetUpgrade(UPG_STICKS, newLevel);
+                } break;
+                case RG_PROGRESSIVE_BOMBCHUS: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_BOMBCHU_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_BOMBCHUS, true);
+                        break;
+                    }
+                    SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                } break;
+                case RG_PROGRESSIVE_MAGIC_METER: {
+                    auto realGI = item.GetGIEntry();
+                    if (realGI->itemId == RG_MAGIC_INF && realGI->modIndex == MOD_RANDOMIZER) {
+                        SetRandoInf(RAND_INF_HAS_INFINITE_MAGIC_METER, true);
+                        break;
+                    }
+                    mSaveContext->magicLevel += (!state ? -1 : 1);
+                } break;
+                case RG_PROGRESSIVE_OCARINA: {
+                    uint8_t i;
+                    for (i = 0; i < 3; i++) {
+                        if (CurrentInventory(ITEM_OCARINA_FAIRY) == OcarinaLookup[i]) {
+                            break;
+                        }
+                    }
+                    i += (!state ? -1 : 1);
+                    if (i < 0) {
+                        i = 0;
+                    } else if (i > 2) {
+                        i = 2;
+                    }
+                    SetInventory(ITEM_OCARINA_FAIRY, OcarinaLookup[i]);
+                } break;
+                case RG_HEART_CONTAINER:
+                    mSaveContext->healthCapacity += (!state ? -16 : 16);
+                    break;
+                case RG_PIECE_OF_HEART:
+                    mSaveContext->healthCapacity += (!state ? -4 : 4);
+                    break;
+                case RG_BOOMERANG:
+                case RG_LENS_OF_TRUTH:
+                case RG_MEGATON_HAMMER:
+                case RG_DINS_FIRE:
+                case RG_FARORES_WIND:
+                case RG_NAYRUS_LOVE:
+                case RG_FIRE_ARROWS:
+                case RG_ICE_ARROWS:
+                case RG_LIGHT_ARROWS:
+                    SetInventory(item.GetGIEntry()->itemId, (!state ? ITEM_NONE : item.GetGIEntry()->itemId));
+                    break;
+                case RG_MAGIC_BEAN:
+                case RG_MAGIC_BEAN_PACK: {
+                    auto change = (item.GetRandomizerGet() == RG_MAGIC_BEAN ? 1 : 10);
+                    auto current = GetAmmo(ITEM_BEAN);
+                    SetAmmo(ITEM_BEAN, current + (!state ? -change : change));
+                } break;
+                case RG_EMPTY_BOTTLE:
+                case RG_BOTTLE_WITH_MILK:
+                case RG_BOTTLE_WITH_RED_POTION:
+                case RG_BOTTLE_WITH_GREEN_POTION:
+                case RG_BOTTLE_WITH_BLUE_POTION:
+                case RG_BOTTLE_WITH_FAIRY:
+                case RG_BOTTLE_WITH_FISH:
+                case RG_BOTTLE_WITH_BLUE_FIRE:
+                case RG_BOTTLE_WITH_BUGS:
+                case RG_BOTTLE_WITH_POE:
+                case RG_BOTTLE_WITH_BIG_POE: {
+                    uint8_t slot = SLOT_BOTTLE_1;
+                    while (slot != SLOT_BOTTLE_4) {
+                        if (mSaveContext->inventory.items[slot] == ITEM_NONE) {
+                            break;
+                        }
+                        slot++;
+                    }
+                    uint16_t itemId = item.GetGIEntry()->itemId;
+                    if (BottleRandomizerGetToItemID.contains(randoGet)) {
+                        itemId = BottleRandomizerGetToItemID[randoGet];
+                    }
+                    if (randoGet == RG_BOTTLE_WITH_BIG_POE) {
+                        BigPoes++;
+                    }
+                    mSaveContext->inventory.items[slot] = static_cast<uint8_t>(itemId);
+                } break;
+                case RG_RUTOS_LETTER:
+                    SetRandoInf(RAND_INF_OBTAINED_RUTOS_LETTER, state);
+                    break;
+                case RG_GOHMA_SOUL:
+                case RG_KING_DODONGO_SOUL:
+                case RG_BARINADE_SOUL:
+                case RG_PHANTOM_GANON_SOUL:
+                case RG_VOLVAGIA_SOUL:
+                case RG_MORPHA_SOUL:
+                case RG_BONGO_BONGO_SOUL:
+                case RG_TWINROVA_SOUL:
+                case RG_GANON_SOUL:
+                case RG_OCARINA_A_BUTTON:
+                case RG_OCARINA_C_UP_BUTTON:
+                case RG_OCARINA_C_DOWN_BUTTON:
+                case RG_OCARINA_C_LEFT_BUTTON:
+                case RG_OCARINA_C_RIGHT_BUTTON:
+                case RG_GREG_RUPEE:
+                case RG_FISHING_POLE:
+                case RG_GUARD_HOUSE_KEY:
+                case RG_MARKET_BAZAAR_KEY:
+                case RG_MARKET_POTION_SHOP_KEY:
+                case RG_MASK_SHOP_KEY:
+                case RG_MARKET_SHOOTING_GALLERY_KEY:
+                case RG_BOMBCHU_BOWLING_KEY:
+                case RG_TREASURE_CHEST_GAME_BUILDING_KEY:
+                case RG_BOMBCHU_SHOP_KEY:
+                case RG_RICHARDS_HOUSE_KEY:
+                case RG_ALLEY_HOUSE_KEY:
+                case RG_KAK_BAZAAR_KEY:
+                case RG_KAK_POTION_SHOP_KEY:
+                case RG_BOSS_HOUSE_KEY:
+                case RG_GRANNYS_POTION_SHOP_KEY:
+                case RG_SKULLTULA_HOUSE_KEY:
+                case RG_IMPAS_HOUSE_KEY:
+                case RG_WINDMILL_KEY:
+                case RG_KAK_SHOOTING_GALLERY_KEY:
+                case RG_DAMPES_HUT_KEY:
+                case RG_TALONS_HOUSE_KEY:
+                case RG_STABLES_KEY:
+                case RG_BACK_TOWER_KEY:
+                case RG_HYLIA_LAB_KEY:
+                case RG_FISHING_HOLE_KEY:
+                    SetRandoInf(RandoGetToRandInf.at(randoGet), state);
+                    break;
+                case RG_TRIFORCE_PIECE:
+                    mSaveContext->ship.quest.data.randomizer.triforcePiecesCollected += (!state ? -1 : 1);
+                    break;
+                case RG_BOMBCHU_5:
+                case RG_BOMBCHU_10:
+                case RG_BOMBCHU_20:
+                    SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                    break;
+                default:
+                    break;
+            }
+        } break;
+        case ITEMTYPE_EQUIP: {
             RandomizerGet itemRG = item.GetRandomizerGet();
-            if (itemRG == RG_GIANTS_KNIFE) {
+            if (itemRG == RG_GIANTS_KNIFE || itemRG == RG_DEKU_SHIELD || itemRG == RG_HYLIAN_SHIELD) {
                 return;
             }
             uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
@@ -1794,15 +1892,13 @@ namespace Rando {
                 if (equipId == EQUIP_FLAG_SWORD_BGS) {
                     mSaveContext->bgsFlag = false;
                 }
-            }
-            else {
+            } else {
                 mSaveContext->inventory.equipment |= equipId;
                 if (equipId == EQUIP_FLAG_SWORD_BGS) {
                     mSaveContext->bgsFlag = true;
                 }
             }
-        }
-        break;
+        } break;
         case ITEMTYPE_DUNGEONREWARD:
         case ITEMTYPE_SONG:
             SetQuestItem(RandoGetToQuestItem.find(item.GetRandomizerGet())->second, state);
@@ -1817,8 +1913,7 @@ namespace Rando {
             SetDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
             break;
         case ITEMTYPE_FORTRESS_SMALLKEY:
-        case ITEMTYPE_SMALLKEY:
-        {
+        case ITEMTYPE_SMALLKEY: {
             auto randoGet = item.GetRandomizerGet();
             auto keyring = randoGet >= RG_FOREST_TEMPLE_KEY_RING && randoGet <= RG_GANONS_CASTLE_KEY_RING;
             auto dungeonIndex = RandoGetToDungeonScene.find(randoGet)->second;
@@ -1826,16 +1921,13 @@ namespace Rando {
             if (!state) {
                 if (keyring) {
                     count = 0;
-                }
-                else {
+                } else {
                     count -= 1;
                 }
-            }
-            else {
+            } else {
                 if (keyring) {
                     count = 10;
-                }
-                else {
+                } else {
                     count += 1;
                 }
             }
@@ -1848,353 +1940,447 @@ namespace Rando {
             break;
         case ITEMTYPE_DROP:
         case ITEMTYPE_REFILL:
-        case ITEMTYPE_SHOP:
-        {
+        case ITEMTYPE_SHOP: {
             RandomizerGet itemRG = item.GetRandomizerGet();
-            if (itemRG == RG_BUY_HYLIAN_SHIELD || itemRG == RG_BUY_DEKU_SHIELD || itemRG == RG_BUY_GORON_TUNIC || itemRG == RG_BUY_ZORA_TUNIC) {
+            if (itemRG == RG_BUY_HYLIAN_SHIELD || itemRG == RG_BUY_DEKU_SHIELD || itemRG == RG_BUY_GORON_TUNIC ||
+                itemRG == RG_BUY_ZORA_TUNIC) {
                 uint32_t equipId = RandoGetToEquipFlag.find(itemRG)->second;
                 if (!state) {
                     mSaveContext->inventory.equipment &= ~equipId;
-                }
-                else {
+                } else {
                     mSaveContext->inventory.equipment |= equipId;
                 }
             }
             switch (itemRG) {
-            case RG_DEKU_NUTS_5:
-            case RG_DEKU_NUTS_10:
-            case RG_BUY_DEKU_NUTS_5:
-            case RG_BUY_DEKU_NUTS_10:
-                SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
-                break;
-            case RG_DEKU_STICK_1:
-            case RG_BUY_DEKU_STICK_1:
-            case RG_STICKS:
-                SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
-                break;
-            case RG_BOMBCHU_5:
-            case RG_BOMBCHU_10:
-            case RG_BOMBCHU_20:
-                SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
-                break;
-            default:
-                break;
+                case RG_DEKU_NUTS_5:
+                case RG_DEKU_NUTS_10:
+                case RG_BUY_DEKU_NUTS_5:
+                case RG_BUY_DEKU_NUTS_10:
+                    SetInventory(ITEM_NUT, (!state ? ITEM_NONE : ITEM_NUT));
+                    break;
+                case RG_DEKU_STICK_1:
+                case RG_BUY_DEKU_STICK_1:
+                case RG_STICKS:
+                    SetInventory(ITEM_STICK, (!state ? ITEM_NONE : ITEM_STICK));
+                    break;
+                case RG_BOMBCHU_5:
+                case RG_BOMBCHU_10:
+                case RG_BOMBCHU_20:
+                    SetInventory(ITEM_BOMBCHU, (!state ? ITEM_NONE : ITEM_BOMBCHU));
+                    break;
+                default:
+                    break;
             }
         } break;
-        }
     }
+}
 
-    SaveContext* Logic::GetSaveContext() {
-        if (mSaveContext == nullptr) {
-            NewSaveContext();
-        }
-        return mSaveContext;
-    }
-
-    void Logic::SetSaveContext(SaveContext* context) {
-        mSaveContext = context;
-    }
-
-    void Logic::InitSaveContext() {
-        mSaveContext->totalDays = 0;
-        mSaveContext->bgsDayCount = 0;
-
-        mSaveContext->deaths = 0;
-        for (int i = 0; i < ARRAY_COUNT(mSaveContext->playerName); i++) {
-            mSaveContext->playerName[i] = 0x3E;
-        }
-        mSaveContext->n64ddFlag = 0;
-        mSaveContext->healthCapacity = 0x30;
-        mSaveContext->health = 0x30;
-        mSaveContext->magicLevel = 0;
-        mSaveContext->magic = 0x30;
-        mSaveContext->rupees = 0;
-        mSaveContext->swordHealth = 0;
-        mSaveContext->naviTimer = 0;
-        mSaveContext->isMagicAcquired = 0;
-        mSaveContext->isDoubleMagicAcquired = 0;
-        mSaveContext->isDoubleDefenseAcquired = 0;
-        mSaveContext->bgsFlag = 0;
-        mSaveContext->ocarinaGameRoundNum = 0;
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.buttonItems); button++) {
-            mSaveContext->childEquips.buttonItems[button] = ITEM_NONE;
-        }
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.cButtonSlots); button++) {
-            mSaveContext->childEquips.cButtonSlots[button] = SLOT_NONE;
-        }
-        mSaveContext->childEquips.equipment = 0;
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.buttonItems); button++) {
-            mSaveContext->adultEquips.buttonItems[button] = ITEM_NONE;
-        }
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.cButtonSlots); button++) {
-            mSaveContext->adultEquips.cButtonSlots[button] = SLOT_NONE;
-        }
-        mSaveContext->adultEquips.equipment = 0;
-        mSaveContext->unk_54 = 0;
-        mSaveContext->savedSceneNum = SCENE_LINKS_HOUSE;
-
-        // Equipment
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.buttonItems); button++) {
-            mSaveContext->equips.buttonItems[button] = ITEM_NONE;
-        }
-        for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.cButtonSlots); button++) {
-            mSaveContext->equips.cButtonSlots[button] = SLOT_NONE;
-        }
-        mSaveContext->equips.equipment = 0;
-
-        // Inventory
-        for (int item = 0; item < ARRAY_COUNT(mSaveContext->inventory.items); item++) {
-            mSaveContext->inventory.items[item] = ITEM_NONE;
-        }
-        for (int ammo = 0; ammo < ARRAY_COUNT(mSaveContext->inventory.ammo); ammo++) {
-            mSaveContext->inventory.ammo[ammo] = 0;
-        }
-        mSaveContext->inventory.equipment = 0;
-        mSaveContext->inventory.upgrades = 0;
-        mSaveContext->inventory.questItems = 0;
-        for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonItems); dungeon++) {
-            mSaveContext->inventory.dungeonItems[dungeon] = 0;
-        }
-        for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonKeys); dungeon++) {
-            mSaveContext->inventory.dungeonKeys[dungeon] = 0x0;
-        }
-        mSaveContext->inventory.defenseHearts = 0;
-        mSaveContext->inventory.gsTokens = 0;
-        for (int scene = 0; scene < ARRAY_COUNT(mSaveContext->sceneFlags); scene++) {
-            mSaveContext->sceneFlags[scene].chest = 0;
-            mSaveContext->sceneFlags[scene].swch = 0;
-            mSaveContext->sceneFlags[scene].clear = 0;
-            mSaveContext->sceneFlags[scene].collect = 0;
-            mSaveContext->sceneFlags[scene].unk = 0;
-            mSaveContext->sceneFlags[scene].rooms = 0;
-            mSaveContext->sceneFlags[scene].floors = 0;
-        }
-        mSaveContext->fw.pos.x = 0;
-        mSaveContext->fw.pos.y = 0;
-        mSaveContext->fw.pos.z = 0;
-        mSaveContext->fw.yaw = 0;
-        mSaveContext->fw.playerParams = 0;
-        mSaveContext->fw.entranceIndex = 0;
-        mSaveContext->fw.roomIndex = 0;
-        mSaveContext->fw.set = 0;
-        mSaveContext->fw.tempSwchFlags = 0;
-        mSaveContext->fw.tempCollectFlags = 0;
-        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->gsFlags); flag++) {
-            mSaveContext->gsFlags[flag] = 0;
-        }
-        for (int highscore = 0; highscore < ARRAY_COUNT(mSaveContext->highScores); highscore++) {
-            mSaveContext->highScores[highscore] = 0;
-        }
-        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->eventChkInf); flag++) {
-            mSaveContext->eventChkInf[flag] = 0;
-        }
-        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->itemGetInf); flag++) {
-            mSaveContext->itemGetInf[flag] = 0;
-        }
-        for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->infTable); flag++) {
-            mSaveContext->infTable[flag] = 0;
-        }
-        mSaveContext->worldMapAreaData = 0;
-        mSaveContext->scarecrowLongSongSet = 0;
-        for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowLongSong); i++) {
-            mSaveContext->scarecrowLongSong[i].noteIdx = 0;
-            mSaveContext->scarecrowLongSong[i].unk_01 = 0;
-            mSaveContext->scarecrowLongSong[i].unk_02 = 0;
-            mSaveContext->scarecrowLongSong[i].volume = 0;
-            mSaveContext->scarecrowLongSong[i].vibrato = 0;
-            mSaveContext->scarecrowLongSong[i].tone = 0;
-            mSaveContext->scarecrowLongSong[i].semitone = 0;
-        }
-        mSaveContext->scarecrowSpawnSongSet = 0;
-        for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowSpawnSong); i++) {
-            mSaveContext->scarecrowSpawnSong[i].noteIdx = 0;
-            mSaveContext->scarecrowSpawnSong[i].unk_01 = 0;
-            mSaveContext->scarecrowSpawnSong[i].unk_02 = 0;
-            mSaveContext->scarecrowSpawnSong[i].volume = 0;
-            mSaveContext->scarecrowSpawnSong[i].vibrato = 0;
-            mSaveContext->scarecrowSpawnSong[i].tone = 0;
-            mSaveContext->scarecrowSpawnSong[i].semitone = 0;
-        }
-
-        mSaveContext->horseData.scene = SCENE_HYRULE_FIELD;
-        mSaveContext->horseData.pos.x = -1840;
-        mSaveContext->horseData.pos.y = 72;
-        mSaveContext->horseData.pos.z = 5497;
-        mSaveContext->horseData.angle = -0x6AD9;
-        mSaveContext->magicLevel = 0;
-        mSaveContext->infTable[29] = 1;
-        mSaveContext->sceneFlags[5].swch = 0x40000000;
-
-        // SoH specific
-        mSaveContext->ship.backupFW = mSaveContext->fw;
-        mSaveContext->ship.pendingSale = ITEM_NONE;
-        mSaveContext->ship.pendingSaleMod = MOD_NONE;
-        mSaveContext->ship.pendingIceTrapCount = 0;
-
-        // Init with normal quest unless only an MQ rom is provided
-        mSaveContext->ship.quest.id = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
-
-        //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
-    }
-
-    void Logic::NewSaveContext() {
-        if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
-            free(mSaveContext);
-        }
-        mSaveContext = new SaveContext();
-        InitSaveContext();
-    }
-
-    uint8_t Logic::InventorySlot(uint32_t item) {
-        return gItemSlots[item];
-    }
-
-    uint32_t Logic::CurrentUpgrade(uint32_t upgrade) {
-        return (mSaveContext->inventory.upgrades & gUpgradeMasks[upgrade]) >> gUpgradeShifts[upgrade];
-    }
-
-    uint32_t Logic::CurrentInventory(uint32_t item) {
-        return mSaveContext->inventory.items[InventorySlot(item)];
-    }
-
-    void Logic::SetUpgrade(uint32_t upgrade, uint8_t level) {
-        mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
-        mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
-    }
-
-    bool Logic::CheckInventory(uint32_t item, bool exact) {
-        auto current = mSaveContext->inventory.items[InventorySlot(item)];
-        return exact ? (current == item) : (current != ITEM_NONE);
-    }
-
-    void Logic::SetInventory(uint32_t itemSlot, uint32_t item) {
-        mSaveContext->inventory.items[InventorySlot(itemSlot)] = item;
-    }
-
-    bool Logic::CheckEquipment(uint32_t equipFlag) {
-        return (equipFlag & mSaveContext->inventory.equipment);
-    }
-
-    bool Logic::CheckQuestItem(uint32_t item) {
-        return ((1 << item) & mSaveContext->inventory.questItems);
-    }
-
-    void Logic::SetQuestItem(uint32_t item, bool state) {
-        if (!state) {
-            mSaveContext->inventory.questItems &= ~(1 << item);
-        } else {
-            mSaveContext->inventory.questItems |= (1 << item);
-        }
-    }
-
-    uint8_t Logic::GetSmallKeyCount(uint32_t dungeonIndex) {
-        return mSaveContext->inventory.dungeonKeys[dungeonIndex];
-    }
-
-    void Logic::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {
-        mSaveContext->inventory.dungeonKeys[dungeonIndex] = count;
-    }
-
-    bool Logic::CheckDungeonItem(uint32_t item, uint32_t dungeonIndex) {
-        return mSaveContext->inventory.dungeonItems[dungeonIndex] & gBitFlags[item];
-    }
-
-    void Logic::SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state) {
-        if (!state) {
-            mSaveContext->inventory.dungeonItems[dungeonIndex] &= ~gBitFlags[item];
-        } else {
-            mSaveContext->inventory.dungeonItems[dungeonIndex] |= gBitFlags[item];
-        }
-    }
-
-    bool Logic::CheckRandoInf(uint32_t flag) {
-        return mSaveContext->ship.randomizerInf[flag >> 4] & (1 << (flag & 0xF));
-    }
-
-    void Logic::SetRandoInf(uint32_t flag, bool state) {
-        if (!state) {
-            mSaveContext->ship.randomizerInf[flag >> 4] &= ~(1 << (flag & 0xF));
-        } else {
-            mSaveContext->ship.randomizerInf[flag >> 4] |= (1 << (flag & 0xF));
-        }
-    }
-
-    bool Logic::CheckEventChkInf(int32_t flag) {
-        return mSaveContext->eventChkInf[flag >> 4] & (1 << (flag & 0xF));
-    }
-
-    void Logic::SetEventChkInf(int32_t flag, bool state) {
-        if (!state) {
-            mSaveContext->eventChkInf[flag >> 4] &= ~(1 << (flag & 0xF));
-        } else {
-            mSaveContext->eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
-        }
-    }
-
-    uint8_t Logic::GetGSCount() {
-        return mSaveContext->inventory.gsTokens;
-    }
-
-    uint8_t Logic::GetAmmo(uint32_t item) {
-        return mSaveContext->inventory.ammo[gItemSlots[item]];
-    }
-
-    void Logic::SetAmmo(uint32_t item, uint8_t count) {
-        mSaveContext->inventory.ammo[gItemSlots[item]] = count;
-    }
-
-    void Logic::SetContext(std::shared_ptr<Context> _ctx) {
-        ctx = _ctx;
-    }
-
-    bool Logic::GetInLogic(LogicVal logicVal) {
-        return inLogic[logicVal];
-    }
-
-    void Logic::SetInLogic(LogicVal logicVal, bool value) {
-        inLogic[logicVal] = value;
-    }
-
-    void Logic::Reset() {
+SaveContext* Logic::GetSaveContext() {
+    if (mSaveContext == nullptr) {
         NewSaveContext();
-        StartPerformanceTimer(PT_LOGIC_RESET);
-        memset(inLogic, false, sizeof(inLogic));
-        //Settings-dependent variables
-        IsKeysanity = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
-                    ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) || 
-                    ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE);
-        AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE) TODO: AmmoDrop setting*/ true;
+    }
+    return mSaveContext;
+}
 
-        //Child item logic
-        SkullMask     = false;
-        MaskOfTruth   = false;
+void Logic::SetSaveContext(SaveContext* context) {
+    mSaveContext = context;
+}
 
-        //Adult logic
-        FreedEpona         = false;
-        //BigPoe        = false;
+void Logic::InitSaveContext() {
+    mSaveContext->totalDays = 0;
+    mSaveContext->bgsDayCount = 0;
 
-        //Trade Quest Events
-        WakeUpAdultTalon   = false;
+    mSaveContext->deaths = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->playerName); i++) {
+        mSaveContext->playerName[i] = 0x3E;
+    }
+    mSaveContext->n64ddFlag = 0;
+    mSaveContext->healthCapacity = 0x30;
+    mSaveContext->health = 0x30;
+    mSaveContext->magicLevel = 0;
+    mSaveContext->magic = 0x30;
+    mSaveContext->rupees = 0;
+    mSaveContext->swordHealth = 0;
+    mSaveContext->naviTimer = 0;
+    mSaveContext->isMagicAcquired = 0;
+    mSaveContext->isDoubleMagicAcquired = 0;
+    mSaveContext->isDoubleDefenseAcquired = 0;
+    mSaveContext->bgsFlag = 0;
+    mSaveContext->ocarinaGameRoundNum = 0;
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.buttonItems); button++) {
+        mSaveContext->childEquips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->childEquips.cButtonSlots); button++) {
+        mSaveContext->childEquips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->childEquips.equipment = 0;
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.buttonItems); button++) {
+        mSaveContext->adultEquips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->adultEquips.cButtonSlots); button++) {
+        mSaveContext->adultEquips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->adultEquips.equipment = 0;
+    mSaveContext->unk_54 = 0;
+    mSaveContext->savedSceneNum = SCENE_LINKS_HOUSE;
 
-        //Dungeon Clears
-        DekuTreeClear       = false;
-        DodongosCavernClear = false;
-        JabuJabusBellyClear = false;
-        ForestTempleClear   = false;
-        FireTempleClear     = false;
-        WaterTempleClear    = false;
-        SpiritTempleClear   = false;
-        ShadowTempleClear   = false;
+    // Equipment
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.buttonItems); button++) {
+        mSaveContext->equips.buttonItems[button] = ITEM_NONE;
+    }
+    for (int button = 0; button < ARRAY_COUNT(mSaveContext->equips.cButtonSlots); button++) {
+        mSaveContext->equips.cButtonSlots[button] = SLOT_NONE;
+    }
+    mSaveContext->equips.equipment = 0;
 
-        //Trial Clears
-        ForestTrialClear = false;
-        FireTrialClear   = false;
-        WaterTrialClear  = false;
-        SpiritTrialClear = false;
-        ShadowTrialClear = false;
-        LightTrialClear  = false;
+    // Inventory
+    for (int item = 0; item < ARRAY_COUNT(mSaveContext->inventory.items); item++) {
+        mSaveContext->inventory.items[item] = ITEM_NONE;
+    }
+    for (int ammo = 0; ammo < ARRAY_COUNT(mSaveContext->inventory.ammo); ammo++) {
+        mSaveContext->inventory.ammo[ammo] = 0;
+    }
+    mSaveContext->inventory.equipment = 0;
+    mSaveContext->inventory.upgrades = 0;
+    mSaveContext->inventory.questItems = 0;
+    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonItems); dungeon++) {
+        mSaveContext->inventory.dungeonItems[dungeon] = 0;
+    }
+    for (int dungeon = 0; dungeon < ARRAY_COUNT(mSaveContext->inventory.dungeonKeys); dungeon++) {
+        mSaveContext->inventory.dungeonKeys[dungeon] = 0x0;
+    }
+    mSaveContext->inventory.defenseHearts = 0;
+    mSaveContext->inventory.gsTokens = 0;
+    for (int scene = 0; scene < ARRAY_COUNT(mSaveContext->sceneFlags); scene++) {
+        mSaveContext->sceneFlags[scene].chest = 0;
+        mSaveContext->sceneFlags[scene].swch = 0;
+        mSaveContext->sceneFlags[scene].clear = 0;
+        mSaveContext->sceneFlags[scene].collect = 0;
+        mSaveContext->sceneFlags[scene].unk = 0;
+        mSaveContext->sceneFlags[scene].rooms = 0;
+        mSaveContext->sceneFlags[scene].floors = 0;
+    }
+    mSaveContext->fw.pos.x = 0;
+    mSaveContext->fw.pos.y = 0;
+    mSaveContext->fw.pos.z = 0;
+    mSaveContext->fw.yaw = 0;
+    mSaveContext->fw.playerParams = 0;
+    mSaveContext->fw.entranceIndex = 0;
+    mSaveContext->fw.roomIndex = 0;
+    mSaveContext->fw.set = 0;
+    mSaveContext->fw.tempSwchFlags = 0;
+    mSaveContext->fw.tempCollectFlags = 0;
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->gsFlags); flag++) {
+        mSaveContext->gsFlags[flag] = 0;
+    }
+    for (int highscore = 0; highscore < ARRAY_COUNT(mSaveContext->highScores); highscore++) {
+        mSaveContext->highScores[highscore] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->eventChkInf); flag++) {
+        mSaveContext->eventChkInf[flag] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->itemGetInf); flag++) {
+        mSaveContext->itemGetInf[flag] = 0;
+    }
+    for (int flag = 0; flag < ARRAY_COUNT(mSaveContext->infTable); flag++) {
+        mSaveContext->infTable[flag] = 0;
+    }
+    mSaveContext->worldMapAreaData = 0;
+    mSaveContext->scarecrowLongSongSet = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowLongSong); i++) {
+        mSaveContext->scarecrowLongSong[i].noteIdx = 0;
+        mSaveContext->scarecrowLongSong[i].unk_01 = 0;
+        mSaveContext->scarecrowLongSong[i].unk_02 = 0;
+        mSaveContext->scarecrowLongSong[i].volume = 0;
+        mSaveContext->scarecrowLongSong[i].vibrato = 0;
+        mSaveContext->scarecrowLongSong[i].tone = 0;
+        mSaveContext->scarecrowLongSong[i].semitone = 0;
+    }
+    mSaveContext->scarecrowSpawnSongSet = 0;
+    for (int i = 0; i < ARRAY_COUNT(mSaveContext->scarecrowSpawnSong); i++) {
+        mSaveContext->scarecrowSpawnSong[i].noteIdx = 0;
+        mSaveContext->scarecrowSpawnSong[i].unk_01 = 0;
+        mSaveContext->scarecrowSpawnSong[i].unk_02 = 0;
+        mSaveContext->scarecrowSpawnSong[i].volume = 0;
+        mSaveContext->scarecrowSpawnSong[i].vibrato = 0;
+        mSaveContext->scarecrowSpawnSong[i].tone = 0;
+        mSaveContext->scarecrowSpawnSong[i].semitone = 0;
+    }
 
-        //Ocarina C Buttons
+    mSaveContext->horseData.scene = SCENE_HYRULE_FIELD;
+    mSaveContext->horseData.pos.x = -1840;
+    mSaveContext->horseData.pos.y = 72;
+    mSaveContext->horseData.pos.z = 5497;
+    mSaveContext->horseData.angle = -0x6AD9;
+    mSaveContext->magicLevel = 0;
+    mSaveContext->infTable[29] = 1;
+    mSaveContext->sceneFlags[5].swch = 0x40000000;
+
+    // SoH specific
+    mSaveContext->ship.backupFW = mSaveContext->fw;
+    mSaveContext->ship.pendingSale = ITEM_NONE;
+    mSaveContext->ship.pendingSaleMod = MOD_NONE;
+    mSaveContext->ship.pendingIceTrapCount = 0;
+
+    // Init with normal quest unless only an MQ rom is provided
+    mSaveContext->ship.quest.id = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
+
+    // RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
+}
+
+void Logic::NewSaveContext() {
+    if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
+        free(mSaveContext);
+    }
+    mSaveContext = new SaveContext();
+    InitSaveContext();
+}
+
+uint8_t Logic::InventorySlot(uint32_t item) {
+    return gItemSlots[item];
+}
+
+uint32_t Logic::CurrentUpgrade(uint32_t upgrade) {
+    return (mSaveContext->inventory.upgrades & gUpgradeMasks[upgrade]) >> gUpgradeShifts[upgrade];
+}
+
+uint32_t Logic::CurrentInventory(uint32_t item) {
+    return mSaveContext->inventory.items[InventorySlot(item)];
+}
+
+void Logic::SetUpgrade(uint32_t upgrade, uint8_t level) {
+    mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
+    mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
+}
+
+bool Logic::CheckInventory(uint32_t item, bool exact) {
+    auto current = mSaveContext->inventory.items[InventorySlot(item)];
+    return exact ? (current == item) : (current != ITEM_NONE);
+}
+
+void Logic::SetInventory(uint32_t itemSlot, uint32_t item) {
+    mSaveContext->inventory.items[InventorySlot(itemSlot)] = item;
+}
+
+bool Logic::CheckEquipment(uint32_t equipFlag) {
+    return (equipFlag & mSaveContext->inventory.equipment);
+}
+
+bool Logic::CheckQuestItem(uint32_t item) {
+    return ((1 << item) & mSaveContext->inventory.questItems);
+}
+
+void Logic::SetQuestItem(uint32_t item, bool state) {
+    if (!state) {
+        mSaveContext->inventory.questItems &= ~(1 << item);
+    } else {
+        mSaveContext->inventory.questItems |= (1 << item);
+    }
+}
+
+// Get the swch bit positions for the dungeon
+const std::vector<uint8_t>& GetDungeonSmallKeyDoors(SceneID sceneId) {
+    static const std::vector<uint8_t> emptyVector;
+
+    auto dungeonInfo = Rando::Context::GetInstance()->GetDungeons()->GetDungeonFromScene(sceneId);
+    if (dungeonInfo == nullptr) {
+        return emptyVector;
+    }
+
+    bool masterQuest = dungeonInfo->IsMQ();
+
+    // Create a unique key for the dungeon and master quest
+    uint8_t key = sceneId | (masterQuest << 7);
+
+    static std::unordered_map<uint8_t, std::vector<uint8_t>> dungeonSmallKeyDoors;
+    auto foundEntry = dungeonSmallKeyDoors.find(key);
+    if (foundEntry != dungeonSmallKeyDoors.end()) {
+        return foundEntry->second;
+    }
+    dungeonSmallKeyDoors[key] = {};
+
+    // Get the scene path
+    SceneTableEntry* sceneTableEntry = &gSceneTable[sceneId];
+    std::string scenePath =
+        StringHelper::Sprintf("scenes/%s/%s/%s", masterQuest ? "mq" : "nonmq", sceneTableEntry->sceneFile.fileName,
+                              sceneTableEntry->sceneFile.fileName);
+
+    // Load the scene
+    std::shared_ptr<SOH::Scene> scene = std::dynamic_pointer_cast<SOH::Scene>(
+        Ship::Context::GetInstance()->GetResourceManager()->LoadResource(scenePath));
+    if (scene == nullptr) {
+        return emptyVector;
+    }
+
+    // Find the SetTransitionActorList command
+    std::shared_ptr<SOH::SetTransitionActorList> transitionActorListCommand = nullptr;
+    for (auto& command : scene->commands) {
+        if (command->cmdId == SOH::SceneCommandID::SetTransitionActorList) {
+            transitionActorListCommand = std::dynamic_pointer_cast<SOH::SetTransitionActorList>(command);
+            break;
+        }
+    }
+    if (transitionActorListCommand == nullptr) {
+        return emptyVector;
+    }
+
+    // Find the bit position for the small key doors
+    for (auto& transitionActor : transitionActorListCommand->transitionActorList) {
+        if (transitionActor.id == ACTOR_EN_DOOR) {
+            uint8_t doorType = (transitionActor.params >> 7) & 7;
+            if (doorType == DOOR_LOCKED) {
+                dungeonSmallKeyDoors[key].emplace_back(transitionActor.params & 0x3F);
+            }
+        } else if (transitionActor.id == ACTOR_DOOR_SHUTTER) {
+            uint8_t doorType = (transitionActor.params >> 7) & 15;
+            if (doorType == SHUTTER_BACK_LOCKED || doorType == SHUTTER_BOSS || doorType == SHUTTER_KEY_LOCKED) {
+                dungeonSmallKeyDoors[key].emplace_back(transitionActor.params & 0x3F);
+            }
+        }
+    }
+
+    return dungeonSmallKeyDoors[key];
+}
+
+int8_t Logic::GetUsedSmallKeyCount(SceneID sceneId) {
+    const auto& smallKeyDoors = GetDungeonSmallKeyDoors(sceneId);
+
+    // Get the swch value for the scene
+    uint32_t swch;
+    if (gPlayState != nullptr && gPlayState->sceneNum == sceneId) {
+        swch = gPlayState->actorCtx.flags.swch;
+    } else {
+        swch = mSaveContext->sceneFlags[sceneId].swch;
+    }
+
+    // Count the number of small keys doors unlocked
+    int8_t unlockedSmallKeyDoors = 0;
+    for (auto& smallKeyDoor : smallKeyDoors) {
+        unlockedSmallKeyDoors += swch >> smallKeyDoor & 1;
+    }
+
+    // RANDOTODO: Account for MQ Water trick that causes the basement lock to unlock when the player clears the stalfos
+    // pit.
+    return unlockedSmallKeyDoors;
+}
+
+uint8_t Logic::GetSmallKeyCount(uint32_t dungeonIndex) {
+    int8_t dungeonKeys = mSaveContext->inventory.dungeonKeys[dungeonIndex];
+    if (dungeonKeys == -1) {
+        // never got keys, so can't have used keys
+        return 0;
+    }
+    return dungeonKeys + GetUsedSmallKeyCount(SceneID(dungeonIndex));
+}
+
+void Logic::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {
+    mSaveContext->inventory.dungeonKeys[dungeonIndex] = count;
+}
+
+bool Logic::CheckDungeonItem(uint32_t item, uint32_t dungeonIndex) {
+    return mSaveContext->inventory.dungeonItems[dungeonIndex] & gBitFlags[item];
+}
+
+void Logic::SetDungeonItem(uint32_t item, uint32_t dungeonIndex, bool state) {
+    if (!state) {
+        mSaveContext->inventory.dungeonItems[dungeonIndex] &= ~gBitFlags[item];
+    } else {
+        mSaveContext->inventory.dungeonItems[dungeonIndex] |= gBitFlags[item];
+    }
+}
+
+bool Logic::CheckRandoInf(uint32_t flag) {
+    return mSaveContext->ship.randomizerInf[flag >> 4] & (1 << (flag & 0xF));
+}
+
+void Logic::SetRandoInf(uint32_t flag, bool state) {
+    if (!state) {
+        mSaveContext->ship.randomizerInf[flag >> 4] &= ~(1 << (flag & 0xF));
+    } else {
+        mSaveContext->ship.randomizerInf[flag >> 4] |= (1 << (flag & 0xF));
+    }
+}
+
+bool Logic::CheckEventChkInf(int32_t flag) {
+    return mSaveContext->eventChkInf[flag >> 4] & (1 << (flag & 0xF));
+}
+
+void Logic::SetEventChkInf(int32_t flag, bool state) {
+    if (!state) {
+        mSaveContext->eventChkInf[flag >> 4] &= ~(1 << (flag & 0xF));
+    } else {
+        mSaveContext->eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
+    }
+}
+
+uint8_t Logic::GetGSCount() {
+    return static_cast<uint8_t>(mSaveContext->inventory.gsTokens);
+}
+
+uint8_t Logic::GetAmmo(uint32_t item) {
+    return mSaveContext->inventory.ammo[gItemSlots[item]];
+}
+
+void Logic::SetAmmo(uint32_t item, uint8_t count) {
+    mSaveContext->inventory.ammo[gItemSlots[item]] = count;
+}
+
+void Logic::SetContext(std::shared_ptr<Context> _ctx) {
+    ctx = _ctx;
+}
+
+bool Logic::GetInLogic(LogicVal logicVal) {
+    return inLogic[logicVal];
+}
+
+void Logic::SetInLogic(LogicVal logicVal, bool value) {
+    inLogic[logicVal] = value;
+}
+
+void Logic::Reset(bool resetSaveContext /*= true*/) {
+    if (resetSaveContext) {
+        NewSaveContext();
+    }
+    StartPerformanceTimer(PT_LOGIC_RESET);
+    memset(inLogic, false, sizeof(inLogic));
+    // Settings-dependent variables
+    IsFireLoopLocked = ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANYWHERE) ||
+                       ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OVERWORLD) ||
+                       ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_ANY_DUNGEON);
+
+    // AmmoCanDrop = /*AmmoDrops.IsNot(AMMODROPS_NONE)*/ false; TODO: AmmoDrop setting
+
+    // Child item logic
+    SkullMask = false;
+    MaskOfTruth = false;
+
+    // Adult logic
+    FreedEpona = false;
+    // BigPoe        = false;
+
+    // Trade Quest Events
+    WakeUpAdultTalon = false;
+
+    // Dungeon Clears
+    DekuTreeClear = false;
+    DodongosCavernClear = false;
+    JabuJabusBellyClear = false;
+    ForestTempleClear = false;
+    FireTempleClear = false;
+    WaterTempleClear = false;
+    SpiritTempleClear = false;
+    ShadowTempleClear = false;
+
+    // Trial Clears
+    ForestTrialClear = false;
+    FireTrialClear = false;
+    WaterTrialClear = false;
+    SpiritTrialClear = false;
+    ShadowTrialClear = false;
+    LightTrialClear = false;
+
+    if (resetSaveContext) {
+        // Ocarina C Buttons
         bool ocBtnShuffle = ctx->GetOption(RSK_SHUFFLE_OCARINA_BUTTONS).Is(true);
         SetRandoInf(RAND_INF_HAS_OCARINA_A, !ocBtnShuffle);
         SetRandoInf(RAND_INF_HAS_OCARINA_C_UP, !ocBtnShuffle);
@@ -2202,145 +2388,153 @@ namespace Rando {
         SetRandoInf(RAND_INF_HAS_OCARINA_C_LEFT, !ocBtnShuffle);
         SetRandoInf(RAND_INF_HAS_OCARINA_C_RIGHT, !ocBtnShuffle);
 
-        //Progressive Items
+        // Progressive Items
         SetUpgrade(UPG_STICKS, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Is(true) ? 0 : 1);
         SetUpgrade(UPG_NUTS, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Is(true) ? 0 : 1);
 
-        //If we're not shuffling swim, we start with it
+        // If we're not shuffling swim, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_SWIM).Is(false)) {
             SetRandoInf(RAND_INF_CAN_SWIM, true);
         }
 
-        //If we're not shuffling child's wallet, we start with it
+        // If we're not shuffling child's wallet, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(false)) {
             SetRandoInf(RAND_INF_HAS_WALLET, true);
         }
 
-        //If we're not shuffling fishing pole, we start with it
+        // If we're not shuffling fishing pole, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_FISHING_POLE).Is(false)) {
             SetRandoInf(RAND_INF_FISHING_POLE_FOUND, true);
         }
 
-        //If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in vanilla FiT
-        if (!IsKeysanity && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
+        // If not keysanity, start with 1 logical key to account for automatically unlocking the basement door in
+        // vanilla FiT
+        if (!IsFireLoopLocked && ctx->GetDungeon(Rando::FIRE_TEMPLE)->IsVanilla()) {
             SetSmallKeyCount(SCENE_FIRE_TEMPLE, 1);
         }
-
-        //Bottle Count
-        Bottles    = 0;
-        NumBottles = 0;
-        CanEmptyBigPoes = false;
-
-        //Drops and Bottle Contents Access
-        NutPot           = false;
-        NutCrate         = false;
-        DekuBabaNuts     = false;
-        StickPot         = false;
-        DekuBabaSticks   = false;
-        BugShrub         = false;
-        WanderingBugs    = false;
-        BugRock          = false;
-        BlueFireAccess   = false;
-        FishGroup        = false;
-        LoneFish         = false;
-        GossipStoneFairy = false;
-        BeanPlantFairy   = false;
-        ButterflyFairy   = false;
-        FairyPot         = false;
-        FreeFairies      = false;
-        FairyPond        = false;
-
-        PieceOfHeart     = 0;
-        HeartContainer   = 0;
-
-        /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
-        /* These are used to simplify reading the logic, but need to be updated
-        /  every time a base value is updated.                       */
-
-        ChildScarecrow   = false;
-        AdultScarecrow   = false;
-
-        CouldPlayBowling = false;
-        IsChild          = false;
-        IsAdult          = false;
-        //CanPlantBean        = false;
-        BigPoeKill       = false;
-        BigPoes          = 0;
-
-        BaseHearts      = ctx->GetOption(RSK_STARTING_HEARTS).Get() + 1;
-        
-
-        //Bridge Requirements
-        BuiltRainbowBridge    = false;
-
-        //Other
-        AtDay         = false;
-        AtNight       = false;
-        GetSaveContext()->linkAge = !ctx->GetOption(RSK_SELECTED_STARTING_AGE).Get();
-
-        //Events
-        ShowedMidoSwordAndShield  = false;
-        CarpenterRescue           = false;
-        GF_GateOpen               = false;
-        GtG_GateOpen              = false;
-        DampesWindmillAccess      = false;
-        DrainWell                 = false;
-        GoronCityChildFire        = false;
-        GCWoodsWarpOpen           = false;
-        GCDaruniasDoorOpenChild   = false;
-        StopGCRollingGoronAsAdult = false;
-        CanWaterTempleLowFromHigh = false;
-        CanWaterTempleLowFromMid  = false;
-        CanWaterTempleMiddle      = false;
-        CanWaterTempleHigh        = false;
-        KakarikoVillageGateOpen   = false;
-        KingZoraThawed            = false;
-        ForestTempleJoelle        = false;
-        ForestTempleBeth          = false;
-        ForestTempleAmy           = false;
-        ForestTempleMeg           = false;
-        FireLoopSwitch            = false;
-        LinksCow                  = false;
-        DeliverLetter             = false;
-        ClearMQDCUpperLobbyRocks  = false;
-        LoweredWaterInsideBotw    = false;
-        OpenedWestRoomMQBotw      = false;
-        OpenedMiddleHoleMQBotw    = false;
-        BrokeDeku1FWeb            = false;
-        ClearedMQDekuSERoom       = false;
-        MQDekuWaterRoomTorches    = false;
-        PushedDekuBasementBlock   = false;
-        OpenedLowestGoronCage     = false;
-        OpenedUpperFireShortcut   = false;
-        HitFireTemplePlatform     = false;
-        OpenedFireMQFireMazeDoor  = false;
-        MQForestBlockRoomTargets  = false;
-        ForestCanTwistHallway     = false;
-        ForestClearBelowBowChest  = false;
-        ForestOpenBossCorridor    = false;
-        ShadowTrialFirstChest     = false;
-        MQGTGMazeSwitch           = false;
-        GTGPlatformSilverRupees   = false;
-        MQJabuHolesRoomDoor       = false;
-        JabuWestTentacle          = false;
-        JabuEastTentacle          = false;
-        JabuNorthTentacle         = false;
-        LoweredJabuPath           = false;
-        MQJabuLiftRoomCow         = false;
-        MQShadowFloorSpikeRupees  = false;
-        ShadowShortcutBlock       = false;
-        MQWaterStalfosPit         = false;
-        MQWaterDragonTorches      = false;
-        MQWaterB1Switch           = false;
-        //MQWaterPillarSoTBlock     = false;
-        MQWaterOpenedPillarB1     = false;
-        MQSpiritCrawlBoulder      = false;
-        MQSpiritMapRoomEnemies    = false;
-        MQSpirit3SunsEnemies      = false;
-        Spirit1FSilverRupees      = false;
-        JabuRutoInB1              = false;
-        JabuRutoIn1F              = false;
-
-        StopPerformanceTimer(PT_LOGIC_RESET);
     }
+
+    // Bottle Count
+    Bottles = 0;
+    NumBottles = 0;
+    CanEmptyBigPoes = false;
+
+    // Drops and Bottle Contents Access
+    NutPot = false;
+    NutCrate = false;
+    DekuBabaNuts = false;
+    StickPot = false;
+    DekuBabaSticks = false;
+    BugShrub = false;
+    WanderingBugs = false;
+    BugRock = false;
+    BlueFireAccess = false;
+    FishGroup = false;
+    LoneFish = false;
+    GossipStoneFairy = false;
+    BeanPlantFairy = false;
+    ButterflyFairy = false;
+    FairyPot = false;
+    FreeFairies = false;
+    FairyPond = false;
+
+    PieceOfHeart = 0;
+    HeartContainer = 0;
+
+    /* --- HELPERS, EVENTS, AND LOCATION ACCESS --- */
+    /* These are used to simplify reading the logic, but need to be updated
+    /  every time a base value is updated.                       */
+
+    ChildScarecrow = false;
+    AdultScarecrow = false;
+
+    CouldPlayBowling = false;
+    IsChild = false;
+    IsAdult = false;
+    // CanPlantBean        = false;
+    BigPoeKill = false;
+    BigPoes = 0;
+
+    BaseHearts = ctx->GetOption(RSK_STARTING_HEARTS).Get() + 1;
+
+    // Bridge Requirements
+    BuiltRainbowBridge = false;
+
+    // Other
+    AtDay = false;
+    AtNight = false;
+    if (resetSaveContext) {
+        GetSaveContext()->linkAge = !ctx->GetOption(RSK_SELECTED_STARTING_AGE).Get();
+    }
+
+    // Events
+    ShowedMidoSwordAndShield = false;
+    THCouldFree1TorchCarpenter = false;
+    THCouldFreeDoubleCellCarpenter = false;
+    TH_CouldFreeDeadEndCarpenter = false;
+    THCouldRescueSlopeCarpenter = false;
+    GF_GateOpen = false;
+    GtG_GateOpen = false;
+    DampesWindmillAccess = false;
+    DrainWell = false;
+    GoronCityChildFire = false;
+    GCWoodsWarpOpen = false;
+    GCDaruniasDoorOpenChild = false;
+    StopGCRollingGoronAsAdult = false;
+    CanWaterTempleLowFromHigh = false;
+    CanWaterTempleLowFromMid = false;
+    CanWaterTempleMiddle = false;
+    CanWaterTempleHigh = false;
+    KakarikoVillageGateOpen = false;
+    KingZoraThawed = false;
+    ForestTempleJoelle = false;
+    ForestTempleBeth = false;
+    ForestTempleAmy = false;
+    ForestTempleMeg = false;
+    FireLoopSwitch = false;
+    LinksCow = false;
+    DeliverLetter = false;
+    ClearMQDCUpperLobbyRocks = false;
+    LoweredWaterInsideBotw = false;
+    OpenedWestRoomMQBotw = false;
+    OpenedMiddleHoleMQBotw = false;
+    BrokeDeku1FWeb = false;
+    ClearedMQDekuSERoom = false;
+    MQDekuWaterRoomTorches = false;
+    PushedDekuBasementBlock = false;
+    OpenedLowestGoronCage = false;
+    OpenedUpperFireShortcut = false;
+    HitFireTemplePlatform = false;
+    OpenedFireMQFireMazeDoor = false;
+    MQForestBlockRoomTargets = false;
+    ForestCanTwistHallway = false;
+    ForestClearBelowBowChest = false;
+    ForestOpenBossCorridor = false;
+    ShadowTrialFirstChest = false;
+    MQGTGMazeSwitch = false;
+    MQGTGRightSideSwitch = false;
+    GTGPlatformSilverRupees = false;
+    MQJabuHolesRoomDoor = false;
+    JabuWestTentacle = false;
+    JabuEastTentacle = false;
+    JabuNorthTentacle = false;
+    LoweredJabuPath = false;
+    MQJabuLiftRoomCow = false;
+    MQShadowFloorSpikeRupees = false;
+    ShadowShortcutBlock = false;
+    MQWaterStalfosPit = false;
+    MQWaterDragonTorches = false;
+    MQWaterB1Switch = false;
+    // MQWaterPillarSoTBlock          = false;
+    MQWaterOpenedPillarB1 = false;
+    MQSpiritCrawlBoulder = false;
+    MQSpiritMapRoomEnemies = false;
+    MQSpirit3SunsEnemies = false;
+    Spirit1FSilverRupees = false;
+    JabuRutoIn1F = false;
+
+    CalculatingAvailableChecks = false;
+
+    StopPerformanceTimer(PT_LOGIC_RESET);
 }
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 4286cc5c36..ba9ab60d0b 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -59,15 +59,13 @@ class Logic {
     bool LightTrialClear = false;
 
     // Logical keysanity
-    bool IsKeysanity = false;
+    bool IsFireLoopLocked = false;
 
     // Bottle Count
     uint8_t Bottles = 0;
     uint8_t NumBottles = 0;
-    //this event covers if the player can currently empty big poes in logic
+    // this event covers if the player can currently empty big poes in logic
     bool CanEmptyBigPoes = false;
-    //this check covers if the generation has confirmed that it's possible to empty big poes if needed as adult
-    bool CouldEmptyBigPoes = true;
 
     // Drops and Bottle Contents Access
     bool NutPot = false;
@@ -87,7 +85,7 @@ class Logic {
     bool FairyPot = false;
     bool FreeFairies = false;
     bool FairyPond = false;
-    bool AmmoCanDrop = false;
+    bool AmmoCanDrop = true;
 
     uint8_t PieceOfHeart = 0;
     uint8_t HeartContainer = 0;
@@ -112,7 +110,11 @@ class Logic {
 
     // Events
     bool ShowedMidoSwordAndShield = false;
-    bool CarpenterRescue = false;
+    bool THCouldFree1TorchCarpenter = false;
+    bool THCouldFreeDoubleCellCarpenter = false;
+    bool TH_CouldFreeDeadEndCarpenter = false;
+    bool THCouldRescueSlopeCarpenter = false;
+    bool THRescuedAllCarpenters = false;
     bool GF_GateOpen = false;
     bool GtG_GateOpen = false;
     bool DampesWindmillAccess = false;
@@ -151,7 +153,7 @@ class Logic {
     bool OpenedFireMQFireMazeDoor = false;
     bool MQForestBlockRoomTargets = false;
     bool ForestCanTwistHallway = false;
-    bool ForestClearBelowBowChest = false; //a better name that covers both versions would be nice
+    bool ForestClearBelowBowChest = false; // a better name that covers both versions would be nice
     bool ForestOpenBossCorridor = false;
     bool ShadowTrialFirstChest = false;
     bool MQGTGMazeSwitch = false;
@@ -168,18 +170,20 @@ class Logic {
     bool MQWaterStalfosPit = false;
     bool MQWaterDragonTorches = false;
     bool MQWaterB1Switch = false;
-    //bool MQWaterPillarSoTBlock = false; should be irrelevant. SHOULD.
+    // bool MQWaterPillarSoTBlock = false; should be irrelevant. SHOULD.
     bool MQWaterOpenedPillarB1 = false;
     bool MQSpiritCrawlBoulder = false;
     bool MQSpiritMapRoomEnemies = false;
     bool MQSpiritTimeTravelChest = false;
     bool MQSpirit3SunsEnemies = false;
     bool Spirit1FSilverRupees = false;
-    bool JabuRutoInB1 = false;
     bool JabuRutoIn1F = false;
 
     /* --- END OF HELPERS AND LOCATION ACCESS --- */
 
+    bool CalculatingAvailableChecks = false;
+    bool ACProcessUndiscoveredExits = false;
+
     SaveContext* mSaveContext = nullptr;
     Logic();
     bool CanUse(RandomizerGet itemName);
@@ -189,9 +193,11 @@ class Logic {
     bool CanOpenOverworldDoor(RandomizerGet itemName);
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmount);
     bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
+    bool CanOpenUnderwaterChest();
     bool CanDoGlitch(GlitchType glitch);
     bool CanEquipSwap(RandomizerGet itemName);
-    bool CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE, bool wallOrFloor = true, uint8_t quantity = 1, bool timer = false, bool inWater = false);
+    bool CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE, bool wallOrFloor = true,
+                      uint8_t quantity = 1, bool timer = false, bool inWater = false);
     bool CanPassEnemy(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE, bool wallOrFloor = true);
     bool CanAvoidEnemy(RandomizerEnemy enemy, bool grounded = false, uint8_t quantity = 1);
     bool CanGetEnemyDrop(RandomizerEnemy enemy, EnemyDistance distance = ED_CLOSE, bool aboveLink = false);
@@ -205,6 +211,7 @@ class Logic {
     uint8_t BottleCount();
     uint8_t OcarinaButtons();
     bool HasBottle();
+    bool CanUseSword();
     bool CanJumpslashExceptHammer();
     bool CanJumpslash();
     bool CanHitSwitch(EnemyDistance distance = ED_CLOSE, bool inWater = false);
@@ -238,16 +245,17 @@ class Logic {
     bool CanBreakUpperBeehives();
     bool CanBreakLowerBeehives();
     bool CanBreakPots();
+    bool CanBreakCrates();
+    bool CanBreakSmallCrates();
     bool HasFireSource();
     bool HasFireSourceWithTorch();
     bool TradeQuestStep(RandomizerGet rg);
-    bool CanFinishGerudoFortress();
     bool CanStandingShield();
     bool CanShield();
     bool CanUseProjectile();
     bool CanBuildRainbowBridge();
     bool CanTriggerLACS();
-    void Reset();
+    void Reset(bool resetSaveContext = true);
     void SetContext(std::shared_ptr<Context> _ctx);
     bool GetInLogic(LogicVal logicVal);
     void SetInLogic(LogicVal logicVal, bool remove);
@@ -261,6 +269,7 @@ class Logic {
     bool CheckEquipment(uint32_t item);
     bool CheckQuestItem(uint32_t item);
     void SetQuestItem(uint32_t item, bool state);
+    int8_t GetUsedSmallKeyCount(SceneID sceneId);
     uint8_t GetSmallKeyCount(uint32_t dungeonIndex);
     void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count);
     bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex);
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index e032d1a2d4..f027fd0668 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -2,35 +2,38 @@
 #include "libultraship/bridge.h"
 #include <Context.h>
 #include <imgui.h>
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/UIWidgets.hpp"
+#include <soh/cvar_prefixes.h>
 
 namespace Rando {
 Option Option::Bool(RandomizerSettingKey key_, std::string name_, std::vector<std::string> options_,
                     const OptionCategory category_, std::string cvarName_, std::string description_,
                     WidgetType widgetType_, const uint8_t defaultOption_, const bool defaultHidden_, int imFlags_) {
-    return {static_cast<size_t>(key_), std::move(name_), std::move(options_), category_,
-            std::move(cvarName_), std::move(description_), widgetType_, defaultOption_, defaultHidden_, imFlags_};
+    return { static_cast<size_t>(key_), std::move(name_), std::move(options_), category_,      std::move(cvarName_),
+             std::move(description_),   widgetType_,      defaultOption_,      defaultHidden_, imFlags_ };
 }
 
 Option Option::Bool(RandomizerSettingKey key_, std::string name_, std::string cvarName_, std::string description_,
                     const int imFlags_, const WidgetType widgetType_, const bool defaultOption_) {
-    return Option(key_, std::move(name_), {"Off", "On"}, OptionCategory::Setting, std::move(cvarName_),
+    return Option(key_, std::move(name_), { "Off", "On" }, OptionCategory::Setting, std::move(cvarName_),
                   std::move(description_), widgetType_, defaultOption_, false, imFlags_);
 }
 
 Option Option::U8(RandomizerSettingKey key_, std::string name_, std::vector<std::string> options_,
                   const OptionCategory category_, std::string cvarName_, std::string description_,
                   WidgetType widgetType_, const uint8_t defaultOption_, const bool defaultHidden_, int imFlags_) {
-    return {static_cast<size_t>(key_), std::move(name_), std::move(options_), category_, std::move(cvarName_),
-                  std::move(description_), widgetType_, defaultOption_, defaultHidden_, imFlags_};
+    return { static_cast<size_t>(key_), std::move(name_), std::move(options_), category_,      std::move(cvarName_),
+             std::move(description_),   widgetType_,      defaultOption_,      defaultHidden_, imFlags_ };
 }
 
 Option Option::LogicTrick(RandomizerTrick rt_, std::string name_) {
-    return Option(rt_, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, "",
-                  "", WidgetType::Checkbox, 0, false, IMFLAG_NONE);
+    return Option(rt_, std::move(name_), { "Disabled", "Enabled" }, OptionCategory::Setting, "", "",
+                  WidgetType::Checkbox, 0, false, IMFLAG_NONE);
 }
 
-OptionValue::OptionValue(uint8_t val) : mVal(val) {}
+OptionValue::OptionValue(uint8_t val) : mVal(val) {
+}
 
 uint8_t OptionValue::Get() {
     return mVal;
@@ -60,8 +63,8 @@ const std::string& Option::GetDescription() const {
     return description;
 }
 
-uint8_t Option::GetMenuOptionIndex() const {
-    return menuSelection;
+uint8_t Option::GetOptionIndex() const {
+    return CVarGetInteger(cvarName.c_str(), defaultOption);
 }
 
 const std::string& Option::GetOptionText(size_t index) const {
@@ -72,18 +75,6 @@ const std::string& Option::GetCVarName() const {
     return cvarName;
 }
 
-void Option::SaveCVar() const {
-    if (!cvarName.empty()) {
-        CVarSetInteger(cvarName.c_str(), GetMenuOptionIndex());
-    }
-}
-
-void Option::SetFromCVar() {
-    if (!cvarName.empty()) {
-        SetMenuIndex(CVarGetInteger(cvarName.c_str(), defaultOption));
-    }
-}
-
 void Option::SetDelayedOption() {
     delayedSelection = contextSelection;
 }
@@ -92,18 +83,11 @@ void Option::RestoreDelayedOption() {
     contextSelection = delayedSelection;
 }
 
-void Option::SetMenuIndex(size_t idx) {
-    menuSelection = idx;
-    if (menuSelection > options.size() - 1) {
-        menuSelection = options.size() - 1;
-    }
-}
-
-void Option::SetContextIndex(size_t idx) {
+void Option::SetContextIndex(uint8_t idx) {
     // TODO: Set to Context's OptionValue array.
     contextSelection = idx;
-    if (contextSelection > options.size() - 1) {
-        contextSelection = options.size() - 1;
+    if (contextSelection > static_cast<uint8_t>(options.size() - 1)) {
+        contextSelection = static_cast<uint8_t>(options.size() - 1);
     }
 }
 
@@ -120,8 +104,8 @@ bool Option::IsHidden() const {
 }
 
 void Option::ChangeOptions(std::vector<std::string> opts) {
-    if (menuSelection >= opts.size()) {
-        menuSelection = opts.size() - 1;
+    if (GetOptionIndex() >= opts.size()) {
+        CVarSetInteger(cvarName.c_str(), static_cast<uint8_t>(opts.size() - 1));
     }
     options = std::move(opts);
 }
@@ -130,11 +114,10 @@ void Option::Enable() {
     disabled = false;
 }
 
-void Option::Disable(std::string text, const UIWidgets::CheckboxGraphics graphic) {
-    if (!disabled || disabledText != text || disabledGraphic != graphic) {
+void Option::Disable(std::string text) {
+    if (!disabled || disabledText != text) {
         disabled = true;
         disabledText = std::move(text);
-        disabledGraphic = graphic;
     }
 }
 
@@ -149,9 +132,6 @@ bool Option::RenderImGui() {
         case WidgetType::Checkbox:
             changed = RenderCheckbox();
             break;
-        case WidgetType::TristateCheckbox:
-            changed = RenderTristateCheckbox();
-            break;
         case WidgetType::Combobox:
             changed = RenderCombobox();
             break;
@@ -159,7 +139,6 @@ bool Option::RenderImGui() {
             changed = RenderSlider();
             break;
     }
-    UIWidgets::Spacer(0);
     ImGui::EndGroup();
     return changed;
 }
@@ -191,7 +170,7 @@ uint8_t Option::GetValueFromText(const std::string text) {
 }
 
 void Option::SetContextIndexFromText(const std::string text) {
-    if (optionsTextToVar.contains(text)){
+    if (optionsTextToVar.contains(text)) {
         SetContextIndex(optionsTextToVar[text]);
     } else {
         SPDLOG_ERROR("Option {} does not have a var named {}.", name, text);
@@ -205,130 +184,67 @@ Option::Option(size_t key_, std::string name_, std::vector<std::string> options_
     : key(key_), name(std::move(name_)), options(std::move(options_)), category(category_),
       cvarName(std::move(cvarName_)), description(std::move(description_)), widgetType(widgetType_),
       defaultOption(defaultOption_), defaultHidden(defaultHidden_), imFlags(imFlags_) {
-    menuSelection = contextSelection = defaultOption;
+    contextSelection = defaultOption;
     hidden = defaultHidden;
     PopulateTextToNum();
-    SetFromCVar();
 }
 
 bool Option::RenderCheckbox() {
     bool changed = false;
-    if (disabled) {
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
     bool val = static_cast<bool>(CVarGetInteger(cvarName.c_str(), defaultOption));
-    if (CustomCheckbox(name.c_str(), &val, disabled, disabledGraphic)) {
+    UIWidgets::CheckboxOptions widgetOptions = static_cast<UIWidgets::CheckboxOptions>(
+        UIWidgets::CheckboxOptions().Color(THEME_COLOR).Tooltip(description.c_str()));
+    widgetOptions.disabled = disabled;
+    if (UIWidgets::Checkbox(name.c_str(), &val, widgetOptions)) {
         CVarSetInteger(cvarName.c_str(), val);
         changed = true;
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
-    if (!description.empty()) {
-        UIWidgets::InsertHelpHoverText(description.c_str());
-    }
-    if (disabled) {
-        UIWidgets::ReEnableComponent(disabledText.c_str());
-    }
-    return changed;
-}
-
-bool Option::RenderTristateCheckbox() {
-    bool changed = false;
-    if (disabled) {
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
-    int val = CVarGetInteger(cvarName.c_str(), defaultOption);
-    if (CustomCheckboxTristate(name.c_str(), &val, disabled, disabledGraphic)) {
-        CVarSetInteger(cvarName.c_str(), val);
-        changed = true;
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    if (!description.empty()) {
-        UIWidgets::InsertHelpHoverText(description.c_str());
-    }
-    if (disabled) {
-        UIWidgets::ReEnableComponent(disabledText.c_str());
-    }
     return changed;
 }
 
 bool Option::RenderCombobox() {
     bool changed = false;
-    if (disabled) {
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
-    ImGui::Text("%s", name.c_str());
     uint8_t selected = CVarGetInteger(cvarName.c_str(), defaultOption);
-    if (selected >= options.size()) {
-        selected = options.size();
+    if (selected >= static_cast<uint8_t>(options.size())) {
+        selected = static_cast<uint8_t>(options.size());
         CVarSetInteger(cvarName.c_str(), selected);
         changed = true;
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
-    if (!description.empty()) {
-        UIWidgets::InsertHelpHoverText(description.c_str());
+    UIWidgets::ComboboxOptions widgetOptions =
+        UIWidgets::ComboboxOptions().Color(THEME_COLOR).Tooltip(description.c_str());
+    if (this->GetKey() == RSK_LOGIC_RULES) {
+        widgetOptions = widgetOptions.LabelPosition(UIWidgets::LabelPositions::None)
+                            .ComponentAlignment(UIWidgets::ComponentAlignments::Right);
     }
-    const std::string comboName = std::string("##") + std::string(cvarName);
-    if (ImGui::BeginCombo(comboName.c_str(), options[selected].c_str())) {
-        for (size_t i = 0; i < options.size(); i++) {
-            if (!options[i].empty()) {
-                if (ImGui::Selectable(options[i].c_str(), i == selected)) {
-                    CVarSetInteger(cvarName.c_str(), static_cast<int>(i));
-                    changed = true;
-                    selected = i;
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                }
-            }
-        }
-        ImGui::EndCombo();
-    }
-    if (disabled) {
-        UIWidgets::ReEnableComponent(disabledText.c_str());
+    widgetOptions.disabled = disabled;
+    if (UIWidgets::Combobox(name.c_str(), &selected, options, widgetOptions)) {
+        CVarSetInteger(cvarName.c_str(), static_cast<int>(selected));
+        changed = true;
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
     return changed;
 }
 
 bool Option::RenderSlider() {
     bool changed = false;
-    int val = GetMenuOptionIndex();
+    int val = CVarGetInteger(cvarName.c_str(), defaultOption);
     if (val > options.size() - 1) {
-        val = options.size() - 1;
-        CVarSetInteger(cvarName.c_str(), val);
+        val = static_cast<int>(options.size()) - 1;
         changed = true;
     }
-    if (disabled) {
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
-    const std::string formatName = name + ": %s";
-    ImGui::Text(formatName.c_str(), options[val].c_str());
-    if (!description.empty()) {
-        UIWidgets::InsertHelpHoverText(description.c_str());
-    }
-    UIWidgets::Spacer(0);
-    ImGui::BeginGroup();
-    const std::string MinusBTNName = " - ##" + cvarName;
-    if (ImGui::Button(MinusBTNName.c_str())) {
-        val--;
+    UIWidgets::IntSliderOptions widgetOptions = UIWidgets::IntSliderOptions()
+                                                    .Color(THEME_COLOR)
+                                                    .Min(0)
+                                                    .Max(static_cast<uint8_t>(options.size() - 1))
+                                                    .Tooltip(description.c_str())
+                                                    .Format(options[val].c_str())
+                                                    .DefaultValue(defaultOption);
+    widgetOptions.disabled = disabled;
+    if (UIWidgets::SliderInt(name.c_str(), &val, widgetOptions)) {
         changed = true;
     }
-    ImGui::SameLine();
-    ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-    ImGui::PushItemWidth(std::min(ImGui::GetContentRegionAvail().x - 30.0f, 260.0f));
-    const std::string id = "##Slider" + cvarName;
-    if (ImGui::SliderInt(id.c_str(), &val, 0, static_cast<int>(options.size()) - 1, "", ImGuiSliderFlags_AlwaysClamp)) {
-        changed = true;
-    }
-    ImGui::PopItemWidth();
-    const std::string PlusBTNName = " + ##" + cvarName;
-    ImGui::SameLine();
-    ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-    if (ImGui::Button(PlusBTNName.c_str())) {
-        val++;
-        changed = true;
-    }
-    ImGui::EndGroup();
-    if (disabled) {
-        UIWidgets::ReEnableComponent(disabledText.c_str());
-    }
     if (val < 0) {
         val = 0;
         changed = true;
@@ -339,33 +255,36 @@ bool Option::RenderSlider() {
     }
     if (changed) {
         CVarSetInteger(cvarName.c_str(), val);
-        SetFromCVar();
         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
     return changed;
 }
 
-void Option::PopulateTextToNum(){
-    for (uint8_t count = 0; count < options.size(); count++){
+void Option::PopulateTextToNum() {
+    for (uint8_t count = 0; count < options.size(); count++) {
         optionsTextToVar[options[count]] = count;
     }
 }
 
-LocationOption::LocationOption(RandomizerCheck key_, const std::string& name_) : 
-    Option(key_, name_, {"Included", "Excluded"}, OptionCategory::Setting, "", "", WidgetType::Checkbox,
-           RO_LOCATION_INCLUDE, false, IMFLAG_NONE) {}
+LocationOption::LocationOption(RandomizerCheck key_, const std::string& name_)
+    : Option(key_, name_, { "Included", "Excluded" }, OptionCategory::Setting, "", "", WidgetType::Checkbox,
+             RO_LOCATION_INCLUDE, false, IMFLAG_NONE) {
+}
 
 RandomizerCheck LocationOption::GetKey() const {
     return static_cast<RandomizerCheck>(key);
 }
 
-TrickOption::TrickOption(RandomizerTrick key_, const RandomizerCheckQuest quest_, const RandomizerArea area_, std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_) :
-    Option(key_, name_, {"Disabled", "Enabled"}, OptionCategory::Setting, "",
-        std::move(description_), WidgetType::Checkbox, 0, false, IMFLAG_NONE),
-    mQuest(quest_), mArea(area_), mTags(std::move(tags_)) {}
+TrickOption::TrickOption(RandomizerTrick key_, const RandomizerCheckQuest quest_, const RandomizerArea area_,
+                         std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_)
+    : Option(key_, name_, { "Disabled", "Enabled" }, OptionCategory::Setting, "", std::move(description_),
+             WidgetType::Checkbox, 0, false, IMFLAG_NONE),
+      mQuest(quest_), mArea(area_), mTags(std::move(tags_)) {
+}
 
-TrickOption TrickOption::LogicTrick(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_) {
-    return {key_, quest_, area_, std::move(tags_), name_, std::move(description_)};
+TrickOption TrickOption::LogicTrick(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_,
+                                    std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_) {
+    return { key_, quest_, area_, std::move(tags_), name_, std::move(description_) };
 }
 
 RandomizerTrick TrickOption::GetKey() const {
@@ -390,8 +309,8 @@ const std::set<Tricks::Tag>& TrickOption::GetTags() const {
 
 OptionGroup::OptionGroup(std::string name, std::vector<Option*> options, const OptionGroupType groupType,
                          const WidgetContainerType containerType, std::string description)
-    : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType),
-      mContainerType(containerType), mDescription(std::move(description)) {
+    : mName(std::move(name)), mOptions(std::move(options)), mGroupType(groupType), mContainerType(containerType),
+      mDescription(std::move(description)) {
 }
 
 OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, const OptionGroupType groupType,
@@ -402,14 +321,12 @@ OptionGroup::OptionGroup(std::string name, std::vector<OptionGroup*> subGroups,
 
 OptionGroup OptionGroup::SubGroup(std::string name, std::vector<Option*> options,
                                   const WidgetContainerType containerType, std::string description) {
-    return {std::move(name), std::move(options), OptionGroupType::SUBGROUP, containerType,
-                       std::move(description)};
+    return { std::move(name), std::move(options), OptionGroupType::SUBGROUP, containerType, std::move(description) };
 }
 
 OptionGroup OptionGroup::SubGroup(std::string name, std::vector<OptionGroup*> subGroups,
                                   const WidgetContainerType containerType, std::string description) {
-    return {std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, containerType,
-                       std::move(description)};
+    return { std::move(name), std::move(subGroups), OptionGroupType::SUBGROUP, containerType, std::move(description) };
 }
 
 const std::string& OptionGroup::GetName() const {
@@ -451,9 +368,12 @@ void OptionGroup::Disable() {
 bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
     ImGuiWindow* window = ImGui::GetCurrentWindow();
     bool changed = false;
-    ImGui::BeginDisabled(mDisabled);
+    ImGui::BeginDisabled(mDisabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) ||
+                         CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) ||
+                         CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0));
     if (mContainerType == WidgetContainerType::TABLE) {
-        if (ImGui::BeginTable(mName.c_str(), static_cast<int>(mSubGroups.size()), ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
+        if (ImGui::BeginTable(mName.c_str(), static_cast<int>(mSubGroups.size()),
+                              ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
             for (const auto column : mSubGroups) {
                 if (column->GetContainerType() == WidgetContainerType::COLUMN) {
                     ImGui::TableSetupColumn(column->GetName().c_str(), ImGuiTableColumnFlags_WidthStretch, 200.0f);
@@ -465,7 +385,7 @@ bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
                 ImGui::TableSetColumnIndex(i);
                 ImGui::TableHeader(mSubGroups[i]->GetName().c_str());
                 if (!mSubGroups[i]->GetDescription().empty()) {
-                    UIWidgets::SetLastItemHoverText(mSubGroups[i]->GetDescription().c_str());
+                    UIWidgets::Tooltip(mSubGroups[i]->GetDescription().c_str());
                 }
             }
             ImGui::PopItemFlag();
@@ -473,12 +393,10 @@ bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
         }
     }
     if (mContainerType == WidgetContainerType::SECTION && !mName.empty()) {
-        UIWidgets::PaddedSeparator();
-        ImGui::Text("%s", mName.c_str());
+        ImGui::SeparatorText(mName.c_str());
         if (!mDescription.empty()) {
-            UIWidgets::InsertHelpHoverText(mDescription.c_str());
+            UIWidgets::Tooltip(mDescription.c_str());
         }
-        UIWidgets::PaddedSeparator();
     }
     if (mContainerType == WidgetContainerType::COLUMN) {
         ImGui::TableNextColumn();
@@ -507,9 +425,6 @@ bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
             if (option->HasFlag(IMFLAG_UNINDENT)) {
                 ImGui::Unindent();
             }
-            if (option->HasFlag(IMFLAG_SEPARATOR_BOTTOM)) {
-                UIWidgets::PaddedSeparator(false, true);
-            }
         }
     }
     if (mContainerType == WidgetContainerType::COLUMN) {
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index d2291463b2..55a06ed86d 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "soh/SohGui/UIWidgets.hpp"
+#ifndef RANDOPTION_H
+#define RANDOPTION_H
 
 #include <cstdint>
 #include <set>
@@ -15,29 +16,31 @@
 
 namespace Rando {
 enum ImGuiMenuFlags {
-  IMFLAG_NONE = 0,
-  IMFLAG_SEPARATOR_BOTTOM = 1 << 0, /** Adds a padded separator below the widget. */
-  IMFLAG_SEPARATOR_TOP = 1 << 1, /** Adds a padded separator above the widget. */
-  IMFLAG_INDENT = 1 << 2, /** Indents this widget and all proceeding widgets. */
-  IMFLAG_UNINDENT = 1 << 3, /** Unindents this widget and all proceeding widgets. */
+    IMFLAG_NONE = 0,
+    IMFLAG_SEPARATOR_BOTTOM = 1 << 0, /** Adds a padded separator below the widget. */
+    IMFLAG_SEPARATOR_TOP = 1 << 1,    /** Adds a padded separator above the widget. */
+    IMFLAG_INDENT = 1 << 2,           /** Indents this widget and all proceeding widgets. */
+    IMFLAG_UNINDENT = 1 << 3,         /** Unindents this widget and all proceeding widgets. */
 };
 
 /**
  * @brief Affects how options are handled when writing a spoiler/patch file
  */
 enum class OptionCategory {
-    Setting, /** An option that typically affects the logic/item pool/etc. of the seed. Typically gets written out to the spoiler file. */
-    Toggle, /** An option that typically affects other options rather than affecting the seed directly. i.e. A toggle for randomizing the values of other options. */
+    Setting, /** An option that typically affects the logic/item pool/etc. of the seed. Typically gets written out to
+                the spoiler file. */
+    Toggle,  /** An option that typically affects other options rather than affecting the seed directly. i.e. A toggle
+                for randomizing the values of other options. */
 };
 
 /**
  * @brief Controls how this option is rendered in the menu.
  */
 enum class WidgetType {
-  Checkbox, /** Default for Bools, not compatible if options.size() > 2. */
-  TristateCheckbox, /** Compatible with U8s, not compatible if options.size() != 3. */
-  Combobox, /** Default for U8s, works with U8s and Bools. */
-  Slider, /** Compatible with U8s. If constructed with NumOpts, consider using this. Technically can be used for Bool or non-NumOpts options but it would be a bit weird semantically. */
+    Checkbox, /** Default for Bools, not compatible if options.size() > 2. */
+    Combobox, /** Default for U8s, works with U8s and Bools. */
+    Slider, /** Compatible with U8s. If constructed with NumOpts, consider using this. Technically can be used for Bool
+               or non-NumOpts options but it would be a bit weird semantically. */
 };
 
 class OptionValue {
@@ -47,15 +50,15 @@ class OptionValue {
 
     /**
      * @brief Returns the value of the OptionValue's mVal
-     * 
-     * @return uint8_t 
+     *
+     * @return uint8_t
      */
     uint8_t Get();
 
     /**
      * @brief Set the OptionValue's mVal to the provided val.
-     * 
-     * @param val 
+     *
+     * @param val
      */
     void Set(uint8_t val);
 
@@ -146,8 +149,8 @@ class Option {
      * @return Option
      */
     static Option Bool(RandomizerSettingKey key_, std::string name_, std::string cvarName_,
-                      std::string description_ = "", int imFlags_ = IMFLAG_SEPARATOR_BOTTOM,
-                      WidgetType widgetType_ = WidgetType::Checkbox, bool defaultOption_ = false);
+                       std::string description_ = "", int imFlags_ = IMFLAG_SEPARATOR_BOTTOM,
+                       WidgetType widgetType_ = WidgetType::Checkbox, bool defaultOption_ = false);
 
     /**
      * @brief Constructs a U8 Option.
@@ -192,8 +195,8 @@ class Option {
 
     /**
      * @brief Get the Key Option
-     * 
-     * @return const RandomizerSettingKey 
+     *
+     * @return const RandomizerSettingKey
      */
     RandomizerSettingKey GetKey() const;
 
@@ -207,9 +210,9 @@ class Option {
 
     /**
      * @brief Get the text of the Option value of the selected index.
-     * 
-     * @param index 
-     * @return const std::string& 
+     *
+     * @param index
+     * @return const std::string&
      */
     const std::string& GetOptionText(size_t index) const;
 
@@ -225,19 +228,7 @@ class Option {
      *
      * @return uint8_t
      */
-    uint8_t GetMenuOptionIndex() const;
-
-    /**
-     * @brief Sets the CVar corresponding to the property `cvarName` equal to the value
-     * of the property `selectedValue`.
-    */
-    void SaveCVar() const;
-
-    /**
-     * @brief Sets the value of property `selectedValue` equal to the CVar corresponding
-     * to the property `cvarName`.
-    */
-    void SetFromCVar();
+    uint8_t GetOptionIndex() const;
 
     /**
      * @brief Set the delayedOption to the currently selected index so it can be restored later.
@@ -250,18 +241,11 @@ class Option {
     void RestoreDelayedOption();
 
     /**
-     * @brief Set the menu index for this Option. Also calls `SetVariable()`.
+     * @brief Set the rando context index for this Option.
      *
      * @param idx the index to set as the selected index.
      */
-    void SetMenuIndex(size_t idx);
-
-    /**
-     * @brief Set the rando context index for this Option. Also calls `SetVariable()`.
-     *
-     * @param idx the index to set as the selected index.
-     */
-    void SetContextIndex(size_t idx);
+    void SetContextIndex(uint8_t idx);
 
     /**
      * @brief Hides this Option in the menu. (Not currently being used afaik, we prefer to
@@ -298,7 +282,7 @@ class Option {
      * "Enable" in this context refers to the ability to change the option in the
      * settings menu. The actual value of the option is not decided by whether or not
      * the option is "Enabled".
-    */
+     */
     void Enable();
 
     /**
@@ -312,13 +296,13 @@ class Option {
      * @param graphic What graphic to display in a disabled checkbox. Defaults to an
      * "X" symbol.
      */
-    void Disable(std::string text, UIWidgets::CheckboxGraphics graphic = UIWidgets::CheckboxGraphics::Cross);
+    void Disable(std::string text);
     bool IsCategory(OptionCategory category) const;
 
     /**
      * @brief Automatically renders a widget for this option in ImGui, based on the various
      * properties of this Option. Typically, Bool options are rendered as Checkboxes and
-     * U8 options are rendered as Comboboxes, but this can be overriden during construction with
+     * U8 options are rendered as Comboboxes, but this can be overridden during construction with
      * the `widgetType` property.
      */
     bool RenderImGui();
@@ -331,7 +315,7 @@ class Option {
     uint8_t GetValueFromText(std::string text);
     void SetContextIndexFromText(std::string text);
 
-protected:
+  protected:
     Option(size_t key_, std::string name_, std::vector<std::string> options_, OptionCategory category_,
            std::string cvarName_, std::string description_, WidgetType widgetType_, uint8_t defaultOption_,
            bool defaultHidden_, int imFlags_);
@@ -339,13 +323,11 @@ protected:
 
   private:
     bool RenderCheckbox();
-    bool RenderTristateCheckbox();
     bool RenderCombobox();
     bool RenderSlider();
     void PopulateTextToNum();
     std::string name;
     std::vector<std::string> options;
-    uint8_t menuSelection = 0;
     uint8_t contextSelection = 0;
     uint8_t delayedSelection = 0;
     bool hidden = false;
@@ -357,20 +339,19 @@ protected:
     bool defaultHidden = false;
     int imFlags = IMFLAG_NONE;
     bool disabled = false;
-    UIWidgets::CheckboxGraphics disabledGraphic = UIWidgets::CheckboxGraphics::Cross;
     std::string disabledText;
     std::unordered_map<std::string, uint8_t> optionsTextToVar = {};
 };
 
 class LocationOption : public Option {
-public:
-  LocationOption() = default;
-  LocationOption(RandomizerCheck key_, const std::string& name_);
-  RandomizerCheck GetKey() const;
+  public:
+    LocationOption() = default;
+    LocationOption(RandomizerCheck key_, const std::string& name_);
+    RandomizerCheck GetKey() const;
 };
 
 class TrickOption : public Option {
-public:
+  public:
     TrickOption() = default;
     /**
      * @brief A convenience function for constructing the Option for a trick.
@@ -383,7 +364,8 @@ public:
      * @param description_ A brief description of the trick.
      * @return Option
      */
-    static TrickOption LogicTrick(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_);
+    static TrickOption LogicTrick(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_,
+                                  std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_);
 
     RandomizerTrick GetKey() const;
 
@@ -411,8 +393,9 @@ public:
 
     const std::set<Tricks::Tag>& GetTags() const;
 
-private:
-    TrickOption(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_, const std::string& name_, std::string description_);
+  private:
+    TrickOption(RandomizerTrick key_, RandomizerCheckQuest quest_, RandomizerArea area_, std::set<Tricks::Tag> tags_,
+                const std::string& name_, std::string description_);
     RandomizerCheckQuest mQuest;
     RandomizerArea mArea;
     std::set<Tricks::Tag> mTags;
@@ -424,11 +407,11 @@ enum class OptionGroupType {
 };
 
 enum class WidgetContainerType {
-  BASIC, /** Barebones container, just lists the options within. */
-  SECTION, /** Similar to Barebones, but has a header with the section name. */
-  COLUMN, /** Signifies the container should be the start of new column within a table. */
-  TABLE, /** Signifies the container is a table (should contain other subgroups with type column)*/
-  TABBED, /** Signifies this container's contents should be contained within a tabbed interface. */
+    BASIC,   /** Barebones container, just lists the options within. */
+    SECTION, /** Similar to Barebones, but has a header with the section name. */
+    COLUMN,  /** Signifies the container should be the start of new column within a table. */
+    TABLE,   /** Signifies the container is a table (should contain other subgroups with type column)*/
+    TABBED,  /** Signifies this container's contents should be contained within a tabbed interface. */
 };
 
 class OptionGroup {
@@ -458,7 +441,8 @@ class OptionGroup {
      * @param containerType Specifies the type of container this widget should render as in ImGui.
      * @param description A description that can appear in a tooltip in ImGui.
      */
-    OptionGroup(std::string name, std::vector<OptionGroup*> subGroups, OptionGroupType groupType = OptionGroupType::DEFAULT,
+    OptionGroup(std::string name, std::vector<OptionGroup*> subGroups,
+                OptionGroupType groupType = OptionGroupType::DEFAULT,
                 WidgetContainerType containerType = WidgetContainerType::BASIC, std::string description = "");
 
     /**
@@ -471,7 +455,8 @@ class OptionGroup {
      * @param description A description that can appear in a tooltip in ImGui.
      * @return OptionGroup
      */
-    static OptionGroup SubGroup(std::string name, std::vector<Option*> options, WidgetContainerType containerType = WidgetContainerType::BASIC,
+    static OptionGroup SubGroup(std::string name, std::vector<Option*> options,
+                                WidgetContainerType containerType = WidgetContainerType::BASIC,
                                 std::string description = "");
 
     /**
@@ -484,7 +469,8 @@ class OptionGroup {
      * @param description A description that can appear in a tooltip in ImGui.
      * @return OptionGroup
      */
-    static OptionGroup SubGroup(std::string name, std::vector<OptionGroup*> subGroups, WidgetContainerType containerType = WidgetContainerType::BASIC,
+    static OptionGroup SubGroup(std::string name, std::vector<OptionGroup*> subGroups,
+                                WidgetContainerType containerType = WidgetContainerType::BASIC,
                                 std::string description = "");
 
     /**
@@ -546,4 +532,6 @@ class OptionGroup {
     std::string mDescription;
     bool mDisabled = false;
 };
-} // namespace Rando
\ No newline at end of file
+} // namespace Rando
+
+#endif // RANDOPTION_H
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index a3184765f1..16c89a1c41 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -2,18 +2,19 @@
 
 namespace Rando {
 void Settings::CreateOptionDescriptions() {
-    mOptionDescriptions[RSK_FOREST] = "Determines if Kokiri forest can be left for the Lost Woods bridge or the Deku Tree.\n"
-                                      "\n"
-                                      "On - Kokiri Sword & Deku Shield are required to access "
-                                      "the Deku Tree, and completing the Deku Tree is required to "
-                                      "access the Lost Woods Bridge Exit.\n"
-                                      "\n"
-                                      "Deku Only - Kokiri boy no longer blocks the path to the Bridge "
-                                      "but Mido still requires the Kokiri Sword and Deku Shield "
-                                      "to access the tree.\n"
-                                      "\n"
-                                      "Off - Mido no longer blocks the path to the Deku Tree. Kokiri "
-                                      "boy no longer blocks the path out of the forest.";
+    mOptionDescriptions[RSK_FOREST] =
+        "Determines if Kokiri forest can be left for the Lost Woods bridge or the Deku Tree.\n"
+        "\n"
+        "On - Kokiri Sword & Deku Shield are required to access "
+        "the Deku Tree, and completing the Deku Tree is required to "
+        "access the Lost Woods Bridge Exit.\n"
+        "\n"
+        "Deku Only - Kokiri boy no longer blocks the path to the Bridge "
+        "but Mido still requires the Kokiri Sword and Deku Shield "
+        "to access the tree.\n"
+        "\n"
+        "Off - Mido no longer blocks the path to the Deku Tree. Kokiri "
+        "boy no longer blocks the path out of the forest.";
     mOptionDescriptions[RSK_KAK_GATE] = "Closed - The gate will remain closed until Zelda's Letter "
                                         "is shown to the guard.\n"
                                         "\n"
@@ -41,22 +42,24 @@ void Settings::CreateOptionDescriptions() {
                                                   "\n"
                                                   "Open - Sleeping Waterfall is always open. "
                                                   "Link may always enter Zora's Domain.";
-    mOptionDescriptions[RSK_LOCK_OVERWORLD_DOORS] = "Add locks to all wooden overworld doors, requiring specific small keys to open them";
+    mOptionDescriptions[RSK_LOCK_OVERWORLD_DOORS] =
+        "Add locks to all wooden overworld doors, requiring specific small keys to open them";
     mOptionDescriptions[RSK_STARTING_AGE] =
         "Choose which age Link will start as.\n\n"
         "Starting as adult means you start with the Master Sword in your inventory.\n"
         "The child option is forcefully set if it would conflict with other options.";
-    mOptionDescriptions[RSK_GERUDO_FORTRESS] = "Sets the state of the carpenters captured by Gerudo "
-                                               "in Gerudo Fortress, and with it the number of guards that spawn.\n"
-                                               "\n"
-                                               "Normal - All 4 carpenters are required to be saved.\n"
-                                               "\n"
-                                               "Fast - Only the bottom left carpenter requires rescuing.\n"
-                                               "\n"
-                                               "Free - The bridge is repaired from the start, and Nabooru cannot spawn.\n"
-                                               "If the Gerudo Membership Card isn't shuffled, you start with it.\n"
-                                               "\n"
-                                               "Only \"Normal\" is compatible with Gerudo Fortress Key Rings.";
+    mOptionDescriptions[RSK_GERUDO_FORTRESS] =
+        "Sets the state of the carpenters captured by Gerudo "
+        "in Gerudo Fortress, and with it the number of guards that spawn.\n"
+        "\n"
+        "Normal - All 4 carpenters are required to be saved.\n"
+        "\n"
+        "Fast - Only the bottom left carpenter requires rescuing.\n"
+        "\n"
+        "Free - The bridge is repaired from the start, and Nabooru cannot spawn.\n"
+        "If the Gerudo Membership Card isn't shuffled, you start with it.\n"
+        "\n"
+        "Only \"Normal\" is compatible with Gerudo Fortress Key Rings.";
     mOptionDescriptions[RSK_RAINBOW_BRIDGE] =
         "Alters the requirements to open the bridge to Ganon's Castle.\n"
         "\n"
@@ -111,13 +114,13 @@ void Settings::CreateOptionDescriptions() {
         "Selection Only - Specify which dungeons are Vanilla, Master Quest or a 50/50 between the two.\n"
         "Differs from Random Number in that they are rolled individually, making the exact total a bell curve.";
     mOptionDescriptions[RSK_MQ_DUNGEON_SET] =
-                "Choose specific Dungeons to be Master Quest or Vanilla.\n"
-                "\n"
-                "If Master Quest Dungeons is set to Set Number or Random, the dungeons chosen "
-                "to be Master Quest here will count towards that total. Any Dungeons set to Vanilla "
-                "here will be guaranteed to be Vanilla. If Set Number is higher than the amount of dungeons "
-                "set to either MQ or Random here, you will have fewer MQ Dungeons than the number you "
-                "set.";
+        "Choose specific Dungeons to be Master Quest or Vanilla.\n"
+        "\n"
+        "If Master Quest Dungeons is set to Set Number or Random, the dungeons chosen "
+        "to be Master Quest here will count towards that total. Any Dungeons set to Vanilla "
+        "here will be guaranteed to be Vanilla. If Set Number is higher than the amount of dungeons "
+        "set to either MQ or Random here, you will have fewer MQ Dungeons than the number you "
+        "set.";
     mOptionDescriptions[RSK_TRIFORCE_HUNT] =
         "Pieces of the Triforce of Courage have been scattered across the world. Find them all to finish the game!\n\n"
         "When the required amount of pieces have been found, the game is saved and Ganon's Boss key is given "
@@ -193,6 +196,8 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES] = "Interior entrances will be part of the mixed pool.";
     mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES] = "Grotto entrances will be part of the mixed pool.";
     mOptionDescriptions[RSK_SHUFFLE_SONGS] =
+        "Off - Songs will appear at their vanilla locations.\n"
+        "\n"
         "Song locations - Songs will only appear at locations that normally teach songs.\n"
         "\n"
         "Dungeon rewards - Songs appear after beating a major dungeon boss.\n"
@@ -224,12 +229,11 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Adult Link will start with a second free item instead of the Master Sword.\n"
         "If you haven't found the Master Sword before facing Ganon, you won't receive it during the fight.";
-    mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET] =
-        "Enabling this shuffles the Child's Wallet into the item pool.\n"
-        "\n"
-        "You will not be able to carry any rupees until you find a wallet.";
-    mOptionDescriptions[RSK_INCLUDE_TYCOON_WALLET] =
-        "Enabling this adds an extra Progressive Wallet to the pool and adds a new 999 capacity tier after Giant's Wallet.\n";
+    mOptionDescriptions[RSK_SHUFFLE_CHILD_WALLET] = "Enabling this shuffles the Child's Wallet into the item pool.\n"
+                                                    "\n"
+                                                    "You will not be able to carry any rupees until you find a wallet.";
+    mOptionDescriptions[RSK_INCLUDE_TYCOON_WALLET] = "Enabling this adds an extra Progressive Wallet to the pool and "
+                                                     "adds a new 999 capacity tier after Giant's Wallet.\n";
     mOptionDescriptions[RSK_SHUFFLE_OCARINA] =
         "Enabling this shuffles the Fairy Ocarina and the Ocarina of Time into the item pool.\n"
         "\n"
@@ -259,62 +263,79 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "The Gerudo Card is required to enter the Gerudo Training Ground, opening "
         "the gate to Haunted Wasteland and the Horseback Archery minigame.";
-    mOptionDescriptions[RSK_SHUFFLE_POTS] = "Pots will drop a randomized item the first time they're broken and collected. This does not include the flying pots."
-                                              " Pots will have a different appearance when they hold a randomized item.\n"
-                                              "With this option enabled, Ganon's boss key door is moved further up the stairs to\n"
-                                              "allow access to the pots before obtaining Ganon's Boss Key.\n"
-                                              "\n"
-                                              "Off - Pots will not be shuffled.\n"
-                                              "\n"
-                                              "Dungeons - Only shuffle pots that are within dungeons.\n"
-                                              "\n"
-                                              "Overworld - Only shuffle pots that are outside of dungeons.\n"
-                                              "\n"
-                                              "All pots - Shuffle all pots.";
-    mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE] = "Shuffles the fishing pole into the item pool.\n"
+    mOptionDescriptions[RSK_SHUFFLE_POTS] =
+        "Pots will drop a randomized item the first time they're broken and collected. This does not include the "
+        "flying pots."
+        " Pots will have a different appearance when they hold a randomized item.\n"
+        "With this option enabled, Ganon's boss key door is moved further up the stairs to\n"
+        "allow access to the pots before obtaining Ganon's Boss Key.\n"
         "\n"
-        "The fishing pole is required to play the fishing pond minigame.";
-    mOptionDescriptions[RSK_INFINITE_UPGRADES] = "Adds upgrades that hold infinite quantities of items (bombs, arrows, etc.).\n"
+        "Off - Pots will not be shuffled.\n"
+        "\n"
+        "Dungeons - Only shuffle pots that are within dungeons.\n"
+        "\n"
+        "Overworld - Only shuffle pots that are outside of dungeons.\n"
+        "\n"
+        "All pots - Shuffle all pots.";
+    mOptionDescriptions[RSK_SHUFFLE_CRATES] =
+        "Crates will drop a randomized item the first time they're broken and collected. "
+        "Crates will have a different appearance when they hold a randomized item.\n"
+        "\n"
+        "Off - Crates will not be shuffled.\n"
+        "\n"
+        "Dungeons - Only shuffle crates that are within dungeons.\n"
+        "\n"
+        "Overworld - Only shuffle crates that are outside of dungeons.\n"
+        "\n"
+        "All Crates - Shuffle all crates.";
+    mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE] = "Shuffles the fishing pole into the item pool.\n"
+                                                    "\n"
+                                                    "The fishing pole is required to play the fishing pond minigame.";
+    mOptionDescriptions[RSK_INFINITE_UPGRADES] =
+        "Adds upgrades that hold infinite quantities of items (bombs, arrows, etc.).\n"
         "\n"
         "Progressive - The infinite upgrades are obtained after getting the last normal capacity upgrade.\n"
         "\n"
-        "Condensed Progressive - The infinite upgrades are obtained as the first capacity upgrade (doesn't apply to the infinite wallet or to infinite magic).";
+        "Condensed Progressive - The infinite upgrades are obtained as the first capacity upgrade (doesn't apply to "
+        "the infinite wallet or to infinite magic).";
     mOptionDescriptions[RSK_SHUFFLE_DEKU_STICK_BAG] = "Shuffles the Deku Stick bag into the item pool.\n"
-        "\n"
-        "The Deku Stick bag is required to hold Deku Sticks.";
+                                                      "\n"
+                                                      "The Deku Stick bag is required to hold Deku Sticks.";
     mOptionDescriptions[RSK_SHUFFLE_DEKU_NUT_BAG] = "Shuffles the Deku Nut bag into the item pool.\n"
+                                                    "\n"
+                                                    "The Deku Nut bag is required to hold Deku Nuts.";
+    mOptionDescriptions[RSK_SHOPSANITY] =
+        "Off - All shop items will be the same as vanilla.\n"
         "\n"
-        "The Deku Nut bag is required to hold Deku Nuts.";
-    mOptionDescriptions[RSK_SHOPSANITY] = "Off - All shop items will be the same as vanilla.\n"
-                                          "\n"
-                                          "Specific Count - Vanilla shop items will be shuffled among different shops, and "
-                                          "each shop will contain a specific number (0-7) of non-vanilla shop items.\n"
-                                          "\n"
-                                          "Random - Vanilla shop items will be shuffled among different shops, and "
-                                          "each shop will contain a random number (1-7) of non-vanilla shop items.";
-    mOptionDescriptions[RSK_SHOPSANITY_COUNT] = "0 Items - Vanilla shop items will be shuffled among different shops.\n"
-                                                "\n"
-                                                "1-7 Items - Vanilla shop items will be shuffled among different shops, and "
-                                                "each shop will contain 1-7 non-vanilla shop items.\n"
-                                                /*
-                                                "\n"
-                                                "8 Items - All shops will contain 8 non-vanilla shop items.\n"
-                                                */;
+        "Specific Count - Vanilla shop items will be shuffled among different shops, and "
+        "each shop will contain a specific number (0-7) of non-vanilla shop items.\n"
+        "\n"
+        "Random - Vanilla shop items will be shuffled among different shops, and "
+        "each shop will contain a random number (1-7) of non-vanilla shop items.";
+    mOptionDescriptions[RSK_SHOPSANITY_COUNT] =
+        "0 Items - Vanilla shop items will be shuffled among different shops.\n"
+        "\n"
+        "1-7 Items - Vanilla shop items will be shuffled among different shops, and "
+        "each shop will contain 1-7 non-vanilla shop items.\n"
+        /*
+        "\n"
+        "8 Items - All shops will contain 8 non-vanilla shop items.\n"
+        */
+        ;
     mOptionDescriptions[RSK_SHOPSANITY_PRICES] =
         "Vanilla - The same price as the item it replaced.\n"
         "Cheap Balanced - Prices will range between 0 to 95 rupees, favoring lower numbers.\n"
         "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers.\n"
         "Fixed - A fixed number.\n"
         "Range - A random point between specific ranges.\n"
-        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen.";
-    mOptionDescriptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE] =
-        "The price for Shopsanity checks.";
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if "
+        "that wallet is chosen.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE] = "The price for Shopsanity checks.";
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_1] =
         "The first part of the inclusive range of prices to allow for Shopsanity checks.";
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_RANGE_2] =
         "The second part of the inclusive range of prices to allow for Shopsanity checks.";
-    mOptionDescriptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT] =
-        "The chance for Shopsanity checks to be free.";
+    mOptionDescriptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT] = "The chance for Shopsanity checks to be free.";
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT] =
         "The chance for Shopsanity checks to be purchasable with Child's Wallet (1-99).";
     mOptionDescriptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT] =
@@ -327,16 +348,24 @@ void Settings::CreateOptionDescriptions() {
         "After choosing a price, set it to the affordable amount based on the wallet required.\n\n"
         "Affordable prices per tier: starter = 1, adult = 100, giant = 201, tycoon = 501\n\n"
         "Use this to enable wallet tier locking, but make shop items not as expensive as they could be.";
-    mOptionDescriptions[RSK_FISHSANITY] = "Off - Fish will not be shuffled. No changes will be made to fishing behavior.\n\n"
-        "Shuffle only Hyrule Loach - Allows you to earn an item by catching the Hyrule Loach at the fishing pond and giving it to the owner.\n\n"
-        "Shuffle Fishing Pond - The fishing pond's fish will be shuffled. Catching a fish in the fishing pond will grant a reward.\n\n"
-        "Shuffle Overworld Fish - Fish in generic grottos and Zora's Domain will be shuffled. Catching a fish in a bottle will give a reward.\n\n"
+    mOptionDescriptions[RSK_FISHSANITY] =
+        "Off - Fish will not be shuffled. No changes will be made to fishing behavior.\n\n"
+        "Shuffle only Hyrule Loach - Allows you to earn an item by catching the Hyrule Loach at the fishing pond and "
+        "giving it to the owner.\n\n"
+        "Shuffle Fishing Pond - The fishing pond's fish will be shuffled. Catching a fish in the fishing pond will "
+        "grant a reward.\n\n"
+        "Shuffle Overworld Fish - Fish in generic grottos and Zora's Domain will be shuffled. Catching a fish in a "
+        "bottle will give a reward.\n\n"
         "Shuffle Both - Both overworld fish and fish in the fishing pond will be shuffled.";
-    mOptionDescriptions[RSK_FISHSANITY_POND_COUNT] = "The number of fish to randomize in the fishing pool.\n\n"
-        "If set to maximum, each fish will have a unique check, including a Hyrule Loach which appears only as child, and "
+    mOptionDescriptions[RSK_FISHSANITY_POND_COUNT] =
+        "The number of fish to randomize in the fishing pool.\n\n"
+        "If set to maximum, each fish will have a unique check, including a Hyrule Loach which appears only as child, "
+        "and "
         "uncaught fish will be given a visual indicator to distinguish from already-caught fish.\n\n"
         "Otherwise, any fish caught in the pond will give a reward, until all rewards have been given.";
-    mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT] = "Enabling this will split the fishing pond fish by age, making fishing pond fish grant different rewards as child and adult.\n\n"
+    mOptionDescriptions[RSK_FISHSANITY_AGE_SPLIT] =
+        "Enabling this will split the fishing pond fish by age, making fishing pond fish grant different rewards as "
+        "child and adult.\n\n"
         "If disabled, then the child pond will be shuffled and shared between both ages.\n\n"
         "Note that, as child, there is a second loach available in the pond!";
     mOptionDescriptions[RSK_SHUFFLE_SCRUBS] =
@@ -353,15 +382,14 @@ void Settings::CreateOptionDescriptions() {
         "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers.\n"
         "Fixed - A fixed number.\n"
         "Range - A random point between specific ranges.\n"
-        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen.";
-    mOptionDescriptions[RSK_SCRUBS_PRICES_FIXED_PRICE] =
-        "The price for Scrub checks.";
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if "
+        "that wallet is chosen.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_FIXED_PRICE] = "The price for Scrub checks.";
     mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_1] =
         "The first part of the inclusive range of prices to allow for Scrub checks.";
     mOptionDescriptions[RSK_SCRUBS_PRICES_RANGE_2] =
         "The second part of the inclusive range of prices to allow for Scrub checks.";
-    mOptionDescriptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT] =
-        "The chance for Scrub checks to be free.";
+    mOptionDescriptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT] = "The chance for Scrub checks to be free.";
     mOptionDescriptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT] =
         "The chance for Scrub checks to be purchasable with Child's Wallet (1-99).";
     mOptionDescriptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT] =
@@ -374,8 +402,7 @@ void Settings::CreateOptionDescriptions() {
         "After choosing a price, set it to the affordable amount based on the wallet required.\n\n"
         "Affordable prices per tier: starter = 1, adult = 100, giant = 201, tycoon = 501\n\n"
         "Use this to enable wallet tier locking, but make scrub items not as expensive as they could be.";
-    mOptionDescriptions[RSK_SHUFFLE_BEEHIVES] =
-        "Beehives give a randomized item from the pool when broken.";
+    mOptionDescriptions[RSK_SHUFFLE_BEEHIVES] = "Beehives give a randomized item from the pool when broken.";
     mOptionDescriptions[RSK_SHUFFLE_COWS] =
         "Cows give a randomized item from the pool upon performing Epona's Song in front of them.";
     mOptionDescriptions[RSK_SHUFFLE_MERCHANTS] =
@@ -397,15 +424,14 @@ void Settings::CreateOptionDescriptions() {
         "Balanced - Prices will range between 0 to 300 rupees, favoring lower numbers.\n"
         "Fixed - A fixed number.\n"
         "Range - A random point between specific ranges.\n"
-        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if that wallet is chosen.";
-    mOptionDescriptions[RSK_MERCHANT_PRICES_FIXED_PRICE] =
-        "The price for Merchant checks.";
+        "Set By Wallet - Set weights that decide the choice of each wallet, and get a random price in that range if "
+        "that wallet is chosen.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_FIXED_PRICE] = "The price for Merchant checks.";
     mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_1] =
         "The first part of the inclusive range of prices to allow for Merchant checks.";
     mOptionDescriptions[RSK_MERCHANT_PRICES_RANGE_2] =
         "The second part of the inclusive range of prices to allow for Merchant checks.";
-    mOptionDescriptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT] =
-        "The chance for Merchant checks to be free.";
+    mOptionDescriptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT] = "The chance for Merchant checks to be free.";
     mOptionDescriptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT] =
         "The chance for Merchant checks to be purchasable with Child's Wallet (1-99).";
     mOptionDescriptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT] =
@@ -437,18 +463,29 @@ void Settings::CreateOptionDescriptions() {
         "have collected all 100 Gold Skulltula Tokens.\n"
         "\n"
         "You can still talk to him multiple times to get Huge Rupees.";
-    mOptionDescriptions[RSK_SHUFFLE_FREESTANDING] = "Freestanding rupees & hearts are shuffles to random items. "
-                                              "Freestanding heart pieces and small keys are already shuffled by default.\n"
-                                              "\n"
-                                              "Off - freestanding rupees & hearts will not be shuffled.\n"
-                                              "\n"
-                                              "Dungeons - Only freestanding rupees & hearts that are within dungeons.\n"
-                                              "\n"
-                                              "Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n"
-                                              "\n"
-                                              "All Items - Shuffle all freestanding rupees & hearts.";
-    mOptionDescriptions[RSK_SHUFFLE_FAIRIES] =
-        "Shuffle fairy locations.";
+    mOptionDescriptions[RSK_SHUFFLE_FREESTANDING] =
+        "Freestanding rupees & hearts are shuffles to random items. "
+        "Freestanding heart pieces and small keys are already shuffled by default.\n"
+        "\n"
+        "Off - freestanding rupees & hearts will not be shuffled.\n"
+        "\n"
+        "Dungeons - Only freestanding rupees & hearts that are within dungeons.\n"
+        "\n"
+        "Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n"
+        "\n"
+        "All Items - Shuffle all freestanding rupees & hearts.";
+    mOptionDescriptions[RSK_SHUFFLE_FAIRIES] = "Shuffle fairy locations.";
+    mOptionDescriptions[RSK_SHUFFLE_GRASS] =
+        "Grass/Bushes will drop a randomized item the first time they're cut and collected. "
+        "Grass/Bushes will have a different appearance when they hold a randomized item.\n"
+        "\n"
+        "Off - Grass/Bushes will not be shuffled.\n"
+        "\n"
+        "Dungeons - Only shuffle grass/bushes that are within dungeons.\n"
+        "\n"
+        "Overworld - Only shuffle grass/bushes that are outside of dungeons.\n"
+        "\n"
+        "All Grass/Bushes - Shuffle all grass/bushes.";
     mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS] =
         "Shuffles the location of Spiritual Stones and medallions.\n"
         "Vanilla - Spiritual Stones and medallions will be given from their respective boss.\n"
@@ -558,7 +595,6 @@ void Settings::CreateOptionDescriptions() {
         "\n"
         "Greg as Wildcard - Greg does not change logic, Greg helps obtain GBK, max number of "
         "rewards on slider does not change.";
-    mOptionDescriptions[RSK_CUCCO_COUNT] = "The amount of cuccos needed to claim the reward from Anju the Cucco Lady.";
     mOptionDescriptions[RSK_BIG_POE_COUNT] = "The Poe collector will give a reward for turning in this many Big Poes.";
     mOptionDescriptions[RSK_SKIP_CHILD_STEALTH] =
         "The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.";
@@ -632,7 +668,8 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_GANONDORF_HINT] =
         "Talking to Ganondorf in his boss room will tell you the location of the Light Arrows and Master Sword."
         "If this option is enabled and Ganondorf is reachable without these items, Gossip Stones will never hint the "
-        "appropriate items.";//RANDOTODO make this hint text about no dupe hints a global hint for static hints. Add to navi?
+        "appropriate items."; // RANDOTODO make this hint text about no dupe hints a global hint for static hints. Add
+                              // to navi?
     mOptionDescriptions[RSK_SHEIK_LA_HINT] =
         "Talking to Sheik inside Ganon's Castle will tell you the location of the Light Arrows."
         "If this option is enabled and Sheik is reachable without Light Arrows, Gossip Stones will never hint the "
@@ -641,29 +678,46 @@ void Settings::CreateOptionDescriptions() {
         "Reading the diary of Dampé the gravekeeper as adult will tell you the location of one of the Hookshots.";
     mOptionDescriptions[RSK_GREG_HINT] =
         "Talking to the chest game owner after buying a key will tell you the location of Greg the Green Rupee.";
-    mOptionDescriptions[RSK_LOACH_HINT] =
-        "Talking to the fishing pond owner and asking to talk about something will tell you what's the reward for the Hyrule Loach.";
+    mOptionDescriptions[RSK_LOACH_HINT] = "Talking to the fishing pond owner and asking to talk about something will "
+                                          "tell you what's the reward for the Hyrule Loach.";
     mOptionDescriptions[RSK_SARIA_HINT] = "Talking to Saria either in person or through Saria's Song will tell you the "
                                           "location of a progressive magic meter.";
-    mOptionDescriptions[RSK_FISHING_POLE_HINT] = "Talking to the fishing pond owner without the fishing pole will tell you its location.";
-    mOptionDescriptions[RSK_OOT_HINT] = "Sheik in the Temple of Time will tell you the item and song on the Ocarina of Time.";
+    mOptionDescriptions[RSK_FISHING_POLE_HINT] =
+        "Talking to the fishing pond owner without the fishing pole will tell you its location.";
+    mOptionDescriptions[RSK_OOT_HINT] =
+        "Sheik in the Temple of Time will tell you the item and song on the Ocarina of Time.";
     mOptionDescriptions[RSK_FROGS_HINT] = "Standing near the pedestal for the frogs in Zora's River will tell you the "
                                           "reward for the frogs' Ocarina game.";
-    mOptionDescriptions[RSK_BIGGORON_HINT] = "Talking to Biggoron will tell you the item he will give you in exchange for the Claim Check.";
-    mOptionDescriptions[RSK_BIG_POES_HINT] = "Talking to the Poe Collector in the Market Guardhouse while adult will tell you what you receive for handing in Big Poes.";
-    mOptionDescriptions[RSK_CHICKENS_HINT] = "Talking to Anju as a child will tell you the item she will give you for delivering her cuccos to the pen.";
-    mOptionDescriptions[RSK_MALON_HINT] = "Talking to Malon as adult will tell you the item on \"Link's cow\", the cow you win from beating her time on the Lon Lon Obstacle Course.";
-    mOptionDescriptions[RSK_HBA_HINT] = "Talking to the Horseback Archery gerudo in Gerudo Fortress, or the nearby sign, will tell you what you win for scoring 1000 and 1500 points on Horseback Archery.";
-    mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Playing a warp song will tell you where it leads. (If warp song destinations are vanilla, this is always enabled.)";
+    mOptionDescriptions[RSK_BIGGORON_HINT] =
+        "Talking to Biggoron will tell you the item he will give you in exchange for the Claim Check.";
+    mOptionDescriptions[RSK_BIG_POES_HINT] = "Talking to the Poe Collector in the Market Guardhouse while adult will "
+                                             "tell you what you receive for handing in Big Poes.";
+    mOptionDescriptions[RSK_CHICKENS_HINT] =
+        "Talking to Anju as a child will tell you the item she will give you for delivering her cuccos to the pen.";
+    mOptionDescriptions[RSK_MALON_HINT] = "Talking to Malon as adult will tell you the item on \"Link's cow\", the cow "
+                                          "you win from beating her time on the Lon Lon Obstacle Course.";
+    mOptionDescriptions[RSK_HBA_HINT] =
+        "Talking to the Horseback Archery gerudo in Gerudo Fortress, or the nearby sign, will tell you what you win "
+        "for scoring 1000 and 1500 points on Horseback Archery.";
+    mOptionDescriptions[RSK_WARP_SONG_HINTS] = "Playing a warp song will tell you where it leads. (If warp song "
+                                               "destinations are vanilla, this is always enabled.)";
     mOptionDescriptions[RSK_SCRUB_TEXT_HINT] = "Business scrubs will reveal the identity of what they're selling.";
-    mOptionDescriptions[RSK_MERCHANT_TEXT_HINT] = "Merchants will reveal the identity of what they're selling (Shops are not affected by this setting).";
-    mOptionDescriptions[RSK_KAK_10_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 10 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_KAK_20_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 20 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_KAK_30_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 30 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_KAK_40_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 40 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_KAK_50_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 50 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] = "Talking to the Cursed Resident in the Skulltula House who is saved after 100 tokens will tell you the reward.";
-    mOptionDescriptions[RSK_MASK_SHOP_HINT] = "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre.";
+    mOptionDescriptions[RSK_MERCHANT_TEXT_HINT] =
+        "Merchants will reveal the identity of what they're selling (Shops are not affected by this setting).";
+    mOptionDescriptions[RSK_KAK_10_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 10 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_KAK_20_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 20 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_KAK_30_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 30 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_KAK_40_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 40 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_KAK_50_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 50 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_KAK_100_SKULLS_HINT] =
+        "Talking to the Cursed Resident in the Skulltula House who is saved after 100 tokens will tell you the reward.";
+    mOptionDescriptions[RSK_MASK_SHOP_HINT] =
+        "Reading the mask shop sign will tell you rewards from showing masks at the Deku Theatre.";
     mOptionDescriptions[RSK_FULL_WALLETS] = "Start with a full wallet. All wallet upgrades come filled with rupees.";
     mOptionDescriptions[RSK_BOMBCHU_BAG] =
         "Bombchus require their own bag to be found before use. Without this setting, any Bombchu requirement "
@@ -681,7 +735,8 @@ void Settings::CreateOptionDescriptions() {
     mOptionDescriptions[RSK_BLUE_FIRE_ARROWS] =
         "Ice Arrows act like Blue Fire, making them able to melt red ice. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
-    mOptionDescriptions[RSK_SKELETON_KEY] = "Adds a new item called the \"Skeleton Key\", it unlocks every dungeon door locked by a small key.";
+    mOptionDescriptions[RSK_SKELETON_KEY] =
+        "Adds a new item called the \"Skeleton Key\", it unlocks every dungeon door locked by a small key.";
     mOptionDescriptions[RSK_SUNLIGHT_ARROWS] =
         "Light Arrows can be used to light up the sun switches instead of using the Mirror Shield. "
         "Item placement logic will respect this option, so it might be required to use this to progress.";
@@ -699,7 +754,9 @@ void Settings::CreateOptionDescriptions() {
                                                        "location is reachable. When disabled, only "
                                                        "required items and locations to beat the game "
                                                        "will be guaranteed reachable.";
-    mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS] = "Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its respective soul."
-                "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.";
+    mOptionDescriptions[RSK_SHUFFLE_BOSS_SOULS] =
+        "Shuffles 8 boss souls (one for each blue warp dungeon). A boss will not appear until you collect its "
+        "respective soul."
+        "\n\"On + Ganon\" will also hide Ganon and Ganondorf behind a boss soul.";
 }
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 44831c7c04..abfa8f3b63 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -11,14 +11,13 @@
 #include "3drando/rando_main.hpp"
 #include "3drando/random.hpp"
 #include "soh/ResourceManagerHelpers.h"
-#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "3drando/custom_messages.hpp"
-#include "soh/SohGui/UIWidgets.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include "../custom-message/CustomMessageTypes.h"
 #include "../item-tables/ItemTableManager.h"
-#include "../presets.h"
+#include "../Presets/Presets.h"
 #include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
 #include <stdexcept>
 #include "randomizer_check_objects.h"
@@ -27,9 +26,10 @@
 #include <tuple>
 #include <functional>
 #include "draw.h"
+#include "soh/OTRGlobals.h"
+#include "soh/SohGui/UIWidgets.hpp"
 #include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include <boost_custom/container_hash/hash_32.hpp>
 #include "randomizer_settings_window.h"
 #include "savefile.h"
 #include "entrance.h"
@@ -65,69 +65,326 @@ const std::string Randomizer::NaviRandoMessageTableID = "RandomizerNavi";
 const std::string Randomizer::IceTrapRandoMessageTableID = "RandomizerIceTrap";
 const std::string Randomizer::randoMiscHintsTableID = "RandomizerMiscHints";
 
-static const char* englishRupeeNames[175] = {
-    "[P]",                "Bad RNG Rolls",     "Bananas",           "Beanbean Coins",    "Beans",
-    "Beli",               "Bells",             "Berries",           "Bison Dollars",     "Bitcoin",
-    "Blue Essence",       "Bolts",             "Bones",             "Boondollars",       "Bottle Caps",
-    "Bratwürste",         "Bucks",             "BugFrags",          "Canadian Dollars",  "Cards",
-    "Chaos Orbs",         "Clams",             "Coal",              "Cocoa Beans",       "Coins",
-    "Cookies",            "Copper",            "Cor",               "Cornflakes",        "Credits",
-    "Crimebucks",         "Crystal Shards",    "Cubits",            "Cucumbers",         "Dalmations",
-    "Dampécoin",          "Dark Elixir",       "Darseks",           "Dead Memes",        "Diamonds",
-    "DNA",                "Doge",              "Dogecoin",          "Doll Hairs",        "Dollars",
-    "Dollarydoos",        "Dosh",              "Doubloons",         "Dwarfbucks",        "Elexit",
-    "Emeralds",           "Energon",           "Eris",              "Ether",             "Euro",
-    "Experience",         "Extinction Points", "Floopies",          "Flurbos",           "FPS",
-    "Friends",            "Frog Coins",        "Gald",              "Gekz",              "Gems",
-    "Geo",                "Gil",               "Glimmer",           "Glitches",          "Gold",
-    "Gold Dragons",       "Goober Dollars",    "Green Herbs",       "Greg Siblings",     "Grouses",
-    "Gummybears",         "Hell",              "Hyrule Loaches",    "Ice Traps",         "ISK",
-    "Jiggies",            "KF7 Ammo",          "Kinstones",         "Kremcoins",         "Kroner",
-    "Leaves",             "Lemmings",          "Lien",              "Lira",              "Lumber",
-    "Lungmen Dollars",    "Macca",             "Mana",              "Mann Co. Keys",     "Meat",
-    "Meat Stacks",        "Medaparts",         "Meseta",            "Mesetas",           "Minerals",
-    "Monopoly Money",     "Moons",             "Mora",              "Mumbo Tokens",      "Munny",
-    "Mushrooms",          "Mysteries",         "Neopoints",         "Notes",             "Nuyen",
-    "Orbs",               "Ore",               "Pix",               "Pixels",            "Plastyks",
-    "Platinum",           "Pokédollars",       "Pokémon",           "Poko",              "Pokos",
-    "Potch",              "Pounds",            "Power Pellets",     "Primogems",         "Réals",
-    "Refined Metal",      "Remote Mines",      "Retweets",          "Rhinu",             "Rings",
-    "Riot Points",        "Robux",             "Rubies",            "Rubles",            "Runite Ore",
-    "Rupees",             "Saint Quartz",      "Septims",           "Shekels",           "Shillings",
-    "Silver",             "Simoleons",         "Smackaroos",        "Social Credit",     "Souls",
-    "Spent Casings",      "Spice",             "Spondulicks",       "Spoons",            "Star Bits",
-    "Star Chips",         "Stars",             "Stones of Jordan",  "Store Credit",      "Strawbs",
-    "Studs",              "Super Sea Snails",  "Talent",            "Teef",              "Telecrystals",
-    "Tiberium",           "TokKul",            "Toys",              "Turnips",           "Upvotes",
-    "V-Bucks",            "Vespene Gas",       "Watts",             "Widgets",           "Woolongs",
-    "World Dollars",      "Wumpa Fruit",       "Yen",               "Zenny",             "Zorkmids"
+static const char* englishRupeeNames[188] = {
+    "[P]",
+    "Bad RNG Rolls",
+    "Baht",
+    "Bananas",
+    "Beanbean Coins",
+    "Beans",
+    "Beli",
+    "Bells",
+    "Berries",
+    "Bison Dollars",
+    "Bitcoin",
+    "Blue Essence",
+    "Bolts",
+    "Bones",
+    "Boondollars",
+    "Bottle Caps",
+    "Bratwürste",
+    "Bucks",
+    "BugFrags",
+    "Canadian Dollars",
+    "Cards",
+    "Cents",
+    "Chaos Orbs",
+    "Clams",
+    "Coal",
+    "Cocoa Beans",
+    "Coins",
+    "Cookies",
+    "Copper",
+    "Cor",
+    "Cornflakes",
+    "Credits",
+    "Crimebucks",
+    "Crystal Shards",
+    "Cubits",
+    "Cucumbers",
+    "Dalmations",
+    "Dampécoin",
+    "Dark Elixir",
+    "Darseks",
+    "Dead Memes",
+    "Diamonds",
+    "Dimes",
+    "Dinars",
+    "DNA",
+    "Doll Hairs",
+    "Dollars",
+    "Dollarydoos",
+    "Dosh",
+    "Doubloons",
+    "Drakes",
+    "Dwarfbucks",
+    "ECU",
+    "Elexit",
+    "Emeralds",
+    "Energon",
+    "Eris",
+    "Ether",
+    "Euro",
+    "Experience",
+    "Extinction Points",
+    "Floopies",
+    "Flurbos",
+    "FPS",
+    "Friends",
+    "Frog Coins",
+    "Gald",
+    "Gekz",
+    "Gems",
+    "Geo",
+    "Gil",
+    "Glimmer",
+    "Glitches",
+    "Gold",
+    "Gold Dragons",
+    "Goober Dollars",
+    "Green Herbs",
+    "Greg Siblings",
+    "Grouses",
+    "Gummybears",
+    "Hell",
+    "Hyrule Loaches",
+    "Ice Traps",
+    "ISK",
+    "Jiggies",
+    "KF7 Ammo",
+    "Kinstones",
+    "Kremcoins",
+    "Kronor",
+    "Leaves",
+    "Lemmings",
+    "Lien",
+    "Lira",
+    "Lumber",
+    "Lungmen Dollars",
+    "Macca",
+    "Mana",
+    "Mann Co. Keys",
+    "Meat",
+    "Meat Stacks",
+    "Medaparts",
+    "Meseta",
+    "Mesetas",
+    "Minerals",
+    "Monopoly Money",
+    "Moons",
+    "Mora",
+    "Mumbo Tokens",
+    "Munny",
+    "Mushrooms",
+    "Mysteries",
+    "Naira",
+    "Neopoints",
+    "Nickels",
+    "Notes",
+    "Nuyen",
+    "Orbs",
+    "Ore",
+    "Pence",
+    "Pix",
+    "Pixels",
+    "Plastyks",
+    "Platinum",
+    "Pokédollars",
+    "Pokémon",
+    "Poko",
+    "Pokos",
+    "Potch",
+    "Pounds",
+    "Power Pellets",
+    "Primogems",
+    "Rand",
+    "Reais",
+    "Refined Metal",
+    "Remote Mines",
+    "Retweets",
+    "Rhinu",
+    "Rials",
+    "Rings",
+    "Riot Points",
+    "Riyals",
+    "Robux",
+    "Rubies",
+    "Rubles",
+    "Runite Ore",
+    "Rupees",
+    "Saint Quartz",
+    "Sapphires",
+    "Septims",
+    "Shekels",
+    "Shillings",
+    "Silver",
+    "Simoleons",
+    "Smackaroos",
+    "Social Credit",
+    "Souls",
+    "Spent Casings",
+    "Spice",
+    "Spondulicks",
+    "Spoons",
+    "Star Bits",
+    "Star Chips",
+    "Stars",
+    "Stones of Jordan",
+    "Store Credit",
+    "Strawbs",
+    "Studs",
+    "Super Sea Snails",
+    "Talent",
+    "Teef",
+    "Telecrystals",
+    "Tiberium",
+    "TokKul",
+    "Toys",
+    "Turnips",
+    "Upvotes",
+    "V-Bucks",
+    "Vespene Gas",
+    "Watts",
+    "Widgets",
+    "Won",
+    "Woolongs",
+    "World Dollars",
+    "Wumpa Fruit",
+    "Yen",
+    "Yuan",
+    "Zenny",
+    "Zorkmids",
 };
 
-static const char* germanRupeeNames[65] = {
-    "Bananen",            "Bitcoin",           "Bonbons",           "Bratwürste",        "Brause UFOs",
-    "Brötchen",           "Cent",              "Diamanten",         "Diridari",          "Dogecoin",
-    "ECU",                "Elexit",            "Erz",               "Erzbrocken",        "Euro",
-    "EXP",                "Forint",            "Franken",           "Freunde",           "Gil",
-    "Gold",               "Groschen",          "Gulden",            "Gummibären",        "Heller",
-    "Juwelen",            "Karolin",           "Kartoffeln",        "Kies",              "Knete",
-    "Knochen",            "Kohle",             "Kraniche",          "Kreuzer",           "Kronen",
-    "Kronkorken",         "Kröten",            "Mark",              "Mäuse",             "Monde",
-    "Moorhühner",         "Moos",              "Münzen",            "Penunze",           "Pesa",
-    "Pfandflaschen",      "Pfennig",           "Pfund",             "Pilze",             "Plastiks",
-    "Pokédollar",         "Radieschen",        "Rappen",            "Rubine",            "Saphire",
-    "Schilling",          "Seelen",            "Smaragde",          "Steine",            "Sterne",
-    "Sternis",            "Tael",              "Taler",             "Wagenchips",        "Zenny"
-};
+static const char* germanRupeeNames[114] = { "Baht",
+                                             "Baklava",
+                                             "Bananen",
+                                             "Bitcoin",
+                                             "Bonbons",
+                                             "Bonschen",
+                                             "Brause UFOs",
+                                             "Bucks",
+                                             "Burek",
+                                             "Cent",
+                                             "Chickenwing",
+                                             "Diamanten",
+                                             "Dinar",
+                                             "Diridari",
+                                             "Dogecoin",
+                                             "Dollar",
+                                             "Draken",
+                                             "ECU",
+                                             "Eis",
+                                             "Elexit",
+                                             "Erz",
+                                             "Erzbrocken",
+                                             "Ethereum",
+                                             "Euro",
+                                             "EXP",
+                                             "Fartcoin",
+                                             "Forint",
+                                             "Franken",
+                                             "Freunde",
+                                             "Geister",
+                                             "Gil",
+                                             "Gold",
+                                             "Groschen",
+                                             "Gulden",
+                                             "Haribo",
+                                             "Heller",
+                                             "Juwelen",
+                                             "Kapseln",
+                                             "Karolin",
+                                             "Kartoffeln",
+                                             "Keks",
+                                             "Kies",
+                                             "Knete",
+                                             "Knochen",
+                                             "Knuspertaler",
+                                             "Kohle",
+                                             "Kraniche",
+                                             "Kreuzer",
+                                             "Kronen",
+                                             "Kronkorken",
+                                             "Lauchcoins",
+                                             "Lira",
+                                             "Mana",
+                                             "Mark",
+                                             "Monde",
+                                             "Moos",
+                                             "Naira",
+                                             "Nugget",
+                                             "Penunze",
+                                             "Pesa",
+                                             "Peso",
+                                             "Pfandflaschen",
+                                             "Pfennig",
+                                             "Pfund",
+                                             "Pillen",
+                                             "Pilze",
+                                             "Plastiks",
+                                             "Pok\x96"
+                                             "dollar",
+                                             "Poster",
+                                             "Puzzle",
+                                             "Radieschen",
+                                             "Rand",
+                                             "Rappen",
+                                             "Real",
+                                             "Rial",
+                                             "Riesennugget",
+                                             "Riyal",
+                                             "Rubine",
+                                             "Rupien",
+                                             "Saphire",
+                                             "Schilling",
+                                             "Schokobon",
+                                             "Seelen",
+                                             "Septime",
+                                             "Shitcoin",
+                                             "Smaragde",
+                                             "Solana",
+                                             "Sosis",
+                                             "Steine",
+                                             "Sterne",
+                                             "Sternis",
+                                             "Tael",
+                                             "Taler",
+                                             "Tokens",
+                                             "Wagenchips",
+                                             "Won",
+                                             "Wumpas",
+                                             "Yen",
+                                             "Yuan",
+                                             "Zenny",
+                                             "M\x93use",
+                                             "M\x9Enzen",
+                                             "Kr\x9Bten",
+                                             "D\x9Bner",
+                                             "W\x9Erstchen",
+                                             "Kn\x9B"
+                                             "del",
+                                             "R\x9Bsti",
+                                             "H\x9Brnli",
+                                             "R\x9E"
+                                             "ebli",
+                                             "K\x9B"
+                                             "fte",
+                                             "Bratw\x9E"
+                                             "rste",
+                                             "Br\x98"
+                                             "tchen",
+                                             "Gummib\x93"
+                                             "ren",
+                                             "Moorh\x9E"
+                                             "hner" };
 
-static const char* frenchRupeeNames[40] = {
-    "Anneaux",            "Baguettes",         "Balles",            "Bananes",           "Bitcoin",
-    "Blés",               "Bling",             "Capsules",          "Centimes",          "Champignons",
-    "Clochettes",         "Crédits",           "Croissants",        "Diamants",          "Dogecoin",
-    "Dollars",            "Émeraudes",         "Éthers",            "Étoiles",           "Euros",
-    "Florens",            "Francs",            "Galds",             "Gils",              "Grouses",
-    "Halos",              "Joyaux",            "Lunes",             "Mailles",           "Munnies",
-    "Orbes",              "Orens",             "Pépètes",           "Pièces",            "Plastyks",
-    "Pokédollars",        "Pokémon",           "Radis",             "Rubis",             "Zennies"
+static const char* frenchRupeeNames[39] = {
+    "Anneaux",  "Baguettes",   "Balles",      "Bananes", "Bitcoin",    "Blés",     "Bling",   "Capsules",
+    "Centimes", "Champignons", "Clochettes",  "Crédits", "Croissants", "Diamants", "Dollars", "Émeraudes",
+    "Éthers",   "Étoiles",     "Euros",       "Florens", "Francs",     "Galds",    "Gils",    "Grouses",
+    "Halos",    "Joyaux",      "Lunes",       "Mailles", "Munnies",    "Orbes",    "Orens",   "Pépètes",
+    "Pièces",   "Plastyks",    "Pokédollars", "Pokémon", "Radis",      "Rubis",    "Zennies",
 };
 
 Randomizer::Randomizer() {
@@ -166,7 +423,7 @@ std::unordered_map<std::string, SceneID> spoilerFileDungeonToScene = {
     { "Ganon's Castle", SCENE_INSIDE_GANONS_CASTLE }
 };
 
-std::unordered_map<s16, s16> getItemIdToItemId = { 
+std::unordered_map<s16, s16> getItemIdToItemId = {
     { GI_BOW, ITEM_BOW },
     { GI_ARROW_FIRE, ITEM_ARROW_FIRE },
     { GI_DINS_FIRE, ITEM_DINS_FIRE },
@@ -205,26 +462,42 @@ std::unordered_map<s16, s16> getItemIdToItemId = {
     { GI_PRESCRIPTION, ITEM_PRESCRIPTION },
     { GI_FROG, ITEM_FROG },
     { GI_EYEDROPS, ITEM_EYEDROPS },
-    { GI_CLAIM_CHECK, ITEM_CLAIM_CHECK } 
+    { GI_CLAIM_CHECK, ITEM_CLAIM_CHECK },
 };
 
+#ifdef _MSC_VER
 #pragma optimize("", off)
+#else
 #pragma GCC push_options
-#pragma GCC optimize ("O0")
+#pragma GCC optimize("O0")
+#endif
 bool Randomizer::SpoilerFileExists(const char* spoilerFileName) {
     if (strcmp(spoilerFileName, "") != 0) {
         std::ifstream spoilerFileStream(SohUtils::Sanitize(spoilerFileName));
-        if (!spoilerFileStream) {
-            return false;
-        } else {
-            return true;
+        if (spoilerFileStream) {
+            nlohmann::json contents;
+            spoilerFileStream >> contents;
+            spoilerFileStream.close();
+            if (contents.contains("version") &&
+                strcmp(std::string(contents["version"]).c_str(), (char*)gBuildVersion) == 0) {
+                return true;
+            } else {
+                SohGui::RegisterPopup(
+                    "Old Spoiler Version",
+                    "The spoiler file located at\n" + std::string(spoilerFileName) +
+                        "\nwas made by a version that doesn't match the currently running version.\n" +
+                        "Loading for this file has been cancelled.");
+            }
         }
     }
 
     return false;
 }
-#pragma GCC pop_options
+#ifdef _MSC_VER
 #pragma optimize("", on)
+#else
+#pragma GCC pop_options
+#endif
 
 void Randomizer::LoadHintMessages() {
     auto ctx = Rando::Context::GetInstance();
@@ -232,65 +505,69 @@ void Randomizer::LoadHintMessages() {
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::hintMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::hintMessageTableID);
 
-    //Extra Hints
+    // Extra Hints
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::randoMiscHintsTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::randoMiscHintsTableID);
 
-
     // Bow Shooting Gallery reminder
-    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW,
         CustomMessage("Come back when you have your own bow and you'll get a #different prize#!",
-        "Komm wieder sobald Du Deinen eigenen Bogen hast, um einen #speziellen Preis# zu erhalten!",
-        "J'aurai #une autre récompense# pour toi lorsque tu auras ton propre arc.",
-        {QM_RED}));
+                      "Komm wieder sobald Du Deinen eigenen Bogen hast, um einen #speziellen Preis# zu erhalten!",
+                      "J'aurai #une autre récompense# pour toi lorsque tu auras ton propre arc.", { QM_RED }));
 
     // Warp Song Mysterious text
-    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST,
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST,
         CustomMessage("Warp to&#a mysterious place?#&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
-            "Zu&#einem mysteriösen Ort#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK&No#",
-            "Se téléporter vers&#un endroit mystérieux#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK!&Non#",
-            {QM_RED, QM_GREEN}));
+                      "Das Ziel ist&#ein mysteriöser Ort#!&" + CustomMessages::TWO_WAY_CHOICE() + "#Ja!&Nein!#",
+                      "Se téléporter vers&#un endroit mystérieux#?&" + CustomMessages::TWO_WAY_CHOICE() + "#OK!&Non#",
+                      { QM_RED, QM_GREEN }));
 
     // Lake Hylia water level system
-    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN,
-        CustomMessage("Water level control system.&Keep away!",
-            "Wasserstand Kontrollsystem&Finger weg!",
-            "Système de contrôle du niveau&d'eau.&Ne pas toucher!"));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI,
-        CustomMessage("%cThis switch is rustier than you think.^%cSomething must be wrong with the pipe system in the %bWater Temple%c.",
-            "%cDieser Schalter scheint rostiger zu sein als er aussieht.^%cEtwas muss mit dem Leitungssystem im %bWassertempel%c nicht stimmen.",
-            "%cCet interrupteur est très rouillé.^%cIl doit y avoir un problème avec la tuyauterie du %bTemple de l'Eau%c."));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN,
+        CustomMessage("Water level control system.&Keep away!", "Wasserstand Kontrollsystem&Finger weg!",
+                      "Système de contrôle du niveau&d'eau.&Ne pas toucher!"));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::hintMessageTableID, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI,
+        CustomMessage("%cThis switch is rustier than you think.^%cSomething must be wrong with the pipe system in the "
+                      "%bWater Temple%c.",
+                      "%cDieser Schalter scheint rostiger zu sein als er aussieht.^%cEtwas muss mit dem Leitungssystem "
+                      "im %bWassertempel%c nicht stimmen.",
+                      "%cCet interrupteur est très rouillé.^%cIl doit y avoir un problème avec la tuyauterie du "
+                      "%bTemple de l'Eau%c."));
 }
 
 // Reference soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
 std::unordered_map<RandomizerGet, EnGirlAShopItem> randomizerGetToEnGirlShopItem = {
-    { RG_BUY_DEKU_NUTS_5,   SI_DEKU_NUTS_5 },
-    { RG_BUY_ARROWS_30,     SI_ARROWS_30 },
-    { RG_BUY_ARROWS_50,     SI_ARROWS_50 },
-    { RG_BUY_BOMBS_525,     SI_BOMBS_5_R25 },
-    { RG_BUY_DEKU_NUTS_10,  SI_DEKU_NUTS_10 },
-    { RG_BUY_DEKU_STICK_1,  SI_DEKU_STICK },
-    { RG_BUY_BOMBS_10,      SI_BOMBS_10 },
-    { RG_BUY_FISH,          SI_FISH },
+    { RG_BUY_DEKU_NUTS_5, SI_DEKU_NUTS_5 },
+    { RG_BUY_ARROWS_30, SI_ARROWS_30 },
+    { RG_BUY_ARROWS_50, SI_ARROWS_50 },
+    { RG_BUY_BOMBS_525, SI_BOMBS_5_R25 },
+    { RG_BUY_DEKU_NUTS_10, SI_DEKU_NUTS_10 },
+    { RG_BUY_DEKU_STICK_1, SI_DEKU_STICK },
+    { RG_BUY_BOMBS_10, SI_BOMBS_10 },
+    { RG_BUY_FISH, SI_FISH },
     { RG_BUY_RED_POTION_30, SI_RED_POTION_R30 },
-    { RG_BUY_GREEN_POTION,  SI_GREEN_POTION },
-    { RG_BUY_BLUE_POTION,   SI_BLUE_POTION },
+    { RG_BUY_GREEN_POTION, SI_GREEN_POTION },
+    { RG_BUY_BLUE_POTION, SI_BLUE_POTION },
     { RG_BUY_HYLIAN_SHIELD, SI_HYLIAN_SHIELD },
-    { RG_BUY_DEKU_SHIELD,   SI_DEKU_SHIELD },
-    { RG_BUY_GORON_TUNIC,   SI_GORON_TUNIC },
-    { RG_BUY_ZORA_TUNIC,    SI_ZORA_TUNIC },
-    { RG_BUY_HEART,         SI_RECOVERY_HEART },
-    { RG_BUY_BOMBCHUS_10,   SI_BOMBCHU_10_1 },
-    { RG_BUY_BOMBCHUS_20,   SI_BOMBCHU_20_1 },
+    { RG_BUY_DEKU_SHIELD, SI_DEKU_SHIELD },
+    { RG_BUY_GORON_TUNIC, SI_GORON_TUNIC },
+    { RG_BUY_ZORA_TUNIC, SI_ZORA_TUNIC },
+    { RG_BUY_HEART, SI_RECOVERY_HEART },
+    { RG_BUY_BOMBCHUS_10, SI_BOMBCHU_10_1 },
+    { RG_BUY_BOMBCHUS_20, SI_BOMBCHU_20_1 },
     { RG_BUY_DEKU_SEEDS_30, SI_DEKU_SEEDS_30 },
-    { RG_BUY_BLUE_FIRE,     SI_BLUE_FIRE },
-    { RG_BUY_BOTTLE_BUG,    SI_BUGS },
-    { RG_BUY_POE,           SI_POE },
+    { RG_BUY_BLUE_FIRE, SI_BLUE_FIRE },
+    { RG_BUY_BOTTLE_BUG, SI_BUGS },
+    { RG_BUY_POE, SI_POE },
     { RG_BUY_FAIRYS_SPIRIT, SI_FAIRY },
-    { RG_BUY_ARROWS_10,     SI_ARROWS_10 },
-    { RG_BUY_BOMBS_20,      SI_BOMBS_20 },
-    { RG_BUY_BOMBS_30,      SI_BOMBS_30 },
-    { RG_BUY_BOMBS_535,     SI_BOMBS_5_R35 },
+    { RG_BUY_ARROWS_10, SI_ARROWS_10 },
+    { RG_BUY_BOMBS_20, SI_BOMBS_20 },
+    { RG_BUY_BOMBS_30, SI_BOMBS_30 },
+    { RG_BUY_BOMBS_535, SI_BOMBS_5_R35 },
     { RG_BUY_RED_POTION_40, SI_RED_POTION_R40 },
     { RG_BUY_RED_POTION_50, SI_RED_POTION_R50 },
 };
@@ -300,112 +577,139 @@ void Randomizer::LoadMerchantMessages() {
     CustomMessageManager::Instance->ClearMessageTable(Randomizer::merchantMessageTableID);
     CustomMessageManager::Instance->AddCustomMessageTable(Randomizer::merchantMessageTableID);
 
-    // Prices have a chance of being 0, and the "sell" message below doesn't really make sense for a free item, so adding a "free" variation here
-    CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will give you a #[[1]]#!&Please, take it!\x07\x10\xA3",
-            "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch dafür, dass Du mich verschont hast, werde ich Dir einen #[[1]]# geben!\x07\x10\xA3",
-            "\x12\x38\x82" "J'me rends! Laisse-moi partir et en échange, je te donne un #[[1]]#! Vas-y prends le!\x07\x10\xA3",
-            {QM_GREEN}));
-    CustomMessageManager::Instance->CreateMessage(Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM,
-        CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will sell you a #[[1]]#! #[[2]] Rupees# it is!\x07\x10\xA3",
-            "\x12\x38\x82" "Ich gebe auf! Ich verkaufe Dir einen #[[1]]# für #[[2]] Rubine#!\x07\x10\xA3",
-            "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter un #[[1]]#? Ça fera #[[2]] Rubis#!\x07\x10\xA3",
-            {QM_GREEN, QM_YELLOW}));
+    // Prices have a chance of being 0, and the "sell" message below doesn't really make sense for a free item, so
+    // adding a "free" variation here
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM_FREE,
+        CustomMessage(
+            "\x12\x38\x82"
+            "All right! You win! In return for sparing me, I will give you a #[[1]]#!&Please, take it!\x07\x10\xA3",
+            "\x12\x38\x82"
+            "In Ordnung! Du gewinnst! Im Austausch dafür, dass Du mich verschont hast, werde ich Dir #[[1]]# "
+            "geben!\x07\x10\xA3",
+            "\x12\x38\x82"
+            "J'me rends! Laisse-moi partir et en échange, je te donne un #[[1]]#! Vas-y prends le!\x07\x10\xA3",
+            { QM_GREEN }));
+    CustomMessageManager::Instance->CreateMessage(
+        Randomizer::merchantMessageTableID, TEXT_SCRUB_RANDOM,
+        CustomMessage("\x12\x38\x82"
+                      "All right! You win! In return for sparing me, I will sell you a #[[1]]#! #[[2]] Rupees# it "
+                      "is!\x07\x10\xA3",
+                      "\x12\x38\x82"
+                      "Ich gebe auf! Ich verkaufe Dir #[[1]]# für #[[2]] Rubine#!\x07\x10\xA3",
+                      "\x12\x38\x82"
+                      "J'abandonne! Tu veux bien m'acheter un #[[1]]#? Ça fera #[[2]] Rubis#!\x07\x10\xA3",
+                      { QM_GREEN, QM_YELLOW }));
 
-    //Carpet Salesman
+    // Carpet Salesman
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_ARMS_DEALER,
         CustomMessage("Finally! Now I can go back to being an #arms dealer#!",
-            /*german*/"Endlich! Schon bald kann ich wieder #Krabbelminen-Händler# sein!",
-            /*french*/"Squalala! Je vais enfin pouvoir #prendre des vacances#!",
-            {QM_RED}));
+                      /*german*/ "Endlich! Schon bald kann ich wieder #Krabbelminen-Händler# sein!",
+                      /*french*/ "Squalala! Je vais enfin pouvoir #prendre des vacances#!", { QM_RED }));
 
     // Each shop item has two messages, one for when the cursor is over it, and one for when you select it and are
     // prompted buy/don't buy
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM,
-        CustomMessage("\x08#[[1]]#  #[[2]]_Rupees#&Special deal! #ONE LEFT#!&Get it while it lasts!\x0A\x02",
-            "\x08#[[1]]#  #[[2]]_Rubine#&Sonderangebot! #NUR NOCH EINES VERFÜGBAR#!&Beeilen Sie sich!\x0A\x02",
-            "\x08#[[1]]#  #[[2]]_Rubis#&Offre spéciale! #DERNIER EN STOCK#!&Faites vite!\x0A\x02",
-            {QM_GREEN, QM_YELLOW, QM_RED}));
+        CustomMessage(
+            "\x08#[[1]]#  #[[2]]_Rupees#&Special deal! #ONE LEFT#!&Get it while it lasts!\x0A\x02",
+            "\x08#[[1]]#  #[[2]]_Rubine#&#NUR EIN EXEMPLAR AUF LAGER!#&Schlag zu solange Du noch kannst!\x0A\x02",
+            "\x08#[[1]]#  #[[2]]_Rubis#&#DERNIER EN STOCK#!&Faites vite!\x0A\x02", { QM_GREEN, QM_YELLOW, QM_RED }));
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM,
         CustomMessage("\x08#[[1]]#  #[[2]]_Rupees#\x09\x1B#Buy&Don't buy#\x09\x02",
-            "\x08#[[1]]#  #[[2]]_Rubine#\x09\x1B#Kaufen&Nicht kaufen#\x09\x02",
-            "\x08#[[1]]#  #[[2]]_Rubis#\x09\x1B#Acheter&Ne pas acheter#\x09\x02",
-            {QM_GREEN, QM_YELLOW, QM_GREEN}));
-                      
+                      "\x08#[[1]]#  #[[2]]_Rubine#\x09\x1B#Kaufen&Nicht kaufen#\x09\x02",
+                      "\x08#[[1]]#  #[[2]]_Rubis#\x09\x1B#Acheter&Ne pas acheter#\x09\x02",
+                      { QM_GREEN, QM_YELLOW, QM_GREEN }));
+
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_10,
-        CustomMessage("I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
-                      "beans!^Anyway, want to buy #[[1]]# for #[[2]] Rupees#?\x1B#Yes&No#",
-           /*german*/ "Möchten Sie #[[1]]# für #[[2]] Rubine# kaufen?\x1B#Ja&Nein#",
-           /*french*/ "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
-                      "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #[[2]] Rubis#?\x1B#Oui&Non#",
-                      {QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN}));
+        CustomMessage(
+            "I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
+            "beans!^Anyway, want to buy #[[1]]# for #[[2]] Rupees#?\x1B#Yes&No#",
+            /*german*/
+            "Ich habe versucht ein Vertreter für #Wundererbsen# zu werden, doch meine Verhandlungskünste waren nicht "
+            "die Bohne wert. Ach egal...^"
+            "Willst Du #[[1]]#?&Deine letzte Chance!^Mein Spezial-Preis!&#[[2]] Rubine#! Greif zu!\x1B#Ja!&Nein!#",
+            /*french*/
+            "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
+            "me courait sur le haricot...^Enfin bref, ça te dirait de m'acheter #[[1]]# pour #[[2]] "
+            "Rubis#?\x1B#Oui&Non#",
+            { QM_RED, QM_GREEN, QM_YELLOW, QM_GREEN }));
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100,
-        CustomMessage("I never thought I'd say this, but I'm selling the last #Magic Bean#.^#99 Rupees#, no less.\x1B#Yes&No#",
-                      "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^#Wundererbse# für #99 Rubine#.\x1B&#Ja&Nein#",
-                      "Je te vends mon dernier #Haricot&magique# pour #99 Rubis#.\x1B&#AcheterNe pas acheter#",
-                      {QM_RED, QM_YELLOW, QM_GREEN}));
+        CustomMessage(
+            "I never thought I'd say this, but I'm selling the last #Magic Bean#.^#99 Rupees#, no less.\x1B#Yes&No#",
+            "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^#Wundererbse# für #99 "
+            "Rubine#.\x1B&#Ja!&Nein!#",
+            "Je te vends mon dernier #Haricot&magique# pour #99 Rubis#.\x1B&#AcheterNe pas acheter#",
+            { QM_RED, QM_YELLOW, QM_GREEN }));
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_MEDIGORON,
         CustomMessage("How about buying #[[1]]# for #[[2]] Rupees#?\x1B#Buy&Don't buy#",
-           /*german*/ "Möchtest Du #[[1]]# für #[[2]] Rubine# kaufen?\x1B#Klar!&Nie im Leben!#",
-           /*french*/ "Veux-tu acheter #[[1]]# pour #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
-                       {QM_GREEN, QM_YELLOW, QM_GREEN}));
-       /*spanish*/ // ¿Me compras #[[1]]# por #[[2]] rupias#?\x1B#Comprar&No comprar#
+                      /*german*/ "Möchtest Du #[[1]]#?^Für #[[2]] Rubine#!\x1B#Klar!&Nie im Leben!#",
+                      /*french*/ "Veux-tu acheter #[[1]]# pour #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
+                      { QM_GREEN, QM_YELLOW, QM_GREEN }));
+    /*spanish*/ // ¿Me compras #[[1]]# por #[[2]] rupias#?\x1B#Comprar&No comprar#
+
+    CustomMessage firstCarpet = CustomMessage(
+        "Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
+        /*german*/
+        "Willkommen!^Ich verkaufe hier allerlei Kuriositäten. Stets sonderliche und seltene Ware aus "
+        "aller Welt für jedermann. Das heutige Angebot...^",
+        /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^");
+    /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La
+                // oferta de hoy es...^#¡
 
-    CustomMessage firstCarpet = CustomMessage("Welcome!^I am selling stuff, strange and rare, from all over the world to everybody. Today's special is...^",
-                                   /*german*/ "Sei gegrüßt!^Ich verkaufe allerlei Kuriositäten. Stets sonderliche und seltene Ware aus "
-                                              "aller Welt für jedermann. Das heutige Angebot bleibt...^",
-                                   /*french*/ "Bienvenue!^Je vends des objets rares et merveilleux du monde entier. En spécial aujourd'hui...^");
-                               /*spanish*/ // ¡Acércate!^Vendo productos extraños y difíciles de encontrar... De todo el mundo a todo el mundo. La oferta de hoy es...^#¡
-    
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_MYSTERIOUS,
         firstCarpet +
-        CustomMessage("Terrifying! I won't tell you what it is until I see the #money#...^How about #[[2]] Rupees#?&&"
-                                    "\x1B#Buy&Don't buy#",
-                        /*german*/ "Furchterregend, oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #[[2]] Rubinen#?&&"
-                                    "\x1B#Aber sicher!&Ich bin weg!#",
-                        /*french*/ "Terrible! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #[[2]] "
-                                    "rubis#?&&\x1B#Acheter&Ne pas acheter#",
-                                    {QM_RED, QM_YELLOW, QM_GREEN}));
-                    /*spanish*/ // ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#[[2]] rupias#, ¿qué te parece?&&"
-                                // "\x1B#Comprar&No comprar#
+            CustomMessage(
+                "Terrifying! I won't tell you what it is until I see the #money#...^How about #[[2]] Rupees#?&&"
+                "\x1B#Buy&Don't buy#",
+                /*german*/
+                "Furchterregend, oder? Ich erzähle Euch mehr, wenn ich #Geld# sehe...^Wie wär's mit #[[2]] Rubinen#?&&"
+                "\x1B#Aber sicher!&Ich bin weg!#",
+                /*french*/
+                "Terrible! Mais montre tes #rubis# avant que je te dise ce que c'est...^Disons #[[2]] "
+                "rubis#?&&\x1B#Acheter&Ne pas acheter#",
+                { QM_RED, QM_YELLOW, QM_GREEN }));
+    /*spanish*/ // ¡Terrorífico! No te revelaré su nombre hasta que vea el #dinero#...^#[[2]] rupias#, ¿qué te
+                // parece?&&"
+                // "\x1B#Comprar&No comprar#
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1,
         firstCarpet +
-        CustomMessage("#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
-                       "How about #[[2]] Rupees#?\x1B#Buy&Don't buy#",
-           /*german*/ "#[[1]]#! Ich kann versichern, es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde Dich doch "
-                       "nicht #anlügen#, oder?^Wie wär's mit #[[2]] Rubinen#?\x1B#Aber sicher!&Ich bin weg!#",
-           /*french*/ "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #[[2]] "
-                       "rubis#?\x1B#Acheter&Ne pas acheter#",
-                       {QM_GREEN, QM_RED, QM_YELLOW}));
+            CustomMessage(
+                "#[[1]]!# It's real, I promise! A lonely man such as myself wouldn't #lie# to you, hmm?^"
+                "How about #[[2]] Rupees#?\x1B#Buy&Don't buy#",
+                /*german*/
+                "#[[1]]#! Ich kann versichern, es ist ein aufrichtiges Angebot!^Ein einsamer Mann wie ich würde Euch "
+                "doch "
+                "nicht #anlügen#, oder?^Wie wär's mit #[[2]] Rubinen#?\x1B#Aber sicher!&Ich bin weg!#",
+                /*french*/
+                "#[[1]]!# C'est vrai! J'te jure! Un gars comme moi ne te #mentirai# pas tu ne crois pas?^Disons #[[2]] "
+                "rubis#?\x1B#Acheter&Ne pas acheter#",
+                { QM_GREEN, QM_RED, QM_YELLOW }));
 
     CustomMessageManager::Instance->CreateMessage(
         Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP,
         CustomMessage("#[[1]]#! How about #[[2]] Rupees#?\x1B#Buy&Don't buy#",
-           /*german*/ "#[[1]]#! Sagen wir #[[2]] Rubine#?\x1B#Gerne!&Auf keinen Fall!#",
-           /*french*/ "#[[1]]#! Que dis-tu de #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
-                       {QM_GREEN, QM_YELLOW, QM_GREEN}, {true}));
-           // /*spanish*/#[[1]]#. Vendo por #[[2]] rupias#.&\x1B#Comprar&No comprar#
+                      /*german*/ "#[[1]]#! Sagen wir #[[2]] Rubine#?\x1B#Gerne!&Auf keinen Fall!#",
+                      /*french*/ "#[[1]]#! Que dis-tu de #[[2]] rubis#?\x1B#Acheter&Ne pas acheter#",
+                      { QM_GREEN, QM_YELLOW, QM_GREEN }, { true }));
+    // /*spanish*/#[[1]]#. Vendo por #[[2]] rupias#.&\x1B#Comprar&No comprar#
 }
 
 std::map<s32, TrialKey> trialFlagToTrialKey = {
-    { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, TK_LIGHT_TRIAL, },
-    { EVENTCHKINF_COMPLETED_FOREST_TRIAL, TK_FOREST_TRIAL, },
-    { EVENTCHKINF_COMPLETED_FIRE_TRIAL, TK_FIRE_TRIAL, },
-    { EVENTCHKINF_COMPLETED_WATER_TRIAL, TK_WATER_TRIAL, },
-    { EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, TK_SPIRIT_TRIAL, },
-    { EVENTCHKINF_COMPLETED_SHADOW_TRIAL, TK_SHADOW_TRIAL, }
+    { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, TK_LIGHT_TRIAL },   { EVENTCHKINF_COMPLETED_FOREST_TRIAL, TK_FOREST_TRIAL },
+    { EVENTCHKINF_COMPLETED_FIRE_TRIAL, TK_FIRE_TRIAL },     { EVENTCHKINF_COMPLETED_WATER_TRIAL, TK_WATER_TRIAL },
+    { EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, TK_SPIRIT_TRIAL }, { EVENTCHKINF_COMPLETED_SHADOW_TRIAL, TK_SHADOW_TRIAL },
 };
 
 bool Randomizer::IsTrialRequired(s32 trialFlag) {
@@ -455,9 +759,11 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
             return !CHECK_OWNED_EQUIP(EQUIP_TYPE_SHIELD, EQUIP_INV_SHIELD_DEKU) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_HYLIAN_SHIELD:
         case RG_BUY_HYLIAN_SHIELD:
-            return !CHECK_OWNED_EQUIP(EQUIP_TYPE_SHIELD, EQUIP_INV_SHIELD_HYLIAN) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return !CHECK_OWNED_EQUIP(EQUIP_TYPE_SHIELD, EQUIP_INV_SHIELD_HYLIAN) ? CAN_OBTAIN
+                                                                                  : CANT_OBTAIN_ALREADY_HAVE;
         case RG_MIRROR_SHIELD:
-            return !CHECK_OWNED_EQUIP(EQUIP_TYPE_SHIELD, EQUIP_INV_SHIELD_MIRROR) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return !CHECK_OWNED_EQUIP(EQUIP_TYPE_SHIELD, EQUIP_INV_SHIELD_MIRROR) ? CAN_OBTAIN
+                                                                                  : CANT_OBTAIN_ALREADY_HAVE;
         case RG_GORON_TUNIC:
         case RG_BUY_GORON_TUNIC:
             return !CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
@@ -471,27 +777,34 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
 
         // Inventory Items
         case RG_PROGRESSIVE_STICK_UPGRADE:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (CUR_UPG_VALUE(UPG_STICKS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_STICK_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE
+                                                                                      : CAN_OBTAIN)
+                       : (CUR_UPG_VALUE(UPG_STICKS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_STICK_1:
         case RG_BUY_DEKU_STICK_1:
-            return CUR_UPG_VALUE(UPG_STICKS) || !OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Get()
-                 ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
+            return CUR_UPG_VALUE(UPG_STICKS) ||
+                           !OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG).Get()
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_NUT_UPGRADE:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (CUR_UPG_VALUE(UPG_NUTS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_NUT_UPGRADE) ? CANT_OBTAIN_ALREADY_HAVE
+                                                                                    : CAN_OBTAIN)
+                       : (CUR_UPG_VALUE(UPG_NUTS) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_NUTS_5:
         case RG_DEKU_NUTS_10:
         case RG_BUY_DEKU_NUTS_5:
         case RG_BUY_DEKU_NUTS_10:
-            return CUR_UPG_VALUE(UPG_NUTS) || !OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Get()
-                ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
+            return CUR_UPG_VALUE(UPG_NUTS) ||
+                           !OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG).Get()
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_BOMB_BAG:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (CUR_UPG_VALUE(UPG_BOMB_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BOMB_BAG) ? CANT_OBTAIN_ALREADY_HAVE
+                                                                                 : CAN_OBTAIN)
+                       : (CUR_UPG_VALUE(UPG_BOMB_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_BOMBS_5:
         case RG_BOMBS_10:
         case RG_BOMBS_20:
@@ -502,9 +815,9 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BUY_BOMBS_30:
             return CUR_UPG_VALUE(UPG_BOMB_BAG) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_BOW:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (CUR_UPG_VALUE(UPG_QUIVER) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_QUIVER) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN)
+                       : (CUR_UPG_VALUE(UPG_QUIVER) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_ARROWS_5:
         case RG_ARROWS_10:
         case RG_ARROWS_30:
@@ -513,9 +826,10 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BUY_ARROWS_50:
             return CUR_UPG_VALUE(UPG_QUIVER) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
         case RG_PROGRESSIVE_SLINGSHOT:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (CUR_UPG_VALUE(UPG_BULLET_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_BULLET_BAG) ? CANT_OBTAIN_ALREADY_HAVE
+                                                                                   : CAN_OBTAIN)
+                       : (CUR_UPG_VALUE(UPG_BULLET_BAG) < 3 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_DEKU_SEEDS_30:
         case RG_BUY_DEKU_SEEDS_30:
             return CUR_UPG_VALUE(UPG_BULLET_BAG) ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
@@ -533,7 +847,8 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_BOMBCHU_20:
         case RG_BUY_BOMBCHUS_10:
         case RG_BUY_BOMBCHUS_20:
-        case RG_PROGRESSIVE_BOMBCHUS: //RANDOTODO Do we want bombchu refills to exist seperatly from bombchu bags? If so, this needs changing.
+        case RG_PROGRESSIVE_BOMBCHUS: // RANDOTODO Do we want bombchu refills to exist seperatly from bombchu bags? If
+                                      // so, this needs changing.
             return CAN_OBTAIN;
         case RG_PROGRESSIVE_HOOKSHOT:
             switch (INV_CONTENT(ITEM_HOOKSHOT)) {
@@ -634,9 +949,10 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_PROGRESSIVE_MAGIC_METER:
         case RG_MAGIC_SINGLE:
         case RG_MAGIC_DOUBLE:
-            return infiniteUpgrades != RO_INF_UPGRADES_OFF ?
-                (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER) ? CANT_OBTAIN_ALREADY_HAVE : CAN_OBTAIN) :
-                (gSaveContext.magicLevel < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
+            return infiniteUpgrades != RO_INF_UPGRADES_OFF
+                       ? (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER) ? CANT_OBTAIN_ALREADY_HAVE
+                                                                                    : CAN_OBTAIN)
+                       : (gSaveContext.magicLevel < 2 ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE);
         case RG_FISHING_POLE:
             return !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
 
@@ -704,7 +1020,8 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_SHADOW_TEMPLE_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, SCENE_SHADOW_TEMPLE) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_BOTTOM_OF_THE_WELL_COMPASS:
-            return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, SCENE_BOTTOM_OF_THE_WELL) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, SCENE_BOTTOM_OF_THE_WELL) ? CAN_OBTAIN
+                                                                                  : CANT_OBTAIN_ALREADY_HAVE;
         case RG_ICE_CAVERN_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, SCENE_ICE_CAVERN) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_FOREST_TEMPLE_BOSS_KEY:
@@ -720,25 +1037,46 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
         case RG_GANONS_CASTLE_BOSS_KEY:
             return !CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
         case RG_FOREST_TEMPLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_FOREST_TEMPLE] < FOREST_TEMPLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_FOREST_TEMPLE] < FOREST_TEMPLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_FIRE_TEMPLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_FIRE_TEMPLE] < FIRE_TEMPLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_FIRE_TEMPLE] < FIRE_TEMPLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_WATER_TEMPLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_WATER_TEMPLE] < WATER_TEMPLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_WATER_TEMPLE] < WATER_TEMPLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_SPIRIT_TEMPLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_SPIRIT_TEMPLE] < SPIRIT_TEMPLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_SPIRIT_TEMPLE] < SPIRIT_TEMPLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_SHADOW_TEMPLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_SHADOW_TEMPLE] < SHADOW_TEMPLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_SHADOW_TEMPLE] < SHADOW_TEMPLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_BOTTOM_OF_THE_WELL_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] < BOTTOM_OF_THE_WELL_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] < BOTTOM_OF_THE_WELL_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_GERUDO_TRAINING_GROUND_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_GERUDO_TRAINING_GROUND] < GERUDO_TRAINING_GROUND_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_GERUDO_TRAINING_GROUND] <
+                           GERUDO_TRAINING_GROUND_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_GERUDO_FORTRESS_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_THIEVES_HIDEOUT] < GERUDO_FORTRESS_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_THIEVES_HIDEOUT] < GERUDO_FORTRESS_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_GANONS_CASTLE_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] < GANONS_CASTLE_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] < GANONS_CASTLE_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
         case RG_TREASURE_GAME_SMALL_KEY:
-            return gSaveContext.inventory.dungeonKeys[SCENE_TREASURE_BOX_SHOP] < TREASURE_GAME_SMALL_KEY_MAX ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
+            return gSaveContext.inventory.dungeonKeys[SCENE_TREASURE_BOX_SHOP] < TREASURE_GAME_SMALL_KEY_MAX
+                       ? CAN_OBTAIN
+                       : CANT_OBTAIN_ALREADY_HAVE;
 
         // Dungeon Rewards
         case RG_KOKIRI_EMERALD:
@@ -794,761 +1132,2132 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
 // There has been some talk about potentially just using the RC identifier to store flags rather than randomizer inf, so
 // for now we're not going to store randomzierInf in the randomizer check objects, we're just going to map them 1:1 here
 std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
-    { RC_KF_LINKS_HOUSE_COW,                                          RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW },
-    { RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,                       RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT },
-    { RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,                        RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT },
-    { RC_LW_DEKU_SCRUB_NEAR_BRIDGE,                                   RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE },
-    { RC_LW_DEKU_SCRUB_GROTTO_REAR,                                   RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR },
-    { RC_LW_DEKU_SCRUB_GROTTO_FRONT,                                  RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT },
-    { RC_SFM_DEKU_SCRUB_GROTTO_REAR,                                  RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR },
-    { RC_SFM_DEKU_SCRUB_GROTTO_FRONT,                                 RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT },
-    { RC_HF_DEKU_SCRUB_GROTTO,                                        RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO },
-    { RC_HF_COW_GROTTO_COW,                                           RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW },
-    { RC_LH_DEKU_SCRUB_GROTTO_LEFT,                                   RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT },
-    { RC_LH_DEKU_SCRUB_GROTTO_RIGHT,                                  RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT },
-    { RC_LH_DEKU_SCRUB_GROTTO_CENTER,                                 RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER },
-    { RC_GV_DEKU_SCRUB_GROTTO_REAR,                                   RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR },
-    { RC_GV_DEKU_SCRUB_GROTTO_FRONT,                                  RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT },
-    { RC_GV_COW,                                                      RAND_INF_COWS_MILKED_GV_COW },
-    { RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,                             RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR },
-    { RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,                            RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT },
-    { RC_KAK_IMPAS_HOUSE_COW,                                         RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW },
-    { RC_DMT_COW_GROTTO_COW,                                          RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW },
-    { RC_GC_DEKU_SCRUB_GROTTO_LEFT,                                   RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT },
-    { RC_GC_DEKU_SCRUB_GROTTO_RIGHT,                                  RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT },
-    { RC_GC_DEKU_SCRUB_GROTTO_CENTER,                                 RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER },
-    { RC_DMC_DEKU_SCRUB,                                              RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB },
-    { RC_DMC_DEKU_SCRUB_GROTTO_LEFT,                                  RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT },
-    { RC_DMC_DEKU_SCRUB_GROTTO_RIGHT,                                 RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT },
-    { RC_DMC_DEKU_SCRUB_GROTTO_CENTER,                                RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER },
-    { RC_ZR_DEKU_SCRUB_GROTTO_REAR,                                   RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR },
-    { RC_ZR_DEKU_SCRUB_GROTTO_FRONT,                                  RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT },
-    { RC_LLR_DEKU_SCRUB_GROTTO_LEFT,                                  RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT },
-    { RC_LLR_DEKU_SCRUB_GROTTO_RIGHT,                                 RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT },
-    { RC_LLR_DEKU_SCRUB_GROTTO_CENTER,                                RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER },
-    { RC_LLR_STABLES_LEFT_COW,                                        RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW },
-    { RC_LLR_STABLES_RIGHT_COW,                                       RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW },
-    { RC_LLR_TOWER_LEFT_COW,                                          RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW },
-    { RC_LLR_TOWER_RIGHT_COW,                                         RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW },
-    { RC_DEKU_TREE_MQ_DEKU_SCRUB,                                     RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB },
-    { RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,               RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT },
-    { RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,          RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS },
-    { RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,              RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT },
-    { RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,                            RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY },
-    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,                    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR },
-    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,                   RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT },
-    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,                     RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE },
-    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS, RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS },
-    { RC_JABU_JABUS_BELLY_DEKU_SCRUB,                                 RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB },
-    { RC_JABU_JABUS_BELLY_MQ_COW,                                     RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW },
-    { RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,                        RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT },
-    { RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,                       RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT },
-    { RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,                              RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT },
-    { RC_GANONS_CASTLE_DEKU_SCRUB_LEFT,                               RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT },
-    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,                           RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT },
-    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,                     RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT },
-    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,                          RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER },
-    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,                    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT },
-    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,                            RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT },
-    { RC_KF_SHOP_ITEM_1,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1 },
-    { RC_KF_SHOP_ITEM_2,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2 },
-    { RC_KF_SHOP_ITEM_3,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3 },
-    { RC_KF_SHOP_ITEM_4,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4 },
-    { RC_KF_SHOP_ITEM_5,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5 },
-    { RC_KF_SHOP_ITEM_6,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6 },
-    { RC_KF_SHOP_ITEM_7,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7 },
-    { RC_KF_SHOP_ITEM_8,                                              RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8 },
-    { RC_GC_SHOP_ITEM_1,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1 },
-    { RC_GC_SHOP_ITEM_2,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2 },
-    { RC_GC_SHOP_ITEM_3,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3 },
-    { RC_GC_SHOP_ITEM_4,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4 },
-    { RC_GC_SHOP_ITEM_5,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5 },
-    { RC_GC_SHOP_ITEM_6,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6 },
-    { RC_GC_SHOP_ITEM_7,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7 },
-    { RC_GC_SHOP_ITEM_8,                                              RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8 },
-    { RC_ZD_SHOP_ITEM_1,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1 },
-    { RC_ZD_SHOP_ITEM_2,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2 },
-    { RC_ZD_SHOP_ITEM_3,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3 },
-    { RC_ZD_SHOP_ITEM_4,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4 },
-    { RC_ZD_SHOP_ITEM_5,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5 },
-    { RC_ZD_SHOP_ITEM_6,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6 },
-    { RC_ZD_SHOP_ITEM_7,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7 },
-    { RC_ZD_SHOP_ITEM_8,                                              RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8 },
-    { RC_KAK_BAZAAR_ITEM_1,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1 },
-    { RC_KAK_BAZAAR_ITEM_2,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2 },
-    { RC_KAK_BAZAAR_ITEM_3,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3 },
-    { RC_KAK_BAZAAR_ITEM_4,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4 },
-    { RC_KAK_BAZAAR_ITEM_5,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5 },
-    { RC_KAK_BAZAAR_ITEM_6,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6 },
-    { RC_KAK_BAZAAR_ITEM_7,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7 },
-    { RC_KAK_BAZAAR_ITEM_8,                                           RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8 },
-    { RC_KAK_POTION_SHOP_ITEM_1,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1 },
-    { RC_KAK_POTION_SHOP_ITEM_2,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2 },
-    { RC_KAK_POTION_SHOP_ITEM_3,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3 },
-    { RC_KAK_POTION_SHOP_ITEM_4,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4 },
-    { RC_KAK_POTION_SHOP_ITEM_5,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5 },
-    { RC_KAK_POTION_SHOP_ITEM_6,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6 },
-    { RC_KAK_POTION_SHOP_ITEM_7,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7 },
-    { RC_KAK_POTION_SHOP_ITEM_8,                                      RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8 },
-    { RC_MARKET_BAZAAR_ITEM_1,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1 },
-    { RC_MARKET_BAZAAR_ITEM_2,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2 },
-    { RC_MARKET_BAZAAR_ITEM_3,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3 },
-    { RC_MARKET_BAZAAR_ITEM_4,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4 },
-    { RC_MARKET_BAZAAR_ITEM_5,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5 },
-    { RC_MARKET_BAZAAR_ITEM_6,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6 },
-    { RC_MARKET_BAZAAR_ITEM_7,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7 },
-    { RC_MARKET_BAZAAR_ITEM_8,                                        RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8 },
-    { RC_MARKET_POTION_SHOP_ITEM_1,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1 },
-    { RC_MARKET_POTION_SHOP_ITEM_2,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2 },
-    { RC_MARKET_POTION_SHOP_ITEM_3,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3 },
-    { RC_MARKET_POTION_SHOP_ITEM_4,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4 },
-    { RC_MARKET_POTION_SHOP_ITEM_5,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5 },
-    { RC_MARKET_POTION_SHOP_ITEM_6,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6 },
-    { RC_MARKET_POTION_SHOP_ITEM_7,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7 },
-    { RC_MARKET_POTION_SHOP_ITEM_8,                                   RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_1,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_2,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_3,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_4,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_5,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_6,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_7,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7 },
-    { RC_MARKET_BOMBCHU_SHOP_ITEM_8,                                  RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8 },
-    { RC_TOT_MASTER_SWORD,                                            RAND_INF_TOT_MASTER_SWORD                      },
-    { RC_GC_MEDIGORON,                                                RAND_INF_MERCHANTS_MEDIGORON                   },
-    { RC_KAK_GRANNYS_SHOP,                                            RAND_INF_MERCHANTS_GRANNYS_SHOP                },
-    { RC_WASTELAND_BOMBCHU_SALESMAN,                                  RAND_INF_MERCHANTS_CARPET_SALESMAN             },
-    { RC_ZR_MAGIC_BEAN_SALESMAN,                                      RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN         },
-    { RC_LW_TRADE_COJIRO,                                             RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO },
-    { RC_GV_TRADE_SAW,                                                RAND_INF_ADULT_TRADES_GV_TRADE_SAW },
-    { RC_DMT_TRADE_BROKEN_SWORD,                                      RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD },
-    { RC_LH_TRADE_FROG,                                               RAND_INF_ADULT_TRADES_LH_TRADE_FROG },
-    { RC_DMT_TRADE_EYEDROPS,                                          RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS },
-    { RC_LH_CHILD_FISHING,                                            RAND_INF_CHILD_FISHING },
-    { RC_LH_ADULT_FISHING,                                            RAND_INF_ADULT_FISHING },
-    { RC_MARKET_10_BIG_POES,                                          RAND_INF_10_BIG_POES },
-    { RC_KAK_100_GOLD_SKULLTULA_REWARD,                               RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD },
-    { RC_KF_STORMS_GROTTO_BEEHIVE_LEFT,                               RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT },
-    { RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT,                              RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT },
-    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT,                       RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT },
-    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT,                      RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT },
-    { RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE,                                RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO },
-    { RC_SFM_STORMS_GROTTO_BEEHIVE,                                   RAND_INF_BEEHIVE_SFM_STORMS_GROTTO },
-    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT,                          RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT },
-    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT,                         RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT },
-    { RC_HF_OPEN_GROTTO_BEEHIVE_LEFT,                                 RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT },
-    { RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT,                                RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT },
-    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT,                            RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT },
-    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT,                           RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT },
-    { RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE,                              RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO },
-    { RC_LLR_GROTTO_BEEHIVE,                                          RAND_INF_BEEHIVE_LLR_GROTTO },
-    { RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT,                                RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT },
-    { RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT,                               RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT },
-    { RC_DMT_COW_GROTTO_BEEHIVE,                                      RAND_INF_BEEHIVE_DMT_COW_GROTTO },
-    { RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT,                              RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT },
-    { RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT,                             RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT },
-    { RC_GC_GROTTO_BEEHIVE,                                           RAND_INF_BEEHIVE_GC_GROTTO },
-    { RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT,                               RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT },
-    { RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT,                              RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT },
-    { RC_DMC_HAMMER_GROTTO_BEEHIVE,                                   RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO },
-    { RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT,                                 RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT },
-    { RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT,                                RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT },
-    { RC_ZR_STORMS_GROTTO_BEEHIVE,                                    RAND_INF_BEEHIVE_ZR_STORMS_GROTTO },
-    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT,                       RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT },
-    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT,                      RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT },
-    { RC_ZD_BEHIND_KING_ZORA_BEEHIVE,                                 RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA },
-    { RC_LH_GROTTO_BEEHIVE,                                           RAND_INF_BEEHIVE_LH_GROTTO },
-    { RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE,                                RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO },
-    { RC_COLOSSUS_GROTTO_BEEHIVE,                                     RAND_INF_BEEHIVE_COLOSSUS_GROTTO },
-    { RC_LH_CHILD_FISH_1,                                             RAND_INF_CHILD_FISH_1 },
-    { RC_LH_CHILD_FISH_2,                                             RAND_INF_CHILD_FISH_2 },
-    { RC_LH_CHILD_FISH_3,                                             RAND_INF_CHILD_FISH_3 },
-    { RC_LH_CHILD_FISH_4,                                             RAND_INF_CHILD_FISH_4 },
-    { RC_LH_CHILD_FISH_5,                                             RAND_INF_CHILD_FISH_5 },
-    { RC_LH_CHILD_FISH_6,                                             RAND_INF_CHILD_FISH_6 },
-    { RC_LH_CHILD_FISH_7,                                             RAND_INF_CHILD_FISH_7 },
-    { RC_LH_CHILD_FISH_8,                                             RAND_INF_CHILD_FISH_8 },
-    { RC_LH_CHILD_FISH_9,                                             RAND_INF_CHILD_FISH_9 },
-    { RC_LH_CHILD_FISH_10,                                            RAND_INF_CHILD_FISH_10 },
-    { RC_LH_CHILD_FISH_11,                                            RAND_INF_CHILD_FISH_11 },
-    { RC_LH_CHILD_FISH_12,                                            RAND_INF_CHILD_FISH_12 },
-    { RC_LH_CHILD_FISH_13,                                            RAND_INF_CHILD_FISH_13 },
-    { RC_LH_CHILD_FISH_14,                                            RAND_INF_CHILD_FISH_14 },
-    { RC_LH_CHILD_FISH_15,                                            RAND_INF_CHILD_FISH_15 },
-    { RC_LH_CHILD_LOACH_1,                                            RAND_INF_CHILD_LOACH_1 },
-    { RC_LH_CHILD_LOACH_2,                                            RAND_INF_CHILD_LOACH_2 },
-    { RC_LH_ADULT_FISH_1,                                             RAND_INF_ADULT_FISH_1 },
-    { RC_LH_ADULT_FISH_2,                                             RAND_INF_ADULT_FISH_2 },
-    { RC_LH_ADULT_FISH_3,                                             RAND_INF_ADULT_FISH_3 },
-    { RC_LH_ADULT_FISH_4,                                             RAND_INF_ADULT_FISH_4 },
-    { RC_LH_ADULT_FISH_5,                                             RAND_INF_ADULT_FISH_5 },
-    { RC_LH_ADULT_FISH_6,                                             RAND_INF_ADULT_FISH_6 },
-    { RC_LH_ADULT_FISH_7,                                             RAND_INF_ADULT_FISH_7 },
-    { RC_LH_ADULT_FISH_8,                                             RAND_INF_ADULT_FISH_8 },
-    { RC_LH_ADULT_FISH_9,                                             RAND_INF_ADULT_FISH_9 },
-    { RC_LH_ADULT_FISH_10,                                            RAND_INF_ADULT_FISH_10 },
-    { RC_LH_ADULT_FISH_11,                                            RAND_INF_ADULT_FISH_11 },
-    { RC_LH_ADULT_FISH_12,                                            RAND_INF_ADULT_FISH_12 },
-    { RC_LH_ADULT_FISH_13,                                            RAND_INF_ADULT_FISH_13 },
-    { RC_LH_ADULT_FISH_14,                                            RAND_INF_ADULT_FISH_14 },
-    { RC_LH_ADULT_FISH_15,                                            RAND_INF_ADULT_FISH_15 },
-    { RC_LH_ADULT_LOACH,                                              RAND_INF_ADULT_LOACH },
-    { RC_ZR_OPEN_GROTTO_FISH,                                         RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO },
-    { RC_DMC_UPPER_GROTTO_FISH,                                       RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO },
-    { RC_DMT_STORMS_GROTTO_FISH,                                      RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO },
-    { RC_KAK_OPEN_GROTTO_FISH,                                        RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO },
-    { RC_HF_NEAR_MARKET_GROTTO_FISH,                                  RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO },
-    { RC_HF_OPEN_GROTTO_FISH,                                         RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO },
-    { RC_HF_SOUTHEAST_GROTTO_FISH,                                    RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO },
-    { RC_LW_NEAR_SHORTCUTS_GROTTO_FISH,                               RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO },
-    { RC_KF_STORMS_GROTTO_FISH,                                       RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO },
-    { RC_ZD_FISH_1,                                                   RAND_INF_ZD_FISH_1 },
-    { RC_ZD_FISH_2,                                                   RAND_INF_ZD_FISH_2 },
-    { RC_ZD_FISH_3,                                                   RAND_INF_ZD_FISH_3 },
-    { RC_ZD_FISH_4,                                                   RAND_INF_ZD_FISH_4 },
-    { RC_ZD_FISH_5,                                                   RAND_INF_ZD_FISH_5 },
-    
-    { RC_KF_LINKS_HOUSE_POT,                                            RAND_INF_KF_LINKS_HOUSE_POT },
-    { RC_KF_TWINS_HOUSE_POT_1,                                          RAND_INF_KF_TWINS_HOUSE_POT_1 },
-    { RC_KF_TWINS_HOUSE_POT_2,                                          RAND_INF_KF_TWINS_HOUSE_POT_2 },
-    { RC_KF_BROTHERS_HOUSE_POT_1,                                       RAND_INF_KF_BROTHERS_HOUSE_POT_1 },
-    { RC_KF_BROTHERS_HOUSE_POT_2,                                       RAND_INF_KF_BROTHERS_HOUSE_POT_2 },
-    { RC_GF_BREAK_ROOM_POT_1,                                           RAND_INF_GF_BREAK_ROOM_POT_1 },
-    { RC_GF_BREAK_ROOM_POT_2,                                           RAND_INF_GF_BREAK_ROOM_POT_2 },
-    { RC_GF_KITCHEN_POT_1,                                              RAND_INF_GF_KITCHEN_POT_1 },
-    { RC_GF_KITCHEN_POT_2,                                              RAND_INF_GF_KITCHEN_POT_2 },
-    { RC_GF_NORTH_F1_CARPENTER_POT_1,                                   RAND_INF_GF_NORTH_F1_CARPENTER_POT_1 },
-    { RC_GF_NORTH_F1_CARPENTER_POT_2,                                   RAND_INF_GF_NORTH_F1_CARPENTER_POT_2 },
-    { RC_GF_NORTH_F1_CARPENTER_POT_3,                                   RAND_INF_GF_NORTH_F1_CARPENTER_POT_3 },
-    { RC_GF_NORTH_F2_CARPENTER_POT_1,                                   RAND_INF_GF_NORTH_F2_CARPENTER_POT_1 },
-    { RC_GF_NORTH_F2_CARPENTER_POT_2,                                   RAND_INF_GF_NORTH_F2_CARPENTER_POT_2 },
-    { RC_GF_SOUTH_F1_CARPENTER_POT_1,                                   RAND_INF_GF_SOUTH_F1_CARPENTER_POT_1 },
-    { RC_GF_SOUTH_F1_CARPENTER_POT_2,                                   RAND_INF_GF_SOUTH_F1_CARPENTER_POT_2 },
-    { RC_GF_SOUTH_F1_CARPENTER_POT_3,                                   RAND_INF_GF_SOUTH_F1_CARPENTER_POT_3 },
-    { RC_GF_SOUTH_F1_CARPENTER_CELL_POT_1,                              RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_1 },
-    { RC_GF_SOUTH_F1_CARPENTER_CELL_POT_2,                              RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_2 },
-    { RC_GF_SOUTH_F1_CARPENTER_CELL_POT_3,                              RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_3 },
-    { RC_GF_SOUTH_F1_CARPENTER_CELL_POT_4,                              RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_4 },
-    { RC_WASTELAND_NEAR_GS_POT_1,                                       RAND_INF_WASTELAND_NEAR_GS_POT_1 },
-    { RC_WASTELAND_NEAR_GS_POT_2,                                       RAND_INF_WASTELAND_NEAR_GS_POT_2 },
-    { RC_WASTELAND_NEAR_GS_POT_3,                                       RAND_INF_WASTELAND_NEAR_GS_POT_3 },
-    { RC_WASTELAND_NEAR_GS_POT_4,                                       RAND_INF_WASTELAND_NEAR_GS_POT_4 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_1,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_2,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_3,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_4,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_5,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_6,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_7,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_8,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_9,                                    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_10,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_11,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_12,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_13,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_14,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_15,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_16,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_17,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_18,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_19,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_20,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_21,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_22,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_23,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_24,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_25,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_26,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_27,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_28,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_29,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_30,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_31,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_32,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_33,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_34,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_35,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_36,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_37,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_38,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_39,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_40,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_41,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_42,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_43,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43 },
-    { RC_MK_GUARD_HOUSE_CHILD_POT_44,                                   RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_1,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_2,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_3,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_4,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_5,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_6,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_7,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_8,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_9,                                    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_10,                                   RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10 },
-    { RC_MK_GUARD_HOUSE_ADULT_POT_11,                                   RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11 },
-    { RC_MK_BACK_ALLEY_HOUSE_POT_1,                                     RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1 },
-    { RC_MK_BACK_ALLEY_HOUSE_POT_2,                                     RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2 },
-    { RC_MK_BACK_ALLEY_HOUSE_POT_3,                                     RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3 },
-    { RC_KAK_NEAR_POTION_SHOP_POT_1,                                    RAND_INF_KAK_NEAR_POTION_SHOP_POT_1 },
-    { RC_KAK_NEAR_POTION_SHOP_POT_2,                                    RAND_INF_KAK_NEAR_POTION_SHOP_POT_2 },
-    { RC_KAK_NEAR_POTION_SHOP_POT_3,                                    RAND_INF_KAK_NEAR_POTION_SHOP_POT_3 },
-    { RC_KAK_NEAR_IMPAS_HOUSE_POT_1,                                    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1 },
-    { RC_KAK_NEAR_IMPAS_HOUSE_POT_2,                                    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2 },
-    { RC_KAK_NEAR_IMPAS_HOUSE_POT_3,                                    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3 },
-    { RC_KAK_NEAR_GUARDS_HOUSE_POT_1,                                   RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1 },
-    { RC_KAK_NEAR_GUARDS_HOUSE_POT_2,                                   RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2 },
-    { RC_KAK_NEAR_GUARDS_HOUSE_POT_3,                                   RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3 },
-    { RC_KAK_NEAR_MEDICINE_SHOP_POT_1,                                  RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1 },
-    { RC_KAK_NEAR_MEDICINE_SHOP_POT_2,                                  RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2 },
-    { RC_GY_DAMPES_GRAVE_POT_1,                                         RAND_INF_GY_DAMPES_GRAVE_POT_1 },
-    { RC_GY_DAMPES_GRAVE_POT_2,                                         RAND_INF_GY_DAMPES_GRAVE_POT_2 },
-    { RC_GY_DAMPES_GRAVE_POT_3,                                         RAND_INF_GY_DAMPES_GRAVE_POT_3 },
-    { RC_GY_DAMPES_GRAVE_POT_4,                                         RAND_INF_GY_DAMPES_GRAVE_POT_4 },
-    { RC_GY_DAMPES_GRAVE_POT_5,                                         RAND_INF_GY_DAMPES_GRAVE_POT_5 },
-    { RC_GY_DAMPES_GRAVE_POT_6,                                         RAND_INF_GY_DAMPES_GRAVE_POT_6 },
-    { RC_GC_LOWER_STAIRCASE_POT_1,                                      RAND_INF_GC_LOWER_STAIRCASE_POT_1 },
-    { RC_GC_LOWER_STAIRCASE_POT_2,                                      RAND_INF_GC_LOWER_STAIRCASE_POT_2 },
-    { RC_GC_UPPER_STAIRCASE_POT_1,                                      RAND_INF_GC_UPPER_STAIRCASE_POT_1 },
-    { RC_GC_UPPER_STAIRCASE_POT_2,                                      RAND_INF_GC_UPPER_STAIRCASE_POT_2 },
-    { RC_GC_UPPER_STAIRCASE_POT_3,                                      RAND_INF_GC_UPPER_STAIRCASE_POT_3 },
-    { RC_GC_MEDIGORON_POT_1,                                            RAND_INF_GC_MEDIGORON_POT_1 },
-    { RC_GC_DARUNIA_POT_1,                                              RAND_INF_GC_DARUNIA_POT_1 },
-    { RC_GC_DARUNIA_POT_2,                                              RAND_INF_GC_DARUNIA_POT_2 },
-    { RC_GC_DARUNIA_POT_3,                                              RAND_INF_GC_DARUNIA_POT_3 },
-    { RC_DMC_NEAR_GC_POT_1,                                             RAND_INF_DMC_NEAR_GC_POT_1 },
-    { RC_DMC_NEAR_GC_POT_2,                                             RAND_INF_DMC_NEAR_GC_POT_2 },
-    { RC_DMC_NEAR_GC_POT_3,                                             RAND_INF_DMC_NEAR_GC_POT_3 },
-    { RC_DMC_NEAR_GC_POT_4,                                             RAND_INF_DMC_NEAR_GC_POT_4 },
-    { RC_ZD_NEAR_SHOP_POT_1,                                            RAND_INF_ZD_NEAR_SHOP_POT_1 },
-    { RC_ZD_NEAR_SHOP_POT_2,                                            RAND_INF_ZD_NEAR_SHOP_POT_2 },
-    { RC_ZD_NEAR_SHOP_POT_3,                                            RAND_INF_ZD_NEAR_SHOP_POT_3 },
-    { RC_ZD_NEAR_SHOP_POT_4,                                            RAND_INF_ZD_NEAR_SHOP_POT_4 },
-    { RC_ZD_NEAR_SHOP_POT_5,                                            RAND_INF_ZD_NEAR_SHOP_POT_5 },
-    { RC_ZF_HIDDEN_CAVE_POT_1,                                          RAND_INF_ZF_HIDDEN_CAVE_POT_1 },
-    { RC_ZF_HIDDEN_CAVE_POT_2,                                          RAND_INF_ZF_HIDDEN_CAVE_POT_2 },
-    { RC_ZF_HIDDEN_CAVE_POT_3,                                          RAND_INF_ZF_HIDDEN_CAVE_POT_3 },
-    { RC_ZF_NEAR_JABU_POT_1,                                            RAND_INF_ZF_NEAR_JABU_POT_1 },
-    { RC_ZF_NEAR_JABU_POT_2,                                            RAND_INF_ZF_NEAR_JABU_POT_2 },
-    { RC_ZF_NEAR_JABU_POT_3,                                            RAND_INF_ZF_NEAR_JABU_POT_3 },
-    { RC_ZF_NEAR_JABU_POT_4,                                            RAND_INF_ZF_NEAR_JABU_POT_4 },
-    { RC_LLR_FRONT_POT_1,                                               RAND_INF_LLR_FRONT_POT_1 },
-    { RC_LLR_FRONT_POT_2,                                               RAND_INF_LLR_FRONT_POT_2 },
-    { RC_LLR_FRONT_POT_3,                                               RAND_INF_LLR_FRONT_POT_3 },
-    { RC_LLR_FRONT_POT_4,                                               RAND_INF_LLR_FRONT_POT_4 },
-    { RC_LLR_RAIN_SHED_POT_1,                                           RAND_INF_LLR_RAIN_SHED_POT_1 },
-    { RC_LLR_RAIN_SHED_POT_2,                                           RAND_INF_LLR_RAIN_SHED_POT_2 },
-    { RC_LLR_RAIN_SHED_POT_3,                                           RAND_INF_LLR_RAIN_SHED_POT_3 },
-    { RC_LLR_TALONS_HOUSE_POT_1,                                        RAND_INF_LLR_TALONS_HOUSE_POT_1 },
-    { RC_LLR_TALONS_HOUSE_POT_2,                                        RAND_INF_LLR_TALONS_HOUSE_POT_2 },
-    { RC_LLR_TALONS_HOUSE_POT_3,                                        RAND_INF_LLR_TALONS_HOUSE_POT_3 },
-    { RC_HF_COW_GROTTO_POT_1,                                           RAND_INF_HF_COW_GROTTO_POT_1 },
-    { RC_HF_COW_GROTTO_POT_2,                                           RAND_INF_HF_COW_GROTTO_POT_2 },
-    { RC_HC_STORMS_GROTTO_POT_1,                                        RAND_INF_HC_STORMS_GROTTO_POT_1 },
-    { RC_HC_STORMS_GROTTO_POT_2,                                        RAND_INF_HC_STORMS_GROTTO_POT_2 },
-    { RC_HC_STORMS_GROTTO_POT_3,                                        RAND_INF_HC_STORMS_GROTTO_POT_3 },
-    { RC_HC_STORMS_GROTTO_POT_4,                                        RAND_INF_HC_STORMS_GROTTO_POT_4 },
-    { RC_DODONGOS_CAVERN_LIZALFOS_POT_1,                                RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1 },
-    { RC_DODONGOS_CAVERN_LIZALFOS_POT_2,                                RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2 },
-    { RC_DODONGOS_CAVERN_LIZALFOS_POT_3,                                RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3 },
-    { RC_DODONGOS_CAVERN_LIZALFOS_POT_4,                                RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5 },
-    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6,                               RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6 },
-    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1,                              RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2,                              RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2 },
-    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3,                              RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3 },
-    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4,                              RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4 },
-    { RC_DODONGOS_CAVERN_STAIRCASE_POT_1,                               RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1 },
-    { RC_DODONGOS_CAVERN_STAIRCASE_POT_2,                               RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2 },
-    { RC_DODONGOS_CAVERN_STAIRCASE_POT_3,                               RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3 },
-    { RC_DODONGOS_CAVERN_STAIRCASE_POT_4,                               RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4 },
-    { RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1,                              RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1 },
-    { RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2,                              RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2 },
-    { RC_DODONGOS_CAVERN_BLADE_POT_1,                                   RAND_INF_DODONGOS_CAVERN_BLADE_POT_1 },
-    { RC_DODONGOS_CAVERN_BLADE_POT_2,                                   RAND_INF_DODONGOS_CAVERN_BLADE_POT_2 },
-    { RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1,                              RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1 },
-    { RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2,                              RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2 },
-    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_1,                               RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_2,                               RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2 },
-    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_3,                               RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3 },
-    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_4,                               RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4 },
-    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,                         RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1 },
-    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,                         RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2 },
-    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,                         RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_1,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_2,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_3,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_4,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_5,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5 },
-    { RC_JABU_JABUS_BELLY_BARINADE_POT_6,                               RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6 },
-    { RC_JABU_JABUS_BELLY_BASEMENT_POT_1,                               RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1 },
-    { RC_JABU_JABUS_BELLY_BASEMENT_POT_2,                               RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2 },
-    { RC_JABU_JABUS_BELLY_BASEMENT_POT_3,                               RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3 },
-    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1,                            RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1 },
-    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2,                            RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2 },
-    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3,                            RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3 },
-    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4,                            RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4 },
-    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5,                            RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_1,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_1 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_2,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_2 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_3,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_3 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_4,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_4 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_5,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_5 },
-    { RC_FOREST_TEMPLE_LOBBY_POT_6,                                     RAND_INF_FOREST_TEMPLE_LOBBY_POT_6 },
-    { RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1,                             RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1 },
-    { RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2,                             RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2 },
-    { RC_FOREST_TEMPLE_GREEN_POE_POT_1,                                 RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1 },
-    { RC_FOREST_TEMPLE_GREEN_POE_POT_2,                                 RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2 },
-    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1,                             RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1 },
-    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2,                             RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2 },
-    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3,                             RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3 },
-    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4,                             RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4 },
-    { RC_FOREST_TEMPLE_BLUE_POE_POT_1,                                  RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1 },
-    { RC_FOREST_TEMPLE_BLUE_POE_POT_2,                                  RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2 },
-    { RC_FOREST_TEMPLE_BLUE_POE_POT_3,                                  RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3 },
-    { RC_FOREST_TEMPLE_FROZEN_EYE_POT_1,                                RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1 },
-    { RC_FOREST_TEMPLE_FROZEN_EYE_POT_2,                                RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2 },
-    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_1,                                   RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1 },
-    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_2,                                   RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2 },
-    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_3,                                   RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3 },
-    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_4,                                   RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4 },
-    { RC_FIRE_TEMPLE_BIG_LAVA_POT_1,                                    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1 },
-    { RC_FIRE_TEMPLE_BIG_LAVA_POT_2,                                    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2 },
-    { RC_FIRE_TEMPLE_BIG_LAVA_POT_3,                                    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1,                             RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2,                             RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3,                             RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4,                             RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1,                            RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2,                            RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3,                            RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3 },
-    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4,                            RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4 },
-    { RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1,                               RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1 },
-    { RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2,                               RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2 },
-    { RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1,                               RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1 },
-    { RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2,                               RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2 },
-    { RC_WATER_TEMPLE_TORCH_POT_1,                                      RAND_INF_WATER_TEMPLE_TORCH_POT_1 },
-    { RC_WATER_TEMPLE_TORCH_POT_2,                                      RAND_INF_WATER_TEMPLE_TORCH_POT_2 },
-    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_1,                               RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1 },
-    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_2,                               RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2 },
-    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_3,                               RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3 },
-    { RC_WATER_TEMPLE_CENTRAL_BOW_POT_1,                                RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1 },
-    { RC_WATER_TEMPLE_CENTRAL_BOW_POT_2,                                RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2 },
-    { RC_WATER_TEMPLE_BEHIND_GATE_POT_1,                                RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1 },
-    { RC_WATER_TEMPLE_BEHIND_GATE_POT_2,                                RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2 },
-    { RC_WATER_TEMPLE_BEHIND_GATE_POT_3,                                RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3 },
-    { RC_WATER_TEMPLE_BEHIND_GATE_POT_4,                                RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4 },
-    { RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1,                      RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1 },
-    { RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2,                      RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2 },
-    { RC_WATER_TEMPLE_RIVER_POT_1,                                      RAND_INF_WATER_TEMPLE_RIVER_POT_1 },
-    { RC_WATER_TEMPLE_RIVER_POT_2,                                      RAND_INF_WATER_TEMPLE_RIVER_POT_2 },
-    { RC_WATER_TEMPLE_LIKE_LIKE_POT_1,                                  RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1 },
-    { RC_WATER_TEMPLE_LIKE_LIKE_POT_2,                                  RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2 },
-    { RC_WATER_TEMPLE_BOSS_KEY_POT_1,                                   RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1 },
-    { RC_WATER_TEMPLE_BOSS_KEY_POT_2,                                   RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2 },
-    { RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1,                            RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1 },
-    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1,                          RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1 },
-    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2,                          RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2 },
-    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3,                          RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3 },
-    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4,                          RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4 },
-    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5,                          RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5 },
-    { RC_SHADOW_TEMPLE_MAP_CHEST_POT_1,                                 RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1 },
-    { RC_SHADOW_TEMPLE_MAP_CHEST_POT_2,                                 RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2 },
-    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1,                            RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1 },
-    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2,                            RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2 },
-    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3,                            RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3 },
-    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4,                            RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4 },
-    { RC_SHADOW_TEMPLE_AFTER_WIND_POT_1,                                RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1 },
-    { RC_SHADOW_TEMPLE_AFTER_WIND_POT_2,                                RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2 },
-    { RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1,                               RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1 },
-    { RC_SHADOW_TEMPLE_FLOORMASTER_POT_1,                               RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1 },
-    { RC_SHADOW_TEMPLE_FLOORMASTER_POT_2,                               RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2 },
-    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1,                                RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1 },
-    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2,                                RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2 },
-    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3,                                RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3 },
-    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4,                                RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4 },
-    { RC_SPIRIT_TEMPLE_LOBBY_POT_1,                                     RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1 },
-    { RC_SPIRIT_TEMPLE_LOBBY_POT_2,                                     RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2 },
-    { RC_SPIRIT_TEMPLE_ANUBIS_POT_1,                                    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1 },
-    { RC_SPIRIT_TEMPLE_ANUBIS_POT_2,                                    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2 },
-    { RC_SPIRIT_TEMPLE_ANUBIS_POT_3,                                    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3 },
-    { RC_SPIRIT_TEMPLE_ANUBIS_POT_4,                                    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4 },
-    { RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1,                               RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1 },
-    { RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1,                           RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1 },
-    { RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2,                           RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5 },
-    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6,                           RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6 },
-    { RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1,                               RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1 },
-    { RC_GANONS_CASTLE_FOREST_TRIAL_POT_1,                              RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_FOREST_TRIAL_POT_2,                              RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_FIRE_TRIAL_POT_1,                                RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,                                RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_WATER_TRIAL_POT_1,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_WATER_TRIAL_POT_2,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_WATER_TRIAL_POT_3,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3 },
-    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3 },
-    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4 },
-    { RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,                              RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,                              RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,                       RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1 },
-    { RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1,                               RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2,                               RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_1,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_2,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_3,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_4,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_5,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_6,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_7,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_8,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_9,                              RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_10,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_11,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_12,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_13,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_14,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_15,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_16,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_17,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17 },
-    { RC_GANONS_CASTLE_GANONS_TOWER_POT_18,                             RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,                             RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,                            RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,                            RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11 },
-    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,                            RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12 },
-    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1,                            RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2,                            RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3,                            RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3 },
-    { RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,                        RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,                        RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1,                           RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT,                             RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT },
-    { RC_ICE_CAVERN_HALL_POT_1,                                         RAND_INF_ICE_CAVERN_HALL_POT_1 },
-    { RC_ICE_CAVERN_HALL_POT_2,                                         RAND_INF_ICE_CAVERN_HALL_POT_2 },
-    { RC_ICE_CAVERN_SPINNING_BLADE_POT_1,                               RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1 },
-    { RC_ICE_CAVERN_SPINNING_BLADE_POT_2,                               RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2 },
-    { RC_ICE_CAVERN_SPINNING_BLADE_POT_3,                               RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3 },
-    { RC_ICE_CAVERN_NEAR_END_POT_1,                                     RAND_INF_ICE_CAVERN_NEAR_END_POT_1 },
-    { RC_ICE_CAVERN_NEAR_END_POT_2,                                     RAND_INF_ICE_CAVERN_NEAR_END_POT_2 },
-    { RC_ICE_CAVERN_FROZEN_POT_1,                                       RAND_INF_ICE_CAVERN_FROZEN_POT_1 },
+    { RC_KF_LINKS_HOUSE_COW, RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW },
+    { RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT },
+    { RC_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT },
+    { RC_LW_DEKU_SCRUB_NEAR_BRIDGE, RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE },
+    { RC_LW_DEKU_SCRUB_GROTTO_REAR, RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR },
+    { RC_LW_DEKU_SCRUB_GROTTO_FRONT, RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT },
+    { RC_SFM_DEKU_SCRUB_GROTTO_REAR, RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR },
+    { RC_SFM_DEKU_SCRUB_GROTTO_FRONT, RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT },
+    { RC_HF_DEKU_SCRUB_GROTTO, RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO },
+    { RC_HF_COW_GROTTO_COW, RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW },
+    { RC_LH_DEKU_SCRUB_GROTTO_LEFT, RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT },
+    { RC_LH_DEKU_SCRUB_GROTTO_RIGHT, RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT },
+    { RC_LH_DEKU_SCRUB_GROTTO_CENTER, RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER },
+    { RC_GV_DEKU_SCRUB_GROTTO_REAR, RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR },
+    { RC_GV_DEKU_SCRUB_GROTTO_FRONT, RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT },
+    { RC_GV_COW, RAND_INF_COWS_MILKED_GV_COW },
+    { RC_COLOSSUS_DEKU_SCRUB_GROTTO_REAR, RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR },
+    { RC_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT, RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT },
+    { RC_KAK_IMPAS_HOUSE_COW, RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW },
+    { RC_DMT_COW_GROTTO_COW, RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW },
+    { RC_GC_DEKU_SCRUB_GROTTO_LEFT, RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT },
+    { RC_GC_DEKU_SCRUB_GROTTO_RIGHT, RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT },
+    { RC_GC_DEKU_SCRUB_GROTTO_CENTER, RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER },
+    { RC_DMC_DEKU_SCRUB, RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB },
+    { RC_DMC_DEKU_SCRUB_GROTTO_LEFT, RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT },
+    { RC_DMC_DEKU_SCRUB_GROTTO_RIGHT, RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT },
+    { RC_DMC_DEKU_SCRUB_GROTTO_CENTER, RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER },
+    { RC_ZR_DEKU_SCRUB_GROTTO_REAR, RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR },
+    { RC_ZR_DEKU_SCRUB_GROTTO_FRONT, RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT },
+    { RC_LLR_DEKU_SCRUB_GROTTO_LEFT, RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT },
+    { RC_LLR_DEKU_SCRUB_GROTTO_RIGHT, RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT },
+    { RC_LLR_DEKU_SCRUB_GROTTO_CENTER, RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER },
+    { RC_LLR_STABLES_LEFT_COW, RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW },
+    { RC_LLR_STABLES_RIGHT_COW, RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW },
+    { RC_LLR_TOWER_LEFT_COW, RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW },
+    { RC_LLR_TOWER_RIGHT_COW, RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW },
+    { RC_DEKU_TREE_MQ_DEKU_SCRUB, RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB },
+    { RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+      RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT },
+    { RC_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+      RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS },
+    { RC_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+      RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT },
+    { RC_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY, RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY },
+    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR },
+    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+      RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT },
+    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE },
+    { RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+      RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS },
+    { RC_JABU_JABUS_BELLY_DEKU_SCRUB, RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB },
+    { RC_JABU_JABUS_BELLY_MQ_COW, RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW },
+    { RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT },
+    { RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT },
+    { RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT },
+    { RC_GANONS_CASTLE_DEKU_SCRUB_LEFT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT },
+    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT },
+    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT },
+    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER },
+    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT },
+    { RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT, RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT },
+    { RC_KF_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1 },
+    { RC_KF_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2 },
+    { RC_KF_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3 },
+    { RC_KF_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4 },
+    { RC_KF_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5 },
+    { RC_KF_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6 },
+    { RC_KF_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7 },
+    { RC_KF_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8 },
+    { RC_GC_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1 },
+    { RC_GC_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2 },
+    { RC_GC_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3 },
+    { RC_GC_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4 },
+    { RC_GC_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5 },
+    { RC_GC_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6 },
+    { RC_GC_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7 },
+    { RC_GC_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8 },
+    { RC_ZD_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1 },
+    { RC_ZD_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2 },
+    { RC_ZD_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3 },
+    { RC_ZD_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4 },
+    { RC_ZD_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5 },
+    { RC_ZD_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6 },
+    { RC_ZD_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7 },
+    { RC_ZD_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8 },
+    { RC_KAK_BAZAAR_ITEM_1, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1 },
+    { RC_KAK_BAZAAR_ITEM_2, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2 },
+    { RC_KAK_BAZAAR_ITEM_3, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3 },
+    { RC_KAK_BAZAAR_ITEM_4, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4 },
+    { RC_KAK_BAZAAR_ITEM_5, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5 },
+    { RC_KAK_BAZAAR_ITEM_6, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6 },
+    { RC_KAK_BAZAAR_ITEM_7, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7 },
+    { RC_KAK_BAZAAR_ITEM_8, RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8 },
+    { RC_KAK_POTION_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1 },
+    { RC_KAK_POTION_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2 },
+    { RC_KAK_POTION_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3 },
+    { RC_KAK_POTION_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4 },
+    { RC_KAK_POTION_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5 },
+    { RC_KAK_POTION_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6 },
+    { RC_KAK_POTION_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7 },
+    { RC_KAK_POTION_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8 },
+    { RC_MARKET_BAZAAR_ITEM_1, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1 },
+    { RC_MARKET_BAZAAR_ITEM_2, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2 },
+    { RC_MARKET_BAZAAR_ITEM_3, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3 },
+    { RC_MARKET_BAZAAR_ITEM_4, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4 },
+    { RC_MARKET_BAZAAR_ITEM_5, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5 },
+    { RC_MARKET_BAZAAR_ITEM_6, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6 },
+    { RC_MARKET_BAZAAR_ITEM_7, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7 },
+    { RC_MARKET_BAZAAR_ITEM_8, RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8 },
+    { RC_MARKET_POTION_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1 },
+    { RC_MARKET_POTION_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2 },
+    { RC_MARKET_POTION_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3 },
+    { RC_MARKET_POTION_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4 },
+    { RC_MARKET_POTION_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5 },
+    { RC_MARKET_POTION_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6 },
+    { RC_MARKET_POTION_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7 },
+    { RC_MARKET_POTION_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_1, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_2, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_3, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_4, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_5, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_6, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_7, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7 },
+    { RC_MARKET_BOMBCHU_SHOP_ITEM_8, RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8 },
+    { RC_TOT_MASTER_SWORD, RAND_INF_TOT_MASTER_SWORD },
+    { RC_GC_MEDIGORON, RAND_INF_MERCHANTS_MEDIGORON },
+    { RC_KAK_GRANNYS_SHOP, RAND_INF_MERCHANTS_GRANNYS_SHOP },
+    { RC_WASTELAND_BOMBCHU_SALESMAN, RAND_INF_MERCHANTS_CARPET_SALESMAN },
+    { RC_ZR_MAGIC_BEAN_SALESMAN, RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN },
+    { RC_LW_TRADE_COJIRO, RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO },
+    { RC_GV_TRADE_SAW, RAND_INF_ADULT_TRADES_GV_TRADE_SAW },
+    { RC_DMT_TRADE_BROKEN_SWORD, RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD },
+    { RC_LH_TRADE_FROG, RAND_INF_ADULT_TRADES_LH_TRADE_FROG },
+    { RC_DMT_TRADE_EYEDROPS, RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS },
+    { RC_LH_CHILD_FISHING, RAND_INF_CHILD_FISHING },
+    { RC_LH_ADULT_FISHING, RAND_INF_ADULT_FISHING },
+    { RC_MARKET_10_BIG_POES, RAND_INF_10_BIG_POES },
+    { RC_KAK_100_GOLD_SKULLTULA_REWARD, RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD },
+    { RC_KF_STORMS_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT },
+    { RC_KF_STORMS_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT },
+    { RC_LW_DEKU_SCRUB_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO },
+    { RC_SFM_STORMS_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_SFM_STORMS_GROTTO },
+    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT },
+    { RC_HF_NEAR_MARKET_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT },
+    { RC_HF_OPEN_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT },
+    { RC_HF_OPEN_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT },
+    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT },
+    { RC_HF_SOUTHEAST_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT },
+    { RC_HF_INSIDE_FENCE_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO },
+    { RC_LLR_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_LLR_GROTTO },
+    { RC_KAK_OPEN_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT },
+    { RC_KAK_OPEN_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT },
+    { RC_DMT_COW_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_DMT_COW_GROTTO },
+    { RC_DMT_STORMS_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT },
+    { RC_DMT_STORMS_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT },
+    { RC_GC_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_GC_GROTTO },
+    { RC_DMC_UPPER_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT },
+    { RC_DMC_UPPER_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT },
+    { RC_DMC_HAMMER_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO },
+    { RC_ZR_OPEN_GROTTO_BEEHIVE_LEFT, RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT },
+    { RC_ZR_OPEN_GROTTO_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT },
+    { RC_ZR_STORMS_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_ZR_STORMS_GROTTO },
+    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_LEFT, RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT },
+    { RC_ZD_IN_FRONT_OF_KING_ZORA_BEEHIVE_RIGHT, RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT },
+    { RC_ZD_BEHIND_KING_ZORA_BEEHIVE, RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA },
+    { RC_LH_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_LH_GROTTO },
+    { RC_GV_DEKU_SCRUB_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO },
+    { RC_COLOSSUS_GROTTO_BEEHIVE, RAND_INF_BEEHIVE_COLOSSUS_GROTTO },
+    { RC_LH_CHILD_FISH_1, RAND_INF_CHILD_FISH_1 },
+    { RC_LH_CHILD_FISH_2, RAND_INF_CHILD_FISH_2 },
+    { RC_LH_CHILD_FISH_3, RAND_INF_CHILD_FISH_3 },
+    { RC_LH_CHILD_FISH_4, RAND_INF_CHILD_FISH_4 },
+    { RC_LH_CHILD_FISH_5, RAND_INF_CHILD_FISH_5 },
+    { RC_LH_CHILD_FISH_6, RAND_INF_CHILD_FISH_6 },
+    { RC_LH_CHILD_FISH_7, RAND_INF_CHILD_FISH_7 },
+    { RC_LH_CHILD_FISH_8, RAND_INF_CHILD_FISH_8 },
+    { RC_LH_CHILD_FISH_9, RAND_INF_CHILD_FISH_9 },
+    { RC_LH_CHILD_FISH_10, RAND_INF_CHILD_FISH_10 },
+    { RC_LH_CHILD_FISH_11, RAND_INF_CHILD_FISH_11 },
+    { RC_LH_CHILD_FISH_12, RAND_INF_CHILD_FISH_12 },
+    { RC_LH_CHILD_FISH_13, RAND_INF_CHILD_FISH_13 },
+    { RC_LH_CHILD_FISH_14, RAND_INF_CHILD_FISH_14 },
+    { RC_LH_CHILD_FISH_15, RAND_INF_CHILD_FISH_15 },
+    { RC_LH_CHILD_LOACH_1, RAND_INF_CHILD_LOACH_1 },
+    { RC_LH_CHILD_LOACH_2, RAND_INF_CHILD_LOACH_2 },
+    { RC_LH_ADULT_FISH_1, RAND_INF_ADULT_FISH_1 },
+    { RC_LH_ADULT_FISH_2, RAND_INF_ADULT_FISH_2 },
+    { RC_LH_ADULT_FISH_3, RAND_INF_ADULT_FISH_3 },
+    { RC_LH_ADULT_FISH_4, RAND_INF_ADULT_FISH_4 },
+    { RC_LH_ADULT_FISH_5, RAND_INF_ADULT_FISH_5 },
+    { RC_LH_ADULT_FISH_6, RAND_INF_ADULT_FISH_6 },
+    { RC_LH_ADULT_FISH_7, RAND_INF_ADULT_FISH_7 },
+    { RC_LH_ADULT_FISH_8, RAND_INF_ADULT_FISH_8 },
+    { RC_LH_ADULT_FISH_9, RAND_INF_ADULT_FISH_9 },
+    { RC_LH_ADULT_FISH_10, RAND_INF_ADULT_FISH_10 },
+    { RC_LH_ADULT_FISH_11, RAND_INF_ADULT_FISH_11 },
+    { RC_LH_ADULT_FISH_12, RAND_INF_ADULT_FISH_12 },
+    { RC_LH_ADULT_FISH_13, RAND_INF_ADULT_FISH_13 },
+    { RC_LH_ADULT_FISH_14, RAND_INF_ADULT_FISH_14 },
+    { RC_LH_ADULT_FISH_15, RAND_INF_ADULT_FISH_15 },
+    { RC_LH_ADULT_LOACH, RAND_INF_ADULT_LOACH },
+    { RC_ZR_OPEN_GROTTO_FISH, RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO },
+    { RC_DMC_UPPER_GROTTO_FISH, RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO },
+    { RC_DMT_STORMS_GROTTO_FISH, RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO },
+    { RC_KAK_OPEN_GROTTO_FISH, RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO },
+    { RC_HF_NEAR_MARKET_GROTTO_FISH, RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO },
+    { RC_HF_OPEN_GROTTO_FISH, RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO },
+    { RC_HF_SOUTHEAST_GROTTO_FISH, RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_FISH, RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO },
+    { RC_KF_STORMS_GROTTO_FISH, RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO },
+    { RC_ZD_FISH_1, RAND_INF_ZD_FISH_1 },
+    { RC_ZD_FISH_2, RAND_INF_ZD_FISH_2 },
+    { RC_ZD_FISH_3, RAND_INF_ZD_FISH_3 },
+    { RC_ZD_FISH_4, RAND_INF_ZD_FISH_4 },
+    { RC_ZD_FISH_5, RAND_INF_ZD_FISH_5 },
+    // Grass
+    { RC_KF_CHILD_GRASS_1, RAND_INF_KF_CHILD_GRASS_1 },
+    { RC_KF_CHILD_GRASS_2, RAND_INF_KF_CHILD_GRASS_2 },
+    { RC_KF_CHILD_GRASS_3, RAND_INF_KF_CHILD_GRASS_3 },
+    { RC_KF_CHILD_GRASS_4, RAND_INF_KF_CHILD_GRASS_4 },
+    { RC_KF_CHILD_GRASS_5, RAND_INF_KF_CHILD_GRASS_5 },
+    { RC_KF_CHILD_GRASS_6, RAND_INF_KF_CHILD_GRASS_6 },
+    { RC_KF_CHILD_GRASS_7, RAND_INF_KF_CHILD_GRASS_7 },
+    { RC_KF_CHILD_GRASS_8, RAND_INF_KF_CHILD_GRASS_8 },
+    { RC_KF_CHILD_GRASS_9, RAND_INF_KF_CHILD_GRASS_9 },
+    { RC_KF_CHILD_GRASS_10, RAND_INF_KF_CHILD_GRASS_10 },
+    { RC_KF_CHILD_GRASS_11, RAND_INF_KF_CHILD_GRASS_11 },
+    { RC_KF_CHILD_GRASS_12, RAND_INF_KF_CHILD_GRASS_12 },
+    { RC_KF_CHILD_GRASS_MAZE_1, RAND_INF_KF_CHILD_GRASS_MAZE_1 },
+    { RC_KF_CHILD_GRASS_MAZE_2, RAND_INF_KF_CHILD_GRASS_MAZE_2 },
+    { RC_KF_CHILD_GRASS_MAZE_3, RAND_INF_KF_CHILD_GRASS_MAZE_3 },
+    { RC_KF_ADULT_GRASS_1, RAND_INF_KF_ADULT_GRASS_1 },
+    { RC_KF_ADULT_GRASS_2, RAND_INF_KF_ADULT_GRASS_2 },
+    { RC_KF_ADULT_GRASS_3, RAND_INF_KF_ADULT_GRASS_3 },
+    { RC_KF_ADULT_GRASS_4, RAND_INF_KF_ADULT_GRASS_4 },
+    { RC_KF_ADULT_GRASS_5, RAND_INF_KF_ADULT_GRASS_5 },
+    { RC_KF_ADULT_GRASS_6, RAND_INF_KF_ADULT_GRASS_6 },
+    { RC_KF_ADULT_GRASS_7, RAND_INF_KF_ADULT_GRASS_7 },
+    { RC_KF_ADULT_GRASS_8, RAND_INF_KF_ADULT_GRASS_8 },
+    { RC_KF_ADULT_GRASS_9, RAND_INF_KF_ADULT_GRASS_9 },
+    { RC_KF_ADULT_GRASS_10, RAND_INF_KF_ADULT_GRASS_10 },
+    { RC_KF_ADULT_GRASS_11, RAND_INF_KF_ADULT_GRASS_11 },
+    { RC_KF_ADULT_GRASS_12, RAND_INF_KF_ADULT_GRASS_12 },
+    { RC_KF_ADULT_GRASS_13, RAND_INF_KF_ADULT_GRASS_13 },
+    { RC_KF_ADULT_GRASS_14, RAND_INF_KF_ADULT_GRASS_14 },
+    { RC_KF_ADULT_GRASS_15, RAND_INF_KF_ADULT_GRASS_15 },
+    { RC_KF_ADULT_GRASS_16, RAND_INF_KF_ADULT_GRASS_16 },
+    { RC_KF_ADULT_GRASS_17, RAND_INF_KF_ADULT_GRASS_17 },
+    { RC_KF_ADULT_GRASS_18, RAND_INF_KF_ADULT_GRASS_18 },
+    { RC_KF_ADULT_GRASS_19, RAND_INF_KF_ADULT_GRASS_19 },
+    { RC_KF_ADULT_GRASS_20, RAND_INF_KF_ADULT_GRASS_20 },
+    { RC_LW_GRASS_1, RAND_INF_LW_GRASS_1 },
+    { RC_LW_GRASS_2, RAND_INF_LW_GRASS_2 },
+    { RC_LW_GRASS_3, RAND_INF_LW_GRASS_3 },
+    { RC_LW_GRASS_4, RAND_INF_LW_GRASS_4 },
+    { RC_LW_GRASS_5, RAND_INF_LW_GRASS_5 },
+    { RC_LW_GRASS_6, RAND_INF_LW_GRASS_6 },
+    { RC_LW_GRASS_7, RAND_INF_LW_GRASS_7 },
+    { RC_LW_GRASS_8, RAND_INF_LW_GRASS_8 },
+    { RC_LW_GRASS_9, RAND_INF_LW_GRASS_9 },
+    { RC_MARKET_GRASS_1, RAND_INF_MARKET_GRASS_1 },
+    { RC_MARKET_GRASS_2, RAND_INF_MARKET_GRASS_2 },
+    { RC_MARKET_GRASS_3, RAND_INF_MARKET_GRASS_3 },
+    { RC_MARKET_GRASS_4, RAND_INF_MARKET_GRASS_4 },
+    { RC_MARKET_GRASS_5, RAND_INF_MARKET_GRASS_5 },
+    { RC_MARKET_GRASS_6, RAND_INF_MARKET_GRASS_6 },
+    { RC_MARKET_GRASS_7, RAND_INF_MARKET_GRASS_7 },
+    { RC_MARKET_GRASS_8, RAND_INF_MARKET_GRASS_8 },
+    { RC_HC_GRASS_1, RAND_INF_HC_GRASS_1 },
+    { RC_HC_GRASS_2, RAND_INF_HC_GRASS_2 },
+    { RC_KAK_GRASS_1, RAND_INF_KAK_GRASS_1 },
+    { RC_KAK_GRASS_2, RAND_INF_KAK_GRASS_2 },
+    { RC_KAK_GRASS_3, RAND_INF_KAK_GRASS_3 },
+    { RC_KAK_GRASS_4, RAND_INF_KAK_GRASS_4 },
+    { RC_KAK_GRASS_5, RAND_INF_KAK_GRASS_5 },
+    { RC_KAK_GRASS_6, RAND_INF_KAK_GRASS_6 },
+    { RC_KAK_GRASS_7, RAND_INF_KAK_GRASS_7 },
+    { RC_KAK_GRASS_8, RAND_INF_KAK_GRASS_8 },
+    { RC_GY_GRASS_1, RAND_INF_GY_GRASS_1 },
+    { RC_GY_GRASS_2, RAND_INF_GY_GRASS_2 },
+    { RC_GY_GRASS_3, RAND_INF_GY_GRASS_3 },
+    { RC_GY_GRASS_4, RAND_INF_GY_GRASS_4 },
+    { RC_GY_GRASS_5, RAND_INF_GY_GRASS_5 },
+    { RC_GY_GRASS_6, RAND_INF_GY_GRASS_6 },
+    { RC_GY_GRASS_7, RAND_INF_GY_GRASS_7 },
+    { RC_GY_GRASS_8, RAND_INF_GY_GRASS_8 },
+    { RC_GY_GRASS_9, RAND_INF_GY_GRASS_9 },
+    { RC_GY_GRASS_10, RAND_INF_GY_GRASS_10 },
+    { RC_GY_GRASS_11, RAND_INF_GY_GRASS_11 },
+    { RC_GY_GRASS_12, RAND_INF_GY_GRASS_12 },
+    { RC_LH_GRASS_1, RAND_INF_LH_GRASS_1 },
+    { RC_LH_GRASS_2, RAND_INF_LH_GRASS_2 },
+    { RC_LH_GRASS_3, RAND_INF_LH_GRASS_3 },
+    { RC_LH_GRASS_4, RAND_INF_LH_GRASS_4 },
+    { RC_LH_GRASS_5, RAND_INF_LH_GRASS_5 },
+    { RC_LH_GRASS_6, RAND_INF_LH_GRASS_6 },
+    { RC_LH_GRASS_7, RAND_INF_LH_GRASS_7 },
+    { RC_LH_GRASS_8, RAND_INF_LH_GRASS_8 },
+    { RC_LH_GRASS_9, RAND_INF_LH_GRASS_9 },
+    { RC_LH_GRASS_10, RAND_INF_LH_GRASS_10 },
+    { RC_LH_GRASS_11, RAND_INF_LH_GRASS_11 },
+    { RC_LH_GRASS_12, RAND_INF_LH_GRASS_12 },
+    { RC_LH_GRASS_13, RAND_INF_LH_GRASS_13 },
+    { RC_LH_GRASS_14, RAND_INF_LH_GRASS_14 },
+    { RC_LH_GRASS_15, RAND_INF_LH_GRASS_15 },
+    { RC_LH_GRASS_16, RAND_INF_LH_GRASS_16 },
+    { RC_LH_GRASS_17, RAND_INF_LH_GRASS_17 },
+    { RC_LH_GRASS_18, RAND_INF_LH_GRASS_18 },
+    { RC_LH_GRASS_19, RAND_INF_LH_GRASS_19 },
+    { RC_LH_GRASS_20, RAND_INF_LH_GRASS_20 },
+    { RC_LH_GRASS_21, RAND_INF_LH_GRASS_21 },
+    { RC_LH_GRASS_22, RAND_INF_LH_GRASS_22 },
+    { RC_LH_GRASS_23, RAND_INF_LH_GRASS_23 },
+    { RC_LH_GRASS_24, RAND_INF_LH_GRASS_24 },
+    { RC_LH_GRASS_25, RAND_INF_LH_GRASS_25 },
+    { RC_LH_GRASS_26, RAND_INF_LH_GRASS_26 },
+    { RC_LH_GRASS_27, RAND_INF_LH_GRASS_27 },
+    { RC_LH_GRASS_28, RAND_INF_LH_GRASS_28 },
+    { RC_LH_GRASS_29, RAND_INF_LH_GRASS_29 },
+    { RC_LH_GRASS_30, RAND_INF_LH_GRASS_30 },
+    { RC_LH_GRASS_31, RAND_INF_LH_GRASS_31 },
+    { RC_LH_GRASS_32, RAND_INF_LH_GRASS_32 },
+    { RC_LH_GRASS_33, RAND_INF_LH_GRASS_33 },
+    { RC_LH_GRASS_34, RAND_INF_LH_GRASS_34 },
+    { RC_LH_GRASS_35, RAND_INF_LH_GRASS_35 },
+    { RC_LH_GRASS_36, RAND_INF_LH_GRASS_36 },
+    { RC_LH_CHILD_GRASS_1, RAND_INF_LH_CHILD_GRASS_1 },
+    { RC_LH_CHILD_GRASS_2, RAND_INF_LH_CHILD_GRASS_2 },
+    { RC_LH_CHILD_GRASS_3, RAND_INF_LH_CHILD_GRASS_3 },
+    { RC_LH_CHILD_GRASS_4, RAND_INF_LH_CHILD_GRASS_4 },
+    { RC_LH_WARP_PAD_GRASS_1, RAND_INF_LH_WARP_PAD_GRASS_1 },
+    { RC_LH_WARP_PAD_GRASS_2, RAND_INF_LH_WARP_PAD_GRASS_2 },
+    { RC_HF_NEAR_KF_GRASS_1, RAND_INF_HF_NEAR_KF_GRASS_1 },
+    { RC_HF_NEAR_KF_GRASS_2, RAND_INF_HF_NEAR_KF_GRASS_2 },
+    { RC_HF_NEAR_KF_GRASS_3, RAND_INF_HF_NEAR_KF_GRASS_3 },
+    { RC_HF_NEAR_KF_GRASS_4, RAND_INF_HF_NEAR_KF_GRASS_4 },
+    { RC_HF_NEAR_KF_GRASS_5, RAND_INF_HF_NEAR_KF_GRASS_5 },
+    { RC_HF_NEAR_KF_GRASS_6, RAND_INF_HF_NEAR_KF_GRASS_6 },
+    { RC_HF_NEAR_KF_GRASS_7, RAND_INF_HF_NEAR_KF_GRASS_7 },
+    { RC_HF_NEAR_KF_GRASS_8, RAND_INF_HF_NEAR_KF_GRASS_8 },
+    { RC_HF_NEAR_KF_GRASS_9, RAND_INF_HF_NEAR_KF_GRASS_9 },
+    { RC_HF_NEAR_KF_GRASS_10, RAND_INF_HF_NEAR_KF_GRASS_10 },
+    { RC_HF_NEAR_KF_GRASS_11, RAND_INF_HF_NEAR_KF_GRASS_11 },
+    { RC_HF_NEAR_KF_GRASS_12, RAND_INF_HF_NEAR_KF_GRASS_12 },
+    { RC_HF_NEAR_MARKET_GRASS_1, RAND_INF_HF_NEAR_MARKET_GRASS_1 },
+    { RC_HF_NEAR_MARKET_GRASS_2, RAND_INF_HF_NEAR_MARKET_GRASS_2 },
+    { RC_HF_NEAR_MARKET_GRASS_3, RAND_INF_HF_NEAR_MARKET_GRASS_3 },
+    { RC_HF_NEAR_MARKET_GRASS_4, RAND_INF_HF_NEAR_MARKET_GRASS_4 },
+    { RC_HF_NEAR_MARKET_GRASS_5, RAND_INF_HF_NEAR_MARKET_GRASS_5 },
+    { RC_HF_NEAR_MARKET_GRASS_6, RAND_INF_HF_NEAR_MARKET_GRASS_6 },
+    { RC_HF_NEAR_MARKET_GRASS_7, RAND_INF_HF_NEAR_MARKET_GRASS_7 },
+    { RC_HF_NEAR_MARKET_GRASS_8, RAND_INF_HF_NEAR_MARKET_GRASS_8 },
+    { RC_HF_NEAR_MARKET_GRASS_9, RAND_INF_HF_NEAR_MARKET_GRASS_9 },
+    { RC_HF_NEAR_MARKET_GRASS_10, RAND_INF_HF_NEAR_MARKET_GRASS_10 },
+    { RC_HF_NEAR_MARKET_GRASS_11, RAND_INF_HF_NEAR_MARKET_GRASS_11 },
+    { RC_HF_NEAR_MARKET_GRASS_12, RAND_INF_HF_NEAR_MARKET_GRASS_12 },
+    { RC_HF_SOUTH_GRASS_1, RAND_INF_HF_SOUTH_GRASS_1 },
+    { RC_HF_SOUTH_GRASS_2, RAND_INF_HF_SOUTH_GRASS_2 },
+    { RC_HF_SOUTH_GRASS_3, RAND_INF_HF_SOUTH_GRASS_3 },
+    { RC_HF_SOUTH_GRASS_4, RAND_INF_HF_SOUTH_GRASS_4 },
+    { RC_HF_SOUTH_GRASS_5, RAND_INF_HF_SOUTH_GRASS_5 },
+    { RC_HF_SOUTH_GRASS_6, RAND_INF_HF_SOUTH_GRASS_6 },
+    { RC_HF_SOUTH_GRASS_7, RAND_INF_HF_SOUTH_GRASS_7 },
+    { RC_HF_SOUTH_GRASS_8, RAND_INF_HF_SOUTH_GRASS_8 },
+    { RC_HF_SOUTH_GRASS_9, RAND_INF_HF_SOUTH_GRASS_9 },
+    { RC_HF_SOUTH_GRASS_10, RAND_INF_HF_SOUTH_GRASS_10 },
+    { RC_HF_SOUTH_GRASS_11, RAND_INF_HF_SOUTH_GRASS_11 },
+    { RC_HF_SOUTH_GRASS_12, RAND_INF_HF_SOUTH_GRASS_12 },
+    { RC_HF_CENTRAL_GRASS_1, RAND_INF_HF_CENTRAL_GRASS_1 },
+    { RC_HF_CENTRAL_GRASS_2, RAND_INF_HF_CENTRAL_GRASS_2 },
+    { RC_HF_CENTRAL_GRASS_3, RAND_INF_HF_CENTRAL_GRASS_3 },
+    { RC_HF_CENTRAL_GRASS_4, RAND_INF_HF_CENTRAL_GRASS_4 },
+    { RC_HF_CENTRAL_GRASS_5, RAND_INF_HF_CENTRAL_GRASS_5 },
+    { RC_HF_CENTRAL_GRASS_6, RAND_INF_HF_CENTRAL_GRASS_6 },
+    { RC_HF_CENTRAL_GRASS_7, RAND_INF_HF_CENTRAL_GRASS_7 },
+    { RC_HF_CENTRAL_GRASS_8, RAND_INF_HF_CENTRAL_GRASS_8 },
+    { RC_HF_CENTRAL_GRASS_9, RAND_INF_HF_CENTRAL_GRASS_9 },
+    { RC_HF_CENTRAL_GRASS_10, RAND_INF_HF_CENTRAL_GRASS_10 },
+    { RC_HF_CENTRAL_GRASS_11, RAND_INF_HF_CENTRAL_GRASS_11 },
+    { RC_HF_CENTRAL_GRASS_12, RAND_INF_HF_CENTRAL_GRASS_12 },
+    { RC_ZR_GRASS_1, RAND_INF_ZR_GRASS_1 },
+    { RC_ZR_GRASS_2, RAND_INF_ZR_GRASS_2 },
+    { RC_ZR_GRASS_3, RAND_INF_ZR_GRASS_3 },
+    { RC_ZR_GRASS_4, RAND_INF_ZR_GRASS_4 },
+    { RC_ZR_GRASS_5, RAND_INF_ZR_GRASS_5 },
+    { RC_ZR_GRASS_6, RAND_INF_ZR_GRASS_6 },
+    { RC_ZR_GRASS_7, RAND_INF_ZR_GRASS_7 },
+    { RC_ZR_GRASS_8, RAND_INF_ZR_GRASS_8 },
+    { RC_ZR_GRASS_9, RAND_INF_ZR_GRASS_9 },
+    { RC_ZR_GRASS_10, RAND_INF_ZR_GRASS_10 },
+    { RC_ZR_GRASS_11, RAND_INF_ZR_GRASS_11 },
+    { RC_ZR_GRASS_12, RAND_INF_ZR_GRASS_12 },
+    { RC_ZR_NEAR_FREESTANDING_POH_GRASS, RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS },
+    // Grotto Grass
+    { RC_KF_STORMS_GROTTO_GRASS_1, RAND_INF_KF_STORMS_GROTTO_GRASS_1 },
+    { RC_KF_STORMS_GROTTO_GRASS_2, RAND_INF_KF_STORMS_GROTTO_GRASS_2 },
+    { RC_KF_STORMS_GROTTO_GRASS_3, RAND_INF_KF_STORMS_GROTTO_GRASS_3 },
+    { RC_KF_STORMS_GROTTO_GRASS_4, RAND_INF_KF_STORMS_GROTTO_GRASS_4 },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1, RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1 },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2, RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2 },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3, RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3 },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4, RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4 },
+    { RC_HF_NEAR_MARKET_GROTTO_GRASS_1, RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_1 },
+    { RC_HF_NEAR_MARKET_GROTTO_GRASS_2, RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_2 },
+    { RC_HF_NEAR_MARKET_GROTTO_GRASS_3, RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_3 },
+    { RC_HF_NEAR_MARKET_GROTTO_GRASS_4, RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_4 },
+    { RC_HF_OPEN_GROTTO_GRASS_1, RAND_INF_HF_OPEN_GROTTO_GRASS_1 },
+    { RC_HF_OPEN_GROTTO_GRASS_2, RAND_INF_HF_OPEN_GROTTO_GRASS_2 },
+    { RC_HF_OPEN_GROTTO_GRASS_3, RAND_INF_HF_OPEN_GROTTO_GRASS_3 },
+    { RC_HF_OPEN_GROTTO_GRASS_4, RAND_INF_HF_OPEN_GROTTO_GRASS_4 },
+    { RC_HF_SOUTHEAST_GROTTO_GRASS_1, RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_1 },
+    { RC_HF_SOUTHEAST_GROTTO_GRASS_2, RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_2 },
+    { RC_HF_SOUTHEAST_GROTTO_GRASS_3, RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_3 },
+    { RC_HF_SOUTHEAST_GROTTO_GRASS_4, RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_4 },
+    { RC_HF_COW_GROTTO_GRASS_1, RAND_INF_HF_COW_GROTTO_GRASS_1 },
+    { RC_HF_COW_GROTTO_GRASS_2, RAND_INF_HF_COW_GROTTO_GRASS_2 },
+    { RC_KAK_OPEN_GROTTO_GRASS_1, RAND_INF_KAK_OPEN_GROTTO_GRASS_1 },
+    { RC_KAK_OPEN_GROTTO_GRASS_2, RAND_INF_KAK_OPEN_GROTTO_GRASS_2 },
+    { RC_KAK_OPEN_GROTTO_GRASS_3, RAND_INF_KAK_OPEN_GROTTO_GRASS_3 },
+    { RC_KAK_OPEN_GROTTO_GRASS_4, RAND_INF_KAK_OPEN_GROTTO_GRASS_4 },
+    { RC_DMT_STORMS_GROTTO_GRASS_1, RAND_INF_DMT_STORMS_GROTTO_GRASS_1 },
+    { RC_DMT_STORMS_GROTTO_GRASS_2, RAND_INF_DMT_STORMS_GROTTO_GRASS_2 },
+    { RC_DMT_STORMS_GROTTO_GRASS_3, RAND_INF_DMT_STORMS_GROTTO_GRASS_3 },
+    { RC_DMT_STORMS_GROTTO_GRASS_4, RAND_INF_DMT_STORMS_GROTTO_GRASS_4 },
+    { RC_DMT_COW_GROTTO_GRASS_1, RAND_INF_DMT_COW_GROTTO_GRASS_1 },
+    { RC_DMT_COW_GROTTO_GRASS_2, RAND_INF_DMT_COW_GROTTO_GRASS_2 },
+    { RC_DMC_UPPER_GROTTO_GRASS_1, RAND_INF_DMC_UPPER_GROTTO_GRASS_1 },
+    { RC_DMC_UPPER_GROTTO_GRASS_2, RAND_INF_DMC_UPPER_GROTTO_GRASS_2 },
+    { RC_DMC_UPPER_GROTTO_GRASS_3, RAND_INF_DMC_UPPER_GROTTO_GRASS_3 },
+    { RC_DMC_UPPER_GROTTO_GRASS_4, RAND_INF_DMC_UPPER_GROTTO_GRASS_4 },
+    { RC_ZR_OPEN_GROTTO_GRASS_1, RAND_INF_ZR_OPEN_GROTTO_GRASS_1 },
+    { RC_ZR_OPEN_GROTTO_GRASS_2, RAND_INF_ZR_OPEN_GROTTO_GRASS_2 },
+    { RC_ZR_OPEN_GROTTO_GRASS_3, RAND_INF_ZR_OPEN_GROTTO_GRASS_3 },
+    { RC_ZR_OPEN_GROTTO_GRASS_4, RAND_INF_ZR_OPEN_GROTTO_GRASS_4 },
+    // Dungeon Grass
+    { RC_DEKU_TREE_LOBBY_GRASS_1, RAND_INF_DEKU_TREE_LOBBY_GRASS_1 },
+    { RC_DEKU_TREE_LOBBY_GRASS_2, RAND_INF_DEKU_TREE_LOBBY_GRASS_2 },
+    { RC_DEKU_TREE_LOBBY_GRASS_3, RAND_INF_DEKU_TREE_LOBBY_GRASS_3 },
+    { RC_DEKU_TREE_LOBBY_GRASS_4, RAND_INF_DEKU_TREE_LOBBY_GRASS_4 },
+    { RC_DEKU_TREE_LOBBY_GRASS_5, RAND_INF_DEKU_TREE_LOBBY_GRASS_5 },
+    { RC_DEKU_TREE_SLINGSHOT_GRASS_1, RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_1 },
+    { RC_DEKU_TREE_SLINGSHOT_GRASS_2, RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_2 },
+    { RC_DEKU_TREE_SLINGSHOT_GRASS_3, RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_3 },
+    { RC_DEKU_TREE_SLINGSHOT_GRASS_4, RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_4 },
+    { RC_DEKU_TREE_COMPASS_GRASS_1, RAND_INF_DEKU_TREE_COMPASS_GRASS_1 },
+    { RC_DEKU_TREE_COMPASS_GRASS_2, RAND_INF_DEKU_TREE_COMPASS_GRASS_2 },
+    { RC_DEKU_TREE_BASEMENT_GRASS_1, RAND_INF_DEKU_TREE_BASEMENT_GRASS_1 },
+    { RC_DEKU_TREE_BASEMENT_GRASS_2, RAND_INF_DEKU_TREE_BASEMENT_GRASS_2 },
+    { RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1, RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1 },
+    { RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2, RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2 },
+    { RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3, RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3 },
+    { RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4, RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4 },
+    { RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1, RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1 },
+    { RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2, RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2 },
+    { RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_1, RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_1 },
+    { RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_2, RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_2 },
+    { RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_1, RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_1 },
+    { RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_2, RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_2 },
+    { RC_DEKU_TREE_BEFORE_BOSS_GRASS_1, RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_1 },
+    { RC_DEKU_TREE_BEFORE_BOSS_GRASS_2, RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_2 },
+    { RC_DEKU_TREE_BEFORE_BOSS_GRASS_3, RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_3 },
+    { RC_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS, RAND_INF_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS },
+    { RC_DODONGOS_CAVERN_BLADE_GRASS, RAND_INF_DODONGOS_CAVERN_BLADE_GRASS },
+    { RC_DODONGOS_CAVERN_SINGLE_EYE_GRASS, RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_GRASS },
+    { RC_DODONGOS_CAVERN_BEFORE_BOSS_GRASS, RAND_INF_DODONGOS_CAVERN_BEFORE_BOSS_GRASS },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3 },
+    // MQ Dungeon Grass
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_1, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_1 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_2, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_2 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_3, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_3 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_4, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_4 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_5, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_5 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_6, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_6 },
+    { RC_DEKU_TREE_MQ_LOBBY_GRASS_7, RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_7 },
+    { RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_1, RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_1 },
+    { RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_2, RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_2 },
+    { RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_3, RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_3 },
+    { RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_4, RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6 },
+    { RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7, RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7 },
+    { RC_DEKU_TREE_MQ_COMPASS_GRASS_1, RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_1 },
+    { RC_DEKU_TREE_MQ_COMPASS_GRASS_2, RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_2 },
+    { RC_DEKU_TREE_MQ_COMPASS_GRASS_3, RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_3 },
+    { RC_DEKU_TREE_MQ_COMPASS_GRASS_4, RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4, RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4, RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4, RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4 },
+    { RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5, RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5 },
+    { RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1, RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2, RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3, RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3 },
+    { RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1, RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1 },
+    { RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2, RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2 },
+    { RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3, RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3 },
+    { RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1, RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1 },
+    { RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2, RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2 },
+    { RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3, RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3 },
+    { RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4, RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4 },
+    { RC_DODONGOS_CAVERN_MQ_ARMOS_GRASS, RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_GRASS },
+    { RC_DODONGOS_CAVERN_MQ_BACK_POE_GRASS, RAND_INF_DODONGOS_CAVERN_MQ_BACK_POE_GRASS },
+    { RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1, RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1 },
+    { RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2, RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2 },
+    { RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1, RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1 },
+    { RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2, RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2 },
+    { RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_1, RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_1 },
+    { RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_2, RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_2 },
+    { RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1, RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1 },
+    { RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2, RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2 },
+    { RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3, RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3 },
+    { RC_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS, RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS },
+    { RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1, RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1 },
+    { RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2, RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2 },
+    { RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS, RAND_INF_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS },
+    { RC_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS, RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS },
+    { RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1, RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1 },
+    { RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2, RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1, RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2, RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3, RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4, RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4 },
+    // Shared Dungeon Grass
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_1, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_1 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_2, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_2 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_3, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_3 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_4, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_4 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_5, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_5 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_6, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_6 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_7, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_7 },
+    { RC_DEKU_TREE_QUEEN_GOHMA_GRASS_8, RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_8 },
+    // End Grass
 
-    { RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1,                            RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1 },
-    { RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2,                            RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2 },
-    { RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1,                              RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1 },
-    { RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2,                              RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2 },
-    { RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,                          RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1 },
-    { RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,                          RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2 },
-    { RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,                          RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1 },
-    { RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,                          RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2 },
-    { RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,                         RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_1,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_2,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_3,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_4,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_5,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5 },
-    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_6,                                  RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6 },
-    { RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1,                                 RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2,                                 RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1,                          RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2,                          RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3,                          RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3 },
-    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4,                          RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4 },
-    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1,                               RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2,                               RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3,                               RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3 },
-    { RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1,                              RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2,                              RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1,                               RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1 },
-    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2,                               RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2 },
-    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3,                               RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3 },
-    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4,                               RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1,                           RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2,                           RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3,                           RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3 },
-    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4,                           RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1,                       RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2,                       RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3,                       RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3 },
-    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4,                       RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1,                             RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2,                             RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3,                             RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3 },
-    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4,                             RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT,                    RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT,                    RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1,                           RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2,                           RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1,                            RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2,                            RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1,                            RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2,                            RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3,                            RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3 },
-    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4,                            RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT,                          RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT,                          RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT,                          RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3 },
-    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT,                          RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4 },
-    { RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT,                         RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT,                         RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2 },
-    { RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1,                             RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1 },
-    { RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2,                             RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2 },
-    { RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1,                           RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2,                           RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1,                            RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2,                            RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1,                           RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2,                           RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1,                             RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2,                             RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1,                            RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2,                            RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2 },
-    { RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1,                           RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1 },
-    { RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2,                           RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1,                       RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2,                       RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1,                        RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2,                        RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT,                      RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT,                      RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT,                     RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3 },
-    { RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT,                     RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4 },
-    { RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1,                            RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2,                            RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT,                        RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT,                        RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2 },
-    { RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT,                         RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3 },
-    { RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT,                         RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4 },
-    { RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT,                           RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT },
-    { RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1,                              RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1 },
-    { RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2,                              RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1,                       RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2,                       RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3,                       RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT,                         RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT },
-    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1,                   RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2,                   RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2 },
-    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3,                   RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3 },
-    { RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1,                                 RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2,                                 RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1,                             RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2,                             RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT,                            RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT,                             RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT,                            RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3 },
-    { RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1,                               RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2,                               RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1,                               RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2,                               RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3,                               RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3 },
-    { RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1,                               RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2,                               RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT,                       RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT,                       RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT,                        RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3 },
-    { RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT,                        RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4 },
-    { RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT,                       RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5 },
-    { RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT,                       RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7 },
-    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8,                         RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8 },
-    { RC_ICE_CAVERN_MQ_ENTRANCE_POT,                                    RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT },
-    { RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1,                             RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1 },
-    { RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2,                             RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2 },
-    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1,                              RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1 },
-    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2,                              RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2 },
-    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3,                              RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3 },
-    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4,                              RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4 },
-    { RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1,                                RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1 },
-    { RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2,                                RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2 },
-    { RC_ICE_CAVERN_MQ_COMPASS_POT_1,                                   RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1 },
-    { RC_ICE_CAVERN_MQ_COMPASS_POT_2,                                   RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1,                               RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2,                               RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3,                               RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3 },
-    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4,                               RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT,                             RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1,                            RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2,                            RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT,                          RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1,                          RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2,                          RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3,                          RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3 },
-    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4,                          RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4 },
-    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT,                    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT,                           RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT,                           RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3 },
-    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT,                           RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4 },
-    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT,                       RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5 },
-    { RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1,                             RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2,                             RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1,                             RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2,                             RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1,                             RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2,                             RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3,                             RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3 },
-    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4,                             RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4 },
-    { RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1,                          RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2,                          RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2 },
-    { RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1,                            RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1 },
-    { RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2,                            RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2 },
-    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT,                     RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1 },
-    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT,                    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2 },
-    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT,                       RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3 },
-    { RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT,                       RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4 },
-    { RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT,                       RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5 },
-    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1,                          RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1 },
-    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2,                          RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2 },
-    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3,                          RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3 },
-    { RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1,                        RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1 },
-    { RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2,                        RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2 },
-    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT,                        RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3 },
-    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT,                         RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4 },
-    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT,                         RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5 },
-    { RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1,                         RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1 },
-    { RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2,                         RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2 },
-    { RC_WATER_TEMPLE_MQ_RIVER_POT_1,                                   RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1 },
-    { RC_WATER_TEMPLE_MQ_RIVER_POT_2,                                   RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2 },
-    { RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1,                            RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1 },
-    { RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2,                            RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2 },
-    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1,                          RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1 },
-    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2,                          RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2 },
-    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1,                         RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1 },
-    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2,                         RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2 },
-    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3,                         RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3 },
-    { RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1,                           RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1 },
-    { RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2,                           RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2 },
-    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1,                               RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1 },
-    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2,                               RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2 },
-    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3,                               RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3 },
-    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4,                               RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4 },
-    { RC_WATER_TEMPLE_MQ_BOSS_KEY_POT,                                  RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT },
-    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1,                   RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1 },
-    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2,                   RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2 },
-    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1,                  RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1 },
-    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2,                  RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2 },
+    { RC_KF_LINKS_HOUSE_POT, RAND_INF_KF_LINKS_HOUSE_POT },
+    { RC_KF_TWINS_HOUSE_POT_1, RAND_INF_KF_TWINS_HOUSE_POT_1 },
+    { RC_KF_TWINS_HOUSE_POT_2, RAND_INF_KF_TWINS_HOUSE_POT_2 },
+    { RC_KF_BROTHERS_HOUSE_POT_1, RAND_INF_KF_BROTHERS_HOUSE_POT_1 },
+    { RC_KF_BROTHERS_HOUSE_POT_2, RAND_INF_KF_BROTHERS_HOUSE_POT_2 },
+    { RC_TH_BREAK_ROOM_FRONT_POT, RAND_INF_TH_BREAK_ROOM_FRONT_POT },
+    { RC_TH_BREAK_ROOM_BACK_POT, RAND_INF_TH_BREAK_ROOM_BACK_POT },
+    { RC_TH_KITCHEN_POT_1, RAND_INF_TH_KITCHEN_POT_1 },
+    { RC_TH_KITCHEN_POT_2, RAND_INF_TH_KITCHEN_POT_2 },
+    { RC_TH_1_TORCH_CELL_RIGHT_POT, RAND_INF_TH_1_TORCH_CELL_RIGHT_POT },
+    { RC_TH_1_TORCH_CELL_MID_POT, RAND_INF_TH_1_TORCH_CELL_MID_POT },
+    { RC_TH_1_TORCH_CELL_LEFT_POT, RAND_INF_TH_1_TORCH_CELL_LEFT_POT },
+    { RC_TH_STEEP_SLOPE_RIGHT_POT, RAND_INF_TH_STEEP_SLOPE_RIGHT_POT },
+    { RC_TH_STEEP_SLOPE_LEFT_POT, RAND_INF_TH_STEEP_SLOPE_LEFT_POT },
+    { RC_TH_NEAR_DOUBLE_CELL_RIGHT_POT, RAND_INF_TH_NEAR_DOUBLE_CELL_RIGHT_POT },
+    { RC_TH_NEAR_DOUBLE_CELL_MID_POT, RAND_INF_TH_NEAR_DOUBLE_CELL_MID_POT },
+    { RC_TH_NEAR_DOUBLE_CELL_LEFT_POT, RAND_INF_NEAR_DOUBLE_CELL_LEFT_POT },
+    { RC_TH_RIGHTMOST_JAILED_POT, RAND_INF_TH_RIGHTMOST_JAILED_POT },
+    { RC_TH_RIGHT_MIDDLE_JAILED_POT, RAND_INF_TH_RIGHT_MIDDLE_JAILED_POT },
+    { RC_TH_LEFT_MIDDLE_JAILED_POT, RAND_INF_TH_LEFT_MIDDLE_JAILED_POT },
+    { RC_TH_LEFTMOST_JAILED_POT, RAND_INF_TH_LEFTMOST_JAILED_POT },
+    { RC_WASTELAND_NEAR_GS_POT_1, RAND_INF_WASTELAND_NEAR_GS_POT_1 },
+    { RC_WASTELAND_NEAR_GS_POT_2, RAND_INF_WASTELAND_NEAR_GS_POT_2 },
+    { RC_WASTELAND_NEAR_GS_POT_3, RAND_INF_WASTELAND_NEAR_GS_POT_3 },
+    { RC_WASTELAND_NEAR_GS_POT_4, RAND_INF_WASTELAND_NEAR_GS_POT_4 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_1, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_2, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_3, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_4, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_5, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_6, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_7, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_8, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_9, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_10, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_11, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_12, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_13, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_14, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_15, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_16, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_17, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_18, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_19, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_20, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_21, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_22, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_23, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_24, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_25, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_26, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_27, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_28, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_29, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_30, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_31, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_32, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_33, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_34, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_35, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_36, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_37, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_38, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_39, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_40, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_41, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_42, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_43, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43 },
+    { RC_MK_GUARD_HOUSE_CHILD_POT_44, RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_1, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_2, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_3, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_4, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_5, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_6, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_7, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_8, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_9, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_10, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10 },
+    { RC_MK_GUARD_HOUSE_ADULT_POT_11, RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11 },
+    { RC_MK_BACK_ALLEY_HOUSE_POT_1, RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1 },
+    { RC_MK_BACK_ALLEY_HOUSE_POT_2, RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2 },
+    { RC_MK_BACK_ALLEY_HOUSE_POT_3, RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3 },
+    { RC_KAK_NEAR_POTION_SHOP_POT_1, RAND_INF_KAK_NEAR_POTION_SHOP_POT_1 },
+    { RC_KAK_NEAR_POTION_SHOP_POT_2, RAND_INF_KAK_NEAR_POTION_SHOP_POT_2 },
+    { RC_KAK_NEAR_POTION_SHOP_POT_3, RAND_INF_KAK_NEAR_POTION_SHOP_POT_3 },
+    { RC_KAK_NEAR_IMPAS_HOUSE_POT_1, RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1 },
+    { RC_KAK_NEAR_IMPAS_HOUSE_POT_2, RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2 },
+    { RC_KAK_NEAR_IMPAS_HOUSE_POT_3, RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3 },
+    { RC_KAK_NEAR_GUARDS_HOUSE_POT_1, RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1 },
+    { RC_KAK_NEAR_GUARDS_HOUSE_POT_2, RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2 },
+    { RC_KAK_NEAR_GUARDS_HOUSE_POT_3, RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3 },
+    { RC_KAK_NEAR_MEDICINE_SHOP_POT_1, RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1 },
+    { RC_KAK_NEAR_MEDICINE_SHOP_POT_2, RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2 },
+    { RC_GY_DAMPES_GRAVE_POT_1, RAND_INF_GY_DAMPES_GRAVE_POT_1 },
+    { RC_GY_DAMPES_GRAVE_POT_2, RAND_INF_GY_DAMPES_GRAVE_POT_2 },
+    { RC_GY_DAMPES_GRAVE_POT_3, RAND_INF_GY_DAMPES_GRAVE_POT_3 },
+    { RC_GY_DAMPES_GRAVE_POT_4, RAND_INF_GY_DAMPES_GRAVE_POT_4 },
+    { RC_GY_DAMPES_GRAVE_POT_5, RAND_INF_GY_DAMPES_GRAVE_POT_5 },
+    { RC_GY_DAMPES_GRAVE_POT_6, RAND_INF_GY_DAMPES_GRAVE_POT_6 },
+    { RC_GC_LOWER_STAIRCASE_POT_1, RAND_INF_GC_LOWER_STAIRCASE_POT_1 },
+    { RC_GC_LOWER_STAIRCASE_POT_2, RAND_INF_GC_LOWER_STAIRCASE_POT_2 },
+    { RC_GC_UPPER_STAIRCASE_POT_1, RAND_INF_GC_UPPER_STAIRCASE_POT_1 },
+    { RC_GC_UPPER_STAIRCASE_POT_2, RAND_INF_GC_UPPER_STAIRCASE_POT_2 },
+    { RC_GC_UPPER_STAIRCASE_POT_3, RAND_INF_GC_UPPER_STAIRCASE_POT_3 },
+    { RC_GC_MEDIGORON_POT_1, RAND_INF_GC_MEDIGORON_POT_1 },
+    { RC_GC_DARUNIA_POT_1, RAND_INF_GC_DARUNIA_POT_1 },
+    { RC_GC_DARUNIA_POT_2, RAND_INF_GC_DARUNIA_POT_2 },
+    { RC_GC_DARUNIA_POT_3, RAND_INF_GC_DARUNIA_POT_3 },
+    { RC_DMC_NEAR_GC_POT_1, RAND_INF_DMC_NEAR_GC_POT_1 },
+    { RC_DMC_NEAR_GC_POT_2, RAND_INF_DMC_NEAR_GC_POT_2 },
+    { RC_DMC_NEAR_GC_POT_3, RAND_INF_DMC_NEAR_GC_POT_3 },
+    { RC_DMC_NEAR_GC_POT_4, RAND_INF_DMC_NEAR_GC_POT_4 },
+    { RC_ZD_NEAR_SHOP_POT_1, RAND_INF_ZD_NEAR_SHOP_POT_1 },
+    { RC_ZD_NEAR_SHOP_POT_2, RAND_INF_ZD_NEAR_SHOP_POT_2 },
+    { RC_ZD_NEAR_SHOP_POT_3, RAND_INF_ZD_NEAR_SHOP_POT_3 },
+    { RC_ZD_NEAR_SHOP_POT_4, RAND_INF_ZD_NEAR_SHOP_POT_4 },
+    { RC_ZD_NEAR_SHOP_POT_5, RAND_INF_ZD_NEAR_SHOP_POT_5 },
+    { RC_ZF_HIDDEN_CAVE_POT_1, RAND_INF_ZF_HIDDEN_CAVE_POT_1 },
+    { RC_ZF_HIDDEN_CAVE_POT_2, RAND_INF_ZF_HIDDEN_CAVE_POT_2 },
+    { RC_ZF_HIDDEN_CAVE_POT_3, RAND_INF_ZF_HIDDEN_CAVE_POT_3 },
+    { RC_ZF_NEAR_JABU_POT_1, RAND_INF_ZF_NEAR_JABU_POT_1 },
+    { RC_ZF_NEAR_JABU_POT_2, RAND_INF_ZF_NEAR_JABU_POT_2 },
+    { RC_ZF_NEAR_JABU_POT_3, RAND_INF_ZF_NEAR_JABU_POT_3 },
+    { RC_ZF_NEAR_JABU_POT_4, RAND_INF_ZF_NEAR_JABU_POT_4 },
+    { RC_LLR_FRONT_POT_1, RAND_INF_LLR_FRONT_POT_1 },
+    { RC_LLR_FRONT_POT_2, RAND_INF_LLR_FRONT_POT_2 },
+    { RC_LLR_FRONT_POT_3, RAND_INF_LLR_FRONT_POT_3 },
+    { RC_LLR_FRONT_POT_4, RAND_INF_LLR_FRONT_POT_4 },
+    { RC_LLR_RAIN_SHED_POT_1, RAND_INF_LLR_RAIN_SHED_POT_1 },
+    { RC_LLR_RAIN_SHED_POT_2, RAND_INF_LLR_RAIN_SHED_POT_2 },
+    { RC_LLR_RAIN_SHED_POT_3, RAND_INF_LLR_RAIN_SHED_POT_3 },
+    { RC_LLR_TALONS_HOUSE_POT_1, RAND_INF_LLR_TALONS_HOUSE_POT_1 },
+    { RC_LLR_TALONS_HOUSE_POT_2, RAND_INF_LLR_TALONS_HOUSE_POT_2 },
+    { RC_LLR_TALONS_HOUSE_POT_3, RAND_INF_LLR_TALONS_HOUSE_POT_3 },
+    { RC_HF_COW_GROTTO_POT_1, RAND_INF_HF_COW_GROTTO_POT_1 },
+    { RC_HF_COW_GROTTO_POT_2, RAND_INF_HF_COW_GROTTO_POT_2 },
+    { RC_HC_STORMS_GROTTO_POT_1, RAND_INF_HC_STORMS_GROTTO_POT_1 },
+    { RC_HC_STORMS_GROTTO_POT_2, RAND_INF_HC_STORMS_GROTTO_POT_2 },
+    { RC_HC_STORMS_GROTTO_POT_3, RAND_INF_HC_STORMS_GROTTO_POT_3 },
+    { RC_HC_STORMS_GROTTO_POT_4, RAND_INF_HC_STORMS_GROTTO_POT_4 },
+    { RC_DODONGOS_CAVERN_LIZALFOS_POT_1, RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1 },
+    { RC_DODONGOS_CAVERN_LIZALFOS_POT_2, RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2 },
+    { RC_DODONGOS_CAVERN_LIZALFOS_POT_3, RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3 },
+    { RC_DODONGOS_CAVERN_LIZALFOS_POT_4, RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5 },
+    { RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6, RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6 },
+    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1, RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2, RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2 },
+    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3, RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3 },
+    { RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4, RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4 },
+    { RC_DODONGOS_CAVERN_STAIRCASE_POT_1, RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1 },
+    { RC_DODONGOS_CAVERN_STAIRCASE_POT_2, RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2 },
+    { RC_DODONGOS_CAVERN_STAIRCASE_POT_3, RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3 },
+    { RC_DODONGOS_CAVERN_STAIRCASE_POT_4, RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4 },
+    { RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1, RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1 },
+    { RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2, RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2 },
+    { RC_DODONGOS_CAVERN_BLADE_POT_1, RAND_INF_DODONGOS_CAVERN_BLADE_POT_1 },
+    { RC_DODONGOS_CAVERN_BLADE_POT_2, RAND_INF_DODONGOS_CAVERN_BLADE_POT_2 },
+    { RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1, RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1 },
+    { RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2, RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2 },
+    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_1, RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_2, RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2 },
+    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_3, RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3 },
+    { RC_DODONGOS_CAVERN_BACK_ROOM_POT_4, RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4 },
+    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1, RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1 },
+    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2, RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2 },
+    { RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3, RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_1, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_2, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_3, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_4, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_5, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5 },
+    { RC_JABU_JABUS_BELLY_BARINADE_POT_6, RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6 },
+    { RC_JABU_JABUS_BELLY_BASEMENT_POT_1, RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1 },
+    { RC_JABU_JABUS_BELLY_BASEMENT_POT_2, RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2 },
+    { RC_JABU_JABUS_BELLY_BASEMENT_POT_3, RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3 },
+    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1, RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1 },
+    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2, RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2 },
+    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3, RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3 },
+    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4, RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4 },
+    { RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5, RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_1, RAND_INF_FOREST_TEMPLE_LOBBY_POT_1 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_2, RAND_INF_FOREST_TEMPLE_LOBBY_POT_2 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_3, RAND_INF_FOREST_TEMPLE_LOBBY_POT_3 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_4, RAND_INF_FOREST_TEMPLE_LOBBY_POT_4 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_5, RAND_INF_FOREST_TEMPLE_LOBBY_POT_5 },
+    { RC_FOREST_TEMPLE_LOBBY_POT_6, RAND_INF_FOREST_TEMPLE_LOBBY_POT_6 },
+    { RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1, RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1 },
+    { RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2, RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2 },
+    { RC_FOREST_TEMPLE_GREEN_POE_POT_1, RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1 },
+    { RC_FOREST_TEMPLE_GREEN_POE_POT_2, RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2 },
+    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1, RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1 },
+    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2, RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2 },
+    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3, RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3 },
+    { RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4, RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4 },
+    { RC_FOREST_TEMPLE_BLUE_POE_POT_1, RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1 },
+    { RC_FOREST_TEMPLE_BLUE_POE_POT_2, RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2 },
+    { RC_FOREST_TEMPLE_BLUE_POE_POT_3, RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3 },
+    { RC_FOREST_TEMPLE_FROZEN_EYE_POT_1, RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1 },
+    { RC_FOREST_TEMPLE_FROZEN_EYE_POT_2, RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2 },
+    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_1, RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1 },
+    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_2, RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2 },
+    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_3, RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3 },
+    { RC_FIRE_TEMPLE_NEAR_BOSS_POT_4, RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4 },
+    { RC_FIRE_TEMPLE_BIG_LAVA_POT_1, RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1 },
+    { RC_FIRE_TEMPLE_BIG_LAVA_POT_2, RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2 },
+    { RC_FIRE_TEMPLE_BIG_LAVA_POT_3, RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3 },
+    { RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4, RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4 },
+    { RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1, RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1 },
+    { RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2, RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2 },
+    { RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1, RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1 },
+    { RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2, RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2 },
+    { RC_WATER_TEMPLE_TORCH_POT_1, RAND_INF_WATER_TEMPLE_TORCH_POT_1 },
+    { RC_WATER_TEMPLE_TORCH_POT_2, RAND_INF_WATER_TEMPLE_TORCH_POT_2 },
+    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_1, RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1 },
+    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_2, RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2 },
+    { RC_WATER_TEMPLE_NEAR_COMPASS_POT_3, RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3 },
+    { RC_WATER_TEMPLE_CENTRAL_BOW_POT_1, RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1 },
+    { RC_WATER_TEMPLE_CENTRAL_BOW_POT_2, RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2 },
+    { RC_WATER_TEMPLE_BEHIND_GATE_POT_1, RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1 },
+    { RC_WATER_TEMPLE_BEHIND_GATE_POT_2, RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2 },
+    { RC_WATER_TEMPLE_BEHIND_GATE_POT_3, RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3 },
+    { RC_WATER_TEMPLE_BEHIND_GATE_POT_4, RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4 },
+    { RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1 },
+    { RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2 },
+    { RC_WATER_TEMPLE_RIVER_POT_1, RAND_INF_WATER_TEMPLE_RIVER_POT_1 },
+    { RC_WATER_TEMPLE_RIVER_POT_2, RAND_INF_WATER_TEMPLE_RIVER_POT_2 },
+    { RC_WATER_TEMPLE_LIKE_LIKE_POT_1, RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1 },
+    { RC_WATER_TEMPLE_LIKE_LIKE_POT_2, RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2 },
+    { RC_WATER_TEMPLE_BOSS_KEY_POT_1, RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1 },
+    { RC_WATER_TEMPLE_BOSS_KEY_POT_2, RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2 },
+    { RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1, RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1 },
+    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1, RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1 },
+    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2, RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2 },
+    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3, RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3 },
+    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4, RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4 },
+    { RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5, RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5 },
+    { RC_SHADOW_TEMPLE_MAP_CHEST_POT_1, RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1 },
+    { RC_SHADOW_TEMPLE_MAP_CHEST_POT_2, RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2 },
+    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1, RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1 },
+    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2, RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2 },
+    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3, RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3 },
+    { RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4, RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4 },
+    { RC_SHADOW_TEMPLE_AFTER_WIND_POT_1, RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1 },
+    { RC_SHADOW_TEMPLE_AFTER_WIND_POT_2, RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2 },
+    { RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1, RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1 },
+    { RC_SHADOW_TEMPLE_FLOORMASTER_POT_1, RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1 },
+    { RC_SHADOW_TEMPLE_FLOORMASTER_POT_2, RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2 },
+    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1, RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1 },
+    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2, RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2 },
+    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3, RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3 },
+    { RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4, RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4 },
+    { RC_SPIRIT_TEMPLE_LOBBY_POT_1, RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1 },
+    { RC_SPIRIT_TEMPLE_LOBBY_POT_2, RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2 },
+    { RC_SPIRIT_TEMPLE_ANUBIS_POT_1, RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1 },
+    { RC_SPIRIT_TEMPLE_ANUBIS_POT_2, RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2 },
+    { RC_SPIRIT_TEMPLE_ANUBIS_POT_3, RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3 },
+    { RC_SPIRIT_TEMPLE_ANUBIS_POT_4, RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4 },
+    { RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1, RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1 },
+    { RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1, RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1 },
+    { RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2, RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5 },
+    { RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6, RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6 },
+    { RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1, RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1 },
+    { RC_GANONS_CASTLE_FOREST_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_FOREST_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_FIRE_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_FIRE_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_WATER_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_WATER_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_WATER_TRIAL_POT_3, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3 },
+    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3 },
+    { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4 },
+    { RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1, RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1 },
+    { RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_1, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_2, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_3, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_4, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_5, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_6, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_7, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_8, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_9, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_10, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_11, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_12, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_13, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_14, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_15, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_16, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_17, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17 },
+    { RC_GANONS_CASTLE_GANONS_TOWER_POT_18, RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11 },
+    { RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12, RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12 },
+    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2, RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3, RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3 },
+    { RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2, RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT, RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT },
+    { RC_ICE_CAVERN_HALL_POT_1, RAND_INF_ICE_CAVERN_HALL_POT_1 },
+    { RC_ICE_CAVERN_HALL_POT_2, RAND_INF_ICE_CAVERN_HALL_POT_2 },
+    { RC_ICE_CAVERN_SPINNING_BLADE_POT_1, RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1 },
+    { RC_ICE_CAVERN_SPINNING_BLADE_POT_2, RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2 },
+    { RC_ICE_CAVERN_SPINNING_BLADE_POT_3, RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3 },
+    { RC_ICE_CAVERN_NEAR_END_POT_1, RAND_INF_ICE_CAVERN_NEAR_END_POT_1 },
+    { RC_ICE_CAVERN_NEAR_END_POT_2, RAND_INF_ICE_CAVERN_NEAR_END_POT_2 },
+    { RC_ICE_CAVERN_FROZEN_POT_1, RAND_INF_ICE_CAVERN_FROZEN_POT_1 },
+
+    { RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1, RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1 },
+    { RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2, RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2 },
+    { RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1, RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1 },
+    { RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2, RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2 },
+    { RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1, RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1 },
+    { RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2, RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2 },
+    { RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1, RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1 },
+    { RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2, RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2 },
+    { RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1, RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_1, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_2, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_3, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_4, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_5, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5 },
+    { RC_FOREST_TEMPLE_MQ_LOBBY_POT_6, RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6 },
+    { RC_FOREST_TEMPLE_MQ_WOLFOS_POT_1, RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_WOLFOS_POT_2, RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1, RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2, RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3, RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3 },
+    { RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4, RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4 },
+    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1, RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2, RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3, RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3 },
+    { RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1, RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2, RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1, RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1 },
+    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2, RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2 },
+    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3, RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3 },
+    { RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4, RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3, RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3 },
+    { RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4, RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3, RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3 },
+    { RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4, RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3, RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3 },
+    { RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4, RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_CORNER_POT, RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_MIDDLE_POT, RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_BIG_BLOCK_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3, RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3 },
+    { RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4, RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NW_POT, RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_NE_POT, RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SE_POT, RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3 },
+    { RC_DODONGOS_CAVERN_MQ_ARMOS_ROOM_SW_POT, RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4 },
+    { RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_SW_POT, RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_NE_POT, RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2 },
+    { RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1, RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1 },
+    { RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2, RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2 },
+    { RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1 },
+    { RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1, RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2, RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1, RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2, RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_WEST_POT, RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_LOWER_UMBRELLA_EAST_POT, RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_SOUTH_POT, RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3 },
+    { RC_SHADOW_TEMPLE_MQ_UPPER_UMBRELLA_NORTH_POT, RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4 },
+    { RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1, RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2, RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_WEST_POT, RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_BEFORE_CHASM_EAST_POT, RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2 },
+    { RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT, RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3 },
+    { RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_EAST_POT, RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4 },
+    { RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT, RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT },
+    { RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1, RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1 },
+    { RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2, RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2, RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3, RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT, RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT },
+    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_1, RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_2, RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2 },
+    { RC_BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_POT_3, RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3 },
+    { RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1, RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2, RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1, RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2, RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_NORTH_POT, RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_HIGH_POT, RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_LAVA_ROOM_SOUTH_POT, RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3 },
+    { RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1, RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2, RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1, RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2, RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3, RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3 },
+    { RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1, RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2, RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_SOUTH_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_PAST_FIRE_MAZE_NORTH_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHMOST_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3 },
+    { RC_FIRE_TEMPLE_MQ_FIRE_MAZE_NORTHWEST_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4 },
+    { RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_WEST_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5 },
+    { RC_FIRE_TEMPLE_MQ_SOUTH_FIRE_MAZE_EAST_POT, RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7 },
+    { RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8, RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8 },
+    { RC_ICE_CAVERN_MQ_ENTRANCE_POT, RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT },
+    { RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1, RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1 },
+    { RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2, RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2 },
+    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1, RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1 },
+    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2, RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2 },
+    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3, RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3 },
+    { RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4, RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4 },
+    { RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1, RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1 },
+    { RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2, RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2 },
+    { RC_ICE_CAVERN_MQ_COMPASS_POT_1, RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1 },
+    { RC_ICE_CAVERN_MQ_COMPASS_POT_2, RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3, RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3 },
+    { RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4, RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3 },
+    { RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4, RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4 },
+    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_CENTER_EAST_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_STATUE_3F_EAST_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_STATUE_3F_WEST_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3 },
+    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_WEST_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4 },
+    { RC_SPIRIT_TEMPLE_MQ_STATUE_2F_EASTMOST_POT, RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5 },
+    { RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3, RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3 },
+    { RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4, RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4 },
+    { RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2 },
+    { RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1, RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1 },
+    { RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2, RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2 },
+    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_WEST_POT, RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1 },
+    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SOUTH_POT, RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2 },
+    { RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_SE_POT, RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3 },
+    { RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_SOUTH_POT, RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4 },
+    { RC_WATER_TEMPLE_MQ_LIZALFOS_CAGE_NORTH_POT, RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5 },
+    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1, RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1 },
+    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2, RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2 },
+    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3, RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3 },
+    { RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1, RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1 },
+    { RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2, RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2 },
+    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_MIDDLE_POT, RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3 },
+    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_SOUTH_POT, RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4 },
+    { RC_WATER_TEMPLE_MQ_STALFOS_PIT_NORTH_POT, RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5 },
+    { RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1, RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1 },
+    { RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2, RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2 },
+    { RC_WATER_TEMPLE_MQ_RIVER_POT_1, RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1 },
+    { RC_WATER_TEMPLE_MQ_RIVER_POT_2, RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2 },
+    { RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1, RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1 },
+    { RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2, RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2 },
+    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1, RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1 },
+    { RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2, RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2 },
+    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1, RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1 },
+    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2, RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2 },
+    { RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3, RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3 },
+    { RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1, RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1 },
+    { RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2, RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2 },
+    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1, RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1 },
+    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2, RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2 },
+    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3, RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3 },
+    { RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4, RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4 },
+    { RC_WATER_TEMPLE_MQ_BOSS_KEY_POT, RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT },
+    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1, RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1 },
+    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2, RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2 },
+    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1, RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1 },
+    { RC_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2, RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2 },
+    // Crates
+    {
+        RC_GV_FREESTANDING_POH_CRATE,
+        RAND_INF_GV_FREESTANDING_POH_CRATE,
+    },
+    {
+        RC_GV_NEAR_COW_CRATE,
+        RAND_INF_GV_NEAR_COW_CRATE,
+    },
+    {
+        RC_GV_CRATE_BRIDGE_1,
+        RAND_INF_GV_CRATE_BRIDGE_1,
+    },
+    {
+        RC_GV_CRATE_BRIDGE_2,
+        RAND_INF_GV_CRATE_BRIDGE_2,
+    },
+    {
+        RC_GV_CRATE_BRIDGE_3,
+        RAND_INF_GV_CRATE_BRIDGE_3,
+    },
+    {
+        RC_GV_CRATE_BRIDGE_4,
+        RAND_INF_GV_CRATE_BRIDGE_4,
+    },
+    {
+        RC_GF_ABOVE_JAIL_CRATE,
+        RAND_INF_GF_ABOVE_JAIL_CRATE,
+    },
+    {
+        RC_GF_SOUTHMOST_CENTER_CRATE,
+        RAND_INF_GF_SOUTHMOST_CENTER_CRATE,
+    },
+    {
+        RC_GF_MID_SOUTH_CENTER_CRATE,
+        RAND_INF_GF_MID_SOUTH_CENTER_CRATE,
+    },
+    {
+        RC_GF_MID_NORTH_CENTER_CRATE,
+        RAND_INF_GF_MID_NORTH_CENTER_CRATE,
+    },
+    {
+        RR_GF_NORTHMOST_CENTER_CRATE,
+        RAND_INF_GF_NORTHMOST_CENTER_CRATE,
+    },
+    {
+        RC_GF_OUTSKIRTS_NE_CRATE,
+        RAND_INF_GF_OUTSKIRTS_NE_CRATE,
+    },
+    {
+        RC_GF_OUTSKIRTS_NW_CRATE,
+        RAND_INF_GF_OUTSKIRTS_NW_CRATE,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_1,
+        RAND_INF_GF_HBA_RANGE_CRATE_1,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_2,
+        RAND_INF_GF_HBA_RANGE_CRATE_2,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_3,
+        RAND_INF_GF_HBA_RANGE_CRATE_3,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_4,
+        RAND_INF_GF_HBA_RANGE_CRATE_4,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_5,
+        RAND_INF_GF_HBA_RANGE_CRATE_5,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_6,
+        RAND_INF_GF_HBA_RANGE_CRATE_6,
+    },
+    {
+        RC_GF_HBA_RANGE_CRATE_7,
+        RAND_INF_GF_HBA_RANGE_CRATE_7,
+    },
+    {
+        RC_GF_HBA_CANOPY_EAST_CRATE,
+        RAND_INF_GF_HBA_CANOPY_EAST_CRATE,
+    },
+    {
+        RC_GF_HBA_CANOPY_WEST_CRATE,
+        RAND_INF_GF_HBA_CANOPY_WEST_CRATE,
+    },
+    {
+        RC_GF_NORTH_TARGET_EAST_CRATE,
+        RAND_INF_GF_NORTH_TARGET_EAST_CRATE,
+    },
+    {
+        RC_GF_NORTH_TARGET_WEST_CRATE,
+        RAND_INF_GF_NORTH_TARGET_WEST_CRATE,
+    },
+    {
+        RC_GF_NORTH_TARGET_CHILD_CRATE,
+        RAND_INF_GF_NORTH_TARGET_CHILD_CRATE,
+    },
+    {
+        RC_GF_SOUTH_TARGET_EAST_CRATE,
+        RAND_INF_GF_SOUTH_TARGET_EAST_CRATE,
+    },
+    {
+        RC_GF_SOUTH_TARGET_WEST_CRATE,
+        RAND_INF_GF_SOUTH_TARGET_WEST_CRATE,
+    },
+    {
+        RC_TH_NEAR_KITCHEN_LEFTMOST_CRATE,
+        RAND_INF_TH_NEAR_KITCHEN_LEFTMOST_CRATE,
+    },
+    {
+        RC_TH_NEAR_KITCHEN_MID_LEFT_CRATE,
+        RAND_INF_TH_NEAR_KITCHEN_MID_LEFT_CRATE,
+    },
+    {
+        RC_TH_NEAR_KITCHEN_MID_RIGHT_CRATE,
+        RAND_INF_TH_NEAR_KITCHEN_MID_RIGHT_CRATE,
+    },
+    {
+        RC_TH_NEAR_KITCHEN_RIGHTMOST_CRATE,
+        RAND_INF_TH_NEAR_KITCHEN_RIGHTMOST_CRATE,
+    },
+    {
+        RC_TH_KITCHEN_CRATE,
+        RAND_INF_TH_KITCHEN_CRATE,
+    },
+    {
+        RC_TH_BREAK_HALLWAY_OUTER_CRATE,
+        RAND_INF_TH_BREAK_HALLWAY_OUTER_CRATE,
+    },
+    {
+        RC_TH_BREAK_HALLWAY_INNER_CRATE,
+        RAND_INF_TH_BREAK_HALLWAY_INNER_CRATE,
+    },
+    {
+        RC_TH_BREAK_ROOM_RIGHT_CRATE,
+        RAND_INF_TH_BREAK_ROOM_RIGHT_CRATE,
+    },
+    {
+        RC_TH_BREAK_ROOM_LEFT_CRATE,
+        RAND_INF_TH_BREAK_ROOM_LEFT_CRATE,
+    },
+    {
+        RC_TH_1_TORCH_CELL_CRATE,
+        RAND_INF_TH_1_TORCH_CELL_CRATE,
+    },
+    {
+        RC_TH_DEAD_END_CELL_CRATE,
+        RAND_INF_TH_DEAD_END_CELL_CRATE,
+    },
+    {
+        RC_TH_DOUBLE_CELL_LEFT_CRATE,
+        RAND_INF_TH_DOUBLE_CELL_LEFT_CRATE,
+    },
+    {
+        RC_TH_DOUBLE_CELL_RIGHT_CRATE,
+        RAND_INF_TH_DOUBLE_CELL_RIGHT_CRATE,
+    },
+    {
+        RC_HW_BEFORE_QUICKSAND_CRATE,
+        RAND_INF_HW_BEFORE_QUICKSAND_CRATE,
+    },
+    {
+        RC_HW_AFTER_QUICKSAND_CRATE_1,
+        RAND_INF_HW_AFTER_QUICKSAND_CRATE_1,
+    },
+    {
+        RC_HW_AFTER_QUICKSAND_CRATE_2,
+        RAND_INF_HW_AFTER_QUICKSAND_CRATE_2,
+    },
+    {
+        RC_HW_AFTER_QUICKSAND_CRATE_3,
+        RAND_INF_HW_AFTER_QUICKSAND_CRATE_3,
+    },
+    {
+        RC_HW_NEAR_COLOSSUS_CRATE,
+        RAND_INF_HW_NEAR_COLOSSUS_CRATE,
+    },
+    {
+        RC_MK_NEAR_BAZAAR_CRATE_1,
+        RAND_INF_MK_NEAR_BAZAAR_CRATE_1,
+    },
+    {
+        RC_MK_NEAR_BAZAAR_CRATE_2,
+        RAND_INF_MK_NEAR_BAZAAR_CRATE_2,
+    },
+    {
+        RC_MK_SHOOTING_GALLERY_CRATE_1,
+        RAND_INF_MK_SHOOTING_GALLERY_CRATE_1,
+    },
+    {
+        RC_MK_SHOOTING_GALLERY_CRATE_2,
+        RAND_INF_MK_SHOOTING_GALLERY_CRATE_2,
+    },
+    {
+        RC_MK_LOST_DOG_HOUSE_CRATE,
+        RAND_INF_MK_LOST_DOG_HOUSE_CRATE,
+    },
+    {
+        RC_MK_GUARD_HOUSE_CRATE_1,
+        RAND_INF_MK_GUARD_HOUSE_CRATE_1,
+    },
+    {
+        RC_MK_GUARD_HOUSE_CRATE_2,
+        RAND_INF_MK_GUARD_HOUSE_CRATE_2,
+    },
+    {
+        RC_MK_GUARD_HOUSE_CRATE_3,
+        RAND_INF_MK_GUARD_HOUSE_CRATE_3,
+    },
+    {
+        RC_MK_GUARD_HOUSE_CRATE_4,
+        RAND_INF_MK_GUARD_HOUSE_CRATE_4,
+    },
+    {
+        RC_MK_GUARD_HOUSE_CRATE_5,
+        RAND_INF_MK_GUARD_HOUSE_CRATE_5,
+    },
+    {
+        RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1,
+        RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1,
+    },
+    {
+        RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2,
+        RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2,
+    },
+    {
+        RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3,
+        RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3,
+    },
+    {
+        RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4,
+        RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4,
+    },
+    {
+        RC_KAK_NEAR_POTION_SHOP_ADULT_CRATE,
+        RAND_INF_KAK_NEAR_POTION_SHOP_ADULT_CRATE,
+    },
+    {
+        RC_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE,
+        RAND_INF_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE,
+    },
+    {
+        RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1,
+        RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1,
+    },
+    {
+        RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2,
+        RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2,
+    },
+    {
+        RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1,
+        RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1,
+    },
+    {
+        RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2,
+        RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2,
+    },
+    {
+        RC_KAK_NEAR_BAZAAR_ADULT_CRATE_1,
+        RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_1,
+    },
+    {
+        RC_KAK_NEAR_BAZAAR_ADULT_CRATE_2,
+        RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_2,
+    },
+    {
+        RC_KAK_BEHIND_GS_HOUSE_ADULT_CRATE,
+        RAND_INF_KAK_BEHIND_GS_HOUSE_ADULT_CRATE,
+    },
+    {
+        RC_KAK_NEAR_GY_CHILD_CRATE,
+        RAND_INF_KAK_NEAR_GY_CHILD_CRATE,
+    },
+    {
+        RC_KAK_NEAR_WINDMILL_CHILD_CRATE,
+        RAND_INF_KAK_NEAR_WINDMILL_CHILD_CRATE,
+    },
+    {
+        RC_KAK_NEAR_FENCE_CHILD_CRATE,
+        RAND_INF_KAK_NEAR_FENCE_CHILD_CRATE,
+    },
+    {
+        RC_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE,
+        RAND_INF_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE,
+    },
+    {
+        RC_KAK_NEAR_BAZAAR_CHILD_CRATE,
+        RAND_INF_KAK_NEAR_BAZAAR_CHILD_CRATE,
+    },
+    {
+        RC_GRAVEYARD_CRATE,
+        RAND_INF_GRAVEYARD_CRATE,
+    },
+    {
+        RC_GC_MAZE_CRATE,
+        RAND_INF_GC_MAZE_CRATE,
+    },
+    {
+        RC_DMC_CRATE,
+        RAND_INF_DMC_CRATE,
+    },
+    {
+        RC_LLR_NEAR_TREE_CRATE,
+        RAND_INF_LLR_NEAR_TREE_CRATE,
+    },
+    {
+        RC_LH_LAB_CRATE,
+        RAND_INF_LH_LAB_CRATE,
+    },
+
+    {
+        RC_DEKU_TREE_MQ_LOBBY_CRATE,
+        RAND_INF_DEKU_TREE_MQ_LOBBY_CRATE,
+    },
+    {
+        RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1,
+        RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1,
+    },
+    {
+        RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2,
+        RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8,
+        RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4,
+        RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1,
+        RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2,
+        RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5,
+    },
+    {
+        RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6,
+        RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6,
+        RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6,
+        RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14,
+        RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE,
+        RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE,
+        RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE,
+        RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1,
+        RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2,
+        RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1,
+        RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2,
+        RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3,
+        RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4,
+        RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4,
+    },
+    {
+        RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE,
+        RAND_INF_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE,
+    },
+
+    {
+        RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1,
+        RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1,
+    },
+    {
+        RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2,
+        RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2,
+    },
+    {
+        RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1,
+        RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1,
+    },
+    {
+        RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2,
+        RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2,
+    },
+
+    {
+        RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1,
+        RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1,
+    },
+    {
+        RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2,
+        RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2,
+    },
+    {
+        RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1,
+        RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1,
+    },
+    {
+        RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2,
+        RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2,
+    },
+    {
+        RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1,
+        RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1,
+    },
+    {
+        RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2,
+        RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2,
+    },
+    {
+        RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3,
+        RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4,
+    },
+    {
+        RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5,
+        RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4,
+        RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE,
+    },
+    {
+        RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE,
+        RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE,
+    },
+    {
+        RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1,
+        RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1,
+    },
+    {
+        RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2,
+        RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2,
+    },
+    {
+        RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3,
+        RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3,
+    },
+    {
+        RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4,
+        RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE,
+        RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE,
+    },
+    {
+        RC_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE,
+        RAND_INF_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE,
+    },
 };
 
 BeehiveIdentity Randomizer::IdentifyBeehive(s32 sceneNum, s16 xPosition, s32 respawnData) {
@@ -1577,9 +3286,10 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
     auto fs = OTRGlobals::Instance->gRandoContext->GetFishsanity();
     RandomizerCheck specialRc = RC_UNKNOWN_CHECK;
     // TODO: Migrate these special cases into table, or at least document why they are special
-    switch(sceneNum) {
+    switch (sceneNum) {
         case SCENE_TREASURE_BOX_SHOP: {
-            if ((actorId == ACTOR_EN_BOX && actorParams == 20170) || (actorId == ACTOR_ITEM_ETCETERA && actorParams == 2572)) {
+            if ((actorId == ACTOR_EN_BOX && actorParams == 20170) ||
+                (actorId == ACTOR_ITEM_ETCETERA && actorParams == 2572)) {
                 specialRc = RC_MARKET_TREASURE_CHEST_GAME_REWARD;
             }
 
@@ -1626,11 +3336,21 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
         case SCENE_HOUSE_OF_SKULLTULA:
             if (actorId == ACTOR_EN_SSH) {
                 switch (actorParams) { // actor params are used to differentiate between textboxes
-                    case 1: specialRc = RC_KAK_10_GOLD_SKULLTULA_REWARD; break;
-                    case 2: specialRc = RC_KAK_20_GOLD_SKULLTULA_REWARD; break;
-                    case 3: specialRc = RC_KAK_30_GOLD_SKULLTULA_REWARD; break;
-                    case 4: specialRc = RC_KAK_40_GOLD_SKULLTULA_REWARD; break;
-                    case 5: specialRc = RC_KAK_50_GOLD_SKULLTULA_REWARD; break;
+                    case 1:
+                        specialRc = RC_KAK_10_GOLD_SKULLTULA_REWARD;
+                        break;
+                    case 2:
+                        specialRc = RC_KAK_20_GOLD_SKULLTULA_REWARD;
+                        break;
+                    case 3:
+                        specialRc = RC_KAK_30_GOLD_SKULLTULA_REWARD;
+                        break;
+                    case 4:
+                        specialRc = RC_KAK_40_GOLD_SKULLTULA_REWARD;
+                        break;
+                    case 5:
+                        specialRc = RC_KAK_50_GOLD_SKULLTULA_REWARD;
+                        break;
                 }
             }
             break;
@@ -1688,11 +3408,10 @@ Rando::Location* Randomizer::GetCheckObjectFromActor(s16 actorId, s16 sceneNum,
     auto range = Rando::StaticData::CheckFromActorMultimap.equal_range(std::make_tuple(actorId, sceneNum, actorParams));
 
     for (auto it = range.first; it != range.second; ++it) {
-        if (
-            Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_BOTH ||
-            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_VANILLA && !ResourceMgr_IsGameMasterQuest()) ||
-            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_MQ && ResourceMgr_IsGameMasterQuest())
-        ) {
+        if (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_BOTH ||
+            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_VANILLA &&
+             !ResourceMgr_IsGameMasterQuest()) ||
+            (Rando::StaticData::GetLocation(it->second)->GetQuest() == RCQUEST_MQ && ResourceMgr_IsGameMasterQuest())) {
             return Rando::StaticData::GetLocation(it->second);
         }
     }
@@ -1710,7 +3429,8 @@ ScrubIdentity Randomizer::IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respa
     scrubIdentity.isShuffled = false;
 
     // Scrubs that are 0x06 are loaded as 0x03 when child, switching from selling arrows to seeds
-    if (actorParams == 0x06) actorParams = 0x03;
+    if (actorParams == 0x06)
+        actorParams = 0x03;
 
     if (sceneNum == SCENE_GROTTOS) {
         actorParams = TWO_ACTOR_PARAMS(actorParams, respawnData);
@@ -1724,11 +3444,14 @@ ScrubIdentity Randomizer::IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respa
         scrubIdentity.getItemId = (GetItemID)Rando::StaticData::RetrieveItem(location->GetVanillaItem()).GetItemID();
         scrubIdentity.isShuffled = GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_ALL;
 
-        if (location->GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO || location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT || location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE) {
+        if (location->GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO ||
+            location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_GROTTO_FRONT ||
+            location->GetRandomizerCheck() == RC_LW_DEKU_SCRUB_NEAR_BRIDGE) {
             scrubIdentity.isShuffled = GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF;
         }
 
-        scrubIdentity.itemPrice = OTRGlobals::Instance->gRandoContext->GetItemLocation(scrubIdentity.randomizerCheck)->GetPrice();
+        scrubIdentity.itemPrice =
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(scrubIdentity.randomizerCheck)->GetPrice();
     }
 
     return scrubIdentity;
@@ -1747,9 +3470,11 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
         return shopItemIdentity;
     }
 
-    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_GIRLA,
+    Rando::Location* location = GetCheckObjectFromActor(
+        ACTOR_EN_GIRLA,
         // Bazaar (SHOP1) scene is reused, so if entering from Kak use debug scene to identify
-        (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == ENTR_BAZAAR_0) ? SCENE_TEST01 : sceneNum, slotIndex - 1);
+        (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == ENTR_BAZAAR_0) ? SCENE_TEST01 : sceneNum,
+        slotIndex - 1);
 
     if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
         shopItemIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
@@ -1762,7 +3487,8 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
             shopItemIdentity.enGirlAShopItem = randomizerGetToEnGirlShopItem[randoGet];
         }
 
-        shopItemIdentity.itemPrice = OTRGlobals::Instance->gRandoContext->GetItemLocation(shopItemIdentity.randomizerCheck)->GetPrice();
+        shopItemIdentity.itemPrice =
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(shopItemIdentity.randomizerCheck)->GetPrice();
     }
 
     return shopItemIdentity;
@@ -1807,7 +3533,6 @@ PotIdentity Randomizer::IdentifyPot(s32 sceneNum, s32 posX, s32 posZ) {
 
     if (location->GetRandomizerCheck() == RC_UNKNOWN_CHECK) {
         LUSLOG_WARN("IdentifyPot did not receive a valid RC value (%d).", location->GetRandomizerCheck());
-        assert(false);
     } else {
         potIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
         potIdentity.randomizerCheck = location->GetRandomizerCheck();
@@ -1837,11 +3562,129 @@ FishIdentity Randomizer::IdentifyFish(s32 sceneNum, s32 actorParams) {
     return fishIdentity;
 }
 
+GrassIdentity Randomizer::IdentifyGrass(s32 sceneNum, s32 posX, s32 posZ, s32 respawnData, s32 linkAge) {
+    struct GrassIdentity grassIdentity;
+
+    grassIdentity.randomizerInf = RAND_INF_MAX;
+    grassIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
+
+    if (sceneNum == SCENE_GROTTOS) {
+        respawnData = TWO_ACTOR_PARAMS(posX, respawnData);
+    } else {
+        // We'll just pretend it's always daytime for our market bushes.
+        if (sceneNum == SCENE_MARKET_NIGHT) {
+            sceneNum = SCENE_MARKET_DAY;
+
+            /*
+                The two bushes by the tree are not in the same spot
+                between night and day. We'll assume the coordinates
+                of the daytime bushes so that we can count them as
+                the same locations.
+            */
+            if (posX == -74) {
+                posX = -106;
+                posZ = 277;
+            }
+            if (posX == -87) {
+                posX = -131;
+                posZ = 225;
+            }
+        }
+
+        /*
+            Same as with Market. ZR has a bush slightly off pos
+            between Child and Adult. This is to merge them into
+            a single location.
+        */
+        if (sceneNum == SCENE_ZORAS_RIVER) {
+            if (posX == 233) {
+                posX = 231;
+                posZ = -1478;
+            }
+        }
+
+        // The two bushes behind the sign in KF should be separate
+        // locations between Child and Adult.
+        if (sceneNum == SCENE_KOKIRI_FOREST && linkAge == 0) {
+            if (posX == -498 || posX == -523) {
+                posZ = 0xFF;
+            }
+        }
+
+        respawnData = TWO_ACTOR_PARAMS(posX, posZ);
+    }
+
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_KUSA, sceneNum, respawnData);
+
+    if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
+        grassIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        grassIdentity.randomizerCheck = location->GetRandomizerCheck();
+    }
+
+    return grassIdentity;
+}
+
+CrateIdentity Randomizer::IdentifyCrate(s32 sceneNum, s32 posX, s32 posZ) {
+    struct CrateIdentity crateIdentity;
+    uint32_t crateSceneNum = sceneNum;
+
+    // pretend night is day to align crates in market and align GF child/adult crates
+    if (sceneNum == SCENE_MARKET_NIGHT) {
+        crateSceneNum = SCENE_MARKET_DAY;
+    } else if (sceneNum == SCENE_GERUDOS_FORTRESS && gPlayState->linkAgeOnLoad == 1 && posX == 310) {
+        if (posZ == -1830) {
+            posZ = -1842;
+        } else if (posZ == -1770) {
+            posZ = -1782;
+        }
+    }
+
+    crateIdentity.randomizerInf = RAND_INF_MAX;
+    crateIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
+
+    s32 actorParams = TWO_ACTOR_PARAMS(posX, posZ);
+
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_OBJ_KIBAKO2, crateSceneNum, actorParams);
+
+    if (location->GetRandomizerCheck() == RC_UNKNOWN_CHECK) {
+        LUSLOG_WARN("IdentifyCrate did not receive a valid RC value (%d).", location->GetRandomizerCheck());
+        assert(false);
+    } else {
+        crateIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        crateIdentity.randomizerCheck = location->GetRandomizerCheck();
+    }
+
+    return crateIdentity;
+}
+
+SmallCrateIdentity Randomizer::IdentifySmallCrate(s32 sceneNum, s32 posX, s32 posZ) {
+    struct SmallCrateIdentity smallCrateIdentity;
+    uint32_t smallCrateSceneNum = sceneNum;
+
+    smallCrateIdentity.randomizerInf = RAND_INF_MAX;
+    smallCrateIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
+
+    s32 actorParams = TWO_ACTOR_PARAMS(posX, posZ);
+
+    Rando::Location* location = GetCheckObjectFromActor(ACTOR_OBJ_KIBAKO, smallCrateSceneNum, actorParams);
+
+    if (location->GetRandomizerCheck() == RC_UNKNOWN_CHECK) {
+        LUSLOG_WARN("IdentifyCrate did not receive a valid RC value (%d).", location->GetRandomizerCheck());
+        assert(false);
+    } else {
+        smallCrateIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
+        smallCrateIdentity.randomizerCheck = location->GetRandomizerCheck();
+    }
+
+    return smallCrateIdentity;
+}
+
 u8 Randomizer::GetRandoSettingValue(RandomizerSettingKey randoSettingKey) {
     return Rando::Context::GetInstance()->GetOption(randoSettingKey).Get();
 }
 
-GetItemEntry Randomizer::GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId, bool checkObtainability) {
+GetItemEntry Randomizer::GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId,
+                                               bool checkObtainability) {
     return Rando::Context::GetInstance()->GetFinalGIEntry(randomizerCheck, checkObtainability);
 }
 
@@ -1853,13 +3696,14 @@ RandomizerInf Randomizer::GetRandomizerInfFromCheck(RandomizerCheck rc) {
     auto rcIt = rcToRandomizerInf.find(rc);
     if (rcIt == rcToRandomizerInf.end())
         return RAND_INF_MAX;
-    
+
     return rcIt->second;
 }
 
 RandomizerCheck Randomizer::GetCheckFromRandomizerInf(RandomizerInf randomizerInf) {
     for (auto const& [key, value] : rcToRandomizerInf) {
-        if (value == randomizerInf) return key;
+        if (value == randomizerInf)
+            return key;
     }
 
     return RC_UNKNOWN_CHECK;
@@ -1871,10 +3715,9 @@ void GenerateRandomizerImgui(std::string seed = "") {
     CVarSetInteger(CVAR_GENERAL("RandoGenerating"), 1);
     CVarSave();
     auto ctx = Rando::Context::GetInstance();
-    //RANDOTODO proper UI for selecting if a spoiler loaded should be used for settings
-    Rando::Settings::GetInstance()->SetAllFromCVar();
+    // RANDOTODO proper UI for selecting if a spoiler loaded should be used for settings
     Rando::Settings::GetInstance()->SetAllToContext();
-    
+
     // todo: this efficently when we build out cvar array support
     std::set<RandomizerCheck> excludedLocations;
     std::stringstream excludedLocationStringStream(CVarGetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), ""));
@@ -1884,14 +3727,13 @@ void GenerateRandomizerImgui(std::string seed = "") {
     }
 
     // todo: better way to sort out linking tricks rather than name
-    
+
     std::set<RandomizerTrick> enabledTricks;
     std::stringstream enabledTrickStringStream(CVarGetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), ""));
     std::string enabledTrickString;
     while (getline(enabledTrickStringStream, enabledTrickString, ',')) {
         enabledTricks.insert((RandomizerTrick)std::stoi(enabledTrickString));
     }
-    
 
     // Update the visibilitiy before removing conflicting excludes (in case the locations tab wasn't viewed)
     RandomizerCheckObjects::UpdateImGuiVisibility();
@@ -1924,67 +3766,76 @@ bool GenerateRandomizer(std::string seed /*= ""*/) {
     return false;
 }
 
+static bool locationsTabOpen = false;
+static bool tricksTabOpen = false;
+
 void RandomizerSettingsWindow::DrawElement() {
     auto ctx = Rando::Context::GetInstance();
     if (generated) {
         generated = 0;
         randoThread.join();
     }
-    bool disableEditingRandoSettings = CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) || CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0);
-    if (disableEditingRandoSettings) {
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
+    bool generating = CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0);
+    bool disableEditingRandoSettings = generating || CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0);
 
-    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
-    DrawPresetSelector(PRESET_TYPE_RANDOMIZER);
-    ImGui::EndDisabled();
+    DrawPresetSelector({ PRESET_SECTION_RANDOMIZER }, "Randomizer", generating);
 
-    UIWidgets::Spacer(0);
-    UIWidgets::EnhancementCheckbox("Manual seed entry", CVAR_RANDOMIZER_SETTING("ManualSeedEntry"), false, "");
+    // UIWidgets::Spacer(0);
+    UIWidgets::CVarCheckbox("Manual seed entry", CVAR_RANDOMIZER_SETTING("ManualSeedEntry"),
+                            UIWidgets::CheckboxOptions().Color(THEME_COLOR));
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ManualSeedEntry"), 0)) {
-        ImGui::Text("Seed");
-        ImGui::InputText("##RandomizerSeed", seedString, MAX_SEED_STRING_SIZE, ImGuiInputTextFlags_CallbackCharFilter, UIWidgets::TextFilters::FilterAlphaNum);
-        UIWidgets::Tooltip(
-            "Characters from a-z, A-Z, and 0-9 are supported.\n"
-            "Character limit is 1023, after which the seed will be truncated.\n"
-        );
+        UIWidgets::PushStyleInput(THEME_COLOR);
+        ImGui::InputText("##RandomizerSeed", seedString, MAX_SEED_STRING_SIZE, ImGuiInputTextFlags_CallbackCharFilter,
+                         UIWidgets::TextFilters::FilterAlphaNum);
+        UIWidgets::Tooltip("Characters from a-z, A-Z, and 0-9 are supported.\n"
+                           "Character limit is 1023, after which the seed will be truncated.\n");
         ImGui::SameLine();
-        if (ImGui::Button("New Seed")) {
+        if (UIWidgets::Button(
+                ICON_FA_RANDOM,
+                UIWidgets::ButtonOptions()
+                    .Size(UIWidgets::Sizes::Inline)
+                    .Color(THEME_COLOR)
+                    .Padding(ImVec2(10.f, 6.f))
+                    .Tooltip("Creates a new random seed value to be used when generating a randomizer"))) {
             SohUtils::CopyStringToCharArray(seedString, std::to_string(rand() & 0xFFFFFFFF), MAX_SEED_STRING_SIZE);
         }
-        UIWidgets::Tooltip("Creates a new random seed value to be used when generating a randomizer");
         ImGui::SameLine();
-        if (ImGui::Button("Clear Seed")) {
+        if (UIWidgets::Button(ICON_FA_ERASER, UIWidgets::ButtonOptions()
+                                                  .Size(UIWidgets::Sizes::Inline)
+                                                  .Color(THEME_COLOR)
+                                                  .Padding(ImVec2(10.f, 6.f)))) {
             memset(seedString, 0, MAX_SEED_STRING_SIZE);
         }
+        if (strnlen(seedString, MAX_SEED_STRING_SIZE) == 0) {
+            ImGui::SameLine(17.0f);
+            ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.4f), "Leave blank for random seed");
+        }
+        UIWidgets::PopStyleInput();
     }
 
     UIWidgets::Spacer(0);
-    ImGui::BeginDisabled((CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0) && gSaveContext.gameMode != GAMEMODE_FILE_SELECT) ||
-                          GameInteractor::IsSaveLoaded());
-    if (ImGui::Button("Generate Randomizer")) {
+    UIWidgets::ButtonOptions options = UIWidgets::ButtonOptions().Size(ImVec2(250.f, 0.f)).Color(THEME_COLOR);
+    options.Disabled((gSaveContext.gameMode != GAMEMODE_FILE_SELECT) || GameInteractor::IsSaveLoaded());
+    if (options.disabled) {
+        options.DisabledTooltip("Must be on File Select to generate a randomizer seed.");
+    }
+    if (UIWidgets::Button("Generate Randomizer", options)) {
         ctx->SetSpoilerLoaded(false);
         GenerateRandomizer(CVarGetInteger(CVAR_RANDOMIZER_SETTING("ManualSeedEntry"), 0) ? seedString : "");
     }
-    ImGui::EndDisabled();
 
-    UIWidgets::Spacer(0);
+    ImGui::SameLine();
     if (!CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
         std::string spoilerfilepath = CVarGetString(CVAR_GENERAL("SpoilerLog"), "");
         ImGui::Text("Spoiler File: %s", spoilerfilepath.c_str());
     }
 
-    // RANDOTODO settings presets
-    // std::string presetfilepath = CVarGetString(CVAR_RANDOMIZER_SETTING("LoadedPreset"), "");
-    // ImGui::Text("Settings File: %s", presetfilepath.c_str());
-
-    UIWidgets::PaddedSeparator();
-
-    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+    UIWidgets::Separator(true, true, 0.f, 0.f);
 
     ImGuiWindow* window = ImGui::GetCurrentWindow();
     static ImVec2 cellPadding(8.0f, 8.0f);
 
+    UIWidgets::PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("Randomizer Settings", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
         if (ImGui::BeginTabItem("World")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
@@ -1995,10 +3846,10 @@ void RandomizerSettingsWindow::DrawElement() {
             ImGui::EndTabItem();
         }
 
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
         if (ImGui::BeginTabItem("Items")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
+                                 RO_LOGIC_VANILLA);
             if (mSettings->GetOptionGroup(RSG_ITEMS_IMGUI_TABLE).RenderImGui()) {
                 mNeedsUpdate = true;
             }
@@ -2006,28 +3857,30 @@ void RandomizerSettingsWindow::DrawElement() {
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
         }
-        ImGui::EndDisabled();
 
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
         if (ImGui::BeginTabItem("Gameplay")) {
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
+                                 RO_LOGIC_VANILLA);
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
             if (mSettings->GetOptionGroup(RSG_GAMEPLAY_IMGUI_TABLE).RenderImGui()) {
                 mNeedsUpdate = true;
             }
+            ImGui::EndDisabled();
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
         }
-        ImGui::EndDisabled();
 
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
-        static bool locationsTabOpen = false;
         if (ImGui::BeginTabItem("Locations")) {
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) || disableEditingRandoSettings ||
+                                 CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
+                                     RO_LOGIC_VANILLA);
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
             if (!locationsTabOpen) {
                 locationsTabOpen = true;
                 RandomizerCheckObjects::UpdateImGuiVisibility();
                 // todo: this efficently when we build out cvar array support
-                std::stringstream excludedLocationStringStream(CVarGetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), ""));
+                std::stringstream excludedLocationStringStream(
+                    CVarGetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), ""));
                 std::string excludedLocationString;
                 excludedLocations.clear();
                 while (getline(excludedLocationStringStream, excludedLocationString, ',')) {
@@ -2048,7 +3901,9 @@ void RandomizerSettingsWindow::DrawElement() {
                 window->DC.CurrLineTextBaseOffset = 0.0f;
 
                 static ImGuiTextFilter locationSearch;
+                UIWidgets::PushStyleInput(THEME_COLOR);
                 locationSearch.Draw();
+                UIWidgets::PopStyleInput();
 
                 ImGui::BeginChild("ChildIncludedLocations", ImVec2(0, -8));
                 for (auto& [rcArea, locations] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
@@ -2067,8 +3922,9 @@ void RandomizerSettingsWindow::DrawElement() {
                         if (ImGui::TreeNode(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str())) {
                             for (auto& location : locations) {
                                 if (ctx->GetItemLocation(location)->IsVisible() && !excludedLocations.count(location) &&
-                                    locationSearch.PassFilter(Rando::StaticData::GetLocation(location)->GetName().c_str())) {
-
+                                    locationSearch.PassFilter(
+                                        Rando::StaticData::GetLocation(location)->GetName().c_str())) {
+                                    UIWidgets::PushStyleButton(THEME_COLOR, ImVec2(7.f, 5.f));
                                     if (ImGui::ArrowButton(std::to_string(location).c_str(), ImGuiDir_Right)) {
                                         excludedLocations.insert(location);
                                         // todo: this efficently when we build out cvar array support
@@ -2077,9 +3933,14 @@ void RandomizerSettingsWindow::DrawElement() {
                                             excludedLocationString += std::to_string(excludedLocationIt);
                                             excludedLocationString += ",";
                                         }
-                                        CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), excludedLocationString.c_str());
-                                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                                        CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"),
+                                                      excludedLocationString.c_str());
+                                        Ship::Context::GetInstance()
+                                            ->GetWindow()
+                                            ->GetGui()
+                                            ->SaveConsoleVariablesNextFrame();
                                     }
+                                    UIWidgets::PopStyleButton();
                                     ImGui::SameLine();
                                     ImGui::Text("%s", Rando::StaticData::GetLocation(location)->GetShortName().c_str());
                                 }
@@ -2110,6 +3971,7 @@ void RandomizerSettingsWindow::DrawElement() {
                             for (auto& location : locations) {
                                 auto elfound = excludedLocations.find(location);
                                 if (ctx->GetItemLocation(location)->IsVisible() && elfound != excludedLocations.end()) {
+                                    UIWidgets::PushStyleButton(THEME_COLOR, ImVec2(7.f, 5.f));
                                     if (ImGui::ArrowButton(std::to_string(location).c_str(), ImGuiDir_Left)) {
                                         excludedLocations.erase(elfound);
                                         // todo: this efficently when we build out cvar array support
@@ -2121,10 +3983,15 @@ void RandomizerSettingsWindow::DrawElement() {
                                         if (excludedLocationString == "") {
                                             CVarClear(CVAR_RANDOMIZER_SETTING("ExcludedLocations"));
                                         } else {
-                                            CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"), excludedLocationString.c_str());
+                                            CVarSetString(CVAR_RANDOMIZER_SETTING("ExcludedLocations"),
+                                                          excludedLocationString.c_str());
                                         }
-                                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                                        Ship::Context::GetInstance()
+                                            ->GetWindow()
+                                            ->GetGui()
+                                            ->SaveConsoleVariablesNextFrame();
                                     }
+                                    UIWidgets::PopStyleButton();
                                     ImGui::SameLine();
                                     ImGui::Text("%s", Rando::StaticData::GetLocation(location)->GetShortName().c_str());
                                 }
@@ -2139,24 +4006,24 @@ void RandomizerSettingsWindow::DrawElement() {
             }
             ImGui::PopStyleVar(1);
             ImGui::EndTabItem();
+            ImGui::EndDisabled();
         } else {
             locationsTabOpen = false;
         }
-        ImGui::EndDisabled();
 
-        static bool tricksTabOpen = false;
         if (ImGui::BeginTabItem("Tricks/Glitches")) {
             if (!tricksTabOpen) {
                 tricksTabOpen = true;
-                //RandomizerTricks::UpdateImGuiVisibility();
-                // todo: this efficently when we build out cvar array support
+                // RandomizerTricks::UpdateImGuiVisibility();
+                //  todo: this efficently when we build out cvar array support
                 std::stringstream enabledTrickStringStream(CVarGetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), ""));
                 std::string enabledTrickString;
                 enabledTricks.clear();
                 while (getline(enabledTrickStringStream, enabledTrickString, ',')) {
                     enabledTricks.insert((RandomizerTrick)std::stoi(enabledTrickString));
                 }
-                std::stringstream enabledGlitchStringStream(CVarGetString(CVAR_RANDOMIZER_SETTING("EnabledGlitches"), ""));
+                std::stringstream enabledGlitchStringStream(
+                    CVarGetString(CVAR_RANDOMIZER_SETTING("EnabledGlitches"), ""));
                 std::string enabledGlitchString;
                 enabledGlitches.clear();
                 while (getline(enabledGlitchStringStream, enabledGlitchString, ',')) {
@@ -2182,100 +4049,104 @@ void RandomizerSettingsWindow::DrawElement() {
                 }
                 if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) {
                     ImGui::SameLine();
-                    ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Heads up! This will disable all rando settings except for entrance shuffle and starter items");
+                    ImGui::TextColored(
+                        ImVec4(1.0f, 0.0f, 0.0f, 1.0f),
+                        "Heads up! This will disable all rando settings except for entrance shuffle and starter items");
                 }
                 ImGui::PopItemWidth();
                 ImGui::EndTable();
             }
 
-            ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA);
+            ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) || disableEditingRandoSettings ||
+                                 CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
+                                     RO_LOGIC_VANILLA);
 
             // Tricks
-            static std::unordered_map<RandomizerArea, bool> areaTreeDisabled {
-                {RA_NONE, true},
-                {RA_KOKIRI_FOREST, true},
-                {RA_THE_LOST_WOODS, true},
-                {RA_SACRED_FOREST_MEADOW, true},
-                {RA_HYRULE_FIELD, true},
-                {RA_LAKE_HYLIA, true},
-                {RA_GERUDO_VALLEY, true},
-                {RA_GERUDO_FORTRESS, true},
-                {RA_HAUNTED_WASTELAND, true},
-                {RA_DESERT_COLOSSUS, true},
-                {RA_THE_MARKET, true},
-                {RA_HYRULE_CASTLE, true},
-                {RA_KAKARIKO_VILLAGE, true},
-                {RA_THE_GRAVEYARD, true},
-                {RA_DEATH_MOUNTAIN_TRAIL, true},
-                {RA_GORON_CITY, true},
-                {RA_DEATH_MOUNTAIN_CRATER, true},
-                {RA_ZORAS_RIVER, true},
-                {RA_ZORAS_DOMAIN, true},
-                {RA_ZORAS_FOUNTAIN, true},
-                {RA_LON_LON_RANCH, true},
-                {RA_DEKU_TREE, true},
-                {RA_DODONGOS_CAVERN, true},
-                {RA_JABU_JABUS_BELLY, true},
-                {RA_FOREST_TEMPLE, true},
-                {RA_FIRE_TEMPLE, true},
-                {RA_WATER_TEMPLE, true},
-                {RA_SPIRIT_TEMPLE, true},
-                {RA_SHADOW_TEMPLE, true},
-                {RA_BOTTOM_OF_THE_WELL, true},
-                {RA_ICE_CAVERN, true},
-                {RA_GERUDO_TRAINING_GROUND, true},
-                {RA_GANONS_CASTLE, true}
+            static std::unordered_map<RandomizerArea, bool> areaTreeDisabled{
+                { RA_NONE, true },
+                { RA_KOKIRI_FOREST, true },
+                { RA_THE_LOST_WOODS, true },
+                { RA_SACRED_FOREST_MEADOW, true },
+                { RA_HYRULE_FIELD, true },
+                { RA_LAKE_HYLIA, true },
+                { RA_GERUDO_VALLEY, true },
+                { RA_GERUDO_FORTRESS, true },
+                { RA_HAUNTED_WASTELAND, true },
+                { RA_DESERT_COLOSSUS, true },
+                { RA_THE_MARKET, true },
+                { RA_HYRULE_CASTLE, true },
+                { RA_KAKARIKO_VILLAGE, true },
+                { RA_THE_GRAVEYARD, true },
+                { RA_DEATH_MOUNTAIN_TRAIL, true },
+                { RA_GORON_CITY, true },
+                { RA_DEATH_MOUNTAIN_CRATER, true },
+                { RA_ZORAS_RIVER, true },
+                { RA_ZORAS_DOMAIN, true },
+                { RA_ZORAS_FOUNTAIN, true },
+                { RA_LON_LON_RANCH, true },
+                { RA_DEKU_TREE, true },
+                { RA_DODONGOS_CAVERN, true },
+                { RA_JABU_JABUS_BELLY, true },
+                { RA_FOREST_TEMPLE, true },
+                { RA_FIRE_TEMPLE, true },
+                { RA_WATER_TEMPLE, true },
+                { RA_SPIRIT_TEMPLE, true },
+                { RA_SHADOW_TEMPLE, true },
+                { RA_BOTTOM_OF_THE_WELL, true },
+                { RA_ICE_CAVERN, true },
+                { RA_GERUDO_TRAINING_GROUND, true },
+                { RA_GANONS_CASTLE, true },
             };
-            static std::unordered_map<RandomizerArea, bool> areaTreeEnabled {
-                {RA_NONE, true},
-                {RA_KOKIRI_FOREST, true},
-                {RA_THE_LOST_WOODS, true},
-                {RA_SACRED_FOREST_MEADOW, true},
-                {RA_HYRULE_FIELD, true},
-                {RA_LAKE_HYLIA, true},
-                {RA_GERUDO_VALLEY, true},
-                {RA_GERUDO_FORTRESS, true},
-                {RA_HAUNTED_WASTELAND, true},
-                {RA_DESERT_COLOSSUS, true},
-                {RA_THE_MARKET, true},
-                {RA_HYRULE_CASTLE, true},
-                {RA_KAKARIKO_VILLAGE, true},
-                {RA_THE_GRAVEYARD, true},
-                {RA_DEATH_MOUNTAIN_TRAIL, true},
-                {RA_GORON_CITY, true},
-                {RA_DEATH_MOUNTAIN_CRATER, true},
-                {RA_ZORAS_RIVER, true},
-                {RA_ZORAS_DOMAIN, true},
-                {RA_ZORAS_FOUNTAIN, true},
-                {RA_LON_LON_RANCH, true},
-                {RA_DEKU_TREE, true},
-                {RA_DODONGOS_CAVERN, true},
-                {RA_JABU_JABUS_BELLY, true},
-                {RA_FOREST_TEMPLE, true},
-                {RA_FIRE_TEMPLE, true},
-                {RA_WATER_TEMPLE, true},
-                {RA_SPIRIT_TEMPLE, true},
-                {RA_SHADOW_TEMPLE, true},
-                {RA_BOTTOM_OF_THE_WELL, true},
-                {RA_ICE_CAVERN, true},
-                {RA_GERUDO_TRAINING_GROUND, true},
-                {RA_GANONS_CASTLE, true}
+            static std::unordered_map<RandomizerArea, bool> areaTreeEnabled{
+                { RA_NONE, true },
+                { RA_KOKIRI_FOREST, true },
+                { RA_THE_LOST_WOODS, true },
+                { RA_SACRED_FOREST_MEADOW, true },
+                { RA_HYRULE_FIELD, true },
+                { RA_LAKE_HYLIA, true },
+                { RA_GERUDO_VALLEY, true },
+                { RA_GERUDO_FORTRESS, true },
+                { RA_HAUNTED_WASTELAND, true },
+                { RA_DESERT_COLOSSUS, true },
+                { RA_THE_MARKET, true },
+                { RA_HYRULE_CASTLE, true },
+                { RA_KAKARIKO_VILLAGE, true },
+                { RA_THE_GRAVEYARD, true },
+                { RA_DEATH_MOUNTAIN_TRAIL, true },
+                { RA_GORON_CITY, true },
+                { RA_DEATH_MOUNTAIN_CRATER, true },
+                { RA_ZORAS_RIVER, true },
+                { RA_ZORAS_DOMAIN, true },
+                { RA_ZORAS_FOUNTAIN, true },
+                { RA_LON_LON_RANCH, true },
+                { RA_DEKU_TREE, true },
+                { RA_DODONGOS_CAVERN, true },
+                { RA_JABU_JABUS_BELLY, true },
+                { RA_FOREST_TEMPLE, true },
+                { RA_FIRE_TEMPLE, true },
+                { RA_WATER_TEMPLE, true },
+                { RA_SPIRIT_TEMPLE, true },
+                { RA_SHADOW_TEMPLE, true },
+                { RA_BOTTOM_OF_THE_WELL, true },
+                { RA_ICE_CAVERN, true },
+                { RA_GERUDO_TRAINING_GROUND, true },
+                { RA_GANONS_CASTLE, true },
             };
 
-            static std::map<Rando::Tricks::Tag, bool> showTag {
-                { Rando::Tricks::Tag::NOVICE, true },
-                { Rando::Tricks::Tag::INTERMEDIATE, true },
-                { Rando::Tricks::Tag::ADVANCED, true },
-                { Rando::Tricks::Tag::EXPERT, true },
-                { Rando::Tricks::Tag::EXTREME, true },
-                { Rando::Tricks::Tag::EXPERIMENTAL, true },
-                //{ Rando::Tricks::Tag::GLITCH, false },
+            static std::map<Rando::Tricks::Tag, bool> showTag{
+                { Rando::Tricks::Tag::NOVICE, true },   { Rando::Tricks::Tag::INTERMEDIATE, true },
+                { Rando::Tricks::Tag::ADVANCED, true }, { Rando::Tricks::Tag::EXPERT, true },
+                { Rando::Tricks::Tag::EXTREME, true },  { Rando::Tricks::Tag::EXPERIMENTAL, true },
+                { Rando::Tricks::Tag::GLITCH, false },
             };
             static ImGuiTextFilter trickSearch;
+            UIWidgets::PushStyleInput(THEME_COLOR);
             trickSearch.Draw("Filter (inc,-exc)", 490.0f);
+            UIWidgets::PopStyleInput();
             if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) {
                 ImGui::SameLine();
-                if (ImGui::Button("Disable All")) {
+                if (UIWidgets::Button("Disable All",
+                                      UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(250.f, 0.f)))) {
                     for (int i = 0; i < RT_MAX; i++) {
                         auto etfound = enabledTricks.find(static_cast<RandomizerTrick>(i));
                         if (etfound != enabledTricks.end()) {
@@ -2291,7 +4162,8 @@ void RandomizerSettingsWindow::DrawElement() {
                     Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 }
                 ImGui::SameLine();
-                if (ImGui::Button("Enable All")) {
+                if (UIWidgets::Button("Enable All",
+                                      UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(250.f, 0.f)))) {
                     for (int i = 0; i < RT_MAX; i++) {
                         if (!enabledTricks.count(static_cast<RandomizerTrick>(i))) {
                             enabledTricks.insert(static_cast<RandomizerTrick>(i));
@@ -2306,7 +4178,9 @@ void RandomizerSettingsWindow::DrawElement() {
                     Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 }
             }
-            if (ImGui::BeginTable("trickTags", showTag.size(), ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders)) {  
+            if (ImGui::BeginTable("trickTags", static_cast<int>(showTag.size()),
+                                  ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings |
+                                      ImGuiTableFlags_Borders)) {
                 for (auto [rtTag, isShown] : showTag) {
                     ImGui::TableNextColumn();
                     if (isShown) {
@@ -2334,19 +4208,22 @@ void RandomizerSettingsWindow::DrawElement() {
                     ImGui::TableNextColumn();
                     window->DC.CurrLineTextBaseOffset = 0.0f;
 
-                    if (ImGui::Button("Collapse All##disabled")) {
+                    if (UIWidgets::Button("Collapse All##disabled",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RA_MAX; i++) {
                             areaTreeDisabled[static_cast<RandomizerArea>(i)] = false;
                         }
                     }
                     ImGui::SameLine();
-                    if (ImGui::Button("Open All##disabled")) {
+                    if (UIWidgets::Button("Open All##disabled",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RA_MAX; i++) {
                             areaTreeDisabled[static_cast<RandomizerArea>(i)] = true;
                         }
                     }
                     ImGui::SameLine();
-                    if (ImGui::Button("Enable Visible")) {
+                    if (UIWidgets::Button("Enable Visible",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RT_MAX; i++) {
                             auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
                             if (!enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
@@ -2365,7 +4242,8 @@ void RandomizerSettingsWindow::DrawElement() {
                         Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                     }
 
-                    ImGui::BeginChild("ChildTricksDisabled", ImVec2(0, -8), false, ImGuiWindowFlags_HorizontalScrollbar);
+                    ImGui::BeginChild("ChildTricksDisabled", ImVec2(0, -8), false,
+                                      ImGuiWindowFlags_HorizontalScrollbar);
 
                     for (auto [area, trickIds] : mSettings->mTricksByArea) {
                         bool hasTricks = false;
@@ -2378,15 +4256,22 @@ void RandomizerSettingsWindow::DrawElement() {
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetAreaName(area) + "##disabled").c_str()), areaTreeDisabled[area]);
+                            ImGui::TreeNodeSetOpen(
+                                ImGui::GetID((Rando::Tricks::GetAreaName(area) + "##disabled").c_str()),
+                                areaTreeDisabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                             if (ImGui::TreeNode((Rando::Tricks::GetAreaName(area) + "##disabled").c_str())) {
                                 for (auto rt : trickIds) {
                                     auto option = mSettings->GetTrickOption(rt);
                                     if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
-                                        !enabledTricks.count(rt) && Rando::Tricks::CheckTags(showTag, option.GetTags())) {
-                                        ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetAreaName(option.GetArea()) + "##disabled").c_str()), areaTreeDisabled[option.GetArea()]);
+                                        !enabledTricks.count(rt) &&
+                                        Rando::Tricks::CheckTags(showTag, option.GetTags())) {
+                                        ImGui::TreeNodeSetOpen(
+                                            ImGui::GetID(
+                                                (Rando::Tricks::GetAreaName(option.GetArea()) + "##disabled").c_str()),
+                                            areaTreeDisabled[option.GetArea()]);
                                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
+                                        UIWidgets::PushStyleButton(THEME_COLOR, ImVec2(7.f, 5.f));
                                         if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Right)) {
                                             enabledTricks.insert(rt);
                                             std::string enabledTrickString = "";
@@ -2394,13 +4279,18 @@ void RandomizerSettingsWindow::DrawElement() {
                                                 enabledTrickString += std::to_string(enabledTrickIt);
                                                 enabledTrickString += ",";
                                             }
-                                            CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
-                                            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                                            CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"),
+                                                          enabledTrickString.c_str());
+                                            Ship::Context::GetInstance()
+                                                ->GetWindow()
+                                                ->GetGui()
+                                                ->SaveConsoleVariablesNextFrame();
                                         }
-                                        Rando::Tricks::DrawTagChips(option.GetTags());
+                                        UIWidgets::PopStyleButton();
+                                        Rando::Tricks::DrawTagChips(option.GetTags(), option.GetName());
                                         ImGui::SameLine();
                                         ImGui::Text("%s", option.GetName().c_str());
-                                        UIWidgets::InsertHelpHoverText(option.GetDescription().c_str());
+                                        UIWidgets::Tooltip(option.GetDescription().c_str());
                                     }
                                 }
                                 areaTreeDisabled[area] = true;
@@ -2416,24 +4306,26 @@ void RandomizerSettingsWindow::DrawElement() {
                     ImGui::TableNextColumn();
                     window->DC.CurrLineTextBaseOffset = 0.0f;
 
-                    if (ImGui::Button("Collapse All##enabled")) {
+                    if (UIWidgets::Button("Collapse All##enabled",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RA_MAX; i++) {
                             areaTreeEnabled[static_cast<RandomizerArea>(i)] = false;
                         }
                     }
                     ImGui::SameLine();
-                    if (ImGui::Button("Open All##enabled")) {
+                    if (UIWidgets::Button("Open All##enabled",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RA_MAX; i++) {
                             areaTreeEnabled[static_cast<RandomizerArea>(i)] = true;
                         }
                     }
                     ImGui::SameLine();
-                    if (ImGui::Button("Disable Visible")) {
+                    if (UIWidgets::Button("Disable Visible",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(ImVec2(0.f, 0.f)))) {
                         for (int i = 0; i < RT_MAX; i++) {
                             auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
                             if (enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
-                                trickSearch.PassFilter(option.GetName().c_str()) &&
-                                areaTreeEnabled[option.GetArea()] &&
+                                trickSearch.PassFilter(option.GetName().c_str()) && areaTreeEnabled[option.GetArea()] &&
                                 Rando::Tricks::CheckTags(showTag, option.GetTags())) {
                                 enabledTricks.erase(static_cast<RandomizerTrick>(i));
                             }
@@ -2464,33 +4356,45 @@ void RandomizerSettingsWindow::DrawElement() {
                             }
                         }
                         if (hasTricks) {
-                            ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetAreaName(area) + "##enabled").c_str()), areaTreeEnabled[area]);
+                            ImGui::TreeNodeSetOpen(
+                                ImGui::GetID((Rando::Tricks::GetAreaName(area) + "##enabled").c_str()),
+                                areaTreeEnabled[area]);
                             ImGui::SetNextItemOpen(true, ImGuiCond_Once);
                             if (ImGui::TreeNode((Rando::Tricks::GetAreaName(area) + "##enabled").c_str())) {
                                 for (auto rt : trickIds) {
                                     auto option = mSettings->GetTrickOption(rt);
                                     if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
-                                        enabledTricks.count(rt) && Rando::Tricks::CheckTags(showTag, option.GetTags())) {
-                                        ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetAreaName(option.GetArea()) + "##enabled").c_str()), areaTreeEnabled[option.GetArea()]);
+                                        enabledTricks.count(rt) &&
+                                        Rando::Tricks::CheckTags(showTag, option.GetTags())) {
+                                        ImGui::TreeNodeSetOpen(
+                                            ImGui::GetID(
+                                                (Rando::Tricks::GetAreaName(option.GetArea()) + "##enabled").c_str()),
+                                            areaTreeEnabled[option.GetArea()]);
                                         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
+                                        UIWidgets::PushStyleButton(THEME_COLOR, ImVec2(7.f, 5.f));
                                         if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Left)) {
                                             enabledTricks.erase(rt);
                                             std::string enabledTrickString = "";
                                             for (auto enabledTrickIt : enabledTricks) {
                                                 enabledTrickString += std::to_string(enabledTrickIt);
                                                 enabledTrickString += ",";
+                                            }
+                                            if (enabledTrickString == "") {
+                                                CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
+                                            } else {
+                                                CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"),
+                                                              enabledTrickString.c_str());
+                                            }
+                                            Ship::Context::GetInstance()
+                                                ->GetWindow()
+                                                ->GetGui()
+                                                ->SaveConsoleVariablesNextFrame();
                                         }
-                                        if (enabledTrickString == "") {
-                                            CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
-                                        } else {
-                                            CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
-                                        }
-                                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                                    }
-                                    Rando::Tricks::DrawTagChips(option.GetTags());
-                                    ImGui::SameLine();
-                                    ImGui::Text("%s", option.GetName().c_str());
-                                    UIWidgets::InsertHelpHoverText(option.GetDescription().c_str());
+                                        UIWidgets::PopStyleButton();
+                                        Rando::Tricks::DrawTagChips(option.GetTags(), option.GetName());
+                                        ImGui::SameLine();
+                                        ImGui::Text("%s", option.GetName().c_str());
+                                        UIWidgets::Tooltip(option.GetDescription().c_str());
                                     }
                                 }
                                 areaTreeEnabled[area] = true;
@@ -2532,17 +4436,20 @@ void RandomizerSettingsWindow::DrawElement() {
 
         ImGui::EndTabBar();
     }
+    UIWidgets::PopStyleTabs();
+}
 
-    ImGui::EndDisabled();
-
-    if (disableEditingRandoSettings) {
-        UIWidgets::ReEnableComponent("");
-    }
+void RandomizerSettingsWindow::SetNeedsUpdate() {
+    mNeedsUpdate = true;
 }
 
 void RandomizerSettingsWindow::UpdateElement() {
     if (mNeedsUpdate) {
+        RandomizerCheckObjects::UpdateImGuiVisibility();
         mSettings->UpdateOptionProperties();
+        locationsTabOpen = false;
+        tricksTabOpen = false;
+        mNeedsUpdate = false;
     }
 }
 
@@ -2551,41 +4458,49 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
     CustomMessage messageEntry;
     switch (scene) {
         case SCENE_TEMPLE_OF_TIME:
-            if (ctx->GetOption(RSK_OOT_HINT) && !ctx->GetItemLocation(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()){
+            if (ctx->GetOption(RSK_OOT_HINT) && !ctx->GetItemLocation(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()) {
                 messageEntry = ctx->GetHint(RH_OOT_HINT)->GetHintMessage(MF_RAW);
             } else if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
                 messageEntry = CustomMessage(
-                "@, meet me at %gGanon's Castle%w once you obtain the %rkey to his lair%w.",
-                "@, wir treffen uns bei %gGanons Schloß%w, sobald Du den %rSchlüssel zu seinem Verlies%w hast.",
-                "Retrouve-moi au %gChâteau de Ganon%w une fois que tu auras obtenu la %rclé de son repaire%w.");
+                    "@, meet me at %gGanon's Castle%w once you obtain the %rkey to his lair%w.",
+                    "@, wir treffen uns bei %gGanons Schloß%w, sobald Du den %rSchlüssel zu seinem Verlies%w hast.",
+                    "Retrouve-moi au %gChâteau de Ganon%w une fois que tu auras obtenu la %rclé de son repaire%w.");
             } else {
-                messageEntry = CustomMessage(
-                "The time has come. Prepare yourself.",
-                "Die Zeit ist gekommen.&Mach Dich bereit.",
-                "Le moment est venu @.&Tu ferais bien de te préparer.");
+                messageEntry =
+                    CustomMessage("The time has come. Prepare yourself.", "Die Zeit ist gekommen.&Mach Dich bereit.",
+                                  "Le moment est venu @.&Tu ferais bien de te préparer.");
             }
             break;
         case SCENE_INSIDE_GANONS_CASTLE:
             if (ctx->GetOption(RSK_SHEIK_LA_HINT) && INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) {
                 messageEntry = ctx->GetHint(RH_SHEIK_HINT)->GetHintMessage(MF_RAW);
-            } else if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
-                       CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired)) {
-                messageEntry = CustomMessage("You are still ill-equipped to face %rGanondorf%w."
-                    "^Seek out the %cMaster Sword%w, %rsomething to hold your arrows%w, and %gmagic%w to summon the %ylight%w.",
+            } else if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER) &&
+                         INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT && CUR_CAPACITY(UPG_QUIVER) >= 30 &&
+                         gSaveContext.isMagicAcquired)) {
+                messageEntry = CustomMessage(
+                    "You are still ill-equipped to face %rGanondorf%w."
+                    "^Seek out the %cMaster Sword%w, %rsomething to hold your arrows%w, and %gmagic%w to summon the "
+                    "%ylight%w.",
                     "Du bist noch nicht gewappnet um Dich %rGanondorf%w stellen zu können.^"
-                    "Begib Dich auf die Suche nach dem %cMaster-Schwert%w, %retwas um Deinen Pfeilen einen Sinn zu geben%w,^sowie %gdie Magie%w, um das %yLicht%w herauf beschwören zu können.",
+                    "Begib Dich auf die Suche nach dem %cMaster-Schwert%w, %retwas um Deinen Pfeilen einen Sinn zu "
+                    "geben%w,^sowie %gdie Magie%w, um das %yLicht%w heraufzubeschwören.",
                     "@, tu n'es toujours pas prêt à affronter %rGanondorf%w.^"
-                    "Cherche l'%cÉpée de Légende%w, %rquelque chose pour ranger tes flèches%w et de la %gmagie%w pour invoquer la %ylumière%w.");
-            } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER) && !ctx->GetOption(RSK_TRIAL_COUNT).Is(0)){
+                    "Cherche l'%cÉpée de Légende%w, %rquelque chose pour ranger tes flèches%w et de la %gmagie%w pour "
+                    "invoquer la %ylumière%w.");
+            } else if (!Flags_GetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER) &&
+                       !ctx->GetOption(RSK_TRIAL_COUNT).Is(0)) {
                 messageEntry = CustomMessage(
-                    "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still stands.^Complete the remaining %gtrials%w to destroy it.",
-                    "Du magst das haben, was Du brauchst um %rden bösen König%w zu besiegen, aber die %cBarriere%w steht noch.^Absolviere die verbleibenden %gPrüfungen%w um sie zu zerstören.",
-		            "@, tu as peut-être ce qu'il te faut pour vaincre %rle Malin%w, mais les barrières sont toujours actives.^Termine les épreuves restantes pour les détruire.");
+                    "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still "
+                    "stands.^Complete the remaining %gtrials%w to destroy it.",
+                    "Du magst haben, was Du brauchst um %rden Großmeister des Bösen%w zu besiegen, doch die "
+                    "%cBarriere%w "
+                    "steht noch.^Breche die verbleibenden %gSiegel%w um sie zu zerstören.",
+                    "@, tu as peut-être ce qu'il te faut pour vaincre %rle Malin%w, mais les barrières sont toujours "
+                    "actives.^Termine les épreuves restantes pour les détruire.");
             } else {
-                messageEntry = CustomMessage(
-                    "If you're ready, then proceed.^Good luck.",
-                    "Wenn Du bereit bist, so schreite&voran.^Viel Glück.",
-                    "Si tu es prêt, tu peux y aller.^Bonne chance.");
+                messageEntry = CustomMessage("If you're ready, then proceed.^Good luck.",
+                                             "Wenn Du bereit bist, so schreite&voran.^Viel Glück.",
+                                             "Si tu es prêt, tu peux y aller.^Bonne chance.");
             }
             break;
     }
@@ -2596,25 +4511,24 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
 CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
     auto ctx = Rando::Context::GetInstance();
     CustomMessage messageEntry = CustomMessage(
-      "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
-      "Entschuldigung, aber der Teich ist zu.&Ich habe meine gute %rAngelrute%w verloren.&Ohne kann ich nicht fischen!",
-      "Désolé, mais l'étang est fermé.&J'ai perdu ma bonne %rCanne à Pêche%w...&Impossible de pêcher sans elle!"
-    );
+        "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
+        "Entschuldigung, aber der Teich hat&geschloßen. Ich habe meine gute &%rAngelrute%w verloren.&Ohne kann ich "
+        "nicht fischen!^",
+        "Désolé, mais l'étang est fermé.&J'ai perdu ma bonne %rCanne à Pêche%w...&Impossible de pêcher sans elle!");
 
-    if (Rando::Context::GetInstance()->GetOption(RSK_FISHING_POLE_HINT)) {
+    if (GetRandoSettingValue(RSK_FISHING_POLE_HINT)) {
         messageEntry = messageEntry + CustomMessage(ctx->GetHint(RH_FISHING_POLE)->GetHintMessage());
     }
 
     // if the fishing pond guy doesnt remember me i will cry :(
     if (originalTextId == TEXT_FISHING_POND_START_MET) {
-        messageEntry = CustomMessage(
-            "Hey, mister! I remember you!&It's been a long time!^",
-            "Hallo, mein Herr! Ich erinnere mich an Sie!&Lang ist's her!",
-            "Hé, monsieur! Je me souviens de toi!&Ça fait longtemps!"
-        ) + messageEntry;
+        messageEntry = CustomMessage("Hey, mister! I remember you!&It's been a long time!^",
+                                     "Hallo, mein Herr! Ich erinnere mich an Sie!&Lang ist's her!",
+                                     "Hé, monsieur! Je me souviens de toi!&Ça fait longtemps!") +
+                       messageEntry;
     }
 
-    messageEntry.Format(); //RANDOTODO why is this needed when it's not elsewhere....
+    messageEntry.Format(); // RANDOTODO why is this needed when it's not elsewhere....
 
     return messageEntry;
 }
@@ -2631,24 +4545,27 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerCheck rc, TextIDs textId,
     } else if (shopItemGet == RG_ICE_TRAP) {
         shopItemGet = ctx->overrides[rc].LooksLike();
         shopItemName = CustomMessage(ctx->overrides[rc].GetTrickName());
-    } else { 
-        auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet);
-        shopItemName = {shopItem.GetName()};
-    }
-    
-    if (freeTextId != TEXT_NONE && shopItemPrice == 0) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, freeTextId, MF_RAW);
     } else {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId, MF_RAW);
+        auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet);
+        shopItemName = { shopItem.GetName() };
     }
 
-    messageEntry.InsertNames({shopItemName, {std::to_string(shopItemPrice)}});
+    if (freeTextId != TEXT_NONE && shopItemPrice == 0) {
+        messageEntry =
+            CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, freeTextId, MF_RAW);
+    } else {
+        messageEntry =
+            CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId, MF_RAW);
+    }
+
+    messageEntry.InsertNames({ shopItemName, { std::to_string(shopItemPrice) } });
     messageEntry.AutoFormat();
     return messageEntry;
 }
 
 CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, itemEntry.getItemId);
+    CustomMessage messageEntry =
+        CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, itemEntry.getItemId);
     int sceneNum;
     switch (itemEntry.getItemId) {
         case RG_DEKU_TREE_MAP:
@@ -2685,8 +4602,7 @@ CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
 
     if (GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE ||
         (GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
-         GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12)
-       ) {
+         GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12)) {
         messageEntry.Replace("[[typeHint]]", "");
     } else if (ResourceMgr_IsSceneMasterQuest(sceneNum)) {
         messageEntry.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_MASTERFUL].GetHintMessage());
@@ -2694,14 +4610,15 @@ CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
         messageEntry.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_ORDINARY].GetHintMessage());
     }
 
+    // BUG: the icon is not in the message yet so are not accounted for, so overflows are possible
+    messageEntry.AutoFormat();
     return messageEntry;
 }
 
-template<size_t N>
-void CreateGetItemMessages(const std::array<GetItemMessage, N>* messageEntries) {
+template <size_t N> void CreateGetItemMessages(const std::array<GetItemMessage, N>& messageEntries) {
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::getItemMessageTableID);
-    for (const GetItemMessage& messageEntry : *messageEntries) {
+    for (const GetItemMessage& messageEntry : messageEntries) {
         customMessageManager->CreateGetItemMessage(
             Randomizer::getItemMessageTableID, messageEntry.giid, messageEntry.iid,
             CustomMessage(messageEntry.english, messageEntry.german, messageEntry.french, TEXTBOX_TYPE_BLUE,
@@ -2731,17 +4648,15 @@ void CreateRupeeMessages() {
         }
         customMessageManager->CreateMessage(
             Randomizer::rupeeMessageTableID, rupee,
-            CustomMessage(
-                "You found" + rupeeText + " !",
-                "Du hast" + rupeeText + "  gefunden!",
-                "Vous obtenez" + rupeeText + " !", TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM));
+            CustomMessage("You found" + rupeeText + " !", "Du hast" + rupeeText + "  gefunden!",
+                          "Vous obtenez" + rupeeText + " !", TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM));
     }
 }
 
 CustomMessage Randomizer::GetRupeeMessage(u16 rupeeTextId) {
-    CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId, MF_AUTO_FORMAT);
-    messageEntry.Replace("[[rupee]]", CustomMessage(RandomElement(englishRupeeNames),
-                                                    RandomElement(germanRupeeNames),
+    CustomMessage messageEntry =
+        CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId, MF_AUTO_FORMAT);
+    messageEntry.Replace("[[rupee]]", CustomMessage(RandomElement(englishRupeeNames), RandomElement(germanRupeeNames),
                                                     RandomElement(frenchRupeeNames)));
     return messageEntry;
 }
@@ -2751,27 +4666,33 @@ void CreateTriforcePieceMessages() {
 
         { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. It's a start!",
           "Ein %yTriforce-Splitter%w! Du hast&%g[[current]]%w von %c[[required]]%w gefunden. Es ist ein&Anfang!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. C'est un début!" },
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à "
+          "trouver. C'est un début!" },
 
         { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Progress!",
           "Ein %yTriforce-Splitter%w! Du hast&%g[[current]]%w von %c[[required]]%w gefunden. Es geht voran!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. Ça avance!" },
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à "
+          "trouver. Ça avance!" },
 
         { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Over half-way&there!",
-          "Ein %yTriforce-Splitter%w! Du hast&schon %g[[current]]%w von %c[[required]]%w gefunden. Schon&über die Hälfte!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. Il en reste un&peu moins que la moitié!" },
+          "Ein %yTriforce-Splitter%w! Du hast&schon %g[[current]]%w von %c[[required]]%w gefunden. Schon&über die "
+          "Hälfte!",
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à "
+          "trouver. Il en reste un&peu moins que la moitié!" },
 
         { "You found a %yTriforce Piece%w!&%g[[current]]%w down, %c[[remaining]]%w to go. Almost done!",
           "Ein %yTriforce-Splitter%w! Du hast&schon %g[[current]]%w von %c[[required]]%w gefunden. Fast&geschafft!",
-          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à trouver. C'est presque&terminé!" },
+          "Vous trouvez un %yFragment de la&Triforce%w! Vous en avez %g[[current]]%w, il en&reste %c[[remaining]]%w à "
+          "trouver. C'est presque&terminé!" },
 
         { "You completed the %yTriforce of&Courage%w! %gGG%w!",
           "Das %yTriforce des Mutes%w! Du hast&alle Splitter gefunden. %gGut gemacht%w!",
           "Vous avez complété la %yTriforce&du Courage%w! %gFélicitations%w!" },
 
         { "You found a spare %yTriforce Piece%w!&You only needed %c[[required]]%w, but you have %g[[current]]%w!",
-          "Ein übriger %yTriforce-Splitter%w! Du&hast nun %g[[current]]%w von %c[[required]]%w nötigen gefunden.",
-          "Vous avez trouvé un %yFragment de&Triforce%w en plus! Vous n'aviez besoin&que de %c[[required]]%w, mais vous en avez %g[[current]]%w en&tout!" },
+          "Noch ein %yTriforce-Splitter%w! Du&brauchtest nur %c[[required]]%w, hast jetzt aber %g[[current]]%w!",
+          "Vous avez trouvé un %yFragment de&Triforce%w en plus! Vous n'aviez besoin&que de %c[[required]]%w, mais "
+          "vous en avez %g[[current]]%w en&tout!" },
     };
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::triforcePieceMessageTableID);
@@ -2832,13 +4753,13 @@ void CreateNaviRandoMessages() {
           "mouvants%c?" },
 
         { "%cYou can reach the back of %wImpa's&House %cby jumping from the&unfinished house with a %rcucco%c!",
-          "%cDu kannst den Balkon von %wImpas&Haus %cerreichen indem Du von&der Baustelle aus mit einem "
+          "%cDu kannst den Balkon von %wImpas&Haus %cerreichen, indem Du von&der Baustelle aus mit einem "
           "%rHuhn&%cspringst!",
           "%cTu peux atteindre l'arrière de la&%wMaison d'Impa %cen sautant depuis la&maison en construction avec "
           "une&%rcocotte%c!" },
 
         { "%cThe %ySpirit Trial %cin %pGanon's Castle&%chas a %whidden chest %csomewhere.&Did you already know that?",
-          "%cDie %yGeister-Prüfung %cin %pGanons&Schloß %chat irgendwo eine&%wversteckte Kiste%c. Weißt Du schon&wo?",
+          "%cDas %yGeister-Siegel %cin %pGanons&Schloß %chat irgendwo eine&%wversteckte Kiste%c. Wußtest Du&das schon?",
           "%cL'%yÉpreuve de l'Esprit%c dans le %pChâteau&de Ganon %ca un coffre caché quelque&part. Je suppose que tu "
           "le savais&déjà?" },
 
@@ -2857,7 +4778,7 @@ void CreateNaviRandoMessages() {
         { "%cYou might end up with an %wextra&key %cfor the %bWater Temple %cor the&%rFire Temple%c. It's for your "
           "safety!",
           "%cVielleicht verbleibt Dir im&%bWassertempel %coder %rFeuertempel %cein&%wzusätzlicher Schlüssel%c. "
-          "Dies&ist zu Deiner Sicherheit!",
+          "&Nur zu Deiner Sicherheit!",
           "%cIl se peut que tu aies une %wPetite&Clé %cen trop dans le %bTemple de l'Eau&%cou le %rTemple du Feu%c. "
           "C'est pour ta&propre sécurité!" },
 
@@ -2873,7 +4794,8 @@ void CreateNaviRandoMessages() {
           "%cMême un adulte ne peut pas pousser&de grands blocs sans un petit %wgain&de force%c!" },
 
         { "%cI've heard that %rFlare Dancer&%cis weak to the %wMaster Sword%c!&Have you tried it?",
-          "%cIch habe gehört, daß der&%rFlammenderwisch %ceine Schwäche für&das %wMaster-Schwert %caufweist. Hast Du&es "
+          "%cIch habe gehört, daß der&%rFlammenderwisch %ceine Schwäche für&das %wMaster-Schwert %caufweist. Hast "
+          "Du&es "
           "schon einmal versucht einzusetzen?",
           "%cJ'ai entendu dire que les %rDanse-&Flammes %csont faîbles face à l'%wÉpée de&Légende%c! Est-ce que tu as "
           "essayé?" },
@@ -2884,25 +4806,27 @@ void CreateNaviRandoMessages() {
           "%wjarre&%cà la figure?" },
 
         { "%cI hear the patch of %wsoft soil&%cin %bZora's River %cis the only one&that isn't home to a %rspider%c!",
-          "%cIch habe gehört, daß die Stelle&%wfeuchten Bodens %cim %bZora-Fluß %cals&einzige keine %rSkulltula "
+          "%cIch habe gehört, daß das&%wErdloch%c am %bZora-Fluß, %cals&einziges keine %rSkulltula "
           "%cbeherbergt.",
           "%cJ'ai entendu dire que la %wterre meuble&%cqui se trouve à la %bRivière Zora %cest&la seule qui ne "
           "contienne pas&d'%raraignée%c." },
 
         { "%cThe people of Hyrule sometimes&have %witems %cfor you, but they won't&like it if you're %wwearing a "
           "mask%c!",
-          "%cDie Bewohner Hyrules haben manchmal&%wGegenstände %cfür Dich, aber sie mögen&es nicht, wenn Du %wMasken "
+          "%cDie Bewohner Hyrules haben manchmal&%wGegenstände %cfür Dich, doch sie mögen&es nicht, wenn Du %wMasken "
           "trägst%c!",
           "%cIl se peut que les habitants d'Hyrule&aient des %wobjets %cpour toi. Par contre,&ils risquent de ne pas "
           "trop apprécier&le fait que tu %wportes un masque%c!" },
 
         { "%cIf you get trapped somewhere, you&might have to %wsave your game %cand&%wreset%c!",
-          "%cSolltest Du irgendwo eingeschlossen&sein, mußt Du vielleicht Dein %wSpiel&speichern %cund %wneu starten%c!",
+          "%cSolltest Du irgendwo eingeschloßen&sein, mußt Du vielleicht Dein %wSpiel&speichern %cund %wneu "
+          "starten%c!",
           "%cSi tu es coincé quelque part, tu&devrais %wsauvegarder ta partie %cet&faire un %wreset%c!" },
 
         { "%cSheik will meet you in a %rburning&village %conce you have %gForest%c,&%rFire%c, and %bWater "
           "%cMedallions!",
-          "%cShiek wird Dich in einem %rbrennenden&Dorf %ctreffen, sobald Du das Amulett&des %gWaldes%c, %rFeuers %cund "
+          "%cShiek wird Dich in einem %rbrennenden&Dorf %ctreffen, sobald Du das Amulett&des %gWaldes%c, %rFeuers "
+          "%cund "
           "%bWassers&%cbesitzt.",
           "%cSheik t'attendra dans un %rvillage&en feu %clorsque tu auras récupéré&les médaillons de la %gForêt%c, du "
           "%rFeu&%cet de l'%bEau%c!" },
@@ -2917,9 +4841,7 @@ void CreateNaviRandoMessages() {
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::NaviRandoMessageTableID);
     for (unsigned int i = 0; i <= (NUM_NAVI_MESSAGES - 1); i++) {
-        customMessageManager->CreateMessage(
-            Randomizer::NaviRandoMessageTableID, i,
-            NaviMessages[i]);
+        customMessageManager->CreateMessage(Randomizer::NaviRandoMessageTableID, i, NaviMessages[i]);
     }
 }
 
@@ -2969,7 +4891,7 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Would you like #ice# with that?",
         "You have obtained the #Ice# Medallion!",
         "Quick, do a #Zora# impression!",
-        "One item #on the rocks#!",//would be better if it could display the name of the item
+        "One item #on the rocks#!", // would be better if it could display the name of the item
         "How much does a polar bear weigh?&Enough to break the #ice#.",
         "You got Din's #Ice#!",
         "You got Nayru's #Cold#!",
@@ -3032,12 +4954,13 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "STOP!&You violated the #Thaw#!",
         "I wanted to give you a treasure, but it looks like you got #cold feet#.",
         "You told me you wanted to deliver #just ice# to Ganondorf!",
-        "You got the triforce!&This ancient artifact of divine power can grant any- wait, no, sorry, it's just an ice trap. My bad.",
+        "You got the triforce!&This ancient artifact of divine power can grant any- wait, no, sorry, it's just an ice "
+        "trap. My bad.",
         "Time to #cool off#!",
         "The #Ice Cavern# sends its regards.",
         "Loading item, please #wait#...",
         "Mash A+B to not #die#.",
-        "Sorry, your item is in another location.", //would be better if it could have the name of the item
+        "Sorry, your item is in another location.", // would be better if it could have the name of the item
         "You only wish this was %gGreg%w.",
         "Do you want to drink a hot chocolate?",
         "The #cold# never bothered me anyway.",
@@ -3058,7 +4981,8 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Remember, there may be some momentary #discomfort#.",
         "In a perfect world #ice traps# like me would not exist, but this is not a perfect world.",
         "Gee, it sure is #cold# around here.",
-        "You tested the item with your #ice detector#, it beeped.", //would be better if it could have the name of the item
+        "You tested the item with your #ice detector#, it beeped.", // would be better if it could have the name of the
+                                                                    // item
         "You have found the way of the zero. The #sub-zero#.",
         "Mweep... mweep... mweep...",
         "Scum, #freezebag#! I mean #freeze#, scumbag!",
@@ -3077,29 +5001,32 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Hydration break! Hey, who #froze# my water?",
         "Oops, wrong #item model#.",
         "Whoops! You have to put the item #in your inventory#.",
-        "You dropped the item, shattering it into #shards of ice#!", //would be better if it could have the name of the item
+        "You dropped the item, shattering it into #shards of ice#!", // would be better if it could have the name of the
+                                                                     // item
         "Is this... golden age Simpsons?&BECAUSE I'M ABOUT TO #CHOKE A CHILD#.",
         "You are the weakest @, #goodbye#!",
         "Ugh... Why did we even randomize #this item#?",
         "The #Frost Moon# is rising...",
-        "According to all known laws of physics and biology, there is no way that @ should be able to survive #getting fully encased in ice#. The cells in @'s body would all die by the time they #unthaw#. Of course, this is a video game, so @ survives anyway... #Probably#.",
+        "According to all known laws of physics and biology, there is no way that @ should be able to survive #getting "
+        "fully encased in ice#. The cells in @'s body would all die by the time they #unthaw#. Of course, this is a "
+        "video game, so @ survives anyway... #Probably#.",
         "Okay, so stop me if you've heard this one - a gamer and a bottle of #liquid nitrogen# walk into a milk bar...",
         "Lástima, es una #trampa de hielo#...&&Nobody expects the Spanish #ice trap#!",
         "Gee, it sure is #BURR#ing around here.",
         "Navi? Oh! I thought she was called #Névé#!",
         "It's fine, @ knew this was a #trap#, they're just using it to take damage intentionally to manipulate RNG.",
-        "Unfortunately, the item has #stopped#.", //would be better if it could have the name of the item
-        "This item is #not available# in your country.", //would be better if it could have the name of the item
+        "Unfortunately, the item has #stopped#.",        // would be better if it could have the name of the item
+        "This item is #not available# in your country.", // would be better if it could have the name of the item
         "#Ice# try. #;)#",
         "D'oh, I #missed#!",
         "Where is my #super suit#?",
         "#Titanic's revenge#.",
     };
 
-    static const char* const germanIceTrapMessages[23] = {
+    static const char* const germanIceTrapMessages[104] = {
         "Du bist ein #DUMMKOPF#!",
         "Du bist eine #Frostbeule#!",
-        "#DUMMKOPF#!",
+        "#NARR#!",
         "Du wurdest #eiskalt# erwischt!",
         "Es läuft Dir #eiskalt# den Rücken hinunter, @.",
         "Bleib #cool#, @.",
@@ -3112,7 +5039,7 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Bewahre einen #kühlen#! Kopf.",
         "Ganondorf setzt #Eisstrahl# ein. Das ist sehr effektiv!",
         "Ein Lächeln ist der beste Weg, um das #Eis# zu brechen!",
-        "#Eiskalt# lässt du meine Seele erfrier'n.",
+        "#Eiskalt# lässt Du meine Seele erfrier'n.",
         "Die #Titanic# hätte Angst vor Dir, @.",
         "Oh nein!",
         "Was die Dinosaurier getötet hat?&Die #Eiszeit#!",
@@ -3120,6 +5047,87 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Never gonna #give you up#. Never gonna #let you down#. Never gonna run around and #desert you#.",
         "Danke #@#! Aber der Gegenstand ist in einem anderem Schloß!",
         "Kalt. Kalt. Kälter. #EISKALT#!",
+        "Von wegen #Belohnung#!",
+        "Ganon lacht dich aus.",
+        "Zelda wartet... aber nicht auf Dich!",
+        "Hyrule braucht Dich... aber nicht so!",
+        "Master-Schmerz statt Master-Schwert.",
+        "Das passiert wenn man alles looten möchte!",
+        "Ein kleiner Vorgeschmack auf Ganons Kühlschrank.",
+        "Ich hoffe, Du hast gespeichert.",
+        "Dein Gesicht, als Du die Truhe geöffnet hast... unbezahlbar.",
+        "Tut mir leid, aber das Item befindet sich in einer anderen Truhe.",
+        "Noch 5 solcher Truhen und Du bist abgehärtet.",
+        "Keine sorge. Ich bin genau so enttäuscht wie Du.",
+        "Epona läuft gerade ohne Dich los.",
+        "Wow! Ein echtes Nichts!",
+        "Du bist sowas von bereit für den Endboss. Nicht!",
+        "Loot? Nur für Gewinner!",
+        "Pure Enttäuschung.",
+        "RNG meint es nicht gut mit dir...",
+        "Link.exe hat ein Problem erkannt. Spiel wird heruntergefahren.",
+        "Die Truhe war leer, dein Verstand ebenso.",
+        "Hier für Dich, lecker #Eis#.",
+        "Das ist kein Item - das ist Karma.",
+        "Und wieder hat Dich 'ne Kiste besiegt.",
+        "Rauru lacht Dich aus.",
+        "Saria hat sich gerade entfreundet.",
+        "Prinzessin Ruto hat die Verlobung aufgelöst.",
+        "Kein Seed, kein Ärger!",
+        "Diese Truhe wurde Ihnen präsentiert von: ABSICHT!",
+        "Nicht heute.",
+        "Nächster halt, #Frosthausen#!",
+        "Genau so nützlich wie Navi im Bosskampf.",
+        "Zelda? Die kennt Dich nicht.",
+        "Zufall? Nein. Absicht!",
+        "Karma.exe erfolgreich ausgeführt.",
+        "Manchmal gewinnt man, aber Du gehörst nicht dazu.",
+        "#Eiskalt# versagt.",
+        "Tingle lacht Dich aus.",
+        "Du hörst Ganondorf dir folgendes zuflüstern.. \"Danke fürs Öffnen, aber das war mein #Müll#!\"",
+        "Navi: 'Hey, hör zu! Da ist... absolut #nichts# drin.",
+        "Truhe geöffnet, Hoffnung zerstört. Willkommen in Hyrule.",
+        "Die Truhe enthält: 100% pure #Enttäuschung#.",
+        "Na? Wieder zu viel von Malons #Mentos# genascht?",
+        "Du wurdest #eiskalt# beim Öffnen der Truhe erwischt.",
+        "Grats, Du hast Ganons alten #Eiswürfelvorrat# gefunden.",
+        "Die Truhe ist kälter als #Zoras Reich#... und genauso leer.",
+        "#Eis#? Klar, das ist der #kalte# Hauch der Enttäuschung!",
+        "Die Truhe ist so leer, sogar der #Yeti# aus Twilight Princess lacht.",
+        "Die Truhe enthält: 100% #gefrorene# Hoffnungslosigkeit.",
+        "Du hast eine Truhe geöffnet und den #Kälterekord# in Hyrule gebrochen.",
+        "Du hast TM16 erhalten: #Eissturm#!",
+        "Controller Disconnect, jetzt bist Du #gefreezed#.",
+        "Noch drei solcher Truhen, und dein Spielstand wird gelöscht.",
+        "Gengar setzt Schlecker ein! Du bist vollständig #paralysiert#!",
+        "Mumbo Jumbo verwandelt Dich in einen #Eisblock#. Haste jetzt 'nen coolen Look.",
+        "Willkommen in Donkey Kong Country: Tropical #Freeze#!",
+        "Gratuliere! Du hast das Spiel #gefreezed#.",
+        "Triforce des Mutes und trotzdem bekommst Du kalte Füße.",
+        "Fortschritt #eingefroren#. Bitte blasen Sie in die Cartridge.",
+        "Du bist nicht soft-locked. Du bist #frost-locked#.",
+        "Ein #frostiger# Wind weht durch die Truhe... leer, als hätte Kirby den ganzen Inhalt eingesaugt.",
+        "Ein #eisiger# Hauch weht dir entgegen.... Doch die Truhe bleibt #kalt# und leer.",
+        "Die Truhe ist von #Frost# versiegelt... drinnen nichts als eine #kalte#, #frostige# Enttäuschung!",
+        "#Frost# knistert bedrohlich in der Truhe - kein Schatz, nur ein #eisiger# Hohn!",
+        "Diese Falle zu finden ist so #frostig# wie Fangen spielen mit Chill Penguin.",
+        "#Eis# kann funkeln, was kannst Du?",
+        "Niete, selbst die Prinzessin ist enttäuscht.",
+        "Herzteil? Nein, #Eiskalt#!",
+        "Ratet mal wer wieder zu gierig war? Richtig... DU!",
+        "Ganondorf bedankt sich persönlich für deine Inkompetenz.",
+        "Der Spind von Davy Jones!",
+        "Herzog Onkled lacht Dich aus.",
+        "GEWINNER!",
+        "vERLIERER!",
+        "Drücke B, Unten und Select um zu überleben.",
+        "#Chill# mal jetzt.",
+        "Hier halt mal eben.",
+        "Sony lacht Dich aus",
+        "Dieses Item ist nicht in deinem Land verfügbar.",
+        "Es ist wichtig, die #Kühltruhe# mal für einen Tag auszuschalten.",
+        "#Kacknoob#!",
+        "Insert Rupee to continue...",
     };
 
     static const char* const frenchIceTrapMessages[83] = {
@@ -3148,12 +5156,13 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "J'espère que ça ne te fait ni chaud, ni #froid#.",
         "Je voulais t'offrir un trésor, mais il semble que tu aies eu #froid aux pieds#",
         "Tu m'as dit que tu voulais livrer #de la glace# à Ganondorf!",
-        "Tu as obtenu la Triforce!&Cet ancien artefact divin peut exaucer n'importe quel... ah non, désolé, c'est juste un piège de glace.",
+        "Tu as obtenu la Triforce!&Cet ancien artefact divin peut exaucer n'importe quel... ah non, désolé, c'est "
+        "juste un piège de glace.",
         "Il est temps de #te rafraîchir#!",
         "La #Caverne Polaire# te passe le bonjour.",
         "Chargement de l'objet, veuillez #patienter#...",
         "Martèle A+B pour ne pas #mourir#.",
-        "Désolé, ton objet est à un autre endroit.", //would be better if it could have the name of the item
+        "Désolé, ton objet est à un autre endroit.", // would be better if it could have the name of the item
         "Tu espérais que ce soit %gGreg%w.",
         "Tu veux boire un chocolat chaud?",
         "Le #froid# ne m'a jamais dérangé, de toute façon.",
@@ -3172,9 +5181,11 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Commence à marteler.",
         "Cet objet va #s'autodétruire# dans 5 secondes...",
         "Souviens-toi, il pourrait y avoir un léger #inconfort#.",
-        "Dans un monde parfait, les #pièges de glace# comme moi n'existeraient pas, mais ce n'est pas un monde parfait.",
+        "Dans un monde parfait, les #pièges de glace# comme moi n'existeraient pas, mais ce n'est pas un monde "
+        "parfait.",
         "Mon dieu qu'il fait #froid# ici.",
-        "Tu as testé l'objet avec ton #détecteur de glace#, il a bipé.", //would be better if it could have the name of the item
+        "Tu as testé l'objet avec ton #détecteur de glace#, il a bipé.", // would be better if it could have the name of
+                                                                         // the item
         "Tu as découvert le chemin du zéro. Le #sub-zéro#.",
         "Mweep... mweep... mweep...",
         "Gelé, #sac à glace#! Je veux dire #gèle-toi#, racaille!",
@@ -3193,16 +5204,21 @@ CustomMessage Randomizer::GetIceTrapMessage() {
         "Pause hydratation ! Hé, qui a #gelé# mon eau?",
         "Oups, mauvais #modèle d'objet#.",
         "Oups! Tu dois mettre l'objet #dans ton inventaire#.",
-        "Tu as fait tomber l'objet, le brisant en #éclats de glace#!", //would be better if it could have the name of the item
+        "Tu as fait tomber l'objet, le brisant en #éclats de glace#!", // would be better if it could have the name of
+                                                                       // the item
         "Tu es le maillon faible @, #au revoir#!",
         "Ugh... Pourquoi avons-nous même randomisé #cet objet#?",
         "La #Lune de Givre# se lève...",
-        "Selon toutes les lois connues de la physique et de la biologie, @ ne devrait pas survivre à #être complètement enfermé dans la glace#. Les cellules de @ mourraient avant qu'elles ne #dégèlent#. Mais c'est un jeu vidéo, alors @ survit... #Probablement#.",
-        "OK, arrête-moi si tu l'as déjà entendue - un joueur et une bouteille de #nitrogène liquide# entrent dans un bar à lait...",
+        "Selon toutes les lois connues de la physique et de la biologie, @ ne devrait pas survivre à #être "
+        "complètement enfermé dans la glace#. Les cellules de @ mourraient avant qu'elles ne #dégèlent#. Mais c'est un "
+        "jeu vidéo, alors @ survit... #Probablement#.",
+        "OK, arrête-moi si tu l'as déjà entendue - un joueur et une bouteille de #nitrogène liquide# entrent dans un "
+        "bar à lait...",
         "Lástima, c'est un #piège de glace#...&&Personne ne s'attend à un #piège de glace espagnol#!",
         "Mon dieu qu'il fait #GLAGLA# ici.",
-        "C'est bon, @ savait que c'était un #piège#, il l'utilise juste pour prendre des dégâts intentionnellement et manipuler la RNG.",
-        "Cet objet n'est #pas disponible# dans votre pays.", //would be better if it could have the name of the item
+        "C'est bon, @ savait que c'était un #piège#, il l'utilise juste pour prendre des dégâts intentionnellement et "
+        "manipuler la RNG.",
+        "Cet objet n'est #pas disponible# dans votre pays.", // would be better if it could have the name of the item
         "#Bonne# tentative. #;)#",
         "Où est mon #Super Costume#?",
         "#La revanche du Titanic#.",
@@ -3213,17 +5229,11 @@ CustomMessage Randomizer::GetIceTrapMessage() {
     if (CVarGetInteger(CVAR_GENERAL("LetItSnow"), 0)) {
         msg = CustomMessage(
             /*english*/ "This year for Christmas, all you get is #COAL#!",
-            /*german*/  "This year for Christmas, all you get is #COAL#!",
-            /*french*/  "Pour Noël, cette année, tu n'auras que du #CHARBON#! %rJoyeux Noël%w!",
-                        { QM_BLUE }
-        );
+            /*german*/ "Dieses Jahr gibt es nur #KOHLE# zu Weihnachten!",
+            /*french*/ "Pour Noël, cette année, tu n'auras que du #CHARBON#! %rJoyeux Noël%w!", { QM_BLUE });
     } else {
-        msg = CustomMessage(
-            RandomElement(englishIceTrapMessages),
-            RandomElement(germanIceTrapMessages),
-            RandomElement(frenchIceTrapMessages),
-            { QM_BLUE, QM_BLUE, QM_BLUE }
-        );
+        msg = CustomMessage(RandomElement(englishIceTrapMessages), RandomElement(germanIceTrapMessages),
+                            RandomElement(frenchIceTrapMessages), { QM_BLUE, QM_BLUE, QM_BLUE });
     }
 
     msg.AutoFormat();
@@ -3238,7 +5248,7 @@ static int goronIDs[9] = { TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME,
                            TEXT_FIRE_TEMPLE_GORON_OCARINA_SECRET,
                            TEXT_FIRE_TEMPLE_GORON_PILLAR_SECRET,
                            TEXT_FIRE_TEMPLE_GORON_HIDDEN_DOOR_SECRET,
-                           TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET};
+                           TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET };
 
 void CreateFireTempleGoronMessages() {
     CustomMessage FireTempleGoronMessages[NUM_GORON_MESSAGES] = {
@@ -3310,7 +5320,7 @@ void CreateFireTempleGoronMessages() {
         },
         {
             "I dunno why I was thrown in here,&truth be told.&I'm just a %g\"PR\"%w person.",
-            "Wat weiß'n ich, wieso ich hier&eingepfercht wurd. Ich mach&doch nur %g\"Pull&Requests\"%w.",
+            "Wat weiß'n ich, wieso ich hier&eingepfercht wurd. Ich mach&doch nur %g\"Pull Requests\"%w.",
             "Je ne sais pas comment on m'a jeté&ici. Il faut croire que je dors comme&une pierre.",
         },
     };
@@ -3333,459 +5343,389 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 112> getItemMessages = {{
-        GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON,
-			"You found %gGreg%w!",
-			"%gGreg%w! Du hast ihn wirklich gefunden!",
-            "Félicitation! Vous avez trouvé %gGreg%w!"),
-        GIMESSAGE(RG_MASTER_SWORD, ITEM_SWORD_MASTER,
-            "You found the %gMaster Sword%w!",
-            "Du erhältst das %gMaster-Schwert%w!",
-            "Vous obtenez %gl'Épée de Légende%w!"),
-        GIMESSAGE(RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE,
-			"You got a %rBottle with Blue &Fire%w! Use it to melt Red Ice!",
-			"Du erhältst eine %rFlasche mit&blauem Feuer%w! Nutze es um&%rRotes Eis%w zu schmelzen!",
+    const std::array<GetItemMessage, 112> getItemMessages = { {
+        GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, "You found %gGreg%w!", "%gGreg%w! Du hast ihn&wirklich gefunden!",
+                  "Félicitation! Vous avez trouvé %gGreg%w!"),
+        GIMESSAGE(RG_MASTER_SWORD, ITEM_SWORD_MASTER, "You found the %gMaster Sword%w!",
+                  "Du erhältst das %gMaster-Schwert%w!", "Vous obtenez %gl'Épée de Légende%w!"),
+        GIMESSAGE(
+            RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE, "You got a %rBottle with Blue &Fire%w! Use it to melt Red Ice!",
+            "Du erhältst eine %rFlasche mit&blauem Feuer%w! Nutze es um&%rRotes Eis%w zu schmelzen!",
             "Vous obtenez une %rBouteille avec&une Flamme Bleue%w! Utilisez-la&pour faire fondre la %rGlace&Rouge%w!"),
-        GIMESSAGE(RG_BOTTLE_WITH_BIG_POE, ITEM_BIG_POE,
-			"You got a %rBig Poe in a Bottle%w!&Sell it to the Ghost Shop!",
-			"Du hast einen %rNachtschwärmer%w&in einer Flasche gefangen!&Gehe zum %rGespenstermarkt%w&und verkaufe ihn!",
-			"Vous obtenez une %rBouteille avec&une Âme%w! Vendez-la au Marchand&d'Âme"),
-        GIMESSAGE(RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE,
-			"You got a %rBottle of Blue Potion%w!&Drink it to replenish your&%ghealth%w and %bmagic%w!",
-			"Du erhältst ein %rBlaues Elixier%w!&Nutze es, um Deine %rMagie- und&Energieleiste%w komplett&aufzufüllen!",
-			"Vous obtenez une %rBouteille avec&une Potion Bleue%w! Buvez-la pour&restaurer votre %rénergie vitale%w&ainsi que votre %gmagie%w!"),
+        GIMESSAGE(RG_BOTTLE_WITH_BIG_POE, ITEM_BIG_POE, "You got a %rBig Poe in a Bottle%w!&Sell it to the Ghost Shop!",
+                  "Du hast einen %rNachtschwärmer%w&in einer Flasche gefangen!&Gehe zum %rGespenstermarkt%w&und "
+                  "verkaufe ihn!",
+                  "Vous obtenez une %rBouteille avec&une Âme%w! Vendez-la au Marchand&d'Âme"),
+        GIMESSAGE(
+            RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE,
+            "You got a %rBottle of Blue Potion%w!&Drink it to replenish your&%ghealth%w and %bmagic%w!",
+            "Du erhältst ein %rBlaues Elixier%w!&Nutze es, um Deine %rMagie- und&Energieleiste%w komplett&aufzufüllen!",
+            "Vous obtenez une %rBouteille avec&une Potion Bleue%w! Buvez-la pour&restaurer votre %rénergie "
+            "vitale%w&ainsi que votre %gmagie%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_FISH, ITEM_FISH,
-            "You got a %rFish in a Bottle%w!&It looks fresh and delicious!&They say Jabu-Jabu loves them!",
-			"Du hast jetzt einen %rFisch in&einer Flasche%w! Er sieht richtig&frisch aus! Man sagt,&Lord Jabu-Jabu liebt Fische!",
-            "Vous obtenez une %rBouteille avec&un Poisson%w! Il a l'air délicieux!&Il paraîtrait que %bJabu-Jabu %wen&serait friand!"),
-        GIMESSAGE(RG_BOTTLE_WITH_BUGS, ITEM_BUG,
-			"You got a %rBug in a Bottle%w!&They love to burrow in&dirt holes!",
-			"Du hast jetzt %rKäfer in einer&Flasche&%w!&Sie graben gerne&in Erdlöchern.",
-            "Vous obtenez une %rBouteille avec&des Insectes%w! Ils adorent creuser&dans la terre meuble!"),
-        GIMESSAGE(RG_BOTTLE_WITH_FAIRY, ITEM_FAIRY,
-			"You got a %rFairy in a Bottle%w!&Use it wisely!",
-			"Du hast jetzt eine %rFee in einer&Flasche%w! Nutze sie weise!",
-			"Vous obtenez une %rBouteille avec&une Fée%w! Faites-en bon usage!"),
-        GIMESSAGE(RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,
+                  "You got a %rFish in a Bottle%w!&It looks fresh and delicious!&They say Jabu-Jabu loves them!",
+                  "Du hast jetzt einen %rFisch in&einer Flasche%w! Er sieht richtig&frisch aus! Man sagt,&Lord "
+                  "Jabu-Jabu liebt Fische!",
+                  "Vous obtenez une %rBouteille avec&un Poisson%w! Il a l'air délicieux!&Il paraîtrait que %bJabu-Jabu "
+                  "%wen&serait friand!"),
+        GIMESSAGE(RG_BOTTLE_WITH_BUGS, ITEM_BUG, "You got a %rBug in a Bottle%w!&They love to burrow in&dirt holes!",
+                  "Du hast jetzt %rKäfer in einer&Flasche%w! Sie graben gerne&in Erdlöchern.",
+                  "Vous obtenez une %rBouteille avec&des Insectes%w! Ils adorent creuser&dans la terre meuble!"),
+        GIMESSAGE(RG_BOTTLE_WITH_FAIRY, ITEM_FAIRY, "You got a %rFairy in a Bottle%w!&Use it wisely!",
+                  "Du hast jetzt eine %rFee in einer&Flasche%w! Nutze sie weise!",
+                  "Vous obtenez une %rBouteille avec&une Fée%w! Faites-en bon usage!"),
+        GIMESSAGE(
+            RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED,
             "You got a %rBottle of Red Potion%w!&Drink it to replenish your&%ghealth%w!",
-			"Du erhältst ein %rRotes Elixier%w!&Nutze es, um Deine %rEnergieleiste&%weinmalig komplett aufzufüllen!",
+            "Du erhältst ein %rRotes Elixier%w!&Nutze es, um Deine %rEnergieleiste&%weinmalig komplett aufzufüllen!",
             "Vous obtenez une %rBouteille avec&une Potion Rouge%w! Buvez-la pour&restaurer votre %rénergie vitale%w!"),
-        GIMESSAGE(RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN,
+        GIMESSAGE(
+            RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN,
             "You got a %rBottle of Green Potion%w!&Drink it to replenish your&%bmagic%w!",
-			"Du erhältst ein %rGrünes Elixier%w!&Nutze es, um Deine %bMagieleiste&%weinmalig komplett aufzufüllen!",
+            "Du erhältst ein %rGrünes Elixier%w!&Nutze es, um Deine %bMagieleiste&%weinmalig komplett aufzufüllen!",
             "Vous obtenez une %rBouteille avec&une Potion Verte%w! Buvez-la pour&restaurer votre %gmagie%w!"),
         GIMESSAGE(RG_BOTTLE_WITH_POE, ITEM_POE,
-            "You got a %rPoe in a Bottle%w!&That creepy Ghost Shop might&be interested in this...",
-			"Du hast jetzt ein %rIrrlicht in einer&Flasche%w! Der %rGespenstermarkt%w&interessiert sich für vielleicht&dafür...",
-            "Vous obtenez une %rBouteille avec&un Esprit%w! Ça intéresserait&peut-être le vendeur d'Âme "),
+                  "You got a %rPoe in a Bottle%w!&That creepy Ghost Shop might&be interested in this...",
+                  "Du hast jetzt ein %rIrrlicht in einer&Flasche%w! Der %rGespenstermarkt%w&interessiert sich "
+                  "vielleicht&dafür...",
+                  "Vous obtenez une %rBouteille avec&un Esprit%w! Ça intéresserait&peut-être le vendeur d'Âme "),
 
-        GIMESSAGE(RG_GERUDO_FORTRESS_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %yThieves Hideout &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für das %yDiebesversteck%w!",
-			"Vous obtenez une %rPetite Clé %w&du %yRepaire des Voleurs%w!"),
-        GIMESSAGE(RG_FOREST_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %gForest Temple &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %gWaldtempel%w!",
-			"Vous obtenez une %rPetite Clé %w&du %gTemple de la Forêt%w!"),
-        GIMESSAGE(RG_FIRE_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %rFire Temple &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %rFeuertempel%w!",
-			"Vous obtenez une %rPetite Clé %w&du %rTemple du Feu%w!"),
-        GIMESSAGE(RG_WATER_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %bWater Temple &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %bWassertempel%w!",
-			"Vous obtenez une %rPetite Clé %w&du %bTemple de l'Eau%w!"),
-        GIMESSAGE(RG_SPIRIT_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %ySpirit Temple &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %yGeistertempel%w!",
-			"Vous obtenez une %rPetite Clé %w&du %yTemple de l'Esprit%w!"),
-        GIMESSAGE(RG_SHADOW_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %pShadow Temple &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %pSchattentempel%w!",
-			"Vous obtenez une %rPetite Clé %w&du %pTemple de l'Ombre%w!"),
-        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %pBottom of the &Well %wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für den %pGrund des Brunnens%w!",
-			"Vous obtenez une %rPetite Clé %w&du %pPuits%w!"),
+        GIMESSAGE(RG_GERUDO_FORTRESS_SMALL_KEY, ITEM_KEY_SMALL, "You found a %yThieves Hideout &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %yDiebesverstecks%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %yRepaire des Voleurs%w!"),
+        GIMESSAGE(RG_FOREST_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %gForest Temple &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %gWaldtempels%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %gTemple de la Forêt%w!"),
+        GIMESSAGE(RG_FIRE_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %rFire Temple &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %rFeuertempels%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %rTemple du Feu%w!"),
+        GIMESSAGE(RG_WATER_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %bWater Temple &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %bWassertempels%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %bTemple de l'Eau%w!"),
+        GIMESSAGE(RG_SPIRIT_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %ySpirit Temple &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %yGeistertempels%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %yTemple de l'Esprit%w!"),
+        GIMESSAGE(RG_SHADOW_TEMPLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %pShadow Temple &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w des %pSchattentempels%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %pTemple de l'Ombre%w!"),
+        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_SMALL_KEY, ITEM_KEY_SMALL, "You found a %pBottom of the &Well %wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w vom %pGrund des Brunnens%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %pPuits%w!"),
         GIMESSAGE(RG_GERUDO_TRAINING_GROUND_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %yGerudo Training &Grounds %wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für die %yGerudo-Trainingsarena%w!",
-			"Vous obtenez une %rPetite Clé %w&du %yGymnase Gerudo%w!"),
-        GIMESSAGE(RG_GANONS_CASTLE_SMALL_KEY, ITEM_KEY_SMALL,
-			"You found a %rGanon's Castle &%wSmall Key!",
-			"Du erhältst einen %rkleinen&Schlüssel%w für %rGanons Schloß%w!",
-			"Vous obtenez une %rPetite Clé %w&du %rChâteau de Ganon%w!"),
-        GIMESSAGE(RG_GUARD_HOUSE_KEY, ITEM_KEY_SMALL,
-			"You found the key to the&%gGuard House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus der Wachen%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison des Gardes%w!"),
-        GIMESSAGE(RG_MARKET_BAZAAR_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gMarket Bazaar%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gBasar des Marktes%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMarché%w!"),
-        GIMESSAGE(RG_MARKET_POTION_SHOP_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gMarket Potion Shop%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gMagie-Laden des Marktes%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMarché%w!"),
-        GIMESSAGE(RG_MASK_SHOP_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gMask Shop%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gMaskenladen%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMagasin de Masques%w!"),
+                  "You found a %yGerudo Training &Ground %wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w der %yGerudo-Trainingsarena%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %yGymnase Gerudo%w!"),
+        GIMESSAGE(RG_GANONS_CASTLE_SMALL_KEY, ITEM_KEY_SMALL, "You found a %rGanon's Castle &%wSmall Key!",
+                  "Du erhältst einen %rkleinen&Schlüssel%w von %rGanons Schloß%w!",
+                  "Vous obtenez une %rPetite Clé %w&du %rChâteau de Ganon%w!"),
+        GIMESSAGE(RG_GUARD_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gGuard House%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gWachhaus%w!",
+                  "Vous obtenez la %rClé %wde la&%gMaison des Gardes%w!"),
+        GIMESSAGE(RG_MARKET_BAZAAR_KEY, ITEM_KEY_SMALL, "You found the key to the&%gMarket Bazaar%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gBasar des Marktes%w!",
+                  "Vous obtenez la %rClé %wdu %gBazar&de la Place du Marché%w!"),
+        GIMESSAGE(RG_MARKET_POTION_SHOP_KEY, ITEM_KEY_SMALL, "You found the key to the&%gMarket Potion Shop%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gMagie-Laden des Marktes%w!",
+                  "Vous obtenez la %rClé %wdu&%gMagasin de Potions de la&Place du Marché%w!"),
+        GIMESSAGE(RG_MASK_SHOP_KEY, ITEM_KEY_SMALL, "You found the key to the&%gMask Shop%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gMaskenhändler%w!",
+                  "Vous obtenez la %rClé %wde la&%gFoire aux Masques%w!"),
         GIMESSAGE(RG_MARKET_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gMarket Shooting Gallery%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gSchießbude des Marktes%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gStand de Tir%w!"),
-        GIMESSAGE(RG_BOMBCHU_BOWLING_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gBombchu Bowling Alley%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gMinenbowlingbahn%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gBowling Bombchu%w!"),
+                  "You found the key to the&%gMarket Shooting Gallery%w!",
+                  "Du erhältst den %rSchlüssel%w&zur %gSchießbude des Marktes%w!",
+                  "Vous obtenez la %rClé %wdu %gStand de&Tir de la Place du Marché%w!"),
+        GIMESSAGE(RG_BOMBCHU_BOWLING_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBombchu Bowling Alley%w!",
+                  "Du erhältst den %rSchlüssel%w&zur %gMinenbowlingbahn%w!",
+                  "Vous obtenez la %rClé %wdu %gBowling&Teigneux%w!"),
         GIMESSAGE(RG_TREASURE_CHEST_GAME_BUILDING_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gTreasure Chest Game Building%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus des Schatzkisten-Pokers%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gJeu de la Chasse au Trésor%w!"),
-        GIMESSAGE(RG_BOMBCHU_SHOP_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gBombchu Shop%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gKrabbelminenladen%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMagasin de Bombchu%w!"),
-        GIMESSAGE(RG_RICHARDS_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gRichard's House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus von Richard%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison de Richard%w!"),
-        GIMESSAGE(RG_RICHARDS_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gRichard's House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus von Richard%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison de Richard%w!"),
-        GIMESSAGE(RG_ALLEY_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to&the %gAlley House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus in der Gasse%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison de la Ruelle%w!"),
-        GIMESSAGE(RG_KAK_BAZAAR_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gKakariko Bazaar%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gBasar von Kakariko%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMarché de Cocorico%w!"),
-        GIMESSAGE(RG_KAK_POTION_SHOP_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gKakariko Potion Shop%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gMagie-Laden von Kakariko%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMagasin de Potions de Cocorico%w!"),
-        GIMESSAGE(RG_BOSS_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gBoss's House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus des Chefs%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison du Boss%w!"),
-        GIMESSAGE(RG_GRANNYS_POTION_SHOP_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gGranny's Potion Shop%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für %gAsas Hexenladen%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMagasin de Potions de Grand-mère%w!"),
-        GIMESSAGE(RG_SKULLTULA_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gSkulltula House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gSkulltula-Haus%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison des Skulltulas%w!"),
-        GIMESSAGE(RG_IMPAS_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gImpa's House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus von Impa%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison d'Impa%w!"),
-        GIMESSAGE(RG_WINDMILL_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gWindmill%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gWindmühle%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gMoulin à Vent%w!"),
+                  "You found the key to the&%gTreasure Chest Game Building%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gHaus der Truhenlotterie%w!",
+                  "Vous obtenez la %rClé  %wdu %gJeu de la&Chasse au Trésor%w!"),
+        GIMESSAGE(RG_BOMBCHU_SHOP_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBombchu Shop%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gKrabbelminenladen%w!",
+                  "Vous obtenez la %rClé %wdu %gMagasin&de Missiles%w!"),
+        GIMESSAGE(RG_RICHARDS_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to&%gRichard's House%w!",
+                  "Du erhältst den %rSchlüssel%w&zu %gRichards Haus%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&de Kiki%w!"),
+        GIMESSAGE(RG_ALLEY_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to&the %gAlley House%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gHaus in der Gasse%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&de la Ruelle%w!"),
+        GIMESSAGE(RG_KAK_BAZAAR_KEY, ITEM_KEY_SMALL, "You found the key to the&%gKakariko Bazaar%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gBasar von Kakariko%w!",
+                  "Vous obtenez la %rClé %wdu %gBazar&de Cocorico%w!"),
+        GIMESSAGE(RG_KAK_POTION_SHOP_KEY, ITEM_KEY_SMALL, "You found the key to the&%gKakariko Potion Shop%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gMagie-Laden von Kakariko%w!",
+                  "Vous obtenez la %rClé %wdu %gMagasin de&Potions de Cocorico%w!"),
+        GIMESSAGE(RG_BOSS_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBoss's House%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gHaus des Chefs%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&du Chef des Ouvriers%w!"),
+        GIMESSAGE(RG_GRANNYS_POTION_SHOP_KEY, ITEM_KEY_SMALL, "You found the key to&%gGranny's Potion Shop%w!",
+                  "Du erhältst den %rSchlüssel%w&zu %gAsas Hexenladen%w!",
+                  "Vous obtenez la %rClé %wde&l'%gApothicaire%w!"),
+        GIMESSAGE(RG_SKULLTULA_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gSkulltula House%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gSkulltula-Haus%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&des Araignées%w!"),
+        GIMESSAGE(RG_IMPAS_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to&%gImpa's House%w!",
+                  "Du erhältst den %rSchlüssel%w&zu %gImpas Haus%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&d'Impa%w!"),
+        GIMESSAGE(RG_WINDMILL_KEY, ITEM_KEY_SMALL, "You found the key to the&%gWindmill%w!",
+                  "Du erhältst den %rSchlüssel%w&zur %gWindmühle%w!", "Vous obtenez la %rClé %w du %gMoulin%w!"),
         GIMESSAGE(RG_KAK_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gKakariko Shooting Gallery%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gSchießbude von Kakariko%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gStand de Tir de Cocorico%w!"),
-        GIMESSAGE(RG_DAMPES_HUT_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gDampe's Hut%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gHütte von Boris%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gChalet de Dampe%w!"),
-        GIMESSAGE(RG_TALONS_HOUSE_KEY, ITEM_KEY_SMALL,
-            "You found the key to&%gTalon's House%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHaus von Talon%w!",
-            "Vous obtenez une %rPetite Clé %w&de la %gMaison de Talon%w!"),
-        GIMESSAGE(RG_STABLES_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gStables%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für die %gStälle%w!",
-            "Vous obtenez une %rPetite Clé %w&des %gÉcuries%w!"),
-        GIMESSAGE(RG_BACK_TOWER_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gBack Tower%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %ghinteren Turm%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gTour Arrière%w!"),
-        GIMESSAGE(RG_HYLIA_LAB_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gHylia Laboratory%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für das %gHylia-Labor%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gLaboratoire d'Hylia%w!"),
-        GIMESSAGE(RG_FISHING_HOLE_KEY, ITEM_KEY_SMALL,
-            "You found the key to the&%gFishing Hole%w!",
-            "Du erhältst einen %rkleinen&Schlüssel%w für den %gFischweiher%w!",
-            "Vous obtenez une %rPetite Clé %w&du %gTrou de Pêche%w!"),
+                  "You found the key to the&%gKakariko Shooting Gallery%w!",
+                  "Du erhältst den %rSchlüssel%w&zur %gSchießbude von Kakariko%w!",
+                  "Vous obtenez la %rClé %w du %gStand de&Tir de Cocorico%w!"),
+        GIMESSAGE(RG_DAMPES_HUT_KEY, ITEM_KEY_SMALL, "You found the key to&%gDampe's Hut%w!",
+                  "Du erhältst den %rSchlüssel%w&zur %gHütte des Totengräbers%w!",
+                  "Vous obtenez la %rClé %wde la %gCabane&d'Igor%w!"),
+        GIMESSAGE(RG_TALONS_HOUSE_KEY, ITEM_KEY_SMALL, "You found the key to&%gTalon's House%w!",
+                  "Du erhältst den %rSchlüssel%w&zu %gTalons Haus%w!",
+                  "Vous obtenez la %rClé %wde la %gMaison&de Talon%w!"),
+        GIMESSAGE(RG_STABLES_KEY, ITEM_KEY_SMALL, "You found the key to the&%gStables%w!",
+                  "Du erhältst den %rSchlüssel%w&zu den %gStällen%w!", "Vous obtenez la %rClé %wdes %gÉcuries%w!"),
+        GIMESSAGE(RG_BACK_TOWER_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBack Tower%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gLon Lon-Turm%w!", "Vous obtenez la %rClé %wdu %gSilo%w!"),
+        GIMESSAGE(RG_HYLIA_LAB_KEY, ITEM_KEY_SMALL, "You found the key to the&%gHylia Laboratory%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gHylia-Labor%w!",
+                  "Vous obtenez la %rClé %wdu %gLaboratoire&du Lac Hylia%w!"),
+        GIMESSAGE(RG_FISHING_HOLE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gPond%w!",
+                  "Du erhältst den %rSchlüssel%w&zum %gFischweiher%w!", "Vous obtenez la %rClé %wde l'%gÉtang%w!"),
 
-        GIMESSAGE(RG_GERUDO_FORTRESS_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %yThieves Hideout &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für das %yDiebesversteck%w!",
-			"Vous obtenez un trousseau de&clés du %yRepaire des Voleurs%w!"),
-        GIMESSAGE(RG_FOREST_TEMPLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %gForest Temple &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %gWaldtempel%w!",
-			"Vous obtenez un trousseau de&clés du %gTemple de la Forêt%w!"),
-        GIMESSAGE(RG_FIRE_TEMPLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %rFire Temple &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %rFeuertempel%w!",
-			"Vous obtenez un trousseau de&clés du %rTemple du Feu%w!"),
-        GIMESSAGE(RG_WATER_TEMPLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %bWater Temple &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %bWassertempel%w!",
-			"Vous obtenez un trousseau de&clés du %bTemple de l'Eau%w!"),
-        GIMESSAGE(RG_SPIRIT_TEMPLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %ySpirit Temple &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %yGeistertempel%w!",
-			"Vous obtenez un trousseau de&clés du %yTemple de l'Esprit%w!"),
-        GIMESSAGE(RG_SHADOW_TEMPLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %pShadow Temple &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %pSchattentempel%w!",
-			"Vous obtenez un trousseau de&clés du %pTemple de l'Ombre%w!"),
-        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %pBottom of the &Well %wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für den %pGrund des Brunnens%w!",
-			"Vous obtenez un trousseau de&clés du %pPuits%w!"),
-        GIMESSAGE(RG_GERUDO_TRAINING_GROUND_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %yGerudo Training &Grounds %wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für die %yGerudo-Trainingsarena%w!",
-			"Vous obtenez un trousseau de&clés du %yGymnase Gerudo%w!"),
-        GIMESSAGE(RG_GANONS_CASTLE_KEY_RING, ITEM_KEY_SMALL,
-			"You found a %rGanon's Castle &%wKeyring!",
-			"Du erhältst ein %rSchlüsselbund%w&für %rGanons Schloß%w!",
-			"Vous obtenez un trousseau de&clés du %rChâteau de Ganon%w!"),
-        GIMESSAGE(RG_TREASURE_GAME_KEY_RING, ITEM_KEY_SMALL, 
-			"You found a %rTreasure Chest Game &%wKeyring!",
-			"!!!",
-			"!!!"),
+        GIMESSAGE(RG_GERUDO_FORTRESS_KEY_RING, ITEM_KEY_SMALL, "You found a %yThieves Hideout&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %yDiebesverstecks%w!",
+                  "Vous obtenez le trousseau de&clés du %yRepaire des Voleurs%w!"),
+        GIMESSAGE(RG_FOREST_TEMPLE_KEY_RING, ITEM_KEY_SMALL, "You found a %gForest Temple&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %gWaldtempels%w!",
+                  "Vous obtenez le trousseau de&clés du %gTemple de la Forêt%w!"),
+        GIMESSAGE(RG_FIRE_TEMPLE_KEY_RING, ITEM_KEY_SMALL, "You found a %rFire Temple&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %rFeuertempels%w!",
+                  "Vous obtenez le trousseau de&clés du %rTemple du Feu%w!"),
+        GIMESSAGE(RG_WATER_TEMPLE_KEY_RING, ITEM_KEY_SMALL, "You found a %bWater Temple&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %bWassertempels%w!",
+                  "Vous obtenez le trousseau de&clés du %bTemple de l'Eau%w!"),
+        GIMESSAGE(RG_SPIRIT_TEMPLE_KEY_RING, ITEM_KEY_SMALL, "You found a %ySpirit Temple&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %yGeistertempels%w!",
+                  "Vous obtenez le trousseau de&clés du %yTemple de l'Esprit%w!"),
+        GIMESSAGE(RG_SHADOW_TEMPLE_KEY_RING, ITEM_KEY_SMALL, "You found a %pShadow Temple&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&des %pSchattentempels%w!",
+                  "Vous obtenez le trousseau de&clés du %pTemple de l'Ombre%w!"),
+        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_KEY_RING, ITEM_KEY_SMALL, "You found a %pBottom of the&Well %wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&vom %pGrund des Brunnens%w!",
+                  "Vous obtenez le trousseau de&clés du %pPuits%w!"),
+        GIMESSAGE(RG_GERUDO_TRAINING_GROUND_KEY_RING, ITEM_KEY_SMALL, "You found a %yGerudo Training&Ground %wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&der %yGerudo-Trainingsarena%w!",
+                  "Vous obtenez le trousseau de&clés du %yGymnase Gerudo%w!"),
+        GIMESSAGE(RG_GANONS_CASTLE_KEY_RING, ITEM_KEY_SMALL, "You found a %rGanon's Castle&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&von %rGanons Schloß%w!",
+                  "Vous obtenez le trousseau de&clés du %rChâteau de Ganon%w!"),
+        GIMESSAGE(RG_TREASURE_GAME_KEY_RING, ITEM_KEY_SMALL, "You found a %rTreasure Chest Game&%wKeyring!",
+                  "Du erhältst das %rSchlüsselbund%w&der %rTruhenlotterie&%w!",
+                  "Vous obtenez le trousseau de&clés du %rJeu de la Chasse au Trésor%w!"),
 
-        GIMESSAGE(RG_FOREST_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %gForest Temple &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für den %gWaldtempel%w!",
-			"Vous obtenez la %rClé d'or %wdu&%gTemple de la Forêt%w!"),
-        GIMESSAGE(RG_FIRE_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %rFire Temple &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für den %rFeuertempel%w!",
-			"Vous obtenez la %rClé d'or %wdu&%rTemple du Feu%w!"),
-        GIMESSAGE(RG_WATER_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %bWater Temple &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für den %bWassertempel%w!",
-			"Vous obtenez la %rClé d'or %wdu&%bTemple de l'Eau%w!"),
-        GIMESSAGE(RG_SPIRIT_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %ySpirit Temple &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für den %yGeistertempel%w!",
-			"Vous obtenez la %rClé d'or %wdu&%yTemple de l'Esprit%w!"),
-        GIMESSAGE(RG_SHADOW_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %pShadow Temple &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für den %pSchattentempel%w!",
-			"Vous obtenez la %rClé d'or %wdu&%pTemple de l'Ombre%w!"),
-        GIMESSAGE(RG_GANONS_CASTLE_BOSS_KEY, ITEM_KEY_BOSS,
-			"You found the %rGanon's Castle &%wBoss Key!",
-			"Du erhältst den %rMaster-Schlüssel%w&für %rGanons Schloß%w!",
-			"Vous obtenez la %rClé d'or %wdu&%rChâteau de Ganon%w!"),
+        GIMESSAGE(RG_FOREST_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %gForest Temple&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&des %gWaldtempels%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%gTemple de la Forêt%w!"),
+        GIMESSAGE(RG_FIRE_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %rFire Temple&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&des %rFeuertempels%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%rTemple du Feu%w!"),
+        GIMESSAGE(RG_WATER_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %bWater Temple&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&des %bWassertempels%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%bTemple de l'Eau%w!"),
+        GIMESSAGE(RG_SPIRIT_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %ySpirit Temple&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&des %yGeistertempels%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%yTemple de l'Esprit%w!"),
+        GIMESSAGE(RG_SHADOW_TEMPLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %pShadow Temple&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&des %pSchattentempels%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%pTemple de l'Ombre%w!"),
+        GIMESSAGE(RG_GANONS_CASTLE_BOSS_KEY, ITEM_KEY_BOSS, "You found the %rGanon's Castle&%wBoss Key!",
+                  "Du erhältst den %rMaster-Schlüssel%w&von %rGanons Schloß%w!",
+                  "Vous obtenez la %rClé d'or %wdu&%rChâteau de Ganon%w!"),
 
-        GIMESSAGE(RG_DEKU_TREE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %gDeku Tree &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%gDeku-Baum%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wde&l'%gArbre Mojo%w![[typeHint]]"),
-        GIMESSAGE(RG_DODONGOS_CAVERN_MAP, ITEM_DUNGEON_MAP,
-			"You found the %rDodongo's Cavern &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für&%rDodongos Höhle%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wde la&%rCaverne Dodongo%w![[typeHint]]"),
-        GIMESSAGE(RG_JABU_JABUS_BELLY_MAP, ITEM_DUNGEON_MAP,
-			"You found the %bJabu Jabu's Belly &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für&%bJabu-Jabus Bauch%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%bVentre de Jabu-Jabu%w![[typeHint]]"),
-        GIMESSAGE(RG_FOREST_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %gForest Temple &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%gWaldtempel%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%gTemple de la Forêt%w![[typeHint]]"),
-        GIMESSAGE(RG_FIRE_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %rFire Temple &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%rFeuertempel%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%rTemple du Feu%w![[typeHint]]"),
-        GIMESSAGE(RG_WATER_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %bWater Temple &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%bWassertempel%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%bTemple de l'Eau%w![[typeHint]]"),
-        GIMESSAGE(RG_SPIRIT_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %ySpirit Temple &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%yGeistertempel%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%yTemple de l'Esprit%w![[typeHint]]"),
-        GIMESSAGE(RG_SHADOW_TEMPLE_MAP, ITEM_DUNGEON_MAP,
-			"You found the %pShadow Temple &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%pSchattentempel%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%pTemple de l'Ombre%w![[typeHint]]"),
-        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_MAP, ITEM_DUNGEON_MAP,
-			"You found the %pBottom of the &Well %wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für den&%pGrund des Brunnens%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wdu &%pPuits%w![[typeHint]]"),
-        GIMESSAGE(RG_ICE_CAVERN_MAP, ITEM_DUNGEON_MAP,
-			"You found the %cIce Cavern &%wMap![[typeHint]]",
-			"Du erhältst die %rKarte%w für die&%cEishöhle%w![[typeHint]]",
-			"Vous obtenez la %rCarte %wde &la %cCaverne Polaire%w![[typeHint]]"),
+        GIMESSAGE(RG_DEKU_TREE_MAP, ITEM_DUNGEON_MAP, "You found the %gDeku Tree&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %gDeku-Baumes%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wde&l'%gArbre Mojo%w![[typeHint]]"),
+        GIMESSAGE(RG_DODONGOS_CAVERN_MAP, ITEM_DUNGEON_MAP, "You found the %rDodongo's Cavern&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w von %rDodongos Höhle%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wde la&%rCaverne Dodongo%w![[typeHint]]"),
+        GIMESSAGE(RG_JABU_JABUS_BELLY_MAP, ITEM_DUNGEON_MAP, "You found the %bJabu Jabu's Belly&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w von %bJabu-Jabus Bauch%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%bVentre de Jabu-Jabu%w![[typeHint]]"),
+        GIMESSAGE(RG_FOREST_TEMPLE_MAP, ITEM_DUNGEON_MAP, "You found the %gForest Temple&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %gWaldtempels%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%gTemple de la Forêt%w![[typeHint]]"),
+        GIMESSAGE(RG_FIRE_TEMPLE_MAP, ITEM_DUNGEON_MAP, "You found the %rFire Temple&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %rFeuertempels%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%rTemple du Feu%w![[typeHint]]"),
+        GIMESSAGE(RG_WATER_TEMPLE_MAP, ITEM_DUNGEON_MAP, "You found the %bWater Temple&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %bWassertempels%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%bTemple de l'Eau%w![[typeHint]]"),
+        GIMESSAGE(RG_SPIRIT_TEMPLE_MAP, ITEM_DUNGEON_MAP, "You found the %ySpirit Temple&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %yGeistertempels%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%yTemple de l'Esprit%w![[typeHint]]"),
+        GIMESSAGE(RG_SHADOW_TEMPLE_MAP, ITEM_DUNGEON_MAP, "You found the %pShadow Temple&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w des %pSchattentempels%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%pTemple de l'Ombre%w![[typeHint]]"),
+        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_MAP, ITEM_DUNGEON_MAP, "You found the %pBottom of the&Well %wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w vom %pGrund des Brunnens%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wdu&%pPuits%w![[typeHint]]"),
+        GIMESSAGE(RG_ICE_CAVERN_MAP, ITEM_DUNGEON_MAP, "You found the %cIce Cavern&%wMap![[typeHint]]",
+                  "Du erhältst die %rLabyrinth-&Karte%w der %cEishöhle%w![[typeHint]]",
+                  "Vous obtenez la %rCarte %wde&la %cCaverne Polaire%w![[typeHint]]"),
 
-        GIMESSAGE(RG_DEKU_TREE_COMPASS, ITEM_COMPASS,
-			"You found the %gDeku Tree &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%gDeku-Baum%w!",
-			"Vous obtenez la %rBoussole %wde&l'%gArbre Mojo%w!"),
-        GIMESSAGE(RG_DODONGOS_CAVERN_COMPASS, ITEM_COMPASS,
-			"You found the %rDodongo's Cavern &%wCompass!",
-			"Du erhältst den %rKompaß%w für&%rDodongos Höhle%w!",
-			"Vous obtenez la %rBoussole %wde la&%rCaverne Dodongo%w!"),
-        GIMESSAGE(RG_JABU_JABUS_BELLY_COMPASS, ITEM_COMPASS,
-			"You found the %bJabu Jabu's Belly &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%bJabu-Jabus Bauch%w!",
-			"Vous obtenez la %rBoussole %wdu &%bVentre de Jabu-Jabu%w!"),
-        GIMESSAGE(RG_FOREST_TEMPLE_COMPASS, ITEM_COMPASS,
-			"You found the %gForest Temple &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%gWaldtempel%w!",
-			"Vous obtenez la %rBoussole %wdu &%gTemple de la Forêt%w!"),
-        GIMESSAGE(RG_FIRE_TEMPLE_COMPASS, ITEM_COMPASS,
-			"You found the %rFire Temple &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%rFeuertempel%w!",
-			"Vous obtenez la %rBoussole %wdu &%rTemple du Feu%w!"),
-        GIMESSAGE(RG_WATER_TEMPLE_COMPASS, ITEM_COMPASS,
-			"You found the %bWater Temple &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%bWassertempel%w!",
-			"Vous obtenez la %rBoussole %wdu &%bTemple de l'Eau%w!"),
-        GIMESSAGE(RG_SPIRIT_TEMPLE_COMPASS, ITEM_COMPASS,
-			"You found the %ySpirit Temple &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%yGeistertempel%w!",
-			"Vous obtenez la %rBoussole %wdu &%yTemple de l'Esprit%w!"),
-        GIMESSAGE(RG_SHADOW_TEMPLE_COMPASS, ITEM_COMPASS,
-			"You found the %pShadow Temple &%wCompass!",
-			"Du erhältst den %rKompaß%w für den&%pSchattentempel%w!",
-			"Vous obtenez la %rBoussole %wdu &%pTemple de l'Ombre%w!"),
-        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_COMPASS, ITEM_COMPASS,
-			"You found the %pBottom of the &Well %wCompass!",
-			"Du erhältst den %rKompaß%w für den&%pGrund des Brunnens%w!",
-			"Vous obtenez la %rBoussole %wdu &%pPuits%w!"),
-        GIMESSAGE(RG_ICE_CAVERN_COMPASS, ITEM_COMPASS,
-			"You found the %cIce Cavern &%wCompass!",
-			"Du erhältst den %rKompaß%w für die&%cEishöhle%w!",
-			"Vous obtenez la %rBoussole %wde &la %cCaverne Polaire%w!"),
+        GIMESSAGE(RG_DEKU_TREE_COMPASS, ITEM_COMPASS, "You found the %gDeku Tree&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%gDeku-Baumes%w!",
+                  "Vous obtenez la %rBoussole %wde&l'%gArbre Mojo%w!"),
+        GIMESSAGE(RG_DODONGOS_CAVERN_COMPASS, ITEM_COMPASS, "You found the %rDodongo's Cavern&%wCompass!",
+                  "Du erhältst den %rKompaß%w von&%rDodongos Höhle%w!",
+                  "Vous obtenez la %rBoussole %wde la&%rCaverne Dodongo%w!"),
+        GIMESSAGE(RG_JABU_JABUS_BELLY_COMPASS, ITEM_COMPASS, "You found the %bJabu Jabu's Belly&%wCompass!",
+                  "Du erhältst den %rKompaß%w von&%bJabu-Jabus Bauch%w!",
+                  "Vous obtenez la %rBoussole %wdu&%bVentre de Jabu-Jabu%w!"),
+        GIMESSAGE(RG_FOREST_TEMPLE_COMPASS, ITEM_COMPASS, "You found the %gForest Temple&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%gWaldtempels%w!",
+                  "Vous obtenez la %rBoussole %wdu&%gTemple de la Forêt%w!"),
+        GIMESSAGE(RG_FIRE_TEMPLE_COMPASS, ITEM_COMPASS, "You found the %rFire Temple&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%rFeuertempels%w!",
+                  "Vous obtenez la %rBoussole %wdu&%rTemple du Feu%w!"),
+        GIMESSAGE(RG_WATER_TEMPLE_COMPASS, ITEM_COMPASS, "You found the %bWater Temple&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%bWassertempels%w!",
+                  "Vous obtenez la %rBoussole %wdu&%bTemple de l'Eau%w!"),
+        GIMESSAGE(RG_SPIRIT_TEMPLE_COMPASS, ITEM_COMPASS, "You found the %ySpirit Temple&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%yGeistertempels%w!",
+                  "Vous obtenez la %rBoussole %wdu&%yTemple de l'Esprit%w!"),
+        GIMESSAGE(RG_SHADOW_TEMPLE_COMPASS, ITEM_COMPASS, "You found the %pShadow Temple&%wCompass!",
+                  "Du erhältst den %rKompaß%w des&%pSchattentempels%w!",
+                  "Vous obtenez la %rBoussole %wdu&%pTemple de l'Ombre%w!"),
+        GIMESSAGE(RG_BOTTOM_OF_THE_WELL_COMPASS, ITEM_COMPASS, "You found the %pBottom of the&Well %wCompass!",
+                  "Du erhältst den %rKompaß%w vom&%pGrund des Brunnens%w!",
+                  "Vous obtenez la %rBoussole %wdu&%pPuits%w!"),
+        GIMESSAGE(RG_ICE_CAVERN_COMPASS, ITEM_COMPASS, "You found the %cIce Cavern&%wCompass!",
+                  "Du erhältst den %rKompaß%w der&%cEishöhle%w!",
+                  "Vous obtenez la %rBoussole %wde&la %cCaverne Polaire%w!"),
 
         GIMESSAGE(RG_MAGIC_BEAN_PACK, ITEM_BEAN,
-			"You got a %rPack of Magic Beans%w!&Find a suitable spot for a garden&and plant them. Then, wait for&something fun to happen!",
-			"Du erhältst eine %rPackung&Wundererbsen%w! Suche nach einer&Stelle um sie einzupflanzen.&Warte ab, was passiert!",
-			"Vous obtenez un %rPaquet de&Haricots Magiques%w! Trouvez&un endroit approprié pour un&jardin et plantez-les.^Attendez ensuite que quelque&chose d'amusant se produise!"),
+                  "You got a %rPack of Magic Beans%w!&Find a suitable spot for a garden&and plant them. Then, wait "
+                  "for&something fun to happen!",
+                  "Du erhältst eine %rPackung&Wundererbsen%w! Suche nach einer&Stelle um sie einzupflanzen.&Warte ab, "
+                  "was passiert!",
+                  "Vous obtenez un %rPaquet de&Haricots Magiques%w! Trouvez&un endroit approprié pour un&jardin et "
+                  "plantez-les.^Attendez ensuite que quelque&chose d'amusant se produise!"),
         GIMESSAGE(RG_TYCOON_WALLET, ITEM_WALLET_GIANT,
-			"You got a %rTycoon's Wallet%w!&It's gigantic! Now you can carry&up to %y999 rupees%w!",
-			"Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 Rubine%w mit Dir führen!",
-			"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
+                  "You got a %rTycoon's Wallet%w!&It's gigantic! Now you can carry&up to %y999 rupees%w!",
+                  "Du erhältst die %rGoldene&Geldbörse%w! Die größte aller&Geldbörsen! Jetzt kannst Du bis&zu %y999 "
+                  "Rubine%w mit Dir führen!",
+                  "Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"),
         GIMESSAGE(RG_CHILD_WALLET, ITEM_WALLET_ADULT,
-			"You got a %rChild's Wallet%w!&Now you can carry&up to %y99 rupees%w!",
-			"Du erhältst die %rKindergeldbörse%w!&Jetzt kannst Du bis&zu %y99 Rubine%w mit Dir führen!",
-			"Vous obtenez la %rPetite Bourse%w!&Elle peut contenir jusqu'à %y99 rubis%w!"),
+                  "You got a %rChild's Wallet%w!&Now you can carry&up to %y99 rupees%w!",
+                  "Du erhältst die %rKindergeldbörse%w!&Jetzt kannst Du bis&zu %y99 Rubine%w mit Dir führen!",
+                  "Vous obtenez la %rPetite Bourse%w!&Elle peut contenir jusqu'à %y99 rubis%w!"),
 
-        GIMESSAGE_NO_GERMAN(RG_GOHMA_SOUL, ITEM_BIG_POE,
-            "You found the soul for %gGohma%w!",
-            "Vous obtenez l'âme de %gGohma%w!"),
-        GIMESSAGE_NO_GERMAN(RG_KING_DODONGO_SOUL, ITEM_BIG_POE,
-            "You found the soul for %rKing&Dodongo%w!",
-            "Vous obtenez l'âme du %rRoi Dodongo%w!"),
-        GIMESSAGE_NO_GERMAN(RG_BARINADE_SOUL, ITEM_BIG_POE,
-            "You found the soul for %bBarinade%w!",
-            "Vous obtenez l'âme de %bBarinade%w!"),
-        GIMESSAGE_NO_GERMAN(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE,
-            "You found the soul for %gPhantom&Ganon%w!",
-            "Vous obtenez l'âme de %gGanon Spectral%w!"),
-        GIMESSAGE_NO_GERMAN(RG_VOLVAGIA_SOUL, ITEM_BIG_POE,
-            "You found the soul for %rVolvagia%w!",
-            "Vous obtenez l'âme de %rVulcania%w!"),
-        GIMESSAGE_NO_GERMAN(RG_MORPHA_SOUL, ITEM_BIG_POE,
-            "You found the soul for %bMorpha%w!",
-            "Vous obtenez l'âme de %bMorpha%w!"),
-        GIMESSAGE_NO_GERMAN(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE,
-            "You found the soul for %pBongo&Bongo%w!",
-            "Vous obtenez l'âme de %pBongo Bongo%w!"),
-        GIMESSAGE_NO_GERMAN(RG_TWINROVA_SOUL, ITEM_BIG_POE,
-            "You found the soul for %yTwinrova%w!",
-            "Vous obtenez l'âme du %yDuo Maléfique%w!"),
-        GIMESSAGE_NO_GERMAN(RG_GANON_SOUL, ITEM_BIG_POE,
-            "You found the soul for %cGanon%w!",
-            "Vous obtenez l'âme de %cGanon%w!"),
+        GIMESSAGE(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!",
+                  "Du hast die Seele von&%gGohma%w gefunden!", "Vous obtenez l'âme de %gGohma%w!"),
+        GIMESSAGE(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing&Dodongo%w!",
+                  "Du hast die Seele von&%rKönig Dodongo%w gefunden!", "Vous obtenez l'âme du %rRoi Dodongo%w!"),
+        GIMESSAGE(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarinade%w!",
+                  "Du hast die Seele von&%bBarinade%w gefunden!", "Vous obtenez l'âme de %bBarinade%w!"),
+        GIMESSAGE(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom&Ganon%w!",
+                  "Du hast die Seele von&%gPhantom-Ganon%w gefunden!", "Vous obtenez l'âme de %gGanon&Spectral%w!"),
+        GIMESSAGE(RG_VOLVAGIA_SOUL, ITEM_BIG_POE, "You found the soul for %rVolvagia%w!",
+                  "Du hast die Seele von&%rVolvagia%w gefunden!", "Vous obtenez l'âme de %rVolcania%w!"),
+        GIMESSAGE(RG_MORPHA_SOUL, ITEM_BIG_POE, "You found the soul for %bMorpha%w!",
+                  "Du hast die Seele von&%bMorpha%w gefunden!", "Vous obtenez l'âme de %bMorpha%w!"),
+        GIMESSAGE(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo&Bongo%w!",
+                  "Du hast die Seele von&%pBongo Bongo%w gefunden!", "Vous obtenez l'âme de %pBongo&Bongo%w!"),
+        GIMESSAGE(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!",
+                  "Du hast die Seele von&%yTwinrova%w gefunden!", "Vous obtenez l'âme du %yDuo&Maléfique%w!"),
+        GIMESSAGE(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!",
+                  "Du hast die Seele von&%cGanon%w gefunden!", "Vous obtenez l'âme de %cGanon%w!"),
 
         GIMESSAGE(RG_OCARINA_A_BUTTON, ITEM_OCARINA_TIME,
-            "You got the %b\x9f%r button for the&Ocarina%w! You can now use it&while playing songs!",
-			"Der %b\x9f%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
-			"Vous trouvez la %rtouche %b\x9f%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+                  "You got the %b\x9f%r button for the&Ocarina%w! You can now use it&while playing songs!",
+                  "Der %b\x9f%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+                  "Vous obtenez la %rtouche %b\x9f%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en "
+                  "jouez!"),
         GIMESSAGE(RG_OCARINA_C_LEFT_BUTTON, ITEM_OCARINA_TIME,
-            "You got the %y\xa7%r button for the&Ocarina%w! You can now use it&while playing songs!",
-			"Der %y\xa7%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
-			"Vous trouvez la %rtouche %y\xa7%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+                  "You got the %y\xa7%r button for the&Ocarina%w! You can now use it&while playing songs!",
+                  "Der %y\xa7%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+                  "Vous obtenez la %rtouche %y\xa7%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en "
+                  "jouez!"),
         GIMESSAGE(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME,
-            "You got the %y\xa8%r button for the&Ocarina%w! You can now use it&while playing songs!",
-			"Der %y\xa8%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
-			"Vous trouvez la %rtouche %y\xa8%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+                  "You got the %y\xa8%r button for the&Ocarina%w! You can now use it&while playing songs!",
+                  "Der %y\xa8%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+                  "Vous obtenez la %rtouche %y\xa8%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en "
+                  "jouez!"),
         GIMESSAGE(RG_OCARINA_C_UP_BUTTON, ITEM_OCARINA_TIME,
-            "You got the %y\xa5%r button for the&Ocarina%w! You can now use it&while playing songs!",
-			"Der %y\xa5%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
-			"Vous trouvez la %rtouche %y\xa5%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
+                  "You got the %y\xa5%r button for the&Ocarina%w! You can now use it&while playing songs!",
+                  "Der %y\xa5%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+                  "Vous obtenez la %rtouche %y\xa5%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en "
+                  "jouez!"),
         GIMESSAGE(RG_OCARINA_C_DOWN_BUTTON, ITEM_OCARINA_TIME,
-            "You got the %y\xa6%r button for the&Ocarina%w! You can now use it&while playing songs!",
-			"Der %y\xa6%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
-			"Vous trouvez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en jouez!"),
-        
-        GIMESSAGE_NO_GERMAN(RG_BRONZE_SCALE, ITEM_SCALE_SILVER,
-            "You got the %rBronze Scale%w!&The power of buoyancy is yours!",
-            "Vous avez obtenu l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est à vous!"),
-        GIMESSAGE_NO_GERMAN(RG_FISHING_POLE, ITEM_FISHING_POLE,
-            "You found a lost %rFishing Pole%w!&Time to hit the pond!",
-            "Vous avez trouvé une %rCanne à pêche%w perdue!&Il est temps d'aller à l'étang!"),
-        GIMESSAGE_NO_GERMAN(RG_BOMBCHU_BAG, ITEM_BOMBCHU,
-            "You found the %rBombchu Bag%w!",
-            "!!!"),
-        GIMESSAGE_NO_GERMAN(RG_BOMB_BAG_INF, ITEM_BOMB_BAG_40,
-            "You got an %rInfinite Bomb Bag%w!&Now you have %yinfinite bombs%w!",
-            "Vous avez obtenu un %rSac à bombes à l'infini%w!&Vous avez maintenant des %ybombes à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_QUIVER_INF, ITEM_QUIVER_50,
-            "You got an %rInfinite Quiver%w!&Now you have %yinfinite arrows%w!",
-            "Vous avez obtenu un %rCarquois à l'infini%w!&Vous avez maintenant des %yflèches à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_BULLET_BAG_INF, ITEM_BULLET_BAG_50,
-            "You got an %rInfinite Bullet Bag%w!&Now you have %yinfinite&slingshot seeds%w!",
-            "Vous avez obtenu un %rSac de Graine à l'infini%w!&Vous avez maintenant des %ygraines de lance-pierres à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_STICK_UPGRADE_INF, ITEM_STICK,
-            "You now have %yinfinite%w %rDeku Sticks%w!",
-            "Vous avez maintenant des %yBâtons Mojo à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_NUT_UPGRADE_INF, ITEM_NUT,
-            "You now have %yinfinite%w %rDeku Nuts%w!",
-            "Vous avez maintenant des %yNoix Mojo à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_MAGIC_INF, ITEM_MAGIC_LARGE,
-            "You now have %yinfinite%w %rMagic%w!",
-            "Vous avez maintenant de la %ymagie à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_BOMBCHU_INF, ITEM_BOMBCHU,
-            "You now have %yinfinite%w %rBombchus%w!",
-            "Vous avez maintenant des %Missiles Teigneux à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_WALLET_INF, ITEM_WALLET_GIANT,
-            "You now have %yinfinite%w %rmoney%w!",
-            "Vous avez maintenant de l'%yargent à l'infini%w!"),
-        GIMESSAGE_NO_GERMAN(RG_SKELETON_KEY, ITEM_KEY_SMALL,
-            "You found the %rSkeleton Key%w!",
-            "Vous avez trouvé la %rClé Squelette%w!"),
-        GIMESSAGE_NO_GERMAN(RG_DEKU_STICK_BAG, ITEM_STICK,
-            "You found the %rDeku Stick Bag%w!&You can now hold deku sticks!",
-            "Vous avez trouvé le %rSac de Bâtons Mojo%w!&Vous pouvez maintenant porter des Bâtons Mojo!"),
-        GIMESSAGE_NO_GERMAN(RG_DEKU_NUT_BAG, ITEM_NUT,
-            "You found the %rDeku Nut Bag%w!&You can now hold deku nuts!",
-            "Vous avez trouvé le %rSac de Noix Mojo%w!&Vous pouvez maintenant porter des Noix Mojo!"),
-    }};
-    CreateGetItemMessages(&getItemMessages);
+                  "You got the %y\xa6%r button for the&Ocarina%w! You can now use it&while playing songs!",
+                  "Der %y\xa6%r Knopf%w!&Du kannst ihn nun zum Spielen&von Liedern auf der %rOkarina%w&verwenden!",
+                  "Vous obtenez la %rtouche %y\xa6%r de&l'Ocarina%w! Vous pouvez&maintenant l'utiliser lorsque&vous en "
+                  "jouez!"),
+
+        GIMESSAGE(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!",
+                  "Du hast die %rBronzene Schuppe%w&erhalten! Die Fähigkeit zu&Schwimmen ist nun dein!",
+                  "Vous obtenez l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est&à vous!"),
+        GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!",
+                  "Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!",
+                  "Vous obtenez une %rCanne à pêche%w&perdue!&Il est temps d'aller à %gl'étang%w!"),
+        GIMESSAGE(RG_BOMBCHU_BAG, ITEM_BOMBCHU, "You found the %rBombchu Bag%w!",
+                  "Du hast die %rKrabbelminentasche%w&gefunden!", "Vous obtenez un %rSac de Missiles&Teigneux%w!"),
+        GIMESSAGE(
+            RG_BOMB_BAG_INF, ITEM_BOMB_BAG_40, "You got an %rInfinite Bomb Bag%w!&Now you have %yinfinite bombs%w!",
+            "Du hast die %rUnendliche Bombentasche%w&gefunden! Nun hast Du &%yunendlich viele Bomben%w!",
+            "Vous obtenez un %rSac de Bombes&sans fond%w!&Vous avez maintenant des %ybombes&en quantité illimitée%w!"),
+        GIMESSAGE(RG_QUIVER_INF, ITEM_QUIVER_50, "You got an %rInfinite Quiver%w!&Now you have %yinfinite arrows%w!",
+                  "Du hast den %rUnendlichen Köcher%w&gefunden! Nun hast Du &%yunendlich viele Pfeile%w!",
+                  "Vous obtenez un %rCarquois Infini%w!&Vous avez maintenant des %yflèches&de manière illimitée%w!"),
+        GIMESSAGE(RG_BULLET_BAG_INF, ITEM_BULLET_BAG_50,
+                  "You got an %rInfinite Bullet Bag%w!&Now you have %yinfinite&slingshot seeds%w!",
+                  "Du hast die %rUnendliche Munitionstasche%w&gefunden! Nun hast Du &%yunendlich viele Deku-Kerne%w!",
+                  "Vous obtenez un %rSac de Graines&sans fond%w!&Vous avez maintenant des %ygraines&de lance-pierres à "
+                  "l'infini%w!"),
+        GIMESSAGE(RG_STICK_UPGRADE_INF, ITEM_STICK, "You now have %yinfinite%w %rDeku Sticks%w!",
+                  "Du hast nun %yrunendlich viele%w %rDeku-Stäbe%w!",
+                  "Vous avez maintenant des %yBâtons&Mojo de manière illimitée%w!"),
+        GIMESSAGE(RG_NUT_UPGRADE_INF, ITEM_NUT, "You now have %yinfinite%w %rDeku Nuts%w!",
+                  "Du hast nun %yunendlich viele%w %rDeku-Nüsse%w!",
+                  "Vous avez maintenant des %yNoix&Mojo de manière illimitée%w!"),
+        GIMESSAGE(RG_MAGIC_INF, ITEM_MAGIC_LARGE, "You now have %yinfinite%w %rMagic%w!",
+                  "Du hast nun %yunendlich viel%w %rMagische Kraft%w!",
+                  "Vous avez maintenant une quantité&de %ymagie illimitée%w!"),
+        GIMESSAGE(RG_BOMBCHU_INF, ITEM_BOMBCHU, "You now have %yinfinite%w %rBombchus%w!",
+                  "Du hast nun %yunendlich viele%w %rKrabbelminen%w!",
+                  "Vous avez maintenant des %yMissiles&Teigneux en quantité illimités%w!"),
+        GIMESSAGE(RG_WALLET_INF, ITEM_WALLET_GIANT, "You now have %yinfinite%w %rmoney%w!",
+                  "Du hast nun %yunendlich viele%w %rRubine%w!",
+                  "Vous avez maintenant des %yRubis en& quantité illimitée%w!"),
+        GIMESSAGE(RG_SKELETON_KEY, ITEM_KEY_SMALL, "You found the %rSkeleton Key%w!",
+                  "Du hast den %rSkelettschlüssel%w gefunden!", "Vous avez trouvé la %rClé Squelette%w!"),
+        GIMESSAGE(RG_DEKU_STICK_BAG, ITEM_STICK, "You found the %rDeku Stick Bag%w!&You can now hold Deku Sticks!",
+                  "Du hast eine %rDeku-Stab-Tasche%w&gefunden! Nun kannst Du &%yDeku-Stäbe%w verwenden!",
+                  "Vous avez trouvé le %rSac de Bâtons&Mojo%w!&Vous pouvez maintenant porter des&Bâtons Mojo!"),
+        GIMESSAGE(RG_DEKU_NUT_BAG, ITEM_NUT, "You found the %rDeku Nut Bag%w!&You can now hold Deku Nuts!",
+                  "Du hast eine %rDeku-Nuß-Tasche%w&gefunden! Nun kannst Du &%yDeku-Nüsse%w verwenden!",
+                  "Vous avez trouvé le %rSac de Noix& Mojo%w!&Vous pouvez maintenant porter des&Noix Mojo!"),
+    } };
+    CreateGetItemMessages(getItemMessages);
     CreateRupeeMessages();
     CreateTriforcePieceMessages();
     CreateNaviRandoMessages();
     CreateFireTempleGoronMessages();
 }
 
-class ExtendedVanillaTableInvalidItemIdException: public std::exception {
-    private:
+class ExtendedVanillaTableInvalidItemIdException : public std::exception {
+  private:
     s16 itemID;
 
-    public:
-      ExtendedVanillaTableInvalidItemIdException(s16 itemID): itemID(itemID) {}
-      std::string what() {
+  public:
+    ExtendedVanillaTableInvalidItemIdException(s16 itemID) : itemID(itemID) {
+    }
+    std::string what() {
         return itemID + " is not a valid ItemID for the extendedVanillaGetItemTable. If you are adding a new"
-        "item, try adding it to randoGetItemTable instead.";
-      }
+                        "item, try adding it to randoGetItemTable instead.";
+    }
 };
 
 void RandomizerSettingsWindow::InitElement() {
@@ -3799,7 +5739,7 @@ void RandomizerSettingsWindow::InitElement() {
 // (special cases for rando items)
 void Randomizer_GameplayStats_SetTimestamp(uint16_t item) {
 
-    u32 time = GAMEPLAYSTAT_TOTAL_TIME;
+    u32 time = static_cast<u32>(GAMEPLAYSTAT_TOTAL_TIME);
 
     // Have items in Link's pocket shown as being obtained at 0.1 seconds
     if (time == 0) {
@@ -3837,36 +5777,38 @@ extern "C" u8 Return_Item_Entry(GetItemEntry itemEntry, u8 returnItem);
 
 // used for items that only set a rand inf when obtained
 std::map<RandomizerGet, RandomizerInf> randomizerGetToRandInf = {
-    { RG_FISHING_POLE,           RAND_INF_FISHING_POLE_FOUND },
-    { RG_BRONZE_SCALE,           RAND_INF_CAN_SWIM },
-    { RG_QUIVER_INF,             RAND_INF_HAS_INFINITE_QUIVER },
-    { RG_BOMB_BAG_INF,           RAND_INF_HAS_INFINITE_BOMB_BAG },
-    { RG_BULLET_BAG_INF,         RAND_INF_HAS_INFINITE_BULLET_BAG },
-    { RG_STICK_UPGRADE_INF,      RAND_INF_HAS_INFINITE_STICK_UPGRADE },
-    { RG_NUT_UPGRADE_INF,        RAND_INF_HAS_INFINITE_NUT_UPGRADE },
-    { RG_MAGIC_INF,              RAND_INF_HAS_INFINITE_MAGIC_METER },
-    { RG_BOMBCHU_INF,            RAND_INF_HAS_INFINITE_BOMBCHUS },
-    { RG_WALLET_INF,             RAND_INF_HAS_INFINITE_MONEY },
-    { RG_SKELETON_KEY,           RAND_INF_HAS_SKELETON_KEY },
-    { RG_OCARINA_A_BUTTON,       RAND_INF_HAS_OCARINA_A },
-    { RG_OCARINA_C_UP_BUTTON,    RAND_INF_HAS_OCARINA_C_UP },
-    { RG_OCARINA_C_DOWN_BUTTON,  RAND_INF_HAS_OCARINA_C_DOWN },
-    { RG_OCARINA_C_LEFT_BUTTON,  RAND_INF_HAS_OCARINA_C_LEFT },
+    { RG_FISHING_POLE, RAND_INF_FISHING_POLE_FOUND },
+    { RG_BRONZE_SCALE, RAND_INF_CAN_SWIM },
+    { RG_QUIVER_INF, RAND_INF_HAS_INFINITE_QUIVER },
+    { RG_BOMB_BAG_INF, RAND_INF_HAS_INFINITE_BOMB_BAG },
+    { RG_BULLET_BAG_INF, RAND_INF_HAS_INFINITE_BULLET_BAG },
+    { RG_STICK_UPGRADE_INF, RAND_INF_HAS_INFINITE_STICK_UPGRADE },
+    { RG_NUT_UPGRADE_INF, RAND_INF_HAS_INFINITE_NUT_UPGRADE },
+    { RG_MAGIC_INF, RAND_INF_HAS_INFINITE_MAGIC_METER },
+    { RG_BOMBCHU_INF, RAND_INF_HAS_INFINITE_BOMBCHUS },
+    { RG_WALLET_INF, RAND_INF_HAS_INFINITE_MONEY },
+    { RG_SKELETON_KEY, RAND_INF_HAS_SKELETON_KEY },
+    { RG_OCARINA_A_BUTTON, RAND_INF_HAS_OCARINA_A },
+    { RG_OCARINA_C_UP_BUTTON, RAND_INF_HAS_OCARINA_C_UP },
+    { RG_OCARINA_C_DOWN_BUTTON, RAND_INF_HAS_OCARINA_C_DOWN },
+    { RG_OCARINA_C_LEFT_BUTTON, RAND_INF_HAS_OCARINA_C_LEFT },
     { RG_OCARINA_C_RIGHT_BUTTON, RAND_INF_HAS_OCARINA_C_RIGHT },
-    { RG_GOHMA_SOUL,             RAND_INF_GOHMA_SOUL },
-    { RG_KING_DODONGO_SOUL,      RAND_INF_KING_DODONGO_SOUL },
-    { RG_BARINADE_SOUL,          RAND_INF_BARINADE_SOUL },
-    { RG_PHANTOM_GANON_SOUL,     RAND_INF_PHANTOM_GANON_SOUL },
-    { RG_VOLVAGIA_SOUL,          RAND_INF_VOLVAGIA_SOUL },
-    { RG_MORPHA_SOUL,            RAND_INF_MORPHA_SOUL },
-    { RG_BONGO_BONGO_SOUL,       RAND_INF_BONGO_BONGO_SOUL },
-    { RG_TWINROVA_SOUL,          RAND_INF_TWINROVA_SOUL },
-    { RG_GANON_SOUL,             RAND_INF_GANON_SOUL },
+    { RG_GOHMA_SOUL, RAND_INF_GOHMA_SOUL },
+    { RG_KING_DODONGO_SOUL, RAND_INF_KING_DODONGO_SOUL },
+    { RG_BARINADE_SOUL, RAND_INF_BARINADE_SOUL },
+    { RG_PHANTOM_GANON_SOUL, RAND_INF_PHANTOM_GANON_SOUL },
+    { RG_VOLVAGIA_SOUL, RAND_INF_VOLVAGIA_SOUL },
+    { RG_MORPHA_SOUL, RAND_INF_MORPHA_SOUL },
+    { RG_BONGO_BONGO_SOUL, RAND_INF_BONGO_BONGO_SOUL },
+    { RG_TWINROVA_SOUL, RAND_INF_TWINROVA_SOUL },
+    { RG_GANON_SOUL, RAND_INF_GANON_SOUL },
 };
 
 extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
     if (giEntry.modIndex != MOD_RANDOMIZER) {
-        LUSLOG_WARN("Randomizer_Item_Give was called with a GetItemEntry with a mod index different from MOD_RANDOMIZER (%d)", giEntry.modIndex);
+        LUSLOG_WARN(
+            "Randomizer_Item_Give was called with a GetItemEntry with a mod index different from MOD_RANDOMIZER (%d)",
+            giEntry.modIndex);
         assert(false);
         return -1;
     }
@@ -3876,13 +5818,13 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
     // Gameplay stats: Update the time the item was obtained
     Randomizer_GameplayStats_SetTimestamp(item);
 
-    //if it's an item that just sets a randomizerInf, set it
+    // if it's an item that just sets a randomizerInf, set it
     if (randomizerGetToRandInf.find(item) != randomizerGetToRandInf.end()) {
         Flags_SetRandomizerInf(randomizerGetToRandInf.find(item)->second);
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
-    //bottle items
+    // bottle items
     if (item >= RG_BOTTLE_WITH_RED_POTION && item <= RG_BOTTLE_WITH_BIG_POE) {
         for (u16 i = 0; i < 4; i++) {
             if (gSaveContext.inventory.items[SLOT_BOTTLE_1 + i] == ITEM_NONE) {
@@ -3925,14 +5867,12 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         }
     }
 
-    //dungeon items
-    if (
-        (item >= RG_FOREST_TEMPLE_SMALL_KEY && item <= RG_GANONS_CASTLE_SMALL_KEY) ||
+    // dungeon items
+    if ((item >= RG_FOREST_TEMPLE_SMALL_KEY && item <= RG_GANONS_CASTLE_SMALL_KEY) ||
         (item >= RG_FOREST_TEMPLE_KEY_RING && item <= RG_GANONS_CASTLE_KEY_RING) ||
         (item >= RG_FOREST_TEMPLE_BOSS_KEY && item <= RG_GANONS_CASTLE_BOSS_KEY) ||
         (item >= RG_DEKU_TREE_MAP && item <= RG_ICE_CAVERN_MAP) ||
-        (item >= RG_DEKU_TREE_COMPASS && item <= RG_ICE_CAVERN_COMPASS)
-    ) {
+        (item >= RG_DEKU_TREE_COMPASS && item <= RG_ICE_CAVERN_COMPASS)) {
         u16 mapIndex = gSaveContext.mapIndex;
         u8 numOfKeysOnKeyring = 0;
         switch (item) {
@@ -4049,7 +5989,8 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         gSaveContext.inventory.dungeonItems[mapIndex] |= bitmask;
         return Return_Item_Entry(giEntry, RG_NONE);
     } else if (item >= RG_GUARD_HOUSE_KEY && item <= RG_FISHING_HOLE_KEY) {
-        Flags_SetRandomizerInf((RandomizerInf)((int)RAND_INF_GUARD_HOUSE_UNLOCKED + ((item - RG_GUARD_HOUSE_KEY) * 2) + 1));
+        Flags_SetRandomizerInf(
+            (RandomizerInf)((int)RAND_INF_GUARD_HOUSE_UNLOCKED + ((item - RG_GUARD_HOUSE_KEY) * 2) + 1));
         return Return_Item_Entry(giEntry, RG_NONE);
     }
 
@@ -4094,15 +6035,17 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         case RG_GREG_RUPEE:
             Rupees_ChangeBy(1);
             Flags_SetRandomizerInf(RAND_INF_GREG_FOUND);
-            gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_FOUND_GREG] = GAMEPLAYSTAT_TOTAL_TIME;
+            gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_FOUND_GREG] = static_cast<u32>(GAMEPLAYSTAT_TOTAL_TIME);
             break;
         case RG_TRIFORCE_PIECE:
             gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected++;
             GameInteractor_SetTriforceHuntPieceGiven(true);
 
             // Teleport to credits when goal is reached.
-            if (gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected == (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1)) {
-                gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME;
+            if (gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected ==
+                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1)) {
+                gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] =
+                    static_cast<u32>(GAMEPLAYSTAT_TOTAL_TIME);
                 gSaveContext.ship.stats.gameComplete = 1;
                 Flags_SetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY);
                 Play_PerformSave(play);
@@ -4135,12 +6078,12 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
         case RG_DEKU_STICK_BAG:
             Inventory_ChangeUpgrade(UPG_STICKS, 1);
             INV_CONTENT(ITEM_STICK) = ITEM_STICK;
-            AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+            AMMO(ITEM_STICK) = static_cast<int8_t>(CUR_CAPACITY(UPG_STICKS));
             break;
         case RG_DEKU_NUT_BAG:
             Inventory_ChangeUpgrade(UPG_NUTS, 1);
             INV_CONTENT(ITEM_NUT) = ITEM_NUT;
-            AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+            AMMO(ITEM_NUT) = static_cast<int8_t>(CUR_CAPACITY(UPG_NUTS));
             break;
         default:
             LUSLOG_WARN("Randomizer_Item_Give didn't have behaviour specified for getItemId=%d", item);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 76bde6a4fb..78f48b01c9 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -54,13 +54,19 @@ class Randomizer {
     CowIdentity IdentifyCow(s32 sceneNum, s32 posX, s32 posZ);
     PotIdentity IdentifyPot(s32 sceneNum, s32 posX, s32 posZ);
     FishIdentity IdentifyFish(s32 sceneNum, s32 actorParams);
-    GetItemEntry GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId, bool checkObtainability = true);
-    GetItemEntry GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId, bool checkObtainability = true);
+    GrassIdentity IdentifyGrass(s32 sceneNum, s32 posX, s32 posZ, s32 respawnData, s32 linkAge);
+    CrateIdentity IdentifyCrate(s32 sceneNum, s32 posX, s32 posZ);
+    SmallCrateIdentity IdentifySmallCrate(s32 sceneNum, s32 posX, s32 posZ);
+    GetItemEntry GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId,
+                                       bool checkObtainability = true);
+    GetItemEntry GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId,
+                                  bool checkObtainability = true);
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
     CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
     CustomMessage GetFishingPondOwnerMessage(u16 originalTextId);
-    CustomMessage GetMerchantMessage(RandomizerCheck rc, TextIDs textId, TextIDs freeTextId = TEXT_NONE, bool mysterious = false);
+    CustomMessage GetMerchantMessage(RandomizerCheck rc, TextIDs textId, TextIDs freeTextId = TEXT_NONE,
+                                     bool mysterious = false);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
     CustomMessage GetGoronMessage(u16 index);
     CustomMessage GetMapGetItemMessageWithHint(GetItemEntry itemEntry);
@@ -79,4 +85,3 @@ bool GenerateRandomizer(std::string seed = "");
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 155b31db12..8295eb6cda 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include "z64item.h"
-#include "randomizer_inf.h"
 
 #define MAX_TRICK_NAME_SIZE 50
 
@@ -13,11 +12,11 @@
 // which doesn't exist yet.
 typedef enum {
     MOD_NONE,
-    MOD_RANDOMIZER
+    MOD_RANDOMIZER,
 } ModIndex;
 typedef enum {
     TABLE_VANILLA = MOD_NONE,
-    TABLE_RANDOMIZER = MOD_RANDOMIZER
+    TABLE_RANDOMIZER = MOD_RANDOMIZER,
 } TableIndex;
 
 typedef struct {
@@ -184,10 +183,10 @@ typedef enum {
     LOGIC_GREG,
     LOGIC_PIECE_OF_HEART,
     LOGIC_HEART_CONTAINER,
-    LOGIC_NUTS,
+    LOGIC_BUY_NUTS,
     LOGIC_BUY_ARROW,
     LOGIC_BUY_BOMB,
-    LOGIC_STICKS,
+    LOGIC_BUY_STICKS,
     LOGIC_FISH_ACCESS,
     LOGIC_BUY_MAGIC_POTION,
     LOGIC_BUY_BOMBCHUS,
@@ -209,11 +208,20 @@ typedef enum {
     LOGIC_OCARINA_C_UP_BUTTON,
     LOGIC_OCARINA_C_DOWN_BUTTON,
     LOGIC_OCARINA_C_LEFT_BUTTON,
-    LOGIC_OCARINA_C_RIGHT_BUTTON,  
+    LOGIC_OCARINA_C_RIGHT_BUTTON,
     LOGIC_TRIFORCE_PIECES,
     LOGIC_MAX
 } LogicVal;
 
+#define DEFINE_RAND_INF(enum) enum,
+
+typedef enum {
+#include "randomizer_inf.h"
+    RAND_INF_MAX,
+} RandomizerInf;
+
+#undef DEFINE_RAND_INF
+
 typedef enum {
     RA_NONE,
     RA_LINKS_POCKET,
@@ -288,12 +296,16 @@ typedef enum {
     RCTYPE_SONG_LOCATION,              // Song locations
     RCTYPE_BOSS_HEART_OR_OTHER_REWARD, // Boss heart container or lesser dungeon rewards (lens, ice arrow)
     RCTYPE_POT,                        // Pots
+    RCTYPE_CRATE,                      // Crates
+    RCTYPE_NLCRATE,                    // NL Crates
+    RCTYPE_SMALL_CRATE,                // Small crates
     RCTYPE_DUNGEON_REWARD,             // Dungeon rewards (blue warps)
     RCTYPE_OCARINA,                    // Ocarina locations
     RCTYPE_BEEHIVE,                    // Beehives
     RCTYPE_FISH,                       // Fishes
     RCTYPE_FREESTANDING,               // Freestanding rupees and hearts
     RCTYPE_FAIRY,                      // Fairies
+    RCTYPE_GRASS,                      // Grass
 } RandomizerCheckType;
 
 typedef enum { RCQUEST_VANILLA, RCQUEST_MQ, RCQUEST_BOTH } RandomizerCheckQuest;
@@ -390,6 +402,8 @@ typedef enum {
     RR_HF_NEAR_KAK_GROTTO,
     RR_HF_TEKTITE_GROTTO,
     RR_LAKE_HYLIA,
+    RR_LH_FROM_SHORTCUT,
+    RR_LH_FROM_WATER_TEMPLE,
     RR_LH_FISHING_ISLAND,
     RR_LH_OWL_FLIGHT,
     RR_LH_LAB,
@@ -404,9 +418,34 @@ typedef enum {
     RR_GV_FORTRESS_SIDE,
     RR_GV_CARPENTER_TENT,
     RR_GV_STORMS_GROTTO,
-    RR_GERUDO_FORTRESS,
+    RR_GF_OUTSKIRTS,
+    RR_GF_NEAR_GROTTO,
+    RR_GF_OUTSIDE_GTG,
+    RR_GF_ABOVE_GTG,
+    RR_GF_BOTTOM_OF_LOWER_VINES,
+    RR_GF_TOP_OF_LOWER_VINES,
+    RR_GF_NEAR_GS,
+    RR_GF_SLOPED_ROOF,
+    RR_GF_BOTTOM_OF_UPPER_VINES,
+    RR_GF_TOP_OF_UPPER_VINES,
+    RR_GF_NEAR_CHEST,
+    RR_GF_LONG_ROOF,
+    RR_GF_BELOW_GS,
+    RR_GF_BELOW_CHEST,
+    RR_GF_HBA_RANGE,
+    RR_GF_ABOVE_JAIL,
+    RR_GF_JAIL_WINDOW,
     RR_GF_OUTSIDE_GATE,
     RR_GF_STORMS_GROTTO,
+    RR_TH_1_TORCH_CELL,
+    RR_TH_DOUBLE_CELL,
+    RR_TH_DEAD_END_CELL,
+    RR_TH_STEEP_SLOPE_CELL,
+    RR_TH_KITCHEN_CORRIDOR,
+    RR_TH_KITCHEN_MAIN,
+    RR_TH_KITCHEN_TOP,
+    RR_TH_BREAK_ROOM,
+    RR_TH_BREAK_ROOM_CORRIDOR,
     RR_WASTELAND_NEAR_FORTRESS,
     RR_HAUNTED_WASTELAND,
     RR_WASTELAND_NEAR_COLOSSUS,
@@ -495,6 +534,7 @@ typedef enum {
     RR_DMC_DISTANT_PLATFORM,
     RR_ZR_FRONT,
     RR_ZORAS_RIVER,
+    RR_ZR_FROM_SHORTCUT,
     RR_ZR_BEHIND_WATERFALL,
     RR_ZR_OPEN_GROTTO,
     RR_ZR_FAIRY_GROTTO,
@@ -505,6 +545,12 @@ typedef enum {
     RR_ZD_SHOP,
     RR_ZD_STORMS_GROTTO,
     RR_ZORAS_FOUNTAIN,
+    RR_ZF_ICEBERGS,
+    RR_ZF_LAKEBED,
+    RR_ZF_LEDGE,
+    RR_ZF_HIDDEN_CAVE,
+    RR_ZF_HIDDEN_LEDGE,
+    RR_ZF_ROCK,
     RR_ZF_GREAT_FAIRY_FOUNTAIN,
     RR_LON_LON_RANCH,
     RR_LLR_TALONS_HOUSE,
@@ -556,6 +602,7 @@ typedef enum {
     RR_DEKU_TREE_MQ_OUTSIDE_BOSS_ROOM,
 
     RR_DEKU_TREE_BOSS_ENTRYWAY,
+    RR_DEKU_TREE_BOSS_EXIT,
     RR_DEKU_TREE_BOSS_ROOM,
 
     RR_DODONGOS_CAVERN_BEGINNING,
@@ -603,7 +650,9 @@ typedef enum {
     RR_DODONGOS_CAVERN_MQ_BEHIND_MOUTH,
     RR_DODONGOS_CAVERN_MQ_BACK_BEHIND_FIRE,
     RR_DODONGOS_CAVERN_MQ_BACK_SWITCH_GRAVE,
+
     RR_DODONGOS_CAVERN_BOSS_ENTRYWAY,
+    RR_DODONGOS_CAVERN_BOSS_EXIT,
     RR_DODONGOS_CAVERN_BOSS_ROOM,
 
     RR_JABU_JABUS_BELLY_BEGINNING,
@@ -632,6 +681,7 @@ typedef enum {
     RR_JABU_JABUS_BELLY_MQ_EAST_ROOM,
 
     RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY,
+    RR_JABU_JABUS_BELLY_BOSS_EXIT,
     RR_JABU_JABUS_BELLY_BOSS_ROOM,
 
     RR_FOREST_TEMPLE_FIRST_ROOM,
@@ -988,7 +1038,6 @@ typedef enum {
     RR_GANONS_CASTLE_SHADOW_TRIAL,
     RR_GANONS_CASTLE_SPIRIT_TRIAL,
     RR_GANONS_CASTLE_LIGHT_TRIAL,
-    RR_GANONS_CASTLE_TOWER,
 
     RR_GANONS_CASTLE_MQ_LOBBY,
     RR_GANONS_CASTLE_MQ_MAIN,
@@ -1017,6 +1066,7 @@ typedef enum {
     RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_BOULDER_ROOM_BACK,
     RR_GANONS_CASTLE_MQ_LIGHT_TRIAL_FINAL_ROOM,
 
+    RR_GANONS_TOWER_ENTRYWAY,
     RR_GANONS_TOWER_FLOOR_1,
     RR_GANONS_TOWER_FLOOR_2,
     RR_GANONS_TOWER_FLOOR_3,
@@ -1368,13 +1418,13 @@ typedef enum {
     RC_GF_CHEST,
     RC_GF_HBA_1000_POINTS,
     RC_GF_HBA_1500_POINTS,
-    RC_GF_GERUDO_MEMBERSHIP_CARD,
-    RC_GF_NORTH_F1_CARPENTER,
-    RC_GF_NORTH_F2_CARPENTER,
-    RC_GF_SOUTH_F1_CARPENTER,
-    RC_GF_SOUTH_F2_CARPENTER,
+    RC_TH_FREED_CARPENTERS,
+    RC_TH_1_TORCH_CARPENTER,
+    RC_TH_DEAD_END_CARPENTER,
+    RC_TH_DOUBLE_CELL_CARPENTER,
+    RC_TH_STEEP_SLOPE_CARPENTER,
     RC_GF_GS_TOP_FLOOR,
-    RC_GF_GS_ARCHERY_RANGE,
+    RC_GF_HBA_RANGE_GS,
     RC_HIDEOUT_JAIL_GUARD_1_TORCH,
     RC_HIDEOUT_JAIL_GUARD_2_TORCHES,
     RC_HIDEOUT_JAIL_GUARD_3_TORCHES,
@@ -1792,22 +1842,22 @@ typedef enum {
     RC_KF_TWINS_HOUSE_POT_2,
     RC_KF_BROTHERS_HOUSE_POT_1,
     RC_KF_BROTHERS_HOUSE_POT_2,
-    RC_GF_BREAK_ROOM_POT_1,
-    RC_GF_BREAK_ROOM_POT_2,
-    RC_GF_KITCHEN_POT_1,
-    RC_GF_KITCHEN_POT_2,
-    RC_GF_NORTH_F1_CARPENTER_POT_1,
-    RC_GF_NORTH_F1_CARPENTER_POT_2,
-    RC_GF_NORTH_F1_CARPENTER_POT_3,
-    RC_GF_NORTH_F2_CARPENTER_POT_1,
-    RC_GF_NORTH_F2_CARPENTER_POT_2,
-    RC_GF_SOUTH_F1_CARPENTER_POT_1,
-    RC_GF_SOUTH_F1_CARPENTER_POT_2,
-    RC_GF_SOUTH_F1_CARPENTER_POT_3,
-    RC_GF_SOUTH_F1_CARPENTER_CELL_POT_1,
-    RC_GF_SOUTH_F1_CARPENTER_CELL_POT_2,
-    RC_GF_SOUTH_F1_CARPENTER_CELL_POT_3,
-    RC_GF_SOUTH_F1_CARPENTER_CELL_POT_4,
+    RC_TH_BREAK_ROOM_FRONT_POT,
+    RC_TH_BREAK_ROOM_BACK_POT,
+    RC_TH_KITCHEN_POT_1,
+    RC_TH_KITCHEN_POT_2,
+    RC_TH_1_TORCH_CELL_RIGHT_POT,
+    RC_TH_1_TORCH_CELL_MID_POT,
+    RC_TH_1_TORCH_CELL_LEFT_POT,
+    RC_TH_STEEP_SLOPE_RIGHT_POT,
+    RC_TH_STEEP_SLOPE_LEFT_POT,
+    RC_TH_NEAR_DOUBLE_CELL_RIGHT_POT,
+    RC_TH_NEAR_DOUBLE_CELL_MID_POT,
+    RC_TH_NEAR_DOUBLE_CELL_LEFT_POT,
+    RC_TH_RIGHTMOST_JAILED_POT,
+    RC_TH_RIGHT_MIDDLE_JAILED_POT,
+    RC_TH_LEFT_MIDDLE_JAILED_POT,
+    RC_TH_LEFTMOST_JAILED_POT,
     RC_WASTELAND_NEAR_GS_POT_1,
     RC_WASTELAND_NEAR_GS_POT_2,
     RC_WASTELAND_NEAR_GS_POT_3,
@@ -2333,6 +2383,268 @@ typedef enum {
     RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2,
     // End Pots
 
+    // Overworld Crates
+    RC_GV_FREESTANDING_POH_CRATE,
+    RC_GV_NEAR_COW_CRATE,
+    RC_GV_CRATE_BRIDGE_1,
+    RC_GV_CRATE_BRIDGE_2,
+    RC_GV_CRATE_BRIDGE_3,
+    RC_GV_CRATE_BRIDGE_4,
+    RC_GF_ABOVE_JAIL_CRATE,
+    RC_GF_SOUTHMOST_CENTER_CRATE,
+    RC_GF_MID_SOUTH_CENTER_CRATE,
+    RC_GF_MID_NORTH_CENTER_CRATE,
+    RR_GF_NORTHMOST_CENTER_CRATE,
+    RC_GF_OUTSKIRTS_NE_CRATE,
+    RC_GF_OUTSKIRTS_NW_CRATE,
+    RC_GF_HBA_RANGE_CRATE_1,
+    RC_GF_HBA_RANGE_CRATE_2,
+    RC_GF_HBA_RANGE_CRATE_3,
+    RC_GF_HBA_RANGE_CRATE_4,
+    RC_GF_HBA_RANGE_CRATE_5,
+    RC_GF_HBA_RANGE_CRATE_6,
+    RC_GF_HBA_RANGE_CRATE_7,
+    RC_GF_HBA_CANOPY_EAST_CRATE,
+    RC_GF_HBA_CANOPY_WEST_CRATE,
+    RC_GF_NORTH_TARGET_EAST_CRATE,
+    RC_GF_NORTH_TARGET_WEST_CRATE,
+    RC_GF_NORTH_TARGET_CHILD_CRATE,
+    RC_GF_SOUTH_TARGET_EAST_CRATE,
+    RC_GF_SOUTH_TARGET_WEST_CRATE,
+    RC_TH_NEAR_KITCHEN_LEFTMOST_CRATE,
+    RC_TH_NEAR_KITCHEN_MID_LEFT_CRATE,
+    RC_TH_NEAR_KITCHEN_MID_RIGHT_CRATE,
+    RC_TH_NEAR_KITCHEN_RIGHTMOST_CRATE,
+    RC_TH_KITCHEN_CRATE,
+    RC_TH_BREAK_HALLWAY_OUTER_CRATE,
+    RC_TH_BREAK_HALLWAY_INNER_CRATE,
+    RC_TH_BREAK_ROOM_RIGHT_CRATE,
+    RC_TH_BREAK_ROOM_LEFT_CRATE,
+    RC_TH_1_TORCH_CELL_CRATE,
+    RC_TH_DEAD_END_CELL_CRATE,
+    RC_TH_DOUBLE_CELL_LEFT_CRATE,
+    RC_TH_DOUBLE_CELL_RIGHT_CRATE,
+    RC_HW_BEFORE_QUICKSAND_CRATE,
+    RC_HW_AFTER_QUICKSAND_CRATE_1,
+    RC_HW_AFTER_QUICKSAND_CRATE_2,
+    RC_HW_AFTER_QUICKSAND_CRATE_3,
+    RC_HW_NEAR_COLOSSUS_CRATE,
+    RC_MK_NEAR_BAZAAR_CRATE_1,
+    RC_MK_NEAR_BAZAAR_CRATE_2,
+    RC_MK_SHOOTING_GALLERY_CRATE_1,
+    RC_MK_SHOOTING_GALLERY_CRATE_2,
+    RC_MK_LOST_DOG_HOUSE_CRATE,
+    RC_MK_GUARD_HOUSE_CRATE_1,
+    RC_MK_GUARD_HOUSE_CRATE_2,
+    RC_MK_GUARD_HOUSE_CRATE_3,
+    RC_MK_GUARD_HOUSE_CRATE_4,
+    RC_MK_GUARD_HOUSE_CRATE_5,
+    RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1,
+    RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2,
+    RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3,
+    RC_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4,
+    RC_KAK_NEAR_POTION_SHOP_ADULT_CRATE,
+    RC_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE,
+    RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1,
+    RC_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2,
+    RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1,
+    RC_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2,
+    RC_KAK_NEAR_BAZAAR_ADULT_CRATE_1,
+    RC_KAK_NEAR_BAZAAR_ADULT_CRATE_2,
+    RC_KAK_BEHIND_GS_HOUSE_ADULT_CRATE,
+    RC_KAK_NEAR_GY_CHILD_CRATE,
+    RC_KAK_NEAR_WINDMILL_CHILD_CRATE,
+    RC_KAK_NEAR_FENCE_CHILD_CRATE,
+    RC_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE,
+    RC_KAK_NEAR_BAZAAR_CHILD_CRATE,
+    RC_GRAVEYARD_CRATE,
+    RC_GC_MAZE_CRATE,
+    RC_DMC_CRATE,
+    RC_LLR_NEAR_TREE_CRATE,
+    RC_LH_LAB_CRATE,
+
+    // MQ Dungeon Crates
+    RC_DEKU_TREE_MQ_LOBBY_CRATE,
+    RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1,
+    RC_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7,
+    RC_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3,
+    RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4,
+    RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1,
+    RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5,
+    RC_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5,
+    RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5,
+    RC_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13,
+    RC_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1,
+    RC_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2,
+    RC_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE,
+    RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3,
+    RC_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3,
+    RC_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4,
+    RC_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE,
+    RC_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE,
+    RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1,
+    RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2,
+    RC_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2,
+    RC_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3,
+    RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1,
+    RC_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2,
+    RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1,
+    RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2,
+    RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3,
+    RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4,
+    RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE,
+
+    // Dungeon Small Crates
+    RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1,
+    RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2,
+    RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1,
+    RC_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2,
+    RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1,
+    RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2,
+
+    // MQ Dungeon Small Crates
+    RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1,
+    RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2,
+    RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1,
+    RC_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2,
+    RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1,
+    RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2,
+    RC_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4,
+    RC_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2,
+    RC_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3,
+    RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE,
+    RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE,
+    RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1,
+    RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2,
+    RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3,
+    RC_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4,
+    RC_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE,
+    RC_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE,
+    // End Crates
+
     RC_PIERRE,
     RC_DELIVER_RUTOS_LETTER,
     RC_MASTER_SWORD_PEDESTAL,
@@ -2825,7 +3137,7 @@ typedef enum {
     RC_DMT_FLAG_SUN_FAIRY,
     RC_DMT_COW_GROTTO_STORMS_FAIRY,
     RC_LW_SHORTCUT_STORMS_FAIRY,
-    RC_GF_KITCHEN_SUN_FAIRY,
+    RC_TH_KITCHEN_SUN_FAIRY,
     RC_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,
     RC_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,
     RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,
@@ -2848,15 +3160,368 @@ typedef enum {
     RC_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY,
     RC_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,
     RC_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,
+
+    // Overworld Grass
+    RC_KF_CHILD_GRASS_1,
+    RC_KF_CHILD_GRASS_2,
+    RC_KF_CHILD_GRASS_3,
+    RC_KF_CHILD_GRASS_4,
+    RC_KF_CHILD_GRASS_5,
+    RC_KF_CHILD_GRASS_6,
+    RC_KF_CHILD_GRASS_7,
+    RC_KF_CHILD_GRASS_8,
+    RC_KF_CHILD_GRASS_9,
+    RC_KF_CHILD_GRASS_10,
+    RC_KF_CHILD_GRASS_11,
+    RC_KF_CHILD_GRASS_12,
+    RC_KF_CHILD_GRASS_MAZE_1,
+    RC_KF_CHILD_GRASS_MAZE_2,
+    RC_KF_CHILD_GRASS_MAZE_3,
+    RC_KF_ADULT_GRASS_1,
+    RC_KF_ADULT_GRASS_2,
+    RC_KF_ADULT_GRASS_3,
+    RC_KF_ADULT_GRASS_4,
+    RC_KF_ADULT_GRASS_5,
+    RC_KF_ADULT_GRASS_6,
+    RC_KF_ADULT_GRASS_7,
+    RC_KF_ADULT_GRASS_8,
+    RC_KF_ADULT_GRASS_9,
+    RC_KF_ADULT_GRASS_10,
+    RC_KF_ADULT_GRASS_11,
+    RC_KF_ADULT_GRASS_12,
+    RC_KF_ADULT_GRASS_13,
+    RC_KF_ADULT_GRASS_14,
+    RC_KF_ADULT_GRASS_15,
+    RC_KF_ADULT_GRASS_16,
+    RC_KF_ADULT_GRASS_17,
+    RC_KF_ADULT_GRASS_18,
+    RC_KF_ADULT_GRASS_19,
+    RC_KF_ADULT_GRASS_20,
+    RC_LW_GRASS_1,
+    RC_LW_GRASS_2,
+    RC_LW_GRASS_3,
+    RC_LW_GRASS_4,
+    RC_LW_GRASS_5,
+    RC_LW_GRASS_6,
+    RC_LW_GRASS_7,
+    RC_LW_GRASS_8,
+    RC_LW_GRASS_9,
+    RC_MARKET_GRASS_1,
+    RC_MARKET_GRASS_2,
+    RC_MARKET_GRASS_3,
+    RC_MARKET_GRASS_4,
+    RC_MARKET_GRASS_5,
+    RC_MARKET_GRASS_6,
+    RC_MARKET_GRASS_7,
+    RC_MARKET_GRASS_8,
+    RC_HC_GRASS_1,
+    RC_HC_GRASS_2,
+    RC_KAK_GRASS_1,
+    RC_KAK_GRASS_2,
+    RC_KAK_GRASS_3,
+    RC_KAK_GRASS_4,
+    RC_KAK_GRASS_5,
+    RC_KAK_GRASS_6,
+    RC_KAK_GRASS_7,
+    RC_KAK_GRASS_8,
+    RC_GY_GRASS_1,
+    RC_GY_GRASS_2,
+    RC_GY_GRASS_3,
+    RC_GY_GRASS_4,
+    RC_GY_GRASS_5,
+    RC_GY_GRASS_6,
+    RC_GY_GRASS_7,
+    RC_GY_GRASS_8,
+    RC_GY_GRASS_9,
+    RC_GY_GRASS_10,
+    RC_GY_GRASS_11,
+    RC_GY_GRASS_12,
+    RC_LH_GRASS_1,
+    RC_LH_GRASS_2,
+    RC_LH_GRASS_3,
+    RC_LH_GRASS_4,
+    RC_LH_GRASS_5,
+    RC_LH_GRASS_6,
+    RC_LH_GRASS_7,
+    RC_LH_GRASS_8,
+    RC_LH_GRASS_9,
+    RC_LH_GRASS_10,
+    RC_LH_GRASS_11,
+    RC_LH_GRASS_12,
+    RC_LH_GRASS_13,
+    RC_LH_GRASS_14,
+    RC_LH_GRASS_15,
+    RC_LH_GRASS_16,
+    RC_LH_GRASS_17,
+    RC_LH_GRASS_18,
+    RC_LH_GRASS_19,
+    RC_LH_GRASS_20,
+    RC_LH_GRASS_21,
+    RC_LH_GRASS_22,
+    RC_LH_GRASS_23,
+    RC_LH_GRASS_24,
+    RC_LH_GRASS_25,
+    RC_LH_GRASS_26,
+    RC_LH_GRASS_27,
+    RC_LH_GRASS_28,
+    RC_LH_GRASS_29,
+    RC_LH_GRASS_30,
+    RC_LH_GRASS_31,
+    RC_LH_GRASS_32,
+    RC_LH_GRASS_33,
+    RC_LH_GRASS_34,
+    RC_LH_GRASS_35,
+    RC_LH_GRASS_36,
+    RC_LH_CHILD_GRASS_1,
+    RC_LH_CHILD_GRASS_2,
+    RC_LH_CHILD_GRASS_3,
+    RC_LH_CHILD_GRASS_4,
+    RC_LH_WARP_PAD_GRASS_1,
+    RC_LH_WARP_PAD_GRASS_2,
+    RC_HF_NEAR_KF_GRASS_1,
+    RC_HF_NEAR_KF_GRASS_2,
+    RC_HF_NEAR_KF_GRASS_3,
+    RC_HF_NEAR_KF_GRASS_4,
+    RC_HF_NEAR_KF_GRASS_5,
+    RC_HF_NEAR_KF_GRASS_6,
+    RC_HF_NEAR_KF_GRASS_7,
+    RC_HF_NEAR_KF_GRASS_8,
+    RC_HF_NEAR_KF_GRASS_9,
+    RC_HF_NEAR_KF_GRASS_10,
+    RC_HF_NEAR_KF_GRASS_11,
+    RC_HF_NEAR_KF_GRASS_12,
+    RC_HF_NEAR_MARKET_GRASS_1,
+    RC_HF_NEAR_MARKET_GRASS_2,
+    RC_HF_NEAR_MARKET_GRASS_3,
+    RC_HF_NEAR_MARKET_GRASS_4,
+    RC_HF_NEAR_MARKET_GRASS_5,
+    RC_HF_NEAR_MARKET_GRASS_6,
+    RC_HF_NEAR_MARKET_GRASS_7,
+    RC_HF_NEAR_MARKET_GRASS_8,
+    RC_HF_NEAR_MARKET_GRASS_9,
+    RC_HF_NEAR_MARKET_GRASS_10,
+    RC_HF_NEAR_MARKET_GRASS_11,
+    RC_HF_NEAR_MARKET_GRASS_12,
+    RC_HF_SOUTH_GRASS_1,
+    RC_HF_SOUTH_GRASS_2,
+    RC_HF_SOUTH_GRASS_3,
+    RC_HF_SOUTH_GRASS_4,
+    RC_HF_SOUTH_GRASS_5,
+    RC_HF_SOUTH_GRASS_6,
+    RC_HF_SOUTH_GRASS_7,
+    RC_HF_SOUTH_GRASS_8,
+    RC_HF_SOUTH_GRASS_9,
+    RC_HF_SOUTH_GRASS_10,
+    RC_HF_SOUTH_GRASS_11,
+    RC_HF_SOUTH_GRASS_12,
+    RC_HF_CENTRAL_GRASS_1,
+    RC_HF_CENTRAL_GRASS_2,
+    RC_HF_CENTRAL_GRASS_3,
+    RC_HF_CENTRAL_GRASS_4,
+    RC_HF_CENTRAL_GRASS_5,
+    RC_HF_CENTRAL_GRASS_6,
+    RC_HF_CENTRAL_GRASS_7,
+    RC_HF_CENTRAL_GRASS_8,
+    RC_HF_CENTRAL_GRASS_9,
+    RC_HF_CENTRAL_GRASS_10,
+    RC_HF_CENTRAL_GRASS_11,
+    RC_HF_CENTRAL_GRASS_12,
+    RC_ZR_GRASS_1,
+    RC_ZR_GRASS_2,
+    RC_ZR_GRASS_3,
+    RC_ZR_GRASS_4,
+    RC_ZR_GRASS_5,
+    RC_ZR_GRASS_6,
+    RC_ZR_GRASS_7,
+    RC_ZR_GRASS_8,
+    RC_ZR_GRASS_9,
+    RC_ZR_GRASS_10,
+    RC_ZR_GRASS_11,
+    RC_ZR_GRASS_12,
+    RC_ZR_NEAR_FREESTANDING_POH_GRASS,
+    // Grotto Grass
+    RC_KF_STORMS_GROTTO_GRASS_1,
+    RC_KF_STORMS_GROTTO_GRASS_2,
+    RC_KF_STORMS_GROTTO_GRASS_3,
+    RC_KF_STORMS_GROTTO_GRASS_4,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3,
+    RC_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4,
+    RC_HF_NEAR_MARKET_GROTTO_GRASS_1,
+    RC_HF_NEAR_MARKET_GROTTO_GRASS_2,
+    RC_HF_NEAR_MARKET_GROTTO_GRASS_3,
+    RC_HF_NEAR_MARKET_GROTTO_GRASS_4,
+    RC_HF_OPEN_GROTTO_GRASS_1,
+    RC_HF_OPEN_GROTTO_GRASS_2,
+    RC_HF_OPEN_GROTTO_GRASS_3,
+    RC_HF_OPEN_GROTTO_GRASS_4,
+    RC_HF_SOUTHEAST_GROTTO_GRASS_1,
+    RC_HF_SOUTHEAST_GROTTO_GRASS_2,
+    RC_HF_SOUTHEAST_GROTTO_GRASS_3,
+    RC_HF_SOUTHEAST_GROTTO_GRASS_4,
+    RC_HF_COW_GROTTO_GRASS_1,
+    RC_HF_COW_GROTTO_GRASS_2,
+    RC_KAK_OPEN_GROTTO_GRASS_1,
+    RC_KAK_OPEN_GROTTO_GRASS_2,
+    RC_KAK_OPEN_GROTTO_GRASS_3,
+    RC_KAK_OPEN_GROTTO_GRASS_4,
+    RC_DMT_STORMS_GROTTO_GRASS_1,
+    RC_DMT_STORMS_GROTTO_GRASS_2,
+    RC_DMT_STORMS_GROTTO_GRASS_3,
+    RC_DMT_STORMS_GROTTO_GRASS_4,
+    RC_DMT_COW_GROTTO_GRASS_1,
+    RC_DMT_COW_GROTTO_GRASS_2,
+    RC_DMC_UPPER_GROTTO_GRASS_1,
+    RC_DMC_UPPER_GROTTO_GRASS_2,
+    RC_DMC_UPPER_GROTTO_GRASS_3,
+    RC_DMC_UPPER_GROTTO_GRASS_4,
+    RC_ZR_OPEN_GROTTO_GRASS_1,
+    RC_ZR_OPEN_GROTTO_GRASS_2,
+    RC_ZR_OPEN_GROTTO_GRASS_3,
+    RC_ZR_OPEN_GROTTO_GRASS_4,
+    // Dungeon Grass
+    RC_DEKU_TREE_LOBBY_GRASS_1,
+    RC_DEKU_TREE_LOBBY_GRASS_2,
+    RC_DEKU_TREE_LOBBY_GRASS_3,
+    RC_DEKU_TREE_LOBBY_GRASS_4,
+    RC_DEKU_TREE_LOBBY_GRASS_5,
+    RC_DEKU_TREE_SLINGSHOT_GRASS_1,
+    RC_DEKU_TREE_SLINGSHOT_GRASS_2,
+    RC_DEKU_TREE_SLINGSHOT_GRASS_3,
+    RC_DEKU_TREE_SLINGSHOT_GRASS_4,
+    RC_DEKU_TREE_COMPASS_GRASS_1,
+    RC_DEKU_TREE_COMPASS_GRASS_2,
+    RC_DEKU_TREE_BASEMENT_GRASS_1,
+    RC_DEKU_TREE_BASEMENT_GRASS_2,
+    RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1,
+    RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2,
+    RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3,
+    RC_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4,
+    RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1,
+    RC_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2,
+    RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_1,
+    RC_DEKU_TREE_BASEMENT_TORCHES_GRASS_2,
+    RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_1,
+    RC_DEKU_TREE_BASEMENT_LARVAE_GRASS_2,
+    RC_DEKU_TREE_BEFORE_BOSS_GRASS_1,
+    RC_DEKU_TREE_BEFORE_BOSS_GRASS_2,
+    RC_DEKU_TREE_BEFORE_BOSS_GRASS_3,
+    RC_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS,
+    RC_DODONGOS_CAVERN_BLADE_GRASS,
+    RC_DODONGOS_CAVERN_SINGLE_EYE_GRASS,
+    RC_DODONGOS_CAVERN_BEFORE_BOSS_GRASS,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2,
+    RC_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3,
+    // MQ Dungeon Grass
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_1,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_2,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_3,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_4,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_5,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_6,
+    RC_DEKU_TREE_MQ_LOBBY_GRASS_7,
+    RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_1,
+    RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_2,
+    RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_3,
+    RC_DEKU_TREE_MQ_SLINGSHOT_GRASS_4,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6,
+    RC_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7,
+    RC_DEKU_TREE_MQ_COMPASS_GRASS_1,
+    RC_DEKU_TREE_MQ_COMPASS_GRASS_2,
+    RC_DEKU_TREE_MQ_COMPASS_GRASS_3,
+    RC_DEKU_TREE_MQ_COMPASS_GRASS_4,
+    RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3,
+    RC_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4,
+    RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3,
+    RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3,
+    RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3,
+    RC_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4,
+    RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3,
+    RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4,
+    RC_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5,
+    RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1,
+    RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2,
+    RC_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3,
+    RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1,
+    RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2,
+    RC_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3,
+    RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1,
+    RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2,
+    RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3,
+    RC_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4,
+    RC_DODONGOS_CAVERN_MQ_ARMOS_GRASS,
+    RC_DODONGOS_CAVERN_MQ_BACK_POE_GRASS,
+    RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1,
+    RC_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2,
+    RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1,
+    RC_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2,
+    RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_1,
+    RC_JABU_JABUS_BELLY_MQ_PIT_GRASS_2,
+    RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1,
+    RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2,
+    RC_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3,
+    RC_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS,
+    RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1,
+    RC_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2,
+    RC_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS,
+    RC_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS,
+    RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1,
+    RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2,
+    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1,
+    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2,
+    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3,
+    RC_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4,
+    // Shared Dungeon Grass
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_1,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_2,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_3,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_4,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_5,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_6,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_7,
+    RC_DEKU_TREE_QUEEN_GOHMA_GRASS_8,
+    // End Grass
+
     RC_MAX
 } RandomizerCheck;
 
-// Randomizer tricks and glitches (beta) based on knowledge of what is achievable in Ship of Harkinian randomizer, excludes Item manipulation (e.g. RBA/GIM/SRM) and Wrong Warping and Ganon BK Skip
-// TODO Fill and alphabetize (area based tricks must have area in name and come alphetized after general tricks) 
+// Randomizer tricks and glitches (beta) based on knowledge of what is achievable in Ship of Harkinian randomizer,
+// excludes Item manipulation (e.g. RBA/GIM/SRM) and Wrong Warping and Ganon BK Skip
+// TODO Fill and alphabetize (area based tricks must have area in name and come alphetized after general tricks)
 // TODO test commented out tricks to see if consistent with console on SoH
 // TODO add area specific tricks
 typedef enum {
-    RT_VISIBLE_COLLISION,                          // -- general tricks
+    RT_VISIBLE_COLLISION, // -- general tricks
     RT_GROTTOS_WITHOUT_AGONY,
     RT_FEWER_TUNIC_REQUIREMENTS,
     RT_RUSTED_SWITCHES,
@@ -2866,15 +3531,17 @@ typedef enum {
     RT_HOVER_BOOST_SIMPLE,
     RT_BOMBCHU_BEEHIVES,
     RT_BLUE_FIRE_MUD_WALLS,
-    RT_KF_ADULT_GS,                            // -- location tricks
+    RT_OPEN_UNDERWATER_CHEST,
+    RT_KF_ADULT_GS, // -- location tricks
     RT_LW_BRIDGE,
     RT_LW_MIDO_BACKFLIP,
     RT_LW_GS_BEAN,
     RT_HC_STORMS_GS,
+    RT_HF_BIG_POE_WITHOUT_EPONA,
     RT_KAK_MAN_ON_ROOF,
     RT_KAK_TOWER_GS,
     RT_KAK_ADULT_WINDMILL_POH,
-    RT_KAK_CHILD_WINDMILL_POH, 
+    RT_KAK_CHILD_WINDMILL_POH,
     RT_KAK_ROOFTOP_GS,
     RT_GY_POH,
     RT_GY_CHILD_DAMPE_RACE_POH,
@@ -2909,7 +3576,7 @@ typedef enum {
     RT_LH_LAB_DIVING,
     RT_LH_WATER_HOOKSHOT,
     RT_GV_CRATE_HOVERS,
-    RT_GF_KITCHEN,
+    RT_PASS_GUARDS_WITH_NOTHING,
     RT_GF_JUMP,
     RT_GF_WARRIOR_WITH_DIFFICULT_WEAPON,
     RT_HW_BUNNY_CROSSING,
@@ -2925,14 +3592,16 @@ typedef enum {
     RT_DEKU_MQ_LOG,
     RT_DC_SCARECROW_GS,
     RT_DC_VINES_GS,
-    RT_DC_STAIRCASE,
+    RT_DC_STAIRS_WITH_BOW,
     RT_DC_SLINGSHOT_SKIP,
     RT_DC_SCRUB_ROOM,
     RT_DC_JUMP,
     RT_DC_HAMMER_FLOOR,
+    RT_DC_MQ_STAIRS_WITH_ONLY_STRENGTH,
     RT_DC_MQ_CHILD_BOMBS,
     RT_DC_MQ_CHILD_EYES,
     RT_DC_MQ_ADULT_EYES,
+    RT_DC_DODONGO_CHU,
     RT_JABU_ALCOVE_JUMP_DIVE,
     RT_JABU_BOSS_HOVER,
     RT_JABU_NEAR_BOSS_RANGED,
@@ -2988,6 +3657,7 @@ typedef enum {
     RT_WATER_CHILD_DRAGON,
     RT_WATER_MQ_CENTRAL_PILLAR,
     RT_WATER_MQ_LOCKED_GS,
+    RT_WATER_MORPHA_WITHOUT_HOOKSHOT,
     RT_LENS_SHADOW,
     RT_LENS_SHADOW_PLATFORM,
     RT_LENS_BONGO,
@@ -3026,14 +3696,14 @@ typedef enum {
     RT_GTG_FAKE_WALL,
     RT_LENS_GTG_MQ,
     RT_GTG_MQ_WITH_HOOKSHOT,
-    RT_GTG_MQ_WIHTOUT_HOOKSHOT,
+    RT_GTG_MQ_WITHOUT_HOOKSHOT,
     RT_LENS_GANON,
     RT_GANON_SPIRIT_TRIAL_HOOKSHOT,
     RT_LENS_GANON_MQ,
     RT_GANON_MQ_FIRE_TRIAL,
     RT_GANON_MQ_SHADOW_TRIAL,
     RT_GANON_MQ_LIGHT_TRIAL,
-    //RT_ROCS_FEATHER                       --if implemented with main branch
+    // RT_ROCS_FEATHER                       --if implemented with main branch
     RT_FOREST_TEMPLE_BK_SKIP,
     RT_FIRE_TEMPLE_BK_SKIP,
     RT_WATER_TEMPLE_BK_SKIP,
@@ -3072,6 +3742,8 @@ typedef enum {
     RT_MEGASIDEHOP_BOMB,
     RT_MEGASIDEHOP_BOMBCHU,
     RT_NAVI_DIVE,
+    RT_BOTTOM_OF_THE_WELL_NAVI_DIVE,
+    RT_LOST_WOOD_NAVI_DIVE,
     RT_OCARINA_ITEMS,
     RT_OCARINA_ITEMS_BOMB,
     RT_OCARINA_ITEMS_ESS,
@@ -3088,11 +3760,11 @@ typedef enum {
     RT_WEIRDSHOT,
     RT_WEIRDSHOT_CHU,
     RT_WEIRDSHOT_ENEMY,
-    //RT_FW_VOID_WARP_FAST_TEXT,                      --untested tricks:
-    //RT_ACTION_SWAP,
-    //RT_ACTOR_GLITCH,
-    //RT_ADULT_TRADE_TTG,
-    RT_TOT_DOT_SKIP_SWORDLESS,           //AREA SPECIFIC GLITCHES
+    // RT_FW_VOID_WARP_FAST_TEXT,                      --untested tricks:
+    // RT_ACTION_SWAP,
+    // RT_ACTOR_GLITCH,
+    // RT_ADULT_TRADE_TTG,
+    RT_TOT_DOT_SKIP_SWORDLESS, // AREA SPECIFIC GLITCHES
     RT_TOT_DOT_SKIP_SWORD,
     RT_LLR_STEAL_EPONA,
     RT_KF_POKEY_SKIP,
@@ -3108,7 +3780,7 @@ typedef enum {
     RT_ZF_JABU_ADULT_HOVERBOOT_BOMB,
     RT_FOREST_TEMPLE_FOUR_POE_SKIP,
     RT_FOREST_TEMPLE_JUNGLE_JUMP,
-    //RT_DARUNIA_CUTSCENE,
+    // RT_DARUNIA_CUTSCENE,
     RT_BOTTOM_OF_THE_WELL_SKULL_PUSH,
     RT_GANONS_CASTLE_BARRIER_SKIP_HOVER,
     RT_GANONS_CASTLE_GOLD_GAUNTLET_SKIP,
@@ -3368,6 +4040,8 @@ typedef enum {
     RG_HOOKSHOT,
     RG_LONGSHOT,
     RG_SCARECROW,
+
+    // Overworld keys
     RG_GUARD_HOUSE_KEY,
     RG_MARKET_BAZAAR_KEY,
     RG_MARKET_POTION_SHOP_KEY,
@@ -3855,11 +4529,11 @@ typedef enum {
     RHT_GF_CHEST,
     RHT_GF_HBA_1000_POINTS,
     RHT_GF_HBA_1500_POINTS,
-    RHT_GF_GERUDO_MEMBERSHIP_CARD,
-    RHT_GF_NORTH_F1_CARPENTER,
-    RHT_GF_NORTH_F2_CARPENTER,
-    RHT_GF_SOUTH_F1_CARPENTER,
-    RHT_GF_SOUTH_F2_CARPENTER,
+    RHT_TH_FREED_CARPENTERS,
+    RHT_TH_1_TORCH_CARPENTER,
+    RHT_TH_DEAD_END_CARPENTER,
+    RHT_TH_DOUBLE_CELL_CARPENTER,
+    RHT_TH_STEEP_SLOPE_CARPENTER,
     RHT_GF_GS_TOP_FLOOR,
     RHT_GF_GS_ARCHERY_RANGE,
     RHT_HIDEOUT_JAIL_GUARD_1_TORCH,
@@ -4742,7 +5416,22 @@ typedef enum {
     RHT_MASK_SHOP_HINT,
     // Shuffle Pots
     RHT_POT_KOKIRI_FOREST,
-    RHT_POT_GERUDO_FORTRESS,
+    RHT_TH_BREAK_ROOM_FRONT_POT,
+    RHT_TH_BREAK_ROOM_BACK_POT,
+    RHT_TH_KITCHEN_POT_1,
+    RHT_TH_KITCHEN_POT_2,
+    RHT_TH_1_TORCH_CELL_RIGHT_POT,
+    RHT_TH_1_TORCH_CELL_MID_POT,
+    RHT_TH_1_TORCH_CELL_LEFT_POT,
+    RHT_TH_STEEP_SLOPE_RIGHT_POT,
+    RHT_TH_STEEP_SLOPE_LEFT_POT,
+    RHT_TH_NEAR_DOUBLE_CELL_RIGHT_POT,
+    RHT_TH_NEAR_DOUBLE_CELL_MID_POT,
+    RHT_TH_NEAR_DOUBLE_CELL_LEFT_POT,
+    RHT_TH_RIGHTMOST_JAILED_POT,
+    RHT_TH_RIGHT_MIDDLE_JAILED_POT,
+    RHT_TH_LEFT_MIDDLE_JAILED_POT,
+    RHT_TH_LEFTMOST_JAILED_POT,
     RHT_POT_WASTELAND,
     RHT_POT_MARKET,
     RHT_POT_KAKARIKO,
@@ -4765,6 +5454,29 @@ typedef enum {
     RHT_POT_GANONS_CASTLE,
     RHT_POT_BOTTOM_OF_THE_WELL,
     RHT_POT_ICE_CAVERN,
+    // Shuffle Crates
+    RHT_CRATE_GERUDO_VALLEY,
+    RHT_CRATE_GERUDOS_FORTRESS,
+    RHT_CRATE_THIEVES_HIDEOUT,
+    RHT_CRATE_WASTELAND,
+    RHT_CRATE_MARKET,
+    RHT_CRATE_DOG_LADY_HOUSE,
+    RHT_CRATE_MARKET_GUARD_HOUSE,
+    RHT_CRATE_KAKARIKO_VILLAGE,
+    RHT_CRATE_GRAVEYARD,
+    RHT_CRATE_GORON_CITY,
+    RHT_CRATE_DEATH_MOUNTAIN_CRATER,
+    RHT_CRATE_LON_LON_RANCH,
+    RHT_CRATE_LAKESIDE_LABORATORY,
+    RHT_CRATE_DEKU_TREE,
+    RHT_CRATE_DODONGOS_CAVERN,
+    RHT_CRATE_JABU_JABU,
+    RHT_CRATE_FOREST_TEMPLE,
+    RHT_CRATE_FIRE_TEMPLE,
+    RHT_CRATE_WATER_TEMPLE,
+    RHT_CRATE_SPIRIT_TEMPLE,
+    RHT_CRATE_SHADOW_TEMPLE,
+    RHT_CRATE_GERUDO_TRAINING_GROUND,
     // Ganon Line
     RHT_GANON_JOKE01,
     RHT_GANON_JOKE02,
@@ -4909,7 +5621,7 @@ typedef enum {
     RHT_DMT_FLAG_SUN_FAIRY,
     RHT_DMT_COW_GROTTO_STORMS_FAIRY,
     RHT_LW_SHORTCUT_STORMS_FAIRY,
-    RHT_GF_KITCHEN_SUN_FAIRY,
+    RHT_TH_KITCHEN_SUN_FAIRY,
     RHT_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,
     RHT_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,
     RHT_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,
@@ -4929,11 +5641,25 @@ typedef enum {
     RHT_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,
     RHT_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,
     RHT_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,
+    // GRASS
+    RHT_KF_GRASS,
+    RHT_LW_GRASS,
+    RHT_MARKET_GRASS,
+    RHT_HC_GRASS,
+    RHT_KAK_GRASS,
+    RHT_GY_GRASS,
+    RHT_LH_GRASS,
+    RHT_HF_GRASS,
+    RHT_ZR_GRASS,
+    RHT_GROTTO_GRASS,
+    RHT_DEKU_TREE_GRASS,
+    RHT_DODONGOS_CAVERN_GRASS,
+    RHT_BOTTOM_OF_THE_WELL_GRASS,
+    RHT_JABU_JABUS_BELLY_GRASS,
     // MAX
-    RHT_MAX
+    RHT_MAX,
 } RandomizerHintTextKey;
 
-
 typedef struct {
     RandomizerGet rgID;
     RandomizerGet fakeRgID;
@@ -5042,16 +5768,16 @@ typedef enum {
     RSK_STARTING_KOKIRI_SWORD,
     RSK_STARTING_MASTER_SWORD,
     RSK_STARTING_ZELDAS_LULLABY,
-    RSK_STARTING_EPONAS_SONG, 
-    RSK_STARTING_SARIAS_SONG, 
+    RSK_STARTING_EPONAS_SONG,
+    RSK_STARTING_SARIAS_SONG,
     RSK_STARTING_SUNS_SONG,
     RSK_STARTING_SONG_OF_TIME,
     RSK_STARTING_SONG_OF_STORMS,
-    RSK_STARTING_MINUET_OF_FOREST, 
+    RSK_STARTING_MINUET_OF_FOREST,
     RSK_STARTING_BOLERO_OF_FIRE,
     RSK_STARTING_SERENADE_OF_WATER,
-    RSK_STARTING_REQUIEM_OF_SPIRIT, 
-    RSK_STARTING_NOCTURNE_OF_SHADOW, 
+    RSK_STARTING_REQUIEM_OF_SPIRIT,
+    RSK_STARTING_NOCTURNE_OF_SHADOW,
     RSK_STARTING_PRELUDE_OF_LIGHT,
     RSK_SHUFFLE_KOKIRI_SWORD,
     RSK_SHUFFLE_MASTER_SWORD,
@@ -5088,6 +5814,7 @@ typedef enum {
     RSK_SHUFFLE_WEIRD_EGG,
     RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD,
     RSK_SHUFFLE_POTS,
+    RSK_SHUFFLE_CRATES,
     RSK_SHUFFLE_FROG_SONG_RUPEES,
     RSK_ITEM_POOL,
     RSK_ICE_TRAPS,
@@ -5130,7 +5857,6 @@ typedef enum {
     RSK_STARTING_NUTS,
     RSK_FULL_WALLETS,
     RSK_SHUFFLE_CHEST_MINIGAME,
-    RSK_CUCCO_COUNT,
     RSK_BIG_POE_COUNT,
     RSK_SKIP_EPONA_RACE,
     RSK_COMPLETE_MASK_QUEST,
@@ -5221,11 +5947,12 @@ typedef enum {
     RSK_SHUFFLE_FREESTANDING,
     RSK_SHUFFLE_FAIRIES,
     RSK_LOCK_OVERWORLD_DOORS,
+    RSK_SHUFFLE_GRASS,
     RSK_MAX
 } RandomizerSettingKey;
 
-//Generic Settings (any binary option can use this)
-// off/on
+// Generic Settings (any binary option can use this)
+//  off/on
 typedef enum {
     RO_GENERIC_OFF,
     RO_GENERIC_ON,
@@ -5243,54 +5970,54 @@ typedef enum {
     RO_GENERIC_SKIP,
 } RandoOptionGenericSkip;
 
-//Closed Forest settings (On, Deku Only, Off)
+// Closed Forest settings (On, Deku Only, Off)
 typedef enum {
     RO_CLOSED_FOREST_ON,
     RO_CLOSED_FOREST_DEKU_ONLY,
     RO_CLOSED_FOREST_OFF,
 } RandoOptionForest;
 
-//Door of Time settings (closed, song only, open)
+// Door of Time settings (closed, song only, open)
 typedef enum {
     RO_DOOROFTIME_CLOSED,
     RO_DOOROFTIME_SONGONLY,
     RO_DOOROFTIME_OPEN,
 } RandoOptionDoorOfTime;
 
-//Zora's Fountain settings (closed, closed as child, open)
+// Zora's Fountain settings (closed, closed as child, open)
 typedef enum {
     RO_ZF_CLOSED,
     RO_ZF_CLOSED_CHILD,
     RO_ZF_OPEN,
 } RandoOptionZorasFountain;
 
-//Sleeping Waterfall settings (closed, open)
+// Sleeping Waterfall settings (closed, open)
 typedef enum {
     RO_WATERFALL_CLOSED,
     RO_WATERFALL_OPEN,
 } RandoOptionSleepingWaterfall;
 
-//Starting Age settings (child, adult, random)
+// Starting Age settings (child, adult, random)
 typedef enum {
     RO_AGE_CHILD,
     RO_AGE_ADULT,
     RO_AGE_RANDOM,
 } RandoOptionStartingAge;
 
-//Fortress Carpenters settings (normal, fast, free)
+// Fortress Carpenters settings (normal, fast, free)
 typedef enum {
     RO_GF_CARPENTERS_NORMAL,
     RO_GF_CARPENTERS_FAST,
     RO_GF_CARPENTERS_FREE,
 } RandoOptionGerudoFortress;
 
-//Kakariko Gate settings (closed/open)
+// Kakariko Gate settings (closed/open)
 typedef enum {
     RO_KAK_GATE_CLOSED,
     RO_KAK_GATE_OPEN,
 } RandoOptionKakarikoGate;
 
-//Rainbow Bridge settings (vanilla, always open, stones, medallions, dungeon rewards, dungeons, tokens)
+// Rainbow Bridge settings (vanilla, always open, stones, medallions, dungeon rewards, dungeons, tokens)
 typedef enum {
     RO_BRIDGE_VANILLA = 0,
     RO_BRIDGE_ALWAYS_OPEN,
@@ -5309,14 +6036,14 @@ typedef enum {
     RO_BRIDGE_WILDCARD_REWARD,
 } RandoOptionBridgeRewards;
 
-//Shopsanity settings (off, specific count, random)
+// Shopsanity settings (off, specific count, random)
 typedef enum {
     RO_SHOPSANITY_OFF,
     RO_SHOPSANITY_SPECIFIC_COUNT,
     RO_SHOPSANITY_RANDOM,
 } RandoOptionShopsanity;
 
-//Shopsanity count settings (0-7 items)
+// Shopsanity count settings (0-7 items)
 typedef enum {
     RO_SHOPSANITY_COUNT_ZERO_ITEMS,
     RO_SHOPSANITY_COUNT_ONE_ITEM,
@@ -5329,27 +6056,27 @@ typedef enum {
     RO_SHOPSANITY_COUNT_EIGHT_ITEMS,
 } RandoOptionShopsanityCount;
 
-//Shopsanity price ranges
+// Shopsanity price ranges
 typedef enum {
     RO_PRICE_VANILLA,
-    RO_PRICE_CHEAP_BALANCED, //Balanced random from 0-95, favoring lower numbers
-    RO_PRICE_BALANCED, //Random from 0-300, favoring lower numbers
+    RO_PRICE_CHEAP_BALANCED, // Balanced random from 0-95, favoring lower numbers
+    RO_PRICE_BALANCED,       // Random from 0-300, favoring lower numbers
     RO_PRICE_FIXED,
     RO_PRICE_RANGE,
     RO_PRICE_SET_BY_WALLET,
 } RandoOptionPrices;
 
-//Scrubsanity settings (off, affordable, expensive, random)
+// Scrubsanity settings (off, affordable, expensive, random)
 typedef enum {
     RO_SCRUBS_OFF,
     RO_SCRUBS_ONE_TIME_ONLY,
     RO_SCRUBS_ALL,
 } RandoOptionScrubsanity;
 
-//Ammo drop settings (on, "on+bombchu", off)
+// Ammo drop settings (on, "on+bombchu", off)
 typedef enum {
     RO_AMMO_DROPS_OFF,
-    //RO_AMMO_DROPS_ON_PLUS_BOMBCHU,
+    // RO_AMMO_DROPS_ON_PLUS_BOMBCHU,
     RO_AMMO_DROPS_ON,
 } RandoOptionAmmoDrops;
 
@@ -5359,7 +6086,7 @@ typedef enum {
     RO_BOSS_SOULS_ON_PLUS_GANON,
 } RandoOptionBossSouls;
 
-//Fishsanity settings (off, loach only, pond only, grottos only, both)
+// Fishsanity settings (off, loach only, pond only, grottos only, both)
 typedef enum {
     RO_FISHSANITY_OFF,
     RO_FISHSANITY_HYRULE_LOACH,
@@ -5368,15 +6095,15 @@ typedef enum {
     RO_FISHSANITY_BOTH
 } RandoOptionsFishsanity;
 
-//Infinite Upgrades settings (off, progressive, condensed progressive)
+// Infinite Upgrades settings (off, progressive, condensed progressive)
 typedef enum {
     RO_INF_UPGRADES_OFF,
     RO_INF_UPGRADES_PROGRESSIVE,
     RO_INF_UPGRADES_CONDENSED_PROGRESSIVE,
 } RandoOptionInfiniteUpgrades;
 
-//Any Dungeon Item (start with, vanilla, own dungeon, any dungeon,
-//overworld, anywhere)
+// Any Dungeon Item (start with, vanilla, own dungeon, any dungeon,
+// overworld, anywhere)
 typedef enum {
     RO_DUNGEON_ITEM_LOC_STARTWITH,
     RO_DUNGEON_ITEM_LOC_VANILLA,
@@ -5386,7 +6113,7 @@ typedef enum {
     RO_DUNGEON_ITEM_LOC_ANYWHERE,
 } RandoOptionDungeonItemLocation;
 
-//Dungeon reward settings
+// Dungeon reward settings
 typedef enum {
     RO_DUNGEON_REWARDS_VANILLA,
     RO_DUNGEON_REWARDS_END_OF_DUNGEON,
@@ -5395,7 +6122,7 @@ typedef enum {
     RO_DUNGEON_REWARDS_ANYWHERE,
 } RandoOptionDungeonRewards;
 
-//Keyring Settings
+// Keyring Settings
 typedef enum {
     RO_KEYRINGS_OFF,
     RO_KEYRINGS_RANDOM,
@@ -5409,8 +6136,8 @@ typedef enum {
     RO_KEYRING_FOR_DUNGEON_ON,
 } RandoOptionKeyringForDungeon;
 
-//Ganon's Boss Key Settings (vanilla, own dungeon, start with,
-//overworld, anywhere, 100 GS reward)
+// Ganon's Boss Key Settings (vanilla, own dungeon, start with,
+// overworld, anywhere, 100 GS reward)
 typedef enum {
     RO_GANON_BOSS_KEY_VANILLA,
     RO_GANON_BOSS_KEY_OWN_DUNGEON,
@@ -5425,7 +6152,6 @@ typedef enum {
     RO_GANON_BOSS_KEY_LACS_DUNGEONS,
     RO_GANON_BOSS_KEY_LACS_TOKENS,
     RO_GANON_BOSS_KEY_KAK_TOKENS,
-    RO_GANON_BOSS_KEY_TRIFORCE_HUNT,
 } RandoOptionGanonsBossKey;
 
 typedef enum {
@@ -5444,42 +6170,43 @@ typedef enum {
     RO_LACS_WILDCARD_REWARD,
 } RandoOptionLACSRewards;
 
-//Ganon's Trials
+// Ganon's Trials
 typedef enum {
     RO_GANONS_TRIALS_SKIP,
     RO_GANONS_TRIALS_SET_NUMBER,
     RO_GANONS_TRIALS_RANDOM_NUMBER,
 } RandoOptionGanonsTrials;
 
-//Shuffle Dungeon Entrance Settings (Off, on, plus ganon)
+// Shuffle Dungeon Entrance Settings (Off, on, plus ganon)
 typedef enum {
     RO_DUNGEON_ENTRANCE_SHUFFLE_OFF,
     RO_DUNGEON_ENTRANCE_SHUFFLE_ON,
     RO_DUNGEON_ENTRANCE_SHUFFLE_ON_PLUS_GANON,
 } RandoOptionDungeonEntranceShuffle;
 
-//Shuffle Boss Room Entrance Settings (Off, Age Restricted, Full)
+// Shuffle Boss Room Entrance Settings (Off, Age Restricted, Full)
 typedef enum {
     RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF,
     RO_BOSS_ROOM_ENTRANCE_SHUFFLE_AGE_RESTRICTED,
     RO_BOSS_ROOM_ENTRANCE_SHUFFLE_FULL,
 } RandoOptionBossRoomEntranceShuffle;
 
-//Shuffle Interior Entrance Settings (Off, simple, all)
+// Shuffle Interior Entrance Settings (Off, simple, all)
 typedef enum {
     RO_INTERIOR_ENTRANCE_SHUFFLE_OFF,
     RO_INTERIOR_ENTRANCE_SHUFFLE_SIMPLE,
     RO_INTERIOR_ENTRANCE_SHUFFLE_ALL,
 } RandoOptionInteriorEntranceShuffle;
 
-//Song shuffle Settings (Song locations, Dungeon rewards, anywhere)
+// Song shuffle Settings (Song locations, Dungeon rewards, anywhere)
 typedef enum {
+    RO_SONG_SHUFFLE_OFF,
     RO_SONG_SHUFFLE_SONG_LOCATIONS,
     RO_SONG_SHUFFLE_DUNGEON_REWARDS,
     RO_SONG_SHUFFLE_ANYWHERE,
 } RandoOptionSongShuffle;
 
-//Shuffle Merchants Settings (Off, Beans Only, All but Beans, All)
+// Shuffle Merchants Settings (Off, Beans Only, All but Beans, All)
 typedef enum {
     RO_SHUFFLE_MERCHANTS_OFF,
     RO_SHUFFLE_MERCHANTS_BEANS_ONLY,
@@ -5487,14 +6214,14 @@ typedef enum {
     RO_SHUFFLE_MERCHANTS_ALL
 } RandoOptionShuffleMerchants;
 
-//Starting Ocarina Settings (off, fairy)
+// Starting Ocarina Settings (off, fairy)
 typedef enum {
     RO_STARTING_OCARINA_OFF,
     RO_STARTING_OCARINA_FAIRY,
     RO_STARTING_OCARINA_TIME,
 } RandoOptionStartingOcarina;
 
-//Item Pool Settings
+// Item Pool Settings
 typedef enum {
     RO_ITEM_POOL_PLENTIFUL,
     RO_ITEM_POOL_BALANCED,
@@ -5502,7 +6229,7 @@ typedef enum {
     RO_ITEM_POOL_MINIMAL,
 } RandoOptionItemPool;
 
-//Ice Trap Settings
+// Ice Trap Settings
 typedef enum {
     RO_ICE_TRAPS_OFF,
     RO_ICE_TRAPS_NORMAL,
@@ -5511,8 +6238,8 @@ typedef enum {
     RO_ICE_TRAPS_ONSLAUGHT,
 } RandoOptionIceTraps;
 
-//Gossip Stone Hint Settings (no hints, needs nothing,
-//needs mask of truth, needs stone of agony)
+// Gossip Stone Hint Settings (no hints, needs nothing,
+// needs mask of truth, needs stone of agony)
 typedef enum {
     RO_GOSSIP_STONES_NONE,
     RO_GOSSIP_STONES_NEED_NOTHING,
@@ -5520,14 +6247,14 @@ typedef enum {
     RO_GOSSIP_STONES_NEED_STONE,
 } RandoOptionGossipStones;
 
-//Hint Clarity Settings (obscure, ambiguous, clear)
+// Hint Clarity Settings (obscure, ambiguous, clear)
 typedef enum {
     RO_HINT_CLARITY_OBSCURE,
     RO_HINT_CLARITY_AMBIGUOUS,
     RO_HINT_CLARITY_CLEAR,
 } RandoOptionHintClarity;
 
-//Hint Distribution Settings (useless, balanced, strong, very strong)
+// Hint Distribution Settings (useless, balanced, strong, very strong)
 typedef enum {
     RO_HINT_DIST_USELESS,
     RO_HINT_DIST_BALANCED,
@@ -5535,8 +6262,8 @@ typedef enum {
     RO_HINT_DIST_VERY_STRONG,
 } RandoOptionHintDistribution;
 
-//Gerudo Fortress Key Settings (vanilla, any dungeon, overworld,
-//anywhere)
+// Gerudo Fortress Key Settings (vanilla, any dungeon, overworld,
+// anywhere)
 typedef enum {
     RO_GERUDO_KEYS_VANILLA,
     RO_GERUDO_KEYS_ANY_DUNGEON,
@@ -5544,7 +6271,7 @@ typedef enum {
     RO_GERUDO_KEYS_ANYWHERE,
 } RandoOptionGerudoKeys;
 
-//Tokensanity settings (off, dungeons, overworld, all)
+// Tokensanity settings (off, dungeons, overworld, all)
 typedef enum {
     RO_TOKENSANITY_OFF,
     RO_TOKENSANITY_DUNGEONS,
@@ -5552,7 +6279,7 @@ typedef enum {
     RO_TOKENSANITY_ALL,
 } RandoOptionTokensanity;
 
-//Freestanding Hearts/Rupees settings (off, dungeons, overworld, all)
+// Freestanding Hearts/Rupees settings (off, dungeons, overworld, all)
 typedef enum {
     RO_SHUFFLE_FREESTANDING_OFF,
     RO_SHUFFLE_FREESTANDING_DUNGEONS,
@@ -5568,7 +6295,23 @@ typedef enum {
     RO_SHUFFLE_POTS_ALL,
 } RandoOptionShufflePots;
 
-//Link's Pocket Settings (dungeon reward, advancement, anything, nothing)
+// Shuffle Grass settings (off, dungeons, overworld, all)
+typedef enum {
+    RO_SHUFFLE_GRASS_OFF,
+    RO_SHUFFLE_GRASS_DUNGEONS,
+    RO_SHUFFLE_GRASS_OVERWORLD,
+    RO_SHUFFLE_GRASS_ALL,
+} RandoOptionShuffleGrass;
+
+// Shuffle Crates settings (off, dungeons, overworld, all)
+typedef enum {
+    RO_SHUFFLE_CRATES_OFF,
+    RO_SHUFFLE_CRATES_DUNGEONS,
+    RO_SHUFFLE_CRATES_OVERWORLD,
+    RO_SHUFFLE_CRATES_ALL,
+} RandoOptionShuffleCrates;
+
+// Link's Pocket Settings (dungeon reward, advancement, anything, nothing)
 typedef enum {
     RO_LINKS_POCKET_DUNGEON_REWARD,
     RO_LINKS_POCKET_ADVANCEMENT,
@@ -5663,14 +6406,34 @@ typedef struct FishIdentity {
     RandomizerCheck randomizerCheck;
 } FishIdentity;
 
+typedef struct FairyIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} FairyIdentity;
+
+typedef struct GrassIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} GrassIdentity;
+
+typedef struct CrateIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} CrateIdentity;
+
+typedef struct SmallCrateIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+} SmallCrateIdentity;
+
 typedef enum {
     TRACKER_WINDOW_FLOATING,
-    TRACKER_WINDOW_WINDOW
+    TRACKER_WINDOW_WINDOW,
 } TrackerWindowType;
 
 typedef enum {
     TRACKER_DISPLAY_ALWAYS,
-    TRACKER_DISPLAY_COMBO_BUTTON
+    TRACKER_DISPLAY_COMBO_BUTTON,
 } TrackerDisplayType;
 
 typedef enum {
@@ -5731,6 +6494,8 @@ typedef enum {
     RE_STINGER,
     RE_BIG_OCTO,
     RE_GERUDO_WARRIOR,
+    RE_GERUDO_GUARD,
+    RE_BREAK_ROOM_GUARD,
     RE_GIBDO,
     RE_GOHMA,
     RE_KING_DODONGO,
@@ -5753,13 +6518,13 @@ typedef enum {
     RE_OCTOROK,
 } RandomizerEnemy;
 
-//RANDOTODO compare child long jumpslash range with adult short
+// RANDOTODO compare child long jumpslash range with adult short
 typedef enum {
     ED_CLOSE,
-    //hammer or kokiri sword
+    // hammer or kokiri sword
     ED_SHORT_JUMPSLASH,
     ED_MASTER_SWORD_JUMPSLASH,
-    //sticks or BGS
+    // sticks or BGS
     ED_LONG_JUMPSLASH,
     ED_BOMB_THROW,
     ED_BOOMERANG,
@@ -5773,7 +6538,7 @@ typedef enum {
     WL_MID,
     WL_HIGH,
     WL_LOW_OR_MID,
-    WL_HIGH_OR_MID
+    WL_HIGH_OR_MID,
 } RandoWaterLevel;
 
 #define ENTRANCE_GROTTO_LOAD_START 0x0700
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index b8d435fd8d..da05ee5081 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -113,23 +113,20 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRandomizerCheck() != RC_UNKNOWN_CHECK) &&
             (location.GetQuest() == RCQUEST_BOTH ||
              location.GetQuest() == RCQUEST_MQ &&
-                 ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_SET_NUMBER &&
+                 ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) ==
+                           RO_MQ_DUNGEONS_SET_NUMBER &&
                        (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonCount"), 12) > 0) || // at least one MQ dungeon
-                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) == RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
+                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) ==
+                       RO_MQ_DUNGEONS_RANDOM_NUMBER)) ||
              location.GetQuest() == RCQUEST_VANILLA &&
-                 (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) != RO_MQ_DUNGEONS_SET_NUMBER ||
+                 (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE) !=
+                      RO_MQ_DUNGEONS_SET_NUMBER ||
                   CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeonCount"), 12) < 12) // at least one vanilla dungeon
              ) &&
-            (
-                location.GetRCType() != RCTYPE_SHOP ||
-                !(
-                    ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
-                    (
-                        ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
-                        ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)
-                    )
-                )
-            ) &&
+            (location.GetRCType() != RCTYPE_SHOP ||
+             !(ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF) ||
+               (ctx->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_SPECIFIC_COUNT) &&
+                ctx->GetOption(RSK_SHOPSANITY_COUNT).Is(RO_SHOPSANITY_COUNT_ZERO_ITEMS)))) &&
             (location.GetRCType() != RCTYPE_SCRUB ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleScrubs"), RO_SCRUBS_OFF) != RO_SCRUBS_OFF ||
              location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO ||
@@ -137,10 +134,13 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              location.GetRandomizerCheck() ==
                  RC_LW_DEKU_SCRUB_NEAR_BRIDGE) && // The 3 scrubs that are always randomized
             (location.GetRCType() != RCTYPE_MERCHANT ||
-             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_OFF) != RO_SHUFFLE_MERCHANTS_OFF) &&
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), RO_SHUFFLE_MERCHANTS_OFF) !=
+                 RO_SHUFFLE_MERCHANTS_OFF) &&
             (location.GetRCType() != RCTYPE_SONG_LOCATION ||
-             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_SONG_LOCATIONS) !=
-                 RO_SONG_SHUFFLE_SONG_LOCATIONS) && // song locations
+             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_SONG_LOCATIONS) !=
+                  RO_SONG_SHUFFLE_SONG_LOCATIONS &&
+              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleSongs"), RO_SONG_SHUFFLE_SONG_LOCATIONS) !=
+                  RO_SONG_SHUFFLE_OFF)) && // song locations
             ((location.GetRCType() != RCTYPE_BOSS_HEART_OR_OTHER_REWARD &&
               location.GetRandomizerCheck() != RC_SONG_FROM_IMPA &&
               location.GetRandomizerCheck() != RC_SHEIK_IN_ICE_CAVERN) ||
@@ -152,27 +152,45 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRCType() != RCTYPE_OCARINA ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_NO)) && // ocarina locations
             (location.GetRandomizerCheck() != RC_HC_ZELDAS_LETTER) && // don't show until we support shuffling letter
-            (location.GetRCType() != RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
-            (location.GetRCType() != RCTYPE_STATIC_HINT) && // don't show static hints
+            (location.GetRCType() !=
+             RCTYPE_GOSSIP_STONE) && // don't show gossip stones (maybe gossipsanity will be a thing eventually?)
+            (location.GetRCType() != RCTYPE_STATIC_HINT) &&  // don't show static hints
             (location.GetRCType() != RCTYPE_LINKS_POCKET) && // links pocket can be set to nothing if needed
             (location.GetRCType() !=
              RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them
             (location.GetRCType() != RCTYPE_SKULL_TOKEN ||
              (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF) == RO_TOKENSANITY_ALL) ||
-             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF) == RO_TOKENSANITY_OVERWORLD) &&
+             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF) ==
+               RO_TOKENSANITY_OVERWORLD) &&
               RandomizerCheckObjects::AreaIsOverworld(location.GetArea())) ||
-             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
+             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleTokens"), RO_TOKENSANITY_OFF) ==
+               RO_TOKENSANITY_DUNGEONS) &&
               RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
             (location.GetRCType() != RCTYPE_FREESTANDING ||
-             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) == RO_SHUFFLE_FREESTANDING_ALL) ||
-             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) == RO_SHUFFLE_FREESTANDING_OVERWORLD) &&
+             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) ==
+              RO_SHUFFLE_FREESTANDING_ALL) ||
+             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) ==
+               RO_SHUFFLE_FREESTANDING_OVERWORLD) &&
               RandomizerCheckObjects::AreaIsOverworld(location.GetArea())) ||
-             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) == RO_SHUFFLE_FREESTANDING_DUNGEONS) &&
+             ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) ==
+               RO_SHUFFLE_FREESTANDING_DUNGEONS) &&
               RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
-            (location.GetRCType() != RCTYPE_BEEHIVE || CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_NO)) &&
-            (location.GetRCType() != RCTYPE_COW || CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_NO)) &&
-            (location.GetRCType() != RCTYPE_POT || CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShufflePots"), RO_GENERIC_NO)) &&
-            (location.GetRCType() != RCTYPE_FISH || ctx->GetFishsanity()->GetFishLocationIncluded(&location, FSO_SOURCE_CVARS)) &&
+            (location.GetRCType() != RCTYPE_BEEHIVE ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_COW ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCows"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_POT ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShufflePots"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_GRASS ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGrass"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_CRATE ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCrates"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_NLCRATE ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCrates"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_SMALL_CRATE ||
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleCrates"), RO_GENERIC_NO)) &&
+            (location.GetRCType() != RCTYPE_FISH ||
+             ctx->GetFishsanity()->GetFishLocationIncluded(&location, FSO_SOURCE_CVARS)) &&
             (location.GetRCType() != RCTYPE_ADULT_TRADE ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleAdultTrade"), RO_GENERIC_NO)) &&
             (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||
@@ -191,7 +209,8 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("StartingMapsCompasses"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
                  RO_DUNGEON_ITEM_LOC_VANILLA) &&
             (location.GetRCType() != RCTYPE_SMALL_KEY ||
-             CVarGetInteger(CVAR_RANDOMIZER_SETTING("Keysanity"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) != RO_DUNGEON_ITEM_LOC_VANILLA) &&
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("Keysanity"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
+                 RO_DUNGEON_ITEM_LOC_VANILLA) &&
             (location.GetRCType() != RCTYPE_BOSS_KEY ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("BossKeysanity"), RO_DUNGEON_ITEM_LOC_OWN_DUNGEON) !=
                  RO_DUNGEON_ITEM_LOC_VANILLA) &&
@@ -214,18 +233,23 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
             (location.GetRandomizerCheck() != RC_KAK_100_GOLD_SKULLTULA_REWARD ||
              CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_VANILLA) !=
                  RO_GANON_BOSS_KEY_KAK_TOKENS) && // 100 skull reward ganon boss key
-            (location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_GF_GERUDO_MEMBERSHIP_CARD ||
-             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) == RO_GF_CARPENTERS_FREE &&
-              location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_GF_GERUDO_MEMBERSHIP_CARD) ||
-             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) == RO_GF_CARPENTERS_FAST &&
-              ((location.GetRandomizerCheck() == RC_GF_GERUDO_MEMBERSHIP_CARD &&
+            (location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_TH_FREED_CARPENTERS ||
+             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) ==
+                  RO_GF_CARPENTERS_FREE &&
+              location.GetRCType() != RCTYPE_GF_KEY && location.GetRandomizerCheck() != RC_TH_FREED_CARPENTERS) ||
+             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) ==
+                  RO_GF_CARPENTERS_FAST &&
+              ((location.GetRandomizerCheck() == RC_TH_FREED_CARPENTERS &&
                 CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), RO_GENERIC_NO) == RO_GENERIC_YES) ||
-               (location.GetRandomizerCheck() == RC_GF_NORTH_F1_CARPENTER &&
-                CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA))) ||
-             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) == RO_GF_CARPENTERS_NORMAL &&
-              ((location.GetRandomizerCheck() == RC_GF_GERUDO_MEMBERSHIP_CARD &&
+               (location.GetRandomizerCheck() == RC_TH_1_TORCH_CARPENTER &&
+                CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) !=
+                    RO_GERUDO_KEYS_VANILLA))) ||
+             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) ==
+                  RO_GF_CARPENTERS_NORMAL &&
+              ((location.GetRandomizerCheck() == RC_TH_FREED_CARPENTERS &&
                 CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), RO_GENERIC_NO) == RO_GENERIC_YES) ||
                (location.GetRCType() == RCTYPE_GF_KEY &&
-                CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA)))));
+                CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) !=
+                    RO_GERUDO_KEYS_VANILLA)))));
     }
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
index 6ab5b8314a..7a7e605bba 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
@@ -7,11 +7,11 @@
 #include <map>
 
 namespace RandomizerCheckObjects {
-    bool AreaIsDungeon(RandomizerCheckArea area);
-    bool AreaIsOverworld(RandomizerCheckArea area);
-    std::string GetRCAreaName(RandomizerCheckArea area);
-    std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> GetAllRCObjectsByArea();
-    std::map<SceneID, RandomizerCheckArea> GetAllRCAreaBySceneID();
-    RandomizerCheckArea GetRCAreaBySceneID(SceneID sceneId);
-    void UpdateImGuiVisibility();
-}
+bool AreaIsDungeon(RandomizerCheckArea area);
+bool AreaIsOverworld(RandomizerCheckArea area);
+std::string GetRCAreaName(RandomizerCheckArea area);
+std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> GetAllRCObjectsByArea();
+std::map<SceneID, RandomizerCheckArea> GetAllRCAreaBySceneID();
+RandomizerCheckArea GetRCAreaBySceneID(SceneID sceneId);
+void UpdateImGuiVisibility();
+} // namespace RandomizerCheckObjects
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index e3b07b672b..d460c6daf6 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -7,10 +7,15 @@
 #include "soh/SaveManager.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "dungeon.h"
+#include "entrance.h"
 #include "location_access.h"
+#include "3drando/fill.hpp"
+#include "soh/Enhancements/debugger/performanceTimer.h"
 
 #include <string>
+#include <sstream>
 #include <vector>
 #include <set>
 #include <libultraship/libultraship.h>
@@ -46,6 +51,7 @@ bool showBeans;
 bool showScrubs;
 bool showMajorScrubs;
 bool showMerchants;
+bool showSongs;
 bool showBeehives;
 bool showCows;
 bool showOverworldFreestanding;
@@ -58,6 +64,10 @@ bool showWeirdEgg;
 bool showGerudoCard;
 bool showOverworldPots;
 bool showDungeonPots;
+bool showOverworldGrass;
+bool showDungeonGrass;
+bool showOverworldCrates;
+bool showDungeonCrates;
 bool showFrogSongRupees;
 bool showFairies;
 bool showStartingMapsCompasses;
@@ -79,30 +89,36 @@ bool fishsanityAgeSplit;
 bool initialized;
 bool doAreaScroll;
 bool previousShowHidden = false;
-bool hideShopUnshuffledChecks = true;
+bool hideShopUnshuffledChecks = false;
 bool alwaysShowGS = false;
 
-std::map<uint32_t, RandomizerCheck> startingShopItem = { { SCENE_KOKIRI_SHOP, RC_KF_SHOP_ITEM_1 },
-                                                         { SCENE_BAZAAR, RC_MARKET_BAZAAR_ITEM_1 },
-                                                         { SCENE_POTION_SHOP_MARKET, RC_MARKET_POTION_SHOP_ITEM_1 },
-                                                         { SCENE_BOMBCHU_SHOP, RC_MARKET_BOMBCHU_SHOP_ITEM_1 },
-                                                         { SCENE_POTION_SHOP_KAKARIKO, RC_KAK_POTION_SHOP_ITEM_1 },
-                                                         { SCENE_ZORA_SHOP, RC_ZD_SHOP_ITEM_1 },
-                                                         { SCENE_GORON_SHOP, RC_GC_SHOP_ITEM_1 } };
+static bool presetLoaded = false;
+static ImVec2 presetPos;
+static ImVec2 presetSize;
+
+std::map<uint32_t, RandomizerCheck> startingShopItem = {
+    { SCENE_KOKIRI_SHOP, RC_KF_SHOP_ITEM_1 },
+    { SCENE_BAZAAR, RC_MARKET_BAZAAR_ITEM_1 },
+    { SCENE_POTION_SHOP_MARKET, RC_MARKET_POTION_SHOP_ITEM_1 },
+    { SCENE_BOMBCHU_SHOP, RC_MARKET_BOMBCHU_SHOP_ITEM_1 },
+    { SCENE_POTION_SHOP_KAKARIKO, RC_KAK_POTION_SHOP_ITEM_1 },
+    { SCENE_ZORA_SHOP, RC_ZD_SHOP_ITEM_1 },
+    { SCENE_GORON_SHOP, RC_GC_SHOP_ITEM_1 },
+};
 
 std::map<SceneID, RandomizerCheckArea> DungeonRCAreasBySceneID = {
-    {SCENE_DEKU_TREE,              RCAREA_DEKU_TREE},
-    {SCENE_DODONGOS_CAVERN,        RCAREA_DODONGOS_CAVERN},
-    {SCENE_JABU_JABU,              RCAREA_JABU_JABUS_BELLY},
-    {SCENE_FOREST_TEMPLE,          RCAREA_FOREST_TEMPLE},
-    {SCENE_FIRE_TEMPLE,            RCAREA_FIRE_TEMPLE},
-    {SCENE_WATER_TEMPLE,           RCAREA_WATER_TEMPLE},
-    {SCENE_SHADOW_TEMPLE,          RCAREA_SHADOW_TEMPLE},
-    {SCENE_SPIRIT_TEMPLE,          RCAREA_SPIRIT_TEMPLE},
-    {SCENE_BOTTOM_OF_THE_WELL,     RCAREA_BOTTOM_OF_THE_WELL},
-    {SCENE_ICE_CAVERN,             RCAREA_ICE_CAVERN},
-    {SCENE_GERUDO_TRAINING_GROUND, RCAREA_GERUDO_TRAINING_GROUND},
-    {SCENE_INSIDE_GANONS_CASTLE,   RCAREA_GANONS_CASTLE},
+    { SCENE_DEKU_TREE, RCAREA_DEKU_TREE },
+    { SCENE_DODONGOS_CAVERN, RCAREA_DODONGOS_CAVERN },
+    { SCENE_JABU_JABU, RCAREA_JABU_JABUS_BELLY },
+    { SCENE_FOREST_TEMPLE, RCAREA_FOREST_TEMPLE },
+    { SCENE_FIRE_TEMPLE, RCAREA_FIRE_TEMPLE },
+    { SCENE_WATER_TEMPLE, RCAREA_WATER_TEMPLE },
+    { SCENE_SHADOW_TEMPLE, RCAREA_SHADOW_TEMPLE },
+    { SCENE_SPIRIT_TEMPLE, RCAREA_SPIRIT_TEMPLE },
+    { SCENE_BOTTOM_OF_THE_WELL, RCAREA_BOTTOM_OF_THE_WELL },
+    { SCENE_ICE_CAVERN, RCAREA_ICE_CAVERN },
+    { SCENE_GERUDO_TRAINING_GROUND, RCAREA_GERUDO_TRAINING_GROUND },
+    { SCENE_INSIDE_GANONS_CASTLE, RCAREA_GANONS_CASTLE },
 };
 
 // Dungeon entrances with obvious visual differences between MQ and vanilla qualifying as spoiling on sight
@@ -119,19 +135,21 @@ std::vector<uint32_t> spoilingEntrances = {
     ENTR_SHADOW_TEMPLE_BOSS_DOOR,
     ENTR_ICE_CAVERN_ENTRANCE,
     ENTR_GERUDO_TRAINING_GROUND_ENTRANCE,
-    ENTR_INSIDE_GANONS_CASTLE_ENTRANCE
+    ENTR_INSIDE_GANONS_CASTLE_ENTRANCE,
 };
 
 std::map<RandomizerCheckArea, std::vector<RandomizerCheck>> checksByArea;
 bool areasFullyChecked[RCAREA_INVALID];
 u32 areasSpoiled = 0;
 bool showVOrMQ;
-s8 areaChecksGotten[RCAREA_INVALID]; //|     "Kokiri Forest (4/9)"
-s8 areaCheckTotals[RCAREA_INVALID];
+s16 areaChecksGotten[RCAREA_INVALID]; //|     "Kokiri Forest (4/9)"
+s16 areaChecksAvailable[RCAREA_INVALID];
+s16 areaCheckTotals[RCAREA_INVALID];
 uint16_t totalChecks = 0;
+uint16_t totalChecksAvailable = 0;
 uint16_t totalChecksGotten = 0;
 bool optCollapseAll; // A bool that will collapse all checks once
-bool optExpandAll;       // A bool that will expand all checks once
+bool optExpandAll;   // A bool that will expand all checks once
 RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK;
 RandomizerCheckArea previousArea = RCAREA_INVALID;
 RandomizerCheckArea currentArea = RCAREA_INVALID;
@@ -161,62 +179,78 @@ bool hideCollected = false;
 bool showHidden = true;
 bool mystery = false;
 bool showLogicTooltip = false;
+bool enableAvailableChecks = false;
+bool onlyShowAvailable = false;
 
 SceneID DungeonSceneLookupByArea(RandomizerCheckArea area) {
     switch (area) {
-        case RCAREA_DEKU_TREE:              return SCENE_DEKU_TREE;
-        case RCAREA_DODONGOS_CAVERN:        return SCENE_DODONGOS_CAVERN;
-        case RCAREA_JABU_JABUS_BELLY:       return SCENE_JABU_JABU;
-        case RCAREA_FOREST_TEMPLE:          return SCENE_FOREST_TEMPLE;
-        case RCAREA_FIRE_TEMPLE:            return SCENE_FIRE_TEMPLE;
-        case RCAREA_WATER_TEMPLE:           return SCENE_WATER_TEMPLE;
-        case RCAREA_SPIRIT_TEMPLE:          return SCENE_SPIRIT_TEMPLE;
-        case RCAREA_SHADOW_TEMPLE:          return SCENE_SHADOW_TEMPLE;
-        case RCAREA_BOTTOM_OF_THE_WELL:     return SCENE_BOTTOM_OF_THE_WELL;
-        case RCAREA_ICE_CAVERN:             return SCENE_ICE_CAVERN;
-        case RCAREA_GERUDO_TRAINING_GROUND: return SCENE_GERUDO_TRAINING_GROUND;
-        case RCAREA_GANONS_CASTLE:          return SCENE_INSIDE_GANONS_CASTLE;
-        default:                            return SCENE_ID_MAX;
+        case RCAREA_DEKU_TREE:
+            return SCENE_DEKU_TREE;
+        case RCAREA_DODONGOS_CAVERN:
+            return SCENE_DODONGOS_CAVERN;
+        case RCAREA_JABU_JABUS_BELLY:
+            return SCENE_JABU_JABU;
+        case RCAREA_FOREST_TEMPLE:
+            return SCENE_FOREST_TEMPLE;
+        case RCAREA_FIRE_TEMPLE:
+            return SCENE_FIRE_TEMPLE;
+        case RCAREA_WATER_TEMPLE:
+            return SCENE_WATER_TEMPLE;
+        case RCAREA_SPIRIT_TEMPLE:
+            return SCENE_SPIRIT_TEMPLE;
+        case RCAREA_SHADOW_TEMPLE:
+            return SCENE_SHADOW_TEMPLE;
+        case RCAREA_BOTTOM_OF_THE_WELL:
+            return SCENE_BOTTOM_OF_THE_WELL;
+        case RCAREA_ICE_CAVERN:
+            return SCENE_ICE_CAVERN;
+        case RCAREA_GERUDO_TRAINING_GROUND:
+            return SCENE_GERUDO_TRAINING_GROUND;
+        case RCAREA_GANONS_CASTLE:
+            return SCENE_INSIDE_GANONS_CASTLE;
+        default:
+            return SCENE_ID_MAX;
     }
 }
 
-Color_RGBA8 Color_Bg_Default                        = {   0,   0,   0, 255 };   // Black
-Color_RGBA8 Color_Main_Default                      = { 255, 255, 255, 255 };   // White
-Color_RGBA8 Color_Area_Incomplete_Extra_Default     = { 255, 255, 255, 255 };   // White
-Color_RGBA8 Color_Area_Complete_Extra_Default       = { 255, 255, 255, 255 };   // White
-Color_RGBA8 Color_Unchecked_Extra_Default           = { 255, 255, 255, 255 };   // White
-Color_RGBA8 Color_Skipped_Main_Default              = { 160, 160, 160, 255 };   // Grey
-Color_RGBA8 Color_Skipped_Extra_Default             = { 160, 160, 160, 255 };   // Grey
-Color_RGBA8 Color_Seen_Extra_Default                = { 255, 255, 255, 255 };   // TODO
-Color_RGBA8 Color_Hinted_Extra_Default              = { 255, 255, 255, 255 };   // TODO
-Color_RGBA8 Color_Collected_Extra_Default           = { 242, 101,  34, 255 };   // Orange
-Color_RGBA8 Color_Scummed_Extra_Default             = {   0, 174, 239, 255 };   // Blue
-Color_RGBA8 Color_Saved_Extra_Default               = {   0, 185,   0, 255 };   // Green
+Color_RGBA8 Color_Bg_Default = { 0, 0, 0, 255 };                          // Black
+Color_RGBA8 Color_Main_Default = { 255, 255, 255, 255 };                  // White
+Color_RGBA8 Color_Area_Incomplete_Extra_Default = { 255, 255, 255, 255 }; // White
+Color_RGBA8 Color_Area_Complete_Extra_Default = { 255, 255, 255, 255 };   // White
+Color_RGBA8 Color_Unchecked_Extra_Default = { 255, 255, 255, 255 };       // White
+Color_RGBA8 Color_Skipped_Main_Default = { 160, 160, 160, 255 };          // Grey
+Color_RGBA8 Color_Skipped_Extra_Default = { 160, 160, 160, 255 };         // Grey
+Color_RGBA8 Color_Seen_Extra_Default = { 255, 255, 255, 255 };            // TODO
+Color_RGBA8 Color_Hinted_Extra_Default = { 255, 255, 255, 255 };          // TODO
+Color_RGBA8 Color_Collected_Extra_Default = { 242, 101, 34, 255 };        // Orange
+Color_RGBA8 Color_Scummed_Extra_Default = { 0, 174, 239, 255 };           // Blue
+Color_RGBA8 Color_Saved_Extra_Default = { 0, 185, 0, 255 };               // Green
 
 Color_RGBA8 Color_Background = { 0, 0, 0, 255 };
 
-Color_RGBA8 Color_Area_Incomplete_Main  = { 255, 255, 255, 255 }; // White
+Color_RGBA8 Color_Area_Incomplete_Main = { 255, 255, 255, 255 };  // White
 Color_RGBA8 Color_Area_Incomplete_Extra = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Area_Complete_Main    = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Area_Complete_Extra   = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Unchecked_Main        = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Unchecked_Extra       = { 255, 255, 255, 255 }; // Useless
-Color_RGBA8 Color_Skipped_Main          = { 160, 160, 160, 255 }; // Grey
-Color_RGBA8 Color_Skipped_Extra         = { 160, 160, 160, 255 }; // Grey
-Color_RGBA8 Color_Seen_Main             = { 255, 255, 255, 255 }; // TODO
-Color_RGBA8 Color_Seen_Extra            = { 160, 160, 160, 255 }; // TODO
-Color_RGBA8 Color_Hinted_Main           = { 255, 255, 255, 255 }; // TODO
-Color_RGBA8 Color_Hinted_Extra          = { 255, 255, 255, 255 }; // TODO
-Color_RGBA8 Color_Collected_Main        = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Collected_Extra       = { 242, 101,  34, 255 }; // Orange
-Color_RGBA8 Color_Scummed_Main          = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Scummed_Extra         = {   0, 174, 239, 255 }; // Blue
-Color_RGBA8 Color_Saved_Main            = { 255, 255, 255, 255 }; // White
-Color_RGBA8 Color_Saved_Extra           = {   0, 185,   0, 255 }; // Green
+Color_RGBA8 Color_Area_Complete_Main = { 255, 255, 255, 255 };    // White
+Color_RGBA8 Color_Area_Complete_Extra = { 255, 255, 255, 255 };   // White
+Color_RGBA8 Color_Unchecked_Main = { 255, 255, 255, 255 };        // White
+Color_RGBA8 Color_Unchecked_Extra = { 255, 255, 255, 255 };       // Useless
+Color_RGBA8 Color_Skipped_Main = { 160, 160, 160, 255 };          // Grey
+Color_RGBA8 Color_Skipped_Extra = { 160, 160, 160, 255 };         // Grey
+Color_RGBA8 Color_Seen_Main = { 255, 255, 255, 255 };             // TODO
+Color_RGBA8 Color_Seen_Extra = { 160, 160, 160, 255 };            // TODO
+Color_RGBA8 Color_Hinted_Main = { 255, 255, 255, 255 };           // TODO
+Color_RGBA8 Color_Hinted_Extra = { 255, 255, 255, 255 };          // TODO
+Color_RGBA8 Color_Collected_Main = { 255, 255, 255, 255 };        // White
+Color_RGBA8 Color_Collected_Extra = { 242, 101, 34, 255 };        // Orange
+Color_RGBA8 Color_Scummed_Main = { 255, 255, 255, 255 };          // White
+Color_RGBA8 Color_Scummed_Extra = { 0, 174, 239, 255 };           // Blue
+Color_RGBA8 Color_Saved_Main = { 255, 255, 255, 255 };            // White
+Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 };               // Green
 
 std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP,   BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
                                   BTN_Z, BTN_R, BTN_START, BTN_DUP,   BTN_DDOWN, BTN_DLEFT,  BTN_DRIGHT };
 static ImGuiTextFilter checkSearch;
+static bool recalculateAvailable = false;
 std::array<bool, RCAREA_INVALID> filterAreasHidden = { 0 };
 std::array<bool, RC_MAX> filterChecksHidden = { 0 };
 
@@ -230,10 +264,12 @@ void TrySetAreas() {
 
 void CalculateTotals() {
     totalChecks = 0;
+    totalChecksAvailable = 0;
     totalChecksGotten = 0;
 
     for (uint8_t i = 0; i < RCAREA_INVALID; i++) {
         totalChecks += areaCheckTotals[i];
+        totalChecksAvailable += areaChecksAvailable[i];
         totalChecksGotten += areaChecksGotten[i];
     }
 }
@@ -246,23 +282,45 @@ uint16_t GetTotalChecksGotten() {
     return totalChecksGotten;
 }
 
+bool IsCheckHidden(RandomizerCheck rc) {
+    Rando::ItemLocation* itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
+    RandomizerCheckStatus status = itemLocation->GetCheckStatus();
+    bool available = itemLocation->IsAvailable();
+    bool skipped = itemLocation->GetIsSkipped();
+    bool obtained = itemLocation->HasObtained();
+    bool seen = status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED;
+    bool scummed = status == RCSHOW_SCUMMED;
+    bool unchecked = status == RCSHOW_UNCHECKED;
+
+    return !showHidden &&
+           ((skipped && hideSkipped) || (seen && hideSeen) || (scummed && hideScummed) || (unchecked && hideUnchecked));
+}
+
 void RecalculateAreaTotals(RandomizerCheckArea rcArea) {
     areaChecksGotten[rcArea] = 0;
+    areaChecksAvailable[rcArea] = 0;
     areaCheckTotals[rcArea] = 0;
     for (auto rc : checksByArea.at(rcArea)) {
         if (!IsVisibleInCheckTracker(rc)) {
             continue;
         }
         areaCheckTotals[rcArea]++;
-        if (OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped() || OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->HasObtained()) {
+
+        Rando::ItemLocation* itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
+
+        if (itemLoc->GetIsSkipped() || itemLoc->HasObtained()) {
             areaChecksGotten[rcArea]++;
         }
+
+        if (itemLoc->IsAvailable() && !IsCheckHidden(rc)) {
+            areaChecksAvailable[rcArea]++;
+        }
     }
     CalculateTotals();
 }
 
 std::map<RandomizerGet, RandomizerCheckArea> MapRGtoRandomizerCheckArea = {
-    { RG_DEKU_TREE_MAP, RCAREA_DEKU_TREE},
+    { RG_DEKU_TREE_MAP, RCAREA_DEKU_TREE },
     { RG_DODONGOS_CAVERN_MAP, RCAREA_DODONGOS_CAVERN },
     { RG_JABU_JABUS_BELLY_MAP, RCAREA_JABU_JABUS_BELLY },
     { RG_FOREST_TEMPLE_MAP, RCAREA_FOREST_TEMPLE },
@@ -303,6 +361,7 @@ void SetCheckCollected(RandomizerCheck rc) {
     if (IsVisibleInCheckTracker(rc)) {
         if (!OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped()) {
             areaChecksGotten[loc->GetArea()]++;
+            areaChecksAvailable[loc->GetArea()]--;
         } else {
             OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
         }
@@ -364,33 +423,19 @@ bool IsAreaScene(SceneID sceneNum) {
 }
 
 RandomizerCheckArea AreaFromEntranceGroup[] = {
-    RCAREA_INVALID,
-    RCAREA_KOKIRI_FOREST,
-    RCAREA_LOST_WOODS,
-    RCAREA_SACRED_FOREST_MEADOW,
-    RCAREA_KAKARIKO_VILLAGE,
-    RCAREA_GRAVEYARD,
-    RCAREA_DEATH_MOUNTAIN_TRAIL,
-    RCAREA_DEATH_MOUNTAIN_CRATER,
-    RCAREA_GORON_CITY,
-    RCAREA_ZORAS_RIVER,
-    RCAREA_ZORAS_DOMAIN,
-    RCAREA_ZORAS_FOUNTAIN,
-    RCAREA_HYRULE_FIELD,
-    RCAREA_LON_LON_RANCH,
-    RCAREA_LAKE_HYLIA,
-    RCAREA_GERUDO_VALLEY,
-    RCAREA_GERUDO_FORTRESS,
-    RCAREA_WASTELAND,
-    RCAREA_DESERT_COLOSSUS,
-    RCAREA_MARKET,
+    RCAREA_INVALID,          RCAREA_KOKIRI_FOREST, RCAREA_LOST_WOODS,           RCAREA_SACRED_FOREST_MEADOW,
+    RCAREA_KAKARIKO_VILLAGE, RCAREA_GRAVEYARD,     RCAREA_DEATH_MOUNTAIN_TRAIL, RCAREA_DEATH_MOUNTAIN_CRATER,
+    RCAREA_GORON_CITY,       RCAREA_ZORAS_RIVER,   RCAREA_ZORAS_DOMAIN,         RCAREA_ZORAS_FOUNTAIN,
+    RCAREA_HYRULE_FIELD,     RCAREA_LON_LON_RANCH, RCAREA_LAKE_HYLIA,           RCAREA_GERUDO_VALLEY,
+    RCAREA_GERUDO_FORTRESS,  RCAREA_WASTELAND,     RCAREA_DESERT_COLOSSUS,      RCAREA_MARKET,
     RCAREA_HYRULE_CASTLE,
 };
 
 RandomizerCheckArea GetCheckArea() {
     auto scene = static_cast<SceneID>(gPlayState->sceneNum);
     bool grottoScene = (scene == SCENE_GROTTOS || scene == SCENE_FAIRYS_FOUNTAIN);
-    const EntranceData* ent = GetEntranceData(grottoScene ? ENTRANCE_GROTTO_EXIT_START + GetCurrentGrottoId() : gSaveContext.entranceIndex);
+    const EntranceData* ent =
+        GetEntranceData(grottoScene ? ENTRANCE_GROTTO_EXIT_START + GetCurrentGrottoId() : gSaveContext.entranceIndex);
     RandomizerCheckArea area = RCAREA_INVALID;
     if (ent != nullptr && !IsAreaScene(scene) && ent->type != ENTRANCE_TYPE_DUNGEON) {
         if (ent->source == "Desert Colossus" || ent->destination == "Desert Colossus") {
@@ -400,7 +445,8 @@ RandomizerCheckArea GetCheckArea() {
         }
     }
     if (area == RCAREA_INVALID) {
-        if (grottoScene && (GetCurrentGrottoId() == -1) && (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) == RO_GENERIC_OFF)) {
+        if (grottoScene && (GetCurrentGrottoId() == -1) &&
+            (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) == RO_GENERIC_OFF)) {
             area = previousArea;
         } else {
             area = RandomizerCheckObjects::GetRCAreaBySceneID(scene);
@@ -413,16 +459,24 @@ bool vector_contains_scene(std::vector<SceneID> vec, const int16_t scene) {
     return std::any_of(vec.begin(), vec.end(), [&](const auto& x) { return x == scene; });
 }
 
-std::vector<SceneID> skipScenes = {SCENE_GANON_BOSS, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, SCENE_GANON_BOSS, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR};
+std::vector<SceneID> skipScenes = {
+    SCENE_GANON_BOSS,
+    SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR,
+    SCENE_GANON_BOSS,
+    SCENE_INSIDE_GANONS_CASTLE_COLLAPSE,
+    SCENE_GANONS_TOWER_COLLAPSE_INTERIOR,
+};
 
 void ClearAreaChecksAndTotals() {
     for (auto& [rcArea, vec] : checksByArea) {
         vec.clear();
         areaChecksGotten[rcArea] = 0;
+        areaChecksAvailable[rcArea] = 0;
         areaCheckTotals[rcArea] = 0;
     }
     totalChecks = 0;
     totalChecksGotten = 0;
+    totalChecksAvailable = 0;
 }
 
 void SetShopSeen(uint32_t sceneNum, bool prices) {
@@ -464,6 +518,9 @@ void CheckTrackerLoadGame(int32_t fileNum) {
             if (loc->GetCheckStatus() == RCSHOW_SAVED || loc->GetIsSkipped()) {
                 areaChecksGotten[entry2->GetArea()]++;
             }
+            if (loc->IsAvailable()) {
+                areaChecksAvailable[entry2->GetArea()]++;
+            }
         }
 
         if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea()) ||
@@ -472,7 +529,8 @@ void CheckTrackerLoadGame(int32_t fileNum) {
         }
 
         // Create check name overrides for child pond fish if age split is disabled
-        if (fishsanityMode != RO_FISHSANITY_OFF && fishsanityMode != RO_FISHSANITY_OVERWORLD && entry.GetRCType() == RCTYPE_FISH && entry.GetScene() == SCENE_FISHING_POND &&
+        if (fishsanityMode != RO_FISHSANITY_OFF && fishsanityMode != RO_FISHSANITY_OVERWORLD &&
+            entry.GetRCType() == RCTYPE_FISH && entry.GetScene() == SCENE_FISHING_POND &&
             entry.GetActorParams() != 116 && !fishsanityAgeSplit) {
             if (entry.GetShortName().starts_with("Child")) {
                 checkNameOverrides[rc] = entry.GetShortName().substr(6);
@@ -480,15 +538,25 @@ void CheckTrackerLoadGame(int32_t fileNum) {
         }
     }
     for (int i = RCAREA_KOKIRI_FOREST; i < RCAREA_INVALID; i++) {
-        if (!IsAreaSpoiled(static_cast<RandomizerCheckArea>(i)) && (RandomizerCheckObjects::AreaIsOverworld(static_cast<RandomizerCheckArea>(i)) || !IS_RANDO ||
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE ||
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SELECTION ||
-            (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
-            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12))) {
+        if (!IsAreaSpoiled(static_cast<RandomizerCheckArea>(i)) &&
+            (RandomizerCheckObjects::AreaIsOverworld(static_cast<RandomizerCheckArea>(i)) || !IS_RANDO ||
+             OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE ||
+             (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) ==
+                  RO_MQ_DUNGEONS_SELECTION &&
+              OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(
+                  static_cast<RandomizerSettingKey>(RSK_MQ_DEKU_TREE + (i - RCAREA_DEKU_TREE))) != RO_MQ_SET_RANDOM) ||
+             (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_SET) == RO_GENERIC_ON &&
+              OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(
+                  static_cast<RandomizerSettingKey>(RSK_MQ_DEKU_TREE + (i - RCAREA_DEKU_TREE))) != RO_MQ_SET_RANDOM) ||
+             (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) ==
+                  RO_MQ_DUNGEONS_SET_NUMBER &&
+              (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12 ||
+               OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 0)))) {
             SetAreaSpoiled(static_cast<RandomizerCheckArea>(i));
         }
     }
-    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) {
+    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING &&
+        IS_RANDO) {
         uint8_t startingAge = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SELECTED_STARTING_AGE).Get();
         RandomizerCheckArea startingArea;
         switch (startingAge) {
@@ -508,13 +576,23 @@ void CheckTrackerLoadGame(int32_t fileNum) {
         areaCheckTotals[startingArea]++;
     }
 
-    showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_RANDOM_NUMBER ||
-                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12));
+    showVOrMQ =
+        (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) ==
+             RO_MQ_DUNGEONS_RANDOM_NUMBER ||
+         (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER &&
+          OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12));
     initialized = true;
     UpdateAllOrdering();
     UpdateInventoryChecks();
     UpdateFilters();
+
+    RegionTable_Init();
+
+    if (Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_ENTRANCES).Get()) {
+        Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides();
+    }
+
+    RecalculateAvailableChecks();
 }
 
 void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) {
@@ -530,6 +608,7 @@ void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) {
     if (status == RCSHOW_SEEN) {
         OTRGlobals::Instance->gRandoContext->GetItemLocation(slot)->SetCheckStatus(RCSHOW_IDENTIFIED);
         SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
+        RecalculateAvailableChecks();
     }
 }
 
@@ -551,7 +630,9 @@ void CheckTrackerTransition(uint32_t sceneNum) {
             SetShopSeen(sceneNum, false);
             break;
     }
-    if (!IsAreaSpoiled(currentArea) && (RandomizerCheckObjects::AreaIsOverworld(currentArea) || std::find(spoilingEntrances.begin(), spoilingEntrances.end(), gPlayState->nextEntranceIndex) != spoilingEntrances.end())) {
+    if (!IsAreaSpoiled(currentArea) && (RandomizerCheckObjects::AreaIsOverworld(currentArea) ||
+                                        std::find(spoilingEntrances.begin(), spoilingEntrances.end(),
+                                                  gPlayState->nextEntranceIndex) != spoilingEntrances.end())) {
         SetAreaSpoiled(currentArea);
     }
 }
@@ -566,7 +647,7 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) {
         if (giEntry.itemId == ITEM_SHIELD_DEKU) {
             SetCheckCollected(RC_KF_SHOP_ITEM_1);
             return;
-        }else if (giEntry.itemId == ITEM_KOKIRI_EMERALD) {
+        } else if (giEntry.itemId == ITEM_KOKIRI_EMERALD) {
             SetCheckCollected(RC_QUEEN_GOHMA);
             return;
         } else if (giEntry.itemId == ITEM_GORON_RUBY) {
@@ -605,34 +686,34 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) {
         } else if (giEntry.itemId == ITEM_BRACELET) {
             SetCheckCollected(RC_GC_DARUNIAS_JOY);
             return;
-        }/* else if (giEntry.itemId == ITEM_SONG_SUN) {
-            SetCheckCollected(RC_SONG_FROM_ROYAL_FAMILYS_TOMB);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_TIME) {
-            SetCheckCollected(RC_SONG_FROM_OCARINA_OF_TIME);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_STORMS) {
-            SetCheckCollected(RC_SONG_FROM_WINDMILL);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_MINUET) {
-            SetCheckCollected(RC_SHEIK_IN_FOREST);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_BOLERO) {
-            SetCheckCollected(RC_SHEIK_IN_CRATER);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_SERENADE) {
-            SetCheckCollected(RC_SHEIK_IN_ICE_CAVERN);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_NOCTURNE) {
-            SetCheckCollected(RC_SHEIK_IN_KAKARIKO);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_REQUIEM) {
-            SetCheckCollected(RC_SHEIK_AT_COLOSSUS);
-            return;
-        } else if (giEntry.itemId == ITEM_SONG_PRELUDE) {
-            SetCheckCollected(RC_SHEIK_AT_TEMPLE);
-            return;
-        }*/
+        } /* else if (giEntry.itemId == ITEM_SONG_SUN) {
+             SetCheckCollected(RC_SONG_FROM_ROYAL_FAMILYS_TOMB);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_TIME) {
+             SetCheckCollected(RC_SONG_FROM_OCARINA_OF_TIME);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_STORMS) {
+             SetCheckCollected(RC_SONG_FROM_WINDMILL);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_MINUET) {
+             SetCheckCollected(RC_SHEIK_IN_FOREST);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_BOLERO) {
+             SetCheckCollected(RC_SHEIK_IN_CRATER);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_SERENADE) {
+             SetCheckCollected(RC_SHEIK_IN_ICE_CAVERN);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_NOCTURNE) {
+             SetCheckCollected(RC_SHEIK_IN_KAKARIKO);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_REQUIEM) {
+             SetCheckCollected(RC_SHEIK_AT_COLOSSUS);
+             return;
+         } else if (giEntry.itemId == ITEM_SONG_PRELUDE) {
+             SetCheckCollected(RC_SHEIK_AT_TEMPLE);
+             return;
+         }*/
     }
 }
 
@@ -644,7 +725,8 @@ void CheckTrackerSceneFlagSet(int16_t sceneNum, int16_t flagType, int32_t flag)
     if (flagType != FLAG_SCENE_TREASURE && flagType != FLAG_SCENE_COLLECTIBLE) {
         return;
     }
-    if (sceneNum == SCENE_GRAVEYARD && flag == 0x19 && flagType == FLAG_SCENE_COLLECTIBLE) { // Gravedigging tour special case
+    if (sceneNum == SCENE_GRAVEYARD && flag == 0x19 &&
+        flagType == FLAG_SCENE_COLLECTIBLE) { // Gravedigging tour special case
         SetCheckCollected(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR);
         return;
     }
@@ -652,7 +734,9 @@ void CheckTrackerSceneFlagSet(int16_t sceneNum, int16_t flagType, int32_t flag)
         if (!IsVisibleInCheckTracker(loc.GetRandomizerCheck())) {
             continue;
         }
-        SpoilerCollectionCheckType checkMatchType = flagType == FLAG_SCENE_TREASURE ? SpoilerCollectionCheckType::SPOILER_CHK_CHEST : SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE;
+        SpoilerCollectionCheckType checkMatchType = flagType == FLAG_SCENE_TREASURE
+                                                        ? SpoilerCollectionCheckType::SPOILER_CHK_CHEST
+                                                        : SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE;
         Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck();
         if (scCheck.scene == sceneNum && scCheck.flag == flag && scCheck.type == checkMatchType) {
             SetCheckCollected(loc.GetRandomizerCheck());
@@ -673,9 +757,9 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
             break;
         case FLAG_EVENT_CHECK_INF:
             if ((flag == EVENTCHKINF_CARPENTERS_FREE(0) || flag == EVENTCHKINF_CARPENTERS_FREE(1) ||
-                 flag == EVENTCHKINF_CARPENTERS_FREE(2) || flag == EVENTCHKINF_CARPENTERS_FREE(3))
-                && GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
-                SetCheckCollected(RC_GF_GERUDO_MEMBERSHIP_CARD);
+                 flag == EVENTCHKINF_CARPENTERS_FREE(2) || flag == EVENTCHKINF_CARPENTERS_FREE(3)) &&
+                GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
+                SetCheckCollected(RC_TH_FREED_CARPENTERS);
                 return;
             }
             checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF;
@@ -732,16 +816,18 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
     for (auto& loc : Rando::StaticData::GetLocationTable()) {
         if ((!IS_RANDO && ((loc.GetQuest() == RCQUEST_MQ && !IS_MASTER_QUEST) ||
                            (loc.GetQuest() == RCQUEST_VANILLA && IS_MASTER_QUEST))) ||
-            (IS_RANDO && !(OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene()) == nullptr) &&
-                ((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
-                                loc.GetQuest() == RCQUEST_VANILLA) ||
-                          OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsVanilla() &&
-                                loc.GetQuest() == RCQUEST_MQ))) {
+            (IS_RANDO &&
+             !(OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene()) == nullptr) &&
+             ((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
+               loc.GetQuest() == RCQUEST_VANILLA) ||
+              OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsVanilla() &&
+                  loc.GetQuest() == RCQUEST_MQ))) {
             continue;
         }
         Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck();
         SpoilerCollectionCheckType scCheckType = scCheck.type;
-        if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF && scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF) {
+        if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF &&
+            scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF) {
             if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) {
                 SetCheckCollected(loc.GetRandomizerCheck());
                 return;
@@ -774,15 +860,15 @@ void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave) {
     }
     SaveManager::Instance->SaveArray("checkStatus", checkCount.size(), [&](size_t i) {
         RandomizerCheck check = checkCount.at(i);
-        RandomizerCheckStatus savedStatus = OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->GetCheckStatus();
+        RandomizerCheckStatus savedStatus =
+            OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->GetCheckStatus();
         bool isSkipped = OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->GetIsSkipped();
         if (savedStatus == RCSHOW_COLLECTED) {
             if (fullSave) {
                 OTRGlobals::Instance->gRandoContext->GetItemLocation(check)->SetCheckStatus(RCSHOW_SAVED);
                 savedStatus = RCSHOW_SAVED;
                 updateOrdering = true;
-            }
-            else {
+            } else {
                 savedStatus = RCSHOW_SCUMMED;
             }
         }
@@ -791,7 +877,7 @@ void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave) {
                 SaveManager::Instance->SaveData("randomizerCheck", check);
                 SaveManager::Instance->SaveData("status", savedStatus);
                 SaveManager::Instance->SaveData("skipped", isSkipped);
-                });
+            });
         }
     });
     SaveManager::Instance->SaveData("areasSpoiled", areasSpoiled);
@@ -803,6 +889,9 @@ void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave) {
 
 void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
     SaveTrackerData(saveContext, sectionID, fullSave);
+    if (fullSave) {
+        recalculateAvailable = true;
+    }
 }
 
 void LoadFile() {
@@ -816,8 +905,8 @@ void LoadFile() {
             SaveManager::Instance->LoadData("skipped", skipped, false);
             OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetCheckStatus(status);
             OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(skipped);
-            });
         });
+    });
     SaveManager::Instance->LoadData("areasSpoiled", areasSpoiled, (uint32_t)0);
     UpdateAllOrdering();
     UpdateAllAreas();
@@ -844,30 +933,74 @@ void SetAreaSpoiled(RandomizerCheckArea rcArea) {
 }
 
 void CheckTrackerWindow::DrawElement() {
+    Color_Background = CVarGetColor(CVAR_TRACKER_CHECK("BgColor.Value"), Color_Bg_Default);
+    Color_Area_Incomplete_Main = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.MainColor.Value"), Color_Main_Default);
+    Color_Area_Incomplete_Extra =
+        CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.ExtraColor.Value"), Color_Area_Incomplete_Extra_Default);
+    Color_Area_Complete_Main = CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.MainColor.Value"), Color_Main_Default);
+    Color_Area_Complete_Extra =
+        CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.ExtraColor.Value"), Color_Area_Complete_Extra_Default);
+    Color_Unchecked_Main = CVarGetColor(CVAR_TRACKER_CHECK("Unchecked.MainColor.Value"), Color_Main_Default);
+    Color_Unchecked_Extra =
+        CVarGetColor(CVAR_TRACKER_CHECK("Unchecked.ExtraColor.Value"), Color_Unchecked_Extra_Default);
+    Color_Skipped_Main = CVarGetColor(CVAR_TRACKER_CHECK("Skipped.MainColor.Value"), Color_Main_Default);
+    Color_Skipped_Extra = CVarGetColor(CVAR_TRACKER_CHECK("Skipped.ExtraColor.Value"), Color_Skipped_Extra_Default);
+    Color_Seen_Main = CVarGetColor(CVAR_TRACKER_CHECK("Seen.MainColor.Value"), Color_Main_Default);
+    Color_Seen_Extra = CVarGetColor(CVAR_TRACKER_CHECK("Seen.ExtraColor.Value"), Color_Seen_Extra_Default);
+    Color_Hinted_Main = CVarGetColor(CVAR_TRACKER_CHECK("Hinted.MainColor.Value"), Color_Main_Default);
+    Color_Hinted_Extra = CVarGetColor(CVAR_TRACKER_CHECK("Hinted.ExtraColor.Value"), Color_Hinted_Extra_Default);
+    Color_Collected_Main = CVarGetColor(CVAR_TRACKER_CHECK("Collected.MainColor.Value"), Color_Main_Default);
+    Color_Collected_Extra =
+        CVarGetColor(CVAR_TRACKER_CHECK("Collected.ExtraColor.Value"), Color_Collected_Extra_Default);
+    Color_Scummed_Main = CVarGetColor(CVAR_TRACKER_CHECK("Scummed.MainColor.Value"), Color_Main_Default);
+    Color_Scummed_Extra = CVarGetColor(CVAR_TRACKER_CHECK("Scummed.ExtraColor.Value"), Color_Scummed_Extra_Default);
+    Color_Saved_Main = CVarGetColor(CVAR_TRACKER_CHECK("Saved.MainColor.Value"), Color_Main_Default);
+    Color_Saved_Extra = CVarGetColor(CVAR_TRACKER_CHECK("Saved.ExtraColor.Value"), Color_Saved_Extra_Default);
+    hideUnchecked = CVarGetInteger(CVAR_TRACKER_CHECK("Unchecked.Hide"), 0);
+    hideScummed = CVarGetInteger(CVAR_TRACKER_CHECK("Scummed.Hide"), 0);
+    hideSeen = CVarGetInteger(CVAR_TRACKER_CHECK("Seen.Hide"), 0);
+    hideSkipped = CVarGetInteger(CVAR_TRACKER_CHECK("Skipped.Hide"), 0);
+    hideSaved = CVarGetInteger(CVAR_TRACKER_CHECK("Saved.Hide"), 0);
+    hideCollected = CVarGetInteger(CVAR_TRACKER_CHECK("Collected.Hide"), 0);
+    showHidden = CVarGetInteger(CVAR_TRACKER_CHECK("ShowHidden"), 0);
+    mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0);
+    showLogicTooltip = CVarGetInteger(CVAR_TRACKER_CHECK("ShowLogic"), 0);
+    enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0);
+    onlyShowAvailable = CVarGetInteger(CVAR_TRACKER_CHECK("OnlyShowAvailable"), 0);
+
+    hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 0);
+    alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0);
     if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
-        if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) && (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) {
+        if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) &&
+            (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) {
             return;
         }
 
         if (CVarGetInteger(CVAR_TRACKER_CHECK("DisplayType"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_COMBO_BUTTON) {
             int comboButton1Mask = buttons[CVarGetInteger(CVAR_TRACKER_CHECK("ComboButton1"), TRACKER_COMBO_BUTTON_L)];
             int comboButton2Mask = buttons[CVarGetInteger(CVAR_TRACKER_CHECK("ComboButton2"), TRACKER_COMBO_BUTTON_R)];
-            OSContPad* trackerButtonsPressed = std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
+            OSContPad* trackerButtonsPressed =
+                std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
             bool comboButtonsHeld = trackerButtonsPressed != nullptr &&
-                trackerButtonsPressed[0].button & comboButton1Mask &&
-                trackerButtonsPressed[0].button & comboButton2Mask;
+                                    trackerButtonsPressed[0].button & comboButton1Mask &&
+                                    trackerButtonsPressed[0].button & comboButton2Mask;
             if (!comboButtonsHeld) {
                 return;
             }
         }
     }
 
-    ImGui::SetNextWindowSize(ImVec2(400, 540), ImGuiCond_FirstUseEver);
-
+    if (presetLoaded) {
+        ImGui::SetNextWindowSize(presetSize);
+        ImGui::SetNextWindowPos(presetPos);
+        presetLoaded = false;
+    } else {
+        ImGui::SetNextWindowSize(ImVec2(400, 540), ImGuiCond_FirstUseEver);
+    }
     BeginFloatWindows("Check Tracker", mIsVisible, ImGuiWindowFlags_NoScrollbar);
 
     if (!GameInteractor::IsSaveLoaded() || !initialized) {
-        ImGui::Text("Waiting for file load..."); //TODO Language
+        ImGui::Text("Waiting for file load..."); // TODO Language
         EndFloatWindows();
         return;
     }
@@ -877,7 +1010,7 @@ void CheckTrackerWindow::DrawElement() {
         sceneId = (SceneID)gPlayState->sceneNum;
     }
 
-    //Quick Options
+    // Quick Options
 #ifdef __WIIU__
     float headerHeight = 40.0f;
 #else
@@ -892,38 +1025,63 @@ void CheckTrackerWindow::DrawElement() {
 
     ImGui::TableNextRow(0, headerHeight);
     ImGui::TableNextColumn();
-    UIWidgets::EnhancementCheckbox(
-        "Show Hidden Items", CVAR_TRACKER_CHECK("ShowHidden"), false,
-        "When active, items will show hidden checks by default when updated to this state.");
+    if (UIWidgets::CVarCheckbox(
+            "Show Hidden Items", CVAR_TRACKER_CHECK("ShowHidden"),
+            UIWidgets::CheckboxOptions(
+                { { .tooltip = "When active, items will show hidden checks by default when updated to this state." } })
+                .Color(THEME_COLOR))) {
+        doAreaScroll = true;
+        showHidden = CVarGetInteger(CVAR_TRACKER_CHECK("ShowHidden"), 0);
+        RecalculateAllAreaTotals();
+    }
+    if (enableAvailableChecks) {
+        if (UIWidgets::CVarCheckbox(
+                "Only Show Available Checks", CVAR_TRACKER_CHECK("OnlyShowAvailable"),
+                UIWidgets::CheckboxOptions({ { .tooltip = "When active, unavailable checks will be hidden." } })
+                    .Color(THEME_COLOR))) {
+            doAreaScroll = true;
+            RecalculateAllAreaTotals();
+        }
+    }
     UIWidgets::PaddedSeparator();
-    if (ImGui::Button("Expand All")) {
+    if (UIWidgets::Button("Expand All", UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
         optCollapseAll = false;
         optExpandAll = true;
         doAreaScroll = true;
     }
     ImGui::SameLine();
-    if (ImGui::Button("Collapse All")) {
+    if (UIWidgets::Button("Collapse All",
+                          UIWidgets::ButtonOptions().Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) {
         optExpandAll = false;
         optCollapseAll = true;
     }
     ImGui::SameLine();
-    if (ImGui::Button("Clear")) {
+    if (UIWidgets::Button("Clear", UIWidgets::ButtonOptions({ { .tooltip = "Clear the search field" } })
+                                       .Color(THEME_COLOR)
+                                       .Size(UIWidgets::Sizes::Inline))) {
         checkSearch.Clear();
         UpdateFilters();
         doAreaScroll = true;
     }
-    UIWidgets::Tooltip("Clear the search field");
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
     if (checkSearch.Draw()) {
         UpdateFilters();
     }
+    UIWidgets::PopStyleCombobox();
+
+    ImGui::Separator();
+
+    std::ostringstream totalChecksSS;
+    totalChecksSS << "Total Checks: ";
+    if (enableAvailableChecks) {
+        totalChecksSS << totalChecksAvailable << " Available / ";
+    }
+    totalChecksSS << totalChecksGotten << " Checked / " << totalChecks << " Total";
+    ImGui::Text(totalChecksSS.str().c_str());
 
     UIWidgets::PaddedSeparator();
 
-    ImGui::Text("Total Checks: %d / %d", totalChecksGotten, totalChecks);
-
-    UIWidgets::PaddedSeparator();
-
-    //Checks Section Lead-in
+    // Checks Section Lead-in
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
     size = ImGui::GetContentRegionAvail();
@@ -935,7 +1093,7 @@ void CheckTrackerWindow::DrawElement() {
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
 
-    //Prep for loop
+    // Prep for loop
     RainbowTick();
     bool doDraw = false;
     bool thisAreaFullyChecked = false;
@@ -946,21 +1104,18 @@ void CheckTrackerWindow::DrawElement() {
     bool doingCollapseOrExpand = optExpandAll || optCollapseAll;
     bool isThisAreaSpoiled;
     RandomizerCheckArea lastArea = RCAREA_INVALID;
-    Color_RGBA8 areaCompleteColor = CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.MainColor"), Color_Main_Default);
-    Color_RGBA8 areaIncompleteColor = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.MainColor"), Color_Main_Default);
-    Color_RGBA8 extraCompleteColor = CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.ExtraColor"), Color_Area_Complete_Extra_Default);
-    Color_RGBA8 extraIncompleteColor = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.ExtraColor"), Color_Area_Incomplete_Extra_Default);
     Color_RGBA8 mainColor;
     Color_RGBA8 extraColor;
     std::string stemp;
 
     bool shouldHideFilteredAreas = CVarGetInteger(CVAR_TRACKER_CHECK("HideFilteredAreas"), 1);
-    
+
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
     for (auto& [rcArea, checks] : checksByArea) {
         RandomizerCheckArea thisArea = currentArea;
 
         thisAreaFullyChecked = (areaChecksGotten[rcArea] == areaCheckTotals[rcArea]);
-        //Last Area needs to be cleaned up
+        // Last Area needs to be cleaned up
         if (lastArea != RCAREA_INVALID && doDraw) {
             UIWidgets::PaddedSeparator();
         }
@@ -970,20 +1125,20 @@ void CheckTrackerWindow::DrawElement() {
             doAreaScroll = true;
         }
         if ((shouldHideFilteredAreas && filterAreasHidden[rcArea]) ||
-            (!showHidden && ((hideComplete && thisAreaFullyChecked) || (hideIncomplete && !thisAreaFullyChecked)))
-        ) {
+            (!showHidden && ((hideComplete && thisAreaFullyChecked) || (hideIncomplete && !thisAreaFullyChecked))) ||
+            (enableAvailableChecks && onlyShowAvailable && areaChecksAvailable[rcArea] == 0)) {
             doDraw = false;
         } else {
-            //Get the colour for the area
+            // Get the colour for the area
             if (thisAreaFullyChecked) {
-                mainColor = areaCompleteColor;
-                extraColor = extraCompleteColor;
+                mainColor = Color_Area_Complete_Main;
+                extraColor = Color_Area_Complete_Extra;
             } else {
-                mainColor = areaIncompleteColor;
-                extraColor = extraIncompleteColor;
+                mainColor = Color_Area_Incomplete_Main;
+                extraColor = Color_Area_Incomplete_Extra;
             }
 
-            //Draw the area
+            // Draw the area
             collapseLogic = !thisAreaFullyChecked;
             if (doingCollapseOrExpand) {
                 if (optExpandAll) {
@@ -1009,21 +1164,37 @@ void CheckTrackerWindow::DrawElement() {
             isThisAreaSpoiled = IsAreaSpoiled(rcArea) || mqSpoilers;
 
             if (isThisAreaSpoiled) {
-                if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) {
-                    if (OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))->IsMQ())
-                        ImGui::Text("(%d/%d) - MQ", areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
-                    else
-                        ImGui::Text("(%d/%d) - Vanilla", areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
-                } else {
-                    ImGui::Text("(%d/%d)", areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
+                std::ostringstream areaTotalsSS;
+                std::ostringstream areaTotalsTooltipSS;
+
+                areaTotalsSS << "(";
+                if (enableAvailableChecks) {
+                    areaTotalsSS << static_cast<uint16_t>(areaChecksAvailable[rcArea]) << " / ";
+                    areaTotalsTooltipSS << "Available / ";
                 }
+                areaTotalsSS << static_cast<uint16_t>(areaChecksGotten[rcArea]) << " / "
+                             << static_cast<uint16_t>(areaCheckTotals[rcArea]) << ")";
+                areaTotalsTooltipSS << "Checked / Total";
+
+                if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) {
+                    if (OTRGlobals::Instance->gRandoContext->GetDungeons()
+                            ->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))
+                            ->IsMQ()) {
+                        areaTotalsSS << " - MQ";
+                    } else {
+                        areaTotalsSS << " - Vanilla";
+                    }
+                }
+
+                ImGui::Text(areaTotalsSS.str().c_str());
+                UIWidgets::Tooltip(areaTotalsTooltipSS.str().c_str());
             } else {
                 ImGui::Text("???");
             }
 
             ImGui::PopStyleColor();
 
-            //Keep areas loaded between transitions
+            // Keep areas loaded between transitions
             if (thisArea == rcArea && doAreaScroll) {
                 ImGui::SetScrollHereY(0.0f);
                 doAreaScroll = false;
@@ -1039,9 +1210,10 @@ void CheckTrackerWindow::DrawElement() {
             }
         }
     }
+    ImGui::PopStyleVar();
 
-    ImGui::EndTable(); //Checks Lead-out
-    ImGui::EndTable(); //Quick Options Lead-out
+    ImGui::EndTable(); // Checks Lead-out
+    ImGui::EndTable(); // Quick Options Lead-out
     EndFloatWindows();
     if (doingCollapseOrExpand) {
         optCollapseAll = false;
@@ -1052,7 +1224,7 @@ void CheckTrackerWindow::DrawElement() {
 bool UpdateFilters() {
     for (auto& [rcArea, checks] : checksByArea) {
         filterAreasHidden[rcArea] = !checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str());
-        for (auto check : checks) { 
+        for (auto check : checks) {
             if (ShouldShowCheck(check)) {
                 filterAreasHidden[rcArea] = false;
                 filterChecksHidden[check] = false;
@@ -1068,21 +1240,22 @@ bool UpdateFilters() {
 bool ShouldShowCheck(RandomizerCheck check) {
     auto itemLoc = Rando::Context::GetInstance()->GetItemLocation(check);
     std::string search = (Rando::StaticData::GetLocation(check)->GetShortName() + " " +
-        Rando::StaticData::GetLocation(check)->GetName() + " " +
-        RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea()));
-    if (itemLoc->HasObtained() || itemLoc->GetCheckStatus() == RCSHOW_SCUMMED || 
-        (!mystery && (itemLoc->GetCheckStatus() == RCSHOW_IDENTIFIED || itemLoc->GetCheckStatus() == RCSHOW_SEEN) && itemLoc->GetPlacedRandomizerGet() != RG_ICE_TRAP)) {
+                          Rando::StaticData::GetLocation(check)->GetName() + " " +
+                          RandomizerCheckObjects::GetRCAreaName(Rando::StaticData::GetLocation(check)->GetArea()));
+    if (itemLoc->HasObtained() || itemLoc->GetCheckStatus() == RCSHOW_SCUMMED ||
+        (!mystery && (itemLoc->GetCheckStatus() == RCSHOW_IDENTIFIED || itemLoc->GetCheckStatus() == RCSHOW_SEEN) &&
+         itemLoc->GetPlacedRandomizerGet() != RG_ICE_TRAP)) {
         search += " " + itemLoc->GetPlacedItemName().GetForLanguage(gSaveContext.language);
     } else if (itemLoc->GetCheckStatus() == RCSHOW_IDENTIFIED && !mystery) {
-        search += OTRGlobals::Instance->gRandoContext->overrides[check].GetTrickName().GetForLanguage(gSaveContext.language);
+        search +=
+            OTRGlobals::Instance->gRandoContext->overrides[check].GetTrickName().GetForLanguage(gSaveContext.language);
     } else if (itemLoc->GetCheckStatus() == RCSHOW_SEEN && !mystery) {
-        search += Rando::StaticData::RetrieveItem(OTRGlobals::Instance->gRandoContext->overrides[check].LooksLike()).GetName().GetForLanguage(gSaveContext.language);
+        search += Rando::StaticData::RetrieveItem(OTRGlobals::Instance->gRandoContext->overrides[check].LooksLike())
+                      .GetName()
+                      .GetForLanguage(gSaveContext.language);
     }
-    return (
-        IsVisibleInCheckTracker(check) &&
-        (checkSearch.Filters.Size == 0 ||
-            checkSearch.PassFilter(search.c_str()))
-    );
+    return (IsVisibleInCheckTracker(check) &&
+            (checkSearch.Filters.Size == 0 || checkSearch.PassFilter(search.c_str())));
 }
 
 // Windowing stuff
@@ -1090,8 +1263,7 @@ void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flag
     ImGuiWindowFlags windowFlags = flags;
 
     if (windowFlags == 0) {
-        windowFlags |=
-            ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_NoFocusOnAppearing;
+        windowFlags |= ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_NoFocusOnAppearing;
     }
 
     if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
@@ -1099,12 +1271,17 @@ void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flag
         windowFlags |= ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoTitleBar |
                        ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar;
 
-        if (!CVarGetInteger(CVAR_TRACKER_CHECK("Draggable"), 0)) {
+        if (!CVarGetInteger(CVAR_TRACKER_CHECK("Draggable"), 1)) {
             windowFlags |= ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove;
         }
     }
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(Color_Background.r / 255.0f, Color_Background.g / 255.0f,
-                                                    Color_Background.b / 255.0f, Color_Background.a / 255.0f));
+    auto maybeParent = ImGui::GetCurrentWindow();
+    ImGuiWindow* window = ImGui::FindWindowByName(UniqueName.c_str());
+    if (window != NULL && window->DockTabIsVisible && window->ParentWindow != NULL &&
+        std::string(window->ParentWindow->Name).compare(0, strlen("Main - Deck"), "Main - Deck") == 0) {
+        Color_Background.a = 255;
+    }
+    ImGui::PushStyleColor(ImGuiCol_WindowBg, VecFromRGBA8(Color_Background));
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
     ImGui::Begin(UniqueName.c_str(), &open, windowFlags);
@@ -1117,80 +1294,83 @@ void EndFloatWindows() {
 }
 
 void LoadSettings() {
-    //If in randomzer, then get the setting and check if in general we should be showing the settings
-    //If in vanilla, _try_ to show items that at least are needed for 100%
+    // If in randomzer, then get the setting and check if in general we should be showing the settings
+    // If in vanilla, _try_ to show items that at least are needed for 100%
 
-    showShops = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF
-        : false;
-    showBeans = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL
-        : true;
-    showScrubs = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_ALL
-        : false;
-    showMajorScrubs = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF
-        : false;
-    showMerchants = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS ||
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) == RO_SHUFFLE_MERCHANTS_ALL
-        : true;
-    showBeehives = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BEEHIVES) == RO_GENERIC_YES
-        : false;
-    showCows = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_COWS) == RO_GENERIC_YES
-        : false;
-    showAdultTrade = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_YES
-        : true;
-    showKokiriSword = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_KOKIRI_SWORD) == RO_GENERIC_YES
-        : true;
-    showMasterSword = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) == RO_GENERIC_YES
-        : true;
-    showHyruleLoach = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH
-        : false;
-    showWeirdEgg = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_WEIRD_EGG) == RO_GENERIC_YES
-        : true;
-    showGerudoCard = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) == RO_GENERIC_YES
-        : true;
-    showFrogSongRupees = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES
-        : false;
-    showFairies = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FAIRIES) == RO_GENERIC_YES
-        : false;
-    showStartingMapsCompasses = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MAPANDCOMPASS) != RO_DUNGEON_ITEM_LOC_VANILLA
-        : false;
-    showKeysanity = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) != RO_DUNGEON_ITEM_LOC_VANILLA
-        : false;
-    showBossKeysanity = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) != RO_DUNGEON_ITEM_LOC_VANILLA
-        : false;
-    showGerudoFortressKeys = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GERUDO_KEYS) != RO_GERUDO_KEYS_VANILLA
-        : false;
-    showGanonBossKey = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) != RO_GANON_BOSS_KEY_VANILLA
-        : false;
-    showOcarinas = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_OCARINA) == RO_GENERIC_YES
-        : false;
-    show100SkullReward = IS_RANDO ?
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_100_GS_REWARD) == RO_GENERIC_YES
-        : false;
-    showLinksPocket = IS_RANDO ? // don't show Link's Pocket if not randomizer, or if rando and pocket is disabled
-        OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING
-        :false;
+    showShops =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) != RO_SHOPSANITY_OFF : false;
+    showBeans = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) ==
+                                   RO_SHUFFLE_MERCHANTS_BEANS_ONLY ||
+                               OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) ==
+                                   RO_SHUFFLE_MERCHANTS_ALL
+                         : true;
+    showScrubs =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_ALL : false;
+    showMajorScrubs =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) != RO_SCRUBS_OFF : false;
+    showMerchants = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) ==
+                                       RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS ||
+                                   OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MERCHANTS) ==
+                                       RO_SHUFFLE_MERCHANTS_ALL
+                             : true;
+    showSongs = IS_RANDO
+                    ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SONGS) != RO_SONG_SHUFFLE_OFF
+                    : false;
+    showBeehives = IS_RANDO
+                       ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BEEHIVES) == RO_GENERIC_YES
+                       : false;
+    showCows =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_COWS) == RO_GENERIC_YES : false;
+    showAdultTrade =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_ADULT_TRADE) == RO_GENERIC_YES
+                 : true;
+    showKokiriSword =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_KOKIRI_SWORD) == RO_GENERIC_YES
+                 : true;
+    showMasterSword =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) == RO_GENERIC_YES
+                 : true;
+    showHyruleLoach =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_FISHSANITY) == RO_FISHSANITY_HYRULE_LOACH
+                 : false;
+    showWeirdEgg =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_WEIRD_EGG) == RO_GENERIC_YES
+                 : true;
+    showGerudoCard = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(
+                                    RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) == RO_GENERIC_YES
+                              : true;
+    showFrogSongRupees =
+        IS_RANDO
+            ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES
+            : false;
+    showFairies = IS_RANDO
+                      ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FAIRIES) == RO_GENERIC_YES
+                      : false;
+    showStartingMapsCompasses = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(
+                                               RSK_SHUFFLE_MAPANDCOMPASS) != RO_DUNGEON_ITEM_LOC_VANILLA
+                                         : false;
+    showKeysanity =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) != RO_DUNGEON_ITEM_LOC_VANILLA
+                 : false;
+    showBossKeysanity = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) !=
+                                       RO_DUNGEON_ITEM_LOC_VANILLA
+                                 : false;
+    showGerudoFortressKeys =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GERUDO_KEYS) != RO_GERUDO_KEYS_VANILLA
+                 : false;
+    showGanonBossKey = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) !=
+                                      RO_GANON_BOSS_KEY_VANILLA
+                                : false;
+    showOcarinas = IS_RANDO
+                       ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_OCARINA) == RO_GENERIC_YES
+                       : false;
+    show100SkullReward =
+        IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_100_GS_REWARD) == RO_GENERIC_YES
+                 : false;
+    showLinksPocket =
+        IS_RANDO ? // don't show Link's Pocket if not randomizer, or if rando and pocket is disabled
+            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING
+                 : false;
 
     if (IS_RANDO) {
         switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS)) {
@@ -1230,11 +1410,53 @@ void LoadSettings() {
                 showDungeonPots = false;
                 break;
         }
+
+        switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GRASS)) {
+            case RO_SHUFFLE_GRASS_ALL:
+                showOverworldGrass = true;
+                showDungeonGrass = true;
+                break;
+            case RO_SHUFFLE_GRASS_OVERWORLD:
+                showOverworldGrass = true;
+                showDungeonGrass = false;
+                break;
+            case RO_SHUFFLE_GRASS_DUNGEONS:
+                showOverworldGrass = false;
+                showDungeonGrass = true;
+                break;
+            default:
+                showOverworldGrass = false;
+                showDungeonGrass = false;
+                break;
+        }
+
+        switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_CRATES)) {
+            case RO_SHUFFLE_CRATES_ALL:
+                showOverworldCrates = true;
+                showDungeonCrates = true;
+                break;
+            case RO_SHUFFLE_CRATES_OVERWORLD:
+                showOverworldCrates = true;
+                showDungeonCrates = false;
+                break;
+            case RO_SHUFFLE_CRATES_DUNGEONS:
+                showOverworldCrates = false;
+                showDungeonCrates = true;
+                break;
+            default:
+                showOverworldCrates = false;
+                showDungeonCrates = false;
+                break;
+        }
     } else { // Vanilla
         showOverworldTokens = true;
         showDungeonTokens = true;
         showOverworldPots = false;
         showDungeonPots = false;
+        showOverworldGrass = false;
+        showDungeonGrass = false;
+        showOverworldCrates = false;
+        showDungeonCrates = false;
     }
 
     fortressFast = false;
@@ -1279,6 +1501,27 @@ void LoadSettings() {
         showOverworldFreestanding = false;
         showDungeonFreestanding = true;
     }
+
+    switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY)) {
+        case RO_GANON_BOSS_KEY_LACS_STONES:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_STONES);
+            break;
+        case RO_GANON_BOSS_KEY_LACS_MEDALLIONS:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_MEDALLIONS);
+            break;
+        case RO_GANON_BOSS_KEY_LACS_REWARDS:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_REWARDS);
+            break;
+        case RO_GANON_BOSS_KEY_LACS_DUNGEONS:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_DUNGEONS);
+            break;
+        case RO_GANON_BOSS_KEY_LACS_TOKENS:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_TOKENS);
+            break;
+        default:
+            Rando::Context::GetInstance()->LACSCondition(RO_LACS_VANILLA);
+            break;
+    }
 }
 
 bool IsCheckShuffled(RandomizerCheck rc) {
@@ -1287,65 +1530,72 @@ bool IsCheckShuffled(RandomizerCheck rc) {
         auto identity = OTRGlobals::Instance->gRandomizer->IdentifyShopItem(loc->GetScene(), loc->GetActorParams() + 1);
     }
     if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOGIC_RULES) != RO_LOGIC_VANILLA) {
-        return
-            (loc->GetArea() != RCAREA_INVALID) &&         // don't show Invalid locations
-            (loc->GetRCType() != RCTYPE_GOSSIP_STONE) &&    //TODO: Don't show hints until tracker supports them
-            (loc->GetRCType() != RCTYPE_STATIC_HINT) &&     //TODO: Don't show hints until tracker supports them
-            (loc->GetRCType() != RCTYPE_CHEST_GAME) &&      // don't show non final reward chest game checks until we support shuffling them
-            (rc != RC_HC_ZELDAS_LETTER) &&        // don't show zeldas letter until we support shuffling it
-            (rc != RC_LINKS_POCKET || showLinksPocket) &&
-            OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc) &&
-            (loc->GetRCType() != RCTYPE_SHOP ||
-                (showShops && OTRGlobals::Instance->gRandomizer->IdentifyShopItem(loc->GetScene(), loc->GetActorParams() + 1).enGirlAShopItem == 50)) &&
-            (rc != RC_TRIFORCE_COMPLETED) &&
-            (rc != RC_GANON) &&
-            (loc->GetRCType() != RCTYPE_SCRUB ||
-                showScrubs ||
+        return (loc->GetArea() != RCAREA_INVALID) &&        // don't show Invalid locations
+               (loc->GetRCType() != RCTYPE_GOSSIP_STONE) && // TODO: Don't show hints until tracker supports them
+               (loc->GetRCType() != RCTYPE_STATIC_HINT) &&  // TODO: Don't show hints until tracker supports them
+               (loc->GetRCType() !=
+                RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them
+               (rc != RC_HC_ZELDAS_LETTER) && // don't show zeldas letter until we support shuffling it
+               (rc != RC_LINKS_POCKET || showLinksPocket) &&
+               OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc) &&
+               (loc->GetRCType() != RCTYPE_SHOP ||
+                (showShops &&
+                 OTRGlobals::Instance->gRandomizer->IdentifyShopItem(loc->GetScene(), loc->GetActorParams() + 1)
+                         .enGirlAShopItem == 50)) &&
+               (rc != RC_TRIFORCE_COMPLETED) && (rc != RC_GANON) &&
+               (loc->GetRCType() != RCTYPE_SCRUB || showScrubs ||
                 (showMajorScrubs && (rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized
-                rc == RC_HF_DEKU_SCRUB_GROTTO ||
-                rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT))
-                ) &&
-            (loc->GetRCType() != RCTYPE_MERCHANT || showMerchants) &&
-            (loc->GetRCType() != RCTYPE_BEEHIVE || showBeehives) &&
-            (loc->GetRCType() != RCTYPE_OCARINA || showOcarinas) &&
-            (loc->GetRCType() != RCTYPE_SKULL_TOKEN || alwaysShowGS ||
+                                     rc == RC_HF_DEKU_SCRUB_GROTTO || rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT))) &&
+               (loc->GetRCType() != RCTYPE_MERCHANT || showMerchants) &&
+               (loc->GetRCType() != RCTYPE_SONG_LOCATION || showSongs) &&
+               (loc->GetRCType() != RCTYPE_BEEHIVE || showBeehives) &&
+               (loc->GetRCType() != RCTYPE_OCARINA || showOcarinas) &&
+               (loc->GetRCType() != RCTYPE_SKULL_TOKEN || alwaysShowGS ||
                 (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
-                (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))
-                ) &&
-            (loc->GetRCType() != RCTYPE_POT ||
+                (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_POT ||
                 (showOverworldPots && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
                 (showDungeonPots && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
-            (loc->GetRCType() != RCTYPE_COW || showCows) &&
-            (loc->GetRCType() != RCTYPE_FISH || OTRGlobals::Instance->gRandoContext->GetFishsanity()->GetFishLocationIncluded(loc)) &&
-            (loc->GetRCType() != RCTYPE_FREESTANDING ||
+               (loc->GetRCType() != RCTYPE_GRASS ||
+                (showOverworldGrass && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
+                (showDungeonGrass && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_CRATE ||
+                (showOverworldCrates && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
+                (showDungeonCrates && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_NLCRATE ||
+                (showOverworldCrates && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea()) &&
+                 OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOGIC_RULES) == RO_LOGIC_NO_LOGIC) ||
+                (showDungeonCrates && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_SMALL_CRATE ||
+                (showOverworldCrates && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
+                (showDungeonCrates && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_COW || showCows) &&
+               (loc->GetRCType() != RCTYPE_FISH ||
+                OTRGlobals::Instance->gRandoContext->GetFishsanity()->GetFishLocationIncluded(loc)) &&
+               (loc->GetRCType() != RCTYPE_FREESTANDING ||
                 (showOverworldFreestanding && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
-                (showDungeonFreestanding && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))
-                ) &&
-            (loc->GetRCType() != RCTYPE_ADULT_TRADE ||
-                showAdultTrade ||
+                (showDungeonFreestanding && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
+               (loc->GetRCType() != RCTYPE_ADULT_TRADE || showAdultTrade ||
                 rc == RC_KAK_ANJU_AS_ADULT ||  // adult trade checks that are always shuffled
                 rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off
                 ) &&
-            (rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) &&
-            (rc != RC_TOT_MASTER_SWORD || showMasterSword) &&
-            (rc != RC_LH_HYRULE_LOACH || showHyruleLoach) &&
-            (rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
-            (rc != RC_HC_MALON_EGG || showWeirdEgg) &&
-            (loc->GetRCType() != RCTYPE_FROG_SONG || showFrogSongRupees) &&
-            ((loc->GetRCType() != RCTYPE_MAP && loc->GetRCType() != RCTYPE_COMPASS) || showStartingMapsCompasses) &&
-            (loc->GetRCType() != RCTYPE_FAIRY || showFairies) &&
-            (loc->GetRCType() != RCTYPE_SMALL_KEY || showKeysanity) &&
-            (loc->GetRCType() != RCTYPE_BOSS_KEY || showBossKeysanity) &&
-            (loc->GetRCType() != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&
-            (rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) &&
-            (loc->GetRCType() != RCTYPE_GF_KEY && rc != RC_GF_GERUDO_MEMBERSHIP_CARD ||
-                (showGerudoCard && rc == RC_GF_GERUDO_MEMBERSHIP_CARD) ||
+               (rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) && (rc != RC_TOT_MASTER_SWORD || showMasterSword) &&
+               (rc != RC_LH_HYRULE_LOACH || showHyruleLoach) && (rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) &&
+               (rc != RC_HC_MALON_EGG || showWeirdEgg) &&
+               (loc->GetRCType() != RCTYPE_FROG_SONG || showFrogSongRupees) &&
+               ((loc->GetRCType() != RCTYPE_MAP && loc->GetRCType() != RCTYPE_COMPASS) || showStartingMapsCompasses) &&
+               (loc->GetRCType() != RCTYPE_FAIRY || showFairies) &&
+               (loc->GetRCType() != RCTYPE_SMALL_KEY || showKeysanity) &&
+               (loc->GetRCType() != RCTYPE_BOSS_KEY || showBossKeysanity) &&
+               (loc->GetRCType() != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&
+               (rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) &&
+               (loc->GetRCType() != RCTYPE_GF_KEY && rc != RC_TH_FREED_CARPENTERS ||
+                (showGerudoCard && rc == RC_TH_FREED_CARPENTERS) ||
                 (fortressNormal && showGerudoFortressKeys && loc->GetRCType() == RCTYPE_GF_KEY) ||
-                (fortressFast && showGerudoFortressKeys && rc == RC_GF_NORTH_F1_CARPENTER)
-                );
-    }
-    else if (loc->IsVanillaCompletion()) {
-        return (OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc) || rc == RC_GIFT_FROM_RAURU) && rc != RC_LINKS_POCKET;
+                (fortressFast && showGerudoFortressKeys && rc == RC_TH_1_TORCH_CARPENTER));
+    } else if (loc->IsVanillaCompletion()) {
+        return (OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc) || rc == RC_GIFT_FROM_RAURU) &&
+               rc != RC_LINKS_POCKET;
     }
     return false;
 }
@@ -1353,17 +1603,18 @@ bool IsCheckShuffled(RandomizerCheck rc) {
 bool IsVisibleInCheckTracker(RandomizerCheck rc) {
     auto loc = Rando::StaticData::GetLocation(rc);
     if (IS_RANDO) {
-        return IsCheckShuffled(rc) || (alwaysShowGS &&
-                loc->GetRCType() == RCTYPE_SKULL_TOKEN &&
-                OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc)
-            ) || (loc->GetRCType() == RCTYPE_SHOP && showShops && !hideShopUnshuffledChecks);
+        return IsCheckShuffled(rc) ||
+               (alwaysShowGS && loc->GetRCType() == RCTYPE_SKULL_TOKEN &&
+                OTRGlobals::Instance->gRandoContext->IsQuestOfLocationActive(rc)) ||
+               (loc->GetRCType() == RCTYPE_SHOP && showShops && !hideShopUnshuffledChecks);
     } else {
-        return loc->IsVanillaCompletion() && (!loc->IsDungeon() || (loc->IsDungeon() && loc->GetQuest() == gSaveContext.ship.quest.id));
+        return loc->IsVanillaCompletion() &&
+               (!loc->IsDungeon() || (loc->IsDungeon() && loc->GetQuest() == gSaveContext.ship.quest.id));
     }
 }
 
 void UpdateInventoryChecks() {
-    //For all the areas with maps, if you have one, spoil the area
+    // For all the areas with maps, if you have one, spoil the area
     for (auto [scene, area] : DungeonRCAreasBySceneID) {
         if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, scene)) {
             SetAreaSpoiled(area);
@@ -1396,7 +1647,7 @@ void UpdateAllOrdering() {
 
 void UpdateOrdering(RandomizerCheckArea rcArea) {
     // Sort a single area
-    if(checksByArea.contains(rcArea)) {
+    if (checksByArea.contains(rcArea)) {
         std::sort(checksByArea.find(rcArea)->second.begin(), checksByArea.find(rcArea)->second.end(), CompareChecks);
     }
     RecalculateAllAreaTotals();
@@ -1462,100 +1713,132 @@ void DrawLocation(RandomizerCheck rc) {
     Rando::ItemLocation* itemLoc = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
     RandomizerCheckStatus status = itemLoc->GetCheckStatus();
     bool skipped = itemLoc->GetIsSkipped();
+    bool available = itemLoc->IsAvailable();
+
+    if (enableAvailableChecks && onlyShowAvailable && !available) {
+        return;
+    }
+
     if (status == RCSHOW_COLLECTED) {
         if (!showHidden && hideCollected) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-                ? Color_Collected_Extra_Default
+                ? Color_Collected_Extra
                 : Color_Collected_Main;
-        extraColor = Color_Collected_Extra_Default;
+        extraColor = Color_Collected_Extra;
     } else if (status == RCSHOW_SAVED) {
         if (!showHidden && hideSaved) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-                ? Color_Saved_Extra_Default
+                ? Color_Saved_Extra
                 : Color_Saved_Main;
-        extraColor = Color_Saved_Extra_Default;
+        extraColor = Color_Saved_Extra;
     } else if (skipped) {
         if (!showHidden && hideSkipped) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-                ? Color_Skipped_Extra_Default
+                ? Color_Skipped_Extra
                 : Color_Skipped_Main;
-        extraColor = Color_Skipped_Extra_Default;
+        extraColor = Color_Skipped_Extra;
     } else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) {
         if (!showHidden && hideSeen) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-                ? Color_Seen_Extra_Default
+                ? Color_Seen_Extra
                 : Color_Seen_Main;
-        extraColor = Color_Seen_Extra_Default;
+        extraColor = Color_Seen_Extra;
     } else if (status == RCSHOW_SCUMMED) {
         if (!showHidden && hideScummed) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-            ? Color_Scummed_Extra_Default
-            : Color_Scummed_Main;
-        extraColor = Color_Scummed_Extra_Default;
+                ? Color_Scummed_Extra
+                : Color_Scummed_Main;
+        extraColor = Color_Scummed_Extra;
     } else if (status == RCSHOW_UNCHECKED) {
         if (!showHidden && hideUnchecked) {
             return;
         }
         mainColor =
             !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
-                ? Color_Unchecked_Extra_Default
+                ? Color_Unchecked_Extra
                 : Color_Unchecked_Main;
-        extraColor = Color_Unchecked_Extra_Default;
+        extraColor = Color_Unchecked_Extra;
     }
 
-    //Main Text
+    // Main Text
     if (checkNameOverrides.contains(loc->GetRandomizerCheck())) {
         txt = checkNameOverrides[loc->GetRandomizerCheck()];
     } else {
         txt = loc->GetShortName();
     }
-    
+
     if (lastLocationChecked == loc->GetRandomizerCheck()) {
         txt = "* " + txt;
     }
 
     // Draw button - for Skipped/Seen/Scummed/Unchecked only
-    if (status == RCSHOW_UNCHECKED || status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED || skipped) {
-        if (UIWidgets::StateButton(std::to_string(rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES)) {
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 4.0f, 3.0f });
+    float sz = ImGui::GetFrameHeight();
+    if (status == RCSHOW_UNCHECKED || status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED ||
+        status == RCSHOW_SCUMMED || skipped) {
+        if (UIWidgets::StateButton(std::to_string(rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES, ImVec2(sz, sz),
+                                   UIWidgets::ButtonOptions().Color(THEME_COLOR))) {
             if (skipped) {
                 OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
                 areaChecksGotten[loc->GetArea()]--;
                 totalChecksGotten--;
+                if (available) {
+                    areaChecksAvailable[loc->GetArea()]++;
+                    totalChecksAvailable++;
+                }
             } else {
                 OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(true);
                 areaChecksGotten[loc->GetArea()]++;
                 totalChecksGotten++;
+                if (available) {
+                    areaChecksAvailable[loc->GetArea()]--;
+                    totalChecksAvailable--;
+                }
             }
             UpdateOrdering(loc->GetArea());
             UpdateInventoryChecks();
             SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
         }
     } else {
-        ImGui::Dummy(ImVec2(20.0f, 10.0f));
+        ImGui::Dummy(ImVec2(sz, sz));
     }
+    ImGui::PopStyleVar();
+
     ImGui::SameLine();
 
-    //Draw
-    ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(mainColor.r / 255.0f, mainColor.g / 255.0f, mainColor.b / 255.0f, mainColor.a / 255.0f));
+    // Draw
+    ImVec4 styleColor(mainColor.r / 255.0f, mainColor.g / 255.0f, mainColor.b / 255.0f, mainColor.a / 255.0f);
+    if (enableAvailableChecks) {
+        if (itemLoc->HasObtained()) {
+            ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0, 0, 0, 0));
+        } else {
+            ImGui::PushStyleColor(ImGuiCol_Text, styleColor);
+        }
+        ImGui::Text("%s", available ? ICON_FA_UNLOCK : ICON_FA_LOCK);
+        ImGui::PopStyleColor();
+        ImGui::SameLine();
+    }
+
+    ImGui::PushStyleColor(ImGuiCol_Text, styleColor);
     ImGui::Text("%s", txt.c_str());
     ImGui::PopStyleColor();
 
-    //Draw the extra info
+    // Draw the extra info
     txt = "";
 
     if (status != RCSHOW_UNCHECKED) {
@@ -1567,7 +1850,8 @@ void DrawLocation(RandomizerCheck rc) {
                     txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                 } else {
                     if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
-                        if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) {
+                        if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER ||
+                            gSaveContext.language == LANGUAGE_JPN) {
                             txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().english;
                         } else if (gSaveContext.language == LANGUAGE_FRA) {
                             txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().french;
@@ -1578,16 +1862,20 @@ void DrawLocation(RandomizerCheck rc) {
             case RCSHOW_IDENTIFIED:
             case RCSHOW_SEEN:
                 if (IS_RANDO) {
-                    if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP && !mystery && !itemLoc->IsAddedToPool()) {
+                    if (itemLoc->GetPlacedRandomizerGet() == RG_ICE_TRAP && !mystery) {
                         if (status == RCSHOW_IDENTIFIED) {
-                            txt = OTRGlobals::Instance->gRandoContext->overrides[rc].GetTrickName().GetForLanguage(gSaveContext.language);
+                            txt = OTRGlobals::Instance->gRandoContext->overrides[rc].GetTrickName().GetForLanguage(
+                                gSaveContext.language);
                         } else {
-                            txt = Rando::StaticData::RetrieveItem(OTRGlobals::Instance->gRandoContext->overrides[rc].LooksLike()).GetName().GetForLanguage(gSaveContext.language);
+                            txt = Rando::StaticData::RetrieveItem(
+                                      OTRGlobals::Instance->gRandoContext->overrides[rc].LooksLike())
+                                      .GetName()
+                                      .GetForLanguage(gSaveContext.language);
                         }
-                    } else if (!mystery && !itemLoc->IsAddedToPool()) {
+                    } else if (!mystery) {
                         txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
                     }
-                    if (IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED && !mystery && !itemLoc->IsAddedToPool()) {
+                    if (IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED && !mystery) {
                         auto price = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetPrice();
                         if (price) {
                             txt += fmt::format(" - {}", price);
@@ -1595,35 +1883,37 @@ void DrawLocation(RandomizerCheck rc) {
                     }
                 } else {
                     if (IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID())) {
-                        if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) {
+                        if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER ||
+                            gSaveContext.language == LANGUAGE_JPN) {
                             txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().english;
                         } else if (gSaveContext.language == LANGUAGE_FRA) {
                             txt = Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetName().french;
                         }
                     }
                 }
-            break;
+                break;
         }
     }
     if (txt == "" && skipped) {
         txt = "Skipped"; // TODO language
     }
-    
+
     if (txt != "") {
-        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, extraColor.b / 255.0f, extraColor.a / 255.0f));
+        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, extraColor.b / 255.0f,
+                                                    extraColor.a / 255.0f));
         ImGui::SameLine();
         ImGui::Text(" (%s)", txt.c_str());
         ImGui::PopStyleColor();
     }
-    
+
     if (showLogicTooltip) {
         for (auto& locationInRegion : areaTable[itemLoc->GetParentRegionKey()].locations) {
             if (locationInRegion.GetLocation() == rc) {
                 std::string conditionStr = locationInRegion.GetConditionStr();
                 if (conditionStr != "true") {
-                    UIWidgets::InsertHelpHoverText(conditionStr);
+                    UIWidgets::Tooltip(conditionStr.c_str());
                 }
-                return;
+                break;
             }
         }
     }
@@ -1643,19 +1933,19 @@ static std::set<std::string> rainbowCVars = {
 
 int hue = 0;
 void RainbowTick() {
-    float freqHue = hue * 2 * M_PI / (360 * CVarGetFloat(CVAR_COSMETIC("RainbowSpeed"), 0.6f));
+    float freqHue = hue * 2 * M_PIf / (360 * CVarGetFloat(CVAR_COSMETIC("RainbowSpeed"), 0.6f));
     for (auto& cvar : rainbowCVars) {
-        if (CVarGetInteger((cvar + "RBM").c_str(), 0) == 0) {
+        if (CVarGetInteger((cvar + ".Rainbow").c_str(), 0) == 0) {
             continue;
         }
 
         Color_RGBA8 newColor;
-        newColor.r = sin(freqHue +              0) * 127 + 128;
-        newColor.g = sin(freqHue + (2 * M_PI / 3)) * 127 + 128;
-        newColor.b = sin(freqHue + (4 * M_PI / 3)) * 127 + 128;
+        newColor.r = static_cast<uint8_t>(sin(freqHue + 0) * 127) + 128;
+        newColor.g = static_cast<uint8_t>(sin(freqHue + (2 * M_PI / 3)) * 127) + 128;
+        newColor.b = static_cast<uint8_t>(sin(freqHue + (4 * M_PI / 3)) * 127) + 128;
         newColor.a = 255;
 
-        CVarSetColor(cvar.c_str(), newColor);
+        CVarSetColor((cvar + ".Value").c_str(), newColor);
     }
 
     hue++;
@@ -1663,47 +1953,42 @@ void RainbowTick() {
 }
 
 void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName, const char* cvarExtraName,
-                                 Color_RGBA8& main_color, Color_RGBA8& extra_color, Color_RGBA8& main_default_color,
-                                 Color_RGBA8& extra_default_color, const char* cvarHideName, const char* tooltip) {
+                                    Color_RGBA8& main_color, Color_RGBA8& extra_color, Color_RGBA8& main_default_color,
+                                    Color_RGBA8& extra_default_color, const char* cvarHideName, const char* tooltip,
+                                    UIWidgets::Colors theme) {
     Color_RGBA8 cvarMainColor = CVarGetColor(cvarMainName, main_default_color);
     Color_RGBA8 cvarExtraColor = CVarGetColor(cvarExtraName, extra_default_color);
     main_color = cvarMainColor;
     extra_color = cvarExtraColor;
 
+    UIWidgets::PushStyleCombobox(theme);
     if (ImGui::CollapsingHeader(text)) {
         if (*cvarHideName != '\0') {
             std::string label = cvarHideName;
             label += "##Hidden";
             ImGui::PushID(label.c_str());
-            UIWidgets::EnhancementCheckbox("Hidden", cvarHideName, false,
-                                           "When active, checks will hide by default when updated to this state. Can "
-                                           "be overriden with the \"Show Hidden Items\" option.");
+            UIWidgets::CVarCheckbox(
+                "Hidden", cvarHideName,
+                UIWidgets::CheckboxOptions(
+                    { { .tooltip = "When active, checks will hide by default when updated to this state. Can "
+                                   "be overridden with the \"Show Hidden Items\" option." } })
+                    .Color(theme));
             ImGui::PopID();
         }
-        if (ImGui::BeginTable(text, 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV | ImGuiTableFlags_Hideable)) {
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-            if (UIWidgets::EnhancementColor("Check", cvarMainName,
-                ImVec4(main_color.r, main_color.g, main_color.b, main_color.a),
-                ImVec4(main_default_color.r, main_default_color.g, main_default_color.b, main_default_color.a)))
-            {
-                main_color = CVarGetColor(cvarMainName, main_default_color);
-            };
-            ImGui::PopItemWidth();
+        std::string mainLabel = "Name##" + std::string(cvarMainName);
+        if (UIWidgets::CVarColorPicker(mainLabel.c_str(), cvarMainName, main_default_color, false,
+                                       UIWidgets::ColorPickerRandomButton | UIWidgets::ColorPickerResetButton |
+                                           UIWidgets::ColorPickerRainbowCheck,
+                                       theme)) {
+            main_color = CVarGetColor(cvarMainName, main_default_color);
+        }
 
-            ImGui::TableNextColumn();
-            ImGui::AlignTextToFramePadding();
-            ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-            if (UIWidgets::EnhancementColor("Details", cvarExtraName,
-                ImVec4(extra_color.r, extra_color.g, extra_color.b, extra_color.a),
-                ImVec4(extra_default_color.r, extra_default_color.g, extra_default_color.b, extra_default_color.a)))
-            {
-                extra_color = CVarGetColor(cvarExtraName, extra_default_color);
-            }
-            ImGui::PopItemWidth();
-
-            ImGui::EndTable();
+        std::string extraLabel = "Details##" + std::string(cvarExtraName);
+        if (UIWidgets::CVarColorPicker(extraLabel.c_str(), cvarExtraName, extra_default_color, false,
+                                       UIWidgets::ColorPickerRandomButton | UIWidgets::ColorPickerResetButton |
+                                           UIWidgets::ColorPickerRainbowCheck,
+                                       theme)) {
+            extra_color = CVarGetColor(cvarExtraName, extra_default_color);
         }
     }
     if (tooltip != NULL && strlen(tooltip) != 0) {
@@ -1711,6 +1996,57 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
         ImGui::Text(" ?");
         UIWidgets::Tooltip(tooltip);
     }
+    UIWidgets::PopStyleCombobox();
+}
+
+void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) {
+    if (!enableAvailableChecks) {
+        return;
+    }
+
+    ResetPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
+    StartPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
+
+    const auto& ctx = Rando::Context::GetInstance();
+
+    std::vector<RandomizerCheck> targetLocations;
+    targetLocations.reserve(RC_MAX);
+    for (auto& location : Rando::StaticData::GetLocationTable()) {
+        RandomizerCheck rc = location.GetRandomizerCheck();
+        Rando::ItemLocation* itemLocation = ctx->GetItemLocation(rc);
+        itemLocation->SetAvailable(false);
+        if (!itemLocation->HasObtained()) {
+            targetLocations.emplace_back(rc);
+        }
+    }
+
+    std::vector<RandomizerCheck> availableChecks = ReachabilitySearch(targetLocations, RG_NONE, true, startingRegion);
+    for (auto& rc : availableChecks) {
+        const auto& itemLocation = ctx->GetItemLocation(rc);
+        itemLocation->SetAvailable(true);
+    }
+
+    totalChecksAvailable = 0;
+    for (auto& [rcArea, vec] : checksByArea) {
+        areaChecksAvailable[rcArea] = 0;
+        for (auto& rc : vec) {
+            Rando::ItemLocation* itemLocation = ctx->GetItemLocation(rc);
+            if (itemLocation->IsAvailable() && IsVisibleInCheckTracker(rc) && !IsCheckHidden(rc)) {
+                areaChecksAvailable[rcArea]++;
+            }
+        }
+        totalChecksAvailable += areaChecksAvailable[rcArea];
+    }
+
+    StopPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
+    SPDLOG_INFO("Recalculate Available Checks Time: {}ms",
+                GetPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS).count());
+}
+
+void CheckTracker_LoadFromPreset(nlohmann::json info) {
+    presetLoaded = true;
+    presetPos = { info["pos"]["x"], info["pos"]["y"] };
+    presetSize = { info["size"]["width"], info["size"]["height"] };
 }
 
 void CheckTrackerWindow::Draw() {
@@ -1722,72 +2058,167 @@ void CheckTrackerWindow::Draw() {
     SyncVisibilityConsoleVariable();
 }
 
-static const char* windowType[] = { "Floating", "Window" };
-static const char* displayType[] = { "Always", "Combo Button Hold" };
-static const char* buttonStrings[] = { "A Button", "B Button", "C-Up",  "C-Down", "C-Left", "C-Right", "L Button",
-                                       "Z Button", "R Button", "Start", "D-Up",   "D-Down", "D-Left",  "D-Right" };
+static std::unordered_map<int32_t, const char*> windowType = { { TRACKER_WINDOW_FLOATING, "Floating" },
+                                                               { TRACKER_WINDOW_WINDOW, "Window" } };
+static std::unordered_map<int32_t, const char*> displayType = { { 0, "Always" }, { 1, "Combo Button Hold" } };
+static std::unordered_map<int32_t, const char*> buttonStrings = {
+    { TRACKER_COMBO_BUTTON_A, "A Button" },    { TRACKER_COMBO_BUTTON_B, "B Button" },
+    { TRACKER_COMBO_BUTTON_C_UP, "C-Up" },     { TRACKER_COMBO_BUTTON_C_DOWN, "C-Down" },
+    { TRACKER_COMBO_BUTTON_C_LEFT, "C-Left" }, { TRACKER_COMBO_BUTTON_C_RIGHT, "C-Right" },
+    { TRACKER_COMBO_BUTTON_L, "L Button" },    { TRACKER_COMBO_BUTTON_Z, "Z Button" },
+    { TRACKER_COMBO_BUTTON_R, "R Button" },    { TRACKER_COMBO_BUTTON_START, "Start" },
+    { TRACKER_COMBO_BUTTON_D_UP, "D-Up" },     { TRACKER_COMBO_BUTTON_D_DOWN, "D-Down" },
+    { TRACKER_COMBO_BUTTON_D_LEFT, "D-Left" }, { TRACKER_COMBO_BUTTON_D_RIGHT, "D-Right" }
+};
 
 void CheckTrackerSettingsWindow::DrawElement() {
+    if (recalculateAvailable) {
+        recalculateAvailable = false;
+        RecalculateAvailableChecks();
+    }
     ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, { 8.0f, 8.0f });
-    ImGui::BeginTable("CheckTrackerSettingsTable", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV);
-    ImGui::TableSetupColumn("General settings", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-    ImGui::TableSetupColumn("Section settings", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-    ImGui::TableHeadersRow();
-    ImGui::TableNextRow();
-    ImGui::TableNextColumn();
-    ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-    if (UIWidgets::EnhancementColor("BG Color", CVAR_TRACKER_CHECK("BgColor"),
-        ImVec4(Color_Background.r, Color_Background.g, Color_Background.b, Color_Background.a),
-        ImVec4(Color_Bg_Default.r, Color_Bg_Default.g, Color_Bg_Default.b, Color_Bg_Default.a),
-        false, true))
-    {
-        Color_Background = CVarGetColor(CVAR_TRACKER_CHECK("BgColor"), Color_Bg_Default);
-    }
-    ImGui::PopItemWidth();
+    if (ImGui::BeginTable("CheckTrackerSettingsTable", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
+        ImGui::TableSetupColumn("General settings", ImGuiTableColumnFlags_WidthStretch, 200.0f);
+        ImGui::TableSetupColumn("Section settings", ImGuiTableColumnFlags_WidthStretch, 200.0f);
+        ImGui::TableHeadersRow();
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
+        UIWidgets::CVarColorPicker("BG Color", CVAR_TRACKER_CHECK("BgColor"), Color_Bg_Default, true,
+                                   UIWidgets::ColorPickerResetButton | UIWidgets::ColorPickerRandomButton, THEME_COLOR);
+        ImGui::PopItemWidth();
 
-    UIWidgets::LabeledRightAlignedEnhancementCombobox("Window Type", CVAR_TRACKER_CHECK("WindowType"), windowType, TRACKER_WINDOW_WINDOW);
-    if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
-        UIWidgets::EnhancementCheckbox("Enable Dragging", CVAR_TRACKER_CHECK("Draggable"));
-        UIWidgets::EnhancementCheckbox("Only enable while paused", CVAR_TRACKER_CHECK("ShowOnlyPaused"));
-        UIWidgets::LabeledRightAlignedEnhancementCombobox("Display Mode", CVAR_TRACKER_CHECK("DisplayType"), displayType, 0);
-        if (CVarGetInteger(CVAR_TRACKER_CHECK("DisplayType"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_COMBO_BUTTON) {
-            UIWidgets::LabeledRightAlignedEnhancementCombobox("Combo Button 1", CVAR_TRACKER_CHECK("ComboButton1"), buttonStrings, TRACKER_COMBO_BUTTON_L);
-            UIWidgets::LabeledRightAlignedEnhancementCombobox("Combo Button 2", CVAR_TRACKER_CHECK("ComboButton2"), buttonStrings, TRACKER_COMBO_BUTTON_R);
+        UIWidgets::CVarCombobox("Window Type", CVAR_TRACKER_CHECK("WindowType"), windowType,
+                                UIWidgets::ComboboxOptions()
+                                    .LabelPosition(UIWidgets::LabelPositions::Far)
+                                    .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                                    .Color(THEME_COLOR)
+                                    .DefaultIndex(TRACKER_WINDOW_WINDOW));
+
+        if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
+            UIWidgets::CVarCheckbox("Enable Dragging", CVAR_TRACKER_CHECK("Draggable"),
+                                    UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+            UIWidgets::CVarCheckbox("Only enable while paused", CVAR_TRACKER_CHECK("ShowOnlyPaused"),
+                                    UIWidgets::CheckboxOptions().Color(THEME_COLOR));
+            UIWidgets::CVarCombobox("Display Mode", CVAR_TRACKER_CHECK("DisplayType"), displayType,
+                                    UIWidgets::ComboboxOptions()
+                                        .LabelPosition(UIWidgets::LabelPositions::Far)
+                                        .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                                        .Color(THEME_COLOR)
+                                        .DefaultIndex(0));
+            if (CVarGetInteger(CVAR_TRACKER_CHECK("DisplayType"), TRACKER_DISPLAY_ALWAYS) ==
+                TRACKER_DISPLAY_COMBO_BUTTON) {
+                UIWidgets::CVarCombobox("Combo Button 1", CVAR_TRACKER_CHECK("ComboButton1"), buttonStrings,
+                                        UIWidgets::ComboboxOptions()
+                                            .LabelPosition(UIWidgets::LabelPositions::Far)
+                                            .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                                            .Color(THEME_COLOR)
+                                            .DefaultIndex(TRACKER_COMBO_BUTTON_L));
+                UIWidgets::CVarCombobox("Combo Button 2", CVAR_TRACKER_CHECK("ComboButton2"), buttonStrings,
+                                        UIWidgets::ComboboxOptions()
+                                            .LabelPosition(UIWidgets::LabelPositions::Far)
+                                            .ComponentAlignment(UIWidgets::ComponentAlignments::Right)
+                                            .Color(THEME_COLOR)
+                                            .DefaultIndex(TRACKER_COMBO_BUTTON_L));
+            }
         }
+        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        UIWidgets::CVarCheckbox("Vanilla/MQ Dungeon Spoilers", CVAR_TRACKER_CHECK("MQSpoilers"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. "
+                                             "Otherwise, Vanilla/MQ dungeon locations must be unlocked.")
+                                    .Color(THEME_COLOR));
+        ImGui::EndDisabled();
+        if (UIWidgets::CVarCheckbox(
+                "Hide unshuffled shop item checks", CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"),
+                UIWidgets::CheckboxOptions()
+                    .Tooltip("If enabled, will prevent the tracker from displaying slots with non-shop-item shuffles.")
+                    .Color(THEME_COLOR))) {
+            hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 0);
+            UpdateFilters();
+        }
+        if (UIWidgets::CVarCheckbox(
+                "Always show gold skulltulas", CVAR_TRACKER_CHECK("AlwaysShowGSLocs"),
+                UIWidgets::CheckboxOptions()
+                    .Tooltip("If enabled, will show GS locations in the tracker regardless of tokensanity settings.")
+                    .Color(THEME_COLOR))) {
+            alwaysShowGS = !alwaysShowGS;
+            UpdateFilters();
+        }
+        UIWidgets::CVarCheckbox("Show Logic", CVAR_TRACKER_CHECK("ShowLogic"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("If enabled, will show a check's logic when hovering over it.")
+                                    .Color(THEME_COLOR));
+        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        if (UIWidgets::CVarCheckbox("Enable Available Checks", CVAR_TRACKER_CHECK("EnableAvailableChecks"),
+                                    UIWidgets::CheckboxOptions()
+                                        .Tooltip("If enabled, will show the checks that are available to be collected "
+                                                 "with your current progress.")
+                                        .Color(THEME_COLOR))) {
+            enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0);
+
+            if (GameInteractor::IsSaveLoaded(true)) {
+                RecalculateAvailableChecks();
+            }
+        }
+        ImGui::EndDisabled();
+
+        // Filtering settings
+        UIWidgets::PaddedSeparator();
+        UIWidgets::CVarCheckbox(
+            "Filter Empty Areas", CVAR_TRACKER_CHECK("HideFilteredAreas"),
+            UIWidgets::CheckboxOptions()
+                .Tooltip("If enabled, will hide area headers that have no locations matching filter")
+                .Color(THEME_COLOR)
+                .DefaultValue(true));
+
+        ImGui::TableNextColumn();
+
+        CheckTracker::ImGuiDrawTwoColorPickerSection("Area Incomplete", CVAR_TRACKER_CHECK("AreaIncomplete.MainColor"),
+                                                     CVAR_TRACKER_CHECK("AreaIncomplete.ExtraColor"),
+                                                     Color_Area_Incomplete_Main, Color_Area_Incomplete_Extra,
+                                                     Color_Main_Default, Color_Area_Incomplete_Extra_Default,
+                                                     CVAR_TRACKER_CHECK("AreaIncomplete.Hide"), "", THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection("Area Complete", CVAR_TRACKER_CHECK("AreaComplete.MainColor"),
+                                                     CVAR_TRACKER_CHECK("AreaComplete.ExtraColor"),
+                                                     Color_Area_Complete_Main, Color_Area_Complete_Extra,
+                                                     Color_Main_Default, Color_Area_Complete_Extra_Default,
+                                                     CVAR_TRACKER_CHECK("AreaComplete.Hide"), "", THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Unchecked", CVAR_TRACKER_CHECK("Unchecked.MainColor"), CVAR_TRACKER_CHECK("Unchecked.ExtraColor"),
+            Color_Unchecked_Main, Color_Unchecked_Extra, Color_Main_Default, Color_Unchecked_Extra_Default,
+            CVAR_TRACKER_CHECK("Unchecked.Hide"), "Checks you have not interacted with at all.", THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Skipped", CVAR_TRACKER_CHECK("Skipped.MainColor"), CVAR_TRACKER_CHECK("Skipped.ExtraColor"),
+            Color_Skipped_Main, Color_Skipped_Extra, Color_Main_Default, Color_Skipped_Extra_Default,
+            CVAR_TRACKER_CHECK("Skipped.Hide"), "", THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Seen", CVAR_TRACKER_CHECK("Seen.MainColor"), CVAR_TRACKER_CHECK("Seen.ExtraColor"), Color_Seen_Main,
+            Color_Seen_Extra, Color_Main_Default, Color_Seen_Extra_Default, CVAR_TRACKER_CHECK("Seen.Hide"),
+            "Used for shops. Shows item names for shop slots when walking in, and prices when highlighting them in buy "
+            "mode.",
+            THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Scummed", CVAR_TRACKER_CHECK("Scummed.MainColor"), CVAR_TRACKER_CHECK("Scummed.ExtraColor"),
+            Color_Scummed_Main, Color_Scummed_Extra, Color_Main_Default, Color_Scummed_Extra_Default,
+            CVAR_TRACKER_CHECK("Scummed.Hide"),
+            "Checks you collect, but then reload before saving so you no longer have them.", THEME_COLOR);
+        // CheckTracker::ImGuiDrawTwoColorPickerSection("Hinted (WIP)",     CVAR_TRACKER_CHECK("Hinted.MainColor"),
+        // CVAR_TRACKER_CHECK("Hinted.ExtraColor"),          Color_Hinted_Main,            Color_Hinted_Extra,
+        // Color_Main_Default, Color_Hinted_Extra_Default,          CVAR_TRACKER_CHECK("Hinted.Hide"),         "",
+        // THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Collected", CVAR_TRACKER_CHECK("Collected.MainColor"), CVAR_TRACKER_CHECK("Collected.ExtraColor"),
+            Color_Collected_Main, Color_Collected_Extra, Color_Main_Default, Color_Collected_Extra_Default,
+            CVAR_TRACKER_CHECK("Collected.Hide"), "Checks you have collected without saving or reloading yet.",
+            THEME_COLOR);
+        CheckTracker::ImGuiDrawTwoColorPickerSection(
+            "Saved", CVAR_TRACKER_CHECK("Saved.MainColor"), CVAR_TRACKER_CHECK("Saved.ExtraColor"), Color_Saved_Main,
+            Color_Saved_Extra, Color_Main_Default, Color_Saved_Extra_Default, CVAR_TRACKER_CHECK("Saved.Hide"),
+            "Checks that you saved the game while having collected.", THEME_COLOR);
+
+        ImGui::PopStyleVar(1);
     }
-    UIWidgets::EnhancementCheckbox("Vanilla/MQ Dungeon Spoilers", CVAR_TRACKER_CHECK("MQSpoilers"));
-    UIWidgets::Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. Otherwise, Vanilla/MQ dungeon locations must be unlocked.");
-    if (UIWidgets::EnhancementCheckbox("Hide unshuffled shop item checks", CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), false, "", UIWidgets::CheckboxGraphics::Cross, false)) {
-        hideShopUnshuffledChecks = !hideShopUnshuffledChecks;
-        UpdateFilters();
-    }
-    UIWidgets::Tooltip("If enabled, will prevent the tracker from displaying slots with non-shop-item shuffles.");
-    if (UIWidgets::EnhancementCheckbox("Always show gold skulltulas", CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), false, "")) {
-        alwaysShowGS = !alwaysShowGS;
-        UpdateFilters();
-    }
-    UIWidgets::Tooltip("If enabled, will show GS locations in the tracker regardless of tokensanity settings.");
-    UIWidgets::EnhancementCheckbox("Show Logic", "gCheckTrackerOptionShowLogic");
-    UIWidgets::Tooltip("If enabled, will show a check's logic when hovering over it.");
-
-    // Filtering settings
-    UIWidgets::PaddedSeparator();
-    UIWidgets::EnhancementCheckbox("Filter Empty Areas", CVAR_TRACKER_CHECK("HideFilteredAreas"), false, "", UIWidgets::CheckboxGraphics::Checkmark, true);
-    UIWidgets::Tooltip("If enabled, will hide area headers that have no locations matching filter");
-
-    ImGui::TableNextColumn();
-
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Area Incomplete",  CVAR_TRACKER_CHECK("AreaIncomplete.MainColor"),   CVAR_TRACKER_CHECK("AreaIncomplete.ExtraColor"),  Color_Area_Incomplete_Main,   Color_Area_Incomplete_Extra,  Color_Main_Default, Color_Area_Incomplete_Extra_Default, CVAR_TRACKER_CHECK("AreaIncomplete.Hide"), "");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Area Complete",    CVAR_TRACKER_CHECK("AreaComplete.MainColor"),     CVAR_TRACKER_CHECK("AreaComplete.ExtraColor"),    Color_Area_Complete_Main,     Color_Area_Complete_Extra,    Color_Main_Default, Color_Area_Complete_Extra_Default,   CVAR_TRACKER_CHECK("AreaComplete.Hide"),   "");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Unchecked",        CVAR_TRACKER_CHECK("Unchecked.MainColor"),        CVAR_TRACKER_CHECK("Unchecked.ExtraColor"),       Color_Unchecked_Main,         Color_Unchecked_Extra,        Color_Main_Default, Color_Unchecked_Extra_Default,       CVAR_TRACKER_CHECK("Unchecked.Hide"),      "Checks you have not interacted with at all.");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Skipped",          CVAR_TRACKER_CHECK("Skipped.MainColor"),          CVAR_TRACKER_CHECK("Skipped.ExtraColor"),         Color_Skipped_Main,           Color_Skipped_Extra,          Color_Main_Default, Color_Skipped_Extra_Default,         CVAR_TRACKER_CHECK("Skipped.Hide"),        "");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Seen",             CVAR_TRACKER_CHECK("Seen.MainColor"),             CVAR_TRACKER_CHECK("Seen.ExtraColor"),            Color_Seen_Main,              Color_Seen_Extra,             Color_Main_Default, Color_Seen_Extra_Default,            CVAR_TRACKER_CHECK("Seen.Hide"),           "Used for shops. Shows item names for shop slots when walking in, and prices when highlighting them in buy mode.");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Scummed",          CVAR_TRACKER_CHECK("Scummed.MainColor"),          CVAR_TRACKER_CHECK("Scummed.ExtraColor"),         Color_Scummed_Main,           Color_Scummed_Extra,          Color_Main_Default, Color_Scummed_Extra_Default,         CVAR_TRACKER_CHECK("Scummed.Hide"),        "Checks you collect, but then reload before saving so you no longer have them.");
-    //CheckTracker::ImGuiDrawTwoColorPickerSection("Hinted (WIP)",     CVAR_TRACKER_CHECK("Hinted.MainColor"),           CVAR_TRACKER_CHECK("Hinted.ExtraColor"),          Color_Hinted_Main,            Color_Hinted_Extra,           Color_Main_Default, Color_Hinted_Extra_Default,          CVAR_TRACKER_CHECK("Hinted.Hide"),         "");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Collected",        CVAR_TRACKER_CHECK("Collected.MainColor"),        CVAR_TRACKER_CHECK("Collected.ExtraColor"),       Color_Collected_Main,         Color_Collected_Extra,        Color_Main_Default, Color_Collected_Extra_Default,       CVAR_TRACKER_CHECK("Collected.Hide"),      "Checks you have collected without saving or reloading yet.");
-    CheckTracker::ImGuiDrawTwoColorPickerSection("Saved",            CVAR_TRACKER_CHECK("Saved.MainColor"),            CVAR_TRACKER_CHECK("Saved.ExtraColor"),           Color_Saved_Main,             Color_Saved_Extra,            Color_Main_Default, Color_Saved_Extra_Default,           CVAR_TRACKER_CHECK("Saved.Hide"),          "Checks that you saved the game while having collected.");
-
-    ImGui::PopStyleVar(1);
     ImGui::EndTable();
 }
 
@@ -1796,9 +2227,7 @@ void CheckTrackerWindow::InitElement() {
     sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, SECTION_PARENT_NONE);
     SaveManager::Instance->AddLoadFunction("trackerData", 1, LoadFile);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(CheckTrackerLoadGame);
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](uint32_t fileNum) {
-        Teardown();
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](uint32_t fileNum) { Teardown(); });
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(CheckTrackerItemReceive);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>(CheckTrackerTransition);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnShopSlotChange>(CheckTrackerShopSlotChange);
@@ -1807,36 +2236,5 @@ void CheckTrackerWindow::InitElement() {
 }
 
 void CheckTrackerWindow::UpdateElement() {
-    Color_Background            = CVarGetColor(CVAR_TRACKER_CHECK("BgColor"),                     Color_Bg_Default);
-    Color_Area_Incomplete_Main  = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.MainColor"),    Color_Main_Default);
-    Color_Area_Incomplete_Extra = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.ExtraColor"),   Color_Area_Incomplete_Extra_Default);
-    Color_Area_Complete_Main    = CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.MainColor"),      Color_Main_Default);
-    Color_Area_Complete_Extra   = CVarGetColor(CVAR_TRACKER_CHECK("AreaComplete.ExtraColor"),     Color_Area_Complete_Extra_Default);
-    Color_Unchecked_Main        = CVarGetColor(CVAR_TRACKER_CHECK("Unchecked.MainColor"),         Color_Main_Default);
-    Color_Unchecked_Extra       = CVarGetColor(CVAR_TRACKER_CHECK("Unchecked.ExtraColor"),        Color_Unchecked_Extra_Default);
-    Color_Skipped_Main          = CVarGetColor(CVAR_TRACKER_CHECK("Skipped.MainColor"),           Color_Main_Default);
-    Color_Skipped_Extra         = CVarGetColor(CVAR_TRACKER_CHECK("Skipped.ExtraColor"),          Color_Skipped_Extra_Default);
-    Color_Seen_Main             = CVarGetColor(CVAR_TRACKER_CHECK("Seen.MainColor"),              Color_Main_Default);
-    Color_Seen_Extra            = CVarGetColor(CVAR_TRACKER_CHECK("Seen.ExtraColor"),             Color_Seen_Extra_Default);
-    Color_Hinted_Main           = CVarGetColor(CVAR_TRACKER_CHECK("Hinted.MainColor"),            Color_Main_Default);
-    Color_Hinted_Extra          = CVarGetColor(CVAR_TRACKER_CHECK("Hinted.ExtraColor"),           Color_Hinted_Extra_Default);
-    Color_Collected_Main        = CVarGetColor(CVAR_TRACKER_CHECK("Collected.MainColor"),         Color_Main_Default);
-    Color_Collected_Extra       = CVarGetColor(CVAR_TRACKER_CHECK("Collected.ExtraColor"),        Color_Collected_Extra_Default);
-    Color_Scummed_Main          = CVarGetColor(CVAR_TRACKER_CHECK("Scummed.MainColor"),           Color_Main_Default);
-    Color_Scummed_Extra         = CVarGetColor(CVAR_TRACKER_CHECK("Scummed.ExtraColor"),          Color_Scummed_Extra_Default);
-    Color_Saved_Main            = CVarGetColor(CVAR_TRACKER_CHECK("Saved.MainColor"),             Color_Main_Default);
-    Color_Saved_Extra           = CVarGetColor(CVAR_TRACKER_CHECK("Saved.ExtraColor"),            Color_Saved_Extra_Default);
-    hideUnchecked               = CVarGetInteger(CVAR_TRACKER_CHECK("Unchecked.Hide"), 0);
-    hideScummed                 = CVarGetInteger(CVAR_TRACKER_CHECK("Scummed.Hide"), 0);
-    hideSeen                    = CVarGetInteger(CVAR_TRACKER_CHECK("Seen.Hide"), 0);
-    hideSkipped                 = CVarGetInteger(CVAR_TRACKER_CHECK("Skipped.Hide"), 0);
-    hideSaved                   = CVarGetInteger(CVAR_TRACKER_CHECK("Saved.Hide"), 0);
-    hideCollected               = CVarGetInteger(CVAR_TRACKER_CHECK("Collected.Hide"), 0);
-    showHidden                  = CVarGetInteger(CVAR_TRACKER_CHECK("ShowHidden"), 0);
-    mystery                     = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0);
-    showLogicTooltip            = CVarGetInteger("gCheckTrackerOptionShowLogic", 0);
-
-    hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 1);
-    alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0);
 }
 } // namespace CheckTracker
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index 8519104890..38c38a39b8 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -2,27 +2,28 @@
 #include <nlohmann/json.hpp>
 #include "randomizerTypes.h"
 #include "randomizer_check_objects.h"
+#include "soh/SohGui/UIWidgets.hpp"
 
 #include <libultraship/libultraship.h>
 
 namespace CheckTracker {
 
-class CheckTrackerSettingsWindow : public Ship::GuiWindow {
+class CheckTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
-    ~CheckTrackerSettingsWindow() {};
+    ~CheckTrackerSettingsWindow(){};
 
   protected:
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
-class CheckTrackerWindow : public Ship::GuiWindow {
+class CheckTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;
-    ~CheckTrackerWindow() {};
+    ~CheckTrackerWindow(){};
 
   protected:
     void InitElement() override;
@@ -30,18 +31,18 @@ class CheckTrackerWindow : public Ship::GuiWindow {
     void UpdateElement() override;
 };
 
-//Converts an index into a Little Endian bitmask, as follows:
-//00: 0000000100000000
-//01: 0000001000000000
+// Converts an index into a Little Endian bitmask, as follows:
+// 00: 0000000100000000
+// 01: 0000001000000000
 //...
-//06: 0100000000000000
-//07: 1000000000000000
-//08: 0000000000000001
-//09: 0000000000000010
+// 06: 0100000000000000
+// 07: 1000000000000000
+// 08: 0000000000000001
+// 09: 0000000000000010
 //...
-//14: 0000000001000000
-//15: 0000000010000000
-//repeat...
+// 14: 0000000001000000
+// 15: 0000000010000000
+// repeat...
 #define INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(idx) (0x8000 >> (7 - (idx % 8) + ((idx % 16) / 8) * 8))
 
 void Teardown();
@@ -60,4 +61,6 @@ void UpdateAllOrdering();
 void UpdateAllAreas();
 void RecalculateAllAreaTotals();
 void SpoilAreaFromCheck(RandomizerCheck rc);
+void RecalculateAvailableChecks(RandomizerRegion startingRegion = RR_ROOT);
+void CheckTracker_LoadFromPreset(nlohmann::json info);
 } // namespace CheckTracker
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
index 3ad26b1f6f..e32223124e 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@@ -1,7 +1,8 @@
 /*
  * Much of the code here was borrowed from https://github.com/gamestabled/OoT3D_Randomizer/blob/main/code/src/entrance.c
- * It's been adapted for SoH to use our gPlayState vs their gGlobalContext with slightly different named properties, and our enums for some scenes/entrances.
- * 
+ * It's been adapted for SoH to use our gPlayState vs their gGlobalContext with slightly different named properties, and
+ * our enums for some scenes/entrances.
+ *
  * Unlike 3DS rando, we need to be able to support the user loading up vanilla and rando saves, so the logic around
  * modifying the entrance table requires that we save the original table and reset whenever loading a vanilla save.
  * A modified dynamicExitList is manually included since we can't read it from addressing like 3ds rando.
@@ -18,8 +19,8 @@
 
 extern PlayState* gPlayState;
 
-//Overwrite the dynamic exit for the OGC Fairy Fountain to be 0x3E8 instead
-//of 0x340 (0x340 will stay as the exit for the HC Fairy Fountain -> Castle Grounds)
+// Overwrite the dynamic exit for the OGC Fairy Fountain to be 0x3E8 instead
+// of 0x340 (0x340 will stay as the exit for the HC Fairy Fountain -> Castle Grounds)
 s16 dynamicExitList[] = {
     ENTR_DEATH_MOUNTAIN_TRAIL_GREAT_FAIRY_EXIT,
     ENTR_DEATH_MOUNTAIN_CRATER_GREAT_FAIRY_EXIT,
@@ -34,19 +35,23 @@ s16 dynamicExitList[] = {
     ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,
     ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY,
     ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT, // HC Fairy
-    ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT
+    ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT,
 };
 
-// Warp Song indices array : 0x53C33C = { ENTR_SACRED_FOREST_MEADOW_WARP_PAD, ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, ENTR_LAKE_HYLIA_WARP_PAD, ENTR_DESERT_COLOSSUS_WARP_PAD, ENTR_GRAVEYARD_WARP_PAD, ENTR_TEMPLE_OF_TIME_WARP_PAD }
+// Warp Song indices array:
+// 0x53C33C = {
+//     ENTR_SACRED_FOREST_MEADOW_WARP_PAD, ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, ENTR_LAKE_HYLIA_WARP_PAD,
+//     ENTR_DESERT_COLOSSUS_WARP_PAD, ENTR_GRAVEYARD_WARP_PAD, ENTR_TEMPLE_OF_TIME_WARP_PAD
+// }
 
 // Owl Flights : 0x492064 and 0x492080
 
-static s16 entranceOverrideTable[ENTRANCE_TABLE_SIZE] = {0};
+static s16 entranceOverrideTable[ENTRANCE_TABLE_SIZE] = { 0 };
 // Boss scenes (normalize boss scene range to 0 on lookup) mapped to save/death warp entrance
-static s16 bossSceneSaveDeathWarps[SHUFFLEABLE_BOSS_COUNT] = {0};
-static ActorEntry modifiedLinkActorEntry = {0};
+static s16 bossSceneSaveDeathWarps[SHUFFLEABLE_BOSS_COUNT] = { 0 };
+static ActorEntry modifiedLinkActorEntry = { 0 };
 
-EntranceInfo originalEntranceTable[ENTRANCE_TABLE_SIZE] = {0};
+EntranceInfo originalEntranceTable[ENTRANCE_TABLE_SIZE] = { 0 };
 
 typedef struct {
     s16 entryway;
@@ -59,6 +64,7 @@ typedef struct {
 } DungeonEntranceInfo;
 
 static DungeonEntranceInfo dungeons[] = {
+    // clang-format off
     //entryway                       exit,                                              boss,                               reverse,                        bluewarp,                                          dungeon scene,         boss scene
     { ENTR_DEKU_TREE_ENTRANCE,       ENTR_KOKIRI_FOREST_OUTSIDE_DEKU_TREE,              ENTR_DEKU_TREE_BOSS_ENTRANCE,       ENTR_DEKU_TREE_BOSS_DOOR,       ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP,            SCENE_DEKU_TREE,       SCENE_DEKU_TREE_BOSS },
     { ENTR_DODONGOS_CAVERN_ENTRANCE, ENTR_DEATH_MOUNTAIN_TRAIL_OUTSIDE_DODONGOS_CAVERN, ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE, ENTR_DODONGOS_CAVERN_BOSS_DOOR, ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP,       SCENE_DODONGOS_CAVERN, SCENE_DODONGOS_CAVERN_BOSS },
@@ -68,6 +74,8 @@ static DungeonEntranceInfo dungeons[] = {
     { ENTR_WATER_TEMPLE_ENTRANCE,    ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE,                    ENTR_WATER_TEMPLE_BOSS_ENTRANCE,    ENTR_WATER_TEMPLE_BOSS_DOOR,    ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP,            SCENE_WATER_TEMPLE,    SCENE_WATER_TEMPLE_BOSS },
     { ENTR_SPIRIT_TEMPLE_ENTRANCE,   ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE,               ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE,   ENTR_SPIRIT_TEMPLE_BOSS_DOOR,   ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP,      SCENE_SPIRIT_TEMPLE,   SCENE_SPIRIT_TEMPLE_BOSS },
     { ENTR_SHADOW_TEMPLE_ENTRANCE,   ENTR_GRAVEYARD_OUTSIDE_TEMPLE,                     ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE,   ENTR_SHADOW_TEMPLE_BOSS_DOOR,   ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP,            SCENE_SHADOW_TEMPLE,   SCENE_SHADOW_TEMPLE_BOSS },
+
+    // clang-format on
 };
 
 static s8 hasCopiedEntranceTable = 0;
@@ -81,16 +89,16 @@ u8 Entrance_EntranceIsNull(EntranceOverride* entranceOverride) {
 }
 
 static void Entrance_SeparateOGCFairyFountainExit(void) {
-    //Overwrite unused entrance 0x03E8 (ENTR_POTION_SHOP_KAKARIKO_1) with values from 0x0340 (ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT) to use it as the
-    //exit from OGC Great Fairy Fountain -> Castle Grounds
+    // Overwrite unused entrance 0x03E8 (ENTR_POTION_SHOP_KAKARIKO_1) with values from 0x0340
+    // (ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT) to use it as the exit from OGC Great Fairy Fountain -> Castle Grounds
     for (size_t i = 0; i < 4; ++i) {
         gEntranceTable[ENTR_POTION_SHOP_KAKARIKO_1 + i] = gEntranceTable[ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT + i];
     }
 }
 
 static void Entrance_SeparateAdultSpawnAndPrelude() {
-    // Overwrite unused entrance 0x0282 (ENTR_HYRULE_FIELD_10) with values from 0x05F4 (ENTR_TEMPLE_OF_TIME_WARP_PAD) to use it as the
-    // Adult Spawn index and separate it from Prelude of Light
+    // Overwrite unused entrance 0x0282 (ENTR_HYRULE_FIELD_10) with values from 0x05F4 (ENTR_TEMPLE_OF_TIME_WARP_PAD) to
+    // use it as the Adult Spawn index and separate it from Prelude of Light
     for (size_t i = 0; i < 4; ++i) {
         gEntranceTable[ENTR_HYRULE_FIELD_10 + i] = gEntranceTable[ENTR_TEMPLE_OF_TIME_WARP_PAD + i];
     }
@@ -101,10 +109,12 @@ static void Entrance_ReplaceChildTempleWarps() {
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF ||
         Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) {
         // Forest Temple
-        gEntranceTable[ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP] = gEntranceTable[ENTR_SACRED_FOREST_MEADOW_WARP_PAD];
+        gEntranceTable[ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP] =
+            gEntranceTable[ENTR_SACRED_FOREST_MEADOW_WARP_PAD];
         gEntranceTable[ENTR_SACRED_FOREST_MEADOW_3_1] = gEntranceTable[ENTR_SACRED_FOREST_MEADOW_2_1];
         // Fire Temple
-        gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP] = gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD];
+        gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP] =
+            gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD];
         gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_5_1] = gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_4_1];
         // Water Temple
         gEntranceTable[ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP] = gEntranceTable[ENTR_LAKE_HYLIA_WARP_PAD];
@@ -142,7 +152,8 @@ void Entrance_Init(void) {
     if (Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH)) {
         gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].scene = SCENE_CASTLE_COURTYARD_ZELDA;
         gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].spawn = 0;
-        gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].field = ENTRANCE_INFO_FIELD(false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE);
+        gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].field =
+            ENTRANCE_INFO_FIELD(false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE);
     }
 
     // Delete the title card and add a fade in for Hyrule Field from Ocarina of Time cutscene
@@ -201,12 +212,12 @@ void Entrance_Init(void) {
         }
 
         // Overwrite grotto related indices
-        if (originalIndex >= ENTRANCE_GROTTO_EXIT_START) {
+        if (originalIndex >= ENTRANCE_GROTTO_EXIT_START && originalIndex < ENTRANCE_GROTTO_EXIT_START + NUM_GROTTOS) {
             Grotto_SetExitOverride(originalIndex, overrideIndex);
             continue;
         }
 
-        if (originalIndex >= ENTRANCE_GROTTO_LOAD_START && originalIndex < ENTRANCE_GROTTO_EXIT_START) {
+        if (originalIndex >= ENTRANCE_GROTTO_LOAD_START && originalIndex < ENTRANCE_GROTTO_LOAD_START + NUM_GROTTOS) {
             Grotto_SetLoadOverride(originalIndex, overrideIndex);
             continue;
         }
@@ -214,10 +225,10 @@ void Entrance_Init(void) {
         // Overwrite the indices which we want to shuffle, leaving the rest as they are
         entranceOverrideTable[originalIndex] = overrideIndex;
 
-        //Override both land and water entrances for Hyrule Field -> ZR Front and vice versa
-        if (originalIndex == ENTR_ZORAS_RIVER_WEST_EXIT) { //Hyrule Field -> ZR Front land entrance
+        // Override both land and water entrances for Hyrule Field -> ZR Front and vice versa
+        if (originalIndex == ENTR_ZORAS_RIVER_WEST_EXIT) { // Hyrule Field -> ZR Front land entrance
             entranceOverrideTable[ENTR_ZORAS_RIVER_3] = overrideIndex;
-        } else if (originalIndex == ENTR_HYRULE_FIELD_RIVER_EXIT) { //ZR Front -> Hyrule Field land entrance
+        } else if (originalIndex == ENTR_HYRULE_FIELD_RIVER_EXIT) { // ZR Front -> Hyrule Field land entrance
             entranceOverrideTable[ENTR_HYRULE_FIELD_14] = overrideIndex;
         }
     }
@@ -242,7 +253,9 @@ void Entrance_Init(void) {
             for (s16 i = 0; i < 4; i++) {
                 // Zero out the bit in the field which tells the game to keep playing
                 // background music for all four scene setups at each index
-                gEntranceTable[override + i].field &= ~ENTRANCE_INFO_CONTINUE_BGM_FLAG;
+                if (override + i < ENTRANCE_TABLE_SIZE) {
+                    gEntranceTable[override + i].field &= ~ENTRANCE_INFO_CONTINUE_BGM_FLAG;
+                }
             }
         }
     }
@@ -269,7 +282,9 @@ s16 Entrance_PeekNextIndexOverride(int16_t nextEntranceIndex) {
 s16 Entrance_OverrideNextIndex(s16 nextEntranceIndex) {
     // Exiting through the crawl space from Hyrule Castle courtyard is the same exit as leaving Ganon's castle
     // Don't override the entrance if we came from the Castle courtyard (day and night scenes)
-    if (gPlayState != NULL && (gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_DAY || gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_NIGHT) &&
+    if (gPlayState != NULL &&
+        (gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_DAY ||
+         gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_NIGHT) &&
         nextEntranceIndex == ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT) {
         return nextEntranceIndex;
     }
@@ -316,37 +331,38 @@ void Entrance_SetGameOverEntrance(void) {
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF &&
         scene >= SCENE_DEKU_TREE_BOSS && scene <= SCENE_SHADOW_TEMPLE_BOSS) {
         // Normalize boss scene range to 0 on lookup and handle for grotto entrances
-        gSaveContext.entranceIndex = Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
+        gSaveContext.entranceIndex =
+            Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
         return;
     }
 
-    //Set the current entrance depending on which entrance the player last came through
+    // Set the current entrance depending on which entrance the player last came through
     switch (gSaveContext.entranceIndex) {
-        case ENTR_DEKU_TREE_BOSS_ENTRANCE : //Deku Tree Boss Room
+        case ENTR_DEKU_TREE_BOSS_ENTRANCE: // Deku Tree Boss Room
             gSaveContext.entranceIndex = ENTR_DEKU_TREE_ENTRANCE;
             return;
-        case ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE : //Dodongos Cavern Boss Room
+        case ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE: // Dodongos Cavern Boss Room
             gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_ENTRANCE;
             return;
-        case ENTR_JABU_JABU_BOSS_ENTRANCE : //Jabu Jabus Belly Boss Room
+        case ENTR_JABU_JABU_BOSS_ENTRANCE: // Jabu Jabus Belly Boss Room
             gSaveContext.entranceIndex = ENTR_JABU_JABU_ENTRANCE;
             return;
-        case ENTR_FOREST_TEMPLE_BOSS_ENTRANCE : //Forest Temple Boss Room
+        case ENTR_FOREST_TEMPLE_BOSS_ENTRANCE: // Forest Temple Boss Room
             gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_ENTRANCE;
             return;
-        case ENTR_FIRE_TEMPLE_BOSS_ENTRANCE : //Fire Temple Boss Room
+        case ENTR_FIRE_TEMPLE_BOSS_ENTRANCE: // Fire Temple Boss Room
             gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_ENTRANCE;
             return;
-        case ENTR_WATER_TEMPLE_BOSS_ENTRANCE : //Water Temple Boss Room
+        case ENTR_WATER_TEMPLE_BOSS_ENTRANCE: // Water Temple Boss Room
             gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_ENTRANCE;
             return;
-        case ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE : //Spirit Temple Boss Room
+        case ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE: // Spirit Temple Boss Room
             gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_ENTRANCE;
             return;
-        case ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE : //Shadow Temple Boss Room
+        case ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE: // Shadow Temple Boss Room
             gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_ENTRANCE;
             return;
-        case ENTR_GANONDORF_BOSS_0 : //Ganondorf Boss Room
+        case ENTR_GANONDORF_BOSS_0:                           // Ganondorf Boss Room
             gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb
             return;
     }
@@ -361,7 +377,8 @@ void Entrance_SetSavewarpEntrance(void) {
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF &&
         scene >= SCENE_DEKU_TREE_BOSS && scene <= SCENE_SHADOW_TEMPLE_BOSS) {
         // Normalize boss scene range to 0 on lookup and handle for grotto entrances
-        gSaveContext.entranceIndex = Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
+        gSaveContext.entranceIndex =
+            Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
         return;
     }
 
@@ -371,15 +388,15 @@ void Entrance_SetSavewarpEntrance(void) {
         gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_ENTRANCE;
     } else if (scene == SCENE_JABU_JABU || scene == SCENE_JABU_JABU_BOSS) {
         gSaveContext.entranceIndex = ENTR_JABU_JABU_ENTRANCE;
-    } else if (scene == SCENE_FOREST_TEMPLE || scene == SCENE_FOREST_TEMPLE_BOSS) { //Forest Temple Boss Room
+    } else if (scene == SCENE_FOREST_TEMPLE || scene == SCENE_FOREST_TEMPLE_BOSS) { // Forest Temple Boss Room
         gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_ENTRANCE;
-    } else if (scene == SCENE_FIRE_TEMPLE || scene == SCENE_FIRE_TEMPLE_BOSS) { //Fire Temple Boss Room
+    } else if (scene == SCENE_FIRE_TEMPLE || scene == SCENE_FIRE_TEMPLE_BOSS) { // Fire Temple Boss Room
         gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_ENTRANCE;
-    } else if (scene == SCENE_WATER_TEMPLE || scene == SCENE_WATER_TEMPLE_BOSS) { //Water Temple Boss Room
+    } else if (scene == SCENE_WATER_TEMPLE || scene == SCENE_WATER_TEMPLE_BOSS) { // Water Temple Boss Room
         gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_ENTRANCE;
-    } else if (scene == SCENE_SPIRIT_TEMPLE || scene == SCENE_SPIRIT_TEMPLE_BOSS) { //Spirit Temple Boss Room
+    } else if (scene == SCENE_SPIRIT_TEMPLE || scene == SCENE_SPIRIT_TEMPLE_BOSS) { // Spirit Temple Boss Room
         gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_ENTRANCE;
-    } else if (scene == SCENE_SHADOW_TEMPLE || scene == SCENE_SHADOW_TEMPLE_BOSS) { //Shadow Temple Boss Room
+    } else if (scene == SCENE_SHADOW_TEMPLE || scene == SCENE_SHADOW_TEMPLE_BOSS) { // Shadow Temple Boss Room
         gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_ENTRANCE;
     } else if (scene == SCENE_BOTTOM_OF_THE_WELL) { // BOTW
         gSaveContext.entranceIndex = ENTR_BOTTOM_OF_THE_WELL_ENTRANCE;
@@ -389,24 +406,29 @@ void Entrance_SetSavewarpEntrance(void) {
         gSaveContext.entranceIndex = ENTR_ICE_CAVERN_ENTRANCE;
     } else if (scene == SCENE_INSIDE_GANONS_CASTLE) {
         gSaveContext.entranceIndex = ENTR_INSIDE_GANONS_CASTLE_ENTRANCE;
-    } else if (scene == SCENE_GANONS_TOWER || scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE || scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR || scene == SCENE_GANON_BOSS || scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) {
-        gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb
-    } else if (scene == SCENE_THIEVES_HIDEOUT) { // Theives hideout
+    } else if (scene == SCENE_GANONS_TOWER || scene == SCENE_GANONDORF_BOSS ||
+               scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE || scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR ||
+               scene == SCENE_GANON_BOSS || scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) {
+        gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0;    // Inside Ganon's Castle -> Ganon's Tower Climb
+    } else if (scene == SCENE_THIEVES_HIDEOUT) {             // Theives hideout
         gSaveContext.entranceIndex = ENTR_THIEVES_HIDEOUT_0; // Gerudo Fortress -> Thieve's Hideout spawn 0
     } else if (scene == SCENE_LINKS_HOUSE &&
                Randomizer_GetSettingValue(RSK_SHUFFLE_INTERIOR_ENTRANCES) != RO_INTERIOR_ENTRANCE_SHUFFLE_ALL) {
         // Save warping in Link's house keeps the player there if Link's house not shuffled,
         // otherwise fallback to regular spawns
         gSaveContext.entranceIndex = ENTR_LINKS_HOUSE_CHILD_SPAWN;
-    } else if (CVarGetInteger(CVAR_ENHANCEMENT("RememberSaveLocation"), 0) && scene != SCENE_FAIRYS_FOUNTAIN && scene != SCENE_GROTTOS &&
-               gSaveContext.entranceIndex != ENTR_LOAD_OPENING) {
+    } else if (CVarGetInteger(CVAR_ENHANCEMENT("RememberSaveLocation"), 0) && scene != SCENE_FAIRYS_FOUNTAIN &&
+               scene != SCENE_GROTTOS && gSaveContext.entranceIndex != ENTR_LOAD_OPENING) {
         // Use the saved entrance value with remember save location, except when in grottos/fairy fountains or if
         // the entrance index is -1 (new save)
         return;
     } else if (LINK_IS_CHILD) {
         gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_LINKS_HOUSE_CHILD_SPAWN); // Child Overworld Spawn
     } else {
-        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_10); // Adult Overworld Spawn (Normally 0x5F4 (ENTR_TEMPLE_OF_TIME_WARP_PAD), but 0x282 (ENTR_HYRULE_FIELD_10) has been repurposed to differentiate from Prelude which also uses 0x5F4)
+        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(
+            ENTR_HYRULE_FIELD_10); // Adult Overworld Spawn (Normally 0x5F4 (ENTR_TEMPLE_OF_TIME_WARP_PAD), but 0x282
+                                   // (ENTR_HYRULE_FIELD_10) has been repurposed to differentiate from Prelude which
+                                   // also uses 0x5F4)
     }
 }
 
@@ -464,14 +486,14 @@ void Entrance_OverrideBlueWarp(void) {
     }
 
     switch (gSaveContext.entranceIndex) {
-        case ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP: // Gohma blue warp
-        case ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP: // KD blue warp
-        case ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP: // Barinade blue warp
+        case ENTR_KOKIRI_FOREST_DEKU_TREE_BLUE_WARP:            // Gohma blue warp
+        case ENTR_DEATH_MOUNTAIN_TRAIL_DODONGO_BLUE_WARP:       // KD blue warp
+        case ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP:           // Barinade blue warp
         case ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP: // Phantom Ganon blue warp
-        case ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP: // Volvagia blue warp
-        case ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP: // Morpha blue warp
-        case ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP: // Bongo-Bongo blue warp
-        case ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP: // Twinrova blue warp
+        case ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP:  // Volvagia blue warp
+        case ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP:            // Morpha blue warp
+        case ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP:      // Bongo-Bongo blue warp
+        case ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP:            // Twinrova blue warp
             gSaveContext.entranceIndex = Entrance_OverrideNextIndex(gSaveContext.entranceIndex);
             return;
     }
@@ -481,16 +503,18 @@ void Entrance_EnableFW(void) {
     Player* player = GET_PLAYER(gPlayState);
     // Leave restriction in Tower Collapse Interior, Castle Collapse, Treasure Box Shop, Tower Collapse Exterior,
     // Grottos area, Fishing Pond, Ganon Battle and for states that disable buttons.
-    if (!false /* farores wind anywhere */ ||
-        gPlayState->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR || gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE ||
+    if (!false /* farores wind anywhere */ || gPlayState->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR ||
+        gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE ||
         (gPlayState->sceneNum == SCENE_TREASURE_BOX_SHOP && !false /* shuffled chest mini game */) ||
         gPlayState->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR || gPlayState->sceneNum == SCENE_GROTTOS ||
         gPlayState->sceneNum == SCENE_FISHING_POND || gPlayState->sceneNum == SCENE_GANON_BOSS ||
-        gSaveContext.eventInf[0] & 0x1 ||   // Ingo's Minigame state
-        player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_WATER) || // Swimming, riding horse, Down A, hanging from a ledge
-        player->stateFlags2 & PLAYER_STATE2_CRAWLING    // Blank A
+        gSaveContext.eventInf[0] & 0x1 || // Ingo's Minigame state
+        player->stateFlags1 &
+            (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_ON_HORSE |
+             PLAYER_STATE1_IN_WATER) ||              // Swimming, riding horse, Down A, hanging from a ledge
+        player->stateFlags2 & PLAYER_STATE2_CRAWLING // Blank A
         // Shielding, spinning and getting skull tokens still disable buttons automatically
-        ) {
+    ) {
         return;
     }
 
@@ -505,8 +529,8 @@ void Entrance_EnableFW(void) {
 void Entrance_HandleEponaState(void) {
     s32 entrance = gPlayState->nextEntranceIndex;
     Player* player = GET_PLAYER(gPlayState);
-    //If Link is riding Epona but he's about to go through an entrance where she can't spawn,
-    //unset the Epona flag to avoid Master glitch, and restore temp B.
+    // If Link is riding Epona but he's about to go through an entrance where she can't spawn,
+    // unset the Epona flag to avoid Master glitch, and restore temp B.
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) && (player->stateFlags1 & PLAYER_STATE1_ON_HORSE)) {
         // Allow Master glitch to be performed on the Thieves Hideout entrance
         if (entrance == Entrance_GetOverride(ENTR_THIEVES_HIDEOUT_4)) { // Gerudo Fortress -> Theives Hideout
@@ -514,27 +538,27 @@ void Entrance_HandleEponaState(void) {
         }
 
         static const s16 validEponaEntrances[] = {
-            ENTR_LAKE_HYLIA_NORTH_EXIT,       // Hyrule Field -> Lake Hylia
-            ENTR_HYRULE_FIELD_FENCE_EXIT,     // Lake Hylia -> Hyrule Field
-            ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND,       // LH Fishing Hole -> LH Fishing Island
-            ENTR_LAKE_HYLIA_OUTSIDE_LAB,       // LH Lab -> Lake Hylia
-            ENTR_GERUDO_VALLEY_EAST_EXIT,    // Hyrule Field -> Gerudo Valley
-            ENTR_HYRULE_FIELD_ROCKY_PATH,     // Gerudo Valley -> Hyrule Field
-            ENTR_LON_LON_RANCH_ENTRANCE,    // Hyrule Field -> Lon Lon Ranch
-            ENTR_HYRULE_FIELD_CENTER_EXIT,     // Lon Lon Ranch -> Hyrule Field
-            ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN,     // Market Entrance -> Hyrule Field
-            ENTR_HYRULE_FIELD_RIVER_EXIT,     // ZR Front -> Hyrule Field
-            ENTR_HYRULE_FIELD_WOODED_EXIT,     // LW Bridge -> Hyrule Field
-            ENTR_GERUDOS_FORTRESS_EAST_EXIT, // GV Fortress Side -> Gerudo Fortress
-            ENTR_GERUDO_VALLEY_WEST_EXIT,    // Gerudo Fortress -> GV Fortress Side
-            ENTR_GERUDO_VALLEY_OUTSIDE_TENT,    // GV Carpenter Tent -> GV Fortress Side
-            ENTR_LON_LON_RANCH_OUTSIDE_STABLES,    // LLR Stables -> Lon Lon Ranch
-            ENTR_LON_LON_RANCH_OUTSIDE_TOWER,   // LLR Tower -> Lon Lon Ranch
-            ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE,    // LLR Talons House -> Lon Lon Ranch
-            ENTR_HYRULE_FIELD_11,    // LLR Southern Fence Jump
-            ENTR_HYRULE_FIELD_12,    // LLR Western Fence Jump
-            ENTR_HYRULE_FIELD_13,    // LLR Eastern Fence Jump
-            ENTR_HYRULE_FIELD_15,    // LLR Front Gate Jump
+            ENTR_LAKE_HYLIA_NORTH_EXIT,              // Hyrule Field -> Lake Hylia
+            ENTR_HYRULE_FIELD_FENCE_EXIT,            // Lake Hylia -> Hyrule Field
+            ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND,    // LH Fishing Hole -> LH Fishing Island
+            ENTR_LAKE_HYLIA_OUTSIDE_LAB,             // LH Lab -> Lake Hylia
+            ENTR_GERUDO_VALLEY_EAST_EXIT,            // Hyrule Field -> Gerudo Valley
+            ENTR_HYRULE_FIELD_ROCKY_PATH,            // Gerudo Valley -> Hyrule Field
+            ENTR_LON_LON_RANCH_ENTRANCE,             // Hyrule Field -> Lon Lon Ranch
+            ENTR_HYRULE_FIELD_CENTER_EXIT,           // Lon Lon Ranch -> Hyrule Field
+            ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN,       // Market Entrance -> Hyrule Field
+            ENTR_HYRULE_FIELD_RIVER_EXIT,            // ZR Front -> Hyrule Field
+            ENTR_HYRULE_FIELD_WOODED_EXIT,           // LW Bridge -> Hyrule Field
+            ENTR_GERUDOS_FORTRESS_EAST_EXIT,         // GV Fortress Side -> Gerudo Fortress
+            ENTR_GERUDO_VALLEY_WEST_EXIT,            // Gerudo Fortress -> GV Fortress Side
+            ENTR_GERUDO_VALLEY_OUTSIDE_TENT,         // GV Carpenter Tent -> GV Fortress Side
+            ENTR_LON_LON_RANCH_OUTSIDE_STABLES,      // LLR Stables -> Lon Lon Ranch
+            ENTR_LON_LON_RANCH_OUTSIDE_TOWER,        // LLR Tower -> Lon Lon Ranch
+            ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE, // LLR Talons House -> Lon Lon Ranch
+            ENTR_HYRULE_FIELD_11,                    // LLR Southern Fence Jump
+            ENTR_HYRULE_FIELD_12,                    // LLR Western Fence Jump
+            ENTR_HYRULE_FIELD_13,                    // LLR Eastern Fence Jump
+            ENTR_HYRULE_FIELD_15,                    // LLR Front Gate Jump
             // The following indices currently aren't randomized, but we'll list
             // them in case they ever are. They're all Theives Hideout -> Gerudo Fortress
             ENTR_GERUDOS_FORTRESS_1,
@@ -577,9 +601,9 @@ void Entrance_OverrideWeatherState() {
         return;
     }
     // Lon Lon Ranch (No Epona)
-    if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)){ // if you don't have Epona
+    if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { // if you don't have Epona
         switch (gSaveContext.entranceIndex) {
-            case ENTR_LON_LON_RANCH_ENTRANCE: // Lon Lon Ranch from HF
+            case ENTR_LON_LON_RANCH_ENTRANCE:   // Lon Lon Ranch from HF
             case ENTR_HYRULE_FIELD_CENTER_EXIT: // Hyrule Field from LLR
                 gWeatherMode = 2;
                 return;
@@ -588,14 +612,14 @@ void Entrance_OverrideWeatherState() {
     // Water Temple
     if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) { // have not beaten Water Temple
         switch (gSaveContext.entranceIndex) {
-            case ENTR_ZORAS_RIVER_WATERFALL_EXIT: // Zora River from behind waterfall
+            case ENTR_ZORAS_RIVER_WATERFALL_EXIT:      // Zora River from behind waterfall
             case ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT: // Zora River from LW water shortcut
-            case ENTR_LOST_WOODS_UNDERWATER_SHORTCUT: // Lost Woods water shortcut from ZR
+            case ENTR_LOST_WOODS_UNDERWATER_SHORTCUT:  // Lost Woods water shortcut from ZR
                 gWeatherMode = 3;
                 return;
         }
         switch (gPlayState->sceneNum) {
-            case SCENE_ZORAS_DOMAIN: // Zora's Domain
+            case SCENE_ZORAS_DOMAIN:   // Zora's Domain
             case SCENE_ZORAS_FOUNTAIN: // Zora's Fountain
                 gWeatherMode = 3;
                 return;
@@ -603,15 +627,15 @@ void Entrance_OverrideWeatherState() {
     }
     // Kakariko Thunderstorm
     if (((gSaveContext.inventory.questItems & 0x7) == 0x7) && // Have forest, fire, and water medallion
-        !(gSaveContext.sceneFlags[24].clear & 0x02)) { // have not beaten Bongo Bongo
+        !(gSaveContext.sceneFlags[24].clear & 0x02)) {        // have not beaten Bongo Bongo
         switch (gPlayState->sceneNum) {
             case SCENE_KAKARIKO_VILLAGE: // Kakariko
-            case SCENE_GRAVEYARD: // Graveyard
+            case SCENE_GRAVEYARD:        // Graveyard
                 gPlayState->envCtx.gloomySkyMode = 2;
                 switch (gSaveContext.entranceIndex) {
                     case ENTR_KAKARIKO_VILLAGE_FRONT_GATE: // Kakariko from HF
                     case ENTR_KAKARIKO_VILLAGE_GUARD_GATE: // Kakariko from Death Mountain Trail
-                    case ENTR_GRAVEYARD_OUTSIDE_TEMPLE: // Graveyard from Shadow Temple
+                    case ENTR_GRAVEYARD_OUTSIDE_TEMPLE:    // Graveyard from Shadow Temple
                         break;
                     default:
                         gWeatherMode = 5;
@@ -620,21 +644,21 @@ void Entrance_OverrideWeatherState() {
         }
     }
     // Death Mountain Cloudy
-    if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) { // have not beaten Fire Temple
+    if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {        // have not beaten Fire Temple
         if (gPlayState->nextEntranceIndex == ENTR_LOST_WOODS_TUNNEL_SHORTCUT) { // Lost Woods Goron City Shortcut
             gWeatherMode = 2;
             return;
         }
         switch (gPlayState->sceneNum) {
-            case SCENE_KAKARIKO_VILLAGE: // Kakariko
-            case SCENE_GRAVEYARD: // Graveyard
-            case SCENE_DEATH_MOUNTAIN_TRAIL: // Death Mountain Trail
+            case SCENE_KAKARIKO_VILLAGE:      // Kakariko
+            case SCENE_GRAVEYARD:             // Graveyard
+            case SCENE_DEATH_MOUNTAIN_TRAIL:  // Death Mountain Trail
             case SCENE_DEATH_MOUNTAIN_CRATER: // Death Mountain Crater
                 if (!gPlayState->envCtx.gloomySkyMode) {
                     gPlayState->envCtx.gloomySkyMode = 1;
                 }
                 switch (gSaveContext.entranceIndex) {
-                    case ENTR_KAKARIKO_VILLAGE_FRONT_GATE: // Kakariko from HF
+                    case ENTR_KAKARIKO_VILLAGE_FRONT_GATE:     // Kakariko from HF
                     case ENTR_KAKARIKO_VILLAGE_SOUTHEAST_EXIT: // Kakariko from Graveyard
                         break;
                     default:
@@ -646,16 +670,17 @@ void Entrance_OverrideWeatherState() {
 }
 
 // Rectify the "Getting Caught By Gerudo" entrance index if necessary, based on the age and current scene
-// In ER, Adult should be placed at the fortress entrance when getting caught in the fortress without a hookshot, instead of being thrown in the valley
-// Child should always be thrown in the stream when caught in the valley, and placed at the fortress entrance from valley when caught in the fortress
+// In ER, Adult should be placed at the fortress entrance when getting caught in the fortress without a hookshot,
+// instead of being thrown in the valley Child should always be thrown in the stream when caught in the valley, and
+// placed at the fortress entrance from valley when caught in the fortress
 void Entrance_OverrideGeurdoGuardCapture(void) {
     if (LINK_IS_CHILD) {
         gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Geurdo Valley thrown out
     }
 
     if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) &&
-        gPlayState->nextEntranceIndex == ENTR_GERUDO_VALLEY_1) { // Geurdo Valley thrown out
-        if (gPlayState->sceneNum != SCENE_GERUDO_VALLEY) { // Geurdo Valley
+        gPlayState->nextEntranceIndex == ENTR_GERUDO_VALLEY_1) {             // Geurdo Valley thrown out
+        if (gPlayState->sceneNum != SCENE_GERUDO_VALLEY) {                   // Geurdo Valley
             gPlayState->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_EAST_EXIT; // Gerudo Fortress
         }
     }
@@ -786,6 +811,7 @@ void Entrance_SetEntranceDiscovered(u16 entranceIndex, u8 isReversedEntrance) {
     if (idx < SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT) {
         u32 entranceBit = 1 << (entranceIndex - (idx * bitsPerIndex));
         gSaveContext.ship.stats.entrancesDiscovered[idx] |= entranceBit;
+        CheckTracker_RecalculateAvailableChecks();
 
         // Set reverse entrance when not decoupled
         if (!Randomizer_GetSettingValue(RSK_DECOUPLED_ENTRANCES) && !isReversedEntrance) {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.h b/soh/soh/Enhancements/randomizer/randomizer_entrance.h
index d2c8c79cb0..ca840f3961 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.h
@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 
-//Entrance Table Data: https://wiki.cloudmodding.com/oot/Entrance_Table_(Data)
-//Accessed June 2021, published content date at the time was 14 March 2020, at 21:47
+// Entrance Table Data: https://wiki.cloudmodding.com/oot/Entrance_Table_(Data)
+// Accessed June 2021, published content date at the time was 14 March 2020, at 21:47
 
 #define ENTRANCE_TABLE_SIZE ENTR_MAX
 
@@ -13,12 +13,12 @@
 #define SHUFFLEABLE_BOSS_COUNT 8
 
 #define SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT 66 // Max entrance rando index is 0x0820, (2080 / 32 == 65) + 1
-#define SAVEFILE_SCENES_DISCOVERED_IDX_COUNT 4 // Max scene ID is 0x6E, (110 / 32 == 3) + 1
+#define SAVEFILE_SCENES_DISCOVERED_IDX_COUNT 4     // Max scene ID is 0x6E, (110 / 32 == 3) + 1
 
-#define ENTRANCE_INFO_FIELD(continueBgm, displayTitleCard, endTransType, startTransType)               \
-    (((continueBgm) ? ENTRANCE_INFO_CONTINUE_BGM_FLAG : 0) |                                           \
-     ((displayTitleCard) ? ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG : 0) |                                \
-     (((endTransType) << ENTRANCE_INFO_END_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_END_TRANS_TYPE_MASK) |    \
+#define ENTRANCE_INFO_FIELD(continueBgm, displayTitleCard, endTransType, startTransType)            \
+    (((continueBgm) ? ENTRANCE_INFO_CONTINUE_BGM_FLAG : 0) |                                        \
+     ((displayTitleCard) ? ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG : 0) |                             \
+     (((endTransType) << ENTRANCE_INFO_END_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_END_TRANS_TYPE_MASK) | \
      (((startTransType) << ENTRANCE_INFO_START_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_START_TRANS_TYPE_MASK))
 
 typedef struct {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index 4c3cb971ec..1a635f58e8 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -1,7 +1,7 @@
 #include "randomizer_entrance_tracker.h"
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
-#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 
 #include <map>
 #include <string>
@@ -27,18 +27,22 @@ extern PlayState* gPlayState;
 #define COLOR_GREEN IM_COL32(0, 158, 115, 255)
 #define COLOR_GRAY IM_COL32(155, 155, 155, 255)
 
-EntranceOverride srcListSortedByArea[ENTRANCE_OVERRIDES_MAX_COUNT] = {0};
-EntranceOverride destListSortedByArea[ENTRANCE_OVERRIDES_MAX_COUNT] = {0};
-EntranceOverride srcListSortedByType[ENTRANCE_OVERRIDES_MAX_COUNT] = {0};
-EntranceOverride destListSortedByType[ENTRANCE_OVERRIDES_MAX_COUNT] = {0};
-EntranceTrackingData gEntranceTrackingData = {0};
+EntranceOverride srcListSortedByArea[ENTRANCE_OVERRIDES_MAX_COUNT] = { 0 };
+EntranceOverride destListSortedByArea[ENTRANCE_OVERRIDES_MAX_COUNT] = { 0 };
+EntranceOverride srcListSortedByType[ENTRANCE_OVERRIDES_MAX_COUNT] = { 0 };
+EntranceOverride destListSortedByType[ENTRANCE_OVERRIDES_MAX_COUNT] = { 0 };
+EntranceTrackingData gEntranceTrackingData = { 0 };
 
-static const EntranceOverride emptyOverride = {0};
+static const EntranceOverride emptyOverride = { 0 };
 
 static s16 lastEntranceIndex = -1;
 static s16 currentGrottoId = -1;
 static s16 lastSceneOrEntranceDetected = -1;
 
+static bool presetLoaded = false;
+static ImVec2 presetPos;
+static ImVec2 presetSize;
+
 static std::string spoilerEntranceGroupNames[] = {
     "Spawns/Warp Songs/Owls",
     "Kokiri Forest",
@@ -64,16 +68,13 @@ static std::string spoilerEntranceGroupNames[] = {
 };
 
 static std::string groupTypeNames[] = {
-    "One Way",
-    "Overworld",
-    "Interior",
-    "Grotto",
-    "Dungeon",
+    "One Way", "Overworld", "Interior", "Grotto", "Dungeon",
 };
 
-// Entrance data for the tracker taken from the 3ds rando entrance tracker, and supplemented with scene/spawn info and meta search tags
-// ENTR_HYRULE_FIELD_10 and ENTR_POTION_SHOP_KAKARIKO_1 have been repurposed for entrance randomizer
+// Entrance data for the tracker taken from the 3ds rando entrance tracker, and supplemented with scene/spawn info and
+// meta search tags ENTR_HYRULE_FIELD_10 and ENTR_POTION_SHOP_KAKARIKO_1 have been repurposed for entrance randomizer
 const EntranceData entranceData[] = {
+    // clang-format off
     //index,                reverse, scenes (and spawns),     source name,   destination name, source group,           destination group,      type,                 metaTag, oneExit
     { ENTR_LINKS_HOUSE_CHILD_SPAWN,   -1,      SINGLE_SCENE_INFO(SCENE_LINKS_HOUSE), "Child Spawn", "Link's House",   ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY},
     { ENTR_HYRULE_FIELD_10, -1,      SINGLE_SCENE_INFO(SCENE_TEMPLE_OF_TIME), "Adult Spawn", "Temple of Time", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY},
@@ -118,10 +119,10 @@ const EntranceData entranceData[] = {
     { ENTR_GORON_CITY_TUNNEL_SHORTCUT,                       ENTR_LOST_WOODS_TUNNEL_SHORTCUT,                       SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods Tunnel Shortcut",     "Goron City Tunnel Shortcut",       ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_GORON_CITY,    ENTRANCE_TYPE_OVERWORLD, "lw,gc"},
     { ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT,                  ENTR_LOST_WOODS_UNDERWATER_SHORTCUT,                   SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods Underwater Shortcut", "Zora's River Underwater Shortcut", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_ZORAS_RIVER,   ENTRANCE_TYPE_OVERWORLD, "lw"},
     { ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT,                  ENTR_LOST_WOODS_NORTH_EXIT,                            SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods North Exit",          "Sacred Forest Meadow South Exit",  ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_SFM,           ENTRANCE_TYPE_OVERWORLD, "lw"},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "LW Shortcuts Grotto Entry",      "LW Tunnel Grotto",                 ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,chest", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "LW Tunnel Grotto Entry",         "LW Tunnel Grotto",                 ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,chest", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET),         ENTRANCE_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET),         SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "LW North Grotto Entry",          "LW Scrubs Grotto",                 ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET),   ENTRANCE_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET),   SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "LW Meadow Grotto Entry",         "Deku Theater",                     ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,mask,stage", 1},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), {{ SCENE_GROTTOS, 0x00 }},           "LW Tunnel Grotto",               "LW Shortcuts Grotto Entry",        ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,chest"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), {{ SCENE_GROTTOS, 0x00 }},           "LW Tunnel Grotto",               "LW Tunnel Grotto Entry",           ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,chest"},
     { ENTRANCE_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET),         ENTRANCE_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET),         {{ SCENE_GROTTOS, 0x07 }},           "LW Scrubs Grotto",               "LW North Grotto Entry",            ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw"},
     { ENTRANCE_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET),   ENTRANCE_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET),   {{ SCENE_GROTTOS, 0x0C }},           "Deku Theater",                   "LW Meadow Grotto Entry",           ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS,    ENTRANCE_TYPE_GROTTO,    "lw,mask,stage"},
 
@@ -129,11 +130,11 @@ const EntranceData entranceData[] = {
     { ENTR_LOST_WOODS_NORTH_EXIT,                        ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT,           SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "Sacred Forest Meadow South Exit",            "Lost Woods North Exit",                      ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"},
     { ENTRANCE_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET),    ENTRANCE_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM Wolfos Grotto Entry",                    "SFM Wolfos Grotto",                          ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "chest", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET),     ENTRANCE_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET),  SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM Fairy Grotto Entry",                     "SFM Fairy Grotto",                           ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET),    ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM Storms Grotto Entry",                    "SFM Storms Grotto",                          ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET),    ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM Storms Grotto Entry",                    "SFM Deku Scrub Grotto",                      ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTR_FOREST_TEMPLE_ENTRANCE,                       ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE,       SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "Sacred Forest Meadow Outside Forest Temple", "Forest Temple Entrance",                     ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON,   "", 1},
     { ENTRANCE_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET),    ENTRANCE_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET), {{ SCENE_GROTTOS, 0x08 }},                     "SFM Wolfos Grotto",                          "SFM Wolfos Grotto Entry",                    ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO},
     { ENTRANCE_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET),     ENTRANCE_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET),  {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},             "SFM Fairy Grotto",                           "SFM Fairy Grotto Entry",                     ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET),    ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }},                     "SFM Storms Grotto",                          "SFM Storms Grotto Entry",                    ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET),    ENTRANCE_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }},                     "SFM Deku Scrub Grotto",                      "SFM Storms Grotto Entry",                    ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_GROTTO,    "scrubs"},
     { ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE,          ENTR_FOREST_TEMPLE_ENTRANCE,                    SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE),        "Forest Temple Entrance",                     "Sacred Forest Meadow Outside Forest Temple", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON},
     { ENTR_FOREST_TEMPLE_BOSS_ENTRANCE,                  ENTR_FOREST_TEMPLE_BOSS_DOOR,                   SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE),        "Forest Temple Boss Door",                    "Phantom Ganon",                              ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON, "", 1},
     { ENTR_FOREST_TEMPLE_BOSS_DOOR,                      ENTR_FOREST_TEMPLE_BOSS_ENTRANCE,               SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE_BOSS),   "Phantom Ganon",                              "Forest Temple Boss Door",                    ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON, "", 1},
@@ -232,10 +233,10 @@ const EntranceData entranceData[] = {
     { ENTR_HYRULE_FIELD_RIVER_EXIT,                  ENTR_ZORAS_RIVER_WEST_EXIT,                    SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "Zora's River Lower Exit",          "Hyrule Field River Exit",        ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"},
     { ENTR_LOST_WOODS_UNDERWATER_SHORTCUT,           ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT,          SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "Zora's River Underwater Shortcut", "Lost Woods Underwater Shortcut", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_LOST_WOODS,   ENTRANCE_TYPE_OVERWORLD, "lw"},
     { ENTR_ZORAS_DOMAIN_ENTRANCE,                    ENTR_ZORAS_RIVER_WATERFALL_EXIT,               SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "Zora's River Waterfall Exit",      "Zora's Domain Entrance",         ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR Rock Circle Grotto Entry",      "ZR Storms Grotto",               ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR Rock Circle Grotto Entry",      "ZR Deku SCrub Grotto",           ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET),  ENTRANCE_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET),  SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR Raised Boulder Grotto Entry",   "ZR Fairy Grotto",                ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET),   ENTRANCE_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET),   SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR Raised Open Grotto Entry",      "ZR Open Grotto",                 ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "chest", 1},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }},            "ZR Storms Grotto",                 "ZR Rock Circle Grotto Entry",    ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }},            "ZR Deku Scrub Grotto",             "ZR Rock Circle Grotto Entry",    ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "scrubs"},
     { ENTRANCE_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET),  ENTRANCE_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET),  {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},    "ZR Fairy Grotto",                  "ZR Raised Boulder Grotto Entry", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO},
     { ENTRANCE_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET),   ENTRANCE_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET),   {{ SCENE_GROTTOS, 0x00 }},            "ZR Open Grotto",                   "ZR Raised Open Grotto Entry",    ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER,  ENTRANCE_TYPE_GROTTO,    "chest"},
 
@@ -244,9 +245,9 @@ const EntranceData entranceData[] = {
     { ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT,           ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT,         SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain Underwater Shortcut", "Lake Hylia Underwater Shortcut", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_LAKE_HYLIA,     ENTRANCE_TYPE_OVERWORLD, "lh"},
     { ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT,               ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT,              SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain Behind King Zora",    "Zora's Fountain Tunnel Exit",    ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_OVERWORLD},
     { ENTR_ZORA_SHOP_0,                              ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP,                SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "ZD Shop Entry",                     "Zora Shop",                      ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "ZD Island Grotto Entry",            "ZD Storms Grotto",               ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_GROTTO,    "fairy", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "ZD Island Grotto Entry",            "ZD Fairy Grotto",                ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_GROTTO,    "fairy", 1},
     { ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP,                ENTR_ZORA_SHOP_0,                              SINGLE_SCENE_INFO(SCENE_ZORA_SHOP),    "Zora Shop",                         "ZD Shop Entry",                  ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_INTERIOR},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},     "ZD Storms Grotto",                  "ZD Island Grotto Entry",         ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_GROTTO,    "fairy"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},     "ZD Fairy Grotto",                   "ZD Island Grotto Entry",         ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_GROTTO,    "fairy"},
 
     // Zora's Fountain
     { ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT,             ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT,              SINGLE_SCENE_INFO(SCENE_ZORAS_FOUNTAIN),        "Zora's Fountain Tunnel Exit",        "Zora's Domain Behind King Zora",     ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_DOMAIN,   ENTRANCE_TYPE_OVERWORLD},
@@ -269,7 +270,7 @@ const EntranceData entranceData[] = {
     { ENTR_LAKE_HYLIA_NORTH_EXIT,                          ENTR_HYRULE_FIELD_FENCE_EXIT,                        SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field Fence Exit",             "Lake Hylia North Exit",               ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LAKE_HYLIA,    ENTRANCE_TYPE_OVERWORLD, "hf,lh"},
     { ENTR_GERUDO_VALLEY_EAST_EXIT,                        ENTR_HYRULE_FIELD_ROCKY_PATH,                        SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field Rocky Path",             "Gerudo Valley East Exit",             ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hf"},
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET),  ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET),  SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Near Market Boulder Grotto Entry", "HF Near Market Boulder Grotto",       ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "chest", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET),     ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET),     SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Near Stairs Tree Grotto Entry",    "HF Near Stairs Tree Grotto",          ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "spider", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET),     ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET),     SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Stone Bridge Tree Grotto Entry",   "HF Stone Bridge Tree Grotto",         ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "spider", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET),      ENTRANCE_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET),      SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Northwest Tree Grotto Entry",      "HF Tektite Grotto",                   ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "water", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET),        ENTRANCE_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET),        SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Northwest Boulder Grotto Entry",   "HF Fairy Grotto",                     ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_COW_OFFSET),          ENTRANCE_GROTTO_EXIT(GROTTO_HF_COW_OFFSET),          SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF West Rock Circle Grotto Entry",    "HF Cow Grotto",                       ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "webbed", 1},
@@ -277,7 +278,7 @@ const EntranceData entranceData[] = {
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_INSIDE_FENCE_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_HF_INSIDE_FENCE_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Fenced Grotto Entry",              "HF Fenced Scrub Grotto",              ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_HF_SOUTHEAST_OFFSET),    ENTRANCE_GROTTO_EXIT(GROTTO_HF_SOUTHEAST_OFFSET),    SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "HF Southeast Boulder Grotto Entry",   "HF Southeast Grotto",                 ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "chest", 1},
     { ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET),  ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET),  {{ SCENE_GROTTOS, 0x00 }},             "HF Near Market Boulder Grotto",       "HF Near Market Boulder Grotto Entry", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET),     ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET),     {{ SCENE_GROTTOS, 0x01 }},             "HF Near Stairs Tree Grotto",          "HF Near Stairs Tree Grotto Entry",    ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "spider"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET),     ENTRANCE_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET),     {{ SCENE_GROTTOS, 0x01 }},             "HF Stone Bridge Tree Grotto",         "HF Stone Bridge Tree Grotto Entry",   ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "spider"},
     { ENTRANCE_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET),      ENTRANCE_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET),      {{ SCENE_GROTTOS, 0x0B }},             "HF Tektite Grotto",                   "HF Northwest Tree Grotto Entry",      ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "water"},
     { ENTRANCE_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET),        ENTRANCE_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET),        {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},     "HF Fairy Grotto",                     "HF Northwest Boulder Grotto Entry",   ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO},
     { ENTRANCE_GROTTO_EXIT(GROTTO_HF_COW_OFFSET),          ENTRANCE_GROTTO_LOAD(GROTTO_HF_COW_OFFSET),          {{ SCENE_GROTTOS, 0x05 }},             "HF Cow Grotto",                       "HF West Rock Circle Grotto Entry",    ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_GROTTO,    "webbed"},
@@ -290,22 +291,22 @@ const EntranceData entranceData[] = {
     { ENTR_LON_LON_BUILDINGS_TALONS_HOUSE,     ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE, SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "LLR Talon's House Entry", "Talon's House",            ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "llr", 1},
     { ENTR_STABLE_0,                           ENTR_LON_LON_RANCH_OUTSIDE_STABLES,      SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "LLR Stables Entry",       "LLR Stables",              ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "cow", 1},
     { ENTR_LON_LON_BUILDINGS_TOWER,            ENTR_LON_LON_RANCH_OUTSIDE_TOWER,        SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "LLR Tower Entry",         "LLR Tower",                ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "cow", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET), SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "LLR Grotto Entry",        "LLR Scrubs Grotto",        ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET), SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "LLR Grotto Entry",        "LLR Deku Scrub Grotto",    ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE, ENTR_LON_LON_BUILDINGS_TALONS_HOUSE,     {{ SCENE_LON_LON_BUILDINGS, 0x00 }},    "Talon's House",           "LLR Talon's House Entry",  ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "llr"},
     { ENTR_LON_LON_RANCH_OUTSIDE_STABLES,      ENTR_STABLE_0,                           SINGLE_SCENE_INFO(SCENE_STABLE),        "LLR Stables",             "LLR Stables Entry",        ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "cow"},
     { ENTR_LON_LON_RANCH_OUTSIDE_TOWER,        ENTR_LON_LON_BUILDINGS_TOWER,            {{ SCENE_LON_LON_BUILDINGS, 0x01 }},    "LLR Tower",               "LLR Tower Entry",          ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR,  "cow"},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET), {{ SCENE_GROTTOS, 0x04 }},              "LLR Scrubs Grotto",       "LLR Grotto Entry",         ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO,    "scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_LLR_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LLR_OFFSET), {{ SCENE_GROTTOS, 0x04 }},              "LLR Deku Scrub Grotto",   "LLR Grotto Entry",         ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO,    "scrubs"},
 
     // Lake Hylia
     { ENTR_HYRULE_FIELD_FENCE_EXIT,           ENTR_LAKE_HYLIA_NORTH_EXIT,             SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "Lake Hylia North Exit",          "Hyrule Field Fence Exit",           ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "lh"},
     { ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT,  ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT,    SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "Lake Hylia Underwater Shortcut", "Zora's Domain Underwater Shortcut", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD, "lh"},
     { ENTR_LAKESIDE_LABORATORY_0,             ENTR_LAKE_HYLIA_OUTSIDE_LAB,            SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "LH Lab Entry",                   "LH Lab",                            ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_INTERIOR,  "lh", 1},
     { ENTR_FISHING_POND_0,                    ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND,   SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "LH Fishing Pond Entry",          "Fishing Pond",                      ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_INTERIOR,  "lh", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET), SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "LH Grave Grotto Entry",          "LH Grotto",                         ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET), ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET), SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "LH Grave Grotto Entry",          "LH Deku Scrub Grotto",              ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTR_WATER_TEMPLE_ENTRANCE,             ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE,         SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA),          "Lake Hylia Outside Temple",      "Water Temple Entrance",             ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_DUNGEON,   "lh", 1},
     { ENTR_LAKE_HYLIA_OUTSIDE_LAB,            ENTR_LAKESIDE_LABORATORY_0,             SINGLE_SCENE_INFO(SCENE_LAKESIDE_LABORATORY), "LH Lab",                         "LH Lab Entry",                      ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_INTERIOR,  "lh"},
     { ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND,   ENTR_FISHING_POND_0,                    SINGLE_SCENE_INFO(SCENE_FISHING_POND),        "Fishing Pond",                   "LH Fishing Pond Entry",             ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_INTERIOR,  "lh"},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET), {{ SCENE_GROTTOS, 0x04 }},                    "LH Grotto",                      "LH Grave Grotto Entry",             ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_GROTTO,    "lh,scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_LH_OFFSET), ENTRANCE_GROTTO_LOAD(GROTTO_LH_OFFSET), {{ SCENE_GROTTOS, 0x04 }},                    "LH Deku Scrub Grotto",           "LH Grave Grotto Entry",             ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_GROTTO,    "lh,scrubs"},
     { ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE,         ENTR_WATER_TEMPLE_ENTRANCE,             SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE),        "Water Temple Entrance",          "Lake Hylia Outside Temple",         ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_DUNGEON,   "lh"},
     { ENTR_WATER_TEMPLE_BOSS_ENTRANCE,        ENTR_WATER_TEMPLE_BOSS_DOOR,            SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE),        "Water Temple Boss Door",         "Morpha",                            ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_DUNGEON,   "lh", 1},
     { ENTR_WATER_TEMPLE_BOSS_DOOR,            ENTR_WATER_TEMPLE_BOSS_ENTRANCE,        SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE_BOSS),   "Morpha",                         "Water Temple Boss Door",            ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_DUNGEON,   "lh", 1},
@@ -317,15 +318,15 @@ const EntranceData entranceData[] = {
     { ENTR_LAKE_HYLIA_RIVER_EXIT,                           -1,                                                   SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "Gerudo Valley River Exit",        "Lake Hylia River Exit",           ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_LAKE_HYLIA,        ENTRANCE_TYPE_OVERWORLD, "lh"},
     { ENTR_CARPENTERS_TENT_0,                               ENTR_GERUDO_VALLEY_OUTSIDE_TENT,                      SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "GV Carpenters' Tent Entry",       "Carpenters' Tent",                ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_INTERIOR,  "", 1},
     { ENTRANCE_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET),       ENTRANCE_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET),       SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "GV Silver Rock Grotto Entry",     "GV Octorok Grotto",               ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO,    "", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET),        ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET),        SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "GV Behind Tent Grotto Entry",     "GV Storms Grotto",                ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET),        ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET),        SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "GV Behind Tent Grotto Entry",     "GV Deku Scrub Grotto",            ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO,    "scrubs", 1},
     { ENTR_GERUDO_VALLEY_OUTSIDE_TENT,                      ENTR_CARPENTERS_TENT_0,                               SINGLE_SCENE_INFO(SCENE_CARPENTERS_TENT),        "Carpenters' Tent",                "GV Carpenters' Tent Entry",       ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_INTERIOR},
     { ENTRANCE_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET),       ENTRANCE_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET),       {{ SCENE_GROTTOS, 0x06 }},                       "GV Octorok Grotto",               "GV Silver Rock Grotto Entry",     ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET),        ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET),        {{ SCENE_GROTTOS, 0x0A }},                       "GV Storms Grotto",                "GV Behind Tent Grotto Entry",     ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO,    "scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET),        ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET),        {{ SCENE_GROTTOS, 0x0A }},                       "GV Deku Scrub Grotto",            "GV Behind Tent Grotto Entry",     ENTRANCE_GROUP_GERUDO_VALLEY,   ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_GROTTO,    "scrubs"},
     { ENTR_GERUDO_VALLEY_WEST_EXIT,                         ENTR_GERUDOS_FORTRESS_EAST_EXIT,                      SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS),       "Gerudo Fortress East Exit",       "Gerudo Valley West Exit",         ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_VALLEY,     ENTRANCE_TYPE_OVERWORLD, ""},
     { ENTR_HAUNTED_WASTELAND_EAST_EXIT,                     ENTR_GERUDOS_FORTRESS_GATE_EXIT,                      SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS),       "Gerudo Fortress Gate Exit",       "Haunted Wasteland East Exit",     ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, ""},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET),        ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET),        SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS),       "GF Storms Grotto Entry",          "GF Storms Grotto",                ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_GROTTO,    "", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET),        ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET),        SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS),       "GF Storms Grotto Entry",          "GF Fairy Grotto",                 ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_GROTTO,    "", 1},
     { ENTR_GERUDO_TRAINING_GROUND_ENTRANCE,                 ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS),       "GF Outside Training Ground",      "Gerudo Training Ground Entrance", ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_DUNGEON,   "gtg", 1},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET),        ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET),        {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},               "GF Storms Grotto",                "GF Storms Grotto Entry",          ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_GROTTO,    ""},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET),        ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET),        {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }},               "GF Fairy Grotto",                 "GF Storms Grotto Entry",          ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_GROTTO,    ""},
     { ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, ENTR_GERUDO_TRAINING_GROUND_ENTRANCE,                 SINGLE_SCENE_INFO(SCENE_GERUDO_TRAINING_GROUND), "Gerudo Training Ground Entrance", "GF Outside Training Ground",      ENTRANCE_GROUP_GERUDO_FORTRESS, ENTRANCE_GROUP_GERUDO_FORTRESS,   ENTRANCE_TYPE_DUNGEON,   "gtg"},
 
     // The Wasteland
@@ -333,42 +334,42 @@ const EntranceData entranceData[] = {
     { ENTR_DESERT_COLOSSUS_EAST_EXIT,                    ENTR_HAUNTED_WASTELAND_WEST_EXIT,                  SINGLE_SCENE_INFO(SCENE_HAUNTED_WASTELAND),     "Haunted Wasteland West Exit",   "Desert Colossus East Exit",     ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"},
     { ENTR_HAUNTED_WASTELAND_WEST_EXIT,                  ENTR_DESERT_COLOSSUS_EAST_EXIT,                    SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS),       "Desert Colossus East Exit",     "Haunted Wasteland West Exit",   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"},
     { ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT,             SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS),       "Colossus Great Fairy Entry",    "Colossus Great Fairy Fountain", ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_INTERIOR,  "dc", 1},
-    { ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET),      ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET),      SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS),       "Colossus Grotto Entry",         "Colossus Grotto",               ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_GROTTO,    "dc,scrubs", 1},
+    { ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET),      ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET),      SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS),       "Colossus Grotto Entry",         "Colossus Deku Scrub Grotto",    ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_GROTTO,    "dc,scrubs", 1},
     { ENTR_SPIRIT_TEMPLE_ENTRANCE,                       ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE,               SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS),       "Colossus Outside Temple",       "Spirit Temple Entrance",        ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_DUNGEON,   "dc", 1},
     { ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT,             ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0x02 }}, "Colossus Great Fairy Fountain", "Colossus Great Fairy Entry",    ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_INTERIOR,  "dc"},
-    { ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET),      ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET),      {{ SCENE_GROTTOS, 0x0A }},                      "Colossus Grotto",               "Colossus Grotto Entry",         ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_GROTTO,    "dc,scrubs"},
+    { ENTRANCE_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET),      ENTRANCE_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET),      {{ SCENE_GROTTOS, 0x0A }},                      "Colossus Deku Scrub Grotto",    "Colossus Grotto Entry",         ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_GROTTO,    "dc,scrubs"},
     { ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE,               ENTR_SPIRIT_TEMPLE_ENTRANCE,                       SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE),         "Spirit Temple Entrance",        "Colossus Outside Temple",       ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_DUNGEON,   "dc"},
     { ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE,                  ENTR_SPIRIT_TEMPLE_BOSS_DOOR,                      SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE),         "Spirit Temple Boss Door",       "Twinrova",                      ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_DUNGEON,   "", 1},
     { ENTR_SPIRIT_TEMPLE_BOSS_DOOR,                      ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE,                  SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE_BOSS),    "Twinrova",                      "Spirit Temple Boss Door",       ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_DUNGEON,   "", 1},
     { ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP,      -1,                                                SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE_BOSS),    "Twinrova Blue Warp",            "Spirit Temple Blue Warp",       ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_GROUP_DESERT_COLOSSUS,   ENTRANCE_TYPE_ONE_WAY,   "bw", 1},
 
     // Market
-    { ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN,                  ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT,               {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "Market Entrance South Exit",          "Hyrule Field Drawbridge Exit",  ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_OVERWORLD, "hf"},
-    { ENTR_MARKET_SOUTH_EXIT,                             ENTR_MARKET_ENTRANCE_NORTH_EXIT,                    {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "Market Entrance North Exit",          "Market South Exit",             ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
-    { ENTR_MARKET_GUARD_HOUSE_0,                          ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE,           {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "MK Entrance Guard House Entry",       "Guard House",                   ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "pots,poe", 1},
-    { ENTR_MARKET_ENTRANCE_NORTH_EXIT,                    ENTR_MARKET_SOUTH_EXIT,                             {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market South Exit",                   "Market Entrance North Exit",    ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
-    { ENTR_CASTLE_GROUNDS_SOUTH_EXIT,                     ENTR_MARKET_DAY_CASTLE_EXIT,                        {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market Castle Exit",                  "Castle Grounds South Exit",     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"},
-    { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, ENTR_MARKET_DAY_TEMPLE_EXIT,                        {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market Temple Exit",                  "Outside Temple of Time",        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
-    { ENTR_SHOOTING_GALLERY_1,                            ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,           {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Shooting Gallery Entry",           "MK Shooting Gallery",           ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "child", 1},
-    { ENTR_BOMBCHU_BOWLING_ALLEY_0,                       ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING,            {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bombchu Bowling Entry",            "Bombchu Bowling",               ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_TREASURE_BOX_SHOP_0,                           ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP,          {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Treasure Chest Game Entry",        "Treasure Chest Game",           ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE,                 ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE,     {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Man-in-Green House Entry",         "Man-in-Green's House",          ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_HAPPY_MASK_SHOP_0,                             ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP,            {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Mask Shop Entry",                  "Mask Shop",                     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_BAZAAR_1,                                      ENTR_MARKET_DAY_OUTSIDE_BAZAAR,                     {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bazaar Entry",                     "MK Bazaar",                     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "shop", 1},
-    { ENTR_POTION_SHOP_MARKET_0,                          ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,                {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Potion Shop Entry",                "MK Potion Shop",                ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_BOMBCHU_SHOP_1,                                ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,           {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bombchu Shop Entry",               "Bombchu Shop",                  ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
-    { ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE,           ENTR_MARKET_GUARD_HOUSE_0,                          {{ SCENE_MARKET_GUARD_HOUSE }},                                                                                                                                                           "Guard House",                         "MK Entrance Guard House Entry", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "pots,poe"},
-    { ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,           ENTR_SHOOTING_GALLERY_1,                            {{ SCENE_SHOOTING_GALLERY, 0x01 }},                                                                                                                                                       "MK Shooting Gallery",                 "MK Shooting Gallery Entry",     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING,            ENTR_BOMBCHU_BOWLING_ALLEY_0,                       SINGLE_SCENE_INFO(SCENE_BOMBCHU_BOWLING_ALLEY),                                                                                                                                           "Bombchu Bowling",                     "MK Bombchu Bowling Entry",      ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP,          ENTR_TREASURE_BOX_SHOP_0,                           SINGLE_SCENE_INFO(SCENE_TREASURE_BOX_SHOP),                                                                                                                                               "Treasure Chest Game",                 "MK Treasure Chest Game Entry",  ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE,     ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE,                 SINGLE_SCENE_INFO(SCENE_BACK_ALLEY_HOUSE),                                                                                                                                                "Man-in-Green's House",                "MK Man-in-Green House Entry",   ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP,            ENTR_HAPPY_MASK_SHOP_0,                             SINGLE_SCENE_INFO(SCENE_HAPPY_MASK_SHOP),                                                                                                                                                 "Mask Shop",                           "MK Mask Shop Entry",            ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_MARKET_DAY_OUTSIDE_BAZAAR,                     ENTR_BAZAAR_1,                                      {{ SCENE_BAZAAR, 0x01 }},                                                                                                                                                                 "MK Bazaar",                           "MK Bazaar Entry",               ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "shop"},
-    { ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,                ENTR_POTION_SHOP_MARKET_0,                          SINGLE_SCENE_INFO(SCENE_POTION_SHOP_MARKET),                                                                                                                                              "MK Potion Shop",                      "MK Potion Shop Entry",          ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,           ENTR_BOMBCHU_SHOP_1,                                SINGLE_SCENE_INFO(SCENE_BOMBCHU_SHOP),                                                                                                                                                    "Bombchu Shop",                        "MK Bombchu Shop Entry",         ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
-    { ENTR_MARKET_DAY_TEMPLE_EXIT,                        ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)},                            "Outside Temple of Time",              "Market Temple Exit",            ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD, "tot"},
-    { ENTR_TEMPLE_OF_TIME_ENTRANCE,                       ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE,    {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)},                            "Outside Temple of Time",              "Temple of Time Entrance",       ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "tot", 1},
-    { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE,    ENTR_TEMPLE_OF_TIME_ENTRANCE,                       SINGLE_SCENE_INFO(SCENE_TEMPLE_OF_TIME),                                                                                                                                                  "Temple of Time Entrance",             "Outside Temple of Time",        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "tot"},
+    { ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN,                  ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT,               {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "Market Entrance South Exit",       "Hyrule Field Drawbridge Exit",     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_OVERWORLD, "hf"},
+    { ENTR_MARKET_SOUTH_EXIT,                             ENTR_MARKET_ENTRANCE_NORTH_EXIT,                    {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "Market Entrance North Exit",       "Market South Exit",                ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
+    { ENTR_MARKET_GUARD_HOUSE_0,                          ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE,           {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "MK Entrance Guard House Entry",    "Guard House",                      ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "pots,poe", 1},
+    { ENTR_MARKET_ENTRANCE_NORTH_EXIT,                    ENTR_MARKET_SOUTH_EXIT,                             {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market South Exit",                "Market Entrance North Exit",       ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
+    { ENTR_CASTLE_GROUNDS_SOUTH_EXIT,                     ENTR_MARKET_DAY_CASTLE_EXIT,                        {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market Castle Exit",               "Castle Grounds South Exit",        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"},
+    { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, ENTR_MARKET_DAY_TEMPLE_EXIT,                        {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market Temple Exit",               "ToT Courtyard Gossip Stones Exit", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD},
+    { ENTR_SHOOTING_GALLERY_1,                            ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,           {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Shooting Gallery Entry",        "MK Shooting Gallery",              ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "child", 1},
+    { ENTR_BOMBCHU_BOWLING_ALLEY_0,                       ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING,            {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bombchu Bowling Entry",         "Bombchu Bowling",                  ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_TREASURE_BOX_SHOP_0,                           ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP,          {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Treasure Chest Game Entry",     "Treasure Chest Game",              ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE,                 ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE,     {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Man-in-Green House Entry",      "Man-in-Green's House",             ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_HAPPY_MASK_SHOP_0,                             ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP,            {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Mask Shop Entry",               "Mask Shop",                        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_BAZAAR_1,                                      ENTR_MARKET_DAY_OUTSIDE_BAZAAR,                     {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bazaar Entry",                  "MK Bazaar",                        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "shop", 1},
+    { ENTR_POTION_SHOP_MARKET_0,                          ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,                {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Potion Shop Entry",             "MK Potion Shop",                   ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_BOMBCHU_SHOP_1,                                ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,           {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "MK Bombchu Shop Entry",            "Bombchu Shop",                     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "", 1},
+    { ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE,           ENTR_MARKET_GUARD_HOUSE_0,                          {{ SCENE_MARKET_GUARD_HOUSE }},                                                                                                                                                           "Guard House",                      "MK Entrance Guard House Entry",    ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "pots,poe"},
+    { ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,           ENTR_SHOOTING_GALLERY_1,                            {{ SCENE_SHOOTING_GALLERY, 0x01 }},                                                                                                                                                       "MK Shooting Gallery",              "MK Shooting Gallery Entry",        ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING,            ENTR_BOMBCHU_BOWLING_ALLEY_0,                       SINGLE_SCENE_INFO(SCENE_BOMBCHU_BOWLING_ALLEY),                                                                                                                                           "Bombchu Bowling",                  "MK Bombchu Bowling Entry",         ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP,          ENTR_TREASURE_BOX_SHOP_0,                           SINGLE_SCENE_INFO(SCENE_TREASURE_BOX_SHOP),                                                                                                                                               "Treasure Chest Game",              "MK Treasure Chest Game Entry",     ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE,     ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE,                 SINGLE_SCENE_INFO(SCENE_BACK_ALLEY_HOUSE),                                                                                                                                                "Man-in-Green's House",             "MK Man-in-Green House Entry",      ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP,            ENTR_HAPPY_MASK_SHOP_0,                             SINGLE_SCENE_INFO(SCENE_HAPPY_MASK_SHOP),                                                                                                                                                 "Mask Shop",                        "MK Mask Shop Entry",               ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_MARKET_DAY_OUTSIDE_BAZAAR,                     ENTR_BAZAAR_1,                                      {{ SCENE_BAZAAR, 0x01 }},                                                                                                                                                                 "MK Bazaar",                        "MK Bazaar Entry",                  ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "shop"},
+    { ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,                ENTR_POTION_SHOP_MARKET_0,                          SINGLE_SCENE_INFO(SCENE_POTION_SHOP_MARKET),                                                                                                                                              "MK Potion Shop",                   "MK Potion Shop Entry",             ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,           ENTR_BOMBCHU_SHOP_1,                                SINGLE_SCENE_INFO(SCENE_BOMBCHU_SHOP),                                                                                                                                                    "Bombchu Shop",                     "MK Bombchu Shop Entry",            ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR},
+    { ENTR_MARKET_DAY_TEMPLE_EXIT,                        ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)},                            "ToT Courtyard Gossip Stones Exit", "Market Temple Exit",               ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD, "tot"},
+    { ENTR_TEMPLE_OF_TIME_ENTRANCE,                       ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE,    {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)},                            "ToT Courtyard Temple Entry",       "Temple of Time Entrance",          ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "tot", 1},
+    { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE,    ENTR_TEMPLE_OF_TIME_ENTRANCE,                       SINGLE_SCENE_INFO(SCENE_TEMPLE_OF_TIME),                                                                                                                                                  "Temple of Time Entrance",          "ToT Courtyard Temple Entry",       ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_INTERIOR,  "tot"},
 
     // Hyrule Castle
     { ENTR_MARKET_DAY_CASTLE_EXIT,                   ENTR_CASTLE_GROUNDS_SOUTH_EXIT,                {SCENE_NO_SPAWN(SCENE_HYRULE_CASTLE), SCENE_NO_SPAWN(SCENE_OUTSIDE_GANONS_CASTLE)}, "Castle Grounds South Exit",      "Market Castle Exit",             ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_MARKET,        ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"},
@@ -380,10 +381,12 @@ const EntranceData entranceData[] = {
     { ENTR_INSIDE_GANONS_CASTLE_ENTRANCE,            ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT,       SINGLE_SCENE_INFO(SCENE_OUTSIDE_GANONS_CASTLE),                                     "OGC Rainbow Bridge Exit",        "Inside Ganon's Castle Entrance", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON,   "outside ganon's castle,gc", 1},
     { ENTR_POTION_SHOP_KAKARIKO_1,                   ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_OGC_DD,       {{ SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0x02 }},                                      "OGC Great Fairy Fountain",       "OGC Behind Pillar",              ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR,  "outside ganon's castle"},
     { ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT,       ENTR_INSIDE_GANONS_CASTLE_ENTRANCE,            SINGLE_SCENE_INFO(SCENE_INSIDE_GANONS_CASTLE),                                      "Inside Ganon's Castle Entrance", "OGC Rainbow Bridge Exit",        ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON,   "outside ganon's castle,gc"}
+
+    // clang-format on
 };
 
 // Check if Link is in the area and return that scene/entrance for tracking
-s8 LinkIsInArea(const EntranceData* entrance) {
+int16_t LinkIsInArea(const EntranceData* entrance) {
     bool result = false;
 
     if (gPlayState == nullptr) {
@@ -424,10 +427,12 @@ bool IsEntranceDiscovered(s16 index) {
     bool isDiscovered = Entrance_GetIsEntranceDiscovered(index);
     if (!isDiscovered) {
         // If the pair included one of the hyrule field <-> zora's river entrances,
-        // the randomizer will have also overriden the water-based entrances, so check those too
-        if ((index == ENTR_ZORAS_RIVER_WEST_EXIT && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_3)) || (index == ENTR_ZORAS_RIVER_3 && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_WEST_EXIT))) {
+        // the randomizer will have also overridden the water-based entrances, so check those too
+        if ((index == ENTR_ZORAS_RIVER_WEST_EXIT && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_3)) ||
+            (index == ENTR_ZORAS_RIVER_3 && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_WEST_EXIT))) {
             isDiscovered = true;
-        } else if ((index == ENTR_HYRULE_FIELD_RIVER_EXIT && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_14)) || (index == ENTR_HYRULE_FIELD_14 && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_RIVER_EXIT))) {
+        } else if ((index == ENTR_HYRULE_FIELD_RIVER_EXIT && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_14)) ||
+                   (index == ENTR_HYRULE_FIELD_14 && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_RIVER_EXIT))) {
             isDiscovered = true;
         }
     }
@@ -444,16 +449,24 @@ const EntranceData* GetEntranceData(s16 index) {
     return nullptr;
 }
 
-// Used for verifying the names on both sides of entrance pairs match. Keeping for ease of use for further name changes later
+void EntranceTracker_LoadFromPreset(nlohmann::json info) {
+    presetLoaded = true;
+    presetPos = { info["pos"]["x"], info["pos"]["y"] };
+    presetSize = { info["size"]["width"], info["size"]["height"] };
+}
+
+// Used for verifying the names on both sides of entrance pairs match. Keeping for ease of use for further name changes
+// later
 // TODO: Figure out how to remove the need for duplicate entrance names so this is no longer necessary
 void CheckEntranceNames() {
-        SPDLOG_ERROR("Checking entrance names:");
+    SPDLOG_ERROR("Checking entrance names:");
     for (size_t i = 0; i < ARRAY_COUNT(entranceData); i++) {
         auto entrance = &entranceData[i];
         auto reverse = GetEntranceData(entrance->reverseIndex);
         if (entrance != nullptr && reverse != nullptr) {
             if (entrance->source != reverse->destination) {
-                SPDLOG_ERROR("{}({}) -> {}({})", entrance->source, entrance->index, reverse->destination, reverse->reverseIndex);
+                SPDLOG_ERROR("{}({}) -> {}({})", entrance->source, entrance->index, reverse->destination,
+                             reverse->reverseIndex);
             }
         }
     }
@@ -587,12 +600,12 @@ void ClearEntranceTrackingData() {
     currentGrottoId = -1;
     lastEntranceIndex = -1;
     lastSceneOrEntranceDetected = -1;
-    gEntranceTrackingData = {0};
+    gEntranceTrackingData = { 0 };
 }
 
 void InitEntranceTrackingData() {
     auto entranceCtx = Rando::Context::GetInstance()->GetEntranceShuffler();
-    gEntranceTrackingData = {0};
+    gEntranceTrackingData = { 0 };
 
     // Check if entrance randomization is disabled
     if (!OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_ENTRANCES)) {
@@ -659,77 +672,89 @@ void InitEntranceTrackingData() {
 }
 
 void EntranceTrackerSettingsWindow::DrawElement() {
-    if (ImGui::BeginTable("entranceTrackerSettings", 1, ImGuiTableFlags_BordersInnerH)) {
+
+    ImGui::TextWrapped("The entrance tracker will only track shuffled entrances");
+    UIWidgets::Spacer(0);
+
+    ImGui::TableNextColumn();
+
+    if (ImGui::BeginTable("entranceTrackerSubSettings", 2,
+                          ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_SizingStretchProp)) {
+        ImGui::TableSetupColumn("column 1", ImGuiTableColumnFlags_WidthStretch, 150.0f);
+        ImGui::TableSetupColumn("column 2", ImGuiTableColumnFlags_WidthStretch, 150.0f);
 
         ImGui::TableNextColumn();
 
-        UIWidgets::Spacer(0);
-        ImGui::TextWrapped("The entrance tracker will only track shuffled entrances");
-        UIWidgets::Spacer(0);
+        ImGui::Text("Sort By");
+        UIWidgets::CVarRadioButton("To", CVAR_TRACKER_ENTRANCE("SortBy"), 0,
+                                   UIWidgets::RadioButtonsOptions()
+                                       .Color(THEME_COLOR)
+                                       .Tooltip("Sort entrances by the original source entrance"));
+        UIWidgets::CVarRadioButton(
+            "From", CVAR_TRACKER_ENTRANCE("SortBy"), 1,
+            UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("Sort entrances by the overrided destination"));
+
+        ImGui::Text("List Items");
+        UIWidgets::CVarCheckbox(
+            "Auto scroll", CVAR_TRACKER_ENTRANCE("AutoScroll"),
+            UIWidgets::CheckboxOptions()
+                .Tooltip("Automatically scroll to the first available entrance in the current scene")
+                .Color(THEME_COLOR));
+        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        UIWidgets::CVarCheckbox("Highlight previous", CVAR_TRACKER_ENTRANCE("HighlightPrevious"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("Highlight the previous entrance that Link came from")
+                                    .Color(THEME_COLOR));
+        UIWidgets::CVarCheckbox("Highlight available", CVAR_TRACKER_ENTRANCE("HighlightAvailable"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("Highlight available entrances in the current scene")
+                                    .Color(THEME_COLOR));
+        ImGui::EndDisabled();
+        UIWidgets::CVarCheckbox("Hide undiscovered", CVAR_TRACKER_ENTRANCE("CollapseUndiscovered"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("Collapse undiscovered entrances towards the bottom of each group")
+                                    .Color(THEME_COLOR));
+        bool disableHideReverseEntrances =
+            OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_ON;
+        static const char* disableHideReverseEntrancesText =
+            "This option is disabled because \"Decouple Entrances\" is enabled.";
+        UIWidgets::CVarCheckbox("Hide reverse", CVAR_TRACKER_ENTRANCE("HideReverseEntrances"),
+                                UIWidgets::CheckboxOptions({ { .disabled = disableHideReverseEntrances,
+                                                               .disabledTooltip = disableHideReverseEntrancesText } })
+                                    .Tooltip("Hide reverse entrance transitions when Decouple Entrances is off")
+                                    .DefaultValue(true)
+                                    .Color(THEME_COLOR));
 
         ImGui::TableNextColumn();
 
-        if (ImGui::BeginTable("entranceTrackerSubSettings", 2, ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_SizingStretchProp)) {
-
-            ImGui::TableNextColumn();
-
-            ImGui::Text("Sort By");
-            UIWidgets::EnhancementRadioButton("To", CVAR_TRACKER_ENTRANCE("SortBy"), 0);
-            UIWidgets::Tooltip("Sort entrances by the original source entrance");
-            UIWidgets::EnhancementRadioButton("From", CVAR_TRACKER_ENTRANCE("SortBy"), 1);
-            UIWidgets::Tooltip("Sort entrances by the overrided destination");
-
-            UIWidgets::Spacer(2.0f);
-
-            ImGui::Text("List Items");
-            UIWidgets::PaddedEnhancementCheckbox("Auto scroll", CVAR_TRACKER_ENTRANCE("AutoScroll"), true, false);
-            UIWidgets::Tooltip("Automatically scroll to the first aviable entrance in the current scene");
-            UIWidgets::PaddedEnhancementCheckbox("Highlight previous", CVAR_TRACKER_ENTRANCE("HighlightPrevious"), true, false);
-            UIWidgets::Tooltip("Highlight the previous entrance that Link came from");
-            UIWidgets::PaddedEnhancementCheckbox("Highlight available", CVAR_TRACKER_ENTRANCE("HighlightAvailable"), true, false);
-            UIWidgets::Tooltip("Highlight available entrances in the current scene");
-            UIWidgets::PaddedEnhancementCheckbox("Hide undiscovered", CVAR_TRACKER_ENTRANCE("CollapseUndiscovered"), true, false);
-            UIWidgets::Tooltip("Collapse undiscovered entrances towards the bottom of each group");
-            bool disableHideReverseEntrances = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_ON;
-            static const char* disableHideReverseEntrancesText = "This option is disabled because \"Decouple Entrances\" is enabled.";
-            UIWidgets::PaddedEnhancementCheckbox("Hide reverse", CVAR_TRACKER_ENTRANCE("HideReverseEntrances"), true, false,
-                                          disableHideReverseEntrances, disableHideReverseEntrancesText, UIWidgets::CheckboxGraphics::Cross, true);
-            UIWidgets::Tooltip("Hide reverse entrance transitions when Decouple Entrances is off");
-            UIWidgets::Spacer(0);
-
-            ImGui::TableNextColumn();
-
-            ImGui::Text("Group By");
-            UIWidgets::EnhancementRadioButton("Area", CVAR_TRACKER_ENTRANCE("GroupBy"), 0);
-            UIWidgets::Tooltip("Group entrances by their area");
-            UIWidgets::EnhancementRadioButton("Type", CVAR_TRACKER_ENTRANCE("GroupBy"), 1);
-            UIWidgets::Tooltip("Group entrances by their entrance type");
-
-            UIWidgets::Spacer(2.0f);
-
-            ImGui::Text("Spoiler Reveal");
-            UIWidgets::PaddedEnhancementCheckbox("Show Source", CVAR_TRACKER_ENTRANCE("ShowFrom"), true, false);
-            UIWidgets::Tooltip("Reveal the sourcefor undiscovered entrances");
-            UIWidgets::PaddedEnhancementCheckbox("Show Destination", CVAR_TRACKER_ENTRANCE("ShowTo"), true, false);
-            UIWidgets::Tooltip("Reveal the destination for undiscovered entrances");
-
-            ImGui::EndTable();
-        }
-
-        ImGui::TableNextColumn();
-
-        ImGui::SetNextItemOpen(false, ImGuiCond_Once);
-        if (ImGui::TreeNode("Legend")) {
-            ImGui::TextColored(ImColor(COLOR_ORANGE), "Last Entrance");
-            ImGui::TextColored(ImColor(COLOR_GREEN), "Available Entrances");
-            ImGui::TextColored(ImColor(COLOR_GRAY), "Undiscovered Entrances");
-            ImGui::TreePop();
-        }
-
-        UIWidgets::Spacer(0);
+        ImGui::Text("Group By");
+        UIWidgets::CVarRadioButton(
+            "Area", CVAR_TRACKER_ENTRANCE("GroupBy"), 0,
+            UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("Group entrances by their area"));
+        UIWidgets::CVarRadioButton(
+            "Type", CVAR_TRACKER_ENTRANCE("GroupBy"), 1,
+            UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("Group entrances by their entrance type"));
 
+        ImGui::Text("Spoiler Reveal");
+        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        UIWidgets::CVarCheckbox(
+            "Show Source", CVAR_TRACKER_ENTRANCE("ShowFrom"),
+            UIWidgets::CheckboxOptions().Tooltip("Reveal the sourcefor undiscovered entrances").Color(THEME_COLOR));
+        UIWidgets::CVarCheckbox("Show Destination", CVAR_TRACKER_ENTRANCE("ShowTo"),
+                                UIWidgets::CheckboxOptions()
+                                    .Tooltip("Reveal the destination for undiscovered entrances")
+                                    .Color(THEME_COLOR));
+        ImGui::EndDisabled();
         ImGui::EndTable();
     }
+
+    ImGui::SetNextItemOpen(false, ImGuiCond_Once);
+    if (ImGui::TreeNode("Legend")) {
+        ImGui::TextColored(ImColor(COLOR_ORANGE), "Last Entrance");
+        ImGui::TextColored(ImColor(COLOR_GREEN), "Available Entrances");
+        ImGui::TextColored(ImColor(COLOR_GRAY), "Undiscovered Entrances");
+        ImGui::TreePop();
+    }
 }
 
 void EntranceTrackerWindow::Draw() {
@@ -742,7 +767,13 @@ void EntranceTrackerWindow::Draw() {
 }
 
 void EntranceTrackerWindow::DrawElement() {
-    ImGui::SetNextWindowSize(ImVec2(600, 375), ImGuiCond_FirstUseEver);
+    if (presetLoaded) {
+        ImGui::SetNextWindowSize(presetSize);
+        ImGui::SetNextWindowPos(presetPos);
+        presetLoaded = false;
+    } else {
+        ImGui::SetNextWindowSize(ImVec2(600, 375), ImGuiCond_FirstUseEver);
+    }
 
     if (!ImGui::Begin("Entrance Tracker", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
         ImGui::End();
@@ -752,24 +783,29 @@ void EntranceTrackerWindow::DrawElement() {
     static ImGuiTextFilter locationSearch;
 
     uint8_t nextTreeState = 0;
-    if (ImGui::Button("Collapse All")) {
+    if (UIWidgets::Button("Collapse All", UIWidgets::ButtonOptions({ { .tooltip = "Collapse all entrance groups" } })
+                                              .Color(THEME_COLOR)
+                                              .Size(UIWidgets::Sizes::Inline))) {
         nextTreeState = 1;
     }
-    UIWidgets::Tooltip("Collapse all entrance groups");
     ImGui::SameLine();
-    if (ImGui::Button("Expand All")) {
+    if (UIWidgets::Button("Expand All", UIWidgets::ButtonOptions({ { .tooltip = "Expand all entrance groups" } })
+                                            .Color(THEME_COLOR)
+                                            .Size(UIWidgets::Sizes::Inline))) {
         nextTreeState = 2;
     }
-    UIWidgets::Tooltip("Expand all entrance groups");
     ImGui::SameLine();
-    if (ImGui::Button("Clear")) {
+    if (UIWidgets::Button("Clear", UIWidgets::ButtonOptions({ { .tooltip = "Clear the search field" } })
+                                       .Color(THEME_COLOR)
+                                       .Size(UIWidgets::Sizes::Inline))) {
         locationSearch.Clear();
     }
-    UIWidgets::Tooltip("Clear the search field");
 
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
     if (locationSearch.Draw()) {
         nextTreeState = 2;
     }
+    UIWidgets::PopStyleCombobox();
 
     uint8_t destToggle = CVarGetInteger(CVAR_TRACKER_ENTRANCE("SortBy"), 0);
     uint8_t groupToggle = CVarGetInteger(CVAR_TRACKER_ENTRANCE("GroupBy"), 0);
@@ -779,7 +815,7 @@ void EntranceTrackerWindow::DrawElement() {
     size_t groupCount = groupToggle ? ENTRANCE_TYPE_COUNT : SPOILER_ENTRANCE_GROUP_COUNT;
     auto groupNames = groupToggle ? groupTypeNames : spoilerEntranceGroupNames;
 
-    EntranceOverride *entranceList;
+    EntranceOverride* entranceList;
 
     switch (groupType) {
         case ENTRANCE_SOURCE_AREA:
@@ -824,14 +860,17 @@ void EntranceTrackerWindow::DrawElement() {
             const EntranceData* original = GetEntranceData(entrance.index);
             const EntranceData* override = GetEntranceData(entrance.override);
 
-            // If entrance is a dungeon, grotto, or interior entrance, the transition into that area has oneExit set, which means we can filter the return transitions as redundant
-            // if entrances are not decoupled, as this is redundant information. Also checks a setting, enabled by default, for hiding them.
-            // If all of these conditions are met, we skip adding this entrance to any lists.
-            // However, if entrances are decoupled, then all transitions need to be displayed, so we proceed with the filtering
-            if ((original->type == ENTRANCE_TYPE_DUNGEON || original->type == ENTRANCE_TYPE_GROTTO || original->type == ENTRANCE_TYPE_INTERIOR) &&
-                (original->oneExit != 1 && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_OFF) &&
+            // If entrance is a dungeon, grotto, or interior entrance, the transition into that area has oneExit set,
+            // which means we can filter the return transitions as redundant if entrances are not decoupled, as this is
+            // redundant information. Also checks a setting, enabled by default, for hiding them. If all of these
+            // conditions are met, we skip adding this entrance to any lists. However, if entrances are decoupled, then
+            // all transitions need to be displayed, so we proceed with the filtering
+            if ((original->type == ENTRANCE_TYPE_DUNGEON || original->type == ENTRANCE_TYPE_GROTTO ||
+                 original->type == ENTRANCE_TYPE_INTERIOR) &&
+                (original->oneExit != 1 &&
+                 OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_OFF) &&
                 hideReverse == 1) {
-                    continue;
+                continue;
             }
 
             // RANDOTODO: Only show blue warps if bluewarp shuffle is on
@@ -849,18 +888,21 @@ void EntranceTrackerWindow::DrawElement() {
             const char* rplcSrcAreaName = spoilerEntranceGroupNames[override->srcGroup].c_str();
             const char* rplcTypeName = groupTypeNames[override->type].c_str();
 
-            const char* origSrcName = showOriginal ? original->source.c_str()      : "";
+            const char* origSrcName = showOriginal ? original->source.c_str() : "";
             const char* rplcDstName = showOverride ? override->destination.c_str() : "";
 
             // Filter for entrances by group name, type, source/destination names, and meta tags
             if ((!locationSearch.IsActive() && (showOriginal || showOverride || !collapsUndiscovered)) ||
-                ((showOriginal && (locationSearch.PassFilter(origSrcName) || locationSearch.PassFilter(origSrcAreaName) ||
-                locationSearch.PassFilter(origTypeName) || locationSearch.PassFilter(original->metaTag.c_str()))) ||
-                (showOverride && (locationSearch.PassFilter(rplcDstName) || locationSearch.PassFilter(rplcSrcAreaName) ||
-                locationSearch.PassFilter(rplcTypeName) || locationSearch.PassFilter(override->metaTag.c_str()))))) {
+                ((showOriginal &&
+                  (locationSearch.PassFilter(origSrcName) || locationSearch.PassFilter(origSrcAreaName) ||
+                   locationSearch.PassFilter(origTypeName) || locationSearch.PassFilter(original->metaTag.c_str()))) ||
+                 (showOverride &&
+                  (locationSearch.PassFilter(rplcDstName) || locationSearch.PassFilter(rplcSrcAreaName) ||
+                   locationSearch.PassFilter(rplcTypeName) || locationSearch.PassFilter(override->metaTag.c_str()))))) {
 
                 // Detect if a scroll should happen and remember the scene for that scroll
-                if (!doAreaScroll && (lastSceneOrEntranceDetected != LinkIsInArea(original) && LinkIsInArea(original) != -1)) {
+                if (!doAreaScroll &&
+                    (lastSceneOrEntranceDetected != LinkIsInArea(original) && LinkIsInArea(original) != -1)) {
                     lastSceneOrEntranceDetected = LinkIsInArea(original);
                     doAreaScroll = true;
                 }
@@ -894,16 +936,18 @@ void EntranceTrackerWindow::DrawElement() {
 
                     const char* unknown = "???";
 
-                    const char* origSrcName = showOriginal ? original->source.c_str()      : unknown;
+                    const char* origSrcName = showOriginal ? original->source.c_str() : unknown;
                     const char* rplcDstName = showOverride ? override->destination.c_str() : unknown;
 
                     uint32_t color = isDiscovered ? IM_COL32_WHITE : COLOR_GRAY;
 
                     // Handle highlighting and auto scroll
                     if ((original->index == lastEntranceIndex ||
-                        (override->reverseIndex == lastEntranceIndex && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) == RO_GENERIC_OFF)) &&
-                            highlightPrevious) {
-                                 color = COLOR_ORANGE;
+                         (override->reverseIndex == lastEntranceIndex &&
+                          OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_DECOUPLED_ENTRANCES) ==
+                              RO_GENERIC_OFF)) &&
+                        highlightPrevious) {
+                        color = COLOR_ORANGE;
                     } else if (LinkIsInArea(original) != -1) {
                         if (highlightAvailable) {
                             color = COLOR_GREEN;
@@ -940,16 +984,13 @@ void EntranceTrackerWindow::DrawElement() {
         }
     }
     ImGui::EndChild();
-
     ImGui::End();
 }
 
 void EntranceTrackerWindow::InitElement() {
     // Setup hooks for loading and clearing the entrance tracker data
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
-        InitEntranceTrackingData();
-    });
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](int32_t fileNum) {
-        ClearEntranceTrackingData();
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(
+        [](int32_t fileNum) { InitEntranceTrackingData(); });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>(
+        [](int32_t fileNum) { ClearEntranceTrackingData(); });
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
index ef217b7f09..2d2f7143cb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
@@ -76,8 +76,12 @@ typedef struct {
 
 extern EntranceTrackingData gEntranceTrackingData;
 
-#define SINGLE_SCENE_INFO(scene) {{ scene, -1 }}
-#define SCENE_NO_SPAWN(scene) { scene, -1 }
+#define SINGLE_SCENE_INFO(scene) \
+    {                            \
+        { scene, -1 }            \
+    }
+#define SCENE_NO_SPAWN(scene) \
+    { scene, -1 }
 
 void SetCurrentGrottoIDForTracker(int16_t entranceIndex);
 void SetLastEntranceOverrideForTracker(int16_t entranceIndex);
@@ -86,23 +90,24 @@ void InitEntranceTrackingData();
 s16 GetLastEntranceOverride();
 s16 GetCurrentGrottoId();
 const EntranceData* GetEntranceData(s16);
+void EntranceTracker_LoadFromPreset(nlohmann::json info);
 
-class EntranceTrackerSettingsWindow : public Ship::GuiWindow {
+class EntranceTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
   protected:
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
-class EntranceTrackerWindow : public Ship::GuiWindow {
+class EntranceTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
-
     void Draw() override;
+
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
index 50cb093c85..042efadf43 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
@@ -12,6 +12,7 @@ extern PlayState* gPlayState;
 
 // Information necessary for entering each grotto
 static const GrottoLoadInfo grottoLoadTable[NUM_GROTTOS] = {
+    // clang-format off
     {.entranceIndex = ENTR_GROTTOS_10,        .content = 0xFD, .scene = SCENE_DESERT_COLOSSUS},       // Desert Colossus -> Colossus Grotto
     {.entranceIndex = ENTR_GROTTOS_4,         .content = 0xEF, .scene = SCENE_LAKE_HYLIA},            // Lake Hylia -> LH Grotto
     {.entranceIndex = ENTR_GROTTOS_10,        .content = 0xEB, .scene = SCENE_ZORAS_RIVER},           // Zora River -> ZR Storms Grotto
@@ -45,10 +46,13 @@ static const GrottoLoadInfo grottoLoadTable[NUM_GROTTOS] = {
     {.entranceIndex = ENTR_GROTTOS_10,        .content = 0xF0, .scene = SCENE_GERUDO_VALLEY},         // GV Fortress Side -> GV Storms Grotto
     {.entranceIndex = ENTR_GROTTOS_6,         .content = 0xF2, .scene = SCENE_GERUDO_VALLEY},         // GV Grotto Ledge -> GV Octorok Grotto
     {.entranceIndex = ENTR_GROTTOS_12,        .content = 0xF3, .scene = SCENE_LOST_WOODS},            // LW Beyond Mido -> Deku Theater
+
+    // clang-format on
 };
 
 // Information necessary for setting up returning from a grotto
 static const GrottoReturnInfo grottoReturnTable[NUM_GROTTOS] = {
+    // clang-format off
     {.entranceIndex = ENTR_DESERT_COLOSSUS_EAST_EXIT,       .room = 0x00, .angle = 0xA71C, .pos = {.x =    62.5078f, .y =   -32.0f, .z = -1296.2f}},   // Colossus Grotto -> Desert Colossus
     {.entranceIndex = ENTR_LAKE_HYLIA_NORTH_EXIT,            .room = 0x00, .angle = 0x0000, .pos = {.x = -3039.34f,   .y = -1033.0f, .z =  6080.74f}},  // LH Grotto -> Lake Hylia
     {.entranceIndex = ENTR_ZORAS_RIVER_WEST_EXIT,           .room = 0x00, .angle = 0x0000, .pos = {.x = -1630.05f,   .y =   100.0f, .z =  -132.104f}}, // ZR Storms Grotto -> Zora River
@@ -82,10 +86,12 @@ static const GrottoReturnInfo grottoReturnTable[NUM_GROTTOS] = {
     {.entranceIndex = ENTR_GERUDO_VALLEY_WEST_EXIT,         .room = 0x00, .angle = 0x9555, .pos = {.x = -1326.34f,   .y =    15.0f, .z =  -983.994f}}, // GV Storms Grotto -> GV Fortress Side
     {.entranceIndex = ENTR_GERUDO_VALLEY_EAST_EXIT,         .room = 0x00, .angle = 0x8000, .pos = {.x =   291.513f,  .y =  -555.0f, .z =  1478.39f}},  // GV Octorok Grotto -> GV Grotto Ledge
     {.entranceIndex = ENTR_LOST_WOODS_NORTH_EXIT,            .room = 0x06, .angle = 0x4000, .pos = {.x =   109.281f,  .y =   -20.0f, .z = -1601.42f}},  // Deku Theater -> LW Beyond Mido
+
+    // clang-format on
 };
 
-static s16 grottoExitList[NUM_GROTTOS] = {0};
-static s16 grottoLoadList[NUM_GROTTOS] = {0};
+static s16 grottoExitList[NUM_GROTTOS] = { 0 };
+static s16 grottoLoadList[NUM_GROTTOS] = { 0 };
 static s8 grottoId = 0xFF;
 static s8 lastEntranceType = NOT_GROTTO;
 static u8 overridingNextEntrance = false;
@@ -137,7 +143,9 @@ static void Grotto_SetupReturnInfo(GrottoReturnInfo grotto, RespawnMode respawnM
 // This method doesn't change player respawn data, so only use this if you are querying an entrance index.
 s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
     // Don't change anything unless grotto shuffle has been enabled
-    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) && !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
+    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
         return nextEntranceIndex;
     }
 
@@ -151,7 +159,8 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
     s8 tempGrottoId = nextEntranceIndex & 0x00FF;
 
     // Grotto Returns
-    if (nextEntranceIndex >= ENTRANCE_GROTTO_EXIT_START && nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START + NUM_GROTTOS) {
+    if (nextEntranceIndex >= ENTRANCE_GROTTO_EXIT_START &&
+        nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START + NUM_GROTTOS) {
         GrottoReturnInfo grotto = grottoReturnTable[tempGrottoId];
 
         // When the nextEntranceIndex is determined by a dynamic exit,
@@ -161,11 +170,11 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
             nextEntranceIndex = grotto.entranceIndex;
         } else if (gPlayState == NULL) { // Handle spawn position when loading from a save file
             nextEntranceIndex = grotto.entranceIndex;
-        // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it
+            // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it
         } else {
             nextEntranceIndex = ENTR_RETURN_GROTTO;
         }
-    // Grotto Loads
+        // Grotto Loads
     } else if (nextEntranceIndex >= ENTRANCE_GROTTO_LOAD_START && nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START) {
         GrottoLoadInfo grotto = grottoLoadTable[tempGrottoId];
         nextEntranceIndex = grotto.entranceIndex;
@@ -179,7 +188,9 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
 s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
 
     // Don't change anything unless grotto shuffle has been enabled
-    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) && !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
+    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
         return nextEntranceIndex;
     }
 
@@ -195,7 +206,8 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
     grottoId = nextEntranceIndex & 0x00FF;
 
     // Grotto Returns
-    if (nextEntranceIndex >= ENTRANCE_GROTTO_EXIT_START && nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START + NUM_GROTTOS) {
+    if (nextEntranceIndex >= ENTRANCE_GROTTO_EXIT_START &&
+        nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START + NUM_GROTTOS) {
 
         GrottoReturnInfo grotto = grottoReturnTable[grottoId];
         Grotto_SetupReturnInfo(grotto, RESPAWN_MODE_RETURN);
@@ -213,13 +225,13 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
             gSaveContext.respawnFlag = 2;
             nextEntranceIndex = grotto.entranceIndex;
             gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
-        // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it
+            // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it
         } else {
             nextEntranceIndex = ENTR_RETURN_GROTTO;
         }
 
         lastEntranceType = GROTTO_RETURN;
-    // Grotto Loads
+        // Grotto Loads
     } else if (nextEntranceIndex >= ENTRANCE_GROTTO_LOAD_START && nextEntranceIndex < ENTRANCE_GROTTO_EXIT_START) {
 
         // Set the respawn data to load the correct grotto
@@ -230,7 +242,7 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
         EntranceTracker_SetCurrentGrottoID(grottoId);
 
         lastEntranceType = NOT_GROTTO;
-    // Otherwise just unset the current grotto ID
+        // Otherwise just unset the current grotto ID
     } else {
         grottoId = 0xFF;
         lastEntranceType = NOT_GROTTO;
@@ -245,7 +257,9 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) {
 void Grotto_OverrideActorEntrance(Actor* thisx) {
 
     // Vanilla Behavior if there's no possibility of ending up in a grotto randomly
-    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) && !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
+    if (!Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) &&
+        !Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
         return;
     }
 
@@ -271,7 +285,9 @@ void Grotto_OverrideActorEntrance(Actor* thisx) {
 
 // Set necessary flags for when warp songs/overworld spawns are shuffled to grotto return points
 void Grotto_ForceGrottoReturnOnSpecialEntrance(void) {
-    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) || Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
+    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
         gSaveContext.respawnFlag = 2;
         gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x04FF;
         gSaveContext.respawn[RESPAWN_MODE_RETURN].pos = grottoReturnTable[grottoId].pos;
@@ -284,11 +300,13 @@ void Grotto_ForceGrottoReturnOnSpecialEntrance(void) {
 // Set the respawn flag for when we want to return from a grotto entrance
 // Used for Sun's Song and Game Over, which usually don't restore saved position data
 void Grotto_ForceGrottoReturn(void) {
-    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) || Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
+    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
         gSaveContext.respawnFlag = 2;
         gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x0DFF;
         gSaveContext.respawn[RESPAWN_MODE_RETURN].pos = grottoReturnTable[grottoId].pos;
-        //Save the current temp flags in the grotto return point, so they'll properly keep their values.
+        // Save the current temp flags in the grotto return point, so they'll properly keep their values.
         gSaveContext.respawn[RESPAWN_MODE_RETURN].tempSwchFlags = gPlayState->actorCtx.flags.tempSwch;
         gSaveContext.respawn[RESPAWN_MODE_RETURN].tempCollectFlags = gPlayState->actorCtx.flags.tempCollect;
     }
@@ -296,7 +314,9 @@ void Grotto_ForceGrottoReturn(void) {
 
 // Used for the DMT special voids, which usually don't restore saved position data
 void Grotto_ForceRegularVoidOut(void) {
-    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) || Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
+    if (lastEntranceType == GROTTO_RETURN && (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) ||
+                                              Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS))) {
         gSaveContext.respawn[RESPAWN_MODE_DOWN] = gSaveContext.respawn[RESPAWN_MODE_RETURN];
         gSaveContext.respawn[RESPAWN_MODE_DOWN].playerParams = 0x0DFF;
         gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = grottoReturnTable[grottoId].pos;
@@ -307,8 +327,9 @@ void Grotto_ForceRegularVoidOut(void) {
 // If returning to a FW point saved at a grotto exit, copy the FW data to the Grotto Return Point
 // so that Sun's Song and Game Over will behave correctly
 void Grotto_SetupReturnInfoOnFWReturn(void) {
-    if (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) || Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS) &&
-        gSaveContext.fw.playerParams == 0x04FF) {
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) ||
+        Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) ||
+        Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS) && gSaveContext.fw.playerParams == 0x04FF) {
         gSaveContext.respawn[RESPAWN_MODE_RETURN] = gSaveContext.respawn[RESPAWN_MODE_TOP];
         gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x0DFF;
         lastEntranceType = GROTTO_RETURN;
@@ -339,7 +360,9 @@ s16 Grotto_GetRenamedGrottoIndexFromOriginal(s8 content, s8 scene) {
 }
 
 s8 Grotto_CurrentGrotto() {
-    if (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) || Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) ||
+        Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) ||
+        Randomizer_GetSettingValue(RSK_SHUFFLE_WARP_SONGS)) {
         return grottoId;
     } else {
         s16 entrance = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
index 8c4d05a4f6..cf2f83d3ad 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_inf.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -1,1355 +1,1954 @@
-#pragma once
+DEFINE_RAND_INF(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)
+DEFINE_RAND_INF(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)
 
-typedef enum {
-    RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE,
-    RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE,
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_GV_COW)
+DEFINE_RAND_INF(RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW)
 
-    RAND_INF_COWS_MILKED_KF_LINKS_HOUSE_COW,
-    RAND_INF_COWS_MILKED_HF_COW_GROTTO_COW,
-    RAND_INF_COWS_MILKED_LLR_STABLES_LEFT_COW,
-    RAND_INF_COWS_MILKED_LLR_STABLES_RIGHT_COW,
-    RAND_INF_COWS_MILKED_LLR_TOWER_LEFT_COW,
-    RAND_INF_COWS_MILKED_LLR_TOWER_RIGHT_COW,
-    RAND_INF_COWS_MILKED_KAK_IMPAS_HOUSE_COW,
-    RAND_INF_COWS_MILKED_DMT_COW_GROTTO_COW,
-    RAND_INF_COWS_MILKED_GV_COW,
-    RAND_INF_COWS_MILKED_JABU_JABUS_BELLY_MQ_COW,
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT)
+DEFINE_RAND_INF(RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT)
 
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
-    RAND_INF_SCRUBS_PURCHASED_JABU_JABUS_BELLY_DEKU_SCRUB,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_DEKU_SCRUB_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO,
-    RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_REAR,
-    RAND_INF_SCRUBS_PURCHASED_ZR_DEKU_SCRUB_GROTTO_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_REAR,
-    RAND_INF_SCRUBS_PURCHASED_SFM_DEKU_SCRUB_GROTTO_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_LH_DEKU_SCRUB_GROTTO_CENTER,
-    RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_REAR,
-    RAND_INF_SCRUBS_PURCHASED_GV_DEKU_SCRUB_GROTTO_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_REAR,
-    RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB_GROTTO_CENTER,
-    RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_GC_DEKU_SCRUB_GROTTO_CENTER,
-    RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_LLR_DEKU_SCRUB_GROTTO_CENTER,
-    RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
-    RAND_INF_SCRUBS_PURCHASED_COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE,
-    RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB,
-    RAND_INF_SCRUBS_PURCHASED_DEKU_TREE_MQ_DEKU_SCRUB,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
-    RAND_INF_SCRUBS_PURCHASED_DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
-    RAND_INF_SCRUBS_PURCHASED_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7)
+DEFINE_RAND_INF(RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8)
 
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7,
-    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7,
-    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7,
-    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8,
+DEFINE_RAND_INF(RAND_INF_MERCHANTS_CARPET_SALESMAN)
+DEFINE_RAND_INF(RAND_INF_MERCHANTS_MEDIGORON)
+DEFINE_RAND_INF(RAND_INF_MERCHANTS_GRANNYS_SHOP)
+DEFINE_RAND_INF(RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN)
 
-    RAND_INF_MERCHANTS_CARPET_SALESMAN,
-    RAND_INF_MERCHANTS_MEDIGORON,
-    RAND_INF_MERCHANTS_GRANNYS_SHOP,
-    RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN,
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_GV_TRADE_SAW)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_LH_TRADE_FROG)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK)
 
-    RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO,
-    RAND_INF_ADULT_TRADES_GV_TRADE_SAW,
-    RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD,
-    RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION,
-    RAND_INF_ADULT_TRADES_LH_TRADE_FROG,
-    RAND_INF_ADULT_TRADES_DMT_TRADE_EYEDROPS,
-    RAND_INF_ADULT_TRADES_DMT_TRADE_CLAIM_CHECK,
+DEFINE_RAND_INF(RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD)
 
-    RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD,
+DEFINE_RAND_INF(RAND_INF_GREG_FOUND)
 
-    RAND_INF_GREG_FOUND,
+DEFINE_RAND_INF(RAND_INF_TOT_MASTER_SWORD)
 
+DEFINE_RAND_INF(RAND_INF_CHILD_FISHING)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_1)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_2)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_3)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_4)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_5)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_6)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_7)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_8)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_9)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_10)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_11)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_12)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_13)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_14)
+DEFINE_RAND_INF(RAND_INF_CHILD_FISH_15)
+DEFINE_RAND_INF(RAND_INF_CHILD_LOACH_1)
+DEFINE_RAND_INF(RAND_INF_CHILD_LOACH_2)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISHING)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_1)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_2)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_3)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_4)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_5)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_6)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_7)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_8)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_9)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_10)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_11)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_12)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_13)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_14)
+DEFINE_RAND_INF(RAND_INF_ADULT_FISH_15)
+DEFINE_RAND_INF(RAND_INF_ADULT_LOACH)
 
-    RAND_INF_TOT_MASTER_SWORD,
+DEFINE_RAND_INF(RAND_INF_10_BIG_POES)
+DEFINE_RAND_INF(RAND_INF_GRANT_GANONS_BOSSKEY)
 
-    RAND_INF_CHILD_FISHING,
-    RAND_INF_CHILD_FISH_1,
-    RAND_INF_CHILD_FISH_2,
-    RAND_INF_CHILD_FISH_3,
-    RAND_INF_CHILD_FISH_4,
-    RAND_INF_CHILD_FISH_5,
-    RAND_INF_CHILD_FISH_6,
-    RAND_INF_CHILD_FISH_7,
-    RAND_INF_CHILD_FISH_8,
-    RAND_INF_CHILD_FISH_9,
-    RAND_INF_CHILD_FISH_10,
-    RAND_INF_CHILD_FISH_11,
-    RAND_INF_CHILD_FISH_12,
-    RAND_INF_CHILD_FISH_13,
-    RAND_INF_CHILD_FISH_14,
-    RAND_INF_CHILD_FISH_15,
-    RAND_INF_CHILD_LOACH_1,
-    RAND_INF_CHILD_LOACH_2,
-    RAND_INF_ADULT_FISHING,
-    RAND_INF_ADULT_FISH_1,
-    RAND_INF_ADULT_FISH_2,
-    RAND_INF_ADULT_FISH_3,
-    RAND_INF_ADULT_FISH_4,
-    RAND_INF_ADULT_FISH_5,
-    RAND_INF_ADULT_FISH_6,
-    RAND_INF_ADULT_FISH_7,
-    RAND_INF_ADULT_FISH_8,
-    RAND_INF_ADULT_FISH_9,
-    RAND_INF_ADULT_FISH_10,
-    RAND_INF_ADULT_FISH_11,
-    RAND_INF_ADULT_FISH_12,
-    RAND_INF_ADULT_FISH_13,
-    RAND_INF_ADULT_FISH_14,
-    RAND_INF_ADULT_FISH_15,
-    RAND_INF_ADULT_LOACH,
+DEFINE_RAND_INF(RAND_INF_GOHMA_SOUL)
+DEFINE_RAND_INF(RAND_INF_KING_DODONGO_SOUL)
+DEFINE_RAND_INF(RAND_INF_BARINADE_SOUL)
+DEFINE_RAND_INF(RAND_INF_PHANTOM_GANON_SOUL)
+DEFINE_RAND_INF(RAND_INF_VOLVAGIA_SOUL)
+DEFINE_RAND_INF(RAND_INF_MORPHA_SOUL)
+DEFINE_RAND_INF(RAND_INF_BONGO_BONGO_SOUL)
+DEFINE_RAND_INF(RAND_INF_TWINROVA_SOUL)
+DEFINE_RAND_INF(RAND_INF_GANON_SOUL)
 
-    RAND_INF_10_BIG_POES,
-    RAND_INF_GRANT_GANONS_BOSSKEY,
+DEFINE_RAND_INF(RAND_INF_HAS_OCARINA_A)
+DEFINE_RAND_INF(RAND_INF_HAS_OCARINA_C_UP)
+DEFINE_RAND_INF(RAND_INF_HAS_OCARINA_C_DOWN)
+DEFINE_RAND_INF(RAND_INF_HAS_OCARINA_C_LEFT)
+DEFINE_RAND_INF(RAND_INF_HAS_OCARINA_C_RIGHT)
 
-    RAND_INF_GOHMA_SOUL,
-    RAND_INF_KING_DODONGO_SOUL,
-    RAND_INF_BARINADE_SOUL,
-    RAND_INF_PHANTOM_GANON_SOUL,
-    RAND_INF_VOLVAGIA_SOUL,
-    RAND_INF_MORPHA_SOUL,
-    RAND_INF_BONGO_BONGO_SOUL,
-    RAND_INF_TWINROVA_SOUL,
-    RAND_INF_GANON_SOUL,
+DEFINE_RAND_INF(RAND_INF_KF_LINKS_HOUSE_POT)
+DEFINE_RAND_INF(RAND_INF_KF_TWINS_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_KF_TWINS_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_KF_BROTHERS_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_KF_BROTHERS_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_ROOM_FRONT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_ROOM_BACK_POT)
+DEFINE_RAND_INF(RAND_INF_TH_KITCHEN_POT_1)
+DEFINE_RAND_INF(RAND_INF_TH_KITCHEN_POT_2)
+DEFINE_RAND_INF(RAND_INF_TH_1_TORCH_CELL_RIGHT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_1_TORCH_CELL_MID_POT)
+DEFINE_RAND_INF(RAND_INF_TH_1_TORCH_CELL_LEFT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_STEEP_SLOPE_RIGHT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_STEEP_SLOPE_LEFT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_DOUBLE_CELL_RIGHT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_DOUBLE_CELL_MID_POT)
+DEFINE_RAND_INF(RAND_INF_NEAR_DOUBLE_CELL_LEFT_POT)
+DEFINE_RAND_INF(RAND_INF_TH_RIGHTMOST_JAILED_POT)
+DEFINE_RAND_INF(RAND_INF_TH_RIGHT_MIDDLE_JAILED_POT)
+DEFINE_RAND_INF(RAND_INF_TH_LEFT_MIDDLE_JAILED_POT)
+DEFINE_RAND_INF(RAND_INF_TH_LEFTMOST_JAILED_POT)
+DEFINE_RAND_INF(RAND_INF_WASTELAND_NEAR_GS_POT_1)
+DEFINE_RAND_INF(RAND_INF_WASTELAND_NEAR_GS_POT_2)
+DEFINE_RAND_INF(RAND_INF_WASTELAND_NEAR_GS_POT_3)
+DEFINE_RAND_INF(RAND_INF_WASTELAND_NEAR_GS_POT_4)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11)
+DEFINE_RAND_INF(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_POTION_SHOP_POT_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_POTION_SHOP_POT_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_POTION_SHOP_POT_3)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_1)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_2)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_3)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_4)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_5)
+DEFINE_RAND_INF(RAND_INF_GY_DAMPES_GRAVE_POT_6)
+DEFINE_RAND_INF(RAND_INF_GC_LOWER_STAIRCASE_POT_1)
+DEFINE_RAND_INF(RAND_INF_GC_LOWER_STAIRCASE_POT_2)
+DEFINE_RAND_INF(RAND_INF_GC_UPPER_STAIRCASE_POT_1)
+DEFINE_RAND_INF(RAND_INF_GC_UPPER_STAIRCASE_POT_2)
+DEFINE_RAND_INF(RAND_INF_GC_UPPER_STAIRCASE_POT_3)
+DEFINE_RAND_INF(RAND_INF_GC_MEDIGORON_POT_1)
+DEFINE_RAND_INF(RAND_INF_GC_DARUNIA_POT_1)
+DEFINE_RAND_INF(RAND_INF_GC_DARUNIA_POT_2)
+DEFINE_RAND_INF(RAND_INF_GC_DARUNIA_POT_3)
+DEFINE_RAND_INF(RAND_INF_DMC_NEAR_GC_POT_1)
+DEFINE_RAND_INF(RAND_INF_DMC_NEAR_GC_POT_2)
+DEFINE_RAND_INF(RAND_INF_DMC_NEAR_GC_POT_3)
+DEFINE_RAND_INF(RAND_INF_DMC_NEAR_GC_POT_4)
+DEFINE_RAND_INF(RAND_INF_ZD_NEAR_SHOP_POT_1)
+DEFINE_RAND_INF(RAND_INF_ZD_NEAR_SHOP_POT_2)
+DEFINE_RAND_INF(RAND_INF_ZD_NEAR_SHOP_POT_3)
+DEFINE_RAND_INF(RAND_INF_ZD_NEAR_SHOP_POT_4)
+DEFINE_RAND_INF(RAND_INF_ZD_NEAR_SHOP_POT_5)
+DEFINE_RAND_INF(RAND_INF_ZF_HIDDEN_CAVE_POT_1)
+DEFINE_RAND_INF(RAND_INF_ZF_HIDDEN_CAVE_POT_2)
+DEFINE_RAND_INF(RAND_INF_ZF_HIDDEN_CAVE_POT_3)
+DEFINE_RAND_INF(RAND_INF_ZF_NEAR_JABU_POT_1)
+DEFINE_RAND_INF(RAND_INF_ZF_NEAR_JABU_POT_2)
+DEFINE_RAND_INF(RAND_INF_ZF_NEAR_JABU_POT_3)
+DEFINE_RAND_INF(RAND_INF_ZF_NEAR_JABU_POT_4)
+DEFINE_RAND_INF(RAND_INF_LLR_FRONT_POT_1)
+DEFINE_RAND_INF(RAND_INF_LLR_FRONT_POT_2)
+DEFINE_RAND_INF(RAND_INF_LLR_FRONT_POT_3)
+DEFINE_RAND_INF(RAND_INF_LLR_FRONT_POT_4)
+DEFINE_RAND_INF(RAND_INF_LLR_RAIN_SHED_POT_1)
+DEFINE_RAND_INF(RAND_INF_LLR_RAIN_SHED_POT_2)
+DEFINE_RAND_INF(RAND_INF_LLR_RAIN_SHED_POT_3)
+DEFINE_RAND_INF(RAND_INF_LLR_TALONS_HOUSE_POT_1)
+DEFINE_RAND_INF(RAND_INF_LLR_TALONS_HOUSE_POT_2)
+DEFINE_RAND_INF(RAND_INF_LLR_TALONS_HOUSE_POT_3)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_POT_1)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_POT_2)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_POT_1)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_POT_2)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_POT_3)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_POT_4)
 
-    RAND_INF_HAS_OCARINA_A,
-    RAND_INF_HAS_OCARINA_C_UP,
-    RAND_INF_HAS_OCARINA_C_DOWN,
-    RAND_INF_HAS_OCARINA_C_LEFT,
-    RAND_INF_HAS_OCARINA_C_RIGHT,
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BLADE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BLADE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_4)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_5)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOBBY_POT_6)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_TORCH_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_TORCH_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_HALL_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_HALL_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_NEAR_END_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_NEAR_END_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_FROZEN_POT_1)
 
-    RAND_INF_KF_LINKS_HOUSE_POT,
-    RAND_INF_KF_TWINS_HOUSE_POT_1,
-    RAND_INF_KF_TWINS_HOUSE_POT_2,
-    RAND_INF_KF_BROTHERS_HOUSE_POT_1,
-    RAND_INF_KF_BROTHERS_HOUSE_POT_2,
-    RAND_INF_GF_BREAK_ROOM_POT_1,
-    RAND_INF_GF_BREAK_ROOM_POT_2,
-    RAND_INF_GF_KITCHEN_POT_1,
-    RAND_INF_GF_KITCHEN_POT_2,
-    RAND_INF_GF_NORTH_F1_CARPENTER_POT_1,
-    RAND_INF_GF_NORTH_F1_CARPENTER_POT_2,
-    RAND_INF_GF_NORTH_F1_CARPENTER_POT_3,
-    RAND_INF_GF_NORTH_F2_CARPENTER_POT_1,
-    RAND_INF_GF_NORTH_F2_CARPENTER_POT_2,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_POT_1,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_POT_2,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_POT_3,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_1,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_2,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_3,
-    RAND_INF_GF_SOUTH_F1_CARPENTER_CELL_POT_4,
-    RAND_INF_WASTELAND_NEAR_GS_POT_1,
-    RAND_INF_WASTELAND_NEAR_GS_POT_2,
-    RAND_INF_WASTELAND_NEAR_GS_POT_3,
-    RAND_INF_WASTELAND_NEAR_GS_POT_4,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_1,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_2,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_3,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_4,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_5,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_6,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_7,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_8,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_9,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_10,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_11,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_12,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_13,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_14,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_15,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_16,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_17,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_18,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_19,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_20,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_21,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_22,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_23,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_24,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_25,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_26,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_27,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_28,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_29,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_30,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_31,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_32,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_33,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_34,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_35,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_36,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_37,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_38,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_39,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_40,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_41,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_42,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_43,
-    RAND_INF_MK_GUARD_HOUSE_CHILD_POT_44,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_1,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_2,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_3,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_4,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_5,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_6,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_7,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_8,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_9,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_10,
-    RAND_INF_MK_GUARD_HOUSE_ADULT_POT_11,
-    RAND_INF_MK_BACK_ALLEY_HOUSE_POT_1,
-    RAND_INF_MK_BACK_ALLEY_HOUSE_POT_2,
-    RAND_INF_MK_BACK_ALLEY_HOUSE_POT_3,
-    RAND_INF_KAK_NEAR_POTION_SHOP_POT_1,
-    RAND_INF_KAK_NEAR_POTION_SHOP_POT_2,
-    RAND_INF_KAK_NEAR_POTION_SHOP_POT_3,
-    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_1,
-    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_2,
-    RAND_INF_KAK_NEAR_IMPAS_HOUSE_POT_3,
-    RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_1,
-    RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_2,
-    RAND_INF_KAK_NEAR_GUARDS_HOUSE_POT_3,
-    RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_1,
-    RAND_INF_KAK_NEAR_MEDICINE_SHOP_POT_2,
-    RAND_INF_GY_DAMPES_GRAVE_POT_1,
-    RAND_INF_GY_DAMPES_GRAVE_POT_2,
-    RAND_INF_GY_DAMPES_GRAVE_POT_3,
-    RAND_INF_GY_DAMPES_GRAVE_POT_4,
-    RAND_INF_GY_DAMPES_GRAVE_POT_5,
-    RAND_INF_GY_DAMPES_GRAVE_POT_6,
-    RAND_INF_GC_LOWER_STAIRCASE_POT_1,
-    RAND_INF_GC_LOWER_STAIRCASE_POT_2,
-    RAND_INF_GC_UPPER_STAIRCASE_POT_1,
-    RAND_INF_GC_UPPER_STAIRCASE_POT_2,
-    RAND_INF_GC_UPPER_STAIRCASE_POT_3,
-    RAND_INF_GC_MEDIGORON_POT_1,
-    RAND_INF_GC_DARUNIA_POT_1,
-    RAND_INF_GC_DARUNIA_POT_2,
-    RAND_INF_GC_DARUNIA_POT_3,
-    RAND_INF_DMC_NEAR_GC_POT_1,
-    RAND_INF_DMC_NEAR_GC_POT_2,
-    RAND_INF_DMC_NEAR_GC_POT_3,
-    RAND_INF_DMC_NEAR_GC_POT_4,
-    RAND_INF_ZD_NEAR_SHOP_POT_1,
-    RAND_INF_ZD_NEAR_SHOP_POT_2,
-    RAND_INF_ZD_NEAR_SHOP_POT_3,
-    RAND_INF_ZD_NEAR_SHOP_POT_4,
-    RAND_INF_ZD_NEAR_SHOP_POT_5,
-    RAND_INF_ZF_HIDDEN_CAVE_POT_1,
-    RAND_INF_ZF_HIDDEN_CAVE_POT_2,
-    RAND_INF_ZF_HIDDEN_CAVE_POT_3,
-    RAND_INF_ZF_NEAR_JABU_POT_1,
-    RAND_INF_ZF_NEAR_JABU_POT_2,
-    RAND_INF_ZF_NEAR_JABU_POT_3,
-    RAND_INF_ZF_NEAR_JABU_POT_4,
-    RAND_INF_LLR_FRONT_POT_1,
-    RAND_INF_LLR_FRONT_POT_2,
-    RAND_INF_LLR_FRONT_POT_3,
-    RAND_INF_LLR_FRONT_POT_4,
-    RAND_INF_LLR_RAIN_SHED_POT_1,
-    RAND_INF_LLR_RAIN_SHED_POT_2,
-    RAND_INF_LLR_RAIN_SHED_POT_3,
-    RAND_INF_LLR_TALONS_HOUSE_POT_1,
-    RAND_INF_LLR_TALONS_HOUSE_POT_2,
-    RAND_INF_LLR_TALONS_HOUSE_POT_3,
-    RAND_INF_HF_COW_GROTTO_POT_1,
-    RAND_INF_HF_COW_GROTTO_POT_2,
-    RAND_INF_HC_STORMS_GROTTO_POT_1,
-    RAND_INF_HC_STORMS_GROTTO_POT_2,
-    RAND_INF_HC_STORMS_GROTTO_POT_3,
-    RAND_INF_HC_STORMS_GROTTO_POT_4,
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2)
 
-    RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_1,
-    RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_2,
-    RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_3,
-    RAND_INF_DODONGOS_CAVERN_LIZALFOS_POT_4,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_2,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_3,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_4,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_5,
-    RAND_INF_DODONGOS_CAVERN_SIDE_ROOM_POT_6,
-    RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_2,
-    RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_3,
-    RAND_INF_DODONGOS_CAVERN_TORCH_ROOM_POT_4,
-    RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_3,
-    RAND_INF_DODONGOS_CAVERN_STAIRCASE_POT_4,
-    RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_BLADE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_BLADE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_DOUBLE_EYE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_2,
-    RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_3,
-    RAND_INF_DODONGOS_CAVERN_BACK_ROOM_POT_4,
-    RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_3,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_4,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_5,
-    RAND_INF_JABU_JABUS_BELLY_BARINADE_POT_6,
-    RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_BASEMENT_POT_3,
-    RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3,
-    RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4,
-    RAND_INF_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_1,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_2,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_3,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_4,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_5,
-    RAND_INF_FOREST_TEMPLE_LOBBY_POT_6,
-    RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_1,
-    RAND_INF_FOREST_TEMPLE_LOWER_STALFOS_POT_2,
-    RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_1,
-    RAND_INF_FOREST_TEMPLE_GREEN_POE_POT_2,
-    RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_1,
-    RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_2,
-    RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_3,
-    RAND_INF_FOREST_TEMPLE_UPPER_STALFOS_POT_4,
-    RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_1,
-    RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_2,
-    RAND_INF_FOREST_TEMPLE_BLUE_POE_POT_3,
-    RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_1,
-    RAND_INF_FOREST_TEMPLE_FROZEN_EYE_POT_2,
-    RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_1,
-    RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_2,
-    RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_3,
-    RAND_INF_FIRE_TEMPLE_NEAR_BOSS_POT_4,
-    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_1,
-    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_2,
-    RAND_INF_FIRE_TEMPLE_BIG_LAVA_POT_3,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3,
-    RAND_INF_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4,
-    RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_1,
-    RAND_INF_WATER_TEMPLE_MAIN_LEVEL_2_POT_2,
-    RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_1,
-    RAND_INF_WATER_TEMPLE_MAIN_LEVEL_1_POT_2,
-    RAND_INF_WATER_TEMPLE_TORCH_POT_1,
-    RAND_INF_WATER_TEMPLE_TORCH_POT_2,
-    RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_1,
-    RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_2,
-    RAND_INF_WATER_TEMPLE_NEAR_COMPASS_POT_3,
-    RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_1,
-    RAND_INF_WATER_TEMPLE_CENTRAL_BOW_POT_2,
-    RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_1,
-    RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2,
-    RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3,
-    RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4,
-    RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1,
-    RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2,
-    RAND_INF_WATER_TEMPLE_RIVER_POT_1,
-    RAND_INF_WATER_TEMPLE_RIVER_POT_2,
-    RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1,
-    RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2,
-    RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1,
-    RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2,
-    RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1,
-    RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1,
-    RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2,
-    RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3,
-    RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4,
-    RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5,
-    RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MAP_CHEST_POT_2,
-    RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_1,
-    RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_2,
-    RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_3,
-    RAND_INF_SHADOW_TEMPLE_FALLING_SPIKES_POT_4,
-    RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_1,
-    RAND_INF_SHADOW_TEMPLE_AFTER_WIND_POT_2,
-    RAND_INF_SHADOW_TEMPLE_SPIKE_WALLS_POT_1,
-    RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_1,
-    RAND_INF_SHADOW_TEMPLE_FLOORMASTER_POT_2,
-    RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_1,
-    RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_2,
-    RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_3,
-    RAND_INF_SHADOW_TEMPLE_AFTER_BOAT_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_LOBBY_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_ANUBIS_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5,
-    RAND_INF_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6,
-    RAND_INF_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1,
-    RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_FOREST_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_4,
-    RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,
-    RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_LIGHT_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_1,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_2,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_3,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_4,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_5,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_6,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_7,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_8,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_9,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_10,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_11,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_12,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_13,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_14,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_15,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_16,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_17,
-    RAND_INF_GANONS_CASTLE_GANONS_TOWER_POT_18,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,
-    RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3,
-    RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_UNDERWATER_POT,
-    RAND_INF_ICE_CAVERN_HALL_POT_1,
-    RAND_INF_ICE_CAVERN_HALL_POT_2,
-    RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_1,
-    RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_2,
-    RAND_INF_ICE_CAVERN_SPINNING_BLADE_POT_3,
-    RAND_INF_ICE_CAVERN_NEAR_END_POT_1,
-    RAND_INF_ICE_CAVERN_NEAR_END_POT_2,
-    RAND_INF_ICE_CAVERN_FROZEN_POT_1,
+DEFINE_RAND_INF(RAND_INF_GV_FREESTANDING_POH_CRATE)
+DEFINE_RAND_INF(RAND_INF_GV_NEAR_COW_CRATE)
+DEFINE_RAND_INF(RAND_INF_GV_CRATE_BRIDGE_1)
+DEFINE_RAND_INF(RAND_INF_GV_CRATE_BRIDGE_2)
+DEFINE_RAND_INF(RAND_INF_GV_CRATE_BRIDGE_3)
+DEFINE_RAND_INF(RAND_INF_GV_CRATE_BRIDGE_4)
+DEFINE_RAND_INF(RAND_INF_GF_ABOVE_JAIL_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_SOUTHMOST_CENTER_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_MID_SOUTH_CENTER_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_MID_NORTH_CENTER_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_NORTHMOST_CENTER_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_OUTSKIRTS_NE_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_OUTSKIRTS_NW_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_RANGE_CRATE_7)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_CANOPY_EAST_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_HBA_CANOPY_WEST_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_NORTH_TARGET_EAST_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_NORTH_TARGET_WEST_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_NORTH_TARGET_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_SOUTH_TARGET_EAST_CRATE)
+DEFINE_RAND_INF(RAND_INF_GF_SOUTH_TARGET_WEST_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_KITCHEN_LEFTMOST_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_KITCHEN_MID_LEFT_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_KITCHEN_MID_RIGHT_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_NEAR_KITCHEN_RIGHTMOST_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_KITCHEN_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_HALLWAY_OUTER_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_HALLWAY_INNER_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_ROOM_RIGHT_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_BREAK_ROOM_LEFT_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_1_TORCH_CELL_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_DEAD_END_CELL_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_DOUBLE_CELL_LEFT_CRATE)
+DEFINE_RAND_INF(RAND_INF_TH_DOUBLE_CELL_RIGHT_CRATE)
+DEFINE_RAND_INF(RAND_INF_HW_BEFORE_QUICKSAND_CRATE)
+DEFINE_RAND_INF(RAND_INF_HW_AFTER_QUICKSAND_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_HW_AFTER_QUICKSAND_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_HW_AFTER_QUICKSAND_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_HW_NEAR_COLOSSUS_CRATE)
+DEFINE_RAND_INF(RAND_INF_MK_NEAR_BAZAAR_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_MK_NEAR_BAZAAR_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_MK_SHOOTING_GALLERY_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_MK_SHOOTING_GALLERY_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_MK_LOST_DOG_HOUSE_CRATE)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_MK_GUARD_HOUSE_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_OPEN_GROTTO_ADULT_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_POTION_SHOP_ADULT_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_SHOOTING_GALLERY_ADULT_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BOARDING_HOUSE_ADULT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_IMPAS_HOUSE_ADULT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BAZAAR_ADULT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_KAK_BEHIND_GS_HOUSE_ADULT_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_GY_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_WINDMILL_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_FENCE_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BOARDING_HOUSE_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_KAK_NEAR_BAZAAR_CHILD_CRATE)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_CRATE)
+DEFINE_RAND_INF(RAND_INF_GC_MAZE_CRATE)
+DEFINE_RAND_INF(RAND_INF_DMC_CRATE)
+DEFINE_RAND_INF(RAND_INF_LLR_NEAR_TREE_CRATE)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_CRATE)
 
-    RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_GEYSER_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,
-    RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_4,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_5,
-    RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_6,
-    RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3,
-    RAND_INF_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4,
-    RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_BLUE_POE_POT_3,
-    RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_GREEN_POE_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_1,
-    RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_2,
-    RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_3,
-    RAND_INF_FOREST_TEMPLE_MQ_BASEMENT_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3,
-    RAND_INF_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3,
-    RAND_INF_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3,
-    RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3,
-    RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_3,
-    RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_POT_4,
-    RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2,
-    RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1,
-    RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2,
-    RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1,
-    RAND_INF_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3,
-    RAND_INF_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4,
-    RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4,
-    RAND_INF_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT,
-    RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1,
-    RAND_INF_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3,
-    RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_ENTRANCE_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_LAVA_POT_3,
-    RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3,
-    RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7,
-    RAND_INF_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8,
-    RAND_INF_ICE_CAVERN_MQ_ENTRANCE_POT,
-    RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1,
-    RAND_INF_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2,
-    RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1,
-    RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2,
-    RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3,
-    RAND_INF_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4,
-    RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1,
-    RAND_INF_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2,
-    RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_1,
-    RAND_INF_ICE_CAVERN_MQ_COMPASS_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5,
-    RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2,
-    RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1,
-    RAND_INF_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3,
-    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4,
-    RAND_INF_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5,
-    RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3,
-    RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3,
-    RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4,
-    RAND_INF_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5,
-    RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_RIVER_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3,
-    RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_1,
-    RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_2,
-    RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_3,
-    RAND_INF_WATER_TEMPLE_MQ_LOWEST_GS_POT_4,
-    RAND_INF_WATER_TEMPLE_MQ_BOSS_KEY_POT,
-    RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_1,
-    RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_POT_2,
-    RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_1,
-    RAND_INF_GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_POT_2,
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_CRATE)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_7)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_POE_ROOM_CRATE_8)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_TWO_FLAMES_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LARVAE_ROOM_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_SHORTCUT_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_UPPER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_7)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_8)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_9)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_10)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_11)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_12)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_13)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_CENTRAL_PILLAR_LOWER_CRATE_14)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_ROOM_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY_GATE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_CRATE_7)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_SUBMERGED_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_UPPER_CRATE)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_BK_ROOM_LOWER_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_FRONT_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_WHIRLPOOL_BEHIND_GATE_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_UPPER_CRATE)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_HALL_CRATE)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DODONGO_ROOM_LOWER_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_B_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_SUBMERGED_CRATE_6)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_TRIPLE_TORCH_ROOM_GATE_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE)
 
-    
-    RAND_INF_CAUGHT_LOACH,
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_AFTER_HAMMER_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2)
 
-    RAND_INF_CAN_SWIM,
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_FROZEN_EYE_SWITCH_SMALL_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LAVA_TORCH_SMALL_CRATE_5)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DRAGON_ROOM_TORCHES_SMALL_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_STORAGE_ROOM_A_SMALL_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_LOWER_SMALL_CRATE)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_UPPER_SMALL_CRATE)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_1)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_2)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_3)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_TRUTH_SPINNER_SMALL_CRATE_4)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_STATUE_SMALL_CRATE)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_BEAMOS_SMALL_CRATE)
 
-    RAND_INF_HAS_WALLET,
+DEFINE_RAND_INF(RAND_INF_CAUGHT_LOACH)
 
-    RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO,
-    RAND_INF_BEEHIVE_SFM_STORMS_GROTTO,
-    RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO,
-    RAND_INF_BEEHIVE_LLR_GROTTO,
-    RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_DMT_COW_GROTTO,
-    RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_GC_GROTTO,
-    RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO,
-    RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT,
-    RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT,
-    RAND_INF_BEEHIVE_ZR_STORMS_GROTTO,
-    RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT,
-    RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT,
-    RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA,
-    RAND_INF_BEEHIVE_LH_GROTTO,
-    RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO,
-    RAND_INF_BEEHIVE_COLOSSUS_GROTTO,
+DEFINE_RAND_INF(RAND_INF_CAN_SWIM)
 
-    RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO,
-    RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO,
-    RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO,
-    RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO,
-    RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO,
-    RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO,
-    RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO,
-    RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO,
-    RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO,
+DEFINE_RAND_INF(RAND_INF_HAS_WALLET)
 
-    RAND_INF_FISHING_POLE_FOUND,
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_LW_NEAR_SHORTCUTS_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_LW_DEKU_SCRUB_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_SFM_STORMS_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_NEAR_MARKET_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_OPEN_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_SOUTHEAST_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_HF_INSIDE_FENCE_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_LLR_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_KAK_OPEN_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMT_COW_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMT_STORMS_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_GC_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMC_UPPER_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_DMC_HAMMER_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZR_OPEN_GROTTO_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZR_STORMS_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_LEFT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZD_IN_FRONT_OF_KING_ZORA_RIGHT)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_ZD_BEHIND_KING_ZORA)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_LH_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_GV_DEKU_SCRUB_GROTTO)
+DEFINE_RAND_INF(RAND_INF_BEEHIVE_COLOSSUS_GROTTO)
 
-    RAND_INF_ZD_FISH_1,
-    RAND_INF_ZD_FISH_2,
-    RAND_INF_ZD_FISH_3,
-    RAND_INF_ZD_FISH_4,
-    RAND_INF_ZD_FISH_5,
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_ZR_OPEN_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_DMC_UPPER_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_DMT_STORMS_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_KAK_OPEN_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_HF_NEAR_MARKET_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_HF_OPEN_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_HF_SOUTHEAST_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_LW_NEAR_SHORTCUTS_GROTTO)
+DEFINE_RAND_INF(RAND_INF_GROTTO_FISH_KF_STORMS_GROTTO)
 
-    RAND_INF_HAS_INFINITE_QUIVER,
-    RAND_INF_HAS_INFINITE_BOMB_BAG,
-    RAND_INF_HAS_INFINITE_BULLET_BAG,
-    RAND_INF_HAS_INFINITE_STICK_UPGRADE,
-    RAND_INF_HAS_INFINITE_NUT_UPGRADE,
-    RAND_INF_HAS_INFINITE_MAGIC_METER,
-    RAND_INF_HAS_INFINITE_BOMBCHUS,
-    RAND_INF_HAS_INFINITE_MONEY,
+DEFINE_RAND_INF(RAND_INF_FISHING_POLE_FOUND)
 
-    RAND_INF_HAS_SKELETON_KEY,
+DEFINE_RAND_INF(RAND_INF_ZD_FISH_1)
+DEFINE_RAND_INF(RAND_INF_ZD_FISH_2)
+DEFINE_RAND_INF(RAND_INF_ZD_FISH_3)
+DEFINE_RAND_INF(RAND_INF_ZD_FISH_4)
+DEFINE_RAND_INF(RAND_INF_ZD_FISH_5)
 
-    RAND_INF_LINKS_POCKET,
-    RAND_INF_LEARNED_EPONA_SONG,
-    RAND_INF_DARUNIAS_JOY,
-    RAND_INF_KING_ZORA_THAWED,
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_QUIVER)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_BOMB_BAG)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_BULLET_BAG)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_STICK_UPGRADE)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_NUT_UPGRADE)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_MAGIC_METER)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_BOMBCHUS)
+DEFINE_RAND_INF(RAND_INF_HAS_INFINITE_MONEY)
 
-    RAND_INF_HC_GREAT_FAIRY_REWARD,
-    RAND_INF_DMT_GREAT_FAIRY_REWARD,
-    RAND_INF_DMC_GREAT_FAIRY_REWARD,
-    RAND_INF_ZF_GREAT_FAIRY_REWARD,
-    RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD,
-    RAND_INF_OGC_GREAT_FAIRY_REWARD,
+DEFINE_RAND_INF(RAND_INF_HAS_SKELETON_KEY)
 
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4,
-    RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5,
+DEFINE_RAND_INF(RAND_INF_LINKS_POCKET)
+DEFINE_RAND_INF(RAND_INF_LEARNED_EPONA_SONG)
+DEFINE_RAND_INF(RAND_INF_DARUNIAS_JOY)
+DEFINE_RAND_INF(RAND_INF_KING_ZORA_THAWED)
 
-    RAND_INF_GF_ITEM_FROM_LEADER_OF_FORTRESS,
-    RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN,
+DEFINE_RAND_INF(RAND_INF_HC_GREAT_FAIRY_REWARD)
+DEFINE_RAND_INF(RAND_INF_DMT_GREAT_FAIRY_REWARD)
+DEFINE_RAND_INF(RAND_INF_DMC_GREAT_FAIRY_REWARD)
+DEFINE_RAND_INF(RAND_INF_ZF_GREAT_FAIRY_REWARD)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_GREAT_FAIRY_REWARD)
+DEFINE_RAND_INF(RAND_INF_OGC_GREAT_FAIRY_REWARD)
 
-    RAND_INF_ZELDAS_LETTER,
-    RAND_INF_WEIRD_EGG,
-    RAND_INF_CHILD_TRADES_MASK_KEATON,
-    RAND_INF_CHILD_TRADES_MASK_SKULL,
-    RAND_INF_CHILD_TRADES_MASK_SPOOKY,
-    RAND_INF_CHILD_TRADES_MASK_BUNNY,
-    RAND_INF_CHILD_TRADES_MASK_GORON,
-    RAND_INF_CHILD_TRADES_MASK_ZORA,
-    RAND_INF_CHILD_TRADES_MASK_GERUDO,
-    RAND_INF_CHILD_TRADES_MASK_TRUTH,
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_1)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_2)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_3)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_4)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_ITEM_5)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_1)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_2)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_3)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_4)
+DEFINE_RAND_INF(RAND_INF_MARKET_TREASURE_CHEST_GAME_KEY_5)
 
-    RAND_INF_KF_BOULDER_RUPEE_2,
-    RAND_INF_KF_BOULDER_RUPEE_1,
-    RAND_INF_KF_BRIDGE_RUPEE,
-    RAND_INF_KF_BEHIND_MIDOS_RUPEE,
-    RAND_INF_KF_SARIAS_ROOF_WEST_HEART,
-    RAND_INF_KF_SARIAS_ROOF_EAST_HEART,
-    RAND_INF_KF_SARIAS_ROOF_NORTH_HEART,
-    RAND_INF_KF_SOUTH_GRASS_WEST_RUPEE,
-    RAND_INF_KF_NORTH_GRASS_WEST_RUPEE,
-    RAND_INF_KF_NORTH_GRASS_EAST_RUPEE,
-    RAND_INF_KF_SOUTH_GRASS_EAST_RUPEE,
-    RAND_INF_KF_SARIAS_TOP_LEFT_HEART,
-    RAND_INF_KF_SARIAS_TOP_RIGHT_HEART,
-    RAND_INF_KF_SARIAS_BOTTOM_LEFT_HEART,
-    RAND_INF_KF_SARIAS_BOTTOM_RIGHT_HEART,
-    RAND_INF_KF_BEAN_RUPEE_1,
-    RAND_INF_KF_BEAN_RUPEE_2,
-    RAND_INF_KF_BEAN_RUPEE_3,
-    RAND_INF_KF_BEAN_RUPEE_4,
-    RAND_INF_KF_BEAN_RUPEE_5,
-    RAND_INF_KF_BEAN_RUPEE_6,
-    RAND_INF_KF_BEAN_RED_RUPEE,
-    RAND_INF_LW_BOULDER_RUPEE,
-    RAND_INF_LW_SHORTCUT_RUPEE_1,
-    RAND_INF_LW_SHORTCUT_RUPEE_2,
-    RAND_INF_LW_SHORTCUT_RUPEE_3,
-    RAND_INF_LW_SHORTCUT_RUPEE_4,
-    RAND_INF_LW_SHORTCUT_RUPEE_5,
-    RAND_INF_LW_SHORTCUT_RUPEE_6,
-    RAND_INF_LW_SHORTCUT_RUPEE_7,
-    RAND_INF_LW_SHORTCUT_RUPEE_8,
-    RAND_INF_LH_FRONT_RUPEE,
-    RAND_INF_LH_MIDDLE_RUPEE,
-    RAND_INF_LH_BACK_RUPEE,
-    RAND_INF_LH_LAB_FRONT_RUPEE,
-    RAND_INF_LH_LAB_LEFT_RUPEE,
-    RAND_INF_LH_LAB_RIGHT_RUPEE,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_1,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_2,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_3,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_4,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_5,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_6,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_7,
-    RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_8,
+DEFINE_RAND_INF(RAND_INF_TH_ITEM_FROM_LEADER_OF_FORTRESS)
+DEFINE_RAND_INF(RAND_INF_GF_GTG_GATE_PERMANENTLY_OPEN)
 
-    RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_BLUE_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_BACK_BLUE_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_BLUE_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_GREEN_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_GREEN_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_BACK_LEFT_GREEN_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_BACK_RIGHT_GREEN_RUPEE,
-    RAND_INF_GV_OCTOROK_GROTTO_RED_RUPEE,
+DEFINE_RAND_INF(RAND_INF_ZELDAS_LETTER)
+DEFINE_RAND_INF(RAND_INF_WEIRD_EGG)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_KEATON)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_SKULL)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_SPOOKY)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_BUNNY)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_GORON)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_ZORA)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_GERUDO)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_MASK_TRUTH)
 
-    RAND_INF_DMT_RED_RUPEE,
-    RAND_INF_DMT_BLUE_RUPEE,
-    RAND_INF_DMT_COW_GROTTO_LEFT_HEART,
-    RAND_INF_DMT_COW_GROTTO_MIDDLE_LEFT_HEART,
-    RAND_INF_DMT_COW_GROTTO_MIDDLE_RIGHT_HEART,
-    RAND_INF_DMT_COW_GROTTO_RIGHT_HEART,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_1,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_2,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_3,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_4,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_5,
-    RAND_INF_DMT_COW_GROTTO_RUPEE_6,
-    RAND_INF_DMT_COW_GROTTO_RED_RUPEE,
+DEFINE_RAND_INF(RAND_INF_KF_BOULDER_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_KF_BOULDER_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_KF_BRIDGE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_BEHIND_MIDOS_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_ROOF_WEST_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_ROOF_EAST_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_ROOF_NORTH_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SOUTH_GRASS_WEST_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_NORTH_GRASS_WEST_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_NORTH_GRASS_EAST_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_SOUTH_GRASS_EAST_RUPEE)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_TOP_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_TOP_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_BOTTOM_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_SARIAS_BOTTOM_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_RED_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LW_BOULDER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_7)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_RUPEE_8)
+DEFINE_RAND_INF(RAND_INF_LH_FRONT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LH_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LH_BACK_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_FRONT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_LEFT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_RIGHT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_7)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_DAMPE_RACE_RUPEE_8)
 
-    RAND_INF_DMC_NEAR_PLATFORM_RED_RUPEE,
-    RAND_INF_DMC_MIDDLE_PLATFORM_RED_RUPEE,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_1,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_2,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_3,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_4,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_5,
-    RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_6,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_1,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_2,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_3,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_4,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_5,
-    RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_6,
-    RAND_INF_DMC_DISTANT_PLATFORM_RED_RUPEE,
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_BLUE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_BACK_BLUE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_BLUE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_FRONT_LEFT_GREEN_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_FRONT_RIGHT_GREEN_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_BACK_LEFT_GREEN_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_BACK_RIGHT_GREEN_RUPEE)
+DEFINE_RAND_INF(RAND_INF_GV_OCTOROK_GROTTO_RED_RUPEE)
 
-    RAND_INF_ZR_BENEATH_WATERFALL_LEFT_RUPEE,
-    RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_LEFT_RUPEE,
-    RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_RIGHT_RUPEE,
-    RAND_INF_ZR_BENEATH_WATERFALL_RIGHT_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTH_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHEAST_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHEAST_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTH_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHWEST_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHWEST_INNER_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTH_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHEAST_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHEAST_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTH_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHWEST_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHWEST_MIDDLE_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTH_OUTER_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHEAST_OUTER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHEAST_OUTER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTH_OUTER_RUPEE,
-    RAND_INF_ZF_BOTTOM_SOUTHWEST_OUTER_RUPEE,
-    RAND_INF_ZF_BOTTOM_NORTHWEST_OUTER_RUPEE,
+DEFINE_RAND_INF(RAND_INF_DMT_RED_RUPEE)
+DEFINE_RAND_INF(RAND_INF_DMT_BLUE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_MIDDLE_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_MIDDLE_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_RED_RUPEE)
 
-    RAND_INF_DEKU_TREE_LOBBY_LOWER_HEART,
-    RAND_INF_DEKU_TREE_LOBBY_UPPER_HEART,
-    RAND_INF_DEKU_TREE_BEFORE_BOSS_LEFT_HEART,
-    RAND_INF_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART,
-    RAND_INF_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART,
-    RAND_INF_DODONGOS_CAVERN_LOWER_LIZALFOS_HEART,
-    RAND_INF_DODONGOS_CAVERN_BLADE_ROOM_HEART,
-    RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_LEFT_HEART,
-    RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_RIGHT_HEART,
-    RAND_INF_FOREST_TEMPLE_COURTYARD_RIGHT_HEART,
-    RAND_INF_FOREST_TEMPLE_COURTYARD_LEFT_HEART,
-    RAND_INF_FOREST_TEMPLE_WELL_WEST_HEART,
-    RAND_INF_FOREST_TEMPLE_WELL_EAST_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_LEFT_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_RIGHT_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_BACK_HEART,
-    RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_LEFT_HEART,
-    RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_RIGHT_HEART,
-    RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_MIDDLE_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_WALL_EAST_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_WALL_WEST_HEART,
-    RAND_INF_FIRE_TEMPLE_FIRE_WALL_EXIT_HEART,
-    RAND_INF_WATER_TEMPLE_RIVER_HEART_1,
-    RAND_INF_WATER_TEMPLE_RIVER_HEART_2,
-    RAND_INF_WATER_TEMPLE_RIVER_HEART_3,
-    RAND_INF_WATER_TEMPLE_RIVER_HEART_4,
-    RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_LEFT_HEART,
-    RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_RIGHT_HEART,
-    RAND_INF_SHADOW_TEMPLE_SCARECROW_NORTH_HEART,
-    RAND_INF_SHADOW_TEMPLE_SCARECROW_SOUTH_HEART,
-    RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_LEFT_HEART,
-    RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_RIGHT_HEART,
-    RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_LOWER_HEART,
-    RAND_INF_SPIRIT_TEMPLE_ADULT_CLIMB_LEFT_HEART,
-    RAND_INF_SPIRIT_TEMPLE_ADULT_CLIMB_RIGHT_HEART,
-    RAND_INF_ICE_CAVERN_LOBBY_RUPEE,
-    RAND_INF_ICE_CAVERN_MAP_ROOM_LEFT_HEART,
-    RAND_INF_ICE_CAVERN_MAP_ROOM_MIDDLE_HEART,
-    RAND_INF_ICE_CAVERN_MAP_ROOM_RIGHT_HEART,
-    RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1,
-    RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2,
-    RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_LEFT_RUPEE,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_BACK_LEFT_RUPEE,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_MIDDLE_RUPEE,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_BACK_RIGHT_RUPEE,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_RIGHT_RUPEE,
-    RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_FRONT_LEFT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_MIDDLE_RIGHT_HEART,
-    RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_SOUTH_HEART,
-    RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_EAST_HEART,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_1,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_2,
-    RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_3,
-    RAND_INF_GANONS_CASTLE_FIRE_TRIAL_HEART,
-    RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_HEART,
+DEFINE_RAND_INF(RAND_INF_DMC_NEAR_PLATFORM_RED_RUPEE)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_RED_RUPEE)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_DMC_MIDDLE_PLATFORM_BLUE_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_4)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_5)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RUPEE_6)
+DEFINE_RAND_INF(RAND_INF_DMC_DISTANT_PLATFORM_RED_RUPEE)
 
-    RAND_INF_DEKU_TREE_MQ_COMPASS_ROOM_HEART,
-    RAND_INF_DEKU_TREE_MQ_DEKU_BABA_HEART,
-    RAND_INF_DEKU_TREE_MQ_LOBBY_HEART,
-    RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_HEART,
-    RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_LEFT_HEART,
-    RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_MIDDLE_HEART,
-    RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_RIGHT_HEART,
-    RAND_INF_DODONGOS_CAVERN_MQ_LIZALFOS_ROOM_HEART,
-    RAND_INF_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_HEART,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_2,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_3,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_1,
-    RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_2,
-    RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_RIGHT_HEART,
-    RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_MIDDLE_HEART,
-    RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_LEFT_HEART,
-    RAND_INF_FOREST_TEMPLE_WELL_MQ_WEST_HEART,
-    RAND_INF_FOREST_TEMPLE_WELL_MQ_MIDDLE_HEART,
-    RAND_INF_FOREST_TEMPLE_WELL_MQ_EAST_HEART,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LEFT_HEART,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_RIGHT_HEART,
-    RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LOWER_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_LEFT_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_RIGHT_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_NORTH_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_SOUTH_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_LEFT_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_RIGHT_HEART,
-    RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_LOWER_HEART,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LEFT_HEART,
-    RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_RIGHT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_FRONT_RIGHT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_LEFT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_RIGHT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_MIDDLE_LEFT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_FRONT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_LEFT_HEART,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_RIGHT_HEART,
-    RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_HEART,
-    RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART,
-    RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART,
+DEFINE_RAND_INF(RAND_INF_ZR_BENEATH_WATERFALL_LEFT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_LEFT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZR_BENEATH_WATERFALL_MIDDLE_RIGHT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZR_BENEATH_WATERFALL_RIGHT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTH_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHEAST_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHEAST_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTH_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHWEST_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHWEST_INNER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTH_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHEAST_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHEAST_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTH_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHWEST_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHWEST_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTH_OUTER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHEAST_OUTER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHEAST_OUTER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTH_OUTER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_SOUTHWEST_OUTER_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ZF_BOTTOM_NORTHWEST_OUTER_RUPEE)
 
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7,
-    RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7,
-    RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_1,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_2,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_3,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_4,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_5,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_6,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_7,
-    RAND_INF_HF_FAIRY_GROTTO_FAIRY_8,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7,
-    RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_1,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_2,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_3,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_4,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_5,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_6,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_7,
-    RAND_INF_GF_FAIRY_GROTTO_FAIRY_8,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7,
-    RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7,
-    RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7,
-    RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_1,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_2,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_3,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_4,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_5,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_6,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_7,
-    RAND_INF_COLOSSUS_OASIS_FAIRY_8,
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_LOWER_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_UPPER_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_LOWER_LIZALFOS_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BLADE_ROOM_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_UPPER_LIZALFOS_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_COURTYARD_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_COURTYARD_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_WELL_WEST_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_WELL_EAST_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_PILLAR_BACK_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_EAST_CENTRAL_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_WALL_EAST_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_WALL_WEST_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_FIRE_WALL_EXIT_HEART)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_HEART_1)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_HEART_2)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_HEART_3)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_RIVER_HEART_4)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_INVISIBLE_BLADES_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_SCARECROW_NORTH_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_SCARECROW_SOUTH_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_UPPER_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_AFTER_SHIP_LOWER_HEART)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ADULT_CLIMB_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ADULT_CLIMB_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_LOBBY_RUPEE)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MAP_ROOM_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MAP_ROOM_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_MAP_ROOM_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_LEFT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_BACK_LEFT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_MIDDLE_RUPEE)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_BACK_RIGHT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_PLATFORM_RIGHT_RUPEE)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_FRONT_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_COFFIN_ROOM_MIDDLE_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_SOUTH_HEART)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_BEAMOS_EAST_HEART)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_HEART_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_FIRE_TRIAL_HEART)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_HEART)
 
-    RAND_INF_ZR_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_ZR_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_ZR_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_KF_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_KF_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_KF_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2,
-    RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3,
-    RAND_INF_LH_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_LH_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_LH_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_GV_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_GV_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_GV_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_DMC_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_DMC_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_DMC_BEAN_SPROUT_FAIRY_3,
-    RAND_INF_DMT_BEAN_SPROUT_FAIRY_1,
-    RAND_INF_DMT_BEAN_SPROUT_FAIRY_2,
-    RAND_INF_DMT_BEAN_SPROUT_FAIRY_3,
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_COMPASS_ROOM_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_DEKU_BABA_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_ROOM_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_LIZALFOS_ROOM_HEART)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_HEART)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_RUPEE_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_LIFT_HEART_2)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_MQ_COURTYARD_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_WELL_MQ_WEST_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_WELL_MQ_MIDDLE_HEART)
+DEFINE_RAND_INF(RAND_INF_FOREST_TEMPLE_WELL_MQ_EAST_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_FIRE_PILLAR_LOWER_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_NORTH_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_SCARECROW_SOUTH_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_UPPER_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_AFTER_SHIP_LOWER_HEART)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_CHILD_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_FRONT_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BOMB_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_COFFIN_ROOM_MIDDLE_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_FRONT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_LEFT_HEART)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_HALLWAY_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_HEART)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_RIGHT_HEART)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_LIGHT_TRIAL_LEFT_HEART)
 
-    RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY,
-    RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY,
-    RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY,
-    RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY,
-    RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DMC_GOSSIP_STONE_FAIRY,
-    RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DMT_GOSSIP_STONE_FAIRY,
-    RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY,
-    RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY,
-    RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY,
-    RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_GV_GOSSIP_STONE_FAIRY,
-    RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY,
-    RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY,
-    RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY,
-    RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY,
-    RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY,
-    RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY,
-    RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY,
-    RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_KF_GOSSIP_STONE_FAIRY,
-    RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY,
-    RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY,
-    RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY,
-    RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_LW_GOSSIP_STONE_FAIRY,
-    RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY,
-    RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY,
-    RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY,
-    RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZD_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG,
-    RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY,
-    RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG,
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_ZR_FAIRY_GROTTO_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_HF_FAIRY_GROTTO_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_ZD_FAIRY_GROTTO_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_GF_FAIRY_GROTTO_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_SHIELD_GRAVE_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SCRUBS_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_MQ_SCRUBS_FAIRY_8)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_4)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_5)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_6)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_7)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_OASIS_FAIRY_8)
 
-    RAND_INF_LH_ISLAND_SUN_FAIRY,
-    RAND_INF_HF_POND_STORMS_FAIRY,
-    RAND_INF_DMT_FLAG_SUN_FAIRY,
-    RAND_INF_DMT_COW_GROTTO_STORMS_FAIRY,
-    RAND_INF_HF_FENCE_GROTTO_STORMS_FAIRY,
-    RAND_INF_LW_SHORTCUT_STORMS_FAIRY,
-    RAND_INF_GF_KITCHEN_SUN_FAIRY,
-    RAND_INF_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY,
-    RAND_INF_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY,
-    RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY,
-    RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY,
-    RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY,
-    RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY,
-    RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY,
-    RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY,
-    RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY,
-    RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY,
-    RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY,
-    RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY,
-    RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY,
-    RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY,
-    RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY,
-    RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY,
+DEFINE_RAND_INF(RAND_INF_ZR_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_ZR_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_ZR_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_KF_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_BRIDGE_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_LW_BEAN_SPROUT_NEAR_THEATER_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_LH_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_LH_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_LH_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GV_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GV_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GV_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_DMC_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_DMC_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_DMC_BEAN_SPROUT_FAIRY_3)
+DEFINE_RAND_INF(RAND_INF_DMT_BEAN_SPROUT_FAIRY_1)
+DEFINE_RAND_INF(RAND_INF_DMT_BEAN_SPROUT_FAIRY_2)
+DEFINE_RAND_INF(RAND_INF_DMT_BEAN_SPROUT_FAIRY_3)
 
-    RAND_INF_GUARD_HOUSE_UNLOCKED,
-    RAND_INF_GUARD_HOUSE_KEY_OBTAINED,
-    RAND_INF_MARKET_BAZAAR_UNLOCKED,
-    RAND_INF_MARKET_BAZAAR_KEY_OBTAINED,
-    RAND_INF_MARKET_POTION_SHOP_UNLOCKED,
-    RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED,
-    RAND_INF_MASK_SHOP_UNLOCKED,
-    RAND_INF_MASK_SHOP_KEY_OBTAINED,
-    RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED,
-    RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED,
-    RAND_INF_BOMBCHU_BOWLING_UNLOCKED,
-    RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED,
-    RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED,
-    RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED,
-    RAND_INF_BOMBCHU_SHOP_UNLOCKED,
-    RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED,
-    RAND_INF_RICHARDS_HOUSE_UNLOCKED,
-    RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED,
-    RAND_INF_ALLEY_HOUSE_UNLOCKED,
-    RAND_INF_ALLEY_HOUSE_KEY_OBTAINED,
-    RAND_INF_KAK_BAZAAR_UNLOCKED,
-    RAND_INF_KAK_BAZAAR_KEY_OBTAINED,
-    RAND_INF_KAK_POTION_SHOP_UNLOCKED,
-    RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED,
-    RAND_INF_BOSS_HOUSE_UNLOCKED,
-    RAND_INF_BOSS_HOUSE_KEY_OBTAINED,
-    RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED,
-    RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED,
-    RAND_INF_SKULLTULA_HOUSE_UNLOCKED,
-    RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED,
-    RAND_INF_IMPAS_HOUSE_UNLOCKED,
-    RAND_INF_IMPAS_HOUSE_KEY_OBTAINED,
-    RAND_INF_WINDMILL_UNLOCKED,
-    RAND_INF_WINDMILL_KEY_OBTAINED,
-    RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED,
-    RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED,
-    RAND_INF_DAMPES_HUT_UNLOCKED,
-    RAND_INF_DAMPES_HUT_KEY_OBTAINED,
-    RAND_INF_TALONS_HOUSE_UNLOCKED,
-    RAND_INF_TALONS_HOUSE_KEY_OBTAINED,
-    RAND_INF_STABLES_UNLOCKED,
-    RAND_INF_STABLES_KEY_OBTAINED,
-    RAND_INF_BACK_TOWER_UNLOCKED,
-    RAND_INF_BACK_TOWER_KEY_OBTAINED,
-    RAND_INF_HYLIA_LAB_UNLOCKED,
-    RAND_INF_HYLIA_LAB_KEY_OBTAINED,
-    RAND_INF_FISHING_HOLE_UNLOCKED,
-    RAND_INF_FISHING_HOLE_KEY_OBTAINED,
+DEFINE_RAND_INF(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_TOT_LEFTMOST_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_TOT_LEFT_CENTER_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_TOT_RIGHT_CENTER_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_TOT_RIGHTMOST_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DMC_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMC_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DMT_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMT_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_COLOSSUS_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_GV_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GV_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GC_MAZE_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GC_MEDIGORON_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HC_MALON_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HC_ROCK_WALL_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HC_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_KF_DEKU_TREE_LEFT_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_KF_DEKU_TREE_RIGHT_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_KF_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_KF_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LH_LAB_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LH_SOUTHEAST_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LH_SOUTHWEST_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_LW_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LW_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SFM_MAZE_LOWER_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SFM_MAZE_UPPER_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SFM_SARIA_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZD_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZD_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZF_FAIRY_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZF_JABU_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZR_NEAR_GROTTOS_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZR_NEAR_DOMAIN_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GOSSIP_STONE_FAIRY_BIG)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG)
 
-    RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG,
-    RAND_INF_CHILD_TRADES_HAS_CHICKEN,
-    RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA,
-    RAND_INF_CHILD_TRADES_HAS_MASK_KEATON,
-    RAND_INF_CHILD_TRADES_HAS_MASK_SKULL,
-    RAND_INF_CHILD_TRADES_HAS_MASK_SPOOKY,
-    RAND_INF_CHILD_TRADES_HAS_MASK_BUNNY,
-    RAND_INF_CHILD_TRADES_HAS_MASK_GORON,
-    RAND_INF_CHILD_TRADES_HAS_MASK_ZORA,
-    RAND_INF_CHILD_TRADES_HAS_MASK_GERUDO,
-    RAND_INF_CHILD_TRADES_HAS_MASK_TRUTH,
+DEFINE_RAND_INF(RAND_INF_LH_ISLAND_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_POND_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMT_FLAG_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_HF_FENCE_GROTTO_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LW_SHORTCUT_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_TH_KITCHEN_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_LW_DEKU_SCRUB_GROTTO_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GRAVEYARD_ROYAL_FAMILYS_TOMB_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_ARMOS_ROOM_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_BEAMOS_STORM_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_PIT_STORM_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_WIND_HINT_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_ICE_CAVERN_ENTRANCE_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GERUDO_TRAINING_GROUND_ENTRANCE_STORMS_FAIRY)
+DEFINE_RAND_INF(RAND_INF_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LOOP_STALFOS_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_FIRE_TEMPLE_MQ_LOOP_KNUCKLE_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_PILAR_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_LEFT_STORM_FAIRY)
+DEFINE_RAND_INF(RAND_INF_WATER_TEMPLE_MQ_DARK_LINK_RIGHT_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SPIRIT_TEMPLE_MQ_DINALFOS_ROOM_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_BEAMOS_STORM_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_PIT_STORM_FAIRY)
+DEFINE_RAND_INF(RAND_INF_SHADOW_TEMPLE_MQ_WIND_HINT_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_CELL_SUN_FAIRY)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_BASEMENT_SUN_FAIRY)
 
-    RAND_INF_ADULT_TRADES_HAS_POCKET_EGG,
-    RAND_INF_ADULT_TRADES_HAS_POCKET_CUCCO,
-    RAND_INF_ADULT_TRADES_HAS_COJIRO,
-    RAND_INF_ADULT_TRADES_HAS_ODD_MUSHROOM,
-    RAND_INF_ADULT_TRADES_HAS_ODD_POTION,
-    RAND_INF_ADULT_TRADES_HAS_SAW,
-    RAND_INF_ADULT_TRADES_HAS_SWORD_BROKEN,
-    RAND_INF_ADULT_TRADES_HAS_PRESCRIPTION,
-    RAND_INF_ADULT_TRADES_HAS_FROG,
-    RAND_INF_ADULT_TRADES_HAS_EYEDROPS,
-    RAND_INF_ADULT_TRADES_HAS_CLAIM_CHECK,
+DEFINE_RAND_INF(RAND_INF_GUARD_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_GUARD_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_MARKET_BAZAAR_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_MARKET_BAZAAR_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_MARKET_POTION_SHOP_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_MASK_SHOP_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_MASK_SHOP_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_BOMBCHU_BOWLING_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_BOMBCHU_SHOP_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_RICHARDS_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_ALLEY_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_ALLEY_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_KAK_BAZAAR_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_KAK_BAZAAR_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_KAK_POTION_SHOP_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_BOSS_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_BOSS_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_SKULLTULA_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_IMPAS_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_IMPAS_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_WINDMILL_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_WINDMILL_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_DAMPES_HUT_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_DAMPES_HUT_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_TALONS_HOUSE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_TALONS_HOUSE_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_STABLES_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_STABLES_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_BACK_TOWER_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_BACK_TOWER_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_HYLIA_LAB_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_HYLIA_LAB_KEY_OBTAINED)
+DEFINE_RAND_INF(RAND_INF_FISHING_HOLE_UNLOCKED)
+DEFINE_RAND_INF(RAND_INF_FISHING_HOLE_KEY_OBTAINED)
 
-    // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_CHICKEN)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_KEATON)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_SKULL)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_SPOOKY)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_BUNNY)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_GORON)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_ZORA)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_GERUDO)
+DEFINE_RAND_INF(RAND_INF_CHILD_TRADES_HAS_MASK_TRUTH)
 
-    RAND_INF_MAX,
-} RandomizerInf;
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_POCKET_CUCCO)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_COJIRO)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_ODD_MUSHROOM)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_ODD_POTION)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_SAW)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_SWORD_BROKEN)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_PRESCRIPTION)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_FROG)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_EYEDROPS)
+DEFINE_RAND_INF(RAND_INF_ADULT_TRADES_HAS_CLAIM_CHECK)
+
+// Overworld Grass
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_MAZE_1)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_MAZE_2)
+DEFINE_RAND_INF(RAND_INF_KF_CHILD_GRASS_MAZE_3)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_13)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_14)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_15)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_16)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_17)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_18)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_19)
+DEFINE_RAND_INF(RAND_INF_KF_ADULT_GRASS_20)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_LW_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_MARKET_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_HC_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HC_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_KAK_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_GY_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_13)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_14)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_15)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_16)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_17)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_18)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_19)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_20)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_21)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_22)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_23)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_24)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_25)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_26)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_27)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_28)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_29)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_30)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_31)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_32)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_33)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_34)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_35)
+DEFINE_RAND_INF(RAND_INF_LH_GRASS_36)
+DEFINE_RAND_INF(RAND_INF_LH_CHILD_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_LH_CHILD_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_LH_CHILD_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_LH_CHILD_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_LH_WARP_PAD_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_LH_WARP_PAD_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_KF_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTH_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_HF_CENTRAL_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_10)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_11)
+DEFINE_RAND_INF(RAND_INF_ZR_GRASS_12)
+DEFINE_RAND_INF(RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS)
+// Grotto Grass
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_KF_STORMS_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_LW_NEAR_SHORTCUTS_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_NEAR_MARKET_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_OPEN_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_HF_SOUTHEAST_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_HF_COW_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_KAK_OPEN_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DMT_STORMS_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DMT_COW_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DMC_UPPER_GROTTO_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_ZR_OPEN_GROTTO_GRASS_4)
+// Dungeon Grass
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_LOBBY_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_SLINGSHOT_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_COMPASS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_COMPASS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SCRUB_ROOM_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_SPIKE_ROLLER_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_TORCHES_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BASEMENT_LARVAE_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_BEFORE_BOSS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_FIRST_BRIDGE_GRASS)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BLADE_GRASS)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_SINGLE_EYE_GRASS)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_BEFORE_BOSS_GRASS)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_8)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_BEHIND_ROCKS_GRASS_9)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_BASEMENT_GRASS_3)
+// MQ Dungeon Grass
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_LOBBY_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_SLINGSHOT_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_COMPASS_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_COMPASS_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LOWER_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_UPPER_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_FRONT_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_SPIKE_ROLLER_BACK_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_TORCHES_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_LARVAE_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_GRAVES_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BASEMENT_BACK_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_MQ_BEFORE_BOSS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_COMPASS_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_ARMOS_GRASS)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_BACK_POE_GRASS)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DODONGOS_CAVERN_MQ_SCRUB_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_FIRST_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_PIT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_JIGGLIES_GRASS)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_AFTER_BIG_OCTO_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_GRASS)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BASEMENT_BOOMERANG_GRASS)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_GRASS_4)
+// Shared Dungeon Grass
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_1)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_2)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_3)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_4)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_5)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_6)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_7)
+DEFINE_RAND_INF(RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_8)
+// End Grass
+DEFINE_RAND_INF(RAND_INF_OBTAINED_RUTOS_LETTER)
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index b2343b0001..6284d7121d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -5,6 +5,7 @@
 #include "soh/SaveManager.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
 #include "randomizerTypes.h"
 
 #include <map>
@@ -35,50 +36,72 @@ void DrawSong(ItemTrackerItem item);
 
 int itemTrackerSectionId;
 
+using namespace UIWidgets;
+
 bool shouldUpdateVectors = true;
 
 std::vector<ItemTrackerItem> mainWindowItems = {};
 
 std::vector<ItemTrackerItem> inventoryItems = {
-    ITEM_TRACKER_ITEM(ITEM_STICK, 0, DrawItem),     ITEM_TRACKER_ITEM(ITEM_NUT, 0, DrawItem),           ITEM_TRACKER_ITEM(ITEM_BOMB, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_BOW, 0, DrawItem),       ITEM_TRACKER_ITEM(ITEM_ARROW_FIRE, 0, DrawItem),    ITEM_TRACKER_ITEM(ITEM_DINS_FIRE, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_SLINGSHOT, 0, DrawItem), ITEM_TRACKER_ITEM(ITEM_OCARINA_FAIRY, 0, DrawItem), ITEM_TRACKER_ITEM(ITEM_BOMBCHU, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_HOOKSHOT, 0, DrawItem),  ITEM_TRACKER_ITEM(ITEM_ARROW_ICE, 0, DrawItem),     ITEM_TRACKER_ITEM(ITEM_FARORES_WIND, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_BOOMERANG, 0, DrawItem), ITEM_TRACKER_ITEM(ITEM_LENS, 0, DrawItem),          ITEM_TRACKER_ITEM(ITEM_BEAN, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_HAMMER, 0, DrawItem),    ITEM_TRACKER_ITEM(ITEM_ARROW_LIGHT, 0, DrawItem),   ITEM_TRACKER_ITEM(ITEM_NAYRUS_LOVE, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 0, DrawBottle),  ITEM_TRACKER_ITEM(ITEM_BOTTLE, 1, DrawBottle),      ITEM_TRACKER_ITEM(ITEM_BOTTLE, 2, DrawBottle),
-    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 3, DrawBottle),  ITEM_TRACKER_ITEM(ITEM_POCKET_EGG, 0, DrawItem),    ITEM_TRACKER_ITEM(ITEM_MASK_KEATON, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_STICK, 0, DrawItem),       ITEM_TRACKER_ITEM(ITEM_NUT, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_BOMB, 0, DrawItem),        ITEM_TRACKER_ITEM(ITEM_BOW, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_ARROW_FIRE, 0, DrawItem),  ITEM_TRACKER_ITEM(ITEM_DINS_FIRE, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_SLINGSHOT, 0, DrawItem),   ITEM_TRACKER_ITEM(ITEM_OCARINA_FAIRY, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_BOMBCHU, 0, DrawItem),     ITEM_TRACKER_ITEM(ITEM_HOOKSHOT, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_ARROW_ICE, 0, DrawItem),   ITEM_TRACKER_ITEM(ITEM_FARORES_WIND, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_BOOMERANG, 0, DrawItem),   ITEM_TRACKER_ITEM(ITEM_LENS, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_BEAN, 0, DrawItem),        ITEM_TRACKER_ITEM(ITEM_HAMMER, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_ARROW_LIGHT, 0, DrawItem), ITEM_TRACKER_ITEM(ITEM_NAYRUS_LOVE, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 0, DrawBottle),    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 1, DrawBottle),
+    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 2, DrawBottle),    ITEM_TRACKER_ITEM(ITEM_BOTTLE, 3, DrawBottle),
+    ITEM_TRACKER_ITEM(ITEM_POCKET_EGG, 0, DrawItem),  ITEM_TRACKER_ITEM(ITEM_MASK_KEATON, 0, DrawItem),
 };
 
 std::vector<ItemTrackerItem> equipmentItems = {
-    ITEM_TRACKER_ITEM(ITEM_SWORD_KOKIRI, 1 << 0, DrawEquip),  ITEM_TRACKER_ITEM(ITEM_SWORD_MASTER, 1 << 1, DrawEquip),  ITEM_TRACKER_ITEM(ITEM_SWORD_BGS, 1 << 2, DrawEquip),
-    ITEM_TRACKER_ITEM(ITEM_TUNIC_KOKIRI, 1 << 8, DrawEquip),  ITEM_TRACKER_ITEM(ITEM_TUNIC_GORON, 1 << 9, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_TUNIC_ZORA, 1 << 10, DrawEquip),
-    ITEM_TRACKER_ITEM(ITEM_SHIELD_DEKU, 1 << 4, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_SHIELD_HYLIAN, 1 << 5, DrawEquip), ITEM_TRACKER_ITEM(ITEM_SHIELD_MIRROR, 1 << 6, DrawEquip),
-    ITEM_TRACKER_ITEM(ITEM_BOOTS_KOKIRI, 1 << 12, DrawEquip), ITEM_TRACKER_ITEM(ITEM_BOOTS_IRON, 1 << 13, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_BOOTS_HOVER, 1 << 14, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_SWORD_KOKIRI, 1 << 0, DrawEquip),  ITEM_TRACKER_ITEM(ITEM_SWORD_MASTER, 1 << 1, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_SWORD_BGS, 1 << 2, DrawEquip),     ITEM_TRACKER_ITEM(ITEM_TUNIC_KOKIRI, 1 << 8, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_TUNIC_GORON, 1 << 9, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_TUNIC_ZORA, 1 << 10, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_SHIELD_DEKU, 1 << 4, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_SHIELD_HYLIAN, 1 << 5, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_SHIELD_MIRROR, 1 << 6, DrawEquip), ITEM_TRACKER_ITEM(ITEM_BOOTS_KOKIRI, 1 << 12, DrawEquip),
+    ITEM_TRACKER_ITEM(ITEM_BOOTS_IRON, 1 << 13, DrawEquip),   ITEM_TRACKER_ITEM(ITEM_BOOTS_HOVER, 1 << 14, DrawEquip),
 };
 
 std::vector<ItemTrackerItem> miscItems = {
-    ITEM_TRACKER_ITEM(ITEM_BRACELET, 0, DrawItem),            ITEM_TRACKER_ITEM(ITEM_SCALE_SILVER, 0, DrawItem),        ITEM_TRACKER_ITEM(ITEM_WALLET_ADULT, 0, DrawItem),
-    ITEM_TRACKER_ITEM(ITEM_HEART_CONTAINER, 0, DrawItem),     ITEM_TRACKER_ITEM(ITEM_HEART_PIECE, 0, DrawItem),         ITEM_TRACKER_ITEM(ITEM_MAGIC_SMALL, 0, DrawItem),
-    ITEM_TRACKER_ITEM(QUEST_GERUDO_CARD, 1 << 22, DrawQuest), ITEM_TRACKER_ITEM(QUEST_SKULL_TOKEN, 1 << 23, DrawQuest), ITEM_TRACKER_ITEM(QUEST_STONE_OF_AGONY, 1 << 21, DrawQuest),
+    ITEM_TRACKER_ITEM(ITEM_BRACELET, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_SCALE_SILVER, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_WALLET_ADULT, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_HEART_CONTAINER, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_HEART_PIECE, 0, DrawItem),
+    ITEM_TRACKER_ITEM(ITEM_MAGIC_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM(QUEST_GERUDO_CARD, 1 << 22, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_SKULL_TOKEN, 1 << 23, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_STONE_OF_AGONY, 1 << 21, DrawQuest),
 };
 
 std::vector<ItemTrackerItem> dungeonRewardStones = {
-    ITEM_TRACKER_ITEM(QUEST_KOKIRI_EMERALD, 1 << 18, DrawQuest), ITEM_TRACKER_ITEM(QUEST_GORON_RUBY, 1 << 19, DrawQuest), ITEM_TRACKER_ITEM(QUEST_ZORA_SAPPHIRE, 1 << 20, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_KOKIRI_EMERALD, 1 << 18, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_GORON_RUBY, 1 << 19, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_ZORA_SAPPHIRE, 1 << 20, DrawQuest),
 };
 
 std::vector<ItemTrackerItem> dungeonRewardMedallions = {
-    ITEM_TRACKER_ITEM(QUEST_MEDALLION_FOREST, 1 << 0, DrawQuest), ITEM_TRACKER_ITEM(QUEST_MEDALLION_FIRE, 1 << 1, DrawQuest),   ITEM_TRACKER_ITEM(QUEST_MEDALLION_WATER, 1 << 2, DrawQuest),
-    ITEM_TRACKER_ITEM(QUEST_MEDALLION_SPIRIT, 1 << 3, DrawQuest), ITEM_TRACKER_ITEM(QUEST_MEDALLION_SHADOW, 1 << 4, DrawQuest), ITEM_TRACKER_ITEM(QUEST_MEDALLION_LIGHT, 1 << 5, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_FOREST, 1 << 0, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_FIRE, 1 << 1, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_WATER, 1 << 2, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_SPIRIT, 1 << 3, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_SHADOW, 1 << 4, DrawQuest),
+    ITEM_TRACKER_ITEM(QUEST_MEDALLION_LIGHT, 1 << 5, DrawQuest),
 };
 
 std::vector<ItemTrackerItem> dungeonRewards = {};
 
 std::vector<ItemTrackerItem> songItems = {
-    ITEM_TRACKER_ITEM(QUEST_SONG_LULLABY, 0, DrawSong), ITEM_TRACKER_ITEM(QUEST_SONG_EPONA, 0, DrawSong),    ITEM_TRACKER_ITEM(QUEST_SONG_SARIA, 0, DrawSong),
-    ITEM_TRACKER_ITEM(QUEST_SONG_SUN, 0, DrawSong),     ITEM_TRACKER_ITEM(QUEST_SONG_TIME, 0, DrawSong),     ITEM_TRACKER_ITEM(QUEST_SONG_STORMS, 0, DrawSong),
-    ITEM_TRACKER_ITEM(QUEST_SONG_MINUET, 0, DrawSong),  ITEM_TRACKER_ITEM(QUEST_SONG_BOLERO, 0, DrawSong),   ITEM_TRACKER_ITEM(QUEST_SONG_SERENADE, 0, DrawSong),
-    ITEM_TRACKER_ITEM(QUEST_SONG_REQUIEM, 0, DrawSong), ITEM_TRACKER_ITEM(QUEST_SONG_NOCTURNE, 0, DrawSong), ITEM_TRACKER_ITEM(QUEST_SONG_PRELUDE, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_LULLABY, 0, DrawSong),  ITEM_TRACKER_ITEM(QUEST_SONG_EPONA, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_SARIA, 0, DrawSong),    ITEM_TRACKER_ITEM(QUEST_SONG_SUN, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_TIME, 0, DrawSong),     ITEM_TRACKER_ITEM(QUEST_SONG_STORMS, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_MINUET, 0, DrawSong),   ITEM_TRACKER_ITEM(QUEST_SONG_BOLERO, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_SERENADE, 0, DrawSong), ITEM_TRACKER_ITEM(QUEST_SONG_REQUIEM, 0, DrawSong),
+    ITEM_TRACKER_ITEM(QUEST_SONG_NOCTURNE, 0, DrawSong), ITEM_TRACKER_ITEM(QUEST_SONG_PRELUDE, 0, DrawSong),
 };
 
 std::vector<ItemTrackerItem> gregItems = {
@@ -90,31 +113,54 @@ std::vector<ItemTrackerItem> triforcePieces = {
 };
 
 std::vector<ItemTrackerItem> bossSoulItems = {
-    ITEM_TRACKER_ITEM(RG_GOHMA_SOUL, 0, DrawItem),
-    ITEM_TRACKER_ITEM(RG_KING_DODONGO_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_BARINADE_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_PHANTOM_GANON_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_VOLVAGIA_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_MORPHA_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_BONGO_BONGO_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_TWINROVA_SOUL, 0, DrawItem ),
-    ITEM_TRACKER_ITEM(RG_GANON_SOUL, 0, DrawItem ),
+    ITEM_TRACKER_ITEM(RG_GOHMA_SOUL, 0, DrawItem),       ITEM_TRACKER_ITEM(RG_KING_DODONGO_SOUL, 0, DrawItem),
+    ITEM_TRACKER_ITEM(RG_BARINADE_SOUL, 0, DrawItem),    ITEM_TRACKER_ITEM(RG_PHANTOM_GANON_SOUL, 0, DrawItem),
+    ITEM_TRACKER_ITEM(RG_VOLVAGIA_SOUL, 0, DrawItem),    ITEM_TRACKER_ITEM(RG_MORPHA_SOUL, 0, DrawItem),
+    ITEM_TRACKER_ITEM(RG_BONGO_BONGO_SOUL, 0, DrawItem), ITEM_TRACKER_ITEM(RG_TWINROVA_SOUL, 0, DrawItem),
+    ITEM_TRACKER_ITEM(RG_GANON_SOUL, 0, DrawItem),
 };
 
 std::vector<ItemTrackerItem> ocarinaButtonItems = {
-    //Hack for right now, just gonna draw ocarina buttons as ocarinas.
-    //Will replace with other macro once we have a custom texture
-    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_A_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
-    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_UP_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
-    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_DOWN_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
-    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_LEFT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
-    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem ),
+    // Hack for right now, just gonna draw ocarina buttons as ocarinas.
+    // Will replace with other macro once we have a custom texture
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_A_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_UP_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_DOWN_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_LEFT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_OCARINA_C_RIGHT_BUTTON, ITEM_OCARINA_TIME, ITEM_OCARINA_TIME, 0, DrawItem),
 };
 
-std::vector<ItemTrackerItem> fishingPoleItems = {
-    ITEM_TRACKER_ITEM(ITEM_FISHING_POLE, 0, DrawItem)
+std::vector<ItemTrackerItem> overworldKeyItems = {
+    // Hack for right now, just gonna overworld keys as dungeon keys.
+    // Will replace with other macro once we have a custom texture
+    ITEM_TRACKER_ITEM_CUSTOM(RG_GUARD_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_MARKET_BAZAAR_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_MARKET_POTION_SHOP_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_MASK_SHOP_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_MARKET_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BOMBCHU_BOWLING_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_TREASURE_CHEST_GAME_BUILDING_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BOMBCHU_SHOP_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_RICHARDS_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_ALLEY_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_KAK_BAZAAR_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_KAK_POTION_SHOP_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BOSS_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_GRANNYS_POTION_SHOP_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_SKULLTULA_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_IMPAS_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_WINDMILL_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_KAK_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_DAMPES_HUT_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_TALONS_HOUSE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_STABLES_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_BACK_TOWER_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_HYLIA_LAB_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
+    ITEM_TRACKER_ITEM_CUSTOM(RG_FISHING_HOLE_KEY, ITEM_KEY_SMALL, ITEM_KEY_SMALL, 0, DrawItem),
 };
 
+std::vector<ItemTrackerItem> fishingPoleItems = { ITEM_TRACKER_ITEM(ITEM_FISHING_POLE, 0, DrawItem) };
+
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsHorizontal = {
     { SCENE_DEKU_TREE, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
     { SCENE_DODONGOS_CAVERN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } },
@@ -141,7 +187,6 @@ std::vector<ItemTrackerDungeon> itemTrackerDungeonsHorizontal = {
     { SCENE_GERUDO_TRAINING_GROUND, { ITEM_KEY_SMALL } },
 };
 
-
 std::vector<ItemTrackerDungeon> itemTrackerDungeonsWithMapsCompact = {
     { SCENE_FOREST_TEMPLE, { ITEM_KEY_SMALL, ITEM_KEY_BOSS, ITEM_DUNGEON_MAP, ITEM_COMPASS } },
     { SCENE_FIRE_TEMPLE, { ITEM_KEY_SMALL, ITEM_KEY_BOSS, ITEM_DUNGEON_MAP, ITEM_COMPASS } },
@@ -170,143 +215,141 @@ std::vector<ItemTrackerDungeon> itemTrackerDungeonsCompact = {
 };
 
 std::map<uint16_t, std::string> itemTrackerDungeonShortNames = {
-    { SCENE_FOREST_TEMPLE, "FRST" },
-    { SCENE_FIRE_TEMPLE, "FIRE" },
-    { SCENE_WATER_TEMPLE, "WATR" },
-    { SCENE_SPIRIT_TEMPLE, "SPRT" },
-    { SCENE_SHADOW_TEMPLE, "SHDW" },
-    { SCENE_BOTTOM_OF_THE_WELL, "BOTW" },
-    { SCENE_DEKU_TREE, "DEKU" },
-    { SCENE_DODONGOS_CAVERN, "DCVN" },
-    { SCENE_JABU_JABU, "JABU" },
-    { SCENE_ICE_CAVERN, "ICE" },
-    { SCENE_INSIDE_GANONS_CASTLE, "GANON" },
-    { SCENE_GERUDO_TRAINING_GROUND, "GTG" },
+    { SCENE_FOREST_TEMPLE, "FRST" },   { SCENE_FIRE_TEMPLE, "FIRE" },           { SCENE_WATER_TEMPLE, "WATR" },
+    { SCENE_SPIRIT_TEMPLE, "SPRT" },   { SCENE_SHADOW_TEMPLE, "SHDW" },         { SCENE_BOTTOM_OF_THE_WELL, "BOTW" },
+    { SCENE_DEKU_TREE, "DEKU" },       { SCENE_DODONGOS_CAVERN, "DCVN" },       { SCENE_JABU_JABU, "JABU" },
+    { SCENE_ICE_CAVERN, "ICE" },       { SCENE_INSIDE_GANONS_CASTLE, "GANON" }, { SCENE_GERUDO_TRAINING_GROUND, "GTG" },
     { SCENE_THIEVES_HIDEOUT, "HIDE" },
 };
 
 std::map<uint16_t, std::string> itemTrackerBossShortNames = {
-    { RG_GOHMA_SOUL, "GOHMA" },
-    { RG_KING_DODONGO_SOUL, "KD" },
-    { RG_BARINADE_SOUL, "BARI" },
-    { RG_PHANTOM_GANON_SOUL, "PG"},
-    { RG_VOLVAGIA_SOUL, "VOLV"},
-    { RG_MORPHA_SOUL, "MORPH"},
-    { RG_BONGO_BONGO_SOUL, "BONGO"},
-    { RG_TWINROVA_SOUL, "TWIN"},
-    { RG_GANON_SOUL, "GANON"},
+    { RG_GOHMA_SOUL, "GOHMA" },       { RG_KING_DODONGO_SOUL, "KD" }, { RG_BARINADE_SOUL, "BARI" },
+    { RG_PHANTOM_GANON_SOUL, "PG" },  { RG_VOLVAGIA_SOUL, "VOLV" },   { RG_MORPHA_SOUL, "MORPH" },
+    { RG_BONGO_BONGO_SOUL, "BONGO" }, { RG_TWINROVA_SOUL, "TWIN" },   { RG_GANON_SOUL, "GANON" },
 };
 
 std::map<uint16_t, std::string> itemTrackerOcarinaButtonShortNames = {
-    { RG_OCARINA_A_BUTTON, "A" },
-    { RG_OCARINA_C_UP_BUTTON, "C-U" },
-    { RG_OCARINA_C_DOWN_BUTTON, "C-D" },
-    { RG_OCARINA_C_LEFT_BUTTON, "C-L"},
-    { RG_OCARINA_C_RIGHT_BUTTON, "C-R"},
+    { RG_OCARINA_A_BUTTON, "A" },        { RG_OCARINA_C_UP_BUTTON, "C-U" },    { RG_OCARINA_C_DOWN_BUTTON, "C-D" },
+    { RG_OCARINA_C_LEFT_BUTTON, "C-L" }, { RG_OCARINA_C_RIGHT_BUTTON, "C-R" },
+};
+
+std::map<uint16_t, std::string> itemTrackerOverworldKeyShortNames = {
+    { RG_GUARD_HOUSE_KEY, "GUARD" },
+    { RG_MARKET_BAZAAR_KEY, "MKBAZ" },
+    { RG_MARKET_POTION_SHOP_KEY, "MKPOT" },
+    { RG_MASK_SHOP_KEY, "MASK" },
+    { RG_MARKET_SHOOTING_GALLERY_KEY, "MKSHO" },
+    { RG_BOMBCHU_BOWLING_KEY, "BOWL" },
+    { RG_TREASURE_CHEST_GAME_BUILDING_KEY, "TREASU" },
+    { RG_BOMBCHU_SHOP_KEY, "CHUSHO" },
+    { RG_RICHARDS_HOUSE_KEY, "RICH" },
+    { RG_ALLEY_HOUSE_KEY, "ALLEY" },
+    { RG_KAK_BAZAAR_KEY, "KAKBAZ" },
+    { RG_KAK_POTION_SHOP_KEY, "KAKPO" },
+    { RG_BOSS_HOUSE_KEY, "BOSS" },
+    { RG_GRANNYS_POTION_SHOP_KEY, "GRANNY" },
+    { RG_SKULLTULA_HOUSE_KEY, "SKULL" },
+    { RG_IMPAS_HOUSE_KEY, "IMPAS" },
+    { RG_WINDMILL_KEY, "WIND" },
+    { RG_KAK_SHOOTING_GALLERY_KEY, "KAKSHO" },
+    { RG_DAMPES_HUT_KEY, "DAMPES" },
+    { RG_TALONS_HOUSE_KEY, "TALONS" },
+    { RG_STABLES_KEY, "STABLE" },
+    { RG_BACK_TOWER_KEY, "TOWER" },
+    { RG_HYLIA_LAB_KEY, "LAB" },
+    { RG_FISHING_HOLE_KEY, "FISH" },
 };
 
 std::vector<ItemTrackerItem> dungeonItems = {};
 
 std::unordered_map<uint32_t, ItemTrackerItem> actualItemTrackerItemMap = {
-    { ITEM_BOTTLE,           ITEM_TRACKER_ITEM(ITEM_BOTTLE, 0, DrawItem) },
-    { ITEM_BIG_POE,          ITEM_TRACKER_ITEM(ITEM_BIG_POE, 0, DrawItem) },
-    { ITEM_BLUE_FIRE,        ITEM_TRACKER_ITEM(ITEM_BLUE_FIRE, 0, DrawItem) },
-    { ITEM_BUG,              ITEM_TRACKER_ITEM(ITEM_BUG, 0, DrawItem) },
-    { ITEM_FAIRY,            ITEM_TRACKER_ITEM(ITEM_FAIRY, 0, DrawItem) },
-    { ITEM_FISH,             ITEM_TRACKER_ITEM(ITEM_FISH, 0, DrawItem) },
-    { ITEM_POTION_GREEN,     ITEM_TRACKER_ITEM(ITEM_POTION_GREEN, 0, DrawItem) },
-    { ITEM_POE,              ITEM_TRACKER_ITEM(ITEM_POE, 0, DrawItem) },
-    { ITEM_POTION_RED,       ITEM_TRACKER_ITEM(ITEM_POTION_RED, 0, DrawItem) },
-    { ITEM_POTION_BLUE,      ITEM_TRACKER_ITEM(ITEM_POTION_BLUE, 0, DrawItem) },
-    { ITEM_MILK_BOTTLE,      ITEM_TRACKER_ITEM(ITEM_MILK_BOTTLE, 0, DrawItem) },
-    { ITEM_MILK_HALF,        ITEM_TRACKER_ITEM(ITEM_MILK_HALF, 0, DrawItem) },
-    { ITEM_LETTER_RUTO,      ITEM_TRACKER_ITEM(ITEM_LETTER_RUTO, 0, DrawItem) },
+    { ITEM_BOTTLE, ITEM_TRACKER_ITEM(ITEM_BOTTLE, 0, DrawItem) },
+    { ITEM_BIG_POE, ITEM_TRACKER_ITEM(ITEM_BIG_POE, 0, DrawItem) },
+    { ITEM_BLUE_FIRE, ITEM_TRACKER_ITEM(ITEM_BLUE_FIRE, 0, DrawItem) },
+    { ITEM_BUG, ITEM_TRACKER_ITEM(ITEM_BUG, 0, DrawItem) },
+    { ITEM_FAIRY, ITEM_TRACKER_ITEM(ITEM_FAIRY, 0, DrawItem) },
+    { ITEM_FISH, ITEM_TRACKER_ITEM(ITEM_FISH, 0, DrawItem) },
+    { ITEM_POTION_GREEN, ITEM_TRACKER_ITEM(ITEM_POTION_GREEN, 0, DrawItem) },
+    { ITEM_POE, ITEM_TRACKER_ITEM(ITEM_POE, 0, DrawItem) },
+    { ITEM_POTION_RED, ITEM_TRACKER_ITEM(ITEM_POTION_RED, 0, DrawItem) },
+    { ITEM_POTION_BLUE, ITEM_TRACKER_ITEM(ITEM_POTION_BLUE, 0, DrawItem) },
+    { ITEM_MILK_BOTTLE, ITEM_TRACKER_ITEM(ITEM_MILK_BOTTLE, 0, DrawItem) },
+    { ITEM_MILK_HALF, ITEM_TRACKER_ITEM(ITEM_MILK_HALF, 0, DrawItem) },
+    { ITEM_LETTER_RUTO, ITEM_TRACKER_ITEM(ITEM_LETTER_RUTO, 0, DrawItem) },
 
-    { ITEM_HOOKSHOT,         ITEM_TRACKER_ITEM(ITEM_HOOKSHOT, 0, DrawItem) },
-    { ITEM_LONGSHOT,         ITEM_TRACKER_ITEM(ITEM_LONGSHOT, 0, DrawItem) },
+    { ITEM_HOOKSHOT, ITEM_TRACKER_ITEM(ITEM_HOOKSHOT, 0, DrawItem) },
+    { ITEM_LONGSHOT, ITEM_TRACKER_ITEM(ITEM_LONGSHOT, 0, DrawItem) },
 
-    { ITEM_OCARINA_FAIRY,    ITEM_TRACKER_ITEM(ITEM_OCARINA_FAIRY, 0, DrawItem) },
-    { ITEM_OCARINA_TIME,     ITEM_TRACKER_ITEM(ITEM_OCARINA_TIME, 0, DrawItem) },
+    { ITEM_OCARINA_FAIRY, ITEM_TRACKER_ITEM(ITEM_OCARINA_FAIRY, 0, DrawItem) },
+    { ITEM_OCARINA_TIME, ITEM_TRACKER_ITEM(ITEM_OCARINA_TIME, 0, DrawItem) },
 
-    { ITEM_MAGIC_SMALL,      ITEM_TRACKER_ITEM(ITEM_MAGIC_SMALL, 0, DrawItem) },
-    { ITEM_MAGIC_LARGE,      ITEM_TRACKER_ITEM(ITEM_MAGIC_LARGE, 0, DrawItem) },
+    { ITEM_MAGIC_SMALL, ITEM_TRACKER_ITEM(ITEM_MAGIC_SMALL, 0, DrawItem) },
+    { ITEM_MAGIC_LARGE, ITEM_TRACKER_ITEM(ITEM_MAGIC_LARGE, 0, DrawItem) },
 
-    { ITEM_WALLET_ADULT,     ITEM_TRACKER_ITEM(ITEM_WALLET_ADULT, 0, DrawItem) },
-    { ITEM_WALLET_GIANT,     ITEM_TRACKER_ITEM(ITEM_WALLET_GIANT, 0, DrawItem) },
+    { ITEM_WALLET_ADULT, ITEM_TRACKER_ITEM(ITEM_WALLET_ADULT, 0, DrawItem) },
+    { ITEM_WALLET_GIANT, ITEM_TRACKER_ITEM(ITEM_WALLET_GIANT, 0, DrawItem) },
 
-    { ITEM_BRACELET,         ITEM_TRACKER_ITEM(ITEM_BRACELET, 0, DrawItem) },
+    { ITEM_BRACELET, ITEM_TRACKER_ITEM(ITEM_BRACELET, 0, DrawItem) },
     { ITEM_GAUNTLETS_SILVER, ITEM_TRACKER_ITEM(ITEM_GAUNTLETS_SILVER, 0, DrawItem) },
-    { ITEM_GAUNTLETS_GOLD,   ITEM_TRACKER_ITEM(ITEM_GAUNTLETS_GOLD, 0, DrawItem) },
+    { ITEM_GAUNTLETS_GOLD, ITEM_TRACKER_ITEM(ITEM_GAUNTLETS_GOLD, 0, DrawItem) },
 
-    { ITEM_SCALE_SILVER,     ITEM_TRACKER_ITEM(ITEM_SCALE_SILVER, 0, DrawItem) },
-    { ITEM_SCALE_GOLDEN,     ITEM_TRACKER_ITEM(ITEM_SCALE_GOLDEN, 0, DrawItem) },
+    { ITEM_SCALE_SILVER, ITEM_TRACKER_ITEM(ITEM_SCALE_SILVER, 0, DrawItem) },
+    { ITEM_SCALE_GOLDEN, ITEM_TRACKER_ITEM(ITEM_SCALE_GOLDEN, 0, DrawItem) },
 
-    { ITEM_WEIRD_EGG,        ITEM_TRACKER_ITEM(ITEM_WEIRD_EGG, 0, DrawItem) },
-    { ITEM_CHICKEN,          ITEM_TRACKER_ITEM(ITEM_CHICKEN, 0, DrawItem) },
-    { ITEM_LETTER_ZELDA,     ITEM_TRACKER_ITEM(ITEM_LETTER_ZELDA, 0, DrawItem) },
-    { ITEM_MASK_KEATON,      ITEM_TRACKER_ITEM(ITEM_MASK_KEATON, 0, DrawItem) },
-    { ITEM_MASK_SKULL,       ITEM_TRACKER_ITEM(ITEM_MASK_SKULL, 0, DrawItem) },
-    { ITEM_MASK_SPOOKY,      ITEM_TRACKER_ITEM(ITEM_MASK_SPOOKY, 0, DrawItem) },
-    { ITEM_MASK_BUNNY,       ITEM_TRACKER_ITEM(ITEM_MASK_BUNNY, 0, DrawItem) },
-    { ITEM_MASK_GORON,       ITEM_TRACKER_ITEM(ITEM_MASK_GORON, 0, DrawItem) },
-    { ITEM_MASK_ZORA,        ITEM_TRACKER_ITEM(ITEM_MASK_ZORA, 0, DrawItem) },
-    { ITEM_MASK_GERUDO,      ITEM_TRACKER_ITEM(ITEM_MASK_GERUDO, 0, DrawItem) },
-    { ITEM_MASK_TRUTH,       ITEM_TRACKER_ITEM(ITEM_MASK_TRUTH, 0, DrawItem) },
-    { ITEM_SOLD_OUT,         ITEM_TRACKER_ITEM(ITEM_SOLD_OUT, 0, DrawItem) },
+    { ITEM_WEIRD_EGG, ITEM_TRACKER_ITEM(ITEM_WEIRD_EGG, 0, DrawItem) },
+    { ITEM_CHICKEN, ITEM_TRACKER_ITEM(ITEM_CHICKEN, 0, DrawItem) },
+    { ITEM_LETTER_ZELDA, ITEM_TRACKER_ITEM(ITEM_LETTER_ZELDA, 0, DrawItem) },
+    { ITEM_MASK_KEATON, ITEM_TRACKER_ITEM(ITEM_MASK_KEATON, 0, DrawItem) },
+    { ITEM_MASK_SKULL, ITEM_TRACKER_ITEM(ITEM_MASK_SKULL, 0, DrawItem) },
+    { ITEM_MASK_SPOOKY, ITEM_TRACKER_ITEM(ITEM_MASK_SPOOKY, 0, DrawItem) },
+    { ITEM_MASK_BUNNY, ITEM_TRACKER_ITEM(ITEM_MASK_BUNNY, 0, DrawItem) },
+    { ITEM_MASK_GORON, ITEM_TRACKER_ITEM(ITEM_MASK_GORON, 0, DrawItem) },
+    { ITEM_MASK_ZORA, ITEM_TRACKER_ITEM(ITEM_MASK_ZORA, 0, DrawItem) },
+    { ITEM_MASK_GERUDO, ITEM_TRACKER_ITEM(ITEM_MASK_GERUDO, 0, DrawItem) },
+    { ITEM_MASK_TRUTH, ITEM_TRACKER_ITEM(ITEM_MASK_TRUTH, 0, DrawItem) },
+    { ITEM_SOLD_OUT, ITEM_TRACKER_ITEM(ITEM_SOLD_OUT, 0, DrawItem) },
 
-    { ITEM_POCKET_EGG,       ITEM_TRACKER_ITEM(ITEM_POCKET_EGG, 0, DrawItem) },
-    { ITEM_POCKET_CUCCO,     ITEM_TRACKER_ITEM(ITEM_POCKET_CUCCO, 0, DrawItem) },
-    { ITEM_COJIRO,           ITEM_TRACKER_ITEM(ITEM_COJIRO, 0, DrawItem) },
-    { ITEM_ODD_MUSHROOM,     ITEM_TRACKER_ITEM(ITEM_ODD_MUSHROOM, 0, DrawItem) },
-    { ITEM_ODD_POTION,       ITEM_TRACKER_ITEM(ITEM_ODD_POTION, 0, DrawItem) },
-    { ITEM_SAW,              ITEM_TRACKER_ITEM(ITEM_SAW, 0, DrawItem) },
-    { ITEM_SWORD_BROKEN,     ITEM_TRACKER_ITEM(ITEM_SWORD_BROKEN, 0, DrawItem) },
-    { ITEM_PRESCRIPTION,     ITEM_TRACKER_ITEM(ITEM_PRESCRIPTION, 0, DrawItem) },
-    { ITEM_FROG,             ITEM_TRACKER_ITEM(ITEM_FROG, 0, DrawItem) },
-    { ITEM_EYEDROPS,         ITEM_TRACKER_ITEM(ITEM_EYEDROPS, 0, DrawItem) },
-    { ITEM_CLAIM_CHECK,      ITEM_TRACKER_ITEM(ITEM_CLAIM_CHECK, 0, DrawItem) },
+    { ITEM_POCKET_EGG, ITEM_TRACKER_ITEM(ITEM_POCKET_EGG, 0, DrawItem) },
+    { ITEM_POCKET_CUCCO, ITEM_TRACKER_ITEM(ITEM_POCKET_CUCCO, 0, DrawItem) },
+    { ITEM_COJIRO, ITEM_TRACKER_ITEM(ITEM_COJIRO, 0, DrawItem) },
+    { ITEM_ODD_MUSHROOM, ITEM_TRACKER_ITEM(ITEM_ODD_MUSHROOM, 0, DrawItem) },
+    { ITEM_ODD_POTION, ITEM_TRACKER_ITEM(ITEM_ODD_POTION, 0, DrawItem) },
+    { ITEM_SAW, ITEM_TRACKER_ITEM(ITEM_SAW, 0, DrawItem) },
+    { ITEM_SWORD_BROKEN, ITEM_TRACKER_ITEM(ITEM_SWORD_BROKEN, 0, DrawItem) },
+    { ITEM_PRESCRIPTION, ITEM_TRACKER_ITEM(ITEM_PRESCRIPTION, 0, DrawItem) },
+    { ITEM_FROG, ITEM_TRACKER_ITEM(ITEM_FROG, 0, DrawItem) },
+    { ITEM_EYEDROPS, ITEM_TRACKER_ITEM(ITEM_EYEDROPS, 0, DrawItem) },
+    { ITEM_CLAIM_CHECK, ITEM_TRACKER_ITEM(ITEM_CLAIM_CHECK, 0, DrawItem) },
 };
 
 std::vector<uint32_t> buttonMap = {
-    BTN_A,
-    BTN_B,
-    BTN_CUP,
-    BTN_CDOWN,
-    BTN_CLEFT,
-    BTN_CRIGHT,
-    BTN_L,
-    BTN_Z,
-    BTN_R,
-    BTN_START,
-    BTN_DUP,
-    BTN_DDOWN,
-    BTN_DLEFT,
-    BTN_DRIGHT
+    BTN_A, BTN_B, BTN_CUP,   BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
+    BTN_Z, BTN_R, BTN_START, BTN_DUP,   BTN_DDOWN, BTN_DLEFT,  BTN_DRIGHT,
 };
 
 typedef enum {
-  ITEM_TRACKER_NUMBER_NONE,
-  ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY,
-  ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY,
-  ITEM_TRACKER_NUMBER_CAPACITY,
-  ITEM_TRACKER_NUMBER_AMMO,
+    ITEM_TRACKER_NUMBER_NONE,
+    ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY,
+    ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY,
+    ITEM_TRACKER_NUMBER_CAPACITY,
+    ITEM_TRACKER_NUMBER_AMMO,
 } ItemTrackerNumberOption;
 
 typedef enum {
     KEYS_COLLECTED_MAX,
     KEYS_CURRENT_COLLECTED_MAX,
-    KEYS_CURRENT_MAX
+    KEYS_CURRENT_MAX,
 } ItemTrackerKeysNumberOption;
 
 typedef enum {
     TRIFORCE_PIECE_COLLECTED_REQUIRED,
-    TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX
+    TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX,
 } ItemTrackerTriforcePieceNumberOption;
 
 typedef enum {
     SECTION_DISPLAY_HIDDEN,
     SECTION_DISPLAY_MAIN_WINDOW,
-    SECTION_DISPLAY_SEPARATE
+    SECTION_DISPLAY_SEPARATE,
 } ItemTrackerDisplayType;
 
 typedef enum {
@@ -318,13 +361,13 @@ typedef enum {
 
 typedef enum {
     SECTION_DISPLAY_MINIMAL_HIDDEN,
-    SECTION_DISPLAY_MINIMAL_SEPARATE
+    SECTION_DISPLAY_MINIMAL_SEPARATE,
 } ItemTrackerMinimalDisplayType;
 
 struct ItemTrackerNumbers {
-  int currentCapacity;
-  int maxCapacity;
-  int currentAmmo;
+    int currentCapacity;
+    int maxCapacity;
+    int currentAmmo;
 };
 
 static ImVector<char> itemTrackerNotes;
@@ -332,6 +375,10 @@ uint32_t notesIdleFrames = 0;
 bool notesNeedSave = false;
 const uint32_t notesMaxIdleFrames = 40; // two seconds of game time, since OnGameFrameUpdate is used to tick
 
+static bool presetLoaded = false;
+static std::unordered_map<std::string, ImVec2> presetPos;
+static std::unordered_map<std::string, ImVec2> presetSize;
+
 void ItemTrackerOnFrame() {
     if (notesNeedSave && notesIdleFrames <= notesMaxIdleFrames) {
         notesIdleFrames++;
@@ -355,6 +402,16 @@ bool HasEquipment(ItemTrackerItem item) {
     return GameInteractor::IsSaveLoaded() ? (item.data & gSaveContext.inventory.equipment) : false;
 }
 
+void ItemTracker_LoadFromPreset(nlohmann::json trackerInfo) {
+    presetLoaded = true;
+    for (auto window : itemTrackerWindowIDs) {
+        if (trackerInfo.contains(window)) {
+            presetPos[window] = { trackerInfo[window]["pos"]["x"], trackerInfo[window]["pos"]["y"] };
+            presetSize[window] = { trackerInfo[window]["size"]["width"], trackerInfo[window]["size"]["height"] };
+        }
+    }
+}
+
 ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
     ItemTrackerNumbers result;
     result.currentCapacity = 0;
@@ -389,8 +446,10 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
             break;
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
-            result.currentCapacity = IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) ? 0 : CUR_CAPACITY(UPG_WALLET);
-            result.maxCapacity = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET) ? 999 : 500;
+            result.currentCapacity =
+                IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) ? 0 : CUR_CAPACITY(UPG_WALLET);
+            result.maxCapacity =
+                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_INCLUDE_TYCOON_WALLET) ? 999 : 500;
             result.currentAmmo = gSaveContext.rupees;
             break;
         case ITEM_BOMBCHU:
@@ -470,7 +529,8 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
     int textSize = CVarGetInteger(CVAR_TRACKER_ITEM("TextSize"), 13);
     ItemTrackerNumbers currentAndMax = GetItemCurrentAndMax(item);
     ImVec2 p = ImGui::GetCursorScreenPos();
-    int32_t trackerNumberDisplayMode = CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY);
+    int32_t trackerNumberDisplayMode =
+        CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY);
     int32_t trackerKeyNumberDisplayMode = CVarGetInteger(CVAR_TRACKER_ITEM("KeyCounts"), KEYS_COLLECTED_MAX);
     float textScalingFactor = static_cast<float>(iconSize) / 36.0f;
     uint32_t actualItemId = INV_CONTENT(item.id);
@@ -480,8 +540,11 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
         if ((actualItemId == ITEM_HOOKSHOT || actualItemId == ITEM_LONGSHOT) && hasItem) {
 
             // Calculate the scaled position for the text
-            ImVec2 textPos = ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(item.id == ITEM_HOOKSHOT ? "H" : "L").x * 
-            textScalingFactor / 2) + 8 * textScalingFactor, p.y - 22 * textScalingFactor);
+            ImVec2 textPos =
+                ImVec2(p.x + (iconSize / 2) -
+                           (ImGui::CalcTextSize(item.id == ITEM_HOOKSHOT ? "H" : "L").x * textScalingFactor / 2) +
+                           8 * textScalingFactor,
+                       p.y - 22 * textScalingFactor);
 
             ImGui::SetCursorScreenPos(textPos);
             ImGui::SetWindowFontScale(textScalingFactor);
@@ -499,16 +562,19 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
         ImU32 currentColor = IM_COL_WHITE;
         ImU32 maxColor = IM_COL_GREEN;
         // "Collected / Max", "Current / Collected / Max", "Current / Max"
-        if (trackerKeyNumberDisplayMode == KEYS_CURRENT_COLLECTED_MAX || trackerKeyNumberDisplayMode == KEYS_CURRENT_MAX) {
-            currentString+= std::to_string(currentAndMax.currentAmmo);
-            currentString+= "/";
+        if (trackerKeyNumberDisplayMode == KEYS_CURRENT_COLLECTED_MAX ||
+            trackerKeyNumberDisplayMode == KEYS_CURRENT_MAX) {
+            currentString += std::to_string(currentAndMax.currentAmmo);
+            currentString += "/";
         }
-        if (trackerKeyNumberDisplayMode == KEYS_COLLECTED_MAX || trackerKeyNumberDisplayMode == KEYS_CURRENT_COLLECTED_MAX) {
-            currentString+= std::to_string(currentAndMax.currentCapacity);
-            currentString+= "/";
+        if (trackerKeyNumberDisplayMode == KEYS_COLLECTED_MAX ||
+            trackerKeyNumberDisplayMode == KEYS_CURRENT_COLLECTED_MAX) {
+            currentString += std::to_string(currentAndMax.currentCapacity);
+            currentString += "/";
         }
 
-        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize((currentString + maxString).c_str()).x / 2), p.y - 14));
+        ImGui::SetCursorScreenPos(
+            ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize((currentString + maxString).c_str()).x / 2), p.y - 14));
         ImGui::PushStyleColor(ImGuiCol_Text, currentColor);
         ImGui::Text("%s", currentString.c_str());
         ImGui::PopStyleColor();
@@ -516,26 +582,25 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
         ImGui::PushStyleColor(ImGuiCol_Text, maxColor);
         ImGui::Text("%s", maxString.c_str());
         ImGui::PopStyleColor();
-    } else if (currentAndMax.currentCapacity > 0 && trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_NONE && IsValidSaveFile()) {
+    } else if (currentAndMax.currentCapacity > 0 && trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_NONE &&
+               IsValidSaveFile()) {
         std::string currentString = "";
         std::string maxString = "";
         ImU32 currentColor = IM_COL_WHITE;
         ImU32 maxColor = item.id == QUEST_SKULL_TOKEN ? IM_COL_RED : IM_COL_GREEN;
 
         bool shouldAlignToLeft = CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountAlignLeft"), 0) &&
-            trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_CAPACITY &&
-            trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_AMMO;
+                                 trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_CAPACITY &&
+                                 trackerNumberDisplayMode != ITEM_TRACKER_NUMBER_AMMO;
 
         bool shouldDisplayAmmo = trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_AMMO ||
-            trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY ||
-            // These items have a static capacity, so display ammo instead
-            item.id == ITEM_BOMBCHU ||
-            item.id == ITEM_BEAN ||
-            item.id == QUEST_SKULL_TOKEN ||
-            item.id == ITEM_HEART_CONTAINER ||
-            item.id == ITEM_HEART_PIECE;
+                                 trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY ||
+                                 // These items have a static capacity, so display ammo instead
+                                 item.id == ITEM_BOMBCHU || item.id == ITEM_BEAN || item.id == QUEST_SKULL_TOKEN ||
+                                 item.id == ITEM_HEART_CONTAINER || item.id == ITEM_HEART_PIECE;
 
-        bool shouldDisplayMax = !(trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY || trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY);
+        bool shouldDisplayMax = !(trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY ||
+                                  trackerNumberDisplayMode == ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY);
 
         if (shouldDisplayAmmo) {
             currentString = std::to_string(currentAndMax.currentAmmo);
@@ -563,7 +628,9 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
             }
         }
 
-        float x = shouldAlignToLeft ? p.x : p.x + (iconSize / 2) - (ImGui::CalcTextSize((currentString + maxString).c_str()).x / 2);
+        float x = shouldAlignToLeft
+                      ? p.x
+                      : p.x + (iconSize / 2) - (ImGui::CalcTextSize((currentString + maxString).c_str()).x / 2);
 
         ImGui::SetCursorScreenPos(ImVec2(x, p.y - 14));
         ImGui::PushStyleColor(ImGuiCol_Text, currentColor);
@@ -578,11 +645,16 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
         std::string currentString = "";
         std::string requiredString = "";
         std::string maxString = "";
-        uint8_t piecesRequired = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1);
-        uint8_t piecesTotal = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_TOTAL) + 1);
-        ImU32 currentColor = gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected >= piecesRequired ? IM_COL_GREEN : IM_COL_WHITE;
+        uint8_t piecesRequired =
+            (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1);
+        uint8_t piecesTotal =
+            (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_TOTAL) + 1);
+        ImU32 currentColor = gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected >= piecesRequired
+                                 ? IM_COL_GREEN
+                                 : IM_COL_WHITE;
         ImU32 maxColor = IM_COL_GREEN;
-        int32_t trackerTriforcePieceNumberDisplayMode = CVarGetInteger(CVAR_TRACKER_ITEM("TriforcePieceCounts"), TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
+        int32_t trackerTriforcePieceNumberDisplayMode =
+            CVarGetInteger(CVAR_TRACKER_ITEM("TriforcePieceCounts"), TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
 
         currentString += std::to_string(gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
         currentString += "/";
@@ -612,18 +684,20 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
 
 void DrawEquip(ItemTrackerItem item) {
     bool hasEquip = HasEquipment(item);
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasEquip && IsValidSaveFile() ? item.name : item.nameFaded),
-                 ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                     hasEquip && IsValidSaveFile() ? item.name : item.nameFaded),
+                 ImVec2(iconSize, iconSize), ImVec2(0.0f, 0.0f), ImVec2(1, 1));
 
-    UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(item.id));
+    Tooltip(SohUtils::GetItemName(item.id).c_str());
 }
 
 void DrawQuest(ItemTrackerItem item) {
     bool hasQuestItem = HasQuestItem(item);
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     ImGui::BeginGroup();
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasQuestItem && IsValidSaveFile() ? item.name : item.nameFaded),
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                     hasQuestItem && IsValidSaveFile() ? item.name : item.nameFaded),
                  ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
 
     if (item.id == QUEST_SKULL_TOKEN) {
@@ -632,17 +706,19 @@ void DrawQuest(ItemTrackerItem item) {
 
     ImGui::EndGroup();
 
-    UIWidgets::SetLastItemHoverText(SohUtils::GetQuestItemName(item.id));
+    Tooltip(SohUtils::GetQuestItemName(item.id).c_str());
 };
 
 void DrawItem(ItemTrackerItem item) {
 
     uint32_t actualItemId = GameInteractor::IsSaveLoaded() ? INV_CONTENT(item.id) : ITEM_NONE;
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     bool hasItem = actualItemId != ITEM_NONE;
     std::string itemName = "";
 
-    if (item.id == ITEM_NONE) {
+    // Hack fix as RG_MARKET_SHOOTING_GALLERY_KEY is RandomizerGet #255 which collides
+    // with ITEM_NONE (ItemId #255) due to the lack of a modid to separate them
+    if (item.name != "ITEM_KEY_SMALL" && item.id == ITEM_NONE) {
         return;
     }
 
@@ -668,7 +744,9 @@ void DrawItem(ItemTrackerItem item) {
         case ITEM_BRACELET:
         case ITEM_GAUNTLETS_SILVER:
         case ITEM_GAUNTLETS_GOLD:
-            actualItemId = CUR_UPG_VALUE(UPG_STRENGTH) == 3 ? ITEM_GAUNTLETS_GOLD : CUR_UPG_VALUE(UPG_STRENGTH) == 2 ? ITEM_GAUNTLETS_SILVER : ITEM_BRACELET;
+            actualItemId = CUR_UPG_VALUE(UPG_STRENGTH) == 3   ? ITEM_GAUNTLETS_GOLD
+                           : CUR_UPG_VALUE(UPG_STRENGTH) == 2 ? ITEM_GAUNTLETS_SILVER
+                                                              : ITEM_BRACELET;
             hasItem = CUR_UPG_VALUE(UPG_STRENGTH) > 0;
             break;
         case ITEM_SCALE_SILVER:
@@ -727,9 +805,10 @@ void DrawItem(ItemTrackerItem item) {
             break;
         case RG_GANON_SOUL:
             actualItemId = item.id;
-            hasItem = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) == RO_BOSS_SOULS_ON_PLUS_GANON ? 
-                Flags_GetRandomizerInf(RAND_INF_GANON_SOUL) : true;
-                
+            hasItem = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BOSS_SOULS) ==
+                              RO_BOSS_SOULS_ON_PLUS_GANON
+                          ? Flags_GetRandomizerInf(RAND_INF_GANON_SOUL)
+                          : true;
             itemName = "Ganon's Soul";
             break;
 
@@ -763,23 +842,148 @@ void DrawItem(ItemTrackerItem item) {
             hasItem = IS_RANDO && Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND);
             itemName = "Fishing Pole";
             break;
+
+        case RG_GUARD_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_GUARD_HOUSE_KEY_OBTAINED);
+            itemName = "Guard House Key";
+            break;
+        case RG_MARKET_BAZAAR_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_MARKET_BAZAAR_KEY_OBTAINED);
+            itemName = "Market Bazaar Key";
+            break;
+        case RG_MARKET_POTION_SHOP_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_MARKET_POTION_SHOP_KEY_OBTAINED);
+            itemName = "Market Potion Shop Key";
+            break;
+        case RG_MASK_SHOP_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_MASK_SHOP_KEY_OBTAINED);
+            itemName = "Mask Shop Key";
+            break;
+        case RG_MARKET_SHOOTING_GALLERY_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_MARKET_SHOOTING_GALLERY_KEY_OBTAINED);
+            itemName = "Market Shooting Gallery Key";
+            break;
+        case RG_BOMBCHU_BOWLING_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BOMBCHU_BOWLING_KEY_OBTAINED);
+            itemName = "Bombchu Bowling Key";
+            break;
+        case RG_TREASURE_CHEST_GAME_BUILDING_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_TREASURE_CHEST_GAME_BUILDING_KEY_OBTAINED);
+            itemName = "Treasure Chest Game Building Key";
+            break;
+        case RG_BOMBCHU_SHOP_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BOMBCHU_SHOP_KEY_OBTAINED);
+            itemName = "Bombchu Shop Key";
+            break;
+        case RG_RICHARDS_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_RICHARDS_HOUSE_KEY_OBTAINED);
+            itemName = "Richards House Key";
+            break;
+        case RG_ALLEY_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_ALLEY_HOUSE_KEY_OBTAINED);
+            itemName = "Alley House Key";
+            break;
+        case RG_KAK_BAZAAR_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_KAK_BAZAAR_KEY_OBTAINED);
+            itemName = "Kak Bazaar Key";
+            break;
+        case RG_KAK_POTION_SHOP_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_KAK_POTION_SHOP_KEY_OBTAINED);
+            itemName = "Kak Potion Shop Key";
+            break;
+        case RG_BOSS_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BOSS_HOUSE_KEY_OBTAINED);
+            itemName = "Boss House Key";
+            break;
+        case RG_GRANNYS_POTION_SHOP_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_GRANNYS_POTION_SHOP_KEY_OBTAINED);
+            itemName = "Granny's Potion Shop Key";
+            break;
+        case RG_SKULLTULA_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_SKULLTULA_HOUSE_KEY_OBTAINED);
+            itemName = "Skulltula House Key";
+            break;
+        case RG_IMPAS_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_IMPAS_HOUSE_KEY_OBTAINED);
+            itemName = "Impa's House Key";
+            break;
+        case RG_WINDMILL_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_WINDMILL_KEY_OBTAINED);
+            itemName = "Windmill Key";
+            break;
+        case RG_KAK_SHOOTING_GALLERY_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_KAK_SHOOTING_GALLERY_KEY_OBTAINED);
+            itemName = "Kak Shooting Gallery Key";
+            break;
+        case RG_DAMPES_HUT_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_DAMPES_HUT_KEY_OBTAINED);
+            itemName = "Dampé's Hut Key";
+            break;
+        case RG_TALONS_HOUSE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_TALONS_HOUSE_KEY_OBTAINED);
+            itemName = "Talon's House Key";
+            break;
+        case RG_STABLES_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_STABLES_KEY_OBTAINED);
+            itemName = "Stables Key";
+            break;
+        case RG_BACK_TOWER_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_BACK_TOWER_KEY_OBTAINED);
+            itemName = "Back Tower Key";
+            break;
+        case RG_HYLIA_LAB_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_HYLIA_LAB_KEY_OBTAINED);
+            itemName = "Hylia Lab Key";
+            break;
+        case RG_FISHING_HOLE_KEY:
+            actualItemId = item.id;
+            hasItem = Flags_GetRandomizerInf(RAND_INF_FISHING_HOLE_KEY_OBTAINED);
+            itemName = "Fishing Hole Key";
+            break;
     }
 
-    if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
+    if (GameInteractor::IsSaveLoaded() &&
+        (hasItem && item.id != actualItemId &&
+         actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
         item = actualItemTrackerItemMap[actualItemId];
     }
-    
+
     ImGui::BeginGroup();
 
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                     hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
                  ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
-    
+
     DrawItemCount(item, false);
 
     if (item.id >= RG_GOHMA_SOUL && item.id <= RG_GANON_SOUL) {
         ImVec2 p = ImGui::GetCursorScreenPos();
         std::string bossName = itemTrackerBossShortNames[item.id];
-        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(bossName.c_str()).x / 2), p.y - (iconSize + 13)));
+        ImGui::SetCursorScreenPos(
+            ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(bossName.c_str()).x / 2), p.y - (iconSize + 13)));
         ImGui::PushStyleColor(ImGuiCol_Text, IM_COL_WHITE);
         ImGui::Text("%s", bossName.c_str());
         ImGui::PopStyleColor();
@@ -788,98 +992,119 @@ void DrawItem(ItemTrackerItem item) {
     if (item.id >= RG_OCARINA_A_BUTTON && item.id <= RG_OCARINA_C_RIGHT_BUTTON) {
         ImVec2 p = ImGui::GetCursorScreenPos();
         std::string ocarinaButtonName = itemTrackerOcarinaButtonShortNames[item.id];
-        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(ocarinaButtonName.c_str()).x / 2), p.y - (iconSize + 13)));
+        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(ocarinaButtonName.c_str()).x / 2),
+                                         p.y - (iconSize + 13)));
         ImGui::PushStyleColor(ImGuiCol_Text, IM_COL_WHITE);
         ImGui::Text("%s", ocarinaButtonName.c_str());
         ImGui::PopStyleColor();
     }
 
+    if (item.id >= RG_GUARD_HOUSE_KEY && item.id <= RG_FISHING_HOLE_KEY) {
+        ImVec2 p = ImGui::GetCursorScreenPos();
+        std::string overworldKeyName = itemTrackerOverworldKeyShortNames[item.id];
+        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(overworldKeyName.c_str()).x / 2),
+                                         p.y - (iconSize + 13)));
+        ImGui::PushStyleColor(ImGuiCol_Text, IM_COL_WHITE);
+        ImGui::Text("%s", overworldKeyName.c_str());
+        ImGui::PopStyleColor();
+    }
+
     ImGui::EndGroup();
 
     if (itemName == "") {
         itemName = SohUtils::GetItemName(item.id);
     }
 
-    UIWidgets::SetLastItemHoverText(itemName);
+    Tooltip(itemName.c_str());
 }
 
 void DrawBottle(ItemTrackerItem item) {
-    uint32_t actualItemId = GameInteractor::IsSaveLoaded() ? (gSaveContext.inventory.items[SLOT(item.id) + item.data]) : false;
+    uint32_t actualItemId =
+        GameInteractor::IsSaveLoaded() ? (gSaveContext.inventory.items[SLOT(item.id) + item.data]) : false;
     bool hasItem = actualItemId != ITEM_NONE;
 
-    if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
+    if (GameInteractor::IsSaveLoaded() &&
+        (hasItem && item.id != actualItemId &&
+         actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) {
         item = actualItemTrackerItemMap[actualItemId];
     }
 
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                     hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
                  ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
 
-    UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(item.id));
+    Tooltip(SohUtils::GetItemName(item.id).c_str());
 };
 
 void DrawDungeonItem(ItemTrackerItem item) {
     uint32_t itemId = item.id;
     ImU32 dungeonColor = IM_COL_WHITE;
     uint32_t bitMask = 1 << (item.id - ITEM_KEY_BOSS); // Bitset starts at ITEM_KEY_BOSS == 0. the rest are sequential
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     bool hasItem = GameInteractor::IsSaveLoaded() ? (bitMask & gSaveContext.inventory.dungeonItems[item.data]) : false;
-    bool hasSmallKey = GameInteractor::IsSaveLoaded() ? ((gSaveContext.inventory.dungeonKeys[item.data]) >= 0)  : false;
+    bool hasSmallKey = GameInteractor::IsSaveLoaded() ? ((gSaveContext.inventory.dungeonKeys[item.data]) >= 0) : false;
     ImGui::BeginGroup();
     if (itemId == ITEM_KEY_SMALL) {
-        ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasSmallKey && IsValidSaveFile() ? item.name : item.nameFaded),
+        ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                         hasSmallKey && IsValidSaveFile() ? item.name : item.nameFaded),
                      ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
-    }
-    else {
-        ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
+    } else {
+        ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                         hasItem && IsValidSaveFile() ? item.name : item.nameFaded),
                      ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1));
     }
 
-    if (CheckTracker::IsAreaSpoiled(RandomizerCheckObjects::GetRCAreaBySceneID(static_cast<SceneID>(item.data))) && GameInteractor::IsSaveLoaded()) {
+    if (CheckTracker::IsAreaSpoiled(RandomizerCheckObjects::GetRCAreaBySceneID(static_cast<SceneID>(item.data))) &&
+        GameInteractor::IsSaveLoaded()) {
         dungeonColor = (ResourceMgr_IsSceneMasterQuest(item.data) ? IM_COL_PURPLE : IM_COL_LIGHT_YELLOW);
     }
 
     if (itemId == ITEM_KEY_SMALL) {
-        DrawItemCount(item, !CheckTracker::IsAreaSpoiled(RandomizerCheckObjects::GetRCAreaBySceneID(static_cast<SceneID>(item.data))));
+        DrawItemCount(item, !CheckTracker::IsAreaSpoiled(
+                                RandomizerCheckObjects::GetRCAreaBySceneID(static_cast<SceneID>(item.data))));
 
         ImVec2 p = ImGui::GetCursorScreenPos();
-        // offset puts the text at the correct level. for some reason, if the save is loaded, the margin is 3 pixels higher only for small keys, so we use 16 then. Otherwise, 13 is where everything else is
+        // offset puts the text at the correct level. for some reason, if the save is loaded, the margin is 3 pixels
+        // higher only for small keys, so we use 16 then. Otherwise, 13 is where everything else is
         int offset = GameInteractor::IsSaveLoaded() ? 16 : 13;
         std::string dungeonName = itemTrackerDungeonShortNames[item.data];
-        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(dungeonName.c_str()).x / 2), p.y - (iconSize + offset)));
+        ImGui::SetCursorScreenPos(
+            ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(dungeonName.c_str()).x / 2), p.y - (iconSize + offset)));
         ImGui::PushStyleColor(ImGuiCol_Text, dungeonColor);
         ImGui::Text("%s", dungeonName.c_str());
         ImGui::PopStyleColor();
     }
 
-    if (itemId == ITEM_DUNGEON_MAP && 
-        (item.data == SCENE_DEKU_TREE || item.data == SCENE_DODONGOS_CAVERN || item.data == SCENE_JABU_JABU || item.data == SCENE_ICE_CAVERN)
-    ) {
+    if (itemId == ITEM_DUNGEON_MAP && (item.data == SCENE_DEKU_TREE || item.data == SCENE_DODONGOS_CAVERN ||
+                                       item.data == SCENE_JABU_JABU || item.data == SCENE_ICE_CAVERN)) {
         ImVec2 p = ImGui::GetCursorScreenPos();
         std::string dungeonName = itemTrackerDungeonShortNames[item.data];
-        ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(dungeonName.c_str()).x / 2), p.y - (iconSize + 13)));
+        ImGui::SetCursorScreenPos(
+            ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(dungeonName.c_str()).x / 2), p.y - (iconSize + 13)));
         ImGui::PushStyleColor(ImGuiCol_Text, dungeonColor);
         ImGui::Text("%s", dungeonName.c_str());
         ImGui::PopStyleColor();
     }
     ImGui::EndGroup();
 
-    UIWidgets::SetLastItemHoverText(SohUtils::GetItemName(item.id));
+    Tooltip(SohUtils::GetItemName(item.id).c_str());
 }
 
 void DrawSong(ItemTrackerItem item) {
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     ImVec2 p = ImGui::GetCursorScreenPos();
     bool hasSong = HasSong(item);
     ImGui::SetCursorScreenPos(ImVec2(p.x + 6, p.y));
-    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(hasSong && IsValidSaveFile() ? item.name : item.nameFaded),
-                 ImVec2(iconSize / 1.5, iconSize), ImVec2(0, 0), ImVec2(1, 1));
-    UIWidgets::SetLastItemHoverText(SohUtils::GetQuestItemName(item.id));
+    ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(
+                     hasSong && IsValidSaveFile() ? item.name : item.nameFaded),
+                 ImVec2(iconSize / 1.5f, iconSize), ImVec2(0, 0), ImVec2(1, 1));
+    Tooltip(SohUtils::GetQuestItemName(item.id).c_str());
 }
 
 void DrawNotes(bool resizeable = false) {
     ImGui::BeginGroup();
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
 
     struct ItemTrackerNotes {
@@ -893,22 +1118,24 @@ void DrawNotes(bool resizeable = false) {
             }
             return 0;
         }
-        static bool TrackerNotesInputTextMultiline(const char* label, ImVector<char>* itemTrackerNotes, const ImVec2& size = ImVec2(0, 0),
-                                                    ImGuiInputTextFlags flags = 0) {
+        static bool TrackerNotesInputTextMultiline(const char* label, ImVector<char>* itemTrackerNotes,
+                                                   const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0) {
             IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0);
-            return ImGui::InputTextMultiline(label, itemTrackerNotes->begin(), (size_t)itemTrackerNotes->size(),
-                                                size, flags | ImGuiInputTextFlags_CallbackResize,
-                                                ItemTrackerNotes::TrackerNotesResizeCallback,
-                                                (void*)itemTrackerNotes);
+            return ImGui::InputTextMultiline(label, itemTrackerNotes->begin(), (size_t)itemTrackerNotes->size(), size,
+                                             flags | ImGuiInputTextFlags_CallbackResize,
+                                             ItemTrackerNotes::TrackerNotesResizeCallback, (void*)itemTrackerNotes);
         }
     };
-    ImVec2 size = resizeable ? ImVec2(-FLT_MIN, ImGui::GetContentRegionAvail().y) : ImVec2(((iconSize + iconSpacing) * 6) - 8, 200);
+    ImVec2 size = resizeable ? ImVec2(-FLT_MIN, ImGui::GetContentRegionAvail().y)
+                             : ImVec2(((iconSize + iconSpacing) * 6) - 8.0f, 200.0f);
     if (GameInteractor::IsSaveLoaded()) {
-        if (ItemTrackerNotes::TrackerNotesInputTextMultiline("##ItemTrackerNotes", &itemTrackerNotes, size, ImGuiInputTextFlags_AllowTabInput)) {
+        if (ItemTrackerNotes::TrackerNotesInputTextMultiline("##ItemTrackerNotes", &itemTrackerNotes, size,
+                                                             ImGuiInputTextFlags_AllowTabInput)) {
             notesNeedSave = true;
             notesIdleFrames = 0;
         }
-        if ((ImGui::IsItemDeactivatedAfterEdit() || (notesNeedSave && notesIdleFrames > notesMaxIdleFrames)) && IsValidSaveFile()) {
+        if ((ImGui::IsItemDeactivatedAfterEdit() || (notesNeedSave && notesIdleFrames > notesMaxIdleFrames)) &&
+            IsValidSaveFile()) {
             notesNeedSave = false;
             SaveManager::Instance->SaveSection(gSaveContext.fileNum, itemTrackerSectionId, true);
         }
@@ -931,25 +1158,39 @@ void DrawTotalChecks() {
 }
 
 // Windowing stuff
-ImVec4 ChromaKeyBackground = { 0, 0, 0, 0 }; // Float value, 1 = 255 in rgb value.
 void BeginFloatingWindows(std::string UniqueName, ImGuiWindowFlags flags = 0) {
     ImGuiWindowFlags windowFlags = flags;
 
     if (windowFlags == 0) {
-        windowFlags |= ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize;
+        windowFlags |=
+            ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize;
     }
 
     if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING) {
         ImGui::SetNextWindowViewport(ImGui::GetMainViewport()->ID);
-        windowFlags |= ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar;
+        windowFlags |= ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoTitleBar |
+                       ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollbar;
 
         if (!CVarGetInteger(CVAR_TRACKER_ITEM("Draggable"), 0)) {
             windowFlags |= ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove;
         }
     }
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ChromaKeyBackground);
+    auto color = VecFromRGBA8(CVarGetColor(CVAR_TRACKER_ITEM("BgColor.Value"), { 0, 0, 0, 0 }));
+    auto maybeParent = ImGui::GetCurrentWindow();
+    ImGuiWindow* window = ImGui::FindWindowByName(UniqueName.c_str());
+    if (window != NULL && window->DockTabIsVisible && window->ParentWindow != NULL &&
+        std::string(window->ParentWindow->Name).compare(0, strlen("Main - Deck"), "Main - Deck") == 0) {
+        color.w = 1.0f;
+    }
+    ImGui::PushStyleColor(ImGuiCol_WindowBg, color);
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
+    if (presetLoaded && presetPos.contains(UniqueName)) {
+        ImGui::SetNextWindowSize(presetSize[UniqueName]);
+        ImGui::SetNextWindowPos(presetPos[UniqueName]);
+        presetSize.erase(UniqueName);
+        presetPos.erase(UniqueName);
+    }
     ImGui::Begin(UniqueName.c_str(), nullptr, windowFlags);
 }
 void EndFloatingWindows() {
@@ -964,14 +1205,16 @@ void EndFloatingWindows() {
  * Takes in a vector of ItemTrackerItem and draws them in rows of N items
  */
 void DrawItemsInRows(std::vector<ItemTrackerItem> items, int columns = 6) {
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
+    float iconSize = static_cast<float>(CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36));
     int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
-    int topPadding = (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW) ? 20 : 0;
+    int topPadding =
+        (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW) ? 20 : 0;
 
     for (int i = 0; i < items.size(); i++) {
         int row = i / columns;
         int column = i % columns;
-        ImGui::SetCursorPos(ImVec2((column * (iconSize + iconSpacing) + 8), (row * (iconSize + iconSpacing)) + 8 + topPadding));
+        ImGui::SetCursorPos(
+            ImVec2((column * (iconSize + iconSpacing) + 8.0f), (row * (iconSize + iconSpacing)) + 8.0f + topPadding));
         items[i].drawFunc(items[i]);
     }
 }
@@ -985,10 +1228,10 @@ void DrawItemsInACircle(std::vector<ItemTrackerItem> items) {
     int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
 
     ImVec2 max = ImGui::GetWindowContentRegionMax();
-    float radius = (iconSize + iconSpacing) * 2;
+    float radius = (iconSize + iconSpacing) * 2.0f;
 
     for (int i = 0; i < items.size(); i++) {
-        float angle = (float)i / items.size() * 2.0f * M_PI;
+        float angle = static_cast<float>(i / items.size() * 2.0f * M_PI);
         float x = (radius / 2.0f) * cos(angle) + max.x / 2.0f;
         float y = (radius / 2.0f) * sin(angle) + max.y / 2.0f;
         ImGui::SetCursorPos(ImVec2(x - (CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36) - 8) / 2.0f, y + 4));
@@ -998,17 +1241,16 @@ void DrawItemsInACircle(std::vector<ItemTrackerItem> items) {
 
 /**
  * GetDungeonItemsVector
- * Loops over dungeons and creates vectors of items in the correct order 
+ * Loops over dungeons and creates vectors of items in the correct order
  * to then call DrawItemsInRows
  */
 std::vector<ItemTrackerItem> GetDungeonItemsVector(std::vector<ItemTrackerDungeon> dungeons, int columns = 6) {
-    int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
-    int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
     std::vector<ItemTrackerItem> dungeonItems = {};
 
     int rowCount = 0;
     for (int i = 0; i < dungeons.size(); i++) {
-        if (dungeons[i].items.size() > rowCount) rowCount = dungeons[i].items.size();
+        if (dungeons[i].items.size() > rowCount)
+            rowCount = static_cast<int32_t>(dungeons[i].items.size());
     }
 
     for (int i = 0; i < rowCount; i++) {
@@ -1021,7 +1263,8 @@ std::vector<ItemTrackerItem> GetDungeonItemsVector(std::vector<ItemTrackerDungeo
                     case ITEM_KEY_BOSS:
                         // Swap Ganon's Castle boss key to the right scene ID manually
                         if (dungeons[j].id == SCENE_INSIDE_GANONS_CASTLE) {
-                            dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, SCENE_GANONS_TOWER, DrawDungeonItem));
+                            dungeonItems.push_back(
+                                ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, SCENE_GANONS_TOWER, DrawDungeonItem));
                         } else {
                             dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, dungeons[j].id, DrawDungeonItem));
                         }
@@ -1040,7 +1283,8 @@ std::vector<ItemTrackerItem> GetDungeonItemsVector(std::vector<ItemTrackerDungeo
     }
 
     if (dungeons.size() > columns) {
-        std::vector<ItemTrackerItem> nextDungeonItems = GetDungeonItemsVector(std::vector<ItemTrackerDungeon>(dungeons.begin() + columns, dungeons.end()), columns);
+        std::vector<ItemTrackerItem> nextDungeonItems =
+            GetDungeonItemsVector(std::vector<ItemTrackerDungeon>(dungeons.begin() + columns, dungeons.end()), columns);
         dungeonItems.insert(dungeonItems.end(), nextDungeonItems.begin(), nextDungeonItems.end());
     }
 
@@ -1049,7 +1293,7 @@ std::vector<ItemTrackerItem> GetDungeonItemsVector(std::vector<ItemTrackerDungeo
 /* ****************************************************** */
 
 void UpdateVectors() {
-    if  (!shouldUpdateVectors) {
+    if (!shouldUpdateVectors) {
         return;
     }
 
@@ -1058,7 +1302,9 @@ void UpdateVectors() {
     dungeonRewards.insert(dungeonRewards.end(), dungeonRewardMedallions.begin(), dungeonRewardMedallions.end());
 
     dungeonItems.clear();
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonItems.Layout"), 1) && CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonItems.Layout"), 1) &&
+        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
         if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonItems.DisplayMaps"), 1)) {
             dungeonItems = GetDungeonItemsVector(itemTrackerDungeonsWithMapsHorizontal, 12);
             // Manually adding Thieves Hideout to an open spot so we don't get an additional row for one item
@@ -1079,46 +1325,60 @@ void UpdateVectors() {
     }
 
     mainWindowItems.clear();
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         mainWindowItems.insert(mainWindowItems.end(), inventoryItems.begin(), inventoryItems.end());
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         mainWindowItems.insert(mainWindowItems.end(), equipmentItems.begin(), equipmentItems.end());
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         mainWindowItems.insert(mainWindowItems.end(), miscItems.begin(), miscItems.end());
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         mainWindowItems.insert(mainWindowItems.end(), dungeonRewardStones.begin(), dungeonRewardStones.end());
         mainWindowItems.insert(mainWindowItems.end(), dungeonRewardMedallions.begin(), dungeonRewardMedallions.end());
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) {
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW &&
-            CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) ==
+                SECTION_DISPLAY_MAIN_WINDOW &&
+            CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) !=
+                SECTION_DISPLAY_MAIN_WINDOW) {
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
         }
         mainWindowItems.insert(mainWindowItems.end(), songItems.begin(), songItems.end());
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         mainWindowItems.insert(mainWindowItems.end(), dungeonItems.begin(), dungeonItems.end());
     }
 
     // if we're adding greg to the misc window,
     // and misc isn't on the main window,
     // and it doesn't already have greg, add him
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
-        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
-        if (std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item) { return item.id == ITEM_RUPEE_GREEN; }))
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+            SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
+        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) !=
+            SECTION_DISPLAY_MAIN_WINDOW) {
+        if (std::none_of(miscItems.begin(), miscItems.end(),
+                         [](ItemTrackerItem item) { return item.id == ITEM_RUPEE_GREEN; }))
             miscItems.insert(miscItems.end(), gregItems.begin(), gregItems.end());
     } else {
-        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(), [](ItemTrackerItem i) { return i.id == ITEM_RUPEE_GREEN; }), miscItems.end());
+        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(),
+                                       [](ItemTrackerItem i) { return i.id == ITEM_RUPEE_GREEN; }),
+                        miscItems.end());
     }
 
     bool newRowAdded = false;
     // if we're adding greg to the main window
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+        SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
         if (!newRowAdded) {
             // insert empty items until we're on a new row for greg
             while (mainWindowItems.size() % 6) {
@@ -1132,7 +1392,8 @@ void UpdateVectors() {
     }
 
     // If we're adding triforce pieces to the main window
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
         // If Greg isn't on the main window, add empty items to place the triforce pieces on a new row.
         if (!newRowAdded) {
             while (mainWindowItems.size() % 6) {
@@ -1146,15 +1407,21 @@ void UpdateVectors() {
     }
 
     // if misc is separate and fishing pole isn't added, add fishing pole to misc
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
-        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) != SECTION_DISPLAY_MAIN_WINDOW) {
-        if (std::none_of(miscItems.begin(), miscItems.end(), [](ItemTrackerItem item) { return item.id == ITEM_FISHING_POLE; }))
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+            SECTION_DISPLAY_EXTENDED_MISC_WINDOW &&
+        CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) !=
+            SECTION_DISPLAY_MAIN_WINDOW) {
+        if (std::none_of(miscItems.begin(), miscItems.end(),
+                         [](ItemTrackerItem item) { return item.id == ITEM_FISHING_POLE; }))
             miscItems.insert(miscItems.end(), fishingPoleItems.begin(), fishingPoleItems.end());
     } else {
-        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(), [](ItemTrackerItem i) { return i.id == ITEM_FISHING_POLE; }), miscItems.end());
+        miscItems.erase(std::remove_if(miscItems.begin(), miscItems.end(),
+                                       [](ItemTrackerItem i) { return i.id == ITEM_FISHING_POLE; }),
+                        miscItems.end());
     }
     // add fishing pole to main window
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+        SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) {
         if (!newRowAdded) {
             while (mainWindowItems.size() % 6) {
                 mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
@@ -1165,28 +1432,45 @@ void UpdateVectors() {
         mainWindowItems.insert(mainWindowItems.end(), fishingPoleItems.begin(), fishingPoleItems.end());
     }
 
-    //If we're adding boss souls to the main window...
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
-        //...add empty items on the main window to get the souls on their own row. (Too many to sit with Greg/Triforce pieces)
+    // If we're adding boss souls to the main window...
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
+        //...add empty items on the main window to get the souls on their own row. (Too many to sit with Greg/Triforce
+        // pieces)
         while (mainWindowItems.size() % 6) {
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
         }
 
-        //Add boss souls
+        // Add boss souls
         mainWindowItems.insert(mainWindowItems.end(), bossSoulItems.begin(), bossSoulItems.end());
     }
 
-    //If we're adding ocarina buttons to the main window...
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) {
-        //...add empty items on the main window to get the buttons on their own row. (Too many to sit with Greg/Triforce pieces/boss souls)
+    // If we're adding ocarina buttons to the main window...
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
+        //...add empty items on the main window to get the buttons on their own row. (Too many to sit with Greg/Triforce
+        // pieces/boss souls)
         while (mainWindowItems.size() % 6) {
             mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
         }
 
-        //Add ocarina buttons
+        // Add ocarina buttons
         mainWindowItems.insert(mainWindowItems.end(), ocarinaButtonItems.begin(), ocarinaButtonItems.end());
     }
 
+    // If we're adding overworld keys to the main window...
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OverworldKeys"), SECTION_DISPLAY_HIDDEN) ==
+        SECTION_DISPLAY_MAIN_WINDOW) {
+        //...add empty items on the main window to get the keys on their own row. (Too many to sit with Greg/Triforce
+        // pieces/boss souls/ocarina buttons)
+        while (mainWindowItems.size() % 6) {
+            mainWindowItems.push_back(ITEM_TRACKER_ITEM(ITEM_NONE, 0, DrawItem));
+        }
+
+        // Add overworld keys
+        mainWindowItems.insert(mainWindowItems.end(), overworldKeyItems.begin(), overworldKeyItems.end());
+    }
+
     shouldUpdateVectors = false;
 }
 
@@ -1196,13 +1480,14 @@ void ItemTrackerInitFile(bool isDebug) {
 }
 
 void ItemTrackerSaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
-    SaveManager::Instance->SaveData("personalNotes", std::string(std::begin(itemTrackerNotes), std::end(itemTrackerNotes)).c_str());
+    SaveManager::Instance->SaveData("personalNotes",
+                                    std::string(std::begin(itemTrackerNotes), std::end(itemTrackerNotes)).c_str());
 }
 
 void ItemTrackerLoadFile() {
     std::string initialTrackerNotes = "";
     SaveManager::Instance->LoadData("personalNotes", initialTrackerNotes);
-    itemTrackerNotes.resize(initialTrackerNotes.length() + 1);
+    itemTrackerNotes.resize(static_cast<int>(initialTrackerNotes.length() + 1));
     if (initialTrackerNotes != "") {
         SohUtils::CopyStringToCharArray(itemTrackerNotes.Data, initialTrackerNotes.c_str(), itemTrackerNotes.size());
     } else {
@@ -1214,9 +1499,11 @@ void ItemTrackerWindow::Draw() {
     if (!IsVisible()) {
         return;
     }
+    ImGui::PushFont(OTRGlobals::Instance->fontMono);
     DrawElement();
     // Sync up the IsVisible flag if it was changed by ImGui
     SyncVisibilityConsoleVariable();
+    ImGui::PopFont();
 }
 
 void ItemTrackerWindow::DrawElement() {
@@ -1226,51 +1513,74 @@ void ItemTrackerWindow::DrawElement() {
     int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
     int comboButton1Mask = buttonMap[CVarGetInteger(CVAR_TRACKER_ITEM("ComboButton1"), TRACKER_COMBO_BUTTON_L)];
     int comboButton2Mask = buttonMap[CVarGetInteger(CVAR_TRACKER_ITEM("ComboButton2"), TRACKER_COMBO_BUTTON_R)];
-    OSContPad* buttonsPressed = std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
-    bool comboButtonsHeld = buttonsPressed != nullptr && buttonsPressed[0].button & comboButton1Mask && buttonsPressed[0].button & comboButton2Mask;
-    bool isPaused = CVarGetInteger(CVAR_TRACKER_ITEM("ShowOnlyPaused"), 0) == 0 || gPlayState != nullptr && gPlayState->pauseCtx.state > 0;
+    OSContPad* buttonsPressed =
+        std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
+    bool comboButtonsHeld = buttonsPressed != nullptr && buttonsPressed[0].button & comboButton1Mask &&
+                            buttonsPressed[0].button & comboButton2Mask;
+    bool isPaused = CVarGetInteger(CVAR_TRACKER_ITEM("ShowOnlyPaused"), 0) == 0 ||
+                    gPlayState != nullptr && gPlayState->pauseCtx.state > 0;
 
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW || isPaused && (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS ? CVarGetInteger(CVAR_WINDOW("ItemTracker"), 0) : comboButtonsHeld)) {
-        if (
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
-            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW)
-        ) {
-            BeginFloatingWindows("Item Tracker##main window");
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW ||
+        isPaused &&
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS
+                 ? CVarGetInteger(CVAR_WINDOW("ItemTracker"), 0)
+                 : comboButtonsHeld)) {
+        if ((CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+             SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) ==
+             SECTION_DISPLAY_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+             SECTION_DISPLAY_EXTENDED_MAIN_WINDOW) ||
+            (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) ==
+             SECTION_DISPLAY_MAIN_WINDOW)) {
+            BeginFloatingWindows("Item Tracker");
             DrawItemsInRows(mainWindowItems, 6);
 
-            if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_MAIN_WINDOW && CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
+            if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) ==
+                    SECTION_DISPLAY_MAIN_WINDOW &&
+                (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING &&
+                 CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) ==
+                     TRACKER_DISPLAY_ALWAYS)) {
                 DrawNotes();
             }
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Inventory"), SECTION_DISPLAY_MAIN_WINDOW) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Inventory Items Tracker");
             DrawItemsInRows(inventoryItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Equipment"), SECTION_DISPLAY_MAIN_WINDOW) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Equipment Items Tracker");
             DrawItemsInRows(equipmentItems, 3);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Misc"), SECTION_DISPLAY_MAIN_WINDOW) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Misc Items Tracker");
             DrawItemsInRows(miscItems, 4);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Dungeon Rewards Tracker");
             if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonRewardsLayout"), 0)) {
                 ImGui::BeginGroup();
@@ -1285,13 +1595,15 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Songs"), SECTION_DISPLAY_MAIN_WINDOW) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Songs Tracker");
             DrawItemsInRows(songItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Dungeon Items Tracker");
             if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonItems.Layout"), 1)) {
                 if (CVarGetInteger(CVAR_TRACKER_ITEM("DungeonItems.DisplayMaps"), 1)) {
@@ -1305,38 +1617,55 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Greg"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+            SECTION_DISPLAY_EXTENDED_SEPARATE) {
             BeginFloatingWindows("Greg Tracker");
             DrawItemsInRows(gregItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Triforce Piece Tracker");
             DrawItemsInRows(triforcePieces);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.BossSouls"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Boss Soul Tracker");
             DrawItemsInRows(bossSoulItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
             BeginFloatingWindows("Ocarina Button Tracker");
             DrawItemsInRows(ocarinaButtonItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) == SECTION_DISPLAY_EXTENDED_SEPARATE) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.OverworldKeys"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
+            BeginFloatingWindows("Overworld Key Tracker");
+            DrawItemsInRows(overworldKeyItems);
+            EndFloatingWindows();
+        }
+
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.FishingPole"), SECTION_DISPLAY_EXTENDED_HIDDEN) ==
+            SECTION_DISPLAY_EXTENDED_SEPARATE) {
             BeginFloatingWindows("Fishing Pole Tracker");
             DrawItemsInRows(fishingPoleItems);
             EndFloatingWindows();
         }
 
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE && CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
-            ImGui::SetNextWindowSize(ImVec2(400,300), ImGuiCond_FirstUseEver);
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Notes"), SECTION_DISPLAY_HIDDEN) ==
+                SECTION_DISPLAY_SEPARATE &&
+            (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW ||
+             (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING &&
+              CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) !=
+                  TRACKER_DISPLAY_COMBO_BUTTON))) {
+            ImGui::SetNextWindowSize(ImVec2(400, 300), ImGuiCond_FirstUseEver);
             BeginFloatingWindows("Personal Notes", ImGuiWindowFlags_NoFocusOnAppearing);
             DrawNotes(true);
             EndFloatingWindows();
@@ -1350,17 +1679,59 @@ void ItemTrackerWindow::DrawElement() {
             EndFloatingWindows();
         }
     }
+    if (presetLoaded) {
+        shouldUpdateVectors = true;
+        presetLoaded = false;
+    }
 }
 
-static const char* itemTrackerCapacityTrackOptions[5] = { "No Numbers", "Current Capacity", "Current Ammo", "Current Capacity / Max Capacity", "Current Ammo / Current Capacity" };
-static const char* itemTrackerKeyTrackOptions[3] = { "Collected / Max", "Current / Collected / Max", "Current / Max" };
-static const char* itemTrackerTriforcePieceTrackOptions[2] = { "Collected / Required", "Collected / Required / Max" };
-static const char* windowTypes[2] = { "Floating", "Window" };
-static const char* displayModes[2] = { "Always", "Combo Button Hold" };
-static const char* buttons[14] = { "A", "B", "C-Up", "C-Down", "C-Left", "C-Right", "L", "Z", "R", "Start", "D-Up", "D-Down", "D-Left", "D-Right" };
-static const char* displayTypes[3] = { "Hidden", "Main Window", "Separate" };
-static const char* extendedDisplayTypes[4] = { "Hidden", "Main Window", "Misc Window", "Separate" };
-static const char* minimalDisplayTypes[2] = { "Hidden", "Separate" };
+static std::unordered_map<int32_t, const char*> itemTrackerCapacityTrackOptions = {
+    { ITEM_TRACKER_NUMBER_NONE, "No Numbers" },
+    { ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY, "Current Capacity" },
+    { ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY, "Current Ammo" },
+    { ITEM_TRACKER_NUMBER_CAPACITY, "Current Capacity / Max Capacity" },
+    { ITEM_TRACKER_NUMBER_AMMO, "Current Ammo / Current Capacity" },
+};
+static std::unordered_map<int32_t, const char*> itemTrackerKeyTrackOptions = {
+    { KEYS_COLLECTED_MAX, "Collected / Max" },
+    { KEYS_CURRENT_COLLECTED_MAX, "Current / Collected / Max" },
+    { KEYS_CURRENT_MAX, "Current / Max" },
+};
+static std::unordered_map<int32_t, const char*> itemTrackerTriforcePieceTrackOptions = {
+    { TRIFORCE_PIECE_COLLECTED_REQUIRED, "Collected / Required" },
+    { TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX, "Collected / Required / Max" },
+};
+static std::unordered_map<int32_t, const char*> windowTypes = {
+    { TRACKER_WINDOW_FLOATING, "Floating" },
+    { TRACKER_WINDOW_WINDOW, "Window" },
+};
+static std::unordered_map<int32_t, const char*> displayModes = {
+    { TRACKER_DISPLAY_ALWAYS, "Always" },
+    { TRACKER_DISPLAY_COMBO_BUTTON, "Combo Button Hold" },
+};
+static std::unordered_map<int32_t, const char*> buttons = {
+    { TRACKER_COMBO_BUTTON_A, "A" },           { TRACKER_COMBO_BUTTON_B, "B" },
+    { TRACKER_COMBO_BUTTON_C_UP, "C-Up" },     { TRACKER_COMBO_BUTTON_C_DOWN, "C-Down" },
+    { TRACKER_COMBO_BUTTON_C_LEFT, "C-Left" }, { TRACKER_COMBO_BUTTON_C_RIGHT, "C-Right" },
+    { TRACKER_COMBO_BUTTON_L, "L" },           { TRACKER_COMBO_BUTTON_Z, "Z" },
+    { TRACKER_COMBO_BUTTON_R, "R" },           { TRACKER_COMBO_BUTTON_START, "Start" },
+    { TRACKER_COMBO_BUTTON_D_UP, "D-Up" },     { TRACKER_COMBO_BUTTON_D_DOWN, "D-Down" },
+    { TRACKER_COMBO_BUTTON_D_LEFT, "D-Left" }, { TRACKER_COMBO_BUTTON_D_RIGHT, "D-Right" },
+};
+static std::unordered_map<int32_t, const char*> displayTypes = {
+    { SECTION_DISPLAY_HIDDEN, "Hidden" },
+    { SECTION_DISPLAY_MAIN_WINDOW, "Main Window" },
+    { SECTION_DISPLAY_SEPARATE, "Separate" },
+};
+static std::unordered_map<int32_t, const char*> extendedDisplayTypes = {
+    { SECTION_DISPLAY_EXTENDED_HIDDEN, "Hidden" },
+    { SECTION_DISPLAY_EXTENDED_MAIN_WINDOW, "Main Window" },
+    { SECTION_DISPLAY_EXTENDED_MISC_WINDOW, "Misc Window" },
+    { SECTION_DISPLAY_EXTENDED_SEPARATE, "Separate" },
+};
+static std::unordered_map<int32_t, const char*> minimalDisplayTypes = {
+    { SECTION_DISPLAY_MINIMAL_HIDDEN, "Hidden" }, { SECTION_DISPLAY_MINIMAL_SEPARATE, "Separate" }
+};
 
 void ItemTrackerSettingsWindow::DrawElement() {
     ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, { 8.0f, 8.0f });
@@ -1370,154 +1741,257 @@ void ItemTrackerSettingsWindow::DrawElement() {
     ImGui::TableHeadersRow();
     ImGui::TableNextRow();
     ImGui::TableNextColumn();
-    ImGui::Text("BG Color");
-    ImGui::SameLine();
     ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
-    if (ImGui::ColorEdit4("BG Color##gItemTrackerBgColor", (float*)&ChromaKeyBackground, ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_NoLabel)) {
-        CVarSetFloat(CVAR_TRACKER_ITEM("BgColorR"), ChromaKeyBackground.x);
-        CVarSetFloat(CVAR_TRACKER_ITEM("BgColorG"), ChromaKeyBackground.y);
-        CVarSetFloat(CVAR_TRACKER_ITEM("BgColorB"), ChromaKeyBackground.z);
-        CVarSetFloat(CVAR_TRACKER_ITEM("BgColorA"), ChromaKeyBackground.w);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    ImGui::PopItemWidth();
+    CVarColorPicker("Background Color##gItemTrackerBgColor", CVAR_TRACKER_ITEM("BgColor"), { 0, 0, 0, 0 }, true,
+                    ColorPickerRandomButton | ColorPickerResetButton, THEME_COLOR);
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Window Type", CVAR_TRACKER_ITEM("WindowType"), windowTypes, TRACKER_WINDOW_FLOATING)) {
+    ImGui::PopItemWidth();
+    if (CVarCombobox("Window Type", CVAR_TRACKER_ITEM("WindowType"), windowTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(TRACKER_WINDOW_FLOATING)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
     if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING) {
-        if (UIWidgets::PaddedEnhancementCheckbox("Enable Dragging", CVAR_TRACKER_ITEM("Draggable"))) {
+        if (CVarCheckbox("Enable Dragging", CVAR_TRACKER_ITEM("Draggable"), CheckboxOptions().Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
-        if (UIWidgets::PaddedEnhancementCheckbox("Only enable while paused", CVAR_TRACKER_ITEM("ShowOnlyPaused"))) {
+        if (CVarCheckbox("Only enable while paused", CVAR_TRACKER_ITEM("ShowOnlyPaused"),
+                         CheckboxOptions().Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
-        if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Display Mode", CVAR_TRACKER_ITEM("DisplayType.Main"), displayModes, TRACKER_DISPLAY_ALWAYS)) {
+        if (CVarCombobox("Display Mode", CVAR_TRACKER_ITEM("DisplayType.Main"), displayModes,
+                         ComboboxOptions()
+                             .DefaultIndex(TRACKER_DISPLAY_ALWAYS)
+                             .ComponentAlignment(ComponentAlignments::Right)
+                             .LabelPosition(LabelPositions::Far)
+                             .Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_COMBO_BUTTON) {
-            if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Combo Button 1", CVAR_TRACKER_ITEM("ComboButton1"), buttons, TRACKER_COMBO_BUTTON_L)) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) ==
+            TRACKER_DISPLAY_COMBO_BUTTON) {
+            if (CVarCombobox("Combo Button 1", CVAR_TRACKER_ITEM("ComboButton1"), buttons,
+                             ComboboxOptions()
+                                 .DefaultIndex(TRACKER_COMBO_BUTTON_L)
+                                 .ComponentAlignment(ComponentAlignments::Right)
+                                 .LabelPosition(LabelPositions::Far)
+                                 .Color(THEME_COLOR))) {
                 shouldUpdateVectors = true;
             }
-            if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Combo Button 2", CVAR_TRACKER_ITEM("ComboButton2"), buttons, TRACKER_COMBO_BUTTON_R)) {
+            if (CVarCombobox("Combo Button 2", CVAR_TRACKER_ITEM("ComboButton2"), buttons,
+                             ComboboxOptions()
+                                 .DefaultIndex(TRACKER_COMBO_BUTTON_R)
+                                 .ComponentAlignment(ComponentAlignments::Right)
+                                 .LabelPosition(LabelPositions::Far)
+                                 .Color(THEME_COLOR))) {
                 shouldUpdateVectors = true;
             }
         }
     }
-    UIWidgets::PaddedSeparator();
-    UIWidgets::EnhancementSliderInt("Icon size : %dpx", "##ITEMTRACKERICONSIZE", CVAR_TRACKER_ITEM("IconSize"), 25, 128, "", 36);
-    UIWidgets::EnhancementSliderInt("Icon margins : %dpx", "##ITEMTRACKERSPACING", CVAR_TRACKER_ITEM("IconSpacing"), -5, 50, "", 12);
-    UIWidgets::EnhancementSliderInt("Text size : %dpx", "##ITEMTRACKERTEXTSIZE", CVAR_TRACKER_ITEM("TextSize"), 1, 30, "", 13);
-    
-    UIWidgets::Spacer(0);
+    ImGui::Separator();
+    CVarSliderInt("Icon size : %dpx", CVAR_TRACKER_ITEM("IconSize"),
+                  IntSliderOptions().Min(25).Max(128).DefaultValue(36).Color(THEME_COLOR));
+    CVarSliderInt("Icon margins : %dpx", CVAR_TRACKER_ITEM("IconSpacing"),
+                  IntSliderOptions().Min(-5).Max(50).DefaultValue(12).Color(THEME_COLOR));
+    CVarSliderInt("Text size : %dpx", CVAR_TRACKER_ITEM("TextSize"),
+                  IntSliderOptions().Min(1).Max(30).DefaultValue(13).Color(THEME_COLOR));
 
-    ImGui::Text("Ammo/Capacity Tracking");
-    UIWidgets::EnhancementCombobox(CVAR_TRACKER_ITEM("ItemCountType"), itemTrackerCapacityTrackOptions, ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY);
-    UIWidgets::InsertHelpHoverText("Customize what the numbers under each item are tracking."
-                                    "\n\nNote: items without capacity upgrades will track ammo even in capacity mode");
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY) == ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY || CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY) == ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY) {
-        if (UIWidgets::PaddedEnhancementCheckbox("Align count to left side", CVAR_TRACKER_ITEM("ItemCountAlignLeft"))) {
+    ImGui::NewLine();
+    CVarCombobox("Ammo/Capacity Tracking", CVAR_TRACKER_ITEM("ItemCountType"), itemTrackerCapacityTrackOptions,
+                 ComboboxOptions()
+                     .DefaultIndex(ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY)
+                     .ComponentAlignment(ComponentAlignments::Left)
+                     .LabelPosition(LabelPositions::Above)
+                     .Color(THEME_COLOR)
+                     .Tooltip("Customize what the numbers under each item are tracking."
+                              "\n\nNote: items without capacity upgrades will track ammo even in capacity mode"));
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY) ==
+            ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY ||
+        CVarGetInteger(CVAR_TRACKER_ITEM("ItemCountType"), ITEM_TRACKER_NUMBER_CURRENT_CAPACITY_ONLY) ==
+            ITEM_TRACKER_NUMBER_CURRENT_AMMO_ONLY) {
+        if (CVarCheckbox("Align count to left side", CVAR_TRACKER_ITEM("ItemCountAlignLeft"),
+                         CheckboxOptions().Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
     }
 
-    UIWidgets::Spacer(0);
+    CVarCombobox("Key Count Tracking", CVAR_TRACKER_ITEM("KeyCounts"), itemTrackerKeyTrackOptions,
+                 ComboboxOptions()
+                     .DefaultIndex(KEYS_COLLECTED_MAX)
+                     .ComponentAlignment(ComponentAlignments::Left)
+                     .LabelPosition(LabelPositions::Above)
+                     .Color(THEME_COLOR)
+                     .Tooltip("Customize what numbers are shown for key tracking."));
 
-    ImGui::Text("Key Count Tracking");
-    UIWidgets::EnhancementCombobox(CVAR_TRACKER_ITEM("KeyCounts"), itemTrackerKeyTrackOptions, KEYS_COLLECTED_MAX);
-    UIWidgets::InsertHelpHoverText("Customize what numbers are shown for key tracking.");
-
-    UIWidgets::Spacer(0);
-
-    ImGui::Text("Triforce Piece Count Tracking");
-    UIWidgets::EnhancementCombobox(CVAR_TRACKER_ITEM("TriforcePieceCounts"), itemTrackerTriforcePieceTrackOptions, TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
-    UIWidgets::InsertHelpHoverText("Customize what numbers are shown for triforce piece tracking.");
+    CVarCombobox("Triforce Piece Count Tracking", CVAR_TRACKER_ITEM("TriforcePieceCounts"),
+                 itemTrackerTriforcePieceTrackOptions,
+                 ComboboxOptions()
+                     .DefaultIndex(TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX)
+                     .ComponentAlignment(ComponentAlignments::Left)
+                     .LabelPosition(LabelPositions::Above)
+                     .Color(THEME_COLOR)
+                     .Tooltip("Customize what numbers are shown for triforce piece tracking."));
 
     ImGui::TableNextColumn();
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Inventory", CVAR_TRACKER_ITEM("DisplayType.Inventory"), displayTypes, SECTION_DISPLAY_MAIN_WINDOW)) {
+    if (CVarCombobox("Inventory", CVAR_TRACKER_ITEM("DisplayType.Inventory"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MAIN_WINDOW)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Equipment", CVAR_TRACKER_ITEM("DisplayType.Equipment"), displayTypes, SECTION_DISPLAY_MAIN_WINDOW)) {
+    if (CVarCombobox("Equipment", CVAR_TRACKER_ITEM("DisplayType.Equipment"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MAIN_WINDOW)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Misc", CVAR_TRACKER_ITEM("DisplayType.Misc"), displayTypes, SECTION_DISPLAY_MAIN_WINDOW)) {
+    if (CVarCombobox("Misc", CVAR_TRACKER_ITEM("DisplayType.Misc"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MAIN_WINDOW)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Dungeon Rewards", CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), displayTypes, SECTION_DISPLAY_MAIN_WINDOW)) {
+    if (CVarCombobox("Dungeon Rewards", CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MAIN_WINDOW)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) == SECTION_DISPLAY_SEPARATE) {
-        if (UIWidgets::PaddedEnhancementCheckbox("Circle display", CVAR_TRACKER_ITEM("DungeonRewardsLayout"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, false)) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonRewards"), SECTION_DISPLAY_MAIN_WINDOW) ==
+        SECTION_DISPLAY_SEPARATE) {
+        if (CVarCheckbox("Circle display", CVAR_TRACKER_ITEM("DungeonRewardsLayout"),
+                         CheckboxOptions().DefaultValue(false).Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Songs", CVAR_TRACKER_ITEM("DisplayType.Songs"), displayTypes, SECTION_DISPLAY_MAIN_WINDOW)) {
+    if (CVarCombobox("Songs", CVAR_TRACKER_ITEM("DisplayType.Songs"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MAIN_WINDOW)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Dungeon Items", CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (CVarCombobox("Dungeon Items", CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) != SECTION_DISPLAY_HIDDEN) {
-        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) == SECTION_DISPLAY_SEPARATE) {
-            if (UIWidgets::PaddedEnhancementCheckbox("Horizontal display", CVAR_TRACKER_ITEM("DungeonItems.Layout"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true)) {
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) !=
+        SECTION_DISPLAY_HIDDEN) {
+        if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.DungeonItems"), SECTION_DISPLAY_HIDDEN) ==
+            SECTION_DISPLAY_SEPARATE) {
+            if (CVarCheckbox("Horizontal display", CVAR_TRACKER_ITEM("DungeonItems.Layout"),
+                             CheckboxOptions().DefaultValue(true).Color(THEME_COLOR))) {
                 shouldUpdateVectors = true;
             }
         }
-        if (UIWidgets::PaddedEnhancementCheckbox("Maps and compasses", CVAR_TRACKER_ITEM("DungeonItems.DisplayMaps"), true, true, false, "", UIWidgets::CheckboxGraphics::Cross, true)) {
+        if (CVarCheckbox("Maps and compasses", CVAR_TRACKER_ITEM("DungeonItems.DisplayMaps"),
+                         CheckboxOptions().DefaultValue(true).Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
     }
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Greg", CVAR_TRACKER_ITEM("DisplayType.Greg"), extendedDisplayTypes, SECTION_DISPLAY_EXTENDED_HIDDEN)) {
+    if (CVarCombobox("Greg", CVAR_TRACKER_ITEM("DisplayType.Greg"), extendedDisplayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_EXTENDED_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Triforce Pieces", CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (CVarCombobox("Triforce Pieces", CVAR_TRACKER_ITEM("DisplayType.TriforcePieces"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Boss Souls", CVAR_TRACKER_ITEM("DisplayType.BossSouls"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (CVarCombobox("Boss Souls", CVAR_TRACKER_ITEM("DisplayType.BossSouls"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Ocarina Buttons", CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (CVarCombobox("Ocarina Buttons", CVAR_TRACKER_ITEM("DisplayType.OcarinaButtons"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Fishing Pole", CVAR_TRACKER_ITEM("DisplayType.FishingPole"), extendedDisplayTypes, SECTION_DISPLAY_EXTENDED_HIDDEN)) {
+    if (CVarCombobox("Overworld Keys", CVAR_TRACKER_ITEM("DisplayType.OverworldKeys"), displayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Total Checks", "gTrackers.ItemTracker.TotalChecks.DisplayType", minimalDisplayTypes, SECTION_DISPLAY_MINIMAL_HIDDEN)) {
+    if (CVarCombobox("Fishing Pole", CVAR_TRACKER_ITEM("DisplayType.FishingPole"), extendedDisplayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_EXTENDED_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
         shouldUpdateVectors = true;
     }
 
-    if (CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) == TRACKER_DISPLAY_ALWAYS) {
-        if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Personal notes", CVAR_TRACKER_ITEM("DisplayType.Notes"), displayTypes, SECTION_DISPLAY_HIDDEN)) {
+    if (CVarCombobox("Total Checks", "gTrackers.ItemTracker.TotalChecks.DisplayType", minimalDisplayTypes,
+                     ComboboxOptions()
+                         .DefaultIndex(SECTION_DISPLAY_MINIMAL_HIDDEN)
+                         .ComponentAlignment(ComponentAlignments::Right)
+                         .LabelPosition(LabelPositions::Far)
+                         .Color(THEME_COLOR))) {
+        shouldUpdateVectors = true;
+    }
+
+    if (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_WINDOW ||
+        (CVarGetInteger(CVAR_TRACKER_ITEM("WindowType"), TRACKER_WINDOW_FLOATING) == TRACKER_WINDOW_FLOATING &&
+         CVarGetInteger(CVAR_TRACKER_ITEM("DisplayType.Main"), TRACKER_DISPLAY_ALWAYS) !=
+             TRACKER_DISPLAY_COMBO_BUTTON)) {
+        if (CVarCombobox("Personal notes", CVAR_TRACKER_ITEM("DisplayType.Notes"), displayTypes,
+                         ComboboxOptions()
+                             .DefaultIndex(SECTION_DISPLAY_HIDDEN)
+                             .ComponentAlignment(ComponentAlignments::Right)
+                             .LabelPosition(LabelPositions::Far)
+                             .Color(THEME_COLOR))) {
             shouldUpdateVectors = true;
         }
     }
-    UIWidgets::EnhancementCheckbox("Show Hookshot Identifiers", CVAR_TRACKER_ITEM("HookshotIdentifier"));
-    UIWidgets::InsertHelpHoverText("Shows an 'H' or an 'L' to more easiely distinguish between Hookshot and Longshot.");
-
-    UIWidgets::Spacer(0);
+    CVarCheckbox("Show Hookshot Identifiers", CVAR_TRACKER_ITEM("HookshotIdentifier"),
+                 CheckboxOptions()
+                     .Tooltip("Shows an 'H' or an 'L' to more easiely distinguish between Hookshot and Longshot.")
+                     .Color(THEME_COLOR));
 
     ImGui::PopStyleVar(1);
     ImGui::EndTable();
 }
 
 void ItemTrackerWindow::InitElement() {
-    float trackerBgR = CVarGetFloat(CVAR_TRACKER_ITEM("BgColorR"), 0);
-    float trackerBgG = CVarGetFloat(CVAR_TRACKER_ITEM("BgColorG"), 0);
-    float trackerBgB = CVarGetFloat(CVAR_TRACKER_ITEM("BgColorB"), 0);
-    float trackerBgA = CVarGetFloat(CVAR_TRACKER_ITEM("BgColorA"), 1);
-    ChromaKeyBackground = {
-        trackerBgR,
-        trackerBgG,
-        trackerBgB,
-        trackerBgA
-    }; // Float value, 1 = 255 in rgb value.
     // Crashes when the itemTrackerNotes is empty, so add an empty character to it
     if (itemTrackerNotes.empty()) {
         itemTrackerNotes.push_back(0);
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
index 5405b1ea2a..85a2b63a03 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
@@ -19,38 +19,51 @@ bool HasSong(ItemTrackerItem);
 bool HasQuestItem(ItemTrackerItem);
 bool HasEquipment(ItemTrackerItem);
 
-#define ITEM_TRACKER_ITEM(id, data, drawFunc)     \
-    {                                             \
-        id, #id, #id "_Faded", data, drawFunc     \
-    }
+#define ITEM_TRACKER_ITEM(id, data, drawFunc) \
+    { id, #id, #id "_Faded", data, drawFunc }
 
-#define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc)\
-    {                                                                \
-        id, #name, #nameFaded "_Faded", data, drawFunc               \
-    }
+#define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc) \
+    { id, #name, #nameFaded "_Faded", data, drawFunc }
+
+static std::vector<const char*> itemTrackerWindowIDs = { "Item Tracker",
+                                                         "Inventory Items Tracker",
+                                                         "Equipment Items Tracker",
+                                                         "Misc Items Tracker",
+                                                         "Dungeon Rewards Tracker",
+                                                         "Songs Tracker",
+                                                         "Dungeon Items Tracker",
+                                                         "Greg Tracker",
+                                                         "Triforce Piece Tracker",
+                                                         "Boss Soul Tracker",
+                                                         "Ocarina Button Tracker",
+                                                         "Overworld Key Tracker",
+                                                         "Fishing Pole Tracker",
+                                                         "Personal Notes",
+                                                         "Total Checks" };
+void ItemTracker_LoadFromPreset(nlohmann::json trackerInfo);
 
 typedef struct ItemTrackerDungeon {
     uint32_t id;
     std::vector<uint32_t> items;
 } ItemTrackerDungeon;
 
-class ItemTrackerSettingsWindow : public Ship::GuiWindow {
+class ItemTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
   protected:
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 
-class ItemTrackerWindow : public Ship::GuiWindow {
+class ItemTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;
 
-protected:
+  protected:
     void InitElement() override;
     void DrawElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer_settings_window.h b/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
index 9f297c29db..87d830e387 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_settings_window.h
@@ -1,16 +1,19 @@
+#pragma once
+
 #include <libultraship/libultraship.h>
 
 namespace Rando {
 class Settings;
 }
 
-class RandomizerSettingsWindow : public Ship::GuiWindow {
+class RandomizerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
     void InitElement() override;
     void DrawElement() override;
     void UpdateElement() override;
+    void SetNeedsUpdate();
 
   private:
     bool mNeedsUpdate = false;
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index fba7c688b4..05a10a2b35 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -22,7 +22,7 @@ void StartingItemGive(GetItemEntry getItemEntry, RandomizerCheck randomizerCheck
         if (getItemEntry.getItemId == GI_SWORD_BGS) {
             gSaveContext.bgsFlag = true;
         }
-        Item_Give(NULL, getItemEntry.itemId);
+        Item_Give(NULL, static_cast<uint8_t>(getItemEntry.itemId));
     } else if (getItemEntry.modIndex == MOD_RANDOMIZER) {
         if (getItemEntry.getItemId == RG_ICE_TRAP) {
             gSaveContext.ship.pendingIceTrapCount++;
@@ -32,9 +32,9 @@ void StartingItemGive(GetItemEntry getItemEntry, RandomizerCheck randomizerCheck
     }
 }
 
-// RANDOTODO replace most of these GiveLink functions with calls to
+// RANDOTODO: Replace most of these GiveLink functions with calls to
 // Item_Give in z_parameter, we'll need to update Item_Give to ensure
-// nothing breaks when calling it without a valid play first
+// nothing breaks when calling it without a valid play first.
 void GiveLinkRupees(int numOfRupees) {
     int maxRupeeCount = 0;
     if (CUR_UPG_VALUE(UPG_WALLET) == 0) {
@@ -101,13 +101,13 @@ void GiveLinksPocketItem() {
     if (Randomizer_GetSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING) {
         GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LINKS_POCKET, (GetItemID)RG_NONE);
         StartingItemGive(getItemEntry, RC_LINKS_POCKET);
-        // If we re-add the above, we'll get the item on save creation, now it's given on first load
+        // If we re-add the above, we'll get the item on save creation, now it's given on first load.
         Flags_SetRandomizerInf(RAND_INF_LINKS_POCKET);
     }
 }
 
-
 void SetStartingItems() {
+    int startingAge = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SELECTED_STARTING_AGE).Get();
     if (Randomizer_GetSettingValue(RSK_STARTING_KOKIRI_SWORD))
         Item_Give(NULL, ITEM_SWORD_KOKIRI);
     if (Randomizer_GetSettingValue(RSK_STARTING_DEKU_SHIELD))
@@ -159,6 +159,13 @@ void SetStartingItems() {
     if (Randomizer_GetSettingValue(RSK_STARTING_NUTS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
         GiveLinkDekuNuts(20);
     }
+    if (Randomizer_GetSettingValue(RSK_STARTING_MASTER_SWORD)) {
+        if (startingAge == RO_AGE_ADULT) {
+            Item_Give(NULL, ITEM_SWORD_MASTER);
+        } else {
+            gSaveContext.inventory.equipment |= 1 << 1;
+        }
+    }
 
     if (Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
         GiveLinkRupees(9001);
@@ -174,40 +181,40 @@ void SetStartingItems() {
     }
 
     if (Randomizer_GetSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
-        gSaveContext.inventory.dungeonKeys[SCENE_FOREST_TEMPLE] = FOREST_TEMPLE_SMALL_KEY_MAX;                    // Forest
-        gSaveContext.ship.stats.dungeonKeys[SCENE_FOREST_TEMPLE] = FOREST_TEMPLE_SMALL_KEY_MAX;                   // Forest
-        gSaveContext.inventory.dungeonKeys[SCENE_FIRE_TEMPLE] = FIRE_TEMPLE_SMALL_KEY_MAX;                        // Fire
-        gSaveContext.ship.stats.dungeonKeys[SCENE_FIRE_TEMPLE] = FIRE_TEMPLE_SMALL_KEY_MAX;                       // Fire
-        gSaveContext.inventory.dungeonKeys[SCENE_WATER_TEMPLE] = WATER_TEMPLE_SMALL_KEY_MAX;                      // Water
-        gSaveContext.ship.stats.dungeonKeys[SCENE_WATER_TEMPLE] = WATER_TEMPLE_SMALL_KEY_MAX;                     // Water
-        gSaveContext.inventory.dungeonKeys[SCENE_SPIRIT_TEMPLE] = SPIRIT_TEMPLE_SMALL_KEY_MAX;                    // Spirit
-        gSaveContext.ship.stats.dungeonKeys[SCENE_SPIRIT_TEMPLE] = SPIRIT_TEMPLE_SMALL_KEY_MAX;                   // Spirit
-        gSaveContext.inventory.dungeonKeys[SCENE_SHADOW_TEMPLE] = SHADOW_TEMPLE_SMALL_KEY_MAX;                    // Shadow
-        gSaveContext.ship.stats.dungeonKeys[SCENE_SHADOW_TEMPLE] = SHADOW_TEMPLE_SMALL_KEY_MAX;                   // Shadow
-        gSaveContext.inventory.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] = BOTTOM_OF_THE_WELL_SMALL_KEY_MAX;          // BotW
-        gSaveContext.ship.stats.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] = BOTTOM_OF_THE_WELL_SMALL_KEY_MAX;         // BotW
+        gSaveContext.inventory.dungeonKeys[SCENE_FOREST_TEMPLE] = FOREST_TEMPLE_SMALL_KEY_MAX;            // Forest
+        gSaveContext.ship.stats.dungeonKeys[SCENE_FOREST_TEMPLE] = FOREST_TEMPLE_SMALL_KEY_MAX;           // Forest
+        gSaveContext.inventory.dungeonKeys[SCENE_FIRE_TEMPLE] = FIRE_TEMPLE_SMALL_KEY_MAX;                // Fire
+        gSaveContext.ship.stats.dungeonKeys[SCENE_FIRE_TEMPLE] = FIRE_TEMPLE_SMALL_KEY_MAX;               // Fire
+        gSaveContext.inventory.dungeonKeys[SCENE_WATER_TEMPLE] = WATER_TEMPLE_SMALL_KEY_MAX;              // Water
+        gSaveContext.ship.stats.dungeonKeys[SCENE_WATER_TEMPLE] = WATER_TEMPLE_SMALL_KEY_MAX;             // Water
+        gSaveContext.inventory.dungeonKeys[SCENE_SPIRIT_TEMPLE] = SPIRIT_TEMPLE_SMALL_KEY_MAX;            // Spirit
+        gSaveContext.ship.stats.dungeonKeys[SCENE_SPIRIT_TEMPLE] = SPIRIT_TEMPLE_SMALL_KEY_MAX;           // Spirit
+        gSaveContext.inventory.dungeonKeys[SCENE_SHADOW_TEMPLE] = SHADOW_TEMPLE_SMALL_KEY_MAX;            // Shadow
+        gSaveContext.ship.stats.dungeonKeys[SCENE_SHADOW_TEMPLE] = SHADOW_TEMPLE_SMALL_KEY_MAX;           // Shadow
+        gSaveContext.inventory.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] = BOTTOM_OF_THE_WELL_SMALL_KEY_MAX;  // BotW
+        gSaveContext.ship.stats.dungeonKeys[SCENE_BOTTOM_OF_THE_WELL] = BOTTOM_OF_THE_WELL_SMALL_KEY_MAX; // BotW
         gSaveContext.inventory.dungeonKeys[SCENE_GERUDO_TRAINING_GROUND] = GERUDO_TRAINING_GROUND_SMALL_KEY_MAX;  // GTG
         gSaveContext.ship.stats.dungeonKeys[SCENE_GERUDO_TRAINING_GROUND] = GERUDO_TRAINING_GROUND_SMALL_KEY_MAX; // GTG
-        gSaveContext.inventory.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] = GANONS_CASTLE_SMALL_KEY_MAX;             // Ganon
-        gSaveContext.ship.stats.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] = GANONS_CASTLE_SMALL_KEY_MAX;            // Ganon
+        gSaveContext.inventory.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] = GANONS_CASTLE_SMALL_KEY_MAX;  // Ganon
+        gSaveContext.ship.stats.dungeonKeys[SCENE_INSIDE_GANONS_CASTLE] = GANONS_CASTLE_SMALL_KEY_MAX; // Ganon
     } else if (Randomizer_GetSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_VANILLA) {
         // Logic cannot handle vanilla key layout in some dungeons
         // this is because vanilla expects the dungeon major item to be
         // locked behind the keys, which is not always true in rando.
-        // We can resolve this by starting with some extra keys
+        // We can resolve this by starting with some extra keys.
         if (ResourceMgr_IsSceneMasterQuest(SCENE_SPIRIT_TEMPLE)) {
-            // MQ Spirit needs 3 keys
+            // MQ Spirit needs 3 keys.
             gSaveContext.inventory.dungeonKeys[SCENE_SPIRIT_TEMPLE] = 3;
             gSaveContext.ship.stats.dungeonKeys[SCENE_SPIRIT_TEMPLE] = 3;
         }
     }
 
     if (Randomizer_GetSettingValue(RSK_BOSS_KEYSANITY) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
-        gSaveContext.inventory.dungeonItems[SCENE_FOREST_TEMPLE] |= 1;    // Forest
-        gSaveContext.inventory.dungeonItems[SCENE_FIRE_TEMPLE] |= 1;     // Fire
-        gSaveContext.inventory.dungeonItems[SCENE_WATER_TEMPLE] |= 1;   // Water
+        gSaveContext.inventory.dungeonItems[SCENE_FOREST_TEMPLE] |= 1; // Forest
+        gSaveContext.inventory.dungeonItems[SCENE_FIRE_TEMPLE] |= 1;   // Fire
+        gSaveContext.inventory.dungeonItems[SCENE_WATER_TEMPLE] |= 1;  // Water
         gSaveContext.inventory.dungeonItems[SCENE_SPIRIT_TEMPLE] |= 1; // Spirit
-        gSaveContext.inventory.dungeonItems[SCENE_SHADOW_TEMPLE] |= 1;   // Shadow
+        gSaveContext.inventory.dungeonItems[SCENE_SHADOW_TEMPLE] |= 1; // Shadow
     }
 
     if (Randomizer_GetSettingValue(RSK_GANONS_BOSS_KEY) == RO_GANON_BOSS_KEY_STARTWITH) {
@@ -222,10 +229,12 @@ extern "C" void Randomizer_InitSaveFile() {
     // Starts pending ice traps out at 0 before potentially incrementing them down the line.
     gSaveContext.ship.pendingIceTrapCount = 0;
 
-    // Reset triforce pieces collected
+    // Reset triforce pieces collected.
     gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected = 0;
 
-    // Set Cutscene flags and texts to skip them
+    SetStartingItems();
+
+    // Set Cutscene flags and texts to skip them.
     Flags_SetEventChkInf(EVENTCHKINF_FIRST_SPOKE_TO_MIDO);
     Flags_SetInfTable(INFTABLE_SPOKE_TO_KAEPORA_IN_LAKE_HYLIA);
     Flags_SetEventChkInf(EVENTCHKINF_SHEIK_SPAWNED_AT_MASTER_SWORD_PEDESTAL);
@@ -234,7 +243,7 @@ extern "C" void Randomizer_InitSaveFile() {
     Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO);
     Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_NABOORU_IN_SPIRIT_TEMPLE);
 
-    // Go away ruto (water temple first cutscene)
+    // Go away Ruto (Water Temple first cutscene).
     gSaveContext.sceneFlags[SCENE_WATER_TEMPLE].swch |= (1 << 0x10);
 
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_OCARINA_BUTTONS) == RO_GENERIC_OFF) {
@@ -260,11 +269,11 @@ extern "C" void Randomizer_InitSaveFile() {
     // Give Link's pocket item
     GiveLinksPocketItem();
 
-    // remove One Time scrubs with scrubsanity off
+    // Remove One Time Scrubs with Scrubsanity off
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_SCRUBS) == RO_SCRUBS_OFF) {
-        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE);
-        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_GROTTO_FRONT);
-        Flags_SetRandomizerInf(RAND_INF_SCRUBS_PURCHASED_HF_DEKU_SCRUB_GROTTO);
+        Flags_SetItemGetInf(ITEMGETINF_DEKU_SCRUB_HEART_PIECE);
+        Flags_SetInfTable(INFTABLE_BOUGHT_STICK_UPGRADE);
+        Flags_SetInfTable(INFTABLE_BOUGHT_NUT_UPGRADE);
     }
 
     int startingAge = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SELECTED_STARTING_AGE).Get();
@@ -272,7 +281,7 @@ extern "C" void Randomizer_InitSaveFile() {
         case RO_AGE_ADULT: // Adult
             gSaveContext.linkAge = LINK_AGE_ADULT;
             gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_WARP_PAD;
-            gSaveContext.savedSceneNum = SCENE_LON_LON_RANCH; // Set scene num manually to ToT
+            gSaveContext.savedSceneNum = SCENE_LON_LON_RANCH; // Set scene num manually to ToT.
             break;
         case RO_AGE_CHILD: // Child
             gSaveContext.linkAge = LINK_AGE_CHILD;
@@ -284,17 +293,13 @@ extern "C" void Randomizer_InitSaveFile() {
 
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS)) {
         // Override the spawn entrance so entrance rando can take control,
-        // and to prevent remember save location from breaking inital spawn
+        // and to prevent remember save location from breaking initial spawn.
         gSaveContext.entranceIndex = -1;
     }
 
-    for (auto trialFlag : { EVENTCHKINF_COMPLETED_LIGHT_TRIAL,
-                        EVENTCHKINF_COMPLETED_FOREST_TRIAL,
-                        EVENTCHKINF_COMPLETED_FIRE_TRIAL,
-                        EVENTCHKINF_COMPLETED_WATER_TRIAL,
-                        EVENTCHKINF_COMPLETED_SPIRIT_TRIAL,
-                        EVENTCHKINF_COMPLETED_SHADOW_TRIAL }
-    ) {
+    for (auto trialFlag : { EVENTCHKINF_COMPLETED_LIGHT_TRIAL, EVENTCHKINF_COMPLETED_FOREST_TRIAL,
+                            EVENTCHKINF_COMPLETED_FIRE_TRIAL, EVENTCHKINF_COMPLETED_WATER_TRIAL,
+                            EVENTCHKINF_COMPLETED_SPIRIT_TRIAL, EVENTCHKINF_COMPLETED_SHADOW_TRIAL }) {
         if (!OTRGlobals::Instance->gRandomizer->IsTrialRequired(trialFlag)) {
             Flags_SetEventChkInf(trialFlag);
         }
@@ -304,24 +309,25 @@ extern "C" void Randomizer_InitSaveFile() {
         GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_SONG_FROM_IMPA, (GetItemID)RG_ZELDAS_LULLABY);
         StartingItemGive(getItemEntry, RC_SONG_FROM_IMPA);
 
-        // malon/talon back at ranch
+        // Malon/Talon back at ranch.
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
+        Flags_SetRandomizerInf(RAND_INF_WEIRD_EGG);
         Flags_SetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_CASTLE);
         Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE);
 
         // Set "Got Zelda's Letter" flag. Also ensures Saria is back at SFM.
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER);
+        Flags_SetRandomizerInf(RAND_INF_ZELDAS_LETTER);
         Flags_SetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
 
-        // Got item from impa
+        // Got item from Impa.
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY);
 
-        gSaveContext.sceneFlags[SCENE_HYRULE_CASTLE].swch |= (1 << 0x4); // move milk crates in hyrule castle to moat
+        gSaveContext.sceneFlags[SCENE_HYRULE_CASTLE].swch |= (1 << 0x4); // Move milk crates in Hyrule Castle to moat.
 
-        // set this at the end to ensure we always start with the letter
-        // this is for the off chance we got the weird egg from impa (which should never happen)
+        // Set this at the end to ensure we always start with the letter.
+        // This is for the off chance, we got the Weird Egg from Impa (which should never happen).
         INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_LETTER_ZELDA;
-        Flags_SetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
     }
 
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && startingAge == RO_AGE_ADULT) {
@@ -330,14 +336,14 @@ extern "C" void Randomizer_InitSaveFile() {
         Flags_SetRandomizerInf(RAND_INF_TOT_MASTER_SWORD);
     }
 
-    HIGH_SCORE(HS_POE_POINTS) = 1000 - (100 * (Randomizer_GetSettingValue(RSK_BIG_POE_COUNT) + 1));
+    HIGH_SCORE(HS_POE_POINTS) = 1000 - (100 * Randomizer_GetSettingValue(RSK_BIG_POE_COUNT));
 
     if (Randomizer_GetSettingValue(RSK_SKIP_EPONA_RACE)) {
         Flags_SetEventChkInf(EVENTCHKINF_EPONA_OBTAINED);
     }
 
-    // Open lowest Vanilla Fire Temple locked door (to prevent key logic lockouts)
-    // Not done on keysanity since this lockout is a non issue when Fire keys can be found outside the temple
+    // Open lowest Vanilla Fire Temple locked door (to prevent key logic lockouts).
+    // Not done on Keysanity since this lockout is a non-issue when Fire Keys can be found outside the temple.
     u8 keysanity = Randomizer_GetSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANYWHERE ||
                    Randomizer_GetSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_OVERWORLD ||
                    Randomizer_GetSettingValue(RSK_KEYSANITY) == RO_DUNGEON_ITEM_LOC_ANY_DUNGEON;
@@ -345,14 +351,14 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.sceneFlags[SCENE_FIRE_TEMPLE].swch |= (1 << 0x17);
     }
 
-    // Opens locked Water Temple door in vanilla to prevent softlocks
-    // West door on the middle level that leads to the water raising thing
-    // Happens in 3DS rando and N64 rando as well
+    // Opens locked Water Temple door in vanilla to prevent softlocks.
+    // West door on the middle level that leads to the water raising thing.
+    // Happens in 3DS rando and N64 rando as well.
     if (!ResourceMgr_IsSceneMasterQuest(SCENE_WATER_TEMPLE)) {
         gSaveContext.sceneFlags[SCENE_WATER_TEMPLE].swch |= (1 << 0x15);
     }
 
-    // Now handled on the fly
+    // Now handled on the fly.
     // int openForest = Randomizer_GetSettingValue(RSK_FOREST);
     // switch (openForest) {
     //     case RO_CLOSED_FOREST_OFF:
@@ -423,9 +429,7 @@ extern "C" void Randomizer_InitSaveFile() {
         gSaveContext.itemGetInf[3] |= 0x100;  // Sold Keaton Mask
         gSaveContext.itemGetInf[3] |= 0x200;  // Sold Skull Mask
         gSaveContext.itemGetInf[3] |= 0x400;  // Sold Spooky Mask
-        gSaveContext.itemGetInf[3] |= 0x800;  // bunny hood related
+        gSaveContext.itemGetInf[3] |= 0x800;  // Bunny Hood related
         gSaveContext.itemGetInf[3] |= 0x8000; // Obtained Mask of Truth
     }
-
-    SetStartingItems();
 }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index cf1acdd7fa..52add036e9 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -13,7 +13,8 @@
 namespace Rando {
 std::shared_ptr<Settings> Settings::mInstance;
 
-std::vector<std::string> NumOpts(const int min, const int max, const int step = 1, const std::string& textBefore = {}, const std::string& textAfter = {}) {
+std::vector<std::string> NumOpts(const int min, const int max, const int step = 1, const std::string& textBefore = {},
+                                 const std::string& textAfter = {}) {
     std::vector<std::string> options;
     options.reserve((max - min) / step + 1);
     for (int i = min; i <= max; i += step) {
@@ -23,8 +24,8 @@ std::vector<std::string> NumOpts(const int min, const int max, const int step =
 }
 
 std::vector<std::string> MultiVecOpts(const std::vector<std::vector<std::string>>& optionsVector) {
-    uint32_t totalSize = 0;
-    for (const auto& vector: optionsVector) {
+    size_t totalSize = 0;
+    for (const auto& vector : optionsVector) {
         totalSize += vector.size();
     }
     std::vector<std::string> options;
@@ -37,11 +38,11 @@ std::vector<std::string> MultiVecOpts(const std::vector<std::vector<std::string>
     return options;
 }
 
-void Settings::HandleShopsanityPriceUI(){
+void Settings::HandleShopsanityPriceUI() {
     bool isTycoon = CVarGetInteger(CVAR_RANDOMIZER_SETTING("IncludeTycoonWallet"), RO_GENERIC_OFF);
     mOptions[RSK_SHOPSANITY].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
     mOptions[RSK_SHOPSANITY_PRICES].Unhide();
-    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_VANILLA)){
+    switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), RO_PRICE_VANILLA)) {
         case RO_PRICE_FIXED:
             mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].Unhide();
             mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].Hide();
@@ -51,7 +52,8 @@ void Settings::HandleShopsanityPriceUI(){
             mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 501
+                         : mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
                 mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
             }
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Hide();
@@ -65,9 +67,12 @@ void Settings::HandleShopsanityPriceUI(){
             mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Hide();
             mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 200) {
-                mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
-                mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+            if (isTycoon ? mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 101
+                         : mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].GetOptionCount() == 200) {
+                mOptions[RSK_SHOPSANITY_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                               : NumOpts(0, 500, 5));
+                mOptions[RSK_SHOPSANITY_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                               : NumOpts(0, 500, 5));
             }
             mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE].Unhide();
             break;
@@ -79,7 +84,7 @@ void Settings::HandleShopsanityPriceUI(){
             mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT].Unhide();
             mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT].Unhide();
             mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT].Unhide();
-            if (isTycoon){
+            if (isTycoon) {
                 mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
             } else {
                 mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT].Hide();
@@ -172,7 +177,7 @@ void Settings::CreateOptions() {
     OPT_U8(RSK_MQ_GANONS_CASTLE, "Ganon's Castle Quest", {"Vanilla", "Master Quest", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MQDungeonsGanonsCastle"), "", WidgetType::Combobox, RO_MQ_SET_VANILLA);
     OPT_U8(RSK_SHUFFLE_DUNGEON_REWARDS, "Shuffle Dungeon Rewards", {"Vanilla", "End of Dungeons", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS], WidgetType::Combobox, RO_DUNGEON_REWARDS_END_OF_DUNGEON);
     OPT_U8(RSK_LINKS_POCKET, "Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LinksPocket"), "", WidgetType::Combobox, RO_LINKS_POCKET_DUNGEON_REWARD);
-    OPT_U8(RSK_SHUFFLE_SONGS, "Shuffle Songs", {"Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSongs"), mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
+    OPT_U8(RSK_SHUFFLE_SONGS, "Shuffle Songs", {"Off", "Song Locations", "Dungeon Rewards", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSongs"), mOptionDescriptions[RSK_SHUFFLE_SONGS], WidgetType::Combobox, RO_SONG_SHUFFLE_SONG_LOCATIONS);
     OPT_U8(RSK_SHOPSANITY, "Shop Shuffle", {"Off", "Specific Count", "Random"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Shopsanity"), mOptionDescriptions[RSK_SHOPSANITY], WidgetType::Combobox, RO_SHOPSANITY_OFF);
     OPT_U8(RSK_SHOPSANITY_COUNT, "Shops Item Count", {NumOpts(0, 7/*8*/)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityCount"), mOptionDescriptions[RSK_SHOPSANITY_COUNT], WidgetType::Slider, 0, false, IMFLAG_NONE);
     OPT_U8(RSK_SHOPSANITY_PRICES, "Shops Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShopsanityPrices"), mOptionDescriptions[RSK_SHOPSANITY_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
@@ -209,6 +214,8 @@ void Settings::CreateOptions() {
     OPT_BOOL(RSK_SHUFFLE_WEIRD_EGG, "Shuffle Weird Egg", CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
     OPT_BOOL(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD, "Shuffle Gerudo Membership Card", CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
     OPT_U8(RSK_SHUFFLE_POTS, "Shuffle Pots", {"Off", "Dungeons", "Overworld", "All Pots"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShufflePots"), mOptionDescriptions[RSK_SHUFFLE_POTS], WidgetType::Combobox, RO_SHUFFLE_POTS_OFF);
+    OPT_U8(RSK_SHUFFLE_GRASS, "Shuffle Grass", {"Off", "Dungeons", "Overworld", "All Grass/Bushes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGrass"), mOptionDescriptions[RSK_SHUFFLE_GRASS], WidgetType::Combobox, RO_SHUFFLE_GRASS_OFF);
+    OPT_U8(RSK_SHUFFLE_CRATES, "Shuffle Crates", {"Off", "Dungeons", "Overworld", "All Crates"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleCrates"), mOptionDescriptions[RSK_SHUFFLE_CRATES], WidgetType::Combobox, RO_SHUFFLE_CRATES_OFF);
     OPT_BOOL(RSK_SHUFFLE_FISHING_POLE, "Shuffle Fishing Pole", CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"), mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
     OPT_U8(RSK_SHUFFLE_MERCHANTS, "Shuffle Merchants", {"Off", "Bean Merchant Only", "All But Beans", "All"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF, IMFLAG_NONE);
     OPT_U8(RSK_MERCHANT_PRICES, "Merchant Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantPrices"), mOptionDescriptions[RSK_MERCHANT_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
@@ -237,32 +244,31 @@ void Settings::CreateOptions() {
     OPT_U8(RSK_KEYSANITY, "Small Key Shuffle", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Keysanity"), mOptionDescriptions[RSK_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
     OPT_U8(RSK_GERUDO_KEYS, "Gerudo Fortress Keys", {"Vanilla", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GerudoKeys"), mOptionDescriptions[RSK_GERUDO_KEYS], WidgetType::Combobox, RO_GERUDO_KEYS_VANILLA);
     OPT_U8(RSK_BOSS_KEYSANITY, "Boss Key Shuffle", {"Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BossKeysanity"), mOptionDescriptions[RSK_BOSS_KEYSANITY], WidgetType::Combobox, RO_DUNGEON_ITEM_LOC_OWN_DUNGEON);
-    OPT_U8(RSK_GANONS_BOSS_KEY, "Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "100 GS Reward", "Triforce Hunt"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
+    OPT_U8(RSK_GANONS_BOSS_KEY, "Ganon's Boss Key", {"Vanilla", "Own Dungeon", "Start With", "Any Dungeon", "Overworld", "Anywhere", "LACS-Vanilla", "LACS-Stones", "LACS-Medallions", "LACS-Rewards", "LACS-Dungeons", "LACS-Tokens", "100 GS Reward"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), mOptionDescriptions[RSK_GANONS_BOSS_KEY], WidgetType::Combobox, RO_GANON_BOSS_KEY_VANILLA);
     OPT_U8(RSK_LACS_STONE_COUNT, "GCBK Stone Count", {NumOpts(0, 4)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsStoneCount"), "", WidgetType::Slider, 3, true);
     OPT_U8(RSK_LACS_MEDALLION_COUNT, "GCBK Medallion Count", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsMedallionCount"), "", WidgetType::Slider, 6, true);
     OPT_U8(RSK_LACS_REWARD_COUNT, "GCBK Reward Count", {NumOpts(0, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardCount"), "", WidgetType::Slider, 9, true);
     OPT_U8(RSK_LACS_DUNGEON_COUNT, "GCBK Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsDungeonCount"), "", WidgetType::Slider, 8, true);
     OPT_U8(RSK_LACS_TOKEN_COUNT, "GCBK Token Count", {NumOpts(0, 100)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsTokenCount"), "", WidgetType::Slider, 100, true);
-    OPT_U8(RSK_LACS_OPTIONS, "GCBK LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardOptions"), "", WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
+    OPT_U8(RSK_LACS_OPTIONS, "GCBK LACS Reward Options", {"Standard Reward", "Greg as Reward", "Greg as Wildcard"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("LacsRewardOptions"), mOptionDescriptions[RSK_LACS_OPTIONS], WidgetType::Combobox, RO_LACS_STANDARD_REWARD);
     OPT_U8(RSK_KEYRINGS, "Key Rings", {"Off", "Random", "Count", "Selection"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRings"), mOptionDescriptions[RSK_KEYRINGS], WidgetType::Combobox, RO_KEYRINGS_OFF);
     OPT_U8(RSK_KEYRINGS_RANDOM_COUNT, "Keyring Dungeon Count", {NumOpts(0, 9)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsRandomCount"), "", WidgetType::Slider, 8);
-    OPT_U8(RSK_KEYRINGS_GERUDO_FORTRESS, "Gerudo Fortress Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGerudoFortress"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_FOREST_TEMPLE, "Forest Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsForestTemple"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_FIRE_TEMPLE, "Fire Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsFireTemple"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_WATER_TEMPLE, "Water Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_SPIRIT_TEMPLE, "Spirit Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsSpiritTemple"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_SHADOW_TEMPLE, "Shadow Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsShadowTemple"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_BOTTOM_OF_THE_WELL, "Bottom of the Well Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsBottomOfTheWell"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_GTG, "Gerudo Training Ground Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGTG"), "", WidgetType::TristateCheckbox, 0);
-    OPT_U8(RSK_KEYRINGS_GANONS_CASTLE, "Ganon's Castle Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGanonsCastle"), "", WidgetType::TristateCheckbox, 0);
+    OPT_U8(RSK_KEYRINGS_GERUDO_FORTRESS, "Gerudo Fortress Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGerudoFortress"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_FOREST_TEMPLE, "Forest Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsForestTemple"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_FIRE_TEMPLE, "Fire Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsFireTemple"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_WATER_TEMPLE, "Water Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsWaterTemple"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_SPIRIT_TEMPLE, "Spirit Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsSpiritTemple"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_SHADOW_TEMPLE, "Shadow Temple Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsShadowTemple"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_BOTTOM_OF_THE_WELL, "Bottom of the Well Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsBottomOfTheWell"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_GTG, "Gerudo Training Ground Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGTG"), "", WidgetType::Combobox, 0);
+    OPT_U8(RSK_KEYRINGS_GANONS_CASTLE, "Ganon's Castle Keyring", {"No", "Random", "Yes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleKeyRingsGanonsCastle"), "", WidgetType::Combobox, 0);
     //Dummied out due to redundancy with TimeSavers.SkipChildStealth until such a time that logic needs to consider child stealth e.g. because it's freestanding checks are added to freestanding shuffle.
     //To undo this dummying, readd this setting to an OptionGroup so it appears in the UI, then edit the timesaver check hooks to look at this, and the timesaver setting to lock itself as needed.
     OPT_BOOL(RSK_SKIP_CHILD_STEALTH, "Skip Child Stealth", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildStealth"), mOptionDescriptions[RSK_SKIP_CHILD_STEALTH], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     OPT_BOOL(RSK_SKIP_CHILD_ZELDA, "Skip Child Zelda", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipChildZelda"), mOptionDescriptions[RSK_SKIP_CHILD_ZELDA], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     OPT_BOOL(RSK_SKIP_EPONA_RACE, "Skip Epona Race", {"Don't Skip", "Skip"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("SkipEponaRace"), mOptionDescriptions[RSK_SKIP_EPONA_RACE], WidgetType::Checkbox, RO_GENERIC_DONT_SKIP);
     OPT_BOOL(RSK_SKIP_SCARECROWS_SONG, "Skip Scarecrow's Song", CVAR_RANDOMIZER_SETTING("SkipScarecrowsSong"), mOptionDescriptions[RSK_SKIP_SCARECROWS_SONG]);
-    OPT_U8(RSK_BIG_POE_COUNT, "Big Poe Target Count", {NumOpts(1, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 9);
-    OPT_U8(RSK_CUCCO_COUNT, "Cuccos to return", {NumOpts(0, 7)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("CuccosToReturn"), mOptionDescriptions[RSK_CUCCO_COUNT], WidgetType::Slider, 7);
+    OPT_U8(RSK_BIG_POE_COUNT, "Big Poe Target Count", {NumOpts(0, 10)}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("BigPoeTargetCount"), mOptionDescriptions[RSK_BIG_POE_COUNT], WidgetType::Slider, 10);
     OPT_BOOL(RSK_COMPLETE_MASK_QUEST, "Complete Mask Quest", CVAR_RANDOMIZER_SETTING("CompleteMaskQuest"), mOptionDescriptions[RSK_COMPLETE_MASK_QUEST]);
     OPT_U8(RSK_GOSSIP_STONE_HINTS, "Gossip Stone Hints", {"No Hints", "Need Nothing", "Mask of Truth", "Stone of Agony"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("GossipStoneHints"), mOptionDescriptions[RSK_GOSSIP_STONE_HINTS], WidgetType::Combobox, RO_GOSSIP_STONES_NEED_NOTHING, false, IMFLAG_NONE);
     OPT_U8(RSK_HINT_CLARITY, "Hint Clarity", {"Obscure", "Ambiguous", "Clear"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("HintClarity"), mOptionDescriptions[RSK_HINT_CLARITY], WidgetType::Combobox, RO_HINT_CLARITY_CLEAR, true, IMFLAG_INDENT);
@@ -333,211 +339,819 @@ void Settings::CreateOptions() {
     mExcludeLocationsOptionsAreas.reserve(RCAREA_INVALID);
 
     // the following are glitches and are currently disabled
-    // OPT_TRICK(RT_ACUTE_ANGLE_CLIP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Acute angle clip", "Enables locations requiring jumpslash clips through walls which meet at an acute angle.");
-    // OPT_TRICK(RT_ADVANCED_CLIPS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Advanced clips", "Enables locations requiring clips through walls and objects requiring precise jumps or other tricks.");
-    // OPT_TRICK(RT_BLANK_A, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Blank A", "Enables locations requiring blank A button; NOTE: this requires the 'Quick Putaway' restoration.");
-    // OPT_TRICK(RT_DOOM_JUMP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Doom Jump", "Enables locations requiring doom jumps.");
-    // OPT_TRICK(RT_EPG, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "EPG", "Enables locations requiring use of the Entrance Point Glitch.");
-    // OPT_TRICK(RT_EQUIP_SWAP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Equip Swap", "Enables locations requiring use of equip swap; NOTE: this may expect the 'Allow cursor to be over any slot' enhancement to be turned off.");
-    // OPT_TRICK(RT_EQUIP_SWAP_EXPECTS_DINS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Equip Swap Require's Din's Fire", "Enables locations requiring use of equip swap once Din's Fire is found.");
-    // OPT_TRICK(RT_FLAME_STORAGE, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Flame Storage", "Enables locations requiring flame storage.");
-    // OPT_TRICK(RT_GROUND_CLIP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Ground Clip", "Enables locations requiring ground clips.");
-    // OPT_TRICK(RT_GROUND_JUMP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Ground Jump", "Enables locations requiring ground jumps.");
-    // OPT_TRICK(RT_HESS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "HESS", "Enables locations requiring a Hyper Extended Super Slide.");
-    // OPT_TRICK(RT_HOOKSHOT_CLIP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Hookshot Clip", "Enables locations requiring hookshot clips.");
-    // OPT_TRICK(RT_HOOKSHOT_JUMP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Hookshot Jump", "Enables locations requiring hookshot jumps.");
-    // OPT_TRICK(RT_ISG, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "ISG", "Enables locations requiring use of the infinite sword glitch.");
+    // OPT_TRICK(RT_ACUTE_ANGLE_CLIP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL,
+    // Tricks::Tag::GLITCH}, "Acute angle clip", "Enables locations requiring jumpslash clips through walls which meet
+    // at an acute angle."); OPT_TRICK(RT_ADVANCED_CLIPS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED,
+    // Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Advanced clips", "Enables locations requiring clips through
+    // walls and objects requiring precise jumps or other tricks."); OPT_TRICK(RT_BLANK_A, RCQUEST_BOTH, RA_NONE,
+    // {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Blank A", "Enables locations requiring
+    // blank A button; NOTE: this requires the 'Quick Putaway' restoration."); OPT_TRICK(RT_DOOM_JUMP, RCQUEST_BOTH,
+    // RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Doom Jump", "Enables locations
+    // requiring doom jumps."); OPT_TRICK(RT_EPG, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED,
+    // Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "EPG", "Enables locations requiring use of the Entrance Point
+    // Glitch."); OPT_TRICK(RT_EQUIP_SWAP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL,
+    // Tricks::Tag::GLITCH}, "Equip Swap", "Enables locations requiring use of equip swap; NOTE: this may expect the
+    // 'Allow cursor to be over any slot' enhancement to be turned off."); OPT_TRICK(RT_EQUIP_SWAP_EXPECTS_DINS,
+    // RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Equip Swap
+    // Require's Din's Fire", "Enables locations requiring use of equip swap once Din's Fire is found.");
+    // OPT_TRICK(RT_FLAME_STORAGE, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL,
+    // Tricks::Tag::GLITCH}, "Flame Storage", "Enables locations requiring flame storage."); OPT_TRICK(RT_GROUND_CLIP,
+    // RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Ground Clip",
+    // "Enables locations requiring ground clips."); OPT_TRICK(RT_GROUND_JUMP, RCQUEST_BOTH, RA_NONE,
+    // {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "Ground Jump", "Enables locations
+    // requiring ground jumps."); OPT_TRICK(RT_HESS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED,
+    // Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "HESS", "Enables locations requiring a Hyper Extended Super
+    // Slide."); OPT_TRICK(RT_HOOKSHOT_CLIP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL,
+    // Tricks::Tag::GLITCH}, "Hookshot Clip", "Enables locations requiring Hookshot clips.");
+    // OPT_TRICK(RT_HOOKSHOT_JUMP, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL,
+    // Tricks::Tag::GLITCH}, "Hookshot Jump", "Enables locations requiring Hookshot jumps."); OPT_TRICK(RT_ISG,
+    // RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL, Tricks::Tag::GLITCH}, "ISG", "Enables
+    // locations requiring use of the infinite sword glitch.");
 
-    OPT_TRICK(RT_VISIBLE_COLLISION, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, "Pass Through Visible One-Way Collision", "Allows climbing through the platform to reach Impa's House Back as adult with no items and going through the Kakariko Village Gate as child when coming from the Mountain Trail side.");
-    OPT_TRICK(RT_GROTTOS_WITHOUT_AGONY, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, "Hidden Grottos without Stone of Agony", "Allows entering hidden grottos without the Stone of Agony.");
-    OPT_TRICK(RT_FEWER_TUNIC_REQUIREMENTS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::INTERMEDIATE}, "Fewer Tunic Requirements", "Allows the following possible without Tunics:\n- Enter Water Temple. The area below the center pillar still requires Zora Tunic. Applies to MQ also.\n- Enter Fire Temple. Volvagia still requires Goron tunic. Applies to MQ also, and includes child access to first floor with dungeon shuffle.");
-    OPT_TRICK(RT_RUSTED_SWITCHES, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, "Hammer Rusted Switches Through Walls", "Applies to:\n- Fire Temple Highest Goron Chest.\n- MQ Fire Temple Lizalfos Maze.\n- MQ Spirit Trial.");
-    OPT_TRICK(RT_FLAMING_CHESTS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::INTERMEDIATE}, "Flaming Chests", "The chests encircled in flames in Gerudo Training Ground and in Spirit Temple can be opened by running into the flames while Link is invincible after taking damage.");
-    // disabled for now, can't check for being able to use bunny hood & bunny hood speedup is currently completely decoupled from rando
-    // OPT_TRICK(RT_BUNNY_HOOD_JUMPS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, "Bunny Hood Jumps", "Allows reaching locations using Bunny Hood's extended jumps.");
-    OPT_TRICK(RT_DAMAGE_BOOST_SIMPLE, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL}, "Simple damage boosts", "Allows damage boosts in order to reach further locations. Can be combined with \"Simple hover boosts\" for reaching far distances.");
-    OPT_TRICK(RT_HOVER_BOOST_SIMPLE, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL}, "Simple hover boosts", "Allows equipping of hover boots when link is moving at high speeds to extend distance covered. Can be combined with \"Simple damage boosts\" for greater uses.");
-    OPT_TRICK(RT_BOMBCHU_BEEHIVES, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, "Bombchu Beehives", "Allows exploding beehives with bombchus.");
-    OPT_TRICK(RT_BLUE_FIRE_MUD_WALLS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::NOVICE}, "Break Mud Walls with Blue Fire", "Use Blue Fire to break mud walls.");
-    OPT_TRICK(RT_KF_ADULT_GS, RCQUEST_BOTH, RA_KOKIRI_FOREST, {Tricks::Tag::NOVICE}, "Adult Kokiri Forest GS with Hover Boots", "Can be obtained without Hookshot by using the Hover Boots off of one of the roots.");
-    OPT_TRICK(RT_LW_BRIDGE, RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::EXPERT}, "Jump onto the Lost Woods Bridge as Adult with Nothing", "With very precise movement it's possible for adult to jump onto the bridge without needing Longshot, Hover Boots, or Bean.");
-    OPT_TRICK(RT_LW_MIDO_BACKFLIP, RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::NOVICE}, "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido.");
-    OPT_TRICK(RT_LW_GS_BEAN, RCQUEST_BOTH, RA_THE_LOST_WOODS, {Tricks::Tag::INTERMEDIATE}, "Lost Woods Adult GS without Bean", "You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow first. It can be killed using Longshot, Bow, Bombchus or Din's Fire.");
-    OPT_TRICK(RT_HC_STORMS_GS, RCQUEST_BOTH, RA_HYRULE_CASTLE, {Tricks::Tag::INTERMEDIATE}, "Hyrule Castle Storms Grotto GS with Just Boomerang", "With precise throws, the Boomerang alone can kill the Skulltula and collect the token, without first needing to blow up the wall.");
-    OPT_TRICK(RT_KAK_MAN_ON_ROOF, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::NOVICE}, "Man on Roof without Hookshot", "Can be reached by side-hopping off the watchtower as either age, or by jumping onto the potion shop's roof from the ledge as adult.");
-    OPT_TRICK(RT_KAK_TOWER_GS, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::INTERMEDIATE}, "Kakariko Tower GS with Jump Slash", "Climb the tower as high as you can without touching the Gold Skulltula, then let go and jump slash immediately. By jump-slashing from as low on the ladder as possible to still hit the Skulltula, this trick can be done without taking fall damage.");
-    OPT_TRICK(RT_KAK_ADULT_WINDMILL_POH, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::NOVICE}, "Windmill PoH as Adult with Nothing", "Can jump up to the spinning platform from below as adult.");
-    OPT_TRICK(RT_KAK_CHILD_WINDMILL_POH, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::EXTREME}, "Windmill PoH as Child with Precise Jump Slash", "Can jump up to the spinning platform from below as child with a precise jumpslash timed with the platforms rotation.");
-    OPT_TRICK(RT_KAK_ROOFTOP_GS, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, {Tricks::Tag::ADVANCED}, "Kakariko Rooftop GS with Hover Boots", "Take the Hover Boots from the entrance to Impa's House over to the rooftop of Skulltula House. From there, a precise Hover Boots backwalk with backflip can be used to get onto a hill above the side of the village. And then from there you can Hover onto Impa's rooftop to kill the Skulltula and backflip into the token.");
-    OPT_TRICK(RT_GY_POH, RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::INTERMEDIATE}, "Graveyard Freestanding PoH with Boomerang", "Using a precise moving setup you can obtain the Piece of Heart by having the Boomerang interact with it along the return path.");
-    OPT_TRICK(RT_GY_CHILD_DAMPE_RACE_POH, RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::NOVICE}, "Second Dampe Race as Child", "It is possible to complete the second dampe race as child in under a minute, but it is a strict time limit.");
-    OPT_TRICK(RT_GY_SHADOW_FIRE_ARROWS, RCQUEST_BOTH, RA_THE_GRAVEYARD, {Tricks::Tag::EXPERT}, "Shadow Temple Entry with Fire Arrows", "It is possible to light all of the torches to open the Shadow Temple entrance with just Fire Arrows, but you must be very quick, precise, and strategic with how you take your shots.");
-    OPT_TRICK(RT_DMT_SOIL_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, "Death Mountain Trail Soil GS without Destroying Boulder", "Bugs will go into the soft soil even while the boulder is still blocking the entrance. Then, using a precise moving setup you can kill the Gold Skulltula and obtain the token by having the Boomerang interact with it along the return path.");
-    OPT_TRICK(RT_DMT_BOMBABLE, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, "Death Mountain Trail Chest with Strength", "Child Link can blow up the wall using a nearby bomb flower. You must backwalk with the flower and then quickly throw it toward the wall.");
-    OPT_TRICK(RT_DMT_HOOKSHOT_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, "Death Mountain Trail Lower Red Rock GS with Hookshot", "After killing the Skulltula, the token can be fished out of the rock without needing to destroy it, by using the Hookshot in the correct way.");
-    OPT_TRICK(RT_DMT_HOVERS_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::ADVANCED}, "Death Mountain Trail Lower Red Rock GS with Hover Boots", "After killing the Skulltula, the token can be collected without needing to destroy the rock by backflipping down onto it with the Hover Boots. First use the Hover Boots to stand on a nearby fence, and go for the Skulltula Token from there.");
-    OPT_TRICK(RT_DMT_BEAN_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::EXPERT}, "Death Mountain Trail Lower Red Rock GS with Magic Bean", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jumping down onto it from the bean plant, midflight, with precise timing and positioning.");
-    OPT_TRICK(RT_DMT_JS_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, "Death Mountain Trail Lower Red Rock GS with Jump Slash", "After killing the Skulltula, the token can be collected without needing to destroy the rock by jump slashing from a precise angle.");
-    OPT_TRICK(RT_DMT_CLIMB_HOVERS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::ADVANCED}, "Death Mountain Trail Climb with Hover Boots", "It is possible to use the Hover Boots to bypass needing to destroy the boulders blocking the path to the top of Death Mountain.");
-    OPT_TRICK(RT_DMT_UPPER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::NOVICE}, "Death Mountain Trail Upper Red Rock GS without Hammer", "After killing the Skulltula, the token can be collected by backflipping into the rock at the correct angle.");
-    // disabled for now, only applies when trade quest is not shuffled so there's a timer (currently not considered in logic)
-    // OPT_TRICK(RT_DMT_BOLERO_BIGGORON, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE}, "Deliver Eye Drops with Bolero of Fire", "Playing a warp song normally causes a trade item to spoil immediately, however, it is possible use Bolero to reach Biggoron and still deliver the Eye Drops before they spoil. If you do not wear the Goron Tunic, the heat timer inside the crater will override the trade item\'s timer. When you exit to Death Mountain Trail you will have one second to show the Eye Drops before they expire. You can get extra time to show the Eye Drops if you warp immediately upon receiving them. If you don't have many hearts, you may have to reset the heat timer by quickly dipping in and out of Darunia\'s chamber or quickly equipping and unequipping the Goron Tunic. This trick does not apply if \"Randomize Warp Song Destinations\" is enabled, or if the settings are such that trade items do not need to be delivered within a time limit.");
-    OPT_TRICK(RT_GC_POT, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, "Goron City Spinning Pot PoH with Bombchu", "A Bombchu can be used to stop the spinning pot, but it can be quite finicky to get it to work.");
-    OPT_TRICK(RT_GC_POT_STRENGTH, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::INTERMEDIATE}, "Goron City Spinning Pot PoH with Strength", "Allows for stopping the Goron City Spinning Pot using a bomb flower alone, requiring strength in lieu of inventory explosives.");
-    OPT_TRICK(RT_GC_ROLLING_STRENGTH, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::INTERMEDIATE}, "Rolling Goron (Hot Rodder Goron) as Child with Strength", "Use the bombflower on the stairs or near Medigoron. Timing is tight, especially without backwalking.");
-    OPT_TRICK(RT_GC_LEFTMOST, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, "Goron City Maze Left Chest with Hover Boots", "A precise backwalk starting from on top of the crate and ending with a precisely-timed backflip can reach this chest without needing either the Hammer or Silver Gauntlets.");
-    OPT_TRICK(RT_GC_GROTTO, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::ADVANCED}, "Goron City Grotto with Hookshot While Taking Damage", "It is possible to reach the Goron City Grotto by quickly using the Hookshot while in the midst of taking damage from the lava floor.");
-    OPT_TRICK(RT_GC_LINK_GORON_DINS, RCQUEST_BOTH, RA_GORON_CITY, {Tricks::Tag::NOVICE}, "Stop Link the Goron with Din\'s Fire", "The timing is quite awkward.");
-    OPT_TRICK(RT_DMC_HOVER_BEAN_POH, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::NOVICE}, "Crater\'s Bean PoH with Hover Boots", "Hover from the base of the bridge near Goron City and walk up the very steep slope.");
-    OPT_TRICK(RT_DMC_BOLERO_JUMP, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::EXTREME}, "Death Mountain Crater Jump to Bolero", "As Adult, using a shield to drop a pot while you have the perfect speed and position, the pot can push you that little extra distance you need to jump across the gap in the bridge.");
-    OPT_TRICK(RT_DMC_BOULDER_JS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::NOVICE}, "Death Mountain Crater Upper to Lower with Hammer", "With the Hammer, you can jump slash the rock twice in the same jump in order to destroy it before you fall into the lava.");
-    OPT_TRICK(RT_DMC_BOULDER_SKIP, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, {Tricks::Tag::INTERMEDIATE}, "Death Mountain Crater Upper to Lower Boulder Skip", "As adult, With careful positioning, you can jump to the ledge where the boulder is, then use repeated ledge grabs to shimmy to a climbable ledge. This trick supersedes \"Death Mountain Crater Upper to Lower with Hammer\".");
-    OPT_TRICK(RT_ZR_LOWER, RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::INTERMEDIATE}, "Zora\'s River Lower Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required.");
-    OPT_TRICK(RT_ZR_UPPER, RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::INTERMEDIATE}, "Zora\'s River Upper Freestanding PoH as Adult with Nothing", "Adult can reach this PoH with a precise jump, no Hover Boots required.");
-    OPT_TRICK(RT_ZR_HOVERS, RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::NOVICE}, "Zora\'s Domain Entry with Hover Boots", "Can hover behind the waterfall as adult.");
-    OPT_TRICK(RT_ZR_CUCCO, RCQUEST_BOTH, RA_ZORAS_RIVER, {Tricks::Tag::NOVICE}, "Zora\'s Domain Entry with Cucco", "You can fly behind the waterfall with a Cucco as child.");
-    OPT_TRICK(RT_ZD_KING_ZORA_SKIP, RCQUEST_BOTH, RA_ZORAS_DOMAIN, {Tricks::Tag::INTERMEDIATE}, "Skip King Zora as Adult with Nothing", "With a precise jump as adult, it is possible to get on the fence next to King Zora from the front to access Zora's Fountain.");
-    OPT_TRICK(RT_ZD_GS, RCQUEST_BOTH, RA_ZORAS_DOMAIN, {Tricks::Tag::INTERMEDIATE}, "Zora\'s Domain GS with No Additional Items", "A precise jump slash can kill the Skulltula and recoil back onto the top of the frozen waterfall. To kill it, the logic normally guarantees one of Hookshot, Bow, or Magic.");
-    OPT_TRICK(RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES, RCQUEST_BOTH, RA_ZORAS_FOUNTAIN, {Tricks::Tag::NOVICE}, "Zora\'s Fountain Great Fairy Without Explosives", "It's possible to use silver gauntlets to pick up the silver rock and hammer to break the rock below it, allowing you to ledge grab the edge of the hole and get past the breakable wall (hammer can't break the wall itself).");
-    OPT_TRICK(RT_LH_LAB_WALL_GS, RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::NOVICE}, "Lake Hylia Lab Wall GS with Jump Slash", "The jump slash to actually collect the token is somewhat precise.");
-    OPT_TRICK(RT_LH_LAB_DIVING, RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::NOVICE}, "Lake Hylia Lab Dive without Gold Scale", "Remove the Iron Boots in the midst of Hookshotting the underwater crate.");
-    OPT_TRICK(RT_LH_WATER_HOOKSHOT, RCQUEST_BOTH, RA_LAKE_HYLIA, {Tricks::Tag::INTERMEDIATE}, "Water Temple Entry without Iron Boots using Hookshot", "When entering Water Temple using Gold Scale instead of Iron Boots, the Longshot is usually used to be able to hit the switch and open the gate. But, by standing in a particular spot, the switch can be hit with only the reach of the Hookshot.");
-    OPT_TRICK(RT_GV_CRATE_HOVERS, RCQUEST_BOTH, RA_GERUDO_VALLEY, {Tricks::Tag::INTERMEDIATE}, "Gerudo Valley Crate PoH as Adult with Hover Boots", "From the far side of Gerudo Valley, a precise Hover Boots movement and jump-slash recoil can allow adult to reach the ledge with the crate PoH without needing Longshot. You will take fall damage.");
-    OPT_TRICK(RT_GF_KITCHEN, RCQUEST_BOTH, RA_GERUDO_FORTRESS, {Tricks::Tag::NOVICE}, "Thieves\' Hideout \"Kitchen\" with No Additional Items", "Allows passing through the kitchen by avoiding being seen by the guards. The logic normally guarantees Bow or Hookshot to stun them from a distance, or Hover Boots to cross the room without needing to deal with the guards.");
-    OPT_TRICK(RT_GF_JUMP, RCQUEST_BOTH, RA_GERUDO_FORTRESS, {Tricks::Tag::NOVICE}, "Gerudo\'s Fortress Ledge Jumps", "Adult can jump onto the top roof of the fortress without going through the interior of the hideout.");
-    OPT_TRICK(RT_GF_WARRIOR_WITH_DIFFICULT_WEAPON, RCQUEST_BOTH, RA_GERUDO_FORTRESS, {Tricks::Tag::NOVICE}, "Gerudo\'s Fortress Warriors with Difficult Weapons", "Warriors can be defeated with slingshot or bombchus.");
-    // disabled for now, can't check for being able to use bunny hood & bunny hood speedup is currently completely decoupled from rando
-    // OPT_TRICK(RT_HW_BUNNY_CROSSING, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::NOVICE}, "Wasteland Crossing with Bunny Hood", "You can beat the quicksand by using the increased speed of the Bunny Hood. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash.");
-    OPT_TRICK(RT_HW_CROSSING, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, "Wasteland Crossing without Hover Boots or Longshot", "You can beat the quicksand by backwalking across it in a specific way. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash.");
-    OPT_TRICK(RT_LENS_HW, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, "Lensless Wasteland", "By memorizing the path, you can travel through the Wasteland without using the Lens of Truth to see the Poe. The equivalent trick for going in reverse through the Wasteland is \"Reverse Wasteland\".");
-    OPT_TRICK(RT_HW_REVERSE, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::INTERMEDIATE}, "Reverse Wasteland", "By memorizing the path, you can travel through the Wasteland in reverse. Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash. The equivalent trick for going forward through the Wasteland is \"Lensless Wasteland\". To cross the river of sand with no additional items, be sure to also enable \"Wasteland Crossing without Hover Boots or Longshot\". Unless all overworld entrances are randomized, child Link will not be expected to do anything at Gerudo's Fortress.");
-    OPT_TRICK(RT_COLOSSUS_GS, RCQUEST_BOTH, RA_DESERT_COLOSSUS, {Tricks::Tag::NOVICE}, "Colossus Hill GS with Hookshot", "Somewhat precise. If you kill enough Leevers you can get enough of a break to take some time to aim more carefully.");
-    OPT_TRICK(RT_DEKU_BASEMENT_GS, RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, "Deku Tree Basement Vines GS with Jump Slash", "Can be defeated by doing a precise jump slash.");
-    OPT_TRICK(RT_DEKU_B1_SKIP, RCQUEST_BOTH, RA_DEKU_TREE, {Tricks::Tag::INTERMEDIATE}, "Deku Tree Basement without Slingshot", "A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If used with the \"Closed Forest\" setting, a Slingshot will not be guaranteed to exist somewhere inside the Forest. This trick applies to both Vanilla and Master Quest.");
-    OPT_TRICK(RT_DEKU_B1_BOW_WEBS, RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, "Deku Tree Basement Web to Gohma with Bow", "All spider web walls in the Deku Tree basement can be burnt as adult with just a bow by shooting through torches. This trick only applies to the circular web leading to Gohma; the two vertical webs are always in logic. Backflip onto the chest near the torch at the bottom of the vine wall. With precise positioning you can shoot through the torch to the right edge of the circular web. This allows completion of adult Deku Tree with no fire source.");
-    OPT_TRICK(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG, RCQUEST_VANILLA, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, "Deku Tree Basement Backflip over Spiked Log", "Allows backflipping over the spiked log in the Deku Tree basement in vanilla. Only relevant if \"Shuffle Swim\" is enabled.");
-    OPT_TRICK(RT_DEKU_MQ_COMPASS_GS, RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, "Deku Tree MQ Compass Room GS Boulders with Just Hammer", "Climb to the top of the vines, then let go and jump slash immediately to destroy the boulders using the Hammer, without needing to spawn a Song of Time block.");
-    OPT_TRICK(RT_DEKU_MQ_LOG, RCQUEST_MQ, RA_DEKU_TREE, {Tricks::Tag::NOVICE}, "Deku Tree MQ Roll Under the Spiked Log", "You can get past the spiked log by rolling to briefly shrink your hitbox. As adult, the timing is a bit more precise.");
-    OPT_TRICK(RT_DC_SCARECROW_GS, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Scarecrow GS with Armos Statue", "You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long time to pull the statue the entire way. The jump to the alcove can be a bit picky when done as child.");
-    OPT_TRICK(RT_DC_VINES_GS, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Vines GS from Below with Longshot", "The vines upon which this Skulltula rests are one-sided collision. You can use the Longshot to get it from below, by shooting it through the vines, bypassing the need to lower the staircase.");
-    OPT_TRICK(RT_DC_STAIRCASE, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Staircase with Bow", "The Bow can be used to knock down the stairs with two well-timed shots.");
-    OPT_TRICK(RT_DC_SLINGSHOT_SKIP, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::EXPERT}, "Dodongo\'s Cavern Child Slingshot Skips", "With precise platforming, child can cross the platforms while the flame circles are there. When enabling this trick, it's recommended that you also enable the Adult variant: \"Dodongo's Cavern Spike Trap Room Jump without Hover Boots\".");
-    OPT_TRICK(RT_DC_SCRUB_ROOM, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Two Scrub Room with Strength", "With help from a conveniently-positioned block, Adult can quickly carry a bomb flower over to destroy the mud wall blocking the room with two Deku Scrubs.");
-    OPT_TRICK(RT_DC_JUMP, RCQUEST_BOTH, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots", "The jump is adult Link only. Applies to both Vanilla and MQ.");
-    OPT_TRICK(RT_DC_HAMMER_FLOOR, RCQUEST_BOTH, RA_DODONGOS_CAVERN, {Tricks::Tag::NOVICE}, "Dodongo\'s Cavern Smash the Boss Lobby Floor", "The bombable floor before King Dodongo can be destroyed with Hammer if hit in the very center. This is only relevant with Shuffle Boss Entrances or if Dodongo's Cavern is MQ and either variant of \"Dodongo's Cavern MQ Light the Eyes with Strength\" is on.");
-    OPT_TRICK(RT_DC_MQ_CHILD_BOMBS, RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::ADVANCED}, "Dodongo\'s Cavern MQ Early Bomb Bag Area as Child", "With a precise jump slash from above, you can reach the Bomb Bag area as only child without needing a Slingshot. You will take fall damage.");
-    OPT_TRICK(RT_DC_MQ_CHILD_EYES, RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::EXPERT}, "Dodongo\'s Cavern MQ Light the Eyes with Strength as Child", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes. To perform this trick as child is significantly more difficult than adult. The player is also expected to complete the DC back area without explosives, including getting past the Armos wall to the switch for the boss door.");
-    OPT_TRICK(RT_DC_MQ_ADULT_EYES, RCQUEST_MQ, RA_DODONGOS_CAVERN, {Tricks::Tag::ADVANCED}, "Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult", "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes.");
-    OPT_TRICK(RT_JABU_ALCOVE_JUMP_DIVE, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, "Jabu Underwater Alcove as Adult with Jump Dive", "Standing above the underwater tunnel leading to the scrub, jump down and swim through the tunnel. This allows adult to access the alcove with no Scale or Iron Boots. In vanilla Jabu, this alcove has a business scrub. In MQ Jabu, it has the compass chest and a door switch for the main floor.");
-    OPT_TRICK(RT_JABU_BOSS_HOVER, RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, "Jabu Near Boss Room with Hover Boots", "A box for the blue switch can be carried over by backwalking with one while the elevator is at its peak. Alternatively, you can skip transporting a box by quickly rolling from the switch and opening the door before it closes. However, the timing for this is very tight.");
-    OPT_TRICK(RT_JABU_NEAR_BOSS_RANGED, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, "Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives", "Vanilla Jabu: From near the entrance into the room, you can hit the switch that opens the door to the boss room using a precisely-aimed use of the Slingshot, Bow, or Longshot. As well, if you climb to the top of the vines you can stand on the right edge of the platform and shoot around the glass. From this distance, even the Hookshot can reach the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled. MQ Jabu: A Gold Skulltula Token can be collected with the Hookshot or Longshot using the same methods as hitting the switch in vanilla. This MQ trick is not currently relevant in logic.");
-    OPT_TRICK(RT_JABU_NEAR_BOSS_EXPLOSIVES, RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, "Jabu Near Boss Ceiling Switch with Explosives", "You can hit the switch that opens the door to the boss room using a precisely-aimed Bombchu. Also, using the Hover Boots, adult can throw a Bomb at the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled.");
-    OPT_TRICK(RT_LENS_JABU_MQ, RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::NOVICE}, "Jabu MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Jabu MQ.");
-    OPT_TRICK(RT_JABU_MQ_RANG_JUMP, RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::ADVANCED}, "Jabu MQ Compass Chest with Boomerang", "Boomerang can reach the cow switch to spawn the chest by targeting the cow, jumping off of the ledge where the chest spawns, and throwing the Boomerang in midair.");
-    OPT_TRICK(RT_JABU_MQ_SOT_GS, RCQUEST_MQ, RA_JABU_JABUS_BELLY, {Tricks::Tag::INTERMEDIATE}, "Jabu MQ Song of Time Block GS with Boomerang", "Allow the Boomerang to return to you through the Song of Time block to grab the token.");
-    OPT_TRICK(RT_LENS_BOTW, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, "Bottom of the Well without Lens of Truth", "Removes the requirements for the Lens of Truth in Bottom of the Well.");
-    OPT_TRICK(RT_BOTW_CHILD_DEADHAND, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, "Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes.");
-    OPT_TRICK(RT_BOTW_BASEMENT, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, "Bottom of the Well Map Chest with Strength & Sticks", "The chest in the basement can be reached with strength by doing a jump slash with a lit stick to access the bomb flowers.");
-    OPT_TRICK(RT_BOTW_MQ_PITS, RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, "Bottom of the Well MQ Jump Over the Pits", "While the pits in Bottom of the Well don't allow you to jump just by running straight at them, you can still get over them by side-hopping or backflipping across. With explosives, this allows you to access the central areas without Zelda's Lullaby. With Zelda's Lullaby, it allows you to access the west inner room without explosives.");
-    OPT_TRICK(RT_BOTW_MQ_DEADHAND_KEY, RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, {Tricks::Tag::NOVICE}, "Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang", "Boomerang can fish the item out of the rubble without needing explosives to blow it up.");
-    OPT_TRICK(RT_FOREST_FIRST_GS, RCQUEST_VANILLA, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple First Room GS with Difficult-to-Use Weapons", "Allows killing this Skulltula with Sword or Sticks by jump slashing it as you let go from the vines. You can avoid taking fall damage by recoiling onto the tree. Also allows killing it as Child with a Bomb throw. It's much more difficult to use a Bomb as child due to Child Link's shorter height.");
-    OPT_TRICK(RT_FOREST_OUTDOORS_EAST_GS, RCQUEST_VANILLA, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple East Courtyard GS with Boomerang", "Precise Boomerang throws can allow child to kill the Skulltula and collect the token.");
-    OPT_TRICK(RT_FOREST_VINES, RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple East Courtyard Vines with Hookshot", "The vines in Forest Temple leading to where the well drain switch is in the standard form can be barely reached with just the Hookshot. Applies to MQ also.");
-    OPT_TRICK(RT_FOREST_OUTDOORS_LEDGE, RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple NE Outdoors Ledge with Hover Boots", "With precise Hover Boots movement you can fall down to this ledge from upper balconies. If done precisely enough, it is not necessary to take fall damage. In MQ, this skips a Longshot requirement. In Vanilla, this can skip a Hookshot requirement in entrance randomizer.");
-    OPT_TRICK(RT_FOREST_DOORFRAME, RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, "Forest Temple East Courtyard Door Frame with Hover Boots", "A precise Hover Boots movement from the upper balconies in this courtyard can be used to get on top of the door frame. Applies to both Vanilla and Master Quest. In Vanilla, from on top the door frame you can summon Pierre, allowing you to access the falling ceiling room early. In Master Quest, this allows you to obtain the GS on the door frame as adult without Hookshot or Song of Time.");
-    OPT_TRICK(RT_FOREST_OUTSIDE_BACKDOOR, RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, "Forest Temple Outside Backdoor with Jump Slash", "A jump slash recoil can be used to reach the ledge in the block puzzle room that leads to the west courtyard. This skips a potential Hover Boots requirement in vanilla, and it can sometimes apply in MQ as well. This trick can be performed as both ages.");
-    OPT_TRICK(RT_FOREST_OUTDOORS_HEARTS_BOOMERANG, RCQUEST_BOTH, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple Outside Hearts with Boomerang", "A well aimed boomerang from the water's edge can reach the hearts from ground level. If unable to swim, you can back away from the water while the boomerang is returning so the hearts land on the ground.");
-    OPT_TRICK(RT_FOREST_MQ_WELL_SWIM, RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::ADVANCED}, "Swim Through Forest Temple MQ Well with Hookshot", "Shoot the vines in the well as low and as far to the right as possible, and then immediately swim under the ceiling to the right. This can only be required if Forest Temple is in its Master Quest form.");
-    OPT_TRICK(RT_FOREST_MQ_BLOCK_PUZZLE, RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Skip Forest Temple MQ Block Puzzle with Bombchu", "Send the Bombchu straight up the center of the wall directly to the left upon entering the room.");
-    //Child with hovers cannot do this from the lower floor, and most go to the upper floor which needs goron bracelet. Adult can do this with hammer and KSword, But child cannot.
-    OPT_TRICK(RT_FOREST_MQ_JS_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::NOVICE}, "Forest Temple MQ Twisted Hallway Switch with Jump Slash", "The switch to twist the hallway can be hit with a jump slash through the glass block. To get in front of the switch, either use the Hover Boots or hit the shortcut switch at the top of the room and jump from the glass blocks that spawn. Sticks can be used as child, but the Kokiri Sword is too short to reach through the glass.");
-    OPT_TRICK(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Forest Temple MQ Twisted Hallway Switch with Hookshot", "There's a very small gap between the glass block and the wall. Through that gap you can hookshot the target on the ceiling.");
-    OPT_TRICK(RT_FOREST_MQ_RANG_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Forest Temple MQ Twisted Hallway Switch with Boomerang", "The Boomerang can return to Link through walls, allowing child to hit the hallway switch. This can be used to allow adult to pass through later, or in conjuction with \"Forest Temple Outside Backdoor with Jump Slash\".");
-    OPT_TRICK(RT_FIRE_BOSS_DOOR_JUMP, RCQUEST_BOTH, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, "Fire Temple Boss Door without Hover Boots or Pillar", "The Fire Temple Boss Door can be reached as adult with a precise jump. You must be touching the side wall of the room so that Link will grab the ledge from farther away than is normally possible.");
-    //Is also used in MQ logic, but has no practical effect there as of now
-    OPT_TRICK(RT_FIRE_SOT, RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple Song of Time Room GS without Song of Time", "A precise jump can be used to reach this room.");
-    OPT_TRICK(RT_FIRE_STRENGTH, RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple Climb without Strength", "A precise jump can be used to skip pushing the block.");
-    OPT_TRICK(RT_FIRE_SCARECROW, RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::EXPERT}, "Fire Temple East Tower without Scarecrow\'s Song", "Also known as \"Pixelshot\". The Longshot can reach the target on the elevator itself, allowing you to skip needing to spawn the scarecrow.");
-    OPT_TRICK(RT_FIRE_FLAME_MAZE, RCQUEST_VANILLA, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to progress without needing either a Small Key or Hover Boots.");
-    OPT_TRICK(RT_FIRE_MQ_NEAR_BOSS, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, "Fire Temple MQ Chest Near Boss without Breaking Crate", "The hitbox for the torch extends a bit outside of the crate. Shoot a flaming arrow at the side of the crate to light the torch without needing to get over there and break the crate.");
-    OPT_TRICK(RT_FIRE_MQ_BLOCKED_CHEST, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple MQ Big Lava Room Blocked Door without Hookshot", "There is a gap between the hitboxes of the flame wall in the big lava room. If you know where this gap is located, you can jump through it and skip needing to use the Hookshot. To do this without taking damage is more precise.");
-    OPT_TRICK(RT_FIRE_MQ_BK_CHEST, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple MQ Boss Key Chest without Bow", "It is possible to light both of the timed torches to unbar the door to the boss key chest's room with just Din's Fire if you move very quickly between the two torches. It is also possible to unbar the door with just Din's by abusing an oversight in the way the game counts how many torches have been lit.");
-    OPT_TRICK(RT_FIRE_MQ_CLIMB, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, "Fire Temple MQ Climb without Fire Source", "You can use the Hover Boots to hover around to the climbable wall, skipping the need to use a fire source and spawn a Hookshot target.");
-    OPT_TRICK(RT_FIRE_MQ_MAZE_SIDE_ROOM, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, "Fire Temple MQ Lizalfos Maze Side Room without Box", "You can walk from the blue switch to the door and quickly open the door before the bars reclose. This skips needing to reach the upper sections of the maze to get a box to place on the switch.");
-    OPT_TRICK(RT_FIRE_MQ_MAZE_HOVERS, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::NOVICE}, "Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots", "Use the Hover Boots off of a crate to climb to the upper maze without needing to spawn and use the Hookshot targets.");
-    OPT_TRICK(RT_FIRE_MQ_MAZE_JUMP, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump", "A precise jump off of a crate can be used to climb to the upper maze without needing to spawn and use the Hookshot targets. This trick supersedes both \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" and \"Fire Temple MQ Lizalfos Maze Side Room without Box\".");
-    OPT_TRICK(RT_FIRE_MQ_ABOVE_MAZE_GS, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot", "The floor of the room that contains this Skulltula is only solid from above. From the maze below, the Longshot can be shot through the ceiling to obtain the token with two fewer small keys than normal.");
-    OPT_TRICK(RT_FIRE_MQ_FLAME_MAZE, RCQUEST_MQ, RA_FIRE_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Fire Temple MQ Flame Wall Maze Skip", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it without taking damage is more precise. Allows you to reach the side room GS without needing Song of Time or Hover Boots. If either of \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" or \"with Precise Jump\" are enabled, this also allows you to progress deeper into the dungeon without Hookshot.");
-    OPT_TRICK(RT_WATER_LONGSHOT_TORCH, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Torch Longshot", "Stand on the eastern side of the central pillar and longshot the torches on the bottom level. Swim through the corridor and float up to the top level. This allows access to this area and lower water levels without Iron Boots. The majority of the tricks that allow you to skip Iron Boots in the Water Temple are not going to be relevant unless this trick is first enabled.");
-    OPT_TRICK(RT_WATER_CRACKED_WALL_HOVERS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Cracked Wall with Hover Boots", "With a midair side-hop while wearing the Hover Boots, you can reach the cracked wall without needing to raise the water up to the middle level.");
-    OPT_TRICK(RT_WATER_CRACKED_WALL, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Water Temple Cracked Wall with No Additional Items", "A precise jump slash (among other methods) will get you to the cracked wall without needing the Hover Boots or to raise the water to the middle level. This trick supersedes \"Water Temple Cracked Wall with Hover Boots\".");
-    OPT_TRICK(RT_WATER_BK_REGION, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Water Temple Boss Key Region with Hover Boots", "With precise Hover Boots movement it is possible to reach the boss key chest's region without needing the Longshot. It is not necessary to take damage from the spikes. The Gold Skulltula Token in the following room can also be obtained with just the Hover Boots.");
-    OPT_TRICK(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP, RCQUEST_BOTH, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Water Temple North Basement Ledge with Precise Jump", "In the northern basement there's a ledge from where, in vanilla Water Temple, boulders roll out into the room. Normally to jump directly to this ledge logically requires the Hover Boots, but with precise jump, it can be done without them. This trick applies to both Vanilla and Master Quest.");
-    OPT_TRICK(RT_WATER_BK_JUMP_DIVE, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Boss Key Jump Dive", "Stand on the very edge of the raised corridor leading from the push block room to the rolling boulder corridor. Face the Gold Skulltula on the waterfall and jump over the boulder corridor floor into the pool of water, swimming right once underwater. This allows access to the boss key room without Iron boots.");
-    //Also used in MQ logic, but won't be relevent unless a way to enter tower without irons exists (likely a clip + swim)
-    OPT_TRICK(RT_WATER_FW_CENTRAL_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Central Pillar GS with Farore\'s Wind", "If you set Farore's Wind inside the central pillar and then return to that warp point after raising the water to the highest level, you can obtain this Skulltula Token with Hookshot or Boomerang.");
-    OPT_TRICK(RT_WATER_IRONS_CENTRAL_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Central Pillar GS with Iron Boots", "After opening the middle water level door into the central pillar, the door will stay unbarred so long as you do not leave the room -- even if you were to raise the water up to the highest level. With the Iron Boots to go through the door after the water has been raised, you can obtain the Skulltula Token with the Hookshot.");
-    OPT_TRICK(RT_WATER_CENTRAL_BOW, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::ADVANCED}, "Water Temple Central Bow Target without Longshot or Hover Boots", "A very precise Bow shot can hit the eye switch from the floor above. Then, you can jump down into the hallway and make through it before the gate closes. It can also be done as child, using the Slingshot instead of the Bow.");
-    OPT_TRICK(RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Falling Platform Room GS with Hookshot", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Hookshot.");
-    OPT_TRICK(RT_WATER_RANG_FALLING_PLATFORM_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Water Temple Falling Platform Room GS with Boomerang", "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Boomerang.");
-    OPT_TRICK(RT_WATER_RIVER_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Water Temple River GS without Iron Boots", "Standing on the exposed ground toward the end of the river, a precise Longshot use can obtain the token. The Longshot cannot normally reach far enough to kill the Skulltula, however. You'll first have to find some other way of killing it.");
-    OPT_TRICK(RT_WATER_DRAGON_JUMP_DIVE, RCQUEST_BOTH, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Dragon Statue Jump Dive", "If you come into the dragon statue room from the serpent river, you can jump down from above and get into the tunnel without needing either Iron Boots or a Scale. This trick applies to both Vanilla and Master Quest. In Vanilla, you must shoot the switch from above with the Bow, and then quickly get through the tunnel before the gate closes.");
-    OPT_TRICK(RT_WATER_ADULT_DRAGON, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple Dragon Statue Switch from Above the Water as Adult", "Normally you need both Hookshot and Iron Boots to hit the switch and swim through the tunnel to get to the chest. But by hitting the switch from dry land, using one of Bombchus, Hookshot, or Bow, it is possible to skip one or both of those requirements. After the gate has been opened, besides just using the Iron Boots, a well-timed dive with at least the Silver Scale could be used to swim through the tunnel. If coming from the serpent river, a jump dive can also be used to get into the tunnel.");
-    OPT_TRICK(RT_WATER_CHILD_DRAGON, RCQUEST_VANILLA, RA_WATER_TEMPLE, {Tricks::Tag::ADVANCED}, "Water Temple Dragon Statue Switch from Above the Water as Child", "It is possible for child to hit the switch from dry land using one of Bombchus, Slingshot or Boomerang. Then, to get to the chest, child can dive through the tunnel using at least the Silver Scale. The timing and positioning of this dive needs to be perfect to actually make it under the gate, and it all needs to be done very quickly to be able to get through before the gate closes. Be sure to enable \"Water Temple Dragon Statue Switch from Above the Water as Adult\" for adult's variant of this trick.");
-    OPT_TRICK(RT_WATER_MQ_CENTRAL_PILLAR, RCQUEST_MQ, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple MQ Central Pillar with Fire Arrows", "Slanted torches have misleading hitboxes. Whenever you see a slanted torch jutting out of the wall, you can expect most or all of its hitbox is actually on the other side that wall. This can make slanted torches very finicky to light when using arrows. The torches in the central pillar of MQ Water Temple are a particularly egregious example. Logic normally expects Din's Fire and Song of Time.");
-    OPT_TRICK(RT_WATER_MQ_LOCKED_GS, RCQUEST_MQ, RA_WATER_TEMPLE, {Tricks::Tag::NOVICE}, "Water Temple MQ North Basement GS without Small Key", "There is an invisible Hookshot target that can be used to get over the gate that blocks you from going to this Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door.");
-    OPT_TRICK(RT_LENS_SHADOW, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple for most areas in the dungeon except for crossing the moving platform in the huge pit room and for fighting Bongo Bongo.");
-    OPT_TRICK(RT_LENS_SHADOW_PLATFORM, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple to cross the invisible moving platform in the huge pit room in either direction.");
-    OPT_TRICK(RT_LENS_BONGO, RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple Bongo Bongo without Lens of Truth", "Bongo Bongo can be defeated without the use of Lens of Truth, as the hands give a pretty good idea of where the eye is.");
-    OPT_TRICK(RT_SHADOW_UMBRELLA, RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::EXPERT}, "Shadow Temple Stone Umbrella Skip", "A very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. Applies to both Vanilla and Master Quest.");
-    OPT_TRICK(RT_SHADOW_UMBRELLA_GS, RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::EXPERT}, "Shadow Temple Falling Spikes GS with Hover Boots", "After killing the Skulltula, a very precise Hover Boots movement from off of the lower chest can get you on top of the crushing spikes without needing to pull the block. From there, another very precise Hover Boots movement can be used to obtain the token without needing the Hookshot. Applies to both Vanilla and Master Quest. For obtaining the chests in this room with just Hover Boots, be sure to enable \"Shadow Temple Stone Umbrella Skip\".");
-    OPT_TRICK(RT_SHADOW_FREESTANDING_KEY, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple Freestanding Key with Bombchu", "Release the Bombchu with good timing so that it explodes near the bottom of the pot.");
-    OPT_TRICK(RT_SHADOW_STATUE, RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple River Statue with Bombchu", "By sending a Bombchu around the edge of the gorge, you can knock down the statue without needing a Bow. Applies in both vanilla and MQ Shadow.");
-    OPT_TRICK(RT_SHADOW_BONGO, RCQUEST_BOTH, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple Bongo Bongo without projectiles", "Using precise sword slashes, Bongo Bongo can be defeated without using projectiles. This is only relevant in conjunction with Shadow Temple dungeon shortcuts or shuffled boss entrances.");
-    OPT_TRICK(RT_LENS_SHADOW_MQ, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple MQ Stationary Objects without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ for most areas in the dungeon. See \"Shadow Temple MQ Invisible Moving Platform without Lens of Truth\", \"Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth\", \"Shadow Temple MQ 2nd Dead Hand without Lens of Truth\", and \"Shadow Temple Bongo Bongo without Lens of Truth\" for exceptions.");
-    OPT_TRICK(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth", "Removes the requirement for the Lens of Truth or Nayru's Love in Shadow Temple MQ for the Invisible Blades room silver rupee collection.");
-    OPT_TRICK(RT_LENS_SHADOW_MQ_PLATFORM, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple MQ Invisible Moving Platform without Lens of Truth", "Removes the requirements for the Lens of Truth in Shadow Temple MQ to cross the invisible moving platform in the huge pit room in either direction.");
-    OPT_TRICK(RT_LENS_SHADOW_MQ_DEADHAND, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::NOVICE}, "Shadow Temple MQ 2nd Dead Hand without Lens of Truth", "Dead Hand spawns in a random spot within the room. Having Lens removes the hassle of having to comb the room looking for his spawn location.");
-    OPT_TRICK(RT_SHADOW_MQ_GAP, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple MQ Truth Spinner Gap with Longshot", "You can Longshot a torch and jump-slash recoil onto the tongue. It works best if you Longshot the right torch from the left side of the room.");
-    OPT_TRICK(RT_SHADOW_MQ_INVISIBLE_BLADES, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple MQ Invisible Blades without Song of Time", "The Like Like can be used to boost you into the silver rupee or recovery hearts that normally require Song of Time. This cannot be performed on OHKO since the Like Like does not boost you high enough if you die.");
-    OPT_TRICK(RT_SHADOW_MQ_HUGE_PIT, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple MQ Lower Huge Pit without Fire Source", "Normally a frozen eye switch spawns some platforms that you can use to climb down, but there's actually a small piece of ground that you can stand on that you can just jump down to.");
-    OPT_TRICK(RT_SHADOW_MQ_WINDY_WALKWAY, RCQUEST_MQ, RA_SHADOW_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Shadow Temple MQ Windy Walkway Reverse without Hover Boots", "It is possible to jump from the alcove in the windy hallway to the middle platform. There are two methods: wait out the fan opposite the door and hold forward, or jump to the right to be pushed by the fan there towards the platform ledge. Note that jumps of this distance are inconsistent, but still possible.");
-    OPT_TRICK(RT_LENS_SPIRIT, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple.");
-    OPT_TRICK(RT_SPIRIT_CHILD_CHU, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple Child Side Bridge with Bombchu", "A carefully-timed Bombchu can hit the switch.");
-    OPT_TRICK(RT_SPIRIT_LOBBY_GS, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple Main Room GS with Boomerang", "Standing on the highest part of the arm of the statue, a precise Boomerang throw can kill and obtain this Gold Skulltula. You must throw the Boomerang slightly off to the side so that it curves into the Skulltula, as aiming directly at it will clank off of the wall in front.");
-    OPT_TRICK(RT_SPIRIT_LOWER_ADULT_SWITCH, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::ADVANCED}, "Spirit Temple Lower Adult Switch with Bombs", "A bomb can be used to hit the switch on the ceiling, but it must be thrown from a particular distance away and with precise timing.");
-    OPT_TRICK(RT_SPIRIT_LOBBY_JUMP, RCQUEST_BOTH, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple Main Room Jump from Hands to Upper Ledges", "A precise jump to obtain the following as adult without needing one of Hover Boots, or Hookshot (in vanilla) or Song of Time (in MQ): - Spirit Temple Statue Room Northeast Chest - Spirit Temple GS Lobby - Spirit Temple MQ Central Chamber Top Left Pot (Left) - Spirit Temple MQ Central Chamber Top Left Pot (Right)");
-    // disabled since "Spirit Temple boss shortcuts" (pre-lowers the platform where you break the statues face) isn't a setting in ship
-    // OPT_TRICK(RT_SPIRIT_PLATFORM_HOOKSHOT, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple Main Room Hookshot to Boss Platform", "Precise hookshot aiming at the platform chains can be used to reach the boss platform from the middle landings. Using a jump slash immediately after reaching a chain makes aiming more lenient. Relevant only when Spirit Temple boss shortcuts are on.");
-    OPT_TRICK(RT_SPIRIT_MAP_CHEST, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple Map Chest with Bow", "To get a line of sight from the upper torch to the map chest torches, you must pull an Armos statue all the way up the stairs.");
-    OPT_TRICK(RT_SPIRIT_SUN_CHEST, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::ADVANCED}, "Spirit Temple Sun Block Room Chest with Bow", "Using the blocks in the room as platforms you can get lines of sight to all three torches. The timer on the torches is quite short so you must move quickly in order to light all three.");
-    OPT_TRICK(RT_SPIRIT_WALL, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple Shifting Wall with No Additional Items", "Logic normally guarantees a way of dealing with both the Beamos and the Walltula before climbing the wall.");
-    OPT_TRICK(RT_LENS_SPIRIT_MQ, RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Spirit Temple MQ.");
-    OPT_TRICK(RT_SPIRIT_MQ_SUN_BLOCK_SOT, RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple MQ Sun Block Room as Child without Song of Time", "While adult can easily jump directly to the switch that unbars the door to the sun block room, child Link cannot make the jump without spawning a Song of Time block to jump from. You can skip this by throwing the crate down onto the switch from above, which does unbar the door, however the crate immediately breaks, so you must move quickly to get through the door before it closes back up.");
-    OPT_TRICK(RT_SPIRIT_MQ_SUN_BLOCK_GS, RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple MQ Sun Block Room GS with Boomerang", "Throw the Boomerang in such a way that it curves through the side of the glass block to hit the Gold Skulltula.");
-    OPT_TRICK(RT_SPIRIT_MQ_LOWER_ADULT, RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::INTERMEDIATE}, "Spirit Temple MQ Lower Adult without Fire Arrows", "By standing in a precise position it is possible to light two of the torches with a single use of Din\'s Fire. This saves enough time to be able to light all three torches with only Din\'s.");
-    OPT_TRICK(RT_SPIRIT_MQ_FROZEN_EYE, RCQUEST_MQ, RA_SPIRIT_TEMPLE, {Tricks::Tag::NOVICE}, "Spirit Temple MQ Frozen Eye Switch without Fire", "You can melt the ice by shooting an arrow through a torch. The only way to find a line of sight for this shot is to first spawn a Song of Time block, and then stand on the very edge of it.");
-    OPT_TRICK(RT_ICE_BLOCK_GS, RCQUEST_VANILLA, RA_ICE_CAVERN, {Tricks::Tag::INTERMEDIATE}, "Ice Cavern Block Room GS with Hover Boots", "The Hover Boots can be used to get in front of the Skulltula to kill it with a jump slash. Then, the Hover Boots can again be used to obtain the Token, all without Hookshot or Boomerang.");
-    OPT_TRICK(RT_ICE_MQ_RED_ICE_GS, RCQUEST_MQ, RA_ICE_CAVERN, {Tricks::Tag::INTERMEDIATE}, "Ice Cavern MQ Red Ice GS without Song of Time", "If you side-hop into the perfect position, you can briefly stand on the platform with the red ice just long enough to dump some blue fire.");
-    OPT_TRICK(RT_ICE_MQ_SCARECROW, RCQUEST_MQ, RA_ICE_CAVERN, {Tricks::Tag::INTERMEDIATE}, "Ice Cavern MQ Scarecrow GS with No Additional Items", "As adult a precise jump can be used to reach this alcove.");
-    OPT_TRICK(RT_LENS_GTG, RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, "Gerudo Training Ground without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground.");
-    OPT_TRICK(RT_GTG_WITHOUT_HOOKSHOT, RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::INTERMEDIATE}, "Gerudo Training Ground Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. Then, you must also reach the exit of the room without the use of the Hookshot. If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do so without taking damage is more precise.");
-    OPT_TRICK(RT_GTG_FAKE_WALL, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, "Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots", "A precise Hover Boots use from the top of the chest can allow you to grab the ledge without needing the usual requirements. In Master Quest, this always skips a Song of Time requirement. In Vanilla, this skips a Hookshot requirement, but is only relevant if \"Gerudo Training Ground Left Side Silver Rupees without Hookshot\" is enabled.");
-    OPT_TRICK(RT_LENS_GTG_MQ, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, "Gerudo Training Ground MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ.");
-    OPT_TRICK(RT_GTG_MQ_WITH_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::NOVICE}, "Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot", "The highest silver rupee can be obtained by hookshotting the target and then immediately jump slashing toward the rupee.");
-    OPT_TRICK(RT_GTG_MQ_WIHTOUT_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, {Tricks::Tag::INTERMEDIATE}, "Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot", "After collecting the rest of the silver rupees in the room, you can reach the final silver rupee on the ceiling by being pulled up into it after getting grabbed by the Wallmaster. The Wallmaster will not track you to directly underneath the rupee. You should take the last step to be under the rupee after the Wallmaster has begun its attempt to grab you. Also included with this trick is that fact that the switch that unbars the door to the final chest of GTG can be hit without a projectile, using a precise jump slash. This trick supersedes \"Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot\".");
-    OPT_TRICK(RT_LENS_GANON, RCQUEST_VANILLA, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, "Ganon\'s Castle without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle.");
-    OPT_TRICK(RT_GANON_SPIRIT_TRIAL_HOOKSHOT, RCQUEST_VANILLA, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, "Spirit Trial without Hookshot", "The highest rupee can be obtained as either age by performing a precise jump and a well-timed jumpslash off of an Armos.");
-    OPT_TRICK(RT_LENS_GANON_MQ, RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, "Ganon\'s Castle MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Ganon's Castle MQ.");
-    OPT_TRICK(RT_GANON_MQ_FIRE_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::ADVANCED}, "Fire Trial MQ with Hookshot", "It's possible to hook the target at the end of fire trial with just Hookshot, but it requires precise aim and perfect positioning. The main difficulty comes from getting on the very corner of the obelisk without falling into the lava.");
-    OPT_TRICK(RT_GANON_MQ_SHADOW_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::NOVICE}, "Shadow Trial MQ Torch with Bow", "You can light the torch in this room without a fire source by shooting an arrow through the lit torch at the beginning of the room. Because the room is so dark and the unlit torch is so far away, it can be difficult to aim the shot correctly.");
-    OPT_TRICK(RT_GANON_MQ_LIGHT_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, {Tricks::Tag::INTERMEDIATE}, "Light Trial MQ without Hookshot", "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. In this case to do it without taking damage is especially precise.");
+    OPT_TRICK(RT_VISIBLE_COLLISION, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
+              "Pass Through Visible One-Way Collision",
+              "Allows climbing through the platform to reach Impa's House Back as adult with no items and going "
+              "through the Kakariko Village Gate as child when coming from the Mountain Trail side.");
+    OPT_TRICK(RT_GROTTOS_WITHOUT_AGONY, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
+              "Hidden Grottos without Stone of Agony", "Allows entering hidden grottos without the Stone of Agony.");
+    OPT_TRICK(RT_FEWER_TUNIC_REQUIREMENTS, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE },
+              "Fewer Tunic Requirements",
+              "Allows the following possible without Tunics:\n- Enter Water Temple. The area below the center pillar "
+              "still requires Zora Tunic. Applies to MQ also.\n- Enter Fire Temple. Volvagia still requires Goron "
+              "Tunic. Applies to MQ also, and includes child access to first floor with dungeon shuffle.");
+    OPT_TRICK(RT_RUSTED_SWITCHES, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
+              "Hammer Rusted Switches Through Walls",
+              "Applies to:\n- Fire Temple Highest Goron Chest.\n- MQ Fire Temple Lizalfos Maze.\n- MQ Spirit Trial.");
+    OPT_TRICK(RT_FLAMING_CHESTS, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE }, "Flaming Chests",
+              "The chests encircled in flames in Gerudo Training Ground and in Spirit Temple can be opened by running "
+              "into the flames while Link is invincible after taking damage.");
+    // disabled for now, can't check for being able to use bunny hood & bunny hood speedup is currently completely
+    // decoupled from rando OPT_TRICK(RT_BUNNY_HOOD_JUMPS, RCQUEST_BOTH, RA_NONE, {Tricks::Tag::ADVANCED}, "Bunny Hood
+    // Jumps", "Allows reaching locations using Bunny Hood's extended jumps.");
+    OPT_TRICK(RT_DAMAGE_BOOST_SIMPLE, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL },
+              "Simple damage boosts",
+              "Allows damage boosts in order to reach further locations. Can be combined with \"Simple hover boosts\" "
+              "for reaching far distances.");
+    OPT_TRICK(RT_HOVER_BOOST_SIMPLE, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::ADVANCED, Tricks::Tag::EXPERIMENTAL },
+              "Simple hover boosts",
+              "Allows equipping of hover boots when link is moving at high speeds to extend distance covered. Can be "
+              "combined with \"Simple damage boosts\" for greater uses.");
+    OPT_TRICK(RT_BOMBCHU_BEEHIVES, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, "Bombchu Beehives",
+              "Allows exploding beehives with Bombchus.");
+    OPT_TRICK(RT_BLUE_FIRE_MUD_WALLS, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, "Blue Fire Beyond Red Ice",
+              "Use Blue Fire to break mud walls, detonate bomb flowers, and break floor to King Dodongo.\nDoes not "
+              "apply to MQ Dead Hand bomb flowers.\nUsing blue fire on bombflower to stop rolling goron also requires "
+              "\"Stop Link the Goron with Din's Fire\".\nUsing blue fire arrows to break floor in King Dodongo's "
+              "chamber also requires \"Dodongo\'s Cavern Smash the Boss Lobby Floor\".");
+    OPT_TRICK(RT_OPEN_UNDERWATER_CHEST, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH },
+              "Open Underwater Chests",
+              "Underwater chests can be opened by wearing iron boots and hookshotting the chest.");
+    OPT_TRICK(RT_KF_ADULT_GS, RCQUEST_BOTH, RA_KOKIRI_FOREST, { Tricks::Tag::NOVICE },
+              "Adult Kokiri Forest GS with Hover Boots",
+              "Can be obtained without Hookshot by using the Hover Boots off of one of the roots.");
+    OPT_TRICK(RT_LW_BRIDGE, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::EXPERT },
+              "Jump onto the Lost Woods Bridge as Adult with Nothing",
+              "With very precise movement it's possible for adult to jump onto the bridge without needing Longshot, "
+              "Hover Boots, or Bean.");
+    OPT_TRICK(RT_LW_MIDO_BACKFLIP, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::NOVICE },
+              "Backflip over Mido as Adult", "With a specific position and angle, you can backflip over Mido.");
+    OPT_TRICK(RT_LOST_WOOD_NAVI_DIVE, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH },
+              "Lost Woods Navi dive",
+              "You need Deku Sticks or Kokiri Sword to dive with Navi for entering Zora's River.");
+    OPT_TRICK(RT_LW_GS_BEAN, RCQUEST_BOTH, RA_THE_LOST_WOODS, { Tricks::Tag::INTERMEDIATE },
+              "Lost Woods Adult GS without Bean",
+              "You can collect the token with a precise Hookshot use, as long as you can kill the Skulltula somehow "
+              "first. It can be killed using Longshot, Bow, Bombchus or Din's Fire.");
+    OPT_TRICK(RT_HC_STORMS_GS, RCQUEST_BOTH, RA_HYRULE_CASTLE, { Tricks::Tag::INTERMEDIATE },
+              "Hyrule Castle Storms Grotto GS with Just Boomerang",
+              "With precise throws, the Boomerang alone can kill the Skulltula and collect the token, without first "
+              "needing to blow up the wall.");
+    OPT_TRICK(RT_HF_BIG_POE_WITHOUT_EPONA, RCQUEST_BOTH, RA_HYRULE_FIELD, { Tricks::Tag::NOVICE },
+              "Big Poe without Epona",
+              "Big Poes have a chance of appearing without Epona, you can shoot them quickly with only bow.");
+    OPT_TRICK(RT_KAK_MAN_ON_ROOF, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::NOVICE },
+              "Man on Roof without Hookshot",
+              "Can be reached by side-hopping off the watchtower as either age, or by jumping onto the potion shop's "
+              "roof from the ledge as adult.");
+    OPT_TRICK(RT_KAK_TOWER_GS, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::INTERMEDIATE },
+              "Kakariko Tower GS with Jump Slash",
+              "Climb the tower as high as you can without touching the Gold Skulltula, then let go and jump slash "
+              "immediately. By jump-slashing from as low on the ladder as possible to still hit the Skulltula, this "
+              "trick can be done without taking fall damage.");
+    OPT_TRICK(RT_KAK_ADULT_WINDMILL_POH, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::NOVICE },
+              "Windmill PoH as Adult with Nothing", "Can jump up to the spinning platform from below as adult.");
+    OPT_TRICK(RT_KAK_CHILD_WINDMILL_POH, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::EXTREME },
+              "Windmill PoH as Child with Precise Jump Slash",
+              "Can jump up to the spinning platform from below as child with a precise jumpslash timed with the "
+              "platforms rotation.");
+    OPT_TRICK(
+        RT_KAK_ROOFTOP_GS, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::ADVANCED },
+        "Kakariko Rooftop GS with Hover Boots",
+        "Take the Hover Boots from the entrance to Impa's House over to the rooftop of Skulltula House. From there, a "
+        "precise Hover Boots backwalk with backflip can be used to get onto a hill above the side of the village. And "
+        "then from there you can Hover onto Impa's rooftop to kill the Skulltula and backflip into the token.");
+    OPT_TRICK(RT_GY_POH, RCQUEST_BOTH, RA_THE_GRAVEYARD, { Tricks::Tag::INTERMEDIATE },
+              "Graveyard Freestanding PoH with Boomerang",
+              "Using a precise moving setup you can obtain the Piece of Heart by having the Boomerang interact with it "
+              "along the return path.");
+    OPT_TRICK(
+        RT_GY_CHILD_DAMPE_RACE_POH, RCQUEST_BOTH, RA_THE_GRAVEYARD, { Tricks::Tag::NOVICE },
+        "Second Dampe Race as Child",
+        "It is possible to complete the second dampe race as child in under a minute, but it is a strict time limit.");
+    OPT_TRICK(RT_GY_SHADOW_FIRE_ARROWS, RCQUEST_BOTH, RA_THE_GRAVEYARD, { Tricks::Tag::EXPERT },
+              "Shadow Temple Entry with Fire Arrows",
+              "It is possible to light all of the torches to open the Shadow Temple entrance with just Fire Arrows, "
+              "but you must be very quick, precise, and strategic with how you take your shots.");
+    OPT_TRICK(RT_DMT_SOIL_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE },
+              "Death Mountain Trail Soil GS without Destroying Boulder",
+              "Bugs will go into the soft soil even while the boulder is still blocking the entrance. Then, using a "
+              "precise moving setup you can kill the Gold Skulltula and obtain the token by having the Boomerang "
+              "interact with it along the return path.");
+    OPT_TRICK(RT_DMT_BOMBABLE, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE },
+              "Death Mountain Trail Chest with Strength",
+              "Child Link can blow up the wall using a nearby bomb flower. You must backwalk with the flower and then "
+              "quickly throw it toward the wall.");
+    OPT_TRICK(RT_DMT_HOOKSHOT_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE },
+              "Death Mountain Trail Lower Red Rock GS with Hookshot",
+              "After killing the Skulltula, the token can be fished out of the rock without needing to destroy it, by "
+              "using the Hookshot in the correct way.");
+    OPT_TRICK(RT_DMT_HOVERS_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::ADVANCED },
+              "Death Mountain Trail Lower Red Rock GS with Hover Boots",
+              "After killing the Skulltula, the token can be collected without needing to destroy the rock by "
+              "backflipping down onto it with the Hover Boots. First use the Hover Boots to stand on a nearby fence, "
+              "and go for the Skulltula Token from there.");
+    OPT_TRICK(RT_DMT_BEAN_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::EXPERT },
+              "Death Mountain Trail Lower Red Rock GS with Magic Bean",
+              "After killing the Skulltula, the token can be collected without needing to destroy the rock by jumping "
+              "down onto it from the bean plant, midflight, with precise timing and positioning.");
+    OPT_TRICK(RT_DMT_JS_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE },
+              "Death Mountain Trail Lower Red Rock GS with Jump Slash",
+              "After killing the Skulltula, the token can be collected without needing to destroy the rock by jump "
+              "slashing from a precise angle.");
+    OPT_TRICK(RT_DMT_CLIMB_HOVERS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::ADVANCED },
+              "Death Mountain Trail Climb with Hover Boots",
+              "It is possible to use the Hover Boots to bypass needing to destroy the boulders blocking the path to "
+              "the top of Death Mountain.");
+    OPT_TRICK(
+        RT_DMT_UPPER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::NOVICE },
+        "Death Mountain Trail Upper Red Rock GS without Hammer",
+        "After killing the Skulltula, the token can be collected by backflipping into the rock at the correct angle.");
+    // disabled for now, only applies when trade quest is not shuffled so there's a timer (currently not considered in
+    // logic) OPT_TRICK(RT_DMT_BOLERO_BIGGORON, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, {Tricks::Tag::INTERMEDIATE},
+    // "Deliver Eye Drops with Bolero of Fire", "Playing a warp song normally causes a trade item to spoil immediately,
+    // however, it is possible use Bolero to reach Biggoron and still deliver the Eye Drops before they spoil. If you do
+    // not wear the Goron Tunic, the heat timer inside the crater will override the trade item\'s timer. When you exit
+    // to Death Mountain Trail you will have one second to show the Eye Drops before they expire. You can get extra time
+    // to show the Eye Drops if you warp immediately upon receiving them. If you don't have many hearts, you may have to
+    // reset the heat timer by quickly dipping in and out of Darunia\'s chamber or quickly equipping and unequipping the
+    // Goron Tunic. This trick does not apply if \"Randomize Warp Song Destinations\" is enabled, or if the settings are
+    // such that trade items do not need to be delivered within a time limit.");
+    OPT_TRICK(RT_GC_POT, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::ADVANCED },
+              "Goron City Spinning Pot PoH with Bombchu",
+              "A Bombchu can be used to stop the spinning pot, but it can be quite finicky to get it to work.");
+    OPT_TRICK(RT_GC_POT_STRENGTH, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::INTERMEDIATE },
+              "Goron City Spinning Pot PoH with Strength",
+              "Allows for stopping the Goron City Spinning Pot using a Bomb Flower alone, requiring strength in lieu "
+              "of inventory explosives.");
+    OPT_TRICK(RT_GC_ROLLING_STRENGTH, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::INTERMEDIATE },
+              "Rolling Goron (Hot Rodder Goron) as Child with Strength",
+              "Use the Bomb Flower on the stairs or near Medigoron. Timing is tight, especially without backwalking.");
+    OPT_TRICK(RT_GC_LEFTMOST, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::ADVANCED },
+              "Goron City Maze Left Chest with Hover Boots",
+              "A precise backwalk starting from on top of the crate and ending with a precisely-timed backflip can "
+              "reach this chest without needing either the Hammer or Silver Gauntlets.");
+    OPT_TRICK(RT_GC_GROTTO, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::ADVANCED },
+              "Goron City Grotto with Hookshot While Taking Damage",
+              "It is possible to reach the Goron City Grotto by quickly using the Hookshot while in the midst of "
+              "taking damage from the lava floor.");
+    OPT_TRICK(RT_GC_LINK_GORON_DINS, RCQUEST_BOTH, RA_GORON_CITY, { Tricks::Tag::NOVICE },
+              "Stop Link the Goron with Din\'s Fire", "The timing is quite awkward.");
+    OPT_TRICK(RT_DMC_HOVER_BEAN_POH, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, { Tricks::Tag::NOVICE },
+              "Crater\'s Bean PoH with Hover Boots",
+              "Hover from the base of the bridge near Goron City and walk up the very steep slope.");
+    OPT_TRICK(RT_DMC_BOLERO_JUMP, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, { Tricks::Tag::EXTREME },
+              "Death Mountain Crater Jump to Bolero",
+              "As Adult, using a shield to drop a pot while you have the perfect speed and position, the pot can push "
+              "you that little extra distance you need to jump across the gap in the bridge.");
+    OPT_TRICK(RT_DMC_BOULDER_JS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, { Tricks::Tag::NOVICE },
+              "Death Mountain Crater Upper to Lower with Hammer",
+              "With the Hammer, you can jump slash the rock twice in the same jump in order to destroy it before you "
+              "fall into the lava.");
+    OPT_TRICK(RT_DMC_BOULDER_SKIP, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_CRATER, { Tricks::Tag::INTERMEDIATE },
+              "Death Mountain Crater Upper to Lower Boulder Skip",
+              "As adult, With careful positioning, you can jump to the ledge where the boulder is, then use repeated "
+              "ledge grabs to shimmy to a climbable ledge. This trick supersedes \"Death Mountain Crater Upper to "
+              "Lower with Hammer\".");
+    OPT_TRICK(RT_ZR_LOWER, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::INTERMEDIATE },
+              "Zora\'s River Lower Freestanding PoH as Adult with Nothing",
+              "Adult can reach this PoH with a precise jump, no Hover Boots required.");
+    OPT_TRICK(RT_ZR_UPPER, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::INTERMEDIATE },
+              "Zora\'s River Upper Freestanding PoH as Adult with Nothing",
+              "Adult can reach this PoH with a precise jump, no Hover Boots required.");
+    OPT_TRICK(RT_ZR_HOVERS, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::NOVICE },
+              "Zora\'s Domain Entry with Hover Boots", "Can hover behind the waterfall as adult.");
+    OPT_TRICK(RT_ZR_CUCCO, RCQUEST_BOTH, RA_ZORAS_RIVER, { Tricks::Tag::NOVICE }, "Zora\'s Domain Entry with Cucco",
+              "You can fly behind the waterfall with a Cucco as child.");
+    OPT_TRICK(RT_ZD_KING_ZORA_SKIP, RCQUEST_BOTH, RA_ZORAS_DOMAIN, { Tricks::Tag::INTERMEDIATE },
+              "Skip King Zora as Adult with Nothing",
+              "With a precise jump as adult, it is possible to get on the fence next to King Zora from the front to "
+              "access Zora's Fountain.");
+    OPT_TRICK(RT_ZD_GS, RCQUEST_BOTH, RA_ZORAS_DOMAIN, { Tricks::Tag::INTERMEDIATE },
+              "Zora\'s Domain GS with No Additional Items",
+              "A precise jump slash can kill the Skulltula and recoil back onto the top of the frozen waterfall. To "
+              "kill it, the logic normally guarantees one of Hookshot, Bow, or Magic.");
+    OPT_TRICK(RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES, RCQUEST_BOTH, RA_ZORAS_FOUNTAIN, { Tricks::Tag::NOVICE },
+              "Zora\'s Fountain Great Fairy without Explosives",
+              "It's possible to use silver gauntlets to pick up the silver rock and hammer to break the rock below it, "
+              "allowing you to ledge grab the edge of the hole and get past the breakable wall (hammer can't break the "
+              "wall itself).");
+    OPT_TRICK(RT_LH_LAB_WALL_GS, RCQUEST_BOTH, RA_LAKE_HYLIA, { Tricks::Tag::NOVICE },
+              "Lake Hylia Lab Wall GS with Jump Slash",
+              "The jump slash to actually collect the token is somewhat precise.");
+    OPT_TRICK(RT_LH_LAB_DIVING, RCQUEST_BOTH, RA_LAKE_HYLIA, { Tricks::Tag::NOVICE },
+              "Lake Hylia Lab Dive without Gold Scale",
+              "Remove the Iron Boots in the midst of Hookshotting the underwater crate.");
+    OPT_TRICK(RT_LH_WATER_HOOKSHOT, RCQUEST_BOTH, RA_LAKE_HYLIA, { Tricks::Tag::INTERMEDIATE },
+              "Water Temple Entry without Iron Boots using Hookshot",
+              "When entering Water Temple using Gold Scale instead of Iron Boots, the Longshot is usually used to be "
+              "able to hit the switch and open the gate. But, by standing in a particular spot, the switch can be hit "
+              "with only the reach of the Hookshot.");
+    OPT_TRICK(RT_GV_CRATE_HOVERS, RCQUEST_BOTH, RA_GERUDO_VALLEY, { Tricks::Tag::INTERMEDIATE },
+              "Gerudo Valley Crate PoH as Adult with Hover Boots",
+              "From the far side of Gerudo Valley, a precise Hover Boots movement and jump-slash recoil can allow "
+              "adult to reach the ledge with the crate PoH without needing Longshot. You will take fall damage.");
+    OPT_TRICK(RT_PASS_GUARDS_WITH_NOTHING, RCQUEST_BOTH, RA_GERUDO_FORTRESS, { Tricks::Tag::NOVICE },
+              "Sneak Past Moving Gerudo Guards with No Items",
+              "The logic normally guarantees Bow or Hookshot to stun them from a distance,"
+              "but every moving guard can be passed with basic movement and AI manipulation");
+    OPT_TRICK(RT_GF_JUMP, RCQUEST_BOTH, RA_GERUDO_FORTRESS, { Tricks::Tag::NOVICE }, "Gerudo\'s Fortress Ledge Jumps",
+              "It is possible to navigate the rooves of Fortress with unintuative jumps to reach additional areas "
+              "without going inside.");
+    OPT_TRICK(RT_GF_WARRIOR_WITH_DIFFICULT_WEAPON, RCQUEST_BOTH, RA_GERUDO_FORTRESS, { Tricks::Tag::NOVICE },
+              "Gerudo\'s Fortress Warriors with Difficult Weapons",
+              "Warriors can be defeated with Slingshot or Bombchus.");
+    // disabled for now, can't check for being able to use bunny hood & bunny hood speedup is currently completely
+    // decoupled from rando OPT_TRICK(RT_HW_BUNNY_CROSSING, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, {Tricks::Tag::NOVICE},
+    // "Wasteland Crossing with Bunny Hood", "You can beat the quicksand by using the increased speed of the Bunny Hood.
+    // Note that jumping to the carpet merchant as child typically requires a fairly precise jump slash.");
+    OPT_TRICK(RT_HW_CROSSING, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, { Tricks::Tag::INTERMEDIATE },
+              "Wasteland Crossing without Hover Boots or Longshot",
+              "You can beat the quicksand by backwalking across it in a specific way. Note that jumping to the carpet "
+              "merchant as child typically requires a fairly precise jump slash.");
+    OPT_TRICK(RT_LENS_HW, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, { Tricks::Tag::INTERMEDIATE }, "Lensless Wasteland",
+              "By memorizing the path, you can travel through the Wasteland without using the Lens of Truth to see the "
+              "Poe. The equivalent trick for going in reverse through the Wasteland is \"Reverse Wasteland\".");
+    OPT_TRICK(
+        RT_HW_REVERSE, RCQUEST_BOTH, RA_HAUNTED_WASTELAND, { Tricks::Tag::INTERMEDIATE }, "Reverse Wasteland",
+        "By memorizing the path, you can travel through the Wasteland in reverse. Note that jumping to the carpet "
+        "merchant as child typically requires a fairly precise jump slash. The equivalent trick for going forward "
+        "through the Wasteland is \"Lensless Wasteland\". To cross the river of sand with no additional items, be sure "
+        "to also enable \"Wasteland Crossing without Hover Boots or Longshot\". Unless all overworld entrances are "
+        "randomized, Child Link will not be expected to do anything at Gerudo's Fortress.");
+    OPT_TRICK(RT_COLOSSUS_GS, RCQUEST_BOTH, RA_DESERT_COLOSSUS, { Tricks::Tag::NOVICE },
+              "Colossus Hill GS with Hookshot",
+              "Somewhat precise. If you kill enough Leevers you can get enough of a break to take some time to aim "
+              "more carefully.");
+    OPT_TRICK(RT_DEKU_BASEMENT_GS, RCQUEST_VANILLA, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
+              "Deku Tree Basement Vines GS with Jump Slash", "Can be defeated by doing a precise jump slash.");
+    OPT_TRICK(RT_DEKU_B1_SKIP, RCQUEST_BOTH, RA_DEKU_TREE, { Tricks::Tag::INTERMEDIATE },
+              "Deku Tree Basement without Slingshot",
+              "A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If "
+              "used with the \"Closed Forest\" setting, a Slingshot will not be guaranteed to exist somewhere inside "
+              "the Forest. This trick applies to both Vanilla and Master Quest.");
+    OPT_TRICK(RT_DEKU_B1_BOW_WEBS, RCQUEST_VANILLA, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
+              "Deku Tree Basement Web to Gohma with Bow",
+              "All spider web walls in the Deku Tree basement can be burnt as adult with just a bow by shooting "
+              "through torches. This trick only applies to the circular web leading to Gohma; the two vertical webs "
+              "are always in logic. Backflip onto the chest near the torch at the bottom of the vine wall. With "
+              "precise positioning you can shoot through the torch to the right edge of the circular web. This allows "
+              "completion of adult Deku Tree with no fire source.");
+    OPT_TRICK(RT_DEKU_B1_BACKFLIP_OVER_SPIKED_LOG, RCQUEST_VANILLA, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
+              "Deku Tree Basement Backflip over Spiked Log",
+              "Allows backflipping over the spiked log in the Deku Tree basement in Vanilla. Only relevant if "
+              "\"Shuffle Swim\" is enabled.");
+    OPT_TRICK(RT_DEKU_MQ_COMPASS_GS, RCQUEST_MQ, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
+              "Deku Tree MQ Compass Room GS Boulders with Just Hammer",
+              "Climb to the top of the vines, then let go and jump slash immediately to destroy the boulders using the "
+              "Hammer, without needing to spawn a Song of Time block.");
+    OPT_TRICK(RT_DEKU_MQ_LOG, RCQUEST_MQ, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
+              "Deku Tree MQ Roll Under the Spiked Log",
+              "You can get past the spiked log by rolling to briefly shrink your hitbox. As adult, the timing is a bit "
+              "more precise.");
+    OPT_TRICK(RT_DC_SCARECROW_GS, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Scarecrow GS with Armos Statue",
+              "You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long "
+              "time to pull the statue the entire way. The jump to the alcove can be a bit picky when done as child.");
+    OPT_TRICK(RT_DC_VINES_GS, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Vines GS from Below with Longshot",
+              "The vines upon which this Skulltula rests are one-sided collision. You can use the Longshot to get it "
+              "from below, by shooting it through the vines, bypassing the need to lower the staircase.");
+    OPT_TRICK(RT_DC_STAIRS_WITH_BOW, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Stairs with Bow",
+              "The Bow can be used to knock down the stairs with two well-timed shots.");
+    OPT_TRICK(RT_DC_SLINGSHOT_SKIP, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, { Tricks::Tag::EXPERT },
+              "Dodongo\'s Cavern Child Slingshot Skips",
+              "With precise platforming, child can cross the platforms while the flame circles are there. When "
+              "enabling this trick, it's recommended that you also enable the Adult variant: \"Dodongo's Cavern Spike "
+              "Trap Room Jump without Hover Boots\".");
+    OPT_TRICK(RT_DC_SCRUB_ROOM, RCQUEST_VANILLA, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Two Scrub Room with Strength",
+              "With help from a conveniently-positioned block, Adult can quickly carry a Bomb Flower over to destroy "
+              "the mud wall blocking the room with two Deku Scrubs.");
+    OPT_TRICK(RT_DC_JUMP, RCQUEST_BOTH, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Spike Trap Room Jump without Hover Boots",
+              "The jump is Adult Link only. Applies to both Vanilla and MQ.");
+    OPT_TRICK(RT_DC_HAMMER_FLOOR, RCQUEST_BOTH, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern Smash the Boss Lobby Floor",
+              "The bombable floor before King Dodongo can be destroyed with Hammer if hit in the very center. This is "
+              "only relevant with Shuffle Boss Entrances or if Dodongo's Cavern is MQ and either variant of "
+              "\"Dodongo's Cavern MQ Light the Eyes with Strength\" is on.");
+    OPT_TRICK(RT_DC_DODONGO_CHU, RCQUEST_BOTH, RA_DODONGOS_CAVERN, { Tricks::Tag::ADVANCED },
+              "Dodongo\'s Cavern Dodongo without Bombchus",
+              "With precise timing you can feed King Dodongo a bombchu during a backflip");
+    OPT_TRICK(RT_DC_MQ_STAIRS_WITH_ONLY_STRENGTH, RCQUEST_MQ, RA_DODONGOS_CAVERN, { Tricks::Tag::NOVICE },
+              "Dodongo\'s Cavern MQ Stairs With Only Strength",
+              "Taking a bomb from the back can be used to lower stairs without using stick to drop bomb from wall.");
+    OPT_TRICK(RT_DC_MQ_CHILD_BOMBS, RCQUEST_MQ, RA_DODONGOS_CAVERN, { Tricks::Tag::ADVANCED },
+              "Dodongo\'s Cavern MQ Early Bomb Bag Area as Child",
+              "With a precise jump slash from above, you can reach the Bomb Bag area as only child without needing a "
+              "Slingshot. You will take fall damage.");
+    OPT_TRICK(RT_DC_MQ_CHILD_EYES, RCQUEST_MQ, RA_DODONGOS_CAVERN, { Tricks::Tag::EXPERT },
+              "Dodongo\'s Cavern MQ Light the Eyes with Strength as Child",
+              "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the "
+              "eyes. To perform this trick as child is significantly more difficult than adult. The player is also "
+              "expected to complete the DC back area without explosives, including getting past the Armos wall to the "
+              "switch for the boss door.");
+    OPT_TRICK(
+        RT_DC_MQ_ADULT_EYES, RCQUEST_MQ, RA_DODONGOS_CAVERN, { Tricks::Tag::ADVANCED },
+        "Dodongo\'s Cavern MQ Light the Eyes with Strength as Adult",
+        "If you move very quickly, it is possible to use the bomb flower at the top of the room to light the eyes.");
+    OPT_TRICK(RT_JABU_ALCOVE_JUMP_DIVE, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, { Tricks::Tag::NOVICE },
+              "Jabu Underwater Alcove as Adult with Jump Dive",
+              "Standing above the underwater tunnel leading to the scrub, jump down and swim through the tunnel. This "
+              "allows adult to access the alcove with no Scale or Iron Boots. In Vanilla Jabu, this alcove has a "
+              "business scrub. In MQ Jabu, it has the compass chest and a door switch for the main floor.");
+    OPT_TRICK(RT_JABU_BOSS_HOVER, RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, { Tricks::Tag::INTERMEDIATE },
+              "Jabu Near Boss Room with Hover Boots",
+              "A box for the blue switch can be carried over by backwalking with one while the elevator is at its "
+              "peak. Alternatively, you can skip transporting a box by quickly rolling from the switch and opening the "
+              "door before it closes. However, the timing for this is very tight.");
+    OPT_TRICK(
+        RT_JABU_NEAR_BOSS_RANGED, RCQUEST_BOTH, RA_JABU_JABUS_BELLY, { Tricks::Tag::NOVICE },
+        "Jabu Near Boss Ceiling Switch/GS without Boomerang or Explosives",
+        "Vanilla Jabu: From near the entrance into the room, you can hit the switch that opens the door to the boss "
+        "room using a precisely-aimed use of the Slingshot, Bow, or Longshot. As well, if you climb to the top of the "
+        "vines you can stand on the right edge of the platform and shoot around the glass. From this distance, even "
+        "the Hookshot can reach the switch. This trick is only relevant if \"Shuffle Boss Entrances\" is enabled. MQ "
+        "Jabu: A Gold Skulltula Token can be collected with the Hookshot or Longshot using the same methods as hitting "
+        "the switch in Vanilla. This MQ trick is not currently relevant in logic.");
+    OPT_TRICK(RT_JABU_NEAR_BOSS_EXPLOSIVES, RCQUEST_VANILLA, RA_JABU_JABUS_BELLY, { Tricks::Tag::INTERMEDIATE },
+              "Jabu Near Boss Ceiling Switch with Explosives",
+              "You can hit the switch that opens the door to the boss room using a precisely-aimed Bombchu. Also, "
+              "using the Hover Boots, adult can throw a Bomb at the switch. This trick is only relevant if \"Shuffle "
+              "Boss Entrances\" is enabled.");
+    OPT_TRICK(RT_LENS_JABU_MQ, RCQUEST_MQ, RA_JABU_JABUS_BELLY, { Tricks::Tag::NOVICE },
+              "Jabu MQ without Lens of Truth", "Removes the requirements for the Lens of Truth in Jabu MQ.");
+    OPT_TRICK(RT_JABU_MQ_RANG_JUMP, RCQUEST_MQ, RA_JABU_JABUS_BELLY, { Tricks::Tag::ADVANCED },
+              "Jabu MQ Compass Chest with Boomerang",
+              "Boomerang can reach the cow switch to spawn the chest by targeting the cow, jumping off of the ledge "
+              "where the chest spawns, and throwing the Boomerang in midair.");
+    OPT_TRICK(RT_JABU_MQ_SOT_GS, RCQUEST_MQ, RA_JABU_JABUS_BELLY, { Tricks::Tag::INTERMEDIATE },
+              "Jabu MQ Song of Time Block GS with Boomerang",
+              "Allow the Boomerang to return to you through the Song of Time block to grab the token.");
+    OPT_TRICK(RT_LENS_BOTW, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
+              "Bottom of the Well without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Bottom of the Well.");
+    OPT_TRICK(RT_BOTTOM_OF_THE_WELL_NAVI_DIVE, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL,
+              { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH }, "Bottom of the Well Navi dive",
+              "You need Deku Sticks or Kokiri Sword to dive with Navi for entering Bottom of the Well.");
+    OPT_TRICK(RT_BOTW_CHILD_DEADHAND, RCQUEST_BOTH, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
+              "Child Dead Hand without Kokiri Sword", "Requires 9 sticks or 5 jump slashes.");
+    OPT_TRICK(RT_BOTW_BASEMENT, RCQUEST_VANILLA, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
+              "Bottom of the Well Map Chest with Strength & Sticks",
+              "The chest in the basement can be reached with strength by doing a jump slash with a lit stick to access "
+              "the Bomb Flowers.");
+    OPT_TRICK(RT_BOTW_MQ_PITS, RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
+              "Bottom of the Well MQ Jump Over the Pits",
+              "While the pits in Bottom of the Well don't allow you to jump just by running straight at them, you can "
+              "still get over them by side-hopping or backflipping across. With explosives, this allows you to access "
+              "the central areas without Zelda's Lullaby. With Zelda's Lullaby, it allows you to access the west inner "
+              "room without explosives.");
+    OPT_TRICK(RT_BOTW_MQ_DEADHAND_KEY, RCQUEST_MQ, RA_BOTTOM_OF_THE_WELL, { Tricks::Tag::NOVICE },
+              "Bottom of the Well MQ Dead Hand Freestanding Key with Boomerang",
+              "Boomerang can fish the item out of the rubble without needing explosives to blow it up.");
+    OPT_TRICK(RT_FOREST_FIRST_GS, RCQUEST_VANILLA, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple First Room GS with Difficult-to-Use Weapons",
+              "Allows killing this Skulltula with Sword or Sticks by jump slashing it as you let go from the vines. "
+              "You can avoid taking fall damage by recoiling onto the tree. Also allows killing it as Child with a "
+              "Bomb throw. It's much more difficult to use a Bomb as child due to Child Link's shorter height.");
+    OPT_TRICK(RT_FOREST_OUTDOORS_EAST_GS, RCQUEST_VANILLA, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple East Courtyard GS with Boomerang",
+              "Precise Boomerang throws can allow child to kill the Skulltula and collect the token.");
+    OPT_TRICK(RT_FOREST_VINES, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple East Courtyard Vines with Hookshot",
+              "The vines in Forest Temple leading to where the well drain switch is in the standard form can be barely "
+              "reached with just the Hookshot. Applies to MQ also.");
+    OPT_TRICK(RT_FOREST_OUTDOORS_LEDGE, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple NE Outdoors Ledge with Hover Boots",
+              "With precise Hover Boots movement you can fall down to this ledge from upper balconies. If done "
+              "precisely enough, it is not necessary to take fall damage. In MQ, this skips a Longshot requirement. In "
+              "Vanilla, this can skip a Hookshot requirement in entrance randomizer.");
+    OPT_TRICK(RT_FOREST_DOORFRAME, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Forest Temple East Courtyard Door Frame with Hover Boots",
+              "A precise Hover Boots movement from the upper balconies in this courtyard can be used to get on top of "
+              "the door frame. Applies to both Vanilla and Master Quest. In Vanilla, from on top the door frame you "
+              "can summon Pierre, allowing you to access the falling ceiling room early. In Master Quest, this allows "
+              "you to obtain the GS on the door frame as adult without Hookshot or Song of Time.");
+    OPT_TRICK(RT_FOREST_OUTSIDE_BACKDOOR, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Forest Temple Outside Backdoor with Jump Slash",
+              "A jump slash recoil can be used to reach the ledge in the block puzzle room that leads to the west "
+              "courtyard. This skips a potential Hover Boots requirement in Vanilla, and it can sometimes apply in MQ "
+              "as well. This trick can be performed as both ages.");
+    OPT_TRICK(RT_FOREST_OUTDOORS_HEARTS_BOOMERANG, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple Outside Hearts with Boomerang",
+              "A well aimed boomerang from the water's edge can reach the hearts from ground level. If unable to swim, "
+              "you can back away from the water while the boomerang is returning so the hearts land on the ground.");
+    OPT_TRICK(RT_FOREST_MQ_WELL_SWIM, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Swim Through Forest Temple MQ Well with Hookshot",
+              "Shoot the vines in the well as low and as far to the right as possible, and then immediately swim under "
+              "the ceiling to the right. This can only be required if Forest Temple is in its Master Quest form.");
+    OPT_TRICK(RT_FOREST_MQ_BLOCK_PUZZLE, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Skip Forest Temple MQ Block Puzzle with Bombchu",
+              "Send the Bombchu straight up the center of the wall directly to the left upon entering the room.");
+    // Child with hovers cannot do this from the lower floor, and most go to the upper floor which needs goron bracelet.
+    // Adult can do this with hammer and KSword, But child cannot.
+    OPT_TRICK(RT_FOREST_MQ_JS_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
+              "Forest Temple MQ Twisted Hallway Switch with Jump Slash",
+              "The switch to twist the hallway can be hit with a jump slash through the glass block. To get in front "
+              "of the switch, either use the Hover Boots or hit the shortcut switch at the top of the room and jump "
+              "from the glass blocks that spawn. Sticks can be used as child, but the Kokiri Sword is too short to "
+              "reach through the glass.");
+    OPT_TRICK(RT_FOREST_MQ_HOOKSHOT_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Forest Temple MQ Twisted Hallway Switch with Hookshot",
+              "There's a very small gap between the glass block and the wall. Through that gap you can hookshot the "
+              "target on the ceiling.");
+    OPT_TRICK(RT_FOREST_MQ_RANG_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Forest Temple MQ Twisted Hallway Switch with Boomerang",
+              "The Boomerang can return to Link through walls, allowing child to hit the hallway switch. This can be "
+              "used to allow adult to pass through later, or in conjunction with \"Forest Temple Outside Backdoor with "
+              "Jump Slash\".");
+    OPT_TRICK(RT_FIRE_BOSS_DOOR_JUMP, RCQUEST_BOTH, RA_FIRE_TEMPLE, { Tricks::Tag::NOVICE },
+              "Fire Temple Boss Door without Hover Boots or Pillar",
+              "The Fire Temple Boss Door can be reached as adult with a precise jump. You must be touching the side "
+              "wall of the room so that Link will grab the ledge from farther away than is normally possible.");
+    // Is also used in MQ logic, but has no practical effect there as of now
+    OPT_TRICK(RT_FIRE_SOT, RCQUEST_VANILLA, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple Song of Time Room GS without Song of Time",
+              "A precise jump can be used to reach this room.");
+    OPT_TRICK(RT_FIRE_STRENGTH, RCQUEST_VANILLA, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple Climb without Strength", "A precise jump can be used to skip pushing the block.");
+    OPT_TRICK(RT_FIRE_SCARECROW, RCQUEST_VANILLA, RA_FIRE_TEMPLE, { Tricks::Tag::EXPERT },
+              "Fire Temple East Tower without Scarecrow\'s Song",
+              "Also known as \"Pixelshot\". The Longshot can reach the target on the elevator itself, allowing you to "
+              "skip needing to spawn the scarecrow.");
+    OPT_TRICK(RT_FIRE_FLAME_MAZE, RCQUEST_VANILLA, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple Flame Wall Maze Skip",
+              "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To "
+              "do it without taking damage is more precise. Allows you to progress without needing either a Small Key "
+              "or Hover Boots.");
+    OPT_TRICK(RT_FIRE_MQ_NEAR_BOSS, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::NOVICE },
+              "Fire Temple MQ Chest Near Boss without Breaking Crate",
+              "The hitbox for the torch extends a bit outside of the crate. Shoot a flaming arrow at the side of the "
+              "crate to light the torch without needing to get over there and break the crate.");
+    OPT_TRICK(RT_FIRE_MQ_BLOCKED_CHEST, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple MQ Big Lava Room Blocked Door without Hookshot",
+              "There is a gap between the hitboxes of the flame wall in the big lava room. If you know where this gap "
+              "is located, you can jump through it and skip needing to use the Hookshot. To do this without taking "
+              "damage is more precise.");
+    OPT_TRICK(
+        RT_FIRE_MQ_BK_CHEST, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Fire Temple MQ Boss Key Chest without Bow",
+        "It is possible to light both of the timed torches to unbar the door to the boss key chest's room with just "
+        "Din's Fire if you move very quickly between the two torches. It is also possible to unbar the door with just "
+        "Din's Fire by abusing an oversight in the way the game counts how many torches have been lit.");
+    OPT_TRICK(RT_FIRE_MQ_CLIMB, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::NOVICE },
+              "Fire Temple MQ Climb without Fire Source",
+              "You can use the Hover Boots to hover around to the climbable wall, skipping the need to use a fire "
+              "source and spawn a Hookshot target.");
+    OPT_TRICK(RT_FIRE_MQ_MAZE_SIDE_ROOM, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::NOVICE },
+              "Fire Temple MQ Lizalfos Maze Side Room without Box",
+              "You can walk from the blue switch to the door and quickly open the door before the bars reclose. This "
+              "skips needing to reach the upper sections of the maze to get a box to place on the switch.");
+    OPT_TRICK(RT_FIRE_MQ_MAZE_HOVERS, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::NOVICE },
+              "Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots",
+              "Use the Hover Boots off of a crate to climb to the upper maze without needing to spawn and use the "
+              "Hookshot targets.");
+    OPT_TRICK(RT_FIRE_MQ_MAZE_JUMP, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple MQ Lower to Upper Lizalfos Maze with Precise Jump",
+              "A precise jump off of a crate can be used to climb to the upper maze without needing to spawn and use "
+              "the Hookshot targets. This trick supersedes both \"Fire Temple MQ Lower to Upper Lizalfos Maze with "
+              "Hover Boots\" and \"Fire Temple MQ Lizalfos Maze Side Room without Box\".");
+    OPT_TRICK(RT_FIRE_MQ_ABOVE_MAZE_GS, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Fire Temple MQ Above Flame Wall Maze GS from Below with Longshot",
+              "The floor of the room that contains this Skulltula is only solid from above. From the maze below, the "
+              "Longshot can be shot through the ceiling to obtain the token with two fewer small keys than normal.");
+    OPT_TRICK(
+        RT_FIRE_MQ_FLAME_MAZE, RCQUEST_MQ, RA_FIRE_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Fire Temple MQ Flame Wall Maze Skip",
+        "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. To do it "
+        "without taking damage is more precise. Allows you to reach the side room GS without needing Song of Time or "
+        "Hover Boots. If either of \"Fire Temple MQ Lower to Upper Lizalfos Maze with Hover Boots\" or \"with Precise "
+        "Jump\" are enabled, this also allows you to progress deeper into the dungeon without Hookshot.");
+    OPT_TRICK(RT_WATER_LONGSHOT_TORCH, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple Torch Longshot",
+              "Stand on the eastern side of the central pillar and longshot the torches on the bottom level. Swim "
+              "through the corridor and float up to the top level. This allows access to this area and lower water "
+              "levels without Iron Boots. The majority of the tricks that allow you to skip Iron Boots in the Water "
+              "Temple are not going to be relevant unless this trick is first enabled.");
+    OPT_TRICK(RT_WATER_CRACKED_WALL_HOVERS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple Cracked Wall with Hover Boots",
+              "With a midair side-hop while wearing the Hover Boots, you can reach the cracked wall without needing to "
+              "raise the water up to the middle level.");
+    OPT_TRICK(RT_WATER_CRACKED_WALL, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Water Temple Cracked Wall with No Additional Items",
+              "A precise jump slash (among other methods) will get you to the cracked wall without needing the Hover "
+              "Boots or to raise the water to the middle level. This trick supersedes \"Water Temple Cracked Wall with "
+              "Hover Boots\".");
+    OPT_TRICK(RT_WATER_BK_REGION, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Water Temple Boss Key Region with Hover Boots",
+              "With precise Hover Boots movement it is possible to reach the boss key chest's region without needing "
+              "the Longshot. It is not necessary to take damage from the spikes. The Gold Skulltula Token in the "
+              "following room can also be obtained with just the Hover Boots.");
+    OPT_TRICK(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Water Temple North Basement Ledge with Precise Jump",
+              "In the northern basement there's a ledge from where, in Vanilla Water Temple, boulders roll out into "
+              "the room. Normally to jump directly to this ledge logically requires the Hover Boots, but with precise "
+              "jump, it can be done without them. This trick applies to both Vanilla and Master Quest.");
+    OPT_TRICK(
+        RT_WATER_BK_JUMP_DIVE, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+        "Water Temple Boss Key Jump Dive",
+        "Stand on the very edge of the raised corridor leading from the push block room to the rolling boulder "
+        "corridor. Face the Gold Skulltula on the waterfall and jump over the boulder corridor floor into the pool of "
+        "water, swimming right once underwater. This allows access to the boss key room without Iron boots.");
+    // Also used in MQ logic, but won't be relevent unless a way to enter tower without irons exists (likely a clip +
+    // swim)
+    OPT_TRICK(RT_WATER_FW_CENTRAL_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple Central Pillar GS with Farore\'s Wind",
+              "If you set Farore's Wind inside the central pillar and then return to that warp point after raising the "
+              "water to the highest level, you can obtain this Skulltula Token with Hookshot or Boomerang.");
+    OPT_TRICK(
+        RT_WATER_IRONS_CENTRAL_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+        "Water Temple Central Pillar GS with Iron Boots",
+        "After opening the middle water level door into the central pillar, the door will stay unbarred so long as you "
+        "do not leave the room, even if you were to raise the water up to the highest level. With the Iron Boots to go "
+        "through the door after the water has been raised, you can obtain the Skulltula Token with the Hookshot.");
+    OPT_TRICK(RT_WATER_CENTRAL_BOW, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Water Temple Central Bow Target without Longshot or Hover Boots",
+              "A very precise Bow shot can hit the eye switch from the floor above. Then, you can jump down into the "
+              "hallway and make through it before the gate closes. It can also be done as child, using the Slingshot "
+              "instead of the Bow.");
+    OPT_TRICK(
+        RT_WATER_HOOKSHOT_FALLING_PLATFORM_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+        "Water Temple Falling Platform Room GS with Hookshot",
+        "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Hookshot.");
+    OPT_TRICK(
+        RT_WATER_RANG_FALLING_PLATFORM_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Water Temple Falling Platform Room GS with Boomerang",
+        "If you stand on the very edge of the platform, this Gold Skulltula can be obtained with only the Boomerang.");
+    OPT_TRICK(RT_WATER_RIVER_GS, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Water Temple River GS without Iron Boots",
+              "Standing on the exposed ground toward the end of the river, a precise Longshot use can obtain the "
+              "token. The Longshot cannot normally reach far enough to kill the Skulltula, however. You'll first have "
+              "to find some other way of killing it.");
+    OPT_TRICK(RT_WATER_DRAGON_JUMP_DIVE, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple Dragon Statue Jump Dive",
+              "If you come into the dragon statue room from the serpent river, you can jump down from above and get "
+              "into the tunnel without needing either Iron Boots or a Scale. This trick applies to both Vanilla and "
+              "Master Quest. In Vanilla, you must shoot the switch from above with the Bow, and then quickly get "
+              "through the tunnel before the gate closes.");
+    OPT_TRICK(RT_WATER_ADULT_DRAGON, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple Dragon Statue Switch from Above the Water as Adult",
+              "Normally you need both Hookshot and Iron Boots to hit the switch and swim through the tunnel to get to "
+              "the chest. But by hitting the switch from dry land, using one of Bombchus, Hookshot, or Bow, it is "
+              "possible to skip one or both of those requirements. After the gate has been opened, besides just using "
+              "the Iron Boots, a well-timed dive with at least the Silver Scale could be used to swim through the "
+              "tunnel. If coming from the serpent river, a jump dive can also be used to get into the tunnel.");
+    OPT_TRICK(RT_WATER_CHILD_DRAGON, RCQUEST_VANILLA, RA_WATER_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Water Temple Dragon Statue Switch from Above the Water as Child",
+              "It is possible for child to hit the switch from dry land using one of Bombchus, Slingshot or Boomerang. "
+              "Then, to get to the chest, child can dive through the tunnel using at least the Silver Scale. The "
+              "timing and positioning of this dive needs to be perfect to actually make it under the gate, and it all "
+              "needs to be done very quickly to be able to get through before the gate closes. Be sure to enable "
+              "\"Water Temple Dragon Statue Switch from Above the Water as Adult\" for adult's variant of this trick.");
+    OPT_TRICK(RT_WATER_MQ_CENTRAL_PILLAR, RCQUEST_MQ, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+              "Water Temple MQ Central Pillar with Fire Arrows",
+              "Slanted torches have misleading hitboxes. Whenever you see a slanted torch jutting out of the wall, you "
+              "can expect most or all of its hitbox is actually on the other side that wall. This can make slanted "
+              "torches very finicky to light when using arrows. The torches in the central pillar of MQ Water Temple "
+              "are a particularly egregious example. Logic normally expects Din's Fire and Song of Time.");
+    OPT_TRICK(
+        RT_WATER_MQ_LOCKED_GS, RCQUEST_MQ, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
+        "Water Temple MQ North Basement GS without Small Key",
+        "There is an invisible Hookshot target that can be used to get over the gate that blocks you from going to "
+        "this Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door.");
+    OPT_TRICK(RT_WATER_MORPHA_WITHOUT_HOOKSHOT, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::EXTREME },
+              "Water Temple Morpha without Hookshot", "It is possible to slash at Morpha without hookshot.");
+    OPT_TRICK(RT_LENS_SHADOW, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple Stationary Objects without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Shadow Temple for most areas in the dungeon except "
+              "for crossing the moving platform in the huge pit room and for fighting Bongo Bongo.");
+    OPT_TRICK(RT_LENS_SHADOW_PLATFORM, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple Invisible Moving Platform without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Shadow Temple to cross the invisible moving platform "
+              "in the huge pit room in either direction.");
+    OPT_TRICK(RT_LENS_BONGO, RCQUEST_BOTH, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple Bongo Bongo without Lens of Truth",
+              "Bongo Bongo can be defeated without the use of Lens of Truth, as the hands give a pretty good idea of "
+              "where the eye is.");
+    OPT_TRICK(RT_SHADOW_UMBRELLA, RCQUEST_BOTH, RA_SHADOW_TEMPLE, { Tricks::Tag::EXPERT },
+              "Shadow Temple Stone Umbrella Skip",
+              "A very precise Hover Boots movement from off of the lower chest can get you on top of the crushing "
+              "spikes without needing to pull the block. Applies to both Vanilla and Master Quest.");
+    OPT_TRICK(RT_SHADOW_UMBRELLA_GS, RCQUEST_BOTH, RA_SHADOW_TEMPLE, { Tricks::Tag::EXPERT },
+              "Shadow Temple Falling Spikes GS with Hover Boots",
+              "After killing the Skulltula, a very precise Hover Boots movement from off of the lower chest can get "
+              "you on top of the crushing spikes without needing to pull the block. From there, another very precise "
+              "Hover Boots movement can be used to obtain the token without needing the Hookshot. Applies to both "
+              "Vanilla and Master Quest. For obtaining the chests in this room with just Hover Boots, be sure to "
+              "enable \"Shadow Temple Stone Umbrella Skip\".");
+    OPT_TRICK(RT_SHADOW_FREESTANDING_KEY, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple Freestanding Key with Bombchu",
+              "Release the Bombchu with good timing so that it explodes near the bottom of the pot.");
+    OPT_TRICK(RT_SHADOW_STATUE, RCQUEST_BOTH, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Shadow Temple River Statue with Bombchu",
+              "By sending a Bombchu around the edge of the gorge, you can knock down the statue without needing a Bow. "
+              "Applies in both Vanilla and MQ Shadow.");
+    OPT_TRICK(RT_SHADOW_BONGO, RCQUEST_BOTH, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Shadow Temple Bongo Bongo without projectiles",
+              "Using precise sword slashes, Bongo Bongo can be defeated without using projectiles. This is only "
+              "relevant in conjunction with Shadow Temple dungeon shortcuts or shuffled boss entrances.");
+    OPT_TRICK(RT_LENS_SHADOW_MQ, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple MQ Stationary Objects without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Shadow Temple MQ for most areas in the dungeon. See "
+              "\"Shadow Temple MQ Invisible Moving Platform without Lens of Truth\", \"Shadow Temple MQ Invisible "
+              "Blades Silver Rupees without Lens of Truth\", \"Shadow Temple MQ 2nd Dead Hand without Lens of Truth\", "
+              "and \"Shadow Temple Bongo Bongo without Lens of Truth\" for exceptions.");
+    OPT_TRICK(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple MQ Invisible Blades Silver Rupees without Lens of Truth",
+              "Removes the requirement for the Lens of Truth or Nayru's Love in Shadow Temple MQ for the Invisible "
+              "Blades room Silver Rupee collection.");
+    OPT_TRICK(RT_LENS_SHADOW_MQ_PLATFORM, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple MQ Invisible Moving Platform without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Shadow Temple MQ to cross the invisible moving "
+              "platform in the huge pit room in either direction.");
+    OPT_TRICK(RT_LENS_SHADOW_MQ_DEADHAND, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },
+              "Shadow Temple MQ 2nd Dead Hand without Lens of Truth",
+              "Dead Hand spawns in a random spot within the room. Having Lens removes the hassle of having to comb the "
+              "room looking for his spawn location.");
+    OPT_TRICK(RT_SHADOW_MQ_GAP, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Shadow Temple MQ Truth Spinner Gap with Longshot",
+              "You can Longshot a torch and jump-slash recoil onto the tongue. It works best if you Longshot the right "
+              "torch from the left side of the room.");
+    OPT_TRICK(
+        RT_SHADOW_MQ_INVISIBLE_BLADES, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Shadow Temple MQ Invisible Blades without Song of Time",
+        "The Like Like can be used to boost you into the Silver Rupee or Recovery Hearts that normally require Song of "
+        "Time. This cannot be performed on OHKO since the Like Like does not boost you high enough if you die.");
+    OPT_TRICK(RT_SHADOW_MQ_HUGE_PIT, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Shadow Temple MQ Lower Huge Pit without Fire Source",
+              "Normally a frozen eye switch spawns some platforms that you can use to climb down, but there's actually "
+              "a small piece of ground that you can stand on that you can just jump down to.");
+    OPT_TRICK(
+        RT_SHADOW_MQ_WINDY_WALKWAY, RCQUEST_MQ, RA_SHADOW_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Shadow Temple MQ Windy Walkway Reverse without Hover Boots",
+        "It is possible to jump from the alcove in the windy hallway to the middle platform. There are two methods: "
+        "wait out the fan opposite the door and hold forward, or jump to the right to be pushed by the fan there "
+        "towards the platform ledge. Note that jumps of this distance are inconsistent, but still possible.");
+    OPT_TRICK(RT_LENS_SPIRIT, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Spirit Temple.");
+    OPT_TRICK(RT_SPIRIT_CHILD_CHU, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple Child Side Bridge with Bombchu", "A carefully-timed Bombchu can hit the switch.");
+    OPT_TRICK(RT_SPIRIT_LOBBY_GS, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple Main Room GS with Boomerang",
+              "Standing on the highest part of the arm of the statue, a precise Boomerang throw can kill and obtain "
+              "this Gold Skulltula. You must throw the Boomerang slightly off to the side so that it curves into the "
+              "Skulltula, as aiming directly at it will clank off of the wall in front.");
+    OPT_TRICK(RT_SPIRIT_LOWER_ADULT_SWITCH, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Spirit Temple Lower Adult Switch with Bombs",
+              "A bomb can be used to hit the switch on the ceiling, but it must be thrown from a particular distance "
+              "away and with precise timing.");
+    OPT_TRICK(
+        RT_SPIRIT_LOBBY_JUMP, RCQUEST_BOTH, RA_SPIRIT_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Spirit Temple Main Room Jump from Hands to Upper Ledges",
+        "A precise jump to obtain the following as adult without needing one of Hover Boots, or Hookshot (in Vanilla) "
+        "or Song of Time (in MQ): - Spirit Temple Statue Room Northeast Chest - Spirit Temple GS Lobby - Spirit Temple "
+        "MQ Central Chamber Top Left Pot (Left) - Spirit Temple MQ Central Chamber Top Left Pot (Right)");
+    // disabled since "Spirit Temple boss shortcuts" (pre-lowers the platform where you break the statues face) isn't a
+    // setting in ship OPT_TRICK(RT_SPIRIT_PLATFORM_HOOKSHOT, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE,
+    // {Tricks::Tag::INTERMEDIATE}, "Spirit Temple Main Room Hookshot to Boss Platform", "Precise hookshot aiming at the
+    // platform chains can be used to reach the boss platform from the middle landings. Using a jump slash immediately
+    // after reaching a chain makes aiming more lenient. Relevant only when Spirit Temple boss shortcuts are on.");
+    OPT_TRICK(RT_SPIRIT_MAP_CHEST, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple Map Chest with Bow",
+              "To get a line of sight from the upper torch to the map chest torches, you must pull an Armos statue all "
+              "the way up the stairs.");
+    OPT_TRICK(RT_SPIRIT_SUN_CHEST, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::ADVANCED },
+              "Spirit Temple Sun Block Room Chest with Bow",
+              "Using the blocks in the room as platforms you can get lines of sight to all three torches. The timer on "
+              "the torches is quite short so you must move quickly in order to light all three.");
+    OPT_TRICK(
+        RT_SPIRIT_WALL, RCQUEST_VANILLA, RA_SPIRIT_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+        "Spirit Temple Shifting Wall with No Additional Items",
+        "Logic normally guarantees a way of dealing with both the Beamos and the Walltula before climbing the wall.");
+    OPT_TRICK(RT_LENS_SPIRIT_MQ, RCQUEST_MQ, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple MQ without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Spirit Temple MQ.");
+    OPT_TRICK(RT_SPIRIT_MQ_SUN_BLOCK_SOT, RCQUEST_MQ, RA_SPIRIT_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Spirit Temple MQ Sun Block Room as Child without Song of Time",
+              "While adult can easily jump directly to the switch that unbars the door to the sun block room, child "
+              "Link cannot make the jump without spawning a Song of Time block to jump from. You can skip this by "
+              "throwing the crate down onto the switch from above, which does unbar the door, however the crate "
+              "immediately breaks, so you must move quickly to get through the door before it closes back up.");
+    OPT_TRICK(RT_SPIRIT_MQ_SUN_BLOCK_GS, RCQUEST_MQ, RA_SPIRIT_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Spirit Temple MQ Sun Block Room GS with Boomerang",
+              "Throw the Boomerang in such a way that it curves through the side of the glass block to hit the Gold "
+              "Skulltula.");
+    OPT_TRICK(RT_SPIRIT_MQ_LOWER_ADULT, RCQUEST_MQ, RA_SPIRIT_TEMPLE, { Tricks::Tag::INTERMEDIATE },
+              "Spirit Temple MQ Lower Adult without Fire Arrows",
+              "By standing in a precise position it is possible to light two of the torches with a single use of "
+              "Din\'s Fire. This saves enough time to be able to light all three torches with only Din\'s Fire.");
+    OPT_TRICK(RT_SPIRIT_MQ_FROZEN_EYE, RCQUEST_MQ, RA_SPIRIT_TEMPLE, { Tricks::Tag::NOVICE },
+              "Spirit Temple MQ Frozen Eye Switch without Fire",
+              "You can melt the ice by shooting an arrow through a torch. The only way to find a line of sight for "
+              "this shot is to first spawn a Song of Time block, and then stand on the very edge of it.");
+    OPT_TRICK(RT_ICE_BLOCK_GS, RCQUEST_VANILLA, RA_ICE_CAVERN, { Tricks::Tag::INTERMEDIATE },
+              "Ice Cavern Block Room GS with Hover Boots",
+              "The Hover Boots can be used to get in front of the Skulltula to kill it with a jump slash. Then, the "
+              "Hover Boots can again be used to obtain the Token, all without Hookshot or Boomerang.");
+    OPT_TRICK(RT_ICE_MQ_RED_ICE_GS, RCQUEST_MQ, RA_ICE_CAVERN, { Tricks::Tag::INTERMEDIATE },
+              "Ice Cavern MQ Red Ice GS without Song of Time",
+              "If you side-hop into the perfect position, you can briefly stand on the platform with the red ice just "
+              "long enough to dump some blue fire.");
+    OPT_TRICK(RT_ICE_MQ_SCARECROW, RCQUEST_MQ, RA_ICE_CAVERN, { Tricks::Tag::INTERMEDIATE },
+              "Ice Cavern MQ Scarecrow GS with No Additional Items",
+              "As adult a precise jump can be used to reach this alcove.");
+    OPT_TRICK(RT_LENS_GTG, RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE },
+              "Gerudo Training Ground without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Gerudo Training Ground.");
+    OPT_TRICK(RT_GTG_WITHOUT_HOOKSHOT, RCQUEST_VANILLA, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE },
+              "Gerudo Training Ground Left Side Silver Rupees without Hookshot",
+              "After collecting the rest of the Silver Rupees in the room, you can reach the final Silver Rupee on the "
+              "ceiling by being pulled up into it after getting grabbed by the Wallmaster. Then, you must also reach "
+              "the exit of the room without the use of the Hookshot. If you move quickly you can sneak past the edge "
+              "of a flame wall before it can rise up to block you. To do so without taking damage is more precise.");
+    OPT_TRICK(RT_GTG_FAKE_WALL, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE },
+              "Reach Gerudo Training Ground Fake Wall Ledge with Hover Boots",
+              "A precise Hover Boots use from the top of the chest can allow you to grab the ledge without needing the "
+              "usual requirements. In Master Quest, this always skips a Song of Time requirement. In Vanilla, this "
+              "skips a Hookshot requirement, but is only relevant if \"Gerudo Training Ground Left Side Silver Rupees "
+              "without Hookshot\" is enabled.");
+    OPT_TRICK(RT_LENS_GTG_MQ, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE },
+              "Gerudo Training Ground MQ without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ.");
+    OPT_TRICK(RT_GTG_MQ_WITH_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE },
+              "Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot",
+              "The highest Silver Rupee can be obtained by hookshooting the target and then immediately jump slashing "
+              "toward the Rupee.");
+    OPT_TRICK(RT_GTG_MQ_WITHOUT_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE },
+              "Gerudo Training Ground MQ Left Side Silver Rupees without Hookshot",
+              "After collecting the rest of the Silver Rupees in the room, you can reach the final Silver Rupee on the "
+              "ceiling by being pulled up into it after getting grabbed by the Wallmaster. The Wallmaster will not "
+              "track you to directly underneath the rupee. You should take the last step to be under the rupee after "
+              "the Wallmaster has begun its attempt to grab you. Also included with this trick is that fact that the "
+              "switch that unbars the door to the final chest of GTG can be hit without a projectile, using a precise "
+              "jump slash. This trick supersedes \"Gerudo Training Ground MQ Left Side Silver Rupees with Hookshot\".");
+    OPT_TRICK(RT_LENS_GANON, RCQUEST_VANILLA, RA_GANONS_CASTLE, { Tricks::Tag::NOVICE },
+              "Ganon\'s Castle without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Ganon's Castle.");
+    OPT_TRICK(RT_GANON_SPIRIT_TRIAL_HOOKSHOT, RCQUEST_VANILLA, RA_GANONS_CASTLE, { Tricks::Tag::NOVICE },
+              "Spirit Trial without Hookshot",
+              "The highest rupee can be obtained as either age by performing a precise jump and a well-timed jumpslash "
+              "off of an Armos.");
+    OPT_TRICK(RT_LENS_GANON_MQ, RCQUEST_MQ, RA_GANONS_CASTLE, { Tricks::Tag::NOVICE },
+              "Ganon\'s Castle MQ without Lens of Truth",
+              "Removes the requirements for the Lens of Truth in Ganon's Castle MQ.");
+    OPT_TRICK(RT_GANON_MQ_FIRE_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, { Tricks::Tag::ADVANCED },
+              "Fire Trial MQ with Hookshot",
+              "It's possible to hook the target at the end of fire trial with just Hookshot, but it requires precise "
+              "aim and perfect positioning. The main difficulty comes from getting on the very corner of the obelisk "
+              "without falling into the lava.");
+    OPT_TRICK(RT_GANON_MQ_SHADOW_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, { Tricks::Tag::NOVICE },
+              "Shadow Trial MQ Torch with Bow",
+              "You can light the torch in this room without a fire source by shooting an arrow through the lit torch "
+              "at the beginning of the room. Because the room is so dark and the unlit torch is so far away, it can be "
+              "difficult to aim the shot correctly.");
+    OPT_TRICK(RT_GANON_MQ_LIGHT_TRIAL, RCQUEST_MQ, RA_GANONS_CASTLE, { Tricks::Tag::INTERMEDIATE },
+              "Light Trial MQ without Hookshot",
+              "If you move quickly you can sneak past the edge of a flame wall before it can rise up to block you. In "
+              "this case to do it without taking damage is especially precise.");
 
     mOptionGroups[RSG_LOGIC] = OptionGroup::SubGroup("Logic Options", {
-        &mOptions[RSK_LOGIC_RULES],
-        &mOptions[RSK_ALL_LOCATIONS_REACHABLE],
-        &mOptions[RSK_SKULLS_SUNS_SONG],
-    });
+                                                                          &mOptions[RSK_LOGIC_RULES],
+                                                                          &mOptions[RSK_ALL_LOCATIONS_REACHABLE],
+                                                                          &mOptions[RSK_SKULLS_SUNS_SONG],
+                                                                      });
     // TODO: Exclude Locations Menus
     mTricksByArea.clear();
     std::vector<Option*> tricksOption;
@@ -552,560 +1166,585 @@ void Settings::CreateOptions() {
     }
     mOptionGroups[RSG_TRICKS] = OptionGroup::SubGroup("Logical Tricks", tricksOption);
     // TODO: Glitches
-    mOptionGroups[RSG_AREA_ACCESS_IMGUI] = OptionGroup::SubGroup("Area Access", {
-        &mOptions[RSK_FOREST],
-        &mOptions[RSK_KAK_GATE],
-        &mOptions[RSK_DOOR_OF_TIME],
-        &mOptions[RSK_ZORAS_FOUNTAIN],
-        &mOptions[RSK_SLEEPING_WATERFALL],
-        &mOptions[RSK_LOCK_OVERWORLD_DOORS],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_WORLD_IMGUI] = OptionGroup::SubGroup("World Settings", {
-        &mOptions[RSK_STARTING_AGE],
-        &mOptions[RSK_GERUDO_FORTRESS],
-        &mOptions[RSK_RAINBOW_BRIDGE],
-        &mOptions[RSK_BRIDGE_OPTIONS],
-        &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
-        &mOptions[RSK_GANONS_TRIALS],
-        &mOptions[RSK_TRIAL_COUNT],
-        &mOptions[RSK_MQ_DUNGEON_RANDOM],
-        &mOptions[RSK_MQ_DUNGEON_COUNT],
-        &mOptions[RSK_MQ_DUNGEON_SET],
-        &mOptions[RSK_MQ_DEKU_TREE],
-        &mOptions[RSK_MQ_DODONGOS_CAVERN],
-        &mOptions[RSK_MQ_JABU_JABU],
-        &mOptions[RSK_MQ_FOREST_TEMPLE],
-        &mOptions[RSK_MQ_FIRE_TEMPLE],
-        &mOptions[RSK_MQ_WATER_TEMPLE],
-        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
-        &mOptions[RSK_MQ_SHADOW_TEMPLE],
-        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_MQ_ICE_CAVERN],
-        &mOptions[RSK_MQ_GTG],
-        &mOptions[RSK_MQ_GANONS_CASTLE],
-        &mOptions[RSK_TRIFORCE_HUNT],
-        &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
-        &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED]
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI] = OptionGroup::SubGroup("Shuffle Entrances", {
-        &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_OWL_DROPS],
-        &mOptions[RSK_SHUFFLE_WARP_SONGS],
-        &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
-        &mOptions[RSK_DECOUPLED_ENTRANCES],
-        &mOptions[RSK_MIXED_ENTRANCE_POOLS],
-        &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
-        &mOptions[RSK_MIX_BOSS_ENTRANCES],
-        &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
-        &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
-        &mOptions[RSK_MIX_GROTTO_ENTRANCES]
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_WORLD_IMGUI_TABLE] = OptionGroup::SubGroup("World", {
-        &mOptionGroups[RSG_AREA_ACCESS_IMGUI],
-        &mOptionGroups[RSG_WORLD_IMGUI],
-        &mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI],
-    }, WidgetContainerType::TABLE);
-    mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Items", {
-        &mOptions[RSK_SHUFFLE_SONGS],
-        &mOptions[RSK_SHUFFLE_TOKENS],
-        &mOptions[RSK_SKULLS_SUNS_SONG],
-        &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
-        &mOptions[RSK_SHUFFLE_MASTER_SWORD],
-        &mOptions[RSK_SHUFFLE_CHILD_WALLET],
-        &mOptions[RSK_INCLUDE_TYCOON_WALLET],
-        &mOptions[RSK_SHUFFLE_OCARINA],
-        &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
-        &mOptions[RSK_SHUFFLE_SWIM],
-        &mOptions[RSK_SHUFFLE_WEIRD_EGG],
-        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
-        &mOptions[RSK_SHUFFLE_FISHING_POLE],
-        &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
-        &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
-        &mOptions[RSK_SHUFFLE_FREESTANDING],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] = OptionGroup::SubGroup("Shuffle NPCs & Merchants", {
-        &mOptions[RSK_SHOPSANITY],
-        &mOptions[RSK_SHOPSANITY_COUNT],
-        &mOptions[RSK_SHOPSANITY_PRICES],
-        &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
-        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
-        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
-        &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
-        &mOptions[RSK_FISHSANITY],
-        &mOptions[RSK_FISHSANITY_POND_COUNT],
-        &mOptions[RSK_FISHSANITY_AGE_SPLIT],
-        &mOptions[RSK_SHUFFLE_SCRUBS],
-        &mOptions[RSK_SCRUBS_PRICES],
-        &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
-        &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
-        &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
-        &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
-        &mOptions[RSK_SHUFFLE_BEEHIVES],
-        &mOptions[RSK_SHUFFLE_COWS],
-        &mOptions[RSK_SHUFFLE_POTS],
-        &mOptions[RSK_SHUFFLE_MERCHANTS],
-        &mOptions[RSK_MERCHANT_PRICES],
-        &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
-        &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
-        &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
-        &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
-        &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
-        &mOptions[RSK_SHUFFLE_ADULT_TRADE],
-        &mOptions[RSK_SHUFFLE_100_GS_REWARD],
-        &mOptions[RSK_SHUFFLE_BOSS_SOULS],
-        &mOptions[RSK_SHUFFLE_FAIRIES],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Dungeon Items", {
-        &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
-        &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
-        &mOptions[RSK_KEYSANITY],
-        &mOptions[RSK_GERUDO_KEYS],
-        &mOptions[RSK_BOSS_KEYSANITY],
-        &mOptions[RSK_GANONS_BOSS_KEY],
-        &mOptions[RSK_LACS_STONE_COUNT],
-        &mOptions[RSK_LACS_MEDALLION_COUNT],
-        &mOptions[RSK_LACS_DUNGEON_COUNT],
-        &mOptions[RSK_LACS_REWARD_COUNT],
-        &mOptions[RSK_LACS_TOKEN_COUNT],
-        &mOptions[RSK_LACS_OPTIONS],
-        &mOptions[RSK_KEYRINGS],
-        &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
-        &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
-        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
-        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
-        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
-        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_KEYRINGS_GTG],
-        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_ITEMS_IMGUI_TABLE] = OptionGroup::SubGroup("Items", {
-        &mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI],
-        &mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI],
-        &mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI],
-    }, WidgetContainerType::TABLE);
-    mOptionGroups[RSG_TIMESAVERS_IMGUI] = OptionGroup::SubGroup("Timesavers", {
-        &mOptions[RSK_CUCCO_COUNT],
-        &mOptions[RSK_BIG_POE_COUNT],
-        &mOptions[RSK_SKIP_CHILD_ZELDA],
-        &mOptions[RSK_SKIP_EPONA_RACE],
-        &mOptions[RSK_COMPLETE_MASK_QUEST],
-        &mOptions[RSK_SKIP_SCARECROWS_SONG]
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI] = OptionGroup::SubGroup("", {
-        &mOptions[RSK_ITEM_POOL],
-        &mOptions[RSK_ICE_TRAPS],
-        &mOptions[RSK_GOSSIP_STONE_HINTS],
-        &mOptions[RSK_HINT_CLARITY],
-        &mOptions[RSK_HINT_DISTRIBUTION],
-    }, WidgetContainerType::SECTION);
-    mOptionGroups[RSG_EXTRA_HINTS_IMGUI] = OptionGroup::SubGroup("Extra Hints", {
-        &mOptions[RSK_TOT_ALTAR_HINT],
-        &mOptions[RSK_GANONDORF_HINT],
-        &mOptions[RSK_SHEIK_LA_HINT],
-        &mOptions[RSK_DAMPES_DIARY_HINT],
-        &mOptions[RSK_GREG_HINT],
-        &mOptions[RSK_LOACH_HINT],
-        &mOptions[RSK_SARIA_HINT],
-        &mOptions[RSK_FROGS_HINT],
-        &mOptions[RSK_OOT_HINT],
-        &mOptions[RSK_BIGGORON_HINT],
-        &mOptions[RSK_BIG_POES_HINT],
-        &mOptions[RSK_CHICKENS_HINT],
-        &mOptions[RSK_MALON_HINT],
-        &mOptions[RSK_HBA_HINT],
-        &mOptions[RSK_FISHING_POLE_HINT],
-        &mOptions[RSK_WARP_SONG_HINTS],
-        &mOptions[RSK_SCRUB_TEXT_HINT],
-        &mOptions[RSK_MERCHANT_TEXT_HINT],
-        &mOptions[RSK_KAK_10_SKULLS_HINT],
-        &mOptions[RSK_KAK_20_SKULLS_HINT],
-        &mOptions[RSK_KAK_30_SKULLS_HINT],
-        &mOptions[RSK_KAK_40_SKULLS_HINT],
-        &mOptions[RSK_KAK_50_SKULLS_HINT],
-        &mOptions[RSK_KAK_100_SKULLS_HINT],
-        &mOptions[RSK_MASK_SHOP_HINT]
-    }, WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.");
-    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN] = OptionGroup::SubGroup("Item Pool & Hints", std::initializer_list<OptionGroup*>{
-        &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI],
-        &mOptionGroups[RSG_EXTRA_HINTS_IMGUI],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI] = OptionGroup::SubGroup("Additional Features", {
-        &mOptions[RSK_FULL_WALLETS],
-        &mOptions[RSK_BOMBCHU_BAG],
-        &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
-        &mOptions[RSK_BLUE_FIRE_ARROWS],
-        &mOptions[RSK_SUNLIGHT_ARROWS],
-        &mOptions[RSK_INFINITE_UPGRADES],
-        &mOptions[RSK_SKELETON_KEY],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE] = OptionGroup::SubGroup("Gameplay", {
-        &mOptionGroups[RSG_TIMESAVERS_IMGUI],
-        &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN],
-        &mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI]
-    }, WidgetContainerType::TABLE);
-    mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI] = OptionGroup::SubGroup("Starting Equipment", {
-        &mOptions[RSK_LINKS_POCKET],
-        &mOptions[RSK_STARTING_KOKIRI_SWORD],
-        &mOptions[RSK_STARTING_MASTER_SWORD],
-        &mOptions[RSK_STARTING_DEKU_SHIELD]
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_STARTING_ITEMS_IMGUI] = OptionGroup::SubGroup("Starting Items", {
-        &mOptions[RSK_STARTING_OCARINA],
-        &mOptions[RSK_STARTING_STICKS],
-        &mOptions[RSK_STARTING_NUTS],
-        &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
-        &mOptions[RSK_STARTING_HEARTS],
-    }, WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI] = OptionGroup::SubGroup("Normal Songs", {
-        &mOptions[RSK_STARTING_ZELDAS_LULLABY],
-        &mOptions[RSK_STARTING_EPONAS_SONG],
-        &mOptions[RSK_STARTING_SARIAS_SONG],
-        &mOptions[RSK_STARTING_SUNS_SONG],
-        &mOptions[RSK_STARTING_SONG_OF_TIME],
-        &mOptions[RSK_STARTING_SONG_OF_STORMS],
-    }, WidgetContainerType::SECTION);
-    mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI] = OptionGroup::SubGroup("Warp Songs", {
-        &mOptions[RSK_STARTING_MINUET_OF_FOREST],
-        &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
-        &mOptions[RSK_STARTING_SERENADE_OF_WATER],
-        &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
-        &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW],
-        &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT]
-    }, WidgetContainerType::SECTION);
-    mOptionGroups[RSG_STARTING_SONGS_IMGUI] = OptionGroup::SubGroup("Starting Songs", std::initializer_list<OptionGroup*>({
-        &mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI],
-        &mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI],
-    }), WidgetContainerType::COLUMN);
-    mOptionGroups[RSG_STARTING_INVENTORY_IMGUI_TABLE] = OptionGroup::SubGroup("Starting Inventory", {
-        &mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI],
-        &mOptionGroups[RSG_STARTING_ITEMS_IMGUI],
-        &mOptionGroups[RSG_STARTING_SONGS_IMGUI]
-    }, WidgetContainerType::TABLE);
+    mOptionGroups[RSG_AREA_ACCESS_IMGUI] = OptionGroup::SubGroup("Area Access",
+                                                                 {
+                                                                     &mOptions[RSK_FOREST],
+                                                                     &mOptions[RSK_KAK_GATE],
+                                                                     &mOptions[RSK_DOOR_OF_TIME],
+                                                                     &mOptions[RSK_ZORAS_FOUNTAIN],
+                                                                     &mOptions[RSK_SLEEPING_WATERFALL],
+                                                                     &mOptions[RSK_LOCK_OVERWORLD_DOORS],
+                                                                 },
+                                                                 WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_WORLD_IMGUI] = OptionGroup::SubGroup("World Settings",
+                                                           { &mOptions[RSK_STARTING_AGE],
+                                                             &mOptions[RSK_GERUDO_FORTRESS],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE],
+                                                             &mOptions[RSK_BRIDGE_OPTIONS],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
+                                                             &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
+                                                             &mOptions[RSK_GANONS_TRIALS],
+                                                             &mOptions[RSK_TRIAL_COUNT],
+                                                             &mOptions[RSK_MQ_DUNGEON_RANDOM],
+                                                             &mOptions[RSK_MQ_DUNGEON_COUNT],
+                                                             &mOptions[RSK_MQ_DUNGEON_SET],
+                                                             &mOptions[RSK_MQ_DEKU_TREE],
+                                                             &mOptions[RSK_MQ_DODONGOS_CAVERN],
+                                                             &mOptions[RSK_MQ_JABU_JABU],
+                                                             &mOptions[RSK_MQ_FOREST_TEMPLE],
+                                                             &mOptions[RSK_MQ_FIRE_TEMPLE],
+                                                             &mOptions[RSK_MQ_WATER_TEMPLE],
+                                                             &mOptions[RSK_MQ_SPIRIT_TEMPLE],
+                                                             &mOptions[RSK_MQ_SHADOW_TEMPLE],
+                                                             &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
+                                                             &mOptions[RSK_MQ_ICE_CAVERN],
+                                                             &mOptions[RSK_MQ_GTG],
+                                                             &mOptions[RSK_MQ_GANONS_CASTLE],
+                                                             &mOptions[RSK_TRIFORCE_HUNT],
+                                                             &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
+                                                             &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED] },
+                                                           WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI] = OptionGroup::SubGroup(
+        "Shuffle Entrances",
+        { &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES], &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
+          &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES], &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
+          &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES], &mOptions[RSK_SHUFFLE_OWL_DROPS], &mOptions[RSK_SHUFFLE_WARP_SONGS],
+          &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS], &mOptions[RSK_DECOUPLED_ENTRANCES],
+          &mOptions[RSK_MIXED_ENTRANCE_POOLS], &mOptions[RSK_MIX_DUNGEON_ENTRANCES], &mOptions[RSK_MIX_BOSS_ENTRANCES],
+          &mOptions[RSK_MIX_OVERWORLD_ENTRANCES], &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
+          &mOptions[RSK_MIX_GROTTO_ENTRANCES] },
+        WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_WORLD_IMGUI_TABLE] = OptionGroup::SubGroup("World",
+                                                                 {
+                                                                     &mOptionGroups[RSG_AREA_ACCESS_IMGUI],
+                                                                     &mOptionGroups[RSG_WORLD_IMGUI],
+                                                                     &mOptionGroups[RSG_SHUFFLE_ENTRANCES_IMGUI],
+                                                                 },
+                                                                 WidgetContainerType::TABLE);
+    mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI] = OptionGroup::SubGroup("Shuffle Items",
+                                                                   {
+                                                                       &mOptions[RSK_SHUFFLE_SONGS],
+                                                                       &mOptions[RSK_SHUFFLE_TOKENS],
+                                                                       &mOptions[RSK_SKULLS_SUNS_SONG],
+                                                                       &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
+                                                                       &mOptions[RSK_SHUFFLE_MASTER_SWORD],
+                                                                       &mOptions[RSK_SHUFFLE_CHILD_WALLET],
+                                                                       &mOptions[RSK_INCLUDE_TYCOON_WALLET],
+                                                                       &mOptions[RSK_SHUFFLE_OCARINA],
+                                                                       &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
+                                                                       &mOptions[RSK_SHUFFLE_SWIM],
+                                                                       &mOptions[RSK_SHUFFLE_WEIRD_EGG],
+                                                                       &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
+                                                                       &mOptions[RSK_SHUFFLE_FISHING_POLE],
+                                                                       &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
+                                                                       &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
+                                                                       &mOptions[RSK_SHUFFLE_FREESTANDING],
+                                                                   },
+                                                                   WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] =
+        OptionGroup::SubGroup("Shuffle NPCs & Merchants",
+                              {
+                                  &mOptions[RSK_SHOPSANITY],
+                                  &mOptions[RSK_SHOPSANITY_COUNT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
+                                  &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+                                  &mOptions[RSK_FISHSANITY],
+                                  &mOptions[RSK_FISHSANITY_POND_COUNT],
+                                  &mOptions[RSK_FISHSANITY_AGE_SPLIT],
+                                  &mOptions[RSK_SHUFFLE_SCRUBS],
+                                  &mOptions[RSK_SCRUBS_PRICES],
+                                  &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
+                                  &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
+                                  &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
+                                  &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
+                                  &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
+                                  &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
+                                  &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
+                                  &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
+                                  &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
+                                  &mOptions[RSK_SHUFFLE_BEEHIVES],
+                                  &mOptions[RSK_SHUFFLE_COWS],
+                                  &mOptions[RSK_SHUFFLE_POTS],
+                                  &mOptions[RSK_SHUFFLE_CRATES],
+                                  &mOptions[RSK_SHUFFLE_MERCHANTS],
+                                  &mOptions[RSK_MERCHANT_PRICES],
+                                  &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
+                                  &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
+                                  &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
+                                  &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
+                                  &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
+                                  &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
+                                  &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
+                                  &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
+                                  &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
+                                  &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
+                                  &mOptions[RSK_SHUFFLE_ADULT_TRADE],
+                                  &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+                                  &mOptions[RSK_SHUFFLE_BOSS_SOULS],
+                                  &mOptions[RSK_SHUFFLE_FAIRIES],
+                                  &mOptions[RSK_SHUFFLE_GRASS],
+                              },
+                              WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI] =
+        OptionGroup::SubGroup("Shuffle Dungeon Items",
+                              {
+                                  &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
+                                  &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
+                                  &mOptions[RSK_KEYSANITY],
+                                  &mOptions[RSK_GERUDO_KEYS],
+                                  &mOptions[RSK_BOSS_KEYSANITY],
+                                  &mOptions[RSK_GANONS_BOSS_KEY],
+                                  &mOptions[RSK_LACS_STONE_COUNT],
+                                  &mOptions[RSK_LACS_MEDALLION_COUNT],
+                                  &mOptions[RSK_LACS_DUNGEON_COUNT],
+                                  &mOptions[RSK_LACS_REWARD_COUNT],
+                                  &mOptions[RSK_LACS_TOKEN_COUNT],
+                                  &mOptions[RSK_LACS_OPTIONS],
+                                  &mOptions[RSK_KEYRINGS],
+                                  &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
+                                  &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
+                                  &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
+                                  &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+                                  &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
+                                  &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+                                  &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
+                                  &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+                                  &mOptions[RSK_KEYRINGS_GTG],
+                                  &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+                              },
+                              WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ITEMS_IMGUI_TABLE] = OptionGroup::SubGroup("Items",
+                                                                 {
+                                                                     &mOptionGroups[RSG_SHUFFLE_ITEMS_IMGUI],
+                                                                     &mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI],
+                                                                     &mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS_IMGUI],
+                                                                 },
+                                                                 WidgetContainerType::TABLE);
+    mOptionGroups[RSG_TIMESAVERS_IMGUI] = OptionGroup::SubGroup(
+        "Timesavers",
+        { &mOptions[RSK_BIG_POE_COUNT], &mOptions[RSK_SKIP_CHILD_ZELDA], &mOptions[RSK_SKIP_EPONA_RACE],
+          &mOptions[RSK_COMPLETE_MASK_QUEST], &mOptions[RSK_SKIP_SCARECROWS_SONG] },
+        WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI] = OptionGroup::SubGroup("",
+                                                                     {
+                                                                         &mOptions[RSK_ITEM_POOL],
+                                                                         &mOptions[RSK_ICE_TRAPS],
+                                                                         &mOptions[RSK_GOSSIP_STONE_HINTS],
+                                                                         &mOptions[RSK_HINT_CLARITY],
+                                                                         &mOptions[RSK_HINT_DISTRIBUTION],
+                                                                     },
+                                                                     WidgetContainerType::SECTION);
+    mOptionGroups[RSG_EXTRA_HINTS_IMGUI] = OptionGroup::SubGroup(
+        "Extra Hints",
+        { &mOptions[RSK_TOT_ALTAR_HINT],     &mOptions[RSK_GANONDORF_HINT],     &mOptions[RSK_SHEIK_LA_HINT],
+          &mOptions[RSK_DAMPES_DIARY_HINT],  &mOptions[RSK_GREG_HINT],          &mOptions[RSK_LOACH_HINT],
+          &mOptions[RSK_SARIA_HINT],         &mOptions[RSK_FROGS_HINT],         &mOptions[RSK_OOT_HINT],
+          &mOptions[RSK_BIGGORON_HINT],      &mOptions[RSK_BIG_POES_HINT],      &mOptions[RSK_CHICKENS_HINT],
+          &mOptions[RSK_MALON_HINT],         &mOptions[RSK_HBA_HINT],           &mOptions[RSK_FISHING_POLE_HINT],
+          &mOptions[RSK_WARP_SONG_HINTS],    &mOptions[RSK_SCRUB_TEXT_HINT],    &mOptions[RSK_MERCHANT_TEXT_HINT],
+          &mOptions[RSK_KAK_10_SKULLS_HINT], &mOptions[RSK_KAK_20_SKULLS_HINT], &mOptions[RSK_KAK_30_SKULLS_HINT],
+          &mOptions[RSK_KAK_40_SKULLS_HINT], &mOptions[RSK_KAK_50_SKULLS_HINT], &mOptions[RSK_KAK_100_SKULLS_HINT],
+          &mOptions[RSK_MASK_SHOP_HINT] },
+        WidgetContainerType::SECTION, "This setting adds some hints at locations other than Gossip Stones.");
+    mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN] =
+        OptionGroup::SubGroup("Item Pool & Hints",
+                              std::initializer_list<OptionGroup*>{
+                                  &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI],
+                                  &mOptionGroups[RSG_EXTRA_HINTS_IMGUI],
+                              },
+                              WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI] = OptionGroup::SubGroup("Additional Features",
+                                                                         {
+                                                                             &mOptions[RSK_FULL_WALLETS],
+                                                                             &mOptions[RSK_BOMBCHU_BAG],
+                                                                             &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
+                                                                             &mOptions[RSK_BLUE_FIRE_ARROWS],
+                                                                             &mOptions[RSK_SUNLIGHT_ARROWS],
+                                                                             &mOptions[RSK_INFINITE_UPGRADES],
+                                                                             &mOptions[RSK_SKELETON_KEY],
+                                                                         },
+                                                                         WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE] =
+        OptionGroup::SubGroup("Gameplay",
+                              { &mOptionGroups[RSG_TIMESAVERS_IMGUI], &mOptionGroups[RSG_ITEM_POOL_HINTS_IMGUI_COLUMN],
+                                &mOptionGroups[RSG_ADDITIONAL_FEATURES_IMGUI] },
+                              WidgetContainerType::TABLE);
+    mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI] =
+        OptionGroup::SubGroup("Starting Equipment",
+                              { &mOptions[RSK_LINKS_POCKET], &mOptions[RSK_STARTING_KOKIRI_SWORD],
+                                &mOptions[RSK_STARTING_MASTER_SWORD], &mOptions[RSK_STARTING_DEKU_SHIELD] },
+                              WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_ITEMS_IMGUI] = OptionGroup::SubGroup("Starting Items",
+                                                                    {
+                                                                        &mOptions[RSK_STARTING_OCARINA],
+                                                                        &mOptions[RSK_STARTING_STICKS],
+                                                                        &mOptions[RSK_STARTING_NUTS],
+                                                                        &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+                                                                        &mOptions[RSK_STARTING_HEARTS],
+                                                                    },
+                                                                    WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI] = OptionGroup::SubGroup("Normal Songs",
+                                                                           {
+                                                                               &mOptions[RSK_STARTING_ZELDAS_LULLABY],
+                                                                               &mOptions[RSK_STARTING_EPONAS_SONG],
+                                                                               &mOptions[RSK_STARTING_SARIAS_SONG],
+                                                                               &mOptions[RSK_STARTING_SUNS_SONG],
+                                                                               &mOptions[RSK_STARTING_SONG_OF_TIME],
+                                                                               &mOptions[RSK_STARTING_SONG_OF_STORMS],
+                                                                           },
+                                                                           WidgetContainerType::SECTION);
+    mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI] =
+        OptionGroup::SubGroup("Warp Songs",
+                              { &mOptions[RSK_STARTING_MINUET_OF_FOREST], &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
+                                &mOptions[RSK_STARTING_SERENADE_OF_WATER], &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
+                                &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW], &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT] },
+                              WidgetContainerType::SECTION);
+    mOptionGroups[RSG_STARTING_SONGS_IMGUI] = OptionGroup::SubGroup("Starting Songs",
+                                                                    std::initializer_list<OptionGroup*>({
+                                                                        &mOptionGroups[RSG_STARTING_NORMAL_SONGS_IMGUI],
+                                                                        &mOptionGroups[RSG_STARTING_WARP_SONGS_IMGUI],
+                                                                    }),
+                                                                    WidgetContainerType::COLUMN);
+    mOptionGroups[RSG_STARTING_INVENTORY_IMGUI_TABLE] =
+        OptionGroup::SubGroup("Starting Inventory",
+                              { &mOptionGroups[RSG_STARTING_EQUIPMENT_IMGUI], &mOptionGroups[RSG_STARTING_ITEMS_IMGUI],
+                                &mOptionGroups[RSG_STARTING_SONGS_IMGUI] },
+                              WidgetContainerType::TABLE);
     mOptionGroups[RSG_OPEN] = OptionGroup("Open Settings", {
-        &mOptions[RSK_FOREST],
-        &mOptions[RSK_KAK_GATE],
-        &mOptions[RSK_DOOR_OF_TIME],
-        &mOptions[RSK_ZORAS_FOUNTAIN],
-        &mOptions[RSK_SLEEPING_WATERFALL],
-        &mOptions[RSK_LOCK_OVERWORLD_DOORS],
-        &mOptions[RSK_GERUDO_FORTRESS],
-        &mOptions[RSK_RAINBOW_BRIDGE],
-        &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
-        &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
-        &mOptions[RSK_BRIDGE_OPTIONS],
-        &mOptions[RSK_GANONS_TRIALS],
-        &mOptions[RSK_TRIAL_COUNT],
-    });
+                                                               &mOptions[RSK_FOREST],
+                                                               &mOptions[RSK_KAK_GATE],
+                                                               &mOptions[RSK_DOOR_OF_TIME],
+                                                               &mOptions[RSK_ZORAS_FOUNTAIN],
+                                                               &mOptions[RSK_SLEEPING_WATERFALL],
+                                                               &mOptions[RSK_LOCK_OVERWORLD_DOORS],
+                                                               &mOptions[RSK_GERUDO_FORTRESS],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT],
+                                                               &mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT],
+                                                               &mOptions[RSK_BRIDGE_OPTIONS],
+                                                               &mOptions[RSK_GANONS_TRIALS],
+                                                               &mOptions[RSK_TRIAL_COUNT],
+                                                           });
     mOptionGroups[RSG_WORLD] = OptionGroup("World Settings", {
-        &mOptions[RSK_STARTING_AGE],
-        &mOptions[RSK_SHUFFLE_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES],
-        &mOptions[RSK_SHUFFLE_OWL_DROPS],
-        &mOptions[RSK_SHUFFLE_WARP_SONGS],
-        &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
-        &mOptions[RSK_MIXED_ENTRANCE_POOLS],
-        &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
-        &mOptions[RSK_MIX_BOSS_ENTRANCES],
-        &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
-        &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
-        &mOptions[RSK_MIX_GROTTO_ENTRANCES],
-        &mOptions[RSK_DECOUPLED_ENTRANCES],
-        &mOptions[RSK_BOMBCHU_BAG],
-        &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
-        &mOptions[RSK_TRIFORCE_HUNT],
-        &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
-        &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED],
-        &mOptions[RSK_MQ_DUNGEON_RANDOM],
-        &mOptions[RSK_MQ_DUNGEON_COUNT],
-        &mOptions[RSK_MQ_DUNGEON_SET],
-    });
-    mOptionGroups[RSG_SHUFFLE_DUNGEON_QUESTS] = OptionGroup::SubGroup("Shuffle Dungeon Quest", {
-        &mOptions[RSK_MQ_DEKU_TREE],
-        &mOptions[RSK_MQ_DODONGOS_CAVERN],
-        &mOptions[RSK_MQ_JABU_JABU],
-        &mOptions[RSK_MQ_FOREST_TEMPLE],
-        &mOptions[RSK_MQ_FIRE_TEMPLE],
-        &mOptions[RSK_MQ_WATER_TEMPLE],
-        &mOptions[RSK_MQ_SPIRIT_TEMPLE],
-        &mOptions[RSK_MQ_SHADOW_TEMPLE],
-        &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_MQ_ICE_CAVERN],
-        &mOptions[RSK_MQ_GTG],
-        &mOptions[RSK_MQ_GANONS_CASTLE]
-    });
-    mOptionGroups[RSG_SHUFFLE] = OptionGroup("Shuffle Settings", {
-        &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
-        &mOptions[RSK_LINKS_POCKET],
-        &mOptions[RSK_SHUFFLE_SONGS],
-        &mOptions[RSK_SHOPSANITY],
-        &mOptions[RSK_SHOPSANITY_COUNT],
-        &mOptions[RSK_SHOPSANITY_PRICES],
-        &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
-        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
-        &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
-        &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
-        &mOptions[RSK_FISHSANITY],
-        &mOptions[RSK_FISHSANITY_POND_COUNT],
-        &mOptions[RSK_FISHSANITY_AGE_SPLIT],
-        &mOptions[RSK_SHUFFLE_FISHING_POLE],
-        &mOptions[RSK_SHUFFLE_TOKENS],
-        &mOptions[RSK_SHUFFLE_SCRUBS],
-        &mOptions[RSK_SCRUBS_PRICES],
-        &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
-        &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
-        &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
-        &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
-        &mOptions[RSK_SHUFFLE_BEEHIVES],
-        &mOptions[RSK_SHUFFLE_COWS],
-        &mOptions[RSK_SHUFFLE_POTS],
-        &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
-        &mOptions[RSK_SHUFFLE_OCARINA],
-        &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
-        &mOptions[RSK_SHUFFLE_SWIM],
-        &mOptions[RSK_SHUFFLE_WEIRD_EGG],
-        &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
-        &mOptions[RSK_SHUFFLE_MERCHANTS],
-        &mOptions[RSK_MERCHANT_PRICES],
-        &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
-        &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
-        &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
-        &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
-        &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
-        &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
-        &mOptions[RSK_SHUFFLE_ADULT_TRADE],
-        &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
-        &mOptions[RSK_SHUFFLE_100_GS_REWARD],
-        &mOptions[RSK_SHUFFLE_BOSS_SOULS],
-        &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
-        &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
-        &mOptions[RSK_SHUFFLE_FREESTANDING],
-        &mOptions[RSK_SHUFFLE_FAIRIES],
-    });
-    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] = OptionGroup("Shuffle Dungeon Items", {
-        &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
-        &mOptions[RSK_KEYSANITY],
-        &mOptions[RSK_GERUDO_KEYS],
-        &mOptions[RSK_BOSS_KEYSANITY],
-        &mOptions[RSK_GANONS_BOSS_KEY],
-        &mOptions[RSK_LACS_STONE_COUNT],
-        &mOptions[RSK_LACS_MEDALLION_COUNT],
-        &mOptions[RSK_LACS_DUNGEON_COUNT],
-        &mOptions[RSK_LACS_REWARD_COUNT],
-        &mOptions[RSK_LACS_TOKEN_COUNT],
-        &mOptions[RSK_LACS_OPTIONS],
-        &mOptions[RSK_KEYRINGS],
-        &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
-        &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
-        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
-        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
-        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
-        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_KEYRINGS_GTG],
-        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
-    });
-    mOptionGroups[RSG_STARTING_ITEMS] = OptionGroup::SubGroup("Items", {
-        &mOptions[RSK_STARTING_OCARINA],
-        &mOptions[RSK_STARTING_KOKIRI_SWORD],
-        &mOptions[RSK_STARTING_DEKU_SHIELD]
-    });
-    mOptionGroups[RSG_STARTING_SONGS] = OptionGroup::SubGroup("Ocarina Songs", {
-        &mOptions[RSK_STARTING_ZELDAS_LULLABY],
-        &mOptions[RSK_STARTING_EPONAS_SONG],
-        &mOptions[RSK_STARTING_SARIAS_SONG],
-        &mOptions[RSK_STARTING_SUNS_SONG],
-        &mOptions[RSK_STARTING_SONG_OF_TIME],
-        &mOptions[RSK_STARTING_SONG_OF_STORMS],
-        &mOptions[RSK_STARTING_SONG_OF_TIME],
-        &mOptions[RSK_STARTING_MINUET_OF_FOREST],
-        &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
-        &mOptions[RSK_STARTING_SERENADE_OF_WATER],
-        &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
-        &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW],
-        &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT],
-    });
+                                                                 &mOptions[RSK_STARTING_AGE],
+                                                                 &mOptions[RSK_SHUFFLE_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_BOSS_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES],
+                                                                 &mOptions[RSK_SHUFFLE_OWL_DROPS],
+                                                                 &mOptions[RSK_SHUFFLE_WARP_SONGS],
+                                                                 &mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS],
+                                                                 &mOptions[RSK_MIXED_ENTRANCE_POOLS],
+                                                                 &mOptions[RSK_MIX_DUNGEON_ENTRANCES],
+                                                                 &mOptions[RSK_MIX_BOSS_ENTRANCES],
+                                                                 &mOptions[RSK_MIX_OVERWORLD_ENTRANCES],
+                                                                 &mOptions[RSK_MIX_INTERIOR_ENTRANCES],
+                                                                 &mOptions[RSK_MIX_GROTTO_ENTRANCES],
+                                                                 &mOptions[RSK_DECOUPLED_ENTRANCES],
+                                                                 &mOptions[RSK_BOMBCHU_BAG],
+                                                                 &mOptions[RSK_ENABLE_BOMBCHU_DROPS],
+                                                                 &mOptions[RSK_TRIFORCE_HUNT],
+                                                                 &mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL],
+                                                                 &mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED],
+                                                                 &mOptions[RSK_MQ_DUNGEON_RANDOM],
+                                                                 &mOptions[RSK_MQ_DUNGEON_COUNT],
+                                                                 &mOptions[RSK_MQ_DUNGEON_SET],
+                                                             });
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_QUESTS] = OptionGroup::SubGroup(
+        "Shuffle Dungeon Quest",
+        { &mOptions[RSK_MQ_DEKU_TREE], &mOptions[RSK_MQ_DODONGOS_CAVERN], &mOptions[RSK_MQ_JABU_JABU],
+          &mOptions[RSK_MQ_FOREST_TEMPLE], &mOptions[RSK_MQ_FIRE_TEMPLE], &mOptions[RSK_MQ_WATER_TEMPLE],
+          &mOptions[RSK_MQ_SPIRIT_TEMPLE], &mOptions[RSK_MQ_SHADOW_TEMPLE], &mOptions[RSK_MQ_BOTTOM_OF_THE_WELL],
+          &mOptions[RSK_MQ_ICE_CAVERN], &mOptions[RSK_MQ_GTG], &mOptions[RSK_MQ_GANONS_CASTLE] });
+    mOptionGroups[RSG_SHUFFLE] =
+        OptionGroup("Shuffle Settings", {
+                                            &mOptions[RSK_SHUFFLE_DUNGEON_REWARDS],
+                                            &mOptions[RSK_LINKS_POCKET],
+                                            &mOptions[RSK_SHUFFLE_SONGS],
+                                            &mOptions[RSK_SHOPSANITY],
+                                            &mOptions[RSK_SHOPSANITY_COUNT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_FIXED_PRICE],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_RANGE_1],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_RANGE_2],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_NO_WALLET_WEIGHT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_CHILD_WALLET_WEIGHT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_ADULT_WALLET_WEIGHT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_GIANT_WALLET_WEIGHT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_TYCOON_WALLET_WEIGHT],
+                                            &mOptions[RSK_SHOPSANITY_PRICES_AFFORDABLE],
+                                            &mOptions[RSK_FISHSANITY],
+                                            &mOptions[RSK_FISHSANITY_POND_COUNT],
+                                            &mOptions[RSK_FISHSANITY_AGE_SPLIT],
+                                            &mOptions[RSK_SHUFFLE_FISHING_POLE],
+                                            &mOptions[RSK_SHUFFLE_TOKENS],
+                                            &mOptions[RSK_SHUFFLE_SCRUBS],
+                                            &mOptions[RSK_SCRUBS_PRICES],
+                                            &mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE],
+                                            &mOptions[RSK_SCRUBS_PRICES_RANGE_1],
+                                            &mOptions[RSK_SCRUBS_PRICES_RANGE_2],
+                                            &mOptions[RSK_SCRUBS_PRICES_NO_WALLET_WEIGHT],
+                                            &mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT],
+                                            &mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT],
+                                            &mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT],
+                                            &mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT],
+                                            &mOptions[RSK_SCRUBS_PRICES_AFFORDABLE],
+                                            &mOptions[RSK_SHUFFLE_BEEHIVES],
+                                            &mOptions[RSK_SHUFFLE_COWS],
+                                            &mOptions[RSK_SHUFFLE_POTS],
+                                            &mOptions[RSK_SHUFFLE_CRATES],
+                                            &mOptions[RSK_SHUFFLE_KOKIRI_SWORD],
+                                            &mOptions[RSK_SHUFFLE_OCARINA],
+                                            &mOptions[RSK_SHUFFLE_OCARINA_BUTTONS],
+                                            &mOptions[RSK_SHUFFLE_SWIM],
+                                            &mOptions[RSK_SHUFFLE_WEIRD_EGG],
+                                            &mOptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD],
+                                            &mOptions[RSK_SHUFFLE_MERCHANTS],
+                                            &mOptions[RSK_MERCHANT_PRICES],
+                                            &mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE],
+                                            &mOptions[RSK_MERCHANT_PRICES_RANGE_1],
+                                            &mOptions[RSK_MERCHANT_PRICES_RANGE_2],
+                                            &mOptions[RSK_MERCHANT_PRICES_NO_WALLET_WEIGHT],
+                                            &mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT],
+                                            &mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT],
+                                            &mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT],
+                                            &mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT],
+                                            &mOptions[RSK_MERCHANT_PRICES_AFFORDABLE],
+                                            &mOptions[RSK_SHUFFLE_FROG_SONG_RUPEES],
+                                            &mOptions[RSK_SHUFFLE_ADULT_TRADE],
+                                            &mOptions[RSK_SHUFFLE_CHEST_MINIGAME],
+                                            &mOptions[RSK_SHUFFLE_100_GS_REWARD],
+                                            &mOptions[RSK_SHUFFLE_BOSS_SOULS],
+                                            &mOptions[RSK_SHUFFLE_DEKU_STICK_BAG],
+                                            &mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
+                                            &mOptions[RSK_SHUFFLE_FREESTANDING],
+                                            &mOptions[RSK_SHUFFLE_FAIRIES],
+                                        });
+    mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] =
+        OptionGroup("Shuffle Dungeon Items", {
+                                                 &mOptions[RSK_SHUFFLE_MAPANDCOMPASS],
+                                                 &mOptions[RSK_KEYSANITY],
+                                                 &mOptions[RSK_GERUDO_KEYS],
+                                                 &mOptions[RSK_BOSS_KEYSANITY],
+                                                 &mOptions[RSK_GANONS_BOSS_KEY],
+                                                 &mOptions[RSK_LACS_STONE_COUNT],
+                                                 &mOptions[RSK_LACS_MEDALLION_COUNT],
+                                                 &mOptions[RSK_LACS_DUNGEON_COUNT],
+                                                 &mOptions[RSK_LACS_REWARD_COUNT],
+                                                 &mOptions[RSK_LACS_TOKEN_COUNT],
+                                                 &mOptions[RSK_LACS_OPTIONS],
+                                                 &mOptions[RSK_KEYRINGS],
+                                                 &mOptions[RSK_KEYRINGS_RANDOM_COUNT],
+                                                 &mOptions[RSK_KEYRINGS_GERUDO_FORTRESS],
+                                                 &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
+                                                 &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+                                                 &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
+                                                 &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+                                                 &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
+                                                 &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+                                                 &mOptions[RSK_KEYRINGS_GTG],
+                                                 &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+                                             });
+    mOptionGroups[RSG_STARTING_ITEMS] =
+        OptionGroup::SubGroup("Items", { &mOptions[RSK_STARTING_OCARINA], &mOptions[RSK_STARTING_KOKIRI_SWORD],
+                                         &mOptions[RSK_STARTING_DEKU_SHIELD] });
+    mOptionGroups[RSG_STARTING_SONGS] =
+        OptionGroup::SubGroup("Ocarina Songs", {
+                                                   &mOptions[RSK_STARTING_ZELDAS_LULLABY],
+                                                   &mOptions[RSK_STARTING_EPONAS_SONG],
+                                                   &mOptions[RSK_STARTING_SARIAS_SONG],
+                                                   &mOptions[RSK_STARTING_SUNS_SONG],
+                                                   &mOptions[RSK_STARTING_SONG_OF_TIME],
+                                                   &mOptions[RSK_STARTING_SONG_OF_STORMS],
+                                                   &mOptions[RSK_STARTING_SONG_OF_TIME],
+                                                   &mOptions[RSK_STARTING_MINUET_OF_FOREST],
+                                                   &mOptions[RSK_STARTING_BOLERO_OF_FIRE],
+                                                   &mOptions[RSK_STARTING_SERENADE_OF_WATER],
+                                                   &mOptions[RSK_STARTING_REQUIEM_OF_SPIRIT],
+                                                   &mOptions[RSK_STARTING_NOCTURNE_OF_SHADOW],
+                                                   &mOptions[RSK_STARTING_PRELUDE_OF_LIGHT],
+                                               });
     mOptionGroups[RSG_STARTING_OTHER] = OptionGroup::SubGroup("Other", {
-        &mOptions[RSK_STARTING_STICKS],
-        &mOptions[RSK_STARTING_NUTS],
-        &mOptions[RSK_FULL_WALLETS],
-        &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
-        &mOptions[RSK_STARTING_HEARTS],
-    });
-    mOptionGroups[RSG_STARTING_INVENTORY] = OptionGroup("Starting Inventory", {
-        &mOptionGroups[RSG_STARTING_ITEMS],
-        &mOptionGroups[RSG_STARTING_SONGS],
-        &mOptionGroups[RSG_STARTING_OTHER],
-    }, OptionGroupType::DEFAULT);
+                                                                           &mOptions[RSK_STARTING_STICKS],
+                                                                           &mOptions[RSK_STARTING_NUTS],
+                                                                           &mOptions[RSK_FULL_WALLETS],
+                                                                           &mOptions[RSK_STARTING_SKULLTULA_TOKEN],
+                                                                           &mOptions[RSK_STARTING_HEARTS],
+                                                                       });
+    mOptionGroups[RSG_STARTING_INVENTORY] = OptionGroup("Starting Inventory",
+                                                        {
+                                                            &mOptionGroups[RSG_STARTING_ITEMS],
+                                                            &mOptionGroups[RSG_STARTING_SONGS],
+                                                            &mOptionGroups[RSG_STARTING_OTHER],
+                                                        },
+                                                        OptionGroupType::DEFAULT);
     mOptionGroups[RSG_TIMESAVERS] = OptionGroup("Timesaver Settings", {
-        &mOptions[RSK_SKIP_CHILD_ZELDA],
-        &mOptions[RSK_SKIP_EPONA_RACE],
-        &mOptions[RSK_SKIP_SCARECROWS_SONG],
-        &mOptions[RSK_BIG_POE_COUNT],
-        &mOptions[RSK_CUCCO_COUNT],
-        &mOptions[RSK_COMPLETE_MASK_QUEST],
-    });
-    mOptionGroups[RSG_MISC] = OptionGroup("Miscellaneous Settings", {
-        &mOptions[RSK_GOSSIP_STONE_HINTS],
-        &mOptions[RSK_HINT_CLARITY],
-        &mOptions[RSK_HINT_DISTRIBUTION],
-        &mOptions[RSK_TOT_ALTAR_HINT],
-        &mOptions[RSK_GANONDORF_HINT],
-        &mOptions[RSK_SHEIK_LA_HINT],
-        &mOptions[RSK_DAMPES_DIARY_HINT],
-        &mOptions[RSK_GREG_HINT],
-        &mOptions[RSK_LOACH_HINT],
-        &mOptions[RSK_SARIA_HINT],
-        &mOptions[RSK_FROGS_HINT],
-        &mOptions[RSK_OOT_HINT],
-        &mOptions[RSK_WARP_SONG_HINTS],
-        &mOptions[RSK_BIGGORON_HINT],
-        &mOptions[RSK_BIG_POES_HINT],
-        &mOptions[RSK_CHICKENS_HINT],
-        &mOptions[RSK_MALON_HINT],
-        &mOptions[RSK_HBA_HINT],
-        &mOptions[RSK_KAK_10_SKULLS_HINT],
-        &mOptions[RSK_KAK_20_SKULLS_HINT],
-        &mOptions[RSK_KAK_30_SKULLS_HINT],
-        &mOptions[RSK_KAK_40_SKULLS_HINT],
-        &mOptions[RSK_KAK_50_SKULLS_HINT],
-        &mOptions[RSK_KAK_100_SKULLS_HINT],
-        &mOptions[RSK_MASK_SHOP_HINT],
-        &mOptions[RSK_SCRUB_TEXT_HINT],
-        &mOptions[RSK_MERCHANT_TEXT_HINT],
-        &mOptions[RSK_FISHING_POLE_HINT],
-        // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
-        &mOptions[RSK_DAMAGE_MULTIPLIER],
-        &mOptions[RSK_BLUE_FIRE_ARROWS],
-        &mOptions[RSK_SUNLIGHT_ARROWS],
-        &mOptions[RSK_INFINITE_UPGRADES],
-        &mOptions[RSK_SKELETON_KEY],
-    });
-    mOptionGroups[RSG_ITEM_POOL] = OptionGroup("Item Pool Settings", std::initializer_list<Option*>({
-        &mOptions[RSK_ITEM_POOL],
-        &mOptions[RSK_ICE_TRAPS]
-    }));
+                                                                          &mOptions[RSK_SKIP_CHILD_ZELDA],
+                                                                          &mOptions[RSK_SKIP_EPONA_RACE],
+                                                                          &mOptions[RSK_SKIP_SCARECROWS_SONG],
+                                                                          &mOptions[RSK_BIG_POE_COUNT],
+                                                                          &mOptions[RSK_COMPLETE_MASK_QUEST],
+                                                                      });
+    mOptionGroups[RSG_MISC] = OptionGroup("Miscellaneous Settings",
+                                          {
+                                              &mOptions[RSK_GOSSIP_STONE_HINTS],
+                                              &mOptions[RSK_HINT_CLARITY],
+                                              &mOptions[RSK_HINT_DISTRIBUTION],
+                                              &mOptions[RSK_TOT_ALTAR_HINT],
+                                              &mOptions[RSK_GANONDORF_HINT],
+                                              &mOptions[RSK_SHEIK_LA_HINT],
+                                              &mOptions[RSK_DAMPES_DIARY_HINT],
+                                              &mOptions[RSK_GREG_HINT],
+                                              &mOptions[RSK_LOACH_HINT],
+                                              &mOptions[RSK_SARIA_HINT],
+                                              &mOptions[RSK_FROGS_HINT],
+                                              &mOptions[RSK_OOT_HINT],
+                                              &mOptions[RSK_WARP_SONG_HINTS],
+                                              &mOptions[RSK_BIGGORON_HINT],
+                                              &mOptions[RSK_BIG_POES_HINT],
+                                              &mOptions[RSK_CHICKENS_HINT],
+                                              &mOptions[RSK_MALON_HINT],
+                                              &mOptions[RSK_HBA_HINT],
+                                              &mOptions[RSK_KAK_10_SKULLS_HINT],
+                                              &mOptions[RSK_KAK_20_SKULLS_HINT],
+                                              &mOptions[RSK_KAK_30_SKULLS_HINT],
+                                              &mOptions[RSK_KAK_40_SKULLS_HINT],
+                                              &mOptions[RSK_KAK_50_SKULLS_HINT],
+                                              &mOptions[RSK_KAK_100_SKULLS_HINT],
+                                              &mOptions[RSK_MASK_SHOP_HINT],
+                                              &mOptions[RSK_SCRUB_TEXT_HINT],
+                                              &mOptions[RSK_MERCHANT_TEXT_HINT],
+                                              &mOptions[RSK_FISHING_POLE_HINT],
+                                              // TODO: Compasses show Reward/WOTH, Maps show Dungeon Mode, Starting Time
+                                              &mOptions[RSK_DAMAGE_MULTIPLIER],
+                                              &mOptions[RSK_BLUE_FIRE_ARROWS],
+                                              &mOptions[RSK_SUNLIGHT_ARROWS],
+                                              &mOptions[RSK_INFINITE_UPGRADES],
+                                              &mOptions[RSK_SKELETON_KEY],
+                                          });
+    mOptionGroups[RSG_ITEM_POOL] = OptionGroup(
+        "Item Pool Settings", std::initializer_list<Option*>({ &mOptions[RSK_ITEM_POOL], &mOptions[RSK_ICE_TRAPS] }));
     // TODO: Progressive Goron Sword, Remove Double Defense
-    mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] = OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsAreas[RCAREA_KOKIRI_FOREST]);
-    mOptionGroups[RSG_EXCLUDES_LOST_WOODS] = OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsAreas[RCAREA_LOST_WOODS]);
-    mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW] = OptionGroup::SubGroup("Sacred Forest Meadow", mExcludeLocationsOptionsAreas[RCAREA_SACRED_FOREST_MEADOW]);
-    mOptionGroups[RSG_EXCLUDES_DEKU_TREE] = OptionGroup::SubGroup("Deku Tree", mExcludeLocationsOptionsAreas[RCAREA_DEKU_TREE]);
-    mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE] = OptionGroup::SubGroup("Forest Temple", mExcludeLocationsOptionsAreas[RCAREA_FOREST_TEMPLE]);
-    mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE] = OptionGroup::SubGroup("Kakariko Village", mExcludeLocationsOptionsAreas[RCAREA_KAKARIKO_VILLAGE]);
-    mOptionGroups[RSG_EXCLUDES_GRAVEYARD] = OptionGroup::SubGroup("Graveyard", mExcludeLocationsOptionsAreas[RCAREA_GRAVEYARD]);
-    mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL] = OptionGroup::SubGroup("Bottom of the Well", mExcludeLocationsOptionsAreas[RCAREA_BOTTOM_OF_THE_WELL]);
-    mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE] = OptionGroup::SubGroup("Shadow Temple", mExcludeLocationsOptionsAreas[RCAREA_SHADOW_TEMPLE]);
-    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL] = OptionGroup::SubGroup("Death Mountain Trail", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_TRAIL]);
-    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER] = OptionGroup::SubGroup("Death Mountain Crater", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_CRATER]);
-    mOptionGroups[RSG_EXCLUDES_GORON_CITY] = OptionGroup::SubGroup("Goron City", mExcludeLocationsOptionsAreas[RCAREA_GORON_CITY]);
-    mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN] = OptionGroup::SubGroup("Dodongo's Cavern", mExcludeLocationsOptionsAreas[RCAREA_DODONGOS_CAVERN]);
-    mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE] = OptionGroup::SubGroup("Fire Temple", mExcludeLocationsOptionsAreas[RCAREA_FIRE_TEMPLE]);
-    mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER] = OptionGroup::SubGroup("Zora's River", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_RIVER]);
-    mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN] = OptionGroup::SubGroup("Zora's Domain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_DOMAIN]);
-    mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN] = OptionGroup::SubGroup("Zora's Fountain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_FOUNTAIN]);
-    mOptionGroups[RSG_EXCLUDES_JABU_JABU] = OptionGroup::SubGroup("Jabu Jabu's Belly", mExcludeLocationsOptionsAreas[RCAREA_JABU_JABUS_BELLY]);
-    mOptionGroups[RSG_EXCLUDES_ICE_CAVERN] = OptionGroup::SubGroup("Ice Cavern", mExcludeLocationsOptionsAreas[RCAREA_ICE_CAVERN]);
-    mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD] = OptionGroup::SubGroup("Hyrule Field", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_FIELD]);
-    mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH] = OptionGroup::SubGroup("Lon Lon Ranch", mExcludeLocationsOptionsAreas[RCAREA_LON_LON_RANCH]);
-    mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA] = OptionGroup::SubGroup("Lake Hylia", mExcludeLocationsOptionsAreas[RCAREA_LAKE_HYLIA]);
-    mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE] = OptionGroup::SubGroup("Water Temple", mExcludeLocationsOptionsAreas[RCAREA_WATER_TEMPLE]);
-    mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY] = OptionGroup::SubGroup("Gerudo Valley", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_VALLEY]);
-    mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS] = OptionGroup::SubGroup("Gerudo Fortress", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_FORTRESS]);
-    mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND] = OptionGroup::SubGroup("Haunted Wasteland", mExcludeLocationsOptionsAreas[RCAREA_WASTELAND]);
-    mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS] = OptionGroup::SubGroup("Desert Colossus", mExcludeLocationsOptionsAreas[RCAREA_DESERT_COLOSSUS]);
-    mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUND] = OptionGroup::SubGroup("Gerudo Training Ground", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_TRAINING_GROUND]);
-    mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE] = OptionGroup::SubGroup("Spirit Temple", mExcludeLocationsOptionsAreas[RCAREA_SPIRIT_TEMPLE]);
-    mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE] = OptionGroup::SubGroup("Hyrule Castle", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_CASTLE]);
+    mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST] =
+        OptionGroup::SubGroup("Kokiri Forest", mExcludeLocationsOptionsAreas[RCAREA_KOKIRI_FOREST]);
+    mOptionGroups[RSG_EXCLUDES_LOST_WOODS] =
+        OptionGroup::SubGroup("Lost Woods", mExcludeLocationsOptionsAreas[RCAREA_LOST_WOODS]);
+    mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW] =
+        OptionGroup::SubGroup("Sacred Forest Meadow", mExcludeLocationsOptionsAreas[RCAREA_SACRED_FOREST_MEADOW]);
+    mOptionGroups[RSG_EXCLUDES_DEKU_TREE] =
+        OptionGroup::SubGroup("Deku Tree", mExcludeLocationsOptionsAreas[RCAREA_DEKU_TREE]);
+    mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE] =
+        OptionGroup::SubGroup("Forest Temple", mExcludeLocationsOptionsAreas[RCAREA_FOREST_TEMPLE]);
+    mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE] =
+        OptionGroup::SubGroup("Kakariko Village", mExcludeLocationsOptionsAreas[RCAREA_KAKARIKO_VILLAGE]);
+    mOptionGroups[RSG_EXCLUDES_GRAVEYARD] =
+        OptionGroup::SubGroup("Graveyard", mExcludeLocationsOptionsAreas[RCAREA_GRAVEYARD]);
+    mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL] =
+        OptionGroup::SubGroup("Bottom of the Well", mExcludeLocationsOptionsAreas[RCAREA_BOTTOM_OF_THE_WELL]);
+    mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE] =
+        OptionGroup::SubGroup("Shadow Temple", mExcludeLocationsOptionsAreas[RCAREA_SHADOW_TEMPLE]);
+    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL] =
+        OptionGroup::SubGroup("Death Mountain Trail", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_TRAIL]);
+    mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER] =
+        OptionGroup::SubGroup("Death Mountain Crater", mExcludeLocationsOptionsAreas[RCAREA_DEATH_MOUNTAIN_CRATER]);
+    mOptionGroups[RSG_EXCLUDES_GORON_CITY] =
+        OptionGroup::SubGroup("Goron City", mExcludeLocationsOptionsAreas[RCAREA_GORON_CITY]);
+    mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN] =
+        OptionGroup::SubGroup("Dodongo's Cavern", mExcludeLocationsOptionsAreas[RCAREA_DODONGOS_CAVERN]);
+    mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE] =
+        OptionGroup::SubGroup("Fire Temple", mExcludeLocationsOptionsAreas[RCAREA_FIRE_TEMPLE]);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER] =
+        OptionGroup::SubGroup("Zora's River", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_RIVER]);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN] =
+        OptionGroup::SubGroup("Zora's Domain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_DOMAIN]);
+    mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN] =
+        OptionGroup::SubGroup("Zora's Fountain", mExcludeLocationsOptionsAreas[RCAREA_ZORAS_FOUNTAIN]);
+    mOptionGroups[RSG_EXCLUDES_JABU_JABU] =
+        OptionGroup::SubGroup("Jabu Jabu's Belly", mExcludeLocationsOptionsAreas[RCAREA_JABU_JABUS_BELLY]);
+    mOptionGroups[RSG_EXCLUDES_ICE_CAVERN] =
+        OptionGroup::SubGroup("Ice Cavern", mExcludeLocationsOptionsAreas[RCAREA_ICE_CAVERN]);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD] =
+        OptionGroup::SubGroup("Hyrule Field", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_FIELD]);
+    mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH] =
+        OptionGroup::SubGroup("Lon Lon Ranch", mExcludeLocationsOptionsAreas[RCAREA_LON_LON_RANCH]);
+    mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA] =
+        OptionGroup::SubGroup("Lake Hylia", mExcludeLocationsOptionsAreas[RCAREA_LAKE_HYLIA]);
+    mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE] =
+        OptionGroup::SubGroup("Water Temple", mExcludeLocationsOptionsAreas[RCAREA_WATER_TEMPLE]);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY] =
+        OptionGroup::SubGroup("Gerudo Valley", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_VALLEY]);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS] =
+        OptionGroup::SubGroup("Gerudo Fortress", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_FORTRESS]);
+    mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND] =
+        OptionGroup::SubGroup("Haunted Wasteland", mExcludeLocationsOptionsAreas[RCAREA_WASTELAND]);
+    mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS] =
+        OptionGroup::SubGroup("Desert Colossus", mExcludeLocationsOptionsAreas[RCAREA_DESERT_COLOSSUS]);
+    mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUND] =
+        OptionGroup::SubGroup("Gerudo Training Ground", mExcludeLocationsOptionsAreas[RCAREA_GERUDO_TRAINING_GROUND]);
+    mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE] =
+        OptionGroup::SubGroup("Spirit Temple", mExcludeLocationsOptionsAreas[RCAREA_SPIRIT_TEMPLE]);
+    mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE] =
+        OptionGroup::SubGroup("Hyrule Castle", mExcludeLocationsOptionsAreas[RCAREA_HYRULE_CASTLE]);
     mOptionGroups[RSG_EXCLUDES_MARKET] = OptionGroup::SubGroup("Market", mExcludeLocationsOptionsAreas[RCAREA_MARKET]);
-    mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE] = OptionGroup::SubGroup("Ganon's Castle", mExcludeLocationsOptionsAreas[RCAREA_GANONS_CASTLE]);
-    mOptionGroups[RSG_EXCLUDES] = OptionGroup::SubGroup("Exclude Locations", {
-        &mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST],
-        &mOptionGroups[RSG_EXCLUDES_LOST_WOODS],
-        &mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW],
-        &mOptionGroups[RSG_EXCLUDES_DEKU_TREE],
-        &mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE],
-        &mOptionGroups[RSG_EXCLUDES_GRAVEYARD],
-        &mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL],
-        &mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL],
-        &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER],
-        &mOptionGroups[RSG_EXCLUDES_GORON_CITY],
-        &mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN],
-        &mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER],
-        &mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN],
-        &mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN],
-        &mOptionGroups[RSG_EXCLUDES_JABU_JABU],
-        &mOptionGroups[RSG_EXCLUDES_ICE_CAVERN],
-        &mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD],
-        &mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH],
-        &mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA],
-        &mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY],
-        &mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS],
-        &mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND],
-        &mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS],
-        &mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUND],
-        &mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE],
-        &mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE],
-        &mOptionGroups[RSG_EXCLUDES_MARKET],
-        &mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE],
-    });
-    mOptionGroups[RSG_DETAILED_LOGIC] = OptionGroup("Detailed Logic Settings", {
-        &mOptionGroups[RSG_LOGIC],
-        &mOptionGroups[RSG_TRICKS],
-        &mOptionGroups[RSG_EXCLUDES]
-    });
+    mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE] =
+        OptionGroup::SubGroup("Ganon's Castle", mExcludeLocationsOptionsAreas[RCAREA_GANONS_CASTLE]);
+    mOptionGroups[RSG_EXCLUDES] =
+        OptionGroup::SubGroup("Exclude Locations", {
+                                                       &mOptionGroups[RSG_EXCLUDES_KOKIRI_FOREST],
+                                                       &mOptionGroups[RSG_EXCLUDES_LOST_WOODS],
+                                                       &mOptionGroups[RSG_EXCLUDES_SACRED_FOREST_MEADOW],
+                                                       &mOptionGroups[RSG_EXCLUDES_DEKU_TREE],
+                                                       &mOptionGroups[RSG_EXCLUDES_FOREST_TEMPLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_KAKARIKO_VILLAGE],
+                                                       &mOptionGroups[RSG_EXCLUDES_GRAVEYARD],
+                                                       &mOptionGroups[RSG_EXCLUDES_BOTTOM_OF_THE_WELL],
+                                                       &mOptionGroups[RSG_EXCLUDES_SHADOW_TEMPLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_TRAIL],
+                                                       &mOptionGroups[RSG_EXCLUDES_DEATH_MOUNTAIN_CRATER],
+                                                       &mOptionGroups[RSG_EXCLUDES_GORON_CITY],
+                                                       &mOptionGroups[RSG_EXCLUDES_DODONGOS_CAVERN],
+                                                       &mOptionGroups[RSG_EXCLUDES_FIRE_TEMPLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_ZORAS_RIVER],
+                                                       &mOptionGroups[RSG_EXCLUDES_ZORAS_DOMAIN],
+                                                       &mOptionGroups[RSG_EXCLUDES_ZORAS_FOUNTAIN],
+                                                       &mOptionGroups[RSG_EXCLUDES_JABU_JABU],
+                                                       &mOptionGroups[RSG_EXCLUDES_ICE_CAVERN],
+                                                       &mOptionGroups[RSG_EXCLUDES_HYRULE_FIELD],
+                                                       &mOptionGroups[RSG_EXCLUDES_LON_LON_RANCH],
+                                                       &mOptionGroups[RSG_EXCLUDES_LAKE_HYLIA],
+                                                       &mOptionGroups[RSG_EXCLUDES_WATER_TEMPLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_GERUDO_VALLEY],
+                                                       &mOptionGroups[RSG_EXCLUDES_GERUDO_FORTRESS],
+                                                       &mOptionGroups[RSG_EXCLUDES_HAUNTED_WASTELAND],
+                                                       &mOptionGroups[RSG_EXCLUDES_DESERT_COLOSSUS],
+                                                       &mOptionGroups[RSG_EXCLUDES_GERUDO_TRAINING_GROUND],
+                                                       &mOptionGroups[RSG_EXCLUDES_SPIRIT_TEMPLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_HYRULE_CASTLE],
+                                                       &mOptionGroups[RSG_EXCLUDES_MARKET],
+                                                       &mOptionGroups[RSG_EXCLUDES_GANONS_CASTLE],
+                                                   });
+    mOptionGroups[RSG_DETAILED_LOGIC] =
+        OptionGroup("Detailed Logic Settings",
+                    { &mOptionGroups[RSG_LOGIC], &mOptionGroups[RSG_TRICKS], &mOptionGroups[RSG_EXCLUDES] });
 }
 
-std::unordered_map<std::string, RandomizerSettingKey> Settings::PopulateOptionNameToEnum(){
+std::unordered_map<std::string, RandomizerSettingKey> Settings::PopulateOptionNameToEnum() {
     std::unordered_map<std::string, RandomizerSettingKey> output = {};
     for (size_t count = 0; count < RSK_MAX; count++) {
         output[mOptions[count].GetName()] = static_cast<RandomizerSettingKey>(count);
@@ -1121,9 +1760,17 @@ TrickOption& Settings::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }
 
+int Settings::GetRandomizerTrickByName(const std::string& name) {
+    const auto& it = mTrickNameToEnum.find(name);
+    if (it == mTrickNameToEnum.end()) {
+        return -1;
+    }
+    return it->second;
+}
+
 void Context::ResetTrickOptions() {
-    for (int count = 0; count < RT_MAX; count++){
-        mTrickOptions[count].Set(0); //RANDOTODO this can probably be done better
+    for (int count = 0; count < RT_MAX; count++) {
+        mTrickOptions[count].Set(0); // RANDOTODO this can probably be done better
     };
 }
 
@@ -1131,11 +1778,11 @@ const std::array<Option, RSK_MAX>& Settings::GetAllOptions() const {
     return mOptions;
 }
 
-std::vector<Option *>& Settings::GetExcludeOptionsForArea(const RandomizerCheckArea area) {
+std::vector<Option*>& Settings::GetExcludeOptionsForArea(const RandomizerCheckArea area) {
     return mExcludeLocationsOptionsAreas[area];
 }
 
-const std::vector<std::vector<Option *>>& Settings::GetExcludeLocationsOptions() const {
+const std::vector<std::vector<Option*>>& Settings::GetExcludeLocationsOptions() const {
     return mExcludeLocationsOptionsAreas;
 }
 
@@ -1147,12 +1794,6 @@ const OptionGroup& Settings::GetOptionGroup(const RandomizerSettingGroupKey key)
     return mOptionGroups[key];
 }
 
-void Settings::SetAllFromCVar() {
-    for (auto& option : mOptions) {
-        option.SetFromCVar();
-    }
-}
-
 void Settings::UpdateOptionProperties() {
     // Default to hiding bridge opts and the extra sliders.
     mOptions[RSK_RAINBOW_BRIDGE].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
@@ -1187,8 +1828,10 @@ void Settings::UpdateOptionProperties() {
         // Starting Age - Disabled when Forest is set to Closed or under very specific conditions
         if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ClosedForest"), RO_CLOSED_FOREST_ON) == RO_CLOSED_FOREST_ON ||
             (CVarGetInteger(CVAR_RANDOMIZER_SETTING("DoorOfTime"), RO_DOOROFTIME_CLOSED) == RO_DOOROFTIME_CLOSED &&
-            CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_OFF) == RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
-            mOptions[RSK_STARTING_AGE].Disable("This option is disabled due to other options making the game unbeatable");
+             CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOcarinas"), RO_GENERIC_OFF) ==
+                 RO_GENERIC_OFF)) /* closed door of time with ocarina shuffle off */ {
+            mOptions[RSK_STARTING_AGE].Disable(
+                "This option is disabled due to other options making the game unbeatable.");
         } else {
             mOptions[RSK_STARTING_AGE].Enable();
         }
@@ -1200,7 +1843,8 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable();
         mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable();
         mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable();
-        const uint8_t bridgeOpt = CVarGetInteger(CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), RO_BRIDGE_STANDARD_REWARD);
+        const uint8_t bridgeOpt =
+            CVarGetInteger(CVAR_RANDOMIZER_SETTING("BridgeRewardOptions"), RO_BRIDGE_STANDARD_REWARD);
         switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("RainbowBridge"), RO_BRIDGE_VANILLA)) {
             case RO_BRIDGE_STONES:
                 // Show Bridge Options and Stone Count slider
@@ -1274,7 +1918,8 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_GANONS_TRIALS].Enable();
         mOptions[RSK_TRIAL_COUNT].Enable();
         // Only show the trial count slider if Trials is set to Set Number
-        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SKIP) == RO_GANONS_TRIALS_SET_NUMBER) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GanonTrial"), RO_GANONS_TRIALS_SET_NUMBER) ==
+            RO_GANONS_TRIALS_SET_NUMBER) {
             mOptions[RSK_GANONS_TRIALS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_TRIAL_COUNT].Unhide();
         } else {
@@ -1302,8 +1947,10 @@ void Settings::UpdateOptionProperties() {
         mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable();
         mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable();
         // Link's Pocket - Disabled when Dungeon Rewards are shuffled to End of Dungeon
-        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
-            mOptions[RSK_LINKS_POCKET].Disable("This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonReward"), RO_DUNGEON_REWARDS_END_OF_DUNGEON) ==
+            RO_DUNGEON_REWARDS_END_OF_DUNGEON) {
+            mOptions[RSK_LINKS_POCKET].Disable(
+                "This option is disabled because \"Dungeon Rewards\" are shuffled to \"End of Dungeons\".");
         } else {
             mOptions[RSK_LINKS_POCKET].Enable();
         }
@@ -1330,7 +1977,7 @@ void Settings::UpdateOptionProperties() {
     } else {
         // If any MQ Options are available, show the MQ Dungeon Randomization Combobox
         mOptions[RSK_MQ_DUNGEON_RANDOM].Unhide();
-        switch(CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE)) {
+        switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MQDungeons"), RO_MQ_DUNGEONS_NONE)) {
             // If No MQ Dungeons, add a separator after the combobx and hide
             // the count slider and the toggle for individual dungeon selections.
             case RO_MQ_DUNGEONS_NONE:
@@ -1396,20 +2043,23 @@ void Settings::UpdateOptionProperties() {
         }
     }
 
-    int dungeonShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
-    int bossShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
-    int overworldShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"), RO_GENERIC_OFF);
-    int interiorShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleInteriorsEntrances"), RO_GENERIC_OFF);
-    int grottoShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), RO_GENERIC_OFF);
-    
-    // Hide Mixed Entrances option if no applicable entrance shuffles are visible
-    if (!dungeonShuffle && !bossShuffle && !overworldShuffle && !interiorShuffle && !grottoShuffle) {
+    bool dungeonShuffle =
+        CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_OFF);
+    bool bossShuffle =
+        CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF);
+    bool overworldShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleOverworldEntrances"), RO_GENERIC_OFF);
+    bool interiorShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleInteriorsEntrances"), RO_GENERIC_OFF);
+    bool grottoShuffle = CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGrottosEntrances"), RO_GENERIC_OFF);
+
+    // Hide Mixed Entrances option if 1 or no applicable entrance shuffles are visible
+    if (dungeonShuffle + bossShuffle + overworldShuffle + interiorShuffle + grottoShuffle <= 1) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].Hide();
     } else {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].Unhide();
     }
     // Show mixed entrance pool options if mixed entrance pools are enabled, but only the ones that aren't off
-    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF) == RO_GENERIC_OFF || mOptions[RSK_MIXED_ENTRANCE_POOLS].IsHidden()) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MixedEntrances"), RO_GENERIC_OFF) == RO_GENERIC_OFF ||
+        mOptions[RSK_MIXED_ENTRANCE_POOLS].IsHidden()) {
         mOptions[RSK_MIXED_ENTRANCE_POOLS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
         mOptions[RSK_MIX_DUNGEON_ENTRANCES].Hide();
         mOptions[RSK_MIX_BOSS_ENTRANCES].Hide();
@@ -1424,13 +2074,15 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_MIX_INTERIOR_ENTRANCES].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
         mOptions[RSK_MIX_GROTTO_ENTRANCES].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
         RandomizerSettingKey lastKey = RSK_MIXED_ENTRANCE_POOLS;
-        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) == RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDungeonsEntrances"), RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) ==
+            RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) {
             mOptions[RSK_MIX_DUNGEON_ENTRANCES].Hide();
         } else {
             mOptions[RSK_MIX_DUNGEON_ENTRANCES].Unhide();
             lastKey = RSK_MIX_DUNGEON_ENTRANCES;
         }
-        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) == RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) {
+        if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBossEntrances"), RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) ==
+            RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) {
             mOptions[RSK_MIX_BOSS_ENTRANCES].Hide();
         } else {
             mOptions[RSK_MIX_BOSS_ENTRANCES].Unhide();
@@ -1458,12 +2110,12 @@ void Settings::UpdateOptionProperties() {
     }
 
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDekuStickBag"), 0)) {
-        mOptions[RSK_STARTING_STICKS].Disable("Disabled because Shuffle Deku Stick Bag is On");
+        mOptions[RSK_STARTING_STICKS].Disable("Disabled because Shuffle Deku Stick Bag is on.");
     } else {
         mOptions[RSK_STARTING_STICKS].Enable();
     }
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleDekuNutBag"), 0)) {
-        mOptions[RSK_STARTING_NUTS].Disable("Disabled because Shuffle Deku Nut Bag is On");
+        mOptions[RSK_STARTING_NUTS].Disable("Disabled because Shuffle Deku Nut Bag is on.");
     } else {
         mOptions[RSK_STARTING_NUTS].Enable();
     }
@@ -1518,7 +2170,7 @@ void Settings::UpdateOptionProperties() {
         default:
             mOptions[RSK_SHUFFLE_SCRUBS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_SCRUBS_PRICES].Unhide();
-            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ScrubsPrices"), RO_PRICE_VANILLA)){
+            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ScrubsPrices"), RO_PRICE_VANILLA)) {
                 case RO_PRICE_FIXED:
                     mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].Unhide();
                     mOptions[RSK_SCRUBS_PRICES_RANGE_1].Hide();
@@ -1528,8 +2180,10 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
-                        mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
+                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 501
+                                 : mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+                        mOptions[RSK_SCRUBS_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999)
+                                                                                       : NumOpts(0, 500));
                     }
                     mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Hide();
                     break;
@@ -1542,9 +2196,12 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 200) {
-                        mOptions[RSK_SCRUBS_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
-                        mOptions[RSK_SCRUBS_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                    if (isTycoon ? mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 101
+                                 : mOptions[RSK_SCRUBS_PRICES_RANGE_1].GetOptionCount() == 200) {
+                        mOptions[RSK_SCRUBS_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                                   : NumOpts(0, 500, 5));
+                        mOptions[RSK_SCRUBS_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                                   : NumOpts(0, 500, 5));
                     }
                     mOptions[RSK_SCRUBS_PRICES_AFFORDABLE].Unhide();
                     break;
@@ -1556,7 +2213,7 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_SCRUBS_PRICES_CHILD_WALLET_WEIGHT].Unhide();
                     mOptions[RSK_SCRUBS_PRICES_ADULT_WALLET_WEIGHT].Unhide();
                     mOptions[RSK_SCRUBS_PRICES_GIANT_WALLET_WEIGHT].Unhide();
-                    if (isTycoon){
+                    if (isTycoon) {
                         mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
                     } else {
                         mOptions[RSK_SCRUBS_PRICES_TYCOON_WALLET_WEIGHT].Hide();
@@ -1594,7 +2251,7 @@ void Settings::UpdateOptionProperties() {
         default:
             mOptions[RSK_SHUFFLE_MERCHANTS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
             mOptions[RSK_MERCHANT_PRICES].Unhide();
-            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MerchantPrices"), RO_PRICE_VANILLA)){
+            switch (CVarGetInteger(CVAR_RANDOMIZER_SETTING("MerchantPrices"), RO_PRICE_VANILLA)) {
                 case RO_PRICE_FIXED:
                     mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].Unhide();
                     mOptions[RSK_MERCHANT_PRICES_RANGE_1].Hide();
@@ -1604,8 +2261,10 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 501 : mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
-                        mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999) : NumOpts(0, 500));
+                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 501
+                                 : mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].GetOptionCount() == 1000) {
+                        mOptions[RSK_MERCHANT_PRICES_FIXED_PRICE].ChangeOptions(isTycoon ? NumOpts(0, 999)
+                                                                                         : NumOpts(0, 500));
                     }
                     mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Hide();
                     break;
@@ -1618,9 +2277,12 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Hide();
                     mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
-                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 101 : mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 200) {
-                        mOptions[RSK_MERCHANT_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
-                        mOptions[RSK_MERCHANT_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5) : NumOpts(0, 500, 5));
+                    if (isTycoon ? mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 101
+                                 : mOptions[RSK_MERCHANT_PRICES_RANGE_1].GetOptionCount() == 200) {
+                        mOptions[RSK_MERCHANT_PRICES_RANGE_1].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                                     : NumOpts(0, 500, 5));
+                        mOptions[RSK_MERCHANT_PRICES_RANGE_2].ChangeOptions(isTycoon ? NumOpts(0, 995, 5)
+                                                                                     : NumOpts(0, 500, 5));
                     }
                     mOptions[RSK_MERCHANT_PRICES_AFFORDABLE].Unhide();
                     break;
@@ -1632,7 +2294,7 @@ void Settings::UpdateOptionProperties() {
                     mOptions[RSK_MERCHANT_PRICES_CHILD_WALLET_WEIGHT].Unhide();
                     mOptions[RSK_MERCHANT_PRICES_ADULT_WALLET_WEIGHT].Unhide();
                     mOptions[RSK_MERCHANT_PRICES_GIANT_WALLET_WEIGHT].Unhide();
-                    if (isTycoon){
+                    if (isTycoon) {
                         mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Unhide();
                     } else {
                         mOptions[RSK_MERCHANT_PRICES_TYCOON_WALLET_WEIGHT].Hide();
@@ -1673,8 +2335,10 @@ void Settings::UpdateOptionProperties() {
         mOptions[RSK_FISHING_POLE_HINT].Disable("This option is disabled since the fishing pole is not shuffled.");
     }
     // Shuffle 100 GS Reward - Force-Enabled if Ganon's Boss Key is on the 100 GS Reward
-    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_VANILLA) == RO_GANON_BOSS_KEY_KAK_TOKENS) {
-        mOptions[RSK_SHUFFLE_100_GS_REWARD].Disable("This option is force-enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward.\"", UIWidgets::CheckboxGraphics::Checkmark);
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleGanonBossKey"), RO_GANON_BOSS_KEY_VANILLA) ==
+        RO_GANON_BOSS_KEY_KAK_TOKENS) {
+        mOptions[RSK_SHUFFLE_100_GS_REWARD].Disable(
+            "This option is force-enabled because \"Ganon's Boss Key\" is set to \"100 GS Reward\".");
     } else {
         mOptions[RSK_SHUFFLE_100_GS_REWARD].Enable();
     }
@@ -1711,21 +2375,28 @@ void Settings::UpdateOptionProperties() {
         default:
             break;
     }
-    const uint8_t maxKeyringCount = (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) == RO_GF_CARPENTERS_NORMAL &&
-                               CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8;
+    const uint8_t maxKeyringCount =
+        (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) ==
+             RO_GF_CARPENTERS_NORMAL &&
+         CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA)
+            ? 9
+            : 8;
     if (mOptions[RSK_KEYRINGS_RANDOM_COUNT].GetOptionCount() != maxKeyringCount + 1) {
         mOptions[RSK_KEYRINGS_RANDOM_COUNT].ChangeOptions(NumOpts(0, maxKeyringCount));
     }
-    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) != RO_GF_CARPENTERS_NORMAL ||
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("FortressCarpenters"), RO_GF_CARPENTERS_NORMAL) !=
+            RO_GF_CARPENTERS_NORMAL ||
         CVarGetInteger(CVAR_RANDOMIZER_SETTING("GerudoKeys"), RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA) {
-        mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Disable("Disabled because the currently selected Gerudo Fortress Carpenters\n"
+        mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Disable(
+            "Disabled because the currently selected Gerudo Fortress Carpenters\n"
             "setting and/or Gerudo Fortress Keys setting is incompatible with\n"
             "having a Gerudo Fortress Keyring.");
     } else {
         mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Enable();
     }
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("TriforceHunt"), RO_GENERIC_OFF)) {
-        mOptions[RSK_GANONS_BOSS_KEY].Disable("This option is disabled because Triforce Hunt is enabled."
+        mOptions[RSK_GANONS_BOSS_KEY].Disable(
+            "This option is disabled because Triforce Hunt is enabled."
             "Ganon's Boss key\nwill instead be given to you after Triforce Hunt completion.");
     } else {
         mOptions[RSK_GANONS_BOSS_KEY].Enable();
@@ -1804,7 +2475,8 @@ void Settings::UpdateOptionProperties() {
     } else {
         mOptions[RSK_SKIP_CHILD_STEALTH].Enable();
     }
-    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GossipStoneHints"), RO_GOSSIP_STONES_NEED_NOTHING) == RO_GOSSIP_STONES_NONE) {
+    if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("GossipStoneHints"), RO_GOSSIP_STONES_NEED_NOTHING) ==
+        RO_GOSSIP_STONES_NONE) {
         mOptions[RSK_HINT_CLARITY].Hide();
         mOptions[RSK_HINT_DISTRIBUTION].Hide();
     } else {
@@ -1827,23 +2499,26 @@ void Settings::UpdateOptionProperties() {
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Shuffle100GSReward"), RO_GENERIC_OFF)) {
         mOptions[RSK_KAK_100_SKULLS_HINT].Enable();
     } else {
-        mOptions[RSK_KAK_100_SKULLS_HINT].Disable("There is no point to hinting 100 skulls if it is not shuffled");
+        mOptions[RSK_KAK_100_SKULLS_HINT].Disable("There is no point to hinting 100 skulls if it is not shuffled.");
     }
 
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("Fishsanity"), RO_FISHSANITY_OFF) == RO_FISHSANITY_HYRULE_LOACH) {
         mOptions[RSK_LOACH_HINT].Enable();
     } else {
-        mOptions[RSK_LOACH_HINT].Disable("Loach hint is only avaliable with \"Fishsanity\" set to \"Shuffle only Hyrule Loach\"\nas that's the only setting where you present the loach to the fishing pond owner");
+        mOptions[RSK_LOACH_HINT].Disable(
+            "Loach hint is only avaliable with \"Fishsanity\" set to \"Shuffle only Hyrule Loach\"\nas that's the only "
+            "setting where you present the loach to the fishing pond owner.");
     }
 
     if (CVarGetInteger(CVAR_RANDOMIZER_SETTING("CuccosToReturn"), 7) == 0) {
-        mOptions[RSK_CHICKENS_HINT].Disable("Anju will just give you the item instead with 0 chickens");
+        mOptions[RSK_CHICKENS_HINT].Disable("Anju will just give you the item instead with 0 chickens.");
     } else {
         mOptions[RSK_CHICKENS_HINT].Enable();
     }
 }
 
-void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations, const std::set<RandomizerTrick>& enabledTricks) {
+void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocations,
+                               const std::set<RandomizerTrick>& enabledTricks) {
     // if we skip child zelda, we start with zelda's letter, and malon starts
     // at the ranch, so we should *not* shuffle the weird egg
     if (mOptions[RSK_SKIP_CHILD_ZELDA]) {
@@ -1851,15 +2526,11 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     }
 
     // With certain access settings, the seed is only beatable if Starting Age is set to Child.
-    if (mOptions[RSK_FOREST].Is(RO_CLOSED_FOREST_ON) || (mOptions[RSK_DOOR_OF_TIME].Is(RO_DOOROFTIME_CLOSED) &&
-        !mOptions[RSK_SHUFFLE_OCARINA])) {
+    if (mOptions[RSK_FOREST].Is(RO_CLOSED_FOREST_ON) ||
+        (mOptions[RSK_DOOR_OF_TIME].Is(RO_DOOROFTIME_CLOSED) && !mOptions[RSK_SHUFFLE_OCARINA])) {
         mOptions[RSK_STARTING_AGE].Set(RO_AGE_CHILD);
     }
 
-    if (mOptions[RSK_TRIFORCE_HUNT]) {
-        mOptions[RSK_GANONS_BOSS_KEY].Set(RO_GANON_BOSS_KEY_TRIFORCE_HUNT);
-    }
-
     // Force 100 GS Shuffle if that's where Ganon's Boss Key is
     if (mOptions[RSK_GANONS_BOSS_KEY].Is(RO_GANON_BOSS_KEY_KAK_TOKENS)) {
         mOptions[RSK_SHUFFLE_100_GS_REWARD].Set(1);
@@ -1883,12 +2554,12 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     }
 
     // If any of the individual shuffle settings are on, turn on the main Shuffle Entrances option
-    if (mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES].IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF)
-        || mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].IsNot(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF)
-        || mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES]
-        || mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF)
-        || mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] || mOptions[RSK_SHUFFLE_OWL_DROPS]
-        || mOptions[RSK_SHUFFLE_WARP_SONGS] || mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]) {
+    if (mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES].IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) ||
+        mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].IsNot(RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) ||
+        mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] ||
+        mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].IsNot(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF) ||
+        mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES] || mOptions[RSK_SHUFFLE_OWL_DROPS] || mOptions[RSK_SHUFFLE_WARP_SONGS] ||
+        mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]) {
         mOptions[RSK_SHUFFLE_ENTRANCES].Set(RO_GENERIC_ON);
     } else {
         mOptions[RSK_SHUFFLE_ENTRANCES].Set(RO_GENERIC_OFF);
@@ -1899,7 +2570,8 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     }
 
     for (const auto locationKey : this->everyPossibleLocation) {
-        if (const auto location = this->GetItemLocation(locationKey); excludedLocations.contains(location->GetRandomizerCheck())) {
+        if (const auto location = this->GetItemLocation(locationKey);
+            excludedLocations.contains(location->GetRandomizerCheck())) {
             location->SetExcludedOption(1);
         } else {
             location->SetExcludedOption(0);
@@ -1928,7 +2600,6 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
             }
         }
     }
-    
 
     if (mOptions[RSK_SHUFFLE_DEKU_STICK_BAG]) {
         mOptions[RSK_STARTING_STICKS].Set(false);
@@ -1940,30 +2611,30 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     // RANDOTODO implement chest shuffle with keysanity
     // ShuffleChestMinigame.Set(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME].Set(RO_CHEST_GAME_OFF);
-    
-    //TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
+
+    // TODO: RandomizeAllSettings(true) when implementing the ability to randomize the options themselves.
     std::array<DungeonInfo*, 12> dungeons = this->GetDungeons()->GetDungeonList();
 
-    //reset the MQ vars
-    for (auto dungeon: dungeons) {
+    // reset the MQ vars
+    for (auto dungeon : dungeons) {
         dungeon->ClearMQ();
         dungeon->SetDungeonKnown(true);
     }
-    //if it's selection mode, process the selection directly
+    // if it's selection mode, process the selection directly
     if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SELECTION)) {
         mOptions[RSK_MQ_DUNGEON_SET].Set(RO_GENERIC_ON);
-        //How many dungeons are set to MQ in selection
+        // How many dungeons are set to MQ in selection
         uint8_t mqSet = 0;
-        for (auto dungeon: dungeons) {
+        for (auto dungeon : dungeons) {
             switch (mOptions[dungeon->GetMQSetting()].Get()) {
                 case RO_MQ_SET_MQ:
                     dungeon->SetMQ();
                     mqSet += 1;
                     break;
                 case RO_MQ_SET_RANDOM:
-                    //50% per dungeon, rolled seperatly so people can either have a linear distribtuion
-                    //or a bell curve for the number of MQ dungeons per seed.
-                    if (Random(0,2)){
+                    // 50% per dungeon, rolled seperatly so people can either have a linear distribtuion
+                    // or a bell curve for the number of MQ dungeons per seed.
+                    if (Random(0, 2)) {
                         dungeon->SetMQ();
                         mqSet += 1;
                     }
@@ -1973,87 +2644,87 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
                     break;
             }
         }
-        //override the dungeons set with the ones set by selection, so it's accurate for anything that wants to know MQ dungeon count
+        // override the dungeons set with the ones set by selection, so it's accurate for anything that wants to know MQ
+        // dungeon count
         mOptions[RSK_MQ_DUNGEON_COUNT].Set(mqSet);
-    //handling set number and random number together
-    } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].IsNot(RO_MQ_DUNGEONS_NONE)){
+        // handling set number and random number together
+    } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].IsNot(RO_MQ_DUNGEONS_NONE)) {
         // so we don't have to call this repeatedly
         uint8_t mqCount = mOptions[RSK_MQ_DUNGEON_COUNT].Get();
-        //How many dungeons are set to MQ in selection
+        // How many dungeons are set to MQ in selection
         uint8_t mqSet = 0;
-        //the number of random 
+        // the number of random
         uint8_t mqToSet = 0;
-        //store the dungeons to randomly decide between. we use the id instead of a dungeon object to avoid a lot of casting.
+        // store the dungeons to randomly decide between. we use the id instead of a dungeon object to avoid a lot of
+        // casting.
         std::vector<uint8_t> randMQOption = {};
-        //if dungeons have been preset, process them
-        if (mOptions[RSK_MQ_DUNGEON_SET]){
+        // if dungeons have been preset, process them
+        if (mOptions[RSK_MQ_DUNGEON_SET]) {
             for (size_t i = 0; i < dungeons.size(); i++) {
                 switch (mOptions[dungeons[i]->GetMQSetting()].Get()) {
-                case RO_MQ_SET_MQ:
-                    dungeons[i]->SetMQ();
-                    mqSet += 1;
-                    break;
-                case RO_MQ_SET_RANDOM:
-                    randMQOption.push_back(i);
-                    dungeons[i]->SetDungeonKnown(false);
-                    break;
-                default:
-                    break;
+                    case RO_MQ_SET_MQ:
+                        dungeons[i]->SetMQ();
+                        mqSet += 1;
+                        break;
+                    case RO_MQ_SET_RANDOM:
+                        randMQOption.push_back(static_cast<uint8_t>(i));
+                        dungeons[i]->SetDungeonKnown(false);
+                        break;
+                    default:
+                        break;
                 }
             }
-        //otherwise, every dungeon is possible
+            // otherwise, every dungeon is possible
         } else {
-            //if the count is fixed to 12, we know everything is MQ, so can skip some setps and do not set Known
-            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SET_NUMBER) &&
-                mqCount == 12) {
-                randMQOption = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
-                for (auto dungeon: dungeons) {
+            // if the count is fixed to 12, we know everything is MQ, so can skip some setps and do not set Known
+            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SET_NUMBER) && mqCount == 12) {
+                randMQOption = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+                for (auto dungeon : dungeons) {
                     mOptions[dungeon->GetMQSetting()].Set(RO_MQ_SET_MQ);
                 }
-            //if it's fixed to zero, set it to None instead. the rest is processed after
-            } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SET_NUMBER) &&
-                       mqCount == 0){
+                // if it's fixed to zero, set it to None instead. the rest is processed after
+            } else if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_SET_NUMBER) && mqCount == 0) {
                 mOptions[RSK_MQ_DUNGEON_RANDOM].Set(RO_MQ_DUNGEONS_NONE);
-            //otherwise, make everything a possibility and unknown
+                // otherwise, make everything a possibility and unknown
             } else {
                 for (size_t i = 0; i < dungeons.size(); i++) {
-                    randMQOption.push_back(i);
+                    randMQOption.push_back(static_cast<uint8_t>(i));
                     dungeons[i]->SetDungeonKnown(false);
                     mOptions[dungeons[i]->GetMQSetting()].Set(RO_MQ_SET_RANDOM);
                 }
             }
         }
-        //if there's no random options, we can skip this
-        if (randMQOption.size() > 0){
-            //Figure out how many dungeons to select, rolling the random number if needed
-            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)){
+        // if there's no random options, we can skip this
+        if (randMQOption.size() > 0) {
+            // Figure out how many dungeons to select, rolling the random number if needed
+            if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_RANDOM_NUMBER)) {
                 mqToSet = Random(0, static_cast<int>(randMQOption.size()) + 1);
             } else if (mqCount > mqSet) {
                 mqToSet = std::min(mqCount - mqSet, static_cast<int>(randMQOption.size()));
             }
-            //we only need to shuffle if we're not using them all
+            // we only need to shuffle if we're not using them all
             if (mqToSet <= static_cast<int8_t>(randMQOption.size()) && mqToSet > 0) {
                 Shuffle(randMQOption);
-            } 
-            for (uint8_t i = 0; i < mqToSet; i++){
+            }
+            for (uint8_t i = 0; i < mqToSet; i++) {
                 dungeons[randMQOption[i]]->SetMQ();
             }
         } else {
-            //if there's no random options, check if we can collapse the setting into None or Selection
-            if (mqSet == 0){   
+            // if there's no random options, check if we can collapse the setting into None or Selection
+            if (mqSet == 0) {
                 mOptions[RSK_MQ_DUNGEON_RANDOM].Set(RO_MQ_DUNGEONS_NONE);
             } else {
                 mOptions[RSK_MQ_DUNGEON_RANDOM].Set(RO_MQ_DUNGEONS_SELECTION);
             }
         }
-        //reset the value set based on what was actually set
+        // reset the value set based on what was actually set
         mOptions[RSK_MQ_DUNGEON_COUNT].Set(mqToSet + mqSet);
-    } 
-    //Not an if else as other settings can become None in processing
+    }
+    // Not an if else as other settings can become None in processing
     if (mOptions[RSK_MQ_DUNGEON_RANDOM].Is(RO_MQ_DUNGEONS_NONE)) {
         mOptions[RSK_MQ_DUNGEON_SET].Set(RO_GENERIC_OFF);
         mOptions[RSK_MQ_DUNGEON_COUNT].Set(0);
-        for (auto dungeon: dungeons) {
+        for (auto dungeon : dungeons) {
             mOptions[dungeon->GetMQSetting()].Set(RO_MQ_SET_VANILLA);
         }
     }
@@ -2064,26 +2735,25 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     }
 
     const std::vector<OptionValue*> keyRingOptions = {
-        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE],
-        &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
-        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
-        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE],
-        &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
-        &mOptions[RSK_KEYRINGS_GTG],
-        &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
+        &mOptions[RSK_KEYRINGS_FOREST_TEMPLE], &mOptions[RSK_KEYRINGS_FIRE_TEMPLE],
+        &mOptions[RSK_KEYRINGS_WATER_TEMPLE],  &mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE],
+        &mOptions[RSK_KEYRINGS_SHADOW_TEMPLE], &mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL],
+        &mOptions[RSK_KEYRINGS_GTG],           &mOptions[RSK_KEYRINGS_GANONS_CASTLE],
     };
 
     if (mOptions[RSK_KEYRINGS]) {
         // Random Key Rings
         auto keyrings = keyRingOptions;
-        if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_CARPENTERS_NORMAL) && mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
+        if (mOptions[RSK_GERUDO_FORTRESS].Is(RO_GF_CARPENTERS_NORMAL) &&
+            mOptions[RSK_GERUDO_KEYS].IsNot(RO_GERUDO_KEYS_VANILLA)) {
             keyrings.push_back(&mOptions[RSK_KEYRINGS_GERUDO_FORTRESS]);
         } else {
             mOptions[RSK_KEYRINGS_GERUDO_FORTRESS].Set(RO_KEYRING_FOR_DUNGEON_OFF);
         }
         if (mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_RANDOM) || mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT)) {
-            const uint32_t keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT) ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Get() : Random(0, static_cast<int>(keyrings.size()));
+            const uint32_t keyRingCount = mOptions[RSK_KEYRINGS].Is(RO_KEYRINGS_COUNT)
+                                              ? mOptions[RSK_KEYRINGS_RANDOM_COUNT].Get()
+                                              : Random(0, static_cast<int>(keyrings.size()));
             Shuffle(keyrings);
             for (size_t i = 0; i < keyRingCount; i++) {
                 keyrings[i]->Set(RO_KEYRING_FOR_DUNGEON_ON);
@@ -2092,28 +2762,36 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
                 keyrings[i]->Set(RO_KEYRING_FOR_DUNGEON_OFF);
             }
         }
-        if (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_BOTTOM_OF_THE_WELL].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(BOTTOM_OF_THE_WELL)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_FOREST_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(FOREST_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_FIRE_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(FIRE_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_WATER_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(WATER_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_SPIRIT_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(SPIRIT_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_SHADOW_TEMPLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(SHADOW_TEMPLE)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_GTG].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(GERUDO_TRAINING_GROUND)->SetKeyRing();
         }
-        if (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_ON) || (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
+        if (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_ON) ||
+            (mOptions[RSK_KEYRINGS_GANONS_CASTLE].Is(RO_KEYRING_FOR_DUNGEON_RANDOM) && Random(0, 2) == 1)) {
             this->GetDungeon(GANONS_CASTLE)->SetKeyRing();
         }
     }
@@ -2123,15 +2801,46 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     for (const auto trial : trials) {
         trial->SetAsSkipped();
     }
-    if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_SKIP)){
+    if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_SKIP)) {
         mOptions[RSK_TRIAL_COUNT].Set(0);
-    } else if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
-        mOptions[RSK_TRIAL_COUNT].Set(Random(0, static_cast<int>(Rando::Settings::GetInstance()->GetOption(RSK_TRIAL_COUNT).GetOptionCount())));
+    } else if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) {
+        mOptions[RSK_TRIAL_COUNT].Set(
+            Random(0, static_cast<int>(Rando::Settings::GetInstance()->GetOption(RSK_TRIAL_COUNT).GetOptionCount())));
     }
     for (uint8_t i = 0; i < mOptions[RSK_TRIAL_COUNT].Get(); i++) {
         trials[i]->SetAsRequired();
     }
 
+    bool dungeonShuffle = !mOptions[RSK_SHUFFLE_DUNGEON_ENTRANCES].Is(RO_GENERIC_OFF);
+    bool bossShuffle = !mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].Is(RO_GENERIC_OFF);
+    bool overworldShuffle = !mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES].Is(RO_GENERIC_OFF);
+    bool interiorShuffle = !mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].Is(RO_INTERIOR_ENTRANCE_SHUFFLE_OFF);
+    bool grottoShuffle = !mOptions[RSK_SHUFFLE_GROTTO_ENTRANCES].Is(RO_GENERIC_OFF);
+
+    if (dungeonShuffle + bossShuffle + overworldShuffle + interiorShuffle + grottoShuffle <= 1) {
+        mOptions[RSK_MIXED_ENTRANCE_POOLS].Set(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_MIXED_ENTRANCE_POOLS] || !dungeonShuffle) {
+        mOptions[RSK_MIX_DUNGEON_ENTRANCES].Set(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_MIXED_ENTRANCE_POOLS] || !bossShuffle) {
+        mOptions[RSK_MIX_BOSS_ENTRANCES].Set(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_MIXED_ENTRANCE_POOLS] || !overworldShuffle) {
+        mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Set(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_MIXED_ENTRANCE_POOLS] || !interiorShuffle) {
+        mOptions[RSK_MIX_INTERIOR_ENTRANCES].Set(RO_GENERIC_OFF);
+    }
+
+    if (!mOptions[RSK_MIXED_ENTRANCE_POOLS] || !grottoShuffle) {
+        mOptions[RSK_MIX_GROTTO_ENTRANCES].Set(RO_GENERIC_OFF);
+    }
+
     if (mOptions[RSK_FOREST].Is(RO_CLOSED_FOREST_ON) &&
         (mOptions[RSK_SHUFFLE_INTERIOR_ENTRANCES].Is(RO_INTERIOR_ENTRANCE_SHUFFLE_ALL) ||
          mOptions[RSK_SHUFFLE_OVERWORLD_ENTRANCES] || mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] ||
@@ -2167,10 +2876,10 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
 
     if (mOptions[RSK_LOGIC_RULES].Is(RO_LOGIC_VANILLA)) {
         for (OptionValue* setting : VanillaLogicDefaults) {
-            //setting->SetDelayedOption();
+            // setting->SetDelayedOption();
             setting->Set(0);
         }
-        //mOptions[RSK_KEYSANITY].SetDelayedOption();
+        // mOptions[RSK_KEYSANITY].SetDelayedOption();
         mOptions[RSK_KEYSANITY].Set(3);
     }
 
@@ -2193,18 +2902,15 @@ void Context::FinalizeSettings(const std::set<RandomizerCheck>& excludedLocation
     if (mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) {
         mOptions[RSK_LOACH_HINT].Set(RO_GENERIC_OFF);
     }
-
-    if (mOptions[RSK_CUCCO_COUNT].Is(0)) {
-        mOptions[RSK_CHICKENS_HINT].Set(RO_GENERIC_OFF);
-    }
 }
+
 void Settings::ParseJson(nlohmann::json spoilerFileJson) {
     mContext->SetSeedString(spoilerFileJson["seed"].get<std::string>());
     mContext->SetSeed(spoilerFileJson["finalSeed"].get<uint32_t>());
     nlohmann::json settingsJson = spoilerFileJson["settings"];
     for (auto it = settingsJson.begin(); it != settingsJson.end(); ++it) {
         // todo load into cvars for UI
-        //RANDOTODO handle numeric value to options conversion better than brute froce
+        // RANDOTODO handle numeric value to options conversion better than brute froce
         if (StaticData::optionNameToEnum.contains(it.key())) {
             const RandomizerSettingKey index = StaticData::optionNameToEnum[it.key()];
             mContext->GetOption(index).Set(mOptions[index].GetValueFromText(it.value()));
@@ -2226,11 +2932,6 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
     }
 }
 
-void Settings::ReloadOptions() {
-    for (int i = 0; i < RSK_MAX; i++) {
-        mOptions[i].SetFromCVar();
-    }
-}
 void Settings::AssignContext(std::shared_ptr<Context> ctx) {
     mContext = ctx;
 }
@@ -2241,13 +2942,14 @@ void Settings::ClearContext() {
 
 void Settings::SetAllToContext() {
     for (int i = 0; i < RSK_MAX; i++) {
-        mContext->GetOption(static_cast<RandomizerSettingKey>(i)).Set(mOptions[i].GetMenuOptionIndex());
+        mContext->GetOption(static_cast<RandomizerSettingKey>(i)).Set(mOptions[i].GetOptionIndex());
     }
     for (int i = 0; i < RT_MAX; i++) {
-        mContext->GetTrickOption(static_cast<RandomizerTrick>(i)).Set(mTrickOptions[i].GetMenuOptionIndex());
+        mContext->GetTrickOption(static_cast<RandomizerTrick>(i)).Set(mTrickOptions[i].GetOptionIndex());
     }
     for (int i = 0; i < RC_MAX; i++) {
-        mContext->GetItemLocation(i)->SetExcludedOption(StaticData::GetLocation(static_cast<RandomizerCheck>(i))->GetExcludedOption()->GetMenuOptionIndex());
+        mContext->GetItemLocation(i)->SetExcludedOption(
+            StaticData::GetLocation(static_cast<RandomizerCheck>(i))->GetExcludedOption()->GetOptionIndex());
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index 6810b68320..ed214471a5 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -50,6 +50,14 @@ class Settings {
      */
     TrickOption& GetTrickOption(RandomizerTrick key);
 
+    /**
+     * @brief Get the RandomizerTrick corresponding to the provided name.
+     *
+     * @param name
+     * @return int RandomizerTrick index or -1 if not found
+     */
+    int GetRandomizerTrickByName(const std::string& name);
+
     /**
      * @brief Returns a reference to the entire array of options.
      *
@@ -88,12 +96,6 @@ class Settings {
      */
     const OptionGroup& GetOptionGroup(RandomizerSettingGroupKey key);
 
-    /**
-     * @brief sets the `selectedOption` of all Options to the value of the CVar
-     * corresponding to their `cvarName`s.
-    */
-    void SetAllFromCVar();
-
     /**
      * @brief Updates various properties of options based on the value of other options.
      * Used to update visibility, whether or not interaction is disabled, and what the
@@ -103,7 +105,7 @@ class Settings {
      * For example, this function handles setting the maximum possible keyring count to 9
      * when Gerudo's Fortress options are set such that a keyring is possible for that
      * dungeon.
-    */
+     */
     void UpdateOptionProperties();
 
     /**
@@ -113,13 +115,12 @@ class Settings {
      */
     void ParseJson(nlohmann::json spoilerFileJson);
     std::map<RandomizerArea, std::vector<RandomizerTrick>> mTricksByArea = {};
-    void ReloadOptions();
 
     /**
      * @brief Assigns a Rando::Context instance to this settings instance
      * with which to later instantiate and access OptionValues.
-     * 
-     * @param ctx 
+     *
+     * @param ctx
      */
     void AssignContext(std::shared_ptr<Context> ctx);
     void ClearContext();
@@ -128,7 +129,7 @@ class Settings {
      * @brief Sets all the currently selected MenuIndexes to the currently assigned Rando::Context.
      */
     void SetAllToContext();
-    
+
     static std::shared_ptr<Settings> GetInstance();
 
   private:
diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp
index 84da0d3c15..448b33819c 100644
--- a/soh/soh/Enhancements/randomizer/static_data.cpp
+++ b/soh/soh/Enhancements/randomizer/static_data.cpp
@@ -5,188 +5,187 @@
 namespace Rando {
 
 std::unordered_map<uint32_t, CustomMessage> StaticData::hintTypeNames = {
-    {HINT_TYPE_HINT_KEY, CustomMessage("Message")},
-    {HINT_TYPE_AREA, CustomMessage("Area")},
-    {HINT_TYPE_ITEM, CustomMessage("Item")},
-    {HINT_TYPE_TRIAL, CustomMessage("Trial")},
-    {HINT_TYPE_ENTRANCE, CustomMessage("Entrance")},
-    {HINT_TYPE_ITEM_AREA, CustomMessage("Item Area")},
-    {HINT_TYPE_ALTAR_CHILD, CustomMessage("Child Altar")},
-    {HINT_TYPE_ALTAR_ADULT, CustomMessage("Adult Altar")},
-    {HINT_TYPE_WOTH, CustomMessage("Way of the Hero")},
-    {HINT_TYPE_FOOLISH, CustomMessage("Foolish")},
-    {HINT_TYPE_MESSAGE, CustomMessage("Hardcoded Message")}
+    { HINT_TYPE_HINT_KEY, CustomMessage("Message") },
+    { HINT_TYPE_AREA, CustomMessage("Area") },
+    { HINT_TYPE_ITEM, CustomMessage("Item") },
+    { HINT_TYPE_TRIAL, CustomMessage("Trial") },
+    { HINT_TYPE_ENTRANCE, CustomMessage("Entrance") },
+    { HINT_TYPE_ITEM_AREA, CustomMessage("Item Area") },
+    { HINT_TYPE_ALTAR_CHILD, CustomMessage("Child Altar") },
+    { HINT_TYPE_ALTAR_ADULT, CustomMessage("Adult Altar") },
+    { HINT_TYPE_WOTH, CustomMessage("Way of the Hero") },
+    { HINT_TYPE_FOOLISH, CustomMessage("Foolish") },
+    { HINT_TYPE_MESSAGE, CustomMessage("Hardcoded Message") }
 };
 
-//RANDOTODO When dynamic grotto check names are done, apply it to these hints
-//RANDOTODO Translations
+// RANDOTODO When dynamic grotto check names are done, apply it to these hints
+// RANDOTODO Translations
 std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
-    {RH_NONE, CustomMessage("ERROR HINT")},
-    {RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE, CustomMessage("KF Left Near Deku Gossip Stone")}, //RANDOTODO find cardinal direction
-    {RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, CustomMessage("KF Right Near Deku Gossip Stone")},
-    {RH_KF_GOSSIP_STONE, CustomMessage("KF Gossip Stone")},
-    {RH_KF_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("KF Storms Grotto Gossip Stone")},
-    {RH_LW_GOSSIP_STONE, CustomMessage("LW Gossip Stone")},
-    {RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, CustomMessage("LW Near Shortcuts Grotto Gossip Stone")},
-    {RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE, CustomMessage("SFM Near LW Gossip Stone")},
-    {RH_SFM_MAZE_CENTER_GOSSIP_STONE, CustomMessage("SFM Center Gossip Stone")},
-    {RH_SFM_SARIA_GOSSIP_STONE, CustomMessage("SFM Near Saria Gossip Stone")},
-    {RH_HF_COW_GROTTO_GOSSIP_STONE, CustomMessage("HF Cow Grotto Gossip Stone")},
-    {RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE, CustomMessage("HF Near Market Grotto Gossip Stone")},
-    {RH_HF_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("HF Open Grotto Gossip Stone")},
-    {RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE, CustomMessage("HF Southeast Grotto Gossip Stone")},
-    {RH_TOT_LEFT_CENTER_GOSSIP_STONE, CustomMessage("Market Left Center Gossip Stone")},
-    {RH_TOT_LEFTMOST_GOSSIP_STONE, CustomMessage("Market Leftmost Center Gossip Stone")},
-    {RH_TOT_RIGHT_CENTER_GOSSIP_STONE, CustomMessage("Market Right Center Gossip Stone")},
-    {RH_TOT_RIGHTMOST_GOSSIP_STONE, CustomMessage("Market Rightmost Gossip Stone")},
-    {RH_HC_MALON_GOSSIP_STONE, CustomMessage("HC Near Malon Gossip Stone")},
-    {RH_HC_ROCK_WALL_GOSSIP_STONE, CustomMessage("HC Rock Wall Gossip Stone")},
-    {RH_HC_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("HC Storm Grotto Gossip Stone")},
-    {RH_KAK_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("Kak Open Grotto Gossip Stone")},
-    {RH_GRAVEYARD_GOSSIP_STONE, CustomMessage("Graveyard Gossip Stone")},
-    {RH_DMT_GOSSIP_STONE, CustomMessage("DMT Gossip Stone")},
-    {RH_DMT_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("DMT Storms Grotto Gossip Stone")},
-    {RH_GC_MAZE_GOSSIP_STONE, CustomMessage("GC Maze Gossip Stone")},
-    {RH_GC_MEDIGORON_GOSSIP_STONE, CustomMessage("GC Medigoron Gossip Stone")},
-    {RH_DMC_GOSSIP_STONE, CustomMessage("DMC Gossip Stone")},
-    {RH_DMC_UPPER_GROTTO_GOSSIP_STONE, CustomMessage("DMC Upper Grotto Gossip Stone")},
-    {RH_ZR_NEAR_DOMAIN_GOSSIP_STONE, CustomMessage("ZR Near Domain Gossip Stone")},
-    {RH_ZR_NEAR_GROTTOS_GOSSIP_STONE, CustomMessage("ZR Near Grottos Gossip Stone")},
-    {RH_ZR_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("ZR Open Grotto Gossip Stone")},
-    {RH_ZD_GOSSIP_STONE, CustomMessage("ZD Gossip Stone")},
-    {RH_ZF_JABU_GOSSIP_STONE, CustomMessage("ZF Near Jabu Gossip Stone")},
-    {RH_ZF_FAIRY_GOSSIP_STONE, CustomMessage("ZF Near Fairy Gossip Stone")},
-    {RH_LH_LAB_GOSSIP_STONE, CustomMessage("LH Near Lab Gossip Stone")},
-    {RH_LH_SOUTHEAST_GOSSIP_STONE, CustomMessage("LH Southeast Gossip Stone")},
-    {RH_LH_SOUTHWEST_GOSSIP_STONE, CustomMessage("LH Southwest Gossip Stone")},
-    {RH_GV_GOSSIP_STONE, CustomMessage("Gerudo Valley Gossip Stone")},
-    {RH_COLOSSUS_GOSSIP_STONE, CustomMessage("Desert Colossus Gossip Stone")},
-    {RH_DODONGOS_CAVERN_GOSSIP_STONE, CustomMessage("Dodongo's Cavern Gossip Stone")},
-    {RH_GANONDORF_HINT, CustomMessage("Ganondorf Hint")},
-    {RH_GANONDORF_JOKE, CustomMessage("Ganondorf Joke")},
-    {RH_SHEIK_HINT, CustomMessage("Sheik in Ganons Castle Hint")},
-    {RH_DAMPES_DIARY, CustomMessage("Dampe's Diary Hint")},
-    {RH_GREG_RUPEE, CustomMessage("Treasure Chest Game Greg Hint")},
-    {RH_ALTAR_CHILD, CustomMessage("ToT Altar as Child")},
-    {RH_ALTAR_ADULT, CustomMessage("ToT Altar as Adult")},
-    {RH_SARIA_HINT, CustomMessage("Saria's Magic Hint")},
-    {RH_LOACH_HINT, CustomMessage("Loach Hint")},
-    {RH_FISHING_POLE, CustomMessage("Fishing Pole Hint")},
-    {RH_MINUET_WARP_LOC, CustomMessage("Minuet of Forest Destination")},
-    {RH_BOLERO_WARP_LOC, CustomMessage("Bolero of Fire Destination")},
-    {RH_SERENADE_WARP_LOC, CustomMessage("Serenade of Water Destination")},
-    {RH_REQUIEM_WARP_LOC, CustomMessage("Requiem of Spirit Destination")},
-    {RH_NOCTURNE_WARP_LOC, CustomMessage("Nocturne of Shadow Destination")},
-    {RH_PRELUDE_WARP_LOC, CustomMessage("Prelude of Light Destination")},
-    {RH_HBA_HINT, CustomMessage("Horseback Archery Hint")},
-    {RH_MALON_HINT, CustomMessage("Malon Hint")},
-    {RH_CHICKENS_HINT, CustomMessage("Anju's Child Chickens Hint")},
-    {RH_BIG_POES_HINT, CustomMessage("Big Poe Reward Hint")},
-    {RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint")},
-    {RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint")},
-    {RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint")},
-    {RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint")},
-    {RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint")},
-    {RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint")},
-    {RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint")},
-    {RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint")},
-    {RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint")},
-    {RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint")},
+    { RH_NONE, CustomMessage("ERROR HINT") },
+    { RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE,
+      CustomMessage("KF Left Near Deku Gossip Stone") }, // RANDOTODO find cardinal direction
+    { RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, CustomMessage("KF Right Near Deku Gossip Stone") },
+    { RH_KF_GOSSIP_STONE, CustomMessage("KF Gossip Stone") },
+    { RH_KF_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("KF Storms Grotto Gossip Stone") },
+    { RH_LW_GOSSIP_STONE, CustomMessage("LW Gossip Stone") },
+    { RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, CustomMessage("LW Near Shortcuts Grotto Gossip Stone") },
+    { RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE, CustomMessage("SFM Near LW Gossip Stone") },
+    { RH_SFM_MAZE_CENTER_GOSSIP_STONE, CustomMessage("SFM Center Gossip Stone") },
+    { RH_SFM_SARIA_GOSSIP_STONE, CustomMessage("SFM Near Saria Gossip Stone") },
+    { RH_HF_COW_GROTTO_GOSSIP_STONE, CustomMessage("HF Cow Grotto Gossip Stone") },
+    { RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE, CustomMessage("HF Near Market Grotto Gossip Stone") },
+    { RH_HF_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("HF Open Grotto Gossip Stone") },
+    { RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE, CustomMessage("HF Southeast Grotto Gossip Stone") },
+    { RH_TOT_LEFT_CENTER_GOSSIP_STONE, CustomMessage("Market Left Center Gossip Stone") },
+    { RH_TOT_LEFTMOST_GOSSIP_STONE, CustomMessage("Market Leftmost Center Gossip Stone") },
+    { RH_TOT_RIGHT_CENTER_GOSSIP_STONE, CustomMessage("Market Right Center Gossip Stone") },
+    { RH_TOT_RIGHTMOST_GOSSIP_STONE, CustomMessage("Market Rightmost Gossip Stone") },
+    { RH_HC_MALON_GOSSIP_STONE, CustomMessage("HC Near Malon Gossip Stone") },
+    { RH_HC_ROCK_WALL_GOSSIP_STONE, CustomMessage("HC Rock Wall Gossip Stone") },
+    { RH_HC_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("HC Storm Grotto Gossip Stone") },
+    { RH_KAK_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("Kak Open Grotto Gossip Stone") },
+    { RH_GRAVEYARD_GOSSIP_STONE, CustomMessage("Graveyard Gossip Stone") },
+    { RH_DMT_GOSSIP_STONE, CustomMessage("DMT Gossip Stone") },
+    { RH_DMT_STORMS_GROTTO_GOSSIP_STONE, CustomMessage("DMT Storms Grotto Gossip Stone") },
+    { RH_GC_MAZE_GOSSIP_STONE, CustomMessage("GC Maze Gossip Stone") },
+    { RH_GC_MEDIGORON_GOSSIP_STONE, CustomMessage("GC Medigoron Gossip Stone") },
+    { RH_DMC_GOSSIP_STONE, CustomMessage("DMC Gossip Stone") },
+    { RH_DMC_UPPER_GROTTO_GOSSIP_STONE, CustomMessage("DMC Upper Grotto Gossip Stone") },
+    { RH_ZR_NEAR_DOMAIN_GOSSIP_STONE, CustomMessage("ZR Near Domain Gossip Stone") },
+    { RH_ZR_NEAR_GROTTOS_GOSSIP_STONE, CustomMessage("ZR Near Grottos Gossip Stone") },
+    { RH_ZR_OPEN_GROTTO_GOSSIP_STONE, CustomMessage("ZR Open Grotto Gossip Stone") },
+    { RH_ZD_GOSSIP_STONE, CustomMessage("ZD Gossip Stone") },
+    { RH_ZF_JABU_GOSSIP_STONE, CustomMessage("ZF Near Jabu Gossip Stone") },
+    { RH_ZF_FAIRY_GOSSIP_STONE, CustomMessage("ZF Near Fairy Gossip Stone") },
+    { RH_LH_LAB_GOSSIP_STONE, CustomMessage("LH Near Lab Gossip Stone") },
+    { RH_LH_SOUTHEAST_GOSSIP_STONE, CustomMessage("LH Southeast Gossip Stone") },
+    { RH_LH_SOUTHWEST_GOSSIP_STONE, CustomMessage("LH Southwest Gossip Stone") },
+    { RH_GV_GOSSIP_STONE, CustomMessage("Gerudo Valley Gossip Stone") },
+    { RH_COLOSSUS_GOSSIP_STONE, CustomMessage("Desert Colossus Gossip Stone") },
+    { RH_DODONGOS_CAVERN_GOSSIP_STONE, CustomMessage("Dodongo's Cavern Gossip Stone") },
+    { RH_GANONDORF_HINT, CustomMessage("Ganondorf Hint") },
+    { RH_GANONDORF_JOKE, CustomMessage("Ganondorf Joke") },
+    { RH_SHEIK_HINT, CustomMessage("Sheik in Ganons Castle Hint") },
+    { RH_DAMPES_DIARY, CustomMessage("Dampe's Diary Hint") },
+    { RH_GREG_RUPEE, CustomMessage("Treasure Chest Game Greg Hint") },
+    { RH_ALTAR_CHILD, CustomMessage("ToT Altar as Child") },
+    { RH_ALTAR_ADULT, CustomMessage("ToT Altar as Adult") },
+    { RH_SARIA_HINT, CustomMessage("Saria's Magic Hint") },
+    { RH_LOACH_HINT, CustomMessage("Loach Hint") },
+    { RH_FISHING_POLE, CustomMessage("Fishing Pole Hint") },
+    { RH_MINUET_WARP_LOC, CustomMessage("Minuet of Forest Destination") },
+    { RH_BOLERO_WARP_LOC, CustomMessage("Bolero of Fire Destination") },
+    { RH_SERENADE_WARP_LOC, CustomMessage("Serenade of Water Destination") },
+    { RH_REQUIEM_WARP_LOC, CustomMessage("Requiem of Spirit Destination") },
+    { RH_NOCTURNE_WARP_LOC, CustomMessage("Nocturne of Shadow Destination") },
+    { RH_PRELUDE_WARP_LOC, CustomMessage("Prelude of Light Destination") },
+    { RH_HBA_HINT, CustomMessage("Horseback Archery Hint") },
+    { RH_MALON_HINT, CustomMessage("Malon Hint") },
+    { RH_CHICKENS_HINT, CustomMessage("Anju's Child Chickens Hint") },
+    { RH_BIG_POES_HINT, CustomMessage("Big Poe Reward Hint") },
+    { RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint") },
+    { RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint") },
+    { RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint") },
+    { RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint") },
+    { RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint") },
+    { RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint") },
+    { RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint") },
+    { RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint") },
+    { RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint") },
+    { RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint") },
 };
 
-std::unordered_map<RandomizerCheck, RandomizerHint> StaticData::gossipStoneCheckToHint {
-  {RC_COLOSSUS_GOSSIP_STONE,                 RH_COLOSSUS_GOSSIP_STONE},
-  {RC_DMC_GOSSIP_STONE,                      RH_DMC_GOSSIP_STONE},
-  {RC_DMC_UPPER_GROTTO_GOSSIP_STONE,         RH_DMC_UPPER_GROTTO_GOSSIP_STONE},
-  {RC_DMT_GOSSIP_STONE,                      RH_DMT_GOSSIP_STONE},
-  {RC_DMT_STORMS_GROTTO_GOSSIP_STONE,        RH_DMT_STORMS_GROTTO_GOSSIP_STONE},
-  {RC_DODONGOS_CAVERN_GOSSIP_STONE,          RH_DODONGOS_CAVERN_GOSSIP_STONE},
-  {RC_ZF_FAIRY_GOSSIP_STONE,                 RH_ZF_FAIRY_GOSSIP_STONE},
-  {RC_GC_MAZE_GOSSIP_STONE,                  RH_GC_MAZE_GOSSIP_STONE},
-  {RC_GC_MEDIGORON_GOSSIP_STONE,             RH_GC_MEDIGORON_GOSSIP_STONE},
-  {RC_GV_GOSSIP_STONE,                       RH_GV_GOSSIP_STONE},
-  {RC_GRAVEYARD_GOSSIP_STONE,                RH_GRAVEYARD_GOSSIP_STONE},
-  {RC_HC_MALON_GOSSIP_STONE,                 RH_HC_MALON_GOSSIP_STONE},
-  {RC_HC_ROCK_WALL_GOSSIP_STONE,             RH_HC_ROCK_WALL_GOSSIP_STONE},
-  {RC_HC_STORMS_GROTTO_GOSSIP_STONE,         RH_HC_STORMS_GROTTO_GOSSIP_STONE},
-  {RC_HF_COW_GROTTO_GOSSIP_STONE,            RH_HF_COW_GROTTO_GOSSIP_STONE},
-  {RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE,    RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE},
-  {RC_HF_OPEN_GROTTO_GOSSIP_STONE,           RH_HF_OPEN_GROTTO_GOSSIP_STONE},
-  {RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE,      RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE},
-  {RC_ZF_JABU_GOSSIP_STONE,                  RH_ZF_JABU_GOSSIP_STONE},
-  {RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE,        RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE},
-  {RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE,       RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE},
-  {RC_KF_GOSSIP_STONE,                       RH_KF_GOSSIP_STONE},
-  {RC_KF_STORMS_GROTTO_GOSSIP_STONE,         RH_KF_STORMS_GROTTO_GOSSIP_STONE},
-  {RC_KAK_OPEN_GROTTO_GOSSIP_STONE,          RH_KAK_OPEN_GROTTO_GOSSIP_STONE},
-  {RC_LH_LAB_GOSSIP_STONE,                   RH_LH_LAB_GOSSIP_STONE},
-  {RC_LH_SOUTHEAST_GOSSIP_STONE,             RH_LH_SOUTHEAST_GOSSIP_STONE},
-  {RC_LH_SOUTHWEST_GOSSIP_STONE,             RH_LH_SOUTHWEST_GOSSIP_STONE},
-  {RC_LW_GOSSIP_STONE,                       RH_LW_GOSSIP_STONE},
-  {RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE},
-  {RC_SFM_MAZE_LOWER_GOSSIP_STONE,           RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE},
-  {RC_SFM_MAZE_UPPER_GOSSIP_STONE,           RH_SFM_MAZE_CENTER_GOSSIP_STONE},
-  {RC_SFM_SARIA_GOSSIP_STONE,                RH_SFM_SARIA_GOSSIP_STONE},
-  {RC_TOT_LEFT_CENTER_GOSSIP_STONE,          RH_TOT_LEFT_CENTER_GOSSIP_STONE},
-  {RC_TOT_LEFTMOST_GOSSIP_STONE,             RH_TOT_LEFTMOST_GOSSIP_STONE},
-  {RC_TOT_RIGHT_CENTER_GOSSIP_STONE,         RH_TOT_RIGHT_CENTER_GOSSIP_STONE},
-  {RC_TOT_RIGHTMOST_GOSSIP_STONE,            RH_TOT_RIGHTMOST_GOSSIP_STONE},
-  {RC_ZD_GOSSIP_STONE,                       RH_ZD_GOSSIP_STONE},
-  {RC_ZR_NEAR_DOMAIN_GOSSIP_STONE,           RH_ZR_NEAR_DOMAIN_GOSSIP_STONE},
-  {RC_ZR_NEAR_GROTTOS_GOSSIP_STONE,          RH_ZR_NEAR_GROTTOS_GOSSIP_STONE},
-  {RC_ZR_OPEN_GROTTO_GOSSIP_STONE,           RH_ZR_OPEN_GROTTO_GOSSIP_STONE}
+std::unordered_map<RandomizerCheck, RandomizerHint> StaticData::gossipStoneCheckToHint{
+    { RC_COLOSSUS_GOSSIP_STONE, RH_COLOSSUS_GOSSIP_STONE },
+    { RC_DMC_GOSSIP_STONE, RH_DMC_GOSSIP_STONE },
+    { RC_DMC_UPPER_GROTTO_GOSSIP_STONE, RH_DMC_UPPER_GROTTO_GOSSIP_STONE },
+    { RC_DMT_GOSSIP_STONE, RH_DMT_GOSSIP_STONE },
+    { RC_DMT_STORMS_GROTTO_GOSSIP_STONE, RH_DMT_STORMS_GROTTO_GOSSIP_STONE },
+    { RC_DODONGOS_CAVERN_GOSSIP_STONE, RH_DODONGOS_CAVERN_GOSSIP_STONE },
+    { RC_ZF_FAIRY_GOSSIP_STONE, RH_ZF_FAIRY_GOSSIP_STONE },
+    { RC_GC_MAZE_GOSSIP_STONE, RH_GC_MAZE_GOSSIP_STONE },
+    { RC_GC_MEDIGORON_GOSSIP_STONE, RH_GC_MEDIGORON_GOSSIP_STONE },
+    { RC_GV_GOSSIP_STONE, RH_GV_GOSSIP_STONE },
+    { RC_GRAVEYARD_GOSSIP_STONE, RH_GRAVEYARD_GOSSIP_STONE },
+    { RC_HC_MALON_GOSSIP_STONE, RH_HC_MALON_GOSSIP_STONE },
+    { RC_HC_ROCK_WALL_GOSSIP_STONE, RH_HC_ROCK_WALL_GOSSIP_STONE },
+    { RC_HC_STORMS_GROTTO_GOSSIP_STONE, RH_HC_STORMS_GROTTO_GOSSIP_STONE },
+    { RC_HF_COW_GROTTO_GOSSIP_STONE, RH_HF_COW_GROTTO_GOSSIP_STONE },
+    { RC_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE, RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE },
+    { RC_HF_OPEN_GROTTO_GOSSIP_STONE, RH_HF_OPEN_GROTTO_GOSSIP_STONE },
+    { RC_HF_SOUTHEAST_GROTTO_GOSSIP_STONE, RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE },
+    { RC_ZF_JABU_GOSSIP_STONE, RH_ZF_JABU_GOSSIP_STONE },
+    { RC_KF_DEKU_TREE_LEFT_GOSSIP_STONE, RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE },
+    { RC_KF_DEKU_TREE_RIGHT_GOSSIP_STONE, RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE },
+    { RC_KF_GOSSIP_STONE, RH_KF_GOSSIP_STONE },
+    { RC_KF_STORMS_GROTTO_GOSSIP_STONE, RH_KF_STORMS_GROTTO_GOSSIP_STONE },
+    { RC_KAK_OPEN_GROTTO_GOSSIP_STONE, RH_KAK_OPEN_GROTTO_GOSSIP_STONE },
+    { RC_LH_LAB_GOSSIP_STONE, RH_LH_LAB_GOSSIP_STONE },
+    { RC_LH_SOUTHEAST_GOSSIP_STONE, RH_LH_SOUTHEAST_GOSSIP_STONE },
+    { RC_LH_SOUTHWEST_GOSSIP_STONE, RH_LH_SOUTHWEST_GOSSIP_STONE },
+    { RC_LW_GOSSIP_STONE, RH_LW_GOSSIP_STONE },
+    { RC_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE },
+    { RC_SFM_MAZE_LOWER_GOSSIP_STONE, RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE },
+    { RC_SFM_MAZE_UPPER_GOSSIP_STONE, RH_SFM_MAZE_CENTER_GOSSIP_STONE },
+    { RC_SFM_SARIA_GOSSIP_STONE, RH_SFM_SARIA_GOSSIP_STONE },
+    { RC_TOT_LEFT_CENTER_GOSSIP_STONE, RH_TOT_LEFT_CENTER_GOSSIP_STONE },
+    { RC_TOT_LEFTMOST_GOSSIP_STONE, RH_TOT_LEFTMOST_GOSSIP_STONE },
+    { RC_TOT_RIGHT_CENTER_GOSSIP_STONE, RH_TOT_RIGHT_CENTER_GOSSIP_STONE },
+    { RC_TOT_RIGHTMOST_GOSSIP_STONE, RH_TOT_RIGHTMOST_GOSSIP_STONE },
+    { RC_ZD_GOSSIP_STONE, RH_ZD_GOSSIP_STONE },
+    { RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, RH_ZR_NEAR_DOMAIN_GOSSIP_STONE },
+    { RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, RH_ZR_NEAR_GROTTOS_GOSSIP_STONE },
+    { RC_ZR_OPEN_GROTTO_GOSSIP_STONE, RH_ZR_OPEN_GROTTO_GOSSIP_STONE }
 };
 
-std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::areaNames = { //RANDOTODO resolve None in area
-    {RA_NONE, RHT_ISOLATED_PLACE}, //explicit none in area hints means we're disconnected
-    {RA_LINKS_POCKET, RHT_LINKS_POCKET},
-    {RA_KOKIRI_FOREST, RHT_KOKIRI_FOREST},
-    {RA_THE_LOST_WOODS, RHT_THE_LOST_WOODS},
-    {RA_SACRED_FOREST_MEADOW, RHT_SACRED_FOREST_MEADOW},
-    {RA_HYRULE_FIELD, RHT_HYRULE_FIELD},
-    {RA_LAKE_HYLIA, RHT_LAKE_HYLIA},
-    {RA_GERUDO_VALLEY, RHT_GERUDO_VALLEY},
-    {RA_GERUDO_FORTRESS, RHT_GERUDO_FORTRESS},
-    {RA_HAUNTED_WASTELAND, RHT_HAUNTED_WASTELAND},
-    {RA_DESERT_COLOSSUS, RHT_DESERT_COLOSSUS},
-    {RA_THE_MARKET, RHT_THE_MARKET},
-    {RA_TEMPLE_OF_TIME, RHT_TEMPLE_OF_TIME},
-    {RA_HYRULE_CASTLE, RHT_HYRULE_CASTLE},
-    {RA_OUTSIDE_GANONS_CASTLE, RHT_OUTSIDE_GANONS_CASTLE},
-    {RA_CASTLE_GROUNDS, RHT_CASTLE_GROUNDS},
-    {RA_KAKARIKO_VILLAGE, RHT_KAKARIKO_VILLAGE},
-    {RA_THE_GRAVEYARD, RHT_THE_GRAVEYARD},
-    {RA_DEATH_MOUNTAIN_TRAIL, RHT_DEATH_MOUNTAIN_TRAIL},
-    {RA_GORON_CITY, RHT_GORON_CITY},
-    {RA_DEATH_MOUNTAIN_CRATER, RHT_DEATH_MOUNTAIN_CRATER},
-    {RA_ZORAS_RIVER, RHT_ZORAS_RIVER},
-    {RA_ZORAS_DOMAIN, RHT_ZORAS_DOMAIN},
-    {RA_ZORAS_FOUNTAIN, RHT_ZORAS_FOUNTAIN},
-    {RA_LON_LON_RANCH, RHT_LON_LON_RANCH},
-    {RA_DEKU_TREE, RHT_DEKU_TREE},
-    {RA_DODONGOS_CAVERN, RHT_DODONGOS_CAVERN},
-    {RA_JABU_JABUS_BELLY, RHT_JABU_JABUS_BELLY},
-    {RA_FOREST_TEMPLE, RHT_FOREST_TEMPLE},
-    {RA_FIRE_TEMPLE, RHT_FIRE_TEMPLE},
-    {RA_WATER_TEMPLE, RHT_WATER_TEMPLE},
-    {RA_SPIRIT_TEMPLE, RHT_SPIRIT_TEMPLE},
-    {RA_SHADOW_TEMPLE, RHT_SHADOW_TEMPLE},
-    {RA_BOTTOM_OF_THE_WELL, RHT_BOTTOM_OF_THE_WELL},
-    {RA_ICE_CAVERN, RHT_ICE_CAVERN},
-    {RA_GERUDO_TRAINING_GROUND, RHT_GERUDO_TRAINING_GROUND},
-    {RA_GANONS_CASTLE, RHT_GANONS_CASTLE}
+std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::areaNames = {
+    // RANDOTODO resolve None in area
+    { RA_NONE, RHT_ISOLATED_PLACE }, // explicit none in area hints means we're disconnected
+    { RA_LINKS_POCKET, RHT_LINKS_POCKET },
+    { RA_KOKIRI_FOREST, RHT_KOKIRI_FOREST },
+    { RA_THE_LOST_WOODS, RHT_THE_LOST_WOODS },
+    { RA_SACRED_FOREST_MEADOW, RHT_SACRED_FOREST_MEADOW },
+    { RA_HYRULE_FIELD, RHT_HYRULE_FIELD },
+    { RA_LAKE_HYLIA, RHT_LAKE_HYLIA },
+    { RA_GERUDO_VALLEY, RHT_GERUDO_VALLEY },
+    { RA_GERUDO_FORTRESS, RHT_GERUDO_FORTRESS },
+    { RA_HAUNTED_WASTELAND, RHT_HAUNTED_WASTELAND },
+    { RA_DESERT_COLOSSUS, RHT_DESERT_COLOSSUS },
+    { RA_THE_MARKET, RHT_THE_MARKET },
+    { RA_TEMPLE_OF_TIME, RHT_TEMPLE_OF_TIME },
+    { RA_HYRULE_CASTLE, RHT_HYRULE_CASTLE },
+    { RA_OUTSIDE_GANONS_CASTLE, RHT_OUTSIDE_GANONS_CASTLE },
+    { RA_CASTLE_GROUNDS, RHT_CASTLE_GROUNDS },
+    { RA_KAKARIKO_VILLAGE, RHT_KAKARIKO_VILLAGE },
+    { RA_THE_GRAVEYARD, RHT_THE_GRAVEYARD },
+    { RA_DEATH_MOUNTAIN_TRAIL, RHT_DEATH_MOUNTAIN_TRAIL },
+    { RA_GORON_CITY, RHT_GORON_CITY },
+    { RA_DEATH_MOUNTAIN_CRATER, RHT_DEATH_MOUNTAIN_CRATER },
+    { RA_ZORAS_RIVER, RHT_ZORAS_RIVER },
+    { RA_ZORAS_DOMAIN, RHT_ZORAS_DOMAIN },
+    { RA_ZORAS_FOUNTAIN, RHT_ZORAS_FOUNTAIN },
+    { RA_LON_LON_RANCH, RHT_LON_LON_RANCH },
+    { RA_DEKU_TREE, RHT_DEKU_TREE },
+    { RA_DODONGOS_CAVERN, RHT_DODONGOS_CAVERN },
+    { RA_JABU_JABUS_BELLY, RHT_JABU_JABUS_BELLY },
+    { RA_FOREST_TEMPLE, RHT_FOREST_TEMPLE },
+    { RA_FIRE_TEMPLE, RHT_FIRE_TEMPLE },
+    { RA_WATER_TEMPLE, RHT_WATER_TEMPLE },
+    { RA_SPIRIT_TEMPLE, RHT_SPIRIT_TEMPLE },
+    { RA_SHADOW_TEMPLE, RHT_SHADOW_TEMPLE },
+    { RA_BOTTOM_OF_THE_WELL, RHT_BOTTOM_OF_THE_WELL },
+    { RA_ICE_CAVERN, RHT_ICE_CAVERN },
+    { RA_GERUDO_TRAINING_GROUND, RHT_GERUDO_TRAINING_GROUND },
+    { RA_GANONS_CASTLE, RHT_GANONS_CASTLE },
 };
 
 std::unordered_map<uint32_t, RandomizerHintTextKey> StaticData::trialData = {
-    {TK_LIGHT_TRIAL, RHT_LIGHT_TRIAL}, 
-    {TK_FOREST_TRIAL, RHT_FOREST_TRIAL},
-    {TK_FIRE_TRIAL, RHT_FIRE_TRIAL},
-    {TK_WATER_TRIAL, RHT_WATER_TRIAL},
-    {TK_SHADOW_TRIAL, RHT_SHADOW_TRIAL},
-    {TK_SPIRIT_TRIAL, RHT_SPIRIT_TRIAL}
+    { TK_LIGHT_TRIAL, RHT_LIGHT_TRIAL }, { TK_FOREST_TRIAL, RHT_FOREST_TRIAL }, { TK_FIRE_TRIAL, RHT_FIRE_TRIAL },
+    { TK_WATER_TRIAL, RHT_WATER_TRIAL }, { TK_SHADOW_TRIAL, RHT_SHADOW_TRIAL }, { TK_SPIRIT_TRIAL, RHT_SPIRIT_TRIAL },
 };
 
 std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap = {
+    // clang-format off
   // RH_GANONDORF_HINT is special cased due to being different based on master sword shuffle
   // Altar hints are special cased due to special hint marking rules
   // warp song hints are special cased due to entrances not being done properly yet
@@ -211,40 +210,46 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {RH_KAK_50_SKULLS_HINT,  StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_50_SKULLS_HINT,  true, {RC_KAK_50_GOLD_SKULLTULA_REWARD},  {}, {}, false, 50)},
   {RH_KAK_100_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM,     {RHT_SKULLS_HINT},                   RSK_KAK_100_SKULLS_HINT, true, {RC_KAK_100_GOLD_SKULLTULA_REWARD}, {}, {}, false, 100)},
   {RH_MASK_SHOP_HINT,      StaticHintInfo(HINT_TYPE_ITEM,     {RHT_MASK_SHOP_HINT},                RSK_MASK_SHOP_HINT,      true, {RC_DEKU_THEATER_SKULL_MASK, RC_DEKU_THEATER_MASK_OF_TRUTH}, {}, {RC_MASK_SHOP_HINT})}
+
+    // clang-format on
 };
 
-std::unordered_map<std::string, uint32_t> StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input){
-  std::unordered_map<std::string, uint32_t> output = {};
-  for (const auto& [key, message] : input) {
-    std::vector<std::string> strings = message.GetAllMessages();
-    for (std::string string: strings){
-      if (output.contains(string)){
-        if (output[string] != key){
-          SPDLOG_DEBUG("\tREPEATED STRING IN " + message.GetEnglish(MF_CLEAN) + "\n\n"); //RANDOTODO should this cause an error of some kind?
+std::unordered_map<std::string, uint32_t>
+StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input) {
+    std::unordered_map<std::string, uint32_t> output = {};
+    for (const auto& [key, message] : input) {
+        std::vector<std::string> strings = message.GetAllMessages();
+        for (std::string string : strings) {
+            if (output.contains(string)) {
+                if (output[string] != key) {
+                    // RANDOTODO should this cause an error of some kind?
+                    SPDLOG_DEBUG("\tREPEATED STRING IN " + message.GetEnglish(MF_CLEAN) + "\n\n");
+                }
+            } else {
+                output[string] = key;
+            }
         }
-      } else {
-        output[string] = key;
-      }
     }
-  }
-  return output;
+    return output;
 }
 
-std::unordered_map<std::string, uint32_t> StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input){
-  std::unordered_map<std::string, uint32_t> output = {};
-  for (const auto& [key, text] : input) {
-    std::vector<std::string> strings = hintTextTable[text].GetClear().GetAllMessages();
-    for (std::string string: strings){
-      if (output.contains(string)){
-        if (output[string] != key){
-          SPDLOG_DEBUG("\tREPEATED STRING WITH " + string + "\n\n"); //RANDOTODO should this cause an error of some kind?
+std::unordered_map<std::string, uint32_t>
+StaticData::PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input) {
+    std::unordered_map<std::string, uint32_t> output = {};
+    for (const auto& [key, text] : input) {
+        std::vector<std::string> strings = hintTextTable[text].GetClear().GetAllMessages();
+        for (std::string string : strings) {
+            if (output.contains(string)) {
+                if (output[string] != key) {
+                    // RANDOTODO should this cause an error of some kind?
+                    SPDLOG_DEBUG("\tREPEATED STRING WITH " + string + "\n\n");
+                }
+            } else {
+                output[string] = key;
+            }
         }
-      } else {
-        output[string] = key;
-      }
     }
-  }
-  return output;
+    return output;
 }
 
 std::unordered_map<std::string, uint32_t> StaticData::hintNameToEnum = {};
@@ -252,54 +257,51 @@ std::unordered_map<std::string, uint32_t> StaticData::hintTypeNameToEnum = {};
 std::unordered_map<std::string, uint32_t> StaticData::areaNameToEnum = {};
 std::unordered_map<std::string, uint32_t> StaticData::trialNameToEnum = {};
 std::unordered_map<std::string, RandomizerSettingKey> StaticData::optionNameToEnum = {};
-std::unordered_map<std::string, RandomizerCheck> StaticData::locationNameToEnum = {}; //is filled in context based on location table
+std::unordered_map<std::string, RandomizerCheck>
+    StaticData::locationNameToEnum = {}; // is filled in context based on location table
 
 std::unordered_map<u32, RandomizerHint> StaticData::stoneParamsToHint{
-  {0x1,  RH_ZF_FAIRY_GOSSIP_STONE},
-  {0x2,  RH_ZF_JABU_GOSSIP_STONE},
-  {0x3,  RH_LH_LAB_GOSSIP_STONE},
-  {0x4,  RH_DMT_GOSSIP_STONE},
-  {0x5,  RH_DMC_GOSSIP_STONE},
-  {0x6,  RH_TOT_LEFTMOST_GOSSIP_STONE},
-  {0x7,  RH_TOT_LEFT_CENTER_GOSSIP_STONE},
-  {0x8,  RH_LH_SOUTHWEST_GOSSIP_STONE},
-  {0x9,  RH_ZD_GOSSIP_STONE}, 
-  {0xA,  RH_GRAVEYARD_GOSSIP_STONE},
-  {0xB,  RH_HC_ROCK_WALL_GOSSIP_STONE},
-  {0xC,  RH_ZR_NEAR_DOMAIN_GOSSIP_STONE},
-  {0xD,  RH_ZR_NEAR_GROTTOS_GOSSIP_STONE},
-  {0xE,  RH_TOT_RIGHT_CENTER_GOSSIP_STONE },
-  {0xF,  RH_LH_SOUTHEAST_GOSSIP_STONE},
-  {0x10, RH_TOT_RIGHTMOST_GOSSIP_STONE },
-  {0x11, RH_GV_GOSSIP_STONE},
-  {0x12, RH_HC_MALON_GOSSIP_STONE},
-  {0x13, RH_HC_STORMS_GROTTO_GOSSIP_STONE},
-  {0x14, RH_DODONGOS_CAVERN_GOSSIP_STONE},
-  {0x15, RH_GC_MAZE_GOSSIP_STONE},
-  {0x16, RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE},
-  {0x17, RH_SFM_MAZE_CENTER_GOSSIP_STONE},
-  //generic grottos all use 0x18, grottoChestParamsToHint is used for conversion
-  {0x19, RH_GC_MEDIGORON_GOSSIP_STONE},
-  {0x1A, RH_COLOSSUS_GOSSIP_STONE},
-  {0x1B, RH_HF_COW_GROTTO_GOSSIP_STONE},
-  {0x1C, RH_SFM_SARIA_GOSSIP_STONE},
-  {0x1D, RH_LW_GOSSIP_STONE},
-  {0x1E, RH_KF_GOSSIP_STONE},
-  {0x1F, RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE},
-  {0x20, RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE},
+    { 0x1, RH_ZF_FAIRY_GOSSIP_STONE },
+    { 0x2, RH_ZF_JABU_GOSSIP_STONE },
+    { 0x3, RH_LH_LAB_GOSSIP_STONE },
+    { 0x4, RH_DMT_GOSSIP_STONE },
+    { 0x5, RH_DMC_GOSSIP_STONE },
+    { 0x6, RH_TOT_LEFTMOST_GOSSIP_STONE },
+    { 0x7, RH_TOT_LEFT_CENTER_GOSSIP_STONE },
+    { 0x8, RH_LH_SOUTHWEST_GOSSIP_STONE },
+    { 0x9, RH_ZD_GOSSIP_STONE },
+    { 0xA, RH_GRAVEYARD_GOSSIP_STONE },
+    { 0xB, RH_HC_ROCK_WALL_GOSSIP_STONE },
+    { 0xC, RH_ZR_NEAR_DOMAIN_GOSSIP_STONE },
+    { 0xD, RH_ZR_NEAR_GROTTOS_GOSSIP_STONE },
+    { 0xE, RH_TOT_RIGHT_CENTER_GOSSIP_STONE },
+    { 0xF, RH_LH_SOUTHEAST_GOSSIP_STONE },
+    { 0x10, RH_TOT_RIGHTMOST_GOSSIP_STONE },
+    { 0x11, RH_GV_GOSSIP_STONE },
+    { 0x12, RH_HC_MALON_GOSSIP_STONE },
+    { 0x13, RH_HC_STORMS_GROTTO_GOSSIP_STONE },
+    { 0x14, RH_DODONGOS_CAVERN_GOSSIP_STONE },
+    { 0x15, RH_GC_MAZE_GOSSIP_STONE },
+    { 0x16, RH_SFM_MAZE_NEAR_LW_GOSSIP_STONE },
+    { 0x17, RH_SFM_MAZE_CENTER_GOSSIP_STONE },
+    // generic grottos all use 0x18, grottoChestParamsToHint is used for conversion
+    { 0x19, RH_GC_MEDIGORON_GOSSIP_STONE },
+    { 0x1A, RH_COLOSSUS_GOSSIP_STONE },
+    { 0x1B, RH_HF_COW_GROTTO_GOSSIP_STONE },
+    { 0x1C, RH_SFM_SARIA_GOSSIP_STONE },
+    { 0x1D, RH_LW_GOSSIP_STONE },
+    { 0x1E, RH_KF_GOSSIP_STONE },
+    { 0x1F, RH_KF_DEKU_TREE_LEFT_GOSSIP_STONE },
+    { 0x20, RH_KF_DEKU_TREE_RIGHT_GOSSIP_STONE },
 };
 
 std::unordered_map<u32, RandomizerHint> StaticData::grottoChestParamsToHint{
-  {22944, RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE},
-  {22978, RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE},
-  {22947, RH_HF_OPEN_GROTTO_GOSSIP_STONE},
-  {22964, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE},
-  {23255, RH_DMT_STORMS_GROTTO_GOSSIP_STONE},
-  {22984, RH_KAK_OPEN_GROTTO_GOSSIP_STONE},
-  {22985, RH_ZR_OPEN_GROTTO_GOSSIP_STONE},
-  {23802, RH_DMC_UPPER_GROTTO_GOSSIP_STONE},
-  {22988, RH_KF_STORMS_GROTTO_GOSSIP_STONE}
+    { 22944, RH_HF_NEAR_MARKET_GROTTO_GOSSIP_STONE }, { 22978, RH_HF_SOUTHEAST_GROTTO_GOSSIP_STONE },
+    { 22947, RH_HF_OPEN_GROTTO_GOSSIP_STONE },        { 22964, RH_LW_NEAR_SHORTCUTS_GROTTO_GOSSIP_STONE },
+    { 23255, RH_DMT_STORMS_GROTTO_GOSSIP_STONE },     { 22984, RH_KAK_OPEN_GROTTO_GOSSIP_STONE },
+    { 22985, RH_ZR_OPEN_GROTTO_GOSSIP_STONE },        { 23802, RH_DMC_UPPER_GROTTO_GOSSIP_STONE },
+    { 22988, RH_KF_STORMS_GROTTO_GOSSIP_STONE },
 };
 
 std::array<HintText, RHT_MAX> StaticData::hintTextTable = {};
-}
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index a456089a35..7bdec17c11 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -10,70 +10,77 @@
 namespace Rando {
 /**
  * @brief Singleton for storing and accessing static Randomizer-related data
- * 
+ *
  * The StaticData class is a class for storing and accessing static Randomizer-related data.
  * Static Data, in this context, refers to data that is the same for every single randomizer seed,
  * i.e. the item and location tables. This class is intended to be used as a Singleton.
  */
 class StaticData {
-    private:
-      static std::array<Item, RG_MAX> itemTable;
-      static std::array<Location, RC_MAX> locationTable;
+  private:
+    static std::array<Item, RG_MAX> itemTable;
+    static std::array<Location, RC_MAX> locationTable;
 
-    public:
-      static void InitItemTable();
-      static void HintTable_Init();
-      static void HintTable_Init_Item();
-      static void HintTable_Init_Exclude_Overworld();
-      static void HintTable_Init_Exclude_Dungeon();
-      static Item& RetrieveItem(const RandomizerGet rgid);
-      static Item& ItemFromGIID(const int giid);
-      static std::array<Item, RG_MAX>& GetItemTable();// is there a reason this is a function and not just an exposed table?
-      static void InitLocationTable();
-      static Location* GetLocation(RandomizerCheck locKey);
-      static std::array<Rando::Location, RC_MAX>& GetLocationTable();
-      static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input);
-      static std::unordered_map<std::string, uint32_t> PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input);
-      static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
-      static std::vector<RandomizerCheck> GetAllDungeonLocations();
-      static std::vector<RandomizerCheck> dungeonRewardLocations;
-      static std::vector<RandomizerCheck> GetShopLocations();
-      static std::vector<RandomizerCheck> GetScrubLocations();
-      static std::vector<RandomizerCheck> GetMerchantLocations();
-      static std::vector<RandomizerCheck> GetAdultTradeLocations();
-      static std::vector<RandomizerCheck> GetGossipStoneLocations();
-      static std::vector<RandomizerCheck> GetStaticHintLocations();
-      static std::vector<RandomizerCheck> GetPondFishLocations();
-      static std::vector<RandomizerCheck> GetOverworldFishLocations();
-      static std::vector<RandomizerCheck> GetOverworldFairyLocations();
-      static void RegisterCowLocations();
-      static void RegisterFishLocations();
-      static void RegisterFairyLocations();
-      static void RegisterPotLocations();
-      static void RegisterFreestandingLocations();
-      static void InitHashMaps();
-      static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
-      static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
-      static std::vector<RandomizerHint> oldVerHintOrder;
-      static uint16_t oldVerGossipStoneStart;
-      static std::unordered_map<std::string, RandomizerCheck> locationNameToEnum;
-      static std::unordered_map<std::string, RandomizerGet> itemNameToEnum;
-      static std::unordered_map<uint32_t, CustomMessage> hintNames;
-      static std::unordered_map<std::string, uint32_t> hintNameToEnum;
-      static std::unordered_map<uint32_t, CustomMessage> hintTypeNames;
-      static std::unordered_map<std::string, uint32_t> hintTypeNameToEnum;
-      static std::unordered_map<RandomizerCheck, RandomizerHint> gossipStoneCheckToHint;
-      static std::unordered_map<uint32_t, RandomizerHintTextKey> areaNames;
-      static std::unordered_map<std::string, uint32_t> areaNameToEnum;
-      static std::unordered_map<uint32_t, RandomizerHintTextKey> trialData;
-      static std::unordered_map<std::string, uint32_t> trialNameToEnum;
-      static std::unordered_map<std::string, RandomizerSettingKey> optionNameToEnum;
-      static std::unordered_map<RandomizerHint, StaticHintInfo> staticHintInfoMap;
-      static std::unordered_map<u32, RandomizerHint> stoneParamsToHint;
-      static std::unordered_map<u32, RandomizerHint> grottoChestParamsToHint;
-      static std::array<HintText, RHT_MAX> hintTextTable;
+  public:
+    static void InitItemTable();
+    static void HintTable_Init();
+    static void HintTable_Init_Item();
+    static void HintTable_Init_Exclude_Overworld();
+    static void HintTable_Init_Exclude_Dungeon();
+    static Item& RetrieveItem(const RandomizerGet rgid);
+    static Item& ItemFromGIID(const int giid);
+    static std::array<Item, RG_MAX>&
+    GetItemTable(); // is there a reason this is a function and not just an exposed table?
+    static void InitLocationTable();
+    static Location* GetLocation(RandomizerCheck locKey);
+    static std::array<Rando::Location, RC_MAX>& GetLocationTable();
+    static std::unordered_map<std::string, uint32_t>
+    PopulateTranslationMap(std::unordered_map<uint32_t, CustomMessage> input);
+    static std::unordered_map<std::string, uint32_t>
+    PopulateTranslationMap(std::unordered_map<uint32_t, RandomizerHintTextKey> input);
+    static std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> CheckFromActorMultimap;
+    static std::vector<RandomizerCheck> GetAllDungeonLocations();
+    static std::vector<RandomizerCheck> dungeonRewardLocations;
+    static std::vector<RandomizerCheck> GetShopLocations();
+    static std::vector<RandomizerCheck> GetScrubLocations();
+    static std::vector<RandomizerCheck> GetMerchantLocations();
+    static std::vector<RandomizerCheck> GetAdultTradeLocations();
+    static std::vector<RandomizerCheck> GetGossipStoneLocations();
+    static std::vector<RandomizerCheck> GetStaticHintLocations();
+    static std::vector<RandomizerCheck> GetPondFishLocations();
+    static std::vector<RandomizerCheck> GetOverworldFishLocations();
+    static std::vector<RandomizerCheck> GetOverworldFairyLocations();
+    static void RegisterSongLocations();
+    static void RegisterBeehiveLocations();
+    static void RegisterCowLocations();
+    static void RegisterFishLocations();
+    static void RegisterFairyLocations();
+    static void RegisterPotLocations();
+    static void RegisterFreestandingLocations();
+    static void RegisterGrassLocations();
+    static void RegisterCrateLocations();
+    static void InitHashMaps();
+    static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
+    static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
+    static std::vector<RandomizerHint> oldVerHintOrder;
+    static uint16_t oldVerGossipStoneStart;
+    static std::unordered_map<std::string, RandomizerCheck> locationNameToEnum;
+    static std::unordered_map<std::string, RandomizerGet> itemNameToEnum;
+    static std::unordered_map<uint32_t, CustomMessage> hintNames;
+    static std::unordered_map<std::string, uint32_t> hintNameToEnum;
+    static std::unordered_map<uint32_t, CustomMessage> hintTypeNames;
+    static std::unordered_map<std::string, uint32_t> hintTypeNameToEnum;
+    static std::unordered_map<RandomizerCheck, RandomizerHint> gossipStoneCheckToHint;
+    static std::unordered_map<uint32_t, RandomizerHintTextKey> areaNames;
+    static std::unordered_map<std::string, uint32_t> areaNameToEnum;
+    static std::unordered_map<uint32_t, RandomizerHintTextKey> trialData;
+    static std::unordered_map<std::string, uint32_t> trialNameToEnum;
+    static std::unordered_map<std::string, RandomizerSettingKey> optionNameToEnum;
+    static std::unordered_map<RandomizerHint, StaticHintInfo> staticHintInfoMap;
+    static std::unordered_map<u32, RandomizerHint> stoneParamsToHint;
+    static std::unordered_map<u32, RandomizerHint> grottoChestParamsToHint;
+    static std::array<HintText, RHT_MAX> hintTextTable;
 
-      StaticData();
-      ~StaticData();
+    StaticData();
+    ~StaticData();
 };
-}
\ No newline at end of file
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/trial.cpp b/soh/soh/Enhancements/randomizer/trial.cpp
index a9b1f3fb32..81ef97a978 100644
--- a/soh/soh/Enhancements/randomizer/trial.cpp
+++ b/soh/soh/Enhancements/randomizer/trial.cpp
@@ -2,7 +2,9 @@
 #include "static_data.h"
 
 namespace Rando {
-TrialInfo::TrialInfo(RandomizerHintTextKey nameKey_, TrialKey trialKey_) : nameKey(std::move(nameKey_)), trialKey(std::move(trialKey_)) {}
+TrialInfo::TrialInfo(RandomizerHintTextKey nameKey_, TrialKey trialKey_)
+    : nameKey(std::move(nameKey_)), trialKey(std::move(trialKey_)) {
+}
 TrialInfo::TrialInfo() = default;
 TrialInfo::~TrialInfo() = default;
 
@@ -35,7 +37,7 @@ void TrialInfo::SetAsSkipped() {
 }
 
 Trials::Trials() {
-    for (const auto trial : StaticData::trialData){
+    for (const auto trial : StaticData::trialData) {
         mTrials[trial.first] = TrialInfo(trial.second, static_cast<TrialKey>(trial.first));
     }
 }
@@ -85,7 +87,7 @@ void Trials::ParseJson(nlohmann::json spoilerFileJson) {
 
 std::unordered_map<uint32_t, RandomizerHintTextKey> Trials::GetAllTrialHintHeys() const {
     std::unordered_map<uint32_t, RandomizerHintTextKey> output = {};
-    for (auto trial: mTrials){
+    for (auto trial : mTrials) {
         output[(uint32_t)trial.GetTrialKey()] = trial.GetNameKey();
     }
     return output;
diff --git a/soh/soh/Enhancements/randomizer/trial.h b/soh/soh/Enhancements/randomizer/trial.h
index 2cc4838985..1ca39d0964 100644
--- a/soh/soh/Enhancements/randomizer/trial.h
+++ b/soh/soh/Enhancements/randomizer/trial.h
@@ -20,6 +20,7 @@ class TrialInfo {
     bool IsRequired() const;
     void SetAsRequired();
     void SetAsSkipped();
+
   private:
     RandomizerHintTextKey nameKey;
     TrialKey trialKey;
@@ -37,7 +38,8 @@ class Trials {
     size_t GetTrialListSize() const;
     void ParseJson(nlohmann::json spoilerFileJson);
     std::unordered_map<uint32_t, RandomizerHintTextKey> GetAllTrialHintHeys() const;
+
   private:
     std::array<TrialInfo, TK_MAX> mTrials;
 };
-}
\ No newline at end of file
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/tricks.cpp b/soh/soh/Enhancements/randomizer/tricks.cpp
index 6008ba3325..018e62e080 100644
--- a/soh/soh/Enhancements/randomizer/tricks.cpp
+++ b/soh/soh/Enhancements/randomizer/tricks.cpp
@@ -1,114 +1,112 @@
 #include "tricks.h"
+#include "soh/SohGui/UIWidgets.hpp"
 #include <unordered_map>
 
 namespace Rando {
-    const std::unordered_map<RandomizerArea, std::string> rtAreaNames = {
-        { RA_NONE, "General Tricks" },
-        { RA_KOKIRI_FOREST, "Kokiri Forest" },
-        { RA_THE_LOST_WOODS, "Lost Woods" },
-        { RA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow" },
-        { RA_HYRULE_FIELD, "Hyrule Field" },
-        { RA_LAKE_HYLIA, "Lake Hylia" },
-        { RA_GERUDO_VALLEY, "Gerudo Valley" },
-        { RA_GERUDO_FORTRESS, "Gerudo Fortress" },
-        { RA_HAUNTED_WASTELAND, "Haunted Wasteland" },
-        { RA_DESERT_COLOSSUS, "Desert Colossus" },
-        { RA_THE_MARKET, "Hyrule Market" },
-        { RA_HYRULE_CASTLE, "Hyrule Castle" },
-        { RA_KAKARIKO_VILLAGE, "Kakariko Village" },
-        { RA_THE_GRAVEYARD, "Graveyard" },
-        { RA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail" },
-        { RA_GORON_CITY, "Goron City" },
-        { RA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater" },
-        { RA_ZORAS_RIVER, "Zora's River" },
-        { RA_ZORAS_DOMAIN, "Zora's Domain" },
-        { RA_ZORAS_FOUNTAIN, "Zora's Fountain" },
-        { RA_LON_LON_RANCH, "Lon Lon Ranch" },
-        { RA_DEKU_TREE, "Deku Tree" },
-        { RA_DODONGOS_CAVERN, "Dodongo's Cavern" },
-        { RA_JABU_JABUS_BELLY, "Jabu Jabu's Belly" },
-        { RA_FOREST_TEMPLE, "Forest Temple" },
-        { RA_FIRE_TEMPLE, "Fire Temple" },
-        { RA_WATER_TEMPLE, "Water Temple" },
-        { RA_SPIRIT_TEMPLE, "Spirit Temple" },
-        { RA_SHADOW_TEMPLE, "Shadow Temple" },
-        { RA_BOTTOM_OF_THE_WELL, "Bottom of the Well" },
-        { RA_ICE_CAVERN, "Ice Cavern" },
-        { RA_GERUDO_TRAINING_GROUND, "Gerudo Training Ground" },
-        { RA_GANONS_CASTLE, "Ganon's Castle" },
-        { RA_MAX, "Invalid" },
-    };
+const std::unordered_map<RandomizerArea, std::string> rtAreaNames = {
+    { RA_NONE, "General Tricks" },
+    { RA_KOKIRI_FOREST, "Kokiri Forest" },
+    { RA_THE_LOST_WOODS, "Lost Woods" },
+    { RA_SACRED_FOREST_MEADOW, "Sacred Forest Meadow" },
+    { RA_HYRULE_FIELD, "Hyrule Field" },
+    { RA_LAKE_HYLIA, "Lake Hylia" },
+    { RA_GERUDO_VALLEY, "Gerudo Valley" },
+    { RA_GERUDO_FORTRESS, "Gerudo Fortress" },
+    { RA_HAUNTED_WASTELAND, "Haunted Wasteland" },
+    { RA_DESERT_COLOSSUS, "Desert Colossus" },
+    { RA_THE_MARKET, "Hyrule Market" },
+    { RA_HYRULE_CASTLE, "Hyrule Castle" },
+    { RA_KAKARIKO_VILLAGE, "Kakariko Village" },
+    { RA_THE_GRAVEYARD, "Graveyard" },
+    { RA_DEATH_MOUNTAIN_TRAIL, "Death Mountain Trail" },
+    { RA_GORON_CITY, "Goron City" },
+    { RA_DEATH_MOUNTAIN_CRATER, "Death Mountain Crater" },
+    { RA_ZORAS_RIVER, "Zora's River" },
+    { RA_ZORAS_DOMAIN, "Zora's Domain" },
+    { RA_ZORAS_FOUNTAIN, "Zora's Fountain" },
+    { RA_LON_LON_RANCH, "Lon Lon Ranch" },
+    { RA_DEKU_TREE, "Deku Tree" },
+    { RA_DODONGOS_CAVERN, "Dodongo's Cavern" },
+    { RA_JABU_JABUS_BELLY, "Jabu Jabu's Belly" },
+    { RA_FOREST_TEMPLE, "Forest Temple" },
+    { RA_FIRE_TEMPLE, "Fire Temple" },
+    { RA_WATER_TEMPLE, "Water Temple" },
+    { RA_SPIRIT_TEMPLE, "Spirit Temple" },
+    { RA_SHADOW_TEMPLE, "Shadow Temple" },
+    { RA_BOTTOM_OF_THE_WELL, "Bottom of the Well" },
+    { RA_ICE_CAVERN, "Ice Cavern" },
+    { RA_GERUDO_TRAINING_GROUND, "Gerudo Training Ground" },
+    { RA_GANONS_CASTLE, "Ganon's Castle" },
+    { RA_MAX, "Invalid" },
+};
 
-    const std::string& Tricks::GetAreaName(const RandomizerArea area) {
-        return rtAreaNames.at(area);
+const std::string& Tricks::GetAreaName(const RandomizerArea area) {
+    return rtAreaNames.at(area);
+}
+
+bool Tricks::CheckTags(const std::map<Tag, bool>& showTag, const std::set<Tag>& rtTags) {
+    if (rtTags.empty()) {
+        return false;
     }
-
-    bool Tricks::CheckTags(const std::map<Tag, bool>& showTag, const std::set<Tag>& rtTags) {
-        if (rtTags.empty()) {
+    for (Tag rtTag : rtTags) {
+        if (!showTag.at(rtTag)) {
             return false;
         }
-        for (Tag rtTag : rtTags) {
-            if (!showTag.at(rtTag)) {
-                return false;
-            }
-        }
-        return true;
     }
+    return true;
+}
 
-    const std::unordered_map<Tricks::Tag, std::string> rtTagNames = {
-        { Tricks::Tag::NOVICE, "Novice" },
-        { Tricks::Tag::INTERMEDIATE, "Intermediate" },
-        { Tricks::Tag::ADVANCED, "Advanced" },
-        { Tricks::Tag::EXPERT, "Expert" },
-        { Tricks::Tag::EXTREME, "Extreme" },
-        { Tricks::Tag::EXPERIMENTAL, "Experimental" },
-        { Tricks::Tag::GLITCH, "Glitch" },
-    };
+const std::unordered_map<Tricks::Tag, std::string> rtTagNames = {
+    { Tricks::Tag::NOVICE, "Novice" },     { Tricks::Tag::INTERMEDIATE, "Intermediate" },
+    { Tricks::Tag::ADVANCED, "Advanced" }, { Tricks::Tag::EXPERT, "Expert" },
+    { Tricks::Tag::EXTREME, "Extreme" },   { Tricks::Tag::EXPERIMENTAL, "Experimental" },
+    { Tricks::Tag::GLITCH, "Glitch" },
+};
 
-    const std::string Tricks::GetTagName(const Tag tag) {
-        return rtTagNames.at(tag);
+const std::string Tricks::GetTagName(const Tag tag) {
+    return rtTagNames.at(tag);
+}
+
+const ImVec4 Tricks::GetTextColor(const Tag tag) {
+    switch (tag) {
+        case Tag::GLITCH:
+            return { 0.00f, 0.00f, 0.00f, 1.0f };
+        default:
+            return { 1.00f, 1.00f, 1.00f, 1.00f };
     }
+}
 
-    const ImVec4 Tricks::GetTextColor(const Tag tag) {
-        switch(tag) {
-            case Tag::EXPERIMENTAL:
-            case Tag::GLITCH:
-                return { 0.00f, 0.00f, 0.00f, 1.0f };
-            default:
-                return { 1.00f, 1.00f, 1.00f, 1.00f };
-        }
+const ImVec4 Tricks::GetTagColor(const Tag tag) {
+    switch (tag) {
+        case Tag::NOVICE:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Green);
+        case Tag::INTERMEDIATE:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Orange);
+        case Tag::ADVANCED:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Blue);
+        case Tag::EXPERT:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Red);
+        case Tag::EXTREME:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Purple);
+        case Tag::EXPERIMENTAL:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::LightBlue);
+        case Tag::GLITCH:
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::White);
+        default:
+            assert(false);
+            return UIWidgets::ColorValues.at(UIWidgets::Colors::Gray);
     }
+}
 
-    const ImVec4 Tricks::GetTagColor(const Tag tag) {
-        switch(tag) {
-            case Tag::NOVICE:
-                return { 0.09f, 0.55f, 0.37f, 1.00f };
-            case Tag::INTERMEDIATE:
-                return { 0.95f, 0.52f, 0.00f, 1.00f };
-            case Tag::ADVANCED:
-                return { 0.00f, 0.29f, 0.71f, 1.00f };
-            case Tag::EXPERT:
-                return { 0.53f, 0.05f, 0.14f, 1.00f };
-            case Tag::EXTREME:
-                return { 0.27f, 0.00f, 0.27f, 1.00f };
-            case Tag::EXPERIMENTAL:
-                return { 0.00f, 1.00f, 1.00f, 1.00f };
-            case Tag::GLITCH:
-                return { 1.00f, 1.00f, 1.00f, 1.00f };
-            default:
-                assert(false);
-                return { 0.50f, 0.50f, 0.50f, 1.00f };
-        }
+void Tricks::DrawTagChips(const std::set<Tag>& rtTags, std::string trickName) {
+    for (const Tag rtTag : rtTags) {
+        std::string tagId = GetTagName(rtTag) + "##" + trickName;
+        ImGui::SameLine();
+        ImGui::BeginDisabled();
+        UIWidgets::PushStyleButton(GetTagColor(rtTag));
+        ImGui::SmallButton(tagId.c_str());
+        UIWidgets::PopStyleButton();
+        ImGui::EndDisabled();
     }
-
-    void Tricks::DrawTagChips(const std::set<Tag>& rtTags) {
-        for (const Tag rtTag : rtTags) {
-            ImGui::SameLine();
-            ImGui::BeginDisabled();
-            ImGui::PushStyleColor(ImGuiCol_Button, GetTagColor(rtTag));
-            ImGui::SmallButton(GetTagName(rtTag).c_str());
-            ImGui::PopStyleColor();
-            ImGui::EndDisabled();
-        }
-    }
-}
\ No newline at end of file
+}
+} // namespace Rando
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/tricks.h b/soh/soh/Enhancements/randomizer/tricks.h
index b3b6355553..066dd44171 100644
--- a/soh/soh/Enhancements/randomizer/tricks.h
+++ b/soh/soh/Enhancements/randomizer/tricks.h
@@ -11,25 +11,25 @@
 #include <string>
 
 namespace Rando {
-    class Tricks {
-        public:
-            enum class Tag {
-                NOVICE,
-                INTERMEDIATE,
-                ADVANCED,
-                EXPERT,
-                EXTREME,
-                EXPERIMENTAL,
-                GLITCH,
-            };
-
-            static const std::string& GetAreaName(RandomizerArea area);
-            static bool CheckTags(const std::map<Tag, bool>& showTag, const std::set<Tag>& rtTags);
-            static const std::string GetTagName(Tag tag);
-            static const ImVec4 GetTextColor(Tag tag);
-            static const ImVec4 GetTagColor(Tag tag);
-            static void DrawTagChips(const std::set<Tag>& rtTags);
+class Tricks {
+  public:
+    enum class Tag {
+        NOVICE,
+        INTERMEDIATE,
+        ADVANCED,
+        EXPERT,
+        EXTREME,
+        EXPERIMENTAL,
+        GLITCH,
     };
-}
 
-#endif //TRICKS_H
\ No newline at end of file
+    static const std::string& GetAreaName(RandomizerArea area);
+    static bool CheckTags(const std::map<Tag, bool>& showTag, const std::set<Tag>& rtTags);
+    static const std::string GetTagName(Tag tag);
+    static const ImVec4 GetTextColor(Tag tag);
+    static const ImVec4 GetTagColor(Tag tag);
+    static void DrawTagChips(const std::set<Tag>& rtTags, std::string trickName = "");
+};
+} // namespace Rando
+
+#endif // TRICKS_H
\ No newline at end of file
diff --git a/soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp b/soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp
deleted file mode 100644
index a18aea8dc4..0000000000
--- a/soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp
+++ /dev/null
@@ -1,489 +0,0 @@
-#include "ResolutionEditor.h"
-#include <imgui.h>
-#include <libultraship/libultraship.h>
-
-#include "soh/SohGui/UIWidgets.hpp"
-#include <graphic/Fast3D/gfx_pc.h>
-#include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
-
-/*  Console Variables are grouped under gAdvancedResolution. (e.g. CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled")
-
-    The following cvars are used in Libultraship and can be edited here:
-        - Enabled                                       - Turns Advanced Resolution Mode on.
-        - AspectRatioX, AspectRatioY                    - Aspect ratio controls. To toggle off, set either to zero.
-        - VerticalPixelCount, VerticalResolutionToggle  - Resolution controls.
-        - PixelPerfectMode, IntegerScale.Factor         - Pixel Perfect Mode a.k.a. integer scaling controls.
-        - IntegerScale.FitAutomatically                 - Automatic resizing for Pixel Perfect Mode.
-        - IntegerScale.NeverExceedBounds                - Prevents manual resizing from exceeding screen bounds.
-
-    The following cvars are also implemented in LUS for niche use cases:
-        - IgnoreAspectCorrection                        - Stretch framebuffer to fill screen.
-            This is something of a power-user setting for niche setups that most people won't need or care about,
-            but may be useful if playing the Switch/Wii U ports on a 4:3 television.
-        - IntegerScale.ExceedBoundsBy                   - Offset the max screen bounds, usually by +1.
-                                                          This isn't that useful at the moment, so it's unused here.
-*/
-
-namespace AdvancedResolutionSettings {
-enum setting { UPDATE_aspectRatioX, UPDATE_aspectRatioY, UPDATE_verticalPixelCount };
-
-const char* aspectRatioPresetLabels[] = {
-    "Off", "Custom", "Original (4:3)", "Widescreen (16:9)", "Nintendo 3DS (5:3)", "16:10 (8:5)", "Ultrawide (21:9)"
-};
-const float aspectRatioPresetsX[] = { 0.0f, 16.0f, 4.0f, 16.0f, 5.0f, 16.0f, 21.0f };
-const float aspectRatioPresetsY[] = { 0.0f,  9.0f, 3.0f,  9.0f, 3.0f, 10.0f,  9.0f };
-const int default_aspectRatio = 1; // Default combo list option
-
-const char* pixelCountPresetLabels[] = { "Custom",     "Native N64 (240p)", "2x (480p)",       "3x (720p)", "4x (960p)",
-                                         "5x (1200p)", "6x (1440p)",        "Full HD (1080p)", "4K (2160p)" };
-const int pixelCountPresets[] = { 480, 240, 480, 720, 960, 1200, 1440, 1080, 2160 };
-const int default_pixelCount = 0; // Default combo list option
-
-// Resolution clamp values as hardcoded in LUS::Gui::ApplyResolutionChanges()
-const uint32_t minVerticalPixelCount = SCREEN_HEIGHT;
-const uint32_t maxVerticalPixelCount = 4320; // 18x native, or 8K TV resolution
-
-const unsigned short default_maxIntegerScaleFactor = 6; // Default size of Integer scale factor slider.
-
-enum messageType { MESSAGE_ERROR, MESSAGE_WARNING, MESSAGE_QUESTION, MESSAGE_INFO, MESSAGE_GRAY_75 };
-const ImVec4 messageColor[]{
-    { 0.85f, 0.0f, 0.0f, 1.0f },  // MESSAGE_ERROR
-    { 0.85f, 0.85f, 0.0f, 1.0f }, // MESSAGE_WARNING
-    { 0.0f, 0.85f, 0.85f, 1.0f }, // MESSAGE_QUESTION
-    { 0.0f, 0.85f, 0.55f, 1.0f }, // MESSAGE_INFO
-    { 0.75f, 0.75f, 0.75f, 1.0f } // MESSAGE_GRAY_75
-};
-const float enhancementSpacerHeight = 19.0f;
-
-void AdvancedResolutionSettingsWindow::InitElement() {
-}
-
-void AdvancedResolutionSettingsWindow::DrawElement() {
-    // Initialise update flags.
-    bool update[3];
-    for (uint8_t i = 0; i < sizeof(update); i++)
-        update[i] = false;
-
-    // Initialise integer scale bounds.
-    short max_integerScaleFactor = default_maxIntegerScaleFactor; // default value, which may or may not get
-                                                                    // overridden depending on viewport res
-
-    short integerScale_maximumBounds = 1; // can change when window is resized
-    // This is mostly just for UX purposes, as Fit Automatically logic is part of LUS.
-    if (((float)gfx_current_game_window_viewport.width / gfx_current_game_window_viewport.height) >
-        ((float)gfx_current_dimensions.width / gfx_current_dimensions.height)) {
-        // Scale to window height
-        integerScale_maximumBounds = gfx_current_game_window_viewport.height / gfx_current_dimensions.height;
-    } else {
-        // Scale to window width
-        integerScale_maximumBounds = gfx_current_game_window_viewport.width / gfx_current_dimensions.width;
-    }
-    // Lower-clamping maximum bounds value to 1 is no-longer necessary as that's accounted for in LUS.
-    // Letting it go below 1 in this Editor will even allow for checking if screen bounds are being exceeded.
-    if (default_maxIntegerScaleFactor < integerScale_maximumBounds) {
-        max_integerScaleFactor =
-            integerScale_maximumBounds + CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
-    }
-
-    // Combo List defaults
-    static int item_aspectRatio = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", 3);
-    static int item_pixelCount = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", default_pixelCount);
-    // Stored Values for non-UIWidgets elements
-    static float aspectRatioX =
-        CVarGetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioPresetsX[item_aspectRatio]);
-    static float aspectRatioY =
-        CVarGetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioPresetsY[item_aspectRatio]);
-    static int verticalPixelCount =
-        CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", pixelCountPresets[item_pixelCount]);
-    // Additional settings
-    static bool showHorizontalResField = false;
-    static int horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-    // Disabling flags
-    const bool disabled_everything = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0);
-    const bool disabled_pixelCount = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0);
-
-#ifdef __APPLE__
-    // Display HiDPI warning. (Remove this once we can definitively say it's fixed.)
-    ImGui::TextColored(messageColor[MESSAGE_INFO],
-                        ICON_FA_INFO_CIRCLE " These settings may behave incorrectly on Retina displays.");
-    UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-#endif
-
-    if (ImGui::CollapsingHeader("Original Settings", ImGuiTreeNodeFlags_DefaultOpen)) {
-        // The original resolution slider (for convenience)
-        const bool disabled_resolutionSlider = (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0) &&
-                                                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0)) ||
-                                                CVarGetInteger(CVAR_LOW_RES_MODE, 0);
-        if (UIWidgets::EnhancementSliderFloat("Internal Resolution: %.1f%%", "##IMul", CVAR_INTERNAL_RESOLUTION, 0.5f,
-                                                2.0f, "", 1.0f, true, true, disabled_resolutionSlider)) {
-            Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(
-                CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1));
-        }
-        UIWidgets::Tooltip("Multiplies your output resolution by the value entered.");
-
-        // The original MSAA slider (also for convenience)
-#ifndef __WIIU__
-        if (UIWidgets::PaddedEnhancementSliderInt("MSAA: %d", "##IMSAA", CVAR_MSAA_VALUE, 1, 8, "", 1, true, true,
-                                                    false)) {
-            Ship::Context::GetInstance()->GetWindow()->SetMsaaLevel(CVarGetInteger(CVAR_MSAA_VALUE, 1));
-        };
-        UIWidgets::Tooltip(
-            "Activates multi-sample anti-aliasing when above 1x, up to 8x for 8 samples for every pixel.\n\n"
-            " " ICON_FA_INFO_CIRCLE
-            " (Higher MSAA with low resolution can approximate an authentic \"real N64\" look!)");
-#endif
-
-        // N64 Mode toggle (again for convenience)
-        // UIWidgets::PaddedEnhancementCheckbox("(Enhancements>Graphics) N64 Mode", CVAR_LOW_RES_MODE, false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
-    }
-
-    UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-    // Activator
-    UIWidgets::PaddedEnhancementCheckbox("Enable advanced settings.", CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", false, false,
-                                            false, "", UIWidgets::CheckboxGraphics::Cross, false);
-    // Error/Warning display
-    if (!CVarGetInteger(CVAR_LOW_RES_MODE, 0)) {
-        if (IsDroppingFrames()) { // Significant frame drop warning
-            ImGui::TextColored(messageColor[MESSAGE_WARNING],
-                                ICON_FA_EXCLAMATION_TRIANGLE " Significant frame rate (FPS) drops may be occuring.");
-            UIWidgets::Spacer(2);
-        } else { // No warnings
-            UIWidgets::Spacer(enhancementSpacerHeight);
-        }
-    } else { // N64 Mode warning
-        ImGui::TextColored(messageColor[MESSAGE_QUESTION],
-                            ICON_FA_QUESTION_CIRCLE " \"N64 Mode\" is overriding these settings.");
-        ImGui::SameLine();
-        if (ImGui::Button("Click to disable")) {
-            CVarSetInteger(CVAR_LOW_RES_MODE, 0);
-            CVarSave();
-        }
-    }
-    // Resolution visualiser
-    ImGui::Text("Viewport dimensions: %d x %d", gfx_current_game_window_viewport.width,
-                gfx_current_game_window_viewport.height);
-    ImGui::Text("Internal resolution: %d x %d", gfx_current_dimensions.width, gfx_current_dimensions.height);
-
-    UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-    if (disabled_everything) { // Hide aspect ratio controls.
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
-
-    // Aspect Ratio
-    ImGui::Text("Force aspect ratio:");
-    ImGui::SameLine();
-    ImGui::TextColored(messageColor[MESSAGE_GRAY_75], "(Select \"Off\" to disable.)");
-    // Presets
-    if (ImGui::Combo(" ", &item_aspectRatio, aspectRatioPresetLabels,
-                        IM_ARRAYSIZE(aspectRatioPresetLabels)) &&
-        item_aspectRatio != default_aspectRatio) { // don't change anything if "Custom" is selected.
-        aspectRatioX = aspectRatioPresetsX[item_aspectRatio];
-        aspectRatioY = aspectRatioPresetsY[item_aspectRatio];
-
-        if (showHorizontalResField) {
-            horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-        }
-
-        CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioX);
-        CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioY);
-        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", item_aspectRatio);
-        CVarSave();
-    }
-    // Hide aspect ratio input fields if using one of the presets.
-    if (item_aspectRatio == default_aspectRatio && !showHorizontalResField) {
-        // Declare input interaction bools outside of IF statement to prevent Y field from disappearing.
-        const bool input_X = ImGui::InputFloat("X", &aspectRatioX, 0.1f, 1.0f, "%.3f");
-        const bool input_Y = ImGui::InputFloat("Y", &aspectRatioY, 0.1f, 1.0f, "%.3f");
-        if (input_X || input_Y) {
-            item_aspectRatio = default_aspectRatio;
-            update[UPDATE_aspectRatioX] = true;
-            update[UPDATE_aspectRatioY] = true;
-        }
-    } else if (showHorizontalResField) { // Show calculated aspect ratio
-        if (item_aspectRatio) {
-            UIWidgets::Spacer(2);
-            const float resolvedAspectRatio = (float)gfx_current_dimensions.width / gfx_current_dimensions.height;
-            ImGui::Text("Aspect ratio: %.2f:1", resolvedAspectRatio);
-        } else {
-            UIWidgets::Spacer(enhancementSpacerHeight);
-        }
-    }
-
-    if (disabled_everything) { // Hide aspect ratio controls.
-        UIWidgets::ReEnableComponent("disabledTooltipText");
-    }
-    UIWidgets::Spacer(0);
-
-    // Vertical Resolution
-    UIWidgets::PaddedEnhancementCheckbox("Set fixed vertical resolution (disables Resolution slider)",
-                                            CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", true, false,
-                                            disabled_everything, "", UIWidgets::CheckboxGraphics::Cross, false);
-    UIWidgets::Tooltip(
-        "Override the resolution scale slider and use the settings below, irrespective of window size.");
-    if (disabled_pixelCount || disabled_everything) { // Hide pixel count controls.
-        UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-    }
-    if (ImGui::Combo("Pixel Count Presets", &item_pixelCount, pixelCountPresetLabels,
-                        IM_ARRAYSIZE(pixelCountPresetLabels)) &&
-        item_pixelCount != default_pixelCount) { // don't change anything if "Custom" is selected.
-        verticalPixelCount = pixelCountPresets[item_pixelCount];
-
-        if (showHorizontalResField) {
-            horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-        }
-
-        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", verticalPixelCount);
-        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", item_pixelCount);
-        CVarSave();
-    }
-    // Horizontal Resolution, if visibility is enabled for it.
-    if (showHorizontalResField) {
-        // Only show the field if Aspect Ratio is being enforced.
-        if ((aspectRatioX > 0.0f) && (aspectRatioY > 0.0f)) {
-            // So basically we're "faking" this one by setting aspectRatioX instead.
-            if (ImGui::InputInt("Horiz. Pixel Count", &horizontalPixelCount, 8, 320)) {
-                item_aspectRatio = default_aspectRatio;
-                if (horizontalPixelCount < SCREEN_WIDTH) {
-                    horizontalPixelCount = SCREEN_WIDTH;
-                }
-                aspectRatioX = horizontalPixelCount;
-                aspectRatioY = verticalPixelCount;
-                update[UPDATE_aspectRatioX] = true;
-                update[UPDATE_aspectRatioY] = true;
-            }
-        } else { // Display a notice instead.
-            ImGui::TextColored(messageColor[MESSAGE_QUESTION],
-                                ICON_FA_QUESTION_CIRCLE " \"Force aspect ratio\" required.");
-            // ImGui::Text(" ");
-            ImGui::SameLine();
-            if (ImGui::Button("Click to resolve")) {
-                item_aspectRatio = default_aspectRatio; // Set it to Custom
-                aspectRatioX = aspectRatioPresetsX[2];  // but use the 4:3 defaults
-                aspectRatioY = aspectRatioPresetsY[2];
-                update[UPDATE_aspectRatioX] = true;
-                update[UPDATE_aspectRatioY] = true;
-                horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-            }
-        }
-    }
-    // Vertical Resolution part 2
-    if (ImGui::InputInt("Vertical Pixel Count", &verticalPixelCount, 8, 240)) {
-        item_pixelCount = default_pixelCount;
-        update[UPDATE_verticalPixelCount] = true;
-
-        // Account for the natural instinct to enter horizontal first.
-        // Ignore vertical resolutions that are below the lower clamp constant.
-        if (showHorizontalResField && !(verticalPixelCount < minVerticalPixelCount)) {
-            item_aspectRatio = default_aspectRatio;
-            aspectRatioX = horizontalPixelCount;
-            aspectRatioY = verticalPixelCount;
-            update[UPDATE_aspectRatioX] = true;
-            update[UPDATE_aspectRatioY] = true;
-        }
-    }
-    if (disabled_pixelCount || disabled_everything) { // Hide pixel count controls.
-        UIWidgets::ReEnableComponent("disabledTooltipText");
-    }
-
-    UIWidgets::Spacer(0);
-
-    // Integer scaling settings group (Pixel-perfect Mode)
-    static const ImGuiTreeNodeFlags IntegerScalingResolvedImGuiFlag =
-        CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ? ImGuiTreeNodeFlags_DefaultOpen
-                                                                    : ImGuiTreeNodeFlags_None;
-    if (ImGui::CollapsingHeader("Integer Scaling Settings", IntegerScalingResolvedImGuiFlag)) {
-        const bool disabled_pixelPerfectMode =
-            !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) || disabled_everything;
-        // Pixel-perfect Mode
-        UIWidgets::PaddedEnhancementCheckbox("Pixel-perfect Mode", CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", true,
-                                                true, disabled_pixelCount || disabled_everything, "",
-                                                UIWidgets::CheckboxGraphics::Cross, false);
-        UIWidgets::Tooltip("Don't scale image to fill window.");
-        if (disabled_pixelCount && CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0)) {
-            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0);
-            CVarSave();
-        }
-
-        // Integer Scaling
-        UIWidgets::EnhancementSliderInt(
-            "Integer scale factor: %d", "##ARSIntScale", CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor", 1,
-            max_integerScaleFactor, "%d", 1, true,
-            disabled_pixelPerfectMode || CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0));
-        UIWidgets::Tooltip("Integer scales the image. Only available in pixel-perfect mode.");
-        // Display warning if size is being clamped or if framebuffer is larger than viewport.
-        if (!disabled_pixelPerfectMode &&
-            (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds", 1) &&
-                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor", 1) > integerScale_maximumBounds)) {
-            ImGui::SameLine();
-            ImGui::TextColored(messageColor[MESSAGE_WARNING], ICON_FA_EXCLAMATION_TRIANGLE " Window exceeded.");
-        }
-
-        UIWidgets::PaddedEnhancementCheckbox(
-            "Automatically scale image to fit viewport", CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", true,
-            true, disabled_pixelPerfectMode, "", UIWidgets::CheckboxGraphics::Cross, false);
-        UIWidgets::Tooltip("Automatically sets scale factor to fit window. Only available in pixel-perfect mode.");
-        if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0)) {
-            // This is just here to update the value shown on the slider.
-            // The function in LUS to handle this setting will ignore IntegerScaleFactor while active.
-            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor", integerScale_maximumBounds);
-            // CVarSave();
-        }
-    } // End of integer scaling settings
-
-    UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-
-    // Collapsible panel for additional settings
-    if (ImGui::CollapsingHeader("Additional Settings")) {
-        UIWidgets::Spacer(0);
-
-#if defined(__SWITCH__) || defined(__WIIU__)
-        // Disable aspect correction, stretching the framebuffer to fill the viewport.
-        // This option is only really needed on systems limited to 16:9 TV resolutions, such as consoles.
-        // The associated cvar is still functional on PC platforms if you want to use it though.
-        UIWidgets::PaddedEnhancementCheckbox("Disable aspect correction and stretch the output image.\n"
-                                                "(Might be useful for 4:3 televisions!)\n"
-                                                "Not available in Pixel Perfect Mode.",
-                                                CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", false, true,
-                                                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ||
-                                                    disabled_everything,
-                                                "", UIWidgets::CheckboxGraphics::Cross, false);
-#else
-        if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0)) {
-            // This setting is intentionally not exposed on PC platforms,
-            // but may be accidentally activated for varying reasons.
-            // Having this button should hopefully prevent support headaches.
-            ImGui::TextColored(messageColor[MESSAGE_QUESTION], ICON_FA_QUESTION_CIRCLE
-                                " If the image is stretched and you don't know why, click this.");
-            if (ImGui::Button("Click to reenable aspect correction.")) {
-                CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0);
-                CVarSave();
-            }
-            UIWidgets::Spacer(2);
-        }
-#endif
-
-        // A requested addition; an alternative way of displaying the resolution field.
-        if (ImGui::Checkbox("Show a horizontal resolution field, instead of aspect ratio.", &showHorizontalResField)) {
-            if (!showHorizontalResField && (aspectRatioX > 0.0f)) { // when turning this setting off
-                // Refresh relevant values
-                aspectRatioX = aspectRatioY * horizontalPixelCount / verticalPixelCount;
-                horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-            } else { // when turning this setting on
-                item_aspectRatio = default_aspectRatio;
-                if (aspectRatioX > 0.0f) {
-                    // Refresh relevant values in the opposite order
-                    horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
-                    aspectRatioX = aspectRatioY * horizontalPixelCount / verticalPixelCount;
-                }
-            }
-            update[UPDATE_aspectRatioX] = true;
-        }
-                        
-        // Beginning of Integer Scaling additional settings.
-        {
-            // UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-                
-            // Integer Scaling - Never Exceed Bounds.
-            const bool disabled_neverExceedBounds =
-                !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ||
-                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0) || disabled_everything;
-            const bool checkbox_neverExceedBounds = 
-                UIWidgets::PaddedEnhancementCheckbox("Prevent integer scaling from exceeding screen bounds.\n"
-                                                        "(Makes screen bounds take priority over specified factor.)",
-                                                        CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds", 
-                                                        true, false, disabled_neverExceedBounds, "",
-                                                        UIWidgets::CheckboxGraphics::Cross, true);
-            UIWidgets::Tooltip(
-                "Prevents integer scaling factor from exceeding screen bounds.\n\n"
-                "Enabled: Will clamp the scaling factor and display a gentle warning in the resolution editor.\n"
-                "Disabled: Will allow scaling to exceed screen bounds, for users who want to crop overscan.\n\n"
-                " " ICON_FA_INFO_CIRCLE
-                " Please note that exceeding screen bounds may show a scroll bar on-screen.");
-
-            // Initialise the (currently unused) "Exceed Bounds By" cvar if it's been changed.
-            if (checkbox_neverExceedBounds &&
-                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
-                CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
-                CVarSave();
-            }
-
-            // Integer Scaling - Exceed Bounds By 1x/Offset.
-            // A popular feature in some retro frontends/upscalers, sometimes called "crop overscan" or "1080p 5x". 
-            /*
-            UIWidgets::PaddedEnhancementCheckbox("Allow integer scale factor to go +1 above maximum screen bounds.", CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", false, false, !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) || disabled_everything, "", UIWidgets::CheckboxGraphics::Cross, false);
-            */
-            // It does actually function as expected, but exceeding the bottom of the screen shows a scroll bar.
-            // I've ended up commenting this one out because of the scroll bar, and for simplicity.
-
-            // Display an info message about the scroll bar.
-            if (!CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds", 1) ||
-                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
-                if (disabled_neverExceedBounds) { // Dim this help text accordingly
-                    UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-                }
-                ImGui::TextColored(messageColor[MESSAGE_INFO],
-                                    " " ICON_FA_INFO_CIRCLE
-                                    " A scroll bar may become visible if screen bounds are exceeded.");
-                if (disabled_neverExceedBounds) { // Dim this help text accordingly
-                    UIWidgets::ReEnableComponent("disabledTooltipText");
-                }
-                    
-                // Another support helper button, to disable the unused "Exceed Bounds By" cvar.
-                // (Remove this button if uncommenting the checkbox.)
-                if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
-                    if (ImGui::Button("Click to reset a console variable that may be causing this.")) {
-                        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
-                        CVarSave();
-                    }
-                }
-            } else {
-                ImGui::Text(" ");
-            }
-            // UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-        } // End of Integer Scaling additional settings.
-
-    } // End of additional settings
-
-    // Clamp and update the cvars that don't use UIWidgets
-    if (update[UPDATE_aspectRatioX] || update[UPDATE_aspectRatioY] || update[UPDATE_verticalPixelCount]) {
-        if (update[UPDATE_aspectRatioX]) {
-            if (aspectRatioX < 0.0f) {
-                aspectRatioX = 0.0f;
-            }
-            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioX);
-        }
-        if (update[UPDATE_aspectRatioY]) {
-            if (aspectRatioY < 0.0f) {
-                aspectRatioY = 0.0f;
-            }
-            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioY);
-        }
-        if (update[UPDATE_verticalPixelCount]) {
-            // There's a upper and lower clamp on the Libultraship side too,
-            // so clamping it here is entirely visual, so the vertical resolution field reflects it.
-            if (verticalPixelCount < minVerticalPixelCount) {
-                verticalPixelCount = minVerticalPixelCount;
-            }
-            if (verticalPixelCount > maxVerticalPixelCount) {
-                verticalPixelCount = maxVerticalPixelCount;
-            }
-            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", verticalPixelCount);
-        }
-        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", item_aspectRatio);
-        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", item_pixelCount);
-        CVarSave();
-    }
-}
-
-void AdvancedResolutionSettingsWindow::UpdateElement() {
-}
-
-bool AdvancedResolutionSettingsWindow::IsDroppingFrames() {
-    // a rather imprecise way of checking for frame drops.
-    // but it's mostly there to inform the player of large drops.
-    const short targetFPS = CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20);
-    const float threshold = targetFPS / 20.0f + 4.1f;
-    return ImGui::GetIO().Framerate < targetFPS - threshold;
-}
-} // namespace AdvancedResolutionSettings
diff --git a/soh/soh/Enhancements/resolution-editor/ResolutionEditor.h b/soh/soh/Enhancements/resolution-editor/ResolutionEditor.h
deleted file mode 100644
index f759314511..0000000000
--- a/soh/soh/Enhancements/resolution-editor/ResolutionEditor.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <libultraship/libultraship.h>
-
-namespace AdvancedResolutionSettings {
-class AdvancedResolutionSettingsWindow : public Ship::GuiWindow {
-  private:
-    bool IsDroppingFrames();
-
-  public:
-    using GuiWindow::GuiWindow;
-
-    void InitElement() override;
-    void DrawElement() override;
-    void UpdateElement() override;
-};
-} // namespace AdvancedResolutionSettings
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
index 24294ea8f1..270bdef7df 100644
--- a/soh/soh/Enhancements/savestates.cpp
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -49,7 +49,7 @@ typedef struct SaveStateInfo {
     uint32_t rngSeed;
     int16_t blueWarpTimerCopy; /* From door_warp_1 */
 
-    SeqScriptState seqScriptStateCopy[4];// Unrelocated
+    SeqScriptState seqScriptStateCopy[4]; // Unrelocated
     ActiveSequence gActiveSeqsCopy[4];
 
     ActiveSound gActiveSoundsCopy[7][MAX_CHANNELS_PER_BANK];
@@ -63,13 +63,13 @@ typedef struct SaveStateInfo {
     void (*D_801755D0_copy)(void);
     MapMarkData** sLoadedMarkDataTableCopy;
 
-    //Static Data
+    // Static Data
 
-    //Camera data
+    // Camera data
     int32_t sInitRegs_copy;
     int32_t gDbgCamEnabled_copy;
     int32_t sDbgModeIdx_copy;
-    int16_t sNextUID_copy;             
+    int16_t sNextUID_copy;
     int32_t sCameraInterfaceFlags_copy;
     int32_t sCameraInterfaceAlpha_copy;
     int32_t sCameraShrinkWindowVal_copy;
@@ -92,10 +92,10 @@ typedef struct SaveStateInfo {
     f32 D_8015CE54_copy;
     CamColChk D_8015CE58_copy;
 
-    //Gameover
+    // Gameover
     uint16_t gGameOverTimer_copy;
 
-    //One point demo
+    // One point demo
     uint32_t sPrevFrameCs1100_copy;
     CutsceneCameraPoint D_8012013C_copy[14];
     CutsceneCameraPoint D_8012021C_copy[14];
@@ -135,8 +135,8 @@ typedef struct SaveStateInfo {
 
     uint16_t gTimeIncrement_copy;
 
-    //Overlay static data
-    //  z_bg_ddan_kd
+    // Overlay static data
+    //   z_bg_ddan_kd
     Vec3f sBgDdanKdVelocity_copy;
     Vec3f sBgDdanKdAccel_copy;
 
@@ -267,9 +267,8 @@ typedef struct SaveStateInfo {
     // z_en_heishi1
     uint32_t sHeishi1PlayerIsCaughtCopy;
 
-
-    //Misc static data
-    // z_map_exp
+    // Misc static data
+    //  z_map_exp
 
     s16 sPlayerInitialPosX_copy;
     s16 sPlayerInitialPosZ_copy;
@@ -327,7 +326,6 @@ typedef struct SaveStateInfo {
     s16 sMessageHasSetSfx_copy;
     u16 sOcarinaSongBitFlags_copy;
 
-
 } SaveStateInfo;
 
 class SaveState {
@@ -361,27 +359,29 @@ class SaveState {
 SaveStateMgr::SaveStateMgr() {
     this->SetCurrentSlot(0);
 }
-SaveStateMgr::~SaveStateMgr() { 
+SaveStateMgr::~SaveStateMgr() {
     this->states.clear();
 }
 
-SaveState::SaveState(std::shared_ptr<SaveStateMgr> mgr, unsigned int slot) : saveStateMgr(mgr), slot(slot), info(nullptr) {
+SaveState::SaveState(std::shared_ptr<SaveStateMgr> mgr, unsigned int slot)
+    : saveStateMgr(mgr), slot(slot), info(nullptr) {
     this->info = std::make_shared<SaveStateInfo>();
 }
 
 void SaveState::BackupSeqScriptState(void) {
     for (unsigned int i = 0; i < 4; i++) {
         info->seqScriptStateCopy[i].value = gAudioContext.seqPlayers[i].scriptState.value;
-        
+
         info->seqScriptStateCopy[i].remLoopIters[0] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[0];
         info->seqScriptStateCopy[i].remLoopIters[1] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[1];
         info->seqScriptStateCopy[i].remLoopIters[2] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[2];
         info->seqScriptStateCopy[i].remLoopIters[3] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[3];
-        
+
         info->seqScriptStateCopy[i].depth = gAudioContext.seqPlayers[i].scriptState.depth;
-        
-        info->seqScriptStateCopy[i].pc = (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.pc - (uintptr_t)gAudioHeap);
-        
+
+        info->seqScriptStateCopy[i].pc =
+            (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.pc - (uintptr_t)gAudioHeap);
+
         info->seqScriptStateCopy[i].stack[0] =
             (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.stack[0] - (uintptr_t)gAudioHeap);
         info->seqScriptStateCopy[i].stack[1] =
@@ -597,7 +597,7 @@ void SaveState::SaveOverlayStaticData(void) {
 
     info->D_80A7DEB0_copy = D_80A7DEB0;
     info->D_80A7DEB4_copy = D_80A7DEB4;
-    info->D_80A7DEB8_copy = D_80A7DEB8; 
+    info->D_80A7DEB8_copy = D_80A7DEB8;
     info->sRockRotSpeedX_copy = sRockRotSpeedX;
     info->sRockRotSpeedY_copy = sRockRotSpeedY;
     info->D_80AB85E0_copy = D_80AB85E0;
@@ -605,7 +605,8 @@ void SaveState::SaveOverlayStaticData(void) {
     info->sUpperRiverSpawned_copy = sUpperRiverSpawned;
     info->sEnPoFieldNumSpawned_copy = sEnPoFieldNumSpawned;
     memcpy(info->sEnPoFieldSpawnPositions_copy, sEnPoFieldSpawnPositions, sizeof(info->sEnPoFieldSpawnPositions_copy));
-    memcpy(info->sEnPoFieldSpawnSwitchFlags_copy, sEnPoFieldSpawnSwitchFlags, sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
+    memcpy(info->sEnPoFieldSpawnSwitchFlags_copy, sEnPoFieldSpawnSwitchFlags,
+           sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
 
     info->sTakaraIsInitialized_copy = sTakaraIsInitialized;
     info->D_80B41D90_copy = D_80B41D90;
@@ -619,9 +620,8 @@ void SaveState::SaveOverlayStaticData(void) {
     info->D_80B5A4BC_copy = D_80B5A4BC;
     info->sKankyoIsSpawned_copy = sKankyoIsSpawned;
     info->sTrailingFairies_copy = sTrailingFairies;
-    
-    info->sHeishi1PlayerIsCaughtCopy = sHeishi1PlayerIsCaught;
 
+    info->sHeishi1PlayerIsCaughtCopy = sHeishi1PlayerIsCaught;
 }
 
 void SaveState::LoadOverlayStaticData(void) {
@@ -677,7 +677,8 @@ void SaveState::LoadOverlayStaticData(void) {
     sUpperRiverSpawned = info->sUpperRiverSpawned_copy;
     sEnPoFieldNumSpawned = info->sEnPoFieldNumSpawned_copy;
     memcpy(sEnPoFieldSpawnPositions, info->sEnPoFieldSpawnPositions_copy, sizeof(info->sEnPoFieldSpawnPositions_copy));
-    memcpy(sEnPoFieldSpawnSwitchFlags, info->sEnPoFieldSpawnSwitchFlags_copy, sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
+    memcpy(sEnPoFieldSpawnSwitchFlags, info->sEnPoFieldSpawnSwitchFlags_copy,
+           sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
 
     sTakaraIsInitialized = info->sTakaraIsInitialized_copy;
     D_80B41D90 = info->D_80B41D90_copy;
@@ -721,7 +722,6 @@ void SaveState::SaveMiscCodeData(void) {
     info->sPlaybackNotePos_copy = sPlaybackNotePos;
     info->sStaffPlaybackPos_copy = sStaffPlaybackPos;
 
-
     info->sCurOcarinaBtnPress_copy = sCurOcarinaBtnPress;
     info->D_8016BA10_copy = D_8016BA10;
     info->sPrevOcarinaBtnPress_copy = sPrevOcarinaBtnPress;
@@ -743,7 +743,6 @@ void SaveState::SaveMiscCodeData(void) {
     info->sAudioMalonBgmDist_copy = sAudioMalonBgmDist;
     info->sDisplayedNoteValue_copy = sDisplayedNoteValue;
 
-
     info->sOcarinaNoteBufPos_copy = sOcarinaNoteBufPos;
     info->sOcarinaNoteBufLen_copy = sOcarinaNoteBufLen;
     memcpy(info->sOcarinaNoteBuf_copy, sOcarinaNoteBuf, sizeof(sOcarinaNoteBuf));
@@ -802,7 +801,7 @@ void SaveState::LoadMiscCodeData(void) {
     sAudioHasMalonBgm = info->sAudioHasMalonBgm_copy;
     sAudioMalonBgmDist = info->sAudioMalonBgmDist_copy;
     sDisplayedNoteValue = info->sDisplayedNoteValue_copy;
-    
+
     sOcarinaNoteBufPos = info->sOcarinaNoteBufPos_copy;
     sOcarinaNoteBufLen = info->sOcarinaNoteBufLen_copy;
     memcpy(sOcarinaNoteBuf, info->sOcarinaNoteBuf_copy, sizeof(sOcarinaNoteBuf));
@@ -814,8 +813,6 @@ void SaveState::LoadMiscCodeData(void) {
     sHasSunsSong = info->sHasSunsSong_copy;
     sMessageHasSetSfx = info->sMessageHasSetSfx_copy;
     sOcarinaSongBitFlags = info->sOcarinaSongBitFlags_copy;
-
-
 }
 
 extern "C" void ProcessSaveStateRequests(void) {
@@ -823,7 +820,8 @@ extern "C" void ProcessSaveStateRequests(void) {
 }
 
 void SaveStateMgr::SetCurrentSlot(unsigned int slot) {
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true, "slot %u set", slot);
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true,
+                                                                                                "slot %u set", slot);
     this->currentSlot = slot;
 }
 
@@ -834,25 +832,28 @@ unsigned int SaveStateMgr::GetCurrentSlot(void) {
 void SaveStateMgr::ProcessSaveStateRequests(void) {
     while (!this->requests.empty()) {
         const auto& request = this->requests.front();
-        
+
         switch (request.type) {
             case RequestType::SAVE:
                 if (!this->states.contains(request.slot)) {
-                    this->states[request.slot] = std::make_shared<SaveState>(OTRGlobals::Instance->gSaveStateMgr, request.slot);
+                    this->states[request.slot] =
+                        std::make_shared<SaveState>(OTRGlobals::Instance->gSaveStateMgr, request.slot);
                 }
                 this->states[request.slot]->Save();
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true, "saved state %u", request.slot);
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                    1.0f, true, "saved state %u", request.slot);
                 break;
             case RequestType::LOAD:
                 if (this->states.contains(request.slot)) {
                     this->states[request.slot]->Load();
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true, "loaded state %u", request.slot);
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                        1.0f, true, "loaded state %u", request.slot);
                 } else {
                     SPDLOG_ERROR("Invalid SaveState slot: {}", request.slot);
                 }
                 break;
-            [[unlikely]] default: 
-                SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
+                [[unlikely]] default
+                    : SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
                 break;
         }
         this->requests.pop();
@@ -862,11 +863,12 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
 SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
     if (gPlayState == nullptr) {
         SPDLOG_ERROR("[SOH] Can not save or load a state outside of \"GamePlay\"");
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true, "states not available here", request.slot);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+            1.0f, true, "states not available here", request.slot);
         return SaveStateReturn::FAIL_WRONG_GAMESTATE;
     }
 
-    switch (request.type) { 
+    switch (request.type) {
         case RequestType::SAVE:
             requests.push(request);
             return SaveStateReturn::SUCCESS;
@@ -876,11 +878,12 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
                 return SaveStateReturn::SUCCESS;
             } else {
                 SPDLOG_ERROR("Invalid SaveState slot: {}", request.slot);
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(1.0f, true, "state slot %u empty", request.slot);
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                    1.0f, true, "state slot %u empty", request.slot);
                 return SaveStateReturn::FAIL_INVALID_SLOT;
             }
-        [[unlikely]] default: 
-            SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
+            [[unlikely]] default
+                : SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
             return SaveStateReturn::FAIL_BAD_REQUEST;
     }
 }
@@ -896,16 +899,13 @@ void SaveState::Save(void) {
 
     memcpy(info->gActiveSoundsCopy, gActiveSounds, sizeof(gActiveSounds));
     memcpy(&info->gSoundBankMutedCopy, gSoundBankMuted, sizeof(info->gSoundBankMutedCopy));
-    
+
     info->D_801333F0_copy = D_801333F0;
     info->gAudioSfxSwapOff_copy = gAudioSfxSwapOff;
 
-    memcpy(&info->gAudioSfxSwapSource_copy, gAudioSfxSwapSource,
-           sizeof(info->gAudioSfxSwapSource_copy));
-    memcpy(&info->gAudioSfxSwapTarget_copy, gAudioSfxSwapTarget,
-           sizeof(info->gAudioSfxSwapTarget_copy));
-    memcpy(&info->gAudioSfxSwapMode_copy, gAudioSfxSwapMode, 
-        sizeof(info->gAudioSfxSwapMode_copy));
+    memcpy(&info->gAudioSfxSwapSource_copy, gAudioSfxSwapSource, sizeof(info->gAudioSfxSwapSource_copy));
+    memcpy(&info->gAudioSfxSwapTarget_copy, gAudioSfxSwapTarget, sizeof(info->gAudioSfxSwapTarget_copy));
+    memcpy(&info->gAudioSfxSwapMode_copy, gAudioSfxSwapMode, sizeof(info->gAudioSfxSwapMode_copy));
 
     info->D_801755D0_copy = D_801755D0;
 
@@ -915,13 +915,12 @@ void SaveState::Save(void) {
     memcpy(&info->mtxStackCopy, sMatrixStack, sizeof(MtxF) * 20);
     memcpy(&info->currentMtxCopy, sCurrentMatrix, sizeof(MtxF));
 
-    //Various static data
+    // Various static data
     info->blueWarpTimerCopy = sWarpTimerTarget;
     BackupCameraData();
     SaveOnePointDemoData();
     SaveOverlayStaticData();
     SaveMiscCodeData();
-
 }
 
 void SaveState::Load(void) {
@@ -945,18 +944,14 @@ void SaveState::Load(void) {
     D_801333F0 = info->D_801333F0_copy;
     gAudioSfxSwapOff = info->gAudioSfxSwapOff_copy;
 
-    memcpy(gAudioSfxSwapSource, &info->gAudioSfxSwapSource_copy,
-           sizeof(info->gAudioSfxSwapSource_copy));
-    memcpy(gAudioSfxSwapTarget, &info->gAudioSfxSwapTarget_copy,
-           sizeof(info->gAudioSfxSwapTarget_copy));
-    memcpy(gAudioSfxSwapMode, &info->gAudioSfxSwapMode_copy,
-           sizeof(info->gAudioSfxSwapMode_copy));
-    
-    //Various static data
+    memcpy(gAudioSfxSwapSource, &info->gAudioSfxSwapSource_copy, sizeof(info->gAudioSfxSwapSource_copy));
+    memcpy(gAudioSfxSwapTarget, &info->gAudioSfxSwapTarget_copy, sizeof(info->gAudioSfxSwapTarget_copy));
+    memcpy(gAudioSfxSwapMode, &info->gAudioSfxSwapMode_copy, sizeof(info->gAudioSfxSwapMode_copy));
+
+    // Various static data
     D_801755D0 = info->D_801755D0_copy;
     LoadCameraData();
     LoadOnePointDemoData();
     LoadOverlayStaticData();
     LoadMiscCodeData();
-
 }
diff --git a/soh/soh/Enhancements/savestates.h b/soh/soh/Enhancements/savestates.h
index 4ac142172a..4cf0353628 100644
--- a/soh/soh/Enhancements/savestates.h
+++ b/soh/soh/Enhancements/savestates.h
@@ -19,7 +19,7 @@ enum class SaveStateReturn {
 typedef struct SaveStateHeader {
     uint32_t stateMagic;
     uint32_t stateVersion;
-    //uint32_t gameVersion;
+    // uint32_t gameVersion;
 } SaveStateHeader;
 
 enum class RequestType {
@@ -36,26 +36,25 @@ class SaveState;
 
 class SaveStateMgr {
     friend class SaveState;
+
   private:
     unsigned int currentSlot;
     std::unordered_map<unsigned int, std::shared_ptr<SaveState>> states;
-    std::queue <SaveStateRequest> requests;
+    std::queue<SaveStateRequest> requests;
     std::mutex mutex;
-    
-  public:
 
+  public:
     SaveStateReturn AddRequest(const SaveStateRequest request);
     SaveStateMgr();
     ~SaveStateMgr();
 
     void SetCurrentSlot(unsigned int slot);
     unsigned int GetCurrentSlot(void);
-    
+
     SaveStateMgr& operator=(const SaveStateMgr& rhs) = delete;
     SaveStateMgr(const SaveStateMgr& rhs) = delete;
 
     void ProcessSaveStateRequests(void);
-    
 };
 extern std::shared_ptr<SaveStateMgr> gSaveStateMgr;
 
diff --git a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp
new file mode 100644
index 0000000000..f92959ff15
--- /dev/null
+++ b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp
@@ -0,0 +1,49 @@
+#include "ESpeakSpeechSynthesizer.h"
+#include <dlfcn.h>
+#include <libultraship/libultraship.h>
+
+ESpeakSpeechSynthesizer::ESpeakSpeechSynthesizer() {
+}
+
+bool ESpeakSpeechSynthesizer::DoInit() {
+    void* espeak = dlopen("libespeak-ng.so", RTLD_LAZY | RTLD_LOCAL);
+    if (espeak != NULL) {
+        this->Initialize = (speak_Initialize)dlsym(espeak, "espeak_Initialize");
+        this->SetVoiceByProperties = (speak_SetVoiceByProperties)dlsym(espeak, "espeak_SetVoiceByProperties");
+        this->Synth = (speak_Synth)dlsym(espeak, "espeak_Synth");
+        this->Terminate = (speak_Terminate)dlsym(espeak, "espeak_Terminate");
+        if (this->Initialize == NULL || this->SetVoiceByProperties == NULL || this->Synth == NULL ||
+            this->Terminate == NULL) {
+            lusprintf(__FILE__, __LINE__, 2, "Failed to load espeak-ng");
+            dlclose(espeak);
+            return false;
+        } else {
+            this->espeak = espeak;
+            return this->Initialize(AUDIO_OUTPUT_PLAYBACK, 100, NULL, 0) != -1;
+        }
+    }
+    return true;
+}
+
+void ESpeakSpeechSynthesizer::DoUninitialize() {
+    if (this->espeak != NULL) {
+        this->Terminate();
+        dlclose(this->espeak);
+        this->espeak = NULL;
+    }
+}
+
+void ESpeakSpeechSynthesizer::Speak(const char* text, const char* language) {
+    if (this->espeak == NULL) {
+        lusprintf(__FILE__, __LINE__, 2, "Spoken Text (%s): %s", language, text);
+    } else {
+        if (language != this->mLanguage) {
+            espeak_VOICE voice = { .languages = language };
+            if (this->SetVoiceByProperties(&voice)) {
+                return;
+            }
+            this->mLanguage = language;
+        }
+        this->Synth(text, 100, 0, POS_CHARACTER, 0, espeakCHARS_UTF8, NULL, NULL);
+    }
+}
diff --git a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.h
new file mode 100644
index 0000000000..0844b92935
--- /dev/null
+++ b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "SpeechSynthesizer.h"
+
+extern "C" {
+#include <espeak-ng/speak_lib.h>
+
+// C23 typeof could help here
+typedef ESPEAK_API int (*speak_Initialize)(espeak_AUDIO_OUTPUT output, int buflength, const char* path, int options);
+typedef ESPEAK_API espeak_ERROR (*speak_Terminate)(void);
+typedef ESPEAK_API espeak_ERROR (*speak_SetVoiceByProperties)(espeak_VOICE* voice_spec);
+typedef ESPEAK_API espeak_ERROR (*speak_Synth)(const void* text, size_t size, unsigned int position,
+                                               espeak_POSITION_TYPE position_type, unsigned int end_position,
+                                               unsigned int flags, unsigned int* unique_identifier, void* user_data);
+}
+
+class ESpeakSpeechSynthesizer : public SpeechSynthesizer {
+  public:
+    ESpeakSpeechSynthesizer();
+
+    void Speak(const char* text, const char* language);
+
+  protected:
+    bool DoInit(void);
+    void DoUninitialize(void);
+
+  private:
+    const char* mLanguage = NULL;
+    void* espeak = NULL;
+    speak_Initialize Initialize = NULL;
+    speak_SetVoiceByProperties SetVoiceByProperties = NULL;
+    speak_Synth Synth = NULL;
+    speak_Terminate Terminate = NULL;
+};
diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
index 29d209b5f8..e82da907f9 100644
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
@@ -35,6 +35,8 @@ class SpeechSynthesizer {
 #include "SAPISpeechSynthesizer.h"
 #elif defined(__APPLE__)
 #include "DarwinSpeechSynthesizer.h"
+#elif ESPEAK
+#include "ESpeakSpeechSynthesizer.h"
 #endif
 
 #include "SpeechLogger.h"
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index eee2a0e9bf..dd8185c1d0 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -13,18 +13,22 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h"
 #include "src/overlays/actors/ovl_En_Owl/z_en_owl.h"
 #include "src/overlays/actors/ovl_En_Go2/z_en_go2.h"
+#include "src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h"
 #include "src/overlays/actors/ovl_En_Ko/z_en_ko.h"
 #include "src/overlays/actors/ovl_En_Ma1/z_en_ma1.h"
 #include "src/overlays/actors/ovl_En_Ru2/z_en_ru2.h"
 #include "src/overlays/actors/ovl_En_Zl4/z_en_zl4.h"
 #include "src/overlays/actors/ovl_En_Box/z_en_box.h"
 #include "src/overlays/actors/ovl_Demo_Im/z_demo_im.h"
+#include "src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h"
 #include "src/overlays/actors/ovl_En_Sa/z_en_sa.h"
 #include "src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h"
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
 #include "src/overlays/actors/ovl_En_Fu/z_en_fu.h"
+#include "src/overlays/actors/ovl_En_Daiku/z_en_daiku.h"
 #include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
 #include "src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h"
+#include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h"
 #include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
@@ -42,9 +46,9 @@ extern void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* bgSpot03Taki, s32 buffe
 extern void EnGo2_CurledUp(EnGo2* enGo2, PlayState* play);
 
 extern void EnRu2_SetEncounterSwitchFlag(EnRu2* enRu2, PlayState* play);
-}
 
-#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).Get()
+extern void EnDaiku_EscapeSuccess(EnDaiku* enDaiku, PlayState* play);
+}
 
 void EnMa1_EndTeachSong(EnMa1* enMa1, PlayState* play) {
     if (Message_GetState(&gPlayState->msgCtx) == TEXT_STATE_CLOSING) {
@@ -75,7 +79,7 @@ void EnFu_EndTeachSong(EnFu* enFu, PlayState* play) {
 void EnDntDemo_JudgeSkipToReward(EnDntDemo* enDntDemo, PlayState* play) {
     // todo: figure out a better way to handle toggling so we don't
     //       need to double check cvars like this
-    if(!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
+    if (!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
         EnDntDemo_Judge(enDntDemo, play);
         return;
     }
@@ -135,7 +139,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
         case VB_PLAY_TRANSITION_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO) {
                 // Song of Time
-                if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE && gSaveContext.cutsceneIndex == 0xFFF7) {
+                if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE &&
+                    gSaveContext.cutsceneIndex == 0xFFF7) {
                     gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_16;
                     gSaveContext.cutsceneIndex = 0;
                     gSaveContext.nextTransitionType = 3;
@@ -143,7 +148,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                 }
 
                 // Requiem of Spirit
-                if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
+                if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE) &&
+                    !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
                     Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
                     // Normally happens in the cutscene
                     gSaveContext.dayTime = gSaveContext.skyboxTime = 0xAC60;
@@ -152,14 +158,13 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                     }
                     *should = false;
                 }
-                
-                u8 meetsBurningKakRequirements = 
-                    LINK_IS_ADULT &&
-                    gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE &&
-                    Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
-                    Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
-                    Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
-                    !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
+
+                u8 meetsBurningKakRequirements = LINK_IS_ADULT &&
+                                                 gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE &&
+                                                 Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
+                                                 Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
+                                                 Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
+                                                 !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
                 if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, meetsBurningKakRequirements)) {
                     Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
                     // Normally happens in the cutscene
@@ -176,8 +181,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                 u8 meetsLACSRequirements =
                     LINK_IS_ADULT &&
                     (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME) &&
-                    CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
-                    CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+                    CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
                     !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
                 if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, meetsLACSRequirements)) {
                     Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
@@ -209,10 +213,30 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             s32 entranceIndex = va_arg(args, s32);
 
             // Epona LLR fence jump cutscenes not skipped to allow the player and epona to load in the world correctly
-            // Nabooru fight cutscene is handled by boss intro skip instead (which deals with other flags needing to be set)
+            // Nabooru fight cutscene is handled by boss intro skip instead (which deals with other flags needing to be
+            // set)
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) &&
                 (entranceFlag != EVENTCHKINF_EPONA_OBTAINED) && entranceIndex != ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE) {
                 *should = false;
+
+                // Check for dispulsion of Ganon's Tower barrier
+                switch (entranceIndex) {
+                    case ENTR_INSIDE_GANONS_CASTLE_2:
+                    case ENTR_INSIDE_GANONS_CASTLE_3:
+                    case ENTR_INSIDE_GANONS_CASTLE_4:
+                    case ENTR_INSIDE_GANONS_CASTLE_5:
+                    case ENTR_INSIDE_GANONS_CASTLE_6:
+                    case ENTR_INSIDE_GANONS_CASTLE_7:
+                        if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) &&
+                            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) &&
+                            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) &&
+                            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) &&
+                            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) &&
+                            Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) {
+                            Flags_SetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER);
+                        }
+                        break;
+                }
             }
             break;
         }
@@ -271,7 +295,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                 }
                 switch (actor->id) {
                     case ACTOR_OBJ_SWITCH: {
-                        ObjSwitch *switchActor = (ObjSwitch*)actor;
+                        if ((actor->params == 8224 && gPlayState->sceneNum == SCENE_DODONGOS_CAVERN) ||
+                            (actor->params == 6979 && gPlayState->sceneNum == SCENE_WATER_TEMPLE) &&
+                                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
+                            break;
+                        }
+                        ObjSwitch* switchActor = (ObjSwitch*)actor;
                         switchActor->cooldownTimer = 0;
                         *should = false;
                         RateLimitedSuccessChime();
@@ -280,8 +309,10 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                     case ACTOR_BG_BDAN_SWITCH: {
                         // The switch in jabu that you are intended to press with a box to reach barinade
                         // can be skipped by either a frame perfect roll open or with OI
-                        // The One Point for that switch is used in common setups for the former and is required for the latter to work
-                        if (actor->params == 14848 && gPlayState->sceneNum == SCENE_JABU_JABU && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)){
+                        // The One Point for that switch is used in common setups for the former and is required for the
+                        // latter to work
+                        if (actor->params == 14848 && gPlayState->sceneNum == SCENE_JABU_JABU &&
+                            CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
                             break;
                         }
                         BgBdanSwitch* switchActor = (BgBdanSwitch*)actor;
@@ -343,17 +374,34 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             }
             break;
         }
+        case VB_FREEZE_LINK_FOR_FOREST_PILLARS:
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
+                *should = false;
+            }
+            break;
         case VB_SHOW_TITLE_CARD:
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO)) {
                 *should = false;
             }
             break;
         case VB_WONDER_TALK: {
-            //We want to show the frog hint if it is on, regardless of cutscene settings
+            // We want to show the frog hint if it is on, regardless of cutscene settings
             if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NPC) &&
                 !(gPlayState->sceneNum == SCENE_ZORAS_RIVER && IS_RANDO && RAND_GET_OPTION(RSK_FROGS_HINT))) {
                 *should = false;
             }
+
+            // If it's near a jailed carpenter, skip it along with introduction of Gerudo mini-boss
+            if (gPlayState->sceneNum == SCENE_THIEVES_HIDEOUT &&
+                CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO)) {
+                EnWonderTalk2* enWonderTalk = va_arg(args, EnWonderTalk2*);
+                EnDaiku* enDaiku =
+                    (EnDaiku*)Actor_FindNearby(gPlayState, &enWonderTalk->actor, ACTOR_EN_DAIKU, ACTORCAT_NPC, 999.0f);
+                if (enDaiku != NULL) {
+                    Flags_SetSwitch(gPlayState, enDaiku->startFightSwitchFlag);
+                    *should = false;
+                }
+            }
             break;
         }
         case VB_NAVI_TALK: {
@@ -371,6 +419,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             }
             break;
         }
+        case VB_END_GERUDO_MEMBERSHIP_TALK: {
+            if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NPC)) {
+                *should = true;
+            }
+            break;
+        }
         case VB_GORON_LINK_BE_SCARED: {
             if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NPC)) {
                 EnGo2* goronLink = va_arg(args, EnGo2*);
@@ -384,7 +438,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             break;
         }
         case VB_NOT_BE_GREETED_BY_SARIA:
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) && !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) &&
+                !Flags_GetInfTable(INFTABLE_GREETED_BY_SARIA)) {
                 Flags_SetInfTable(INFTABLE_GREETED_BY_SARIA);
                 *should = true;
             }
@@ -416,6 +471,26 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                 *should = false;
             }
             break;
+        case VB_PLAY_DISPEL_BARRIER_CS: {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
+                static s16 trialEntrances[] = {
+                    0,
+                    ENTR_INSIDE_GANONS_CASTLE_3,
+                    ENTR_INSIDE_GANONS_CASTLE_6,
+                    ENTR_INSIDE_GANONS_CASTLE_5,
+                    ENTR_INSIDE_GANONS_CASTLE_4,
+                    ENTR_INSIDE_GANONS_CASTLE_7,
+                    ENTR_INSIDE_GANONS_CASTLE_2,
+                };
+                RateLimitedSuccessChime();
+                DemoKekkai* kekkai = va_arg(args, DemoKekkai*);
+                gPlayState->nextEntranceIndex = trialEntrances[kekkai->actor.params];
+                gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+                gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
+                *should = false;
+            }
+            break;
+        }
         case VB_OWL_INTERACTION: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) && *should) {
                 EnOwl* enOwl = va_arg(args, EnOwl*);
@@ -467,42 +542,51 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
 
                 static uint32_t demoImUpdateHook = 0;
                 static uint32_t demoImKillHook = 0;
-                demoImUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* actorRef) mutable {
-                    Actor* actor = static_cast<Actor*>(actorRef);
-                    if (actor->id == ACTOR_DEMO_IM && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
-                        DemoIm* demoIm = static_cast<DemoIm*>(actorRef);
-                        Player* player = GET_PLAYER(gPlayState);
-                        player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
-                        player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM;
-
-                        if (Animation_OnFrame(&demoIm->skelAnime, 25.0f)) {
-                            Audio_PlaySoundGeneral(NA_SE_IT_DEKU, &demoIm->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(demoImUpdateHook);
-                            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(demoImKillHook);
-                            demoImUpdateHook = 0;
-                            demoImKillHook = 0;
-                        } else if (Animation_OnFrame(&demoIm->skelAnime, 15.0f)) {
+                demoImUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>(
+                    [](void* actorRef) mutable {
+                        Actor* actor = static_cast<Actor*>(actorRef);
+                        if (actor->id == ACTOR_DEMO_IM &&
+                            (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) ||
+                             IS_RANDO)) {
+                            DemoIm* demoIm = static_cast<DemoIm*>(actorRef);
                             Player* player = GET_PLAYER(gPlayState);
-                            // SOH [Randomizer] In entrance rando have impa bring link back to the front of castle grounds
-                            if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
-                                gPlayState->nextEntranceIndex = ENTR_CASTLE_GROUNDS_SOUTH_EXIT;
-                            } else {
-                                gPlayState->nextEntranceIndex = ENTR_HYRULE_FIELD_17;
+                            player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
+                            player->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM;
+
+                            if (Animation_OnFrame(&demoIm->skelAnime, 25.0f)) {
+                                Audio_PlaySoundGeneral(NA_SE_IT_DEKU, &demoIm->actor.projectedPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(
+                                    demoImUpdateHook);
+                                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(
+                                    demoImKillHook);
+                                demoImUpdateHook = 0;
+                                demoImKillHook = 0;
+                            } else if (Animation_OnFrame(&demoIm->skelAnime, 15.0f)) {
+                                Player* player = GET_PLAYER(gPlayState);
+                                // SOH [Randomizer] In entrance rando have impa bring link back to the front of castle
+                                // grounds
+                                if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
+                                    gPlayState->nextEntranceIndex = ENTR_CASTLE_GROUNDS_SOUTH_EXIT;
+                                } else {
+                                    gPlayState->nextEntranceIndex = ENTR_HYRULE_FIELD_17;
+                                }
+                                gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
+                                gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
+                                gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+                                gSaveContext.nextTransitionType = 2;
+                                Player_SetCsActionWithHaltedActors(gPlayState, &player->actor, 8);
                             }
-                            gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
-                            gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
-                            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
-                            gSaveContext.nextTransitionType = 2;
-                            Player_SetCsActionWithHaltedActors(gPlayState, &player->actor, 8);
                         }
-                    }
-                });
-                demoImKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(demoImUpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(demoImKillHook);
-                    demoImUpdateHook = 0;
-                    demoImKillHook = 0;
-                });
+                    });
+                demoImKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(
+                    [](int16_t sceneNum) mutable {
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(demoImUpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(demoImKillHook);
+                        demoImUpdateHook = 0;
+                        demoImKillHook = 0;
+                    });
                 *should = false;
             }
             break;
@@ -516,7 +600,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             break;
         }
         case VB_DESPAWN_HORSE_RACE_COW: {
-            if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && CVarGetInteger(CVAR_ENHANCEMENT("CowOfTime"), 0)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) &&
+                CVarGetInteger(CVAR_ENHANCEMENT("CowOfTime"), 0)) {
                 *should = false;
             }
             break;
@@ -551,6 +636,17 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             }
             break;
         }
+        case VB_PLAY_CARPENTER_FREE_CS: {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
+                EnDaiku* enDaiku = va_arg(args, EnDaiku*);
+                if (enDaiku->subCamActive) {
+                    enDaiku->subCamActive = false;
+                    EnDaiku_EscapeSuccess(enDaiku, gPlayState);
+                }
+                *should = false;
+            }
+            break;
+        }
         case VB_PLAY_GORON_FREE_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
@@ -604,14 +700,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             break;
         case VB_BE_VALID_GRAVEDIGGING_SPOT:
             if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
-                EnTk *enTk = va_arg(args, EnTk*);
+                EnTk* enTk = va_arg(args, EnTk*);
                 enTk->validDigHere = true;
                 *should = true;
             }
             break;
         case VB_BE_DAMPE_GRAVEDIGGING_GRAND_PRIZE:
             if (CVarGetInteger(CVAR_ENHANCEMENT("DampeWin"), 0)) {
-                EnTk *enTk = va_arg(args, EnTk*);
+                EnTk* enTk = va_arg(args, EnTk*);
                 enTk->currentReward = 3;
                 *should = true;
             }
@@ -624,7 +720,10 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
         case VB_FIX_SAW_SOFTLOCK:
             // Animation Count should be no more than 1 to guarantee putaway is complete after giving the saw
             // As this is vanilla behavior, it only applies with the Fix toggle or Skip Text enabled.
-            *should = (CVarGetInteger(CVAR_ENHANCEMENT("FixSawSoftlock"), 0) != 0 || CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0) ? gPlayState->animationCtx.animationCount > 1 : *should;
+            *should = (CVarGetInteger(CVAR_ENHANCEMENT("FixSawSoftlock"), 0) != 0 ||
+                       CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0)
+                          ? gPlayState->animationCtx.animationCount > 1
+                          : *should;
             break;
         case VB_BIGGORON_CONSIDER_SWORD_FORGED:
             *should = Environment_GetBgsDayCount() >= CVarGetInteger(CVAR_ENHANCEMENT("ForgeTime"), 3);
@@ -659,7 +758,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                 }
             }
 
-            if (flag != RAND_INF_MAX && (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
+            if (flag != RAND_INF_MAX &&
+                (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
                 if (IS_RANDO || *should) {
                     Flags_SetRandomizerInf(flag);
                     gSaveContext.healthAccumulator = 0x140;
@@ -670,6 +770,18 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
 
             break;
         }
+        case VB_PLAY_GATE_OPENING_OR_CLOSING_CS: {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
+                EnHeishi2* enHeishi2 = va_arg(args, EnHeishi2*);
+                enHeishi2->unk_2F2[0] = 0;
+
+                // The second argument determines whether the vanilla code should be run anyway. It
+                // should be set to `true` ONLY IF said code calls `Play_ClearCamera`, false otherwise.
+                bool clearCamera = (bool)va_arg(args, int);
+                *should = clearCamera && enHeishi2->cameraId != MAIN_CAM;
+            }
+            break;
+        }
         case VB_PLAY_RAINBOW_BRIDGE_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
                 *should = false;
@@ -720,8 +832,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                         pos.x = ik->actor.world.pos.x + Rand_CenteredFloat(120.0f);
                         pos.z = ik->actor.world.pos.z + Rand_CenteredFloat(120.0f);
                         pos.y = ik->actor.world.pos.y + 20.0f + Rand_CenteredFloat(120.0f);
-                        EffectSsDeadDb_Spawn(gPlayState, &pos, &sp7C, &sp7C, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9,
-                                             true);
+                        EffectSsDeadDb_Spawn(gPlayState, &pos, &sp7C, &sp7C, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1,
+                                             9, true);
                     }
                     Actor_Kill(&ik->actor);
                 }
@@ -739,7 +851,8 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
             break;
         }
         case VB_SKIP_SCARECROWS_SONG: {
-            if (gPlayState->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING && CVarGetInteger(CVAR_ENHANCEMENT("InstantScarecrow"), 0) && gSaveContext.scarecrowSpawnSongSet) {
+            if (gPlayState->msgCtx.msgMode == MSGMODE_OCARINA_PLAYING &&
+                CVarGetInteger(CVAR_ENHANCEMENT("InstantScarecrow"), 0) && gSaveContext.scarecrowSpawnSongSet) {
                 *should = true;
             }
             break;
@@ -765,173 +878,182 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
     Actor* actor = static_cast<Actor*>(actorRef);
 
     if (actor->id == ACTOR_EN_MA1 && gPlayState->sceneNum == SCENE_LON_LON_RANCH) {
-        enMa1UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_MA1 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
-                EnMa1* enMa1 = static_cast<EnMa1*>(innerActorRef);
-                if (enMa1->actionFunc == func_80AA106C) {
-                    enMa1->actionFunc = EnMa1_EndTeachSong;
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
-                    enMa1UpdateHook = 0;
-                    enMa1KillHook = 0;
-                // They've already learned the song
-                } else if (enMa1->actionFunc == func_80AA0D88) {
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
-                    enMa1UpdateHook = 0;
-                    enMa1KillHook = 0;
+        enMa1UpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+                Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                if (innerActor->id == ACTOR_EN_MA1 &&
+                    (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
+                    EnMa1* enMa1 = static_cast<EnMa1*>(innerActorRef);
+                    if (enMa1->actionFunc == func_80AA106C) {
+                        enMa1->actionFunc = EnMa1_EndTeachSong;
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+                        enMa1UpdateHook = 0;
+                        enMa1KillHook = 0;
+                        // They've already learned the song
+                    } else if (enMa1->actionFunc == func_80AA0D88) {
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+                        enMa1UpdateHook = 0;
+                        enMa1KillHook = 0;
+                    }
                 }
-            }
-        });
-        enMa1KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
-            enMa1UpdateHook = 0;
-            enMa1KillHook = 0;
-        });
+            });
+        enMa1KillHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enMa1UpdateHook);
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enMa1KillHook);
+                enMa1UpdateHook = 0;
+                enMa1KillHook = 0;
+            });
     }
 
     if (actor->id == ACTOR_EN_FU) {
-        enFuUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_FU && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
-                EnFu* enFu = static_cast<EnFu*>(innerActorRef);
-                if (enFu->actionFunc == EnFu_TeachSong) {
-                    enFu->actionFunc = EnFu_EndTeachSong;
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
-                    enFuUpdateHook = 0;
-                    enFuKillHook = 0;
+        enFuUpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+                Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                if (innerActor->id == ACTOR_EN_FU &&
+                    (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) || IS_RANDO)) {
+                    EnFu* enFu = static_cast<EnFu*>(innerActorRef);
+                    if (enFu->actionFunc == EnFu_TeachSong) {
+                        enFu->actionFunc = EnFu_EndTeachSong;
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
+                        enFuUpdateHook = 0;
+                        enFuKillHook = 0;
+                    }
                 }
-            }
-        });
-        enFuKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
-            enFuUpdateHook = 0;
-            enFuKillHook = 0;
-        });
+            });
+        enFuKillHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enFuUpdateHook);
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enFuKillHook);
+                enFuUpdateHook = 0;
+                enFuKillHook = 0;
+            });
     }
 
-    if (actor->id == ACTOR_EN_OWL && gPlayState->sceneNum == SCENE_ZORAS_RIVER && CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"), 0) == 2) {
+    if (actor->id == ACTOR_EN_OWL && gPlayState->sceneNum == SCENE_ZORAS_RIVER &&
+        CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"), 0) == 2) {
         Actor_Kill(actor);
     }
 
     if (actor->id == ACTOR_BG_SPOT02_OBJECTS && actor->params == 2) {
-        bgSpot02UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
-                BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
-                if (bgSpot02->actionFunc == func_808ACC34) {
-                    bgSpot02->actionFunc = func_808AC908;
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
-                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
-                    bgSpot02UpdateHook = 0;
-                    bgSpot02KillHook = 0;
+        bgSpot02UpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+                Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                if (innerActor->id == ACTOR_BG_SPOT02_OBJECTS && innerActor->params == 2 &&
+                    (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
+                    BgSpot02Objects* bgSpot02 = static_cast<BgSpot02Objects*>(innerActorRef);
+                    if (bgSpot02->actionFunc == func_808ACC34) {
+                        bgSpot02->actionFunc = func_808AC908;
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
+                        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
+                        bgSpot02UpdateHook = 0;
+                        bgSpot02KillHook = 0;
+                    }
                 }
-            }
-        });
-        bgSpot02KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
-            bgSpot02UpdateHook = 0;
-            bgSpot02KillHook = 0;
-        });
+            });
+        bgSpot02KillHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot02UpdateHook);
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot02KillHook);
+                bgSpot02UpdateHook = 0;
+                bgSpot02KillHook = 0;
+            });
     }
 
     if (actor->id == ACTOR_BG_SPOT03_TAKI) {
-        bgSpot03UpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
+        bgSpot03UpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+                Actor* innerActor = static_cast<Actor*>(innerActorRef);
 
-            if (innerActor->id != ACTOR_BG_SPOT03_TAKI) {
-                return;
-            }
+                if (innerActor->id != ACTOR_BG_SPOT03_TAKI) {
+                    return;
+                }
 
-            bool shouldKeepOpen;
-            switch (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"), 0)) {
-                case 1:
-                    shouldKeepOpen = Flags_GetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN);
-                    break;
-                case 2:
-                    if (IS_RANDO && RAND_GET_OPTION(RSK_SLEEPING_WATERFALL) == RO_WATERFALL_OPEN) {
-                        shouldKeepOpen = true;
-                    } else {
-                        shouldKeepOpen = CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) &&
-                                         (INV_CONTENT(ITEM_OCARINA_TIME) == ITEM_OCARINA_TIME ||
-                                          INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY);
-                    }
-                    break;
-                default:
-                    shouldKeepOpen = false;
-                    break;
-            }
+                bool shouldKeepOpen = RAND_GET_OPTION(RSK_SLEEPING_WATERFALL) && IS_RANDO;
+                if (!shouldKeepOpen) {
+                    int enhancement = CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"), 0);
+                    shouldKeepOpen =
+                        (enhancement == 2 &&
+                         ((CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) && (INV_CONTENT(ITEM_OCARINA_TIME) != ITEM_NONE)))) ||
+                        (enhancement == 1 && Flags_GetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN));
+                }
 
-            if (!shouldKeepOpen) {
-                return;
-            }
+                if (!shouldKeepOpen) {
+                    return;
+                }
 
-            BgSpot03Taki* bgSpot03 = static_cast<BgSpot03Taki*>(innerActorRef);
-            if (bgSpot03->actionFunc == BgSpot03Taki_HandleWaterfallState) {
-                bgSpot03->actionFunc = BgSpot03Taki_KeepOpen;
-                bgSpot03->state = WATERFALL_OPENED;
-                bgSpot03->openingAlpha = 0.0f;
-                Flags_SetSwitch(gPlayState, bgSpot03->switchFlag);
-                func_8003EBF8(gPlayState, &gPlayState->colCtx.dyna, bgSpot03->dyna.bgId);
-                BgSpot03Taki_ApplyOpeningAlpha(bgSpot03, 0);
-                BgSpot03Taki_ApplyOpeningAlpha(bgSpot03, 1);
+                BgSpot03Taki* bgSpot03 = static_cast<BgSpot03Taki*>(innerActorRef);
+                if (bgSpot03->actionFunc == BgSpot03Taki_HandleWaterfallState) {
+                    bgSpot03->actionFunc = BgSpot03Taki_KeepOpen;
+                    bgSpot03->state = WATERFALL_OPENED;
+                    bgSpot03->openingAlpha = 0.0f;
+                    Flags_SetSwitch(gPlayState, bgSpot03->switchFlag);
+                    func_8003EBF8(gPlayState, &gPlayState->colCtx.dyna, bgSpot03->dyna.bgId);
+                    BgSpot03Taki_ApplyOpeningAlpha(bgSpot03, 0);
+                    BgSpot03Taki_ApplyOpeningAlpha(bgSpot03, 1);
 
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot03UpdateHook);
+                    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot03KillHook);
+                    bgSpot03UpdateHook = 0;
+                    bgSpot03KillHook = 0;
+                }
+            });
+        bgSpot03KillHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
                 GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot03UpdateHook);
                 GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot03KillHook);
                 bgSpot03UpdateHook = 0;
                 bgSpot03KillHook = 0;
-            }
-        });
-        bgSpot03KillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(bgSpot03UpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(bgSpot03KillHook);
-            bgSpot03UpdateHook = 0;
-            bgSpot03KillHook = 0;
-        });
+            });
     }
 
-    if (actor->id == ACTOR_EN_DNT_DEMO && (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
+    if (actor->id == ACTOR_EN_DNT_DEMO &&
+        (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
         EnDntDemo* enDntDemo = static_cast<EnDntDemo*>(actorRef);
         enDntDemo->actionFunc = EnDntDemo_JudgeSkipToReward;
     }
 
     // Forest Temple entrance cutscene
-    // This is a bit of a hack, we can't effectively override the behavior of the torches 
+    // This is a bit of a hack, we can't effectively override the behavior of the torches
     // or poes from which the cutscene is triggered until we can have a "BeforeActorInit" hook.
     // So for now we're just going to set the flag before they get to the room the cutscene is in
-    if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B) && !Flags_GetSwitch(gPlayState, 0x1C)) {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
+    if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && actor->id == ACTOR_EN_ST && !Flags_GetSwitch(gPlayState, 0x1B) &&
+        !Flags_GetSwitch(gPlayState, 0x1C)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) &&
+            !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
             Flags_SetSwitch(gPlayState, 0x1B);
         }
     }
 
     // Forest Temple purple poe fight speedup
     if (actor->id == ACTOR_EN_PO_SISTERS && actor->params == 28) {
-        enPoSistersUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
-            Actor* innerActor = static_cast<Actor*>(innerActorRef);
-            if (innerActor->id == ACTOR_EN_PO_SISTERS && innerActor->params == 28 && (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
-                EnPoSisters* enPoSisters = static_cast<EnPoSisters*>(innerActorRef);
-                if (enPoSisters->actionFunc == func_80ADB338) {
-                    enPoSisters->unk_19C = 0;
+        enPoSistersUpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* innerActorRef) mutable {
+                Actor* innerActor = static_cast<Actor*>(innerActorRef);
+                if (innerActor->id == ACTOR_EN_PO_SISTERS && innerActor->params == 28 &&
+                    (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO))) {
+                    EnPoSisters* enPoSisters = static_cast<EnPoSisters*>(innerActorRef);
+                    if (enPoSisters->actionFunc == func_80ADB338) {
+                        enPoSisters->unk_19C = 0;
+                    }
                 }
-            }
-        });
-        enPoSistersKillHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enPoSistersUpdateHook);
-            GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enPoSistersKillHook);
-            enPoSistersUpdateHook = 0;
-            enPoSistersKillHook = 0;
-        });
+            });
+        enPoSistersKillHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) mutable {
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(enPoSistersUpdateHook);
+                GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(enPoSistersKillHook);
+                enPoSistersUpdateHook = 0;
+                enPoSistersKillHook = 0;
+            });
     }
 
     // Fire Temple Darunia cutscene
     if (actor->id == ACTOR_EN_DU && gPlayState->sceneNum == SCENE_FIRE_TEMPLE) {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) &&
+            !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)) {
             Flags_SetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE);
             Actor_Kill(actor);
         }
@@ -950,14 +1072,17 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
 void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
     switch (sceneNum) {
         case SCENE_HYRULE_CASTLE:
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
+                !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
                 Flags_SetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE);
                 Flags_SetInfTable(INFTABLE_MET_CHILD_MALON_AT_CASTLE_OR_MARKET);
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET);
             }
             break;
         case SCENE_LON_LON_RANCH:
-            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) && GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE))) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
+                GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE,
+                                      Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE))) {
                 Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_RANCH);
                 Flags_SetInfTable(INFTABLE_CHILD_MALON_SAID_EPONA_WAS_AFRAID_OF_YOU);
                 Flags_SetEventChkInf(EVENTCHKINF_INVITED_TO_SING_WITH_CHILD_MALON);
@@ -1034,6 +1159,11 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
 static GetItemEntry vanillaQueuedItemEntry = GET_ITEM_NONE;
 
 void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
+    // Do nothing when in a boss rush
+    if (IS_BOSS_RUSH) {
+        return;
+    }
+
     if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
         switch (flagType) {
             case FLAG_EVENT_CHECK_INF:
@@ -1106,12 +1236,18 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                 break;
             case FLAG_ITEM_GET_INF:
                 switch (flag) {
-                    case ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE:
-                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DEKU_STICK_CAPACITY_30).GetGIEntry_Copy();
+                    case ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE: {
+                        RandomizerGet stickUpgrade =
+                            CUR_UPG_VALUE(UPG_STICKS) == 2 ? RG_DEKU_STICK_CAPACITY_30 : RG_DEKU_STICK_CAPACITY_20;
+                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(stickUpgrade).GetGIEntry_Copy();
                         break;
-                    case ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE:
-                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_DEKU_NUT_CAPACITY_40).GetGIEntry_Copy();
+                    }
+                    case ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE: {
+                        RandomizerGet nutUpgrade =
+                            CUR_UPG_VALUE(UPG_NUTS) == 2 ? RG_DEKU_NUT_CAPACITY_40 : RG_DEKU_NUT_CAPACITY_30;
+                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(nutUpgrade).GetGIEntry_Copy();
                         break;
+                    }
                 }
                 break;
         }
@@ -1131,13 +1267,16 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
                         vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_BOLERO_OF_FIRE).GetGIEntry_Copy();
                         break;
                     case EVENTCHKINF_LEARNED_SERENADE_OF_WATER:
-                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_SERENADE_OF_WATER).GetGIEntry_Copy();
+                        vanillaQueuedItemEntry =
+                            Rando::StaticData::RetrieveItem(RG_SERENADE_OF_WATER).GetGIEntry_Copy();
                         break;
                     case EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT:
-                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_REQUIEM_OF_SPIRIT).GetGIEntry_Copy();
+                        vanillaQueuedItemEntry =
+                            Rando::StaticData::RetrieveItem(RG_REQUIEM_OF_SPIRIT).GetGIEntry_Copy();
                         break;
                     case EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL:
-                        vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_NOCTURNE_OF_SHADOW).GetGIEntry_Copy();
+                        vanillaQueuedItemEntry =
+                            Rando::StaticData::RetrieveItem(RG_NOCTURNE_OF_SHADOW).GetGIEntry_Copy();
                         break;
                     case EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT:
                         vanillaQueuedItemEntry = Rando::StaticData::RetrieveItem(RG_PRELUDE_OF_LIGHT).GetGIEntry_Copy();
@@ -1168,14 +1307,18 @@ void TimeSaverOnFlagSetHandler(int16_t flagType, int16_t flag) {
 }
 
 void TimeSaverOnPlayerUpdateHandler() {
-    if (vanillaQueuedItemEntry.itemId == ITEM_NONE) return;
+    if (vanillaQueuedItemEntry.itemId == ITEM_NONE)
+        return;
 
     Player* player = GET_PLAYER(gPlayState);
-    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) || player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM || player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
+    if (player == NULL || Player_InBlockingCsMode(gPlayState, player) ||
+        player->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || player->stateFlags1 & PLAYER_STATE1_GETTING_ITEM ||
+        player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
         return;
     }
 
-    SPDLOG_INFO("Attempting to give Item: mod {} item {}", vanillaQueuedItemEntry.modIndex, vanillaQueuedItemEntry.itemId);
+    SPDLOG_INFO("Attempting to give Item: mod {} item {}", vanillaQueuedItemEntry.modIndex,
+                vanillaQueuedItemEntry.itemId);
     GiveItemEntryWithoutActor(gPlayState, vanillaQueuedItemEntry);
     if (player->stateFlags1 & PLAYER_STATE1_IN_WATER) {
         // Allow the player to receive the item while swimming
@@ -1185,9 +1328,11 @@ void TimeSaverOnPlayerUpdateHandler() {
 }
 
 void TimeSaverOnItemReceiveHandler(GetItemEntry receivedItemEntry) {
-    if (vanillaQueuedItemEntry.itemId == ITEM_NONE) return;
+    if (vanillaQueuedItemEntry.itemId == ITEM_NONE)
+        return;
 
-    if (vanillaQueuedItemEntry.modIndex == receivedItemEntry.modIndex && vanillaQueuedItemEntry.itemId == receivedItemEntry.itemId) {
+    if (vanillaQueuedItemEntry.modIndex == receivedItemEntry.modIndex &&
+        vanillaQueuedItemEntry.itemId == receivedItemEntry.itemId) {
         SPDLOG_INFO("Item received: mod {} item {}", receivedItemEntry.modIndex, receivedItemEntry.itemId);
         vanillaQueuedItemEntry = GET_ITEM_NONE;
     }
@@ -1220,15 +1365,35 @@ void TimeSaverRegisterHooks() {
         onPlayerUpdateHook = 0;
         onItemReceiveHook = 0;
 
-        onSceneInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(TimeSaverOnSceneInitHandler);
-        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(TimeSaverOnVanillaBehaviorHandler);
-        onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(TimeSaverOnActorInitHandler);
-        onGameFrameUpdate = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(TimeSaverOnGameFrameUpdateHandler);
+        onSceneInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(TimeSaverOnSceneInitHandler);
+        onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>(
+            TimeSaverOnVanillaBehaviorHandler);
+        onActorInitHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(TimeSaverOnActorInitHandler);
+        onGameFrameUpdate = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(
+            TimeSaverOnGameFrameUpdateHandler);
 
-        if (IS_RANDO) return;
+        if (IS_RANDO)
+            return;
 
-        onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(TimeSaverOnFlagSetHandler);
-        onPlayerUpdateHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(TimeSaverOnPlayerUpdateHandler);
-        onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(TimeSaverOnItemReceiveHandler);
+        onFlagSetHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>(TimeSaverOnFlagSetHandler);
+        onPlayerUpdateHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerUpdate>(TimeSaverOnPlayerUpdateHandler);
+        onItemReceiveHook =
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>(TimeSaverOnItemReceiveHandler);
     });
 }
+
+void RegisterSkipWaterTempleGateDelay() {
+    COND_ID_HOOK(OnActorUpdate, ACTOR_BG_SPOT06_OBJECTS,
+                 CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), [](void* actor) {
+                     BgSpot06Objects* spot06 = static_cast<BgSpot06Objects*>(actor);
+                     if (spot06->dyna.actor.params == 0) {
+                         spot06->timer = 0;
+                     }
+                 })
+}
+
+static RegisterShipInitFunc skipWaterTempleGateDelay(RegisterSkipWaterTempleGateDelay);
diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
index de9e157c31..f08235970e 100644
--- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp
+++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
@@ -1,5 +1,4 @@
 #include "TimeSplits.h"
-#include "soh/SohGui/UIWidgets.hpp"
 #include "soh/Enhancements/gameplaystats.h"
 #include "soh/SaveManager.h"
 #include "soh/util.h"
@@ -14,12 +13,16 @@
 #include "soh/Enhancements/debugger/debugSaveEditor.h"
 #include "soh_assets.h"
 #include "assets/textures/parameter_static/parameter_static.h"
+#include <soh/SohGui/SohGui.hpp>
+#include "soh/SohGui/UIWidgets.hpp"
 
 extern "C" {
-    extern SaveContext gSaveContext;
-    extern PlayState* gPlayState;
+extern SaveContext gSaveContext;
+extern PlayState* gPlayState;
 }
 
+using namespace UIWidgets;
+
 // ImVec4 Colors
 #define COLOR_WHITE ImVec4(1.00f, 1.00f, 1.00f, 1.00f)
 #define COLOR_LIGHT_RED ImVec4(1.0f, 0.05f, 0.0f, 1.0f)
@@ -60,6 +63,7 @@ std::vector<SplitObject> splitList;
 std::vector<SplitObject> emptyList;
 
 std::vector<SplitObject> splitObjectList = {
+    // clang-format off
     { SPLIT_TYPE_ITEM,      ITEM_STICK,                           "Deku Stick",                       "ITEM_STICK",                   COLOR_WHITE },
     { SPLIT_TYPE_ITEM,      ITEM_NUT,                             "Deku Nut",                         "ITEM_NUT",                     COLOR_WHITE },
     { SPLIT_TYPE_ITEM,      ITEM_BOMB,                            "Bomb",                             "ITEM_BOMB",                    COLOR_WHITE },
@@ -202,9 +206,12 @@ std::vector<SplitObject> splitObjectList = {
     { SPLIT_TYPE_MISC,      SCENE_ZORAS_RIVER,                    "Lost Woods Escape",                "SPECIAL_SPLIT_ENTRANCE",       COLOR_WHITE },
     { SPLIT_TYPE_MISC,      SCENE_LOST_WOODS,                     "Forest Escape",                    "SPECIAL_SPLIT_ENTRANCE",       COLOR_WHITE },
     { SPLIT_TYPE_MISC,      SCENE_KAKARIKO_VILLAGE,               "Watchtower Death",                 "SPECIAL_SPLIT_ENTRANCE",       COLOR_WHITE },
+
+    // clang-format on
 };
 
 std::map<uint32_t, std::vector<uint32_t>> popupList = {
+    // clang-format off
     { ITEM_STICK,           { ITEM_STICK, ITEM_STICK_UPGRADE_20, ITEM_STICK_UPGRADE_30 } },
     { ITEM_NUT,             { ITEM_NUT, ITEM_NUT_UPGRADE_30, ITEM_NUT_UPGRADE_40 } },
     { ITEM_BOMB,            { ITEM_BOMB_BAG_20, ITEM_BOMB_BAG_30, ITEM_BOMB_BAG_40 } },
@@ -226,6 +233,8 @@ std::map<uint32_t, std::vector<uint32_t>> popupList = {
     { ITEM_WALLET_ADULT,    { ITEM_WALLET_ADULT, ITEM_WALLET_GIANT } },
     { ITEM_SINGLE_MAGIC,    { ITEM_SINGLE_MAGIC, ITEM_DOUBLE_MAGIC } },
     { ITEM_SKULL_TOKEN,     { } }
+
+    // clang-format on
 };
 
 std::string removeSpecialCharacters(const std::string& str) {
@@ -249,12 +258,7 @@ std::string formatTimestampTimeSplit(uint32_t value) {
 }
 
 nlohmann::json ImVec4_to_json(const ImVec4& vec) {
-    return nlohmann::json{
-        {"x", vec.x},
-        {"y", vec.y},
-        {"z", vec.z},
-        {"w", vec.w}
-    };
+    return nlohmann::json{ { "x", vec.x }, { "y", vec.y }, { "z", vec.z }, { "w", vec.w } };
 }
 
 ImVec4 json_to_ImVec4(const nlohmann::json& jsonVec) {
@@ -262,18 +266,16 @@ ImVec4 json_to_ImVec4(const nlohmann::json& jsonVec) {
 }
 
 nlohmann::json SplitObject_to_json(const SplitObject& split) {
-    return nlohmann::json{
-        {"splitType", split.splitType},
-        {"splitID", split.splitID},
-        {"splitName", split.splitName},
-        {"splitImage", split.splitImage},
-        {"splitTint", ImVec4_to_json(split.splitTint)},
-        {"splitTimeCurrent", split.splitTimeCurrent},
-        {"splitTimeBest", split.splitTimeBest},
-        {"splitTimePreviousBest", split.splitTimePreviousBest},
-        {"splitTimeStatus", SPLIT_STATUS_INACTIVE},
-        {"splitSkullTokenCount", split.splitSkullTokenCount}
-    };
+    return nlohmann::json{ { "splitType", split.splitType },
+                           { "splitID", split.splitID },
+                           { "splitName", split.splitName },
+                           { "splitImage", split.splitImage },
+                           { "splitTint", ImVec4_to_json(split.splitTint) },
+                           { "splitTimeCurrent", split.splitTimeCurrent },
+                           { "splitTimeBest", split.splitTimeBest },
+                           { "splitTimePreviousBest", split.splitTimePreviousBest },
+                           { "splitTimeStatus", SPLIT_STATUS_INACTIVE },
+                           { "splitSkullTokenCount", split.splitSkullTokenCount } };
 }
 
 SplitObject json_to_SplitObject(const nlohmann::json& jsonSplit) {
@@ -301,13 +303,13 @@ void TimeSplitsGetImageSize(uint32_t item) {
     }
 }
 
-void SplitsPushImageButtonStyle(){
+void SplitsPushImageButtonStyle() {
     ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
     ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.2f));
     ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 1.0f, 1.0f, 0.1f));
 }
 
-void SplitsPopImageButtonStyle(){
+void SplitsPopImageButtonStyle() {
     ImGui::PopStyleColor(3);
 }
 
@@ -321,13 +323,15 @@ void TimeSplitsUpdateSplitStatus() {
         index++;
     }
     for (size_t i = index; i < splitList.size(); i++) {
-        if (splitList[i].splitTimeStatus != SPLIT_STATUS_ACTIVE && splitList[i].splitTimeStatus != SPLIT_STATUS_COLLECTED) {
+        if (splitList[i].splitTimeStatus != SPLIT_STATUS_ACTIVE &&
+            splitList[i].splitTimeStatus != SPLIT_STATUS_COLLECTED) {
             splitList[i].splitTimeStatus = SPLIT_STATUS_INACTIVE;
         }
     }
 }
 
-void HandleDragAndDrop(std::vector<SplitObject>& objectList, int targetIndex, const std::string& itemName, ImGuiDragDropFlags flags = ImGuiDragDropFlags_None) {
+void HandleDragAndDrop(std::vector<SplitObject>& objectList, int targetIndex, const std::string& itemName,
+                       ImGuiDragDropFlags flags = ImGuiDragDropFlags_None) {
     if (ImGui::BeginDragDropSource(flags)) {
         ImGui::SetDragDropPayload("DragMove", &targetIndex, sizeof(uint32_t));
         ImGui::Text("Move %s", itemName.c_str());
@@ -433,8 +437,10 @@ void TimeSplitsPopUpContext() {
             ImGui::TableNextColumn();
             SplitsPushImageButtonStyle();
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 2.0f));
-            ImGui::ImageButton("QUEST_SKULL_TOKEN", Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("QUEST_SKULL_TOKEN"),
-                               ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0));
+            ImGui::ImageButton(
+                "QUEST_SKULL_TOKEN",
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("QUEST_SKULL_TOKEN"),
+                ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0));
             ImGui::PopStyleVar();
             ImGui::TableNextColumn();
             SplitsPopImageButtonStyle();
@@ -457,7 +463,8 @@ void TimeSplitsPopUpContext() {
 
             ImGui::PopItemWidth();
             if (ImGui::Button("Set Tokens")) {
-                auto findID = std::find_if(splitObjectList.begin(), splitObjectList.end(), [&](const SplitObject& obj) { return obj.splitID == ITEM_SKULL_TOKEN; });
+                auto findID = std::find_if(splitObjectList.begin(), splitObjectList.end(),
+                                           [&](const SplitObject& obj) { return obj.splitID == ITEM_SKULL_TOKEN; });
                 SplitObject& buildTokenObject = *findID;
                 std::string tokenStr = " (" + std::to_string(skullTokenCount) + ")";
                 buildTokenObject.splitName += tokenStr.c_str();
@@ -469,11 +476,12 @@ void TimeSplitsPopUpContext() {
                 popupID = -1;
             }
             ImGui::EndTable();
-        }  else {
+        } else {
             int rowIndex = 0;
             SplitsPushImageButtonStyle();
             for (auto item : popupList[popupID]) {
-                auto findID = std::find_if(splitObjectList.begin(), splitObjectList.end(), [&](const SplitObject& obj) { return obj.splitID == item; });
+                auto findID = std::find_if(splitObjectList.begin(), splitObjectList.end(),
+                                           [&](const SplitObject& obj) { return obj.splitID == item; });
                 if (findID == splitObjectList.end()) {
                     continue;
                 }
@@ -482,8 +490,10 @@ void TimeSplitsPopUpContext() {
                 ImGui::BeginGroup();
                 ImGui::PushID(popupObject.splitID);
                 ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 2.0f));
-                auto ret = ImGui::ImageButton(popupObject.splitImage.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(popupObject.splitImage),
-                                              ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), popupObject.splitTint);
+                auto ret = ImGui::ImageButton(
+                    popupObject.splitImage.c_str(),
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(popupObject.splitImage),
+                    ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), popupObject.splitTint);
                 ImGui::PopStyleVar();
                 if (ret) {
                     splitList.push_back(popupObject);
@@ -501,7 +511,7 @@ void TimeSplitsPopUpContext() {
                     if (popupID <= ITEM_SLINGSHOT && popupID != -1) {
                         ImVec2 imageMin = ImGui::GetItemRectMin();
                         ImVec2 imageMax = ImGui::GetItemRectMax();
-                        //ImVec2 imageSize = ImVec2(imageMax.x - imageMin.x, imageMax.y - imageMin.y); UNUSED
+                        // ImVec2 imageSize = ImVec2(imageMax.x - imageMin.x, imageMax.y - imageMin.y); UNUSED
                         ImVec2 textPos = ImVec2(imageMax.x - ImGui::CalcTextSize("00").x - 5,
                                                 imageMax.y - ImGui::CalcTextSize("00").y - 5);
 
@@ -565,12 +575,12 @@ void TimeSplitsItemSplitEvent(uint32_t type, u8 item) {
     }
     if (type == SPLIT_TYPE_ENTRANCE) {
         if ((item == SCENE_ZORAS_RIVER && gSaveContext.entranceIndex == ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT) ||
-            (item == SCENE_LOST_WOODS &&
-             (gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT || gSaveContext.entranceIndex == ENTR_LOST_WOODS_SOUTH_EXIT))) {
+            (item == SCENE_LOST_WOODS && (gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT ||
+                                          gSaveContext.entranceIndex == ENTR_LOST_WOODS_SOUTH_EXIT))) {
             type = SPLIT_TYPE_MISC;
         }
     }
-        
+
     for (auto& split : splitList) {
         if (split.splitType == type) {
             if (item == split.splitID) {
@@ -636,59 +646,66 @@ void TimeSplitsDrawSplitsList() {
     uint32_t dragIndex = 0;
     ImGui::BeginChild("SplitTable", ImVec2(0.0f, ImGui::GetWindowHeight() - 128.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(4, 0));
-    ImGui::BeginTable("Splits", 5, ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable);
-    ImGui::TableSetupColumn("Item Image", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 34.0f);
-    ImGui::TableSetupColumn("Item Name");
-    ImGui::TableSetupColumn("Current Time");
-    ImGui::TableSetupColumn("+/-");
-    ImGui::TableSetupColumn("Prev. Best");
-    ImGui::TableHeadersRow();
+    if (ImGui::BeginTable("Splits", 5, ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable)) {
+        ImGui::TableSetupColumn("Item Image", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel,
+                                34.0f);
+        ImGui::TableSetupColumn("Item Name");
+        ImGui::TableSetupColumn("Current Time");
+        ImGui::TableSetupColumn("+/-");
+        ImGui::TableSetupColumn("Prev. Best");
+        ImGui::TableHeadersRow();
 
+        SplitsPushImageButtonStyle();
+        for (auto& split : splitList) {
+            ImGui::TableNextColumn();
+            TimeSplitsSplitBestTimeDisplay(split);
 
-    SplitsPushImageButtonStyle();
-    for (auto& split : splitList) {
-        ImGui::TableNextColumn();
-        TimeSplitsSplitBestTimeDisplay(split);
-        
-        ImGui::PushID(split.splitID);
-        if (split.splitTimeStatus == SPLIT_STATUS_ACTIVE) {
-            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, IM_COL32(47, 79, 90, 255));
+            ImGui::PushID(split.splitID);
+            if (split.splitTimeStatus == SPLIT_STATUS_ACTIVE) {
+                ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, IM_COL32(47, 79, 90, 255));
+            }
+            TimeSplitsGetImageSize(split.splitID);
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
+            auto ret = ImGui::ImageButton(
+                split.splitImage.c_str(),
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(split.splitImage), imageSize,
+                ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), split.splitTint);
+            ImGui::PopStyleVar();
+            if (ret) {
+                TimeSplitsSkipSplit(dragIndex);
+            }
+            HandleDragAndDrop(splitList, dragIndex, split.splitName);
+            ImGui::TableNextColumn();
+            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 5.0f));
+            ImGui::AlignTextToFramePadding();
+            ImGui::TextWrapped("%s", split.splitName.c_str());
+            ImGui::TableNextColumn();
+            // Current Time
+            ImGui::Text("%s", (split.splitTimeStatus == SPLIT_STATUS_ACTIVE)
+                                  ? formatTimestampTimeSplit(GAMEPLAYSTAT_TOTAL_TIME).c_str()
+                              : (split.splitTimeStatus == SPLIT_STATUS_COLLECTED)
+                                  ? formatTimestampTimeSplit(split.splitTimeCurrent).c_str()
+                                  : "--:--:-");
+            ImGui::TableNextColumn();
+            // +/- Difference
+            ImGui::TextColored(splitTimeColor, "%s", formatTimestampTimeSplit(splitBestTimeDisplay).c_str());
+            ImGui::TableNextColumn();
+            // Previous Best
+            ImGui::Text("%s", (split.splitTimePreviousBest != 0)
+                                  ? formatTimestampTimeSplit(split.splitTimePreviousBest).c_str()
+                                  : "--:--:-");
+            ImGui::PopID();
+            ImGui::PopStyleVar(1);
+
+            dragIndex++;
         }
-        TimeSplitsGetImageSize(split.splitID);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-        auto ret = ImGui::ImageButton(split.splitImage.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(split.splitImage),
-                                      imageSize, ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), split.splitTint);
-        ImGui::PopStyleVar();
-        if (ret) {
-            TimeSplitsSkipSplit(dragIndex);
-        }
-        HandleDragAndDrop(splitList, dragIndex, split.splitName);
-        ImGui::TableNextColumn();
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 5.0f));
-        ImGui::AlignTextToFramePadding();
-        ImGui::TextWrapped("%s", split.splitName.c_str());
-        ImGui::TableNextColumn();
-        // Current Time
-        ImGui::Text("%s", (split.splitTimeStatus == SPLIT_STATUS_ACTIVE)
-            ? formatTimestampTimeSplit(GAMEPLAYSTAT_TOTAL_TIME).c_str() : (split.splitTimeStatus == SPLIT_STATUS_COLLECTED) 
-            ? formatTimestampTimeSplit(split.splitTimeCurrent).c_str() : "--:--:-");
-        ImGui::TableNextColumn();
-        // +/- Difference
-        ImGui::TextColored(splitTimeColor, "%s", formatTimestampTimeSplit(splitBestTimeDisplay).c_str());
-        ImGui::TableNextColumn();
-        // Previous Best
-        ImGui::Text("%s", (split.splitTimePreviousBest != 0) ? formatTimestampTimeSplit(split.splitTimePreviousBest).c_str() : "--:--:-");
-        ImGui::PopID();
-        ImGui::PopStyleVar(1);
+        SplitsPopImageButtonStyle();
 
-        dragIndex++;
+        TimeSplitsPostDragAndDrop();
+
+        ImGui::EndTable();
     }
-    SplitsPopImageButtonStyle();
-
-    TimeSplitsPostDragAndDrop();
-
-    ImGui::PopStyleVar(1);
-    ImGui::EndTable();
+    ImGui::PopStyleVar();
     ImGui::EndChild();
 }
 
@@ -714,12 +731,14 @@ void TimeSplitsDrawItemList(uint32_t type) {
     ImGui::BeginTable("Item List", tableSize);
     for (size_t i = 0; i < tableSize; i++) {
         if (i == 0) {
-            ImGui::TableSetupColumn("Item Image", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 39.0f);
+            ImGui::TableSetupColumn("Item Image",
+                                    ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 39.0f);
         } else {
             if (type > SPLIT_TYPE_QUEST) {
                 ImGui::TableSetupColumn("Item Name");
             } else {
-                ImGui::TableSetupColumn(std::to_string(i).c_str(), ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 39.0f);
+                ImGui::TableSetupColumn(std::to_string(i).c_str(),
+                                        ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHeaderLabel, 39.0f);
             }
         }
     }
@@ -731,8 +750,10 @@ void TimeSplitsDrawItemList(uint32_t type) {
             TimeSplitsGetImageSize(split.splitID);
             SplitsPushImageButtonStyle();
             ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-            auto ret = ImGui::ImageButton(split.splitImage.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(split.splitImage),
-                                          imageSize, ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), split.splitTint);
+            auto ret = ImGui::ImageButton(
+                split.splitImage.c_str(),
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(split.splitImage), imageSize,
+                ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), split.splitTint);
             ImGui::PopStyleVar();
             if (ret) {
                 if (popupList.contains(split.splitID) && (split.splitType < SPLIT_TYPE_BOSS)) {
@@ -740,7 +761,6 @@ void TimeSplitsDrawItemList(uint32_t type) {
                     ImGui::OpenPopup("TimeSplitsPopUp");
                 } else {
                     splitList.push_back(split);
-                    
 
                     if (splitList.size() == 1) {
                         splitList[0].splitTimeStatus = SPLIT_STATUS_ACTIVE;
@@ -753,7 +773,7 @@ void TimeSplitsDrawItemList(uint32_t type) {
 
             TimeSplitsPopUpContext();
             ImGui::PopID();
-            
+
             if (type > SPLIT_TYPE_QUEST) {
                 ImGui::TableNextColumn();
                 ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 7.0f));
@@ -761,7 +781,6 @@ void TimeSplitsDrawItemList(uint32_t type) {
                 ImGui::Text("%s", split.splitName.c_str());
                 ImGui::PopStyleVar(1);
             }
-            
         }
     }
     ImGui::EndTable();
@@ -769,7 +788,7 @@ void TimeSplitsDrawItemList(uint32_t type) {
 }
 
 void TimeSplitsUpdateWindowSize() {
-    timeSplitsWindowSize = CVarGetFloat(CVAR_ENHANCEMENT("TimeSplits.WindowSize"), 0);
+    timeSplitsWindowSize = CVarGetFloat(CVAR_ENHANCEMENT("TimeSplits.WindowScale"), 0);
     if (timeSplitsWindowSize < 1.0f) {
         timeSplitsWindowSize = 1.0f;
     }
@@ -777,24 +796,21 @@ void TimeSplitsUpdateWindowSize() {
 
 void TimeSplitsDrawOptionsMenu() {
     ImGui::SeparatorText("Window Options");
-    if (ImGui::ColorEdit4("Background Color", (float*)&windowColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel)) {
-        Color_RGBA8 color;
-        color.r = windowColor.x * 255.0;
-        color.g = windowColor.y * 255.0;
-        color.b = windowColor.z * 255.0;
-        color.a = windowColor.w * 255.0;
-        CVarSetColor("TimeSplits.WindowColor", color);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    ImGui::SameLine();
-    if (ImGui::Button("Reset")) {
-        windowColor = { 0.0f, 0.0f, 0.0f, 1.0f };
-        CVarSetColor("TimeSplits.WindowColor", {0, 0, 0, 1});
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+    Color_RGBA8 defaultColor = { 0, 0, 0, 255 };
+    if (CVarColorPicker("Background Color", CVAR_ENHANCEMENT("TimeSplits.WindowColor"), defaultColor, true, 0,
+                        THEME_COLOR)) {
+        windowColor = VecFromRGBA8(CVarGetColor(CVAR_ENHANCEMENT("TimeSplits.WindowColor.Value"), defaultColor));
     }
 
-    if (UIWidgets::PaddedEnhancementSliderFloat("Window Size: %.1fx", "##windowSize",
-        CVAR_ENHANCEMENT("TimeSplits.WindowSize"), 1.0f, 3.0f, "", 1.0f, false, true, true, false)) {
+    if (CVarSliderFloat("Window Scale", CVAR_ENHANCEMENT("TimeSplits.WindowScale"),
+                        FloatSliderOptions()
+                            .Min(1.0f)
+                            .Max(3.0f)
+                            .DefaultValue(1.0f)
+                            .Format("%.1fx")
+                            .Size({ 300.0f, 0.0f })
+                            .Step(0.1f)
+                            .Color(THEME_COLOR))) {
         TimeSplitsUpdateWindowSize();
     }
 
@@ -802,55 +818,44 @@ void TimeSplitsDrawOptionsMenu() {
 
     ImGui::Text("New List Name: ");
     ImGui::PushItemWidth(150.0f);
+    PushStyleInput(THEME_COLOR);
     ImGui::InputText("##listName", listNameBuf, 25);
+    PopStyleInput();
     ImGui::PopItemWidth();
     ImGui::SameLine();
-    if (ImGui::Button("Create List")) {
+    if (Button("Create List", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         TimeSplitsFileManagement(SPLIT_ACTION_SAVE, listNameBuf, splitList);
     }
     UIWidgets::PaddedSeparator();
 
     TimeSplitsFileManagement(SPLIT_ACTION_COLLECT, "", emptyList);
     static uint32_t selectedItem = 0;
-    static std::string listItem = keys[0];
     ImGui::Text("Select List to Load: ");
     ImGui::PushItemWidth(150.0f);
-    if (ImGui::BeginCombo("##listEntries", keys[selectedItem].c_str())) {
-        for (int i = 0; i < keys.size(); i++) {
-            bool isSelected = (selectedItem == i);
-            if (ImGui::Selectable(keys[i].c_str(), isSelected)) {
-                selectedItem = i;
-                listItem = keys[i].c_str();
-            }
-            if (isSelected) {
-                ImGui::SetItemDefaultFocus();
-            }
-        }
-        ImGui::EndCombo();
-    }
+    Combobox("", &selectedItem, keys, ComboboxOptions().Color(THEME_COLOR).LabelPosition(LabelPositions::Near));
     ImGui::PopItemWidth();
     ImGui::SameLine();
-    if (ImGui::Button("Load List")) {
+    if (Button("Load List", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         TimeSplitsFileManagement(SPLIT_ACTION_LOAD, keys[selectedItem].c_str(), emptyList);
     }
     ImGui::SameLine();
-    if (ImGui::Button("Save List")) {
+    if (Button("Save List", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         TimeSplitsFileManagement(SPLIT_ACTION_SAVE, keys[selectedItem].c_str(), splitList);
     }
     ImGui::SameLine();
-    if (ImGui::Button("Delete List")) {
+    if (Button("Delete List", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         TimeSplitsFileManagement(SPLIT_ACTION_DELETE, keys[selectedItem].c_str(), emptyList);
     }
-    UIWidgets::PaddedSeparator();
+    UIWidgets::Separator(true, true, ImGui::GetStyle().ItemSpacing.y, ImGui::GetStyle().ItemSpacing.y);
 
-    if (ImGui::Button("New Attempt")) {
+    if (Button("New Attempt", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         for (auto& data : splitList) {
             data.splitTimeStatus = SPLIT_STATUS_INACTIVE;
         }
         splitList[0].splitTimeStatus = SPLIT_STATUS_ACTIVE;
     }
     ImGui::SameLine();
-    if (ImGui::Button("Update Splits")) {
+    if (Button("Update Splits", ButtonOptions().Color(THEME_COLOR).Size(Sizes::Inline))) {
         TimeSplitsFileManagement(SPLIT_ACTION_UPDATE, keys[selectedItem].c_str(), splitList);
     }
 }
@@ -864,75 +869,82 @@ void TimeSplitsRemoveSplitEntry(uint32_t index) {
 
 void TimeSplitsDrawManageList() {
     uint32_t index = 0;
-    ImGui::BeginTable("List Management", 2, ImGuiTableFlags_BordersInnerV);
-    ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_WidthFixed, 60.0f);
-    ImGui::TableSetupColumn("Options", ImGuiTableColumnFlags_NoHeaderLabel);
+    ImGui::BeginChild("SplitTable", ImVec2(0.0f, ImGui::GetWindowHeight() - 128.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(4, 0));
+    if (ImGui::BeginTable("List Management", 2, ImGuiTableFlags_BordersInnerV)) {
+        ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_WidthFixed, 120.0f);
+        ImGui::TableSetupColumn("Options", ImGuiTableColumnFlags_NoHeaderLabel);
 
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.2f));
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 1.0f, 1.0f, 0.1f));
+        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
+        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.2f));
+        ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 1.0f, 1.0f, 0.1f));
 
-    ImGui::TableNextColumn();
-    ImGui::BeginTabBar("List Preview");
-    if (ImGui::BeginTabItem("Preview")) {
-        ImGui::BeginChild("PreviewChild");
-        for (auto& data : splitList) {
-            float availableWidth = ImGui::GetContentRegionAvail().x;
-            float imageWidth = 38.0f; // Width of your image button
-            float offsetX = (availableWidth - imageWidth) * 0.5f; // Centering offset
+        ImGui::TableNextColumn();
+        ImGui::BeginTabBar("List Preview");
+        if (ImGui::BeginTabItem("Preview")) {
+            ImGui::BeginChild("PreviewChild");
+            for (auto& data : splitList) {
+                float availableWidth = ImGui::GetContentRegionAvail().x;
+                float imageWidth = 38.0f;                             // Width of your image button
+                float offsetX = (availableWidth - imageWidth) * 0.5f; // Centering offset
 
-            if (offsetX > 0.0f) {
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + offsetX); // Apply the offset to center
+                if (offsetX > 0.0f) {
+                    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + offsetX); // Apply the offset to center
+                }
+                TimeSplitsGetImageSize(data.splitID);
+                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
+                auto ret = ImGui::ImageButton(
+                    data.splitImage.c_str(),
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(data.splitImage), imageSize,
+                    ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), data.splitTint);
+                ImGui::PopStyleVar();
+                if (ret) {
+                    removeIndex = index;
+                }
+                HandleDragAndDrop(splitList, index, splitList[index].splitName);
+                index++;
             }
-            TimeSplitsGetImageSize(data.splitID);
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(imagePadding, imagePadding));
-            auto ret = ImGui::ImageButton(data.splitImage.c_str(), Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(data.splitImage),
-                                          imageSize, ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), data.splitTint);
-            ImGui::PopStyleVar();
-            if (ret) {
-                removeIndex = index;
-            }
-            HandleDragAndDrop(splitList, index, splitList[index].splitName);
-            index++;
+            TimeSplitsRemoveSplitEntry(removeIndex);
+            ImGui::EndChild();
+            ImGui::EndTabItem();
         }
-        TimeSplitsRemoveSplitEntry(removeIndex);
-        ImGui::EndChild();
-        ImGui::EndTabItem();
-    }
-    ImGui::EndTabBar();
-    
-    ImGui::PopStyleColor(3);
-    ImGui::TableNextColumn();
-    ImGui::BeginTabBar("List Options");
-    if (ImGui::BeginTabItem("Equipment")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_EQUIPMENT);
-        ImGui::EndTabItem();
-    }
-    if (ImGui::BeginTabItem("Inventory")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_ITEM);
-        ImGui::EndTabItem();
-    }
-    if (ImGui::BeginTabItem("Quest")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_QUEST);
-        ImGui::EndTabItem();
-    }
-    if (ImGui::BeginTabItem("Entrances")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_ENTRANCE);
-        ImGui::EndTabItem();
-    }
-    if (ImGui::BeginTabItem("Bosses")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_BOSS);
-        ImGui::EndTabItem();
-    }
-    if (ImGui::BeginTabItem("Miscellaneous")) {
-        TimeSplitsDrawItemList(SPLIT_TYPE_MISC);
-        ImGui::EndTabItem();
-    }
+        ImGui::EndTabBar();
 
-    TimeSplitsPostDragAndDrop();
+        ImGui::PopStyleColor(3);
+        ImGui::TableNextColumn();
+        ImGui::BeginTabBar("List Options");
+        if (ImGui::BeginTabItem("Equipment")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_EQUIPMENT);
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Inventory")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_ITEM);
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Quest")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_QUEST);
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Entrances")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_ENTRANCE);
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Bosses")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_BOSS);
+            ImGui::EndTabItem();
+        }
+        if (ImGui::BeginTabItem("Miscellaneous")) {
+            TimeSplitsDrawItemList(SPLIT_TYPE_MISC);
+            ImGui::EndTabItem();
+        }
 
-    ImGui::EndTabBar();
-    ImGui::EndTable();
+        TimeSplitsPostDragAndDrop();
+
+        ImGui::EndTabBar();
+        ImGui::EndTable();
+    }
+    ImGui::PopStyleVar();
+    ImGui::EndChild();
 }
 
 void InitializeSplitDataFile() {
@@ -954,14 +966,8 @@ static bool initialized = false;
 
 void TimeSplitWindow::DrawElement() {
     ImGui::SetWindowFontScale(timeSplitsWindowSize);
-    if (!initialized) {
-        Color_RGBA8 defaultColour = {0, 0, 0, 255};
-        Color_RGBA8 color = CVarGetColor("TimeSplits.WindowColor", defaultColour);
-        windowColor = {(float)color.r / 255.0f, (float)color.g / 255.0f, (float)color.b / 255.0f, (float)color.a / 255.0f};
-        InitializeSplitDataFile();
-        initialized = true;
-    }
-    
+
+    PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("Split Tabs")) {
         if (ImGui::BeginTabItem("Splits")) {
             TimeSplitsDrawSplitsList();
@@ -977,14 +983,20 @@ void TimeSplitWindow::DrawElement() {
         }
         ImGui::EndTabBar();
     }
+    PopStyleTabs();
 }
 
 void TimeSplitWindow::InitElement() {
     TimeSplitsUpdateWindowSize();
 
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("SPECIAL_TRIFORCE_PIECE_WHITE", gWTriforcePieceTex, ImVec4(1, 1, 1, 1));
-    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("SPECIAL_SPLIT_ENTRANCE", gSplitEntranceTex, ImVec4(1, 1, 1, 1));
-    
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("SPECIAL_TRIFORCE_PIECE_WHITE",
+                                                                        gWTriforcePieceTex, ImVec4(1, 1, 1, 1));
+    Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("SPECIAL_SPLIT_ENTRANCE", gSplitEntranceTex,
+                                                                        ImVec4(1, 1, 1, 1));
+    Color_RGBA8 defaultColour = { 0, 0, 0, 255 };
+    windowColor = VecFromRGBA8(CVarGetColor(CVAR_ENHANCEMENT("TimeSplits.WindowColor.Value"), defaultColour));
+    InitializeSplitDataFile();
+
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTimestamp>([](u8 item) {
         if (item != ITEM_SKULL_TOKEN) {
             uint32_t tempType = SPLIT_TYPE_ITEM;
@@ -1000,8 +1012,8 @@ void TimeSplitWindow::InitElement() {
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>([](GetItemEntry itemEntry) {
         GetItemEntry testItem = itemEntry;
-        if (itemEntry.itemId == ITEM_SKULL_TOKEN || itemEntry.itemId == ITEM_BOTTLE || itemEntry.itemId == ITEM_POE 
-            || itemEntry.itemId == ITEM_BIG_POE) {
+        if (itemEntry.itemId == ITEM_SKULL_TOKEN || itemEntry.itemId == ITEM_BOTTLE || itemEntry.itemId == ITEM_POE ||
+            itemEntry.itemId == ITEM_BIG_POE) {
             uint32_t tempType = SPLIT_TYPE_ITEM;
             for (auto& data : splitList) {
                 if (data.splitID == itemEntry.itemId) {
@@ -1013,9 +1025,8 @@ void TimeSplitWindow::InitElement() {
         }
     });
 
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerBottleUpdate>([](int16_t contents) {
-        TimeSplitsItemSplitEvent(SPLIT_TYPE_UPGRADE, contents);
-    });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPlayerBottleUpdate>(
+        [](int16_t contents) { TimeSplitsItemSplitEvent(SPLIT_TYPE_UPGRADE, contents); });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnBossDefeat>([](void* refActor) {
         Actor* bossActor = (Actor*)refActor;
diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.h b/soh/soh/Enhancements/timesplits/TimeSplits.h
index ba5f9cb808..8644d6010b 100644
--- a/soh/soh/Enhancements/timesplits/TimeSplits.h
+++ b/soh/soh/Enhancements/timesplits/TimeSplits.h
@@ -17,7 +17,7 @@ extern "C" {
 #include <libultraship/libultraship.h>
 
 #ifdef __cplusplus
-class TimeSplitWindow : public Ship::GuiWindow {
+class TimeSplitWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -39,7 +39,7 @@ typedef enum SplitStatus {
     SPLIT_STATUS_ACTIVE,
     SPLIT_STATUS_INACTIVE,
     SPLIT_STATUS_COLLECTED,
-    SPLIT_STATUS_SKIPPED
+    SPLIT_STATUS_SKIPPED,
 } SplitStatus;
 
 typedef enum SplitType {
diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp
index 9d58e2d62c..13dd9f183a 100644
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@@ -12,6 +12,7 @@
 #include "message_data_static.h"
 #include "overlays/gamestates/ovl_file_choose/file_choose.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/Enhancements/FileSelectEnhancements.h"
 #include "soh/resource/type/SohResourceType.h"
 
 extern "C" {
@@ -42,10 +43,10 @@ std::string GetParameritizedText(std::string key, TextBank bank, const char* arg
         }
         case TEXT_BANK_MISC: {
             auto value = miscMap[key].get<std::string>();
-            
+
             std::string searchString = "$0";
             size_t index = value.find(searchString);
-            
+
             if (index != std::string::npos) {
                 assert(arg != nullptr);
                 value.replace(index, searchString.size(), std::string(arg));
@@ -53,15 +54,15 @@ std::string GetParameritizedText(std::string key, TextBank bank, const char* arg
             } else {
                 return value;
             }
-            
+
             break;
         }
         case TEXT_BANK_KALEIDO: {
             auto value = kaleidoMap[key].get<std::string>();
-            
+
             std::string searchString = "$0";
             size_t index = value.find(searchString);
-            
+
             if (index != std::string::npos) {
                 assert(arg != nullptr);
                 value.replace(index, searchString.size(), std::string(arg));
@@ -69,7 +70,7 @@ std::string GetParameritizedText(std::string key, TextBank bank, const char* arg
             } else {
                 return value;
             }
-            
+
             break;
         }
         case TEXT_BANK_FILECHOOSE: {
@@ -95,12 +96,10 @@ const char* GetLanguageCode() {
     switch (CVarGetInteger(CVAR_SETTING("Languages"), 0)) {
         case LANGUAGE_FRA:
             return "fr-FR";
-            break;
         case LANGUAGE_GER:
             return "de-DE";
-            break;
     }
-    
+
     return "en-US";
 }
 
@@ -116,16 +115,18 @@ static std::string titleCardText;
 
 void RegisterOnSceneInitHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>([](int16_t sceneNum) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         titleCardText = NameForSceneId(sceneNum);
     });
 }
 
 void RegisterOnPresentTitleCardHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPresentTitleCard>([]() {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         SpeechSynthesizer::Instance->Speak(titleCardText.c_str(), GetLanguageCode());
     });
 }
@@ -134,66 +135,68 @@ void RegisterOnPresentTitleCardHook() {
 
 void RegisterOnInterfaceUpdateHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnInterfaceUpdate>([]() {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         static uint32_t prevTimer = 0;
         static char ttsAnnounceBuf[32];
-        
+
         uint32_t timer = 0;
-        if (gSaveContext.timer1State != 0) {
-            timer = gSaveContext.timer1Value;
-        } else if (gSaveContext.timer2State != 0) {
-            timer = gSaveContext.timer2Value;
+        if (gSaveContext.timerState != 0) {
+            timer = gSaveContext.timerSeconds;
+        } else if (gSaveContext.subTimerState != 0) {
+            timer = gSaveContext.subTimerSeconds;
         }
-        
-        if (timer > 0) {
-            if (timer > prevTimer || (timer % 30 == 0 && prevTimer != timer)) {
-                uint32_t minutes = timer / 60;
-                uint32_t seconds = timer % 60;
-                char* announceBuf = ttsAnnounceBuf;
-                char arg[8]; // at least big enough where no s8 string will overflow
-                if (minutes > 0) {
-                    snprintf(arg, sizeof(arg), "%d", minutes);
-                    auto translation = GetParameritizedText((minutes > 1) ? "minutes_plural" : "minutes_singular", TEXT_BANK_MISC, arg);
-                    announceBuf += snprintf(announceBuf, sizeof(ttsAnnounceBuf), "%s ", translation.c_str());
-                }
-                if (seconds > 0) {
-                    snprintf(arg, sizeof(arg), "%d", seconds);
-                    auto translation = GetParameritizedText((seconds > 1) ? "seconds_plural" : "seconds_singular", TEXT_BANK_MISC, arg);
-                    announceBuf += snprintf(announceBuf, sizeof(ttsAnnounceBuf), "%s", translation.c_str());
-                }
-                assert(announceBuf < ttsAnnounceBuf + sizeof(ttsAnnounceBuf));
-                SpeechSynthesizer::Instance->Speak(ttsAnnounceBuf, GetLanguageCode());
-                prevTimer = timer;
+
+        if (timer > 0 && timer % (timer < 60 ? 10 : 30) == 0 && timer != prevTimer) {
+            uint32_t minutes = timer / 60;
+            uint32_t seconds = timer % 60;
+            char* announceBuf = ttsAnnounceBuf;
+            char arg[8]; // at least big enough where no s8 string will overflow
+            if (minutes > 0) {
+                snprintf(arg, sizeof(arg), "%d", minutes);
+                auto translation =
+                    GetParameritizedText((minutes > 1) ? "minutes_plural" : "minutes_singular", TEXT_BANK_MISC, arg);
+                announceBuf += snprintf(announceBuf, sizeof(ttsAnnounceBuf), "%s ", translation.c_str());
             }
+            if (seconds > 0) {
+                snprintf(arg, sizeof(arg), "%d", seconds);
+                auto translation =
+                    GetParameritizedText((seconds > 1) ? "seconds_plural" : "seconds_singular", TEXT_BANK_MISC, arg);
+                announceBuf += snprintf(announceBuf, sizeof(ttsAnnounceBuf), "%s", translation.c_str());
+            }
+            assert(announceBuf < ttsAnnounceBuf + sizeof(ttsAnnounceBuf));
+            SpeechSynthesizer::Instance->Speak(ttsAnnounceBuf, GetLanguageCode());
         }
-        
+
         prevTimer = timer;
-        
-        if (!GameInteractor::IsSaveLoaded(true)) return;
-        
+
+        if (!GameInteractor::IsSaveLoaded(true))
+            return;
+
         static int16_t lostHealth = 0;
         static int16_t prevHealth = 0;
-        
+
         if (gSaveContext.health - prevHealth < 0) {
             lostHealth += prevHealth - gSaveContext.health;
         }
-        
+
         if (gPlayState->state.frames % 7 == 0) {
             if (lostHealth >= 16) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 lostHealth -= 16;
             }
         }
-        
+
         prevHealth = gSaveContext.health;
     });
 }
 
-
 void RegisterOnKaleidoscopeUpdateHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoscopeUpdate>([](int16_t inDungeonScene) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
 
         static int16_t prevCursorIndex = 0;
         static uint16_t prevCursorSpecialPos = 0;
@@ -210,7 +213,8 @@ void RegisterOnKaleidoscopeUpdateHook() {
             if (pauseCtx->unk_1EC == 1) {
                 // prompt
                 if (prevPromptChoice != pauseCtx->promptChoice) {
-                    auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
+                    auto prompt =
+                        GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
                     if (prevPromptChoice == -1) {
                         auto translation = GetParameritizedText("save_prompt", TEXT_BANK_KALEIDO, nullptr);
                         SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode());
@@ -250,10 +254,12 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 // Prompt for save
                 case 0xE: {
                     if (prevPromptChoice != pauseCtx->promptChoice) {
-                        auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
+                        auto prompt =
+                            GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
                         if (prevPromptChoice == -1) {
                             auto translation = GetParameritizedText("save_prompt", TEXT_BANK_KALEIDO, nullptr);
-                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode());
+                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(),
+                                                               GetLanguageCode());
                         } else {
                             SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode());
                         }
@@ -274,10 +280,12 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 // Prompt to continue playing
                 case 0x10: {
                     if (prevPromptChoice != pauseCtx->promptChoice) {
-                        auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
+                        auto prompt =
+                            GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
                         if (prevPromptChoice == -1) {
                             auto translation = GetParameritizedText("continue_game", TEXT_BANK_KALEIDO, nullptr);
-                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode());
+                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(),
+                                                               GetLanguageCode());
                         } else {
                             SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode());
                         }
@@ -366,37 +374,31 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 auto translation = GetParameritizedText("rupees", TEXT_BANK_KALEIDO, arg);
                 SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
             } else if (CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)) {
-                //TODO: announce timer?
+                // TODO: announce timer?
             }
         }
-        
-        uint16_t cursorIndex = (pauseCtx->pageIndex == PAUSE_MAP && !inDungeonScene) ? PAUSE_WORLD_MAP : pauseCtx->pageIndex;
-        if (prevCursorIndex == cursorIndex &&
-            prevCursorSpecialPos == pauseCtx->cursorSpecialPos &&
+
+        uint16_t cursorIndex =
+            (pauseCtx->pageIndex == PAUSE_MAP && !inDungeonScene) ? PAUSE_WORLD_MAP : pauseCtx->pageIndex;
+        if (prevCursorIndex == cursorIndex && prevCursorSpecialPos == pauseCtx->cursorSpecialPos &&
             prevCursorPoint[cursorIndex] == pauseCtx->cursorPoint[cursorIndex]) {
             return;
         }
-        
+
         prevCursorSpecialPos = pauseCtx->cursorSpecialPos;
-        
+
         if (pauseCtx->cursorSpecialPos > 0) {
             return;
         }
 
         std::string buttonNames[] = {
-            "input_button_c_left",
-            "input_button_c_down",
-            "input_button_c_right",
-            "input_d_pad_up",
-            "input_d_pad_down",
-            "input_d_pad_left",
-            "input_d_pad_right",
+            "input_button_c_left", "input_button_c_down", "input_button_c_right", "input_d_pad_up",
+            "input_d_pad_down",    "input_d_pad_left",    "input_d_pad_right",
         };
         int8_t assignedTo = -1;
-        
+
         switch (pauseCtx->pageIndex) {
-            case PAUSE_ITEM:
-            {
+            case PAUSE_ITEM: {
                 char arg[8]; // at least big enough where no s8 string will overflow
                 switch (pauseCtx->cursorItem[PAUSE_ITEM]) {
                     case ITEM_STICK:
@@ -432,7 +434,8 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 if (assignedTo != -1) {
                     auto button = GetParameritizedText(buttonNames[assignedTo], TEXT_BANK_MISC, nullptr);
                     auto translation = GetParameritizedText("assigned_to", TEXT_BANK_KALEIDO, button.c_str());
-                    SpeechSynthesizer::Instance->Speak((itemTranslation + " - " + translation).c_str(), GetLanguageCode());
+                    SpeechSynthesizer::Instance->Speak((itemTranslation + " - " + translation).c_str(),
+                                                       GetLanguageCode());
                 } else {
                     SpeechSynthesizer::Instance->Speak(itemTranslation.c_str(), GetLanguageCode());
                 }
@@ -452,7 +455,8 @@ void RegisterOnKaleidoscopeUpdateHook() {
 
                         // Cursor is on a dungeon floor position
                         if (cursorPoint >= 3 && cursorPoint < 11) {
-                            int floorID = gMapData->floorID[gPlayState->interfaceCtx.unk_25A][pauseCtx->dungeonMapSlot - 3];
+                            int floorID =
+                                gMapData->floorID[gPlayState->interfaceCtx.unk_25A][pauseCtx->dungeonMapSlot - 3];
                             // Normalize so F1 == 0, and negative numbers are basement levels
                             int normalizedFloor = (floorID * -1) + 8;
                             if (normalizedFloor >= 0) {
@@ -472,8 +476,7 @@ void RegisterOnKaleidoscopeUpdateHook() {
                     SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
                 }
                 break;
-            case PAUSE_QUEST:
-            {
+            case PAUSE_QUEST: {
                 char arg[8]; // at least big enough where no s8 string will overflow
                 switch (pauseCtx->cursorItem[PAUSE_QUEST]) {
                     case ITEM_SKULL_TOKEN:
@@ -496,8 +499,7 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
                 break;
             }
-            case PAUSE_EQUIP:
-            {
+            case PAUSE_EQUIP: {
                 if (pauseCtx->namedItem == PAUSE_ITEM_NONE) {
                     prevCursorIndex = -1;
                     return;
@@ -533,7 +535,8 @@ void RegisterOnKaleidoscopeUpdateHook() {
                 if (assignedTo != -1) {
                     auto button = GetParameritizedText(buttonNames[assignedTo], TEXT_BANK_MISC, nullptr);
                     auto translation = GetParameritizedText("assigned_to", TEXT_BANK_KALEIDO, button.c_str());
-                    SpeechSynthesizer::Instance->Speak((itemTranslation + " - " + translation).c_str(), GetLanguageCode());
+                    SpeechSynthesizer::Instance->Speak((itemTranslation + " - " + translation).c_str(),
+                                                       GetLanguageCode());
                 } else {
                     SpeechSynthesizer::Instance->Speak(itemTranslation.c_str(), GetLanguageCode());
                 }
@@ -550,15 +553,17 @@ void RegisterOnKaleidoscopeUpdateHook() {
 
 void RegisterOnUpdateMainMenuSelection() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPresentFileSelect>([]() {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         auto translation = GetParameritizedText("file1", TEXT_BANK_FILECHOOSE, nullptr);
         SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
     });
-    
+
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileSelectSelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case FS_BTN_MAIN_FILE_1: {
                 auto translation = GetParameritizedText("file1", TEXT_BANK_FILECHOOSE, nullptr);
@@ -595,28 +600,31 @@ void RegisterOnUpdateMainMenuSelection() {
         }
     });
 
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileSelectConfirmationSelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileSelectConfirmationSelection>(
+        [](uint16_t optionIndex) {
+            if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+                return;
 
-        switch (optionIndex) {
-            case FS_BTN_CONFIRM_YES: {
-                auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
+            switch (optionIndex) {
+                case FS_BTN_CONFIRM_YES: {
+                    auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                case FS_BTN_CONFIRM_QUIT: {
+                    auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                default:
+                    break;
             }
-            case FS_BTN_CONFIRM_QUIT: {
-                auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
-            }
-            default:
-                break;
-        }
-    });
+        });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileCopySelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case FS_BTN_COPY_FILE_1: {
                 auto translation = GetParameritizedText("file1", TEXT_BANK_FILECHOOSE, nullptr);
@@ -642,29 +650,32 @@ void RegisterOnUpdateMainMenuSelection() {
                 break;
         }
     });
-    
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileCopyConfirmationSelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
-        switch (optionIndex) {
-            case FS_BTN_CONFIRM_YES: {
-                auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileCopyConfirmationSelection>(
+        [](uint16_t optionIndex) {
+            if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+                return;
+
+            switch (optionIndex) {
+                case FS_BTN_CONFIRM_YES: {
+                    auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                case FS_BTN_CONFIRM_QUIT: {
+                    auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                default:
+                    break;
             }
-            case FS_BTN_CONFIRM_QUIT: {
-                auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
-            }
-            default:
-                break;
-        }
-    });
-    
+        });
+
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileEraseSelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case FS_BTN_ERASE_FILE_1: {
                 auto translation = GetParameritizedText("file1", TEXT_BANK_FILECHOOSE, nullptr);
@@ -690,29 +701,32 @@ void RegisterOnUpdateMainMenuSelection() {
                 break;
         }
     });
-    
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileEraseConfirmationSelection>([](uint16_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
-        switch (optionIndex) {
-            case FS_BTN_CONFIRM_YES: {
-                auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileEraseConfirmationSelection>(
+        [](uint16_t optionIndex) {
+            if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+                return;
+
+            switch (optionIndex) {
+                case FS_BTN_CONFIRM_YES: {
+                    auto translation = GetParameritizedText("confirm", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                case FS_BTN_CONFIRM_QUIT: {
+                    auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
+                    SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    break;
+                }
+                default:
+                    break;
             }
-            case FS_BTN_CONFIRM_QUIT: {
-                auto translation = GetParameritizedText("quit", TEXT_BANK_FILECHOOSE, nullptr);
-                SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-                break;
-            }
-            default:
-                break;
-        }
-    });
-    
+        });
+
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileAudioSelection>([](uint8_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case FS_AUDIO_STEREO: {
                 auto translation = GetParameritizedText("audio_stereo", TEXT_BANK_FILECHOOSE, nullptr);
@@ -740,8 +754,9 @@ void RegisterOnUpdateMainMenuSelection() {
     });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileTargetSelection>([](uint8_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case FS_TARGET_SWITCH: {
                 auto translation = GetParameritizedText("target_switch", TEXT_BANK_FILECHOOSE, nullptr);
@@ -759,8 +774,9 @@ void RegisterOnUpdateMainMenuSelection() {
     });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileLanguageSelection>([](uint8_t optionIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
         switch (optionIndex) {
             case LANGUAGE_ENG: {
                 auto translation = GetParameritizedText("language_english", TEXT_BANK_FILECHOOSE, nullptr);
@@ -783,7 +799,8 @@ void RegisterOnUpdateMainMenuSelection() {
     });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileQuestSelection>([](uint8_t questIndex) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
 
         switch (questIndex) {
             case QUEST_NORMAL: {
@@ -811,17 +828,31 @@ void RegisterOnUpdateMainMenuSelection() {
         }
     });
 
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileBossRushOptionSelection>([](uint8_t optionIndex, uint8_t optionValue) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileBossRushOptionSelection>(
+        [](uint8_t optionIndex, uint8_t optionValue) {
+            if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+                return;
+            uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
 
-        auto optionName = BossRush_GetSettingName(optionIndex, gSaveContext.language);
-        auto optionValueName = BossRush_GetSettingChoiceName(optionIndex, optionValue, gSaveContext.language);
-        auto translation = optionName + std::string(" - ") + optionValueName;
-        SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
-    });
+            auto optionName = BossRush_GetSettingName(optionIndex, language);
+            auto optionValueName = BossRush_GetSettingChoiceName(optionIndex, optionValue, language);
+            auto translation = optionName + std::string(" - ") + optionValueName;
+            SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+        });
+
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileRandomizerOptionSelection>(
+        [](uint8_t optionIndex) {
+            if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+                return;
+            uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
+
+            auto optionName = SohFileSelect_GetSettingText(optionIndex, language);
+            SpeechSynthesizer::Instance->Speak(optionName, GetLanguageCode());
+        });
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnUpdateFileNameSelection>([](int16_t charCode) {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
 
         char charVal[2];
         std::string translation;
@@ -863,50 +894,94 @@ static int8_t ttsCurrentHighlightedChoice;
 
 std::string remap(uint8_t character) {
     switch (character) {
-        case 0x80: return "À";
-        case 0x81: return "î";
-        case 0x82: return "Â";
-        case 0x83: return "Ä";
-        case 0x84: return "Ç";
-        case 0x85: return "È";
-        case 0x86: return "É";
-        case 0x87: return "Ê";
-        case 0x88: return "Ë";
-        case 0x89: return "Ï";
-        case 0x8A: return "Ô";
-        case 0x8B: return "Ö";
-        case 0x8C: return "Ù";
-        case 0x8D: return "Û";
-        case 0x8E: return "Ü";
-        case 0x8F: return "ß";
-        case 0x90: return "à";
-        case 0x91: return "á";
-        case 0x92: return "â";
-        case 0x93: return "ä";
-        case 0x94: return "ç";
-        case 0x95: return "è";
-        case 0x96: return "é";
-        case 0x97: return "ê";
-        case 0x98: return "ë";
-        case 0x99: return "ï";
-        case 0x9A: return "ô";
-        case 0x9B: return "ö";
-        case 0x9C: return "ù";
-        case 0x9D: return "û";
-        case 0x9E: return "ü";
-        case 0x9F: return GetParameritizedText("input_button_a", TEXT_BANK_MISC, nullptr);
-        case 0xA0: return GetParameritizedText("input_button_b", TEXT_BANK_MISC, nullptr);
-        case 0xA1: return GetParameritizedText("input_button_c", TEXT_BANK_MISC, nullptr);
-        case 0xA2: return GetParameritizedText("input_button_l", TEXT_BANK_MISC, nullptr);
-        case 0xA3: return GetParameritizedText("input_button_r", TEXT_BANK_MISC, nullptr);
-        case 0xA4: return GetParameritizedText("input_button_z", TEXT_BANK_MISC, nullptr);
-        case 0xA5: return GetParameritizedText("input_button_c_up", TEXT_BANK_MISC, nullptr);
-        case 0xA6: return GetParameritizedText("input_button_c_down", TEXT_BANK_MISC, nullptr);
-        case 0xA7: return GetParameritizedText("input_button_c_left", TEXT_BANK_MISC, nullptr);
-        case 0xA8: return GetParameritizedText("input_button_c_right", TEXT_BANK_MISC, nullptr);
-        case 0xAA: return GetParameritizedText("input_analog_stick", TEXT_BANK_MISC, nullptr);
-        case 0xAB: return GetParameritizedText("input_d_pad", TEXT_BANK_MISC, nullptr);
-        default: return "";
+        case 0x80:
+            return "À";
+        case 0x81:
+            return "î";
+        case 0x82:
+            return "Â";
+        case 0x83:
+            return "Ä";
+        case 0x84:
+            return "Ç";
+        case 0x85:
+            return "È";
+        case 0x86:
+            return "É";
+        case 0x87:
+            return "Ê";
+        case 0x88:
+            return "Ë";
+        case 0x89:
+            return "Ï";
+        case 0x8A:
+            return "Ô";
+        case 0x8B:
+            return "Ö";
+        case 0x8C:
+            return "Ù";
+        case 0x8D:
+            return "Û";
+        case 0x8E:
+            return "Ü";
+        case 0x8F:
+            return "ß";
+        case 0x90:
+            return "à";
+        case 0x91:
+            return "á";
+        case 0x92:
+            return "â";
+        case 0x93:
+            return "ä";
+        case 0x94:
+            return "ç";
+        case 0x95:
+            return "è";
+        case 0x96:
+            return "é";
+        case 0x97:
+            return "ê";
+        case 0x98:
+            return "ë";
+        case 0x99:
+            return "ï";
+        case 0x9A:
+            return "ô";
+        case 0x9B:
+            return "ö";
+        case 0x9C:
+            return "ù";
+        case 0x9D:
+            return "û";
+        case 0x9E:
+            return "ü";
+        case 0x9F:
+            return GetParameritizedText("input_button_a", TEXT_BANK_MISC, nullptr);
+        case 0xA0:
+            return GetParameritizedText("input_button_b", TEXT_BANK_MISC, nullptr);
+        case 0xA1:
+            return GetParameritizedText("input_button_c", TEXT_BANK_MISC, nullptr);
+        case 0xA2:
+            return GetParameritizedText("input_button_l", TEXT_BANK_MISC, nullptr);
+        case 0xA3:
+            return GetParameritizedText("input_button_r", TEXT_BANK_MISC, nullptr);
+        case 0xA4:
+            return GetParameritizedText("input_button_z", TEXT_BANK_MISC, nullptr);
+        case 0xA5:
+            return GetParameritizedText("input_button_c_up", TEXT_BANK_MISC, nullptr);
+        case 0xA6:
+            return GetParameritizedText("input_button_c_down", TEXT_BANK_MISC, nullptr);
+        case 0xA7:
+            return GetParameritizedText("input_button_c_left", TEXT_BANK_MISC, nullptr);
+        case 0xA8:
+            return GetParameritizedText("input_button_c_right", TEXT_BANK_MISC, nullptr);
+        case 0xAA:
+            return GetParameritizedText("input_analog_stick", TEXT_BANK_MISC, nullptr);
+        case 0xAB:
+            return GetParameritizedText("input_d_pad", TEXT_BANK_MISC, nullptr);
+        default:
+            return "";
     }
 }
 
@@ -914,10 +989,10 @@ std::string Message_TTS_Decode(uint8_t* sourceBuf, uint16_t startOfset, uint16_t
     std::string output;
     uint32_t destWriteIndex = 0;
     uint8_t isListingChoices = 0;
-    
+
     for (uint16_t i = 0; i < size; i++) {
         uint8_t cchar = sourceBuf[i + startOfset];
-        
+
         if (cchar < ' ') {
             switch (cchar) {
                 case MESSAGE_NEWLINE:
@@ -952,41 +1027,51 @@ std::string Message_TTS_Decode(uint8_t* sourceBuf, uint16_t startOfset, uint16_t
             }
         }
     }
-    
+
     return output;
 }
 
 void RegisterOnDialogMessageHook() {
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnDialogMessage>([]() {
-        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) return;
-        
-        MessageContext *msgCtx = &gPlayState->msgCtx;
-        
-        if (msgCtx->msgMode == MSGMODE_TEXT_NEXT_MSG || msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT_BEGIN || (msgCtx->msgMode == MSGMODE_TEXT_CONTINUING && msgCtx->stateTimer == 1)) {
+        if (!CVarGetInteger(CVAR_SETTING("A11yTTS"), 0))
+            return;
+
+        MessageContext* msgCtx = &gPlayState->msgCtx;
+
+        if (msgCtx->msgMode == MSGMODE_TEXT_NEXT_MSG || msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT_BEGIN ||
+            (msgCtx->msgMode == MSGMODE_TEXT_CONTINUING && msgCtx->stateTimer == 1)) {
             ttsHasNewMessage = 1;
-        } else if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING || msgCtx->msgMode == MSGMODE_TEXT_AWAIT_NEXT || msgCtx->msgMode == MSGMODE_TEXT_DONE || msgCtx->msgMode == MSGMODE_TEXT_DELAYED_BREAK
-                   || msgCtx->msgMode == MSGMODE_OCARINA_STARTING || msgCtx->msgMode == MSGMODE_OCARINA_PLAYING
-                   || msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT || msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT || msgCtx->msgMode == MSGMODE_SONG_PLAYED_ACT_BEGIN || msgCtx->msgMode == MSGMODE_SONG_PLAYED_ACT || msgCtx->msgMode == MSGMODE_SONG_PLAYBACK_STARTING || msgCtx->msgMode == MSGMODE_SONG_PLAYBACK || msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION_STARTING || msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT || msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION
-        ) {
+        } else if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING || msgCtx->msgMode == MSGMODE_TEXT_AWAIT_NEXT ||
+                   msgCtx->msgMode == MSGMODE_TEXT_DONE || msgCtx->msgMode == MSGMODE_TEXT_DELAYED_BREAK ||
+                   msgCtx->msgMode == MSGMODE_OCARINA_STARTING || msgCtx->msgMode == MSGMODE_OCARINA_PLAYING ||
+                   msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT ||
+                   msgCtx->msgMode == MSGMODE_DISPLAY_SONG_PLAYED_TEXT ||
+                   msgCtx->msgMode == MSGMODE_SONG_PLAYED_ACT_BEGIN || msgCtx->msgMode == MSGMODE_SONG_PLAYED_ACT ||
+                   msgCtx->msgMode == MSGMODE_SONG_PLAYBACK_STARTING || msgCtx->msgMode == MSGMODE_SONG_PLAYBACK ||
+                   msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION_STARTING ||
+                   msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT ||
+                   msgCtx->msgMode == MSGMODE_SONG_DEMONSTRATION) {
             if (ttsHasNewMessage) {
                 ttsHasMessage = 1;
                 ttsHasNewMessage = 0;
                 ttsCurrentHighlightedChoice = 0;
-                
+
                 uint16_t size = msgCtx->decodedTextLen;
                 auto decodedMsg = Message_TTS_Decode(msgCtx->msgBufDecoded, 0, size);
                 SpeechSynthesizer::Instance->Speak(decodedMsg.c_str(), GetLanguageCode());
-            } else if (msgCtx->msgMode == MSGMODE_TEXT_DONE && msgCtx->choiceNum > 0 && msgCtx->choiceIndex != ttsCurrentHighlightedChoice) {
+            } else if (msgCtx->msgMode == MSGMODE_TEXT_DONE && msgCtx->choiceNum > 0 &&
+                       msgCtx->choiceIndex != ttsCurrentHighlightedChoice) {
                 ttsCurrentHighlightedChoice = msgCtx->choiceIndex;
                 uint16_t startOffset = 0;
                 while (startOffset < msgCtx->decodedTextLen) {
-                    if (msgCtx->msgBufDecoded[startOffset] == MESSAGE_TWO_CHOICE || msgCtx->msgBufDecoded[startOffset] == MESSAGE_THREE_CHOICE) {
+                    if (msgCtx->msgBufDecoded[startOffset] == MESSAGE_TWO_CHOICE ||
+                        msgCtx->msgBufDecoded[startOffset] == MESSAGE_THREE_CHOICE) {
                         startOffset++;
                         break;
                     }
                     startOffset++;
                 }
-                
+
                 uint16_t endOffset = 0;
                 if (startOffset < msgCtx->decodedTextLen) {
                     uint8_t i = msgCtx->choiceIndex;
@@ -999,7 +1084,7 @@ void RegisterOnDialogMessageHook() {
                             startOffset++;
                         }
                     }
-                    
+
                     endOffset = startOffset;
                     while (endOffset < msgCtx->decodedTextLen) {
                         if (msgCtx->msgBufDecoded[endOffset] == MESSAGE_NEWLINE) {
@@ -1007,7 +1092,7 @@ void RegisterOnDialogMessageHook() {
                         }
                         endOffset++;
                     }
-                    
+
                     if (startOffset < msgCtx->decodedTextLen && startOffset != endOffset) {
                         uint16_t size = endOffset - startOffset;
                         auto decodedMsg = Message_TTS_Decode(msgCtx->msgBufDecoded, startOffset, size);
@@ -1018,9 +1103,11 @@ void RegisterOnDialogMessageHook() {
         } else if (ttsHasMessage) {
             ttsHasMessage = 0;
             ttsHasNewMessage = 0;
-            
-            if (msgCtx->decodedTextLen < 3 || (msgCtx->msgBufDecoded[msgCtx->decodedTextLen - 2] != MESSAGE_FADE && msgCtx->msgBufDecoded[msgCtx->decodedTextLen - 3] != MESSAGE_FADE2)) {
-                SpeechSynthesizer::Instance->Speak("", GetLanguageCode()); // cancel current speech (except for faded out messages)
+
+            if (msgCtx->decodedTextLen < 3 || (msgCtx->msgBufDecoded[msgCtx->decodedTextLen - 2] != MESSAGE_FADE &&
+                                               msgCtx->msgBufDecoded[msgCtx->decodedTextLen - 3] != MESSAGE_FADE2)) {
+                SpeechSynthesizer::Instance->Speak(
+                    "", GetLanguageCode()); // cancel current speech (except for faded out messages)
             }
         }
     });
@@ -1043,23 +1130,65 @@ void InitTTSBank() {
     initData->Format = RESOURCE_FORMAT_BINARY;
     initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json);
     initData->ResourceVersion = 0;
-    
-    sceneMap = std::static_pointer_cast<Ship::Json>(
-        Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/scenes" + languageSuffix, true, initData))->Data;
 
-    miscMap = std::static_pointer_cast<Ship::Json>(
-        Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/misc" + languageSuffix, true, initData))->Data;
+    sceneMap = std::static_pointer_cast<Ship::Json>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
+                                                        "accessibility/texts/scenes" + languageSuffix, true, initData))
+                   ->Data;
 
-    kaleidoMap = std::static_pointer_cast<Ship::Json>(
-        Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/kaleidoscope" + languageSuffix, true, initData))->Data;
+    miscMap = std::static_pointer_cast<Ship::Json>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
+                                                       "accessibility/texts/misc" + languageSuffix, true, initData))
+                  ->Data;
 
-    fileChooseMap = std::static_pointer_cast<Ship::Json>(
-        Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/filechoose" + languageSuffix, true, initData))->Data;
+    kaleidoMap =
+        std::static_pointer_cast<Ship::Json>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
+                                                 "accessibility/texts/kaleidoscope" + languageSuffix, true, initData))
+            ->Data;
+
+    fileChooseMap =
+        std::static_pointer_cast<Ship::Json>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
+                                                 "accessibility/texts/filechoose" + languageSuffix, true, initData))
+            ->Data;
 }
 
 void RegisterOnSetGameLanguageHook() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSetGameLanguage>([]() {
-        InitTTSBank();
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSetGameLanguage>([]() { InitTTSBank(); });
+}
+
+void RegisterOnSetDoAction() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSetDoAction>([](uint16_t action) {
+        if (CVarGetInteger(CVAR_SETTING("A11yTTS"), 0)) {
+            uint8_t language = CVarGetInteger(CVAR_SETTING("Languages"), 0);
+            const char* text;
+            switch (action) {
+                case DO_ACTION_CHECK:
+                    text = language == LANGUAGE_FRA ? "voir" : language == LANGUAGE_GER ? "lesen" : "check";
+                    break;
+                case DO_ACTION_ENTER:
+                    text = language == LANGUAGE_FRA ? "entrer" : language == LANGUAGE_GER ? "kriechen" : "enter";
+                    break;
+                case DO_ACTION_OPEN:
+                    text = language == LANGUAGE_FRA ? "ouvrir" : language == LANGUAGE_GER ? "öffnen" : "open";
+                    break;
+                case DO_ACTION_CLIMB:
+                    text = language == LANGUAGE_FRA ? "monter" : language == LANGUAGE_GER ? "hinauf" : "climb";
+                    break;
+                case DO_ACTION_SPEAK:
+                    text = language == LANGUAGE_FRA ? "parler" : language == LANGUAGE_GER ? "reden" : "speak";
+                    break;
+                case DO_ACTION_GRAB:
+                    text = language == LANGUAGE_FRA ? "action" : language == LANGUAGE_GER ? "aktion" : "grab";
+                    break;
+                case DO_ACTION_DOWN: {
+                    Player* player = GET_PLAYER(gPlayState);
+                    if (player == NULL || !(player->stateFlags1 & PLAYER_STATE1_ON_HORSE))
+                        return;
+                    text = language == LANGUAGE_FRA ? "descendre" : language == LANGUAGE_GER ? "herab" : "down";
+                } break;
+                default:
+                    return;
+            }
+            SpeechSynthesizer::Instance->Speak(text, GetLanguageCode());
+        }
     });
 }
 
@@ -1071,6 +1200,7 @@ void RegisterTTSModHooks() {
     RegisterOnInterfaceUpdateHook();
     RegisterOnKaleidoscopeUpdateHook();
     RegisterOnUpdateMainMenuSelection();
+    RegisterOnSetDoAction();
 }
 
 void RegisterTTS() {
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
index 673afc8a64..a12be6264b 100644
--- a/soh/soh/Extractor/Extract.cpp
+++ b/soh/soh/Extractor/Extract.cpp
@@ -58,19 +58,28 @@ static constexpr uint32_t OOT_PAL_GC_DBG2 = 0x87121EFE; // 03-13-2002 build
 static constexpr uint32_t OOT_PAL_GC_MQ_DBG = 0x917D18F6;
 static constexpr uint32_t OOT_PAL_10 = 0xB044B569;
 static constexpr uint32_t OOT_PAL_11 = 0xB2055FBD;
+static constexpr uint32_t OOT_NTSC_US_GC = 0xF3DD35BA;
+static constexpr uint32_t OOT_NTSC_JP_GC = 0xF611F4BA;
+static constexpr uint32_t OOT_NTSC_JP_GC_CE = 0xF7F52DB8;
+static constexpr uint32_t OOT_NTSC_US_MQ = 0xF034001A;
+static constexpr uint32_t OOT_NTSC_JP_MQ = 0xF43B45BA;
+static constexpr uint32_t OOT_NTSC_10 = 0xEC7011B7;
+static constexpr uint32_t OOT_NTSC_11 = 0xD43DA81F;
+static constexpr uint32_t OOT_NTSC_12 = 0x693BA2AE;
 
 static const std::unordered_map<uint32_t, const char*> verMap = {
-    { OOT_PAL_GC, "PAL Gamecube" },
-    { OOT_PAL_MQ, "PAL MQ" },
-    { OOT_PAL_GC_DBG1, "PAL Debug 1" },
-    { OOT_PAL_GC_DBG2, "PAL Debug 2" },
-    { OOT_PAL_GC_MQ_DBG, "PAL MQ Debug" },
-    { OOT_PAL_10, "PAL N64 1.0" },
-    { OOT_PAL_11, "PAL N64 1.1" },
+    { OOT_PAL_GC, "PAL Gamecube" },         { OOT_PAL_MQ, "PAL MQ" },
+    { OOT_PAL_GC_DBG1, "PAL Debug 1" },     { OOT_PAL_GC_DBG2, "PAL Debug 2" },
+    { OOT_PAL_GC_MQ_DBG, "PAL MQ Debug" },  { OOT_PAL_10, "PAL N64 1.0" },
+    { OOT_PAL_11, "PAL N64 1.1" },          { OOT_NTSC_US_GC, "NTSC Gamecube US" },
+    { OOT_NTSC_JP_GC, "NTSC Gamecube JP" }, { OOT_NTSC_JP_GC_CE, "NTSC Gamecube JP (Collector's Edition)" },
+    { OOT_NTSC_US_GC, "NTSC MQ US" },       { OOT_NTSC_JP_GC, "NTSC MQ JP" },
+    { OOT_NTSC_10, "NTSC N64 1.0" },        { OOT_NTSC_11, "NTSC N64 1.1" },
+    { OOT_NTSC_12, "NTSC N64 1.2" },
 };
 
 // TODO only check the first 54MB of the rom.
-static constexpr std::array<const uint32_t, 10> goodCrcs = {
+static constexpr std::array<const uint32_t, 21> goodCrcs = {
     0xfa8c0555, // MQ DBG 64MB (Original overdump)
     0x8652ac4c, // MQ DBG 64MB
     0x5B8A1EB7, // MQ DBG 64MB (Empty overdump)
@@ -81,6 +90,17 @@ static constexpr std::array<const uint32_t, 10> goodCrcs = {
     0x7A2FAE68, // GC MQ PAL
     0xFD9913B1, // N64 PAL 1.0
     0xE033FBBA, // N64 PAL 1.1
+    0x460C938C, // N64 NTSC US 1.0
+    0xD0C76FA9, // N64 NTSC JP 1.0
+    0x3496EE47, // N64 NTSC US 1.1
+    0xA25D1262, // N64 NTSC JP 1.1
+    0x15736A58, // N64 NTSC US 1.2
+    0x83B8967D, // N64 NTSC JP 1.2
+    0xD61453DE, // GC NTSC US
+    0x4129C825, // GC MQ NTSC US
+    0x11A4BE61, // GC NTSC JP
+    0x2BC6C6FD, // GC NTSC JP Collector's Edition
+    0x02CD974C, // GC MQ NTSC JP
 };
 
 enum class ButtonId : int {
@@ -89,7 +109,6 @@ enum class ButtonId : int {
     FIND,
 };
 
-
 void Extractor::ShowErrorBox(const char* title, const char* text) {
 #ifdef _WIN32
     MessageBoxA(nullptr, text, title, MB_OK | MB_ICONERROR);
@@ -107,8 +126,9 @@ void Extractor::ShowSizeErrorBox() const {
 }
 
 void Extractor::ShowCrcErrorBox() const {
-    ShowErrorBox("Rom CRC invalid", "Rom CRC did not match the list of known compatible roms. Please find another.\n\n"
-                                    "Visit https://ship.equipment/ to validate your ROM and see a list of compatible versions");
+    ShowErrorBox("Rom CRC invalid",
+                 "Rom CRC did not match the list of known compatible roms. Please find another.\n\n"
+                 "Visit https://ship.equipment/ to validate your ROM and see a list of compatible versions");
 }
 
 void Extractor::ShowCompressedErrorBox() const {
@@ -196,8 +216,7 @@ void Extractor::FilterRoms(std::vector<std::string>& roms, RomSearchMode searchM
 
         // Rom doesn't claim to be valid
         // Game type doesn't match search mode
-        if (!verMap.contains(GetRomVerCrc()) ||
-            (searchMode == RomSearchMode::Vanilla && IsMasterQuest()) ||
+        if (!verMap.contains(GetRomVerCrc()) || (searchMode == RomSearchMode::Vanilla && IsMasterQuest()) ||
             (searchMode == RomSearchMode::MQ && !IsMasterQuest())) {
             it = roms.erase(it);
             continue;
@@ -240,8 +259,7 @@ void Extractor::GetRoms(std::vector<std::string>& roms) {
 
                 // Get the position of the extension character.
                 char* ext = strrchr(dir->d_name, '.');
-                if (ext != NULL && (strcmp(ext, ".z64") == 0 || strcmp(ext, ".n64") == 0 ||
-                    strcmp(ext, ".v64") == 0)) {
+                if (ext != NULL && (strcmp(ext, ".z64") == 0 || strcmp(ext, ".n64") == 0 || strcmp(ext, ".v64") == 0)) {
                     roms.push_back(dir->d_name);
                 }
             }
@@ -270,7 +288,8 @@ bool Extractor::GetRomPathFromBox() {
     box.lpstrFile = nameBuffer;
     box.nMaxFile = sizeof(nameBuffer) / sizeof(nameBuffer[0]);
     box.lpstrTitle = "Open Rom";
-    box.Flags = OFN_NOCHANGEDIR | OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
+    box.Flags =
+        OFN_NOCHANGEDIR | OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
     box.lpstrFilter = "N64 Roms\0*.z64;*.v64;*.n64\0\0";
     if (!GetOpenFileNameA(&box)) {
         DWORD err = CommDlgExtendedError();
@@ -297,7 +316,7 @@ bool Extractor::GetRomPathFromBox() {
         return false;
     }
     mCurrentRomPath = nameBuffer;
-    #else
+#else
     auto selection = pfd::open_file("Select a file", mSearchPath, { "N64 Roms", "*.z64 *.n64 *.v64" }).result();
 
     if (selection.empty()) {
@@ -305,7 +324,7 @@ bool Extractor::GetRomPathFromBox() {
     }
 
     mCurrentRomPath = selection[0];
-    #endif
+#endif
     mCurRomSize = GetCurRomSize();
     return true;
 }
@@ -345,7 +364,8 @@ bool Extractor::ValidateNotCompressed() const {
         return false;
     }
     // 7z file header. 37 7A BC AF 27 1C
-    if (mRomData[0] == '7' && mRomData[1] == 'z' && mRomData[2] == 0xBC && mRomData[3] == 0xAF && mRomData[4] == 0x27 && mRomData[5] == 0x1C) {
+    if (mRomData[0] == '7' && mRomData[1] == 'z' && mRomData[2] == 0xBC && mRomData[3] == 0xAF && mRomData[4] == 0x27 &&
+        mRomData[5] == 0x1C) {
         return false;
     }
 
@@ -408,7 +428,9 @@ bool Extractor::ManuallySearchForRomMatchingType(RomSearchMode searchMode) {
     }
 
     char msgBuf[150];
-    snprintf(msgBuf, 150, "The selected rom does not match the expected game type\nExpected type: %s.\n\nDo you want to search again?",
+    snprintf(
+        msgBuf, 150,
+        "The selected rom does not match the expected game type\nExpected type: %s.\n\nDo you want to search again?",
         searchMode == RomSearchMode::MQ ? "Master Quest" : "Vanilla");
 
     while ((searchMode == RomSearchMode::Vanilla && IsMasterQuest()) ||
@@ -479,9 +501,10 @@ bool Extractor::Run(std::string searchPath, RomSearchMode searchMode) {
                 if (rom == roms.back()) {
                     ShowCrcErrorBox();
                 } else {
-                    ShowErrorBox("Rom CRC invalid",
-                                 "Rom CRC did not match the list of known compatible roms. Trying the next one...\n\n"
-                                 "Visit https://ship.equipment/ to validate your ROM and see a list of compatible versions");
+                    ShowErrorBox(
+                        "Rom CRC invalid",
+                        "Rom CRC did not match the list of known compatible roms. Trying the next one...\n\n"
+                        "Visit https://ship.equipment/ to validate your ROM and see a list of compatible versions");
                 }
                 continue;
             }
@@ -507,7 +530,15 @@ bool Extractor::IsMasterQuest() const {
     switch (GetRomVerCrc()) {
         case OOT_PAL_MQ:
         case OOT_PAL_GC_MQ_DBG:
+        case OOT_NTSC_US_MQ:
+        case OOT_NTSC_JP_MQ:
             return true;
+        case OOT_NTSC_10:
+        case OOT_NTSC_11:
+        case OOT_NTSC_12:
+        case OOT_NTSC_US_GC:
+        case OOT_NTSC_JP_GC:
+        case OOT_NTSC_JP_GC_CE:
         case OOT_PAL_10:
         case OOT_PAL_11:
         case OOT_PAL_GC:
@@ -532,6 +563,22 @@ const char* Extractor::GetZapdVerStr() const {
             return "N64_PAL_10";
         case OOT_PAL_11:
             return "N64_PAL_11";
+        case OOT_NTSC_US_GC:
+            return "GC_NMQ_NTSC_U";
+        case OOT_NTSC_JP_GC:
+            return "GC_NMQ_NTSC_J";
+        case OOT_NTSC_JP_GC_CE:
+            return "GC_NMQ_NTSC_J_CE";
+        case OOT_NTSC_US_MQ:
+            return "GC_MQ_NTSC_U";
+        case OOT_NTSC_JP_MQ:
+            return "GC_MQ_NTSC_J";
+        case OOT_NTSC_10:
+            return "N64_NTSC_10";
+        case OOT_NTSC_11:
+            return "N64_NTSC_11";
+        case OOT_NTSC_12:
+            return "N64_NTSC_12";
         default:
             // We should never be in a state where this path happens.
             UNREACHABLE;
@@ -541,7 +588,7 @@ const char* Extractor::GetZapdVerStr() const {
 
 std::string Extractor::Mkdtemp() {
     std::string temp_dir = std::filesystem::temp_directory_path().string();
-    
+
     // create 6 random alphanumeric characters
     static const char charset[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     std::random_device rd;
@@ -560,15 +607,16 @@ std::string Extractor::Mkdtemp() {
 }
 
 extern "C" int zapd_main(int argc, char** argv);
+static void MessageboxWorker();
 
 bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
-    constexpr int argc = 18;
+    constexpr int argc = 22;
     char xmlPath[1024];
     char confPath[1024];
     char portVersion[18]; // 5 digits for int16_max (x3) + separators + terminator
     std::array<const char*, argc> argv;
     const char* version = GetZapdVerStr();
-    const char* otrFile = IsMasterQuest() ? "oot-mq.otr" : "oot.otr";
+    const char* otrFile = IsMasterQuest() ? "oot-mq.o2r" : "oot.o2r";
 
     std::string romPath = std::filesystem::absolute(mCurrentRomPath).string();
     installPath = std::filesystem::absolute(installPath).string();
@@ -578,15 +626,15 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     std::string curdir = std::filesystem::current_path().string();
 #ifdef _WIN32
     std::filesystem::copy(installPath + "/assets", tempdir + "/assets",
-        std::filesystem::copy_options::recursive | std::filesystem::copy_options::update_existing);
+                          std::filesystem::copy_options::recursive | std::filesystem::copy_options::update_existing);
 #else
     std::filesystem::create_symlink(installPath + "/assets", tempdir + "/assets");
 #endif
 
     std::filesystem::current_path(tempdir);
 
-    snprintf(xmlPath, 1024, "assets/extractor/xmls/%s", version);
-    snprintf(confPath, 1024, "assets/extractor/Config_%s.xml", version);
+    snprintf(xmlPath, 1024, "assets/xml/%s", version);
+    snprintf(confPath, 1024, "assets/Config_%s.xml", version);
     snprintf(portVersion, 18, "%d.%d.%d", gBuildVersionMajor, gBuildVersionMinor, gBuildVersionPatch);
 
     argv[0] = "ZAPD";
@@ -596,9 +644,9 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     argv[4] = "-b";
     argv[5] = romPath.c_str();
     argv[6] = "-fl";
-    argv[7] = "assets/extractor/filelists";
+    argv[7] = "assets/filelists";
     argv[8] = "-gsf";
-    argv[9] = "1";
+    argv[9] = "0";
     argv[10] = "-rconf";
     argv[11] = confPath;
     argv[12] = "-se";
@@ -607,17 +655,23 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     argv[15] = otrFile;
     argv[16] = "--portVer";
     argv[17] = portVersion;
+    argv[18] = "-o";
+    argv[19] = "placeholder";
+    argv[20] = "-osf";
+    argv[21] = "placeholder";
 
 #ifdef _WIN32
     // Grab a handle to the command window.
     HWND cmdWindow = GetConsoleWindow();
 
-    // Normally the command window is hidden. We want the window to be shown here so the user can see the progess of the extraction.
+    // Normally the command window is hidden. We want the window to be shown here so the user can see the progess of the
+    // extraction.
     ShowWindow(cmdWindow, SW_SHOW);
     SetWindowPos(cmdWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
 #else
     // Show extraction in background message until linux/mac can have visual progress
-    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Extracting", "Extraction will now begin in the background.\n\nPlease be patient for the process to finish. Do not close the main program.", nullptr);
+    std::thread mbThread(MessageboxWorker);
+    mbThread.detach();
 #endif
 
     zapd_main(argc, (char**)argv.data());
@@ -633,5 +687,12 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     std::filesystem::current_path(curdir);
     std::filesystem::remove_all(tempdir);
 
-    return 0;
+    return false;
+}
+
+static void MessageboxWorker() {
+    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Extracting",
+                             "Extraction will now begin in the background.\n\nPlease be patient for the process to "
+                             "finish. Do not close the main program.",
+                             nullptr);
 }
diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h
index ce4008fbe1..ae4fa740aa 100644
--- a/soh/soh/Extractor/Extract.h
+++ b/soh/soh/Extractor/Extract.h
@@ -20,9 +20,9 @@ static constexpr size_t MB54 = 54 * MB_BASE;
 static constexpr size_t MB64 = 64 * MB_BASE;
 
 enum class RomSearchMode {
-  Both = 0,
-  Vanilla = 1,
-  MQ = 2,
+    Both = 0,
+    Vanilla = 1,
+    MQ = 2,
 };
 
 class Extractor {
@@ -54,7 +54,7 @@ class Extractor {
     bool ManuallySearchForRomMatchingType(RomSearchMode searchMode);
 
   public:
-    //TODO create some kind of abstraction for message boxes.
+    // TODO create some kind of abstraction for message boxes.
     static int ShowYesNoBox(const char* title, const char* text);
     static void ShowErrorBox(const char* title, const char* text);
     bool IsMasterQuest() const;
diff --git a/soh/soh/Extractor/FastCrc32C.c b/soh/soh/Extractor/FastCrc32C.c
index d88b04bebe..2dccda61ec 100644
--- a/soh/soh/Extractor/FastCrc32C.c
+++ b/soh/soh/Extractor/FastCrc32C.c
@@ -2,7 +2,8 @@
 #include <stddef.h>
 
 // Force the compiler to assume we have support for the CRC32 intrinsic. We will check for our selves later.
-// Clang will define both __llvm__ and __GNUC__ but GCC will only define __GNUC__. So we need to check for __llvm__ first.
+// Clang will define both __llvm__ and __GNUC__ but GCC will only define __GNUC__. So we need to check for __llvm__
+// first.
 #if ((defined(__llvm__) && (defined(__x86_64__) || defined(__i386__))))
 #pragma clang attribute push(__attribute__((target("crc32"))), apply_to = function)
 #elif ((defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))))
@@ -11,7 +12,8 @@
 #pragma GCC target("sse4.2")
 #endif
 
-// Include headers for the CRC32 intrinsic and cpuid instruction on windows. No need to do any other checks because it assumes the target will support CRC32
+// Include headers for the CRC32 intrinsic and cpuid instruction on windows. No need to do any other checks because it
+// assumes the target will support CRC32
 #ifdef _WIN32
 #include <immintrin.h>
 #include <intrin.h>
@@ -68,7 +70,8 @@ static const uint32_t crc32Table[256] = {
     0xE03E9C81L, 0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, 0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL,
     0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L
 };
-// On platforms that we know will never support a crc32 instruction (such as the WiiU) we will skip compiling this function in.
+// On platforms that we know will never support a crc32 instruction (such as the WiiU) we will skip compiling this
+// function in.
 #ifndef NO_CRC_INTRIN
 
 static uint32_t CRC32IntrinImpl(unsigned char* data, size_t dataSize) {
@@ -123,7 +126,7 @@ uint32_t CRC32C(unsigned char* data, size_t dataSize) {
 #ifdef _WIN32
     __cpuid(cpuidData, 1);
 #elif __APPLE__ || (defined(__aarch64__) && defined(__ARM_FEATURE_CRC32))
-// Every Mac that supports SoH should support this instruction. Also check for ARM64 at the same time
+    // Every Mac that supports SoH should support this instruction. Also check for ARM64 at the same time
     return CRC32IntrinImpl(data, dataSize);
 #else
     __get_cpuid(1, &cpuidData[0], &cpuidData[1], &cpuidData[2], &cpuidData[3]);
diff --git a/soh/soh/Extractor/portable-file-dialogs.h b/soh/soh/Extractor/portable-file-dialogs.h
index 1fc79a2910..6deb9ed661 100644
--- a/soh/soh/Extractor/portable-file-dialogs.h
+++ b/soh/soh/Extractor/portable-file-dialogs.h
@@ -14,7 +14,7 @@
 
 #if _WIN32
 #ifndef WIN32_LEAN_AND_MEAN
-#   define WIN32_LEAN_AND_MEAN 1
+#define WIN32_LEAN_AND_MEAN 1
 #endif
 #include <windows.h>
 #include <commdlg.h>
@@ -22,20 +22,20 @@
 #include <shobjidl.h> // IFileDialog
 #include <shellapi.h>
 #include <strsafe.h>
-#include <future>     // std::async
-#include <userenv.h>  // GetUserProfileDirectory()
+#include <future>    // std::async
+#include <userenv.h> // GetUserProfileDirectory()
 
 #elif __EMSCRIPTEN__
 #include <emscripten.h>
 
 #else
 #ifndef _POSIX_C_SOURCE
-#   define _POSIX_C_SOURCE 2 // for popen()
+#define _POSIX_C_SOURCE 2 // for popen()
 #endif
 #ifdef __APPLE__
-#   ifndef _DARWIN_C_SOURCE
-#       define _DARWIN_C_SOURCE
-#   endif
+#ifndef _DARWIN_C_SOURCE
+#define _DARWIN_C_SOURCE
+#endif
 #endif
 #include <cstdio>     // popen()
 #include <cstdlib>    // std::getenv()
@@ -58,20 +58,18 @@
 
 // Versions of mingw64 g++ up to 9.3.0 do not have a complete IFileDialog
 #ifndef PFD_HAS_IFILEDIALOG
-#   define PFD_HAS_IFILEDIALOG 1
-#   if (defined __MINGW64__ || defined __MINGW32__) && defined __GXX_ABI_VERSION
-#       if __GXX_ABI_VERSION <= 1013
-#           undef PFD_HAS_IFILEDIALOG
-#           define PFD_HAS_IFILEDIALOG 0
-#       endif
-#   endif
+#define PFD_HAS_IFILEDIALOG 1
+#if (defined __MINGW64__ || defined __MINGW32__) && defined __GXX_ABI_VERSION
+#if __GXX_ABI_VERSION <= 1013
+#undef PFD_HAS_IFILEDIALOG
+#define PFD_HAS_IFILEDIALOG 0
+#endif
+#endif
 #endif
 
-namespace pfd
-{
+namespace pfd {
 
-enum class button
-{
+enum class button {
     cancel = -1,
     ok,
     yes,
@@ -81,8 +79,7 @@ enum class button
     ignore,
 };
 
-enum class choice
-{
+enum class choice {
     ok = 0,
     ok_cancel,
     yes_no,
@@ -91,8 +88,7 @@ enum class choice
     abort_retry_ignore,
 };
 
-enum class icon
-{
+enum class icon {
     info = 0,
     warning,
     error,
@@ -100,43 +96,44 @@ enum class icon
 };
 
 // Additional option flags for various dialog constructors
-enum class opt : uint8_t
-{
+enum class opt : uint8_t {
     none = 0,
     // For file open, allow multiselect.
-    multiselect     = 0x1,
+    multiselect = 0x1,
     // For file save, force overwrite and disable the confirmation dialog.
     force_overwrite = 0x2,
     // For folder select, force path to be the provided argument instead
     // of the last opened directory, which is the Microsoft-recommended,
     // user-friendly behaviour.
-    force_path      = 0x4,
+    force_path = 0x4,
 };
 
-inline opt operator |(opt a, opt b) { return opt(uint8_t(a) | uint8_t(b)); }
-inline bool operator &(opt a, opt b) { return bool(uint8_t(a) & uint8_t(b)); }
+inline opt operator|(opt a, opt b) {
+    return opt(uint8_t(a) | uint8_t(b));
+}
+inline bool operator&(opt a, opt b) {
+    return bool(uint8_t(a) & uint8_t(b));
+}
 
 // The settings class, only exposing to the user a way to set verbose mode
 // and to force a rescan of installed desktop helpers (zenity, kdialog…).
-class settings
-{
-public:
+class settings {
+  public:
     static bool available();
 
     static void verbose(bool value);
     static void rescan();
 
-protected:
+  protected:
     explicit settings(bool resync = false);
 
-    bool check_program(std::string const &program);
+    bool check_program(std::string const& program);
 
     inline bool is_osascript() const;
     inline bool is_zenity() const;
     inline bool is_kdialog() const;
 
-    enum class flag
-    {
+    enum class flag {
         is_scanned = 0,
         is_verbose,
 
@@ -150,46 +147,44 @@ protected:
     };
 
     // Static array of flags for internal state
-    bool const &flags(flag in_flag) const;
+    bool const& flags(flag in_flag) const;
 
     // Non-const getter for the static array of flags
-    bool &flags(flag in_flag);
+    bool& flags(flag in_flag);
 };
 
 // Internal classes, not to be used by client applications
-namespace internal
-{
+namespace internal {
 
 // Process wait timeout, in milliseconds
 static int const default_wait_timeout = 20;
 
-class executor
-{
+class executor {
     friend class dialog;
 
-public:
+  public:
     // High level function to get the result of a command
-    std::string result(int *exit_code = nullptr);
+    std::string result(int* exit_code = nullptr);
 
     // High level function to abort
     bool kill();
 
 #if _WIN32
-    void start_func(std::function<std::string(int *)> const &fun);
+    void start_func(std::function<std::string(int*)> const& fun);
     static BOOL CALLBACK enum_windows_callback(HWND hwnd, LPARAM lParam);
 #elif __EMSCRIPTEN__
     void start(int exit_code);
 #else
-    void start_process(std::vector<std::string> const &command);
+    void start_process(std::vector<std::string> const& command);
 #endif
 
     ~executor();
 
-protected:
+  protected:
     bool ready(int timeout = default_wait_timeout);
     void stop();
 
-private:
+  private:
     bool m_running = false;
     std::string m_stdout;
     int m_exit_code = -1;
@@ -207,106 +202,99 @@ private:
 #endif
 };
 
-class platform
-{
-protected:
+class platform {
+  protected:
 #if _WIN32
     // Helper class around LoadLibraryA() and GetProcAddress() with some safety
-    class dll
-    {
-    public:
-        dll(std::string const &name);
+    class dll {
+      public:
+        dll(std::string const& name);
         ~dll();
 
-        template<typename T> class proc
-        {
-        public:
-            proc(dll const &lib, std::string const &sym)
-              : m_proc(reinterpret_cast<T *>((void *)::GetProcAddress(lib.handle, sym.c_str())))
-            {}
+        template <typename T> class proc {
+          public:
+            proc(dll const& lib, std::string const& sym)
+                : m_proc(reinterpret_cast<T*>((void*)::GetProcAddress(lib.handle, sym.c_str()))) {
+            }
 
-            operator bool() const { return m_proc != nullptr; }
-            operator T *() const { return m_proc; }
+            operator bool() const {
+                return m_proc != nullptr;
+            }
+            operator T*() const {
+                return m_proc;
+            }
 
-        private:
-            T *m_proc;
+          private:
+            T* m_proc;
         };
 
-    private:
+      private:
         HMODULE handle;
     };
 
     // Helper class around CoInitialize() and CoUnInitialize()
-    class ole32_dll : public dll
-    {
-    public:
+    class ole32_dll : public dll {
+      public:
         ole32_dll();
         ~ole32_dll();
         bool is_initialized();
 
-    private:
+      private:
         HRESULT m_state;
     };
 
     // Helper class around CreateActCtx() and ActivateActCtx()
-    class new_style_context
-    {
-    public:
+    class new_style_context {
+      public:
         new_style_context();
         ~new_style_context();
 
-    private:
+      private:
         HANDLE create();
         ULONG_PTR m_cookie = 0;
     };
 #endif
 };
 
-class dialog : protected settings, protected platform
-{
-public:
+class dialog : protected settings, protected platform {
+  public:
     bool ready(int timeout = default_wait_timeout) const;
     bool kill() const;
 
-protected:
+  protected:
     explicit dialog();
 
     std::vector<std::string> desktop_helper() const;
     static std::string buttons_to_name(choice _choice);
     static std::string get_icon_name(icon _icon);
 
-    std::string powershell_quote(std::string const &str) const;
-    std::string osascript_quote(std::string const &str) const;
-    std::string shell_quote(std::string const &str) const;
+    std::string powershell_quote(std::string const& str) const;
+    std::string osascript_quote(std::string const& str) const;
+    std::string shell_quote(std::string const& str) const;
 
     // Keep handle to executing command
     std::shared_ptr<executor> m_async;
 };
 
-class file_dialog : public dialog
-{
-protected:
-    enum type
-    {
+class file_dialog : public dialog {
+  protected:
+    enum type {
         open,
         save,
         folder,
     };
 
-    file_dialog(type in_type,
-                std::string const &title,
-                std::string const &default_path = "",
-                std::vector<std::string> const &filters = {},
-                opt options = opt::none);
+    file_dialog(type in_type, std::string const& title, std::string const& default_path = "",
+                std::vector<std::string> const& filters = {}, opt options = opt::none);
 
-protected:
+  protected:
     std::string string_result();
     std::vector<std::string> vector_result();
 
 #if _WIN32
     static int CALLBACK bffcallback(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData);
 #if PFD_HAS_IFILEDIALOG
-    std::string select_folder_vista(IFileDialog *ifd, bool force_path);
+    std::string select_folder_vista(IFileDialog* ifd, bool force_path);
 #endif
 
     std::wstring m_wtitle;
@@ -322,9 +310,8 @@ protected:
 // The path class provides some platform-specific path constants
 //
 
-class path : protected internal::platform
-{
-public:
+class path : protected internal::platform {
+  public:
     static std::string home();
     static std::string separator();
 };
@@ -333,29 +320,23 @@ public:
 // The notify widget
 //
 
-class notify : public internal::dialog
-{
-public:
-    notify(std::string const &title,
-           std::string const &message,
-           icon _icon = icon::info);
+class notify : public internal::dialog {
+  public:
+    notify(std::string const& title, std::string const& message, icon _icon = icon::info);
 };
 
 //
 // The message widget
 //
 
-class message : public internal::dialog
-{
-public:
-    message(std::string const &title,
-            std::string const &text,
-            choice _choice = choice::ok_cancel,
+class message : public internal::dialog {
+  public:
+    message(std::string const& title, std::string const& text, choice _choice = choice::ok_cancel,
             icon _icon = icon::info);
 
     button result();
 
-private:
+  private:
     // Some extra logic to map the exit code to button number
     std::map<int, button> m_mappings;
 };
@@ -364,13 +345,10 @@ private:
 // The open_file, save_file, and open_folder widgets
 //
 
-class open_file : public internal::file_dialog
-{
-public:
-    open_file(std::string const &title,
-              std::string const &default_path = "",
-              std::vector<std::string> const &filters = { "All Files", "*" },
-              opt options = opt::none);
+class open_file : public internal::file_dialog {
+  public:
+    open_file(std::string const& title, std::string const& default_path = "",
+              std::vector<std::string> const& filters = { "All Files", "*" }, opt options = opt::none);
 
 #if defined(__has_cpp_attribute)
 #if __has_cpp_attribute(deprecated)
@@ -378,21 +356,16 @@ public:
     [[deprecated("Use pfd::opt::multiselect instead of allow_multiselect")]]
 #endif
 #endif
-    open_file(std::string const &title,
-              std::string const &default_path,
-              std::vector<std::string> const &filters,
+    open_file(std::string const& title, std::string const& default_path, std::vector<std::string> const& filters,
               bool allow_multiselect);
 
     std::vector<std::string> result();
 };
 
-class save_file : public internal::file_dialog
-{
-public:
-    save_file(std::string const &title,
-              std::string const &default_path = "",
-              std::vector<std::string> const &filters = { "All Files", "*" },
-              opt options = opt::none);
+class save_file : public internal::file_dialog {
+  public:
+    save_file(std::string const& title, std::string const& default_path = "",
+              std::vector<std::string> const& filters = { "All Files", "*" }, opt options = opt::none);
 
 #if defined(__has_cpp_attribute)
 #if __has_cpp_attribute(deprecated)
@@ -400,20 +373,15 @@ public:
     [[deprecated("Use pfd::opt::force_overwrite instead of confirm_overwrite")]]
 #endif
 #endif
-    save_file(std::string const &title,
-              std::string const &default_path,
-              std::vector<std::string> const &filters,
+    save_file(std::string const& title, std::string const& default_path, std::vector<std::string> const& filters,
               bool confirm_overwrite);
 
     std::string result();
 };
 
-class select_folder : public internal::file_dialog
-{
-public:
-    select_folder(std::string const &title,
-                  std::string const &default_path = "",
-                  opt options = opt::none);
+class select_folder : public internal::file_dialog {
+  public:
+    select_folder(std::string const& title, std::string const& default_path = "", opt options = opt::none);
 
     std::string result();
 };
@@ -428,36 +396,30 @@ public:
 
 // internal free functions implementations
 
-namespace internal
-{
+namespace internal {
 
 #if _WIN32
-static inline std::wstring str2wstr(std::string const &str)
-{
+static inline std::wstring str2wstr(std::string const& str) {
     int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), (int)str.size(), nullptr, 0);
     std::wstring ret(len, '\0');
     MultiByteToWideChar(CP_UTF8, 0, str.c_str(), (int)str.size(), (LPWSTR)ret.data(), (int)ret.size());
     return ret;
 }
 
-static inline std::string wstr2str(std::wstring const &str)
-{
+static inline std::string wstr2str(std::wstring const& str) {
     int len = WideCharToMultiByte(CP_UTF8, 0, str.c_str(), (int)str.size(), nullptr, 0, nullptr, nullptr);
     std::string ret(len, '\0');
     WideCharToMultiByte(CP_UTF8, 0, str.c_str(), (int)str.size(), (LPSTR)ret.data(), (int)ret.size(), nullptr, nullptr);
     return ret;
 }
 
-static inline bool is_vista()
-{
+static inline bool is_vista() {
     OSVERSIONINFOEXW osvi;
     memset(&osvi, 0, sizeof(osvi));
-    DWORDLONG const mask = VerSetConditionMask(
-            VerSetConditionMask(
-                    VerSetConditionMask(
-                            0, VER_MAJORVERSION, VER_GREATER_EQUAL),
-                    VER_MINORVERSION, VER_GREATER_EQUAL),
-            VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
+    DWORDLONG const mask =
+        VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL),
+                                                VER_MINORVERSION, VER_GREATER_EQUAL),
+                            VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
     osvi.dwOSVersionInfoSize = sizeof(osvi);
     osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA);
     osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA);
@@ -469,22 +431,17 @@ static inline bool is_vista()
 
 // This is necessary until C++20 which will have std::string::ends_with() etc.
 
-static inline bool ends_with(std::string const &str, std::string const &suffix)
-{
-    return suffix.size() <= str.size() &&
-        str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
+static inline bool ends_with(std::string const& str, std::string const& suffix) {
+    return suffix.size() <= str.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
 }
 
-static inline bool starts_with(std::string const &str, std::string const &prefix)
-{
-    return prefix.size() <= str.size() &&
-        str.compare(0, prefix.size(), prefix) == 0;
+static inline bool starts_with(std::string const& str, std::string const& prefix) {
+    return prefix.size() <= str.size() && str.compare(0, prefix.size(), prefix) == 0;
 }
 
 // This is necessary until C++17 which will have std::filesystem::is_directory
 
-static inline bool is_directory(std::string const &path)
-{
+static inline bool is_directory(std::string const& path) {
 #if _WIN32
     auto attr = GetFileAttributesA(path.c_str());
     return attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY);
@@ -499,13 +456,11 @@ static inline bool is_directory(std::string const &path)
 
 // This is necessary because getenv is not thread-safe
 
-static inline std::string getenv(std::string const &str)
-{
+static inline std::string getenv(std::string const& str) {
 #if _MSC_VER
-    char *buf = nullptr;
+    char* buf = nullptr;
     size_t size = 0;
-    if (_dupenv_s(&buf, &size, str.c_str()) == 0 && buf)
-    {
+    if (_dupenv_s(&buf, &size, str.c_str()) == 0 && buf) {
         std::string ret(buf);
         free(buf);
         return ret;
@@ -521,8 +476,7 @@ static inline std::string getenv(std::string const &str)
 
 // settings implementation
 
-inline settings::settings(bool resync)
-{
+inline settings::settings(bool resync) {
     flags(flag::is_scanned) &= !resync;
 
     if (flags(flag::is_scanned))
@@ -542,8 +496,7 @@ inline settings::settings(bool resync)
     flags(flag::has_kdialog) = check_program("kdialog");
 
     // If multiple helpers are available, try to default to the best one
-    if (flags(flag::has_zenity) && flags(flag::has_kdialog))
-    {
+    if (flags(flag::has_zenity) && flags(flag::has_kdialog)) {
         auto desktop_name = internal::getenv("XDG_SESSION_DESKTOP");
         if (desktop_name == std::string("gnome"))
             flags(flag::has_kdialog) = false;
@@ -555,8 +508,7 @@ inline settings::settings(bool resync)
     flags(flag::is_scanned) = true;
 }
 
-inline bool settings::available()
-{
+inline bool settings::available() {
 #if _WIN32
     return true;
 #elif __APPLE__
@@ -566,26 +518,21 @@ inline bool settings::available()
     return false;
 #else
     settings tmp;
-    return tmp.flags(flag::has_zenity) ||
-           tmp.flags(flag::has_matedialog) ||
-           tmp.flags(flag::has_qarma) ||
+    return tmp.flags(flag::has_zenity) || tmp.flags(flag::has_matedialog) || tmp.flags(flag::has_qarma) ||
            tmp.flags(flag::has_kdialog);
 #endif
 }
 
-inline void settings::verbose(bool value)
-{
+inline void settings::verbose(bool value) {
     settings().flags(flag::is_verbose) = value;
 }
 
-inline void settings::rescan()
-{
+inline void settings::rescan() {
     settings(/* resync = */ true);
 }
 
 // Check whether a program is present using “which”.
-inline bool settings::check_program(std::string const &program)
-{
+inline bool settings::check_program(std::string const& program) {
 #if _WIN32
     (void)program;
     return false;
@@ -595,14 +542,13 @@ inline bool settings::check_program(std::string const &program)
 #else
     int exit_code = -1;
     internal::executor async;
-    async.start_process({"/bin/sh", "-c", "which " + program});
+    async.start_process({ "/bin/sh", "-c", "which " + program });
     async.result(&exit_code);
     return exit_code == 0;
 #endif
 }
 
-inline bool settings::is_osascript() const
-{
+inline bool settings::is_osascript() const {
 #if __APPLE__
     return true;
 #else
@@ -610,32 +556,25 @@ inline bool settings::is_osascript() const
 #endif
 }
 
-inline bool settings::is_zenity() const
-{
-    return flags(flag::has_zenity) ||
-           flags(flag::has_matedialog) ||
-           flags(flag::has_qarma);
+inline bool settings::is_zenity() const {
+    return flags(flag::has_zenity) || flags(flag::has_matedialog) || flags(flag::has_qarma);
 }
 
-inline bool settings::is_kdialog() const
-{
+inline bool settings::is_kdialog() const {
     return flags(flag::has_kdialog);
 }
 
-inline bool const &settings::flags(flag in_flag) const
-{
+inline bool const& settings::flags(flag in_flag) const {
     static bool flags[size_t(flag::max_flag)];
     return flags[size_t(in_flag)];
 }
 
-inline bool &settings::flags(flag in_flag)
-{
-    return const_cast<bool &>(static_cast<settings const *>(this)->flags(in_flag));
+inline bool& settings::flags(flag in_flag) {
+    return const_cast<bool&>(static_cast<settings const*>(this)->flags(in_flag));
 }
 
 // path implementation
-inline std::string path::home()
-{
+inline std::string path::home() {
 #if _WIN32
     // First try the USERPROFILE environment variable
     auto user_profile = internal::getenv("USERPROFILE");
@@ -645,10 +584,9 @@ inline std::string path::home()
     HANDLE token = nullptr;
     DWORD len = MAX_PATH;
     char buf[MAX_PATH] = { '\0' };
-    if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token))
-    {
+    if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {
         dll userenv("userenv.dll");
-        dll::proc<BOOL WINAPI (HANDLE, LPSTR, LPDWORD)> get_user_profile_directory(userenv, "GetUserProfileDirectoryA");
+        dll::proc<BOOL WINAPI(HANDLE, LPSTR, LPDWORD)> get_user_profile_directory(userenv, "GetUserProfileDirectoryA");
         get_user_profile_directory(token, buf, &len);
         CloseHandle(token);
         if (*buf)
@@ -676,8 +614,7 @@ inline std::string path::home()
     return "/";
 }
 
-inline std::string path::separator()
-{
+inline std::string path::separator() {
 #if _WIN32
     return "\\";
 #else
@@ -687,25 +624,21 @@ inline std::string path::separator()
 
 // executor implementation
 
-inline std::string internal::executor::result(int *exit_code /* = nullptr */)
-{
+inline std::string internal::executor::result(int* exit_code /* = nullptr */) {
     stop();
     if (exit_code)
         *exit_code = m_exit_code;
     return m_stdout;
 }
 
-inline bool internal::executor::kill()
-{
+inline bool internal::executor::kill() {
 #if _WIN32
-    if (m_future.valid())
-    {
+    if (m_future.valid()) {
         // Close all windows that weren’t open when we started the future
         auto previous_windows = m_windows;
         EnumWindows(&enum_windows_callback, (LPARAM)this);
         for (auto hwnd : m_windows)
-            if (previous_windows.find(hwnd) == previous_windows.end())
-            {
+            if (previous_windows.find(hwnd) == previous_windows.end()) {
                 SendMessage(hwnd, WM_CLOSE, 0, 0);
                 // Also send IDNO in case of a Yes/No or Abort/Retry/Ignore messagebox
                 SendMessage(hwnd, WM_COMMAND, IDNO, 0);
@@ -722,9 +655,8 @@ inline bool internal::executor::kill()
 }
 
 #if _WIN32
-inline BOOL CALLBACK internal::executor::enum_windows_callback(HWND hwnd, LPARAM lParam)
-{
-    auto that = (executor *)lParam;
+inline BOOL CALLBACK internal::executor::enum_windows_callback(HWND hwnd, LPARAM lParam) {
+    auto that = (executor*)lParam;
 
     DWORD pid;
     auto tid = GetWindowThreadProcessId(hwnd, &pid);
@@ -735,12 +667,10 @@ inline BOOL CALLBACK internal::executor::enum_windows_callback(HWND hwnd, LPARAM
 #endif
 
 #if _WIN32
-inline void internal::executor::start_func(std::function<std::string(int *)> const &fun)
-{
+inline void internal::executor::start_func(std::function<std::string(int*)> const& fun) {
     stop();
 
-    auto trampoline = [fun, this]()
-    {
+    auto trampoline = [fun, this]() {
         // Save our thread id so that the caller can cancel us
         m_tid = GetCurrentThreadId();
         EnumWindows(&enum_windows_callback, (LPARAM)this);
@@ -755,14 +685,12 @@ inline void internal::executor::start_func(std::function<std::string(int *)> con
 }
 
 #elif __EMSCRIPTEN__
-inline void internal::executor::start(int exit_code)
-{
+inline void internal::executor::start(int exit_code) {
     m_exit_code = exit_code;
 }
 
 #else
-inline void internal::executor::start_process(std::vector<std::string> const &command)
-{
+inline void internal::executor::start_process(std::vector<std::string> const& command) {
     stop();
     m_stdout.clear();
     m_exit_code = -1;
@@ -778,8 +706,7 @@ inline void internal::executor::start_process(std::vector<std::string> const &co
     close(in[m_pid ? 0 : 1]);
     close(out[m_pid ? 1 : 0]);
 
-    if (m_pid == 0)
-    {
+    if (m_pid == 0) {
         dup2(in[0], STDIN_FILENO);
         dup2(out[1], STDOUT_FILENO);
 
@@ -788,9 +715,9 @@ inline void internal::executor::start_process(std::vector<std::string> const &co
         dup2(fd, STDERR_FILENO);
         close(fd);
 
-        std::vector<char *> args;
+        std::vector<char*> args;
         std::transform(command.cbegin(), command.cend(), std::back_inserter(args),
-                       [](std::string const &s) { return const_cast<char *>(s.c_str()); });
+                       [](std::string const& s) { return const_cast<char*>(s.c_str()); });
         args.push_back(nullptr); // null-terminate argv[]
 
         execvp(args[0], args.data());
@@ -806,28 +733,23 @@ inline void internal::executor::start_process(std::vector<std::string> const &co
 }
 #endif
 
-inline internal::executor::~executor()
-{
+inline internal::executor::~executor() {
     stop();
 }
 
-inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
-{
+inline bool internal::executor::ready(int timeout /* = default_wait_timeout */) {
     if (!m_running)
         return true;
 
 #if _WIN32
-    if (m_future.valid())
-    {
+    if (m_future.valid()) {
         auto status = m_future.wait_for(std::chrono::milliseconds(timeout));
-        if (status != std::future_status::ready)
-        {
+        if (status != std::future_status::ready) {
             // On Windows, we need to run the message pump. If the async
             // thread uses a Windows API dialog, it may be attached to the
             // main thread and waiting for messages that only we can dispatch.
             MSG msg;
-            while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE))
-            {
+            while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
                 TranslateMessage(&msg);
                 DispatchMessage(&msg);
             }
@@ -842,8 +764,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
 #else
     char buf[BUFSIZ];
     ssize_t received = read(m_fd, buf, BUFSIZ); // Flawfinder: ignore
-    if (received > 0)
-    {
+    if (received > 0) {
         m_stdout += std::string(buf, received);
         return false;
     }
@@ -854,8 +775,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
     // a little while.
     int status;
     pid_t child = waitpid(m_pid, &status, WNOHANG);
-    if (child != m_pid && (child >= 0 || errno != ECHILD))
-    {
+    if (child != m_pid && (child >= 0 || errno != ECHILD)) {
         // FIXME: this happens almost always at first iteration
         std::this_thread::sleep_for(std::chrono::milliseconds(timeout));
         return false;
@@ -869,8 +789,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
     return true;
 }
 
-inline void internal::executor::stop()
-{
+inline void internal::executor::stop() {
     // Loop until the user closes the dialog
     while (!ready())
         ;
@@ -879,12 +798,10 @@ inline void internal::executor::stop()
 // dll implementation
 
 #if _WIN32
-inline internal::platform::dll::dll(std::string const &name)
-  : handle(::LoadLibraryA(name.c_str()))
-{}
+inline internal::platform::dll::dll(std::string const& name) : handle(::LoadLibraryA(name.c_str())) {
+}
 
-inline internal::platform::dll::~dll()
-{
+inline internal::platform::dll::~dll() {
     if (handle)
         ::FreeLibrary(handle);
 }
@@ -893,23 +810,19 @@ inline internal::platform::dll::~dll()
 // ole32_dll implementation
 
 #if _WIN32
-inline internal::platform::ole32_dll::ole32_dll()
-    : dll("ole32.dll")
-{
+inline internal::platform::ole32_dll::ole32_dll() : dll("ole32.dll") {
     // Use COINIT_MULTITHREADED because COINIT_APARTMENTTHREADED causes crashes.
     // See https://github.com/samhocevar/portable-file-dialogs/issues/51
-    auto coinit = proc<HRESULT WINAPI (LPVOID, DWORD)>(*this, "CoInitializeEx");
+    auto coinit = proc<HRESULT WINAPI(LPVOID, DWORD)>(*this, "CoInitializeEx");
     m_state = coinit(nullptr, COINIT_MULTITHREADED);
 }
 
-inline internal::platform::ole32_dll::~ole32_dll()
-{
+inline internal::platform::ole32_dll::~ole32_dll() {
     if (is_initialized())
-        proc<void WINAPI ()>(*this, "CoUninitialize")();
+        proc<void WINAPI()>(*this, "CoUninitialize")();
 }
 
-inline bool internal::platform::ole32_dll::is_initialized()
-{
+inline bool internal::platform::ole32_dll::is_initialized() {
     return m_state == S_OK || m_state == S_FALSE;
 }
 #endif
@@ -917,8 +830,7 @@ inline bool internal::platform::ole32_dll::is_initialized()
 // new_style_context implementation
 
 #if _WIN32
-inline internal::platform::new_style_context::new_style_context()
-{
+inline internal::platform::new_style_context::new_style_context() {
     // Only create one activation context for the whole app lifetime.
     static HANDLE hctx = create();
 
@@ -926,13 +838,11 @@ inline internal::platform::new_style_context::new_style_context()
         ActivateActCtx(hctx, &m_cookie);
 }
 
-inline internal::platform::new_style_context::~new_style_context()
-{
+inline internal::platform::new_style_context::~new_style_context() {
     DeactivateActCtx(0, m_cookie);
 }
 
-inline HANDLE internal::platform::new_style_context::create()
-{
+inline HANDLE internal::platform::new_style_context::create() {
     // This “hack” seems to be necessary for this code to work on windows XP.
     // Without it, dialogs do not show and close immediately. GetError()
     // returns 0 so I don’t know what causes this. I was not able to reproduce
@@ -947,13 +857,18 @@ inline HANDLE internal::platform::new_style_context::create()
     std::string sys_dir(len, '\0');
     ::GetSystemDirectoryA(&sys_dir[0], len);
 
-    ACTCTXA act_ctx =
-    {
+    ACTCTXA act_ctx = {
         // Do not set flag ACTCTX_FLAG_SET_PROCESS_DEFAULT, since it causes a
         // crash with error “default context is already set”.
         sizeof(act_ctx),
         ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID,
-        "shell32.dll", 0, 0, sys_dir.c_str(), (LPCSTR)124, nullptr, 0,
+        "shell32.dll",
+        0,
+        0,
+        sys_dir.c_str(),
+        (LPCSTR)124,
+        nullptr,
+        0,
     };
 
     return ::CreateActCtxA(&act_ctx);
@@ -962,54 +877,54 @@ inline HANDLE internal::platform::new_style_context::create()
 
 // dialog implementation
 
-inline bool internal::dialog::ready(int timeout /* = default_wait_timeout */) const
-{
+inline bool internal::dialog::ready(int timeout /* = default_wait_timeout */) const {
     return m_async->ready(timeout);
 }
 
-inline bool internal::dialog::kill() const
-{
+inline bool internal::dialog::kill() const {
     return m_async->kill();
 }
 
-inline internal::dialog::dialog()
-  : m_async(std::make_shared<executor>())
-{
+inline internal::dialog::dialog() : m_async(std::make_shared<executor>()) {
 }
 
-inline std::vector<std::string> internal::dialog::desktop_helper() const
-{
+inline std::vector<std::string> internal::dialog::desktop_helper() const {
 #if __APPLE__
     return { "osascript" };
 #else
     return { flags(flag::has_zenity) ? "zenity"
-           : flags(flag::has_matedialog) ? "matedialog"
-           : flags(flag::has_qarma) ? "qarma"
-           : flags(flag::has_kdialog) ? "kdialog"
-           : "echo" };
+             : flags(flag::has_matedialog) ? "matedialog"
+             : flags(flag::has_qarma) ? "qarma"
+             : flags(flag::has_kdialog) ? "kdialog"
+                                        : "echo" };
 #endif
 }
 
-inline std::string internal::dialog::buttons_to_name(choice _choice)
-{
-    switch (_choice)
-    {
-        case choice::ok_cancel: return "okcancel";
-        case choice::yes_no: return "yesno";
-        case choice::yes_no_cancel: return "yesnocancel";
-        case choice::retry_cancel: return "retrycancel";
-        case choice::abort_retry_ignore: return "abortretryignore";
-        /* case choice::ok: */ default: return "ok";
+inline std::string internal::dialog::buttons_to_name(choice _choice) {
+    switch (_choice) {
+        case choice::ok_cancel:
+            return "okcancel";
+        case choice::yes_no:
+            return "yesno";
+        case choice::yes_no_cancel:
+            return "yesnocancel";
+        case choice::retry_cancel:
+            return "retrycancel";
+        case choice::abort_retry_ignore:
+            return "abortretryignore";
+        /* case choice::ok: */ default:
+            return "ok";
     }
 }
 
-inline std::string internal::dialog::get_icon_name(icon _icon)
-{
-    switch (_icon)
-    {
-        case icon::warning: return "warning";
-        case icon::error: return "error";
-        case icon::question: return "question";
+inline std::string internal::dialog::get_icon_name(icon _icon) {
+    switch (_icon) {
+        case icon::warning:
+            return "warning";
+        case icon::error:
+            return "error";
+        case icon::question:
+            return "question";
         // Zenity wants "information" but WinForms wants "info"
         /* case icon::info: */ default:
 #if _WIN32
@@ -1021,10 +936,9 @@ inline std::string internal::dialog::get_icon_name(icon _icon)
 }
 
 // This is only used for debugging purposes
-inline std::ostream& operator <<(std::ostream &s, std::vector<std::string> const &v)
-{
+inline std::ostream& operator<<(std::ostream& s, std::vector<std::string> const& v) {
     int not_first = 0;
-    for (auto &e : v)
+    for (auto& e : v)
         s << (not_first++ ? " " : "") << e;
     return s;
 }
@@ -1033,47 +947,39 @@ inline std::ostream& operator <<(std::ostream &s, std::vector<std::string> const
 // FIXME: we should probably get rid of newlines!
 // FIXME: the \" sequence seems unsafe, too!
 // XXX: this is no longer used but I would like to keep it around just in case
-inline std::string internal::dialog::powershell_quote(std::string const &str) const
-{
+inline std::string internal::dialog::powershell_quote(std::string const& str) const {
     return "'" + std::regex_replace(str, std::regex("['\"]"), "$&$&") + "'";
 }
 
 // Properly quote a string for osascript: replace \ or " with \\ or \"
 // XXX: this also used to replace ' with \' when popen was used, but it would be
 // smarter to do shell_quote(osascript_quote(...)) if this is needed again.
-inline std::string internal::dialog::osascript_quote(std::string const &str) const
-{
+inline std::string internal::dialog::osascript_quote(std::string const& str) const {
     return "\"" + std::regex_replace(str, std::regex("[\\\\\"]"), "\\$&") + "\"";
 }
 
 // Properly quote a string for the shell: just replace ' with '\''
 // XXX: this is no longer used but I would like to keep it around just in case
-inline std::string internal::dialog::shell_quote(std::string const &str) const
-{
+inline std::string internal::dialog::shell_quote(std::string const& str) const {
     return "'" + std::regex_replace(str, std::regex("'"), "'\\''") + "'";
 }
 
 // file_dialog implementation
 
-inline internal::file_dialog::file_dialog(type in_type,
-            std::string const &title,
-            std::string const &default_path /* = "" */,
-            std::vector<std::string> const &filters /* = {} */,
-            opt options /* = opt::none */)
-{
+inline internal::file_dialog::file_dialog(type in_type, std::string const& title,
+                                          std::string const& default_path /* = "" */,
+                                          std::vector<std::string> const& filters /* = {} */,
+                                          opt options /* = opt::none */) {
 #if _WIN32
     std::string filter_list;
     std::regex whitespace("  *");
-    for (size_t i = 0; i + 1 < filters.size(); i += 2)
-    {
+    for (size_t i = 0; i + 1 < filters.size(); i += 2) {
         filter_list += filters[i] + '\0';
         filter_list += std::regex_replace(filters[i + 1], whitespace, ";") + '\0';
     }
     filter_list += '\0';
 
-    m_async->start_func([this, in_type, title, default_path, filter_list,
-                         options](int *exit_code) -> std::string
-    {
+    m_async->start_func([this, in_type, title, default_path, filter_list, options](int* exit_code) -> std::string {
         (void)exit_code;
         m_wtitle = internal::str2wstr(title);
         m_wdefault_path = internal::str2wstr(default_path);
@@ -1086,15 +992,13 @@ inline internal::file_dialog::file_dialog(type in_type,
         ole32_dll ole32;
 
         // Folder selection uses a different method
-        if (in_type == type::folder)
-        {
+        if (in_type == type::folder) {
 #if PFD_HAS_IFILEDIALOG
-            if (flags(flag::is_vista))
-            {
+            if (flags(flag::is_vista)) {
                 // On Vista and higher we should be able to use IFileDialog for folder selection
-                IFileDialog *ifd;
-                HRESULT hr = dll::proc<HRESULT WINAPI (REFCLSID, LPUNKNOWN, DWORD, REFIID, LPVOID *)>(ole32, "CoCreateInstance")
-                                 (CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&ifd));
+                IFileDialog* ifd;
+                HRESULT hr = dll::proc<HRESULT WINAPI(REFCLSID, LPUNKNOWN, DWORD, REFIID, LPVOID*)>(
+                    ole32, "CoCreateInstance")(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&ifd));
 
                 // In case CoCreateInstance fails (which it should not), try legacy approach
                 if (SUCCEEDED(hr))
@@ -1108,21 +1012,19 @@ inline internal::file_dialog::file_dialog(type in_type,
             bi.lpfn = &bffcallback;
             bi.lParam = (LPARAM)this;
 
-            if (flags(flag::is_vista))
-            {
+            if (flags(flag::is_vista)) {
                 if (ole32.is_initialized())
                     bi.ulFlags |= BIF_NEWDIALOGSTYLE;
                 bi.ulFlags |= BIF_EDITBOX;
                 bi.ulFlags |= BIF_STATUSTEXT;
             }
 
-            auto *list = SHBrowseForFolderW(&bi);
+            auto* list = SHBrowseForFolderW(&bi);
             std::string ret;
-            if (list)
-            {
+            if (list) {
                 auto buffer = new wchar_t[MAX_PATH];
                 SHGetPathFromIDListW(list, buffer);
-                dll::proc<void WINAPI (LPVOID)>(ole32, "CoTaskMemFree")(list);
+                dll::proc<void WINAPI(LPVOID)>(ole32, "CoTaskMemFree")(list);
                 ret = internal::wstr2str(buffer);
                 delete[] buffer;
             }
@@ -1139,8 +1041,7 @@ inline internal::file_dialog::file_dialog(type in_type,
         auto woutput = std::wstring(MAX_PATH * 256, L'\0');
         ofn.lpstrFile = (LPWSTR)woutput.data();
         ofn.nMaxFile = (DWORD)woutput.size();
-        if (!m_wdefault_path.empty())
-        {
+        if (!m_wdefault_path.empty()) {
             // If a directory was provided, use it as the initial directory. If
             // a valid path was provided, use it as the initial file. Otherwise,
             // let the Windows API decide.
@@ -1148,10 +1049,9 @@ inline internal::file_dialog::file_dialog(type in_type,
             if (path_attr != INVALID_FILE_ATTRIBUTES && (path_attr & FILE_ATTRIBUTE_DIRECTORY))
                 ofn.lpstrInitialDir = m_wdefault_path.c_str();
             else if (m_wdefault_path.size() <= woutput.size())
-                //second argument is size of buffer, not length of string
-                StringCchCopyW(ofn.lpstrFile, MAX_PATH*256+1, m_wdefault_path.c_str());
-            else
-            {
+                // second argument is size of buffer, not length of string
+                StringCchCopyW(ofn.lpstrFile, MAX_PATH * 256 + 1, m_wdefault_path.c_str());
+            else {
                 ofn.lpstrFileTitle = (LPWSTR)m_wdefault_path.data();
                 ofn.nMaxFileTitle = (DWORD)m_wdefault_path.size();
             }
@@ -1164,37 +1064,32 @@ inline internal::file_dialog::file_dialog(type in_type,
         // Apply new visual style (required for windows XP)
         new_style_context ctx;
 
-        if (in_type == type::save)
-        {
+        if (in_type == type::save) {
             if (!(options & opt::force_overwrite))
                 ofn.Flags |= OFN_OVERWRITEPROMPT;
 
-            dll::proc<BOOL WINAPI (LPOPENFILENAMEW)> get_save_file_name(comdlg32, "GetSaveFileNameW");
+            dll::proc<BOOL WINAPI(LPOPENFILENAMEW)> get_save_file_name(comdlg32, "GetSaveFileNameW");
             if (get_save_file_name(&ofn) == 0)
                 return "";
             return internal::wstr2str(woutput.c_str());
-        }
-        else
-        {
+        } else {
             if (options & opt::multiselect)
                 ofn.Flags |= OFN_ALLOWMULTISELECT;
             ofn.Flags |= OFN_PATHMUSTEXIST;
 
-            dll::proc<BOOL WINAPI (LPOPENFILENAMEW)> get_open_file_name(comdlg32, "GetOpenFileNameW");
+            dll::proc<BOOL WINAPI(LPOPENFILENAMEW)> get_open_file_name(comdlg32, "GetOpenFileNameW");
             if (get_open_file_name(&ofn) == 0)
                 return "";
         }
 
         std::string prefix;
-        for (wchar_t const *p = woutput.c_str(); *p; )
-        {
+        for (wchar_t const* p = woutput.c_str(); *p;) {
             auto filename = internal::wstr2str(p);
             p += wcslen(p);
             // In multiselect mode, we advance p one wchar further and
             // check for another filename. If there is one and the
             // prefix is empty, it means we just read the prefix.
-            if ((options & opt::multiselect) && *++p && prefix.empty())
-            {
+            if ((options & opt::multiselect) && *++p && prefix.empty()) {
                 prefix = filename + "/";
                 continue;
             }
@@ -1214,15 +1109,14 @@ inline internal::file_dialog::file_dialog(type in_type,
 #else
     auto command = desktop_helper();
 
-    if (is_osascript())
-    {
+    if (is_osascript()) {
         std::string script = "set ret to choose";
-        switch (in_type)
-        {
+        switch (in_type) {
             case type::save:
                 script += " file name";
                 break;
-            case type::open: default:
+            case type::open:
+            default:
                 script += " file";
                 if (options & opt::multiselect)
                     script += " with multiple selections allowed";
@@ -1232,8 +1126,7 @@ inline internal::file_dialog::file_dialog(type in_type,
                 break;
         }
 
-        if (default_path.size())
-        {
+        if (default_path.size()) {
             if (in_type == type::folder || is_directory(default_path))
                 script += " default location ";
             else
@@ -1243,8 +1136,7 @@ inline internal::file_dialog::file_dialog(type in_type,
 
         script += " with prompt " + osascript_quote(title);
 
-        if (in_type == type::open)
-        {
+        if (in_type == type::open) {
             // Concatenate all user-provided filter patterns
             std::string patterns;
             for (size_t i = 0; i < filters.size() / 2; ++i)
@@ -1258,8 +1150,7 @@ inline internal::file_dialog::file_dialog(type in_type,
             bool has_filter = true;
             std::sregex_token_iterator iter(patterns.begin(), patterns.end(), sep, -1);
             std::sregex_token_iterator end;
-            for ( ; iter != end; ++iter)
-            {
+            for (; iter != end; ++iter) {
                 auto pat = iter->str();
                 if (pat == "*" || pat == "*.*")
                     has_filter = false;
@@ -1267,8 +1158,7 @@ inline internal::file_dialog::file_dialog(type in_type,
                     filter_list += "," + osascript_quote(pat.substr(2, pat.size() - 2));
             }
 
-            if (has_filter && filter_list.size() > 0)
-            {
+            if (has_filter && filter_list.size() > 0) {
                 // There is a weird AppleScript bug where file extensions of length != 3 are
                 // ignored, e.g. type{"txt"} works, but type{"json"} does not. Fortunately if
                 // the whole list starts with a 3-character extension, everything works again.
@@ -1278,24 +1168,19 @@ inline internal::file_dialog::file_dialog(type in_type,
             }
         }
 
-        if (in_type == type::open && (options & opt::multiselect))
-        {
+        if (in_type == type::open && (options & opt::multiselect)) {
             script += "\nset s to \"\"";
             script += "\nrepeat with i in ret";
             script += "\n  set s to s & (POSIX path of i) & \"\\n\"";
             script += "\nend repeat";
             script += "\ncopy s to stdout";
-        }
-        else
-        {
+        } else {
             script += "\nPOSIX path of ret";
         }
 
         command.push_back("-e");
         command.push_back(script);
-    }
-    else if (is_zenity())
-    {
+    } else if (is_zenity()) {
         command.push_back("--file-selection");
 
         // If the default path is a directory, make sure it ends with "/" otherwise zenity will
@@ -1309,8 +1194,7 @@ inline internal::file_dialog::file_dialog(type in_type,
         command.push_back(title);
         command.push_back("--separator=\n");
 
-        for (size_t i = 0; i < filters.size() / 2; ++i)
-        {
+        for (size_t i = 0; i < filters.size() / 2; ++i) {
             command.push_back("--file-filter");
             command.push_back(filters[2 * i] + "|" + filters[2 * i + 1]);
         }
@@ -1323,17 +1207,19 @@ inline internal::file_dialog::file_dialog(type in_type,
             command.push_back("--confirm-overwrite");
         if (options & opt::multiselect)
             command.push_back("--multiple");
-    }
-    else if (is_kdialog())
-    {
-        switch (in_type)
-        {
-            case type::save: command.push_back("--getsavefilename"); break;
-            case type::open: command.push_back("--getopenfilename"); break;
-            case type::folder: command.push_back("--getexistingdirectory"); break;
+    } else if (is_kdialog()) {
+        switch (in_type) {
+            case type::save:
+                command.push_back("--getsavefilename");
+                break;
+            case type::open:
+                command.push_back("--getopenfilename");
+                break;
+            case type::folder:
+                command.push_back("--getexistingdirectory");
+                break;
         }
-        if (options & opt::multiselect)
-        {
+        if (options & opt::multiselect) {
             command.push_back("--multiple");
             command.push_back("--separate-output");
         }
@@ -1356,8 +1242,7 @@ inline internal::file_dialog::file_dialog(type in_type,
 #endif
 }
 
-inline std::string internal::file_dialog::string_result()
-{
+inline std::string internal::file_dialog::string_result() {
 #if _WIN32
     return m_async->result();
 #else
@@ -1370,16 +1255,14 @@ inline std::string internal::file_dialog::string_result()
 #endif
 }
 
-inline std::vector<std::string> internal::file_dialog::vector_result()
-{
+inline std::vector<std::string> internal::file_dialog::vector_result() {
 #if _WIN32
     m_async->result();
     return m_vector_result;
 #else
     std::vector<std::string> ret;
     auto result = m_async->result();
-    for (;;)
-    {
+    for (;;) {
         // Split result along newline characters
         auto i = result.find('\n');
         if (i == 0 || i == std::string::npos)
@@ -1393,12 +1276,9 @@ inline std::vector<std::string> internal::file_dialog::vector_result()
 
 #if _WIN32
 // Use a static function to pass as BFFCALLBACK for legacy folder select
-inline int CALLBACK internal::file_dialog::bffcallback(HWND hwnd, UINT uMsg,
-                                                       LPARAM, LPARAM pData)
-{
-    auto inst = (file_dialog *)pData;
-    switch (uMsg)
-    {
+inline int CALLBACK internal::file_dialog::bffcallback(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData) {
+    auto inst = (file_dialog*)pData;
+    switch (uMsg) {
         case BFFM_INITIALIZED:
             SendMessage(hwnd, BFFM_SETSELECTIONW, TRUE, (LPARAM)inst->m_wdefault_path.c_str());
             break;
@@ -1407,23 +1287,19 @@ inline int CALLBACK internal::file_dialog::bffcallback(HWND hwnd, UINT uMsg,
 }
 
 #if PFD_HAS_IFILEDIALOG
-inline std::string internal::file_dialog::select_folder_vista(IFileDialog *ifd, bool force_path)
-{
+inline std::string internal::file_dialog::select_folder_vista(IFileDialog* ifd, bool force_path) {
     std::string result;
 
-    IShellItem *folder;
+    IShellItem* folder;
 
     // Load library at runtime so app doesn't link it at load time (which will fail on windows XP)
     dll shell32("shell32.dll");
-    dll::proc<HRESULT WINAPI (PCWSTR, IBindCtx*, REFIID, void**)>
-        create_item(shell32, "SHCreateItemFromParsingName");
+    dll::proc<HRESULT WINAPI(PCWSTR, IBindCtx*, REFIID, void**)> create_item(shell32, "SHCreateItemFromParsingName");
 
     if (!create_item)
         return "";
 
-    auto hr = create_item(m_wdefault_path.c_str(),
-                          nullptr,
-                          IID_PPV_ARGS(&folder));
+    auto hr = create_item(m_wdefault_path.c_str(), nullptr, IID_PPV_ARGS(&folder));
 
     // Set default folder if found. This only sets the default folder. If
     // Windows has any info about the most recently selected folder, it
@@ -1431,8 +1307,7 @@ inline std::string internal::file_dialog::select_folder_vista(IFileDialog *ifd,
     // current directory “is not a good or expected user experience and
     // should therefore be avoided”:
     // https://docs.microsoft.com/windows/win32/api/shobjidl_core/nf-shobjidl_core-ifiledialog-setfolder
-    if (SUCCEEDED(hr))
-    {
+    if (SUCCEEDED(hr)) {
         if (force_path)
             ifd->SetFolder(folder);
         else
@@ -1445,29 +1320,22 @@ inline std::string internal::file_dialog::select_folder_vista(IFileDialog *ifd,
     ifd->SetTitle(m_wtitle.c_str());
 
     hr = ifd->Show(GetActiveWindow());
-    if (SUCCEEDED(hr))
-    {
+    if (SUCCEEDED(hr)) {
         IShellItem* item;
         hr = ifd->GetResult(&item);
-        if (SUCCEEDED(hr))
-        {
+        if (SUCCEEDED(hr)) {
             wchar_t* wname = nullptr;
             // This is unlikely to fail because we use FOS_FORCEFILESYSTEM, but try
             // to output a debug message just in case.
-            if (SUCCEEDED(item->GetDisplayName(SIGDN_FILESYSPATH, &wname)))
-            {
+            if (SUCCEEDED(item->GetDisplayName(SIGDN_FILESYSPATH, &wname))) {
                 result = internal::wstr2str(std::wstring(wname));
-                dll::proc<void WINAPI (LPVOID)>(ole32_dll(), "CoTaskMemFree")(wname);
-            }
-            else
-            {
-                if (SUCCEEDED(item->GetDisplayName(SIGDN_NORMALDISPLAY, &wname)))
-                {
+                dll::proc<void WINAPI(LPVOID)>(ole32_dll(), "CoTaskMemFree")(wname);
+            } else {
+                if (SUCCEEDED(item->GetDisplayName(SIGDN_NORMALDISPLAY, &wname))) {
                     auto name = internal::wstr2str(std::wstring(wname));
-                    dll::proc<void WINAPI (LPVOID)>(ole32_dll(), "CoTaskMemFree")(wname);
+                    dll::proc<void WINAPI(LPVOID)>(ole32_dll(), "CoTaskMemFree")(wname);
                     std::cerr << "pfd: failed to get path for " << name << std::endl;
-                }
-                else
+                } else
                     std::cerr << "pfd: item of unknown type selected" << std::endl;
             }
 
@@ -1484,10 +1352,7 @@ inline std::string internal::file_dialog::select_folder_vista(IFileDialog *ifd,
 
 // notify implementation
 
-inline notify::notify(std::string const &title,
-                      std::string const &message,
-                      icon _icon /* = icon::info */)
-{
+inline notify::notify(std::string const& title, std::string const& message, icon _icon /* = icon::info */) {
     if (_icon == icon::question) // Not supported by notifications
         _icon = icon::info;
 
@@ -1495,9 +1360,10 @@ inline notify::notify(std::string const &title,
     // Use a static shared pointer for notify_icon so that we can delete
     // it whenever we need to display a new one, and we can also wait
     // until the program has finished running.
-    struct notify_icon_data : public NOTIFYICONDATAW
-    {
-        ~notify_icon_data() { Shell_NotifyIconW(NIM_DELETE, this); }
+    struct notify_icon_data : public NOTIFYICONDATAW {
+        ~notify_icon_data() {
+            Shell_NotifyIconW(NIM_DELETE, this);
+        }
     };
 
     static std::shared_ptr<notify_icon_data> nid;
@@ -1518,7 +1384,8 @@ inline notify::notify(std::string const &title,
     // - NIF_MESSAGE The uCallbackMessage member is valid.
     // - NIF_TIP     The szTip member is valid.
     // - NIF_STATE   The dwState and dwStateMask members are valid.
-    // - NIF_INFO    Use a balloon ToolTip instead of a standard ToolTip. The szInfo, uTimeout, szInfoTitle, and dwInfoFlags members are valid.
+    // - NIF_INFO    Use a balloon ToolTip instead of a standard ToolTip. The szInfo, uTimeout, szInfoTitle, and
+    // dwInfoFlags members are valid.
     // - NIF_GUID    Reserved.
     nid->uFlags = NIF_MESSAGE | NIF_ICON | NIF_INFO;
 
@@ -1529,16 +1396,20 @@ inline notify::notify(std::string const &title,
     // - NIIF_WARNING   A warning icon.
     // - NIIF_ICON_MASK Version 6.0. Reserved.
     // - NIIF_NOSOUND   Version 6.0. Do not play the associated sound. Applies only to balloon ToolTips
-    switch (_icon)
-    {
-        case icon::warning: nid->dwInfoFlags = NIIF_WARNING; break;
-        case icon::error: nid->dwInfoFlags = NIIF_ERROR; break;
-        /* case icon::info: */ default: nid->dwInfoFlags = NIIF_INFO; break;
+    switch (_icon) {
+        case icon::warning:
+            nid->dwInfoFlags = NIIF_WARNING;
+            break;
+        case icon::error:
+            nid->dwInfoFlags = NIIF_ERROR;
+            break;
+        /* case icon::info: */ default:
+            nid->dwInfoFlags = NIIF_INFO;
+            break;
     }
 
-    ENUMRESNAMEPROC icon_enum_callback = [](HMODULE, LPCTSTR, LPTSTR lpName, LONG_PTR lParam) -> BOOL
-    {
-        ((NOTIFYICONDATAW *)lParam)->hIcon = ::LoadIcon(GetModuleHandle(nullptr), lpName);
+    ENUMRESNAMEPROC icon_enum_callback = [](HMODULE, LPCTSTR, LPTSTR lpName, LONG_PTR lParam) -> BOOL {
+        ((NOTIFYICONDATAW*)lParam)->hIcon = ::LoadIcon(GetModuleHandle(nullptr), lpName);
         return false;
     };
 
@@ -1559,22 +1430,16 @@ inline notify::notify(std::string const &title,
 #else
     auto command = desktop_helper();
 
-    if (is_osascript())
-    {
+    if (is_osascript()) {
         command.push_back("-e");
-        command.push_back("display notification " + osascript_quote(message) +
-                          " with title " + osascript_quote(title));
-    }
-    else if (is_zenity())
-    {
+        command.push_back("display notification " + osascript_quote(message) + " with title " + osascript_quote(title));
+    } else if (is_zenity()) {
         command.push_back("--notification");
         command.push_back("--window-icon");
         command.push_back(get_icon_name(_icon));
         command.push_back("--text");
         command.push_back(title + "\n" + message);
-    }
-    else if (is_kdialog())
-    {
+    } else if (is_kdialog()) {
         command.push_back("--icon");
         command.push_back(get_icon_name(_icon));
         command.push_back("--title");
@@ -1593,31 +1458,46 @@ inline notify::notify(std::string const &title,
 
 // message implementation
 
-inline message::message(std::string const &title,
-                        std::string const &text,
-                        choice _choice /* = choice::ok_cancel */,
-                        icon _icon /* = icon::info */)
-{
+inline message::message(std::string const& title, std::string const& text, choice _choice /* = choice::ok_cancel */,
+                        icon _icon /* = icon::info */) {
 #if _WIN32
     // Use MB_SYSTEMMODAL rather than MB_TOPMOST to ensure the message window is brought
     // to front. See https://github.com/samhocevar/portable-file-dialogs/issues/52
     UINT style = MB_SYSTEMMODAL;
-    switch (_icon)
-    {
-        case icon::warning: style |= MB_ICONWARNING; break;
-        case icon::error: style |= MB_ICONERROR; break;
-        case icon::question: style |= MB_ICONQUESTION; break;
-        /* case icon::info: */ default: style |= MB_ICONINFORMATION; break;
+    switch (_icon) {
+        case icon::warning:
+            style |= MB_ICONWARNING;
+            break;
+        case icon::error:
+            style |= MB_ICONERROR;
+            break;
+        case icon::question:
+            style |= MB_ICONQUESTION;
+            break;
+        /* case icon::info: */ default:
+            style |= MB_ICONINFORMATION;
+            break;
     }
 
-    switch (_choice)
-    {
-        case choice::ok_cancel: style |= MB_OKCANCEL; break;
-        case choice::yes_no: style |= MB_YESNO; break;
-        case choice::yes_no_cancel: style |= MB_YESNOCANCEL; break;
-        case choice::retry_cancel: style |= MB_RETRYCANCEL; break;
-        case choice::abort_retry_ignore: style |= MB_ABORTRETRYIGNORE; break;
-        /* case choice::ok: */ default: style |= MB_OK; break;
+    switch (_choice) {
+        case choice::ok_cancel:
+            style |= MB_OKCANCEL;
+            break;
+        case choice::yes_no:
+            style |= MB_YESNO;
+            break;
+        case choice::yes_no_cancel:
+            style |= MB_YESNOCANCEL;
+            break;
+        case choice::retry_cancel:
+            style |= MB_RETRYCANCEL;
+            break;
+        case choice::abort_retry_ignore:
+            style |= MB_ABORTRETRYIGNORE;
+            break;
+        /* case choice::ok: */ default:
+            style |= MB_OK;
+            break;
     }
 
     m_mappings[IDCANCEL] = button::cancel;
@@ -1628,8 +1508,7 @@ inline message::message(std::string const &title,
     m_mappings[IDRETRY] = button::retry;
     m_mappings[IDIGNORE] = button::ignore;
 
-    m_async->start_func([text, title, style](int* exit_code) -> std::string
-    {
+    m_async->start_func([text, title, style](int* exit_code) -> std::string {
         auto wtext = internal::str2wstr(text);
         auto wtitle = internal::str2wstr(title);
         // Apply new visual style (required for all Windows versions)
@@ -1640,12 +1519,19 @@ inline message::message(std::string const &title,
 
 #elif __EMSCRIPTEN__
     std::string full_message;
-    switch (_icon)
-    {
-        case icon::warning: full_message = "⚠️"; break;
-        case icon::error: full_message = "⛔"; break;
-        case icon::question: full_message = "❓"; break;
-        /* case icon::info: */ default: full_message = "ℹ"; break;
+    switch (_icon) {
+        case icon::warning:
+            full_message = "⚠️";
+            break;
+        case icon::error:
+            full_message = "⛔";
+            break;
+        case icon::question:
+            full_message = "❓";
+            break;
+        /* case icon::info: */ default:
+            full_message = "ℹ";
+            break;
     }
 
     full_message += ' ' + title + "\n\n" + text;
@@ -1653,22 +1539,20 @@ inline message::message(std::string const &title,
     // This does not really start an async task; it just passes the
     // EM_ASM_INT return value to a fake start() function.
     m_async->start(EM_ASM_INT(
-    {
-        if ($1)
-            return window.confirm(UTF8ToString($0)) ? 0 : -1;
-        alert(UTF8ToString($0));
-        return 0;
-    }, full_message.c_str(), _choice == choice::ok_cancel));
+        {
+            if ($1)
+                return window.confirm(UTF8ToString($0)) ? 0 : -1;
+            alert(UTF8ToString($0));
+            return 0;
+        },
+        full_message.c_str(), _choice == choice::ok_cancel));
 #else
     auto command = desktop_helper();
 
-    if (is_osascript())
-    {
-        std::string script = "display dialog " + osascript_quote(text) +
-                             " with title " + osascript_quote(title);
+    if (is_osascript()) {
+        std::string script = "display dialog " + osascript_quote(text) + " with title " + osascript_quote(title);
         auto if_cancel = button::cancel;
-        switch (_choice)
-        {
+        switch (_choice) {
             case choice::ok_cancel:
                 script += "buttons {\"OK\", \"Cancel\"}"
                           " default button \"OK\""
@@ -1696,7 +1580,8 @@ inline message::message(std::string const &title,
                           " cancel button \"Retry\"";
                 if_cancel = button::retry;
                 break;
-            case choice::ok: default:
+            case choice::ok:
+            default:
                 script += "buttons {\"OK\"}"
                           " default button \"OK\""
                           " cancel button \"OK\"";
@@ -1706,65 +1591,82 @@ inline message::message(std::string const &title,
         m_mappings[1] = if_cancel;
         m_mappings[256] = if_cancel; // XXX: I think this was never correct
         script += " with icon ";
-        switch (_icon)
-        {
-            #define PFD_OSX_ICON(n) "alias ((path to library folder from system domain) as text " \
-                "& \"CoreServices:CoreTypes.bundle:Contents:Resources:" n ".icns\")"
-            case icon::info: default: script += PFD_OSX_ICON("ToolBarInfo"); break;
-            case icon::warning: script += "caution"; break;
-            case icon::error: script += "stop"; break;
-            case icon::question: script += PFD_OSX_ICON("GenericQuestionMarkIcon"); break;
-            #undef PFD_OSX_ICON
+        switch (_icon) {
+#define PFD_OSX_ICON(n)                                           \
+    "alias ((path to library folder from system domain) as text " \
+    "& \"CoreServices:CoreTypes.bundle:Contents:Resources:" n ".icns\")"
+            case icon::info:
+            default:
+                script += PFD_OSX_ICON("ToolBarInfo");
+                break;
+            case icon::warning:
+                script += "caution";
+                break;
+            case icon::error:
+                script += "stop";
+                break;
+            case icon::question:
+                script += PFD_OSX_ICON("GenericQuestionMarkIcon");
+                break;
+#undef PFD_OSX_ICON
         }
 
         command.push_back("-e");
         command.push_back(script);
-    }
-    else if (is_zenity())
-    {
-        switch (_choice)
-        {
+    } else if (is_zenity()) {
+        switch (_choice) {
             case choice::ok_cancel:
-                command.insert(command.end(), { "--question", "--cancel-label=Cancel", "--ok-label=OK" }); break;
+                command.insert(command.end(), { "--question", "--cancel-label=Cancel", "--ok-label=OK" });
+                break;
             case choice::yes_no:
                 // Do not use standard --question because it causes “No” to return -1,
                 // which is inconsistent with the “Yes/No/Cancel” mode below.
-                command.insert(command.end(), { "--question", "--switch", "--extra-button=No", "--extra-button=Yes" }); break;
+                command.insert(command.end(), { "--question", "--switch", "--extra-button=No", "--extra-button=Yes" });
+                break;
             case choice::yes_no_cancel:
-                command.insert(command.end(), { "--question", "--switch", "--extra-button=Cancel", "--extra-button=No", "--extra-button=Yes" }); break;
+                command.insert(command.end(), { "--question", "--switch", "--extra-button=Cancel", "--extra-button=No",
+                                                "--extra-button=Yes" });
+                break;
             case choice::retry_cancel:
-                command.insert(command.end(), { "--question", "--switch", "--extra-button=Cancel", "--extra-button=Retry" }); break;
+                command.insert(command.end(),
+                               { "--question", "--switch", "--extra-button=Cancel", "--extra-button=Retry" });
+                break;
             case choice::abort_retry_ignore:
-                command.insert(command.end(), { "--question", "--switch", "--extra-button=Ignore", "--extra-button=Abort", "--extra-button=Retry" }); break;
+                command.insert(command.end(), { "--question", "--switch", "--extra-button=Ignore",
+                                                "--extra-button=Abort", "--extra-button=Retry" });
+                break;
             case choice::ok:
             default:
-                switch (_icon)
-                {
-                    case icon::error: command.push_back("--error"); break;
-                    case icon::warning: command.push_back("--warning"); break;
-                    default: command.push_back("--info"); break;
+                switch (_icon) {
+                    case icon::error:
+                        command.push_back("--error");
+                        break;
+                    case icon::warning:
+                        command.push_back("--warning");
+                        break;
+                    default:
+                        command.push_back("--info");
+                        break;
                 }
         }
 
-        command.insert(command.end(), { "--title", title,
-                                        "--width=300", "--height=0", // sensible defaults
+        command.insert(command.end(), { "--title", title, "--width=300", "--height=0", // sensible defaults
                                         "--no-markup", // do not interpret text as Pango markup
-                                        "--text", text,
-                                        "--icon-name=dialog-" + get_icon_name(_icon) });
-    }
-    else if (is_kdialog())
-    {
-        if (_choice == choice::ok)
-        {
-            switch (_icon)
-            {
-                case icon::error: command.push_back("--error"); break;
-                case icon::warning: command.push_back("--sorry"); break;
-                default: command.push_back("--msgbox"); break;
+                                        "--text", text, "--icon-name=dialog-" + get_icon_name(_icon) });
+    } else if (is_kdialog()) {
+        if (_choice == choice::ok) {
+            switch (_icon) {
+                case icon::error:
+                    command.push_back("--error");
+                    break;
+                case icon::warning:
+                    command.push_back("--sorry");
+                    break;
+                default:
+                    command.push_back("--msgbox");
+                    break;
             }
-        }
-        else
-        {
+        } else {
             std::string flag = "--";
             if (_icon == icon::warning || _icon == icon::error)
                 flag += "warning";
@@ -1772,8 +1674,7 @@ inline message::message(std::string const &title,
             if (_choice == choice::yes_no_cancel)
                 flag += "cancel";
             command.push_back(flag);
-            if (_choice == choice::yes_no || _choice == choice::yes_no_cancel)
-            {
+            if (_choice == choice::yes_no || _choice == choice::yes_no_cancel) {
                 m_mappings[0] = button::yes;
                 m_mappings[256] = button::no;
             }
@@ -1795,8 +1696,7 @@ inline message::message(std::string const &title,
 #endif
 }
 
-inline button message::result()
-{
+inline button message::result() {
     int exit_code;
     auto ret = m_async->result(&exit_code);
     // osascript will say "button returned:Cancel\n"
@@ -1822,63 +1722,46 @@ inline button message::result()
 
 // open_file implementation
 
-inline open_file::open_file(std::string const &title,
-                            std::string const &default_path /* = "" */,
-                            std::vector<std::string> const &filters /* = { "All Files", "*" } */,
+inline open_file::open_file(std::string const& title, std::string const& default_path /* = "" */,
+                            std::vector<std::string> const& filters /* = { "All Files", "*" } */,
                             opt options /* = opt::none */)
-  : file_dialog(type::open, title, default_path, filters, options)
-{
+    : file_dialog(type::open, title, default_path, filters, options) {
 }
 
-inline open_file::open_file(std::string const &title,
-                            std::string const &default_path,
-                            std::vector<std::string> const &filters,
-                            bool allow_multiselect)
-  : open_file(title, default_path, filters,
-              (allow_multiselect ? opt::multiselect : opt::none))
-{
+inline open_file::open_file(std::string const& title, std::string const& default_path,
+                            std::vector<std::string> const& filters, bool allow_multiselect)
+    : open_file(title, default_path, filters, (allow_multiselect ? opt::multiselect : opt::none)) {
 }
 
-inline std::vector<std::string> open_file::result()
-{
+inline std::vector<std::string> open_file::result() {
     return vector_result();
 }
 
 // save_file implementation
 
-inline save_file::save_file(std::string const &title,
-                            std::string const &default_path /* = "" */,
-                            std::vector<std::string> const &filters /* = { "All Files", "*" } */,
+inline save_file::save_file(std::string const& title, std::string const& default_path /* = "" */,
+                            std::vector<std::string> const& filters /* = { "All Files", "*" } */,
                             opt options /* = opt::none */)
-  : file_dialog(type::save, title, default_path, filters, options)
-{
+    : file_dialog(type::save, title, default_path, filters, options) {
 }
 
-inline save_file::save_file(std::string const &title,
-                            std::string const &default_path,
-                            std::vector<std::string> const &filters,
-                            bool confirm_overwrite)
-  : save_file(title, default_path, filters,
-              (confirm_overwrite ? opt::none : opt::force_overwrite))
-{
+inline save_file::save_file(std::string const& title, std::string const& default_path,
+                            std::vector<std::string> const& filters, bool confirm_overwrite)
+    : save_file(title, default_path, filters, (confirm_overwrite ? opt::none : opt::force_overwrite)) {
 }
 
-inline std::string save_file::result()
-{
+inline std::string save_file::result() {
     return string_result();
 }
 
 // select_folder implementation
 
-inline select_folder::select_folder(std::string const &title,
-                                    std::string const &default_path /* = "" */,
+inline select_folder::select_folder(std::string const& title, std::string const& default_path /* = "" */,
                                     opt options /* = opt::none */)
-  : file_dialog(type::folder, title, default_path, {}, options)
-{
+    : file_dialog(type::folder, title, default_path, {}, options) {
 }
 
-inline std::string select_folder::result()
-{
+inline std::string select_folder::result() {
     return string_result();
 }
 
diff --git a/soh/soh/GbiWrap.cpp b/soh/soh/GbiWrap.cpp
index 2dad29e606..0a26e9b186 100644
--- a/soh/soh/GbiWrap.cpp
+++ b/soh/soh/GbiWrap.cpp
@@ -1,6 +1,6 @@
 #include "z64.h"
 
-//OTRTODO - this is awful
+// OTRTODO - this is awful
 
 extern "C" {
 void InitOTR();
@@ -29,10 +29,8 @@ CollisionHeader* ResourceMgr_LoadColByName(char* path);
 uint64_t GetPerfCounter();
 int ResourceMgr_OTRSigCheck(char* imgData);
 void ResourceMgr_PushCurrentDirectory(char* path);
-
 }
 
-
 extern "C" void gSPSegment(void* value, int segNum, uintptr_t target) {
     char* imgData = (char*)target;
 
@@ -70,9 +68,9 @@ extern "C" void gSPDisplayList(Gfx* pkt, Gfx* dl) {
     char* imgData = (char*)dl;
 
     if (ResourceMgr_OTRSigCheck(imgData) == 1) {
-        
-        //ResourceMgr_PushCurrentDirectory(imgData);
-        //gsSPPushCD(pkt++, imgData);
+
+        // ResourceMgr_PushCurrentDirectory(imgData);
+        // gsSPPushCD(pkt++, imgData);
         dl = ResourceMgr_LoadGfxByName(imgData);
     }
 
@@ -96,15 +94,14 @@ extern "C" void gSPVertex(Gfx* pkt, uintptr_t v, int n, int v0) {
     __gSPVertex(pkt, v, n, v0);
 }
 
-extern "C" void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr)
-{
+extern "C" void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr) {
     char* imgData = (char*)texAddr;
-    
+
     if (texAddr != 0 && ResourceMgr_OTRSigCheck(imgData)) {
         // Temporary solution to the mq/nonmq issue, this will be
         // handled better with LUS 1.0
-        texAddr = (uintptr_t)ResourceMgr_LoadTexOrDListByName(imgData); 
+        texAddr = (uintptr_t)ResourceMgr_LoadTexOrDListByName(imgData);
     }
 
     __gSPInvalidateTexCache(pkt, texAddr);
- }
+}
diff --git a/soh/soh/Network/CrowdControl/CrowdControl.cpp b/soh/soh/Network/CrowdControl/CrowdControl.cpp
index 131ae54b38..fd293d8bab 100644
--- a/soh/soh/Network/CrowdControl/CrowdControl.cpp
+++ b/soh/soh/Network/CrowdControl/CrowdControl.cpp
@@ -19,7 +19,8 @@ extern PlayState* gPlayState;
 }
 
 void CrowdControl::Enable() {
-    Network::Enable(CVarGetString(CVAR_REMOTE_CROWD_CONTROL("Host"), "127.0.0.1"), CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Port"), 43384));
+    Network::Enable(CVarGetString(CVAR_REMOTE_CROWD_CONTROL("Host"), "127.0.0.1"),
+                    CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Port"), 43384));
 }
 
 void CrowdControl::OnConnected() {
@@ -44,7 +45,8 @@ void CrowdControl::OnIncomingJson(nlohmann::json payload) {
         // If another timed effect is already active that conflicts with the incoming effect.
         bool isConflictingEffectActive = false;
         for (Effect* effect : activeEffects) {
-            if (effect != incomingEffect && effect->category == incomingEffect->category && effect->id < incomingEffect->id) {
+            if (effect != incomingEffect && effect->category == incomingEffect->category &&
+                effect->id < incomingEffect->id) {
                 isConflictingEffectActive = true;
                 EmitMessage(incomingEffect->id, incomingEffect->timeRemaining, EffectResult::Retry);
                 break;
@@ -75,14 +77,14 @@ void CrowdControl::ProcessActiveEffects() {
         auto it = activeEffects.begin();
 
         while (it != activeEffects.end()) {
-            Effect *effect = *it;
+            Effect* effect = *it;
             EffectResult result = CrowdControl::ExecuteEffect(effect);
 
             if (result == EffectResult::Success) {
                 // If time remaining has reached 0, we have finished the effect.
                 if (effect->timeRemaining <= 0) {
                     it = activeEffects.erase(std::remove(activeEffects.begin(), activeEffects.end(), effect),
-                                        activeEffects.end());
+                                             activeEffects.end());
                     GameInteractor::RemoveEffect(dynamic_cast<RemovableGameInteractionEffect*>(effect->giEffect));
                     delete effect;
                 } else {
@@ -90,9 +92,9 @@ void CrowdControl::ProcessActiveEffects() {
                     if (effect->isPaused) {
                         effect->isPaused = false;
                         EmitMessage(effect->id, effect->timeRemaining, EffectResult::Resumed);
-                    // If not paused before, subtract time from the timer and send a Success event if
-                    // the result is different from the last time this was ran.
-                    // Timed events are put on a thread that runs once per second.
+                        // If not paused before, subtract time from the timer and send a Success event if
+                        // the result is different from the last time this was ran.
+                        // Timed events are put on a thread that runs once per second.
                     } else {
                         effect->timeRemaining -= 1000;
                         if (result != effect->lastExecutionResult) {
@@ -333,7 +335,8 @@ CrowdControl::Effect* CrowdControl::ParseMessage(nlohmann::json dataReceived) {
             effect->category = kEffectCatBoots;
             effect->timeRemaining = 30000;
             effect->giEffect = new GameInteractionEffect::ForceEquipBoots();
-            dynamic_cast<ParameterizedGameInteractionEffect*>(effect->giEffect)->parameters[0] = EQUIP_VALUE_BOOTS_HOVER;
+            dynamic_cast<ParameterizedGameInteractionEffect*>(effect->giEffect)->parameters[0] =
+                EQUIP_VALUE_BOOTS_HOVER;
             break;
         case kEffectSlipperyFloor:
             effect->category = kEffectCatSlipperyFloor;
@@ -626,76 +629,4 @@ CrowdControl::Effect* CrowdControl::ParseMessage(nlohmann::json dataReceived) {
 
     return effect;
 }
-
-void CrowdControl::DrawMenu() {
-    ImGui::PushID("CrowdControl");
-
-    static std::string host = CVarGetString(CVAR_REMOTE_CROWD_CONTROL("Host"), "127.0.0.1");
-    static uint16_t port = CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Port"), 43384);
-    bool isFormValid = !SohUtils::IsStringEmpty(host) && port > 1024 && port < 65535;
-
-    ImGui::SeparatorText("Crowd Control");
-    UIWidgets::Tooltip(
-        "Crowd Control is a platform that allows viewers to interact "
-        "with a streamer's game in real time.\n"
-        "\n"
-        "Click the question mark to copy the link to the Crowd Control "
-        "website to your clipboard."
-    );
-    if (ImGui::IsItemClicked()) {
-        ImGui::SetClipboardText("https://crowdcontrol.live");
-    }
-
-    ImGui::BeginDisabled(isEnabled);
-    ImGui::Text("Host & Port");
-    if (UIWidgets::InputString("##Host", &host)) {
-        CVarSetString(CVAR_REMOTE_CROWD_CONTROL("Host"), host.c_str());
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-
-    ImGui::SameLine();
-    ImGui::PushItemWidth(ImGui::GetFontSize() * 5);
-    if (ImGui::InputScalar("##Port", ImGuiDataType_U16, &port)) {
-        CVarSetInteger(CVAR_REMOTE_CROWD_CONTROL("Port"), port);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    ImGui::PopItemWidth();
-    ImGui::EndDisabled();
-
-    ImGui::Spacing();
-
-    ImGui::BeginDisabled(!isFormValid);
-    const char* buttonLabel = isEnabled ? "Disable" : "Enable";
-    if (ImGui::Button(buttonLabel, ImVec2(-1.0f, 0.0f))) {
-        if (isEnabled) {
-            CVarClear(CVAR_REMOTE_CROWD_CONTROL("Enabled"));
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            Disable();
-        } else {
-            CVarSetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 1);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            Enable();
-        }
-    }
-    ImGui::EndDisabled();
-
-    if (isEnabled) {
-        ImGui::Spacing();
-        if (isConnected) {
-            ImGui::Text("Connected");
-        } else {
-            ImGui::Text("Connecting...");
-        }
-    }
-
-    UIWidgets::PaddedEnhancementCheckbox("Enemy Name Tags", CVAR_ENHANCEMENT("CrowdControl.EnemyNameTags"), true,
-                                         false);
-    UIWidgets::Tooltip("When viewers spawn enemies, the enemy will have a name tag above them with the viewer's name.");
-    UIWidgets::PaddedEnhancementCheckbox("Spawned Enemies Ignored Ingame", CVAR_ENHANCEMENT("CrowdControl.SpawnedEnemiesIgnoredIngame"), true,
-                                         false);
-    UIWidgets::Tooltip("Enemies spawned by CrowdControl won't be considered for \"clear enemy rooms\", so they don't need to be killed to complete these rooms.");
-    
-    ImGui::PopID();
-}
-
 #endif
diff --git a/soh/soh/Network/CrowdControl/CrowdControl.h b/soh/soh/Network/CrowdControl/CrowdControl.h
index a8e4b82cc6..f906961c33 100644
--- a/soh/soh/Network/CrowdControl/CrowdControl.h
+++ b/soh/soh/Network/CrowdControl/CrowdControl.h
@@ -11,81 +11,78 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 class CrowdControl : public Network {
-    private:
-        enum EffectResult {
-            /// <summary>The effect executed successfully.</summary>
-            Success = 0x00,
-            /// <summary>The effect failed to trigger, but is still available for use. Viewer(s) will be refunded. You probably don't want this.</summary>
-            Failure = 0x01,
-            /// <summary>Same as <see cref="Failure"/> but the effect is no longer available for use for the remainder of the game. You probably don't want this.</summary>
-            Unavailable = 0x02,
-            /// <summary>The effect cannot be triggered right now, try again in a few seconds. This is the "normal" failure response.</summary>
-            Retry = 0x03,
-            /// <summary>INTERNAL USE ONLY. The effect has been queued for execution after the current one ends.</summary>
-            Queue = 0x04,
-            /// <summary>INTERNAL USE ONLY. The effect triggered successfully and is now active until it ends.</summary>
-            Running = 0x05,
-            /// <summary>The timed effect has been paused and is now waiting.</summary>
-            Paused = 0x06,
-            /// <summary>The timed effect has been resumed and is counting down again.</summary>
-            Resumed = 0x07,
-            /// <summary>The timed effect has finished.</summary>
-            Finished = 0x08,
-            /// <summary>Effect is being initiated. SoH exclusive to check against if an effect state has changed or not.</summary>
-            Initiate = 0xFE,
-            /// <summary>The processor isn't ready to start or has shut down.</summary>
-            NotReady = 0xFF
-        };
+  private:
+    enum EffectResult {
+        /// <summary>The effect executed successfully.</summary>
+        Success = 0x00,
+        /// <summary>The effect failed to trigger, but is still available for use. Viewer(s) will be refunded. You
+        /// probably don't want this.</summary>
+        Failure = 0x01,
+        /// <summary>Same as <see cref="Failure"/> but the effect is no longer available for use for the remainder of
+        /// the game. You probably don't want this.</summary>
+        Unavailable = 0x02,
+        /// <summary>The effect cannot be triggered right now, try again in a few seconds. This is the "normal" failure
+        /// response.</summary>
+        Retry = 0x03,
+        /// <summary>INTERNAL USE ONLY. The effect has been queued for execution after the current one ends.</summary>
+        Queue = 0x04,
+        /// <summary>INTERNAL USE ONLY. The effect triggered successfully and is now active until it ends.</summary>
+        Running = 0x05,
+        /// <summary>The timed effect has been paused and is now waiting.</summary>
+        Paused = 0x06,
+        /// <summary>The timed effect has been resumed and is counting down again.</summary>
+        Resumed = 0x07,
+        /// <summary>The timed effect has finished.</summary>
+        Finished = 0x08,
+        /// <summary>Effect is being initiated. SoH exclusive to check against if an effect state has changed or
+        /// not.</summary>
+        Initiate = 0xFE,
+        /// <summary>The processor isn't ready to start or has shut down.</summary>
+        NotReady = 0xFF
+    };
 
-        enum ResponseType {
-            EffectRequest = 0x00,
-            Login = 0xF0,
-            LoginSuccess = 0xF1,
-            Disconnect = 0xFE,
-            KeepAlive = 0xFF
-        };
+    enum ResponseType { EffectRequest = 0x00, Login = 0xF0, LoginSuccess = 0xF1, Disconnect = 0xFE, KeepAlive = 0xFF };
 
-        struct Response {
-            int id;
-            EffectResult status;
-            long timeRemaining;
-            ResponseType type = ResponseType::EffectRequest;
-        };
+    struct Response {
+        int id;
+        EffectResult status;
+        long timeRemaining;
+        ResponseType type = ResponseType::EffectRequest;
+    };
 
-        typedef struct Effect {
-            uint32_t id;
-            uint32_t spawnParams[2];
-            uint32_t category = 0;
-            long timeRemaining;
-            GameInteractionEffectBase *giEffect;
-            std::string viewerName;
+    typedef struct Effect {
+        uint32_t id;
+        uint32_t spawnParams[2];
+        uint32_t category = 0;
+        long timeRemaining;
+        GameInteractionEffectBase* giEffect;
+        std::string viewerName;
 
-            // Metadata used while executing (only for timed effects)
-            bool isPaused;
-            EffectResult lastExecutionResult;
-        } Effect;
-        
-        std::thread ccThreadProcess;
+        // Metadata used while executing (only for timed effects)
+        bool isPaused;
+        EffectResult lastExecutionResult;
+    } Effect;
 
-        std::vector<Effect*> activeEffects;
-        std::mutex activeEffectsMutex;
+    std::thread ccThreadProcess;
 
-        void HandleRemoteData(nlohmann::json payload);
-        void ProcessActiveEffects();
+    std::vector<Effect*> activeEffects;
+    std::mutex activeEffectsMutex;
 
-        void EmitMessage(uint32_t eventId, long timeRemaining, EffectResult status);
-        Effect* ParseMessage(nlohmann::json payload);
-        EffectResult ExecuteEffect(Effect* effect);
-        EffectResult CanApplyEffect(Effect *effect);
-        EffectResult TranslateGiEnum(GameInteractionEffectQueryResult giResult);
+    void HandleRemoteData(nlohmann::json payload);
+    void ProcessActiveEffects();
 
-    public:
-        static CrowdControl* Instance;
-        void Enable();
-        void OnIncomingJson(nlohmann::json payload);
-        void OnConnected();
-        void OnDisconnected();
-        void DrawMenu();
+    void EmitMessage(uint32_t eventId, long timeRemaining, EffectResult status);
+    Effect* ParseMessage(nlohmann::json payload);
+    EffectResult ExecuteEffect(Effect* effect);
+    EffectResult CanApplyEffect(Effect* effect);
+    EffectResult TranslateGiEnum(GameInteractionEffectQueryResult giResult);
+
+  public:
+    static CrowdControl* Instance;
+    void Enable();
+    void OnIncomingJson(nlohmann::json payload);
+    void OnConnected();
+    void OnDisconnected();
 };
 
 #endif // __cplusplus
diff --git a/soh/soh/Network/CrowdControl/ShipOfHarkinian.cs b/soh/soh/Network/CrowdControl/ShipOfHarkinian.cs
index 95d1ad0682..554e0d56be 100644
--- a/soh/soh/Network/CrowdControl/ShipOfHarkinian.cs
+++ b/soh/soh/Network/CrowdControl/ShipOfHarkinian.cs
@@ -36,7 +36,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Fire Keese", "spawn_fire_keese") { Category = "Spawn Enemies/Objects", Price = 15, Description = "Do not bring close to Deku Shields. Or do, we're not your parents." },
         new("Wolfos", "spawn_wolfos") { Category = "Spawn Enemies/Objects", Price = 15, Description = "Awooooooo" },
         new("Wallmaster", "spawn_wallmaster") { Category = "Spawn Enemies/Objects", Price = 30, Description = "Need a hand? Try it together with electrocuting Link." },
-        
+
         // Link Modifiers
         new("Take Half Damage", "take_half_damage") { Category = "Link Modifiers", Duration = 30, Price = 20, Description = "Halves the damage Link takes. Won't save the streamer if they're bad at the game though." },
         new("Take Double Damage", "take_double_damage") { Category = "Link Modifiers", Duration = 30, Price = 30, Description = "Doubles the damage Link takes. Turns OoT into Dark Souls.. kinda." },
@@ -52,7 +52,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Disable Ledge Grabs", "no_ledge_grabs") { Category = "Link Modifiers", Duration = 30, Price = 15, Description = "Jump! Pull up-- Oh, woops." },
         new("Random Wind", "random_wind") { Category = "Link Modifiers", Duration = 30, Price = 30, Description = "A wind blows, which changes to a random direction every 5 seconds." },
         new("Random Bonks When Rolling", "random_bonks") { Category = "Link Modifiers", Duration = 60, Price = 15, Description = "Why do I keep bonking while there's nothing here!?" },
-        
+
         // Hurt or Heal Link
         new("Empty Heart", "empty_heart") { Category = "Hurt/Heal Link", Quantity = 20, Price = 10, Description = "Damage Link for however many hearts you choose." },
         new("Fill Heart", "fill_heart") { Category = "Hurt/Heal Link", Quantity = 20, Price = 5, Description = "Heal Link for however many hearts you choose." },
@@ -63,7 +63,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Freeze Link", "freeze_link") { Category = "Hurt/Heal Link", Price = 20, Description = "FREEZE! Don't move!" },
         new("Electrocute Link", "electrocute_link") { Category = "Hurt/Heal Link", Price = 20, Description = "Ganon used Thundershock!" },
         new("Kill Link", "kill_link") { Category = "Hurt/Heal Link", Price = 150, Description = "Rest in RIP." },
-        
+
         // Give Items and Consumables
         new("Add Heart Container", "add_heart_container") { Category = "Give Items/Consumables", Price = 25, Description = "The limit is 20 heart containers." },
         new("Fill Magic", "fill_magic") { Category = "Give Items/Consumables", Price = 20, Description = "Fills the entire magic bar. Abra-kadabra." },
@@ -76,7 +76,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Refill Slingshot Seeds", "refill_seeds") { Category = "Give Items/Consumables", Quantity = 30, Price = 1, Description = "Only works when the player already has a Slingshot." },
         new("Refill Arrows", "refill_arrows") { Category = "Give Items/Consumables", Price = 1, Description = "Only works when the player already has a bow." },
         new("Refill Bombchus", "refill_bombchus") { Category = "Give Items/Consumables", Quantity = 30, Price = 5, Description = "Only works when the player already had Bombchus before." },
-        
+
         // Take Items and Consumables
         new("Remove Heart Container", "remove_heart_container") { Category = "Take Items/Consumables", Price = 35, Description = "The limit is 1 heart. But you wouldn't go that far, would you?" },
         new("Empty Magic", "empty_magic") { Category = "Take Items/Consumables", Price = 25, Description = "Empties the entire magic bar. They didn't need it anyway." },
@@ -89,25 +89,25 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Take Slingshot Seeds", "take_seeds") { Category = "Take Items/Consumables", Quantity = 30, Price = 2, Description = "Who even uses the Slingshot?" },
         new("Take Arrows", "take_arrows") { Category = "Take Items/Consumables", Quantity = 30, Price = 2, Description = "*ploink*" },
         new("Take Bombchus", "take_bombchus") { Category = "Take Items/Consumables", Quantity = 30, Price = 10, Description = "Hopefully they still have some regular bombs." },
-        
+
         // Link Size Modifiers
         new("Giant Lonk", "giant_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Big Lonk equals big sword." },
         new("Minish Link", "minish_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "They say size doesn't matter." },
         new("Paper Link", "paper_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "We might not have a Zelda variant of Paper Mario, but this gets pretty close." },
         new("Squished Link", "squished_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Drop an anvil on Link, but the anvil is invisible." },
         new("Invisible Link", "invisible_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Now you see me, now you don't." },
-        
+
         // Generic Effects
         new("Random Bomb Fuse Timer", "random_bomb_timer") { Category = "Generic Effects", Duration = 60, Price = 5, Description = "Sets the timer for new bombs to either super short, super long or something inbetween (does not work for bombchus)." },
         new("Set Time to Dawn", "set_time_to_dawn") { Category = "Generic Effects", Price = 25, Description = "Sets the time to early day. Might require an area reload to take effect." },
         new("Set Time to Dusk", "set_time_to_dusk") { Category = "Generic Effects", Price = 25, Description = "Sets the time to early night. Might require an area reload to take effect." },
-        
+
         // Visual Effects
         new("No UI", "no_ui") { Category = "Visual Effects", Duration = 60, Price = 20, Description = "No need to see ammo counts. The cinematic experience." },
         new("Rainstorm", "rainstorm") { Category = "Visual Effects", Duration = 30, Price = 5, Description = "Summon a rainstorm for a sad moment." },
         new("Debug Mode", "debug_mode") { Category = "Visual Effects", Duration = 30, Price = 20, Description = "if (debug_mode) { ShowCollision(); }" },
         new("Randomize Cosmetics", "random_cosmetics") { Category = "Visual Effects", Price = 30, Description = "Randomize most cosmetics options. Cosmetics changed by bidding wars are unaffected." },
-        
+
         // Controls
         new("No Z Button", "no_z_button") { Category = "Controls", Duration = 30, Price = 20, Description = "No sidehops, no backflips, no jump attacks, no camera adjustments." },
         new("Reverse Controls", "reverse_controls") { Category = "Controls", Duration = 60, Price = 25, Description = "Just hold the controller upside down." },
@@ -115,7 +115,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
         new("Press Random Buttons", "press_random_buttons") { Category = "Controls", Duration = 30, Price = 25, Description = "Press random buttons on the controller for the duration. Maybe it'll help (spoiler: probably not)." },
         new("Clear C-Buttons", "clear_cbuttons") { Category = "Controls", Price = 10, Description = "Clear the assigned items from the C-buttons." },
         new("Clear D-pad", "clear_dpad") { Category = "Controls", Price = 10, Description = "Clear the assigned items from the D-pad." },
-        
+
         // Teleport Player
         new("Link's House", "tp_links_house") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to Link's House. Welcome Home!" },
         new("Minuet Destination", "tp_minuet") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to Sacred Forest Meadow." },
diff --git a/soh/soh/Network/Sail/Sail.cpp b/soh/soh/Network/Sail/Sail.cpp
index e80405072b..08f23fca56 100644
--- a/soh/soh/Network/Sail/Sail.cpp
+++ b/soh/soh/Network/Sail/Sail.cpp
@@ -7,13 +7,13 @@
 #include "soh/OTRGlobals.h"
 #include "soh/util.h"
 
-template <class DstType, class SrcType>
-bool IsType(const SrcType* src) {
+template <class DstType, class SrcType> bool IsType(const SrcType* src) {
     return dynamic_cast<const DstType*>(src) != nullptr;
 }
 
 void Sail::Enable() {
-    Network::Enable(CVarGetString(CVAR_REMOTE_SAIL("Host"), "127.0.0.1"), CVarGetInteger(CVAR_REMOTE_SAIL("Port"), 43384));
+    Network::Enable(CVarGetString(CVAR_REMOTE_SAIL("Host"), "127.0.0.1"),
+                    CVarGetInteger(CVAR_REMOTE_SAIL("Port"), 43384));
 }
 
 void Sail::OnConnected() {
@@ -56,7 +56,9 @@ void Sail::OnIncomingJson(nlohmann::json payload) {
             }
 
             std::string command = payload["command"].get<std::string>();
-            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch(command);
+            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+                ->Dispatch(command);
             responsePayload["status"] = "success";
             SendJsonToRemote(responsePayload);
             return;
@@ -78,7 +80,9 @@ void Sail::OnIncomingJson(nlohmann::json payload) {
                 }
 
                 std::string command = payload["effect"]["command"].get<std::string>();
-                std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch(command);
+                std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+                    ->Dispatch(command);
                 responsePayload["status"] = "success";
                 SendJsonToRemote(responsePayload);
                 return;
@@ -128,9 +132,7 @@ void Sail::OnIncomingJson(nlohmann::json payload) {
         SendJsonToRemote(responsePayload);
     } catch (const std::exception& e) {
         SPDLOG_ERROR("[Sail] Exception handling remote JSON: {}", e.what());
-    } catch (...) {
-        SPDLOG_ERROR("[Sail] Unknown exception handling remote JSON");
-    }
+    } catch (...) { SPDLOG_ERROR("[Sail] Unknown exception handling remote JSON"); }
 }
 
 GameInteractionEffectBase* Sail::EffectFromJson(nlohmann::json payload) {
@@ -371,19 +373,22 @@ void Sail::RegisterHooks() {
         return;
     }
 
-    onTransitionEndHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>([&](int32_t sceneNum) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+    onTransitionEndHook =
+        GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>([&](int32_t sceneNum) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnTransitionEnd";
-        payload["hook"]["sceneNum"] = sceneNum;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnTransitionEnd";
+            payload["hook"]["sceneNum"] = sceneNum;
 
-        SendJsonToRemote(payload);
-    });
+            SendJsonToRemote(payload);
+        });
     onLoadGameHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([&](int32_t fileNum) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+        if (!isConnected || !GameInteractor::IsSaveLoaded())
+            return;
 
         nlohmann::json payload;
         payload["id"] = std::rand();
@@ -394,7 +399,8 @@ void Sail::RegisterHooks() {
         SendJsonToRemote(payload);
     });
     onExitGameHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([&](int32_t fileNum) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+        if (!isConnected || !GameInteractor::IsSaveLoaded())
+            return;
 
         nlohmann::json payload;
         payload["id"] = std::rand();
@@ -404,20 +410,23 @@ void Sail::RegisterHooks() {
 
         SendJsonToRemote(payload);
     });
-    onItemReceiveHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>([&](GetItemEntry itemEntry) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+    onItemReceiveHook =
+        GameInteractor::Instance->RegisterGameHook<GameInteractor::OnItemReceive>([&](GetItemEntry itemEntry) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnItemReceive";
-        payload["hook"]["tableId"] = itemEntry.tableId;
-        payload["hook"]["getItemId"] = itemEntry.getItemId;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnItemReceive";
+            payload["hook"]["tableId"] = itemEntry.tableId;
+            payload["hook"]["getItemId"] = itemEntry.getItemId;
 
-        SendJsonToRemote(payload);
-    });
+            SendJsonToRemote(payload);
+        });
     onEnemyDefeatHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnEnemyDefeat>([&](void* refActor) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+        if (!isConnected || !GameInteractor::IsSaveLoaded())
+            return;
 
         Actor* actor = (Actor*)refActor;
         nlohmann::json payload;
@@ -430,7 +439,8 @@ void Sail::RegisterHooks() {
         SendJsonToRemote(payload);
     });
     onActorInitHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([&](void* refActor) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+        if (!isConnected || !GameInteractor::IsSaveLoaded())
+            return;
 
         Actor* actor = (Actor*)refActor;
         nlohmann::json payload;
@@ -442,124 +452,64 @@ void Sail::RegisterHooks() {
 
         SendJsonToRemote(payload);
     });
-    onFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>([&](int16_t flagType, int16_t flag) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+    onFlagSetHook =
+        GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagSet>([&](int16_t flagType, int16_t flag) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnFlagSet";
-        payload["hook"]["flagType"] = flagType;
-        payload["hook"]["flag"] = flag;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnFlagSet";
+            payload["hook"]["flagType"] = flagType;
+            payload["hook"]["flag"] = flag;
 
-        SendJsonToRemote(payload);
-    });
-    onFlagUnsetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagUnset>([&](int16_t flagType, int16_t flag) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+            SendJsonToRemote(payload);
+        });
+    onFlagUnsetHook =
+        GameInteractor::Instance->RegisterGameHook<GameInteractor::OnFlagUnset>([&](int16_t flagType, int16_t flag) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnFlagUnset";
-        payload["hook"]["flagType"] = flagType;
-        payload["hook"]["flag"] = flag;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnFlagUnset";
+            payload["hook"]["flagType"] = flagType;
+            payload["hook"]["flag"] = flag;
 
-        SendJsonToRemote(payload);
-    });
-    onSceneFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>([&](int16_t sceneNum, int16_t flagType, int16_t flag) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+            SendJsonToRemote(payload);
+        });
+    onSceneFlagSetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagSet>(
+        [&](int16_t sceneNum, int16_t flagType, int16_t flag) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnSceneFlagSet";
-        payload["hook"]["flagType"] = flagType;
-        payload["hook"]["flag"] = flag;
-        payload["hook"]["sceneNum"] = sceneNum;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnSceneFlagSet";
+            payload["hook"]["flagType"] = flagType;
+            payload["hook"]["flag"] = flag;
+            payload["hook"]["sceneNum"] = sceneNum;
 
-        SendJsonToRemote(payload);
-    });
-    onSceneFlagUnsetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagUnset>([&](int16_t sceneNum, int16_t flagType, int16_t flag) {
-        if (!isConnected || !GameInteractor::IsSaveLoaded()) return;
+            SendJsonToRemote(payload);
+        });
+    onSceneFlagUnsetHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneFlagUnset>(
+        [&](int16_t sceneNum, int16_t flagType, int16_t flag) {
+            if (!isConnected || !GameInteractor::IsSaveLoaded())
+                return;
 
-        nlohmann::json payload;
-        payload["id"] = std::rand();
-        payload["type"] = "hook";
-        payload["hook"]["type"] = "OnSceneFlagUnset";
-        payload["hook"]["flagType"] = flagType;
-        payload["hook"]["flag"] = flag;
-        payload["hook"]["sceneNum"] = sceneNum;
+            nlohmann::json payload;
+            payload["id"] = std::rand();
+            payload["type"] = "hook";
+            payload["hook"]["type"] = "OnSceneFlagUnset";
+            payload["hook"]["flagType"] = flagType;
+            payload["hook"]["flag"] = flag;
+            payload["hook"]["sceneNum"] = sceneNum;
 
-        SendJsonToRemote(payload);
-    });
-}
-
-void Sail::DrawMenu() {
-    ImGui::PushID("Sail");
-
-    static std::string host = CVarGetString(CVAR_REMOTE_SAIL("Host"), "127.0.0.1");
-    static uint16_t port = CVarGetInteger(CVAR_REMOTE_SAIL("Port"), 43384);
-    bool isFormValid = !SohUtils::IsStringEmpty(host) && port > 1024 && port < 65535;
-
-    ImGui::SeparatorText("Sail");
-    UIWidgets::Tooltip(
-        "Sail is a networking protocol designed to facilitate remote "
-        "control of the Ship of Harkinian client. It is intended to "
-        "be utilized alongside a Sail server, for which we provide a "
-        "few straightforward implementations on our GitHub. The current "
-        "implementations available allow integration with Twitch chat "
-        "and SAMMI Bot, feel free to contribute your own!\n"
-        "\n"
-        "Click the question mark to copy the link to the Sail Github "
-        "page to your clipboard."
-    );
-    if (ImGui::IsItemClicked()) {
-        ImGui::SetClipboardText("https://github.com/HarbourMasters/sail");
-    }
-
-    ImGui::BeginDisabled(isEnabled);
-    ImGui::Text("Host & Port");
-    if (UIWidgets::InputString("##Host", &host)) {
-        CVarSetString(CVAR_REMOTE_SAIL("Host"), host.c_str());
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-
-    ImGui::SameLine();
-    ImGui::PushItemWidth(ImGui::GetFontSize() * 5);
-    if (ImGui::InputScalar("##Port", ImGuiDataType_U16, &port)) {
-        CVarSetInteger(CVAR_REMOTE_SAIL("Port"), port);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-    }
-    ImGui::PopItemWidth();
-    ImGui::EndDisabled();
-
-    ImGui::Spacing();
-
-    ImGui::BeginDisabled(!isFormValid);
-    const char* buttonLabel = isEnabled ? "Disable" : "Enable";
-    if (ImGui::Button(buttonLabel, ImVec2(-1.0f, 0.0f))) {
-        if (isEnabled) {
-            CVarClear(CVAR_REMOTE_SAIL("Enabled"));
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            Disable();
-        } else {
-            CVarSetInteger(CVAR_REMOTE_SAIL("Enabled"), 1);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            Enable();
-        }
-    }
-    ImGui::EndDisabled();
-
-    if (isEnabled) {
-        ImGui::Spacing();
-        if (isConnected) {
-            ImGui::Text("Connected");
-        } else {
-            ImGui::Text("Connecting...");
-        }
-    }
-
-    ImGui::PopID();
+            SendJsonToRemote(payload);
+        });
 }
 
 #endif // ENABLE_REMOTE_CONTROL
diff --git a/soh/soh/Network/Sail/Sail.h b/soh/soh/Network/Sail/Sail.h
index 8c7c9d55eb..2a41b8723a 100644
--- a/soh/soh/Network/Sail/Sail.h
+++ b/soh/soh/Network/Sail/Sail.h
@@ -18,7 +18,6 @@ class Sail : public Network {
     void OnIncomingJson(nlohmann::json payload);
     void OnConnected();
     void OnDisconnected();
-    void DrawMenu();
 };
 
 #endif // __cplusplus
diff --git a/soh/soh/Notification/Notification.cpp b/soh/soh/Notification/Notification.cpp
index ebc4e168b3..14873b0684 100644
--- a/soh/soh/Notification/Notification.cpp
+++ b/soh/soh/Notification/Notification.cpp
@@ -20,14 +20,14 @@ void Window::Draw() {
     const float margin = 30.0f;
     const float padding = 10.0f;
 
-    int position = CVarGetInteger(CVAR_SETTING("Notifications.Position"), 0);
+    int position = CVarGetInteger(CVAR_SETTING("Notifications.Position"), 3);
 
     // Top Left
     ImVec2 basePosition;
     switch (position) {
         case 0: // Top Left
             basePosition = ImVec2(vp->Pos.x + margin, vp->Pos.y + margin);
-            break;  
+            break;
         case 1: // Top Right
             basePosition = ImVec2(vp->Pos.x + vp->Size.x - margin, vp->Pos.y + margin);
             break;
@@ -41,7 +41,8 @@ void Window::Draw() {
             return;
     }
 
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, CVarGetFloat(CVAR_SETTING("Notifications.BgOpacity"), 0.5f)));
+    ImGui::PushStyleColor(ImGuiCol_WindowBg,
+                          ImVec4(0, 0, 0, CVarGetFloat(CVAR_SETTING("Notifications.BgOpacity"), 0.5f)));
     ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
 
@@ -57,40 +58,38 @@ void Window::Draw() {
         }
 
         ImGui::Begin(("notification#" + std::to_string(notification.id)).c_str(), nullptr,
-            ImGuiWindowFlags_AlwaysAutoResize |
-            ImGuiWindowFlags_NoNav |
-            ImGuiWindowFlags_NoFocusOnAppearing |
-            ImGuiWindowFlags_NoResize |
-            ImGuiWindowFlags_NoDocking |
-            ImGuiWindowFlags_NoTitleBar |
-            ImGuiWindowFlags_NoScrollWithMouse |
-            ImGuiWindowFlags_NoInputs |
-            ImGuiWindowFlags_NoMove |
-            ImGuiWindowFlags_NoScrollbar
-        );
+                     ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoFocusOnAppearing |
+                         ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar |
+                         ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove |
+                         ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings);
 
         ImGui::SetWindowFontScale(CVarGetFloat(CVAR_SETTING("Notifications.Size"), 1.8f)); // Make this adjustable
 
         ImVec2 notificationPos;
         switch (position) {
             case 0: // Top Left
-                notificationPos = ImVec2(basePosition.x, basePosition.y + ((ImGui::GetWindowSize().y + padding) * inverseIndex));
+                notificationPos =
+                    ImVec2(basePosition.x, basePosition.y + ((ImGui::GetWindowSize().y + padding) * inverseIndex));
                 break;
             case 1: // Top Right
-                notificationPos = ImVec2(basePosition.x - ImGui::GetWindowSize().x, basePosition.y + ((ImGui::GetWindowSize().y + padding) * inverseIndex));
+                notificationPos = ImVec2(basePosition.x - ImGui::GetWindowSize().x,
+                                         basePosition.y + ((ImGui::GetWindowSize().y + padding) * inverseIndex));
                 break;
             case 2: // Bottom Left
-                notificationPos = ImVec2(basePosition.x, basePosition.y - ((ImGui::GetWindowSize().y + padding) * (inverseIndex + 1)));
+                notificationPos = ImVec2(basePosition.x,
+                                         basePosition.y - ((ImGui::GetWindowSize().y + padding) * (inverseIndex + 1)));
                 break;
             case 3: // Bottom Right
-                notificationPos = ImVec2(basePosition.x - ImGui::GetWindowSize().x, basePosition.y - ((ImGui::GetWindowSize().y + padding) * (inverseIndex + 1)));
+                notificationPos = ImVec2(basePosition.x - ImGui::GetWindowSize().x,
+                                         basePosition.y - ((ImGui::GetWindowSize().y + padding) * (inverseIndex + 1)));
                 break;
         }
 
         ImGui::SetWindowPos(notificationPos);
 
         if (notification.itemIcon != nullptr) {
-            ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(notification.itemIcon), ImVec2(24, 24));
+            ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(notification.itemIcon),
+                         ImVec2(24, 24));
             ImGui::SameLine();
         }
         if (!notification.prefix.empty()) {
@@ -111,7 +110,6 @@ void Window::Draw() {
     ImGui::PopStyleColor(2);
 }
 
-
 void Window::UpdateElement() {
     for (int index = 0; index < notifications.size(); ++index) {
         auto& notification = notifications[index];
@@ -133,7 +131,8 @@ void Emit(Options notification) {
         notification.remainingTime = CVarGetFloat(CVAR_SETTING("Notifications.Duration"), 10.0f);
     }
     notifications.push_back(notification);
-    Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 } // namespace Notification
diff --git a/soh/soh/Notification/Notification.h b/soh/soh/Notification/Notification.h
index 670e86ba34..7eb4bb2d71 100644
--- a/soh/soh/Notification/Notification.h
+++ b/soh/soh/Notification/Notification.h
@@ -19,12 +19,12 @@ struct Options {
     float remainingTime = 0.0f; // Seconds
 };
 
-class Window : public Ship::GuiWindow {
+class Window final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
-    void InitElement() override {};
-    void DrawElement() override {};
+    void InitElement() override{};
+    void DrawElement() override{};
     void Draw() override;
     void UpdateElement() override;
 };
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 2acc01d7fa..2bdcabfb5f 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1,4 +1,4 @@
-#include "OTRGlobals.h"
+#include "OTRGlobals.h"
 #include "OTRAudio.h"
 #include <iostream>
 #include <algorithm>
@@ -34,23 +34,23 @@
 #include "Enhancements/randomizer/static_data.h"
 #include "Enhancements/randomizer/dungeon.h"
 #include "Enhancements/gameplaystats.h"
-#include "Enhancements/n64_weird_frame_data.inc"
 #include "frame_interpolation.h"
 #include "variables.h"
 #include "z64.h"
 #include "macros.h"
 #include "Fonts.h"
+#include "window/FileDropMgr.h"
+#include "window/gui/resource/Font.h"
 #include <utils/StringHelper.h>
 #include "Enhancements/custom-message/CustomMessageManager.h"
-#include "Enhancements/presets.h"
+#include "Enhancements/Presets/Presets.h"
 #include "util.h"
-#include <boost_custom/container_hash/hash_32.hpp>
 
-#if not defined (__SWITCH__) && not defined(__WIIU__)
+#if not defined(__SWITCH__) && not defined(__WIIU__)
 #include "Extractor/Extract.h"
 #endif
 
-#include <Fast3D/gfx_pc.h>
+#include <Fast3D/interpreter.h>
 
 #ifdef __APPLE__
 #include <SDL_scancode.h>
@@ -65,7 +65,6 @@
 #include <coreinit/debug.h> // OSFatal
 #endif
 
-
 #include "Enhancements/custom-message/CustomMessageTypes.h"
 #include <functions.h>
 #include "Enhancements/item-tables/ItemTableManager.h"
@@ -182,7 +181,8 @@ const NaviColor_RGB8 LEDColorDefaultNaviColorList[] = {
     defaultPropsColor, // ACTORCAT_MAX
 };
 
-// OTRTODO: A lot of these left in Japanese are used by the mempak manager. LUS does not currently support mempaks. Ignore unused ones.
+// OTRTODO: A lot of these left in Japanese are used by the mempak manager. LUS does not currently support mempaks.
+// Ignore unused ones.
 const char* constCameraStrings[] = {
     "INSUFFICIENT",
     "KEYFRAMES",
@@ -200,7 +200,7 @@ const char* constCameraStrings[] = {
     "E MODE FIX",
     "E MODE ABS",
     GFXP_HIRAGANA "ｶﾞﾒﾝ" GFXP_KATAKANA "   ﾃﾞﾓ", // OTRTODO: Unused, get a translation! Number 15
-    GFXP_HIRAGANA "ｶﾞﾒﾝ   ﾌﾂｳ", // OTRTODO: Unused, get a translation! Number 16
+    GFXP_HIRAGANA "ｶﾞﾒﾝ   ﾌﾂｳ",                  // OTRTODO: Unused, get a translation! Number 16
     "P TIME  MAX",
     GFXP_KATAKANA "ﾘﾝｸ" GFXP_HIRAGANA "    ｷｵｸ", // OTRTODO: Unused, get a translation! Number 18
     GFXP_KATAKANA "ﾘﾝｸ" GFXP_HIRAGANA "     ﾑｼ", // OTRTODO: Unused, get a translation! Number 19
@@ -227,7 +227,7 @@ const char* constCameraStrings[] = {
     GFXP_HIRAGANA "ｦﾐﾂｹﾗﾚﾏｾﾝ",
     GFXP_KATAKANA "ﾌｧｲﾙ " GFXP_HIRAGANA "ｦ",
     GFXP_HIRAGANA "ｼﾃﾓｲｲﾃﾞｽｶ?",
-    GFXP_HIRAGANA "ｹﾞﾝｻﾞｲﾍﾝｼｭｳﾁｭｳﾉ", // OTRTODO: Unused, get a translation! Number 43
+    GFXP_HIRAGANA "ｹﾞﾝｻﾞｲﾍﾝｼｭｳﾁｭｳﾉ",              // OTRTODO: Unused, get a translation! Number 43
     GFXP_KATAKANA "ﾌｧｲﾙ" GFXP_HIRAGANA "ﾊﾊｷｻﾚﾏｽ", // OTRTODO: Unused, get a translation! Number 44
     GFXP_HIRAGANA "ﾊｲ",
     GFXP_HIRAGANA "ｲｲｴ",
@@ -249,7 +249,7 @@ const char* constCameraStrings[] = {
     "FOV              ",
     "N FRAME          ",
     "Z ROT            ",
-    GFXP_KATAKANA  "ﾓ-ﾄﾞ        ", // OTRTODO: Unused, need translation. Number 65
+    GFXP_KATAKANA "ﾓ-ﾄﾞ        ", // OTRTODO: Unused, need translation. Number 65
     "  R FOCUS   ",
     "PMAX              ",
     "DEPTH             ",
@@ -261,16 +261,22 @@ const char* constCameraStrings[] = {
 };
 
 OTRGlobals::OTRGlobals() {
+    context = Ship::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json");
+}
+
+void OTRGlobals::Initialize() {
     std::vector<std::string> OTRFiles;
-    std::string mqPath = Ship::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName);
-    if (std::filesystem::exists(mqPath)) { 
+    std::string mqPath = Ship::Context::LocateFileAcrossAppDirs("oot-mq.o2r", appShortName);
+    if (std::filesystem::exists(mqPath)) {
         OTRFiles.push_back(mqPath);
-    } 
-    std::string ootPath = Ship::Context::LocateFileAcrossAppDirs("oot.otr", appShortName);
+    }
+    std::string ootPath = Ship::Context::LocateFileAcrossAppDirs("oot.o2r", appShortName);
     if (std::filesystem::exists(ootPath)) {
         OTRFiles.push_back(ootPath);
     }
-    std::string sohOtrPath = Ship::Context::GetPathRelativeToAppBundle("soh.otr");
+
+    std::string sohOtrPath = Ship::Context::LocateFileAcrossAppDirs("soh.o2r");
+
     if (std::filesystem::exists(sohOtrPath)) {
         OTRFiles.push_back(sohOtrPath);
     }
@@ -278,7 +284,8 @@ OTRGlobals::OTRGlobals() {
     std::vector<std::string> patchOTRs = {};
     if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {
         if (std::filesystem::is_directory(patchesPath)) {
-            for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath, std::filesystem::directory_options::follow_directory_symlink)) {
+            for (const auto& p : std::filesystem::recursive_directory_iterator(
+                     patchesPath, std::filesystem::directory_options::follow_directory_symlink)) {
                 if (StringHelper::IEquals(p.path().extension().string(), ".otr") ||
                     StringHelper::IEquals(p.path().extension().string(), ".mpq") ||
                     StringHelper::IEquals(p.path().extension().string(), ".o2r") ||
@@ -289,43 +296,25 @@ OTRGlobals::OTRGlobals() {
         }
     }
     std::sort(patchOTRs.begin(), patchOTRs.end(), [](const std::string& a, const std::string& b) {
-        return std::lexicographical_compare(
-            a.begin(), a.end(),
-            b.begin(), b.end(),
-            [](char c1, char c2) {
-                return std::tolower(c1) < std::tolower(c2);
-            }
-        );
+        return std::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end(),
+                                            [](char c1, char c2) { return std::tolower(c1) < std::tolower(c2); });
     });
     OTRFiles.insert(OTRFiles.end(), patchOTRs.begin(), patchOTRs.end());
     std::unordered_set<uint32_t> ValidHashes = {
-        OOT_PAL_MQ,
-        OOT_NTSC_JP_MQ,
-        OOT_NTSC_US_MQ,
-        OOT_PAL_GC_MQ_DBG,
-        OOT_NTSC_US_10,
-        OOT_NTSC_US_11,
-        OOT_NTSC_US_12,
-        OOT_PAL_10,
-        OOT_PAL_11,
-        OOT_NTSC_JP_GC_CE,
-        OOT_NTSC_JP_GC,
-        OOT_NTSC_US_GC,
-        OOT_PAL_GC,
-        OOT_PAL_GC_DBG1,
-        OOT_PAL_GC_DBG2
+        OOT_PAL_MQ,     OOT_NTSC_JP_MQ, OOT_NTSC_US_MQ, OOT_PAL_GC_MQ_DBG, OOT_NTSC_US_10,
+        OOT_NTSC_US_11, OOT_NTSC_US_12, OOT_PAL_10,     OOT_PAL_11,        OOT_NTSC_JP_GC_CE,
+        OOT_NTSC_JP_GC, OOT_NTSC_US_GC, OOT_PAL_GC,     OOT_PAL_GC_DBG1,   OOT_PAL_GC_DBG2,
     };
 
-    context = Ship::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json");
-
     context->InitLogging();
     context->InitGfxDebugger();
     context->InitConfiguration();
     context->InitConsoleVariables();
+    context->InitFileDropMgr();
 
     // tell LUS to reserve 3 SoH specific threads (Game, Audio, Save)
     context->InitResourceManager(OTRFiles, {}, 3);
-    prevAltAssets = CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0);
+    prevAltAssets = CVarGetInteger(CVAR_SETTING("AltAssets"), 0);
     context->GetResourceManager()->SetAltAssetsEnabled(prevAltAssets);
 
     auto controlDeck = std::make_shared<LUS::ControlDeck>(std::vector<CONTROLLERBUTTONS_T>({
@@ -345,8 +334,14 @@ OTRGlobals::OTRGlobals() {
     context->InitCrashHandler();
     context->InitConsole();
 
-    auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>(CVAR_WINDOW("ControllerConfiguration"), "Controller Configuration");
-    auto sohFast3dWindow = std::make_shared<Fast::Fast3dWindow>(std::vector<std::shared_ptr<Ship::GuiWindow>>({sohInputEditorWindow}));
+    Ship::Context::GetInstance()->GetLogger()->set_level(
+        (spdlog::level::level_enum)CVarGetInteger(CVAR_DEVELOPER_TOOLS("LogLevel"), 1));
+    Ship::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v");
+
+    auto sohInputEditorWindow =
+        std::make_shared<SohInputEditorWindow>(CVAR_WINDOW("ControllerConfiguration"), "Configure Controller");
+    auto sohFast3dWindow =
+        std::make_shared<Fast::Fast3dWindow>(std::vector<std::shared_ptr<Ship::GuiWindow>>({ sohInputEditorWindow }));
     context->InitWindow(sohFast3dWindow);
 
     auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
@@ -356,57 +351,109 @@ OTRGlobals::OTRGlobals() {
 
     context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });
 
-    SPDLOG_INFO("Starting Ship of Harkinian version {} (Branch: {} | Commit: {})", (char*)gBuildVersion, (char*)gGitBranch, (char*)gGitCommitHash);
+    SPDLOG_INFO("Starting Ship of Harkinian version {} (Branch: {} | Commit: {})", (char*)gBuildVersion,
+                (char*)gGitBranch, (char*)gGitCommitHash);
 
     auto loader = context->GetResourceManager()->GetResourceLoader();
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryTextureV0>(), RESOURCE_FORMAT_BINARY, "Texture", static_cast<uint32_t>(Fast::ResourceType::Texture), 0);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryTextureV1>(), RESOURCE_FORMAT_BINARY, "Texture", static_cast<uint32_t>(Fast::ResourceType::Texture), 1);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryVertexV0>(), RESOURCE_FORMAT_BINARY, "Vertex", static_cast<uint32_t>(Fast::ResourceType::Vertex), 0);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryXMLVertexV0>(), RESOURCE_FORMAT_XML, "Vertex", static_cast<uint32_t>(Fast::ResourceType::Vertex), 0);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryDisplayListV0>(), RESOURCE_FORMAT_BINARY, "DisplayList", static_cast<uint32_t>(Fast::ResourceType::DisplayList), 0);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryXMLDisplayListV0>(), RESOURCE_FORMAT_XML, "DisplayList", static_cast<uint32_t>(Fast::ResourceType::DisplayList), 0);
-    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryMatrixV0>(), RESOURCE_FORMAT_BINARY, "Matrix", static_cast<uint32_t>(Fast::ResourceType::Matrix), 0);
-    loader->RegisterResourceFactory(std::make_shared<Ship::ResourceFactoryBinaryBlobV0>(), RESOURCE_FORMAT_BINARY, "Blob", static_cast<uint32_t>(Ship::ResourceType::Blob), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryArrayV0>(), RESOURCE_FORMAT_BINARY, "Array", static_cast<uint32_t>(SOH::ResourceType::SOH_Array), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAnimationV0>(), RESOURCE_FORMAT_BINARY, "Animation", static_cast<uint32_t>(SOH::ResourceType::SOH_Animation), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryPlayerAnimationV0>(), RESOURCE_FORMAT_BINARY, "PlayerAnimation", static_cast<uint32_t>(SOH::ResourceType::SOH_PlayerAnimation), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySceneV0>(), RESOURCE_FORMAT_BINARY, "Room", static_cast<uint32_t>(SOH::ResourceType::SOH_Room), 0); // Is room scene? maybe?
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSceneV0>(), RESOURCE_FORMAT_XML, "Room", static_cast<uint32_t>(SOH::ResourceType::SOH_Room), 0); // Is room scene? maybe?
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryCollisionHeaderV0>(), RESOURCE_FORMAT_BINARY, "CollisionHeader", static_cast<uint32_t>(SOH::ResourceType::SOH_CollisionHeader), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLCollisionHeaderV0>(), RESOURCE_FORMAT_XML, "CollisionHeader", static_cast<uint32_t>(SOH::ResourceType::SOH_CollisionHeader), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySkeletonV0>(), RESOURCE_FORMAT_BINARY, "Skeleton", static_cast<uint32_t>(SOH::ResourceType::SOH_Skeleton), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSkeletonV0>(), RESOURCE_FORMAT_XML, "Skeleton", static_cast<uint32_t>(SOH::ResourceType::SOH_Skeleton), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySkeletonLimbV0>(), RESOURCE_FORMAT_BINARY, "SkeletonLimb", static_cast<uint32_t>(SOH::ResourceType::SOH_SkeletonLimb), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSkeletonLimbV0>(), RESOURCE_FORMAT_XML, "SkeletonLimb", static_cast<uint32_t>(SOH::ResourceType::SOH_SkeletonLimb), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryPathV0>(), RESOURCE_FORMAT_BINARY, "Path", static_cast<uint32_t>(SOH::ResourceType::SOH_Path), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLPathV0>(), RESOURCE_FORMAT_XML, "Path", static_cast<uint32_t>(SOH::ResourceType::SOH_Path), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryCutsceneV0>(), RESOURCE_FORMAT_BINARY, "Cutscene", static_cast<uint32_t>(SOH::ResourceType::SOH_Cutscene), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryTextV0>(), RESOURCE_FORMAT_BINARY, "Text", static_cast<uint32_t>(SOH::ResourceType::SOH_Text), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLTextV0>(), RESOURCE_FORMAT_XML, "Text", static_cast<uint32_t>(SOH::ResourceType::SOH_Text), 0);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSampleV2>(), RESOURCE_FORMAT_BINARY, "AudioSample", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSample), 2);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSoundFontV2>(), RESOURCE_FORMAT_BINARY, "AudioSoundFont", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSoundFont), 2);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSequenceV2>(), RESOURCE_FORMAT_BINARY, "AudioSequence", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSequence), 2);
-    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryBackgroundV0>(), RESOURCE_FORMAT_BINARY, "Background", static_cast<uint32_t>(SOH::ResourceType::SOH_Background), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryTextureV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Texture", static_cast<uint32_t>(Fast::ResourceType::Texture), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryTextureV1>(), RESOURCE_FORMAT_BINARY,
+                                    "Texture", static_cast<uint32_t>(Fast::ResourceType::Texture), 1);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryVertexV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Vertex", static_cast<uint32_t>(Fast::ResourceType::Vertex), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryXMLVertexV0>(), RESOURCE_FORMAT_XML, "Vertex",
+                                    static_cast<uint32_t>(Fast::ResourceType::Vertex), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryDisplayListV0>(),
+                                    RESOURCE_FORMAT_BINARY, "DisplayList",
+                                    static_cast<uint32_t>(Fast::ResourceType::DisplayList), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryXMLDisplayListV0>(), RESOURCE_FORMAT_XML,
+                                    "DisplayList", static_cast<uint32_t>(Fast::ResourceType::DisplayList), 0);
+    loader->RegisterResourceFactory(std::make_shared<Fast::ResourceFactoryBinaryMatrixV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Matrix", static_cast<uint32_t>(Fast::ResourceType::Matrix), 0);
+    loader->RegisterResourceFactory(std::make_shared<Ship::ResourceFactoryBinaryBlobV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Blob", static_cast<uint32_t>(Ship::ResourceType::Blob), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryArrayV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Array", static_cast<uint32_t>(SOH::ResourceType::SOH_Array), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAnimationV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Animation", static_cast<uint32_t>(SOH::ResourceType::SOH_Animation), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryPlayerAnimationV0>(),
+                                    RESOURCE_FORMAT_BINARY, "PlayerAnimation",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_PlayerAnimation), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySceneV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Room", static_cast<uint32_t>(SOH::ResourceType::SOH_Room),
+                                    0); // Is room scene? maybe?
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSceneV0>(), RESOURCE_FORMAT_XML, "Room",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_Room), 0); // Is room scene? maybe?
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryCollisionHeaderV0>(),
+                                    RESOURCE_FORMAT_BINARY, "CollisionHeader",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_CollisionHeader), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLCollisionHeaderV0>(), RESOURCE_FORMAT_XML,
+                                    "CollisionHeader", static_cast<uint32_t>(SOH::ResourceType::SOH_CollisionHeader),
+                                    0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySkeletonV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Skeleton", static_cast<uint32_t>(SOH::ResourceType::SOH_Skeleton), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSkeletonV0>(), RESOURCE_FORMAT_XML,
+                                    "Skeleton", static_cast<uint32_t>(SOH::ResourceType::SOH_Skeleton), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinarySkeletonLimbV0>(),
+                                    RESOURCE_FORMAT_BINARY, "SkeletonLimb",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_SkeletonLimb), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSkeletonLimbV0>(), RESOURCE_FORMAT_XML,
+                                    "SkeletonLimb", static_cast<uint32_t>(SOH::ResourceType::SOH_SkeletonLimb), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryPathV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Path", static_cast<uint32_t>(SOH::ResourceType::SOH_Path), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLPathV0>(), RESOURCE_FORMAT_XML, "Path",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_Path), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryCutsceneV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Cutscene", static_cast<uint32_t>(SOH::ResourceType::SOH_Cutscene), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryTextV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Text", static_cast<uint32_t>(SOH::ResourceType::SOH_Text), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLTextV0>(), RESOURCE_FORMAT_XML, "Text",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_Text), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSampleV2>(), RESOURCE_FORMAT_BINARY,
+                                    "AudioSample", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSample), 2);
+
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLAudioSampleV0>(), RESOURCE_FORMAT_XML,
+                                    "Sample", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSample), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSoundFontV2>(),
+                                    RESOURCE_FORMAT_BINARY, "AudioSoundFont",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSoundFont), 2);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLSoundFontV0>(), RESOURCE_FORMAT_XML,
+                                    "SoundFont", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSoundFont), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAudioSequenceV2>(),
+                                    RESOURCE_FORMAT_BINARY, "AudioSequence",
+                                    static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSequence), 2);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryXMLAudioSequenceV0>(), RESOURCE_FORMAT_XML,
+                                    "Sequence", static_cast<uint32_t>(SOH::ResourceType::SOH_AudioSequence), 0);
+    loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryBackgroundV0>(), RESOURCE_FORMAT_BINARY,
+                                    "Background", static_cast<uint32_t>(SOH::ResourceType::SOH_Background), 0);
 
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
     gRandoContext->InitStaticData();
     gRandoContext = Rando::Context::CreateInstance();
     Rando::Settings::GetInstance()->AssignContext(gRandoContext);
-    Rando::StaticData::InitItemTable();//RANDOTODO make this not rely on context's logic so it can be initialised in InitStaticData
+    Rando::StaticData::InitItemTable(); // RANDOTODO make this not rely on context's logic so it can be initialised in
+                                        // InitStaticData
     Rando::Settings::GetInstance()->CreateOptions();
     gRandomizer = std::make_shared<Randomizer>();
 
     hasMasterQuest = hasOriginal = false;
 
     previousImGuiScale = defaultImGuiScale;
-    defaultFontSmaller = CreateDefaultFontWithSize(10.0f);
-    defaultFontLarger = CreateDefaultFontWithSize(16.0f);
-    defaultFontLargest = CreateDefaultFontWithSize(20.0f);
+
+    fontMonoSmall = CreateFontWithSize(14.0f, "fonts/Inconsolata-Regular.ttf");
+    fontMono = CreateFontWithSize(16.0f, "fonts/Inconsolata-Regular.ttf");
+    fontMonoLarger = CreateFontWithSize(20.0f, "fonts/Inconsolata-Regular.ttf");
+    fontMonoLargest = CreateFontWithSize(24.0f, "fonts/Inconsolata-Regular.ttf");
+    fontStandard = CreateFontWithSize(16.0f, "fonts/Montserrat-Regular.ttf");
+    fontStandardLarger = CreateFontWithSize(20.0f, "fonts/Montserrat-Regular.ttf");
+    fontStandardLargest = CreateFontWithSize(24.0f, "fonts/Montserrat-Regular.ttf");
+    ImGui::GetIO().FontDefault = fontStandardLarger;
     ScaleImGui();
 
     // Move the camera strings from read only memory onto the heap (writable memory)
-    // This is in OTRGlobals right now because this is a place that will only ever be run once at the beginning of startup.
-    // We should probably find some code in db_camera that does initialization and only run once, and then dealloc on deinitialization.
+    // This is in OTRGlobals right now because this is a place that will only ever be run once at the beginning of
+    // startup. We should probably find some code in db_camera that does initialization and only run once, and then
+    // dealloc on deinitialization.
     cameraStrings = (char**)malloc(sizeof(constCameraStrings));
     for (int32_t i = 0; i < sizeof(constCameraStrings) / sizeof(char*); i++) {
         // OTRTODO: never deallocated...
@@ -480,7 +527,8 @@ ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) {
     iconsConfig.MergeMode = true;
     iconsConfig.PixelSnapH = true;
     iconsConfig.GlyphMinAdvanceX = iconFontSize;
-    mImGuiIo->Fonts->AddFontFromMemoryCompressedBase85TTF(fontawesome_compressed_data_base85, iconFontSize, &iconsConfig, sIconsRanges);
+    mImGuiIo->Fonts->AddFontFromMemoryCompressedBase85TTF(fontawesome_compressed_data_base85, iconFontSize,
+                                                          &iconsConfig, sIconsRanges);
     return font;
 }
 
@@ -493,15 +541,14 @@ bool OTRGlobals::HasOriginal() {
 }
 
 uint32_t OTRGlobals::GetInterpolationFPS() {
-    if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
-        return CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20);
-    }
-
     if (CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0)) {
         return Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
+    } else if (CVarGetInteger(CVAR_VSYNC_ENABLED, 1) ||
+               !Ship::Context::GetInstance()->GetWindow()->CanDisableVerticalSync()) {
+        return std::min<uint32_t>(Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate(),
+                                  CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20));
     }
-
-    return std::min<uint32_t>(Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate(), CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20));
+    return CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20);
 }
 
 extern "C" void OTRMessage_Init();
@@ -524,14 +571,14 @@ void OTRAudio_Thread() {
             }
         }
         std::unique_lock<std::mutex> Lock(audio.mutex);
-        //AudioMgr_ThreadEntry(&gAudioMgr);
-        // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333..
-        // in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528
-        #define SAMPLES_HIGH 560
-        #define SAMPLES_LOW 528
+// AudioMgr_ThreadEntry(&gAudioMgr);
+//  528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333..
+//  in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528
+#define SAMPLES_HIGH 560
+#define SAMPLES_LOW 528
 
-        #define AUDIO_FRAMES_PER_UPDATE (R_UPDATE_RATE > 0 ? R_UPDATE_RATE : 1 )
-        #define NUM_AUDIO_CHANNELS 2
+#define AUDIO_FRAMES_PER_UPDATE (R_UPDATE_RATE > 0 ? R_UPDATE_RATE : 1)
+#define NUM_AUDIO_CHANNELS 2
 
         int samples_left = AudioPlayer_Buffered();
         u32 num_audio_samples = samples_left < AudioPlayer_GetDesiredBuffered() ? SAMPLES_HIGH : SAMPLES_LOW;
@@ -539,10 +586,12 @@ void OTRAudio_Thread() {
         // 3 is the maximum authentic frame divisor.
         s16 audio_buffer[SAMPLES_HIGH * NUM_AUDIO_CHANNELS * 3];
         for (int i = 0; i < AUDIO_FRAMES_PER_UPDATE; i++) {
-            AudioMgr_CreateNextAudioBuffer(audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS), num_audio_samples);
+            AudioMgr_CreateNextAudioBuffer(audio_buffer + i * (num_audio_samples * NUM_AUDIO_CHANNELS),
+                                           num_audio_samples);
         }
 
-        AudioPlayer_Play((u8*)audio_buffer, num_audio_samples * (sizeof(int16_t) * NUM_AUDIO_CHANNELS * AUDIO_FRAMES_PER_UPDATE));
+        AudioPlayer_Play((u8*)audio_buffer,
+                         num_audio_samples * (sizeof(int16_t) * NUM_AUDIO_CHANNELS * AUDIO_FRAMES_PER_UPDATE));
 
         audio.processing = false;
         audio.cv_from_thread.notify_one();
@@ -550,8 +599,7 @@ void OTRAudio_Thread() {
 }
 
 // C->C++ Bridge
-extern "C" void OTRAudio_Init()
-{
+extern "C" void OTRAudio_Init() {
     // Precache all our samples, sequences, etc...
     ResourceMgr_LoadDirectory("audio");
 
@@ -561,6 +609,12 @@ extern "C" void OTRAudio_Init()
     }
 }
 
+extern "C" char** sequenceMap;
+extern "C" size_t sequenceMapSize;
+
+extern "C" char** fontMap;
+extern "C" size_t fontMapSize;
+
 extern "C" void OTRAudio_Exit() {
     // Tell the audio thread to stop
     {
@@ -571,10 +625,24 @@ extern "C" void OTRAudio_Exit() {
 
     // Wait until the audio thread quit
     audio.thread.join();
+#if 0
+    for (size_t i = 0; i < sequenceMapSize; i++) {
+        free(sequenceMap[i]);
+    }
+    free(sequenceMap);
+
+    for (size_t i = 0; i < fontMapSize; i++) {
+        free(fontMap[i]);
+    }
+    free(fontMap);
+    free(gAudioContext.seqLoadStatus);
+    free(gAudioContext.fontLoadStatus);
+#endif
 }
 
 extern "C" void VanillaItemTable_Init() {
     static GetItemEntry getItemTable[] = {
+        // clang-format off
         GET_ITEM(ITEM_BOMBS_5,          OBJECT_GI_BOMB_1,        GID_BOMB,             0x32, 0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BOMBS_5),
         GET_ITEM(ITEM_NUTS_5,           OBJECT_GI_NUTS,          GID_NUTS,             0x34, 0x0C, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_NUTS_5),
         GET_ITEM(ITEM_BOMBCHU,          OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOMBCHUS_10),
@@ -701,6 +769,7 @@ extern "C" void VanillaItemTable_Init() {
         GET_ITEM_NONE,
         GET_ITEM_NONE,
         GET_ITEM_NONE // GI_MAX - if you need to add to this table insert it before this entry.
+        // clang-format on
     };
     ItemTableManager::Instance->AddItemTable(MOD_NONE);
     for (uint8_t i = 0; i < ARRAY_COUNT(getItemTable); i++) {
@@ -709,11 +778,11 @@ extern "C" void VanillaItemTable_Init() {
         // that table was accessed used `GetItemID - 1`. This allows the
         // "first" item of the new map to start at 1, syncing it up with
         // the GetItemID values and removing the need for the `- 1`
-        ItemTableManager::Instance->AddItemEntry(MOD_NONE, i+1, getItemTable[i]);
+        ItemTableManager::Instance->AddItemEntry(MOD_NONE, i + 1, getItemTable[i]);
     }
 }
 
-std::unordered_map<ItemID, GetItemID> ItemIDtoGetItemIDMap {
+std::unordered_map<ItemID, GetItemID> ItemIDtoGetItemIDMap{
     { ITEM_ARROWS_LARGE, GI_ARROWS_LARGE },
     { ITEM_ARROWS_MEDIUM, GI_ARROWS_MEDIUM },
     { ITEM_ARROWS_SMALL, GI_ARROWS_SMALL },
@@ -837,7 +906,7 @@ std::unordered_map<ItemID, GetItemID> ItemIDtoGetItemIDMap {
     { ITEM_TUNIC_ZORA, GI_TUNIC_ZORA },
     { ITEM_WALLET_ADULT, GI_WALLET_ADULT },
     { ITEM_WALLET_GIANT, GI_WALLET_GIANT },
-    { ITEM_WEIRD_EGG, GI_WEIRD_EGG }
+    { ITEM_WEIRD_EGG, GI_WEIRD_EGG },
 };
 
 extern "C" GetItemID RetrieveGetItemIDFromItemID(ItemID itemID) {
@@ -847,7 +916,7 @@ extern "C" GetItemID RetrieveGetItemIDFromItemID(ItemID itemID) {
     return GI_MAX;
 }
 
-std::unordered_map<ItemID, RandomizerGet> ItemIDtoRandomizerGetMap {
+std::unordered_map<ItemID, RandomizerGet> ItemIDtoRandomizerGetMap{
     { ITEM_SONG_MINUET, RG_MINUET_OF_FOREST },
     { ITEM_SONG_BOLERO, RG_BOLERO_OF_FIRE },
     { ITEM_SONG_SERENADE, RG_SERENADE_OF_WATER },
@@ -903,9 +972,9 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
     OTRVersion version = {};
 
     // Use a temporary archive instance to load the otr and read the version file
-    auto archive = std::make_shared<Ship::OtrArchive>(otrPath);
+    auto archive = std::make_shared<Ship::O2rArchive>(otrPath);
     if (archive->Open()) {
-        auto t = archive->LoadFile("portVersion", std::make_shared<Ship::ResourceInitData>());
+        auto t = archive->LoadFile("portVersion");
         if (t != nullptr && t->IsLoaded) {
             auto stream = std::make_shared<Ship::MemoryStream>(t->Buffer->data(), t->Buffer->size());
             auto reader = std::make_shared<Ship::BinaryReader>(stream);
@@ -921,41 +990,43 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
     return version;
 }
 
-// Check that a soh.otr exists and matches the version of soh running
+// Check that a soh.o2r exists and matches the version of soh running
 // Otherwise show a message and exit
 void CheckSoHOTRVersion(std::string otrPath) {
     std::string msg;
 
 #if defined(__SWITCH__)
     msg = "\x1b[4;2HPlease re-extract it from the download."
-                       "\x1b[6;2HPress the Home button to exit...";
+          "\x1b[6;2HPress the Home button to exit...";
 #elif defined(__WIIU__)
-    msg = "Please extract the soh.otr from the Ship of Harkinian download\nto your folder.\n\nPress and hold the power button to shutdown...";
+    msg = "Please extract the soh.o2r from the Ship of Harkinian download\nto your folder.\n\nPress and hold the power "
+          "button to shutdown...";
 #else
-    msg = "Please extract the soh.otr from the Ship of Harkinian download to your folder.\n\nExiting...";
+    msg = "Please extract the soh.o2r from the Ship of Harkinian download to your folder.\n\nExiting...";
 #endif
 
     if (!std::filesystem::exists(otrPath)) {
 #if not defined(__SWITCH__) && not defined(__WIIU__)
-        Extractor::ShowErrorBox("soh.otr file is missing", msg.c_str());
+        Extractor::ShowErrorBox("soh.o2r file is missing", msg.c_str());
         exit(1);
 #elif defined(__SWITCH__)
-        Ship::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou are missing the soh.otr file." + msg).c_str());
+        Ship::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou are missing the soh.o2r file." + msg).c_str());
 #elif defined(__WIIU__)
-        OSFatal(("You are missing the soh.otr file\n\n" + msg).c_str());
+        OSFatal(("You are missing the soh.o2r file\n\n" + msg).c_str());
 #endif
     }
 
     OTRVersion otrVersion = ReadPortVersionFromOTR(otrPath);
 
-    if (otrVersion.major != gBuildVersionMajor || otrVersion.minor != gBuildVersionMinor || otrVersion.patch != gBuildVersionPatch) {
+    if (otrVersion.major != gBuildVersionMajor || otrVersion.minor != gBuildVersionMinor ||
+        otrVersion.patch != gBuildVersionPatch) {
 #if not defined(__SWITCH__) && not defined(__WIIU__)
-        Extractor::ShowErrorBox("soh.otr file version does not match", msg.c_str());
+        Extractor::ShowErrorBox("soh.o2r file version does not match", msg.c_str());
         exit(1);
 #elif defined(__SWITCH__)
-        Ship::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou have an old soh.otr file." + msg).c_str());
+        Ship::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou have an old soh.o2r file." + msg).c_str());
 #elif defined(__WIIU__)
-        OSFatal(("You have an old soh.otr file\n\n" + msg).c_str());
+        OSFatal(("You have an old soh.o2r file\n\n" + msg).c_str());
 #endif
     }
 }
@@ -989,20 +1060,23 @@ void DetectOTRVersion(std::string fileName, bool isMQ) {
         }
 
         snprintf(msgBuf, 250,
-            "The %s file was generated with a different version of Ship of Harkinian.\nOTR version: %s\n\n"
-            "You must regenerate to be able to play, otherwise the program will exit.\nWould you like to regenerate it now?",
-            fileName.c_str(), version);
+                 "The %s file was generated with a different version of Ship of Harkinian.\nOTR version: %s\n\n"
+                 "You must regenerate to be able to play, otherwise the program will exit.\nWould you like to "
+                 "regenerate it now?",
+                 fileName.c_str(), version);
 
         if (Extractor::ShowYesNoBox("Old OTR File Found", msgBuf) == IDYES) {
             std::string installPath = Ship::Context::GetAppBundlePath();
-            if (!std::filesystem::exists(installPath + "/assets/extractor")) {
-                Extractor::ShowErrorBox("Extractor assets not found",
-                    "Unable to regenerate. Missing assets/extractor folder needed to generate OTR file.\n\nExiting...");
+            if (!std::filesystem::exists(installPath + "/assets")) {
+                Extractor::ShowErrorBox(
+                    "Extractor assets not found",
+                    "Unable to regenerate. Missing assets/ folder needed to generate OTR file.\n\nExiting...");
                 exit(1);
             }
 
             Extractor extract;
-            if (!extract.Run(Ship::Context::GetAppDirectoryPath(appShortName), isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) {
+            if (!extract.Run(Ship::Context::GetAppDirectoryPath(appShortName),
+                             isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) {
                 Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting...");
                 exit(1);
             }
@@ -1013,8 +1087,8 @@ void DetectOTRVersion(std::string fileName, bool isMQ) {
 
 #elif defined(__SWITCH__)
         Ship::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship with an old game OTR file."
-                                               "\x1b[4;2HPlease regenerate a new game OTR and relaunch."
-                                               "\x1b[6;2HPress the Home button to exit...");
+                                                "\x1b[4;2HPlease regenerate a new game OTR and relaunch."
+                                                "\x1b[6;2HPress the Home button to exit...");
 #elif defined(__WIIU__)
         OSFatal("You've launched the Ship with an old a game OTR file.\n\n"
                 "Please generate a game OTR and relaunch.\n\n"
@@ -1023,6 +1097,10 @@ void DetectOTRVersion(std::string fileName, bool isMQ) {
     }
 }
 
+extern "C" void Messagebox_ShowErrorBox(char* title, char* body) {
+    Extractor::ShowErrorBox(title, body);
+}
+
 bool IsSubpath(const std::filesystem::path& path, const std::filesystem::path& base) {
     auto rel = std::filesystem::relative(path, base);
     return !rel.empty() && rel.native()[0] != '.';
@@ -1030,10 +1108,11 @@ bool IsSubpath(const std::filesystem::path& path, const std::filesystem::path& b
 
 bool PathTestCleanup(FILE* tfile) {
     try {
-        if (std::filesystem::exists("./text.txt")) std::filesystem::remove("./text.txt");
-        if (std::filesystem::exists("./test/")) std::filesystem::remove("./test/");
-    }
-    catch (std::filesystem::filesystem_error const& ex) { return false; }
+        if (std::filesystem::exists("./text.txt"))
+            std::filesystem::remove("./text.txt");
+        if (std::filesystem::exists("./test/"))
+            std::filesystem::remove("./test/");
+    } catch (std::filesystem::filesystem_error const& ex) { return false; }
     return true;
 }
 
@@ -1055,7 +1134,7 @@ void CheckAndCreateModFolder() {
 }
 
 extern "C" void InitOTR() {
-
+    OTRGlobals::Instance = new OTRGlobals();
 #ifdef __SWITCH__
     Ship::Switch::Init(Ship::PreInitPhase);
 #elif defined(__WIIU__)
@@ -1084,17 +1163,24 @@ extern "C" void InitOTR() {
     bool error = false;
     try {
         create_directories(tfolder);
-    } catch (std::filesystem::filesystem_error const& ex) {
-        error = true;
-    }
+    } catch (std::filesystem::filesystem_error const& ex) { error = true; }
     if (tfile == NULL || error) {
-        Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
+        Extractor::ShowErrorBox(
+            "Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
         PathTestCleanup(tfile);
         exit(1);
     }
     fclose(tfile);
     if (!PathTestCleanup(tfile)) {
-        Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
+        Extractor::ShowErrorBox(
+            "Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
+        exit(1);
+    }
+    if (ownPath.string().find("OneDrive") != std::string::npos) {
+        Extractor::ShowErrorBox(
+            "Error",
+            "SoH appears to be in a OneDrive folder, which will cause issues. "
+            "Please move it to a folder outside of OneDrive, like the root of a drive (e.g. \"C:\\Games\\SoH\").");
         exit(1);
     }
 #endif
@@ -1102,17 +1188,18 @@ extern "C" void InitOTR() {
 #if not defined(__SWITCH__) && not defined(__WIIU__)
     CheckAndCreateModFolder();
 #endif
+    const bool ootO2RExists =
+        std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot-mq.o2r", appShortName)) ||
+        std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot.o2r", appShortName));
 
-    CheckSoHOTRVersion(Ship::Context::GetPathRelativeToAppBundle("soh.otr"));
-
-    if (!std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) &&
-        !std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))){
+    if (!ootO2RExists) {
 
 #if not defined(__SWITCH__) && not defined(__WIIU__)
         std::string installPath = Ship::Context::GetAppBundlePath();
-        if (!std::filesystem::exists(installPath + "/assets/extractor")) {
-            Extractor::ShowErrorBox("Extractor assets not found",
-                "No OTR files found. Missing assets/extractor folder needed to generate OTR file.\n\nExiting...");
+        if (!std::filesystem::exists(installPath + "/assets")) {
+            Extractor::ShowErrorBox(
+                "Extractor assets not found",
+                "No OTR files found. Missing assets/ folder needed to generate OTR file.\n\nExiting...");
             exit(1);
         }
 
@@ -1130,8 +1217,11 @@ extern "C" void InitOTR() {
         }
         if (Extractor::ShowYesNoBox("Extraction Complete", "ROM Extracted. Extract another?") == IDYES) {
             Extractor extract;
-            if (!extract.Run(Ship::Context::GetAppDirectoryPath(appShortName), generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
-                Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step.\n\nContinuing...");
+            if (!extract.Run(Ship::Context::GetAppDirectoryPath(appShortName),
+                             generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
+                Extractor::ShowErrorBox(
+                    "Error",
+                    "An error occured, an OTR file may have been generated by a different step.\n\nContinuing...");
             } else {
                 extract.CallZapd(installPath, Ship::Context::GetAppDirectoryPath(appShortName));
             }
@@ -1139,8 +1229,8 @@ extern "C" void InitOTR() {
 
 #elif defined(__SWITCH__)
         Ship::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship without a game OTR file."
-                                               "\x1b[4;2HPlease generate a game OTR and relaunch."
-                                               "\x1b[6;2HPress the Home button to exit...");
+                                                "\x1b[4;2HPlease generate a game OTR and relaunch."
+                                                "\x1b[6;2HPress the Home button to exit...");
 #elif defined(__WIIU__)
         OSFatal("You've launched the Ship without a game OTR file.\n\n"
                 "Please generate a game OTR and relaunch.\n\n"
@@ -1148,10 +1238,10 @@ extern "C" void InitOTR() {
 #endif
     }
 
-    DetectOTRVersion("oot.otr", false);
-    DetectOTRVersion("oot-mq.otr", true);
+    DetectOTRVersion("oot.o2r", false);
+    DetectOTRVersion("oot-mq.o2r", true);
 
-    OTRGlobals::Instance = new OTRGlobals();
+    OTRGlobals::Instance->Initialize();
     CustomMessageManager::Instance = new CustomMessageManager();
     ItemTableManager::Instance = new ItemTableManager();
     GameInteractor::Instance = new GameInteractor();
@@ -1172,14 +1262,14 @@ extern "C" void InitOTR() {
     ActorDB::Instance = new ActorDB();
 #ifdef __APPLE__
     SpeechSynthesizer::Instance = new DarwinSpeechSynthesizer();
-    SpeechSynthesizer::Instance->Init();
 #elif defined(_WIN32)
     SpeechSynthesizer::Instance = new SAPISpeechSynthesizer();
-    SpeechSynthesizer::Instance->Init();
+#elif ESPEAK
+    SpeechSynthesizer::Instance = new ESpeakSpeechSynthesizer();
 #else
     SpeechSynthesizer::Instance = new SpeechLogger();
-    SpeechSynthesizer::Instance->Init();
 #endif
+    SpeechSynthesizer::Instance->Init();
 
 #ifdef ENABLE_REMOTE_CONTROL
     CrowdControl::Instance = new CrowdControl();
@@ -1203,7 +1293,7 @@ extern "C" void InitOTR() {
     RegisterImGuiItemIcons();
 
     time_t now = time(NULL);
-    tm *tm_now = localtime(&now);
+    tm* tm_now = localtime(&now);
     if (tm_now->tm_mon == 11 && tm_now->tm_mday >= 24 && tm_now->tm_mday <= 25) {
         CVarRegisterInteger(CVAR_GENERAL("LetItSnow"), 1);
     } else {
@@ -1239,7 +1329,8 @@ extern "C" void DeinitOTR() {
     SDLNet_Quit();
 #endif
 
-    // Destroying gui here because we have shared ptrs to LUS objects which output to SPDLOG which is destroyed before these shared ptrs.
+    // Destroying gui here because we have shared ptrs to LUS objects which output to SPDLOG which is destroyed before
+    // these shared ptrs.
     SohGui::Destroy();
 
     OTRGlobals::Instance->context = nullptr;
@@ -1290,10 +1381,23 @@ extern "C" void Graph_StartFrame() {
     OTRGlobals::Instance->context->GetWindow()->SetLastScancode(-1);
 
     switch (dwScancode) {
+        case KbScancode::LUS_KB_F1: {
+            std::shared_ptr<SohModalWindow> modal = static_pointer_cast<SohModalWindow>(
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Modal Window"));
+            if (modal->IsPopupOpen("Menu Moved")) {
+                modal->DismissPopup();
+            } else {
+                modal->RegisterPopup("Menu Moved",
+                                     "The menubar, accessed by hitting F1, no longer exists.\nThe new menu can be "
+                                     "accessed by hitting the Esc button instead.",
+                                     "OK");
+            }
+            break;
+        }
         case KbScancode::LUS_KB_F5: {
             if (CVarGetInteger(CVAR_CHEAT("SaveStatesEnabled"), 0) == 0) {
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->
-                    TextDrawNotification(6.0f, true, "Save states not enabled. Check Cheats Menu.");
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                    6.0f, true, "Save states not enabled. Check Cheats Menu.");
                 return;
             }
             const unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
@@ -1307,15 +1411,14 @@ extern "C" void Graph_StartFrame() {
                 case SaveStateReturn::FAIL_WRONG_GAMESTATE:
                     SPDLOG_ERROR("[SOH] Can not save a state outside of \"GamePlay\"");
                     break;
-                [[unlikely]] default:
-                    break;
+                    [[unlikely]] default : break;
             }
             break;
         }
         case KbScancode::LUS_KB_F6: {
             if (CVarGetInteger(CVAR_CHEAT("SaveStatesEnabled"), 0) == 0) {
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->
-                    TextDrawNotification(6.0f, true, "Save states not enabled. Check Cheats Menu.");
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                    6.0f, true, "Save states not enabled. Check Cheats Menu.");
                 return;
             }
             unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
@@ -1329,8 +1432,8 @@ extern "C" void Graph_StartFrame() {
         }
         case KbScancode::LUS_KB_F7: {
             if (CVarGetInteger(CVAR_CHEAT("SaveStatesEnabled"), 0) == 0) {
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->
-                    TextDrawNotification(6.0f, true, "Save states not enabled. Check Cheats Menu.");
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(
+                    6.0f, true, "Save states not enabled. Check Cheats Menu.");
                 return;
             }
             const unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
@@ -1350,8 +1453,7 @@ extern "C" void Graph_StartFrame() {
                 case SaveStateReturn::FAIL_WRONG_GAMESTATE:
                     SPDLOG_ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
                     break;
-                [[unlikely]] default:
-                    break;
+                    [[unlikely]] default : break;
             }
 
             break;
@@ -1364,19 +1466,19 @@ extern "C" void Graph_StartFrame() {
         }
 #endif
         case KbScancode::LUS_KB_TAB: {
-            CVarSetInteger(CVAR_ENHANCEMENT("AltAssets"), !CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0));
+            CVarSetInteger(CVAR_SETTING("AltAssets"), !CVarGetInteger(CVAR_SETTING("AltAssets"), 0));
             break;
         }
     }
 #endif
 
-    if (CVarGetInteger(CVAR_NEW_FILE_DROPPED, 0)) {
-        std::string filePath = SohUtils::Sanitize(CVarGetString(CVAR_DROPPED_FILE, ""));
+    auto dropMgr = Ship::Context::GetInstance()->GetFileDropMgr();
+    if (dropMgr->FileDropped()) {
+        std::string filePath = dropMgr->GetDroppedFile();
         if (!filePath.empty()) {
             GameInteractor::Instance->ExecuteHooks<GameInteractor::OnFileDropped>(filePath);
         }
-        CVarClear(CVAR_NEW_FILE_DROPPED);
-        CVarClear(CVAR_DROPPED_FILE);
+        dropMgr->ClearDroppedFile();
     }
 }
 
@@ -1390,9 +1492,13 @@ void RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>
     // Process window events for resize, mouse, keyboard events
     wnd->HandleEvents();
 
+    UIWidgets::Colors themeColor =
+        static_cast<UIWidgets::Colors>(CVarGetInteger(CVAR_SETTING("Menu.Theme"), UIWidgets::Colors::LightBlue));
+    ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIWidgets::ColorValues.at(themeColor));
     for (const auto& m : mtx_replacements) {
         wnd->DrawAndRunGraphicsCommands(Commands, m);
     }
+    ImGui::PopStyleColor();
 }
 
 // C->C++ Bridge
@@ -1456,7 +1562,7 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
         }
     }
 
-    bool curAltAssets = CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0);
+    bool curAltAssets = CVarGetInteger(CVAR_SETTING("AltAssets"), 0);
     if (prevAltAssets != curAltAssets) {
         prevAltAssets = curAltAssets;
         Ship::Context::GetInstance()->GetResourceManager()->SetAltAssetsEnabled(curAltAssets);
@@ -1466,9 +1572,8 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
     }
 
     // OTRTODO: FIGURE OUT END FRAME POINT
-   /* if (OTRGlobals::Instance->context->lastScancode != -1)
-        OTRGlobals::Instance->context->lastScancode = -1;*/
-
+    /* if (OTRGlobals::Instance->context->lastScancode != -1)
+         OTRGlobals::Instance->context->lastScancode = -1;*/
 }
 
 float divisor_num = 0.0f;
@@ -1503,7 +1608,7 @@ std::map<std::string, SoundFontSample*> cachedCustomSFs;
 
 extern "C" SoundFontSample* ReadCustomSample(const char* path) {
     return nullptr;
-/*
+    /*
     if (!ExtensionCache.contains(path))
         return nullptr;
 
@@ -1520,10 +1625,8 @@ extern "C" SoundFontSample* ReadCustomSample(const char* path) {
         drwav_uint32 sampleRate;
         drwav_uint64 totalPcm;
         drmp3_int16* pcmData =
-            drwav_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &channels, &sampleRate, &totalPcm, NULL);
-        sampleC->size = totalPcm;
-        sampleC->sampleAddr = (uint8_t*)pcmData;
-        sampleC->codec = CODEC_S16;
+            drwav_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &channels, &sampleRate, &totalPcm,
+    NULL); sampleC->size = totalPcm; sampleC->sampleAddr = (uint8_t*)pcmData; sampleC->codec = CODEC_S16;
 
         sampleC->loop = new AdpcmLoop;
         sampleC->loop->start = 0;
@@ -1556,11 +1659,43 @@ extern "C" SoundFontSample* ReadCustomSample(const char* path) {
     }
 
     return nullptr;
-*/
+    */
+}
+
+ImFont* OTRGlobals::CreateFontWithSize(float size, std::string fontPath) {
+    auto mImGuiIo = &ImGui::GetIO();
+    ImFont* font;
+    if (fontPath == "") {
+        ImFontConfig fontCfg = ImFontConfig();
+        fontCfg.OversampleH = fontCfg.OversampleV = 1;
+        fontCfg.PixelSnapH = true;
+        fontCfg.SizePixels = size;
+        font = mImGuiIo->Fonts->AddFontDefault(&fontCfg);
+    } else {
+        auto initData = std::make_shared<Ship::ResourceInitData>();
+        initData->Format = RESOURCE_FORMAT_BINARY;
+        initData->Type = static_cast<uint32_t>(RESOURCE_TYPE_FONT);
+        initData->ResourceVersion = 0;
+        initData->Path = fontPath;
+        std::shared_ptr<Ship::Font> fontData = std::static_pointer_cast<Ship::Font>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fontPath, false, initData));
+        font = mImGuiIo->Fonts->AddFontFromMemoryTTF(fontData->Data, fontData->DataSize, size);
+    }
+    // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly
+    float iconFontSize = size * 2.0f / 3.0f;
+    static const ImWchar sIconsRanges[] = { ICON_MIN_FA, ICON_MAX_16_FA, 0 };
+    ImFontConfig iconsConfig;
+    iconsConfig.MergeMode = true;
+    iconsConfig.PixelSnapH = true;
+    iconsConfig.GlyphMinAdvanceX = iconFontSize;
+    mImGuiIo->Fonts->AddFontFromMemoryCompressedBase85TTF(fontawesome_compressed_data_base85, iconFontSize,
+                                                          &iconsConfig, sIconsRanges);
+    return font;
 }
 
 std::filesystem::path GetSaveFile(std::shared_ptr<Ship::Config> Conf) {
-    const std::string fileName = Conf->GetString("Game.SaveName", Ship::Context::GetPathRelativeToAppDirectory("oot_save.sav"));
+    const std::string fileName =
+        Conf->GetString("Game.SaveName", Ship::Context::GetPathRelativeToAppDirectory("oot_save.sav"));
     std::filesystem::path saveFile = std::filesystem::absolute(fileName);
 
     if (!exists(saveFile.parent_path())) {
@@ -1601,6 +1736,7 @@ extern "C" void Ctx_WriteSaveFile(uintptr_t addr, void* dramAddr, size_t size) {
 std::wstring StringToU16(const std::string& s) {
     std::vector<unsigned long> result;
     size_t i = 0;
+
     while (i < s.size()) {
         unsigned long uni;
         size_t nbytes = 0;
@@ -1609,7 +1745,13 @@ std::wstring StringToU16(const std::string& s) {
         if (c < 0x80) { // ascii
             uni = c;
             nbytes = 0;
-        } else if (c <= 0xBF) { // assuming kata/hiragana delimiter
+        } else if (c == GFXP_HIRAGANA_CHAR) { // Start Hiragana Mode
+            uni = c;
+            nbytes = 0;
+        } else if (c == GFXP_KATAKANA_CHAR) { // Start Katakana Mode
+            uni = c;
+            nbytes = 0;
+        } else if (c <= 0xBF) { // Invalid Characters (Skipped)
             nbytes = 0;
             uni = '\1';
         } else if (c <= 0xDF) {
@@ -1644,19 +1786,6 @@ std::wstring StringToU16(const std::string& s) {
     return utf16;
 }
 
-int CopyStringToCharBuffer(const std::string& inputStr, char* buffer, const int maxBufferSize) {
-    if (!inputStr.empty()) {
-        // Prevent potential horrible overflow due to implicit conversion of maxBufferSize to an unsigned. Prevents negatives.
-        memset(buffer, 0, std::max<int>(0, maxBufferSize));
-        // Gaurentee that this value will be greater than 0, regardless of passed variables.
-        const int copiedCharLen = std::min<int>(std::max<int>(0, maxBufferSize - 1), inputStr.length());
-        memcpy(buffer, inputStr.c_str(), copiedCharLen);
-        return copiedCharLen;
-    }
-
-    return 0;
-}
-
 extern "C" void OTRGfxPrint(const char* str, void* printer, void (*printImpl)(void*, char)) {
     const std::vector<uint32_t> hira1 = {
         u'を', u'ぁ', u'ぃ', u'ぅ', u'ぇ', u'ぉ', u'ゃ', u'ゅ', u'ょ', u'っ', u'-',  u'あ', u'い',
@@ -1668,24 +1797,56 @@ extern "C" void OTRGfxPrint(const char* str, void* printer, void (*printImpl)(vo
         u'み', u'む', u'め', u'も', u'や', u'ゆ', u'よ', u'ら', u'り', u'る', u'れ', u'ろ', u'わ', u'ん', u'゛', u'゜',
     };
 
+    const std::vector<uint32_t> kata1 = {
+        u'ヲ', u'ァ', u'ィ', u'ゥ', u'ェ', u'ォ', u'ャ', u'ュ', u'ョ', u'ッ', u'ー',
+    };
+
+    const std::vector<uint32_t> kata2 = {
+        u'ア', u'イ', u'ウ', u'エ', u'オ', u'カ', u'キ', u'ク', u'ケ', u'コ', u'サ', u'シ', u'ス', u'セ', u'ソ',
+        u'タ', u'チ', u'ツ', u'テ', u'ト', u'ナ', u'ニ', u'ヌ', u'ネ', u'ノ', u'ハ', u'ヒ', u'フ', u'ヘ', u'ホ',
+        u'マ', u'ミ', u'ム', u'メ', u'モ', u'ヤ', u'ユ', u'ヨ', u'ラ', u'リ', u'ル', u'レ', u'ロ', u'ワ', u'ン',
+    };
+
     std::wstring wstr = StringToU16(str);
+    bool hiraganaMode = false;
 
     for (const auto& c : wstr) {
-        unsigned char convt = ' ';
         if (c < 0x80) {
             printImpl(printer, c);
-        } else if (c >= u'｡' && c <= u'ﾟ') { // katakana
-            printImpl(printer, c - 0xFEC0);
+        } else if (c == GFXP_HIRAGANA_CHAR) {
+            hiraganaMode = true;
+        } else if (c == GFXP_KATAKANA_CHAR) {
+            hiraganaMode = false;
+        } else if (c >= u'｡' && c <= u'ﾟ') { // katakana (hankaku)
+            if (hiraganaMode && c >= u'ｦ' && c <= u'ｿ') {
+                printImpl(printer, c - 0xFEC0 - 0x20); // Hiragana Mode, Block 1
+            } else if (hiraganaMode && c >= u'ﾀ' && c <= u'ﾝ') {
+                printImpl(printer, c - 0xFEC0 + 0x20); // Hiragana Mode, Block 2
+            } else {
+                printImpl(printer, c - 0xFEC0);
+            }
+        } else if (c == u'　') { // zenkaku space
+            printImpl(printer, u' ');
         } else {
             auto it = std::find(hira1.begin(), hira1.end(), c);
             if (it != hira1.end()) { // hiragana block 1
-                printImpl(printer, 0x88 + std::distance(hira1.begin(), it));
+                printImpl(printer, 0x86 + std::distance(hira1.begin(), it));
             }
 
             auto it2 = std::find(hira2.begin(), hira2.end(), c);
             if (it2 != hira2.end()) { // hiragana block 2
                 printImpl(printer, 0xe0 + std::distance(hira2.begin(), it2));
             }
+
+            auto it3 = std::find(kata1.begin(), kata1.end(), c);
+            if (it3 != kata1.end()) { // katakana zenkaku block 1
+                printImpl(printer, 0xa6 + std::distance(kata1.begin(), it3));
+            }
+
+            auto it4 = std::find(kata2.begin(), kata2.end(), c);
+            if (it4 != kata2.end()) { // katakana zenkaku block 2
+                printImpl(printer, 0xb1 + std::distance(kata2.begin(), it4));
+            }
         }
     }
 }
@@ -1702,7 +1863,8 @@ Color_RGB8 GetColorForControllerLED() {
     auto brightness = CVarGetFloat(CVAR_SETTING("LEDBrightness"), 1.0f) / 1.0f;
     Color_RGB8 color = { 0, 0, 0 };
     if (brightness > 0.0f) {
-        LEDColorSource source = static_cast<LEDColorSource>(CVarGetInteger(CVAR_SETTING("LEDColorSource"), LED_SOURCE_TUNIC_ORIGINAL));
+        LEDColorSource source =
+            static_cast<LEDColorSource>(CVarGetInteger(CVAR_SETTING("LEDColorSource"), LED_SOURCE_TUNIC_ORIGINAL));
         bool criticalOverride = CVarGetInteger(CVAR_SETTING("LEDCriticalOverride"), 1);
         if (gPlayState && (source == LED_SOURCE_TUNIC_ORIGINAL || source == LED_SOURCE_TUNIC_COSMETICS)) {
             switch (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)) {
@@ -1762,7 +1924,8 @@ Color_RGB8 GetColorForControllerLED() {
                         color = LEDColorDefaultNaviColorList[category].inner;
                 }
             } else { // No target actor.
-                if (source == LED_SOURCE_NAVI_COSMETICS && CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
+                if (source == LED_SOURCE_NAVI_COSMETICS &&
+                    CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
                     color = CVarGetColor24(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdleColor.inner);
                 } else {
                     color = LEDColorDefaultNaviColorList[ACTORCAT_PLAYER].inner;
@@ -1794,11 +1957,13 @@ Color_RGB8 GetColorForControllerLED() {
 extern "C" void OTRControllerCallback(uint8_t rumble) {
     // We call this every tick, SDL accounts for this use and prevents driver spam
     // https://github.com/libsdl-org/SDL/blob/f17058b562c8a1090c0c996b42982721ace90903/src/joystick/SDL_joystick.c#L1114-L1144
-    Ship::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetLED()->SetLEDColor(GetColorForControllerLED());
+    Ship::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetLED()->SetLEDColor(
+        GetColorForControllerLED());
 
     static std::shared_ptr<SohInputEditorWindow> controllerConfigWindow = nullptr;
     if (controllerConfigWindow == nullptr) {
-        controllerConfigWindow = std::dynamic_pointer_cast<SohInputEditorWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Controller Configuration"));
+        controllerConfigWindow = std::dynamic_pointer_cast<SohInputEditorWindow>(
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Controller Configuration"));
     } else if (controllerConfigWindow->TestingRumble()) {
         return;
     }
@@ -1811,7 +1976,7 @@ extern "C" void OTRControllerCallback(uint8_t rumble) {
 }
 
 extern "C" float OTRGetAspectRatio() {
-    return gfx_current_dimensions.aspect_ratio;
+    return Ship::Context::GetInstance()->GetWindow()->GetAspectRatio();
 }
 
 extern "C" float OTRGetDimensionFromLeftEdge(float v) {
@@ -1824,16 +1989,38 @@ extern "C" float OTRGetDimensionFromRightEdge(float v) {
 
 // Gets the width of the current render target area
 extern "C" uint32_t OTRGetGameRenderWidth() {
-    return gfx_current_dimensions.width;
+    auto fastWnd = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());
+    auto intP = fastWnd->GetInterpreterWeak().lock();
+
+    if (!intP) {
+        assert(false && "Lost reference to Fast::Interpreter");
+        return 320;
+    }
+
+    uint32_t height, width;
+    intP->GetCurDimensions(&width, &height);
+
+    return width;
 }
 
 // Gets the height of the current render target area
 extern "C" uint32_t OTRGetGameRenderHeight() {
-    return gfx_current_dimensions.height;
+    auto fastWnd = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());
+    auto intP = fastWnd->GetInterpreterWeak().lock();
+
+    if (!intP) {
+        assert(false && "Lost reference to Fast::Interpreter");
+        return 240;
+    }
+
+    uint32_t height, width;
+    intP->GetCurDimensions(&width, &height);
+
+    return height;
 }
 
-f32 floorf(f32 x);// RANDOTODO False positive error "allowing all exceptions is incompatible with previous function"
-f32 ceilf(f32 x); // This gets annoying
+f32 floorf(f32 x); // RANDOTODO False positive error "allowing all exceptions is incompatible with previous function"
+f32 ceilf(f32 x);  // This gets annoying
 
 extern "C" int16_t OTRGetRectDimensionFromLeftEdge(float v) {
     return ((int)floorf(OTRGetDimensionFromLeftEdge(v)));
@@ -1861,7 +2048,8 @@ extern "C" int Controller_ShouldRumble(size_t slot) {
             ->GetControlDeck()
             ->GetControllerByPort(static_cast<uint8_t>(slot))
             ->GetRumble()
-            ->GetAllRumbleMappings().empty()) {
+            ->GetAllRumbleMappings()
+            .empty()) {
         return 0;
     }
 
@@ -1869,7 +2057,8 @@ extern "C" int Controller_ShouldRumble(size_t slot) {
     if (Ship::Context::GetInstance()
             ->GetControlDeck()
             ->GetConnectedPhysicalDeviceManager()
-            ->GetConnectedSDLGamepadsForPort(slot).empty()) {
+            ->GetConnectedSDLGamepadsForPort(slot)
+            .empty()) {
         return 0;
     }
 
@@ -1877,12 +2066,7 @@ extern "C" int Controller_ShouldRumble(size_t slot) {
     return 1;
 }
 
-extern "C" void* getN64WeirdFrame(s32 i) {
-    char* weirdFrameBytes = reinterpret_cast<char*>(n64WeirdFrames);
-    return &weirdFrameBytes[i + sizeof(n64WeirdFrames)];
-}
-
-extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize) {
+extern "C" size_t GetEquipNowMessage(char* buffer, char* src, const size_t maxBufferSize) {
     CustomMessage customMessage("\x04\x1A\x08"
                                 "Would you like to equip it now?"
                                 "\x09&&"
@@ -1901,7 +2085,7 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
                                 "&"
                                 "Nein!"
                                 "%w\x02",
-				"\x04\x1A\x08"
+                                "\x04\x1A\x08"
                                 "D\x96sirez-vous l'\x96quiper maintenant?"
                                 "\x09&&"
                                 "\x1B%g"
@@ -1923,7 +2107,7 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
 
     if (!str.empty()) {
         memset(buffer, 0, maxBufferSize);
-        const int copiedCharLen = std::min<int>(maxBufferSize - 1, str.length());
+        const size_t copiedCharLen = std::min<size_t>(maxBufferSize - 1, str.length());
         memcpy(buffer, str.c_str(), copiedCharLen);
         return copiedCharLen;
     }
@@ -1994,7 +2178,8 @@ extern "C" GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s
     return OTRGlobals::Instance->gRandomizer->GetItemFromActor(actorId, sceneNum, actorParams, ogId);
 }
 
-extern "C" GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId) {
+extern "C" GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams,
+                                                                             GetItemID ogId) {
     return OTRGlobals::Instance->gRandomizer->GetItemFromActor(actorId, sceneNum, actorParams, ogId, false);
 }
 
@@ -2002,7 +2187,8 @@ extern "C" GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomi
     return OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(randomizerCheck, ogId);
 }
 
-extern "C" GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId) {
+extern "C" GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck,
+                                                                                  GetItemID ogId) {
     return OTRGlobals::Instance->gRandomizer->GetItemFromKnownCheck(randomizerCheck, ogId, false);
 }
 
@@ -2019,7 +2205,7 @@ extern "C" bool Randomizer_IsCheckShuffled(RandomizerCheck rc) {
 }
 
 extern "C" GetItemEntry GetItemMystery() {
-    return { ITEM_NONE_FE, 0, 0, 0, 0, 0, 0, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, NULL, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem };
+    return GET_ITEM_MYSTERY;
 }
 
 extern "C" uint8_t Randomizer_IsSeedGenerated() {
@@ -2053,7 +2239,8 @@ CustomMessage Randomizer_GetCustomGetItemMessage(Player* player) {
     } else {
         giid = player->getItemId;
     }
-    const CustomMessage getItemText = CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, giid);
+    const CustomMessage getItemText =
+        CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, giid);
     return getItemText;
 }
 
@@ -2062,13 +2249,13 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
     uint16_t textId = msgCtx->textId;
     Font* font = &msgCtx->font;
     char* buffer = font->msgBuf;
-    const int maxBufferSize = sizeof(font->msgBuf);
+    const size_t maxBufferSize = sizeof(font->msgBuf);
     CustomMessage messageEntry;
     s16 actorParams = 0;
     if (IS_RANDO) {
         auto ctx = Rando::Context::GetInstance();
-        bool nonBeanMerchants = ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) || 
-                                 ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL);
+        bool nonBeanMerchants = ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) ||
+                                ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL);
         Player* player = GET_PLAYER(play);
         if (textId == TEXT_RANDOMIZER_CUSTOM_ITEM) {
             if (player->getItemEntry.getItemId == RG_ICE_TRAP) {
@@ -2081,7 +2268,8 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         } else if (textId == TEXT_ITEM_DUNGEON_MAP || textId == TEXT_ITEM_COMPASS) {
             if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS)) {
                 if (textId == TEXT_ITEM_DUNGEON_MAP) {
-                    messageEntry = OTRGlobals::Instance->gRandomizer->GetMapGetItemMessageWithHint(player->getItemEntry);
+                    messageEntry =
+                        OTRGlobals::Instance->gRandomizer->GetMapGetItemMessageWithHint(player->getItemEntry);
                 } else {
                     messageEntry = Randomizer_GetCustomGetItemMessage(player);
                 }
@@ -2106,272 +2294,287 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
                     messageEntry = Randomizer_GetCustomGetItemMessage(player);
                 }
             }
-        } else if (textId == TEXT_RANDOMIZER_GOSSIP_STONE_HINTS && Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) != RO_GOSSIP_STONES_NONE &&
-            (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_NOTHING ||
-             (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_TRUTH &&
-              Player_GetMask(play) == PLAYER_MASK_TRUTH) ||
-             (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_STONE && CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
+        } else if (textId == TEXT_RANDOMIZER_GOSSIP_STONE_HINTS &&
+                   Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) != RO_GOSSIP_STONES_NONE &&
+                   (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_NOTHING ||
+                    (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_TRUTH &&
+                     Player_GetMask(play) == PLAYER_MASK_TRUTH) ||
+                    (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_STONE &&
+                     CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
 
-            Actor* stone = GET_PLAYER(play)->talkActor; 
+            Actor* stone = player->talkActor;
             RandomizerHint stoneHint = RH_NONE;
             s16 hintParams = stone->params & 0xFF;
-            
-            if (Rando::StaticData::stoneParamsToHint.contains(hintParams)){
+
+            if (Rando::StaticData::stoneParamsToHint.contains(hintParams)) {
                 stoneHint = Rando::StaticData::stoneParamsToHint[hintParams];
-            } else if (hintParams == 0x18){
+            } else if (hintParams == 0x18) {
                 // look for the chest in the actorlist to determine
                 // which grotto we're in
-                int numOfActorLists =
-                    sizeof(play->actorCtx.actorLists) / sizeof(play->actorCtx.actorLists[0]);
+                int numOfActorLists = sizeof(play->actorCtx.actorLists) / sizeof(play->actorCtx.actorLists[0]);
                 for (int i = 0; i < numOfActorLists; i++) {
                     if (play->actorCtx.actorLists[i].length) {
-                        if (play->actorCtx.actorLists[i].head->id == 10 && 
-                            Rando::StaticData::grottoChestParamsToHint.contains(play->actorCtx.actorLists[i].head->params)) {
-                            //use the chest params to find the stone hint
-                            stoneHint = Rando::StaticData::grottoChestParamsToHint[play->actorCtx.actorLists[i].head->params];
+                        if (play->actorCtx.actorLists[i].head->id == 10 &&
+                            Rando::StaticData::grottoChestParamsToHint.contains(
+                                play->actorCtx.actorLists[i].head->params)) {
+                            // use the chest params to find the stone hint
+                            stoneHint =
+                                Rando::StaticData::grottoChestParamsToHint[play->actorCtx.actorLists[i].head->params];
                         }
                     }
                 }
             }
-            if (stoneHint == RH_NONE){
+            if (stoneHint == RH_NONE) {
                 messageEntry = CustomMessage("INVALID STONE. PARAMS: " + std::to_string(hintParams));
             } else {
                 messageEntry = ctx->GetHint(stoneHint)->GetHintMessage(MF_AUTO_FORMAT);
             }
         } else if ((textId == TEXT_ALTAR_CHILD || textId == TEXT_ALTAR_ADULT)) {
             // rando hints at altar
-            messageEntry = (LINK_IS_ADULT) ? ctx->GetHint(RH_ALTAR_ADULT)->GetHintMessage() : ctx->GetHint(RH_ALTAR_CHILD)->GetHintMessage(MF_AUTO_FORMAT);
+            messageEntry = (LINK_IS_ADULT) ? ctx->GetHint(RH_ALTAR_ADULT)->GetHintMessage()
+                                           : ctx->GetHint(RH_ALTAR_CHILD)->GetHintMessage(MF_AUTO_FORMAT);
         } else if (textId == TEXT_GANONDORF) {
-            if (ctx->GetOption(RSK_GANONDORF_HINT)){
-                if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)){
-                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT ?
-                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1):
-                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
+            if (ctx->GetOption(RSK_GANONDORF_HINT)) {
+                if (ctx->GetOption(RSK_SHUFFLE_MASTER_SWORD) &&
+                    !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT
+                                       ? ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1)
+                                       : ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
                 } else {
-                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT ?
-                                   ctx->GetHint(RH_GANONDORF_JOKE)->GetHintMessage(MF_AUTO_FORMAT):
-                                   ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+                    messageEntry = INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT
+                                       ? ctx->GetHint(RH_GANONDORF_JOKE)->GetHintMessage(MF_AUTO_FORMAT)
+                                       : ctx->GetHint(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
                 }
             }
         } else if (textId == TEXT_SHEIK_NEED_HOOK || textId == TEXT_SHEIK_HAVE_HOOK) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetSheikMessage(gPlayState->sceneNum, textId);            
-        // Shop items each have two message entries, second one offset by NUM_SHOP_ITEMS
-        // textId: TEXT_SHOP_ITEM_RANDOM + (randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)
-        // textId: TEXT_SHOP_ITEM_RANDOM + ((randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS)
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetSheikMessage(gPlayState->sceneNum, textId);
+            // Shop items each have two message entries, second one offset by NUM_SHOP_ITEMS
+            // textId: TEXT_SHOP_ITEM_RANDOM + (randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)
+            // textId: TEXT_SHOP_ITEM_RANDOM + ((randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS)
         } else if (textId >= TEXT_SHOP_ITEM_RANDOM && textId < TEXT_SHOP_ITEM_RANDOM_CONFIRM) {
-            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+                (RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
             messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SHOP_ITEM_RANDOM);
-        } else if (textId >= TEXT_SHOP_ITEM_RANDOM_CONFIRM && textId <= TEXT_SHOP_ITEM_RANDOM_CONFIRM_END){
-            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+        } else if (textId >= TEXT_SHOP_ITEM_RANDOM_CONFIRM && textId <= TEXT_SHOP_ITEM_RANDOM_CONFIRM_END) {
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+                (RandomizerInf)((textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
             messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SHOP_ITEM_RANDOM_CONFIRM);
         } else if (textId == TEXT_SCRUB_RANDOM) {
-            EnDns* enDns = (EnDns*)GET_PLAYER(play)->talkActor;
-            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf((RandomizerInf)enDns->sohScrubIdentity.randomizerInf);
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(rc, TEXT_SCRUB_RANDOM, TEXT_SCRUB_RANDOM_FREE, Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
+            EnDns* enDns = (EnDns*)player->talkActor;
+            RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+                (RandomizerInf)enDns->sohScrubIdentity.randomizerInf);
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                rc, TEXT_SCRUB_RANDOM, TEXT_SCRUB_RANDOM_FREE,
+                Randomizer_GetSettingValue(RSK_SCRUB_TEXT_HINT) == RO_GENERIC_OFF);
         } else if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1) &&
                    (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE ||
-                   textId == TEXT_HUGE_RUPEE)) {
+                    textId == TEXT_HUGE_RUPEE)) {
             messageEntry = Randomizer::GetRupeeMessage(textId);
             // In rando, replace Navi's general overworld hints with rando-related gameplay tips
-        } else if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1) && textId >= TEXT_NAVI_DEKU_TREE_SUMMONS && textId <= TEXT_NAVI_TRY_TO_KEEP_MOVING) {
+        } else if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1) &&
+                   textId >= TEXT_NAVI_DEKU_TREE_SUMMONS && textId <= TEXT_NAVI_TRY_TO_KEEP_MOVING) {
             u16 naviTextId = Random(0, NUM_NAVI_MESSAGES);
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId, MF_FORMATTED);
-        } 
-        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_10 && 
-                 (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) || 
-                  ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_ZR_MAGIC_BEAN_SALESMAN, TEXT_BEAN_SALESMAN_BUY_FOR_10, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
-        } 
-        else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100, MF_AUTO_FORMAT);
-        } 
-        else if (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) && nonBeanMerchants &&
-            (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)){
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_KAK_GRANNYS_SHOP, TEXT_GRANNYS_SHOP, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
-        } 
-        else if (textId == TEXT_MEDIGORON && nonBeanMerchants){
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_GC_MEDIGORON, TEXT_MEDIGORON, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
-        } 
-        else if (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) && nonBeanMerchants){
-            if (Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT)){
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_1, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID,
+                                                                           naviTextId, MF_FORMATTED);
+        } else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_10 &&
+                   (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+                    ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                RC_ZR_MAGIC_BEAN_SALESMAN, TEXT_BEAN_SALESMAN_BUY_FOR_10, TEXT_NONE,
+                Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+        } else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(
+                Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_GRANNYS_SHOP && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
+                   nonBeanMerchants &&
+                   (ctx->GetOption(RSK_SHUFFLE_ADULT_TRADE) || INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                RC_KAK_GRANNYS_SHOP, TEXT_GRANNYS_SHOP, TEXT_NONE,
+                Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+        } else if (textId == TEXT_MEDIGORON && nonBeanMerchants) {
+            messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                RC_GC_MEDIGORON, TEXT_MEDIGORON, TEXT_NONE,
+                Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+        } else if (textId == TEXT_CARPET_SALESMAN_1 && !Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN) &&
+                   nonBeanMerchants) {
+            if (Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT)) {
+                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                    RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_1, TEXT_NONE,
+                    Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
             } else {
-                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_MYSTERIOUS, TEXT_NONE, Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
+                messageEntry = OTRGlobals::Instance->gRandomizer->GetMerchantMessage(
+                    RC_WASTELAND_BOMBCHU_SALESMAN, TEXT_CARPET_SALESMAN_MYSTERIOUS, TEXT_NONE,
+                    Randomizer_GetSettingValue(RSK_MERCHANT_TEXT_HINT) == RO_GENERIC_OFF);
             }
-        } 
-        else if (textId == TEXT_CARPET_SALESMAN_ARMS_DEALER){
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_CARPET_SALESMAN_ARMS_DEALER) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId,
+                                                                           MF_AUTO_FORMAT);
         } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
-            actorParams = GET_PLAYER(play)->talkActor->params;
-            if (actorParams == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)){
+            actorParams = player->talkActor->params;
+            if (actorParams == 1 && ctx->GetOption(RSK_KAK_10_SKULLS_HINT)) {
                 messageEntry = ctx->GetHint(RH_KAK_10_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-            } else if (actorParams == 2 && ctx->GetOption(RSK_KAK_20_SKULLS_HINT)){
+            } else if (actorParams == 2 && ctx->GetOption(RSK_KAK_20_SKULLS_HINT)) {
                 messageEntry = ctx->GetHint(RH_KAK_20_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-            } else if (actorParams == 3 && ctx->GetOption(RSK_KAK_30_SKULLS_HINT)){
+            } else if (actorParams == 3 && ctx->GetOption(RSK_KAK_30_SKULLS_HINT)) {
                 messageEntry = ctx->GetHint(RH_KAK_30_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-            } else if (actorParams == 4 && ctx->GetOption(RSK_KAK_40_SKULLS_HINT)){
+            } else if (actorParams == 4 && ctx->GetOption(RSK_KAK_40_SKULLS_HINT)) {
                 messageEntry = ctx->GetHint(RH_KAK_40_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-            } else if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)){
+            } else if (ctx->GetOption(RSK_KAK_50_SKULLS_HINT)) {
                 messageEntry = ctx->GetHint(RH_KAK_50_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
             }
         } else if (textId == TEXT_DAMPES_DIARY && ctx->GetOption(RSK_DAMPES_DIARY_HINT)) {
             messageEntry = ctx->GetHint(RH_DAMPES_DIARY)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if ((textId == TEXT_CHEST_GAME_PROCEED || textId == TEXT_CHEST_GAME_REAL_GAMBLER || textId == TEXT_CHEST_GAME_THANKS_A_LOT) &&
+        } else if ((textId == TEXT_CHEST_GAME_PROCEED || textId == TEXT_CHEST_GAME_REAL_GAMBLER ||
+                    textId == TEXT_CHEST_GAME_THANKS_A_LOT) &&
                    play->sceneNum == SCENE_TREASURE_BOX_SHOP && ctx->GetOption(RSK_GREG_HINT)) {
             messageEntry = ctx->GetHint(RH_GREG_RUPEE)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if (textId == TEXT_WARP_MINUET_OF_FOREST && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_MINUET_OF_FOREST && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_MINUET_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId == TEXT_WARP_BOLERO_OF_FIRE && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_BOLERO_OF_FIRE && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_BOLERO_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId == TEXT_WARP_SERENADE_OF_WATER && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_SERENADE_OF_WATER && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_SERENADE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId == TEXT_WARP_REQUIEM_OF_SPIRIT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_REQUIEM_OF_SPIRIT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_REQUIEM_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId == TEXT_WARP_NOCTURNE_OF_SHADOW && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_NOCTURNE_OF_SHADOW && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_NOCTURNE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId == TEXT_WARP_PRELUDE_OF_LIGHT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
+        } else if (textId == TEXT_WARP_PRELUDE_OF_LIGHT && ctx->GetOption(RSK_WARP_SONG_HINTS)) {
             messageEntry = ctx->GetHint(RH_PRELUDE_WARP_LOC)->GetHintMessage(MF_FORMATTED);
-        }
-        else if (textId >= TEXT_WARP_MINUET_OF_FOREST &&  textId <= TEXT_WARP_PRELUDE_OF_LIGHT 
-                 && ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_WARP_MINUET_OF_FOREST, MF_FORMATTED);
-        }
-        else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId, MF_AUTO_FORMAT);
-        }
-        else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, MF_AUTO_FORMAT);
-        }
-        else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME || (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET && textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
+        } else if (textId >= TEXT_WARP_MINUET_OF_FOREST && textId <= TEXT_WARP_PRELUDE_OF_LIGHT &&
+                   ctx->GetOption(RSK_SHUFFLE_WARP_SONGS)) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID,
+                                                                           TEXT_WARP_MINUET_OF_FOREST, MF_FORMATTED);
+        } else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
+            messageEntry =
+                CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, textId, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(
+                Randomizer::hintMessageTableID, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME ||
+                   (textId >= TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET &&
+                    textId <= TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET)) {
             u16 choice = Random(0, NUM_GORON_MESSAGES);
             messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
-        }
-        else if (textId == TEXT_FROGS_UNDERWATER && ctx->GetOption(RSK_FROGS_HINT)) {
-           messageEntry = ctx->GetHint(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if (
-            Randomizer_GetSettingValue(RSK_LOACH_HINT) &&
-            (
-                textId == TEXT_FISHING_CLOUDY ||
-                textId == TEXT_FISHING_TRY_ANOTHER_LURE ||
-                textId == TEXT_FISHING_SECRETS ||
-                textId == TEXT_FISHING_GOOD_FISHERMAN ||
-                textId == TEXT_FISHING_DIFFERENT_POND ||
-                textId == TEXT_FISHING_SCRATCHING ||
-                textId == TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE
-            )
-        ) {
+        } else if (textId == TEXT_FROGS_UNDERWATER && ctx->GetOption(RSK_FROGS_HINT)) {
+            messageEntry = ctx->GetHint(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        } else if (Randomizer_GetSettingValue(RSK_LOACH_HINT) &&
+                   (textId == TEXT_FISHING_CLOUDY || textId == TEXT_FISHING_TRY_ANOTHER_LURE ||
+                    textId == TEXT_FISHING_SECRETS || textId == TEXT_FISHING_GOOD_FISHERMAN ||
+                    textId == TEXT_FISHING_DIFFERENT_POND || textId == TEXT_FISHING_SCRATCHING ||
+                    textId == TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE)) {
             messageEntry = ctx->GetHint(RH_LOACH_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if ((textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET) &&
+        } else if ((textId == TEXT_FISHING_POND_START || textId == TEXT_FISHING_POND_START_MET) &&
                    ctx->GetOption(RSK_SHUFFLE_FISHING_POLE) && !Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND)) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetFishingPondOwnerMessage(textId);
-        }
-        else if (textId == TEXT_SARIA_SFM && gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && ctx->GetOption(RSK_SARIA_HINT)){
+        } else if (textId == TEXT_SARIA_SFM && gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW &&
+                   ctx->GetOption(RSK_SARIA_HINT)) {
             messageEntry = ctx->GetHint(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
-        }
-        else if ((textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER) && ctx->GetOption(RSK_SARIA_HINT)){
+        } else if ((textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER) &&
+                   ctx->GetOption(RSK_SARIA_HINT)) {
             messageEntry = ctx->GetHint(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
-        }
-        else if (ctx->GetOption(RSK_BIGGORON_HINT) && (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId ==  TEXT_BIGGORON_WAITING_FOR_YOU ||
-                                                       textId == TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS || textId == TEXT_BIGGORON_I_MAAAADE_THISSSS)) {
-           messageEntry = ctx->GetHint(RH_BIGGORON_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if (ctx->GetOption(RSK_BIG_POES_HINT) && (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
+        } else if (ctx->GetOption(RSK_BIGGORON_HINT) &&
+                   (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId == TEXT_BIGGORON_WAITING_FOR_YOU ||
+                    textId == TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS || textId == TEXT_BIGGORON_I_MAAAADE_THISSSS)) {
+            messageEntry = ctx->GetHint(RH_BIGGORON_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        } else if (ctx->GetOption(RSK_BIG_POES_HINT) &&
+                   (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
             messageEntry = ctx->GetHint(RH_BIG_POES_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if (ctx->GetOption(RSK_CHICKENS_HINT) && (textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
+        } else if (ctx->GetOption(RSK_CHICKENS_HINT) &&
+                   (textId >= TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK && textId <= TEXT_ANJU_PLEASE_BRING_1_CUCCO)) {
             messageEntry = ctx->GetHint(RH_CHICKENS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if ((textId == TEXT_MALON_EVERYONE_TURNING_EVIL || textId == TEXT_MALON_I_SING_THIS_SONG)&& ctx->GetOption(RSK_MALON_HINT)){
+        } else if ((textId == TEXT_MALON_EVERYONE_TURNING_EVIL || textId == TEXT_MALON_I_SING_THIS_SONG) &&
+                   ctx->GetOption(RSK_MALON_HINT)) {
             messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
-        }
-        else if (textId == TEXT_MALON_HOW_IS_EPONA_DOING && ctx->GetOption(RSK_MALON_HINT)){
+        } else if (textId == TEXT_MALON_HOW_IS_EPONA_DOING && ctx->GetOption(RSK_MALON_HINT)) {
             messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
-        }
-        else if (textId == TEXT_MALON_OBSTICLE_COURSE && ctx->GetOption(RSK_MALON_HINT)){
+        } else if (textId == TEXT_MALON_OBSTICLE_COURSE && ctx->GetOption(RSK_MALON_HINT)) {
             messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
-        }
-        else if (textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED && ctx->GetOption(RSK_MALON_HINT)){
+        } else if (textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED && ctx->GetOption(RSK_MALON_HINT)) {
             messageEntry = ctx->GetHint(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
-        }
-        else if (ctx->GetOption(RSK_KAK_100_SKULLS_HINT) && textId == TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH) {
+        } else if (ctx->GetOption(RSK_KAK_100_SKULLS_HINT) && textId == TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH) {
             messageEntry = ctx->GetHint(RH_KAK_100_SKULLS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        }
-        else if (textId == TEXT_GF_HBA_SIGN && ctx->GetOption(RSK_HBA_HINT)) {
+        } else if (textId == TEXT_GF_HBA_SIGN && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
-        }
-        else if (textId == TEXT_HBA_NOT_ON_HORSE && ctx->GetOption(RSK_HBA_HINT)) {
+        } else if (textId == TEXT_HBA_NOT_ON_HORSE && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
-        }
-        else if (textId == TEXT_HBA_INITIAL_EXPLAINATION && ctx->GetOption(RSK_HBA_HINT)) {
+        } else if (textId == TEXT_HBA_INITIAL_EXPLAINATION && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
-        }
-        else if (textId == TEXT_HBA_ALREADY_HAVE_1000 && ctx->GetOption(RSK_HBA_HINT)) {
+        } else if (textId == TEXT_HBA_ALREADY_HAVE_1000 && ctx->GetOption(RSK_HBA_HINT)) {
             messageEntry = ctx->GetHint(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 3);
-        } 
-        else if (textId == TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY){
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT);
-        }
-        else if (textId == TEXT_MASK_SHOP_SIGN && ctx->GetOption(RSK_MASK_SHOP_HINT)) {
+        } else if (textId == TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY) {
+            messageEntry =
+                CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_MASK_SHOP_SIGN && ctx->GetOption(RSK_MASK_SHOP_HINT)) {
             messageEntry = ctx->GetHint(RH_MASK_SHOP_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+        } else if (textId == TEXT_BIG_POE_COLLECTED_RANDO) {
+            messageEntry =
+                CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_AUTO_FORMAT);
+        } else if (textId == TEXT_GERUDO_GUARD_FRIENDLY && player->talkActor->id == ACTOR_EN_GE2) {
+            // TODO_TRANSLATE Translate into french and german
+            messageEntry = CustomMessage("Want me to throw you in jail?&\x1B#Yes please&No thanks#", { QM_GREEN });
+            messageEntry.AutoFormat();
         }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) != 0) {
             // The freeze text cannot be manually dismissed and must be auto-dismissed.
             // This is fine and even wanted when skull tokens are not shuffled, but when
-            // when they are shuffled we don't want to be able to manually dismiss the box.
+            // when they are shuffled we want to be able to manually dismiss the box.
             // Otherwise if we get a token from a chest or an NPC we get stuck in the ItemGet
             // animation until the text box auto-dismisses.
             // RANDOTODO: Implement a way to determine if an item came from a skulltula and
             // inject the auto-dismiss control code if it did.
-            if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 &&
-                !(IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_TOKENS) != RO_TOKENSANITY_OFF)) {
+            bool gsTokensShuffled = Randomizer_GetSettingValue(RSK_SHUFFLE_TOKENS) != RO_TOKENSANITY_OFF;
+            if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 && !(IS_RANDO && gsTokensShuffled)) {
                 textId = TEXT_GS_NO_FREEZE;
             } else {
                 textId = TEXT_GS_FREEZE;
             }
             // In vanilla, GS token count is incremented prior to the text box displaying
             // In rando we need to bump the token count by one to show the correct count
-            s16 gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
+            s16 gsCount = gSaveContext.inventory.gsTokens + ((IS_RANDO && gsTokensShuffled) ? 1 : 0);
             messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_FORMATTED);
             messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
-        } 
+        } else if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 &&
+                   (!IS_RANDO || Randomizer_GetSettingValue(RSK_SHUFFLE_TOKENS) == RO_TOKENSANITY_OFF)) {
+            messageEntry = CustomMessage::LoadVanillaMessageTableEntry(TEXT_GS_FREEZE);
+            messageEntry.Replace(CustomMessage::MESSAGE_END(), "\x0E\x3C");
+            messageEntry += CustomMessage::MESSAGE_END();
+        }
     } else if ((IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) &&
-                (textId == TEXT_BUY_BOMBCHUS_10_DESC || textId == TEXT_BUY_BOMBCHUS_10_PROMPT)) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_FORMATTED);
-    } else if (textId == TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER, MF_FORMATTED);
+               (textId == TEXT_BUY_BOMBCHUS_10_DESC || textId == TEXT_BUY_BOMBCHUS_10_PROMPT)) {
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId, MF_FORMATTED);
+    } else if (textId == TEXT_HEART_CONTAINER &&
+               CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 0)) {
+        messageEntry =
+            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER, MF_FORMATTED);
         messageEntry.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.ship.stats.heartContainers + 1));
-    } else if (textId >= TEXT_HEART_PIECE && textId < TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE, MF_FORMATTED);
+    } else if (textId >= TEXT_HEART_PIECE && textId < TEXT_HEART_CONTAINER &&
+               CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0)) {
+        messageEntry =
+            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE, MF_FORMATTED);
         messageEntry.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.ship.stats.heartPieces + 1));
-    } else if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0) && play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT, MF_FORMATTED);
+    } else if (textId == TEXT_MARKET_GUARD_NIGHT && CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0) &&
+               play->sceneNum == SCENE_MARKET_ENTRANCE_NIGHT) {
+        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_MARKET_GUARD_NIGHT,
+                                                                       MF_FORMATTED);
     }
     if (textId == TEXT_FISHERMAN_LEAVE && CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0)) {
-        messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_FISHERMAN_LEAVE, MF_FORMATTED);
+        messageEntry =
+            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_FISHERMAN_LEAVE, MF_FORMATTED);
     }
     font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
     switch (gSaveContext.language) {
         case LANGUAGE_FRA:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetFrench(MF_RAW), buffer, maxBufferSize);
+                       SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetFrench(MF_RAW), maxBufferSize);
         case LANGUAGE_GER:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetGerman(MF_RAW), buffer, maxBufferSize);
+                       SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetGerman(MF_RAW), maxBufferSize);
         case LANGUAGE_ENG:
         default:
             return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetEnglish(MF_RAW), buffer, maxBufferSize);
+                       SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetEnglish(MF_RAW), maxBufferSize);
     }
     return false;
 }
@@ -2394,11 +2597,23 @@ extern "C" void EntranceTracker_SetLastEntranceOverride(s16 entranceIndex) {
 }
 
 extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement) {
-    gfx_register_blended_texture(name, mask, replacement);
+    if (auto intP = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow())
+                        ->GetInterpreterWeak()
+                        .lock()) {
+        intP->RegisterBlendedTexture(name, mask, replacement);
+    } else {
+        assert(false && "Lost reference to Fast::Interpreter");
+    }
 }
 
 extern "C" void Gfx_UnregisterBlendedTexture(const char* name) {
-    gfx_unregister_blended_texture(name);
+    if (auto intP = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow())
+                        ->GetInterpreterWeak()
+                        .lock()) {
+        intP->UnregisterBlendedTexture(name);
+    } else {
+        assert(false && "Lost reference to Fast::Interpreter");
+    }
 }
 
 extern "C" void Gfx_TextureCacheDelete(const uint8_t* texAddr) {
@@ -2412,7 +2627,13 @@ extern "C" void Gfx_TextureCacheDelete(const uint8_t* texAddr) {
         texAddr = (const uint8_t*)ResourceMgr_GetResourceDataByNameHandlingMQ(imgName);
     }
 
-    gfx_texture_cache_delete(texAddr);
+    if (auto intP = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow())
+                        ->GetInterpreterWeak()
+                        .lock()) {
+        intP->TextureCacheDelete(texAddr);
+    } else {
+        assert(false && "Lost reference to Fast::Interpreter");
+    }
 }
 
 void SoH_ProcessDroppedFiles(std::string filePath) {
@@ -2425,7 +2646,7 @@ void SoH_ProcessDroppedFiles(std::string filePath) {
         nlohmann::json configJson;
         configStream >> configJson;
 
-        // #region SOH [Randomizer] TODO: Refactor spoiler file handling for randomizer 
+        // #region SOH [Randomizer] TODO: Refactor spoiler file handling for randomizer
         if (configJson.contains("version") && configJson.contains("finalSeed")) {
             CVarSetString(CVAR_GENERAL("RandomizerDroppedFile"), filePath.c_str());
             CVarSetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 1);
@@ -2463,7 +2684,6 @@ void SoH_ProcessDroppedFiles(std::string filePath) {
         }
 
         Rando::Settings::GetInstance()->UpdateOptionProperties();
-        Rando::Settings::GetInstance()->SetAllFromCVar();
 
         auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
         gui->GetGuiWindow("Console")->Hide();
@@ -2472,11 +2692,14 @@ void SoH_ProcessDroppedFiles(std::string filePath) {
         gui->GetGuiWindow("Save Editor")->Hide();
         gui->GetGuiWindow("Display List Viewer")->Hide();
         gui->GetGuiWindow("Stats")->Hide();
-        std::dynamic_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->ClearBindings();
+        std::dynamic_pointer_cast<Ship::ConsoleWindow>(
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+            ->ClearBindings();
 
         gui->SaveConsoleVariablesNextFrame();
+        ShipInit::Init("*");
 
-        uint32_t finalHash = boost::hash_32<std::string>{}(configJson.dump());
+        uint32_t finalHash = SohUtils::Hash(configJson.dump());
         gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Configuration Loaded. Hash: %d", finalHash);
     } catch (std::exception& e) {
         SPDLOG_ERROR("Failed to load config file: {}", e.what());
@@ -2490,4 +2713,7 @@ void SoH_ProcessDroppedFiles(std::string filePath) {
         return;
     }
 }
-// #endregion
+
+extern "C" void CheckTracker_RecalculateAvailableChecks() {
+    CheckTracker::RecalculateAvailableChecks();
+}
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index f056cad5e4..cab7575cd7 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -15,6 +15,11 @@
 #define BTN_CUSTOM_OCARINA_PITCH_UP ((CONTROLLERBUTTONS_T)0x00400000)
 #define BTN_CUSTOM_OCARINA_PITCH_DOWN ((CONTROLLERBUTTONS_T)0x00800000)
 
+#define M_PIf 3.14159265358979323846f
+#define M_PI_2f 1.57079632679489661923f // pi/2
+#define M_SQRT2f 1.41421356237309504880f
+#define M_SQRT1_2f 0.70710678118654752440f /* 1/sqrt(2) */
+
 #ifdef __cplusplus
 #include <Context.h>
 #include "Enhancements/savestates.h"
@@ -42,33 +47,42 @@ const uint32_t defaultImGuiScale = 1;
 const float imguiScaleOptionToValue[4] = { 0.75f, 1.0f, 1.5f, 2.0f };
 
 class OTRGlobals {
-    public:
-        static OTRGlobals* Instance;
+  public:
+    static OTRGlobals* Instance;
 
     std::shared_ptr<Ship::Context> context;
     std::shared_ptr<SaveStateMgr> gSaveStateMgr;
     std::shared_ptr<Randomizer> gRandomizer;
     std::shared_ptr<Rando::Context> gRandoContext;
 
-        ImFont* defaultFontSmaller;
-        ImFont* defaultFontLarger;
-        ImFont* defaultFontLargest;
+    ImFont* defaultFontSmaller;
+    ImFont* defaultFontLarger;
+    ImFont* defaultFontLargest;
 
-        OTRGlobals();
-        ~OTRGlobals();
+    ImFont* fontMonoSmall;
+    ImFont* fontStandard;
+    ImFont* fontStandardLarger;
+    ImFont* fontStandardLargest;
+    ImFont* fontMono;
+    ImFont* fontMonoLarger;
+    ImFont* fontMonoLargest;
 
-        void ScaleImGui();
+    OTRGlobals();
+    ~OTRGlobals();
 
-        bool HasMasterQuest();
-        bool HasOriginal();
-        uint32_t GetInterpolationFPS();
-        std::shared_ptr<std::vector<std::string>> ListFiles(std::string path);
+    void ScaleImGui();
+    void Initialize();
+    bool HasMasterQuest();
+    bool HasOriginal();
+    uint32_t GetInterpolationFPS();
+    std::shared_ptr<std::vector<std::string>> ListFiles(std::string path);
 
-    private:
-    	void CheckSaveFile(size_t sramSize) const;
-        bool hasMasterQuest;
-        bool hasOriginal;
-        ImFont* CreateDefaultFontWithSize(float size);
+  private:
+    void CheckSaveFile(size_t sramSize) const;
+    bool hasMasterQuest;
+    bool hasOriginal;
+    ImFont* CreateDefaultFontWithSize(float size);
+    ImFont* CreateFontWithSize(float size, std::string fontPath);
 };
 #endif
 
@@ -111,8 +125,7 @@ void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
 int Controller_ShouldRumble(size_t slot);
 void Controller_BlockGameInput();
 void Controller_UnblockGameInput();
-void* getN64WeirdFrame(s32 i);
-int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize);
+size_t GetEquipNowMessage(char* buffer, char* src, const size_t maxBufferSize);
 u32 SpoilerFileExists(const char* spoilerFileName);
 Sprite* GetSeedTexture(uint8_t index);
 uint8_t GetSeedIconIndex(uint8_t index);
@@ -128,7 +141,8 @@ void Randomizer_LoadHintMessages();
 void Randomizer_LoadMerchantMessages();
 bool Randomizer_IsTrialRequired(s32 trialFlag);
 GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
-GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
+GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams,
+                                                                  GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 RandomizerInf Randomizer_GetRandomizerInfFromCheck(RandomizerCheck randomizerCheck);
@@ -153,9 +167,11 @@ void Gfx_UnregisterBlendedTexture(const char* name);
 void Gfx_TextureCacheDelete(const uint8_t* addr);
 void SaveManager_ThreadPoolWait();
 void CheckTracker_OnMessageClose();
+void CheckTracker_RecalculateAvailableChecks();
 
 GetItemID RetrieveGetItemIDFromItemID(ItemID itemID);
 RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID);
+void Messagebox_ShowErrorBox(char* title, char* body);
 #endif
 
 #ifdef __cplusplus
diff --git a/soh/soh/ObjectExtension/ActorListIndex.cpp b/soh/soh/ObjectExtension/ActorListIndex.cpp
new file mode 100644
index 0000000000..5c9367703b
--- /dev/null
+++ b/soh/soh/ObjectExtension/ActorListIndex.cpp
@@ -0,0 +1,16 @@
+#include "ActorListIndex.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+
+struct ActorListIndex {
+    s16 index = -1;
+};
+static ObjectExtension::Register<ActorListIndex> ActorListIndexRegister;
+
+int16_t GetActorListIndex(const Actor* actor) {
+    const ActorListIndex* index = ObjectExtension::GetInstance().Get<ActorListIndex>(actor);
+    return index != nullptr ? index->index : ActorListIndex{}.index;
+}
+
+void SetActorListIndex(const Actor* actor, int16_t index) {
+    ObjectExtension::GetInstance().Set<ActorListIndex>(actor, ActorListIndex{ index });
+}
\ No newline at end of file
diff --git a/soh/soh/ObjectExtension/ActorListIndex.h b/soh/soh/ObjectExtension/ActorListIndex.h
new file mode 100644
index 0000000000..84f00449d0
--- /dev/null
+++ b/soh/soh/ObjectExtension/ActorListIndex.h
@@ -0,0 +1,16 @@
+#ifndef ACTOR_LIST_INDEX_H
+#define ACTOR_LIST_INDEX_H
+
+#ifdef __cplusplus
+extern "C" {
+#include "z64actor.h"
+#endif
+
+int16_t GetActorListIndex(const Actor* actor);
+void SetActorListIndex(const Actor* actor, int16_t index);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ACTOR_LIST_INDEX_H
\ No newline at end of file
diff --git a/soh/soh/ObjectExtension/ActorMaximumHealth.cpp b/soh/soh/ObjectExtension/ActorMaximumHealth.cpp
new file mode 100644
index 0000000000..9c710822f5
--- /dev/null
+++ b/soh/soh/ObjectExtension/ActorMaximumHealth.cpp
@@ -0,0 +1,29 @@
+#include "ActorMaximumHealth.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+#include "soh/ShipInit.hpp"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+struct ActorMaximumHealth {
+    u8 maximumHealth = 0;
+};
+static ObjectExtension::Register<ActorMaximumHealth> ActorMaximumHealthRegister;
+
+u8 GetActorMaximumHealth(const Actor* actor) {
+    const ActorMaximumHealth* maxHealth = ObjectExtension::GetInstance().Get<ActorMaximumHealth>(actor);
+    return maxHealth != nullptr ? maxHealth->maximumHealth : ActorMaximumHealth{}.maximumHealth;
+}
+
+void SetActorMaximumHealth(const Actor* actor, u8 maximumHealth) {
+    ObjectExtension::GetInstance().Set<ActorMaximumHealth>(actor, ActorMaximumHealth{ maximumHealth });
+}
+
+static void ActorMaximumHealth_Register() {
+    COND_HOOK(OnActorInit, true, [](void* ptr) {
+        Actor* actor = static_cast<Actor*>(ptr);
+        if (actor->category == ACTORCAT_ENEMY) {
+            SetActorMaximumHealth(actor, actor->colChkInfo.health);
+        }
+    });
+}
+
+RegisterShipInitFunc actorMaximumHealthInit(ActorMaximumHealth_Register);
\ No newline at end of file
diff --git a/soh/soh/ObjectExtension/ActorMaximumHealth.h b/soh/soh/ObjectExtension/ActorMaximumHealth.h
new file mode 100644
index 0000000000..d3ee67acdf
--- /dev/null
+++ b/soh/soh/ObjectExtension/ActorMaximumHealth.h
@@ -0,0 +1,17 @@
+#ifndef ACTOR_MAXIMUM_HEALTH_H
+#define ACTOR_MAXIMUM_HEALTH_H
+
+#ifdef __cplusplus
+extern "C" {
+#include "z64actor.h"
+#endif
+
+// Max health value for use with health bars, set on actor init
+u8 GetActorMaximumHealth(const Actor* actor);
+void SetActorMaximumHealth(const Actor* actor, u8 maximumHealth);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ACTOR_MAXIMUM_HEALTH_H
\ No newline at end of file
diff --git a/soh/soh/ObjectExtension/ObjectExtension.cpp b/soh/soh/ObjectExtension/ObjectExtension.cpp
new file mode 100644
index 0000000000..3b8f6f8bfc
--- /dev/null
+++ b/soh/soh/ObjectExtension/ObjectExtension.cpp
@@ -0,0 +1,25 @@
+#include "ObjectExtension.h"
+
+ObjectExtension& ObjectExtension::GetInstance() {
+    static ObjectExtension instance;
+    return instance;
+}
+
+ObjectExtension::Id ObjectExtension::RegisterId() {
+    return NextId++;
+}
+
+void ObjectExtension::Free(const void* object) {
+    if (object == nullptr) {
+        return;
+    }
+
+    std::erase_if(Data, [&object](const auto& iter) {
+        auto const& [key, value] = iter;
+        return key.first == object;
+    });
+}
+
+extern "C" void ObjectExtension_Free(const void* object) {
+    ObjectExtension::GetInstance().Free(object);
+}
diff --git a/soh/soh/ObjectExtension/ObjectExtension.h b/soh/soh/ObjectExtension/ObjectExtension.h
new file mode 100644
index 0000000000..d59edffd01
--- /dev/null
+++ b/soh/soh/ObjectExtension/ObjectExtension.h
@@ -0,0 +1,116 @@
+#pragma once
+
+#ifdef __cplusplus
+
+#include <libultraship/libultraship.h>
+
+#include <any>
+#include <limits>
+#include <stdint.h>
+#include <unordered_map>
+#include <vector>
+
+/*
+ * This class can attach additional data to pointers. It can only attach a single instance of each type of data.
+ * Use the ObjectExtension::Register class to register a type to be used as an object extension.
+ * An example usage is:
+ *
+ * struct MyData {
+ *     s32 data = -1;
+ * };
+ * static ObjectExtension::Register<MyData> MyDataRegister;
+ *
+ * Then you can get with
+ * ObjectExtension::GetInstance().Get<MyData>(ptr);
+ * and set with
+ * ObjectExtension::GetInstance().Set<MyData>(ptr, MyData{});
+ * (or with the returned pointer from Get()).
+ */
+class ObjectExtension {
+  public:
+    using Id = uint32_t;
+
+    static constexpr Id InvalidId = std::numeric_limits<Id>::max();
+
+    // Registers type T to be used as an object extension
+    template <typename T> class Register {
+      public:
+        Register() {
+            Id = ObjectExtension::GetInstance().RegisterId();
+        }
+
+        static ObjectExtension::Id Id;
+    };
+
+    // Gets the singleton ObjectExtension instance
+    static ObjectExtension& GetInstance();
+
+    // Gets the data of type T associated with an object, or nullptr if no such data has been attached
+    template <typename T> T* Get(const void* object) {
+        assert(ObjectExtension::Register<T>::Id != InvalidId);
+        if (object == nullptr) {
+            return nullptr;
+        }
+
+        auto it = Data.find(std::make_pair(object, ObjectExtension::Register<T>::Id));
+        if (it == Data.end()) {
+            return nullptr;
+        }
+
+        return std::any_cast<T>(&(it->second));
+    }
+
+    // Sets the data of type T for an object. Data will be copied.
+    template <typename T> void Set(const void* object, const T&& data) {
+        assert(ObjectExtension::Register<T>::Id != InvalidId);
+        if (object != nullptr) {
+            Data[std::make_pair(object, ObjectExtension::Register<T>::Id)] = data;
+        }
+    }
+
+    // Returns true if an object has data of type T associated with it
+    template <typename T> bool Has(const void* object) {
+        assert(ObjectExtension::Register<T>::Id != InvalidId);
+        if (object == nullptr) {
+            return false;
+        }
+
+        return Data.contains(std::make_pair(object, ObjectExtension::Register<T>::Id));
+    }
+
+    // Removes data of type T from an object
+    template <typename T> void Remove(const void* object) {
+        assert(ObjectExtension::Register<T>::Id != InvalidId);
+
+        Data.erase(std::make_pair(object, ObjectExtension::Register<T>::Id));
+    }
+
+    // Removes all data from an object
+    void Free(const void* object);
+
+  private:
+    ObjectExtension() = default;
+
+    // Returns the next free object extension Id
+    Id RegisterId();
+
+    ObjectExtension::Id NextId = 0;
+
+    struct KeyHash {
+        std::size_t operator()(const std::pair<const void*, ObjectExtension::Id>& key) const {
+            return std::hash<const void*>{}(key.first) ^ (std::hash<ObjectExtension::Id>{}(key.second) << 1);
+        }
+    };
+
+    // Collection of all object extension data.
+    std::unordered_map<std::pair<const void*, ObjectExtension::Id>, std::any, KeyHash> Data;
+};
+
+// Static template globals
+template <typename T> ObjectExtension::Id ObjectExtension::Register<T>::Id = ObjectExtension::InvalidId;
+
+#else // __cplusplus
+
+void ObjectExtension_Free(const void* object);
+
+#endif // __cplusplus
diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp
index 2ab3458614..a9ec6fc253 100644
--- a/soh/soh/ResourceManagerHelpers.cpp
+++ b/soh/soh/ResourceManagerHelpers.cpp
@@ -11,7 +11,7 @@
 #include "resource/type/Array.h"
 #include "resource/type/Skeleton.h"
 #include "resource/type/PlayerAnimation.h"
-#include <Fast3D/gfx_pc.h>
+#include <Fast3D/Fast3dWindow.h>
 #include <DisplayList.h>
 
 extern "C" PlayState* gPlayState;
@@ -25,7 +25,8 @@ extern "C" uint32_t ResourceMgr_GetGameVersion(int index) {
 }
 
 extern "C" uint32_t ResourceMgr_GetGamePlatform(int index) {
-    uint32_t version = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];
+    uint32_t version =
+        Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];
 
     switch (version) {
         case OOT_NTSC_US_10:
@@ -35,6 +36,7 @@ extern "C" uint32_t ResourceMgr_GetGamePlatform(int index) {
         case OOT_PAL_11:
             return GAME_PLATFORM_N64;
         case OOT_NTSC_JP_GC:
+        case OOT_NTSC_JP_GC_CE:
         case OOT_NTSC_US_GC:
         case OOT_PAL_GC:
         case OOT_NTSC_JP_MQ:
@@ -48,13 +50,15 @@ extern "C" uint32_t ResourceMgr_GetGamePlatform(int index) {
 }
 
 extern "C" uint32_t ResourceMgr_GetGameRegion(int index) {
-    uint32_t version = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];
+    uint32_t version =
+        Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];
 
     switch (version) {
         case OOT_NTSC_US_10:
         case OOT_NTSC_US_11:
         case OOT_NTSC_US_12:
         case OOT_NTSC_JP_GC:
+        case OOT_NTSC_JP_GC_CE:
         case OOT_NTSC_US_GC:
         case OOT_NTSC_JP_MQ:
         case OOT_NTSC_US_MQ:
@@ -70,6 +74,11 @@ extern "C" uint32_t ResourceMgr_GetGameRegion(int index) {
     }
 }
 
+extern "C" char* _message_0xFFFC_nes;
+extern "C" bool ResourceMgr_IsPalLoaded() {
+    return _message_0xFFFC_nes != NULL;
+}
+
 u32 IsSceneMasterQuest(s16 sceneNum) {
     u8 mqMode = CVarGetInteger(CVAR_GENERAL("BetterDebugWarpScreenMQMode"), WARP_MODE_OVERRIDE_OFF);
     if (mqMode == WARP_MODE_OVERRIDE_MQ_AS_VANILLA) {
@@ -151,7 +160,7 @@ extern "C" char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize)
 
 extern "C" uint8_t ResourceMgr_FileExists(const char* filePath) {
     std::string path = filePath;
-    if(path.substr(0, 7) == "__OTR__"){
+    if (path.substr(0, 7) == "__OTR__") {
         path = path.substr(7);
     }
 
@@ -179,7 +188,7 @@ extern "C" bool ResourceMgr_IsAltAssetsEnabled() {
 // The resource is only removed from the internal cache to prevent it from used in the next resource lookup
 extern "C" void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName) {
     if (ResourceMgr_IsAltAssetsEnabled() && ResourceMgr_FileAltExists((char*)resName)) {
-        ResourceMgr_UnloadResource((char*) resName);
+        ResourceMgr_UnloadResource((char*)resName);
     }
 }
 
@@ -225,8 +234,10 @@ extern "C" char* ResourceMgr_LoadJPEG(char* data, size_t dataSize) {
     int h;
     int comp;
 
-    unsigned char* pixels = stbi_load_from_memory((const unsigned char*)data, 320 * 240 * 2, &w, &h, &comp, STBI_rgb_alpha);
-    //unsigned char* pixels = stbi_load_from_memory((const unsigned char*)data, 480 * 240 * 2, &w, &h, &comp, STBI_rgb_alpha);
+    unsigned char* pixels =
+        stbi_load_from_memory((const unsigned char*)data, 320 * 240 * 2, &w, &h, &comp, STBI_rgb_alpha);
+    // unsigned char* pixels = stbi_load_from_memory((const unsigned char*)data, 480 * 240 * 2, &w, &h, &comp,
+    // STBI_rgb_alpha);
     int idx = 0;
 
     for (int y = 0; y < h; y++) {
@@ -281,7 +292,7 @@ extern "C" char* ResourceMgr_LoadPlayerAnimByName(const char* animPath) {
 }
 
 extern "C" void ResourceMgr_PushCurrentDirectory(char* path) {
-    gfx_push_current_dir(path);
+    Fast::gfx_push_current_dir(path);
 }
 
 extern "C" Gfx* ResourceMgr_LoadGfxByName(const char* path) {
@@ -306,8 +317,8 @@ typedef struct {
 
 std::unordered_map<std::string, std::unordered_map<std::string, GfxPatch>> originalGfx;
 
-// Attention! This is primarily for cosmetics & bug fixes. For things like mods and model replacement you should be using OTRs
-// instead (When that is available). Index can be found using the commented out section below.
+// Attention! This is primarily for cosmetics & bug fixes. For things like mods and model replacement you should be
+// using OTRs instead (When that is available). Index can be found using the commented out section below.
 extern "C" void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction) {
     auto res = std::static_pointer_cast<Fast::DisplayList>(
         Ship::Context::GetInstance()->GetResourceManager()->LoadResource(path));
@@ -320,7 +331,8 @@ extern "C" void ResourceMgr_PatchGfxByName(const char* path, const char* patchNa
             // SPDLOG_INFO("index:{} command:{}", i, gfx->words.w0 >> 24);
             // Log only SetPrimColors
             if (gfx->words.w0 >> 24 == 250) {
-                SPDLOG_INFO("index:{} r:{} g:{} b:{} a:{}", i, _SHIFTR(gfx->words.w1, 24, 8), _SHIFTR(gfx->words.w1, 16, 8), _SHIFTR(gfx->words.w1, 8, 8), _SHIFTR(gfx->words.w1, 0, 8));
+                SPDLOG_INFO("index:{} r:{} g:{} b:{} a:{}", i, _SHIFTR(gfx->words.w1, 24, 8), _SHIFTR(gfx->words.w1, 16,
+    8), _SHIFTR(gfx->words.w1, 8, 8), _SHIFTR(gfx->words.w1, 0, 8));
             }
         }
     }*/
@@ -338,16 +350,14 @@ extern "C" void ResourceMgr_PatchGfxByName(const char* path, const char* patchNa
     Gfx* gfx = (Gfx*)&res->Instructions[index];
 
     if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) {
-        originalGfx[path][patchName] = {
-            index,
-            *gfx
-        };
+        originalGfx[path][patchName] = { index, *gfx };
     }
 
     *gfx = instruction;
 }
 
-extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex, int sourceIndex) {
+extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex,
+                                                      int sourceIndex) {
     auto res = std::static_pointer_cast<Fast::DisplayList>(
         Ship::Context::GetInstance()->GetResourceManager()->LoadResource(path));
 
@@ -360,10 +370,7 @@ extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const ch
     Gfx sourceGfx = *(Gfx*)&res->Instructions[sourceIndex];
 
     if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) {
-        originalGfx[path][patchName] = {
-            destinationIndex,
-            *destinationGfx
-        };
+        originalGfx[path][patchName] = { destinationIndex, *destinationGfx };
     }
 
     *destinationGfx = sourceGfx;
@@ -395,59 +402,57 @@ extern "C" char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path) {
     //     return (char*)res->CachedGameAsset;
     // else
     // {
-        Vec3s* data = (Vec3s*)malloc(sizeof(Vec3s) * res->Scalars.size());
+    Vec3s* data = (Vec3s*)malloc(sizeof(Vec3s) * res->Scalars.size());
 
-        for (size_t i = 0; i < res->Scalars.size(); i += 3) {
-            data[(i / 3)].x = res->Scalars[i + 0].s16;
-            data[(i / 3)].y = res->Scalars[i + 1].s16;
-            data[(i / 3)].z = res->Scalars[i + 2].s16;
-        }
+    for (size_t i = 0; i < res->Scalars.size(); i += 3) {
+        data[(i / 3)].x = res->Scalars[i + 0].s16;
+        data[(i / 3)].y = res->Scalars[i + 1].s16;
+        data[(i / 3)].z = res->Scalars[i + 2].s16;
+    }
 
-        // res->CachedGameAsset = data;
+    // res->CachedGameAsset = data;
 
-        return (char*)data;
+    return (char*)data;
     // }
 }
 
 extern "C" CollisionHeader* ResourceMgr_LoadColByName(const char* path) {
-    return (CollisionHeader*) ResourceGetDataByName(path);
+    return (CollisionHeader*)ResourceGetDataByName(path);
 }
 
 extern "C" Vtx* ResourceMgr_LoadVtxByName(char* path) {
-    return (Vtx*) ResourceGetDataByName(path);
+    return (Vtx*)ResourceGetDataByName(path);
 }
 
 extern "C" SequenceData ResourceMgr_LoadSeqByName(const char* path) {
-    SequenceData* sequence = (SequenceData*) ResourceGetDataByName(path);
+    SequenceData* sequence = (SequenceData*)ResourceGetDataByName(path);
     return *sequence;
 }
 
-extern "C" SoundFontSample* ResourceMgr_LoadAudioSample(const char* path) {
-    return (SoundFontSample*) ResourceGetDataByName(path);
+extern "C" SequenceData* ResourceMgr_LoadSeqPtrByName(const char* path) {
+    SequenceData* sequence = (SequenceData*)ResourceGetDataByName(path);
+    return sequence;
 }
 
-extern "C" SoundFont* ResourceMgr_LoadAudioSoundFont(const char* path) {
-    return (SoundFont*) ResourceGetDataByName(path);
+extern "C" SoundFontSample* ResourceMgr_LoadAudioSample(const char* path) {
+    return (SoundFontSample*)ResourceGetDataByName(path);
+}
+
+extern "C" SoundFont* ResourceMgr_LoadAudioSoundFontByName(const char* path) {
+    return (SoundFont*)ResourceGetDataByName(path);
 }
 
 extern "C" int ResourceMgr_OTRSigCheck(char* imgData) {
-	uintptr_t i = (uintptr_t)(imgData);
+    uintptr_t i = (uintptr_t)(imgData);
 
-// if (i == 0xD9000000 || i == 0xE7000000 || (i & 1) == 1)
+    // if (i == 0xD9000000 || i == 0xE7000000 || (i & 1) == 1)
     if ((i & 1) == 1)
         return 0;
 
-// if ((i & 0xFF000000) != 0xAB000000 && (i & 0xFF000000) != 0xCD000000 && i != 0) {
+    // if ((i & 0xFF000000) != 0xAB000000 && (i & 0xFF000000) != 0xCD000000 && i != 0) {
     if (i != 0) {
-        if (
-            imgData[0] == '_' &&
-            imgData[1] == '_' &&
-            imgData[2] == 'O' &&
-            imgData[3] == 'T' &&
-            imgData[4] == 'R' &&
-            imgData[5] == '_' &&
-            imgData[6] == '_'
-        ) {
+        if (imgData[0] == '_' && imgData[1] == '_' && imgData[2] == 'O' && imgData[3] == 'T' && imgData[4] == 'R' &&
+            imgData[5] == '_' && imgData[6] == '_') {
             return 1;
         }
     }
@@ -456,7 +461,7 @@ extern "C" int ResourceMgr_OTRSigCheck(char* imgData) {
 }
 
 extern "C" AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path) {
-    return (AnimationHeaderCommon*) ResourceGetDataByName(path);
+    return (AnimationHeaderCommon*)ResourceGetDataByName(path);
 }
 
 extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, SkelAnime* skelAnime) {
@@ -473,11 +478,11 @@ extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, Skel
         pathStr = Ship::IResource::gAltAssetPrefix + pathStr;
     }
 
-    SkeletonHeader* skelHeader = (SkeletonHeader*) ResourceGetDataByName(pathStr.c_str());
+    SkeletonHeader* skelHeader = (SkeletonHeader*)ResourceGetDataByName(pathStr.c_str());
 
     // If there isn't an alternate model, load the regular one
     if (isAlt && skelHeader == NULL) {
-        skelHeader = (SkeletonHeader*) ResourceGetDataByName(path);
+        skelHeader = (SkeletonHeader*)ResourceGetDataByName(path);
     }
 
     // This function is only called when a skeleton is initialized.
diff --git a/soh/soh/ResourceManagerHelpers.h b/soh/soh/ResourceManagerHelpers.h
index 3b14188b75..b760feae3f 100644
--- a/soh/soh/ResourceManagerHelpers.h
+++ b/soh/soh/ResourceManagerHelpers.h
@@ -16,51 +16,53 @@ std::shared_ptr<Ship::IResource> ResourceMgr_GetResourceByNameHandlingMQ(const c
 
 extern "C" {
 #endif // __cplusplus
-    #include "z64animation.h"
-    #include "z64audio.h"
-    #include "z64bgcheck.h"
-    uint32_t ResourceMgr_IsGameMasterQuest();
-    uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
-    uint32_t ResourceMgr_GameHasMasterQuest();
-    uint32_t ResourceMgr_GameHasOriginal();
-    uint32_t ResourceMgr_GetNumGameVersions();
-    uint32_t ResourceMgr_GetGameVersion(int index);
-    uint32_t ResourceMgr_GetGamePlatform(int index);
-    uint32_t ResourceMgr_GetGameRegion(int index);
-    void ResourceMgr_LoadDirectory(const char* resName);
-    void ResourceMgr_UnloadResource(const char* resName);
-    char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize);
-    uint8_t ResourceMgr_FileExists(const char* resName);
-    uint8_t ResourceMgr_FileAltExists(const char* resName);
-    void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName);
-    uint8_t ResourceMgr_TexIsRaw(const char* texPath);
-    uint8_t ResourceMgr_ResourceIsBackground(char* texPath);
-    char* ResourceMgr_LoadJPEG(char* data, size_t dataSize);
-    uint16_t ResourceMgr_LoadTexWidthByName(char* texPath);
-    uint16_t ResourceMgr_LoadTexHeightByName(char* texPath);
-    char* ResourceMgr_LoadTexOrDListByName(const char* filePath);
-    char* ResourceMgr_LoadPlayerAnimByName(const char* animPath);
-    AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path);
-    char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc);
-    Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc);
-    Gfx* ResourceMgr_LoadGfxByName(const char* path);
-    uint8_t ResourceMgr_FileIsCustomByName(const char* path);
-    void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
-    void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
-    char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path);
-    Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc);
-    Vtx* ResourceMgr_LoadVtxByName(char* path);
-    SoundFont* ResourceMgr_LoadAudioSoundFont(const char* path);
-    SequenceData ResourceMgr_LoadSeqByName(const char* path);
-    SoundFontSample* ResourceMgr_LoadAudioSample(const char* path);
-    CollisionHeader* ResourceMgr_LoadColByName(const char* path);
-    bool ResourceMgr_IsAltAssetsEnabled();
-    SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, SkelAnime* skelAnime);
-    void ResourceMgr_UnregisterSkeleton(SkelAnime* skelAnime);
-    void ResourceMgr_ClearSkeletons();
-    s32* ResourceMgr_LoadCSByName(const char* path);
-    int ResourceMgr_OTRSigCheck(char* imgData);
-    char* ResourceMgr_GetResourceDataByNameHandlingMQ(const char* path);
+#include "z64animation.h"
+#include "z64audio.h"
+#include "z64bgcheck.h"
+uint32_t ResourceMgr_IsGameMasterQuest();
+uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
+uint32_t ResourceMgr_GameHasMasterQuest();
+uint32_t ResourceMgr_GameHasOriginal();
+uint32_t ResourceMgr_GetNumGameVersions();
+uint32_t ResourceMgr_GetGameVersion(int index);
+uint32_t ResourceMgr_GetGamePlatform(int index);
+uint32_t ResourceMgr_GetGameRegion(int index);
+bool ResourceMgr_IsPalLoaded();
+void ResourceMgr_LoadDirectory(const char* resName);
+void ResourceMgr_UnloadResource(const char* resName);
+char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize);
+uint8_t ResourceMgr_FileExists(const char* resName);
+uint8_t ResourceMgr_FileAltExists(const char* resName);
+void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName);
+uint8_t ResourceMgr_TexIsRaw(const char* texPath);
+uint8_t ResourceMgr_ResourceIsBackground(char* texPath);
+char* ResourceMgr_LoadJPEG(char* data, size_t dataSize);
+uint16_t ResourceMgr_LoadTexWidthByName(char* texPath);
+uint16_t ResourceMgr_LoadTexHeightByName(char* texPath);
+char* ResourceMgr_LoadTexOrDListByName(const char* filePath);
+char* ResourceMgr_LoadPlayerAnimByName(const char* animPath);
+AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path);
+char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc);
+Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc);
+Gfx* ResourceMgr_LoadGfxByName(const char* path);
+uint8_t ResourceMgr_FileIsCustomByName(const char* path);
+void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
+void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
+char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path);
+Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc);
+Vtx* ResourceMgr_LoadVtxByName(char* path);
+SoundFont* ResourceMgr_LoadAudioSoundFontByName(const char* path);
+SequenceData ResourceMgr_LoadSeqByName(const char* path);
+SequenceData* ResourceMgr_LoadSeqPtrByName(const char* path);
+SoundFontSample* ResourceMgr_LoadAudioSample(const char* path);
+CollisionHeader* ResourceMgr_LoadColByName(const char* path);
+bool ResourceMgr_IsAltAssetsEnabled();
+SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, SkelAnime* skelAnime);
+void ResourceMgr_UnregisterSkeleton(SkelAnime* skelAnime);
+void ResourceMgr_ClearSkeletons();
+s32* ResourceMgr_LoadCSByName(const char* path);
+int ResourceMgr_OTRSigCheck(char* imgData);
+char* ResourceMgr_GetResourceDataByNameHandlingMQ(const char* path);
 #ifdef __cplusplus
 }
 #endif // __cplusplus
\ No newline at end of file
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 55c7d204e5..2180f6d953 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -8,6 +8,7 @@
 #include "soh/util.h"
 #include "Enhancements/randomizer/hint.h"
 #include "Enhancements/randomizer/item.h"
+#include "ResourceManagerHelpers.h"
 
 #include "z64.h"
 #include "cvar_prefixes.h"
@@ -29,7 +30,7 @@ extern "C" SaveContext gSaveContext;
 using namespace std::string_literals;
 
 void SaveManager::WriteSaveFile(const std::filesystem::path& savePath, const uintptr_t addr, void* dramAddr,
-                           const size_t size) {
+                                const size_t size) {
     std::ofstream saveFile = std::ofstream(savePath, std::fstream::in | std::fstream::out | std::fstream::binary);
     saveFile.seekp(addr);
     saveFile.write((char*)dramAddr, size);
@@ -60,7 +61,7 @@ std::filesystem::path SaveManager::GetFileTempName(int fileNum) {
     return sSavePath / ("file" + std::to_string(fileNum + 1) + ".temp");
 }
 
-std::vector<RandomizerHint> Rando::StaticData::oldVerHintOrder {
+std::vector<RandomizerHint> Rando::StaticData::oldVerHintOrder{
     RH_COLOSSUS_GOSSIP_STONE,
     RH_DMC_GOSSIP_STONE,
     RH_DMC_UPPER_GROTTO_GOSSIP_STONE,
@@ -118,14 +119,13 @@ SaveManager::SaveManager() {
     AddLoadFunction("base", 4, LoadBaseVersion4);
     AddSaveFunction("base", 4, SaveBase, true, SECTION_PARENT_NONE);
 
-    AddLoadFunction("randomizer", 1, LoadRandomizerVersion1);
-    AddLoadFunction("randomizer", 2, LoadRandomizerVersion2);
-    AddLoadFunction("randomizer", 3, LoadRandomizerVersion3);
-    AddSaveFunction("randomizer", 3, SaveRandomizer, true, SECTION_PARENT_NONE);
+    AddLoadFunction("randomizer", 1, LoadRandomizer);
+    AddSaveFunction("randomizer", 1, SaveRandomizer, true, SECTION_PARENT_NONE);
 
     AddInitFunction(InitFileImpl);
 
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([this](uint32_t fileNum) { ThreadPoolWait(); });
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>(
+        [this](uint32_t fileNum) { ThreadPoolWait(); });
 
     smThreadPool = std::make_shared<BS::thread_pool>(1);
 
@@ -155,95 +155,7 @@ SaveManager::SaveManager() {
     }
 }
 
-// RANDOTODO should we just have dummy functions that raise warnings instead if these aren't supported?
-void SaveManager::LoadRandomizerVersion1() {
-    auto randoContext = Rando::Context::GetInstance();
-    RandomizerCheck location = RC_UNKNOWN_CHECK;
-    for (int i = 0; i < RC_MAX; i++) {
-        SaveManager::Instance->LoadData("check" + std::to_string(i), location);
-        SaveManager::Instance->LoadStruct("get" + std::to_string(i), [&]() {
-            SaveManager::Instance->LoadData("rgID", randoContext->GetItemLocation(location)->RefPlacedItem());
-            if (randoContext->GetItemLocation(location)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
-                randoContext->overrides[location].SetLocation(location);
-                SaveManager::Instance->LoadData("fakeRgID", randoContext->overrides[location].RefLooksLike());
-                SaveManager::Instance->LoadData("trickName", randoContext->overrides[location].GetTrickName().english);
-                SaveManager::Instance->LoadData("trickName", randoContext->overrides[location].GetTrickName().french);
-            }
-        });
-    }
-
-    for (uint32_t i = 0; i < randoContext->hashIconIndexes.size(); i++) {
-        SaveManager::Instance->LoadData("seed" + std::to_string(i), randoContext->hashIconIndexes[i]);
-    }
-
-    for (int i = 0; i < RSK_MAX; i++) {
-        int key, value;
-        SaveManager::Instance->LoadData("sk" + std::to_string(i), key);
-        SaveManager::Instance->LoadData("sv" + std::to_string(i), value);
-        randoContext->GetOption(RandomizerSettingKey(key)).Set(value);
-    }
-
-    for (int i = 0; i < 50; i++) {
-        RandomizerCheck check;
-        char hintText[200];
-        SaveManager::Instance->LoadData("hc" + std::to_string(i), check);
-        for (int j = 0; j < ARRAY_COUNT(hintText); j++) {
-            SaveManager::Instance->LoadData("ht" + std::to_string(i) + "-" + std::to_string(j), hintText[j]);
-        }
-        RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[i - Rando::StaticData::oldVerGossipStoneStart];
-        randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
-    }
-
-    char childAltarText[250];
-    for (int i = 0; i < ARRAY_COUNT(childAltarText); i++) {
-        SaveManager::Instance->LoadData("cat" + std::to_string(i), childAltarText[i]);
-    }
-    randoContext->AddHint(RH_ALTAR_CHILD, Rando::Hint(RH_ALTAR_CHILD, {CustomMessage(childAltarText)}));
-
-    char adultAltarText[750];
-    for (int i = 0; i < ARRAY_COUNT(adultAltarText); i++) {
-        SaveManager::Instance->LoadData("aat" + std::to_string(i), adultAltarText[i]);
-    }
-    randoContext->AddHint(RH_ALTAR_ADULT, Rando::Hint(RH_ALTAR_ADULT, {CustomMessage(adultAltarText)}));
-
-    char ganonHintText[150];
-    for (int i = 0; i < ARRAY_COUNT(ganonHintText); i++) {
-        SaveManager::Instance->LoadData("ght" + std::to_string(i), ganonHintText[i]);
-    }
-    randoContext->AddHint(RH_GANONDORF_HINT, Rando::Hint(RH_GANONDORF_HINT, {CustomMessage(ganonHintText)}));
-
-    char ganonText[250];
-    for (int i = 0; i < ARRAY_COUNT(ganonText); i++) {
-        SaveManager::Instance->LoadData("gt" + std::to_string(i), ganonText[i]);
-    }
-    randoContext->AddHint(RH_GANONDORF_JOKE, Rando::Hint(RH_GANONDORF_JOKE, {CustomMessage(ganonText)}));
-
-    SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
-
-    SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.ship.pendingIceTrapCount);
-
-
-    size_t merchantPricesSize = 0;
-    if (randoContext->GetOption(RSK_SHUFFLE_SCRUBS).Is(RO_SCRUBS_OFF)) {
-        merchantPricesSize += NUM_SCRUBS;
-    }
-    if (randoContext->GetOption(RSK_SHOPSANITY).Is(RO_SHOPSANITY_OFF)) {
-        merchantPricesSize += NUM_SHOP_ITEMS;
-    }
-
-    SaveManager::Instance->LoadArray("merchantPrices", merchantPricesSize, [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            RandomizerCheck rc;
-            SaveManager::Instance->LoadData("check", rc);
-            uint32_t price;
-            SaveManager::Instance->LoadData("price", price);
-            randoContext->GetItemLocation(rc)->SetCustomPrice(price);
-        });
-    });
-}
-
-//RANDOTODO if we actually support this, be less lazy
-void SaveManager::LoadRandomizerVersion2() {
+void SaveManager::LoadRandomizer() {
     auto randoContext = Rando::Context::GetInstance();
     SaveManager::Instance->LoadArray("itemLocations", RC_MAX, [&](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
@@ -251,145 +163,12 @@ void SaveManager::LoadRandomizerVersion2() {
             RandomizerGet rg = RG_NONE;
             SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
             if (rg != RG_NONE) {
-                randoContext->overrides[static_cast<RandomizerCheck>(i)] = Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg);
-                SaveManager::Instance->LoadData("trickName", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().english);
-                SaveManager::Instance->LoadData("trickName", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().french);
-            }
-        });
-    });
-
-    auto entranceCtx = randoContext->GetEntranceShuffler();
-    SaveManager::Instance->LoadArray("entrances", ARRAY_COUNT(entranceCtx->entranceOverrides), [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("type", entranceCtx->entranceOverrides[i].type);
-            SaveManager::Instance->LoadData("index", entranceCtx->entranceOverrides[i].index);
-            SaveManager::Instance->LoadData("destination", entranceCtx->entranceOverrides[i].destination);
-            SaveManager::Instance->LoadData("override", entranceCtx->entranceOverrides[i].override);
-            SaveManager::Instance->LoadData("overrideDestination", entranceCtx->entranceOverrides[i].overrideDestination);
-        });
-    });
-
-    SaveManager::Instance->LoadArray("seed", randoContext->hashIconIndexes.size(), [&](size_t i) {
-        SaveManager::Instance->LoadData("", randoContext->hashIconIndexes[i]);
-    });
-
-    std::string inputSeed;
-    SaveManager::Instance->LoadData("inputSeed", inputSeed);
-    randoContext->SetSeedString(inputSeed);
-
-    uint32_t finalSeed;
-    SaveManager::Instance->LoadData("finalSeed", finalSeed);
-    randoContext->SetSeed(finalSeed);
-
-    SaveManager::Instance->LoadArray("randoSettings", RSK_MAX, [&](size_t i) {
-        int value = 0;
-        SaveManager::Instance->LoadData("", value);
-        randoContext->GetOption(RandomizerSettingKey(i)).Set(value);
-    });
-
-    SaveManager::Instance->LoadArray("hintLocations", RH_ZR_OPEN_GROTTO_GOSSIP_STONE + 1, [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            RandomizerCheck rc = RC_UNKNOWN_CHECK;
-            SaveManager::Instance->LoadData("check", rc);
-            if (rc != RC_UNKNOWN_CHECK) {
-                std::string hintText;
-                SaveManager::Instance->LoadData("hintText", hintText);
-                RandomizerHint stoneHint = Rando::StaticData::oldVerHintOrder[rc - Rando::StaticData::oldVerGossipStoneStart];
-                randoContext->AddHint(stoneHint, Rando::Hint(stoneHint, {CustomMessage(hintText)}));
-            }
-        });
-    });
-
-    std::string childAltarText;
-    SaveManager::Instance->LoadData("childAltarText", childAltarText);
-    randoContext->AddHint(RH_ALTAR_CHILD, Rando::Hint(RH_ALTAR_CHILD, {CustomMessage(childAltarText)}));
-    std::string adultAltarText;
-    SaveManager::Instance->LoadData("adultAltarText", adultAltarText);
-    randoContext->AddHint(RH_ALTAR_ADULT, Rando::Hint(RH_ALTAR_ADULT, {CustomMessage(adultAltarText)}));
-    std::string ganonHintText;
-    SaveManager::Instance->LoadData("ganonHintText", ganonHintText);
-    randoContext->AddHint(RH_GANONDORF_HINT, Rando::Hint(RH_GANONDORF_HINT, {CustomMessage(ganonHintText)}));
-    std::string ganonText;
-    SaveManager::Instance->LoadData("ganonText", ganonText);
-    randoContext->AddHint(RH_GANONDORF_JOKE, Rando::Hint(RH_GANONDORF_JOKE, {CustomMessage(ganonText)}));
-    std::string dampeText;
-    SaveManager::Instance->LoadData("dampeText", dampeText);
-    randoContext->AddHint(RH_DAMPES_DIARY, Rando::Hint(RH_DAMPES_DIARY, {CustomMessage(dampeText)}));
-    std::string gregHintText;
-    SaveManager::Instance->LoadData("gregHintText", gregHintText);
-    randoContext->AddHint(RH_GREG_RUPEE, Rando::Hint(RH_GREG_RUPEE, {CustomMessage(gregHintText)}));
-    std::string sheikText;
-    SaveManager::Instance->LoadData("sheikText", sheikText);
-    randoContext->AddHint(RH_SHEIK_HINT, Rando::Hint(RH_SHEIK_HINT, {CustomMessage(sheikText)}));
-    std::string sariaText;
-    SaveManager::Instance->LoadData("sariaText", sariaText);
-    randoContext->AddHint(RH_SARIA_HINT, Rando::Hint(RH_SARIA_HINT, {CustomMessage(sariaText)}));
-    std::string fishingPoleText;
-    SaveManager::Instance->LoadData("fishingPoleText", fishingPoleText);
-    randoContext->AddHint(RH_FISHING_POLE, Rando::Hint(RH_FISHING_POLE, {CustomMessage(fishingPoleText)}));
-    std::string warpMinuetText;
-    SaveManager::Instance->LoadData("warpMinuetText", warpMinuetText);
-    randoContext->AddHint(RH_MINUET_WARP_LOC, Rando::Hint(RH_MINUET_WARP_LOC, {CustomMessage(warpMinuetText)}));
-    std::string warpBoleroText;
-    SaveManager::Instance->LoadData("warpBoleroText", warpBoleroText);
-    randoContext->AddHint(RH_BOLERO_WARP_LOC, Rando::Hint(RH_BOLERO_WARP_LOC, {CustomMessage(warpBoleroText)}));
-    std::string warpSerenadeText;
-    SaveManager::Instance->LoadData("warpSerenadeText", warpSerenadeText);
-    randoContext->AddHint(RH_SERENADE_WARP_LOC, Rando::Hint(RH_SERENADE_WARP_LOC, {CustomMessage(warpSerenadeText)}));
-    std::string warpRequiemText;
-    SaveManager::Instance->LoadData("warpRequiemText", warpRequiemText);
-    randoContext->AddHint(RH_REQUIEM_WARP_LOC, Rando::Hint(RH_REQUIEM_WARP_LOC, {CustomMessage(warpRequiemText)}));
-    std::string warpNocturneText;
-    SaveManager::Instance->LoadData("warpNocturneText", warpNocturneText);
-    randoContext->AddHint(RH_NOCTURNE_WARP_LOC, Rando::Hint(RH_NOCTURNE_WARP_LOC, {CustomMessage(warpNocturneText)}));
-    std::string warpPreludeText;
-    SaveManager::Instance->LoadData("warpPreludeText", warpPreludeText);
-    randoContext->AddHint(RH_PRELUDE_WARP_LOC, Rando::Hint(RH_PRELUDE_WARP_LOC, {CustomMessage(warpPreludeText)}));
-
-    SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
-
-    SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.ship.pendingIceTrapCount);
-
-    std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
-
-    size_t merchantPricesSize = 0;
-    SaveManager::Instance->LoadData("merchantPricesSize", merchantPricesSize);
-
-    SaveManager::Instance->LoadArray("merchantPrices", merchantPricesSize, [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            RandomizerCheck rc;
-            SaveManager::Instance->LoadData("check", rc);
-            uint32_t price;
-            SaveManager::Instance->LoadData("price", price);
-            randoContext->GetItemLocation(rc)->SetCustomPrice(price);
-        });
-    });
-
-    size_t mqDungeonCount;
-    SaveManager::Instance->LoadData("masterQuestDungeonCount", mqDungeonCount, (size_t)0);
-
-    randoContext->GetDungeons()->ClearAllMQ();
-    SaveManager::Instance->LoadArray("masterQuestDungeons", mqDungeonCount, [&](size_t i) {
-        uint16_t scene;
-        SaveManager::Instance->LoadData("", scene);
-        randoContext->GetDungeons()->GetDungeonFromScene(SceneID(scene))->SetMQ();
-    });
-}
-
-void SaveManager::LoadRandomizerVersion3() {
-    auto randoContext = Rando::Context::GetInstance();
-    SaveManager::Instance->LoadArray("itemLocations", RC_MAX, [&](size_t i) {
-        SaveManager::Instance->LoadStruct("", [&]() {
-            SaveManager::Instance->LoadData("rgID", randoContext->GetItemLocation(i)->RefPlacedItem());
-            RandomizerGet rg = RG_NONE;
-            SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
-            if (rg != RG_NONE) {
-                randoContext->overrides.emplace(static_cast<RandomizerCheck>(i), Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg));
+                randoContext->overrides.emplace(static_cast<RandomizerCheck>(i),
+                                                Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg));
                 SaveManager::Instance->LoadStruct("trickName", [&]() {
-                    SaveManager::Instance->LoadData(
-                        "english", randoContext->GetItemOverride(i).GetTrickName().english);
-                    SaveManager::Instance->LoadData(
-                        "french", randoContext->GetItemOverride(i).GetTrickName().french);
+                    SaveManager::Instance->LoadData("english", randoContext->GetItemOverride(i).GetTrickName().english);
+                    SaveManager::Instance->LoadData("german", randoContext->GetItemOverride(i).GetTrickName().german);
+                    SaveManager::Instance->LoadData("french", randoContext->GetItemOverride(i).GetTrickName().french);
                 });
             }
             uint16_t price = 0;
@@ -441,7 +220,8 @@ void SaveManager::LoadRandomizerVersion3() {
         randoContext->AddHint(hint, Rando::Hint(hint, json));
     });
 
-    SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
+    SaveManager::Instance->LoadData("triforcePiecesCollected",
+                                    gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
 
     SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.ship.pendingIceTrapCount);
 
@@ -458,16 +238,23 @@ void SaveManager::LoadRandomizerVersion3() {
     });
 
     randoContext->GetTrials()->SkipAll();
-    SaveManager::Instance->LoadArray("requiredTrials", randoContext->GetOption(RSK_TRIAL_COUNT).Get() + 1, [&](size_t i) {
+    SaveManager::Instance->LoadArray("requiredTrials", randoContext->GetOption(RSK_TRIAL_COUNT).Get(), [&](size_t i) {
         size_t trialId;
         SaveManager::Instance->LoadData("", trialId);
         randoContext->GetTrial(trialId)->SetAsRequired();
     });
+
+    SaveManager::Instance->LoadArray("trickOptions", RT_MAX, [&](size_t i) {
+        uint8_t value = 0;
+        SaveManager::Instance->LoadData("", value);
+        randoContext->GetTrickOption(RandomizerTrick(i)).Set(value);
+    });
 }
 
 void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool fullSave) {
 
-    if(saveContext->ship.quest.id != QUEST_RANDOMIZER) return;
+    if (saveContext->ship.quest.id != QUEST_RANDOMIZER)
+        return;
     auto randoContext = Rando::Context::GetInstance();
 
     SaveManager::Instance->SaveArray("itemLocations", RC_MAX, [&](size_t i) {
@@ -476,9 +263,12 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
                 SaveManager::Instance->SaveData("fakeRgID", randoContext->GetItemOverride(i).LooksLike());
                 SaveManager::Instance->SaveStruct("trickName", [&]() {
-                    SaveManager::Instance->SaveData("english", randoContext->GetItemOverride(i).GetTrickName().GetEnglish());
-                    SaveManager::Instance->SaveData("french", randoContext->GetItemOverride(i).GetTrickName().GetFrench());
-                    // TODO: German (trick names don't have german translations yet)
+                    SaveManager::Instance->SaveData("english",
+                                                    randoContext->GetItemOverride(i).GetTrickName().GetEnglish());
+                    SaveManager::Instance->SaveData("german",
+                                                    randoContext->GetItemOverride(i).GetTrickName().GetGerman());
+                    SaveManager::Instance->SaveData("french",
+                                                    randoContext->GetItemOverride(i).GetTrickName().GetFrench());
                 });
             }
             if (randoContext->GetItemLocation(i)->HasCustomPrice()) {
@@ -494,7 +284,8 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
             SaveManager::Instance->SaveData("index", entranceCtx->entranceOverrides[i].index);
             SaveManager::Instance->SaveData("destination", entranceCtx->entranceOverrides[i].destination);
             SaveManager::Instance->SaveData("override", entranceCtx->entranceOverrides[i].override);
-            SaveManager::Instance->SaveData("overrideDestination", entranceCtx->entranceOverrides[i].overrideDestination);
+            SaveManager::Instance->SaveData("overrideDestination",
+                                            entranceCtx->entranceOverrides[i].overrideDestination);
         });
     });
 
@@ -513,26 +304,25 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
     SaveManager::Instance->SaveArray("hintLocations", RH_MAX, [&](size_t i) {
         auto hint = randoContext->GetHint(RandomizerHint(i));
         // RANDOTODO a way for saveData to accept a raw JSON would make maintaining hint code nicer.
-        // save manager forces code rewrites between the spoiler log and internal saves, when the code needs to do the exact same thing
-        // in cases where data needs to be loaded in from the spoiler log for plando mode.
-        // fails as push_back is ambiguous
+        // save manager forces code rewrites between the spoiler log and internal saves, when the code needs to do the
+        // exact same thing in cases where data needs to be loaded in from the spoiler log for plando mode. fails as
+        // push_back is ambiguous
         // SaveManager::Instance->SaveData(Rando::StaticData::hintNames[(uint32_t)hint].GetEnglish(), hint->toJSON());
         SaveManager::Instance->SaveStruct("", [&]() {
             bool enabled = hint->IsEnabled();
             SaveManager::Instance->SaveData("enabled", enabled);
-            if (enabled){
+            if (enabled) {
                 std::vector<std::string> messages = hint->GetAllMessageStrings(MF_RAW);
-                SaveManager::Instance->SaveArray("messages", messages.size(), [&](size_t i) {
-                    SaveManager::Instance->SaveData("", messages[i]);
-                });
+                SaveManager::Instance->SaveArray("messages", messages.size(),
+                                                 [&](size_t i) { SaveManager::Instance->SaveData("", messages[i]); });
 
                 SaveManager::Instance->SaveData("distribution", hint->GetDistribution());
-                SaveManager::Instance->SaveData("type", Rando::StaticData::hintTypeNames[hint->GetHintType()].GetEnglish(MF_CLEAN));
-                
+                SaveManager::Instance->SaveData(
+                    "type", Rando::StaticData::hintTypeNames[hint->GetHintType()].GetEnglish(MF_CLEAN));
+
                 std::vector<RandomizerHintTextKey> hintKeys = hint->GetHintTextKeys();
-                SaveManager::Instance->SaveArray("hintKeys", hintKeys.size(), [&](size_t i) {
-                    SaveManager::Instance->SaveData("", hintKeys[i]);
-                });
+                SaveManager::Instance->SaveArray("hintKeys", hintKeys.size(),
+                                                 [&](size_t i) { SaveManager::Instance->SaveData("", hintKeys[i]); });
 
                 std::vector<RandomizerCheck> locations = hint->GetHintedLocations();
                 SaveManager::Instance->SaveArray("locations", locations.size(), [&](size_t i) {
@@ -541,14 +331,15 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
 
                 std::vector<RandomizerGet> items = hint->GetHintedItems();
                 SaveManager::Instance->SaveArray("items", items.size(), [&](size_t i) {
-                    SaveManager::Instance->SaveData("", Rando::StaticData::GetItemTable()[items[i]].GetName().GetEnglish());
+                    SaveManager::Instance->SaveData("",
+                                                    Rando::StaticData::GetItemTable()[items[i]].GetName().GetEnglish());
                 });
-                
+
                 std::vector<uint8_t> itemNamesChosen = hint->GetItemNamesChosen();
                 SaveManager::Instance->SaveArray("itemNamesChosen", itemNamesChosen.size(), [&](size_t i) {
                     SaveManager::Instance->SaveData("", itemNamesChosen[i]);
                 });
-                
+
                 std::vector<uint8_t> hintTextsChosen = hint->GetHintTextsChosen();
                 SaveManager::Instance->SaveArray("hintTextsChosen", hintTextsChosen.size(), [&](size_t i) {
                     SaveManager::Instance->SaveData("", hintTextsChosen[i]);
@@ -558,25 +349,28 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
                 SaveManager::Instance->SaveArray("areaTextsChosen", areaTextsChosen.size(), [&](size_t i) {
                     SaveManager::Instance->SaveData("", areaTextsChosen[i]);
                 });
-                
+
                 std::vector<RandomizerArea> areas = hint->GetHintedAreas();
                 SaveManager::Instance->SaveArray("areas", areas.size(), [&](size_t i) {
-                    SaveManager::Instance->SaveData("", Rando::StaticData::hintTextTable[Rando::StaticData::areaNames[areas[i]]].GetClear().GetForCurrentLanguage(MF_CLEAN));
+                    SaveManager::Instance->SaveData(
+                        "", Rando::StaticData::hintTextTable[Rando::StaticData::areaNames[areas[i]]]
+                                .GetClear()
+                                .GetForCurrentLanguage(MF_CLEAN));
                 });
-                
+
                 std::vector<TrialKey> trials = hint->GetHintedTrials();
                 SaveManager::Instance->SaveArray("trials", trials.size(), [&](size_t i) {
-                    SaveManager::Instance->SaveData("", randoContext->GetTrial(trials[i])->GetName().GetForCurrentLanguage(MF_CLEAN));
+                    SaveManager::Instance->SaveData(
+                        "", randoContext->GetTrial(trials[i])->GetName().GetForCurrentLanguage(MF_CLEAN));
                 });
 
                 SaveManager::Instance->SaveData("num", hint->GetNum());
-
-
             }
         });
     });
 
-    SaveManager::Instance->SaveData("triforcePiecesCollected", saveContext->ship.quest.data.randomizer.triforcePiecesCollected);
+    SaveManager::Instance->SaveData("triforcePiecesCollected",
+                                    saveContext->ship.quest.data.randomizer.triforcePiecesCollected);
 
     SaveManager::Instance->SaveData("pendingIceTrapCount", saveContext->ship.pendingIceTrapCount);
 
@@ -584,20 +378,26 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
 
     SaveManager::Instance->SaveData("masterQuestDungeonCount", randoContext->GetDungeons()->CountMQ());
 
-    SaveManager::Instance->SaveArray("masterQuestDungeons", randoContext->GetDungeons()->GetDungeonListSize(), [&](size_t i) {
-        if (randoContext->GetDungeon(i)->IsMQ()) {
-            SaveManager::Instance->SaveData("", i);
-        }
-    });
+    SaveManager::Instance->SaveArray("masterQuestDungeons", randoContext->GetDungeons()->GetDungeonListSize(),
+                                     [&](size_t i) {
+                                         if (randoContext->GetDungeon(i)->IsMQ()) {
+                                             SaveManager::Instance->SaveData("", i);
+                                         }
+                                     });
 
     SaveManager::Instance->SaveArray("requiredTrials", randoContext->GetTrials()->GetTrialListSize(), [&](size_t i) {
         if (randoContext->GetTrial(i)->IsRequired()) {
             SaveManager::Instance->SaveData("", i);
         }
     });
+
+    SaveManager::Instance->SaveArray("trickOptions", RT_MAX, [&](size_t i) {
+        SaveManager::Instance->SaveData("", randoContext->GetTrickOption(RandomizerTrick(i)).Get());
+    });
 }
 
-// Init() here is an extension of InitSram, and thus not truly an initializer for SaveManager itself. don't put any class initialization stuff here
+// Init() here is an extension of InitSram, and thus not truly an initializer for SaveManager itself. don't put any
+// class initialization stuff here
 void SaveManager::Init() {
     // Wait on saves that snuck through the Wait in OnExitGame
     ThreadPoolWait();
@@ -675,21 +475,25 @@ void SaveManager::InitMeta(int fileNum) {
     fileMetaInfo[fileNum].gsTokens = gSaveContext.inventory.gsTokens;
     fileMetaInfo[fileNum].isDoubleDefenseAcquired = gSaveContext.isDoubleDefenseAcquired;
     fileMetaInfo[fileNum].gregFound = Flags_GetRandomizerInf(RAND_INF_GREG_FOUND);
+    fileMetaInfo[fileNum].filenameLanguage = gSaveContext.ship.filenameLanguage;
     fileMetaInfo[fileNum].hasWallet = Flags_GetRandomizerInf(RAND_INF_HAS_WALLET) || !IS_RANDO;
     fileMetaInfo[fileNum].defense = gSaveContext.inventory.defenseHearts;
     fileMetaInfo[fileNum].health = gSaveContext.health;
     auto randoContext = Rando::Context::GetInstance();
 
-        for (int i = 0; i < ARRAY_COUNT(fileMetaInfo[fileNum].seedHash); i++) {
+    for (int i = 0; i < ARRAY_COUNT(fileMetaInfo[fileNum].seedHash); i++) {
         fileMetaInfo[fileNum].seedHash[i] = randoContext->hashIconIndexes[i];
     }
 
     fileMetaInfo[fileNum].randoSave = IS_RANDO;
-    // If the file is marked as a Master Quest file or if we're randomized and have at least one master quest dungeon, we need the mq otr.
-    fileMetaInfo[fileNum].requiresMasterQuest = IS_MASTER_QUEST || (IS_RANDO && randoContext->GetDungeons()->CountMQ() > 0);
-    // If the file is not marked as Master Quest, it could still theoretically be a rando save with all 12 MQ dungeons, in which case
-    // we don't actually require a vanilla OTR.
-    fileMetaInfo[fileNum].requiresOriginal = !IS_MASTER_QUEST && (!IS_RANDO || randoContext->GetDungeons()->CountMQ() < 12);
+    // If the file is marked as a Master Quest file or if we're randomized and have at least one master quest dungeon,
+    // we need the mq otr.
+    fileMetaInfo[fileNum].requiresMasterQuest =
+        IS_MASTER_QUEST || (IS_RANDO && randoContext->GetDungeons()->CountMQ() > 0);
+    // If the file is not marked as Master Quest, it could still theoretically be a rando save with all 12 MQ dungeons,
+    // in which case we don't actually require a vanilla OTR.
+    fileMetaInfo[fileNum].requiresOriginal =
+        !IS_MASTER_QUEST && (!IS_RANDO || randoContext->GetDungeons()->CountMQ() < 12);
 
     fileMetaInfo[fileNum].buildVersionMajor = gSaveContext.ship.stats.buildVersionMajor;
     fileMetaInfo[fileNum].buildVersionMinor = gSaveContext.ship.stats.buildVersionMinor;
@@ -717,8 +521,17 @@ void SaveManager::InitFileNormal() {
     gSaveContext.bgsDayCount = 0;
 
     gSaveContext.deaths = 0;
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
-        gSaveContext.playerName[i] = 0x3E;
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = 0x3E;
+        }
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_PAL;
+    } else { // GAME_REGION_NTSC
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = 0xDF;
+        }
+        gSaveContext.ship.filenameLanguage =
+            (gSaveContext.language == LANGUAGE_JPN) ? NAME_LANGUAGE_NTSC_JPN : NAME_LANGUAGE_NTSC_ENG;
     }
     gSaveContext.n64ddFlag = 0;
     gSaveContext.healthCapacity = 0x30;
@@ -856,13 +669,13 @@ void SaveManager::InitFileNormal() {
     // Init with normal quest unless only an MQ rom is provided
     gSaveContext.ship.quest.id = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
 
-    //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
+    // RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
 }
 
 void SaveManager::InitFileDebug() {
     InitFileNormal();
 
-    //don't apply gDebugSaveFileMode on the title screen
+    // don't apply gDebugSaveFileMode on the title screen
     if (gSaveContext.fileNum != 0xFF) {
         if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugSaveFileMode"), 1) == 2) {
             InitFileMaxed();
@@ -876,9 +689,25 @@ void SaveManager::InitFileDebug() {
     gSaveContext.bgsDayCount = 0;
 
     gSaveContext.deaths = 0;
-    static std::array<char, 8> sPlayerName = { 0x15, 0x12, 0x17, 0x14, 0x3E, 0x3E, 0x3E, 0x3E };
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
-        gSaveContext.playerName[i] = sPlayerName[i];
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        const static std::array<char, 8> sPlayerName = { 0x15, 0x12, 0x17, 0x14, 0x3E, 0x3E, 0x3E, 0x3E };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_PAL;
+    } else if (gSaveContext.language == LANGUAGE_JPN) { // Japanese
+        const static std::array<char, 8> sPlayerName = { 0x81, 0x87, 0x61, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_NTSC_JPN;
+    } else { // GAME_REGION_NTSC
+        const static std::array<char, 8> sPlayerName = { 0xB6, 0xB3, 0xB8, 0xB5, 0xDF, 0xDF, 0xDF, 0xDF };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage =
+            (gSaveContext.language == LANGUAGE_JPN) ? NAME_LANGUAGE_NTSC_JPN : NAME_LANGUAGE_NTSC_ENG;
     }
     gSaveContext.n64ddFlag = 0;
     gSaveContext.healthCapacity = 0xE0;
@@ -911,11 +740,13 @@ void SaveManager::InitFileDebug() {
     gSaveContext.savedSceneNum = 0x51;
 
     // Equipment
-    static std::array<u8, 8> sButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW, ITEM_BOMB, ITEM_OCARINA_FAIRY, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE };
+    static std::array<u8, 8> sButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW,  ITEM_BOMB, ITEM_OCARINA_FAIRY,
+                                              ITEM_NONE,         ITEM_NONE, ITEM_NONE, ITEM_NONE };
     for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.buttonItems); button++) {
         gSaveContext.equips.buttonItems[button] = sButtonItems[button];
     }
-    static std::array<u8, 7> sCButtonSlots = { SLOT_BOW, SLOT_BOMB, SLOT_OCARINA, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
+    static std::array<u8, 7> sCButtonSlots = { SLOT_BOW,  SLOT_BOMB, SLOT_OCARINA, SLOT_NONE,
+                                               SLOT_NONE, SLOT_NONE, SLOT_NONE };
     for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); button++) {
         gSaveContext.equips.cButtonSlots[button] = sCButtonSlots[button];
     }
@@ -979,9 +810,25 @@ void SaveManager::InitFileMaxed() {
     gSaveContext.bgsDayCount = 0;
 
     gSaveContext.deaths = 0;
-    static std::array<char, 8> sPlayerName = { 0x15, 0x12, 0x17, 0x14, 0x3E, 0x3E, 0x3E, 0x3E };
-    for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
-        gSaveContext.playerName[i] = sPlayerName[i];
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        const static std::array<char, 8> sPlayerName = { 0x15, 0x12, 0x17, 0x14, 0x3E, 0x3E, 0x3E, 0x3E };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_PAL;
+    } else if (gSaveContext.language == LANGUAGE_JPN) { // Japanese
+        const static std::array<char, 8> sPlayerName = { 0x81, 0x87, 0x61, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_NTSC_JPN;
+    } else { // GAME_REGION_NTSC
+        const static std::array<char, 8> sPlayerName = { 0xB6, 0xB3, 0xB8, 0xB5, 0xDF, 0xDF, 0xDF, 0xDF };
+        for (int i = 0; i < ARRAY_COUNT(gSaveContext.playerName); i++) {
+            gSaveContext.playerName[i] = sPlayerName[i];
+        }
+        gSaveContext.ship.filenameLanguage =
+            (gSaveContext.language == LANGUAGE_JPN) ? NAME_LANGUAGE_NTSC_JPN : NAME_LANGUAGE_NTSC_ENG;
     }
     gSaveContext.n64ddFlag = 0;
     gSaveContext.healthCapacity = 0x140;
@@ -1014,11 +861,13 @@ void SaveManager::InitFileMaxed() {
     gSaveContext.savedSceneNum = 0x51;
 
     // Equipment
-    static std::array<u8, 8> sButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW, ITEM_BOMB, ITEM_OCARINA_TIME, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE };
+    static std::array<u8, 8> sButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW,  ITEM_BOMB, ITEM_OCARINA_TIME,
+                                              ITEM_NONE,         ITEM_NONE, ITEM_NONE, ITEM_NONE };
     for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.buttonItems); button++) {
         gSaveContext.equips.buttonItems[button] = sButtonItems[button];
     }
-    static std::array<u8, 7> sCButtonSlots = { SLOT_BOW, SLOT_BOMB, SLOT_OCARINA, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE };
+    static std::array<u8, 7> sCButtonSlots = { SLOT_BOW,  SLOT_BOMB, SLOT_OCARINA, SLOT_NONE,
+                                               SLOT_NONE, SLOT_NONE, SLOT_NONE };
     for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); button++) {
         gSaveContext.equips.cButtonSlots[button] = sCButtonSlots[button];
     }
@@ -1062,7 +911,7 @@ void SaveManager::InitFileMaxed() {
     gSaveContext.eventChkInf[8] |= 1;
     gSaveContext.eventChkInf[12] |= 0x10;
 
-    //set all the "Entered *" flags for dungeons
+    // set all the "Entered *" flags for dungeons
     for (int i = 0; i < 0xF; i += 1) {
         Flags_SetInfTable(0x1A0 + i);
     }
@@ -1158,9 +1007,9 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
             }
             nlohmann::json& sectionBlock = saveBlock["sections"][saveFuncInfo.name];
             sectionBlock["version"] = sectionHandlerPair.second.version;
-            // If any save file is loaded for medatata, or a spoiler log is loaded (not sure which at this point), there is still data in the "randomizer" section
-            // This clears the randomizer data block if and only if the section being called is "randomizer" and the current save file is not a randomizer save file.
-
+            // If any save file is loaded for medatata, or a spoiler log is loaded (not sure which at this point), there
+            // is still data in the "randomizer" section This clears the randomizer data block if and only if the
+            // section being called is "randomizer" and the current save file is not a randomizer save file.
 
             currentJsonContext = &sectionBlock["data"];
             sectionHandlerPair.second.func(saveContext, sectionID, true);
@@ -1169,7 +1018,8 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
         SaveFuncInfo svi = sectionSaveHandlers.find(sectionID)->second;
         auto& sectionName = svi.name;
         auto sectionVersion = svi.version;
-        // If section has a parentSection, it is a subsection. Load parentSection version and set sectionBlock to parent string
+        // If section has a parentSection, it is a subsection. Load parentSection version and set sectionBlock to parent
+        // string
         if (svi.parentSection != -1 && svi.parentSection < sectionIndex) {
             auto parentSvi = sectionSaveHandlers.find(svi.parentSection)->second;
             sectionName = parentSvi.name;
@@ -1220,8 +1070,8 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
     saveMtx.unlock();
 }
 
-// SaveSection creates a copy of gSaveContext to prevent mid-save data modification, and passes its reference to SaveFileThreaded
-// This should never be called with threaded == false except during file creation
+// SaveSection creates a copy of gSaveContext to prevent mid-save data modification, and passes its reference to
+// SaveFileThreaded This should never be called with threaded == false except during file creation
 void SaveManager::SaveSection(int fileNum, int sectionID, bool threaded) {
     // Don't save in Boss rush.
     if (fileNum == 0xFF || fileNum == 0xFE) {
@@ -1267,7 +1117,7 @@ void SaveManager::LoadFile(int fileNum) {
     InitFile(false);
 
     std::ifstream input(fileName);
-    
+
     try {
         saveBlock = nlohmann::json::object();
         input >> saveBlock;
@@ -1278,8 +1128,57 @@ void SaveManager::LoadFile(int fileNum) {
         switch (saveBlock["version"].get<int>()) {
             case 1:
                 for (auto& block : saveBlock["sections"].items()) {
-                    int sectionVersion = block.value()["version"];
                     std::string sectionName = block.key();
+                    if (sectionName == "randomizer") {
+                        bool hasStats = saveBlock["sections"].contains("sohStats");
+                        if (block.value()["data"].contains("aat0") || !hasStats) { // Rachael rando data
+                            SohGui::RegisterPopup(
+                                "Loading old file",
+                                "The file in slot " + std::to_string(fileNum + 1) +
+                                    " appears to contain randomizer data, but is a very old format.\n" +
+                                    "The randomizer data has been removed, and this file will be treated as a vanilla "
+                                    "file.\n" +
+                                    "If this was a randomizer file, the file will not work, and should be deleted.");
+                            input.close();
+                            saveMtx.unlock();
+                            SaveFile(fileNum);
+                            return;
+                        }
+                        s16 major = saveBlock["sections"]["sohStats"]["data"]["buildVersionMajor"];
+                        s16 minor = saveBlock["sections"]["sohStats"]["data"]["buildVersionMinor"];
+                        s16 patch = saveBlock["sections"]["sohStats"]["data"]["buildVersionPatch"];
+                        // block loading outdated rando save
+                        if (!(major == gBuildVersionMajor && minor == gBuildVersionMinor &&
+                              patch == gBuildVersionPatch)) {
+                            input.close();
+                            std::string newFileName = Ship::Context::GetPathRelativeToAppDirectory("Save") +
+                                                      ("/file" + std::to_string(fileNum + 1) + "-" +
+                                                       std::to_string(GetUnixTimestamp()) + ".bak");
+                            std::filesystem::path newFile(newFileName);
+
+#if defined(__SWITCH__) || defined(__WIIU__)
+                            copy_file(fileName.c_str(), newFile.c_str());
+#else
+                            std::filesystem::copy_file(fileName, newFile);
+#endif
+
+                            std::filesystem::remove(fileName);
+                            SohGui::RegisterPopup(
+                                "Outdated Randomizer Save",
+                                "The SoH version in the file in slot " + std::to_string(fileNum + 1) +
+                                    " does not match the currently running version.\n" +
+                                    "Non-matching rando saves are unsupported, and the file has been renamed to\n" +
+                                    "    " + newFileName + "\n" +
+                                    "If this was not in error, the file should be deleted.");
+                            saveMtx.unlock();
+                            SaveFile(fileNum);
+                            return;
+                        }
+                    }
+                    int sectionVersion = block.value()["version"];
+                    if (sectionName == "randomizer" && sectionVersion != 1) {
+                        sectionVersion = 1;
+                    }
                     if (!sectionLoadHandlers.contains(sectionName)) {
                         // Unloadable sections aren't necessarily errors, they are probably mods that were unloaded
                         // TODO report in a more noticeable manner
@@ -1315,16 +1214,20 @@ void SaveManager::LoadFile(int fileNum) {
         GameInteractor::Instance->ExecuteHooks<GameInteractor::OnLoadFile>(fileNum);
     } catch (const std::exception& e) {
         input.close();
-        std::filesystem::path newFile(Ship::Context::GetPathRelativeToAppDirectory("Save") + ("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak"));
+        std::filesystem::path newFile(
+            Ship::Context::GetPathRelativeToAppDirectory("Save") +
+            ("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak"));
 #if defined(__SWITCH__) || defined(__WIIU__)
         copy_file(fileName.c_str(), newFile.c_str());
 #else
         std::filesystem::copy_file(fileName, newFile);
 #endif
-    
+
         std::filesystem::remove(fileName);
-        SohGui::RegisterPopup("Error loading save file", "A problem occurred loading the save in slot " + std::to_string(fileNum + 1) + ".\nSave file corruption is suspected.\n" +
-            "The file has been renamed to prevent further issues.");
+        SohGui::RegisterPopup("Error loading save file", "A problem occurred loading the save in slot " +
+                                                             std::to_string(fileNum + 1) +
+                                                             ".\nSave file corruption is suspected.\n" +
+                                                             "The file has been renamed to prevent further issues.");
     }
     saveMtx.unlock();
 }
@@ -1338,10 +1241,9 @@ void SaveManager::ThreadPoolWait() {
 bool SaveManager::SaveFile_Exist(int fileNum) {
     try {
         bool exists = std::filesystem::exists(GetFileName(fileNum));
-        SPDLOG_INFO("File[{}] - {}", fileNum, exists ? "exists" : "does not exist" );
+        SPDLOG_INFO("File[{}] - {}", fileNum, exists ? "exists" : "does not exist");
         return exists;
-    }
-    catch(std::filesystem::filesystem_error const& ex) {
+    } catch (std::filesystem::filesystem_error const& ex) {
         SPDLOG_ERROR("Filesystem error");
         return false;
     }
@@ -1357,7 +1259,8 @@ void SaveManager::AddLoadFunction(const std::string& name, int version, LoadFunc
     }
 
     if (sectionLoadHandlers[name].contains(version)) {
-        SPDLOG_ERROR("Adding load function for section and version that already has one: " + name + ", " + std::to_string(version));
+        SPDLOG_ERROR("Adding load function for section and version that already has one: " + name + ", " +
+                     std::to_string(version));
         assert(false);
         return;
     }
@@ -1365,7 +1268,8 @@ void SaveManager::AddLoadFunction(const std::string& name, int version, LoadFunc
     sectionLoadHandlers[name][version] = func;
 }
 
-int SaveManager::AddSaveFunction(const std::string& name, int version, SaveFunc func, bool saveWithBase, int parentSection = -1) {
+int SaveManager::AddSaveFunction(const std::string& name, int version, SaveFunc func, bool saveWithBase,
+                                 int parentSection = -1) {
     if (sectionRegistry.contains(name)) {
         SPDLOG_ERROR("Adding save function for section that already has one: " + name);
         assert(false);
@@ -1420,9 +1324,8 @@ void SaveManager::LoadBaseVersion1() {
     SaveManager::Instance->LoadData("totalDays", gSaveContext.totalDays);
     SaveManager::Instance->LoadData("bgsDayCount", gSaveContext.bgsDayCount);
     SaveManager::Instance->LoadData("deaths", gSaveContext.deaths);
-    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.playerName[i]);
-    });
+    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.playerName[i]); });
     int isRando = 0;
     SaveManager::Instance->LoadData("n64ddFlag", isRando);
     if (isRando) {
@@ -1441,25 +1344,29 @@ void SaveManager::LoadBaseVersion1() {
     SaveManager::Instance->LoadData("bgsFlag", gSaveContext.bgsFlag);
     SaveManager::Instance->LoadData("ocarinaGameRoundNum", gSaveContext.ocarinaGameRoundNum);
     SaveManager::Instance->LoadStruct("childEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.childEquips.equipment);
     });
     SaveManager::Instance->LoadStruct("adultEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.adultEquips.equipment);
     });
     SaveManager::Instance->LoadData("unk_54", gSaveContext.unk_54);
@@ -1483,9 +1390,9 @@ void SaveManager::LoadBaseVersion1() {
         SaveManager::Instance->LoadData("equipment", gSaveContext.inventory.equipment);
         SaveManager::Instance->LoadData("upgrades", gSaveContext.inventory.upgrades);
         SaveManager::Instance->LoadData("questItems", gSaveContext.inventory.questItems);
-        SaveManager::Instance->LoadArray("dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]); });
         SaveManager::Instance->LoadArray("dungeonKeys", ARRAY_COUNT(gSaveContext.inventory.dungeonKeys), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonKeys[i]);
         });
@@ -1517,21 +1424,17 @@ void SaveManager::LoadBaseVersion1() {
         SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.fw.tempSwchFlags);
         SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.fw.tempCollectFlags);
     });
-    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]);
-    });
-    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.highScores[i]);
-    });
+    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]); });
+    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.highScores[i]); });
     SaveManager::Instance->LoadArray("eventChkInf", ARRAY_COUNT(gSaveContext.eventChkInf), [](size_t i) {
         SaveManager::Instance->LoadData("", gSaveContext.eventChkInf[i]);
     });
-    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]);
-    });
-    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.infTable[i]);
-    });
+    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]); });
+    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.infTable[i]); });
     SaveManager::Instance->LoadData("worldMapAreaData", gSaveContext.worldMapAreaData);
     SaveManager::Instance->LoadData("scarecrowCustomSongSet", gSaveContext.scarecrowLongSongSet);
     SaveManager::Instance->LoadArray("scarecrowCustomSong", sizeof(gSaveContext.scarecrowLongSong), [](size_t i) {
@@ -1565,9 +1468,8 @@ void SaveManager::LoadBaseVersion2() {
     SaveManager::Instance->LoadData("totalDays", gSaveContext.totalDays);
     SaveManager::Instance->LoadData("bgsDayCount", gSaveContext.bgsDayCount);
     SaveManager::Instance->LoadData("deaths", gSaveContext.deaths);
-    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.playerName[i]);
-    });
+    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.playerName[i]); });
     int isRando = 0;
     SaveManager::Instance->LoadData("n64ddFlag", isRando);
     if (isRando) {
@@ -1586,25 +1488,29 @@ void SaveManager::LoadBaseVersion2() {
     SaveManager::Instance->LoadData("bgsFlag", gSaveContext.bgsFlag);
     SaveManager::Instance->LoadData("ocarinaGameRoundNum", gSaveContext.ocarinaGameRoundNum);
     SaveManager::Instance->LoadStruct("childEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.childEquips.equipment);
     });
     SaveManager::Instance->LoadStruct("adultEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.adultEquips.equipment);
     });
     SaveManager::Instance->LoadData("unk_54", gSaveContext.unk_54);
@@ -1628,9 +1534,9 @@ void SaveManager::LoadBaseVersion2() {
         SaveManager::Instance->LoadData("equipment", gSaveContext.inventory.equipment);
         SaveManager::Instance->LoadData("upgrades", gSaveContext.inventory.upgrades);
         SaveManager::Instance->LoadData("questItems", gSaveContext.inventory.questItems);
-        SaveManager::Instance->LoadArray("dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]); });
         SaveManager::Instance->LoadArray("dungeonKeys", ARRAY_COUNT(gSaveContext.inventory.dungeonKeys), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonKeys[i]);
         });
@@ -1647,18 +1553,18 @@ void SaveManager::LoadBaseVersion2() {
         SaveManager::Instance->LoadData("fileCreatedAt", gSaveContext.ship.stats.fileCreatedAt);
         SaveManager::Instance->LoadData("playTimer", gSaveContext.ship.stats.playTimer);
         SaveManager::Instance->LoadData("pauseTimer", gSaveContext.ship.stats.pauseTimer);
-        SaveManager::Instance->LoadArray("timestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "timestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]); });
         SaveManager::Instance->LoadArray("counts", ARRAY_COUNT(gSaveContext.ship.stats.count), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.ship.stats.count[i]);
         });
-        SaveManager::Instance->LoadArray("scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]);
-        });
-        SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]); });
+        SaveManager::Instance->LoadArray(
+            "entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]); });
     });
     SaveManager::Instance->LoadArray("sceneFlags", ARRAY_COUNT(gSaveContext.sceneFlags), [](size_t i) {
         SaveManager::Instance->LoadStruct("", [&i]() {
@@ -1685,21 +1591,17 @@ void SaveManager::LoadBaseVersion2() {
         SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.fw.tempSwchFlags);
         SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.fw.tempCollectFlags);
     });
-    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]);
-    });
-    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.highScores[i]);
-    });
+    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]); });
+    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.highScores[i]); });
     SaveManager::Instance->LoadArray("eventChkInf", ARRAY_COUNT(gSaveContext.eventChkInf), [](size_t i) {
         SaveManager::Instance->LoadData("", gSaveContext.eventChkInf[i]);
     });
-    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]);
-    });
-    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.infTable[i]);
-    });
+    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]); });
+    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.infTable[i]); });
     SaveManager::Instance->LoadData("worldMapAreaData", gSaveContext.worldMapAreaData);
     SaveManager::Instance->LoadData("scarecrowCustomSongSet", gSaveContext.scarecrowLongSongSet);
     SaveManager::Instance->LoadArray("scarecrowCustomSong", ARRAY_COUNT(gSaveContext.scarecrowLongSong), [](size_t i) {
@@ -1757,17 +1659,18 @@ void SaveManager::LoadBaseVersion2() {
     if (!gSaveContext.scarecrowLongSongSet) {
         SaveManager::Instance->LoadData("scarecrowLongSongSet", gSaveContext.scarecrowLongSongSet);
         if (gSaveContext.scarecrowLongSongSet) {
-            SaveManager::Instance->LoadArray("scarecrowLongSong", ARRAY_COUNT(gSaveContext.scarecrowLongSong), [](size_t i) {
-                SaveManager::Instance->LoadStruct("", [&i]() {
-                    SaveManager::Instance->LoadData("noteIdx", gSaveContext.scarecrowLongSong[i].noteIdx);
-                    SaveManager::Instance->LoadData("unk_01", gSaveContext.scarecrowLongSong[i].unk_01);
-                    SaveManager::Instance->LoadData("unk_02", gSaveContext.scarecrowLongSong[i].unk_02);
-                    SaveManager::Instance->LoadData("volume", gSaveContext.scarecrowLongSong[i].volume);
-                    SaveManager::Instance->LoadData("vibrato", gSaveContext.scarecrowLongSong[i].vibrato);
-                    SaveManager::Instance->LoadData("tone", gSaveContext.scarecrowLongSong[i].tone);
-                    SaveManager::Instance->LoadData("semitone", gSaveContext.scarecrowLongSong[i].semitone);
+            SaveManager::Instance->LoadArray(
+                "scarecrowLongSong", ARRAY_COUNT(gSaveContext.scarecrowLongSong), [](size_t i) {
+                    SaveManager::Instance->LoadStruct("", [&i]() {
+                        SaveManager::Instance->LoadData("noteIdx", gSaveContext.scarecrowLongSong[i].noteIdx);
+                        SaveManager::Instance->LoadData("unk_01", gSaveContext.scarecrowLongSong[i].unk_01);
+                        SaveManager::Instance->LoadData("unk_02", gSaveContext.scarecrowLongSong[i].unk_02);
+                        SaveManager::Instance->LoadData("volume", gSaveContext.scarecrowLongSong[i].volume);
+                        SaveManager::Instance->LoadData("vibrato", gSaveContext.scarecrowLongSong[i].vibrato);
+                        SaveManager::Instance->LoadData("tone", gSaveContext.scarecrowLongSong[i].tone);
+                        SaveManager::Instance->LoadData("semitone", gSaveContext.scarecrowLongSong[i].semitone);
+                    });
                 });
-            });
         }
     }
 }
@@ -1781,9 +1684,8 @@ void SaveManager::LoadBaseVersion3() {
     SaveManager::Instance->LoadData("totalDays", gSaveContext.totalDays);
     SaveManager::Instance->LoadData("bgsDayCount", gSaveContext.bgsDayCount);
     SaveManager::Instance->LoadData("deaths", gSaveContext.deaths);
-    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.playerName[i]);
-    });
+    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.playerName[i]); });
     int isRando = 0;
     SaveManager::Instance->LoadData("n64ddFlag", isRando);
     if (isRando) {
@@ -1802,25 +1704,29 @@ void SaveManager::LoadBaseVersion3() {
     SaveManager::Instance->LoadData("bgsFlag", gSaveContext.bgsFlag);
     SaveManager::Instance->LoadData("ocarinaGameRoundNum", gSaveContext.ocarinaGameRoundNum);
     SaveManager::Instance->LoadStruct("childEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.childEquips.equipment);
     });
     SaveManager::Instance->LoadStruct("adultEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.adultEquips.equipment);
     });
     SaveManager::Instance->LoadData("unk_54", gSaveContext.unk_54);
@@ -1844,9 +1750,9 @@ void SaveManager::LoadBaseVersion3() {
         SaveManager::Instance->LoadData("equipment", gSaveContext.inventory.equipment);
         SaveManager::Instance->LoadData("upgrades", gSaveContext.inventory.upgrades);
         SaveManager::Instance->LoadData("questItems", gSaveContext.inventory.questItems);
-        SaveManager::Instance->LoadArray("dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]); });
         SaveManager::Instance->LoadArray("dungeonKeys", ARRAY_COUNT(gSaveContext.inventory.dungeonKeys), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonKeys[i]);
         });
@@ -1869,29 +1775,29 @@ void SaveManager::LoadBaseVersion3() {
         SaveManager::Instance->LoadData("fileCreatedAt", gSaveContext.ship.stats.fileCreatedAt);
         SaveManager::Instance->LoadData("playTimer", gSaveContext.ship.stats.playTimer);
         SaveManager::Instance->LoadData("pauseTimer", gSaveContext.ship.stats.pauseTimer);
-        SaveManager::Instance->LoadArray("itemTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]);
-        });
-        SaveManager::Instance->LoadArray("sceneTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.sceneTimestamps), [](size_t i) {
-            SaveManager::Instance->LoadStruct("", [&i]() {
-                SaveManager::Instance->LoadData("scene", gSaveContext.ship.stats.sceneTimestamps[i].scene);
-                SaveManager::Instance->LoadData("room", gSaveContext.ship.stats.sceneTimestamps[i].room);
-                SaveManager::Instance->LoadData("sceneTime", gSaveContext.ship.stats.sceneTimestamps[i].sceneTime);
-                SaveManager::Instance->LoadData("roomTime", gSaveContext.ship.stats.sceneTimestamps[i].roomTime);
-                SaveManager::Instance->LoadData("isRoom", gSaveContext.ship.stats.sceneTimestamps[i].isRoom);
-
+        SaveManager::Instance->LoadArray(
+            "itemTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.itemTimestamp),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.itemTimestamp[i]); });
+        SaveManager::Instance->LoadArray(
+            "sceneTimestamps", ARRAY_COUNT(gSaveContext.ship.stats.sceneTimestamps), [](size_t i) {
+                SaveManager::Instance->LoadStruct("", [&i]() {
+                    SaveManager::Instance->LoadData("scene", gSaveContext.ship.stats.sceneTimestamps[i].scene);
+                    SaveManager::Instance->LoadData("room", gSaveContext.ship.stats.sceneTimestamps[i].room);
+                    SaveManager::Instance->LoadData("sceneTime", gSaveContext.ship.stats.sceneTimestamps[i].sceneTime);
+                    SaveManager::Instance->LoadData("roomTime", gSaveContext.ship.stats.sceneTimestamps[i].roomTime);
+                    SaveManager::Instance->LoadData("isRoom", gSaveContext.ship.stats.sceneTimestamps[i].isRoom);
+                });
             });
-        });
         SaveManager::Instance->LoadData("tsIdx", gSaveContext.ship.stats.tsIdx);
         SaveManager::Instance->LoadArray("counts", ARRAY_COUNT(gSaveContext.ship.stats.count), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.ship.stats.count[i]);
         });
-        SaveManager::Instance->LoadArray("scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]);
-        });
-        SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "scenesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.scenesDiscovered),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.scenesDiscovered[i]); });
+        SaveManager::Instance->LoadArray(
+            "entrancesDiscovered", ARRAY_COUNT(gSaveContext.ship.stats.entrancesDiscovered),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.ship.stats.entrancesDiscovered[i]); });
     });
     SaveManager::Instance->LoadArray("sceneFlags", ARRAY_COUNT(gSaveContext.sceneFlags), [](size_t i) {
         SaveManager::Instance->LoadStruct("", [&i]() {
@@ -1918,21 +1824,17 @@ void SaveManager::LoadBaseVersion3() {
         SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.fw.tempSwchFlags);
         SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.fw.tempCollectFlags);
     });
-    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]);
-    });
-    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.highScores[i]);
-    });
+    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]); });
+    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.highScores[i]); });
     SaveManager::Instance->LoadArray("eventChkInf", ARRAY_COUNT(gSaveContext.eventChkInf), [](size_t i) {
         SaveManager::Instance->LoadData("", gSaveContext.eventChkInf[i]);
     });
-    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]);
-    });
-    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.infTable[i]);
-    });
+    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]); });
+    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.infTable[i]); });
     SaveManager::Instance->LoadData("worldMapAreaData", gSaveContext.worldMapAreaData);
     SaveManager::Instance->LoadData("scarecrowLongSongSet", gSaveContext.scarecrowLongSongSet);
     SaveManager::Instance->LoadArray("scarecrowLongSong", ARRAY_COUNT(gSaveContext.scarecrowLongSong), [](size_t i) {
@@ -2002,9 +1904,8 @@ void SaveManager::LoadBaseVersion4() {
     SaveManager::Instance->LoadData("totalDays", gSaveContext.totalDays);
     SaveManager::Instance->LoadData("bgsDayCount", gSaveContext.bgsDayCount);
     SaveManager::Instance->LoadData("deaths", gSaveContext.deaths);
-    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.playerName[i]);
-    });
+    SaveManager::Instance->LoadArray("playerName", ARRAY_COUNT(gSaveContext.playerName),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.playerName[i]); });
     int isRando = 0;
     SaveManager::Instance->LoadData("n64ddFlag", isRando);
     if (isRando) {
@@ -2023,25 +1924,29 @@ void SaveManager::LoadBaseVersion4() {
     SaveManager::Instance->LoadData("bgsFlag", gSaveContext.bgsFlag);
     SaveManager::Instance->LoadData("ocarinaGameRoundNum", gSaveContext.ocarinaGameRoundNum);
     SaveManager::Instance->LoadStruct("childEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.childEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.childEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.childEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.childEquips.equipment);
     });
     SaveManager::Instance->LoadStruct("adultEquips", []() {
-        SaveManager::Instance->LoadArray("buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
+        SaveManager::Instance->LoadArray(
+            "buttonItems", ARRAY_COUNT(gSaveContext.adultEquips.buttonItems), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.buttonItems[i],
                                                 static_cast<uint8_t>(ITEM_NONE));
-        });
-        SaveManager::Instance->LoadArray("cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
+            });
+        SaveManager::Instance->LoadArray(
+            "cButtonSlots", ARRAY_COUNT(gSaveContext.adultEquips.cButtonSlots), [](size_t i) {
                 SaveManager::Instance->LoadData("", gSaveContext.adultEquips.cButtonSlots[i],
                                                 static_cast<uint8_t>(SLOT_NONE));
-        });
+            });
         SaveManager::Instance->LoadData("equipment", gSaveContext.adultEquips.equipment);
     });
     SaveManager::Instance->LoadData("unk_54", gSaveContext.unk_54);
@@ -2065,9 +1970,9 @@ void SaveManager::LoadBaseVersion4() {
         SaveManager::Instance->LoadData("equipment", gSaveContext.inventory.equipment);
         SaveManager::Instance->LoadData("upgrades", gSaveContext.inventory.upgrades);
         SaveManager::Instance->LoadData("questItems", gSaveContext.inventory.questItems);
-        SaveManager::Instance->LoadArray("dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems), [](size_t i) {
-            SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]);
-        });
+        SaveManager::Instance->LoadArray(
+            "dungeonItems", ARRAY_COUNT(gSaveContext.inventory.dungeonItems),
+            [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonItems[i]); });
         SaveManager::Instance->LoadArray("dungeonKeys", ARRAY_COUNT(gSaveContext.inventory.dungeonKeys), [](size_t i) {
             SaveManager::Instance->LoadData("", gSaveContext.inventory.dungeonKeys[i]);
         });
@@ -2099,21 +2004,17 @@ void SaveManager::LoadBaseVersion4() {
         SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.fw.tempSwchFlags);
         SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.fw.tempCollectFlags);
     });
-    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]);
-    });
-    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.highScores[i]);
-    });
+    SaveManager::Instance->LoadArray("gsFlags", ARRAY_COUNT(gSaveContext.gsFlags),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.gsFlags[i]); });
+    SaveManager::Instance->LoadArray("highScores", ARRAY_COUNT(gSaveContext.highScores),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.highScores[i]); });
     SaveManager::Instance->LoadArray("eventChkInf", ARRAY_COUNT(gSaveContext.eventChkInf), [](size_t i) {
         SaveManager::Instance->LoadData("", gSaveContext.eventChkInf[i]);
     });
-    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]);
-    });
-    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable), [](size_t i) {
-        SaveManager::Instance->LoadData("", gSaveContext.infTable[i]);
-    });
+    SaveManager::Instance->LoadArray("itemGetInf", ARRAY_COUNT(gSaveContext.itemGetInf),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.itemGetInf[i]); });
+    SaveManager::Instance->LoadArray("infTable", ARRAY_COUNT(gSaveContext.infTable),
+                                     [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.infTable[i]); });
     SaveManager::Instance->LoadData("worldMapAreaData", gSaveContext.worldMapAreaData);
     SaveManager::Instance->LoadData("scarecrowLongSongSet", gSaveContext.scarecrowLongSongSet);
     SaveManager::Instance->LoadArray("scarecrowLongSong", ARRAY_COUNT(gSaveContext.scarecrowLongSong), [](size_t i) {
@@ -2172,6 +2073,7 @@ void SaveManager::LoadBaseVersion4() {
         SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.ship.backupFW.tempCollectFlags);
     });
     SaveManager::Instance->LoadData("dogParams", gSaveContext.dogParams);
+    SaveManager::Instance->LoadData("filenameLanguage", gSaveContext.ship.filenameLanguage);
     SaveManager::Instance->LoadData("maskMemory", gSaveContext.ship.maskMemory);
 }
 
@@ -2201,21 +2103,21 @@ void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSav
     SaveManager::Instance->SaveData("bgsFlag", saveContext->bgsFlag);
     SaveManager::Instance->SaveData("ocarinaGameRoundNum", saveContext->ocarinaGameRoundNum);
     SaveManager::Instance->SaveStruct("childEquips", [&]() {
-        SaveManager::Instance->SaveArray("buttonItems", ARRAY_COUNT(saveContext->childEquips.buttonItems), [&](size_t i) {
-            SaveManager::Instance->SaveData("", saveContext->childEquips.buttonItems[i]);
-        });
-        SaveManager::Instance->SaveArray("cButtonSlots", ARRAY_COUNT(saveContext->childEquips.cButtonSlots), [&](size_t i) {
-            SaveManager::Instance->SaveData("", saveContext->childEquips.cButtonSlots[i]);
-        });
+        SaveManager::Instance->SaveArray(
+            "buttonItems", ARRAY_COUNT(saveContext->childEquips.buttonItems),
+            [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->childEquips.buttonItems[i]); });
+        SaveManager::Instance->SaveArray(
+            "cButtonSlots", ARRAY_COUNT(saveContext->childEquips.cButtonSlots),
+            [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->childEquips.cButtonSlots[i]); });
         SaveManager::Instance->SaveData("equipment", saveContext->childEquips.equipment);
     });
     SaveManager::Instance->SaveStruct("adultEquips", [&]() {
-        SaveManager::Instance->SaveArray("buttonItems", ARRAY_COUNT(saveContext->adultEquips.buttonItems), [&](size_t i) {
-            SaveManager::Instance->SaveData("", saveContext->adultEquips.buttonItems[i]);
-        });
-        SaveManager::Instance->SaveArray("cButtonSlots", ARRAY_COUNT(saveContext->adultEquips.cButtonSlots), [&](size_t i) {
-            SaveManager::Instance->SaveData("", saveContext->adultEquips.cButtonSlots[i]);
-        });
+        SaveManager::Instance->SaveArray(
+            "buttonItems", ARRAY_COUNT(saveContext->adultEquips.buttonItems),
+            [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->adultEquips.buttonItems[i]); });
+        SaveManager::Instance->SaveArray(
+            "cButtonSlots", ARRAY_COUNT(saveContext->adultEquips.cButtonSlots),
+            [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->adultEquips.cButtonSlots[i]); });
         SaveManager::Instance->SaveData("equipment", saveContext->adultEquips.equipment);
     });
     SaveManager::Instance->SaveData("unk_54", saveContext->unk_54);
@@ -2239,9 +2141,9 @@ void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSav
         SaveManager::Instance->SaveData("equipment", saveContext->inventory.equipment);
         SaveManager::Instance->SaveData("upgrades", saveContext->inventory.upgrades);
         SaveManager::Instance->SaveData("questItems", saveContext->inventory.questItems);
-        SaveManager::Instance->SaveArray("dungeonItems", ARRAY_COUNT(saveContext->inventory.dungeonItems), [&](size_t i) {
-            SaveManager::Instance->SaveData("", saveContext->inventory.dungeonItems[i]);
-        });
+        SaveManager::Instance->SaveArray(
+            "dungeonItems", ARRAY_COUNT(saveContext->inventory.dungeonItems),
+            [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->inventory.dungeonItems[i]); });
         SaveManager::Instance->SaveArray("dungeonKeys", ARRAY_COUNT(saveContext->inventory.dungeonKeys), [&](size_t i) {
             SaveManager::Instance->SaveData("", saveContext->inventory.dungeonKeys[i]);
         });
@@ -2273,9 +2175,8 @@ void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSav
         SaveManager::Instance->SaveData("tempSwchFlags", saveContext->fw.tempSwchFlags);
         SaveManager::Instance->SaveData("tempCollectFlags", saveContext->fw.tempCollectFlags);
     });
-    SaveManager::Instance->SaveArray("gsFlags", ARRAY_COUNT(saveContext->gsFlags), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->gsFlags[i]);
-    });
+    SaveManager::Instance->SaveArray("gsFlags", ARRAY_COUNT(saveContext->gsFlags),
+                                     [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->gsFlags[i]); });
     SaveManager::Instance->SaveArray("highScores", ARRAY_COUNT(saveContext->highScores), [&](size_t i) {
         SaveManager::Instance->SaveData("", saveContext->highScores[i]);
     });
@@ -2285,9 +2186,8 @@ void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSav
     SaveManager::Instance->SaveArray("itemGetInf", ARRAY_COUNT(saveContext->itemGetInf), [&](size_t i) {
         SaveManager::Instance->SaveData("", saveContext->itemGetInf[i]);
     });
-    SaveManager::Instance->SaveArray("infTable", ARRAY_COUNT(saveContext->infTable), [&](size_t i) {
-        SaveManager::Instance->SaveData("", saveContext->infTable[i]);
-    });
+    SaveManager::Instance->SaveArray("infTable", ARRAY_COUNT(saveContext->infTable),
+                                     [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->infTable[i]); });
     SaveManager::Instance->SaveData("worldMapAreaData", saveContext->worldMapAreaData);
     SaveManager::Instance->SaveData("scarecrowLongSongSet", saveContext->scarecrowLongSongSet);
     SaveManager::Instance->SaveArray("scarecrowLongSong", ARRAY_COUNT(saveContext->scarecrowLongSong), [&](size_t i) {
@@ -2342,6 +2242,7 @@ void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSav
         SaveManager::Instance->SaveData("tempCollectFlags", saveContext->ship.backupFW.tempCollectFlags);
     });
     SaveManager::Instance->SaveData("dogParams", saveContext->dogParams);
+    SaveManager::Instance->SaveData("filenameLanguage", saveContext->ship.filenameLanguage);
     SaveManager::Instance->SaveData("maskMemory", saveContext->ship.maskMemory);
 }
 
@@ -2391,15 +2292,14 @@ void SaveManager::LoadArray(const std::string& name, const size_t size, LoadArra
     for (; (currentJsonArrayContext != currentJsonContext->end()) && (i < size); i++, currentJsonArrayContext++) {
         func(i);
     }
-    // Handle remainer of items. Either this was data that was manually deleted, or a later version extended the size of the array.
-    // The later members will be default constructed.
+    // Handle remainer of items. Either this was data that was manually deleted, or a later version extended the size of
+    // the array. The later members will be default constructed.
     for (; i < size; i++) {
         func(i);
     }
     currentJsonContext = saveJsonContext;
 }
 
-
 void SaveManager::LoadStruct(const std::string& name, LoadStructFunc func) {
     // Create an empty struct and set it as the current load context, then call the function that loads the struct.
     // If it is an array entry, load it from the array instead.
@@ -2449,6 +2349,7 @@ void SaveManager::CopyZeldaFile(int from, int to) {
     fileMetaInfo[to].buildVersionMajor = fileMetaInfo[from].buildVersionMajor;
     fileMetaInfo[to].buildVersionMinor = fileMetaInfo[from].buildVersionMinor;
     fileMetaInfo[to].buildVersionPatch = fileMetaInfo[from].buildVersionPatch;
+    fileMetaInfo[to].filenameLanguage = fileMetaInfo[from].filenameLanguage;
     SohUtils::CopyStringToCharArray(fileMetaInfo[to].buildVersion, fileMetaInfo[from].buildVersion,
                                     ARRAY_COUNT(fileMetaInfo[to].buildVersion));
 }
@@ -2609,28 +2510,28 @@ typedef struct {
     /* 0x13C8 */ s16 nayrusLoveTimer;
     /* 0x13CA */ char unk_13CA[0x0002];
     /* 0x13CC */ s16 rupeeAccumulator;
-    /* 0x13CE */ s16 timer1State;
-    /* 0x13D0 */ s16 timer1Value;
-    /* 0x13D2 */ s16 timer2State;
-    /* 0x13D4 */ s16 timer2Value;
+    /* 0x13CE */ s16 timerState;
+    /* 0x13D0 */ s16 timerSeconds;
+    /* 0x13D2 */ s16 subTimerState;
+    /* 0x13D4 */ s16 subTimerSeconds;
     /* 0x13D6 */ s16 timerX[2];
     /* 0x13DA */ s16 timerY[2];
     /* 0x13DE */ char unk_13DE[0x0002];
     /* 0x13E0 */ u8 seqId;
     /* 0x13E1 */ u8 natureAmbienceId;
     /* 0x13E2 */ u8 buttonStatus[5];
-    /* 0x13E7 */ u8 unk_13E7;     // alpha related
-    /* 0x13E8 */ u16 unk_13E8;    // alpha type?
-    /* 0x13EA */ u16 unk_13EA;    // also alpha type?
-    /* 0x13EC */ u16 unk_13EC;    // alpha type counter?
-    /* 0x13EE */ u16 unk_13EE;    // previous alpha type?
-    /* 0x13F0 */ s16 unk_13F0;    // magic related
-    /* 0x13F2 */ s16 unk_13F2;    // magic related
-    /* 0x13F4 */ s16 unk_13F4;    // magic related
-    /* 0x13F6 */ s16 unk_13F6;    // magic related
-    /* 0x13F8 */ s16 unk_13F8;    // magic related
-    /* 0x13FA */ u16 eventInf[4]; // "event_inf"
-    /* 0x1402 */ u16 mapIndex;    // intended for maps/minimaps but commonly used as the dungeon index
+    /* 0x13E7 */ u8 forceRisingButtonAlphas; // alpha related
+    /* 0x13E8 */ u16 unk_13E8;               // alpha type?
+    /* 0x13EA */ u16 unk_13EA;               // also alpha type?
+    /* 0x13EC */ u16 unk_13EC;               // alpha type counter?
+    /* 0x13EE */ u16 unk_13EE;               // previous alpha type?
+    /* 0x13F0 */ s16 unk_13F0;               // magic related
+    /* 0x13F2 */ s16 unk_13F2;               // magic related
+    /* 0x13F4 */ s16 unk_13F4;               // magic related
+    /* 0x13F6 */ s16 unk_13F6;               // magic related
+    /* 0x13F8 */ s16 unk_13F8;               // magic related
+    /* 0x13FA */ u16 eventInf[4];            // "event_inf"
+    /* 0x1402 */ u16 mapIndex;               // intended for maps/minimaps but commonly used as the dungeon index
     /* 0x1404 */ u16 minigameState;
     /* 0x1406 */ u16 minigameScore; // "yabusame_total"
     /* 0x1408 */ char unk_1408[0x0001];
@@ -2841,6 +2742,7 @@ extern "C" void Save_LoadFile(void) {
     OTRGlobals::Instance->gRandoContext = Rando::Context::CreateInstance();
     OTRGlobals::Instance->gRandoContext->GetLogic()->SetSaveContext(&gSaveContext);
     Rando::Settings::GetInstance()->AssignContext(OTRGlobals::Instance->gRandoContext);
+    OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
     SaveManager::Instance->LoadFile(gSaveContext.fileNum);
 }
 
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 1eb6ee87ab..6d7ef3b33a 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -7,7 +7,7 @@
 typedef struct {
     u8 valid;
     u16 deaths;
-    char playerName[8];
+    u8 playerName[8];
     u16 healthCapacity;
     u32 questItems;
     s8 defense;
@@ -29,10 +29,17 @@ typedef struct {
     s16 rupees;
     s16 gsTokens;
     u8 isDoubleDefenseAcquired;
+    s32 filenameLanguage;
     s32 gregFound;
     s32 hasWallet;
 } SaveFileMetaInfo;
 
+typedef enum {
+    /* 0 */ NAME_LANGUAGE_PAL,
+    /* 1 */ NAME_LANGUAGE_NTSC_JPN,
+    /* 2 */ NAME_LANGUAGE_NTSC_ENG,
+} FilenameLanguage;
+
 #ifdef __cplusplus
 
 #include <map>
@@ -159,11 +166,7 @@ class SaveManager {
     static void InitFileDebug();
     static void InitFileMaxed();
 
-    static void LoadRandomizerVersion1();
-    static void LoadRandomizerVersion2();
-    static void LoadRandomizerVersion3();
-    static void LoadTrackerData();
-    static void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave);
+    static void LoadRandomizer();
     static void SaveRandomizer(SaveContext* saveContext, int sectionID, bool fullSave);
 
     static void LoadBaseVersion1();
diff --git a/soh/soh/ShipInit.hpp b/soh/soh/ShipInit.hpp
index b5351cdc01..e96e77f914 100644
--- a/soh/soh/ShipInit.hpp
+++ b/soh/soh/ShipInit.hpp
@@ -3,6 +3,7 @@
 
 #ifdef __cplusplus
 
+#include <string>
 #include <vector>
 #include <set>
 #include <unordered_map>
@@ -28,34 +29,34 @@ struct ShipInit {
 
 /**
  * @brief Register a function to execute on boot and (optionally) in other situations
- * 
+ *
  * @param initFunc The function to execute
  * @param updatePaths Strings to specify additional situations in which to execute the function
- * 
+ *
  * ### Examples:
- * 
+ *
  * #### Execute function `bar` on boot
- * 
+ *
  * ```cpp
  * static RegisterShipInitFunc foo(bar);
  * ```
- * 
+ *
  * #### Execute function `bar` on boot and when the CVar `baz` might have changed
- * 
+ *
  * ```cpp
  * static RegisterShipInitFunc foo(bar, { "baz" });
  * ```
- * 
+ *
  * #### Execute function `bar` on boot and when `IS_RANDO` might have changed
- * 
+ *
  * ```cpp
  * static RegisterShipInitFunc foo(bar, { "IS_RANDO" });
  * ```
- * 
+ *
  * ### Additional Information:
- * 
- * To get a better sense of when your function will be executed 
- * you can look for `ShipInit::Init` calls throughout the codebase 
+ *
+ * To get a better sense of when your function will be executed
+ * you can look for `ShipInit::Init` calls throughout the codebase
  */
 struct RegisterShipInitFunc {
     RegisterShipInitFunc(std::function<void()> initFunc, const std::set<std::string>& updatePaths = {}) {
diff --git a/soh/soh/ShipUtils.cpp b/soh/soh/ShipUtils.cpp
new file mode 100644
index 0000000000..1e914d03cf
--- /dev/null
+++ b/soh/soh/ShipUtils.cpp
@@ -0,0 +1,98 @@
+#include "ShipUtils.h"
+#include <libultraship/libultraship.h>
+#include "soh_assets.h"
+
+extern "C" {
+#include "z64.h"
+#include "functions.h"
+#include "macros.h"
+
+extern float OTRGetAspectRatio();
+
+extern f32 sFontWidths[144];
+extern const char* fontTbl[140];
+}
+
+constexpr f32 fourByThree = 4.0f / 3.0f;
+
+// Gets the additional ratio of the screen compared to the original 4:3 ratio, clamping to 1 if smaller
+extern "C" f32 Ship_GetExtendedAspectRatioMultiplier() {
+    f32 currentRatio = OTRGetAspectRatio();
+    return MAX(currentRatio / fourByThree, 1.0f);
+}
+
+// Enables Extended Culling options on specific actors by applying an inverse ratio of the draw distance slider
+// to the projected Z value of the actor. This tricks distance checks without having to replace hardcoded values.
+// Requires that Ship_ExtendedCullingActorRestoreProjectedPos is called within the same function scope.
+extern "C" void Ship_ExtendedCullingActorAdjustProjectedZ(Actor* actor) {
+    s32 multiplier = CVarGetInteger("gEnhancements.Graphics.IncreaseActorDrawDistance", 1);
+    multiplier = MAX(multiplier, 1);
+    if (multiplier > 1) {
+        actor->projectedPos.z /= multiplier;
+    }
+}
+
+// Enables Extended Culling options on specific actors by applying an inverse ratio of the widescreen aspect ratio
+// to the projected X value of the actor. This tricks distance checks without having to replace hardcoded values.
+// Requires that Ship_ExtendedCullingActorRestoreProjectedPos is called within the same function scope.
+extern "C" void Ship_ExtendedCullingActorAdjustProjectedX(Actor* actor) {
+    if (CVarGetInteger("gEnhancements.Graphics.ActorCullingAccountsForWidescreen", 0)) {
+        f32 ratioAdjusted = Ship_GetExtendedAspectRatioMultiplier();
+        actor->projectedPos.x /= ratioAdjusted;
+    }
+}
+
+// Restores the projectedPos values on the actor after modifications from the Extended Culling hacks
+// extern "C" void Ship_ExtendedCullingActorRestoreProjectedPos(PlayState* play, Actor* actor) {
+//    f32 invW = 0.0f;
+//    Actor_GetProjectedPos(play, &actor->world.pos, &actor->projectedPos, &invW);
+//}
+
+extern "C" bool Ship_IsCStringEmpty(const char* str) {
+    return str == NULL || str[0] == '\0';
+}
+
+// Build vertex coordinates for a quad command
+// In order of top left, top right, bottom left, then bottom right
+// Supports flipping the texture horizontally
+extern "C" void Ship_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH) {
+    vtxList[0].v.ob[0] = xStart;
+    vtxList[0].v.ob[1] = yStart;
+    vtxList[0].v.tc[0] = (flippedH ? width : 0) << 5;
+    vtxList[0].v.tc[1] = 0 << 5;
+
+    vtxList[1].v.ob[0] = xStart + width;
+    vtxList[1].v.ob[1] = yStart;
+    vtxList[1].v.tc[0] = (flippedH ? width * 2 : width) << 5;
+    vtxList[1].v.tc[1] = 0 << 5;
+
+    vtxList[2].v.ob[0] = xStart;
+    vtxList[2].v.ob[1] = yStart + height;
+    vtxList[2].v.tc[0] = (flippedH ? width : 0) << 5;
+    vtxList[2].v.tc[1] = height << 5;
+
+    vtxList[3].v.ob[0] = xStart + width;
+    vtxList[3].v.ob[1] = yStart + height;
+    vtxList[3].v.tc[0] = (flippedH ? width * 2 : width) << 5;
+    vtxList[3].v.tc[1] = height << 5;
+}
+
+extern "C" f32 Ship_GetCharFontWidth(u8 character) {
+    u8 adjustedChar = character - ' ';
+
+    if (adjustedChar >= ARRAY_COUNTU(sFontWidths)) {
+        return 0.0f;
+    }
+
+    return sFontWidths[adjustedChar];
+}
+
+extern "C" void* Ship_GetCharFontTexture(u8 character) {
+    u8 adjustedChar = character - ' ';
+
+    if (adjustedChar >= ARRAY_COUNTU(fontTbl)) {
+        return (void*)gEmptyTexture;
+    }
+
+    return (void*)fontTbl[adjustedChar];
+}
diff --git a/soh/soh/ShipUtils.h b/soh/soh/ShipUtils.h
new file mode 100644
index 0000000000..85fc89cc53
--- /dev/null
+++ b/soh/soh/ShipUtils.h
@@ -0,0 +1,31 @@
+#ifndef SHIP_UTILS_H
+#define SHIP_UTILS_H
+
+#include <libultraship/libultraship.h>
+//#include "PR/ultratypes.h"
+
+#ifdef __cplusplus
+
+void LoadGuiTextures();
+
+extern "C" {
+#endif
+
+struct PlayState;
+struct Actor;
+
+f32 Ship_GetExtendedAspectRatioMultiplier();
+void Ship_ExtendedCullingActorAdjustProjectedZ(Actor* actor);
+void Ship_ExtendedCullingActorAdjustProjectedX(Actor* actor);
+void Ship_ExtendedCullingActorRestoreProjectedPos(PlayState* play, Actor* actor);
+
+bool Ship_IsCStringEmpty(const char* str);
+void Ship_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH);
+f32 Ship_GetCharFontWidth(u8 character);
+void* Ship_GetCharFontTexture(u8 character);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // SHIP_UTILS_H
diff --git a/soh/soh/SohGui/ImGuiUtils.cpp b/soh/soh/SohGui/ImGuiUtils.cpp
index ebedf6b59a..ab3d8f59c5 100644
--- a/soh/soh/SohGui/ImGuiUtils.cpp
+++ b/soh/soh/SohGui/ImGuiUtils.cpp
@@ -1,5 +1,6 @@
 #include "ImGuiUtils.h"
 #include <Context.h>
+#include <Window.h>
 #include "assets/soh_assets.h"
 #include "soh/Enhancements/randomizer/rando_hash.h"
 
@@ -125,27 +126,29 @@ std::map<uint32_t, ItemMapEntry> itemMapping = {
     ITEM_MAP_ENTRY(ITEM_DUNGEON_MAP),
     ITEM_MAP_ENTRY(ITEM_KEY_SMALL),
     ITEM_MAP_ENTRY(ITEM_MAGIC_SMALL),
-    ITEM_MAP_ENTRY(ITEM_MAGIC_LARGE)
+    ITEM_MAP_ENTRY(ITEM_MAGIC_LARGE),
 };
 
 std::map<uint32_t, ItemMapEntry> gregMapping = {
-    {ITEM_RUPEE_GREEN, {ITEM_RUPEE_GREEN, "ITEM_RUPEE_GREEN", "ITEM_RUPEE_GREEN_Faded", gRupeeCounterIconTex}}
+    { ITEM_RUPEE_GREEN, { ITEM_RUPEE_GREEN, "ITEM_RUPEE_GREEN", "ITEM_RUPEE_GREEN_Faded", gRupeeCounterIconTex } }
 };
 
 std::map<uint32_t, ItemMapEntry> triforcePieceMapping = {
-    {RG_TRIFORCE_PIECE, {RG_TRIFORCE_PIECE, "RG_TRIFORCE_PIECE", "RG_TRIFORCE_PIECE_Faded", gTriforcePieceTex}}
+    { RG_TRIFORCE_PIECE, { RG_TRIFORCE_PIECE, "RG_TRIFORCE_PIECE", "RG_TRIFORCE_PIECE_Faded", gTriforcePieceTex } }
 };
 
 std::map<uint32_t, ItemMapEntry> bossSoulMapping = {
-    { RG_GOHMA_SOUL,        { RG_GOHMA_SOUL,        "RG_GOHMA_SOUL",        "RG_GOHMA_SOUL_Faded",          gBossSoulTex } },
-    { RG_KING_DODONGO_SOUL, { RG_KING_DODONGO_SOUL, "RG_KING_DODONGO_SOUL", "RG_KING_DODONGO_SOUL_Faded",   gBossSoulTex } },
-    { RG_BARINADE_SOUL,     { RG_BARINADE_SOUL,     "RG_BARINADE_SOUL",     "RG_BARINADE_SOUL_Faded",       gBossSoulTex } },
-    { RG_PHANTOM_GANON_SOUL,{ RG_PHANTOM_GANON_SOUL,"RG_PHANTOM_GANON_SOUL","RG_PHANTOM_GANON_SOUL_Faded",  gBossSoulTex } },
-    { RG_VOLVAGIA_SOUL,     { RG_VOLVAGIA_SOUL,     "RG_VOLVAGIA_SOUL",     "RG_VOLVAGIA_SOUL_Faded",       gBossSoulTex } },
-    { RG_MORPHA_SOUL,       { RG_MORPHA_SOUL,       "RG_MORPHA_SOUL",       "RG_MORPHA_SOUL_Faded",         gBossSoulTex } },
-    { RG_BONGO_BONGO_SOUL,  { RG_BONGO_BONGO_SOUL,  "RG_BONGO_BONGO_SOUL",  "RG_BONGO_BONGO_SOUL_Faded",    gBossSoulTex } },
-    { RG_TWINROVA_SOUL,     { RG_TWINROVA_SOUL,     "RG_TWINROVA_SOUL",     "RG_TWINROVA_SOUL_Faded",       gBossSoulTex } },
-    { RG_GANON_SOUL,        { RG_GANON_SOUL,        "RG_GANON_SOUL",        "RG_GANON_SOUL_Faded",          gBossSoulTex } },
+    { RG_GOHMA_SOUL, { RG_GOHMA_SOUL, "RG_GOHMA_SOUL", "RG_GOHMA_SOUL_Faded", gBossSoulTex } },
+    { RG_KING_DODONGO_SOUL,
+      { RG_KING_DODONGO_SOUL, "RG_KING_DODONGO_SOUL", "RG_KING_DODONGO_SOUL_Faded", gBossSoulTex } },
+    { RG_BARINADE_SOUL, { RG_BARINADE_SOUL, "RG_BARINADE_SOUL", "RG_BARINADE_SOUL_Faded", gBossSoulTex } },
+    { RG_PHANTOM_GANON_SOUL,
+      { RG_PHANTOM_GANON_SOUL, "RG_PHANTOM_GANON_SOUL", "RG_PHANTOM_GANON_SOUL_Faded", gBossSoulTex } },
+    { RG_VOLVAGIA_SOUL, { RG_VOLVAGIA_SOUL, "RG_VOLVAGIA_SOUL", "RG_VOLVAGIA_SOUL_Faded", gBossSoulTex } },
+    { RG_MORPHA_SOUL, { RG_MORPHA_SOUL, "RG_MORPHA_SOUL", "RG_MORPHA_SOUL_Faded", gBossSoulTex } },
+    { RG_BONGO_BONGO_SOUL, { RG_BONGO_BONGO_SOUL, "RG_BONGO_BONGO_SOUL", "RG_BONGO_BONGO_SOUL_Faded", gBossSoulTex } },
+    { RG_TWINROVA_SOUL, { RG_TWINROVA_SOUL, "RG_TWINROVA_SOUL", "RG_TWINROVA_SOUL_Faded", gBossSoulTex } },
+    { RG_GANON_SOUL, { RG_GANON_SOUL, "RG_GANON_SOUL", "RG_GANON_SOUL_Faded", gBossSoulTex } },
 };
 
 std::map<uint32_t, QuestMapEntry> questMapping = {
@@ -164,33 +167,27 @@ std::map<uint32_t, QuestMapEntry> questMapping = {
 };
 
 std::map<QuestItem, SongMapEntry> songMapping = {
-    SONG_MAP_ENTRY(QUEST_SONG_LULLABY,  224, 107, 255),
-    SONG_MAP_ENTRY(QUEST_SONG_EPONA,    255, 195, 60),
-    SONG_MAP_ENTRY(QUEST_SONG_SARIA,    127, 255, 137),
-    SONG_MAP_ENTRY(QUEST_SONG_SUN,      255, 255, 60),
-    SONG_MAP_ENTRY(QUEST_SONG_TIME,     119, 236, 255),
-    SONG_MAP_ENTRY(QUEST_SONG_STORMS,   165, 165, 165),
-    SONG_MAP_ENTRY(QUEST_SONG_MINUET,   150, 255, 100),
-    SONG_MAP_ENTRY(QUEST_SONG_BOLERO,   255, 80,  40),
-    SONG_MAP_ENTRY(QUEST_SONG_SERENADE, 100, 150, 255),
-    SONG_MAP_ENTRY(QUEST_SONG_REQUIEM,  255, 160, 0),
-    SONG_MAP_ENTRY(QUEST_SONG_NOCTURNE, 255, 100, 255),
-    SONG_MAP_ENTRY(QUEST_SONG_PRELUDE,  255, 240, 100),
+    SONG_MAP_ENTRY(QUEST_SONG_LULLABY, 224, 107, 255),  SONG_MAP_ENTRY(QUEST_SONG_EPONA, 255, 195, 60),
+    SONG_MAP_ENTRY(QUEST_SONG_SARIA, 127, 255, 137),    SONG_MAP_ENTRY(QUEST_SONG_SUN, 255, 255, 60),
+    SONG_MAP_ENTRY(QUEST_SONG_TIME, 119, 236, 255),     SONG_MAP_ENTRY(QUEST_SONG_STORMS, 165, 165, 165),
+    SONG_MAP_ENTRY(QUEST_SONG_MINUET, 150, 255, 100),   SONG_MAP_ENTRY(QUEST_SONG_BOLERO, 255, 80, 40),
+    SONG_MAP_ENTRY(QUEST_SONG_SERENADE, 100, 150, 255), SONG_MAP_ENTRY(QUEST_SONG_REQUIEM, 255, 160, 0),
+    SONG_MAP_ENTRY(QUEST_SONG_NOCTURNE, 255, 100, 255), SONG_MAP_ENTRY(QUEST_SONG_PRELUDE, 255, 240, 100),
 };
 
 std::array<SongMapEntry, 12> vanillaSongMapping = { {
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_LULLABY,  255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_EPONA,    255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_SARIA,    255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_SUN,      255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_TIME,     255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_STORMS,   255, 255, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_MINUET,   150, 255, 100),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_BOLERO,   255, 80,  40),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_LULLABY, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_EPONA, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_SARIA, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_SUN, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_TIME, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_STORMS, 255, 255, 255),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_MINUET, 150, 255, 100),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_BOLERO, 255, 80, 40),
     VANILLA_SONG_MAP_ENTRY(QUEST_SONG_SERENADE, 100, 150, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_REQUIEM,  255, 160, 0),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_REQUIEM, 255, 160, 0),
     VANILLA_SONG_MAP_ENTRY(QUEST_SONG_NOCTURNE, 255, 100, 255),
-    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_PRELUDE,  255, 240, 100),
+    VANILLA_SONG_MAP_ENTRY(QUEST_SONG_PRELUDE, 255, 240, 100),
 } };
 
 const char* GetTextureForItemId(uint32_t itemId) {
@@ -203,31 +200,41 @@ const char* GetTextureForItemId(uint32_t itemId) {
 
 void RegisterImGuiItemIcons() {
     for (const auto& entry : itemMapping) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath, ImVec4(1, 1, 1, 1));
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath,
+                                                                            ImVec4(1, 1, 1, 1));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(
+            entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
     }
 
     for (const auto& entry : gregMapping) {
         ImVec4 gregGreen = ImVec4(42.0f / 255.0f, 169.0f / 255.0f, 40.0f / 255.0f, 1.0f);
         ImVec4 gregFadedGreen = gregGreen;
         gregFadedGreen.w = 0.3f;
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath, gregGreen);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, gregFadedGreen);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath,
+                                                                            gregGreen);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded,
+                                                                            entry.second.texturePath, gregFadedGreen);
     }
 
     for (const auto& entry : triforcePieceMapping) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath, ImVec4(1, 1, 1, 1));
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath,
+                                                                            ImVec4(1, 1, 1, 1));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(
+            entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
     }
 
     for (const auto& entry : bossSoulMapping) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath, ImVec4(1, 1, 1, 1));
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath,
+                                                                            ImVec4(1, 1, 1, 1));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(
+            entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
     }
 
     for (const auto& entry : questMapping) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath, ImVec4(1, 1, 1, 1));
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(entry.second.name, entry.second.texturePath,
+                                                                            ImVec4(1, 1, 1, 1));
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(
+            entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
     }
 
     for (const auto& [quest, entry] : songMapping) {
diff --git a/soh/soh/SohGui/ImGuiUtils.h b/soh/soh/SohGui/ImGuiUtils.h
index fde8ec6a42..2206b4e481 100644
--- a/soh/soh/SohGui/ImGuiUtils.h
+++ b/soh/soh/SohGui/ImGuiUtils.h
@@ -26,11 +26,11 @@ typedef struct {
     std::string texturePath;
 } ItemMapEntry;
 
-#define ITEM_MAP_ENTRY(id) \
-    {                      \
-        id, {              \
+#define ITEM_MAP_ENTRY(id)                                            \
+    {                                                                 \
+        id, {                                                         \
             id, #id, #id "_Faded", static_cast<char*>(gItemIcons[id]) \
-        }                  \
+        }                                                             \
     }
 
 // Maps items ids to info for use in ImGui
@@ -62,20 +62,20 @@ typedef struct {
     ImVec4 color;
 } SongMapEntry;
 
-#define SONG_MAP_ENTRY(id, r, g, b) \
-    {                               \
-            id, { id, #id, #id "_Faded", ImVec4(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f) } \
+#define SONG_MAP_ENTRY(id, r, g, b)                                                 \
+    {                                                                               \
+        id, {                                                                       \
+            id, #id, #id "_Faded", ImVec4(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f) \
+        }                                                                           \
     }
 
 // Maps song ids to info for use in ImGui
 extern std::map<QuestItem, SongMapEntry> songMapping;
 
 #define VANILLA_SONG_MAP_ENTRY(id, r, g, b) \
-    {                                       \
-            id, #id "_Vanilla", #id "_Vanilla_Faded", ImVec4(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f) \
-    }
+    { id, #id "_Vanilla", #id "_Vanilla_Faded", ImVec4(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f) }
 
 // Maps song ids to info for use in ImGui
 extern std::array<SongMapEntry, 12> vanillaSongMapping;
 
-#endif //IM_GUI_UTILS_H
\ No newline at end of file
+#endif // IM_GUI_UTILS_H
\ No newline at end of file
diff --git a/soh/soh/SohGui/Menu.cpp b/soh/soh/SohGui/Menu.cpp
new file mode 100644
index 0000000000..5a609a935e
--- /dev/null
+++ b/soh/soh/SohGui/Menu.cpp
@@ -0,0 +1,858 @@
+#include "Menu.h"
+#include "UIWidgets.hpp"
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/controls/SohInputEditorWindow.h"
+#include "window/gui/GuiMenuBar.h"
+#include "window/gui/GuiElement.h"
+#include "SohModals.h"
+#include <variant>
+#include <spdlog/fmt/fmt.h>
+#include "variables.h"
+#include <tuple>
+
+extern "C" {
+#include "z64.h"
+#include "functions.h"
+extern PlayState* gPlayState;
+}
+std::vector<ImVec2> windowTypeSizes = { {} };
+
+extern std::unordered_map<s16, const char*> warpPointSceneList;
+extern void Warp();
+
+namespace SohGui {
+extern std::shared_ptr<SohModalWindow> mModalWindow;
+}
+
+namespace Ship {
+std::string disabledTempTooltip;
+const char* disabledTooltip;
+bool disabledValue = false;
+
+bool operator==(Color_RGB8 const& l, Color_RGB8 const& r) noexcept {
+    return l.r == r.r && l.g == r.g && l.b == r.b;
+}
+
+bool operator==(Color_RGBA8 const& l, Color_RGBA8 const& r) noexcept {
+    return l.r == r.r && l.g == r.g && l.b == r.b && l.a == r.a;
+}
+
+bool operator<(Color_RGB8 const& l, Color_RGB8 const& r) noexcept {
+    return (l.r < r.r && l.g <= r.g && l.b <= r.b) || (l.r <= r.r && l.g < r.g && l.b <= r.b) ||
+           (l.r <= r.r && l.g <= r.g && l.b < r.b);
+}
+
+bool operator<(Color_RGBA8 const& l, Color_RGBA8 const& r) noexcept {
+    return (l.r < r.r && l.g <= r.g && l.b <= r.b && l.a <= r.a) ||
+           (l.r <= r.r && l.g < r.g && l.b <= r.b && l.a <= r.a) ||
+           (l.r <= r.r && l.g <= r.g && l.b < r.b && l.a <= r.a) ||
+           (l.r <= r.r && l.g <= r.g && l.b <= r.b && l.a < r.a);
+}
+
+bool operator>(Color_RGB8 const& l, Color_RGB8 const& r) noexcept {
+    return (l.r > r.r && l.g >= r.g && l.b >= r.b) || (l.r >= r.r && l.g > r.g && l.b >= r.b) ||
+           (l.r >= r.r && l.g >= r.g && l.b > r.b);
+}
+
+bool operator>(Color_RGBA8 const& l, Color_RGBA8 const& r) noexcept {
+    return (l.r > r.r && l.g >= r.g && l.b >= r.b && l.a >= r.a) ||
+           (l.r >= r.r && l.g > r.g && l.b >= r.b && l.a >= r.a) ||
+           (l.r >= r.r && l.g >= r.g && l.b > r.b && l.a >= r.a) ||
+           (l.r >= r.r && l.g >= r.g && l.b >= r.b && l.a > r.a);
+}
+
+uint32_t GetVectorIndexOf(std::vector<std::string>& vector, std::string value) {
+    return std::distance(vector.begin(), std::find(vector.begin(), vector.end(), value));
+}
+
+static bool raceDisableActive = false;
+
+void Menu::InsertSidebarSearch() {
+    menuEntries["Settings"].sidebars.emplace("Search", searchSidebarEntry);
+    uint32_t curIndex = 0;
+    if (!Ship_IsCStringEmpty(CVarGetString(menuEntries["Settings"].sidebarCvar, ""))) {
+        curIndex = GetVectorIndexOf(menuEntries["Settings"].sidebarOrder,
+                                    CVarGetString(menuEntries["Settings"].sidebarCvar, ""));
+    }
+    menuEntries["Settings"].sidebarOrder.insert(menuEntries["Settings"].sidebarOrder.begin() + searchSidebarIndex,
+                                                "Search");
+    if (curIndex > searchSidebarIndex) {
+        CVarSetString(menuEntries["Settings"].sidebarCvar, menuEntries["Settings"].sidebarOrder.at(curIndex).c_str());
+    }
+}
+
+void Menu::RemoveSidebarSearch() {
+    uint32_t curIndex = GetVectorIndexOf(menuEntries["Settings"].sidebarOrder,
+                                         CVarGetString(menuEntries["Settings"].sidebarCvar, "General"));
+    menuEntries["Settings"].sidebars.erase("Search");
+    std::erase_if(menuEntries["Settings"].sidebarOrder, [](std::string& name) { return name == "Search"; });
+    if (curIndex > searchSidebarIndex) {
+        curIndex--;
+    } else if (curIndex >= menuEntries["Settings"].sidebarOrder.size()) {
+        curIndex = menuEntries["Settings"].sidebarOrder.size() - 1;
+    }
+    CVarSetString(menuEntries["Settings"].sidebarCvar, menuEntries["Settings"].sidebarOrder.at(curIndex).c_str());
+}
+
+void Menu::UpdateWindowBackendObjects() {
+    Ship::WindowBackend runningWindowBackend = Ship::Context::GetInstance()->GetWindow()->GetWindowBackend();
+    int32_t configWindowBackendId = Ship::Context::GetInstance()->GetConfig()->GetInt("Window.Backend.Id", -1);
+    if (Ship::Context::GetInstance()->GetWindow()->IsAvailableWindowBackend(configWindowBackendId)) {
+        configWindowBackend = static_cast<Ship::WindowBackend>(configWindowBackendId);
+    } else {
+        configWindowBackend = runningWindowBackend;
+    }
+
+    availableWindowBackends = Ship::Context::GetInstance()->GetWindow()->GetAvailableWindowBackends();
+    for (auto& backend : *availableWindowBackends) {
+        availableWindowBackendsMap[backend] = windowBackendsMap.at(backend);
+    }
+}
+
+bool Menu::IsMenuPopped() {
+    return popped;
+}
+
+UIWidgets::Colors Menu::GetMenuThemeColor() {
+    return menuThemeIndex;
+}
+
+Menu::Menu(const std::string& cVar, const std::string& name, uint8_t searchSidebarIndex_,
+           UIWidgets::Colors defaultThemeIndex_)
+    : GuiWindow(cVar, name), searchSidebarIndex(searchSidebarIndex_), defaultThemeIndex(defaultThemeIndex_) {
+}
+
+void Menu::InitElement() {
+    popped = CVarGetInteger(CVAR_SETTING("Menu.Popout"), 0);
+    poppedSize.x = CVarGetInteger(CVAR_SETTING("Menu.PoppedWidth"), 1280);
+    poppedSize.y = CVarGetInteger(CVAR_SETTING("Menu.PoppedHeight"), 800);
+    poppedPos.x = CVarGetInteger(CVAR_SETTING("Menu.PoppedPos.x"), 0);
+    poppedPos.y = CVarGetInteger(CVAR_SETTING("Menu.PoppedPos.y"), 0);
+
+    UpdateWindowBackendObjects();
+}
+
+void Menu::UpdateElement() {
+    menuThemeIndex = static_cast<UIWidgets::Colors>(CVarGetInteger(CVAR_SETTING("Menu.Theme"), defaultThemeIndex));
+}
+
+bool ModernMenuSidebarEntry(std::string label) {
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    ImGuiStyle& style = ImGui::GetStyle();
+    ImVec2 pos = window->DC.CursorPos;
+    const ImGuiID sidebarId = window->GetID(std::string(label + "##Sidebar").c_str());
+    ImVec2 labelSize = ImGui::CalcTextSize(label.c_str(), ImGui::FindRenderedTextEnd(label.c_str()), true);
+    pos.y += style.FramePadding.y;
+    pos.x = window->WorkRect.GetCenter().x - labelSize.x / 2;
+    ImRect bb = { pos - style.FramePadding, pos + labelSize + style.FramePadding };
+    ImGui::ItemSize(bb, style.FramePadding.y);
+    ImGui::ItemAdd(bb, sidebarId);
+    bool hovered, held;
+    bool pressed = ImGui::ButtonBehavior(bb, sidebarId, &hovered, &held);
+    if (pressed) {
+        ImGui::MarkItemEdited(sidebarId);
+    }
+    window->DrawList->AddRectFilled(pos - style.FramePadding, pos + labelSize + style.FramePadding,
+                                    ImGui::GetColorU32((held && hovered) ? ImGuiCol_ButtonActive
+                                                       : hovered         ? ImGuiCol_ButtonHovered
+                                                                         : ImGuiCol_Button),
+                                    3.0f);
+    UIWidgets::RenderText(pos, label.c_str(), ImGui::FindRenderedTextEnd(label.c_str()), true);
+    return pressed;
+}
+
+bool ModernMenuHeaderEntry(std::string label) {
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    ImGuiStyle& style = ImGui::GetStyle();
+    ImVec2 pos = window->DC.CursorPos;
+    const ImGuiID headerId = window->GetID(std::string(label + "##Header").c_str());
+    ImVec2 labelSize = ImGui::CalcTextSize(label.c_str(), ImGui::FindRenderedTextEnd(label.c_str()), true);
+    ImRect bb = { pos, pos + labelSize + style.FramePadding * 2 };
+    ImGui::ItemSize(bb, style.FramePadding.y);
+    ImGui::ItemAdd(bb, headerId);
+    bool hovered, held;
+    bool pressed = ImGui::ButtonBehavior(bb, headerId, &hovered, &held);
+    window->DrawList->AddRectFilled(bb.Min, bb.Max,
+                                    ImGui::GetColorU32((held && hovered) ? ImGuiCol_ButtonActive
+                                                       : hovered         ? ImGuiCol_ButtonHovered
+                                                                         : ImGuiCol_Button),
+                                    3.0f);
+    pos += style.FramePadding;
+    UIWidgets::RenderText(pos, label.c_str(), ImGui::FindRenderedTextEnd(label.c_str()), true);
+    return pressed;
+}
+
+uint32_t Menu::DrawSearchResults(std::string& menuSearchText) {
+    int searchCount = 0;
+    if (ImGui::BeginChild("Search Results")) {
+        for (auto& menuLabel : menuOrder) {
+            auto& menuEntry = menuEntries.at(menuLabel);
+            for (auto& sidebarLabel : menuEntry.sidebarOrder) {
+                auto& sidebar = menuEntry.sidebars[sidebarLabel];
+                for (int i = 0; i < sidebar.columnWidgets.size(); i++) {
+                    auto& column = sidebar.columnWidgets.at(i);
+                    for (auto& info : column) {
+                        if (info.type == WIDGET_SEARCH || info.type == WIDGET_SEPARATOR ||
+                            info.type == WIDGET_SEPARATOR_TEXT || info.isHidden) {
+                            continue;
+                        }
+                        const char* tooltip = info.options->tooltip;
+                        std::string widgetStr = std::string(info.name) + std::string(tooltip != NULL ? tooltip : "");
+                        std::transform(menuSearchText.begin(), menuSearchText.end(), menuSearchText.begin(), ::tolower);
+                        menuSearchText.erase(std::remove(menuSearchText.begin(), menuSearchText.end(), ' '),
+                                             menuSearchText.end());
+                        std::transform(widgetStr.begin(), widgetStr.end(), widgetStr.begin(), ::tolower);
+                        widgetStr.erase(std::remove(widgetStr.begin(), widgetStr.end(), ' '), widgetStr.end());
+                        if (widgetStr.find(menuSearchText) != std::string::npos) {
+                            MenuDrawItem(info, 90 / sidebar.columnCount, menuThemeIndex);
+                            ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(UIWidgets::Colors::Gray));
+                            std::string origin =
+                                fmt::format("  ({} -> {}, Col {})", menuEntry.label, sidebarLabel, i + 1);
+                            ImGui::Text("%s", origin.c_str());
+                            ImGui::PopStyleColor();
+                            searchCount++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return searchCount;
+}
+
+void Menu::AddMenuEntry(std::string entryName, const char* entryCvar) {
+    menuEntries.emplace(entryName, MainMenuEntry{ entryName, entryCvar });
+    menuOrder.push_back(entryName);
+}
+
+std::unordered_map<uint32_t, disabledInfo>& Menu::GetDisabledMap() {
+    return disabledMap;
+}
+
+void Menu::MenuDrawItem(WidgetInfo& widget, uint32_t width, UIWidgets::Colors menuThemeIndex) {
+    disabledTempTooltip = "This setting is disabled because: \n";
+    disabledValue = false;
+    disabledTooltip = " ";
+
+    if (widget.preFunc != nullptr) {
+        widget.ResetDisables();
+        widget.preFunc(widget);
+        if (widget.isHidden) {
+            return;
+        }
+        if (!widget.activeDisables.empty()) {
+            widget.options->disabled = true;
+            for (auto option : widget.activeDisables) {
+                disabledTempTooltip += std::string("\n- ") + disabledMap.at(option).reason;
+            }
+            widget.options->disabledTooltip = disabledTempTooltip.c_str();
+        }
+    }
+    if (widget.raceDisable && raceDisableActive) {
+        widget.options->disabled = true;
+        disabledTempTooltip += std::string("\n- Race Lockout Active");
+        widget.options->disabledTooltip = disabledTempTooltip.c_str();
+    }
+
+    if (widget.sameLine) {
+        ImGui::SameLine();
+    }
+
+    try {
+        switch (widget.type) {
+            case WIDGET_CHECKBOX: {
+                bool* pointer = std::get<bool*>(widget.valuePointer);
+                if (pointer == nullptr) {
+                    SPDLOG_ERROR("Checkbox Widget requires a value pointer, currently nullptr");
+                    assert(false);
+                    return;
+                }
+                auto options = std::static_pointer_cast<UIWidgets::CheckboxOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::Checkbox(UIWidgets::WrappedText(widget.name.c_str(), width).c_str(), pointer,
+                                        *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                }
+            } break;
+            case WIDGET_CVAR_CHECKBOX: {
+                auto options = std::static_pointer_cast<UIWidgets::CheckboxOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::CVarCheckbox(UIWidgets::WrappedText(widget.name.c_str(), width).c_str(), widget.cVar,
+                                            *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                };
+            } break;
+            case WIDGET_AUDIO_BACKEND: {
+                auto currentAudioBackend = Ship::Context::GetInstance()->GetAudio()->GetCurrentAudioBackend();
+                UIWidgets::ComboboxOptions options = {};
+                options.color = menuThemeIndex;
+                options.tooltip = "Sets the audio API used by the game. Requires a relaunch to take effect.";
+                options.disabled = Ship::Context::GetInstance()->GetAudio()->GetAvailableAudioBackends()->size() <= 1;
+                options.disabledTooltip = "Only one audio API is available on this platform.";
+                if (UIWidgets::Combobox("Audio API", &currentAudioBackend, audioBackendsMap, options)) {
+                    Ship::Context::GetInstance()->GetAudio()->SetCurrentAudioBackend(currentAudioBackend);
+                }
+            } break;
+            case WIDGET_VIDEO_BACKEND: {
+                UIWidgets::ComboboxOptions options = {};
+                options.color = menuThemeIndex;
+                options.tooltip = "Sets the renderer API used by the game.";
+                options.disabled = availableWindowBackends->size() <= 1;
+                options.disabledTooltip = "Only one renderer API is available on this platform.";
+                if (UIWidgets::Combobox("Renderer API (Needs reload)", &configWindowBackend, availableWindowBackendsMap,
+                                        options)) {
+                    Ship::Context::GetInstance()->GetConfig()->SetInt("Window.Backend.Id",
+                                                                      (int32_t)(configWindowBackend));
+                    Ship::Context::GetInstance()->GetConfig()->SetString("Window.Backend.Name",
+                                                                         windowBackendsMap.at(configWindowBackend));
+                    Ship::Context::GetInstance()->GetConfig()->Save();
+                    UpdateWindowBackendObjects();
+                }
+            } break;
+            case WIDGET_SEPARATOR: {
+                ImGui::Separator();
+            } break;
+            case WIDGET_SEPARATOR_TEXT: {
+                auto options = std::static_pointer_cast<UIWidgets::TextOptions>(widget.options);
+                if (options->color != UIWidgets::Colors::NoColor) {
+                    ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(options->color));
+                }
+                ImGui::SeparatorText(widget.name.c_str());
+                if (options->color != UIWidgets::Colors::NoColor) {
+                    ImGui::PopStyleColor();
+                }
+            } break;
+            case WIDGET_TEXT: {
+                auto options = std::static_pointer_cast<UIWidgets::TextOptions>(widget.options);
+                if (options->color != UIWidgets::Colors::NoColor) {
+                    ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(options->color));
+                }
+                ImGui::AlignTextToFramePadding();
+                ImGui::TextWrapped("%s", widget.name.c_str());
+                if (options->color != UIWidgets::Colors::NoColor) {
+                    ImGui::PopStyleColor();
+                }
+            } break;
+            case WIDGET_COMBOBOX: {
+                int32_t* pointer = std::get<int32_t*>(widget.valuePointer);
+                if (pointer == nullptr) {
+                    SPDLOG_ERROR("Combobox Widget requires a value pointer, currently nullptr");
+                    assert(false);
+                    return;
+                }
+                auto options = std::static_pointer_cast<UIWidgets::ComboboxOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::Combobox(widget.name.c_str(), pointer, options->comboMap, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                };
+            } break;
+            case WIDGET_CVAR_COMBOBOX: {
+                auto options = std::static_pointer_cast<UIWidgets::ComboboxOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::CVarCombobox(widget.name.c_str(), widget.cVar, options->comboMap, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                }
+            } break;
+            case WIDGET_SLIDER_INT: {
+                int32_t* pointer = std::get<int32_t*>(widget.valuePointer);
+                if (pointer == nullptr) {
+                    SPDLOG_ERROR("int32 Slider Widget requires a value pointer, currently nullptr");
+                    assert(false);
+                    return;
+                }
+                auto options = std::static_pointer_cast<UIWidgets::IntSliderOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::SliderInt(widget.name.c_str(), pointer, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                };
+            } break;
+            case WIDGET_CVAR_SLIDER_INT: {
+                auto options = std::static_pointer_cast<UIWidgets::IntSliderOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::CVarSliderInt(widget.name.c_str(), widget.cVar, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                };
+            } break;
+            case WIDGET_SLIDER_FLOAT: {
+                float* pointer = std::get<float*>(widget.valuePointer);
+
+                if (pointer == nullptr) {
+                    SPDLOG_ERROR("float Slider Widget requires a value pointer, currently nullptr");
+                    assert(false);
+                    return;
+                }
+                auto options = std::static_pointer_cast<UIWidgets::FloatSliderOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::SliderFloat(widget.name.c_str(), pointer, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                }
+            } break;
+            case WIDGET_CVAR_SLIDER_FLOAT: {
+                auto options = std::static_pointer_cast<UIWidgets::FloatSliderOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::CVarSliderFloat(widget.name.c_str(), widget.cVar, *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                }
+            } break;
+            case WIDGET_BUTTON: {
+                auto options = std::static_pointer_cast<UIWidgets::ButtonOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (UIWidgets::Button(widget.name.c_str(), *options)) {
+                    if (widget.callback != nullptr) {
+                        widget.callback(widget);
+                    }
+                }
+            } break;
+            case WIDGET_CUSTOM: {
+                if (widget.customFunction != nullptr) {
+                    widget.customFunction(widget);
+                }
+            } break;
+            case WIDGET_WINDOW_BUTTON: {
+                if (widget.windowName == nullptr || widget.windowName[0] == '\0') {
+                    std::string msg =
+                        fmt::format("Error drawing window contents for {}: windowName not defined", widget.name);
+                    SPDLOG_ERROR(msg.c_str());
+                    break;
+                }
+                auto window = Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow(widget.windowName);
+                if (!window) {
+                    std::string msg =
+                        fmt::format("Error drawing window contents: windowName {} does not exist", widget.windowName);
+                    SPDLOG_ERROR(msg.c_str());
+                    break;
+                }
+                auto options = std::static_pointer_cast<UIWidgets::WindowButtonOptions>(widget.options);
+                options->color = menuThemeIndex;
+                if (options->showButton) {
+                    UIWidgets::WindowButton(widget.name.c_str(), widget.cVar, window, *options);
+                }
+                if (!window->IsVisible() && options->embedWindow) {
+                    window->DrawElement();
+                }
+            } break;
+            case WIDGET_SEARCH: {
+                UIWidgets::PushStyleButton(menuThemeIndex);
+                if (ImGui::Button("Clear")) {
+                    menuSearch.Clear();
+                }
+                ImGui::SameLine();
+                if (CVarGetInteger(CVAR_SETTING("Menu.SearchAutofocus"), 0) &&
+                    ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) && !ImGui::IsAnyItemActive() &&
+                    !ImGui::IsMouseClicked(0)) {
+                    ImGui::SetKeyboardFocusHere(0);
+                }
+                UIWidgets::PushStyleCombobox(menuThemeIndex);
+                ImGui::PushStyleColor(ImGuiCol_Border, UIWidgets::ColorValues.at(menuThemeIndex));
+                menuSearch.Draw();
+                ImGui::PopStyleColor();
+                UIWidgets::PopStyleCombobox();
+                UIWidgets::PopStyleButton();
+                std::string menuSearchText(menuSearch.InputBuf);
+
+                if (menuSearchText == "") {
+                    ImGui::Text("Start typing to see results.");
+                    return;
+                }
+                DrawSearchResults(menuSearchText);
+                ImGui::EndChild();
+            } break;
+            default:
+                break;
+        }
+        if (widget.postFunc != nullptr) {
+            widget.postFunc(widget);
+        }
+    } catch (const std::bad_variant_access& e) {
+        SPDLOG_ERROR("Failed to draw menu item \"{}\" due to: {}", widget.name, e.what());
+        assert(false);
+    }
+}
+
+void Menu::Draw() {
+    if (!IsVisible()) {
+        return;
+    }
+    DrawElement();
+    // Sync up the IsVisible flag if it was changed by ImGui
+    SyncVisibilityConsoleVariable();
+}
+
+void Menu::DrawElement() {
+    for (auto& [reason, info] : disabledMap) {
+        info.active = info.evaluation(info);
+    }
+
+    raceDisableActive = CVarGetInteger(CVAR_SETTING("DisableChanges"), 0);
+
+    windowHeight = ImGui::GetMainViewport()->WorkSize.y;
+    windowWidth = ImGui::GetMainViewport()->WorkSize.x;
+    auto windowFlags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings;
+    bool popout = CVarGetInteger(CVAR_SETTING("Menu.Popout"), 0) && allowPopout;
+    if (popout) {
+        windowFlags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoDocking;
+    }
+    if (popout != popped) {
+        if (popout) {
+            windowHeight = poppedSize.y;
+            windowWidth = poppedSize.x;
+            ImGui::SetNextWindowSize({ static_cast<float>(windowWidth), static_cast<float>(windowHeight) },
+                                     ImGuiCond_Always);
+            ImGui::SetNextWindowPos(poppedPos, ImGuiCond_Always);
+        } else if (popped) {
+            CVarSetFloat(CVAR_SETTING("Menu.PoppedWidth"), poppedSize.x);
+            CVarSetFloat(CVAR_SETTING("Menu.PoppedHeight"), poppedSize.y);
+            CVarSave();
+        }
+    }
+    popped = popout;
+    auto windowCond = ImGuiCond_Always;
+    if (!popout) {
+        ImGui::SetNextWindowSize({ static_cast<float>(windowWidth), static_cast<float>(windowHeight) }, windowCond);
+        ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), windowCond, { 0.5f, 0.5f });
+        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+    }
+
+    ImGui::PushStyleColor(ImGuiCol_WindowBg,
+                          ImVec4(0, 0, 0, CVarGetFloat(CVAR_SETTING("Menu.BackgroundOpacity"), 0.85f)));
+
+    if (!ImGui::Begin("Main Menu", NULL, windowFlags)) {
+        if (!popout) {
+            ImGui::PopStyleVar();
+        }
+        ImGui::PopStyleColor();
+        ImGui::End();
+        return;
+    }
+
+    ImGui::PopStyleColor();
+
+    if (popped != popout) {
+        if (!popout) {
+            ImGui::PopStyleVar();
+        }
+        ImGui::PopStyleColor();
+        CVarSetInteger(CVAR_SETTING("Menu.Popout"), popped);
+        CVarSetFloat(CVAR_SETTING("Menu.PoppedWidth"), poppedSize.x);
+        CVarSetFloat(CVAR_SETTING("Menu.PoppedHeight"), poppedSize.y);
+        CVarSetFloat(CVAR_SETTING("Menu.PoppedPos.x"), poppedSize.x);
+        CVarSetFloat(CVAR_SETTING("Menu.PoppedPos.y"), poppedSize.y);
+        CVarSave();
+        ImGui::End();
+        return;
+    }
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    ImGuiStyle& style = ImGui::GetStyle();
+    windowHeight = window->WorkRect.GetHeight();
+    windowWidth = window->WorkRect.GetWidth();
+
+    ImGui::PushFont(OTRGlobals::Instance->fontStandardLargest);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
+    const char* headerCvar = CVAR_SETTING("Menu.ActiveHeader");
+    std::string headerIndex = CVarGetString(headerCvar, "Settings");
+    ImVec2 pos = window->DC.CursorPos;
+    float centerX = pos.x + windowWidth / 2 - (style.ItemSpacing.x * (menuEntries.size() + 1));
+    std::vector<ImVec2> headerSizes;
+    float headerWidth = style.ItemSpacing.x + 20;
+    bool headerSearch = !CVarGetInteger(CVAR_SETTING("Menu.SidebarSearch"), 0);
+    if (headerSearch) {
+        headerWidth += 200.0f + style.ItemSpacing.x + style.FramePadding.x;
+    }
+    for (auto& label : menuOrder) {
+        ImVec2 size = ImGui::CalcTextSize(label.c_str());
+        headerSizes.push_back(size);
+        headerWidth += size.x + style.FramePadding.x * 2;
+        if (label == headerIndex) {
+            headerWidth += style.ItemSpacing.x;
+        }
+    }
+
+    // Full screen menu with widths below 1280, heights below 800.
+    // 5% of screen width/height padding on both sides above those resolutions.
+    // Menu width will never exceed a 16:9 aspect ratio.
+    ImVec2 menuSize = { windowWidth, windowHeight };
+    if (windowWidth > 1280) {
+        menuSize.x = std::fminf(windowWidth * 0.9f, (windowHeight * 1.77f));
+    }
+    if (windowHeight > 800) {
+        menuSize.y = windowHeight * 0.9f;
+    }
+
+    pos += window->WorkRect.GetSize() / 2 - menuSize / 2;
+    ImGui::SetNextWindowPos(pos);
+    ImGui::BeginChild("Menu Block", menuSize,
+                      ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_AlwaysAutoResize,
+                      ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar);
+
+    std::unordered_map<std::string, SidebarEntry>* sidebar;
+    float headerHeight = headerSizes.at(0).y + style.FramePadding.y * 2;
+    ImVec2 buttonSize = ImGui::CalcTextSize(ICON_FA_TIMES_CIRCLE) + style.FramePadding * 2;
+    bool scrollbar = false;
+    if (headerWidth > menuSize.x - buttonSize.x * 3 - style.ItemSpacing.x * 3) {
+        headerHeight += style.ScrollbarSize;
+        scrollbar = true;
+    }
+    ImGui::SetNextWindowSizeConstraints({ 0, headerHeight }, { headerWidth, headerHeight });
+    ImVec2 headerSelSize = { menuSize.x - buttonSize.x * 3 - style.ItemSpacing.x * 3, headerHeight };
+    if (scrollbar) {
+        headerSelSize.y += style.ScrollbarSize;
+    }
+    bool autoFocus = CVarGetInteger(CVAR_SETTING("Menu.SearchAutofocus"), 0);
+    ImGui::BeginChild("Header Selection", headerSelSize,
+                      ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_AlwaysAutoResize,
+                      ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_HorizontalScrollbar);
+    uint8_t curIndex = 0;
+    for (auto& label : menuOrder) {
+        if (curIndex != 0) {
+            ImGui::SameLine();
+        }
+        auto& entry = menuEntries.at(label);
+        std::string nextIndex = label;
+        UIWidgets::PushStyleButton(menuThemeIndex);
+        if (headerIndex != label) {
+            ImGui::PushStyleColor(ImGuiCol_Button, { 0, 0, 0, 0 });
+        }
+        if (ModernMenuHeaderEntry(entry.label)) {
+            if (headerSearch) {
+                menuSearch.Clear();
+            }
+            CVarSetString(headerCvar, label.c_str());
+            CVarSave();
+            nextIndex = label;
+        }
+        if (headerIndex != label) {
+            ImGui::PopStyleColor();
+        }
+        UIWidgets::PopStyleButton();
+        if (headerIndex == label) {
+            sidebar = &entry.sidebars;
+        }
+        if (nextIndex != label) {
+            headerIndex = nextIndex;
+        }
+        curIndex++;
+    }
+    std::string menuSearchText = "";
+    if (headerSearch) {
+        ImGui::SameLine();
+        if (autoFocus && ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) && !ImGui::IsAnyItemActive() &&
+            !ImGui::IsMouseClicked(0)) {
+            ImGui::SetKeyboardFocusHere(0);
+        }
+        auto color = UIWidgets::ColorValues.at(menuThemeIndex);
+        color.w = 0.2f;
+        ImGui::PushStyleColor(ImGuiCol_FrameBg, color);
+        menuSearch.Draw("##search", 200.0f);
+        menuSearchText = menuSearch.InputBuf;
+        menuSearchText.erase(std::remove(menuSearchText.begin(), menuSearchText.end(), ' '), menuSearchText.end());
+        if (menuSearchText.length() < 1) {
+            ImGui::SameLine(headerWidth - 200.0f + style.ItemSpacing.x);
+            ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.4f), "Search...");
+        }
+        ImGui::PopStyleColor();
+    }
+    ImGui::EndChild();
+    ImGui::SameLine(menuSize.x - (buttonSize.x * 3) - (style.ItemSpacing.x * 2));
+    UIWidgets::ButtonOptions options3 = {};
+    options3.color = UIWidgets::Colors::Red;
+    options3.size = UIWidgets::Sizes::Inline;
+    options3.tooltip = "Quit SoH";
+    if (UIWidgets::Button(ICON_FA_POWER_OFF, options3)) {
+        SohGui::mModalWindow->RegisterPopup(
+            "Quit SoH", "Are you sure you want to quit SoH?", "Quit", "Cancel",
+            []() {
+                std::shared_ptr<Menu> menu =
+                    static_pointer_cast<Menu>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetMenu());
+                if (!menu->IsMenuPopped()) {
+                    menu->ToggleVisibility();
+                }
+                Ship::Context::GetInstance()->GetWindow()->Close();
+            },
+            nullptr);
+    }
+    ImGui::PopStyleVar();
+    ImGui::SameLine();
+    UIWidgets::ButtonOptions options2 = {};
+    options2.color = UIWidgets::Colors::Red;
+    options2.size = UIWidgets::Sizes::Inline;
+    options2.tooltip = "Reset"
+#ifdef __APPLE__
+                       " (Command-R)"
+#elif !defined(__SWITCH__) && !defined(__WIIU__)
+                       " (Ctrl+R)"
+#else
+                       ""
+#endif
+        ;
+    if (UIWidgets::Button(ICON_FA_UNDO, options2)) {
+        std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+            ->Dispatch("reset");
+    }
+    ImGui::SameLine();
+    UIWidgets::ButtonOptions options = {};
+    options.size = UIWidgets::Sizes::Inline;
+    options.tooltip = "Close Menu (Esc)";
+    if (UIWidgets::Button(ICON_FA_TIMES_CIRCLE, options)) {
+        ToggleVisibility();
+
+        // Update gamepad navigation after close based on if other menus are still visible
+        auto mImGuiIo = &ImGui::GetIO();
+        if (CVarGetInteger(CVAR_IMGUI_CONTROLLER_NAV, 0) &&
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetMenuOrMenubarVisible()) {
+            mImGuiIo->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
+        } else {
+            mImGuiIo->ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
+        }
+    }
+
+    pos.y += headerHeight + style.ItemSpacing.y;
+    pos.x = centerX - menuSize.x / 2 + (style.ItemSpacing.x * (menuEntries.size() + 1));
+    window->DrawList->AddRectFilled(pos, pos + ImVec2{ menuSize.x, 4 }, ImGui::GetColorU32({ 255, 255, 255, 255 }),
+                                    true, style.WindowRounding);
+    pos.y += style.ItemSpacing.y;
+    float sectionHeight = menuSize.y - headerHeight - 4 - style.ItemSpacing.y * 2;
+    float columnHeight = sectionHeight - style.ItemSpacing.y * 4;
+    ImGui::SetNextWindowPos(pos + style.ItemSpacing * 2);
+
+    // Increase sidebar width on larger screens to accomodate people scaling their menus.
+    float sidebarWidth = 200 - style.ItemSpacing.x;
+    if (menuSize.x > 1600) {
+        sidebarWidth = menuSize.x * 0.15f;
+    }
+
+    const char* sidebarCvar = menuEntries.at(headerIndex).sidebarCvar;
+
+    std::string sectionIndex = CVarGetString(sidebarCvar, "");
+    if (!sidebar->contains(sectionIndex)) {
+        sectionIndex = menuEntries.at(headerIndex).sidebarOrder.at(0);
+    }
+    float sectionCenterX = pos.x + (sidebarWidth / 2);
+    float topY = pos.y;
+    ImGui::SetNextWindowSizeConstraints({ sidebarWidth, 0 }, { sidebarWidth, columnHeight });
+    ImGui::BeginChild((menuEntries.at(headerIndex).label + " Section").c_str(), { sidebarWidth, columnHeight * 3 },
+                      ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_AlwaysAutoResize, ImGuiWindowFlags_NoTitleBar);
+    for (auto& sidebarLabel : menuEntries.at(headerIndex).sidebarOrder) {
+        std::string nextIndex = "";
+        UIWidgets::PushStyleButton(menuThemeIndex);
+        if (sectionIndex != sidebarLabel) {
+            ImGui::PushStyleColor(ImGuiCol_Button, { 0, 0, 0, 0 });
+        }
+        if (ModernMenuSidebarEntry(sidebarLabel)) {
+            if (headerSearch) {
+                menuSearch.Clear();
+            }
+            CVarSetString(sidebarCvar, sidebarLabel.c_str());
+            CVarSave();
+            nextIndex = sidebarLabel;
+        }
+        if (sectionIndex != sidebarLabel) {
+            ImGui::PopStyleColor();
+        }
+        UIWidgets::PopStyleButton();
+        if (nextIndex != "") {
+            sectionIndex = nextIndex;
+        }
+    }
+    ImGui::EndChild();
+    ImGui::PopFont();
+
+    pos = ImVec2{ sectionCenterX + (sidebarWidth / 2), topY } + style.ItemSpacing * 2;
+    window->DrawList->AddRectFilled(pos, pos + ImVec2{ 4, sectionHeight - style.FramePadding.y * 2 },
+                                    ImGui::GetColorU32({ 255, 255, 255, 255 }), true, style.WindowRounding);
+    pos.x += 4 + style.ItemSpacing.x;
+    ImGui::SetNextWindowPos(pos + style.ItemSpacing);
+    float sectionWidth = menuSize.x - sidebarWidth - 4 - style.ItemSpacing.x * 4;
+    std::string sectionMenuId = sectionIndex + " Settings";
+    int columns = sidebar->at(sectionIndex).columnCount;
+    size_t columnFuncs = sidebar->at(sectionIndex).columnWidgets.size();
+    if (windowWidth < 800) {
+        columns = 1;
+    }
+    float columnWidth = (sectionWidth - style.ItemSpacing.x * columns) / columns;
+    bool useColumns = columns > 1;
+    if (!useColumns || (headerSearch && menuSearchText.length() > 0)) {
+        ImGui::SameLine();
+        ImGui::SetNextWindowSizeConstraints({ sectionWidth, 0 }, { sectionWidth, columnHeight });
+        ImGui::BeginChild(sectionMenuId.c_str(), { sectionWidth, windowHeight * 4 }, ImGuiChildFlags_AutoResizeY,
+                          ImGuiWindowFlags_NoTitleBar);
+    }
+    if (headerSearch && menuSearchText.length() > 0) {
+        uint32_t searchCount = DrawSearchResults(menuSearchText);
+        if (searchCount == 0) {
+            ImGui::SetCursorPosX((ImGui::GetWindowWidth() - ImGui::CalcTextSize("No results found").x) / 2);
+            ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
+            ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.4f), "No results found");
+        }
+        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - ImGui::CalcTextSize("Clear Search").x) / 2 - 10.0f);
+        ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10.0f);
+        UIWidgets::ButtonOptions clearBtnOpts = {};
+        clearBtnOpts.size = UIWidgets::Sizes::Inline;
+        if (UIWidgets::Button("Clear Search", clearBtnOpts)) {
+            menuSearch.Clear();
+        }
+
+        ImGui::EndChild();
+    } else {
+        std::string menuLabel = menuEntries.at(headerIndex).label;
+        if (MenuInit::GetUpdateFuncs().contains(menuLabel)) {
+            if (MenuInit::GetUpdateFuncs()[menuLabel].contains(sectionIndex)) {
+                for (auto& updateFunc : MenuInit::GetUpdateFuncs()[menuLabel][sectionIndex]) {
+                    updateFunc();
+                }
+            }
+        }
+        for (int i = 0; i < columnFuncs; i++) {
+            std::string sectionId = fmt::format("{} Column {}", sectionMenuId, i);
+            if (useColumns) {
+                ImGui::SetNextWindowSizeConstraints({ columnWidth, 0 }, { columnWidth, columnHeight });
+                ImGui::BeginChild(sectionId.c_str(), { columnWidth, windowHeight * 4 }, ImGuiChildFlags_AutoResizeY,
+                                  ImGuiWindowFlags_NoTitleBar);
+            }
+            // for (auto& entryName : sidebar->at(sectionIndex).sidebarOrder) {
+            for (auto& entry : sidebar->at(sectionIndex).columnWidgets.at(i)) {
+                MenuDrawItem(entry, 90 / sidebar->at(sectionIndex).columnCount, menuThemeIndex);
+            }
+            //}
+            if (useColumns) {
+                ImGui::EndChild();
+            }
+            if (i < columns - 1) {
+                ImGui::SameLine();
+            }
+        }
+    }
+    if (!useColumns || menuSearchText.length() > 0) {
+        ImGui::EndChild();
+    }
+
+    if (!popout) {
+        ImGui::PopStyleVar();
+    }
+    ImGui::EndChild();
+    if (popout) {
+        poppedSize = ImGui::GetWindowSize();
+        poppedPos = ImGui::GetWindowPos();
+    }
+    ImGui::End();
+}
+} // namespace Ship
diff --git a/soh/soh/SohGui/Menu.h b/soh/soh/SohGui/Menu.h
new file mode 100644
index 0000000000..a7facffd1e
--- /dev/null
+++ b/soh/soh/SohGui/Menu.h
@@ -0,0 +1,66 @@
+#ifndef MENU_H
+#define MENU_H
+
+#include <libultraship/libultraship.h>
+#include "graphic/Fast3D/backends/gfx_rendering_api.h"
+#include "MenuTypes.h"
+
+namespace Ship {
+uint32_t GetVectorIndexOf(std::vector<std::string>& vector, std::string value);
+class Menu : public GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+
+    Menu(const std::string& cVar, const std::string& name, uint8_t searchSidebarIndex_ = 0,
+         UIWidgets::Colors menuThemeIndex_ = UIWidgets::Colors::LightBlue);
+
+    void InitElement() override;
+    void DrawElement() override;
+    void UpdateElement() override;
+    void Draw() override;
+    void InsertSidebarSearch();
+    void RemoveSidebarSearch();
+    void UpdateWindowBackendObjects();
+    bool IsMenuPopped();
+    UIWidgets::Colors GetMenuThemeColor();
+
+    void MenuDrawItem(WidgetInfo& widget, uint32_t width, UIWidgets::Colors menuThemeIndex);
+    void AddMenuEntry(std::string entryName, const char* entryCvar);
+    std::unordered_map<uint32_t, disabledInfo>& GetDisabledMap();
+
+  protected:
+    ImVec2 mOriginalSize;
+    std::string mName;
+    uint32_t mWindowFlags;
+    std::unordered_map<std::string, MainMenuEntry> menuEntries;
+    std::vector<std::string> menuOrder;
+    uint32_t DrawSearchResults(std::string& menuSearchText);
+    ImGuiTextFilter menuSearch;
+    uint8_t searchSidebarIndex;
+    UIWidgets::Colors defaultThemeIndex;
+    std::shared_ptr<std::vector<Ship::WindowBackend>> availableWindowBackends;
+    std::unordered_map<Ship::WindowBackend, const char*> availableWindowBackendsMap;
+    Ship::WindowBackend configWindowBackend;
+
+    std::unordered_map<uint32_t, disabledInfo> disabledMap;
+    std::vector<disabledInfo> disabledVector;
+    const SidebarEntry searchSidebarEntry = {
+        .columnCount = 1,
+        .columnWidgets = { { { .name = "Sidebar Search",
+                               .type = WIDGET_SEARCH,
+                               .options = std::make_shared<UIWidgets::WidgetOptions>(UIWidgets::WidgetOptions{}.Tooltip(
+                                   "Searches all menus for the given text, including tooltips.")) } } }
+    };
+
+  private:
+    bool allowPopout = true; // PortNote: should be set to false on small screen ports
+    bool popped;
+    ImVec2 poppedSize;
+    ImVec2 poppedPos;
+    float windowHeight;
+    float windowWidth;
+    UIWidgets::Colors menuThemeIndex;
+};
+} // namespace Ship
+
+#endif // MENU_H
diff --git a/soh/soh/SohGui/MenuTypes.h b/soh/soh/SohGui/MenuTypes.h
new file mode 100644
index 0000000000..e96d015efe
--- /dev/null
+++ b/soh/soh/SohGui/MenuTypes.h
@@ -0,0 +1,288 @@
+#ifndef MENUTYPES_H
+#define MENUTYPES_H
+
+#include <libultraship/libultraship.h>
+#include "UIWidgets.hpp"
+
+typedef enum {
+    DISABLE_FOR_NO_VSYNC,
+    DISABLE_FOR_NO_WINDOWED_FULLSCREEN,
+    DISABLE_FOR_NO_MULTI_VIEWPORT,
+    DISABLE_FOR_NOT_DIRECTX,
+    DISABLE_FOR_DIRECTX,
+    DISABLE_FOR_MATCH_REFRESH_RATE_ON,
+    DISABLE_FOR_ADVANCED_RESOLUTION_ON,
+    DISABLE_FOR_VERTICAL_RES_TOGGLE_ON,
+    DISABLE_FOR_LOW_RES_MODE_ON,
+    DISABLE_FOR_NULL_PLAY_STATE,
+    DISABLE_FOR_DEBUG_MODE_OFF,
+    DISABLE_FOR_FRAME_ADVANCE_OFF,
+    DISABLE_FOR_ADVANCED_RESOLUTION_OFF,
+    DISABLE_FOR_VERTICAL_RESOLUTION_OFF,
+    DISABLE_FOR_BOOT_TO_DEBUG_WARP_SCREEN_ON,
+} DisableOption;
+
+struct WidgetInfo;
+struct disabledInfo;
+using VoidFunc = void (*)();
+using DisableInfoFunc = bool (*)(disabledInfo&);
+using DisableVec = std::vector<DisableOption>;
+using WidgetFunc = void (*)(WidgetInfo&);
+
+typedef enum {
+    WIDGET_CHECKBOX,
+    WIDGET_COMBOBOX,
+    WIDGET_SLIDER_INT,
+    WIDGET_SLIDER_FLOAT,
+    WIDGET_CVAR_CHECKBOX,
+    WIDGET_CVAR_COMBOBOX,
+    WIDGET_CVAR_SLIDER_INT,
+    WIDGET_CVAR_SLIDER_FLOAT,
+    WIDGET_BUTTON,
+    WIDGET_INPUT,
+    WIDGET_CVAR_INPUT,
+    WIDGET_COLOR_24, // color picker without alpha
+    WIDGET_COLOR_32, // color picker with alpha
+    WIDGET_SEARCH,
+    WIDGET_SEPARATOR,
+    WIDGET_SEPARATOR_TEXT,
+    WIDGET_TEXT,
+    WIDGET_WINDOW_BUTTON,
+    WIDGET_AUDIO_BACKEND, // needed for special operations that can't be handled easily with the normal combobox widget
+    WIDGET_VIDEO_BACKEND, // same as above
+    WIDGET_CUSTOM,
+} WidgetType;
+
+typedef enum {
+    SECTION_COLUMN_1,
+    SECTION_COLUMN_2,
+    SECTION_COLUMN_3,
+} SectionColumns;
+
+typedef enum {
+    DEBUG_LOG_TRACE,
+    DEBUG_LOG_DEBUG,
+    DEBUG_LOG_INFO,
+    DEBUG_LOG_WARN,
+    DEBUG_LOG_ERROR,
+    DEBUG_LOG_CRITICAL,
+    DEBUG_LOG_OFF,
+} DebugLogOption;
+
+// holds the widget values for a widget, contains all CVar types available from LUS. int32_t is used for boolean
+// evaluation
+using CVarVariant = std::variant<int32_t, const char*, float, Color_RGBA8, Color_RGB8>;
+using OptionsVariant = std::variant<UIWidgets::ButtonOptions, UIWidgets::CheckboxOptions, UIWidgets::ComboboxOptions,
+                                    UIWidgets::FloatSliderOptions, UIWidgets::IntSliderOptions, UIWidgets::TextOptions,
+                                    UIWidgets::WidgetOptions, UIWidgets::WindowButtonOptions>;
+
+// All the info needed for display and search of all widgets in the menu.
+// `name` is the label displayed,
+// `cVar` is the string representation of the CVar used to store the widget value
+// `tooltip` is what is displayed when hovering (except when disabled, more on that later)
+// `type` is the WidgetType for the widget, which is what determines how the information is used in the draw func
+// `options` is a variant that holds the UIWidgetsOptions struct for the widget type
+// blank objects need to be initialized with specific typing matching the expected Options struct for the widget
+// `callback` is a lambda used for running code on widget change. may need `SohGui::GetMenu()` for specific menu actions
+// `preFunc` is a lambda called before drawing code starts. It can be used to determine a widget's status,
+// whether disabled or hidden, as well as update pointers for non-CVar widget types.
+// `postFunc` is a lambda called after all drawing code is finished, for reacting to states other than
+// widgets having been changed, like holding buttons.
+// All three lambdas accept a `widgetInfo` reference in case it needs information on the widget for these operations
+// `activeDisables` is a vector of DisableOptions for specifying what reasons a widget is disabled, which are displayed
+// in the disabledTooltip for the widget. Can display multiple reasons. Handling the reasons is done in `preFunc`.
+// It is recommended to utilize `disabledInfo`/`DisableReason` to list out all reasons for disabling and isHidden so
+// the info can be shown.
+// `windowName` is what is displayed and searched for `windowButton` type and window interactions
+// `isHidden` just prevents the widget from being drawn under whatever circumstances you specify in the `preFunc`
+// `sameLine` allows for specifying that the widget should be on the same line as the previous widget
+struct WidgetInfo {
+    std::string name; // Used by all widgets
+    const char* cVar; // Used by all widgets except
+    WidgetType type;
+    std::shared_ptr<UIWidgets::WidgetOptions> options;
+    std::variant<bool*, int32_t*, float*> valuePointer;
+    WidgetFunc callback = nullptr;
+    WidgetFunc preFunc = nullptr;
+    WidgetFunc postFunc = nullptr;
+    WidgetFunc customFunction = nullptr;
+    DisableVec activeDisables = {};
+    const char* windowName = "";
+    bool isHidden = false;
+    bool sameLine = false;
+    bool raceDisable = true;
+
+    WidgetInfo& CVar(const char* cVar_) {
+        cVar = cVar_;
+        return *this;
+    }
+    WidgetInfo& Options(OptionsVariant options_) {
+        switch (type) {
+            case WIDGET_AUDIO_BACKEND:
+            case WIDGET_VIDEO_BACKEND:
+            case WIDGET_COMBOBOX:
+            case WIDGET_CVAR_COMBOBOX:
+                options = std::make_shared<UIWidgets::ComboboxOptions>(std::get<UIWidgets::ComboboxOptions>(options_));
+                break;
+            case WIDGET_CHECKBOX:
+            case WIDGET_CVAR_CHECKBOX:
+                options = std::make_shared<UIWidgets::CheckboxOptions>(std::get<UIWidgets::CheckboxOptions>(options_));
+                break;
+            case WIDGET_SLIDER_FLOAT:
+            case WIDGET_CVAR_SLIDER_FLOAT:
+                options =
+                    std::make_shared<UIWidgets::FloatSliderOptions>(std::get<UIWidgets::FloatSliderOptions>(options_));
+                break;
+            case WIDGET_SLIDER_INT:
+            case WIDGET_CVAR_SLIDER_INT:
+                options =
+                    std::make_shared<UIWidgets::IntSliderOptions>(std::get<UIWidgets::IntSliderOptions>(options_));
+                break;
+            case WIDGET_BUTTON:
+                options = std::make_shared<UIWidgets::ButtonOptions>(std::get<UIWidgets::ButtonOptions>(options_));
+                break;
+            case WIDGET_WINDOW_BUTTON:
+                options = std::make_shared<UIWidgets::WindowButtonOptions>(
+                    std::get<UIWidgets::WindowButtonOptions>(options_));
+                break;
+            case WIDGET_TEXT:
+            case WIDGET_SEPARATOR_TEXT:
+                options = std::make_shared<UIWidgets::TextOptions>(std::get<UIWidgets::TextOptions>(options_));
+                break;
+            case WIDGET_SEPARATOR:
+            default:
+                options = std::make_shared<UIWidgets::WidgetOptions>(std::get<UIWidgets::WidgetOptions>(options_));
+        }
+        return *this;
+    }
+    void ResetDisables() {
+        isHidden = false;
+        options->disabled = false;
+        options->disabledTooltip = "";
+        activeDisables.clear();
+    }
+    WidgetInfo& Options(std::shared_ptr<UIWidgets::WidgetOptions> options_) {
+        options = options_;
+        return *this;
+    }
+    WidgetInfo& Callback(WidgetFunc callback_) {
+        callback = callback_;
+        return *this;
+    }
+    WidgetInfo& PreFunc(WidgetFunc preFunc_) {
+        preFunc = preFunc_;
+        return *this;
+    }
+    WidgetInfo& PostFunc(WidgetFunc postFunc_) {
+        postFunc = postFunc_;
+        return *this;
+    }
+    WidgetInfo& WindowName(const char* windowName_) {
+        windowName = windowName_;
+        return *this;
+    }
+    WidgetInfo& ValuePointer(std::variant<bool*, int32_t*, float*> valuePointer_) {
+        valuePointer = valuePointer_;
+        return *this;
+    }
+    WidgetInfo& SameLine(bool sameLine_) {
+        sameLine = sameLine_;
+        return *this;
+    }
+    WidgetInfo& CustomFunction(WidgetFunc customFunction_) {
+        customFunction = customFunction_;
+        return *this;
+    }
+    WidgetInfo& RaceDisable(bool disable) {
+        raceDisable = disable;
+        return *this;
+    }
+};
+
+struct WidgetPath {
+    std::string sectionName;
+    std::string sidebarName;
+    SectionColumns column;
+};
+
+// `disabledInfo` holds information on reasons for hiding or disabling a widget, as well as an evaluation lambda that
+// is run once per frame to update its status (this is done to prevent dozens of redundant CVarGets in each frame loop)
+// `evaluation` returns a bool which can be determined by whatever code you want that changes its status
+// `reason` is the text displayed in the disabledTooltip when a widget is disabled by a particular DisableReason
+// `active` is what's referenced when determining disabled status for a widget that uses this This can also be used to
+// hold reasons to hide widgets so that their evaluations are also only run once per frame
+struct disabledInfo {
+    DisableInfoFunc evaluation;
+    const char* reason;
+    bool active = false;
+    int32_t value = 0;
+};
+
+// Contains the name displayed in the sidebar (label), the number of columns to use in drawing (columnCount; for visual
+// separation, 1-3), and nested vectors of the widgets, grouped by column (columnWidgets). The number of widget vectors
+// added to the column groups does not need to match the specified columnCount, e.g. you can have one vector added to
+// the sidebar, but still separate the window into 3 columns and display only in the first column
+struct SidebarEntry {
+    uint32_t columnCount;
+    std::vector<std::vector<WidgetInfo>> columnWidgets;
+};
+
+// Contains entries for what's listed in the header at the top, including the name displayed on the top bar (label),
+// a vector of the SidebarEntries for that header entry, and the name of the cvar used to track what sidebar entry is
+// the last viewed for that header.
+struct MainMenuEntry {
+    std::string label;
+    const char* sidebarCvar;
+    std::unordered_map<std::string, SidebarEntry> sidebars = {};
+    std::vector<std::string> sidebarOrder = {};
+};
+
+static const std::unordered_map<Ship::AudioBackend, const char*> audioBackendsMap = {
+    { Ship::AudioBackend::WASAPI, "Windows Audio Session API" },
+    { Ship::AudioBackend::SDL, "SDL" },
+};
+
+static const std::unordered_map<Ship::WindowBackend, const char*> windowBackendsMap = {
+    { Ship::WindowBackend::FAST3D_DXGI_DX11, "DirectX" },
+    { Ship::WindowBackend::FAST3D_SDL_OPENGL, "OpenGL" },
+    { Ship::WindowBackend::FAST3D_SDL_METAL, "Metal" },
+};
+
+struct MenuInit {
+    static std::vector<std::function<void()>>& GetInitFuncs() {
+        static std::vector<std::function<void()>> menuInitFuncs;
+        return menuInitFuncs;
+    }
+
+    static std::unordered_map<std::string, std::unordered_map<std::string, std::vector<std::function<void()>>>>&
+    GetUpdateFuncs() {
+        static std::unordered_map<std::string, std::unordered_map<std::string, std::vector<std::function<void()>>>>
+            menuUpdateFuncs;
+        return menuUpdateFuncs;
+    }
+
+    static void InitAll() {
+        auto& menuInitFuncs = MenuInit::GetInitFuncs();
+        for (const auto& initFunc : menuInitFuncs) {
+            initFunc();
+        }
+    }
+};
+
+struct RegisterMenuInitFunc {
+    RegisterMenuInitFunc(std::function<void()> initFunc) {
+        auto& menuInitFuncs = MenuInit::GetInitFuncs();
+
+        menuInitFuncs.push_back(initFunc);
+    }
+};
+
+struct RegisterMenuUpdateFunc {
+    RegisterMenuUpdateFunc(std::function<void()> updateFunc, std::string sectionName, std::string sidebarName) {
+        auto& menuUpdateFuncs = MenuInit::GetUpdateFuncs();
+
+        menuUpdateFuncs[sectionName][sidebarName].push_back(updateFunc);
+    }
+};
+
+#endif // MENUTYPES_H
diff --git a/soh/soh/SohGui/ResolutionEditor.cpp b/soh/soh/SohGui/ResolutionEditor.cpp
new file mode 100644
index 0000000000..41026e1e24
--- /dev/null
+++ b/soh/soh/SohGui/ResolutionEditor.cpp
@@ -0,0 +1,603 @@
+#include "ResolutionEditor.h"
+#include <imgui.h>
+#include <libultraship/libultraship.h>
+
+#include "soh/SohGui/UIWidgets.hpp"
+#include <graphic/Fast3D/Fast3dWindow.h>
+#include <graphic/Fast3D/interpreter.h>
+#include "soh/OTRGlobals.h"
+#include "soh/SohGui/SohMenu.h"
+#include "soh/SohGui/SohGui.hpp"
+
+/*  Console Variables are grouped under gAdvancedResolution. (e.g. CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled")
+
+    The following cvars are used in Libultraship and can be edited here:
+        - Enabled                                       - Turns Advanced Resolution Mode on.
+        - AspectRatioX, AspectRatioY                    - Aspect ratio controls. To toggle off, set either to zero.
+        - VerticalPixelCount, VerticalResolutionToggle  - Resolution controls.
+        - PixelPerfectMode, IntegerScale.Factor         - Pixel Perfect Mode a.k.a. integer scaling controls.
+        - IntegerScale.FitAutomatically                 - Automatic resizing for Pixel Perfect Mode.
+        - IntegerScale.NeverExceedBounds                - Prevents manual resizing from exceeding screen bounds.
+
+    The following cvars are also implemented in LUS for niche use cases:
+        - IgnoreAspectCorrection                        - Stretch framebuffer to fill screen.
+            This is something of a power-user setting for niche setups that most people won't need or care about,
+            but may be useful if playing the Switch/Wii U ports on a 4:3 television.
+        - IntegerScale.ExceedBoundsBy                   - Offset the max screen bounds, usually by +1.
+                                                          This isn't that useful at the moment, so it's unused here.
+*/
+
+namespace SohGui {
+extern std::shared_ptr<SohMenu> mSohMenu;
+enum setting { UPDATE_aspectRatioX, UPDATE_aspectRatioY, UPDATE_verticalPixelCount };
+
+std::unordered_map<int32_t, const char*> aspectRatioPresetLabels = { { 0, "Off" },
+                                                                     { 1, "Custom" },
+                                                                     { 2, "Original (4:3)" },
+                                                                     { 3, "Widescreen (16:9)" },
+                                                                     { 4, "Nintendo 3DS (5:3)" },
+                                                                     { 5, "16:10 (8:5)" },
+                                                                     { 6, "Ultrawide (21:9)" } };
+const float aspectRatioPresetsX[] = { 0.0f, 16.0f, 4.0f, 16.0f, 5.0f, 16.0f, 21.0f };
+const float aspectRatioPresetsY[] = { 0.0f, 9.0f, 3.0f, 9.0f, 3.0f, 10.0f, 9.0f };
+const int default_aspectRatio = 1; // Default combo list option
+
+const char* pixelCountPresetLabels[] = { "Custom",     "Native N64 (240p)", "2x (480p)",       "3x (720p)", "4x (960p)",
+                                         "5x (1200p)", "6x (1440p)",        "Full HD (1080p)", "4K (2160p)" };
+const int pixelCountPresets[] = { 480, 240, 480, 720, 960, 1200, 1440, 1080, 2160 };
+const int default_pixelCount = 0; // Default combo list option
+
+// Resolution clamp values as hardcoded in LUS::Gui::ApplyResolutionChanges()
+const uint32_t minVerticalPixelCount = SCREEN_HEIGHT;
+const uint32_t maxVerticalPixelCount = 4320; // 18x native, or 8K TV resolution
+
+const unsigned short default_maxIntegerScaleFactor = 6; // Default size of Integer scale factor slider.
+
+enum messageType { MESSAGE_ERROR, MESSAGE_WARNING, MESSAGE_QUESTION, MESSAGE_INFO, MESSAGE_GRAY_75 };
+const ImVec4 messageColor[]{
+    { 0.85f, 0.0f, 0.0f, 1.0f },  // MESSAGE_ERROR
+    { 0.85f, 0.85f, 0.0f, 1.0f }, // MESSAGE_WARNING
+    { 0.0f, 0.85f, 0.85f, 1.0f }, // MESSAGE_QUESTION
+    { 0.0f, 0.85f, 0.55f, 1.0f }, // MESSAGE_INFO
+    { 0.75f, 0.75f, 0.75f, 1.0f } // MESSAGE_GRAY_75
+};
+static const float enhancementSpacerHeight = 19.0f;
+// Initialise update flags.
+static bool update[3];
+
+// Initialise integer scale bounds.
+static short max_integerScaleFactor = default_maxIntegerScaleFactor; // default value, which may or may not get
+                                                                     // overridden depending on viewport res
+
+static short integerScale_maximumBounds = 1; // can change when window is resized
+
+// Combo List defaults
+static int32_t item_aspectRatio;
+static int32_t item_pixelCount;
+// Stored Values for non-UIWidgets elements
+static float aspectRatioX;
+static float aspectRatioY;
+static int32_t verticalPixelCount;
+// Additional settings
+static bool showHorizontalResField;
+static int32_t horizontalPixelCount;
+// Disabling flags
+static bool disabled_everything;
+static bool disabled_pixelCount;
+
+using namespace UIWidgets;
+
+static std::weak_ptr<Fast::Interpreter> mInterpreter;
+
+std::shared_ptr<Fast::Interpreter> GetInterpreter() {
+    auto intP = mInterpreter.lock();
+    if (!intP) {
+        assert(false && "Lost reference to Fast::Interpreter");
+    }
+    return intP;
+}
+
+void ResolutionCustomWidget(WidgetInfo& info) {
+    ImGui::BeginDisabled(disabled_everything);
+    // Vertical Resolution
+    UIWidgets::CVarCheckbox(
+        "Set fixed vertical resolution (disables resolution slider)",
+        CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle",
+        UIWidgets::CheckboxOptions({ { .disabled = disabled_everything } })
+            .Tooltip("Override the resolution scale slider and use the settings below, irrespective of window size.")
+            .Color(THEME_COLOR));
+    // if (disabled_pixelCount || disabled_everything) { // Hide pixel count controls.
+    //     UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    // }
+    UIWidgets::PushStyleCombobox(THEME_COLOR);
+    if (ImGui::Combo("Pixel Count Presets", &item_pixelCount, pixelCountPresetLabels,
+                     IM_ARRAYSIZE(pixelCountPresetLabels)) &&
+        item_pixelCount != default_pixelCount) { // don't change anything if "Custom" is selected.
+        verticalPixelCount = pixelCountPresets[item_pixelCount];
+
+        if (showHorizontalResField) {
+            horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+        }
+
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", verticalPixelCount);
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", item_pixelCount);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+    }
+    UIWidgets::PopStyleCombobox();
+    // Horizontal Resolution, if visibility is enabled for it.
+    if (showHorizontalResField) {
+        // Only show the field if Aspect Ratio is being enforced.
+        if ((aspectRatioX > 0.0f) && (aspectRatioY > 0.0f)) {
+            // So basically we're "faking" this one by setting aspectRatioX instead.
+            UIWidgets::PushStyleInput(THEME_COLOR);
+            if (ImGui::InputInt("Horiz. Pixel Count", &horizontalPixelCount, 8, 320)) {
+                item_aspectRatio = default_aspectRatio;
+                if (horizontalPixelCount < SCREEN_WIDTH) {
+                    horizontalPixelCount = SCREEN_WIDTH;
+                }
+                aspectRatioX = horizontalPixelCount;
+                aspectRatioY = verticalPixelCount;
+                update[UPDATE_aspectRatioX] = true;
+                update[UPDATE_aspectRatioY] = true;
+            }
+            UIWidgets::PopStyleInput();
+        } else { // Display a notice instead.
+            ImGui::TextColored(messageColor[MESSAGE_QUESTION],
+                               ICON_FA_QUESTION_CIRCLE " \"Force aspect ratio\" required.");
+            // ImGui::Text(" ");
+            ImGui::SameLine();
+            if (UIWidgets::Button("Click to resolve", UIWidgets::ButtonOptions().Color(THEME_COLOR))) {
+                item_aspectRatio = default_aspectRatio; // Set it to Custom
+                aspectRatioX = aspectRatioPresetsX[2];  // but use the 4:3 defaults
+                aspectRatioY = aspectRatioPresetsY[2];
+                update[UPDATE_aspectRatioX] = true;
+                update[UPDATE_aspectRatioY] = true;
+                horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+            }
+        }
+    }
+    // Vertical Resolution part 2
+    UIWidgets::PushStyleInput(THEME_COLOR);
+    if (ImGui::InputInt("Vertical Pixel Count", &verticalPixelCount, 8, 240)) {
+        item_pixelCount = default_pixelCount;
+        update[UPDATE_verticalPixelCount] = true;
+
+        // Account for the natural instinct to enter horizontal first.
+        // Ignore vertical resolutions that are below the lower clamp constant.
+        if (showHorizontalResField && !(verticalPixelCount < minVerticalPixelCount)) {
+            item_aspectRatio = default_aspectRatio;
+            aspectRatioX = horizontalPixelCount;
+            aspectRatioY = verticalPixelCount;
+            update[UPDATE_aspectRatioX] = true;
+            update[UPDATE_aspectRatioY] = true;
+        }
+    }
+    ImGui::EndDisabled();
+    UIWidgets::PopStyleInput();
+
+    // Integer scaling settings group (Pixel Perfect Mode)
+    static const ImGuiTreeNodeFlags IntegerScalingResolvedImGuiFlag =
+        CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ? ImGuiTreeNodeFlags_DefaultOpen
+                                                                               : ImGuiTreeNodeFlags_None;
+    UIWidgets::PushStyleHeader(THEME_COLOR);
+    if (ImGui::CollapsingHeader("Integer Scaling Settings", IntegerScalingResolvedImGuiFlag)) {
+        const bool disabled_pixelPerfectMode =
+            !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) || disabled_everything;
+        // Pixel Perfect Mode
+        UIWidgets::CVarCheckbox(
+            "Pixel Perfect Mode", CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode",
+            UIWidgets::CheckboxOptions({ { .disabled = disabled_pixelCount || disabled_everything } })
+                .Tooltip("Don't scale image to fill window.")
+                .Color(THEME_COLOR));
+        if (disabled_pixelCount && CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0)) {
+            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        }
+
+        // Integer Scaling
+        UIWidgets::CVarSliderInt(
+            fmt::format("Integer scale factor: {}", max_integerScaleFactor).c_str(),
+            CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor",
+            UIWidgets::IntSliderOptions(
+                { { .disabled = disabled_pixelPerfectMode ||
+                                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0) } })
+                .Min(1)
+                .Max(max_integerScaleFactor)
+                .DefaultValue(1)
+                .Tooltip("Integer scales the image. Only available in Pixel Perfect Mode.")
+                .Color(THEME_COLOR));
+        // Display warning if size is being clamped or if framebuffer is larger than viewport.
+        if (!disabled_pixelPerfectMode &&
+            (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds", 1) &&
+             CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor", 1) > integerScale_maximumBounds)) {
+            ImGui::SameLine();
+            ImGui::TextColored(messageColor[MESSAGE_WARNING], ICON_FA_EXCLAMATION_TRIANGLE " Window exceeded.");
+        }
+
+        UIWidgets::CVarCheckbox(
+            "Automatically scale image to fit viewport",
+            CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically",
+            UIWidgets::CheckboxOptions({ { .disabled = disabled_pixelPerfectMode } })
+                .DefaultValue(true)
+                .Color(THEME_COLOR)
+                .Tooltip("Automatically sets scale factor to fit window. Only available in Pixel Perfect Mode."));
+        if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0)) {
+            // This is just here to update the value shown on the slider.
+            // The function in LUS to handle this setting will ignore IntegerScaleFactor while active.
+            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.Factor", integerScale_maximumBounds);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        }
+    } // End of integer scaling settings
+    UIWidgets::PopStyleHeader();
+
+    // Collapsible panel for additional settings
+    UIWidgets::PushStyleHeader(THEME_COLOR);
+    if (ImGui::CollapsingHeader("Additional Settings")) {
+#if defined(__SWITCH__) || defined(__WIIU__)
+        // Disable aspect correction, stretching the framebuffer to fill the viewport.
+        // This option is only really needed on systems limited to 16:9 TV resolutions, such as consoles.
+        // The associated cvar is still functional on PC platforms if you want to use it though.
+        UIWidgets::CVarCheckbox(
+            "Disable aspect correction and stretch the output image.\n"
+            "(Might be useful for 4:3 televisions!)\n"
+            "Not available in Pixel Perfect Mode.",
+            CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection",
+            UIWidgets::CheckboxOptions(
+                { { .disabled = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ||
+                                disabled_everything } })
+                .Color(THEME_COLOR));
+#else
+        if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0)) {
+            // This setting is intentionally not exposed on PC platforms,
+            // but may be accidentally activated for varying reasons.
+            // Having this button should hopefully prevent support headaches.
+            ImGui::TextColored(messageColor[MESSAGE_QUESTION], ICON_FA_QUESTION_CIRCLE
+                               " If the image is stretched and you don't know why, click this.");
+            if (ImGui::Button("Click to reenable aspect correction.")) {
+                CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IgnoreAspectCorrection", 0);
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+            }
+            UIWidgets::Spacer(2);
+        }
+#endif
+
+        // A requested addition; an alternative way of displaying the resolution field.
+        if (UIWidgets::Checkbox("Show a horizontal resolution field, instead of aspect ratio.", &showHorizontalResField,
+                                UIWidgets::CheckboxOptions().Color(THEME_COLOR))) {
+            if (!showHorizontalResField && (aspectRatioX > 0.0f)) { // when turning this setting off
+                // Refresh relevant values
+                aspectRatioX = aspectRatioY * horizontalPixelCount / verticalPixelCount;
+                horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+            } else { // when turning this setting on
+                item_aspectRatio = default_aspectRatio;
+                if (aspectRatioX > 0.0f) {
+                    // Refresh relevant values in the opposite order
+                    horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+                    aspectRatioX = aspectRatioY * horizontalPixelCount / verticalPixelCount;
+                }
+            }
+            update[UPDATE_aspectRatioX] = true;
+        }
+
+        // Beginning of Integer Scaling additional settings.
+        {
+            // UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
+
+            // Integer Scaling - Never Exceed Bounds.
+            const bool disabled_neverExceedBounds =
+                !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ||
+                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.FitAutomatically", 0) ||
+                disabled_everything;
+            if (UIWidgets::CVarCheckbox(
+                    "Prevent integer scaling from exceeding screen bounds.\n"
+                    "(Makes screen bounds take priority over specified factor.)",
+                    CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds",
+                    UIWidgets::CheckboxOptions({ { .disabled = disabled_neverExceedBounds } })
+                        .Tooltip("Prevents integer scaling factor from exceeding screen bounds.\n\n"
+                                 "Enabled: Will clamp the scaling factor and display a gentle warning in the "
+                                 "resolution editor.\n"
+                                 "Disabled: Will allow scaling to exceed screen bounds, for users who want to crop "
+                                 "overscan.\n\n"
+                                 " " ICON_FA_INFO_CIRCLE
+                                 " Please note that exceeding screen bounds may show a scroll bar on-screen.")
+                        .Color(THEME_COLOR)
+                        .DefaultValue(true))) {
+
+                // Initialise the (currently unused) "Exceed Bounds By" cvar if it's been changed.
+                if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
+                    CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                }
+            }
+
+            // Integer Scaling - Exceed Bounds By 1x/Offset.
+            // A popular feature in some retro frontends/upscalers, sometimes called "crop overscan" or "1080p 5x".
+            UIWidgets::CVarCheckbox(
+                "Allow integer scale factor to go +1 above maximum screen bounds.",
+                CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy",
+                UIWidgets::CheckboxOptions(
+                    { { .disabled = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".PixelPerfectMode", 0) ||
+                                    disabled_everything } })
+                    .Color(THEME_COLOR));
+
+            // It does actually function as expected, but exceeding the bottom of the screen shows a scroll bar.
+            // I've ended up commenting this one out because of the scroll bar, and for simplicity.
+
+            // Display an info message about the scroll bar.
+            if (!CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.NeverExceedBounds", 1) ||
+                CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
+                ImGui::TextColored(messageColor[MESSAGE_INFO],
+                                   " " ICON_FA_INFO_CIRCLE
+                                   " A scroll bar may become visible if screen bounds are exceeded.");
+
+                // Another support helper button, to disable the unused "Exceed Bounds By" cvar.
+                // (Remove this button if uncommenting the checkbox.)
+                if (CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0)) {
+                    if (UIWidgets::Button("Click to reset a console variable that may be causing this.",
+                                          UIWidgets::ButtonOptions().Color(THEME_COLOR))) {
+                        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
+                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                    }
+                }
+            } else {
+                ImGui::Text(" ");
+            }
+        } // End of Integer Scaling additional settings.
+
+    } // End of additional settings
+    UIWidgets::PopStyleHeader();
+
+    // Clamp and update the cvars that don't use UIWidgets
+    if (update[UPDATE_aspectRatioX] || update[UPDATE_aspectRatioY] || update[UPDATE_verticalPixelCount]) {
+        if (update[UPDATE_aspectRatioX]) {
+            if (aspectRatioX < 0.0f) {
+                aspectRatioX = 0.0f;
+            }
+            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioX);
+        }
+        if (update[UPDATE_aspectRatioY]) {
+            if (aspectRatioY < 0.0f) {
+                aspectRatioY = 0.0f;
+            }
+            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioY);
+        }
+        if (update[UPDATE_verticalPixelCount]) {
+            // There's a upper and lower clamp on the Libultraship side too,
+            // so clamping it here is entirely visual, so the vertical resolution field reflects it.
+            if (verticalPixelCount < minVerticalPixelCount) {
+                verticalPixelCount = minVerticalPixelCount;
+            }
+            if (verticalPixelCount > maxVerticalPixelCount) {
+                verticalPixelCount = maxVerticalPixelCount;
+            }
+            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", verticalPixelCount);
+        }
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", item_aspectRatio);
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", item_pixelCount);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+    }
+}
+
+void RegisterResolutionWidgets() {
+    auto fastWnd = dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());
+    mInterpreter = fastWnd->GetInterpreterWeak();
+
+    WidgetPath path = { "Settings", "Graphics", SECTION_COLUMN_2 };
+
+    // Resolution visualiser
+    mSohMenu->AddWidget(path, "Viewport dimensions: {} x {}", WIDGET_TEXT)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            auto gfx_current_game_window_viewport = GetInterpreter().get()->mGameWindowViewport;
+            info.name = fmt::format("Viewport dimensions: {} x {}", gfx_current_game_window_viewport.width,
+                                    gfx_current_game_window_viewport.height);
+        });
+    mSohMenu->AddWidget(path, "Internal resolution: {} x {}", WIDGET_TEXT)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            auto gfx_current_dimensions = GetInterpreter().get()->mCurDimensions;
+            info.name = fmt::format("Internal resolution: {} x {}", gfx_current_dimensions.width,
+                                    gfx_current_dimensions.height);
+        });
+
+    //  Activator
+    mSohMenu->AddWidget(path, "Enable advanced settings.", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled")
+        .RaceDisable(false);
+    // Error/Warning display
+    mSohMenu
+        ->AddWidget(path, ICON_FA_EXCLAMATION_TRIANGLE " Significant frame rate (FPS) drops may be occuring.",
+                    WIDGET_TEXT)
+        .RaceDisable(false)
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = !(!CVarGetInteger(CVAR_LOW_RES_MODE, 0) && IsDroppingFrames()); })
+        .Options(TextOptions().Color(Colors::Orange));
+    mSohMenu->AddWidget(path, ICON_FA_QUESTION_CIRCLE " \"N64 Mode\" is overriding these settings.", WIDGET_TEXT)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_LOW_RES_MODE, 0); })
+        .Options(TextOptions().Color(Colors::LightBlue));
+    mSohMenu->AddWidget(path, "Click to disable N64 mode", WIDGET_BUTTON)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_LOW_RES_MODE, 0); })
+        .Callback([](WidgetInfo& info) {
+            CVarSetInteger(CVAR_LOW_RES_MODE, 0);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        });
+
+    // Aspect Ratio
+    mSohMenu->AddWidget(path, "AspectSep", WIDGET_SEPARATOR).RaceDisable(false).PreFunc([](WidgetInfo& info) {
+        if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
+            info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
+        }
+    });
+    mSohMenu->AddWidget(path, "Force aspect ratio:", WIDGET_TEXT).RaceDisable(false).PreFunc([](WidgetInfo& info) {
+        if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
+            info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
+        }
+    });
+    mSohMenu->AddWidget(path, "(Select \"Off\" to disable.)", WIDGET_TEXT)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
+                info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
+            }
+        })
+        .SameLine(true)
+        .Options(TextOptions().Color(Colors::Gray));
+    // Presets
+    mSohMenu->AddWidget(path, "Aspect Ratio", WIDGET_COMBOBOX)
+        .ValuePointer(&item_aspectRatio)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
+                info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
+            }
+        })
+        .Callback([](WidgetInfo& info) {
+            if (item_aspectRatio != default_aspectRatio) { // don't change anything if "Custom" is selected.
+                aspectRatioX = aspectRatioPresetsX[item_aspectRatio];
+                aspectRatioY = aspectRatioPresetsY[item_aspectRatio];
+
+                if (showHorizontalResField) {
+                    horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+                }
+
+                CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioX);
+                CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioY);
+            }
+            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", item_aspectRatio);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        })
+        .Options(ComboboxOptions().ComboMap(aspectRatioPresetLabels));
+    mSohMenu->AddWidget(path, "AspectRatioCustom", WIDGET_CUSTOM)
+        .RaceDisable(false)
+        .CustomFunction([](WidgetInfo& info) {
+            // Hide aspect ratio input fields if using one of the presets.
+            if (item_aspectRatio == default_aspectRatio && !showHorizontalResField) {
+                // Declare input interaction bools outside of IF statement to prevent Y field from disappearing.
+                const bool input_X =
+                    UIWidgets::SliderFloat("X", &aspectRatioX,
+                                           UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
+                                               .Min(0.1f)
+                                               .Max(32.0f)
+                                               .Step(0.001f)
+                                               .Format("%3f")
+                                               .Color(THEME_COLOR)
+                                               .LabelPosition(UIWidgets::LabelPositions::Near)
+                                               .ComponentAlignment(UIWidgets::ComponentAlignments::Right));
+                const bool input_Y =
+                    UIWidgets::SliderFloat("Y", &aspectRatioY,
+                                           UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
+                                               .Min(0.1f)
+                                               .Max(24.0f)
+                                               .Step(0.001f)
+                                               .Format("%3f")
+                                               .Color(THEME_COLOR)
+                                               .LabelPosition(UIWidgets::LabelPositions::Near)
+                                               .ComponentAlignment(UIWidgets::ComponentAlignments::Right));
+                if (input_X || input_Y) {
+                    item_aspectRatio = default_aspectRatio;
+                    update[UPDATE_aspectRatioX] = true;
+                    update[UPDATE_aspectRatioY] = true;
+                }
+            } else if (showHorizontalResField) { // Show calculated aspect ratio
+                if (item_aspectRatio) {
+                    auto gfx_current_dimensions = GetInterpreter().get()->mCurDimensions;
+                    ImGui::Dummy({ 0, 2 });
+                    const float resolvedAspectRatio =
+                        (float)gfx_current_dimensions.width / gfx_current_dimensions.height;
+                    ImGui::Text("Aspect ratio: %.2f:1", resolvedAspectRatio);
+                }
+            }
+        });
+    mSohMenu->AddWidget(path, "MoreResolutionSettings", WIDGET_CUSTOM)
+        .CustomFunction(ResolutionCustomWidget)
+        .RaceDisable(false);
+}
+
+void UpdateResolutionVars() {
+    // Clamp and update the cvars that don't use UIWidgets
+    if (update[UPDATE_aspectRatioX] || update[UPDATE_aspectRatioY] || update[UPDATE_verticalPixelCount]) {
+        if (update[UPDATE_aspectRatioX]) {
+            if (aspectRatioX < 0.0f) {
+                aspectRatioX = 0.0f;
+            }
+            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioX);
+        }
+        if (update[UPDATE_aspectRatioY]) {
+            if (aspectRatioY < 0.0f) {
+                aspectRatioY = 0.0f;
+            }
+            CVarSetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioY);
+        }
+        if (update[UPDATE_verticalPixelCount]) {
+            // There's a upper and lower clamp on the Libultraship side too,
+            // so clamping it here is entirely visual, so the vertical resolution field reflects it.
+            if (verticalPixelCount < minVerticalPixelCount) {
+                verticalPixelCount = minVerticalPixelCount;
+            }
+            if (verticalPixelCount > maxVerticalPixelCount) {
+                verticalPixelCount = maxVerticalPixelCount;
+            }
+            CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", verticalPixelCount);
+        }
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", item_aspectRatio);
+        CVarSetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", item_pixelCount);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+    }
+    // Initialise update flags.
+    for (uint8_t i = 0; i < sizeof(update); i++) {
+        update[i] = false;
+    }
+
+    // Initialise integer scale bounds.
+    short max_integerScaleFactor = default_maxIntegerScaleFactor; // default value, which may or may not get
+    // overridden depending on viewport res
+
+    short integerScale_maximumBounds = 1; // can change when window is resized
+    // This is mostly just for UX purposes, as Fit Automatically logic is part of LUS.
+    auto gfx_current_game_window_viewport = GetInterpreter().get()->mGameWindowViewport;
+    auto gfx_current_dimensions = GetInterpreter().get()->mCurDimensions;
+    if (((float)gfx_current_game_window_viewport.width / gfx_current_game_window_viewport.height) >
+        ((float)gfx_current_dimensions.width / gfx_current_dimensions.height)) {
+        // Scale to window height
+        integerScale_maximumBounds = gfx_current_game_window_viewport.height / gfx_current_dimensions.height;
+    } else {
+        // Scale to window width
+        integerScale_maximumBounds = gfx_current_game_window_viewport.width / gfx_current_dimensions.width;
+    }
+    // Lower-clamping maximum bounds value to 1 is no-longer necessary as that's accounted for in LUS.
+    // Letting it go below 1 in this Editor will even allow for checking if screen bounds are being exceeded.
+    if (default_maxIntegerScaleFactor < integerScale_maximumBounds) {
+        max_integerScaleFactor = integerScale_maximumBounds +
+                                 CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".IntegerScale.ExceedBoundsBy", 0);
+    }
+
+    // Combo List defaults
+    item_aspectRatio = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.AspectRatio", 3);
+    item_pixelCount = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".UIComboItem.PixelCount", default_pixelCount);
+    // Stored Values for non-UIWidgets elements
+    aspectRatioX = CVarGetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioX", aspectRatioPresetsX[item_aspectRatio]);
+    aspectRatioY = CVarGetFloat(CVAR_PREFIX_ADVANCED_RESOLUTION ".AspectRatioY", aspectRatioPresetsY[item_aspectRatio]);
+    verticalPixelCount =
+        CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalPixelCount", pixelCountPresets[item_pixelCount]);
+    // Additional settings
+    showHorizontalResField = false;
+    horizontalPixelCount = (verticalPixelCount / aspectRatioY) * aspectRatioX;
+    // Disabling flags
+    disabled_everything = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0);
+    disabled_pixelCount = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0);
+}
+
+bool IsDroppingFrames() {
+    // a rather imprecise way of checking for frame drops.
+    // but it's mostly there to inform the player of large drops.
+    const short targetFPS = OTRGlobals::Instance->GetInterpolationFPS();
+    const float threshold = targetFPS / 20.0f + 4.1f;
+    return ImGui::GetIO().Framerate < targetFPS - threshold;
+}
+
+static RegisterMenuUpdateFunc updateFunc(UpdateResolutionVars, "Settings", "Graphics");
+static RegisterMenuInitFunc initFunc(RegisterResolutionWidgets);
+
+} // namespace SohGui
diff --git a/soh/soh/SohGui/ResolutionEditor.h b/soh/soh/SohGui/ResolutionEditor.h
new file mode 100644
index 0000000000..358598a875
--- /dev/null
+++ b/soh/soh/SohGui/ResolutionEditor.h
@@ -0,0 +1,12 @@
+#ifndef RESOLUTIONEDITOR_H
+#define RESOLUTIONEDITOR_H
+
+#include <libultraship/libultraship.h>
+
+namespace SohGui {
+bool IsDroppingFrames();
+void RegisterResolutionWidgets();
+void UpdateResolutionVars();
+} // namespace SohGui
+
+#endif // RESOLUTIONEDITOR_H
diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp
index 8d7a4ba45c..e9b27eda1c 100644
--- a/soh/soh/SohGui/SohGui.cpp
+++ b/soh/soh/SohGui/SohGui.cpp
@@ -11,262 +11,240 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <libultraship/libultraship.h>
-#include <Fast3D/gfx_pc.h>
 
 #ifdef __APPLE__
-#include "graphic/Fast3D/gfx_metal.h"
+#include "graphic/Fast3D/backends/gfx_metal.h"
 #endif
 
 #ifdef __SWITCH__
 #include <port/switch/SwitchImpl.h>
 #endif
-
-#include "UIWidgets.hpp"
+#include "SohMenu.h"
 #include "include/global.h"
 #include "include/z64audio.h"
 #include "soh/SaveManager.h"
 #include "soh/OTRGlobals.h"
-#include "soh/Enhancements/presets.h"
+#include "soh/Enhancements/Presets/Presets.h"
 #include "soh/resource/type/Skeleton.h"
 #include "libultraship/libultraship.h"
 
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
-#include "soh/Enhancements/resolution-editor/ResolutionEditor.h"
 #include "soh/Enhancements/debugger/MessageViewer.h"
 #include "soh/Notification/Notification.h"
 #include "soh/Enhancements/TimeDisplay/TimeDisplay.h"
 
-bool isBetaQuestEnabled = false;
-
-extern "C" {
-    void enableBetaQuest() { isBetaQuestEnabled = true; }
-    void disableBetaQuest() { isBetaQuestEnabled = false; }
-}
-
-
 namespace SohGui {
 
-    // MARK: - Properties
+// MARK: - Properties
+static const char* bunnyHoodOptions[3] = { "Disabled", "Faster Run & Longer Jump", "Faster Run" };
 
-    static const char* chestSizeAndTextureMatchesContentsOptions[4] = { "Disabled", "Both", "Texture Only", "Size Only" };
-    static const char* bunnyHoodOptions[3] = { "Disabled", "Faster Run & Longer Jump", "Faster Run" };
-    static const char* allPowers[9] = {
-                        "Vanilla (1x)",
-                        "Double (2x)",
-                        "Quadruple (4x)",
-                        "Octuple (8x)",
-                        "Foolish (16x)",
-                        "Ridiculous (32x)",
-                        "Merciless (64x)",
-                        "Pure Torture (128x)",
-                        "OHKO (256x)" };
-    static const char* subPowers[8] = { allPowers[0], allPowers[1], allPowers[2], allPowers[3], allPowers[4], allPowers[5], allPowers[6], allPowers[7] };
-    static const char* subSubPowers[7] = { allPowers[0], allPowers[1], allPowers[2], allPowers[3], allPowers[4], allPowers[5], allPowers[6] };
-    static const char* zFightingOptions[3] = { "Disabled", "Consistent Vanish", "No Vanish" };
-    static const char* bonkDamageValues[8] = {
-        "No Damage",
-        "0.25 Heart",
-        "0.5 Heart",
-        "1 Heart",
-        "2 Hearts",
-        "4 Hearts",
-        "8 Hearts",
-        "OHKO"
-    };
-
-    static const inline std::vector<std::pair<const char*, const char*>> audioBackends = {
+static const inline std::vector<std::pair<const char*, const char*>> audioBackends = {
 #ifdef _WIN32
-            { "wasapi", "Windows Audio Session API" },
+    { "wasapi", "Windows Audio Session API" },
 #endif
 #if defined(__linux)
-            { "pulse", "PulseAudio" },
+    { "pulse", "PulseAudio" },
 #endif
-            { "sdl", "SDL Audio" }
-    };
+    { "sdl", "SDL Audio" }
+};
 
+// MARK: - Helpers
 
-    // MARK: - Helpers
-
-    std::string GetWindowButtonText(const char* text, bool menuOpen) {
-        char buttonText[100] = "";
-        if (menuOpen) {
-            strcat(buttonText, ICON_FA_CHEVRON_RIGHT " ");
-        }
-        strcat(buttonText, text);
-        if (!menuOpen) { strcat(buttonText, "  "); }
-        return buttonText;
+std::string GetWindowButtonText(const char* text, bool menuOpen) {
+    char buttonText[100] = "";
+    if (menuOpen) {
+        strcat(buttonText, ICON_FA_CHEVRON_RIGHT " ");
     }
-
-
-    // MARK: - Delegates
-
-    std::shared_ptr<SohMenuBar> mSohMenuBar;
-
-    std::shared_ptr<Ship::GuiWindow> mConsoleWindow;
-    std::shared_ptr<Ship::GuiWindow> mStatsWindow;
-    std::shared_ptr<Ship::GuiWindow> mGfxDebuggerWindow;
-    std::shared_ptr<Ship::GuiWindow> mInputEditorWindow;
-
-    std::shared_ptr<AudioEditor> mAudioEditorWindow;
-    std::shared_ptr<InputViewer> mInputViewer;
-    std::shared_ptr<InputViewerSettingsWindow> mInputViewerSettings;
-    std::shared_ptr<CosmeticsEditorWindow> mCosmeticsEditorWindow;
-    std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
-    std::shared_ptr<ColViewerWindow> mColViewerWindow;
-    std::shared_ptr<SaveEditorWindow> mSaveEditorWindow;
-    std::shared_ptr<HookDebuggerWindow> mHookDebuggerWindow;
-    std::shared_ptr<DLViewerWindow> mDLViewerWindow;
-    std::shared_ptr<ValueViewerWindow> mValueViewerWindow;
-    std::shared_ptr<MessageViewer> mMessageViewerWindow;
-    std::shared_ptr<GameplayStatsWindow> mGameplayStatsWindow;
-    std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
-    std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
-    std::shared_ptr<EntranceTrackerSettingsWindow> mEntranceTrackerSettingsWindow;
-    std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
-    std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
-    std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
-    std::shared_ptr<TimeSplitWindow> mTimeSplitWindow;
-    std::shared_ptr<PlandomizerWindow> mPlandomizerWindow;
-    std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
-    std::shared_ptr<AdvancedResolutionSettings::AdvancedResolutionSettingsWindow> mAdvancedResolutionSettingsWindow;
-    std::shared_ptr<SohModalWindow> mModalWindow;
-    std::shared_ptr<Notification::Window> mNotificationWindow;
-    std::shared_ptr<TimeDisplayWindow> mTimeDisplayWindow;
-    std::shared_ptr<AboutWindow> mAboutWindow;
-
-    void SetupGuiElements() {
-        auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
-
-        mSohMenuBar = std::make_shared<SohMenuBar>(CVAR_MENU_BAR_OPEN, CVarGetInteger(CVAR_MENU_BAR_OPEN, 0));
-        gui->SetMenuBar(std::reinterpret_pointer_cast<Ship::GuiMenuBar>(mSohMenuBar));
-
-        if (gui->GetMenuBar() && !gui->GetMenuBar()->IsVisible()) {
-#if defined(__SWITCH__) || defined(__WIIU__)
-            Notification::Emit({ .message = "Press - to access enhancements menu", .remainingTime = 10.0f });
-#else
-            Notification::Emit({ .message = "Press F1 to access enhancements menu", .remainingTime = 10.0f });
-#endif
-        }
-
-        mStatsWindow = gui->GetGuiWindow("Stats");
-        if (mStatsWindow == nullptr) {
-            SPDLOG_ERROR("Could not find stats window");
-        }
-
-        mConsoleWindow = gui->GetGuiWindow("Console");
-        if (mConsoleWindow == nullptr) {
-            SPDLOG_ERROR("Could not find console window");
-        }
-
-        mGfxDebuggerWindow = gui->GetGuiWindow("GfxDebuggerWindow");
-        if (mGfxDebuggerWindow == nullptr) {
-            SPDLOG_ERROR("Could not find input GfxDebuggerWindow");
-        }
-
-        mInputEditorWindow = gui->GetGuiWindow("Controller Configuration");
-        if (mInputEditorWindow == nullptr) {
-            SPDLOG_ERROR("Could not find input editor window");
-        }
-
-        mAudioEditorWindow = std::make_shared<AudioEditor>(CVAR_WINDOW("AudioEditor"), "Audio Editor", ImVec2(820, 630));
-        gui->AddGuiWindow(mAudioEditorWindow);
-        mInputViewer = std::make_shared<InputViewer>(CVAR_WINDOW("InputViewer"), "Input Viewer");
-        gui->AddGuiWindow(mInputViewer);
-        mInputViewerSettings = std::make_shared<InputViewerSettingsWindow>(CVAR_WINDOW("InputViewerSettings"), "Input Viewer Settings", ImVec2(500, 525));
-        gui->AddGuiWindow(mInputViewerSettings);
-        mCosmeticsEditorWindow = std::make_shared<CosmeticsEditorWindow>(CVAR_WINDOW("CosmeticsEditor"), "Cosmetics Editor", ImVec2(550, 520));
-        gui->AddGuiWindow(mCosmeticsEditorWindow);
-        mActorViewerWindow = std::make_shared<ActorViewerWindow>(CVAR_WINDOW("ActorViewer"), "Actor Viewer", ImVec2(520, 600));
-        gui->AddGuiWindow(mActorViewerWindow);
-        mColViewerWindow = std::make_shared<ColViewerWindow>(CVAR_WINDOW("CollisionViewer"), "Collision Viewer", ImVec2(520, 600));
-        gui->AddGuiWindow(mColViewerWindow);
-        mSaveEditorWindow = std::make_shared<SaveEditorWindow>(CVAR_WINDOW("SaveEditor"), "Save Editor", ImVec2(520, 600));
-        gui->AddGuiWindow(mSaveEditorWindow);
-        mHookDebuggerWindow = std::make_shared<HookDebuggerWindow>(CVAR_WINDOW("HookDebugger"), "Hook Debugger", ImVec2(1250, 850));
-        gui->AddGuiWindow(mHookDebuggerWindow);
-        mDLViewerWindow = std::make_shared<DLViewerWindow>(CVAR_WINDOW("DLViewer"), "Display List Viewer", ImVec2(520, 600));
-        gui->AddGuiWindow(mDLViewerWindow);
-        mValueViewerWindow = std::make_shared<ValueViewerWindow>(CVAR_WINDOW("ValueViewer"), "Value Viewer", ImVec2(520, 600));
-        gui->AddGuiWindow(mValueViewerWindow);
-        mMessageViewerWindow = std::make_shared<MessageViewer>(CVAR_WINDOW("MessageViewer"), "Message Viewer", ImVec2(520, 600));
-        gui->AddGuiWindow(mMessageViewerWindow);
-        mGameplayStatsWindow = std::make_shared<GameplayStatsWindow>(CVAR_WINDOW("GameplayStats"), "Gameplay Stats", ImVec2(480, 550));
-        gui->AddGuiWindow(mGameplayStatsWindow);
-        mCheckTrackerWindow = std::make_shared<CheckTracker::CheckTrackerWindow>(CVAR_WINDOW("CheckTracker"), "Check Tracker");
-        gui->AddGuiWindow(mCheckTrackerWindow);
-        mCheckTrackerSettingsWindow = std::make_shared<CheckTracker::CheckTrackerSettingsWindow>(CVAR_WINDOW("CheckTrackerSettings"), "Check Tracker Settings", ImVec2(600, 375));
-        gui->AddGuiWindow(mCheckTrackerSettingsWindow);
-        mEntranceTrackerWindow = std::make_shared<EntranceTrackerWindow>(CVAR_WINDOW("EntranceTracker"), "Entrance Tracker");
-        gui->AddGuiWindow(mEntranceTrackerWindow);
-        mEntranceTrackerSettingsWindow = std::make_shared<EntranceTrackerSettingsWindow>(CVAR_WINDOW("EntranceTrackerSettings"), "Entrance Tracker Settings", ImVec2(600, 375));
-        gui->AddGuiWindow(mEntranceTrackerSettingsWindow);
-        mItemTrackerWindow = std::make_shared<ItemTrackerWindow>(CVAR_WINDOW("ItemTracker"), "Item Tracker");
-        gui->AddGuiWindow(mItemTrackerWindow);
-        mItemTrackerSettingsWindow = std::make_shared<ItemTrackerSettingsWindow>(CVAR_WINDOW("ItemTrackerSettings"), "Item Tracker Settings", ImVec2(733, 472));
-        gui->AddGuiWindow(mItemTrackerSettingsWindow);
-        mRandomizerSettingsWindow = std::make_shared<RandomizerSettingsWindow>(CVAR_WINDOW("RandomizerSettings"), "Randomizer Settings", ImVec2(920, 600));
-        gui->AddGuiWindow(mRandomizerSettingsWindow);
-        mTimeSplitWindow = std::make_shared<TimeSplitWindow>(CVAR_WINDOW("TimeSplitEnabled"), "Time Splits", ImVec2(450, 660));
-        gui->AddGuiWindow(mTimeSplitWindow);
-        mPlandomizerWindow = std::make_shared<PlandomizerWindow>(CVAR_WINDOW("PlandomizerWindow"), "Plandomizer Editor", ImVec2(850, 760));
-        gui->AddGuiWindow(mPlandomizerWindow);
-        mAdvancedResolutionSettingsWindow = std::make_shared<AdvancedResolutionSettings::AdvancedResolutionSettingsWindow>(CVAR_WINDOW("AdvancedResolutionEditor"), "Advanced Resolution Settings", ImVec2(497, 599));
-        gui->AddGuiWindow(mAdvancedResolutionSettingsWindow);
-        mModalWindow = std::make_shared<SohModalWindow>(CVAR_WINDOW("ModalWindow"), "Modal Window");
-        gui->AddGuiWindow(mModalWindow);
-        mModalWindow->Show();
-        mNotificationWindow = std::make_shared<Notification::Window>(CVAR_WINDOW("Notifications"), "Notifications Window");
-        gui->AddGuiWindow(mNotificationWindow);
-        mNotificationWindow->Show();
-        mTimeDisplayWindow = std::make_shared<TimeDisplayWindow>(CVAR_WINDOW("TimeDisplayEnabled"), "Additional Timers");
-        gui->AddGuiWindow(mTimeDisplayWindow);
-        mAboutWindow = std::make_shared<AboutWindow>(CVAR_WINDOW("AboutWindow"), "About");
-        gui->AddGuiWindow(mAboutWindow);
-    }
-
-    void Destroy() {
-        auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
-        gui->RemoveAllGuiWindows();
-        
-        mNotificationWindow = nullptr;
-        mModalWindow = nullptr;
-        mAdvancedResolutionSettingsWindow = nullptr;
-        mRandomizerSettingsWindow = nullptr;
-        mItemTrackerWindow = nullptr;
-        mItemTrackerSettingsWindow = nullptr;
-        mEntranceTrackerWindow = nullptr;
-        mEntranceTrackerSettingsWindow = nullptr;
-        mCheckTrackerWindow = nullptr;
-        mCheckTrackerSettingsWindow = nullptr;
-        mGameplayStatsWindow = nullptr;
-        mDLViewerWindow = nullptr;
-        mValueViewerWindow = nullptr;
-        mMessageViewerWindow = nullptr;
-        mSaveEditorWindow = nullptr;
-        mHookDebuggerWindow = nullptr;
-        mColViewerWindow = nullptr;
-        mActorViewerWindow = nullptr;
-        mCosmeticsEditorWindow = nullptr;
-        mAudioEditorWindow = nullptr;
-        mInputEditorWindow = nullptr;
-        mStatsWindow = nullptr;
-        mConsoleWindow = nullptr;
-        mGfxDebuggerWindow = nullptr;
-        mSohMenuBar = nullptr;
-        mInputViewer = nullptr;
-        mInputViewerSettings = nullptr;
-        mTimeSplitWindow = nullptr;
-        mPlandomizerWindow = nullptr;
-        mTimeDisplayWindow = nullptr;
-        mAboutWindow = nullptr;
-    }
-
-    void RegisterPopup(std::string title, std::string message, std::string button1, std::string button2, std::function<void()> button1callback, std::function<void()> button2callback) {
-        mModalWindow->RegisterPopup(title, message, button1, button2, button1callback, button2callback);
-    }
-
-    void ShowRandomizerSettingsMenu() {
-        mRandomizerSettingsWindow->Show();
+    strcat(buttonText, text);
+    if (!menuOpen) {
+        strcat(buttonText, "  ");
     }
+    return buttonText;
 }
+
+// MARK: - Delegates
+
+std::shared_ptr<SohMenuBar> mSohMenuBar;
+
+std::shared_ptr<Ship::GuiWindow> mConsoleWindow;
+std::shared_ptr<SohStatsWindow> mStatsWindow;
+std::shared_ptr<Ship::GuiWindow> mGfxDebuggerWindow;
+std::shared_ptr<Ship::GuiWindow> mInputEditorWindow;
+
+std::shared_ptr<SohMenu> mSohMenu;
+std::shared_ptr<AudioEditor> mAudioEditorWindow;
+std::shared_ptr<InputViewer> mInputViewer;
+std::shared_ptr<InputViewerSettingsWindow> mInputViewerSettings;
+std::shared_ptr<CosmeticsEditorWindow> mCosmeticsEditorWindow;
+std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
+std::shared_ptr<ColViewerWindow> mColViewerWindow;
+std::shared_ptr<SaveEditorWindow> mSaveEditorWindow;
+std::shared_ptr<HookDebuggerWindow> mHookDebuggerWindow;
+std::shared_ptr<DLViewerWindow> mDLViewerWindow;
+std::shared_ptr<ValueViewerWindow> mValueViewerWindow;
+std::shared_ptr<MessageViewer> mMessageViewerWindow;
+std::shared_ptr<GameplayStatsWindow> mGameplayStatsWindow;
+std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
+std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
+std::shared_ptr<EntranceTrackerSettingsWindow> mEntranceTrackerSettingsWindow;
+std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
+std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
+std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
+std::shared_ptr<TimeSplitWindow> mTimeSplitWindow;
+std::shared_ptr<PlandomizerWindow> mPlandomizerWindow;
+std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
+std::shared_ptr<SohModalWindow> mModalWindow;
+std::shared_ptr<Notification::Window> mNotificationWindow;
+std::shared_ptr<TimeDisplayWindow> mTimeDisplayWindow;
+
+UIWidgets::Colors GetMenuThemeColor() {
+    return mSohMenu->GetMenuThemeColor();
+}
+
+void SetupGuiElements() {
+    auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
+
+    /*mSohMenuBar = std::make_shared<SohMenuBar>(CVAR_MENU_BAR_OPEN, CVarGetInteger(CVAR_MENU_BAR_OPEN, 0));
+    gui->SetMenuBar(std::reinterpret_pointer_cast<Ship::GuiMenuBar>(mSohMenuBar));
+
+    if (!gui->GetMenuBar() && !CVarGetInteger("gSettings.DisableMenuShortcutNotify", 0)) {
+#if defined(__SWITCH__) || defined(__WIIU__)
+        gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press - to access enhancements menu");
+#else
+        gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F1 to access enhancements menu");
+        gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F2 to enable the mouse cursor");
+#endif
+    }*/
+
+    mSohMenu = std::make_shared<SohMenu>(CVAR_WINDOW("Menu"), "Port Menu");
+    gui->SetMenu(mSohMenu);
+
+    mConsoleWindow = std::make_shared<SohConsoleWindow>(CVAR_WINDOW("SohConsole"), "Console##SoH", ImVec2(820, 630));
+    gui->AddGuiWindow(mConsoleWindow);
+
+    mGfxDebuggerWindow =
+        std::make_shared<SohGfxDebuggerWindow>(CVAR_WINDOW("SohGfxDebugger"), "GfxDebugger##SoH", ImVec2(820, 630));
+    gui->AddGuiWindow(mGfxDebuggerWindow);
+
+    mStatsWindow = std::make_shared<SohStatsWindow>(CVAR_WINDOW("SohStats"), "Stats##Soh", ImVec2(400, 100));
+    gui->AddGuiWindow(mStatsWindow);
+
+    mInputEditorWindow = gui->GetGuiWindow("Controller Configuration");
+    if (mInputEditorWindow == nullptr) {
+        SPDLOG_ERROR("Could not find input editor window");
+    }
+
+    mAudioEditorWindow = std::make_shared<AudioEditor>(CVAR_WINDOW("AudioEditor"), "Audio Editor", ImVec2(820, 630));
+    gui->AddGuiWindow(mAudioEditorWindow);
+    mInputViewer = std::make_shared<InputViewer>(CVAR_WINDOW("InputViewer"), "Input Viewer");
+    gui->AddGuiWindow(mInputViewer);
+    mInputViewerSettings = std::make_shared<InputViewerSettingsWindow>(CVAR_WINDOW("InputViewerSettings"),
+                                                                       "Input Viewer Settings", ImVec2(500, 525));
+    gui->AddGuiWindow(mInputViewerSettings);
+    mCosmeticsEditorWindow =
+        std::make_shared<CosmeticsEditorWindow>(CVAR_WINDOW("CosmeticsEditor"), "Cosmetics Editor", ImVec2(550, 520));
+    gui->AddGuiWindow(mCosmeticsEditorWindow);
+    mActorViewerWindow =
+        std::make_shared<ActorViewerWindow>(CVAR_WINDOW("ActorViewer"), "Actor Viewer", ImVec2(520, 600));
+    gui->AddGuiWindow(mActorViewerWindow);
+    mColViewerWindow =
+        std::make_shared<ColViewerWindow>(CVAR_WINDOW("CollisionViewer"), "Collision Viewer", ImVec2(520, 600));
+    gui->AddGuiWindow(mColViewerWindow);
+    mSaveEditorWindow = std::make_shared<SaveEditorWindow>(CVAR_WINDOW("SaveEditor"), "Save Editor", ImVec2(520, 600));
+    gui->AddGuiWindow(mSaveEditorWindow);
+    mHookDebuggerWindow =
+        std::make_shared<HookDebuggerWindow>(CVAR_WINDOW("HookDebugger"), "Hook Debugger", ImVec2(1250, 850));
+    gui->AddGuiWindow(mHookDebuggerWindow);
+    mDLViewerWindow =
+        std::make_shared<DLViewerWindow>(CVAR_WINDOW("DisplayListViewer"), "Display List Viewer", ImVec2(520, 600));
+    gui->AddGuiWindow(mDLViewerWindow);
+    mValueViewerWindow =
+        std::make_shared<ValueViewerWindow>(CVAR_WINDOW("ValueViewer"), "Value Viewer", ImVec2(520, 600));
+    gui->AddGuiWindow(mValueViewerWindow);
+    mMessageViewerWindow =
+        std::make_shared<MessageViewer>(CVAR_WINDOW("MessageViewer"), "Message Viewer", ImVec2(520, 600));
+    gui->AddGuiWindow(mMessageViewerWindow);
+    mGameplayStatsWindow =
+        std::make_shared<GameplayStatsWindow>(CVAR_WINDOW("GameplayStats"), "Gameplay Stats", ImVec2(480, 550));
+    gui->AddGuiWindow(mGameplayStatsWindow);
+    mCheckTrackerWindow = std::make_shared<CheckTracker::CheckTrackerWindow>(CVAR_WINDOW("CheckTracker"),
+                                                                             "Check Tracker", ImVec2(400, 540));
+    gui->AddGuiWindow(mCheckTrackerWindow);
+    mCheckTrackerSettingsWindow = std::make_shared<CheckTracker::CheckTrackerSettingsWindow>(
+        CVAR_WINDOW("CheckTrackerSettings"), "Check Tracker Settings", ImVec2(600, 375));
+    gui->AddGuiWindow(mCheckTrackerSettingsWindow);
+    mEntranceTrackerWindow =
+        std::make_shared<EntranceTrackerWindow>(CVAR_WINDOW("EntranceTracker"), "Entrance Tracker", ImVec2(500, 750));
+    gui->AddGuiWindow(mEntranceTrackerWindow);
+    mEntranceTrackerSettingsWindow = std::make_shared<EntranceTrackerSettingsWindow>(
+        CVAR_WINDOW("EntranceTrackerSettings"), "Entrance Tracker Settings", ImVec2(600, 375));
+    gui->AddGuiWindow(mEntranceTrackerSettingsWindow);
+    mItemTrackerWindow =
+        std::make_shared<ItemTrackerWindow>(CVAR_WINDOW("ItemTracker"), "Item Tracker", ImVec2(350, 600));
+    gui->AddGuiWindow(mItemTrackerWindow);
+    mItemTrackerSettingsWindow = std::make_shared<ItemTrackerSettingsWindow>(CVAR_WINDOW("ItemTrackerSettings"),
+                                                                             "Item Tracker Settings", ImVec2(733, 472));
+    gui->AddGuiWindow(mItemTrackerSettingsWindow);
+    mRandomizerSettingsWindow = std::make_shared<RandomizerSettingsWindow>(CVAR_WINDOW("RandomizerSettings"),
+                                                                           "Randomizer Settings", ImVec2(920, 600));
+    gui->AddGuiWindow(mRandomizerSettingsWindow);
+    mTimeSplitWindow = std::make_shared<TimeSplitWindow>(CVAR_WINDOW("TimeSplits"), "Time Splits", ImVec2(450, 660));
+    gui->AddGuiWindow(mTimeSplitWindow);
+    mPlandomizerWindow =
+        std::make_shared<PlandomizerWindow>(CVAR_WINDOW("PlandomizerEditor"), "Plandomizer Editor", ImVec2(850, 760));
+    gui->AddGuiWindow(mPlandomizerWindow);
+    mModalWindow = std::make_shared<SohModalWindow>(CVAR_WINDOW("ModalWindow"), "Modal Window");
+    gui->AddGuiWindow(mModalWindow);
+    mModalWindow->Show();
+    mNotificationWindow = std::make_shared<Notification::Window>(CVAR_WINDOW("Notifications"), "Notifications Window");
+    gui->AddGuiWindow(mNotificationWindow);
+    mNotificationWindow->Show();
+    mTimeDisplayWindow = std::make_shared<TimeDisplayWindow>(CVAR_WINDOW("TimeDisplayEnabled"), "Additional Timers");
+    gui->AddGuiWindow(mTimeDisplayWindow);
+}
+
+void Destroy() {
+    auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
+    gui->RemoveAllGuiWindows();
+
+    mNotificationWindow = nullptr;
+    mModalWindow = nullptr;
+    mRandomizerSettingsWindow = nullptr;
+    mItemTrackerWindow = nullptr;
+    mItemTrackerSettingsWindow = nullptr;
+    mEntranceTrackerWindow = nullptr;
+    mEntranceTrackerSettingsWindow = nullptr;
+    mCheckTrackerWindow = nullptr;
+    mCheckTrackerSettingsWindow = nullptr;
+    mGameplayStatsWindow = nullptr;
+    mDLViewerWindow = nullptr;
+    mValueViewerWindow = nullptr;
+    mMessageViewerWindow = nullptr;
+    mSaveEditorWindow = nullptr;
+    mHookDebuggerWindow = nullptr;
+    mColViewerWindow = nullptr;
+    mActorViewerWindow = nullptr;
+    mCosmeticsEditorWindow = nullptr;
+    mAudioEditorWindow = nullptr;
+    mInputEditorWindow = nullptr;
+    mStatsWindow = nullptr;
+    mConsoleWindow = nullptr;
+    mGfxDebuggerWindow = nullptr;
+    mSohMenuBar = nullptr;
+    mInputViewer = nullptr;
+    mInputViewerSettings = nullptr;
+    mTimeSplitWindow = nullptr;
+    mPlandomizerWindow = nullptr;
+    mTimeDisplayWindow = nullptr;
+}
+
+void RegisterPopup(std::string title, std::string message, std::string button1, std::string button2,
+                   std::function<void()> button1callback, std::function<void()> button2callback) {
+    mModalWindow->RegisterPopup(title, message, button1, button2, button1callback, button2callback);
+}
+
+void ShowRandomizerSettingsMenu() {
+    mRandomizerSettingsWindow->Show();
+}
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohGui.hpp b/soh/soh/SohGui/SohGui.hpp
index 4544c13e9e..d9b7bb6441 100644
--- a/soh/soh/SohGui/SohGui.hpp
+++ b/soh/soh/SohGui/SohGui.hpp
@@ -18,6 +18,9 @@
 #include "soh/Enhancements/debugger/debugSaveEditor.h"
 #include "soh/Enhancements/debugger/hookDebugger.h"
 #include "soh/Enhancements/debugger/dlViewer.h"
+#include "soh/Enhancements/debugger/SohConsoleWindow.h"
+#include "soh/Enhancements/debugger/SohGfxDebuggerWindow.h"
+#include "soh/Enhancements/debugger/SohStatsWindow.h"
 #include "soh/Enhancements/debugger/valueViewer.h"
 #include "soh/Enhancements/gameplaystatswindow.h"
 #include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
@@ -26,25 +29,19 @@
 #include "soh/Enhancements/randomizer/randomizer_settings_window.h"
 #include "soh/Enhancements/timesplits/TimeSplits.h"
 #include "soh/Enhancements/randomizer/Plandomizer.h"
-#include "soh/AboutWindow.h"
 #include "SohModals.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void enableBetaQuest();
-    void disableBetaQuest();
-#ifdef __cplusplus
-}
-#endif
-
 namespace SohGui {
-    void SetupHooks();
-    void SetupGuiElements();
-    void Draw();
-    void Destroy();
-    void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
-    void ShowRandomizerSettingsMenu();
-}
+void SetupHooks();
+void SetupGuiElements();
+void Draw();
+void Destroy();
+void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "",
+                   std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
+void ShowRandomizerSettingsMenu();
+UIWidgets::Colors GetMenuThemeColor();
+} // namespace SohGui
+
+#define THEME_COLOR SohGui::GetMenuThemeColor()
 
 #endif /* SohGui_hpp */
diff --git a/soh/soh/SohGui/SohMenu.cpp b/soh/soh/SohGui/SohMenu.cpp
new file mode 100644
index 0000000000..a71fd1cad6
--- /dev/null
+++ b/soh/soh/SohGui/SohMenu.cpp
@@ -0,0 +1,178 @@
+#include "SohMenu.h"
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/controls/SohInputEditorWindow.h"
+#include "window/gui/GuiMenuBar.h"
+#include "window/gui/GuiElement.h"
+#include <variant>
+#include "StringHelper.h"
+#include <spdlog/fmt/fmt.h>
+#include <tuple>
+
+extern std::unordered_map<s16, const char*> warpPointSceneList;
+
+namespace SohGui {
+extern std::shared_ptr<SohMenu> mSohMenu;
+
+using namespace UIWidgets;
+
+void SohMenu::AddSidebarEntry(std::string sectionName, std::string sidebarName, uint32_t columnCount) {
+    assert(!sectionName.empty());
+    assert(!sidebarName.empty());
+    menuEntries.at(sectionName).sidebars.emplace(sidebarName, SidebarEntry{ .columnCount = columnCount });
+    menuEntries.at(sectionName).sidebarOrder.push_back(sidebarName);
+}
+
+WidgetInfo& SohMenu::AddWidget(WidgetPath& pathInfo, std::string widgetName, WidgetType widgetType) {
+    assert(!widgetName.empty());                        // Must be unique
+    assert(menuEntries.contains(pathInfo.sectionName)); // Section/header must already exist
+    assert(menuEntries.at(pathInfo.sectionName).sidebars.contains(pathInfo.sidebarName)); // Sidebar must already exist
+    std::unordered_map<std::string, SidebarEntry>& sidebar = menuEntries.at(pathInfo.sectionName).sidebars;
+    uint8_t column = pathInfo.column;
+    if (sidebar.contains(pathInfo.sidebarName)) {
+        while (sidebar.at(pathInfo.sidebarName).columnWidgets.size() < column + 1) {
+            sidebar.at(pathInfo.sidebarName).columnWidgets.push_back({});
+        }
+    }
+    SidebarEntry& entry = sidebar.at(pathInfo.sidebarName);
+    entry.columnWidgets.at(column).push_back({ .name = widgetName, .type = widgetType });
+    WidgetInfo& widget = entry.columnWidgets.at(column).back();
+    switch (widgetType) {
+        case WIDGET_CHECKBOX:
+        case WIDGET_CVAR_CHECKBOX:
+            widget.options = std::make_shared<CheckboxOptions>();
+            break;
+        case WIDGET_SLIDER_FLOAT:
+        case WIDGET_CVAR_SLIDER_FLOAT:
+            widget.options = std::make_shared<FloatSliderOptions>();
+            break;
+        case WIDGET_SLIDER_INT:
+        case WIDGET_CVAR_SLIDER_INT:
+            widget.options = std::make_shared<IntSliderOptions>();
+            break;
+        case WIDGET_COMBOBOX:
+        case WIDGET_CVAR_COMBOBOX:
+        case WIDGET_AUDIO_BACKEND:
+        case WIDGET_VIDEO_BACKEND:
+            widget.options = std::make_shared<ComboboxOptions>();
+            break;
+        case WIDGET_BUTTON:
+            widget.options = std::make_shared<ButtonOptions>();
+            break;
+        case WIDGET_WINDOW_BUTTON:
+            widget.options = std::make_shared<WindowButtonOptions>();
+            break;
+        case WIDGET_COLOR_24:
+        case WIDGET_COLOR_32:
+            break;
+        case WIDGET_SEPARATOR_TEXT:
+        case WIDGET_TEXT:
+            widget.options = std::make_shared<TextOptions>();
+            break;
+        case WIDGET_SEARCH:
+        case WIDGET_SEPARATOR:
+        default:
+            widget.options = std::make_shared<WidgetOptions>();
+    }
+    return widget;
+}
+
+SohMenu::SohMenu(const std::string& consoleVariable, const std::string& name)
+    : Menu(consoleVariable, name, 0, UIWidgets::Colors::LightBlue) {
+}
+
+void SohMenu::InitElement() {
+    Ship::Menu::InitElement();
+    AddMenuSettings();
+    AddMenuEnhancements();
+    AddMenuRandomizer();
+#ifdef ENABLE_REMOTE_CONTROL
+    AddMenuNetwork();
+#endif
+    AddMenuDevTools();
+
+    if (CVarGetInteger(CVAR_SETTING("Menu.SidebarSearch"), 0)) {
+        InsertSidebarSearch();
+    }
+
+    for (auto& initFunc : MenuInit::GetInitFuncs()) {
+        initFunc();
+    }
+
+    disabledMap = {
+        { DISABLE_FOR_NO_VSYNC,
+          { [](disabledInfo& info) -> bool {
+               return !Ship::Context::GetInstance()->GetWindow()->CanDisableVerticalSync();
+           },
+            "Disabling VSync not supported" } },
+        { DISABLE_FOR_NO_WINDOWED_FULLSCREEN,
+          { [](disabledInfo& info) -> bool {
+               return !Ship::Context::GetInstance()->GetWindow()->SupportsWindowedFullscreen();
+           },
+            "Windowed Fullscreen not supported" } },
+        { DISABLE_FOR_NO_MULTI_VIEWPORT,
+          { [](disabledInfo& info) -> bool {
+               return !Ship::Context::GetInstance()->GetWindow()->GetGui()->SupportsViewports();
+           },
+            "Multi-viewports not supported" } },
+        { DISABLE_FOR_NOT_DIRECTX,
+          { [](disabledInfo& info) -> bool {
+               return Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() !=
+                      Ship::WindowBackend::FAST3D_DXGI_DX11;
+           },
+            "Available Only on DirectX" } },
+        { DISABLE_FOR_DIRECTX,
+          { [](disabledInfo& info) -> bool {
+               return Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() ==
+                      Ship::WindowBackend::FAST3D_DXGI_DX11;
+           },
+            "Not Available on DirectX" } },
+        { DISABLE_FOR_MATCH_REFRESH_RATE_ON,
+          { [](disabledInfo& info) -> bool { return CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0); },
+            "Match Refresh Rate is Enabled" } },
+        { DISABLE_FOR_ADVANCED_RESOLUTION_ON,
+          { [](disabledInfo& info) -> bool { return CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0); },
+            "Advanced Resolution Enabled" } },
+        { DISABLE_FOR_VERTICAL_RES_TOGGLE_ON,
+          { [](disabledInfo& info) -> bool {
+               return CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0);
+           },
+            "Vertical Resolution Toggle Enabled" } },
+        { DISABLE_FOR_LOW_RES_MODE_ON,
+          { [](disabledInfo& info) -> bool { return CVarGetInteger(CVAR_LOW_RES_MODE, 0); }, "N64 Mode Enabled" } },
+        { DISABLE_FOR_NULL_PLAY_STATE,
+          { [](disabledInfo& info) -> bool { return gPlayState == NULL; }, "Save Not Loaded" } },
+        { DISABLE_FOR_DEBUG_MODE_OFF,
+          { [](disabledInfo& info) -> bool { return !CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0); },
+            "Debug Mode is Disabled" } },
+        { DISABLE_FOR_FRAME_ADVANCE_OFF,
+          { [](disabledInfo& info) -> bool { return !(gPlayState != nullptr && gPlayState->frameAdvCtx.enabled); },
+            "Frame Advance is Disabled" } },
+        { DISABLE_FOR_ADVANCED_RESOLUTION_OFF,
+          { [](disabledInfo& info) -> bool { return !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0); },
+            "Advanced Resolution is Disabled" } },
+        { DISABLE_FOR_VERTICAL_RESOLUTION_OFF,
+          { [](disabledInfo& info) -> bool {
+               return !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0);
+           },
+            "Vertical Resolution Toggle is Off" } },
+        { DISABLE_FOR_BOOT_TO_DEBUG_WARP_SCREEN_ON,
+          { [](disabledInfo& info) -> bool {
+               return CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) &&
+                      CVarGetInteger(CVAR_DEVELOPER_TOOLS("BootToDebugWarpScreen"), 0);
+           },
+            "\"Boot To Debug Warp Screen\" Enabled (see Dev Tools -> General)" } },
+    };
+}
+
+void SohMenu::UpdateElement() {
+    Ship::Menu::UpdateElement();
+}
+
+void SohMenu::Draw() {
+    Ship::Menu::Draw();
+}
+
+void SohMenu::DrawElement() {
+    Ship::Menu::DrawElement();
+}
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohMenu.h b/soh/soh/SohGui/SohMenu.h
new file mode 100644
index 0000000000..c3c3f4fd1a
--- /dev/null
+++ b/soh/soh/SohGui/SohMenu.h
@@ -0,0 +1,220 @@
+#ifndef SOHMENU_H
+#define SOHMENU_H
+
+#include <libultraship/libultraship.h>
+#include "UIWidgets.hpp"
+#include "Menu.h"
+#include "graphic/Fast3D/backends/gfx_rendering_api.h"
+#include "soh/cvar_prefixes.h"
+#include "soh/Enhancements/enhancementTypes.h"
+#include "soh/Enhancements/Presets/Presets.h"
+
+extern "C" {
+#include "z64.h"
+#include "functions.h"
+#include "variables.h"
+#include "macros.h"
+extern PlayState* gPlayState;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void enableBetaQuest();
+void disableBetaQuest();
+#ifdef __cplusplus
+}
+#endif
+
+namespace SohGui {
+
+static std::unordered_map<int32_t, const char*> languages = {
+    { LANGUAGE_ENG, "English" },
+    { LANGUAGE_GER, "German" },
+    { LANGUAGE_FRA, "French" },
+    { LANGUAGE_JPN, "Japanese" },
+};
+
+static const std::unordered_map<int32_t, const char*> menuThemeOptions = {
+    { UIWidgets::Colors::Red, "Red" },
+    { UIWidgets::Colors::DarkRed, "Dark Red" },
+    { UIWidgets::Colors::Orange, "Orange" },
+    { UIWidgets::Colors::Green, "Green" },
+    { UIWidgets::Colors::DarkGreen, "Dark Green" },
+    { UIWidgets::Colors::LightBlue, "Light Blue" },
+    { UIWidgets::Colors::Blue, "Blue" },
+    { UIWidgets::Colors::DarkBlue, "Dark Blue" },
+    { UIWidgets::Colors::Indigo, "Indigo" },
+    { UIWidgets::Colors::Violet, "Violet" },
+    { UIWidgets::Colors::Purple, "Purple" },
+    { UIWidgets::Colors::Brown, "Brown" },
+    { UIWidgets::Colors::Gray, "Gray" },
+    { UIWidgets::Colors::DarkGray, "Dark Gray" },
+};
+
+static const std::unordered_map<int32_t, const char*> textureFilteringMap = {
+    { Fast::FILTER_THREE_POINT, "Three-Point" },
+    { Fast::FILTER_LINEAR, "Linear" },
+    { Fast::FILTER_NONE, "None" },
+};
+
+static const std::unordered_map<int32_t, const char*> logLevels = {
+    { DEBUG_LOG_TRACE, "Trace" }, { DEBUG_LOG_DEBUG, "Debug" }, { DEBUG_LOG_INFO, "Info" },
+    { DEBUG_LOG_WARN, "Warn" },   { DEBUG_LOG_ERROR, "Error" }, { DEBUG_LOG_CRITICAL, "Critical" },
+    { DEBUG_LOG_OFF, "Off" },
+};
+
+static const std::unordered_map<int32_t, const char*> notificationPosition = {
+    { 0, "Top Left" }, { 1, "Top Right" }, { 2, "Bottom Left" }, { 3, "Bottom Right" }, { 4, "Hidden" },
+};
+
+static const std::unordered_map<int32_t, const char*> dekuStickCheat = {
+    { DEKU_STICK_NORMAL, "Normal" },
+    { DEKU_STICK_UNBREAKABLE, "Unbreakable" },
+    { DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, "Unbreakable + Always on Fire" },
+};
+
+static const std::unordered_map<int32_t, const char*> skipForcedDialogOptions = {
+    { FORCED_DIALOG_SKIP_NONE, "None" },
+    { FORCED_DIALOG_SKIP_NAVI, "Navi" },
+    { FORCED_DIALOG_SKIP_NPC, "NPCs" },
+    { FORCED_DIALOG_SKIP_ALL, "All" },
+};
+
+static const std::unordered_map<int32_t, const char*> skipGetItemAnimationOptions = {
+    { SGIA_DISABLED, "Disabled" },
+    { SGIA_JUNK, "Junk Items" },
+    { SGIA_ALL, "All Items" },
+};
+
+static const std::unordered_map<int32_t, const char*> chestStyleMatchesContentsOptions = {
+    { CSMC_DISABLED, "Disabled" },
+    { CSMC_BOTH, "Both" },
+    { CSMC_TEXTURE, "Texture Only" },
+    { CSMC_SIZE, "Size Only" },
+};
+
+static const std::unordered_map<int32_t, const char*> timeTravelOptions = {
+    { TIME_TRAVEL_DISABLED, "Disabled" },
+    { TIME_TRAVEL_OOT, "Ocarina of Time" },
+    { TIME_TRAVEL_ANY, "Any Ocarina" },
+};
+
+static const std::unordered_map<int32_t, const char*> sleepingWaterfallOptions = {
+    { WATERFALL_ALWAYS, "Always" },
+    { WATERFALL_ONCE, "Once" },
+    { WATERFALL_NEVER, "Never" },
+};
+
+static const std::unordered_map<int32_t, const char*> allPowers = {
+    { DAMAGE_VANILLA, "Vanilla (1x)" },      { DAMAGE_DOUBLE, "Double (2x)" },
+    { DAMAGE_QUADRUPLE, "Quadruple (4x)" },  { DAMAGE_OCTUPLE, "Octuple (8x)" },
+    { DAMAGE_FOOLISH, "Foolish (16x)" },     { DAMAGE_RIDICULOUS, "Ridiculous (32x)" },
+    { DAMAGE_MERCILESS, "Merciless (64x)" }, { DAMAGE_TORTURE, "Pure Torture (128x)" },
+    { DAMAGE_OHKO, "OHKO (256x)" },
+};
+
+static const std::unordered_map<int32_t, const char*> subPowers = {
+    { DAMAGE_VANILLA, "Vanilla (1x)" },      { DAMAGE_DOUBLE, "Double (2x)" },
+    { DAMAGE_QUADRUPLE, "Quadruple (4x)" },  { DAMAGE_OCTUPLE, "Octuple (8x)" },
+    { DAMAGE_FOOLISH, "Foolish (16x)" },     { DAMAGE_RIDICULOUS, "Ridiculous (32x)" },
+    { DAMAGE_MERCILESS, "Merciless (64x)" }, { DAMAGE_TORTURE, "Pure Torture (128x)" },
+};
+
+static const std::unordered_map<int32_t, const char*> subSubPowers = {
+    { DAMAGE_VANILLA, "Vanilla (1x)" },      { DAMAGE_DOUBLE, "Double (2x)" },
+    { DAMAGE_QUADRUPLE, "Quadruple (4x)" },  { DAMAGE_OCTUPLE, "Octuple (8x)" },
+    { DAMAGE_FOOLISH, "Foolish (16x)" },     { DAMAGE_RIDICULOUS, "Ridiculous (32x)" },
+    { DAMAGE_MERCILESS, "Merciless (64x)" },
+};
+
+static const std::unordered_map<int32_t, const char*> bonkDamageValues = {
+    { BONK_DAMAGE_NONE, "No Damage" },        { BONK_DAMAGE_QUARTER_HEART, "0.25 Hearts" },
+    { BONK_DAMAGE_HALF_HEART, "0.5 Hearts" }, { BONK_DAMAGE_1_HEART, "1 Heart" },
+    { BONK_DAMAGE_2_HEARTS, "2 Hearts" },     { BONK_DAMAGE_4_HEARTS, "4 Hearts" },
+    { BONK_DAMAGE_8_HEARTS, "8 Hearts" },     { BONK_DAMAGE_OHKO, "OHKO" },
+};
+
+static const std::unordered_map<int32_t, const char*> dampeDropRates = {
+    { DAMPE_NONE, "None" },
+    { DAMPE_NORMAL, "Vanilla" },
+    { DAMPE_JALAPENO, "Jalapeño" },
+    { DAMPE_CHIPOTLE, "Serrano" },
+    { DAMPE_SCOTCH_BONNET, "Habanero" },
+    { DAMPE_GHOST_PEPPER, "Ghost Pepper" },
+    { DAMPE_INFERNO, "Dampe's Inferno" },
+};
+
+static const std::unordered_map<int32_t, const char*> cursorAnywhereValues = {
+    { PAUSE_ANY_CURSOR_RANDO_ONLY, "Only in Rando" },
+    { PAUSE_ANY_CURSOR_ALWAYS_ON, "Always" },
+    { PAUSE_ANY_CURSOR_ALWAYS_OFF, "Never" },
+};
+
+static const std::unordered_map<int32_t, const char*> swordToggleModes = {
+    { SWORD_TOGGLE_NONE, "None" },
+    { SWORD_TOGGLE_CHILD, "Child Toggle" },
+    { SWORD_TOGGLE_BOTH_AGES, "Both Ages" },
+};
+
+static const std::unordered_map<int32_t, const char*> zFightingOptions = {
+    { ZFIGHT_FIX_DISABLED, "Disabled" },
+    { ZFIGHT_FIX_CONSISTENT_VANISH, "Consistent Vanish" },
+    { ZFIGHT_FIX_NO_VANISH, "No Vanish" },
+};
+
+static const std::unordered_map<int32_t, const char*> mirroredWorldModes = {
+    { MIRRORED_WORLD_OFF, "Disabled" },
+    { MIRRORED_WORLD_ALWAYS, "Always" },
+    { MIRRORED_WORLD_RANDOM, "Random" },
+    { MIRRORED_WORLD_RANDOM_SEEDED, "Random (Seeded)" },
+    { MIRRORED_WORLD_DUNGEONS_ALL, "Dungeons" },
+    { MIRRORED_WORLD_DUNGEONS_VANILLA, "Dungeons (Vanilla)" },
+    { MIRRORED_WORLD_DUNGEONS_MQ, "Dungeons (MQ)" },
+    { MIRRORED_WORLD_DUNGEONS_RANDOM, "Dungeons Random" },
+    { MIRRORED_WORLD_DUNGEONS_RANDOM_SEEDED, "Dungeons Random (Seeded)" },
+};
+
+static const std::unordered_map<int32_t, const char*> enemyRandomizerModes = {
+    { ENEMY_RANDOMIZER_OFF, "Disabled" },
+    { ENEMY_RANDOMIZER_RANDOM, "Random" },
+    { ENEMY_RANDOMIZER_RANDOM_SEEDED, "Random (Seeded)" },
+};
+
+static const std::unordered_map<int32_t, const char*> debugSaveFileModes = {
+    { 0, "Off" },
+    { 1, "Vanilla" },
+    { 2, "Maxed" },
+};
+
+static const std::unordered_map<int32_t, const char*> bootSequenceLabels = {
+    { BOOTSEQUENCE_DEFAULT, "Default" },
+    { BOOTSEQUENCE_AUTHENTIC, "Authentic" },
+    { BOOTSEQUENCE_FILESELECT, "File Select" },
+};
+
+class SohMenu : public Ship::Menu {
+  public:
+    SohMenu(const std::string& consoleVariable, const std::string& name);
+
+    void InitElement() override;
+    void DrawElement() override;
+    void UpdateElement() override;
+    void Draw() override;
+
+    void AddSidebarEntry(std::string sectionName, std::string sidbarName, uint32_t columnCount);
+    WidgetInfo& AddWidget(WidgetPath& pathInfo, std::string widgetName, WidgetType widgetType);
+    void AddMenuSettings();
+    void AddMenuEnhancements();
+    void AddMenuDevTools();
+    void AddMenuRandomizer();
+    void AddMenuNetwork();
+    static void UpdateLanguageMap(std::unordered_map<int32_t, const char*>& languageMap);
+
+  private:
+    char mGitCommitHashTruncated[8];
+    bool mIsTaggedVersion;
+};
+} // namespace SohGui
+
+#endif // SOHMENU_H
diff --git a/soh/soh/SohGui/SohMenuBar.cpp b/soh/soh/SohGui/SohMenuBar.cpp
index 5fd7324fbc..418d02eb58 100644
--- a/soh/soh/SohGui/SohMenuBar.cpp
+++ b/soh/soh/SohGui/SohMenuBar.cpp
@@ -5,7 +5,7 @@
 #include <libultraship/libultraship.h>
 #include "UIWidgets.hpp"
 #include "include/z64audio.h"
-#include "graphic/Fast3D/gfx_rendering_api.h"
+#include "graphic/Fast3D/backends/gfx_rendering_api.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
 #include "z64.h"
@@ -14,7 +14,7 @@
 #include "functions.h"
 #include "variables.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/presets.h"
+#include "soh/Enhancements/Presets/Presets.h"
 #include "soh/Enhancements/mods.h"
 #include "soh/Notification/Notification.h"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
@@ -23,7 +23,6 @@
 #include "soh/Network/Sail/Sail.h"
 #endif
 
-
 #include "soh/Enhancements/audio/AudioEditor.h"
 #include "soh/Enhancements/controls/InputViewer.h"
 #include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
@@ -39,12 +38,10 @@
 #include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer_item_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer_settings_window.h"
-#include "soh/Enhancements/resolution-editor/ResolutionEditor.h"
 #include "soh/Enhancements/enemyrandomizer.h"
 #include "soh/Enhancements/timesplits/TimeSplits.h"
 #include "soh/Enhancements/randomizer/Plandomizer.h"
 #include "soh/Enhancements/TimeDisplay/TimeDisplay.h"
-#include "soh/AboutWindow.h"
 
 // FA icons are kind of wonky, if they worked how I expected them to the "+ 2.0f" wouldn't be needed, but
 // they don't work how I expect them to so I added that because it looked good when I eyeballed it
@@ -60,7 +57,9 @@ std::string GetWindowButtonText(const char* text, bool menuOpen) {
         strcat(buttonText, ICON_FA_CHEVRON_RIGHT " ");
     }
     strcat(buttonText, text);
-    if (!menuOpen) { strcat(buttonText, "  "); }
+    if (!menuOpen) {
+        strcat(buttonText, "  ");
+    }
     return buttonText;
 }
 
@@ -70,65 +69,14 @@ static std::unordered_map<Ship::WindowBackend, const char*> windowBackendNames =
     { Ship::WindowBackend::FAST3D_SDL_METAL, "Metal" },
 };
 
-static const char* imguiScaleOptions[4] = { "Small", "Normal", "Large", "X-Large" };
-
-    static const char* filters[3] = {
+static const char* filters[3] = {
 #ifdef __WIIU__
-            "",
+    "",
 #else
-            "Three-Point",
+    "Three-Point",
 #endif
-            "Linear", "None"
-    };
-
-    static const char* chestStyleMatchesContentsOptions[4] = { "Disabled", "Both", "Texture Only", "Size Only" };
-    static const char* skipGetItemAnimationOptions[3] = { "Disabled", "Junk Items", "All Items" };
-    static const char* skipForcedDialogOptions[4] = { "None", "Navi Only", "NPCs Only", "All" };
-    static const char* sleepingWaterfallOptions[3] = { "Always", "Once", "Never" };
-    static const char* bunnyHoodOptions[3] = { "Disabled", "Faster Run & Longer Jump", "Faster Run" };
-    static const char* mirroredWorldModes[9] = {
-        "Disabled",           "Always",        "Random",          "Random (Seeded)",          "Dungeons",
-        "Dungeons (Vanilla)", "Dungeons (MQ)", "Dungeons Random", "Dungeons Random (Seeded)",
-    };
-    static const char* enemyRandomizerModes[3] = { "Disabled", "Random", "Random (Seeded)" };
-    static const char* allPowers[9] = {
-                        "Vanilla (1x)",
-                        "Double (2x)",
-                        "Quadruple (4x)",
-                        "Octuple (8x)",
-                        "Foolish (16x)",
-                        "Ridiculous (32x)",
-                        "Merciless (64x)",
-                        "Pure Torture (128x)",
-                        "OHKO (256x)" };
-    static const char* subPowers[8] = { allPowers[0], allPowers[1], allPowers[2], allPowers[3], allPowers[4], allPowers[5], allPowers[6], allPowers[7] };
-    static const char* subSubPowers[7] = { allPowers[0], allPowers[1], allPowers[2], allPowers[3], allPowers[4], allPowers[5], allPowers[6] };
-    static const char* zFightingOptions[3] = { "Disabled", "Consistent Vanish", "No Vanish" };
-    static const char* bootSequenceLabels[3] = { "Default", "Authentic", "File Select" };
-    static const char* DebugSaveFileModes[3] = { "Off", "Vanilla", "Maxed" };
-    static const char* DekuStickCheat[3] = { "Normal", "Unbreakable", "Unbreakable + Always on Fire" };
-    static const char* bonkDamageValues[8] = {
-        "No Damage",
-        "0.25 Heart",
-        "0.5 Heart",
-        "1 Heart",
-        "2 Hearts",
-        "4 Hearts",
-        "8 Hearts",
-        "OHKO"
-    };
-    static const char* timeTravelOptions[3] = { "Disabled", "Ocarina of Time", "Any Ocarina" };
-    static const char* swordToggleModes[3] = { "Disabled", "Child Toggle", "Both Ages (May lead to unintended behaviour)"};
-    static const char* itemCountMessageCVars[3] = {
-        CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"),
-        CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"),
-        CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"),
-    };
-    static const char* itemCountMessageOptions[ARRAY_COUNT(itemCountMessageCVars)] = {
-        "Gold Skulltula Tokens",
-        "Pieces of Heart",
-        "Heart Containers",
-    };
+    "Linear", "None"
+};
 
 extern "C" SaveContext gSaveContext;
 
@@ -137,2058 +85,22 @@ namespace SohGui {
 std::unordered_map<Ship::WindowBackend, const char*> availableWindowBackendsMap;
 Ship::WindowBackend configWindowBackend;
 
-void UpdateWindowBackendObjects() {
-    Ship::WindowBackend runningWindowBackend = Ship::Context::GetInstance()->GetWindow()->GetWindowBackend();
-    int32_t configWindowBackendId = Ship::Context::GetInstance()->GetConfig()->GetInt("Window.Backend.Id", -1);
-    if (Ship::Context::GetInstance()->GetWindow()->IsAvailableWindowBackend(configWindowBackendId)) {
-        configWindowBackend = static_cast<Ship::WindowBackend>(configWindowBackendId);
-    } else {
-        configWindowBackend = runningWindowBackend;
-    }
-
-    auto availableWindowBackends = Ship::Context::GetInstance()->GetWindow()->GetAvailableWindowBackends();
-    for (auto& backend : *availableWindowBackends) {
-        availableWindowBackendsMap[backend] = windowBackendNames[backend];
-    }
-}
-
-void DrawMenuBarIcon() {
-    static bool gameIconLoaded = false;
-    if (!gameIconLoaded) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Game_Icon", "textures/icons/gIcon.png");
-        gameIconLoaded = true;
-    }
-
-    if (Ship::Context::GetInstance()->GetWindow()->GetGui()->HasTextureByName("Game_Icon")) {
-#ifdef __SWITCH__
-        ImVec2 iconSize = ImVec2(20.0f, 20.0f);
-        float posScale = 1.0f;
-#elif defined(__WIIU__)
-        ImVec2 iconSize = ImVec2(16.0f * 2, 16.0f * 2);
-        float posScale = 2.0f;
-#else
-        ImVec2 iconSize = ImVec2(16.0f, 16.0f);
-        float posScale = 1.0f;
-#endif
-        ImGui::SetCursorPos(ImVec2(5, 2.5f) * posScale);
-        ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Game_Icon"), iconSize);
-        ImGui::SameLine();
-        ImGui::SetCursorPos(ImVec2(25, 0) * posScale);
-    }
-}
-
-extern std::shared_ptr<AboutWindow> mAboutWindow;
-
-void DrawShipMenu() {
-    if (ImGui::BeginMenu("Ship")) {
-        if (mAboutWindow) {
-            if (ImGui::MenuItem("About...")) {
-                mAboutWindow->Show();
-            }
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::MenuItem("Hide Menu Bar",
-#if !defined(__SWITCH__) && !defined(__WIIU__)
-         "F1"
-#else
-         "[-]"
-#endif
-        )) {
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetMenuBar()->ToggleVisibility();
-        }
-        UIWidgets::Spacer(0);
-#if !defined(__SWITCH__) && !defined(__WIIU__)
-        if (ImGui::MenuItem("Toggle Fullscreen", "F11")) {
-            Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen();
-        }
-        UIWidgets::Spacer(0);
-#endif
-        if (ImGui::MenuItem("Reset",
-#ifdef __APPLE__
-                            "Command-R"
-#elif !defined(__SWITCH__) && !defined(__WIIU__)
-                            "Ctrl+R"
-#else
-                            ""
-#endif
-                            )) {
-            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch("reset");
-        }
-#if !defined(__SWITCH__) && !defined(__WIIU__)
-        UIWidgets::Spacer(0);
-        if (ImGui::MenuItem("Open App Files Folder")) {
-            std::string filesPath = Ship::Context::GetInstance()->GetAppDirectoryPath();
-            SDL_OpenURL(std::string("file:///" + std::filesystem::absolute(filesPath).string()).c_str());
-        }
-        UIWidgets::Spacer(0);
-
-        if (ImGui::MenuItem("Quit")) {
-            Ship::Context::GetInstance()->GetWindow()->Close();
-        }
-#endif
-        ImGui::EndMenu();
-    }
-}
-
-extern std::shared_ptr<Ship::GuiWindow> mInputEditorWindow;
-extern std::shared_ptr<Ship::GuiWindow> mGfxDebuggerWindow;
-extern std::shared_ptr<InputViewer> mInputViewer;
-extern std::shared_ptr<InputViewerSettingsWindow> mInputViewerSettings;
-extern std::shared_ptr<AdvancedResolutionSettings::AdvancedResolutionSettingsWindow> mAdvancedResolutionSettingsWindow;
-
 void DrawSettingsMenu() {
-    if (ImGui::BeginMenu("Settings"))
-    {
-        if (ImGui::BeginMenu("Audio")) {
-            UIWidgets::PaddedEnhancementSliderInt("Master Volume: %d %%", "##Master_Vol", CVAR_SETTING("Volume.Master"), 0, 100, "", 100, true, false, true);
-            if (UIWidgets::PaddedEnhancementSliderInt("Main Music Volume: %d %%", "##Main_Music_Vol", CVAR_SETTING("Volume.MainMusic"), 0, 100, "", 100, true, false, true)) {
-                Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN, ((float)CVarGetInteger(CVAR_SETTING("Volume.MainMusic"), 100) / 100.0f));
-            }
-            if (UIWidgets::PaddedEnhancementSliderInt("Sub Music Volume: %d %%", "##Sub_Music_Vol", CVAR_SETTING("Volume.SubMusic"), 0, 100, "", 100, true, false, true)) {
-                Audio_SetGameVolume(SEQ_PLAYER_BGM_SUB, ((float)CVarGetInteger(CVAR_SETTING("Volume.SubMusic"), 100) / 100.0f));
-            }
-            if (UIWidgets::PaddedEnhancementSliderInt("Fanfare Volume: %d %%", "##Fanfare_Vol", CVAR_SETTING("Volume.Fanfare"), 0, 100, "", 100, true, false, true)) {
-                Audio_SetGameVolume(SEQ_PLAYER_FANFARE, ((float)CVarGetInteger(CVAR_SETTING("Volume.Fanfare"), 100) / 100.0f));
-            }
-            if (UIWidgets::PaddedEnhancementSliderInt("Sound Effects Volume: %d %%", "##Sound_Effect_Vol", CVAR_SETTING("Volume.SFX"), 0, 100, "", 100, true, false, true)) {
-                Audio_SetGameVolume(SEQ_PLAYER_SFX, ((float)CVarGetInteger(CVAR_SETTING("Volume.SFX"), 100) / 100.0f));
-            }
-
-            static std::unordered_map<Ship::AudioBackend, const char*> audioBackendNames = {
-                { Ship::AudioBackend::WASAPI, "Windows Audio Session API" },
-                { Ship::AudioBackend::SDL, "SDL" }
-            };
-
-            ImGui::Text("Audio API (Needs reload)");
-            auto currentAudioBackend = Ship::Context::GetInstance()->GetAudio()->GetCurrentAudioBackend();
-
-            if (Ship::Context::GetInstance()->GetAudio()->GetAvailableAudioBackends()->size() <= 1) {
-                UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-            }
-            if (ImGui::BeginCombo("##AApi", audioBackendNames[currentAudioBackend])) {
-                for (uint8_t i = 0; i < Ship::Context::GetInstance()->GetAudio()->GetAvailableAudioBackends()->size(); i++) {
-                    auto backend = Ship::Context::GetInstance()->GetAudio()->GetAvailableAudioBackends()->data()[i];
-                    if (ImGui::Selectable(audioBackendNames[backend], backend == currentAudioBackend)) {
-                        Ship::Context::GetInstance()->GetAudio()->SetCurrentAudioBackend(backend);
-                    }
-                }
-                ImGui::EndCombo();
-            }
-            if (Ship::Context::GetInstance()->GetAudio()->GetAvailableAudioBackends()->size() <= 1) {
-                UIWidgets::ReEnableComponent("");
-            }
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Controller")) {
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2 (12.0f, 6.0f));
-            ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.0f));
-            ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-            ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-            if (mInputEditorWindow) {
-                if (ImGui::Button(GetWindowButtonText("Controller Mapping", CVarGetInteger(CVAR_WINDOW("ControllerConfiguration"), 0)).c_str(), ImVec2 (-1.0f, 0.0f))) {
-                    mInputEditorWindow->ToggleVisibility();
-                }
-            }
-            UIWidgets::PaddedSeparator();
-            ImGui::PopStyleColor(1);
-            ImGui::PopStyleVar(3);
-        #ifndef __SWITCH__
-            UIWidgets::EnhancementCheckbox("Menubar Controller Navigation", CVAR_IMGUI_CONTROLLER_NAV);
-            UIWidgets::Tooltip("Allows controller navigation of the SOH menu bar (Settings, Enhancements,...)\nCAUTION: This will disable game inputs while the menubar is visible.\n\nD-pad to move between items, A to select, and X to grab focus on the menu bar");
-            UIWidgets::PaddedSeparator();
-        #endif
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2 (12.0f, 6.0f));
-            ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.0f));
-            ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-            ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-            if (mInputViewer) {
-                if (ImGui::Button(GetWindowButtonText("Input Viewer", CVarGetInteger(CVAR_WINDOW("InputViewer"), 0)).c_str(), ImVec2 (-1.0f, 0.0f))) {
-                    mInputViewer->ToggleVisibility();
-                }
-            }
-            if (mInputViewerSettings) {
-                if (ImGui::Button(GetWindowButtonText("Input Viewer Settings", CVarGetInteger(CVAR_WINDOW("InputViewerSettings"), 0)).c_str(), ImVec2 (-1.0f, 0.0f))) {
-                    mInputViewerSettings->ToggleVisibility();
-                }
-            }
-            ImGui::PopStyleColor(1);
-            ImGui::PopStyleVar(3);
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Graphics")) {
-        #ifndef __APPLE__
-            const bool disabled_resolutionSlider = CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0) &&
-                                                   CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0);
-            if (UIWidgets::EnhancementSliderFloat("Internal Resolution: %.1f %%", "##IMul", CVAR_INTERNAL_RESOLUTION, 0.5f,
-                                                  2.0f, "", 1.0f, true, true, disabled_resolutionSlider)) {
-                Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1));
-            }
-            UIWidgets::Tooltip("Resolution scale. Multiplies output resolution by this value, on each axis relative to window size.\n"
-                               "Lower values may improve performance.\n"
-                               "Values above 100% can be used for super-sampling, as an intensive but highly effective form of anti-aliasing.\n\n"
-                               "Default: 100%");
-            
-            if (mAdvancedResolutionSettingsWindow) {
-                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-                ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.0f));
-                ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-                ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-                UIWidgets::Spacer(0);
-                if (ImGui::Button(GetWindowButtonText("Advanced Resolution", CVarGetInteger(CVAR_WINDOW("AdvancedResolutionEditor"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                    mAdvancedResolutionSettingsWindow->ToggleVisibility();
-                }
-                ImGui::PopStyleColor(1);
-                ImGui::PopStyleVar(3);
-            }
-        #else
-            // macOS: Internal resolution is currently disabled in libultraship.
-            ImGui::BeginGroup();
-            ImGui::Text("Internal Resolution: 100.0%%");
-            UIWidgets::Spacer(0);
-            ImGui::Text(" " ICON_FA_INFO_CIRCLE " Not available on this system.");
-            UIWidgets::Spacer(0);
-            ImGui::EndGroup();
-        #endif
-
-        #ifndef __WIIU__
-            if (UIWidgets::PaddedEnhancementSliderInt(
-                    (CVarGetInteger(CVAR_MSAA_VALUE, 1) == 1) ? "Anti-aliasing (MSAA): Off" : "Anti-aliasing (MSAA): %d",
-                    "##IMSAA", CVAR_MSAA_VALUE, 1, 8, "", 1, true, true, false)) {
-                Ship::Context::GetInstance()->GetWindow()->SetMsaaLevel(CVarGetInteger(CVAR_MSAA_VALUE, 1));
-            }
-            UIWidgets::Tooltip("Activates MSAA (multi-sample anti-aliasing) from 2x up to 8x, to smooth the edges of rendered geometry.\n"
-                               "Higher sample count will result in smoother edges on models, but may reduce performance.\n\n"
-                               "Recommended: 2x or 4x");
-        #endif
-
-            UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-            { // FPS Slider
-                const int minFps = 20;
-                static int maxFps;
-                if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
-                    maxFps = 360;
-                } else {
-                    maxFps = Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
-                }
-                int currentFps = fmax(fmin(OTRGlobals::Instance->GetInterpolationFPS(), maxFps), minFps);
-            #ifdef __WIIU__
-                UIWidgets::Spacer(0);
-                // only support divisors of 60 on the Wii U
-                if (currentFps > 60) {
-                    currentFps = 60;
-                } else {
-                    currentFps = 60 / (60 / currentFps);
-                }
-
-                int fpsSlider = 1;
-                if (currentFps == 20) {
-                    ImGui::Text("FPS: Original (20)");
-                } else {
-                    ImGui::Text("FPS: %d", currentFps);
-                    if (currentFps == 30) {
-                        fpsSlider = 2;
-                    } else { // currentFps == 60
-                        fpsSlider = 3;
-                    }
-                }
-                if (CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0)) {
-                    UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-                }
-
-                if (ImGui::Button(" - ##WiiUFPS")) {
-                    fpsSlider--;
-                }
-                ImGui::SameLine();
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-
-                UIWidgets::Spacer(0);
-
-                ImGui::PushItemWidth(std::min((ImGui::GetContentRegionAvail().x - 60.0f), 260.0f));
-                ImGui::SliderInt("##WiiUFPSSlider", &fpsSlider, 1, 3, "", ImGuiSliderFlags_AlwaysClamp);
-                ImGui::PopItemWidth();
-
-                ImGui::SameLine();
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-                if (ImGui::Button(" + ##WiiUFPS")) {
-                    fpsSlider++;
-                }
-
-                if (CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0)) {
-                    UIWidgets::ReEnableComponent("");
-                }
-                if (fpsSlider > 3) {
-                    fpsSlider = 3;
-                } else if (fpsSlider < 1) {
-                    fpsSlider = 1;
-                }
-
-                if (fpsSlider == 1) {
-                    currentFps = 20;
-                } else if (fpsSlider == 2) {
-                    currentFps = 30;
-                } else if (fpsSlider == 3) {
-                    currentFps = 60;
-                }
-                CVarSetInteger(CVAR_SETTING("InterpolationFPS"), currentFps);
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            #else
-                bool matchingRefreshRate =
-                    CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0) && Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() != Ship::WindowBackend::FAST3D_DXGI_DX11;
-                UIWidgets::PaddedEnhancementSliderInt(
-                    (currentFps == 20) ? "Frame Rate: Original (20 fps)" : "Frame Rate: %d fps",
-                    "##FPSInterpolation", CVAR_SETTING("InterpolationFPS"), minFps, maxFps, "", 20, true, true, false, matchingRefreshRate);
-            #endif
-                if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
-                    UIWidgets::Tooltip(
-                        "Uses Matrix Interpolation to create extra frames, resulting in smoother graphics.\n"
-                        "This is purely visual and does not impact game logic, execution of glitches etc.\n"
-                        "Higher frame rate settings may impact CPU performance."
-                        "\n\n " ICON_FA_INFO_CIRCLE 
-                        " There is no need to set this above your monitor's refresh rate. Doing so will waste resources and may give a worse result.");
-                } else {
-                    UIWidgets::Tooltip(
-                        "Uses Matrix Interpolation to create extra frames, resulting in smoother graphics.\n"
-                        "This is purely visual and does not impact game logic, execution of glitches etc.\n"
-                        "Higher frame rate settings may impact CPU performance.");
-                }
-            } // END FPS Slider
-
-            if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
-                UIWidgets::Spacer(0);
-                if (ImGui::Button("Match Frame Rate to Refresh Rate")) {
-                    int hz = Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
-                    if (hz >= 20 && hz <= 360) {
-                        CVarSetInteger(CVAR_SETTING("InterpolationFPS"), hz);
-                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                    }
-                }
-            } else {
-                UIWidgets::PaddedEnhancementCheckbox("Match Frame Rate to Refresh Rate", CVAR_SETTING("MatchRefreshRate"), true, false);
-            }
-            UIWidgets::Tooltip("Matches interpolation value to the game window's current refresh rate.");
-
-            UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-
-            ImGui::Text("ImGui Menu Scale");
-            ImGui::SameLine();
-            ImGui::TextColored({ 0.85f, 0.35f, 0.0f, 1.0f }, "(Experimental)");
-            if (UIWidgets::EnhancementCombobox(CVAR_SETTING("ImGuiScale"), imguiScaleOptions, 1)) {
-                OTRGlobals::Instance->ScaleImGui();
-            }
-            UIWidgets::Tooltip("Changes the scaling of the ImGui menu elements.");
-
-            UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-
-            ImGui::Text("Renderer API (Needs reload)");
-
-            if (availableWindowBackendsMap.size() <= 1) {
-                UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-            }
-            if (ImGui::BeginCombo("##RApi", availableWindowBackendsMap[configWindowBackend])) {
-                for (auto backend : availableWindowBackendsMap) {
-                    if (ImGui::Selectable(backend.second, backend.first == configWindowBackend)) {
-                        Ship::Context::GetInstance()->GetConfig()->SetInt("Window.Backend.Id", static_cast<int>(backend.first));
-                        Ship::Context::GetInstance()->GetConfig()->SetString("Window.Backend.Name", backend.second);
-                        Ship::Context::GetInstance()->GetConfig()->Save();
-                        UpdateWindowBackendObjects();
-                    }
-                }
-                ImGui::EndCombo();
-            }
-            if (availableWindowBackendsMap.size() <= 1) {
-                UIWidgets::ReEnableComponent("");
-            }
-
-            if (Ship::Context::GetInstance()->GetWindow()->CanDisableVerticalSync()) {
-                UIWidgets::PaddedEnhancementCheckbox("Enable Vsync", CVAR_VSYNC_ENABLED, true, false);
-                UIWidgets::Tooltip("Activate vertical sync, to prevent screen tearing.");
-            }
-
-            if (Ship::Context::GetInstance()->GetWindow()->SupportsWindowedFullscreen()) {
-                UIWidgets::PaddedEnhancementCheckbox("Windowed fullscreen", CVAR_SDL_WINDOWED_FULLSCREEN, true, false);
-            }
-
-            if (Ship::Context::GetInstance()->GetWindow()->GetGui()->SupportsViewports()) {
-                UIWidgets::PaddedEnhancementCheckbox("Allow multi-windows (Needs reload)", CVAR_ENABLE_MULTI_VIEWPORTS, true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-                UIWidgets::Tooltip("Allows windows to be able to be dragged off of the main game window. Requires a reload to take effect.");
-            }
-
-            // If more filters are added to LUS, make sure to add them to the filters list here
-            ImGui::Text("Texture Filtering (Needs reload)");
-            UIWidgets::EnhancementCombobox(CVAR_TEXTURE_FILTER, filters, FILTER_THREE_POINT);
-            UIWidgets::Tooltip("Texture filtering, aka texture smoothing. Requires a reload to take effect.\n\n"
-                               "Three-Point: Replicates real N64 texture filtering.\n"
-                               "Bilinear: If Three-Point causes poor performance, try this.\n"
-                               "Nearest: Disables texture smoothing. (Not recommended)");
-
-            UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
-
-            // Draw LUS settings menu (such as Overlays Text Font)
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->DrawSettings();
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Languages")) {
-            UIWidgets::PaddedEnhancementCheckbox("Translate Title Screen", CVAR_SETTING("TitleScreenTranslation"));
-            if (UIWidgets::EnhancementRadioButton("English", CVAR_SETTING("Languages"), LANGUAGE_ENG)) {
-                GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSetGameLanguage>();
-            }
-            if (UIWidgets::EnhancementRadioButton("German", CVAR_SETTING("Languages"), LANGUAGE_GER)) {
-                GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSetGameLanguage>();
-            }
-            if (UIWidgets::EnhancementRadioButton("French", CVAR_SETTING("Languages"), LANGUAGE_FRA)) {
-                GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSetGameLanguage>();
-            }
-            ImGui::EndMenu();
-        }
-        
-        UIWidgets::Spacer(0);
-        
-        if (ImGui::BeginMenu("Accessibility")) {
-        #if defined(_WIN32) || defined(__APPLE__)
-            UIWidgets::PaddedEnhancementCheckbox("Text to Speech", CVAR_SETTING("A11yTTS"));
-            UIWidgets::Tooltip("Enables text to speech for in game dialog");
-        #endif
-            UIWidgets::PaddedEnhancementCheckbox("Disable Idle Camera Re-Centering", CVAR_SETTING("A11yDisableIdleCam"));
-            UIWidgets::Tooltip("Disables the automatic re-centering of the camera when idle.");
-            
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Notifications")) {
-            static const char* notificationPosition[] = {
-                "Top Left",
-                "Top Right",
-                "Bottom Left",
-                "Bottom Right",
-                "Hidden",
-            };
-
-            ImGui::Text("Position");
-            UIWidgets::EnhancementCombobox(CVAR_SETTING("Notifications.Position"), notificationPosition, 0);
-            UIWidgets::EnhancementSliderFloat("Duration: %.1f seconds", "##NotificationDuration", CVAR_SETTING("Notifications.Duration"), 3.0f, 30.0f, "", 10.0f, false, true, false);
-            UIWidgets::EnhancementSliderFloat("BG Opacity: %.1f %%", "##NotificaitonBgOpacity", CVAR_SETTING("Notifications.BgOpacity"), 0.0f, 1.0f, "", 0.5f, true, true, false);
-            UIWidgets::EnhancementSliderFloat("Size: %.1f", "##NotificaitonSize", CVAR_SETTING("Notifications.Size"), 1.0f, 20.0f, "", 1.8f, false, true, false);
-
-            UIWidgets::Spacer(0);
-
-            if (ImGui::Button("Test Notification", ImVec2(-1.0f, 0.0f))) {
-                Notification::Emit({
-                    .message = (gPlayState != NULL ? SohUtils::GetSceneName(gPlayState->sceneNum) : "Hyrule") + " looks beautiful today!",
-                });
-            }
-
-            ImGui::EndMenu();
-        }
-
-        ImGui::EndMenu();
-    }
-}
-
-extern std::shared_ptr<AudioEditor> mAudioEditorWindow;
-extern std::shared_ptr<CosmeticsEditorWindow> mCosmeticsEditorWindow;
-extern std::shared_ptr<GameplayStatsWindow> mGameplayStatsWindow;
-extern std::shared_ptr<TimeSplitWindow> mTimeSplitWindow;
-extern std::shared_ptr<TimeDisplayWindow> mTimeDisplayWindow;
-
-void DrawEnhancementsMenu() {
-    if (ImGui::BeginMenu("Enhancements"))
-    {
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
-
-        DrawPresetSelector(PRESET_TYPE_ENHANCEMENTS);
-
-        UIWidgets::PaddedSeparator();
-
-        if (ImGui::BeginMenu("Gameplay"))
-        {
-            if (ImGui::BeginMenu("Time Savers"))
-            {
-                ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 8.0f);
-                ImGui::BeginTable("##timeSaversMenu", 2, ImGuiTableFlags_SizingFixedFit);
-                ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-                ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-                ImGui::TableNextColumn();
-                UIWidgets::Spacer(0);
-                ImGui::Text("Speed-ups:");
-                UIWidgets::PaddedSeparator();
-                bool allSkipsChecked =
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO);
-                bool someSkipsChecked =
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO) ||
-                    CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), IS_RANDO);
-
-                ImGuiContext* g = ImGui::GetCurrentContext();
-                ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
-                if (!allSkipsChecked && someSkipsChecked) g->CurrentItemFlags |= ImGuiItemFlags_MixedValue;
-                if (ImGui::Checkbox("All", &allSkipsChecked)) {
-                    int32_t newValue = allSkipsChecked ? 1 : 0;
-
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), newValue);
-                    CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), newValue);
-
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                }
-                g->CurrentItemFlags = backup_item_flags;
-                UIWidgets::PaddedEnhancementCheckbox("Skip Intro", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Entrance Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Story Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Song Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Boss Introductions", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Quick Boss Deaths", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip One Point Cutscenes (Chests, Door Unlocks, etc)", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Owl Interactions", CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Misc Interactions", CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Disable Title Card", CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, IS_RANDO);
-                UIWidgets::PaddedEnhancementCheckbox("Exclude Glitch-Aiding Cutscenes", CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, 0);
-                UIWidgets::Tooltip("Don't skip cutscenes that are associated with useful glitches, currently this is only the Fire Temple Darunia CS, Forest Temple Poe Sisters CS and the Box Skip One Point in Jabu");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Child Stealth", CVAR_ENHANCEMENT("TimeSavers.SkipChildStealth"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
-                UIWidgets::Tooltip("The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards.");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Tower Escape", CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"), false, false, false, "", UIWidgets::CheckboxGraphics::Cross, false);
-                UIWidgets::Tooltip("Skip the tower escape sequence between Ganondorf and Ganon.");
-
-                UIWidgets::PaddedText("Skip Get Item Animations", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), skipGetItemAnimationOptions, SGIA_DISABLED);
-                if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_DISABLED) != SGIA_DISABLED) {
-                    UIWidgets::EnhancementSliderFloat("Item Scale: %f", "##ItemScale", CVAR_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"), 5.0f, 15.0f, "", 10.0f, false);
-                    UIWidgets::Tooltip("The size of the item when it is picked up");
-                }
-
-                UIWidgets::PaddedText("Skip Forced Dialog", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("TimeSavers.SkipForcedDialog"), skipForcedDialogOptions, FORCED_DIALOG_SKIP_NONE);
-                UIWidgets::Tooltip("Prevent forced conversations with Navi or other NPCs");
-
-                UIWidgets::PaddedEnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", CVAR_ENHANCEMENT("TextSpeed"), 1, 5, "", 1, true, false, true);
-                UIWidgets::PaddedEnhancementCheckbox("Skip Text", CVAR_ENHANCEMENT("SkipText"), false, true);
-                UIWidgets::Tooltip("Holding down B skips text");
-                UIWidgets::PaddedEnhancementSliderInt("Slow Text Speed: %dx", "##SLOWTEXTSPEED", CVAR_ENHANCEMENT("SlowTextSpeed"), 1, 5, "", 1, true, false, true);
-                UIWidgets::Tooltip("Changes the speed of sections of text that normally are paced slower than the text surrounding it.");
-                if (ImGui::Button("Match Normal Text")) {
-                    CVarSetInteger(CVAR_ENHANCEMENT("SlowTextSpeed"), CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1));
-                }
-                UIWidgets::Tooltip("Makes the speed of slow text match the normal text speed above.");
-                UIWidgets::PaddedEnhancementSliderFloat("King Zora Speed: %.2fx", "##MWEEPSPEED", CVAR_ENHANCEMENT("MweepSpeed"), 0.1f, 5.0f, "", 1.0f, false, true, false, true);
-                UIWidgets::PaddedEnhancementSliderInt("Vine/Ladder Climb speed +%d", "##CLIMBSPEED", CVAR_ENHANCEMENT("ClimbSpeed"), 0, 12, "", 0, true, false, true);
-                UIWidgets::PaddedEnhancementSliderInt("Block pushing speed +%d", "##BLOCKSPEED", CVAR_ENHANCEMENT("FasterBlockPush"), 0, 5, "", 0, true, false, true);
-                UIWidgets::PaddedEnhancementSliderInt("Crawl speed %dx", "##CRAWLSPEED", CVAR_ENHANCEMENT("CrawlSpeed"), 1, 4, "", 1, true, false, true);
-                UIWidgets::PaddedEnhancementCheckbox("Faster Heavy Block Lift", CVAR_ENHANCEMENT("FasterHeavyBlockLift"), false, false);
-                UIWidgets::Tooltip("Speeds up lifting silver rocks and obelisks");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Pickup Messages", CVAR_ENHANCEMENT("FastDrops"), true, false);
-                UIWidgets::Tooltip("Skip pickup messages for new consumable items and bottle swipes");
-                UIWidgets::PaddedEnhancementCheckbox("Fast Ocarina Playback", CVAR_ENHANCEMENT("FastOcarinaPlayback"), true, false);
-                UIWidgets::Tooltip("Skip the part where the Ocarina playback is called when you play a song");
-                UIWidgets::PaddedEnhancementCheckbox("Skip Magic Arrow Equip Animation", CVAR_ENHANCEMENT("SkipArrowAnimation"), true, false);
-                UIWidgets::PaddedEnhancementCheckbox("Skip save confirmation", CVAR_ENHANCEMENT("SkipSaveConfirmation"), true, false);
-                UIWidgets::Tooltip("Skip the \"Game saved.\" confirmation screen");
-                UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", CVAR_ENHANCEMENT("FastFarores"), true, false);
-                UIWidgets::Tooltip("Greatly decreases cast time of Farore's Wind magic spell.");
-
-                ImGui::TableNextColumn();
-                UIWidgets::Spacer(0);
-                ImGui::Text("Changes:");
-                UIWidgets::PaddedSeparator();
-
-                UIWidgets::PaddedEnhancementSliderInt("Biggoron Forge Time: %d days", "##FORGETIME", CVAR_ENHANCEMENT("ForgeTime"), 0, 3, "", 3, true, false, true);
-                UIWidgets::Tooltip("Allows you to change the number of days it takes for Biggoron to forge the Biggoron Sword");
-                UIWidgets::PaddedEnhancementCheckbox("Remember Save Location", CVAR_ENHANCEMENT("RememberSaveLocation"), false, false);
-                UIWidgets::Tooltip("When loading a save, places Link at the last entrance he went through.\n"
-                        "This doesn't work if the save was made in grottos/fairy fountains or dungeons.");
-                UIWidgets::PaddedEnhancementCheckbox("Navi Timer Resets", CVAR_ENHANCEMENT("ResetNaviTimer"), true, false);
-                UIWidgets::Tooltip("Resets the Navi timer on scene change. If you have already talked to her, she will try and talk to you again, instead of needing a save warp or death. ");
-                UIWidgets::PaddedEnhancementCheckbox("No Skulltula Freeze", CVAR_ENHANCEMENT("SkulltulaFreeze"), true, false);
-                UIWidgets::Tooltip("Stops the game from freezing the player when picking up Gold Skulltulas");
-                UIWidgets::PaddedEnhancementCheckbox("Nighttime GS Always Spawn", CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), true, false);
-                UIWidgets::Tooltip("Nighttime Skulltulas will spawn during both day and night.");
-                UIWidgets::PaddedEnhancementCheckbox("Dampe Appears All Night", CVAR_ENHANCEMENT("DampeAllNight"), true, false);
-                UIWidgets::Tooltip("Makes Dampe appear anytime during the night, not just his usual working hours.");
-                UIWidgets::PaddedEnhancementCheckbox("Fast Chests", CVAR_ENHANCEMENT("FastChests"), true, false);
-                UIWidgets::Tooltip("Kick open every chest");
-                UIWidgets::PaddedText("Chest size & texture matches contents", true, false);
-                if (UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), chestStyleMatchesContentsOptions, CSMC_DISABLED)) {
-                    if (CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED) == CSMC_DISABLED) {
-                        CVarSetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0);
-                    }
-                }
-                UIWidgets::Tooltip(
-                    "Chest sizes and textures are changed to help identify the item inside.\n"
-                    " - Major items: Large gold chests\n"
-                    " - Lesser items: Large brown chests\n"
-                    " - Junk items: Small brown chests\n"
-                    " - Small keys: Small silver chest\n"
-                    " - Boss keys: Vanilla size and texture\n"
-                    " - Skulltula Tokens: Small skulltula chest\n"
-                    "\n"
-                    "NOTE: Textures will not apply if you are using a mod pack with a custom chest model."
-                );
-                if (CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED) != CSMC_DISABLED) {
-                    UIWidgets::PaddedEnhancementCheckbox("Chests of Agony", CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), true, false);
-                    UIWidgets::Tooltip("Only change the size/texture of chests if you have the Stone of Agony.");
-                }
-                UIWidgets::PaddedEnhancementCheckbox("Ask to Equip New Items", CVAR_ENHANCEMENT("AskToEquip"), true, false);
-                UIWidgets::Tooltip("Adds a prompt to equip newly-obtained swords, shields and tunics");
-                UIWidgets::PaddedEnhancementCheckbox("Better Owl", CVAR_ENHANCEMENT("BetterOwl"), true, false);
-                UIWidgets::Tooltip("The default response to Kaepora Gaebora is always that you understood what he said");
-                UIWidgets::PaddedEnhancementCheckbox("Exit Market at Night", CVAR_ENHANCEMENT("MarketSneak"), true, false);
-                UIWidgets::Tooltip("Allows exiting Hyrule Castle Market Town to Hyrule Field at night by speaking to the guard next to the gate.");
-                bool randoLockedOverworldDoors = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOCK_OVERWORLD_DOORS);
-                UIWidgets::PaddedEnhancementCheckbox("Shops and Games Always Open", CVAR_ENHANCEMENT("OpenAllHours"), true, false, randoLockedOverworldDoors, 
-                    "This is not compatible with the Locked Overworld Doors Randomizer option", UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::Tooltip("Shops and minigames are open both day and night. Requires scene reload to take effect.");
-                UIWidgets::PaddedEnhancementCheckbox("Link as default file name", CVAR_ENHANCEMENT("LinkDefaultName"), true, false);
-                UIWidgets::Tooltip("Allows you to have \"Link\" as a premade file name");
-				UIWidgets::PaddedEnhancementCheckbox("Quit Fishing At Door", CVAR_ENHANCEMENT("QuitFishingAtDoor"), true, false);
-                UIWidgets::Tooltip("Fisherman asks if you want to quit at the door when you still have the rod");
-                UIWidgets::PaddedText("Time Travel with the Song of Time", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("TimeTravel"), timeTravelOptions, 0);
-                UIWidgets::Tooltip("Allows Link to freely change age by playing the Song of Time.\n"
-                    "Time Blocks can still be used properly.\n\n"
-                    "Requirements:\n"
-                    "- Obtained the Ocarina of Time (depends on selection)\n"
-                    "- Obtained the Song of Time\n"
-                    "- Obtained the Master Sword\n"
-                    "- Not within range of Time Block\n"
-                    "- Not within range of Ocarina playing spots");
-                UIWidgets::PaddedEnhancementCheckbox("Pause Warp", CVAR_ENHANCEMENT("PauseWarp"), true, false);
-                UIWidgets::Tooltip("Selection of warp song in pause menu initiates warp. Disables song playback.");
-                UIWidgets::PaddedEnhancementCheckbox("Skip water take breath animation", CVAR_ENHANCEMENT("SkipSwimDeepEndAnim"), true, false);
-                UIWidgets::Tooltip("Skips Link's taking breath animation after coming up from water. This setting does not interfere with getting items from underwater.");
-                bool forceSkipScarecrow = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SKIP_SCARECROWS_SONG);
-                static const char* forceSkipScarecrowText = "This setting is forcefully enabled because a savefile\nwith \"Skip Scarecrow Song\" is loaded";
-                UIWidgets::PaddedEnhancementCheckbox("Skip Scarecrow Song", CVAR_ENHANCEMENT("InstantScarecrow"), true, false,
-                                                        forceSkipScarecrow, forceSkipScarecrowText, UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::Tooltip("Pierre appears when Ocarina is pulled out. Requires learning scarecrow song.");
-                bool forceSleepingWaterfallEnhancement =
-                    IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SLEEPING_WATERFALL) == RO_WATERFALL_OPEN;
-                uint8_t forceSleepingWaterfallValue = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SLEEPING_WATERFALL) + 1;
-                static const char* forceSleepingWaterfallText =
-                    "This setting is forcefully enabled because a randomizer savefile with \"Sleeping Waterfall: Open\" is loaded.";
-                UIWidgets::PaddedText("Play Zelda's Lullaby to open Sleeping Waterfall", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"),
-                                               sleepingWaterfallOptions, 0, forceSleepingWaterfallEnhancement,
-                                               forceSleepingWaterfallText, forceSleepingWaterfallValue);
-                UIWidgets::Tooltip(
-                    "Always: Link must always play Zelda's Lullaby to open "
-                    "the waterfall entrance to Zora's Domain.\n"
-                    "Once: Link only needs to play Zelda's Lullaby once to "
-                    "open the waterfall; after that, it stays open permanently.\n"
-                    "Never: Link never needs to play Zelda's Lullaby to open the "
-                    "waterfall; he only needs to have learned it and have an ocarina."
-                );
-                
-                ImGui::EndTable();
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            if (ImGui::BeginMenu("Items"))
-            {
-                UIWidgets::PaddedEnhancementCheckbox("Equip Items on D-pad", CVAR_ENHANCEMENT("DpadEquips"), true, false);
-                UIWidgets::Tooltip("Equip items and equipment on the D-pad\nIf used with \"D-pad on Pause Screen\", you "
-                                   "must hold C-Up to equip instead of navigate");
-                UIWidgets::PaddedEnhancementCheckbox("Instant Putaway", CVAR_ENHANCEMENT("InstantPutaway"), true, false);
-                UIWidgets::Tooltip("Allow Link to put items away without having to wait around");
-                UIWidgets::PaddedEnhancementCheckbox("Instant Boomerang Recall", CVAR_ENHANCEMENT("FastBoomerang"), true, false);
-                UIWidgets::Tooltip("Instantly return the boomerang to Link by pressing its item button while it's in the air");
-                UIWidgets::PaddedEnhancementCheckbox("Prevent Dropped Ocarina Inputs", CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), true, false);
-                UIWidgets::Tooltip("Prevent dropping inputs when playing the ocarina quickly");
-                UIWidgets::PaddedText("Bunny Hood Effect", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("MMBunnyHood"), bunnyHoodOptions, BUNNY_HOOD_VANILLA);
-                UIWidgets::Tooltip(
-                    "Wearing the Bunny Hood grants a speed increase like in Majora's Mask. The longer jump option is not accounted for in randomizer logic.\n\n"
-                    "Also disables NPC's reactions to wearing the Bunny Hood."
-                );
-                UIWidgets::PaddedEnhancementCheckbox("Masks Equippable as Adult", CVAR_ENHANCEMENT("AdultMasks"), true, false);
-                UIWidgets::Tooltip("Allows masks to be equipped normally from the pause menu as adult.");
-                UIWidgets::PaddedEnhancementCheckbox("Persistent masks", CVAR_ENHANCEMENT("PersistentMasks"), true, false);
-                UIWidgets::Tooltip(
-                    "Stops masks from automatically unequipping on certain situations:\n"
-                    "- When entering a new scene\n"
-                    "- When not in any C button or the D-Pad\n"
-                    "- When saving and quitting\n"
-                    "- When dying\n"
-                    "- When traveling thru time (if \"Masks Equippable as Adult\" is activated)"
-                );
-                UIWidgets::PaddedEnhancementCheckbox("Mask Select in Inventory", CVAR_ENHANCEMENT("MaskSelect"), true, false);
-                UIWidgets::Tooltip("After completing the mask trading sub-quest, press A and any direction on the mask slot to change masks");
-                UIWidgets::PaddedEnhancementCheckbox("Nuts explode bombs", CVAR_ENHANCEMENT("NutsExplodeBombs"), true, false);
-                UIWidgets::Tooltip("Makes nuts explode bombs, similar to how they interact with bombchus. This does not affect bombflowers.");
-                UIWidgets::PaddedEnhancementCheckbox("Equip Multiple Arrows at Once", CVAR_ENHANCEMENT("SeparateArrows"), true, false);
-                UIWidgets::Tooltip("Allow the bow and magic arrows to be equipped at the same time on different slots. (Note this will disable the behaviour of the 'Equip Dupe' glitch)");
-                UIWidgets::PaddedEnhancementCheckbox("Bow as Child/Slingshot as Adult", CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), true, false);
-                UIWidgets::Tooltip("Allows child to use bow with arrows.\nAllows adult to use slingshot with seeds.\n\nRequires glitches or 'Timeless Equipment' cheat to equip.");
-                UIWidgets::PaddedEnhancementCheckbox("Better Farore's Wind", CVAR_ENHANCEMENT("BetterFarore"), true, false);
-                UIWidgets::Tooltip("Helps FW persist between ages, gives child and adult separate FW points, and can be used in more places.");
-                UIWidgets::PaddedEnhancementCheckbox("Remove Explosive Limit", CVAR_ENHANCEMENT("RemoveExplosiveLimit"), true, false);
-                UIWidgets::Tooltip("Removes the cap of 3 active explosives being deployed at once.");
-                UIWidgets::PaddedEnhancementCheckbox("Static Explosion Radius", CVAR_ENHANCEMENT("StaticExplosionRadius"), true, false);
-                UIWidgets::Tooltip("Explosions are now a static size, like in Majora's Mask and OoT3D. Makes bombchu hovering much easier.");
-                UIWidgets::PaddedEnhancementCheckbox("Prevent Bombchus Forcing First-Person", CVAR_ENHANCEMENT("DisableFirstPersonChus"), true, false);
-                UIWidgets::Tooltip("Prevent bombchus from forcing the camera into first-person mode when released.");
-                UIWidgets::PaddedEnhancementCheckbox("Better Bombchu Shopping", CVAR_ENHANCEMENT("BetterBombchuShopping"), true, false,
-                                                        IS_RANDO, "This setting is forcefully enabled when you are playing a randomizer.", UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::Tooltip("Bombchus do not sell out when bought, and a 10 pack of bombchus costs 99 rupees instead of 100."
-                "\n"
-                "Toggling while inside the shop will not change prices or restock any SOLD OUTs");
-                UIWidgets::PaddedEnhancementCheckbox("Aiming reticle for the bow/slingshot", CVAR_ENHANCEMENT("BowReticle"), true, false);
-                UIWidgets::Tooltip("Aiming with a bow or slingshot will display a reticle as with the hookshot when the projectile is ready to fire.");
-                if (UIWidgets::PaddedEnhancementCheckbox("Aim boomerang in first-person mode", CVAR_ENHANCEMENT("BoomerangFirstPerson"), true, false)) {
-                    if (!CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
-                        CVarSetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0);
-                    }
-                }
-                UIWidgets::Tooltip(
-                    "Change aiming for the boomerang from third person to first person to see past Link's head");
-                if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
-                    UIWidgets::PaddedEnhancementCheckbox("Aiming reticle for boomerang", CVAR_ENHANCEMENT("BoomerangReticle"), true, false);
-                    UIWidgets::Tooltip("Aiming with the boomerang will display a reticle as with the hookshot");
-                }
-                if (UIWidgets::PaddedEnhancementCheckbox("Allow strength equipment to be toggled", CVAR_ENHANCEMENT("ToggleStrength"), true, false)) {
-                    if (!CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)) {
-                        CVarSetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0);
-                    }
-                }
-                UIWidgets::Tooltip("Allows strength to be toggled on and off by pressing A on the strength upgrade in the equipment subscreen of the pause menu (This allows performing some glitches that require the player to not have strength).");
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            if (ImGui::BeginMenu("Item Count Messages")) {
-                int numOptions = ARRAY_COUNT(itemCountMessageCVars);
-                bool allItemCountsChecked = std::all_of(itemCountMessageCVars, itemCountMessageCVars + numOptions,
-                                                        [](const char* cvar) { return CVarGetInteger(cvar, 0); });
-                bool someItemCountsChecked = std::any_of(itemCountMessageCVars, itemCountMessageCVars + numOptions,
-                                                         [](const char* cvar) { return CVarGetInteger(cvar, 0); });
-
-                ImGuiContext* g = ImGui::GetCurrentContext();
-                ImGuiItemFlags backup_item_flags = g->CurrentItemFlags;
-                if (!allItemCountsChecked && someItemCountsChecked) g->CurrentItemFlags |= ImGuiItemFlags_MixedValue;
-                if (ImGui::Checkbox("All", &allItemCountsChecked)) {
-                    int32_t newValue = allItemCountsChecked ? 1 : 0;
-
-                    std::for_each(itemCountMessageCVars, itemCountMessageCVars + numOptions,
-                                  [newValue](const char* cvar) { CVarSetInteger(cvar, newValue); });
-
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                }
-                g->CurrentItemFlags = backup_item_flags;
-
-                for (int i = 0; i < numOptions; i++) {
-                    UIWidgets::PaddedEnhancementCheckbox(itemCountMessageOptions[i], itemCountMessageCVars[i], true, false);
-                }
-
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            if (ImGui::BeginMenu("Difficulty Options"))
-            {
-                if (ImGui::BeginMenu("Shooting Gallery")) {
-                    UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeShootingGallery"));
-                    UIWidgets::Tooltip("Turn on/off changes to the shooting gallery behavior");
-                    bool disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0);
-                    static const char* disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off";
-                    UIWidgets::PaddedEnhancementCheckbox("Instant Win", CVAR_ENHANCEMENT("InstantShootingGalleryWin"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Skips the shooting gallery minigame");
-                    UIWidgets::PaddedEnhancementCheckbox("No Rupee Randomization", CVAR_ENHANCEMENT("ConstantAdultGallery"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Forces the rupee order to not be randomized as adult, making it the same as chlid");
-                    UIWidgets::PaddedEnhancementSliderInt("Child Starting Ammunition: %d", "##cShootingGalleryAmmunition", CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 10, 30, "", 15, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The ammunition at the start of the shooting gallery minigame as a child");
-                    UIWidgets::PaddedEnhancementSliderInt("Adult Starting Ammunition: %d", "##aShootingGalleryAmmunition", CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"), 10, 30, "", 15, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The ammunition at the start of the shooting gallery minigame as an adult");
-                    ImGui::EndMenu();
-                }
-
-                UIWidgets::Spacer(0);
-
-                if (ImGui::BeginMenu("Bombchu Bowling")) {
-                    UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeBombchuBowling"));
-                    UIWidgets::Tooltip("Turn on/off changes to the bombchu bowling behavior");
-                    bool disabled = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) == 0;
-                    static const char* disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off";
-                    UIWidgets::PaddedEnhancementCheckbox("Remove Small Cucco", CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Prevents the small cucco from appearing in the bombchu bowling minigame");
-                    UIWidgets::PaddedEnhancementCheckbox("Remove Big Cucco", CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Prevents the big cucco from appearing in the bombchu bowling minigame");
-                    UIWidgets::PaddedEnhancementSliderInt("Bombchu Count: %d", "##cBombchuBowlingAmmunition", CVAR_ENHANCEMENT("BombchuBowlingAmmo"), 3, 20, "", 10, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The number of bombchus available at the start of the bombchu bowling minigame");
-                    ImGui::EndMenu();
-                }
-
-                UIWidgets::Spacer(0);
-                if (ImGui::BeginMenu("Fishing")) {
-                    UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeFishing"));
-                    UIWidgets::Tooltip("Turn on/off changes to the fishing behavior");
-                    bool disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0);
-                    static const char* disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off";
-                    UIWidgets::PaddedEnhancementCheckbox("Instant Fishing", CVAR_ENHANCEMENT("InstantFishing"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("All fish will be caught instantly");
-                    UIWidgets::PaddedEnhancementCheckbox("Guarantee Bite", CVAR_ENHANCEMENT("GuaranteeFishingBite"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic");
-                    UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", CVAR_ENHANCEMENT("FishNeverEscape"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in.");
-                    UIWidgets::PaddedEnhancementCheckbox("Loaches Always Appear", CVAR_ENHANCEMENT("LoachesAlwaysAppear"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Loaches will always appear in the fishing pond instead of every four visits.");
-                    UIWidgets::PaddedEnhancementCheckbox("Skip Keep Confirmation", CVAR_ENHANCEMENT("SkipKeepConfirmation"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The pond owner will not ask to confirm if you want to keep a smaller fish.");
-                    UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3, 10, "", 10, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
-                    UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 6, 13, "", 13, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
-                    UIWidgets::PaddedEnhancementCheckbox("All fish are Hyrule Loaches", CVAR_ENHANCEMENT("AllHyruleLoaches"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Every fish in the fishing pond will always be a Hyrule Loach\n\nNote: This requires reloading the area");
-                    ImGui::EndMenu();
-                }
-                UIWidgets::Spacer(0);
-
-                if (ImGui::BeginMenu("Lost Woods Ocarina Game")) {
-                    UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeOcarinaGame"));
-                    UIWidgets::Tooltip("Turn on/off changes to the lost woods ocarina game behavior");
-                    bool disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0);
-                    static const char* disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off";
-                    UIWidgets::PaddedEnhancementCheckbox("Instant Win", CVAR_ENHANCEMENT("InstantOcarinaGameWin"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Skips the lost woods ocarina game");
-                    UIWidgets::PaddedEnhancementSliderInt("Note Play Speed: %dx", "##OcarinaGameNoteSpeed", CVAR_ENHANCEMENT("OcarinaGame.NoteSpeed"), 1, 5, "", 1, true, true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Adjust the speed that the skull kids play notes");
-                    UIWidgets::PaddedEnhancementCheckbox("Unlimited Playback Time", CVAR_ENHANCEMENT("OcarinaUnlimitedFailTime"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Removes the timer to play back the song");
-                    UIWidgets::PaddedEnhancementSliderInt("Number of Starting Notes: %d", "##OcarinaGameStartingNotes", CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"), 1, 8, "", 3, true, true, false,
-                                                          disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Adjust the number of notes the skull kids play to start the first round");
-                    int roundMin = CVarGetInteger(CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"), 3);
-                    UIWidgets::PaddedEnhancementSliderInt("Round One Notes: %d", "##OcarinaGameRoundOne",
-                                                          CVAR_ENHANCEMENT("OcarinaGame.RoundOneNotes"), roundMin, 8, "", 5, true, true,
-                                                          false,
-                                                          disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Adjust the number of notes you need to play to end the first round");
-                    UIWidgets::PaddedEnhancementSliderInt("Round Two Notes: %d", "##OcarinaGameRoundTwoNotes",
-                                                          CVAR_ENHANCEMENT("OcarinaGame.RoundTwoNotes"), roundMin, 8, "", 6, true, true,
-                                                          false,
-                                                          disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Adjust the number of notes you need to play to end the second round");
-                    UIWidgets::PaddedEnhancementSliderInt("Round Three Notes: %d", "##OcarinaGameRoundThreeNotes",
-                                                          CVAR_ENHANCEMENT("OcarinaGame.RoundThreeNotes"), roundMin, 8, "", 8, true, true,
-                                                          false,
-                                                          disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Adjust the number of notes you need to play to end the third round");
-                    ImGui::EndMenu();
-                }
-
-                UIWidgets::Spacer(0);
-
-                if (ImGui::BeginMenu("Frogs Ocarina Game")) {
-                    UIWidgets::EnhancementCheckbox("Customize Behavior", CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"));
-                    UIWidgets::Tooltip("Turn on/off changes to the frogs ocarina game behavior");
-                    bool disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0);
-                    static const char* disabledTooltip =
-                        "This option is disabled because \"Customize Behavior\" is turned off";
-                    UIWidgets::PaddedEnhancementCheckbox("Instant Win", CVAR_ENHANCEMENT("InstantFrogsGameWin"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Skips the frogs ocarina game");
-                    UIWidgets::PaddedEnhancementCheckbox("Unlimited Playback Time", CVAR_ENHANCEMENT("FrogsUnlimitedFailTime"), true, false, disabled, disabledTooltip);
-                    UIWidgets::Tooltip("Removes the timer to play back the song");
-                    bool disabledFrog = 0;
-                    static const char* disabledFrogTooltip =
-                        "This option is disabled because \"Customize Behavior\" is turned off or \"Unlimited Playback Time\" is on";
-                    if (!CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("FrogsUnlimitedFailTime"), 0)) {
-                        disabledFrog = 1;
-                    } else {
-                        disabledFrog = 0;
-                    }
-                    UIWidgets::PaddedEnhancementSliderInt("Modify note timer: %dx", "##FrogsFailTimer", CVAR_ENHANCEMENT("FrogsModifyFailTime"), 1, 5, "", 1, true, true, false,
-                                                          disabledFrog, disabledFrogTooltip);
-                    UIWidgets::Tooltip("Adjusts the time allowed for playback before failing");
-                    ImGui::EndMenu();
-                }
-
-                UIWidgets::Spacer(0);
-
-                UIWidgets::PaddedEnhancementCheckbox("Delete File On Death", CVAR_ENHANCEMENT("DeleteFileOnDeath"), true, false);
-                ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.0f, 0.0f, 1.0f));
-                UIWidgets::Tooltip("Dying will delete your file\n\n     " ICON_FA_EXCLAMATION_TRIANGLE " WARNING " ICON_FA_EXCLAMATION_TRIANGLE "\nTHIS IS NOT REVERSABLE\nUSE AT YOUR OWN RISK!");
-                ImGui::PopStyleColor();
-                if (UIWidgets::PaddedEnhancementCheckbox("Permanent heart loss", CVAR_ENHANCEMENT("PermanentHeartLoss"), true, false)) {
-                    UpdatePermanentHeartLossState();
-                }
-                UIWidgets::Tooltip("When you lose 4 quarters of a heart you will permanently lose that heart container.\n\nDisabling this after the fact will restore your heart containers.");
-                ImGui::Text("Damage Multiplier");
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("DamageMult"), allPowers, 0);
-                UIWidgets::Tooltip(
-                    "Modifies all sources of damage not affected by other sliders\n"
-                    "2x: Can survive all common attacks from the start of the game\n"
-                    "4x: Dies in 1 hit to any substantial attack from the start of the game\n"
-                    "8x: Can only survive trivial damage from the start of the game\n"
-                    "16x: Can survive all common attacks with max health without double defense\n"
-                    "32x: Can survive all common attacks with max health and double defense\n"
-                    "64x: Can survive trivial damage with max health without double defense\n"
-                    "128x: Can survive trivial damage with max health and double defense\n"
-                    "256x: Cannot survive damage"
-                );
-                UIWidgets::PaddedText("Fall Damage Multiplier", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("FallDamageMult"), subPowers, 0);
-                UIWidgets::Tooltip(
-                    "Modifies all fall damage\n"
-                    "2x: Can survive all fall damage from the start of the game\n"
-                    "4x: Can only survive short fall damage from the start of the game\n"
-                    "8x: Cannot survive any fall damage from the start of the game\n"
-                    "16x: Can survive all fall damage with max health without double defense\n"
-                    "32x: Can survive all fall damage with max health and double defense\n"
-                    "64x: Can survive short fall damage with double defense\n"
-                    "128x: Cannot survive fall damage"
-                );
-                UIWidgets::PaddedText("Void Damage Multiplier", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("VoidDamageMult"), subSubPowers, 0);
-                UIWidgets::Tooltip(
-                    "Modifies damage taken after falling into a void\n"
-                    "2x: Can survive void damage from the start of the game\n"
-                    "4x: Cannot survive void damage from the start of the game\n"
-                    "8x: Can survive void damage twice with max health without double defense\n"
-                    "16x: Can survive void damage with max health without double defense\n"
-                    "32x: Can survive void damage with max health and double defense\n"
-                    "64x: Cannot survive void damage"
-                );
-                UIWidgets::PaddedText("Bonk Damage Multiplier", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("BonkDamageMult"), bonkDamageValues, BONK_DAMAGE_NONE);
-                UIWidgets::Tooltip("Modifies damage taken after bonking.");
-                UIWidgets::PaddedEnhancementCheckbox("Spawn with full health", CVAR_ENHANCEMENT("FullHealthSpawn"), true, false);
-                UIWidgets::Tooltip("Respawn with full health instead of 3 Hearts");
-                UIWidgets::PaddedEnhancementCheckbox("No Random Drops", CVAR_ENHANCEMENT("NoRandomDrops"), true, false);
-                UIWidgets::Tooltip("Disables random drops, except from the Goron Pot, Dampe, and bosses");
-                bool forceEnableBombchuDrops = IS_RANDO &&
-                    OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1;
-                static const char* forceEnableBombchuDropsText =
-                    "This setting is forcefully enabled because a savefile\nwith \"Enable Bombchu Drops\" is loaded.";
-                UIWidgets::PaddedEnhancementCheckbox("Enable Bombchu Drops", CVAR_ENHANCEMENT("EnableBombchuDrops"), true, false,
-                                                        forceEnableBombchuDrops, forceEnableBombchuDropsText, UIWidgets::CheckboxGraphics::Checkmark);
-                UIWidgets::Tooltip("Bombchus will sometimes drop in place of bombs");
-                UIWidgets::PaddedEnhancementCheckbox("Trees Drop Sticks", CVAR_ENHANCEMENT("TreesDropSticks"), true, false);
-                UIWidgets::Tooltip("Bonking into trees will have a chance to drop up to 3 sticks. Must already have obtained sticks.");
-                UIWidgets::PaddedEnhancementCheckbox("No Heart Drops", CVAR_ENHANCEMENT("NoHeartDrops"), true, false);
-                UIWidgets::Tooltip("Disables heart drops, but not heart placements, like from a Deku Scrub running off\nThis simulates Hero Mode from other games in the series");
-                if (UIWidgets::PaddedEnhancementCheckbox("Hyper Bosses", CVAR_ENHANCEMENT("HyperBosses"), true, false)) {
-                    UpdateHyperBossesState();
-                }
-                UIWidgets::Tooltip("All major bosses move and act twice as fast.");
-                if (UIWidgets::PaddedEnhancementCheckbox("Hyper Enemies", CVAR_ENHANCEMENT("HyperEnemies"), true, false)) {
-                    UpdateHyperEnemiesState();
-                }
-                UIWidgets::Tooltip("All regular enemies and mini-bosses move and act twice as fast.");
-                UIWidgets::PaddedEnhancementCheckbox("Always Win Goron Pot", CVAR_ENHANCEMENT("GoronPot"), true, false);
-                UIWidgets::Tooltip("Always get the heart piece/purple rupee from the spinning Goron pot");
-                UIWidgets::PaddedEnhancementCheckbox("Always Win Dampe Digging Game", CVAR_ENHANCEMENT("DampeWin"), true, false);
-                UIWidgets::Tooltip("Always win the heart piece/purple rupee on the first dig in Dampe's grave digging game, just like in rando\nIn a rando file, this is unconditionally enabled");
-                UIWidgets::PaddedEnhancementCheckbox("All Dogs are Richard", CVAR_ENHANCEMENT("AllDogsRichard"), true, false);
-                UIWidgets::Tooltip("All dogs can be traded in and will count as Richard.");
-                UIWidgets::PaddedEnhancementSliderInt("Cuccos Stay Put Multiplier: %dx", "##CuccoStayDurationMultiplier", CVAR_ENHANCEMENT("CuccoStayDurationMult"), 1, 5, "", 1, true, true, false);
-                UIWidgets::Tooltip("Cuccos will stay in place longer after putting them down, by a multiple of the value of the slider.");
-                UIWidgets::PaddedEnhancementSliderInt("Leever Spawn Rate: %d seconds", "##LeeverSpawnRate", CVAR_ENHANCEMENT("LeeverSpawnRate"), 0, 10, "", 0, true, true, false);
-                UIWidgets::Tooltip("The time between leever groups spawning.");
-
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            if (ImGui::BeginMenu("Reduced Clutter"))
-            {
-                UIWidgets::EnhancementCheckbox("Mute Low HP Alarm", CVAR_ENHANCEMENT("LowHpAlarm"));
-                UIWidgets::Tooltip("Disable the low HP beeping sound");
-                UIWidgets::PaddedEnhancementCheckbox("Minimal UI", CVAR_ENHANCEMENT("MinimalUI"), true, false);
-                UIWidgets::Tooltip("Hides most of the UI when not needed\nNote: Doesn't activate until after loading a new scene");
-                UIWidgets::PaddedEnhancementCheckbox("Disable Navi Call Audio", CVAR_ENHANCEMENT("DisableNaviCallAudio"), true, false);
-                UIWidgets::Tooltip("Disables the voice audio when Navi calls you");
-                UIWidgets::PaddedEnhancementCheckbox("Disable Hot/Underwater Warning Text", CVAR_ENHANCEMENT("DisableTunicWarningText"), true, false);
-                UIWidgets::Tooltip("Disables warning text when you don't have on the Goron/Zora Tunic in Hot/Underwater conditions.");
-                UIWidgets::PaddedEnhancementCheckbox("Remember Minimap State Between Areas", CVAR_ENHANCEMENT("RememberMapToggleState"));
-                UIWidgets::Tooltip("Preserves the minimap visibility state when going between areas rather than defaulting it to \"on\" when going through loading zones.");
-
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            UIWidgets::EnhancementCheckbox("Visual Stone of Agony", CVAR_ENHANCEMENT("VisualAgony"));
-            UIWidgets::Tooltip("Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble");
-            static const char* cursorOnAnySlot[3] = { "Only in Rando", "Always", "Never" };
-            UIWidgets::PaddedText("Allow the cursor to be on any slot", true, false);
-            UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("PauseAnyCursor"), cursorOnAnySlot, PAUSE_ANY_CURSOR_RANDO_ONLY);
-            UIWidgets::Tooltip("Allows the cursor on the pause menu to be over any slot. Sometimes required in rando to select certain items.");
-            UIWidgets::PaddedEnhancementCheckbox("Assignable Tunics and Boots", CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), true, false);
-            UIWidgets::Tooltip("Allows equipping the tunic and boots to c-buttons");
-            UIWidgets::PaddedEnhancementCheckbox("Equipment Toggle", CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), true, false);
-            UIWidgets::Tooltip("Allows equipment to be removed by toggling it off on\nthe equipment subscreen.");
-            if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 0)) {
-                UIWidgets::PaddedText("Sword Toggle Options", true, false);
-                UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("SwordToggle"), swordToggleModes, SWORD_TOGGLE_NONE);
-                UIWidgets::Tooltip(
-                    "Introduces Options for unequipping Link's sword\n\n"
-                    "None: Only Biggoron's Sword/Giant's Knife can be toggled. Doing so will equip the Master Sword.\n\n"
-                    "Child Toggle: This will allow for completely unequipping any sword as child link.\n\n"
-                    "Both Ages: Any sword can be unequipped as either age. This may lead to swordless glitches as Adult.\n"
-                );
-            }
-
-            UIWidgets::PaddedEnhancementCheckbox("Link's Cow in Both Time Periods", CVAR_ENHANCEMENT("CowOfTime"), true, false);
-            UIWidgets::Tooltip("Allows the Lon Lon Ranch obstacle course reward to be shared across time periods");
-            UIWidgets::PaddedEnhancementCheckbox("Enable visible guard vision", CVAR_ENHANCEMENT("GuardVision"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Enable passage of time on file select", CVAR_ENHANCEMENT("TimeFlowFileSelect"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Pull grave during the day", CVAR_ENHANCEMENT("DayGravePull"), true, false);
-            UIWidgets::Tooltip("Allows graves to be pulled when child during the day");
-            UIWidgets::PaddedEnhancementCheckbox("Dogs follow you everywhere", CVAR_ENHANCEMENT("DogFollowsEverywhere"), true, false);
-            UIWidgets::Tooltip("Allows dogs to follow you anywhere you go, even if you leave the market");
-            UIWidgets::PaddedEnhancementCheckbox("Don't require input for Credits sequence", CVAR_ENHANCEMENT("NoInputForCredits"), true, false);
-            UIWidgets::Tooltip("Removes the input requirement on textboxes after defeating Ganon, allowing Credits sequence to continue to progress");
-            UIWidgets::PaddedEnhancementCheckbox("Answer Navi Prompt with L Button", CVAR_ENHANCEMENT("NaviOnL"), true, false);
-            UIWidgets::Tooltip("Speak to Navi with L but enter first-person camera with C-Up");
-
-            // Blue Fire Arrows
-            bool forceEnableBlueFireArrows = IS_RANDO &&
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BLUE_FIRE_ARROWS);
-            static const char* forceEnableBlueFireArrowsText =
-                "This setting is forcefully enabled because a savefile\nwith \"Blue Fire Arrows\" is loaded.";
-            UIWidgets::PaddedEnhancementCheckbox("Blue Fire Arrows", CVAR_ENHANCEMENT("BlueFireArrows"), true, false, 
-                forceEnableBlueFireArrows, forceEnableBlueFireArrowsText, UIWidgets::CheckboxGraphics::Checkmark);
-            UIWidgets::Tooltip("Allows Ice Arrows to melt red ice.\nMay require a room reload if toggled during gameplay.");
-
-            // Sunlight Arrows
-            bool forceEnableSunLightArrows = IS_RANDO &&
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SUNLIGHT_ARROWS);
-            static const char* forceEnableSunLightArrowsText =
-                "This setting is forcefully enabled because a savefile\nwith \"Sunlight Arrows\" is loaded.";
-            UIWidgets::PaddedEnhancementCheckbox("Sunlight Arrows", CVAR_ENHANCEMENT("SunlightArrows"), true, false, 
-                forceEnableSunLightArrows, forceEnableSunLightArrowsText, UIWidgets::CheckboxGraphics::Checkmark);
-            UIWidgets::Tooltip("Allows Light Arrows to activate sun switches.\nMay require a room reload if toggled during gameplay.");
-
-            UIWidgets::PaddedEnhancementCheckbox("Disable Crit wiggle", CVAR_ENHANCEMENT("DisableCritWiggle"), true, false);
-            UIWidgets::Tooltip("Disable random camera wiggle at low health");
-            UIWidgets::PaddedEnhancementCheckbox("Enemy Health Bars", CVAR_ENHANCEMENT("EnemyHealthBar"), true, false);
-            UIWidgets::Tooltip("Renders a health bar for enemies when Z-Targeted");
-
-            UIWidgets::PaddedEnhancementCheckbox("Targetable Hookshot Reticle", CVAR_ENHANCEMENT("HookshotableReticle"), true, false);
-            UIWidgets::Tooltip("Use a different color when aiming at hookshotable collision");
-
-            UIWidgets::PaddedEnhancementCheckbox("Faster Rupee Accumulator", CVAR_ENHANCEMENT("TimeSavers.FasterRupeeAccumulator"), true, false);
-            UIWidgets::Tooltip("Causes your wallet to fill and empty faster when you gain or lose money.");
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Graphics"))
-        {
-            if (ImGui::BeginMenu("Mods")) {
-                UIWidgets::PaddedEnhancementCheckbox("Use Alternate Assets", CVAR_ENHANCEMENT("AltAssets"), false, false);
-                UIWidgets::Tooltip("Toggle between standard assets and alternate assets. Usually mods will indicate if this setting has to be used or not.");
-                UIWidgets::PaddedEnhancementCheckbox("Disable Bomb Billboarding", CVAR_ENHANCEMENT("DisableBombBillboarding"), true, false);
-                UIWidgets::Tooltip("Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to replace bombs with 3D objects.");
-                UIWidgets::PaddedEnhancementCheckbox("Disable Grotto Fixed Rotation", CVAR_ENHANCEMENT("DisableGrottoRotation"), true, false);
-                UIWidgets::Tooltip("Disables grottos rotating with the camera. To be used in conjunction with mods that want to replace grottos with 3D objects.");
-                UIWidgets::PaddedEnhancementCheckbox("Invisible Bunny Hood", CVAR_ENHANCEMENT("HideBunnyHood"), true, false);
-                UIWidgets::Tooltip("Turns Bunny Hood invisible while still maintaining its effects.");
-                UIWidgets::PaddedEnhancementCheckbox("Disable HUD Heart animations", CVAR_ENHANCEMENT("NoHUDHeartAnimation"), true, false);
-                UIWidgets::Tooltip("Disables the beating animation of the hearts on the HUD.");
-
-                ImGui::EndMenu();
-            }
-
-            UIWidgets::Spacer(0);
-
-            UIWidgets::PaddedEnhancementCheckbox("Animated Link in Pause Menu", CVAR_ENHANCEMENT("PauseMenuAnimatedLink"), false, false);
-            UIWidgets::PaddedEnhancementCheckbox("Disable LOD", CVAR_ENHANCEMENT("DisableLOD"), true, false);
-            UIWidgets::Tooltip(
-                "Turns off the Level of Detail setting, making models use their higher-poly variants at any distance");
-            if (UIWidgets::EnhancementSliderInt("Increase Actor Draw Distance: %dx", "##IncreaseActorDrawDistance",
-                                                CVAR_ENHANCEMENT("DisableDrawDistance"), 1, 5, "", 1, true, false)) {
-                if (CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1) {
-                    CVarSetInteger(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), 0);
-                }
-            }
-            UIWidgets::Tooltip("Increases the range in which actors/objects are drawn");
-            if (CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) > 1) {
-                UIWidgets::PaddedEnhancementCheckbox("Kokiri Draw Distance",
-                                                     CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), true, false);
-                UIWidgets::Tooltip("The Kokiri are mystical beings that fade into view when approached\nEnabling this "
-                                   "will remove their draw distance");
-            }
-            UIWidgets::PaddedEnhancementCheckbox("Widescreen Actor Culling", CVAR_ENHANCEMENT("WidescreenActorCulling"),
-                                                 true, false);
-            UIWidgets::Tooltip("Adjusts the horizontal culling plane to account for widescreen resolutions");
-            UIWidgets::PaddedEnhancementCheckbox(
-                "Cull Glitch Useful Actors", CVAR_ENHANCEMENT("ExtendedCullingExcludeGlitchActors"), true, false,
-                !CVarGetInteger(CVAR_ENHANCEMENT("WidescreenActorCulling"), 0) &&
-                    CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1,
-                "Requires Actor Draw Distance to be increased or Widescreen Actor Culling enabled");
-            UIWidgets::Tooltip(
-                "Exclude actors that are useful for glitches from the extended culling ranges.\n"
-                "Some actors may still draw in the extended ranges, but will not \"update\" so that certain "
-                "glitches that leverage the original culling requirements will still work.\n"
-                "\n"
-                "The following actors are excluded:\n"
-                "- White clothed Gerudos\n"
-                "- King Zora\n"
-                "- Gossip Stones\n"
-                "- Boulders\n"
-                "- Blue Warps\n"
-                "- Darunia\n"
-                "- Gold Skulltulas");
-            if (UIWidgets::PaddedEnhancementCheckbox("Show Age-Dependent Equipment", CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), true,
-                                                     false)) {
-                UpdatePatchHand();
-            }
-            UIWidgets::Tooltip("Makes all equipment visible, regardless of Age.");
-            if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) == 1) {
-				UIWidgets::PaddedEnhancementCheckbox("Scale Adult Equipment as Child", CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"), true, false);
-				UIWidgets::Tooltip("Scales all of the Adult Equipment, as well and moving some a bit, to fit on Child Link Better. May not work properly with some mods.");
-			}
-            UIWidgets::PaddedEnhancementCheckbox("N64 Mode", CVAR_LOW_RES_MODE, true, false);
-            UIWidgets::Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution");
-            UIWidgets::PaddedEnhancementCheckbox("Glitch line-up tick", CVAR_ENHANCEMENT("DrawLineupTick"), true, false);
-            UIWidgets::Tooltip("Displays a tick in the top center of the screen to help with glitch line-ups in SoH, as traditional UI based line-ups do not work outside of 4:3");
-            UIWidgets::PaddedEnhancementCheckbox("Enable 3D Dropped items/projectiles", CVAR_ENHANCEMENT("NewDrops"), true, false);
-            UIWidgets::Tooltip("Change most 2D items and projectiles on the overworld to their 3D versions");
-            UIWidgets::PaddedEnhancementCheckbox("Disable Black Bar Letterboxes", CVAR_ENHANCEMENT("DisableBlackBars"), true, false);
-            UIWidgets::Tooltip("Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be minor visual glitches that were covered up by the black bars\nPlease disable this setting before reporting a bug");
-            UIWidgets::PaddedEnhancementCheckbox("Dynamic Wallet Icon", CVAR_ENHANCEMENT("DynamicWalletIcon"), true, false);
-            UIWidgets::Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
-            UIWidgets::PaddedEnhancementCheckbox("Always show dungeon entrances", CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), true, false);
-            UIWidgets::Tooltip("Always shows dungeon entrance icons on the minimap");
-            UIWidgets::PaddedEnhancementCheckbox("Show Gauntlets in First Person", CVAR_ENHANCEMENT("FirstPersonGauntlets"), true, false);
-            UIWidgets::Tooltip("Renders Gauntlets when using the Bow and Hookshot like in OOT3D");
-            if (UIWidgets::PaddedEnhancementCheckbox("Color Temple of Time's Medallions", CVAR_ENHANCEMENT("ToTMedallionsColors"), true, false)) {
-                PatchToTMedallions();
-            }
-            UIWidgets::Tooltip("When medallions are collected, the medallion imprints around the Master Sword pedestal in the Temple of Time will become colored");
-            UIWidgets::PaddedEnhancementCheckbox("Show locked door chains on both sides of locked doors", CVAR_ENHANCEMENT("ShowDoorLocksOnBothSides"), true, false);
-            UIWidgets::PaddedText("Fix Vanishing Paths", true, false);
-            if (UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("SceneSpecificDirtPathFix"), zFightingOptions, ZFIGHT_FIX_DISABLED) && gPlayState != NULL) {
-                UpdateDirtPathFixState(gPlayState->sceneNum);
-            }
-            UIWidgets::Tooltip("Disabled: Paths vanish more the higher the resolution (Z-fighting is based on resolution)\n"
-                                "Consistent: Certain paths vanish the same way in all resolutions\n"
-                                "No Vanish: Paths do not vanish, Link seems to sink in to some paths\n"
-                                "This might affect other decal effects\n");
-            UIWidgets::PaddedEnhancementSliderInt("Text Spacing: %d", "##TEXTSPACING", CVAR_ENHANCEMENT("TextSpacing"), 4, 6, "", 6, true, true, true);
-            UIWidgets::Tooltip("Space between text characters (useful for HD font textures)");
-            UIWidgets::PaddedEnhancementCheckbox("More info in file select", CVAR_ENHANCEMENT("FileSelectMoreInfo"), true, false);
-            UIWidgets::Tooltip("Shows what items you have collected in the file select screen, like in N64 randomizer");
-            UIWidgets::PaddedEnhancementCheckbox("Better ammo rendering in pause menu", CVAR_ENHANCEMENT("BetterAmmoRendering"), true, false);
-            UIWidgets::Tooltip("Ammo counts in the pause menu will work correctly regardless of the position of items in the inventory");
-            UIWidgets::PaddedEnhancementCheckbox("Remove spin attack darkness", CVAR_ENHANCEMENT("RemoveSpinAttackDarkness"), true, false);
-            UIWidgets::Tooltip("Remove the darkness that appears when charging a spin attack");
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Fixes"))
-        {
-            UIWidgets::EnhancementCheckbox("Fix L&R Pause menu", CVAR_ENHANCEMENT("FixMenuLR"));
-            UIWidgets::Tooltip("Makes the L and R buttons in the pause menu the same color");
-            UIWidgets::PaddedEnhancementCheckbox("Fix L&Z Page switch in Pause menu", CVAR_ENHANCEMENT("NGCKaleidoSwitcher"), true, false);
-            UIWidgets::Tooltip("Makes L and R switch pages like on the GameCube\nZ opens the Debug Menu instead");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Dungeon entrances", CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), true, false);
-            UIWidgets::Tooltip("Removes the dungeon entrance icon on the top-left corner of the screen when no dungeon is present on the current map");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Two Handed idle animations", CVAR_ENHANCEMENT("TwoHandedIdle"), true, false);
-            UIWidgets::Tooltip("Re-enables the two-handed idle animation, a seemingly finished animation that was disabled on accident in the original game");
-            UIWidgets::PaddedEnhancementCheckbox("Fix the Gravedigging Tour Glitch", CVAR_ENHANCEMENT("GravediggingTourFix"), true, false, SaveManager::Instance->IsRandoFile(),
-                                                        "This setting is always enabled in randomizer files", UIWidgets::CheckboxGraphics::Checkmark);
-            UIWidgets::Tooltip("Fixes a bug where the Gravedigging Tour Heart Piece disappears if the area reloads");
-            UIWidgets::PaddedEnhancementCheckbox(
-                "Fix Deku Nut upgrade", CVAR_ENHANCEMENT("DekuNutUpgradeFix"), true, false, IS_RANDO,
-                "This setting is forcefully enabled when you are playing a randomizer.",
-                UIWidgets::CheckboxGraphics::Checkmark);
-            UIWidgets::Tooltip("Prevents the Forest Stage Deku Nut upgrade from becoming unobtainable after receiving the Poacher's Saw");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Navi text HUD position", CVAR_ENHANCEMENT("NaviTextFix"), true, false);
-            UIWidgets::Tooltip("Correctly centers the Navi text prompt on the HUD's C-Up button");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Anubis fireballs", CVAR_ENHANCEMENT("AnubisFix"), true, false);
-            UIWidgets::Tooltip("Make Anubis fireballs do fire damage when reflected back at them with the Mirror Shield");
-            if (UIWidgets::PaddedEnhancementCheckbox("Fix Megaton Hammer crouch stab", CVAR_ENHANCEMENT("CrouchStabHammerFix"), true, false)) {
-                if (!CVarGetInteger(CVAR_ENHANCEMENT("CrouchStabHammerFix"), 0)) {
-                    CVarClear(CVAR_ENHANCEMENT("CrouchStabFix"));
-                }
-            }
-            UIWidgets::Tooltip("Make the Megaton Hammer's crouch stab able to destroy rocks without first swinging it normally");
-            if (CVarGetInteger(CVAR_ENHANCEMENT("CrouchStabHammerFix"), 0)) {
-                UIWidgets::PaddedEnhancementCheckbox("Remove power crouch stab", CVAR_ENHANCEMENT("CrouchStabFix"), true, false);
-                UIWidgets::Tooltip("Make crouch stabbing always do the same damage as a regular slash");
-            }
-            UIWidgets::PaddedEnhancementCheckbox("Fix credits timing", CVAR_ENHANCEMENT("CreditsFix"), true, false);
-            UIWidgets::Tooltip("Extend certain credits scenes so the music lines up properly with the visuals");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Gerudo Warrior's clothing colors", CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), true, false);
-            UIWidgets::Tooltip("Prevent the Gerudo Warrior's clothes changing color when changing Link's tunic or using bombs in front of her");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Camera Drift", CVAR_ENHANCEMENT("FixCameraDrift"), true, false);
-            UIWidgets::Tooltip("Fixes camera slightly drifting to the left when standing still due to a math error");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Camera Swing", CVAR_ENHANCEMENT("FixCameraSwing"), true, false);
-            UIWidgets::Tooltip("Fixes camera getting stuck on collision when standing still, also fixes slight shift back in camera when stop moving");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Hanging Ledge Swing Rate", CVAR_ENHANCEMENT("FixHangingLedgeSwingRate"), true, false);
-            UIWidgets::Tooltip("Fixes camera swing rate when player falls off a ledge and camera swings around");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Missing Jingle after 5 Silver Rupees", CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), true, false);
-            UIWidgets::Tooltip(
-                "Adds 5 higher pitches for the Silver Rupee Jingle for the rooms with more than 5 Silver Rupees. "
-                "Currently only relevant in Master Quest.");
-            if (UIWidgets::PaddedEnhancementCheckbox("Fix out of bounds textures", CVAR_ENHANCEMENT("FixTexturesOOB"), true, false)) {
-                ApplyAuthenticGfxPatches();
-            }
-            UIWidgets::Tooltip("Fixes authentic out of bounds texture reads, instead loading textures with the correct size");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Poacher's Saw Softlock", CVAR_ENHANCEMENT("FixSawSoftlock"), true, false, CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0),
-                "This is disabled because it is forced on when Skip Text is enabled.", UIWidgets::CheckboxGraphics::Checkmark);
-            UIWidgets::Tooltip("Prevents the Poacher's Saw softlock from mashing through the text, or with Skip Text enabled.");
-            UIWidgets::PaddedEnhancementCheckbox("Fix enemies not spawning near water", CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), true, false);
-            UIWidgets::Tooltip("Causes respawning enemies, like stalchildren, to appear on land near bodies of water. "
-                                "Fixes an incorrect calculation that acted like water underneath ground was above it.");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Bush Item Drops", CVAR_ENHANCEMENT("BushDropFix"), true, false);
-            UIWidgets::Tooltip("Fixes the bushes to drop items correctly rather than spawning undefined items.");
-            UIWidgets::PaddedEnhancementCheckbox("Fix falling from vine edges", CVAR_ENHANCEMENT("FixVineFall"), true, false); 
-            UIWidgets::Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."); 
-            UIWidgets::PaddedEnhancementCheckbox("Fix Link's eyes open while sleeping", CVAR_ENHANCEMENT("FixEyesOpenWhileSleeping"), true, false);
-            UIWidgets::Tooltip("Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping.");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Darunia dancing too fast", CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"),
-                                                 true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-            UIWidgets::Tooltip("Fixes Darunia's dancing speed so he dances to the beat of Saria's Song, like in vanilla.");
-            UIWidgets::PaddedEnhancementCheckbox("Fix raised Floor Switches", CVAR_ENHANCEMENT("FixFloorSwitches"), true, false);
-            UIWidgets::Tooltip("Fixes the two raised floor switches, the one in Forest Temple Basement and the one at the top of Fire Temple. \n"
-                "This will lower them, making activating them easier");
-            UIWidgets::PaddedEnhancementCheckbox("Fix Zora hint dialogue", CVAR_ENHANCEMENT("FixZoraHintDialogue"), true, false);
-            UIWidgets::Tooltip("Fixes one Zora's dialogue giving a hint about bringing Ruto's Letter to King Zora to properly occur before moving King Zora rather than after");
-            if (UIWidgets::PaddedEnhancementCheckbox("Fix hand holding Hammer", CVAR_ENHANCEMENT("FixHammerHand"), true, false)) {
-                UpdatePatchHand();
-            }
-            UIWidgets::Tooltip("Fixes Adult Link having a backwards left hand when holding the Megaton Hammer.");
-            if (UIWidgets::PaddedEnhancementCheckbox(
-                "Fix Broken Giant's Knife bug", CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), true, false, IS_RANDO,
-                "This setting is forcefully enabled when you are playing a randomizer.",
-                UIWidgets::CheckboxGraphics::Checkmark)) {
-                bool hasGiantsKnife = CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON);
-                bool hasBrokenKnife = CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
-                bool knifeIsBroken = gSaveContext.swordHealth == 0.0f;
-
-                if (hasGiantsKnife && (hasBrokenKnife != knifeIsBroken)) {
-                    func_800849EC(gPlayState);
-                }
-            }
-            UIWidgets::Tooltip("Fixes the Broken Giant's Knife flag not being reset when Medigoron fixes it");
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Restoration"))
-        {
-            UIWidgets::PaddedEnhancementCheckbox("Red Ganon blood", CVAR_ENHANCEMENT("RedGanonBlood"), true, false);
-            UIWidgets::Tooltip("Restore the original red blood from NTSC 1.0/1.1. Disable for green blood");
-            UIWidgets::PaddedEnhancementCheckbox("Fish while hovering", CVAR_ENHANCEMENT("HoverFishing"), true, false);
-            UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows casting the Fishing Rod while using the Hover Boots");
-            UIWidgets::PaddedEnhancementCheckbox("N64 Weird Frames", CVAR_ENHANCEMENT("N64WeirdFrames"), true, false);
-            UIWidgets::Tooltip("Restores N64 Weird Frames allowing weirdshots to behave the same as N64");
-            UIWidgets::PaddedEnhancementCheckbox("Bombchus out of bounds", CVAR_ENHANCEMENT("BombchusOOB"), true, false);
-            UIWidgets::Tooltip("Allows bombchus to explode out of bounds\nSimilar to GameCube and Wii VC");
-            UIWidgets::PaddedEnhancementCheckbox("Quick Putaway", CVAR_ENHANCEMENT("QuickPutaway"), true, false);
-            UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows putting away an item without an animation and performing Putaway Ocarina Items");
-            UIWidgets::PaddedEnhancementCheckbox("Restore old Gold Skulltula cutscene", CVAR_ENHANCEMENT("GSCutscene"), true, false);
-            UIWidgets::Tooltip("Restore pre-release behavior where defeating a Gold Skulltula will play a cutscene showing it die.");
-            UIWidgets::PaddedEnhancementCheckbox("Quick Bongo Kill", CVAR_ENHANCEMENT("QuickBongoKill"), true, false);
-            UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows bypassing Bongo Bongo's intro cutscene to quickly kill him");
-            UIWidgets::PaddedEnhancementCheckbox("Original RBA Values", CVAR_ENHANCEMENT("RestoreRBAValues"), true, false);
-            UIWidgets::Tooltip("Restores the original outcomes when performing Reverse Bottle Adventure.");
-            UIWidgets::PaddedEnhancementCheckbox("Early Eyeball Frog", CVAR_ENHANCEMENT("EarlyEyeballFrog"), true, false);
-            UIWidgets::Tooltip("Restores a bug from NTSC 1.0/1.1 that allows you to obtain the eyeball frog from King Zora instead of the Zora Tunic by holding shield.");
-            UIWidgets::PaddedEnhancementCheckbox("Pulsate boss icon", CVAR_ENHANCEMENT("PulsateBossIcon"), true, false);
-            UIWidgets::Tooltip("Restores an unfinished feature to pulsate the boss room icon when you are in the boss room.");
-            UIWidgets::PaddedEnhancementSliderInt("Pause Buffer Input Window: %d", "##PauseBufferWindow", CVAR_ENHANCEMENT("PauseBufferWindow"), 0, 40, "", 0, true, true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Include held inputs at start of Buffer Input Window", CVAR_ENHANCEMENT("IncludeHeldInputsBufferWindow"), true, false);
-            UIWidgets::Tooltip("Typically, inputs that are held prior to the buffer window are not included in the buffer. This setting changes that behavior to include them. This may cause some inputs to be re-triggered undesireably, for instance Z-Targetting something you might not want to.");
-            UIWidgets::PaddedEnhancementSliderInt("Simulated Input Lag: %d frames", "##SimulatedInputLag", CVAR_SIMULATED_INPUT_LAG, 0, 6, "", 0, true, true, false);
-            UIWidgets::Tooltip("Buffers your inputs to be executed a specified amount of frames later");
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Extra Modes")) {
-            UIWidgets::PaddedText("Mirrored World", true, false);
-            if (UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("MirroredWorldMode"), mirroredWorldModes, MIRRORED_WORLD_OFF) && gPlayState != NULL) {
-                UpdateMirrorModeState(gPlayState->sceneNum);
-            }
-            UIWidgets::Tooltip(
-                "Mirrors the world horizontally\n\n"
-                "- Always: Always mirror the world\n"
-                "- Random: Randomly decide to mirror the world on each scene change\n"
-                "- Random (Seeded): Scenes are mirrored based on the current randomizer seed/file\n"
-                "- Dungeons: Mirror the world in Dungeons\n"
-                "- Dungeons (Vanilla): Mirror the world in vanilla Dungeons\n"
-                "- Dungeons (MQ): Mirror the world in MQ Dungeons\n"
-                "- Dungeons Random: Randomly decide to mirror the world in Dungeons\n"
-                "- Dungeons Random (Seeded): Dungeons are mirrored based on the current randomizer seed/file\n"
-            );
-
-            UIWidgets::PaddedText("Enemy Randomizer", true, false);
-            if (UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("RandomizedEnemies"), enemyRandomizerModes, ENEMY_RANDOMIZER_OFF)) {
-                GetSelectedEnemies();
-            }
-            UIWidgets::Tooltip(
-                "Replaces fixed enemies throughout the game with a random enemy. Bosses, mini-bosses and a few specific regular enemies are excluded.\n"
-                "Enemies that need more than Deku Nuts + either Deku Sticks or a sword to kill are excluded from spawning in \"clear enemy\" rooms.\n\n"
-                "- Random: Enemies are randomized every time you load a room\n"
-                "- Random (Seeded): Enemies are randomized based on the current randomizer seed/file\n"
-            );
-            if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) == ENEMY_RANDOMIZER_RANDOM) {
-                ImGui::Separator();
-                if (ImGui::BeginMenu("Enemy List")) {
-                    UIWidgets::PaddedEnhancementCheckbox("Select All Enemies", CVAR_ENHANCEMENT("RandomizedEnemyList.All"), true, false);
-                    bool disabledEnemyList = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0);
-                    ImGui::Separator();
-
-                    ImGui::BeginDisabled(CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0));
-
-                    ImGui::BeginTable("Enemy Table", 2);
-                    ImGui::TableNextColumn();
-                    for (int i = 0; i < RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE; i++) {
-                        if (UIWidgets::PaddedEnhancementCheckbox(enemyNameList[i], enemyCVarList[i], true, false, disabledEnemyList, 
-                            "These options are disabled because \"Select All Enemies\" is enabled.",
-                            UIWidgets::CheckboxGraphics::Checkmark)) { 
-                            GetSelectedEnemies();
-                        }
-                        if (i == RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE / 2) {
-                            ImGui::TableNextColumn();
-                        }
-                    }
-                    ImGui::EndTable();
-                    ImGui::EndDisabled();
-
-                    ImGui::EndMenu();
-                }
-            };
-            ImGui::Separator();
-
-            UIWidgets::PaddedEnhancementCheckbox("Randomized Enemy Sizes", CVAR_ENHANCEMENT("RandomizedEnemySizes"), true, false);
-            UIWidgets::Tooltip("Enemies and Bosses spawn with random sizes.");
-
-            if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemySizes"), 0)) {
-                UIWidgets::EnhancementCheckbox("Scale Health with Size", CVAR_ENHANCEMENT("EnemySizeScalesHealth"));
-                UIWidgets::Tooltip("Scales normal enemies health with their randomized size. *This will NOT affect bosses*");
-            }
-
-            UIWidgets::PaddedEnhancementCheckbox("Ivan the Fairy (Coop Mode)", CVAR_ENHANCEMENT("IvanCoopModeEnabled"), true, false);
-            UIWidgets::Tooltip("Enables Ivan the Fairy upon the next map change. Player 2 can control Ivan and "
-                                "press the C-Buttons to use items and mess with Player 1!");
-
-            UIWidgets::PaddedEnhancementCheckbox("Rupee Dash Mode", CVAR_ENHANCEMENT("RupeeDash"), true, false);
-            UIWidgets::Tooltip("Rupees reduced over time, Link suffers damage when the count hits 0.");
-
-            if (CVarGetInteger(CVAR_ENHANCEMENT("RupeeDash"), 0)) {
-                UIWidgets::PaddedEnhancementSliderInt(
-                    "Rupee Dash Interval: %d", "##DashInterval", CVAR_ENHANCEMENT("RupeeDashInterval"), 1, 10, "", 5, true, true, false,
-                    !CVarGetInteger(CVAR_ENHANCEMENT("RupeeDash"), 0),
-                    "This option is disabled because \"Rupee Dash Mode\" is turned off");
-                UIWidgets::Tooltip("Interval between Rupee reduction in Rupee Dash Mode");
-            }
-
-            UIWidgets::PaddedEnhancementCheckbox("Shadow Tag Mode", CVAR_ENHANCEMENT("ShadowTag"), true, false);
-            UIWidgets::Tooltip("A wallmaster follows Link everywhere, don't get caught!");
-
-            UIWidgets::PaddedEnhancementCheckbox("Additional Traps", CVAR_ENHANCEMENT("ExtraTraps.Enabled"), true, false);
-            UIWidgets::Tooltip("Enables additional Trap variants.");
-
-            if (CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0)) {
-                UIWidgets::PaddedSeparator();
-                if (ImGui::BeginMenu("Trap Options")) {
-                    ImGui::Text("Tier 1 Traps:");
-                    UIWidgets::Spacer(0);
-                    UIWidgets::PaddedEnhancementCheckbox("Freeze Traps", CVAR_ENHANCEMENT("ExtraTraps.Ice"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Burn Traps", CVAR_ENHANCEMENT("ExtraTraps.Burn"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Shock Traps", CVAR_ENHANCEMENT("ExtraTraps.Shock"), true, false);
-
-                    UIWidgets::PaddedSeparator();
-                    ImGui::Text("Tier 2 Traps:");
-                    UIWidgets::Spacer(0);
-                    UIWidgets::PaddedEnhancementCheckbox("Knockback Traps", CVAR_ENHANCEMENT("ExtraTraps.Knockback"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Speed Traps", CVAR_ENHANCEMENT("ExtraTraps.Speed"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Bomb Traps", CVAR_ENHANCEMENT("ExtraTraps.Bomb"), true, false);
-
-                    UIWidgets::PaddedSeparator();
-                    ImGui::Text("Tier 3 Traps:");
-                    UIWidgets::Spacer(0);
-                    UIWidgets::PaddedEnhancementCheckbox("Void Traps", CVAR_ENHANCEMENT("ExtraTraps.Void"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Ammo Traps", CVAR_ENHANCEMENT("ExtraTraps.Ammo"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Death Traps", CVAR_ENHANCEMENT("ExtraTraps.Kill"), true, false);
-                    UIWidgets::PaddedEnhancementCheckbox("Teleport Traps", CVAR_ENHANCEMENT("ExtraTraps.Teleport"), true, false);
-
-                    ImGui::EndMenu();
-                }
-            }
-
-            UIWidgets::Spacer(0);
-            if (UIWidgets::PaddedEnhancementCheckbox("Hurt Container Mode", CVAR_ENHANCEMENT("HurtContainer"), true, false)) {
-                UpdateHurtContainerModeState(CVarGetInteger(CVAR_ENHANCEMENT("HurtContainer"), 0));
-            }
-            UIWidgets::Tooltip("Changes Heart Piece and Heart Container functionality.\n\n"
-                "- Each Heart Container or full Heart Piece reduces Links hearts by 1.\n"
-                "- Can be enabled retroactively after a File has already started.");
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::PaddedSeparator();
-
-        UIWidgets::EnhancementCheckbox("Autosave", CVAR_ENHANCEMENT("Autosave"));
-        UIWidgets::Tooltip("Save the game automatically on a 3 minute interval and when soft-resetting the game.\n\n"
-                           "The interval autosave will wait if the game is paused in any way (dialogue, pause screen up, cutscenes).");
-
-        UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
-
-        UIWidgets::PaddedText("Boot Sequence", false, true);
-        UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("BootSequence"), bootSequenceLabels, BOOTSEQUENCE_DEFAULT);
-        UIWidgets::Tooltip("Configure what happens when starting or resetting the game\n\n"
-                           "Default: LUS logo -> N64 logo\n"
-                           "Authentic: N64 logo only\n"
-                           "File Select: Skip to file select menu"
-        );
-
-        UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f);
-
-        ImGui::EndDisabled();
-
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-
-        if (mCosmeticsEditorWindow) {
-            if (ImGui::Button(GetWindowButtonText("Cosmetics Editor", CVarGetInteger(CVAR_WINDOW("CosmeticsEditor"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mCosmeticsEditorWindow->ToggleVisibility();
-            }
-        }
-
-        if (mAudioEditorWindow) {
-            if (ImGui::Button(GetWindowButtonText("Audio Editor", CVarGetInteger(CVAR_WINDOW("AudioEditor"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mAudioEditorWindow->ToggleVisibility();
-            }
-        }
-
-        if (mGameplayStatsWindow) {
-            if (ImGui::Button(GetWindowButtonText("Gameplay Stats", CVarGetInteger(CVAR_WINDOW("GameplayStats"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mGameplayStatsWindow->ToggleVisibility();
-            }
-        }
-
-        if (mTimeSplitWindow) {
-            if (ImGui::Button(GetWindowButtonText("Time Splits", CVarGetInteger(CVAR_WINDOW("TimeSplitEnabled"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mTimeSplitWindow->ToggleVisibility();
-            }
-        }
-
-        if (mTimeDisplayWindow) {
-            if (ImGui::Button(GetWindowButtonText("Additional Timers", CVarGetInteger(CVAR_WINDOW("TimeDisplayEnabled"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mTimeDisplayWindow->ToggleVisibility();
-            }
-        }
-        if (mTimeDisplayWindow->IsVisible()) {
-            ImGui::SeparatorText("Timer Display Options");
-
-            if (!gPlayState) {
-                ImGui::Text("Additional Timer options\n"
-                            "available when a file is\n"
-                            "loaded...");
-            } else {
-                if (UIWidgets::PaddedEnhancementSliderFloat("Font Scale: %.2fx", "##FontScale", CVAR_ENHANCEMENT("TimeDisplay.FontScale"), 
-                    1.0f, 5.0f, "", 1.0f, false, true, false, true)) {
-                    TimeDisplayInitSettings();
-                }
-                if (UIWidgets::PaddedEnhancementCheckbox("Hide Background", CVAR_ENHANCEMENT("TimeDisplay.ShowWindowBG"), 
-                    false, false)) {
-                    TimeDisplayInitSettings();
-                }
-                ImGui::Separator();
-                for (auto& timer : timeDisplayList) {
-                    if (UIWidgets::PaddedEnhancementCheckbox(timer.timeLabel.c_str(), timer.timeEnable, false, false)) {
-                        TimeDisplayUpdateDisplayOptions();
-                    }
-                }
-            }
-        }
-        ImGui::PopStyleVar(3);
-        ImGui::PopStyleColor(1);
-
-        #ifdef __SWITCH__
-        UIWidgets::Spacer(0);
-        ImGui::Text("Switch performance mode");
-        if (UIWidgets::EnhancementCombobox(CVAR_ENHANCEMENT("SwitchPerfMode"), SWITCH_CPU_PROFILES, (int)Ship::SwitchProfiles::STOCK)) {
-            SPDLOG_INFO("Profile:: %s", SWITCH_CPU_PROFILES[CVarGetInteger(CVAR_ENHANCEMENT("SwitchPerfMode"), (int)Ship::SwitchProfiles::STOCK)]);
-            Ship::Switch::ApplyOverclock();
-        }
-        #endif
-
-        ImGui::EndMenu();
-    }
-}
-
-void DrawCheatsMenu() {
-    if (ImGui::BeginMenu("Cheats"))
-    {
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
-        ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 8.0f);
-        ImGui::BeginTable("##cheatsMenu", 2, ImGuiTableFlags_SizingFixedFit);
-        ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-        ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-        ImGui::TableNextColumn();
-        UIWidgets::Spacer(2.0f);
-        ImGui::Text("Inventory:");
-        UIWidgets::PaddedSeparator();
-
-        UIWidgets::PaddedEnhancementCheckbox("Super Tunic", CVAR_CHEAT("SuperTunic"), true, false);
-        UIWidgets::Tooltip("Makes every tunic have the effects of every other tunic");
-        UIWidgets::PaddedEnhancementCheckbox("Easy ISG", CVAR_CHEAT("EasyISG"), true, false);
-        UIWidgets::Tooltip("Passive Infinite Sword Glitch\nIt makes your sword's swing effect and hitbox stay active indefinitely");
-        UIWidgets::PaddedEnhancementCheckbox("Easy QPA", CVAR_CHEAT("EasyQPA"), true, false);
-        UIWidgets::Tooltip("Gives you the glitched damage value of the quick put away glitch.");
-        UIWidgets::PaddedEnhancementCheckbox("Timeless Equipment", CVAR_CHEAT("TimelessEquipment"), true, false);
-        UIWidgets::Tooltip("Allows any item to be equipped, regardless of age\nAlso allows Child to use Adult strength upgrades");
-        UIWidgets::PaddedEnhancementCheckbox("Unrestricted Items", CVAR_CHEAT("NoRestrictItems"), true, false);
-        UIWidgets::Tooltip("Allows you to use any item at any location");
-        UIWidgets::PaddedEnhancementCheckbox("Fireproof Deku Shield", CVAR_CHEAT("FireproofDekuShield"), true, false);
-        UIWidgets::Tooltip("Prevents the Deku Shield from burning on contact with fire");
-        UIWidgets::PaddedEnhancementCheckbox("Shield with Two-Handed Weapons", CVAR_CHEAT("ShieldTwoHanded"), true, false);
-        UIWidgets::Tooltip("This allows you to put up your shield with any two-handed weapon in hand except for Deku Sticks");
-        UIWidgets::Spacer(2.0f);
-        ImGui::Text("Deku Sticks:");
-        UIWidgets::EnhancementCombobox(CVAR_CHEAT("DekuStick"), DekuStickCheat, DEKU_STICK_NORMAL);
-        UIWidgets::Spacer(2.0f);
-        UIWidgets::EnhancementSliderFloat("Bomb Timer Multiplier: %.2fx", "##gBombTimerMultiplier", CVAR_CHEAT("BombTimerMultiplier"), 0.1f, 5.0f, "", 1.0f, false);
-        UIWidgets::PaddedEnhancementCheckbox("Hookshot Everything", CVAR_CHEAT("HookshotEverything"), true, false);
-        UIWidgets::Tooltip("Makes every surface in the game hookshot-able");
-        UIWidgets::Spacer(0);
-        UIWidgets::EnhancementSliderFloat("Hookshot Reach Multiplier: %.2fx", "##gCheatHookshotReachMultiplier", CVAR_CHEAT("HookshotReachMultiplier"), 1.0f, 5.0f, "", 1.0f, false);
-        UIWidgets::Spacer(2.0f);
-        if (ImGui::Button("Change Age")) {
-            SwitchAge();
-        }
-        UIWidgets::Tooltip("Switches Link's age and reloads the area.");  
-        UIWidgets::Spacer(2.0f);
-        if (ImGui::Button("Clear Cutscene Pointer")) {
-            GameInteractor::RawAction::ClearCutscenePointer();
-        }
-        UIWidgets::Tooltip("Clears the cutscene pointer to a value safe for wrong warps.");   
-
-        ImGui::TableNextColumn();
-        UIWidgets::Spacer(2.0f);
-
-        if (ImGui::BeginMenu("Infinite...")) {
-            UIWidgets::EnhancementCheckbox("Money", CVAR_CHEAT("InfiniteMoney"));
-            UIWidgets::PaddedEnhancementCheckbox("Health", CVAR_CHEAT("InfiniteHealth"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Ammo", CVAR_CHEAT("InfiniteAmmo"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Magic", CVAR_CHEAT("InfiniteMagic"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Nayru's Love", CVAR_CHEAT("InfiniteNayru"), true, false);
-            UIWidgets::PaddedEnhancementCheckbox("Epona Boost", CVAR_CHEAT("InfiniteEponaBoost"), true, false);
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (ImGui::BeginMenu("Save States")) {
-            ImGui::TextColored({ 0.85f, 0.85f, 0.0f, 1.0f }, "          " ICON_FA_EXCLAMATION_TRIANGLE);
-            ImGui::SameLine();
-            ImGui::TextColored({ 0.85f, 0.35f, 0.0f, 1.0f }, " WARNING!!!! ");
-            ImGui::SameLine();
-            ImGui::TextColored({ 0.85f, 0.85f, 0.0f, 1.0f }, ICON_FA_EXCLAMATION_TRIANGLE);
-            UIWidgets::PaddedText("These are NOT like emulator states.", true, false);
-            UIWidgets::PaddedText("They do not save your game progress, and", true, false);
-            UIWidgets::PaddedText("they WILL break across transitions and", true, false);
-            UIWidgets::PaddedText("load zones (like doors). Support for", true, false);
-            UIWidgets::PaddedText("related issues will not be provided.", true, false);
-            if (UIWidgets::PaddedEnhancementCheckbox("I promise I have read the warning", CVAR_CHEAT("SaveStatePromise"), true,
-                                                     false)) {
-                CVarSetInteger(CVAR_CHEAT("SaveStatesEnabled"), 0);
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            }
-            if (CVarGetInteger(CVAR_CHEAT("SaveStatePromise"), 0) == 1) {
-                UIWidgets::PaddedEnhancementCheckbox("I understand, enable save states", CVAR_CHEAT("SaveStatesEnabled"), true,
-                                                     false);
-                UIWidgets::Tooltip("F5 to save, F6 to change slots, F7 to load");
-            }
-
-            ImGui::EndMenu();
-        }
-
-        UIWidgets::Spacer(2.0f);
-        ImGui::Text("Behavior:");
-        UIWidgets::PaddedSeparator();
-
-        UIWidgets::PaddedEnhancementCheckbox("No Clip", CVAR_CHEAT("NoClip"), true, false);
-        UIWidgets::Tooltip("Allows you to walk through walls");
-        UIWidgets::PaddedEnhancementCheckbox("Climb Everything", CVAR_CHEAT("ClimbEverything"), true, false);
-        UIWidgets::Tooltip("Makes every surface in the game climbable");
-        UIWidgets::PaddedEnhancementCheckbox("Moon Jump on L", CVAR_CHEAT("MoonJumpOnL"), true, false);
-        UIWidgets::Tooltip("Holding L makes you float into the air");
-        UIWidgets::PaddedEnhancementCheckbox("New Easy Frame Advancing", CVAR_CHEAT("EasyFrameAdvance"), true, false);
-        UIWidgets::Tooltip("Continue holding START button when unpausing to only advance a single frame and then re-pause.");
-        UIWidgets::PaddedEnhancementCheckbox("Drops Don't Despawn", CVAR_CHEAT("DropsDontDie"), true, false);
-        UIWidgets::Tooltip("Drops from enemies, grass, etc. don't disappear after a set amount of time");
-        UIWidgets::PaddedEnhancementCheckbox("Fish Don't despawn", CVAR_CHEAT("NoFishDespawn"), true, false);
-        UIWidgets::Tooltip("Prevents fish from automatically despawning after a while when dropped");
-        UIWidgets::PaddedEnhancementCheckbox("Bugs Don't despawn", CVAR_CHEAT("NoBugsDespawn"), true, false);
-        UIWidgets::Tooltip("Prevents bugs from automatically despawning after a while when dropped");
-        UIWidgets::PaddedEnhancementCheckbox("Freeze Time", CVAR_CHEAT("FreezeTime"), true, false);
-        UIWidgets::Tooltip("Freezes the time of day");
-        UIWidgets::PaddedEnhancementCheckbox("Time Sync", CVAR_CHEAT("TimeSync"), true, false);
-        UIWidgets::Tooltip("This syncs the ingame time with the real world time");
-        UIWidgets::PaddedEnhancementCheckbox("No ReDead/Gibdo Freeze", CVAR_CHEAT("NoRedeadFreeze"), true, false);
-        UIWidgets::Tooltip("Prevents ReDeads and Gibdos from being able to freeze you with their scream");
-        UIWidgets::PaddedEnhancementCheckbox("Keese/Guay don't target you", CVAR_CHEAT("NoKeeseGuayTarget"), true, false);
-        UIWidgets::Tooltip("Keese and Guay no longer target you and simply ignore you as if you were wearing the skull mask");
-        {
-            static int32_t betaQuestEnabled = CVarGetInteger(CVAR_CHEAT("EnableBetaQuest"), 0);
-            static int32_t lastBetaQuestEnabled = betaQuestEnabled;
-            static int32_t betaQuestWorld = CVarGetInteger(CVAR_CHEAT("BetaQuestWorld"), 0xFFEF);
-            static int32_t lastBetaQuestWorld = betaQuestWorld;
-
-            if (!isBetaQuestEnabled) {
-                UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-            }
-
-            UIWidgets::PaddedEnhancementCheckbox("Enable Beta Quest", CVAR_CHEAT("EnableBetaQuest"), true, false);
-            UIWidgets::Tooltip("Turns on OoT Beta Quest. *WARNING* This will reset your game.");
-            betaQuestEnabled = CVarGetInteger(CVAR_CHEAT("EnableBetaQuest"), 0);
-            if (betaQuestEnabled) {
-                if (betaQuestEnabled != lastBetaQuestEnabled) {
-                    betaQuestWorld = 0;
-                }
-
-                ImGui::Text("Beta Quest World: %d", betaQuestWorld);
-
-                if (ImGui::Button(" - ##BetaQuest")) {
-                    betaQuestWorld--;
-                }
-                ImGui::SameLine();
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-
-                ImGui::SliderInt("##BetaQuest", &betaQuestWorld, 0, 8, "", ImGuiSliderFlags_AlwaysClamp);
-                UIWidgets::Tooltip("Set the Beta Quest world to explore. *WARNING* Changing this will reset your game.\nCtrl+Click to type in a value.");
-
-                ImGui::SameLine();
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-                if (ImGui::Button(" + ##BetaQuest")) {
-                    betaQuestWorld++;
-                }
-
-                if (betaQuestWorld > 8) {
-                    betaQuestWorld = 8;
-                }
-                else if (betaQuestWorld < 0) {
-                    betaQuestWorld = 0;
-                }
-            }
-            else {
-                lastBetaQuestWorld = betaQuestWorld = 0xFFEF;
-                CVarClear(CVAR_CHEAT("BetaQuestWorld"));
-            }
-            if (betaQuestEnabled != lastBetaQuestEnabled || betaQuestWorld != lastBetaQuestWorld)
-            {
-                // Reset the game if the beta quest state or world changed because beta quest happens on redirecting the title screen cutscene.
-                lastBetaQuestEnabled = betaQuestEnabled;
-                lastBetaQuestWorld = betaQuestWorld;
-                CVarSetInteger(CVAR_CHEAT("EnableBetaQuest"), betaQuestEnabled);
-                CVarSetInteger(CVAR_CHEAT("BetaQuestWorld"), betaQuestWorld);
-
-                std::reinterpret_pointer_cast<Ship::ConsoleWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch("reset");
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            }
-
-            if (!isBetaQuestEnabled) {
-                UIWidgets::ReEnableComponent("");
-            }
-        }
-
-        ImGui::EndTable();
-        ImGui::EndDisabled();
-        ImGui::EndMenu();
-    }
-}
-
-extern std::shared_ptr<Ship::GuiWindow> mStatsWindow;
-extern std::shared_ptr<Ship::GuiWindow> mConsoleWindow;
-extern std::shared_ptr<SaveEditorWindow> mSaveEditorWindow;
-extern std::shared_ptr<HookDebuggerWindow> mHookDebuggerWindow;
-extern std::shared_ptr<ColViewerWindow> mColViewerWindow;
-extern std::shared_ptr<ActorViewerWindow> mActorViewerWindow;
-extern std::shared_ptr<DLViewerWindow> mDLViewerWindow;
-extern std::shared_ptr<ValueViewerWindow> mValueViewerWindow;
-extern std::shared_ptr<MessageViewer> mMessageViewerWindow;
-
-void DrawDeveloperToolsMenu() {
-    if (ImGui::BeginMenu("Developer Tools")) {
-        ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
-
-        UIWidgets::EnhancementCheckbox("OoT Debug Mode", CVAR_DEVELOPER_TOOLS("DebugEnabled"));
-        UIWidgets::Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip with L + D-pad Right, and open the debug menu with L on the pause screen");
-        if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) {
-            UIWidgets::EnhancementCheckbox("OoT Registry Editor", CVAR_DEVELOPER_TOOLS("RegEditEnabled"));
-            UIWidgets::Tooltip("Enables the registry editor");
-            ImGui::Text("Debug Save File Mode:");
-            UIWidgets::EnhancementCombobox(CVAR_DEVELOPER_TOOLS("DebugSaveFileMode"), DebugSaveFileModes, 1);
-            UIWidgets::Tooltip(
-                "Changes the behaviour of debug file select creation (creating a save file on slot 1 with debug mode on)\n"
-                "- Off: The debug save file will be a normal savefile\n"
-                "- Vanilla: The debug save file will be the debug save file from the original game\n"
-                "- Maxed: The debug save file will be a save file with all of the items & upgrades"
-            );
-        }
-        UIWidgets::PaddedEnhancementCheckbox("OoT Skulltula Debug", CVAR_DEVELOPER_TOOLS("SkulltulaDebugEnabled"), true, false);
-        UIWidgets::Tooltip("Enables Skulltula Debug, when moving the cursor in the menu above various map icons (boss key, compass, map screen locations, etc) will set the GS bits in that area.\nUSE WITH CAUTION AS IT DOES NOT UPDATE THE GS COUNT.");
-        UIWidgets::PaddedEnhancementCheckbox("Better Debug Warp Screen", CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"), true, false);
-        UIWidgets::Tooltip("Optimized debug warp screen, with the added ability to chose entrances and time of day");
-        UIWidgets::PaddedEnhancementCheckbox("Debug Warp Screen Translation", CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-        UIWidgets::Tooltip("Translate the Debug Warp Screen based on the game language");
-        UIWidgets::PaddedEnhancementCheckbox("Resource logging", CVAR_DEVELOPER_TOOLS("ResourceLogging"), true, false);
-        UIWidgets::Tooltip("Logs some resources as XML when they're loaded in binary format");
-        if (gPlayState != NULL) {
-            UIWidgets::PaddedSeparator();
-            ImGui::Checkbox("Frame Advance##frameAdvance", (bool*)&gPlayState->frameAdvCtx.enabled);
-            if (gPlayState->frameAdvCtx.enabled) {
-                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-                ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0,0));
-                ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-                ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-                if (ImGui::Button("Advance 1", ImVec2(ImGui::GetContentRegionAvail().x / 2.0f, 0.0f))) {
-                    CVarSetInteger(CVAR_GENERAL("FrameAdvance"), 1);
-                }
-                ImGui::SameLine();
-                ImGui::Button("Advance (Hold)");
-                if (ImGui::IsItemActive()) {
-                    CVarSetInteger(CVAR_GENERAL("FrameAdvance"), 1);
-                }
-                ImGui::PopStyleVar(3);
-                ImGui::PopStyleColor(1);
-            }
-        }
-        UIWidgets::PaddedSeparator();
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0,0));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-        if (mStatsWindow) {
-            if (ImGui::Button(GetWindowButtonText("Stats", CVarGetInteger(CVAR_STATS_WINDOW_OPEN, 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mStatsWindow->ToggleVisibility();
-            }
-            UIWidgets::Tooltip("Shows the stats window, with your FPS and frametimes, and the OS you're playing on");
-        }
-        UIWidgets::Spacer(0);
-        if (mConsoleWindow) {
-            if (ImGui::Button(GetWindowButtonText("Console", CVarGetInteger(CVAR_CONSOLE_WINDOW_OPEN, 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mConsoleWindow->ToggleVisibility();
-            }
-            UIWidgets::Tooltip("Enables the console window, allowing you to input commands, type help for some examples");
-        }
-        UIWidgets::Spacer(0);
-        if (mSaveEditorWindow) {
-            if (ImGui::Button(GetWindowButtonText("Save Editor", CVarGetInteger(CVAR_WINDOW("SaveEditor"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mSaveEditorWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mHookDebuggerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Hook Debugger", CVarGetInteger(CVAR_WINDOW("HookDebugger"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mHookDebuggerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mColViewerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Collision Viewer", CVarGetInteger(CVAR_WINDOW("CollisionViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mColViewerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mActorViewerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Actor Viewer", CVarGetInteger(CVAR_WINDOW("ActorViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mActorViewerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mDLViewerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Display List Viewer", CVarGetInteger(CVAR_WINDOW("DLViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mDLViewerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mValueViewerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Value Viewer", CVarGetInteger(CVAR_WINDOW("ValueViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mValueViewerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mMessageViewerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Message Viewer", CVarGetInteger(CVAR_WINDOW("MessageViewer"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mMessageViewerWindow->ToggleVisibility();
-            }
-        }
-        UIWidgets::Spacer(0);
-        if (mGfxDebuggerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Gfx Debugger", CVarGetInteger(CVAR_WINDOW("GfxDebugger"), 0)).c_str(), ImVec2(-1.0f, 0.0f))) {
-                mGfxDebuggerWindow->ToggleVisibility();
-            }
-        }
-
-        ImGui::PopStyleVar(3);
-        ImGui::PopStyleColor(1);
-
-        ImGui::EndDisabled();
-
-        ImGui::EndMenu();
-    }
-}
-
-#ifdef ENABLE_REMOTE_CONTROL
-void DrawRemoteControlMenu() {
-    if (ImGui::BeginMenu("Network")) {
-        Sail::Instance->DrawMenu();
-        CrowdControl::Instance->DrawMenu();
-        ImGui::EndMenu();
-    }
-}
-#endif
-
-extern std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
-extern std::shared_ptr<PlandomizerWindow> mPlandomizerWindow;
-extern std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
-extern std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
-extern std::shared_ptr<EntranceTrackerWindow> mEntranceTrackerWindow;
-extern std::shared_ptr<EntranceTrackerSettingsWindow> mEntranceTrackerSettingsWindow;
-extern std::shared_ptr<CheckTracker::CheckTrackerWindow> mCheckTrackerWindow;
-extern std::shared_ptr<CheckTracker::CheckTrackerSettingsWindow> mCheckTrackerSettingsWindow;
-extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
-
-void DrawRandomizerMenu() {
-    if (ImGui::BeginMenu("Randomizer")) {
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.22f, 0.38f, 0.56f, 1.0f));
-
-    #ifdef __WIIU__
-        static ImVec2 buttonSize(200.0f * 2.0f, 0.0f);
-        static ImVec2 buttonWithOptionsSize(170.0f * 2.0f, 0.0f);
-        static ImVec2 optionsButtonSize(25.0f * 2.0f, 0.0f);
-        static float separationToOptionsButton = 5.0f * 2.0f;
-    #else
-        static ImVec2 buttonSize(200.0f, 0.0f);
-        static ImVec2 buttonWithOptionsSize(170.0f, 0.0f);
-        static ImVec2 optionsButtonSize(25.0f, 0.0f);
-        static float separationToOptionsButton = 5.0f;
-    #endif
-
-        if (mRandomizerSettingsWindow) {
-            if (ImGui::Button(GetWindowButtonText("Randomizer Settings", CVarGetInteger(CVAR_WINDOW("RandomizerSettings"), 0)).c_str(), buttonSize)) {
-                mRandomizerSettingsWindow->ToggleVisibility();
-            }
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (mPlandomizerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Plandomizer Editor", CVarGetInteger(CVAR_WINDOW("PlandomizerWindow"), 0)).c_str(), buttonSize)) {
-                mPlandomizerWindow->ToggleVisibility();
-            }
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (mItemTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Item Tracker", CVarGetInteger(CVAR_WINDOW("ItemTracker"), 0)).c_str(), buttonWithOptionsSize)) {
-                mItemTrackerWindow->ToggleVisibility();
-            }
-        }
-
-        ImGui::SameLine(0, 0);
-        ImVec2 cursor = ImGui::GetCursorPos();
-        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
-
-        if (mItemTrackerSettingsWindow) {
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
-            if (ImGui::Button(ICON_FA_COG "##ItemTrackerSettings", optionsButtonSize)) {
-                mItemTrackerSettingsWindow->ToggleVisibility();
-            }
-            ImGui::PopStyleVar();
-        }
-
-        UIWidgets::Spacer(0);
-        if (mEntranceTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Entrance Tracker", CVarGetInteger(CVAR_WINDOW("EntranceTracker"), 0)).c_str(), buttonWithOptionsSize)) {
-                mEntranceTrackerWindow->ToggleVisibility();
-            }
-        }
-
-        ImGui::SameLine(0, 0);
-        cursor = ImGui::GetCursorPos();
-        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
-
-        if (mEntranceTrackerSettingsWindow) {
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
-            if (ImGui::Button(ICON_FA_COG "##EntranceTrackerSettings", optionsButtonSize)) {
-                mEntranceTrackerSettingsWindow->ToggleVisibility();
-            }
-            ImGui::PopStyleVar();
-        }
-
-        UIWidgets::Spacer(0);
-
-        if (mCheckTrackerWindow) {
-            if (ImGui::Button(GetWindowButtonText("Check Tracker", CVarGetInteger(CVAR_WINDOW("CheckTracker"), 0)).c_str(), buttonWithOptionsSize)) {
-                mCheckTrackerWindow->ToggleVisibility();
-            }
-        }
-
-        ImGui::SameLine(0, 0);
-        cursor = ImGui::GetCursorPos();
-        ImGui::SetCursorPos(ImVec2(cursor.x + separationToOptionsButton, cursor.y));
-
-        if (mCheckTrackerSettingsWindow) {
-            ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(FA_ICON_BUTTON_FRAME_PADDING_X(ICON_FA_COG), 6.0f));
-            if (ImGui::Button(ICON_FA_COG "##CheckTrackerSettings", optionsButtonSize)) {
-                mCheckTrackerSettingsWindow->ToggleVisibility();
-            }
-            ImGui::PopStyleVar();
-        }
-
-        ImGui::PopStyleVar(3);
-        ImGui::PopStyleColor(1);
-
-        UIWidgets::PaddedSeparator();
-
-        if (ImGui::BeginMenu("Rando Enhancements"))
-        {
-            UIWidgets::EnhancementCheckbox("Rando-Relevant Navi Hints", CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), false, "", UIWidgets::CheckboxGraphics::Cross, true);
-            UIWidgets::Tooltip(
-                "Replace Navi's overworld quest hints with rando-related gameplay hints."
-            );
-            UIWidgets::PaddedEnhancementCheckbox("Random Rupee Names", CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true);
-            UIWidgets::Tooltip(
-                "When obtaining rupees, randomize what the rupee is called in the textbox."
-            );
-            
-            UIWidgets::PaddedEnhancementCheckbox("Use Custom Key Models", CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"), true, false);
-            UIWidgets::Tooltip("Use Custom graphics for dungeon keys, Big and Small, so that they can be easily told apart");
-
-            bool disableCompassColors = !DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS);
-
-            static const char* disableCompassColorsText =
-                "This setting is disabled because a savefile is loaded without the compass\n"
-                "shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\"";
-
-            if (UIWidgets::PaddedEnhancementCheckbox("Compass Colors Match Dungeon", CVAR_RANDOMIZER_ENHANCEMENT("MatchCompassColors"), true, false,
-                                                  disableCompassColors, disableCompassColorsText, UIWidgets::CheckboxGraphics::Cross, true)) {
-                PatchCompasses();
-            }
-            UIWidgets::Tooltip(
-                "Matches the color of compasses to the dungeon they belong to. "
-                "This helps identify compasses from afar and adds a little bit of flair.\n\nThis only "
-                "applies to seeds with compasses shuffled to \"Any Dungeon\", \"Overworld\", or \"Anywhere\".");
-
-            UIWidgets::PaddedEnhancementCheckbox("Quest Item Fanfares", CVAR_RANDOMIZER_ENHANCEMENT("QuestItemFanfares"), true, false);
-            UIWidgets::Tooltip(
-                "Play unique fanfares when obtaining quest items "
-                "(medallions/stones/songs). Note that these fanfares are longer than usual."
-            );
-            UIWidgets::PaddedEnhancementCheckbox("Mysterious Shuffled Items", CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), true, false);
-            UIWidgets::Tooltip(
-                "Displays a \"Mystery Item\" model in place of any freestanding/GS/shop items that were shuffled, "
-                "and replaces item names for them and scrubs and merchants, regardless of hint settings, "
-                "so you never know what you're getting.");
-            UIWidgets::PaddedEnhancementCheckbox("Simpler Boss Soul Models",
-                                                 CVAR_RANDOMIZER_ENHANCEMENT("SimplerBossSoulModels"), true, false);
-            UIWidgets::Tooltip(
-                "When shuffling boss souls, they'll appear as a simpler model instead of showing the boss' models."
-                "This might make boss souls more distinguishable from a distance, and can help with performance."
-            );
-            ImGui::EndMenu();
-        }
-
-        ImGui::EndMenu();
-    }
 }
 
 void SohMenuBar::InitElement() {
-    UpdateWindowBackendObjects();
 }
 
 void SohMenuBar::DrawElement() {
     if (ImGui::BeginMenuBar()) {
-        DrawMenuBarIcon();
-
         static ImVec2 sWindowPadding(8.0f, 8.0f);
 
         ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, sWindowPadding);
 
-        DrawShipMenu();
-
-        ImGui::SetCursorPosY(0.0f);
-
         DrawSettingsMenu();
 
         ImGui::SetCursorPosY(0.0f);
 
-        DrawEnhancementsMenu();
-
-        ImGui::SetCursorPosY(0.0f);
-
-        DrawCheatsMenu();
-
-        ImGui::SetCursorPosY(0.0f);
-
-        DrawDeveloperToolsMenu();
-
-        ImGui::SetCursorPosY(0.0f);
-
-        #ifdef ENABLE_REMOTE_CONTROL
-        DrawRemoteControlMenu();
-
-        ImGui::SetCursorPosY(0.0f);
-        #endif
-
-        DrawRandomizerMenu();
-
         ImGui::PopStyleVar(1);
         ImGui::EndMenuBar();
     }
diff --git a/soh/soh/SohGui/SohMenuBar.h b/soh/soh/SohGui/SohMenuBar.h
index b90960e2ce..8c078e08f3 100644
--- a/soh/soh/SohGui/SohMenuBar.h
+++ b/soh/soh/SohGui/SohMenuBar.h
@@ -8,9 +8,10 @@ namespace SohGui {
 class SohMenuBar : public Ship::GuiMenuBar {
   public:
     using Ship::GuiMenuBar::GuiMenuBar;
+
   protected:
     void DrawElement() override;
     void InitElement() override;
-    void UpdateElement() override {};
+    void UpdateElement() override{};
 };
 } // namespace SohGui
\ No newline at end of file
diff --git a/soh/soh/SohGui/SohMenuDevTools.cpp b/soh/soh/SohGui/SohMenuDevTools.cpp
new file mode 100644
index 0000000000..3e87af8906
--- /dev/null
+++ b/soh/soh/SohGui/SohMenuDevTools.cpp
@@ -0,0 +1,190 @@
+#include "SohMenu.h"
+
+namespace SohGui {
+
+extern std::shared_ptr<SohMenu> mSohMenu;
+using namespace UIWidgets;
+
+void SohMenu::AddMenuDevTools() {
+    // Add Dev Tools Menu
+    AddMenuEntry("Dev Tools", CVAR_SETTING("Menu.DevToolsSidebarSection"));
+
+    // General
+    AddSidebarEntry("Dev Tools", "General", 3);
+    WidgetPath path = { "Dev Tools", "General", SECTION_COLUMN_1 };
+
+    AddWidget(path, "Popout Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar("gSettings.Menu.Popout")
+        .Options(CheckboxOptions().Tooltip("Changes the menu display from overlay to windowed."));
+    AddWidget(path, "Debug Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("DebugEnabled"))
+        .Options(
+            CheckboxOptions().Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip "
+                                      "with L + D-pad Right, and open the debug menu with L on the pause screen."));
+    AddWidget(path, "Boot To Debug Warp Screen", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("BootToDebugWarpScreen"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0); })
+        .Options(
+            CheckboxOptions().Tooltip("Automatically shows Debug Warp Screen when starting or resetting the game.\n"
+                                      "This option takes precedence over \"Boot Sequence\" option."));
+    AddWidget(path, "OoT Registry Editor", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("RegEditEnabled"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0); })
+        .Options(CheckboxOptions().Tooltip("Enables the registry editor."));
+    AddWidget(path, "Debug Save File Mode", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("DebugSaveFileMode"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0); })
+        .Options(ComboboxOptions()
+                     .Tooltip("Changes the behavior of debug file select creation (creating a save file on slot 1 "
+                              "with debug mode on):\n"
+                              "- Off: The debug save file will be a normal savefile.\n"
+                              "- Vanilla: The debug save file will be the debug save file from the original game.\n"
+                              "- Maxed: The debug save file will be a save file with all of the items & upgrades.")
+                     .ComboMap(debugSaveFileModes));
+    AddWidget(path, "OoT Skulltula Debug", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("SkulltulaDebugEnabled"))
+        .Options(CheckboxOptions().Tooltip("Enables Skulltula Debug, when moving the cursor in the menu above various "
+                                           "map icons (boss key, compass, map screen locations, etc.) will set the GS "
+                                           "bits in that area.\nUSE WITH CAUTION AS IT DOES NOT UPDATE THE GS COUNT!"));
+    AddWidget(path, "Better Debug Warp Screen", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"))
+        .Options(CheckboxOptions()
+                     .Tooltip("Optimized Debug Warp Screen, with the added ability to chose entrances and time of day.")
+                     .DefaultValue(true));
+    AddWidget(path, "Debug Warp Screen Translation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"))
+        .Options(CheckboxOptions()
+                     .Tooltip("Translate the Debug Warp Screen based on the game language.")
+                     .DefaultValue(true));
+    AddWidget(path, "Resource logging", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("ResourceLogging"))
+        .Options(CheckboxOptions().Tooltip("Logs some resources as XML when they're loaded in binary format."));
+
+    AddWidget(path, "Frame Advance", WIDGET_CHECKBOX)
+        .Options(CheckboxOptions().Tooltip(
+            "This allows you to advance through the game one frame at a time on command. "
+            "To advance a frame, hold Z and tap R on the second controller. Holding Z "
+            "and R will advance a frame every half second. You can also use the buttons below."))
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NULL_PLAY_STATE).active ||
+                            mSohMenu->disabledMap.at(DISABLE_FOR_DEBUG_MODE_OFF).active;
+            if (gPlayState != nullptr) {
+                info.valuePointer = (bool*)&gPlayState->frameAdvCtx.enabled;
+            } else {
+                info.valuePointer = (bool*)nullptr;
+            }
+        });
+    AddWidget(path, "Advance 1", WIDGET_BUTTON)
+        .Options(ButtonOptions().Tooltip("Advance 1 frame.").Size(Sizes::Inline))
+        .Callback([](WidgetInfo& info) { CVarSetInteger(CVAR_DEVELOPER_TOOLS("FrameAdvanceTick"), 1); })
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_FRAME_ADVANCE_OFF).active ||
+                            mSohMenu->disabledMap.at(DISABLE_FOR_DEBUG_MODE_OFF).active;
+        });
+    AddWidget(path, "Advance (Hold)", WIDGET_BUTTON)
+        .Options(ButtonOptions().Tooltip("Advance frames while the button is held.").Size(Sizes::Inline))
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_FRAME_ADVANCE_OFF).active ||
+                            mSohMenu->disabledMap.at(DISABLE_FOR_DEBUG_MODE_OFF).active;
+        })
+        .PostFunc([](WidgetInfo& info) {
+            if (ImGui::IsItemActive()) {
+                CVarSetInteger(CVAR_DEVELOPER_TOOLS("FrameAdvanceTick"), 1);
+            }
+        })
+        .SameLine(true);
+    AddWidget(path, "Log Level", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("LogLevel"))
+        .Options(ComboboxOptions()
+                     .Tooltip("The log level determines which messages are printed to the console."
+                              " This does not affect the log file output")
+                     .ComboMap(logLevels))
+        .Callback([](WidgetInfo& info) {
+            Ship::Context::GetInstance()->GetLogger()->set_level(
+                (spdlog::level::level_enum)CVarGetInteger(CVAR_DEVELOPER_TOOLS("LogLevel"), DEBUG_LOG_DEBUG));
+        })
+        .PreFunc([](WidgetInfo& info) { info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_DEBUG_MODE_OFF).active; });
+
+    // Stats
+    path.sidebarName = "Stats";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 1);
+    AddWidget(path, "Popout Stats Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("SohStats"))
+        .RaceDisable(false)
+        .WindowName("Stats##Soh")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Stats Window."));
+
+    // Console
+    path.sidebarName = "Console";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 1);
+    AddWidget(path, "Popout Console", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("SohConsole"))
+        .WindowName("Console##SoH")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Console Window."));
+
+    // Save Editor
+    path.sidebarName = "Save Editor";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 1);
+    AddWidget(path, "Popout Save Editor", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("SaveEditor"))
+        .WindowName("Save Editor")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Save Editor Window."));
+
+    // Hook Debugger
+    path.sidebarName = "Hook Debugger";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 1);
+    AddWidget(path, "Popout Hook Debugger", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("HookDebugger"))
+        .WindowName("Hook Debugger")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Hook Debugger Window."));
+
+    // Collision Viewer
+    path.sidebarName = "Collision Viewer";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 2);
+    AddWidget(path, "Popout Collision Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("CollisionViewer"))
+        .WindowName("Collision Viewer")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Collision Viewer Window."));
+
+    // Actor Viewer
+    path.sidebarName = "Actor Viewer";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 2);
+    AddWidget(path, "Popout Actor Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ActorViewer"))
+        .WindowName("Actor Viewer")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Actor Viewer Window."));
+
+    // Display List Viewer
+    path.sidebarName = "DList Viewer";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 2);
+    AddWidget(path, "Popout Display List Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("DisplayListViewer"))
+        .WindowName("Display List Viewer")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Display List Viewer Window."));
+
+    // Value Viewer
+    path.sidebarName = "Value Viewer";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 2);
+    AddWidget(path, "Popout Value Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ValueViewer"))
+        .WindowName("Value Viewer")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Value Viewer Window."));
+
+    // Message Viewer
+    path.sidebarName = "Message Viewer";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 2);
+    AddWidget(path, "Popout Message Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("MessageViewer"))
+        .WindowName("Message Viewer")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Message Viewer Window."));
+
+    // Gfx Debugger
+    path.sidebarName = "Gfx Debugger";
+    AddSidebarEntry("Dev Tools", path.sidebarName, 1);
+    AddWidget(path, "Popout Gfx Debugger", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("SohGfxDebugger"))
+        .WindowName("GfxDebugger##SoH")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Gfx Debugger Window."));
+}
+
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohMenuEnhancements.cpp b/soh/soh/SohGui/SohMenuEnhancements.cpp
new file mode 100644
index 0000000000..c8d456923b
--- /dev/null
+++ b/soh/soh/SohGui/SohMenuEnhancements.cpp
@@ -0,0 +1,1762 @@
+#include "SohMenu.h"
+#include <soh/Enhancements/mods.h>
+#include <soh/Enhancements/game-interactor/GameInteractor.h>
+#include <soh/OTRGlobals.h>
+#include <soh/Enhancements/cosmetics/authenticGfxPatches.h>
+#include <soh/Enhancements/enemyrandomizer.h>
+#include <soh/Enhancements/TimeDisplay/TimeDisplay.h>
+
+static std::string comboboxTooltip = "";
+bool isBetaQuestEnabled = false;
+static std::unordered_map<int32_t, const char*> bunnyHoodEffectMap = {
+    { BUNNY_HOOD_VANILLA, "Vanilla" },
+    { BUNNY_HOOD_FAST, "Faster Run" },
+    { BUNNY_HOOD_FAST_AND_JUMP, "Faster + Longer Jump" },
+};
+
+extern "C" {
+void enableBetaQuest() {
+    isBetaQuestEnabled = true;
+}
+void disableBetaQuest() {
+    isBetaQuestEnabled = false;
+}
+}
+
+namespace SohGui {
+
+extern std::shared_ptr<SohMenu> mSohMenu;
+using namespace UIWidgets;
+
+void SohMenu::AddMenuEnhancements() {
+    // Add Enhancements Menu
+    AddMenuEntry("Enhancements", CVAR_SETTING("Menu.EnhancementsSidebarSection"));
+
+    // Quality of Life
+    WidgetPath path = { "Enhancements", "Quality of Life", SECTION_COLUMN_1 };
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Saving", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Autosave", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("Autosave"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Save the game automatically on a 3 minute interval and when soft-resetting the game. The interval "
+            "autosave will wait if the game is paused in any way (dialogue, pause screen up, cutscenes, "
+            "etc.).\n\n"
+            "The soft-reset save will *not* trigger in cutscene maps like the Chamber of Sages!"));
+    AddWidget(path, "Remember Save Location", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RememberSaveLocation"))
+        .Options(CheckboxOptions().Tooltip(
+            "When loading a save, places Link at the last entrance he went through.\n"
+            "This doesn't work if the save was made in grottos, fairy fountains, or dungeons."));
+
+    AddWidget(path, "Containers Match Contents", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Chest Size & Texture Matches Contents", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"))
+        .Callback([](WidgetInfo& info) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), CSMC_DISABLED) == CSMC_DISABLED) {
+                CVarSetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0);
+            }
+        })
+        .Options(ComboboxOptions()
+                     .ComboMap(chestStyleMatchesContentsOptions)
+                     .DefaultIndex(CSMC_DISABLED)
+                     .Tooltip("Chest sizes and textures are changed to help identify the item inside.\n"
+                              " - Major items: Large gold chests\n"
+                              " - Lesser items: Large brown chests\n"
+                              " - Junk items: Small brown chests\n"
+                              " - Small keys: Small silver chests\n"
+                              " - Boss keys: Vanilla size and texture\n"
+                              " - Skulltula Tokens: Small Skulltula chest\n"
+                              "\n"
+                              "NOTE: Textures will not apply if you are using a mod pack with a custom chest model."));
+    AddWidget(path, "Chests of Agony", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"))
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchesContents"), CSMC_DISABLED);
+        })
+        .Options(CheckboxOptions().Tooltip("Only change the size/texture of chests if you have the Stone of Agony."));
+
+    AddWidget(path, "Time of Day", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Nighttime GS Always Spawn", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"))
+        .Options(CheckboxOptions().Tooltip("Nighttime Skulltulas will spawn during both day and night."));
+    AddWidget(path, "Pull Grave During the Day", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DayGravePull"))
+        .Options(CheckboxOptions().Tooltip("Allows graves to be pulled when child during the day."));
+    AddWidget(path, "Dampe Appears All Night", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DampeAllNight"))
+        .Options(CheckboxOptions().Tooltip(
+            "Makes Dampe appear anytime during the night, not just his usual working hours."));
+    AddWidget(path, "Exit Market at Night", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("MarketSneak"))
+        .Options(CheckboxOptions().Tooltip(
+            "Allows exiting Hyrule Castle Market Town to Hyrule Field at night by speaking to the guard "
+            "next to the gate."));
+    AddWidget(path, "Shops and Games Always Open", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("OpenAllHours"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_LOCK_OVERWORLD_DOORS).Is(RO_GENERIC_ON);
+        })
+        .Options(
+            CheckboxOptions()
+                .Tooltip("Shops and Minigames are open both day and night. Requires a scene reload to take effect.")
+                .DisabledTooltip("This is not compatible with the Locked Overworld Doors Randomizer option."));
+
+    AddWidget(path, "Pause Menu", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Allow the Cursor to be on Any Slot", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("PauseAnyCursor"))
+        .Options(
+            ComboboxOptions()
+                .ComboMap(cursorAnywhereValues)
+                .DefaultIndex(PAUSE_ANY_CURSOR_RANDO_ONLY)
+                .Tooltip("Allows the cursor on the pause menu to be over any slot. Sometimes required in Randomizer "
+                         "to select certain items."));
+    AddWidget(path, "Pause Warp", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("PauseWarp"))
+        .Options(CheckboxOptions().Tooltip(
+            "Selection of warp song in pause menu initiates a warp. Disables song playback."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Controls", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Answer Navi Prompt with L Button", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NaviOnL"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Speak to Navi with L but enter First-Person Camera with C-Up."));
+    AddWidget(path, "Don't Require Input for Credits Sequence", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NoInputForCredits"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Removes the Input Requirement on Text boxes after defeating Ganon, allowing the Credits "
+            "Sequence to continue to progress."));
+    AddWidget(path, "Include Held Inputs at the Start of Pause Buffer Input Window", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("IncludeHeldInputsBufferWindow"))
+        .Options(CheckboxOptions().Tooltip(
+            "Typically, inputs that are held prior to the buffer window are not included in the buffer. This "
+            "setting changes that behavior to include them. This may cause some inputs to be re-triggered "
+            "undesireably, for instance Z-Targeting something you might not want to."));
+    AddWidget(path, "Pause Buffer Input Window: %d frames", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("PauseBufferWindow"))
+        .Options(IntSliderOptions()
+                     .Min(0)
+                     .Max(40)
+                     .DefaultValue(0)
+                     .Format("%d frames")
+                     .Tooltip("Adds back in a delay after unpausing before the game resumes playing again, "
+                              "where inputs can be held prematurely to be input immediately after the game resumes. "
+                              "This essentially brings back behaviour from console releases which are lost on default "
+                              "because SoH isn't limited to N64 hardware."));
+    AddWidget(path, "Simulated Input Lag: %d frames", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SIMULATED_INPUT_LAG)
+        .Options(IntSliderOptions()
+                     .Min(0)
+                     .Max(6)
+                     .DefaultValue(0)
+                     .Format("%d frames")
+                     .Tooltip("Buffers your inputs to be executed a specified amount of frames later."));
+
+    AddWidget(path, "Item Count Messages", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Gold Skulltula Tokens", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"))
+        .RaceDisable(false);
+    AddWidget(path, "Pieces of Heart", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"))
+        .RaceDisable(false);
+    AddWidget(path, "Heart Containers", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"))
+        .RaceDisable(false);
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Misc", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Disable Crit Wiggle", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableCritWiggle"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Disable Random Camera Wiggle at Low Health."));
+    AddWidget(path, "Better Owl", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BetterOwl"))
+        .Options(CheckboxOptions().Tooltip(
+            "The default response to Kaepora Gaebora is always that you understood what he said."));
+
+    AddWidget(path, "Convenience", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Quit Fishing at Door", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("QuitFishingAtDoor"))
+        .Options(CheckboxOptions().Tooltip(
+            "Fisherman asks if you want to quit at the door if you try to leave the Fishing Pond "
+            "while still holding the Fishing Rod."));
+    AddWidget(path, "Instant Putaway", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantPutaway"))
+        .Options(CheckboxOptions().Tooltip("Allow Link to put items away without having to wait around."));
+    AddWidget(path, "Navi Timer Resets on Scene Change", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ResetNaviTimer"))
+        .Options(
+            CheckboxOptions().Tooltip("Resets the Navi timer on scene change. If you have already talked to her, "
+                                      "she will try and talk to you again, instead of needing a save warp or death."));
+    AddWidget(path, "Link's Cow in Both Time Periods", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CowOfTime"))
+        .Options(CheckboxOptions().Tooltip(
+            "Allows the Lon Lon Ranch Obstacle Course reward to be shared across time periods."));
+    AddWidget(path, "Play Zelda's Lullaby to Open Sleeping Waterfall", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SleepingWaterfall"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                IS_RANDO &&
+                OTRGlobals::Instance->gRandoContext->GetOption(RSK_SLEEPING_WATERFALL).Is(RO_WATERFALL_OPEN);
+            info.options->disabledTooltip = "This setting is forcefully enabled because a randomizer savefile with "
+                                            "\"Sleeping Waterfall: Open\" is loaded.";
+        })
+        .Options(
+            ComboboxOptions()
+                .ComboMap(sleepingWaterfallOptions)
+                .DefaultIndex(WATERFALL_ALWAYS)
+                .Tooltip(
+                    "Always: Link must always play Zelda's Lullaby to open the waterfall entrance to Zora's Domain.\n"
+                    "Once: Link only needs to play Zelda's Lullaby once to open the waterfall; after that, it stays "
+                    "open permanently.\n"
+                    "Never: Link never needs to play Zelda's Lullaby to open the waterfall. He only needs to have "
+                    "learned it and have an Ocarina."));
+
+    // Skips & Speed-ups
+    path.sidebarName = "Skips & Speed-ups";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Cutscenes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "All##Skips", WIDGET_BUTTON)
+        .Options(ButtonOptions().Size(Sizes::Inline))
+        .Callback([](WidgetInfo& info) {
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), true);
+            CVarSetInteger(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"), true);
+
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        });
+    AddWidget(path, "None##Skips", WIDGET_BUTTON)
+        .SameLine(true)
+        .Options(ButtonOptions().Size(Sizes::Inline))
+        .Callback([](WidgetInfo& info) {
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"));
+            CVarClear(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"));
+
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        });
+    AddWidget(path, "Skip Intro", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Entrance Cutscenes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Entrances"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Story Cutscenes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Song Cutscenes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.LearnSong"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Boss Introductions", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.BossIntro"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Quick Boss Deaths", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.QuickBossDeaths"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip One Point Cutscenes (Chests, Door Unlocks, etc.)", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Owl Interactions", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipOwlInteractions"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Skip Misc Interactions", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Disable Title Card", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.DisableTitleCard"))
+        .Options(CheckboxOptions().DefaultValue(IS_RANDO));
+    AddWidget(path, "Exclude Glitch-Aiding Cutscenes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"))
+        .Options(CheckboxOptions().Tooltip(
+            "Don't skip cutscenes that are associated with useful glitches. Currently, it is "
+            "only the Fire Temple Darunia CS, Forest Temple Poe Sisters CS, Dodongo Boss "
+            "Door Switch CS, Water Temple Dragon Switch CS, and the Box Skip One Point in Jabu."));
+
+    AddWidget(path, "Text", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Skip Pickup Messages", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FastDrops"))
+        .Options(CheckboxOptions().Tooltip("Skip Pickup Messages for new Consumable Items and Bottle Swipes."));
+    AddWidget(path, "Skip Forced Dialog", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipForcedDialog"))
+        .Options(ComboboxOptions()
+                     .ComboMap(skipForcedDialogOptions)
+                     .DefaultIndex(FORCED_DIALOG_SKIP_NONE)
+                     .Tooltip("Prevent forced conversations with Navi and/or other NPCs."));
+    AddWidget(path, "Skip Text", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipText"))
+        .Options(CheckboxOptions().Tooltip("Holding down B skips text."));
+    AddWidget(path, "Text Speed: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("TextSpeed"))
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx"));
+    AddWidget(path, "Slow Text Speed: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("SlowTextSpeed"))
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx").Tooltip(
+            "Changes the speed of sections of text that normally are paced slower than the text surrounding it."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Animations", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Faster Heavy Block Lift", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterHeavyBlockLift"))
+        .Options(CheckboxOptions().Tooltip("Speeds up lifting Silver Rocks and Obelisks."));
+    AddWidget(path, "Faster Shadow Ship", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterShadowShip"))
+        .Options(CheckboxOptions().Tooltip("Speeds up ship in Shadow Temple."));
+    AddWidget(path, "Fast Chests", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FastChests"))
+        .Options(CheckboxOptions().Tooltip("Makes Link always kick the chest to open it, instead of doing the longer "
+                                           "chest opening animation for major items."));
+    AddWidget(path, "Skip Water Take Breath Animation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipSwimDeepEndAnim"))
+        .Options(CheckboxOptions().Tooltip("Skips Link's taking breath animation after coming up from water. "
+                                           "This setting does not interfere with getting items from underwater."));
+    AddWidget(path, "Empty Bottles Faster", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterBottleEmpty"))
+        .Options(CheckboxOptions().Tooltip("Speeds up emptying animation when dumping out the contents of a bottle."));
+    AddWidget(path, "Vine/Ladder Climb Speed +%d", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("ClimbSpeed"))
+        .Options(IntSliderOptions().Min(0).Max(12).DefaultValue(0).Format("+%d"));
+    AddWidget(path, "Block Pushing Speed +%d", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("FasterBlockPush"))
+        .Options(IntSliderOptions().Min(0).Max(5).DefaultValue(0).Format("+%d"));
+    AddWidget(path, "Crawl Speed %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("CrawlSpeed"))
+        .Options(IntSliderOptions().Min(1).Max(4).DefaultValue(1).Format("%dx"));
+    AddWidget(path, "Exclude Glitch-Aiding Crawlspaces", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GlitchAidingCrawlspaces"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 0) == 1; })
+        .Options(CheckboxOptions().Tooltip("Don't increase crawl speed when exiting glitch-useful crawlspaces."
+                                           "Currently it is only the BOTW crawlspace to locked door"));
+    AddWidget(path, "King Zora Speed: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_ENHANCEMENT("MweepSpeed"))
+        .Options(FloatSliderOptions().Min(0.1f).Max(5.0f).DefaultValue(1.0f).Format("%.2fx"));
+    AddWidget(path, "Faster Pause Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterPauseMenu"))
+        .Options(CheckboxOptions().Tooltip("Speeds up animation of the pause menu, similar to Majora's Mask"));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Misc", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Skip Child Stealth", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipChildStealth"))
+        .Options(CheckboxOptions().Tooltip(
+            "The crawlspace into Hyrule Castle goes straight to Zelda, skipping the guards."));
+    AddWidget(path, "Skip Tower Escape", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"))
+        .Options(CheckboxOptions().Tooltip("Skip the tower escape sequence between Ganondorf and Ganon."));
+    AddWidget(path, "Skip Scarecrow's Song", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantScarecrow"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_SKIP_SCARECROWS_SONG);
+            info.options->disabledTooltip = "This setting is forcefully enabled because a randomized "
+                                            "save file with the option \"Skip Scarecrow Song\" is currently loaded.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Pierre appears when an Ocarina is pulled out. Requires learning the Scarecrow's Song first."));
+    AddWidget(path, "Faster Rupee Accumulator", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterRupeeAccumulator"))
+        .Options(CheckboxOptions().Tooltip("Causes your Wallet to fill and empty faster when you gain or lose money."));
+    AddWidget(path, "No Skulltula Freeze", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkulltulaFreeze"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true);
+            info.options->disabledTooltip =
+                "This setting is disabled because a randomizer savefile is loaded. Please use the "
+                "\"Skip Get Item Animation\" option within the randomizer enhancements instead.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Stops the game from freezing the player when picking up Gold Skulltula Tokens. Does not "
+            "apply in randomizer savefiles."));
+    AddWidget(path, "Skip Save Confirmation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipSaveConfirmation"))
+        .Options(CheckboxOptions().Tooltip("Skip the \"Game Saved\" confirmation screen."));
+    AddWidget(path, "Link as Default File Name", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("LinkDefaultName"))
+        .Options(CheckboxOptions().Tooltip("Allows you to have \"Link\" as a premade file name."));
+    AddWidget(path, "Spawn Bean Skulltula Faster", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FasterBeanSkull"))
+        .Options(CheckboxOptions().Tooltip(
+            "Makes Gold Skulltulas come out of bean patches faster after bugs dig into center."));
+    AddWidget(path, "Biggoron Forge Time: %d days", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("ForgeTime"))
+        .Options(IntSliderOptions().Min(0).Max(3).DefaultValue(3).Format("%d days").Tooltip(
+            "Allows you to change the number of days it takes for "
+            "Biggoron to forge the Biggoron's Sword."));
+
+    // Graphics
+    path.sidebarName = "Graphics";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Mods", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Use Alternate Assets", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("AltAssets"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Toggle between standard assets and alternate assets. Usually mods will indicate if "
+            "this setting has to be used or not."));
+    AddWidget(path, "Disable Bomb Billboarding", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableBombBillboarding"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to "
+            "replace bombs with 3D objects."));
+    AddWidget(path, "Disable Grotto Fixed Rotation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableGrottoRotation"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Disables Grottos rotating with the Camera. To be used in conjuction with mods that want to "
+            "replace grottos with 3D objects."));
+    AddWidget(path, "Ingame Text Spacing: %d", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("TextSpacing"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(4).Max(6).DefaultValue(6).Tooltip(
+            "Space between text characters (useful for HD font textures)."));
+
+    AddWidget(path, "Models & Textures", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Disable LOD", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableLOD"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Turns off the Level of Detail setting, making models use their Higher-Poly variants at any distance."));
+    AddWidget(path, "Enemy Health Bars", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EnemyHealthBar"))
+        .Options(CheckboxOptions().Tooltip("Renders a health bar for Enemies when Z-Targeted."));
+    AddWidget(path, "Enable 3D Dropped Items/Projectiles", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NewDrops"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Replaces most 2D items and projectiles on the overworld with their equivalent 3D models."));
+    AddWidget(path, "Animated Link in Pause Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Turns the Static Image of Link in the Pause Menu's Equipment Subscreen "
+                                           "into a model cycling through his idle animations."));
+    AddWidget(path, "Show Age-Dependent Equipment", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { UpdatePatchHand(); })
+        .Options(CheckboxOptions().Tooltip("Makes all equipment visible, regardless of age."));
+    AddWidget(path, "Scale Adult Equipment as Child", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"))
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) == 0;
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Scales all of the Adult Equipment, as well as moving some a bit, to fit on Child Link better. May "
+            "not work properly with some mods."));
+    AddWidget(path, "Show Gauntlets in First Person", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FirstPersonGauntlets"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Renders Gauntlets when using the Bow and Hookshot like in OoT3D."));
+    AddWidget(path, "Show Chains on Both Sides of Locked Doors", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ShowDoorLocksOnBothSides"))
+        .RaceDisable(false);
+    AddWidget(path, "Color Temple of Time's Medallions", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ToTMedallionsColors"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { PatchToTMedallions(); })
+        .Options(CheckboxOptions().Tooltip(
+            "When Medallions are collected, the Medallion imprints around the Master Sword Pedestal in the Temple "
+            "of Time will become colored-in."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "UI", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Minimal UI", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("MinimalUI"))
+        .Options(CheckboxOptions().Tooltip("Hides most of the UI when not needed.\n"
+                                           "NOTE: Doesn't activate until scene transition."));
+    AddWidget(path, "Disable Hot/Underwater Warning Text", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableTunicWarningText"))
+        .Options(CheckboxOptions().Tooltip("Disables warning text when you don't have on the Goron/Zora Tunic "
+                                           "in Hot/Underwater conditions."));
+    AddWidget(path, "Remember Minimap State Between Areas", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RememberMapToggleState"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Preserve the minimap visibility state when going between areas rather than default it to \"on\" "
+            "when going through loading zones."));
+    AddWidget(path, "Visual Stone of Agony", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("VisualAgony"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble."));
+    AddWidget(path, "Disable HUD Heart Animations", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NoHUDHeartAnimation"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Disables the Beating Animation of the Hearts on the HUD."));
+    AddWidget(path, "Glitch Line-up Tick", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DrawLineupTick"))
+        .Options(CheckboxOptions().Tooltip(
+            "Displays a tick in the top center of the screen to help with glitch line-ups in SoH, since traditional "
+            "UI based line-ups do not work outside of 4:3"));
+    AddWidget(path, "Disable Black Bar Letterboxes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableBlackBars"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Disables Black Bar Letterboxes during cutscenes and Z-Targeting. NOTE: There may be minor visual "
+            "glitches that were covered up by the black bars. Please disable this setting before reporting a bug."));
+    AddWidget(path, "Dynamic Wallet Icon", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DynamicWalletIcon"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Changes the Rupee in the Wallet icon to match the wallet size you currently have."));
+    AddWidget(path, "Always Show Dungeon Entrances", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Always shows dungeon entrance icons on the Minimap."));
+    AddWidget(path, "More Info in File Select", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FileSelectMoreInfo"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Shows what items you have collected in the File Select screen, like in N64 Randomizer."));
+    AddWidget(path, "Better Ammo Rendering in Pause Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BetterAmmoRendering"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Ammo counts in the pause menu will work correctly regardless of the position of items in the Inventory."));
+    AddWidget(path, "Enable Passage of Time on File Select", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeFlowFileSelect"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("The skybox in the background of the File Select screen will go through the "
+                                           "day and night cycle over time."));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Misc.", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "N64 Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_LOW_RES_MODE)
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Sets the aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution."));
+    AddWidget(path, "Remove Spin Attack Darkness", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RemoveSpinAttackDarkness"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Remove the Darkness that appears when charging a Spin Attack."));
+    AddWidget(path, "Draw Distance", WIDGET_SEPARATOR_TEXT).RaceDisable(false);
+    AddWidget(path, "Increase Actor Draw Distance: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("DisableDrawDistance"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1) {
+                CVarSetInteger(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), 0);
+            }
+        })
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx").Tooltip(
+            "Increases the range in which Actors/Objects are drawn."));
+    AddWidget(path, "Kokiri Draw Distance", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"))
+        .RaceDisable(false)
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1; })
+        .Options(CheckboxOptions().Tooltip(
+            "The Kokiri are mystical beings that fade into view when approached. Enabling this will remove their "
+            "draw distance."));
+    AddWidget(path, "Widescreen Actor Culling", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("WidescreenActorCulling"))
+        .Options(
+            CheckboxOptions().Tooltip("Adjusts the Horizontal Culling Plane to account for Widescreen Resolutions."));
+    AddWidget(path, "Cull Glitch Useful Actors", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtendedCullingExcludeGlitchActors"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = !CVarGetInteger(CVAR_ENHANCEMENT("WidescreenActorCulling"), 0) &&
+                                     CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1;
+            info.options->disabledTooltip =
+                "Requires Actor Draw Distance to be increased or Widscreen Actor Culling to be enabled.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Exclude Actors that are useful for Glitches from the extended culling ranges. Some actors may still draw "
+            "in the extended ranges, but will not \"update\" so that certain glitches that leverage the original "
+            "culling requirements will still work.\n\nThe following actors are excluded:\n"
+            " - White Clothed Gerudos\n"
+            " - King Zora\n"
+            " - Gossip Stones\n"
+            " - Boulders\n"
+            " - Blue Warps\n"
+            " - Darunia\n"
+            " - Gold Skulltulas\n"));
+
+    path.sidebarName = "Items";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Equipment", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Equip Items on Dpad", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DpadEquips"))
+        .Options(CheckboxOptions().Tooltip(
+            "Equip items and equipment on the D-pad. If used with \"D-pad on Pause Screen\", you must "
+            "hold C-Up to equip instead of navigate."));
+    AddWidget(path, "Assignable Tunics and Boots", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"))
+        .Options(CheckboxOptions().Tooltip("Allows equipping the Tunics and Boots to C-Buttons/D-pad."));
+    // TODO: Revist strength toggle, it's currently separate but should probably be locked behind the
+    // Equipment toggle settings or be absorbed by it completely.
+    AddWidget(path, "Equipment Toggle", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"))
+        .Options(CheckboxOptions().Tooltip(
+            "Allows equipment to be removed by toggling it on/off\n the equipment subscreen."));
+    AddWidget(path, "Allow Strength Equipment to be Toggled", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ToggleStrength"))
+        .Callback([](WidgetInfo& info) {
+            if (!CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)) {
+                CVarSetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0);
+            }
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Allows Strength to be toggled on and off by pressing A on the Strength Upgrade "
+            "in the Equipment Subscreen of the Pause Menu. This allows performing some glitches "
+            "that require the player to not have Strength."));
+    AddWidget(path, "Sword Toggle Options", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("SwordToggle"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 0) == 0; })
+        .Options(ComboboxOptions()
+                     .ComboMap(swordToggleModes)
+                     .DefaultIndex(SWORD_TOGGLE_NONE)
+                     .Tooltip("Introduces Options for unequipping Link's sword\n\n"
+                              "None: Only Biggoron's Sword/Giant's Knife can be toggled. Doing so will equip the "
+                              "Master Sword.\n\n"
+                              "Child Toggle: This will allow for completely unequipping any sword as Child link.\n\n"
+                              "Both Ages: Any sword can be unequipped as either age. This may lead to swordless "
+                              "glitches as adult."));
+    AddWidget(path, "Ask to Equip New Items", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AskToEquip"))
+        .Options(CheckboxOptions().Tooltip("Adds a prompt to equip newly-obtained Swords, Shields, and Tunics."));
+
+    AddWidget(path, "Ocarina", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Prevent Dropped Ocarina Inputs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"))
+        .Options(CheckboxOptions().Tooltip("Prevent dropping inputs when playing the Ocarina too quickly."));
+    AddWidget(path, "Fast Ocarina Playback", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FastOcarinaPlayback"))
+        .Options(CheckboxOptions().Tooltip("Skip the part where the Ocarina Playback is called when you play a song."));
+    AddWidget(path, "Time Travel with Song of Time", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("TimeTravel"))
+        .Options(ComboboxOptions()
+                     .ComboMap(timeTravelOptions)
+                     .DefaultIndex(0)
+                     .Tooltip("Allows Link to freely change age by playing the Song of Time.\n"
+                              "Time Blocks can still be used properly.\n\n"
+                              "Requirements:\n"
+                              " - Obtained the Ocarina of Time (depends on selection)\n"
+                              " - Obtained the Song of Time\n"
+                              " - Obtained the Master Sword\n"
+                              " - Not within range of a Time Block\n"
+                              " - Not within range of Ocarina Playing spots"));
+
+    AddWidget(path, "Masks", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Bunny Hood Effect", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("MMBunnyHood"))
+        .Options(ComboboxOptions()
+                     .ComboMap(bunnyHoodEffectMap)
+                     .Tooltip("Wearing the Bunny Hood grants a speed and jump boost like in Majora's Mask.\n"
+                              "Can also be limited to only the speed boost.\n"
+                              "The effects of either option are not accounted for in Randomizer logic.\n"
+                              "Also disables NPC's reactions to wearing the Bunny Hood."));
+    AddWidget(path, "Masks Equippable as Adult", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AdultMasks"))
+        .Options(CheckboxOptions().Tooltip("Allows masks to be equipped normally from the pause menu as adult."));
+    AddWidget(path, "Persistent Masks", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("PersistentMasks"))
+        .Options(
+            CheckboxOptions().Tooltip("Stops masks from automatically unequipping on certain situations:\n"
+                                      "- When entering a new scene\n"
+                                      "- When not in any C-Button or the D-pad\n"
+                                      "- When saving and quitting\n"
+                                      "- When dying\n"
+                                      "- When traveling through time (if \"Masks Equippable as Adult\" is activated)"));
+    AddWidget(path, "Invisible Bunny Hood", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HideBunnyHood"))
+        .Options(CheckboxOptions().Tooltip("Turns Bunny Hood Invisible while still maintaining its effects."));
+    AddWidget(path, "Mask Select in Inventory", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("MaskSelect"))
+        .Options(CheckboxOptions().Tooltip(
+            "After completing the mask trading sub-quest, press A and any direction on the mask "
+            "slot to change masks."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Explosives", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Deku Nuts Explode Bombs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NutsExplodeBombs"))
+        .Options(CheckboxOptions().Tooltip("Make Deku Nuts explode Bombs, similar to how they interact with Bombchus. "
+                                           "This does not affect Bomb Flowers."));
+    AddWidget(path, "Remove Explosive Limit", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RemoveExplosiveLimit"))
+        .Options(CheckboxOptions().Tooltip("Removes the cap of 3 active explosives being deployed at once."));
+    AddWidget(path, "Static Explosion Radius", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("StaticExplosionRadius"))
+        .Options(CheckboxOptions().Tooltip(
+            "Explosions are now a static size, like in Majora's Mask and OoT3D. Makes Bombchu "
+            "hovering much easier."));
+    AddWidget(path, "Prevent Bombchus Forcing First-Person", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DisableFirstPersonChus"))
+        .Options(CheckboxOptions().Tooltip(
+            "Prevent Bombchus from forcing the camera into first-person mode when released."));
+    AddWidget(path, "Better Bombchu Shopping", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BetterBombchuShopping"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true);
+            info.options->disabledTooltip = "This setting is forcefully enabled when you are playing a randomizer.";
+        })
+        .Options(
+            CheckboxOptions().Tooltip("Bombchus do not sell out when bought, and a 10 pack of Bombchus costs 99 rupees "
+                                      "instead of 100."));
+
+    AddWidget(path, "Bow / Slingshot", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Equip Multiple Arrows at Once", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SeparateArrows"))
+        .Options(CheckboxOptions().Tooltip(
+            "Allow the Bow and Magic Arrows to be equipped at the same time on different slots. "
+            "NOTE: This will disable the behavior of the 'Equip Dupe' glitch."));
+    AddWidget(path, "Skip Magic Arrow Equip Animation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipArrowAnimation"));
+    // TODO: See if a Callback could be registered to avoid the need to reload scenes for the next two options.
+    AddWidget(path, "Blue Fire Arrows", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BlueFireArrows"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                OTRGlobals::Instance->gRandoContext->GetOption(RSK_BLUE_FIRE_ARROWS).Is(RO_GENERIC_ON);
+            info.options->disabledTooltip = "This setting is forcefully enabled because a randomized savefile with "
+                                            "\"Blue Fire Arrows\" is currently loaded.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Allows Ice Arrows to melt Red Ice. May require a room reload if toggled during gameplay."));
+    AddWidget(path, "Sunlight Arrows", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SunlightArrows"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                OTRGlobals::Instance->gRandoContext->GetOption(RSK_SUNLIGHT_ARROWS).Is(RO_GENERIC_ON);
+            info.options->disabledTooltip = "This setting is forcefully enabled because a randomized savefile with "
+                                            "\"Sunlight Arrows\" enabled is currently loaded.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Allows Light Arrows to activate Sun Switches. May require a room reload if toggled during gameplay."));
+    AddWidget(path, "Bow as Child/Slingshot as Adult", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"))
+        .Options(CheckboxOptions().Tooltip("Allows Child Link to use a Bow with Arrows.\n"
+                                           "Allows Adult Link to use a Slingshot with Seeds.\n\n"
+                                           "Requires glitches or the 'Timeless Equipment' cheat to equip."));
+    AddWidget(path, "Aiming Reticle for the Bow/Slingshot", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BowReticle"))
+        .Options(CheckboxOptions().Tooltip("Aiming with a Bow or Slingshot will display a reticle as with the Hookshot "
+                                           "when the projectile is ready to fire."));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Hookshot", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Targetable Hookshot Reticle", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HookshotableReticle"))
+        .Options(CheckboxOptions().Tooltip(
+            "Makes the Hookshot Reticle use a different color when aiming at hookshotable collision."));
+
+    AddWidget(path, "Boomerang", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Instant Boomerang Recall", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FastBoomerang"))
+        .Options(CheckboxOptions().Tooltip("Instantly return the Boomerang to Link by pressing its item button while "
+                                           "it's in the air."));
+    AddWidget(path, "Aim Boomerang in First-Person Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BoomerangFirstPerson"))
+        .Callback([](WidgetInfo& info) {
+            if (!CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
+                CVarSetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0);
+            }
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Change aiming for the Boomerang from Third-Person to First-Person to see past Link's head."));
+    AddWidget(path, "Aiming Reticle for Boomerang", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BoomerangReticle"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0); })
+        .Options(CheckboxOptions().Tooltip("Aiming with the Boomerang will display a reticle as with the Hookshot."));
+
+    AddWidget(path, "Magic Spells", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Better Farore's Wind", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BetterFarore"))
+        .Options(CheckboxOptions().Tooltip(
+            "Helps FW persist between ages, gives Child and Adult separate FW points, and can "
+            "be used in more places."));
+    AddWidget(path, "Faster Farore's Wind", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FastFarores"))
+        .Options(CheckboxOptions().Tooltip("Greatly decreases cast time of Farore's Wind magic spell."));
+
+    AddWidget(path, "Bottles", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Rebottle Blue Fire", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RebottleBlueFire"))
+        .Options(CheckboxOptions().Tooltip("Blue Fire dropped from bottle can be bottled."));
+
+    // Fixes
+    path.sidebarName = "Fixes";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+    AddWidget(path, "Gameplay Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix the Gravedigging Tour Glitch", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GravediggingTourFix"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true);
+            info.options->disabledTooltip = "This setting is always enabled in randomized save files.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes a bug where the Gravedigging Tour Heart Piece disappears if the area reloads."));
+    AddWidget(path, "Fix Raised Floor Switches", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixFloorSwitches"))
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes the two raised floor switches, the one in Forest Temple Basement and the one at the top of Fire "
+            "Temple. This will lower them, making activating them easier."));
+    AddWidget(path, "Fix Zora Hint Dialogue", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixZoraHintDialogue"))
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes one Zora's dialogue giving a hint about bringing Ruto's Letter to King Zora to properly occur "
+            "before moving King Zora rather than after."));
+    AddWidget(path, "Fix Falling from Vine Edges", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixVineFall"))
+        .Options(
+            CheckboxOptions().Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."));
+    AddWidget(path, "Fix Bush Item Drops", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BushDropFix"))
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes the bushes to drop items correctly rather than spawning undefined items."));
+    AddWidget(path, "Fix Enemies not Spawning Near Water", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"))
+        .Options(CheckboxOptions().Tooltip(
+            "Causes respawning enemies, like Stalchildren, to appear on land near bodies of water. "
+            "Fixes an incorrect calculation that acted like water underneath ground was above it."));
+    AddWidget(path, "Fix Poacher's Saw Softlock", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixSawSoftlock"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) == 1;
+            info.options->disabledTooltip = "This option is forced on when Skip Text is enabled.";
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Prevents the Poacher's Saw softlock from mashing through the text, or with Skip Text enabled."));
+    AddWidget(path, "Fix Anubis Fireballs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AnubisFix"))
+        .Options(CheckboxOptions().Tooltip(
+            "Make Anubis Fireballs do Fire damage when reflected back at them with the Mirror Shield."));
+
+    AddWidget(path, "Item-related Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix Deku Nut Upgrade", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DekuNutUpgradeFix"))
+        .Options(CheckboxOptions().Tooltip("Prevents the Forest Stage Deku Nut upgrade from becoming unobtainable "
+                                           "after receiving the Poacher's Saw."));
+    AddWidget(path, "Fix Megaton Hammer Crouch Stab", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CrouchStabHammerFix"))
+        .Callback([](WidgetInfo& info) {
+            if (!CVarGetInteger(CVAR_ENHANCEMENT("CrouchStabHammerFix"), 0)) {
+                CVarClear(CVAR_ENHANCEMENT("CrouchStabFix"));
+            }
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Make the Megaton Hammer's crouch stab able to destroy rocks without first swinging it normally."));
+    AddWidget(path, "Remove Power Crouch Stab", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CrouchStabFix"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("CrouchStabHammerFix"), 0) == 0; })
+        .Options(CheckboxOptions().Tooltip("Make crouch stabbing always do the same damage as a regular slash."));
+    AddWidget(path, "Fix Broken Giant's Knife Bug", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true);
+            info.options->disabledTooltip = "This setting is forcefully enabled when you are playing a Randomizer.";
+        })
+        .Callback([](WidgetInfo& info) {
+            bool hasGiantsKnife = CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON);
+            bool hasBrokenKnife = CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
+            bool knifeIsBroken = gSaveContext.swordHealth == 0.0f;
+
+            if (hasGiantsKnife && (hasBrokenKnife != knifeIsBroken)) {
+                func_800849EC(gPlayState);
+            }
+        })
+        .Options(
+            CheckboxOptions().Tooltip("Fixes the Broken Giant's Knife flag not being reset when Medigoron fixes it."));
+
+    AddWidget(path, "Camera Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix Camera Drift", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixCameraDrift"))
+        .Options(CheckboxOptions().Tooltip("Fixes camera slightly drifting to the left when standing still due to a "
+                                           "math error. May impact certain glitches."));
+    AddWidget(path, "Fix Camera Swing", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixCameraSwing"))
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes camera getting stuck on collision when standing still. Also fixes slight shift "
+            "back in camera when Link stops moving. May impact certain glitches."));
+    AddWidget(path, "Fix Hanging Ledge Swing Rate", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixHangingLedgeSwingRate"))
+        .Options(CheckboxOptions().Tooltip("Fixes camera swing rate when the player falls off a ledge and the camera "
+                                           "swings around. May impact certain glitches."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Graphical Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix L&R Pause Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixMenuLR"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Makes the L and R buttons in the pause menu the same color."));
+    AddWidget(path, "Fix Dungeon Entrances", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Removes the Dungeon Entrance icon on the top-left corner of the screen when no dungeon is present on the "
+            "current map."));
+    AddWidget(path, "Fix Two-Handed Idle Animations", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TwoHandedIdle"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Re-Enables the two-handed idle animation, a seemingly finished animation that was disabled on accident "
+            "in the original game."));
+    AddWidget(path, "Fix Navi Text HUD Position", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NaviTextFix"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Correctly centers the Navi text prompt on the HUD's C-Up button."));
+    AddWidget(path, "Fix Gerudo Warrior's Clothing Colors", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Prevent the Gerudo Warrior's clothes changing color when changing Link's tunic or "
+            "using bombs in front of her."));
+    AddWidget(path, "Fix Out of Bounds Textures", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixTexturesOOB"))
+        .Callback([](WidgetInfo& info) { ApplyAuthenticGfxPatches(); })
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes authentic out of bounds texture reads, instead loading textures with the correct size."));
+    AddWidget(path, "Fix Link's Eyes Open while Sleeping", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixEyesOpenWhileSleeping"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping."));
+    AddWidget(path, "Fix Hand Holding Hammer", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixHammerHand"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { UpdatePatchHand(); })
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes Adult Link having a backwards Left hand when holding the Megaton Hammer."));
+    AddWidget(path, "Fix Vanishing Paths", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("SceneSpecificDirtPathFix"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            if (gPlayState != NULL) {
+                UpdateDirtPathFixState(gPlayState->sceneNum);
+            }
+        })
+        .Options(
+            ComboboxOptions()
+                .ComboMap(zFightingOptions)
+                .DefaultIndex(ZFIGHT_FIX_DISABLED)
+                .Tooltip("Disabled: Paths vanish more the higher the resolution (Z-Fighting is based on resolution).\n"
+                         "Consistent: Certain paths vanish the same way in all resolutions.\n"
+                         "No Vanish: Paths do not vanish, Link seems to sink in to some paths.\n"
+                         "This might affect other decal effects.\n"));
+
+    AddWidget(path, "Audio Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix Missing Jingle after 5 Silver Rupees", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Adds 5 higher pitches for the Silver Rupee Jingle for the rooms with more than 5 Silver Rupees. "
+            "Only relevant for playthroughs involving Master Quest Dungeons."));
+
+    AddWidget(path, "Desync Fixes", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix Darunia Dancing too Fast", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Fixes Darunia's dancing speed so he dances to the beat of Saria's Song, like in the Original Game."));
+    AddWidget(path, "Fix Credits Timing (PAL)", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CreditsFix"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Extend certain credits scenes so the music lines up properly with the visuals. (PAL only)"));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Graphical Restorations", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Red Ganon Blood", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RedGanonBlood"))
+        .RaceDisable(false)
+        .Options(
+            CheckboxOptions().Tooltip("Restore the original red blood from NTSC 1.0/1.1. Disable for Green blood."));
+    AddWidget(path, "Restore Old Gold Skulltula Cutscene", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GSCutscene"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restore pre-release behavior where defeating a Gold Skulltula will play a cutscene showing it die."));
+    AddWidget(path, "Pulsate Boss Icon", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("PulsateBossIcon"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Restores an unfinished feature to pulsate the boss room icon when you are in the boss room."));
+
+    AddWidget(path, "Glitch Restorations", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fish while Hovering", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HoverFishing"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restore a bug from NTSC 1.0 that allows casting the Fishing Rod while using the Hover Boots."));
+    AddWidget(path, "N64 Weird Frames", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("N64WeirdFrames"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restores N64 Weird Frames allowing weirdshots and weirdslides to behave the same as N64."));
+    AddWidget(path, "Bombchus Out of Bounds", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BombchusOOB"))
+        .Options(
+            CheckboxOptions().Tooltip("Allows Bombchus to explode out of bounds. Similar to GameCube and Wii VC."));
+    AddWidget(path, "Quick Putaway", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("QuickPutaway"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restore a bug from NTSC 1.0 that allows putting away an item without an animation and performing "
+            "Putaway Ocarina Items."));
+    AddWidget(path, "Quick Bongo Kill", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("QuickBongoKill"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restore a bug from NTSC 1.0 that allows bypassing Bongo Bongo's intro cutscene to quickly kill him."));
+    AddWidget(path, "Early Eyeball Frog", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EarlyEyeballFrog"))
+        .Options(CheckboxOptions().Tooltip(
+            "Restores a bug from NTSC 1.0/1.1 that allows you to obtain the eyeball frog from King Zora "
+            "instead of the Zora Tunic by Holding Shield."));
+
+    AddWidget(path, "Misc Restorations", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Fix L&Z Page Switch in Pause Menu", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NGCKaleidoSwitcher"))
+        .Options(CheckboxOptions().Tooltip(
+            "Makes L and R switch pages like on the GameCube. Z opens the Debug Menu instead."));
+
+    // Difficulty Options
+    path.sidebarName = "Difficulty";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Health", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Permanent Heart Loss", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("PermanentHeartLoss"))
+        .Callback([](WidgetInfo& info) { UpdatePermanentHeartLossState(); })
+        .Options(CheckboxOptions().Tooltip(
+            "When you lose 4 quarters of a heart you will permanently lose that Heart Container.\n\n"
+            "Disabling this after the fact will restore your Heart Containers."));
+    AddWidget(path, "Damage Multiplier", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("DamageMult"))
+        .Options(ComboboxOptions().ComboMap(allPowers).DefaultIndex(0).Tooltip(
+            "Modifies all sources of damage not affected by other sliders:\n"
+            "2x: Can survive all common attacks from the start of the game.\n"
+            "4x: Dies in 1 hit to any substantial attack from the start of the game.\n"
+            "8x: Can only survive trivial damage from the start of the game.\n"
+            "16x: Can survive all common attacks with max health without double defense.\n"
+            "32x: Can survive all common attacks with max health and double defense.\n"
+            "64x: Can survive trivial damage with max health without double defense.\n"
+            "128x: Can survive trivial damage with max health and double defense.\n"
+            "256x: Cannot survive damage."));
+    AddWidget(path, "Fall Damage Multiplier", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("FallDamageMult"))
+        .Options(ComboboxOptions().ComboMap(subPowers).Tooltip(
+            "Modifies all fall damage:\n"
+            "2x: Can survive all fall damage from the start of the game.\n"
+            "4x: Can only survive short fall damage from the start of the game.\n"
+            "8x: Cannot survive any fall damage from the start of the game.\n"
+            "16x: Can survive all fall damage with max health without double defense.\n"
+            "32x: Can survive all fall damage with max health and double defense.\n"
+            "64x: Can survive short fall damage with double defense.\n"
+            "128x: Cannot survive fall damage."));
+    AddWidget(path, "Void Damage Multiplier", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("VoidDamageMult"))
+        .Options(ComboboxOptions()
+                     .ComboMap(subSubPowers)
+                     .DefaultIndex(0)
+                     .Tooltip("Modifies damage taken after falling into a void:\n"
+                              "2x: Can survive void damage from the start of the game.\n"
+                              "4x: Cannot survive void damage from the start of the game.\n"
+                              "8x: Can survive void damage twice with max health without double defense.\n"
+                              "16x: Can survive void damage with max health without double defense.\n"
+                              "32x: Can survive void damage with max health and double defense.\n"
+                              "64x: Cannot survive void damage."));
+    AddWidget(path, "Bonk Damage Multiplier", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("BonkDamageMult"))
+        .Options(ComboboxOptions()
+                     .ComboMap(bonkDamageValues)
+                     .DefaultIndex(BONK_DAMAGE_NONE)
+                     .Tooltip("Modifies Damage taken after Bonking."));
+    AddWidget(path, "Spawn with Full Health", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FullHealthSpawn"))
+        .Options(CheckboxOptions().Tooltip("Respawn with Full Health instead of 3 hearts."));
+    AddWidget(path, "No Heart Drops", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NoHeartDrops"))
+        .Options(CheckboxOptions().Tooltip(
+            "Disables Heart Drops, but not Heart Placements, like from a Deku Scrub running off.\n"
+            "This simulates Hero Mode from other games in the series."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Drops", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "No Random Drops", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("NoRandomDrops"))
+        .Options(CheckboxOptions().Tooltip("Disables Random Drops, except from the Goron Pot, Dampe, and Bosses."));
+    AddWidget(path, "Enable Bombchu Drops", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EnableBombchuDrops"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                IS_RANDO && GameInteractor::IsSaveLoaded(true) &&
+                OTRGlobals::Instance->gRandoContext->GetOption(RSK_ENABLE_BOMBCHU_DROPS).Is(RO_GENERIC_ON);
+            info.options->disabledTooltip = "This setting is forcefully enabled because a randomized savefile with "
+                                            "\"Enable Bombchu Drops\" is loaded.";
+        })
+        .Options(CheckboxOptions().Tooltip("Bombchus will sometimes drop in place of Bombs."));
+    AddWidget(path, "Trees Drop Sticks", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("TreesDropSticks"))
+        .Options(CheckboxOptions().Tooltip(
+            "Bonking into Trees will have a chance to drop up to 3 Sticks. Must have obtained sticks previously."));
+    AddWidget(path, "Dampe Drop Rate", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("DampeDropRate"))
+        .Options(ComboboxOptions()
+                     .ComboMap(dampeDropRates)
+                     .DefaultIndex(DAMPE_NORMAL)
+                     .Tooltip("Adjusts rate Dampe drops flames during race."));
+
+    AddWidget(path, "Miscellaneous", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Delete File on Death", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DeleteFileOnDeath"))
+        .Options(CheckboxOptions().Tooltip("Dying will delete your file.\n\n" ICON_FA_EXCLAMATION_TRIANGLE
+                                           " WARNING " ICON_FA_EXCLAMATION_TRIANGLE
+                                           "\nTHIS IS NOT REVERSIBLE!\nUSE AT YOUR OWN RISK!"));
+    AddWidget(path, "Switch Timer Multiplier", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("SwitchTimerMultiplier"))
+        .Options(IntSliderOptions().Min(-5).Max(5).DefaultValue(0).Format("%+d").Tooltip(
+            "-5 will be half as much time, +5 will be 6x as much time. Affects timed switches, torches, GTG statue "
+            "eyes, & doors in race with Dampe."));
+    AddWidget(path, "Always Win Goron Pot", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GoronPot"))
+        .Options(CheckboxOptions().Tooltip("Always get the Heart Piece/Purple Rupee from the Spinning Goron Pot."));
+    AddWidget(path, "Always Win Dampe Digging Game", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DampeWin"))
+        .Options(CheckboxOptions().Tooltip(
+            "Always win the Heart Piece/Purple Rupee on the first dig in Dampe's Grave Digging game. "
+            "In a Randomizer file, this is always enabled."));
+    AddWidget(path, "All Dogs are Richard", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AllDogsRichard"))
+        .Options(CheckboxOptions().Tooltip("All dogs can be traded in and will count as Richard."));
+    AddWidget(path, "Cuccos Stay Put Multiplier: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("CuccoStayDurationMult"))
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx").Tooltip(
+            "Cuccos will stay in place longer after putting them down, by a multiple of the value of the slider."));
+    AddWidget(path, "Cuccos Needed By Anju: %d", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("CuccosToReturn"))
+        .Options(IntSliderOptions().Min(0).Max(7).DefaultValue(7).Format("%d").Tooltip(
+            "The amount of cuccos needed to receive bottle from Anju the Cucco Lady."));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Enemies", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Hyper Bosses", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HyperBosses"))
+        .Callback([](WidgetInfo& info) { UpdateHyperBossesState(); })
+        .Options(CheckboxOptions().Tooltip("All Major Bosses move and act twice as fast."));
+    AddWidget(path, "Hyper Enemies", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HyperEnemies"))
+        .Callback([](WidgetInfo& info) { UpdateHyperEnemiesState(); })
+        .Options(CheckboxOptions().Tooltip("All Regular Enemies and Mini-Bosses move and act twice as fast."));
+    AddWidget(path, "Enable Visual Guard Vision", WIDGET_CVAR_CHECKBOX).CVar(CVAR_ENHANCEMENT("GuardVision"));
+    AddWidget(path, "Leever Spawn Rate: %d seconds", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("LeeverSpawnRate"))
+        .Options(IntSliderOptions()
+                     .Min(0)
+                     .Max(10)
+                     .DefaultValue(0)
+                     .Format("%d seconds")
+                     .Tooltip("The time between groups of Leevers spawning."));
+
+    // Minigames
+    path.sidebarName = "Minigames";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Shooting Gallery", WIDGET_SEPARATOR_TEXT);
+    auto shootingGalleryDisabledFunc = [](WidgetInfo& info) {
+        info.options->disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0);
+        info.options->disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off.";
+    };
+    AddWidget(path, "Customize Behavior##Shooting", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CustomizeShootingGallery"))
+        .Options(CheckboxOptions().Tooltip("Turn on/off changes to the shooting gallery behavior."));
+    AddWidget(path, "Instant Win", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantShootingGalleryWin"))
+        .PreFunc(shootingGalleryDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Skips the Shooting Gallery minigame."));
+    AddWidget(path, "No Rupee Randomization", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ConstantAdultGallery"))
+        .PreFunc(shootingGalleryDisabledFunc)
+        .Options(CheckboxOptions().Tooltip(
+            "Forces the rupee order to not be randomized as adult, making it the same as child."));
+    AddWidget(path, "Child Starting Ammunition: %d seeds", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"))
+        .PreFunc(shootingGalleryDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(10)
+                     .Max(30)
+                     .DefaultValue(15)
+                     .Format("%d seeds")
+                     .Tooltip("The ammunition at the start of the Shooting Gallery minigame as Child."));
+    AddWidget(path, "Adult Starting Ammunition: %d arrows", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult"))
+        .PreFunc(shootingGalleryDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(10)
+                     .Max(30)
+                     .DefaultValue(15)
+                     .Format("%d arrows")
+                     .Tooltip("The ammunition at the start of the Shooting Gallery minigame as Adult."));
+
+    AddWidget(path, "Bombchu Bowling", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Customize Behavior##Bowling", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CustomizeBombchuBowling"))
+        .Options(CheckboxOptions().Tooltip("Turn on/off changes to the Bombchu Bowling behavior."));
+    auto bombchuBowlingDisabledFunc = [](WidgetInfo& info) {
+        info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) == 0;
+        info.options->disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off.";
+    };
+    AddWidget(path, "Remove Small Cucco", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco"))
+        .PreFunc(bombchuBowlingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Prevents the small Cucco from appearing in the Bombchu Bowling minigame."));
+    AddWidget(path, "Remove Big Cucco", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"))
+        .PreFunc(bombchuBowlingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Prevents the big Cucco from appearing in the Bombchu Bowling minigame."));
+    AddWidget(path, "Bombchu Count: %d bombchus", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("BombchuBowlingAmmo"))
+        .PreFunc(bombchuBowlingDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(3)
+                     .Max(20)
+                     .DefaultValue(10)
+                     .Format("%d bombchus")
+                     .Tooltip("The number of Bombchus available at the start of the Bombchu Bowling minigame."));
+    AddWidget(path, "Frogs' Ocarina Game", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Customize Behavior##Frogs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"))
+        .Options(CheckboxOptions().Tooltip("Turn on/off changes to the Frogs' Ocarina Game behavior."));
+    auto frogsOcarinaGameDisabledFunc = [](WidgetInfo& info) {
+        info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0) == 0;
+        info.options->disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off.";
+    };
+    AddWidget(path, "Instant Win##Frogs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantFrogsGameWin"))
+        .PreFunc(frogsOcarinaGameDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Skips the Frogs' Ocarina Game."));
+    AddWidget(path, "Unlimited Playback Time##Frogs", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FrogsUnlimitedFailTime"))
+        .PreFunc(frogsOcarinaGameDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Removes the timer to play back the song."));
+    AddWidget(path, "Modify Note Timer: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("FrogsModifyFailTime"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0) ||
+                                     CVarGetInteger(CVAR_ENHANCEMENT("FrogsUnlimitedFailTime"), 0);
+            info.options->disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off or "
+                                            "\"Unlimited Playback Time\" is on.";
+        })
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx").Tooltip(
+            "Adjusts the time allowed for playback before failing."));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Lost Woods Ocarina Game", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Customize Behavior##LostWoods", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CustomizeOcarinaGame"))
+        .Options(CheckboxOptions().Tooltip("Turn on/off changes to the Lost Woods Ocarina Game behavior."));
+    auto ocarinaMemoryGameDisabledFunc = [](WidgetInfo& info) {
+        info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0) == 0;
+        info.options->disabledTooltip = "This options is disabled because \"Customize Behavior\" is turned off.";
+    };
+    AddWidget(path, "Instant Win##LostWoods", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantOcarinaGameWin"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Skips the Lost Woods Ocarina Memory Game."));
+    AddWidget(path, "Note Play Speed: %dx", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("OcarinaGame.NoteSpeed"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(IntSliderOptions().Min(1).Max(5).DefaultValue(1).Format("%dx").Tooltip(
+            "Adjust the speed that the Skull Kids play the notes."));
+    AddWidget(path, "Unlimited Playback Time##LostWoods", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("OcarinaUnlimitedFailTime"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Removes the timer to play back the song."));
+    AddWidget(path, "Number of Starting Notes: %d notes", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(1)
+                     .Max(8)
+                     .DefaultValue(3)
+                     .Format("%d notes")
+                     .Tooltip("Adjust the number of notes the Skull Kids play to start the first round."));
+    int roundMin = CVarGetInteger(CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"), 3);
+    AddWidget(path, "Round One Notes: %d notes", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("OcarinaGame.RoundOneNotes"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(roundMin)
+                     .Max(8)
+                     .DefaultValue(5)
+                     .Format("%d notes")
+                     .Tooltip("Adjust the number of notes you need to play to end the first round."));
+    AddWidget(path, "Round Two Notes: %d notes", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("OcarinaGame.RoundTwoNotes"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(roundMin)
+                     .Max(8)
+                     .DefaultValue(6)
+                     .Format("%d notes")
+                     .Tooltip("Adjust the number of notes you need to play to end the second round."));
+    AddWidget(path, "Round Three Notes: %d notes", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("OcarinaGame.RoundThreeNotes"))
+        .PreFunc(ocarinaMemoryGameDisabledFunc)
+        .Options(IntSliderOptions()
+                     .Min(roundMin)
+                     .Max(8)
+                     .DefaultValue(8)
+                     .Format("%d notes")
+                     .Tooltip("Adjust the number of notes you need to play to end the third round."));
+
+    AddWidget(path, "Forest Temple", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Solve Amy's Puzzle", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipAmyPuzzle"))
+        .Options(CheckboxOptions().Tooltip("Amy's block pushing puzzle instantly solved."));
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Fishing", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Customize Behavior##Fishing", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("CustomizeFishing"))
+        .Options(CheckboxOptions().Tooltip("Turn on/off changes to the Fishing behavior."));
+    auto fishingDisabledFunc = [](WidgetInfo& info) {
+        info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) == 0;
+        info.options->disabledTooltip = "This option is disabled because \"Customize Behavior\" is turned off.";
+    };
+    AddWidget(path, "Instant Fishing", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("InstantFishing"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("All fish will be caught instantly."));
+    AddWidget(path, "Guarantee Bite", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("GuaranteeFishingBite"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("When a line is stable, guarantee bite. Otherwise use Default logic."));
+    AddWidget(path, "Fish never Escape", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("FishNeverEscape"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Once a hook as been set, Fish will never let go while being reeled in."));
+    AddWidget(path, "Loaches always Appear", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("LoachesAlwaysAppear"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(
+            CheckboxOptions().Tooltip("Loaches will always appear in the fishing pond instead of every four visits."));
+    AddWidget(path, "Skip Keep Confirmation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("SkipKeepConfirmation"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(
+            CheckboxOptions().Tooltip("The Pond Owner will not ask to confirm if you want to keep a smaller Fish."));
+    AddWidget(path, "All Fish are Hyrule Loaches", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("AllHyruleLoaches"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(CheckboxOptions().Tooltip("Every fish in the Fishing Pond will always be a Hyrule Loach.\n\n"
+                                           "NOTE: This requires reloading the area."));
+    AddWidget(path, "Child Minimum Weight: %d lbs.", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("MinimumFishWeightChild"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(IntSliderOptions().Min(3).Max(10).DefaultValue(10).Format("%d lbs.").Tooltip(
+            "The minimum weight for the unique Fishing Reward as a child."));
+    AddWidget(path, "Adult Minimum Weight: %d lbs.", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("MinimumFishWeightAdult"))
+        .PreFunc(fishingDisabledFunc)
+        .Options(IntSliderOptions().Min(6).Max(13).DefaultValue(13).Format("%d lbs.").Tooltip(
+            "The minimum weight for the unique fishing reward as an adult."));
+
+    // Extra Modes
+    path.sidebarName = "Extra Modes";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Mirrored World", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("MirroredWorldMode"))
+        .Callback([](WidgetInfo& info) {
+            if (gPlayState != NULL) {
+                UpdateMirrorModeState(gPlayState->sceneNum);
+            }
+        })
+        .Options(
+            ComboboxOptions()
+                .DefaultIndex(MIRRORED_WORLD_OFF)
+                .ComboMap(mirroredWorldModes)
+                .Tooltip(
+                    "Mirrors the world horizontally:\n\n"
+                    " - Always: Always mirror the world.\n"
+                    " - Random: Randomly decide to mirror the world on each scene change.\n"
+                    " - Random (Seeded): Scenes are mirrored based on the current randomizer seed/file.\n"
+                    " - Dungeons: Mirror the world in Dungeons.\n"
+                    " - Dungeons (Vanilla): Mirror the world in Vanilla Dungeons.\n"
+                    " - Dungeons (MQ): Mirror the world in MQ Dungeons.\n"
+                    " - Dungeons Random: Randomly decide to mirror the world in Dungeons.\n"
+                    " - Dungeons Random (Seeded): Dungeons are mirrored based on the current randomizer seed/file.\n"));
+    AddWidget(path, "Ivan the Fairy (Coop Mode)", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("IvanCoopModeEnabled"))
+        .Options(CheckboxOptions().Tooltip(
+            "Enables Ivan the Fairy upon the next map change. Player 2 can control Ivan and press the C-Buttons to "
+            "use items and mess with Player 1!"));
+    AddWidget(path, "Dogs Follow You Everywhere", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("DogFollowsEverywhere"))
+        .Options(CheckboxOptions().Tooltip("Allows dogs to follow you anywhere you go, even if you leave the Market."));
+    AddWidget(path, "Rupee Dash Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RupeeDash"))
+        .Options(CheckboxOptions().Tooltip("Rupees reduce over time, Link suffers damage when the count hits 0."));
+    AddWidget(path, "Rupee Dash Interval %d seconds", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_ENHANCEMENT("RupeeDashInterval"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("RupeeDash"), 0) == 0; })
+        .Options(IntSliderOptions()
+                     .Min(1)
+                     .Max(10)
+                     .DefaultValue(5)
+                     .Format("%d seconds")
+                     .Tooltip("Interval between Rupee reduction in Rupee Dash Mode."));
+    AddWidget(path, "Shadow Tag Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ShadowTag"))
+        .Options(CheckboxOptions().Tooltip("A Wallmaster follows Link everywhere, don't get caught!"));
+    AddWidget(path, "Hurt Container Mode", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("HurtContainer"))
+        .Callback([](WidgetInfo& info) {
+            UpdateHurtContainerModeState(CVarGetInteger(CVAR_ENHANCEMENT("HurtContainer"), 0));
+        })
+        .Options(CheckboxOptions().Tooltip("Changes Heart Piece and Heart Container functionality.\n\n"
+                                           " - Each Heart Container or full Heart Piece reduces Link's Hearts by 1.\n"
+                                           " - Can be enabled retroactively after a File has already started."));
+    AddWidget(path, "Additional Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Enabled"))
+        .Options(CheckboxOptions().Tooltip("Enables additional Trap variants."));
+    AddWidget(path, "Trap Options", WIDGET_SEPARATOR_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0;
+    });
+    AddWidget(path, "Tier 1 Traps:", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0;
+    });
+    AddWidget(path, "Freeze Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Ice"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Burn Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Burn"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Shock Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Shock"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Tier 2 Traps:", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0;
+    });
+    AddWidget(path, "Knockback Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Knockback"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Speed Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Speed"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Bomb Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Bomb"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Tier 3 Traps:", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0;
+    });
+    AddWidget(path, "Void Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Void"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Ammo Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Ammo"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Death Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Kill"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+    AddWidget(path, "Teleport Traps", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("ExtraTraps.Teleport"))
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("ExtraTraps.Enabled"), 0) == 0; });
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Enemy Randomizer", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("RandomizedEnemies"))
+        .Callback([](WidgetInfo& info) { GetSelectedEnemies(); })
+        .Options(
+            ComboboxOptions()
+                .DefaultIndex(ENEMY_RANDOMIZER_OFF)
+                .ComboMap(enemyRandomizerModes)
+                .Tooltip("Replaces fixed enemies throughout the game with a random enemy. Bosses, Mini-Bosses and a "
+                         "few specific regular enemies are excluded.\n"
+                         "Enemies that need more than Deku Nuts & either Deku Sticks or a sword to kill are excluded "
+                         "from spawning in \"clear enemy\" rooms.\n\n"
+                         "- Random: Enemies are randomized every time you load a room.\n"
+                         "- Random (Seeded): Enemies are randomized based on the current randomizer seed/file.\n"));
+    AddWidget(path, "Randomized Enemy Sizes", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RandomizedEnemySizes"))
+        .Options(CheckboxOptions().Tooltip("Enemies and Bosses spawn with random sizes."));
+    AddWidget(path, "Scale Health with Size", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("EnemySizeScalesHealth"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemySizes"), 0);
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Scales normal enemies Health with their randomized size. *This will NOT affect Bosses!*"));
+    AddWidget(path, "Enemy List", WIDGET_SEPARATOR_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
+    });
+    AddWidget(path, "Select all Enemies", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENHANCEMENT("RandomizedEnemyList.All"))
+        .PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0); });
+    AddWidget(path, "Enemy List", WIDGET_SEPARATOR).PreFunc([](WidgetInfo& info) {
+        info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
+    });
+    for (int i = 0; i < RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE; i++) {
+        AddWidget(path, enemyNameList[i], WIDGET_CVAR_CHECKBOX)
+            .CVar(enemyCVarList[i])
+            .Options(CheckboxOptions().DefaultValue(true))
+            .PreFunc([](WidgetInfo& info) {
+                info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
+                info.options->disabled = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemyList.All"), 0);
+                info.options->disabledTooltip = "These options are disabled because \"Select All Enemies\" is enabled.";
+            })
+            .Callback([](WidgetInfo& info) { GetSelectedEnemies(); });
+    }
+
+    // Cheats
+    path.sidebarName = "Cheats";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path, "Infinite...", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Money", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteMoney"));
+    AddWidget(path, "Health", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteHealth"));
+    AddWidget(path, "Ammo", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteAmmo"));
+    AddWidget(path, "Magic", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteMagic"));
+    AddWidget(path, "Nayru's Love", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteNayru"));
+    AddWidget(path, "Epona Boost", WIDGET_CVAR_CHECKBOX).CVar(CVAR_CHEAT("InfiniteEponaBoost"));
+
+    AddWidget(path, "Items", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Timeless Equipment", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("TimelessEquipment"))
+        .Options(CheckboxOptions().Tooltip("Allows any item to be equipped, regardless of age.\n"
+                                           "Also allows child to use adult strength upgrades."));
+    AddWidget(path, "Unrestricted Items", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoRestrictItems"))
+        .Options(CheckboxOptions().Tooltip("Allows you to use any item at any location"));
+    AddWidget(path, "Super Tunic", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("SuperTunic"))
+        .Options(CheckboxOptions().Tooltip("Makes every tunic have the effects of every other tunic."));
+    AddWidget(path, "Fireproof Deku Shield", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("FireproofDekuShield"))
+        .Options(CheckboxOptions().Tooltip("Prevents the Deku Shield from burning on contact with fire."));
+    AddWidget(path, "Shield with Two-Handed Weapons", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("ShieldTwoHanded"))
+        .Options(CheckboxOptions().Tooltip(
+            "This allows you to put up for shield with any two-handed weapon in hand except for Deku Sticks."));
+    AddWidget(path, "Deku Sticks:", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_CHEAT("DekuStick"))
+        .Options(ComboboxOptions().ComboMap(dekuStickCheat).DefaultIndex(DEKU_STICK_NORMAL));
+    AddWidget(path, "Bomb Timer Multiplier: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_CHEAT("BombTimerMultiplier"))
+        .Options(FloatSliderOptions().Format("%.2f").Min(0.1f).Max(5.0f).DefaultValue(1.0f));
+    AddWidget(path, "Hookshot Everything", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("HookshotEverything"))
+        .Options(CheckboxOptions().Tooltip("Makes every surface in the game hookshotable."));
+    AddWidget(path, "Hookshot Reach Multiplier: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_CHEAT("HookshotReachMultiplier"))
+        .Options(FloatSliderOptions().Format("%.2f").Min(1.0f).Max(5.0f));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Misc", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "No Clip", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoClip"))
+        .Options(CheckboxOptions().Tooltip("Allows you to walk through walls."));
+    AddWidget(path, "Climb Everything", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("ClimbEverything"))
+        .Options(CheckboxOptions().Tooltip("Makes every surface in the game climbable."));
+    AddWidget(path, "Moon Jump on L", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("MoonJumpOnL"))
+        .Options(CheckboxOptions().Tooltip("Holding L makes you float into the air."));
+    AddWidget(path, "No ReDead/Gibdo Freeze", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoRedeadFreeze"))
+        .Options(
+            CheckboxOptions().Tooltip("Prevents ReDeads and Gibdos from being able to freeze you with their scream."));
+    AddWidget(path, "Keese/Guay don't Target You", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoKeeseGuayTarget"))
+        .Options(CheckboxOptions().Tooltip(
+            "Keese and Guay no longer target you and simply ignore you as if you were wearing the "
+            "Skull Mask."));
+
+    AddWidget(path, "Glitch Aids", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Easy Frame Advancing with Pause", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("EasyFrameAdvance"))
+        .Options(CheckboxOptions().Tooltip(
+            "Continue holding START button when unpausing to only advance a single frame and then re-pause."));
+    AddWidget(path, "Easy ISG", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("EasyISG"))
+        .Options(CheckboxOptions().Tooltip("Passive Infinite Sword Glitch\n"
+                                           "It makes your sword's swing effect and hitbox stay active indefinitely."));
+    AddWidget(path, "Easy QPA", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("EasyQPA"))
+        .Options(CheckboxOptions().Tooltip("Gives you the glitched damage value of the quick put away glitch."));
+    AddWidget(path, "Clear Cutscene Pointer", WIDGET_BUTTON)
+        .Callback([](WidgetInfo& info) { GameInteractor::RawAction::ClearCutscenePointer(); })
+        .Options(ButtonOptions()
+                     .Tooltip("Clears the cutscene pointer to a value safe for wrong warps.")
+                     .Size(UIWidgets::Sizes::Inline));
+
+    AddWidget(path, "Despawn Timers", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Drops Don't Despawn", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("DropsDontDie"))
+        .Options(
+            CheckboxOptions().Tooltip("Drops from enemies, grass, etc. don't disappear after a set amount of time."));
+    AddWidget(path, "Fish don't Despawn", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoFishDespawn"))
+        .Options(CheckboxOptions().Tooltip("Prevents fish from automatically despawning after a while when dropped."));
+    AddWidget(path, "Bugs don't Despawn", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("NoBugsDespawn"))
+        .Options(CheckboxOptions().Tooltip("Prevents bugs from automatically despawning after a while when dropped."));
+
+    AddWidget(path, "Time of Day", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Freeze Time", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("FreezeTime"))
+        .Options(CheckboxOptions().Tooltip("Freezes the time of day."));
+    AddWidget(path, "Time Sync", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("TimeSync"))
+        .Options(CheckboxOptions().Tooltip("Syncs the in-game time with the real world time."));
+
+    AddWidget(path, "Instant Age Change", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Change Age", WIDGET_BUTTON)
+        .Options(ButtonOptions().Tooltip("Switches Link's age and reloads the area.").Size(UIWidgets::Sizes::Inline))
+        .Callback([](WidgetInfo& info) { SwitchAge(); });
+
+    path.column = SECTION_COLUMN_3;
+    AddWidget(path, "Save States", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, ICON_FA_EXCLAMATION_TRIANGLE " WARNING!!!! " ICON_FA_EXCLAMATION_TRIANGLE, WIDGET_TEXT)
+        .Options(TextOptions().Color(Colors::Orange));
+    AddWidget(path,
+              "These are NOT like emulator states. They do not save your game progress "
+              "and they WILL break across transitions and load zones (like doors). "
+              "Support for related issues will not be provided.",
+              WIDGET_TEXT);
+    AddWidget(path, "I promise I have read the warning", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("SaveStatePromise"))
+        .Callback([](WidgetInfo& info) {
+            CVarSetInteger(CVAR_CHEAT("SaveStatesEnabled"), 0);
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        });
+    AddWidget(path, "I understand, enable save states", WIDGET_CVAR_CHECKBOX)
+        .PreFunc([](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_CHEAT("SaveStatePromise"), 0) == 0; })
+        .CVar(CVAR_CHEAT("SaveStatesEnabled"))
+        .Options(CheckboxOptions().Tooltip("F5 to save, F6 to change slots, F7 to load"));
+
+    AddWidget(path, "Beta Quest", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Enable Beta Quest", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("EnableBetaQuest"))
+        .PreFunc([](WidgetInfo& info) { info.options->disabled = !isBetaQuestEnabled; })
+        .Callback([](WidgetInfo& info) {
+            if (CVarGetInteger(CVAR_CHEAT("EnableBetaQuest"), 0) == 0) {
+                CVarClear(CVAR_CHEAT("BetaQuestWorld"));
+            } else {
+                CVarSetInteger(CVAR_CHEAT("BetaQuestWorld"), 0);
+            }
+            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+                ->Dispatch("reset");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        })
+        .Options(CheckboxOptions().Tooltip("Turns on OoT Beta Quest. *WARNING*: This will reset your game!"));
+    AddWidget(path, "Beta Quest World: %d", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_CHEAT("BetaQuestWorld"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = info.isHidden = CVarGetInteger(CVAR_CHEAT("EnableBetaQuest"), 0) == 0;
+        })
+        .Callback([](WidgetInfo& info) {
+            std::reinterpret_pointer_cast<Ship::ConsoleWindow>(
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))
+                ->Dispatch("reset");
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        })
+        .Options(IntSliderOptions().DefaultValue(0).Min(0).Max(8).Tooltip(
+            "Set the Beta Quest world to explore. *WARNING*: Changing this will reset your game!\n"
+            "Ctrl+Click to type in a value."));
+
+    // Cosmetics Editor
+    path.sidebarName = "Cosmetics Editor";
+    AddSidebarEntry("Enhancements", path.sidebarName, 1);
+    path.column = SECTION_COLUMN_1;
+    AddWidget(path, "Popout Cosmetics Editor Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("CosmeticsEditor"))
+        .RaceDisable(false)
+        .WindowName("Cosmetics Editor")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Cosmetics Editor Window."));
+
+    // Audio Editor
+    path.sidebarName = "Audio Editor";
+    AddSidebarEntry("Enhancements", path.sidebarName, 1);
+    AddWidget(path, "Popout Audio Editor Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("AudioEditor"))
+        .RaceDisable(false)
+        .WindowName("Audio Editor")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Audio Editor Window."));
+
+    // Gameplay Stats
+    path.sidebarName = "Gameplay Stats";
+    AddSidebarEntry("Enhancements", path.sidebarName, 2);
+    AddWidget(path, "Popout Gameplay Stats Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("GameplayStats"))
+        .RaceDisable(false)
+        .WindowName("Gameplay Stats")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Gameplay Stats Window."));
+
+    // Time Splits
+    path.sidebarName = "Time Splits";
+    AddSidebarEntry("Enhancements", path.sidebarName, 1);
+    AddWidget(path, "Popout Time Splits Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("TimeSplits"))
+        .RaceDisable(false)
+        .WindowName("Time Splits")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Time Splits Window."));
+
+    // Timers
+    path.sidebarName = "Timers";
+    AddSidebarEntry("Enhancements", path.sidebarName, 3);
+    AddWidget(path, "Toggle Timers Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("TimeDisplayEnabled"))
+        .RaceDisable(false)
+        .WindowName("Additional Timers")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Additional Timers Window."));
+    AddWidget(path, "Font Scale: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_TIME_DISPLAY("FontScale"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { TimeDisplayInitSettings(); })
+        .Options(FloatSliderOptions().Min(1.0f).Max(5.0f).DefaultValue(1.0f).Format("%.2fx"));
+    AddWidget(path, "Hide Background", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_TIME_DISPLAY("ShowWindowBG"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { TimeDisplayInitSettings(); });
+    for (auto& timer : timeDisplayList) {
+        AddWidget(path, timer.timeLabel, WIDGET_CVAR_CHECKBOX)
+            .RaceDisable(false)
+            .CVar(timer.timeEnable)
+            .Callback([](WidgetInfo& info) { TimeDisplayUpdateDisplayOptions(); });
+    }
+}
+
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohMenuNetwork.cpp b/soh/soh/SohGui/SohMenuNetwork.cpp
new file mode 100644
index 0000000000..bb6004288c
--- /dev/null
+++ b/soh/soh/SohGui/SohMenuNetwork.cpp
@@ -0,0 +1,169 @@
+#ifdef ENABLE_REMOTE_CONTROL
+#include "SohMenu.h"
+#include <soh/Notification/Notification.h>
+#include <soh/Network/Network.h>
+#include "SohGui.hpp"
+#include "soh/OTRGlobals.h"
+#include <soh/Network/Sail/Sail.h>
+#include <soh/Network/CrowdControl/CrowdControl.h>
+
+namespace SohGui {
+
+extern std::shared_ptr<SohMenu> mSohMenu;
+using namespace UIWidgets;
+
+void SohMenu::AddMenuNetwork() {
+    // Add Network Menu
+    AddMenuEntry("Network", CVAR_SETTING("Menu.NetworkSidebarSection"));
+
+    // Sail
+    WidgetPath path = { "Network", "Sail", SECTION_COLUMN_1 };
+    AddSidebarEntry("Network", path.sidebarName, 3);
+
+    AddWidget(path,
+              "Sail is a networking protocol designed to facilitate remote "
+              "control of the Ship of Harkinian client. It is intended to "
+              "be utilized alongside a Sail server, for which we provide a "
+              "few straightforward implementations on our GitHub. The current "
+              "implementations available allow integration with Twitch chat "
+              "and SAMMI Bot, feel free to contribute your own!\n"
+              "\n"
+              "Click this button to copy the link to the Sail Github "
+              "page to your clipboard.",
+              WIDGET_TEXT);
+    AddWidget(path, ICON_FA_CLIPBOARD "##Sail", WIDGET_BUTTON)
+        .Callback([](WidgetInfo& info) {
+            ImGui::SetClipboardText("https://github.com/HarbourMasters/sail");
+            Notification::Emit({
+                .message = "Copied to clipboard",
+            });
+        })
+        .Options(ButtonOptions().Tooltip("https://github.com/HarbourMasters/sail"));
+    AddWidget(path, "Host & Port", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
+        ImGui::BeginDisabled(Sail::Instance->isEnabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        ImGui::Text("%s", info.name.c_str());
+        CVarInputString("##HostSail", CVAR_REMOTE_SAIL("Host"),
+                        InputOptions()
+                            .Color(THEME_COLOR)
+                            .PlaceholderText("127.0.0.1")
+                            .DefaultValue("127.0.0.1")
+                            .Size(ImVec2(ImGui::GetFontSize() * 15, 0))
+                            .LabelPosition(LabelPositions::None));
+        ImGui::SameLine();
+        ImGui::Text(":");
+        ImGui::SameLine();
+        CVarInputInt("##PortSail", CVAR_REMOTE_SAIL("Port"),
+                     InputOptions()
+                         .Color(THEME_COLOR)
+                         .PlaceholderText("43384")
+                         .DefaultValue("43384")
+                         .Size(ImVec2(ImGui::GetFontSize() * 5, 0))
+                         .LabelPosition(LabelPositions::None));
+        ImGui::EndDisabled();
+    });
+    AddWidget(path, "Enable##Sail", WIDGET_BUTTON)
+        .PreFunc([](WidgetInfo& info) {
+            std::string host = CVarGetString(CVAR_REMOTE_SAIL("Host"), "127.0.0.1");
+            uint16_t port = CVarGetInteger(CVAR_REMOTE_SAIL("Port"), 43384);
+            info.options->disabled = !(!SohUtils::IsStringEmpty(host) && port > 1024 && port < 65535);
+            if (Sail::Instance->isEnabled) {
+                info.name = "Disable##Sail";
+            } else {
+                info.name = "Enable##Sail";
+            }
+        })
+        .Callback([](WidgetInfo& info) {
+            if (Sail::Instance->isEnabled) {
+                CVarClear(CVAR_REMOTE_SAIL("Enabled"));
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                Sail::Instance->Disable();
+            } else {
+                CVarSetInteger(CVAR_REMOTE_SAIL("Enabled"), 1);
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                Sail::Instance->Enable();
+            }
+        });
+    AddWidget(path, "Connecting...##Sail", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = !Sail::Instance->isEnabled;
+        if (Sail::Instance->isConnected) {
+            info.name = "Connected##Sail";
+        } else {
+            info.name = "Connecting...##Sail";
+        }
+    });
+
+    path.sidebarName = "Crowd Control";
+    AddSidebarEntry("Network", path.sidebarName, 3);
+    path.column = SECTION_COLUMN_1;
+
+    AddWidget(path,
+              "Crowd Control is a platform that allows viewers to interact "
+              "with a streamer's game in real time.\n"
+              "\n"
+              "Click the question mark to copy the link to the Crowd Control "
+              "website to your clipboard.",
+              WIDGET_TEXT);
+    AddWidget(path, ICON_FA_CLIPBOARD "##CrowdControl", WIDGET_BUTTON)
+        .Callback([](WidgetInfo& info) {
+            ImGui::SetClipboardText("https://crowdcontrol.live");
+            Notification::Emit({
+                .message = "Copied to clipboard",
+            });
+        })
+        .Options(ButtonOptions().Tooltip("https://crowdcontrol.live"));
+    AddWidget(path, "Host & Port", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
+        ImGui::BeginDisabled(CrowdControl::Instance->isEnabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
+        ImGui::Text("%s", info.name.c_str());
+        CVarInputString("##HostCrowdControl", CVAR_REMOTE_CROWD_CONTROL("Host"),
+                        InputOptions()
+                            .Color(THEME_COLOR)
+                            .PlaceholderText("127.0.0.1")
+                            .DefaultValue("127.0.0.1")
+                            .Size(ImVec2(ImGui::GetFontSize() * 15, 0))
+                            .LabelPosition(LabelPositions::None));
+        ImGui::SameLine();
+        ImGui::Text(":");
+        ImGui::SameLine();
+        CVarInputInt("##PortCrowdControl", CVAR_REMOTE_CROWD_CONTROL("Port"),
+                     InputOptions()
+                         .Color(THEME_COLOR)
+                         .PlaceholderText("43384")
+                         .DefaultValue("43384")
+                         .Size(ImVec2(ImGui::GetFontSize() * 5, 0))
+                         .LabelPosition(LabelPositions::None));
+        ImGui::EndDisabled();
+    });
+    AddWidget(path, "Enable##CrowdControl", WIDGET_BUTTON)
+        .PreFunc([](WidgetInfo& info) {
+            std::string host = CVarGetString(CVAR_REMOTE_CROWD_CONTROL("Host"), "127.0.0.1");
+            uint16_t port = CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Port"), 43384);
+            info.options->disabled = !(!SohUtils::IsStringEmpty(host) && port > 1024 && port < 65535);
+            if (CrowdControl::Instance->isEnabled) {
+                info.name = "Disable##CrowdControl";
+            } else {
+                info.name = "Enable##CrowdControl";
+            }
+        })
+        .Callback([](WidgetInfo& info) {
+            if (CrowdControl::Instance->isEnabled) {
+                CVarClear(CVAR_REMOTE_CROWD_CONTROL("Enabled"));
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                CrowdControl::Instance->Disable();
+            } else {
+                CVarSetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 1);
+                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+                CrowdControl::Instance->Enable();
+            }
+        });
+    AddWidget(path, "Connecting...##CrowdControl", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
+        info.isHidden = !CrowdControl::Instance->isEnabled;
+        if (CrowdControl::Instance->isConnected) {
+            info.name = "Connected##CrowdControl";
+        } else {
+            info.name = "Connecting...##CrowdControl";
+        }
+    });
+}
+
+} // namespace SohGui
+#endif
\ No newline at end of file
diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp
new file mode 100644
index 0000000000..b95a8049c0
--- /dev/null
+++ b/soh/soh/SohGui/SohMenuRandomizer.cpp
@@ -0,0 +1,158 @@
+#include "SohMenu.h"
+#include "soh/OTRGlobals.h"
+
+namespace SohGui {
+
+extern std::shared_ptr<SohMenu> mSohMenu;
+using namespace UIWidgets;
+
+void SohMenu::AddMenuRandomizer() {
+    // Add Randomizer Menu
+    AddMenuEntry("Randomizer", CVAR_SETTING("Menu.RandomizerSidebarSection"));
+
+    // Seed Settings
+    WidgetPath path = { "Randomizer", "Seed Settings", SECTION_COLUMN_1 };
+    AddSidebarEntry("Randomizer", path.sidebarName, 1);
+    AddWidget(path, "Popout Randomizer Settings Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("RandomizerSettings"))
+        .WindowName("Randomizer Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window."));
+
+    // Enhancements
+    path.sidebarName = "Enhancements";
+    AddSidebarEntry("Randomizer", path.sidebarName, 3);
+    AddWidget(path, "Randomizer Enhancements", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Rando-Relevant Navi Hints", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"))
+        .Options(CheckboxOptions()
+                     .Tooltip("Replace Navi's overworld quest hints with rando-related gameplay hints.")
+                     .DefaultValue(true));
+    AddWidget(path, "Random Rupee Names", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions()
+                     .Tooltip("When obtaining Rupees, randomize what the Rupee is called in the textbox.")
+                     .DefaultValue(true));
+    AddWidget(path, "Use Custom Key Models", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("CustomKeyModels"))
+        .Options(
+            CheckboxOptions()
+                .Tooltip("Use Custom graphics for Dungeon Keys, Big and Small, so that they can be easily told apart.")
+                .DefaultValue(true));
+    AddWidget(path, "Map & Compass Colors Match Dungeon", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("ColoredMapsAndCompasses"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled = !(OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_MAPANDCOMPASS)
+                                           .IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH) &&
+                                       OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_MAPANDCOMPASS)
+                                           .IsNot(RO_DUNGEON_ITEM_LOC_VANILLA) &&
+                                       OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_MAPANDCOMPASS)
+                                           .IsNot(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON));
+            info.options->disabledTooltip =
+                "This setting is disabled because a savefile is loaded without the map & compass.\n"
+                "Shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\".";
+        })
+        .Options(
+            CheckboxOptions()
+                .Tooltip("Matches the color of maps & compasses to the dungeon they belong to. "
+                         "This helps identify maps & compasses from afar and adds a little bit of flair.\n\nThis only "
+                         "applies to seeds with maps & compasses shuffled to \"Any Dungeon\", \"Overworld\", or "
+                         "\"Anywhere\".")
+                .DefaultValue(true));
+    AddWidget(path, "Quest Item Fanfares", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("QuestItemFanfares"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Play unique fanfares when obtaining quest items (medallions/stones/songs). Note that these "
+            "fanfares can be longer than usual."));
+    AddWidget(path, "Mysterious Shuffled Items", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"))
+        .Options(CheckboxOptions().Tooltip(
+            "Displays a \"Mystery Item\" model in place of any freestanding/GS/shop items that were shuffled, "
+            "and replaces item names for them and scrubs and merchants, regardless of hint settings, "
+            "so you never know what you're getting."));
+    AddWidget(path, "Simpler Boss Soul Models", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("SimplerBossSoulModels"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "When shuffling boss souls, they'll appear as a simpler model instead of showing the boss' models."
+            "This might make boss souls more distinguishable from a distance, and can help with performance."));
+    AddWidget(path, "Skip Get Item Animations", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"))
+        .Options(ComboboxOptions().ComboMap(skipGetItemAnimationOptions).DefaultIndex(SGIA_JUNK));
+    AddWidget(path, "Item Scale: %.2f", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimationScale"))
+        .PreFunc([](WidgetInfo& info) {
+            info.options->disabled =
+                !CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("TimeSavers.SkipGetItemAnimation"), SGIA_JUNK);
+            info.options->disabledTooltip =
+                "This slider only applies when using the \"Skip Get Item Animations\" option.";
+        })
+        .Options(FloatSliderOptions().Min(5.0f).Max(15.0f).Format("%.2f").DefaultValue(10.0f).Tooltip(
+            "The size of the item when it is picked up."));
+
+    // Plandomizer
+    path.sidebarName = "Plandomizer";
+    AddSidebarEntry("Randomizer", path.sidebarName, 1);
+    AddWidget(path, "Popout Plandomizer Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("PlandomizerEditor"))
+        .RaceDisable(false)
+        .WindowName("Plandomizer Editor")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window."));
+
+    // Item Tracker
+    path.sidebarName = "Item Tracker";
+    AddSidebarEntry("Randomizer", path.sidebarName, 1);
+
+    AddWidget(path, "Item Tracker", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Toggle Item Tracker", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ItemTracker"))
+        .RaceDisable(false)
+        .WindowName("Item Tracker")
+        .Options(WindowButtonOptions().Tooltip("Toggles the Item Tracker.").EmbedWindow(false));
+
+    AddWidget(path, "Item Tracker Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Popout Item Tracker Settings", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ItemTrackerSettings"))
+        .RaceDisable(false)
+        .WindowName("Item Tracker Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Item Tracker Settings Window."));
+
+    // Entrance Tracker
+    path.sidebarName = "Entrance Tracker";
+    AddSidebarEntry("Randomizer", path.sidebarName, 1);
+
+    AddWidget(path, "Entrance Tracker", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Toggle Entrance Tracker", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("EntranceTracker"))
+        .RaceDisable(false)
+        .WindowName("Entrance Tracker")
+        .Options(WindowButtonOptions().Tooltip("Toggles the Entrance Tracker.").EmbedWindow(false));
+
+    AddWidget(path, "Entrance Tracker Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Popout Entrance Tracker Settings", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("EntranceTrackerSettings"))
+        .RaceDisable(false)
+        .WindowName("Entrance Tracker Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Entrance Tracker Settings Window."));
+
+    // Check Tracker
+    path.sidebarName = "Check Tracker";
+    AddSidebarEntry("Randomizer", path.sidebarName, 1);
+
+    AddWidget(path, "Check Tracker", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Toggle Check Tracker", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("CheckTracker"))
+        .RaceDisable(false)
+        .WindowName("Check Tracker")
+        .Options(WindowButtonOptions().Tooltip("Toggles the Check Tracker.").EmbedWindow(false));
+
+    AddWidget(path, "Check Tracker Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Popout Check Tracker Settings", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("CheckTrackerSettings"))
+        .RaceDisable(false)
+        .WindowName("Check Tracker Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Check Tracker Settings Window."));
+}
+
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp
new file mode 100644
index 0000000000..0221ae3f74
--- /dev/null
+++ b/soh/soh/SohGui/SohMenuSettings.cpp
@@ -0,0 +1,456 @@
+#include "SohMenu.h"
+#include "soh/Notification/Notification.h"
+#include "soh/OTRGlobals.h"
+#include <soh/GameVersions.h>
+#include "soh/ResourceManagerHelpers.h"
+#include "UIWidgets.hpp"
+#include <spdlog/fmt/fmt.h>
+
+extern "C" {
+#include "include/z64audio.h"
+#include "variables.h"
+}
+
+namespace SohGui {
+
+extern std::shared_ptr<SohMenu> mSohMenu;
+using namespace UIWidgets;
+
+static std::unordered_map<int32_t, const char*> imguiScaleOptions = {
+    { 0, "Small" },
+    { 1, "Normal" },
+    { 2, "Large" },
+    { 3, "X-Large" },
+};
+
+const char* GetGameVersionString(uint32_t index) {
+    uint32_t gameVersion = ResourceMgr_GetGameVersion(index);
+    switch (gameVersion) {
+        case OOT_NTSC_US_10:
+            return "NTSC 1.0";
+        case OOT_NTSC_US_11:
+            return "NTSC 1.1";
+        case OOT_NTSC_US_12:
+            return "NTSC 1.2";
+        case OOT_NTSC_US_GC:
+            return "NTSC-U GC";
+        case OOT_NTSC_JP_GC:
+            return "NTSC-J GC";
+        case OOT_NTSC_JP_GC_CE:
+            return "NTSC-J GC (Collector's Edition)";
+        case OOT_NTSC_US_MQ:
+            return "NTSC-U MQ";
+        case OOT_NTSC_JP_MQ:
+            return "NTSC-J MQ";
+        case OOT_PAL_10:
+            return "PAL 1.0";
+        case OOT_PAL_11:
+            return "PAL 1.1";
+        case OOT_PAL_GC:
+            return "PAL GC";
+        case OOT_PAL_MQ:
+            return "PAL MQ";
+        case OOT_PAL_GC_DBG1:
+        case OOT_PAL_GC_DBG2:
+            return "PAL GC-D";
+        case OOT_PAL_GC_MQ_DBG:
+            return "PAL MQ-D";
+        case OOT_IQUE_CN:
+            return "IQUE CN";
+        case OOT_IQUE_TW:
+            return "IQUE TW";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+#include "message_data_static.h"
+extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
+extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
+extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
+extern "C" MessageTableEntry* sJpnMessageEntryTablePtr;
+
+static const std::array<MessageTableEntry**, LANGUAGE_MAX> messageTables = {
+    &sNesMessageEntryTablePtr, &sGerMessageEntryTablePtr, &sFraMessageEntryTablePtr, &sJpnMessageEntryTablePtr
+};
+
+void SohMenu::UpdateLanguageMap(std::unordered_map<int32_t, const char*>& languageMap) {
+    for (int32_t i = LANGUAGE_ENG; i < LANGUAGE_MAX; i++) {
+        if (*messageTables.at(i) != NULL) {
+            if (!languageMap.contains(i)) {
+                languageMap.insert(std::make_pair(i, languages.at(i)));
+            }
+        } else {
+            languageMap.erase(i);
+        }
+    }
+}
+
+void SohMenu::AddMenuSettings() {
+    // Add Settings Menu
+    AddMenuEntry("Settings", CVAR_SETTING("Menu.SettingsSidebarSection"));
+    AddSidebarEntry("Settings", "General", 3);
+    WidgetPath path = { "Settings", "General", SECTION_COLUMN_1 };
+
+    // General - Settings
+    AddWidget(path, "Menu Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Menu Theme", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_SETTING("Menu.Theme"))
+        .RaceDisable(false)
+        .Options(ComboboxOptions()
+                     .Tooltip("Changes the Theme of the Menu Widgets.")
+                     .ComboMap(menuThemeOptions)
+                     .DefaultIndex(Colors::LightBlue));
+#if not defined(__SWITCH__) and not defined(__WIIU__)
+    AddWidget(path, "Menu Controller Navigation", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_IMGUI_CONTROLLER_NAV)
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Allows controller navigation of the port menu (Settings, Enhancements,...)\nCAUTION: "
+            "This will disable game inputs while the menu is visible.\n\nD-pad to move between "
+            "items, A to select, B to move up in scope."));
+    AddWidget(path, "Menu Background Opacity", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_SETTING("Menu.BackgroundOpacity"))
+        .RaceDisable(false)
+        .Options(FloatSliderOptions().DefaultValue(0.85f).IsPercentage().Tooltip(
+            "Sets the opacity of the background of the port menu."));
+
+    AddWidget(path, "General Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Cursor Always Visible", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("CursorVisibility"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            Ship::Context::GetInstance()->GetWindow()->SetForceCursorVisibility(
+                CVarGetInteger(CVAR_SETTING("CursorVisibility"), 0));
+        })
+        .Options(CheckboxOptions().Tooltip("Makes the cursor always visible, even in full screen."));
+#endif
+    AddWidget(path, "Search In Sidebar", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("Menu.SidebarSearch"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            if (CVarGetInteger(CVAR_SETTING("Menu.SidebarSearch"), 0)) {
+                mSohMenu->InsertSidebarSearch();
+            } else {
+                mSohMenu->RemoveSidebarSearch();
+            }
+        })
+        .Options(CheckboxOptions().Tooltip(
+            "Displays the Search menu as a sidebar entry in Settings instead of in the header."));
+    AddWidget(path, "Search Input Autofocus", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("Menu.SearchAutofocus"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip(
+            "Search input box gets autofocus when visible. Does not affect using other widgets."));
+    AddWidget(path, "Alt Assets Tab hotkey", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("Mods.AlternateAssetsHotkey"))
+        .RaceDisable(false)
+        .Options(
+            CheckboxOptions().Tooltip("Allows pressing the Tab key to toggle alternate assets").DefaultValue(true));
+    AddWidget(path, "Open App Files Folder", WIDGET_BUTTON)
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            std::string filesPath = Ship::Context::GetInstance()->GetAppDirectoryPath();
+            SDL_OpenURL(std::string("file:///" + std::filesystem::absolute(filesPath).string()).c_str());
+        })
+        .Options(ButtonOptions().Tooltip("Opens the folder that contains the save and mods folders, etc."));
+
+    AddWidget(path, "Boot", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Boot Sequence", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_SETTING("BootSequence"))
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            if (mSohMenu->disabledMap.at(DISABLE_FOR_BOOT_TO_DEBUG_WARP_SCREEN_ON).active)
+                info.activeDisables.push_back(DISABLE_FOR_BOOT_TO_DEBUG_WARP_SCREEN_ON);
+        })
+        .Options(ComboboxOptions()
+                     .DefaultIndex(BOOTSEQUENCE_DEFAULT)
+                     .LabelPosition(LabelPositions::Far)
+                     .ComponentAlignment(ComponentAlignments::Right)
+                     .ComboMap(bootSequenceLabels)
+                     .Tooltip("Configure what happens when starting or resetting the game.\n\n"
+                              "Default: LUS logo -> N64 logo\n"
+                              "Authentic: N64 logo only\n"
+                              "File Select: Skip to file select menu"));
+
+    AddWidget(path, "Languages", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Translate Title Screen", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("TitleScreenTranslation"))
+        .RaceDisable(false);
+    AddWidget(path, "Language", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_SETTING("Languages"))
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            auto options = std::static_pointer_cast<UIWidgets::ComboboxOptions>(info.options);
+            SohMenu::UpdateLanguageMap(options->comboMap);
+        })
+        .Options(ComboboxOptions()
+                     .LabelPosition(LabelPositions::Far)
+                     .ComponentAlignment(ComponentAlignments::Right)
+                     .ComboMap(languages)
+                     .DefaultIndex(LANGUAGE_ENG));
+    AddWidget(path, "Accessibility", WIDGET_SEPARATOR_TEXT);
+#if defined(_WIN32) || defined(__APPLE__) || defined(ESPEAK)
+    AddWidget(path, "Text to Speech", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("A11yTTS"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Enables text to speech for in game dialog"));
+#endif
+    AddWidget(path, "Disable Idle Camera Re-Centering", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("A11yDisableIdleCam"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Disables the automatic re-centering of the camera when idle."));
+    AddWidget(path, "EXPERIMENTAL", WIDGET_SEPARATOR_TEXT).Options(TextOptions().Color(Colors::Orange));
+    AddWidget(path, "ImGui Menu Scaling", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_SETTING("ImGuiScale"))
+        .RaceDisable(false)
+        .Options(ComboboxOptions()
+                     .ComboMap(imguiScaleOptions)
+                     .Tooltip("Changes the scaling of the ImGui menu elements.")
+                     .DefaultIndex(1)
+                     .ComponentAlignment(ComponentAlignments::Right)
+                     .LabelPosition(LabelPositions::Far))
+        .Callback([](WidgetInfo& info) { OTRGlobals::Instance->ScaleImGui(); });
+
+    // General - About
+    path.column = SECTION_COLUMN_2;
+
+    AddWidget(path, "About", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Ship Of Harkinian", WIDGET_TEXT);
+    if (gGitCommitTag[0] != 0) {
+        AddWidget(path, gBuildVersion, WIDGET_TEXT);
+    } else {
+        AddWidget(path, ("Branch: " + std::string(gGitBranch)), WIDGET_TEXT);
+        AddWidget(path, ("Commit: " + std::string(gGitCommitHash)), WIDGET_TEXT);
+    }
+    for (uint32_t i = 0; i < ResourceMgr_GetNumGameVersions(); i++) {
+        AddWidget(path, GetGameVersionString(i), WIDGET_TEXT);
+    }
+
+    // Audio Settings
+    path.sidebarName = "Audio";
+    path.column = SECTION_COLUMN_1;
+    AddSidebarEntry("Settings", "Audio", 3);
+
+    AddWidget(path, "Master Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("Volume.Master"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(0).Max(100).DefaultValue(40).ShowButtons(true).Format(""));
+    AddWidget(path, "Main Music Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("Volume.MainMusic"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
+        .Callback([](WidgetInfo& info) {
+            Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN,
+                                ((float)CVarGetInteger(CVAR_SETTING("Volume.MainMusic"), 100) / 100.0f));
+        });
+    AddWidget(path, "Sub Music Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("Volume.SubMusic"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
+        .Callback([](WidgetInfo& info) {
+            Audio_SetGameVolume(SEQ_PLAYER_BGM_SUB,
+                                ((float)CVarGetInteger(CVAR_SETTING("Volume.SubMusic"), 100) / 100.0f));
+        });
+    AddWidget(path, "Fanfare Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("Volume.Fanfare"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
+        .Callback([](WidgetInfo& info) {
+            Audio_SetGameVolume(SEQ_PLAYER_FANFARE,
+                                ((float)CVarGetInteger(CVAR_SETTING("Volume.Fanfare"), 100) / 100.0f));
+        });
+    AddWidget(path, "Sound Effects Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("Volume.SFX"))
+        .RaceDisable(false)
+        .Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
+        .Callback([](WidgetInfo& info) {
+            Audio_SetGameVolume(SEQ_PLAYER_SFX, ((float)CVarGetInteger(CVAR_SETTING("Volume.SFX"), 100) / 100.0f));
+        });
+    AddWidget(path, "Audio API (Needs reload)", WIDGET_AUDIO_BACKEND).RaceDisable(false);
+
+    // Graphics Settings
+    static int32_t maxFps = 360;
+    const char* tooltip = "Uses Matrix Interpolation to create extra frames, resulting in smoother graphics. This is "
+                          "purely visual and does not impact game logic, execution of glitches etc.\n\nA higher target "
+                          "FPS than your monitor's refresh rate will waste resources, and might give a worse result.";
+    path.sidebarName = "Graphics";
+    AddSidebarEntry("Settings", "Graphics", 3);
+    AddWidget(path, "Graphics Options", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Toggle Fullscreen", WIDGET_BUTTON)
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); })
+        .Options(ButtonOptions().Tooltip("Toggles Fullscreen On/Off."));
+    AddWidget(path, "Internal Resolution", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_INTERNAL_RESOLUTION)
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(
+                CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1));
+        })
+        .PreFunc([](WidgetInfo& info) {
+            if (mSohMenu->disabledMap.at(DISABLE_FOR_ADVANCED_RESOLUTION_ON).active &&
+                mSohMenu->disabledMap.at(DISABLE_FOR_VERTICAL_RES_TOGGLE_ON).active) {
+                info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_ON);
+                info.activeDisables.push_back(DISABLE_FOR_VERTICAL_RES_TOGGLE_ON);
+            } else if (mSohMenu->disabledMap.at(DISABLE_FOR_LOW_RES_MODE_ON).active) {
+                info.activeDisables.push_back(DISABLE_FOR_LOW_RES_MODE_ON);
+            }
+        })
+        .Options(
+            FloatSliderOptions()
+                .Tooltip("Multiplies your output resolution by the value inputted, as a more intensive but effective "
+                         "form of anti-aliasing.")
+                .ShowButtons(false)
+                .IsPercentage()
+                .Min(0.5f)
+                .Max(2.0f));
+#ifndef __WIIU__
+    AddWidget(path, "Anti-aliasing (MSAA)", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_MSAA_VALUE)
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            Ship::Context::GetInstance()->GetWindow()->SetMsaaLevel(CVarGetInteger(CVAR_MSAA_VALUE, 1));
+        })
+        .Options(
+            IntSliderOptions()
+                .Tooltip("Activates MSAA (multi-sample anti-aliasing) from 2x up to 8x, to smooth the edges of "
+                         "rendered geometry.\n"
+                         "Higher sample count will result in smoother edges on models, but may reduce performance.")
+                .Min(1)
+                .Max(8)
+                .DefaultValue(1));
+#endif
+    auto fps = CVarGetInteger(CVAR_SETTING("InterpolationFPS"), 20);
+    const char* fpsFormat = fps == 20 ? "Original (%d)" : "%d";
+    AddWidget(path, "Current FPS", WIDGET_CVAR_SLIDER_INT)
+        .CVar(CVAR_SETTING("InterpolationFPS"))
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            auto options = std::static_pointer_cast<IntSliderOptions>(info.options);
+            int32_t defaultValue = options->defaultValue;
+            if (CVarGetInteger(info.cVar, defaultValue) == defaultValue) {
+                options->format = "Original (%d)";
+            } else {
+                options->format = "%d";
+            }
+        })
+        .PreFunc([](WidgetInfo& info) {
+            if (mSohMenu->disabledMap.at(DISABLE_FOR_MATCH_REFRESH_RATE_ON).active)
+                info.activeDisables.push_back(DISABLE_FOR_MATCH_REFRESH_RATE_ON);
+        })
+        .Options(IntSliderOptions().Tooltip(tooltip).Min(20).Max(maxFps).DefaultValue(20).Format(fpsFormat));
+    AddWidget(path, "Match Refresh Rate", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SETTING("MatchRefreshRate"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Matches interpolation value to the refresh rate of your display."));
+    AddWidget(path, "Renderer API (Needs reload)", WIDGET_VIDEO_BACKEND).RaceDisable(false);
+    AddWidget(path, "Enable Vsync", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_VSYNC_ENABLED)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) { info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_VSYNC).active; })
+        .Options(CheckboxOptions()
+                     .Tooltip("Removes tearing, but clamps your max FPS to your displays refresh rate.")
+                     .DefaultValue(true));
+    AddWidget(path, "Windowed Fullscreen", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_SDL_WINDOWED_FULLSCREEN)
+        .RaceDisable(false)
+        .PreFunc([](WidgetInfo& info) {
+            info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_WINDOWED_FULLSCREEN).active;
+        })
+        .Options(CheckboxOptions().Tooltip("Enables Windowed Fullscreen Mode."));
+    AddWidget(path, "Allow multi-windows", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_ENABLE_MULTI_VIEWPORTS)
+        .RaceDisable(false)
+        .PreFunc(
+            [](WidgetInfo& info) { info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_MULTI_VIEWPORT).active; })
+        .Options(CheckboxOptions().Tooltip(
+            "Allows multiple windows to be opened at once. Requires a reload to take effect."));
+    AddWidget(path, "Texture Filter (Needs reload)", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_TEXTURE_FILTER)
+        .RaceDisable(false)
+        .Options(ComboboxOptions().Tooltip("Sets the applied Texture Filtering.").ComboMap(textureFilteringMap));
+
+    path.column = SECTION_COLUMN_2;
+    AddWidget(path, "Advanced Graphics Options", WIDGET_SEPARATOR_TEXT);
+
+    // Controls
+    path.sidebarName = "Controls";
+    path.column = SECTION_COLUMN_1;
+    AddSidebarEntry("Settings", "Controls", 2);
+    AddWidget(path, "Controller Bindings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Popout Bindings Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ControllerConfiguration"))
+        .RaceDisable(false)
+        .WindowName("Configure Controller")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Bindings Window."));
+
+    // Input Viewer
+    path.sidebarName = "Input Viewer";
+    AddSidebarEntry("Settings", path.sidebarName, 3);
+    AddWidget(path, "Input Viewer", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Toggle Input Viewer", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("InputViewer"))
+        .RaceDisable(false)
+        .WindowName("Input Viewer")
+        .Options(WindowButtonOptions().Tooltip("Toggles the Input Viewer.").EmbedWindow(false));
+
+    AddWidget(path, "Input Viewer Settings", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Popout Input Viewer Settings", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("InputViewerSettings"))
+        .RaceDisable(false)
+        .WindowName("Input Viewer Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the separate Input Viewer Settings Window."));
+
+    // Notifications
+    path.sidebarName = "Notifications";
+    path.column = SECTION_COLUMN_1;
+    AddSidebarEntry("Settings", path.sidebarName, 3);
+    AddWidget(path, "Position", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_SETTING("Notifications.Position"))
+        .RaceDisable(false)
+        .Options(ComboboxOptions()
+                     .Tooltip("Which corner of the screen notifications appear in.")
+                     .ComboMap(notificationPosition)
+                     .DefaultIndex(3));
+    AddWidget(path, "Duration (seconds):", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_SETTING("Notifications.Duration"))
+        .RaceDisable(false)
+        .Options(FloatSliderOptions()
+                     .Tooltip("How long notifications are displayed for.")
+                     .Format("%.1f")
+                     .Step(0.1f)
+                     .Min(3.0f)
+                     .Max(30.0f)
+                     .DefaultValue(10.0f));
+    AddWidget(path, "Background Opacity", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_SETTING("Notifications.BgOpacity"))
+        .RaceDisable(false)
+        .Options(FloatSliderOptions()
+                     .Tooltip("How opaque the background of notifications is.")
+                     .DefaultValue(0.5f)
+                     .IsPercentage());
+    AddWidget(path, "Size:", WIDGET_CVAR_SLIDER_FLOAT)
+        .CVar(CVAR_SETTING("Notifications.Size"))
+        .RaceDisable(false)
+        .Options(FloatSliderOptions()
+                     .Tooltip("How large notifications are.")
+                     .Format("%.1f")
+                     .Step(0.1f)
+                     .Min(1.0f)
+                     .Max(5.0f)
+                     .DefaultValue(1.8f));
+    AddWidget(path, "Test Notification", WIDGET_BUTTON)
+        .RaceDisable(false)
+        .Callback([](WidgetInfo& info) {
+            Notification::Emit({
+                .itemIcon = "__OTR__textures/icon_item_24_static/gQuestIconGoldSkulltulaTex",
+                .prefix = "This",
+                .message = "is a",
+                .suffix = "test.",
+            });
+        })
+        .Options(ButtonOptions().Tooltip("Displays a test notification."));
+}
+
+} // namespace SohGui
diff --git a/soh/soh/SohGui/SohModals.cpp b/soh/soh/SohGui/SohModals.cpp
index 642fedf156..339511e756 100644
--- a/soh/soh/SohGui/SohModals.cpp
+++ b/soh/soh/SohGui/SohModals.cpp
@@ -5,6 +5,7 @@
 #include <libultraship/bridge.h>
 #include <libultraship/libultraship.h>
 #include "UIWidgets.hpp"
+#include "SohGui.hpp"
 #include "soh/OTRGlobals.h"
 #include "z64.h"
 
@@ -19,6 +20,8 @@ struct SohModal {
 };
 std::vector<SohModal> modals;
 
+bool closePopup = false;
+
 void SohModalWindow::Draw() {
     if (!IsVisible()) {
         return;
@@ -34,8 +37,17 @@ void SohModalWindow::DrawElement() {
         if (!ImGui::IsPopupOpen(curModal.title_.c_str())) {
             ImGui::OpenPopup(curModal.title_.c_str());
         }
-        if (ImGui::BeginPopupModal(curModal.title_.c_str(), NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings)) {
+        if (closePopup) {
+            ImGui::CloseCurrentPopup();
+            modals.erase(modals.begin());
+            closePopup = false;
+        }
+        if (ImGui::BeginPopupModal(curModal.title_.c_str(), NULL,
+                                   ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
+                                       ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar |
+                                       ImGuiWindowFlags_NoSavedSettings)) {
             ImGui::Text("%s", curModal.message_.c_str());
+            UIWidgets::PushStyleButton(THEME_COLOR);
             if (ImGui::Button(curModal.button1_.c_str())) {
                 if (curModal.button1callback_ != nullptr) {
                     curModal.button1callback_();
@@ -43,8 +55,10 @@ void SohModalWindow::DrawElement() {
                 ImGui::CloseCurrentPopup();
                 modals.erase(modals.begin());
             }
-            ImGui::SameLine();
+            UIWidgets::PopStyleButton();
             if (curModal.button2_ != "") {
+                ImGui::SameLine();
+                UIWidgets::PushStyleButton(THEME_COLOR);
                 if (ImGui::Button(curModal.button2_.c_str())) {
                     if (curModal.button2callback_ != nullptr) {
                         curModal.button2callback_();
@@ -52,12 +66,22 @@ void SohModalWindow::DrawElement() {
                     ImGui::CloseCurrentPopup();
                     modals.erase(modals.begin());
                 }
+                UIWidgets::PopStyleButton();
             }
         }
         ImGui::EndPopup();
     }
 }
 
-void SohModalWindow::RegisterPopup(std::string title, std::string message, std::string button1, std::string button2, std::function<void()> button1callback, std::function<void()> button2callback) {
+void SohModalWindow::RegisterPopup(std::string title, std::string message, std::string button1, std::string button2,
+                                   std::function<void()> button1callback, std::function<void()> button2callback) {
     modals.push_back({ title, message, button1, button2, button1callback, button2callback });
 }
+
+bool SohModalWindow::IsPopupOpen(std::string title) {
+    return !modals.empty() && modals.at(0).title_ == title;
+}
+
+void SohModalWindow::DismissPopup() {
+    closePopup = true;
+}
diff --git a/soh/soh/SohGui/SohModals.h b/soh/soh/SohGui/SohModals.h
index f584b95401..f74f0b1bfb 100644
--- a/soh/soh/SohGui/SohModals.h
+++ b/soh/soh/SohGui/SohModals.h
@@ -4,13 +4,17 @@
 #include "window/gui/GuiMenuBar.h"
 #include "window/gui/GuiElement.h"
 
-class SohModalWindow : public Ship::GuiWindow {
+class SohModalWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;
 
-    void InitElement() override {};
+    void InitElement() override{};
     void DrawElement() override;
-    void UpdateElement() override {};
-    void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
+    void UpdateElement() override{};
+    void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "",
+                       std::function<void()> button1callback = nullptr,
+                       std::function<void()> button2callback = nullptr);
+    bool IsPopupOpen(std::string title);
+    void DismissPopup();
 };
\ No newline at end of file
diff --git a/soh/soh/SohGui/UIWidgets.cpp b/soh/soh/SohGui/UIWidgets.cpp
index 6d9ca7a652..774407583b 100644
--- a/soh/soh/SohGui/UIWidgets.cpp
+++ b/soh/soh/SohGui/UIWidgets.cpp
@@ -1,836 +1,1178 @@
-//
-//  UIWidgets.cpp
-//  soh
-//
-//  Created by David Chavez on 25.08.22.
-//
-
 #include "UIWidgets.hpp"
-
-#include <imgui.h>
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui_internal.h>
+#include <sstream>
 #include <libultraship/libultraship.h>
-
+#include <string>
+#include <random>
+#include <math.h>
+#include <unordered_map>
 #include <libultraship/libultra/types.h>
-#include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
+#include <spdlog/fmt/fmt.h>
 
 namespace UIWidgets {
 
-    // MARK: - Layout Helper
-
-    // Automatically adds newlines to break up text longer than a specified number of characters
-    // Manually included newlines will still be respected and reset the line length
-    // If line is midword when it hits the limit, text should break at the last encountered space
-    std::string WrappedText(const char* text, unsigned int charactersPerLine) {
-        std::string newText(text);
-        const size_t tipLength = newText.length();
-        int lastSpace = -1;
-        int currentLineLength = 0;
-        for (unsigned int currentCharacter = 0; currentCharacter < tipLength; currentCharacter++) {
-            if (newText[currentCharacter] == '\n') {
-                currentLineLength = 0;
-                lastSpace = -1;
-                continue;
-            } else if (newText[currentCharacter] == ' ') {
-                lastSpace = currentCharacter;
-            }
-
-            if ((currentLineLength >= charactersPerLine) && (lastSpace >= 0)) {
-                newText[lastSpace] = '\n';
-                currentLineLength = currentCharacter - lastSpace - 1;
-                lastSpace = -1;
-            }
-            currentLineLength++;
+// Automatically adds newlines to break up text longer than a specified number of characters
+// Manually included newlines will still be respected and reset the line length
+// If line is midword when it hits the limit, text should break at the last encountered space
+std::string WrappedText(const char* text, unsigned int charactersPerLine) {
+    std::string newText(text);
+    const size_t tipLength = newText.length();
+    int lastSpace = -1;
+    int currentLineLength = 0;
+    for (unsigned int currentCharacter = 0; currentCharacter < tipLength; currentCharacter++) {
+        if (newText[currentCharacter] == '\n') {
+            currentLineLength = 0;
+            lastSpace = -1;
+            continue;
+        } else if (newText[currentCharacter] == ' ') {
+            lastSpace = currentCharacter;
         }
 
-        return newText;
+        if ((currentLineLength >= charactersPerLine) && (lastSpace >= 0)) {
+            newText[lastSpace] = '\n';
+            currentLineLength = currentCharacter - lastSpace - 1;
+            lastSpace = -1;
+        }
+        currentLineLength++;
     }
 
-    std::string WrappedText(const std::string& text, unsigned int charactersPerLine) {
-        return WrappedText(text.c_str(), charactersPerLine);
+    return newText;
+}
+
+std::string WrappedText(const std::string& text, unsigned int charactersPerLine) {
+    return WrappedText(text.c_str(), charactersPerLine);
+}
+
+void PaddedSeparator(bool padTop, bool padBottom, float extraVerticalTopPadding, float extraVerticalBottomPadding) {
+    if (padTop) {
+        Spacer(extraVerticalTopPadding);
     }
-
-    void SetLastItemHoverText(const std::string& text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60).c_str());
-            ImGui::EndTooltip();
-        }
-    }
-
-    void SetLastItemHoverText(const char* text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60).c_str());
-            ImGui::EndTooltip();
-        }
-    }
-
-    // Adds a "?" next to the previous ImGui item with a custom tooltip
-    void InsertHelpHoverText(const std::string& text) {
-        ImGui::SameLine();
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60).c_str());
-            ImGui::EndTooltip();
-        }
-    }
-
-    void InsertHelpHoverText(const char* text) {
-        ImGui::SameLine();
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60).c_str());
-            ImGui::EndTooltip();
-        }
-    }
-
-
-    // MARK: - UI Elements
-
-    void Tooltip(const char* text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::SetTooltip("%s", WrappedText(text).c_str());
-        }
-    }
-
-    void Spacer(float height) {
-        ImGui::Dummy(ImVec2(0.0f, height));
-    }
-
-    void PaddedSeparator(bool padTop, bool padBottom, float extraVerticalTopPadding, float extraVerticalBottomPadding) {
-        if (padTop) {
-            Spacer(extraVerticalTopPadding);
-        }
-        ImGui::Separator();
-        if (padBottom) {
-            Spacer(extraVerticalBottomPadding);
-        }
-    }
-
-    void RenderCross(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz) {
-        float thickness = ImMax(sz / 5.0f, 1.0f);
-        sz -= thickness * 0.5f;
-        pos += ImVec2(thickness * 0.25f, thickness * 0.25f);
-
-        draw_list->PathLineTo(ImVec2(pos.x, pos.y));
-        draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y + sz));
-        draw_list->PathStroke(col, 0, thickness);
-
-        draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y));
-        draw_list->PathLineTo(ImVec2(pos.x, pos.y + sz));
-        draw_list->PathStroke(col, 0, thickness);
-    }
-
-    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic, bool renderCrossWhenOff) {
-        ImGuiWindow* window = ImGui::GetCurrentWindow();
-        if (window->SkipItems) {
-            return false;
-        }
-
-        ImGuiContext& g = *GImGui;
-        const ImGuiStyle& style = g.Style;
-        const ImGuiID id = window->GetID(label);
-        const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
-
-        const float square_sz = ImGui::GetFrameHeight();
-        const ImVec2 pos = window->DC.CursorPos;
-        const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
-        ImGui::ItemSize(total_bb, style.FramePadding.y);
-        if (!ImGui::ItemAdd(total_bb, id)) {
-            IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-            return false;
-        }
-
-        bool hovered, held;
-        bool pressed = ImGui::ButtonBehavior(total_bb, id, &hovered, &held);
-        if (pressed) {
-            *v = !(*v);
-            ImGui::MarkItemEdited(id);
-        }
-
-        const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
-        ImGui::RenderNavHighlight(total_bb, id);
-        ImGui::RenderFrame(check_bb.Min, check_bb.Max, ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding);
-        ImU32 check_col = ImGui::GetColorU32(ImGuiCol_CheckMark);
-        ImU32 cross_col = ImGui::GetColorU32(ImVec4(0.50f, 0.50f, 0.50f, 1.00f));
-        bool mixed_value = (g.LastItemData.ItemFlags & ImGuiItemFlags_MixedValue) != 0;
-        if (mixed_value) {
-            // Undocumented tristate/mixed/indeterminate checkbox (#2644)
-            // This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all widgets (not just checkbox)
-            ImVec2 pad(ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)), ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)));
-            window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
-        } else if ((!disabled && *v) || (disabled && disabledGraphic == CheckboxGraphics::Checkmark)) {
-            const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
-        } else if ((!disabled && !*v && renderCrossWhenOff) || (disabled && disabledGraphic == CheckboxGraphics::Cross)) {
-            const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            //RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), disabled ? cross_col : check_col, square_sz - pad * 2.0f); // Caused confusion as to status
-        }
-
-        ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
-        if (g.LogEnabled) {
-            ImGui::LogRenderedText(&label_pos, mixed_value ? "[~]" : *v ? "[x]" : "[ ]");
-        }
-        if (label_size.x > 0.0f) {
-            ImGui::RenderText(label_pos, label);
-        }
-
-        IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-        return pressed;
-    }
-
-    bool CustomCheckboxTristate(const char* label, int* v, bool disabled, CheckboxGraphics disabledGraphic) {
-        bool ret;
-        if (*v == 0) {
-            bool b = false;
-            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
-            if (ret) {
-                *v = 1;
-            }
-        } else if (*v == 1) {
-            ImGui::PushItemFlag(ImGuiItemFlags_MixedValue, true);
-            bool b = true;
-            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
-            if (ret) {
-                *v = 2;
-            }
-            ImGui::PopItemFlag();
-        } else if (*v == 2) {
-            bool b = true;
-            ret = CustomCheckbox(label, &b, disabled, disabledGraphic, true);
-            if (ret) {
-                *v = 0;
-            }
-        } else {
-            SPDLOG_INFO("Invalid CheckBoxTristate value: {}", *v);
-            *v = 0;
-            return false;
-        }
-        return ret;
-    }
-
-    void ReEnableComponent(const char* disabledTooltipText) {
-        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(disabledTooltipText, "") != 0) {
-            ImGui::SetTooltip("%s", disabledTooltipText);
-        }
-        // End of disable region of previous component
-        ImGui::PopStyleVar(1);
-        ImGui::PopItemFlag();
-    }
-
-    void DisableComponent(const float alpha) {
-        ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-        ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
-    }
-
-    bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
-        bool changed = false;
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        bool val = (bool)CVarGetInteger(cvarName, defaultValue);
-        if (CustomCheckbox(text, &val, disabled, disabledGraphic)) {
-            CVarSetInteger(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            ShipInit::Init(cvarName);
-            changed = true;
-        }
-
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
-        return changed;
-    }
-
-    bool EnhancementCheckboxTristate(const char* text, const char* cvarName, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
-        bool changed = false;
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        int val = CVarGetInteger(cvarName, defaultValue);
-        if (CustomCheckboxTristate(text, &val, disabled, disabledGraphic)) {
-            CVarSetInteger(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            changed = true;
-        }
-
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
-        return changed;
-    }
-
-    bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
-
-        bool changed = EnhancementCheckbox(text, cvarName, disabled, disabledTooltipText, disabledGraphic, defaultValue);
-
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
-
-    bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled, const char* disabledTooltipText, uint8_t disabledValue) {
-        bool changed = false;
-        if (defaultIndex <= 0) {
-            defaultIndex = 0;
-        }
-
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        uint8_t selected = CVarGetInteger(cvarName, defaultIndex);
-        std::string comboName = std::string("##") + std::string(cvarName);
-        if (ImGui::BeginCombo(comboName.c_str(), comboArray[selected])) {
-            for (uint8_t i = 0; i < comboArray.size(); i++) {
-                if (strlen(comboArray[i]) > 0) {
-                    if (ImGui::Selectable(comboArray[i], i == selected)) {
-                        CVarSetInteger(cvarName, i);
-                        selected = i;
-                        changed = true;
-                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                        ShipInit::Init(cvarName);
-                    }
-                }
-            }
-            ImGui::EndCombo();
-        }
-
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-
-            if (disabledValue >= 0 && selected != disabledValue) {
-                CVarSetInteger(cvarName, disabledValue);
-                changed = true;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            }
-        }
-
-        return changed;
-    }
-
-    bool LabeledRightAlignedEnhancementCombobox(const char* label, const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled, const char* disabledTooltipText, uint8_t disabledValue) {
-        ImGui::Text("%s", label);
-        s32 currentValue = CVarGetInteger(cvarName, defaultIndex);
-
-#ifdef __WIIU__
-        ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 40.0f));
-        ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 60.0f);
-#else
-        ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 20.0f));
-        ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 30.0f);
-#endif
-
-        bool changed = EnhancementCombobox(cvarName, comboArray, defaultIndex, disabled, disabledTooltipText, disabledValue);
-
-        ImGui::PopItemWidth();
-        return changed;
-    }
-
-    void PaddedText(const char* text, bool padTop, bool padBottom) {
-        if (padTop) Spacer(0);
-
-        ImGui::Text("%s", text);
-
-        if (padBottom) Spacer(0);
-    }
-
-    bool EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue, bool PlusMinusButton, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        int val = CVarGetInteger(cvarName, defaultValue);
-        const int oldVal = val;
-
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        ImGui::Text(text, val);
-        Spacer(0);
-
-        ImGui::BeginGroup();
-        if (PlusMinusButton) {
-            std::string MinusBTNName = " - ##" + std::string(cvarName);
-            if (ImGui::Button(MinusBTNName.c_str())) {
-                val--;
-                changed = true;
-            }
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-        }
-
-        ImGui::PushItemWidth(std::min((ImGui::GetContentRegionAvail().x - (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth));
-        if (ImGui::SliderInt(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp))
-        {
-            changed = true;
-        }
-        ImGui::PopItemWidth();
-        
-        if (PlusMinusButton) {
-            std::string PlusBTNName = " + ##" + std::string(cvarName);
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-            if (ImGui::Button(PlusBTNName.c_str())) {
-                val++;
-                changed = true;
-            }
-        }
-        ImGui::EndGroup();
-
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
-
-        if (val < min) {
-            val = min;
-            changed = true;
-        }
-
-        if (val > max) {
-            val = max;
-            changed = true;
-        }
-
-        if (changed && (oldVal != val)) {
-            CVarSetInteger(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            ShipInit::Init(cvarName);
-        } else {
-            changed = false;
-        }
-
-        return changed;
-    }
-
-    bool EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        float val = CVarGetFloat(cvarName, defaultValue);
-        const float oldVal = val;
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        // Calculate how much precision to save based on the given range of the slider, limited to 6 decimal places
-        // Precision is also used when adding/subtracting using the +/- buttons
-        const float sliderWidth = std::min((ImGui::GetContentRegionAvail().x - 2.0f * (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth);
-        const float diff = (max - min) / sliderWidth;
-        int ticks = 0;
-        float increment = 1.0f;
-        if (diff < 1.0f) {
-            ticks++;
-            increment = 0.1f;
-        }
-        if (diff < 0.1f) {
-            ticks++;
-            increment = 0.01f;
-        }
-        if (diff < 0.01f) {
-            ticks++;
-            increment = 0.001f;
-        }
-        if (diff < 0.001f) {
-            ticks++;
-            increment = 0.0001f;
-        }
-        if (diff < 0.0001f) {
-            ticks++;
-            increment = 0.00001f;
-        }
-        if (diff < 0.00001f) {
-            ticks++;
-            increment = 0.000001f;
-        }
-
-        if (!isPercentage) {
-            ImGui::Text(text, val);
-        } else {
-            ImGui::Text(text, val * 100.0f);
-        }
-        Spacer(0);
-
-        ImGui::BeginGroup();
-        if (PlusMinusButton) {
-            std::string MinusBTNName = " - ##" + std::string(cvarName);
-            if (ImGui::Button(MinusBTNName.c_str())) {
-                val -= increment;
-                changed = true;
-            }
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-        }
-
-        ImGui::PushItemWidth(sliderWidth);
-        if (ImGui::SliderFloat(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp)) {
-            changed = true;
-        }
-        ImGui::PopItemWidth();
-        
-        if (PlusMinusButton) {
-            std::string PlusBTNName = " + ##" + std::string(cvarName);
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-            if (ImGui::Button(PlusBTNName.c_str())) {
-                val += increment;
-                changed = true;
-            }
-        }
-        ImGui::EndGroup();
-
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
-
-        if (val < min) {
-            val = min;
-            changed = true;
-        }
-
-        if (val > max) {
-            val = max;
-            changed = true;
-        }
-
-        if (changed && !(abs(oldVal - val) < 0.000001f)) {
-            std::stringstream ss;
-            ss << std::setprecision(ticks + 1) << std::setiosflags(std::ios_base::fixed) << val;
-            val = std::stof(ss.str());
-            CVarSetFloat(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-        } else {
-            changed = false;
-        }
-
-        return changed;
-    }
-
-    bool PaddedEnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue, bool PlusMinusButton, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
-
-        changed = EnhancementSliderInt(text, id, cvarName, min, max, format, defaultValue, PlusMinusButton, disabled, disabledTooltipText);
-
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
-
-    bool PaddedEnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
-
-        changed = EnhancementSliderFloat(text, id, cvarName, min, max, format, defaultValue, isPercentage, PlusMinusButton, disabled, disabledTooltipText);
-
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
-
-    bool EnhancementRadioButton(const char* text, const char* cvarName, int id) {
-        /*Usage :
-        EnhancementRadioButton("My Visible Name",CVAR_GROUP("MyCVarName"), MyID);
-        First arg is the visible name of the Radio button
-        Second is the cvar name where MyID will be saved.
-        Note: the CVar name should be the same to each Buddies.
-        Example :
-            EnhancementRadioButton("English", CVAR_SETTING("Languages"), LANGUAGE_ENG);
-            EnhancementRadioButton("German", CVAR_SETTING("Languages"), LANGUAGE_GER);
-            EnhancementRadioButton("French", CVAR_SETTING("Languages"), LANGUAGE_FRA);
-        */
-        std::string make_invisible = "##" + std::string(text) + std::string(cvarName);
-
-        bool ret = false;
-        int val = CVarGetInteger(cvarName, 0);
-        if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
-            CVarSetInteger(cvarName, id);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            ret = true;
-        }
-        ImGui::SameLine();
-        ImGui::Text("%s", text);
-        
-        return ret;
-    }
-
-    bool DrawResetColorButton(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha) {
-        bool changed = false;
-        std::string Cvar_RBM = std::string(cvarName) + "RBM";
-        std::string MakeInvisible = "Reset##" + std::string(cvarName) + "Reset";
-        if (ImGui::Button(MakeInvisible.c_str())) {
-            colors->x = defaultcolors.x;
-            colors->y = defaultcolors.y;
-            colors->z = defaultcolors.z;
-            colors->w = has_alpha ? defaultcolors.w : 255.0f;
-
-            Color_RGBA8 colorsRGBA;
-            colorsRGBA.r = defaultcolors.x;
-            colorsRGBA.g = defaultcolors.y;
-            colorsRGBA.b = defaultcolors.z;
-            colorsRGBA.a = has_alpha ? defaultcolors.w : 255.0f;
-
-            CVarSetColor(cvarName, colorsRGBA);
-            CVarSetInteger(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            changed = true;
-        }
-        Tooltip("Revert colors to the game's original colors (GameCube version)\nOverwrites previously chosen color");
-        return changed;
-    }
-
-    bool DrawRandomizeColorButton(const char* cvarName, ImVec4* colors) {
-        bool changed = false;
-        Color_RGBA8 NewColors = {0,0,0,255};
-        std::string Cvar_RBM = std::string(cvarName) + "RBM";
-        std::string FullName = "Random##" + std::string(cvarName) + "Random";
-        if (ImGui::Button(FullName.c_str())) {
-#if defined(__SWITCH__) || defined(__WIIU__)
-            srand(time(NULL));
-#endif
-            ImVec4 color = GetRandomValue();
-            colors->x = color.x;
-            colors->y = color.y;
-            colors->z = color.z;
-            NewColors.r = fmin(fmax(colors->x * 255, 0), 255);
-            NewColors.g = fmin(fmax(colors->y * 255, 0), 255);
-            NewColors.b = fmin(fmax(colors->z * 255, 0), 255);
-            CVarSetColor(cvarName, NewColors);
-            CVarSetInteger(Cvar_RBM.c_str(), 0); // On click disable rainbow mode.
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-            changed = true;
-        }
-        Tooltip("Chooses a random color\nOverwrites previously chosen color");
-        return changed;
-    }
-
-    void DrawLockColorCheckbox(const char* cvarName) {
-        std::string Cvar_Lock = std::string(cvarName) + "Lock";
-        s32 lock = CVarGetInteger(Cvar_Lock.c_str(), 0);
-        std::string FullName = "Lock##" + Cvar_Lock;
-        EnhancementCheckbox(FullName.c_str(), Cvar_Lock.c_str());
-        Tooltip("Prevents this color from being changed upon selecting \"Randomize all\"");
-    }
-
-    void RainbowColor(const char* cvarName, ImVec4* colors) {
-        std::string Cvar_RBM = std::string(cvarName) + "RBM";
-        std::string MakeInvisible = "Rainbow##" + std::string(cvarName) + "Rainbow";
-
-        EnhancementCheckbox(MakeInvisible.c_str(), Cvar_RBM.c_str());
-        Tooltip("Cycles through colors on a timer\nOverwrites previously chosen color");
-    }
-
-    void LoadPickersColors(ImVec4& ColorArray, const char* cvarname, const ImVec4& default_colors, bool has_alpha) {
-        Color_RGBA8 defaultColors;
-        defaultColors.r = default_colors.x;
-        defaultColors.g = default_colors.y;
-        defaultColors.b = default_colors.z;
-        defaultColors.a = default_colors.w;
-
-        Color_RGBA8 cvarColor = CVarGetColor(cvarname, defaultColors);
-
-        ColorArray.x = cvarColor.r / 255.0;
-        ColorArray.y = cvarColor.g / 255.0;
-        ColorArray.z = cvarColor.b / 255.0;
-        ColorArray.w = cvarColor.a / 255.0;
-    }
-
-    bool EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow, bool has_alpha, bool TitleSameLine) {
-        bool changed = false;
-        LoadPickersColors(ColorRGBA, cvarName, default_colors, has_alpha);
-
-        ImGuiColorEditFlags flags = ImGuiColorEditFlags_None;
-
-        if (!TitleSameLine) {
-            ImGui::Text("%s", text);
-            flags = ImGuiColorEditFlags_NoLabel;
-        }
-
-        ImGui::PushID(cvarName);
-
-        if (!has_alpha) {
-            if (ImGui::ColorEdit3(text, (float*)&ColorRGBA, flags))
-            {
-                Color_RGBA8 colors;
-                colors.r = ColorRGBA.x * 255.0;
-                colors.g = ColorRGBA.y * 255.0;
-                colors.b = ColorRGBA.z * 255.0;
-                colors.a = 255.0;
-
-                CVarSetColor(cvarName, colors);
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                changed = true;
-            }
-        }
-        else
-        {
-            flags |= ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_AlphaPreview;
-            if (ImGui::ColorEdit4(text, (float*)&ColorRGBA, flags))
-            {
-                Color_RGBA8 colors;
-                colors.r = ColorRGBA.x * 255.0;
-                colors.g = ColorRGBA.y * 255.0;
-                colors.b = ColorRGBA.z * 255.0;
-                colors.a = ColorRGBA.w * 255.0;
-
-                CVarSetColor(cvarName, colors);
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
-                changed = true;
-            }
-        }
-
-        ImGui::PopID();
-
-        //ImGui::SameLine(); // Removing that one to gain some width spacing on the HUD editor
-        ImGui::PushItemWidth(-FLT_MIN);
-        if (DrawResetColorButton(cvarName, &ColorRGBA, default_colors, has_alpha)) {
-            changed = true;
-        }
-        ImGui::SameLine();
-        if (DrawRandomizeColorButton(cvarName, &ColorRGBA)) {
-            changed = true;
-        }
-        if (allow_rainbow) {
-            if (ImGui::GetContentRegionAvail().x > 185) {
-                ImGui::SameLine();
-            }
-            RainbowColor(cvarName, &ColorRGBA);
-        }
-        DrawLockColorCheckbox(cvarName);
-        ImGui::NewLine();
-        ImGui::PopItemWidth();
-
-        return changed;
-    }
-
-    void DrawFlagArray32(const std::string& name, uint32_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int32_t flagIndex = 0; flagIndex < 32; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint32_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
-            }
-            ImGui::PopID();
-        }
-        ImGui::PopID();
-    }
-
-    void DrawFlagArray16(const std::string& name, uint16_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int16_t flagIndex = 0; flagIndex < 16; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint16_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
-            }
-            ImGui::PopID();
-        }
-        ImGui::PopID();
-    }
-
-    void DrawFlagArray8(const std::string& name, uint8_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int8_t flagIndex = 0; flagIndex < 8; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint8_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
-            }
-            ImGui::PopID();
-        }
-        ImGui::PopID();
-    }
-
-    bool StateButtonEx(const char* str_id, const char* label, ImVec2 size, ImGuiButtonFlags flags) {
-        ImGuiContext& g = *GImGui;
-        ImGuiWindow* window = ImGui::GetCurrentWindow();
-        if (window->SkipItems)
-            return false;
-
-        const ImGuiStyle& style = g.Style;
-        const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
-
-        const ImGuiID id = window->GetID(str_id);
-        const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
-        const float default_size = ImGui::GetFrameHeight();
-        ImGui::ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f);
-        if (!ImGui::ItemAdd(bb, id))
-            return false;
-
-        if (g.LastItemData.ItemFlags & ImGuiItemFlags_ButtonRepeat) {
-            ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat, true);
-        }
-
-        bool hovered, held;
-        bool pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held, flags);
-
-        if (g.LastItemData.ItemFlags & ImGuiItemFlags_ButtonRepeat) {
-            ImGui::PopItemFlag(); // ImGuiItemFlags_ButtonRepeat;
-        }
-
-        // Render
-        const ImU32 bg_col = ImGui::GetColorU32((held && hovered) ? ImGuiCol_ButtonActive
-                                         : hovered         ? ImGuiCol_ButtonHovered
-                                                           : ImGuiCol_Button);
-        //const ImU32 text_col = ImGui::GetColorU32(ImGuiCol_Text);
-        ImGui::RenderNavHighlight(bb, id);
-        ImGui::RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding);
-        ImGui::RenderTextClipped(bb.Min + style.FramePadding, bb.Max - style.FramePadding, label, NULL, &label_size, {0.55f, 0.45f}, &bb);
-        /*ImGui::RenderArrow(window->DrawList,
-                    bb.Min +
-                        ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)),
-                    text_col, dir);*/
-
-        IMGUI_TEST_ENGINE_ITEM_INFO(id, str_id, g.LastItemData.StatusFlags);
-        return pressed;
-    }
-
-    bool StateButton(const char* str_id, const char* label) {
-        float sz = ImGui::GetFrameHeight();
-        return StateButtonEx(str_id, label, ImVec2(sz, sz), ImGuiButtonFlags_None);
-    }
-
-    // Reference: imgui-src/misc/cpp/imgui_stdlib.cpp
-    int InputTextResizeCallback(ImGuiInputTextCallbackData* data) {
-        std::string* value = (std::string*)data->UserData;
-        if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) {
-            value->resize(data->BufTextLen);
-            data->Buf = (char*)value->c_str();
-        }
-        return 0;
-    }
-
-    bool InputString(const char* label, std::string* value) {
-        return ImGui::InputText(label, (char*)value->c_str(), value->capacity() + 1, ImGuiInputTextFlags_CallbackResize, InputTextResizeCallback, value);
+    ImGui::Separator();
+    if (padBottom) {
+        Spacer(extraVerticalBottomPadding);
     }
 }
+
+void Tooltip(const char* text) {
+    if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("%s", WrappedText(text).c_str());
+    }
+}
+
+void PushStyleMenu(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_PopupBg, ColorValues.at(Colors::DarkGray));
+    ImGui::PushStyleColor(ImGuiCol_Border, ColorValues.at(Colors::DarkGray));
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8.0f, 15.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 3.0f);
+}
+
+void PushStyleMenu(Colors color) {
+    PushStyleMenu(ColorValues.at(color));
+}
+
+void PopStyleMenu() {
+    ImGui::PopStyleVar(2);
+    ImGui::PopStyleColor(4);
+}
+
+bool BeginMenu(const char* label, Colors color) {
+    bool dirty = false;
+    PushStyleMenu(color);
+    ImGui::SetNextWindowSizeConstraints(ImVec2(200.0f, 0.0f), ImVec2(FLT_MAX, FLT_MAX));
+    if (ImGui::BeginMenu(label)) {
+        dirty = true;
+    }
+    PopStyleMenu();
+    return dirty;
+}
+
+void PushStyleMenuItem(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, color);
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(20.0f, 15.0f));
+}
+
+void PushStyleMenuItem(Colors color) {
+    PushStyleMenuItem(ColorValues.at(color));
+}
+
+void PopStyleMenuItem() {
+    ImGui::PopStyleVar(1);
+    ImGui::PopStyleColor(1);
+}
+
+bool MenuItem(const char* label, const char* shortcut, Colors color) {
+    bool dirty = false;
+    PushStyleMenuItem(color);
+    if (ImGui::MenuItem(label, shortcut)) {
+        dirty = true;
+    }
+    PopStyleMenuItem();
+    return dirty;
+}
+
+void PushStyleButton(const ImVec4& color, const ImVec2 padding) {
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, padding);
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PushStyleButton(Colors color, ImVec2 padding) {
+    PushStyleButton(ColorValues.at(color), padding);
+}
+
+void PopStyleButton() {
+    ImGui::PopStyleVar(3);
+    ImGui::PopStyleColor(4);
+}
+
+void PushStyleInput(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PushStyleInput(Colors color) {
+    PushStyleInput(ColorValues.at(color));
+}
+
+void PopStyleInput() {
+    ImGui::PopStyleVar(3);
+    ImGui::PopStyleColor(7);
+}
+
+void PushStyleHeader(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(color.x, color.y, color.z, 0.6f));
+}
+
+void PushStyleHeader(Colors color) {
+    PushStyleHeader(ColorValues.at(color));
+}
+
+void PopStyleHeader() {
+    ImGui::PopStyleColor(3);
+}
+
+bool Button(const char* label, const ButtonOptions& options) {
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleButton(options.color, options.padding);
+    bool dirty = ImGui::Button(label, options.size);
+    PopStyleButton();
+    ImGui::EndDisabled();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    return dirty;
+}
+
+bool WindowButton(const char* label, const char* cvarName, std::shared_ptr<Ship::GuiWindow> windowPtr,
+                  const WindowButtonOptions& options) {
+    ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
+    std::string buttonText = label;
+    bool dirty = false;
+    if (CVarGetInteger(cvarName, 0)) {
+        buttonText = ICON_FA_WINDOW_CLOSE " " + buttonText;
+    } else {
+        buttonText = ICON_FA_EXTERNAL_LINK_SQUARE " " + buttonText;
+    }
+    if (Button(buttonText.c_str(), { { options.tooltip, options.disabled, options.disabledTooltip },
+                                     options.size,
+                                     options.padding,
+                                     options.color })) {
+        windowPtr->ToggleVisibility();
+        dirty = true;
+    }
+    ImGui::PopStyleVar();
+    return dirty;
+}
+
+void PushStyleCheckbox(const ImVec4& color, ImVec2 padding) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(1.0f, 1.0f, 1.0f, 0.7f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, padding);
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PushStyleCheckbox(Colors color, ImVec2 padding) {
+    PushStyleCheckbox(ColorValues.at(color), padding);
+}
+
+void PopStyleCheckbox() {
+    ImGui::PopStyleVar(3);
+    ImGui::PopStyleColor(5);
+}
+
+void Spacer(float height) {
+    ImGui::Dummy(ImVec2(0.0f, height));
+}
+
+void Separator(bool padTop, bool padBottom, float extraVerticalTopPadding, float extraVerticalBottomPadding) {
+    if (padTop) {
+        Spacer(extraVerticalTopPadding);
+    }
+    ImGui::Separator();
+    if (padBottom) {
+        Spacer(extraVerticalBottomPadding);
+    }
+}
+
+// Adds a "?" next to the previous ImGui item with a custom tooltip
+void InsertHelpHoverText(const std::string& text) {
+    ImGui::SameLine();
+    ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60).c_str());
+        ImGui::EndTooltip();
+    }
+}
+
+void InsertHelpHoverText(const char* text) {
+    ImGui::SameLine();
+    ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60).c_str());
+        ImGui::EndTooltip();
+    }
+}
+
+void RenderText(ImVec2 pos, const char* text, const char* text_end, bool hide_text_after_hash) {
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+
+    // Hide anything after a '##' string
+    const char* text_display_end;
+    if (hide_text_after_hash) {
+        text_display_end = ImGui::FindRenderedTextEnd(text, text_end);
+    } else {
+        if (!text_end)
+            text_end = text + strlen(text); // FIXME-OPT
+        text_display_end = text_end;
+    }
+
+    if (text != text_display_end) {
+        window->DrawList->AddText(g.Font, g.FontSize, pos, ImGui::GetColorU32(ImGuiCol_Text), text, text_display_end);
+        if (g.LogEnabled)
+            ImGui::LogRenderedText(&pos, text, text_display_end);
+    }
+}
+
+bool Checkbox(const char* _label, bool* value, const CheckboxOptions& options) {
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    if (window->SkipItems)
+        return false;
+
+    ImGui::BeginDisabled(options.disabled);
+
+    bool above = options.labelPosition == LabelPositions::Above;
+    bool lpFar = options.labelPosition == LabelPositions::Far;
+    bool right = options.alignment == ComponentAlignments::Right;
+    bool none = options.labelPosition == LabelPositions::None;
+
+    std::string labelStr = (none ? "##" : "");
+    labelStr.append(_label);
+
+    const char* label = labelStr.c_str();
+
+    PushStyleCheckbox(options.color, options.padding);
+    ImGuiContext& g = *GImGui;
+    const ImGuiStyle& style = g.Style;
+    const ImGuiID id = window->GetID(label);
+    const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
+    const float square_sz = ImGui::GetFrameHeight();
+    ImVec2 pos = window->DC.CursorPos;
+
+    if (right) {
+        float labelOffsetX = (above ? 0 : (style.ItemInnerSpacing.x * 2.0f) + square_sz);
+        if (!lpFar) {
+            pos.x += ImGui::GetContentRegionAvail().x - (label_size.x + labelOffsetX);
+        }
+    }
+    float bbAboveX = lpFar ? ImGui::GetContentRegionAvail().x
+                           : (label_size.x + (above ? 0 : (style.ItemInnerSpacing.x * 2.0f) + square_sz));
+    float bbAboveY = label_size.y + (above ? square_sz : 0) + (style.FramePadding.y * 2.0f);
+    const ImRect total_bb(pos, pos + ImVec2(bbAboveX, bbAboveY));
+
+    ImGui::ItemSize(total_bb, style.FramePadding.y);
+    if (!ImGui::ItemAdd(total_bb, id)) {
+        PopStyleCheckbox();
+        ImGui::EndDisabled();
+        return false;
+    }
+    bool hovered, held, pressed;
+    pressed = ImGui::ButtonBehavior(total_bb, id, &hovered, &held);
+    if (pressed) {
+        *value = !(*value);
+        ImGui::MarkItemEdited(id);
+    }
+    ImVec2 checkPos = pos;
+    ImVec2 labelPos = pos;
+    if (options.labelPosition == LabelPositions::Above) {
+        checkPos.y += label_size.y + (style.ItemInnerSpacing.y * 2.0f);
+    } else {
+        // Center with checkbox automatically
+        labelPos.y += ImGui::GetStyle().FramePadding.y;
+    }
+    if (options.alignment == ComponentAlignments::Right) {
+        checkPos.x = total_bb.Max.x - square_sz;
+    } else {
+        float labelFarOffset = ImGui::GetContentRegionAvail().x - label_size.x;
+        float labelOffsetX = above ? 0 : (lpFar ? labelFarOffset : (style.ItemInnerSpacing.x * 2.0f) + square_sz);
+        labelPos.x += labelOffsetX;
+    }
+    const ImRect check_bb(checkPos, checkPos + ImVec2(square_sz, square_sz));
+    ImGui::RenderNavHighlight(total_bb, id);
+    ImGui::RenderFrame(check_bb.Min, check_bb.Max,
+                       ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive
+                                          : hovered         ? ImGuiCol_FrameBgHovered
+                                                            : ImGuiCol_FrameBg),
+                       true, style.FrameRounding);
+    ImU32 check_col = ImGui::GetColorU32(ImGuiCol_CheckMark);
+    bool mixed_value = (g.LastItemData.ItemFlags & ImGuiItemFlags_MixedValue) != 0;
+    if (mixed_value) {
+        // Undocumented tristate/mixed/indeterminate checkbox (#2644)
+        // This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all
+        // widgets (not just checkbox)
+        ImVec2 pad(ImMax(1.0f, IM_TRUNC(square_sz / 3.6f)), ImMax(1.0f, IM_TRUNC(square_sz / 3.6f)));
+        window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
+    } else if (*value) {
+        const float pad = ImMax(1.0f, IM_TRUNC(square_sz / 6.0f));
+        ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
+    }
+    RenderText(labelPos, label, ImGui::FindRenderedTextEnd(label), true);
+    PopStyleCheckbox();
+    ImGui::EndDisabled();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    return pressed;
+}
+
+bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions& options) {
+    bool dirty = false;
+    bool value = (bool)CVarGetInteger(cvarName, options.defaultValue);
+    if (Checkbox(label, &value, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+bool StateButton(const char* str_id, const char* label, ImVec2 size, ButtonOptions options, ImGuiButtonFlags flags) {
+
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    if (window->SkipItems) {
+        return false;
+    }
+
+    const ImGuiStyle& style = g.Style;
+    const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
+
+    const ImGuiID id = window->GetID(str_id);
+    const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
+    const float default_size = ImGui::GetFrameHeight();
+    ImGui::ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f);
+    if (!ImGui::ItemAdd(bb, id))
+        return false;
+
+    if (g.LastItemData.ItemFlags & ImGuiItemFlags_ButtonRepeat) {
+        ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat, true);
+    }
+
+    bool hovered, held;
+    bool pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held, flags);
+
+    if (g.LastItemData.ItemFlags & ImGuiItemFlags_ButtonRepeat) {
+        ImGui::PopItemFlag(); // ImGuiItemFlags_ButtonRepeat;
+    }
+    PushStyleButton(options.color);
+    // Render
+    const ImU32 bg_col = ImGui::GetColorU32((held && hovered) ? ImGuiCol_ButtonActive
+                                            : hovered         ? ImGuiCol_ButtonHovered
+                                                              : ImGuiCol_Button);
+    // const ImU32 text_col = ImGui::GetColorU32(ImGuiCol_Text);
+    ImGui::RenderNavHighlight(bb, id);
+    ImGui::RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding);
+    ImGui::RenderTextClipped(bb.Min + (style.FramePadding * 0.35f), bb.Max - (style.FramePadding / 4), label, NULL,
+                             &label_size, style.ButtonTextAlign, &bb);
+    PopStyleButton();
+    /*ImGui::RenderArrow(window->DrawList,
+    bb.Min +
+    ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)),
+    text_col, dir);*/
+
+    IMGUI_TEST_ENGINE_ITEM_INFO(id, str_id, g.LastItemData.StatusFlags);
+    return pressed;
+}
+
+float CalcComboWidth(const char* preview_value, ImGuiComboFlags flags) {
+    ImGuiContext& g = *GImGui;
+
+    const ImGuiStyle& style = g.Style;
+    IM_ASSERT((flags & (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)) !=
+              (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)); // Can't use both flags together
+    if (flags & ImGuiComboFlags_WidthFitPreview)
+        IM_ASSERT((flags & (ImGuiComboFlags_NoPreview | (ImGuiComboFlags)ImGuiComboFlags_CustomPreview)) == 0);
+
+    const float arrow_size = (flags & ImGuiComboFlags_NoArrowButton) ? 0.0f : ImGui::GetFrameHeight();
+    const float preview_width = ImGui::CalcTextSize(preview_value, NULL, true).x;
+    float w = arrow_size + preview_width + (style.FramePadding.x * 2.0f);
+    return w;
+}
+
+void PushStyleCombobox(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
+}
+
+void PushStyleCombobox(Colors color) {
+    PushStyleCombobox(ColorValues.at(color));
+}
+
+void PopStyleCombobox() {
+    ImGui::PopStyleVar(4);
+    ImGui::PopStyleColor(9);
+}
+
+void PushStyleTabs(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Tab, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_TabHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_TabActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
+}
+
+void PushStyleTabs(Colors color) {
+    PushStyleTabs(ColorValues.at(color));
+}
+
+void PopStyleTabs() {
+    ImGui::PopStyleColor(6);
+    ImGui::PopStyleVar(4);
+}
+
+void PushStyleSlider(Colors color_) {
+    const ImVec4& color = ColorValues.at(color_);
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_SliderGrab, ImVec4(1.0, 1.0, 1.0, 0.4f));
+    ImGui::PushStyleColor(ImGuiCol_SliderGrabActive, ImVec4(1.0, 1.0, 1.0, 0.5f));
+    ImGui::PushStyleVar(ImGuiStyleVar_GrabRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
+}
+
+void PopStyleSlider() {
+    ImGui::PopStyleVar(4);
+    ImGui::PopStyleColor(6);
+}
+
+bool SliderInt(const char* label, int32_t* value, const IntSliderOptions& options) {
+    bool dirty = false;
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleSlider(options.color);
+    float width = (options.size == ImVec2(0, 0)) ? ImGui::GetContentRegionAvail().x : options.size.x;
+    if (options.labelPosition == LabelPositions::Near || options.labelPosition == LabelPositions::Far) {
+        width = width - (ImGui::CalcTextSize(label).x + ImGui::GetStyle().FramePadding.x);
+    }
+    ImGui::AlignTextToFramePadding();
+    if (options.alignment == ComponentAlignments::Right) {
+        ImGui::Text(label, *value);
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+        } else if (options.labelPosition == LabelPositions::Near) {
+            ImGui::SameLine();
+        } else if (options.labelPosition == LabelPositions::Far || options.labelPosition == LabelPositions::None) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+        }
+    } else if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::Text(label, *value);
+        }
+    }
+    if (options.showButtons) {
+        if (Button("-", ButtonOptions{ .color = options.color }.Size(Sizes::Inline)) && *value > options.min) {
+            *value -= options.step;
+            if (options.clamp) {
+                if (*value < options.min) {
+                    *value = options.min;
+                }
+            }
+            dirty = true;
+        }
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(width - (ImGui::CalcTextSize("+").x + ImGui::GetStyle().FramePadding.x * 2 + 3) * 2);
+    } else {
+        ImGui::SetNextItemWidth(width);
+    }
+    if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_S32, value, &options.min, &options.max, options.format,
+                            options.flags)) {
+        if (options.clamp) {
+            if (*value < options.min) {
+                *value = options.min;
+            }
+            if (*value > options.max)
+                *value = options.max;
+        }
+        dirty = true;
+    }
+    if (options.showButtons) {
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (Button("+", ButtonOptions{ .color = options.color }.Size(Sizes::Inline)) && *value < options.max) {
+            *value += options.step;
+            if (options.clamp) {
+                if (*value > options.max)
+                    *value = options.max;
+            }
+            dirty = true;
+        }
+    }
+
+    if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Near) {
+            ImGui::SameLine();
+            ImGui::Text(label, *value);
+        } else if (options.labelPosition == LabelPositions::Far || options.labelPosition == LabelPositions::None) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x +
+                            ImGui::GetStyle().ItemSpacing.x);
+            ImGui::Text(label, *value);
+        }
+    }
+    PopStyleSlider();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarSliderInt(const char* label, const char* cvarName, const IntSliderOptions& options) {
+    bool dirty = false;
+    int32_t value = CVarGetInteger(cvarName, options.defaultValue);
+    if (SliderInt(label, &value, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+void ClampFloat(float* value, float min, float max, float step) {
+    int factor = 1;
+    if (step < 1.0f) {
+        factor *= 10;
+    }
+    if (step < 0.1f) {
+        factor *= 10;
+    }
+    if (step < 0.01f) {
+        factor *= 10;
+    }
+    if (step < 0.001f) {
+        factor *= 10;
+    }
+    if (step < 0.0001f) {
+        factor *= 10;
+    }
+    if (step < 0.00001f) {
+        factor *= 10;
+    }
+    if (*value < min) {
+        *value = min;
+    } else if (*value > max) {
+        *value = max;
+    } else {
+        int trunc = (int)std::round(*value * factor);
+        *value = (float)trunc / factor;
+    }
+}
+
+bool SliderFloat(const char* label, float* value, const FloatSliderOptions& options) {
+    bool dirty = false;
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    float valueToDisplay = options.isPercentage ? *value * 100.0f : *value;
+    float maxToDisplay = options.isPercentage ? options.max * 100.0f : options.max;
+    float minToDisplay = options.isPercentage ? options.min * 100.0f : options.min;
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleSlider(options.color);
+    float labelSpacing = ImGui::CalcTextSize(label).x + ImGui::GetStyle().ItemSpacing.x;
+    float width = (options.size == ImVec2(0, 0)) ? ImGui::GetContentRegionAvail().x : options.size.x;
+    if (options.labelPosition == LabelPositions::Near || options.labelPosition == LabelPositions::Far) {
+        width = width - (ImGui::CalcTextSize(label).x + ImGui::GetStyle().FramePadding.x);
+    }
+    ImGui::AlignTextToFramePadding();
+    if (options.alignment == ComponentAlignments::Right) {
+        ImGui::Text(label, *value);
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+        } else if (options.labelPosition == LabelPositions::Near) {
+            width -= labelSpacing;
+            ImGui::SameLine();
+        } else if (options.labelPosition == LabelPositions::Far || options.labelPosition == LabelPositions::None) {
+            width -= labelSpacing;
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+        }
+    } else if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::Text(label, *value);
+        }
+    }
+    if (options.showButtons) {
+        if (Button("-", ButtonOptions{ .color = options.color }.Size(Sizes::Inline)) && *value > options.min) {
+            *value -= options.step;
+            if (options.clamp) {
+                ClampFloat(value, options.min, options.max, options.step);
+            }
+            dirty = true;
+        }
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(width - (ImGui::CalcTextSize("+").x + ImGui::GetStyle().FramePadding.x * 2 + 3) * 2);
+    } else {
+        ImGui::SetNextItemWidth(width);
+    }
+    if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_Float, &valueToDisplay, &minToDisplay, &maxToDisplay,
+                            options.format, options.flags)) {
+        *value = options.isPercentage ? valueToDisplay / 100.0f : valueToDisplay;
+        if (options.clamp) {
+            ClampFloat(value, options.min, options.max, options.step);
+        }
+        dirty = true;
+    }
+    if (options.showButtons) {
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (Button("+", ButtonOptions{ .color = options.color }.Size(Sizes::Inline)) && *value < options.max) {
+            *value += options.step;
+            if (options.clamp) {
+                ClampFloat(value, options.min, options.max, options.step);
+            }
+            dirty = true;
+        }
+    }
+
+    if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Near) {
+            ImGui::SameLine();
+            ImGui::Text(label, *value);
+        } else if (options.labelPosition == LabelPositions::Far || options.labelPosition == LabelPositions::None) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - labelSpacing);
+            ImGui::Text(label, *value);
+        }
+    }
+    PopStyleSlider();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarSliderFloat(const char* label, const char* cvarName, const FloatSliderOptions& options) {
+    bool dirty = false;
+    float value = CVarGetFloat(cvarName, options.defaultValue);
+    if (SliderFloat(label, &value, options)) {
+        CVarSetFloat(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+int InputTextResizeCallback(ImGuiInputTextCallbackData* data) {
+    std::string* value = (std::string*)data->UserData;
+    if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) {
+        value->resize(data->BufTextLen);
+        data->Buf = (char*)value->c_str();
+    }
+    return 0;
+}
+
+bool InputString(const char* label, std::string* value, const InputOptions& options) {
+    bool dirty = false;
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleInput(options.color);
+    if (options.hasError) {
+        ImGui::PushStyleColor(ImGuiCol_Border, ColorValues.at(Colors::Red));
+    }
+    float width = (options.size == ImVec2(0, 0)) ? ImGui::GetContentRegionAvail().x : options.size.x;
+    if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::Text(label, *value->c_str());
+        }
+    } else if (options.alignment == ComponentAlignments::Right) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(width - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label, *value->c_str());
+        }
+    }
+    ImGui::SetNextItemWidth(width);
+    ImGuiInputTextFlags flags = ImGuiInputTextFlags_CallbackResize;
+    if (options.secret) {
+        flags |= ImGuiInputTextFlags_Password;
+    }
+    flags |= options.addedFlags;
+    if (ImGui::InputText(label, (char*)value->c_str(), value->capacity() + 1, flags, InputTextResizeCallback, value)) {
+        dirty = true;
+    }
+    if (value->empty() && !options.placeholder.empty()) {
+        ImGui::SameLine(17.0f);
+        ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.4f), "%s", options.placeholder.c_str());
+    }
+    if (options.hasError) {
+        ImGui::PopStyleColor();
+    }
+    PopStyleInput();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.hasError && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.errorText)) {
+        ImGui::SetTooltip("%s", WrappedText(options.errorText).c_str());
+    } else if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+               !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarInputString(const char* label, const char* cvarName, const InputOptions& options) {
+    bool dirty = false;
+    std::string value = CVarGetString(cvarName, options.defaultValue.c_str());
+    if (InputString(label, &value, options)) {
+        CVarSetString(cvarName, value.c_str());
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+bool InputInt(const char* label, int32_t* value, const InputOptions& options) {
+    bool dirty = false;
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleInput(options.color);
+    float width = (options.size == ImVec2(0, 0)) ? ImGui::GetContentRegionAvail().x : options.size.x;
+    if (options.alignment == ComponentAlignments::Left) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::Text(label, *value);
+        }
+    } else if (options.alignment == ComponentAlignments::Right) {
+        if (options.labelPosition == LabelPositions::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(width - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label, *value);
+        }
+    }
+    ImGui::SetNextItemWidth(width);
+    if (ImGui::InputScalar(label, ImGuiDataType_S32, value, nullptr, nullptr, nullptr, options.addedFlags)) {
+        dirty = true;
+    }
+    if ((ImGui::GetItemStatusFlags() & ImGuiItemStatusFlags_Edited) && !options.placeholder.empty()) {
+        ImGui::SameLine(17.0f);
+        ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.4f), "%s", options.placeholder.c_str());
+    }
+    PopStyleInput();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarInputInt(const char* label, const char* cvarName, const InputOptions& options) {
+    bool dirty = false;
+    int32_t defaultValue = std::stoi(options.defaultValue);
+    int32_t value = CVarGetInteger(cvarName, defaultValue);
+    if (InputInt(label, &value, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+bool CVarColorPicker(const char* label, const char* cvarName, Color_RGBA8 defaultColor, bool hasAlpha,
+                     uint8_t modifiers, UIWidgets::Colors themeColor) {
+    std::string valueCVar = std::string(cvarName) + ".Value";
+    std::string rainbowCVar = std::string(cvarName) + ".Rainbow";
+    std::string lockedCVar = std::string(cvarName) + ".Locked";
+    Color_RGBA8 color = CVarGetColor(valueCVar.c_str(), defaultColor);
+    ImVec4 colorVec = ImVec4(color.r / 255.0f, color.g / 255.0f, color.b / 255.0f, color.a / 255.0f);
+    bool changed = false;
+    bool showReset = modifiers & ColorPickerResetButton;
+    bool showRandom = modifiers & ColorPickerRandomButton;
+    bool showRainbow = modifiers & ColorPickerRainbowCheck;
+    bool showLock = modifiers & ColorPickerLockCheck;
+    bool locked = CVarGetInteger(lockedCVar.c_str(), 0);
+    ImGuiColorEditFlags flags = ImGuiColorEditFlags_NoInputs;
+    ImGui::BeginDisabled(locked);
+    PushStyleCombobox(UIWidgets::Colors::DarkGray);
+    if (hasAlpha) {
+        changed = ImGui::ColorEdit4(label, (float*)&colorVec,
+                                    flags | ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_AlphaPreview);
+    } else {
+        changed = ImGui::ColorEdit3(label, (float*)&colorVec, flags | ImGuiColorEditFlags_NoAlpha);
+    }
+    PopStyleCombobox();
+    ImGui::AlignTextToFramePadding();
+    if (showReset) {
+        ImGui::SameLine();
+        std::string uniqueTag = "Reset##" + std::string(label);
+        if (UIWidgets::Button(uniqueTag.c_str(),
+                              UIWidgets::ButtonOptions({ { .tooltip = "Resets this color to its default value" } })
+                                  .Color(themeColor)
+                                  .Size(UIWidgets::Sizes::Inline))) {
+            // TODO: Remove for next minor or major version, temporary fix for already migrated configs to 3 for 9.0.0
+            CVarClear((std::string(cvarName) + ".R").c_str());
+            CVarClear((std::string(cvarName) + ".G").c_str());
+            CVarClear((std::string(cvarName) + ".B").c_str());
+            CVarClear((std::string(cvarName) + ".A").c_str());
+            CVarClear((std::string(cvarName) + ".Type").c_str());
+            CVarClearBlock(valueCVar.c_str());
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        }
+    }
+    if (showRandom) {
+        ImGui::SameLine();
+        std::string uniqueTag = "Random##" + std::string(label);
+        if (UIWidgets::Button(uniqueTag.c_str(),
+                              UIWidgets::ButtonOptions({ { .tooltip = "Generates a random color value to use" } })
+                                  .Color(themeColor)
+                                  .Size(UIWidgets::Sizes::Inline))) {
+            colorVec = GetRandomValue();
+            color.r = fmin(fmax(colorVec.x * 255, 0), 255);
+            color.g = fmin(fmax(colorVec.y * 255, 0), 255);
+            color.b = fmin(fmax(colorVec.z * 255, 0), 255);
+            CVarSetColor(valueCVar.c_str(), color);
+            CVarSetInteger(rainbowCVar.c_str(), 0); // On click disable rainbow mode.
+            ShipInit::Init(rainbowCVar.c_str());
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        }
+    }
+    if (showRainbow) {
+        ImGui::SameLine();
+        std::string uniqueTag = "Rainbow##" + std::string(cvarName) + "Rainbow";
+
+        UIWidgets::CVarCheckbox(
+            uniqueTag.c_str(), rainbowCVar.c_str(),
+            UIWidgets::CheckboxOptions(
+                { { .tooltip = "Cycles through colors on a timer\nOverwrites previously chosen color" } })
+                .Color(themeColor));
+    }
+    ImGui::EndDisabled();
+    if (showLock) {
+        ImGui::SameLine();
+        std::string uniqueTag = "Lock##" + std::string(cvarName) + "Locked";
+
+        UIWidgets::CVarCheckbox(
+            uniqueTag.c_str(), lockedCVar.c_str(),
+            UIWidgets::CheckboxOptions({ { .tooltip = "Prevents this color from being changed" } }).Color(themeColor));
+    }
+    if (changed) {
+        color.r = (uint8_t)(colorVec.x * 255.0f);
+        color.g = (uint8_t)(colorVec.y * 255.0f);
+        color.b = (uint8_t)(colorVec.z * 255.0f);
+        color.a = (uint8_t)(colorVec.w * 255.0f);
+        CVarSetColor(valueCVar.c_str(), color);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(valueCVar.c_str());
+        changed = true;
+    }
+
+    return changed;
+}
+
+bool RadioButton(const char* label, bool active, const RadioButtonsOptions& options) {
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    if (window->SkipItems)
+        return false;
+
+    ImGuiContext& g = *GImGui;
+    const ImGuiStyle& style = g.Style;
+    const ImGuiID id = window->GetID(label);
+    const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
+
+    const float square_sz = ImGui::GetFrameHeight();
+    const ImVec2 pos = window->DC.CursorPos;
+    const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
+    const ImRect total_bb(
+        pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f),
+                          label_size.y + style.FramePadding.y * 2.0f));
+    ImGui::ItemSize(total_bb, style.FramePadding.y);
+    if (!ImGui::ItemAdd(total_bb, id))
+        return false;
+
+    ImVec2 center = check_bb.GetCenter();
+    center.x = IM_ROUND(center.x);
+    center.y = IM_ROUND(center.y);
+    const float radius = (square_sz - 1.0f) * 0.5f;
+
+    bool hovered, held;
+    bool pressed = ImGui::ButtonBehavior(total_bb, id, &hovered, &held);
+    if (pressed)
+        ImGui::MarkItemEdited(id);
+
+    ImGui::RenderNavCursor(total_bb, id);
+    const int num_segment = window->DrawList->_CalcCircleAutoSegmentCount(radius);
+    window->DrawList->AddCircleFilled(center, radius,
+                                      ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive
+                                                         : hovered         ? ImGuiCol_FrameBgHovered
+                                                                           : ImGuiCol_FrameBg),
+                                      num_segment);
+    if (active) {
+        const float pad = ImMax(1.0f, IM_TRUNC(square_sz / 6.0f));
+        window->DrawList->AddCircleFilled(center, radius - pad, ImGui::GetColorU32(ImGuiCol_CheckMark));
+    }
+
+    if (style.FrameBorderSize > 0.0f) {
+        window->DrawList->AddCircle(center + ImVec2(1, 1), radius, ImGui::GetColorU32(ImGuiCol_BorderShadow),
+                                    num_segment, style.FrameBorderSize);
+        window->DrawList->AddCircle(center, radius, ImGui::GetColorU32(ImGuiCol_Border), num_segment,
+                                    style.FrameBorderSize);
+    }
+
+    ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
+    if (g.LogEnabled)
+        ImGui::LogRenderedText(&label_pos, active ? "(x)" : "( )");
+    if (label_size.x > 0.0f)
+        RenderText(label_pos, label, ImGui::FindRenderedTextEnd(label), true);
+
+    IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags);
+    return pressed;
+}
+
+bool CVarRadioButton(const char* text, const char* cvarName, int32_t id, const RadioButtonsOptions& options) {
+    std::string make_invisible = "##" + std::string(text) + std::string(cvarName);
+
+    bool ret = false;
+    int val = CVarGetInteger(cvarName, options.defaultIndex);
+    PushStyleCheckbox(options.color);
+    if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
+        CVarSetInteger(cvarName, id);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ret = true;
+    }
+    ImGui::SameLine();
+    ImGui::Text("%s", text);
+    PopStyleCheckbox();
+    if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+
+    return ret;
+}
+
+void DrawFlagArray32(const std::string& name, uint32_t& flags, Colors color) {
+    ImGui::PushID(name.c_str());
+    for (int32_t flagIndex = 0; flagIndex < 32; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint32_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        PushStyleCheckbox(color);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
+        std::string id = fmt::format("##{}{}", name, flagIndex);
+        if (ImGui::Checkbox(id.c_str(), &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
+            }
+        }
+        ImGui::PopStyleVar();
+        PopStyleCheckbox();
+        ImGui::PopID();
+    }
+    ImGui::PopID();
+}
+
+void DrawFlagArray16(const std::string& name, uint16_t& flags, Colors color) {
+    ImGui::PushID(name.c_str());
+    for (int16_t flagIndex = 0; flagIndex < 16; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint16_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        PushStyleCheckbox(color);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
+        std::string id = fmt::format("##{}{}", name, flagIndex);
+        if (ImGui::Checkbox(id.c_str(), &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
+            }
+        }
+        ImGui::PopStyleVar();
+        PopStyleCheckbox();
+        ImGui::PopID();
+    }
+    ImGui::PopID();
+}
+
+void DrawFlagArray8(const std::string& name, uint8_t& flags, Colors color) {
+    ImGui::PushID(name.c_str());
+    for (int8_t flagIndex = 0; flagIndex < 8; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint8_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        PushStyleCheckbox(color);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
+        std::string id = fmt::format("##{}{}", name, flagIndex);
+        if (ImGui::Checkbox(id.c_str(), &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
+            }
+        }
+        ImGui::PopStyleVar();
+        PopStyleCheckbox();
+        ImGui::PopID();
+    }
+    ImGui::PopID();
+}
+
+void DrawFlagArray8Mask(const std::string& name, uint8_t& flags, Colors color) {
+    ImGui::PushID(name.c_str());
+    for (int8_t flagIndex = 0; flagIndex < 8; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint8_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        PushStyleCheckbox(color);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.0f, 3.0f));
+        std::string id = fmt::format("##{}{}", name, flagIndex);
+        if (ImGui::Checkbox(id.c_str(), &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
+            }
+        }
+        ImGui::PopStyleVar();
+        PopStyleCheckbox();
+        ImGui::PopID();
+    }
+    ImGui::PopID();
+}
+} // namespace UIWidgets
+
+ImVec4 GetRandomValue() {
+#if !defined(__SWITCH__) && !defined(__WIIU__)
+    std::random_device rd;
+    std::mt19937 rng(rd());
+#else
+    size_t seed = std::hash<std::string>{}(std::to_string(rand()));
+    std::mt19937_64 rng(seed);
+#endif
+    std::uniform_int_distribution<int> dist(0, 255 - 1);
+
+    ImVec4 NewColor;
+    NewColor.x = (float)(dist(rng)) / 255.0f;
+    NewColor.y = (float)(dist(rng)) / 255.0f;
+    NewColor.z = (float)(dist(rng)) / 255.0f;
+    return NewColor;
+}
+
+Color_RGBA8 RGBA8FromVec(ImVec4 vec) {
+    Color_RGBA8 color = { vec.x * 255, vec.y * 255, vec.z * 255, vec.w * 255 };
+    return color;
+}
+
+ImVec4 VecFromRGBA8(Color_RGBA8 color) {
+    ImVec4 vec = { color.r / 255.0f, color.g / 255.0f, color.b / 255.0f, color.a / 255.0f };
+    return vec;
+}
diff --git a/soh/soh/SohGui/UIWidgets.hpp b/soh/soh/SohGui/UIWidgets.hpp
index 97a3672705..caf2e912bf 100644
--- a/soh/soh/SohGui/UIWidgets.hpp
+++ b/soh/soh/SohGui/UIWidgets.hpp
@@ -1,99 +1,948 @@
-#ifndef UIWidgets_hpp
-#define UIWidgets_hpp
+#ifndef UIWidgets2_hpp
+#define UIWidgets2_hpp
 
 #include <string>
-#include <sstream>
 #include <vector>
 #include <span>
 #include <stdint.h>
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
+#include <libultraship/libultraship.h>
+#include <unordered_map>
+#include "soh/ShipUtils.h"
 #include "soh/ShipInit.hpp"
 
 namespace UIWidgets {
 
-    struct TextFilters {
-        static int FilterNumbers(ImGuiInputTextCallbackData* data) {
-            if (data->EventChar < 256 && strchr("1234567890", (char)data->EventChar)) {
-                return 0;
-            }
-            return 1;
+using SectionFunc = void (*)();
+
+struct TextFilters {
+    static int FilterNumbers(ImGuiInputTextCallbackData* data) {
+        if (data->EventChar < 256 && strchr("1234567890", (char)data->EventChar)) {
+            return 0;
         }
+        return 1;
+    }
 
-        static int FilterAlphaNum(ImGuiInputTextCallbackData* data) {
-            const char* alphanum = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWYZ0123456789";
-            if (data->EventChar < 256 && strchr(alphanum, (char)data->EventChar)) {
-                return 0;
-            }
-            return 1;
+    static int FilterAlphaNum(ImGuiInputTextCallbackData* data) {
+        const char* alphanum = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWYZ0123456789";
+        if (data->EventChar < 256 && strchr(alphanum, (char)data->EventChar)) {
+            return 0;
         }
-        
-    };
+        return 1;
+    }
+};
 
-    // MARK: - Enums
+std::string WrappedText(const char* text, unsigned int charactersPerLine = 80);
+std::string WrappedText(const std::string& text, unsigned int charactersPerLine = 80);
+void PaddedSeparator(bool padTop = true, bool padBottom = true, float extraVerticalTopPadding = 0.0f,
+                     float extraVerticalBottomPadding = 0.0f);
+void Tooltip(const char* text);
 
-    enum class CheckboxGraphics {
-        Cross,
-        Checkmark,
-        None
-    };
-    constexpr float maxSliderWidth = 260.0f;
-#ifdef __SWITCH__
-    constexpr float sliderButtonWidth = 42.0f;
-#elif defined(__WIIU__)
-    constexpr float sliderButtonWidth = 60.0f;
-#else
-    constexpr float sliderButtonWidth = 30.0f;
-#endif
+typedef enum ColorPickerModifiers {
+    ColorPickerResetButton = 1,
+    ColorPickerRandomButton = 2,
+    ColorPickerRainbowCheck = 4,
+    ColorPickerLockCheck = 8,
+} ColorPickerModifiers;
 
-    std::string WrappedText(const char* text, unsigned int charactersPerLine = 60);
-    std::string WrappedText(const std::string& text, unsigned int charactersPerLine);
+// mostly in order for colors usable by the menu without custom text color
+enum Colors {
+    Red,
+    DarkRed,
+    Orange,
+    Green,
+    DarkGreen,
+    LightBlue,
+    Blue,
+    DarkBlue,
+    Indigo,
+    Violet,
+    Purple,
+    Brown,
+    Gray,
+    DarkGray,
+    // not suitable for menu theme use
+    Pink,
+    Yellow,
+    Cyan,
+    Black,
+    LightGray,
+    White,
+    NoColor
+};
 
-    void SetLastItemHoverText(const std::string& text);
-    void SetLastItemHoverText(const char* text);
+enum InputTypes { String, Scalar };
 
-    void InsertHelpHoverText(const std::string& text);
-    void InsertHelpHoverText(const char* text);
+const std::unordered_map<Colors, ImVec4> ColorValues = {
+    { Colors::Pink, ImVec4(0.87f, 0.3f, 0.87f, 1.0f) },     { Colors::Red, ImVec4(0.55f, 0.0f, 0.0f, 1.0f) },
+    { Colors::DarkRed, ImVec4(0.3f, 0.0f, 0.0f, 1.0f) },    { Colors::Orange, ImVec4(0.85f, 0.55f, 0.0f, 1.0f) },
+    { Colors::Yellow, ImVec4(0.95f, 0.95f, 0.0f, 1.0f) },   { Colors::Green, ImVec4(0.0f, 0.55f, 0.0f, 1.0f) },
+    { Colors::DarkGreen, ImVec4(0.0f, 0.3f, 0.0f, 1.0f) },  { Colors::Cyan, ImVec4(0.0f, 0.9f, 0.9f, 1.0f) },
+    { Colors::LightBlue, ImVec4(0.0f, 0.24f, 0.8f, 1.0f) }, { Colors::Blue, ImVec4(0.08f, 0.03f, 0.65f, 1.0f) },
+    { Colors::DarkBlue, ImVec4(0.03f, 0.0f, 0.5f, 1.0f) },  { Colors::Indigo, ImVec4(0.35f, 0.0f, 0.87f, 1.0f) },
+    { Colors::Violet, ImVec4(0.5f, 0.0f, 0.9f, 1.0f) },     { Colors::Purple, ImVec4(0.31f, 0.0f, 0.67f, 1.0f) },
+    { Colors::Brown, ImVec4(0.37f, 0.18f, 0.0f, 1.0f) },    { Colors::LightGray, ImVec4(0.75f, 0.75f, 0.75f, 1.0f) },
+    { Colors::Gray, ImVec4(0.45f, 0.45f, 0.45f, 1.0f) },    { Colors::DarkGray, ImVec4(0.15f, 0.15f, 0.15f, 1.0f) },
+    { Colors::Black, ImVec4(0.0f, 0.0f, 0.0f, 1.0f) },      { Colors::White, ImVec4(1.0f, 1.0f, 1.0f, 1.0f) },
+    { Colors::NoColor, ImVec4(0.0f, 0.0f, 0.0f, 0.0f) },
+};
 
-    void Tooltip(const char* text);
-    void Spacer(float height);
-    void PaddedSeparator(bool padTop = true, bool padBottom = true, float extraVerticalTopPadding = 0.0f, float extraVerticalBottomPadding = 0.0f);
+namespace Sizes {
+const ImVec2 Inline = ImVec2(0.0f, 0.0f);
+const ImVec2 Fill = ImVec2(-1.0f, 0.0f);
+} // namespace Sizes
 
-    void RenderCross(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz);
-    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic, bool renderCrossWhenOff = false);
-    bool CustomCheckboxTristate(const char* label, int* v, bool disabled, CheckboxGraphics disabledGraphic);
+enum LabelPositions {
+    Near,
+    Far,
+    Above,
+    None,
+    Within,
+};
 
-    void ReEnableComponent(const char* disabledTooltipText);
-    void DisableComponent(const float alpha);
+enum ComponentAlignments {
+    Left,
+    Right,
+};
 
-    bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
-    bool EnhancementCheckboxTristate(const char* text, const char* cvarName, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
-    bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop = true, bool padBottom = true, bool disabled = false, const char* disabledTooltipText = "", CheckboxGraphics disabledGraphic = CheckboxGraphics::Cross, bool defaultValue = false);
-    
-    bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled = false, const char* disabledTooltipText = "", uint8_t disabledValue = -1);
-    bool LabeledRightAlignedEnhancementCombobox(const char* label, const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled = false, const char* disabledTooltipText = "", uint8_t disabledValue = -1);
-    
-    void PaddedText(const char* text, bool padTop = true, bool padBottom = true);
-    
-    bool EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue = 0, bool PlusMinusButton = true, bool disabled = false, const char* disabledTooltipText = "");
-    bool PaddedEnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue = 0, bool PlusMinusButton = true, bool padTop = true, bool padBottom = true, bool disabled = false, const char* disabledTooltipText = "");
-    bool EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton = true, bool disabled = false, const char* disabledTooltipText = "");
-    bool PaddedEnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton = true, bool padTop = true, bool padBottom = true, bool disabled = false, const char* disabledTooltipText = "");
-    
-    bool EnhancementRadioButton(const char* text, const char* cvarName, int id);
+struct WidgetOptions {
+    const char* tooltip = "";
+    bool disabled = false;
+    const char* disabledTooltip = "";
 
-    bool DrawResetColorButton(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha);
-    bool DrawRandomizeColorButton(const char* cvarName, ImVec4* colors);
-    void DrawLockColorCheckbox(const char* cvarName);
-    void RainbowColor(const char* cvarName, ImVec4* colors);
+    WidgetOptions& Tooltip(const char* tooltip_) {
+        tooltip = tooltip_;
+        return *this;
+    }
+    WidgetOptions& Disabled(bool disabled_) {
+        disabled = disabled_;
+        return *this;
+    }
+    WidgetOptions& DisabledTooltip(const char* disabledTooltip_) {
+        disabledTooltip = disabledTooltip_;
+        return *this;
+    }
+};
 
-    void LoadPickersColors(ImVec4& ColorArray, const char* cvarname, const ImVec4& default_colors, bool has_alpha);
-    bool EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow = true, bool has_alpha = false, bool TitleSameLine = false);
+struct TextOptions : WidgetOptions {
+    Colors color = Colors::NoColor;
 
-    void DrawFlagArray32(const std::string& name, uint32_t& flags);
-    void DrawFlagArray16(const std::string& name, uint16_t& flags);
-    void DrawFlagArray8(const std::string& name, uint8_t& flags);
-    bool StateButton(const char* str_id, const char* label);
-    bool InputString(const char* label, std::string* value);
+    TextOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+};
+
+struct ButtonOptions : WidgetOptions {
+    ImVec2 size = Sizes::Fill;
+    ImVec2 padding = ImVec2(10.0f, 8.0f);
+    Colors color = Colors::Gray;
+
+    ButtonOptions& Size(ImVec2 size_) {
+        size = size_;
+        return *this;
+    }
+    ButtonOptions& Padding(ImVec2 padding_) {
+        padding = padding_;
+        return *this;
+    }
+    ButtonOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    ButtonOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+};
+
+struct WindowButtonOptions : WidgetOptions {
+    ImVec2 size = Sizes::Inline;
+    ImVec2 padding = ImVec2(10.0f, 8.0f);
+    Colors color = Colors::Gray;
+    bool showButton = true;
+    bool embedWindow = true;
+
+    WindowButtonOptions& Size(ImVec2 size_) {
+        size = size_;
+        return *this;
+    }
+    WindowButtonOptions& Padding(ImVec2 padding_) {
+        padding = padding_;
+        return *this;
+    }
+    WindowButtonOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    WindowButtonOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    WindowButtonOptions& ShowButton(bool showButton_) {
+        showButton = showButton_;
+        return *this;
+    }
+    WindowButtonOptions& EmbedWindow(bool embedWindow_) {
+        embedWindow = embedWindow_;
+        return *this;
+    }
+};
+
+struct CheckboxOptions : WidgetOptions {
+    bool defaultValue = false; // Only applicable to CVarCheckbox
+    ComponentAlignments alignment = ComponentAlignments::Left;
+    LabelPositions labelPosition = LabelPositions::Near;
+    ImVec2 padding = ImVec2(10.0f, 8.0f);
+    Colors color = Colors::LightBlue;
+
+    CheckboxOptions& DefaultValue(bool defaultValue_) {
+        defaultValue = defaultValue_;
+        return *this;
+    }
+    CheckboxOptions& ComponentAlignment(ComponentAlignments alignment_) {
+        alignment = alignment_;
+        return *this;
+    }
+    CheckboxOptions& LabelPosition(LabelPositions labelPosition_) {
+        labelPosition = labelPosition_;
+        return *this;
+    }
+    CheckboxOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    CheckboxOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    CheckboxOptions& DisabledTooltip(const char* disabledTooltip_) {
+        WidgetOptions::disabledTooltip = disabledTooltip_;
+        return *this;
+    }
+    CheckboxOptions& Padding(ImVec2 padding_) {
+        padding = padding_;
+        return *this;
+    }
+};
+
+struct ComboboxOptions : WidgetOptions {
+    std::unordered_map<int32_t, const char*> comboMap = {};
+    uint32_t defaultIndex = 0; // Only applicable to CVarCombobox
+    ComponentAlignments alignment = ComponentAlignments::Left;
+    LabelPositions labelPosition = LabelPositions::Above;
+    ImGuiComboFlags flags = 0;
+    Colors color = Colors::LightBlue;
+
+    ComboboxOptions& ComboMap(std::unordered_map<int32_t, const char*> comboMap_) {
+        comboMap = comboMap_;
+        return *this;
+    }
+    ComboboxOptions& DefaultIndex(uint32_t defaultIndex_) {
+        defaultIndex = defaultIndex_;
+        return *this;
+    }
+    ComboboxOptions& ComponentAlignment(ComponentAlignments alignment_) {
+        alignment = alignment_;
+        return *this;
+    }
+    ComboboxOptions& LabelPosition(LabelPositions labelPosition_) {
+        labelPosition = labelPosition_;
+        return *this;
+    }
+    ComboboxOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    ComboboxOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+};
+
+struct IntSliderOptions : WidgetOptions {
+    bool showButtons = true;
+    const char* format = "%d";
+    int32_t step = 1;
+    int32_t min = 1;
+    int32_t max = 10;
+    int32_t defaultValue = 1;
+    bool clamp = true;
+    ComponentAlignments alignment = ComponentAlignments::Left;
+    LabelPositions labelPosition = LabelPositions::Above;
+    Colors color = Colors::Gray;
+    ImGuiSliderFlags flags = 0;
+    ImVec2 size = { 0, 0 };
+
+    IntSliderOptions& ShowButtons(bool showButtons_) {
+        showButtons = showButtons_;
+        return *this;
+    }
+    IntSliderOptions& Format(const char* format_) {
+        format = format_;
+        return *this;
+    }
+    IntSliderOptions& Step(int32_t step_) {
+        step = step_;
+        return *this;
+    }
+    IntSliderOptions& Min(int32_t min_) {
+        min = min_;
+        return *this;
+    }
+    IntSliderOptions& Max(int32_t max_) {
+        max = max_;
+        return *this;
+    }
+    IntSliderOptions& DefaultValue(int32_t defaultValue_) {
+        defaultValue = defaultValue_;
+        return *this;
+    }
+    IntSliderOptions& ComponentAlignment(ComponentAlignments alignment_) {
+        alignment = alignment_;
+        return *this;
+    }
+    IntSliderOptions& LabelPosition(LabelPositions labelPosition_) {
+        labelPosition = labelPosition_;
+        return *this;
+    }
+    IntSliderOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    IntSliderOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    IntSliderOptions& Size(ImVec2 size_) {
+        size = size_;
+        return *this;
+    }
+    IntSliderOptions& Clamp(bool clamp_) {
+        clamp = clamp_;
+        return *this;
+    }
+};
+
+struct FloatSliderOptions : WidgetOptions {
+    bool showButtons = true;
+    const char* format = "%f";
+    float step = 0.01f;
+    float min = 0.01f;
+    float max = 10.0f;
+    float defaultValue = 1.0f;
+    bool clamp = true;
+    bool isPercentage = false; // Multiplies visual value by 100
+    ComponentAlignments alignment = ComponentAlignments::Left;
+    LabelPositions labelPosition = LabelPositions::Above;
+    Colors color = Colors::Gray;
+    ImGuiSliderFlags flags = 0;
+    ImVec2 size = { 0, 0 };
+
+    FloatSliderOptions& ShowButtons(bool showButtons_) {
+        showButtons = showButtons_;
+        return *this;
+    }
+    FloatSliderOptions& Format(const char* format_) {
+        format = format_;
+        return *this;
+    }
+    FloatSliderOptions& Step(float step_) {
+        step = step_;
+        return *this;
+    }
+    FloatSliderOptions& Min(float min_) {
+        min = min_;
+        return *this;
+    }
+    FloatSliderOptions& Max(float max_) {
+        max = max_;
+        return *this;
+    }
+    FloatSliderOptions& DefaultValue(float defaultValue_) {
+        defaultValue = defaultValue_;
+        return *this;
+    }
+    FloatSliderOptions& ComponentAlignment(ComponentAlignments alignment_) {
+        alignment = alignment_;
+        return *this;
+    }
+    FloatSliderOptions& LabelPosition(LabelPositions labelPosition_) {
+        labelPosition = labelPosition_;
+        return *this;
+    }
+    FloatSliderOptions& IsPercentage(bool isPercentage_ = true) {
+        isPercentage = isPercentage_;
+        format = "%.0f%%";
+        min = 0.0f;
+        max = 1.0f;
+        return *this;
+    }
+    FloatSliderOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    FloatSliderOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    FloatSliderOptions& Size(ImVec2 size_) {
+        size = size_;
+        return *this;
+    }
+    FloatSliderOptions& Clamp(bool clamp_) {
+        clamp = clamp_;
+        return *this;
+    }
+};
+
+struct RadioButtonsOptions : WidgetOptions {
+    std::unordered_map<int32_t, const char*> buttonMap;
+    int32_t defaultIndex = 0;
+    Colors color = Colors::LightBlue;
+
+    RadioButtonsOptions& ButtonMap(std::unordered_map<int32_t, const char*> buttonMap_) {
+        buttonMap = buttonMap_;
+        return *this;
+    }
+    RadioButtonsOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    RadioButtonsOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    RadioButtonsOptions& DefaultIndex(int32_t defaultIndex_) {
+        defaultIndex = defaultIndex_;
+        return *this;
+    }
+};
+
+struct InputOptions : WidgetOptions {
+    ComponentAlignments alignment = ComponentAlignments::Left;
+    LabelPositions labelPosition = LabelPositions::Above;
+    Colors color = Colors::Gray;
+    ImVec2 size = { 0, 0 };
+    std::string placeholder = "";
+    InputTypes type = InputTypes::String;
+    std::string defaultValue = "";
+    bool secret = false;
+    ImGuiInputFlags addedFlags = 0;
+    bool hasError = false;
+    const char* errorText = "";
+
+    InputOptions& Tooltip(const char* tooltip_) {
+        WidgetOptions::tooltip = tooltip_;
+        return *this;
+    }
+    InputOptions& Color(Colors color_) {
+        color = color_;
+        return *this;
+    }
+    InputOptions& Size(ImVec2 size_) {
+        size = size_;
+        return *this;
+    }
+
+    InputOptions& LabelPosition(LabelPositions labelPosition_) {
+        labelPosition = labelPosition_;
+        return *this;
+    }
+
+    InputOptions& PlaceholderText(std::string&& placeholder_) {
+        placeholder = std::move(placeholder_);
+        return *this;
+    }
+
+    InputOptions& PlaceholderText(std::string& placeholder_) {
+        placeholder = placeholder_;
+        return *this;
+    }
+
+    InputOptions& InputType(InputTypes type_) {
+        type = type_;
+        return *this;
+    }
+
+    InputOptions& ComponentAlignment(ComponentAlignments alignment_) {
+        alignment = alignment_;
+        return *this;
+    }
+
+    InputOptions& DefaultValue(std::string defaultValue_) {
+        defaultValue = defaultValue_;
+        return *this;
+    }
+
+    InputOptions& IsSecret(bool secret_ = false) {
+        secret = secret_;
+        return *this;
+    }
+
+    InputOptions& HasError(bool error_ = false) {
+        hasError = error_;
+        return *this;
+    }
+
+    InputOptions& ErrorText(const char* errorText_) {
+        errorText = errorText_;
+        return *this;
+    }
+};
+
+void PushStyleMenu(const ImVec4& color);
+void PushStyleMenu(Colors color = Colors::LightBlue);
+void PopStyleMenu();
+bool BeginMenu(const char* label, Colors color = Colors::LightBlue);
+
+void PushStyleMenuItem(const ImVec4& color);
+void PushStyleMenuItem(Colors color = Colors::LightBlue);
+void PopStyleMenuItem();
+bool MenuItem(const char* label, const char* shortcut = NULL, Colors color = Colors::LightBlue);
+
+void PushStyleButton(const ImVec4& color, ImVec2 padding = ImVec2(10.0f, 8.0f));
+void PushStyleButton(Colors color = Colors::Gray, ImVec2 padding = ImVec2(10.0f, 8.0f));
+void PopStyleButton();
+bool Button(const char* label, const ButtonOptions& options = {});
+bool WindowButton(const char* label, const char* cvarName, std::shared_ptr<Ship::GuiWindow> windowPtr,
+                  const WindowButtonOptions& options = {});
+
+void PushStyleCheckbox(const ImVec4& color, ImVec2 padding = ImVec2(10.0f, 6.0f));
+void PushStyleCheckbox(Colors color = Colors::LightBlue, ImVec2 padding = ImVec2(10.0f, 6.0f));
+void PopStyleCheckbox();
+void RenderText(ImVec2 pos, const char* text, const char* text_end, bool hide_text_after_hash);
+bool Checkbox(const char* label, bool* v, const CheckboxOptions& options = {});
+bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions& options = {});
+
+void PushStyleCombobox(const ImVec4& color);
+void PushStyleCombobox(Colors color = Colors::LightBlue);
+void PopStyleCombobox();
+
+void PushStyleTabs(const ImVec4& color);
+void PushStyleTabs(Colors color = Colors::LightBlue);
+void PopStyleTabs();
+
+void PushStyleInput(const ImVec4& color);
+void PushStyleInput(Colors color = Colors::LightBlue);
+void PopStyleInput();
+
+void PushStyleHeader(const ImVec4& color);
+void PushStyleHeader(Colors color = Colors::LightBlue);
+void PopStyleHeader();
+
+void Spacer(float height = 0.0f);
+void Separator(bool padTop = true, bool padBottom = true, float extraVerticalTopPadding = 0.0f,
+               float extraVerticalBottomPadding = 0.0f);
+
+float CalcComboWidth(const char* preview_value, ImGuiComboFlags flags);
+
+template <typename T>
+bool Combobox(const char* label, T* value, const std::unordered_map<T, const char*>& comboMap,
+              const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    float startX = ImGui::GetCursorPosX();
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCombobox(options.color);
+
+    const char* longest;
+    size_t length = 0;
+    for (auto& [index, string] : comboMap) {
+        size_t len = strlen(string);
+        if (len > length) {
+            longest = string;
+            length = len;
+        }
+    }
+    float comboWidth = CalcComboWidth(longest, options.flags);
+
+    ImGui::AlignTextToFramePadding();
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Right) {
+            ImGui::Text("%s", label);
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::NewLine();
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            } else if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+            } else if (options.labelPosition == LabelPositions::Far) {
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            }
+        } else if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    ImGui::SetNextItemWidth(comboWidth);
+    if (ImGui::BeginCombo(invisibleLabel, comboMap.at(*value), options.flags)) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
+        for (const auto& pair : comboMap) {
+            if (strlen(pair.second) > 1) {
+                if (ImGui::Selectable(pair.second, pair.first == *value)) {
+                    *value = pair.first;
+                    dirty = true;
+                }
+            }
+        }
+        ImGui::PopStyleVar();
+        ImGui::EndCombo();
+    }
+
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+                ImGui::Text("%s", label);
+            } else if (options.labelPosition == LabelPositions::Far) {
+                float width = ImGui::CalcTextSize(comboMap.at(*value)).x + ImGui::GetStyle().FramePadding.x * 2;
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+    PopStyleCombobox();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
 }
 
+template <typename T = size_t>
+bool Combobox(const char* label, T* value, const std::vector<const char*>& comboVector,
+              const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    size_t currentValueIndex = static_cast<size_t>(*value);
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCombobox(options.color);
+
+    const char* longest;
+    size_t length = 0;
+    for (auto& string : comboVector) {
+        size_t len = strlen(string);
+        if (len > length) {
+            longest = string;
+            length = len;
+        }
+    }
+    float comboWidth = CalcComboWidth(longest, options.flags);
+
+    ImGui::AlignTextToFramePadding();
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Right) {
+            ImGui::Text("%s", label);
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::NewLine();
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            } else if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+            } else if (options.labelPosition == LabelPositions::Far) {
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            }
+        } else if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    ImGui::SetNextItemWidth(comboWidth);
+    if (ImGui::BeginCombo(invisibleLabel, comboVector.at(currentValueIndex), options.flags)) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
+        for (size_t i = 0; i < comboVector.size(); ++i) {
+            auto newValue = static_cast<T>(i);
+            if (strlen(comboVector.at(i)) > 1) {
+                if (ImGui::Selectable(comboVector.at(i), newValue == *value)) {
+                    *value = newValue;
+                    dirty = true;
+                }
+            }
+        }
+        ImGui::PopStyleVar();
+        ImGui::EndCombo();
+    }
+
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+                ImGui::Text("%s", label);
+            } else if (options.labelPosition == LabelPositions::Far) {
+                float width = ImGui::CalcTextSize(comboVector.at(*value)).x + ImGui::GetStyle().FramePadding.x * 2;
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    PopStyleCombobox();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+template <typename T = size_t>
+bool Combobox(const char* label, T* value, const std::vector<std::string>& comboVector,
+              const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    size_t currentValueIndex = static_cast<size_t>(*value);
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCombobox(options.color);
+
+    const char* longest;
+    size_t length = 0;
+    for (auto& string : comboVector) {
+        size_t len = string.length();
+        if (len > length) {
+            longest = string.c_str();
+            length = len;
+        }
+    }
+    float comboWidth = CalcComboWidth(longest, options.flags);
+
+    ImGui::AlignTextToFramePadding();
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Right) {
+            ImGui::Text("%s", label);
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::NewLine();
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            } else if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+            } else if (options.labelPosition == LabelPositions::Far) {
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            }
+        } else if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    ImGui::SetNextItemWidth(comboWidth);
+    if (ImGui::BeginCombo(invisibleLabel, comboVector.at(currentValueIndex).c_str(), options.flags)) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
+        for (size_t i = 0; i < comboVector.size(); ++i) {
+            auto newValue = static_cast<T>(i);
+            if (comboVector.at(i).length() > 1) {
+                if (ImGui::Selectable(comboVector.at(i).c_str(), newValue == *value)) {
+                    *value = newValue;
+                    dirty = true;
+                }
+            }
+        }
+        ImGui::PopStyleVar();
+        ImGui::EndCombo();
+    }
+
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+                ImGui::Text("%s", label);
+            } else if (options.labelPosition == LabelPositions::Far) {
+                float width =
+                    ImGui::CalcTextSize(comboVector.at(*value).c_str()).x + ImGui::GetStyle().FramePadding.x * 2;
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    PopStyleCombobox();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+template <typename T = size_t, size_t N>
+bool Combobox(const char* label, T* value, const char* (&comboArray)[N], const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    size_t currentValueIndex = static_cast<size_t>(*value);
+    if (currentValueIndex >= N) {
+        currentValueIndex = 0;
+    }
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCombobox(options.color);
+
+    const char* longest;
+    size_t length = 0;
+    for (size_t i = 0; i < N; i++) {
+        size_t len = strlen(comboArray[i]);
+        if (len > length) {
+            longest = comboArray[i];
+            length = len;
+        }
+    }
+    float comboWidth = CalcComboWidth(longest, options.flags);
+
+    ImGui::AlignTextToFramePadding();
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Right) {
+            ImGui::Text("%s", label);
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::NewLine();
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            } else if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+            } else if (options.labelPosition == LabelPositions::Far) {
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - comboWidth);
+            }
+        } else if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Above) {
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+
+    ImGui::SetNextItemWidth(comboWidth);
+    if (ImGui::BeginCombo(invisibleLabel, comboArray[currentValueIndex], options.flags)) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
+        for (size_t i = 0; i < N; ++i) {
+            auto newValue = static_cast<T>(i);
+            if (strlen(comboArray[i]) > 1) {
+                if (ImGui::Selectable(comboArray[i], newValue == *value)) {
+                    *value = newValue;
+                    dirty = true;
+                }
+            }
+        }
+        ImGui::PopStyleVar();
+        ImGui::EndCombo();
+    }
+
+    if (options.labelPosition != LabelPositions::None) {
+        if (options.alignment == ComponentAlignments::Left) {
+            if (options.labelPosition == LabelPositions::Near) {
+                ImGui::SameLine();
+                ImGui::Text("%s", label);
+            } else if (options.labelPosition == LabelPositions::Far) {
+                float width = ImGui::CalcTextSize(comboArray[*value]).x + ImGui::GetStyle().FramePadding.x * 2;
+                ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+                ImGui::Text("%s", label);
+            }
+        }
+    }
+    PopStyleCombobox();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        !Ship_IsCStringEmpty(options.disabledTooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip).c_str());
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && !Ship_IsCStringEmpty(options.tooltip)) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip).c_str());
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+template <typename T = int32_t>
+bool CVarCombobox(const char* label, const char* cvarName, const std::unordered_map<T, const char*>& comboMap,
+                  const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
+    if (Combobox<T>(label, &value, comboMap, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+template <typename T = int32_t>
+bool CVarCombobox(const char* label, const char* cvarName, const std::vector<const char*>& comboVector,
+                  const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
+    if (Combobox<T>(label, &value, comboVector, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+template <typename T = int32_t, size_t N>
+bool CVarCombobox(const char* label, const char* cvarName, const char* (&comboArray)[N],
+                  const ComboboxOptions& options = {}) {
+    bool dirty = false;
+    int32_t value = CVarGetInteger(cvarName, options.defaultIndex);
+    if (Combobox<T>(label, &value, comboArray, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
+        ShipInit::Init(cvarName);
+        dirty = true;
+    }
+    return dirty;
+}
+
+void PushStyleSlider(Colors color = Colors::LightBlue);
+void PopStyleSlider();
+bool SliderInt(const char* label, int32_t* value, const IntSliderOptions& options = {});
+bool CVarSliderInt(const char* label, const char* cvarName, const IntSliderOptions& options = {});
+bool SliderFloat(const char* label, float* value, const FloatSliderOptions& options = {});
+bool CVarSliderFloat(const char* label, const char* cvarName, const FloatSliderOptions& options = {});
+bool InputString(const char* label, std::string* value, const InputOptions& options = {});
+bool CVarInputString(const char* label, const char* cvarName, const InputOptions& options = {});
+bool InputInt(const char* label, int32_t* value, const InputOptions& options = {});
+bool CVarInputInt(const char* label, const char* cvarName, const InputOptions& options = {});
+bool CVarColorPicker(const char* label, const char* cvarName, Color_RGBA8 defaultColor, bool hasAlpha = false,
+                     uint8_t modifiers = 0, UIWidgets::Colors themeColor = UIWidgets::Colors::LightBlue);
+bool RadioButton(const char* label, bool active);
+bool CVarRadioButton(const char* text, const char* cvarName, int32_t id, const RadioButtonsOptions& options);
+bool StateButton(const char* str_id, const char* label, ImVec2 size, UIWidgets::ButtonOptions options,
+                 ImGuiButtonFlags flags = ImGuiButtonFlags_None);
+void DrawFlagArray32(const std::string& name, uint32_t& flags, Colors color = Colors::LightBlue);
+void DrawFlagArray16(const std::string& name, uint16_t& flags, Colors color = Colors::LightBlue);
+void DrawFlagArray8(const std::string& name, uint8_t& flags, Colors color = Colors::LightBlue);
+void DrawFlagArray8Mask(const std::string& name, uint8_t& flags, Colors color = Colors::LightBlue);
+
+void InsertHelpHoverText(const std::string& text);
+void InsertHelpHoverText(const char* text);
+} // namespace UIWidgets
+ImVec4 GetRandomValue();
+
+Color_RGBA8 RGBA8FromVec(ImVec4 vec);
+ImVec4 VecFromRGBA8(Color_RGBA8 color);
+
 #endif /* UIWidgets_hpp */
diff --git a/soh/soh/config/ConfigMigrators.h b/soh/soh/config/ConfigMigrators.h
index 29cbb07747..ee7e91792b 100644
--- a/soh/soh/config/ConfigMigrators.h
+++ b/soh/soh/config/ConfigMigrators.h
@@ -3,1438 +3,1521 @@
 #include <vector>
 
 namespace SOH {
-    enum class MigrationAction {
-        Rename,
-        Remove,
-    };
+enum class MigrationAction {
+    Rename,
+    Remove,
+};
 
-    struct Migration {
-        MigrationAction action;
-        std::string from;
-        std::optional<std::string> to = std::nullopt;
-    };
+struct Migration {
+    MigrationAction action;
+    std::string from;
+    std::optional<std::string> to = std::nullopt;
+};
 
-    std::vector<Migration> version3Migrations = {
-        { MigrationAction::Rename, "gSwitchAge", "gGeneral.SwitchAge" },
-        { MigrationAction::Rename, "gFrameAdvance", "gGeneral.FrameAdvance" },
-        { MigrationAction::Rename, "gRandoGenerating", "gGeneral.RandoGenerating" },
-        { MigrationAction::Rename, "gNewSeedGenerated", "gGeneral.NewSeedGenerated" },
-        { MigrationAction::Rename, "gOnFileSelectNameEntry", "gGeneral.OnFileSelectNameEntry" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreenMQMode", "gGeneral.BetterDebugWarpScreenMQMode" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreenMQModeScene", "gGeneral.BetterDebugWarpScreenMQModeScene" },
-        { MigrationAction::Rename, "gCheatEasyPauseBufferLastInputs", "gGeneral.CheatEasyPauseBufferLastInputs" },
-        { MigrationAction::Rename, "gCheatEasyPauseBufferTimer", "gGeneral.CheatEasyPauseBufferTimer" },
-        { MigrationAction::Rename, "gRandomizerNewFileDropped", "gGeneral.RandomizerNewFileDropped" },
-        { MigrationAction::Rename, "gRandomizerDroppedFile", "gGeneral.RandomizerDroppedFile" },
-        { MigrationAction::Rename, "gLetItSnow", "gGeneral.LetItSnow" },
-        { MigrationAction::Rename, "gPrevTime", "gGeneral.PrevTime" },
-        { MigrationAction::Rename, "gSwitchTimeline", "gGeneral.SwitchTimeline" },
-        { MigrationAction::Rename, "gSpoilerLog", "gGeneral.SpoilerLog" },
-        { MigrationAction::Rename, "gRestoreQPA", "gGeneral.RestoreQPA" },
-        { MigrationAction::Rename, "gFixIceTrapWithBunnyHood", "gGeneral.FixIceTrapWithBunnyHood" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreenCurrentScene", "gGeneral.BetterDebugWarpScreenCurrentScene" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreenTopDisplayedScene", "gGeneral.BetterDebugWarpScreenTopDisplayedScene" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreenPageDownIndex", "gGeneral.BetterDebugWarpScreenPageDownIndex" },
-        { MigrationAction::Rename, "gActorViewerEnabled", "gOpenWindows.ActorViewer" },
-        { MigrationAction::Rename, "gAdvancedResolutionEditorEnabled", "gOpenWindows.AdvancedResolutionEditor" },
-        { MigrationAction::Rename, "gAudioEditor.WindowOpen", "gOpenWindows.AudioEditor" },
-        { MigrationAction::Rename, "gCheckTrackerEnabled", "gOpenWindows.CheckTracker" },
-        { MigrationAction::Rename, "gCheckTrackerSettingsEnabled", "gOpenWindows.CheckTrackerSettings" },
-        { MigrationAction::Rename, "gCollisionViewerEnabled", "gOpenWindows.CollisionViewer" },
-        { MigrationAction::Rename, "gCosmeticsEditorEnabled", "gOpenWindows.CosmeticsEditor" },
-        { MigrationAction::Rename, "gDLViewerEnabled", "gOpenWindows.DLViewer" },
-        { MigrationAction::Rename, "gEntranceTrackerEnabled", "gOpenWindows.EntranceTracker" },
-        { MigrationAction::Rename, "gGameplayStatsEnabled", "gOpenWindows.GameplayStats" },
-        { MigrationAction::Rename, "gItemTrackerEnabled", "gOpenWindows.ItemTracker" },
-        { MigrationAction::Rename, "gItemTrackerSettingsEnabled", "gOpenWindows.ItemTrackerSettings" },
-        { MigrationAction::Rename, "gMessageViewerEnabled", "gOpenWindows.MessageViewer" },
-        { MigrationAction::Rename, "gOpenWindows.InputViewer", "gOpenWindows.InputViewer" },
-        { MigrationAction::Rename, "gOpenWindows.InputViewerSettings", "gOpenWindows.InputViewerSettings" },
-        { MigrationAction::Rename, "gRandomizerSettingsEnabled", "gOpenWindows.RandomizerSettings" },
-        { MigrationAction::Rename, "gSaveEditorEnabled", "gOpenWindows.SaveEditor" },
-        { MigrationAction::Rename, "gValueViewer.WindowOpen", "gOpenWindows.ValueViewer" },
-        { MigrationAction::Rename, "gConsoleEnabled", "gOpenWindows.Console" },
-        { MigrationAction::Rename, "gControllerConfigurationEnabled", "gOpenWindows.ControllerConfiguration" },
-        { MigrationAction::Rename, "gControllerDisconnectedWindowEnabled", "gOpenWindows.ControllerDisconnectedWindow" },
-        { MigrationAction::Rename, "gControllerReorderingWindowEnabled", "gOpenWindows.ControllerReorderingWindow" },
-        { MigrationAction::Rename, "gGfxDebuggerEnabled", "gOpenWindows.GfxDebugger" },
-        { MigrationAction::Rename, "gStatsEnabled", "gOpenWindows.Stats" },
-        { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
-        { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
-        { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
-        { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },
-        { MigrationAction::Rename, "gA11yTTS", "gSettings.A11yTTS" },
-        { MigrationAction::Rename, "gLanguages", "gSettings.Languages" },
-        { MigrationAction::Rename, "gMatchRefreshRate", "gSettings.MatchRefreshRate" },
-        { MigrationAction::Rename, "gSimulatedInputLag", "gSettings.SimulatedInputLag" },
-        { MigrationAction::Rename, "gInterpolationFPS", "gSettings.InterpolationFPS" },
-        { MigrationAction::Rename, "gLowResMode", "gSettings.LowResMode" },
-        { MigrationAction::Rename, "gZFightingMode", "gSettings.ZFightingMode" },
-        { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
-        { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
-        { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
-        { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },
-        { MigrationAction::Rename, "gA11yTTS", "gSettings.A11yTTS" },
-        { MigrationAction::Rename, "gLanguages", "gSettings.Languages" },
-        { MigrationAction::Rename, "gMatchRefreshRate", "gSettings.MatchRefreshRate" },
-        { MigrationAction::Rename, "gInterpolationFPS", "gSettings.InterpolationFPS" },
-        { MigrationAction::Rename, "gLedColorSource", "gSettings.LEDColorSource" },
-        { MigrationAction::Rename, "gLedPort1Color", "gSettings.LEDPort1Color" },
-        { MigrationAction::Rename, "gLedBrightness", "gSettings.LEDBrightness" },
-        { MigrationAction::Rename, "gLedCriticalOverride", "gSettings.LEDCriticalOverride" },
-        { MigrationAction::Rename, "gOcarinaD5BtnMap", "gSettings.CustomOcarina.D5Button" },
-        { MigrationAction::Rename, "gOcarinaB4BtnMap", "gSettings.CustomOcarina.B4Button" },
-        { MigrationAction::Rename, "gOcarinaA4BtnMap", "gSettings.CustomOcarina.A4Button" },
-        { MigrationAction::Rename, "gOcarinaF4BtnMap", "gSettings.CustomOcarina.F4Button" },
-        { MigrationAction::Rename, "gOcarinaD4BtnMap", "gSettings.CustomOcarina.D4Button" },
-        { MigrationAction::Rename, "gOcarinaDisableBtnMap", "gSettings.CustomOcarina.DisableButton" },
-        { MigrationAction::Rename, "gOcarinaSharpBtnMap", "gSettings.CustomOcarina.SharpButton" },
-        { MigrationAction::Rename, "gOcarinaFlatBtnMap", "gSettings.CustomOcarina.FlatButton" },
-        { MigrationAction::Rename, "gCustomOcarinaControls", "gSettings.CustomOcarina.Enabled" },
-        { MigrationAction::Rename, "gDpadOcarina", "gSettings.OcarinaControl.Dpad" },
-        { MigrationAction::Rename, "gRStickOcarina", "gSettings.OcarinaControl.Rstick" },
-        { MigrationAction::Rename, "gRightStickAiming", "gSettings.Controls.RightStickAim" },
-        { MigrationAction::Rename, "gInvertAimingXAxis", "gSettings.Controls.InvertAimingXAxis" },
-        { MigrationAction::Rename, "gInvertAimingYAxis", "gSettings.Controls.InvertAimingYAxis" },
-        { MigrationAction::Rename, "gInvertShieldAimingYAxis", "gSettings.Controls.InvertShieldAimingYAxis" },
-        { MigrationAction::Rename, "gInvertShieldAimingXAxis", "gSettings.Controls.InvertShieldAimingYAxis" },
-        { MigrationAction::Rename, "gInvertZAimingYAxis", "gSettings.Controls.InvertZAimingYAxis" },
-        { MigrationAction::Rename, "gDisableAutoCenterViewFirstPerson", "gSettings.DisableFirstPersonAutoCenterView" },
-        { MigrationAction::Rename, "gEnableFirstPersonSensitivity", "gSettings.FirstPersonCameraSensitivity.Enabled" },
-        { MigrationAction::Rename, "gFirstPersonCameraSensitivityX", "gSettings.FirstPersonCameraSensitivity.X" },
-        { MigrationAction::Rename, "gFirstPersonCameraSensitivityY", "gSettings.FirstPersonCameraSensitivity.Y" },
-        { MigrationAction::Rename, "gFreeCamera", "gSettings.FreeLook.Enabled" },
-        { MigrationAction::Rename, "gInvertXAxis", "gSettings.FreeLook.InvertXAxis" },
-        { MigrationAction::Rename, "gInvertYAxis", "gSettings.FreeLook.InvertYAxis" },
-        { MigrationAction::Rename, "gThirdPersonCameraSensitivityX", "gSettings.FreeLook.CameraSensitivity.X" },
-        { MigrationAction::Rename, "gThirdPersonCameraSensitivityY", "gSettings.FreeLook.CameraSensitivity.Y" },
-        { MigrationAction::Rename, "gFreeCameraDistMax", "gSettings.FreeLook.MaxCameraDistance" },
-        { MigrationAction::Rename, "gFreeCameraTransitionSpeed", "gSettings.FreeLook.TransitionSpeed" },
-        { MigrationAction::Rename, "gDpadPause", "gSettings.DpadOnPause" },
-        { MigrationAction::Rename, "gDpadText", "gSettings.DpadInText" },
-        { MigrationAction::Rename, "gPauseAnyCursor", "gEnhancements.PauseAnyCursor" },
-        { MigrationAction::Rename, "gEnableWalkModify", "gSettings.WalkModifier.Enabled" },
-        { MigrationAction::Rename, "gWalkSpeedToggle", "gSettings.WalkModifier.SpeedToggle" },
-        { MigrationAction::Rename, "gWalkModifierDoesntChangeJump", "gSettings.WalkModifier.DoesntChangeJump" },
-        { MigrationAction::Rename, "gWalkModifierOne", "gSettings.WalkModifier.Mapping1" },
-        { MigrationAction::Rename, "gWalkModifierTwo", "gSettings.WalkModifier.Mapping2" },
-        { MigrationAction::Rename, "gSwimModifierOne", "gSettings.WalkModifier.SwimMapping1" },
-        { MigrationAction::Rename, "gSwimModifierTwo", "gSettings.WalkModifier.SwimMapping2" },
-        { MigrationAction::Rename, "gNaviOnL", "gEnhancements.NaviOnL" },
-        { MigrationAction::Rename, "gDpadEquips", "gEnhancements.DpadEquips" },
-        { MigrationAction::Rename, "gMoveWhileFirstPerson", "gSettings.MoveInFirstPerson" },
-        { MigrationAction::Rename, "gA11yDisableIdleCam", "gSettings.A11yDisableIdleCam" },
-        { MigrationAction::Rename, "gDpadHoldChange", "gSettings.DpadHoldChange" },
-        { MigrationAction::Rename, "gAddTraps.Ammo", "gEnhancements.ExtraTraps.Ammo" },
-        { MigrationAction::Rename, "gAddTraps.Bomb", "gEnhancements.ExtraTraps.Bomb" },
-        { MigrationAction::Rename, "gAddTraps.Burn", "gEnhancements.ExtraTraps.Burn" },
-        { MigrationAction::Rename, "gAddTraps.Ice", "gEnhancements.ExtraTraps.Ice" },
-        { MigrationAction::Rename, "gAddTraps.Kill", "gEnhancements.ExtraTraps.Kill" },
-        { MigrationAction::Rename, "gAddTraps.Knock", "gEnhancements.ExtraTraps.Knockback" },
-        { MigrationAction::Rename, "gAddTraps.Shock", "gEnhancements.ExtraTraps.Shock" },
-        { MigrationAction::Rename, "gAddTraps.Speed", "gEnhancements.ExtraTraps.Speed" },
-        { MigrationAction::Rename, "gAddTraps.Tele", "gEnhancements.ExtraTraps.Teleport" },
-        { MigrationAction::Rename, "gAddTraps.Void", "gEnhancements.ExtraTraps.Void" },
-        { MigrationAction::Rename, "gAddTraps.enabled", "gEnhancements.ExtraTraps.Enabled" },
-        { MigrationAction::Rename, "gAdultBunnyHood", "gEnhancements.AdultBunnyHood" },
-        { MigrationAction::Rename, "gAdultMinimumWeightFish", "gEnhancements.MinimumFishWeightAdult" },
-        { MigrationAction::Rename, "gAdultShootingGalleryAmmunition", "gEnhancements.ShootingGalleryAmmoAdult" },
-        { MigrationAction::Rename, "gAllDogsRichard", "gEnhancements.AllDogsRichard" },
-        { MigrationAction::Rename, "gAlwaysShowDungeonMinimapIcon", "gEnhancements.AlwaysShowDungeonMinimapIcon" },
-        { MigrationAction::Rename, "gAnubisFix", "gEnhancements.AnubisFix" },
-        { MigrationAction::Rename, "gAskToEquip", "gEnhancements.AskToEquip" },
-        { MigrationAction::Rename, "gAssignableTunicsAndBoots", "gEnhancements.AssignableTunicsAndBoots" },
-        { MigrationAction::Rename, "gAuthenticLogo", "gEnhancements.AuthenticLogo" },
-        { MigrationAction::Rename, "gBetterFW", "gEnhancements.BetterFarore" },
-        { MigrationAction::Rename, "gBetterOwl", "gEnhancements.BetterOwl" },
-        { MigrationAction::Rename, "gBlueFireArrows", "gEnhancements.BlueFireArrows" },
-        { MigrationAction::Rename, "gBombchuBowlingAmmunition", "gEnhancements.BombchuBowlingAmmo" },
-        { MigrationAction::Rename, "gBombchuBowlingNoBigCucco", "gEnhancements.BombchuBowlingNoBigCucco" },
-        { MigrationAction::Rename, "gBombchuBowlingNoSmallCucco", "gEnhancements.BombchuBowlingNoSmallCucco" },
-        { MigrationAction::Rename, "gBombchuDrops", "gEnhancements.BombchuDrops" },
-        { MigrationAction::Rename, "gBombchusOOB", "gEnhancements.BombchusOOB" },
-        { MigrationAction::Rename, "gBonkDamageMul", "gEnhancements.BonkDamageMult" },
-        { MigrationAction::Rename, "gBowReticle", "gEnhancements.BowReticle" },
-        { MigrationAction::Rename, "gBowSlingShotAmmoFix", "gEnhancements.BowSlingshotAmmoFix" },
-        { MigrationAction::Rename, "gBushDropFix", "gEnhancements.BushDropFix" },
-        { MigrationAction::Rename, "gChestSizeAndTextureMatchesContents", "gEnhancements.ChestSizeAndTextureMatchContents" },
-        { MigrationAction::Rename, "gChestSizeDependsStoneOfAgony", "gEnhancements.ChestSizeDependsStoneOfAgony" },
-        { MigrationAction::Rename, "gChildMinimumWeightFish", "gEnhancements.MinimumFishWeightChild" },
-        { MigrationAction::Rename, "gChildShootingGalleryAmmunition", "gEnhancements.ShootingGalleryAmmoChild" },
-        { MigrationAction::Rename, "gClimbSpeed", "gEnhancements.ClimbSpeed" },
-        { MigrationAction::Rename, "gConstantAdultGallery", "gEnhancements.ConstantAdultGallery" },
-        { MigrationAction::Rename, "gCowOfTime", "gEnhancements.CowOfTime" },
-        { MigrationAction::Rename, "gCrawlSpeed", "gEnhancements.CrawlSpeed" },
-        { MigrationAction::Rename, "gCreditsFix", "gEnhancements.CreditsFix" },
-        { MigrationAction::Rename, "gCrouchStabFix", "gEnhancements.CrouchStabFix" },
-        { MigrationAction::Rename, "gCrouchStabHammerFix", "gEnhancements.CrouchStabHammerFix" },
-        { MigrationAction::Rename, "gCuccoStayDurationMultiplier", "gEnhancements.CuccoStayDurationMult" },
-        { MigrationAction::Rename, "gCustomizeBombchuBowling", "gEnhancements.CustomizeBombchuBowling" },
-        { MigrationAction::Rename, "gCustomizeFishing", "gEnhancements.CustomizeFishing" },
-        { MigrationAction::Rename, "gCustomizeOcarinaGame", "gEnhancements.CustomizeOcarinaGame" },
-        { MigrationAction::Rename, "gCustomizeShootingGallery", "gEnhancements.CustomizeShootingGallery" },
-        { MigrationAction::Rename, "gDamageMul", "gEnhancements.DamageMult" },
-        { MigrationAction::Rename, "gDampeAllNight", "gEnhancements.DampeAllNight" },
-        { MigrationAction::Rename, "gDampeWin", "gEnhancements.DampeWin" },
-        { MigrationAction::Rename, "gDashInterval", "gEnhancements.RupeeDashInterval" },
-        { MigrationAction::Rename, "gDayGravePull", "gEnhancements.DayGravePull" },
-        { MigrationAction::Rename, "gDekuNutUpgradeFix", "gEnhancements.DekuNutUpgradeFix" },
-        { MigrationAction::Rename, "gDeleteFileOnDeath", "gEnhancements.DeleteFileOnDeath" },
-        { MigrationAction::Rename, "gDisableBlackBars", "gEnhancements.DisableBlackBars" },
-        { MigrationAction::Rename, "gDisableBombBillboarding", "gEnhancements.DisableBombBillboarding" },
-        { MigrationAction::Rename, "gDisableCritWiggle", "gEnhancements.DisableCritWiggle" },
-        { MigrationAction::Rename, "gDisableDrawDistance", "gEnhancements.DisableDrawDistance" },
-        { MigrationAction::Rename, "gDisableFirstPersonChus", "gEnhancements.DisableFirstPersonChus" },
-        { MigrationAction::Rename, "gDisableGrottoRotation", "gEnhancements.DisableGrottoRotation" },
-        { MigrationAction::Rename, "gDisableKokiriDrawDistance", "gEnhancements.DisableKokiriDrawDistance" },
-        { MigrationAction::Rename, "gDisableLOD", "gEnhancements.DisableLOD" },
-        { MigrationAction::Rename, "gDisableNaviCallAudio", "gEnhancements.DisableNaviCallAudio" },
-        { MigrationAction::Rename, "gDisableTunicWarningText", "gEnhancements.DisableTunicWarningText" },
-        { MigrationAction::Rename, "gDogFollowsEverywhere", "gEnhancements.DogFollowsEverywhere" },
-        { MigrationAction::Rename, "gDpadNoDropOcarinaInput", "gEnhancements.DpadNoDropOcarinaInput" },
-        { MigrationAction::Rename, "gDrawLineupTick", "gEnhancements.DrawLineupTick" },
-        { MigrationAction::Rename, "gDynamicWalletIcon", "gEnhancements.DynamicWalletIcon" },
-        { MigrationAction::Rename, "gEnemyHealthBar", "gEnhancements.EnemyHealthBar" },
-        { MigrationAction::Rename, "gEnemySizeScalesHealth", "gEnhancements.EnemySizeScalesHealth" },
-        { MigrationAction::Rename, "gEnemySpawnsOverWaterboxes", "gEnhancements.EnemySpawnsOverWaterboxes" },
-        { MigrationAction::Rename, "gEquipmentCanBeRemoved", "gEnhancements.EquipmentCanBeRemoved" },
-        { MigrationAction::Rename, "gFPSGauntlets", "gEnhancements.FirstPersonGauntlets" },
-        { MigrationAction::Rename, "gFallDamageMul", "gEnhancements.FallDamageMult" },
-        { MigrationAction::Rename, "gFastBoomerang", "gEnhancements.FastBoomerang" },
-        { MigrationAction::Rename, "gFastChests", "gEnhancements.FastChests" },
-        { MigrationAction::Rename, "gFastDrops", "gEnhancements.FastDrops" },
-        { MigrationAction::Rename, "gFastFarores", "gEnhancements.FastFarores" },
-        { MigrationAction::Rename, "gFastOcarinaPlayback", "gEnhancements.FastOcarinaPlayback" },
-        { MigrationAction::Rename, "gFasterBlockPush", "gEnhancements.FasterBlockPush" },
-        { MigrationAction::Rename, "gFasterHeavyBlockLift", "gEnhancements.FasterHeavyBlockLift" },
-        { MigrationAction::Rename, "gFileSelectMoreInfo", "gEnhancements.FileSelectMoreInfo" },
-        { MigrationAction::Rename, "gFishNeverEscape", "gEnhancements.FishNeverEscape" },
-        { MigrationAction::Rename, "gFixCameraDrift", "gEnhancements.FixCameraDrift" },
-        { MigrationAction::Rename, "gFixCameraSwing", "gEnhancements.FixCameraSwing" },
-        { MigrationAction::Rename, "gFixDungeonMinimapIcon", "gEnhancements.FixDungeonMinimapIcon" },
-        { MigrationAction::Rename, "gFixEyesOpenWhileSleeping", "gEnhancements.FixEyesOpenWhileSleeping" },
-        { MigrationAction::Rename, "gFixHangingLedgeSwingRate", "gEnhancements.FixHangingLedgeSwingRate" },
-        { MigrationAction::Rename, "gFixSawSoftlock", "gEnhancements.FixSawSoftlock" },
-        { MigrationAction::Rename, "gFixTexturesOOB", "gEnhancements.FixTexturesOOB" },
-        { MigrationAction::Rename, "gFixVineFall", "gEnhancements.FixVineFall" },
-        { MigrationAction::Rename, "gFixZoraHintDialogue", "gEnhancements.FixZoraHintDialogue" },
-        { MigrationAction::Rename, "gForgeTime", "gEnhancements.ForgeTime" },
-        { MigrationAction::Rename, "gFullHealthSpawn", "gEnhancements.FullHealthSpawn" },
-        { MigrationAction::Rename, "gGerudoWarriorClothingFix", "gEnhancements.GerudoWarriorClothingFix" },
-        { MigrationAction::Rename, "gGoronPot", "gEnhancements.GoronPot" },
-        { MigrationAction::Rename, "gGravediggingTourFix", "gEnhancements.GravediggingTourFix" },
-        { MigrationAction::Rename, "gGsCutscene", "gEnhancements.GSCutscene" },
-        { MigrationAction::Rename, "gGuaranteeFishingBite", "gEnhancements.GuaranteeFishingBite" },
-        { MigrationAction::Rename, "gGuardVision", "gEnhancements.GuardVision" },
-        { MigrationAction::Rename, "gHideBunnyHood", "gEnhancements.HideBunnyHood" },
-        { MigrationAction::Rename, "gHookshotableReticle", "gEnhancements.HookshotableReticle" },
-        { MigrationAction::Rename, "gHoverFishing", "gEnhancements.HoverFishing" },
-        { MigrationAction::Rename, "gHurtContainer", "gEnhancements.HurtContainer" },
-        { MigrationAction::Rename, "gHyperBosses", "gEnhancements.HyperBosses" },
-        { MigrationAction::Rename, "gHyperEnemies", "gEnhancements.HyperEnemies" },
-        { MigrationAction::Rename, "gInstantFishing", "gEnhancements.InstantFishing" },
-        { MigrationAction::Rename, "gInstantOcarinaGameWin", "gEnhancements.InstantOcarinaGameWin" },
-        { MigrationAction::Rename, "gInstantPutaway", "gEnhancements.InstantPutaway" },
-        { MigrationAction::Rename, "gInstantShootingGalleryWin", "gEnhancements.InstantShootingGalleryWin" },
-        { MigrationAction::Rename, "gIvanCoopModeEnabled", "gEnhancements.IvanCoopModeEnabled" },
-        { MigrationAction::Rename, "gLinkDefaultName", "gEnhancements.LinkDefaultName" },
-        { MigrationAction::Rename, "gLowHpAlarm", "gEnhancements.LowHpAlarm" },
-        { MigrationAction::Rename, "gMMBunnyHood", "gEnhancements.MMBunnyHood" },
-        { MigrationAction::Rename, "gMarketSneak", "gEnhancements.MarketSneak" },
-        { MigrationAction::Rename, "gMaskSelect", "gEnhancements.MaskSelect" },
-        { MigrationAction::Rename, "gMinFrameCount", "gEnhancements.MinFrameCount" },
-        { MigrationAction::Rename, "gMinimalUI", "gEnhancements.MinimalUI" },
-        { MigrationAction::Rename, "gMirroredWorldMode", "gEnhancements.MirroredWorldMode" },
-        { MigrationAction::Rename, "gMweepSpeed", "gEnhancements.MweepSpeed" },
-        { MigrationAction::Rename, "gN64WeirdFrames", "gEnhancements.N64WeirdFrames" },
-        { MigrationAction::Rename, "gNGCKaleidoSwitcher", "gEnhancements.NGCKaleidoSwitcher" },
-        { MigrationAction::Rename, "gNaviTextFix", "gEnhancements.NaviTextFix" },
-        { MigrationAction::Rename, "gNewDrops", "gEnhancements.NewDrops" },
-        { MigrationAction::Rename, "gNightGSAlwaysSpawn", "gEnhancements.NightGSAlwaysSpawn" },
-        { MigrationAction::Rename, "gNoForcedNavi", "gEnhancements.NoForcedNavi" },
-        { MigrationAction::Rename, "gNoHUDHeartAnimation", "gEnhancements.NoHUDHeartAnimation" },
-        { MigrationAction::Rename, "gNoHeartDrops", "gEnhancements.NoHeartDrops" },
-        { MigrationAction::Rename, "gNoInputForCredits", "gEnhancements.NoInputForCredits" },
-        { MigrationAction::Rename, "gNoRandomDrops", "gEnhancements.NoRandomDrops" },
-        { MigrationAction::Rename, "gNutsExplodeBombs", "gEnhancements.NutsExplodeBombs" },
-        { MigrationAction::Rename, "gOcarinaGameNoteSpeed", "gEnhancements.OcarinaGameNoteSpeed" },
-        { MigrationAction::Rename, "gOcarinaGameRoundOneNotes", "gEnhancements.OcarinaGameRoundOneNotes" },
-        { MigrationAction::Rename, "gOcarinaGameRoundThreeNotes", "gEnhancements.OcarinaGameRoundThreeNotes" },
-        { MigrationAction::Rename, "gOcarinaGameRoundTwoNotes", "gEnhancements.OcarinaGameRoundTwoNotes" },
-        { MigrationAction::Rename, "gOcarinaGameStartingNotes", "gEnhancements.OcarinaGameStartingNotes" },
-        { MigrationAction::Rename, "gOcarinaUnlimitedFailTime", "gEnhancements.OcarinaUnlimitedFailTime" },
-        { MigrationAction::Rename, "gPauseWarp", "gEnhancements.PauseWarp" },
-        { MigrationAction::Rename, "gPermanentHeartLoss", "gEnhancements.PermanentHeartLoss" },
-        { MigrationAction::Rename, "gQuickBongoKill", "gEnhancements.QuickBongoKill" },
-        { MigrationAction::Rename, "gQuickPutaway", "gEnhancements.QuickPutaway" },
-        { MigrationAction::Rename, "gQuitFishingAtDoor", "gEnhancements.QuitFishingAtDoor" },
-        { MigrationAction::Rename, "gRandomizedEnemies", "gEnhancements.RandomizedEnemies" },
-        { MigrationAction::Rename, "gRandomizedEnemySizes", "gEnhancements.RandomizedEnemySizes" },
-        { MigrationAction::Rename, "gRedGanonBlood", "gEnhancements.RedGanonBlood" },
-        { MigrationAction::Rename, "gRememberSaveLocation", "gEnhancements.RememberSaveLocation" },
-        { MigrationAction::Rename, "gRemoveExplosiveLimit", "gEnhancements.RemoveExplosiveLimit" },
-        { MigrationAction::Rename, "gRestoreRBAValues", "gEnhancements.RestoreRBAValues" },
-        { MigrationAction::Rename, "gRupeeDash", "gEnhancements.RupeeDash" },
-        { MigrationAction::Rename, "gSceneSpecificDirtPathFix", "gEnhancements.SceneSpecificDirtPathFix" },
-        { MigrationAction::Rename, "gSeparateArrows", "gEnhancements.SeparateArrows" },
-        { MigrationAction::Rename, "gShadowTag", "gEnhancements.ShadowTag" },
-        { MigrationAction::Rename, "gShowDoorLocksOnBothSides", "gEnhancements.ShowDoorLocksOnBothSides" },
-        { MigrationAction::Rename, "gSilverRupeeJingleExtend", "gEnhancements.SilverRupeeJingleExtend" },
-        { MigrationAction::Rename, "gSkipArrowAnimation", "gEnhancements.SkipArrowAnimation" },
-        { MigrationAction::Rename, "gSkipSaveConfirmation", "gEnhancements.SkipSaveConfirmation" },
-        { MigrationAction::Rename, "gSkipScarecrow", "gEnhancements.InstantScarecrow" },
-        { MigrationAction::Rename, "gSkipSwimDeepEndAnim", "gEnhancements.SkipSwimDeepEndAnim" },
-        { MigrationAction::Rename, "gSkipText", "gEnhancements.SkipText" },
-        { MigrationAction::Rename, "gSkulltulaFreeze", "gEnhancements.SkulltulaFreeze" },
-        { MigrationAction::Rename, "gStaticExplosionRadius", "gEnhancements.StaticExplosionRadius" },
-        { MigrationAction::Rename, "gStrengthDisabled", "gEnhancements.StrengthDisabled" },
-        { MigrationAction::Rename, "gSunlightArrows", "gEnhancements.SunlightArrows" },
-        { MigrationAction::Rename, "gSwitchPerfMode", "gEnhancements.SwitchPerfMode" },
-        { MigrationAction::Rename, "gTextSpacing", "gEnhancements.TextSpacing" },
-        { MigrationAction::Rename, "gTextSpeed", "gEnhancements.TextSpeed" },
-        { MigrationAction::Rename, "gTimeFlowFileSelect", "gEnhancements.TimeFlowFileSelect" },
-        { MigrationAction::Rename, "gTimeTravel", "gEnhancements.TimeTravel" },
-        { MigrationAction::Rename, "gToTMedallionsColors", "gEnhancements.ToTMedallionsColors" },
-        { MigrationAction::Rename, "gToggleStrength", "gEnhancements.ToggleStrength" },
-        { MigrationAction::Rename, "gTreeStickDrops", "gEnhancements.TreesDropSticks" },
-        { MigrationAction::Rename, "gTwoHandedIdle", "gEnhancements.TwoHandedIdle" },
-        { MigrationAction::Rename, "gUniformLR", "gEnhancements.FixMenuLR" },
-        { MigrationAction::Rename, "gVisualAgony", "gEnhancements.VisualAgony" },
-        { MigrationAction::Rename, "gVoidDamageMul", "gEnhancements.VoidDamageMult" },
-        { MigrationAction::Rename, "gGameplayStats.ShowAdditionalTimers", "gEnhancements.GameplayStats.ShowAdditionalTimers" },
-        { MigrationAction::Rename, "gGameplayStats.ShowDebugInfo", "gEnhancements.GameplayStats.ShowDebugInfo" },
-        { MigrationAction::Rename, "gGameplayStats.RoomBreakdown", "gEnhancements.GameplayStats.RoomBreakdown" },
-        { MigrationAction::Rename, "gGameplayStats.ShowIngameTimer", "gEnhancements.GameplayStats.ShowInGameTimer" },
-        { MigrationAction::Rename, "gGameplayStats.TimestampsReverse", "gEnhancements.GameplayStats.ReverseTimestamps" },
-        { MigrationAction::Rename, "gGameplayStats.RTATiming", "gEnhancements.GameplayStats.RTATiming" },
-        { MigrationAction::Rename, "gMirroredWorld", "gEnhancements.MirroredWorld" },
-        { MigrationAction::Rename, "gBetaQuestWorld", "gCheats.BetaQuestWorld" },
-        { MigrationAction::Rename, "gBombTimerMultiplier", "gCheats.BombTimerMultiplier" },
-        { MigrationAction::Rename, "gCheatEasyInputBufferingEnabled", "gCheats.EasyInputBuffer" },
-        { MigrationAction::Rename, "gCheatEasyPauseBufferEnabled", "gCheats.EasyPauseBuffer" },
-        { MigrationAction::Rename, "gCheatHookshotReachMultiplier", "gCheats.HookshotReachMultiplier" },
-        { MigrationAction::Rename, "gClimbEverything", "gCheats.ClimbEverything" },
-        { MigrationAction::Rename, "gDekuStickCheat", "gCheats.DekuStick" },
-        { MigrationAction::Rename, "gDropsDontDie", "gCheats.DropsDontDie" },
-        { MigrationAction::Rename, "gEnableBetaQuest", "gCheats.EnableBetaQuest" },
-        { MigrationAction::Rename, "gEzISG", "gCheats.EasyISG" },
-        { MigrationAction::Rename, "gEzQPA", "gCheats.EasyQPA" },
-        { MigrationAction::Rename, "gFireproofDekuShield", "gCheats.FireproofDekuShield" },
-        { MigrationAction::Rename, "gFreezeTime", "gCheats.FreezeTime" },
-        { MigrationAction::Rename, "gHookshotEverything", "gCheats.HookshotEverything" },
-        { MigrationAction::Rename, "gInfiniteAmmo", "gCheats.InfiniteAmmo" },
-        { MigrationAction::Rename, "gInfiniteEpona", "gCheats.InfiniteEponaBoost" },
-        { MigrationAction::Rename, "gInfiniteHealth", "gCheats.InfiniteHealth" },
-        { MigrationAction::Rename, "gInfiniteMagic", "gCheats.InfiniteMagic" },
-        { MigrationAction::Rename, "gInfiniteMoney", "gCheats.InfiniteMoney" },
-        { MigrationAction::Rename, "gInfiniteNayru", "gCheats.InfiniteNayru" },
-        { MigrationAction::Rename, "gMoonJumpOnL", "gCheats.MoonJumpOnL" },
-        { MigrationAction::Rename, "gNoBugsDespawn", "gCheats.NoBugsDespawn" },
-        { MigrationAction::Rename, "gNoClip", "gCheats.NoClip" },
-        { MigrationAction::Rename, "gNoFishDespawn", "gCheats.NoFishDespawn" },
-        { MigrationAction::Rename, "gNoKeeseGuayTarget", "gCheats.NoKeeseGuayTarget" },
-        { MigrationAction::Rename, "gNoRedeadFreeze", "gCheats.NoRedeadFreeze" },
-        { MigrationAction::Rename, "gNoRestrictItems", "gCheats.NoRestrictItems" },
-        { MigrationAction::Rename, "gSaveStatePromise", "gCheats.SaveStatePromise" },
-        { MigrationAction::Rename, "gSaveStatesEnabled", "gCheats.SaveStatesEnabled" },
-        { MigrationAction::Rename, "gShieldTwoHanded", "gCheats.ShieldTwoHanded" },
-        { MigrationAction::Rename, "gSuperTunic", "gCheats.SuperTunic" },
-        { MigrationAction::Rename, "gTimeSync", "gCheats.TimeSync" },
-        { MigrationAction::Rename, "gTimelessEquipment", "gCheats.TimelessEquipment" },
-        { MigrationAction::Rename, "gBetterDebugWarpScreen", "gDeveloperTools.BetterDebugWarpScreen" },
-        { MigrationAction::Rename, "gDebugEnabled", "gDeveloperTools.DebugEnabled" },
-        { MigrationAction::Rename, "gDebugSaveFileMode", "gDeveloperTools.DebugSaveFileMode" },
-        { MigrationAction::Rename, "gDebugWarpScreenTranslation", "gDeveloperTools.DebugWarpScreenTranslation" },
-        { MigrationAction::Rename, "gRegEditEnabled", "gDeveloperTools.RegEditEnabled" },
-        { MigrationAction::Rename, "gSaveFileID", "gDeveloperTools.SaveFileID" },
-        { MigrationAction::Rename, "gSkipLogoTitle", "gDeveloperTools.SkipLogoTitle" },
-        { MigrationAction::Rename, "gSkulltulaDebugEnabled", "gDeveloperTools.SkulltulaDebugEnabled" },
-        { MigrationAction::Rename, "gDebugActorViewerNameTags", "gDeveloperTools.ActorViewer.NameTags" },
-        { MigrationAction::Rename, "gActorViewerAdvancedParams", "gDeveloperTools.ActorViewer.AdvancedParams" },
-        { MigrationAction::Rename, "gColViewerEnabled", "gDeveloperTools.ColViewer.Enabled" },
-        { MigrationAction::Rename, "gColViewerScene", "gDeveloperTools.ColViewer.Scene" },
-        { MigrationAction::Rename, "gColViewerBgActors", "gDeveloperTools.ColViewer.BGActors" },
-        { MigrationAction::Rename, "gColViewerColCheck", "gDeveloperTools.ColViewer.ColCheck" },
-        { MigrationAction::Rename, "gColViewerWaterbox", "gDeveloperTools.ColViewer.Waterbox" },
-        { MigrationAction::Rename, "gColViewerDecal", "gDeveloperTools.ColViewer.Decal" },
-        { MigrationAction::Rename, "gColViewerShaded", "gDeveloperTools.ColViewer.Shaded" },
-        { MigrationAction::Rename, "gColViewerColorNormal", "gDeveloperTools.ColViewer.ColorNormal" },
-        { MigrationAction::Rename, "gColViewerColorHookshot", "gDeveloperTools.ColViewer.ColorHookshot" },
-        { MigrationAction::Rename, "gColViewerColorEntrance", "gDeveloperTools.ColViewer.ColorEntrance" },
-        { MigrationAction::Rename, "gColViewerColorSpecialSurface", "gDeveloperTools.ColViewer.ColorSpecialSurface" },
-        { MigrationAction::Rename, "gColViewerColorInteractable", "gDeveloperTools.ColViewer.ColorInteractable" },
-        { MigrationAction::Rename, "gColViewerColorSlope", "gDeveloperTools.ColViewer.ColorSlope" },
-        { MigrationAction::Rename, "gColViewerColorVoid", "gDeveloperTools.ColViewer.ColorVoid" },
-        { MigrationAction::Rename, "gColViewerColorOC", "gDeveloperTools.ColViewer.ColorOC" },
-        { MigrationAction::Rename, "gColViewerColorAC", "gDeveloperTools.ColViewer.ColorAC" },
-        { MigrationAction::Rename, "gColViewerColorAT", "gDeveloperTools.ColViewer.ColorAT" },
-        { MigrationAction::Rename, "gColViewerColorWaterbox", "gDeveloperTools.ColViewer.ColorWaterbox" },
-        { MigrationAction::Rename, "gValueViewer.EnablePrinting", "gDeveloperTools.ValueViewerEnablePrinting" },
-        { MigrationAction::Rename, "gEnableMapToggle", "gDeveloperTools.EnableMapToggle" },
-        { MigrationAction::Rename, "gGfxPrintCharStartOffset", "gDeveloperTools.GfxPrintChar.StartOffset" },
-        { MigrationAction::Rename, "gGfxPrintCharSpacing", "gDeveloperTools.GfxPrintChar.Spacing" },
-        { MigrationAction::Rename, "gEnemyBGMDisable", "gAudioEditor.EnemyBGMDisable" },
-        { MigrationAction::Rename, "gLostWoodsConsistentVolume", "gAudioEditor.LostWoodsConsistentVolume" },
-        { MigrationAction::Rename, "gSeqNameOverlay", "gAudioEditor.SeqNameOverlay" },
-        { MigrationAction::Rename, "gSeqNameOverlayDuration", "gAudioEditor.SeqNameOverlayDuration" },
-        { MigrationAction::Rename, "gLinkVoiceFreqMultiplier", "gAudioEditor.LinkVoiceFreqMultiplier" },
-        { MigrationAction::Rename, "gExperimentalOctaveDrop", "gAudioEditor.ExperimentalOctaveDrop" },
-        { MigrationAction::Rename, "gCosmetics.Hud_AButton", "gCosmetics.HUD.AButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_BButton", "gCosmetics.HUD.BButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CButtons", "gCosmetics.HUD.CButtons" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CUpButton", "gCosmetics.HUD.CUpButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CDownButton", "gCosmetics.HUD.CDownButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton", "gCosmetics.HUD.CLeftButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CRightButton", "gCosmetics.HUD.CRightButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StartButton", "gCosmetics.HUD.StartButton" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Dpad", "gCosmetics.HUD.Dpad" },
-        { MigrationAction::Rename, "gCosmetics.Hud_KeyCount", "gCosmetics.HUD.KeyCount" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony", "gCosmetics.HUD.StoneOfAgony" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Minimap", "gCosmetics.HUD.Minimap" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition", "gCosmetics.HUD.MinimapPosition" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance", "gCosmetics.HUD.MinimapEntrance" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar", "gCosmetics.HUD.EnemyHealthBar" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder", "gCosmetics.HUD.EnemyHealthBorder" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText", "gCosmetics.HUD.NameTagActorText" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground", "gCosmetics.HUD.NameTagActorBackground" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA", "gCosmetics.Kaleido.ItemSelA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB", "gCosmetics.Kaleido.ItemSelB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC", "gCosmetics.Kaleido.ItemSelC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD", "gCosmetics.Kaleido.ItemSelD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA", "gCosmetics.Kaleido.EquipSelA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB", "gCosmetics.Kaleido.EquipSelB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC", "gCosmetics.Kaleido.EquipSelC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD", "gCosmetics.Kaleido.EquipSelD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA", "gCosmetics.Kaleido.MapSelDunA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB", "gCosmetics.Kaleido.MapSelDunB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC", "gCosmetics.Kaleido.MapSelDunC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD", "gCosmetics.Kaleido.MapSelDunD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA", "gCosmetics.Kaleido.QuestStatusA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB", "gCosmetics.Kaleido.QuestStatusB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC", "gCosmetics.Kaleido.QuestStatusC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD", "gCosmetics.Kaleido.QuestStatusD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA", "gCosmetics.Kaleido.MapSelectA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB", "gCosmetics.Kaleido.MapSelectB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC", "gCosmetics.Kaleido.MapSelectC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD", "gCosmetics.Kaleido.MapSelectD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveA", "gCosmetics.Kaleido.SaveA" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveB", "gCosmetics.Kaleido.SaveB" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveC", "gCosmetics.Kaleido.SaveC" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveD", "gCosmetics.Kaleido.SaveD" },
-        { MigrationAction::Rename, "gCosmetics.Kal_NamePanel", "gCosmetics.Kaleido.NamePanel" },
-        { MigrationAction::Rename, "gCosmetics.Title_FileChoose", "gCosmetics.Title.FileChoose" },
-        { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo", "gCosmetics.Title.NintendoLogo" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed", "gCosmetics.Title.N64LogoRed" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue", "gCosmetics.Title.N64LogoBlue" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen", "gCosmetics.Title.N64LogoGreen" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow", "gCosmetics.Title.N64LogoYellow" },
-        { MigrationAction::Rename, "gCosmetics.Title_FirePrimary", "gCosmetics.Title.FirePrimary" },
-        { MigrationAction::Rename, "gCosmetics.Title_FireSecondary", "gCosmetics.Title.FireSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary", "gCosmetics.Arrows.NormalPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary", "gCosmetics.Arrows.NormalSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary", "gCosmetics.Arrows.FirePrimary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary", "gCosmetics.Arrows.FireSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary", "gCosmetics.Arrows.IcePrimary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary", "gCosmetics.Arrows.IceSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary", "gCosmetics.Arrows.LightPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary", "gCosmetics.Arrows.LightSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary", "gCosmetics.Magic.DinsPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary", "gCosmetics.Magic.DinsSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary", "gCosmetics.Magic.FaroresPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary", "gCosmetics.Magic.FaroresSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary", "gCosmetics.Magic.NayrusPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary", "gCosmetics.Magic.NayrusSecondary" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary", "gCosmetics.SpinAttack.Level1Primary" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary", "gCosmetics.SpinAttack.Level1Secondary" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary", "gCosmetics.SpinAttack.Level2Primary" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary", "gCosmetics.SpinAttack.Level2Secondary" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Bombchu", "gCosmetics.Trails.Bombchu" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Boomerang", "gCosmetics.Trails.Boomerang" },
-        { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword", "gCosmetics.Trails.KokiriSword" },
-        { MigrationAction::Rename, "gCosmetics.Trails_MasterSword", "gCosmetics.Trails.MasterSword" },
-        { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword", "gCosmetics.Trails.BiggoronSword" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Stick", "gCosmetics.Trails.Stick" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Hammer", "gCosmetics.Trails.Hammer" },
-        { MigrationAction::Rename, "gCosmetics.World_BlockOfTime", "gCosmetics.World.BlockOfTime" },
-        { MigrationAction::Rename, "gCosmetics.World_Moon", "gCosmetics.World.Moon" },
-        { MigrationAction::Rename, "gCosmetics.World_GossipStone", "gCosmetics.World.GossipStone" },
-        { MigrationAction::Rename, "gCosmetics.World_RedIce", "gCosmetics.World.RedIce" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary", "gCosmetics.Navi.IdlePrimary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary", "gCosmetics.Navi.IdleSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary", "gCosmetics.Navi.NPCPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary", "gCosmetics.Navi.NPCSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary", "gCosmetics.Navi.EnemyPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary", "gCosmetics.Navi.EnemySecondary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary", "gCosmetics.Navi.PropsPrimary" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary", "gCosmetics.Navi.PropsSecondary" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary", "gCosmetics.Ivan.IdlePrimary" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary", "gCosmetics.Ivan.IdleSecondary" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary", "gCosmetics.NPC.FireKeesePrimary" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary", "gCosmetics.NPC.FireKeeseSecondary" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary", "gCosmetics.NPC.IceKeesePrimary" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary", "gCosmetics.NPC.IceKeeseSecondary" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog1", "gCosmetics.NPC.Dog1" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog2", "gCosmetics.NPC.Dog2" },
-        { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula", "gCosmetics.NPC.GoldenSkulltula" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Kokiri", "gCosmetics.NPC.Kokiri" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Gerudo", "gCosmetics.NPC.Gerudo" },
-        { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap", "gCosmetics.NPC.MetalTrap" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles", "gCosmetics.NPC.IronKnuckles" },
-        { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Value", "gCosmetics.Link.KokiriTunic.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Value", "gCosmetics.Link.GoronTunic.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Value", "gCosmetics.Link.ZoraTunic.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_Hair.Value", "gCosmetics.Link.Hair.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_Linen.Value", "gCosmetics.Link.Linen.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_Boots.Value", "gCosmetics.Link.Boots.Value" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Value", "gCosmetics.MirrorShield.Body.Value" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Value", "gCosmetics.MirrorShield.Mirror.Value" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Value", "gCosmetics.MirrorShield.Emblem.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Value", "gCosmetics.Swords.KokiriBlade.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Value", "gCosmetics.Swords.KokiriHilt.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Value", "gCosmetics.Swords.MasterBlade.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Value", "gCosmetics.Swords.MasterHilt.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Value", "gCosmetics.Swords.BiggoronBlade.Value" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Value", "gCosmetics.Swords.BiggoronHilt.Value" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Value", "gCosmetics.Gloves.GoronBracelet.Value" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Value", "gCosmetics.Gloves.SilverGauntlets.Value" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Value", "gCosmetics.Gloves.GoldenGauntlets.Value" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Value", "gCosmetics.Gloves.GauntletsGem.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Value", "gCosmetics.Equipment.BoomerangBody.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Value", "gCosmetics.Equipment.BoomerangGem.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Value", "gCosmetics.Equipment.SlingshotBody.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Value", "gCosmetics.Equipment.SlingshotString.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Value", "gCosmetics.Equipment.HammerHead.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Value", "gCosmetics.Equipment.HammerHandle.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Value", "gCosmetics.Equipment.HookshotChain.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Value", "gCosmetics.Equipment.HookshotTip.Value" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Value", "gCosmetics.HookshotReticle.Target.Value" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Value", "gCosmetics.HookshotReticle.NonTarget.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Value", "gCosmetics.Equipment.BowTips.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Value", "gCosmetics.Equipment.BowString.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Value", "gCosmetics.Equipment.BowBody.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Value", "gCosmetics.Equipment.BowHandle.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Value", "gCosmetics.Equipment.ChuFace.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Value", "gCosmetics.Equipment.ChuBody.Value" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Value", "gCosmetics.Equipment.BunnyHood.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Value", "gCosmetics.Consumable.Hearts.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Value", "gCosmetics.Consumable.HeartBorder.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Value", "gCosmetics.Consumable.DDHearts.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Value", "gCosmetics.Consumable.DDHeartBorder.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Value", "gCosmetics.Consumable.Magic.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Value", "gCosmetics.Consumable.MagicActive.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Value", "gCosmetics.Consumable.MagicBorder.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Value", "gCosmetics.Consumable.MagicBorderActive.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Value", "gCosmetics.Consumable.GreenRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Value", "gCosmetics.Consumable.BlueRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Value", "gCosmetics.Consumable.RedRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Value", "gCosmetics.Consumable.PurpleRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Value", "gCosmetics.Consumable.GoldRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Value", "gCosmetics.Consumable.SilverRupee.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_AButton.Value", "gCosmetics.HUD.AButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_BButton.Value", "gCosmetics.HUD.BButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Value", "gCosmetics.HUD.CButtons.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Value", "gCosmetics.HUD.CUpButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Value", "gCosmetics.HUD.CDownButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Value", "gCosmetics.HUD.CLeftButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Value", "gCosmetics.HUD.CRightButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Value", "gCosmetics.HUD.StartButton.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Value", "gCosmetics.HUD.Dpad.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Value", "gCosmetics.HUD.KeyCount.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Value", "gCosmetics.HUD.StoneOfAgony.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Value", "gCosmetics.HUD.Minimap.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Value", "gCosmetics.HUD.MinimapPosition.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Value", "gCosmetics.HUD.MinimapEntrance.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Value", "gCosmetics.HUD.EnemyHealthBar.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Value", "gCosmetics.HUD.EnemyHealthBorder.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Value", "gCosmetics.HUD.NameTagActorText.Value" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Value", "gCosmetics.HUD.NameTagActorBackground.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Value", "gCosmetics.Kaleido.ItemSelA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Value", "gCosmetics.Kaleido.ItemSelB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Value", "gCosmetics.Kaleido.ItemSelC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Value", "gCosmetics.Kaleido.ItemSelD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Value", "gCosmetics.Kaleido.EquipSelA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Value", "gCosmetics.Kaleido.EquipSelB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Value", "gCosmetics.Kaleido.EquipSelC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Value", "gCosmetics.Kaleido.EquipSelD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Value", "gCosmetics.Kaleido.MapSelDunA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Value", "gCosmetics.Kaleido.MapSelDunB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Value", "gCosmetics.Kaleido.MapSelDunC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Value", "gCosmetics.Kaleido.MapSelDunD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Value", "gCosmetics.Kaleido.QuestStatusA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Value", "gCosmetics.Kaleido.QuestStatusB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Value", "gCosmetics.Kaleido.QuestStatusC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Value", "gCosmetics.Kaleido.QuestStatusD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Value", "gCosmetics.Kaleido.MapSelectA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Value", "gCosmetics.Kaleido.MapSelectB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Value", "gCosmetics.Kaleido.MapSelectC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Value", "gCosmetics.Kaleido.MapSelectD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Value", "gCosmetics.Kaleido.SaveA.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Value", "gCosmetics.Kaleido.SaveB.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Value", "gCosmetics.Kaleido.SaveC.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Value", "gCosmetics.Kaleido.SaveD.Value" },
-        { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Value", "gCosmetics.Kaleido.NamePanel.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Value", "gCosmetics.Title.FileChoose.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Value", "gCosmetics.Title.NintendoLogo.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Value", "gCosmetics.Title.N64LogoRed.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Value", "gCosmetics.Title.N64LogoBlue.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Value", "gCosmetics.Title.N64LogoGreen.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Value", "gCosmetics.Title.N64LogoYellow.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Value", "gCosmetics.Title.FirePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Value", "gCosmetics.Title.FireSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Value", "gCosmetics.Arrows.NormalPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Value", "gCosmetics.Arrows.NormalSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Value", "gCosmetics.Arrows.FirePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Value", "gCosmetics.Arrows.FireSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Value", "gCosmetics.Arrows.IcePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Value", "gCosmetics.Arrows.IceSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Value", "gCosmetics.Arrows.LightPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Value", "gCosmetics.Arrows.LightSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Value", "gCosmetics.Magic.DinsPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Value", "gCosmetics.Magic.DinsSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Value", "gCosmetics.Magic.FaroresPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Value", "gCosmetics.Magic.FaroresSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Value", "gCosmetics.Magic.NayrusPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Value", "gCosmetics.Magic.NayrusSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Value", "gCosmetics.SpinAttack.Level1Primary.Value" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Value", "gCosmetics.SpinAttack.Level1Secondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Value", "gCosmetics.SpinAttack.Level2Primary.Value" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Value", "gCosmetics.SpinAttack.Level2Secondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Value", "gCosmetics.Trails.Bombchu.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Value", "gCosmetics.Trails.Boomerang.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Value", "gCosmetics.Trails.KokiriSword.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Value", "gCosmetics.Trails.MasterSword.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Value", "gCosmetics.Trails.BiggoronSword.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Stick.Value", "gCosmetics.Trails.Stick.Value" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Value", "gCosmetics.Trails.Hammer.Value" },
-        { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Value", "gCosmetics.World.BlockOfTime.Value" },
-        { MigrationAction::Rename, "gCosmetics.World_Moon.Value", "gCosmetics.World.Moon.Value" },
-        { MigrationAction::Rename, "gCosmetics.World_GossipStone.Value", "gCosmetics.World.GossipStone.Value" },
-        { MigrationAction::Rename, "gCosmetics.World_RedIce.Value", "gCosmetics.World.RedIce.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Value", "gCosmetics.Navi.IdlePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Value", "gCosmetics.Navi.IdleSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Value", "gCosmetics.Navi.NPCPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Value", "gCosmetics.Navi.NPCSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Value", "gCosmetics.Navi.EnemyPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Value", "gCosmetics.Navi.EnemySecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Value", "gCosmetics.Navi.PropsPrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Value", "gCosmetics.Navi.PropsSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Value", "gCosmetics.Ivan.IdlePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Value", "gCosmetics.Ivan.IdleSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Value", "gCosmetics.NPC.FireKeesePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Value", "gCosmetics.NPC.FireKeeseSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Value", "gCosmetics.NPC.IceKeesePrimary.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Value", "gCosmetics.NPC.IceKeeseSecondary.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Value", "gCosmetics.NPC.Dog1.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Value", "gCosmetics.NPC.Dog2.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Value", "gCosmetics.NPC.GoldenSkulltula.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Value", "gCosmetics.NPC.Kokiri.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Value", "gCosmetics.NPC.Gerudo.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Value", "gCosmetics.NPC.MetalTrap.Value" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Value", "gCosmetics.NPC.IronKnuckles.Value" },
-        { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Rainbow", "gCosmetics.Link.KokiriTunic.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Rainbow", "gCosmetics.Link.GoronTunic.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Rainbow", "gCosmetics.Link.ZoraTunic.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_Hair.Rainbow", "gCosmetics.Link.Hair.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_Linen.Rainbow", "gCosmetics.Link.Linen.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_Boots.Rainbow", "gCosmetics.Link.Boots.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Rainbow", "gCosmetics.MirrorShield.Body.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Rainbow", "gCosmetics.MirrorShield.Mirror.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Rainbow", "gCosmetics.MirrorShield.Emblem.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Rainbow", "gCosmetics.Swords.KokiriBlade.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Rainbow", "gCosmetics.Swords.KokiriHilt.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Rainbow", "gCosmetics.Swords.MasterBlade.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Rainbow", "gCosmetics.Swords.MasterHilt.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Rainbow", "gCosmetics.Swords.BiggoronBlade.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Rainbow", "gCosmetics.Swords.BiggoronHilt.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Rainbow", "gCosmetics.Gloves.GoronBracelet.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Rainbow", "gCosmetics.Gloves.SilverGauntlets.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Rainbow", "gCosmetics.Gloves.GoldenGauntlets.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Rainbow", "gCosmetics.Gloves.GauntletsGem.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Rainbow", "gCosmetics.Equipment.BoomerangBody.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Rainbow", "gCosmetics.Equipment.BoomerangGem.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Rainbow", "gCosmetics.Equipment.SlingshotBody.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Rainbow", "gCosmetics.Equipment.SlingshotString.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Rainbow", "gCosmetics.Equipment.HammerHead.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Rainbow", "gCosmetics.Equipment.HammerHandle.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Rainbow", "gCosmetics.Equipment.HookshotChain.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Rainbow", "gCosmetics.Equipment.HookshotTip.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Rainbow", "gCosmetics.HookshotReticle.Target.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Rainbow", "gCosmetics.HookshotReticle.NonTarget.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Rainbow", "gCosmetics.Equipment.BowTips.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Rainbow", "gCosmetics.Equipment.BowString.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Rainbow", "gCosmetics.Equipment.BowBody.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Rainbow", "gCosmetics.Equipment.BowHandle.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Rainbow", "gCosmetics.Equipment.ChuFace.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Rainbow", "gCosmetics.Equipment.ChuBody.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Rainbow", "gCosmetics.Equipment.BunnyHood.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Rainbow", "gCosmetics.Consumable.Hearts.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Rainbow", "gCosmetics.Consumable.HeartBorder.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Rainbow", "gCosmetics.Consumable.DDHearts.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Rainbow", "gCosmetics.Consumable.DDHeartBorder.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Rainbow", "gCosmetics.Consumable.Magic.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Rainbow", "gCosmetics.Consumable.MagicActive.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Rainbow", "gCosmetics.Consumable.MagicBorder.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Rainbow", "gCosmetics.Consumable.MagicBorderActive.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Rainbow", "gCosmetics.Consumable.GreenRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Rainbow", "gCosmetics.Consumable.BlueRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Rainbow", "gCosmetics.Consumable.RedRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Rainbow", "gCosmetics.Consumable.PurpleRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Rainbow", "gCosmetics.Consumable.GoldRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Rainbow", "gCosmetics.Consumable.SilverRupee.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_AButton.Rainbow", "gCosmetics.HUD.AButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_BButton.Rainbow", "gCosmetics.HUD.BButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Rainbow", "gCosmetics.HUD.CButtons.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Rainbow", "gCosmetics.HUD.CUpButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Rainbow", "gCosmetics.HUD.CDownButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Rainbow", "gCosmetics.HUD.CLeftButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Rainbow", "gCosmetics.HUD.CRightButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Rainbow", "gCosmetics.HUD.StartButton.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Rainbow", "gCosmetics.HUD.Dpad.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Rainbow", "gCosmetics.HUD.KeyCount.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Rainbow", "gCosmetics.HUD.StoneOfAgony.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Rainbow", "gCosmetics.HUD.Minimap.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Rainbow", "gCosmetics.HUD.MinimapPosition.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Rainbow", "gCosmetics.HUD.MinimapEntrance.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Rainbow", "gCosmetics.HUD.EnemyHealthBar.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Rainbow", "gCosmetics.HUD.EnemyHealthBorder.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Rainbow", "gCosmetics.HUD.NameTagActorText.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Rainbow", "gCosmetics.HUD.NameTagActorBackground.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Rainbow", "gCosmetics.Kaleido.ItemSelA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Rainbow", "gCosmetics.Kaleido.ItemSelB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Rainbow", "gCosmetics.Kaleido.ItemSelC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Rainbow", "gCosmetics.Kaleido.ItemSelD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Rainbow", "gCosmetics.Kaleido.EquipSelA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Rainbow", "gCosmetics.Kaleido.EquipSelB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Rainbow", "gCosmetics.Kaleido.EquipSelC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Rainbow", "gCosmetics.Kaleido.EquipSelD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Rainbow", "gCosmetics.Kaleido.MapSelDunA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Rainbow", "gCosmetics.Kaleido.MapSelDunB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Rainbow", "gCosmetics.Kaleido.MapSelDunC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Rainbow", "gCosmetics.Kaleido.MapSelDunD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Rainbow", "gCosmetics.Kaleido.QuestStatusA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Rainbow", "gCosmetics.Kaleido.QuestStatusB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Rainbow", "gCosmetics.Kaleido.QuestStatusC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Rainbow", "gCosmetics.Kaleido.QuestStatusD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Rainbow", "gCosmetics.Kaleido.MapSelectA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Rainbow", "gCosmetics.Kaleido.MapSelectB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Rainbow", "gCosmetics.Kaleido.MapSelectC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Rainbow", "gCosmetics.Kaleido.MapSelectD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Rainbow", "gCosmetics.Kaleido.SaveA.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Rainbow", "gCosmetics.Kaleido.SaveB.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Rainbow", "gCosmetics.Kaleido.SaveC.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Rainbow", "gCosmetics.Kaleido.SaveD.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Rainbow", "gCosmetics.Kaleido.NamePanel.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Rainbow", "gCosmetics.Title.FileChoose.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Rainbow", "gCosmetics.Title.NintendoLogo.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Rainbow", "gCosmetics.Title.N64LogoRed.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Rainbow", "gCosmetics.Title.N64LogoBlue.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Rainbow", "gCosmetics.Title.N64LogoGreen.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Rainbow", "gCosmetics.Title.N64LogoYellow.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Rainbow", "gCosmetics.Title.FirePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Rainbow", "gCosmetics.Title.FireSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Rainbow", "gCosmetics.Arrows.NormalPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Rainbow", "gCosmetics.Arrows.NormalSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Rainbow", "gCosmetics.Arrows.FirePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Rainbow", "gCosmetics.Arrows.FireSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Rainbow", "gCosmetics.Arrows.IcePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Rainbow", "gCosmetics.Arrows.IceSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Rainbow", "gCosmetics.Arrows.LightPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Rainbow", "gCosmetics.Arrows.LightSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Rainbow", "gCosmetics.Magic.DinsPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Rainbow", "gCosmetics.Magic.DinsSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Rainbow", "gCosmetics.Magic.FaroresPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Rainbow", "gCosmetics.Magic.FaroresSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Rainbow", "gCosmetics.Magic.NayrusPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Rainbow", "gCosmetics.Magic.NayrusSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Rainbow", "gCosmetics.SpinAttack.Level1Primary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Rainbow", "gCosmetics.SpinAttack.Level1Secondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Rainbow", "gCosmetics.SpinAttack.Level2Primary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Rainbow", "gCosmetics.SpinAttack.Level2Secondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Rainbow", "gCosmetics.Trails.Bombchu.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Rainbow", "gCosmetics.Trails.Boomerang.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Rainbow", "gCosmetics.Trails.KokiriSword.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Rainbow", "gCosmetics.Trails.MasterSword.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Rainbow", "gCosmetics.Trails.BiggoronSword.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Stick.Rainbow", "gCosmetics.Trails.Stick.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Rainbow", "gCosmetics.Trails.Hammer.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Rainbow", "gCosmetics.World.BlockOfTime.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.World_Moon.Rainbow", "gCosmetics.World.Moon.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.World_GossipStone.Rainbow", "gCosmetics.World.GossipStone.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.World_RedIce.Rainbow", "gCosmetics.World.RedIce.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Rainbow", "gCosmetics.Navi.IdlePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Rainbow", "gCosmetics.Navi.IdleSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Rainbow", "gCosmetics.Navi.NPCPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Rainbow", "gCosmetics.Navi.NPCSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Rainbow", "gCosmetics.Navi.EnemyPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Rainbow", "gCosmetics.Navi.EnemySecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Rainbow", "gCosmetics.Navi.PropsPrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Rainbow", "gCosmetics.Navi.PropsSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Rainbow", "gCosmetics.Ivan.IdlePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Rainbow", "gCosmetics.Ivan.IdleSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Rainbow", "gCosmetics.NPC.FireKeesePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Rainbow", "gCosmetics.NPC.FireKeeseSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Rainbow", "gCosmetics.NPC.IceKeesePrimary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Rainbow", "gCosmetics.NPC.IceKeeseSecondary.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Rainbow", "gCosmetics.NPC.Dog1.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Rainbow", "gCosmetics.NPC.Dog2.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Rainbow", "gCosmetics.NPC.GoldenSkulltula.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Rainbow", "gCosmetics.NPC.Kokiri.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Rainbow", "gCosmetics.NPC.Gerudo.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Rainbow", "gCosmetics.NPC.MetalTrap.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Rainbow", "gCosmetics.NPC.IronKnuckles.Rainbow" },
-        { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Locked", "gCosmetics.Link.KokiriTunic.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Locked", "gCosmetics.Link.GoronTunic.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Locked", "gCosmetics.Link.ZoraTunic.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_Hair.Locked", "gCosmetics.Link.Hair.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_Linen.Locked", "gCosmetics.Link.Linen.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_Boots.Locked", "gCosmetics.Link.Boots.Locked" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Locked", "gCosmetics.MirrorShield.Body.Locked" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Locked", "gCosmetics.MirrorShield.Mirror.Locked" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Locked", "gCosmetics.MirrorShield.Emblem.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Locked", "gCosmetics.Swords.KokiriBlade.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Locked", "gCosmetics.Swords.KokiriHilt.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Locked", "gCosmetics.Swords.MasterBlade.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Locked", "gCosmetics.Swords.MasterHilt.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Locked", "gCosmetics.Swords.BiggoronBlade.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Locked", "gCosmetics.Swords.BiggoronHilt.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Locked", "gCosmetics.Gloves.GoronBracelet.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Locked", "gCosmetics.Gloves.SilverGauntlets.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Locked", "gCosmetics.Gloves.GoldenGauntlets.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Locked", "gCosmetics.Gloves.GauntletsGem.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Locked", "gCosmetics.Equipment.BoomerangBody.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Locked", "gCosmetics.Equipment.BoomerangGem.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Locked", "gCosmetics.Equipment.SlingshotBody.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Locked", "gCosmetics.Equipment.SlingshotString.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Locked", "gCosmetics.Equipment.HammerHead.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Locked", "gCosmetics.Equipment.HammerHandle.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Locked", "gCosmetics.Equipment.HookshotChain.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Locked", "gCosmetics.Equipment.HookshotTip.Locked" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Locked", "gCosmetics.HookshotReticle.Target.Locked" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Locked", "gCosmetics.HookshotReticle.NonTarget.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Locked", "gCosmetics.Equipment.BowTips.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Locked", "gCosmetics.Equipment.BowString.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Locked", "gCosmetics.Equipment.BowBody.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Locked", "gCosmetics.Equipment.BowHandle.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Locked", "gCosmetics.Equipment.ChuFace.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Locked", "gCosmetics.Equipment.ChuBody.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Locked", "gCosmetics.Equipment.BunnyHood.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Locked", "gCosmetics.Consumable.Hearts.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Locked", "gCosmetics.Consumable.HeartBorder.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Locked", "gCosmetics.Consumable.DDHearts.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Locked", "gCosmetics.Consumable.DDHeartBorder.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Locked", "gCosmetics.Consumable.Magic.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Locked", "gCosmetics.Consumable.MagicActive.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Locked", "gCosmetics.Consumable.MagicBorder.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Locked", "gCosmetics.Consumable.MagicBorderActive.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Locked", "gCosmetics.Consumable.GreenRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Locked", "gCosmetics.Consumable.BlueRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Locked", "gCosmetics.Consumable.RedRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Locked", "gCosmetics.Consumable.PurpleRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Locked", "gCosmetics.Consumable.GoldRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Locked", "gCosmetics.Consumable.SilverRupee.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_AButton.Locked", "gCosmetics.HUD.AButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_BButton.Locked", "gCosmetics.HUD.BButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Locked", "gCosmetics.HUD.CButtons.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Locked", "gCosmetics.HUD.CUpButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Locked", "gCosmetics.HUD.CDownButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Locked", "gCosmetics.HUD.CLeftButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Locked", "gCosmetics.HUD.CRightButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Locked", "gCosmetics.HUD.StartButton.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Locked", "gCosmetics.HUD.Dpad.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Locked", "gCosmetics.HUD.KeyCount.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Locked", "gCosmetics.HUD.StoneOfAgony.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Locked", "gCosmetics.HUD.Minimap.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Locked", "gCosmetics.HUD.MinimapPosition.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Locked", "gCosmetics.HUD.MinimapEntrance.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Locked", "gCosmetics.HUD.EnemyHealthBar.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Locked", "gCosmetics.HUD.EnemyHealthBorder.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Locked", "gCosmetics.HUD.NameTagActorText.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Locked", "gCosmetics.HUD.NameTagActorBackground.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Locked", "gCosmetics.Kaleido.ItemSelA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Locked", "gCosmetics.Kaleido.ItemSelB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Locked", "gCosmetics.Kaleido.ItemSelC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Locked", "gCosmetics.Kaleido.ItemSelD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Locked", "gCosmetics.Kaleido.EquipSelA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Locked", "gCosmetics.Kaleido.EquipSelB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Locked", "gCosmetics.Kaleido.EquipSelC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Locked", "gCosmetics.Kaleido.EquipSelD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Locked", "gCosmetics.Kaleido.MapSelDunA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Locked", "gCosmetics.Kaleido.MapSelDunB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Locked", "gCosmetics.Kaleido.MapSelDunC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Locked", "gCosmetics.Kaleido.MapSelDunD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Locked", "gCosmetics.Kaleido.QuestStatusA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Locked", "gCosmetics.Kaleido.QuestStatusB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Locked", "gCosmetics.Kaleido.QuestStatusC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Locked", "gCosmetics.Kaleido.QuestStatusD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Locked", "gCosmetics.Kaleido.MapSelectA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Locked", "gCosmetics.Kaleido.MapSelectB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Locked", "gCosmetics.Kaleido.MapSelectC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Locked", "gCosmetics.Kaleido.MapSelectD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Locked", "gCosmetics.Kaleido.SaveA.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Locked", "gCosmetics.Kaleido.SaveB.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Locked", "gCosmetics.Kaleido.SaveC.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Locked", "gCosmetics.Kaleido.SaveD.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Locked", "gCosmetics.Kaleido.NamePanel.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Locked", "gCosmetics.Title.FileChoose.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Locked", "gCosmetics.Title.NintendoLogo.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Locked", "gCosmetics.Title.N64LogoRed.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Locked", "gCosmetics.Title.N64LogoBlue.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Locked", "gCosmetics.Title.N64LogoGreen.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Locked", "gCosmetics.Title.N64LogoYellow.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Locked", "gCosmetics.Title.FirePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Locked", "gCosmetics.Title.FireSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Locked", "gCosmetics.Arrows.NormalPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Locked", "gCosmetics.Arrows.NormalSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Locked", "gCosmetics.Arrows.FirePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Locked", "gCosmetics.Arrows.FireSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Locked", "gCosmetics.Arrows.IcePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Locked", "gCosmetics.Arrows.IceSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Locked", "gCosmetics.Arrows.LightPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Locked", "gCosmetics.Arrows.LightSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Locked", "gCosmetics.Magic.DinsPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Locked", "gCosmetics.Magic.DinsSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Locked", "gCosmetics.Magic.FaroresPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Locked", "gCosmetics.Magic.FaroresSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Locked", "gCosmetics.Magic.NayrusPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Locked", "gCosmetics.Magic.NayrusSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Locked", "gCosmetics.SpinAttack.Level1Primary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Locked", "gCosmetics.SpinAttack.Level1Secondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Locked", "gCosmetics.SpinAttack.Level2Primary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Locked", "gCosmetics.SpinAttack.Level2Secondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Locked", "gCosmetics.Trails.Bombchu.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Locked", "gCosmetics.Trails.Boomerang.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Locked", "gCosmetics.Trails.KokiriSword.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Locked", "gCosmetics.Trails.MasterSword.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Locked", "gCosmetics.Trails.BiggoronSword.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Stick.Locked", "gCosmetics.Trails.Stick.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Locked", "gCosmetics.Trails.Hammer.Locked" },
-        { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Locked", "gCosmetics.World.BlockOfTime.Locked" },
-        { MigrationAction::Rename, "gCosmetics.World_Moon.Locked", "gCosmetics.World.Moon.Locked" },
-        { MigrationAction::Rename, "gCosmetics.World_GossipStone.Locked", "gCosmetics.World.GossipStone.Locked" },
-        { MigrationAction::Rename, "gCosmetics.World_RedIce.Locked", "gCosmetics.World.RedIce.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Locked", "gCosmetics.Navi.IdlePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Locked", "gCosmetics.Navi.IdleSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Locked", "gCosmetics.Navi.NPCPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Locked", "gCosmetics.Navi.NPCSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Locked", "gCosmetics.Navi.EnemyPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Locked", "gCosmetics.Navi.EnemySecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Locked", "gCosmetics.Navi.PropsPrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Locked", "gCosmetics.Navi.PropsSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Locked", "gCosmetics.Ivan.IdlePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Locked", "gCosmetics.Ivan.IdleSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Locked", "gCosmetics.NPC.FireKeesePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Locked", "gCosmetics.NPC.FireKeeseSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Locked", "gCosmetics.NPC.IceKeesePrimary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Locked", "gCosmetics.NPC.IceKeeseSecondary.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Locked", "gCosmetics.NPC.Dog1.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Locked", "gCosmetics.NPC.Dog2.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Locked", "gCosmetics.NPC.GoldenSkulltula.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Locked", "gCosmetics.NPC.Kokiri.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Locked", "gCosmetics.NPC.Gerudo.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Locked", "gCosmetics.NPC.MetalTrap.Locked" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Locked", "gCosmetics.NPC.IronKnuckles.Locked" },
-        { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Changed", "gCosmetics.Link.KokiriTunic.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Changed", "gCosmetics.Link.GoronTunic.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Changed", "gCosmetics.Link.ZoraTunic.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Link_Hair.Changed", "gCosmetics.Link.Hair.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Link_Linen.Changed", "gCosmetics.Link.Linen.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Link_Boots.Changed", "gCosmetics.Link.Boots.Changed" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Changed", "gCosmetics.MirrorShield.Body.Changed" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Changed", "gCosmetics.MirrorShield.Mirror.Changed" },
-        { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Changed", "gCosmetics.MirrorShield.Emblem.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Changed", "gCosmetics.Swords.KokiriBlade.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Changed", "gCosmetics.Swords.KokiriHilt.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Changed", "gCosmetics.Swords.MasterBlade.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Changed", "gCosmetics.Swords.MasterHilt.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Changed", "gCosmetics.Swords.BiggoronBlade.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Changed", "gCosmetics.Swords.BiggoronHilt.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Changed", "gCosmetics.Gloves.GoronBracelet.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Changed", "gCosmetics.Gloves.SilverGauntlets.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Changed", "gCosmetics.Gloves.GoldenGauntlets.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Changed", "gCosmetics.Gloves.GauntletsGem.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Changed", "gCosmetics.Equipment.BoomerangBody.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Changed", "gCosmetics.Equipment.BoomerangGem.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Changed", "gCosmetics.Equipment.SlingshotBody.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Changed", "gCosmetics.Equipment.SlingshotString.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Changed", "gCosmetics.Equipment.HammerHead.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Changed", "gCosmetics.Equipment.HammerHandle.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Changed", "gCosmetics.Equipment.HookshotChain.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Changed", "gCosmetics.Equipment.HookshotTip.Changed" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Changed", "gCosmetics.HookshotReticle.Target.Changed" },
-        { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Changed", "gCosmetics.HookshotReticle.NonTarget.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Changed", "gCosmetics.Equipment.BowTips.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Changed", "gCosmetics.Equipment.BowString.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Changed", "gCosmetics.Equipment.BowBody.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Changed", "gCosmetics.Equipment.BowHandle.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Changed", "gCosmetics.Equipment.ChuFace.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Changed", "gCosmetics.Equipment.ChuBody.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Changed", "gCosmetics.Equipment.BunnyHood.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Changed", "gCosmetics.Consumable.Hearts.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Changed", "gCosmetics.Consumable.HeartBorder.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Changed", "gCosmetics.Consumable.DDHearts.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Changed", "gCosmetics.Consumable.DDHeartBorder.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Changed", "gCosmetics.Consumable.Magic.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Changed", "gCosmetics.Consumable.MagicActive.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Changed", "gCosmetics.Consumable.MagicBorder.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Changed", "gCosmetics.Consumable.MagicBorderActive.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Changed", "gCosmetics.Consumable.GreenRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Changed", "gCosmetics.Consumable.BlueRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Changed", "gCosmetics.Consumable.RedRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Changed", "gCosmetics.Consumable.PurpleRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Changed", "gCosmetics.Consumable.GoldRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Changed", "gCosmetics.Consumable.SilverRupee.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_AButton.Changed", "gCosmetics.HUD.AButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_BButton.Changed", "gCosmetics.HUD.BButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Changed", "gCosmetics.HUD.CButtons.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Changed", "gCosmetics.HUD.CUpButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Changed", "gCosmetics.HUD.CDownButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Changed", "gCosmetics.HUD.CLeftButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Changed", "gCosmetics.HUD.CRightButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Changed", "gCosmetics.HUD.StartButton.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Changed", "gCosmetics.HUD.Dpad.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Changed", "gCosmetics.HUD.KeyCount.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Changed", "gCosmetics.HUD.StoneOfAgony.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Changed", "gCosmetics.HUD.Minimap.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Changed", "gCosmetics.HUD.MinimapPosition.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Changed", "gCosmetics.HUD.MinimapEntrance.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Changed", "gCosmetics.HUD.EnemyHealthBar.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Changed", "gCosmetics.HUD.EnemyHealthBorder.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Changed", "gCosmetics.HUD.NameTagActorText.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Changed", "gCosmetics.HUD.NameTagActorBackground.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Changed", "gCosmetics.Kaleido.ItemSelA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Changed", "gCosmetics.Kaleido.ItemSelB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Changed", "gCosmetics.Kaleido.ItemSelC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Changed", "gCosmetics.Kaleido.ItemSelD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Changed", "gCosmetics.Kaleido.EquipSelA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Changed", "gCosmetics.Kaleido.EquipSelB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Changed", "gCosmetics.Kaleido.EquipSelC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Changed", "gCosmetics.Kaleido.EquipSelD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Changed", "gCosmetics.Kaleido.MapSelDunA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Changed", "gCosmetics.Kaleido.MapSelDunB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Changed", "gCosmetics.Kaleido.MapSelDunC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Changed", "gCosmetics.Kaleido.MapSelDunD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Changed", "gCosmetics.Kaleido.QuestStatusA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Changed", "gCosmetics.Kaleido.QuestStatusB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Changed", "gCosmetics.Kaleido.QuestStatusC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Changed", "gCosmetics.Kaleido.QuestStatusD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Changed", "gCosmetics.Kaleido.MapSelectA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Changed", "gCosmetics.Kaleido.MapSelectB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Changed", "gCosmetics.Kaleido.MapSelectC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Changed", "gCosmetics.Kaleido.MapSelectD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Changed", "gCosmetics.Kaleido.SaveA.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Changed", "gCosmetics.Kaleido.SaveB.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Changed", "gCosmetics.Kaleido.SaveC.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Changed", "gCosmetics.Kaleido.SaveD.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Changed", "gCosmetics.Kaleido.NamePanel.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Changed", "gCosmetics.Title.FileChoose.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Changed", "gCosmetics.Title.NintendoLogo.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Changed", "gCosmetics.Title.N64LogoRed.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Changed", "gCosmetics.Title.N64LogoBlue.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Changed", "gCosmetics.Title.N64LogoGreen.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Changed", "gCosmetics.Title.N64LogoYellow.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Changed", "gCosmetics.Title.FirePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Changed", "gCosmetics.Title.FireSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Changed", "gCosmetics.Arrows.NormalPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Changed", "gCosmetics.Arrows.NormalSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Changed", "gCosmetics.Arrows.FirePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Changed", "gCosmetics.Arrows.FireSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Changed", "gCosmetics.Arrows.IcePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Changed", "gCosmetics.Arrows.IceSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Changed", "gCosmetics.Arrows.LightPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Changed", "gCosmetics.Arrows.LightSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Changed", "gCosmetics.Magic.DinsPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Changed", "gCosmetics.Magic.DinsSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Changed", "gCosmetics.Magic.FaroresPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Changed", "gCosmetics.Magic.FaroresSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Changed", "gCosmetics.Magic.NayrusPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Changed", "gCosmetics.Magic.NayrusSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Changed", "gCosmetics.SpinAttack.Level1Primary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Changed", "gCosmetics.SpinAttack.Level1Secondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Changed", "gCosmetics.SpinAttack.Level2Primary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Changed", "gCosmetics.SpinAttack.Level2Secondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Changed", "gCosmetics.Trails.Bombchu.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Changed", "gCosmetics.Trails.Boomerang.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Changed", "gCosmetics.Trails.KokiriSword.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Changed", "gCosmetics.Trails.MasterSword.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Changed", "gCosmetics.Trails.BiggoronSword.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Stick.Changed", "gCosmetics.Trails.Stick.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Changed", "gCosmetics.Trails.Hammer.Changed" },
-        { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Changed", "gCosmetics.World.BlockOfTime.Changed" },
-        { MigrationAction::Rename, "gCosmetics.World_Moon.Changed", "gCosmetics.World.Moon.Changed" },
-        { MigrationAction::Rename, "gCosmetics.World_GossipStone.Changed", "gCosmetics.World.GossipStone.Changed" },
-        { MigrationAction::Rename, "gCosmetics.World_RedIce.Changed", "gCosmetics.World.RedIce.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Changed", "gCosmetics.Navi.IdlePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Changed", "gCosmetics.Navi.IdleSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Changed", "gCosmetics.Navi.NPCPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Changed", "gCosmetics.Navi.NPCSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Changed", "gCosmetics.Navi.EnemyPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Changed", "gCosmetics.Navi.EnemySecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Changed", "gCosmetics.Navi.PropsPrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Changed", "gCosmetics.Navi.PropsSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Changed", "gCosmetics.Ivan.IdlePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Changed", "gCosmetics.Ivan.IdleSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Changed", "gCosmetics.NPC.FireKeesePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Changed", "gCosmetics.NPC.FireKeeseSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Changed", "gCosmetics.NPC.IceKeesePrimary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Changed", "gCosmetics.NPC.IceKeeseSecondary.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Changed", "gCosmetics.NPC.Dog1.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Changed", "gCosmetics.NPC.Dog2.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Changed", "gCosmetics.NPC.GoldenSkulltula.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Changed", "gCosmetics.NPC.Kokiri.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Changed", "gCosmetics.NPC.Gerudo.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Changed", "gCosmetics.NPC.MetalTrap.Changed" },
-        { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Changed", "gCosmetics.NPC.IronKnuckles.Changed" },
-        { MigrationAction::Rename, "gHUDMargin_T", "gCosmetics.HUD.Margin.T" },
-        { MigrationAction::Rename, "gHUDMargin_L", "gCosmetics.HUD.Margin.L" },
-        { MigrationAction::Rename, "gHUDMargin_R", "gCosmetics.HUD.Margin.R" },
-        { MigrationAction::Rename, "gHUDMargin_B", "gCosmetics.HUD.Margin.B" },
-        { MigrationAction::Rename, "gHearts", "gCosmetics.HUD.Hearts" },
-        { MigrationAction::Rename, "gHeartsCount", "gCosmetics.HUD.HeartsCount" },
-        { MigrationAction::Rename, "gMagicBar", "gCosmetics.HUD.MagicBar" },
-        { MigrationAction::Rename, "gVSOA", "gCosmetics.HUD.VisualSoA" },
-        { MigrationAction::Rename, "gBBtn", "gCosmetics.HUD.BButton" },
-        { MigrationAction::Rename, "gABtn", "gCosmetics.HUD.AButton" },
-        { MigrationAction::Rename, "gStartBtn", "gCosmetics.HUD.StartButton" },
-        { MigrationAction::Rename, "gCBtnU", "gCosmetics.HUD.CUpButton" },
-        { MigrationAction::Rename, "gCBtnD", "gCosmetics.HUD.CDownButton" },
-        { MigrationAction::Rename, "gCBtnL", "gCosmetics.HUD.CLeftButton" },
-        { MigrationAction::Rename, "gCBtnR", "gCosmetics.HUD.CRightButton" },
-        { MigrationAction::Rename, "gDPad", "gCosmetics.HUD.Dpad" },
-        { MigrationAction::Rename, "gMinimap", "gCosmetics.HUD.Minimap" },
-        { MigrationAction::Rename, "gSKC", "gCosmetics.HUD.SmallKey" },
-        { MigrationAction::Rename, "gRC", "gCosmetics.HUD.Rupees" },
-        { MigrationAction::Rename, "gCarrots", "gCosmetics.HUD.Carrots" },
-        { MigrationAction::Rename, "gTimers", "gCosmetics.HUD.Timers" },
-        { MigrationAction::Rename, "gAS", "gCosmetics.HUD.ArcheryScore" },
-        { MigrationAction::Rename, "gTCM", "gCosmetics.HUD.TitleCard.Map" },
-        { MigrationAction::Rename, "gTCB", "gCosmetics.HUD.TitleCard.Boss" },
-        { MigrationAction::Rename, "gIGT", "gCosmetics.HUD.IGT" },
-        { MigrationAction::Rename, "gHeartsPosType", "gCosmetics.HUD.Hearts.PosType" },
-        { MigrationAction::Rename, "gHeartsCountPosType", "gCosmetics.HUD.HeartsCount.PosType" },
-        { MigrationAction::Rename, "gMagicBarPosType", "gCosmetics.HUD.MagicBar.PosType" },
-        { MigrationAction::Rename, "gVSOAPosType", "gCosmetics.HUD.VisualSoA.PosType" },
-        { MigrationAction::Rename, "gBBtnPosType", "gCosmetics.HUD.BButton.PosType" },
-        { MigrationAction::Rename, "gABtnPosType", "gCosmetics.HUD.AButton.PosType" },
-        { MigrationAction::Rename, "gStartBtnPosType", "gCosmetics.HUD.StartButton.PosType" },
-        { MigrationAction::Rename, "gCBtnUPosType", "gCosmetics.HUD.CUpButton.PosType" },
-        { MigrationAction::Rename, "gCBtnDPosType", "gCosmetics.HUD.CDownButton.PosType" },
-        { MigrationAction::Rename, "gCBtnLPosType", "gCosmetics.HUD.CLeftButton.PosType" },
-        { MigrationAction::Rename, "gCBtnRPosType", "gCosmetics.HUD.CRightButton.PosType" },
-        { MigrationAction::Rename, "gDPadPosType", "gCosmetics.HUD.Dpad.PosType" },
-        { MigrationAction::Rename, "gMinimapPosType", "gCosmetics.HUD.Minimap.PosType" },
-        { MigrationAction::Rename, "gSKCPosType", "gCosmetics.HUD.SmallKey.PosType" },
-        { MigrationAction::Rename, "gRCPosType", "gCosmetics.HUD.Rupees.PosType" },
-        { MigrationAction::Rename, "gCarrotsPosType", "gCosmetics.HUD.Carrots.PosType" },
-        { MigrationAction::Rename, "gTimersPosType", "gCosmetics.HUD.Timers.PosType" },
-        { MigrationAction::Rename, "gASPosType", "gCosmetics.HUD.ArcheryScore.PosType" },
-        { MigrationAction::Rename, "gTCMPosType", "gCosmetics.HUD.TitleCard.Map.PosType" },
-        { MigrationAction::Rename, "gTCBPosType", "gCosmetics.HUD.TitleCard.Boss.PosType" },
-        { MigrationAction::Rename, "gIGTPosType", "gCosmetics.HUD.IGT.PosType" },
-        { MigrationAction::Rename, "gHeartsPosX", "gCosmetics.HUD.Hearts.PosX" },
-        { MigrationAction::Rename, "gHeartsCountPosX", "gCosmetics.HUD.HeartsCount.PosX" },
-        { MigrationAction::Rename, "gMagicBarPosX", "gCosmetics.HUD.MagicBar.PosX" },
-        { MigrationAction::Rename, "gVSOAPosX", "gCosmetics.HUD.VisualSoA.PosX" },
-        { MigrationAction::Rename, "gBBtnPosX", "gCosmetics.HUD.BButton.PosX" },
-        { MigrationAction::Rename, "gABtnPosX", "gCosmetics.HUD.AButton.PosX" },
-        { MigrationAction::Rename, "gStartBtnPosX", "gCosmetics.HUD.StartButton.PosX" },
-        { MigrationAction::Rename, "gCBtnUPosX", "gCosmetics.HUD.CUpButton.PosX" },
-        { MigrationAction::Rename, "gCBtnDPosX", "gCosmetics.HUD.CDownButton.PosX" },
-        { MigrationAction::Rename, "gCBtnLPosX", "gCosmetics.HUD.CLeftButton.PosX" },
-        { MigrationAction::Rename, "gCBtnRPosX", "gCosmetics.HUD.CRightButton.PosX" },
-        { MigrationAction::Rename, "gDPadPosX", "gCosmetics.HUD.Dpad.PosX" },
-        { MigrationAction::Rename, "gMinimapPosX", "gCosmetics.HUD.Minimap.PosX" },
-        { MigrationAction::Rename, "gSKCPosX", "gCosmetics.HUD.SmallKey.PosX" },
-        { MigrationAction::Rename, "gRCPosX", "gCosmetics.HUD.Rupees.PosX" },
-        { MigrationAction::Rename, "gCarrotsPosX", "gCosmetics.HUD.Carrots.PosX" },
-        { MigrationAction::Rename, "gTimersPosX", "gCosmetics.HUD.Timers.PosX" },
-        { MigrationAction::Rename, "gASPosX", "gCosmetics.HUD.ArcheryScore.PosX" },
-        { MigrationAction::Rename, "gTCMPosX", "gCosmetics.HUD.TitleCard.Map.PosX" },
-        { MigrationAction::Rename, "gTCBPosX", "gCosmetics.HUD.TitleCard.Boss.PosX" },
-        { MigrationAction::Rename, "gIGTPosX", "gCosmetics.HUD.IGT.PosX" },
-        { MigrationAction::Rename, "gHeartsPosY", "gCosmetics.HUD.Hearts.PosY" },
-        { MigrationAction::Rename, "gHeartsCountPosY", "gCosmetics.HUD.HeartsCount.PosY" },
-        { MigrationAction::Rename, "gMagicBarPosY", "gCosmetics.HUD.MagicBar.PosY" },
-        { MigrationAction::Rename, "gVSOAPosY", "gCosmetics.HUD.VisualSoA.PosY" },
-        { MigrationAction::Rename, "gBBtnPosY", "gCosmetics.HUD.BButton.PosY" },
-        { MigrationAction::Rename, "gABtnPosY", "gCosmetics.HUD.AButton.PosY" },
-        { MigrationAction::Rename, "gStartBtnPosY", "gCosmetics.HUD.StartButton.PosY" },
-        { MigrationAction::Rename, "gCBtnUPosY", "gCosmetics.HUD.CUpButton.PosY" },
-        { MigrationAction::Rename, "gCBtnDPosY", "gCosmetics.HUD.CDownButton.PosY" },
-        { MigrationAction::Rename, "gCBtnLPosY", "gCosmetics.HUD.CLeftButton.PosY" },
-        { MigrationAction::Rename, "gCBtnRPosY", "gCosmetics.HUD.CRightButton.PosY" },
-        { MigrationAction::Rename, "gDPadPosY", "gCosmetics.HUD.Dpad.PosY" },
-        { MigrationAction::Rename, "gMinimapPosY", "gCosmetics.HUD.Minimap.PosY" },
-        { MigrationAction::Rename, "gSKCPosY", "gCosmetics.HUD.SmallKey.PosY" },
-        { MigrationAction::Rename, "gRCPosY", "gCosmetics.HUD.Rupees.PosY" },
-        { MigrationAction::Rename, "gCarrotsPosY", "gCosmetics.HUD.Carrots.PosY" },
-        { MigrationAction::Rename, "gTimersPosY", "gCosmetics.HUD.Timers.PosY" },
-        { MigrationAction::Rename, "gASPosY", "gCosmetics.HUD.ArcheryScore.PosY" },
-        { MigrationAction::Rename, "gTCMPosY", "gCosmetics.HUD.TitleCard.Map.PosY" },
-        { MigrationAction::Rename, "gTCBPosY", "gCosmetics.HUD.TitleCard.Boss.PosY" },
-        { MigrationAction::Rename, "gIGTPosY", "gCosmetics.HUD.IGT.PosY" },
-        { MigrationAction::Rename, "gHeartsUseMargins", "gCosmetics.HUD.HeartsUseMargins" },
-        { MigrationAction::Rename, "gHeartsCountUseMargins", "gCosmetics.HUD.HeartsCountUseMargins" },
-        { MigrationAction::Rename, "gMagicBarUseMargins", "gCosmetics.HUD.MagicBarUseMargins" },
-        { MigrationAction::Rename, "gVSOAUseMargins", "gCosmetics.HUD.VisualSoAUseMargins" },
-        { MigrationAction::Rename, "gBBtnUseMargins", "gCosmetics.HUD.BButtonUseMargins" },
-        { MigrationAction::Rename, "gABtnUseMargins", "gCosmetics.HUD.AButtonUseMargins" },
-        { MigrationAction::Rename, "gStartBtnUseMargins", "gCosmetics.HUD.StartButtonUseMargins" },
-        { MigrationAction::Rename, "gCBtnUUseMargins", "gCosmetics.HUD.CUpButtonUseMargins" },
-        { MigrationAction::Rename, "gCBtnDUseMargins", "gCosmetics.HUD.CDownButtonUseMargins" },
-        { MigrationAction::Rename, "gCBtnLUseMargins", "gCosmetics.HUD.CLeftButtonUseMargins" },
-        { MigrationAction::Rename, "gCBtnRUseMargins", "gCosmetics.HUD.CRightButtonUseMargins" },
-        { MigrationAction::Rename, "gDPadUseMargins", "gCosmetics.HUD.DpadUseMargins" },
-        { MigrationAction::Rename, "gMinimapUseMargins", "gCosmetics.HUD.MinimapUseMargins" },
-        { MigrationAction::Rename, "gSKCUseMargins", "gCosmetics.HUD.AButtonUseMargins" },
-        { MigrationAction::Rename, "gRCUseMargins", "gCosmetics.HUD.StartButtonUseMargins" },
-        { MigrationAction::Rename, "gCarrotsUseMargins", "gCosmetics.HUD.CUpButtonUseMargins" },
-        { MigrationAction::Rename, "gTimersUseMargins", "gCosmetics.HUD.CDownButtonUseMargins" },
-        { MigrationAction::Rename, "gASUseMargins", "gCosmetics.HUD.CLeftButtonUseMargins" },
-        { MigrationAction::Rename, "gTCMUseMargins", "gCosmetics.HUD.CRightButtonUseMargins" },
-        { MigrationAction::Rename, "gTCBUseMargins", "gCosmetics.HUD.DpadUseMargins" },
-        { MigrationAction::Rename, "gIGTUseMargins", "gCosmetics.HUD.MinimapUseMargins" },
-        { MigrationAction::Rename, "gUnfixGoronSpin", "gCosmetics.UnfixGoronSpin" },
-        { MigrationAction::Rename, "gNL_Diamond_Env", "gCosmetics.Magic.NayrusSecondary" },
-        { MigrationAction::Rename, "gUseSpellsCol", "gCosmetics.UseSpellsColors" },
-        { MigrationAction::Rename, "gItemTrackerBgColorA", "gTrackers.ItemTracker.BgColorA" },
-        { MigrationAction::Rename, "gItemTrackerBgColorB", "gTrackers.ItemTracker.BgColorB" },
-        { MigrationAction::Rename, "gItemTrackerBgColorG", "gTrackers.ItemTracker.BgColorG" },
-        { MigrationAction::Rename, "gItemTrackerBgColorR", "gTrackers.ItemTracker.BgColorR" },
-        { MigrationAction::Rename, "gItemTrackerCapacityTrack", "gTrackers.ItemTracker.ItemCountType" },
-        { MigrationAction::Rename, "gItemTrackerComboButton1", "gTrackers.ItemTracker.ComboButton1" },
-        { MigrationAction::Rename, "gItemTrackerComboButton2", "gTrackers.ItemTracker.ComboButton2" },
-        { MigrationAction::Rename, "gItemTrackerCurrentOnLeft", "gTrackers.ItemTracker.ItemCountAlignLeft" },
-        { MigrationAction::Rename, "gItemTrackerDisplayDungeonItemsHorizontal", "gTrackers.ItemTracker.DungeonItems.Layout" },
-        { MigrationAction::Rename, "gItemTrackerDisplayDungeonItemsMaps", "gTrackers.ItemTracker.DungeonItems.DisplayMaps" },
-        { MigrationAction::Rename, "gItemTrackerDisplayType", "gTrackers.ItemTracker.DisplayType.Main" },
-        { MigrationAction::Rename, "gItemTrackerDungeonItemsDisplayType", "gTrackers.ItemTracker.DisplayType.DungeonItems" },
-        { MigrationAction::Rename, "gItemTrackerDungeonRewardsCircle", "gTrackers.ItemTracker.DungeonRewardsLayout" },
-        { MigrationAction::Rename, "gItemTrackerDungeonRewardsDisplayType", "gTrackers.ItemTracker.DisplayType.DungeonRewards" },
-        { MigrationAction::Rename, "gItemTrackerEquipmentItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Equipment" },
-        { MigrationAction::Rename, "gItemTrackerGregDisplayType", "gTrackers.ItemTracker.DisplayType.Greg" },
-        { MigrationAction::Rename, "gItemTrackerHudEditMode", "gTrackers.ItemTracker.HudEditMode" },
-        { MigrationAction::Rename, "gItemTrackerIconSize", "gTrackers.ItemTracker.IconSize" },
-        { MigrationAction::Rename, "gItemTrackerIconSpacing", "gTrackers.ItemTracker.IconSpacing" },
-        { MigrationAction::Rename, "gItemTrackerInventoryItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Inventory" },
-        { MigrationAction::Rename, "gItemTrackerKeyTrack", "gTrackers.ItemTracker.KeyCounts" },
-        { MigrationAction::Rename, "gItemTrackerMiscItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Misc" },
-        { MigrationAction::Rename, "gItemTrackerNotesDisplayType", "gTrackers.ItemTracker.DisplayType.Notes" },
-        { MigrationAction::Rename, "gItemTrackerShowOnlyPaused", "gTrackers.ItemTracker.ShowOnlyPaused" },
-        { MigrationAction::Rename, "gItemTrackerSongsDisplayType", "gTrackers.ItemTracker.DisplayType.Songs" },
-        { MigrationAction::Rename, "gItemTrackerTriforcePieceTrack", "gTrackers.ItemTracker.TriforcePieceCounts" },
-        { MigrationAction::Rename, "gItemTrackerTriforcePiecesDisplayType", "gTrackers.ItemTracker.DisplayType.TriforcePieces" },
-        { MigrationAction::Rename, "gItemTrackerWindowType", "gTrackers.ItemTracker.WindowType" },
-        { MigrationAction::Rename, "gTrackers.ItemTracker.ItemTrackerTextSize", "gTrackers.ItemTracker.TextSize" },
-        { MigrationAction::Rename, "gEntranceTrackerAutoScroll", "gTrackers.EntranceTracker.AutoScroll" },
-        { MigrationAction::Rename, "gEntranceTrackerCollapseUndiscovered", "gTrackers.EntranceTracker.CollapseUndiscovered" },
-        { MigrationAction::Rename, "gEntranceTrackerGroupBy", "gTrackers.EntranceTracker.GroupBy" },
-        { MigrationAction::Rename, "gEntranceTrackerHideReverseEntrances", "gTrackers.EntranceTracker.HideReverseEntrances" },
-        { MigrationAction::Rename, "gEntranceTrackerHighlightAvailable", "gTrackers.EntranceTracker.HighlightAvailable" },
-        { MigrationAction::Rename, "gEntranceTrackerHighlightPrevious", "gTrackers.EntranceTracker.HighlightPrevious" },
-        { MigrationAction::Rename, "gEntranceTrackerShowFrom", "gTrackers.EntranceTracker.ShowFrom" },
-        { MigrationAction::Rename, "gEntranceTrackerShowTo", "gTrackers.EntranceTracker.ShowTo" },
-        { MigrationAction::Rename, "gEntranceTrackerSortBy", "gTrackers.EntranceTracker.SortBy" },
-        { MigrationAction::Rename, "gCheckTrackerAreaCompleteHide", "gTrackers.CheckTracker.AreaComplete.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerAreaExtraCompleteColor", "gTrackers.CheckTracker.AreaComplete.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerAreaExtraIncompleteColor", "gTrackers.CheckTracker.AreaIncomplete.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerAreaIncompleteHide", "gTrackers.CheckTracker.AreaIncomplete.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerAreaMainCompleteColor", "gTrackers.CheckTracker.AreaComplete.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerAreaMainIncompleteColor", "gTrackers.CheckTracker.AreaIncomplete.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerBgColor", "gTrackers.CheckTracker.BgColor" },
-        { MigrationAction::Rename, "gCheckTrackerCollectedExtraColor", "gTrackers.CheckTracker.Collected.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerCollectedHide", "gTrackers.CheckTracker.Collected.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerCollectedMainColor", "gTrackers.CheckTracker.Collected.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerComboButton1", "gTrackers.CheckTracker.ComboButton1" },
-        { MigrationAction::Rename, "gCheckTrackerComboButton2", "gTrackers.CheckTracker.ComboButton2" },
-        { MigrationAction::Rename, "gCheckTrackerDisplayType", "gTrackers.CheckTracker.DisplayType" },
-        { MigrationAction::Rename, "gCheckTrackerHintedExtraColor", "gTrackers.CheckTracker.Hinted.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerHintedMainColor", "gTrackers.CheckTracker.Hinted.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerHintedHide", "gTrackers.CheckTracker.Hinted.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerHudEditMode", "gTrackers.CheckTracker.Draggable" },
-        { MigrationAction::Rename, "gCheckTrackerKnownHide", "gTrackers.CheckTracker.Scummed.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerOptionAlwaysShowGSLocs", "gTrackers.CheckTracker.AlwaysShowGSLocs" },
-        { MigrationAction::Rename, "gCheckTrackerOptionHideRightShopChecks", "gTrackers.CheckTracker.HideUnshuffledShopChecks" },
-        { MigrationAction::Rename, "gCheckTrackerOptionMQSpoilers", "gTrackers.CheckTracker.MQSpoilers" },
-        { MigrationAction::Rename, "gCheckTrackerOptionShowHidden", "gTrackers.CheckTracker.ShowHidden" },
-        { MigrationAction::Rename, "gCheckTrackerSavedExtraColor", "gTrackers.CheckTracker.Saved.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerSavedHide", "gTrackers.CheckTracker.Saved.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerSavedMainColor", "gTrackers.CheckTracker.Saved.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerScummedExtraColor", "gTrackers.CheckTracker.Scummed.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerScummedMainColor", "gTrackers.CheckTracker.Scummed.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerSeenExtraColor", "gTrackers.CheckTracker.Seen.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerSeenHide", "gTrackers.CheckTracker.Seen.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerSeenMainColor", "gTrackers.CheckTracker.Seen.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerShowOnlyPaused", "gTrackers.CheckTracker.ShowOnlyPaused" },
-        { MigrationAction::Rename, "gCheckTrackerSkippedExtraColor", "gTrackers.CheckTracker.Skipped.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerSkippedHide", "gTrackers.CheckTracker.Skipped.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerSkippedMainColor", "gTrackers.CheckTracker.Skipped.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerUncheckedExtraColor", "gTrackers.CheckTracker.Unchecked.ExtraColor" },
-        { MigrationAction::Rename, "gCheckTrackerUncheckedHide", "gTrackers.CheckTracker.Unchecked.Hide" },
-        { MigrationAction::Rename, "gCheckTrackerUncheckedMainColor", "gTrackers.CheckTracker.Unchecked.MainColor" },
-        { MigrationAction::Rename, "gCheckTrackerWindowType", "gTrackers.CheckTracker.WindowType" },
-        { MigrationAction::Rename, "gRandomize10GSHint", "gRandoSettings.10GSHint" },
-        { MigrationAction::Rename, "gRandomize20GSHint", "gRandoSettings.20GSHint" },
-        { MigrationAction::Rename, "gRandomize30GSHint", "gRandoSettings.30GSHint" },
-        { MigrationAction::Rename, "gRandomize40GSHint", "gRandoSettings.40GSHint" },
-        { MigrationAction::Rename, "gRandomize50GSHint", "gRandoSettings.50GSHint" },
-        { MigrationAction::Rename, "gRandomizeAllLocationsReachable", "gRandoSettings.AllLocationsReachable" },
-        { MigrationAction::Rename, "gRandomizeAltarHint", "gRandoSettings.AltarHint" },
-        { MigrationAction::Rename, "gRandomizeBigPoeTargetCount", "gRandoSettings.BigPoeTargetCount" },
-        { MigrationAction::Rename, "gRandomizeBlueFireArrows", "gRandoSettings.BlueFireArrows" },
-        { MigrationAction::Rename, "gRandomizeBombchusInLogic", "gRandoSettings.BombchusInLogic" },
-        { MigrationAction::Rename, "gRandomizeBossKeysanity", "gRandoSettings.BossKeysanity" },
-        { MigrationAction::Rename, "gRandomizeBridgeRewardOptions", "gRandoSettings.BridgeRewardOptions" },
-        { MigrationAction::Rename, "gRandomizeCompleteMaskQuest", "gRandoSettings.CompleteMaskQuest" },
-        { MigrationAction::Rename, "gRandomizeCuccosToReturn", "gRandoSettings.CuccosToReturn" },
-        { MigrationAction::Rename, "gRandomizeDampeHint", "gRandoSettings.DampeHint" },
-        { MigrationAction::Rename, "gRandomizeDecoupleEntrances", "gRandoSettings.DecoupleEntrances" },
-        { MigrationAction::Rename, "gRandomizeDoorOfTime", "gRandoSettings.DoorOfTime" },
-        { MigrationAction::Rename, "gRandomizeDungeonCount", "gRandoSettings.DungeonCount" },
-        { MigrationAction::Rename, "gRandomizeEnableBombchuDrops", "gRandoSettings.EnableBombchuDrops" },
-        { MigrationAction::Rename, "gRandomizeEnabledTricks", "gRandoSettings.EnabledTricks" },
-        { MigrationAction::Rename, "gRandomizeForest", "gRandoSettings.ClosedForest" },
-        { MigrationAction::Rename, "gRandomizeFrogsHint", "gRandoSettings.FrogsHint" },
-        { MigrationAction::Rename, "gRandomizeFullWallets", "gRandoSettings.FullWallets" },
-        { MigrationAction::Rename, "gRandomizeGanonTrial", "gRandoSettings.GanonTrial" },
-        { MigrationAction::Rename, "gRandomizeGanonTrialCount", "gRandoSettings.GanonTrialCount" },
-        { MigrationAction::Rename, "gRandomizeGerudoFortress", "gRandoSettings.FortressCarpenters" },
-        { MigrationAction::Rename, "gRandomizeGerudoKeys", "gRandoSettings.GerudoKeys" },
-        { MigrationAction::Rename, "gRandomizeGossipStoneHints", "gRandoSettings.GossipStoneHints" },
-        { MigrationAction::Rename, "gRandomizeGregHint", "gRandoSettings.GregHint" },
-        { MigrationAction::Rename, "gRandomizeGsExpectSunsSong", "gRandoSettings.GsExpectSunsSong" },
-        { MigrationAction::Rename, "gRandomizeHintClarity", "gRandoSettings.HintClarity" },
-        { MigrationAction::Rename, "gRandomizeHintDistribution", "gRandoSettings.HintDistribution" },
-        { MigrationAction::Rename, "gRandomizeIceTraps", "gRandoSettings.IceTraps" },
-        { MigrationAction::Rename, "gRandomizeItemPool", "gRandoSettings.ItemPool" },
-        { MigrationAction::Rename, "gRandomizeKakarikoGate", "gRandoSettings.KakarikoGate" },
-        { MigrationAction::Rename, "gRandomizeKeysanity", "gRandoSettings.Keysanity" },
-        { MigrationAction::Rename, "gRandomizeLAHint", "gRandoSettings.LAHint" },
-        { MigrationAction::Rename, "gRandomizeLacsDungeonCount", "gRandoSettings.LacsDungeonCount" },
-        { MigrationAction::Rename, "gRandomizeLacsMedallionCount", "gRandoSettings.LacsMedallionCount" },
-        { MigrationAction::Rename, "gRandomizeLacsRewardCount", "gRandoSettings.LacsRewardCount" },
-        { MigrationAction::Rename, "gRandomizeLacsRewardOptions", "gRandoSettings.LacsRewardOptions" },
-        { MigrationAction::Rename, "gRandomizeLacsStoneCount", "gRandoSettings.LacsStoneCount" },
-        { MigrationAction::Rename, "gRandomizeLacsTokenCount", "gRandoSettings.LacsTokenCount" },
-        { MigrationAction::Rename, "gRandomizeLinksPocket", "gRandoSettings.LinksPocket" },
-        { MigrationAction::Rename, "gRandomizeLogicRules", "gRandoSettings.LogicRules" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonCount", "gRandoSettings.MQDungeonCount" },
-        { MigrationAction::Rename, "gRandomizeMqDungeons", "gRandoSettings.MQDungeons" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsBottomOfTheWell", "gRandoSettings.MQDungeonsBottomOfTheWell" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsDekuTree", "gRandoSettings.MQDungeonsDekuTree" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsDodongosCavern", "gRandoSettings.MQDungeonsDodongosCavern" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsFireTemple", "gRandoSettings.MQDungeonsFireTemple" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsForestTemple", "gRandoSettings.MQDungeonsForestTemple" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsGTG", "gRandoSettings.MQDungeonsGTG" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsGanonsCastle", "gRandoSettings.MQDungeonsGanonsCastle" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsIceCavern", "gRandoSettings.MQDungeonsIceCavern" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsJabuJabu", "gRandoSettings.MQDungeonsJabuJabu" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsShadowTemple", "gRandoSettings.MQDungeonsShadowTemple" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsSpiritTemple", "gRandoSettings.MQDungeonsSpiritTemple" },
-        { MigrationAction::Rename, "gRandomizeMqDungeonsWaterTemple", "gRandoSettings.MQDungeonsWaterTemple" },
-        { MigrationAction::Rename, "gRandomizeMedallionCount", "gRandoSettings.MedallionCount" },
-        { MigrationAction::Rename, "gRandomizeMixBosses", "gRandoSettings.MixBosses" },
-        { MigrationAction::Rename, "gRandomizeMixDungeons", "gRandoSettings.MixDungeons" },
-        { MigrationAction::Rename, "gRandomizeMixGrottos", "gRandoSettings.MixGrottos" },
-        { MigrationAction::Rename, "gRandomizeMixInteriors", "gRandoSettings.MixInteriors" },
-        { MigrationAction::Rename, "gRandomizeMixOverworld", "gRandoSettings.MixOverworld" },
-        { MigrationAction::Rename, "gRandomizeMixedEntrances", "gRandoSettings.MixedEntrances" },
-        { MigrationAction::Rename, "gRandomizeRainbowBridge", "gRandoSettings.RainbowBridge" },
-        { MigrationAction::Rename, "gRandomizeRewardCount", "gRandoSettings.RewardCount" },
-        { MigrationAction::Rename, "gRandomizeSariaHint", "gRandoSettings.SariaHint" },
-        { MigrationAction::Rename, "gRandomizeScrubText", "gRandoSettings.ScrubText" },
-        { MigrationAction::Rename, "gRandomizeShopsanity", "gRandoSettings.Shopsanity" },
-        { MigrationAction::Rename, "gRandomizeShopsanityPrices", "gRandoSettings.ShopsanityPrices" },
-        { MigrationAction::Rename, "gRandomizeShopsanityPricesAffordable", "gRandoSettings.ShopsanityPricesAffordable" },
-        { MigrationAction::Rename, "gRandomizeShuffle100GSReward", "gRandoSettings.Shuffle100GSReward" },
-        { MigrationAction::Rename, "gRandomizeShuffleAdultTrade", "gRandoSettings.ShuffleAdultTrade" },
-        { MigrationAction::Rename, "gRandomizeShuffleBeans", "gRandoSettings.ShuffleBeans" },
-        { MigrationAction::Rename, "gRandomizeShuffleBossEntrances", "gRandoSettings.ShuffleBossEntrances" },
-        { MigrationAction::Rename, "gRandomizeShuffleCows", "gRandoSettings.ShuffleCows" },
-        { MigrationAction::Rename, "gRandomizeShuffleDungeonReward", "gRandoSettings.ShuffleDungeonReward" },
-        { MigrationAction::Rename, "gRandomizeShuffleDungeonsEntrances", "gRandoSettings.ShuffleDungeonsEntrances" },
-        { MigrationAction::Rename, "gRandomizeShuffleFrogSongRupees", "gRandoSettings.ShuffleFrogSongRupees" },
-        { MigrationAction::Rename, "gRandomizeShuffleGanonBossKey", "gRandoSettings.ShuffleGanonBossKey" },
-        { MigrationAction::Rename, "gRandomizeShuffleGerudoToken", "gRandoSettings.ShuffleGerudoToken" },
-        { MigrationAction::Rename, "gRandomizeShuffleGrottosEntrances", "gRandoSettings.ShuffleGrottosEntrances" },
-        { MigrationAction::Rename, "gRandomizeShuffleInteriorsEntrances", "gRandoSettings.ShuffleInteriorsEntrances" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRings", "gRandoSettings.ShuffleKeyRings" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsBottomOfTheWell", "gRandoSettings.ShuffleKeyRingsBottomOfTheWell" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsFireTemple", "gRandoSettings.ShuffleKeyRingsFireTemple" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsForestTemple", "gRandoSettings.ShuffleKeyRingsForestTemple" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGTG", "gRandoSettings.ShuffleKeyRingsGTG" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGanonsCastle", "gRandoSettings.ShuffleKeyRingsGanonsCastle" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGerudoFortress", "gRandoSettings.ShuffleKeyRingsGerudoFortress" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsRandomCount", "gRandoSettings.ShuffleKeyRingsRandomCount" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsShadowTemple", "gRandoSettings.ShuffleKeyRingsShadowTemple" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsSpiritTemple", "gRandoSettings.ShuffleKeyRingsSpiritTemple" },
-        { MigrationAction::Rename, "gRandomizeShuffleKeyRingsWaterTemple", "gRandoSettings.ShuffleKeyRingsWaterTemple" },
-        { MigrationAction::Rename, "gRandomizeShuffleKokiriSword", "gRandoSettings.ShuffleKokiriSword" },
-        { MigrationAction::Rename, "gRandomizeShuffleMasterSword", "gRandoSettings.ShuffleMasterSword" },
-        { MigrationAction::Rename, "gRandomizeShuffleMerchants", "gRandoSettings.ShuffleMerchants" },
-        { MigrationAction::Rename, "gRandomizeShuffleOcarinas", "gRandoSettings.ShuffleOcarinas" },
-        { MigrationAction::Rename, "gRandomizeShuffleOverworldEntrances", "gRandoSettings.ShuffleOverworldEntrances" },
-        { MigrationAction::Rename, "gRandomizeShuffleOverworldSpawns", "gRandoSettings.ShuffleOverworldSpawns" },
-        { MigrationAction::Rename, "gRandomizeShuffleOwlDrops", "gRandoSettings.ShuffleOwlDrops" },
-        { MigrationAction::Rename, "gRandomizeShuffleScrubs", "gRandoSettings.ShuffleScrubs" },
-        { MigrationAction::Rename, "gRandomizeShuffleSongs", "gRandoSettings.ShuffleSongs" },
-        { MigrationAction::Rename, "gRandomizeShuffleTokens", "gRandoSettings.ShuffleTokens" },
-        { MigrationAction::Rename, "gRandomizeShuffleWarpSongs", "gRandoSettings.ShuffleWarpSongs" },
-        { MigrationAction::Rename, "gRandomizeShuffleWeirdEgg", "gRandoSettings.ShuffleWeirdEgg" },
-        { MigrationAction::Rename, "gRandomizeSkipChildZelda", "gRandoSettings.SkipChildZelda" },
-        { MigrationAction::Rename, "gRandomizeSkipEponaRace", "gRandoSettings.SkipEponaRace" },
-        { MigrationAction::Rename, "gRandomizeSkipScarecrowsSong", "gRandoSettings.SkipScarecrowsSong" },
-        { MigrationAction::Rename, "gRandomizeSkipTowerEscape", "gRandoSettings.SkipTowerEscape" },
-        { MigrationAction::Rename, "gRandomizeStartingAge", "gRandoSettings.StartingAge" },
-        { MigrationAction::Rename, "gRandomizeStartingBoleroOfFire", "gRandoSettings.StartingBoleroOfFire" },
-        { MigrationAction::Rename, "gRandomizeStartingConsumables", "gRandoSettings.StartingConsumables" },
-        { MigrationAction::Rename, "gRandomizeStartingDekuShield", "gRandoSettings.StartingDekuShield" },
-        { MigrationAction::Rename, "gRandomizeStartingEponasSong", "gRandoSettings.StartingEponasSong" },
-        { MigrationAction::Rename, "gRandomizeStartingKokiriSword", "gRandoSettings.StartingKokiriSword" },
-        { MigrationAction::Rename, "gRandomizeStartingMapsCompasses", "gRandoSettings.StartingMapsCompasses" },
-        { MigrationAction::Rename, "gRandomizeStartingMinuetOfForest", "gRandoSettings.StartingMinuetOfForest" },
-        { MigrationAction::Rename, "gRandomizeStartingNocturneOfShadow", "gRandoSettings.StartingNocturneOfShadow" },
-        { MigrationAction::Rename, "gRandomizeStartingOcarina", "gRandoSettings.StartingOcarina" },
-        { MigrationAction::Rename, "gRandomizeStartingPreludeOfLight", "gRandoSettings.StartingPreludeOfLight" },
-        { MigrationAction::Rename, "gRandomizeStartingRequiemOfSpirit", "gRandoSettings.StartingRequiemOfSpirit" },
-        { MigrationAction::Rename, "gRandomizeStartingSariasSong", "gRandoSettings.StartingSariasSong" },
-        { MigrationAction::Rename, "gRandomizeStartingSerenadeOfWater", "gRandoSettings.StartingSerenadeOfWater" },
-        { MigrationAction::Rename, "gRandomizeStartingSkulltulaToken", "gRandoSettings.StartingSkulltulaToken" },
-        { MigrationAction::Rename, "gRandomizeStartingSongOfStorms", "gRandoSettings.StartingSongOfStorms" },
-        { MigrationAction::Rename, "gRandomizeStartingSongOfTime", "gRandoSettings.StartingSongOfTime" },
-        { MigrationAction::Rename, "gRandomizeStartingSunsSong", "gRandoSettings.StartingSunsSong" },
-        { MigrationAction::Rename, "gRandomizeStartingZeldasLullaby", "gRandoSettings.StartingZeldasLullaby" },
-        { MigrationAction::Rename, "gRandomizeStoneCount", "gRandoSettings.StoneCount" },
-        { MigrationAction::Rename, "gRandomizeSunlightArrows", "gRandoSettings.SunlightArrows" },
-        { MigrationAction::Rename, "gRandomizeTokenCount", "gRandoSettings.TokenCount" },
-        { MigrationAction::Rename, "gRandomizeTriforceHunt", "gRandoSettings.TriforceHunt" },
-        { MigrationAction::Rename, "gRandomizeTriforceHuntRequiredPieces", "gRandoSettings.TriforceHuntRequiredPieces" },
-        { MigrationAction::Rename, "gRandomizeTriforceHuntTotalPieces", "gRandoSettings.TriforceHuntTotalPieces" },
-        { MigrationAction::Rename, "gRandomizeWarpSongText", "gRandoSettings.WarpSongText" },
-        { MigrationAction::Rename, "gRandomizeZorasFountain", "gRandoSettings.ZorasFountain" },
-        { MigrationAction::Rename, "gLoadedPreset", "gRandoSettings.LoadedPreset" },
-        { MigrationAction::Rename, "gRandoRelevantNavi", "gRandoEnhancements.RandoRelevantNavi" },
-        { MigrationAction::Rename, "gRandomizeRupeeNames", "gRandoEnhancements.RandomizeRupeeNames" },
-        { MigrationAction::Rename, "gRandoMatchKeyColors", "gRandoEnhancements.MatchKeyColors" },
-        { MigrationAction::Rename, "gRandoQuestItemFanfares", "gRandoEnhancements.QuestItemFanfares" },
-        { MigrationAction::Rename, "gInputEnabled", "gOpenWindows.InputViewer" },
-        { MigrationAction::Rename, "gOpenMenuBar", "gSettings.OpenMenuBar" },
-        { MigrationAction::Rename, "gRandomizeSkipChildStealth", "gRandoSettings.SkipChildStealth" },
-        { MigrationAction::Rename, "gRandomizeExcludedLocations", "gRandoSettings.ExcludedLocations" },
-        { MigrationAction::Rename, "gAltAssets", "gEnhancements.AltAssets" },
-        { MigrationAction::Rename, "gMSAAValue", "gSettings.MSAAValue" },
-        { MigrationAction::Rename, "gInternalResolution", "gSettings.InternalResolution" },
-        { MigrationAction::Rename, "gTextureFilter", "gSettings.TextureFilter" },
-        { MigrationAction::Rename, "gVsyncEnabled", "gSettings.VsyncEnabled" },
-        { MigrationAction::Rename, "gControlNav", "gSettings.ControlNav" },
-        { MigrationAction::Rename, "gEnableMultiViewports", "gSettings.EnableMultiViewports" },
-        { MigrationAction::Rename, "gOverlayFont", "gSettings.OverlayFont" },
-        { MigrationAction::Rename, "gCrowdControl", "gRemote.CrowdControl" },
-        { MigrationAction::Remove, "gItemTrackerNotes0" },
-        { MigrationAction::Remove, "gItemTrackerNotes1" },
-        { MigrationAction::Remove, "gItemTrackerNotes2" },
-        { MigrationAction::Remove, "gHideBuildInfo" },
-        { MigrationAction::Remove, "gGameControlEditorEnabled" },
-        { MigrationAction::Remove, "gPreset0" },
-        { MigrationAction::Remove, "gPreset1" },
-    };
-}
+std::vector<Migration> version3Migrations = {
+    { MigrationAction::Rename, "gSwitchAge", "gGeneral.SwitchAge" },
+    { MigrationAction::Rename, "gFrameAdvance", "gDeveloperTools.FrameAdvanceTick" },
+    { MigrationAction::Rename, "gRandoGenerating", "gGeneral.RandoGenerating" },
+    { MigrationAction::Rename, "gNewSeedGenerated", "gGeneral.NewSeedGenerated" },
+    { MigrationAction::Rename, "gOnFileSelectNameEntry", "gGeneral.OnFileSelectNameEntry" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreenMQMode", "gGeneral.BetterDebugWarpScreenMQMode" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreenMQModeScene", "gGeneral.BetterDebugWarpScreenMQModeScene" },
+    { MigrationAction::Rename, "gCheatEasyPauseBufferLastInputs", "gGeneral.CheatEasyPauseBufferLastInputs" },
+    { MigrationAction::Rename, "gCheatEasyPauseBufferTimer", "gGeneral.CheatEasyPauseBufferTimer" },
+    { MigrationAction::Rename, "gRandomizerNewFileDropped", "gGeneral.RandomizerNewFileDropped" },
+    { MigrationAction::Rename, "gRandomizerDroppedFile", "gGeneral.RandomizerDroppedFile" },
+    { MigrationAction::Rename, "gLetItSnow", "gGeneral.LetItSnow" },
+    { MigrationAction::Rename, "gPrevTime", "gGeneral.PrevTime" },
+    { MigrationAction::Rename, "gSwitchTimeline", "gGeneral.SwitchTimeline" },
+    { MigrationAction::Rename, "gSpoilerLog", "gGeneral.SpoilerLog" },
+    { MigrationAction::Rename, "gRestoreQPA", "gGeneral.RestoreQPA" },
+    { MigrationAction::Rename, "gFixIceTrapWithBunnyHood", "gGeneral.FixIceTrapWithBunnyHood" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreenCurrentScene", "gGeneral.BetterDebugWarpScreenCurrentScene" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreenTopDisplayedScene",
+      "gGeneral.BetterDebugWarpScreenTopDisplayedScene" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreenPageDownIndex", "gGeneral.BetterDebugWarpScreenPageDownIndex" },
+    { MigrationAction::Rename, "gActorViewerEnabled", "gOpenWindows.ActorViewer" },
+    { MigrationAction::Rename, "gAdvancedResolutionEditorEnabled", "gOpenWindows.AdvancedResolutionEditor" },
+    { MigrationAction::Rename, "gAudioEditor.WindowOpen", "gOpenWindows.AudioEditor" },
+    { MigrationAction::Rename, "gCheckTrackerEnabled", "gOpenWindows.CheckTracker" },
+    { MigrationAction::Rename, "gCheckTrackerSettingsEnabled", "gOpenWindows.CheckTrackerSettings" },
+    { MigrationAction::Rename, "gCollisionViewerEnabled", "gOpenWindows.CollisionViewer" },
+    { MigrationAction::Rename, "gCosmeticsEditorEnabled", "gOpenWindows.CosmeticsEditor" },
+    { MigrationAction::Rename, "gDLViewerEnabled", "gOpenWindows.DisplayListViewer" },
+    { MigrationAction::Rename, "gEntranceTrackerEnabled", "gOpenWindows.EntranceTracker" },
+    { MigrationAction::Rename, "gGameplayStatsEnabled", "gOpenWindows.GameplayStats" },
+    { MigrationAction::Rename, "gItemTrackerEnabled", "gOpenWindows.ItemTracker" },
+    { MigrationAction::Rename, "gItemTrackerSettingsEnabled", "gOpenWindows.ItemTrackerSettings" },
+    { MigrationAction::Rename, "gMessageViewerEnabled", "gOpenWindows.MessageViewer" },
+    { MigrationAction::Rename, "gRandomizerSettingsEnabled", "gOpenWindows.RandomizerSettings" },
+    { MigrationAction::Rename, "gSaveEditorEnabled", "gOpenWindows.SaveEditor" },
+    { MigrationAction::Rename, "gValueViewer.WindowOpen", "gOpenWindows.ValueViewer" },
+    { MigrationAction::Rename, "gConsoleEnabled", "gOpenWindows.Console" },
+    { MigrationAction::Rename, "gControllerConfigurationEnabled", "gOpenWindows.ControllerConfiguration" },
+    { MigrationAction::Rename, "gControllerDisconnectedWindowEnabled", "gOpenWindows.ControllerDisconnectedWindow" },
+    { MigrationAction::Rename, "gControllerReorderingWindowEnabled", "gOpenWindows.ControllerReorderingWindow" },
+    { MigrationAction::Rename, "gGfxDebuggerEnabled", "gOpenWindows.GfxDebugger" },
+    { MigrationAction::Rename, "gStatsEnabled", "gOpenWindows.Stats" },
+    { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
+    { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
+    { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
+    { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },
+    { MigrationAction::Rename, "gA11yTTS", "gSettings.A11yTTS" },
+    { MigrationAction::Rename, "gLanguages", "gSettings.Languages" },
+    { MigrationAction::Rename, "gMatchRefreshRate", "gSettings.MatchRefreshRate" },
+    { MigrationAction::Rename, "gSimulatedInputLag", "gSettings.SimulatedInputLag" },
+    { MigrationAction::Rename, "gInterpolationFPS", "gSettings.InterpolationFPS" },
+    { MigrationAction::Rename, "gLowResMode", "gSettings.LowResMode" },
+    { MigrationAction::Rename, "gZFightingMode", "gSettings.ZFightingMode" },
+    { MigrationAction::Rename, "gDisableChangingSettings", "gSettings.DisableChanges" },
+    { MigrationAction::Rename, "gExtraLatencyThreshold", "gSettings.ExtraLatencyThreshold" },
+    { MigrationAction::Rename, "gImGuiScale", "gSettings.ImGuiScale" },
+    { MigrationAction::Rename, "gTitleScreenTranslation", "gSettings.TitleScreenTranslation" },
+    { MigrationAction::Rename, "gA11yTTS", "gSettings.A11yTTS" },
+    { MigrationAction::Rename, "gLanguages", "gSettings.Languages" },
+    { MigrationAction::Rename, "gMatchRefreshRate", "gSettings.MatchRefreshRate" },
+    { MigrationAction::Rename, "gInterpolationFPS", "gSettings.InterpolationFPS" },
+    { MigrationAction::Rename, "gLedColorSource", "gSettings.LEDColorSource" },
+    { MigrationAction::Rename, "gLedPort1Color", "gSettings.LEDPort1Color" },
+    { MigrationAction::Rename, "gLedBrightness", "gSettings.LEDBrightness" },
+    { MigrationAction::Rename, "gLedCriticalOverride", "gSettings.LEDCriticalOverride" },
+    { MigrationAction::Rename, "gOcarinaD5BtnMap", "gSettings.CustomOcarina.D5Button" },
+    { MigrationAction::Rename, "gOcarinaB4BtnMap", "gSettings.CustomOcarina.B4Button" },
+    { MigrationAction::Rename, "gOcarinaA4BtnMap", "gSettings.CustomOcarina.A4Button" },
+    { MigrationAction::Rename, "gOcarinaF4BtnMap", "gSettings.CustomOcarina.F4Button" },
+    { MigrationAction::Rename, "gOcarinaD4BtnMap", "gSettings.CustomOcarina.D4Button" },
+    { MigrationAction::Rename, "gOcarinaDisableBtnMap", "gSettings.CustomOcarina.DisableButton" },
+    { MigrationAction::Rename, "gOcarinaSharpBtnMap", "gSettings.CustomOcarina.SharpButton" },
+    { MigrationAction::Rename, "gOcarinaFlatBtnMap", "gSettings.CustomOcarina.FlatButton" },
+    { MigrationAction::Rename, "gCustomOcarinaControls", "gSettings.CustomOcarina.Enabled" },
+    { MigrationAction::Rename, "gDpadOcarina", "gSettings.OcarinaControl.Dpad" },
+    { MigrationAction::Rename, "gRStickOcarina", "gSettings.OcarinaControl.Rstick" },
+    { MigrationAction::Rename, "gRightStickAiming", "gSettings.Controls.RightStickAim" },
+    { MigrationAction::Rename, "gInvertAimingXAxis", "gSettings.Controls.InvertAimingXAxis" },
+    { MigrationAction::Rename, "gInvertAimingYAxis", "gSettings.Controls.InvertAimingYAxis" },
+    { MigrationAction::Rename, "gInvertShieldAimingYAxis", "gSettings.Controls.InvertShieldAimingYAxis" },
+    { MigrationAction::Rename, "gInvertShieldAimingXAxis", "gSettings.Controls.InvertShieldAimingYAxis" },
+    { MigrationAction::Rename, "gInvertZAimingYAxis", "gSettings.Controls.InvertZAimingYAxis" },
+    { MigrationAction::Rename, "gDisableAutoCenterViewFirstPerson", "gSettings.DisableFirstPersonAutoCenterView" },
+    { MigrationAction::Rename, "gEnableFirstPersonSensitivity", "gSettings.FirstPersonCameraSensitivity.Enabled" },
+    { MigrationAction::Rename, "gFirstPersonCameraSensitivityX", "gSettings.FirstPersonCameraSensitivity.X" },
+    { MigrationAction::Rename, "gFirstPersonCameraSensitivityY", "gSettings.FirstPersonCameraSensitivity.Y" },
+    { MigrationAction::Rename, "gFreeCamera", "gSettings.FreeLook.Enabled" },
+    { MigrationAction::Rename, "gInvertXAxis", "gSettings.FreeLook.InvertXAxis" },
+    { MigrationAction::Rename, "gInvertYAxis", "gSettings.FreeLook.InvertYAxis" },
+    { MigrationAction::Rename, "gThirdPersonCameraSensitivityX", "gSettings.FreeLook.CameraSensitivity.X" },
+    { MigrationAction::Rename, "gThirdPersonCameraSensitivityY", "gSettings.FreeLook.CameraSensitivity.Y" },
+    { MigrationAction::Rename, "gFreeCameraDistMax", "gSettings.FreeLook.MaxCameraDistance" },
+    { MigrationAction::Rename, "gFreeCameraTransitionSpeed", "gSettings.FreeLook.TransitionSpeed" },
+    { MigrationAction::Rename, "gDpadPause", "gSettings.DpadOnPause" },
+    { MigrationAction::Rename, "gDpadText", "gSettings.DpadInText" },
+    { MigrationAction::Rename, "gPauseAnyCursor", "gEnhancements.PauseAnyCursor" },
+    { MigrationAction::Rename, "gEnableWalkModify", "gSettings.WalkModifier.Enabled" },
+    { MigrationAction::Rename, "gWalkSpeedToggle", "gSettings.WalkModifier.SpeedToggle" },
+    { MigrationAction::Rename, "gWalkModifierDoesntChangeJump", "gSettings.WalkModifier.DoesntChangeJump" },
+    { MigrationAction::Rename, "gWalkModifierOne", "gSettings.WalkModifier.Mapping1" },
+    { MigrationAction::Rename, "gWalkModifierTwo", "gSettings.WalkModifier.Mapping2" },
+    { MigrationAction::Rename, "gSwimModifierOne", "gSettings.WalkModifier.SwimMapping1" },
+    { MigrationAction::Rename, "gSwimModifierTwo", "gSettings.WalkModifier.SwimMapping2" },
+    { MigrationAction::Rename, "gNaviOnL", "gEnhancements.NaviOnL" },
+    { MigrationAction::Rename, "gDpadEquips", "gEnhancements.DpadEquips" },
+    { MigrationAction::Rename, "gMoveWhileFirstPerson", "gSettings.MoveInFirstPerson" },
+    { MigrationAction::Rename, "gA11yDisableIdleCam", "gSettings.A11yDisableIdleCam" },
+    { MigrationAction::Rename, "gDpadHoldChange", "gSettings.DpadHoldChange" },
+    { MigrationAction::Rename, "gAddTraps.Ammo", "gEnhancements.ExtraTraps.Ammo" },
+    { MigrationAction::Rename, "gAddTraps.Bomb", "gEnhancements.ExtraTraps.Bomb" },
+    { MigrationAction::Rename, "gAddTraps.Burn", "gEnhancements.ExtraTraps.Burn" },
+    { MigrationAction::Rename, "gAddTraps.Ice", "gEnhancements.ExtraTraps.Ice" },
+    { MigrationAction::Rename, "gAddTraps.Kill", "gEnhancements.ExtraTraps.Kill" },
+    { MigrationAction::Rename, "gAddTraps.Knock", "gEnhancements.ExtraTraps.Knockback" },
+    { MigrationAction::Rename, "gAddTraps.Shock", "gEnhancements.ExtraTraps.Shock" },
+    { MigrationAction::Rename, "gAddTraps.Speed", "gEnhancements.ExtraTraps.Speed" },
+    { MigrationAction::Rename, "gAddTraps.Tele", "gEnhancements.ExtraTraps.Teleport" },
+    { MigrationAction::Rename, "gAddTraps.Void", "gEnhancements.ExtraTraps.Void" },
+    { MigrationAction::Rename, "gAddTraps.enabled", "gEnhancements.ExtraTraps.Enabled" },
+    { MigrationAction::Rename, "gAdultBunnyHood", "gEnhancements.AdultBunnyHood" },
+    { MigrationAction::Rename, "gAdultMinimumWeightFish", "gEnhancements.MinimumFishWeightAdult" },
+    { MigrationAction::Rename, "gAdultShootingGalleryAmmunition", "gEnhancements.ShootingGalleryAmmoAdult" },
+    { MigrationAction::Rename, "gAllDogsRichard", "gEnhancements.AllDogsRichard" },
+    { MigrationAction::Rename, "gAlwaysShowDungeonMinimapIcon", "gEnhancements.AlwaysShowDungeonMinimapIcon" },
+    { MigrationAction::Rename, "gAnubisFix", "gEnhancements.AnubisFix" },
+    { MigrationAction::Rename, "gAskToEquip", "gEnhancements.AskToEquip" },
+    { MigrationAction::Rename, "gAssignableTunicsAndBoots", "gEnhancements.AssignableTunicsAndBoots" },
+    { MigrationAction::Rename, "gAuthenticLogo", "gEnhancements.AuthenticLogo" },
+    { MigrationAction::Rename, "gBetterFW", "gEnhancements.BetterFarore" },
+    { MigrationAction::Rename, "gBetterOwl", "gEnhancements.BetterOwl" },
+    { MigrationAction::Rename, "gBlueFireArrows", "gEnhancements.BlueFireArrows" },
+    { MigrationAction::Rename, "gBombchuBowlingAmmunition", "gEnhancements.BombchuBowlingAmmo" },
+    { MigrationAction::Rename, "gBombchuBowlingNoBigCucco", "gEnhancements.BombchuBowlingNoBigCucco" },
+    { MigrationAction::Rename, "gBombchuBowlingNoSmallCucco", "gEnhancements.BombchuBowlingNoSmallCucco" },
+    { MigrationAction::Rename, "gBombchuDrops", "gEnhancements.BombchuDrops" },
+    { MigrationAction::Rename, "gBombchusOOB", "gEnhancements.BombchusOOB" },
+    { MigrationAction::Rename, "gBonkDamageMul", "gEnhancements.BonkDamageMult" },
+    { MigrationAction::Rename, "gBowReticle", "gEnhancements.BowReticle" },
+    { MigrationAction::Rename, "gBowSlingShotAmmoFix", "gEnhancements.BowSlingshotAmmoFix" },
+    { MigrationAction::Rename, "gBushDropFix", "gEnhancements.BushDropFix" },
+    { MigrationAction::Rename, "gChestSizeAndTextureMatchesContents",
+      "gEnhancements.ChestSizeAndTextureMatchContents" },
+    { MigrationAction::Rename, "gChestSizeDependsStoneOfAgony", "gEnhancements.ChestSizeDependsStoneOfAgony" },
+    { MigrationAction::Rename, "gChildMinimumWeightFish", "gEnhancements.MinimumFishWeightChild" },
+    { MigrationAction::Rename, "gChildShootingGalleryAmmunition", "gEnhancements.ShootingGalleryAmmoChild" },
+    { MigrationAction::Rename, "gClimbSpeed", "gEnhancements.ClimbSpeed" },
+    { MigrationAction::Rename, "gConstantAdultGallery", "gEnhancements.ConstantAdultGallery" },
+    { MigrationAction::Rename, "gCowOfTime", "gEnhancements.CowOfTime" },
+    { MigrationAction::Rename, "gCrawlSpeed", "gEnhancements.CrawlSpeed" },
+    { MigrationAction::Rename, "gCreditsFix", "gEnhancements.CreditsFix" },
+    { MigrationAction::Rename, "gCrouchStabFix", "gEnhancements.CrouchStabFix" },
+    { MigrationAction::Rename, "gCrouchStabHammerFix", "gEnhancements.CrouchStabHammerFix" },
+    { MigrationAction::Rename, "gCuccoStayDurationMultiplier", "gEnhancements.CuccoStayDurationMult" },
+    { MigrationAction::Rename, "gCustomizeBombchuBowling", "gEnhancements.CustomizeBombchuBowling" },
+    { MigrationAction::Rename, "gCustomizeFishing", "gEnhancements.CustomizeFishing" },
+    { MigrationAction::Rename, "gCustomizeOcarinaGame", "gEnhancements.CustomizeOcarinaGame" },
+    { MigrationAction::Rename, "gCustomizeShootingGallery", "gEnhancements.CustomizeShootingGallery" },
+    { MigrationAction::Rename, "gDamageMul", "gEnhancements.DamageMult" },
+    { MigrationAction::Rename, "gDampeAllNight", "gEnhancements.DampeAllNight" },
+    { MigrationAction::Rename, "gDampeWin", "gEnhancements.DampeWin" },
+    { MigrationAction::Rename, "gDashInterval", "gEnhancements.RupeeDashInterval" },
+    { MigrationAction::Rename, "gDayGravePull", "gEnhancements.DayGravePull" },
+    { MigrationAction::Rename, "gDekuNutUpgradeFix", "gEnhancements.DekuNutUpgradeFix" },
+    { MigrationAction::Rename, "gDeleteFileOnDeath", "gEnhancements.DeleteFileOnDeath" },
+    { MigrationAction::Rename, "gDisableBlackBars", "gEnhancements.DisableBlackBars" },
+    { MigrationAction::Rename, "gDisableBombBillboarding", "gEnhancements.DisableBombBillboarding" },
+    { MigrationAction::Rename, "gDisableCritWiggle", "gEnhancements.DisableCritWiggle" },
+    { MigrationAction::Rename, "gDisableDrawDistance", "gEnhancements.DisableDrawDistance" },
+    { MigrationAction::Rename, "gDisableFirstPersonChus", "gEnhancements.DisableFirstPersonChus" },
+    { MigrationAction::Rename, "gDisableGrottoRotation", "gEnhancements.DisableGrottoRotation" },
+    { MigrationAction::Rename, "gDisableKokiriDrawDistance", "gEnhancements.DisableKokiriDrawDistance" },
+    { MigrationAction::Rename, "gDisableLOD", "gEnhancements.DisableLOD" },
+    { MigrationAction::Rename, "gDisableNaviCallAudio", "gAudioEditor.DisableNaviCallAudio" },
+    { MigrationAction::Rename, "gDisableTunicWarningText", "gEnhancements.DisableTunicWarningText" },
+    { MigrationAction::Rename, "gDogFollowsEverywhere", "gEnhancements.DogFollowsEverywhere" },
+    { MigrationAction::Rename, "gDpadNoDropOcarinaInput", "gEnhancements.DpadNoDropOcarinaInput" },
+    { MigrationAction::Rename, "gDrawLineupTick", "gEnhancements.DrawLineupTick" },
+    { MigrationAction::Rename, "gDynamicWalletIcon", "gEnhancements.DynamicWalletIcon" },
+    { MigrationAction::Rename, "gEnemyHealthBar", "gEnhancements.EnemyHealthBar" },
+    { MigrationAction::Rename, "gEnemySizeScalesHealth", "gEnhancements.EnemySizeScalesHealth" },
+    { MigrationAction::Rename, "gEnemySpawnsOverWaterboxes", "gEnhancements.EnemySpawnsOverWaterboxes" },
+    { MigrationAction::Rename, "gEquipmentCanBeRemoved", "gEnhancements.EquipmentCanBeRemoved" },
+    { MigrationAction::Rename, "gFPSGauntlets", "gEnhancements.FirstPersonGauntlets" },
+    { MigrationAction::Rename, "gFallDamageMul", "gEnhancements.FallDamageMult" },
+    { MigrationAction::Rename, "gFastBoomerang", "gEnhancements.FastBoomerang" },
+    { MigrationAction::Rename, "gFastChests", "gEnhancements.FastChests" },
+    { MigrationAction::Rename, "gFastDrops", "gEnhancements.FastDrops" },
+    { MigrationAction::Rename, "gFastFarores", "gEnhancements.FastFarores" },
+    { MigrationAction::Rename, "gFastOcarinaPlayback", "gEnhancements.FastOcarinaPlayback" },
+    { MigrationAction::Rename, "gFasterBlockPush", "gEnhancements.FasterBlockPush" },
+    { MigrationAction::Rename, "gFasterHeavyBlockLift", "gEnhancements.FasterHeavyBlockLift" },
+    { MigrationAction::Rename, "gFileSelectMoreInfo", "gEnhancements.FileSelectMoreInfo" },
+    { MigrationAction::Rename, "gFishNeverEscape", "gEnhancements.FishNeverEscape" },
+    { MigrationAction::Rename, "gFixCameraDrift", "gEnhancements.FixCameraDrift" },
+    { MigrationAction::Rename, "gFixCameraSwing", "gEnhancements.FixCameraSwing" },
+    { MigrationAction::Rename, "gFixDungeonMinimapIcon", "gEnhancements.FixDungeonMinimapIcon" },
+    { MigrationAction::Rename, "gFixEyesOpenWhileSleeping", "gEnhancements.FixEyesOpenWhileSleeping" },
+    { MigrationAction::Rename, "gFixHangingLedgeSwingRate", "gEnhancements.FixHangingLedgeSwingRate" },
+    { MigrationAction::Rename, "gFixSawSoftlock", "gEnhancements.FixSawSoftlock" },
+    { MigrationAction::Rename, "gFixTexturesOOB", "gEnhancements.FixTexturesOOB" },
+    { MigrationAction::Rename, "gFixVineFall", "gEnhancements.FixVineFall" },
+    { MigrationAction::Rename, "gFixZoraHintDialogue", "gEnhancements.FixZoraHintDialogue" },
+    { MigrationAction::Rename, "gForgeTime", "gEnhancements.ForgeTime" },
+    { MigrationAction::Rename, "gFullHealthSpawn", "gEnhancements.FullHealthSpawn" },
+    { MigrationAction::Rename, "gGerudoWarriorClothingFix", "gEnhancements.GerudoWarriorClothingFix" },
+    { MigrationAction::Rename, "gGoronPot", "gEnhancements.GoronPot" },
+    { MigrationAction::Rename, "gGravediggingTourFix", "gEnhancements.GravediggingTourFix" },
+    { MigrationAction::Rename, "gGsCutscene", "gEnhancements.GSCutscene" },
+    { MigrationAction::Rename, "gGuaranteeFishingBite", "gEnhancements.GuaranteeFishingBite" },
+    { MigrationAction::Rename, "gGuardVision", "gEnhancements.GuardVision" },
+    { MigrationAction::Rename, "gHideBunnyHood", "gEnhancements.HideBunnyHood" },
+    { MigrationAction::Rename, "gHookshotableReticle", "gEnhancements.HookshotableReticle" },
+    { MigrationAction::Rename, "gHoverFishing", "gEnhancements.HoverFishing" },
+    { MigrationAction::Rename, "gHurtContainer", "gEnhancements.HurtContainer" },
+    { MigrationAction::Rename, "gHyperBosses", "gEnhancements.HyperBosses" },
+    { MigrationAction::Rename, "gHyperEnemies", "gEnhancements.HyperEnemies" },
+    { MigrationAction::Rename, "gInstantFishing", "gEnhancements.InstantFishing" },
+    { MigrationAction::Rename, "gInstantOcarinaGameWin", "gEnhancements.InstantOcarinaGameWin" },
+    { MigrationAction::Rename, "gInstantPutaway", "gEnhancements.InstantPutaway" },
+    { MigrationAction::Rename, "gInstantShootingGalleryWin", "gEnhancements.InstantShootingGalleryWin" },
+    { MigrationAction::Rename, "gIvanCoopModeEnabled", "gEnhancements.IvanCoopModeEnabled" },
+    { MigrationAction::Rename, "gLinkDefaultName", "gEnhancements.LinkDefaultName" },
+    { MigrationAction::Rename, "gLowHpAlarm", "gAudioEditor.LowHpAlarm" },
+    { MigrationAction::Rename, "gMMBunnyHood", "gEnhancements.MMBunnyHood" },
+    { MigrationAction::Rename, "gMarketSneak", "gEnhancements.MarketSneak" },
+    { MigrationAction::Rename, "gMaskSelect", "gEnhancements.MaskSelect" },
+    { MigrationAction::Rename, "gMinFrameCount", "gEnhancements.MinFrameCount" },
+    { MigrationAction::Rename, "gMinimalUI", "gEnhancements.MinimalUI" },
+    { MigrationAction::Rename, "gMirroredWorldMode", "gEnhancements.MirroredWorldMode" },
+    { MigrationAction::Rename, "gMweepSpeed", "gEnhancements.MweepSpeed" },
+    { MigrationAction::Rename, "gN64WeirdFrames", "gEnhancements.N64WeirdFrames" },
+    { MigrationAction::Rename, "gNGCKaleidoSwitcher", "gEnhancements.NGCKaleidoSwitcher" },
+    { MigrationAction::Rename, "gNaviTextFix", "gEnhancements.NaviTextFix" },
+    { MigrationAction::Rename, "gNewDrops", "gEnhancements.NewDrops" },
+    { MigrationAction::Rename, "gNightGSAlwaysSpawn", "gEnhancements.NightGSAlwaysSpawn" },
+    { MigrationAction::Rename, "gNoForcedNavi", "gEnhancements.NoForcedNavi" },
+    { MigrationAction::Rename, "gNoHUDHeartAnimation", "gEnhancements.NoHUDHeartAnimation" },
+    { MigrationAction::Rename, "gNoHeartDrops", "gEnhancements.NoHeartDrops" },
+    { MigrationAction::Rename, "gNoInputForCredits", "gEnhancements.NoInputForCredits" },
+    { MigrationAction::Rename, "gNoRandomDrops", "gEnhancements.NoRandomDrops" },
+    { MigrationAction::Rename, "gNutsExplodeBombs", "gEnhancements.NutsExplodeBombs" },
+    { MigrationAction::Rename, "gOcarinaGameNoteSpeed", "gEnhancements.OcarinaGameNoteSpeed" },
+    { MigrationAction::Rename, "gOcarinaGameRoundOneNotes", "gEnhancements.OcarinaGameRoundOneNotes" },
+    { MigrationAction::Rename, "gOcarinaGameRoundThreeNotes", "gEnhancements.OcarinaGameRoundThreeNotes" },
+    { MigrationAction::Rename, "gOcarinaGameRoundTwoNotes", "gEnhancements.OcarinaGameRoundTwoNotes" },
+    { MigrationAction::Rename, "gOcarinaGameStartingNotes", "gEnhancements.OcarinaGameStartingNotes" },
+    { MigrationAction::Rename, "gOcarinaUnlimitedFailTime", "gEnhancements.OcarinaUnlimitedFailTime" },
+    { MigrationAction::Rename, "gPauseWarp", "gEnhancements.PauseWarp" },
+    { MigrationAction::Rename, "gPermanentHeartLoss", "gEnhancements.PermanentHeartLoss" },
+    { MigrationAction::Rename, "gQuickBongoKill", "gEnhancements.QuickBongoKill" },
+    { MigrationAction::Rename, "gQuickPutaway", "gEnhancements.QuickPutaway" },
+    { MigrationAction::Rename, "gQuitFishingAtDoor", "gEnhancements.QuitFishingAtDoor" },
+    { MigrationAction::Rename, "gRandomizedEnemies", "gEnhancements.RandomizedEnemies" },
+    { MigrationAction::Rename, "gRandomizedEnemySizes", "gEnhancements.RandomizedEnemySizes" },
+    { MigrationAction::Rename, "gRedGanonBlood", "gEnhancements.RedGanonBlood" },
+    { MigrationAction::Rename, "gRememberSaveLocation", "gEnhancements.RememberSaveLocation" },
+    { MigrationAction::Rename, "gRemoveExplosiveLimit", "gEnhancements.RemoveExplosiveLimit" },
+    { MigrationAction::Rename, "gRestoreRBAValues", "gEnhancements.RestoreRBAValues" },
+    { MigrationAction::Rename, "gRupeeDash", "gEnhancements.RupeeDash" },
+    { MigrationAction::Rename, "gSceneSpecificDirtPathFix", "gEnhancements.SceneSpecificDirtPathFix" },
+    { MigrationAction::Rename, "gSeparateArrows", "gEnhancements.SeparateArrows" },
+    { MigrationAction::Rename, "gShadowTag", "gEnhancements.ShadowTag" },
+    { MigrationAction::Rename, "gShowDoorLocksOnBothSides", "gEnhancements.ShowDoorLocksOnBothSides" },
+    { MigrationAction::Rename, "gSilverRupeeJingleExtend", "gEnhancements.SilverRupeeJingleExtend" },
+    { MigrationAction::Rename, "gSkipArrowAnimation", "gEnhancements.SkipArrowAnimation" },
+    { MigrationAction::Rename, "gSkipSaveConfirmation", "gEnhancements.SkipSaveConfirmation" },
+    { MigrationAction::Rename, "gSkipScarecrow", "gEnhancements.InstantScarecrow" },
+    { MigrationAction::Rename, "gSkipSwimDeepEndAnim", "gEnhancements.SkipSwimDeepEndAnim" },
+    { MigrationAction::Rename, "gSkipText", "gEnhancements.SkipText" },
+    { MigrationAction::Rename, "gSkulltulaFreeze", "gEnhancements.SkulltulaFreeze" },
+    { MigrationAction::Rename, "gStaticExplosionRadius", "gEnhancements.StaticExplosionRadius" },
+    { MigrationAction::Rename, "gStrengthDisabled", "gEnhancements.StrengthDisabled" },
+    { MigrationAction::Rename, "gSunlightArrows", "gEnhancements.SunlightArrows" },
+    { MigrationAction::Rename, "gSwitchPerfMode", "gEnhancements.SwitchPerfMode" },
+    { MigrationAction::Rename, "gTextSpacing", "gEnhancements.TextSpacing" },
+    { MigrationAction::Rename, "gTextSpeed", "gEnhancements.TextSpeed" },
+    { MigrationAction::Rename, "gTimeFlowFileSelect", "gEnhancements.TimeFlowFileSelect" },
+    { MigrationAction::Rename, "gTimeTravel", "gEnhancements.TimeTravel" },
+    { MigrationAction::Rename, "gToTMedallionsColors", "gEnhancements.ToTMedallionsColors" },
+    { MigrationAction::Rename, "gToggleStrength", "gEnhancements.ToggleStrength" },
+    { MigrationAction::Rename, "gTreeStickDrops", "gEnhancements.TreesDropSticks" },
+    { MigrationAction::Rename, "gTwoHandedIdle", "gEnhancements.TwoHandedIdle" },
+    { MigrationAction::Rename, "gUniformLR", "gEnhancements.FixMenuLR" },
+    { MigrationAction::Rename, "gVisualAgony", "gEnhancements.VisualAgony" },
+    { MigrationAction::Rename, "gVoidDamageMul", "gEnhancements.VoidDamageMult" },
+    { MigrationAction::Rename, "gGameplayStats.ShowIngameTimer", "gGameplayStats.ShowInGameTimer" },
+    { MigrationAction::Rename, "gGameplayStats.TimestampsReverse", "gGameplayStats.ReverseTimestamps" },
+    { MigrationAction::Rename, "gMirroredWorld", "gEnhancements.MirroredWorld" },
+    { MigrationAction::Rename, "gBetaQuestWorld", "gCheats.BetaQuestWorld" },
+    { MigrationAction::Rename, "gBombTimerMultiplier", "gCheats.BombTimerMultiplier" },
+    { MigrationAction::Rename, "gCheatEasyInputBufferingEnabled", "gCheats.EasyInputBuffer" },
+    { MigrationAction::Rename, "gCheatEasyPauseBufferEnabled", "gCheats.EasyPauseBuffer" },
+    { MigrationAction::Rename, "gCheatHookshotReachMultiplier", "gCheats.HookshotReachMultiplier" },
+    { MigrationAction::Rename, "gClimbEverything", "gCheats.ClimbEverything" },
+    { MigrationAction::Rename, "gDekuStickCheat", "gCheats.DekuStick" },
+    { MigrationAction::Rename, "gDropsDontDie", "gCheats.DropsDontDie" },
+    { MigrationAction::Rename, "gEnableBetaQuest", "gCheats.EnableBetaQuest" },
+    { MigrationAction::Rename, "gEzISG", "gCheats.EasyISG" },
+    { MigrationAction::Rename, "gEzQPA", "gCheats.EasyQPA" },
+    { MigrationAction::Rename, "gFireproofDekuShield", "gCheats.FireproofDekuShield" },
+    { MigrationAction::Rename, "gFreezeTime", "gCheats.FreezeTime" },
+    { MigrationAction::Rename, "gHookshotEverything", "gCheats.HookshotEverything" },
+    { MigrationAction::Rename, "gInfiniteAmmo", "gCheats.InfiniteAmmo" },
+    { MigrationAction::Rename, "gInfiniteEpona", "gCheats.InfiniteEponaBoost" },
+    { MigrationAction::Rename, "gInfiniteHealth", "gCheats.InfiniteHealth" },
+    { MigrationAction::Rename, "gInfiniteMagic", "gCheats.InfiniteMagic" },
+    { MigrationAction::Rename, "gInfiniteMoney", "gCheats.InfiniteMoney" },
+    { MigrationAction::Rename, "gInfiniteNayru", "gCheats.InfiniteNayru" },
+    { MigrationAction::Rename, "gMoonJumpOnL", "gCheats.MoonJumpOnL" },
+    { MigrationAction::Rename, "gNoBugsDespawn", "gCheats.NoBugsDespawn" },
+    { MigrationAction::Rename, "gNoClip", "gCheats.NoClip" },
+    { MigrationAction::Rename, "gNoFishDespawn", "gCheats.NoFishDespawn" },
+    { MigrationAction::Rename, "gNoKeeseGuayTarget", "gCheats.NoKeeseGuayTarget" },
+    { MigrationAction::Rename, "gNoRedeadFreeze", "gCheats.NoRedeadFreeze" },
+    { MigrationAction::Rename, "gNoRestrictItems", "gCheats.NoRestrictItems" },
+    { MigrationAction::Rename, "gSaveStatePromise", "gCheats.SaveStatePromise" },
+    { MigrationAction::Rename, "gSaveStatesEnabled", "gCheats.SaveStatesEnabled" },
+    { MigrationAction::Rename, "gShieldTwoHanded", "gCheats.ShieldTwoHanded" },
+    { MigrationAction::Rename, "gSuperTunic", "gCheats.SuperTunic" },
+    { MigrationAction::Rename, "gTimeSync", "gCheats.TimeSync" },
+    { MigrationAction::Rename, "gTimelessEquipment", "gCheats.TimelessEquipment" },
+    { MigrationAction::Rename, "gBetterDebugWarpScreen", "gDeveloperTools.BetterDebugWarpScreen" },
+    { MigrationAction::Rename, "gDebugEnabled", "gDeveloperTools.DebugEnabled" },
+    { MigrationAction::Rename, "gDebugSaveFileMode", "gDeveloperTools.DebugSaveFileMode" },
+    { MigrationAction::Rename, "gDebugWarpScreenTranslation", "gDeveloperTools.DebugWarpScreenTranslation" },
+    { MigrationAction::Rename, "gRegEditEnabled", "gDeveloperTools.RegEditEnabled" },
+    { MigrationAction::Rename, "gSaveFileID", "gDeveloperTools.SaveFileID" },
+    { MigrationAction::Rename, "gSkipLogoTitle", "gDeveloperTools.SkipLogoTitle" },
+    { MigrationAction::Rename, "gSkulltulaDebugEnabled", "gDeveloperTools.SkulltulaDebugEnabled" },
+    { MigrationAction::Rename, "gDebugActorViewerNameTags", "gDeveloperTools.ActorViewer.NameTags" },
+    { MigrationAction::Rename, "gActorViewerAdvancedParams", "gDeveloperTools.ActorViewer.AdvancedParams" },
+    { MigrationAction::Rename, "gColViewerEnabled", "gDeveloperTools.ColViewer.Enabled" },
+    { MigrationAction::Rename, "gColViewerScene", "gDeveloperTools.ColViewer.Scene" },
+    { MigrationAction::Rename, "gColViewerBgActors", "gDeveloperTools.ColViewer.BGActors" },
+    { MigrationAction::Rename, "gColViewerColCheck", "gDeveloperTools.ColViewer.ColCheck" },
+    { MigrationAction::Rename, "gColViewerWaterbox", "gDeveloperTools.ColViewer.Waterbox" },
+    { MigrationAction::Rename, "gColViewerDecal", "gDeveloperTools.ColViewer.Decal" },
+    { MigrationAction::Rename, "gColViewerShaded", "gDeveloperTools.ColViewer.Shaded" },
+    { MigrationAction::Rename, "gColViewerColorNormal", "gDeveloperTools.ColViewer.ColorNormal" },
+    { MigrationAction::Rename, "gColViewerColorHookshot", "gDeveloperTools.ColViewer.ColorHookshot" },
+    { MigrationAction::Rename, "gColViewerColorEntrance", "gDeveloperTools.ColViewer.ColorEntrance" },
+    { MigrationAction::Rename, "gColViewerColorSpecialSurface", "gDeveloperTools.ColViewer.ColorSpecialSurface" },
+    { MigrationAction::Rename, "gColViewerColorInteractable", "gDeveloperTools.ColViewer.ColorInteractable" },
+    { MigrationAction::Rename, "gColViewerColorSlope", "gDeveloperTools.ColViewer.ColorSlope" },
+    { MigrationAction::Rename, "gColViewerColorVoid", "gDeveloperTools.ColViewer.ColorVoid" },
+    { MigrationAction::Rename, "gColViewerColorOC", "gDeveloperTools.ColViewer.ColorOC" },
+    { MigrationAction::Rename, "gColViewerColorAC", "gDeveloperTools.ColViewer.ColorAC" },
+    { MigrationAction::Rename, "gColViewerColorAT", "gDeveloperTools.ColViewer.ColorAT" },
+    { MigrationAction::Rename, "gColViewerColorWaterbox", "gDeveloperTools.ColViewer.ColorWaterbox" },
+    { MigrationAction::Rename, "gValueViewer.EnablePrinting", "gDeveloperTools.ValueViewerEnablePrinting" },
+    { MigrationAction::Rename, "gEnableMapToggle", "gDeveloperTools.EnableMapToggle" },
+    { MigrationAction::Rename, "gGfxPrintCharStartOffset", "gDeveloperTools.GfxPrintChar.StartOffset" },
+    { MigrationAction::Rename, "gGfxPrintCharSpacing", "gDeveloperTools.GfxPrintChar.Spacing" },
+    { MigrationAction::Rename, "gEnemyBGMDisable", "gAudioEditor.EnemyBGMDisable" },
+    { MigrationAction::Rename, "gLostWoodsConsistentVolume", "gAudioEditor.LostWoodsConsistentVolume" },
+    { MigrationAction::Rename, "gSeqNameOverlay", "gAudioEditor.SeqNameOverlay" },
+    { MigrationAction::Rename, "gSeqNameOverlayDuration", "gAudioEditor.SeqNameOverlayDuration" },
+    { MigrationAction::Rename, "gLinkVoiceFreqMultiplier", "gAudioEditor.LinkVoiceFreqMultiplier" },
+    { MigrationAction::Rename, "gExperimentalOctaveDrop", "gAudioEditor.ExperimentalOctaveDrop" },
+    { MigrationAction::Rename, "gCosmetics.Hud_AButton", "gCosmetics.HUD.AButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_BButton", "gCosmetics.HUD.BButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CButtons", "gCosmetics.HUD.CButtons" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CUpButton", "gCosmetics.HUD.CUpButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CDownButton", "gCosmetics.HUD.CDownButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton", "gCosmetics.HUD.CLeftButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CRightButton", "gCosmetics.HUD.CRightButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StartButton", "gCosmetics.HUD.StartButton" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Dpad", "gCosmetics.HUD.Dpad" },
+    { MigrationAction::Rename, "gCosmetics.Hud_KeyCount", "gCosmetics.HUD.KeyCount" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony", "gCosmetics.HUD.StoneOfAgony" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Minimap", "gCosmetics.HUD.Minimap" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition", "gCosmetics.HUD.MinimapPosition" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance", "gCosmetics.HUD.MinimapEntrance" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar", "gCosmetics.HUD.EnemyHealthBar" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder", "gCosmetics.HUD.EnemyHealthBorder" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText", "gCosmetics.HUD.NameTagActorText" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground", "gCosmetics.HUD.NameTagActorBackground" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA", "gCosmetics.Kaleido.ItemSelA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB", "gCosmetics.Kaleido.ItemSelB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC", "gCosmetics.Kaleido.ItemSelC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD", "gCosmetics.Kaleido.ItemSelD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA", "gCosmetics.Kaleido.EquipSelA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB", "gCosmetics.Kaleido.EquipSelB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC", "gCosmetics.Kaleido.EquipSelC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD", "gCosmetics.Kaleido.EquipSelD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA", "gCosmetics.Kaleido.MapSelDunA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB", "gCosmetics.Kaleido.MapSelDunB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC", "gCosmetics.Kaleido.MapSelDunC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD", "gCosmetics.Kaleido.MapSelDunD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA", "gCosmetics.Kaleido.QuestStatusA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB", "gCosmetics.Kaleido.QuestStatusB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC", "gCosmetics.Kaleido.QuestStatusC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD", "gCosmetics.Kaleido.QuestStatusD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA", "gCosmetics.Kaleido.MapSelectA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB", "gCosmetics.Kaleido.MapSelectB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC", "gCosmetics.Kaleido.MapSelectC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD", "gCosmetics.Kaleido.MapSelectD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveA", "gCosmetics.Kaleido.SaveA" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveB", "gCosmetics.Kaleido.SaveB" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveC", "gCosmetics.Kaleido.SaveC" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveD", "gCosmetics.Kaleido.SaveD" },
+    { MigrationAction::Rename, "gCosmetics.Kal_NamePanel", "gCosmetics.Kaleido.NamePanel" },
+    { MigrationAction::Rename, "gCosmetics.Title_FileChoose", "gCosmetics.Title.FileChoose" },
+    { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo", "gCosmetics.Title.NintendoLogo" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed", "gCosmetics.Title.N64LogoRed" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue", "gCosmetics.Title.N64LogoBlue" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen", "gCosmetics.Title.N64LogoGreen" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow", "gCosmetics.Title.N64LogoYellow" },
+    { MigrationAction::Rename, "gCosmetics.Title_FirePrimary", "gCosmetics.Title.FirePrimary" },
+    { MigrationAction::Rename, "gCosmetics.Title_FireSecondary", "gCosmetics.Title.FireSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary", "gCosmetics.Arrows.NormalPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary", "gCosmetics.Arrows.NormalSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary", "gCosmetics.Arrows.FirePrimary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary", "gCosmetics.Arrows.FireSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary", "gCosmetics.Arrows.IcePrimary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary", "gCosmetics.Arrows.IceSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary", "gCosmetics.Arrows.LightPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary", "gCosmetics.Arrows.LightSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary", "gCosmetics.Magic.DinsPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary", "gCosmetics.Magic.DinsSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary", "gCosmetics.Magic.FaroresPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary", "gCosmetics.Magic.FaroresSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary", "gCosmetics.Magic.NayrusPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary", "gCosmetics.Magic.NayrusSecondary" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary", "gCosmetics.SpinAttack.Level1Primary" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary", "gCosmetics.SpinAttack.Level1Secondary" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary", "gCosmetics.SpinAttack.Level2Primary" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary", "gCosmetics.SpinAttack.Level2Secondary" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Bombchu", "gCosmetics.Trails.Bombchu" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Boomerang", "gCosmetics.Trails.Boomerang" },
+    { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword", "gCosmetics.Trails.KokiriSword" },
+    { MigrationAction::Rename, "gCosmetics.Trails_MasterSword", "gCosmetics.Trails.MasterSword" },
+    { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword", "gCosmetics.Trails.BiggoronSword" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Stick", "gCosmetics.Trails.Stick" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Hammer", "gCosmetics.Trails.Hammer" },
+    { MigrationAction::Rename, "gCosmetics.World_BlockOfTime", "gCosmetics.World.BlockOfTime" },
+    { MigrationAction::Rename, "gCosmetics.World_Moon", "gCosmetics.World.Moon" },
+    { MigrationAction::Rename, "gCosmetics.World_GossipStone", "gCosmetics.World.GossipStone" },
+    { MigrationAction::Rename, "gCosmetics.World_RedIce", "gCosmetics.World.RedIce" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary", "gCosmetics.Navi.IdlePrimary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary", "gCosmetics.Navi.IdleSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary", "gCosmetics.Navi.NPCPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary", "gCosmetics.Navi.NPCSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary", "gCosmetics.Navi.EnemyPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary", "gCosmetics.Navi.EnemySecondary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary", "gCosmetics.Navi.PropsPrimary" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary", "gCosmetics.Navi.PropsSecondary" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary", "gCosmetics.Ivan.IdlePrimary" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary", "gCosmetics.Ivan.IdleSecondary" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary", "gCosmetics.NPC.FireKeesePrimary" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary", "gCosmetics.NPC.FireKeeseSecondary" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary", "gCosmetics.NPC.IceKeesePrimary" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary", "gCosmetics.NPC.IceKeeseSecondary" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog1", "gCosmetics.NPC.Dog1" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog2", "gCosmetics.NPC.Dog2" },
+    { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula", "gCosmetics.NPC.GoldenSkulltula" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Kokiri", "gCosmetics.NPC.Kokiri" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Gerudo", "gCosmetics.NPC.Gerudo" },
+    { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap", "gCosmetics.NPC.MetalTrap" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles", "gCosmetics.NPC.IronKnuckles" },
+    { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Value", "gCosmetics.Link.KokiriTunic.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Value", "gCosmetics.Link.GoronTunic.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Value", "gCosmetics.Link.ZoraTunic.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_Hair.Value", "gCosmetics.Link.Hair.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_Linen.Value", "gCosmetics.Link.Linen.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_Boots.Value", "gCosmetics.Link.Boots.Value" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Value", "gCosmetics.MirrorShield.Body.Value" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Value", "gCosmetics.MirrorShield.Mirror.Value" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Value", "gCosmetics.MirrorShield.Emblem.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Value", "gCosmetics.Swords.KokiriBlade.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Value", "gCosmetics.Swords.KokiriHilt.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Value", "gCosmetics.Swords.MasterBlade.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Value", "gCosmetics.Swords.MasterHilt.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Value", "gCosmetics.Swords.BiggoronBlade.Value" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Value", "gCosmetics.Swords.BiggoronHilt.Value" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Value", "gCosmetics.Gloves.GoronBracelet.Value" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Value", "gCosmetics.Gloves.SilverGauntlets.Value" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Value", "gCosmetics.Gloves.GoldenGauntlets.Value" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Value", "gCosmetics.Gloves.GauntletsGem.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Value", "gCosmetics.Equipment.BoomerangBody.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Value", "gCosmetics.Equipment.BoomerangGem.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Value", "gCosmetics.Equipment.SlingshotBody.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Value",
+      "gCosmetics.Equipment.SlingshotString.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Value", "gCosmetics.Equipment.HammerHead.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Value", "gCosmetics.Equipment.HammerHandle.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Value", "gCosmetics.Equipment.HookshotChain.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Value", "gCosmetics.Equipment.HookshotTip.Value" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Value", "gCosmetics.HookshotReticle.Target.Value" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Value",
+      "gCosmetics.HookshotReticle.NonTarget.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Value", "gCosmetics.Equipment.BowTips.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Value", "gCosmetics.Equipment.BowString.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Value", "gCosmetics.Equipment.BowBody.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Value", "gCosmetics.Equipment.BowHandle.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Value", "gCosmetics.Equipment.ChuFace.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Value", "gCosmetics.Equipment.ChuBody.Value" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Value", "gCosmetics.Equipment.BunnyHood.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Value", "gCosmetics.Consumable.Hearts.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Value", "gCosmetics.Consumable.HeartBorder.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Value", "gCosmetics.Consumable.DDHearts.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Value",
+      "gCosmetics.Consumable.DDHeartBorder.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Value", "gCosmetics.Consumable.Magic.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Value", "gCosmetics.Consumable.MagicActive.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Value", "gCosmetics.Consumable.MagicBorder.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Value",
+      "gCosmetics.Consumable.MagicBorderActive.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Value", "gCosmetics.Consumable.GreenRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Value", "gCosmetics.Consumable.BlueRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Value", "gCosmetics.Consumable.RedRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Value", "gCosmetics.Consumable.PurpleRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Value", "gCosmetics.Consumable.GoldRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Value", "gCosmetics.Consumable.SilverRupee.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_AButton.Value", "gCosmetics.HUD.AButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_BButton.Value", "gCosmetics.HUD.BButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Value", "gCosmetics.HUD.CButtons.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Value", "gCosmetics.HUD.CUpButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Value", "gCosmetics.HUD.CDownButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Value", "gCosmetics.HUD.CLeftButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Value", "gCosmetics.HUD.CRightButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Value", "gCosmetics.HUD.StartButton.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Value", "gCosmetics.HUD.Dpad.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Value", "gCosmetics.HUD.KeyCount.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Value", "gCosmetics.HUD.StoneOfAgony.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Value", "gCosmetics.HUD.Minimap.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Value", "gCosmetics.HUD.MinimapPosition.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Value", "gCosmetics.HUD.MinimapEntrance.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Value", "gCosmetics.HUD.EnemyHealthBar.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Value", "gCosmetics.HUD.EnemyHealthBorder.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Value", "gCosmetics.HUD.NameTagActorText.Value" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Value",
+      "gCosmetics.HUD.NameTagActorBackground.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Value", "gCosmetics.Kaleido.ItemSelA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Value", "gCosmetics.Kaleido.ItemSelB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Value", "gCosmetics.Kaleido.ItemSelC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Value", "gCosmetics.Kaleido.ItemSelD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Value", "gCosmetics.Kaleido.EquipSelA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Value", "gCosmetics.Kaleido.EquipSelB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Value", "gCosmetics.Kaleido.EquipSelC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Value", "gCosmetics.Kaleido.EquipSelD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Value", "gCosmetics.Kaleido.MapSelDunA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Value", "gCosmetics.Kaleido.MapSelDunB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Value", "gCosmetics.Kaleido.MapSelDunC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Value", "gCosmetics.Kaleido.MapSelDunD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Value", "gCosmetics.Kaleido.QuestStatusA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Value", "gCosmetics.Kaleido.QuestStatusB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Value", "gCosmetics.Kaleido.QuestStatusC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Value", "gCosmetics.Kaleido.QuestStatusD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Value", "gCosmetics.Kaleido.MapSelectA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Value", "gCosmetics.Kaleido.MapSelectB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Value", "gCosmetics.Kaleido.MapSelectC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Value", "gCosmetics.Kaleido.MapSelectD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Value", "gCosmetics.Kaleido.SaveA.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Value", "gCosmetics.Kaleido.SaveB.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Value", "gCosmetics.Kaleido.SaveC.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Value", "gCosmetics.Kaleido.SaveD.Value" },
+    { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Value", "gCosmetics.Kaleido.NamePanel.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Value", "gCosmetics.Title.FileChoose.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Value", "gCosmetics.Title.NintendoLogo.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Value", "gCosmetics.Title.N64LogoRed.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Value", "gCosmetics.Title.N64LogoBlue.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Value", "gCosmetics.Title.N64LogoGreen.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Value", "gCosmetics.Title.N64LogoYellow.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Value", "gCosmetics.Title.FirePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Value", "gCosmetics.Title.FireSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Value", "gCosmetics.Arrows.NormalPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Value", "gCosmetics.Arrows.NormalSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Value", "gCosmetics.Arrows.FirePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Value", "gCosmetics.Arrows.FireSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Value", "gCosmetics.Arrows.IcePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Value", "gCosmetics.Arrows.IceSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Value", "gCosmetics.Arrows.LightPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Value", "gCosmetics.Arrows.LightSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Value", "gCosmetics.Magic.DinsPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Value", "gCosmetics.Magic.DinsSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Value", "gCosmetics.Magic.FaroresPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Value", "gCosmetics.Magic.FaroresSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Value", "gCosmetics.Magic.NayrusPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Value", "gCosmetics.Magic.NayrusSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Value",
+      "gCosmetics.SpinAttack.Level1Primary.Value" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Value",
+      "gCosmetics.SpinAttack.Level1Secondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Value",
+      "gCosmetics.SpinAttack.Level2Primary.Value" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Value",
+      "gCosmetics.SpinAttack.Level2Secondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Value", "gCosmetics.Trails.Bombchu.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Value", "gCosmetics.Trails.Boomerang.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Value", "gCosmetics.Trails.KokiriSword.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Value", "gCosmetics.Trails.MasterSword.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Value", "gCosmetics.Trails.BiggoronSword.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Stick.Value", "gCosmetics.Trails.Stick.Value" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Value", "gCosmetics.Trails.Hammer.Value" },
+    { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Value", "gCosmetics.World.BlockOfTime.Value" },
+    { MigrationAction::Rename, "gCosmetics.World_Moon.Value", "gCosmetics.World.Moon.Value" },
+    { MigrationAction::Rename, "gCosmetics.World_GossipStone.Value", "gCosmetics.World.GossipStone.Value" },
+    { MigrationAction::Rename, "gCosmetics.World_RedIce.Value", "gCosmetics.World.RedIce.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Value", "gCosmetics.Navi.IdlePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Value", "gCosmetics.Navi.IdleSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Value", "gCosmetics.Navi.NPCPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Value", "gCosmetics.Navi.NPCSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Value", "gCosmetics.Navi.EnemyPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Value", "gCosmetics.Navi.EnemySecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Value", "gCosmetics.Navi.PropsPrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Value", "gCosmetics.Navi.PropsSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Value", "gCosmetics.Ivan.IdlePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Value", "gCosmetics.Ivan.IdleSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Value", "gCosmetics.NPC.FireKeesePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Value", "gCosmetics.NPC.FireKeeseSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Value", "gCosmetics.NPC.IceKeesePrimary.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Value", "gCosmetics.NPC.IceKeeseSecondary.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Value", "gCosmetics.NPC.Dog1.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Value", "gCosmetics.NPC.Dog2.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Value", "gCosmetics.NPC.GoldenSkulltula.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Value", "gCosmetics.NPC.Kokiri.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Value", "gCosmetics.NPC.Gerudo.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Value", "gCosmetics.NPC.MetalTrap.Value" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Value", "gCosmetics.NPC.IronKnuckles.Value" },
+    { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Rainbow", "gCosmetics.Link.KokiriTunic.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Rainbow", "gCosmetics.Link.GoronTunic.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Rainbow", "gCosmetics.Link.ZoraTunic.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_Hair.Rainbow", "gCosmetics.Link.Hair.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_Linen.Rainbow", "gCosmetics.Link.Linen.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_Boots.Rainbow", "gCosmetics.Link.Boots.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Rainbow", "gCosmetics.MirrorShield.Body.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Rainbow", "gCosmetics.MirrorShield.Mirror.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Rainbow", "gCosmetics.MirrorShield.Emblem.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Rainbow", "gCosmetics.Swords.KokiriBlade.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Rainbow", "gCosmetics.Swords.KokiriHilt.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Rainbow", "gCosmetics.Swords.MasterBlade.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Rainbow", "gCosmetics.Swords.MasterHilt.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Rainbow", "gCosmetics.Swords.BiggoronBlade.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Rainbow", "gCosmetics.Swords.BiggoronHilt.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Rainbow", "gCosmetics.Gloves.GoronBracelet.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Rainbow",
+      "gCosmetics.Gloves.SilverGauntlets.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Rainbow",
+      "gCosmetics.Gloves.GoldenGauntlets.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Rainbow", "gCosmetics.Gloves.GauntletsGem.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Rainbow",
+      "gCosmetics.Equipment.BoomerangBody.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Rainbow",
+      "gCosmetics.Equipment.BoomerangGem.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Rainbow",
+      "gCosmetics.Equipment.SlingshotBody.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Rainbow",
+      "gCosmetics.Equipment.SlingshotString.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Rainbow", "gCosmetics.Equipment.HammerHead.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Rainbow",
+      "gCosmetics.Equipment.HammerHandle.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Rainbow",
+      "gCosmetics.Equipment.HookshotChain.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Rainbow", "gCosmetics.Equipment.HookshotTip.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Rainbow",
+      "gCosmetics.HookshotReticle.Target.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Rainbow",
+      "gCosmetics.HookshotReticle.NonTarget.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Rainbow", "gCosmetics.Equipment.BowTips.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Rainbow", "gCosmetics.Equipment.BowString.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Rainbow", "gCosmetics.Equipment.BowBody.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Rainbow", "gCosmetics.Equipment.BowHandle.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Rainbow", "gCosmetics.Equipment.ChuFace.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Rainbow", "gCosmetics.Equipment.ChuBody.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Rainbow", "gCosmetics.Equipment.BunnyHood.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Rainbow", "gCosmetics.Consumable.Hearts.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Rainbow",
+      "gCosmetics.Consumable.HeartBorder.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Rainbow", "gCosmetics.Consumable.DDHearts.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Rainbow",
+      "gCosmetics.Consumable.DDHeartBorder.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Rainbow", "gCosmetics.Consumable.Magic.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Rainbow",
+      "gCosmetics.Consumable.MagicActive.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Rainbow",
+      "gCosmetics.Consumable.MagicBorder.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Rainbow",
+      "gCosmetics.Consumable.MagicBorderActive.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Rainbow", "gCosmetics.Consumable.GreenRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Rainbow", "gCosmetics.Consumable.BlueRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Rainbow", "gCosmetics.Consumable.RedRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Rainbow",
+      "gCosmetics.Consumable.PurpleRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Rainbow", "gCosmetics.Consumable.GoldRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Rainbow",
+      "gCosmetics.Consumable.SilverRupee.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_AButton.Rainbow", "gCosmetics.HUD.AButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_BButton.Rainbow", "gCosmetics.HUD.BButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Rainbow", "gCosmetics.HUD.CButtons.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Rainbow", "gCosmetics.HUD.CUpButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Rainbow", "gCosmetics.HUD.CDownButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Rainbow", "gCosmetics.HUD.CLeftButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Rainbow", "gCosmetics.HUD.CRightButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Rainbow", "gCosmetics.HUD.StartButton.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Rainbow", "gCosmetics.HUD.Dpad.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Rainbow", "gCosmetics.HUD.KeyCount.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Rainbow", "gCosmetics.HUD.StoneOfAgony.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Rainbow", "gCosmetics.HUD.Minimap.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Rainbow", "gCosmetics.HUD.MinimapPosition.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Rainbow", "gCosmetics.HUD.MinimapEntrance.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Rainbow", "gCosmetics.HUD.EnemyHealthBar.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Rainbow", "gCosmetics.HUD.EnemyHealthBorder.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Rainbow", "gCosmetics.HUD.NameTagActorText.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Rainbow",
+      "gCosmetics.HUD.NameTagActorBackground.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Rainbow", "gCosmetics.Kaleido.ItemSelA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Rainbow", "gCosmetics.Kaleido.ItemSelB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Rainbow", "gCosmetics.Kaleido.ItemSelC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Rainbow", "gCosmetics.Kaleido.ItemSelD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Rainbow", "gCosmetics.Kaleido.EquipSelA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Rainbow", "gCosmetics.Kaleido.EquipSelB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Rainbow", "gCosmetics.Kaleido.EquipSelC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Rainbow", "gCosmetics.Kaleido.EquipSelD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Rainbow", "gCosmetics.Kaleido.MapSelDunA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Rainbow", "gCosmetics.Kaleido.MapSelDunB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Rainbow", "gCosmetics.Kaleido.MapSelDunC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Rainbow", "gCosmetics.Kaleido.MapSelDunD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Rainbow", "gCosmetics.Kaleido.QuestStatusA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Rainbow", "gCosmetics.Kaleido.QuestStatusB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Rainbow", "gCosmetics.Kaleido.QuestStatusC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Rainbow", "gCosmetics.Kaleido.QuestStatusD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Rainbow", "gCosmetics.Kaleido.MapSelectA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Rainbow", "gCosmetics.Kaleido.MapSelectB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Rainbow", "gCosmetics.Kaleido.MapSelectC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Rainbow", "gCosmetics.Kaleido.MapSelectD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Rainbow", "gCosmetics.Kaleido.SaveA.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Rainbow", "gCosmetics.Kaleido.SaveB.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Rainbow", "gCosmetics.Kaleido.SaveC.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Rainbow", "gCosmetics.Kaleido.SaveD.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Rainbow", "gCosmetics.Kaleido.NamePanel.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Rainbow", "gCosmetics.Title.FileChoose.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Rainbow", "gCosmetics.Title.NintendoLogo.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Rainbow", "gCosmetics.Title.N64LogoRed.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Rainbow", "gCosmetics.Title.N64LogoBlue.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Rainbow", "gCosmetics.Title.N64LogoGreen.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Rainbow", "gCosmetics.Title.N64LogoYellow.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Rainbow", "gCosmetics.Title.FirePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Rainbow", "gCosmetics.Title.FireSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Rainbow", "gCosmetics.Arrows.NormalPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Rainbow",
+      "gCosmetics.Arrows.NormalSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Rainbow", "gCosmetics.Arrows.FirePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Rainbow", "gCosmetics.Arrows.FireSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Rainbow", "gCosmetics.Arrows.IcePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Rainbow", "gCosmetics.Arrows.IceSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Rainbow", "gCosmetics.Arrows.LightPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Rainbow", "gCosmetics.Arrows.LightSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Rainbow", "gCosmetics.Magic.DinsPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Rainbow", "gCosmetics.Magic.DinsSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Rainbow", "gCosmetics.Magic.FaroresPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Rainbow",
+      "gCosmetics.Magic.FaroresSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Rainbow", "gCosmetics.Magic.NayrusPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Rainbow", "gCosmetics.Magic.NayrusSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Rainbow",
+      "gCosmetics.SpinAttack.Level1Primary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Rainbow",
+      "gCosmetics.SpinAttack.Level1Secondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Rainbow",
+      "gCosmetics.SpinAttack.Level2Primary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Rainbow",
+      "gCosmetics.SpinAttack.Level2Secondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Rainbow", "gCosmetics.Trails.Bombchu.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Rainbow", "gCosmetics.Trails.Boomerang.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Rainbow", "gCosmetics.Trails.KokiriSword.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Rainbow", "gCosmetics.Trails.MasterSword.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Rainbow", "gCosmetics.Trails.BiggoronSword.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Stick.Rainbow", "gCosmetics.Trails.Stick.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Rainbow", "gCosmetics.Trails.Hammer.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Rainbow", "gCosmetics.World.BlockOfTime.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.World_Moon.Rainbow", "gCosmetics.World.Moon.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.World_GossipStone.Rainbow", "gCosmetics.World.GossipStone.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.World_RedIce.Rainbow", "gCosmetics.World.RedIce.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Rainbow", "gCosmetics.Navi.IdlePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Rainbow", "gCosmetics.Navi.IdleSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Rainbow", "gCosmetics.Navi.NPCPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Rainbow", "gCosmetics.Navi.NPCSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Rainbow", "gCosmetics.Navi.EnemyPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Rainbow", "gCosmetics.Navi.EnemySecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Rainbow", "gCosmetics.Navi.PropsPrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Rainbow", "gCosmetics.Navi.PropsSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Rainbow", "gCosmetics.Ivan.IdlePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Rainbow", "gCosmetics.Ivan.IdleSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Rainbow", "gCosmetics.NPC.FireKeesePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Rainbow",
+      "gCosmetics.NPC.FireKeeseSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Rainbow", "gCosmetics.NPC.IceKeesePrimary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Rainbow", "gCosmetics.NPC.IceKeeseSecondary.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Rainbow", "gCosmetics.NPC.Dog1.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Rainbow", "gCosmetics.NPC.Dog2.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Rainbow", "gCosmetics.NPC.GoldenSkulltula.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Rainbow", "gCosmetics.NPC.Kokiri.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Rainbow", "gCosmetics.NPC.Gerudo.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Rainbow", "gCosmetics.NPC.MetalTrap.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Rainbow", "gCosmetics.NPC.IronKnuckles.Rainbow" },
+    { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Locked", "gCosmetics.Link.KokiriTunic.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Locked", "gCosmetics.Link.GoronTunic.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Locked", "gCosmetics.Link.ZoraTunic.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_Hair.Locked", "gCosmetics.Link.Hair.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_Linen.Locked", "gCosmetics.Link.Linen.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_Boots.Locked", "gCosmetics.Link.Boots.Locked" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Locked", "gCosmetics.MirrorShield.Body.Locked" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Locked", "gCosmetics.MirrorShield.Mirror.Locked" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Locked", "gCosmetics.MirrorShield.Emblem.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Locked", "gCosmetics.Swords.KokiriBlade.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Locked", "gCosmetics.Swords.KokiriHilt.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Locked", "gCosmetics.Swords.MasterBlade.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Locked", "gCosmetics.Swords.MasterHilt.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Locked", "gCosmetics.Swords.BiggoronBlade.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Locked", "gCosmetics.Swords.BiggoronHilt.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Locked", "gCosmetics.Gloves.GoronBracelet.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Locked", "gCosmetics.Gloves.SilverGauntlets.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Locked", "gCosmetics.Gloves.GoldenGauntlets.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Locked", "gCosmetics.Gloves.GauntletsGem.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Locked",
+      "gCosmetics.Equipment.BoomerangBody.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Locked", "gCosmetics.Equipment.BoomerangGem.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Locked",
+      "gCosmetics.Equipment.SlingshotBody.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Locked",
+      "gCosmetics.Equipment.SlingshotString.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Locked", "gCosmetics.Equipment.HammerHead.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Locked", "gCosmetics.Equipment.HammerHandle.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Locked",
+      "gCosmetics.Equipment.HookshotChain.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Locked", "gCosmetics.Equipment.HookshotTip.Locked" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Locked", "gCosmetics.HookshotReticle.Target.Locked" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Locked",
+      "gCosmetics.HookshotReticle.NonTarget.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Locked", "gCosmetics.Equipment.BowTips.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Locked", "gCosmetics.Equipment.BowString.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Locked", "gCosmetics.Equipment.BowBody.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Locked", "gCosmetics.Equipment.BowHandle.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Locked", "gCosmetics.Equipment.ChuFace.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Locked", "gCosmetics.Equipment.ChuBody.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Locked", "gCosmetics.Equipment.BunnyHood.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Locked", "gCosmetics.Consumable.Hearts.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Locked", "gCosmetics.Consumable.HeartBorder.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Locked", "gCosmetics.Consumable.DDHearts.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Locked",
+      "gCosmetics.Consumable.DDHeartBorder.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Locked", "gCosmetics.Consumable.Magic.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Locked", "gCosmetics.Consumable.MagicActive.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Locked", "gCosmetics.Consumable.MagicBorder.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Locked",
+      "gCosmetics.Consumable.MagicBorderActive.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Locked", "gCosmetics.Consumable.GreenRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Locked", "gCosmetics.Consumable.BlueRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Locked", "gCosmetics.Consumable.RedRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Locked", "gCosmetics.Consumable.PurpleRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Locked", "gCosmetics.Consumable.GoldRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Locked", "gCosmetics.Consumable.SilverRupee.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_AButton.Locked", "gCosmetics.HUD.AButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_BButton.Locked", "gCosmetics.HUD.BButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Locked", "gCosmetics.HUD.CButtons.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Locked", "gCosmetics.HUD.CUpButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Locked", "gCosmetics.HUD.CDownButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Locked", "gCosmetics.HUD.CLeftButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Locked", "gCosmetics.HUD.CRightButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Locked", "gCosmetics.HUD.StartButton.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Locked", "gCosmetics.HUD.Dpad.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Locked", "gCosmetics.HUD.KeyCount.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Locked", "gCosmetics.HUD.StoneOfAgony.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Locked", "gCosmetics.HUD.Minimap.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Locked", "gCosmetics.HUD.MinimapPosition.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Locked", "gCosmetics.HUD.MinimapEntrance.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Locked", "gCosmetics.HUD.EnemyHealthBar.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Locked", "gCosmetics.HUD.EnemyHealthBorder.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Locked", "gCosmetics.HUD.NameTagActorText.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Locked",
+      "gCosmetics.HUD.NameTagActorBackground.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Locked", "gCosmetics.Kaleido.ItemSelA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Locked", "gCosmetics.Kaleido.ItemSelB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Locked", "gCosmetics.Kaleido.ItemSelC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Locked", "gCosmetics.Kaleido.ItemSelD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Locked", "gCosmetics.Kaleido.EquipSelA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Locked", "gCosmetics.Kaleido.EquipSelB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Locked", "gCosmetics.Kaleido.EquipSelC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Locked", "gCosmetics.Kaleido.EquipSelD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Locked", "gCosmetics.Kaleido.MapSelDunA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Locked", "gCosmetics.Kaleido.MapSelDunB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Locked", "gCosmetics.Kaleido.MapSelDunC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Locked", "gCosmetics.Kaleido.MapSelDunD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Locked", "gCosmetics.Kaleido.QuestStatusA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Locked", "gCosmetics.Kaleido.QuestStatusB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Locked", "gCosmetics.Kaleido.QuestStatusC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Locked", "gCosmetics.Kaleido.QuestStatusD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Locked", "gCosmetics.Kaleido.MapSelectA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Locked", "gCosmetics.Kaleido.MapSelectB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Locked", "gCosmetics.Kaleido.MapSelectC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Locked", "gCosmetics.Kaleido.MapSelectD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Locked", "gCosmetics.Kaleido.SaveA.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Locked", "gCosmetics.Kaleido.SaveB.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Locked", "gCosmetics.Kaleido.SaveC.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Locked", "gCosmetics.Kaleido.SaveD.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Locked", "gCosmetics.Kaleido.NamePanel.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Locked", "gCosmetics.Title.FileChoose.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Locked", "gCosmetics.Title.NintendoLogo.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Locked", "gCosmetics.Title.N64LogoRed.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Locked", "gCosmetics.Title.N64LogoBlue.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Locked", "gCosmetics.Title.N64LogoGreen.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Locked", "gCosmetics.Title.N64LogoYellow.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Locked", "gCosmetics.Title.FirePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Locked", "gCosmetics.Title.FireSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Locked", "gCosmetics.Arrows.NormalPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Locked", "gCosmetics.Arrows.NormalSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Locked", "gCosmetics.Arrows.FirePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Locked", "gCosmetics.Arrows.FireSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Locked", "gCosmetics.Arrows.IcePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Locked", "gCosmetics.Arrows.IceSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Locked", "gCosmetics.Arrows.LightPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Locked", "gCosmetics.Arrows.LightSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Locked", "gCosmetics.Magic.DinsPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Locked", "gCosmetics.Magic.DinsSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Locked", "gCosmetics.Magic.FaroresPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Locked", "gCosmetics.Magic.FaroresSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Locked", "gCosmetics.Magic.NayrusPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Locked", "gCosmetics.Magic.NayrusSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Locked",
+      "gCosmetics.SpinAttack.Level1Primary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Locked",
+      "gCosmetics.SpinAttack.Level1Secondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Locked",
+      "gCosmetics.SpinAttack.Level2Primary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Locked",
+      "gCosmetics.SpinAttack.Level2Secondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Locked", "gCosmetics.Trails.Bombchu.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Locked", "gCosmetics.Trails.Boomerang.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Locked", "gCosmetics.Trails.KokiriSword.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Locked", "gCosmetics.Trails.MasterSword.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Locked", "gCosmetics.Trails.BiggoronSword.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Stick.Locked", "gCosmetics.Trails.Stick.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Locked", "gCosmetics.Trails.Hammer.Locked" },
+    { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Locked", "gCosmetics.World.BlockOfTime.Locked" },
+    { MigrationAction::Rename, "gCosmetics.World_Moon.Locked", "gCosmetics.World.Moon.Locked" },
+    { MigrationAction::Rename, "gCosmetics.World_GossipStone.Locked", "gCosmetics.World.GossipStone.Locked" },
+    { MigrationAction::Rename, "gCosmetics.World_RedIce.Locked", "gCosmetics.World.RedIce.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Locked", "gCosmetics.Navi.IdlePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Locked", "gCosmetics.Navi.IdleSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Locked", "gCosmetics.Navi.NPCPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Locked", "gCosmetics.Navi.NPCSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Locked", "gCosmetics.Navi.EnemyPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Locked", "gCosmetics.Navi.EnemySecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Locked", "gCosmetics.Navi.PropsPrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Locked", "gCosmetics.Navi.PropsSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Locked", "gCosmetics.Ivan.IdlePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Locked", "gCosmetics.Ivan.IdleSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Locked", "gCosmetics.NPC.FireKeesePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Locked", "gCosmetics.NPC.FireKeeseSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Locked", "gCosmetics.NPC.IceKeesePrimary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Locked", "gCosmetics.NPC.IceKeeseSecondary.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Locked", "gCosmetics.NPC.Dog1.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Locked", "gCosmetics.NPC.Dog2.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Locked", "gCosmetics.NPC.GoldenSkulltula.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Locked", "gCosmetics.NPC.Kokiri.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Locked", "gCosmetics.NPC.Gerudo.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Locked", "gCosmetics.NPC.MetalTrap.Locked" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Locked", "gCosmetics.NPC.IronKnuckles.Locked" },
+    { MigrationAction::Rename, "gCosmetics.Link_KokiriTunic.Changed", "gCosmetics.Link.KokiriTunic.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Link_GoronTunic.Changed", "gCosmetics.Link.GoronTunic.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Link_ZoraTunic.Changed", "gCosmetics.Link.ZoraTunic.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Link_Hair.Changed", "gCosmetics.Link.Hair.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Link_Linen.Changed", "gCosmetics.Link.Linen.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Link_Boots.Changed", "gCosmetics.Link.Boots.Changed" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Body.Changed", "gCosmetics.MirrorShield.Body.Changed" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Mirror.Changed", "gCosmetics.MirrorShield.Mirror.Changed" },
+    { MigrationAction::Rename, "gCosmetics.MirrorShield_Emblem.Changed", "gCosmetics.MirrorShield.Emblem.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriBlade.Changed", "gCosmetics.Swords.KokiriBlade.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_KokiriHilt.Changed", "gCosmetics.Swords.KokiriHilt.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterBlade.Changed", "gCosmetics.Swords.MasterBlade.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_MasterHilt.Changed", "gCosmetics.Swords.MasterHilt.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronBlade.Changed", "gCosmetics.Swords.BiggoronBlade.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Swords_BiggoronHilt.Changed", "gCosmetics.Swords.BiggoronHilt.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoronBracelet.Changed", "gCosmetics.Gloves.GoronBracelet.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_SilverGauntlets.Changed",
+      "gCosmetics.Gloves.SilverGauntlets.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GoldenGauntlets.Changed",
+      "gCosmetics.Gloves.GoldenGauntlets.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Gloves_GauntletsGem.Changed", "gCosmetics.Gloves.GauntletsGem.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangBody.Changed",
+      "gCosmetics.Equipment.BoomerangBody.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BoomerangGem.Changed",
+      "gCosmetics.Equipment.BoomerangGem.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotBody.Changed",
+      "gCosmetics.Equipment.SlingshotBody.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_SlingshotString.Changed",
+      "gCosmetics.Equipment.SlingshotString.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHead.Changed", "gCosmetics.Equipment.HammerHead.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HammerHandle.Changed",
+      "gCosmetics.Equipment.HammerHandle.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotChain.Changed",
+      "gCosmetics.Equipment.HookshotChain.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_HookshotTip.Changed", "gCosmetics.Equipment.HookshotTip.Changed" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_Target.Changed",
+      "gCosmetics.HookshotReticle.Target.Changed" },
+    { MigrationAction::Rename, "gCosmetics.HookshotReticle_NonTarget.Changed",
+      "gCosmetics.HookshotReticle.NonTarget.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowTips.Changed", "gCosmetics.Equipment.BowTips.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowString.Changed", "gCosmetics.Equipment.BowString.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowBody.Changed", "gCosmetics.Equipment.BowBody.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BowHandle.Changed", "gCosmetics.Equipment.BowHandle.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuFace.Changed", "gCosmetics.Equipment.ChuFace.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_ChuBody.Changed", "gCosmetics.Equipment.ChuBody.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Equipment_BunnyHood.Changed", "gCosmetics.Equipment.BunnyHood.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Hearts.Changed", "gCosmetics.Consumable.Hearts.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_HeartBorder.Changed",
+      "gCosmetics.Consumable.HeartBorder.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHearts.Changed", "gCosmetics.Consumable.DDHearts.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_DDHeartBorder.Changed",
+      "gCosmetics.Consumable.DDHeartBorder.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_Magic.Changed", "gCosmetics.Consumable.Magic.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicActive.Changed",
+      "gCosmetics.Consumable.MagicActive.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorder.Changed",
+      "gCosmetics.Consumable.MagicBorder.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_MagicBorderActive.Changed",
+      "gCosmetics.Consumable.MagicBorderActive.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GreenRupee.Changed", "gCosmetics.Consumable.GreenRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_BlueRupee.Changed", "gCosmetics.Consumable.BlueRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_RedRupee.Changed", "gCosmetics.Consumable.RedRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_PurpleRupee.Changed",
+      "gCosmetics.Consumable.PurpleRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_GoldRupee.Changed", "gCosmetics.Consumable.GoldRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Consumable_SilverRupee.Changed",
+      "gCosmetics.Consumable.SilverRupee.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_AButton.Changed", "gCosmetics.HUD.AButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_BButton.Changed", "gCosmetics.HUD.BButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CButtons.Changed", "gCosmetics.HUD.CButtons.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CUpButton.Changed", "gCosmetics.HUD.CUpButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CDownButton.Changed", "gCosmetics.HUD.CDownButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CLeftButton.Changed", "gCosmetics.HUD.CLeftButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_CRightButton.Changed", "gCosmetics.HUD.CRightButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StartButton.Changed", "gCosmetics.HUD.StartButton.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Dpad.Changed", "gCosmetics.HUD.Dpad.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_KeyCount.Changed", "gCosmetics.HUD.KeyCount.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_StoneOfAgony.Changed", "gCosmetics.HUD.StoneOfAgony.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_Minimap.Changed", "gCosmetics.HUD.Minimap.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapPosition.Changed", "gCosmetics.HUD.MinimapPosition.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_MinimapEntrance.Changed", "gCosmetics.HUD.MinimapEntrance.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBar.Changed", "gCosmetics.HUD.EnemyHealthBar.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_EnemyHealthBorder.Changed", "gCosmetics.HUD.EnemyHealthBorder.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorText.Changed", "gCosmetics.HUD.NameTagActorText.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Hud_NameTagActorBackground.Changed",
+      "gCosmetics.HUD.NameTagActorBackground.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelA.Changed", "gCosmetics.Kaleido.ItemSelA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelB.Changed", "gCosmetics.Kaleido.ItemSelB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelC.Changed", "gCosmetics.Kaleido.ItemSelC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_ItemSelD.Changed", "gCosmetics.Kaleido.ItemSelD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelA.Changed", "gCosmetics.Kaleido.EquipSelA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelB.Changed", "gCosmetics.Kaleido.EquipSelB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelC.Changed", "gCosmetics.Kaleido.EquipSelC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_EquipSelD.Changed", "gCosmetics.Kaleido.EquipSelD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunA.Changed", "gCosmetics.Kaleido.MapSelDunA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunB.Changed", "gCosmetics.Kaleido.MapSelDunB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunC.Changed", "gCosmetics.Kaleido.MapSelDunC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelDunD.Changed", "gCosmetics.Kaleido.MapSelDunD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusA.Changed", "gCosmetics.Kaleido.QuestStatusA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusB.Changed", "gCosmetics.Kaleido.QuestStatusB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusC.Changed", "gCosmetics.Kaleido.QuestStatusC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_QuestStatusD.Changed", "gCosmetics.Kaleido.QuestStatusD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectA.Changed", "gCosmetics.Kaleido.MapSelectA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectB.Changed", "gCosmetics.Kaleido.MapSelectB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectC.Changed", "gCosmetics.Kaleido.MapSelectC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_MapSelectD.Changed", "gCosmetics.Kaleido.MapSelectD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveA.Changed", "gCosmetics.Kaleido.SaveA.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveB.Changed", "gCosmetics.Kaleido.SaveB.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveC.Changed", "gCosmetics.Kaleido.SaveC.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_SaveD.Changed", "gCosmetics.Kaleido.SaveD.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Kal_NamePanel.Changed", "gCosmetics.Kaleido.NamePanel.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_FileChoose.Changed", "gCosmetics.Title.FileChoose.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_NintendoLogo.Changed", "gCosmetics.Title.NintendoLogo.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoRed.Changed", "gCosmetics.Title.N64LogoRed.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoBlue.Changed", "gCosmetics.Title.N64LogoBlue.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoGreen.Changed", "gCosmetics.Title.N64LogoGreen.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_N64LogoYellow.Changed", "gCosmetics.Title.N64LogoYellow.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_FirePrimary.Changed", "gCosmetics.Title.FirePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Title_FireSecondary.Changed", "gCosmetics.Title.FireSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalPrimary.Changed", "gCosmetics.Arrows.NormalPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_NormalSecondary.Changed",
+      "gCosmetics.Arrows.NormalSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FirePrimary.Changed", "gCosmetics.Arrows.FirePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_FireSecondary.Changed", "gCosmetics.Arrows.FireSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IcePrimary.Changed", "gCosmetics.Arrows.IcePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_IceSecondary.Changed", "gCosmetics.Arrows.IceSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightPrimary.Changed", "gCosmetics.Arrows.LightPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Arrows_LightSecondary.Changed", "gCosmetics.Arrows.LightSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsPrimary.Changed", "gCosmetics.Magic.DinsPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_DinsSecondary.Changed", "gCosmetics.Magic.DinsSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresPrimary.Changed", "gCosmetics.Magic.FaroresPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_FaroresSecondary.Changed",
+      "gCosmetics.Magic.FaroresSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusPrimary.Changed", "gCosmetics.Magic.NayrusPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Magic_NayrusSecondary.Changed", "gCosmetics.Magic.NayrusSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Primary.Changed",
+      "gCosmetics.SpinAttack.Level1Primary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level1Secondary.Changed",
+      "gCosmetics.SpinAttack.Level1Secondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Primary.Changed",
+      "gCosmetics.SpinAttack.Level2Primary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.SpinAttack_Level2Secondary.Changed",
+      "gCosmetics.SpinAttack.Level2Secondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Bombchu.Changed", "gCosmetics.Trails.Bombchu.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Boomerang.Changed", "gCosmetics.Trails.Boomerang.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_KokiriSword.Changed", "gCosmetics.Trails.KokiriSword.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_MasterSword.Changed", "gCosmetics.Trails.MasterSword.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_BiggoronSword.Changed", "gCosmetics.Trails.BiggoronSword.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Stick.Changed", "gCosmetics.Trails.Stick.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Trails_Hammer.Changed", "gCosmetics.Trails.Hammer.Changed" },
+    { MigrationAction::Rename, "gCosmetics.World_BlockOfTime.Changed", "gCosmetics.World.BlockOfTime.Changed" },
+    { MigrationAction::Rename, "gCosmetics.World_Moon.Changed", "gCosmetics.World.Moon.Changed" },
+    { MigrationAction::Rename, "gCosmetics.World_GossipStone.Changed", "gCosmetics.World.GossipStone.Changed" },
+    { MigrationAction::Rename, "gCosmetics.World_RedIce.Changed", "gCosmetics.World.RedIce.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdlePrimary.Changed", "gCosmetics.Navi.IdlePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_IdleSecondary.Changed", "gCosmetics.Navi.IdleSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCPrimary.Changed", "gCosmetics.Navi.NPCPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_NPCSecondary.Changed", "gCosmetics.Navi.NPCSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemyPrimary.Changed", "gCosmetics.Navi.EnemyPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_EnemySecondary.Changed", "gCosmetics.Navi.EnemySecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsPrimary.Changed", "gCosmetics.Navi.PropsPrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Navi_PropsSecondary.Changed", "gCosmetics.Navi.PropsSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdlePrimary.Changed", "gCosmetics.Ivan.IdlePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.Ivan_IdleSecondary.Changed", "gCosmetics.Ivan.IdleSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeesePrimary.Changed", "gCosmetics.NPC.FireKeesePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_FireKeeseSecondary.Changed",
+      "gCosmetics.NPC.FireKeeseSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeesePrimary.Changed", "gCosmetics.NPC.IceKeesePrimary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IceKeeseSecondary.Changed", "gCosmetics.NPC.IceKeeseSecondary.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog1.Changed", "gCosmetics.NPC.Dog1.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Dog2.Changed", "gCosmetics.NPC.Dog2.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_GoldenSkulltula.Changed", "gCosmetics.NPC.GoldenSkulltula.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Kokiri.Changed", "gCosmetics.NPC.Kokiri.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_Gerudo.Changed", "gCosmetics.NPC.Gerudo.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_MetalTrap.Changed", "gCosmetics.NPC.MetalTrap.Changed" },
+    { MigrationAction::Rename, "gCosmetics.NPC_IronKnuckles.Changed", "gCosmetics.NPC.IronKnuckles.Changed" },
+    { MigrationAction::Rename, "gHUDMargin_T", "gCosmetics.HUD.Margin.T" },
+    { MigrationAction::Rename, "gHUDMargin_L", "gCosmetics.HUD.Margin.L" },
+    { MigrationAction::Rename, "gHUDMargin_R", "gCosmetics.HUD.Margin.R" },
+    { MigrationAction::Rename, "gHUDMargin_B", "gCosmetics.HUD.Margin.B" },
+    { MigrationAction::Rename, "gHearts", "gCosmetics.HUD.Hearts" },
+    { MigrationAction::Rename, "gHeartsCount", "gCosmetics.HUD.HeartsCount" },
+    { MigrationAction::Rename, "gMagicBar", "gCosmetics.HUD.MagicBar" },
+    { MigrationAction::Rename, "gVSOA", "gCosmetics.HUD.VisualSoA" },
+    { MigrationAction::Rename, "gBBtn", "gCosmetics.HUD.BButton" },
+    { MigrationAction::Rename, "gABtn", "gCosmetics.HUD.AButton" },
+    { MigrationAction::Rename, "gStartBtn", "gCosmetics.HUD.StartButton" },
+    { MigrationAction::Rename, "gCBtnU", "gCosmetics.HUD.CUpButton" },
+    { MigrationAction::Rename, "gCBtnD", "gCosmetics.HUD.CDownButton" },
+    { MigrationAction::Rename, "gCBtnL", "gCosmetics.HUD.CLeftButton" },
+    { MigrationAction::Rename, "gCBtnR", "gCosmetics.HUD.CRightButton" },
+    { MigrationAction::Rename, "gDPad", "gCosmetics.HUD.Dpad" },
+    { MigrationAction::Rename, "gMinimap", "gCosmetics.HUD.Minimap" },
+    { MigrationAction::Rename, "gSKC", "gCosmetics.HUD.SmallKey" },
+    { MigrationAction::Rename, "gRC", "gCosmetics.HUD.Rupees" },
+    { MigrationAction::Rename, "gCarrots", "gCosmetics.HUD.Carrots" },
+    { MigrationAction::Rename, "gTimers", "gCosmetics.HUD.Timers" },
+    { MigrationAction::Rename, "gAS", "gCosmetics.HUD.ArcheryScore" },
+    { MigrationAction::Rename, "gTCM", "gCosmetics.HUD.TitleCard.Map" },
+    { MigrationAction::Rename, "gTCB", "gCosmetics.HUD.TitleCard.Boss" },
+    { MigrationAction::Rename, "gIGT", "gCosmetics.HUD.IGT" },
+    { MigrationAction::Rename, "gHeartsPosType", "gCosmetics.HUD.Hearts.PosType" },
+    { MigrationAction::Rename, "gHeartsCountPosType", "gCosmetics.HUD.HeartsCount.PosType" },
+    { MigrationAction::Rename, "gMagicBarPosType", "gCosmetics.HUD.MagicBar.PosType" },
+    { MigrationAction::Rename, "gVSOAPosType", "gCosmetics.HUD.VisualSoA.PosType" },
+    { MigrationAction::Rename, "gBBtnPosType", "gCosmetics.HUD.BButton.PosType" },
+    { MigrationAction::Rename, "gABtnPosType", "gCosmetics.HUD.AButton.PosType" },
+    { MigrationAction::Rename, "gStartBtnPosType", "gCosmetics.HUD.StartButton.PosType" },
+    { MigrationAction::Rename, "gCBtnUPosType", "gCosmetics.HUD.CUpButton.PosType" },
+    { MigrationAction::Rename, "gCBtnDPosType", "gCosmetics.HUD.CDownButton.PosType" },
+    { MigrationAction::Rename, "gCBtnLPosType", "gCosmetics.HUD.CLeftButton.PosType" },
+    { MigrationAction::Rename, "gCBtnRPosType", "gCosmetics.HUD.CRightButton.PosType" },
+    { MigrationAction::Rename, "gDPadPosType", "gCosmetics.HUD.Dpad.PosType" },
+    { MigrationAction::Rename, "gMinimapPosType", "gCosmetics.HUD.Minimap.PosType" },
+    { MigrationAction::Rename, "gSKCPosType", "gCosmetics.HUD.SmallKey.PosType" },
+    { MigrationAction::Rename, "gRCPosType", "gCosmetics.HUD.Rupees.PosType" },
+    { MigrationAction::Rename, "gCarrotsPosType", "gCosmetics.HUD.Carrots.PosType" },
+    { MigrationAction::Rename, "gTimersPosType", "gCosmetics.HUD.Timers.PosType" },
+    { MigrationAction::Rename, "gASPosType", "gCosmetics.HUD.ArcheryScore.PosType" },
+    { MigrationAction::Rename, "gTCMPosType", "gCosmetics.HUD.TitleCard.Map.PosType" },
+    { MigrationAction::Rename, "gTCBPosType", "gCosmetics.HUD.TitleCard.Boss.PosType" },
+    { MigrationAction::Rename, "gIGTPosType", "gCosmetics.HUD.IGT.PosType" },
+    { MigrationAction::Rename, "gHeartsPosX", "gCosmetics.HUD.Hearts.PosX" },
+    { MigrationAction::Rename, "gHeartsCountPosX", "gCosmetics.HUD.HeartsCount.PosX" },
+    { MigrationAction::Rename, "gMagicBarPosX", "gCosmetics.HUD.MagicBar.PosX" },
+    { MigrationAction::Rename, "gVSOAPosX", "gCosmetics.HUD.VisualSoA.PosX" },
+    { MigrationAction::Rename, "gBBtnPosX", "gCosmetics.HUD.BButton.PosX" },
+    { MigrationAction::Rename, "gABtnPosX", "gCosmetics.HUD.AButton.PosX" },
+    { MigrationAction::Rename, "gStartBtnPosX", "gCosmetics.HUD.StartButton.PosX" },
+    { MigrationAction::Rename, "gCBtnUPosX", "gCosmetics.HUD.CUpButton.PosX" },
+    { MigrationAction::Rename, "gCBtnDPosX", "gCosmetics.HUD.CDownButton.PosX" },
+    { MigrationAction::Rename, "gCBtnLPosX", "gCosmetics.HUD.CLeftButton.PosX" },
+    { MigrationAction::Rename, "gCBtnRPosX", "gCosmetics.HUD.CRightButton.PosX" },
+    { MigrationAction::Rename, "gDPadPosX", "gCosmetics.HUD.Dpad.PosX" },
+    { MigrationAction::Rename, "gMinimapPosX", "gCosmetics.HUD.Minimap.PosX" },
+    { MigrationAction::Rename, "gSKCPosX", "gCosmetics.HUD.SmallKey.PosX" },
+    { MigrationAction::Rename, "gRCPosX", "gCosmetics.HUD.Rupees.PosX" },
+    { MigrationAction::Rename, "gCarrotsPosX", "gCosmetics.HUD.Carrots.PosX" },
+    { MigrationAction::Rename, "gTimersPosX", "gCosmetics.HUD.Timers.PosX" },
+    { MigrationAction::Rename, "gASPosX", "gCosmetics.HUD.ArcheryScore.PosX" },
+    { MigrationAction::Rename, "gTCMPosX", "gCosmetics.HUD.TitleCard.Map.PosX" },
+    { MigrationAction::Rename, "gTCBPosX", "gCosmetics.HUD.TitleCard.Boss.PosX" },
+    { MigrationAction::Rename, "gIGTPosX", "gCosmetics.HUD.IGT.PosX" },
+    { MigrationAction::Rename, "gHeartsPosY", "gCosmetics.HUD.Hearts.PosY" },
+    { MigrationAction::Rename, "gHeartsCountPosY", "gCosmetics.HUD.HeartsCount.PosY" },
+    { MigrationAction::Rename, "gMagicBarPosY", "gCosmetics.HUD.MagicBar.PosY" },
+    { MigrationAction::Rename, "gVSOAPosY", "gCosmetics.HUD.VisualSoA.PosY" },
+    { MigrationAction::Rename, "gBBtnPosY", "gCosmetics.HUD.BButton.PosY" },
+    { MigrationAction::Rename, "gABtnPosY", "gCosmetics.HUD.AButton.PosY" },
+    { MigrationAction::Rename, "gStartBtnPosY", "gCosmetics.HUD.StartButton.PosY" },
+    { MigrationAction::Rename, "gCBtnUPosY", "gCosmetics.HUD.CUpButton.PosY" },
+    { MigrationAction::Rename, "gCBtnDPosY", "gCosmetics.HUD.CDownButton.PosY" },
+    { MigrationAction::Rename, "gCBtnLPosY", "gCosmetics.HUD.CLeftButton.PosY" },
+    { MigrationAction::Rename, "gCBtnRPosY", "gCosmetics.HUD.CRightButton.PosY" },
+    { MigrationAction::Rename, "gDPadPosY", "gCosmetics.HUD.Dpad.PosY" },
+    { MigrationAction::Rename, "gMinimapPosY", "gCosmetics.HUD.Minimap.PosY" },
+    { MigrationAction::Rename, "gSKCPosY", "gCosmetics.HUD.SmallKey.PosY" },
+    { MigrationAction::Rename, "gRCPosY", "gCosmetics.HUD.Rupees.PosY" },
+    { MigrationAction::Rename, "gCarrotsPosY", "gCosmetics.HUD.Carrots.PosY" },
+    { MigrationAction::Rename, "gTimersPosY", "gCosmetics.HUD.Timers.PosY" },
+    { MigrationAction::Rename, "gASPosY", "gCosmetics.HUD.ArcheryScore.PosY" },
+    { MigrationAction::Rename, "gTCMPosY", "gCosmetics.HUD.TitleCard.Map.PosY" },
+    { MigrationAction::Rename, "gTCBPosY", "gCosmetics.HUD.TitleCard.Boss.PosY" },
+    { MigrationAction::Rename, "gIGTPosY", "gCosmetics.HUD.IGT.PosY" },
+    { MigrationAction::Rename, "gHeartsUseMargins", "gCosmetics.HUD.HeartsUseMargins" },
+    { MigrationAction::Rename, "gHeartsCountUseMargins", "gCosmetics.HUD.HeartsCountUseMargins" },
+    { MigrationAction::Rename, "gMagicBarUseMargins", "gCosmetics.HUD.MagicBarUseMargins" },
+    { MigrationAction::Rename, "gVSOAUseMargins", "gCosmetics.HUD.VisualSoAUseMargins" },
+    { MigrationAction::Rename, "gBBtnUseMargins", "gCosmetics.HUD.BButtonUseMargins" },
+    { MigrationAction::Rename, "gABtnUseMargins", "gCosmetics.HUD.AButtonUseMargins" },
+    { MigrationAction::Rename, "gStartBtnUseMargins", "gCosmetics.HUD.StartButtonUseMargins" },
+    { MigrationAction::Rename, "gCBtnUUseMargins", "gCosmetics.HUD.CUpButtonUseMargins" },
+    { MigrationAction::Rename, "gCBtnDUseMargins", "gCosmetics.HUD.CDownButtonUseMargins" },
+    { MigrationAction::Rename, "gCBtnLUseMargins", "gCosmetics.HUD.CLeftButtonUseMargins" },
+    { MigrationAction::Rename, "gCBtnRUseMargins", "gCosmetics.HUD.CRightButtonUseMargins" },
+    { MigrationAction::Rename, "gDPadUseMargins", "gCosmetics.HUD.DpadUseMargins" },
+    { MigrationAction::Rename, "gMinimapUseMargins", "gCosmetics.HUD.MinimapUseMargins" },
+    { MigrationAction::Rename, "gSKCUseMargins", "gCosmetics.HUD.AButtonUseMargins" },
+    { MigrationAction::Rename, "gRCUseMargins", "gCosmetics.HUD.StartButtonUseMargins" },
+    { MigrationAction::Rename, "gCarrotsUseMargins", "gCosmetics.HUD.CUpButtonUseMargins" },
+    { MigrationAction::Rename, "gTimersUseMargins", "gCosmetics.HUD.CDownButtonUseMargins" },
+    { MigrationAction::Rename, "gASUseMargins", "gCosmetics.HUD.CLeftButtonUseMargins" },
+    { MigrationAction::Rename, "gTCMUseMargins", "gCosmetics.HUD.CRightButtonUseMargins" },
+    { MigrationAction::Rename, "gTCBUseMargins", "gCosmetics.HUD.DpadUseMargins" },
+    { MigrationAction::Rename, "gIGTUseMargins", "gCosmetics.HUD.MinimapUseMargins" },
+    { MigrationAction::Rename, "gUnfixGoronSpin", "gCosmetics.UnfixGoronSpin" },
+    { MigrationAction::Rename, "gNL_Diamond_Env", "gCosmetics.Magic.NayrusSecondary" },
+    { MigrationAction::Rename, "gUseSpellsCol", "gCosmetics.UseSpellsColors" },
+    { MigrationAction::Rename, "gItemTrackerBgColorA", "gTrackers.ItemTracker.BgColor.Value.A" },
+    { MigrationAction::Rename, "gItemTrackerBgColorB", "gTrackers.ItemTracker.BgColor.Value.B" },
+    { MigrationAction::Rename, "gItemTrackerBgColorG", "gTrackers.ItemTracker.BgColor.Value.G" },
+    { MigrationAction::Rename, "gItemTrackerBgColorR", "gTrackers.ItemTracker.BgColor.Value.R" },
+    { MigrationAction::Rename, "gItemTrackerCapacityTrack", "gTrackers.ItemTracker.ItemCountType" },
+    { MigrationAction::Rename, "gItemTrackerComboButton1", "gTrackers.ItemTracker.ComboButton1" },
+    { MigrationAction::Rename, "gItemTrackerComboButton2", "gTrackers.ItemTracker.ComboButton2" },
+    { MigrationAction::Rename, "gItemTrackerCurrentOnLeft", "gTrackers.ItemTracker.ItemCountAlignLeft" },
+    { MigrationAction::Rename, "gItemTrackerDisplayDungeonItemsHorizontal",
+      "gTrackers.ItemTracker.DungeonItems.Layout" },
+    { MigrationAction::Rename, "gItemTrackerDisplayDungeonItemsMaps",
+      "gTrackers.ItemTracker.DungeonItems.DisplayMaps" },
+    { MigrationAction::Rename, "gItemTrackerDisplayType", "gTrackers.ItemTracker.DisplayType.Main" },
+    { MigrationAction::Rename, "gItemTrackerDungeonItemsDisplayType",
+      "gTrackers.ItemTracker.DisplayType.DungeonItems" },
+    { MigrationAction::Rename, "gItemTrackerDungeonRewardsCircle", "gTrackers.ItemTracker.DungeonRewardsLayout" },
+    { MigrationAction::Rename, "gItemTrackerDungeonRewardsDisplayType",
+      "gTrackers.ItemTracker.DisplayType.DungeonRewards" },
+    { MigrationAction::Rename, "gItemTrackerEquipmentItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Equipment" },
+    { MigrationAction::Rename, "gItemTrackerGregDisplayType", "gTrackers.ItemTracker.DisplayType.Greg" },
+    { MigrationAction::Rename, "gItemTrackerHudEditMode", "gTrackers.ItemTracker.HudEditMode" },
+    { MigrationAction::Rename, "gItemTrackerIconSize", "gTrackers.ItemTracker.IconSize" },
+    { MigrationAction::Rename, "gItemTrackerIconSpacing", "gTrackers.ItemTracker.IconSpacing" },
+    { MigrationAction::Rename, "gItemTrackerInventoryItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Inventory" },
+    { MigrationAction::Rename, "gItemTrackerKeyTrack", "gTrackers.ItemTracker.KeyCounts" },
+    { MigrationAction::Rename, "gItemTrackerMiscItemsDisplayType", "gTrackers.ItemTracker.DisplayType.Misc" },
+    { MigrationAction::Rename, "gItemTrackerNotesDisplayType", "gTrackers.ItemTracker.DisplayType.Notes" },
+    { MigrationAction::Rename, "gItemTrackerShowOnlyPaused", "gTrackers.ItemTracker.ShowOnlyPaused" },
+    { MigrationAction::Rename, "gItemTrackerSongsDisplayType", "gTrackers.ItemTracker.DisplayType.Songs" },
+    { MigrationAction::Rename, "gItemTrackerTriforcePieceTrack", "gTrackers.ItemTracker.TriforcePieceCounts" },
+    { MigrationAction::Rename, "gItemTrackerTriforcePiecesDisplayType",
+      "gTrackers.ItemTracker.DisplayType.TriforcePieces" },
+    { MigrationAction::Rename, "gItemTrackerWindowType", "gTrackers.ItemTracker.WindowType" },
+    { MigrationAction::Rename, "gTrackers.ItemTracker.ItemTrackerTextSize", "gTrackers.ItemTracker.TextSize" },
+    { MigrationAction::Rename, "gEntranceTrackerAutoScroll", "gTrackers.EntranceTracker.AutoScroll" },
+    { MigrationAction::Rename, "gEntranceTrackerCollapseUndiscovered",
+      "gTrackers.EntranceTracker.CollapseUndiscovered" },
+    { MigrationAction::Rename, "gEntranceTrackerGroupBy", "gTrackers.EntranceTracker.GroupBy" },
+    { MigrationAction::Rename, "gEntranceTrackerHideReverseEntrances",
+      "gTrackers.EntranceTracker.HideReverseEntrances" },
+    { MigrationAction::Rename, "gEntranceTrackerHighlightAvailable", "gTrackers.EntranceTracker.HighlightAvailable" },
+    { MigrationAction::Rename, "gEntranceTrackerHighlightPrevious", "gTrackers.EntranceTracker.HighlightPrevious" },
+    { MigrationAction::Rename, "gEntranceTrackerShowFrom", "gTrackers.EntranceTracker.ShowFrom" },
+    { MigrationAction::Rename, "gEntranceTrackerShowTo", "gTrackers.EntranceTracker.ShowTo" },
+    { MigrationAction::Rename, "gEntranceTrackerSortBy", "gTrackers.EntranceTracker.SortBy" },
+    { MigrationAction::Rename, "gCheckTrackerAreaCompleteHide", "gTrackers.CheckTracker.AreaComplete.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerAreaExtraCompleteColor",
+      "gTrackers.CheckTracker.AreaComplete.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerAreaExtraIncompleteColor.Value",
+      "gTrackers.CheckTracker.AreaIncomplete.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerAreaIncompleteHide", "gTrackers.CheckTracker.AreaIncomplete.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerAreaMainCompleteColor",
+      "gTrackers.CheckTracker.AreaComplete.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerAreaMainIncompleteColor.Value",
+      "gTrackers.CheckTracker.AreaIncomplete.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerBgColor", "gTrackers.CheckTracker.BgColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerCollectedExtraColor",
+      "gTrackers.CheckTracker.Collected.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerCollectedHide", "gTrackers.CheckTracker.Collected.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerCollectedMainColor", "gTrackers.CheckTracker.Collected.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerComboButton1", "gTrackers.CheckTracker.ComboButton1" },
+    { MigrationAction::Rename, "gCheckTrackerComboButton2", "gTrackers.CheckTracker.ComboButton2" },
+    { MigrationAction::Rename, "gCheckTrackerDisplayType", "gTrackers.CheckTracker.DisplayType" },
+    { MigrationAction::Rename, "gCheckTrackerHintedExtraColor", "gTrackers.CheckTracker.Hinted.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerHintedMainColor", "gTrackers.CheckTracker.Hinted.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerHintedHide", "gTrackers.CheckTracker.Hinted.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerHudEditMode", "gTrackers.CheckTracker.Draggable" },
+    { MigrationAction::Rename, "gCheckTrackerKnownHide", "gTrackers.CheckTracker.Scummed.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerOptionAlwaysShowGSLocs", "gTrackers.CheckTracker.AlwaysShowGSLocs" },
+    { MigrationAction::Rename, "gCheckTrackerOptionHideRightShopChecks",
+      "gTrackers.CheckTracker.HideUnshuffledShopChecks" },
+    { MigrationAction::Rename, "gCheckTrackerOptionMQSpoilers", "gTrackers.CheckTracker.MQSpoilers" },
+    { MigrationAction::Rename, "gCheckTrackerOptionShowHidden", "gTrackers.CheckTracker.ShowHidden" },
+    { MigrationAction::Rename, "gCheckTrackerSavedExtraColor", "gTrackers.CheckTracker.Saved.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerSavedHide", "gTrackers.CheckTracker.Saved.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerSavedMainColor", "gTrackers.CheckTracker.Saved.MainColor" },
+    { MigrationAction::Rename, "gCheckTrackerScummedExtraColor", "gTrackers.CheckTracker.Scummed.ExtraColor" },
+    { MigrationAction::Rename, "gCheckTrackerScummedMainColor", "gTrackers.CheckTracker.Scummed.MainColor" },
+    { MigrationAction::Rename, "gCheckTrackerSeenExtraColor", "gTrackers.CheckTracker.Seen.ExtraColor" },
+    { MigrationAction::Rename, "gCheckTrackerSeenHide", "gTrackers.CheckTracker.Seen.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerSeenMainColor", "gTrackers.CheckTracker.Seen.MainColor" },
+    { MigrationAction::Rename, "gCheckTrackerShowOnlyPaused", "gTrackers.CheckTracker.ShowOnlyPaused" },
+    { MigrationAction::Rename, "gCheckTrackerSkippedExtraColor", "gTrackers.CheckTracker.Skipped.ExtraColor" },
+    { MigrationAction::Rename, "gCheckTrackerSkippedHide", "gTrackers.CheckTracker.Skipped.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerSkippedMainColor", "gTrackers.CheckTracker.Skipped.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerUncheckedExtraColor",
+      "gTrackers.CheckTracker.Unchecked.ExtraColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerUncheckedHide", "gTrackers.CheckTracker.Unchecked.Hide" },
+    { MigrationAction::Rename, "gCheckTrackerUncheckedMainColor", "gTrackers.CheckTracker.Unchecked.MainColor.Value" },
+    { MigrationAction::Rename, "gCheckTrackerWindowType", "gTrackers.CheckTracker.WindowType" },
+    { MigrationAction::Rename, "gRandomize10GSHint", "gRandoSettings.10GSHint" },
+    { MigrationAction::Rename, "gRandomize20GSHint", "gRandoSettings.20GSHint" },
+    { MigrationAction::Rename, "gRandomize30GSHint", "gRandoSettings.30GSHint" },
+    { MigrationAction::Rename, "gRandomize40GSHint", "gRandoSettings.40GSHint" },
+    { MigrationAction::Rename, "gRandomize50GSHint", "gRandoSettings.50GSHint" },
+    { MigrationAction::Rename, "gRandomizeAllLocationsReachable", "gRandoSettings.AllLocationsReachable" },
+    { MigrationAction::Rename, "gRandomizeAltarHint", "gRandoSettings.AltarHint" },
+    { MigrationAction::Rename, "gRandomizeBigPoeTargetCount", "gRandoSettings.BigPoeTargetCount" },
+    { MigrationAction::Rename, "gRandomizeBlueFireArrows", "gRandoSettings.BlueFireArrows" },
+    { MigrationAction::Rename, "gRandomizeBombchusInLogic", "gRandoSettings.BombchusInLogic" },
+    { MigrationAction::Rename, "gRandomizeBossKeysanity", "gRandoSettings.BossKeysanity" },
+    { MigrationAction::Rename, "gRandomizeBridgeRewardOptions", "gRandoSettings.BridgeRewardOptions" },
+    { MigrationAction::Rename, "gRandomizeCompleteMaskQuest", "gRandoSettings.CompleteMaskQuest" },
+    { MigrationAction::Rename, "gRandomizeCuccosToReturn", "gRandoSettings.CuccosToReturn" },
+    { MigrationAction::Rename, "gRandomizeDampeHint", "gRandoSettings.DampeHint" },
+    { MigrationAction::Rename, "gRandomizeDecoupleEntrances", "gRandoSettings.DecoupleEntrances" },
+    { MigrationAction::Rename, "gRandomizeDoorOfTime", "gRandoSettings.DoorOfTime" },
+    { MigrationAction::Rename, "gRandomizeDungeonCount", "gRandoSettings.DungeonCount" },
+    { MigrationAction::Rename, "gRandomizeEnableBombchuDrops", "gRandoSettings.EnableBombchuDrops" },
+    { MigrationAction::Rename, "gRandomizeEnabledTricks", "gRandoSettings.EnabledTricks" },
+    { MigrationAction::Rename, "gRandomizeForest", "gRandoSettings.ClosedForest" },
+    { MigrationAction::Rename, "gRandomizeFrogsHint", "gRandoSettings.FrogsHint" },
+    { MigrationAction::Rename, "gRandomizeFullWallets", "gRandoSettings.FullWallets" },
+    { MigrationAction::Rename, "gRandomizeGanonTrial", "gRandoSettings.GanonTrial" },
+    { MigrationAction::Rename, "gRandomizeGanonTrialCount", "gRandoSettings.GanonTrialCount" },
+    { MigrationAction::Rename, "gRandomizeGerudoFortress", "gRandoSettings.FortressCarpenters" },
+    { MigrationAction::Rename, "gRandomizeGerudoKeys", "gRandoSettings.GerudoKeys" },
+    { MigrationAction::Rename, "gRandomizeGossipStoneHints", "gRandoSettings.GossipStoneHints" },
+    { MigrationAction::Rename, "gRandomizeGregHint", "gRandoSettings.GregHint" },
+    { MigrationAction::Rename, "gRandomizeGsExpectSunsSong", "gRandoSettings.GsExpectSunsSong" },
+    { MigrationAction::Rename, "gRandomizeHintClarity", "gRandoSettings.HintClarity" },
+    { MigrationAction::Rename, "gRandomizeHintDistribution", "gRandoSettings.HintDistribution" },
+    { MigrationAction::Rename, "gRandomizeIceTraps", "gRandoSettings.IceTraps" },
+    { MigrationAction::Rename, "gRandomizeItemPool", "gRandoSettings.ItemPool" },
+    { MigrationAction::Rename, "gRandomizeKakarikoGate", "gRandoSettings.KakarikoGate" },
+    { MigrationAction::Rename, "gRandomizeKeysanity", "gRandoSettings.Keysanity" },
+    { MigrationAction::Rename, "gRandomizeLAHint", "gRandoSettings.LAHint" },
+    { MigrationAction::Rename, "gRandomizeLacsDungeonCount", "gRandoSettings.LacsDungeonCount" },
+    { MigrationAction::Rename, "gRandomizeLacsMedallionCount", "gRandoSettings.LacsMedallionCount" },
+    { MigrationAction::Rename, "gRandomizeLacsRewardCount", "gRandoSettings.LacsRewardCount" },
+    { MigrationAction::Rename, "gRandomizeLacsRewardOptions", "gRandoSettings.LacsRewardOptions" },
+    { MigrationAction::Rename, "gRandomizeLacsStoneCount", "gRandoSettings.LacsStoneCount" },
+    { MigrationAction::Rename, "gRandomizeLacsTokenCount", "gRandoSettings.LacsTokenCount" },
+    { MigrationAction::Rename, "gRandomizeLinksPocket", "gRandoSettings.LinksPocket" },
+    { MigrationAction::Rename, "gRandomizeLogicRules", "gRandoSettings.LogicRules" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonCount", "gRandoSettings.MQDungeonCount" },
+    { MigrationAction::Rename, "gRandomizeMqDungeons", "gRandoSettings.MQDungeons" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsBottomOfTheWell", "gRandoSettings.MQDungeonsBottomOfTheWell" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsDekuTree", "gRandoSettings.MQDungeonsDekuTree" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsDodongosCavern", "gRandoSettings.MQDungeonsDodongosCavern" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsFireTemple", "gRandoSettings.MQDungeonsFireTemple" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsForestTemple", "gRandoSettings.MQDungeonsForestTemple" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsGTG", "gRandoSettings.MQDungeonsGTG" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsGanonsCastle", "gRandoSettings.MQDungeonsGanonsCastle" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsIceCavern", "gRandoSettings.MQDungeonsIceCavern" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsJabuJabu", "gRandoSettings.MQDungeonsJabuJabu" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsShadowTemple", "gRandoSettings.MQDungeonsShadowTemple" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsSpiritTemple", "gRandoSettings.MQDungeonsSpiritTemple" },
+    { MigrationAction::Rename, "gRandomizeMqDungeonsWaterTemple", "gRandoSettings.MQDungeonsWaterTemple" },
+    { MigrationAction::Rename, "gRandomizeMedallionCount", "gRandoSettings.MedallionCount" },
+    { MigrationAction::Rename, "gRandomizeMixBosses", "gRandoSettings.MixBosses" },
+    { MigrationAction::Rename, "gRandomizeMixDungeons", "gRandoSettings.MixDungeons" },
+    { MigrationAction::Rename, "gRandomizeMixGrottos", "gRandoSettings.MixGrottos" },
+    { MigrationAction::Rename, "gRandomizeMixInteriors", "gRandoSettings.MixInteriors" },
+    { MigrationAction::Rename, "gRandomizeMixOverworld", "gRandoSettings.MixOverworld" },
+    { MigrationAction::Rename, "gRandomizeMixedEntrances", "gRandoSettings.MixedEntrances" },
+    { MigrationAction::Rename, "gRandomizeRainbowBridge", "gRandoSettings.RainbowBridge" },
+    { MigrationAction::Rename, "gRandomizeRewardCount", "gRandoSettings.RewardCount" },
+    { MigrationAction::Rename, "gRandomizeSariaHint", "gRandoSettings.SariaHint" },
+    { MigrationAction::Rename, "gRandomizeScrubText", "gRandoSettings.ScrubText" },
+    { MigrationAction::Remove, "gRandomizeShopsanity" },
+    { MigrationAction::Rename, "gRandomizeShopsanityPrices", "gRandoSettings.ShopsanityPrices" },
+    { MigrationAction::Rename, "gRandomizeShopsanityPricesAffordable", "gRandoSettings.ShopsanityPricesAffordable" },
+    { MigrationAction::Rename, "gRandomizeShuffle100GSReward", "gRandoSettings.Shuffle100GSReward" },
+    { MigrationAction::Rename, "gRandomizeShuffleAdultTrade", "gRandoSettings.ShuffleAdultTrade" },
+    { MigrationAction::Rename, "gRandomizeShuffleBeans", "gRandoSettings.ShuffleBeans" },
+    { MigrationAction::Rename, "gRandomizeShuffleBossEntrances", "gRandoSettings.ShuffleBossEntrances" },
+    { MigrationAction::Rename, "gRandomizeShuffleCows", "gRandoSettings.ShuffleCows" },
+    { MigrationAction::Rename, "gRandomizeShuffleDungeonReward", "gRandoSettings.ShuffleDungeonReward" },
+    { MigrationAction::Rename, "gRandomizeShuffleDungeonsEntrances", "gRandoSettings.ShuffleDungeonsEntrances" },
+    { MigrationAction::Rename, "gRandomizeShuffleFrogSongRupees", "gRandoSettings.ShuffleFrogSongRupees" },
+    { MigrationAction::Rename, "gRandomizeShuffleGanonBossKey", "gRandoSettings.ShuffleGanonBossKey" },
+    { MigrationAction::Rename, "gRandomizeShuffleGerudoToken", "gRandoSettings.ShuffleGerudoToken" },
+    { MigrationAction::Rename, "gRandomizeShuffleGrottosEntrances", "gRandoSettings.ShuffleGrottosEntrances" },
+    { MigrationAction::Rename, "gRandomizeShuffleInteriorsEntrances", "gRandoSettings.ShuffleInteriorsEntrances" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRings", "gRandoSettings.ShuffleKeyRings" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsBottomOfTheWell",
+      "gRandoSettings.ShuffleKeyRingsBottomOfTheWell" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsFireTemple", "gRandoSettings.ShuffleKeyRingsFireTemple" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsForestTemple", "gRandoSettings.ShuffleKeyRingsForestTemple" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGTG", "gRandoSettings.ShuffleKeyRingsGTG" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGanonsCastle", "gRandoSettings.ShuffleKeyRingsGanonsCastle" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsGerudoFortress",
+      "gRandoSettings.ShuffleKeyRingsGerudoFortress" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsRandomCount", "gRandoSettings.ShuffleKeyRingsRandomCount" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsShadowTemple", "gRandoSettings.ShuffleKeyRingsShadowTemple" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsSpiritTemple", "gRandoSettings.ShuffleKeyRingsSpiritTemple" },
+    { MigrationAction::Rename, "gRandomizeShuffleKeyRingsWaterTemple", "gRandoSettings.ShuffleKeyRingsWaterTemple" },
+    { MigrationAction::Rename, "gRandomizeShuffleKokiriSword", "gRandoSettings.ShuffleKokiriSword" },
+    { MigrationAction::Rename, "gRandomizeShuffleMasterSword", "gRandoSettings.ShuffleMasterSword" },
+    { MigrationAction::Rename, "gRandomizeShuffleMerchants", "gRandoSettings.ShuffleMerchants" },
+    { MigrationAction::Rename, "gRandomizeShuffleOcarinas", "gRandoSettings.ShuffleOcarinas" },
+    { MigrationAction::Rename, "gRandomizeShuffleOverworldEntrances", "gRandoSettings.ShuffleOverworldEntrances" },
+    { MigrationAction::Rename, "gRandomizeShuffleOverworldSpawns", "gRandoSettings.ShuffleOverworldSpawns" },
+    { MigrationAction::Rename, "gRandomizeShuffleOwlDrops", "gRandoSettings.ShuffleOwlDrops" },
+    { MigrationAction::Remove, "gRandomizeShuffleScrubs" },
+    { MigrationAction::Rename, "gRandomizeShuffleSongs", "gRandoSettings.ShuffleSongs" },
+    { MigrationAction::Rename, "gRandomizeShuffleTokens", "gRandoSettings.ShuffleTokens" },
+    { MigrationAction::Rename, "gRandomizeShuffleWarpSongs", "gRandoSettings.ShuffleWarpSongs" },
+    { MigrationAction::Rename, "gRandomizeShuffleWeirdEgg", "gRandoSettings.ShuffleWeirdEgg" },
+    { MigrationAction::Rename, "gRandomizeSkipChildZelda", "gRandoSettings.SkipChildZelda" },
+    { MigrationAction::Rename, "gRandomizeSkipEponaRace", "gRandoSettings.SkipEponaRace" },
+    { MigrationAction::Rename, "gRandomizeSkipScarecrowsSong", "gRandoSettings.SkipScarecrowsSong" },
+    { MigrationAction::Rename, "gRandomizeSkipTowerEscape", "gRandoSettings.SkipTowerEscape" },
+    { MigrationAction::Rename, "gRandomizeStartingAge", "gRandoSettings.StartingAge" },
+    { MigrationAction::Rename, "gRandomizeStartingBoleroOfFire", "gRandoSettings.StartingBoleroOfFire" },
+    { MigrationAction::Rename, "gRandomizeStartingConsumables", "gRandoSettings.StartingConsumables" },
+    { MigrationAction::Rename, "gRandomizeStartingDekuShield", "gRandoSettings.StartingDekuShield" },
+    { MigrationAction::Rename, "gRandomizeStartingEponasSong", "gRandoSettings.StartingEponasSong" },
+    { MigrationAction::Rename, "gRandomizeStartingKokiriSword", "gRandoSettings.StartingKokiriSword" },
+    { MigrationAction::Rename, "gRandomizeStartingMapsCompasses", "gRandoSettings.StartingMapsCompasses" },
+    { MigrationAction::Rename, "gRandomizeStartingMinuetOfForest", "gRandoSettings.StartingMinuetOfForest" },
+    { MigrationAction::Rename, "gRandomizeStartingNocturneOfShadow", "gRandoSettings.StartingNocturneOfShadow" },
+    { MigrationAction::Rename, "gRandomizeStartingOcarina", "gRandoSettings.StartingOcarina" },
+    { MigrationAction::Rename, "gRandomizeStartingPreludeOfLight", "gRandoSettings.StartingPreludeOfLight" },
+    { MigrationAction::Rename, "gRandomizeStartingRequiemOfSpirit", "gRandoSettings.StartingRequiemOfSpirit" },
+    { MigrationAction::Rename, "gRandomizeStartingSariasSong", "gRandoSettings.StartingSariasSong" },
+    { MigrationAction::Rename, "gRandomizeStartingSerenadeOfWater", "gRandoSettings.StartingSerenadeOfWater" },
+    { MigrationAction::Rename, "gRandomizeStartingSkulltulaToken", "gRandoSettings.StartingSkulltulaToken" },
+    { MigrationAction::Rename, "gRandomizeStartingSongOfStorms", "gRandoSettings.StartingSongOfStorms" },
+    { MigrationAction::Rename, "gRandomizeStartingSongOfTime", "gRandoSettings.StartingSongOfTime" },
+    { MigrationAction::Rename, "gRandomizeStartingSunsSong", "gRandoSettings.StartingSunsSong" },
+    { MigrationAction::Rename, "gRandomizeStartingZeldasLullaby", "gRandoSettings.StartingZeldasLullaby" },
+    { MigrationAction::Rename, "gRandomizeStoneCount", "gRandoSettings.StoneCount" },
+    { MigrationAction::Rename, "gRandomizeSunlightArrows", "gRandoSettings.SunlightArrows" },
+    { MigrationAction::Rename, "gRandomizeTokenCount", "gRandoSettings.TokenCount" },
+    { MigrationAction::Rename, "gRandomizeTriforceHunt", "gRandoSettings.TriforceHunt" },
+    { MigrationAction::Rename, "gRandomizeTriforceHuntRequiredPieces", "gRandoSettings.TriforceHuntRequiredPieces" },
+    { MigrationAction::Rename, "gRandomizeTriforceHuntTotalPieces", "gRandoSettings.TriforceHuntTotalPieces" },
+    { MigrationAction::Rename, "gRandomizeWarpSongText", "gRandoSettings.WarpSongText" },
+    { MigrationAction::Rename, "gRandomizeZorasFountain", "gRandoSettings.ZorasFountain" },
+    { MigrationAction::Rename, "gLoadedPreset", "gRandoSettings.LoadedPreset" },
+    { MigrationAction::Rename, "gRandoRelevantNavi", "gRandoEnhancements.RandoRelevantNavi" },
+    { MigrationAction::Rename, "gRandomizeRupeeNames", "gRandoEnhancements.RandomizeRupeeNames" },
+    { MigrationAction::Rename, "gRandoMatchKeyColors", "gRandoEnhancements.MatchKeyColors" },
+    { MigrationAction::Rename, "gRandoQuestItemFanfares", "gRandoEnhancements.QuestItemFanfares" },
+    { MigrationAction::Rename, "gInputEnabled", "gOpenWindows.InputViewer" },
+    { MigrationAction::Rename, "gOpenMenuBar", "gSettings.OpenMenuBar" },
+    { MigrationAction::Rename, "gRandomizeSkipChildStealth", "gRandoSettings.SkipChildStealth" },
+    { MigrationAction::Rename, "gRandomizeExcludedLocations", "gRandoSettings.ExcludedLocations" },
+    { MigrationAction::Rename, "gAltAssets", "gEnhancements.AltAssets" },
+    { MigrationAction::Rename, "gMSAAValue", "gSettings.MSAAValue" },
+    { MigrationAction::Rename, "gInternalResolution", "gSettings.InternalResolution" },
+    { MigrationAction::Rename, "gTextureFilter", "gSettings.TextureFilter" },
+    { MigrationAction::Rename, "gVsyncEnabled", "gSettings.VsyncEnabled" },
+    { MigrationAction::Rename, "gControlNav", "gSettings.ControlNav" },
+    { MigrationAction::Rename, "gEnableMultiViewports", "gSettings.EnableMultiViewports" },
+    { MigrationAction::Rename, "gOverlayFont", "gSettings.OverlayFont" },
+    { MigrationAction::Rename, "gCrowdControl", "gRemote.CrowdControl" },
+    { MigrationAction::Remove, "gItemTrackerNotes0" },
+    { MigrationAction::Remove, "gItemTrackerNotes1" },
+    { MigrationAction::Remove, "gItemTrackerNotes2" },
+    { MigrationAction::Remove, "gHideBuildInfo" },
+    { MigrationAction::Remove, "gGameControlEditorEnabled" },
+    { MigrationAction::Remove, "gPreset0" },
+    { MigrationAction::Remove, "gPreset1" },
+};
+} // namespace SOH
diff --git a/soh/soh/config/ConfigUpdaters.cpp b/soh/soh/config/ConfigUpdaters.cpp
index 0f3324be7b..ff451d98cd 100644
--- a/soh/soh/config/ConfigUpdaters.cpp
+++ b/soh/soh/config/ConfigUpdaters.cpp
@@ -3,109 +3,112 @@
 #include "soh/Enhancements/audio/AudioCollection.h"
 
 namespace SOH {
-    ConfigVersion1Updater::ConfigVersion1Updater() : ConfigVersionUpdater(1) {}
-    ConfigVersion2Updater::ConfigVersion2Updater() : ConfigVersionUpdater(2) {}
-    ConfigVersion3Updater::ConfigVersion3Updater() : ConfigVersionUpdater(3) {}
-    
-    void ConfigVersion1Updater::Update(Ship::Config* conf) {
-        if (conf->GetInt("Window.Width", 640) == 640) {
-            conf->Erase("Window.Width");
+ConfigVersion1Updater::ConfigVersion1Updater() : ConfigVersionUpdater(1) {
+}
+ConfigVersion2Updater::ConfigVersion2Updater() : ConfigVersionUpdater(2) {
+}
+ConfigVersion3Updater::ConfigVersion3Updater() : ConfigVersionUpdater(3) {
+}
+
+void ConfigVersion1Updater::Update(Ship::Config* conf) {
+    if (conf->GetInt("Window.Width", 640) == 640) {
+        conf->Erase("Window.Width");
+    }
+    if (conf->GetInt("Window.Height", 480) == 480) {
+        conf->Erase("Window.Height");
+    }
+    if (conf->GetInt("Window.PositionX", 100) == 100) {
+        conf->Erase("Window.PositionX");
+    }
+    if (conf->GetInt("Window.PositionY", 100) == 100) {
+        conf->Erase("Window.PositionY");
+    }
+    if (conf->GetString("Window.GfxBackend", "") == "") {
+        conf->Erase("Window.GfxBackend");
+    }
+    if (conf->GetString("Window.GfxApi", "") == "") {
+        conf->Erase("Window.GfxApi");
+    }
+    if (conf->GetString("Window.AudioBackend", "") == "") {
+        conf->Erase("Window.AudioBackend");
+    }
+    if (conf->GetBool("Window.Fullscreen.Enabled", false) == false) {
+        conf->Erase("Window.Fullscreen.Enabled");
+    }
+    if (conf->GetInt("Window.Fullscreen.Width", 1920) == 1920) {
+        conf->Erase("Window.Fullscreen.Width");
+    }
+    if (conf->GetInt("Window.Fullscreen.Height", 1080) == 1080) {
+        conf->Erase("Window.Fullscreen.Height");
+    }
+    if (conf->GetInt("Shortcuts.Fullscreen", Ship::KbScancode::LUS_KB_F11) == Ship::KbScancode::LUS_KB_F10) {
+        conf->Erase("Shortcuts.Fullscreen");
+    }
+    if (conf->GetInt("Shortcuts.Console", Ship::KbScancode::LUS_KB_OEM_3) == Ship::KbScancode::LUS_KB_OEM_3) {
+        conf->Erase("Shortcuts.Console");
+    }
+    if (conf->GetString("Game.SaveName", "") == "") {
+        conf->Erase("Game.SaveName");
+    }
+    if (conf->GetString("Game.Main Archive", "") == "") {
+        conf->Erase("Game.Main Archive");
+    }
+    if (conf->GetString("Game.Patches Archive", "") == "") {
+        conf->Erase("Game.Patches Archive");
+    }
+    if (CVarGetInteger("gDirtPathFix", 0) != 0) {
+        CVarSetInteger(CVAR_Z_FIGHTING_MODE, CVarGetInteger("gDirtPathFix", 0));
+        CVarClear("gDirtPathFix");
+    }
+    if (CVarGetInteger("gRandomizedEnemies", 0) != 0) {
+        if (CVarGetInteger("gSeededRandomizedEnemies", 0)) {
+            CVarSetInteger("gRandomizedEnemies", 2);
         }
-        if (conf->GetInt("Window.Height", 480) == 480) {
-            conf->Erase("Window.Height");
-        }
-        if (conf->GetInt("Window.PositionX", 100) == 100) {
-            conf->Erase("Window.PositionX");
-        }
-        if (conf->GetInt("Window.PositionY", 100) == 100) {
-            conf->Erase("Window.PositionY");
-        }
-        if (conf->GetString("Window.GfxBackend", "") == "") {
-            conf->Erase("Window.GfxBackend");
-        }
-        if (conf->GetString("Window.GfxApi", "") == "") {
-            conf->Erase("Window.GfxApi");
-        }
-        if (conf->GetString("Window.AudioBackend", "") == "") {
-            conf->Erase("Window.AudioBackend");
-        }
-        if (conf->GetBool("Window.Fullscreen.Enabled", false) == false) {
-            conf->Erase("Window.Fullscreen.Enabled");
-        }
-        if (conf->GetInt("Window.Fullscreen.Width", 1920) == 1920) {
-            conf->Erase("Window.Fullscreen.Width");
-        }
-        if (conf->GetInt("Window.Fullscreen.Height", 1080) == 1080) {
-            conf->Erase("Window.Fullscreen.Height");
-        }
-        if (conf->GetInt("Shortcuts.Fullscreen", Ship::KbScancode::LUS_KB_F11) == Ship::KbScancode::LUS_KB_F10) {
-            conf->Erase("Shortcuts.Fullscreen");
-        }
-        if (conf->GetInt("Shortcuts.Console", Ship::KbScancode::LUS_KB_OEM_3) == Ship::KbScancode::LUS_KB_OEM_3) {
-            conf->Erase("Shortcuts.Console");
-        }
-        if (conf->GetString("Game.SaveName", "") == "") {
-            conf->Erase("Game.SaveName");
-        }
-        if (conf->GetString("Game.Main Archive", "") == "") {
-            conf->Erase("Game.Main Archive");
-        }
-        if (conf->GetString("Game.Patches Archive", "") == "") {
-            conf->Erase("Game.Patches Archive");
-        }
-        if (CVarGetInteger("gDirtPathFix", 0) != 0) {
-            CVarSetInteger(CVAR_Z_FIGHTING_MODE, CVarGetInteger("gDirtPathFix", 0));
-            CVarClear("gDirtPathFix");
-        }
-        if (CVarGetInteger("gRandomizedEnemies", 0) != 0) {
-            if (CVarGetInteger("gSeededRandomizedEnemies", 0)) {
-                CVarSetInteger("gRandomizedEnemies", 2);
-            }
-        }
-        CVarClear("gSeededRandomizedEnemies");
+    }
+    CVarClear("gSeededRandomizedEnemies");
+}
+
+void ConfigVersion2Updater::Update(Ship::Config* conf) {
+    CVarClearBlock("gAudioEditor.ReplacedSequences");
+}
+
+void ConfigVersion3Updater::Update(Ship::Config* conf) {
+    conf->EraseBlock("Controllers");
+
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gInjectItemCounts")) {
+        CVarClear("gInjectItemCounts");
+        CVarSetInteger("gEnhancements.InjectItemCounts.GoldSkulltula", 1);
+        CVarSetInteger("gEnhancements.InjectItemCounts.HeartContainer", 1);
+        CVarSetInteger("gEnhancements.InjectItemCounts.HeartPiece", 1);
     }
 
-    void ConfigVersion2Updater::Update(Ship::Config* conf) {
-        CVarClearBlock("gAudioEditor.ReplacedSequences");
+    // Migrate all audio settings to ints
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gGameMasterVolume")) {
+        CVarSetInteger("gSettings.Volume.Master", (int32_t)(CVarGetFloat("gGameMasterVolume", 1.0f) * 100));
+        CVarClear("gGameMasterVolume");
+    }
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gMainMusicVolume")) {
+        CVarSetInteger("gSettings.Volume.MainMusic", (int32_t)(CVarGetFloat("gMainMusicVolume", 1.0f) * 100));
+        CVarClear("gMainMusicVolume");
+    }
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gSubMusicVolume")) {
+        CVarSetInteger("gSettings.Volume.SubMusic", (int32_t)(CVarGetFloat("gSubMusicVolume", 1.0f) * 100));
+        CVarClear("gSubMusicVolume");
+    }
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gSFXMusicVolume")) {
+        CVarSetInteger("gSettings.Volume.SFX", (int32_t)(CVarGetFloat("gSFXMusicVolume", 1.0f) * 100));
+        CVarClear("gSFXMusicVolume");
+    }
+    if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gFanfareVolume")) {
+        CVarSetInteger("gSettings.Volume.Fanfare", (int32_t)(CVarGetFloat("gFanfareVolume", 1.0f) * 100));
+        CVarClear("gFanfareVolume");
     }
 
-    void ConfigVersion3Updater::Update(Ship::Config* conf) {
-        conf->EraseBlock("Controllers");
-
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gInjectItemCounts")) {
-            CVarClear("gInjectItemCounts");
-            CVarSetInteger("gEnhancements.InjectItemCounts.GoldSkulltula", 1);
-            CVarSetInteger("gEnhancements.InjectItemCounts.HeartContainer", 1);
-            CVarSetInteger("gEnhancements.InjectItemCounts.HeartPiece", 1);
-        }
-
-        // Migrate all audio settings to ints
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gGameMasterVolume")) {
-            CVarSetInteger("gSettings.Volume.Master", (int32_t)(CVarGetFloat("gGameMasterVolume", 1.0f) * 100));
-            CVarClear("gGameMasterVolume");
-        }
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gMainMusicVolume")) {
-            CVarSetInteger("gSettings.Volume.MainMusic", (int32_t)(CVarGetFloat("gMainMusicVolume", 1.0f) * 100));
-            CVarClear("gMainMusicVolume");
-        }
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gSubMusicVolume")) {
-            CVarSetInteger("gSettings.Volume.SubMusic", (int32_t)(CVarGetFloat("gSubMusicVolume", 1.0f) * 100));
-            CVarClear("gSubMusicVolume");
-        }
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gSFXMusicVolume")) {
-            CVarSetInteger("gSettings.Volume.SFX", (int32_t)(CVarGetFloat("gSFXMusicVolume", 1.0f) * 100));
-            CVarClear("gSFXMusicVolume");
-        }
-        if (conf->GetNestedJson().contains("CVars") && conf->GetNestedJson()["CVars"].contains("gFanfareVolume")) {
-            CVarSetInteger("gSettings.Volume.Fanfare", (int32_t)(CVarGetFloat("gFanfareVolume", 1.0f) * 100));
-            CVarClear("gFanfareVolume");
-        }
-
-        for (Migration migration : version3Migrations) {
-            if (migration.action == MigrationAction::Rename) {
-                CVarCopy(migration.from.c_str(), migration.to.value().c_str());
-            }
-            CVarClear(migration.from.c_str());
+    for (Migration migration : version3Migrations) {
+        if (migration.action == MigrationAction::Rename) {
+            CVarCopy(migration.from.c_str(), migration.to.value().c_str());
         }
+        CVarClear(migration.from.c_str());
     }
 }
+} // namespace SOH
diff --git a/soh/soh/config/ConfigUpdaters.h b/soh/soh/config/ConfigUpdaters.h
index ebf8b63538..7912be7de0 100644
--- a/soh/soh/config/ConfigUpdaters.h
+++ b/soh/soh/config/ConfigUpdaters.h
@@ -1,21 +1,21 @@
 #include "libultraship/libultraship.h"
 
 namespace SOH {
-    class ConfigVersion1Updater : public Ship::ConfigVersionUpdater {
-        public:
-        ConfigVersion1Updater();
-        void Update(Ship::Config* conf);
-    };
+class ConfigVersion1Updater final : public Ship::ConfigVersionUpdater {
+  public:
+    ConfigVersion1Updater();
+    void Update(Ship::Config* conf);
+};
 
-    class ConfigVersion2Updater : public Ship::ConfigVersionUpdater {
-        public:
-        ConfigVersion2Updater();
-        void Update(Ship::Config* conf);
-    };
+class ConfigVersion2Updater final : public Ship::ConfigVersionUpdater {
+  public:
+    ConfigVersion2Updater();
+    void Update(Ship::Config* conf);
+};
 
-    class ConfigVersion3Updater : public Ship::ConfigVersionUpdater {
-      public:
-        ConfigVersion3Updater();
-        void Update(Ship::Config* conf);
-    };
-}
+class ConfigVersion3Updater final : public Ship::ConfigVersionUpdater {
+  public:
+    ConfigVersion3Updater();
+    void Update(Ship::Config* conf);
+};
+} // namespace SOH
diff --git a/soh/soh/cvar_prefixes.h b/soh/soh/cvar_prefixes.h
index 6ddde97bdc..375833cb1e 100644
--- a/soh/soh/cvar_prefixes.h
+++ b/soh/soh/cvar_prefixes.h
@@ -7,11 +7,13 @@
 #define CVAR_SETTING(var) CVAR_PREFIX_SETTING "." var
 #define CVAR_WINDOW(var) CVAR_PREFIX_WINDOW "." var
 #define CVAR_TRACKER(var) CVAR_PREFIX_TRACKER "." var
-#define CVAR_TRACKER_ITEM(var) CVAR_TRACKER(".ItemTracker." var)
-#define CVAR_TRACKER_CHECK(var) CVAR_TRACKER(".CheckTracker." var)
-#define CVAR_TRACKER_ENTRANCE(var) CVAR_TRACKER(".EntranceTracker." var)
+#define CVAR_TRACKER_ITEM(var) CVAR_TRACKER("ItemTracker." var)
+#define CVAR_TRACKER_CHECK(var) CVAR_TRACKER("CheckTracker." var)
+#define CVAR_TRACKER_ENTRANCE(var) CVAR_TRACKER("EntranceTracker." var)
 #define CVAR_DEVELOPER_TOOLS(var) CVAR_PREFIX_DEVELOPER_TOOLS "." var
 #define CVAR_GENERAL(var) CVAR_PREFIX_GENERAL "." var
 #define CVAR_REMOTE(var) CVAR_PREFIX_REMOTE "." var
-#define CVAR_REMOTE_CROWD_CONTROL(var) CVAR_REMOTE(".CrowdControl." var)
-#define CVAR_REMOTE_SAIL(var) CVAR_REMOTE(".Sail." var)
\ No newline at end of file
+#define CVAR_REMOTE_CROWD_CONTROL(var) CVAR_REMOTE("CrowdControl." var)
+#define CVAR_REMOTE_SAIL(var) CVAR_REMOTE("Sail." var)
+#define CVAR_GAMEPLAY_STATS(var) CVAR_PREFIX_GAMEPLAY_STATS "." var
+#define CVAR_TIME_DISPLAY(var) CVAR_PREFIX_TIME_DISPLAY "." var
\ No newline at end of file
diff --git a/soh/soh/frame_interpolation.cpp b/soh/soh/frame_interpolation.cpp
index c42f0e89f8..ad130a0518 100644
--- a/soh/soh/frame_interpolation.cpp
+++ b/soh/soh/frame_interpolation.cpp
@@ -76,7 +76,6 @@ void Matrix_SetTranslateScaleMtx2(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ,
 MtxF* Matrix_GetCurrent(void);
 
 void SkinMatrix_MtxFMtxFMult(MtxF* mfA, MtxF* mfB, MtxF* dest);
-
 }
 
 static bool invert_matrix(const float m[16], float invOut[16]);
@@ -85,357 +84,362 @@ using namespace std;
 
 namespace {
 
-    enum class Op {
-        OpenChild,
-        CloseChild,
+enum class Op {
+    OpenChild,
+    CloseChild,
 
-        MatrixPush,
-        MatrixPop,
-        MatrixPut,
-        MatrixMult,
-        MatrixTranslate,
-        MatrixScale,
-        MatrixRotate1Coord,
-        MatrixRotateZYX,
-        MatrixTranslateRotateZYX,
-        MatrixSetTranslateRotateYXZ,
-        MatrixMtxFToMtx,
-        MatrixToMtx,
-        MatrixReplaceRotation,
-        MatrixRotateAxis,
-        SkinMatrixMtxFToMtx
-    };
+    MatrixPush,
+    MatrixPop,
+    MatrixPut,
+    MatrixMult,
+    MatrixTranslate,
+    MatrixScale,
+    MatrixRotate1Coord,
+    MatrixRotateZYX,
+    MatrixTranslateRotateZYX,
+    MatrixSetTranslateRotateYXZ,
+    MatrixMtxFToMtx,
+    MatrixToMtx,
+    MatrixReplaceRotation,
+    MatrixRotateAxis,
+    SkinMatrixMtxFToMtx
+};
 
-    typedef pair<const void*, int> label;
+typedef pair<const void*, int> label;
 
-    union Data {
-        Data() {
-        }
-
-        struct {
-            MtxF src;
-        } matrix_put;
-
-        struct {
-            MtxF mf;
-            u8 mode;
-        } matrix_mult;
-
-        struct {
-            f32 x, y, z;
-            u8 mode;
-        } matrix_translate, matrix_scale;
-
-        struct {
-            u32 coord;
-            f32 value;
-            u8 mode;
-        } matrix_rotate_1_coord;
-
-        struct {
-            s16 x, y, z;
-            u8 mode;
-        } matrix_rotate_zyx;
-
-        struct {
-            Vec3f translation;
-            Vec3s rotation;
-        } matrix_translate_rotate_zyx;
-
-        struct {
-            f32 translateX, translateY, translateZ;
-            Vec3s rot;
-            //MtxF mtx;
-            bool has_mtx;
-        } matrix_set_translate_rotate_yxz;
-
-        struct {
-            MtxF src;
-            Mtx* dest;
-        } matrix_mtxf_to_mtx;
-
-        struct {
-            Mtx* dest;
-            MtxF src;
-            bool has_adjusted;
-        } matrix_to_mtx;
-
-        struct {
-            MtxF mf;
-        } matrix_replace_rotation;
-
-        struct {
-            f32 angle;
-            Vec3f axis;
-            u8 mode;
-        } matrix_rotate_axis;
-
-        struct {
-            label key;
-            size_t idx;
-        } open_child;
-    };
-
-    struct Path {
-        map<label, vector<Path>> children;
-        map<Op, vector<Data>> ops;
-        vector<pair<Op, size_t>> items;
-    };
-
-    struct Recording {
-        Path root_path;
-    };
-
-    bool is_recording;
-    vector<Path*> current_path;
-    uint32_t camera_epoch;
-    uint32_t previous_camera_epoch;
-    Recording current_recording;
-    Recording previous_recording;
-
-    bool next_is_actor_pos_rot_matrix;
-    bool has_inv_actor_mtx;
-    MtxF inv_actor_mtx;
-    size_t inv_actor_mtx_path_index;
-
-    Data& append(Op op) {
-        auto& m = current_path.back()->ops[op];
-        current_path.back()->items.emplace_back(op, m.size());
-        return m.emplace_back();
+union Data {
+    Data() {
     }
 
-    struct InterpolateCtx {
-        float step;
-        float w;
-        unordered_map<Mtx*, MtxF> mtx_replacements;
-        MtxF tmp_mtxf, tmp_mtxf2;
-        Vec3f tmp_vec3f;
-        Vec3s tmp_vec3s;
-        MtxF actor_mtx;
+    struct {
+        MtxF src;
+    } matrix_put;
 
-        MtxF* new_replacement(Mtx* addr) {
-            return &mtx_replacements[addr];
-        }
+    struct {
+        MtxF mf;
+        u8 mode;
+    } matrix_mult;
 
-        void interpolate_mtxf(MtxF* res, MtxF* o, MtxF* n) {
-            for (size_t i = 0; i < 4; i++) {
-                for (size_t j = 0; j < 4; j++) {
-                    res->mf[i][j] = w * o->mf[i][j] + step * n->mf[i][j];
-                }
+    struct {
+        f32 x, y, z;
+        u8 mode;
+    } matrix_translate, matrix_scale;
+
+    struct {
+        u32 coord;
+        f32 value;
+        u8 mode;
+    } matrix_rotate_1_coord;
+
+    struct {
+        s16 x, y, z;
+        u8 mode;
+    } matrix_rotate_zyx;
+
+    struct {
+        Vec3f translation;
+        Vec3s rotation;
+    } matrix_translate_rotate_zyx;
+
+    struct {
+        f32 translateX, translateY, translateZ;
+        Vec3s rot;
+        // MtxF mtx;
+        bool has_mtx;
+    } matrix_set_translate_rotate_yxz;
+
+    struct {
+        MtxF src;
+        Mtx* dest;
+    } matrix_mtxf_to_mtx;
+
+    struct {
+        Mtx* dest;
+        MtxF src;
+        bool has_adjusted;
+    } matrix_to_mtx;
+
+    struct {
+        MtxF mf;
+    } matrix_replace_rotation;
+
+    struct {
+        f32 angle;
+        Vec3f axis;
+        u8 mode;
+    } matrix_rotate_axis;
+
+    struct {
+        label key;
+        size_t idx;
+    } open_child;
+};
+
+struct Path {
+    map<label, vector<Path>> children;
+    map<Op, vector<Data>> ops;
+    vector<pair<Op, size_t>> items;
+};
+
+struct Recording {
+    Path root_path;
+};
+
+bool is_recording;
+vector<Path*> current_path;
+uint32_t camera_epoch;
+uint32_t previous_camera_epoch;
+Recording current_recording;
+Recording previous_recording;
+
+bool next_is_actor_pos_rot_matrix;
+bool has_inv_actor_mtx;
+MtxF inv_actor_mtx;
+size_t inv_actor_mtx_path_index;
+
+Data& append(Op op) {
+    auto& m = current_path.back()->ops[op];
+    current_path.back()->items.emplace_back(op, m.size());
+    return m.emplace_back();
+}
+
+struct InterpolateCtx {
+    float step;
+    float w;
+    unordered_map<Mtx*, MtxF> mtx_replacements;
+    MtxF tmp_mtxf, tmp_mtxf2;
+    Vec3f tmp_vec3f;
+    Vec3s tmp_vec3s;
+    MtxF actor_mtx;
+
+    MtxF* new_replacement(Mtx* addr) {
+        return &mtx_replacements[addr];
+    }
+
+    void interpolate_mtxf(MtxF* res, MtxF* o, MtxF* n) {
+        for (size_t i = 0; i < 4; i++) {
+            for (size_t j = 0; j < 4; j++) {
+                res->mf[i][j] = w * o->mf[i][j] + step * n->mf[i][j];
             }
         }
+    }
 
-        float lerp(f32 o, f32 n) {
-            return w * o + step * n;
+    float lerp(f32 o, f32 n) {
+        return w * o + step * n;
+    }
+
+    void lerp_vec3f(Vec3f* res, Vec3f* o, Vec3f* n) {
+        res->x = lerp(o->x, n->x);
+        res->y = lerp(o->y, n->y);
+        res->z = lerp(o->z, n->z);
+    }
+
+    float interpolate_angle(f32 o, f32 n) {
+        if (o == n)
+            return n;
+        o = fmodf(o, 2 * M_PI);
+        if (o < 0.0f) {
+            o += 2 * M_PI;
         }
-
-        void lerp_vec3f(Vec3f* res, Vec3f* o, Vec3f* n) {
-            res->x = lerp(o->x, n->x);
-            res->y = lerp(o->y, n->y);
-            res->z = lerp(o->z, n->z);
+        n = fmodf(n, 2 * M_PI);
+        if (n < 0.0f) {
+            n += 2 * M_PI;
         }
-
-        float interpolate_angle(f32 o, f32 n) {
-            if (o == n)
-                return n;
-            o = fmodf(o, 2 * M_PI);
-            if (o < 0.0f) {
+        if (fabsf(o - n) > M_PI) {
+            if (o < n) {
                 o += 2 * M_PI;
-            }
-            n = fmodf(n, 2 * M_PI);
-            if (n < 0.0f) {
+            } else {
                 n += 2 * M_PI;
             }
-            if (fabsf(o - n) > M_PI) {
-                if (o < n) {
-                    o += 2 * M_PI;
-                } else {
-                    n += 2 * M_PI;
-                }
-            }
-            if (fabsf(o - n) > M_PI / 2) {
-                //return n;
-            }
-            return lerp(o, n);
         }
+        if (fabsf(o - n) > M_PI / 2) {
+            // return n;
+        }
+        return lerp(o, n);
+    }
 
-        s16 interpolate_angle(s16 os, s16 ns) {
-            if (os == ns)
+    s16 interpolate_angle(s16 os, s16 ns) {
+        if (os == ns)
+            return ns;
+        int o = (u16)os;
+        int n = (u16)ns;
+        u16 res;
+        int diff = o - n;
+        if (-0x8000 <= diff && diff <= 0x8000) {
+            if (diff < -0x4000 || diff > 0x4000) {
                 return ns;
-            int o = (u16)os;
-            int n = (u16)ns;
-            u16 res;
-            int diff = o - n;
-            if (-0x8000 <= diff && diff <= 0x8000) {
-                if (diff < -0x4000 || diff > 0x4000) {
-                    return ns;
-                }
-                res = (u16)(w * o + step * n);
+            }
+            res = (u16)(w * o + step * n);
+        } else {
+            if (o < n) {
+                o += 0x10000;
             } else {
-                if (o < n) {
-                    o += 0x10000;
+                n += 0x10000;
+            }
+            diff = o - n;
+            if (diff < -0x4000 || diff > 0x4000) {
+                return ns;
+            }
+            res = (u16)(w * o + step * n);
+        }
+        if (os / 327 == ns / 327 && (s16)res / 327 != os / 327) {
+            int bp = 0;
+        }
+        return res;
+    }
+
+    void interpolate_angles(Vec3s* res, Vec3s* o, Vec3s* n) {
+        res->x = interpolate_angle(o->x, n->x);
+        res->y = interpolate_angle(o->y, n->y);
+        res->z = interpolate_angle(o->z, n->z);
+    }
+
+    void interpolate_branch(Path* old_path, Path* new_path) {
+        for (auto& item : new_path->items) {
+            Data& new_op = new_path->ops[item.first][item.second];
+
+            if (item.first == Op::OpenChild) {
+                if (auto it = old_path->children.find(new_op.open_child.key);
+                    it != old_path->children.end() && new_op.open_child.idx < it->second.size()) {
+                    interpolate_branch(&it->second[new_op.open_child.idx],
+                                       &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
                 } else {
-                    n += 0x10000;
+                    interpolate_branch(&new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx],
+                                       &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
                 }
-                diff = o - n;
-                if (diff < -0x4000 || diff > 0x4000) {
-                    return ns;
-                }
-                res = (u16)(w * o + step * n);
+                continue;
             }
-            if (os / 327 == ns / 327 && (s16)res / 327 != os / 327) {
-                int bp = 0;
-            }
-            return res;
-        }
 
-        void interpolate_angles(Vec3s* res, Vec3s* o, Vec3s* n) {
-            res->x = interpolate_angle(o->x, n->x);
-            res->y = interpolate_angle(o->y, n->y);
-            res->z = interpolate_angle(o->z, n->z);
-        }
+            if (auto it = old_path->ops.find(item.first); it != old_path->ops.end()) {
+                if (item.second < it->second.size()) {
+                    Data& old_op = it->second[item.second];
+                    switch (item.first) {
+                        case Op::OpenChild:
+                            break;
+                        case Op::CloseChild:
+                            break;
 
-        void interpolate_branch(Path* old_path, Path *new_path) {
-            for (auto& item : new_path->items) {
-                Data& new_op = new_path->ops[item.first][item.second];
+                        case Op::MatrixPush:
+                            Matrix_Push();
+                            break;
 
-                if (item.first == Op::OpenChild) {
-                    if (auto it = old_path->children.find(new_op.open_child.key);
-                        it != old_path->children.end() && new_op.open_child.idx < it->second.size()) {
-                        interpolate_branch(&it->second[new_op.open_child.idx],
-                                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
-                    } else {
-                        interpolate_branch(
-                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx],
-                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
-                    }
-                    continue;
-                }
+                        case Op::MatrixPop:
+                            Matrix_Pop();
+                            break;
 
-                if (auto it = old_path->ops.find(item.first); it != old_path->ops.end()) {
-                    if (item.second < it->second.size()) {
-                        Data& old_op = it->second[item.second];
-                        switch (item.first) {
-                            case Op::OpenChild:
-                                break;
-                            case Op::CloseChild:
-                                break;
+                        case Op::MatrixPut:
+                            interpolate_mtxf(&tmp_mtxf, &old_op.matrix_put.src, &new_op.matrix_put.src);
+                            Matrix_Put(&tmp_mtxf);
+                            break;
 
-                            case Op::MatrixPush:
-                                Matrix_Push();
-                                break;
+                        case Op::MatrixMult:
+                            interpolate_mtxf(&tmp_mtxf, &old_op.matrix_mult.mf, &new_op.matrix_mult.mf);
+                            Matrix_Mult(&tmp_mtxf, new_op.matrix_mult.mode);
+                            break;
 
-                            case Op::MatrixPop:
-                                Matrix_Pop();
-                                break;
+                        case Op::MatrixTranslate:
+                            Matrix_Translate(lerp(old_op.matrix_translate.x, new_op.matrix_translate.x),
+                                             lerp(old_op.matrix_translate.y, new_op.matrix_translate.y),
+                                             lerp(old_op.matrix_translate.z, new_op.matrix_translate.z),
+                                             new_op.matrix_translate.mode);
+                            break;
 
-                            case Op::MatrixPut:
-                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_put.src, &new_op.matrix_put.src);
-                                Matrix_Put(&tmp_mtxf);
-                                break;
+                        case Op::MatrixScale:
+                            Matrix_Scale(lerp(old_op.matrix_scale.x, new_op.matrix_scale.x),
+                                         lerp(old_op.matrix_scale.y, new_op.matrix_scale.y),
+                                         lerp(old_op.matrix_scale.z, new_op.matrix_scale.z), new_op.matrix_scale.mode);
+                            break;
 
-                            case Op::MatrixMult:
-                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_mult.mf, &new_op.matrix_mult.mf);
-                                Matrix_Mult(&tmp_mtxf, new_op.matrix_mult.mode);
-                                break;
+                        case Op::MatrixRotate1Coord: {
+                            float v = interpolate_angle(old_op.matrix_rotate_1_coord.value,
+                                                        new_op.matrix_rotate_1_coord.value);
+                            u8 mode = new_op.matrix_rotate_1_coord.mode;
+                            switch (new_op.matrix_rotate_1_coord.coord) {
+                                case 0:
+                                    Matrix_RotateX(v, mode);
+                                    break;
 
-                            case Op::MatrixTranslate:
-                                Matrix_Translate(lerp(old_op.matrix_translate.x, new_op.matrix_translate.x),
-                                                 lerp(old_op.matrix_translate.y, new_op.matrix_translate.y),
-                                                 lerp(old_op.matrix_translate.z, new_op.matrix_translate.z),
-                                                 new_op.matrix_translate.mode);
-                                break;
+                                case 1:
+                                    Matrix_RotateY(v, mode);
+                                    break;
 
-                            case Op::MatrixScale:
-                                Matrix_Scale(lerp(old_op.matrix_scale.x, new_op.matrix_scale.x),
-                                             lerp(old_op.matrix_scale.y, new_op.matrix_scale.y),
-                                             lerp(old_op.matrix_scale.z, new_op.matrix_scale.z),
-                                             new_op.matrix_scale.mode);
-                                break;
-
-                            case Op::MatrixRotate1Coord: {
-                                float v = interpolate_angle(old_op.matrix_rotate_1_coord.value, new_op.matrix_rotate_1_coord.value);
-                                u8 mode = new_op.matrix_rotate_1_coord.mode;
-                                switch (new_op.matrix_rotate_1_coord.coord) {
-                                    case 0:
-                                        Matrix_RotateX(v, mode);
-                                        break;
-
-                                    case 1:
-                                        Matrix_RotateY(v, mode);
-                                        break;
-
-                                    case 2:
-                                        Matrix_RotateZ(v, mode);
-                                        break;
-                                }
-                                break;
+                                case 2:
+                                    Matrix_RotateZ(v, mode);
+                                    break;
                             }
-
-                            case Op::MatrixRotateZYX:
-                                Matrix_RotateZYX(interpolate_angle(old_op.matrix_rotate_zyx.x, new_op.matrix_rotate_zyx.x),
-                                                 interpolate_angle(old_op.matrix_rotate_zyx.y, new_op.matrix_rotate_zyx.y),
-                                                 interpolate_angle(old_op.matrix_rotate_zyx.z, new_op.matrix_rotate_zyx.z),
-                                                 new_op.matrix_rotate_zyx.mode);
-                                break;
-
-                            case Op::MatrixTranslateRotateZYX:
-                                lerp_vec3f(&tmp_vec3f, &old_op.matrix_translate_rotate_zyx.translation, &new_op.matrix_translate_rotate_zyx.translation);
-                                interpolate_angles(&tmp_vec3s, &old_op.matrix_translate_rotate_zyx.rotation, &new_op.matrix_translate_rotate_zyx.rotation);
-                                Matrix_TranslateRotateZYX(&tmp_vec3f, &tmp_vec3s);
-                                break;
-
-                            case Op::MatrixSetTranslateRotateYXZ:
-                                interpolate_angles(&tmp_vec3s, &old_op.matrix_set_translate_rotate_yxz.rot,
-                                                               &new_op.matrix_set_translate_rotate_yxz.rot);
-                                Matrix_SetTranslateRotateYXZ(lerp(old_op.matrix_set_translate_rotate_yxz.translateX,
-                                                                  new_op.matrix_set_translate_rotate_yxz.translateX),
-                                                             lerp(old_op.matrix_set_translate_rotate_yxz.translateY,
-                                                                  new_op.matrix_set_translate_rotate_yxz.translateY),
-                                                             lerp(old_op.matrix_set_translate_rotate_yxz.translateZ,
-                                                                  new_op.matrix_set_translate_rotate_yxz.translateZ),
-                                                             &tmp_vec3s);
-                                if (new_op.matrix_set_translate_rotate_yxz.has_mtx && old_op.matrix_set_translate_rotate_yxz.has_mtx) {
-                                    actor_mtx = *Matrix_GetCurrent();
-                                }
-                                break;
-
-                            case Op::MatrixMtxFToMtx:
-                                interpolate_mtxf(new_replacement(new_op.matrix_mtxf_to_mtx.dest),
-                                                 &old_op.matrix_mtxf_to_mtx.src, &new_op.matrix_mtxf_to_mtx.src);
-                                break;
-
-                            case Op::MatrixToMtx: {
-                                //*new_replacement(new_op.matrix_to_mtx.dest) = *Matrix_GetCurrent();
-                                if (old_op.matrix_to_mtx.has_adjusted && new_op.matrix_to_mtx.has_adjusted) {
-                                    interpolate_mtxf(&tmp_mtxf, &old_op.matrix_to_mtx.src, &new_op.matrix_to_mtx.src);
-                                    SkinMatrix_MtxFMtxFMult(&actor_mtx, &tmp_mtxf, new_replacement(new_op.matrix_to_mtx.dest));
-                                } else {
-                                    interpolate_mtxf(new_replacement(new_op.matrix_to_mtx.dest),
-                                                     &old_op.matrix_to_mtx.src, &new_op.matrix_to_mtx.src);
-                                }
-                                break;
-                            }
-
-                            case Op::MatrixReplaceRotation:
-                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_replace_rotation.mf, &new_op.matrix_replace_rotation.mf);
-                                Matrix_ReplaceRotation(&tmp_mtxf);
-                                break;
-
-                            case Op::MatrixRotateAxis:
-                                lerp_vec3f(&tmp_vec3f, &old_op.matrix_rotate_axis.axis, &new_op.matrix_rotate_axis.axis);
-                                Matrix_RotateAxis(interpolate_angle(old_op.matrix_rotate_axis.angle, new_op.matrix_rotate_axis.angle),
-                                                  &tmp_vec3f, new_op.matrix_rotate_axis.mode);
-                                break;
-
-                            case Op::SkinMatrixMtxFToMtx:
-                                break;
+                            break;
                         }
+
+                        case Op::MatrixRotateZYX:
+                            Matrix_RotateZYX(interpolate_angle(old_op.matrix_rotate_zyx.x, new_op.matrix_rotate_zyx.x),
+                                             interpolate_angle(old_op.matrix_rotate_zyx.y, new_op.matrix_rotate_zyx.y),
+                                             interpolate_angle(old_op.matrix_rotate_zyx.z, new_op.matrix_rotate_zyx.z),
+                                             new_op.matrix_rotate_zyx.mode);
+                            break;
+
+                        case Op::MatrixTranslateRotateZYX:
+                            lerp_vec3f(&tmp_vec3f, &old_op.matrix_translate_rotate_zyx.translation,
+                                       &new_op.matrix_translate_rotate_zyx.translation);
+                            interpolate_angles(&tmp_vec3s, &old_op.matrix_translate_rotate_zyx.rotation,
+                                               &new_op.matrix_translate_rotate_zyx.rotation);
+                            Matrix_TranslateRotateZYX(&tmp_vec3f, &tmp_vec3s);
+                            break;
+
+                        case Op::MatrixSetTranslateRotateYXZ:
+                            interpolate_angles(&tmp_vec3s, &old_op.matrix_set_translate_rotate_yxz.rot,
+                                               &new_op.matrix_set_translate_rotate_yxz.rot);
+                            Matrix_SetTranslateRotateYXZ(lerp(old_op.matrix_set_translate_rotate_yxz.translateX,
+                                                              new_op.matrix_set_translate_rotate_yxz.translateX),
+                                                         lerp(old_op.matrix_set_translate_rotate_yxz.translateY,
+                                                              new_op.matrix_set_translate_rotate_yxz.translateY),
+                                                         lerp(old_op.matrix_set_translate_rotate_yxz.translateZ,
+                                                              new_op.matrix_set_translate_rotate_yxz.translateZ),
+                                                         &tmp_vec3s);
+                            if (new_op.matrix_set_translate_rotate_yxz.has_mtx &&
+                                old_op.matrix_set_translate_rotate_yxz.has_mtx) {
+                                actor_mtx = *Matrix_GetCurrent();
+                            }
+                            break;
+
+                        case Op::MatrixMtxFToMtx:
+                            interpolate_mtxf(new_replacement(new_op.matrix_mtxf_to_mtx.dest),
+                                             &old_op.matrix_mtxf_to_mtx.src, &new_op.matrix_mtxf_to_mtx.src);
+                            break;
+
+                        case Op::MatrixToMtx: {
+                            //*new_replacement(new_op.matrix_to_mtx.dest) = *Matrix_GetCurrent();
+                            if (old_op.matrix_to_mtx.has_adjusted && new_op.matrix_to_mtx.has_adjusted) {
+                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_to_mtx.src, &new_op.matrix_to_mtx.src);
+                                SkinMatrix_MtxFMtxFMult(&actor_mtx, &tmp_mtxf,
+                                                        new_replacement(new_op.matrix_to_mtx.dest));
+                            } else {
+                                interpolate_mtxf(new_replacement(new_op.matrix_to_mtx.dest), &old_op.matrix_to_mtx.src,
+                                                 &new_op.matrix_to_mtx.src);
+                            }
+                            break;
+                        }
+
+                        case Op::MatrixReplaceRotation:
+                            interpolate_mtxf(&tmp_mtxf, &old_op.matrix_replace_rotation.mf,
+                                             &new_op.matrix_replace_rotation.mf);
+                            Matrix_ReplaceRotation(&tmp_mtxf);
+                            break;
+
+                        case Op::MatrixRotateAxis:
+                            lerp_vec3f(&tmp_vec3f, &old_op.matrix_rotate_axis.axis, &new_op.matrix_rotate_axis.axis);
+                            Matrix_RotateAxis(
+                                interpolate_angle(old_op.matrix_rotate_axis.angle, new_op.matrix_rotate_axis.angle),
+                                &tmp_vec3f, new_op.matrix_rotate_axis.mode);
+                            break;
+
+                        case Op::SkinMatrixMtxFToMtx:
+                            break;
                     }
                 }
             }
         }
-    };
+    }
+};
 
 } // anonymous namespace
 
@@ -474,7 +478,7 @@ void FrameInterpolation_RecordOpenChild(const void* a, int b) {
 void FrameInterpolation_RecordCloseChild(void) {
     if (!is_recording)
         return;
-    //append(Op::CloseChild);
+    // append(Op::CloseChild);
     if (has_inv_actor_mtx && current_path.size() == inv_actor_mtx_path_index) {
         has_inv_actor_mtx = false;
     }
@@ -552,12 +556,12 @@ void FrameInterpolation_RecordMatrixTranslateRotateZYX(Vec3f* translation, Vec3s
 void FrameInterpolation_RecordMatrixSetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ, Vec3s* rot) {
     if (!is_recording)
         return;
-    auto& d = append(Op::MatrixSetTranslateRotateYXZ).matrix_set_translate_rotate_yxz = { translateX, translateY, translateZ,
-                                                                                          *rot };
+    auto& d = append(Op::MatrixSetTranslateRotateYXZ).matrix_set_translate_rotate_yxz = { translateX, translateY,
+                                                                                          translateZ, *rot };
     if (next_is_actor_pos_rot_matrix) {
         d.has_mtx = true;
-        //d.mtx = *Matrix_GetCurrent();
-        invert_matrix((const float *)Matrix_GetCurrent()->mf, (float *)inv_actor_mtx.mf);
+        // d.mtx = *Matrix_GetCurrent();
+        invert_matrix((const float*)Matrix_GetCurrent()->mf, (float*)inv_actor_mtx.mf);
         next_is_actor_pos_rot_matrix = false;
         has_inv_actor_mtx = true;
         inv_actor_mtx_path_index = current_path.size();
@@ -605,6 +609,7 @@ static bool invert_matrix(const float m[16], float invOut[16]) {
     float inv[16], det;
     int i;
 
+    // clang-format off
     inv[0] = m[5]  * m[10] * m[15] -
              m[5]  * m[11] * m[14] -
              m[9]  * m[6]  * m[15] +
@@ -716,6 +721,7 @@ static bool invert_matrix(const float m[16], float invOut[16]) {
               m[4] * m[2] * m[9] +
               m[8] * m[1] * m[6] -
               m[8] * m[2] * m[5];
+    // clang-format on
 
     det = m[0] * inv[0] + m[1] * inv[4] + m[2] * inv[8] + m[3] * inv[12];
 
diff --git a/soh/soh/mixer.c b/soh/soh/mixer.c
index ba6a01bc1f..1646d1a074 100644
--- a/soh/soh/mixer.c
+++ b/soh/soh/mixer.c
@@ -1,11 +1,13 @@
+//! This file is always optimized by a rule in the CMakeList. This is done because the SIMD functions are very large
+//! when unoptimized and clang does not allow optimizing a single function.
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "mixer.h"
-
 #ifndef __clang__
-#pragma GCC optimize ("unroll-loops")
+#pragma GCC optimize("unroll-loops")
 #endif
 
 #define ROUND_UP_64(v) (((v) + 63) & ~63)
@@ -15,8 +17,8 @@
 #define ROUND_DOWN_16(v) ((v) & ~0xf)
 
 #define DMEM_BUF_SIZE (0x1000 - 0x3C0 - 0x40)
-#define BUF_U8(a) (rspa.buf.as_u8 + ((a) - 0x3C0))
-#define BUF_S16(a) (rspa.buf.as_s16 + ((a) - 0x3C0) / sizeof(int16_t))
+#define BUF_U8(a) (rspa.buf.as_u8 + ((a)-0x3C0))
+#define BUF_S16(a) (rspa.buf.as_s16 + ((a)-0x3C0) / sizeof(int16_t))
 
 static struct {
     uint16_t in;
@@ -28,7 +30,7 @@ static struct {
     uint16_t vol_wet;
     uint16_t rate_wet;
 
-    ADPCM_STATE *adpcm_loop_state;
+    ADPCM_STATE* adpcm_loop_state;
 
     int16_t adpcm_table[8][2][8];
 
@@ -42,40 +44,33 @@ static struct {
 } rspa;
 
 static int16_t resample_table[64][4] = {
-    {0x0c39, 0x66ad, 0x0d46, 0xffdf}, {0x0b39, 0x6696, 0x0e5f, 0xffd8},
-    {0x0a44, 0x6669, 0x0f83, 0xffd0}, {0x095a, 0x6626, 0x10b4, 0xffc8},
-    {0x087d, 0x65cd, 0x11f0, 0xffbf}, {0x07ab, 0x655e, 0x1338, 0xffb6},
-    {0x06e4, 0x64d9, 0x148c, 0xffac}, {0x0628, 0x643f, 0x15eb, 0xffa1},
-    {0x0577, 0x638f, 0x1756, 0xff96}, {0x04d1, 0x62cb, 0x18cb, 0xff8a},
-    {0x0435, 0x61f3, 0x1a4c, 0xff7e}, {0x03a4, 0x6106, 0x1bd7, 0xff71},
-    {0x031c, 0x6007, 0x1d6c, 0xff64}, {0x029f, 0x5ef5, 0x1f0b, 0xff56},
-    {0x022a, 0x5dd0, 0x20b3, 0xff48}, {0x01be, 0x5c9a, 0x2264, 0xff3a},
-    {0x015b, 0x5b53, 0x241e, 0xff2c}, {0x0101, 0x59fc, 0x25e0, 0xff1e},
-    {0x00ae, 0x5896, 0x27a9, 0xff10}, {0x0063, 0x5720, 0x297a, 0xff02},
-    {0x001f, 0x559d, 0x2b50, 0xfef4}, {0xffe2, 0x540d, 0x2d2c, 0xfee8},
-    {0xffac, 0x5270, 0x2f0d, 0xfedb}, {0xff7c, 0x50c7, 0x30f3, 0xfed0},
-    {0xff53, 0x4f14, 0x32dc, 0xfec6}, {0xff2e, 0x4d57, 0x34c8, 0xfebd},
-    {0xff0f, 0x4b91, 0x36b6, 0xfeb6}, {0xfef5, 0x49c2, 0x38a5, 0xfeb0},
-    {0xfedf, 0x47ed, 0x3a95, 0xfeac}, {0xfece, 0x4611, 0x3c85, 0xfeab},
-    {0xfec0, 0x4430, 0x3e74, 0xfeac}, {0xfeb6, 0x424a, 0x4060, 0xfeaf},
-    {0xfeaf, 0x4060, 0x424a, 0xfeb6}, {0xfeac, 0x3e74, 0x4430, 0xfec0},
-    {0xfeab, 0x3c85, 0x4611, 0xfece}, {0xfeac, 0x3a95, 0x47ed, 0xfedf},
-    {0xfeb0, 0x38a5, 0x49c2, 0xfef5}, {0xfeb6, 0x36b6, 0x4b91, 0xff0f},
-    {0xfebd, 0x34c8, 0x4d57, 0xff2e}, {0xfec6, 0x32dc, 0x4f14, 0xff53},
-    {0xfed0, 0x30f3, 0x50c7, 0xff7c}, {0xfedb, 0x2f0d, 0x5270, 0xffac},
-    {0xfee8, 0x2d2c, 0x540d, 0xffe2}, {0xfef4, 0x2b50, 0x559d, 0x001f},
-    {0xff02, 0x297a, 0x5720, 0x0063}, {0xff10, 0x27a9, 0x5896, 0x00ae},
-    {0xff1e, 0x25e0, 0x59fc, 0x0101}, {0xff2c, 0x241e, 0x5b53, 0x015b},
-    {0xff3a, 0x2264, 0x5c9a, 0x01be}, {0xff48, 0x20b3, 0x5dd0, 0x022a},
-    {0xff56, 0x1f0b, 0x5ef5, 0x029f}, {0xff64, 0x1d6c, 0x6007, 0x031c},
-    {0xff71, 0x1bd7, 0x6106, 0x03a4}, {0xff7e, 0x1a4c, 0x61f3, 0x0435},
-    {0xff8a, 0x18cb, 0x62cb, 0x04d1}, {0xff96, 0x1756, 0x638f, 0x0577},
-    {0xffa1, 0x15eb, 0x643f, 0x0628}, {0xffac, 0x148c, 0x64d9, 0x06e4},
-    {0xffb6, 0x1338, 0x655e, 0x07ab}, {0xffbf, 0x11f0, 0x65cd, 0x087d},
-    {0xffc8, 0x10b4, 0x6626, 0x095a}, {0xffd0, 0x0f83, 0x6669, 0x0a44},
-    {0xffd8, 0x0e5f, 0x6696, 0x0b39}, {0xffdf, 0x0d46, 0x66ad, 0x0c39}
+    { 0x0c39, 0x66ad, 0x0d46, 0xffdf }, { 0x0b39, 0x6696, 0x0e5f, 0xffd8 }, { 0x0a44, 0x6669, 0x0f83, 0xffd0 },
+    { 0x095a, 0x6626, 0x10b4, 0xffc8 }, { 0x087d, 0x65cd, 0x11f0, 0xffbf }, { 0x07ab, 0x655e, 0x1338, 0xffb6 },
+    { 0x06e4, 0x64d9, 0x148c, 0xffac }, { 0x0628, 0x643f, 0x15eb, 0xffa1 }, { 0x0577, 0x638f, 0x1756, 0xff96 },
+    { 0x04d1, 0x62cb, 0x18cb, 0xff8a }, { 0x0435, 0x61f3, 0x1a4c, 0xff7e }, { 0x03a4, 0x6106, 0x1bd7, 0xff71 },
+    { 0x031c, 0x6007, 0x1d6c, 0xff64 }, { 0x029f, 0x5ef5, 0x1f0b, 0xff56 }, { 0x022a, 0x5dd0, 0x20b3, 0xff48 },
+    { 0x01be, 0x5c9a, 0x2264, 0xff3a }, { 0x015b, 0x5b53, 0x241e, 0xff2c }, { 0x0101, 0x59fc, 0x25e0, 0xff1e },
+    { 0x00ae, 0x5896, 0x27a9, 0xff10 }, { 0x0063, 0x5720, 0x297a, 0xff02 }, { 0x001f, 0x559d, 0x2b50, 0xfef4 },
+    { 0xffe2, 0x540d, 0x2d2c, 0xfee8 }, { 0xffac, 0x5270, 0x2f0d, 0xfedb }, { 0xff7c, 0x50c7, 0x30f3, 0xfed0 },
+    { 0xff53, 0x4f14, 0x32dc, 0xfec6 }, { 0xff2e, 0x4d57, 0x34c8, 0xfebd }, { 0xff0f, 0x4b91, 0x36b6, 0xfeb6 },
+    { 0xfef5, 0x49c2, 0x38a5, 0xfeb0 }, { 0xfedf, 0x47ed, 0x3a95, 0xfeac }, { 0xfece, 0x4611, 0x3c85, 0xfeab },
+    { 0xfec0, 0x4430, 0x3e74, 0xfeac }, { 0xfeb6, 0x424a, 0x4060, 0xfeaf }, { 0xfeaf, 0x4060, 0x424a, 0xfeb6 },
+    { 0xfeac, 0x3e74, 0x4430, 0xfec0 }, { 0xfeab, 0x3c85, 0x4611, 0xfece }, { 0xfeac, 0x3a95, 0x47ed, 0xfedf },
+    { 0xfeb0, 0x38a5, 0x49c2, 0xfef5 }, { 0xfeb6, 0x36b6, 0x4b91, 0xff0f }, { 0xfebd, 0x34c8, 0x4d57, 0xff2e },
+    { 0xfec6, 0x32dc, 0x4f14, 0xff53 }, { 0xfed0, 0x30f3, 0x50c7, 0xff7c }, { 0xfedb, 0x2f0d, 0x5270, 0xffac },
+    { 0xfee8, 0x2d2c, 0x540d, 0xffe2 }, { 0xfef4, 0x2b50, 0x559d, 0x001f }, { 0xff02, 0x297a, 0x5720, 0x0063 },
+    { 0xff10, 0x27a9, 0x5896, 0x00ae }, { 0xff1e, 0x25e0, 0x59fc, 0x0101 }, { 0xff2c, 0x241e, 0x5b53, 0x015b },
+    { 0xff3a, 0x2264, 0x5c9a, 0x01be }, { 0xff48, 0x20b3, 0x5dd0, 0x022a }, { 0xff56, 0x1f0b, 0x5ef5, 0x029f },
+    { 0xff64, 0x1d6c, 0x6007, 0x031c }, { 0xff71, 0x1bd7, 0x6106, 0x03a4 }, { 0xff7e, 0x1a4c, 0x61f3, 0x0435 },
+    { 0xff8a, 0x18cb, 0x62cb, 0x04d1 }, { 0xff96, 0x1756, 0x638f, 0x0577 }, { 0xffa1, 0x15eb, 0x643f, 0x0628 },
+    { 0xffac, 0x148c, 0x64d9, 0x06e4 }, { 0xffb6, 0x1338, 0x655e, 0x07ab }, { 0xffbf, 0x11f0, 0x65cd, 0x087d },
+    { 0xffc8, 0x10b4, 0x6626, 0x095a }, { 0xffd0, 0x0f83, 0x6669, 0x0a44 }, { 0xffd8, 0x0e5f, 0x6696, 0x0b39 },
+    { 0xffdf, 0x0d46, 0x66ad, 0x0c39 }
 };
 
+static void aMixImplSSE2(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr);
+static void aMixImplNEON(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr);
+
 static inline int16_t clamp16(int32_t v) {
     if (v < -0x8000) {
         return -0x8000;
@@ -109,11 +104,38 @@ void aLoadBufferImpl(const void* source_addr, uint16_t dest_addr, uint16_t nbyte
 #endif
 }
 
-void aSaveBufferImpl(uint16_t source_addr, int16_t *dest_addr, uint16_t nbytes) {
+#include <opus/opus.h>
+#include <opusfile.h>
+
+void aOPUSdecImpl(void* source_addr, uint16_t dest_addr, uint16_t nbytes, struct OggOpusFile** decState, int32_t pos,
+                  uint32_t size) {
+    int readSamples = 0;
+    if (*decState == NULL) {
+        *decState = op_open_memory(source_addr, size, NULL);
+    }
+    op_pcm_seek(*decState, pos);
+    int ret = op_read(*decState, BUF_S16(dest_addr), nbytes / 2, NULL);
+    if (ret < 0) {
+        return;
+    }
+    readSamples += ret;
+    while (readSamples < nbytes / 2) {
+        ret = op_read(*decState, BUF_S16(dest_addr + readSamples * 2), (nbytes - readSamples * 2) / 2, NULL);
+        if (ret == 0)
+            break;
+        readSamples += ret;
+    }
+}
+
+void aOPUSFree(struct OggOpusFile* opusFile) {
+    op_free(opusFile);
+}
+
+void aSaveBufferImpl(uint16_t source_addr, int16_t* dest_addr, uint16_t nbytes) {
     memcpy(dest_addr, BUF_S16(source_addr), ROUND_DOWN_16(nbytes));
 }
 
-void aLoadADPCMImpl(int num_entries_times_16, const int16_t *book_source_addr) {
+void aLoadADPCMImpl(int num_entries_times_16, const int16_t* book_source_addr) {
     memcpy(rspa.adpcm_table, book_source_addr, num_entries_times_16);
 }
 
@@ -125,9 +147,9 @@ void aSetBufferImpl(uint8_t flags, uint16_t in, uint16_t out, uint16_t nbytes) {
 
 void aInterleaveImpl(uint16_t dest, uint16_t left, uint16_t right, uint16_t c) {
     int count = ROUND_UP_8(c) / sizeof(int16_t) / 4;
-    int16_t *l = BUF_S16(left);
-    int16_t *r = BUF_S16(right);
-    int16_t *d = BUF_S16(dest);
+    int16_t* l = BUF_S16(left);
+    int16_t* r = BUF_S16(right);
+    int16_t* d = BUF_S16(dest);
     while (count > 0) {
         int16_t l0 = *l++;
         int16_t l1 = *l++;
@@ -154,13 +176,13 @@ void aDMEMMoveImpl(uint16_t in_addr, uint16_t out_addr, int nbytes) {
     memmove(BUF_U8(out_addr), BUF_U8(in_addr), nbytes);
 }
 
-void aSetLoopImpl(ADPCM_STATE *adpcm_loop_state) {
+void aSetLoopImpl(ADPCM_STATE* adpcm_loop_state) {
     rspa.adpcm_loop_state = adpcm_loop_state;
 }
 
 void aADPCMdecImpl(uint8_t flags, ADPCM_STATE state) {
-    uint8_t *in = BUF_U8(rspa.in);
-    int16_t *out = BUF_S16(rspa.out);
+    uint8_t* in = BUF_U8(rspa.in);
+    int16_t* out = BUF_S16(rspa.out);
     int nbytes = ROUND_UP_32(rspa.nbytes);
     if (flags & A_INIT) {
         memset(out, 0, 16 * sizeof(int16_t));
@@ -172,9 +194,9 @@ void aADPCMdecImpl(uint8_t flags, ADPCM_STATE state) {
     out += 16;
 
     while (nbytes > 0) {
-        int shift = *in >> 4; // should be in 0..12 or 0..14
+        int shift = *in >> 4;          // should be in 0..12 or 0..14
         int table_index = *in++ & 0xf; // should be in 0..7
-        int16_t (*tbl)[8] = rspa.adpcm_table[table_index];
+        int16_t(*tbl)[8] = rspa.adpcm_table[table_index];
         int i;
 
         for (i = 0; i < 2; i++) {
@@ -182,19 +204,19 @@ void aADPCMdecImpl(uint8_t flags, ADPCM_STATE state) {
             int16_t prev1 = out[-1];
             int16_t prev2 = out[-2];
             int j, k;
-			if (flags & 4) {
-				for (j = 0; j < 2; j++) {
-					ins[j * 4] = (((*in >> 6) << 30) >> 30) << shift;
-					ins[j * 4 + 1] = ((((*in >> 4) & 0x3) << 30) >> 30) << shift;
-					ins[j * 4 + 2] = ((((*in >> 2) & 0x3) << 30) >> 30) << shift;
-					ins[j * 4 + 3] = (((*in++ & 0x3) << 30) >> 30) << shift;
-				}
-			} else {
-				for (j = 0; j < 4; j++) {
-					ins[j * 2] = (((*in >> 4) << 28) >> 28) << shift;
-					ins[j * 2 + 1] = (((*in++ & 0xf) << 28) >> 28) << shift;
-				}
-			}
+            if (flags & 4) {
+                for (j = 0; j < 2; j++) {
+                    ins[j * 4] = (((*in >> 6) << 30) >> 30) << shift;
+                    ins[j * 4 + 1] = ((((*in >> 4) & 0x3) << 30) >> 30) << shift;
+                    ins[j * 4 + 2] = ((((*in >> 2) & 0x3) << 30) >> 30) << shift;
+                    ins[j * 4 + 3] = (((*in++ & 0x3) << 30) >> 30) << shift;
+                }
+            } else {
+                for (j = 0; j < 4; j++) {
+                    ins[j * 2] = (((*in >> 4) << 28) >> 28) << shift;
+                    ins[j * 2 + 1] = (((*in++ & 0xf) << 28) >> 28) << shift;
+                }
+            }
             for (j = 0; j < 8; j++) {
                 int32_t acc = tbl[0][j] * prev2 + tbl[1][j] * prev1 + (ins[j] << 11);
                 for (k = 0; k < j; k++) {
@@ -211,13 +233,13 @@ void aADPCMdecImpl(uint8_t flags, ADPCM_STATE state) {
 
 void aResampleImpl(uint8_t flags, uint16_t pitch, RESAMPLE_STATE state) {
     int16_t tmp[16];
-    int16_t *in_initial = BUF_S16(rspa.in);
-    int16_t *in = in_initial;
-    int16_t *out = BUF_S16(rspa.out);
+    int16_t* in_initial = BUF_S16(rspa.in);
+    int16_t* in = in_initial;
+    int16_t* out = BUF_S16(rspa.out);
     int nbytes = ROUND_UP_16(rspa.nbytes);
     uint32_t pitch_accumulator;
     int i;
-    int16_t *tbl;
+    int16_t* tbl;
     int32_t sample;
 
     if (flags & A_INIT) {
@@ -236,10 +258,8 @@ void aResampleImpl(uint8_t flags, uint16_t pitch, RESAMPLE_STATE state) {
     do {
         for (i = 0; i < 8; i++) {
             tbl = resample_table[pitch_accumulator * 64 >> 16];
-            sample = ((in[0] * tbl[0] + 0x4000) >> 15) +
-                     ((in[1] * tbl[1] + 0x4000) >> 15) +
-                     ((in[2] * tbl[2] + 0x4000) >> 15) +
-                     ((in[3] * tbl[3] + 0x4000) >> 15);
+            sample = ((in[0] * tbl[0] + 0x4000) >> 15) + ((in[1] * tbl[1] + 0x4000) >> 15) +
+                     ((in[2] * tbl[2] + 0x4000) >> 15) + ((in[3] * tbl[3] + 0x4000) >> 15);
             *out++ = clamp16(sample);
 
             pitch_accumulator += (pitch << 1);
@@ -272,32 +292,32 @@ void aEnvSetup2Impl(uint16_t initial_vol_left, uint16_t initial_vol_right) {
     rspa.vol[1] = initial_vol_right;
 }
 
-void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb,
-				   bool neg_3, bool neg_2,
-                   bool neg_left, bool neg_right,
-                   int32_t wet_dry_addr, u32 unk)
-{
-    int16_t *in = BUF_S16(in_addr);
-    int16_t *dry[2] = {BUF_S16(((wet_dry_addr >> 24) & 0xFF) << 4), BUF_S16(((wet_dry_addr >> 16) & 0xFF) << 4)};
-    int16_t *wet[2] = {BUF_S16(((wet_dry_addr >> 8) & 0xFF) << 4), BUF_S16(((wet_dry_addr) & 0xFF) << 4)};
-    int16_t negs[4] = {neg_left ? -1 : 0, neg_right ? -1 : 0, neg_3 ? -4 : 0, neg_2 ? -2 : 0};
-    int swapped[2] = {swap_reverb ? 1 : 0, swap_reverb ? 0 : 1};
+void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb, bool neg_3, bool neg_2, bool neg_left,
+                   bool neg_right, int32_t wet_dry_addr, u32 unk) {
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* dry[2] = { BUF_S16(((wet_dry_addr >> 24) & 0xFF) << 4), BUF_S16(((wet_dry_addr >> 16) & 0xFF) << 4) };
+    int16_t* wet[2] = { BUF_S16(((wet_dry_addr >> 8) & 0xFF) << 4), BUF_S16(((wet_dry_addr)&0xFF) << 4) };
+    int16_t negs[4] = { neg_left ? -1 : 0, neg_right ? -1 : 0, neg_3 ? -4 : 0, neg_2 ? -2 : 0 };
+    int swapped[2] = { swap_reverb ? 1 : 0, swap_reverb ? 0 : 1 };
     int n = ROUND_UP_16(n_samples);
 
-    uint16_t vols[2] = {rspa.vol[0], rspa.vol[1]};
-    uint16_t rates[2] = {rspa.rate[0], rspa.rate[1]};
+    uint16_t vols[2] = { rspa.vol[0], rspa.vol[1] };
+    uint16_t rates[2] = { rspa.rate[0], rspa.rate[1] };
     uint16_t vol_wet = rspa.vol_wet;
     uint16_t rate_wet = rspa.rate_wet;
 
     do {
         for (int i = 0; i < 8; i++) {
-            int16_t samples[2] = {*in, *in}; in++;
+            int16_t samples[2] = { *in, *in };
+            in++;
             for (int j = 0; j < 2; j++) {
                 samples[j] = (samples[j] * vols[j] >> 16) ^ negs[j];
             }
-        	for (int j = 0; j < 2; j++) {
-                *dry[j] = clamp16(*dry[j] + samples[j]); dry[j]++;
-                *wet[j] = clamp16(*wet[j] + ((samples[swapped[j]] * vol_wet >> 16) ^ negs[2 + j])); wet[j]++;
+            for (int j = 0; j < 2; j++) {
+                *dry[j] = clamp16(*dry[j] + samples[j]);
+                dry[j]++;
+                *wet[j] = clamp16(*wet[j] + ((samples[swapped[j]] * vol_wet >> 16) ^ negs[2 + j]));
+                wet[j]++;
             }
         }
         vols[0] += rates[0];
@@ -308,10 +328,10 @@ void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb,
     } while (n > 0);
 }
 
-void aMixImpl(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
+static void aMixImplRef(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
     int nbytes = ROUND_UP_32(ROUND_DOWN_16(count << 4));
-    int16_t *in = BUF_S16(in_addr);
-    int16_t *out = BUF_S16(out_addr);
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
     int i;
     int32_t sample;
 
@@ -335,9 +355,19 @@ void aMixImpl(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr)
     }
 }
 
+void aMixImpl(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
+#if defined(__SSE2__) || defined(_M_AMD64)
+    aMixImplSSE2(count, gain, in_addr, out_addr);
+#elif defined(__ARM_NEON)
+    aMixImplNEON(count, gain, in_addr, out_addr);
+#else
+    aMixImplRef(count, gain, in_addr, out_addr);
+#endif
+}
+
 void aS8DecImpl(uint8_t flags, ADPCM_STATE state) {
-    uint8_t *in = BUF_U8(rspa.in);
-    int16_t *out = BUF_S16(rspa.out);
+    uint8_t* in = BUF_U8(rspa.in);
+    int16_t* out = BUF_S16(rspa.out);
     int nbytes = ROUND_UP_32(rspa.nbytes);
     if (flags & A_INIT) {
         memset(out, 0, 16 * sizeof(int16_t));
@@ -373,27 +403,43 @@ void aS8DecImpl(uint8_t flags, ADPCM_STATE state) {
 }
 
 void aAddMixerImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr) {
-    int16_t *in = BUF_S16(in_addr);
-    int16_t *out = BUF_S16(out_addr);
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
     int nbytes = ROUND_UP_64(ROUND_DOWN_16(count));
 
     do {
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
-        *out = clamp16(*out + *in++); out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
+        *out = clamp16(*out + *in++);
+        out++;
 
         nbytes -= 16 * sizeof(int16_t);
     } while (nbytes > 0);
@@ -401,7 +447,7 @@ void aAddMixerImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr) {
 
 void aDuplicateImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr) {
     uint8_t* in = BUF_U8(in_addr);
-    uint8_t *out = BUF_U8(out_addr);
+    uint8_t* out = BUF_U8(out_addr);
 
     uint8_t tmp[128];
     memcpy(tmp, in, 128);
@@ -412,49 +458,61 @@ void aDuplicateImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr) {
 }
 
 void aResampleZohImpl(uint16_t pitch, uint16_t start_fract) {
-    int16_t *in = BUF_S16(rspa.in);
-    int16_t *out = BUF_S16(rspa.out);
+    int16_t* in = BUF_S16(rspa.in);
+    int16_t* out = BUF_S16(rspa.out);
     int nbytes = ROUND_UP_8(rspa.nbytes);
     uint32_t pos = start_fract;
     uint32_t pitch_add = pitch << 2;
 
     do {
-        *out++ = in[pos >> 17]; pos += pitch_add;
-        *out++ = in[pos >> 17]; pos += pitch_add;
-        *out++ = in[pos >> 17]; pos += pitch_add;
-        *out++ = in[pos >> 17]; pos += pitch_add;
+        *out++ = in[pos >> 17];
+        pos += pitch_add;
+        *out++ = in[pos >> 17];
+        pos += pitch_add;
+        *out++ = in[pos >> 17];
+        pos += pitch_add;
+        *out++ = in[pos >> 17];
+        pos += pitch_add;
 
         nbytes -= 4 * sizeof(int16_t);
     } while (nbytes > 0);
 }
 
 void aInterlImpl(uint16_t in_addr, uint16_t out_addr, uint16_t n_samples) {
-    int16_t *in = BUF_S16(in_addr);
-    int16_t *out = BUF_S16(out_addr);
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
     int n = ROUND_UP_8(n_samples);
 
     do {
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
-        *out++ = *in++; in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
+        *out++ = *in++;
+        in++;
 
         n -= 8;
     } while (n > 0);
 }
 
-void aFilterImpl(uint8_t flags, uint16_t count_or_buf, int16_t *state_or_filter) {
+void aFilterImpl(uint8_t flags, uint16_t count_or_buf, int16_t* state_or_filter) {
     if (flags > A_INIT) {
         rspa.filter_count = ROUND_UP_16(count_or_buf);
         memcpy(rspa.filter, state_or_filter, sizeof(rspa.filter));
     } else {
         int16_t tmp[16], tmp2[8];
         int count = rspa.filter_count;
-        int16_t *buf = BUF_S16(count_or_buf);
+        int16_t* buf = BUF_S16(count_or_buf);
 
         if (flags == A_INIT) {
 #ifndef __clang__
@@ -496,18 +554,26 @@ void aFilterImpl(uint8_t flags, uint16_t count_or_buf, int16_t *state_or_filter)
 }
 
 void aHiLoGainImpl(uint8_t g, uint16_t count, uint16_t addr) {
-    int16_t *samples = BUF_S16(addr);
+    int16_t* samples = BUF_S16(addr);
     int nbytes = ROUND_UP_32(count);
 
     do {
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
-        *samples = clamp16((*samples * g) >> 4); samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
+        *samples = clamp16((*samples * g) >> 4);
+        samples++;
 
         nbytes -= 8;
     } while (nbytes > 0);
@@ -518,8 +584,8 @@ void aUnkCmd3Impl(uint16_t a, uint16_t b, uint16_t c) {
 
 void aUnkCmd19Impl(uint8_t f, uint16_t count, uint16_t out_addr, uint16_t in_addr) {
     int nbytes = ROUND_UP_64(count);
-    int16_t *in = BUF_S16(in_addr + f);
-    int16_t *out = BUF_S16(out_addr);
+    int16_t* in = BUF_S16(in_addr + f);
+    int16_t* out = BUF_S16(out_addr);
     int16_t tbl[32];
 
     memcpy(tbl, in, 32 * sizeof(int16_t));
@@ -531,3 +597,222 @@ void aUnkCmd19Impl(uint8_t f, uint16_t count, uint16_t out_addr, uint16_t in_add
         nbytes -= 32 * sizeof(int16_t);
     } while (nbytes > 0);
 }
+
+// From here on there are SIMD implementations of the various mixer functions.
+// A note about FORCE_OPTIMIZE...
+// Compilers don't handle SIMD code well when not optimizing. It is unlikely that this code will need to be debugged
+// outside of specific audio issues. We can assume it should always be optimized.
+
+// SIMD operations expect aligned data
+#include "align_asset_macro.h"
+
+#if defined(__SSE2__) || defined(_M_AMD64)
+#include <immintrin.h>
+
+static const ALIGN_ASSET(16) int16_t x7fff[8] = {
+    0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,
+};
+static const ALIGN_ASSET(16) int32_t x4000[4] = {
+    0x4000,
+    0x4000,
+    0x4000,
+    0x4000,
+};
+
+static void aMixImplSSE2(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
+    int nbytes = ROUND_UP_32(ROUND_DOWN_16(count << 4));
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
+    int i;
+    int32_t sample;
+    if (gain == -0x8000) {
+        while (nbytes > 0) {
+            for (unsigned int i = 0; i < 2; i++) {
+                __m128i outVec = _mm_loadu_si128((__m128i*)out);
+                __m128i inVec = _mm_loadu_si128((__m128i*)in);
+                __m128i subsVec = _mm_subs_epi16(outVec, inVec);
+                _mm_storeu_si128(out, subsVec);
+                nbytes -= 8 * sizeof(int16_t);
+                in += 8;
+                out += 8;
+            }
+        }
+    }
+    // Load constants into vectors from aligned memory.
+    __m128i x7fffVec = _mm_load_si128((__m128i*)x7fff);
+    __m128i x4000Vec = _mm_load_si128((__m128i*)x4000);
+    __m128i gainVec = _mm_set1_epi16(gain);
+    while (nbytes > 0) {
+        for (unsigned int i = 0; i < 2; i++) {
+            // Load input and output data into vectors
+            __m128i outVec = _mm_loadu_si128((__m128i*)out);
+            __m128i inVec = _mm_loadu_si128((__m128i*)in);
+            // Multiply `out` by `0x7FFF` producing 32 bit results, and store the upper and lower bits in each vector.
+            // Equivalent to `out[0..8] * 0x7FFF`
+            __m128i outx7fffLoVec = _mm_mullo_epi16(outVec, x7fffVec);
+            __m128i outx7fffHiVec = _mm_mulhi_epi16(outVec, x7fffVec);
+            // Same as above but for in and gain. Equivalent to `in[0..8] * gain`
+            __m128i inxGainLoVec = _mm_mullo_epi16(inVec, gainVec);
+            __m128i inxGainHiVec = _mm_mulhi_epi16(inVec, gainVec);
+
+            // Interleave the lo and hi bits into one 32 bit value for each vector element.
+            // So now we have 4 full elements in each vector instead of 8 half elements.
+            outx7fffLoVec = _mm_unpacklo_epi16(outx7fffLoVec, outx7fffHiVec);
+            outx7fffHiVec = _mm_unpackhi_epi16(outx7fffLoVec, outx7fffHiVec);
+            inxGainLoVec = _mm_unpacklo_epi16(inxGainLoVec, inxGainHiVec);
+            inxGainHiVec = _mm_unpackhi_epi16(inxGainLoVec, inxGainHiVec);
+
+            // Now we have 4 32 bit elements.  Continue the calculaton per the reference implementation.
+            // We already did out + 0x7fff and in * gain.
+            // *out * 0x7fff + *in++ * gain is the final result of these two calculations.
+            __m128i addLoVec = _mm_add_epi32(outx7fffLoVec, inxGainLoVec);
+            __m128i addHiVec = _mm_add_epi32(outx7fffHiVec, inxGainHiVec);
+            // Add 0x4000 to each element
+            addLoVec = _mm_add_epi32(addLoVec, x4000Vec);
+            addHiVec = _mm_add_epi32(addHiVec, x4000Vec);
+            // Shift each element over by 15
+            __m128i shiftedLoVec = _mm_srai_epi32(addLoVec, 15);
+            __m128i shiftedHiVec = _mm_srai_epi32(addHiVec, 15);
+            // Convert each 32 bit element to 16 bit with saturation (clamp) and store in `outVec`
+            outVec = _mm_packs_epi32(shiftedLoVec, shiftedHiVec);
+            // Write the final vector back to memory
+            // The final calculation is ((out[0..8] * 0x7fff + in[0..8] * gain) + 0x4000) >> 15;
+            _mm_storeu_si128((__m128i*)out, outVec);
+
+            in += 8;
+            out += 8;
+            nbytes -= 8 * sizeof(int16_t);
+        }
+    }
+}
+#endif
+#if defined(__ARM_NEON)
+#include <arm_neon.h>
+static const int32_t x4000Arr[4] = { 0x4000, 0x4000, 0x4000, 0x4000 };
+void aMixImplNEON(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
+    int nbytes = ROUND_UP_32(ROUND_DOWN_16(count << 4));
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
+    int i;
+    int32_t sample;
+
+    if (gain == -0x8000) {
+        while (nbytes > 0) {
+            for (unsigned int i = 0; i < 2; i++) {
+                int16x8_t outVec = vld1q_s16(out);
+                int16x8_t inVec = vld1q_s16(in);
+                int16x8_t subVec = vqsubq_s16(outVec, inVec);
+                vst1q_s16(out, subVec);
+                nbytes -= 8 * sizeof(int16_t);
+                out += 8;
+                in += 8;
+            }
+        }
+    }
+    int16x8_t gainVec = vdupq_n_s16(gain);
+    int32x4_t x4000Vec = vld1q_s32(x4000Arr);
+    while (nbytes > 0) {
+        for (unsigned int i = 0; i < 2; i++) {
+            // for (i = 0; i < 16; i++) {
+            int16x8_t outVec = vld1q_s16(out);
+            int16x8_t inVec = vld1q_s16(in);
+            int16x4_t outLoVec = vget_low_s16(outVec);
+            int16x8_t outLoVec2 = vcombine_s16(outLoVec, outLoVec);
+            int16x4_t inLoVec = vget_low_s16(inVec);
+            int16x8_t inLoVec2 = vcombine_s16(inLoVec, inLoVec);
+            int32x4_t outX7fffHiVec = vmull_high_n_s16(outVec, 0x7FFF);
+            int32x4_t outX7fffLoVec = vmull_high_n_s16(outLoVec2, 0x7FFF);
+
+            int32x4_t inGainLoVec = vmull_high_s16(inLoVec2, gainVec);
+            int32x4_t inGainHiVec = vmull_high_s16(inVec, gainVec);
+            int32x4_t addVecLo = vaddq_s32(outX7fffLoVec, inGainLoVec);
+            int32x4_t addVecHi = vaddq_s32(outX7fffHiVec, inGainHiVec);
+            addVecHi = vaddq_s32(addVecHi, x4000Vec);
+            addVecLo = vaddq_s32(addVecLo, x4000Vec);
+            int32x4_t shiftVecHi = vshrq_n_s32(addVecHi, 15);
+            int32x4_t shiftVecLo = vshrq_n_s32(addVecLo, 15);
+            int16x4_t shiftedNarrowHiVec = vqmovn_s32(shiftVecHi);
+            int16x4_t shiftedNarrowLoVec = vqmovn_s32(shiftVecLo);
+            vst1_s16(out, shiftedNarrowLoVec);
+            out += 4;
+            vst1_s16(out, shiftedNarrowHiVec);
+            // int16x8_t finalVec = vcombine_s16(shiftedNarrowLoVec, shiftedNarrowHiVec);
+            // vst1q_s16(out, finalVec);
+            out += 4;
+            in += 8;
+
+            nbytes -= 8 * sizeof(int16_t);
+        }
+    }
+}
+#endif
+
+#if 0
+static const ALIGN_ASSET(32) int16_t x7fff[16] = { 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,};
+static const ALIGN_ASSET(32) int32_t x4000[8] = { 0x4000, 0x4000, 0x4000, 0x4000, 0x4000, 0x4000, 0x4000, 0x4000};
+
+#pragma GCC target("avx2")
+// AVX2 version of the SSE2 implementation above. AVX2 wasn't released until 2014 and I don't have a good way of checking for it at compile time.
+void aMixImpl256(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr) {
+    int nbytes = ROUND_UP_32(ROUND_DOWN_16(count << 4));
+    int16_t* in = BUF_S16(in_addr);
+    int16_t* out = BUF_S16(out_addr);
+    int i;
+    int32_t sample;
+    if (gain == -0x8000) {
+        while (nbytes > 0) {
+            __m256i outVec =_mm256_loadu_si256((__m256*)out);
+            __m256i inVec =_mm256_loadu_si256((__m256i*)in);
+            __m256i subsVec =_mm256_subs_epi16(outVec, inVec);
+            _mm256_storeu_si256(out, subsVec);
+            in += 16;
+            out += 16;
+            nbytes -= 16 * sizeof(int16_t);
+        }
+    }
+    // Load constants into vectors from aligned memory.
+    __m256i x7fffVec = _mm256_load_si256((__m256i*)x7fff);
+    __m256i x4000Vec = _mm256_load_si256((__m256i*)x4000);
+    __m256i gainVec = _mm256_set1_epi16(gain);
+    while (nbytes > 0) {
+        // Load input and output data into vectors
+        __m256i outVec = _mm256_loadu_si256((__m256i*)out);
+        __m256i inVec = _mm256_loadu_si256((__m256i*)in);
+        // Multiply `out` by `0x7FFF` producing 32 bit results, and store the upper and lower bits in each vector.
+        // Equivalent to `out[0..16] * 0x7FFF`
+        __m256i outx7fffLoVec = _mm256_mullo_epi16(outVec, x7fffVec);
+        __m256i outx7fffHiVec = _mm256_mulhi_epi16(outVec, x7fffVec);
+        // Same as above but for in and gain. Equivalent to `in[0..16] * gain`
+        __m256i inxGainLoVec = _mm256_mullo_epi16(inVec, gainVec);
+        __m256i inxGainHiVec = _mm256_mulhi_epi16(inVec, gainVec);
+
+        // Interleave the lo and hi bits into one 32 bit value for each vector element.
+        // So now we have 8 full elements in each vector instead of 16 half elements.
+        outx7fffLoVec = _mm256_unpacklo_epi16(outx7fffLoVec, outx7fffHiVec);
+        outx7fffHiVec = _mm256_unpackhi_epi16(outx7fffLoVec, outx7fffHiVec);
+        inxGainLoVec = _mm256_unpacklo_epi16(inxGainLoVec, inxGainHiVec);
+        inxGainHiVec = _mm256_unpackhi_epi16(inxGainLoVec, inxGainHiVec);
+
+        // Now we have 8 32 bit elements.  Continue the calculaton per the reference implementation.
+        // We already did out + 0x7fff and in * gain.
+        // *out * 0x7fff + *in++ * gain is the final result of these two calculations.
+        __m256i addLoVec = _mm256_add_epi32(outx7fffLoVec, inxGainLoVec);
+        __m256i addHiVec = _mm256_add_epi32(outx7fffHiVec, inxGainHiVec);
+        // Add 0x4000 to each element
+        addLoVec = _mm256_add_epi32(addLoVec, x4000Vec);
+        addHiVec = _mm256_add_epi32(addHiVec, x4000Vec);
+        // Shift each element over by 15
+        __m256i shiftedLoVec = _mm256_srai_epi32(addLoVec, 15);
+        __m256i shiftedHiVec = _mm256_srai_epi32(addHiVec, 15);
+        // Convert each 32 bit element to 16 bit with saturation (clamp) and store in `outVec`
+        outVec = _mm256_packs_epi32(shiftedLoVec, shiftedHiVec);
+        // Write the final vector back to memory
+        // The final calculation is ((out[0..16] * 0x7fff + in[0..16] * gain) + 0x4000) >> 15;
+        _mm256_storeu_si256((__m256i*)out, outVec);
+
+        in += 16;
+        out += 16;
+        nbytes -= 16 * sizeof(int16_t);
+    }
+}
+#endif
diff --git a/soh/soh/mixer.h b/soh/soh/mixer.h
index 6bde9621ee..048135e448 100644
--- a/soh/soh/mixer.h
+++ b/soh/soh/mixer.h
@@ -57,6 +57,11 @@ void aHiLoGainImpl(uint8_t g, uint16_t count, uint16_t addr);
 void aUnkCmd3Impl(uint16_t a, uint16_t b, uint16_t c);
 void aUnkCmd19Impl(uint8_t f, uint16_t count, uint16_t out_addr, uint16_t in_addr);
 
+struct OggOpusFile;
+
+void aOPUSdecImpl(void* source_addr, uint16_t dest_addr, uint16_t nbytes, struct OggOpusFile** decState, int32_t pos,
+                  uint32_t size);
+
 #define aSegment(pkt, s, b) \
     do {                    \
     } while (0)
diff --git a/soh/soh/resource/importer/AnimationFactory.cpp b/soh/soh/resource/importer/AnimationFactory.cpp
index 13aa71c86a..d6adfb66c0 100644
--- a/soh/soh/resource/importer/AnimationFactory.cpp
+++ b/soh/soh/resource/importer/AnimationFactory.cpp
@@ -1,14 +1,18 @@
 #include "soh/resource/importer/AnimationFactory.h"
 #include "soh/resource/type/Animation.h"
+#include "ResourceManager.h"
 #include "spdlog/spdlog.h"
+#include "Context.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAnimationV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryAnimationV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                               std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto animation = std::make_shared<Animation>(file->InitData);
+    auto animation = std::make_shared<Animation>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     AnimationType animType = (AnimationType)reader->ReadUInt32();
@@ -78,7 +82,11 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAnimationV0::ReadResource(
         animation->animationData.linkAnimationHeader.common.frameCount = reader->ReadInt16();
 
         // Read the segment pointer (always 32 bit, doesn't adjust for system pointer size)
-        animation->animationData.linkAnimationHeader.segment = (void*)reader->ReadUInt32();
+        std::string path = reader->ReadString();
+        const auto animData = std::static_pointer_cast<Animation>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path.c_str()));
+
+        animation->animationData.linkAnimationHeader.segment = animData->GetPointer();
     } else if (animType == AnimationType::Legacy) {
         SPDLOG_DEBUG("BEYTAH ANIMATION?!");
     }
diff --git a/soh/soh/resource/importer/AnimationFactory.h b/soh/soh/resource/importer/AnimationFactory.h
index ae27832b6a..2312d7ad37 100644
--- a/soh/soh/resource/importer/AnimationFactory.h
+++ b/soh/soh/resource/importer/AnimationFactory.h
@@ -4,8 +4,9 @@
 #include "ResourceFactoryBinary.h"
 
 namespace SOH {
-class ResourceFactoryBinaryAnimationV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryAnimationV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/ArrayFactory.cpp b/soh/soh/resource/importer/ArrayFactory.cpp
index 39be7c0937..0762704ffd 100644
--- a/soh/soh/resource/importer/ArrayFactory.cpp
+++ b/soh/soh/resource/importer/ArrayFactory.cpp
@@ -4,12 +4,14 @@
 #include "graphic/Fast3D/lus_gbi.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryArrayV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryArrayV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto array = std::make_shared<Array>(file->InitData);
+    auto array = std::make_shared<Array>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     array->ArrayType = (ArrayResourceType)reader->ReadUInt32();
@@ -18,7 +20,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryArrayV0::ReadResource(std:
     for (uint32_t i = 0; i < array->ArrayCount; i++) {
         if (array->ArrayType == ArrayResourceType::Vertex) {
             // OTRTODO: Implement Vertex arrays as just a vertex resource.
-            F3DVtx data;
+            Fast::F3DVtx data;
             data.v.ob[0] = reader->ReadInt16();
             data.v.ob[1] = reader->ReadInt16();
             data.v.ob[2] = reader->ReadInt16();
@@ -61,4 +63,4 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryArrayV0::ReadResource(std:
 
     return array;
 }
-} // namespace LUS
+} // namespace SOH
diff --git a/soh/soh/resource/importer/ArrayFactory.h b/soh/soh/resource/importer/ArrayFactory.h
index b9f5ca75b6..a64b7a8213 100644
--- a/soh/soh/resource/importer/ArrayFactory.h
+++ b/soh/soh/resource/importer/ArrayFactory.h
@@ -4,8 +4,9 @@
 #include "resource/ResourceFactoryBinary.h"
 
 namespace SOH {
-class ResourceFactoryBinaryArrayV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryArrayV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
-} // namespace LUS
+} // namespace SOH
diff --git a/soh/soh/resource/importer/AudioSampleFactory.cpp b/soh/soh/resource/importer/AudioSampleFactory.cpp
index 0ec3f52601..9fd8d746a0 100644
--- a/soh/soh/resource/importer/AudioSampleFactory.cpp
+++ b/soh/soh/resource/importer/AudioSampleFactory.cpp
@@ -1,123 +1,356 @@
 #include "soh/resource/importer/AudioSampleFactory.h"
+#include "soh/resource/importer/AudioSoundFontFactory.h"
 #include "soh/resource/type/AudioSample.h"
 #include "spdlog/spdlog.h"
+#include "z64.h"
+#include "z64audio.h"
+#include "Context.h"
+#include "resource/archive/Archive.h"
+#include "resource/ResourceManager.h"
+#define DR_WAV_IMPLEMENTATION
+#include <dr_wav.h>
+
+#define DR_MP3_IMPLEMENTATION
+#include <dr_mp3.h>
+
+#define DR_FLAC_IMPLEMENTATION
+#include <dr_flac.h>
+
+#include <ogg/ogg.h>
+#include <vorbis/codec.h>
+#include "vorbis/vorbisfile.h"
+#include <tinyxml2.h>
+
+struct OggFileData {
+    void* data;
+    size_t pos;
+    size_t size;
+};
+
+typedef enum class OggType {
+    None = -1,
+    Vorbis,
+    Opus,
+} OggType;
+
+static size_t VorbisReadCallback(void* out, size_t size, size_t elems, void* src) {
+    OggFileData* data = static_cast<OggFileData*>(src);
+    size_t toRead = size * elems;
+
+    if (toRead > data->size - data->pos) {
+        toRead = data->size - data->pos;
+    }
+
+    memcpy(out, static_cast<uint8_t*>(data->data) + data->pos, toRead);
+    data->pos += toRead;
+
+    return toRead / size;
+}
+
+static int VorbisSeekCallback(void* src, ogg_int64_t pos, int whence) {
+    OggFileData* data = static_cast<OggFileData*>(src);
+    size_t newPos;
+
+    switch (whence) {
+        case SEEK_SET:
+            newPos = pos;
+            break;
+        case SEEK_CUR:
+            newPos = data->pos + pos;
+            break;
+        case SEEK_END:
+            newPos = data->size + pos;
+            break;
+        default:
+            return -1;
+    }
+    if (newPos > data->size) {
+        return -1;
+    }
+    data->pos = newPos;
+    return 0;
+}
+
+static int VorbisCloseCallback([[maybe_unused]] void* src) {
+    return 0;
+}
+
+static long VorbisTellCallback(void* src) {
+    OggFileData* data = static_cast<OggFileData*>(src);
+    return data->pos;
+}
+
+static const ov_callbacks vorbisCallbacks = {
+    VorbisReadCallback,
+    VorbisSeekCallback,
+    VorbisCloseCallback,
+    VorbisTellCallback,
+};
+
+static OggType GetOggType(OggFileData* data) {
+    ogg_sync_state oy;
+    ogg_stream_state os;
+    ogg_page og;
+    ogg_packet op;
+    OggType type;
+    // The first page as the header information, containing, among other things, what kind of data this ogg holds.
+    ogg_sync_init(&oy);
+    char* buffer = ogg_sync_buffer(&oy, 4096);
+    VorbisReadCallback(buffer, 4096, 1, data);
+    ogg_sync_wrote(&oy, 4096);
+
+    ogg_sync_pageout(&oy, &og);
+    ogg_stream_init(&os, ogg_page_serialno(&og));
+    ogg_stream_pagein(&os, &og);
+    ogg_stream_packetout(&os, &op);
+
+    // Can't use strmp because op.packet isn't a null terminated string.
+    if (memcmp((char*)op.packet, "\x01vorbis", 7) == 0) {
+        type = OggType::Vorbis;
+    } else if (memcmp((char*)op.packet, "OpusHead", 8) == 0) {
+        type = OggType::Opus;
+    } else {
+        type = OggType::None;
+    }
+    ogg_stream_clear(&os);
+    ogg_sync_clear(&oy);
+    return type;
+}
+
+static void Mp3DecoderWorker(std::shared_ptr<SOH::AudioSample> audioSample, std::shared_ptr<Ship::File> sampleFile) {
+    drmp3 mp3;
+    drwav_uint64 numFrames;
+    drmp3_bool32 ret =
+        drmp3_init_memory(&mp3, sampleFile->Buffer.get()->data(), sampleFile->Buffer.get()->size(), nullptr);
+    numFrames = drmp3_get_pcm_frame_count(&mp3);
+    drwav_uint64 channels = mp3.channels;
+    drwav_uint64 sampleRate = mp3.sampleRate;
+
+    audioSample->sample.sampleAddr = new uint8_t[numFrames * channels * 2];
+    drmp3_read_pcm_frames_s16(&mp3, numFrames, (int16_t*)audioSample->sample.sampleAddr);
+}
+
+static void FlacDecoderWorker(std::shared_ptr<SOH::AudioSample> audioSample, std::shared_ptr<Ship::File> sampleFile) {
+    drflac* flac = drflac_open_memory(sampleFile->Buffer.get()->data(), sampleFile->Buffer.get()->size(), nullptr);
+    drflac_uint64 numFrames = flac->totalPCMFrameCount;
+    audioSample->sample.sampleAddr = new uint8_t[numFrames * flac->channels * 2];
+    drflac_read_pcm_frames_s16(flac, numFrames, (int16_t*)audioSample->sample.sampleAddr);
+    drflac_close(flac);
+}
+
+static void OggDecoderWorker(std::shared_ptr<SOH::AudioSample> audioSample, std::shared_ptr<Ship::File> sampleFile,
+                             std::shared_ptr<Ship::ResourceInitData> initData) {
+    OggVorbis_File vf;
+    char dataBuff[4096];
+    long read = 0;
+    size_t pos = 0;
+
+    OggFileData fileData = {
+        .data = sampleFile->Buffer.get()->data(),
+        .pos = 0,
+        .size = sampleFile->Buffer.get()->size(),
+    };
+    switch (GetOggType(&fileData)) {
+        case OggType::Vorbis: {
+            // Getting the type advanced the position. We are going to use a different library to decode the file which
+            // assumes the file starts at 0
+            fileData.pos = 0;
+            int ret = ov_open_callbacks(&fileData, &vf, nullptr, 0, vorbisCallbacks);
+
+            vorbis_info* vi = ov_info(&vf, -1);
+
+            uint64_t numFrames = ov_pcm_total(&vf, -1);
+            uint64_t sampleRate = vi->rate;
+            uint64_t numChannels = vi->channels;
+            int bitStream = 0;
+            size_t toRead = numFrames * numChannels * 2;
+            audioSample->sample.sampleAddr = new uint8_t[toRead];
+            do {
+                read = ov_read(&vf, dataBuff, 4096, 0, 2, 1, &bitStream);
+                memcpy(audioSample->sample.sampleAddr + pos, dataBuff, read);
+                pos += read;
+            } while (read != 0);
+            ov_clear(&vf);
+            break;
+        }
+        case OggType::Opus: {
+            // OPUS encoded data is decoded by the audio driver.
+            audioSample->sample.codec = CODEC_OPUS;
+            audioSample->sample.sampleAddr = new uint8_t[sampleFile->Buffer.get()->size()];
+            memcpy(audioSample->sample.sampleAddr, sampleFile->Buffer.get()->data(), sampleFile->Buffer.get()->size());
+            break;
+        }
+        case OggType::None: {
+            char buff[2048];
+            snprintf(buff, 2048, "Ogg file %s is not Vorbis or OPUS", initData->Path.c_str());
+            throw std::runtime_error(buff);
+            break;
+        }
+    }
+}
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioSampleV2::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryAudioSampleV2::ReadResource(std::shared_ptr<Ship::File> file,
+                                                 std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto audioSample = std::make_shared<AudioSample>(file->InitData);
+    auto audioSample = std::make_shared<AudioSample>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     audioSample->sample.codec = reader->ReadUByte();
     audioSample->sample.medium = reader->ReadUByte();
     audioSample->sample.unk_bit26 = reader->ReadUByte();
-    audioSample->sample.unk_bit25 = reader->ReadUByte();
+    audioSample->sample.isRelocated = reader->ReadUByte();
     audioSample->sample.size = reader->ReadUInt32();
 
-    audioSample->audioSampleData.reserve(audioSample->sample.size);
+    audioSample->sample.sampleAddr = new uint8_t[audioSample->sample.size];
     for (uint32_t i = 0; i < audioSample->sample.size; i++) {
-        audioSample->audioSampleData.push_back(reader->ReadUByte());
+        audioSample->sample.sampleAddr[i] = reader->ReadUByte();
     }
-    audioSample->sample.sampleAddr = audioSample->audioSampleData.data();
 
     audioSample->loop.start = reader->ReadUInt32();
     audioSample->loop.end = reader->ReadUInt32();
     audioSample->loop.count = reader->ReadUInt32();
 
-    audioSample->loopStateCount = reader->ReadUInt32();
+    // This always seems to be 16. Can it be removed in V3?
+    uint32_t loopStateCount = reader->ReadUInt32();
     for (int i = 0; i < 16; i++) {
         audioSample->loop.state[i] = 0;
     }
-    for (uint32_t i = 0; i < audioSample->loopStateCount; i++) {
+    for (uint32_t i = 0; i < loopStateCount; i++) {
         audioSample->loop.state[i] = reader->ReadInt16();
     }
     audioSample->sample.loop = &audioSample->loop;
 
     audioSample->book.order = reader->ReadInt32();
     audioSample->book.npredictors = reader->ReadInt32();
-    audioSample->bookDataCount = reader->ReadUInt32();
+    uint32_t bookDataCount = reader->ReadUInt32();
 
-    audioSample->bookData.reserve(audioSample->bookDataCount);
-    for (uint32_t i = 0; i < audioSample->bookDataCount; i++) {
-        audioSample->bookData.push_back(reader->ReadInt16());
+    audioSample->book.book = new int16_t[bookDataCount];
+
+    for (uint32_t i = 0; i < bookDataCount; i++) {
+        audioSample->book.book[i] = reader->ReadInt16();
     }
-    audioSample->book.book = audioSample->bookData.data();
     audioSample->sample.book = &audioSample->book;
 
     return audioSample;
 }
-} // namespace SOH
 
-/*
-in ResourceMgr_LoadAudioSample we used to have
---------------
-    if (cachedCustomSFs.find(path) != cachedCustomSFs.end())
-        return cachedCustomSFs[path];
-
-    SoundFontSample* cSample = ReadCustomSample(path);
-
-    if (cSample != nullptr)
-        return cSample;
---------------
-before the rest of the standard sample reading, this is the ReadCustomSample code we used to have
-
-extern "C" SoundFontSample* ReadCustomSample(const char* path) {
-
-    if (!ExtensionCache.contains(path))
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLAudioSampleV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                              std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
-
-    ExtensionEntry entry = ExtensionCache[path];
-
-    auto sampleRaw = Ship::Context::GetInstance()->GetResourceManager()->LoadFile(entry.path);
-    uint32_t* strem = (uint32_t*)sampleRaw->Buffer.get();
-    uint8_t* strem2 = (uint8_t*)strem;
-
-    SoundFontSample* sampleC = new SoundFontSample;
-
-    if (entry.ext == "wav") {
-        drwav_uint32 channels;
-        drwav_uint32 sampleRate;
-        drwav_uint64 totalPcm;
-        drmp3_int16* pcmData =
-            drwav_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &channels, &sampleRate, &totalPcm, NULL);
-        sampleC->size = totalPcm;
-        sampleC->sampleAddr = (uint8_t*)pcmData;
-        sampleC->codec = CODEC_S16;
-
-        sampleC->loop = new AdpcmLoop;
-        sampleC->loop->start = 0;
-        sampleC->loop->end = sampleC->size - 1;
-        sampleC->loop->count = 0;
-        sampleC->sampleRateMagicValue = 'RIFF';
-        sampleC->sampleRate = sampleRate;
-
-        cachedCustomSFs[path] = sampleC;
-        return sampleC;
-    } else if (entry.ext == "mp3") {
-        drmp3_config mp3Info;
-        drmp3_uint64 totalPcm;
-        drmp3_int16* pcmData =
-            drmp3_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &mp3Info, &totalPcm, NULL);
-
-        sampleC->size = totalPcm * mp3Info.channels * sizeof(short);
-        sampleC->sampleAddr = (uint8_t*)pcmData;
-        sampleC->codec = CODEC_S16;
-
-        sampleC->loop = new AdpcmLoop;
-        sampleC->loop->start = 0;
-        sampleC->loop->end = sampleC->size;
-        sampleC->loop->count = 0;
-        sampleC->sampleRateMagicValue = 'RIFF';
-        sampleC->sampleRate = mp3Info.sampleRate;
-
-        cachedCustomSFs[path] = sampleC;
-        return sampleC;
     }
 
-    return nullptr;
+    auto audioSample = std::make_shared<AudioSample>(initData);
+    auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
+    const char* customFormatStr = child->Attribute("CustomFormat");
+    memset(&audioSample->sample, 0, sizeof(audioSample->sample));
+    audioSample->sample.isRelocated = 0;
+    audioSample->sample.codec = CodecStrToInt(child->Attribute("Codec"), initData->Path.c_str());
+    audioSample->sample.medium =
+        ResourceFactoryXMLSoundFontV0::MediumStrToInt(child->Attribute("Medium"), initData->Path.c_str());
+    audioSample->sample.unk_bit26 = child->IntAttribute("bit26");
+
+    tinyxml2::XMLElement* loopRoot = child->FirstChildElement("ADPCMLoop");
+    if (loopRoot != nullptr) {
+        size_t i = 0;
+        audioSample->loop.start = loopRoot->UnsignedAttribute("Start");
+        audioSample->loop.end = loopRoot->UnsignedAttribute("End");
+        audioSample->loop.count = loopRoot->UnsignedAttribute("Count");
+        tinyxml2::XMLElement* predictor = loopRoot->FirstChildElement("Predictor");
+        while (predictor != nullptr) {
+            audioSample->loop.state[i++] = predictor->IntAttribute("State");
+            predictor = predictor->NextSiblingElement();
+        }
+    }
+
+    tinyxml2::XMLElement* bookRoot = child->FirstChildElement("ADPCMBook");
+    if (bookRoot != nullptr) {
+        size_t i = 0;
+        audioSample->book.npredictors = bookRoot->IntAttribute("Npredictors");
+        audioSample->book.order = bookRoot->IntAttribute("Order");
+        tinyxml2::XMLElement* book = bookRoot->FirstChildElement("Book");
+        size_t numBooks = audioSample->book.npredictors * audioSample->book.order * 8;
+        audioSample->book.book = new int16_t[numBooks];
+        while (book != nullptr) {
+            audioSample->book.book[i++] = book->IntAttribute("Page");
+            book = book->NextSiblingElement();
+        }
+        audioSample->sample.book = &audioSample->book;
+    }
+
+    audioSample->sample.loop = &audioSample->loop;
+    size_t size = child->Int64Attribute("Size");
+    audioSample->sample.size = size;
+
+    const char* path = child->Attribute("Path");
+
+    auto sampleFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
+    audioSample->sample.fileSize = sampleFile->Buffer.get()->size();
+    if (customFormatStr != nullptr) {
+        // Compressed files can take a really long time to decode (~250ms per).
+        // This worked when we tested it (09/04/2024) (Works on my machine)
+        if (strcmp(customFormatStr, "wav") == 0) {
+            drwav wav;
+            drwav_uint64 numFrames;
+
+            drwav_bool32 ret =
+                drwav_init_memory(&wav, sampleFile->Buffer.get()->data(), sampleFile->Buffer.get()->size(), nullptr);
+
+            drwav_get_length_in_pcm_frames(&wav, &numFrames);
+
+            audioSample->tuning = (wav.sampleRate * wav.channels) / 32000.0f;
+            audioSample->sample.sampleAddr = new uint8_t[numFrames * wav.channels * 2];
+
+            drwav_read_pcm_frames_s16(&wav, numFrames, (int16_t*)audioSample->sample.sampleAddr);
+            return audioSample;
+        } else if (strcmp(customFormatStr, "mp3") == 0) {
+            std::thread fileDecoderThread = std::thread(Mp3DecoderWorker, audioSample, sampleFile);
+            fileDecoderThread.detach();
+            return audioSample;
+        } else if (strcmp(customFormatStr, "ogg") == 0) {
+            std::thread fileDecoderThread = std::thread(OggDecoderWorker, audioSample, sampleFile, initData);
+            fileDecoderThread.detach();
+            return audioSample;
+        } else if (strcmp(customFormatStr, "flac") == 0) {
+            std::thread fileDecoderThread = std::thread(FlacDecoderWorker, audioSample, sampleFile);
+            fileDecoderThread.detach();
+            return audioSample;
+        }
+    }
+    // Not a normal streamed sample. Fallback to the original ADPCM sample to be decoded by the audio engine.
+    audioSample->sample.sampleAddr = new uint8_t[size];
+    // Can't use memcpy due to endianness issues.
+    for (uint32_t i = 0; i < size; i++) {
+        audioSample->sample.sampleAddr[i] = sampleFile->Buffer.get()->data()[i];
+    }
+
+    return audioSample;
 }
 
-*/
+uint8_t ResourceFactoryXMLAudioSampleV0::CodecStrToInt(const char* str, const char* file) {
+    if (strcmp("ADPCM", str) == 0) {
+        return CODEC_ADPCM;
+    } else if (strcmp("S8", str) == 0) {
+        return CODEC_S8;
+    } else if (strcmp("S16MEM", str) == 0) {
+        return CODEC_S16_INMEMORY;
+    } else if (strcmp("ADPCMSMALL", str) == 0) {
+        return CODEC_SMALL_ADPCM;
+    } else if (strcmp("REVERB", str) == 0) {
+        return CODEC_REVERB;
+    } else if (strcmp("S16", str) == 0) {
+        return CODEC_S16;
+    } else {
+        char buff[2048];
+        snprintf(buff, 2048, "Invalid codec in %s. Got %s, expected ADPCM, S8, S16MEM, ADPCMSMALL, REVERB, S16.", file,
+                 str);
+        throw std::runtime_error(buff);
+    }
+}
+} // namespace SOH
diff --git a/soh/soh/resource/importer/AudioSampleFactory.h b/soh/soh/resource/importer/AudioSampleFactory.h
index 372e8a3104..b750da4f1c 100644
--- a/soh/soh/resource/importer/AudioSampleFactory.h
+++ b/soh/soh/resource/importer/AudioSampleFactory.h
@@ -2,10 +2,22 @@
 
 #include "Resource.h"
 #include "ResourceFactoryBinary.h"
+#include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinaryAudioSampleV2 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryAudioSampleV2 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
+
+class ResourceFactoryXMLAudioSampleV0 final : public Ship::ResourceFactoryXML {
+  public:
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
+
+  private:
+    static uint8_t CodecStrToInt(const char* str, const char* file);
+};
+
 } // namespace SOH
diff --git a/soh/soh/resource/importer/AudioSequenceFactory.cpp b/soh/soh/resource/importer/AudioSequenceFactory.cpp
index 35da7f798d..850c27c16c 100644
--- a/soh/soh/resource/importer/AudioSequenceFactory.cpp
+++ b/soh/soh/resource/importer/AudioSequenceFactory.cpp
@@ -1,35 +1,395 @@
 #include "soh/resource/importer/AudioSequenceFactory.h"
+#include "soh/resource/importer/AudioSoundFontFactory.h"
 #include "soh/resource/type/AudioSequence.h"
 #include "spdlog/spdlog.h"
+#include "resource/ResourceManager.h"
+#include <tinyxml2.h>
+
+#include "Context.h"
+#include "resource/archive/Archive.h"
+#include "BinaryWriter.h"
+#include <type_traits>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioSequenceV2::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryAudioSequenceV2::ReadResource(std::shared_ptr<Ship::File> file,
+                                                   std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto audioSequence = std::make_shared<AudioSequence>(file->InitData);
+    auto audioSequence = std::make_shared<AudioSequence>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
-    audioSequence->sequence.seqDataSize = reader->ReadInt32();
-    audioSequence->sequenceData.reserve(audioSequence->sequence.seqDataSize);
-    for (uint32_t i = 0; i < audioSequence->sequence.seqDataSize; i++) {
-        audioSequence->sequenceData.push_back(reader->ReadChar());
+    audioSequence->sequence.seqDataSize = reader->ReadUInt32();
+    audioSequence->sequence.seqData = new char[audioSequence->sequence.seqDataSize];
+    for (int32_t i = 0; i < audioSequence->sequence.seqDataSize; i++) {
+        audioSequence->sequence.seqData[i] = reader->ReadChar();
     }
-    audioSequence->sequence.seqData = audioSequence->sequenceData.data();
-    
+
     audioSequence->sequence.seqNumber = reader->ReadUByte();
     audioSequence->sequence.medium = reader->ReadUByte();
     audioSequence->sequence.cachePolicy = reader->ReadUByte();
 
     audioSequence->sequence.numFonts = reader->ReadUInt32();
-    for (uint32_t i = 0; i < 16; i++) {
+    for (int32_t i = 0; i < 16; i++) {
         audioSequence->sequence.fonts[i] = 0;
     }
-    for (uint32_t i = 0; i < audioSequence->sequence.numFonts; i++) {
+    for (int32_t i = 0; i < audioSequence->sequence.numFonts; i++) {
         audioSequence->sequence.fonts[i] = reader->ReadUByte();
     }
 
     return audioSequence;
 }
-} // namespace SOH
+
+template <typename T> static void WriteInsnOneArg(Ship::BinaryWriter* writer, uint8_t opcode, T arg) {
+    static_assert(std::is_fundamental<T>::value);
+    writer->Write(opcode);
+    writer->Write(arg);
+}
+
+template <typename T1, typename T2>
+static void WriteInsnTwoArg(Ship::BinaryWriter* writer, uint8_t opcode, T1 arg1, T2 arg2) {
+    static_assert(std::is_fundamental<T1>::value && std::is_fundamental<T2>::value);
+    writer->Write(opcode);
+    writer->Write(arg1);
+    writer->Write(arg2);
+}
+
+template <typename T1, typename T2, typename T3>
+static void WriteInsnThreeArg(Ship::BinaryWriter* writer, uint8_t opcode, T1 arg1, T2 arg2, T3 arg3) {
+    static_assert(std::is_fundamental<T1>::value && std::is_fundamental<T2>::value);
+    writer->Write(opcode);
+    writer->Write(arg1);
+    writer->Write(arg2);
+    writer->Write(arg3);
+}
+
+static void WriteInsnNoArg(Ship::BinaryWriter* writer, uint8_t opcode) {
+    writer->Write(opcode);
+}
+
+static void WriteLegato(Ship::BinaryWriter* writer) {
+    WriteInsnNoArg(writer, 0xC4);
+}
+
+static void WriteNoLegato(Ship::BinaryWriter* writer) {
+    WriteInsnNoArg(writer, 0xC5);
+}
+
+static void WriteMuteBhv(Ship::BinaryWriter* writer, uint8_t arg) {
+    WriteInsnOneArg(writer, 0xD3, arg);
+}
+
+static void WriteMuteScale(Ship::BinaryWriter* writer, uint8_t arg) {
+    WriteInsnOneArg(writer, 0xD5, arg);
+}
+
+static void WriteInitchan(Ship::BinaryWriter* writer, uint16_t channels) {
+    WriteInsnOneArg(writer, 0xD7, channels);
+}
+
+static void WriteLdchan(Ship::BinaryWriter* writer, uint8_t channel, uint16_t offset) {
+    WriteInsnOneArg(writer, 0x90 | channel, offset);
+}
+
+static void WriteVolSHeader(Ship::BinaryWriter* writer, uint8_t vol) {
+    WriteInsnOneArg(writer, 0xDB, vol);
+}
+
+static void WriteVolCHeader(Ship::BinaryWriter* writer, uint8_t vol) {
+    WriteInsnOneArg(writer, 0xDF, vol);
+}
+
+static void WriteTempo(Ship::BinaryWriter* writer, uint8_t tempo) {
+    WriteInsnOneArg(writer, 0xDD, tempo);
+}
+
+static void WriteJump(Ship::BinaryWriter* writer, uint16_t offset) {
+    WriteInsnOneArg(writer, 0xFB, offset);
+}
+
+static void WriteDisablecan(Ship::BinaryWriter* writer, uint16_t channels) {
+    WriteInsnOneArg(writer, 0xD6, channels);
+}
+
+static void WriteNoshort(Ship::BinaryWriter* writer) {
+    WriteInsnNoArg(writer, 0xC4);
+}
+
+static void WriteLdlayer(Ship::BinaryWriter* writer, uint8_t layer, uint16_t offset) {
+    WriteInsnOneArg(writer, 0x88 | layer, offset);
+}
+
+static void WritePan(Ship::BinaryWriter* writer, uint8_t pan) {
+    WriteInsnOneArg(writer, 0xDD, pan);
+}
+
+static void WriteBend(Ship::BinaryWriter* writer, uint8_t bend) {
+    WriteInsnOneArg(writer, 0xD3, bend);
+}
+
+static void WriteInstrument(Ship::BinaryWriter* writer, uint8_t instrument) {
+    WriteInsnOneArg(writer, 0xC1, instrument);
+}
+
+static void WriteTranspose(Ship::BinaryWriter* writer, int8_t transpose) {
+    WriteInsnOneArg(writer, 0xC2, transpose);
+}
+
+static void WriteDelay(Ship::BinaryWriter* writer, uint16_t delay) {
+    if (delay > 0x7F) {
+        WriteInsnOneArg(writer, 0xFD, static_cast<uint16_t>(delay | 0x8000));
+    } else {
+        WriteInsnOneArg(writer, 0xFD, static_cast<uint8_t>(delay));
+    }
+}
+
+template <typename T> static void WriteLDelay(Ship::BinaryWriter* writer, T delay) {
+    WriteInsnOneArg(writer, 0xC0, delay);
+}
+
+template <typename T> static void WriteNotedv(Ship::BinaryWriter* writer, uint8_t note, T delay, uint8_t velocity) {
+    WriteInsnTwoArg(writer, note, delay, velocity);
+}
+
+static void WriteNotedvg(Ship::BinaryWriter* writer, uint8_t note, uint16_t delay, uint8_t velocity, uint8_t gateTime) {
+    if (delay > 0x7F) {
+        WriteInsnThreeArg(writer, note, static_cast<uint16_t>(delay | 0x8000), velocity, gateTime);
+    } else {
+        WriteInsnThreeArg(writer, note, static_cast<uint8_t>(delay), velocity, gateTime);
+    }
+}
+
+static void WriteMonoSingleSeq(Ship::BinaryWriter* writer, uint16_t delay, uint8_t tempo, bool looped) {
+    uint16_t channelStart;
+    uint16_t channelPlaceholderOff;
+    uint16_t loopPoint;
+    uint16_t layerPlaceholderOff;
+    uint16_t layerStart;
+    if (looped) {
+        delay = 0x7FFF;
+    }
+    // Write seq header
+
+    // These two values are always the same in OOT and MM
+    WriteMuteBhv(writer, 0x20);
+    WriteMuteScale(writer, 0x32);
+
+    // We only have one channel
+    WriteInitchan(writer, 0b11);
+    // Store the current position so we can write the address of the channel when we are ready.
+    channelPlaceholderOff = writer->GetBaseAddress();
+    // Store the current position so we can loop here after the song ends.
+    loopPoint = writer->GetBaseAddress();
+    WriteLdchan(writer, 0, 0); // Fill in the actual address later
+
+    WriteVolSHeader(writer, 127); // Max volume
+    WriteTempo(writer, tempo);
+
+    WriteDelay(writer, delay);
+    if (looped) {
+        WriteJump(writer, loopPoint);
+    }
+    WriteDisablecan(writer, 0b11);
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    // Fill in the ldchan from before
+    channelStart = writer->GetBaseAddress();
+    writer->Seek(channelPlaceholderOff, Ship::SeekOffsetType::Start);
+    WriteLdchan(writer, 0, channelStart);
+    writer->Seek(channelStart, Ship::SeekOffsetType::Start);
+
+    // Channel header
+    layerPlaceholderOff = writer->GetBaseAddress();
+    WriteNoshort(writer);
+    WriteLdlayer(writer, 0, 0);
+    WritePan(writer, 64);
+    WriteVolCHeader(writer, 127); // Max volume
+    WriteBend(writer, 0);
+    WriteInstrument(writer, 0);
+    WriteDelay(writer, delay);
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    layerStart = writer->GetBaseAddress();
+    writer->Seek(layerPlaceholderOff, Ship::SeekOffsetType::Start);
+    WriteLdlayer(writer, 0, layerStart);
+    writer->Seek(layerStart, Ship::SeekOffsetType::Start);
+
+    // Note layer
+    WriteLegato(writer);
+    WriteNotedvg(writer, 39, 0x7FFF - 1, static_cast<uint8_t>(0x7F), static_cast<uint8_t>(1));
+    writer->Write(static_cast<uint8_t>(0xFF));
+}
+
+static void WriteStereoSingleSeq(Ship::BinaryWriter* writer, uint16_t delay, uint8_t tempo, bool looped) {
+    uint16_t lChannelStart;
+    uint16_t rChannelStart;
+    uint16_t channelPlaceholderOff;
+    uint16_t loopPoint;
+    uint16_t lLayerPlaceholderOff;
+    uint16_t rLayerPlaceholderOff;
+    uint16_t lLayerOffset;
+    uint16_t rLayerOffset;
+
+    uint16_t layerStart;
+    // Write seq header
+    if (looped) {
+        delay = 0x7FFF;
+    }
+    // These two values are always the same in OOT and MM
+    WriteMuteBhv(writer, 0x20);
+    WriteMuteScale(writer, 0x32);
+
+    // We only have one channel
+    WriteInitchan(writer, 0b11);
+    // Store the current position so we can write the address of the channel when we are ready.
+    channelPlaceholderOff = writer->GetBaseAddress();
+    // Store the current position so we can loop here after the song ends.
+    loopPoint = writer->GetBaseAddress();
+    // Left note channel
+    WriteLdchan(writer, 0, 0); // Fill in the actual address later
+    // Right note channel
+    WriteLdchan(writer, 1, 0); // Fill in the actual address later
+
+    WriteVolSHeader(writer, 127); // Max volume
+    WriteTempo(writer, tempo);
+
+    WriteDelay(writer, delay);
+    if (looped) {
+        WriteJump(writer, loopPoint);
+    }
+    WriteDisablecan(writer, 0b11);
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    lChannelStart = writer->GetBaseAddress();
+    // Left Channel header
+    WriteNoshort(writer);
+    lLayerPlaceholderOff = writer->GetBaseAddress();
+    WriteLdlayer(writer, 0, 0);
+    WritePan(writer, 0);
+    WriteVolCHeader(writer, 127); // Max volume
+    WriteBend(writer, 0);
+    WriteInstrument(writer, 0);
+    WriteDelay(writer, delay);
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    rChannelStart = writer->GetBaseAddress();
+    // Right Channel header
+    WriteNoshort(writer);
+    rLayerPlaceholderOff = writer->GetBaseAddress();
+    WriteLdlayer(writer, 1, 0);
+    WritePan(writer, 127);
+    WriteVolCHeader(writer, 127); // Max volume
+    WriteBend(writer, 0);
+    WriteInstrument(writer, 1);
+    WriteDelay(writer, delay);
+    writer->Write(static_cast<uint8_t>(0xFF));
+    uint16_t placeHolder = writer->GetBaseAddress();
+    writer->Seek(channelPlaceholderOff, Ship::SeekOffsetType::Start);
+    WriteLdchan(writer, 0, lChannelStart);
+    WriteLdchan(writer, 1, rChannelStart);
+    writer->Seek(placeHolder, Ship::SeekOffsetType::Start);
+
+    // Left Note layer
+    lLayerOffset = writer->GetBaseAddress();
+    WriteLegato(writer);
+    WriteNotedvg(writer, 39, 0x7FFF - 1, static_cast<uint8_t>(0x7F), static_cast<uint8_t>(1));
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    // Right Note layer
+    rLayerOffset = writer->GetBaseAddress();
+    WriteLegato(writer);
+    WriteNotedvg(writer, 39, 0x7FFF - 1, static_cast<uint8_t>(0x7F), static_cast<uint8_t>(1));
+    writer->Write(static_cast<uint8_t>(0xFF));
+
+    writer->Seek(lLayerPlaceholderOff, Ship::SeekOffsetType::Start);
+    WriteLdlayer(writer, 0, lLayerOffset);
+    writer->Seek(rLayerPlaceholderOff, Ship::SeekOffsetType::Start);
+    WriteLdlayer(writer, 1, rLayerOffset);
+}
+
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLAudioSequenceV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
+        return nullptr;
+    }
+
+    auto sequence = std::make_shared<AudioSequence>(initData);
+    auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
+    unsigned int i = 0;
+
+    sequence->sequence.medium =
+        ResourceFactoryXMLSoundFontV0::MediumStrToInt(child->Attribute("Medium"), initData->Path.c_str());
+    sequence->sequence.cachePolicy =
+        ResourceFactoryXMLSoundFontV0::CachePolicyToInt(child->Attribute("CachePolicy"), initData->Path.c_str());
+    sequence->sequence.seqDataSize = child->IntAttribute("Size");
+    sequence->sequence.seqNumber = child->IntAttribute("Index");
+    bool streamed = child->BoolAttribute("Streamed");
+
+    memset(sequence->sequence.fonts, 0, sizeof(sequence->sequence.fonts));
+
+    tinyxml2::XMLElement* fontsElement = child->FirstChildElement();
+    tinyxml2::XMLElement* fontElement = fontsElement->FirstChildElement();
+    while (fontElement != nullptr) {
+        sequence->sequence.fonts[i] = fontElement->IntAttribute("FontIdx");
+        fontElement = fontElement->NextSiblingElement();
+        i++;
+    }
+    sequence->sequence.numFonts = i;
+
+    const char* path = child->Attribute("Path");
+    std::shared_ptr<Ship::File> seqFile;
+    if (path != nullptr) {
+        seqFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
+    }
+
+    if (!streamed) {
+        sequence->sequence.seqDataSize = seqFile->Buffer.get()->size();
+        sequence->sequence.seqData = new char[seqFile->Buffer.get()->size()];
+        memcpy(sequence->sequence.seqData, seqFile->Buffer.get()->data(), seqFile->Buffer.get()->size());
+    } else {
+        // setting numFonts to -1 tells the game's audio engine the sound font to used is CRC64 encoded in the font
+        // indicies.
+        sequence->sequence.numFonts = -1;
+        if (path != nullptr) {
+            sequence->sequence.seqDataSize = seqFile->Buffer.get()->size();
+            sequence->sequence.seqData = new char[seqFile->Buffer.get()->size()];
+            memcpy(sequence->sequence.seqData, seqFile->Buffer.get()->data(), seqFile->Buffer.get()->size());
+        } else {
+            unsigned int length = child->UnsignedAttribute("Length");
+            bool looped = child->BoolAttribute("Looped", true);
+            bool stereo = child->BoolAttribute("Stereo", false);
+            Ship::BinaryWriter writer = Ship::BinaryWriter();
+            writer.SetEndianness(Ship::Endianness::Big);
+
+            // 1 second worth of ticks can be found by using `ticks = 60 / (bpm * 48)`
+            // Get the number of ticks per second and then divide the length by this number to get the number of ticks
+            // for the song.
+            constexpr uint8_t TEMPO = 1;
+            constexpr float TEMPO_F = TEMPO;
+            // Use floats for this first calculation so we can round up
+            float delayF = length / (60.0f / (TEMPO_F * 48.0f));
+            // Convert to u16. This way this value is encoded changes depending on the value.
+            // It can be at most 0xFFFF so store it in a u16 for now.
+            uint16_t delay;
+            if (delayF >= 65535.0f) {
+                delay = 0x7FFF;
+            } else {
+                delay = delayF;
+            }
+            if (stereo) {
+                WriteStereoSingleSeq(&writer, delay, TEMPO, looped);
+            } else {
+                WriteMonoSingleSeq(&writer, delay, TEMPO, looped);
+            }
+            sequence->sequence.seqDataSize = writer.ToVector().size();
+            sequence->sequence.seqData = new char[sequence->sequence.seqDataSize];
+            memcpy(sequence->sequence.seqData, writer.ToVector().data(), sequence->sequence.seqDataSize);
+        }
+    }
+
+    return sequence;
+}
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/importer/AudioSequenceFactory.h b/soh/soh/resource/importer/AudioSequenceFactory.h
index 35fd1ebef5..4ae249ec35 100644
--- a/soh/soh/resource/importer/AudioSequenceFactory.h
+++ b/soh/soh/resource/importer/AudioSequenceFactory.h
@@ -2,10 +2,19 @@
 
 #include "Resource.h"
 #include "ResourceFactoryBinary.h"
+#include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinaryAudioSequenceV2 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryAudioSequenceV2 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
+
+class ResourceFactoryXMLAudioSequenceV0 final : public Ship::ResourceFactoryXML {
+  public:
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
+};
+
 } // namespace SOH
diff --git a/soh/soh/resource/importer/AudioSoundFontFactory.cpp b/soh/soh/resource/importer/AudioSoundFontFactory.cpp
index 534a7914c8..1150b2b69a 100644
--- a/soh/soh/resource/importer/AudioSoundFontFactory.cpp
+++ b/soh/soh/resource/importer/AudioSoundFontFactory.cpp
@@ -1,21 +1,27 @@
 #include "soh/resource/importer/AudioSoundFontFactory.h"
 #include "soh/resource/type/AudioSoundFont.h"
-#include "spdlog/spdlog.h"
-#include "libultraship/libultraship.h"
+#include <tinyxml2.h>
+#include <z64.h>
+#include "z64audio.h"
+#include "Context.h"
+#include "resource/archive/Archive.h"
+#include "resource/ResourceManager.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryAudioSoundFontV2::ReadResource(std::shared_ptr<Ship::File> file,
+                                                    std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto audioSoundFont = std::make_shared<AudioSoundFont>(file->InitData);
+    auto audioSoundFont = std::make_shared<AudioSoundFont>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     audioSoundFont->soundFont.fntIndex = reader->ReadInt32();
     audioSoundFont->medium = reader->ReadInt8();
     audioSoundFont->cachePolicy = reader->ReadInt8();
-    
+
     audioSoundFont->data1 = reader->ReadUInt16();
     audioSoundFont->soundFont.sampleBankId1 = audioSoundFont->data1 >> 8;
     audioSoundFont->soundFont.sampleBankId2 = audioSoundFont->data1 & 0xFF;
@@ -25,128 +31,123 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioSoundFontV2::ReadReso
 
     uint32_t drumCount = reader->ReadUInt32();
     audioSoundFont->soundFont.numDrums = drumCount;
-    
+
     uint32_t instrumentCount = reader->ReadUInt32();
     audioSoundFont->soundFont.numInstruments = instrumentCount;
-    
+
     uint32_t soundEffectCount = reader->ReadUInt32();
     audioSoundFont->soundFont.numSfx = soundEffectCount;
 
     // 🥁 DRUMS 🥁
-    audioSoundFont->drums.reserve(audioSoundFont->soundFont.numDrums);
+    // audioSoundFont->drums.reserve(audioSoundFont->soundFont.numDrums);
     audioSoundFont->drumAddresses.reserve(audioSoundFont->soundFont.numDrums);
     for (uint32_t i = 0; i < audioSoundFont->soundFont.numDrums; i++) {
-        Drum drum;
-        drum.releaseRate = reader->ReadUByte();
-        drum.pan = reader->ReadUByte();
-        drum.loaded = reader->ReadUByte();
-        drum.loaded = 0; // this was always getting set to zero in ResourceMgr_LoadAudioSoundFont
+        Drum* drum = new Drum;
+        drum->releaseRate = reader->ReadUByte();
+        drum->pan = reader->ReadUByte();
+        drum->loaded = reader->ReadUByte();
+        drum->loaded = 0; // this was always getting set to zero in ResourceMgr_LoadAudioSoundFontByName
 
         uint32_t envelopeCount = reader->ReadUInt32();
-        audioSoundFont->drumEnvelopeCounts.push_back(envelopeCount);
-        std::vector<AdsrEnvelope> drumEnvelopes;
-        drumEnvelopes.reserve(audioSoundFont->drumEnvelopeCounts[i]);
-        for (uint32_t j = 0; j < audioSoundFont->drumEnvelopeCounts.back(); j++) {
-            AdsrEnvelope env;
-            
+        drum->envelope = new AdsrEnvelope[envelopeCount];
+        for (uint32_t j = 0; j < envelopeCount; j++) {
             int16_t delay = reader->ReadInt16();
             int16_t arg = reader->ReadInt16();
 
-            env.delay = BE16SWAP(delay);
-            env.arg = BE16SWAP(arg);
-
-            drumEnvelopes.push_back(env);
+            drum->envelope[j].delay = BE16SWAP(delay);
+            drum->envelope[j].arg = BE16SWAP(arg);
         }
-        audioSoundFont->drumEnvelopeArrays.push_back(drumEnvelopes);
-        drum.envelope = audioSoundFont->drumEnvelopeArrays.back().data();
 
         bool hasSample = reader->ReadInt8();
         std::string sampleFileName = reader->ReadString();
-        drum.sound.tuning = reader->ReadFloat();
+        drum->sound.tuning = reader->ReadFloat();
 
         if (sampleFileName.empty()) {
-            drum.sound.sample = nullptr;
+            drum->sound.sample = nullptr;
         } else {
             auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
-            drum.sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            drum->sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
         }
 
-        audioSoundFont->drums.push_back(drum);
-        audioSoundFont->drumAddresses.push_back(&audioSoundFont->drums.back());
+        // audioSoundFont->drums.push_back(drum);
+        //  BENTODO clean this up in V3.
+        if (drum->sound.sample == nullptr) {
+            delete[] drum->envelope;
+            delete drum;
+            audioSoundFont->drumAddresses.push_back(nullptr);
+        } else {
+            audioSoundFont->drumAddresses.push_back(drum);
+        }
     }
     audioSoundFont->soundFont.drums = audioSoundFont->drumAddresses.data();
 
     // 🎺🎻🎷🎸🎹 INSTRUMENTS 🎹🎸🎷🎻🎺
-    audioSoundFont->instruments.reserve(audioSoundFont->soundFont.numInstruments);
     for (uint32_t i = 0; i < audioSoundFont->soundFont.numInstruments; i++) {
-        Instrument instrument;
+        Instrument* instrument = new Instrument;
 
         uint8_t isValidEntry = reader->ReadUByte();
-        instrument.loaded = reader->ReadUByte();
-        instrument.loaded = 0; // this was always getting set to zero in ResourceMgr_LoadAudioSoundFont
+        instrument->loaded = reader->ReadUByte();
+        instrument->loaded = 0; // this was always getting set to zero in ResourceMgr_LoadAudioSoundFontByName
 
-        instrument.normalRangeLo = reader->ReadUByte();
-        instrument.normalRangeHi = reader->ReadUByte();
-        instrument.releaseRate = reader->ReadUByte();
+        instrument->normalRangeLo = reader->ReadUByte();
+        instrument->normalRangeHi = reader->ReadUByte();
+        instrument->releaseRate = reader->ReadUByte();
 
         uint32_t envelopeCount = reader->ReadInt32();
-        audioSoundFont->instrumentEnvelopeCounts.push_back(envelopeCount);
-        std::vector<AdsrEnvelope> instrumentEnvelopes;
-        for (uint32_t j = 0; j < audioSoundFont->instrumentEnvelopeCounts.back(); j++) {
-            AdsrEnvelope env;
+        instrument->envelope = new AdsrEnvelope[envelopeCount];
 
+        for (uint32_t j = 0; j < envelopeCount; j++) {
             int16_t delay = reader->ReadInt16();
             int16_t arg = reader->ReadInt16();
 
-            env.delay = BE16SWAP(delay);
-            env.arg = BE16SWAP(arg);
-
-            instrumentEnvelopes.push_back(env);
+            instrument->envelope[j].delay = BE16SWAP(delay);
+            instrument->envelope[j].arg = BE16SWAP(arg);
         }
-        audioSoundFont->instrumentEnvelopeArrays.push_back(instrumentEnvelopes);
-        instrument.envelope = audioSoundFont->instrumentEnvelopeArrays.back().data();
 
         bool hasLowNoteSoundFontEntry = reader->ReadInt8();
         if (hasLowNoteSoundFontEntry) {
             bool hasSampleRef = reader->ReadInt8();
             std::string sampleFileName = reader->ReadString();
-            instrument.lowNotesSound.tuning = reader->ReadFloat();
+            instrument->lowNotesSound.tuning = reader->ReadFloat();
             auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
-            instrument.lowNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            instrument->lowNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
         } else {
-            instrument.lowNotesSound.sample = nullptr;
-            instrument.lowNotesSound.tuning = 0;
+            instrument->lowNotesSound.sample = nullptr;
+            instrument->lowNotesSound.tuning = 0;
         }
 
         bool hasNormalNoteSoundFontEntry = reader->ReadInt8();
         if (hasNormalNoteSoundFontEntry) {
+            // BENTODO remove in V3
             bool hasSampleRef = reader->ReadInt8();
             std::string sampleFileName = reader->ReadString();
-            instrument.normalNotesSound.tuning = reader->ReadFloat();
+            instrument->normalNotesSound.tuning = reader->ReadFloat();
             auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
-            instrument.normalNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            instrument->normalNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
         } else {
-            instrument.normalNotesSound.sample = nullptr;
-            instrument.normalNotesSound.tuning = 0;
+            instrument->normalNotesSound.sample = nullptr;
+            instrument->normalNotesSound.tuning = 0;
         }
 
         bool hasHighNoteSoundFontEntry = reader->ReadInt8();
         if (hasHighNoteSoundFontEntry) {
             bool hasSampleRef = reader->ReadInt8();
             std::string sampleFileName = reader->ReadString();
-            instrument.highNotesSound.tuning = reader->ReadFloat();
+            instrument->highNotesSound.tuning = reader->ReadFloat();
             auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
-            instrument.highNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            instrument->highNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
         } else {
-            instrument.highNotesSound.sample = nullptr;
-            instrument.highNotesSound.tuning = 0;
+            instrument->highNotesSound.sample = nullptr;
+            instrument->highNotesSound.tuning = 0;
         }
 
-        
-        audioSoundFont->instruments.push_back(instrument);
-        audioSoundFont->instrumentAddresses.push_back(isValidEntry ? 
-                                                      &audioSoundFont->instruments.back() :
-                                                      nullptr);
+        if (isValidEntry) {
+            audioSoundFont->instrumentAddresses.push_back(instrument);
+        } else {
+            delete[] instrument->envelope;
+            delete instrument;
+            audioSoundFont->instrumentAddresses.push_back(nullptr);
+        }
     }
     audioSoundFont->soundFont.instruments = audioSoundFont->instrumentAddresses.data();
 
@@ -163,11 +164,309 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioSoundFontV2::ReadReso
             auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleFileName.c_str());
             soundEffect.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
         }
-        
+
         audioSoundFont->soundEffects.push_back(soundEffect);
     }
     audioSoundFont->soundFont.soundEffects = audioSoundFont->soundEffects.data();
 
     return audioSoundFont;
 }
+
+int8_t ResourceFactoryXMLSoundFontV0::MediumStrToInt(const char* str, const char* file) {
+    if (!strcmp("Ram", str)) {
+        return MEDIUM_RAM;
+    } else if (!strcmp("Unk", str)) {
+        return MEDIUM_UNK;
+    } else if (!strcmp("Cart", str)) {
+        return MEDIUM_CART;
+    } else if (!strcmp("Disk", str)) {
+        return MEDIUM_DISK_DRIVE;
+        // 4 is skipped
+    } else {
+        char buff[2048];
+        snprintf(buff, 2048, "Bad medium value in %s. Got %s, expected Ram, Unk, Cart, or Disk.", file, str);
+        throw std::runtime_error(buff);
+    }
+}
+
+int8_t ResourceFactoryXMLSoundFontV0::CachePolicyToInt(const char* str, const char* file) {
+    if (!strcmp("Temporary", str)) {
+        return CACHE_TEMPORARY;
+    } else if (!strcmp("Persistent", str)) {
+        return CACHE_PERSISTENT;
+    } else if (!strcmp("Either", str)) {
+        return CACHE_EITHER;
+    } else if (!strcmp("Permanent", str)) {
+        return CACHE_PERMANENT;
+    } else {
+        char buff[2048];
+        snprintf(buff, 2048,
+                 "Bad cache policy value in %s. Got %s, expected Temporary, Persistent, Either, or Permanent.", file,
+                 str);
+        throw std::runtime_error(buff);
+    }
+}
+
+void ResourceFactoryXMLSoundFontV0::ParseDrums(AudioSoundFont* soundFont, tinyxml2::XMLElement* element) {
+    element = element->FirstChildElement();
+    // No drums
+    if (element == nullptr) {
+        soundFont->soundFont.drums = nullptr;
+        soundFont->soundFont.numDrums = 0;
+        return;
+    }
+
+    do {
+        int patch = element->IntAttribute("Patches", -1);
+        Drum* drum;
+        if (patch != -1) {
+            drum = soundFont->drumAddresses[patch];
+        } else {
+            drum = new Drum;
+        }
+        std::vector<AdsrEnvelope> envelopes;
+        drum->releaseRate = element->IntAttribute("ReleaseRate");
+        drum->pan = element->IntAttribute("Pan");
+        drum->loaded = element->IntAttribute("Loaded");
+        drum->sound.tuning = element->FloatAttribute("Tuning");
+        const char* sampleStr = element->Attribute("SampleRef");
+
+        if (sampleStr != nullptr && sampleStr[0] != 0) {
+            auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr);
+            drum->sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+        } else {
+            drum->sound.sample = nullptr;
+        }
+
+        element = element->FirstChildElement();
+        if (!strcmp(element->Name(), "Envelopes")) {
+            // element = (tinyxml2::XMLElement*)element->FirstChildElement();
+            unsigned int envCount = 0;
+            envelopes = ParseEnvelopes(soundFont, element, &envCount);
+            element = (tinyxml2::XMLElement*)element->Parent();
+            soundFont->drumEnvelopeArrays.push_back(envelopes);
+            // If we are applying a patch the envelopes are already allocated
+            // TODO revert this if we enable editing envelopes in a patch
+            if (patch == -1) {
+                drum->envelope = new AdsrEnvelope[envelopes.size()];
+            }
+            memcpy(drum->envelope, envelopes.data(), envelopes.size() * sizeof(AdsrEnvelope));
+        } else {
+            drum->envelope = nullptr;
+        }
+
+        if (drum->sound.sample == nullptr) {
+            soundFont->drumAddresses.push_back(nullptr);
+        } else {
+            soundFont->drumAddresses.push_back(drum);
+        }
+
+        element = element->NextSiblingElement();
+    } while (element != nullptr);
+
+    soundFont->soundFont.numDrums = soundFont->drumAddresses.size();
+    soundFont->soundFont.drums = soundFont->drumAddresses.data();
+}
+
+void ResourceFactoryXMLSoundFontV0::ParseInstruments(AudioSoundFont* soundFont, tinyxml2::XMLElement* element) {
+    element = element->FirstChildElement();
+    if (element == nullptr) {
+        return;
+    }
+    do {
+        int patch = element->IntAttribute("Patches", -1);
+        Instrument* instrument;
+        // Same as drums, if applying a patch, don't re-allocate and clear.
+        if (patch != -1) {
+            instrument = soundFont->instrumentAddresses[patch];
+        } else {
+            instrument = new Instrument;
+            memset(instrument, 0, sizeof(Instrument));
+        }
+        unsigned int envCount = 0;
+        std::vector<AdsrEnvelope> envelopes;
+
+        int isValid = element->BoolAttribute("IsValid");
+        instrument->loaded = element->IntAttribute("Loaded");
+        instrument->normalRangeLo = element->IntAttribute("NormalRangeLo");
+        instrument->normalRangeHi = element->IntAttribute("NormalRangeHi");
+        instrument->releaseRate = element->IntAttribute("ReleaseRate");
+        tinyxml2::XMLElement* instrumentElement = element->FirstChildElement();
+        tinyxml2::XMLElement* instrumentElementCopy = instrumentElement;
+
+        if (instrumentElement != nullptr && !strcmp(instrumentElement->Name(), "Envelopes")) {
+            envelopes = ParseEnvelopes(soundFont, instrumentElement, &envCount);
+            if (patch == -1) {
+                instrument->envelope = new AdsrEnvelope[envelopes.size()];
+            }
+            memcpy(instrument->envelope, envelopes.data(), envelopes.size() * sizeof(AdsrEnvelope));
+            instrumentElement = instrumentElement->NextSiblingElement();
+        }
+
+        if (instrumentElement != nullptr && !strcmp("LowNotesSound", instrumentElement->Name())) {
+            instrument->lowNotesSound.tuning = instrumentElement->FloatAttribute("Tuning");
+            const char* sampleStr = instrumentElement->Attribute("SampleRef");
+            if (sampleStr != nullptr && sampleStr[0] != 0) {
+                std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
+                    Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+                if (res->tuning != -1.0f) {
+                    instrument->lowNotesSound.tuning = res->tuning;
+                }
+                instrument->lowNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            }
+            instrumentElement = instrumentElement->NextSiblingElement();
+        }
+
+        if (instrumentElement != nullptr && !strcmp("NormalNotesSound", instrumentElement->Name())) {
+            instrument->normalNotesSound.tuning = instrumentElement->FloatAttribute("Tuning");
+            const char* sampleStr = instrumentElement->Attribute("SampleRef");
+            if (sampleStr != nullptr && sampleStr[0] != 0) {
+                std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
+                    Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+                if (res->tuning != -1.0f) {
+                    instrument->normalNotesSound.tuning = res->tuning;
+                }
+                instrument->normalNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            }
+            instrumentElement = instrumentElement->NextSiblingElement();
+        }
+
+        if (instrumentElement != nullptr && !strcmp("HighNotesSound", instrumentElement->Name())) {
+            instrument->highNotesSound.tuning = instrumentElement->FloatAttribute("Tuning");
+            const char* sampleStr = instrumentElement->Attribute("SampleRef");
+            if (sampleStr != nullptr && sampleStr[0] != 0) {
+                std::shared_ptr<SOH::AudioSample> res = static_pointer_cast<SOH::AudioSample>(
+                    Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+                if (res->tuning != -1.0f) {
+                    instrument->highNotesSound.tuning = res->tuning;
+                }
+                instrument->highNotesSound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+            }
+            instrumentElement = instrumentElement->NextSiblingElement();
+        }
+        // Don't add it to the list if applying a patch
+        if (patch == -1) {
+            soundFont->instrumentAddresses.push_back(instrument);
+        }
+        element = instrumentElementCopy;
+        element = (tinyxml2::XMLElement*)element->Parent();
+        element = element->NextSiblingElement();
+    } while (element != nullptr);
+
+    soundFont->soundFont.instruments = soundFont->instrumentAddresses.data();
+    soundFont->soundFont.numInstruments = soundFont->instrumentAddresses.size();
+}
+
+void ResourceFactoryXMLSoundFontV0::ParseSfxTable(AudioSoundFont* soundFont, tinyxml2::XMLElement* element) {
+    size_t count = element->IntAttribute("Count");
+
+    element = element->FirstChildElement();
+
+    while (element != nullptr) {
+        int patch = element->IntAttribute("Patches", -1);
+
+        SoundFontSound sound = {};
+
+        const char* sampleStr = element->Attribute("SampleRef");
+        // Insert an empty sound effect. The game assumes the empty slots are
+        // filled so we can't just skip them
+        if (sampleStr == nullptr)
+            goto skip;
+
+        sound.tuning = element->FloatAttribute("Tuning");
+        if (sampleStr[0] != 0) {
+            auto res = static_pointer_cast<SOH::AudioSample>(
+                Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(sampleStr));
+            if (res->tuning != -1.0f) {
+                sound.tuning = res->tuning;
+            }
+            sound.sample = static_cast<Sample*>(res ? res->GetRawPointer() : nullptr);
+        }
+    skip:
+        element = element->NextSiblingElement();
+        if (patch != -1) {
+            soundFont->soundEffects[patch] = sound;
+        } else {
+            soundFont->soundEffects.push_back(sound);
+        }
+    }
+    soundFont->soundFont.soundEffects = soundFont->soundEffects.data();
+    soundFont->soundFont.numSfx = soundFont->soundEffects.size();
+}
+
+std::vector<AdsrEnvelope> SOH::ResourceFactoryXMLSoundFontV0::ParseEnvelopes(AudioSoundFont* soundFont,
+                                                                             tinyxml2::XMLElement* element,
+                                                                             unsigned int* count) {
+    std::vector<AdsrEnvelope> envelopes;
+    unsigned int total = 0;
+    element = element->FirstChildElement("Envelope");
+    while (element != nullptr) {
+        AdsrEnvelope env = {
+            .delay = (s16)element->IntAttribute("Delay"),
+            .arg = (s16)element->IntAttribute("Arg"),
+        };
+        env.delay = BSWAP16(env.delay);
+        env.arg = BSWAP16(env.arg);
+        envelopes.emplace_back(env);
+        element = element->NextSiblingElement("Envelope");
+        total++;
+    }
+    *count = total;
+    return envelopes;
+}
+
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLSoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                            std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
+        return nullptr;
+    }
+
+    auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
+    const char* patch = child->Attribute("Patches");
+    std::shared_ptr<Ship::IResource> sf;
+    std::shared_ptr<AudioSoundFont> audioSoundFont;
+    // If we are patching an existing SF, load the original, otherwise create and clear a new one.
+    if (patch != nullptr) {
+        std::string origName = "audio/fonts/";
+        origName += patch;
+        audioSoundFont = dynamic_pointer_cast<AudioSoundFont>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(origName));
+    } else {
+        audioSoundFont = std::make_shared<AudioSoundFont>(initData);
+        memset(&audioSoundFont->soundFont, 0, sizeof(audioSoundFont->soundFont));
+    }
+    // Header data
+    audioSoundFont->soundFont.fntIndex = child->IntAttribute("Num", 0);
+
+    const char* mediumStr = child->Attribute("Medium");
+    audioSoundFont->medium = MediumStrToInt(mediumStr, initData->Path.c_str());
+
+    const char* cachePolicyStr = child->Attribute("CachePolicy");
+    audioSoundFont->cachePolicy = CachePolicyToInt(cachePolicyStr, initData->Path.c_str());
+
+    audioSoundFont->data1 = child->IntAttribute("Data1");
+    audioSoundFont->data2 = child->IntAttribute("Data2");
+    audioSoundFont->data3 = child->IntAttribute("Data3");
+
+    audioSoundFont->soundFont.sampleBankId1 = audioSoundFont->data1 >> 8;
+    audioSoundFont->soundFont.sampleBankId2 = audioSoundFont->data1 & 0xFF;
+
+    child = (tinyxml2::XMLElement*)child->FirstChildElement();
+
+    while (child != nullptr) {
+        const char* name = child->Name();
+
+        if (!strcmp(name, "Drums")) {
+            ParseDrums(audioSoundFont.get(), child);
+        } else if (!strcmp(name, "Instruments")) {
+            ParseInstruments(audioSoundFont.get(), child);
+        } else if (!strcmp(name, "SfxTable")) {
+            ParseSfxTable(audioSoundFont.get(), child);
+        }
+        child = child->NextSiblingElement();
+    }
+    return audioSoundFont;
+}
+
 } // namespace SOH
diff --git a/soh/soh/resource/importer/AudioSoundFontFactory.h b/soh/soh/resource/importer/AudioSoundFontFactory.h
index a80b8fe972..0a56769cd1 100644
--- a/soh/soh/resource/importer/AudioSoundFontFactory.h
+++ b/soh/soh/resource/importer/AudioSoundFontFactory.h
@@ -2,10 +2,29 @@
 
 #include "Resource.h"
 #include "ResourceFactoryBinary.h"
+#include "ResourceFactoryXML.h"
+#include "soh/resource/type/AudioSoundFont.h"
 
 namespace SOH {
-class ResourceFactoryBinaryAudioSoundFontV2 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryAudioSoundFontV2 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
+
+class ResourceFactoryXMLSoundFontV0 final : public Ship::ResourceFactoryXML {
+  public:
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
+    static int8_t MediumStrToInt(const char* str, const char* file);
+    static int8_t CachePolicyToInt(const char* str, const char* file);
+
+  private:
+    void ParseDrums(AudioSoundFont* soundFont, tinyxml2::XMLElement* element);
+    void ParseInstruments(AudioSoundFont* soundFont, tinyxml2::XMLElement* element);
+    void ParseSfxTable(AudioSoundFont* soundFont, tinyxml2::XMLElement* element);
+    std::vector<AdsrEnvelope> ParseEnvelopes(AudioSoundFont* soundFont, tinyxml2::XMLElement* element,
+                                             unsigned int* count);
+};
+
 } // namespace SOH
diff --git a/soh/soh/resource/importer/BackgroundFactory.cpp b/soh/soh/resource/importer/BackgroundFactory.cpp
index 6be4846982..763690a3f9 100644
--- a/soh/soh/resource/importer/BackgroundFactory.cpp
+++ b/soh/soh/resource/importer/BackgroundFactory.cpp
@@ -3,12 +3,14 @@
 #include "spdlog/spdlog.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryBackgroundV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryBackgroundV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto background = std::make_shared<Background>(file->InitData);
+    auto background = std::make_shared<Background>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     uint32_t dataSize = reader->ReadUInt32();
diff --git a/soh/soh/resource/importer/BackgroundFactory.h b/soh/soh/resource/importer/BackgroundFactory.h
index e74e897e9d..e9a47a9529 100644
--- a/soh/soh/resource/importer/BackgroundFactory.h
+++ b/soh/soh/resource/importer/BackgroundFactory.h
@@ -4,8 +4,9 @@
 #include "resource/ResourceFactoryBinary.h"
 
 namespace SOH {
-class ResourceFactoryBinaryBackgroundV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryBackgroundV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.cpp b/soh/soh/resource/importer/CollisionHeaderFactory.cpp
index 4636d80c76..39bf885a03 100644
--- a/soh/soh/resource/importer/CollisionHeaderFactory.cpp
+++ b/soh/soh/resource/importer/CollisionHeaderFactory.cpp
@@ -1,14 +1,17 @@
 #include "soh/resource/importer/CollisionHeaderFactory.h"
 #include "soh/resource/type/CollisionHeader.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryCollisionHeaderV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                     std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto collisionHeader = std::make_shared<CollisionHeader>(file->InitData);
+    auto collisionHeader = std::make_shared<CollisionHeader>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     collisionHeader->collisionHeaderData.minBounds.x = reader->ReadInt16();
@@ -36,7 +39,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadRes
         CollisionPoly polygon;
 
         polygon.type = reader->ReadUInt16();
-        
+
         polygon.flags_vIA = reader->ReadUInt16();
         polygon.flags_vIB = reader->ReadUInt16();
         polygon.vIC = reader->ReadUInt16();
@@ -48,7 +51,6 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadRes
         polygon.dist = reader->ReadUInt16();
 
         collisionHeader->polygons.push_back(polygon);
-        
     }
     collisionHeader->collisionHeaderData.polyList = collisionHeader->polygons.data();
 
@@ -72,7 +74,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadRes
         camDataEntry.cameraSType = reader->ReadUInt16();
         camDataEntry.numCameras = reader->ReadInt16();
         collisionHeader->camData.push_back(camDataEntry);
-        
+
         int32_t camPosDataIdx = reader->ReadInt32();
         collisionHeader->camPosDataIndices.push_back(camPosDataIdx);
     }
@@ -91,7 +93,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadRes
     zero.x = 0;
     zero.y = 0;
     zero.z = 0;
-    collisionHeader->camPosDataZero = zero; 
+    collisionHeader->camPosDataZero = zero;
 
     for (size_t i = 0; i < collisionHeader->camDataCount; i++) {
         int32_t idx = collisionHeader->camPosDataIndices[i];
@@ -123,12 +125,14 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCollisionHeaderV0::ReadRes
     return collisionHeader;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLCollisionHeaderV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLCollisionHeaderV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto collisionHeader = std::make_shared<CollisionHeader>(file->InitData);
+    auto collisionHeader = std::make_shared<CollisionHeader>(initData);
 
     auto reader = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
     auto child = reader->FirstChildElement();
@@ -159,7 +163,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLCollisionHeaderV0::ReadResour
             CollisionPoly polygon;
 
             polygon.type = child->UnsignedAttribute("Type");
-        
+
             polygon.flags_vIA = child->UnsignedAttribute("VertexA");
             polygon.flags_vIB = child->UnsignedAttribute("VertexB");
             polygon.vIC = child->UnsignedAttribute("VertexC");
@@ -183,11 +187,11 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLCollisionHeaderV0::ReadResour
             camDataEntry.cameraSType = child->UnsignedAttribute("SType");
             camDataEntry.numCameras = child->IntAttribute("NumData");
             collisionHeader->camData.push_back(camDataEntry);
-        
+
             int32_t camPosDataIdx = child->IntAttribute("CameraPosDataSeg");
             collisionHeader->camPosDataIndices.push_back(camPosDataIdx);
         } else if (childName == "CameraPositionData") {
-            //each camera position data is made up of 3 Vec3s
+            // each camera position data is made up of 3 Vec3s
             Vec3s pos;
             pos.x = child->IntAttribute("PosX");
             pos.y = child->IntAttribute("PosY");
@@ -227,7 +231,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLCollisionHeaderV0::ReadResour
             collisionHeader->camData[i].camPosData = &collisionHeader->camPosDataZero;
         }
     }
-    
+
     collisionHeader->collisionHeaderData.numVertices = collisionHeader->vertices.size();
     collisionHeader->collisionHeaderData.numPolygons = collisionHeader->polygons.size();
     collisionHeader->surfaceTypesCount = collisionHeader->surfaceTypes.size();
diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.h b/soh/soh/resource/importer/CollisionHeaderFactory.h
index dd438f9c35..4db21d3513 100644
--- a/soh/soh/resource/importer/CollisionHeaderFactory.h
+++ b/soh/soh/resource/importer/CollisionHeaderFactory.h
@@ -5,13 +5,15 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinaryCollisionHeaderV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryCollisionHeaderV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
-class ResourceFactoryXMLCollisionHeaderV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLCollisionHeaderV0 final : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/CutsceneFactory.cpp b/soh/soh/resource/importer/CutsceneFactory.cpp
index 49e44680ce..c8d3b0e19f 100644
--- a/soh/soh/resource/importer/CutsceneFactory.cpp
+++ b/soh/soh/resource/importer/CutsceneFactory.cpp
@@ -58,12 +58,14 @@ static inline uint32_t read_CMD_HH(std::shared_ptr<Ship::BinaryReader> reader) {
 }
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryCutsceneV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryCutsceneV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                              std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto cutscene = std::make_shared<Cutscene>(file->InitData);
+    auto cutscene = std::make_shared<Cutscene>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     uint32_t numEntries = reader->ReadUInt32();
diff --git a/soh/soh/resource/importer/CutsceneFactory.h b/soh/soh/resource/importer/CutsceneFactory.h
index 8afe98bb8a..95a6f379ea 100644
--- a/soh/soh/resource/importer/CutsceneFactory.h
+++ b/soh/soh/resource/importer/CutsceneFactory.h
@@ -4,8 +4,9 @@
 #include "ResourceFactoryBinary.h"
 
 namespace SOH {
-class ResourceFactoryBinaryCutsceneV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryCutsceneV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/PathFactory.cpp b/soh/soh/resource/importer/PathFactory.cpp
index f0f92be022..945e36c5fe 100644
--- a/soh/soh/resource/importer/PathFactory.cpp
+++ b/soh/soh/resource/importer/PathFactory.cpp
@@ -2,14 +2,17 @@
 #include "soh/resource/type/Path.h"
 #include "soh/resource/logging/PathLogger.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryPathV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryPathV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                          std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto path = std::make_shared<Path>(file->InitData);
+    auto path = std::make_shared<Path>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     path->numPaths = reader->ReadUInt32();
@@ -29,7 +32,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryPathV0::ReadResource(std::
 
         PathData pathDataEntry;
         pathDataEntry.count = pointCount;
-        
+
         path->paths.push_back(points);
         pathDataEntry.points = path->paths.back().data();
 
@@ -43,25 +46,27 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryPathV0::ReadResource(std::
     return path;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLPathV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLPathV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                       std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto path = std::make_shared<Path>(file->InitData);
+    auto path = std::make_shared<Path>(initData);
     auto reader = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader);
 
     auto pathElement = reader->RootElement();
 
-    //path->numPaths = pathElement->IntAttribute("NumPaths");
-    //path->paths.reserve(path->numPaths);
+    // path->numPaths = pathElement->IntAttribute("NumPaths");
+    // path->paths.reserve(path->numPaths);
 
     auto pathDataElement = pathElement->FirstChildElement();
 
     while (pathDataElement != nullptr) {
         std::vector<Vec3s> points;
-        //uint32_t pointCount = pathDataElement->IntAttribute("NumPoints");
-        //points.reserve(pointCount);
+        // uint32_t pointCount = pathDataElement->IntAttribute("NumPoints");
+        // points.reserve(pointCount);
 
         auto pointElement = pathDataElement->FirstChildElement();
 
@@ -77,7 +82,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLPathV0::ReadResource(std::sha
         }
 
         PathData pathDataEntry;
-        //pathDataEntry.count = pointCount;
+        // pathDataEntry.count = pointCount;
         pathDataEntry.count = points.size();
 
         path->paths.push_back(points);
diff --git a/soh/soh/resource/importer/PathFactory.h b/soh/soh/resource/importer/PathFactory.h
index 9dd73b1102..f94a201c59 100644
--- a/soh/soh/resource/importer/PathFactory.h
+++ b/soh/soh/resource/importer/PathFactory.h
@@ -5,13 +5,15 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinaryPathV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryPathV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
-class ResourceFactoryXMLPathV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLPathV0 final : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/PlayerAnimationFactory.cpp b/soh/soh/resource/importer/PlayerAnimationFactory.cpp
index 59610da46f..5543cf4187 100644
--- a/soh/soh/resource/importer/PlayerAnimationFactory.cpp
+++ b/soh/soh/resource/importer/PlayerAnimationFactory.cpp
@@ -3,12 +3,14 @@
 #include "spdlog/spdlog.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryPlayerAnimationV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryPlayerAnimationV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                     std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto playerAnimation = std::make_shared<PlayerAnimation>(file->InitData);
+    auto playerAnimation = std::make_shared<PlayerAnimation>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     uint32_t numEntries = reader->ReadUInt32();
diff --git a/soh/soh/resource/importer/PlayerAnimationFactory.h b/soh/soh/resource/importer/PlayerAnimationFactory.h
index 3ee8b1d3a2..7761c63b66 100644
--- a/soh/soh/resource/importer/PlayerAnimationFactory.h
+++ b/soh/soh/resource/importer/PlayerAnimationFactory.h
@@ -4,8 +4,9 @@
 #include "ResourceFactoryBinary.h"
 
 namespace SOH {
-class ResourceFactoryBinaryPlayerAnimationV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryPlayerAnimationV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/SceneFactory.cpp b/soh/soh/resource/importer/SceneFactory.cpp
index 1bcf92e1c9..730842b7e3 100644
--- a/soh/soh/resource/importer/SceneFactory.cpp
+++ b/soh/soh/resource/importer/SceneFactory.cpp
@@ -1,4 +1,5 @@
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include "soh/resource/type/SohResourceType.h"
 #include "soh/resource/importer/SceneFactory.h"
 #include "soh/resource/type/Scene.h"
@@ -58,7 +59,8 @@ ResourceFactoryBinarySceneV0::ResourceFactoryBinarySceneV0() {
     sceneCommandFactories[SceneCommandID::SetMesh] = std::make_shared<SetMeshFactory>();
 }
 
-void ResourceFactoryBinarySceneV0::ParseSceneCommands(std::shared_ptr<Scene> scene, std::shared_ptr<Ship::BinaryReader> reader) {
+void ResourceFactoryBinarySceneV0::ParseSceneCommands(std::shared_ptr<Scene> scene,
+                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     uint32_t commandCount = reader->ReadUInt32();
     scene->commands.reserve(commandCount);
 
@@ -67,8 +69,9 @@ void ResourceFactoryBinarySceneV0::ParseSceneCommands(std::shared_ptr<Scene> sce
     }
 }
 
-std::shared_ptr<ISceneCommand> ResourceFactoryBinarySceneV0::ParseSceneCommand(std::shared_ptr<Scene> scene,
-                                                                std::shared_ptr<Ship::BinaryReader> reader, uint32_t index) {
+std::shared_ptr<ISceneCommand>
+ResourceFactoryBinarySceneV0::ParseSceneCommand(std::shared_ptr<Scene> scene,
+                                                std::shared_ptr<Ship::BinaryReader> reader, uint32_t index) {
     SceneCommandID cmdID = (SceneCommandID)reader->ReadInt32();
 
     reader->Seek(-sizeof(int32_t), Ship::SeekOffsetType::Current);
@@ -87,18 +90,21 @@ std::shared_ptr<ISceneCommand> ResourceFactoryBinarySceneV0::ParseSceneCommand(s
     }
 
     if (result == nullptr) {
-        SPDLOG_ERROR("Failed to load scene command of type {} in scene {}", (uint32_t)cmdID, scene->GetInitData()->Path);
+        SPDLOG_ERROR("Failed to load scene command of type {} in scene {}", (uint32_t)cmdID,
+                     scene->GetInitData()->Path);
     }
 
     return result;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySceneV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinarySceneV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto scene = std::make_shared<Scene>(file->InitData);
+    auto scene = std::make_shared<Scene>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     ParseSceneCommands(scene, reader);
@@ -125,7 +131,8 @@ ResourceFactoryXMLSceneV0::ResourceFactoryXMLSceneV0() {
     sceneCommandFactories[SceneCommandID::SetObjectList] = std::make_shared<SetObjectListFactoryXML>();
     sceneCommandFactories[SceneCommandID::SetStartPositionList] = std::make_shared<SetStartPositionListFactoryXML>();
     sceneCommandFactories[SceneCommandID::SetActorList] = std::make_shared<SetActorListFactoryXML>();
-    sceneCommandFactories[SceneCommandID::SetTransitionActorList] = std::make_shared<SetTransitionActorListFactoryXML>();
+    sceneCommandFactories[SceneCommandID::SetTransitionActorList] =
+        std::make_shared<SetTransitionActorListFactoryXML>();
     sceneCommandFactories[SceneCommandID::EndMarker] = std::make_shared<EndMarkerFactoryXML>();
     sceneCommandFactories[SceneCommandID::SetAlternateHeaders] = std::make_shared<SetAlternateHeadersFactoryXML>();
     sceneCommandFactories[SceneCommandID::SetPathways] = std::make_shared<SetPathwaysFactoryXML>();
@@ -173,7 +180,8 @@ SceneCommandID GetCommandID(std::string commandName) {
     return SceneCommandID::Error;
 }
 
-void ResourceFactoryXMLSceneV0::ParseSceneCommands(std::shared_ptr<Scene> scene, std::shared_ptr<tinyxml2::XMLDocument> reader) {
+void ResourceFactoryXMLSceneV0::ParseSceneCommands(std::shared_ptr<Scene> scene,
+                                                   std::shared_ptr<tinyxml2::XMLDocument> reader) {
     auto child = reader->RootElement()->FirstChildElement();
 
     int i = 0;
@@ -187,7 +195,8 @@ void ResourceFactoryXMLSceneV0::ParseSceneCommands(std::shared_ptr<Scene> scene,
 }
 
 std::shared_ptr<ISceneCommand> ResourceFactoryXMLSceneV0::ParseSceneCommand(std::shared_ptr<Scene> scene,
-                                                                tinyxml2::XMLElement* child, uint32_t index) {
+                                                                            tinyxml2::XMLElement* child,
+                                                                            uint32_t index) {
     std::string commandName = child->Name();
     SceneCommandID cmdID = GetCommandID(commandName);
 
@@ -210,18 +219,21 @@ std::shared_ptr<ISceneCommand> ResourceFactoryXMLSceneV0::ParseSceneCommand(std:
     }
 
     if (result == nullptr) {
-        SPDLOG_ERROR("Failed to load scene command of type {} in scene {}", (uint32_t)cmdID, scene->GetInitData()->Path);
+        SPDLOG_ERROR("Failed to load scene command of type {} in scene {}", (uint32_t)cmdID,
+                     scene->GetInitData()->Path);
     }
 
     return result;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLSceneV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLSceneV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                        std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto scene = std::make_shared<Scene>(file->InitData);
+    auto scene = std::make_shared<Scene>(initData);
     auto reader = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader);
 
     ParseSceneCommands(scene, reader);
diff --git a/soh/soh/resource/importer/SceneFactory.h b/soh/soh/resource/importer/SceneFactory.h
index 115c3f3f5a..a22291d51b 100644
--- a/soh/soh/resource/importer/SceneFactory.h
+++ b/soh/soh/resource/importer/SceneFactory.h
@@ -8,27 +8,32 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinarySceneV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinarySceneV0 final : public Ship::ResourceFactoryBinary {
   public:
     ResourceFactoryBinarySceneV0();
 
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
     void ParseSceneCommands(std::shared_ptr<Scene> scene, std::shared_ptr<Ship::BinaryReader> reader);
 
     // Doing something very similar to what we do on the ResourceLoader.
     // Eventually, scene commands should be moved up to the ResourceLoader as well.
     // They can not right now because the exporter does not give them a proper resource type enum value,
     // and the exporter does not export the commands with a proper OTR header.
-    static inline std::unordered_map<SceneCommandID, std::shared_ptr<SceneCommandFactoryBinaryV0>> sceneCommandFactories;
-protected:
-    std::shared_ptr<ISceneCommand> ParseSceneCommand(std::shared_ptr<Scene> scene, std::shared_ptr<Ship::BinaryReader> reader, uint32_t index);
+    static inline std::unordered_map<SceneCommandID, std::shared_ptr<SceneCommandFactoryBinaryV0>>
+        sceneCommandFactories;
+
+  protected:
+    std::shared_ptr<ISceneCommand> ParseSceneCommand(std::shared_ptr<Scene> scene,
+                                                     std::shared_ptr<Ship::BinaryReader> reader, uint32_t index);
 };
 
-class ResourceFactoryXMLSceneV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLSceneV0 final : public Ship::ResourceFactoryXML {
   public:
     ResourceFactoryXMLSceneV0();
 
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
     void ParseSceneCommands(std::shared_ptr<Scene> scene, std::shared_ptr<tinyxml2::XMLDocument> reader);
 
     // Doing something very similar to what we do on the ResourceLoader.
@@ -36,7 +41,9 @@ class ResourceFactoryXMLSceneV0 : public Ship::ResourceFactoryXML {
     // They can not right now because the exporter does not give them a proper resource type enum value,
     // and the exporter does not export the commands with a proper OTR header.
     static inline std::unordered_map<SceneCommandID, std::shared_ptr<SceneCommandFactoryXMLV0>> sceneCommandFactories;
-protected:
-    std::shared_ptr<ISceneCommand> ParseSceneCommand(std::shared_ptr<Scene> scene, tinyxml2::XMLElement* child, uint32_t index);
+
+  protected:
+    std::shared_ptr<ISceneCommand> ParseSceneCommand(std::shared_ptr<Scene> scene, tinyxml2::XMLElement* child,
+                                                     uint32_t index);
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/SkeletonFactory.cpp b/soh/soh/resource/importer/SkeletonFactory.cpp
index d4cb965bf3..f814765237 100644
--- a/soh/soh/resource/importer/SkeletonFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonFactory.cpp
@@ -1,15 +1,18 @@
 #include "soh/resource/importer/SkeletonFactory.h"
 #include "soh/resource/type/Skeleton.h"
 #include <spdlog/spdlog.h>
+#include <tinyxml2.h>
 #include <libultraship/libultraship.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                              std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto skeleton = std::make_shared<Skeleton>(file->InitData);
+    auto skeleton = std::make_shared<Skeleton>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     skeleton->type = (SkeletonType)reader->ReadInt8();
@@ -20,25 +23,25 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(s
     skeleton->limbTableCount = reader->ReadUInt32();
 
     skeleton->limbTable.reserve(skeleton->limbTableCount);
-    for (uint32_t i = 0; i < skeleton->limbTableCount; i++) {
+    for (int32_t i = 0; i < skeleton->limbTableCount; i++) {
         std::string limbPath = reader->ReadString();
 
         skeleton->limbTable.push_back(limbPath);
     }
 
     if (skeleton->type == SkeletonType::Curve) {
-	skeleton->skeletonData.skelCurveLimbList.limbCount = skeleton->limbCount;
-	skeleton->curveLimbArray.reserve(skeleton->skeletonData.skelCurveLimbList.limbCount);
+        skeleton->skeletonData.skelCurveLimbList.limbCount = skeleton->limbCount;
+        skeleton->curveLimbArray.reserve(skeleton->skeletonData.skelCurveLimbList.limbCount);
     } else if (skeleton->type == SkeletonType::Flex) {
-	skeleton->skeletonData.flexSkeletonHeader.dListCount = skeleton->dListCount;
+        skeleton->skeletonData.flexSkeletonHeader.dListCount = skeleton->dListCount;
     }
 
     if (skeleton->type == SkeletonType::Normal) {
         skeleton->skeletonData.skeletonHeader.limbCount = skeleton->limbCount;
-	skeleton->standardLimbArray.reserve(skeleton->skeletonData.skeletonHeader.limbCount);
+        skeleton->standardLimbArray.reserve(skeleton->skeletonData.skeletonHeader.limbCount);
     } else if (skeleton->type == SkeletonType::Flex) {
         skeleton->skeletonData.flexSkeletonHeader.sh.limbCount = skeleton->limbCount;
-	skeleton->standardLimbArray.reserve(skeleton->skeletonData.flexSkeletonHeader.sh.limbCount);
+        skeleton->standardLimbArray.reserve(skeleton->skeletonData.flexSkeletonHeader.sh.limbCount);
     }
 
     for (size_t i = 0; i < skeleton->limbTable.size(); i++) {
@@ -62,12 +65,14 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(s
     return skeleton;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLSkeletonV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLSkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto skel = std::make_shared<Skeleton>(file->InitData);
+    auto skel = std::make_shared<Skeleton>(initData);
     auto reader = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
     auto child = reader->FirstChildElement();
 
@@ -101,7 +106,6 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLSkeletonV0::ReadResource(std:
         }
     }
 
-
     skel->limbCount = reader->IntAttribute("LimbCount");
     skel->dListCount = reader->IntAttribute("DisplayListCount");
 
@@ -118,7 +122,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLSkeletonV0::ReadResource(std:
 
         child = child->NextSiblingElement();
     }
-    
+
     skel->skeletonData.flexSkeletonHeader.sh.limbCount = skel->limbCount;
     skel->skeletonData.flexSkeletonHeader.sh.segment = (void**)skel->skeletonHeaderSegments.data();
     skel->skeletonData.flexSkeletonHeader.dListCount = skel->dListCount;
diff --git a/soh/soh/resource/importer/SkeletonFactory.h b/soh/soh/resource/importer/SkeletonFactory.h
index 24f92720af..b7c90443fc 100644
--- a/soh/soh/resource/importer/SkeletonFactory.h
+++ b/soh/soh/resource/importer/SkeletonFactory.h
@@ -5,13 +5,15 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinarySkeletonV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinarySkeletonV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
-class ResourceFactoryXMLSkeletonV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLSkeletonV0 final : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;  
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.cpp b/soh/soh/resource/importer/SkeletonLimbFactory.cpp
index 3f780e6d4b..731892f2ac 100644
--- a/soh/soh/resource/importer/SkeletonLimbFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonLimbFactory.cpp
@@ -1,15 +1,18 @@
 #include "soh/resource/importer/SkeletonLimbFactory.h"
 #include "soh/resource/type/SkeletonLimb.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include "libultraship/libultraship.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonLimbV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinarySkeletonLimbV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto skeletonLimb = std::make_shared<SkeletonLimb>(file->InitData);
+    auto skeletonLimb = std::make_shared<SkeletonLimb>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     skeletonLimb->limbType = (LimbType)reader->ReadInt8();
@@ -17,12 +20,12 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonLimbV0::ReadResour
     skeletonLimb->skinDList = reader->ReadString();
 
     skeletonLimb->skinVtxCnt = reader->ReadUInt16();
-    
+
     skeletonLimb->skinLimbModifCount = reader->ReadUInt32();
     skeletonLimb->skinLimbModifArray.reserve(skeletonLimb->skinLimbModifCount);
     skeletonLimb->skinLimbModifVertexArrays.reserve(skeletonLimb->skinLimbModifCount);
     skeletonLimb->skinLimbModifTransformationArrays.reserve(skeletonLimb->skinLimbModifCount);
-    for (size_t i = 0; i <  skeletonLimb->skinLimbModifCount; i++) {
+    for (size_t i = 0; i < skeletonLimb->skinLimbModifCount; i++) {
         SkinLimbModif skinLimbModif;
         skinLimbModif.unk_4 = reader->ReadUInt16();
         skeletonLimb->skinLimbModifArray.push_back(skinLimbModif);
@@ -168,28 +171,34 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonLimbV0::ReadResour
             }
 
             for (size_t i = 0; i < skeletonLimb->skinLimbModifArray.size(); i++) {
-                skeletonLimb->skinAnimLimbData.limbModifications[i].vtxCount = skeletonLimb->skinLimbModifVertexArrays[i].size();
-                skeletonLimb->skinAnimLimbData.limbModifications[i].skinVertices = skeletonLimb->skinLimbModifVertexArrays[i].data();
-                
-                skeletonLimb->skinAnimLimbData.limbModifications[i].transformCount = skeletonLimb->skinLimbModifTransformationArrays[i].size();
-                skeletonLimb->skinAnimLimbData.limbModifications[i].limbTransformations = skeletonLimb->skinLimbModifTransformationArrays[i].data();
+                skeletonLimb->skinAnimLimbData.limbModifications[i].vtxCount =
+                    skeletonLimb->skinLimbModifVertexArrays[i].size();
+                skeletonLimb->skinAnimLimbData.limbModifications[i].skinVertices =
+                    skeletonLimb->skinLimbModifVertexArrays[i].data();
+
+                skeletonLimb->skinAnimLimbData.limbModifications[i].transformCount =
+                    skeletonLimb->skinLimbModifTransformationArrays[i].size();
+                skeletonLimb->skinAnimLimbData.limbModifications[i].limbTransformations =
+                    skeletonLimb->skinLimbModifTransformationArrays[i].data();
 
                 skeletonLimb->skinAnimLimbData.limbModifications[i].unk_4 = skeletonLimb->skinLimbModifArray[i].unk_4;
             }
 
-           skeletonLimb->limbData.skinLimb.segment = &skeletonLimb->skinAnimLimbData;
+            skeletonLimb->limbData.skinLimb.segment = &skeletonLimb->skinAnimLimbData;
         }
     }
 
     return skeletonLimb;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLSkeletonLimbV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLSkeletonLimbV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                               std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto skelLimb = std::make_shared<SkeletonLimb>(file->InitData);
+    auto skelLimb = std::make_shared<SkeletonLimb>(initData);
     auto reader = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
 
     std::string limbType = reader->Attribute("Type");
diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.h b/soh/soh/resource/importer/SkeletonLimbFactory.h
index 222cefa2ce..bcf1fd4d5a 100644
--- a/soh/soh/resource/importer/SkeletonLimbFactory.h
+++ b/soh/soh/resource/importer/SkeletonLimbFactory.h
@@ -5,13 +5,15 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinarySkeletonLimbV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinarySkeletonLimbV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
-class ResourceFactoryXMLSkeletonLimbV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLSkeletonLimbV0 final : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;  
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/TextFactory.cpp b/soh/soh/resource/importer/TextFactory.cpp
index 1da1d50db1..0a2c1afb40 100644
--- a/soh/soh/resource/importer/TextFactory.cpp
+++ b/soh/soh/resource/importer/TextFactory.cpp
@@ -1,14 +1,17 @@
 #include "soh/resource/importer/TextFactory.h"
 #include "soh/resource/type/Text.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryTextV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryBinaryTextV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                          std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto text = std::make_shared<Text>(file->InitData);
+    auto text = std::make_shared<Text>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     uint32_t msgCount = reader->ReadUInt32();
@@ -27,13 +30,16 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryTextV0::ReadResource(std::
     return text;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLTextV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource>
+ResourceFactoryXMLTextV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                       std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
-    auto txt = std::make_shared<Text>(file->InitData);
-    auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement()->FirstChildElement();
+    auto txt = std::make_shared<Text>(initData);
+    auto child =
+        std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement()->FirstChildElement();
 
     while (child != nullptr) {
         std::string childName = child->Name();
diff --git a/soh/soh/resource/importer/TextFactory.h b/soh/soh/resource/importer/TextFactory.h
index 55a5693662..b67f07cbbc 100644
--- a/soh/soh/resource/importer/TextFactory.h
+++ b/soh/soh/resource/importer/TextFactory.h
@@ -5,13 +5,15 @@
 #include "ResourceFactoryXML.h"
 
 namespace SOH {
-class ResourceFactoryBinaryTextV0 : public Ship::ResourceFactoryBinary {
+class ResourceFactoryBinaryTextV0 final : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
-class ResourceFactoryXMLTextV0 : public Ship::ResourceFactoryXML {
+class ResourceFactoryXMLTextV0 final : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;  
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
index 6932117f1a..f96d541f52 100644
--- a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
@@ -2,10 +2,11 @@
 #include "soh/resource/type/scenecommand/EndMarker.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-EndMarkerFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> EndMarkerFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                std::shared_ptr<Ship::BinaryReader> reader) {
     auto endMarker = std::make_shared<EndMarker>(initData);
 
     ReadCommandId(endMarker, reader);
diff --git a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.h b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.h
index 62dfcd7c4f..3ffc956a61 100644
--- a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.h
+++ b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.h
@@ -3,14 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class EndMarkerFactory : public SceneCommandFactoryBinaryV0 {
+class EndMarkerFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class EndMarkerFactoryXML : public SceneCommandFactoryXMLV0 {
+class EndMarkerFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
index 8d7de50218..97ebdfc052 100644
--- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
@@ -3,7 +3,8 @@
 #include "spdlog/spdlog.h"
 
 namespace SOH {
-void SceneCommandFactoryBinaryV0::ReadCommandId(std::shared_ptr<ISceneCommand> command, std::shared_ptr<Ship::BinaryReader> reader) {
+void SceneCommandFactoryBinaryV0::ReadCommandId(std::shared_ptr<ISceneCommand> command,
+                                                std::shared_ptr<Ship::BinaryReader> reader) {
     command->cmdId = (SceneCommandID)reader->ReadInt32();
 }
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
index 601996ea46..b1cd67ae6e 100644
--- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
@@ -8,18 +8,20 @@
 
 namespace SOH {
 class SceneCommandFactoryBinaryV0 {
-    public:
-        virtual std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) = 0;
+  public:
+    virtual std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                          std::shared_ptr<Ship::BinaryReader> reader) = 0;
 
-    protected:
-        void ReadCommandId(std::shared_ptr<ISceneCommand> command, std::shared_ptr<Ship::BinaryReader> reader);
+  protected:
+    void ReadCommandId(std::shared_ptr<ISceneCommand> command, std::shared_ptr<Ship::BinaryReader> reader);
 };
 
 class SceneCommandFactoryXMLV0 {
-    public:
-        virtual std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) = 0;
+  public:
+    virtual std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                          tinyxml2::XMLElement* reader) = 0;
 
-    protected:
-        void ReadCommandId(std::shared_ptr<ISceneCommand> command, tinyxml2::XMLElement* reader);
+  protected:
+    void ReadCommandId(std::shared_ptr<ISceneCommand> command, tinyxml2::XMLElement* reader);
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
index 6c262e7afc..5b9f851d1a 100644
--- a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetActorList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                   std::shared_ptr<Ship::BinaryReader> reader) {
     auto setActorList = std::make_shared<SetActorList>(initData);
 
     ReadCommandId(setActorList, reader);
-	
+
     setActorList->numActors = reader->ReadUInt32();
     setActorList->actorList.reserve(setActorList->numActors);
     for (uint32_t i = 0; i < setActorList->numActors; i++) {
@@ -35,7 +36,7 @@ SetActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDa
 }
 
 std::shared_ptr<Ship::IResource> SetActorListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                      tinyxml2::XMLElement* reader) {
     auto setActorList = std::make_shared<SetActorList>(initData);
 
     setActorList->cmdId = SceneCommandID::SetActorList;
diff --git a/soh/soh/resource/importer/scenecommand/SetActorListFactory.h b/soh/soh/resource/importer/scenecommand/SetActorListFactory.h
index 703181c9a0..febc5d2b80 100644
--- a/soh/soh/resource/importer/scenecommand/SetActorListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetActorListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetActorListFactory : public SceneCommandFactoryBinaryV0 {
+class SetActorListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetActorListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetActorListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
index f5ac8914e2..5a6d35cc22 100644
--- a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
@@ -2,21 +2,24 @@
 #include "soh/resource/type/scenecommand/SetAlternateHeaders.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include "libultraship/libultraship.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetAlternateHeadersFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetAlternateHeadersFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                         std::shared_ptr<Ship::BinaryReader> reader) {
     auto setAlternateHeaders = std::make_shared<SetAlternateHeaders>(initData);
 
     ReadCommandId(setAlternateHeaders, reader);
-	
+
     setAlternateHeaders->numHeaders = reader->ReadUInt32();
     setAlternateHeaders->headers.reserve(setAlternateHeaders->numHeaders);
     for (uint32_t i = 0; i < setAlternateHeaders->numHeaders; i++) {
         auto headerName = reader->ReadString();
         if (!headerName.empty()) {
-            setAlternateHeaders->headers.push_back(std::static_pointer_cast<Scene>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
+            setAlternateHeaders->headers.push_back(std::static_pointer_cast<Scene>(
+                Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
             setAlternateHeaders->headerFileNames.push_back(headerName);
         } else {
             setAlternateHeaders->headers.push_back(nullptr);
@@ -30,8 +33,9 @@ std::shared_ptr<Ship::IResource> SetAlternateHeadersFactory::ReadResource(std::s
     return setAlternateHeaders;
 }
 
-std::shared_ptr<Ship::IResource> SetAlternateHeadersFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetAlternateHeadersFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                            tinyxml2::XMLElement* reader) {
     auto setAlternateHeaders = std::make_shared<SetAlternateHeaders>(initData);
 
     setAlternateHeaders->cmdId = SceneCommandID::SetAlternateHeaders;
@@ -42,12 +46,13 @@ std::shared_ptr<Ship::IResource> SetAlternateHeadersFactoryXML::ReadResource(std
         std::string childName = child->Name();
         if (childName == "AlternateHeader") {
             for (uint32_t i = 0; i < setAlternateHeaders->numHeaders; i++) {
-	            auto headerName = std::string(child->Attribute("Path"));
-	            if (!headerName.empty()) {
-	            	setAlternateHeaders->headers.push_back(std::static_pointer_cast<Scene>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
-	            } else {
-	            	setAlternateHeaders->headers.push_back(nullptr);
-	            }
+                auto headerName = std::string(child->Attribute("Path"));
+                if (!headerName.empty()) {
+                    setAlternateHeaders->headers.push_back(std::static_pointer_cast<Scene>(
+                        Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(headerName.c_str())));
+                } else {
+                    setAlternateHeaders->headers.push_back(nullptr);
+                }
             }
         }
 
diff --git a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h
index 7b1324a603..4778436030 100644
--- a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetAlternateHeadersFactory : public SceneCommandFactoryBinaryV0 {
+class SetAlternateHeadersFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetAlternateHeadersFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetAlternateHeadersFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
index 58c6ab4e36..e2f4de65bd 100644
--- a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetCameraSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetCameraSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                 std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetCameraSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                       std::shared_ptr<Ship::BinaryReader> reader) {
     auto setCameraSettings = std::make_shared<SetCameraSettings>(initData);
 
     ReadCommandId(setCameraSettings, reader);
-	
+
     setCameraSettings->settings.cameraMovement = reader->ReadInt8();
     setCameraSettings->settings.worldMapArea = reader->ReadInt32();
 
@@ -20,8 +22,9 @@ std::shared_ptr<Ship::IResource> SetCameraSettingsFactory::ReadResource(std::sha
     return setCameraSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetCameraSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetCameraSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                          tinyxml2::XMLElement* reader) {
     auto setCameraSettings = std::make_shared<SetCameraSettings>(initData);
 
     setCameraSettings->cmdId = SceneCommandID::SetCameraSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h
index a8c21f7766..d25e8b447e 100644
--- a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetCameraSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetCameraSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetCameraSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetCameraSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
index a67778f63b..cc0a7b0057 100644
--- a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
@@ -3,16 +3,19 @@
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "libultraship/libultraship.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetCollisionHeaderFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                  std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetCollisionHeaderFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        std::shared_ptr<Ship::BinaryReader> reader) {
     auto setCollisionHeader = std::make_shared<SetCollisionHeader>(initData);
 
     ReadCommandId(setCollisionHeader, reader);
-    
+
     setCollisionHeader->fileName = reader->ReadString();
-    setCollisionHeader->collisionHeader = std::static_pointer_cast<CollisionHeader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCollisionHeader->fileName.c_str()));
+    setCollisionHeader->collisionHeader = std::static_pointer_cast<CollisionHeader>(
+        Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCollisionHeader->fileName.c_str()));
 
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ResourceLogging"), 0)) {
         LogSetCollisionHeaderAsXML(setCollisionHeader);
@@ -21,14 +24,16 @@ std::shared_ptr<Ship::IResource> SetCollisionHeaderFactory::ReadResource(std::sh
     return setCollisionHeader;
 }
 
-std::shared_ptr<Ship::IResource> SetCollisionHeaderFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetCollisionHeaderFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                           tinyxml2::XMLElement* reader) {
     auto setCollisionHeader = std::make_shared<SetCollisionHeader>(initData);
 
     setCollisionHeader->cmdId = SceneCommandID::SetCollisionHeader;
 
     setCollisionHeader->fileName = reader->Attribute("FileName");
-    setCollisionHeader->collisionHeader = std::static_pointer_cast<CollisionHeader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCollisionHeader->fileName.c_str()));
+    setCollisionHeader->collisionHeader = std::static_pointer_cast<CollisionHeader>(
+        Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCollisionHeader->fileName.c_str()));
 
     return setCollisionHeader;
 }
diff --git a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h
index 35902e7cb4..da76267018 100644
--- a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetCollisionHeaderFactory : public SceneCommandFactoryBinaryV0 {
+class SetCollisionHeaderFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetCollisionHeaderFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetCollisionHeaderFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
index 7ae8237bfb..ed08c88be7 100644
--- a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetCsCamera.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetCsCameraFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetCsCameraFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                  std::shared_ptr<Ship::BinaryReader> reader) {
     auto setCsCamera = std::make_shared<SetCsCamera>(initData);
 
     ReadCommandId(setCsCamera, reader);
-	
+
     reader->ReadInt8();  // camSize
     reader->ReadInt32(); // segOffset
 
@@ -23,7 +24,7 @@ SetCsCameraFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDat
 }
 
 std::shared_ptr<Ship::IResource> SetCsCameraFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                     tinyxml2::XMLElement* reader) {
     auto setCsCamera = std::make_shared<SetCsCamera>(initData);
 
     setCsCamera->cmdId = SceneCommandID::SetCsCamera;
diff --git a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h
index ad232a11da..239713d445 100644
--- a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetCsCameraFactory : public SceneCommandFactoryBinaryV0 {
+class SetCsCameraFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetCsCameraFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetCsCameraFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
index 7ca657403c..a8883b2e4e 100644
--- a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
@@ -3,16 +3,18 @@
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include <libultraship/libultraship.h>
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetCutscenesFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetCutscenesFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                   std::shared_ptr<Ship::BinaryReader> reader) {
     auto setCutscenes = std::make_shared<SetCutscenes>(initData);
 
     ReadCommandId(setCutscenes, reader);
-    
+
     setCutscenes->fileName = reader->ReadString();
-    setCutscenes->cutscene = std::static_pointer_cast<Cutscene>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCutscenes->fileName.c_str()));
+    setCutscenes->cutscene = std::static_pointer_cast<Cutscene>(
+        Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCutscenes->fileName.c_str()));
 
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ResourceLogging"), 0)) {
         LogCutscenesAsXML(setCutscenes);
@@ -22,13 +24,14 @@ SetCutscenesFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDa
 }
 
 std::shared_ptr<Ship::IResource> SetCutscenesFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                      tinyxml2::XMLElement* reader) {
     auto setCutscenes = std::make_shared<SetCutscenes>(initData);
 
     setCutscenes->cmdId = SceneCommandID::SetCutscenes;
 
     setCutscenes->fileName = reader->Attribute("FileName");
-    setCutscenes->cutscene = std::static_pointer_cast<Cutscene>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCutscenes->fileName.c_str()));
+    setCutscenes->cutscene = std::static_pointer_cast<Cutscene>(
+        Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(setCutscenes->fileName.c_str()));
 
     return setCutscenes;
 }
diff --git a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h
index 4bd76b5636..5db5824fc7 100644
--- a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetCutscenesFactory : public SceneCommandFactoryBinaryV0 {
+class SetCutscenesFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetCutscenesFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetCutscenesFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
index 4038ea8254..3352a2ef27 100644
--- a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetEchoSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetEchoSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetEchoSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     auto setEchoSettings = std::make_shared<SetEchoSettings>(initData);
 
     ReadCommandId(setEchoSettings, reader);
-	
+
     setEchoSettings->settings.echo = reader->ReadInt8();
 
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ResourceLogging"), 0)) {
@@ -19,8 +20,9 @@ SetEchoSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> ini
     return setEchoSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetEchoSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetEchoSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        tinyxml2::XMLElement* reader) {
     auto setEchoSettings = std::make_shared<SetEchoSettings>(initData);
 
     setEchoSettings->cmdId = SceneCommandID::SetEchoSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h
index c76885cf92..1ce2ff52d8 100644
--- a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetEchoSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetEchoSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetEchoSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetEchoSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
index 0590bfeb7b..eab272b891 100644
--- a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
@@ -2,22 +2,23 @@
 #include "soh/resource/type/scenecommand/SetEntranceList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetEntranceListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetEntranceListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     auto setEntranceList = std::make_shared<SetEntranceList>(initData);
 
     ReadCommandId(setEntranceList, reader);
-	
+
     setEntranceList->numEntrances = reader->ReadUInt32();
     setEntranceList->entrances.reserve(setEntranceList->numEntrances);
     for (uint32_t i = 0; i < setEntranceList->numEntrances; i++) {
-	EntranceEntry entranceEntry;
+        EntranceEntry entranceEntry;
+
+        entranceEntry.spawn = reader->ReadInt8();
+        entranceEntry.room = reader->ReadInt8();
 
-	entranceEntry.spawn = reader->ReadInt8();
-	entranceEntry.room = reader->ReadInt8();
-		
         setEntranceList->entrances.push_back(entranceEntry);
     }
 
@@ -28,8 +29,9 @@ SetEntranceListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> ini
     return setEntranceList;
 }
 
-std::shared_ptr<Ship::IResource> SetEntranceListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetEntranceListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        tinyxml2::XMLElement* reader) {
     auto setEntranceList = std::make_shared<SetEntranceList>(initData);
 
     setEntranceList->cmdId = SceneCommandID::SetEntranceList;
diff --git a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h
index 207e9f050c..e6949f9246 100644
--- a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetEntranceListFactory : public SceneCommandFactoryBinaryV0 {
+class SetEntranceListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetEntranceListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetEntranceListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
index 328b41d8af..a1cb515ffd 100644
--- a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetExitList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetExitListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
-    auto setExitList = std::make_shared<SetExitList>( initData);
+std::shared_ptr<Ship::IResource> SetExitListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                  std::shared_ptr<Ship::BinaryReader> reader) {
+    auto setExitList = std::make_shared<SetExitList>(initData);
 
     ReadCommandId(setExitList, reader);
-	
+
     setExitList->numExits = reader->ReadUInt32();
     setExitList->exits.reserve(setExitList->numExits);
     for (uint32_t i = 0; i < setExitList->numExits; i++) {
@@ -24,7 +25,7 @@ SetExitListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDat
 }
 
 std::shared_ptr<Ship::IResource> SetExitListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                     tinyxml2::XMLElement* reader) {
     auto setExitList = std::make_shared<SetExitList>(initData);
 
     setExitList->cmdId = SceneCommandID::SetExitList;
diff --git a/soh/soh/resource/importer/scenecommand/SetExitListFactory.h b/soh/soh/resource/importer/scenecommand/SetExitListFactory.h
index 4b050f46f2..3e5da585ab 100644
--- a/soh/soh/resource/importer/scenecommand/SetExitListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetExitListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetExitListFactory : public SceneCommandFactoryBinaryV0 {
+class SetExitListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetExitListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetExitListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
index e1cbd21225..ebb819634a 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
@@ -2,22 +2,23 @@
 #include "soh/resource/type/scenecommand/SetLightList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetLightListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetLightListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                   std::shared_ptr<Ship::BinaryReader> reader) {
     auto setLightList = std::make_shared<SetLightList>(initData);
 
     ReadCommandId(setLightList, reader);
-    
+
     setLightList->numLights = reader->ReadUInt32();
     setLightList->lightList.reserve(setLightList->numLights);
     for (uint32_t i = 0; i < setLightList->numLights; i++) {
         LightInfo light;
 
         light.type = reader->ReadUByte();
-		
-	    light.params.point.x = reader->ReadInt16();
+
+        light.params.point.x = reader->ReadInt16();
         light.params.point.y = reader->ReadInt16();
         light.params.point.z = reader->ReadInt16();
 
@@ -26,7 +27,7 @@ SetLightListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDa
         light.params.point.color[2] = reader->ReadUByte(); // b
 
         light.params.point.drawGlow = reader->ReadUByte();
-	    light.params.point.radius = reader->ReadInt16();
+        light.params.point.radius = reader->ReadInt16();
 
         setLightList->lightList.push_back(light);
     }
@@ -39,7 +40,7 @@ SetLightListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDa
 }
 
 std::shared_ptr<Ship::IResource> SetLightListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                      tinyxml2::XMLElement* reader) {
     auto setLightList = std::make_shared<SetLightList>(initData);
 
     setLightList->cmdId = SceneCommandID::SetLightList;
@@ -51,7 +52,7 @@ std::shared_ptr<Ship::IResource> SetLightListFactoryXML::ReadResource(std::share
         if (childName == "LightInfo") {
             LightInfo light;
             light.type = child->IntAttribute("Type");
-            if (false/*light.type == LIGHT_DIRECTIONAL*/) {
+            if (false /*light.type == LIGHT_DIRECTIONAL*/) {
                 light.params.dir.x = child->IntAttribute("X");
                 light.params.dir.y = child->IntAttribute("Y");
                 light.params.dir.z = child->IntAttribute("Z");
diff --git a/soh/soh/resource/importer/scenecommand/SetLightListFactory.h b/soh/soh/resource/importer/scenecommand/SetLightListFactory.h
index 0af868d176..1cc5c5758b 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetLightListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetLightListFactory : public SceneCommandFactoryBinaryV0 {
+class SetLightListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetLightListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetLightListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
index 7e35a7ac09..01c5d59e12 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
@@ -2,10 +2,12 @@
 #include "soh/resource/type/scenecommand/SetLightingSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetLightingSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetLightingSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                         std::shared_ptr<Ship::BinaryReader> reader) {
     auto setLightingSettings = std::make_shared<SetLightingSettings>(initData);
 
     ReadCommandId(setLightingSettings, reader);
@@ -51,8 +53,9 @@ std::shared_ptr<Ship::IResource> SetLightingSettingsFactory::ReadResource(std::s
     return setLightingSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetLightingSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetLightingSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                            tinyxml2::XMLElement* reader) {
     auto setLightingSettings = std::make_shared<SetLightingSettings>(initData);
 
     setLightingSettings->cmdId = SceneCommandID::SetLightingSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h
index d5b3be279e..eeb3024b92 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetLightingSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetLightingSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetLightingSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetLightingSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
index b53a36b85d..2f6bf55684 100644
--- a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
@@ -2,15 +2,16 @@
 #include "soh/resource/type/scenecommand/SetMesh.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include "libultraship/libultraship.h"
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                              std::shared_ptr<Ship::BinaryReader> reader) {
     auto setMesh = std::make_shared<SetMesh>(initData);
 
     ReadCommandId(setMesh, reader);
-    
+
     setMesh->data = reader->ReadInt8();
 
     setMesh->meshHeader.base.type = reader->ReadInt8();
@@ -23,7 +24,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
         } else if (setMesh->meshHeader.base.type == 2) {
             setMesh->meshHeader.polygon2.num = polyNum;
         } else {
-            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                         setMesh->meshHeader.base.type);
         }
     }
 
@@ -43,8 +45,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
             std::string meshOpa = reader->ReadString();
             std::string meshXlu = reader->ReadString();
 
-            // Enables alt-toggling support by setting maintained c_str references to DList resource after pushing to vector the first
-            // Defers resource loading later in game when the scene is drawn
+            // Enables alt-toggling support by setting maintained c_str references to DList resource after pushing to
+            // vector the first Defers resource loading later in game when the scene is drawn
             if (meshOpa != "") {
                 meshOpa = "__OTR__" + meshOpa;
                 setMesh->opaPaths.push_back(meshOpa);
@@ -64,8 +66,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
 
             setMesh->meshHeader.polygon1.format = reader->ReadUByte();
 
-            // These strings are the same that are read and used below. Not sure why they get exported twice from the exporter.
-            // We read and ignore these to advance the reader.
+            // These strings are the same that are read and used below. Not sure why they get exported twice from the
+            // exporter. We read and ignore these to advance the reader.
             reader->ReadString();
             reader->ReadString();
 
@@ -91,7 +93,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
                 if (setMesh->meshHeader.polygon1.format == 1) {
                     setMesh->meshHeader.polygon1.single.source = image.source;
                     setMesh->meshHeader.polygon1.single.unk_0C = image.unk_0C;
-                    setMesh->meshHeader.polygon1.single.tlut = (void*)image.tlut; // OTRTODO: type of bgimage.tlut should be uintptr_t
+                    setMesh->meshHeader.polygon1.single.tlut =
+                        (void*)image.tlut; // OTRTODO: type of bgimage.tlut should be uintptr_t
                     setMesh->meshHeader.polygon1.single.width = image.width;
                     setMesh->meshHeader.polygon1.single.height = image.height;
                     setMesh->meshHeader.polygon1.single.fmt = image.fmt;
@@ -153,7 +156,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
 
             setMesh->dlists2.push_back(dlist);
         } else {
-            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                         setMesh->meshHeader.base.type);
         }
     }
 
@@ -165,7 +169,8 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
         setMesh->meshHeader.polygon1.multi.list = setMesh->images.data();
         setMesh->meshHeader.polygon1.dlist = (Gfx*)setMesh->dlists.data();
     } else {
-        SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+        SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                     setMesh->meshHeader.base.type);
     }
 
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("ResourceLogging"), 0)) {
@@ -176,7 +181,7 @@ SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, s
 }
 
 std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                 tinyxml2::XMLElement* reader) {
     auto setMesh = std::make_shared<SetMesh>(initData);
 
     setMesh->cmdId = SceneCommandID::SetMesh;
@@ -193,7 +198,8 @@ std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr
         } else if (setMesh->meshHeader.base.type == 2) {
             setMesh->meshHeader.polygon2.num = polyNum;
         } else {
-            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                         setMesh->meshHeader.base.type);
         }
     }
 
@@ -221,8 +227,8 @@ std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr
             std::string meshOpa = child->Attribute("MeshOpa");
             std::string meshXlu = child->Attribute("MeshXlu");
 
-            // Enables alt-toggling support by setting maintained c_str references to DList resource after pushing to vector the first
-            // Defers resource loading later in game when the scene is drawn
+            // Enables alt-toggling support by setting maintained c_str references to DList resource after pushing to
+            // vector the first Defers resource loading later in game when the scene is drawn
             if (meshOpa != "") {
                 meshOpa = "__OTR__" + meshOpa;
                 setMesh->opaPaths.push_back(meshOpa);
@@ -271,7 +277,8 @@ std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr
                 if (setMesh->meshHeader.polygon1.format == 1) {
                     setMesh->meshHeader.polygon1.single.source = image.source;
                     setMesh->meshHeader.polygon1.single.unk_0C = image.unk_0C;
-                    setMesh->meshHeader.polygon1.single.tlut = (void*)image.tlut; // OTRTODO: type of bgimage.tlut should be uintptr_t
+                    setMesh->meshHeader.polygon1.single.tlut =
+                        (void*)image.tlut; // OTRTODO: type of bgimage.tlut should be uintptr_t
                     setMesh->meshHeader.polygon1.single.width = image.width;
                     setMesh->meshHeader.polygon1.single.height = image.height;
                     setMesh->meshHeader.polygon1.single.fmt = image.fmt;
@@ -335,7 +342,8 @@ std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr
 
             setMesh->dlists2.push_back(dlist);
         } else {
-            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+            SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                         setMesh->meshHeader.base.type);
         }
 
         child = child->NextSiblingElement();
@@ -349,7 +357,8 @@ std::shared_ptr<Ship::IResource> SetMeshFactoryXML::ReadResource(std::shared_ptr
         setMesh->meshHeader.polygon1.multi.list = setMesh->images.data();
         setMesh->meshHeader.polygon1.dlist = (Gfx*)setMesh->dlists.data();
     } else {
-        SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}", setMesh->meshHeader.base.type);
+        SPDLOG_ERROR("Tried to load mesh in SetMesh scene header with type that doesn't exist: {}",
+                     setMesh->meshHeader.base.type);
     }
 
     return setMesh;
diff --git a/soh/soh/resource/importer/scenecommand/SetMeshFactory.h b/soh/soh/resource/importer/scenecommand/SetMeshFactory.h
index c87123174b..82430d5b53 100644
--- a/soh/soh/resource/importer/scenecommand/SetMeshFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetMeshFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetMeshFactory : public SceneCommandFactoryBinaryV0 {
+class SetMeshFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetMeshFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetMeshFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
index 0ba356f7b2..fbee15e8a3 100644
--- a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetObjectList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetObjectListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetObjectListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                    std::shared_ptr<Ship::BinaryReader> reader) {
     auto setObjectList = std::make_shared<SetObjectList>(initData);
 
     ReadCommandId(setObjectList, reader);
-	
+
     setObjectList->numObjects = reader->ReadUInt32();
     setObjectList->objects.reserve(setObjectList->numObjects);
     for (uint32_t i = 0; i < setObjectList->numObjects; i++) {
@@ -24,7 +25,7 @@ SetObjectListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initD
 }
 
 std::shared_ptr<Ship::IResource> SetObjectListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                       tinyxml2::XMLElement* reader) {
     auto setObjectList = std::make_shared<SetObjectList>(initData);
 
     setObjectList->cmdId = SceneCommandID::SetObjectList;
diff --git a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.h b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.h
index 663ef23040..3b060dd610 100644
--- a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetObjectListFactory : public SceneCommandFactoryBinaryV0 {
+class SetObjectListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetObjectListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetObjectListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
index ed36812353..62a3d0d7f9 100644
--- a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
@@ -2,20 +2,22 @@
 #include "soh/resource/type/scenecommand/SetPathways.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include <libultraship/libultraship.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetPathwaysFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetPathwaysFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                  std::shared_ptr<Ship::BinaryReader> reader) {
     auto setPathways = std::make_shared<SetPathways>(initData);
 
     ReadCommandId(setPathways, reader);
-	
+
     setPathways->numPaths = reader->ReadUInt32();
     setPathways->paths.reserve(setPathways->numPaths);
     for (uint32_t i = 0; i < setPathways->numPaths; i++) {
         std::string pathFileName = reader->ReadString();
-        auto path = std::static_pointer_cast<Path>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
+        auto path = std::static_pointer_cast<Path>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
         setPathways->paths.push_back(path->GetPointer());
         setPathways->pathFileNames.push_back(pathFileName);
     }
@@ -28,7 +30,7 @@ SetPathwaysFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDat
 }
 
 std::shared_ptr<Ship::IResource> SetPathwaysFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                     tinyxml2::XMLElement* reader) {
     auto setPathways = std::make_shared<SetPathways>(initData);
 
     setPathways->cmdId = SceneCommandID::SetPathways;
@@ -39,7 +41,8 @@ std::shared_ptr<Ship::IResource> SetPathwaysFactoryXML::ReadResource(std::shared
         std::string childName = child->Name();
         if (childName == "Pathway") {
             std::string pathFileName = child->Attribute("FilePath");
-            auto path = std::static_pointer_cast<Path>(Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
+            auto path = std::static_pointer_cast<Path>(
+                Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(pathFileName.c_str()));
             setPathways->paths.push_back(path->GetPointer());
             setPathways->pathFileNames.push_back(pathFileName);
         }
diff --git a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h
index 783c9f45c2..7c49e34a94 100644
--- a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetPathwaysFactory : public SceneCommandFactoryBinaryV0 {
+class SetPathwaysFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetPathwaysFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetPathwaysFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
index 14bb787ed4..9b18593f53 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetRoomBehavior.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetRoomBehaviorFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetRoomBehaviorFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     auto setRoomBehavior = std::make_shared<SetRoomBehavior>(initData);
 
     ReadCommandId(setRoomBehavior, reader);
-	
+
     setRoomBehavior->roomBehavior.gameplayFlags = reader->ReadInt8();
     setRoomBehavior->roomBehavior.gameplayFlags2 = reader->ReadInt32();
 
@@ -20,8 +21,9 @@ SetRoomBehaviorFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> ini
     return setRoomBehavior;
 }
 
-std::shared_ptr<Ship::IResource> SetRoomBehaviorFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetRoomBehaviorFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        tinyxml2::XMLElement* reader) {
     auto setRoomBehavior = std::make_shared<SetRoomBehavior>(initData);
 
     setRoomBehavior->cmdId = SceneCommandID::SetRoomBehavior;
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h
index 87e55194d8..080adb2b50 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetRoomBehaviorFactory : public SceneCommandFactoryBinaryV0 {
+class SetRoomBehaviorFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetRoomBehaviorFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetRoomBehaviorFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
index b19ac98d77..7925a012fe 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetRoomList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetRoomListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetRoomListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                  std::shared_ptr<Ship::BinaryReader> reader) {
     auto setRoomList = std::make_shared<SetRoomList>(initData);
 
     ReadCommandId(setRoomList, reader);
-	
+
     setRoomList->numRooms = reader->ReadInt32();
     setRoomList->rooms.reserve(setRoomList->numRooms);
     for (uint32_t i = 0; i < setRoomList->numRooms; i++) {
@@ -20,7 +21,7 @@ SetRoomListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDat
         room.fileName = (char*)setRoomList->fileNames.back().c_str();
         room.vromStart = reader->ReadInt32();
         room.vromEnd = reader->ReadInt32();
-		
+
         setRoomList->rooms.push_back(room);
     }
 
@@ -32,7 +33,7 @@ SetRoomListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initDat
 }
 
 std::shared_ptr<Ship::IResource> SetRoomListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+                                                                     tinyxml2::XMLElement* reader) {
     auto setRoomList = std::make_shared<SetRoomList>(initData);
 
     setRoomList->cmdId = SceneCommandID::SetRoomList;
@@ -44,11 +45,11 @@ std::shared_ptr<Ship::IResource> SetRoomListFactoryXML::ReadResource(std::shared
         if (childName == "RoomEntry") {
             RomFile room;
 
-	        setRoomList->fileNames.push_back(child->Attribute("Path"));
+            setRoomList->fileNames.push_back(child->Attribute("Path"));
 
-	        room.fileName = (char*)setRoomList->fileNames.back().c_str();
-	        room.vromStart = child->IntAttribute("VromStart");
-	        room.vromEnd = child->IntAttribute("VromEnd");
+            room.fileName = (char*)setRoomList->fileNames.back().c_str();
+            room.vromStart = child->IntAttribute("VromStart");
+            room.vromEnd = child->IntAttribute("VromEnd");
 
             setRoomList->rooms.push_back(room);
         }
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.h b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.h
index 1e05c7e031..310a42a3bc 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetRoomListFactory : public SceneCommandFactoryBinaryV0 {
+class SetRoomListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetRoomListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetRoomListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
index 6c0ee14007..a071cc4d02 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetSkyboxModifier.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetSkyboxModifierFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                 std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetSkyboxModifierFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                       std::shared_ptr<Ship::BinaryReader> reader) {
     auto setSkyboxModifier = std::make_shared<SetSkyboxModifier>(initData);
 
-	ReadCommandId(setSkyboxModifier, reader);
-	
+    ReadCommandId(setSkyboxModifier, reader);
+
     setSkyboxModifier->modifier.skyboxDisabled = reader->ReadInt8();
     setSkyboxModifier->modifier.sunMoonDisabled = reader->ReadInt8();
 
@@ -20,8 +22,9 @@ std::shared_ptr<Ship::IResource> SetSkyboxModifierFactory::ReadResource(std::sha
     return setSkyboxModifier;
 }
 
-std::shared_ptr<Ship::IResource> SetSkyboxModifierFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetSkyboxModifierFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                          tinyxml2::XMLElement* reader) {
     auto setSkyboxModifier = std::make_shared<SetSkyboxModifier>(initData);
 
     setSkyboxModifier->cmdId = SceneCommandID::SetSkyboxModifier;
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h
index a4ef581508..def84cf591 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetSkyboxModifierFactory : public SceneCommandFactoryBinaryV0 {
+class SetSkyboxModifierFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetSkyboxModifierFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetSkyboxModifierFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
index 607909d654..3434505cb0 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetSkyboxSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetSkyboxSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                 std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetSkyboxSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                       std::shared_ptr<Ship::BinaryReader> reader) {
     auto setSkyboxSettings = std::make_shared<SetSkyboxSettings>(initData);
 
     ReadCommandId(setSkyboxSettings, reader);
-	
+
     setSkyboxSettings->settings.unk = reader->ReadInt8();
     setSkyboxSettings->settings.skyboxId = reader->ReadInt8();
     setSkyboxSettings->settings.weather = reader->ReadInt8();
@@ -22,8 +24,9 @@ std::shared_ptr<Ship::IResource> SetSkyboxSettingsFactory::ReadResource(std::sha
     return setSkyboxSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetSkyboxSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetSkyboxSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                          tinyxml2::XMLElement* reader) {
     auto setSkyboxSettings = std::make_shared<SetSkyboxSettings>(initData);
 
     setSkyboxSettings->cmdId = SceneCommandID::SetSkyboxSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h
index 352275b584..74e48da15d 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetSkyboxSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetSkyboxSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetSkyboxSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetSkyboxSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
index 61c1892ddf..a72acce8cc 100644
--- a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetSoundSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetSoundSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                std::shared_ptr<Ship::BinaryReader> reader) {
+                                                                       std::shared_ptr<Ship::BinaryReader> reader) {
     auto setSoundSettings = std::make_shared<SetSoundSettings>(initData);
 
     ReadCommandId(setSoundSettings, reader);
-	
+
     setSoundSettings->settings.reverb = reader->ReadInt8();
     setSoundSettings->settings.natureAmbienceId = reader->ReadInt8();
     setSoundSettings->settings.seqId = reader->ReadInt8();
@@ -21,8 +22,9 @@ std::shared_ptr<Ship::IResource> SetSoundSettingsFactory::ReadResource(std::shar
     return setSoundSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetSoundSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetSoundSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                         tinyxml2::XMLElement* reader) {
     auto setSoundSettings = std::make_shared<SetSoundSettings>(initData);
 
     setSoundSettings->cmdId = SceneCommandID::SetSoundSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h
index 14d1ebe844..f6e04a3afc 100644
--- a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetSoundSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetSoundSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetSoundSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetSoundSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
index f28393134c..2877dc88aa 100644
--- a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetSpecialObjects.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetSpecialObjectsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                 std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetSpecialObjectsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                       std::shared_ptr<Ship::BinaryReader> reader) {
     auto setSpecialObjects = std::make_shared<SetSpecialObjects>(initData);
 
     ReadCommandId(setSpecialObjects, reader);
-    
+
     setSpecialObjects->specialObjects.elfMessage = reader->ReadInt8();
     setSpecialObjects->specialObjects.globalObject = reader->ReadInt16();
 
@@ -20,8 +22,9 @@ std::shared_ptr<Ship::IResource> SetSpecialObjectsFactory::ReadResource(std::sha
     return setSpecialObjects;
 }
 
-std::shared_ptr<Ship::IResource> SetSpecialObjectsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetSpecialObjectsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                          tinyxml2::XMLElement* reader) {
     auto setSpecialObjects = std::make_shared<SetSpecialObjects>(initData);
 
     setSpecialObjects->cmdId = SceneCommandID::SetSpecialObjects;
diff --git a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h
index 38b1ea5116..b3be7e3a5a 100644
--- a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetSpecialObjectsFactory : public SceneCommandFactoryBinaryV0 {
+class SetSpecialObjectsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetSpecialObjectsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetSpecialObjectsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
index 3dee5d9925..d370cde2bc 100644
--- a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetStartPositionList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetStartPositionListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                    std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetStartPositionListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                          std::shared_ptr<Ship::BinaryReader> reader) {
     auto setStartPositionList = std::make_shared<SetStartPositionList>(initData);
 
     ReadCommandId(setStartPositionList, reader);
-	
+
     setStartPositionList->numStartPositions = reader->ReadUInt32();
     setStartPositionList->startPositions.reserve(setStartPositionList->numStartPositions);
     for (uint32_t i = 0; i < setStartPositionList->numStartPositions; i++) {
@@ -34,8 +36,9 @@ std::shared_ptr<Ship::IResource> SetStartPositionListFactory::ReadResource(std::
     return setStartPositionList;
 }
 
-std::shared_ptr<Ship::IResource> SetStartPositionListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetStartPositionListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                             tinyxml2::XMLElement* reader) {
     auto setStartPositionList = std::make_shared<SetStartPositionList>(initData);
 
     setStartPositionList->cmdId = SceneCommandID::SetStartPositionList;
diff --git a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h
index b4894207ec..2e71e43e25 100644
--- a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetStartPositionListFactory : public SceneCommandFactoryBinaryV0 {
+class SetStartPositionListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetStartPositionListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetStartPositionListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
index 739da53302..7145702082 100644
--- a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetTimeSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetTimeSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetTimeSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     auto setTimeSettings = std::make_shared<SetTimeSettings>(initData);
 
     ReadCommandId(setTimeSettings, reader);
-    
+
     setTimeSettings->settings.hour = reader->ReadInt8();
     setTimeSettings->settings.minute = reader->ReadInt8();
     setTimeSettings->settings.timeIncrement = reader->ReadInt8();
@@ -21,8 +22,9 @@ SetTimeSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> ini
     return setTimeSettings;
 }
 
-std::shared_ptr<Ship::IResource> SetTimeSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetTimeSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        tinyxml2::XMLElement* reader) {
     auto setTimeSettings = std::make_shared<SetTimeSettings>(initData);
 
     setTimeSettings->cmdId = SceneCommandID::SetTimeSettings;
diff --git a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h
index 4b7b5c90f5..cb886776c6 100644
--- a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetTimeSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetTimeSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetTimeSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetTimeSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
index 4289ef46ee..fd028b6e31 100644
--- a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
@@ -2,14 +2,16 @@
 #include "soh/resource/type/scenecommand/SetTransitionActorList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource> SetTransitionActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource>
+SetTransitionActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                            std::shared_ptr<Ship::BinaryReader> reader) {
     auto setTransitionActorList = std::make_shared<SetTransitionActorList>(initData);
-    
+
     ReadCommandId(setTransitionActorList, reader);
-	
+
     setTransitionActorList->numTransitionActors = reader->ReadUInt32();
     setTransitionActorList->transitionActorList.reserve(setTransitionActorList->numTransitionActors);
     for (uint32_t i = 0; i < setTransitionActorList->numTransitionActors; i++) {
@@ -36,8 +38,9 @@ std::shared_ptr<Ship::IResource> SetTransitionActorListFactory::ReadResource(std
     return setTransitionActorList;
 }
 
-std::shared_ptr<Ship::IResource> SetTransitionActorListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetTransitionActorListFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                               tinyxml2::XMLElement* reader) {
     auto setTransitionActorList = std::make_shared<SetTransitionActorList>(initData);
 
     setTransitionActorList->cmdId = SceneCommandID::SetTransitionActorList;
diff --git a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h
index a3fc42f416..f4763b021f 100644
--- a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetTransitionActorListFactory : public SceneCommandFactoryBinaryV0 {
+class SetTransitionActorListFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetTransitionActorListFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetTransitionActorListFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
index 587e9dcc77..86f0af5151 100644
--- a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
@@ -2,14 +2,15 @@
 #include "soh/resource/type/scenecommand/SetWindSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-std::shared_ptr<Ship::IResource>
-SetWindSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) {
+std::shared_ptr<Ship::IResource> SetWindSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                                      std::shared_ptr<Ship::BinaryReader> reader) {
     auto setWind = std::make_shared<SetWindSettings>(initData);
 
     ReadCommandId(setWind, reader);
-    
+
     setWind->settings.windWest = reader->ReadInt8();
     setWind->settings.windVertical = reader->ReadInt8();
     setWind->settings.windSouth = reader->ReadInt8();
@@ -22,8 +23,9 @@ SetWindSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> ini
     return setWind;
 }
 
-std::shared_ptr<Ship::IResource> SetWindSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
-                                                                   tinyxml2::XMLElement* reader) {
+std::shared_ptr<Ship::IResource>
+SetWindSettingsFactoryXML::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                        tinyxml2::XMLElement* reader) {
     auto setWind = std::make_shared<SetWindSettings>(initData);
 
     setWind->cmdId = SceneCommandID::SetWind;
diff --git a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h
index 85381e5179..bc60ca2d8a 100644
--- a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.h
@@ -3,15 +3,15 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 
 namespace SOH {
-class SetWindSettingsFactory : public SceneCommandFactoryBinaryV0 {
+class SetWindSettingsFactory final : public SceneCommandFactoryBinaryV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, std::shared_ptr<Ship::BinaryReader> reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  std::shared_ptr<Ship::BinaryReader> reader) override;
 };
 
-class SetWindSettingsFactoryXML : public SceneCommandFactoryXMLV0 {
+class SetWindSettingsFactoryXML final : public SceneCommandFactoryXMLV0 {
   public:
-    std::shared_ptr<Ship::IResource>
-    ReadResource(std::shared_ptr<Ship::ResourceInitData> initData, tinyxml2::XMLElement* reader) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
+                                                  tinyxml2::XMLElement* reader) override;
 };
 } // namespace SOH
diff --git a/soh/soh/resource/logging/PathLogger.cpp b/soh/soh/resource/logging/PathLogger.cpp
index 5c216c9ff9..47b0081f3a 100644
--- a/soh/soh/resource/logging/PathLogger.cpp
+++ b/soh/soh/resource/logging/PathLogger.cpp
@@ -1,33 +1,34 @@
 #include "soh/resource/type/Path.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 
 namespace SOH {
-    void LogPathAsXML(std::shared_ptr<Ship::IResource> resource) {
-        std::shared_ptr<Path> path = std::static_pointer_cast<Path>(resource);
+void LogPathAsXML(std::shared_ptr<Ship::IResource> resource) {
+    std::shared_ptr<Path> path = std::static_pointer_cast<Path>(resource);
 
-        tinyxml2::XMLDocument doc;
-        tinyxml2::XMLElement* root = doc.NewElement("Path");
-        doc.InsertFirstChild(root);
+    tinyxml2::XMLDocument doc;
+    tinyxml2::XMLElement* root = doc.NewElement("Path");
+    doc.InsertFirstChild(root);
 
-        for (size_t i = 0; i < path->paths.size(); i += 1) {
-            tinyxml2::XMLElement* pathData = doc.NewElement("PathData");
+    for (size_t i = 0; i < path->paths.size(); i += 1) {
+        tinyxml2::XMLElement* pathData = doc.NewElement("PathData");
 
-            for (size_t j = 0; j < path->paths[i].size(); j += 1) {
-                tinyxml2::XMLElement* pathPoint = doc.NewElement("PathPoint");
+        for (size_t j = 0; j < path->paths[i].size(); j += 1) {
+            tinyxml2::XMLElement* pathPoint = doc.NewElement("PathPoint");
 
-                pathPoint->SetAttribute("X", path->paths[i][j].x);
-                pathPoint->SetAttribute("Y", path->paths[i][j].y);
-                pathPoint->SetAttribute("Z", path->paths[i][j].z);
+            pathPoint->SetAttribute("X", path->paths[i][j].x);
+            pathPoint->SetAttribute("Y", path->paths[i][j].y);
+            pathPoint->SetAttribute("Z", path->paths[i][j].z);
 
-                pathData->InsertEndChild(pathPoint);
-            }
-
-            root->InsertEndChild(pathData);
+            pathData->InsertEndChild(pathPoint);
         }
 
-        tinyxml2::XMLPrinter printer;
-        doc.Accept(&printer);
-
-        SPDLOG_INFO("{}: {}", resource->GetInitData()->Path, printer.CStr());
+        root->InsertEndChild(pathData);
     }
-}
\ No newline at end of file
+
+    tinyxml2::XMLPrinter printer;
+    doc.Accept(&printer);
+
+    SPDLOG_INFO("{}: {}", resource->GetInitData()->Path, printer.CStr());
+}
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/logging/PathLogger.h b/soh/soh/resource/logging/PathLogger.h
index 91274db768..f239d5747d 100644
--- a/soh/soh/resource/logging/PathLogger.h
+++ b/soh/soh/resource/logging/PathLogger.h
@@ -3,5 +3,5 @@
 #include "soh/cvar_prefixes.h"
 
 namespace SOH {
-    void LogPathAsXML(std::shared_ptr<Ship::IResource> resource);
+void LogPathAsXML(std::shared_ptr<Ship::IResource> resource);
 }
\ No newline at end of file
diff --git a/soh/soh/resource/logging/SceneCommandLoggers.cpp b/soh/soh/resource/logging/SceneCommandLoggers.cpp
index 22e7420c22..8a464172d1 100644
--- a/soh/soh/resource/logging/SceneCommandLoggers.cpp
+++ b/soh/soh/resource/logging/SceneCommandLoggers.cpp
@@ -24,6 +24,7 @@
 #include "soh/resource/type/scenecommand/SetTransitionActorList.h"
 #include "soh/resource/type/scenecommand/SetWindSettings.h"
 #include "spdlog/spdlog.h"
+#include <tinyxml2.h>
 #include <string.h>
 
 namespace SOH {
@@ -259,7 +260,7 @@ void LogLightListAsXML(std::shared_ptr<Ship::IResource> resource) {
     for (size_t i = 0; i < setLightList->numLights; i++) {
         tinyxml2::XMLElement* light = doc.NewElement("LightInfo");
         light->SetAttribute("Type", setLightList->lightList[i].type);
-        if (false/*setLightList->lightList[i].type == LIGHT_DIRECTIONAL*/) {
+        if (false /*setLightList->lightList[i].type == LIGHT_DIRECTIONAL*/) {
             light->SetAttribute("X", setLightList->lightList[i].params.dir.x);
             light->SetAttribute("Y", setLightList->lightList[i].params.dir.y);
             light->SetAttribute("Z", setLightList->lightList[i].params.dir.z);
@@ -529,7 +530,8 @@ void LogSpecialObjectsAsXML(std::shared_ptr<Ship::IResource> resource) {
 }
 
 void LogStartPositionListAsXML(std::shared_ptr<Ship::IResource> resource) {
-    std::shared_ptr<SetStartPositionList> setStartPositionList = std::static_pointer_cast<SetStartPositionList>(resource);
+    std::shared_ptr<SetStartPositionList> setStartPositionList =
+        std::static_pointer_cast<SetStartPositionList>(resource);
 
     tinyxml2::XMLDocument doc;
     tinyxml2::XMLElement* root = doc.NewElement("SetStartPositionList");
@@ -572,7 +574,8 @@ void LogTimeSettingsAsXML(std::shared_ptr<Ship::IResource> resource) {
 }
 
 void LogTransitionActorListAsXML(std::shared_ptr<Ship::IResource> resource) {
-    std::shared_ptr<SetTransitionActorList> setTransitionActorList = std::static_pointer_cast<SetTransitionActorList>(resource);
+    std::shared_ptr<SetTransitionActorList> setTransitionActorList =
+        std::static_pointer_cast<SetTransitionActorList>(resource);
 
     tinyxml2::XMLDocument doc;
     tinyxml2::XMLElement* root = doc.NewElement("SetTransitionActorList");
@@ -617,4 +620,4 @@ void LogWindSettingsAsXML(std::shared_ptr<Ship::IResource> resource) {
     SPDLOG_INFO("{}: {}", resource->GetInitData()->Path, printer.CStr());
 }
 
-} //namespace SOH
+} // namespace SOH
diff --git a/soh/soh/resource/logging/SceneCommandLoggers.h b/soh/soh/resource/logging/SceneCommandLoggers.h
index d8a7ac2d54..b006b9c0a0 100644
--- a/soh/soh/resource/logging/SceneCommandLoggers.h
+++ b/soh/soh/resource/logging/SceneCommandLoggers.h
@@ -30,4 +30,4 @@ void LogTimeSettingsAsXML(std::shared_ptr<Ship::IResource> resource);
 void LogTransitionActorListAsXML(std::shared_ptr<Ship::IResource> resource);
 void LogWindSettingsAsXML(std::shared_ptr<Ship::IResource> resource);
 
-} //namespace SOH
\ No newline at end of file
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/Animation.cpp b/soh/soh/resource/type/Animation.cpp
index d11d053944..0547c79c27 100644
--- a/soh/soh/resource/type/Animation.cpp
+++ b/soh/soh/resource/type/Animation.cpp
@@ -6,11 +6,11 @@ AnimationData* Animation::GetPointer() {
 }
 
 size_t Animation::GetPointerSize() {
-    switch(type) {
+    switch (type) {
         case AnimationType::Normal:
             return sizeof(animationData.animationHeader);
         case AnimationType::Link:
-            return  sizeof(animationData.linkAnimationHeader);
+            return sizeof(animationData.linkAnimationHeader);
         case AnimationType::Curve:
             return sizeof(animationData.transformUpdateIndex);
         case AnimationType::Legacy:
diff --git a/soh/soh/resource/type/Animation.h b/soh/soh/resource/type/Animation.h
index bf24971079..e4ca4295f4 100644
--- a/soh/soh/resource/type/Animation.h
+++ b/soh/soh/resource/type/Animation.h
@@ -38,7 +38,7 @@ typedef struct {
     /* 0x00 */ s16 frameCount;
 } AnimationHeaderCommon;
 
-// Index into the frame data table. 
+// Index into the frame data table.
 typedef struct {
     /* 0x00 */ u16 x;
     /* 0x02 */ u16 y;
@@ -47,7 +47,7 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ AnimationHeaderCommon common;
-    /* 0x04 */ s16* frameData; // "tbl"
+    /* 0x04 */ s16* frameData;           // "tbl"
     /* 0x08 */ JointIndex* jointIndices; // "ref_tbl"
     /* 0x0C */ u16 staticIndexMax;
 } AnimationHeader; // size = 0x10
@@ -58,16 +58,17 @@ typedef struct {
 } LinkAnimationHeader; // size = 0x8
 
 union AnimationData {
-AnimationHeader animationHeader;
-LinkAnimationHeader linkAnimationHeader;
-TransformUpdateIndex transformUpdateIndex;
+    AnimationHeader animationHeader;
+    LinkAnimationHeader linkAnimationHeader;
+    TransformUpdateIndex transformUpdateIndex;
 };
 
 class Animation : public Ship::Resource<AnimationData> {
-public:
+  public:
     using Resource::Resource;
 
-    Animation() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Animation() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     AnimationData* GetPointer();
     size_t GetPointerSize();
@@ -84,4 +85,4 @@ public:
     std::vector<TransformData> transformDataArr;
     std::vector<int16_t> copyValuesArr;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/Array.cpp b/soh/soh/resource/type/Array.cpp
index 70d5d42baa..a4bbc0e5ee 100644
--- a/soh/soh/resource/type/Array.cpp
+++ b/soh/soh/resource/type/Array.cpp
@@ -23,7 +23,7 @@ size_t Array::GetPointerSize() {
     size_t typeSize = 0;
     switch (ArrayType) {
         case ArrayResourceType::Vertex:
-            typeSize = sizeof(F3DVtx);
+            typeSize = sizeof(Fast::F3DVtx);
             break;
         case ArrayResourceType::Scalar:
         default:
@@ -42,4 +42,4 @@ size_t Array::GetPointerSize() {
     }
     return ArrayCount * typeSize;
 }
-} // namespace LUS
+} // namespace SOH
diff --git a/soh/soh/resource/type/Array.h b/soh/soh/resource/type/Array.h
index ba41ec0492..c7d15a22a9 100644
--- a/soh/soh/resource/type/Array.h
+++ b/soh/soh/resource/type/Array.h
@@ -2,7 +2,10 @@
 
 #include "resource/Resource.h"
 
+namespace Fast {
 union F3DVtx;
+}
+
 namespace SOH {
 typedef union ScalarData {
     uint8_t u8;
@@ -80,6 +83,6 @@ class Array : public Ship::Resource<void> {
     size_t ArrayCount;
     // OTRTODO: Should be a vector of resource pointers...
     std::vector<ScalarData> Scalars;
-    std::vector<F3DVtx> Vertices;
+    std::vector<Fast::F3DVtx> Vertices;
 };
-} // namespace LUS
+} // namespace SOH
diff --git a/soh/soh/resource/type/AudioSample.cpp b/soh/soh/resource/type/AudioSample.cpp
index 2887658224..b4a5397576 100644
--- a/soh/soh/resource/type/AudioSample.cpp
+++ b/soh/soh/resource/type/AudioSample.cpp
@@ -1,6 +1,14 @@
 #include "AudioSample.h"
 
 namespace SOH {
+AudioSample::~AudioSample() {
+    if (sample.book != nullptr && sample.book->book != nullptr) {
+        delete[] sample.book->book;
+    }
+    if (sample.sampleAddr != nullptr) {
+        delete[] sample.sampleAddr;
+    }
+}
 Sample* AudioSample::GetPointer() {
     return &sample;
 }
diff --git a/soh/soh/resource/type/AudioSample.h b/soh/soh/resource/type/AudioSample.h
index f376590912..84e623781e 100644
--- a/soh/soh/resource/type/AudioSample.h
+++ b/soh/soh/resource/type/AudioSample.h
@@ -1,61 +1,60 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
 #include "Resource.h"
 #include <libultraship/libultra/types.h>
 
 namespace SOH {
-    typedef struct {
-        /* 0x00 */ uintptr_t start;
-        /* 0x04 */ uintptr_t end;
-        /* 0x08 */ u32 count;
-        /* 0x0C */ char unk_0C[0x4];
-        /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
-    } AdpcmLoop; // size = 0x30 (or 0x10)
+typedef struct {
+    /* 0x00 */ u32 start;
+    /* 0x04 */ u32 end;
+    /* 0x08 */ u32 count;
+    /* 0x0C */ char unk_0C[0x4];
+    /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
+} AdpcmLoop;                  // size = 0x30 (or 0x10)
 
-    typedef struct {
-        /* 0x00 */ s32 order;
-        /* 0x04 */ s32 npredictors;
-        /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
-    } AdpcmBook; // s
+typedef struct {
+    /* 0x00 */ s32 order;
+    /* 0x04 */ s32 npredictors;
+    /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
+} AdpcmBook;              // s
 
-    typedef struct {
-        union {
-            struct {
-                /* 0x00 */ u32 codec : 4;
-                /* 0x00 */ u32 medium : 2;
-                /* 0x00 */ u32 unk_bit26 : 1;
-                /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret
-                /* 0x01 */ u32 size : 24;
-            };
-            u32 asU32;
+typedef struct Sample {
+    union {
+        struct {
+            ///* 0x0 */ u32 unk_0 : 1;
+            /* 0x0 */ u32 codec : 4;  // The state of compression or decompression, See `SampleCodec`
+            /* 0x0 */ u32 medium : 2; // Medium where sample is currently stored. See `SampleMedium`
+            /* 0x0 */ u32 unk_bit26 : 1;
+            /* 0x0 */ u32 isRelocated : 1; // Has the sample header been relocated (offsets to pointers)
         };
-
-        /* 0x04 */ u8* sampleAddr;
-        /* 0x08 */ AdpcmLoop* loop;
-        /* 0x0C */ AdpcmBook* book;
-        u32 sampleRateMagicValue; // For wav samples only...
-        s32 sampleRate;           // For wav samples only...
-    } Sample; // size = 0x10
-
-    class AudioSample : public Ship::Resource<Sample> {
-        public:
-            using Resource::Resource;
-
-        AudioSample() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
-
-            Sample* GetPointer();
-            size_t GetPointerSize();
-
-            Sample sample;
-            std::vector<uint8_t> audioSampleData;
-
-            AdpcmLoop loop;
-            uint32_t loopStateCount;
-
-            AdpcmBook book;
-            uint32_t bookDataCount;
-            std::vector<int16_t> bookData;
+        u32 asU32;
     };
-}; // namespace LUS
+    /* 0x1 */ u32 size; // Size of the sample
+    u32 fileSize;
+    /* 0x4 */ u8* sampleAddr; // Raw sample data. Offset from the start of the sample bank or absolute address to either
+                              // rom or ram
+    /* 0x8 */ AdpcmLoop*
+        loop; // Adpcm loop parameters used by the sample. Offset from the start of the sound font / pointer to ram
+    /* 0xC */ AdpcmBook*
+        book; // Adpcm book parameters used by the sample. Offset from the start of the sound font / pointer to ram
+} Sample;     // size = 0x10
+
+class AudioSample : public Ship::Resource<Sample> {
+  public:
+    using Resource::Resource;
+
+    AudioSample() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
+    ~AudioSample();
+
+    Sample* GetPointer();
+    size_t GetPointerSize();
+
+    Sample sample;
+    AdpcmLoop loop;
+    AdpcmBook book;
+    // Only applies to streamed audio
+    float tuning = -1.0f;
+};
+}; // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/AudioSequence.cpp b/soh/soh/resource/type/AudioSequence.cpp
index 41029d47d7..040fbf124c 100644
--- a/soh/soh/resource/type/AudioSequence.cpp
+++ b/soh/soh/resource/type/AudioSequence.cpp
@@ -9,4 +9,10 @@ Sequence* AudioSequence::GetPointer() {
 size_t AudioSequence::GetPointerSize() {
     return sizeof(Sequence);
 }
-} // namespace SOH
+
+AudioSequence::~AudioSequence() {
+    delete[] sequence.seqData;
+    sequence.seqData = nullptr;
+}
+
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/AudioSequence.h b/soh/soh/resource/type/AudioSequence.h
index d7a8820a39..b76645deef 100644
--- a/soh/soh/resource/type/AudioSequence.h
+++ b/soh/soh/resource/type/AudioSequence.h
@@ -1,32 +1,31 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
 #include "Resource.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 
 typedef struct {
     char* seqData;
-    int32_t seqDataSize;
+    uint32_t seqDataSize;
     uint16_t seqNumber;
     uint8_t medium;
     uint8_t cachePolicy;
-    int32_t numFonts;
+    uint32_t numFonts;
     uint8_t fonts[16];
 } Sequence;
 
 class AudioSequence : public Ship::Resource<Sequence> {
-public:
+  public:
     using Resource::Resource;
 
-    AudioSequence() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    AudioSequence() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
+    ~AudioSequence();
 
     Sequence* GetPointer();
     size_t GetPointerSize();
 
     Sequence sequence;
-    std::vector<char> sequenceData;
 };
-}; // namespace LUS
+}; // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/AudioSoundFont.cpp b/soh/soh/resource/type/AudioSoundFont.cpp
index 12218cb648..da95bf5741 100644
--- a/soh/soh/resource/type/AudioSoundFont.cpp
+++ b/soh/soh/resource/type/AudioSoundFont.cpp
@@ -1,6 +1,23 @@
 #include "AudioSoundFont.h"
 
 namespace SOH {
+
+AudioSoundFont::~AudioSoundFont() {
+    for (auto i : instrumentAddresses) {
+        if (i != nullptr) {
+            delete[] i->envelope;
+            delete i;
+        }
+    }
+
+    for (auto d : drumAddresses) {
+        if (d != nullptr) {
+            delete[] d->envelope;
+            delete d;
+        }
+    }
+}
+
 SoundFont* AudioSoundFont::GetPointer() {
     return &soundFont;
 }
@@ -8,4 +25,4 @@ SoundFont* AudioSoundFont::GetPointer() {
 size_t AudioSoundFont::GetPointerSize() {
     return sizeof(SoundFont);
 }
-} // namespace SOH
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/AudioSoundFont.h b/soh/soh/resource/type/AudioSoundFont.h
index 12d66b2d24..e387ede5f5 100644
--- a/soh/soh/resource/type/AudioSoundFont.h
+++ b/soh/soh/resource/type/AudioSoundFont.h
@@ -17,7 +17,7 @@ typedef struct {
     /* 0x00 */ Sample* sample;
     /* 0x04 */ union {
         u32 tuningAsU32;
-        f32 tuning;// frequency scale factor
+        f32 tuning; // frequency scale factor
     };
 } SoundFontSound; // size = 0x8
 
@@ -53,10 +53,12 @@ typedef struct {
 } SoundFont; // size = 0x14
 
 class AudioSoundFont : public Ship::Resource<SoundFont> {
-public:
+  public:
     using Resource::Resource;
 
-    AudioSoundFont() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    AudioSoundFont() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
+    ~AudioSoundFont();
 
     SoundFont* GetPointer();
     size_t GetPointerSize();
@@ -67,18 +69,13 @@ public:
     uint16_t data2;
     uint16_t data3;
 
-    std::vector<Drum> drums;
     std::vector<Drum*> drumAddresses;
-    std::vector<uint32_t> drumEnvelopeCounts;
     std::vector<std::vector<AdsrEnvelope>> drumEnvelopeArrays;
 
-    std::vector<Instrument> instruments;
     std::vector<Instrument*> instrumentAddresses;
-    std::vector<uint32_t> instrumentEnvelopeCounts;
-    std::vector<std::vector<AdsrEnvelope>> instrumentEnvelopeArrays;
 
     std::vector<SoundFontSound> soundEffects;
 
     SoundFont soundFont;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/Background.h b/soh/soh/resource/type/Background.h
index aa81edde4e..728e0207e3 100644
--- a/soh/soh/resource/type/Background.h
+++ b/soh/soh/resource/type/Background.h
@@ -7,11 +7,12 @@ class Background : public Ship::Resource<uint8_t> {
   public:
     using Resource::Resource;
 
-    Background() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Background() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     uint8_t* GetPointer();
     size_t GetPointerSize();
 
     std::vector<uint8_t> Data;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h
index dba5994ce2..151437442d 100644
--- a/soh/soh/resource/type/CollisionHeader.h
+++ b/soh/soh/resource/type/CollisionHeader.h
@@ -23,7 +23,7 @@ typedef struct {
                              // Value ranges from -0x7FFF to 0x7FFF, representing -1.0 to 1.0; 0x8000 is invalid
 
     /* 0x0E */ s16 dist; // Plane distance from origin along the normal
-} CollisionPoly; // size = 0x10
+} CollisionPoly;         // size = 0x10
 
 typedef struct {
     /* 0x00 */ s16 xMin;
@@ -52,7 +52,6 @@ typedef struct {
     // 0x0800_0000 = wall damage
 } SurfaceType;
 
-
 typedef struct {
     /* 0x00 */ Vec3s minBounds; // minimum coordinates of poly bounding box
     /* 0x06 */ Vec3s maxBounds; // maximum coordinates of poly bounding box
@@ -65,13 +64,14 @@ typedef struct {
     /* 0x24 */ u16 numWaterBoxes;
     /* 0x28 */ WaterBox* waterBoxes;
     size_t cameraDataListLen; // OTRTODO: Added to allow for bounds checking the cameraDataList.
-} CollisionHeaderData; // original name: BGDataInfo
+} CollisionHeaderData;        // original name: BGDataInfo
 
 class CollisionHeader : public Ship::Resource<CollisionHeaderData> {
-public:
+  public:
     using Resource::Resource;
 
-    CollisionHeader() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    CollisionHeader() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     CollisionHeaderData* GetPointer();
     size_t GetPointerSize();
@@ -95,4 +95,4 @@ public:
 
     std::vector<WaterBox> waterBoxes;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/Cutscene.cpp b/soh/soh/resource/type/Cutscene.cpp
index 60440ceb26..fec43126c4 100644
--- a/soh/soh/resource/type/Cutscene.cpp
+++ b/soh/soh/resource/type/Cutscene.cpp
@@ -7,6 +7,6 @@ uint32_t* Cutscene::GetPointer() {
 }
 
 size_t Cutscene::GetPointerSize() {
-	return commands.size() * sizeof(uint32_t);
+    return commands.size() * sizeof(uint32_t);
 }
 } // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/Cutscene.h b/soh/soh/resource/type/Cutscene.h
index 664413d2db..e1f786ea53 100644
--- a/soh/soh/resource/type/Cutscene.h
+++ b/soh/soh/resource/type/Cutscene.h
@@ -45,7 +45,8 @@ class Cutscene : public Ship::Resource<uint32_t> {
   public:
     using Resource::Resource;
 
-    Cutscene() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Cutscene() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     uint32_t* GetPointer();
     size_t GetPointerSize();
@@ -56,7 +57,6 @@ class Cutscene : public Ship::Resource<uint32_t> {
 };
 } // namespace SOH
 
-
 /////////////
 
 // class CutsceneCommand {
diff --git a/soh/soh/resource/type/Path.h b/soh/soh/resource/type/Path.h
index 5adf683d32..baef6519c9 100644
--- a/soh/soh/resource/type/Path.h
+++ b/soh/soh/resource/type/Path.h
@@ -9,15 +9,16 @@
 namespace SOH {
 
 typedef struct {
-    /* 0x00 */ u8 count; // number of points in the path
+    /* 0x00 */ u8 count;      // number of points in the path
     /* 0x04 */ Vec3s* points; // Segment Address to the array of points
-} PathData; // size = 0x8
+} PathData;                   // size = 0x8
 
 class Path : public Ship::Resource<PathData> {
-public:
-  using Resource::Resource;
+  public:
+    using Resource::Resource;
 
-    Path() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Path() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     PathData* GetPointer();
     size_t GetPointerSize();
@@ -26,4 +27,4 @@ public:
     std::vector<PathData> pathData;
     std::vector<std::vector<Vec3s>> paths;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/PlayerAnimation.cpp b/soh/soh/resource/type/PlayerAnimation.cpp
index 189460e4d2..46ba8a1900 100644
--- a/soh/soh/resource/type/PlayerAnimation.cpp
+++ b/soh/soh/resource/type/PlayerAnimation.cpp
@@ -7,6 +7,6 @@ int16_t* PlayerAnimation::GetPointer() {
 }
 
 size_t PlayerAnimation::GetPointerSize() {
-	return limbRotData.size() * sizeof(int16_t);
+    return limbRotData.size() * sizeof(int16_t);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/PlayerAnimation.h b/soh/soh/resource/type/PlayerAnimation.h
index e44d30b1b4..db8e8ccf95 100644
--- a/soh/soh/resource/type/PlayerAnimation.h
+++ b/soh/soh/resource/type/PlayerAnimation.h
@@ -9,7 +9,8 @@ class PlayerAnimation : public Ship::Resource<int16_t> {
   public:
     using Resource::Resource;
 
-    PlayerAnimation() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    PlayerAnimation() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     int16_t* GetPointer();
     size_t GetPointerSize();
diff --git a/soh/soh/resource/type/Scene.cpp b/soh/soh/resource/type/Scene.cpp
index 15829c40e6..9b93e4aeaa 100644
--- a/soh/soh/resource/type/Scene.cpp
+++ b/soh/soh/resource/type/Scene.cpp
@@ -7,6 +7,6 @@ void* Scene::GetPointer() {
 }
 
 size_t Scene::GetPointerSize() {
-	return 0;
+    return 0;
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/Scene.h b/soh/soh/resource/type/Scene.h
index 722c518458..73fcd57a90 100644
--- a/soh/soh/resource/type/Scene.h
+++ b/soh/soh/resource/type/Scene.h
@@ -10,14 +10,15 @@
 namespace SOH {
 
 class Scene : public Ship::Resource<void> {
-public:
-  using Resource::Resource;
+  public:
+    using Resource::Resource;
 
-    Scene() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Scene() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     void* GetPointer();
-  size_t GetPointerSize();
+    size_t GetPointerSize();
 
-  std::vector<std::shared_ptr<ISceneCommand>> commands;
+    std::vector<std::shared_ptr<ISceneCommand>> commands;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp
index 883eacd19b..027da1790f 100644
--- a/soh/soh/resource/type/Skeleton.cpp
+++ b/soh/soh/resource/type/Skeleton.cpp
@@ -16,7 +16,7 @@ SkeletonData* Skeleton::GetPointer() {
 }
 
 size_t Skeleton::GetPointerSize() {
-    switch(type) {
+    switch (type) {
         case SkeletonType::Normal:
             return sizeof(skeletonData.skeletonHeader);
         case SkeletonType::Flex:
@@ -30,7 +30,6 @@ size_t Skeleton::GetPointerSize() {
 
 std::vector<SkeletonPatchInfo> SkeletonPatcher::skeletons;
 
-
 void SkeletonPatcher::RegisterSkeleton(std::string& path, SkelAnime* skelAnime) {
     SkeletonPatchInfo info;
 
@@ -56,8 +55,7 @@ void SkeletonPatcher::RegisterSkeleton(std::string& path, SkelAnime* skelAnime)
 void SkeletonPatcher::UnregisterSkeleton(SkelAnime* skelAnime) {
 
     // TODO: Should probably just use a dictionary here...
-    for (int i = 0; i < skeletons.size(); i++) 
-    {
+    for (int i = 0; i < skeletons.size(); i++) {
         auto skel = skeletons[i];
 
         if (skel.skelAnime == skelAnime) {
@@ -66,8 +64,7 @@ void SkeletonPatcher::UnregisterSkeleton(SkelAnime* skelAnime) {
         }
     }
 }
-void SkeletonPatcher::ClearSkeletons() 
-{
+void SkeletonPatcher::ClearSkeletons() {
     skeletons.clear();
 }
 
@@ -76,12 +73,15 @@ void SkeletonPatcher::UpdateSkeletons() {
     bool isAlt = resourceMgr->IsAltAssetsEnabled();
     for (auto skel : skeletons) {
         Skeleton* newSkel =
-            (Skeleton*)resourceMgr->LoadResource((isAlt ? Ship::IResource::gAltAssetPrefix : "") + skel.vanillaSkeletonPath, true).get();
+            (Skeleton*)resourceMgr
+                ->LoadResource((isAlt ? Ship::IResource::gAltAssetPrefix : "") + skel.vanillaSkeletonPath, true)
+                .get();
 
         if (newSkel != nullptr) {
             skel.skelAnime->skeleton = newSkel->skeletonData.skeletonHeader.segment;
             uintptr_t skelPtr = (uintptr_t)newSkel->GetPointer();
-            memcpy(&skel.skelAnime->skeletonHeader, &skelPtr, sizeof(uintptr_t)); // Dumb thing that needs to be done because cast is not cooperating
+            memcpy(&skel.skelAnime->skeletonHeader, &skelPtr,
+                   sizeof(uintptr_t)); // Dumb thing that needs to be done because cast is not cooperating
         }
     }
 }
@@ -141,11 +141,10 @@ void SkeletonPatcher::UpdateCustomSkeletonFromPath(const std::string& skeletonPa
 
     // If alt assets are on, look for alt tagged skeletons
     if (isAlt) {
-        altSkel = 
-            (Skeleton*)Ship::Context::GetInstance()
-                ->GetResourceManager()
-                ->LoadResource(Ship::IResource::gAltAssetPrefix + skeletonPath, true)
-                .get();
+        altSkel = (Skeleton*)Ship::Context::GetInstance()
+                      ->GetResourceManager()
+                      ->LoadResource(Ship::IResource::gAltAssetPrefix + skeletonPath, true)
+                      .get();
 
         // Override non-alt skeleton if necessary
         if (altSkel != nullptr) {
@@ -155,11 +154,7 @@ void SkeletonPatcher::UpdateCustomSkeletonFromPath(const std::string& skeletonPa
 
     // Load new skeleton based on the custom model if it exists
     if (altSkel == nullptr) {
-        newSkel = 
-            (Skeleton*)Ship::Context::GetInstance()
-                ->GetResourceManager()
-                ->LoadResource(skeletonPath, true)
-                .get();
+        newSkel = (Skeleton*)Ship::Context::GetInstance()->GetResourceManager()->LoadResource(skeletonPath, true).get();
     }
 
     // Change back to the original skeleton if no skeleton's were found
diff --git a/soh/soh/resource/type/Skeleton.h b/soh/soh/resource/type/Skeleton.h
index fce931c794..4d5dc01196 100644
--- a/soh/soh/resource/type/Skeleton.h
+++ b/soh/soh/resource/type/Skeleton.h
@@ -24,7 +24,7 @@ enum class SkeletonType {
 typedef struct {
     /* 0x00 */ void** segment;
     /* 0x04 */ uint8_t limbCount;
-               uint8_t skeletonType;
+    uint8_t skeletonType;
 } SkeletonHeader; // size = 0x8
 
 // Model has limbs with flexible meshes
@@ -54,14 +54,15 @@ class Skeleton : public Ship::Resource<SkeletonData> {
   public:
     using Resource::Resource;
 
-    Skeleton() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Skeleton() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     SkeletonData* GetPointer();
     size_t GetPointerSize();
 
     SkeletonType type;
     SkeletonData skeletonData;
-    
+
     LimbType limbType;
     int limbCount;
     int dListCount;
@@ -74,8 +75,7 @@ class Skeleton : public Ship::Resource<SkeletonData> {
 };
 
 // TODO: CLEAN THIS UP LATER
-struct SkeletonPatchInfo 
-{
+struct SkeletonPatchInfo {
     SkelAnime* skelAnime;
     std::string vanillaSkeletonPath;
 };
@@ -89,11 +89,11 @@ class SkeletonPatcher {
     static void UpdateCustomSkeletons();
 
     static std::vector<SkeletonPatchInfo> skeletons;
+
   private:
     inline static const std::string sOtr = "__OTR__";
     static void UpdateTunicSkeletons(SkeletonPatchInfo& skel);
     static void UpdateCustomSkeletonFromPath(const std::string& skeletonPath, SkeletonPatchInfo& skel);
 };
 
-
 } // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/SkeletonLimb.cpp b/soh/soh/resource/type/SkeletonLimb.cpp
index eb599e6411..ddc2e4d25a 100644
--- a/soh/soh/resource/type/SkeletonLimb.cpp
+++ b/soh/soh/resource/type/SkeletonLimb.cpp
@@ -6,7 +6,7 @@ SkeletonLimbData* SkeletonLimb::GetPointer() {
 }
 
 size_t SkeletonLimb::GetPointerSize() {
-    switch(limbType) {
+    switch (limbType) {
         case LimbType::Standard:
             return sizeof(limbData.standardLimb);
         case LimbType::LOD:
diff --git a/soh/soh/resource/type/SkeletonLimb.h b/soh/soh/resource/type/SkeletonLimb.h
index 04b815f05a..5ee73b99a2 100644
--- a/soh/soh/resource/type/SkeletonLimb.h
+++ b/soh/soh/resource/type/SkeletonLimb.h
@@ -14,12 +14,11 @@ enum class LimbType {
     Legacy,
 };
 
-enum class ZLimbSkinType
-{
-	SkinType_0,           // Segment = 0
-	SkinType_4 = 4,       // Segment = segmented address // Struct_800A5E28
-	SkinType_5 = 5,       // Segment = 0
-	SkinType_DList = 11,  // Segment = DList address
+enum class ZLimbSkinType {
+    SkinType_0,          // Segment = 0
+    SkinType_4 = 4,      // Segment = segmented address // Struct_800A5E28
+    SkinType_5 = 5,      // Segment = 0
+    SkinType_DList = 11, // Segment = DList address
 };
 
 /**
@@ -60,7 +59,7 @@ typedef struct {
     /* 0x06 */ u8 child;
     /* 0x07 */ u8 sibling;
     /* 0x08 */ Gfx* dLists[2]; // Near and far
-} LodLimb; // size = 0x10
+} LodLimb;                     // size = 0x10
 
 typedef struct {
     /* 0x00 */ Vec3s jointPos; // Root is position in model space, children are relative to parent
@@ -80,8 +79,9 @@ typedef struct {
     /* 0x06 */ u8 child;
     /* 0x07 */ u8 sibling;
     /* 0x08 */ s32 segmentType; // Type of data contained in segment
-    /* 0x0C */ void* segment; // Gfx* if segmentType is SKIN_LIMB_TYPE_NORMAL, SkinAnimatedLimbData* if segmentType is SKIN_LIMB_TYPE_ANIMATED, NULL otherwise
-} SkinLimb; // size = 0x10
+    /* 0x0C */ void* segment;   // Gfx* if segmentType is SKIN_LIMB_TYPE_NORMAL, SkinAnimatedLimbData* if segmentType is
+                                // SKIN_LIMB_TYPE_ANIMATED, NULL otherwise
+} SkinLimb;                     // size = 0x10
 
 typedef struct {
     /* 0x00 */ u16 totalVtxCount; // total vertex count for all modif entries
@@ -91,17 +91,18 @@ typedef struct {
 } SkinAnimatedLimbData; // size = 0xC
 
 union SkeletonLimbData {
-  LodLimb lodLimb;
-  StandardLimb standardLimb;
-  SkelCurveLimb skelCurveLimb;
-  SkinLimb skinLimb;
+    LodLimb lodLimb;
+    StandardLimb standardLimb;
+    SkelCurveLimb skelCurveLimb;
+    SkinLimb skinLimb;
 };
 
 class SkeletonLimb : public Ship::Resource<SkeletonLimbData> {
-public:
-  using Resource::Resource;
+  public:
+    using Resource::Resource;
 
-    SkeletonLimb() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    SkeletonLimb() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     SkeletonLimbData* GetPointer();
     size_t GetPointerSize();
diff --git a/soh/soh/resource/type/Text.cpp b/soh/soh/resource/type/Text.cpp
index 4678dbbadf..3ac8f0d2dc 100644
--- a/soh/soh/resource/type/Text.cpp
+++ b/soh/soh/resource/type/Text.cpp
@@ -6,6 +6,6 @@ MessageEntry* Text::GetPointer() {
 }
 
 size_t Text::GetPointerSize() {
-	return messages.size() * sizeof(MessageEntry);
+    return messages.size() * sizeof(MessageEntry);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h
index 1ad8c96634..5352037162 100644
--- a/soh/soh/resource/type/Text.h
+++ b/soh/soh/resource/type/Text.h
@@ -7,24 +7,24 @@
 
 namespace SOH {
 // TODO: we've moved away from using classes for this stuff
-class MessageEntry
-{
-public:
-	uint16_t id;
-	uint8_t textboxType;
-	uint8_t textboxYPos;
-	std::string msg;
+class MessageEntry {
+  public:
+    uint16_t id;
+    uint8_t textboxType;
+    uint8_t textboxYPos;
+    std::string msg;
 };
 
 class Text : public Ship::Resource<MessageEntry> {
-public:
-  using Resource::Resource;
+  public:
+    using Resource::Resource;
 
-    Text() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    Text() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
 
     MessageEntry* GetPointer();
     size_t GetPointerSize();
 
     std::vector<MessageEntry> messages;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/EndMarker.cpp b/soh/soh/resource/type/scenecommand/EndMarker.cpp
index ba88981870..9b9fc0960b 100644
--- a/soh/soh/resource/type/scenecommand/EndMarker.cpp
+++ b/soh/soh/resource/type/scenecommand/EndMarker.cpp
@@ -6,6 +6,6 @@ Marker* EndMarker::GetPointer() {
 }
 
 size_t EndMarker::GetPointerSize() {
-	return sizeof(Marker);
+    return sizeof(Marker);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h
index 4f45051c2b..37b06911d0 100644
--- a/soh/soh/resource/type/scenecommand/EndMarker.h
+++ b/soh/soh/resource/type/scenecommand/EndMarker.h
@@ -21,4 +21,4 @@ class EndMarker : public SceneCommand<Marker> {
 
     Marker endMarker;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/RomFile.h b/soh/soh/resource/type/scenecommand/RomFile.h
index 19a5545e75..5262ce6499 100644
--- a/soh/soh/resource/type/scenecommand/RomFile.h
+++ b/soh/soh/resource/type/scenecommand/RomFile.h
@@ -3,9 +3,9 @@
 #include <cstdint>
 
 namespace SOH {
-    typedef struct {
-        /* 0x00 */ uintptr_t vromStart;
-        /* 0x04 */ uintptr_t vromEnd;
-        char* fileName;
-    } RomFile; // size = 0x8
-}
\ No newline at end of file
+typedef struct {
+    /* 0x00 */ uintptr_t vromStart;
+    /* 0x04 */ uintptr_t vromEnd;
+    char* fileName;
+} RomFile; // size = 0x8
+} // namespace SOH
\ No newline at end of file
diff --git a/soh/soh/resource/type/scenecommand/SceneCommand.h b/soh/soh/resource/type/scenecommand/SceneCommand.h
index 04216e09b6..99234b24a9 100644
--- a/soh/soh/resource/type/scenecommand/SceneCommand.h
+++ b/soh/soh/resource/type/scenecommand/SceneCommand.h
@@ -48,9 +48,10 @@ enum class SceneCommandID : uint8_t {
 };
 
 class ISceneCommand : public Ship::IResource {
-public:
+  public:
     using IResource::IResource;
-    ISceneCommand() : IResource(std::shared_ptr<Ship::ResourceInitData>()) {}
+    ISceneCommand() : IResource(std::shared_ptr<Ship::ResourceInitData>()) {
+    }
     SceneCommandID cmdId;
 };
 
@@ -63,4 +64,4 @@ template <class T> class SceneCommand : public ISceneCommand {
     }
 };
 
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetActorList.cpp b/soh/soh/resource/type/scenecommand/SetActorList.cpp
index 5bb62e7645..3f33afb723 100644
--- a/soh/soh/resource/type/scenecommand/SetActorList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetActorList.cpp
@@ -6,6 +6,6 @@ ActorEntry* SetActorList::GetPointer() {
 }
 
 size_t SetActorList::GetPointerSize() {
-	return actorList.size() * sizeof(ActorEntry);
+    return actorList.size() * sizeof(ActorEntry);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetActorList.h b/soh/soh/resource/type/scenecommand/SetActorList.h
index 0eb53c5859..d4ee3a9025 100644
--- a/soh/soh/resource/type/scenecommand/SetActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetActorList.h
@@ -11,10 +11,10 @@
 
 namespace SOH {
 typedef struct {
-    /* 0x00 */ s16   id;
+    /* 0x00 */ s16 id;
     /* 0x02 */ Vec3s pos;
     /* 0x08 */ Vec3s rot;
-    /* 0x0E */ s16   params;
+    /* 0x0E */ s16 params;
 } ActorEntry; // size = 0x10
 
 class SetActorList : public SceneCommand<ActorEntry> {
@@ -27,4 +27,4 @@ class SetActorList : public SceneCommand<ActorEntry> {
     uint32_t numActors;
     std::vector<ActorEntry> actorList;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
index 596e0a22ea..11dabd31f3 100644
--- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
+++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
@@ -10,7 +10,6 @@
 #include "RomFile.h"
 #include <libultraship/libultra/types.h>
 
-
 namespace SOH {
 
 class SetAlternateHeaders : public SceneCommand<void> {
@@ -24,4 +23,4 @@ class SetAlternateHeaders : public SceneCommand<void> {
     std::vector<std::string> headerFileNames;
     std::vector<std::shared_ptr<Scene>> headers;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp b/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp
index 5c41f1c8f1..287a291eac 100644
--- a/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp
@@ -6,6 +6,6 @@ CameraSettings* SetCameraSettings::GetPointer() {
 }
 
 size_t SetCameraSettings::GetPointerSize() {
-	return sizeof(CameraSettings);
+    return sizeof(CameraSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
index 1d8062f9af..ad674d3062 100644
--- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
@@ -9,8 +9,8 @@
 
 namespace SOH {
 typedef struct {
-  int8_t cameraMovement;
-  int32_t worldMapArea;
+    int8_t cameraMovement;
+    int32_t worldMapArea;
 } CameraSettings;
 
 class SetCameraSettings : public SceneCommand<CameraSettings> {
@@ -22,4 +22,4 @@ class SetCameraSettings : public SceneCommand<CameraSettings> {
 
     CameraSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp b/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp
index a1c22b9ea7..a50fecee68 100644
--- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp
+++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp
@@ -12,6 +12,6 @@ size_t SetCollisionHeader::GetPointerSize() {
     if (collisionHeader == nullptr) {
         return 0;
     }
-	return collisionHeader->GetPointerSize();
+    return collisionHeader->GetPointerSize();
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
index e2f63d0891..b246732428 100644
--- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
+++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
@@ -21,4 +21,4 @@ class SetCollisionHeader : public SceneCommand<CollisionHeaderData> {
 
     std::shared_ptr<CollisionHeader> collisionHeader;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.cpp b/soh/soh/resource/type/scenecommand/SetCsCamera.cpp
index 762ee1e658..2f82f4e7d2 100644
--- a/soh/soh/resource/type/scenecommand/SetCsCamera.cpp
+++ b/soh/soh/resource/type/scenecommand/SetCsCamera.cpp
@@ -6,6 +6,6 @@ CsCamera* SetCsCamera::GetPointer() {
 }
 
 size_t SetCsCamera::GetPointerSize() {
-	return sizeof(CsCamera);
+    return sizeof(CsCamera);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h
index c44d9f935a..fbd51e06ca 100644
--- a/soh/soh/resource/type/scenecommand/SetCsCamera.h
+++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h
@@ -21,4 +21,4 @@ class SetCsCamera : public SceneCommand<CsCamera> {
 
     CsCamera csCamera;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.cpp b/soh/soh/resource/type/scenecommand/SetCutscenes.cpp
index 6643eda472..7b002e8137 100644
--- a/soh/soh/resource/type/scenecommand/SetCutscenes.cpp
+++ b/soh/soh/resource/type/scenecommand/SetCutscenes.cpp
@@ -12,6 +12,6 @@ size_t SetCutscenes::GetPointerSize() {
     if (cutscene == nullptr) {
         return 0;
     }
-	return cutscene->GetPointerSize();
+    return cutscene->GetPointerSize();
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.h b/soh/soh/resource/type/scenecommand/SetCutscenes.h
index be74770c0d..5ad28d4ae1 100644
--- a/soh/soh/resource/type/scenecommand/SetCutscenes.h
+++ b/soh/soh/resource/type/scenecommand/SetCutscenes.h
@@ -20,4 +20,4 @@ class SetCutscenes : public SceneCommand<uint32_t> {
     std::string fileName;
     std::shared_ptr<Cutscene> cutscene;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp b/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp
index d4b2b1e150..579f93aea6 100644
--- a/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp
@@ -6,6 +6,6 @@ EchoSettings* SetEchoSettings::GetPointer() {
 }
 
 size_t SetEchoSettings::GetPointerSize() {
-	return sizeof(EchoSettings);
+    return sizeof(EchoSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
index 30f54d1b3d..2d17a879e0 100644
--- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
@@ -9,7 +9,7 @@
 
 namespace SOH {
 typedef struct {
-  int8_t echo;
+    int8_t echo;
 } EchoSettings;
 
 class SetEchoSettings : public SceneCommand<EchoSettings> {
@@ -21,4 +21,4 @@ class SetEchoSettings : public SceneCommand<EchoSettings> {
 
     EchoSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.cpp b/soh/soh/resource/type/scenecommand/SetEntranceList.cpp
index e82711da24..d23e39a03b 100644
--- a/soh/soh/resource/type/scenecommand/SetEntranceList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetEntranceList.cpp
@@ -6,6 +6,6 @@ EntranceEntry* SetEntranceList::GetPointer() {
 }
 
 size_t SetEntranceList::GetPointerSize() {
-	return entrances.size() * sizeof(EntranceEntry);
+    return entrances.size() * sizeof(EntranceEntry);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h
index 7c41b4b046..e41050c87f 100644
--- a/soh/soh/resource/type/scenecommand/SetEntranceList.h
+++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h
@@ -25,4 +25,4 @@ class SetEntranceList : public SceneCommand<EntranceEntry> {
 
     std::vector<EntranceEntry> entrances;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetExitList.cpp b/soh/soh/resource/type/scenecommand/SetExitList.cpp
index 3de483b0e7..6ed71368c0 100644
--- a/soh/soh/resource/type/scenecommand/SetExitList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetExitList.cpp
@@ -6,6 +6,6 @@ uint16_t* SetExitList::GetPointer() {
 }
 
 size_t SetExitList::GetPointerSize() {
-	return exits.size() * sizeof(int16_t);
+    return exits.size() * sizeof(int16_t);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetExitList.h b/soh/soh/resource/type/scenecommand/SetExitList.h
index f97f11d1e9..56026075fd 100644
--- a/soh/soh/resource/type/scenecommand/SetExitList.h
+++ b/soh/soh/resource/type/scenecommand/SetExitList.h
@@ -19,4 +19,4 @@ class SetExitList : public SceneCommand<uint16_t> {
 
     std::vector<uint16_t> exits;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetLightList.cpp b/soh/soh/resource/type/scenecommand/SetLightList.cpp
index 459e957cbc..5e12624baf 100644
--- a/soh/soh/resource/type/scenecommand/SetLightList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetLightList.cpp
@@ -6,6 +6,6 @@ LightInfo* SetLightList::GetPointer() {
 }
 
 size_t SetLightList::GetPointerSize() {
-	return lightList.size() * sizeof(LightInfo);
+    return lightList.size() * sizeof(LightInfo);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h
index c3ede1f16d..d79a73aecf 100644
--- a/soh/soh/resource/type/scenecommand/SetLightList.h
+++ b/soh/soh/resource/type/scenecommand/SetLightList.h
@@ -35,7 +35,7 @@ typedef struct {
     /* 0x2 */ LightParams params;
 } LightInfo; // size = 0xE
 
-class SetLightList : public SceneCommand<LightInfo> {
+class SetLightList final : public SceneCommand<LightInfo> {
   public:
     using SceneCommand::SceneCommand;
 
@@ -45,4 +45,4 @@ class SetLightList : public SceneCommand<LightInfo> {
     uint32_t numLights;
     std::vector<LightInfo> lightList;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp b/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp
index 042062512a..b660d5e1ae 100644
--- a/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp
@@ -6,6 +6,6 @@ EnvLightSettings* SetLightingSettings::GetPointer() {
 }
 
 size_t SetLightingSettings::GetPointerSize() {
-	return settings.size() * sizeof(EnvLightSettings);
+    return settings.size() * sizeof(EnvLightSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.h b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
index b8f08d8345..cb20895175 100644
--- a/soh/soh/resource/type/scenecommand/SetLightingSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
@@ -19,7 +19,7 @@ typedef struct {
     /* 0x14 */ s16 fogFar;
 } EnvLightSettings; // size = 0x16
 
-class SetLightingSettings : public SceneCommand<EnvLightSettings> {
+class SetLightingSettings final : public SceneCommand<EnvLightSettings> {
   public:
     using SceneCommand::SceneCommand;
 
@@ -28,4 +28,4 @@ class SetLightingSettings : public SceneCommand<EnvLightSettings> {
 
     std::vector<EnvLightSettings> settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetMesh.cpp b/soh/soh/resource/type/scenecommand/SetMesh.cpp
index 1e2cd396c2..eb286f7e03 100644
--- a/soh/soh/resource/type/scenecommand/SetMesh.cpp
+++ b/soh/soh/resource/type/scenecommand/SetMesh.cpp
@@ -6,6 +6,6 @@ MeshHeader* SetMesh::GetPointer() {
 }
 
 size_t SetMesh::GetPointerSize() {
-	return sizeof(MeshHeader);
+    return sizeof(MeshHeader);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h
index 5d4f99c6b6..d96661c438 100644
--- a/soh/soh/resource/type/scenecommand/SetMesh.h
+++ b/soh/soh/resource/type/scenecommand/SetMesh.h
@@ -10,48 +10,48 @@
 
 namespace SOH {
 typedef struct {
-    /* 0x00 */ u8    type;
+    /* 0x00 */ u8 type;
 } PolygonBase;
 
 typedef struct {
     /* 0x00 */ PolygonBase base;
-    /* 0x01 */ u8    num; // number of dlist entries
+    /* 0x01 */ u8 num; // number of dlist entries
     /* 0x04 */ void* start;
     /* 0x08 */ void* end;
 } PolygonType0; // size = 0xC
 
 typedef struct {
-    /* 0x00 */ u16   unk_00;
-    /* 0x02 */ u8    id;
+    /* 0x00 */ u16 unk_00;
+    /* 0x02 */ u8 id;
     /* 0x04 */ void* source;
-    /* 0x08 */ u32   unk_0C;
-    /* 0x0C */ u32   tlut;
-    /* 0x10 */ u16   width;
-    /* 0x12 */ u16   height;
-    /* 0x14 */ u8    fmt;
-    /* 0x15 */ u8    siz;
-    /* 0x16 */ u16   mode0;
-    /* 0x18 */ u16   tlutCount;
+    /* 0x08 */ u32 unk_0C;
+    /* 0x0C */ u32 tlut;
+    /* 0x10 */ u16 width;
+    /* 0x12 */ u16 height;
+    /* 0x14 */ u8 fmt;
+    /* 0x15 */ u8 siz;
+    /* 0x16 */ u16 mode0;
+    /* 0x18 */ u16 tlutCount;
 } BgImage; // size = 0x1C
 
 typedef struct {
     /* 0x00 */ PolygonBase base;
-    /* 0x01 */ u8    format; // 1 = single, 2 = multi
-    /* 0x04 */ Gfx*  dlist;
+    /* 0x01 */ u8 format; // 1 = single, 2 = multi
+    /* 0x04 */ Gfx* dlist;
     union {
         struct {
             /* 0x08 */ void* source;
-            /* 0x0C */ u32   unk_0C;
+            /* 0x0C */ u32 unk_0C;
             /* 0x10 */ void* tlut;
-            /* 0x14 */ u16   width;
-            /* 0x16 */ u16   height;
-            /* 0x18 */ u8    fmt;
-            /* 0x19 */ u8    siz;
-            /* 0x1A */ u16   mode0;
-            /* 0x1C */ u16   tlutCount;
+            /* 0x14 */ u16 width;
+            /* 0x16 */ u16 height;
+            /* 0x18 */ u8 fmt;
+            /* 0x19 */ u8 siz;
+            /* 0x1A */ u16 mode0;
+            /* 0x1C */ u16 tlutCount;
         } single;
         struct {
-            /* 0x08 */ u8    count;
+            /* 0x08 */ u8 count;
             /* 0x0C */ BgImage* list;
         } multi;
     };
@@ -59,13 +59,13 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ PolygonBase base;
-    /* 0x01 */ u8    num; // number of dlist entries
+    /* 0x01 */ u8 num; // number of dlist entries
     /* 0x04 */ void* start;
     /* 0x08 */ void* end;
 } PolygonType2; // size = 0xC
 
 typedef union {
-    PolygonBase  base;
+    PolygonBase base;
     PolygonType0 polygon0;
     PolygonType1 polygon1;
     PolygonType2 polygon2;
@@ -73,9 +73,9 @@ typedef union {
 
 typedef struct {
     /* 0x00 */ Vec3s pos;
-    /* 0x06 */ s16   unk_06;
-    /* 0x08 */ Gfx*  opa;
-    /* 0x0C */ Gfx*  xlu;
+    /* 0x06 */ s16 unk_06;
+    /* 0x08 */ Gfx* opa;
+    /* 0x0C */ Gfx* xlu;
 } PolygonDlist2; // size = 0x8
 
 typedef struct {
@@ -102,4 +102,4 @@ class SetMesh : public SceneCommand<MeshHeader> {
     std::vector<BgImage> images;
     MeshHeader meshHeader;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.cpp b/soh/soh/resource/type/scenecommand/SetObjectList.cpp
index 04aeb27d09..16399b38f8 100644
--- a/soh/soh/resource/type/scenecommand/SetObjectList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetObjectList.cpp
@@ -6,6 +6,6 @@ int16_t* SetObjectList::GetPointer() {
 }
 
 size_t SetObjectList::GetPointerSize() {
-	return objects.size() * sizeof(int16_t);
+    return objects.size() * sizeof(int16_t);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h
index e843d4db06..74081763ad 100644
--- a/soh/soh/resource/type/scenecommand/SetObjectList.h
+++ b/soh/soh/resource/type/scenecommand/SetObjectList.h
@@ -19,4 +19,4 @@ class SetObjectList : public SceneCommand<int16_t> {
     uint32_t numObjects;
     std::vector<int16_t> objects;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetPathways.h b/soh/soh/resource/type/scenecommand/SetPathways.h
index 9f22130a62..377b5923de 100644
--- a/soh/soh/resource/type/scenecommand/SetPathways.h
+++ b/soh/soh/resource/type/scenecommand/SetPathways.h
@@ -21,4 +21,4 @@ class SetPathways : public SceneCommand<PathData*> {
     std::vector<std::string> pathFileNames;
     std::vector<PathData*> paths;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp b/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp
index 11bb4e95f5..f99bd77c80 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp
+++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp
@@ -6,6 +6,6 @@ RoomBehavior* SetRoomBehavior::GetPointer() {
 }
 
 size_t SetRoomBehavior::GetPointerSize() {
-	return sizeof(RoomBehavior);
+    return sizeof(RoomBehavior);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
index c05e96a66b..db59fa76b2 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
@@ -9,8 +9,8 @@
 
 namespace SOH {
 typedef struct {
-  int8_t gameplayFlags;
-  int32_t gameplayFlags2;
+    int8_t gameplayFlags;
+    int32_t gameplayFlags2;
 } RoomBehavior;
 
 class SetRoomBehavior : public SceneCommand<RoomBehavior> {
@@ -22,4 +22,4 @@ class SetRoomBehavior : public SceneCommand<RoomBehavior> {
 
     RoomBehavior roomBehavior;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.cpp b/soh/soh/resource/type/scenecommand/SetRoomList.cpp
index c81d3645e7..e7b8daf0b0 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetRoomList.cpp
@@ -6,6 +6,6 @@ RomFile* SetRoomList::GetPointer() {
 }
 
 size_t SetRoomList::GetPointerSize() {
-	return rooms.size() * sizeof(RomFile);
+    return rooms.size() * sizeof(RomFile);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h
index 09ba46f220..b60a75dbe8 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomList.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomList.h
@@ -9,7 +9,6 @@
 #include "RomFile.h"
 #include <libultraship/libultra/types.h>
 
-
 namespace SOH {
 // typedef struct {
 //     /* 0x00 */ uintptr_t vromStart;
@@ -29,4 +28,4 @@ class SetRoomList : public SceneCommand<RomFile> {
     std::vector<std::string> fileNames;
     std::vector<RomFile> rooms;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp
index 122d93d773..3066ead433 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp
@@ -6,6 +6,6 @@ SkyboxModifier* SetSkyboxModifier::GetPointer() {
 }
 
 size_t SetSkyboxModifier::GetPointerSize() {
-	return sizeof(SkyboxModifier);
+    return sizeof(SkyboxModifier);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
index a60adfcaf4..7ed86ddc5b 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
@@ -9,8 +9,8 @@
 
 namespace SOH {
 typedef struct {
-  uint8_t skyboxDisabled;
-  uint8_t sunMoonDisabled;
+    uint8_t skyboxDisabled;
+    uint8_t sunMoonDisabled;
 } SkyboxModifier;
 
 class SetSkyboxModifier : public SceneCommand<SkyboxModifier> {
@@ -22,4 +22,4 @@ class SetSkyboxModifier : public SceneCommand<SkyboxModifier> {
 
     SkyboxModifier modifier;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp
index 527f0462c5..031e15b8cc 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp
@@ -6,6 +6,6 @@ SkyboxSettings* SetSkyboxSettings::GetPointer() {
 }
 
 size_t SetSkyboxSettings::GetPointerSize() {
-	return sizeof(SetSkyboxSettings);
+    return sizeof(SetSkyboxSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
index f256e103e3..d3d7b5a4c1 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
@@ -9,10 +9,10 @@
 
 namespace SOH {
 typedef struct {
-  uint8_t unk;
-  uint8_t skyboxId;
-  uint8_t weather;
-  uint8_t indoors;
+    uint8_t unk;
+    uint8_t skyboxId;
+    uint8_t weather;
+    uint8_t indoors;
 } SkyboxSettings;
 
 class SetSkyboxSettings : public SceneCommand<SkyboxSettings> {
@@ -24,4 +24,4 @@ class SetSkyboxSettings : public SceneCommand<SkyboxSettings> {
 
     SkyboxSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp b/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp
index c136d34db1..2df7e325cb 100644
--- a/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp
@@ -6,6 +6,6 @@ SoundSettings* SetSoundSettings::GetPointer() {
 }
 
 size_t SetSoundSettings::GetPointerSize() {
-	return sizeof(SoundSettings);
+    return sizeof(SoundSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
index b72c2b74db..57e3beaae6 100644
--- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
@@ -9,9 +9,9 @@
 
 namespace SOH {
 typedef struct {
-  uint8_t seqId;
-  uint8_t natureAmbienceId;
-  uint8_t reverb;
+    uint8_t seqId;
+    uint8_t natureAmbienceId;
+    uint8_t reverb;
 } SoundSettings;
 
 class SetSoundSettings : public SceneCommand<SoundSettings> {
@@ -23,4 +23,4 @@ class SetSoundSettings : public SceneCommand<SoundSettings> {
 
     SoundSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp b/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp
index 304ab514c0..dae2f13858 100644
--- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp
+++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp
@@ -6,6 +6,6 @@ SpecialObjects* SetSpecialObjects::GetPointer() {
 }
 
 size_t SetSpecialObjects::GetPointerSize() {
-	return sizeof(SpecialObjects);
+    return sizeof(SpecialObjects);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
index 2a8906461e..51a57c5996 100644
--- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
+++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
@@ -9,8 +9,8 @@
 
 namespace SOH {
 typedef struct {
-  int8_t elfMessage;
-  int16_t globalObject;
+    int8_t elfMessage;
+    int16_t globalObject;
 } SpecialObjects;
 
 class SetSpecialObjects : public SceneCommand<SpecialObjects> {
@@ -22,4 +22,4 @@ class SetSpecialObjects : public SceneCommand<SpecialObjects> {
 
     SpecialObjects specialObjects;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp b/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp
index 5fa17b2a05..2b8ab450b4 100644
--- a/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp
@@ -6,6 +6,6 @@ ActorEntry* SetStartPositionList::GetPointer() {
 }
 
 size_t SetStartPositionList::GetPointerSize() {
-	return startPositions.size() * sizeof(ActorEntry);
+    return startPositions.size() * sizeof(ActorEntry);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.h b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
index 28d2d0d315..f2b097b0c7 100644
--- a/soh/soh/resource/type/scenecommand/SetStartPositionList.h
+++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
@@ -27,4 +27,4 @@ class SetStartPositionList : public SceneCommand<ActorEntry> {
     uint32_t numStartPositions;
     std::vector<ActorEntry> startPositions;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp b/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp
index c9380a0a08..8ff2525f37 100644
--- a/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp
@@ -6,6 +6,6 @@ TimeSettings* SetTimeSettings::GetPointer() {
 }
 
 size_t SetTimeSettings::GetPointerSize() {
-	return sizeof(TimeSettings);
+    return sizeof(TimeSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.h b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
index cd47e33dcf..ca95841e77 100644
--- a/soh/soh/resource/type/scenecommand/SetTimeSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
@@ -9,9 +9,9 @@
 
 namespace SOH {
 typedef struct {
-  uint8_t hour;
-  uint8_t minute;
-  uint8_t timeIncrement;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t timeIncrement;
 } TimeSettings;
 
 class SetTimeSettings : public SceneCommand<TimeSettings> {
@@ -23,4 +23,4 @@ class SetTimeSettings : public SceneCommand<TimeSettings> {
 
     TimeSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp b/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp
index c944e99f22..961778e112 100644
--- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp
+++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp
@@ -6,6 +6,6 @@ TransitionActorEntry* SetTransitionActorList::GetPointer() {
 }
 
 size_t SetTransitionActorList::GetPointerSize() {
-	return transitionActorList.size() * sizeof(TransitionActorEntry);
+    return transitionActorList.size() * sizeof(TransitionActorEntry);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
index 389526b0d7..e740f128ad 100644
--- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
@@ -12,13 +12,13 @@
 namespace SOH {
 typedef struct {
     struct {
-        s8 room;    // Room to switch to
-        s8 effects; // How the camera reacts during the transition
+        s8 room;           // Room to switch to
+        s8 effects;        // How the camera reacts during the transition
     } /* 0x00 */ sides[2]; // 0 = front, 1 = back
-    /* 0x04 */ s16   id;
+    /* 0x04 */ s16 id;
     /* 0x06 */ Vec3s pos;
-    /* 0x0C */ s16   rotY;
-    /* 0x0E */ s16   params;
+    /* 0x0C */ s16 rotY;
+    /* 0x0E */ s16 params;
 } TransitionActorEntry; // size = 0x10
 
 class SetTransitionActorList : public SceneCommand<TransitionActorEntry> {
@@ -31,4 +31,4 @@ class SetTransitionActorList : public SceneCommand<TransitionActorEntry> {
     uint32_t numTransitionActors;
     std::vector<TransitionActorEntry> transitionActorList;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.cpp b/soh/soh/resource/type/scenecommand/SetWindSettings.cpp
index 64bc8ecc8e..e1ffb70040 100644
--- a/soh/soh/resource/type/scenecommand/SetWindSettings.cpp
+++ b/soh/soh/resource/type/scenecommand/SetWindSettings.cpp
@@ -6,6 +6,6 @@ WindSettings* SetWindSettings::GetPointer() {
 }
 
 size_t SetWindSettings::GetPointerSize() {
-	return sizeof(WindSettings);
+    return sizeof(WindSettings);
 }
 } // namespace SOH
diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h
index f3f9da968e..755ad0d0da 100644
--- a/soh/soh/resource/type/scenecommand/SetWindSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h
@@ -9,10 +9,10 @@
 
 namespace SOH {
 typedef struct {
-  int8_t windWest;
-  int8_t windVertical;
-  int8_t windSouth;
-  uint8_t windSpeed;
+    int8_t windWest;
+    int8_t windVertical;
+    int8_t windSouth;
+    uint8_t windSpeed;
 } WindSettings;
 
 class SetWindSettings : public SceneCommand<WindSettings> {
@@ -24,4 +24,4 @@ class SetWindSettings : public SceneCommand<WindSettings> {
 
     WindSettings settings;
 };
-}; // namespace LUS
+}; // namespace SOH
diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c
index 99105d9f08..118b36e724 100644
--- a/soh/soh/stubs.c
+++ b/soh/soh/stubs.c
@@ -8,7 +8,7 @@
 
 u32 osResetType;
 u32 osTvType = OS_TV_NTSC;
-//u32 osTvType = OS_TV_PAL;
+// u32 osTvType = OS_TV_PAL;
 OSViMode osViModeNtscLan1;
 OSViMode osViModeMpalLan1;
 OSViMode osViModeFpalLan1;
@@ -31,249 +31,200 @@ u8 osAppNmiBuffer[2048];
 
 f32 qNaN0x10000 = 0x7F810000;
 
-//void gSPTextureRectangle(Gfx* pkt, s32 xl, s32 yl, s32 xh, s32 yh, u32 tile, u32 s, s32 t, u32 dsdx, u32 dtdy)
+// void gSPTextureRectangle(Gfx* pkt, s32 xl, s32 yl, s32 xh, s32 yh, u32 tile, u32 s, s32 t, u32 dsdx, u32 dtdy)
 //{
 //	__gSPTextureRectangle(pkt, xl, yl, xh, yh, tile, s, t, dsdx, dtdy);
-//}
+// }
 
-OSId osGetThreadId(OSThread* thread)
-{
+OSId osGetThreadId(OSThread* thread) {
 }
 
-OSPri osGetThreadPri(OSThread* thread)
-{
+OSPri osGetThreadPri(OSThread* thread) {
 }
 
-void osSetThreadPri(OSThread* thread, OSPri pri)
-{
+void osSetThreadPri(OSThread* thread, OSPri pri) {
 }
 
-void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt)
-{
-
+void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt) {
 }
 
-s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes)
-{
-
+s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes) {
 }
 
-s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data)
-{
-
+s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) {
 }
 
-s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, ptrdiff_t size, u8* data)
-{
-
+s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, ptrdiff_t size, u8* data) {
 }
 
-s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName)
-{
-
+s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName) {
 }
 
-s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state)
-{
-
+s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) {
 }
 
-s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 channel)
-{
-
+s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 channel) {
 }
 
-s32 __osPfsCheckRamArea(OSPfs* pfs)
-{
-
+s32 __osPfsCheckRamArea(OSPfs* pfs) {
 }
 
-s32 osPfsChecker(OSPfs* pfs)
-{
-
+s32 osPfsChecker(OSPfs* pfs) {
 }
 
-s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo)
-{
-
+s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo) {
 }
 
-s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 length, s32* fileNo)
-{
-
+s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 length, s32* fileNo) {
 }
 
-OSIntMask osSetIntMask(OSIntMask a)
-{
-	return 0;
+OSIntMask osSetIntMask(OSIntMask a) {
+    return 0;
 }
 
-s32 osAfterPreNMI(void)
-{
-	return 0;
+s32 osAfterPreNMI(void) {
+    return 0;
 }
 
-s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel)
-{
-
+s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel) {
 }
 
-s32 osSetRumble(OSPfs* pfs, u32 vibrate)
-{
-	return 0;
+s32 osSetRumble(OSPfs* pfs, u32 vibrate) {
+    return 0;
 }
 
-void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri)
-{
-
+void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) {
 }
 
-void osStartThread(OSThread* thread)
-{
-
+void osStartThread(OSThread* thread) {
 }
 
-void osStopThread(OSThread* thread)
-{
-
+void osStopThread(OSThread* thread) {
 }
 
-void osDestroyThread(OSThread* thread)
-{
-
+void osDestroyThread(OSThread* thread) {
 }
 
-void osWritebackDCache(void* vaddr, s32 nbytes)
-{
-
+void osWritebackDCache(void* vaddr, s32 nbytes) {
 }
 
-void osInvalICache(void* vaddr, s32 nbytes)
-{
-
+void osInvalICache(void* vaddr, s32 nbytes) {
 }
 
-s32 osContStartQuery(OSMesgQueue* mq)
-{
-
+s32 osContStartQuery(OSMesgQueue* mq) {
 }
 
-void osContGetQuery(OSContStatus* data)
-{
-
+void osContGetQuery(OSContStatus* data) {
 }
 
-u32 __osGetFpcCsr()
-{
-	return 0;
+u32 __osGetFpcCsr() {
+    return 0;
 }
 
-void __osSetFpcCsr(u32 a0)
-{
-
+void __osSetFpcCsr(u32 a0) {
 }
 
-s32 __osDisableInt(void)
-{
-
+s32 __osDisableInt(void) {
 }
 
-void __osRestoreInt(s32 a0)
-{
-
+void __osRestoreInt(s32 a0) {
 }
 
-OSThread* __osGetActiveQueue(void)
-{
-
+OSThread* __osGetActiveQueue(void) {
 }
 
-OSThread* __osGetCurrFaultedThread(void)
-{
-
+OSThread* __osGetCurrFaultedThread(void) {
 }
 
 u32 osMemSize = 1024 * 1024 * 1024;
 
-void Audio_osInvalDCache(void* buf, s32 size)
-{
-
+void Audio_osInvalDCache(void* buf, s32 size) {
 }
 
-void Audio_osWritebackDCache(void* mem, s32 size)
-{
-
+void Audio_osWritebackDCache(void* mem, s32 size) {
 }
 
+s32 osAiSetFrequency(u32 freq) {
+    // this is based off the math from the original method
+    /*
 
-s32 osAiSetFrequency(u32 freq)
-{
-	return 1;
+    s32 osAiSetFrequency(u32 frequency) {
+        u8 bitrate;
+        f32 dacRateF = ((f32)osViClock / frequency) + 0.5f;
+        u32 dacRate = dacRateF;
+
+        if (dacRate < 132) {
+            return -1;
+        }
+
+        bitrate = (dacRate / 66);
+        if (bitrate > 16) {
+            bitrate = 16;
+        }
+
+        HW_REG(AI_DACRATE_REG, u32) = dacRate - 1;
+        HW_REG(AI_BITRATE_REG, u32) = bitrate - 1;
+        return osViClock / (s32)dacRate;
+    }
+
+    */
+
+    // bitrate is unused
+
+    // osViClock comes from
+    // #define VI_NTSC_CLOCK 48681812 /* Hz = 48.681812 MHz */
+    // s32 osViClock = VI_NTSC_CLOCK;
+
+    // frequency was originally 32000
+
+    // given all of that, dacRate is
+    // (u32)(((f32)48681812 / 32000) + 0.5f)
+    // which evaluates to 1521 (which is > 132)
+
+    // this leaves us with a final calculation of
+    // 48681812 / 1521
+    // which evaluates to 32006
+
+    return 32006;
 }
 
-void osInvalDCache(void* vaddr, s32 nbytes)
-{
-
+void osInvalDCache(void* vaddr, s32 nbytes) {
 }
 
-void osWritebackDCacheAll(void)
-{
-
+void osWritebackDCacheAll(void) {
 }
 
-void Audio_SetBGM(u32 bgmId)
-{
-
+void Audio_SetBGM(u32 bgmId) {
 }
 
-s32 osContSetCh(u8 ch)
-{
-
+s32 osContSetCh(u8 ch) {
 }
 
-u32 osDpGetStatus(void)
-{
-
+u32 osDpGetStatus(void) {
 }
 
-void osDpSetStatus(u32 status)
-{
-
+void osDpSetStatus(u32 status) {
 }
 
-u32 __osSpGetStatus()
-{
-
+u32 __osSpGetStatus() {
 }
 
-void __osSpSetStatus(u32 status)
-{
-
+void __osSpSetStatus(u32 status) {
 }
 
-OSPiHandle* osDriveRomInit()
-{
-	
+OSPiHandle* osDriveRomInit() {
 }
 
-void __osInitialize_common(void)
-{
-
+void __osInitialize_common(void) {
 }
 
-void __osInitialize_autodetect(void)
-{
-
+void __osInitialize_autodetect(void) {
 }
 
-void __osExceptionPreamble()
-{
-
+void __osExceptionPreamble() {
 }
 
-void __osCleanupThread(void)
-{
-
+void __osCleanupThread(void) {
 }
 
 s32 _Printf(PrintCallback a, void* arg, const char* fmt, va_list ap) {
@@ -283,46 +234,31 @@ s32 _Printf(PrintCallback a, void* arg, const char* fmt, va_list ap) {
     a(arg, buffer, strlen(buffer));
 }
 
-void osSpTaskLoad(OSTask* task)
-{
-
+void osSpTaskLoad(OSTask* task) {
 }
 
-void osSpTaskStartGo(OSTask* task)
-{
-
+void osSpTaskStartGo(OSTask* task) {
 }
 
-void osSetUpMempakWrite(s32 channel, OSPifRam* buf)
-{
-
+void osSetUpMempakWrite(s32 channel, OSPifRam* buf) {
 }
 
-u32 osGetMemSize(void)
-{
-	return 1024 * 1024 * 1024;
+u32 osGetMemSize(void) {
+    return 1024 * 1024 * 1024;
 }
 
-s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data)
-{
-	return 0;
+s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) {
+    return 0;
 }
 
-void osSpTaskYield(void)
-{
+void osSpTaskYield(void) {
 }
 
-s32 osStopTimer(OSTimer* timer)
-{
-
+s32 osStopTimer(OSTimer* timer) {
 }
 
-OSYieldResult osSpTaskYielded(OSTask* task)
-{
-
+OSYieldResult osSpTaskYielded(OSTask* task) {
 }
 
-void osViExtendVStart(u32 arg0)
-{
-
+void osViExtendVStart(u32 arg0) {
 }
diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp
index 4eeaa16fd9..f1405abbb9 100644
--- a/soh/soh/util.cpp
+++ b/soh/soh/util.cpp
@@ -4,6 +4,8 @@
 #include <vector>
 #include <algorithm>
 #include <array>
+#include <assert.h>
+#include <spdlog/spdlog.h>
 #include "Enhancements/randomizer/randomizerTypes.h"
 
 std::vector<std::string> sceneNames = {
@@ -279,30 +281,11 @@ std::vector<std::string> itemNames = {
 };
 
 std::vector<std::string> questItemNames = {
-        "Forest Medallion",
-        "Fire Medallion",
-        "Water Medallion",
-        "Spirit Medallion",
-        "Shadow Medallion",
-        "Light Medallion",
-        "Minuet of Forest",
-        "Bolero of Fire",
-        "Serenade of Water",
-        "Requiem of Spirit",
-        "Nocturne of Shadow",
-        "Prelude of Light",
-        "Zelda's Lullaby",
-        "Epona's Song",
-        "Saria's Song",
-        "Sun's Song",
-        "Song of Time",
-        "Song of Storms",
-        "Kokiri's Emerald",
-        "Goron's Ruby",
-        "Zora's Sapphire",
-        "Stone of Agony",
-        "Gerudo's Card",
-        "Gold Skulltula Token",
+    "Forest Medallion",   "Fire Medallion",   "Water Medallion", "Spirit Medallion",     "Shadow Medallion",
+    "Light Medallion",    "Minuet of Forest", "Bolero of Fire",  "Serenade of Water",    "Requiem of Spirit",
+    "Nocturne of Shadow", "Prelude of Light", "Zelda's Lullaby", "Epona's Song",         "Saria's Song",
+    "Sun's Song",         "Song of Time",     "Song of Storms",  "Kokiri's Emerald",     "Goron's Ruby",
+    "Zora's Sapphire",    "Stone of Agony",   "Gerudo's Card",   "Gold Skulltula Token",
 };
 
 std::array<std::string, RA_MAX> rcareaPrefixes = {
@@ -341,49 +324,64 @@ std::array<std::string, RA_MAX> rcareaPrefixes = {
 };
 
 const std::string& SohUtils::GetSceneName(int32_t scene) {
+    if (scene > sceneNames.size()) {
+        SPDLOG_WARN("Passed invalid scene id to SohUtils::GetSceneName: ({})", scene);
+        assert(false);
+        return "";
+    }
+
     return sceneNames[scene];
 }
 
 const std::string& SohUtils::GetItemName(int32_t item) {
+    if (item > itemNames.size()) {
+        SPDLOG_WARN("Passed invalid item id to SohUtils::GetItemName: ({})", item);
+        assert(false);
+        return "";
+    }
+
     return itemNames[item];
 }
 
 const std::string& SohUtils::GetQuestItemName(int32_t item) {
+    if (item > questItemNames.size()) {
+        SPDLOG_WARN("Passed invalid quest item id to SohUtils::GetQuestItemName: ({})", item);
+        assert(false);
+        return "";
+    }
+
     return questItemNames[item];
 }
 
 const std::string& SohUtils::GetRandomizerCheckAreaPrefix(int32_t rcarea) {
+    if (rcarea > rcareaPrefixes.size()) {
+        SPDLOG_WARN("Passed invalid rcarea to SohUtils::GetRandomizerCheckAreaPrefix: ({})", rcarea);
+        assert(false);
+        return "";
+    }
+
     return rcareaPrefixes[rcarea];
 }
 
 void SohUtils::CopyStringToCharArray(char* destination, std::string source, size_t size) {
-    strncpy(destination, source.c_str(), size - 1);
-    destination[size - 1] = '\0';
+    if (size > 0) {
+        strncpy(destination, source.c_str(), size - 1);
+        destination[size - 1] = '\0';
+    }
 }
 
 std::string SohUtils::Sanitize(std::string stringValue) {
-    // Add backslashes.
-    for (auto i = stringValue.begin();;) {
-        auto const pos = std::find_if(i, stringValue.end(), [](char const c) { return '\\' == c || '\'' == c || '"' == c; });
-        if (pos == stringValue.end()) {
-            break;
-        }
-        i = std::next(stringValue.insert(pos, '\\'), 2);
-    }
-
-    // Removes others.
-    stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(), [](char const c) {
-        return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }), stringValue.end());
+    stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(),
+                                     [](char const c) { return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }),
+                      stringValue.end());
 
     return stringValue;
 }
 
 size_t SohUtils::CopyStringToCharBuffer(char* buffer, const std::string& source, const size_t maxBufferSize) {
-    if (!source.empty()) {
-        // Prevent potential horrible overflow due to implicit conversion of maxBufferSize to an unsigned. Prevents negatives.
-        memset(buffer, 0, std::max<size_t>(0, maxBufferSize));
-        // Gaurentee that this value will be greater than 0, regardless of passed variables.
-        const size_t copiedCharLen = std::min<size_t>(std::max<size_t>(0, maxBufferSize - 1), source.length());
+    if (!source.empty() && maxBufferSize > 0) {
+        memset(buffer, 0, maxBufferSize);
+        const size_t copiedCharLen = std::min<size_t>(maxBufferSize - 1, source.length());
         memcpy(buffer, source.c_str(), copiedCharLen);
         return copiedCharLen;
     }
@@ -398,8 +396,16 @@ bool SohUtils::IsStringEmpty(std::string str) {
     std::string::size_type end = str.find_last_not_of(' ');
 
     // Check if the string is empty after stripping spaces
-    if (start == std::string::npos || end == std::string::npos)
-        return true; // The string is empty
-    else
-        return false; // The string is not empty
+    return start == std::string::npos || end == std::string::npos;
+}
+
+uint32_t SohUtils::Hash(std::string str) {
+    // FNV-1a
+    const size_t len = str.size();
+    uint32_t hval = 0x811c9dc5;
+    for (size_t pos = 0; pos < len; pos++) {
+        hval ^= (uint32_t)str[pos];
+        hval *= 0x01000193;
+    }
+    return hval;
 }
diff --git a/soh/soh/util.h b/soh/soh/util.h
index a37279a18e..9a31d4be45 100644
--- a/soh/soh/util.h
+++ b/soh/soh/util.h
@@ -3,23 +3,24 @@
 #include <stdint.h>
 
 namespace SohUtils {
-    const std::string& GetSceneName(int32_t scene);
+const std::string& GetSceneName(int32_t scene);
 
-    const std::string& GetItemName(int32_t item);
+const std::string& GetItemName(int32_t item);
 
-    const std::string& GetQuestItemName(int32_t item);
+const std::string& GetQuestItemName(int32_t item);
 
-    const std::string& GetRandomizerCheckAreaPrefix(int32_t rcarea);
+const std::string& GetRandomizerCheckAreaPrefix(int32_t rcarea);
 
-    // Copies a string and ensures the destination is null terminated if the source string is larger than size
-    // Only up to size-1 characters are copied from the source string
-    void CopyStringToCharArray(char* destination, std::string source, size_t size);
+// Copies a string and ensures the destination is null terminated if the source string is larger than size
+// Only up to size-1 characters are copied from the source string
+void CopyStringToCharArray(char* destination, std::string source, size_t size);
 
-    std::string Sanitize(std::string stringValue);
+std::string Sanitize(std::string stringValue);
 
-    // Copies a string into a char buffer up to maxBufferSize characters. This does NOT insert a null terminator
-    // on the end, as this is used for in-game messages which are not null-terminated.
-    size_t CopyStringToCharBuffer(char* buffer, const std::string& source, size_t maxBufferSize);
+// Copies a string into a char buffer up to maxBufferSize characters. This does NOT insert a null terminator
+// on the end, as this is used for in-game messages which are not null-terminated.
+size_t CopyStringToCharBuffer(char* buffer, const std::string& source, size_t maxBufferSize);
 
-    bool IsStringEmpty(std::string str);
+bool IsStringEmpty(std::string str);
+uint32_t Hash(std::string str);
 } // namespace SohUtils
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index 2159756626..ea849af059 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -12,8 +12,9 @@
 extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
 extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
 extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
+extern "C" MessageTableEntry* sJpnMessageEntryTablePtr;
 extern "C" MessageTableEntry* sStaffMessageEntryTablePtr;
-//extern "C" MessageTableEntry* _message_0xFFFC_nes;	
+// extern "C" MessageTableEntry* _message_0xFFFC_nes;
 
 static void SetMessageEntry(MessageTableEntry& entry, const SOH::MessageEntry& msgEntry) {
     entry.textId = msgEntry.id;
@@ -26,7 +27,8 @@ static void OTRMessage_LoadCustom(const std::string& folderPath, MessageTableEnt
     auto lst = *Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles(folderPath).get();
 
     for (auto& tPath : lst) {
-        auto file = std::static_pointer_cast<SOH::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(tPath));
+        auto file = std::static_pointer_cast<SOH::Text>(
+            Ship::Context::GetInstance()->GetResourceManager()->LoadResource(tPath));
 
         for (size_t j = 0; j < file->messages.size(); ++j) {
             // Check if same text ID exists already
@@ -43,59 +45,25 @@ static void OTRMessage_LoadCustom(const std::string& folderPath, MessageTableEnt
 }
 
 MessageTableEntry* OTRMessage_LoadTable(const std::string& filePath, bool isNES) {
-    auto file = std::static_pointer_cast<SOH::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(filePath));
+    auto file =
+        std::static_pointer_cast<SOH::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(filePath));
 
     if (file == nullptr)
         return nullptr;
-    
+
     // Allocate room for an additional message
     // OTRTODO: Should not be malloc'ing here. It's fine for now since we check elsewhere that the message table is
     // already null.
-    MessageTableEntry* table = (MessageTableEntry*)malloc(sizeof(MessageTableEntry) * (file->messages.size() + 1));
+    MessageTableEntry* table = (MessageTableEntry*)malloc(sizeof(MessageTableEntry) * file->messages.size());
 
     for (size_t i = 0; i < file->messages.size(); i++) {
-        // Look for Owl Text
-        if (file->messages[i].id == 0x2066) {
-            // Create a new message based on the Owl Text
-            uint32_t kaeporaMsgSize = file->messages[i].msg.size();
-            // OTRTODO: Should not be malloc'ing here. It's fine for now since we check elsewhere that the message table
-            // is already null.
-            char* kaeporaOg = (char*)malloc(sizeof(char) * kaeporaMsgSize);
-            char* kaeporaPatch = (char*)malloc(sizeof(char) * kaeporaMsgSize);
-            file->messages[i].msg.copy(kaeporaOg, kaeporaMsgSize, 0);
-            file->messages[i].msg.copy(kaeporaPatch, kaeporaMsgSize, 0);
-
-            size_t colorPos = file->messages[i].msg.find(QM_GREEN);
-            size_t newLinePos = colorPos + file->messages[i].msg.substr(colorPos + 1).find(CTRL_NEWLINE) + 1;
-            size_t endColorPos = newLinePos + file->messages[i].msg.substr(newLinePos).find(CTRL_COLOR);
-            size_t NoLength = newLinePos - (colorPos + 1);
-            size_t YesLength = endColorPos - (newLinePos + 1);
-            // Swap the order of yes and no in this new message
-            size_t yes = 0;
-            while (yes < YesLength) {
-                kaeporaPatch[colorPos + yes + 1] = kaeporaOg[newLinePos + yes + 1];
-                yes++;
-            }
-            kaeporaPatch[colorPos + yes + 1] = CTRL_NEWLINE;
-            size_t no = 0;
-            while (no < NoLength) {
-                kaeporaPatch[colorPos + yes + 2 + no] = kaeporaOg[colorPos + 1 + no];
-                no++;
-            }
-
-            // load data into message
-            table[file->messages.size()].textId = 0x71B3;
-            table[file->messages.size()].typePos = (file->messages[i].textboxType << 4) | file->messages[i].textboxYPos;
-            table[file->messages.size()].segment = kaeporaPatch;
-            table[file->messages.size()].msgSize = kaeporaMsgSize;
-        }
-
         SetMessageEntry(table[i], file->messages[i]);
 
         if (isNES && file->messages[i].id == 0xFFFC)
             _message_0xFFFC_nes = (char*)file->messages[i].msg.c_str();
     }
-    OTRMessage_LoadCustom("override/" + filePath.substr(0, filePath.find_last_of('/')) + "/*", table, file->messages.size() + 1);
+    OTRMessage_LoadCustom("override/" + filePath.substr(0, filePath.find_last_of('/')) + "/*", table,
+                          file->messages.size() + 1);
 
     // Assert that the first message starts at the first text ID
     assert(table[0].textId == 0x0001);
@@ -103,8 +71,7 @@ MessageTableEntry* OTRMessage_LoadTable(const std::string& filePath, bool isNES)
     return table;
 }
 
-extern "C" void OTRMessage_Init()
-{
+extern "C" void OTRMessage_Init() {
     // OTRTODO: Added a lot of null checks here so that we don't malloc the table multiple times causing a memory leak.
     // We really ought to fix the implementation such that we aren't malloc'ing new tables.
     // Once we fix the implementation, remove these NULL checks.
@@ -117,18 +84,29 @@ extern "C" void OTRMessage_Init()
     if (sFraMessageEntryTablePtr == NULL) {
         sFraMessageEntryTablePtr = OTRMessage_LoadTable("text/fra_message_data_static/fra_message_data_static", false);
     }
+    if (sJpnMessageEntryTablePtr == NULL) {
+        sJpnMessageEntryTablePtr = OTRMessage_LoadTable("text/jpn_message_data_static/jpn_message_data_static", false);
+    }
+    // Note: Make sure this loads after PAL nes_message_data_static, so that message 0xFFFC is definitely loaded if it
+    // exists
+    if (sNesMessageEntryTablePtr == NULL) {
+        sNesMessageEntryTablePtr =
+            OTRMessage_LoadTable("text/nes_message_data_static/ntsc_nes_message_data_static", false);
+    }
 
     if (sStaffMessageEntryTablePtr == NULL) {
         auto file2 =
             std::static_pointer_cast<SOH::Text>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
                 "text/staff_message_data_static/staff_message_data_static"));
-        // OTRTODO: Should not be malloc'ing here. It's fine for now since we check that the message table is already null.
+        // OTRTODO: Should not be malloc'ing here. It's fine for now since we check that the message table is already
+        // null.
         sStaffMessageEntryTablePtr = (MessageTableEntry*)malloc(sizeof(MessageTableEntry) * file2->messages.size());
 
         for (size_t i = 0; i < file2->messages.size(); i++) {
             SetMessageEntry(sStaffMessageEntryTablePtr[i], file2->messages[i]);
         }
-        OTRMessage_LoadCustom("override/text/staff_message_data_static/*", sStaffMessageEntryTablePtr, file2->messages.size());
+        OTRMessage_LoadCustom("override/text/staff_message_data_static/*", sStaffMessageEntryTablePtr,
+                              file2->messages.size());
 
         // Assert staff credits start at the first credits ID
         assert(sStaffMessageEntryTablePtr[0].textId == 0x0500);
@@ -185,10 +163,16 @@ extern "C" void OTRMessage_Init()
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_FISHERMAN_LEAVE,
         CustomMessage("Hey! Hey!&You can't take the rod out of here!&I'm serious!^Do you want to quit?&\x1B&%gYes&No%w",
-                      "Hey! Hey!&Du kannst die Angel doch nicht&einfach mitnehmen!&Ganz im Ernst!^Möchtest Du aufhören?&\x1B&%gJa&Nein%w",
-                      "Holà! Holà!&Les cannes ne sortent pas d'ici!&Je suis sérieux!^Voulez-vous arrêter?&\x1B&%gOui&Non%w")); //TODO Used AI translation as placeholder
+                      "Hey! Hey!&Du kannst die Angel doch nicht&einfach mitnehmen!&Ganz im Ernst!^Möchtest Du "
+                      "aufhören?&\x1B&%gJa&Nein%w",
+                      "Holà! Holà!&Les cannes ne sortent pas d'ici!&Je suis sérieux!^Voulez-vous "
+                      "arrêter?&\x1B&%gOui&Non%w")); // TODO Used AI translation as placeholder
     CustomMessageManager::Instance->CreateMessage(
         customMessageTableID, TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY,
         CustomMessage("I'm sorry I can't sell you these fine specimens, they need an #experienced owner#.^"
-                      "Come back when you have had #Bombchus# of your own.", {QM_RED, QM_GREEN}));
+                      "Come back when you have had #Bombchus# of your own.",
+                      { QM_RED, QM_GREEN }));
+    CustomMessageManager::Instance->CreateMessage(
+        customMessageTableID, TEXT_BIG_POE_COLLECTED_RANDO,
+        CustomMessage("You have #" + CustomMessage::POINTS("\x01") + "# points.", { QM_RED }));
 }
diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp
index 279b4e696c..23e61261c7 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -3,19 +3,18 @@
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
 #include <utils/StringHelper.h>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "global.h"
 #include "vt.h"
 #include <Vertex.h>
 
-extern "C" void Play_InitScene(PlayState * play, s32 spawn);
-extern "C" void Play_InitEnvironment(PlayState * play, s16 skyboxId);
+extern "C" void Play_InitScene(PlayState* play, s32 spawn);
+extern "C" void Play_InitEnvironment(PlayState* play, s16 skyboxId);
 void OTRPlay_InitScene(PlayState* play, s32 spawn);
 s32 OTRScene_ExecuteCommands(PlayState* play, SOH::Scene* scene);
 
-//LUS::OTRResource* OTRPlay_LoadFile(PlayState* play, RomFile* file) {
-Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName)
-{
+// LUS::OTRResource* OTRPlay_LoadFile(PlayState* play, RomFile* file) {
+Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName) {
     auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fileName);
     return res.get();
 }
@@ -28,7 +27,7 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneId, s32 spawn) {
     play->sceneNum = sceneId;
     play->sceneConfig = scene->config;
 
-    //osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f);
+    // osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f);
 
     // Scenes considered "dungeon" with a MQ variant
     int16_t inNonSharedScene = (sceneId >= SCENE_DEKU_TREE && sceneId <= SCENE_ICE_CAVERN) ||
@@ -38,13 +37,13 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneId, s32 spawn) {
     if (inNonSharedScene) {
         sceneVersion = ResourceMgr_IsGameMasterQuest() ? "mq" : "nonmq";
     }
-    std::string scenePath = StringHelper::Sprintf("scenes/%s/%s/%s", sceneVersion.c_str(), scene->sceneFile.fileName, scene->sceneFile.fileName);
+    std::string scenePath = StringHelper::Sprintf("scenes/%s/%s/%s", sceneVersion.c_str(), scene->sceneFile.fileName,
+                                                  scene->sceneFile.fileName);
 
     play->sceneSegment = OTRPlay_LoadFile(play, scenePath.c_str());
 
     // Failed to load scene... default to doodongs cavern
-    if (play->sceneSegment == nullptr) 
-    {
+    if (play->sceneSegment == nullptr) {
         lusprintf(__FILE__, __LINE__, 2, "Unable to load scene %s... Defaulting to Doodong's Cavern!\n",
                   scenePath.c_str());
         OTRPlay_SpawnScene(play, 0x01, 0);
@@ -53,14 +52,14 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneId, s32 spawn) {
 
     scene->unk_13 = 0;
 
-    //gSegments[2] = VIRTUAL_TO_PHYSICAL(play->sceneSegment);
+    // gSegments[2] = VIRTUAL_TO_PHYSICAL(play->sceneSegment);
 
     OTRPlay_InitScene(play, spawn);
     auto roomSize = func_80096FE8(play, &play->roomCtx);
 
     osSyncPrintf("ROOM SIZE=%fK\n", roomSize / 1024.0f);
 
-    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(play->sceneNum);
+    GameInteractor_ExecuteOnSceneInit(play->sceneNum);
     SPDLOG_INFO("Scene Init - sceneNum: {0:#x}, entranceIndex: {1:#x}", play->sceneNum, gSaveContext.entranceIndex);
 }
 
@@ -80,6 +79,7 @@ void OTRPlay_InitScene(PlayState* play, s32 spawn) {
     YREG(15) = 0;
     gSaveContext.worldMapArea = 0;
     OTRScene_ExecuteCommands(play, (SOH::Scene*)play->sceneSegment);
+    GameInteractor_ExecuteAfterSceneCommands(play->sceneNum);
     Play_InitEnvironment(play, play->skyboxId);
     /* auto data = static_cast<LUS::Vertex*>(Ship::Context::GetInstance()
                                                ->GetResourceManager()
diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp
index 022aeee372..b4f8a29e89 100644
--- a/soh/soh/z_scene_otr.cpp
+++ b/soh/soh/z_scene_otr.cpp
@@ -106,7 +106,7 @@ bool Scene_CommandSpecialFiles(PlayState* play, SOH::ISceneCommand* cmd) {
     }
 
     if (specialCmd->specialObjects.elfMessage != 0) {
-        auto res = 
+        auto res =
             (Ship::Blob*)OTRPlay_LoadFile(play, sNaviMsgFiles[specialCmd->specialObjects.elfMessage - 1].fileName);
         play->cUpElfMsgs = (ElfMessage*)res->Data.data();
     }
@@ -150,17 +150,13 @@ bool Scene_CommandObjectList(PlayState* play, SOH::ISceneCommand* cmd) {
     s32 i;
     s32 j;
     s32 k;
-    ObjectStatus* status;
     ObjectStatus* status2;
-    ObjectStatus* firstStatus;
     // s16* objectEntry = SEGMENTED_TO_VIRTUAL(cmd->objectList.segment);
     s16* objectEntry = (s16*)cmdObj->GetRawPointer();
     void* nextPtr;
 
     k = 0;
     i = play->objectCtx.unk_09;
-    firstStatus = &play->objectCtx.status[0];
-    status = &play->objectCtx.status[i];
 
     // Loop until a mismatch in the object lists
     // Then clear all object ids past that in the context object list and kill actors for those objects
@@ -401,7 +397,7 @@ bool Scene_CommandMiscSettings(PlayState* play, SOH::ISceneCommand* cmd) {
         if (gSaveContext.cutsceneIndex < 0xFFF0) {
             gSaveContext.worldMapAreaData |= gBitFlags[gSaveContext.worldMapArea];
             osSyncPrintf("０００  ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.worldMapAreaData,
-                gSaveContext.worldMapArea);
+                         gSaveContext.worldMapArea);
         }
     }
     return false;
@@ -446,7 +442,8 @@ s32 OTRScene_ExecuteCommands(PlayState* play, SOH::Scene* scene) {
             continue;
 
         cmdCode = sceneCmd->cmdId;
-        // osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1, sceneCmd->base.data2);
+        // osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1,
+        // sceneCmd->base.data2);
 
         if ((int)cmdCode == 0x14) {
             break;
@@ -507,10 +504,10 @@ extern "C" s32 OTRfunc_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomN
 
         osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1);
         // DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, play->roomList[roomNum].vromStart, size, 0,
-                            //&roomCtx->loadQueue, NULL, __FILE__, __LINE__);
+        //&roomCtx->loadQueue, NULL, __FILE__, __LINE__);
 
-        auto roomData =
-            std::static_pointer_cast<SOH::Scene>(ResourceMgr_GetResourceByNameHandlingMQ(play->roomList[roomNum].fileName));
+        auto roomData = std::static_pointer_cast<SOH::Scene>(
+            ResourceMgr_GetResourceByNameHandlingMQ(play->roomList[roomNum].fileName));
         roomCtx->status = 1;
         roomCtx->roomToLoad = roomData.get();
 
diff --git a/soh/src/boot/boot_main.c b/soh/src/boot/boot_main.c
index 7b8b88fed2..c0b0872e4d 100644
--- a/soh/src/boot/boot_main.c
+++ b/soh/src/boot/boot_main.c
@@ -7,7 +7,7 @@ StackEntry sIdleThreadInfo;
 u8 sBootThreadStack[0x400];
 
 void cleararena(void) {
-    //bzero(_dmadataSegmentStart, osMemSize - OS_K0_TO_PHYSICAL(_dmadataSegmentStart));
+    // bzero(_dmadataSegmentStart, osMemSize - OS_K0_TO_PHYSICAL(_dmadataSegmentStart));
 }
 
 void bootproc(void) {
diff --git a/soh/src/boot/idle.c b/soh/src/boot/idle.c
index 9799229e46..95b510036d 100644
--- a/soh/src/boot/idle.c
+++ b/soh/src/boot/idle.c
@@ -23,12 +23,13 @@ void Main_ThreadEntry(void* arg) {
     DmaMgr_Init();
     osSyncPrintf("codeセグメントロード中...");
     time = osGetTime();
-    //DmaMgr_SendRequest1(_codeSegmentStart, (uintptr_t)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart,
-                        //"../idle.c", 238);
+    // DmaMgr_SendRequest1(_codeSegmentStart, (uintptr_t)_codeSegmentRomStart, _codeSegmentRomEnd -
+    // _codeSegmentRomStart,
+    //"../idle.c", 238);
     time -= osGetTime();
     osSyncPrintf("\rcodeセグメントロード中...完了\n");
     osSyncPrintf("転送時間 %6.3f\n");
-    //bzero(_codeSegmentBssStart, _codeSegmentBssEnd - _codeSegmentBssStart);
+    // bzero(_codeSegmentBssStart, _codeSegmentBssEnd - _codeSegmentBssStart);
     osSyncPrintf("codeセグメントBSSクリア完了\n");
     Main(arg);
     osSyncPrintf("mainx 実行終了\n");
@@ -41,7 +42,7 @@ void Idle_ThreadEntry(void* arg) {
     osSyncPrintf("MAKEOPTION: %s\n", gBuildMakeOption);
     osSyncPrintf(VT_FGCOL(GREEN));
     osSyncPrintf("ＲＡＭサイズは %d キロバイトです(osMemSize/osGetMemSize)\n", (s32)osMemSize / 1024);
-    //osSyncPrintf("_bootSegmentEnd(%08x) 以降のＲＡＭ領域はクリアされました(boot)\n", _bootSegmentEnd);
+    // osSyncPrintf("_bootSegmentEnd(%08x) 以降のＲＡＭ領域はクリアされました(boot)\n", _bootSegmentEnd);
     osSyncPrintf("Ｚバッファのサイズは %d キロバイトです\n", 0x96);
     osSyncPrintf("ダイナミックバッファのサイズは %d キロバイトです\n", 0x92);
     osSyncPrintf("ＦＩＦＯバッファのサイズは %d キロバイトです\n", 0x60);
diff --git a/soh/src/boot/is_debug.c b/soh/src/boot/is_debug.c
index 4ece8c36e1..2bc5e2d211 100644
--- a/soh/src/boot/is_debug.c
+++ b/soh/src/boot/is_debug.c
@@ -40,7 +40,7 @@ void* is_proutSyncPrintf(void* arg, const char* str, u32 count) {
     s32 start;
     s32 end;
 
-    //OTRLogString(str);
+    // OTRLogString(str);
 
     osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, &data);
     if (data != ASCII_TO_U32('I', 'S', '6', '4')) {
diff --git a/soh/src/boot/z_std_dma.c b/soh/src/boot/z_std_dma.c
index fd1f85f01c..6393ae2707 100644
--- a/soh/src/boot/z_std_dma.c
+++ b/soh/src/boot/z_std_dma.c
@@ -93,7 +93,6 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, uintptr_t ram, size_t size) {
         ram += buffSize;
     }
 
-
     ioMsg.hdr.pri = OS_MESG_PRI_NORMAL;
     ioMsg.hdr.retQueue = &queue;
     ioMsg.devAddr = rom;
@@ -331,7 +330,8 @@ void DmaMgr_ThreadEntry(void* arg0) {
     osSyncPrintf("ＤＭＡマネージャスレッド実行終了\n");
 }
 
-s32 DmaMgr_SendRequestImpl(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_t size, u32 unk, OSMesgQueue* queue, OSMesg msg) {
+s32 DmaMgr_SendRequestImpl(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_t size, u32 unk, OSMesgQueue* queue,
+                           OSMesg msg) {
     static s32 sDmaMgrQueueFullLogged = 0;
 
     if ((1 && (ram == 0)) || (osMemSize < ram + size + 0x80000000) || (vrom & 1) || (vrom > 0x4000000) || (size == 0) ||
@@ -383,8 +383,8 @@ void DmaMgr_Init(void) {
     s32 idx;
     DmaEntry* iter;
 
-    //DmaMgr_DmaRomToRam((uintptr_t)_dmadataSegmentRomStart, (uintptr_t)_dmadataSegmentStart,
-                       //(uintptr_t)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart));
+    // DmaMgr_DmaRomToRam((uintptr_t)_dmadataSegmentRomStart, (uintptr_t)_dmadataSegmentStart,
+    //(uintptr_t)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart));
     osSyncPrintf("dma_rom_ad[]\n");
 
     sDmaMgrIsRomCompressed = false;
@@ -425,8 +425,8 @@ void DmaMgr_Init(void) {
     osStartThread(&sDmaMgrThread);
 }
 
-s32 DmaMgr_SendRequest2(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_t size, u32 unk5, OSMesgQueue* queue, OSMesg msg,
-                        const char* file, s32 line) {
+s32 DmaMgr_SendRequest2(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_t size, u32 unk5, OSMesgQueue* queue,
+                        OSMesg msg, const char* file, s32 line) {
 #if 0
     req->filename = file;
     req->line = line;
@@ -435,7 +435,7 @@ s32 DmaMgr_SendRequest2(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_t s
 }
 
 s32 DmaMgr_SendRequest1(void* ram0, uintptr_t vrom, size_t size, const char* file, s32 line) {
-    //printf("DmaMgr_SendRequest1 called...\n");
+    // printf("DmaMgr_SendRequest1 called...\n");
     return 0;
 
 #if 0
diff --git a/soh/src/buffers/heaps.c b/soh/src/buffers/heaps.c
index 2191ae72f6..f54ffa3e0c 100644
--- a/soh/src/buffers/heaps.c
+++ b/soh/src/buffers/heaps.c
@@ -12,8 +12,7 @@
 u8* gAudioHeap;
 u8* gSystemHeap;
 
-void Heaps_Alloc(void)
-{
+void Heaps_Alloc(void) {
 #ifdef _MSC_VER
     gAudioHeap = (u8*)_aligned_malloc(AUDIO_HEAP_SIZE, 0x10);
     gSystemHeap = (u8*)_aligned_malloc(SYSTEM_HEAP_SIZE, 0x10);
@@ -31,8 +30,7 @@ void Heaps_Alloc(void)
     assert(gSystemHeap != NULL);
 }
 
-void Heaps_Free(void)
-{
+void Heaps_Free(void) {
 #ifdef _MSC_VER
     _aligned_free(gAudioHeap);
     _aligned_free(gSystemHeap);
diff --git a/soh/src/code/PreRender.c b/soh/src/code/PreRender.c
index 343919e0e6..e79b4cfe0c 100644
--- a/soh/src/code/PreRender.c
+++ b/soh/src/code/PreRender.c
@@ -17,7 +17,7 @@ void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf,
 }
 
 void PreRender_Init(PreRender* this) {
-    memset(this,0, sizeof(PreRender));
+    memset(this, 0, sizeof(PreRender));
     ListAlloc_Init(&this->alloc);
 }
 
@@ -253,7 +253,7 @@ void func_800C1F20(PreRender* this, Gfx** gfxp) {
     LOG_CHECK_NULL_POINTER("this->fbuf", this->fbuf);
 
     if ((this->fbufSave != NULL) && (this->fbuf != NULL)) {
-         func_800C1AE8(this, gfxp, this->fbuf, this->fbufSave);
+        func_800C1AE8(this, gfxp, this->fbuf, this->fbufSave);
     }
 }
 
diff --git a/soh/src/code/TwoHeadArena.c b/soh/src/code/TwoHeadArena.c
index 08f2c7758d..9e6500a768 100644
--- a/soh/src/code/TwoHeadArena.c
+++ b/soh/src/code/TwoHeadArena.c
@@ -138,5 +138,5 @@ void THA_Ct(TwoHeadArena* tha, void* ptr, size_t size) {
 }
 
 void THA_Dt(TwoHeadArena* tha) {
-    memset(tha,0, sizeof(TwoHeadArena));
+    memset(tha, 0, sizeof(TwoHeadArena));
 }
diff --git a/soh/src/code/__osMalloc.c b/soh/src/code/__osMalloc.c
index 895de5fd95..656f3d8b77 100644
--- a/soh/src/code/__osMalloc.c
+++ b/soh/src/code/__osMalloc.c
@@ -3,7 +3,8 @@
 
 #include <string.h>
 
-// SOH [General] This file corresponds to decomp's "__osMalloc_gc.c", there's currently no file corresponding to decomp's "__osMalloc_n64.c"
+// SOH [General] This file corresponds to decomp's "__osMalloc_gc.c", there's currently no file corresponding to
+// decomp's "__osMalloc_n64.c"
 
 // #region SOH [General] We currently don't set OOT_DEBUG when building so set it here manually
 #define OOT_DEBUG 1
@@ -180,7 +181,7 @@ ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) {
 }
 
 void __osMallocInit(Arena* arena, void* start, size_t size) {
-    memset(arena,0, sizeof(Arena));
+    memset(arena, 0, sizeof(Arena));
     ArenaImpl_LockInit(arena);
     __osMallocAddBlock(arena, start, size);
     arena->isInit = true;
@@ -649,7 +650,8 @@ void* __osRealloc(Arena* arena, void* ptr, size_t newSize) {
         } else if (node->size < newSize) {
             next = NODE_GET_NEXT(node);
             sizeDiff = newSize - node->size;
-            if ((uintptr_t)next == ((uintptr_t)node + node->size + sizeof(ArenaNode)) && next->isFree && next->size >= sizeDiff) {
+            if ((uintptr_t)next == ((uintptr_t)node + node->size + sizeof(ArenaNode)) && next->isFree &&
+                next->size >= sizeDiff) {
                 // "Merge because there is a free block after the current memory block"
                 osSyncPrintf("現メモリブロックの後ろにフリーブロックがあるので結合します\n");
                 next->size -= sizeDiff;
@@ -879,8 +881,7 @@ s32 __osCheckArena(Arena* arena) {
         if (NODE_IS_VALID(iter)) {
 #if OOT_DEBUG
             // "Oops!! (%08x %08x)"
-            osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter,
-                         iter->magic);
+            osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter, iter->magic);
 #else
             // "Oops!! (%08x %08x)"
             osSyncPrintf("おおっと！！ (%08x %08x)\n", iter, iter->magic);
diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c
index 54f0b2afe6..b1ad53a209 100644
--- a/soh/src/code/audioMgr.c
+++ b/soh/src/code/audioMgr.c
@@ -55,27 +55,27 @@ void AudioMgr_ThreadEntry(void* arg0) {
     AudioMgr* audioMgr = (AudioMgr*)arg0;
     s16* msg = NULL;
 
-    //while (true) {
-        osRecvMesg(&audioMgr->unk_74, (OSMesg*)&msg, OS_MESG_BLOCK);
-        AudioMgr_HandleRetrace(audioMgr);
-        /*switch (*msg) {
-            case OS_SC_RETRACE_MSG:
-                AudioMgr_HandleRetrace(audioMgr);
-                while (audioMgr->unk_74.validCount != 0) {
-                    osRecvMesg(&audioMgr->unk_74, (OSMesg*)&msg, OS_MESG_BLOCK);
-                    switch (*msg) {
-                        case OS_SC_RETRACE_MSG:
-                            break;
-                        case OS_SC_PRE_NMI_MSG:
-                            AudioMgr_HandlePRENMI(audioMgr);
-                            break;
-                    }
+    // while (true) {
+    osRecvMesg(&audioMgr->unk_74, (OSMesg*)&msg, OS_MESG_BLOCK);
+    AudioMgr_HandleRetrace(audioMgr);
+    /*switch (*msg) {
+        case OS_SC_RETRACE_MSG:
+            AudioMgr_HandleRetrace(audioMgr);
+            while (audioMgr->unk_74.validCount != 0) {
+                osRecvMesg(&audioMgr->unk_74, (OSMesg*)&msg, OS_MESG_BLOCK);
+                switch (*msg) {
+                    case OS_SC_RETRACE_MSG:
+                        break;
+                    case OS_SC_PRE_NMI_MSG:
+                        AudioMgr_HandlePRENMI(audioMgr);
+                        break;
                 }
-                break;
-            case OS_SC_PRE_NMI_MSG:
-                AudioMgr_HandlePRENMI(audioMgr);
-                break;
-        }*/
+            }
+            break;
+        case OS_SC_PRE_NMI_MSG:
+            AudioMgr_HandlePRENMI(audioMgr);
+            break;
+    }*/
     //}
 }
 
@@ -86,7 +86,7 @@ void AudioMgr_Unlock(AudioMgr* audioMgr) {
 void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) {
     // AudioPlayer_Init();
 
-    memset(audioMgr,0, sizeof(AudioMgr));
+    memset(audioMgr, 0, sizeof(AudioMgr));
 
     audioMgr->sched = sched;
     audioMgr->irqMgr = irqMgr;
@@ -98,7 +98,7 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon
 
     osSendMesgPtr(&audioMgr->unk_AC, NULL, OS_MESG_BLOCK);
 
-        static bool hasInitialized = false;
+    static bool hasInitialized = false;
 
     if (!hasInitialized) {
         IrqMgrClient irqClient;
@@ -108,17 +108,18 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon
         AudioLoad_SetDmaHandler(DmaMgr_DmaHandler);
         Audio_InitSound();
         osSendMesgPtr(&audioMgr->unk_C8, NULL, OS_MESG_BLOCK);
-        
-        Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN, ((float)CVarGetInteger(CVAR_SETTING("Volume.MainMusic"), 100) / 100.0f));
+
+        Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN,
+                            ((float)CVarGetInteger(CVAR_SETTING("Volume.MainMusic"), 100) / 100.0f));
         Audio_SetGameVolume(SEQ_PLAYER_BGM_SUB, ((float)CVarGetInteger(CVAR_SETTING("Volume.SubMusic"), 100) / 100.0f));
         Audio_SetGameVolume(SEQ_PLAYER_FANFARE, ((float)CVarGetInteger(CVAR_SETTING("Volume.Fanfare"), 100) / 100.0f));
         Audio_SetGameVolume(SEQ_PLAYER_SFX, ((float)CVarGetInteger(CVAR_SETTING("Volume.SFX"), 100) / 100.0f));
 
         // Removed due to crash
-        //IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->unk_74);
+        // IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->unk_74);
         hasInitialized = true;
     }
 
-    //osCreateThread(&audioMgr->unk_E8, id, AudioMgr_ThreadEntry, audioMgr, stack, pri);
-    //osStartThread(&audioMgr->unk_E8);
+    // osCreateThread(&audioMgr->unk_E8, id, AudioMgr_ThreadEntry, audioMgr, stack, pri);
+    // osStartThread(&audioMgr->unk_E8);
 }
diff --git a/soh/src/code/audio_data.c b/soh/src/code/audio_data.c
index 37e8176882..ab083145ce 100644
--- a/soh/src/code/audio_data.c
+++ b/soh/src/code/audio_data.c
@@ -544,10 +544,10 @@ u8 gDefaultShortNoteGateTimeTable[] = {
 };
 
 AdsrEnvelope gDefaultEnvelope[] = {
-    { BE16SWAP_CONST(1),    BE16SWAP_CONST(32000) },
+    { BE16SWAP_CONST(1), BE16SWAP_CONST(32000) },
     { BE16SWAP_CONST(1000), BE16SWAP_CONST(32000) },
-    { BE16SWAP_CONST(-1),   BE16SWAP_CONST(0) },
-    { BE16SWAP_CONST(0),    BE16SWAP_CONST(0) },
+    { BE16SWAP_CONST(-1), BE16SWAP_CONST(0) },
+    { BE16SWAP_CONST(0), BE16SWAP_CONST(0) },
 };
 
 NoteSubEu gZeroNoteSub = { 0 };
diff --git a/soh/src/code/audio_effects.c b/soh/src/code/audio_effects.c
index be02155540..476e8e3bae 100644
--- a/soh/src/code/audio_effects.c
+++ b/soh/src/code/audio_effects.c
@@ -2,7 +2,7 @@
 #include <libultraship/libultra.h>
 #include "global.h"
 
-#define ROUND(num) floorf((num) * 100) / 100;
+#define ROUND(num) floorf((num)*100) / 100;
 
 void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 b) {
     f32 channelVolume;
diff --git a/soh/src/code/audio_heap.c b/soh/src/code/audio_heap.c
index 8d0e97fa37..398946fa96 100644
--- a/soh/src/code/audio_heap.c
+++ b/soh/src/code/audio_heap.c
@@ -41,7 +41,7 @@ void func_800DDE3C(void) {
 void AudioHeap_ResetLoadStatus(void) {
     s32 i;
 
-    for (i = 0; i < 0x30; i++) {
+    for (i = 0; i < fontMapSize; i++) {
         if (gAudioContext.fontLoadStatus[i] != 5) {
             gAudioContext.fontLoadStatus[i] = 0;
         }
@@ -940,7 +940,7 @@ void AudioHeap_Init(void) {
         reverb->sample.sampleAddr = (u8*)reverb->leftRingBuf;
         reverb->loop.start = 0;
         reverb->loop.count = 1;
-        reverb->loop.end = reverb->windowSize;
+        reverb->loop.loopEnd = reverb->windowSize;
 
         if (reverb->downsampleRate != 1) {
             reverb->unk_0E = 0x8000 / reverb->downsampleRate;
@@ -1201,8 +1201,7 @@ void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry) {
     }
 }
 
-void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, SoundFontSample* sample)
-{
+void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, SoundFontSample* sample) {
 }
 
 SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(size_t size) {
diff --git a/soh/src/code/audio_init_params.c b/soh/src/code/audio_init_params.c
index 02593f8e49..77b826ca90 100644
--- a/soh/src/code/audio_init_params.c
+++ b/soh/src/code/audio_init_params.c
@@ -68,22 +68,22 @@ ReverbSettings D_80133420[][3] = {
 };
 
 AudioSpec gAudioSpecs[18] = {
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[1], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[2], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[4], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[5], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[6], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[7], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[9], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 28, 3, 0, 0, 2, D_80133420[10], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 28, 3, 0, 0, 1, D_80133420[11], 0x300, 0x200, 0x7FFF, 0, 0x4800, 0, 0x5000, 0, 0, 0, 0 },
-    { 32000, 1, 28, 3, 0, 0, 1, D_80133420[11], 0x300, 0x200, 0x7FFF, 0, 0, 0, 0x5000, 0x4800, 0, 0, 0 },
-    { 32000, 1, 22, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 22, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 16, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 22050, 1, 24, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2880, 0, 0, 0 },
-    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[2], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x5000, 0x2600, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x4000, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[1], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[2], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[4], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[5], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[6], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[7], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[9], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 23, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 28, 3, 0, 0, 2, D_80133420[10], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x2800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 28, 3, 0, 0, 1, D_80133420[11], 0x300, 0x200, 0x7FFF, 0, 0x4800, 0, 0x4000, 0, 0, 0, 0 },
+    { 32000, 1, 28, 3, 0, 0, 1, D_80133420[11], 0x300, 0x200, 0x7FFF, 0, 0, 0, 0x4000, 0x4800, 0, 0, 0 },
+    { 32000, 1, 22, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 22, 4, 0, 0, 2, D_80133420[8], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 16, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 22050, 1, 24, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
+    { 32000, 1, 24, 4, 0, 0, 2, D_80133420[2], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3600, 0x2600, 0, 0, 0 },
 };
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 3c72246127..81f67f9c06 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -8,6 +8,10 @@
 #include "soh/Enhancements/audio/AudioCollection.h"
 #include "soh/Enhancements/audio/AudioEditor.h"
 #include "soh/ResourceManagerHelpers.h"
+#include <stdio.h>
+#ifdef _MSC_VER
+#define strdup _strdup
+#endif
 
 #define MK_ASYNC_MSG(retData, tableType, id, status) (((retData) << 24) | ((tableType) << 16) | ((id) << 8) | (status))
 #define ASYNC_TBLTYPE(v) ((u8)(v >> 16))
@@ -53,9 +57,8 @@ void AudioLoad_SyncDmaUnkMedium(uintptr_t devAddr, u8* addr, size_t size, s32 un
 s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, uintptr_t devAddr, uintptr_t ramAddr, size_t size,
                   OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType);
 void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue);
-AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, uintptr_t devAddr, uintptr_t ramAddr,
-                                                  size_t size, s32 medium,
-                                                  s32 nChunks, OSMesgQueue* retQueue, s32 retMsg);
+AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, uintptr_t devAddr, uintptr_t ramAddr, size_t size,
+                                                  s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg);
 AudioAsyncLoad* AudioLoad_StartAsyncLoad(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s32 medium, s32 nChunks,
                                          OSMesgQueue* retQueue, s32 retMsg);
 void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size);
@@ -83,7 +86,8 @@ char** sequenceMap;
 size_t sequenceMapSize;
 // A map of authentic sequence IDs to their cache policies, for use with sequence swapping.
 u8 seqCachePolicyMap[MAX_AUTHENTIC_SEQID];
-char* fontMap[256];
+size_t fontMapSize;
+char** fontMap;
 
 uintptr_t fontStart;
 uint32_t fontOffsets[8192];
@@ -420,8 +424,7 @@ void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1) {
 s32 AudioLoad_SyncLoadSample(SoundFontSample* sample, s32 fontId) {
     void* sampleAddr;
 
-    if (sample->unk_bit25 == 1)
-    {
+    if (sample->isRelocated == 1) {
         if (sample->medium != MEDIUM_RAM) {
             sampleAddr = AudioHeap_AllocSampleCache(sample->size, fontId, (void*)sample->sampleAddr, sample->medium,
                                                     CACHE_PERSISTENT);
@@ -591,11 +594,10 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
         seqData2.cachePolicy = authCachePolicy;
     }
 
-    for (int i = 0; i < seqData2.numFonts; i++)
-    {
+    for (int i = 0; i < seqData2.numFonts; i++) {
         fontId = seqData2.fonts[i];
         AudioLoad_SyncLoadFont(fontId); // NOTE: If this is commented out, then enemies will play child link sounds...
-        //numFonts--;
+        // numFonts--;
     }
 
     seqData = AudioLoad_SyncLoadSeq(seqId);
@@ -619,24 +621,21 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
     // Fix for barinade boss fight starting music multiple times
     // this is not noticeable if the sequence is authentic, since the "Boss Battle"
     // sequence begins with some silence
-    if (gPlayState != NULL &&
-        gPlayState->sceneNum == SCENE_JABU_JABU_BOSS &&
-        playerIdx == SEQ_PLAYER_BGM_MAIN &&
+    if (gPlayState != NULL && gPlayState->sceneNum == SCENE_JABU_JABU_BOSS && playerIdx == SEQ_PLAYER_BGM_MAIN &&
         seqId != NA_BGM_BOSS) {
-        
+
         seqPlayer->delay = 10;
     }
-    
+
     AudioSeq_SkipForwardSequence(seqPlayer);
     //! @bug missing return (but the return value is not used so it's not UB)
-    
+
     // Keep track of the previous sequence/scene so we don't repeat notifications
     static uint16_t previousSeqId = UINT16_MAX;
     static int16_t previousSceneNum = INT16_MAX;
-    if (CVarGetInteger(CVAR_AUDIO("SeqNameOverlay"), 0) &&
-        playerIdx == SEQ_PLAYER_BGM_MAIN &&
+    if (CVarGetInteger(CVAR_AUDIO("SeqNameOverlay"), 0) && playerIdx == SEQ_PLAYER_BGM_MAIN &&
         (seqId != previousSeqId || (gPlayState != NULL && gPlayState->sceneNum != previousSceneNum))) {
-        
+
         previousSeqId = seqId;
         if (gPlayState != NULL) {
             previousSceneNum = gPlayState->sceneNum;
@@ -679,7 +678,7 @@ uintptr_t AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32
         return ret;
     }
 
-    //cachePolicy = sampleBankTable->entries[sampleBankId].cachePolicy;
+    // cachePolicy = sampleBankTable->entries[sampleBankId].cachePolicy;
     if (/* cachePolicy == 4 || */ noLoad == true) {
         *outMedium = sampleBankTable->entries[sampleBankId].medium;
         return sampleBankTable->entries[realTableId].romAddr;
@@ -707,23 +706,23 @@ SoundFontData* AudioLoad_SyncLoadFont(u32 fontId) {
         return NULL;
     }
 
-    SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
 
     sampleBankId1 = sf->sampleBankId1;
     sampleBankId2 = sf->sampleBankId2;
 
     relocInfo.sampleBankId1 = sampleBankId1;
     relocInfo.sampleBankId2 = sampleBankId2;
-    //if (sampleBankId1 != 0xFF) {
-        //relocInfo.baseAddr1 = AudioLoad_TrySyncLoadSampleBank(sampleBankId1, &relocInfo.medium1, false);
+    // if (sampleBankId1 != 0xFF) {
+    // relocInfo.baseAddr1 = AudioLoad_TrySyncLoadSampleBank(sampleBankId1, &relocInfo.medium1, false);
     //} else {
-        relocInfo.baseAddr1 = 0;
+    relocInfo.baseAddr1 = 0;
     //}
 
-    //if (sampleBankId2 != 0xFF) {
-        //relocInfo.baseAddr2 = AudioLoad_TrySyncLoadSampleBank(sampleBankId2, &relocInfo.medium2, false);
+    // if (sampleBankId2 != 0xFF) {
+    // relocInfo.baseAddr2 = AudioLoad_TrySyncLoadSampleBank(sampleBankId2, &relocInfo.medium2, false);
     //} else {
-        relocInfo.baseAddr2 = 0;
+    relocInfo.baseAddr2 = 0;
     //}
 
     ret = AudioLoad_SyncLoad(FONT_TABLE, fontId, &didAllocate);
@@ -757,31 +756,26 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
         char* seqData = 0;
         SoundFont* fnt;
 
-        if (tableType == SEQUENCE_TABLE)
-        {
+        if (tableType == SEQUENCE_TABLE) {
             SequenceData sData = ResourceMgr_LoadSeqByName(sequenceMap[id]);
             seqData = sData.seqData;
             size = sData.seqDataSize;
             medium = sData.medium;
             cachePolicy = sData.cachePolicy;
             romAddr = 0;
-        }
-        else if (tableType == FONT_TABLE)
-        {
-            fnt = ResourceMgr_LoadAudioSoundFont(fontMap[id]);
+        } else if (tableType == FONT_TABLE) {
+            fnt = ResourceMgr_LoadAudioSoundFontByName(fontMap[id]);
             size = sizeof(SoundFont);
             medium = 2;
             cachePolicy = 0;
             romAddr = 0;
-        }
-        else
-        {
-            //table = AudioLoad_GetLoadTable(tableType);
-            //size = table->entries[realId].size;
-            //size = ALIGN16(size);
-            //medium = table->entries[id].medium;
-            //cachePolicy = table->entries[id].cachePolicy;
-            //romAddr = table->entries[realId].romAddr;
+        } else {
+            // table = AudioLoad_GetLoadTable(tableType);
+            // size = table->entries[realId].size;
+            // size = ALIGN16(size);
+            // medium = table->entries[id].medium;
+            // cachePolicy = table->entries[id].cachePolicy;
+            // romAddr = table->entries[realId].romAddr;
         }
 
         switch (cachePolicy) {
@@ -820,9 +814,8 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
                 AudioLoad_SyncDma(seqData, ret, size, medium);
             } else if (tableType == FONT_TABLE) {
                 AudioLoad_SyncDma(fnt, ret, size, medium);
-            }
-            else {
-                //AudioLoad_SyncDma(romAddr, ret, size, medium);
+            } else {
+                // AudioLoad_SyncDma(romAddr, ret, size, medium);
             }
         }
 
@@ -846,18 +839,17 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
     return ret;
 }
 
-u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id)
-{
+u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id) {
     if ((tableType == SEQUENCE_TABLE || tableType == FONT_TABLE)) {
         return id;
     }
 
-    //AudioTable* table = AudioLoad_GetLoadTable(tableType);
+    // AudioTable* table = AudioLoad_GetLoadTable(tableType);
 
     // If the size is 0, then this entry actually redirects to another entry.
     // The rom address is actually an index into the same table where the "real" data is.
-    //if (table->entries[id].size == 0) {
-        //id = table->entries[id].romAddr;
+    // if (table->entries[id].size == 0) {
+    // id = table->entries[id].romAddr;
     //}
 
     return id;
@@ -900,6 +892,7 @@ AudioTable* AudioLoad_GetLoadTable(s32 tableType) {
 }
 
 void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo) {
+    return;
     uintptr_t reloc;
     uintptr_t reloc2;
     Instrument* inst;
@@ -911,7 +904,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
     s32 numInstruments = 0;
     s32 numSfx = 0;
 
-    sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
     numDrums = sf->numDrums;
     numInstruments = sf->numInstruments;
     numSfx = sf->numSfx;
@@ -921,15 +914,12 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
 #define BASE_OFFSET(x) (void*)((u32)(x) + (u32)(mem))
 
     reloc2 = ptrs[0];
-    if ((numDrums != 0))
-    {
+    if ((numDrums != 0)) {
         ptrs[0] = BASE_OFFSET(reloc2);
-        for (i = 0; i < numDrums; i++)
-        {
+        for (i = 0; i < numDrums; i++) {
             drum = sf->drums[i];
 
-            if (!drum->loaded)
-            {
+            if (!drum->loaded) {
                 AudioLoad_RelocateSample(&sf->drums[i]->sound, mem, relocInfo, fontOffsets[fontId]);
                 drum->loaded = 1;
             }
@@ -956,8 +946,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
         inst = sf->instruments[i];
 
         if (inst != NULL && !inst->loaded) {
-            if (inst->normalRangeLo != 0)
-            {
+            if (inst->normalRangeLo != 0) {
                 AudioLoad_RelocateSample(&inst->lowNotesSound, mem, relocInfo, fontOffsets[fontId]);
             }
             AudioLoad_RelocateSample(&inst->normalNotesSound, mem, relocInfo, fontOffsets[fontId]);
@@ -976,7 +965,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
 void AudioLoad_SyncDma(uintptr_t devAddr, u8* addr, size_t size, s32 medium) {
     OSMesgQueue* msgQueue = &gAudioContext.syncDmaQueue;
     OSIoMesg* ioMesg = &gAudioContext.syncDmaIoMesg;
-    //size = ALIGN16(size);
+    // size = ALIGN16(size);
 
     Audio_InvalDCache(addr, size);
 
@@ -1257,19 +1246,20 @@ void AudioLoad_InitSwapFont(void) {
 
 #undef BASE_ROM_OFFSET
 
-int strcmp_sort( const void *str1, const void *str2 ) {
-    char *const *pp1 = str1;
-    char *const *pp2 = str2;
+int strcmp_sort(const void* str1, const void* str2) {
+    char* const* pp1 = str1;
+    char* const* pp2 = str2;
     return strcmp(*pp1, *pp2);
 }
 
 void AudioLoad_Init(void* heap, size_t heapSize) {
-    char pad[0x48];
+    s32 pad1[9];
     s32 numFonts;
-    void* temp_v0_3;
+    s32 pad2[2];
+    u8* audioCtxPtr;
+    void* addr;
     s32 i;
-    u64* heapP;
-    s16* u2974p;
+    s32 j;
 
     D_801755D0 = NULL;
     gAudioContext.resetTimer = 0;
@@ -1283,10 +1273,12 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
             gAudioContext.unk_2960 = 20.03042f;
             gAudioContext.refreshRate = 50;
             break;
+
         case OS_TV_MPAL:
             gAudioContext.unk_2960 = 16.546f;
             gAudioContext.refreshRate = 60;
             break;
+
         case OS_TV_NTSC:
         default:
             gAudioContext.unk_2960 = 16.713f;
@@ -1295,7 +1287,7 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
 
     Audio_InitMesgQueues();
 
-    for (i = 0; i < 3; i++) {
+    for (i = 0; i < ARRAY_COUNT(gAudioContext.aiBufLengths); i++) {
         gAudioContext.aiBufLengths[i] = 0xA0;
     }
 
@@ -1306,12 +1298,14 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
     gAudioContext.currTask = NULL;
     gAudioContext.rspTask[0].task.t.data_size = 0;
     gAudioContext.rspTask[1].task.t.data_size = 0;
+
     osCreateMesgQueue(&gAudioContext.syncDmaQueue, &gAudioContext.syncDmaMesg, 1);
-    osCreateMesgQueue(&gAudioContext.currAudioFrameDmaQueue, gAudioContext.currAudioFrameDmaMesgBuf, 0x40);
+    osCreateMesgQueue(&gAudioContext.currAudioFrameDmaQueue, gAudioContext.currAudioFrameDmaMesgBuf,
+                      ARRAY_COUNT(gAudioContext.currAudioFrameDmaMesgBuf));
     osCreateMesgQueue(&gAudioContext.externalLoadQueue, gAudioContext.externalLoadMesgBuf,
                       ARRAY_COUNT(gAudioContext.externalLoadMesgBuf));
     osCreateMesgQueue(&gAudioContext.preloadSampleQueue, gAudioContext.preloadSampleMesgBuf,
-                      ARRAY_COUNT(gAudioContext.externalLoadMesgBuf));
+                      ARRAY_COUNT(gAudioContext.preloadSampleMesgBuf));
     gAudioContext.curAudioFrameDmaCount = 0;
     gAudioContext.sampleDmaCount = 0;
     gAudioContext.cartHandle = osCartRomInit();
@@ -1321,107 +1315,151 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
         gAudioContext.audioHeapSize = D_8014A6C4.heapSize;
     } else {
         void** hp = &heap;
+
         gAudioContext.audioHeap = *hp;
         gAudioContext.audioHeapSize = heapSize;
     }
 
-    for (i = 0; i < gAudioContext.audioHeapSize / 8; i++) {
+    for (i = 0; i < ((s32)gAudioContext.audioHeapSize / (s32)sizeof(u64)); i++) {
         ((u64*)gAudioContext.audioHeap)[i] = 0;
     }
 
+    // Main Pool Split (split entirety of audio heap into initPool and sessionPool)
     AudioHeap_InitMainPools(D_8014A6C4.initPoolSize);
 
-    for (i = 0; i < 3; i++) {
+    // Initialize the audio interface buffers
+    for (i = 0; i < ARRAY_COUNT(gAudioContext.aiBuffers); i++) {
         gAudioContext.aiBuffers[i] = AudioHeap_AllocZeroed(&gAudioContext.audioInitPool, AIBUF_LEN * sizeof(s16));
     }
 
-    //gAudioContext.sequenceTable = (AudioTable*)gSequenceTable;
-    //gAudioContext.soundFontTable = (AudioTable*)gSoundFontTable;
-    //gAudioContext.sampleBankTable = (AudioTable*)gSampleBankTable;
-    //gAudioContext.sequenceFontTable = gSequenceFontTable;
-    //gAudioContext.numSequences = gAudioContext.sequenceTable->numEntries;
+    // Connect audio tables to their tables in memory
+    // gAudioContext.sequenceTable = (AudioTable*)gSequenceTable;
+    // gAudioContext.soundFontTable = (AudioTable*)gSoundFontTable;
+    // gAudioContext.sampleBankTable = (AudioTable*)gSampleBankTable;
+    // gAudioContext.sequenceFontTable = gSequenceFontTable;
+    // gAudioContext.numSequences = gAudioContext.sequenceTable->numEntries;
 
     gAudioContext.audioResetSpecIdToLoad = 0;
-    gAudioContext.resetStatus = 1;
-
+    gAudioContext.resetStatus = 1; // Set reset to immediately initialize the audio heap
     AudioHeap_ResetStep();
 
+    // Initialize audio tables
+    // AudioLoad_InitTable(gAudioContext.sequenceTable, SEGMENT_ROM_START(Audioseq), 0);
+    // AudioLoad_InitTable(gAudioContext.soundFontTable, SEGMENT_ROM_START(Audiobank), 0);
+    // AudioLoad_InitTable(gAudioContext.sampleBankTable, SEGMENT_ROM_START(Audiotable), 0);
+
+    // #region 2S2H [Port] Audio in the archive and custom sequences
+    // Only load the original sequences right now because custom songs may require data from sound fonts and samples
     int seqListSize = 0;
     int customSeqListSize = 0;
     char** seqList = ResourceMgr_ListFiles("audio/sequences*", &seqListSize);
     char** customSeqList = ResourceMgr_ListFiles("custom/music/*", &customSeqListSize);
-    sequenceMapSize = (size_t)(AudioCollection_SequenceMapSize() + customSeqListSize); 
-    sequenceMap = malloc(sequenceMapSize * sizeof(char*));
-    gAudioContext.seqLoadStatus = malloc(sequenceMapSize * sizeof(char*));
+    sequenceMapSize = (size_t)(seqListSize + customSeqListSize);
+    sequenceMap = malloc((sequenceMapSize + 0xF) * sizeof(char*));
 
-    for (size_t i = 0; i < seqListSize; i++)
-    {
+    gAudioContext.seqLoadStatus = malloc(sequenceMapSize);
+    memset(gAudioContext.seqLoadStatus, 5, sequenceMapSize);
+    for (size_t i = 0; i < seqListSize; i++) {
         SequenceData sDat = ResourceMgr_LoadSeqByName(seqList[i]);
-
-        char* str = malloc(strlen(seqList[i]) + 1);
-        strcpy(str, seqList[i]);
-
-        sequenceMap[sDat.seqNumber] = str;
+        sequenceMap[sDat.seqNumber] = strdup(seqList[i]);
         seqCachePolicyMap[sDat.seqNumber] = sDat.cachePolicy;
     }
 
     free(seqList);
 
-    int startingSeqNum = MAX_AUTHENTIC_SEQID; // 109 is the highest vanilla sequence
+    // 2S2H [Streamed Audio] We need to load the custom songs after the fonts because streamed songs will use a hash to
+    // find its soundfont
+    int fntListSize = 0;
+    int customFntListSize = 0;
+    char** fntList = ResourceMgr_ListFiles("audio/fonts*", &fntListSize);
+    char** customFntList = ResourceMgr_ListFiles("custom/fonts/*", &customFntListSize);
+
+    gAudioContext.fontLoadStatus = malloc(customFntListSize + fntListSize);
+    fontMap = calloc(customFntListSize + fntListSize, sizeof(char*));
+    fontMapSize = customFntListSize + fntListSize;
+    for (int i = 0; i < fntListSize; i++) {
+        SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fntList[i]);
+        fontMap[sf->fntIndex] = strdup(fntList[i]);
+    }
+
+    free(fntList);
+
+    int customFontStart = fntListSize;
+    for (int i = customFontStart; i < customFntListSize + fntListSize; i++) {
+        SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(customFntList[i - customFontStart]);
+        sf->fntIndex = i;
+        fontMap[i] = strdup(customFntList[i - customFontStart]);
+    }
+    free(customFntList);
+
+    // 2S2H Port I think we need to take use seqListSize because entry 0x7A is missing.
+    int startingSeqNum = seqListSize; // MAX_AUTHENTIC_SEQID; // 109 is the highest vanilla sequence
     qsort(customSeqList, customSeqListSize, sizeof(char*), strcmp_sort);
 
-    // Because AudioCollection's sequenceMap actually has more than sequences (including instruments from 130-135 and sfx in the 2000s, 6000s, 10000s, 14000s, 18000s, and 26000s),
-    // it's better here to keep track of the next empty seqNum in AudioCollection instead of just skipping past the instruments at 130 with a higher MAX_AUTHENTIC_SEQID,
-    // especially if those others could be added to in the future. However, this really needs to be streamlined with specific ranges in AudioCollection for types, or unifying
-    // AudioCollection and the various maps in here
+    // Because AudioCollection's sequenceMap actually has more than sequences (including instruments from 130-135 and
+    // sfx in the 2000s, 6000s, 10000s, 14000s, 18000s, and 26000s), it's better here to keep track of the next empty
+    // seqNum in AudioCollection instead of just skipping past the instruments at 130 with a higher MAX_AUTHENTIC_SEQID,
+    // especially if those others could be added to in the future. However, this really needs to be streamlined with
+    // specific ranges in AudioCollection for types, or unifying AudioCollection and the various maps in here
     int seqNum = startingSeqNum;
 
     for (size_t i = startingSeqNum; i < startingSeqNum + customSeqListSize; i++) {
         // ensure that what would be the next sequence number is actually unassigned in AudioCollection
+        int j = i - startingSeqNum;
+        SequenceData* sDat = ResourceMgr_LoadSeqPtrByName(customSeqList[j]);
+
+        if (sDat->numFonts == -1) {
+            uint64_t crc;
+
+            memcpy(&crc, sDat->fonts, sizeof(uint64_t));
+            const char* res = ResourceGetNameByCrc(crc);
+            if (res == NULL) {
+                // Passing a null buffer and length of 0 to snprintf will return the required numbers of characters the
+                // buffer needs to be.
+                int len =
+                    snprintf(NULL, 0, "Could not find sound font for sequence %s. It will not be in the audio editor.",
+                             customSeqList[j]);
+                char* error = malloc(len + 1);
+                snprintf(error, len, "Could not find sound font for sequence %s. It will not be in the audio editor.",
+                         customSeqList[j]);
+                LUSLOG_ERROR("%s", error);
+                Messagebox_ShowErrorBox("Invalid Sequence", error);
+                free(error);
+                continue;
+            }
+            SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(res);
+            memset(&sDat->fonts[0], 0, sizeof(sDat->fonts));
+            sDat->fonts[0] = sf->fntIndex;
+            sDat->numFonts = 1;
+        }
+
         while (AudioCollection_HasSequenceNum(seqNum)) {
             seqNum++;
         }
-        int j = i - startingSeqNum;
+
         AudioCollection_AddToCollection(customSeqList[j], seqNum);
-        SequenceData sDat = ResourceMgr_LoadSeqByName(customSeqList[j]);
-        sDat.seqNumber = seqNum;
 
-        char* str = malloc(strlen(customSeqList[j]) + 1);
-        strcpy(str, customSeqList[j]);
-
-        sequenceMap[sDat.seqNumber] = str;
+        sDat->seqNumber = seqNum;
+        printf("%d\n", seqNum);
+        sequenceMap[sDat->seqNumber] = strdup(customSeqList[j]);
         seqNum++;
     }
 
     free(customSeqList);
 
-    int fntListSize = 0;
-    char** fntList = ResourceMgr_ListFiles("audio/fonts*", &fntListSize);
+    numFonts = fntListSize;
 
-    for (int i = 0; i < fntListSize; i++)
-    {
-        SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fntList[i]);
+    // #end region
+    gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.audioInitPool, numFonts * sizeof(SoundFont));
 
-        char* str = malloc(strlen(fntList[i]) + 1);
-        strcpy(str, fntList[i]);
-
-        fontMap[sf->fntIndex] = str;
-    }
-
-        numFonts = fntListSize;
-
-        free(fntList);
-        gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.audioInitPool, numFonts * sizeof(SoundFont));
-
-
-    if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) {
+    if (addr = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), addr == NULL) {
         // cast away const from D_8014A6C4
-        // *((u32*)&D_8014A6C4.permanentPoolSize) = 0;
+        *((u32*)&D_8014A6C4.permanentPoolSize) = 0;
     }
 
-    AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, temp_v0_3, D_8014A6C4.permanentPoolSize);
+    AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, addr, D_8014A6C4.permanentPoolSize);
     gAudioContextInitalized = true;
-    osSendMesg32(gAudioContext.taskStartQueueP, gAudioContext.totalTaskCnt, OS_MESG_NOBLOCK);
+    osSendMesg(gAudioContext.taskStartQueueP, OS_MESG_32(gAudioContext.totalTaskCnt), OS_MESG_NOBLOCK);
 }
 
 void AudioLoad_InitSlowLoads(void) {
@@ -1641,8 +1679,7 @@ void AudioLoad_InitAsyncLoads(void) {
 }
 
 AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, uintptr_t devAddr, uintptr_t ramAddr, size_t size,
-                                                  s32 medium,
-                                                  s32 nChunks, OSMesgQueue* retQueue, s32 retMsg) {
+                                                  s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg) {
     AudioAsyncLoad* asyncLoad;
 
     asyncLoad = AudioLoad_StartAsyncLoad(devAddr, ramAddr, size, medium, nChunks, retQueue, retMsg);
@@ -1830,8 +1867,7 @@ void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size) {
 void AudioLoad_AsyncDmaUnkMedium(uintptr_t devAddr, uintptr_t ramAddr, size_t size, s16 arg3) {
 }
 
-void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo, int fontId) 
-{
+void AudioLoad_RelocateSample(SoundFontSound* sound, SoundFontData* mem, RelocInfo* relocInfo, int fontId) {
 }
 
 void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo, s32 async) {
@@ -2080,7 +2116,7 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, RelocInfo* relocInfo
 
     gAudioContext.numUsedSamples = 0;
 
-    SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
 
     numDrums = sf->numDrums;
     numInstruments = sf->numInstruments;
@@ -2205,12 +2241,11 @@ void AudioLoad_LoadPermanentSamples(void) {
     for (i = 0; i < gAudioContext.permanentPool.count; i++) {
         RelocInfo relocInfo;
 
-        if (gAudioContext.permanentCache[i].tableType == FONT_TABLE)
-        {
+        if (gAudioContext.permanentCache[i].tableType == FONT_TABLE) {
             fontId = AudioLoad_GetRealTableIndex(FONT_TABLE, gAudioContext.permanentCache[i].id);
-            //fontId = gAudioContext.permanentCache[i].id;
+            // fontId = gAudioContext.permanentCache[i].id;
 
-            SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+            SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
             relocInfo.sampleBankId1 = sf->sampleBankId1;
             relocInfo.sampleBankId2 = sf->sampleBankId2;
 
diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c
index 430c463f86..a43a083800 100644
--- a/soh/src/code/audio_playback.c
+++ b/soh/src/code/audio_playback.c
@@ -95,7 +95,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
     vel = 0.0f > vel ? 0.0f : vel;
     vel = 1.0f < vel ? 1.0f : vel;
 
-    float master_vol = (float)CVarGetInteger(CVAR_SETTING("Volume.Master"), 100) / 100.0f;
+    float master_vol = (float)CVarGetInteger(CVAR_SETTING("Volume.Master"), 40) / 100.0f;
     sub->targetVolLeft = (s32)((vel * volLeft) * (0x1000 - 0.001f)) * master_vol;
     sub->targetVolRight = (s32)((vel * volRight) * (0x1000 - 0.001f)) * master_vol;
 
@@ -121,7 +121,7 @@ void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput)
     } else {
         noteSubEu->bitField1.hasTwoParts = true;
         if (3.99996f < resamplingRateInput) {
-            if (CVarGetInteger(CVAR_AUDIO("ExperimentalOctaveDrop"), 0)) {
+            if (CVarGetInteger(CVAR_AUDIO("ExperimentalOctaveDrop"), 0) || noteSubEu->bitField1.isSyntheticWave) {
                 resamplingRate = resamplingRateInput * 0.25;
             } else {
                 resamplingRate = 1.99998f;
@@ -147,6 +147,7 @@ void Audio_NoteInit(Note* note) {
     note->noteSubEu = gDefaultNoteSub;
 }
 
+extern void aOPUSFree(struct OggOpusFile* opusFile);
 void Audio_NoteDisable(Note* note) {
     if (note->noteSubEu.bitField0.needsInit == true) {
         note->noteSubEu.bitField0.needsInit = false;
@@ -159,6 +160,10 @@ void Audio_NoteDisable(Note* note) {
     note->playbackState.prevParentLayer = NO_LAYER;
     note->playbackState.adsr.action.s.state = ADSR_STATE_DISABLED;
     note->playbackState.adsr.current = 0;
+    if (note->synthesisState.opusFile != NULL) {
+        aOPUSFree(note->synthesisState.opusFile);
+        note->synthesisState.opusFile = NULL;
+    }
 }
 
 void Audio_ProcessNotes(void) {
@@ -293,16 +298,8 @@ void Audio_ProcessNotes(void) {
 
             f32 resampRate = gAudioContext.audioBufferParameters.resampleRate;
 
-            // CUSTOM SAMPLE CHECK
-            if (!noteSubEu2->bitField1.isSyntheticWave && noteSubEu2->sound.soundFontSound != NULL &&
-                noteSubEu2->sound.soundFontSound->sample != NULL &&
-                noteSubEu2->sound.soundFontSound->sample->sampleRateMagicValue == 'RIFF') {
-                resampRate = CALC_RESAMPLE_FREQ(noteSubEu2->sound.soundFontSound->sample->sampleRate);
-            }
-
             subAttrs.frequency *= resampRate;
 
-
             subAttrs.velocity *= scale;
             Audio_InitNoteSub(note, noteSubEu2, &subAttrs);
             noteSubEu->bitField1.bookOffset = bookOffset;
@@ -336,7 +333,7 @@ Instrument* Audio_GetInstrumentInner(s32 fontId, s32 instId) {
     }
 
     int instCnt = 0;
-    SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
 
     if (instId >= sf->numInstruments)
         return NULL;
@@ -363,12 +360,11 @@ Drum* Audio_GetDrum(s32 fontId, s32 drumId) {
         return NULL;
     }
 
-    
-    SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
     if (drumId < sf->numDrums) {
         drum = sf->drums[drumId];
     }
-    
+
     if (drum == NULL) {
         gAudioContext.audioErrorFlags = ((fontId << 8) + drumId) + 0x5000000;
     }
@@ -388,7 +384,7 @@ SoundFontSound* Audio_GetSfx(s32 fontId, s32 sfxId) {
         return NULL;
     }
 
-    SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
+    SoundFont* sf = ResourceMgr_LoadAudioSoundFontByName(fontMap[fontId]);
     if (sfxId < sf->numSfx) {
         sfx = &sf->soundEffects[sfxId];
     }
diff --git a/soh/src/code/audio_seqplayer.c b/soh/src/code/audio_seqplayer.c
index e194fd28b7..b99d29e1ed 100644
--- a/soh/src/code/audio_seqplayer.c
+++ b/soh/src/code/audio_seqplayer.c
@@ -789,7 +789,7 @@ s32 AudioSeq_SeqLayerProcessScriptStep4(SequenceLayer* layer, s32 cmd) {
     layer->freqScale *= layer->unk_34;
     if (layer->delay == 0) {
         if (layer->sound != NULL) {
-            time = (f32)layer->sound->sample->loop->end;
+            time = (f32)layer->sound->sample->loop->loopEnd;
         } else {
             time = 0.0f;
         }
@@ -944,12 +944,10 @@ u8 AudioSeq_GetInstrument(SequenceChannel* channel, u8 instId, Instrument** inst
         return 0;
     }
 
-    if (inst->envelope != NULL)
-    {
+    if (inst->envelope != NULL) {
         adsr->envelope = inst->envelope;
         adsr->releaseRate = (inst->releaseRate);
-    }
-    else {
+    } else {
         adsr->envelope = gDefaultEnvelope;
     }
 
@@ -1064,8 +1062,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
                         result = (u8)parameters[0];
                         command = (u8)parameters[0];
 
-                        if (seqPlayer->defaultFont != 0xFF) 
-                        {
+                        if (seqPlayer->defaultFont != 0xFF) {
                             if (gAudioContext.seqReplaced[seqPlayer->playerIdx]) {
                                 seqPlayer->seqId = gAudioContext.seqToPlay[seqPlayer->playerIdx];
                                 gAudioContext.seqReplaced[seqPlayer->playerIdx] = 0;
@@ -1075,8 +1072,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
                             command = sDat.fonts[sDat.numFonts - result - 1];
                         }
 
-                        if (AudioHeap_SearchCaches(FONT_TABLE, CACHE_EITHER, command)) 
-                        {
+                        if (AudioHeap_SearchCaches(FONT_TABLE, CACHE_EITHER, command)) {
                             channel->fontId = command;
                         }
 
@@ -1181,8 +1177,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
                         result = (u8)parameters[0];
                         command = (u8)parameters[0];
 
-                        if (seqPlayer->defaultFont != 0xFF) 
-                        {
+                        if (seqPlayer->defaultFont != 0xFF) {
                             if (gAudioContext.seqReplaced[seqPlayer->playerIdx]) {
                                 seqPlayer->seqId = gAudioContext.seqToPlay[seqPlayer->playerIdx];
                                 gAudioContext.seqReplaced[seqPlayer->playerIdx] = 0;
@@ -1190,16 +1185,15 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
                             u16 seqId = AudioEditor_GetReplacementSeq(seqPlayer->seqId);
                             SequenceData sDat = ResourceMgr_LoadSeqByName(sequenceMap[seqId]);
 
-                            // The game apparantely would sometimes do negative array lookups, the result of which would get rejected by AudioHeap_SearchCaches, never
-                            // changing the actual fontid.
+                            // The game apparantely would sometimes do negative array lookups, the result of which would
+                            // get rejected by AudioHeap_SearchCaches, never changing the actual fontid.
                             if (result > sDat.numFonts)
                                 break;
 
                             command = sDat.fonts[(sDat.numFonts - result - 1)];
                         }
 
-                        if (AudioHeap_SearchCaches(FONT_TABLE, CACHE_EITHER, command)) 
-                        {
+                        if (AudioHeap_SearchCaches(FONT_TABLE, CACHE_EITHER, command)) {
                             channel->fontId = command;
                         }
 
@@ -1353,7 +1347,8 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
                         break;
                     case 0xB2:
                         offset = (u16)parameters[0];
-                        channel->unk_22 = BE16SWAP(*(u16*)(seqPlayer->seqData + (uintptr_t)(offset + scriptState->value * 2)));
+                        channel->unk_22 =
+                            BE16SWAP(*(u16*)(seqPlayer->seqData + (uintptr_t)(offset + scriptState->value * 2)));
                         break;
                     case 0xB4:
                         channel->dynTable = (void*)&seqPlayer->seqData[channel->unk_22];
diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c
index 7044a48c46..abd657e0d9 100644
--- a/soh/src/code/audio_synthesis.c
+++ b/soh/src/code/audio_synthesis.c
@@ -164,7 +164,8 @@ Acmd* AudioSynth_Update(Acmd* cmdStart, s32* cmdCnt, s16* aiStart, s32 aiBufLen)
             }
         }
 
-        cmdP = AudioSynth_DoOneAudioUpdate(aiBufP, chunkLen, cmdP, gAudioContext.audioBufferParameters.updatesPerFrame - i);
+        cmdP = AudioSynth_DoOneAudioUpdate(aiBufP, chunkLen, cmdP,
+                                           gAudioContext.audioBufferParameters.updatesPerFrame - i);
         aiBufLen -= chunkLen;
         aiBufP += chunkLen * 2;
     }
@@ -561,8 +562,8 @@ Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updat
     NoteSubEu* noteSubEu2;
     s32 unk14;
 
-    //if (aiBufLen == 0)
-        //return;
+    // if (aiBufLen == 0)
+    // return;
 
     t = gAudioContext.numNotes * updateIndex;
     count = 0;
@@ -756,12 +757,11 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
         cmd = AudioSynth_LoadWaveSamples(cmd, noteSubEu, synthState, nSamplesToLoad);
         noteSamplesDmemAddrBeforeResampling = DMEM_UNCOMPRESSED_NOTE + (synthState->samplePosInt * 2);
         synthState->samplePosInt += nSamplesToLoad;
-    } else 
-    {
+    } else {
         audioFontSample = noteSubEu->sound.soundFontSound->sample;
-        
+
         loopInfo = audioFontSample->loop;
-        loopEndPos = loopInfo->end;
+        loopEndPos = loopInfo->loopEnd;
         sampleAddr = audioFontSample->sampleAddr;
         resampledTempLen = 0;
 
@@ -828,7 +828,6 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
                         noteFinished = true;
                     }
                 }
-               
 
                 switch (audioFontSample->codec) {
                     case CODEC_ADPCM:
@@ -854,14 +853,27 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
                         s5 = samplesLenAdjusted;
                         goto skip;
                     case CODEC_S16:
-                        AudioSynth_ClearBuffer(cmd++, DMEM_UNCOMPRESSED_NOTE, (samplesLenAdjusted * 2) + 0x20);
-                        AudioSynth_LoadBuffer(cmd++, DMEM_UNCOMPRESSED_NOTE, ALIGN16(nSamplesToLoad * 2),
-                                              audioFontSample->sampleAddr + (synthState->samplePosInt * 2));
-                        
+                    case CODEC_OPUS:
+                        AudioSynth_ClearBuffer(cmd++, DMEM_UNCOMPRESSED_NOTE, (samplesLenAdjusted + 16) * 2);
                         flags = A_CONTINUE;
                         skipBytes = 0;
-                        nSamplesProcessed = samplesLenAdjusted;
-                        s5 = samplesLenAdjusted;
+                        size_t bytesToRead;
+                        nSamplesProcessed += samplesLenAdjusted;
+
+                        if (((synthState->samplePosInt * 2) + (samplesLenAdjusted)*2) < audioFontSample->size) {
+                            bytesToRead = (samplesLenAdjusted)*2;
+                        } else {
+                            bytesToRead = audioFontSample->size - (synthState->samplePosInt * 2);
+                        }
+                        // 2S2H [Port] [Custom audio] Handle decoding OPUS data
+                        if (audioFontSample->codec == CODEC_OPUS) {
+                            aOPUSdecImpl(sampleAddr, DMEM_UNCOMPRESSED_NOTE, bytesToRead, &synthState->opusFile,
+                                         synthState->samplePosInt, audioFontSample->fileSize);
+                        } else {
+                            aLoadBuffer(cmd++, sampleAddr + (synthState->samplePosInt * 2), DMEM_UNCOMPRESSED_NOTE,
+                                        bytesToRead);
+                        }
+
                         goto skip;
                     case CODEC_REVERB:
                         break;
@@ -870,8 +882,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
                 if (nFramesToDecode != 0) {
                     frameIndex = (synthState->samplePosInt + skipInitialSamples - nFirstFrameSamplesToIgnore) / 16;
                     sampleDataOffset = frameIndex * frameSize;
-                    if (audioFontSample->medium == MEDIUM_RAM) 
-                    {
+                    if (audioFontSample->medium == MEDIUM_RAM) {
                         sampleData = (u8*)(sampleDataStart + sampleDataOffset + sampleAddr);
                     } else if (audioFontSample->medium == MEDIUM_UNK) {
                         return cmd;
@@ -888,6 +899,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
                     sampleDataStartPad = (uintptr_t)sampleData & 0xF;
                     aligned = ALIGN16((nFramesToDecode * frameSize) + 16);
                     addr = DMEM_COMPRESSED_ADPCM_DATA - aligned;
+
                     aLoadBuffer(cmd++, sampleData - sampleDataStartPad, addr, aligned);
                 } else {
                     nSamplesToDecode = 0;
@@ -895,7 +907,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
                 }
 
                 if (synthState->restart) {
-                    aSetLoop(cmd++, audioFontSample->loop->state);
+                    aSetLoop(cmd++, audioFontSample->loop->predictorState);
                     flags = A_LOOP;
                     synthState->restart = false;
                 }
@@ -958,7 +970,8 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
 
             skip:
                 if (noteFinished) {
-                    AudioSynth_ClearBuffer(cmd++, DMEM_UNCOMPRESSED_NOTE + s5, (samplesLenAdjusted - nSamplesProcessed) * 2);
+                    AudioSynth_ClearBuffer(cmd++, DMEM_UNCOMPRESSED_NOTE + s5,
+                                           (samplesLenAdjusted - nSamplesProcessed) * 2);
                     finished = true;
                     note->noteSubEu.bitField0.finished = true;
                     func_800DB2C0(updateIndex, noteIndex);
@@ -1034,8 +1047,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
     unk7 = noteSubEu->unk_07;
     unkE = noteSubEu->unk_0E;
     buf = &synthState->synthesisBuffers->panSamplesBuffer[0x18];
-    if (unk7 != 0 && noteSubEu->unk_0E != 0) 
-    {
+    if (unk7 != 0 && noteSubEu->unk_0E != 0) {
         AudioSynth_DMemMove(cmd++, DMEM_TEMP, DMEM_SCRATCH2, aiBufLen * 2);
         thing = DMEM_SCRATCH2 - unk7;
         if (synthState->unk_1A != 0) {
diff --git a/soh/src/code/code_800A9F30.c b/soh/src/code/code_800A9F30.c
index 3462da7296..2eba3774c9 100644
--- a/soh/src/code/code_800A9F30.c
+++ b/soh/src/code/code_800A9F30.c
@@ -63,7 +63,6 @@ void func_800AA0B4(void) {
 
     gPadMgr.retraceCallback = func_800A9F30;
     gPadMgr.retraceCallbackValue = 0;
-
 }
 
 void func_800AA0F0(void) {
@@ -85,7 +84,7 @@ void func_800AA15C(void) {
     D_80160FD0.unk_104 = 2;
 }
 
-void func_800AA16C(void) {
+void Rumble_ClearRequests(void) {
     D_80160FD0.unk_104 = 0;
 }
 
diff --git a/soh/src/code/code_800D2E30.c b/soh/src/code/code_800D2E30.c
index 2742e72328..725df18cce 100644
--- a/soh/src/code/code_800D2E30.c
+++ b/soh/src/code/code_800D2E30.c
@@ -110,7 +110,7 @@ void func_800D2E30(UnkRumbleStruct* arg0) {
 }
 
 void func_800D3140(UnkRumbleStruct* arg0) {
-    memset(arg0, 0,sizeof(UnkRumbleStruct));
+    memset(arg0, 0, sizeof(UnkRumbleStruct));
     arg0->unk_104 = 2;
     arg0->unk_105 = 1;
 }
diff --git a/soh/src/code/code_800E4FE0.c b/soh/src/code/code_800E4FE0.c
index 6eb3ae3695..440fb05a67 100644
--- a/soh/src/code/code_800E4FE0.c
+++ b/soh/src/code/code_800E4FE0.c
@@ -396,8 +396,7 @@ void Audio_QueueCmd(u32 opArgs, u32 data) {
 }
 
 void Audio_QueueCmdF32(u32 opArgs, f32 data) {
-    union
-    {
+    union {
         f32 f;
         u32 u;
     } uData = { .f = data };
@@ -428,9 +427,8 @@ s32 Audio_ScheduleProcessCmds(void) {
         D_801304E8 = (u8)((gAudioContext.cmdWrPos - gAudioContext.cmdRdPos) + 0x100);
     }
 
-    ret =
-        osSendMesg32(gAudioContext.cmdProcQueueP,
-                   (((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK);
+    ret = osSendMesg32(gAudioContext.cmdProcQueueP,
+                       (((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK);
     if (ret != -1) {
         gAudioContext.cmdRdPos = gAudioContext.cmdWrPos;
         ret = 0;
@@ -794,7 +792,7 @@ s32 func_800E6590(s32 playerIdx, s32 arg1, s32 arg2) {
                 if (sound == NULL) {
                     return 0;
                 }
-                loopEnd = sound->sample->loop->end;
+                loopEnd = sound->sample->loop->loopEnd;
                 samplePos = note->synthesisState.samplePosInt;
                 return loopEnd - samplePos;
             }
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c
index 0af2ed9ca5..2da5b4d2b1 100644
--- a/soh/src/code/code_800EC960.c
+++ b/soh/src/code/code_800EC960.c
@@ -26,10 +26,10 @@
 #define Audio_SeqCmd8(playerIdx, a, b, c) \
     Audio_QueueSeqCmd(0x80000000 | ((u8)playerIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c))
 #define Audio_SeqCmdF(playerIdx, a) Audio_QueueSeqCmd(0xF0000000 | ((u8)playerIdx << 24) | ((u8)a))
-#define BTN_CUSTOM_RSTICK_UP       ((CONTROLLERBUTTONS_T)0x01000000)
-#define BTN_CUSTOM_RSTICK_DOWN     ((CONTROLLERBUTTONS_T)0x02000000)
-#define BTN_CUSTOM_RSTICK_LEFT     ((CONTROLLERBUTTONS_T)0x04000000)
-#define BTN_CUSTOM_RSTICK_RIGHT    ((CONTROLLERBUTTONS_T)0x08000000)
+#define BTN_CUSTOM_RSTICK_UP ((CONTROLLERBUTTONS_T)0x01000000)
+#define BTN_CUSTOM_RSTICK_DOWN ((CONTROLLERBUTTONS_T)0x02000000)
+#define BTN_CUSTOM_RSTICK_LEFT ((CONTROLLERBUTTONS_T)0x04000000)
+#define BTN_CUSTOM_RSTICK_RIGHT ((CONTROLLERBUTTONS_T)0x08000000)
 
 typedef struct {
     /* 0x0 */ f32 vol;
@@ -1265,8 +1265,7 @@ void Audio_OcaUpdateBtnMap(bool customControls) {
         sOcarinaA4BtnMap = BTN_CUSTOM_OCARINA_NOTE_A4;
         sOcarinaF4BtnMap = BTN_CUSTOM_OCARINA_NOTE_F4;
         sOcarinaD4BtnMap = BTN_CUSTOM_OCARINA_NOTE_D4;
-    }
-    else {
+    } else {
         sOcarinaD5BtnMap = BTN_CUP;
         sOcarinaB4BtnMap = BTN_CLEFT;
         sOcarinaA4BtnMap = BTN_CRIGHT;
@@ -1286,13 +1285,8 @@ void Audio_OcaUpdateBtnMap(bool customControls) {
         sOcarinaF4BtnMap |= BTN_CUSTOM_RSTICK_DOWN;
     }
 
-    sOcarinaAllowedBtnMask = (
-        sOcarinaD5BtnMap |
-        sOcarinaB4BtnMap |
-        sOcarinaA4BtnMap |
-        sOcarinaF4BtnMap |
-        sOcarinaD4BtnMap
-    );
+    sOcarinaAllowedBtnMask =
+        (sOcarinaD5BtnMap | sOcarinaB4BtnMap | sOcarinaA4BtnMap | sOcarinaF4BtnMap | sOcarinaD4BtnMap);
 }
 
 void Audio_GetOcaInput(void) {
@@ -1545,10 +1539,8 @@ void func_800ED200(void) {
         disableSongBtnMap = BTN_L;
     }
 
-    if (
-        CHECK_BTN_ANY(sCurOcarinaBtnPress, disableSongBtnMap)
-        && CHECK_BTN_ANY(sCurOcarinaBtnPress, sOcarinaAllowedBtnMask)
-    ) {
+    if (CHECK_BTN_ANY(sCurOcarinaBtnPress, disableSongBtnMap) &&
+        CHECK_BTN_ANY(sCurOcarinaBtnPress, sOcarinaAllowedBtnMask)) {
         func_800ECC04((u16)D_80130F3C);
         return;
     }
@@ -1875,7 +1867,6 @@ void func_800EDD68(u8 arg0) {
         lastNote = song[i].noteIdx;
     }
 
-
     if (sRecordSongPos != (i + 1)) {
         sRecordSongPos = i + 2;
         song[sRecordSongPos - 1].unk_02 = 0;
@@ -2062,7 +2053,7 @@ void func_800EE404(void) {
 
 void Audio_OcaMemoryGameStart(u8 minigameRound) {
     u8 i;
-    
+
     // #region SOH [Enhancement]
     if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0)) {
         u8 startingNotes = 3;
@@ -2071,7 +2062,6 @@ void Audio_OcaMemoryGameStart(u8 minigameRound) {
         u8 roundThreeCount = CVarGetInteger(CVAR_ENHANCEMENT("OcarinaGame.RoundThreeNotes"), 8);
         u8 modMinigameNoteCnts[] = { roundOneCount, roundTwoCount, roundThreeCount };
 
-
         startingNotes = CVarGetInteger(CVAR_ENHANCEMENT("OcarinaGame.StartingNotes"), 3);
 
         if (minigameRound > 2) {
@@ -2084,7 +2074,7 @@ void Audio_OcaMemoryGameStart(u8 minigameRound) {
         for (i = 0; i < startingNotes; i++) {
             Audio_OcaMemoryGameGenNote();
         }
-    // #endregion
+        // #endregion
     } else {
         if (minigameRound > 2) {
             minigameRound = 2;
@@ -2124,7 +2114,7 @@ s32 Audio_OcaMemoryGameGenNote(void) {
         sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].volume = 0x50;
         sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].vibrato = 0;
         sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].tone = 0;
-    // #endregion
+        // #endregion
     } else {
         sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].noteIdx = rndNote;
         sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].unk_02 = 0x2D;
@@ -3077,7 +3067,8 @@ void AudioDebug_ProcessInput_SndCont(void) {
             case 2:
             case 3:
                 Audio_PlaySoundGeneral(((sAudioSndContWork[2] << 12) & 0xFFFF) + sAudioSndContWork[3] + SFX_FLAG,
-                                       &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                       &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultReverb);
                 break;
             case 4:
                 func_800F6700(sAudioSndContWork[sAudioSndContSel]);
@@ -3476,7 +3467,8 @@ void AudioDebug_ProcessInput_SfxParamChg(void) {
 
     if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) {
         sfx = (u16)(sAudioSfxParamChgWork[0] << 12) + sAudioSfxParamChgWork[1] + SFX_FLAG;
-        Audio_PlaySoundGeneral(sfx, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(sfx, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultReverb);
     }
 
     if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) {
@@ -4007,7 +3999,8 @@ void Audio_PlayFanfare_Rando(GetItemEntry getItem) {
 
     if (getItem.modIndex == MOD_NONE) {
         if (((itemId >= ITEM_RUPEE_GREEN) && (itemId <= ITEM_RUPEE_GOLD)) || (itemId == ITEM_HEART)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             if (itemId == ITEM_HEART_CONTAINER ||
                 ((itemId == ITEM_HEART_PIECE_2) && ((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) {
@@ -4018,7 +4011,7 @@ void Audio_PlayFanfare_Rando(GetItemEntry getItem) {
             // If we get a skulltula token or the "WINNER" heart, play "get small item"
             // Also make sure "WINNER" heart is not the 4th heart piece.
             if (itemId == ITEM_SKULL_TOKEN || (getItemId == GI_HEART_PIECE_WIN && itemId == ITEM_HEART_PIECE_2 &&
-                (gSaveContext.inventory.questItems & 0xF0000000) != 0x40000000)) {
+                                               (gSaveContext.inventory.questItems & 0xF0000000) != 0x40000000)) {
                 temp1 = NA_BGM_SMALL_ITEM_GET | 0x900;
             }
             // If the setting is toggled on and we get special quest items (longer fanfares):
@@ -4037,9 +4030,9 @@ void Audio_PlayFanfare_Rando(GetItemEntry getItem) {
                 }
             }
             Audio_PlayFanfare(temp1);
-        } 
+        }
     } else if (getItem.modIndex == MOD_RANDOMIZER) {
-        if ((itemId >= RG_BOTTLE_WITH_RED_POTION && itemId <= RG_BOTTLE_WITH_BIG_POE) || 
+        if ((itemId >= RG_BOTTLE_WITH_RED_POTION && itemId <= RG_BOTTLE_WITH_BIG_POE) ||
             (itemId >= RG_DEKU_TREE_MAP && itemId <= RG_GANONS_CASTLE_SMALL_KEY)) {
             temp1 = NA_BGM_ITEM_GET | 0x900;
         } else {
@@ -4112,7 +4105,8 @@ void func_800F4190(Vec3f* pos, u16 sfxId) {
 void Audio_PlaySoundRandom(Vec3f* pos, u16 baseSfxId, u8 randLim) {
     u8 offset = Audio_NextRandom() % randLim;
 
-    Audio_PlaySoundGeneral(baseSfxId + offset, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(baseSfxId + offset, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultReverb);
 }
 
 void func_800F4254(Vec3f* pos, u8 level) {
@@ -4121,10 +4115,12 @@ void func_800F4254(Vec3f* pos, u8 level) {
         D_801305F4 = D_801305E4[level];
         switch (level) {
             case 1:
-                Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultReverb);
                 break;
             case 2:
-                Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultReverb);
                 break;
         }
 
@@ -4132,7 +4128,8 @@ void func_800F4254(Vec3f* pos, u8 level) {
     }
 
     if (level != 0) {
-        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &D_801305F4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultReverb);
     }
 }
 
@@ -4189,8 +4186,8 @@ void Audio_PlaySoundRiver(Vec3f* pos, f32 freqScale) {
         sRiverFreqScaleLerp.remainingFrames = 40;
         sRiverFreqScaleLerp.step = (sRiverFreqScaleLerp.target - sRiverFreqScaleLerp.value) / 40;
     }
-    Audio_PlaySoundGeneral(NA_SE_EV_RIVER_STREAM - SFX_FLAG, pos, 4, &sRiverFreqScaleLerp.value, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_RIVER_STREAM - SFX_FLAG, pos, 4, &sRiverFreqScaleLerp.value,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void Audio_PlaySoundWaterfall(Vec3f* pos, f32 freqScale) {
@@ -4253,8 +4250,7 @@ void func_800F4870(u8 arg0) {
 }
 
 // (name derived from debug strings, should probably update. used in ganon/ganon_boss scenes)
-s32 Audio_SetGanonDistVol(u8 targetVol)
-{
+s32 Audio_SetGanonDistVol(u8 targetVol) {
     u8 phi_v0;
     u16 phi_v0_2;
     u8 i;
@@ -4318,8 +4314,8 @@ void func_800F4A70(void) {
 }
 
 void Audio_PlaySoundIncreasinglyTransposed(Vec3f* pos, s16 sfxId, u8* semitones) {
-    Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitones[sAudioIncreasingTranspose] + 39], &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitones[sAudioIncreasingTranspose] + 39],
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
     if (sAudioIncreasingTranspose < 15) {
         sAudioIncreasingTranspose++;
@@ -4331,7 +4327,8 @@ void Audio_ResetIncreasingTranspose(void) {
 }
 
 void Audio_PlaySoundTransposed(Vec3f* pos, u16 sfxId, s8 semitone) {
-    Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitone + 39], &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitone + 39], &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultReverb);
 }
 
 void func_800F4C58(Vec3f* pos, u16 sfxId, u8 arg2) {
@@ -4691,8 +4688,7 @@ void func_800F5C2C(void) {
     sPrevMainBgmSeqId = NA_BGM_DISABLED;
 }
 
-void Audio_PlayFanfare(u16 seqId)
-{
+void Audio_PlayFanfare(u16 seqId) {
     u16 curSeqId;
     u32 outNumFonts;
     u8* curFontId;
@@ -4707,17 +4703,17 @@ void Audio_PlayFanfare(u16 seqId)
     curFontId = func_800E5E84(curSeqId & 0xFF, &outNumFonts);
     requestedFontId = func_800E5E84(seqId & 0xFF, &outNumFonts);
 
-	if (!curFontId || !requestedFontId) {
-		// disable BGM, we're about to null deref!
-		D_8016B9F4 = 1;
-	} else {
-		if ((curSeqId == NA_BGM_DISABLED) || (*curFontId == *requestedFontId)) {
-			D_8016B9F4 = 1;
-		} else {
-			D_8016B9F4 = 5;
-			Audio_SeqCmd1(SEQ_PLAYER_FANFARE, 0);
-		}
-	}
+    if (!curFontId || !requestedFontId) {
+        // disable BGM, we're about to null deref!
+        D_8016B9F4 = 1;
+    } else {
+        if ((curSeqId == NA_BGM_DISABLED) || (*curFontId == *requestedFontId)) {
+            D_8016B9F4 = 1;
+        } else {
+            D_8016B9F4 = 5;
+            Audio_SeqCmd1(SEQ_PLAYER_FANFARE, 0);
+        }
+    }
     D_8016B9F6 = seqId;
 }
 
@@ -4913,10 +4909,12 @@ void func_800F6268(f32 dist, u16 arg1) {
 void func_800F64E0(u8 arg0) {
     D_80130608 = arg0;
     if (arg0 != 0) {
-        Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         Audio_QueueCmdS32(0xF1000000, 0);
     } else {
-        Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         Audio_QueueCmdS32(0xF2000000, 0);
     }
 }
@@ -4994,7 +4992,8 @@ void Audio_SetBaseFilter(u8 filter) {
         if (filter == 0) {
             Audio_StopSfxById(NA_SE_PL_IN_BUBBLE);
         } else if (sAudioBaseFilter == 0) {
-            Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     sAudioBaseFilter = filter;
@@ -5027,7 +5026,8 @@ void Audio_PlaySoundGeneralIfNotInCutscene(u16 sfxId, Vec3f* pos, u8 arg2, f32*
 }
 
 void Audio_PlaySoundIfNotInCutscene(u16 sfxId) {
-    Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                          &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void func_800F6964(u16 arg0) {
diff --git a/soh/src/code/code_800F7260.c b/soh/src/code/code_800F7260.c
index a226799572..94f13de7f2 100644
--- a/soh/src/code/code_800F7260.c
+++ b/soh/src/code/code_800F7260.c
@@ -124,8 +124,7 @@ void Audio_ClearBGMMute(u8 channelIdx) {
     }
 }
 
-void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd)
-{
+void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd) {
     size_t i;
     SoundRequest* req;
 
@@ -206,8 +205,7 @@ void Audio_RemoveMatchingSoundRequests(u8 aspect, SoundBankEntry* cmp) {
     }
 }
 
-void Audio_ProcessSoundRequest(void)
-{
+void Audio_ProcessSoundRequest(void) {
     u16 sfxId;
     u8 count;
     u8 index;
@@ -314,8 +312,7 @@ void Audio_ProcessSoundRequest(void)
     }
 }
 
-void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex)
-{
+void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex) {
     SoundBankEntry* entry = &gSoundBanks[bankId][entryIndex];
     u8 i;
 
@@ -342,8 +339,7 @@ void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex)
     }
 }
 
-void Audio_ChooseActiveSounds(u8 bankId)
-{
+void Audio_ChooseActiveSounds(u8 bankId) {
     u8 numChosenSounds;
     u8 numChannels;
     u8 entryIndex;
@@ -499,8 +495,7 @@ void Audio_ChooseActiveSounds(u8 bankId)
     }
 }
 
-void Audio_PlayActiveSounds(u8 bankId)
-{
+void Audio_PlayActiveSounds(u8 bankId) {
     u8 entryIndex;
     SequenceChannel* channel;
     SoundBankEntry* entry;
@@ -560,8 +555,7 @@ void Audio_PlayActiveSounds(u8 bankId)
     }
 }
 
-void Audio_StopSfxByBank(u8 bankId)
-{
+void Audio_StopSfxByBank(u8 bankId) {
     SoundBankEntry* entry;
     s32 pad;
     SoundBankEntry cmp;
@@ -622,8 +616,7 @@ void Audio_StopSfxByPos(Vec3f* pos) {
     Audio_RemoveMatchingSoundRequests(2, &cmp);
 }
 
-void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId)
-{
+void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId) {
     SoundBankEntry* entry;
     u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;
     u8 prevEntryIndex = 0;
@@ -742,8 +735,7 @@ void func_800F8F88(void) {
     }
 }
 
-u8 Audio_IsSfxPlaying(u32 sfxId)
-{
+u8 Audio_IsSfxPlaying(u32 sfxId) {
     SoundBankEntry* entry;
     u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;
 
diff --git a/soh/src/code/code_800F9280.c b/soh/src/code/code_800F9280.c
index 4c604ec268..8651e2a4d6 100644
--- a/soh/src/code/code_800F9280.c
+++ b/soh/src/code/code_800F9280.c
@@ -268,9 +268,11 @@ void Audio_ProcessSeqCmd(u32 cmd) {
                 duration++;
             }
             gActiveSeqs[playerIdx].channelData[chanIdx].volTarget = (f32)val / 127.0f;
-            if (gActiveSeqs[playerIdx].channelData[chanIdx].volCur != gActiveSeqs[playerIdx].channelData[chanIdx].volTarget) {
+            if (gActiveSeqs[playerIdx].channelData[chanIdx].volCur !=
+                gActiveSeqs[playerIdx].channelData[chanIdx].volTarget) {
                 gActiveSeqs[playerIdx].channelData[chanIdx].volStep =
-                    (gActiveSeqs[playerIdx].channelData[chanIdx].volCur - gActiveSeqs[playerIdx].channelData[chanIdx].volTarget) /
+                    (gActiveSeqs[playerIdx].channelData[chanIdx].volCur -
+                     gActiveSeqs[playerIdx].channelData[chanIdx].volTarget) /
                     (f32)duration;
                 gActiveSeqs[playerIdx].channelData[chanIdx].volTimer = duration;
                 gActiveSeqs[playerIdx].volChannelFlags |= 1 << chanIdx;
@@ -369,8 +371,7 @@ void Audio_ProcessSeqCmd(u32 cmd) {
 extern f32 D_80130F24;
 extern f32 D_80130F28;
 
-void Audio_QueueSeqCmd(u32 cmd) 
-{
+void Audio_QueueSeqCmd(u32 cmd) {
     u8 op = cmd >> 28;
     if (op == 0 || op == 2 || op == 12) {
         u8 seqId = cmd & 0xFF;
@@ -543,7 +544,8 @@ void func_800FA3DC(void) {
 
                 gActiveSeqs[playerIdx].tempoTarget = phi_a2;
                 gActiveSeqs[playerIdx].tempoCur = gAudioContext.seqPlayers[playerIdx].tempo / 0x30;
-                gActiveSeqs[playerIdx].tempoStep = (gActiveSeqs[playerIdx].tempoCur - gActiveSeqs[playerIdx].tempoTarget) / phi_t0;
+                gActiveSeqs[playerIdx].tempoStep =
+                    (gActiveSeqs[playerIdx].tempoCur - gActiveSeqs[playerIdx].tempoTarget) / phi_t0;
                 gActiveSeqs[playerIdx].tempoTimer = phi_t0;
                 gActiveSeqs[playerIdx].tempoCmd = 0;
             }
@@ -582,9 +584,11 @@ void func_800FA3DC(void) {
                 if (gActiveSeqs[playerIdx].channelData[k].freqScaleTimer != 0) {
                     gActiveSeqs[playerIdx].channelData[k].freqScaleTimer--;
                     if (gActiveSeqs[playerIdx].channelData[k].freqScaleTimer != 0) {
-                        gActiveSeqs[playerIdx].channelData[k].freqScaleCur -= gActiveSeqs[playerIdx].channelData[k].freqScaleStep;
+                        gActiveSeqs[playerIdx].channelData[k].freqScaleCur -=
+                            gActiveSeqs[playerIdx].channelData[k].freqScaleStep;
                     } else {
-                        gActiveSeqs[playerIdx].channelData[k].freqScaleCur = gActiveSeqs[playerIdx].channelData[k].freqScaleTarget;
+                        gActiveSeqs[playerIdx].channelData[k].freqScaleCur =
+                            gActiveSeqs[playerIdx].channelData[k].freqScaleTarget;
                         gActiveSeqs[playerIdx].freqScaleChannelFlags ^= (1 << k);
                     }
                     // CHAN_UPD_FREQ_SCALE
diff --git a/soh/src/code/code_800FC620.c b/soh/src/code/code_800FC620.c
index a25465e2e2..32197b417e 100644
--- a/soh/src/code/code_800FC620.c
+++ b/soh/src/code/code_800FC620.c
@@ -20,8 +20,7 @@ char D_80134488[0x18] = {
     0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
 };
 
-s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) 
-{
+s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) {
     return 0;
 
 #if 0
diff --git a/soh/src/code/db_camera.c b/soh/src/code/db_camera.c
index b3e26be7df..591190136d 100644
--- a/soh/src/code/db_camera.c
+++ b/soh/src/code/db_camera.c
@@ -3,7 +3,7 @@
 
 static PlayState* sPlayState;
 
-char** cameraStrings = {0};
+char** cameraStrings = { 0 };
 
 #define ACTION_E 0
 #define ACTION_SAVE 1
@@ -26,7 +26,6 @@ static DbCamera* sDbCamPtr;
 static s16 D_8016110C;
 static DbCameraAnim sDbCamAnim;
 
-
 Vec3f* DbCamera_AddVecSph(Vec3f* out, Vec3f* in, VecSph* sph) {
     Vec3f ret;
     Vec3f vec;
@@ -294,7 +293,8 @@ void func_800B44E0(DbCamera* dbCamera, Camera* cam) {
 
     if (dbCamera->sub.nPoints < 6) {
         if (sDbCamAnim.unk_0A != 0) {
-            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             sDbCamAnim.unk_0A = 0;
         }
         func_8006376C(0x0D, 0x17, 3, cameraStrings[0]);
@@ -308,7 +308,8 @@ void func_800B44E0(DbCamera* dbCamera, Camera* cam) {
         !func_800BB2B4(&sDbCamAnim.lookAtPos, &sDbCamAnim.roll, &sDbCamAnim.fov, dbCamera->sub.lookAt,
                        &sDbCamAnim.keyframe, &sDbCamAnim.curFrame) &&
         sDbCamAnim.unk_0A == 1) {
-        Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         sDbCamAnim.unk_04++;
 
         if (dbCamera->sub.nFrames > 0 && dbCamera->sub.nFrames < sDbCamAnim.unk_04) {
@@ -536,7 +537,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
         dbCamera->unk_40 = -1;
         dbCamera->sub.demoCtrlActionIdx = 0;
         sDbCamAnim.unk_0A = 0;
-        Audio_PlaySoundGeneral(NA_SE_SY_LOCK_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_LOCK_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (dbCamera->unk_38 == -1) {
         dbCamera->unk_38 = 1;
     } else {
@@ -856,22 +858,25 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
             dbCamera->unk_1C.z = 0.0f;
             dbCamera->unk_1C.y = 1.0f;
         } else if (dbCamera->sub.unk_08 == 2) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             dbCamera->sub.unk_08 = 0;
             func_800B41DC(dbCamera, dbCamera->sub.unkIdx, cam);
         } else {
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_R) &&
                 CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 dbCamera->sub.nPoints = dbCamera->sub.unkIdx + 1;
                 func_800B4088(dbCamera, cam);
             } else if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_R)) {
                 if (dbCamera->sub.unkIdx == 0x80) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     func_800B42C0(dbCamera, cam);
                     if (dbCamera->sub.unkIdx == (dbCamera->sub.nPoints - 1)) {
                         dbCamera->sub.unkIdx++;
@@ -923,7 +928,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
         } else {
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CRIGHT) &&
                 CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** start here *** */\n@@@\n");
                 DbCamera_PrintPoints("Lookat", dbCamera->sub.nPoints, dbCamera->sub.lookAt);
                 DbCamera_PrintPoints("Position", dbCamera->sub.nPoints, dbCamera->sub.position);
@@ -932,13 +938,15 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                 osSyncPrintf("@@@static short  Mode = %d;\n@@@\n", dbCamera->sub.mode);
                 osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** finish! *** */\n@@@\n");
             } else if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CLEFT)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 dbCamera->sub.unk_08 = (dbCamera->sub.unk_08 + 1) % 3;
             }
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CUP) &&
                 CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L)) {
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (dbCamera->sub.unkIdx > 0) {
                     dbCamera->sub.unkIdx--;
                 } else {
@@ -946,8 +954,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                 }
             } else {
                 if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CUP)) {
-                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     if (dbCamera->sub.unkIdx > 0) {
                         dbCamera->sub.unkIdx--;
                     } else {
@@ -968,7 +976,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
             }
             if (CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L) &&
                 CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CDOWN)) {
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
                     dbCamera->sub.unkIdx++;
                 } else {
@@ -976,8 +985,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                 }
             } else {
                 if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CDOWN)) {
-                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
                         dbCamera->sub.unkIdx++;
                     } else {
@@ -1046,8 +1055,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                 case 1:
                     dbCamera->unk_3C = true;
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DUP)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         if (dbCamera->sub.unk_0A == 0) {
                             dbCamera->sub.unk_0A = 5;
                         } else {
@@ -1055,8 +1064,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                         }
                     }
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DDOWN)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         if (dbCamera->sub.unk_0A == 5) {
                             dbCamera->sub.unk_0A = 0;
                         } else {
@@ -1064,8 +1073,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                         }
                     }
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DLEFT)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         switch (dbCamera->sub.unk_0A) {
                             case 1:
                                 if (CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L)) {
@@ -1114,7 +1123,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
 
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_DLEFT)) {
                         if ((D_8012D10C++ % 5) == 0) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
 
@@ -1152,8 +1162,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                     }
 
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DRIGHT)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                         switch (dbCamera->sub.unk_0A) {
                             case 1:
@@ -1201,7 +1211,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                     }
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_DRIGHT)) {
                         if ((D_8012D10C++ % 5) == 0) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
 
@@ -1226,11 +1237,14 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
                         }
                     }
 
-                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].viewAngle, &cameraStrings[62][10], 3);
+                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].viewAngle, &cameraStrings[62][10],
+                                          3);
                     func_8006376C(0x0E, 0x14, (dbCamera->sub.unk_0A == 0) ? 7 : 4, cameraStrings[62]);
-                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].nextPointFrame, &cameraStrings[63][10], 3);
+                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].nextPointFrame,
+                                          &cameraStrings[63][10], 3);
                     func_8006376C(0x0E, 0x15, (dbCamera->sub.unk_0A == 1) ? 7 : 4, cameraStrings[63]);
-                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].cameraRoll, &cameraStrings[64][10], 3);
+                    DbCamera_SetTextValue(dbCamera->sub.lookAt[dbCamera->sub.unkIdx].cameraRoll, &cameraStrings[64][10],
+                                          3);
                     func_8006376C(0x0E, 0x16, (dbCamera->sub.unk_0A == 2) ? 7 : 4, cameraStrings[64]);
                     func_8006376C(0xF, 0x17, (dbCamera->sub.unk_0A == 3) ? 7 : 4,
                                   (dbCamera->sub.mode == 1)   ? cameraStrings[13]
@@ -1353,7 +1367,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
         dbCamera->fov = 60.0f;
         dbCamera->rollDegrees = dbCamera->roll * 1.40625f;
         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CLEFT)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             dbCamera->unk_78 = (dbCamera->unk_78 + 1) % 3;
             dbCamera->unk_38 = -1;
         }
@@ -1634,7 +1649,8 @@ void DbCamera_DrawSlotLetters(char* str, s16 y, s16 x, s32 colorId) {
 void DbCamera_PrintAllCuts(Camera* cam) {
     s32 i;
 
-    Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** start here ***** */\n@@@\n");
 
     for (i = 0; i < ARRAY_COUNT(sDbCameraCuts) - 1; i++) {
@@ -1777,8 +1793,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                     if ((1 << sCurFileIdx) & sMempakFiles) {
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DLEFT) ||
                             CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DRIGHT)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlToggleSwitch ^= 1;
                         }
                         cameraStrings[41][9] = sCurFileIdx + 'A';
@@ -1791,12 +1807,12 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_A)) {
                             if (dbCamera->sub.demoCtrlToggleSwitch == 0) {
-                                Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                                 dbCamera->sub.demoCtrlMenu++;
                             } else {
-                                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                                 dbCamera->sub.demoCtrlMenu = 0;
                             }
                         }
@@ -1812,7 +1828,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                         }
                     }
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_B)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         dbCamera->sub.demoCtrlMenu = 0;
                         return 1;
                     }
@@ -1848,7 +1865,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_A) ||
                         CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_B)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         if (dbCamera->sub.demoCtrlMenu == DEMO_CTRL_MENU(ACTION_LOAD, MENU_SUCCESS)) {
                             dbCamera->sub.demoCtrlActionIdx = ACTION_E;
                         }
@@ -1870,7 +1888,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
                     if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_A) ||
                         CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_B)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         dbCamera->sub.demoCtrlMenu -= 9;
                     }
                 block_2:
@@ -1904,8 +1923,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                         sp74[i * 2 + 1] = '\0';
 
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DRIGHT)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             if (sCurFileIdx >= 4) {
                                 sCurFileIdx = 0;
                             } else {
@@ -1921,8 +1940,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                             }
                         }
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DLEFT)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             if (sCurFileIdx <= 0) {
                                 sCurFileIdx = 4;
                             } else {
@@ -1959,30 +1978,31 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                         func_8006376C(0x12, 0x17, sDbCameraColors[idx1], cameraStrings[33]);
                         func_8006376C(0x12, 0x18, sDbCameraColors[idx1 - 1], cameraStrings[34]);
                         func_8006376C(0x12, 0x19, sDbCameraColors[idx1 - 2], cameraStrings[35]);
-                        func_8006376C(0xE, dbCamera->sub.demoCtrlActionIdx + 0x16, 7, cameraStrings[11]); // current selection
+                        func_8006376C(0xE, dbCamera->sub.demoCtrlActionIdx + 0x16, 7,
+                                      cameraStrings[11]); // current selection
                         func_8006376C(0xD, 0x1A, 5, cameraStrings[32]);
                         func_8006376C(0x14, 0x1A, 5, cameraStrings[36]);
 
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DUP)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx - 1) % 4u;
                         }
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DDOWN)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx + 1) % 4u;
                         }
 
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_A)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlToggleSwitch = 0;
                             dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(dbCamera->sub.demoCtrlActionIdx, MENU_INFO);
                         }
                         if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_B)) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlActionIdx = ACTION_E;
                             return 1;
                         }
@@ -1994,8 +2014,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                             CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DUP) ||
                             CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DDOWN)) {
 
-                            Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             dbCamera->sub.demoCtrlActionIdx = ACTION_E;
                         }
                         return 2;
@@ -2007,13 +2027,15 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
         default: {
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DUP)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(ACTION_E, MENU_INFO);
                 dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx - 1) % 4u;
                 sCurFileIdx = 0;
             }
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DDOWN)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(ACTION_E, MENU_INFO);
                 dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx + 1) % 4u;
                 sCurFileIdx = 0;
@@ -2052,7 +2074,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 if (func_800B91B0(cam, dbCamera) == 0) {
                     Interface_ChangeAlpha(2);
                     ShrinkWindow_SetVal(0);
-                    Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
                 OLib_Vec3fDiffToVecSphGeo(&sp5C, &dbCamera->eye, &dbCamera->at);
                 DbCamera_CalcUpFromPitchYawRoll(&dbCamera->unk_1C, sp5C.pitch, sp5C.yaw,
@@ -2070,7 +2093,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 sDbCamAnim.unk_0A = 1;
                 sDbCamAnim.unk_0C = 0;
                 D_8016110C = 0;
-                Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_L)) {
@@ -2085,15 +2109,15 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 if (sLastFileIdx != -1) {
                     switch (sp74[sCurFileIdx]) {
                         case '?':
-                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             sDbCameraCuts[idx1] = sDbCameraCuts[idx2];
                             sp74[sCurFileIdx] = '?'; // useless
                             DbCamera_ResetCut(idx2, false);
                             break;
                         case '-':
-                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                             sp64 = sDbCameraCuts[idx2];
                             if (sLastFileIdx < sCurFileIdx) {
@@ -2115,8 +2139,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                             }
                             break;
                         default:
-                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                             break;
                     }
                 }
@@ -2125,7 +2149,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_A)) {
                 if (sp74[sCurFileIdx] == '?') {
-                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     sp74[sCurFileIdx] = DbCamera_InitCut(idx1, &dbCamera->sub);
                     if (sp74[sCurFileIdx] == '?') {
                         func_8006376C(0xF, 0x18, 7, cameraStrings[26]);
@@ -2135,7 +2160,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_B)) {
                 if (sp74[sCurFileIdx] != '?' && sp74[sCurFileIdx] != '-') {
-                    Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     sp74[sCurFileIdx] = '?';
                     DbCamera_ResetCut(idx1, true);
                 }
@@ -2143,7 +2169,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_R)) {
                 if (sp74[sCurFileIdx] != '?' && sp74[sCurFileIdx] != '-') {
-                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                     for (i = 0; i < sDbCameraCuts[idx1].nPoints; i++) {
                         dbCamera->sub.lookAt[i] = sDbCameraCuts[idx1].lookAt[i];
@@ -2165,7 +2192,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
             }
 
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DRIGHT)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (sCurFileIdx == 0x1E) {
                     sCurFileIdx = 0;
                 } else {
@@ -2173,7 +2201,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 }
             }
             if (CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_DLEFT)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 sCurFileIdx = (sCurFileIdx == 0) ? 0x1E : sCurFileIdx - 1;
             }
 
@@ -2187,7 +2216,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 DbCamera_PrintAllCuts(cam);
             } else if (CHECK_BTN_ALL(sPlayState->state.input[2].cur.button, BTN_L) &&
                        CHECK_BTN_ALL(sPlayState->state.input[2].press.button, BTN_CLEFT)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 for (i = 0; i < ARRAY_COUNT(sDbCameraCuts) - 1; i++) {
                     if (sDbCameraCuts[i].nPoints != 0) {
                         osSyncPrintf("\n@@@ /* CUT [%d]\t*/", i);
@@ -2203,7 +2233,8 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
                 Interface_ChangeAlpha(50);
                 ShrinkWindow_SetVal(0x20);
                 D_8016110C = 0;
-                Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
 
             func_8006376C(4, 7, 5, cameraStrings[28]);
diff --git a/soh/src/code/fault.c b/soh/src/code/fault.c
index fe7f7f9665..c5331fabbe 100644
--- a/soh/src/code/fault.c
+++ b/soh/src/code/fault.c
@@ -55,8 +55,7 @@ void Fault_ClientProcessThread(void* arg) {
     }
 }
 
-void Fault_ProcessClientContext(FaultClientContext* ctx) 
-{
+void Fault_ProcessClientContext(FaultClientContext* ctx) {
 #if 0
     OSMesgQueue queue;
     OSMesg msg;
@@ -115,8 +114,7 @@ u32 Fault_ProcessClient(u32 callback, u32 param0, u32 param1) {
     return a.ret;
 }
 
-void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* param1) 
-{
+void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* param1) {
 #if 0
     OSIntMask mask;
     s32 alreadyExists = false;
@@ -149,8 +147,7 @@ end:
 #endif
 }
 
-void Fault_RemoveClient(FaultClient* client) 
-{
+void Fault_RemoveClient(FaultClient* client) {
 #if 0
     FaultClient* iter;
     FaultClient* lastIter;
@@ -190,8 +187,7 @@ void Fault_RemoveClient(FaultClient* client)
 #endif
 }
 
-void Fault_AddAddrConvClient(FaultAddrConvClient* client, void* callback, void* param) 
-{
+void Fault_AddAddrConvClient(FaultAddrConvClient* client, void* callback, void* param) {
 #if 0
     OSIntMask mask;
     u32 alreadyExists = false;
@@ -223,8 +219,7 @@ end:
 #endif
 }
 
-void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) 
-{
+void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
 #if 0
     FaultAddrConvClient* iter;
     FaultAddrConvClient* lastIter;
@@ -265,8 +260,7 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client)
 #endif
 }
 
-u32 Fault_ConvertAddress(FaultAddrConvClient* client) 
-{
+u32 Fault_ConvertAddress(FaultAddrConvClient* client) {
 #if 0
     u32 ret;
     FaultAddrConvClient* iter = sFaultStructPtr->addrConvClients;
@@ -296,15 +290,13 @@ void Fault_PadCallback(Input* input) {
     PadMgr_RequestPadData(&gPadMgr, input, 0);
 }
 
-void Fault_UpdatePadImpl() 
-{
+void Fault_UpdatePadImpl() {
 #if 0
     sFaultStructPtr->padCallback(&sFaultStructPtr->padInput);
 #endif
 }
 
-u32 Fault_WaitForInputImpl() 
-{
+u32 Fault_WaitForInputImpl() {
 #if 0
     Input* input = &sFaultStructPtr->padInput;
     s32 count = 600;
@@ -455,7 +447,7 @@ void Fault_PrintThreadContext(OSThread* t) {
     FaultDrawer_Printf("S3:%08xH S4:%08xH S5:%08xH\n", (u32)ctx->s3, (u32)ctx->s4, (u32)ctx->s5);
     FaultDrawer_Printf("S6:%08xH S7:%08xH T8:%08xH\n", (u32)ctx->s6, (u32)ctx->s7, (u32)ctx->t8);
     FaultDrawer_Printf("T9:%08xH GP:%08xH SP:%08xH\n", (u32)ctx->t9, (u32)ctx->gp, (u32)ctx->sp);
-    //FaultDrawer_Printf("S8:%08xH RA:%08xH LO:%08xH\n\n", (u32)ctx->s8, (u32)ctx->ra, (u32)ctx->lo);
+    // FaultDrawer_Printf("S8:%08xH RA:%08xH LO:%08xH\n\n", (u32)ctx->s8, (u32)ctx->ra, (u32)ctx->lo);
 
     Fault_PrintFPCR(ctx->fpcsr);
     FaultDrawer_Printf("\n");
@@ -511,7 +503,7 @@ void Fault_LogThreadContext(OSThread* t) {
     osSyncPrintf("S3:%08xH   S4:%08xH   S5:%08xH\n", (u32)ctx->s3, (u32)ctx->s4, (u32)ctx->s5);
     osSyncPrintf("S6:%08xH   S7:%08xH   T8:%08xH\n", (u32)ctx->s6, (u32)ctx->s7, (u32)ctx->t8);
     osSyncPrintf("T9:%08xH   GP:%08xH   SP:%08xH\n", (u32)ctx->t9, (u32)ctx->gp, (u32)ctx->sp);
-    //osSyncPrintf("S8:%08xH   RA:%08xH   LO:%08xH\n", (u32)ctx->s8, (u32)ctx->ra, (u32)ctx->lo);
+    // osSyncPrintf("S8:%08xH   RA:%08xH   LO:%08xH\n", (u32)ctx->s8, (u32)ctx->ra, (u32)ctx->lo);
     osSyncPrintf("\n");
     Fault_LogFPCR(ctx->fpcsr);
     osSyncPrintf("\n");
@@ -553,8 +545,7 @@ OSThread* Fault_FindFaultedThread() {
     return NULL;
 }
 
-void Fault_Wait5Seconds(void) 
-{
+void Fault_Wait5Seconds(void) {
 #if 0
     OSTime start[2]; // to make the function allocate 0x28 bytes of stack instead of 0x20
 
@@ -567,8 +558,7 @@ void Fault_Wait5Seconds(void)
 #endif
 }
 
-void Fault_WaitForButtonCombo() 
-{
+void Fault_WaitForButtonCombo() {
 #if 0
     Input* input = &sFaultStructPtr->padInput;
     s32 state;
@@ -745,8 +735,7 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) {
     FaultDrawer_SetCharPad(0, 0);
 }
 
-void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) 
-{
+void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
 #if 0
     Input* input = &sFaultStructPtr->padInput;
     u32 addr = pc;
@@ -955,8 +944,7 @@ void Fault_CommitFB() {
 #endif
 }
 
-void Fault_ProcessClients(void) 
-{
+void Fault_ProcessClients(void) {
 #if 0
     FaultClient* iter = sFaultStructPtr->clients;
     s32 idx = 0;
@@ -1068,16 +1056,14 @@ void Fault_ThreadEntry(void* arg) {
 #endif
 }
 
-void Fault_SetFB(void* fb, u16 w, u16 h) 
-{
+void Fault_SetFB(void* fb, u16 w, u16 h) {
 #if 0
     sFaultStructPtr->fb = fb;
     FaultDrawer_SetDrawerFB(fb, w, h);
 #endif
 }
 
-void Fault_Init(void) 
-{
+void Fault_Init(void) {
 #if 0
     sFaultStructPtr = &gFaultStruct;
     bzero(sFaultStructPtr, sizeof(FaultThreadStruct));
@@ -1099,8 +1085,7 @@ void Fault_Init(void)
 #endif
 }
 
-void Fault_HangupFaultClient(const char* arg0, const char* arg1) 
-{
+void Fault_HangupFaultClient(const char* arg0, const char* arg1) {
 #if 0
     osSyncPrintf("HungUp on Thread %d\n", osGetThreadId(0));
     osSyncPrintf("%s\n", arg0 != NULL ? arg0 : "(NULL)");
diff --git a/soh/src/code/game.c b/soh/src/code/game.c
index 7e1db9c177..a31cf64744 100644
--- a/soh/src/code/game.c
+++ b/soh/src/code/game.c
@@ -6,6 +6,12 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
+#include "message_data_static.h"
+extern MessageTableEntry* sNesMessageEntryTablePtr;
+extern MessageTableEntry* sGerMessageEntryTablePtr;
+extern MessageTableEntry* sFraMessageEntryTablePtr;
+extern MessageTableEntry* sJpnMessageEntryTablePtr;
+
 SpeedMeter D_801664D0;
 VisCvg sVisCvg;
 VisZBuf sVisZBuf;
@@ -19,10 +25,10 @@ GameState* gGameState;
 // #endregion
 
 // Forward declared, because this in a C++ header.
-int gfx_create_framebuffer(uint32_t width, uint32_t height, uint32_t native_width, uint32_t native_height, uint8_t resize);
+int gfx_create_framebuffer(uint32_t width, uint32_t height, uint32_t native_width, uint32_t native_height,
+                           uint8_t resize);
 void gfx_texture_cache_clear();
 
-
 void GameState_FaultPrint(void) {
     static char sBtnChars[] = "ABZSuldr*+LRudlr";
     s32 i;
@@ -339,6 +345,14 @@ void GameState_Update(GameState* gameState) {
 
     gSaveContext.language = CVarGetInteger(CVAR_SETTING("Languages"), LANGUAGE_ENG);
 
+    if (gSaveContext.language == LANGUAGE_JPN && sJpnMessageEntryTablePtr == NULL) {
+        gSaveContext.language = LANGUAGE_ENG;
+    } else if (gSaveContext.language == LANGUAGE_GER && sGerMessageEntryTablePtr == NULL) {
+        gSaveContext.language = LANGUAGE_ENG;
+    } else if (gSaveContext.language == LANGUAGE_FRA && sFraMessageEntryTablePtr == NULL) {
+        gSaveContext.language = LANGUAGE_ENG;
+    }
+
     GameInteractor_ExecuteOnGameFrameUpdate();
     gameState->frames++;
 }
@@ -472,7 +486,8 @@ void GameState_Destroy(GameState* gameState) {
 
     osSyncPrintf("game デストラクタ終了\n"); // "game destructor end"
 
-    // Performing clear skeletons before unload resources fixes an actor heap corruption crash due to the skeleton patching system.
+    // Performing clear skeletons before unload resources fixes an actor heap corruption crash due to the skeleton
+    // patching system.
     ResourceMgr_ClearSkeletons();
 
     if (ResourceMgr_IsAltAssetsEnabled()) {
@@ -493,8 +508,7 @@ u32 GameState_IsRunning(GameState* gameState) {
     return gameState->running;
 }
 
-void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line)
-{
+void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line) {
     void* ret;
 
     if (THA_IsCrash(&gameState->tha)) {
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index be5ee994d9..9694b7a4e1 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -54,7 +54,7 @@ void Graph_FaultClient() {
 }
 
 void Graph_DisassembleUCode(Gfx* workBuf) {
-    #if 0
+#if 0
     UCodeDisas disassembler;
 
     if (HREG(80) == 7 && HREG(81) != 0) {
@@ -87,11 +87,11 @@ void Graph_DisassembleUCode(Gfx* workBuf) {
         }
         UCodeDisas_Destroy(&disassembler);
     }
-    #endif
+#endif
 }
 
 void Graph_UCodeFaultClient(Gfx* workBuf) {
-    #if 0
+#if 0
     UCodeDisas disassembler;
 
     UCodeDisas_Init(&disassembler);
@@ -100,7 +100,7 @@ void Graph_UCodeFaultClient(Gfx* workBuf) {
     //UCodeDisas_SetCurUCode(&disassembler, D_80155F50);
     UCodeDisas_Disassemble(&disassembler, workBuf);
     UCodeDisas_Destroy(&disassembler);
-    #endif
+#endif
 }
 
 void Graph_InitTHGA(GraphicsContext* gfxCtx) {
@@ -149,7 +149,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
 }
 
 void Graph_Init(GraphicsContext* gfxCtx) {
-    memset(gfxCtx,0, sizeof(GraphicsContext));
+    memset(gfxCtx, 0, sizeof(GraphicsContext));
     gfxCtx->gfxPoolIdx = 0;
     gfxCtx->fbIdx = 0;
     gfxCtx->viMode = NULL;
@@ -184,8 +184,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
 
     osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_BLOCK);
     osStopTimer(&timer);
-    //OTRTODO - Proper GFX crash handler
-    #if 0
+// OTRTODO - Proper GFX crash handler
+#if 0
     if (msg == (OSMesg)666) {
         osSyncPrintf(VT_FGCOL(RED));
         osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return."
@@ -204,7 +204,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
         }
         Fault_AddHungupAndCrashImpl("RCP is HUNG UP!!", "Oh! MY GOD!!");
     }
-    #endif
+#endif
     osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_NOBLOCK);
 
     D_8012D260 = gfxCtx->workBuffer;
@@ -408,8 +408,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         sGraphUpdateTime = time;
     }
 
-    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0))
-    {
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) {
         if (CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) &&
             CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) {
             gSaveContext.gameMode = GAMEMODE_NORMAL;
@@ -433,8 +432,7 @@ extern AudioMgr gAudioMgr;
 
 extern void ProcessSaveStateRequests(void);
 
-static void RunFrame()
-{
+static void RunFrame() {
     u32 size;
     char faultMsg[0x50];
     static bool hasSetupSkybox = false;
@@ -451,8 +449,7 @@ static void RunFrame()
     osSyncPrintf("グラフィックスレッド実行開始\n"); // "Start graphic thread execution"
     Graph_Init(&runFrameContext.gfxCtx);
 
-    while (runFrameContext.nextOvl)
-    {
+    while (runFrameContext.nextOvl) {
         runFrameContext.ovl = runFrameContext.nextOvl;
         Overlay_LoadGameState(runFrameContext.ovl);
 
@@ -461,8 +458,7 @@ static void RunFrame()
 
         gGameState = SYSTEM_ARENA_MALLOC_DEBUG(size);
 
-        if (!gGameState)
-        {
+        if (!gGameState) {
             osSyncPrintf("確保失敗\n"); // "Failure to secure"
 
             snprintf(faultMsg, sizeof(faultMsg), "CLASS SIZE= %d bytes", size);
@@ -480,17 +476,16 @@ static void RunFrame()
 
         uint64_t freq = GetFrequency();
 
-        while (GameState_IsRunning(gGameState))
-        {
-            //uint64_t ticksA, ticksB;
-            //ticksA = GetPerfCounter();
+        while (GameState_IsRunning(gGameState)) {
+            // uint64_t ticksA, ticksB;
+            // ticksA = GetPerfCounter();
 
             Graph_StartFrame();
 
             PadMgr_ThreadEntry(&gPadMgr);
 
             Graph_Update(&runFrameContext.gfxCtx, gGameState);
-            //ticksB = GetPerfCounter();
+            // ticksB = GetPerfCounter();
 
             if (GfxDebuggerIsDebuggingRequested()) {
                 GfxDebuggerDebugDisplayList(runFrameContext.gfxCtx.workBuffer);
@@ -498,13 +493,12 @@ static void RunFrame()
 
             Graph_ProcessGfxCommands(runFrameContext.gfxCtx.workBuffer);
 
-
-            //uint64_t diff = (ticksB - ticksA) / (freq / 1000);
-            //printf("Frame simulated in %ims\n", diff);
+            // uint64_t diff = (ticksB - ticksA) / (freq / 1000);
+            // printf("Frame simulated in %ims\n", diff);
             runFrameContext.state = 1;
             ProcessSaveStateRequests();
             return;
-            nextFrame:;
+        nextFrame:;
         }
 
         runFrameContext.nextOvl = Graph_GetNextGameState(gGameState);
@@ -515,7 +509,7 @@ static void RunFrame()
     Graph_Destroy(&runFrameContext.gfxCtx);
     osSyncPrintf("グラフィックスレッド実行終了\n"); // "End of graphic thread execution"
 
-    //Graph_Update(gfxCtxTest, gameStateTest);
+    // Graph_Update(gfxCtxTest, gameStateTest);
     exit(0);
 }
 
diff --git a/soh/src/code/loadfragment2.c b/soh/src/code/loadfragment2.c
index 03e7497e16..bdf13a68fe 100644
--- a/soh/src/code/loadfragment2.c
+++ b/soh/src/code/loadfragment2.c
@@ -5,7 +5,8 @@ void* Overlay_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRam
 
     if (gOverlayLogSeverity >= 3) {
         osSyncPrintf("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vRamStart, vRamEnd, allocatedVRamAddr,
-                     ((uintptr_t)vRamEnd - (uintptr_t)vRamStart) + (uintptr_t)allocatedVRamAddr, (uintptr_t)vRamStart - (uintptr_t)allocatedVRamAddr);
+                     ((uintptr_t)vRamEnd - (uintptr_t)vRamStart) + (uintptr_t)allocatedVRamAddr,
+                     (uintptr_t)vRamStart - (uintptr_t)allocatedVRamAddr);
     }
 
     if (allocatedVRamAddr != NULL) {
diff --git a/soh/src/code/main.c b/soh/src/code/main.c
index 9d52833fd0..0a255f48d0 100644
--- a/soh/src/code/main.c
+++ b/soh/src/code/main.c
@@ -44,8 +44,7 @@ void Main_LogSystemHeap(void) {
 }
 
 #ifdef _WIN32
-int SDL_main(int argc, char** argv)
-{
+int SDL_main(int argc, char** argv) {
     AllocConsole();
     (void)freopen("CONIN$", "r", stdin);
     (void)freopen("CONOUT$", "w", stdout);
@@ -55,8 +54,7 @@ int SDL_main(int argc, char** argv)
 #endif
 
 #else //_WIN32
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
 #endif
 
     GameConsole_Init();
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index a8bf778af4..173b03394b 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -3,6 +3,7 @@
 #include <string.h>
 
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/controls/Mouse.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
@@ -293,7 +294,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
         input->press.stick_x += (s8)(input->cur.stick_x - input->prev.stick_x);
         input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y);
         // #region SOH [Enhancement]
-        PadUtils_UpdateRelRXY(input); 
+        PadUtils_UpdateRelRXY(input);
         input->press.right_stick_x += (s8)(input->cur.right_stick_x - input->prev.right_stick_x);
         input->press.right_stick_y += (s8)(input->cur.right_stick_y - input->prev.right_stick_y);
         // #endregion
@@ -317,6 +318,8 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
     osRecvMesg(queue, NULL, OS_MESG_BLOCK);
     osContGetReadData(padMgr->pads);
 
+    Mouse_UpdateAll();
+
     for (i = 0; i < __osMaxControllers; i++) {
         padMgr->padStatus[i].status = Controller_ShouldRumble(i);
     }
@@ -336,9 +339,9 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
             if (padMgr->padStatus[i].type == CONT_TYPE_NORMAL) {
                 mask |= 1 << i;
             } else {
-                //LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type);
-                // "An unknown type of controller is connected"
-                //osSyncPrintf("知らない種類のコントローラが接続されています\n");
+                // LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type);
+                //  "An unknown type of controller is connected"
+                // osSyncPrintf("知らない種類のコントローラが接続されています\n");
             }
         }
     }
@@ -346,7 +349,8 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
 
     /* if (gFaultStruct.msgId) {
         PadMgr_RumbleStop(padMgr);
-    } else */ if (padMgr->rumbleOffFrames > 0) {
+    } else */
+    if (padMgr->rumbleOffFrames > 0) {
         --padMgr->rumbleOffFrames;
         PadMgr_RumbleStop(padMgr);
     } else if (padMgr->rumbleOnFrames == 0) {
@@ -406,7 +410,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
     s16* mesg = NULL;
     s32 exit;
 
-    //osSyncPrintf("コントローラスレッド実行開始\n"); // "Controller thread execution start"
+    // osSyncPrintf("コントローラスレッド実行開始\n"); // "Controller thread execution start"
 
     exit = false;
     while (!exit) {
@@ -416,7 +420,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
         }
 
         osRecvMesg(&padMgr->interruptMsgQ, (OSMesg*)&mesg, OS_MESG_BLOCK);
-        //LOG_CHECK_NULL_POINTER("msg", mesg);
+        // LOG_CHECK_NULL_POINTER("msg", mesg);
 
         PadMgr_HandleRetraceMsg(padMgr);
         break;
@@ -446,9 +450,9 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
     }
 
     // OTRTODO: Removed due to crash
-    //IrqMgr_RemoveClient(padMgr->irqMgr, &padMgr->irqClient);
+    // IrqMgr_RemoveClient(padMgr->irqMgr, &padMgr->irqClient);
 
-    //osSyncPrintf("コントローラスレッド実行終了\n"); // "Controller thread execution end"
+    // osSyncPrintf("コントローラスレッド実行終了\n"); // "Controller thread execution end"
 }
 
 void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* siIntMsgQ, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack) {
@@ -459,7 +463,7 @@ void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* siIntMsgQ, IrqMgr* irqMgr, OSId id
 
     osCreateMesgQueue(&padMgr->interruptMsgQ, padMgr->interruptMsgBuf, 4);
     // OTRTODO: Removed due to crash
-    //IrqMgr_AddClient(padMgr->irqMgr, &padMgr->irqClient, &padMgr->interruptMsgQ);
+    // IrqMgr_AddClient(padMgr->irqMgr, &padMgr->irqClient, &padMgr->interruptMsgQ);
     osCreateMesgQueue(&padMgr->serialMsgQ, padMgr->serialMsgBuf, 1);
     PadMgr_UnlockSerialMesgQueue(padMgr, siIntMsgQ);
     osCreateMesgQueue(&padMgr->lockMsgQ, padMgr->lockMsgBuf, 1);
diff --git a/soh/src/code/padutils.c b/soh/src/code/padutils.c
index c4548ae326..1ad887ac3c 100644
--- a/soh/src/code/padutils.c
+++ b/soh/src/code/padutils.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 void PadUtils_Init(Input* input) {
-    memset(input,0, sizeof(Input));
+    memset(input, 0, sizeof(Input));
 }
 
 void func_800FCB70(void) {
diff --git a/soh/src/code/relocation.c b/soh/src/code/relocation.c
index a62ba32398..23b6ef6d28 100644
--- a/soh/src/code/relocation.c
+++ b/soh/src/code/relocation.c
@@ -105,8 +105,8 @@ void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* over
             case 0x6000000:
                 if (gOverlayLogSeverity >= 3) {
                     osSyncPrintf("%02d %08x %08x %08x ", dbg, relocDataP, relocatedValue, relocatedAddress);
-                    osSyncPrintf(" %08x %08x %08x %08x\n", ((uintptr_t)relocDataP + (uintptr_t)vRamAddress) - allocu32, relocData,
-                                 unrelocatedAddress, relocOffset);
+                    osSyncPrintf(" %08x %08x %08x %08x\n", ((uintptr_t)relocDataP + (uintptr_t)vRamAddress) - allocu32,
+                                 relocData, unrelocatedAddress, relocOffset);
                 }
         }
     }
diff --git a/soh/src/code/sched.c b/soh/src/code/sched.c
index 5edbbf0791..944df1af72 100644
--- a/soh/src/code/sched.c
+++ b/soh/src/code/sched.c
@@ -480,7 +480,7 @@ void Sched_ThreadEntry(void* arg) {
 }
 
 void Sched_Init(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr) {
-    memset(sc,0, sizeof(SchedContext));
+    memset(sc, 0, sizeof(SchedContext));
     sc->unk_24C = 1;
     osCreateMesgQueue(&sc->interruptQ, sc->intBuf, 8);
     osCreateMesgQueue(&sc->cmdQ, sc->cmdMsgBuf, 8);
diff --git a/soh/src/code/sys_cfb.c b/soh/src/code/sys_cfb.c
index 5a1aaba81b..53e9306bc1 100644
--- a/soh/src/code/sys_cfb.c
+++ b/soh/src/code/sys_cfb.c
@@ -31,16 +31,16 @@ void SysCfb_Init(s32 n64dd) {
     */
 
     screenSize = SCREEN_WIDTH * SCREEN_HEIGHT;
-    //sSysCfbEnd &= ~0x3F;
-    // "The final address used by the system is %08x"
+    // sSysCfbEnd &= ~0x3F;
+    //  "The final address used by the system is %08x"
     osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd);
-    //sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4);
-    //sSysCfbFbPtr[1] = sSysCfbEnd - (screenSize * 2);
+    // sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4);
+    // sSysCfbFbPtr[1] = sSysCfbEnd - (screenSize * 2);
     sSysCfbFbPtr[0] = malloc(screenSize * 4);
     sSysCfbFbPtr[1] = malloc(screenSize * 4);
 
     // "Frame buffer addresses are %08x and %08x"
-    //osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]);
+    // osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]);
 
     // SOH [Port] Inform LUS on resolution changes
     FB_CreateFramebuffers();
diff --git a/soh/src/code/sys_matrix.c b/soh/src/code/sys_matrix.c
index c0f326673b..3e4798d2e1 100644
--- a/soh/src/code/sys_matrix.c
+++ b/soh/src/code/sys_matrix.c
@@ -557,7 +557,7 @@ Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line) {
     FrameInterpolation_RecordMatrixToMtx(dest, file, line);
     guMtxF2L(Matrix_CheckFloats(sCurrentMatrix, file, line), dest);
     return dest;
-    //return Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(sCurrentMatrix), dest);
+    // return Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(sCurrentMatrix), dest);
 }
 
 Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) {
@@ -903,7 +903,7 @@ MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) {
                              "\\ %12.6f %12.6f %12.6f %12.6f /\n",
                              file, line, "mf", mf->xx, mf->xy, mf->xz, mf->xw, mf->yx, mf->yy, mf->yz, mf->yw, mf->zx,
                              mf->zy, mf->zz, mf->zw, mf->wx, mf->wy, mf->wz, mf->ww);
-                //Fault_AddHungupAndCrash(file, line);
+                // Fault_AddHungupAndCrash(file, line);
             }
         }
     }
@@ -1044,11 +1044,8 @@ void Matrix_SetTranslateScaleMtx1(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ,
 
 void Matrix_SetTranslateScaleMtx2(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY,
                                   f32 translateZ) {
-    MtxF mtxf = { {
-            { scaleX, 0, 0, 0 },
-            { 0, scaleY, 0, 0 },
-            { 0, 0, scaleZ, 0 },
-            { translateX, translateY, translateZ, 1 }
-        } };
+    MtxF mtxf = {
+        { { scaleX, 0, 0, 0 }, { 0, scaleY, 0, 0 }, { 0, 0, scaleZ, 0 }, { translateX, translateY, translateZ, 1 } }
+    };
     guMtxF2L(&mtxf, mtx);
 }
diff --git a/soh/src/code/z_DLF.c b/soh/src/code/z_DLF.c
index 370334d182..f6783c4e89 100644
--- a/soh/src/code/z_DLF.c
+++ b/soh/src/code/z_DLF.c
@@ -21,7 +21,8 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) {
         osSyncPrintf(VT_FGCOL(GREEN));
         osSyncPrintf("OVL(d):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd,
                      overlayEntry->loadedRamAddr,
-                     (uintptr_t)overlayEntry->loadedRamAddr + (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart,
+                     (uintptr_t)overlayEntry->loadedRamAddr + (uintptr_t)overlayEntry->vramEnd -
+                         (uintptr_t)overlayEntry->vramStart,
                      (uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr, "");
         osSyncPrintf(VT_RST);
 
@@ -40,8 +41,8 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) {
         }
 
         if (overlayEntry->destroy != NULL) {
-            overlayEntry->destroy = (void*)((uintptr_t)overlayEntry->destroy -
-                                            ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+            overlayEntry->destroy = (void*)((uintptr_t)overlayEntry->destroy - ((intptr_t)overlayEntry->vramStart -
+                                                                                (intptr_t)overlayEntry->loadedRamAddr));
         } else {
             overlayEntry->destroy = NULL;
         }
@@ -70,36 +71,40 @@ void Overlay_FreeGameState(GameStateOverlay* overlayEntry) {
 
         if (temp == 0) {
             if (overlayEntry->unk_14 != NULL) {
-                overlayEntry->unk_14 = (void*)((uintptr_t)overlayEntry->unk_14 +
-                                               ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+                overlayEntry->unk_14 =
+                    (void*)((uintptr_t)overlayEntry->unk_14 +
+                            ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
             } else {
                 overlayEntry->unk_14 = NULL;
             }
 
             if (overlayEntry->init != NULL) {
-                overlayEntry->init = (void*)((uintptr_t)overlayEntry->init +
-                                             ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+                overlayEntry->init = (void*)((uintptr_t)overlayEntry->init + ((intptr_t)overlayEntry->vramStart -
+                                                                              (intptr_t)overlayEntry->loadedRamAddr));
             } else {
                 overlayEntry->init = NULL;
             }
 
             if (overlayEntry->destroy != NULL) {
-                overlayEntry->destroy = (void*)((uintptr_t)overlayEntry->destroy +
-                                                ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+                overlayEntry->destroy =
+                    (void*)((uintptr_t)overlayEntry->destroy +
+                            ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
             } else {
                 overlayEntry->destroy = NULL;
             }
 
             if (overlayEntry->unk_20 != NULL) {
-                overlayEntry->unk_20 = (void*)((uintptr_t)overlayEntry->unk_20 +
-                                               ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+                overlayEntry->unk_20 =
+                    (void*)((uintptr_t)overlayEntry->unk_20 +
+                            ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
             } else {
                 overlayEntry->unk_20 = NULL;
             }
 
             if (overlayEntry->unk_24 != NULL) {
-                overlayEntry->unk_24 = (void*)((uintptr_t)overlayEntry->unk_24 +
-                                               ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
+                overlayEntry->unk_24 =
+                    (void*)((uintptr_t)overlayEntry->unk_24 +
+                            ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr));
             } else {
                 overlayEntry->unk_24 = NULL;
             }
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index 873e525a76..620cb4959e 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -7,6 +7,8 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "objects/object_bdoor/object_bdoor.h"
+#include "soh/ObjectExtension/ObjectExtension.h"
+#include "soh/ObjectExtension/ActorListIndex.h"
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/enemyrandomizer.h"
@@ -133,8 +135,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, PlayState* play, Gfx* dlist,
             temp2 = (1.0f - (temp1 * (1.0f / 350))) * actor->shape.shadowScale;
             Matrix_Scale(actor->scale.x * temp2, 1.0f, actor->scale.z * temp2, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_MODELVIEW | G_MTX_LOAD);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
             gSPDisplayList(POLY_OPA_DISP++, dlist);
 
             CLOSE_DISPS(play->state.gfxCtx);
@@ -173,8 +174,7 @@ void ActorShadow_DrawFoot(PlayState* play, Light* light, MtxF* arg2, s32 arg3, f
     Matrix_RotateY(sp58, MTXMODE_APPLY);
     Matrix_Scale(arg5, 1.0f, arg5 * arg6, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, gFootShadowDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -357,49 +357,59 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play)
 
 void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, PlayState* play) {
     if (CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_PLAYER].inner = CVarGetColor(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdlePrimaryColor);
+        sNaviColorList[ACTORCAT_PLAYER].inner =
+            CVarGetColor(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdlePrimaryColor);
     } else {
         sNaviColorList[ACTORCAT_PLAYER].inner = defaultIdlePrimaryColor;
     }
     if (CVarGetInteger(CVAR_COSMETIC("Navi.IdleSecondary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_PLAYER].outer = CVarGetColor(CVAR_COSMETIC("Navi.IdleSecondary.Value"), defaultIdleSecondaryColor);
+        sNaviColorList[ACTORCAT_PLAYER].outer =
+            CVarGetColor(CVAR_COSMETIC("Navi.IdleSecondary.Value"), defaultIdleSecondaryColor);
     } else {
         sNaviColorList[ACTORCAT_PLAYER].outer = defaultIdleSecondaryColor;
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("Navi.NPCPrimary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_NPC].inner = CVarGetColor(CVAR_COSMETIC("Navi.NPCPrimary.Value"), defaultNPCPrimaryColor);
+        sNaviColorList[ACTORCAT_NPC].inner =
+            CVarGetColor(CVAR_COSMETIC("Navi.NPCPrimary.Value"), defaultNPCPrimaryColor);
     } else {
         sNaviColorList[ACTORCAT_NPC].inner = defaultNPCPrimaryColor;
     }
     if (CVarGetInteger(CVAR_COSMETIC("Navi.NPCSecondary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_NPC].outer = CVarGetColor(CVAR_COSMETIC("Navi.NPCSecondary.Value"), defaultNPCSecondaryColor);
+        sNaviColorList[ACTORCAT_NPC].outer =
+            CVarGetColor(CVAR_COSMETIC("Navi.NPCSecondary.Value"), defaultNPCSecondaryColor);
     } else {
         sNaviColorList[ACTORCAT_NPC].outer = defaultNPCSecondaryColor;
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("Navi.EnemyPrimary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_ENEMY].inner = CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
-        sNaviColorList[ACTORCAT_BOSS].inner = CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
+        sNaviColorList[ACTORCAT_ENEMY].inner =
+            CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
+        sNaviColorList[ACTORCAT_BOSS].inner =
+            CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
     } else {
         sNaviColorList[ACTORCAT_ENEMY].inner = defaultEnemyPrimaryColor;
         sNaviColorList[ACTORCAT_BOSS].inner = defaultEnemyPrimaryColor;
     }
     if (CVarGetInteger(CVAR_COSMETIC("Navi.EnemySecondary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_ENEMY].outer = CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
-        sNaviColorList[ACTORCAT_BOSS].outer = CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
+        sNaviColorList[ACTORCAT_ENEMY].outer =
+            CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
+        sNaviColorList[ACTORCAT_BOSS].outer =
+            CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
     } else {
         sNaviColorList[ACTORCAT_ENEMY].outer = defaultEnemySecondaryColor;
         sNaviColorList[ACTORCAT_BOSS].outer = defaultEnemySecondaryColor;
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("Navi.PropsPrimary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_PROP].inner = CVarGetColor(CVAR_COSMETIC("Navi.PropsPrimary.Value"), defaultPropsPrimaryColor);
+        sNaviColorList[ACTORCAT_PROP].inner =
+            CVarGetColor(CVAR_COSMETIC("Navi.PropsPrimary.Value"), defaultPropsPrimaryColor);
     } else {
         sNaviColorList[ACTORCAT_PROP].inner = defaultPropsPrimaryColor;
     }
     if (CVarGetInteger(CVAR_COSMETIC("Navi.PropsSecondary.Changed"), 0)) {
-        sNaviColorList[ACTORCAT_PROP].outer = CVarGetColor(CVAR_COSMETIC("Navi.PropsSecondary.Value"), defaultPropsSecondaryColor);
+        sNaviColorList[ACTORCAT_PROP].outer =
+            CVarGetColor(CVAR_COSMETIC("Navi.PropsSecondary.Value"), defaultPropsSecondaryColor);
     } else {
         sNaviColorList[ACTORCAT_PROP].outer = defaultPropsSecondaryColor;
     }
@@ -513,8 +523,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) {
                         Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
                         Matrix_Push();
                         Matrix_Translate(entry->unk_0C, entry->unk_0C, 0.0f, MTXMODE_APPLY);
-                        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                                  G_MTX_MODELVIEW | G_MTX_LOAD);
+                        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
                         gSPDisplayList(OVERLAY_DISP++, gZTargetLockOnTriangleDL);
                         Matrix_Pop();
                     }
@@ -542,8 +551,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) {
         Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY);
 
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_XLU_DISP++, gZTargetArrowDL);
         FrameInterpolation_RecordCloseChild();
     }
@@ -625,7 +633,8 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl
                 targetCtx->unk_48 = 0;
             }
 
-            lockOnSfxId = CHECK_FLAG_ALL(actorArg->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) ? NA_SE_SY_LOCK_ON
+            lockOnSfxId = CHECK_FLAG_ALL(actorArg->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
+                              ? NA_SE_SY_LOCK_ON
                               : NA_SE_SY_LOCK_ON_HUMAN;
             Sfx_PlaySfxCentered(lockOnSfxId);
         }
@@ -847,6 +856,10 @@ void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* t
             newName[length - 6] = 'G';
             newName[length - 5] = 'E';
             newName[length - 4] = 'R';
+        } else if (gSaveContext.language == LANGUAGE_JPN) {
+            newName[length - 6] = 'J';
+            newName[length - 5] = 'P';
+            newName[length - 4] = 'N';
         }
         texture = newName;
     }
@@ -862,8 +875,8 @@ void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* t
     titleCtx->delayTimer = 0;
 }
 
-void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y,
-                             s32 width, s32 height, s32 delay) {
+void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y, s32 width,
+                             s32 height, s32 delay) {
     SceneTableEntry* loadedScene = play->loadedScene;
     //  size_t size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart;
     switch (play->sceneNum) {
@@ -1050,7 +1063,6 @@ void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void*
         default:
             titleCtx->texture = NULL;
             return;
-
     }
 
     static char newName[512];
@@ -1062,11 +1074,14 @@ void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void*
             newName[length - 6] = 'F';
             newName[length - 5] = 'R';
             newName[length - 4] = 'A';
-        }
-        else if (gSaveContext.language == LANGUAGE_GER) {
+        } else if (gSaveContext.language == LANGUAGE_GER) {
             newName[length - 6] = 'G';
             newName[length - 5] = 'E';
             newName[length - 4] = 'R';
+        } else if (gSaveContext.language == LANGUAGE_JPN) {
+            newName[length - 6] = 'J';
+            newName[length - 5] = 'P';
+            newName[length - 4] = 'N';
         }
         texture = newName;
     }
@@ -1119,20 +1134,30 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) {
     if (titleCtx->alpha != 0) {
         width = titleCtx->width;
         height = titleCtx->height;
-        s16 TitleCard_PosX_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosX"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosX"), 0));
-        s16 TitleCard_PosY_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosY"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosY"), 0));
-        s16 TitleCard_PosType_Checker = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosType"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosType"), 0));
-        s16 TitleCard_Margin_Checker = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.UseMargins"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.UseMargins"), 0));
+        s16 TitleCard_PosX_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosX"), 0)
+                                                            : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosX"), 0));
+        s16 TitleCard_PosY_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosY"), 0)
+                                                            : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosY"), 0));
+        s16 TitleCard_PosType_Checker =
+            (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosType"), 0)
+                                  : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosType"), 0));
+        s16 TitleCard_Margin_Checker =
+            (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.UseMargins"), 0)
+                                  : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.UseMargins"), 0));
         s16 TitleCard_MarginX = 0;
         s16 TitleCard_PosX = titleCtx->x;
         s16 TitleCard_PosY = titleCtx->y;
         if (TitleCard_PosType_Checker != 0) {
             TitleCard_PosY = TitleCard_PosY_Modifier;
             if (TitleCard_PosType_Checker == ANCHOR_LEFT) {
-                if (TitleCard_Margin_Checker != 0) {TitleCard_MarginX = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.L"), 0) * -1;};
+                if (TitleCard_Margin_Checker != 0) {
+                    TitleCard_MarginX = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.L"), 0) * -1;
+                };
                 TitleCard_PosX = OTRGetDimensionFromLeftEdge(TitleCard_PosX_Modifier + TitleCard_MarginX) - 11;
             } else if (TitleCard_PosType_Checker == ANCHOR_RIGHT) {
-                if (TitleCard_Margin_Checker != 0) {TitleCard_MarginX = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.R"), 0);};
+                if (TitleCard_Margin_Checker != 0) {
+                    TitleCard_MarginX = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.R"), 0);
+                };
                 TitleCard_PosX = OTRGetDimensionFromRightEdge(TitleCard_PosX_Modifier + TitleCard_MarginX);
             } else if (TitleCard_PosType_Checker == ANCHOR_NONE) {
                 TitleCard_PosX = TitleCard_PosX_Modifier;
@@ -1149,13 +1174,12 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) {
 
         OVERLAY_DISP = Gfx_SetupDL_52NoCD(OVERLAY_DISP);
 
-        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, (u8)titleCtx->intensityR, (u8)titleCtx->intensityG, (u8)titleCtx->intensityB,
-                        (u8)titleCtx->alpha);
+        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, (u8)titleCtx->intensityR, (u8)titleCtx->intensityG,
+                        (u8)titleCtx->intensityB, (u8)titleCtx->alpha);
 
-        gDPLoadTextureBlock(OVERLAY_DISP++, (uintptr_t)titleCtx->texture, G_IM_FMT_IA,
-                            G_IM_SIZ_8b,
-                            width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                            G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(OVERLAY_DISP++, (uintptr_t)titleCtx->texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
         gSPWideTextureRectangle(OVERLAY_DISP++, titleX, titleY, ((doubleWidth * 2) + titleX) - 4, titleY + (height * 4),
                                 G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
 
@@ -1236,11 +1260,6 @@ void Actor_Init(Actor* actor, PlayState* play) {
         actor->init = NULL;
 
         GameInteractor_ExecuteOnActorInit(actor);
-
-        // For enemy health bar we need to know the max health during init
-        if (actor->category == ACTORCAT_ENEMY) {
-            actor->maximumHealth = actor->colChkInfo.health;
-        }
     }
 }
 
@@ -1598,8 +1617,7 @@ s32 func_8002E2AC(PlayState* play, Actor* actor, Vec3f* arg2, s32 arg3) {
 
     arg2->y += 50.0f;
 
-    actor->floorHeight =
-        BgCheck_EntityRaycastFloor5(play, &play->colCtx, &actor->floorPoly, &floorBgId, actor, arg2);
+    actor->floorHeight = BgCheck_EntityRaycastFloor5(play, &play->colCtx, &actor->floorPoly, &floorBgId, actor, arg2);
     actor->bgCheckFlags &= ~0x0086;
 
     if (actor->floorHeight <= BGCHECK_Y_MIN) {
@@ -1701,8 +1719,8 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight,
         sp64.y = actor->prevPos.y;
         func_8002E2AC(play, actor, &sp64, flags);
         waterBoxYSurface = actor->world.pos.y;
-        if (WaterBox_GetSurface1(play, &play->colCtx, actor->world.pos.x, actor->world.pos.z,
-                                 &waterBoxYSurface, &waterBox)) {
+        if (WaterBox_GetSurface1(play, &play->colCtx, actor->world.pos.x, actor->world.pos.z, &waterBoxYSurface,
+                                 &waterBox)) {
             actor->yDistToWater = waterBoxYSurface - actor->world.pos.y;
             if (actor->yDistToWater < 0.0f) {
                 actor->bgCheckFlags &= ~0x60;
@@ -1790,8 +1808,8 @@ void func_8002EBCC(Actor* actor, PlayState* play, s32 flag) {
     lightDir.z = play->envCtx.dirLight1.params.dir.z;
 
     if (HREG(80) == 6) {
-        osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", play->view.eye.x,
-                     play->view.eye.y, play->view.eye.z);
+        osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", play->view.eye.x, play->view.eye.y,
+                     play->view.eye.z);
     }
 
     hilite = func_8002EABC(&actor->world.pos, &play->view.eye, &lightDir, play->state.gfxCtx);
@@ -2005,8 +2023,9 @@ s32 GiveItemEntryWithoutActor(PlayState* play, GetItemEntry getItemEntry) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->stateFlags1 &
-        (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
-         PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER)) && 
+          (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
+           PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON |
+           PLAYER_STATE1_CLIMBING_LADDER)) &&
         Player_GetExplosiveHeld(player) < 0) {
         if (((player->heldActor != NULL) && ((getItemEntry.getItemId > GI_NONE) && (getItemEntry.getItemId < GI_MAX)) ||
              (IS_RANDO && (getItemEntry.getItemId > RG_NONE) && (getItemEntry.getItemId < RG_MAX))) ||
@@ -2044,8 +2063,9 @@ s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEn
     Player* player = GET_PLAYER(play);
 
     if (!(player->stateFlags1 &
-        (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
-         PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER)) && 
+          (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
+           PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON |
+           PLAYER_STATE1_CLIMBING_LADDER)) &&
         Player_GetExplosiveHeld(player) < 0) {
         if ((((player->heldActor != NULL) || (actor == player->talkActor)) &&
              ((!IS_RANDO && ((getItemEntry.getItemId > GI_NONE) && (getItemEntry.getItemId < GI_MAX))) ||
@@ -2088,11 +2108,13 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange
     Player* player = GET_PLAYER(play);
 
     if (!(player->stateFlags1 &
-        (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
-         PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER)) && 
+          (PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
+           PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON |
+           PLAYER_STATE1_CLIMBING_LADDER)) &&
         Player_GetExplosiveHeld(player) < 0) {
         if ((((player->heldActor != NULL) || (actor == player->talkActor)) &&
-            ((!IS_RANDO && ((getItemId > GI_NONE) && (getItemId < GI_MAX))) || (IS_RANDO && ((getItemId > RG_NONE) && (getItemId < RG_MAX))))) ||
+             ((!IS_RANDO && ((getItemId > GI_NONE) && (getItemId < GI_MAX))) ||
+              (IS_RANDO && ((getItemId > RG_NONE) && (getItemId < RG_MAX))))) ||
             (!(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE)))) {
             if ((actor->xzDistToPlayer < xzRange) && (fabsf(actor->yDistToPlayer) < yRange)) {
                 s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y;
@@ -2163,8 +2185,9 @@ u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->stateFlags1 &
-        (PLAYER_STATE1_DEAD | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
-         PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER))) {
+          (PLAYER_STATE1_DEAD | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_CHARGING_SPIN_ATTACK |
+           PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING |
+           PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER))) {
         player->rideActor = horse;
         player->mountSide = mountSide;
         return true;
@@ -2209,7 +2232,8 @@ void func_8002F7A0(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4)
 
 void Player_PlaySfx(Actor* actor, u16 sfxId) {
     if (actor->id != ACTOR_PLAYER || sfxId < NA_SE_VO_LI_SWORD_N || sfxId > NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID) {
-        Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale , &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultReverb);
     } else {
         freqMultiplier = CVarGetFloat(CVAR_AUDIO("LinkVoiceFreqMultiplier"), 1.0);
         if (freqMultiplier <= 0) {
@@ -2217,7 +2241,8 @@ void Player_PlaySfx(Actor* actor, u16 sfxId) {
         }
         // Authentic behavior uses D_801333E0 for both freqScale and a4
         // Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &D_801333E0 , &D_801333E0, &D_801333E8);
-        Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &freqMultiplier, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &freqMultiplier, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultReverb);
     }
 }
 
@@ -2261,7 +2286,8 @@ void func_8002F948(Actor* actor, u16 sfxId) {
 }
 
 void func_8002F974(Actor* actor, u16 sfxId) {
-    actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 | ACTOR_FLAG_SFX_TIMER);
+    actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 |
+                      ACTOR_FLAG_SFX_TIMER);
     actor->sfx = sfxId;
 }
 
@@ -2347,7 +2373,7 @@ void Actor_DrawFaroresWindPointer(PlayState* play) {
             D_8015BC14 = 60;
             D_8015BC18 = 1.0f;
         } else if (D_8015BC14) {
-            D_8015BC14-= CVarGetInteger(CVAR_ENHANCEMENT("FastFarores"), 0) ? 5 : 1;
+            D_8015BC14 -= CVarGetInteger(CVAR_ENHANCEMENT("FastFarores"), 0) ? 5 : 1;
         } else if (D_8015BC18 > 0.0f) {
             static Vec3f effectVel = { 0.0f, -0.05f, 0.0f };
             static Vec3f effectAccel = { 0.0f, -0.025f, 0.0f };
@@ -2392,8 +2418,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) {
             effectPos.y = curPos->y + 80.0f + (6.0f * Rand_ZeroOne());
             effectPos.z = curPos->z + Rand_CenteredFloat(6.0f);
 
-            EffectSsKiraKira_SpawnDispersed(play, &effectPos, &effectVel, &effectAccel, &effectPrimCol,
-                                            &effectEnvCol, 1000, 16);
+            EffectSsKiraKira_SpawnDispersed(play, &effectPos, &effectVel, &effectAccel, &effectPrimCol, &effectEnvCol,
+                                            1000, 16);
 
             if (D_8015BC18 == 0.0f) {
                 gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN];
@@ -2465,22 +2491,19 @@ void Actor_DrawFaroresWindPointer(PlayState* play) {
             gDPSetEnvColor(POLY_XLU_DISP++, Spell_env.r, Spell_env.g, Spell_env.b, 255);
 
             Matrix_RotateZ(((play->gameplayFrames * 1500) & 0xFFFF) * M_PI / 32768.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
             gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
 
             Matrix_Pop();
             Matrix_RotateZ(~((play->gameplayFrames * 1200) & 0xFFFF) * M_PI / 32768.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
             gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
         }
 
         Lights_PointNoGlowSetInfo(&D_8015BC00, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x),
                                   ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y) + yOffset,
                                   ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius);
-
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -2556,7 +2579,11 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
     if (play->numSetupActors != 0) {
         actorEntry = &play->setupActorList[0];
         for (i = 0; i < play->numSetupActors; i++) {
-            Actor_SpawnEntry(&play->actorCtx, actorEntry++, play);
+            Actor* spawnedActor = Actor_SpawnEntry(&play->actorCtx, actorEntry++, play);
+
+            // #region SOH [ObjectExtension] ActorListIndex tracking
+            SetActorListIndex(spawnedActor, (s16)i);
+            // #endregion
         }
         play->numSetupActors = 0;
         GameInteractor_ExecuteOnSceneSpawnActors();
@@ -2569,8 +2596,8 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
     if (KREG(0) == -100) {
         refActor = &GET_PLAYER(play)->actor;
         KREG(0) = 0;
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, refActor->world.pos.x,
-                    refActor->world.pos.y + 100.0f, refActor->world.pos.z, 0, 0, 0, 1, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, refActor->world.pos.x, refActor->world.pos.y + 100.0f,
+                    refActor->world.pos.z, 0, 0, 0, 1, true);
     }
 
     sp80 = &D_80116068[0];
@@ -2595,18 +2622,12 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
             actor->sfx = 0;
 
             if (actor->init != NULL) {
-                if (Object_IsLoaded(&play->objectCtx, actor->objBankIndex))
-                {
+                if (Object_IsLoaded(&play->objectCtx, actor->objBankIndex)) {
                     Actor_SetObjectDependency(play, actor);
                     actor->init(actor, play);
                     actor->init = NULL;
 
                     GameInteractor_ExecuteOnActorInit(actor);
-
-                    // For enemy health bar we need to know the max health during init
-                    if (actor->category == ACTORCAT_ENEMY) {
-                        actor->maximumHealth = actor->colChkInfo.health;
-                    }
                 }
                 actor = actor->next;
             } else if (!Object_IsLoaded(&play->objectCtx, actor->objBankIndex)) {
@@ -2633,7 +2654,8 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
                 actor->yawTowardsPlayer = Actor_WorldYawTowardActor(actor, &player->actor);
                 actor->flags &= ~ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT;
 
-                if ((DECR(actor->freezeTimer) == 0) && (actor->flags & (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) {
+                if ((DECR(actor->freezeTimer) == 0) &&
+                    (actor->flags & (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) {
                     if (actor == player->focusActor) {
                         actor->isTargeted = true;
                     } else {
@@ -2716,7 +2738,8 @@ void Actor_Draw(PlayState* play, Actor* actor) {
 
     lights = LightContext_NewLights(&play->lightCtx, play->state.gfxCtx);
 
-    Lights_BindAll(lights, play->lightCtx.listHead, (actor->flags & ACTOR_FLAG_IGNORE_POINTLIGHTS) ? NULL : &actor->world.pos);
+    Lights_BindAll(lights, play->lightCtx.listHead,
+                   (actor->flags & ACTOR_FLAG_IGNORE_POINTLIGHTS) ? NULL : &actor->world.pos);
     Lights_Draw(lights, play->state.gfxCtx);
 
     FrameInterpolation_RecordActorPosRotMatrix();
@@ -2776,7 +2799,8 @@ void Actor_Draw(PlayState* play, Actor* actor) {
 
 void func_80030ED8(Actor* actor) {
     if (actor->flags & ACTOR_FLAG_SFX_ACTOR_POS_2) {
-        Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (actor->flags & ACTOR_AUDIO_FLAG_SFX_CENTERED_1) {
         Sfx_PlaySfxCentered(actor->sfx);
     } else if (actor->flags & ACTOR_AUDIO_FLAG_SFX_CENTERED_2) {
@@ -2808,9 +2832,8 @@ void Actor_DrawLensOverlay(GraphicsContext* gfxCtx) {
                    (SCREEN_HEIGHT / 2 - LENS_MASK_HEIGHT) << 2, (SCREEN_WIDTH / 2 + LENS_MASK_WIDTH - 1) << 2,
                    (SCREEN_HEIGHT / 2 + LENS_MASK_HEIGHT - 1) << 2);
     gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), SCREEN_HEIGHT << 2, G_TX_RENDERTILE, 0, 0, 0, 0);
-    gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, SCREEN_HEIGHT << 2, G_TX_RENDERTILE,
-                        LENS_MASK_OFFSET_S << 5, LENS_MASK_OFFSET_T << 5,
-                        (1 << 10) * (SCREEN_WIDTH - 2 * LENS_MASK_OFFSET_S) / SCREEN_WIDTH,
+    gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, SCREEN_HEIGHT << 2, G_TX_RENDERTILE, LENS_MASK_OFFSET_S << 5,
+                            LENS_MASK_OFFSET_T << 5, (1 << 10) * (SCREEN_WIDTH - 2 * LENS_MASK_OFFSET_S) / SCREEN_WIDTH,
                             (1 << 10) * (SCREEN_HEIGHT - 2 * LENS_MASK_OFFSET_T) / SCREEN_HEIGHT);
     gDPPipeSync(POLY_XLU_DISP++);
     CLOSE_DISPS(gfxCtx);
@@ -3058,11 +3081,12 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) {
 
             if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) {
                 if ((actor->init == NULL) && (actor->draw != NULL) &&
-                    ((actor->flags & (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME)) || shipShouldDraw)) {
+                    ((actor->flags & (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME)) ||
+                     shipShouldDraw)) {
                     // #endregion
                     if ((actor->flags & ACTOR_FLAG_REACT_TO_LENS) &&
-                        ((play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) ||
-                         play->actorCtx.lensActive || (actor->room != play->roomCtx.curRoom.num))) {
+                        ((play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) || play->actorCtx.lensActive ||
+                         (actor->room != play->roomCtx.curRoom.num))) {
                         assert(invisibleActorCounter < INVISIBLE_ACTOR_MAX);
                         invisibleActors[invisibleActorCounter] = actor;
                         invisibleActorCounter++;
@@ -3272,14 +3296,15 @@ void Actor_FreeOverlay(ActorDBEntry* dbEntry) {
 }
 
 // SoH: Flag to check if actors are being spawned from the actor entry list
-//      This flag is checked against to allow actors which dont have an objectBankIndex in the objectCtx slot/status array to spawn
-//      An example of what this fixes, is that it allows hookshot to be used as child
+//      This flag is checked against to allow actors which dont have an objectBankIndex in the objectCtx slot/status
+//      array to spawn An example of what this fixes, is that it allows hookshot to be used as child
 int gMapLoading = 0;
 
-Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ,
-                   s16 rotX, s16 rotY, s16 rotZ, s16 params, s16 canRandomize) {
+Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX,
+                   s16 rotY, s16 rotZ, s16 params, s16 canRandomize) {
 
-    uint8_t tryRandomizeEnemy = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2 && canRandomize;
+    uint8_t tryRandomizeEnemy = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && gSaveContext.fileNum >= 0 &&
+                                gSaveContext.fileNum <= 2 && canRandomize;
 
     if (tryRandomizeEnemy) {
         if (!GetRandomizedEnemy(play, &actorId, &posX, &posY, &posZ, &rotX, &rotY, &rotZ, &params)) {
@@ -3331,6 +3356,10 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
         return NULL;
     }
 
+    // #region SOH [ObjectExtension]
+    SetActorListIndex(actor, -1);
+    // #endregion
+
     assert(dbEntry->numLoaded < 255);
 
     dbEntry->numLoaded++;
@@ -3370,11 +3399,13 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
     Actor_Init(actor, play);
     gSegments[6] = temp;
 
+    GameInteractor_ExecuteOnActorSpawn(actor);
+
     return actor;
 }
 
-Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play, s16 actorId, f32 posX,
-                          f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) {
+Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play, s16 actorId, f32 posX, f32 posY,
+                          f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) {
     Actor* spawnedActor = Actor_Spawn(actorCtx, play, actorId, posX, posY, posZ, rotX, rotY, rotZ, params, true);
 
     if (spawnedActor == NULL) {
@@ -3386,7 +3417,8 @@ Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play
     // Gohma (z_boss_goma.c), the Stalchildren spawner (z_en_encount1.c) and the falling platform spawning Stalfos in
     // Forest Temple (z_bg_mori_bigst.c) that normally rely on this behaviour are changed when
     // Enemy Rando is on so they still work properly even without assigning a parent.
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && (spawnedActor->id == ACTOR_EN_FLOORMAS || spawnedActor->id == ACTOR_EN_PEEHAT)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) &&
+        (spawnedActor->id == ACTOR_EN_FLOORMAS || spawnedActor->id == ACTOR_EN_PEEHAT)) {
         return spawnedActor;
     }
 
@@ -3444,6 +3476,9 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
 
     player = GET_PLAYER(play);
 
+    // Execute before actor memory is freed
+    GameInteractor_ExecuteOnActorDestroy(actor);
+
     dbEntry = ActorDB_Retrieve(actor->id);
 
     if (HREG(20) != 0) {
@@ -3472,6 +3507,10 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
 
     newHead = Actor_RemoveFromCategory(play, actorCtx, actor);
 
+    // #region SOH [ObjectExtension]
+    ObjectExtension_Free(actor);
+    // #endregion
+
     ZELDA_ARENA_FREE_DEBUG(actor);
 
     dbEntry->numLoaded--;
@@ -3508,11 +3547,13 @@ void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32
     sp84 = player->focusActor;
 
     while (actor != NULL) {
-        if ((actor->update != NULL) && ((Player*)actor != player) && CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED)) {
+        if ((actor->update != NULL) && ((Player*)actor != player) &&
+            CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED)) {
 
             // This block below is for determining the closest actor to player in determining the volume
             // used while playing enemy bgm music
-            if ((actorCategory == ACTORCAT_ENEMY) && CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) &&
+            if ((actorCategory == ACTORCAT_ENEMY) &&
+                CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) &&
                 (actor->xyzDistToPlayerSq < SQ(500.0f)) && (actor->xyzDistToPlayerSq < sbgmEnemyDistSq)) {
                 actorCtx->targetCtx.bgmEnemy = actor;
                 sbgmEnemyDistSq = actor->xyzDistToPlayerSq;
@@ -3521,8 +3562,8 @@ void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32
             if (actor != sp84) {
                 var = func_8002EFC0(actor, player, D_8015BBFC);
                 if ((var < D_8015BBF0) && func_8002F090(actor, var) && func_80032880(play, actor) &&
-                    (!BgCheck_CameraLineTest1(&play->colCtx, &player->actor.focus.pos, &actor->focus.pos, &sp70,
-                                              &sp80, 1, 1, 1, 1, &sp7C) ||
+                    (!BgCheck_CameraLineTest1(&play->colCtx, &player->actor.focus.pos, &actor->focus.pos, &sp70, &sp80,
+                                              1, 1, 1, 1, &sp7C) ||
                      SurfaceType_IsIgnoredByProjectiles(&play->colCtx, sp80, sp7C))) {
                     if (actor->targetPriority != 0) {
                         if (actor->targetPriority < D_8015BBF8) {
@@ -3653,7 +3694,7 @@ void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, PlayState* play) {
             bodyBreak->objectIds = ZELDA_ARENA_MALLOC_DEBUG(objectIdsSize);
 
             if (bodyBreak->objectIds != NULL) {
-                memset((u8*)bodyBreak->matrices,0, matricesSize);
+                memset((u8*)bodyBreak->matrices, 0, matricesSize);
                 memset((u8*)bodyBreak->dLists, 0, dListsSize);
                 memset((u8*)bodyBreak->objectIds, 0, objectIdsSize);
                 bodyBreak->val = 1;
@@ -3724,8 +3765,8 @@ s32 BodyBreak_SpawnParts(Actor* actor, BodyBreak* bodyBreak, PlayState* play, s1
 
         mtx = &bodyBreak->matrices[bodyBreak->count];
 
-        spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, mtx->xw,
-                                                    mtx->yw, mtx->zw, 0, 0, objBankIndex, type);
+        spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, mtx->xw, mtx->yw,
+                                                    mtx->zw, 0, 0, objBankIndex, type);
 
         if (spawnedEnPart != NULL) {
             Matrix_MtxFToYXZRotS(&bodyBreak->matrices[bodyBreak->count], &spawnedEnPart->actor.shape.rot, 0);
@@ -3869,8 +3910,7 @@ Actor* Actor_GetProjectileActor(PlayState* play, Actor* refActor, f32 radius) {
             //  place in memory and causing issues with Dark link behavior, and probably other places too
             if ((Math_Vec3f_DistXYZ(&refActor->world.pos, &actor->world.pos) > radius) ||
                 (actor->id == ACTOR_ARMS_HOOK && ((ArmsHook*)actor)->timer == 0) ||
-                (actor->id == ACTOR_EN_ARROW && ((EnArrow*)actor)->unk_210.x == 0)
-            ) {
+                (actor->id == ACTOR_EN_ARROW && ((EnArrow*)actor)->unk_210.x == 0)) {
                 actor = actor->next;
             } else {
                 deltaX = Math_SinS(actor->world.rot.y) * (actor->speedXZ * 10.0f);
@@ -4075,8 +4115,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, PlayState* play) {
 
     Matrix_Scale(arg1->x, 1.0f, arg1->z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, gCircleShadowDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -4166,8 +4205,7 @@ void Actor_DrawDoorLock(PlayState* play, s32 frame, s32 type) {
             Matrix_Scale(entry->chainsScale, entry->chainsScale, entry->chainsScale, MTXMODE_APPLY);
         }
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_OPA_DISP++, entry->chainDL);
 
         if (i % 2) {
@@ -4183,8 +4221,7 @@ void Actor_DrawDoorLock(PlayState* play, s32 frame, s32 type) {
     Matrix_Put(&baseMtxF);
     Matrix_Scale(frame * 0.1f, frame * 0.1f, frame * 0.1f, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, entry->lockDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -4522,8 +4559,8 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) {
     return displayList;
 }
 
-void func_80034BA0(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw,
-                   PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) {
+void func_80034BA0(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw,
+                   Actor* actor, s16 alpha) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
@@ -4539,8 +4576,8 @@ void func_80034BA0(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overr
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw,
-                   PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) {
+void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw,
+                   Actor* actor, s16 alpha) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
@@ -4671,7 +4708,8 @@ s32 func_800354B4(PlayState* play, Actor* actor, f32 range, s16 arg3, s16 arg4,
     var1 = (s16)(actor->yawTowardsPlayer + 0x8000) - player->actor.shape.rot.y;
     var2 = actor->yawTowardsPlayer - arg5;
 
-    if ((actor->xzDistToPlayer <= range) && (player->meleeWeaponState != 0) && (arg4 >= ABS(var1)) && (arg3 >= ABS(var2))) {
+    if ((actor->xzDistToPlayer <= range) && (player->meleeWeaponState != 0) && (arg4 >= ABS(var1)) &&
+        (arg3 >= ABS(var2))) {
         return true;
     } else {
         return false;
@@ -4711,7 +4749,8 @@ void func_800355B8(PlayState* play, Vec3f* pos) {
 u8 func_800355E4(PlayState* play, Collider* collider) {
     Player* player = GET_PLAYER(play);
 
-    if ((collider->acFlags & AC_TYPE_PLAYER) && (player->meleeWeaponState != 0) && (player->meleeWeaponAnimation == 0x16)) {
+    if ((collider->acFlags & AC_TYPE_PLAYER) && (player->meleeWeaponState != 0) &&
+        (player->meleeWeaponAnimation == 0x16)) {
         return true;
     } else {
         return false;
@@ -4806,12 +4845,11 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3) {
 /**
  * Spawns En_Part (Dissipating Flames) actor as a child of the given actor.
  */
-Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused,
-                     PlayState* play, s16 params, s32 arg8) {
+Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, PlayState* play,
+                     s16 params, s32 arg8) {
     EnPart* spawnedEnPart;
 
-    spawnedEnPart =
-        (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, spawnPos->x, spawnPos->y,
+    spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, spawnPos->x, spawnPos->y,
                                                 spawnPos->z, spawnRot->x, spawnRot->y, actor->objBankIndex, params);
     if (spawnedEnPart != NULL) {
         spawnedEnPart->actor.scale = actor->scale;
@@ -5346,7 +5384,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 17:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 if (Flags_GetInfTable(INFTABLE_6C)) {
                     retTextId = 0x7008;
                 } else {
@@ -5360,7 +5400,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             retTextId = 0x702D;
             break;
         case 18:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7006;
             } else {
                 if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG)) {
@@ -5391,14 +5433,18 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 24:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7044;
             } else {
                 retTextId = 0x7015;
             }
             break;
         case 25:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7045;
             } else {
                 Flags_GetInfTable(INFTABLE_C2);
@@ -5406,7 +5452,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 26:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7046;
             } else {
                 Flags_GetInfTable(INFTABLE_C2);
@@ -5414,7 +5462,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 27:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7047;
             } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
                 retTextId = 0x701A;
@@ -5429,7 +5479,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 28:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7048;
             } else {
                 Flags_GetInfTable(INFTABLE_CA);
@@ -5437,7 +5489,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 29:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x7049;
             } else {
                 Flags_GetInfTable(INFTABLE_CC);
@@ -5445,7 +5499,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 30:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x704A;
             } else {
                 Flags_GetInfTable(INFTABLE_CE);
@@ -5453,7 +5509,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 31:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x704B;
             } else {
                 Flags_GetInfTable(INFTABLE_D0);
@@ -5461,7 +5519,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 32:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x704C;
             } else {
                 Flags_GetInfTable(INFTABLE_D2);
@@ -5469,7 +5529,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             }
             break;
         case 33:
-            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+            if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
                 retTextId = 0x704D;
             } else {
                 Flags_GetInfTable(INFTABLE_D4);
@@ -5721,7 +5783,8 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
                 retTextId = 0x2048;
             } else if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
                 retTextId = 0x2047;
-            } else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG) && !Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
+            } else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG) &&
+                       !Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
                 retTextId = 0x2044;
             } else if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_CHILD_MALON_AT_CASTLE_OR_MARKET)) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_INGO_AT_RANCH_BEFORE_TALON_RETURNS)) {
@@ -5791,8 +5854,8 @@ void func_80036E50(u16 textId, s16 arg1) {
                     Flags_SetInfTable(INFTABLE_0C);
                     return;
                 case 0x1033:
-                    Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
                     Flags_SetInfTable(INFTABLE_0E);
                     return;
@@ -6255,7 +6318,8 @@ s32 func_80037CB8(PlayState* play, Actor* actor, s16 arg2) {
         case TEXT_STATE_CHOICE:
         case TEXT_STATE_EVENT:
             if (Message_ShouldAdvance(play) && func_80037C94(play, actor, arg2)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 msgCtx->msgMode = MSGMODE_TEXT_CLOSING;
                 ret = true;
             }
@@ -6355,7 +6419,8 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a
     actor->focus.pos = actor->world.pos;
     actor->focus.pos.y += arg4;
 
-    if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) {
+    if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) &&
+          (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) {
         var = actor->yawTowardsPlayer - actor->shape.rot.y;
         abs_var = ABS(var);
         if (abs_var >= 0x4300) {
@@ -6364,7 +6429,8 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a
         }
     }
 
-    if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) {
+    if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) &&
+        (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) {
         sp2C = play->view.eye;
     } else {
         sp2C = player->actor.focus.pos;
@@ -6384,7 +6450,8 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f
 
     actor->focus.pos = arg4;
 
-    if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) {
+    if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) &&
+          (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) {
         var = actor->yawTowardsPlayer - actor->shape.rot.y;
         abs_var = ABS(var);
         if (abs_var >= 0x4300) {
@@ -6393,7 +6460,8 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f
         }
     }
 
-    if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) {
+    if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) &&
+        (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) {
         sp24 = play->view.eye;
     } else {
         sp24 = player->actor.focus.pos;
diff --git a/soh/src/code/z_bgcheck.c b/soh/src/code/z_bgcheck.c
index 20deee6795..f0ad28568b 100644
--- a/soh/src/code/z_bgcheck.c
+++ b/soh/src/code/z_bgcheck.c
@@ -1599,10 +1599,10 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
     BgCheck_SetSubdivisionDimension(colCtx->minBounds.z, colCtx->subdivAmount.z, &colCtx->maxBounds.z,
                                     &colCtx->subdivLength.z, &colCtx->subdivLengthInv.z);
 
-// OTRTODO: Re-enable when the below DynaPoly workaround is removed.
-// #ifdef _SOH64 // BGCheck needs more memory on 64 bits because it crashes on some areas
-//     colCtx->memSize *= 2;
-// #endif
+    // OTRTODO: Re-enable when the below DynaPoly workaround is removed.
+    // #ifdef _SOH64 // BGCheck needs more memory on 64 bits because it crashes on some areas
+    //     colCtx->memSize *= 2;
+    // #endif
 
     // BGCheck needs a higher polygon and vertex count due to removed object dependencies.
     // Otherwise Forest Temple checkered room will crash due to the hallway actor being killed a frame late.
@@ -1765,8 +1765,7 @@ f32 BgCheck_EntityRaycastFloor1(CollisionContext* colCtx, CollisionPoly** outPol
  * Public raycast toward floor
  * returns yIntersect of the poly found, or BGCHECK_Y_MIN if no poly detected
  */
-f32 BgCheck_EntityRaycastFloor2(PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly,
-                                Vec3f* pos) {
+f32 BgCheck_EntityRaycastFloor2(PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, Vec3f* pos) {
     s32 bgId;
 
     return BgCheck_RaycastFloorImpl(play, colCtx, COLPOLY_IGNORE_ENTITY, outPoly, &bgId, pos, NULL, 0x1C, 1.0f);
@@ -1916,8 +1915,7 @@ s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResul
     dy = posNext->y - posPrev->y;
     dz = posNext->z - posPrev->z;
 
-    if (BGCHECK_POS_ERROR_CHECK(posNext) == true ||
-        BGCHECK_POS_ERROR_CHECK(posPrev) == true) {
+    if (BGCHECK_POS_ERROR_CHECK(posNext) == true || BGCHECK_POS_ERROR_CHECK(posPrev) == true) {
         if (actor != NULL) {
             osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
         }
@@ -2179,8 +2177,7 @@ s32 BgCheck_CheckLineImpl(CollisionContext* colCtx, u16 xpFlags1, u16 xpFlags2,
     s32 temp_lo;
 
     *outBgId = BGCHECK_SCENE;
-    if (BGCHECK_POS_ERROR_CHECK(posA) == true ||
-        BGCHECK_POS_ERROR_CHECK(posB) == true) {
+    if (BGCHECK_POS_ERROR_CHECK(posA) == true || BGCHECK_POS_ERROR_CHECK(posB) == true) {
         if (actor != NULL) {
             osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
         } else {
@@ -2653,8 +2650,7 @@ void DynaPoly_Alloc(PlayState* play, DynaCollisionContext* dyna) {
  * Set BgActor
  * original name: DynaPolyInfo_setActor
  */
-s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* actor,
-                        CollisionHeader* colHeader) {
+s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader) {
     s32 bgId;
     s32 foundSlot = false;
 
@@ -3813,8 +3809,7 @@ void CollisionHeader_SegmentedToVirtual(CollisionHeader* colHeader) {
 /**
  * Convert CollisionHeader Segmented to Virtual addressing
  */
-void CollisionHeader_GetVirtual(void* colHeader, CollisionHeader** dest)
-{
+void CollisionHeader_GetVirtual(void* colHeader, CollisionHeader** dest) {
     if (ResourceMgr_OTRSigCheck(colHeader))
         colHeader = ResourceMgr_LoadColByName(colHeader);
 
@@ -4339,8 +4334,7 @@ u32 WaterBox_GetLightSettingIndex(CollisionContext* colCtx, WaterBox* waterBox)
  * returns true if point is within the xz boundaries of an active water box, else false
  * `ySurface` returns the water box's surface, while `outWaterBox` returns a pointer to the WaterBox
  */
-s32 func_800425B0(PlayState* play, CollisionContext* colCtx, f32 x, f32 z, f32* ySurface,
-                  WaterBox** outWaterBox) {
+s32 func_800425B0(PlayState* play, CollisionContext* colCtx, f32 x, f32 z, f32* ySurface, WaterBox** outWaterBox) {
     CollisionHeader* colHeader = colCtx->colHeader;
     u32 room;
     WaterBox* curWaterBox;
@@ -4408,8 +4402,8 @@ s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec
 /**
  * Draw a list of dyna polys, specified by `ssList`
  */
-void BgCheck_DrawDynaPolyList(PlayState* play, CollisionContext* colCtx, DynaCollisionContext* dyna,
-                              SSList* ssList, u8 r, u8 g, u8 b) {
+void BgCheck_DrawDynaPolyList(PlayState* play, CollisionContext* colCtx, DynaCollisionContext* dyna, SSList* ssList,
+                              u8 r, u8 g, u8 b) {
     s16 curPolyId;
     CollisionPoly* poly;
     SSNode* curNode;
@@ -4457,16 +4451,14 @@ void BgCheck_DrawDynaPolyList(PlayState* play, CollisionContext* colCtx, DynaCol
  */
 void BgCheck_DrawBgActor(PlayState* play, CollisionContext* colCtx, s32 bgId) {
     if (AREG(21)) {
-        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.ceiling, 255,
-                                 0, 0);
-    }
-    if (AREG(22)) {
-        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.wall, 0, 255,
+        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.ceiling, 255, 0,
                                  0);
     }
+    if (AREG(22)) {
+        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.wall, 0, 255, 0);
+    }
     if (AREG(23)) {
-        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.floor, 0, 0,
-                                 255);
+        BgCheck_DrawDynaPolyList(play, colCtx, &colCtx->dyna, &colCtx->dyna.bgActors[bgId].dynaLookup.floor, 0, 0, 255);
     }
 }
 
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c
index 7167daceb9..0d30dcb2e6 100644
--- a/soh/src/code/z_camera.c
+++ b/soh/src/code/z_camera.c
@@ -7,6 +7,7 @@
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/controls/Mouse.h"
 
 s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags);
 s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags);
@@ -492,8 +493,7 @@ Vec3s* Camera_GetCamBgDataUnderPlayer(Camera* camera, u16* dataCnt) {
 
     Actor_GetWorldPosShapeRot(&playerPosShape, &camera->player->actor);
     playerPosShape.pos.y += Player_GetHeight(camera->player);
-    if (BgCheck_EntityRaycastFloor3(&camera->play->colCtx, &floorPoly, &bgId, &playerPosShape.pos) ==
-        BGCHECK_Y_MIN) {
+    if (BgCheck_EntityRaycastFloor3(&camera->play->colCtx, &floorPoly, &bgId, &playerPosShape.pos) == BGCHECK_Y_MIN) {
         // no floor
         return NULL;
     }
@@ -515,8 +515,8 @@ s32 Camera_GetWaterBoxDataIdx(Camera* camera, f32* waterY) {
     Actor_GetWorldPosShapeRot(&playerPosShape, &camera->player->actor);
     *waterY = playerPosShape.pos.y;
 
-    if (!WaterBox_GetSurface1(camera->play, &camera->play->colCtx, playerPosShape.pos.x, playerPosShape.pos.z,
-                              waterY, &waterBox)) {
+    if (!WaterBox_GetSurface1(camera->play, &camera->play->colCtx, playerPosShape.pos.x, playerPosShape.pos.z, waterY,
+                              &waterBox)) {
         // player's position is not in a water box.
         *waterY = BGCHECK_Y_MIN;
         return -1;
@@ -550,8 +550,7 @@ f32 Camera_GetWaterSurface(Camera* camera, Vec3f* chkPos, s32* envProp) {
     Actor_GetWorldPosShapeRot(&playerPosRot, &camera->player->actor);
     waterY = playerPosRot.pos.y;
 
-    if (!WaterBox_GetSurface1(camera->play, &camera->play->colCtx, chkPos->x, chkPos->z, &waterY,
-                              &waterBox)) {
+    if (!WaterBox_GetSurface1(camera->play, &camera->play->colCtx, chkPos->x, chkPos->z, &waterY, &waterBox)) {
         // chkPos is not within the x/z boundaries of a water box.
         return BGCHECK_Y_MIN;
     }
@@ -573,9 +572,9 @@ s16 Camera_XZAngle(Vec3f* to, Vec3f* from) {
     return DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(from->x - to->x, from->z - to->z)));
 }
 
- f32 D_8015CE50;
- f32 D_8015CE54;
- CamColChk D_8015CE58;
+f32 D_8015CE50;
+f32 D_8015CE54;
+CamColChk D_8015CE58;
 s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
     Vec3f playerPos;
     Vec3f rotatedPos;
@@ -1316,7 +1315,7 @@ s16 Camera_CalcDefaultYaw(Camera* camera, s16 cur, s16 target, f32 arg3, f32 acc
     return cur + (s16)(angDelta * velocity * velFactor * yawUpdRate);
 }
 
-//Follow player with collision
+// Follow player with collision
 void func_80046E20(Camera* camera, VecSph* eyeAdjustment, f32 minDist, f32 arg3, f32* arg4, SwingAnimation* anim) {
     static CamColChk atEyeColChk;
     static CamColChk eyeAtColChk;
@@ -1422,6 +1421,8 @@ s32 SetCameraManual(Camera* camera) {
     f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
     f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
 
+    Mouse_HandleThirdPerson(&newCamX, &newCamY);
+
     if ((fabsf(newCamX) >= 15.0f || fabsf(newCamY) >= 15.0f) && camera->play->manualCamera == false) {
         camera->play->manualCamera = true;
 
@@ -1485,9 +1486,21 @@ s32 Camera_Free(Camera* camera) {
 
     camera->animState = 0;
 
-    f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f * (CVarGetFloat(CVAR_SETTING("FreeLook.CameraSensitivity.X"), 1.0f));
-    f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f * (CVarGetFloat(CVAR_SETTING("FreeLook.CameraSensitivity.Y"), 1.0f));
-    bool invertXAxis = (CVarGetInteger(CVAR_SETTING("FreeLook.InvertXAxis"), 0) && !CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) || (!CVarGetInteger(CVAR_SETTING("FreeLook.InvertXAxis"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0));
+    f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
+    f32 newCamY = +D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
+
+    /* Disable mouse movement when holding down the shield */
+    if (!(camera->player->stateFlags1 & 0x400000)) {
+        Mouse_HandleThirdPerson(&newCamX, &newCamY);
+    }
+
+    newCamX *= (CVarGetFloat(CVAR_SETTING("FreeLook.CameraSensitivity.X"), 1.0f));
+    newCamY *= (CVarGetFloat(CVAR_SETTING("FreeLook.CameraSensitivity.Y"), 1.0f));
+
+    bool invertXAxis = (CVarGetInteger(CVAR_SETTING("FreeLook.InvertXAxis"), 0) &&
+                        !CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) ||
+                       (!CVarGetInteger(CVAR_SETTING("FreeLook.InvertXAxis"), 0) &&
+                        CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0));
 
     camera->play->camX += newCamX * (invertXAxis ? -1 : 1);
     camera->play->camY += newCamY * (CVarGetInteger(CVAR_SETTING("FreeLook.InvertYAxis"), 1) ? 1 : -1);
@@ -1749,7 +1762,7 @@ s32 Camera_Normal1(Camera* camera) {
         }
 
         // crit wiggle
-        if(!CVarGetInteger(CVAR_ENHANCEMENT("DisableCritWiggle"),0)) {
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("DisableCritWiggle"), 0)) {
             if (gSaveContext.health <= 16 && ((camera->play->state.frames % 256) == 0)) {
                 wiggleAdj = Rand_ZeroOne() * 10000.0f;
                 camera->inputDir.y = wiggleAdj + camera->inputDir.y;
@@ -3083,7 +3096,7 @@ s32 Camera_Battle1(Camera* camera) {
     }
     anim->roll += (((OREG(36) * camera->speedRatio) * (1.0f - distRatio)) - anim->roll) * PCT(OREG(37));
     camera->roll = DEGF_TO_BINANG(anim->roll);
-    camera->fov = Camera_LERPCeilF((player->meleeWeaponState != 0       ? 0.8f
+    camera->fov = Camera_LERPCeilF((player->meleeWeaponState != 0 ? 0.8f
                                     : gSaveContext.health <= 0x10 ? 0.8f
                                                                   : 1.0f) *
                                        (fov - ((fov * 0.05f) * distRatio)),
@@ -3553,8 +3566,8 @@ s32 Camera_KeepOn3(Camera* camera) {
         Camera_Vec3fVecSphGeoAdd(&lineChkPointB, &anim->atTarget, &atToEyeAdj);
         if (!(keep3->flags & 0x80)) {
             while (i < angleCnt) {
-                if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &anim->atTarget,
-                                                &lineChkPointB, colChkActors, 2) &&
+                if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &anim->atTarget, &lineChkPointB,
+                                                colChkActors, 2) &&
                     !Camera_BGCheck(camera, &anim->atTarget, &lineChkPointB)) {
                     break;
                 }
@@ -3578,7 +3591,7 @@ s32 Camera_KeepOn3(Camera* camera) {
         at->y += (anim->atTarget.y - at->y) / anim->animTimer;
         at->z += (anim->atTarget.z - at->z) / anim->animTimer;
         // needed to match
-        //if (!prevTargetPlayerDist) {}
+        // if (!prevTargetPlayerDist) {}
         atToEyeAdj.r = ((anim->eyeToAtTarget.x * anim->animTimer) + atToEyeNextDir.r) + 1.0f;
         atToEyeAdj.yaw = atToEyeNextDir.yaw + (s16)(anim->eyeToAtTarget.y * anim->animTimer);
         atToEyeAdj.pitch = atToEyeNextDir.pitch + (s16)(anim->eyeToAtTarget.z * anim->animTimer);
@@ -3836,8 +3849,8 @@ s32 Camera_KeepOn4(Camera* camera) {
             if (!(keep4->unk_1C & 1)) {
                 angleCnt = ARRAY_COUNT(D_8011D3B0);
                 for (i = 0; i < angleCnt; i++) {
-                    if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &D_8015BD50,
-                                                    &D_8015BD70, spCC, sp9C) &&
+                    if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &D_8015BD50, &D_8015BD70,
+                                                    spCC, sp9C) &&
                         !Camera_BGCheck(camera, &D_8015BD50, &D_8015BD70)) {
                         break;
                     }
@@ -4529,9 +4542,9 @@ s32 Camera_Subj4(Camera* camera) {
     }
 
     anim->unk_28 = temp_f16;
-    //camera->player->actor.world.pos = *eyeNext;
-    //camera->player->actor.world.pos.y = camera->playerGroundY;
-    //camera->player->actor.shape.rot.y = sp64.yaw;
+    // camera->player->actor.world.pos = *eyeNext;
+    // camera->player->actor.world.pos.y = camera->playerGroundY;
+    // camera->player->actor.shape.rot.y = sp64.yaw;
     temp_f16 = ((240.0f * temp_f16) * (anim->unk_24 * 0.416667f));
     temp_a0 = temp_f16 + anim->unk_30;
     at->x = eye->x + (Math_SinS(temp_a0) * 10.0f);
@@ -4726,7 +4739,8 @@ s32 Camera_Unique1(Camera* camera) {
         anim->timer--;
     }
 
-    sp8C.yaw = Camera_LERPFloorS(anim->yawTarget, eyeNextAtOffset.yaw, 0.5f, CVarGetInteger(CVAR_ENHANCEMENT("FixHangingLedgeSwingRate"), 0) ? 0xA : 0x2710);
+    sp8C.yaw = Camera_LERPFloorS(anim->yawTarget, eyeNextAtOffset.yaw, 0.5f,
+                                 CVarGetInteger(CVAR_ENHANCEMENT("FixHangingLedgeSwingRate"), 0) ? 0xA : 0x2710);
     Camera_Vec3fVecSphGeoAdd(eyeNext, at, &sp8C);
     *eye = *eyeNext;
     Camera_BGCheck(camera, at, eye);
@@ -5237,7 +5251,8 @@ s32 Camera_Unique9(Camera* camera) {
                     D_8011D3AC = anim->curKeyFrame->unk_01 & 0xF;
                 } else if ((anim->curKeyFrame->unk_01 & 0xF0) == 0xC0) {
                     Camera_UpdateInterface(0xF000 | ((anim->curKeyFrame->unk_01 & 0xF) << 8));
-                } else if (camera->player->stateFlags1 & PLAYER_STATE1_IN_WATER && player->currentBoots != PLAYER_BOOTS_IRON) {
+                } else if (camera->player->stateFlags1 & PLAYER_STATE1_IN_WATER &&
+                           player->currentBoots != PLAYER_BOOTS_IRON) {
                     func_8002DF38(camera->play, camera->target, 8);
                     osSyncPrintf("camera: demo: player demo set WAIT\n");
                 } else {
@@ -5712,8 +5727,8 @@ s32 Camera_Demo1(Camera* camera) {
             anim->curFrame = 0.0f;
             camera->animState++;
             // "absolute" : "relative"
-            osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n",
-                         camera->play->state.frames, *relativeToPlayer == 0 ? "絶対" : "相対");
+            osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n", camera->play->state.frames,
+                         *relativeToPlayer == 0 ? "絶対" : "相対");
 
             if (PREG(93)) {
                 Camera_DebugPrintSplineArray("CENTER", 5, csAtPoints);
@@ -7039,8 +7054,7 @@ void func_80057FC4(Camera* camera) {
                 camera->prevSetting = camera->setting = CAM_SET_NORMAL0;
                 break;
             default:
-                osSyncPrintf("camera: room type: default set etc (%d)\n",
-                             camera->play->roomCtx.curRoom.behaviorType1);
+                osSyncPrintf("camera: room type: default set etc (%d)\n", camera->play->roomCtx.curRoom.behaviorType1);
                 Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10);
                 camera->prevSetting = camera->setting = CAM_SET_NORMAL0;
                 camera->unk_14C |= 4;
@@ -7456,7 +7470,7 @@ void Camera_UpdateDistortion(Camera* camera) {
         screenPlanePhase += DEGF_TO_BINANG(screenPlanePhaseStep);
 
         View_SetDistortionOrientation(&camera->play->view, Math_CosS(depthPhase) * 0.0f, Math_SinS(depthPhase) * 0.0f,
-                                 Math_SinS(screenPlanePhase) * 0.0f);
+                                      Math_SinS(screenPlanePhase) * 0.0f);
         View_SetDistortionScale(&camera->play->view, Math_SinS(screenPlanePhase) * (xScale * scaleFactor) + 1.0f,
                                 Math_CosS(screenPlanePhase) * (yScale * scaleFactor) + 1.0f,
                                 Math_CosS(depthPhase) * (zScale * scaleFactor) + 1.0f);
@@ -7512,8 +7526,8 @@ Vec3s Camera_Update(Camera* camera) {
         spAC = curPlayerPosRot.pos;
         spAC.y += Player_GetHeight(camera->player);
 
-        playerGroundY = BgCheck_EntityRaycastFloor5(camera->play, &camera->play->colCtx, &playerFloorPoly,
-                                                    &bgId, &camera->player->actor, &spAC);
+        playerGroundY = BgCheck_EntityRaycastFloor5(camera->play, &camera->play->colCtx, &playerFloorPoly, &bgId,
+                                                    &camera->player->actor, &spAC);
         if (playerGroundY != BGCHECK_Y_MIN) {
             // player is above ground.
             sOOBTimer = 0;
@@ -7619,7 +7633,8 @@ Vec3s Camera_Update(Camera* camera) {
     }
 
     // enable/disable debug cam
-    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) && CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_START)) {
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) &&
+        CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_START)) {
         gDbgCamEnabled ^= 1;
         if (gDbgCamEnabled) {
             DbgCamera_Enable(&D_8015BD80, camera);
@@ -7935,7 +7950,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) {
         return -5;
     }
 
-    //modified from "==" to "<=" to not crash when "setting" is a negative value
+    // modified from "==" to "<=" to not crash when "setting" is a negative value
     if (setting <= CAM_SET_NONE || setting >= CAM_SET_MAX) {
         osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera set (%d) !!!!\n" VT_RST, setting);
         return -99;
diff --git a/soh/src/code/z_cheap_proc.c b/soh/src/code/z_cheap_proc.c
index 4af2867e5a..f2b833ecc9 100644
--- a/soh/src/code/z_cheap_proc.c
+++ b/soh/src/code/z_cheap_proc.c
@@ -5,13 +5,12 @@ void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
 
-     if (ResourceMgr_OTRSigCheck(dlist) == 1)
+    if (ResourceMgr_OTRSigCheck(dlist) == 1)
         gsSPPushCD(POLY_OPA_DISP++, dlist);
-    
-     gSPDisplayList(POLY_OPA_DISP++, dlist);
+
+    gSPDisplayList(POLY_OPA_DISP++, dlist);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -20,12 +19,11 @@ void Gfx_DrawDListXlu(PlayState* play, Gfx* dlist) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
-    
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
+
     if (ResourceMgr_OTRSigCheck(dlist) == 1)
         gsSPPushCD(POLY_XLU_DISP++, dlist);
-    
+
     gSPDisplayList(POLY_XLU_DISP++, dlist);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/code/z_collision_check.c b/soh/src/code/z_collision_check.c
index 312675f7f7..aa466e412e 100644
--- a/soh/src/code/z_collision_check.c
+++ b/soh/src/code/z_collision_check.c
@@ -274,8 +274,7 @@ s32 Collider_DestroyJntSphElementDim(PlayState* play, ColliderJntSphElementDim*
     return 1;
 }
 
-s32 Collider_SetJntSphElementDim(PlayState* play, ColliderJntSphElementDim* dest,
-                                 ColliderJntSphElementDimInit* src) {
+s32 Collider_SetJntSphElementDim(PlayState* play, ColliderJntSphElementDim* dest, ColliderJntSphElementDimInit* src) {
     dest->limb = src->limb;
     dest->modelSphere = src->modelSphere;
     dest->scale = src->scale * 0.01f;
@@ -391,8 +390,7 @@ s32 Collider_SetJntSphToActor(PlayState* play, ColliderJntSph* dest, ColliderJnt
  * Sets up the ColliderJntSph using the values in src and dynamically allocates the element array. Uses default
  * OC2_TYPE_1. Only used by En_Nwc, an unused and unfinished actor.
  */
-s32 Collider_SetJntSphAllocType1(PlayState* play, ColliderJntSph* dest, Actor* actor,
-                                 ColliderJntSphInitType1* src) {
+s32 Collider_SetJntSphAllocType1(PlayState* play, ColliderJntSph* dest, Actor* actor, ColliderJntSphInitType1* src) {
     ColliderJntSphElement* destElem;
     ColliderJntSphElementInit* srcElem;
 
@@ -549,8 +547,7 @@ s32 Collider_DestroyCylinder(PlayState* play, ColliderCylinder* collider) {
  * Sets up the ColliderCylinder using the values in src and sets it to the actor specified in src. Uses default
  * OC2_TYPE_1 and COLTYPE_0. Used only by DekuJr, who sets it to himself anyways.
  */
-s32 Collider_SetCylinderToActor(PlayState* play, ColliderCylinder* collider,
-                                ColliderCylinderInitToActor* src) {
+s32 Collider_SetCylinderToActor(PlayState* play, ColliderCylinder* collider, ColliderCylinderInitToActor* src) {
     Collider_SetBaseToActor(play, &collider->base, &src->base);
     Collider_SetInfo(play, &collider->info, &src->info);
     Collider_SetCylinderDim(play, &collider->dim, &src->dim);
@@ -571,8 +568,7 @@ s32 Collider_SetCylinderType1(PlayState* play, ColliderCylinder* collider, Actor
 /**
  * Sets up the ColliderCylinder using the values in src.
  */
-s32 Collider_SetCylinder(PlayState* play, ColliderCylinder* collider, Actor* actor,
-                         ColliderCylinderInit* src) {
+s32 Collider_SetCylinder(PlayState* play, ColliderCylinder* collider, Actor* actor, ColliderCylinderInit* src) {
     Collider_SetBase(play, &collider->base, actor, &src->base);
     Collider_SetInfo(play, &collider->info, &src->info);
     Collider_SetCylinderDim(play, &collider->dim, &src->dim);
@@ -1117,8 +1113,8 @@ void Collider_Draw(PlayState* play, Collider* collider) {
         case COLSHAPE_TRIS:
             tris = (ColliderTris*)collider;
             for (i = 0; i < tris->count; i++) {
-                Collider_DrawRedPoly(play->state.gfxCtx, &tris->elements[i].dim.vtx[0],
-                                     &tris->elements[i].dim.vtx[1], &tris->elements[i].dim.vtx[2]);
+                Collider_DrawRedPoly(play->state.gfxCtx, &tris->elements[i].dim.vtx[0], &tris->elements[i].dim.vtx[1],
+                                     &tris->elements[i].dim.vtx[2]);
             }
             break;
         case COLSHAPE_QUAD:
@@ -1209,8 +1205,7 @@ s32 CollisionCheck_SetAT(PlayState* play, CollisionCheckContext* colChkCtx, Coll
  * If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it
  * will be inserted into the next slot
  */
-s32 CollisionCheck_SetAT_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider,
-                             s32 index) {
+s32 CollisionCheck_SetAT_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, s32 index) {
     assert(collider->shape <= COLSHAPE_QUAD);
 
     if (GameInteractor_SecondCollisionUpdate()) {
@@ -1288,8 +1283,7 @@ s32 CollisionCheck_SetAC(PlayState* play, CollisionCheckContext* colChkCtx, Coll
  * If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it
  * will be inserted into the next slot
  */
-s32 CollisionCheck_SetAC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider,
-                             s32 index) {
+s32 CollisionCheck_SetAC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, s32 index) {
     assert(collider->shape <= COLSHAPE_QUAD);
 
     if (GameInteractor_SecondCollisionUpdate()) {
@@ -1369,8 +1363,7 @@ s32 CollisionCheck_SetOC(PlayState* play, CollisionCheckContext* colChkCtx, Coll
  * If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it
  * will be inserted into the next slot
  */
-s32 CollisionCheck_SetOC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider,
-                             s32 index) {
+s32 CollisionCheck_SetOC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, s32 index) {
 
     if (GameInteractor_SecondCollisionUpdate()) {
         return -1;
@@ -1607,10 +1600,11 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
     if (flags == TOUCH_SFX_NORMAL && collider->colType != COLTYPE_METAL) {
         EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos);
         if (collider->actor == NULL) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if (flags == TOUCH_SFX_NORMAL) { // collider->colType == COLTYPE_METAL
         EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, hitPos);
@@ -1622,18 +1616,20 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
     } else if (flags == TOUCH_SFX_HARD) {
         EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos);
         if (collider->actor == NULL) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if (flags == TOUCH_SFX_WOOD) {
         EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_DUST, hitPos);
         if (collider->actor == NULL) {
-            Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-        } else {
-            Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+            Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
                                    &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        } else {
+            Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 }
@@ -1644,17 +1640,17 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
 s32 CollisionCheck_SwordHitAudio(Collider* at, ColliderInfo* acInfo) {
     if (at->actor != NULL && at->actor->category == ACTORCAT_PLAYER) {
         if (acInfo->elemType == ELEMTYPE_UNK0) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else if (acInfo->elemType == ELEMTYPE_UNK1) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else if (acInfo->elemType == ELEMTYPE_UNK2) {
-            Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else if (acInfo->elemType == ELEMTYPE_UNK3) {
-            Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     return 1;
@@ -1674,8 +1670,8 @@ static HitInfo sHitInfo[] = {
 /**
  * Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colType
  */
-void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atInfo, Collider* ac,
-                               ColliderInfo* acInfo, Vec3f* hitPos) {
+void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atInfo, Collider* ac, ColliderInfo* acInfo,
+                               Vec3f* hitPos) {
     if (acInfo->bumperFlags & BUMP_NO_HITMARK) {
         return;
     }
@@ -1691,7 +1687,8 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atIn
         } else if (sHitInfo[ac->colType].effect == HIT_WOOD) {
             if (at->actor == NULL) {
                 CollisionCheck_SpawnShieldParticles(play, hitPos);
-                Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &at->actor->projectedPos);
             }
@@ -1704,10 +1701,11 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atIn
     } else {
         EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos);
         if (ac->actor == NULL) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &ac->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &ac->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 }
@@ -1804,8 +1802,8 @@ void CollisionCheck_AC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* co
                     } else {
                         Math_Vec3f_Copy(&hitPos, &atPos);
                     }
-                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info,
-                                             &acPos, &hitPos);
+                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info, &acPos,
+                                             &hitPos);
                     if (!(ac->base.ocFlags2 & OC2_FIRST_ONLY)) {
                         return;
                     }
@@ -1861,8 +1859,7 @@ void CollisionCheck_AC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colCh
                 } else {
                     Math_Vec3f_Copy(&hitPos, &atPos);
                 }
-                CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &ac->info, &acPos,
-                                         &hitPos);
+                CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &ac->info, &acPos, &hitPos);
                 return;
             }
         }
@@ -1915,8 +1912,7 @@ void CollisionCheck_AC_CylVsJntSph(PlayState* play, CollisionCheckContext* colCh
                 } else {
                     Math_Vec3f_Copy(&hitPos, &atPos);
                 }
-                CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos, &ac->base, &acElem->info, &acPos,
-                                         &hitPos);
+                CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos, &ac->base, &acElem->info, &acPos, &hitPos);
                 if (!(ac->base.ocFlags2 & OC2_FIRST_ONLY)) {
                     break;
                 }
@@ -1958,8 +1954,8 @@ void CollisionCheck_AC_JntSphVsTris(PlayState* play, CollisionCheckContext* colC
                     acPos.x = (acTri->dim.vtx[0].x + acTri->dim.vtx[1].x + acTri->dim.vtx[2].x) * (1.0f / 3);
                     acPos.y = (acTri->dim.vtx[0].y + acTri->dim.vtx[1].y + acTri->dim.vtx[2].y) * (1.0f / 3);
                     acPos.z = (acTri->dim.vtx[0].z + acTri->dim.vtx[1].z + acTri->dim.vtx[2].z) * (1.0f / 3);
-                    CollisionCheck_SetATvsAC(play, &at->base, &atSph->info, &atPos, &ac->base, &acTri->info,
-                                             &acPos, &hitPos);
+                    CollisionCheck_SetATvsAC(play, &at->base, &atSph->info, &atPos, &ac->base, &acTri->info, &acPos,
+                                             &hitPos);
                     return;
                 }
             }
@@ -1998,8 +1994,8 @@ void CollisionCheck_AC_TrisVsJntSph(PlayState* play, CollisionCheckContext* colC
                     atPos.x = (atItem->dim.vtx[0].x + atItem->dim.vtx[1].x + atItem->dim.vtx[2].x) * (1.0f / 3);
                     atPos.y = (atItem->dim.vtx[0].y + atItem->dim.vtx[1].y + atItem->dim.vtx[2].y) * (1.0f / 3);
                     atPos.z = (atItem->dim.vtx[0].z + atItem->dim.vtx[1].z + atItem->dim.vtx[2].z) * (1.0f / 3);
-                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info,
-                                             &acPos, &hitPos);
+                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info, &acPos,
+                                             &hitPos);
                     if (!(ac->base.ocFlags2 & OC2_FIRST_ONLY)) {
                         return;
                     }
@@ -2045,8 +2041,7 @@ void CollisionCheck_AC_JntSphVsQuad(PlayState* play, CollisionCheckContext* colC
                 acPos.y = (ac->dim.quad[0].y + (ac->dim.quad[1].y + (ac->dim.quad[3].y + ac->dim.quad[2].y))) / 4.0f;
                 acPos.z = (ac->dim.quad[0].z + (ac->dim.quad[1].z + (ac->dim.quad[3].z + ac->dim.quad[2].z))) / 4.0f;
 
-                CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &ac->info, &acPos,
-                                         &hitPos);
+                CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &ac->info, &acPos, &hitPos);
                 return;
             }
         }
@@ -2108,8 +2103,7 @@ void CollisionCheck_AC_QuadVsJntSph(PlayState* play, CollisionCheckContext* colC
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                Collider* colAC) {
+void CollisionCheck_AC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     ColliderCylinder* at = (ColliderCylinder*)colAT;
     ColliderCylinder* ac = (ColliderCylinder*)colAC;
     f32 deadSpace;
@@ -2149,8 +2143,7 @@ void CollisionCheck_AC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCt
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                 Collider* colAC) {
+void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     ColliderCylinder* at = (ColliderCylinder*)colAT;
     ColliderTris* ac = (ColliderTris*)colAC;
     ColliderTrisElement* acElem;
@@ -2176,8 +2169,7 @@ void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkC
                 acPos.x = (acElem->dim.vtx[0].x + acElem->dim.vtx[1].x + acElem->dim.vtx[2].x) * (1.0f / 3);
                 acPos.y = (acElem->dim.vtx[0].y + acElem->dim.vtx[1].y + acElem->dim.vtx[2].y) * (1.0f / 3);
                 acPos.z = (acElem->dim.vtx[0].z + acElem->dim.vtx[1].z + acElem->dim.vtx[2].z) * (1.0f / 3);
-                CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atpos, &ac->base, &acElem->info, &acPos,
-                                         &hitPos);
+                CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atpos, &ac->base, &acElem->info, &acPos, &hitPos);
                 return;
             }
         }
@@ -2187,8 +2179,7 @@ void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkC
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_TrisVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                 Collider* colAC) {
+void CollisionCheck_AC_TrisVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static Vec3f D_8015E310;
     ColliderTris* at = (ColliderTris*)colAT;
     ColliderTrisElement* atItem;
@@ -2224,8 +2215,7 @@ void CollisionCheck_AC_TrisVsCyl(PlayState* play, CollisionCheckContext* colChkC
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_CylVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                 Collider* colAC) {
+void CollisionCheck_AC_CylVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static TriNorm D_8015E320;
     static TriNorm D_8015E358;
     static Vec3f D_8015E390;
@@ -2249,8 +2239,7 @@ void CollisionCheck_AC_CylVsQuad(PlayState* play, CollisionCheckContext* colChkC
             acPos1.x = (ac->dim.quad[0].x + (ac->dim.quad[1].x + (ac->dim.quad[3].x + ac->dim.quad[2].x))) / 4.0f;
             acPos1.y = (ac->dim.quad[0].y + (ac->dim.quad[1].y + (ac->dim.quad[3].y + ac->dim.quad[2].y))) / 4.0f;
             acPos1.z = (ac->dim.quad[0].z + (ac->dim.quad[1].z + (ac->dim.quad[3].z + ac->dim.quad[2].z))) / 4.0f;
-            CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos1, &ac->base, &ac->info, &acPos1,
-                                     &D_8015E390);
+            CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos1, &ac->base, &ac->info, &acPos1, &D_8015E390);
         } else if (Math3D_CylTriVsIntersect(&at->dim, &D_8015E358, &D_8015E390) == 1) {
             Vec3f atPos2;
             Vec3f acPos2;
@@ -2259,8 +2248,7 @@ void CollisionCheck_AC_CylVsQuad(PlayState* play, CollisionCheckContext* colChkC
             acPos2.x = (ac->dim.quad[0].x + (ac->dim.quad[1].x + (ac->dim.quad[3].x + ac->dim.quad[2].x))) / 4.0f;
             acPos2.y = (ac->dim.quad[0].y + (ac->dim.quad[1].y + (ac->dim.quad[3].y + ac->dim.quad[2].y))) / 4.0f;
             acPos2.z = (ac->dim.quad[0].z + (ac->dim.quad[1].z + (ac->dim.quad[3].z + ac->dim.quad[2].z))) / 4.0f;
-            CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos2, &ac->base, &ac->info, &acPos2,
-                                     &D_8015E390);
+            CollisionCheck_SetATvsAC(play, &at->base, &at->info, &atPos2, &ac->base, &ac->info, &acPos2, &D_8015E390);
         }
     }
 }
@@ -2271,8 +2259,7 @@ static s8 sBssDummy1;
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_QuadVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                 Collider* colAC) {
+void CollisionCheck_AC_QuadVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static TriNorm D_8015E3A0;
     static TriNorm D_8015E3D8;
     static Vec3f D_8015E410;
@@ -2326,8 +2313,7 @@ static s8 sBssDummy6;
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_TrisVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                  Collider* colAC) {
+void CollisionCheck_AC_TrisVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static Vec3f D_8015E420;
     ColliderTris* at = (ColliderTris*)colAT;
     ColliderTrisElement* atItem;
@@ -2356,8 +2342,8 @@ void CollisionCheck_AC_TrisVsTris(PlayState* play, CollisionCheckContext* colChk
                     acPos.x = (acElem->dim.vtx[0].x + acElem->dim.vtx[1].x + acElem->dim.vtx[2].x) * (1.0f / 3);
                     acPos.y = (acElem->dim.vtx[0].y + acElem->dim.vtx[1].y + acElem->dim.vtx[2].y) * (1.0f / 3);
                     acPos.z = (acElem->dim.vtx[0].z + acElem->dim.vtx[1].z + acElem->dim.vtx[2].z) * (1.0f / 3);
-                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info,
-                                             &acPos, &D_8015E420);
+                    CollisionCheck_SetATvsAC(play, &at->base, &atItem->info, &atPos, &ac->base, &acElem->info, &acPos,
+                                             &D_8015E420);
                     return;
                 }
             }
@@ -2373,8 +2359,7 @@ static s8 sBssDummy10;
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_TrisVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                  Collider* colAC) {
+void CollisionCheck_AC_TrisVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static Vec3f D_8015E430;
     static TriNorm D_8015E440;
     static TriNorm D_8015E478;
@@ -2417,8 +2402,7 @@ void CollisionCheck_AC_TrisVsQuad(PlayState* play, CollisionCheckContext* colChk
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_QuadVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                  Collider* colAC) {
+void CollisionCheck_AC_QuadVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static Vec3f D_8015E4B0;
     static TriNorm D_8015E4C0;
     static TriNorm D_8015E4F8;
@@ -2466,8 +2450,7 @@ void CollisionCheck_AC_QuadVsTris(PlayState* play, CollisionCheckContext* colChk
 /**
  * AC overlap check. Calculates the center of each collider element and the point of contact.
  */
-void CollisionCheck_AC_QuadVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT,
-                                  Collider* colAC) {
+void CollisionCheck_AC_QuadVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) {
     static TriNorm D_8015E530[2];
     static Vec3f D_8015E598;
     static TriNorm D_8015E5A8[2];
@@ -2531,8 +2514,8 @@ void CollisionCheck_SetJntSphHitFX(PlayState* play, CollisionCheckContext* colCh
         if ((element->info.bumperFlags & BUMP_DRAW_HITMARK) && (element->info.acHitInfo != NULL) &&
             !(element->info.acHitInfo->toucherFlags & TOUCH_DREW_HITMARK)) {
             Math_Vec3s_ToVec3f(&hitPos, &element->info.bumper.hitPos);
-            CollisionCheck_HitEffects(play, element->info.acHit, element->info.acHitInfo, &jntSph->base,
-                                      &element->info, &hitPos);
+            CollisionCheck_HitEffects(play, element->info.acHit, element->info.acHitInfo, &jntSph->base, &element->info,
+                                      &hitPos);
             element->info.acHitInfo->toucherFlags |= TOUCH_DREW_HITMARK;
             return;
         }
@@ -2567,8 +2550,8 @@ void CollisionCheck_SetTrisHitFX(PlayState* play, CollisionCheckContext* colChkC
         if ((element->info.bumperFlags & BUMP_DRAW_HITMARK) && (element->info.acHitInfo != NULL) &&
             !(element->info.acHitInfo->toucherFlags & TOUCH_DREW_HITMARK)) {
             Math_Vec3s_ToVec3f(&hitPos, &element->info.bumper.hitPos);
-            CollisionCheck_HitEffects(play, element->info.acHit, element->info.acHitInfo, &tris->base,
-                                      &element->info, &hitPos);
+            CollisionCheck_HitEffects(play, element->info.acHit, element->info.acHitInfo, &tris->base, &element->info,
+                                      &hitPos);
             element->info.acHitInfo->toucherFlags |= TOUCH_DREW_HITMARK;
             return;
         }
@@ -2785,8 +2768,7 @@ void CollisionCheck_SetOCvsOC(Collider* left, ColliderInfo* leftInfo, Vec3f* lef
 /**
  * OC overlap check for two JntSphs
  */
-void CollisionCheck_OC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l,
-                                      Collider* r) {
+void CollisionCheck_OC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) {
     ColliderJntSph* left = (ColliderJntSph*)l;
     ColliderJntSphElement* leftElem;
     ColliderJntSph* right = (ColliderJntSph*)r;
@@ -2819,8 +2801,7 @@ void CollisionCheck_OC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* co
 /**
  * OC overlap check for a JntSph and Cylinder
  */
-void CollisionCheck_OC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l,
-                                   Collider* r) {
+void CollisionCheck_OC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) {
     ColliderJntSph* left = (ColliderJntSph*)l;
     ColliderJntSphElement* leftElem;
     ColliderCylinder* right = (ColliderCylinder*)r;
@@ -2849,8 +2830,7 @@ void CollisionCheck_OC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colCh
 /**
  * OC overlap check for a Cylinder and JntSph
  */
-void CollisionCheck_OC_CylVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l,
-                                   Collider* r) {
+void CollisionCheck_OC_CylVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) {
     CollisionCheck_OC_JntSphVsCyl(play, colChkCtx, r, l);
 }
 
@@ -3124,8 +3104,8 @@ void CollisionCheck_Damage(PlayState* play, CollisionCheckContext* colChkCtx) {
 /**
  * Checks if the line ab intersects any of the ColliderJntSph's elements
  */
-s32 CollisionCheck_LineOC_JntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider,
-                                 Vec3f* a, Vec3f* b) {
+s32 CollisionCheck_LineOC_JntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a,
+                                 Vec3f* b) {
     static Linef D_8015E610;
     ColliderJntSph* jntSph = (ColliderJntSph*)collider;
     s32 i;
@@ -3174,8 +3154,8 @@ static ColChkLineFunc sOCLineCheckFuncs[4] = {
  * Checks if the line segment ab intersects any OC colliders, excluding those attached to actors
  * on the exclusion list. Returns true if there are any intersections and false otherwise.
  */
-s32 CollisionCheck_LineOC(PlayState* play, CollisionCheckContext* colChkCtx, Vec3f* a, Vec3f* b,
-                          Actor** exclusions, s32 numExclusions) {
+s32 CollisionCheck_LineOC(PlayState* play, CollisionCheckContext* colChkCtx, Vec3f* a, Vec3f* b, Actor** exclusions,
+                          s32 numExclusions) {
     ColChkLineFunc lineCheck;
     Collider** col;
     s32 i;
@@ -3460,7 +3440,8 @@ void CollisionCheck_SpawnShieldParticles(PlayState* play, Vec3f* v) {
  */
 void CollisionCheck_SpawnShieldParticlesMetal(PlayState* play, Vec3f* v) {
     CollisionCheck_SpawnShieldParticles(play, v);
-    Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 /**
@@ -3468,7 +3449,8 @@ void CollisionCheck_SpawnShieldParticlesMetal(PlayState* play, Vec3f* v) {
  */
 void CollisionCheck_SpawnShieldParticlesMetalSound(PlayState* play, Vec3f* v, Vec3f* pos) {
     CollisionCheck_SpawnShieldParticles(play, v);
-    Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultReverb);
 }
 
 /**
@@ -3508,7 +3490,8 @@ void CollisionCheck_SpawnShieldParticlesWood(PlayState* play, Vec3f* v, Vec3f* a
     initWood.lightPoint.z = initWood.position.z;
 
     Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &initWood);
-    Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, actorPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, actorPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 /**
diff --git a/soh/src/code/z_construct.c b/soh/src/code/z_construct.c
index 065c6f413d..06f8729957 100644
--- a/soh/src/code/z_construct.c
+++ b/soh/src/code/z_construct.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include <textures/do_action_static/do_action_static.h>
 #include <assert.h>
+#include "soh/ResourceManagerHelpers.h"
 
 void func_80110990(PlayState* play) {
     Map_Destroy(play);
@@ -53,8 +54,8 @@ void func_801109B0(PlayState* play) {
     interfaceCtx->doActionSegment[1] = gCheckDoActionENGTex;
     interfaceCtx->doActionSegment[2] = gReturnDoActionENGTex;
 
-    interfaceCtx->iconItemSegment = GAMESTATE_ALLOC_MC(
-        &play->state, 0x1000 * ARRAY_COUNT(gSaveContext.equips.buttonItems));
+    interfaceCtx->iconItemSegment =
+        GAMESTATE_ALLOC_MC(&play->state, 0x1000 * ARRAY_COUNT(gSaveContext.equips.buttonItems));
 
     // "Icon Item Texture Initialization = %x"
     osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000);
@@ -80,21 +81,21 @@ void func_801109B0(PlayState* play) {
         }
     }
 
-    osSyncPrintf("ＥＶＥＮＴ＝%d\n", ((void)0, gSaveContext.timer1State));
+    osSyncPrintf("ＥＶＥＮＴ＝%d\n", ((void)0, gSaveContext.timerState));
 
-    if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8) || (gSaveContext.timer2State == 4) ||
-        (gSaveContext.timer2State == 10)) {
+    if ((gSaveContext.timerState == 4) || (gSaveContext.timerState == 8) || (gSaveContext.subTimerState == 4) ||
+        (gSaveContext.subTimerState == 10)) {
         osSyncPrintf("restart_flag=%d\n", ((void)0, gSaveContext.respawnFlag));
 
         if ((gSaveContext.respawnFlag == -1) || (gSaveContext.respawnFlag == 1)) {
-            if (gSaveContext.timer1State == 4) {
-                gSaveContext.timer1State = 1;
+            if (gSaveContext.timerState == 4) {
+                gSaveContext.timerState = 1;
                 gSaveContext.timerX[0] = 140;
                 gSaveContext.timerY[0] = 80;
             }
         }
 
-        if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) {
+        if ((gSaveContext.timerState == 4) || (gSaveContext.timerState == 8)) {
             temp = 0;
         } else {
             temp = 1;
@@ -109,10 +110,10 @@ void func_801109B0(PlayState* play) {
         }
     }
 
-    if ((gSaveContext.timer1State >= 11) && (gSaveContext.timer1State < 16)) {
-        gSaveContext.timer1State = 0;
+    if ((gSaveContext.timerState >= 11) && (gSaveContext.timerState < 16)) {
+        gSaveContext.timerState = 0;
         // "Timer Stop!!!!!!!!!!!!!!!!!!!!!!"
-        osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！  = %d\n", gSaveContext.timer1State);
+        osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！  = %d\n", gSaveContext.timerState);
     }
 
     osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x"
@@ -157,7 +158,11 @@ void Message_Init(PlayState* play) {
     osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); // "Textbox game_alloc=%x"
     assert(msgCtx->textboxSegment != NULL);
 
-    Font_LoadOrderedFont(&play->msgCtx.font);
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        Font_LoadOrderedFont(&play->msgCtx.font);
+    } else { // GAME_REGION_NTSC
+        Font_LoadOrderedFontNTSC(&play->msgCtx.font);
+    }
 
     YREG(31) = 0;
 }
diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c
index 1a814d745a..aebd08f864 100644
--- a/soh/src/code/z_debug.c
+++ b/soh/src/code/z_debug.c
@@ -24,35 +24,35 @@ Color_RGBA8 printTextColors[] = {
 };
 
 InputCombo inputCombos[REG_GROUPS] = {
-    { BTN_L, BTN_CUP },         //REG
-    { BTN_L, BTN_CLEFT },       //SREG
-    { BTN_L, BTN_CDOWN },       //OREG
-    { BTN_L, BTN_A },           //PREG
-    { BTN_R, BTN_CDOWN },       //QREG
-    { BTN_L, BTN_CRIGHT },      //MREG
-    { BTN_L, BTN_R },           //YREG
-    { BTN_L, BTN_DLEFT },       //DREG
-    { BTN_L, BTN_DRIGHT },      //UREG
-    { BTN_L, BTN_DUP },         //IREG
-    { BTN_L, BTN_B },           //ZREG
-    { BTN_L, BTN_Z },           //CREG
-    { BTN_L, BTN_DDOWN },       //NREG
-    { BTN_R, BTN_A },           //KREG
-    { BTN_R, BTN_B },           //XREG
-    { BTN_R, BTN_Z },           //cREG
-    { BTN_R, BTN_L },           //sREG
-    { BTN_R, BTN_CUP },         //iREG
-    { BTN_R, BTN_CRIGHT },      //WREG
-    { BTN_R, BTN_DLEFT },       //AREG
-    { BTN_R, BTN_CLEFT },       //VREG
-    { BTN_R, BTN_START },       //HREG
-    { BTN_L, BTN_START },       //GREG
-    { BTN_R, BTN_DRIGHT },      //mREG
-    { BTN_R, BTN_DUP },         //nREG
-    { BTN_START, BTN_R },       //BREG
-    { BTN_START, BTN_A },       //dREG
-    { BTN_START, BTN_B },       //kREG
-    { BTN_START, BTN_CRIGHT },  //bREG
+    { BTN_L, BTN_CUP },        // REG
+    { BTN_L, BTN_CLEFT },      // SREG
+    { BTN_L, BTN_CDOWN },      // OREG
+    { BTN_L, BTN_A },          // PREG
+    { BTN_R, BTN_CDOWN },      // QREG
+    { BTN_L, BTN_CRIGHT },     // MREG
+    { BTN_L, BTN_R },          // YREG
+    { BTN_L, BTN_DLEFT },      // DREG
+    { BTN_L, BTN_DRIGHT },     // UREG
+    { BTN_L, BTN_DUP },        // IREG
+    { BTN_L, BTN_B },          // ZREG
+    { BTN_L, BTN_Z },          // CREG
+    { BTN_L, BTN_DDOWN },      // NREG
+    { BTN_R, BTN_A },          // KREG
+    { BTN_R, BTN_B },          // XREG
+    { BTN_R, BTN_Z },          // cREG
+    { BTN_R, BTN_L },          // sREG
+    { BTN_R, BTN_CUP },        // iREG
+    { BTN_R, BTN_CRIGHT },     // WREG
+    { BTN_R, BTN_DLEFT },      // AREG
+    { BTN_R, BTN_CLEFT },      // VREG
+    { BTN_R, BTN_START },      // HREG
+    { BTN_L, BTN_START },      // GREG
+    { BTN_R, BTN_DRIGHT },     // mREG
+    { BTN_R, BTN_DUP },        // nREG
+    { BTN_START, BTN_R },      // BREG
+    { BTN_START, BTN_A },      // dREG
+    { BTN_START, BTN_B },      // kREG
+    { BTN_START, BTN_CRIGHT }, // bREG
 };
 
 char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb";
diff --git a/soh/src/code/z_debug_display.c b/soh/src/code/z_debug_display.c
index 555151b7c1..aa76cba7ee 100644
--- a/soh/src/code/z_debug_display.c
+++ b/soh/src/code/z_debug_display.c
@@ -86,8 +86,7 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, PlayStat
     gDPLoadTextureBlock(POLY_XLU_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, gDebugSpriteDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -105,8 +104,7 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, PlayState*
     Matrix_SetTranslateRotateYXZ(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot);
     Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, dlist);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c
index c079d00648..b6ccedc7c0 100644
--- a/soh/src/code/z_demo.c
+++ b/soh/src/code/z_demo.c
@@ -249,7 +249,8 @@ void func_80064824(PlayState* play, CutsceneContext* csCtx, CsCmdBase* cmd) {
         case 3:
             if (sp3F != 0) {
                 Flags_SetEnv(play, 0);
-                if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
+                if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE ||
+                    (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
                     Flags_SetEnv(play, 2);
                 }
             }
@@ -314,8 +315,7 @@ void func_80064824(PlayState* play, CutsceneContext* csCtx, CsCmdBase* cmd) {
             break;
         case 15:
             if (sp3F != 0) {
-                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120,
-                                        144, 24, 20);
+                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, player->giObjectSegment, 160, 120, 144, 24, 20);
             }
             break;
         case 16:
@@ -516,16 +516,18 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
          CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B) ||
          CHECK_BTN_ALL(play->state.input[0].press.button, BTN_START)) &&
         (gSaveContext.fileNum != 0xFEDC) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         temp = 1;
     }
 
     bool playCutscene = false;
-    if (!CVarGetInteger(CVAR_ENHANCEMENT("CreditsFix"), 1) && (cmd->startFrame == csCtx->frames)) {
+    if ((!CVarGetInteger(CVAR_ENHANCEMENT("CreditsFix"), 1) || ResourceMgr_GetGameRegion(0) == GAME_REGION_NTSC) &&
+        (cmd->startFrame == csCtx->frames)) {
         playCutscene = true;
     } else if (CVarGetInteger(CVAR_ENHANCEMENT("CreditsFix"), 1)) {
         u16 delay = 0;
-        
+
         // HACK:  Align visual timing with audio during credits sequence
         switch (cmd->base) {
             case 55: // Gerudo fortress (second scene of credits roll)
@@ -576,7 +578,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
         osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->base); // "Future fork designation=No. [%d]"
 
         if ((gSaveContext.gameMode != GAMEMODE_NORMAL) && (csCtx->frames != cmd->startFrame)) {
-            gSaveContext.unk_13E7 = 1;
+            gSaveContext.forceRisingButtonAlphas = 1;
         }
 
         gSaveContext.cutsceneIndex = 0;
@@ -633,7 +635,8 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                     gSaveContext.fw.set = 0;
                     gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
                 }
-                if (GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS, !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL))) {
+                if (GameInteractor_Should(VB_PLAY_PULL_MASTER_SWORD_CS,
+                                          !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL))) {
                     Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL);
                     play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
@@ -1096,7 +1099,8 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_WHITE;
                 break;
             case 95:
-                if ((Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) &&
+                if ((Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) &&
+                    (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) &&
                     (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP))) {
                     play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_ENTRANCE;
                     play->transitionTrigger = TRANS_TRIGGER_START;
@@ -1252,8 +1256,12 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
                 play->transitionType = TRANS_TYPE_FADE_BLACK;
                 break;
             case 113:
-                if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) &&
-                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) {
+                if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) &&
+                    Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) {
                     play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs);
                     play->csCtx.frames = 0;
                     gSaveContext.cutsceneTrigger = 1;
@@ -1330,13 +1338,14 @@ void Cutscene_Command_TransitionFX(PlayState* play, CutsceneContext* csCtx, CsCm
                 if (cmd->base == 1) {
                     play->envCtx.screenFillColor[3] = 255.0f * temp;
                     if ((temp == 0.0f) && (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     } else if ((temp == 0.0f) &&
-                               ((gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE) || (gSaveContext.entranceIndex == ENTR_CASTLE_GROUNDS_SOUTH_EXIT) ||
+                               ((gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE) ||
+                                (gSaveContext.entranceIndex == ENTR_CASTLE_GROUNDS_SOUTH_EXIT) ||
                                 (gSaveContext.entranceIndex == ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF))) {
-                        Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     } else if ((temp == 0.0f) && (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE)) {
                         Sfx_PlaySfxCentered2(NA_SE_EV_WHITE_OUT);
                     }
@@ -1410,8 +1419,8 @@ size_t Cutscene_Command_CameraPositions(PlayState* play, CutsceneContext* csCtx,
     CsCmdBase* cmdBase = (CsCmdBase*)cmd;
     size_t size;
 
-    cmd += sizeof(CutsceneData)*2;
-    size = sizeof(CutsceneData)*2;
+    cmd += sizeof(CutsceneData) * 2;
+    size = sizeof(CutsceneData) * 2;
 
     if ((cmdBase->startFrame < csCtx->frames) && (csCtx->frames < cmdBase->endFrame) &&
         ((csCtx->unk_18 < cmdBase->startFrame) || (csCtx->unk_18 >= 0xF000))) {
@@ -1424,8 +1433,8 @@ size_t Cutscene_Command_CameraPositions(PlayState* play, CutsceneContext* csCtx,
                 Play_ChangeCameraStatus(play, D_8015FCC6, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, csCtx->unk_14, CAM_STAT_ACTIVE);
                 Camera_ResetAnim(Play_GetCamera(play, csCtx->unk_14));
-                Camera_SetCSParams(Play_GetCamera(play, csCtx->unk_14), csCtx->cameraFocus,
-                                   csCtx->cameraPosition, GET_PLAYER(play), relativeToLink);
+                Camera_SetCSParams(Play_GetCamera(play, csCtx->unk_14), csCtx->cameraFocus, csCtx->cameraPosition,
+                                   GET_PLAYER(play), relativeToLink);
             }
         }
     }
@@ -1461,8 +1470,8 @@ size_t Cutscene_Command_CameraFocus(PlayState* play, CutsceneContext* csCtx, u8*
                 Play_ChangeCameraStatus(play, D_8015FCC6, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, csCtx->unk_14, CAM_STAT_ACTIVE);
                 Camera_ResetAnim(Play_GetCamera(play, csCtx->unk_14));
-                Camera_SetCSParams(Play_GetCamera(play, csCtx->unk_14), csCtx->cameraFocus,
-                                   csCtx->cameraPosition, GET_PLAYER(play), relativeToLink);
+                Camera_SetCSParams(Play_GetCamera(play, csCtx->unk_14), csCtx->cameraFocus, csCtx->cameraPosition,
+                                   GET_PLAYER(play), relativeToLink);
             }
         }
     }
@@ -1607,7 +1616,8 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
                                 getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GIFT_FROM_RAURU, RG_LIGHT_MEDALLION);
                                 break;
                             case 0x72:
-                                getItemEntry = Randomizer_GetItemFromKnownCheck(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_LIGHT_ARROWS);
+                                getItemEntry =
+                                    Randomizer_GetItemFromKnownCheck(RC_TOT_LIGHT_ARROWS_CUTSCENE, RG_LIGHT_ARROWS);
                                 break;
                         }
                         if (getItemEntry.getItemId != GI_NONE) {
@@ -1641,14 +1651,16 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
                 if ((dialogState == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
                     if (play->msgCtx.choiceIndex == 0) {
                         if (cmd->textId1 != 0xFFFF) {
-                            // LUSLOG_INFO("Cutscene_Command_Textbox D: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
+                            // LUSLOG_INFO("Cutscene_Command_Textbox D: base:0x%x textId1:0x%x textId2:0x%x", cmd->base,
+                            // cmd->textId1, cmd->textId2);
                             Message_ContinueTextbox(play, cmd->textId1);
                         } else {
                             csCtx->frames++;
                         }
                     } else {
                         if (cmd->textId2 != 0xFFFF) {
-                            // LUSLOG_INFO("Cutscene_Command_Textbox E: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
+                            // LUSLOG_INFO("Cutscene_Command_Textbox E: base:0x%x textId1:0x%x textId2:0x%x", cmd->base,
+                            // cmd->textId1, cmd->textId2);
                             Message_ContinueTextbox(play, cmd->textId2);
                         } else {
                             csCtx->frames++;
@@ -1658,7 +1670,8 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
 
                 if (dialogState == TEXT_STATE_9) {
                     if (cmd->textId1 != 0xFFFF) {
-                        // LUSLOG_INFO("Cutscene_Command_Textbox F: base:0x%x textId1:0x%x textId2:0x%x", cmd->base, cmd->textId1, cmd->textId2);
+                        // LUSLOG_INFO("Cutscene_Command_Textbox F: base:0x%x textId1:0x%x textId2:0x%x", cmd->base,
+                        // cmd->textId1, cmd->textId2);
                         Message_ContinueTextbox(play, cmd->textId1);
                     } else {
                         csCtx->frames++;
@@ -1703,7 +1716,8 @@ void Cutscene_ProcessCommands(PlayState* play, CutsceneContext* csCtx, u8* cutsc
         return;
     }
 
-    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) && CHECK_BTN_ALL(play->state.input[0].press.button, BTN_DRIGHT)) {
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) &&
+        CHECK_BTN_ALL(play->state.input[0].press.button, BTN_DRIGHT)) {
         csCtx->state = CS_STATE_UNSKIPPABLE_INIT;
         return;
     }
@@ -1716,7 +1730,7 @@ void Cutscene_ProcessCommands(PlayState* play, CutsceneContext* csCtx, u8* cutsc
             return;
         }
 
-        //printf("CmdType: %04X\n", cmdType);
+        // printf("CmdType: %04X\n", cmdType);
 
         switch (cmdType) {
             case CS_CMD_MISC:
@@ -2197,41 +2211,43 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
 
 void Cutscene_HandleConditionalTriggers(PlayState* play) {
     osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
-    LUSLOG_INFO("Cutscene_HandleConditionalTriggers - entranceIndex: %#x cutsceneIndex: %#x", gSaveContext.entranceIndex, gSaveContext.cutsceneIndex);
+    LUSLOG_INFO("Cutscene_HandleConditionalTriggers - entranceIndex: %#x cutsceneIndex: %#x",
+                gSaveContext.entranceIndex, gSaveContext.cutsceneIndex);
 
     if (!GameInteractor_Should(VB_PLAY_TRANSITION_CS, true)) {
         return;
     }
 
-    if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
-        if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
+    if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.respawnFlag <= 0) &&
+        (gSaveContext.cutsceneIndex < 0xFFF0)) {
+        if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE) &&
+            !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT);
             gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_EAST_EXIT;
             gSaveContext.cutsceneIndex = 0xFFF0;
-        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW, (
-            (gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE) && 
-            LINK_IS_ADULT &&
-            Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) && 
-            Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
-            Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) && 
-            !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)
-        ))) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
+                                         ((gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_FRONT_GATE) &&
+                                          LINK_IS_ADULT &&
+                                          Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) &&
+                                          Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) &&
+                                          Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) &&
+                                          !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)))) {
             Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL);
             gSaveContext.cutsceneIndex = 0xFFF0;
-        } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
+        } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) &&
+                   !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
             Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
             if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
                 Item_Give(play, ITEM_OCARINA_FAIRY);
             }
             gSaveContext.entranceIndex = ENTR_LOST_WOODS_SOUTH_EXIT;
             gSaveContext.cutsceneIndex = 0xFFF0;
-        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS, (
-            CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && 
-            CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
-            LINK_IS_ADULT &&
-            !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
-            (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)
-        ))) {
+        } else if (GameInteractor_Should(
+                       VB_BE_ELIGIBLE_FOR_LIGHT_ARROWS,
+                       (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+                        LINK_IS_ADULT &&
+                        !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) &&
+                        (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)))) {
             Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS);
             gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_ENTRANCE;
             gSaveContext.cutsceneIndex = 0xFFF8;
@@ -2245,8 +2261,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
 }
 
 void Cutscene_SetSegment(PlayState* play, void* segment) {
-    if (SEGMENT_NUMBER(segment) != 0)
-    {
+    if (SEGMENT_NUMBER(segment) != 0) {
         play->csCtx.segment = SEGMENTED_TO_VIRTUAL(segment);
     } else {
         play->csCtx.segment = segment;
diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c
index 523f65bbd3..b1b4c1cc5b 100644
--- a/soh/src/code/z_draw.c
+++ b/soh/src/code/z_draw.c
@@ -382,16 +382,16 @@ DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawJewelGoron, { gGiGoronRubyGemDL, gGiGoronRubySettingDL } },
     { GetItem_DrawJewelZora, { gGiZoraSapphireGemDL, gGiZoraSapphireSettingDL } },
 
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Generic
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Generic
 
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Zelda's  Lullaby
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Epona's song
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Saria's song
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Sun's song
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Song of time
-    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Song of storms
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Zelda's  Lullaby
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Epona's song
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Saria's song
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Sun's song
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Song of time
+    { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } },  // Song of storms
     { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } }, // Triforce Piece
-    { GetItem_DrawFishingPole, { gFishingPoleGiDL } }, // Fishing Pole
+    { GetItem_DrawFishingPole, { gFishingPoleGiDL } },    // Fishing Pole
 };
 
 /**
@@ -512,8 +512,7 @@ void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_26Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -525,8 +524,7 @@ void GetItem_DrawSoldOut(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 5);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -538,20 +536,17 @@ void GetItem_DrawBlueFire(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-                                0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
-                                1 * -(play->state.frames * 8), 16, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 16,
+                                32, 1, 1 * (play->state.frames * 1), 1 * -(play->state.frames * 8), 16, 32));
     Matrix_Push();
     Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY);
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
     Matrix_Pop();
 
@@ -564,22 +559,18 @@ void GetItem_DrawPoes(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-                                0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1),
-                                1 * -(play->state.frames * 6), 16, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 16,
+                                32, 1, 1 * (play->state.frames * 1), 1 * -(play->state.frames * 6), 16, 32));
     Matrix_Push();
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
     Matrix_Pop();
@@ -593,22 +584,18 @@ void GetItem_DrawFairy(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-                                0 * (play->state.frames * 0), 32, 32, 1, 1 * (play->state.frames * 1),
-                                1 * -(play->state.frames * 6), 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 32,
+                                32, 1, 1 * (play->state.frames * 1), 1 * -(play->state.frames * 6), 32, 32));
     Matrix_Push();
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
     Matrix_Pop();
 
@@ -623,16 +610,13 @@ void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0) % 256,
-                                1 * (play->state.frames * 2) % 256, 64, 64, 1,
-                                0 * (play->state.frames * 0) % 128, 1 * (play->state.frames * 1) % 128, 32,
-                                32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+                                1 * (play->state.frames * 2) % 256, 64, 64, 1, 0 * (play->state.frames * 0) % 128,
+                                1 * (play->state.frames * 1) % 128, 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -644,17 +628,14 @@ void GetItem_DrawSkullToken(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-                                1 * -(play->state.frames * 5), 32, 32, 1, 0 * (play->state.frames * 0),
-                                0 * (play->state.frames * 0), 32, 64));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0), 1 * -(play->state.frames * 5), 32,
+                                32, 1, 0 * (play->state.frames * 0), 0 * (play->state.frames * 0), 32, 64));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -666,8 +647,7 @@ void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_26Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
 
@@ -680,13 +660,11 @@ void GetItem_DrawCompass(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 5);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -699,19 +677,16 @@ void GetItem_DrawPotion(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, -1 * (play->state.frames * 1),
-                                1 * (play->state.frames * 1), 32, 32, 1, -1 * (play->state.frames * 1),
-                                1 * (play->state.frames * 1), 32, 32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, -1 * (play->state.frames * 1), 1 * (play->state.frames * 1), 32,
+                                32, 1, -1 * (play->state.frames * 1), 1 * (play->state.frames * 1), 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]);
 
@@ -725,11 +700,9 @@ void GetItem_DrawGoronSword(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 1),
-                                0 * (play->state.frames * 1), 32, 32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 1), 0 * (play->state.frames * 1), 32,
+                                32, 1, 0 * (play->state.frames * 1), 0 * (play->state.frames * 1), 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -742,11 +715,9 @@ void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6),
-                                1 * (play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 6),
-                                1 * (play->state.frames * 6), 32, 32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6), 1 * (play->state.frames * 6), 32,
+                                32, 1, 1 * (play->state.frames * 6), 1 * (play->state.frames * 6), 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -759,13 +730,11 @@ void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 1),
-                                1 * -(play->state.frames * 3), 32, 32, 1, 0 * (play->state.frames * 1),
-                                1 * -(play->state.frames * 2), 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 1), 1 * -(play->state.frames * 3), 32,
+                                32, 1, 0 * (play->state.frames * 1), 1 * -(play->state.frames * 2), 32, 32));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
-        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), (Color_RGB8) { 255, 70, 50 });
+        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), (Color_RGB8){ 255, 70, 50 });
         gDPSetGrayscaleColor(POLY_XLU_DISP++, color.r, color.g, color.b, 255);
         gSPGrayscale(POLY_XLU_DISP++, true);
     }
@@ -783,11 +752,9 @@ void GetItem_DrawFish(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0),
-                                1 * (play->state.frames * 1), 32, 32, 1, 0 * (play->state.frames * 0),
-                                1 * (play->state.frames * 1), 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0 * (play->state.frames * 0), 1 * (play->state.frames * 1), 32,
+                                32, 1, 0 * (play->state.frames * 0), 1 * (play->state.frames * 1), 32, 32));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -799,8 +766,7 @@ void GetItem_DrawOpa0(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -812,13 +778,11 @@ void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -826,20 +790,20 @@ void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) {
 
 void GetItem_DrawGenericMusicNote(PlayState* play, s16 drawId) {
     s32 pad;
-    s16 color_slot = drawId-120; //0 = generic 
+    s16 color_slot = drawId - 120; // 0 = generic
     s16* colors[7][3] = {
-        {255,255,255},  //Generic Song (full white)
-        {109, 73,143},  //Lullaby
-        {217,110, 48},  //Epona
-        { 62,109, 23},  //Saria
-        {237,231, 62},  //Sun
-        { 98,177,211},  //Time
-        {146,146,146}   //Storms
+        { 255, 255, 255 }, // Generic Song (full white)
+        { 109, 73, 143 },  // Lullaby
+        { 217, 110, 48 },  // Epona
+        { 62, 109, 23 },   // Saria
+        { 237, 231, 62 },  // Sun
+        { 98, 177, 211 },  // Time
+        { 146, 146, 146 }  // Storms
     };
 
     OPEN_DISPS(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx,  __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
     gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
     gSPGrayscale(POLY_XLU_DISP++, true);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
@@ -855,8 +819,7 @@ void GetItem_DrawXlu01(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
 
@@ -869,14 +832,12 @@ void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -888,13 +849,11 @@ void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
 
@@ -908,11 +867,9 @@ void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2),
-                                1 * -(play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 1),
-                                -1 * (play->state.frames * 2), 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2), 1 * -(play->state.frames * 6), 32,
+                                32, 1, 1 * (play->state.frames * 1), -1 * (play->state.frames * 2), 32, 32));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
@@ -926,8 +883,7 @@ void GetItem_DrawOpa1023(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
@@ -942,14 +898,12 @@ void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
 
@@ -964,14 +918,12 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) {
     Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
 
@@ -985,11 +937,9 @@ void GetItem_DrawScale(PlayState* play, s16 drawId) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2),
-                                -1 * (play->state.frames * 2), 64, 64, 1, 1 * (play->state.frames * 4),
-                                1 * -(play->state.frames * 4), 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 2), -1 * (play->state.frames * 2), 64,
+                                64, 1, 1 * (play->state.frames * 4), 1 * -(play->state.frames * 4), 32, 32));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
@@ -1004,14 +954,12 @@ void GetItem_DrawBulletBag(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
     gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
@@ -1025,8 +973,7 @@ void GetItem_DrawWallet(PlayState* play, s16 drawId) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
@@ -1051,13 +998,13 @@ void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId) {
 
     switch (index) {
         case 1:
-            triforcePieceDL = (Gfx*) gTriforcePiece1DL;
+            triforcePieceDL = (Gfx*)gTriforcePiece1DL;
             break;
         case 2:
-            triforcePieceDL = (Gfx*) gTriforcePiece2DL;
+            triforcePieceDL = (Gfx*)gTriforcePiece2DL;
             break;
         default:
-            triforcePieceDL = (Gfx*) gTriforcePiece0DL;
+            triforcePieceDL = (Gfx*)gTriforcePiece0DL;
             break;
     }
 
diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c
index f5716dc16b..f63f8a80c3 100644
--- a/soh/src/code/z_eff_blure.c
+++ b/soh/src/code/z_eff_blure.c
@@ -72,7 +72,7 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     }
 }
 
-//dumb doo doo command to change the type of an object's blur on the fly. Link's Swords with unique trail colors.
+// dumb doo doo command to change the type of an object's blur on the fly. Link's Swords with unique trail colors.
 void EffectBlure_ChangeType(EffectBlure* this, int type) {
     this->trailType = type;
 }
@@ -831,7 +831,6 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) {
         } else {
             EffectBlure_DrawElemHermiteInterpolation(this, elem, i, gfxCtx);
         }
-        
     }
 
     FrameInterpolation_RecordCloseChild();
@@ -1170,7 +1169,6 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
                         } else {
                             gSP1Quadrangle(POLY_XLU_DISP++, j - 2, j - 1, j + 1, j, 0);
 
-                
                             if (this->unkFlag == 1) {
                                 phi_t2 = 0;
                             }
diff --git a/soh/src/code/z_eff_shield_particle.c b/soh/src/code/z_eff_shield_particle.c
index ecc3099f58..2564e47f18 100644
--- a/soh/src/code/z_eff_shield_particle.c
+++ b/soh/src/code/z_eff_shield_particle.c
@@ -214,7 +214,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
             gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPVertex(POLY_XLU_DISP++, sVertices, 4, 0);
             gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 3, 1, 0);
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
diff --git a/soh/src/code/z_effect_soft_sprite.c b/soh/src/code/z_effect_soft_sprite.c
index ee6c7e9513..06263304cb 100644
--- a/soh/src/code/z_effect_soft_sprite.c
+++ b/soh/src/code/z_effect_soft_sprite.c
@@ -14,11 +14,11 @@ void EffectSs_InitInfo(PlayState* play, s32 tableSize) {
     for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) {
         overlay = &gEffectSsOverlayTable[i];
         osSyncPrintf("effect index %3d:size=%6dbyte romsize=%6dbyte\n", i,
-                     (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart, overlay->vromEnd - overlay->vromStart);
+                     (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart,
+                     overlay->vromEnd - overlay->vromStart);
     }
 
-    sEffectSsInfo.table =
-        GAMESTATE_ALLOC_MC(&play->state, tableSize * sizeof(EffectSs));
+    sEffectSsInfo.table = GAMESTATE_ALLOC_MC(&play->state, tableSize * sizeof(EffectSs));
     assert(sEffectSsInfo.table != NULL);
 
     sEffectSsInfo.searchStartIndex = 0;
@@ -216,10 +216,11 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) {
             osSyncPrintf(VT_RST);
         }
 
-        initInfo = (void*)(uintptr_t)((overlayEntry->initInfo != NULL)
-                                    ? (void*)((uintptr_t)overlayEntry->initInfo -
-                                              ((intptr_t)overlayEntry->vramStart - (intptr_t)overlayEntry->loadedRamAddr))
-                                    : NULL);
+        initInfo =
+            (void*)(uintptr_t)((overlayEntry->initInfo != NULL) ? (void*)((uintptr_t)overlayEntry->initInfo -
+                                                                          ((intptr_t)overlayEntry->vramStart -
+                                                                           (intptr_t)overlayEntry->loadedRamAddr))
+                                                                : NULL);
     }
 
     if (initInfo->init == NULL) {
diff --git a/soh/src/code/z_effect_soft_sprite_dlftbls.c b/soh/src/code/z_effect_soft_sprite_dlftbls.c
index 3a090041ec..ae95dd935a 100644
--- a/soh/src/code/z_effect_soft_sprite_dlftbls.c
+++ b/soh/src/code/z_effect_soft_sprite_dlftbls.c
@@ -30,15 +30,9 @@
 //        1,                                 \
 //    },
 
-#define DEFINE_EFFECT_SS(name, _1)         \
-    {                                      \
-        (uintptr_t)0, \
-        (uintptr_t)0,   \
-        0,         \
-        0,           \
-        NULL,                              \
-        &name##_InitVars,                  \
-        1,                                 \
+#define DEFINE_EFFECT_SS(name, _1)                                   \
+    {                                                                \
+        (uintptr_t)0, (uintptr_t)0, 0, 0, NULL, &name##_InitVars, 1, \
     },
 
 #define DEFINE_EFFECT_SS_UNSET(_0) { 0 },
diff --git a/soh/src/code/z_effect_soft_sprite_old_init.c b/soh/src/code/z_effect_soft_sprite_old_init.c
index 7b740bbcd7..abe9e6788e 100644
--- a/soh/src/code/z_effect_soft_sprite_old_init.c
+++ b/soh/src/code/z_effect_soft_sprite_old_init.c
@@ -154,13 +154,11 @@ void func_800286CC(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s
     EffectSsDust_Spawn(play, 5, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, 10, 0);
 }
 
-void func_8002873C(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
-                   s16 life) {
+void func_8002873C(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life) {
     EffectSsDust_Spawn(play, 4, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, life, 0);
 }
 
-void func_800287AC(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
-                   s16 life) {
+void func_800287AC(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life) {
     EffectSsDust_Spawn(play, 5, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, life, 0);
 }
 
@@ -229,13 +227,13 @@ void EffectSsKiraKira_SpawnSmallYellow(PlayState* play, Vec3f* pos, Vec3f* veloc
     EffectSsKiraKira_SpawnDispersed(play, pos, velocity, accel, &primColor, &envColor, 1000, 16);
 }
 
-void EffectSsKiraKira_SpawnSmall(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
-                                 Color_RGBA8* primColor, Color_RGBA8* envColor) {
+void EffectSsKiraKira_SpawnSmall(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
+                                 Color_RGBA8* envColor) {
     EffectSsKiraKira_SpawnDispersed(play, pos, velocity, accel, primColor, envColor, 1000, 16);
 }
 
-void EffectSsKiraKira_SpawnDispersed(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
-                                     Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life) {
+void EffectSsKiraKira_SpawnDispersed(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
+                                     Color_RGBA8* envColor, s16 scale, s32 life) {
     EffectSsKiraKiraInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -255,8 +253,8 @@ void EffectSsKiraKira_SpawnDispersed(PlayState* play, Vec3f* pos, Vec3f* velocit
     EffectSs_Spawn(play, EFFECT_SS_KIRAKIRA, 128, &initParams);
 }
 
-void EffectSsKiraKira_SpawnFocused(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
-                                   Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life) {
+void EffectSsKiraKira_SpawnFocused(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
+                                   Color_RGBA8* envColor, s16 scale, s32 life) {
     EffectSsKiraKiraInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -303,8 +301,7 @@ void EffectSsBomb2_SpawnFade(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f
     EffectSs_Spawn(play, EFFECT_SS_BOMB2, 10, &initParams);
 }
 
-void EffectSsBomb2_SpawnLayered(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
-                                s16 scaleStep) {
+void EffectSsBomb2_SpawnLayered(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep) {
     EffectSsBomb2InitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -344,8 +341,8 @@ void EffectSsBlast_SpawnWhiteCustomScale(PlayState* play, Vec3f* pos, Vec3f* vel
     EffectSsBlast_Spawn(play, pos, velocity, accel, &primColor, &envColor, scale, scaleStep, 35, life);
 }
 
-void EffectSsBlast_SpawnShockwave(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
-                                  Color_RGBA8* primColor, Color_RGBA8* envColor, s16 life) {
+void EffectSsBlast_SpawnShockwave(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
+                                  Color_RGBA8* envColor, s16 life) {
     EffectSsBlast_Spawn(play, pos, velocity, accel, primColor, envColor, 100, 375, 35, life);
 }
 
@@ -401,8 +398,8 @@ void EffectSsGSpk_SpawnFuse(PlayState* play, Actor* actor, Vec3f* pos, Vec3f* ve
 }
 
 // unused
-void EffectSsGSpk_SpawnRandColor(PlayState* play, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel,
-                                 s16 scale, s16 scaleStep) {
+void EffectSsGSpk_SpawnRandColor(PlayState* play, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
+                                 s16 scaleStep) {
     Color_RGBA8 primColor = { 255, 255, 150, 255 };
     Color_RGBA8 envColor = { 255, 0, 0, 0 };
     s32 randOffset = (Rand_ZeroOne() * 20.0f) - 10.0f;
@@ -477,8 +474,8 @@ void EffectSsGRipple_Spawn(PlayState* play, Vec3f* pos, s16 radius, s16 radiusMa
 
 // EffectSsGSplash Spawn Functions
 
-void EffectSsGSplash_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor,
-                           s16 type, s16 scale) {
+void EffectSsGSplash_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 type,
+                           s16 scale) {
     EffectSsGSplashInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -518,8 +515,8 @@ void EffectSsGFire_Spawn(PlayState* play, Vec3f* pos) {
 
 // EffectSsLightning Spawn Functions
 
-void EffectSsLightning_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor,
-                             s16 scale, s16 yaw, s16 life, s16 numBolts) {
+void EffectSsLightning_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale,
+                             s16 yaw, s16 life, s16 numBolts) {
     EffectSsLightningInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -535,8 +532,8 @@ void EffectSsLightning_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor
 
 // EffectSsDtBubble Spawn Functions
 
-void EffectSsDtBubble_SpawnColorProfile(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
-                                        s16 life, s16 colorProfile, s16 randXZ) {
+void EffectSsDtBubble_SpawnColorProfile(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 life,
+                                        s16 colorProfile, s16 randXZ) {
     EffectSsDtBubbleInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -579,8 +576,8 @@ void EffectSsDtBubble_SpawnCustomColor(PlayState* play, Vec3f* pos, Vec3f* veloc
  *     - due to how life is implemented it is capped at 200. Any value over 200 is accepted, but the fragment will
  *       only live for 200 frames
  */
-void EffectSsHahen_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16 scale,
-                         s16 objId, s16 life, Gfx* dList) {
+void EffectSsHahen_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16 scale, s16 objId,
+                         s16 life, Gfx* dList) {
     EffectSsHahenInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -604,8 +601,8 @@ void EffectSsHahen_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* ac
  *     - due to how life is implemented it is capped at 200. Any value over 200 is accepted, but the fragment will
  *       only live for 200 frames
  */
-void EffectSsHahen_SpawnBurst(PlayState* play, Vec3f* pos, f32 burstScale, s16 unused, s16 scale,
-                              s16 randScaleRange, s16 count, s16 objId, s16 life, Gfx* dList) {
+void EffectSsHahen_SpawnBurst(PlayState* play, Vec3f* pos, f32 burstScale, s16 unused, s16 scale, s16 randScaleRange,
+                              s16 count, s16 objId, s16 life, Gfx* dList) {
     s32 i;
     Vec3f velocity;
     Vec3f accel;
@@ -618,8 +615,8 @@ void EffectSsHahen_SpawnBurst(PlayState* play, Vec3f* pos, f32 burstScale, s16 u
         velocity.z = (Rand_ZeroOne() - 0.5f) * burstScale;
         velocity.y = ((Rand_ZeroOne() * 0.5f) + 0.5f) * burstScale;
 
-        EffectSsHahen_Spawn(play, pos, &velocity, &accel, unused, Rand_S16Offset(scale, randScaleRange), objId,
-                            life, dList);
+        EffectSsHahen_Spawn(play, pos, &velocity, &accel, unused, Rand_S16Offset(scale, randScaleRange), objId, life,
+                            dList);
     }
 }
 
@@ -640,8 +637,8 @@ void EffectSsStick_Spawn(PlayState* play, Vec3f* pos, s16 yaw) {
 
 // EffectSsSibuki Spawn Functions
 
-void EffectSsSibuki_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 moveDelay,
-                          s16 direction, s16 scale) {
+void EffectSsSibuki_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 moveDelay, s16 direction,
+                          s16 scale) {
     EffectSsSibukiInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -681,8 +678,8 @@ void EffectSsSibuki2_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f*
 
 // EffectSsGMagma2 Spawn Functions
 
-void EffectSsGMagma2_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor,
-                           s16 updateRate, s16 drawMode, s16 scale) {
+void EffectSsGMagma2_Spawn(PlayState* play, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 updateRate,
+                           s16 drawMode, s16 scale) {
     EffectSsGMagma2InitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -734,8 +731,7 @@ void EffectSsHitMark_SpawnCustomScale(PlayState* play, s32 type, s16 scale, Vec3
  * param changes the color of the ball. Refer to FhgFlashLightBallParam for the options.
  * Note: this type requires OBJECT_FHG to be loaded
  */
-void EffectSsFhgFlash_SpawnLightBall(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
-                                     u8 param) {
+void EffectSsFhgFlash_SpawnLightBall(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, u8 param) {
     EffectSsFhgFlashInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -799,9 +795,9 @@ void EffectSsSolderSrchBall_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity,
 
 // EffectSsKakera Spawn Functions
 
-void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5,
-                          s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx,
-                          s16 objId, Gfx* dList) {
+void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, s16 arg6,
+                          s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, s16 objId,
+                          Gfx* dList) {
     EffectSsKakeraInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -867,8 +863,8 @@ void EffectSsIcePiece_SpawnBurst(PlayState* play, Vec3f* refPos, f32 scale) {
         pos.y += vecScales[i].y;
         pos.z += vecScales[i].z;
 
-        EffectSsIcePiece_Spawn(play, &pos, (Rand_ZeroFloat(1.0f) + 0.5f) * ((scale * 1.3f) * 100.0f), &velocity,
-                               &accel, 25);
+        EffectSsIcePiece_Spawn(play, &pos, (Rand_ZeroFloat(1.0f) + 0.5f) * ((scale * 1.3f) * 100.0f), &velocity, &accel,
+                               25);
     }
 }
 
@@ -924,8 +920,8 @@ void EffectSsEnIce_SpawnFlyingVec3s(PlayState* play, Actor* actor, Vec3s* pos, s
     EffectSs_Spawn(play, EFFECT_SS_EN_ICE, 80, &initParams);
 }
 
-void EffectSsEnIce_Spawn(PlayState* play, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel,
-                         Color_RGBA8* primColor, Color_RGBA8* envColor, s32 life) {
+void EffectSsEnIce_Spawn(PlayState* play, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
+                         Color_RGBA8* envColor, s32 life) {
     EffectSsEnIceInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -979,8 +975,7 @@ void EffectSsFireTail_SpawnFlame(PlayState* play, Actor* actor, Vec3f* pos, f32
 void EffectSsFireTail_SpawnFlameOnPlayer(PlayState* play, f32 scale, s16 bodyPart, f32 colorIntensity) {
     Player* player = GET_PLAYER(play);
 
-    EffectSsFireTail_SpawnFlame(play, &player->actor, &player->bodyPartsPos[bodyPart], scale, bodyPart,
-                                colorIntensity);
+    EffectSsFireTail_SpawnFlame(play, &player->actor, &player->bodyPartsPos[bodyPart], scale, bodyPart, colorIntensity);
 }
 
 // EffectSsEnFire Spawn Functions
@@ -1136,15 +1131,14 @@ void EffectSsDeadDs_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* a
     EffectSs_Spawn(play, EFFECT_SS_DEAD_DS, 100, &initParams);
 }
 
-void EffectSsDeadDs_SpawnStationary(PlayState* play, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha,
-                                    s32 life) {
+void EffectSsDeadDs_SpawnStationary(PlayState* play, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha, s32 life) {
     EffectSsDeadDs_Spawn(play, pos, &sZeroVec, &sZeroVec, scale, scaleStep, alpha, life);
 }
 
 // EffectSsDeadSound Spawn Functions
 
-void EffectSsDeadSound_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u16 sfxId,
-                             s16 lowerPriority, s16 repeatMode, s32 life) {
+void EffectSsDeadSound_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u16 sfxId, s16 lowerPriority,
+                             s16 repeatMode, s32 life) {
     EffectSsDeadSoundInitParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -1162,8 +1156,8 @@ void EffectSsDeadSound_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f
     }
 }
 
-void EffectSsDeadSound_SpawnStationary(PlayState* play, Vec3f* pos, u16 sfxId, s16 lowerPriority,
-                                       s16 repeatMode, s32 life) {
+void EffectSsDeadSound_SpawnStationary(PlayState* play, Vec3f* pos, u16 sfxId, s16 lowerPriority, s16 repeatMode,
+                                       s32 life) {
     EffectSsDeadSound_Spawn(play, pos, &sZeroVec, &sZeroVec, sfxId, lowerPriority, repeatMode, life);
 }
 
diff --git a/soh/src/code/z_elf_message.c b/soh/src/code/z_elf_message.c
index 91f00105fb..42c11319ad 100644
--- a/soh/src/code/z_elf_message.c
+++ b/soh/src/code/z_elf_message.c
@@ -156,7 +156,7 @@ u16 ElfMessage_GetSariaText(PlayState* play) {
 
     if (!LINK_IS_ADULT) {
         if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) {
-             if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
+            if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
                 return 0x161;
             }
             msgs = sChildSariaMsgs;
diff --git a/soh/src/code/z_en_a_keep.c b/soh/src/code/z_en_a_keep.c
index 128b214fc8..611d2dfb84 100644
--- a/soh/src/code/z_en_a_keep.c
+++ b/soh/src/code/z_en_a_keep.c
@@ -54,7 +54,7 @@ static ColliderCylinderInit sCylinderInit = {
     { 25, 60, 0, { 0, 0, 0 } },
 };
 
-//extern CollisionHeader D_06000730; // gHookshotTargetCol ?
+// extern CollisionHeader D_06000730; // gHookshotTargetCol ?
 
 static CollisionHeader* sColHeaders[] = {
     &gLargerCubeCol,       // A_OBJ_GRASS_CLUMP, A_OBJ_TREE_STUMP
@@ -72,7 +72,8 @@ static Gfx* sDLists[] = {
     gFlatRotBlockDL,
     gFlatRotBlockDL,
     gSmallCubeDL,
-    gHookshotPostDL, /* gHookshotPostDL ? */ // 0x06000210, // OTRTODO!
+    gHookshotPostDL,
+    /* gHookshotPostDL ? */ // 0x06000210, // OTRTODO!
     gGrassBladesDL,
     gTreeStumpDL,
     gSignRectangularDL,
@@ -359,8 +360,7 @@ void EnAObj_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 1, 60, 60, 60, 50);
     }
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDLists[type]);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 9a9c60bfae..b6bf5ecdf9 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -4,8 +4,8 @@
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
 #include "textures/icon_item_static/icon_item_static.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/OTRGlobals.h"
 
 #define FLAGS 0
 
@@ -336,7 +336,8 @@ void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) {
 void EnItem00_SetObjectDependency(EnItem00* this, PlayState* play, s16 objectIndex) {
     // Remove object dependency for Enemy Randomizer and Crowd Control to allow Like-likes to
     // drop equipment correctly in rooms where Like-likes normally don't spawn.
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+        (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
         this->actor.objBankIndex = 0;
     } else {
         this->actor.objBankIndex = Object_GetIndex(&play->objectCtx, objectIndex);
@@ -710,8 +711,7 @@ void func_8001E304(EnItem00* this, PlayState* play) {
         pos.x = this->actor.world.pos.x + (Rand_ZeroOne() - 0.5f) * 10.0f;
         pos.y = this->actor.world.pos.y + (Rand_ZeroOne() - 0.5f) * 10.0f;
         pos.z = this->actor.world.pos.z + (Rand_ZeroOne() - 0.5f) * 10.0f;
-        EffectSsKiraKira_SpawnSmall(play, &pos, &sEffectVelocity, &sEffectAccel, &sEffectPrimColor,
-                                    &sEffectEnvColor);
+        EffectSsKiraKira_SpawnSmall(play, &pos, &sEffectVelocity, &sEffectAccel, &sEffectPrimColor, &sEffectEnvColor);
     }
 
     if (this->actor.bgCheckFlags & 0x0003) {
@@ -768,15 +768,13 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
     s32 pad;
 
     // Rotate some drops when 3D drops are on, otherwise reset rotation back to 0 for billboard effect
-    if (
-        (this->actor.params == ITEM00_HEART && this->unk_15A >= 0) ||
+    if ((this->actor.params == ITEM00_HEART && this->unk_15A >= 0) ||
         (this->actor.params >= ITEM00_ARROWS_SMALL && this->actor.params <= ITEM00_SMALL_KEY) ||
-        this->actor.params == ITEM00_BOMBS_A ||
-        this->actor.params == ITEM00_ARROWS_SINGLE ||
+        this->actor.params == ITEM00_BOMBS_A || this->actor.params == ITEM00_ARROWS_SINGLE ||
         this->actor.params == ITEM00_BOMBS_SPECIAL ||
-        (this->actor.params >= ITEM00_BOMBCHU && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)
-    ) {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0) || (this->actor.params >= ITEM00_SOH_DUMMY && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)) {
+        (this->actor.params >= ITEM00_BOMBCHU && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0) ||
+            (this->actor.params >= ITEM00_SOH_DUMMY && this->actor.params <= ITEM00_SOH_GIVE_ITEM_ENTRY_GI)) {
             this->actor.shape.rot.y += 960;
         } else {
             this->actor.shape.rot.y = 0;
@@ -967,7 +965,8 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
     }
 
     if ((*params <= ITEM00_RUPEE_RED) || (*params == ITEM00_RUPEE_ORANGE)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (getItemId != GI_NONE) {
         if (Actor_HasParent(&this->actor, play)) {
             Flags_SetCollectible(play, this->collectibleFlag);
@@ -975,7 +974,8 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
         }
         return;
     } else {
-        Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     Flags_SetCollectible(play, this->collectibleFlag);
@@ -1181,7 +1181,6 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
     }
 }
 
-
 typedef enum {
     PARTICLE_BRIGHT_GREEN,
     PARTICLE_RED,
@@ -1357,8 +1356,7 @@ void EnItem00_DrawRupee(EnItem00* this, PlayState* play) {
         texIndex = this->actor.params - 0x10;
     }
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
 
     Color_RGB8 rupeeColor;
     u8 shouldColor = 0;
@@ -1422,8 +1420,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
 
         POLY_OPA_DISP = Gfx_SetupDL_66(POLY_OPA_DISP);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
 
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetTexturePersp(POLY_OPA_DISP++, G_TP_PERSP);
@@ -1455,8 +1452,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
 
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sItemDropTex[texIndex]));
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -1473,14 +1469,12 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     func_8002EBCC(&this->actor, play, 0);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, gHeartPieceExteriorDL);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     func_8002ED80(&this->actor, play, 0);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, gHeartContainerInteriorDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -1496,8 +1490,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     func_8002ED80(&this->actor, play, 0);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-            G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -1543,7 +1536,7 @@ s16 func_8001F404(s16 dropId) {
     if (LINK_IS_ADULT) {
         if (dropId == ITEM00_SEEDS) {
             dropId = ITEM00_ARROWS_SMALL;
-        } else if ((dropId == ITEM00_STICK) && !(CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0))) {
+        } else if (GameInteractor_Should(VB_PREVENT_ADULT_STICK, dropId == ITEM00_STICK)) {
             dropId = ITEM00_RUPEE_GREEN;
         }
     } else {
@@ -1553,8 +1546,8 @@ s16 func_8001F404(s16 dropId) {
     }
 
     // #region [Randomizer] [Enchancment]
-    if ((CVarGetInteger(CVAR_ENHANCEMENT("EnableBombchuDrops"), 0) || 
-        (IS_RANDO && Randomizer_GetSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1)) &&
+    if ((CVarGetInteger(CVAR_ENHANCEMENT("EnableBombchuDrops"), 0) ||
+         (IS_RANDO && Randomizer_GetSettingValue(RSK_ENABLE_BOMBCHU_DROPS) == 1)) &&
         (dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_B || dropId == ITEM00_BOMBS_SPECIAL) &&
         (!IS_RANDO || Randomizer_GetSettingValue(RSK_BOMBCHU_BAG) || INV_CONTENT(ITEM_BOMB) != ITEM_NONE)) {
         dropId = EnItem00_ConvertBombDropToBombchu(dropId);
@@ -1589,22 +1582,24 @@ EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) {
 
     params &= 0x3FFF;
 
-    if ((params & 0x00FF) == ITEM00_HEART && CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { return NULL; }
+    if ((params & 0x00FF) == ITEM00_HEART && CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) {
+        return NULL;
+    }
 
     if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) {
         // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf)
-        spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x,
-                                              spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED, true);
-        EffectSsDeadSound_SpawnStationary(play, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true,
-                                          DEADSOUND_REPEAT_MODE_OFF, 40);
+        spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f,
+                                              spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED, true);
+        EffectSsDeadSound_SpawnStationary(play, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF,
+                                          40);
     } else {
         if (!param8000) {
             params = func_8001F404(params & 0x00FF);
         }
 
         if (params != -1) {
-            spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, spawnPos->x,
-                                                  spawnPos->y, spawnPos->z, 0, 0, 0, params | param8000 | param3F00, true);
+            spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y,
+                                                  spawnPos->z, 0, 0, 0, params | param8000 | param3F00, true);
             if ((spawnedActor != NULL) && !param8000) {
                 spawnedActor->actor.velocity.y = !param4000 ? 8.0f : -2.0f;
                 spawnedActor->actor.speedXZ = 2.0f;
@@ -1634,19 +1629,21 @@ EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) {
 
     params &= 0x3FFF;
 
-    if ((params & 0x00FF) == ITEM00_HEART && CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { return NULL; }
-    
+    if ((params & 0x00FF) == ITEM00_HEART && CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) {
+        return NULL;
+    }
+
     if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) {
         // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf)
-        spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x,
-                                              spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED, true);
-        EffectSsDeadSound_SpawnStationary(play, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true,
-                                          DEADSOUND_REPEAT_MODE_OFF, 40);
+        spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f,
+                                              spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED, true);
+        EffectSsDeadSound_SpawnStationary(play, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF,
+                                          40);
     } else {
         params = func_8001F404(params & 0x00FF);
         if (params != -1) {
-            spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, spawnPos->x,
-                                                  spawnPos->y, spawnPos->z, 0, 0, 0, params | param8000 | param3F00, true);
+            spawnedActor = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y,
+                                                  spawnPos->z, 0, 0, 0, params | param8000 | param3F00, true);
             if ((spawnedActor != NULL) && !param8000) {
                 spawnedActor->actor.velocity.y = 0.0f;
                 spawnedActor->actor.speedXZ = 0.0f;
@@ -1671,7 +1668,9 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
     param8000 = params & 0x8000;
     params &= 0x7FFF;
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) { return; }
+    if (CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
+        return;
+    }
 
     if (fromActor != NULL) {
         if (fromActor->dropFlag) {
@@ -1709,16 +1708,18 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
 
     if (dropId == ITEM00_FLEXIBLE) {
         if (gSaveContext.health <= 0x10) { // 1 heart or less
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0,
-                        0, 0, FAIRY_HEAL_TIMED, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0,
+                        FAIRY_HEAL_TIMED, true);
             EffectSsDeadSound_SpawnStationary(play, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true,
                                               DEADSOUND_REPEAT_MODE_OFF, 40);
             return;
-        } else if (gSaveContext.health <= 0x30 && !CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { // 3 hearts or less
+        } else if (gSaveContext.health <= 0x30 &&
+                   !CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { // 3 hearts or less
             params = 0xB * 0x10;
             dropTableIndex = 0x0;
             dropId = ITEM00_HEART;
-        } else if (gSaveContext.health <= 0x50 && !CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { // 5 hearts or less
+        } else if (gSaveContext.health <= 0x50 &&
+                   !CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) { // 5 hearts or less
             params = 0xA * 0x10;
             dropTableIndex = 0x0;
             dropId = ITEM00_HEART;
diff --git a/soh/src/code/z_face_reaction.c b/soh/src/code/z_face_reaction.c
index 278af706e1..0ea94b119a 100644
--- a/soh/src/code/z_face_reaction.c
+++ b/soh/src/code/z_face_reaction.c
@@ -67,10 +67,10 @@ u16 sReactionTextIds[][PLAYER_MASK_MAX] = {
 u16 Text_GetFaceReaction(PlayState* play, u32 reactionSet) {
     u8 currentMask = Player_GetMask(play);
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && currentMask == PLAYER_MASK_BUNNY) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA &&
+        currentMask == PLAYER_MASK_BUNNY) {
         return 0;
     } else {
         return sReactionTextIds[reactionSet][currentMask];
     }
-
 }
diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c
index 9a85dcf05f..b23e474f8e 100644
--- a/soh/src/code/z_fbdemo_circle.c
+++ b/soh/src/code/z_fbdemo_circle.c
@@ -90,7 +90,8 @@ void TransitionCircle_Start(void* thisx) {
     } else {
         this->texY = 0x1F4;
         if (this->appearanceType == TCA_RIPPLE) {
-            Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     guPerspective(&this->projection, &this->normal, 60.0f, (4.0f / 3.0f), 10.0f, 12800.0f, 1.0f);
@@ -115,7 +116,8 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) {
     if (this->direction != 0) {
         if (this->texY == 0) {
             if (this->appearanceType == TCA_RIPPLE) {
-                Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
         this->texY += this->speed * 3 / updateRate;
diff --git a/soh/src/code/z_fbdemo_triforce.c b/soh/src/code/z_fbdemo_triforce.c
index 66268836e7..0a4c52542b 100644
--- a/soh/src/code/z_fbdemo_triforce.c
+++ b/soh/src/code/z_fbdemo_triforce.c
@@ -18,7 +18,7 @@ void TransitionTriforce_Start(void* thisx) {
 void* TransitionTriforce_Init(void* thisx) {
     TransitionTriforce* this = (TransitionTriforce*)thisx;
 
-    memset(this,0, sizeof(*this));
+    memset(this, 0, sizeof(*this));
     guOrtho(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f);
     this->transPos = 1.0f;
     this->state = 2;
diff --git a/soh/src/code/z_fcurve_data_skelanime.c b/soh/src/code/z_fcurve_data_skelanime.c
index 3daa6528a2..b80bd87bd9 100644
--- a/soh/src/code/z_fcurve_data_skelanime.c
+++ b/soh/src/code/z_fcurve_data_skelanime.c
@@ -59,10 +59,10 @@ s32 SkelCurve_Update(PlayState* play, SkelAnimeCurve* skelCurve) {
     s32 j;
 
     transformIndex = SEGMENTED_TO_VIRTUAL(skelCurve->transUpdIdx);
-    
+
     if (ResourceMgr_OTRSigCheck(transformIndex))
         transformIndex = ResourceMgr_LoadAnimByName(transformIndex);
-    
+
     transformRefIdx = SEGMENTED_TO_VIRTUAL(transformIndex->refIndex);
     transData = SEGMENTED_TO_VIRTUAL(transformIndex->transformData);
     transformCopyValues = SEGMENTED_TO_VIRTUAL(transformIndex->copyValues);
@@ -109,8 +109,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelAnimeCurve* skelCurv
 
     Matrix_Push();
 
-    if (overrideLimbDraw == NULL ||
-        (overrideLimbDraw != NULL && overrideLimbDraw(play, skelCurve, limbIndex, data))) {
+    if (overrideLimbDraw == NULL || (overrideLimbDraw != NULL && overrideLimbDraw(play, skelCurve, limbIndex, data))) {
         Vec3f scale;
         Vec3s rot;
         Vec3f pos;
@@ -179,8 +178,8 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelAnimeCurve* skelCurv
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void SkelCurve_Draw(Actor* actor, PlayState* play, SkelAnimeCurve* skelCurve,
-                    OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data) {
+void SkelCurve_Draw(Actor* actor, PlayState* play, SkelAnimeCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw,
+                    PostCurveLimbDraw postLimbDraw, s32 lod, void* data) {
     if (skelCurve->transforms != NULL) {
         SkelCurve_DrawLimb(play, 0, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);
     }
diff --git a/soh/src/code/z_frame_advance.c b/soh/src/code/z_frame_advance.c
index 6fcd76ae76..ecddb55e64 100644
--- a/soh/src/code/z_frame_advance.c
+++ b/soh/src/code/z_frame_advance.c
@@ -18,10 +18,11 @@ s32 FrameAdvance_Update(FrameAdvanceContext* frameAdvCtx, Input* input) {
         frameAdvCtx->enabled = !frameAdvCtx->enabled;
     }
 
-    if (!frameAdvCtx->enabled || CVarGetInteger(CVAR_GENERAL("FrameAdvance"), 0) || (CHECK_BTN_ALL(input->cur.button, BTN_Z) &&
-                                  (CHECK_BTN_ALL(input->press.button, BTN_R) ||
-                                   (CHECK_BTN_ALL(input->cur.button, BTN_R) && (++frameAdvCtx->timer >= 9))))) {
-        CVarClear(CVAR_GENERAL("FrameAdvance"));
+    if (!frameAdvCtx->enabled || CVarGetInteger(CVAR_DEVELOPER_TOOLS("FrameAdvanceTick"), 0) ||
+        (CHECK_BTN_ALL(input->cur.button, BTN_Z) &&
+         (CHECK_BTN_ALL(input->press.button, BTN_R) ||
+          (CHECK_BTN_ALL(input->cur.button, BTN_R) && (++frameAdvCtx->timer >= 9))))) {
+        CVarClear(CVAR_DEVELOPER_TOOLS("FrameAdvanceTick"));
         frameAdvCtx->timer = 0;
         return true;
     }
diff --git a/soh/src/code/z_game_over.c b/soh/src/code/z_game_over.c
index 1850133aab..da154f8870 100644
--- a/soh/src/code/z_game_over.c
+++ b/soh/src/code/z_game_over.c
@@ -31,8 +31,8 @@ void GameOver_Update(PlayState* play) {
         case GAMEOVER_DEATH_START:
             Message_CloseTextbox(play);
 
-            gSaveContext.timer1State = 0;
-            gSaveContext.timer2State = 0;
+            gSaveContext.timerState = 0;
+            gSaveContext.subTimerState = 0;
             gSaveContext.eventInf[1] &= ~1;
 
             // search inventory for spoiling items and revert if necessary
@@ -50,7 +50,7 @@ void GameOver_Update(PlayState* play) {
                         }
                     }
                 }
-			}
+            }
 
             // restore "temporary B" to the B Button if not a sword item
             if (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI &&
@@ -77,7 +77,8 @@ void GameOver_Update(PlayState* play) {
             for (int buttonIndex = 0; buttonIndex < ARRAY_COUNT(gSaveContext.buttonStatus); buttonIndex++) {
                 gSaveContext.buttonStatus[buttonIndex] = BTN_ENABLED;
             }
-            gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
+            gSaveContext.forceRisingButtonAlphas = gSaveContext.unk_13E8 = gSaveContext.unk_13EA =
+                gSaveContext.unk_13EC = 0;
 
             Environment_InitGameOverLights(play);
             gGameOverTimer = 20;
diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c
index de50eac4aa..ef4b7ec500 100644
--- a/soh/src/code/z_horse.c
+++ b/soh/src/code/z_horse.c
@@ -5,7 +5,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 s32 func_8006CFC0(s32 scene) {
-    s32 validScenes[] = { SCENE_HYRULE_FIELD, SCENE_LAKE_HYLIA, SCENE_GERUDO_VALLEY, SCENE_GERUDOS_FORTRESS, SCENE_LON_LON_RANCH };
+    s32 validScenes[] = { SCENE_HYRULE_FIELD, SCENE_LAKE_HYLIA, SCENE_GERUDO_VALLEY, SCENE_GERUDOS_FORTRESS,
+                          SCENE_LON_LON_RANCH };
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(validScenes); i++) {
@@ -70,25 +71,27 @@ void func_8006D0EC(PlayState* play, Player* player) {
         horseActor =
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1, true);
         horseActor->room = -1;
-    } else if ((gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_7) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) {
+    } else if ((gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_7) &&
+               (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) {
         Actor* horseActor =
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1, true);
         assert(horseActor != NULL);
     } else if ((play->sceneNum == gSaveContext.horseData.scene) &&
-               (((Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) != 0) && (!IS_RANDO ||
-               (IS_RANDO && CHECK_QUEST_ITEM(QUEST_SONG_EPONA) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true) &&
-                    GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true) &&
-               (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE)))) || DREG(1) != 0)) {
+               (((Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) != 0) &&
+                 (!IS_RANDO || (IS_RANDO && CHECK_QUEST_ITEM(QUEST_SONG_EPONA) &&
+                                GameInteractor_Should(VB_HAVE_OCARINA_NOTE_D5, true) &&
+                                GameInteractor_Should(VB_HAVE_OCARINA_NOTE_B4, true) &&
+                                GameInteractor_Should(VB_HAVE_OCARINA_NOTE_A4, true) &&
+                                (INV_CONTENT(ITEM_OCARINA_FAIRY) != ITEM_NONE)))) ||
+                DREG(1) != 0)) {
         // "Set by existence of horse %d %d %d"
-        osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED),
-                     DREG(1));
+        osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene,
+                     Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1));
 
         if (func_8006CFC0(gSaveContext.horseData.scene)) {
-            Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE,
-                                            gSaveContext.horseData.pos.x, gSaveContext.horseData.pos.y,
-                                            gSaveContext.horseData.pos.z, 0, gSaveContext.horseData.angle, 0, 1, true);
+            Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, gSaveContext.horseData.pos.x,
+                                            gSaveContext.horseData.pos.y, gSaveContext.horseData.pos.z, 0,
+                                            gSaveContext.horseData.angle, 0, 1, true);
             assert(horseActor != NULL);
             if (play->sceneNum == SCENE_GERUDOS_FORTRESS) {
                 horseActor->room = -1;
@@ -100,9 +103,9 @@ void func_8006D0EC(PlayState* play, Player* player) {
             osSyncPrintf(VT_RST);
             func_8006D074(play);
         }
-    } else if ((play->sceneNum == SCENE_LON_LON_RANCH) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0)) {
-        Actor* horseActor =
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1, true);
+    } else if ((play->sceneNum == SCENE_LON_LON_RANCH) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) &&
+               (DREG(1) == 0)) {
+        Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1, true);
         assert(horseActor != NULL);
     } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0)) {
         for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) {
@@ -159,8 +162,8 @@ void func_8006D684(PlayState* play, Player* player) {
             spawnPos = spawnPositions[3];
         }
 
-        player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y,
-                                        spawnPos.z, 0, player->actor.world.rot.y, 0, 7, true);
+        player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y, spawnPos.z, 0,
+                                        player->actor.world.rot.y, 0, 7, true);
         assert(player->rideActor != NULL);
 
         Actor_MountHorse(play, player, player->rideActor);
@@ -201,9 +204,9 @@ void func_8006D684(PlayState* play, Player* player) {
                         D_8011F9B8[i].pos.z = player->actor.world.pos.z;
                     }
 
-                    player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE,
-                                                    D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0,
-                                                    player->actor.world.rot.y, 0, D_8011F9B8[i].type, true);
+                    player->rideActor =
+                        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y,
+                                    D_8011F9B8[i].pos.z, 0, player->actor.world.rot.y, 0, D_8011F9B8[i].type, true);
                     assert(player->rideActor != NULL);
 
                     Actor_MountHorse(play, player, player->rideActor);
@@ -216,9 +219,9 @@ void func_8006D684(PlayState* play, Player* player) {
                         temp = 0x8000;
                     }
 
-                    player->rideActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE,
-                                                    D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0,
-                                                    D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp, true);
+                    player->rideActor =
+                        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y,
+                                    D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp, true);
                     assert(player->rideActor != NULL);
 
                     player->actor.world.pos.x = D_8011F9B8[i].pos.x;
@@ -236,9 +239,8 @@ void func_8006D684(PlayState* play, Player* player) {
 
                     Play_CameraSetAtEye(play, play->activeCamera, &player->actor.world.pos, &sp54);
                 } else {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x,
-                                D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0,
-                                D_8011F9B8[i].type, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y,
+                                D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type, true);
                 }
                 break;
             }
@@ -258,8 +260,10 @@ void func_8006DC68(PlayState* play, Player* player) {
 
         if (func_8006CFC0(play->sceneNum)) {
             if ((gSaveContext.sceneSetupIndex > 3) ||
-                ((gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12 ||
-                  gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_15) &&
+                ((gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11 ||
+                  gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12 ||
+                  gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13 ||
+                  gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_15) &&
                  (gSaveContext.respawnFlag == 0)) ||
                 ((play->sceneNum == SCENE_LON_LON_RANCH) && ((gSaveContext.eventInf[0] & 0xF) == 6) &&
                  !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0))) {
diff --git a/soh/src/code/z_inventory.c b/soh/src/code/z_inventory.c
index 32110d8d29..8a51c6263d 100644
--- a/soh/src/code/z_inventory.c
+++ b/soh/src/code/z_inventory.c
@@ -205,7 +205,8 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) {
         if (equipment == EQUIP_TYPE_TUNIC) {
             gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4);
             // non-vanilla: remove goron and zora tunics from item buttons if assignable tunics is on
-            if (CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) && equipValue != EQUIP_VALUE_TUNIC_KOKIRI) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) &&
+                equipValue != EQUIP_VALUE_TUNIC_KOKIRI) {
                 ItemID item = (equipValue == EQUIP_VALUE_TUNIC_GORON ? ITEM_TUNIC_GORON : ITEM_TUNIC_ZORA);
                 for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
                     if (gSaveContext.equips.buttonItems[i] == item) {
diff --git a/soh/src/code/z_jpeg.c b/soh/src/code/z_jpeg.c
index a812ef73be..89abf3e73d 100644
--- a/soh/src/code/z_jpeg.c
+++ b/soh/src/code/z_jpeg.c
@@ -18,8 +18,7 @@
 /**
  * Configures and schedules a JPEG decoder task and waits for it to finish.
  */
-void Jpeg_ScheduleDecoderTask(JpegContext* ctx) 
-{
+void Jpeg_ScheduleDecoderTask(JpegContext* ctx) {
 #if 0
     static OSTask_t sJpegTask = {
         M_NJPEGTASK,          // type
diff --git a/soh/src/code/z_kaleido_manager.c b/soh/src/code/z_kaleido_manager.c
index 92540b3c48..2f9f552217 100644
--- a/soh/src/code/z_kaleido_manager.c
+++ b/soh/src/code/z_kaleido_manager.c
@@ -10,7 +10,7 @@
 //    }
 
 #define KALEIDO_OVERLAY(name) \
-{ 0 }
+    { 0 }
 
 KaleidoMgrOverlay gKaleidoMgrOverlayTable[] = {
     KALEIDO_OVERLAY(kaleido_scope),
@@ -22,16 +22,16 @@ KaleidoMgrOverlay* gKaleidoMgrCurOvl = NULL;
 u8 gBossMarkState = 0;
 
 void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl) {
-    //LOG_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr);
+    // LOG_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr);
 
     ovl->loadedRamAddr = sKaleidoAreaPtr;
     Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr);
 
-    //osSyncPrintf(VT_FGCOL(GREEN));
-    //osSyncPrintf("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr,
-                 //(uintptr_t)ovl->loadedRamAddr + (uintptr_t)ovl->vramEnd - (uintptr_t)ovl->vramStart,
-                 //(uintptr_t)ovl->vramStart - (uintptr_t)ovl->loadedRamAddr, ovl->name);
-    //osSyncPrintf(VT_RST);
+    // osSyncPrintf(VT_FGCOL(GREEN));
+    // osSyncPrintf("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd,
+    // ovl->loadedRamAddr, (uintptr_t)ovl->loadedRamAddr + (uintptr_t)ovl->vramEnd - (uintptr_t)ovl->vramStart,
+    //(uintptr_t)ovl->vramStart - (uintptr_t)ovl->loadedRamAddr, ovl->name);
+    // osSyncPrintf(VT_RST);
 
     ovl->offset = (uintptr_t)ovl->loadedRamAddr - (uintptr_t)ovl->vramStart;
     gKaleidoMgrCurOvl = ovl;
diff --git a/soh/src/code/z_kaleido_scope_call.c b/soh/src/code/z_kaleido_scope_call.c
index bc21b9b551..b685fa0aee 100644
--- a/soh/src/code/z_kaleido_scope_call.c
+++ b/soh/src/code/z_kaleido_scope_call.c
@@ -59,8 +59,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
 
     GameInteractor_ExecuteOnKaleidoUpdate();
 
-    if (!gSaveContext.ship.stats.gameComplete &&
-        (!IS_BOSS_RUSH || !gSaveContext.ship.quest.data.bossRush.isPaused)) {
+    if (!gSaveContext.ship.stats.gameComplete && (!IS_BOSS_RUSH || !gSaveContext.ship.quest.data.bossRush.isPaused)) {
         gSaveContext.ship.stats.pauseTimer++;
     }
 
@@ -89,8 +88,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
                 pauseCtx->state++;
             }
         } else if (pauseCtx->state != 0) {
-            if (gKaleidoMgrCurOvl != kaleidoScopeOvl) 
-            {
+            if (gKaleidoMgrCurOvl != kaleidoScopeOvl) {
                 if (gKaleidoMgrCurOvl != NULL) {
                     osSyncPrintf(VT_FGCOL(GREEN));
                     // "Kaleido area Player Forced Elimination"
@@ -108,8 +106,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
                 KaleidoManager_LoadOvl(kaleidoScopeOvl);
             }
 
-            if (gKaleidoMgrCurOvl == kaleidoScopeOvl) 
-            {
+            if (gKaleidoMgrCurOvl == kaleidoScopeOvl) {
                 sKaleidoScopeUpdateFunc(play);
 
                 if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0)) {
@@ -132,8 +129,7 @@ void KaleidoScopeCall_Draw(PlayState* play) {
     if (R_PAUSE_MENU_MODE >= 3) {
         if (((play->pauseCtx.state >= 4) && (play->pauseCtx.state <= 7)) ||
             ((play->pauseCtx.state >= 11) && (play->pauseCtx.state <= 18))) {
-            if (gKaleidoMgrCurOvl == kaleidoScopeOvl) 
-            {
+            if (gKaleidoMgrCurOvl == kaleidoScopeOvl) {
                 sKaleidoScopeDrawFunc(play);
             }
         }
diff --git a/soh/src/code/z_kaleido_setup.c b/soh/src/code/z_kaleido_setup.c
index c6b5205efa..8d92d7c329 100644
--- a/soh/src/code/z_kaleido_setup.c
+++ b/soh/src/code/z_kaleido_setup.c
@@ -13,9 +13,10 @@ void KaleidoSetup_Update(PlayState* play) {
     Input* input = &play->state.input[0];
 
     if (pauseCtx->state == 0 && pauseCtx->debugState == 0 && play->gameOverCtx.state == GAMEOVER_INACTIVE &&
-        play->transitionTrigger == TRANS_TRIGGER_OFF && play->transitionMode == TRANS_MODE_OFF && gSaveContext.cutsceneIndex < 0xFFF0 &&
-        gSaveContext.nextCutsceneIndex < 0xFFF0 && !Play_InCsMode(play) &&
-        play->shootingGalleryStatus <= 1 && gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY && gSaveContext.magicState != MAGIC_STATE_FILL &&
+        play->transitionTrigger == TRANS_TRIGGER_OFF && play->transitionMode == TRANS_MODE_OFF &&
+        gSaveContext.cutsceneIndex < 0xFFF0 && gSaveContext.nextCutsceneIndex < 0xFFF0 && !Play_InCsMode(play) &&
+        play->shootingGalleryStatus <= 1 && gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY &&
+        gSaveContext.magicState != MAGIC_STATE_FILL &&
         (play->sceneNum != SCENE_BOMBCHU_BOWLING_ALLEY || !Flags_GetSwitch(play, 0x38))) {
 
         if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
@@ -31,7 +32,6 @@ void KaleidoSetup_Update(PlayState* play) {
             else
                 CVarSetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0);
 
-
             WREG(16) = -175;
             WREG(17) = 155;
 
diff --git a/soh/src/code/z_kanfont.c b/soh/src/code/z_kanfont.c
index 217ef3c0ac..7c85204da7 100644
--- a/soh/src/code/z_kanfont.c
+++ b/soh/src/code/z_kanfont.c
@@ -4,10 +4,14 @@
 
 #include "message_data_static.h"
 #include "textures/nes_font_static/nes_font_static.h"
+#include "textures/kanji/kanji.h"
 #include "textures/message_static/message_static.h"
 
-static const char* fntTbl[] =
-{
+// SOH [NTSC]
+extern MessageTableEntry* sJpnMessageEntryTablePtr;
+
+// #region SOH [Port] Asset tables we can pull from instead of from ROM
+const char* fontTbl[140] = {
     gMsgChar20SpaceTex,
     gMsgChar21ExclamationMarkTex,
     gMsgChar22QuotationMarkTex,
@@ -150,18 +154,4014 @@ static const char* fntTbl[] =
     gMsgCharABControlPadTex,
 };
 
-const char* msgStaticTbl[] =
-{
+static const char* kanjiFontTbl[] = {
+    gMsgKanji8140SpaceTex,
+    gMsgKanji8141ToutenTex,
+    gMsgKanji8142KutenTex,
+    gMsgKanji8143CommaTex,
+    gMsgKanji8144PeriodTex,
+    gMsgKanji8145NakatenTex,
+    gMsgKanji8146ColonTex,
+    gMsgKanji8147SemicolonTex,
+    gMsgKanji8148QuestionMarkTex,
+    gMsgKanji8149ExclamationMarkTex,
+    gMsgKanji814ADakutenTex,
+    gMsgKanji814BHandakutenTex,
+    gMsgKanji814CAcuteAccentTex,
+    gMsgKanji814DGraveAccentTex,
+    gMsgKanji814EDiaeresisTex,
+    gMsgKanji814FCircumflexAccentTex,
+    gMsgKanji8150EmptyTex,
+    gMsgKanji8151EmptyTex,
+    gMsgKanji8152IchinojitenKatakanaTex,
+    gMsgKanji8153IchinojitenKatakanaDakutenTex,
+    gMsgKanji8154IchinojitenHiraganaTex,
+    gMsgKanji8155IchinojitenHiraganaDakutenTex,
+    gMsgKanji8156NonojitenTex,
+    gMsgKanji8157Tex,
+    gMsgKanji8158DounojitenTex,
+    gMsgKanji8159ShimeTex,
+    gMsgKanji815AZeroTex,
+    gMsgKanji815BChouonpuTex,
+    gMsgKanji815CDashTex,
+    gMsgKanji815DHyphenTex,
+    gMsgKanji815ESlashTex,
+    gMsgKanji815FBackSlashTex,
+    gMsgKanji8160WaveDashTex,
+    gMsgKanji8161DoubleVerticalLineTex,
+    gMsgKanji8162VerticalLineTex,
+    gMsgKanji8163SantenLeaderTex,
+    gMsgKanji8164NitenLeaderTex,
+    gMsgKanji8165SingleQuotationMarkLeftTex,
+    gMsgKanji8166SingleQuotationMarkRightTex,
+    gMsgKanji8167DoubleQuotationMarkLeftTex,
+    gMsgKanji8168DoubleQuotationMarkRightTex,
+    gMsgKanji8169ParenthesesLeftTex,
+    gMsgKanji816AParenthesesRightTex,
+    gMsgKanji816BKikkoukakkoLeftTex,
+    gMsgKanji816CKikkoukakkoRightTex,
+    gMsgKanji816DSquareBracketLeftTex,
+    gMsgKanji816ESquareBracketRightTex,
+    gMsgKanji816FCurlyBracketLeftTex,
+    gMsgKanji8170CurlyBracketRightTex,
+    gMsgKanji8171YamakakkoLeftTex,
+    gMsgKanji8172YamakakkoRightTex,
+    gMsgKanji8173NijyuuyamakakkoLeftTex,
+    gMsgKanji8174NijyuuyamakakkoRightTex,
+    gMsgKanji8175KagikakkoLeftTex,
+    gMsgKanji8176KagikakkoRightTex,
+    gMsgKanji8177NijyuukagikakkoLeftTex,
+    gMsgKanji8178NijyuukagikakkoRightTex,
+    gMsgKanji8179SumitsukikakkoLeftTex,
+    gMsgKanji817ASumitsukikakkoRightTex,
+    gMsgKanji817BPlusSignTex,
+    gMsgKanji817CMinusSignTex,
+    gMsgKanji817DPlusMinusSignTex,
+    gMsgKanji817EMultiplicationSignTex,
+    gMsgKanji8180DivisionSignTex,
+    gMsgKanji8181EqualsSignTex,
+    gMsgKanji8182NotEqualSignTex,
+    gMsgKanji8183LessThanSignTex,
+    gMsgKanji8184GreaterThanSignTex,
+    gMsgKanji8185LessThanOrEqualToTex,
+    gMsgKanji8186GreaterThanOrEqualToTex,
+    gMsgKanji8187InfinityTex,
+    gMsgKanji8188ThereforeTex,
+    gMsgKanji8189MaleTex,
+    gMsgKanji818AFemaleTex,
+    gMsgKanji818BDegreeSignTex,
+    gMsgKanji818CPrimeTex,
+    gMsgKanji818DDoublePrimeTex,
+    gMsgKanji818ECelciusTex,
+    gMsgKanji818FYenSignTex,
+    gMsgKanji8190DollarSignTex,
+    gMsgKanji8191CentSignTex,
+    gMsgKanji8192PoundSignTex,
+    gMsgKanji8193PercentSignTex,
+    gMsgKanji8194NumberSignTex,
+    gMsgKanji8195AmpersandTex,
+    gMsgKanji8196AsteriskTex,
+    gMsgKanji8197AtSignTex,
+    gMsgKanji8198SectionSignTex,
+    gMsgKanji8199WhiteStarTex,
+    gMsgKanji819ABlackStarTex,
+    gMsgKanji819BWhiteCircleTex,
+    gMsgKanji819CBlackCircleTex,
+    gMsgKanji819DDoubleCircleTex,
+    gMsgKanji819EWhiteDiamondTex,
+    gMsgKanji819FBlackDiamondTex,
+    gMsgKanji81A0WhiteSquareTex,
+    gMsgKanji81A1BlackSquareTex,
+    gMsgKanji81A2WhiteTriangleTex,
+    gMsgKanji81A3BlackTriangleTex,
+    gMsgKanji81A4WhiteInvertedTriangleTex,
+    gMsgKanji81A5BlackInvertedTriangleTex,
+    gMsgKanji81A6KomejirushiTex,
+    gMsgKanji81A7PostalMarkTex,
+    gMsgKanji81A8ArrowRightTex,
+    gMsgKanji81A9ArrowLeftTex,
+    gMsgKanji81AAArrowUpTex,
+    gMsgKanji81ABArrowDownTex,
+    gMsgKanji81ACGetaTex,
+    gMsgKanji81B8EmptyTex,
+    gMsgKanji81B9EmptyTex,
+    gMsgKanji81BAEmptyTex,
+    gMsgKanji81BBEmptyTex,
+    gMsgKanji81BCEmptyTex,
+    gMsgKanji81BDEmptyTex,
+    gMsgKanji81BEEmptyTex,
+    gMsgKanji81BFIntersectionTex,
+    gMsgKanji81C8EmptyTex,
+    gMsgKanji81C9EmptyTex,
+    gMsgKanji81CAEmptyTex,
+    gMsgKanji81CBEmptyTex,
+    gMsgKanji81CCEmptyTex,
+    gMsgKanji81CDEmptyTex,
+    gMsgKanji81CEEmptyTex,
+    gMsgKanji81DBEmptyTex,
+    gMsgKanji81DCEmptyTex,
+    gMsgKanji81DDEmptyTex,
+    gMsgKanji81DEEmptyTex,
+    gMsgKanji81DFEmptyTex,
+    gMsgKanji81E0ApproximatelyEqualToTex,
+    gMsgKanji81E1MuchLessThanTex,
+    gMsgKanji81E2MuchGreaterThanTex,
+    gMsgKanji81E3SquareRootTex,
+    gMsgKanji81E4SimilarTex,
+    gMsgKanji81E5ProportionalTex,
+    gMsgKanji81E6BecauseTex,
+    gMsgKanji81E7IntegralTex,
+    gMsgKanji81E8DoubleIntegralTex,
+    gMsgKanji81F0EmptyTex,
+    gMsgKanji81F1EmptyTex,
+    gMsgKanji81F2EmptyTex,
+    gMsgKanji81F3EmptyTex,
+    gMsgKanji81F4EmptyTex,
+    gMsgKanji81F5EmptyTex,
+    gMsgKanji81F6EmptyTex,
+    gMsgKanji81F7EmptyTex,
+    gMsgKanji81FCEmptyTex,
+    gMsgKanji824FZeroTex,
+    gMsgKanji8250OneTex,
+    gMsgKanji8251TwoTex,
+    gMsgKanji8252ThreeTex,
+    gMsgKanji8253FourTex,
+    gMsgKanji8254FiveTex,
+    gMsgKanji8255SixTex,
+    gMsgKanji8256SevenTex,
+    gMsgKanji8257EightTex,
+    gMsgKanji8258NineTex,
+    gMsgKanji8260CapitalATex,
+    gMsgKanji8261CapitalBTex,
+    gMsgKanji8262CapitalCTex,
+    gMsgKanji8263CapitalDTex,
+    gMsgKanji8264CapitalETex,
+    gMsgKanji8265CapitalFTex,
+    gMsgKanji8266CapitalGTex,
+    gMsgKanji8267CapitalHTex,
+    gMsgKanji8268CapitalITex,
+    gMsgKanji8269CapitalJTex,
+    gMsgKanji826ACapitalKTex,
+    gMsgKanji826BCapitalLTex,
+    gMsgKanji826CCapitalMTex,
+    gMsgKanji826DCapitalNTex,
+    gMsgKanji826ECapitalOTex,
+    gMsgKanji826FCapitalPTex,
+    gMsgKanji8270CapitalQTex,
+    gMsgKanji8271CapitalRTex,
+    gMsgKanji8272CapitalSTex,
+    gMsgKanji8273CapitalTTex,
+    gMsgKanji8274CapitalUTex,
+    gMsgKanji8275CapitalVTex,
+    gMsgKanji8276CapitalWTex,
+    gMsgKanji8277CapitalXTex,
+    gMsgKanji8278CapitalYTex,
+    gMsgKanji8279CapitalZTex,
+    gMsgKanji8281LowercaseATex,
+    gMsgKanji8282LowercaseBTex,
+    gMsgKanji8283LowercaseCTex,
+    gMsgKanji8284LowercaseDTex,
+    gMsgKanji8285LowercaseETex,
+    gMsgKanji8286LowercaseFTex,
+    gMsgKanji8287LowercaseGTex,
+    gMsgKanji8288LowercaseHTex,
+    gMsgKanji8289LowercaseITex,
+    gMsgKanji828ALowercaseJTex,
+    gMsgKanji828BLowercaseKTex,
+    gMsgKanji828CLowercaseLTex,
+    gMsgKanji828DLowercaseMTex,
+    gMsgKanji828ELowercaseNTex,
+    gMsgKanji828FLowercaseOTex,
+    gMsgKanji8290LowercasePTex,
+    gMsgKanji8291LowercaseQTex,
+    gMsgKanji8292LowercaseRTex,
+    gMsgKanji8293LowercaseSTex,
+    gMsgKanji8294LowercaseTTex,
+    gMsgKanji8295LowercaseUTex,
+    gMsgKanji8296LowercaseVTex,
+    gMsgKanji8297LowercaseWTex,
+    gMsgKanji8298LowercaseXTex,
+    gMsgKanji8299LowercaseYTex,
+    gMsgKanji829ALowercaseZTex,
+    gMsgKanji829FHiraganaSmallATex,
+    gMsgKanji82A0HiraganaATex,
+    gMsgKanji82A1HiraganaSmallITex,
+    gMsgKanji82A2HiraganaITex,
+    gMsgKanji82A3HiraganaSmallUTex,
+    gMsgKanji82A4HiraganaUTex,
+    gMsgKanji82A5HiraganaSmallETex,
+    gMsgKanji82A6HiraganaETex,
+    gMsgKanji82A7HiraganaSmallOTex,
+    gMsgKanji82A8HiraganaOTex,
+    gMsgKanji82A9HiraganaKaTex,
+    gMsgKanji82AAHiraganaGaTex,
+    gMsgKanji82ABHiraganaKiTex,
+    gMsgKanji82ACHiraganaGiTex,
+    gMsgKanji82ADHiraganaKuTex,
+    gMsgKanji82AEHiraganaGuTex,
+    gMsgKanji82AFHiraganaKeTex,
+    gMsgKanji82B0HiraganaGeTex,
+    gMsgKanji82B1HiraganaKoTex,
+    gMsgKanji82B2HiraganaGoTex,
+    gMsgKanji82B3HiraganaSaTex,
+    gMsgKanji82B4HiraganaZaTex,
+    gMsgKanji82B5HiraganaShiTex,
+    gMsgKanji82B6HiraganaJiTex,
+    gMsgKanji82B7HiraganaSuTex,
+    gMsgKanji82B8HiraganaZuTex,
+    gMsgKanji82B9HiraganaSeTex,
+    gMsgKanji82BAHiraganaZeTex,
+    gMsgKanji82BBHiraganaSoTex,
+    gMsgKanji82BCHiraganaZoTex,
+    gMsgKanji82BDHiraganaTaTex,
+    gMsgKanji82BEHiraganaDaTex,
+    gMsgKanji82BFHiraganaChiTex,
+    gMsgKanji82C0HiraganaDiTex,
+    gMsgKanji82C1HiraganaSmallTsuTex,
+    gMsgKanji82C2HiraganaTsuTex,
+    gMsgKanji82C3HiraganaDuTex,
+    gMsgKanji82C4HiraganaTeTex,
+    gMsgKanji82C5HiraganaDeTex,
+    gMsgKanji82C6HiraganaToTex,
+    gMsgKanji82C7HiraganaDoTex,
+    gMsgKanji82C8HiraganaNaTex,
+    gMsgKanji82C9HiraganaNiTex,
+    gMsgKanji82CAHiraganaNuTex,
+    gMsgKanji82CBHiraganaNeTex,
+    gMsgKanji82CCHiraganaNoTex,
+    gMsgKanji82CDHiraganaHaTex,
+    gMsgKanji82CEHiraganaBaTex,
+    gMsgKanji82CFHiraganaPaTex,
+    gMsgKanji82D0HiraganaHiTex,
+    gMsgKanji82D1HiraganaBiTex,
+    gMsgKanji82D2HiraganaPiTex,
+    gMsgKanji82D3HiraganaFuTex,
+    gMsgKanji82D4HiraganaBuTex,
+    gMsgKanji82D5HiraganaPuTex,
+    gMsgKanji82D6HiraganaHeTex,
+    gMsgKanji82D7HiraganaBeTex,
+    gMsgKanji82D8HiraganaPeTex,
+    gMsgKanji82D9HiraganaHoTex,
+    gMsgKanji82DAHiraganaBoTex,
+    gMsgKanji82DBHiraganaPoTex,
+    gMsgKanji82DCHiraganaMaTex,
+    gMsgKanji82DDHiraganaMiTex,
+    gMsgKanji82DEHiraganaMuTex,
+    gMsgKanji82DFHiraganaMeTex,
+    gMsgKanji82E0HiraganaMoTex,
+    gMsgKanji82E1HiraganaSmallYaTex,
+    gMsgKanji82E2HiraganaYaTex,
+    gMsgKanji82E3HiraganaSmallYuTex,
+    gMsgKanji82E4HiraganaYuTex,
+    gMsgKanji82E5HiraganaSmallYoTex,
+    gMsgKanji82E6HiraganaYoTex,
+    gMsgKanji82E7HiraganaRaTex,
+    gMsgKanji82E8HiraganaRiTex,
+    gMsgKanji82E9HiraganaRuTex,
+    gMsgKanji82EAHiraganaReTex,
+    gMsgKanji82EBHiraganaRoTex,
+    gMsgKanji82ECHiraganaSmallWaTex,
+    gMsgKanji82EDHiraganaWaTex,
+    gMsgKanji82EEHiraganaWiTex,
+    gMsgKanji82EFHiraganaWeTex,
+    gMsgKanji82F0HiraganaWoTex,
+    gMsgKanji82F1HiraganaNTex,
+    gMsgKanji82F2EmptyTex,
+    gMsgKanji8340KatakanaSmallATex,
+    gMsgKanji8341KatakanaATex,
+    gMsgKanji8342KatakanaSmallITex,
+    gMsgKanji8343KatakanaITex,
+    gMsgKanji8344KatakanaSmallUTex,
+    gMsgKanji8345KatakanaUTex,
+    gMsgKanji8346KatakanaSmallETex,
+    gMsgKanji8347KatakanaETex,
+    gMsgKanji8348KatakanaSmallOTex,
+    gMsgKanji8349KatakanaOTex,
+    gMsgKanji834AKatakanaKaTex,
+    gMsgKanji834BKatakanaGaTex,
+    gMsgKanji834CKatakanaKiTex,
+    gMsgKanji834DKatakanaGiTex,
+    gMsgKanji834EKatakanaKuTex,
+    gMsgKanji834FKatakanaGuTex,
+    gMsgKanji8350KatakanaKeTex,
+    gMsgKanji8351KatakanaGeTex,
+    gMsgKanji8352KatakanaKoTex,
+    gMsgKanji8353KatakanaGoTex,
+    gMsgKanji8354KatakanaSaTex,
+    gMsgKanji8355KatakanaZaTex,
+    gMsgKanji8356KatakanaShiTex,
+    gMsgKanji8357KatakanaJiTex,
+    gMsgKanji8358KatakanaSuTex,
+    gMsgKanji8359KatakanaZuTex,
+    gMsgKanji835AKatakanaSeTex,
+    gMsgKanji835BKatakanaZeTex,
+    gMsgKanji835CKatakanaSoTex,
+    gMsgKanji835DKatakanaZoTex,
+    gMsgKanji835EKatakanaTaTex,
+    gMsgKanji835FKatakanaDaTex,
+    gMsgKanji8360KatakanaChiTex,
+    gMsgKanji8361KatakanaDiTex,
+    gMsgKanji8362KatakanaSmallTsuTex,
+    gMsgKanji8363KatakanaTsuTex,
+    gMsgKanji8364KatakanaDuTex,
+    gMsgKanji8365KatakanaTeTex,
+    gMsgKanji8366KatakanaDeTex,
+    gMsgKanji8367KatakanaToTex,
+    gMsgKanji8368KatakanaDoTex,
+    gMsgKanji8369KatakanaNaTex,
+    gMsgKanji836AKatakanaNiTex,
+    gMsgKanji836BKatakanaNuTex,
+    gMsgKanji836CKatakanaNeTex,
+    gMsgKanji836DKatakanaNoTex,
+    gMsgKanji836EKatakanaHaTex,
+    gMsgKanji836FKatakanaBaTex,
+    gMsgKanji8370KatakanaPaTex,
+    gMsgKanji8371KatakanaHiTex,
+    gMsgKanji8372KatakanaBiTex,
+    gMsgKanji8373KatakanaPiTex,
+    gMsgKanji8374KatakanaFuTex,
+    gMsgKanji8375KatakanaBuTex,
+    gMsgKanji8376KatakanaPuTex,
+    gMsgKanji8377KatakanaHeTex,
+    gMsgKanji8378KatakanaBeTex,
+    gMsgKanji8379KatakanaPeTex,
+    gMsgKanji837AKatakanaHoTex,
+    gMsgKanji837BKatakanaBoTex,
+    gMsgKanji837CKatakanaPoTex,
+    gMsgKanji837DKatakanaMaTex,
+    gMsgKanji837EKatakanaMiTex,
+    gMsgKanji8380KatakanaMuTex,
+    gMsgKanji8381KatakanaMeTex,
+    gMsgKanji8382KatakanaMoTex,
+    gMsgKanji8383KatakanaSmallYaTex,
+    gMsgKanji8384KatakanaYaTex,
+    gMsgKanji8385KatakanaSmallYuTex,
+    gMsgKanji8386KatakanaYuTex,
+    gMsgKanji8387KatakanaSmallYoTex,
+    gMsgKanji8388KatakanaYoTex,
+    gMsgKanji8389KatakanaRaTex,
+    gMsgKanji838AKatakanaRiTex,
+    gMsgKanji838BKatakanaRuTex,
+    gMsgKanji838CKatakanaReTex,
+    gMsgKanji838DKatakanaRoTex,
+    gMsgKanji838EKatakanaSmallWaTex,
+    gMsgKanji838FKatakanaWaTex,
+    gMsgKanji8390KatakanaWiTex,
+    gMsgKanji8391KatakanaWeTex,
+    gMsgKanji8392KatakanaWoTex,
+    gMsgKanji8393KatakanaNTex,
+    gMsgKanji8394KatakanaVuTex,
+    gMsgKanji8395KatakanaSmallKaTex,
+    gMsgKanji8396KatakanaSmallKeTex,
+    gMsgKanji839FButtonATex,
+    gMsgKanji83A0ButtonBTex,
+    gMsgKanji83A1ButtonCTex,
+    gMsgKanji83A2ButtonLTex,
+    gMsgKanji83A3ButtonRTex,
+    gMsgKanji83A4ButtonZTex,
+    gMsgKanji83A5ButtonCUpTex,
+    gMsgKanji83A6ButtonCDownTex,
+    gMsgKanji83A7ButtonCLeftTex,
+    gMsgKanji83A8ButtonCRightTex,
+    gMsgKanji83A9ZTargetSignTex,
+    gMsgKanji83AAControlStickTex,
+    gMsgKanji83ABGreekCapitalNuTex,
+    gMsgKanji83ACGreekCapitalXiTex,
+    gMsgKanji83ADGreekCapitalOmicronTex,
+    gMsgKanji83AEGreekCapitalPiTex,
+    gMsgKanji83AFGreekCapitalRhoTex,
+    gMsgKanji83B0GreekCapitalSigmaTex,
+    gMsgKanji83B1GreekCapitalTauTex,
+    gMsgKanji83B2GreekCapitalUpsilonTex,
+    gMsgKanji83B3GreekCapitalPhiTex,
+    gMsgKanji83B4GreekCapitalChiTex,
+    gMsgKanji83B5GreekCapitalPsiTex,
+    gMsgKanji83B6GreekCapitalOmegaTex,
+    gMsgKanji83BFGreekLowercaseAlphaTex,
+    gMsgKanji83C0GreekLowercaseBetaTex,
+    gMsgKanji83C1GreekLowercaseGammaTex,
+    gMsgKanji83C2GreekLowercaseDeltaTex,
+    gMsgKanji83C3GreekLowercaseEpsilonTex,
+    gMsgKanji83C4GreekLowercaseZetaTex,
+    gMsgKanji83C5GreekLowercaseEtaTex,
+    gMsgKanji83C6GreekLowercaseThetaTex,
+    gMsgKanji83C7GreekLowercaseIotaTex,
+    gMsgKanji83C8GreekLowercaseKappaTex,
+    gMsgKanji83C9GreekLowercaseLamdaTex,
+    gMsgKanji83CAGreekLowercaseMuTex,
+    gMsgKanji83CBGreekLowercaseNuTex,
+    gMsgKanji83CCGreekLowercaseXiTex,
+    gMsgKanji83CDGreekLowercaseOmicronTex,
+    gMsgKanji83CEGreekLowercasePiTex,
+    gMsgKanji83CFGreekLowercaseRhoTex,
+    gMsgKanji83D0GreekLowercaseSigmaTex,
+    gMsgKanji83D1GreekLowercaseTauTex,
+    gMsgKanji83D2GreekLowercaseUpsilonTex,
+    gMsgKanji83D3GreekLowercasePhiTex,
+    gMsgKanji83D4GreekLowercaseChiTex,
+    gMsgKanji83D5GreekLowercasePsiTex,
+    gMsgKanji83D6GreekLowercaseOmegaTex,
+    gMsgKanji83D7EmptyTex,
+    gMsgKanji8440HylianATex,
+    gMsgKanji8441HylianITex,
+    gMsgKanji8442HylianUTex,
+    gMsgKanji8443HylianETex,
+    gMsgKanji8444HylianOTex,
+    gMsgKanji8445HylianKaTex,
+    gMsgKanji8446HylianKiTex,
+    gMsgKanji8447HylianKuTex,
+    gMsgKanji8448HylianKeTex,
+    gMsgKanji8449HylianKoTex,
+    gMsgKanji844AHylianSaTex,
+    gMsgKanji844BHylianShiTex,
+    gMsgKanji844CHylianSuTex,
+    gMsgKanji844DHylianSeTex,
+    gMsgKanji844EHylianSoTex,
+    gMsgKanji844FHylianTaTex,
+    gMsgKanji8450HylianChiTex,
+    gMsgKanji8451HylianTsuTex,
+    gMsgKanji8452HylianTeTex,
+    gMsgKanji8453HylianToTex,
+    gMsgKanji8454HylianNaTex,
+    gMsgKanji8455HylianNiTex,
+    gMsgKanji8456HylianNuTex,
+    gMsgKanji8457HylianNeTex,
+    gMsgKanji8458HylianNoTex,
+    gMsgKanji8459HylianHaTex,
+    gMsgKanji845AHylianHiTex,
+    gMsgKanji845BHylianFuTex,
+    gMsgKanji845CHylianHeTex,
+    gMsgKanji845DHylianHoTex,
+    gMsgKanji845EHylianMaTex,
+    gMsgKanji845FHylianMiTex,
+    gMsgKanji8460HylianMuTex,
+    gMsgKanji8470HylianMeTex,
+    gMsgKanji8471HylianMoTex,
+    gMsgKanji8472HylianYaTex,
+    gMsgKanji8473HylianYuTex,
+    gMsgKanji8474HylianYoTex,
+    gMsgKanji8475HylianRaTex,
+    gMsgKanji8476HylianRiTex,
+    gMsgKanji8477HylianRuTex,
+    gMsgKanji8478HylianReTex,
+    gMsgKanji8479HylianRoTex,
+    gMsgKanji847AHylianWaTex,
+    gMsgKanji847BHylianWoTex,
+    gMsgKanji847CHylianNTex,
+    gMsgKanji847DHylianToutenTex,
+    gMsgKanji847EHylianKutenTex,
+    gMsgKanji8480CyrillicLowercaseOTex,
+    gMsgKanji8481CyrillicLowercasePeTex,
+    gMsgKanji8482CyrillicLowercaseErTex,
+    gMsgKanji8483CyrillicLowercaseEsTex,
+    gMsgKanji8484CyrillicLowercaseTeTex,
+    gMsgKanji8485CyrillicLowercaseUTex,
+    gMsgKanji8486CyrillicLowercaseEfTex,
+    gMsgKanji8487CyrillicLowercaseHaTex,
+    gMsgKanji8488CyrillicLowercaseTseTex,
+    gMsgKanji8489CyrillicLowercaseCheTex,
+    gMsgKanji848ACyrillicLowercaseShaTex,
+    gMsgKanji848BCyrillicLowercaseShchaTex,
+    gMsgKanji848CCyrillicLowercaseHardSignTex,
+    gMsgKanji848DCyrillicLowercaseYeruTex,
+    gMsgKanji848ECyrillicLowercaseSoftSignTex,
+    gMsgKanji848FCyrillicLowercaseETex,
+    gMsgKanji8490CyrillicLowercaseYuTex,
+    gMsgKanji8491CyrillicLowercaseYaTex,
+    gMsgKanji849FBoxThinHorizontalTex,
+    gMsgKanji84A0BoxThinVerticalTex,
+    gMsgKanji84A1BoxThinTopLeftTex,
+    gMsgKanji84A2BoxThinTopRightTex,
+    gMsgKanji84A3BoxThinBottomRightTex,
+    gMsgKanji84A4BoxThinBottomLeftTex,
+    gMsgKanji84A5BoxThinLeftTex,
+    gMsgKanji84A6BoxThinTopTex,
+    gMsgKanji84A7BoxThinRightTex,
+    gMsgKanji84A8BoxThinBottomTex,
+    gMsgKanji84A9BoxThinCenterTex,
+    gMsgKanji84AABoxThickHorizontalTex,
+    gMsgKanji84ABBoxThickVerticalTex,
+    gMsgKanji84ACBoxThickTopLeftTex,
+    gMsgKanji84ADBoxThickTopRightTex,
+    gMsgKanji84AEBoxThickBottomRightTex,
+    gMsgKanji84AFBoxThickBottomLeftTex,
+    gMsgKanji84B0BoxThickLeftTex,
+    gMsgKanji84B1BoxThickTopTex,
+    gMsgKanji84B2BoxThickRightTex,
+    gMsgKanji84B3BoxThickBottomTex,
+    gMsgKanji84B4BoxThickCenterTex,
+    gMsgKanji84B5BoxVertThickHorizThinLeftTex,
+    gMsgKanji84B6BoxVertThinHorizThickTopTex,
+    gMsgKanji84B7BoxVertThickHorizThinRightTex,
+    gMsgKanji84B8BoxVertThinHorizThickBottomTex,
+    gMsgKanji84B9BoxVertThinHorizThickCenterTex,
+    gMsgKanji84BABoxVertThinHorizThickLeftTex,
+    gMsgKanji84BBBoxVertThickHorizThinTopTex,
+    gMsgKanji84BCBoxVertThinHorizThickRightTex,
+    gMsgKanji84BDBoxVertThickHorizThinBottomTex,
+    gMsgKanji84BEBoxVertThickHorizThinCenterTex,
+    gMsgKanji84BFEmptyTex,
+    gMsgKanji8540HalfwidthExclamationMarkTex,
+    gMsgKanji8541HalfwidthQuotationMarkTex,
+    gMsgKanji8542HalfwidthNumberSignTex,
+    gMsgKanji8543HalfwidthDollarSignTex,
+    gMsgKanji8544HalfwidthPercentSignTex,
+    gMsgKanji8545HalfwidthAmpersandTex,
+    gMsgKanji8546HalfwidthApostropheTex,
+    gMsgKanji8547HalfwidthParenthesesLeftTex,
+    gMsgKanji8548HalfwidthParenthesesRightTex,
+    gMsgKanji8549HalfwidthAsteriskTex,
+    gMsgKanji854AHalfwidthPlusSignTex,
+    gMsgKanji854BHalfwidthCommaTex,
+    gMsgKanji854CHalfwidthHyphenMinusTex,
+    gMsgKanji854DHalfwidthPeriodTex,
+    gMsgKanji854EHalfwidthSlashTex,
+    gMsgKanji854FHalfwidth0Tex,
+    gMsgKanji8550Halfwidth1Tex,
+    gMsgKanji8551Halfwidth2Tex,
+    gMsgKanji8552Halfwidth3Tex,
+    gMsgKanji8553Halfwidth4Tex,
+    gMsgKanji855EHalfwidthQuestionMarkTex,
+    gMsgKanji855FHalfwidthAtSignTex,
+    gMsgKanji8560HalfwidthCapitalATex,
+    gMsgKanji8561HalfwidthCapitalBTex,
+    gMsgKanji8562HalfwidthCapitalCTex,
+    gMsgKanji8563HalfwidthCapitalDTex,
+    gMsgKanji8564HalfwidthCapitalETex,
+    gMsgKanji8565HalfwidthCapitalFTex,
+    gMsgKanji8566HalfwidthCapitalGTex,
+    gMsgKanji8567HalfwidthCapitalHTex,
+    gMsgKanji8568HalfwidthCapitalITex,
+    gMsgKanji8569HalfwidthCapitalJTex,
+    gMsgKanji856AHalfwidthCapitalKTex,
+    gMsgKanji856BHalfwidthCapitalLTex,
+    gMsgKanji856CHalfwidthCapitalMTex,
+    gMsgKanji856DHalfwidthCapitalNTex,
+    gMsgKanji856EHalfwidthCapitalOTex,
+    gMsgKanji856FHalfwidthCapitalPTex,
+    gMsgKanji8570HalfwidthCapitalQTex,
+    gMsgKanji8571HalfwidthCapitalRTex,
+    gMsgKanji857CHalfwidthSquareBracketRightTex,
+    gMsgKanji857DHalfwidthCircumflexAccentTex,
+    gMsgKanji857EEmptyTex,
+    gMsgKanji8580HalfwidthGraveAccentTex,
+    gMsgKanji8581HalfwidthLowercaseATex,
+    gMsgKanji8582HalfwidthLowercaseBTex,
+    gMsgKanji8583HalfwidthLowercaseCTex,
+    gMsgKanji8584HalfwidthLowercaseDTex,
+    gMsgKanji8585HalfwidthLowercaseETex,
+    gMsgKanji8591HalfwidthLowercaseQTex,
+    gMsgKanji8592HalfwidthLowercaseRTex,
+    gMsgKanji8593HalfwidthLowercaseSTex,
+    gMsgKanji8594HalfwidthLowercaseTTex,
+    gMsgKanji8595HalfwidthLowercaseUTex,
+    gMsgKanji8596HalfwidthLowercaseVTex,
+    gMsgKanji8597HalfwidthLowercaseWTex,
+    gMsgKanji8598HalfwidthLowercaseXTex,
+    gMsgKanji8599HalfwidthLowercaseYTex,
+    gMsgKanji859AHalfwidthLowercaseZTex,
+    gMsgKanji859FHalfwidthKutenTex,
+    gMsgKanji85A0HalfwidthKagikakkoLeftTex,
+    gMsgKanji85A1HalfwidthKagikakkoRightTex,
+    gMsgKanji85A2HalfwidthToutenTex,
+    gMsgKanji85A3HalfwidthNakatenTex,
+    gMsgKanji85A4HalfwidthKatakanaWoTex,
+    gMsgKanji85A5HalfwidthKatakanaSmallATex,
+    gMsgKanji85A6HalfwidthKatakanaSmallITex,
+    gMsgKanji85A7HalfwidthKatakanaSmallUTex,
+    gMsgKanji85A8HalfwidthKatakanaSmallETex,
+    gMsgKanji85A9HalfwidthKatakanaSmallOTex,
+    gMsgKanji85AAHalfwidthKatakanaSmallYaTex,
+    gMsgKanji85ABHalfwidthKatakanaSmallYuTex,
+    gMsgKanji85ACHalfwidthKatakanaSmallYoTex,
+    gMsgKanji85ADHalfwidthKatakanaSmallTsuTex,
+    gMsgKanji85B3HalfwidthKatakanaOTex,
+    gMsgKanji85B4HalfwidthKatakanaKaTex,
+    gMsgKanji85B5HalfwidthKatakanaKiTex,
+    gMsgKanji85B6HalfwidthKatakanaKuTex,
+    gMsgKanji85B7HalfwidthKatakanaKeTex,
+    gMsgKanji85B8HalfwidthKatakanaKoTex,
+    gMsgKanji85B9HalfwidthKatakanaSaTex,
+    gMsgKanji85BAHalfwidthKatakanaShiTex,
+    gMsgKanji85BBHalfwidthKatakanaSuTex,
+    gMsgKanji85BCHalfwidthKatakanaSeTex,
+    gMsgKanji85BDHalfwidthKatakanaSoTex,
+    gMsgKanji85BEHalfwidthKatakanaTaTex,
+    gMsgKanji85BFHalfwidthKatakanaChiTex,
+    gMsgKanji85C0HalfwidthKatakanaTsuTex,
+    gMsgKanji85C1HalfwidthKatakanaTeTex,
+    gMsgKanji85DBHalfwidthKatakanaNTex,
+    gMsgKanji85DCHalfwidthDakutenTex,
+    gMsgKanji85DDHalfwidthHandakutenTex,
+    gMsgKanji85DEHalfwidthKatakanaWiTex,
+    gMsgKanji85DFHalfwidthKatakanaWeTex,
+    gMsgKanji85E0HalfwidthKatakanaSmallWaTex,
+    gMsgKanji85E1HalfwidthKatakanaSmallKaTex,
+    gMsgKanji85E2HalfwidthKatakanaSmallKeTex,
+    gMsgKanji85E3HalfwidthKatakanaVuTex,
+    gMsgKanji85E4HalfwidthKatakanaGaTex,
+    gMsgKanji85E5HalfwidthKatakanaGiTex,
+    gMsgKanji85E6HalfwidthKatakanaGuTex,
+    gMsgKanji85E7HalfwidthKatakanaGeTex,
+    gMsgKanji85E8HalfwidthKatakanaGoTex,
+    gMsgKanji85E9HalfwidthKatakanaZaTex,
+    gMsgKanji85EAHalfwidthKatakanaJiTex,
+    gMsgKanji85EBHalfwidthKatakanaZuTex,
+    gMsgKanji85ECHalfwidthKatakanaZeTex,
+    gMsgKanji85EDHalfwidthKatakanaZoTex,
+    gMsgKanji85EEHalfwidthKatakanaDaTex,
+    gMsgKanji85EFHalfwidthKatakanaDiTex,
+    gMsgKanji85F0HalfwidthKatakanaDuTex,
+    gMsgKanji85F1HalfwidthKatakanaDeTex,
+    gMsgKanji85F2HalfwidthKatakanaDoTex,
+    gMsgKanji85F3HalfwidthKatakanaBaTex,
+    gMsgKanji85F4HalfwidthKatakanaPaTex,
+    gMsgKanji85F5HalfwidthKatakanaBiTex,
+    gMsgKanji8640EmptyTex,
+    gMsgKanji8641TategakiToutenTex,
+    gMsgKanji8642TategakiKutenTex,
+    gMsgKanji8643HalfwidthHorizontalThinTex,
+    gMsgKanji8644HalfwidthHorizontalThickTex,
+    gMsgKanji8645HalfwidthVerticalThinTex,
+    gMsgKanji8646HalfwidthVerticalThickTex,
+    gMsgKanji8647HalfwidthHorizontalThinDottedTex,
+    gMsgKanji8648HalfwidthHorizontalThickDottedTex,
+    gMsgKanji8649HalfwidthVerticalThinDottedTex,
+    gMsgKanji864AHalfwidthVerticalThickDottedTex,
+    gMsgKanji864BHalfwidthHorizontalThinDotted2Tex,
+    gMsgKanji864CHalfwidthHorizontalThickDotted2Tex,
+    gMsgKanji864DHalfwidthVerticalThinDotted2Tex,
+    gMsgKanji864EHalfwidthVerticalThickDotted2Tex,
+    gMsgKanji864FHalfwidthBoxThinTopLeftTex,
+    gMsgKanji8650VerticalFarRightTex,
+    gMsgKanji8651VerticalFarLeftTex,
+    gMsgKanji8652HalfwidthBoxThickTopLeftTex,
+    gMsgKanji8653HalfwidthBoxThinTopRightTex,
+    gMsgKanji8654HalfwidthBoxVertThinHorizThickTopRightTex,
+    gMsgKanji8655HalfwidthBoxVertThickHorizThinTopRightTex,
+    gMsgKanji8656HalfwidthBoxThickTopRightTex,
+    gMsgKanji8657HalfwidthBoxThinBottomLeftTex,
+    gMsgKanji8658HalfwidthBoxVertThinHorizThickBottomLeftTex,
+    gMsgKanji8659HalfwidthBoxVertThickHorizThinBottomLeftTex,
+    gMsgKanji865AHalfwidthBoxThickBottomLeftTex,
+    gMsgKanji865BTategakiChouonpuTex,
+    gMsgKanji865CTategakiDashTex,
+    gMsgKanji865DTategakiHyphenTex,
+    gMsgKanji869BHalfwidthNijyuukagikakkoRightTex,
+    gMsgKanji869CHalfwidthSumitsukikakkoLeftTex,
+    gMsgKanji869DHalfwidthSumitsukikakkoRightTex,
+    gMsgKanji869EHalfwidthHyphenTex,
+    gMsgKanji869FEmptyTex,
+    gMsgKanji86A0EmptyTex,
+    gMsgKanji86A1EmptyTex,
+    gMsgKanji86A2EmptyTex,
+    gMsgKanji86A3EmptyTex,
+    gMsgKanji86A4EmptyTex,
+    gMsgKanji86A5EmptyTex,
+    gMsgKanji86A6EmptyTex,
+    gMsgKanji86B3BoxVertThinHorizThickTopRightTex,
+    gMsgKanji86B4BoxVertThickHorizThinTopRightTex,
+    gMsgKanji86B5BoxThickTopRightTex,
+    gMsgKanji86C7BoxVertThinHorizThickRightTex,
+    gMsgKanji86C8BoxTopThickBottomThinHorizThinRightTex,
+    gMsgKanji86C9BoxTopThinBottomThickHorizThinRightTex,
+    gMsgKanji86CABoxVertThickHorizThinRightTex,
+    gMsgKanji86CBBoxTopThickBottomThinHorizThickRightTex,
+    gMsgKanji86CCBoxTopThinBottomThickHorizThickRightTex,
+    gMsgKanji86CDBoxThickRightTex,
+    gMsgKanji86CEBoxThinTopTex,
+    gMsgKanji86CFBoxVertThinLeftThickRightThinTopTex,
+    gMsgKanji86D0BoxVertThinLeftThinRightThickTopTex,
+    gMsgKanji86D1BoxVertThinHorizThickTopTex,
+    gMsgKanji86D2BoxVertThickHorizThinTopTex,
+    gMsgKanji86D3BoxVertThickLeftThickRightThinTopTex,
+    gMsgKanji86D4BoxVertThickLeftThinRightThickTopTex,
+    gMsgKanji86D5BoxThickTopTex,
+    gMsgKanji86D6BoxThinBottomTex,
+    gMsgKanji86D7BoxVertThinLeftThickRightThinBottomTex,
+    gMsgKanji8740Circled1Tex,
+    gMsgKanji8741Circled2Tex,
+    gMsgKanji8742Circled3Tex,
+    gMsgKanji8743Circled4Tex,
+    gMsgKanji8744Circled5Tex,
+    gMsgKanji8745Circled6Tex,
+    gMsgKanji8746Circled7Tex,
+    gMsgKanji8747Circled8Tex,
+    gMsgKanji8748Circled9Tex,
+    gMsgKanji8749Circled10Tex,
+    gMsgKanji874ACircled11Tex,
+    gMsgKanji874BCircled12Tex,
+    gMsgKanji874CCircled13Tex,
+    gMsgKanji874DCircled14Tex,
+    gMsgKanji874ECircled15Tex,
+    gMsgKanji874FCircled16Tex,
+    gMsgKanji8750Circled17Tex,
+    gMsgKanji8751Circled18Tex,
+    gMsgKanji8752Circled19Tex,
+    gMsgKanji8753Circled20Tex,
+    gMsgKanji8754RomanNumeral1Tex,
+    gMsgKanji8755RomanNumeral2Tex,
+    gMsgKanji8756RomanNumeral3Tex,
+    gMsgKanji8757RomanNumeral4Tex,
+    gMsgKanji8758RomanNumeral5Tex,
+    gMsgKanji8791IdenticalToTex,
+    gMsgKanji8792IntegralTex,
+    gMsgKanji8793CountourIntegralTex,
+    gMsgKanji8794SummationTex,
+    gMsgKanji8795SquareRootTex,
+    gMsgKanji8796PerpendicularSymbolTex,
+    gMsgKanji8797AngleTex,
+    gMsgKanji8798RightAngleTex,
+    gMsgKanji8799RightTriangleTex,
+    gMsgKanji879ABecauseTex,
+    gMsgKanji879BIntersectionTex,
+    gMsgKanji879CUnionTex,
+    gMsgKanji879DEmptyTex,
+    gMsgKanji879EEmptyTex,
+    gMsgKanji879FHiraganaSmallATex,
+    gMsgKanji87A0EmptyTex,
+    gMsgKanji87A1EmptyTex,
+    gMsgKanji87A2EmptyTex,
+    gMsgKanji87A3EmptyTex,
+    gMsgKanji87A4EmptyTex,
+    gMsgKanji87A5EmptyTex,
+    gMsgKanji87A6EmptyTex,
+    gMsgKanji87A7EmptyTex,
+    gMsgKanji87A8EmptyTex,
+    gMsgKanji87A9EmptyTex,
+    gMsgKanji87AAEmptyTex,
+    gMsgKanji87ABEmptyTex,
+    gMsgKanji87ACEmptyTex,
+    gMsgKanji87ADEmptyTex,
+    gMsgKanji87AEEmptyTex,
+    gMsgKanji87AFEmptyTex,
+    gMsgKanji87B0EmptyTex,
+    gMsgKanji87B1EmptyTex,
+    gMsgKanji87B2EmptyTex,
+    gMsgKanji87B3EmptyTex,
+    gMsgKanji87B4EmptyTex,
+    gMsgKanji87B5EmptyTex,
+    gMsgKanji87BDEmptyTex,
+    gMsgKanji87BEEmptyTex,
+    gMsgKanji87BFEmptyTex,
+    gMsgKanji87C0EmptyTex,
+    gMsgKanji87C1EmptyTex,
+    gMsgKanji87E5EmptyTex,
+    gMsgKanji87E6EmptyTex,
+    gMsgKanji87E7EmptyTex,
+    gMsgKanji87E8EmptyTex,
+    gMsgKanji87FAEmptyTex,
+    gMsgKanji87FBEmptyTex,
+    gMsgKanji87FCEmptyTex,
+    gMsgKanji8840KatakanaSmallATex,
+    gMsgKanji8841EmptyTex,
+    gMsgKanji8842EmptyTex,
+    gMsgKanji8843EmptyTex,
+    gMsgKanji8844EmptyTex,
+    gMsgKanji8845EmptyTex,
+    gMsgKanji8846EmptyTex,
+    gMsgKanji8847EmptyTex,
+    gMsgKanji8848EmptyTex,
+    gMsgKanji8849EmptyTex,
+    gMsgKanji884AEmptyTex,
+    gMsgKanji884BEmptyTex,
+    gMsgKanji884CEmptyTex,
+    gMsgKanji884DEmptyTex,
+    gMsgKanji884EEmptyTex,
+    gMsgKanji884FEmptyTex,
+    gMsgKanji8850EmptyTex,
+    gMsgKanji8851EmptyTex,
+    gMsgKanji8852EmptyTex,
+    gMsgKanji8853EmptyTex,
+    gMsgKanji8854EmptyTex,
+    gMsgKanji8855EmptyTex,
+    gMsgKanji8856EmptyTex,
+    gMsgKanji8857EmptyTex,
+    gMsgKanji8858EmptyTex,
+    gMsgKanji8859EmptyTex,
+    gMsgKanji885AEmptyTex,
+    gMsgKanji885BEmptyTex,
+    gMsgKanji885CEmptyTex,
+    gMsgKanji885DEmptyTex,
+    gMsgKanji885EEmptyTex,
+    gMsgKanji885FEmptyTex,
+    gMsgKanji8860EmptyTex,
+    gMsgKanji8861EmptyTex,
+    gMsgKanji8862EmptyTex,
+    gMsgKanji8863EmptyTex,
+    gMsgKanji8864EmptyTex,
+    gMsgKanji8865EmptyTex,
+    gMsgKanji8866EmptyTex,
+    gMsgKanji8867EmptyTex,
+    gMsgKanji8868EmptyTex,
+    gMsgKanji8869EmptyTex,
+    gMsgKanji886AEmptyTex,
+    gMsgKanji886BEmptyTex,
+    gMsgKanji886CEmptyTex,
+    gMsgKanji886DEmptyTex,
+    gMsgKanji886EEmptyTex,
+    gMsgKanji886FEmptyTex,
+    gMsgKanji8870EmptyTex,
+    gMsgKanji8871EmptyTex,
+    gMsgKanji8872EmptyTex,
+    gMsgKanji8873EmptyTex,
+    gMsgKanji8874EmptyTex,
+    gMsgKanji8875EmptyTex,
+    gMsgKanji8876EmptyTex,
+    gMsgKanji8877EmptyTex,
+    gMsgKanji8878EmptyTex,
+    gMsgKanji8879EmptyTex,
+    gMsgKanji887AEmptyTex,
+    gMsgKanji887BEmptyTex,
+    gMsgKanji887CEmptyTex,
+    gMsgKanji887DEmptyTex,
+    gMsgKanji887EEmptyTex,
+    gMsgKanji8880EmptyTex,
+    gMsgKanji8881EmptyTex,
+    gMsgKanji8882EmptyTex,
+    gMsgKanji8883EmptyTex,
+    gMsgKanji8884EmptyTex,
+    gMsgKanji8885EmptyTex,
+    gMsgKanji8886EmptyTex,
+    gMsgKanji8887EmptyTex,
+    gMsgKanji8888EmptyTex,
+    gMsgKanji8889EmptyTex,
+    gMsgKanji888AEmptyTex,
+    gMsgKanji888BEmptyTex,
+    gMsgKanji888CEmptyTex,
+    gMsgKanji888DEmptyTex,
+    gMsgKanji888EEmptyTex,
+    gMsgKanji888FEmptyTex,
+    gMsgKanji8890EmptyTex,
+    gMsgKanji8891EmptyTex,
+    gMsgKanji8892EmptyTex,
+    gMsgKanji8893EmptyTex,
+    gMsgKanji8894EmptyTex,
+    gMsgKanji8895EmptyTex,
+    gMsgKanji8896EmptyTex,
+    gMsgKanji8897EmptyTex,
+    gMsgKanji8898EmptyTex,
+    gMsgKanji8899EmptyTex,
+    gMsgKanji889AEmptyTex,
+    gMsgKanji889BEmptyTex,
+    gMsgKanji889CEmptyTex,
+    gMsgKanji889DEmptyTex,
+    gMsgKanji889EEmptyTex,
+    gMsgKanji889FTex,
+    gMsgKanji88A0Tex,
+    gMsgKanji88A1Tex,
+    gMsgKanji88A2Tex,
+    gMsgKanji88A3Tex,
+    gMsgKanji88A4Tex,
+    gMsgKanji88A5Tex,
+    gMsgKanji88A6Tex,
+    gMsgKanji88A7Tex,
+    gMsgKanji88A8Tex,
+    gMsgKanji88A9Tex,
+    gMsgKanji88AATex,
+    gMsgKanji88ABTex,
+    gMsgKanji88ACTex,
+    gMsgKanji88ADTex,
+    gMsgKanji88AETex,
+    gMsgKanji88AFTex,
+    gMsgKanji88B0Tex,
+    gMsgKanji88B1Tex,
+    gMsgKanji88B2Tex,
+    gMsgKanji88B3Tex,
+    gMsgKanji88B4Tex,
+    gMsgKanji88B5Tex,
+    gMsgKanji88B6Tex,
+    gMsgKanji88B7Tex,
+    gMsgKanji88B8Tex,
+    gMsgKanji88B9Tex,
+    gMsgKanji88BATex,
+    gMsgKanji88BBTex,
+    gMsgKanji88BCTex,
+    gMsgKanji88BDTex,
+    gMsgKanji88BETex,
+    gMsgKanji88BFTex,
+    gMsgKanji88C0Tex,
+    gMsgKanji88C1Tex,
+    gMsgKanji88C2Tex,
+    gMsgKanji88C3Tex,
+    gMsgKanji88C4Tex,
+    gMsgKanji88C5Tex,
+    gMsgKanji88C6Tex,
+    gMsgKanji88C7Tex,
+    gMsgKanji88C8Tex,
+    gMsgKanji88C9Tex,
+    gMsgKanji88CATex,
+    gMsgKanji88CBTex,
+    gMsgKanji88CCTex,
+    gMsgKanji88CDTex,
+    gMsgKanji88CETex,
+    gMsgKanji88CFTex,
+    gMsgKanji88D0Tex,
+    gMsgKanji88D1Tex,
+    gMsgKanji88D2Tex,
+    gMsgKanji88D3Tex,
+    gMsgKanji88D4Tex,
+    gMsgKanji88D5Tex,
+    gMsgKanji88D6Tex,
+    gMsgKanji88D7Tex,
+    gMsgKanji88D8Tex,
+    gMsgKanji88D9Tex,
+    gMsgKanji88DATex,
+    gMsgKanji88DBTex,
+    gMsgKanji88DCTex,
+    gMsgKanji88DDTex,
+    gMsgKanji88DETex,
+    gMsgKanji88DFTex,
+    gMsgKanji88E0Tex,
+    gMsgKanji88E1Tex,
+    gMsgKanji88E2Tex,
+    gMsgKanji88E3Tex,
+    gMsgKanji88E4Tex,
+    gMsgKanji88E5Tex,
+    gMsgKanji88E6Tex,
+    gMsgKanji88E7Tex,
+    gMsgKanji88E8Tex,
+    gMsgKanji88E9Tex,
+    gMsgKanji88EATex,
+    gMsgKanji88EBTex,
+    gMsgKanji88ECTex,
+    gMsgKanji88EDTex,
+    gMsgKanji88EETex,
+    gMsgKanji88EFTex,
+    gMsgKanji88F0Tex,
+    gMsgKanji88F1Tex,
+    gMsgKanji88F2Tex,
+    gMsgKanji88F3Tex,
+    gMsgKanji88F4Tex,
+    gMsgKanji88F5Tex,
+    gMsgKanji88F6Tex,
+    gMsgKanji88F7Tex,
+    gMsgKanji88F8Tex,
+    gMsgKanji88F9Tex,
+    gMsgKanji88FATex,
+    gMsgKanji88FBTex,
+    gMsgKanji88FCTex,
+    gMsgKanji8940Tex,
+    gMsgKanji8941Tex,
+    gMsgKanji8942Tex,
+    gMsgKanji8943Tex,
+    gMsgKanji8944Tex,
+    gMsgKanji8945Tex,
+    gMsgKanji8946Tex,
+    gMsgKanji8947Tex,
+    gMsgKanji8948Tex,
+    gMsgKanji8949Tex,
+    gMsgKanji894ATex,
+    gMsgKanji894BTex,
+    gMsgKanji894CTex,
+    gMsgKanji894DTex,
+    gMsgKanji894ETex,
+    gMsgKanji894FTex,
+    gMsgKanji8950Tex,
+    gMsgKanji8951Tex,
+    gMsgKanji8952Tex,
+    gMsgKanji8953Tex,
+    gMsgKanji8954Tex,
+    gMsgKanji8955Tex,
+    gMsgKanji8956Tex,
+    gMsgKanji8957Tex,
+    gMsgKanji8958Tex,
+    gMsgKanji8959Tex,
+    gMsgKanji895ATex,
+    gMsgKanji895BTex,
+    gMsgKanji895CTex,
+    gMsgKanji895DTex,
+    gMsgKanji895ETex,
+    gMsgKanji895FTex,
+    gMsgKanji8960Tex,
+    gMsgKanji8961Tex,
+    gMsgKanji8962Tex,
+    gMsgKanji8963Tex,
+    gMsgKanji8964Tex,
+    gMsgKanji8965Tex,
+    gMsgKanji8966Tex,
+    gMsgKanji8967Tex,
+    gMsgKanji8968Tex,
+    gMsgKanji8969Tex,
+    gMsgKanji896ATex,
+    gMsgKanji896BTex,
+    gMsgKanji896CTex,
+    gMsgKanji896DTex,
+    gMsgKanji896ETex,
+    gMsgKanji896FTex,
+    gMsgKanji8970Tex,
+    gMsgKanji8971Tex,
+    gMsgKanji8972Tex,
+    gMsgKanji8973Tex,
+    gMsgKanji8974Tex,
+    gMsgKanji8975Tex,
+    gMsgKanji8976Tex,
+    gMsgKanji8977Tex,
+    gMsgKanji8978Tex,
+    gMsgKanji8979Tex,
+    gMsgKanji897ATex,
+    gMsgKanji897BTex,
+    gMsgKanji897CTex,
+    gMsgKanji897DTex,
+    gMsgKanji897ETex,
+    gMsgKanji8980Tex,
+    gMsgKanji8981Tex,
+    gMsgKanji8982Tex,
+    gMsgKanji8983Tex,
+    gMsgKanji8984Tex,
+    gMsgKanji8985Tex,
+    gMsgKanji8986Tex,
+    gMsgKanji8987Tex,
+    gMsgKanji8988Tex,
+    gMsgKanji8989Tex,
+    gMsgKanji898ATex,
+    gMsgKanji898BTex,
+    gMsgKanji898CTex,
+    gMsgKanji898DTex,
+    gMsgKanji898ETex,
+    gMsgKanji898FTex,
+    gMsgKanji8990Tex,
+    gMsgKanji8991Tex,
+    gMsgKanji8992Tex,
+    gMsgKanji8993Tex,
+    gMsgKanji8994Tex,
+    gMsgKanji8995Tex,
+    gMsgKanji8996Tex,
+    gMsgKanji8997Tex,
+    gMsgKanji8998Tex,
+    gMsgKanji8999Tex,
+    gMsgKanji899ATex,
+    gMsgKanji899BTex,
+    gMsgKanji899CTex,
+    gMsgKanji899DTex,
+    gMsgKanji899ETex,
+    gMsgKanji899FTex,
+    gMsgKanji89A0Tex,
+    gMsgKanji89A1Tex,
+    gMsgKanji89A2Tex,
+    gMsgKanji89A3Tex,
+    gMsgKanji89A4Tex,
+    gMsgKanji89A5Tex,
+    gMsgKanji89A6Tex,
+    gMsgKanji89A7Tex,
+    gMsgKanji89A8Tex,
+    gMsgKanji89A9Tex,
+    gMsgKanji89AATex,
+    gMsgKanji89ABTex,
+    gMsgKanji89ACTex,
+    gMsgKanji89ADTex,
+    gMsgKanji89AETex,
+    gMsgKanji89AFTex,
+    gMsgKanji89B0Tex,
+    gMsgKanji89B1Tex,
+    gMsgKanji89B2Tex,
+    gMsgKanji89B3Tex,
+    gMsgKanji89B4Tex,
+    gMsgKanji89B5Tex,
+    gMsgKanji89B6Tex,
+    gMsgKanji89B7Tex,
+    gMsgKanji89B8Tex,
+    gMsgKanji89B9Tex,
+    gMsgKanji89BATex,
+    gMsgKanji89BBTex,
+    gMsgKanji89BCTex,
+    gMsgKanji89BDTex,
+    gMsgKanji89BETex,
+    gMsgKanji89BFTex,
+    gMsgKanji89C0Tex,
+    gMsgKanji89C1Tex,
+    gMsgKanji89C2Tex,
+    gMsgKanji89C3Tex,
+    gMsgKanji89C4Tex,
+    gMsgKanji89C5Tex,
+    gMsgKanji89C6Tex,
+    gMsgKanji89C7Tex,
+    gMsgKanji89C8Tex,
+    gMsgKanji89C9Tex,
+    gMsgKanji89CATex,
+    gMsgKanji89CBTex,
+    gMsgKanji89CCTex,
+    gMsgKanji89CDTex,
+    gMsgKanji89CETex,
+    gMsgKanji89CFTex,
+    gMsgKanji89D0Tex,
+    gMsgKanji89D1Tex,
+    gMsgKanji89D2Tex,
+    gMsgKanji89D3Tex,
+    gMsgKanji89D4Tex,
+    gMsgKanji89D5Tex,
+    gMsgKanji89D6Tex,
+    gMsgKanji89D7Tex,
+    gMsgKanji89D8Tex,
+    gMsgKanji89D9Tex,
+    gMsgKanji89DATex,
+    gMsgKanji89DBTex,
+    gMsgKanji89DCTex,
+    gMsgKanji89DDTex,
+    gMsgKanji89DETex,
+    gMsgKanji89DFTex,
+    gMsgKanji89E0Tex,
+    gMsgKanji89E1Tex,
+    gMsgKanji89E2Tex,
+    gMsgKanji89E3Tex,
+    gMsgKanji89E4Tex,
+    gMsgKanji89E5Tex,
+    gMsgKanji89E6Tex,
+    gMsgKanji89E7Tex,
+    gMsgKanji89E8Tex,
+    gMsgKanji89E9Tex,
+    gMsgKanji89EATex,
+    gMsgKanji89EBTex,
+    gMsgKanji89ECTex,
+    gMsgKanji89EDTex,
+    gMsgKanji89EETex,
+    gMsgKanji89EFTex,
+    gMsgKanji89F0Tex,
+    gMsgKanji89F1Tex,
+    gMsgKanji89F2Tex,
+    gMsgKanji89F3Tex,
+    gMsgKanji89F4Tex,
+    gMsgKanji89F5Tex,
+    gMsgKanji89F6Tex,
+    gMsgKanji89F7Tex,
+    gMsgKanji89F8Tex,
+    gMsgKanji89F9Tex,
+    gMsgKanji89FATex,
+    gMsgKanji89FBTex,
+    gMsgKanji89FCTex,
+    gMsgKanji8A40Tex,
+    gMsgKanji8A41Tex,
+    gMsgKanji8A42Tex,
+    gMsgKanji8A43Tex,
+    gMsgKanji8A44Tex,
+    gMsgKanji8A45Tex,
+    gMsgKanji8A46Tex,
+    gMsgKanji8A47Tex,
+    gMsgKanji8A48Tex,
+    gMsgKanji8A49Tex,
+    gMsgKanji8A4ATex,
+    gMsgKanji8A4BTex,
+    gMsgKanji8A4CTex,
+    gMsgKanji8A4DTex,
+    gMsgKanji8A4ETex,
+    gMsgKanji8A4FTex,
+    gMsgKanji8A50Tex,
+    gMsgKanji8A51Tex,
+    gMsgKanji8A52Tex,
+    gMsgKanji8A53Tex,
+    gMsgKanji8A54Tex,
+    gMsgKanji8A55Tex,
+    gMsgKanji8A56Tex,
+    gMsgKanji8A57Tex,
+    gMsgKanji8A58Tex,
+    gMsgKanji8A59Tex,
+    gMsgKanji8A5ATex,
+    gMsgKanji8A5BTex,
+    gMsgKanji8A5CTex,
+    gMsgKanji8A5DTex,
+    gMsgKanji8A5ETex,
+    gMsgKanji8A5FTex,
+    gMsgKanji8A60Tex,
+    gMsgKanji8A61Tex,
+    gMsgKanji8A62Tex,
+    gMsgKanji8A63Tex,
+    gMsgKanji8A64Tex,
+    gMsgKanji8A65Tex,
+    gMsgKanji8A66Tex,
+    gMsgKanji8A67Tex,
+    gMsgKanji8A68Tex,
+    gMsgKanji8A69Tex,
+    gMsgKanji8A6ATex,
+    gMsgKanji8A6BTex,
+    gMsgKanji8A6CTex,
+    gMsgKanji8A6DTex,
+    gMsgKanji8A6ETex,
+    gMsgKanji8A6FTex,
+    gMsgKanji8A70Tex,
+    gMsgKanji8A71Tex,
+    gMsgKanji8A72Tex,
+    gMsgKanji8A73Tex,
+    gMsgKanji8A74Tex,
+    gMsgKanji8A75Tex,
+    gMsgKanji8A76Tex,
+    gMsgKanji8A77Tex,
+    gMsgKanji8A78Tex,
+    gMsgKanji8A79Tex,
+    gMsgKanji8A7ATex,
+    gMsgKanji8A7BTex,
+    gMsgKanji8A7CTex,
+    gMsgKanji8A7DTex,
+    gMsgKanji8A7ETex,
+    gMsgKanji8A80Tex,
+    gMsgKanji8A81Tex,
+    gMsgKanji8A82Tex,
+    gMsgKanji8A83Tex,
+    gMsgKanji8A84Tex,
+    gMsgKanji8A85Tex,
+    gMsgKanji8A86Tex,
+    gMsgKanji8A87Tex,
+    gMsgKanji8A88Tex,
+    gMsgKanji8A89Tex,
+    gMsgKanji8A8ATex,
+    gMsgKanji8A8BTex,
+    gMsgKanji8A8CTex,
+    gMsgKanji8A8DTex,
+    gMsgKanji8A8ETex,
+    gMsgKanji8A8FTex,
+    gMsgKanji8A90Tex,
+    gMsgKanji8A91Tex,
+    gMsgKanji8A92Tex,
+    gMsgKanji8A93Tex,
+    gMsgKanji8A94Tex,
+    gMsgKanji8A95Tex,
+    gMsgKanji8A96Tex,
+    gMsgKanji8A97Tex,
+    gMsgKanji8A98Tex,
+    gMsgKanji8A99Tex,
+    gMsgKanji8A9ATex,
+    gMsgKanji8A9BTex,
+    gMsgKanji8A9CTex,
+    gMsgKanji8A9DTex,
+    gMsgKanji8A9ETex,
+    gMsgKanji8A9FTex,
+    gMsgKanji8AA0Tex,
+    gMsgKanji8AA1Tex,
+    gMsgKanji8AA2Tex,
+    gMsgKanji8AA3Tex,
+    gMsgKanji8AA4Tex,
+    gMsgKanji8AA5Tex,
+    gMsgKanji8AA6Tex,
+    gMsgKanji8AA7Tex,
+    gMsgKanji8AA8Tex,
+    gMsgKanji8AA9Tex,
+    gMsgKanji8AAATex,
+    gMsgKanji8AABTex,
+    gMsgKanji8AACTex,
+    gMsgKanji8AADTex,
+    gMsgKanji8AAETex,
+    gMsgKanji8AAFTex,
+    gMsgKanji8AB0Tex,
+    gMsgKanji8AB1Tex,
+    gMsgKanji8AB2Tex,
+    gMsgKanji8AB3Tex,
+    gMsgKanji8AB4Tex,
+    gMsgKanji8AB5Tex,
+    gMsgKanji8AB6Tex,
+    gMsgKanji8AB7Tex,
+    gMsgKanji8AB8Tex,
+    gMsgKanji8AB9Tex,
+    gMsgKanji8ABATex,
+    gMsgKanji8ABBTex,
+    gMsgKanji8ABCTex,
+    gMsgKanji8ABDTex,
+    gMsgKanji8ABETex,
+    gMsgKanji8ABFTex,
+    gMsgKanji8AC0Tex,
+    gMsgKanji8AC1Tex,
+    gMsgKanji8AC2Tex,
+    gMsgKanji8AC3Tex,
+    gMsgKanji8AC4Tex,
+    gMsgKanji8AC5Tex,
+    gMsgKanji8AC6Tex,
+    gMsgKanji8AC7Tex,
+    gMsgKanji8AC8Tex,
+    gMsgKanji8AC9Tex,
+    gMsgKanji8ACATex,
+    gMsgKanji8ACBTex,
+    gMsgKanji8ACCTex,
+    gMsgKanji8ACDTex,
+    gMsgKanji8ACETex,
+    gMsgKanji8ACFTex,
+    gMsgKanji8AD0Tex,
+    gMsgKanji8AD1Tex,
+    gMsgKanji8AD2Tex,
+    gMsgKanji8AD3Tex,
+    gMsgKanji8AD4Tex,
+    gMsgKanji8AD5Tex,
+    gMsgKanji8AD6Tex,
+    gMsgKanji8AD7Tex,
+    gMsgKanji8AD8Tex,
+    gMsgKanji8AD9Tex,
+    gMsgKanji8ADATex,
+    gMsgKanji8ADBTex,
+    gMsgKanji8ADCTex,
+    gMsgKanji8ADDTex,
+    gMsgKanji8ADETex,
+    gMsgKanji8ADFTex,
+    gMsgKanji8AE0Tex,
+    gMsgKanji8AE1Tex,
+    gMsgKanji8AE2Tex,
+    gMsgKanji8AE3Tex,
+    gMsgKanji8AE4Tex,
+    gMsgKanji8AE5Tex,
+    gMsgKanji8AE6Tex,
+    gMsgKanji8AE7Tex,
+    gMsgKanji8AE8Tex,
+    gMsgKanji8AE9Tex,
+    gMsgKanji8AEATex,
+    gMsgKanji8AEBTex,
+    gMsgKanji8AECTex,
+    gMsgKanji8AEDTex,
+    gMsgKanji8AEETex,
+    gMsgKanji8AEFTex,
+    gMsgKanji8AF0Tex,
+    gMsgKanji8AF1Tex,
+    gMsgKanji8AF2Tex,
+    gMsgKanji8AF3Tex,
+    gMsgKanji8AF4Tex,
+    gMsgKanji8AF5Tex,
+    gMsgKanji8AF6Tex,
+    gMsgKanji8AF7Tex,
+    gMsgKanji8AF8Tex,
+    gMsgKanji8AF9Tex,
+    gMsgKanji8AFATex,
+    gMsgKanji8AFBTex,
+    gMsgKanji8AFCTex,
+    gMsgKanji8B40Tex,
+    gMsgKanji8B41Tex,
+    gMsgKanji8B42Tex,
+    gMsgKanji8B43Tex,
+    gMsgKanji8B44Tex,
+    gMsgKanji8B45Tex,
+    gMsgKanji8B46Tex,
+    gMsgKanji8B47Tex,
+    gMsgKanji8B48Tex,
+    gMsgKanji8B49Tex,
+    gMsgKanji8B4ATex,
+    gMsgKanji8B4BTex,
+    gMsgKanji8B4CTex,
+    gMsgKanji8B4DTex,
+    gMsgKanji8B4ETex,
+    gMsgKanji8B4FTex,
+    gMsgKanji8B50Tex,
+    gMsgKanji8B51Tex,
+    gMsgKanji8B52Tex,
+    gMsgKanji8B53Tex,
+    gMsgKanji8B54Tex,
+    gMsgKanji8B55Tex,
+    gMsgKanji8B56Tex,
+    gMsgKanji8B57Tex,
+    gMsgKanji8B58Tex,
+    gMsgKanji8B59Tex,
+    gMsgKanji8B5ATex,
+    gMsgKanji8B5BTex,
+    gMsgKanji8B5CTex,
+    gMsgKanji8B5DTex,
+    gMsgKanji8B5ETex,
+    gMsgKanji8B5FTex,
+    gMsgKanji8B60Tex,
+    gMsgKanji8B61Tex,
+    gMsgKanji8B62Tex,
+    gMsgKanji8B63Tex,
+    gMsgKanji8B64Tex,
+    gMsgKanji8B65Tex,
+    gMsgKanji8B66Tex,
+    gMsgKanji8B67Tex,
+    gMsgKanji8B68Tex,
+    gMsgKanji8B69Tex,
+    gMsgKanji8B6ATex,
+    gMsgKanji8B6BTex,
+    gMsgKanji8B6CTex,
+    gMsgKanji8B6DTex,
+    gMsgKanji8B6ETex,
+    gMsgKanji8B6FTex,
+    gMsgKanji8B70Tex,
+    gMsgKanji8B71Tex,
+    gMsgKanji8B72Tex,
+    gMsgKanji8B73Tex,
+    gMsgKanji8B74Tex,
+    gMsgKanji8B75Tex,
+    gMsgKanji8B76Tex,
+    gMsgKanji8B77Tex,
+    gMsgKanji8B78Tex,
+    gMsgKanji8B79Tex,
+    gMsgKanji8B7ATex,
+    gMsgKanji8B7BTex,
+    gMsgKanji8B7CTex,
+    gMsgKanji8B7DTex,
+    gMsgKanji8B7ETex,
+    gMsgKanji8B80Tex,
+    gMsgKanji8B81Tex,
+    gMsgKanji8B82Tex,
+    gMsgKanji8B83Tex,
+    gMsgKanji8B84Tex,
+    gMsgKanji8B85Tex,
+    gMsgKanji8B86Tex,
+    gMsgKanji8B87Tex,
+    gMsgKanji8B88Tex,
+    gMsgKanji8B89Tex,
+    gMsgKanji8B8ATex,
+    gMsgKanji8B8BTex,
+    gMsgKanji8B8CTex,
+    gMsgKanji8B8DTex,
+    gMsgKanji8B8ETex,
+    gMsgKanji8B8FTex,
+    gMsgKanji8B90Tex,
+    gMsgKanji8B91Tex,
+    gMsgKanji8B92Tex,
+    gMsgKanji8B93Tex,
+    gMsgKanji8B94Tex,
+    gMsgKanji8B95Tex,
+    gMsgKanji8B96Tex,
+    gMsgKanji8B97Tex,
+    gMsgKanji8B98Tex,
+    gMsgKanji8B99Tex,
+    gMsgKanji8B9ATex,
+    gMsgKanji8B9BTex,
+    gMsgKanji8B9CTex,
+    gMsgKanji8B9DTex,
+    gMsgKanji8B9ETex,
+    gMsgKanji8B9FTex,
+    gMsgKanji8BA0Tex,
+    gMsgKanji8BA1Tex,
+    gMsgKanji8BA2Tex,
+    gMsgKanji8BA3Tex,
+    gMsgKanji8BA4Tex,
+    gMsgKanji8BA5Tex,
+    gMsgKanji8BA6Tex,
+    gMsgKanji8BA7Tex,
+    gMsgKanji8BA8Tex,
+    gMsgKanji8BA9Tex,
+    gMsgKanji8BAATex,
+    gMsgKanji8BABTex,
+    gMsgKanji8BACTex,
+    gMsgKanji8BADTex,
+    gMsgKanji8BAETex,
+    gMsgKanji8BAFTex,
+    gMsgKanji8BB0Tex,
+    gMsgKanji8BB1Tex,
+    gMsgKanji8BB2Tex,
+    gMsgKanji8BB3Tex,
+    gMsgKanji8BB4Tex,
+    gMsgKanji8BB5Tex,
+    gMsgKanji8BB6Tex,
+    gMsgKanji8BB7Tex,
+    gMsgKanji8BB8Tex,
+    gMsgKanji8BB9Tex,
+    gMsgKanji8BBATex,
+    gMsgKanji8BBBTex,
+    gMsgKanji8BBCTex,
+    gMsgKanji8BBDTex,
+    gMsgKanji8BBETex,
+    gMsgKanji8BBFTex,
+    gMsgKanji8BC0Tex,
+    gMsgKanji8BC1Tex,
+    gMsgKanji8BC2Tex,
+    gMsgKanji8BC3Tex,
+    gMsgKanji8BC4Tex,
+    gMsgKanji8BC5Tex,
+    gMsgKanji8BC6Tex,
+    gMsgKanji8BC7Tex,
+    gMsgKanji8BC8Tex,
+    gMsgKanji8BC9Tex,
+    gMsgKanji8BCATex,
+    gMsgKanji8BCBTex,
+    gMsgKanji8BCCTex,
+    gMsgKanji8BCDTex,
+    gMsgKanji8BCETex,
+    gMsgKanji8BCFTex,
+    gMsgKanji8BD0Tex,
+    gMsgKanji8BD1Tex,
+    gMsgKanji8BD2Tex,
+    gMsgKanji8BD3Tex,
+    gMsgKanji8BD4Tex,
+    gMsgKanji8BD5Tex,
+    gMsgKanji8BD6Tex,
+    gMsgKanji8BD7Tex,
+    gMsgKanji8BD8Tex,
+    gMsgKanji8BD9Tex,
+    gMsgKanji8BDATex,
+    gMsgKanji8BDBTex,
+    gMsgKanji8BDCTex,
+    gMsgKanji8BDDTex,
+    gMsgKanji8BDETex,
+    gMsgKanji8BDFTex,
+    gMsgKanji8BE0Tex,
+    gMsgKanji8BE1Tex,
+    gMsgKanji8BE2Tex,
+    gMsgKanji8BE3Tex,
+    gMsgKanji8BE4Tex,
+    gMsgKanji8BE5Tex,
+    gMsgKanji8BE6Tex,
+    gMsgKanji8BE7Tex,
+    gMsgKanji8BE8Tex,
+    gMsgKanji8BE9Tex,
+    gMsgKanji8BEATex,
+    gMsgKanji8BEBTex,
+    gMsgKanji8BECTex,
+    gMsgKanji8BEDTex,
+    gMsgKanji8BEETex,
+    gMsgKanji8BEFTex,
+    gMsgKanji8BF0Tex,
+    gMsgKanji8BF1Tex,
+    gMsgKanji8BF2Tex,
+    gMsgKanji8BF3Tex,
+    gMsgKanji8BF4Tex,
+    gMsgKanji8BF5Tex,
+    gMsgKanji8BF6Tex,
+    gMsgKanji8BF7Tex,
+    gMsgKanji8BF8Tex,
+    gMsgKanji8BF9Tex,
+    gMsgKanji8BFATex,
+    gMsgKanji8BFBTex,
+    gMsgKanji8BFCTex,
+    gMsgKanji8C40Tex,
+    gMsgKanji8C41Tex,
+    gMsgKanji8C42Tex,
+    gMsgKanji8C43Tex,
+    gMsgKanji8C44Tex,
+    gMsgKanji8C45Tex,
+    gMsgKanji8C46Tex,
+    gMsgKanji8C47Tex,
+    gMsgKanji8C48Tex,
+    gMsgKanji8C49Tex,
+    gMsgKanji8C4ATex,
+    gMsgKanji8C4BTex,
+    gMsgKanji8C4CTex,
+    gMsgKanji8C4DTex,
+    gMsgKanji8C4ETex,
+    gMsgKanji8C4FTex,
+    gMsgKanji8C50Tex,
+    gMsgKanji8C51Tex,
+    gMsgKanji8C52Tex,
+    gMsgKanji8C53Tex,
+    gMsgKanji8C54Tex,
+    gMsgKanji8C55Tex,
+    gMsgKanji8C56Tex,
+    gMsgKanji8C57Tex,
+    gMsgKanji8C58Tex,
+    gMsgKanji8C59Tex,
+    gMsgKanji8C5ATex,
+    gMsgKanji8C5BTex,
+    gMsgKanji8C5CTex,
+    gMsgKanji8C5DTex,
+    gMsgKanji8C5ETex,
+    gMsgKanji8C5FTex,
+    gMsgKanji8C60Tex,
+    gMsgKanji8C61Tex,
+    gMsgKanji8C62Tex,
+    gMsgKanji8C63Tex,
+    gMsgKanji8C64Tex,
+    gMsgKanji8C65Tex,
+    gMsgKanji8C66Tex,
+    gMsgKanji8C67Tex,
+    gMsgKanji8C68Tex,
+    gMsgKanji8C69Tex,
+    gMsgKanji8C6ATex,
+    gMsgKanji8C6BTex,
+    gMsgKanji8C6CTex,
+    gMsgKanji8C6DTex,
+    gMsgKanji8C6ETex,
+    gMsgKanji8C6FTex,
+    gMsgKanji8C70Tex,
+    gMsgKanji8C71Tex,
+    gMsgKanji8C72Tex,
+    gMsgKanji8C73Tex,
+    gMsgKanji8C74Tex,
+    gMsgKanji8C75Tex,
+    gMsgKanji8C76Tex,
+    gMsgKanji8C77Tex,
+    gMsgKanji8C78Tex,
+    gMsgKanji8C79Tex,
+    gMsgKanji8C7ATex,
+    gMsgKanji8C7BTex,
+    gMsgKanji8C7CTex,
+    gMsgKanji8C7DTex,
+    gMsgKanji8C7ETex,
+    gMsgKanji8C80Tex,
+    gMsgKanji8C81Tex,
+    gMsgKanji8C82Tex,
+    gMsgKanji8C83Tex,
+    gMsgKanji8C84Tex,
+    gMsgKanji8C85Tex,
+    gMsgKanji8C86Tex,
+    gMsgKanji8C87Tex,
+    gMsgKanji8C88Tex,
+    gMsgKanji8C89Tex,
+    gMsgKanji8C8ATex,
+    gMsgKanji8C8BTex,
+    gMsgKanji8C8CTex,
+    gMsgKanji8C8DTex,
+    gMsgKanji8C8ETex,
+    gMsgKanji8C8FTex,
+    gMsgKanji8C90Tex,
+    gMsgKanji8C91Tex,
+    gMsgKanji8C92Tex,
+    gMsgKanji8C93Tex,
+    gMsgKanji8C94Tex,
+    gMsgKanji8C95Tex,
+    gMsgKanji8C96Tex,
+    gMsgKanji8C97Tex,
+    gMsgKanji8C98Tex,
+    gMsgKanji8C99Tex,
+    gMsgKanji8C9ATex,
+    gMsgKanji8C9BTex,
+    gMsgKanji8C9CTex,
+    gMsgKanji8C9DTex,
+    gMsgKanji8C9ETex,
+    gMsgKanji8C9FTex,
+    gMsgKanji8CA0Tex,
+    gMsgKanji8CA1Tex,
+    gMsgKanji8CA2Tex,
+    gMsgKanji8CA3Tex,
+    gMsgKanji8CA4Tex,
+    gMsgKanji8CA5Tex,
+    gMsgKanji8CA6Tex,
+    gMsgKanji8CA7Tex,
+    gMsgKanji8CA8Tex,
+    gMsgKanji8CA9Tex,
+    gMsgKanji8CAATex,
+    gMsgKanji8CABTex,
+    gMsgKanji8CACTex,
+    gMsgKanji8CADTex,
+    gMsgKanji8CAETex,
+    gMsgKanji8CAFTex,
+    gMsgKanji8CB0Tex,
+    gMsgKanji8CB1Tex,
+    gMsgKanji8CB2Tex,
+    gMsgKanji8CB3Tex,
+    gMsgKanji8CB4Tex,
+    gMsgKanji8CB5Tex,
+    gMsgKanji8CB6Tex,
+    gMsgKanji8CB7Tex,
+    gMsgKanji8CB8Tex,
+    gMsgKanji8CB9Tex,
+    gMsgKanji8CBATex,
+    gMsgKanji8CBBTex,
+    gMsgKanji8CBCTex,
+    gMsgKanji8CBDTex,
+    gMsgKanji8CBETex,
+    gMsgKanji8CBFTex,
+    gMsgKanji8CC0Tex,
+    gMsgKanji8CC1Tex,
+    gMsgKanji8CC2Tex,
+    gMsgKanji8CC3Tex,
+    gMsgKanji8CC4Tex,
+    gMsgKanji8CC5Tex,
+    gMsgKanji8CC6Tex,
+    gMsgKanji8CC7Tex,
+    gMsgKanji8CC8Tex,
+    gMsgKanji8CC9Tex,
+    gMsgKanji8CCATex,
+    gMsgKanji8CCBTex,
+    gMsgKanji8CCCTex,
+    gMsgKanji8CCDTex,
+    gMsgKanji8CCETex,
+    gMsgKanji8CCFTex,
+    gMsgKanji8CD0Tex,
+    gMsgKanji8CD1Tex,
+    gMsgKanji8CD2Tex,
+    gMsgKanji8CD3Tex,
+    gMsgKanji8CD4Tex,
+    gMsgKanji8CD5Tex,
+    gMsgKanji8CD6Tex,
+    gMsgKanji8CD7Tex,
+    gMsgKanji8CD8Tex,
+    gMsgKanji8CD9Tex,
+    gMsgKanji8CDATex,
+    gMsgKanji8CDBTex,
+    gMsgKanji8CDCTex,
+    gMsgKanji8CDDTex,
+    gMsgKanji8CDETex,
+    gMsgKanji8CDFTex,
+    gMsgKanji8CE0Tex,
+    gMsgKanji8CE1Tex,
+    gMsgKanji8CE2Tex,
+    gMsgKanji8CE3Tex,
+    gMsgKanji8CE4Tex,
+    gMsgKanji8CE5Tex,
+    gMsgKanji8CE6Tex,
+    gMsgKanji8CE7Tex,
+    gMsgKanji8CE8Tex,
+    gMsgKanji8CE9Tex,
+    gMsgKanji8CEATex,
+    gMsgKanji8CEBTex,
+    gMsgKanji8CECTex,
+    gMsgKanji8CEDTex,
+    gMsgKanji8CEETex,
+    gMsgKanji8CEFTex,
+    gMsgKanji8CF0Tex,
+    gMsgKanji8CF1Tex,
+    gMsgKanji8CF2Tex,
+    gMsgKanji8CF3Tex,
+    gMsgKanji8CF4Tex,
+    gMsgKanji8CF5Tex,
+    gMsgKanji8CF6Tex,
+    gMsgKanji8CF7Tex,
+    gMsgKanji8CF8Tex,
+    gMsgKanji8CF9Tex,
+    gMsgKanji8CFATex,
+    gMsgKanji8CFBTex,
+    gMsgKanji8CFCTex,
+    gMsgKanji8D40Tex,
+    gMsgKanji8D41Tex,
+    gMsgKanji8D42Tex,
+    gMsgKanji8D43Tex,
+    gMsgKanji8D44Tex,
+    gMsgKanji8D45Tex,
+    gMsgKanji8D46Tex,
+    gMsgKanji8D47Tex,
+    gMsgKanji8D48Tex,
+    gMsgKanji8D49Tex,
+    gMsgKanji8D4ATex,
+    gMsgKanji8D4BTex,
+    gMsgKanji8D4CTex,
+    gMsgKanji8D4DTex,
+    gMsgKanji8D4ETex,
+    gMsgKanji8D4FTex,
+    gMsgKanji8D50Tex,
+    gMsgKanji8D51Tex,
+    gMsgKanji8D52Tex,
+    gMsgKanji8D53Tex,
+    gMsgKanji8D54Tex,
+    gMsgKanji8D55Tex,
+    gMsgKanji8D56Tex,
+    gMsgKanji8D57Tex,
+    gMsgKanji8D58Tex,
+    gMsgKanji8D59Tex,
+    gMsgKanji8D5ATex,
+    gMsgKanji8D5BTex,
+    gMsgKanji8D5CTex,
+    gMsgKanji8D5DTex,
+    gMsgKanji8D5ETex,
+    gMsgKanji8D5FTex,
+    gMsgKanji8D60Tex,
+    gMsgKanji8D61Tex,
+    gMsgKanji8D62Tex,
+    gMsgKanji8D63Tex,
+    gMsgKanji8D64Tex,
+    gMsgKanji8D65Tex,
+    gMsgKanji8D66Tex,
+    gMsgKanji8D67Tex,
+    gMsgKanji8D68Tex,
+    gMsgKanji8D69Tex,
+    gMsgKanji8D6ATex,
+    gMsgKanji8D6BTex,
+    gMsgKanji8D6CTex,
+    gMsgKanji8D6DTex,
+    gMsgKanji8D6ETex,
+    gMsgKanji8D6FTex,
+    gMsgKanji8D70Tex,
+    gMsgKanji8D71Tex,
+    gMsgKanji8D72Tex,
+    gMsgKanji8D73Tex,
+    gMsgKanji8D74Tex,
+    gMsgKanji8D75Tex,
+    gMsgKanji8D76Tex,
+    gMsgKanji8D77Tex,
+    gMsgKanji8D78Tex,
+    gMsgKanji8D79Tex,
+    gMsgKanji8D7ATex,
+    gMsgKanji8D7BTex,
+    gMsgKanji8D7CTex,
+    gMsgKanji8D7DTex,
+    gMsgKanji8D7ETex,
+    gMsgKanji8D80Tex,
+    gMsgKanji8D81Tex,
+    gMsgKanji8D82Tex,
+    gMsgKanji8D83Tex,
+    gMsgKanji8D84Tex,
+    gMsgKanji8D85Tex,
+    gMsgKanji8D86Tex,
+    gMsgKanji8D87Tex,
+    gMsgKanji8D88Tex,
+    gMsgKanji8D89Tex,
+    gMsgKanji8D8ATex,
+    gMsgKanji8D8BTex,
+    gMsgKanji8D8CTex,
+    gMsgKanji8D8DTex,
+    gMsgKanji8D8ETex,
+    gMsgKanji8D8FTex,
+    gMsgKanji8D90Tex,
+    gMsgKanji8D91Tex,
+    gMsgKanji8D92Tex,
+    gMsgKanji8D93Tex,
+    gMsgKanji8D94Tex,
+    gMsgKanji8D95Tex,
+    gMsgKanji8D96Tex,
+    gMsgKanji8D97Tex,
+    gMsgKanji8D98Tex,
+    gMsgKanji8D99Tex,
+    gMsgKanji8D9ATex,
+    gMsgKanji8D9BTex,
+    gMsgKanji8D9CTex,
+    gMsgKanji8D9DTex,
+    gMsgKanji8D9ETex,
+    gMsgKanji8D9FTex,
+    gMsgKanji8DA0Tex,
+    gMsgKanji8DA1Tex,
+    gMsgKanji8DA2Tex,
+    gMsgKanji8DA3Tex,
+    gMsgKanji8DA4Tex,
+    gMsgKanji8DA5Tex,
+    gMsgKanji8DA6Tex,
+    gMsgKanji8DA7Tex,
+    gMsgKanji8DA8Tex,
+    gMsgKanji8DA9Tex,
+    gMsgKanji8DAATex,
+    gMsgKanji8DABTex,
+    gMsgKanji8DACTex,
+    gMsgKanji8DADTex,
+    gMsgKanji8DAETex,
+    gMsgKanji8DAFTex,
+    gMsgKanji8DB0Tex,
+    gMsgKanji8DB1Tex,
+    gMsgKanji8DB2Tex,
+    gMsgKanji8DB3Tex,
+    gMsgKanji8DB4Tex,
+    gMsgKanji8DB5Tex,
+    gMsgKanji8DB6Tex,
+    gMsgKanji8DB7Tex,
+    gMsgKanji8DB8Tex,
+    gMsgKanji8DB9Tex,
+    gMsgKanji8DBATex,
+    gMsgKanji8DBBTex,
+    gMsgKanji8DBCTex,
+    gMsgKanji8DBDTex,
+    gMsgKanji8DBETex,
+    gMsgKanji8DBFTex,
+    gMsgKanji8DC0Tex,
+    gMsgKanji8DC1Tex,
+    gMsgKanji8DC2Tex,
+    gMsgKanji8DC3Tex,
+    gMsgKanji8DC4Tex,
+    gMsgKanji8DC5Tex,
+    gMsgKanji8DC6Tex,
+    gMsgKanji8DC7Tex,
+    gMsgKanji8DC8Tex,
+    gMsgKanji8DC9Tex,
+    gMsgKanji8DCATex,
+    gMsgKanji8DCBTex,
+    gMsgKanji8DCCTex,
+    gMsgKanji8DCDTex,
+    gMsgKanji8DCETex,
+    gMsgKanji8DCFTex,
+    gMsgKanji8DD0Tex,
+    gMsgKanji8DD1Tex,
+    gMsgKanji8DD2Tex,
+    gMsgKanji8DD3Tex,
+    gMsgKanji8DD4Tex,
+    gMsgKanji8DD5Tex,
+    gMsgKanji8DD6Tex,
+    gMsgKanji8DD7Tex,
+    gMsgKanji8DD8Tex,
+    gMsgKanji8DD9Tex,
+    gMsgKanji8DDATex,
+    gMsgKanji8DDBTex,
+    gMsgKanji8DDCTex,
+    gMsgKanji8DDDTex,
+    gMsgKanji8DDETex,
+    gMsgKanji8DDFTex,
+    gMsgKanji8DE0Tex,
+    gMsgKanji8DE1Tex,
+    gMsgKanji8DE2Tex,
+    gMsgKanji8DE3Tex,
+    gMsgKanji8DE4Tex,
+    gMsgKanji8DE5Tex,
+    gMsgKanji8DE6Tex,
+    gMsgKanji8DE7Tex,
+    gMsgKanji8DE8Tex,
+    gMsgKanji8DE9Tex,
+    gMsgKanji8DEATex,
+    gMsgKanji8DEBTex,
+    gMsgKanji8DECTex,
+    gMsgKanji8DEDTex,
+    gMsgKanji8DEETex,
+    gMsgKanji8DEFTex,
+    gMsgKanji8DF0Tex,
+    gMsgKanji8DF1Tex,
+    gMsgKanji8DF2Tex,
+    gMsgKanji8DF3Tex,
+    gMsgKanji8DF4Tex,
+    gMsgKanji8DF5Tex,
+    gMsgKanji8DF6Tex,
+    gMsgKanji8DF7Tex,
+    gMsgKanji8DF8Tex,
+    gMsgKanji8DF9Tex,
+    gMsgKanji8DFATex,
+    gMsgKanji8DFBTex,
+    gMsgKanji8DFCTex,
+    gMsgKanji8E40Tex,
+    gMsgKanji8E41Tex,
+    gMsgKanji8E42Tex,
+    gMsgKanji8E43Tex,
+    gMsgKanji8E44Tex,
+    gMsgKanji8E45Tex,
+    gMsgKanji8E46Tex,
+    gMsgKanji8E47Tex,
+    gMsgKanji8E48Tex,
+    gMsgKanji8E49Tex,
+    gMsgKanji8E4ATex,
+    gMsgKanji8E4BTex,
+    gMsgKanji8E4CTex,
+    gMsgKanji8E4DTex,
+    gMsgKanji8E4ETex,
+    gMsgKanji8E4FTex,
+    gMsgKanji8E50Tex,
+    gMsgKanji8E51Tex,
+    gMsgKanji8E52Tex,
+    gMsgKanji8E53Tex,
+    gMsgKanji8E54Tex,
+    gMsgKanji8E55Tex,
+    gMsgKanji8E56Tex,
+    gMsgKanji8E57Tex,
+    gMsgKanji8E58Tex,
+    gMsgKanji8E59Tex,
+    gMsgKanji8E5ATex,
+    gMsgKanji8E5BTex,
+    gMsgKanji8E5CTex,
+    gMsgKanji8E5DTex,
+    gMsgKanji8E5ETex,
+    gMsgKanji8E5FTex,
+    gMsgKanji8E60Tex,
+    gMsgKanji8E61Tex,
+    gMsgKanji8E62Tex,
+    gMsgKanji8E63Tex,
+    gMsgKanji8E64Tex,
+    gMsgKanji8E65Tex,
+    gMsgKanji8E66Tex,
+    gMsgKanji8E67Tex,
+    gMsgKanji8E68Tex,
+    gMsgKanji8E69Tex,
+    gMsgKanji8E6ATex,
+    gMsgKanji8E6BTex,
+    gMsgKanji8E6CTex,
+    gMsgKanji8E6DTex,
+    gMsgKanji8E6ETex,
+    gMsgKanji8E6FTex,
+    gMsgKanji8E70Tex,
+    gMsgKanji8E71Tex,
+    gMsgKanji8E72Tex,
+    gMsgKanji8E73Tex,
+    gMsgKanji8E74Tex,
+    gMsgKanji8E75Tex,
+    gMsgKanji8E76Tex,
+    gMsgKanji8E77Tex,
+    gMsgKanji8E78Tex,
+    gMsgKanji8E79Tex,
+    gMsgKanji8E7ATex,
+    gMsgKanji8E7BTex,
+    gMsgKanji8E7CTex,
+    gMsgKanji8E7DTex,
+    gMsgKanji8E7ETex,
+    gMsgKanji8E80Tex,
+    gMsgKanji8E81Tex,
+    gMsgKanji8E82Tex,
+    gMsgKanji8E83Tex,
+    gMsgKanji8E84Tex,
+    gMsgKanji8E85Tex,
+    gMsgKanji8E86Tex,
+    gMsgKanji8E87Tex,
+    gMsgKanji8E88Tex,
+    gMsgKanji8E89Tex,
+    gMsgKanji8E8ATex,
+    gMsgKanji8E8BTex,
+    gMsgKanji8E8CTex,
+    gMsgKanji8E8DTex,
+    gMsgKanji8E8ETex,
+    gMsgKanji8E8FTex,
+    gMsgKanji8E90Tex,
+    gMsgKanji8E91Tex,
+    gMsgKanji8E92Tex,
+    gMsgKanji8E93Tex,
+    gMsgKanji8E94Tex,
+    gMsgKanji8E95Tex,
+    gMsgKanji8E96Tex,
+    gMsgKanji8E97Tex,
+    gMsgKanji8E98Tex,
+    gMsgKanji8E99Tex,
+    gMsgKanji8E9ATex,
+    gMsgKanji8E9BTex,
+    gMsgKanji8E9CTex,
+    gMsgKanji8E9DTex,
+    gMsgKanji8E9ETex,
+    gMsgKanji8E9FTex,
+    gMsgKanji8EA0Tex,
+    gMsgKanji8EA1Tex,
+    gMsgKanji8EA2Tex,
+    gMsgKanji8EA3Tex,
+    gMsgKanji8EA4Tex,
+    gMsgKanji8EA5Tex,
+    gMsgKanji8EA6Tex,
+    gMsgKanji8EA7Tex,
+    gMsgKanji8EA8Tex,
+    gMsgKanji8EA9Tex,
+    gMsgKanji8EAATex,
+    gMsgKanji8EABTex,
+    gMsgKanji8EACTex,
+    gMsgKanji8EADTex,
+    gMsgKanji8EAETex,
+    gMsgKanji8EAFTex,
+    gMsgKanji8EB0Tex,
+    gMsgKanji8EB1Tex,
+    gMsgKanji8EB2Tex,
+    gMsgKanji8EB3Tex,
+    gMsgKanji8EB4Tex,
+    gMsgKanji8EB5Tex,
+    gMsgKanji8EB6Tex,
+    gMsgKanji8EB7Tex,
+    gMsgKanji8EB8Tex,
+    gMsgKanji8EB9Tex,
+    gMsgKanji8EBATex,
+    gMsgKanji8EBBTex,
+    gMsgKanji8EBCTex,
+    gMsgKanji8EBDTex,
+    gMsgKanji8EBETex,
+    gMsgKanji8EBFTex,
+    gMsgKanji8EC0Tex,
+    gMsgKanji8EC1Tex,
+    gMsgKanji8EC2Tex,
+    gMsgKanji8EC3Tex,
+    gMsgKanji8EC4Tex,
+    gMsgKanji8EC5Tex,
+    gMsgKanji8EC6Tex,
+    gMsgKanji8EC7Tex,
+    gMsgKanji8EC8Tex,
+    gMsgKanji8EC9Tex,
+    gMsgKanji8ECATex,
+    gMsgKanji8ECBTex,
+    gMsgKanji8ECCTex,
+    gMsgKanji8ECDTex,
+    gMsgKanji8ECETex,
+    gMsgKanji8ECFTex,
+    gMsgKanji8ED0Tex,
+    gMsgKanji8ED1Tex,
+    gMsgKanji8ED2Tex,
+    gMsgKanji8ED3Tex,
+    gMsgKanji8ED4Tex,
+    gMsgKanji8ED5Tex,
+    gMsgKanji8ED6Tex,
+    gMsgKanji8ED7Tex,
+    gMsgKanji8ED8Tex,
+    gMsgKanji8ED9Tex,
+    gMsgKanji8EDATex,
+    gMsgKanji8EDBTex,
+    gMsgKanji8EDCTex,
+    gMsgKanji8EDDTex,
+    gMsgKanji8EDETex,
+    gMsgKanji8EDFTex,
+    gMsgKanji8EE0Tex,
+    gMsgKanji8EE1Tex,
+    gMsgKanji8EE2Tex,
+    gMsgKanji8EE3Tex,
+    gMsgKanji8EE4Tex,
+    gMsgKanji8EE5Tex,
+    gMsgKanji8EE6Tex,
+    gMsgKanji8EE7Tex,
+    gMsgKanji8EE8Tex,
+    gMsgKanji8EE9Tex,
+    gMsgKanji8EEATex,
+    gMsgKanji8EEBTex,
+    gMsgKanji8EECTex,
+    gMsgKanji8EEDTex,
+    gMsgKanji8EEETex,
+    gMsgKanji8EEFTex,
+    gMsgKanji8EF0Tex,
+    gMsgKanji8EF1Tex,
+    gMsgKanji8EF2Tex,
+    gMsgKanji8EF3Tex,
+    gMsgKanji8EF4Tex,
+    gMsgKanji8EF5Tex,
+    gMsgKanji8EF6Tex,
+    gMsgKanji8EF7Tex,
+    gMsgKanji8EF8Tex,
+    gMsgKanji8EF9Tex,
+    gMsgKanji8EFATex,
+    gMsgKanji8EFBTex,
+    gMsgKanji8EFCTex,
+    gMsgKanji8F40Tex,
+    gMsgKanji8F41Tex,
+    gMsgKanji8F42Tex,
+    gMsgKanji8F43Tex,
+    gMsgKanji8F44Tex,
+    gMsgKanji8F45Tex,
+    gMsgKanji8F46Tex,
+    gMsgKanji8F47Tex,
+    gMsgKanji8F48Tex,
+    gMsgKanji8F49Tex,
+    gMsgKanji8F4ATex,
+    gMsgKanji8F4BTex,
+    gMsgKanji8F4CTex,
+    gMsgKanji8F4DTex,
+    gMsgKanji8F4ETex,
+    gMsgKanji8F4FTex,
+    gMsgKanji8F50Tex,
+    gMsgKanji8F51Tex,
+    gMsgKanji8F52Tex,
+    gMsgKanji8F53Tex,
+    gMsgKanji8F54Tex,
+    gMsgKanji8F55Tex,
+    gMsgKanji8F56Tex,
+    gMsgKanji8F57Tex,
+    gMsgKanji8F58Tex,
+    gMsgKanji8F59Tex,
+    gMsgKanji8F5ATex,
+    gMsgKanji8F5BTex,
+    gMsgKanji8F5CTex,
+    gMsgKanji8F5DTex,
+    gMsgKanji8F5ETex,
+    gMsgKanji8F5FTex,
+    gMsgKanji8F60Tex,
+    gMsgKanji8F61Tex,
+    gMsgKanji8F62Tex,
+    gMsgKanji8F63Tex,
+    gMsgKanji8F64Tex,
+    gMsgKanji8F65Tex,
+    gMsgKanji8F66Tex,
+    gMsgKanji8F67Tex,
+    gMsgKanji8F68Tex,
+    gMsgKanji8F69Tex,
+    gMsgKanji8F6ATex,
+    gMsgKanji8F6BTex,
+    gMsgKanji8F6CTex,
+    gMsgKanji8F6DTex,
+    gMsgKanji8F6ETex,
+    gMsgKanji8F6FTex,
+    gMsgKanji8F70Tex,
+    gMsgKanji8F71Tex,
+    gMsgKanji8F72Tex,
+    gMsgKanji8F73Tex,
+    gMsgKanji8F74Tex,
+    gMsgKanji8F75Tex,
+    gMsgKanji8F76Tex,
+    gMsgKanji8F77Tex,
+    gMsgKanji8F78Tex,
+    gMsgKanji8F79Tex,
+    gMsgKanji8F7ATex,
+    gMsgKanji8F7BTex,
+    gMsgKanji8F7CTex,
+    gMsgKanji8F7DTex,
+    gMsgKanji8F7ETex,
+    gMsgKanji8F80Tex,
+    gMsgKanji8F81Tex,
+    gMsgKanji8F82Tex,
+    gMsgKanji8F83Tex,
+    gMsgKanji8F84Tex,
+    gMsgKanji8F85Tex,
+    gMsgKanji8F86Tex,
+    gMsgKanji8F87Tex,
+    gMsgKanji8F88Tex,
+    gMsgKanji8F89Tex,
+    gMsgKanji8F8ATex,
+    gMsgKanji8F8BTex,
+    gMsgKanji8F8CTex,
+    gMsgKanji8F8DTex,
+    gMsgKanji8F8ETex,
+    gMsgKanji8F8FTex,
+    gMsgKanji8F90Tex,
+    gMsgKanji8F91Tex,
+    gMsgKanji8F92Tex,
+    gMsgKanji8F93Tex,
+    gMsgKanji8F94Tex,
+    gMsgKanji8F95Tex,
+    gMsgKanji8F96Tex,
+    gMsgKanji8F97Tex,
+    gMsgKanji8F98Tex,
+    gMsgKanji8F99Tex,
+    gMsgKanji8F9ATex,
+    gMsgKanji8F9BTex,
+    gMsgKanji8F9CTex,
+    gMsgKanji8F9DTex,
+    gMsgKanji8F9ETex,
+    gMsgKanji8F9FTex,
+    gMsgKanji8FA0Tex,
+    gMsgKanji8FA1Tex,
+    gMsgKanji8FA2Tex,
+    gMsgKanji8FA3Tex,
+    gMsgKanji8FA4Tex,
+    gMsgKanji8FA5Tex,
+    gMsgKanji8FA6Tex,
+    gMsgKanji8FA7Tex,
+    gMsgKanji8FA8Tex,
+    gMsgKanji8FA9Tex,
+    gMsgKanji8FAATex,
+    gMsgKanji8FABTex,
+    gMsgKanji8FACTex,
+    gMsgKanji8FADTex,
+    gMsgKanji8FAETex,
+    gMsgKanji8FAFTex,
+    gMsgKanji8FB0Tex,
+    gMsgKanji8FB1Tex,
+    gMsgKanji8FB2Tex,
+    gMsgKanji8FB3Tex,
+    gMsgKanji8FB4Tex,
+    gMsgKanji8FB5Tex,
+    gMsgKanji8FB6Tex,
+    gMsgKanji8FB7Tex,
+    gMsgKanji8FB8Tex,
+    gMsgKanji8FB9Tex,
+    gMsgKanji8FBATex,
+    gMsgKanji8FBBTex,
+    gMsgKanji8FBCTex,
+    gMsgKanji8FBDTex,
+    gMsgKanji8FBETex,
+    gMsgKanji8FBFTex,
+    gMsgKanji8FC0Tex,
+    gMsgKanji8FC1Tex,
+    gMsgKanji8FC2Tex,
+    gMsgKanji8FC3Tex,
+    gMsgKanji8FC4Tex,
+    gMsgKanji8FC5Tex,
+    gMsgKanji8FC6Tex,
+    gMsgKanji8FC7Tex,
+    gMsgKanji8FC8Tex,
+    gMsgKanji8FC9Tex,
+    gMsgKanji8FCATex,
+    gMsgKanji8FCBTex,
+    gMsgKanji8FCCTex,
+    gMsgKanji8FCDTex,
+    gMsgKanji8FCETex,
+    gMsgKanji8FCFTex,
+    gMsgKanji8FD0Tex,
+    gMsgKanji8FD1Tex,
+    gMsgKanji8FD2Tex,
+    gMsgKanji8FD3Tex,
+    gMsgKanji8FD4Tex,
+    gMsgKanji8FD5Tex,
+    gMsgKanji8FD6Tex,
+    gMsgKanji8FD7Tex,
+    gMsgKanji8FD8Tex,
+    gMsgKanji8FD9Tex,
+    gMsgKanji8FDATex,
+    gMsgKanji8FDBTex,
+    gMsgKanji8FDCTex,
+    gMsgKanji8FDDTex,
+    gMsgKanji8FDETex,
+    gMsgKanji8FDFTex,
+    gMsgKanji8FE0Tex,
+    gMsgKanji8FE1Tex,
+    gMsgKanji8FE2Tex,
+    gMsgKanji8FE3Tex,
+    gMsgKanji8FE4Tex,
+    gMsgKanji8FE5Tex,
+    gMsgKanji8FE6Tex,
+    gMsgKanji8FE7Tex,
+    gMsgKanji8FE8Tex,
+    gMsgKanji8FE9Tex,
+    gMsgKanji8FEATex,
+    gMsgKanji8FEBTex,
+    gMsgKanji8FECTex,
+    gMsgKanji8FEDTex,
+    gMsgKanji8FEETex,
+    gMsgKanji8FEFTex,
+    gMsgKanji8FF0Tex,
+    gMsgKanji8FF1Tex,
+    gMsgKanji8FF2Tex,
+    gMsgKanji8FF3Tex,
+    gMsgKanji8FF4Tex,
+    gMsgKanji8FF5Tex,
+    gMsgKanji8FF6Tex,
+    gMsgKanji8FF7Tex,
+    gMsgKanji8FF8Tex,
+    gMsgKanji8FF9Tex,
+    gMsgKanji8FFATex,
+    gMsgKanji8FFBTex,
+    gMsgKanji8FFCTex,
+    gMsgKanji9040Tex,
+    gMsgKanji9041Tex,
+    gMsgKanji9042Tex,
+    gMsgKanji9043Tex,
+    gMsgKanji9044Tex,
+    gMsgKanji9045Tex,
+    gMsgKanji9046Tex,
+    gMsgKanji9047Tex,
+    gMsgKanji9048Tex,
+    gMsgKanji9049Tex,
+    gMsgKanji904ATex,
+    gMsgKanji904BTex,
+    gMsgKanji904CTex,
+    gMsgKanji904DTex,
+    gMsgKanji904ETex,
+    gMsgKanji904FTex,
+    gMsgKanji9050Tex,
+    gMsgKanji9051Tex,
+    gMsgKanji9052Tex,
+    gMsgKanji9053Tex,
+    gMsgKanji9054Tex,
+    gMsgKanji9055Tex,
+    gMsgKanji9056Tex,
+    gMsgKanji9057Tex,
+    gMsgKanji9058Tex,
+    gMsgKanji9059Tex,
+    gMsgKanji905ATex,
+    gMsgKanji905BTex,
+    gMsgKanji905CTex,
+    gMsgKanji905DTex,
+    gMsgKanji905ETex,
+    gMsgKanji905FTex,
+    gMsgKanji9060Tex,
+    gMsgKanji9061Tex,
+    gMsgKanji9062Tex,
+    gMsgKanji9063Tex,
+    gMsgKanji9064Tex,
+    gMsgKanji9065Tex,
+    gMsgKanji9066Tex,
+    gMsgKanji9067Tex,
+    gMsgKanji9068Tex,
+    gMsgKanji9069Tex,
+    gMsgKanji906ATex,
+    gMsgKanji906BTex,
+    gMsgKanji906CTex,
+    gMsgKanji906DTex,
+    gMsgKanji906ETex,
+    gMsgKanji906FTex,
+    gMsgKanji9070Tex,
+    gMsgKanji9071Tex,
+    gMsgKanji9072Tex,
+    gMsgKanji9073Tex,
+    gMsgKanji9074Tex,
+    gMsgKanji9075Tex,
+    gMsgKanji9076Tex,
+    gMsgKanji9077Tex,
+    gMsgKanji9078Tex,
+    gMsgKanji9079Tex,
+    gMsgKanji907ATex,
+    gMsgKanji907BTex,
+    gMsgKanji907CTex,
+    gMsgKanji907DTex,
+    gMsgKanji907ETex,
+    gMsgKanji9080Tex,
+    gMsgKanji9081Tex,
+    gMsgKanji9082Tex,
+    gMsgKanji9083Tex,
+    gMsgKanji9084Tex,
+    gMsgKanji9085Tex,
+    gMsgKanji9086Tex,
+    gMsgKanji9087Tex,
+    gMsgKanji9088Tex,
+    gMsgKanji9089Tex,
+    gMsgKanji908ATex,
+    gMsgKanji908BTex,
+    gMsgKanji908CTex,
+    gMsgKanji908DTex,
+    gMsgKanji908ETex,
+    gMsgKanji908FTex,
+    gMsgKanji9090Tex,
+    gMsgKanji9091Tex,
+    gMsgKanji9092Tex,
+    gMsgKanji9093Tex,
+    gMsgKanji9094Tex,
+    gMsgKanji9095Tex,
+    gMsgKanji9096Tex,
+    gMsgKanji9097Tex,
+    gMsgKanji9098Tex,
+    gMsgKanji9099Tex,
+    gMsgKanji909ATex,
+    gMsgKanji909BTex,
+    gMsgKanji909CTex,
+    gMsgKanji909DTex,
+    gMsgKanji909ETex,
+    gMsgKanji909FTex,
+    gMsgKanji90A0Tex,
+    gMsgKanji90A1Tex,
+    gMsgKanji90A2Tex,
+    gMsgKanji90A3Tex,
+    gMsgKanji90A4Tex,
+    gMsgKanji90A5Tex,
+    gMsgKanji90A6Tex,
+    gMsgKanji90A7Tex,
+    gMsgKanji90A8Tex,
+    gMsgKanji90A9Tex,
+    gMsgKanji90AATex,
+    gMsgKanji90ABTex,
+    gMsgKanji90ACTex,
+    gMsgKanji90ADTex,
+    gMsgKanji90AETex,
+    gMsgKanji90AFTex,
+    gMsgKanji90B0Tex,
+    gMsgKanji90B1Tex,
+    gMsgKanji90B2Tex,
+    gMsgKanji90B3Tex,
+    gMsgKanji90B4Tex,
+    gMsgKanji90B5Tex,
+    gMsgKanji90B6Tex,
+    gMsgKanji90B7Tex,
+    gMsgKanji90B8Tex,
+    gMsgKanji90B9Tex,
+    gMsgKanji90BATex,
+    gMsgKanji90BBTex,
+    gMsgKanji90BCTex,
+    gMsgKanji90BDTex,
+    gMsgKanji90BETex,
+    gMsgKanji90BFTex,
+    gMsgKanji90C0Tex,
+    gMsgKanji90C1Tex,
+    gMsgKanji90C2Tex,
+    gMsgKanji90C3Tex,
+    gMsgKanji90C4Tex,
+    gMsgKanji90C5Tex,
+    gMsgKanji90C6Tex,
+    gMsgKanji90C7Tex,
+    gMsgKanji90C8Tex,
+    gMsgKanji90C9Tex,
+    gMsgKanji90CATex,
+    gMsgKanji90CBTex,
+    gMsgKanji90CCTex,
+    gMsgKanji90CDTex,
+    gMsgKanji90CETex,
+    gMsgKanji90CFTex,
+    gMsgKanji90D0Tex,
+    gMsgKanji90D1Tex,
+    gMsgKanji90D2Tex,
+    gMsgKanji90D3Tex,
+    gMsgKanji90D4Tex,
+    gMsgKanji90D5Tex,
+    gMsgKanji90D6Tex,
+    gMsgKanji90D7Tex,
+    gMsgKanji90D8Tex,
+    gMsgKanji90D9Tex,
+    gMsgKanji90DATex,
+    gMsgKanji90DBTex,
+    gMsgKanji90DCTex,
+    gMsgKanji90DDTex,
+    gMsgKanji90DETex,
+    gMsgKanji90DFTex,
+    gMsgKanji90E0Tex,
+    gMsgKanji90E1Tex,
+    gMsgKanji90E2Tex,
+    gMsgKanji90E3Tex,
+    gMsgKanji90E4Tex,
+    gMsgKanji90E5Tex,
+    gMsgKanji90E6Tex,
+    gMsgKanji90E7Tex,
+    gMsgKanji90E8Tex,
+    gMsgKanji90E9Tex,
+    gMsgKanji90EATex,
+    gMsgKanji90EBTex,
+    gMsgKanji90ECTex,
+    gMsgKanji90EDTex,
+    gMsgKanji90EETex,
+    gMsgKanji90EFTex,
+    gMsgKanji90F0Tex,
+    gMsgKanji90F1Tex,
+    gMsgKanji90F2Tex,
+    gMsgKanji90F3Tex,
+    gMsgKanji90F4Tex,
+    gMsgKanji90F5Tex,
+    gMsgKanji90F6Tex,
+    gMsgKanji90F7Tex,
+    gMsgKanji90F8Tex,
+    gMsgKanji90F9Tex,
+    gMsgKanji90FATex,
+    gMsgKanji90FBTex,
+    gMsgKanji90FCTex,
+    gMsgKanji9140Tex,
+    gMsgKanji9141Tex,
+    gMsgKanji9142Tex,
+    gMsgKanji9143Tex,
+    gMsgKanji9144Tex,
+    gMsgKanji9145Tex,
+    gMsgKanji9146Tex,
+    gMsgKanji9147Tex,
+    gMsgKanji9148Tex,
+    gMsgKanji9149Tex,
+    gMsgKanji914ATex,
+    gMsgKanji914BTex,
+    gMsgKanji914CTex,
+    gMsgKanji914DTex,
+    gMsgKanji914ETex,
+    gMsgKanji914FTex,
+    gMsgKanji9150Tex,
+    gMsgKanji9151Tex,
+    gMsgKanji9152Tex,
+    gMsgKanji9153Tex,
+    gMsgKanji9154Tex,
+    gMsgKanji9155Tex,
+    gMsgKanji9156Tex,
+    gMsgKanji9157Tex,
+    gMsgKanji9158Tex,
+    gMsgKanji9159Tex,
+    gMsgKanji915ATex,
+    gMsgKanji915BTex,
+    gMsgKanji915CTex,
+    gMsgKanji915DTex,
+    gMsgKanji915ETex,
+    gMsgKanji915FTex,
+    gMsgKanji9160Tex,
+    gMsgKanji9161Tex,
+    gMsgKanji9162Tex,
+    gMsgKanji9163Tex,
+    gMsgKanji9164Tex,
+    gMsgKanji9165Tex,
+    gMsgKanji9166Tex,
+    gMsgKanji9167Tex,
+    gMsgKanji9168Tex,
+    gMsgKanji9169Tex,
+    gMsgKanji916ATex,
+    gMsgKanji916BTex,
+    gMsgKanji916CTex,
+    gMsgKanji916DTex,
+    gMsgKanji916ETex,
+    gMsgKanji916FTex,
+    gMsgKanji9170Tex,
+    gMsgKanji9171Tex,
+    gMsgKanji9172Tex,
+    gMsgKanji9173Tex,
+    gMsgKanji9174Tex,
+    gMsgKanji9175Tex,
+    gMsgKanji9176Tex,
+    gMsgKanji9177Tex,
+    gMsgKanji9178Tex,
+    gMsgKanji9179Tex,
+    gMsgKanji917ATex,
+    gMsgKanji917BTex,
+    gMsgKanji917CTex,
+    gMsgKanji917DTex,
+    gMsgKanji917ETex,
+    gMsgKanji9180Tex,
+    gMsgKanji9181Tex,
+    gMsgKanji9182Tex,
+    gMsgKanji9183Tex,
+    gMsgKanji9184Tex,
+    gMsgKanji9185Tex,
+    gMsgKanji9186Tex,
+    gMsgKanji9187Tex,
+    gMsgKanji9188Tex,
+    gMsgKanji9189Tex,
+    gMsgKanji918ATex,
+    gMsgKanji918BTex,
+    gMsgKanji918CTex,
+    gMsgKanji918DTex,
+    gMsgKanji918ETex,
+    gMsgKanji918FTex,
+    gMsgKanji9190Tex,
+    gMsgKanji9191Tex,
+    gMsgKanji9192Tex,
+    gMsgKanji9193Tex,
+    gMsgKanji9194Tex,
+    gMsgKanji9195Tex,
+    gMsgKanji9196Tex,
+    gMsgKanji9197Tex,
+    gMsgKanji9198Tex,
+    gMsgKanji9199Tex,
+    gMsgKanji919ATex,
+    gMsgKanji919BTex,
+    gMsgKanji919CTex,
+    gMsgKanji919DTex,
+    gMsgKanji919ETex,
+    gMsgKanji919FTex,
+    gMsgKanji91A0Tex,
+    gMsgKanji91A1Tex,
+    gMsgKanji91A2Tex,
+    gMsgKanji91A3Tex,
+    gMsgKanji91A4Tex,
+    gMsgKanji91A5Tex,
+    gMsgKanji91A6Tex,
+    gMsgKanji91A7Tex,
+    gMsgKanji91A8Tex,
+    gMsgKanji91A9Tex,
+    gMsgKanji91AATex,
+    gMsgKanji91ABTex,
+    gMsgKanji91ACTex,
+    gMsgKanji91ADTex,
+    gMsgKanji91AETex,
+    gMsgKanji91AFTex,
+    gMsgKanji91B0Tex,
+    gMsgKanji91B1Tex,
+    gMsgKanji91B2Tex,
+    gMsgKanji91B3Tex,
+    gMsgKanji91B4Tex,
+    gMsgKanji91B5Tex,
+    gMsgKanji91B6Tex,
+    gMsgKanji91B7Tex,
+    gMsgKanji91B8Tex,
+    gMsgKanji91B9Tex,
+    gMsgKanji91BATex,
+    gMsgKanji91BBTex,
+    gMsgKanji91BCTex,
+    gMsgKanji91BDTex,
+    gMsgKanji91BETex,
+    gMsgKanji91BFTex,
+    gMsgKanji91C0Tex,
+    gMsgKanji91C1Tex,
+    gMsgKanji91C2Tex,
+    gMsgKanji91C3Tex,
+    gMsgKanji91C4Tex,
+    gMsgKanji91C5Tex,
+    gMsgKanji91C6Tex,
+    gMsgKanji91C7Tex,
+    gMsgKanji91C8Tex,
+    gMsgKanji91C9Tex,
+    gMsgKanji91CATex,
+    gMsgKanji91CBTex,
+    gMsgKanji91CCTex,
+    gMsgKanji91CDTex,
+    gMsgKanji91CETex,
+    gMsgKanji91CFTex,
+    gMsgKanji91D0Tex,
+    gMsgKanji91D1Tex,
+    gMsgKanji91D2Tex,
+    gMsgKanji91D3Tex,
+    gMsgKanji91D4Tex,
+    gMsgKanji91D5Tex,
+    gMsgKanji91D6Tex,
+    gMsgKanji91D7Tex,
+    gMsgKanji91D8Tex,
+    gMsgKanji91D9Tex,
+    gMsgKanji91DATex,
+    gMsgKanji91DBTex,
+    gMsgKanji91DCTex,
+    gMsgKanji91DDTex,
+    gMsgKanji91DETex,
+    gMsgKanji91DFTex,
+    gMsgKanji91E0Tex,
+    gMsgKanji91E1Tex,
+    gMsgKanji91E2Tex,
+    gMsgKanji91E3Tex,
+    gMsgKanji91E4Tex,
+    gMsgKanji91E5Tex,
+    gMsgKanji91E6Tex,
+    gMsgKanji91E7Tex,
+    gMsgKanji91E8Tex,
+    gMsgKanji91E9Tex,
+    gMsgKanji91EATex,
+    gMsgKanji91EBTex,
+    gMsgKanji91ECTex,
+    gMsgKanji91EDTex,
+    gMsgKanji91EETex,
+    gMsgKanji91EFTex,
+    gMsgKanji91F0Tex,
+    gMsgKanji91F1Tex,
+    gMsgKanji91F2Tex,
+    gMsgKanji91F3Tex,
+    gMsgKanji91F4Tex,
+    gMsgKanji91F5Tex,
+    gMsgKanji91F6Tex,
+    gMsgKanji91F7Tex,
+    gMsgKanji91F8Tex,
+    gMsgKanji91F9Tex,
+    gMsgKanji91FATex,
+    gMsgKanji91FBTex,
+    gMsgKanji91FCTex,
+    gMsgKanji9240Tex,
+    gMsgKanji9241Tex,
+    gMsgKanji9242Tex,
+    gMsgKanji9243Tex,
+    gMsgKanji9244Tex,
+    gMsgKanji9245Tex,
+    gMsgKanji9246Tex,
+    gMsgKanji9247Tex,
+    gMsgKanji9248Tex,
+    gMsgKanji9249Tex,
+    gMsgKanji924ATex,
+    gMsgKanji924BTex,
+    gMsgKanji924CTex,
+    gMsgKanji924DTex,
+    gMsgKanji924ETex,
+    gMsgKanji924FTex,
+    gMsgKanji9250Tex,
+    gMsgKanji9251Tex,
+    gMsgKanji9252Tex,
+    gMsgKanji9253Tex,
+    gMsgKanji9254Tex,
+    gMsgKanji9255Tex,
+    gMsgKanji9256Tex,
+    gMsgKanji9257Tex,
+    gMsgKanji9258Tex,
+    gMsgKanji9259Tex,
+    gMsgKanji925ATex,
+    gMsgKanji925BTex,
+    gMsgKanji925CTex,
+    gMsgKanji925DTex,
+    gMsgKanji925ETex,
+    gMsgKanji925FTex,
+    gMsgKanji9260Tex,
+    gMsgKanji9261Tex,
+    gMsgKanji9262Tex,
+    gMsgKanji9263Tex,
+    gMsgKanji9264Tex,
+    gMsgKanji9265Tex,
+    gMsgKanji9266Tex,
+    gMsgKanji9267Tex,
+    gMsgKanji9268Tex,
+    gMsgKanji9269Tex,
+    gMsgKanji926ATex,
+    gMsgKanji926BTex,
+    gMsgKanji926CTex,
+    gMsgKanji926DTex,
+    gMsgKanji926ETex,
+    gMsgKanji926FTex,
+    gMsgKanji9270Tex,
+    gMsgKanji9271Tex,
+    gMsgKanji9272Tex,
+    gMsgKanji9273Tex,
+    gMsgKanji9274Tex,
+    gMsgKanji9275Tex,
+    gMsgKanji9276Tex,
+    gMsgKanji9277Tex,
+    gMsgKanji9278Tex,
+    gMsgKanji9279Tex,
+    gMsgKanji927ATex,
+    gMsgKanji927BTex,
+    gMsgKanji927CTex,
+    gMsgKanji927DTex,
+    gMsgKanji927ETex,
+    gMsgKanji9280Tex,
+    gMsgKanji9281Tex,
+    gMsgKanji9282Tex,
+    gMsgKanji9283Tex,
+    gMsgKanji9284Tex,
+    gMsgKanji9285Tex,
+    gMsgKanji9286Tex,
+    gMsgKanji9287Tex,
+    gMsgKanji9288Tex,
+    gMsgKanji9289Tex,
+    gMsgKanji928ATex,
+    gMsgKanji928BTex,
+    gMsgKanji928CTex,
+    gMsgKanji928DTex,
+    gMsgKanji928ETex,
+    gMsgKanji928FTex,
+    gMsgKanji9290Tex,
+    gMsgKanji9291Tex,
+    gMsgKanji9292Tex,
+    gMsgKanji9293Tex,
+    gMsgKanji9294Tex,
+    gMsgKanji9295Tex,
+    gMsgKanji9296Tex,
+    gMsgKanji9297Tex,
+    gMsgKanji9298Tex,
+    gMsgKanji9299Tex,
+    gMsgKanji929ATex,
+    gMsgKanji929BTex,
+    gMsgKanji929CTex,
+    gMsgKanji929DTex,
+    gMsgKanji929ETex,
+    gMsgKanji929FTex,
+    gMsgKanji92A0Tex,
+    gMsgKanji92A1Tex,
+    gMsgKanji92A2Tex,
+    gMsgKanji92A3Tex,
+    gMsgKanji92A4Tex,
+    gMsgKanji92A5Tex,
+    gMsgKanji92A6Tex,
+    gMsgKanji92A7Tex,
+    gMsgKanji92A8Tex,
+    gMsgKanji92A9Tex,
+    gMsgKanji92AATex,
+    gMsgKanji92ABTex,
+    gMsgKanji92ACTex,
+    gMsgKanji92ADTex,
+    gMsgKanji92AETex,
+    gMsgKanji92AFTex,
+    gMsgKanji92B0Tex,
+    gMsgKanji92B1Tex,
+    gMsgKanji92B2Tex,
+    gMsgKanji92B3Tex,
+    gMsgKanji92B4Tex,
+    gMsgKanji92B5Tex,
+    gMsgKanji92B6Tex,
+    gMsgKanji92B7Tex,
+    gMsgKanji92B8Tex,
+    gMsgKanji92B9Tex,
+    gMsgKanji92BATex,
+    gMsgKanji92BBTex,
+    gMsgKanji92BCTex,
+    gMsgKanji92BDTex,
+    gMsgKanji92BETex,
+    gMsgKanji92BFTex,
+    gMsgKanji92C0Tex,
+    gMsgKanji92C1Tex,
+    gMsgKanji92C2Tex,
+    gMsgKanji92C3Tex,
+    gMsgKanji92C4Tex,
+    gMsgKanji92C5Tex,
+    gMsgKanji92C6Tex,
+    gMsgKanji92C7Tex,
+    gMsgKanji92C8Tex,
+    gMsgKanji92C9Tex,
+    gMsgKanji92CATex,
+    gMsgKanji92CBTex,
+    gMsgKanji92CCTex,
+    gMsgKanji92CDTex,
+    gMsgKanji92CETex,
+    gMsgKanji92CFTex,
+    gMsgKanji92D0Tex,
+    gMsgKanji92D1Tex,
+    gMsgKanji92D2Tex,
+    gMsgKanji92D3Tex,
+    gMsgKanji92D4Tex,
+    gMsgKanji92D5Tex,
+    gMsgKanji92D6Tex,
+    gMsgKanji92D7Tex,
+    gMsgKanji92D8Tex,
+    gMsgKanji92D9Tex,
+    gMsgKanji92DATex,
+    gMsgKanji92DBTex,
+    gMsgKanji92DCTex,
+    gMsgKanji92DDTex,
+    gMsgKanji92DETex,
+    gMsgKanji92DFTex,
+    gMsgKanji92E0Tex,
+    gMsgKanji92E1Tex,
+    gMsgKanji92E2Tex,
+    gMsgKanji92E3Tex,
+    gMsgKanji92E4Tex,
+    gMsgKanji92E5Tex,
+    gMsgKanji92E6Tex,
+    gMsgKanji92E7Tex,
+    gMsgKanji92E8Tex,
+    gMsgKanji92E9Tex,
+    gMsgKanji92EATex,
+    gMsgKanji92EBTex,
+    gMsgKanji92ECTex,
+    gMsgKanji92EDTex,
+    gMsgKanji92EETex,
+    gMsgKanji92EFTex,
+    gMsgKanji92F0Tex,
+    gMsgKanji92F1Tex,
+    gMsgKanji92F2Tex,
+    gMsgKanji92F3Tex,
+    gMsgKanji92F4Tex,
+    gMsgKanji92F5Tex,
+    gMsgKanji92F6Tex,
+    gMsgKanji92F7Tex,
+    gMsgKanji92F8Tex,
+    gMsgKanji92F9Tex,
+    gMsgKanji92FATex,
+    gMsgKanji92FBTex,
+    gMsgKanji92FCTex,
+    gMsgKanji9340Tex,
+    gMsgKanji9341Tex,
+    gMsgKanji9342Tex,
+    gMsgKanji9343Tex,
+    gMsgKanji9344Tex,
+    gMsgKanji9345Tex,
+    gMsgKanji9346Tex,
+    gMsgKanji9347Tex,
+    gMsgKanji9348Tex,
+    gMsgKanji9349Tex,
+    gMsgKanji934ATex,
+    gMsgKanji934BTex,
+    gMsgKanji934CTex,
+    gMsgKanji934DTex,
+    gMsgKanji934ETex,
+    gMsgKanji934FTex,
+    gMsgKanji9350Tex,
+    gMsgKanji9351Tex,
+    gMsgKanji9352Tex,
+    gMsgKanji9353Tex,
+    gMsgKanji9354Tex,
+    gMsgKanji9355Tex,
+    gMsgKanji9356Tex,
+    gMsgKanji9357Tex,
+    gMsgKanji9358Tex,
+    gMsgKanji9359Tex,
+    gMsgKanji935ATex,
+    gMsgKanji935BTex,
+    gMsgKanji935CTex,
+    gMsgKanji935DTex,
+    gMsgKanji935ETex,
+    gMsgKanji935FTex,
+    gMsgKanji9360Tex,
+    gMsgKanji9361Tex,
+    gMsgKanji9362Tex,
+    gMsgKanji9363Tex,
+    gMsgKanji9364Tex,
+    gMsgKanji9365Tex,
+    gMsgKanji9366Tex,
+    gMsgKanji9367Tex,
+    gMsgKanji9368Tex,
+    gMsgKanji9369Tex,
+    gMsgKanji936ATex,
+    gMsgKanji936BTex,
+    gMsgKanji936CTex,
+    gMsgKanji936DTex,
+    gMsgKanji936ETex,
+    gMsgKanji936FTex,
+    gMsgKanji9370Tex,
+    gMsgKanji9371Tex,
+    gMsgKanji9372Tex,
+    gMsgKanji9373Tex,
+    gMsgKanji9374Tex,
+    gMsgKanji9375Tex,
+    gMsgKanji9376Tex,
+    gMsgKanji9377Tex,
+    gMsgKanji9378Tex,
+    gMsgKanji9379Tex,
+    gMsgKanji937ATex,
+    gMsgKanji937BTex,
+    gMsgKanji937CTex,
+    gMsgKanji937DTex,
+    gMsgKanji937ETex,
+    gMsgKanji9380Tex,
+    gMsgKanji9381Tex,
+    gMsgKanji9382Tex,
+    gMsgKanji9383Tex,
+    gMsgKanji9384Tex,
+    gMsgKanji9385Tex,
+    gMsgKanji9386Tex,
+    gMsgKanji9387Tex,
+    gMsgKanji9388Tex,
+    gMsgKanji9389Tex,
+    gMsgKanji938ATex,
+    gMsgKanji938BTex,
+    gMsgKanji938CTex,
+    gMsgKanji938DTex,
+    gMsgKanji938ETex,
+    gMsgKanji938FTex,
+    gMsgKanji9390Tex,
+    gMsgKanji9391Tex,
+    gMsgKanji9392Tex,
+    gMsgKanji9393Tex,
+    gMsgKanji9394Tex,
+    gMsgKanji9395Tex,
+    gMsgKanji9396Tex,
+    gMsgKanji9397Tex,
+    gMsgKanji9398Tex,
+    gMsgKanji9399Tex,
+    gMsgKanji939ATex,
+    gMsgKanji939BTex,
+    gMsgKanji939CTex,
+    gMsgKanji939DTex,
+    gMsgKanji939ETex,
+    gMsgKanji939FTex,
+    gMsgKanji93A0Tex,
+    gMsgKanji93A1Tex,
+    gMsgKanji93A2Tex,
+    gMsgKanji93A3Tex,
+    gMsgKanji93A4Tex,
+    gMsgKanji93A5Tex,
+    gMsgKanji93A6Tex,
+    gMsgKanji93A7Tex,
+    gMsgKanji93A8Tex,
+    gMsgKanji93A9Tex,
+    gMsgKanji93AATex,
+    gMsgKanji93ABTex,
+    gMsgKanji93ACTex,
+    gMsgKanji93ADTex,
+    gMsgKanji93AETex,
+    gMsgKanji93AFTex,
+    gMsgKanji93B0Tex,
+    gMsgKanji93B1Tex,
+    gMsgKanji93B2Tex,
+    gMsgKanji93B3Tex,
+    gMsgKanji93B4Tex,
+    gMsgKanji93B5Tex,
+    gMsgKanji93B6Tex,
+    gMsgKanji93B7Tex,
+    gMsgKanji93B8Tex,
+    gMsgKanji93B9Tex,
+    gMsgKanji93BATex,
+    gMsgKanji93BBTex,
+    gMsgKanji93BCTex,
+    gMsgKanji93BDTex,
+    gMsgKanji93BETex,
+    gMsgKanji93BFTex,
+    gMsgKanji93C0Tex,
+    gMsgKanji93C1Tex,
+    gMsgKanji93C2Tex,
+    gMsgKanji93C3Tex,
+    gMsgKanji93C4Tex,
+    gMsgKanji93C5Tex,
+    gMsgKanji93C6Tex,
+    gMsgKanji93C7Tex,
+    gMsgKanji93C8Tex,
+    gMsgKanji93C9Tex,
+    gMsgKanji93CATex,
+    gMsgKanji93CBTex,
+    gMsgKanji93CCTex,
+    gMsgKanji93CDTex,
+    gMsgKanji93CETex,
+    gMsgKanji93CFTex,
+    gMsgKanji93D0Tex,
+    gMsgKanji93D1Tex,
+    gMsgKanji93D2Tex,
+    gMsgKanji93D3Tex,
+    gMsgKanji93D4Tex,
+    gMsgKanji93D5Tex,
+    gMsgKanji93D6Tex,
+    gMsgKanji93D7Tex,
+    gMsgKanji93D8Tex,
+    gMsgKanji93D9Tex,
+    gMsgKanji93DATex,
+    gMsgKanji93DBTex,
+    gMsgKanji93DCTex,
+    gMsgKanji93DDTex,
+    gMsgKanji93DETex,
+    gMsgKanji93DFTex,
+    gMsgKanji93E0Tex,
+    gMsgKanji93E1Tex,
+    gMsgKanji93E2Tex,
+    gMsgKanji93E3Tex,
+    gMsgKanji93E4Tex,
+    gMsgKanji93E5Tex,
+    gMsgKanji93E6Tex,
+    gMsgKanji93E7Tex,
+    gMsgKanji93E8Tex,
+    gMsgKanji93E9Tex,
+    gMsgKanji93EATex,
+    gMsgKanji93EBTex,
+    gMsgKanji93ECTex,
+    gMsgKanji93EDTex,
+    gMsgKanji93EETex,
+    gMsgKanji93EFTex,
+    gMsgKanji93F0Tex,
+    gMsgKanji93F1Tex,
+    gMsgKanji93F2Tex,
+    gMsgKanji93F3Tex,
+    gMsgKanji93F4Tex,
+    gMsgKanji93F5Tex,
+    gMsgKanji93F6Tex,
+    gMsgKanji93F7Tex,
+    gMsgKanji93F8Tex,
+    gMsgKanji93F9Tex,
+    gMsgKanji93FATex,
+    gMsgKanji93FBTex,
+    gMsgKanji93FCTex,
+    gMsgKanji9440Tex,
+    gMsgKanji9441Tex,
+    gMsgKanji9442Tex,
+    gMsgKanji9443Tex,
+    gMsgKanji9444Tex,
+    gMsgKanji9445Tex,
+    gMsgKanji9446Tex,
+    gMsgKanji9447Tex,
+    gMsgKanji9448Tex,
+    gMsgKanji9449Tex,
+    gMsgKanji944ATex,
+    gMsgKanji944BTex,
+    gMsgKanji944CTex,
+    gMsgKanji944DTex,
+    gMsgKanji944ETex,
+    gMsgKanji944FTex,
+    gMsgKanji9450Tex,
+    gMsgKanji9451Tex,
+    gMsgKanji9452Tex,
+    gMsgKanji9453Tex,
+    gMsgKanji9454Tex,
+    gMsgKanji9455Tex,
+    gMsgKanji9456Tex,
+    gMsgKanji9457Tex,
+    gMsgKanji9458Tex,
+    gMsgKanji9459Tex,
+    gMsgKanji945ATex,
+    gMsgKanji945BTex,
+    gMsgKanji945CTex,
+    gMsgKanji945DTex,
+    gMsgKanji945ETex,
+    gMsgKanji945FTex,
+    gMsgKanji9460Tex,
+    gMsgKanji9461Tex,
+    gMsgKanji9462Tex,
+    gMsgKanji9463Tex,
+    gMsgKanji9464Tex,
+    gMsgKanji9465Tex,
+    gMsgKanji9466Tex,
+    gMsgKanji9467Tex,
+    gMsgKanji9468Tex,
+    gMsgKanji9469Tex,
+    gMsgKanji946ATex,
+    gMsgKanji946BTex,
+    gMsgKanji946CTex,
+    gMsgKanji946DTex,
+    gMsgKanji946ETex,
+    gMsgKanji946FTex,
+    gMsgKanji9470Tex,
+    gMsgKanji9471Tex,
+    gMsgKanji9472Tex,
+    gMsgKanji9473Tex,
+    gMsgKanji9474Tex,
+    gMsgKanji9475Tex,
+    gMsgKanji9476Tex,
+    gMsgKanji9477Tex,
+    gMsgKanji9478Tex,
+    gMsgKanji9479Tex,
+    gMsgKanji947ATex,
+    gMsgKanji947BTex,
+    gMsgKanji947CTex,
+    gMsgKanji947DTex,
+    gMsgKanji947ETex,
+    gMsgKanji9480Tex,
+    gMsgKanji9481Tex,
+    gMsgKanji9482Tex,
+    gMsgKanji9483Tex,
+    gMsgKanji9484Tex,
+    gMsgKanji9485Tex,
+    gMsgKanji9486Tex,
+    gMsgKanji9487Tex,
+    gMsgKanji9488Tex,
+    gMsgKanji9489Tex,
+    gMsgKanji948ATex,
+    gMsgKanji948BTex,
+    gMsgKanji948CTex,
+    gMsgKanji948DTex,
+    gMsgKanji948ETex,
+    gMsgKanji948FTex,
+    gMsgKanji9490Tex,
+    gMsgKanji9491Tex,
+    gMsgKanji9492Tex,
+    gMsgKanji9493Tex,
+    gMsgKanji9494Tex,
+    gMsgKanji9495Tex,
+    gMsgKanji9496Tex,
+    gMsgKanji9497Tex,
+    gMsgKanji9498Tex,
+    gMsgKanji9499Tex,
+    gMsgKanji949ATex,
+    gMsgKanji949BTex,
+    gMsgKanji949CTex,
+    gMsgKanji949DTex,
+    gMsgKanji949ETex,
+    gMsgKanji949FTex,
+    gMsgKanji94A0Tex,
+    gMsgKanji94A1Tex,
+    gMsgKanji94A2Tex,
+    gMsgKanji94A3Tex,
+    gMsgKanji94A4Tex,
+    gMsgKanji94A5Tex,
+    gMsgKanji94A6Tex,
+    gMsgKanji94A7Tex,
+    gMsgKanji94A8Tex,
+    gMsgKanji94A9Tex,
+    gMsgKanji94AATex,
+    gMsgKanji94ABTex,
+    gMsgKanji94ACTex,
+    gMsgKanji94ADTex,
+    gMsgKanji94AETex,
+    gMsgKanji94AFTex,
+    gMsgKanji94B0Tex,
+    gMsgKanji94B1Tex,
+    gMsgKanji94B2Tex,
+    gMsgKanji94B3Tex,
+    gMsgKanji94B4Tex,
+    gMsgKanji94B5Tex,
+    gMsgKanji94B6Tex,
+    gMsgKanji94B7Tex,
+    gMsgKanji94B8Tex,
+    gMsgKanji94B9Tex,
+    gMsgKanji94BATex,
+    gMsgKanji94BBTex,
+    gMsgKanji94BCTex,
+    gMsgKanji94BDTex,
+    gMsgKanji94BETex,
+    gMsgKanji94BFTex,
+    gMsgKanji94C0Tex,
+    gMsgKanji94C1Tex,
+    gMsgKanji94C2Tex,
+    gMsgKanji94C3Tex,
+    gMsgKanji94C4Tex,
+    gMsgKanji94C5Tex,
+    gMsgKanji94C6Tex,
+    gMsgKanji94C7Tex,
+    gMsgKanji94C8Tex,
+    gMsgKanji94C9Tex,
+    gMsgKanji94CATex,
+    gMsgKanji94CBTex,
+    gMsgKanji94CCTex,
+    gMsgKanji94CDTex,
+    gMsgKanji94CETex,
+    gMsgKanji94CFTex,
+    gMsgKanji94D0Tex,
+    gMsgKanji94D1Tex,
+    gMsgKanji94D2Tex,
+    gMsgKanji94D3Tex,
+    gMsgKanji94D4Tex,
+    gMsgKanji94D5Tex,
+    gMsgKanji94D6Tex,
+    gMsgKanji94D7Tex,
+    gMsgKanji94D8Tex,
+    gMsgKanji94D9Tex,
+    gMsgKanji94DATex,
+    gMsgKanji94DBTex,
+    gMsgKanji94DCTex,
+    gMsgKanji94DDTex,
+    gMsgKanji94DETex,
+    gMsgKanji94DFTex,
+    gMsgKanji94E0Tex,
+    gMsgKanji94E1Tex,
+    gMsgKanji94E2Tex,
+    gMsgKanji94E3Tex,
+    gMsgKanji94E4Tex,
+    gMsgKanji94E5Tex,
+    gMsgKanji94E6Tex,
+    gMsgKanji94E7Tex,
+    gMsgKanji94E8Tex,
+    gMsgKanji94E9Tex,
+    gMsgKanji94EATex,
+    gMsgKanji94EBTex,
+    gMsgKanji94ECTex,
+    gMsgKanji94EDTex,
+    gMsgKanji94EETex,
+    gMsgKanji94EFTex,
+    gMsgKanji94F0Tex,
+    gMsgKanji94F1Tex,
+    gMsgKanji94F2Tex,
+    gMsgKanji94F3Tex,
+    gMsgKanji94F4Tex,
+    gMsgKanji94F5Tex,
+    gMsgKanji94F6Tex,
+    gMsgKanji94F7Tex,
+    gMsgKanji94F8Tex,
+    gMsgKanji94F9Tex,
+    gMsgKanji94FATex,
+    gMsgKanji94FBTex,
+    gMsgKanji94FCTex,
+    gMsgKanji9540Tex,
+    gMsgKanji9541Tex,
+    gMsgKanji9542Tex,
+    gMsgKanji9543Tex,
+    gMsgKanji9544Tex,
+    gMsgKanji9545Tex,
+    gMsgKanji9546Tex,
+    gMsgKanji9547Tex,
+    gMsgKanji9548Tex,
+    gMsgKanji9549Tex,
+    gMsgKanji954ATex,
+    gMsgKanji954BTex,
+    gMsgKanji954CTex,
+    gMsgKanji954DTex,
+    gMsgKanji954ETex,
+    gMsgKanji954FTex,
+    gMsgKanji9550Tex,
+    gMsgKanji9551Tex,
+    gMsgKanji9552Tex,
+    gMsgKanji9553Tex,
+    gMsgKanji9554Tex,
+    gMsgKanji9555Tex,
+    gMsgKanji9556Tex,
+    gMsgKanji9557Tex,
+    gMsgKanji9558Tex,
+    gMsgKanji9559Tex,
+    gMsgKanji955ATex,
+    gMsgKanji955BTex,
+    gMsgKanji955CTex,
+    gMsgKanji955DTex,
+    gMsgKanji955ETex,
+    gMsgKanji955FTex,
+    gMsgKanji9560Tex,
+    gMsgKanji9561Tex,
+    gMsgKanji9562Tex,
+    gMsgKanji9563Tex,
+    gMsgKanji9564Tex,
+    gMsgKanji9565Tex,
+    gMsgKanji9566Tex,
+    gMsgKanji9567Tex,
+    gMsgKanji9568Tex,
+    gMsgKanji9569Tex,
+    gMsgKanji956ATex,
+    gMsgKanji956BTex,
+    gMsgKanji956CTex,
+    gMsgKanji956DTex,
+    gMsgKanji956ETex,
+    gMsgKanji956FTex,
+    gMsgKanji9570Tex,
+    gMsgKanji9571Tex,
+    gMsgKanji9572Tex,
+    gMsgKanji9573Tex,
+    gMsgKanji9574Tex,
+    gMsgKanji9575Tex,
+    gMsgKanji9576Tex,
+    gMsgKanji9577Tex,
+    gMsgKanji9578Tex,
+    gMsgKanji9579Tex,
+    gMsgKanji957ATex,
+    gMsgKanji957BTex,
+    gMsgKanji957CTex,
+    gMsgKanji957DTex,
+    gMsgKanji957ETex,
+    gMsgKanji9580Tex,
+    gMsgKanji9581Tex,
+    gMsgKanji9582Tex,
+    gMsgKanji9583Tex,
+    gMsgKanji9584Tex,
+    gMsgKanji9585Tex,
+    gMsgKanji9586Tex,
+    gMsgKanji9587Tex,
+    gMsgKanji9588Tex,
+    gMsgKanji9589Tex,
+    gMsgKanji958ATex,
+    gMsgKanji958BTex,
+    gMsgKanji958CTex,
+    gMsgKanji958DTex,
+    gMsgKanji958ETex,
+    gMsgKanji958FTex,
+    gMsgKanji9590Tex,
+    gMsgKanji9591Tex,
+    gMsgKanji9592Tex,
+    gMsgKanji9593Tex,
+    gMsgKanji9594Tex,
+    gMsgKanji9595Tex,
+    gMsgKanji9596Tex,
+    gMsgKanji9597Tex,
+    gMsgKanji9598Tex,
+    gMsgKanji9599Tex,
+    gMsgKanji959ATex,
+    gMsgKanji959BTex,
+    gMsgKanji959CTex,
+    gMsgKanji959DTex,
+    gMsgKanji959ETex,
+    gMsgKanji959FTex,
+    gMsgKanji95A0Tex,
+    gMsgKanji95A1Tex,
+    gMsgKanji95A2Tex,
+    gMsgKanji95A3Tex,
+    gMsgKanji95A4Tex,
+    gMsgKanji95A5Tex,
+    gMsgKanji95A6Tex,
+    gMsgKanji95A7Tex,
+    gMsgKanji95A8Tex,
+    gMsgKanji95A9Tex,
+    gMsgKanji95AATex,
+    gMsgKanji95ABTex,
+    gMsgKanji95ACTex,
+    gMsgKanji95ADTex,
+    gMsgKanji95AETex,
+    gMsgKanji95AFTex,
+    gMsgKanji95B0Tex,
+    gMsgKanji95B1Tex,
+    gMsgKanji95B2Tex,
+    gMsgKanji95B3Tex,
+    gMsgKanji95B4Tex,
+    gMsgKanji95B5Tex,
+    gMsgKanji95B6Tex,
+    gMsgKanji95B7Tex,
+    gMsgKanji95B8Tex,
+    gMsgKanji95B9Tex,
+    gMsgKanji95BATex,
+    gMsgKanji95BBTex,
+    gMsgKanji95BCTex,
+    gMsgKanji95BDTex,
+    gMsgKanji95BETex,
+    gMsgKanji95BFTex,
+    gMsgKanji95C0Tex,
+    gMsgKanji95C1Tex,
+    gMsgKanji95C2Tex,
+    gMsgKanji95C3Tex,
+    gMsgKanji95C4Tex,
+    gMsgKanji95C5Tex,
+    gMsgKanji95C6Tex,
+    gMsgKanji95C7Tex,
+    gMsgKanji95C8Tex,
+    gMsgKanji95C9Tex,
+    gMsgKanji95CATex,
+    gMsgKanji95CBTex,
+    gMsgKanji95CCTex,
+    gMsgKanji95CDTex,
+    gMsgKanji95CETex,
+    gMsgKanji95CFTex,
+    gMsgKanji95D0Tex,
+    gMsgKanji95D1Tex,
+    gMsgKanji95D2Tex,
+    gMsgKanji95D3Tex,
+    gMsgKanji95D4Tex,
+    gMsgKanji95D5Tex,
+    gMsgKanji95D6Tex,
+    gMsgKanji95D7Tex,
+    gMsgKanji95D8Tex,
+    gMsgKanji95D9Tex,
+    gMsgKanji95DATex,
+    gMsgKanji95DBTex,
+    gMsgKanji95DCTex,
+    gMsgKanji95DDTex,
+    gMsgKanji95DETex,
+    gMsgKanji95DFTex,
+    gMsgKanji95E0Tex,
+    gMsgKanji95E1Tex,
+    gMsgKanji95E2Tex,
+    gMsgKanji95E3Tex,
+    gMsgKanji95E4Tex,
+    gMsgKanji95E5Tex,
+    gMsgKanji95E6Tex,
+    gMsgKanji95E7Tex,
+    gMsgKanji95E8Tex,
+    gMsgKanji95E9Tex,
+    gMsgKanji95EATex,
+    gMsgKanji95EBTex,
+    gMsgKanji95ECTex,
+    gMsgKanji95EDTex,
+    gMsgKanji95EETex,
+    gMsgKanji95EFTex,
+    gMsgKanji95F0Tex,
+    gMsgKanji95F1Tex,
+    gMsgKanji95F2Tex,
+    gMsgKanji95F3Tex,
+    gMsgKanji95F4Tex,
+    gMsgKanji95F5Tex,
+    gMsgKanji95F6Tex,
+    gMsgKanji95F7Tex,
+    gMsgKanji95F8Tex,
+    gMsgKanji95F9Tex,
+    gMsgKanji95FATex,
+    gMsgKanji95FBTex,
+    gMsgKanji95FCTex,
+    gMsgKanji9640Tex,
+    gMsgKanji9641Tex,
+    gMsgKanji9642Tex,
+    gMsgKanji9643Tex,
+    gMsgKanji9644Tex,
+    gMsgKanji9645Tex,
+    gMsgKanji9646Tex,
+    gMsgKanji9647Tex,
+    gMsgKanji9648Tex,
+    gMsgKanji9649Tex,
+    gMsgKanji964ATex,
+    gMsgKanji964BTex,
+    gMsgKanji964CTex,
+    gMsgKanji964DTex,
+    gMsgKanji964ETex,
+    gMsgKanji964FTex,
+    gMsgKanji9650Tex,
+    gMsgKanji9651Tex,
+    gMsgKanji9652Tex,
+    gMsgKanji9653Tex,
+    gMsgKanji9654Tex,
+    gMsgKanji9655Tex,
+    gMsgKanji9656Tex,
+    gMsgKanji9657Tex,
+    gMsgKanji9658Tex,
+    gMsgKanji9659Tex,
+    gMsgKanji965ATex,
+    gMsgKanji965BTex,
+    gMsgKanji965CTex,
+    gMsgKanji965DTex,
+    gMsgKanji965ETex,
+    gMsgKanji965FTex,
+    gMsgKanji9660Tex,
+    gMsgKanji9661Tex,
+    gMsgKanji9662Tex,
+    gMsgKanji9663Tex,
+    gMsgKanji9664Tex,
+    gMsgKanji9665Tex,
+    gMsgKanji9666Tex,
+    gMsgKanji9667Tex,
+    gMsgKanji9668Tex,
+    gMsgKanji9669Tex,
+    gMsgKanji966ATex,
+    gMsgKanji966BTex,
+    gMsgKanji966CTex,
+    gMsgKanji966DTex,
+    gMsgKanji966ETex,
+    gMsgKanji966FTex,
+    gMsgKanji9670Tex,
+    gMsgKanji9671Tex,
+    gMsgKanji9672Tex,
+    gMsgKanji9673Tex,
+    gMsgKanji9674Tex,
+    gMsgKanji9675Tex,
+    gMsgKanji9676Tex,
+    gMsgKanji9677Tex,
+    gMsgKanji9678Tex,
+    gMsgKanji9679Tex,
+    gMsgKanji967ATex,
+    gMsgKanji967BTex,
+    gMsgKanji967CTex,
+    gMsgKanji967DTex,
+    gMsgKanji967ETex,
+    gMsgKanji9680Tex,
+    gMsgKanji9681Tex,
+    gMsgKanji9682Tex,
+    gMsgKanji9683Tex,
+    gMsgKanji9684Tex,
+    gMsgKanji9685Tex,
+    gMsgKanji9686Tex,
+    gMsgKanji9687Tex,
+    gMsgKanji9688Tex,
+    gMsgKanji9689Tex,
+    gMsgKanji968ATex,
+    gMsgKanji968BTex,
+    gMsgKanji968CTex,
+    gMsgKanji968DTex,
+    gMsgKanji968ETex,
+    gMsgKanji968FTex,
+    gMsgKanji9690Tex,
+    gMsgKanji9691Tex,
+    gMsgKanji9692Tex,
+    gMsgKanji9693Tex,
+    gMsgKanji9694Tex,
+    gMsgKanji9695Tex,
+    gMsgKanji9696Tex,
+    gMsgKanji9697Tex,
+    gMsgKanji9698Tex,
+    gMsgKanji9699Tex,
+    gMsgKanji969ATex,
+    gMsgKanji969BTex,
+    gMsgKanji969CTex,
+    gMsgKanji969DTex,
+    gMsgKanji969ETex,
+    gMsgKanji969FTex,
+    gMsgKanji96A0Tex,
+    gMsgKanji96A1Tex,
+    gMsgKanji96A2Tex,
+    gMsgKanji96A3Tex,
+    gMsgKanji96A4Tex,
+    gMsgKanji96A5Tex,
+    gMsgKanji96A6Tex,
+    gMsgKanji96A7Tex,
+    gMsgKanji96A8Tex,
+    gMsgKanji96A9Tex,
+    gMsgKanji96AATex,
+    gMsgKanji96ABTex,
+    gMsgKanji96ACTex,
+    gMsgKanji96ADTex,
+    gMsgKanji96AETex,
+    gMsgKanji96AFTex,
+    gMsgKanji96B0Tex,
+    gMsgKanji96B1Tex,
+    gMsgKanji96B2Tex,
+    gMsgKanji96B3Tex,
+    gMsgKanji96B4Tex,
+    gMsgKanji96B5Tex,
+    gMsgKanji96B6Tex,
+    gMsgKanji96B7Tex,
+    gMsgKanji96B8Tex,
+    gMsgKanji96B9Tex,
+    gMsgKanji96BATex,
+    gMsgKanji96BBTex,
+    gMsgKanji96BCTex,
+    gMsgKanji96BDTex,
+    gMsgKanji96BETex,
+    gMsgKanji96BFTex,
+    gMsgKanji96C0Tex,
+    gMsgKanji96C1Tex,
+    gMsgKanji96C2Tex,
+    gMsgKanji96C3Tex,
+    gMsgKanji96C4Tex,
+    gMsgKanji96C5Tex,
+    gMsgKanji96C6Tex,
+    gMsgKanji96C7Tex,
+    gMsgKanji96C8Tex,
+    gMsgKanji96C9Tex,
+    gMsgKanji96CATex,
+    gMsgKanji96CBTex,
+    gMsgKanji96CCTex,
+    gMsgKanji96CDTex,
+    gMsgKanji96CETex,
+    gMsgKanji96CFTex,
+    gMsgKanji96D0Tex,
+    gMsgKanji96D1Tex,
+    gMsgKanji96D2Tex,
+    gMsgKanji96D3Tex,
+    gMsgKanji96D4Tex,
+    gMsgKanji96D5Tex,
+    gMsgKanji96D6Tex,
+    gMsgKanji96D7Tex,
+    gMsgKanji96D8Tex,
+    gMsgKanji96D9Tex,
+    gMsgKanji96DATex,
+    gMsgKanji96DBTex,
+    gMsgKanji96DCTex,
+    gMsgKanji96DDTex,
+    gMsgKanji96DETex,
+    gMsgKanji96DFTex,
+    gMsgKanji96E0Tex,
+    gMsgKanji96E1Tex,
+    gMsgKanji96E2Tex,
+    gMsgKanji96E3Tex,
+    gMsgKanji96E4Tex,
+    gMsgKanji96E5Tex,
+    gMsgKanji96E6Tex,
+    gMsgKanji96E7Tex,
+    gMsgKanji96E8Tex,
+    gMsgKanji96E9Tex,
+    gMsgKanji96EATex,
+    gMsgKanji96EBTex,
+    gMsgKanji96ECTex,
+    gMsgKanji96EDTex,
+    gMsgKanji96EETex,
+    gMsgKanji96EFTex,
+    gMsgKanji96F0Tex,
+    gMsgKanji96F1Tex,
+    gMsgKanji96F2Tex,
+    gMsgKanji96F3Tex,
+    gMsgKanji96F4Tex,
+    gMsgKanji96F5Tex,
+    gMsgKanji96F6Tex,
+    gMsgKanji96F7Tex,
+    gMsgKanji96F8Tex,
+    gMsgKanji96F9Tex,
+    gMsgKanji96FATex,
+    gMsgKanji96FBTex,
+    gMsgKanji96FCTex,
+    gMsgKanji9740Tex,
+    gMsgKanji9741Tex,
+    gMsgKanji9742Tex,
+    gMsgKanji9743Tex,
+    gMsgKanji9744Tex,
+    gMsgKanji9745Tex,
+    gMsgKanji9746Tex,
+    gMsgKanji9747Tex,
+    gMsgKanji9748Tex,
+    gMsgKanji9749Tex,
+    gMsgKanji974ATex,
+    gMsgKanji974BTex,
+    gMsgKanji974CTex,
+    gMsgKanji974DTex,
+    gMsgKanji974ETex,
+    gMsgKanji974FTex,
+    gMsgKanji9750Tex,
+    gMsgKanji9751Tex,
+    gMsgKanji9752Tex,
+    gMsgKanji9753Tex,
+    gMsgKanji9754Tex,
+    gMsgKanji9755Tex,
+    gMsgKanji9756Tex,
+    gMsgKanji9757Tex,
+    gMsgKanji9758Tex,
+    gMsgKanji9759Tex,
+    gMsgKanji975ATex,
+    gMsgKanji975BTex,
+    gMsgKanji975CTex,
+    gMsgKanji975DTex,
+    gMsgKanji975ETex,
+    gMsgKanji975FTex,
+    gMsgKanji9760Tex,
+    gMsgKanji9761Tex,
+    gMsgKanji9762Tex,
+    gMsgKanji9763Tex,
+    gMsgKanji9764Tex,
+    gMsgKanji9765Tex,
+    gMsgKanji9766Tex,
+    gMsgKanji9767Tex,
+    gMsgKanji9768Tex,
+    gMsgKanji9769Tex,
+    gMsgKanji976ATex,
+    gMsgKanji976BTex,
+    gMsgKanji976CTex,
+    gMsgKanji976DTex,
+    gMsgKanji976ETex,
+    gMsgKanji976FTex,
+    gMsgKanji9770Tex,
+    gMsgKanji9771Tex,
+    gMsgKanji9772Tex,
+    gMsgKanji9773Tex,
+    gMsgKanji9774Tex,
+    gMsgKanji9775Tex,
+    gMsgKanji9776Tex,
+    gMsgKanji9777Tex,
+    gMsgKanji9778Tex,
+    gMsgKanji9779Tex,
+    gMsgKanji977ATex,
+    gMsgKanji977BTex,
+    gMsgKanji977CTex,
+    gMsgKanji977DTex,
+    gMsgKanji977ETex,
+    gMsgKanji9780Tex,
+    gMsgKanji9781Tex,
+    gMsgKanji9782Tex,
+    gMsgKanji9783Tex,
+    gMsgKanji9784Tex,
+    gMsgKanji9785Tex,
+    gMsgKanji9786Tex,
+    gMsgKanji9787Tex,
+    gMsgKanji9788Tex,
+    gMsgKanji9789Tex,
+    gMsgKanji978ATex,
+    gMsgKanji978BTex,
+    gMsgKanji978CTex,
+    gMsgKanji978DTex,
+    gMsgKanji978ETex,
+    gMsgKanji978FTex,
+    gMsgKanji9790Tex,
+    gMsgKanji9791Tex,
+    gMsgKanji9792Tex,
+    gMsgKanji9793Tex,
+    gMsgKanji9794Tex,
+    gMsgKanji9795Tex,
+    gMsgKanji9796Tex,
+    gMsgKanji9797Tex,
+    gMsgKanji9798Tex,
+    gMsgKanji9799Tex,
+    gMsgKanji979ATex,
+    gMsgKanji979BTex,
+    gMsgKanji979CTex,
+    gMsgKanji979DTex,
+    gMsgKanji979ETex,
+    gMsgKanji979FTex,
+    gMsgKanji97A0Tex,
+    gMsgKanji97A1Tex,
+    gMsgKanji97A2Tex,
+    gMsgKanji97A3Tex,
+    gMsgKanji97A4Tex,
+    gMsgKanji97A5Tex,
+    gMsgKanji97A6Tex,
+    gMsgKanji97A7Tex,
+    gMsgKanji97A8Tex,
+    gMsgKanji97A9Tex,
+    gMsgKanji97AATex,
+    gMsgKanji97ABTex,
+    gMsgKanji97ACTex,
+    gMsgKanji97ADTex,
+    gMsgKanji97AETex,
+    gMsgKanji97AFTex,
+    gMsgKanji97B0Tex,
+    gMsgKanji97B1Tex,
+    gMsgKanji97B2Tex,
+    gMsgKanji97B3Tex,
+    gMsgKanji97B4Tex,
+    gMsgKanji97B5Tex,
+    gMsgKanji97B6Tex,
+    gMsgKanji97B7Tex,
+    gMsgKanji97B8Tex,
+    gMsgKanji97B9Tex,
+    gMsgKanji97BATex,
+    gMsgKanji97BBTex,
+    gMsgKanji97BCTex,
+    gMsgKanji97BDTex,
+    gMsgKanji97BETex,
+    gMsgKanji97BFTex,
+    gMsgKanji97C0Tex,
+    gMsgKanji97C1Tex,
+    gMsgKanji97C2Tex,
+    gMsgKanji97C3Tex,
+    gMsgKanji97C4Tex,
+    gMsgKanji97C5Tex,
+    gMsgKanji97C6Tex,
+    gMsgKanji97C7Tex,
+    gMsgKanji97C8Tex,
+    gMsgKanji97C9Tex,
+    gMsgKanji97CATex,
+    gMsgKanji97CBTex,
+    gMsgKanji97CCTex,
+    gMsgKanji97CDTex,
+    gMsgKanji97CETex,
+    gMsgKanji97CFTex,
+    gMsgKanji97D0Tex,
+    gMsgKanji97D1Tex,
+    gMsgKanji97D2Tex,
+    gMsgKanji97D3Tex,
+    gMsgKanji97D4Tex,
+    gMsgKanji97D5Tex,
+    gMsgKanji97D6Tex,
+    gMsgKanji97D7Tex,
+    gMsgKanji97D8Tex,
+    gMsgKanji97D9Tex,
+    gMsgKanji97DATex,
+    gMsgKanji97DBTex,
+    gMsgKanji97DCTex,
+    gMsgKanji97DDTex,
+    gMsgKanji97DETex,
+    gMsgKanji97DFTex,
+    gMsgKanji97E0Tex,
+    gMsgKanji97E1Tex,
+    gMsgKanji97E2Tex,
+    gMsgKanji97E3Tex,
+    gMsgKanji97E4Tex,
+    gMsgKanji97E5Tex,
+    gMsgKanji97E6Tex,
+    gMsgKanji97E7Tex,
+    gMsgKanji97E8Tex,
+    gMsgKanji97E9Tex,
+    gMsgKanji97EATex,
+    gMsgKanji97EBTex,
+    gMsgKanji97ECTex,
+    gMsgKanji97EDTex,
+    gMsgKanji97EETex,
+    gMsgKanji97EFTex,
+    gMsgKanji97F0Tex,
+    gMsgKanji97F1Tex,
+    gMsgKanji97F2Tex,
+    gMsgKanji97F3Tex,
+    gMsgKanji97F4Tex,
+    gMsgKanji97F5Tex,
+    gMsgKanji97F6Tex,
+    gMsgKanji97F7Tex,
+    gMsgKanji97F8Tex,
+    gMsgKanji97F9Tex,
+    gMsgKanji97FATex,
+    gMsgKanji97FBTex,
+    gMsgKanji97FCTex,
+    gMsgKanji9840Tex,
+    gMsgKanji9841Tex,
+    gMsgKanji9842Tex,
+    gMsgKanji9843Tex,
+    gMsgKanji9844Tex,
+    gMsgKanji9845Tex,
+    gMsgKanji9846Tex,
+    gMsgKanji9847Tex,
+    gMsgKanji9848Tex,
+    gMsgKanji9849Tex,
+    gMsgKanji984ATex,
+    gMsgKanji984BTex,
+    gMsgKanji984CTex,
+    gMsgKanji984DTex,
+    gMsgKanji984ETex,
+    gMsgKanji984FTex,
+    gMsgKanji9850Tex,
+    gMsgKanji9851Tex,
+    gMsgKanji9852Tex,
+    gMsgKanji9853Tex,
+    gMsgKanji9854Tex,
+    gMsgKanji9855Tex,
+    gMsgKanji9856Tex,
+    gMsgKanji9857Tex,
+    gMsgKanji9858Tex,
+    gMsgKanji9859Tex,
+    gMsgKanji985ATex,
+    gMsgKanji985BTex,
+    gMsgKanji985CTex,
+    gMsgKanji985DTex,
+    gMsgKanji985ETex,
+    gMsgKanji985FTex,
+    gMsgKanji9860Tex,
+    gMsgKanji9861Tex,
+    gMsgKanji9862Tex,
+    gMsgKanji9863Tex,
+    gMsgKanji9864Tex,
+    gMsgKanji9865Tex,
+    gMsgKanji9866Tex,
+    gMsgKanji9867Tex,
+    gMsgKanji9868Tex,
+    gMsgKanji9869Tex,
+    gMsgKanji986ATex,
+    gMsgKanji986BTex,
+    gMsgKanji986CTex,
+    gMsgKanji986DTex,
+    gMsgKanji986ETex,
+    gMsgKanji986FTex,
+    gMsgKanji9870Tex,
+    gMsgKanji9871Tex,
+    gMsgKanji9872Tex,
+    gMsgKanji9873EmptyTex,
+    gMsgKanji9874EmptyTex,
+    gMsgKanji9875EmptyTex,
+    gMsgKanji9876EmptyTex,
+    gMsgKanji9877EmptyTex,
+    gMsgKanji9878EmptyTex,
+    gMsgKanji9879EmptyTex,
+    gMsgKanji987AEmptyTex,
+    gMsgKanji987BEmptyTex,
+    gMsgKanji987CEmptyTex,
+    gMsgKanji987DEmptyTex,
+    gMsgKanji987EEmptyTex,
+    gMsgKanji9880EmptyTex,
+    gMsgKanji9881EmptyTex,
+    gMsgKanji9882EmptyTex,
+    gMsgKanji9883EmptyTex,
+    gMsgKanji9884EmptyTex,
+    gMsgKanji9885EmptyTex,
+    gMsgKanji9886EmptyTex,
+    gMsgKanji9887EmptyTex,
+    gMsgKanji9888EmptyTex,
+    gMsgKanji9889EmptyTex,
+    gMsgKanji988AEmptyTex,
+    gMsgKanji988BEmptyTex,
+    gMsgKanji988CEmptyTex,
+    gMsgKanji988DEmptyTex,
+    gMsgKanji988EEmptyTex,
+    gMsgKanji988FEmptyTex,
+    gMsgKanji9890EmptyTex,
+    gMsgKanji9891EmptyTex,
+    gMsgKanji9892EmptyTex,
+    gMsgKanji9893EmptyTex,
+    gMsgKanji9894EmptyTex,
+    gMsgKanji9895EmptyTex,
+    gMsgKanji9896EmptyTex,
+    gMsgKanji9897EmptyTex,
+    gMsgKanji9898EmptyTex,
+    gMsgKanji9899EmptyTex,
+    gMsgKanji989AEmptyTex,
+    gMsgKanji989BEmptyTex,
+    gMsgKanji989CEmptyTex,
+    gMsgKanji989DEmptyTex,
+    gMsgKanji989EEmptyTex,
+    gMsgKanji989FEmptyTex,
+    gMsgKanji98A0EmptyTex,
+    gMsgKanji98A1EmptyTex,
+    gMsgKanji98A2EmptyTex,
+    gMsgKanji98A3EmptyTex,
+    gMsgKanji98A4EmptyTex,
+    gMsgKanji98A5EmptyTex,
+    gMsgKanji98A6EmptyTex,
+    gMsgKanji98A7EmptyTex,
+    gMsgKanji98A8EmptyTex,
+    gMsgKanji98A9EmptyTex,
+    gMsgKanji98AAEmptyTex,
+    gMsgKanji98ABEmptyTex,
+    gMsgKanji98ACEmptyTex,
+    gMsgKanji98ADEmptyTex,
+    gMsgKanji98AEEmptyTex,
+    gMsgKanji98AFEmptyTex,
+    gMsgKanji98B0EmptyTex,
+    gMsgKanji98B1EmptyTex,
+    gMsgKanji98B2EmptyTex,
+    gMsgKanji98B3EmptyTex,
+    gMsgKanji98B4EmptyTex,
+    gMsgKanji98B5EmptyTex,
+    gMsgKanji98B6EmptyTex,
+    gMsgKanji98B7EmptyTex,
+    gMsgKanji98B8EmptyTex,
+    gMsgKanji98B9EmptyTex,
+    gMsgKanji98BAEmptyTex,
+    gMsgKanji98BBEmptyTex,
+    gMsgKanji98BCEmptyTex,
+    gMsgKanji98BDEmptyTex,
+    gMsgKanji98BEEmptyTex,
+    gMsgKanji98BFEmptyTex,
+    gMsgKanji98C0EmptyTex,
+    gMsgKanji98C1EmptyTex,
+    gMsgKanji98C2EmptyTex,
+    gMsgKanji98C3EmptyTex,
+    gMsgKanji98C4EmptyTex,
+    gMsgKanji98C5EmptyTex,
+    gMsgKanji98C6EmptyTex,
+    gMsgKanji98C7EmptyTex,
+    gMsgKanji98C8EmptyTex,
+    gMsgKanji98C9EmptyTex,
+    gMsgKanji98CAEmptyTex,
+    gMsgKanji98CBEmptyTex,
+    gMsgKanji98CCEmptyTex,
+    gMsgKanji98CDEmptyTex,
+    gMsgKanji98CEEmptyTex,
+    gMsgKanji98CFEmptyTex,
+    gMsgKanji98D0EmptyTex,
+    gMsgKanji98D1EmptyTex,
+    gMsgKanji98D2EmptyTex,
+    gMsgKanji98D3EmptyTex,
+    gMsgKanji98D4EmptyTex,
+    gMsgKanji98D5EmptyTex,
+    gMsgKanji98D6EmptyTex,
+    gMsgKanji98D7EmptyTex,
+    gMsgKanji98D8EmptyTex,
+    gMsgKanji98D9EmptyTex,
+    gMsgKanji98DAEmptyTex,
+    gMsgKanji98DBEmptyTex,
+    gMsgKanji98DCEmptyTex,
+    gMsgKanji98DDEmptyTex,
+    gMsgKanji98DEEmptyTex,
+    gMsgKanji98DFEmptyTex,
+    gMsgKanji98E0EmptyTex,
+    gMsgKanji98E1EmptyTex,
+    gMsgKanji98E2EmptyTex,
+    gMsgKanji98E3EmptyTex,
+    gMsgKanji98E4EmptyTex,
+    gMsgKanji98E5EmptyTex,
+    gMsgKanji98E6EmptyTex,
+    gMsgKanji98E7EmptyTex,
+    gMsgKanji98E8EmptyTex,
+    gMsgKanji98E9EmptyTex,
+    gMsgKanji98EAEmptyTex,
+    gMsgKanji98EBEmptyTex,
+    gMsgKanji98ECEmptyTex,
+    gMsgKanji98EDEmptyTex,
+    gMsgKanji98EEEmptyTex,
+    gMsgKanji98EFEmptyTex,
+    gMsgKanji98F0EmptyTex,
+    gMsgKanji98F1EmptyTex,
+    gMsgKanji98F2EmptyTex,
+    gMsgKanji98F3EmptyTex,
+    gMsgKanji98F4EmptyTex,
+    gMsgKanji98F5EmptyTex,
+    gMsgKanji98F6EmptyTex,
+    gMsgKanji98F7EmptyTex,
+    gMsgKanji98F8EmptyTex,
+    gMsgKanji98F9EmptyTex,
+    gMsgKanji98FAEmptyTex,
+    gMsgKanji98FBEmptyTex,
+    gMsgKanji98FCEmptyTex,
+};
+
+const char* msgStaticTbl[] = {
     gDefaultMessageBackgroundTex,
     gSignMessageBackgroundTex,
     gNoteStaffMessageBackgroundTex,
     gFadingMessageBackgroundTex,
     gMessageContinueTriangleTex,
     gMessageEndSquareTex,
-    gMessageArrowTex
+    gMessageArrowTex,
 };
+// #endregion
 
-void func_8006EE50(Font* font, u16 arg1, u16 arg2) {
+/**
+ * Loads a texture from kanji for the requested `character` into the character texture buffer
+ * at `codePointIndex`. The value of `character` is the SHIFT-JIS encoding of the character.
+ */
+void Font_LoadCharWide(Font* font, u16 character, u16 codePointIndex) {
+    // DmaMgr_RequestSync(&font->charTexBuf[codePointIndex], _kanjiSegmentStart + Kanji_OffsetFromShiftJIS(character),
+    // 0x80);
+
+    // #region SOH [NTSC]
+    // This function is called even for non-nstc, but this function would be empty for non-ntsc.
+    // To simulate that, we check if the jpn message table is loaded and if not immediately return.
+    if (sJpnMessageEntryTablePtr == NULL) {
+        return;
+    }
+
+    s32 charIndex = Kanji_OffsetFromShiftJIS(character);
+    charIndex /= FONT_CHAR_TEX_SIZE;
+    if (charIndex < ARRAY_COUNT(kanjiFontTbl))
+        memcpy(&font->charTexBuf[codePointIndex], kanjiFontTbl[charIndex], strlen(kanjiFontTbl[charIndex]) + 1);
+    // #endregion
 }
 
 /**
@@ -169,16 +4169,12 @@ void func_8006EE50(Font* font, u16 arg1, u16 arg2) {
  * at `codePointIndex`. The value of `character` is the ASCII codepoint subtract ' '/0x20.
  */
 void Font_LoadChar(Font* font, u8 character, u16 codePointIndex) {
-    //DmaMgr_SendRequest1(&font->charTexBuf[codePointIndex],
-                        //&_nes_font_staticSegmentRomStart[character * FONT_CHAR_TEX_SIZE], FONT_CHAR_TEX_SIZE,
-                        //__FILE__, __LINE__);
+    // DmaMgr_SendRequest1(&font->charTexBuf[codePointIndex],
+    //&_nes_font_staticSegmentRomStart[character * FONT_CHAR_TEX_SIZE], FONT_CHAR_TEX_SIZE,
+    //__FILE__, __LINE__);
 
     if (character < 0x8B)
-        memcpy(&font->charTexBuf[codePointIndex], fntTbl[character], strlen(fntTbl[character]) + 1);
-}
-
-void* Font_FetchCharTexture(u8 character) {
-    return fntTbl[character];
+        memcpy(&font->charTexBuf[codePointIndex], fontTbl[character], strlen(fontTbl[character]) + 1);
 }
 
 /**
@@ -222,9 +4218,50 @@ void Font_LoadOrderedFont(Font* font) {
             osSyncPrintf("nes_mes_buf[%d]=%d\n", codePointIndex, font->msgBuf[codePointIndex]);
 
             offset = (font->msgBuf[codePointIndex] - '\x20') * FONT_CHAR_TEX_SIZE;
-            memcpy(fontBuf, fntTbl[offset / FONT_CHAR_TEX_SIZE], strlen(fntTbl[offset / FONT_CHAR_TEX_SIZE]) + 1);
-            //DmaMgr_SendRequest1(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, __FILE__, __LINE__);
+            memcpy(fontBuf, fontTbl[offset / FONT_CHAR_TEX_SIZE], strlen(fontTbl[offset / FONT_CHAR_TEX_SIZE]) + 1);
+            // DmaMgr_SendRequest1(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, __FILE__, __LINE__);
             fontBufIndex += FONT_CHAR_TEX_SIZE / 8;
         }
     }
 }
+
+// #region SOH [NTSC]
+void Font_LoadOrderedFontNTSC(Font* font) {
+    s32 len;
+    s32 size;
+    s32 codePointIndex;
+    s32 fontBufIndex;
+    s32 offset;
+
+    // font->msgOffset = _message_0xFFFC_jpn - (const char*)_jpn_message_data_staticSegmentStart;
+    // size = font->msgLength = _message_0xFFFD_jpn - _message_0xFFFC_jpn;
+    // len = (u32)size / 2;
+    // DmaMgr_RequestSync(font->msgBufWide, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, size);
+    MessageTableEntry* msgEntry = sJpnMessageEntryTablePtr;
+
+    while (msgEntry->textId != 0xFFFC) {
+        msgEntry++;
+    }
+
+    size = msgEntry->msgSize;
+    len = (u32)size / 2;
+    memcpy(font->msgBuf, msgEntry->segment, size);
+
+    fontBufIndex = 0;
+    for (codePointIndex = 0; font->msgBufWide[codePointIndex] != 0x8170; codePointIndex++) {
+        if (len < codePointIndex) {
+            osSyncPrintf("ＥＲＲＯＲ！！  エラー！！！  error───！！！！\n");
+            break;
+        }
+
+        if (font->msgBufWide[codePointIndex] != 0xA) {
+            offset = Kanji_OffsetFromShiftJIS(font->msgBufWide[codePointIndex]);
+            offset /= FONT_CHAR_TEX_SIZE;
+            memcpy(&font->fontBuf[fontBufIndex * 8], kanjiFontTbl[offset], strlen(kanjiFontTbl[offset]) + 1);
+            // DmaMgr_RequestSync(&font->fontBuf[fontBufIndex * 8], (uintptr_t)_kanjiSegmentStart + offset,
+            // FONT_CHAR_TEX_SIZE);
+            fontBufIndex += FONT_CHAR_TEX_SIZE / 8;
+        }
+    }
+}
+// #endregion
diff --git a/soh/src/code/z_kanji.c b/soh/src/code/z_kanji.c
new file mode 100644
index 0000000000..cd818a9a1a
--- /dev/null
+++ b/soh/src/code/z_kanji.c
@@ -0,0 +1,127 @@
+#include "global.h"
+#include "macros.h"
+
+u16 T_800AF828_ne0[] = {
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D,
+    0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B,
+    0x001C, 0x001D, 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029,
+    0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
+    0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045,
+    0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053,
+    0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061,
+    0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x0072,
+    0x0073, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+    0x0079, 0x007A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0000, 0x0000, 0x0000, 0x0000, 0x0091, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+    0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD,
+    0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3,
+    0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB,
+    0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9,
+    0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105,
+    0x0106, 0x0107, 0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x010D, 0x010E, 0x010F, 0x0110, 0x0111, 0x0112, 0x0113,
+    0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120, 0x0121,
+    0x0122, 0x0123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0125,
+    0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132, 0x0133,
+    0x0134, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x013F, 0x0140, 0x0141,
+    0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F,
+    0x0150, 0x0151, 0x0152, 0x0153, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, 0x0159, 0x015A, 0x015B, 0x015C, 0x015D,
+    0x015E, 0x015F, 0x0160, 0x0161, 0x0162, 0x0163, 0x0164, 0x0165, 0x0166, 0x0167, 0x0168, 0x0169, 0x016A, 0x016B,
+    0x016C, 0x016D, 0x016E, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017A, 0x017B, 0x017C, 0x017D, 0x017E, 0x017F,
+    0x0180, 0x0181, 0x0182, 0x0183, 0x0184, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018A, 0x018B, 0x018C, 0x018D,
+    0x018E, 0x018F, 0x0190, 0x0191, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0193,
+    0x0194, 0x0195, 0x0196, 0x0197, 0x0198, 0x0199, 0x019A, 0x019B, 0x019C, 0x019D, 0x019E, 0x019F, 0x01A0, 0x01A1,
+    0x01A2, 0x01A3, 0x01A4, 0x01A5, 0x01A6, 0x01A7, 0x01A8, 0x01A9, 0x01AA, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x01AB, 0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B4,
+    0x01B5, 0x01B6, 0x01B7, 0x01B8, 0x01B9, 0x01BA, 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF, 0x01C0, 0x01C1, 0x01C2,
+    0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C9, 0x01CA, 0x01CB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01CC, 0x01CD, 0x01CE, 0x01CF,
+    0x01D0, 0x01D1, 0x01D2, 0x01D3, 0x01D4, 0x01D5, 0x01D6, 0x01D7, 0x01D8, 0x01D9, 0x01DA, 0x01DB, 0x01DC, 0x01DD,
+    0x01DE, 0x01DF, 0x01E0, 0x01E1, 0x01E2, 0x01E3, 0x01E4, 0x01E5, 0x01E6, 0x01E7, 0x01E8, 0x01E9, 0x01EA, 0x01EB,
+    0x01EC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x01ED, 0x01EE, 0x01EF, 0x01F0, 0x01F1, 0x01F2, 0x01F3, 0x01F4, 0x01F5, 0x01F6, 0x01F7, 0x01F8, 0x01F9, 0x01FA,
+    0x01FB, 0x01FC, 0x01FD, 0x01FE, 0x01FF, 0x0200, 0x0201, 0x0202, 0x0203, 0x0204, 0x0205, 0x0206, 0x0207, 0x0208,
+    0x0209, 0x020A, 0x020B, 0x020C, 0x020D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x020E, 0x020F, 0x0210, 0x0211,
+    0x0212, 0x0213, 0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D, 0x021E, 0x021F,
+    0x0220, 0x0221, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0222, 0x0223,
+    0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B, 0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231,
+    0x0232, 0x0233, 0x0234, 0x0235, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0236, 0x0237, 0x0238, 0x0239, 0x023A, 0x023B, 0x023C, 0x023D, 0x023E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x023F, 0x0240, 0x0241, 0x0242, 0x0243, 0x0244, 0x0245, 0x0246,
+    0x0247, 0x0248, 0x0000, 0x0000, 0x0000, 0x0000, 0x0249, 0x024A, 0x024B, 0x024C, 0x024D, 0x024E, 0x024F, 0x0250,
+    0x0251, 0x0252, 0x0253, 0x0254, 0x0255, 0x0256, 0x0257, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0258, 0x0259,
+    0x025A, 0x025B, 0x025C, 0x025D, 0x025E, 0x025F, 0x0260, 0x0261, 0x0262, 0x0263, 0x0264, 0x0265, 0x0266, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0267, 0x0268, 0x0269, 0x026A,
+    0x026B, 0x026C, 0x026D, 0x026E, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278,
+    0x0279, 0x027A, 0x027B, 0x027C, 0x027D, 0x027E, 0x027F, 0x0280, 0x0281, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028D,
+    0x028E, 0x028F, 0x0290, 0x0291, 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297, 0x0298, 0x0299, 0x029A, 0x029B,
+    0x029C, 0x029D, 0x029E, 0x029F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x02A0, 0x02A1, 0x02A2, 0x02A3, 0x02A4, 0x02A5,
+    0x02A6, 0x02A7, 0x02A8, 0x02A9, 0x02AA, 0x02AB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x02AC, 0x02AD, 0x02AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x02AF, 0x02B0, 0x02B1, 0x02B2,
+    0x02B3, 0x02B4, 0x02B5, 0x02B6, 0x02B7, 0x02B8, 0x02B9, 0x02BA, 0x02BB, 0x02BC, 0x02BD, 0x02BE, 0x02BF, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x02C0, 0x02C1, 0x02C2, 0x02C3, 0x02C4, 0x02C5,
+    0x02C6, 0x02C7, 0x02C8, 0x02C9, 0x02CA, 0x02CB, 0x02CC, 0x02CD, 0x02CE, 0x02CF, 0x02D0, 0x02D1, 0x02D2, 0x02D3,
+    0x02D4, 0x02D5, 0x02D6, 0x02D7, 0x02D8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x02D9, 0x02DA, 0x02DB, 0x02DC, 0x02DD, 0x02DE, 0x02DF, 0x02E0, 0x02E1, 0x02E2,
+    0x02E3, 0x02E4, 0x02E5, 0x02E6, 0x02E7, 0x02E8, 0x02E9, 0x02EA, 0x02EB, 0x02EC, 0x02ED, 0x02EE, 0x02EF, 0x02F0,
+    0x02F1, 0x02F2, 0x02F3, 0x02F4, 0x02F5, 0x02F6, 0x02F7, 0x02F8, 0x02F9, 0x02FA, 0x02FB, 0x02FC, 0x02FD, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x02FE, 0x02FF, 0x0300, 0x0301, 0x0302, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0303, 0x0304, 0x0305, 0x0306, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0307, 0x0308, 0x0309,
+};
+
+// Handwritten Function
+s32 Kanji_OffsetFromShiftJIS(u32 arg0) {
+    s32 var_a3;
+
+    if (arg0 >= 0x8800) {
+        var_a3 = (arg0 & 0xFF) - 0x40;
+        if (var_a3 >= 0x40) {
+            var_a3--;
+        }
+        return (var_a3 + 0x30A + (0xBC * ((arg0 >> 8) - 0x88))) << 7;
+    }
+    var_a3 = (arg0 & 0xFF) - 0x40;
+    if (var_a3 >= 0x40) {
+        var_a3--;
+    }
+
+    // #Region SOH
+    int index = var_a3 + (0xBC * ((arg0 >> 8) - 0x81));
+    if (index < 0 || index >= ARRAY_COUNT(T_800AF828_ne0)) {
+        // Invalid font char found
+        // @bug: Some characters e.g. 0x0222 can reach here incorrectly
+        return 0;
+    }
+    // #End region
+
+    return T_800AF828_ne0[var_a3 + (0xBC * ((arg0 >> 8) - 0x81))] << 7;
+}
\ No newline at end of file
diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c
index 2c88ecd800..d78a93c6c7 100644
--- a/soh/src/code/z_kankyo.c
+++ b/soh/src/code/z_kankyo.c
@@ -116,7 +116,7 @@ struct_8011FC1C D_8011FC1C[][9] = {
         { 0x3556, 0x4000, 0, 0, 0 },
         { 0x4000, 0x5556, 1, 0, 1 },
         { 0x5556, 0xAAAB, 0, 1, 1 },
-     // { 0x5556, 0xAAAB, 0, 2, 2 },
+        // { 0x5556, 0xAAAB, 0, 2, 2 },
         { 0xAAAB, 0xB556, 1, 1, 2 },
         { 0xB556, 0xC001, 0, 2, 2 },
         { 0xC001, 0xCAAC, 1, 2, 3 },
@@ -218,9 +218,9 @@ LightInfo sSGameOverLightInfo;
 u8 sGameOverLightsIntensity;
 u16 D_8015FDB0;
 
-void LoadSkyboxPalette(SkyboxContext* skyboxCtx, int paletteIndex, char* palTex, int width,
-                       int height);
-void LoadSkyboxTex(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height, int offsetW, int offsetH);
+void LoadSkyboxPalette(SkyboxContext* skyboxCtx, int paletteIndex, char* palTex, int width, int height);
+void LoadSkyboxTex(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height,
+                   int offsetW, int offsetH);
 void Skybox_Update(SkyboxContext* skyboxCtx);
 
 s32 func_8006F0A0(s32 a0) {
@@ -696,12 +696,12 @@ void Environment_UpdateSkybox(PlayState* play, u8 skyboxId, EnvironmentContext*
 
             envCtx->skybox1Index = newSkybox1Index;
 
-            //size = gSkyboxFiles[newSkybox1Index].file.vromEnd - gSkyboxFiles[newSkybox1Index].file.vromStart;
+            // size = gSkyboxFiles[newSkybox1Index].file.vromEnd - gSkyboxFiles[newSkybox1Index].file.vromStart;
 
-            //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-            //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[0],
-                                //gSkyboxFiles[newSkybox1Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL,
-                                //__FILE__, __LINE__);
+            // osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
+            // DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[0],
+            // gSkyboxFiles[newSkybox1Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL,
+            //__FILE__, __LINE__);
         }
 
         if ((envCtx->skybox2Index != newSkybox2Index) && (envCtx->skyboxDmaState == SKYBOX_DMA_INACTIVE)) {
@@ -716,11 +716,11 @@ void Environment_UpdateSkybox(PlayState* play, u8 skyboxId, EnvironmentContext*
 
             envCtx->skybox2Index = newSkybox2Index;
 
-            //size = gSkyboxFiles[newSkybox2Index].file.vromEnd - gSkyboxFiles[newSkybox2Index].file.vromStart;
-            //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-            //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[1],
-                                //gSkyboxFiles[newSkybox2Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL,
-                                //__FILE__, __LINE__);
+            // size = gSkyboxFiles[newSkybox2Index].file.vromEnd - gSkyboxFiles[newSkybox2Index].file.vromStart;
+            // osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
+            // DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[1],
+            // gSkyboxFiles[newSkybox2Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL,
+            //__FILE__, __LINE__);
         }
 
         if (envCtx->skyboxDmaState == SKYBOX_DMA_FILE1_DONE) {
@@ -731,20 +731,20 @@ void Environment_UpdateSkybox(PlayState* play, u8 skyboxId, EnvironmentContext*
                 SkyboxTableEntry entryA = sSkyboxTable[newSkybox1Index];
                 LoadSkyboxPalette(skyboxCtx, 0, entryA.palettes[0], 16, 8);
 
-                //size = gSkyboxFiles[newSkybox1Index].palette.vromEnd - gSkyboxFiles[newSkybox1Index].palette.vromStart;
-                //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-                //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes,
-                                    //gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
-                                    //__FILE__, __LINE__);
+                // size = gSkyboxFiles[newSkybox1Index].palette.vromEnd -
+                // gSkyboxFiles[newSkybox1Index].palette.vromStart; osCreateMesgQueue(&envCtx->loadQueue,
+                // &envCtx->loadMsg, 1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes,
+                // gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
+                //__FILE__, __LINE__);
             } else {
                 SkyboxTableEntry entryA = sSkyboxTable[newSkybox1Index];
                 LoadSkyboxPalette(skyboxCtx, 1, entryA.palettes[0], 16, 8);
 
-                //size = gSkyboxFiles[newSkybox1Index].palette.vromEnd - gSkyboxFiles[newSkybox1Index].palette.vromStart;
-                //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-                //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size,
-                                    //gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
-                                    //__FILE__, __LINE__);
+                // size = gSkyboxFiles[newSkybox1Index].palette.vromEnd -
+                // gSkyboxFiles[newSkybox1Index].palette.vromStart; osCreateMesgQueue(&envCtx->loadQueue,
+                // &envCtx->loadMsg, 1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size,
+                // gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
+                //__FILE__, __LINE__);
             }
 
             Skybox_Update(skyboxCtx);
@@ -753,24 +753,22 @@ void Environment_UpdateSkybox(PlayState* play, u8 skyboxId, EnvironmentContext*
         if (envCtx->skyboxDmaState == SKYBOX_DMA_FILE2_DONE) {
             envCtx->skyboxDmaState = SKYBOX_DMA_PAL2_START;
 
-            if ((newSkybox2Index & 1) ^ ((newSkybox2Index & 4) >> 2))
-            {
+            if ((newSkybox2Index & 1) ^ ((newSkybox2Index & 4) >> 2)) {
                 SkyboxTableEntry entryA = sSkyboxTable[newSkybox2Index];
                 LoadSkyboxPalette(skyboxCtx, 0, entryA.palettes[0], 16, 8);
 
-                /*size = gSkyboxFiles[newSkybox2Index].palette.vromEnd - gSkyboxFiles[newSkybox2Index].palette.vromStart;
-                osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-                DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes,
+                /*size = gSkyboxFiles[newSkybox2Index].palette.vromEnd -
+                gSkyboxFiles[newSkybox2Index].palette.vromStart; osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg,
+                1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes,
                                     gSkyboxFiles[newSkybox2Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
                                     __FILE__, __LINE__);*/
-            } else
-            {
+            } else {
                 SkyboxTableEntry entryA = sSkyboxTable[newSkybox2Index];
                 LoadSkyboxPalette(skyboxCtx, 1, entryA.palettes[0], 16, 8);
 
-                /*size = gSkyboxFiles[newSkybox2Index].palette.vromEnd - gSkyboxFiles[newSkybox2Index].palette.vromStart;
-                osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1);
-                DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size,
+                /*size = gSkyboxFiles[newSkybox2Index].palette.vromEnd -
+                gSkyboxFiles[newSkybox2Index].palette.vromStart; osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg,
+                1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size,
                                     gSkyboxFiles[newSkybox2Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL,
                                     __FILE__, __LINE__);*/
             }
@@ -779,15 +777,11 @@ void Environment_UpdateSkybox(PlayState* play, u8 skyboxId, EnvironmentContext*
         }
 
         if ((envCtx->skyboxDmaState == SKYBOX_DMA_FILE1_START) || (envCtx->skyboxDmaState == SKYBOX_DMA_FILE2_START)) {
-            //if (osRecvMesg(&envCtx->loadQueue, 0, OS_MESG_NOBLOCK) == 0)
-            {
-                envCtx->skyboxDmaState++;
-            }
+            // if (osRecvMesg(&envCtx->loadQueue, 0, OS_MESG_NOBLOCK) == 0)
+            { envCtx->skyboxDmaState++; }
         } else if (envCtx->skyboxDmaState >= SKYBOX_DMA_FILE1_DONE) {
-            //if (osRecvMesg(&envCtx->loadQueue, 0, OS_MESG_NOBLOCK) == 0)
-            {
-                envCtx->skyboxDmaState = SKYBOX_DMA_INACTIVE;
-            }
+            // if (osRecvMesg(&envCtx->loadQueue, 0, OS_MESG_NOBLOCK) == 0)
+            { envCtx->skyboxDmaState = SKYBOX_DMA_INACTIVE; }
         }
 
         envCtx->skyboxBlend = skyboxBlend;
@@ -886,9 +880,8 @@ void Environment_PrintDebugInfo(PlayState* play, Gfx** gfx) {
 void func_80075B44(PlayState* play);
 void func_800766C4(PlayState* play);
 
-void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContext* lightCtx,
-                        PauseContext* pauseCtx, MessageContext* msgCtx, GameOverContext* gameOverCtx,
-                        GraphicsContext* gfxCtx) {
+void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContext* lightCtx, PauseContext* pauseCtx,
+                        MessageContext* msgCtx, GameOverContext* gameOverCtx, GraphicsContext* gfxCtx) {
     f32 sp8C;
     f32 sp88 = 0.0f;
     u16 i;
@@ -897,8 +890,9 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
     EnvLightSettings* lightSettingsList = play->envCtx.lightSettingsList;
     s32 adjustment;
 
-    if ((((void)0, gSaveContext.gameMode) != GAMEMODE_NORMAL) && (((void)0, gSaveContext.gameMode) != GAMEMODE_END_CREDITS)) {
-        func_800AA16C(play);
+    if ((((void)0, gSaveContext.gameMode) != GAMEMODE_NORMAL) &&
+        (((void)0, gSaveContext.gameMode) != GAMEMODE_END_CREDITS)) {
+        Rumble_ClearRequests();
     }
 
     if (pauseCtx->state == 0) {
@@ -927,7 +921,8 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
         }
 
         if ((pauseCtx->state == 0) && (gameOverCtx->state == GAMEOVER_INACTIVE)) {
-            if (((msgCtx->msgLength == 0) && (msgCtx->msgMode == 0)) || (((void)0, gSaveContext.gameMode) == GAMEMODE_END_CREDITS)) {
+            if (((msgCtx->msgLength == 0) && (msgCtx->msgMode == 0)) ||
+                (((void)0, gSaveContext.gameMode) == GAMEMODE_END_CREDITS)) {
                 if ((envCtx->unk_1A == 0) && !FrameAdvance_IsEnabled(play) &&
                     (play->transitionMode == TRANS_MODE_OFF || ((void)0, gSaveContext.gameMode) != GAMEMODE_NORMAL)) {
 
@@ -1326,9 +1321,9 @@ void Environment_DrawSunAndMoon(PlayState* play) {
         play->envCtx.sunPos.z = +(Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 20.0f) * 25.0f;
     }
 
-    if (gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN || ((void)0, gSaveContext.sceneSetupIndex) != 5) {
-        Matrix_Translate(play->view.eye.x + play->envCtx.sunPos.x,
-                         play->view.eye.y + play->envCtx.sunPos.y,
+    if (gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN ||
+        ((void)0, gSaveContext.sceneSetupIndex) != 5) {
+        Matrix_Translate(play->view.eye.x + play->envCtx.sunPos.x, play->view.eye.y + play->envCtx.sunPos.y,
                          play->view.eye.z + play->envCtx.sunPos.z, MTXMODE_NEW);
 
         y = play->envCtx.sunPos.y / 25.0f;
@@ -1363,25 +1358,22 @@ void Environment_DrawSunAndMoon(PlayState* play) {
 
         static Vtx vertices[] = {
             VTX(-31, -31, 0, 0, 0, 255, 255, 255, 255),
-	        VTX(32, -31, 0, 2016, 0, 255, 255, 255, 255),
-	        VTX(-31, 32, 0, 0, 2016, 255, 255, 255, 255),
-	        VTX(32, 32, 0, 2016, 2016, 255, 255, 255, 255),
+            VTX(32, -31, 0, 2016, 0, 255, 255, 255, 255),
+            VTX(-31, 32, 0, 0, 2016, 255, 255, 255, 255),
+            VTX(32, 32, 0, 2016, 2016, 255, 255, 255, 255),
         };
 
         // Replacement for gSunDL
         gSPMatrix(POLY_OPA_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
         gDPPipeSync(POLY_OPA_DISP++);
         gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSun1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                               G_TX_NOMIRROR | G_TX_CLAMP,
-                               6, 6, G_TX_NOLOD, G_TX_NOLOD);
+                               G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
         gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEvening1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0,
-                             G_TX_NOMIRROR | G_TX_CLAMP,
-                             G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
+                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
         gSPVertex(POLY_OPA_DISP++, vertices, 4, 0);
         gSP2Triangles(POLY_OPA_DISP++, 0, 1, 2, 0, 2, 1, 3, 0);
 
-        Matrix_Translate(play->view.eye.x - play->envCtx.sunPos.x,
-                         play->view.eye.y - play->envCtx.sunPos.y,
+        Matrix_Translate(play->view.eye.x - play->envCtx.sunPos.x, play->view.eye.y - play->envCtx.sunPos.y,
                          play->view.eye.z - play->envCtx.sunPos.z, MTXMODE_NEW);
 
         color = -y / 120.0f;
@@ -1415,19 +1407,18 @@ void Environment_DrawSunAndMoon(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view,
-                                  GraphicsContext* gfxCtx, Vec3f pos, s32 unused) {
+void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, GraphicsContext* gfxCtx,
+                                  Vec3f pos, s32 unused) {
     if ((play->envCtx.unk_EE[1] == 0) && (play->envCtx.unk_17 == 0)) {
-        Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos, 2000,
-                                  370, Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 120.0f, 400, 1);
+        Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos, 2000, 370,
+                                  Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 120.0f, 400, 1);
     }
 }
 
 f32 sLensFlareScales[] = { 23.0f, 12.0f, 7.0f, 5.0f, 3.0f, 10.0f, 6.0f, 2.0f, 3.0f, 1.0f };
 
-void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view,
-                               GraphicsContext* gfxCtx, Vec3f pos, s32 unused, s16 scale, f32 colorIntensity,
-                               s16 screenFillAlpha, u8 arg9) {
+void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, GraphicsContext* gfxCtx,
+                               Vec3f pos, s32 unused, s16 scale, f32 colorIntensity, s16 screenFillAlpha, u8 arg9) {
     s16 i;
     f32 tempX;
     f32 tempY;
@@ -1562,7 +1553,6 @@ void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View
 
             alpha *= 1.0f - fogInfluence;
 
-
             if (!(isOffScreen ^ 0)) {
                 Math_SmoothStepToF(&envCtx->unk_88, unk88Target, 0.5f, 0.05f, 0.001f);
             } else {
@@ -1570,10 +1560,9 @@ void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View
             }
 
             POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++);
-             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, lensFlareColors[i].r, lensFlareColors[i].g, lensFlareColors[i].b,
-                             alpha * envCtx->unk_88);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, lensFlareColors[i].r, lensFlareColors[i].g, lensFlareColors[i].b,
+                            alpha * envCtx->unk_88);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0,
                               0, PRIMITIVE, 0);
             gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE);
@@ -1709,8 +1698,7 @@ void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx)
             Matrix_RotateY(-rotY, MTXMODE_APPLY);
             Matrix_RotateX(M_PI / 2 - rotX, MTXMODE_APPLY);
             Matrix_Scale(0.4f, 1.2f, 0.4f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gRaindropDL);
 
             FrameInterpolation_RecordCloseChild();
@@ -1722,7 +1710,7 @@ void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx)
 
             for (i = 0; i < play->envCtx.unk_EE[1]; i++) {
                 FrameInterpolation_RecordOpenChild("Droplet Ring", i);
-                
+
                 if (!firstDone) {
                     Gfx_SetupDL_25Xlu(gfxCtx);
                     gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
@@ -1740,8 +1728,7 @@ void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx)
                     Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
                 }
 
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
 
                 FrameInterpolation_RecordCloseChild();
@@ -1753,8 +1740,7 @@ void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx)
 }
 
 void func_80074CE8(PlayState* play, u32 arg1) {
-    if ((play->envCtx.unk_BD != arg1) && (play->envCtx.unk_D8 >= 1.0f) &&
-        (play->envCtx.unk_BF == 0xFF)) {
+    if ((play->envCtx.unk_BD != arg1) && (play->envCtx.unk_D8 >= 1.0f) && (play->envCtx.unk_BF == 0xFF)) {
         if (arg1 > 30) {
             arg1 = 0;
         }
@@ -1778,8 +1764,7 @@ void func_80074CE8(PlayState* play, u32 arg1) {
  * An example usage of a filter is to dim the skybox in cloudy conditions.
  */
 void Environment_DrawSkyboxFilters(PlayState* play) {
-    if (((play->skyboxId != SKYBOX_NONE) && (play->lightCtx.fogNear < 980)) ||
-        (play->skyboxId == SKYBOX_UNSET_1D)) {
+    if (((play->skyboxId != SKYBOX_NONE) && (play->lightCtx.fogNear < 980)) || (play->skyboxId == SKYBOX_UNSET_1D)) {
         f32 alpha;
 
         OPEN_DISPS(play->state.gfxCtx);
@@ -1807,9 +1792,8 @@ void Environment_DrawSkyboxFilters(PlayState* play) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Gfx_SetupDL_57Opa(play->state.gfxCtx);
-        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, play->envCtx.skyboxFilterColor[0],
-                        play->envCtx.skyboxFilterColor[1], play->envCtx.skyboxFilterColor[2],
-                        play->envCtx.skyboxFilterColor[3]);
+        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, play->envCtx.skyboxFilterColor[0], play->envCtx.skyboxFilterColor[1],
+                        play->envCtx.skyboxFilterColor[2], play->envCtx.skyboxFilterColor[3]);
         gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -1990,14 +1974,13 @@ void Environment_DrawLightning(PlayState* play, s32 unused) {
             Matrix_Scale(22.0f, 100.0f, 22.0f, MTXMODE_APPLY);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 128);
             gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 128);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(lightningTextures[sLightningBolts[i].textureIndex]));
             Gfx_SetupDL_61Xlu(play->state.gfxCtx);
             gSPMatrix(POLY_XLU_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gEffLightningDL);
         }
-        
+
         FrameInterpolation_RecordCloseChild();
     }
 
@@ -2008,7 +1991,8 @@ void Environment_PlaySceneSequence(PlayState* play) {
     play->envCtx.unk_E0 = 0xFF;
 
     // both lost woods exits on the bridge from kokiri to hyrule field
-    if (((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_BRIDGE_WEST_EXIT || ((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) {
+    if (((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_BRIDGE_WEST_EXIT ||
+        ((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) {
         Audio_PlayNatureAmbienceSequence(NATURE_ID_KOKIRI_REGION);
     } else if (((void)0, gSaveContext.forcedSeqId) != NA_BGM_GENERAL_SFX) {
         if (!Environment_IsForcedSequenceDisabled()) {
@@ -2110,8 +2094,7 @@ void func_80075B44(PlayState* play) {
                 gSaveContext.bgsDayCount++;
                 gSaveContext.dogIsLost = true;
                 Sfx_PlaySfxCentered(NA_SE_EV_CHICKEN_CRY_M);
-                if ((Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) ||
-                     Inventory_HatchPocketCucco(play)) &&
+                if ((Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) || Inventory_HatchPocketCucco(play)) &&
                     play->csCtx.state == 0 && !Player_InCsMode(play)) {
                     GameInteractor_ExecuteOnCuccoOrChickenHatch();
                     Message_StartTextbox(play, 0x3066, NULL);
@@ -2122,12 +2105,11 @@ void func_80075B44(PlayState* play) {
         case 7:
             Audio_SetNatureAmbienceChannelIO(NATURE_CHANNEL_CRITTER_1 << 4 | NATURE_CHANNEL_CRITTER_3,
                                              CHANNEL_IO_PORT_1, 0);
-            if (play->envCtx.unk_EE[0] == 0 && play->envCtx.unk_F2[0] == 0) 
-            {
-                // OTRTODO: This is where corrupt audio happens. Commenting this out seems to not introduce any side effects?
-                // Further investigation is needed...
-                //Audio_SetNatureAmbienceChannelIO(NATURE_CHANNEL_CRITTER_4 << 4 | NATURE_CHANNEL_CRITTER_5,
-                                                    //CHANNEL_IO_PORT_1, 1);
+            if (play->envCtx.unk_EE[0] == 0 && play->envCtx.unk_F2[0] == 0) {
+                // OTRTODO: This is where corrupt audio happens. Commenting this out seems to not introduce any side
+                // effects? Further investigation is needed...
+                // Audio_SetNatureAmbienceChannelIO(NATURE_CHANNEL_CRITTER_4 << 4 | NATURE_CHANNEL_CRITTER_5,
+                // CHANNEL_IO_PORT_1, 1);
             }
             play->envCtx.unk_E0++;
             break;
@@ -2147,9 +2129,8 @@ void Environment_DrawCustomLensFlare(PlayState* play) {
         pos.y = gCustomLensFlarePos.y;
         pos.z = gCustomLensFlarePos.z;
 
-        Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos,
-                                  gLensFlareUnused, gLensFlareScale, gLensFlareColorIntensity,
-                                  gLensFlareScreenFillAlpha, 0);
+        Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos, gLensFlareUnused,
+                                  gLensFlareScale, gLensFlareColorIntensity, gLensFlareScreenFillAlpha, 0);
     }
 }
 
@@ -2310,19 +2291,22 @@ Color_RGB8 sSandstormEnvColors[] = {
 u16 previousPatchedSandstormScreenSize = 0;
 
 void Environment_PatchSandstorm(PlayState* play) {
-    if (previousPatchedSandstormScreenSize == ABS(OTRGetRectDimensionFromLeftEdge(0)) + ABS(OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH))) {
+    if (previousPatchedSandstormScreenSize ==
+        ABS(OTRGetRectDimensionFromLeftEdge(0)) + ABS(OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH))) {
         return;
     }
 
     Gfx gfxPatchSandstormRect[] = {
         gsSPWideTextureRectangle(OTRGetRectDimensionFromLeftEdge(0) << 2, 0,
-            OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0, 0x008C, -0x008C),
+                                 OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0,
+                                 0x008C, -0x008C),
     };
     ResourceMgr_PatchGfxByName(gFieldSandstormDL, "gfxPatchSandstormRect0", 24, gfxPatchSandstormRect[0]);
     ResourceMgr_PatchGfxByName(gFieldSandstormDL, "gfxPatchSandstormRect1", 25, gfxPatchSandstormRect[1]);
     ResourceMgr_PatchGfxByName(gFieldSandstormDL, "gfxPatchSandstormRect2", 26, gfxPatchSandstormRect[2]);
 
-    previousPatchedSandstormScreenSize = ABS(OTRGetRectDimensionFromLeftEdge(0)) + ABS(OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH));
+    previousPatchedSandstormScreenSize =
+        ABS(OTRGetRectDimensionFromLeftEdge(0)) + ABS(OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH));
 }
 
 void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) {
diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c
index 726e8d44de..451bdf9ab5 100644
--- a/soh/src/code/z_lifemeter.c
+++ b/soh/src/code/z_lifemeter.c
@@ -122,19 +122,19 @@ s16 sHeartsDDEnv[2][3];
 
 void HealthMeter_Init(PlayState* play) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
-    Color_RGB8 mainColor = {HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B};
+    Color_RGB8 mainColor = { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
         mainColor = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), mainColor);
     }
-    Color_RGB8 mainBorder = {HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B};
+    Color_RGB8 mainBorder = { HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.HeartBorder.Changed"), 0)) {
         mainBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.HeartBorder.Value"), mainBorder);
     }
-    Color_RGB8 ddColor = {HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B};
+    Color_RGB8 ddColor = { HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHearts.Changed"), 0)) {
         ddColor = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHearts.Value"), ddColor);
     }
-    Color_RGB8 ddBorder = {HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B};
+    Color_RGB8 ddBorder = { HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHeartBorder.Changed"), 0)) {
         ddBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHeartBorder.Value"), ddBorder);
     }
@@ -184,19 +184,19 @@ void HealthMeter_Update(PlayState* play) {
     Right_LM_Margin = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.R"), 0);
     Bottom_LM_Margin = CVarGetInteger(CVAR_COSMETIC("HUD.Margin.B"), 0);
 
-    Color_RGB8 mainColor = {HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B};
+    Color_RGB8 mainColor = { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
         mainColor = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), mainColor);
     }
-    Color_RGB8 mainBorder = {HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B};
+    Color_RGB8 mainBorder = { HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.HeartBorder.Changed"), 0)) {
         mainBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.HeartBorder.Value"), mainBorder);
     }
-    Color_RGB8 ddColor = {HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B};
+    Color_RGB8 ddColor = { HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHearts.Changed"), 0)) {
         ddColor = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHearts.Value"), ddColor);
     }
-    Color_RGB8 ddBorder = {HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B};
+    Color_RGB8 ddBorder = { HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHeartBorder.Changed"), 0)) {
         ddBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHeartBorder.Value"), ddBorder);
     }
@@ -346,11 +346,11 @@ s16 getHealthMeterXOffset() {
 
     if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) != ORIGINAL_LOCATION) {
         if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_LEFT) {
-            return OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0)+X_Margins +
+            return OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0) + X_Margins +
                                                70.0f);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_RIGHT) {
             X_Margins = Right_LM_Margin;
-            return OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0)+X_Margins +
+            return OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0) + X_Margins +
                                                 70.0f);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_NONE) {
             return CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0) + 70.0f;
@@ -358,23 +358,23 @@ s16 getHealthMeterXOffset() {
             return -9999;
         }
     } else {
-        return OTRGetDimensionFromLeftEdge(0.0f)+X_Margins;
+        return OTRGetDimensionFromLeftEdge(0.0f) + X_Margins;
     }
 }
 
 s16 getHealthMeterYOffset() {
     s16 Y_Margins;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Hearts.UseMargins"), 0) != 0)
-        Y_Margins = (Top_LM_Margin*-1);
+        Y_Margins = (Top_LM_Margin * -1);
     else
         Y_Margins = 0;
 
     f32 HeartsScale = 0.7f;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) != ORIGINAL_LOCATION) {
         HeartsScale = CVarGetFloat(CVAR_COSMETIC("HUD.HeartsCount.Scale"), 0.7f);
-        return CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosY"), 0)+Y_Margins+(HeartsScale*15);
+        return CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosY"), 0) + Y_Margins + (HeartsScale * 15);
     } else {
-        return 0.0f+Y_Margins;
+        return 0.0f + Y_Margins;
     }
 }
 
@@ -430,11 +430,11 @@ void HealthMeter_Draw(PlayState* play) {
         if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) != ORIGINAL_LOCATION) {
             offsetY = CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosY"), 0)+Y_Margins+(HeartsScale*15);
             if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_LEFT) {
-                offsetX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0)+X_Margins+70.0f);
-            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_RIGHT) {
+                offsetX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"),
+       0)+X_Margins+70.0f); } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_RIGHT) {
                 X_Margins = Right_LM_Margin;
-                offsetX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0)+X_Margins+70.0f); 
-            } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_NONE) {
+                offsetX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"),
+       0)+X_Margins+70.0f); } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == ANCHOR_NONE) {
                 offsetX = CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosX"), 0)+70.0f;
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.HeartsCount.PosType"), 0) == HIDDEN) {
                 offsetX = -9999;
@@ -568,8 +568,8 @@ void HealthMeter_Draw(PlayState* play) {
 
             temp3 = offsetY;
             temp2 = offsetX;
-            temp4 = 1.0f;//Heart texture size
-            temp4 /= 0.68f; //Hearts Scaled size
+            temp4 = 1.0f;   // Heart texture size
+            temp4 /= 0.68f; // Hearts Scaled size
             temp4 *= 1 << 10;
             temp1 = 8.0f;
             temp1 *= 0.68f;
@@ -578,12 +578,12 @@ void HealthMeter_Draw(PlayState* play) {
                                 (s32)temp4, (s32)temp4);*/
             Mtx* matrix = Graph_Alloc(gfxCtx, sizeof(Mtx));
             Matrix_SetTranslateScaleMtx2(matrix,
-                HeartsScale, //Scale X
-                HeartsScale, //Scale Y
-                HeartsScale, //Scale Z
-                -130+offsetX, //Pos X
-                (-94+offsetY) *-1, //Pos Y
-                0.0f); //Pos Z
+                                         HeartsScale,          // Scale X
+                                         HeartsScale,          // Scale Y
+                                         HeartsScale,          // Scale Z
+                                         -130 + offsetX,       // Pos X
+                                         (-94 + offsetY) * -1, // Pos Y
+                                         0.0f);                // Pos Z
             gSPMatrix(OVERLAY_DISP++, matrix, G_MTX_MODELVIEW | G_MTX_LOAD);
             gSPVertex(OVERLAY_DISP++, sp154, 4, 0);
             gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0);
@@ -632,7 +632,7 @@ void HealthMeter_Draw(PlayState* play) {
 
         offsetX += 10.0f;
         s32 lineLength = CVarGetInteger(CVAR_COSMETIC("HUD.Hearts.LineLength"), 10);
-        if (lineLength != 0 && (i+1)%lineLength == 0) {
+        if (lineLength != 0 && (i + 1) % lineLength == 0) {
             offsetX = PosX_anchor;
             offsetY += 10.0f;
         }
@@ -651,8 +651,9 @@ void HealthMeter_HandleCriticalAlarm(PlayState* play) {
         if (interfaceCtx->unk_22A <= 0) {
             interfaceCtx->unk_22A = 0;
             interfaceCtx->unk_22C = 0;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("LowHpAlarm"), 0) == 0 && !Player_InCsMode(play) && (play->pauseCtx.state == 0) &&
-            (play->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Play_InCsMode(play)) {
+            if (CVarGetInteger(CVAR_AUDIO("LowHpAlarm"), 0) == 0 && !Player_InCsMode(play) &&
+                (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && HealthMeter_IsCritical() &&
+                !Play_InCsMode(play)) {
                 Sfx_PlaySfxCentered(NA_SE_SY_HITPOINT_ALARM);
             }
         }
diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c
index d45d10cc90..96fa863058 100644
--- a/soh/src/code/z_lights.c
+++ b/soh/src/code/z_lights.c
@@ -397,7 +397,7 @@ void Lights_GlowCheck(PlayState* play) {
             if ((multDest.z > 1.0f) && y >= shrink && y <= SCREEN_HEIGHT - shrink) {
                 wZ = (s32)((multDest.z * wDest) * 16352.0f) + 16352;
                 zBuf = OTRGetPixelDepth(x, y) * 4;
-        
+
                 if (wZ < (zBuf >> 3)) {
                     params->drawGlow = true;
                 }
@@ -436,8 +436,7 @@ void Lights_DrawGlow(PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, params->color[0], params->color[1], params->color[2], 50);
             Matrix_Translate(params->x, params->y, params->z, MTXMODE_NEW);
             Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGlowCircleDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/code/z_malloc.c b/soh/src/code/z_malloc.c
index a44c1e47de..26d2fb855f 100644
--- a/soh/src/code/z_malloc.c
+++ b/soh/src/code/z_malloc.c
@@ -75,7 +75,7 @@ void* ZeldaArena_Calloc(size_t num, size_t size) {
 
     ret = __osMalloc(&sZeldaArena, n);
     if (ret != NULL) {
-        memset(ret, 0,n);
+        memset(ret, 0, n);
     }
 
     ZeldaArena_CheckPointer(ret, n, "zelda_calloc", "確保");
diff --git a/soh/src/code/z_map_data.c b/soh/src/code/z_map_data.c
index f76a3b4ce0..48507ce0ef 100644
--- a/soh/src/code/z_map_data.c
+++ b/soh/src/code/z_map_data.c
@@ -309,13 +309,30 @@ static u8 sFloorID[10][8] = {
 static s16 sSkullFloorIconY[10] = { -47, -47, -33, -47, -47, -5, -19, -47, -99, -99 };
 
 MapData gMapDataTable = {
-    sFloorTexIndexOffset,       sBossFloor,             sRoomPalette,
-    sMaxPaletteCount,           sPaletteRoom,           sRoomCompassOffsetX,
-    sRoomCompassOffsetY,        sDgnMinimapCount,       sDgnMinimapTexIndexOffset,
-    sOwMinimapPosX,             sOwMinimapPosY,         sOwCompassInfo,
-    sDgnMinimapTexIndexBase,    sDgnCompassInfo,        sOwMinimapWidth,
-    sOwMinimapHeight,           sOwEntranceIconPosX,    sOwEntranceIconPosY,
-    sOwEntranceFlag,            sFloorCoordY,           sSwitchEntryCount,
-    sSwitchFromRoom,            sSwitchFromFloor,       sSwitchToRoom,
-    sFloorID,                   sSkullFloorIconY,
+    sFloorTexIndexOffset,
+    sBossFloor,
+    sRoomPalette,
+    sMaxPaletteCount,
+    sPaletteRoom,
+    sRoomCompassOffsetX,
+    sRoomCompassOffsetY,
+    sDgnMinimapCount,
+    sDgnMinimapTexIndexOffset,
+    sOwMinimapPosX,
+    sOwMinimapPosY,
+    sOwCompassInfo,
+    sDgnMinimapTexIndexBase,
+    sDgnCompassInfo,
+    sOwMinimapWidth,
+    sOwMinimapHeight,
+    sOwEntranceIconPosX,
+    sOwEntranceIconPosY,
+    sOwEntranceFlag,
+    sFloorCoordY,
+    sSwitchEntryCount,
+    sSwitchFromRoom,
+    sSwitchFromFloor,
+    sSwitchToRoom,
+    sFloorID,
+    sSkullFloorIconY,
 };
diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c
index 49af7a6541..44b5b43b5d 100644
--- a/soh/src/code/z_map_exp.c
+++ b/soh/src/code/z_map_exp.c
@@ -92,8 +92,7 @@ void Map_SetFloorPalettesData(PlayState* play, s16 floor) {
     }
 }
 
-const char* minimapTableOW[] =
-{
+const char* minimapTableOW[] = {
     gHyruleFieldMinimapTex,
     gKakarikoVillageMinimapTex,
     gGraveyardMinimapTex,
@@ -120,8 +119,7 @@ const char* minimapTableOW[] =
     gGerudosFortressMinimapTex,
 };
 
-const char* minimapTableDangeon[] =
-{
+const char* minimapTableDangeon[] = {
     gDekuTreeRoom0Floor1MinimapTex,
     gDekuTreeRoom1MinimapTex,
     gDekuTreeRoom2MinimapTex,
@@ -414,9 +412,9 @@ void Map_InitData(PlayState* play, s16 room) {
             osSyncPrintf("ＫＫＫ＝%d\n", extendedMapIndex);
             osSyncPrintf(VT_RST);
             sEntranceIconMapIndex = extendedMapIndex;
-            //DmaMgr_SendRequest1(interfaceCtx->mapSegment,
+            // DmaMgr_SendRequest1(interfaceCtx->mapSegment,
             //(uintptr_t)_map_grand_staticSegmentRomStart + gMapData->owMinimapTexOffset[extendedMapIndex],
-                                //gMapData->owMinimapTexSize[mapIndex], __FILE__, __LINE__);
+            // gMapData->owMinimapTexSize[mapIndex], __FILE__, __LINE__);
 
             if (sEntranceIconMapIndex < 24) {
                 play->interfaceCtx.mapSegment[0] = ResourceGetDataByName(minimapTableOW[sEntranceIconMapIndex]);
@@ -448,14 +446,15 @@ void Map_InitData(PlayState* play, s16 room) {
             osSyncPrintf("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d  VREG(30)=%d\n", room,
                          mapIndex, VREG(30));
             osSyncPrintf(VT_RST);
-            //DmaMgr_SendRequest1(play->interfaceCtx.mapSegment,
+            // DmaMgr_SendRequest1(play->interfaceCtx.mapSegment,
             //(uintptr_t)_map_i_staticSegmentRomStart +
             //((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * 0xFF0),
-                                //0xFF0, __FILE__, __LINE__);
+            // 0xFF0, __FILE__, __LINE__);
 
-            play->interfaceCtx.mapSegment[0] = ResourceGetDataByName(
-                    minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]);
-            play->interfaceCtx.mapSegmentName[0] = minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room];
+            play->interfaceCtx.mapSegment[0] =
+                ResourceGetDataByName(minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]);
+            play->interfaceCtx.mapSegmentName[0] =
+                minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room];
             R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room];
             R_COMPASS_OFFSET_Y = gMapData->roomCompassOffsetY[mapIndex][room];
             Map_SetFloorPalettesData(play, VREG(30));
@@ -618,7 +617,9 @@ void Minimap_DrawCompassIcons(PlayState* play) {
     s16 X_Margins_Minimap;
     s16 Y_Margins_Minimap;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Minimap = Right_MM_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_Minimap = Right_MM_Margin;
+        };
         Y_Margins_Minimap = Bottom_MM_Margin;
     } else {
         X_Margins_Minimap = 0;
@@ -630,7 +631,7 @@ void Minimap_DrawCompassIcons(PlayState* play) {
     if (play->interfaceCtx.minimapAlpha >= 0xAA) {
         Gfx_SetupDL_42Overlay(play->state.gfxCtx);
 
-        //Player current position (yellow arrow)
+        // Player current position (yellow arrow)
         gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                           PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
@@ -647,9 +648,9 @@ void Minimap_DrawCompassIcons(PlayState* play) {
             mapWidth = 96;
         }
 
-        // The compass offset value is a factor of 10 compared to N64 screen pixels and originates in the center of the screen
-        // Compute the additional mirror offset value by normalizing the original offset position
-        // and taking it's distance to the center of the map, duplicating that result and casting back to a factor of 10
+        // The compass offset value is a factor of 10 compared to N64 screen pixels and originates in the center of the
+        // screen Compute the additional mirror offset value by normalizing the original offset position and taking it's
+        // distance to the center of the map, duplicating that result and casting back to a factor of 10
         s16 mirrorOffset = ((mapWidth / 2) - ((R_COMPASS_OFFSET_X / 10) - (mapStartPosX - SCREEN_WIDTH / 2))) * 2 * 10;
 
         tempX = player->actor.world.pos.x;
@@ -657,65 +658,103 @@ void Minimap_DrawCompassIcons(PlayState* play) {
         tempX /= R_COMPASS_SCALE_X * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
         tempZ /= R_COMPASS_SCALE_Y;
 
-        s16 tempXOffset = R_COMPASS_OFFSET_X + (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? mirrorOffset : 0);
+        s16 tempXOffset =
+            R_COMPASS_OFFSET_X + (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? mirrorOffset : 0);
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
             if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                    X_Margins_Minimap = Left_MM_Margin;
+                };
                 Matrix_Translate(
-                    OTRGetDimensionFromLeftEdge((tempXOffset + (X_Margins_Minimap*10) + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)*10)) /10.0f),
-                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap*10)*-1) - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)*10)*-1)) / 10.0f, 0.0f, MTXMODE_NEW);
+                    OTRGetDimensionFromLeftEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX +
+                                                 (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) /
+                                                10.0f),
+                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ +
+                     ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                    X_Margins_Minimap = Right_MM_Margin;
+                };
                 Matrix_Translate(
-                    OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap*10) + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)*10)) / 10.0f),
-                    (R_COMPASS_OFFSET_Y +((Y_Margins_Minimap*10)*-1) - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)*10)*-1)) / 10.0f, 0.0f, MTXMODE_NEW);
+                    OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX +
+                                                  (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) /
+                                                 10.0f),
+                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ +
+                     ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
                 Matrix_Translate(
-                    (tempXOffset + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)*10) / 10.0f),
-                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap*10)*-1) - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)*10)*-1)) / 10.0f, 0.0f, MTXMODE_NEW);
+                    (tempXOffset + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10) / 10.0f),
+                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ +
+                     ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             }
         } else {
-            Matrix_Translate(OTRGetDimensionFromRightEdge((tempXOffset+(X_Margins_Minimap*10) + tempX) / 10.0f), (R_COMPASS_OFFSET_Y+((Y_Margins_Minimap*10)*-1) - tempZ) / 10.0f, 0.0f, MTXMODE_NEW);
+            Matrix_Translate(OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX) / 10.0f),
+                             (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ) / 10.0f, 0.0f, MTXMODE_NEW);
         }
         Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY);
         Matrix_RotateX(-1.6f, MTXMODE_APPLY);
-        tempX = ((0x7FFF - player->actor.shape.rot.y) / 0x400) * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
+        tempX = ((0x7FFF - player->actor.shape.rot.y) / 0x400) *
+                (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
         Matrix_RotateY(tempX / 10.0f, MTXMODE_APPLY);
-        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-        gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, currentPositionColor.r, currentPositionColor.g, currentPositionColor.b, 255);
+        gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, currentPositionColor.r, currentPositionColor.g, currentPositionColor.b,
+                        255);
         gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL);
 
-        //Player map entry (red arrow)
+        // Player map entry (red arrow)
         tempX = sPlayerInitialPosX;
         tempZ = sPlayerInitialPosZ;
         tempX /= R_COMPASS_SCALE_X * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
         tempZ /= R_COMPASS_SCALE_Y;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
             if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                    X_Margins_Minimap = Left_MM_Margin;
+                };
                 Matrix_Translate(
-                    OTRGetDimensionFromLeftEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) / 10.0f),
-                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap*10)*-1) - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /10.0f, 0.0f, MTXMODE_NEW);
+                    OTRGetDimensionFromLeftEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX +
+                                                 (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) /
+                                                10.0f),
+                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ +
+                     ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                    X_Margins_Minimap = Right_MM_Margin;
+                };
                 Matrix_Translate(
-                    OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap*10) + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) / 10.0f),
-                    (R_COMPASS_OFFSET_Y +((Y_Margins_Minimap*10)*-1) - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10)*-1)) / 10.0f, 0.0f, MTXMODE_NEW);
+                    OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX +
+                                                  (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10)) /
+                                                 10.0f),
+                    (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ +
+                     ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
                 Matrix_Translate(
-                    (tempXOffset + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)*10) / 10.0f),
-                    (R_COMPASS_OFFSET_Y - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)*10)*-1)) / 10.0f, 0.0f, MTXMODE_NEW);
+                    (tempXOffset + tempX + (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) * 10) / 10.0f),
+                    (R_COMPASS_OFFSET_Y - tempZ + ((CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) * 10) * -1)) /
+                        10.0f,
+                    0.0f, MTXMODE_NEW);
             }
         } else {
-            Matrix_Translate(OTRGetDimensionFromRightEdge((tempXOffset+(X_Margins_Minimap*10) + tempX) / 10.0f), (R_COMPASS_OFFSET_Y+((Y_Margins_Minimap*10)*-1) - tempZ) / 10.0f, 0.0f, MTXMODE_NEW);
+            Matrix_Translate(OTRGetDimensionFromRightEdge((tempXOffset + (X_Margins_Minimap * 10) + tempX) / 10.0f),
+                             (R_COMPASS_OFFSET_Y + ((Y_Margins_Minimap * 10) * -1) - tempZ) / 10.0f, 0.0f, MTXMODE_NEW);
         }
         Matrix_Scale(VREG(9) / 100.0f, VREG(9) / 100.0f, VREG(9) / 100.0f, MTXMODE_APPLY);
         Matrix_RotateX(VREG(52) / 10.0f, MTXMODE_APPLY);
-        Matrix_RotateY((sPlayerInitialDirection * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1)) / 10.0f, MTXMODE_APPLY);
-        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        Matrix_RotateY((sPlayerInitialDirection * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1)) /
+                           10.0f,
+                       MTXMODE_APPLY);
+        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, lastEntranceColor.r, lastEntranceColor.g, lastEntranceColor.b, 255);
         gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL);
@@ -728,7 +767,7 @@ void Minimap_Draw(PlayState* play) {
     s32 pad[2];
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
     s32 mapIndex = gSaveContext.mapIndex;
-    Color_RGB8 minimapColor = {0, 255, 255};
+    Color_RGB8 minimapColor = { 0, 255, 255 };
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.Changed"), 0)) {
         minimapColor = CVarGetColor24(CVAR_COSMETIC("HUD.Minimap.Value"), minimapColor);
     }
@@ -741,11 +780,13 @@ void Minimap_Draw(PlayState* play) {
         CVarGetInteger(CVAR_DEVELOPER_TOOLS("EnableMapToggle"), 0);
 
     if (play->pauseCtx.state < 4) {
-        //Minimap margins
+        // Minimap margins
         s16 X_Margins_Minimap;
         s16 Y_Margins_Minimap;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Minimap = Right_MM_Margin;};
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {
+                X_Margins_Minimap = Right_MM_Margin;
+            };
             Y_Margins_Minimap = Bottom_MM_Margin;
         } else {
             X_Margins_Minimap = 0;
@@ -769,9 +810,11 @@ void Minimap_Draw(PlayState* play) {
                                       TEXEL0, 0, PRIMITIVE, 0);
 
                     if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, mapIndex)) {
-                        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b, interfaceCtx->minimapAlpha);
+                        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b,
+                                        interfaceCtx->minimapAlpha);
 
-                        u8 mirrorMode = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? G_TX_MIRROR : G_TX_NOMIRROR;
+                        u8 mirrorMode =
+                            CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? G_TX_MIRROR : G_TX_NOMIRROR;
                         gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegmentName[0], G_IM_FMT_I, 96, 85, 0,
                                                mirrorMode | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                                                G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -779,13 +822,22 @@ void Minimap_Draw(PlayState* play) {
                         s16 dgnMiniMapX = OTRGetRectDimensionFromRightEdge(R_DGN_MINIMAP_X + X_Margins_Minimap);
                         s16 dgnMiniMapY = R_DGN_MINIMAP_Y + Y_Margins_Minimap;
                         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
-                            dgnMiniMapY = R_DGN_MINIMAP_Y + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)+Y_Margins_Minimap;
+                            dgnMiniMapY = R_DGN_MINIMAP_Y + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) +
+                                          Y_Margins_Minimap;
                             if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
-                                dgnMiniMapX = OTRGetDimensionFromLeftEdge(R_DGN_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)+X_Margins_Minimap);
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                    X_Margins_Minimap = Left_MM_Margin;
+                                };
+                                dgnMiniMapX = OTRGetDimensionFromLeftEdge(
+                                    R_DGN_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +
+                                    X_Margins_Minimap);
                             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
-                                dgnMiniMapX = OTRGetDimensionFromRightEdge(R_DGN_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +X_Margins_Minimap);
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                    X_Margins_Minimap = Right_MM_Margin;
+                                };
+                                dgnMiniMapX = OTRGetDimensionFromRightEdge(
+                                    R_DGN_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +
+                                    X_Margins_Minimap);
                             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
                                 dgnMiniMapX = CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
                             }
@@ -809,7 +861,8 @@ void Minimap_Draw(PlayState* play) {
                     }
                 }
 
-                if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_L) && !Play_InCsMode(play) && enableMapToggle) {
+                if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_L) && !Play_InCsMode(play) &&
+                    enableMapToggle) {
                     osSyncPrintf("Game_play_demo_mode_check=%d\n", Play_InCsMode(play));
                     // clang-format off
                     if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4,
@@ -845,24 +898,34 @@ void Minimap_Draw(PlayState* play) {
                     Gfx_SetupDL_39Overlay(play->state.gfxCtx);
 
                     gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
-                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b, interfaceCtx->minimapAlpha);
+                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b,
+                                    interfaceCtx->minimapAlpha);
 
                     u8 mirrorMode = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? G_TX_MIRROR : G_TX_NOMIRROR;
                     gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegmentName[0], G_IM_FMT_IA,
                                            gMapData->owMinimapWidth[mapIndex], gMapData->owMinimapHeight[mapIndex], 0,
-                                           mirrorMode | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                                           mirrorMode | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                           G_TX_NOLOD, G_TX_NOLOD);
 
                     s16 oWMiniMapX = OTRGetRectDimensionFromRightEdge(R_OW_MINIMAP_X + X_Margins_Minimap);
                     s16 oWMiniMapY = R_OW_MINIMAP_Y + Y_Margins_Minimap;
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
-                        oWMiniMapY = R_OW_MINIMAP_Y+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0)+Y_Margins_Minimap;
+                        oWMiniMapY =
+                            R_OW_MINIMAP_Y + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) + Y_Margins_Minimap;
                         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
-                            oWMiniMapX = OTRGetDimensionFromLeftEdge(R_OW_MINIMAP_X+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)+X_Margins_Minimap);
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                X_Margins_Minimap = Left_MM_Margin;
+                            };
+                            oWMiniMapX = OTRGetDimensionFromLeftEdge(
+                                R_OW_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +
+                                X_Margins_Minimap);
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
-                            oWMiniMapX = OTRGetDimensionFromRightEdge(R_OW_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +X_Margins_Minimap);
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                X_Margins_Minimap = Right_MM_Margin;
+                            };
+                            oWMiniMapX = OTRGetDimensionFromRightEdge(
+                                R_OW_MINIMAP_X + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) +
+                                X_Margins_Minimap);
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
                             oWMiniMapX = CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
                         }
@@ -876,10 +939,11 @@ void Minimap_Draw(PlayState* play) {
 
                     gSPWideTextureRectangle(OVERLAY_DISP++, oWMiniMapX << 2, oWMiniMapY << 2,
                                             (oWMiniMapX + gMapData->owMinimapWidth[mapIndex]) << 2,
-                                           (oWMiniMapY + gMapData->owMinimapHeight[mapIndex]) << 2, G_TX_RENDERTILE, sValue,
-                                            0, 1 << 10, 1 << 10);
+                                            (oWMiniMapY + gMapData->owMinimapHeight[mapIndex]) << 2, G_TX_RENDERTILE,
+                                            sValue, 0, 1 << 10, 1 << 10);
 
-                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b, interfaceCtx->minimapAlpha);
+                    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, minimapColor.r, minimapColor.g, minimapColor.b,
+                                    interfaceCtx->minimapAlpha);
 
                     s16 iconSize = 8;
 
@@ -889,50 +953,66 @@ void Minimap_Draw(PlayState* play) {
                         s16 origX = gMapData->owEntranceIconPosX[sEntranceIconMapIndex];
 
                         // Compute the distance of the center of the original texture location to the center of the map
-                        // Then duplicate that and right-align the texture (extra 2 pixels are due to the texture being a 6px left-aligned in a 8px tex)
-                        s16 distFromCenter = (R_OW_MINIMAP_X + (gMapData->owMinimapWidth[mapIndex] / 2)) - (origX + (iconSize / 2));
+                        // Then duplicate that and right-align the texture (extra 2 pixels are due to the texture being
+                        // a 6px left-aligned in a 8px tex)
+                        s16 distFromCenter =
+                            (R_OW_MINIMAP_X + (gMapData->owMinimapWidth[mapIndex] / 2)) - (origX + (iconSize / 2));
                         s16 mirrorOffset = distFromCenter * 2 + (iconSize / 2) - 2;
                         s16 newX = origX + (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? mirrorOffset : 0);
 
-                        // The game authentically uses larger negative values for the entrance icon Y pos value. Normally only the first 12 bits
-                        // would be read when the final value is passed into `gSPTextureRectangle`, but our cosmetic hud placements requires using
-                        // `gSPWideTextureRectangle` which reads the first 24 bits instead. This caused the icon to be placed off screen.
-                        // To address this, we take only the first 10 bits (which are later left-shifted by 2 to get our final 12 bits)
-                        // to fix the entrance icon position when used with `gSPWideTextureRectangle`
+                        // The game authentically uses larger negative values for the entrance icon Y pos value.
+                        // Normally only the first 12 bits would be read when the final value is passed into
+                        // `gSPTextureRectangle`, but our cosmetic hud placements requires using
+                        // `gSPWideTextureRectangle` which reads the first 24 bits instead. This caused the icon to be
+                        // placed off screen. To address this, we take only the first 10 bits (which are later
+                        // left-shifted by 2 to get our final 12 bits) to fix the entrance icon position when used with
+                        // `gSPWideTextureRectangle`
                         s16 newY = gMapData->owEntranceIconPosY[sEntranceIconMapIndex] & 0x3FF;
 
                         s16 entranceX = OTRGetRectDimensionFromRightEdge(newX + X_Margins_Minimap);
                         s16 entranceY = newY + Y_Margins_Minimap;
                         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
                             entranceY = newY + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0) + Y_Margins_Minimap;
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) { 
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
-                                entranceX = OTRGetRectDimensionFromLeftEdge(newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                    X_Margins_Minimap = Left_MM_Margin;
+                                };
+                                entranceX = OTRGetRectDimensionFromLeftEdge(
+                                    newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
                             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
-                                entranceX = OTRGetRectDimensionFromRightEdge(newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                    X_Margins_Minimap = Right_MM_Margin;
+                                };
+                                entranceX = OTRGetRectDimensionFromRightEdge(
+                                    newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
                             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
-                                entranceX = newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
+                                entranceX =
+                                    newX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
                             }
                         }
 
-                        // For icons that normally would be placed in 0,0 leave them there based on the left edge dimension
-                        // or hide them entirely if the fix is applied
+                        // For icons that normally would be placed in 0,0 leave them there based on the left edge
+                        // dimension or hide them entirely if the fix is applied
                         if (gMapData->owEntranceIconPosY[sEntranceIconMapIndex] == 0) {
                             entranceY = 0;
-                            entranceX = CVarGetInteger(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 0) ? -9999 : OTRGetRectDimensionFromLeftEdge(0);
+                            entranceX = CVarGetInteger(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 0)
+                                            ? -9999
+                                            : OTRGetRectDimensionFromLeftEdge(0);
                         }
 
-                        //! @bug UB: sEntranceIconMapIndex can be up to 23 and is accessing owEntranceFlag which is size 20
+                        //! @bug UB: sEntranceIconMapIndex can be up to 23 and is accessing owEntranceFlag which is size
+                        //! 20
                         if ((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) ||
                             ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) &&
                              ((gSaveContext.infTable[26] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]) ||
                               CVarGetInteger(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), 0)))) {
                             gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b,
-                                                iconSize, iconSize, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                                                G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                            gSPWideTextureRectangle(OVERLAY_DISP++, entranceX << 2, entranceY << 2, (entranceX + iconSize) << 2,
-                                                    (entranceY + iconSize) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+                                                iconSize, iconSize, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                                                G_TX_NOLOD);
+                            gSPWideTextureRectangle(OVERLAY_DISP++, entranceX << 2, entranceY << 2,
+                                                    (entranceX + iconSize) << 2, (entranceY + iconSize) << 2,
+                                                    G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
                         }
                     }
 
@@ -942,30 +1022,40 @@ void Minimap_Draw(PlayState* play) {
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
                         entranceY = 154 + Y_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0);
                         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Left_MM_Margin;};
-                            entranceX = OTRGetRectDimensionFromLeftEdge(origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                X_Margins_Minimap = Left_MM_Margin;
+                            };
+                            entranceX = OTRGetRectDimensionFromLeftEdge(
+                                origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap = Right_MM_Margin;};
-                            entranceX = OTRGetRectDimensionFromRightEdge(origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                                X_Margins_Minimap = Right_MM_Margin;
+                            };
+                            entranceX = OTRGetRectDimensionFromRightEdge(
+                                origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0));
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
-                            entranceX = origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
+                            entranceX =
+                                origX + X_Margins_Minimap + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0);
                         }
                     }
 
                     // Ice Cavern entrance icon
-                    if ((play->sceneNum == SCENE_ZORAS_FOUNTAIN) && ((gSaveContext.infTable[26] & gBitFlags[9]) ||
+                    if ((play->sceneNum == SCENE_ZORAS_FOUNTAIN) &&
+                        ((gSaveContext.infTable[26] & gBitFlags[9]) ||
                          CVarGetInteger(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"), 0))) {
-                        gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, iconSize,
-                                            iconSize, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                                            G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                        gSPWideTextureRectangle(OVERLAY_DISP++, entranceX << 2, entranceY << 2, (entranceX + iconSize) << 2,
-                                               (entranceY + iconSize) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+                        gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b,
+                                            iconSize, iconSize, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                            G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                        gSPWideTextureRectangle(OVERLAY_DISP++, entranceX << 2, entranceY << 2,
+                                                (entranceX + iconSize) << 2, (entranceY + iconSize) << 2,
+                                                G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
                     }
 
                     Minimap_DrawCompassIcons(play); // Draw icons for the player spawn and current position
                 }
 
-                if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_L) && !Play_InCsMode(play) && enableMapToggle) {
+                if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_L) && !Play_InCsMode(play) &&
+                    enableMapToggle) {
                     // clang-format off
                     if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4,
                                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); }
diff --git a/soh/src/code/z_map_mark.c b/soh/src/code/z_map_mark.c
index 65e1bd1b14..4d1496fb40 100644
--- a/soh/src/code/z_map_mark.c
+++ b/soh/src/code/z_map_mark.c
@@ -45,41 +45,41 @@ static MapMarkInfo sMapMarkInfoTable[] = {
     { gMapBossIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1 << 10, 1 << 10 },     // Boss Skull Icon
 };
 
-//static MapMarkDataOverlay sMapMarkDataOvl = {
-//    NULL,
-//    //(uintptr_t)_ovl_map_mark_dataSegmentRomStart,
-//    //(uintptr_t)_ovl_map_mark_dataSegmentRomEnd,
-//    //_ovl_map_mark_dataSegmentStart,
-//    //_ovl_map_mark_dataSegmentEnd,
-//    0, 0, 0, 0,
-//    gMapMarkDataTableVanilla,
-//};
+// static MapMarkDataOverlay sMapMarkDataOvl = {
+//     NULL,
+//     //(uintptr_t)_ovl_map_mark_dataSegmentRomStart,
+//     //(uintptr_t)_ovl_map_mark_dataSegmentRomEnd,
+//     //_ovl_map_mark_dataSegmentStart,
+//     //_ovl_map_mark_dataSegmentEnd,
+//     0, 0, 0, 0,
+//     gMapMarkDataTableVanilla,
+// };
 
 MapMarkData** sLoadedMarkDataTable;
 
 void MapMark_Init(PlayState* play) {
-    //MapMarkDataOverlay* overlay = &sMapMarkDataOvl;
-    //u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart;
+    // MapMarkDataOverlay* overlay = &sMapMarkDataOvl;
+    // u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart;
 
-    //overlay->loadedRamAddr = GAMESTATE_ALLOC_MC(&play->state, overlaySize);
-    //LOG_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr);
+    // overlay->loadedRamAddr = GAMESTATE_ALLOC_MC(&play->state, overlaySize);
+    // LOG_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr);
 
-    //Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr);
+    // Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr);
 
-    if(ResourceMgr_IsGameMasterQuest()) {
+    if (ResourceMgr_IsGameMasterQuest()) {
         sLoadedMarkDataTable = gMapMarkDataTableMq;
     } else {
         sLoadedMarkDataTable = gMapMarkDataTableVanilla;
     }
-    //sLoadedMarkDataTable = gMapMarkDataTableVanilla;
-    //sLoadedMarkDataTable = (void*)(uintptr_t)(
+    // sLoadedMarkDataTable = gMapMarkDataTableVanilla;
+    // sLoadedMarkDataTable = (void*)(uintptr_t)(
     //(overlay->vramTable != NULL)
     //? (void*)((uintptr_t)overlay->vramTable - ((intptr_t)overlay->vramStart - (intptr_t)overlay->loadedRamAddr))
     //: NULL);
 }
 
 void MapMark_ClearPointers(PlayState* play) {
-    //sMapMarkDataOvl.loadedRamAddr = NULL;
+    // sMapMarkDataOvl.loadedRamAddr = NULL;
     sLoadedMarkDataTable = NULL;
 }
 
@@ -124,7 +124,9 @@ void MapMark_DrawForDungeon(PlayState* play) {
         s32 X_Margins_Minimap_ic;
         s32 Y_Margins_Minimap_ic;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Minimap_ic = Right_MC_Margin;};
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ORIGINAL_LOCATION) {
+                X_Margins_Minimap_ic = Right_MC_Margin;
+            };
             Y_Margins_Minimap_ic = Bottom_MC_Margin;
         } else {
             X_Margins_Minimap_ic = 0;
@@ -132,40 +134,55 @@ void MapMark_DrawForDungeon(PlayState* play) {
         }
 
         markPoint = &mapMarkIconData->points[0];
-        //Place each chest / boss room icon
+        // Place each chest / boss room icon
         for (i = 0; i < mapMarkIconData->count; i++) {
             if ((mapMarkIconData->markType != MAP_MARK_CHEST) || !Flags_GetTreasure(play, markPoint->chestFlag)) {
                 markInfo = &sMapMarkInfoTable[mapMarkIconData->markType];
-                int height = markInfo->textureHeight * 1.0f; //Adjust Height with scale
-                int width = markInfo->textureWidth * 1.0f; //Adjust Width with scale
+                int height = markInfo->textureHeight * 1.0f; // Adjust Height with scale
+                int width = markInfo->textureWidth * 1.0f;   // Adjust Width with scale
                 int height_factor = (1 << 10) * markInfo->textureHeight / height;
                 int width_factor = (1 << 10) * markInfo->textureWidth / width;
 
                 // The original mark point X originates from the left edge of the map
                 // For mirror mode, we compute the new mark point X by subtracting it from the right side of the
                 // dungeon map and the textures width
-                s16 markPointX = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 96 - markPoint->x - width : markPoint->x;
+                s16 markPointX =
+                    CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 96 - markPoint->x - width : markPoint->x;
 
-                //Minimap chest / boss icon 
-                const s32 PosX_Minimap_ori = GREG(94) + OTRGetRectDimensionFromRightEdge(markPointX+X_Margins_Minimap_ic) + 204;
+                // Minimap chest / boss icon
+                const s32 PosX_Minimap_ori =
+                    GREG(94) + OTRGetRectDimensionFromRightEdge(markPointX + X_Margins_Minimap_ic) + 204;
                 const s32 PosY_Minimap_ori = GREG(95) + markPoint->y + Y_Margins_Minimap_ic + 140;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) != ORIGINAL_LOCATION) {
-                    rectTop = (markPoint->y + Y_Margins_Minimap_ic + 140+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0));
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) { 
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap_ic = Left_MC_Margin;};
-                        if (play->sceneNum == SCENE_DEKU_TREE || play->sceneNum == SCENE_DODONGOS_CAVERN || play->sceneNum == SCENE_JABU_JABU || 
-                            play->sceneNum == SCENE_FOREST_TEMPLE || play->sceneNum == SCENE_FIRE_TEMPLE || play->sceneNum == SCENE_WATER_TEMPLE || 
-                            play->sceneNum == SCENE_SPIRIT_TEMPLE || play->sceneNum == SCENE_SHADOW_TEMPLE || play->sceneNum == SCENE_BOTTOM_OF_THE_WELL || 
-                            play->sceneNum == SCENE_ICE_CAVERN) {
-                            rectLeft = OTRGetRectDimensionFromLeftEdge(markPointX+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)+204+X_Margins_Minimap_ic);
+                    rectTop = (markPoint->y + Y_Margins_Minimap_ic + 140 +
+                               CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosY"), 0));
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_LEFT) {
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                            X_Margins_Minimap_ic = Left_MC_Margin;
+                        };
+                        if (play->sceneNum == SCENE_DEKU_TREE || play->sceneNum == SCENE_DODONGOS_CAVERN ||
+                            play->sceneNum == SCENE_JABU_JABU || play->sceneNum == SCENE_FOREST_TEMPLE ||
+                            play->sceneNum == SCENE_FIRE_TEMPLE || play->sceneNum == SCENE_WATER_TEMPLE ||
+                            play->sceneNum == SCENE_SPIRIT_TEMPLE || play->sceneNum == SCENE_SHADOW_TEMPLE ||
+                            play->sceneNum == SCENE_BOTTOM_OF_THE_WELL || play->sceneNum == SCENE_ICE_CAVERN) {
+                            rectLeft = OTRGetRectDimensionFromLeftEdge(
+                                markPointX + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) + 204 +
+                                X_Margins_Minimap_ic);
                         } else {
-                            rectLeft = OTRGetRectDimensionFromLeftEdge(markPointX+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)+204+X_Margins_Minimap_ic);
+                            rectLeft = OTRGetRectDimensionFromLeftEdge(
+                                markPointX + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) + 204 +
+                                X_Margins_Minimap_ic);
                         }
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_RIGHT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {X_Margins_Minimap_ic = Right_MC_Margin;};
-                        rectLeft = OTRGetRectDimensionFromRightEdge(markPointX+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) + 204 +X_Margins_Minimap_ic);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.UseMargins"), 0) != 0) {
+                            X_Margins_Minimap_ic = Right_MC_Margin;
+                        };
+                        rectLeft = OTRGetRectDimensionFromRightEdge(
+                            markPointX + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) + 204 +
+                            X_Margins_Minimap_ic);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == ANCHOR_NONE) {
-                        rectLeft = markPointX+CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0)+204+X_Margins_Minimap_ic;
+                        rectLeft = markPointX + CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosX"), 0) + 204 +
+                                   X_Margins_Minimap_ic;
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Minimap.PosType"), 0) == HIDDEN) {
                         rectLeft = -9999;
                     }
@@ -179,10 +196,9 @@ void MapMark_DrawForDungeon(PlayState* play) {
                 gDPLoadTextureBlock(OVERLAY_DISP++, markInfo->texture, markInfo->imageFormat, G_IM_SIZ_MARK,
                                     markInfo->textureWidth, markInfo->textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
                                     G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                //Changed to a Wide texture to support Left anchor.
-                gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, rectLeft + width  << 2,
-                                    rectTop + height  << 2, G_TX_RENDERTILE, 0, 0, width_factor,
-                                    height_factor);
+                // Changed to a Wide texture to support Left anchor.
+                gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, rectLeft + width << 2,
+                                        rectTop + height << 2, G_TX_RENDERTILE, 0, 0, width_factor, height_factor);
             }
 
             markPoint++;
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index e6b944a739..fc63f96c8a 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -12,6 +12,14 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/OTRGlobals.h"
+#include "soh/SaveManager.h"
+#include "soh/ResourceManagerHelpers.h"
+
+// #region SOH [NTSC] - Allows custom messages to work on japanese
+static bool sDisplayNextMessageAsEnglish = false;
+static u8 sLastLanguage = LANGUAGE_ENG;
+static u16 sTextBoxNum = 0;
+// #endregion
 
 s16 sTextFade = false; // original name: key_off_flag ?
 
@@ -40,6 +48,7 @@ u16 sOcarinaSongBitFlags = 0; // ocarina bit flags
 MessageTableEntry* sNesMessageEntryTablePtr = NULL;
 MessageTableEntry* sGerMessageEntryTablePtr = NULL;
 MessageTableEntry* sFraMessageEntryTablePtr = NULL;
+MessageTableEntry* sJpnMessageEntryTablePtr = NULL;
 MessageTableEntry* sStaffMessageEntryTablePtr = NULL;
 
 char* _message_0xFFFC_nes;
@@ -152,10 +161,11 @@ u8 Message_ShouldAdvance(PlayState* play) {
     Input* input = &play->state.input[0];
 
     bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0 ? CHECK_BTN_ALL(input->cur.button, BTN_B)
-                                                     : CHECK_BTN_ALL(input->press.button, BTN_B);
+                                                                         : CHECK_BTN_ALL(input->press.button, BTN_B);
 
     if (CHECK_BTN_ALL(input->press.button, BTN_A) || isB_Held || CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     return CHECK_BTN_ALL(input->press.button, BTN_A) || isB_Held || CHECK_BTN_ALL(input->press.button, BTN_CUP);
 }
@@ -164,7 +174,7 @@ u8 Message_ShouldAdvanceSilent(PlayState* play) {
     Input* input = &play->state.input[0];
 
     bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0 ? CHECK_BTN_ALL(input->cur.button, BTN_B)
-                                                     : CHECK_BTN_ALL(input->press.button, BTN_B);
+                                                                         : CHECK_BTN_ALL(input->press.button, BTN_B);
 
     return CHECK_BTN_ALL(input->press.button, BTN_A) || isB_Held || CHECK_BTN_ALL(input->press.button, BTN_CUP);
 }
@@ -180,7 +190,8 @@ void Message_CloseTextbox(PlayState* play) {
         msgCtx->stateTimer = 2;
         msgCtx->msgMode = MSGMODE_TEXT_CLOSING;
         msgCtx->textboxEndType = TEXTBOX_ENDTYPE_DEFAULT;
-        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultReverb);
     }
 }
 
@@ -196,15 +207,18 @@ void Message_HandleChoiceSelection(PlayState* play, u8 numChoices) {
         if (msgCtx->choiceIndex > 128) {
             msgCtx->choiceIndex = 0;
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
-    } else if ((input->rel.stick_y <= -30 && !sAnalogStickHeld) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
+    } else if ((input->rel.stick_y <= -30 && !sAnalogStickHeld) ||
+               (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
         sAnalogStickHeld = true;
         msgCtx->choiceIndex++;
         if (msgCtx->choiceIndex > numChoices) {
             msgCtx->choiceIndex = numChoices;
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if (ABS(input->rel.stick_y) < 30) {
         sAnalogStickHeld = false;
@@ -283,6 +297,45 @@ void Message_GrowTextbox(MessageContext* msgCtx) {
     R_TEXTBOX_X = (R_TEXTBOX_X_TARGET + R_TEXTBOX_WIDTH_TARGET) - (R_TEXTBOX_WIDTH / 2);
 }
 
+// Taken from decomped N64 1.0 z_message https://decomp.me/scratch/462bn
+void Message_FindMessageJPN(PlayState* play, u16 textId) {
+    const char* foundSeg;
+    const char* nextSeg;
+    const char* seg;
+    Font* font = &play->msgCtx.font;
+    MessageTableEntry* messageTableEntry = sJpnMessageEntryTablePtr;
+
+    seg = messageTableEntry->segment;
+
+    while (messageTableEntry->textId != 0xFFFF) {
+        if (messageTableEntry->textId == textId) {
+            foundSeg = messageTableEntry->segment;
+            font->charTexBuf[0] = messageTableEntry->typePos;
+            nextSeg = messageTableEntry->segment;
+            font->msgOffset = messageTableEntry->segment;
+            font->msgLength = messageTableEntry->msgSize;
+            // "Message found!!!"
+            osSyncPrintf(" メッセージが,見つかった！！！ = %x  "
+                         "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
+                         textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
+            return;
+        }
+        messageTableEntry++;
+    }
+
+    // "Message not found!!!"
+    osSyncPrintf(" メッセージが,見つからなかった！！！ = %x\n", textId);
+    messageTableEntry = sJpnMessageEntryTablePtr;
+
+    foundSeg = messageTableEntry->segment;
+    font->charTexBuf[0] = messageTableEntry->typePos;
+    messageTableEntry++;
+    nextSeg = messageTableEntry->segment;
+
+    font->msgOffset = foundSeg - seg;
+    font->msgLength = nextSeg - foundSeg;
+}
+
 void Message_FindMessage(PlayState* play, u16 textId) {
     const char* foundSeg;
     const char* nextSeg;
@@ -290,13 +343,6 @@ void Message_FindMessage(PlayState* play, u16 textId) {
     const char** languageSegmentTable;
     Font* font;
     const char* seg;
-    u16 bufferId = textId;
-    // Use the better owl message if better owl is enabled
-    if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) != 0 && (bufferId == 0x2066 || bufferId == 0x607B ||
-        bufferId == 0x10C2 || bufferId == 0x10C6 || bufferId == 0x206A))
-    {
-        bufferId = 0x71B3;
-    }
 
     if (gSaveContext.language == LANGUAGE_GER)
         messageTableEntry = sGerMessageEntryTablePtr;
@@ -312,7 +358,7 @@ void Message_FindMessage(PlayState* play, u16 textId) {
     while (messageTableEntry->textId != 0xFFFF) {
         font = &play->msgCtx.font;
 
-        if (messageTableEntry->textId == bufferId) {
+        if (messageTableEntry->textId == textId) {
             foundSeg = messageTableEntry->segment;
             font->charTexBuf[0] = messageTableEntry->typePos;
 
@@ -323,14 +369,14 @@ void Message_FindMessage(PlayState* play, u16 textId) {
             // "Message found!!!"
             osSyncPrintf(" メッセージが,見つかった！！！ = %x  "
                          "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
-                         bufferId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
+                         textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
             return;
         }
         messageTableEntry++;
     }
 
     // "Message not found!!!"
-    osSyncPrintf(" メッセージが,見つからなかった！！！ = %x\n", bufferId);
+    osSyncPrintf(" メッセージが,見つからなかった！！！ = %x\n", textId);
     font = &play->msgCtx.font;
     messageTableEntry = sNesMessageEntryTablePtr;
 
@@ -368,14 +414,15 @@ void Message_FindCreditsMessage(PlayState* play, u16 textId) {
     }
 }
 
-#pragma region [SoH] Cosmetics
+#pragma region[SoH] Cosmetics
 
-#define MESSAGE_COSMETICS_HANDLE_COLOR(id)                                                                                       \
-    if (CVarGetInteger(CVAR_COSMETIC("Message." id ".Changed"), 0)) {                                                            \
-        Color_RGBA8 color = CVarGetColor(CVAR_COSMETIC("Message." id ".Value"), CosmeticsEditor_GetDefaultValue("Message." id)); \
-        msgCtx->textColorR = color.r;                                                                                            \
-        msgCtx->textColorG = color.g;                                                                                            \
-        msgCtx->textColorB = color.b;                                                                                            \
+#define MESSAGE_COSMETICS_HANDLE_COLOR(id)                                                                       \
+    if (CVarGetInteger(CVAR_COSMETIC("Message." id ".Changed"), 0)) {                                            \
+        Color_RGBA8 color =                                                                                      \
+            CVarGetColor(CVAR_COSMETIC("Message." id ".Value"), CosmeticsEditor_GetDefaultValue("Message." id)); \
+        msgCtx->textColorR = color.r;                                                                            \
+        msgCtx->textColorG = color.g;                                                                            \
+        msgCtx->textColorB = color.b;                                                                            \
     }
 
 void Cosmetics_MaybeSetTextColor(MessageContext* msgCtx, u16 colorParameter) {
@@ -548,10 +595,10 @@ void Message_DrawTextboxIcon(PlayState* play, Gfx** p, s16 x, s16 y) {
         sIconEnvColors[1] = color;
     } else if (CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) {
         sIconPrimColors[0] = (Color_RGB8){ 0, 200, 80 };
-        sIconPrimColors[1] = (Color_RGB8){ 50, 255, 130 }; 
-        sIconEnvColors[1] = (Color_RGB8){ 50, 255, 130 }; 
+        sIconPrimColors[1] = (Color_RGB8){ 50, 255, 130 };
+        sIconEnvColors[1] = (Color_RGB8){ 50, 255, 130 };
     }
-    static Color_RGB8 sIconPrim =  { 0, 80, 200 };
+    static Color_RGB8 sIconPrim = { 0, 80, 200 };
     static s16 sIconFlashTimer = 12;
     static s16 sIconFlashColorIdx = 0;
     static Color_RGB8 sIconEnv = { 0, 0, 0 };
@@ -790,10 +837,6 @@ f32 sFontWidths[144] = {
     14.0f, // ?
 };
 
-f32 Message_GetCharacterWidth(unsigned char characterIndex) {
-    return sFontWidths[characterIndex] * (R_TEXT_CHAR_SCALE / 100.0f);
-}
-
 u16 Message_DrawItemIcon(PlayState* play, u16 itemId, Gfx** p, u16 i) {
     s32 pad;
     Gfx* gfx = *p;
@@ -811,13 +854,13 @@ u16 Message_DrawItemIcon(PlayState* play, u16 itemId, Gfx** p, u16 i) {
     gSPInvalidateTexCache(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE);
 
     if (itemId >= ITEM_MEDALLION_FOREST) {
-        gDPLoadTextureBlock(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_RGBA, G_IM_SIZ_32b,
-                            24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                            G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_RGBA,
+                            G_IM_SIZ_32b, 24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                            G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
     } else {
-        gDPLoadTextureBlock(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_RGBA, G_IM_SIZ_32b,
-                            32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                            G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_RGBA,
+                            G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                            G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
     }
     gSPTextureRectangle(gfx++, (msgCtx->textPosX + R_TEXTBOX_ICON_XPOS) << 2, R_TEXTBOX_ICON_YPOS << 2,
                         (msgCtx->textPosX + R_TEXTBOX_ICON_XPOS + R_TEXTBOX_ICON_SIZE) << 2,
@@ -899,6 +942,354 @@ void Message_HandleOcarina(PlayState* play) {
     }
 }
 
+// Taken from decomped N64 1.0 z_message https://decomp.me/scratch/462bn
+void Message_DrawTextJPN(PlayState* play, Gfx** gfxP) {
+    MessageContext* msgCtx = &play->msgCtx;
+    Font* font = &play->msgCtx.font;
+    u16 character;
+    u16 j;
+    u16 i;
+    u16 charTexIdx;
+    Gfx* gfx = *gfxP;
+    int gTextSpeed, gSlowTextSpeed;
+
+    play->msgCtx.textPosX = R_TEXT_INIT_XPOS;
+    play->msgCtx.textPosY = R_TEXT_INIT_YPOS;
+
+    if (msgCtx->textBoxType == TEXTBOX_TYPE_NONE_NO_SHADOW) {
+        msgCtx->textColorR = msgCtx->textColorG = msgCtx->textColorB = 0;
+    } else {
+        msgCtx->textColorR = msgCtx->textColorG = msgCtx->textColorB = 255;
+    }
+
+    msgCtx->unk_E3D0 = 0;
+    charTexIdx = 0;
+
+    gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
+    gSlowTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("SlowTextSpeed"), gTextSpeed);
+
+    for (i = 0; i < msgCtx->textDrawPos; i++) {
+        character = msgCtx->msgBufDecodedWide[i];
+
+        switch (character) {
+            case MESSAGE_NEWLINE_JPN:
+                msgCtx->textPosY += R_TEXT_LINE_SPACING;
+                msgCtx->textPosX = R_TEXT_INIT_XPOS;
+                if (msgCtx->choiceNum == 1) {
+                    msgCtx->textPosX += 32;
+                }
+                if (msgCtx->choiceNum == 2) {
+                    msgCtx->textPosX += 32;
+                }
+                break;
+            case MESSAGE_COLOR_JPN:
+                Message_SetTextColor(msgCtx, msgCtx->msgBufDecodedWide[++i]);
+                break;
+            case MESSAGE_SPACE_JPN:
+                msgCtx->textPosX += CVarGetInteger(CVAR_ENHANCEMENT("TextSpacing"), 6);
+                break;
+            case MESSAGE_BOX_BREAK_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    if (!sTextboxSkipped) {
+                        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        msgCtx->msgMode = MSGMODE_TEXT_AWAIT_NEXT;
+                        Font_LoadMessageBoxIcon(&play->msgCtx.font, TEXTBOX_ICON_TRIANGLE);
+                    } else {
+                        msgCtx->msgMode = MSGMODE_TEXT_NEXT_MSG;
+                        msgCtx->textUnskippable = false;
+                        msgCtx->msgBufPos++;
+                    }
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_SHIFT_JPN:
+                msgCtx->textPosX += msgCtx->msgBufDecodedWide[++i];
+                break;
+            case MESSAGE_TEXTID_JPN:
+                // #region SOH [General] Fixes softlock for higher text speeds
+                if (gTextSpeed > 1) {
+                    msgCtx->textDrawPos = i + 1;
+                }
+                // #endregion
+                msgCtx->textboxEndType = TEXTBOX_ENDTYPE_HAS_NEXT;
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    msgCtx->msgMode = MSGMODE_TEXT_DONE;
+                    Font_LoadMessageBoxIcon(&play->msgCtx.font, TEXTBOX_ICON_TRIANGLE);
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_QUICKTEXT_ENABLE_JPN:
+                if ((i + 1 == msgCtx->textDrawPos || (gTextSpeed > 1 && i + gTextSpeed >= msgCtx->textDrawPos)) &&
+                    (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
+                     (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
+                      msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
+                    j = i;
+                    while (true) {
+                        character = msgCtx->msgBufDecodedWide[j];
+                        if ((character != MESSAGE_QUICKTEXT_DISABLE_JPN) && (character != MESSAGE_PERSISTENT_JPN) &&
+                            (character != MESSAGE_EVENT_JPN) && (character != MESSAGE_BOX_BREAK_DELAYED_JPN) &&
+                            (character != MESSAGE_AWAIT_BUTTON_PRESS_JPN) && (character != MESSAGE_BOX_BREAK_JPN) &&
+                            (character != MESSAGE_END_JPN)) {
+                            j++;
+                        } else {
+                            break;
+                        }
+                    }
+                    if (j > msgCtx->textDrawPos) {
+                        i = j - 1;
+                        msgCtx->textDrawPos = j;
+                    }
+                }
+                /* fallthrough */
+            case MESSAGE_QUICKTEXT_DISABLE_JPN:
+                break;
+            case MESSAGE_AWAIT_BUTTON_PRESS_JPN:
+                if (i + 1 == msgCtx->textDrawPos) {
+                    if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                        msgCtx->msgMode = MSGMODE_TEXT_AWAIT_INPUT;
+                        Font_LoadMessageBoxIcon(&play->msgCtx.font, TEXTBOX_ICON_TRIANGLE);
+                    }
+                    *gfxP = gfx;
+                    return;
+                }
+                break;
+            case MESSAGE_BOX_BREAK_DELAYED_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->stateTimer = msgCtx->msgBufDecodedWide[++i];
+                    msgCtx->msgMode = MSGMODE_TEXT_DELAYED_BREAK;
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_FADE2_JPN:
+                break;
+            case MESSAGE_SFX_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && !sMessageHasSetSfx) {
+                    sMessageHasSetSfx = true;
+                    Audio_PlaySoundGeneral(msgCtx->msgBufDecodedWide[i + 1], &gSfxDefaultPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
+                }
+                i++;
+                break;
+            case MESSAGE_ITEM_ICON_JPN:
+                i = Message_DrawItemIcon(play, msgCtx->msgBufDecodedWide[i + 1], &gfx, i);
+                break;
+            case MESSAGE_BACKGROUND_JPN:
+                // clang-format off
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { \
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+                // clang-format on
+                gDPPipeSync(gfx++);
+                gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
+                gDPSetPrimColor(gfx++, 0, 0, sTextboxBackgroundBackPrimColors[msgCtx->textboxBackgroundBackColorIdx][0],
+                                sTextboxBackgroundBackPrimColors[msgCtx->textboxBackgroundBackColorIdx][1],
+                                sTextboxBackgroundBackPrimColors[msgCtx->textboxBackgroundBackColorIdx][2],
+                                msgCtx->textColorAlpha);
+
+                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_I,
+                                       96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                                       G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gSPTextureRectangle(
+                    gfx++, (msgCtx->textPosX + 1) << 2,
+                    (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx]) << 2,
+                    (msgCtx->textPosX + 96 + 1) << 2,
+                    (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx] + 48) << 2,
+                    G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+
+                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900,
+                                       G_IM_FMT_I, 96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                       G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gSPTextureRectangle(
+                    gfx++, (msgCtx->textPosX + 96 + 1) << 2,
+                    (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx]) << 2,
+                    (msgCtx->textPosX + 96 + 1 + 96 + 1) << 2,
+                    (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx] + 48) << 2,
+                    G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+
+                gDPPipeSync(gfx++);
+                gDPSetPrimColor(gfx++, 0, 0, sTextboxBackgroundForePrimColors[msgCtx->textboxBackgroundForeColorIdx][0],
+                                sTextboxBackgroundForePrimColors[msgCtx->textboxBackgroundForeColorIdx][1],
+                                sTextboxBackgroundForePrimColors[msgCtx->textboxBackgroundForeColorIdx][2],
+                                msgCtx->textColorAlpha);
+
+                gDPLoadTextureBlock_4b(gfx++, ((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE), G_IM_FMT_I,
+                                       96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                                       G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gSPTextureRectangle(gfx++, msgCtx->textPosX << 2, R_TEXTBOX_BG_YPOS << 2, (msgCtx->textPosX + 96) << 2,
+                                    (R_TEXTBOX_BG_YPOS + 48) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+
+                gDPLoadTextureBlock_4b(gfx++, ((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900),
+                                       G_IM_FMT_I, 96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                       G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gSPTextureRectangle(gfx++, (msgCtx->textPosX + 96) << 2, R_TEXTBOX_BG_YPOS << 2,
+                                    (msgCtx->textPosX + 192) << 2, (R_TEXTBOX_BG_YPOS + 48) << 2, G_TX_RENDERTILE, 0, 0,
+                                    1 << 10, 1 << 10);
+
+                gDPPipeSync(gfx++);
+                gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
+                                  PRIMITIVE, 0);
+                msgCtx->textPosX += 32;
+                break;
+            case MESSAGE_TEXT_SPEED_JPN:
+                msgCtx->textDelay = msgCtx->msgBufDecodedWide[++i];
+                break;
+            case MESSAGE_UNSKIPPABLE_JPN:
+                msgCtx->textUnskippable = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 1;
+                break;
+            case MESSAGE_TWO_CHOICE_JPN:
+                msgCtx->textboxEndType = TEXTBOX_ENDTYPE_2_CHOICE;
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->choiceTextId = msgCtx->textId;
+                    msgCtx->stateTimer = 4;
+                    msgCtx->choiceIndex = 0;
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0)) {
+                        if ((msgCtx->textId == 0x2066 || msgCtx->textId == 0x607B || msgCtx->textId == 0x10C2 ||
+                             msgCtx->textId == 0x10C6 || msgCtx->textId == 0x206A)) {
+                            msgCtx->choiceIndex = 1;
+                        }
+                    }
+                    Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_ARROW);
+                }
+                break;
+            case MESSAGE_THREE_CHOICE_JPN:
+                msgCtx->textboxEndType = TEXTBOX_ENDTYPE_3_CHOICE;
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->choiceTextId = msgCtx->textId;
+                    msgCtx->stateTimer = 4;
+                    msgCtx->choiceIndex = 0;
+                    Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_ARROW);
+                }
+                break;
+            case MESSAGE_END_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->msgMode = MSGMODE_TEXT_DONE;
+                    if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_DEFAULT) {
+                        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_SQUARE);
+                        if (play->csCtx.state == 0) {
+                            Interface_SetDoAction(play, DO_ACTION_RETURN);
+                        }
+                    }
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_OCARINA_JPN:
+                // #region SOH [General] Fixes softlock for higher text speeds
+                if (gTextSpeed > 1) {
+                    msgCtx->textDrawPos = i + 1;
+                }
+                // #endregion
+                if (i + 1 == msgCtx->textDrawPos) {
+                    Message_HandleOcarina(play);
+                    *gfxP = gfx;
+                    return;
+                }
+                break;
+            case MESSAGE_FADE_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->msgMode = MSGMODE_TEXT_DONE;
+                    msgCtx->textboxEndType = TEXTBOX_ENDTYPE_FADING;
+                    msgCtx->stateTimer = msgCtx->msgBufDecodedWide[++i];
+                    Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_SQUARE);
+                    if (play->csCtx.state == 0) {
+                        Interface_SetDoAction(play, DO_ACTION_RETURN);
+                    }
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_PERSISTENT_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    msgCtx->msgMode = MSGMODE_TEXT_DONE;
+                    msgCtx->textboxEndType = TEXTBOX_ENDTYPE_PERSISTENT;
+                }
+                *gfxP = gfx;
+                return;
+            case MESSAGE_EVENT_JPN:
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
+                    msgCtx->msgMode = MSGMODE_TEXT_DONE;
+                    msgCtx->textboxEndType = TEXTBOX_ENDTYPE_EVENT;
+                    Font_LoadMessageBoxIcon(&play->msgCtx.font, TEXTBOX_ICON_TRIANGLE);
+                    Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+                *gfxP = gfx;
+                return;
+            default:
+                switch (character) {
+                    case 0x8169:
+                    case 0x8175:
+                        msgCtx->textPosX -= 6;
+                        break;
+                    case 0x8145:
+                        msgCtx->textPosX -= 3;
+                        break;
+                    case 0x8148:
+                    case 0x8149:
+                    case 0x814F:
+                    case 0x8250:
+                        msgCtx->textPosX -= 2;
+                        break;
+                }
+                if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && i + 1 == msgCtx->textDrawPos &&
+                    msgCtx->textDelayTimer == msgCtx->textDelay) {
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+                Message_DrawTextChar(play, &font->charTexBuf[charTexIdx], &gfx);
+                charTexIdx += FONT_CHAR_TEX_SIZE;
+
+                switch (character) {
+                    case 0x8144:
+                        msgCtx->textPosX += 3;
+                        break;
+                    case 0x816A:
+                    case 0x8176:
+                        msgCtx->textPosX += 5;
+                        break;
+                    case 0x8141:
+                    case 0x8142:
+                    case 0x8168:
+                        msgCtx->textPosX += 7;
+                        break;
+                    case 0x814F:
+                    case 0x8194:
+                    case 0x8196:
+                        msgCtx->textPosX += 9;
+                        break;
+                    case 0x8145:
+                        msgCtx->textPosX += 10;
+                        break;
+                    default:
+                        msgCtx->textPosX += (s32)(16.0f * (R_TEXT_CHAR_SCALE / 100.0f));
+                        break;
+                }
+                break;
+        }
+    }
+
+    if (msgCtx->textDelay == 0) {
+        msgCtx->textDrawPos = i + gTextSpeed;
+        if (msgCtx->textDrawPos > msgCtx->decodedTextLen) {
+            msgCtx->textDrawPos = msgCtx->decodedTextLen + 1;
+        }
+    } else if (msgCtx->textDelayTimer == 0) {
+        msgCtx->textDrawPos = i + 1;
+        msgCtx->textDelayTimer = msgCtx->textDelay;
+    } else if (msgCtx->textDelayTimer <= gSlowTextSpeed) {
+        msgCtx->textDelayTimer = 0;
+    } else {
+        msgCtx->textDelayTimer -= gSlowTextSpeed;
+    }
+    *gfxP = gfx;
+}
+
 /**
  * Draws the text contents of a textbox, up to the current point that has
  * been scrolled to so far.
@@ -936,7 +1327,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
 
     gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
     gSlowTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("SlowTextSpeed"), gTextSpeed);
-    
+
     for (i = 0; i < msgCtx->textDrawPos; i++) {
         character = msgCtx->msgBufDecoded[i];
 
@@ -960,7 +1351,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
             case MESSAGE_BOX_BREAK:
                 if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
                     if (!sTextboxSkipped) {
-                        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         msgCtx->msgMode = MSGMODE_TEXT_AWAIT_NEXT;
                         Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
                     } else {
@@ -977,16 +1369,18 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
             case MESSAGE_TEXTID:
                 msgCtx->textboxEndType = TEXTBOX_ENDTYPE_HAS_NEXT;
                 if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
-                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->msgMode = MSGMODE_TEXT_DONE;
                     Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
                 }
                 *gfxP = gfx;
                 return;
             case MESSAGE_QUICKTEXT_ENABLE:
-                if (i < msgCtx->textDrawPos && i + gTextSpeed >= msgCtx->textDrawPos && (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
-                                                                                         (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
-                                                                                          msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
+                if ((i + 1 == msgCtx->textDrawPos || (gTextSpeed > 1 && i + gTextSpeed >= msgCtx->textDrawPos)) &&
+                    (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
+                     (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
+                      msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
                     j = i;
                     while (true) {
                         lookAheadCharacter = msgCtx->msgBufDecoded[j];
@@ -1048,8 +1442,9 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                     // "Sound (SE)"
                     osSyncPrintf("サウンド（ＳＥ）\n");
                     sfxHi = msgCtx->msgBufDecoded[i + 1] << 8;
-                    Audio_PlaySoundGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gSfxDefaultPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 }
                 i += 2;
                 break;
@@ -1067,8 +1462,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                                 sTextboxBackgroundBackPrimColors[msgCtx->textboxBackgroundBackColorIdx][2],
                                 msgCtx->textColorAlpha);
 
-                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_I, 96, 48,
-                                       0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_I,
+                                       96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                                        G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
                 gSPTextureRectangle(
                     gfx++, (msgCtx->textPosX + 1) << 2,
@@ -1077,9 +1472,9 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                     (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx] + 48) << 2,
                     G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
 
-                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900, G_IM_FMT_I,
-                                       96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                                       G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gDPLoadTextureBlock_4b(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900,
+                                       G_IM_FMT_I, 96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                       G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
                 gSPTextureRectangle(
                     gfx++, (msgCtx->textPosX + 96 + 1) << 2,
                     (R_TEXTBOX_BG_YPOS + sTextboxBackgroundYOffsets[msgCtx->textboxBackgroundYOffsetIdx]) << 2,
@@ -1093,8 +1488,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                                 sTextboxBackgroundForePrimColors[msgCtx->textboxBackgroundForeColorIdx][2],
                                 msgCtx->textColorAlpha);
 
-                gDPLoadTextureBlock_4b(gfx++, ((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE), G_IM_FMT_I, 96,
-                                       48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                gDPLoadTextureBlock_4b(gfx++, ((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE), G_IM_FMT_I,
+                                       96, 48, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                                        G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
                 gSPTextureRectangle(gfx++, msgCtx->textPosX << 2, R_TEXTBOX_BG_YPOS << 2, (msgCtx->textPosX + 96) << 2,
                                     (R_TEXTBOX_BG_YPOS + 48) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
@@ -1124,6 +1519,12 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                     msgCtx->choiceTextId = msgCtx->textId;
                     msgCtx->stateTimer = 4;
                     msgCtx->choiceIndex = 0;
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0)) {
+                        if ((msgCtx->textId == 0x2066 || msgCtx->textId == 0x607B || msgCtx->textId == 0x10C2 ||
+                             msgCtx->textId == 0x10C6 || msgCtx->textId == 0x206A)) {
+                            msgCtx->choiceIndex = 1;
+                        }
+                    }
                     Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_ARROW);
                 }
                 break;
@@ -1140,8 +1541,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                 if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
                     msgCtx->msgMode = MSGMODE_TEXT_DONE;
                     if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_DEFAULT) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_SQUARE);
                         if (play->csCtx.state == 0) {
                             Interface_SetDoAction(play, DO_ACTION_RETURN);
@@ -1151,7 +1552,11 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                 *gfxP = gfx;
                 return;
             case MESSAGE_OCARINA:
-                msgCtx->textDrawPos = i + 1;
+                // #region SOH [General] Fixes softlock for higher text speeds
+                if (gTextSpeed > 1) {
+                    msgCtx->textDrawPos = i + 1;
+                }
+                // #endregion
                 if (i + 1 == msgCtx->textDrawPos) {
                     Message_HandleOcarina(play);
                     *gfxP = gfx;
@@ -1172,7 +1577,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                 return;
             case MESSAGE_PERSISTENT:
                 if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
-                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->msgMode = MSGMODE_TEXT_DONE;
                     msgCtx->textboxEndType = TEXTBOX_ENDTYPE_PERSISTENT;
                 }
@@ -1183,14 +1589,33 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
                     msgCtx->msgMode = MSGMODE_TEXT_DONE;
                     msgCtx->textboxEndType = TEXTBOX_ENDTYPE_EVENT;
                     Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
-                    Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
                 *gfxP = gfx;
                 return;
+            // #region SOH [NTSC] - support multiple file name languages
+            case MESSAGE_NAME:
+                if (ResourceMgr_GetGameRegion(0) == GAME_REGION_NTSC &&
+                    gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_JPN) {
+                    if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && i + 1 == msgCtx->textDrawPos &&
+                        msgCtx->textDelayTimer == msgCtx->textDelay) {
+                        Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    }
+                    Message_DrawTextChar(play, &font->charTexBuf[charTexIdx], &gfx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+
+                    msgCtx->textPosX += (s32)(16.0f * (R_TEXT_CHAR_SCALE / 100.0f));
+                    break;
+                }
+                /* fallthrough */
+            // #endregion
             default:
                 if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && i + 1 == msgCtx->textDrawPos &&
                     msgCtx->textDelayTimer == msgCtx->textDelay) {
-                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
                 Message_DrawTextChar(play, &font->charTexBuf[charTexIdx], &gfx);
                 charTexIdx += FONT_CHAR_TEX_SIZE;
@@ -1213,29 +1638,30 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
 }
 
 void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
-    static s16 sIconItem32XOffsets[] = { 74, 74, 74 };
-    static s16 sIconItem24XOffsets[] = { 72, 72, 72 };
+    static s16 sIconItem32XOffsets[] = { 74, 74, 74, 54 };
+    static s16 sIconItem24XOffsets[] = { 72, 72, 72, 50 };
     MessageContext* msgCtx = &play->msgCtx;
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
+    u8 language = sDisplayNextMessageAsEnglish ? LANGUAGE_ENG : gSaveContext.language;
 
     if (itemId == ITEM_DUNGEON_MAP) {
         interfaceCtx->mapPalette[30] = 0xFF;
         interfaceCtx->mapPalette[31] = 0xFF;
     }
     if (itemId < ITEM_MEDALLION_FOREST) {
-        R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem32XOffsets[gSaveContext.language];
+        R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem32XOffsets[language];
         R_TEXTBOX_ICON_YPOS = y + 6;
         R_TEXTBOX_ICON_SIZE = 32;
-        memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
-               gItemIcons[itemId], strlen(gItemIcons[itemId]) + 1);
+        memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, gItemIcons[itemId],
+               strlen(gItemIcons[itemId]) + 1);
         // "Item 32-0"
         osSyncPrintf("アイテム32-0\n");
     } else {
-        R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[gSaveContext.language];
+        R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[language];
         R_TEXTBOX_ICON_YPOS = y + 10;
         R_TEXTBOX_ICON_SIZE = 24;
-        memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
-               gItemIcons[itemId], strlen(gItemIcons[itemId]) + 1);
+        memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, gItemIcons[itemId],
+               strlen(gItemIcons[itemId]) + 1);
         // "Item 24"
         osSyncPrintf("アイテム24＝%d (%d) {%d}\n", itemId, itemId - ITEM_KOKIRI_EMERALD, 84);
     }
@@ -1243,6 +1669,602 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
     msgCtx->choiceNum = 1;
 }
 
+// #region SOH [NTSC] - Add support for filenames on different versions
+bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxPtr) {
+    s32 i;
+    s32 j;
+    s32 playerNameLen;
+    u8 curChar2;
+    MessageContext* msgCtx = &play->msgCtx;
+    Font* font = &play->msgCtx.font;
+    u8 emptyChar = (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) ? 0x3E : 0xDF;
+
+    for (playerNameLen = ARRAY_COUNT(gSaveContext.playerName); playerNameLen > 0; playerNameLen--) {
+        if (gSaveContext.playerName[playerNameLen - 1] != emptyChar) {
+            break;
+        }
+    }
+
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL &&
+        (gSaveContext.language != LANGUAGE_JPN || sDisplayNextMessageAsEnglish)) {
+        if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) {
+            for (i = 0; i < playerNameLen; i++) {
+                curChar2 = gSaveContext.playerName[i];
+                if (curChar2 == 0x3E) {
+                    curChar2 = ' ';
+                } else if (curChar2 == 0x40) {
+                    curChar2 = '.';
+                } else if (curChar2 == 0x3F) {
+                    curChar2 = '-';
+                } else if (curChar2 < 0xA) {
+                    curChar2 += 0;
+                    curChar2 += '0';
+                } else if (curChar2 < 0x24) {
+                    curChar2 += 0;
+                    curChar2 += '7';
+                } else if (curChar2 < 0x3E) {
+                    curChar2 += 0;
+                    curChar2 += '=';
+                }
+                if (curChar2 != ' ') {
+                    Font_LoadChar(font, curChar2 - ' ', *charTexIdxPtr);
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+
+                msgCtx->msgBufDecoded[*decodedBufPosPtr] = curChar2;
+                (*decodedBufPosPtr)++;
+            }
+        } else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_ENG) {
+            for (i = 0; i < playerNameLen; i++) {
+                curChar2 = gSaveContext.playerName[i];
+                if (curChar2 == 0xDF) {
+                    curChar2 = ' ';
+                } else if (curChar2 == 0xEA) {
+                    curChar2 = '.';
+                } else if (curChar2 == 0xE4) {
+                    curChar2 = '-';
+                } else if (curChar2 < 0xA) {
+                    curChar2 += 0;
+                    curChar2 += '0';
+                } else if (curChar2 < 0xC5) {
+                    curChar2 += 0;
+                    curChar2 -= 0x6A;
+                } else if (curChar2 < 0xDF) {
+                    curChar2 += 0;
+                    curChar2 -= 0x64;
+                }
+                if (curChar2 != ' ') {
+                    Font_LoadChar(font, curChar2 - ' ', *charTexIdxPtr);
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+
+                msgCtx->msgBufDecoded[(*decodedBufPosPtr)] = curChar2;
+                (*decodedBufPosPtr)++;
+            }
+        } else { // NAME_LANGUAGE_NTSC_JPN
+            for (i = 0; i < playerNameLen; i++) {
+                curChar2 = gSaveContext.playerName[i];
+
+                // Remove JPN Characters from the pool (set them to ' ')
+                if (curChar2 >= 0x0A && curChar2 < 0xAB) {
+                    curChar2 = 0xDF;
+                } else if (curChar2 == 0xE7 || curChar2 == 0xE8) {
+                    curChar2 = 0xDF;
+                }
+
+                if (curChar2 == 0xDF) {
+                    curChar2 = ' ';
+                } else if (curChar2 == 0xEA) {
+                    curChar2 = '.';
+                } else if (curChar2 == 0xE4) {
+                    curChar2 = '-';
+                } else if (curChar2 < 0xA) {
+                    curChar2 += 0;
+                    curChar2 += '0';
+                } else if (curChar2 < 0xC5) {
+                    curChar2 += 0;
+                    curChar2 -= 0x6A;
+                } else if (curChar2 < 0xDF) {
+                    curChar2 += 0;
+                    curChar2 -= 0x64;
+                }
+
+                if (curChar2 != ' ') {
+                    Font_LoadChar(font, curChar2 - ' ', *charTexIdxPtr);
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+
+                msgCtx->msgBufDecoded[(*decodedBufPosPtr)] = curChar2;
+                (*decodedBufPosPtr)++;
+            }
+        }
+    } else { // GAME_REGION_NTSC
+
+        if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_JPN) {
+            if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+                    u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
+                    msgCtx->msgBufDecodedWide[(*decodedBufPosPtr)++] = MESSAGE_NAME_JPN;
+                    for (j = 0; j < FONT_CHAR_TEX_SIZE; j += 4) {
+                        font->charTexBuf[*charTexIdxPtr + j + 0] = fontBuf[j + 0];
+                        font->charTexBuf[*charTexIdxPtr + j + 1] = fontBuf[j + 1];
+                        font->charTexBuf[*charTexIdxPtr + j + 2] = fontBuf[j + 2];
+                        font->charTexBuf[*charTexIdxPtr + j + 3] = fontBuf[j + 3];
+                    }
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+            } else { // LANGUAGE_ENG
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+                    u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
+                    msgCtx->msgBufDecoded[(*decodedBufPosPtr)++] = MESSAGE_NAME;
+                    for (j = 0; j < FONT_CHAR_TEX_SIZE; j += 4) {
+                        font->charTexBuf[*charTexIdxPtr + j + 0] = fontBuf[j + 0];
+                        font->charTexBuf[*charTexIdxPtr + j + 1] = fontBuf[j + 1];
+                        font->charTexBuf[*charTexIdxPtr + j + 2] = fontBuf[j + 2];
+                        font->charTexBuf[*charTexIdxPtr + j + 3] = fontBuf[j + 3];
+                    }
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+            }
+        } else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_ENG) {
+            if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+                    u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
+                    msgCtx->msgBufDecodedWide[(*decodedBufPosPtr)++] = MESSAGE_NAME_JPN;
+                    for (j = 0; j < FONT_CHAR_TEX_SIZE; j += 4) {
+                        font->charTexBuf[*charTexIdxPtr + j + 0] = fontBuf[j + 0];
+                        font->charTexBuf[*charTexIdxPtr + j + 1] = fontBuf[j + 1];
+                        font->charTexBuf[*charTexIdxPtr + j + 2] = fontBuf[j + 2];
+                        font->charTexBuf[*charTexIdxPtr + j + 3] = fontBuf[j + 3];
+                    }
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+            } else { // LANGUAGE_ENG
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+                    if (curChar2 == 0xDF) {
+                        curChar2 = ' ';
+                    } else if (curChar2 == 0xEA) {
+                        curChar2 = '.';
+                    } else if (curChar2 == 0xE4) {
+                        curChar2 = '-';
+                    } else if (curChar2 < 0xA) {
+                        curChar2 += 0;
+                        curChar2 += '0';
+                    } else if (curChar2 < 0xC5) {
+                        curChar2 += 0;
+                        curChar2 -= 0x6A;
+                    } else if (curChar2 < 0xDF) {
+                        curChar2 += 0;
+                        curChar2 -= 0x64;
+                    }
+                    if (curChar2 != ' ') {
+                        Font_LoadChar(font, curChar2 - ' ', *charTexIdxPtr);
+                        *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                    }
+
+                    msgCtx->msgBufDecoded[(*decodedBufPosPtr)] = curChar2;
+                    (*decodedBufPosPtr)++;
+                }
+            }
+        } else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) {
+            if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+
+                    // Convert PAL char to NTSC
+                    if (curChar2 >= 0xA && curChar2 <= 0x3E) {
+                        curChar2 += 0xA1;
+                    } else if (curChar2 == 0x3F) {
+                        curChar2 += 0xA5;
+                    } else if (curChar2 == 0x40) {
+                        curChar2 += 0xAA;
+                    }
+
+                    u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
+                    msgCtx->msgBufDecoded[(*decodedBufPosPtr)++] = MESSAGE_NAME;
+                    for (j = 0; j < FONT_CHAR_TEX_SIZE; j += 4) {
+                        font->charTexBuf[*charTexIdxPtr + j + 0] = fontBuf[j + 0];
+                        font->charTexBuf[*charTexIdxPtr + j + 1] = fontBuf[j + 1];
+                        font->charTexBuf[*charTexIdxPtr + j + 2] = fontBuf[j + 2];
+                        font->charTexBuf[*charTexIdxPtr + j + 3] = fontBuf[j + 3];
+                    }
+                    *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                }
+            } else { // LANGUAGE_ENG
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar2 = gSaveContext.playerName[i];
+                    if (curChar2 == 0x3E) {
+                        curChar2 = ' ';
+                    } else if (curChar2 == 0x40) {
+                        curChar2 = '.';
+                    } else if (curChar2 == 0x3F) {
+                        curChar2 = '-';
+                    } else if (curChar2 < 0xA) {
+                        curChar2 += 0;
+                        curChar2 += '0';
+                    } else if (curChar2 < 0x24) {
+                        curChar2 += 0;
+                        curChar2 += '7';
+                    } else if (curChar2 < 0x3E) {
+                        curChar2 += 0;
+                        curChar2 += '=';
+                    }
+                    if (curChar2 != ' ') {
+                        Font_LoadChar(font, curChar2 - ' ', *charTexIdxPtr);
+                        *charTexIdxPtr += FONT_CHAR_TEX_SIZE;
+                    }
+
+                    msgCtx->msgBufDecoded[*decodedBufPosPtr] = curChar2;
+                    (*decodedBufPosPtr)++;
+                }
+            }
+        }
+    }
+    (*decodedBufPosPtr)--;
+
+    return true;
+}
+// #endregion
+
+// Taken from decomped N64 1.0 z_message https://decomp.me/scratch/462bn
+void Message_DecodeJPN(PlayState* play) {
+    u16 curChar;
+    u8 curChar2;
+    u8* fontBuf;
+    s32 loadChar;
+    s32 charTexIdx = 0;
+    s16 playerNameLen;
+    s16 numLines = 0;
+    s16 digits[4];
+    u16 value;
+    s16 decodedBufPos = 0;
+    s16 i;
+    s16 j;
+    f32 timeInSeconds;
+    MessageContext* msgCtx = &play->msgCtx;
+    Font* font = &play->msgCtx.font;
+
+    while (true) {
+        curChar = msgCtx->msgBufDecodedWide[decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos];
+
+        // #region SOH - Don't require input for credits textboxes in randomizer
+        if (CVarGetInteger(CVAR_ENHANCEMENT("NoInputForCredits"), 0) &&
+            (msgCtx->textId == 0x706F || msgCtx->textId == 0x7091 || msgCtx->textId == 0x7092 ||
+             msgCtx->textId == 0x7093 || msgCtx->textId == 0x7094 || msgCtx->textId == 0x7095)) {
+            if (curChar == MESSAGE_BOX_BREAK_JPN) {
+                curChar = msgCtx->msgBufDecodedWide[decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos] =
+                    MESSAGE_BOX_BREAK_DELAYED_JPN;
+            } else if (curChar == MESSAGE_END_JPN) {
+                // use fade instead of fade2, as fade2 is unimplemented in JP
+                curChar = msgCtx->msgBufDecodedWide[decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos] =
+                    MESSAGE_FADE_JPN;
+                curChar = msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[++msgCtx->msgBufPos] =
+                    MESSAGE_END_JPN;
+            }
+        }
+        // #endregion
+
+        if (curChar == MESSAGE_BOX_BREAK_JPN || curChar == MESSAGE_TEXTID_JPN ||
+            curChar == MESSAGE_BOX_BREAK_DELAYED_JPN || curChar == MESSAGE_EVENT_JPN || curChar == MESSAGE_END_JPN) {
+            msgCtx->msgMode = MSGMODE_TEXT_DISPLAYING;
+            msgCtx->textDrawPos = 1;
+            R_TEXT_INIT_YPOS = R_TEXTBOX_Y + 6;
+            if (msgCtx->textBoxType != TEXTBOX_TYPE_NONE_BOTTOM) {
+                if (numLines == 0) {
+                    R_TEXT_INIT_YPOS = (u16)(R_TEXTBOX_Y + 22);
+                } else if (numLines == 1) {
+                    R_TEXT_INIT_YPOS = (u16)(R_TEXTBOX_Y + 14);
+                }
+            }
+            if (curChar == MESSAGE_TEXTID_JPN) {
+                sNextTextId = msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos + 1];
+            }
+            if (curChar == MESSAGE_BOX_BREAK_DELAYED_JPN) {
+                msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos + 1];
+                msgCtx->msgBufPos += 2;
+            }
+            msgCtx->decodedTextLen = decodedBufPos;
+            if (sTextboxSkipped) {
+                msgCtx->textDrawPos = msgCtx->decodedTextLen;
+            }
+            break;
+        }
+        if (curChar == MESSAGE_NAME_JPN) {
+            // #region SOH [NTSC] - Support multiple names
+            if (!Message_DecodeName(play, &decodedBufPos, &charTexIdx)) {
+                for (playerNameLen = 8; playerNameLen > 0; playerNameLen--) {
+                    if (gSaveContext.playerName[playerNameLen - 1] != 0xDF) {
+                        break;
+                    }
+                }
+                for (i = 0; i < playerNameLen; i++) {
+                    curChar = gSaveContext.playerName[i];
+                    // FAKE? Figure out what best way to match is
+                    fontBuf = &font->fontBuf[(curChar * 32) << 2];
+                    msgCtx->msgBufDecodedWide[decodedBufPos + i] = MESSAGE_NAME_JPN;
+
+                    for (j = 0; j < FONT_CHAR_TEX_SIZE; j += 4) {
+                        font->charTexBuf[charTexIdx + j + 0] = fontBuf[j + 0];
+                        font->charTexBuf[charTexIdx + j + 1] = fontBuf[j + 1];
+                        font->charTexBuf[charTexIdx + j + 2] = fontBuf[j + 2];
+                        font->charTexBuf[charTexIdx + j + 3] = fontBuf[j + 3];
+                    }
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                }
+                decodedBufPos += playerNameLen - 1;
+            }
+        } else if (curChar == MESSAGE_MARATHON_TIME_JPN || curChar == MESSAGE_RACE_TIME_JPN) {
+            digits[0] = digits[1] = digits[2] = 0;
+            if (curChar == MESSAGE_RACE_TIME_JPN) {
+                digits[3] = gSaveContext.timerSeconds;
+            } else {
+                digits[3] = gSaveContext.subTimerSeconds;
+            }
+            while (digits[3] >= 60) {
+                digits[1]++;
+                if (digits[1] >= 10) {
+                    digits[0]++;
+                    digits[1] -= 10;
+                }
+                digits[3] -= 60;
+            }
+            while (digits[3] >= 10) {
+                digits[2]++;
+                digits[3] -= 10;
+            }
+
+            for (i = 0; i < 4; i++) {
+                Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                charTexIdx += FONT_CHAR_TEX_SIZE;
+                msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                decodedBufPos++;
+                if (i == 1) {
+                    Font_LoadCharWide(font, 0x95AA, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = 0x95AA;
+                    decodedBufPos++;
+                } else if (i == 3) {
+                    Font_LoadCharWide(font, 0x9562, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = 0x9562;
+                }
+            }
+        } else if (curChar == MESSAGE_POINTS_JPN) {
+            digits[0] = digits[1] = digits[2] = 0;
+            digits[3] = gSaveContext.minigameScore;
+
+            while (digits[3] >= 1000) {
+                digits[0]++;
+                digits[3] -= 1000;
+            }
+            while (digits[3] >= 100) {
+                digits[1]++;
+                digits[3] -= 100;
+            }
+            while (digits[3] >= 10) {
+                digits[2]++;
+                digits[3] -= 10;
+            }
+            loadChar = false;
+            for (i = 0; i < 4; i++) {
+                if (i == 3 || digits[i] != 0) {
+                    loadChar = true;
+                }
+                if (loadChar) {
+                    Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                    decodedBufPos++;
+                }
+            }
+            decodedBufPos--;
+        } else if (curChar == MESSAGE_TOKENS_JPN) {
+            digits[0] = digits[1] = 0;
+            digits[2] = gSaveContext.inventory.gsTokens;
+
+            while (digits[2] >= 100) {
+                digits[0]++;
+                digits[2] -= 100;
+            }
+            while (digits[2] >= 10) {
+                digits[1]++;
+                digits[2] -= 10;
+            }
+
+            loadChar = false;
+            for (i = 0; i < 3; i++) {
+                if (i == 2 || digits[i] != 0) {
+                    loadChar = true;
+                }
+                if (loadChar) {
+                    Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                    decodedBufPos++;
+                }
+            }
+            decodedBufPos--;
+        } else if (curChar == MESSAGE_FISH_INFO_JPN) {
+            digits[0] = 0;
+            digits[1] = gSaveContext.minigameScore;
+
+            while (digits[1] >= 10) {
+                digits[0]++;
+                digits[1] -= 10;
+            }
+
+            for (i = 0; i < 2; i++) {
+                if (i == 1 || digits[i] != 0) {
+                    Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                    decodedBufPos++;
+                }
+            }
+            decodedBufPos--;
+        } else if (curChar == MESSAGE_HIGHSCORE_JPN) {
+            value = HIGH_SCORE(font->msgBufWide[++msgCtx->msgBufPos] & 0xFF);
+            if ((font->msgBufWide[msgCtx->msgBufPos] & 0xFF) == 2) {
+                if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
+                    value &= 0x7F;
+                } else {
+                    value = ((HIGH_SCORE(font->msgBufWide[msgCtx->msgBufPos]) & 0xFF000000) >> 0x18) & 0x7F;
+                }
+            }
+            switch (font->msgBufWide[msgCtx->msgBufPos] & 0xFF) {
+                case HS_HBA:
+                case HS_POE_POINTS:
+                case HS_FISHING:
+                    digits[0] = digits[1] = digits[2] = 0;
+                    digits[3] = value;
+
+                    while (digits[3] >= 1000) {
+                        digits[0]++;
+                        digits[3] -= 1000;
+                    }
+                    while (digits[3] >= 100) {
+                        digits[1]++;
+                        digits[3] -= 100;
+                    }
+                    while (digits[3] >= 10) {
+                        digits[2]++;
+                        digits[3] -= 10;
+                    }
+
+                    loadChar = false;
+                    for (i = 0; i < 4; i++) {
+                        if (i == 3 || digits[i] != 0) {
+                            loadChar = true;
+                        }
+                        if (loadChar) {
+                            Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                            charTexIdx += FONT_CHAR_TEX_SIZE;
+                            msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                            decodedBufPos++;
+                        }
+                    }
+                    decodedBufPos--;
+                    break;
+                case HS_UNK_05:
+                    break;
+                case HS_HORSE_RACE:
+                case HS_MARATHON:
+                case HS_DAMPE_RACE:
+                    digits[0] = digits[1] = digits[2] = 0;
+                    digits[3] = value;
+
+                    while (digits[3] >= 60) {
+                        digits[1]++;
+                        if (digits[1] >= 10) {
+                            digits[0]++;
+                            digits[1] -= 10;
+                        }
+                        digits[3] -= 60;
+                    }
+                    while (digits[3] >= 10) {
+                        digits[2]++;
+                        digits[3] -= 10;
+                    }
+
+                    for (i = 0; i < 4; i++) {
+                        Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                        charTexIdx += FONT_CHAR_TEX_SIZE;
+                        msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                        decodedBufPos++;
+                        if (i == 1) {
+                            Font_LoadCharWide(font, 0x95AA, charTexIdx);
+                            charTexIdx += FONT_CHAR_TEX_SIZE;
+                            msgCtx->msgBufDecodedWide[decodedBufPos] = 0x95AA;
+                            decodedBufPos++;
+                        } else if (i == 3) {
+                            Font_LoadCharWide(font, 0x9562, charTexIdx);
+                            charTexIdx += FONT_CHAR_TEX_SIZE;
+                            msgCtx->msgBufDecodedWide[decodedBufPos] = 0x9562;
+                        }
+                    }
+                    break;
+            }
+        } else if (curChar == MESSAGE_TIME_JPN) {
+            digits[0] = 0;
+            timeInSeconds = gSaveContext.dayTime * (24.0f * 60.0f / 0x10000);
+
+            digits[1] = timeInSeconds / 60.0f;
+            while (digits[1] >= 10) {
+                digits[0]++;
+                digits[1] -= 10;
+            }
+            digits[2] = 0;
+            digits[3] = (s16)timeInSeconds % 60;
+            while (digits[3] >= 10) {
+                digits[2]++;
+                digits[3] -= 10;
+            }
+
+            for (i = 0; i < 4; i++) {
+                Font_LoadCharWide(font, digits[i] + 0x824F, charTexIdx);
+                charTexIdx += FONT_CHAR_TEX_SIZE;
+                msgCtx->msgBufDecodedWide[decodedBufPos] = digits[i] + 0x824F;
+                decodedBufPos++;
+                if (i == 1) {
+                    Font_LoadCharWide(font, 0x8E9E, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = 0x8E9E;
+                    decodedBufPos++;
+                } else if (i == 3) {
+                    Font_LoadCharWide(font, 0x95AA, charTexIdx);
+                    charTexIdx += FONT_CHAR_TEX_SIZE;
+                    msgCtx->msgBufDecodedWide[decodedBufPos] = 0x95AA;
+                }
+            }
+        } else if (curChar == MESSAGE_ITEM_ICON_JPN) {
+            msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[msgCtx->msgBufPos + 1];
+            Message_LoadItemIcon(play, font->msgBufWide[msgCtx->msgBufPos + 1], R_TEXTBOX_Y + 10);
+        } else if (curChar == MESSAGE_BACKGROUND_JPN) {
+            msgCtx->textboxBackgroundIdx = font->msgBufWide[msgCtx->msgBufPos + 1] * 2;
+            msgCtx->textboxBackgroundForeColorIdx = (font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF000) >> 12;
+            msgCtx->textboxBackgroundBackColorIdx = (font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF00) >> 8;
+            msgCtx->textboxBackgroundYOffsetIdx = (font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF0) >> 4;
+            msgCtx->textboxBackgroundUnkArg = font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF;
+            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, gRedMessageXLeftTex,
+                   strlen(gRedMessageXLeftTex) + 1);
+            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900, gRedMessageXRightTex,
+                   strlen(gRedMessageXRightTex) + 1);
+            numLines = 2;
+            msgCtx->msgBufPos += 2;
+            R_TEXTBOX_BG_YPOS = R_TEXTBOX_Y + 8;
+        } else if (curChar == MESSAGE_COLOR_JPN) {
+            msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[++msgCtx->msgBufPos] & 0xF;
+        } else if (curChar == MESSAGE_NEWLINE_JPN) {
+            numLines++;
+        } else if (curChar != MESSAGE_QUICKTEXT_ENABLE_JPN && curChar != MESSAGE_QUICKTEXT_DISABLE_JPN &&
+                   curChar != MESSAGE_AWAIT_BUTTON_PRESS_JPN && curChar != MESSAGE_OCARINA_JPN &&
+                   curChar != MESSAGE_PERSISTENT_JPN && curChar != MESSAGE_UNSKIPPABLE_JPN) {
+            if (curChar == MESSAGE_FADE_JPN) {
+                sTextFade = true;
+                msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[++msgCtx->msgBufPos] & 0xFF;
+            } else if (curChar == MESSAGE_SHIFT_JPN || curChar == MESSAGE_TEXT_SPEED_JPN) {
+                msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[++msgCtx->msgBufPos] & 0xFF;
+            } else if (curChar == MESSAGE_SFX_JPN) {
+                msgCtx->msgBufDecodedWide[++decodedBufPos] = font->msgBufWide[++msgCtx->msgBufPos];
+            } else if (curChar == MESSAGE_TWO_CHOICE_JPN) {
+                msgCtx->choiceNum = 2;
+            } else if (curChar == MESSAGE_THREE_CHOICE_JPN) {
+                msgCtx->choiceNum = 3;
+                R_TEXT_INIT_XPOS += 32;
+            } else if (curChar != MESSAGE_SPACE_JPN) {
+                Font_LoadCharWide(font, curChar, charTexIdx);
+                charTexIdx += FONT_CHAR_TEX_SIZE;
+            }
+        }
+        decodedBufPos++;
+        msgCtx->msgBufPos++;
+    }
+}
+
 void Message_Decode(PlayState* play) {
     u8 temp_s2;
     u8 phi_s1;
@@ -1258,7 +2280,12 @@ void Message_Decode(PlayState* play) {
     MessageContext* msgCtx = &play->msgCtx;
     Font* font = &play->msgCtx.font;
 
-    if ((msgCtx->msgMode >= MSGMODE_OCARINA_STARTING && msgCtx->msgMode <= MSGMODE_OCARINA_AWAIT_INPUT) || msgCtx->textBoxType == TEXTBOX_TYPE_OCARINA) {
+    // #region SOH [NTSC] - allow switching languages mid text
+    sTextBoxNum++;
+    // #endregion
+
+    if ((msgCtx->msgMode >= MSGMODE_OCARINA_STARTING && msgCtx->msgMode <= MSGMODE_OCARINA_AWAIT_INPUT) ||
+        msgCtx->textBoxType == TEXTBOX_TYPE_OCARINA) {
         // TODO: Figure out what specific textures to invalidate to prevent the ocarina textboxes from flashing
         gSPInvalidateTexCache(play->state.gfxCtx->polyOpa.p++, NULL);
     } else {
@@ -1273,23 +2300,29 @@ void Message_Decode(PlayState* play) {
     play->msgCtx.textUnskippable = play->msgCtx.textDelay = play->msgCtx.textDelayTimer = 0;
     sTextFade = false;
 
+    // #region SOH [NTSC] - Originally this is all in one function, but for ease of reading, the JP decoding will be
+    // separated out
+    if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+        Message_DecodeJPN(play);
+        return;
+    }
+    // #endregion
+
     while (true) {
         phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos];
 
         // Don't require input for credits textboxes in randomizer
-        if (CVarGetInteger(CVAR_ENHANCEMENT("NoInputForCredits"), 0) && (
-            msgCtx->textId == 0x706F ||
-            msgCtx->textId == 0x7091 ||
-            msgCtx->textId == 0x7092 ||
-            msgCtx->textId == 0x7093 ||
-            msgCtx->textId == 0x7094 ||
-            msgCtx->textId == 0x7095
-        )) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("NoInputForCredits"), 0) &&
+            (msgCtx->textId == 0x706F || msgCtx->textId == 0x7091 || msgCtx->textId == 0x7092 ||
+             msgCtx->textId == 0x7093 || msgCtx->textId == 0x7094 || msgCtx->textId == 0x7095)) {
             if (temp_s2 == MESSAGE_BOX_BREAK) {
-                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] = MESSAGE_BOX_BREAK_DELAYED;
+                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] =
+                    MESSAGE_BOX_BREAK_DELAYED;
             } else if (temp_s2 == MESSAGE_END) {
-                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] = MESSAGE_FADE2;
-                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos] = MESSAGE_END;
+                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] =
+                    MESSAGE_FADE2;
+                phi_s1 = temp_s2 = msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos] =
+                    MESSAGE_END;
             }
         }
 
@@ -1328,40 +2361,46 @@ void Message_Decode(PlayState* play) {
             break;
         } else if (temp_s2 == MESSAGE_NAME) {
             // Substitute the player name control character for the file's player name.
-            for (playerNameLen = ARRAY_COUNT(gSaveContext.playerName); playerNameLen > 0; playerNameLen--) {
-                if (gSaveContext.playerName[playerNameLen - 1] != 0x3E) {
-                    break;
+            // #region SOH [NTSC] - Support PAL and NTSC with either language
+            //                      Function always returns true, so block is not entered
+            if (!Message_DecodeName(play, &decodedBufPos, &charTexIdx)) {
+                for (playerNameLen = ARRAY_COUNT(gSaveContext.playerName); playerNameLen > 0; playerNameLen--) {
+                    if (gSaveContext.playerName[playerNameLen - 1] != 0x3E) {
+                        break;
+                    }
                 }
+                // "Name"
+                osSyncPrintf("\n名前 ＝ ");
+
+                for (i = 0; i < playerNameLen; i++) {
+                    phi_s1 = gSaveContext.playerName[i];
+                    if (phi_s1 == 0x3E) {
+                        phi_s1 = ' ';
+                    } else if (phi_s1 == 0x40) {
+                        phi_s1 = '.';
+                    } else if (phi_s1 == 0x3F) {
+                        phi_s1 = '-';
+                    } else if (phi_s1 < 0xA) {
+                        phi_s1 += 0;
+                        phi_s1 += '0';
+                    } else if (phi_s1 < 0x24) {
+                        phi_s1 += 0;
+                        phi_s1 += '7';
+                    } else if (phi_s1 < 0x3E) {
+                        phi_s1 += 0;
+                        phi_s1 += '=';
+                    }
+                    if (phi_s1 != ' ') {
+                        Font_LoadChar(font, phi_s1 - ' ', charTexIdx);
+                        charTexIdx += FONT_CHAR_TEX_SIZE;
+                    }
+                    osSyncPrintf("%x ", phi_s1);
+                    msgCtx->msgBufDecoded[decodedBufPos] = phi_s1;
+                    decodedBufPos++;
+                }
+                decodedBufPos--;
             }
-            // "Name"
-            osSyncPrintf("\n名前 ＝ ");
-            for (i = 0; i < playerNameLen; i++) {
-                phi_s1 = gSaveContext.playerName[i];
-                if (phi_s1 == 0x3E) {
-                    phi_s1 = ' ';
-                } else if (phi_s1 == 0x40) {
-                    phi_s1 = '.';
-                } else if (phi_s1 == 0x3F) {
-                    phi_s1 = '-';
-                } else if (phi_s1 < 0xA) {
-                    phi_s1 += 0;
-                    phi_s1 += '0';
-                } else if (phi_s1 < 0x24) {
-                    phi_s1 += 0;
-                    phi_s1 += '7';
-                } else if (phi_s1 < 0x3E) {
-                    phi_s1 += 0;
-                    phi_s1 += '=';
-                }
-                if (phi_s1 != ' ') {
-                    Font_LoadChar(font, phi_s1 - ' ', charTexIdx);
-                    charTexIdx += FONT_CHAR_TEX_SIZE;
-                }
-                osSyncPrintf("%x ", phi_s1);
-                msgCtx->msgBufDecoded[decodedBufPos] = phi_s1;
-                decodedBufPos++;
-            }
-            decodedBufPos--;
+            // #endregion
         } else if (temp_s2 == MESSAGE_MARATHON_TIME || temp_s2 == MESSAGE_RACE_TIME) {
             // Convert the values of the appropriate timer to digits and add the
             //  digits to the decoded buffer in place of the control character.
@@ -1369,9 +2408,9 @@ void Message_Decode(PlayState* play) {
             osSyncPrintf("\nＥＶＥＮＴタイマー ＝ ");
             digits[0] = digits[1] = digits[2] = 0;
             if (temp_s2 == MESSAGE_RACE_TIME) {
-                digits[3] = gSaveContext.timer1Value;
+                digits[3] = gSaveContext.timerSeconds;
             } else {
-                digits[3] = gSaveContext.timer2Value;
+                digits[3] = gSaveContext.subTimerSeconds;
             }
 
             while (digits[3] >= 60) {
@@ -1621,8 +2660,10 @@ void Message_Decode(PlayState* play) {
             msgCtx->textboxBackgroundYOffsetIdx = (font->msgBuf[msgCtx->msgBufPos + 3] & 0xF0) >> 4;
             msgCtx->textboxBackgroundUnkArg = font->msgBuf[msgCtx->msgBufPos + 3] & 0xF;
 
-            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, gRedMessageXLeftTex, strlen(gRedMessageXLeftTex) + 1);
-            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900, gRedMessageXRightTex, strlen(gRedMessageXRightTex) + 1);
+            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, gRedMessageXLeftTex,
+                   strlen(gRedMessageXLeftTex) + 1);
+            memcpy((uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900, gRedMessageXRightTex,
+                   strlen(gRedMessageXRightTex) + 1);
 
             msgCtx->msgBufPos += 3;
             R_TEXTBOX_BG_YPOS = R_TEXTBOX_Y + 8;
@@ -1672,6 +2713,8 @@ void Message_OpenText(PlayState* play, u16 textId) {
     Font* font = &msgCtx->font;
     s16 textBoxType;
 
+    sDisplayNextMessageAsEnglish = false;
+
     if (msgCtx->msgMode == MSGMODE_NONE) {
         gSaveContext.unk_13EE = gSaveContext.unk_13EA;
     }
@@ -1698,6 +2741,10 @@ void Message_OpenText(PlayState* play, u16 textId) {
         R_TEXT_LINE_SPACING = 6;
         R_TEXT_INIT_XPOS = 20;
         YREG(1) = 48;
+    } else if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+        R_TEXT_CHAR_SCALE = 88;
+        R_TEXT_LINE_SPACING = 18;
+        R_TEXT_INIT_XPOS = 50;
     } else {
         R_TEXT_CHAR_SCALE = 75;
         R_TEXT_LINE_SPACING = 12;
@@ -1709,7 +2756,8 @@ void Message_OpenText(PlayState* play, u16 textId) {
         textId += (gSaveContext.inventory.questItems & 0xF0000000 & 0xF0000000) >> 0x1C;
     } else if (!IS_RANDO && (msgCtx->textId == 0xC && CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON))) {
         textId = 0xB; // Traded Giant's Knife for Biggoron Sword
-    } else if (!IS_RANDO && (msgCtx->textId == 0xB4 && (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_CURSED_MAN_IN_SKULL_HOUSE)))) {
+    } else if (!IS_RANDO &&
+               (msgCtx->textId == 0xB4 && (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_CURSED_MAN_IN_SKULL_HOUSE)))) {
         textId = 0xB5; // Destroyed Gold Skulltula
     }
     // Ocarina Staff + Dialog
@@ -1722,6 +2770,11 @@ void Message_OpenText(PlayState* play, u16 textId) {
     }
     msgCtx->textId = textId;
 
+    // #region SOH [NTSC] - allow for switching languages mid textbox
+    sLastLanguage = gSaveContext.language;
+    sTextBoxNum = 0;
+    // #endregion
+
     if (textId == 0x2030) { // Talking to Ingo as adult in Lon Lon Ranch for the first time before freeing Epona
         osSyncPrintf(VT_FGCOL(YELLOW));
         osSyncPrintf("？？？？？？？？？？？？？？？？  z_message.c  ？？？？？？？？？？？？？？？？？？\n");
@@ -1732,6 +2785,14 @@ void Message_OpenText(PlayState* play, u16 textId) {
     // RANDOTODO: Use this for ice trap messages
     if (CustomMessage_RetrieveIfExists(play)) {
         osSyncPrintf("Found custom message");
+        if (gSaveContext.language == LANGUAGE_JPN) {
+            sDisplayNextMessageAsEnglish = true;
+            if (!sTextIsCredits) {
+                R_TEXT_CHAR_SCALE = 75;
+                R_TEXT_LINE_SPACING = 12;
+                R_TEXT_INIT_XPOS = 65;
+            }
+        }
     } else if (sTextIsCredits) {
         Message_FindCreditsMessage(play, textId);
         msgCtx->msgLength = font->msgLength;
@@ -1739,23 +2800,35 @@ void Message_OpenText(PlayState* play, u16 textId) {
         memcpy(font->msgBuf, src, font->msgLength);
 
         // OTRTODO
-        //DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)(_staff_message_data_staticSegmentRomStart + 4 + font->msgOffset),
-                            //font->msgLength, __FILE__, __LINE__);
+        // DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)(_staff_message_data_staticSegmentRomStart + 4 +
+        // font->msgOffset), font->msgLength, __FILE__, __LINE__);
 
     } else if (CVarGetInteger(CVAR_ENHANCEMENT("AskToEquip"), 0) &&
                (((LINK_IS_ADULT || CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)) &&
                  // 0C = Biggoron, 4B = Giant's, 4E = Mirror Shield, 50-51 = Tunics
-                 (textId == 0x0C || textId == 0x4B || textId == 0x4E ||
-                  textId == 0x50 || textId == 0x51)) ||
+                 (textId == 0x0C || textId == 0x4B || textId == 0x4E || textId == 0x50 || textId == 0x51)) ||
                 ((!LINK_IS_ADULT || CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)) &&
-                // 4C = Deku Shield, A4 = Kokiri Sword
+                 // 4C = Deku Shield, A4 = Kokiri Sword
                  (textId == 0x4C || textId == 0xA4)) ||
                 // 4D == Hylian Shield
                 textId == 0x4D)) {
+        // NTSC TODO: Translate EquipNow Message
         Message_FindMessage(play, textId);
+        if (gSaveContext.language == LANGUAGE_JPN) {
+            sDisplayNextMessageAsEnglish = true;
+            if (!sTextIsCredits) {
+                R_TEXT_CHAR_SCALE = 75;
+                R_TEXT_LINE_SPACING = 12;
+                R_TEXT_INIT_XPOS = 65;
+            }
+        }
         msgCtx->msgLength = font->msgLength = GetEquipNowMessage(font->msgBuf, font->msgOffset, sizeof(font->msgBuf));
     } else {
-        Message_FindMessage(play, textId);
+        if (gSaveContext.language == LANGUAGE_JPN) {
+            Message_FindMessageJPN(play, textId);
+        } else {
+            Message_FindMessage(play, textId);
+        }
         msgCtx->msgLength = font->msgLength;
         char* src = (uintptr_t)font->msgOffset;
         memcpy(font->msgBuf, src, font->msgLength);
@@ -1890,7 +2963,8 @@ void Message_StartOcarina(PlayState* play, u16 ocarinaActionId) {
         osSyncPrintf("ocarina_set 000000000000000000  = %d\n", ocarinaActionId);
         msgCtx->ocarinaAction = ocarinaActionId;
         if (ocarinaActionId >= OCARINA_ACTION_CHECK_SARIA && ocarinaActionId <= OCARINA_ACTION_CHECK_STORMS) {
-            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         if (ocarinaActionId == OCARINA_ACTION_SCARECROW_PLAYBACK) {
             Message_OpenText(play, 0x86F); // Ocarina
@@ -1964,8 +3038,9 @@ void Message_StartOcarina(PlayState* play, u16 ocarinaActionId) {
         gSaveContext.unk_13EA = 0;
         Interface_ChangeAlpha(1);
     }
-    for (k = 0, j = 0; j < 48; j++, k += 0x80) {
-        func_8006EE50(&play->msgCtx.font, 0x8140, k);
+    for (k = 0, j = 0; j < 48; j++) {
+        Font_LoadCharWide(&play->msgCtx.font, 0x8140, k);
+        k += FONT_CHAR_TEX_SIZE;
     }
 }
 
@@ -2061,27 +3136,24 @@ void Message_SetView(View* view) {
     func_800AB2C4(view);
 }
 
-#define FLASH_NOTE_COLORS(target, source)                     \
-    r = ABS(target.r - source[sOcarinaNoteFlashColorIdx].r) / \
-        sOcarinaNoteFlashTimer;                               \
-    g = ABS(target.g - source[sOcarinaNoteFlashColorIdx].g) / \
-        sOcarinaNoteFlashTimer;                               \
-    b = ABS(target.b - source[sOcarinaNoteFlashColorIdx].b) / \
-        sOcarinaNoteFlashTimer;                               \
-    if (target.r >= source[sOcarinaNoteFlashColorIdx].r) {    \
-        target.r -= r;                                        \
-    } else {                                                  \
-        target.r += r;                                        \
-    }                                                         \
-    if (target.g >= source[sOcarinaNoteFlashColorIdx].g) {    \
-        target.g -= g;                                        \
-    } else {                                                  \
-        target.g += g;                                        \
-    }                                                         \
-    if (target.b >= source[sOcarinaNoteFlashColorIdx].b) {    \
-        target.b -= b;                                        \
-    } else {                                                  \
-        target.b += b;                                        \
+#define FLASH_NOTE_COLORS(target, source)                                             \
+    r = ABS(target.r - source[sOcarinaNoteFlashColorIdx].r) / sOcarinaNoteFlashTimer; \
+    g = ABS(target.g - source[sOcarinaNoteFlashColorIdx].g) / sOcarinaNoteFlashTimer; \
+    b = ABS(target.b - source[sOcarinaNoteFlashColorIdx].b) / sOcarinaNoteFlashTimer; \
+    if (target.r >= source[sOcarinaNoteFlashColorIdx].r) {                            \
+        target.r -= r;                                                                \
+    } else {                                                                          \
+        target.r += r;                                                                \
+    }                                                                                 \
+    if (target.g >= source[sOcarinaNoteFlashColorIdx].g) {                            \
+        target.g -= g;                                                                \
+    } else {                                                                          \
+        target.g += g;                                                                \
+    }                                                                                 \
+    if (target.b >= source[sOcarinaNoteFlashColorIdx].b) {                            \
+        target.b -= b;                                                                \
+    } else {                                                                          \
+        target.b += b;                                                                \
     }
 
 /**
@@ -2094,7 +3166,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
     };
     static s16 sOcarinaEffectActorParams[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000 };
     static void* sOcarinaNoteTextures[] = {
-        gOcarinaBtnIconATex, gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex, gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
+        gOcarinaBtnIconATex,     gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex,
+        gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
     };
 
     // SoH [Cosmetics] The following Color_RGB8 were originally static
@@ -2229,6 +3302,32 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
     gSPSegment(gfx++, 0x07, msgCtx->textboxSegment);
 
     if (msgCtx->msgLength != 0) {
+        // #region SOH [NTSC] - allow switching languages mid text
+        if (gSaveContext.language != sLastLanguage) {
+            u16 drawPos = msgCtx->textDrawPos;
+            u16 choiceNum = msgCtx->choiceNum;
+            u16 textUnskippable = msgCtx->textUnskippable;
+            u16 textboxEndType = msgCtx->textboxEndType;
+            u8 msgMode = msgCtx->msgMode;
+            s16 textboxColorAlphaCurrent = msgCtx->textboxColorAlphaCurrent;
+            s32 textBoxNum;
+            s32 textBoxMax = sTextBoxNum - 1;
+            Message_OpenText(play, msgCtx->textId);
+            Message_Decode(play);
+            // Move to correct textbox
+            for (textBoxNum = 0; textBoxNum < textBoxMax; textBoxNum++) {
+                msgCtx->msgBufPos++;
+                Message_Decode(play);
+            }
+            msgCtx->textDrawPos = (drawPos > msgCtx->decodedTextLen) ? msgCtx->decodedTextLen : drawPos;
+            msgCtx->choiceNum = choiceNum;
+            msgCtx->textUnskippable = textUnskippable;
+            msgCtx->textboxEndType = textboxEndType;
+            msgCtx->msgMode = msgMode;
+            msgCtx->textboxColorAlphaCurrent = textboxColorAlphaCurrent;
+        }
+        // #endregion
+
         if (msgCtx->ocarinaAction != OCARINA_ACTION_FROGS && msgCtx->msgMode != MSGMODE_SONG_PLAYED_ACT &&
             msgCtx->msgMode >= MSGMODE_TEXT_BOX_GROWING && msgCtx->msgMode < MSGMODE_TEXT_CLOSING &&
             msgCtx->textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) {
@@ -2243,8 +3342,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
         gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
                           0);
 
-            bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0 ? CHECK_BTN_ALL(play->state.input[0].cur.button, BTN_B)
-                                                         : CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B);
+        bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0
+                            ? CHECK_BTN_ALL(play->state.input[0].cur.button, BTN_B)
+                            : CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B);
 
         switch (msgCtx->msgMode) {
             case MSGMODE_TEXT_START:
@@ -2254,19 +3354,32 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 break;
             case MSGMODE_TEXT_CONTINUING:
                 if (msgCtx->stateTimer == 1) {
-                    for (j = 0, i = 0; i < 48; i++, j += 0x80) {
-                        func_8006EE50(&play->msgCtx.font, 0x8140, j);
+                    for (j = 0, i = 0; i < 48; i++) {
+                        Font_LoadCharWide(&play->msgCtx.font, 0x8140, j);
+                        j += FONT_CHAR_TEX_SIZE;
+                    }
+                    if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                        Message_DrawTextJPN(play, &gfx);
+                    } else {
+                        Message_DrawText(play, &gfx);
                     }
-                    Message_DrawText(play, &gfx);
                 }
                 break;
             case MSGMODE_TEXT_DISPLAYING:
             case MSGMODE_TEXT_DELAYED_BREAK:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_TEXT_AWAIT_INPUT:
             case MSGMODE_TEXT_AWAIT_NEXT:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 Message_DrawTextboxIcon(play, &gfx, R_TEXTBOX_END_XPOS, R_TEXTBOX_END_YPOS);
                 break;
             case MSGMODE_OCARINA_STARTING:
@@ -2309,7 +3422,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 }
                 if (msgCtx->ocarinaAction != OCARINA_ACTION_FREE_PLAY &&
                     msgCtx->ocarinaAction != OCARINA_ACTION_CHECK_NOWARP) {
-                    Message_DrawText(play, &gfx);
+                    if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                        Message_DrawTextJPN(play, &gfx);
+                    } else {
+                        Message_DrawText(play, &gfx);
+                    }
                 }
                 break;
             case MSGMODE_OCARINA_PLAYING:
@@ -2337,7 +3454,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                             if (msgCtx->ocarinaStaff->state < OCARINA_SONG_SARIAS ||
                                 msgCtx->ocarinaStaff->state == OCARINA_SONG_SCARECROW) {
                                 Audio_OcaSetInstrument(0);
-                                Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                        &gSfxDefaultReverb);
                                 msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
                             } else {
@@ -2347,14 +3465,16 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                                 msgCtx->msgMode = MSGMODE_SONG_PLAYED;
                                 msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
                                 msgCtx->stateTimer = 10;
-                                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
                                 Interface_ChangeAlpha(1);
                             }
                         } else if (msgCtx->ocarinaAction == OCARINA_ACTION_CHECK_SCARECROW) {
                             if (msgCtx->ocarinaStaff->state < OCARINA_SONG_SCARECROW) {
                                 Audio_OcaSetInstrument(0);
-                                Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                        &gSfxDefaultReverb);
                                 msgCtx->stateTimer = 10;
                                 msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
@@ -2365,8 +3485,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                                 msgCtx->msgMode = MSGMODE_SONG_PLAYED;
                                 msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
                                 msgCtx->stateTimer = 10;
-                                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
                                 Interface_ChangeAlpha(1);
                             }
                         } else if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY) {
@@ -2376,23 +3497,25 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                             msgCtx->msgMode = MSGMODE_SONG_PLAYED;
                             msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
                             msgCtx->stateTimer = 10;
-                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
                         Interface_ChangeAlpha(1);
                     } else {
                         Audio_OcaSetInstrument(0);
-                        Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
                     }
                 } else if (msgCtx->ocarinaStaff->state == 0xFF) {
                     Audio_OcaSetInstrument(0);
-                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->stateTimer = 10;
                     msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
                 } else if (isB_Held) {
@@ -2402,7 +3525,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 }
                 if (msgCtx->ocarinaAction != OCARINA_ACTION_FREE_PLAY &&
                     msgCtx->ocarinaAction != OCARINA_ACTION_CHECK_NOWARP) {
-                    Message_DrawText(play, &gfx);
+                    if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                        Message_DrawTextJPN(play, &gfx);
+                    } else {
+                        Message_DrawText(play, &gfx);
+                    }
                 }
                 break;
             case MSGMODE_OCARINA_CORRECT_PLAYBACK:
@@ -2460,11 +3587,19 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                         play->msgCtx.ocarinaMode = OCARINA_MODE_03;
                     }
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_OCARINA_FAIL:
             case MSGMODE_SONG_PLAYBACK_FAIL:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
             case MSGMODE_OCARINA_FAIL_NO_TEXT:
                 msgCtx->stateTimer--;
                 if (msgCtx->stateTimer == 0) {
@@ -2516,10 +3651,10 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     Message_ResetOcarinaNoteState();
                     if (msgCtx->lastPlayedSong >= OCARINA_SONG_SARIAS &&
                         msgCtx->lastPlayedSong < OCARINA_SONG_MEMORY_GAME) {
-                        Actor_Spawn(&play->actorCtx, play,
-                                    sOcarinaEffectActorIds[msgCtx->lastPlayedSong - OCARINA_SONG_SARIAS],
-                                    player->actor.world.pos.x, player->actor.world.pos.y, player->actor.world.pos.z, 0,
-                                    0, 0, sOcarinaEffectActorParams[msgCtx->lastPlayedSong - OCARINA_SONG_SARIAS], true);
+                        Actor_Spawn(
+                            &play->actorCtx, play, sOcarinaEffectActorIds[msgCtx->lastPlayedSong - OCARINA_SONG_SARIAS],
+                            player->actor.world.pos.x, player->actor.world.pos.y, player->actor.world.pos.z, 0, 0, 0,
+                            sOcarinaEffectActorParams[msgCtx->lastPlayedSong - OCARINA_SONG_SARIAS], true);
                     }
                 }
                 break;
@@ -2528,7 +3663,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     play->msgCtx.lastPlayedSong == OCARINA_SONG_TIME ||
                     play->msgCtx.lastPlayedSong == OCARINA_SONG_STORMS ||
                     play->msgCtx.lastPlayedSong == OCARINA_SONG_SUNS) {
-                    Message_DrawText(play, &gfx);
+                    if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                        Message_DrawTextJPN(play, &gfx);
+                    } else {
+                        Message_DrawText(play, &gfx);
+                    }
                     Audio_OcaSetInstrument(1);
                     Audio_OcaSetInstrument(1);
                     Audio_OcaSetSongPlayback(msgCtx->lastPlayedSong + 1, 1);
@@ -2572,36 +3711,53 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     sOcarinaNoteBufPos = 0;
                     msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION;
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_DISPLAY_SONG_PLAYED_TEXT_BEGIN:
                 Message_ContinueTextbox(play, msgCtx->lastPlayedSong + 0x893); // You played [song name]
                 Message_Decode(play);
                 msgCtx->msgMode = MSGMODE_DISPLAY_SONG_PLAYED_TEXT;
 
-                if (CVarGetInteger(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 0) == 0 || play->msgCtx.lastPlayedSong == OCARINA_SONG_TIME
-                    || play->msgCtx.lastPlayedSong == OCARINA_SONG_STORMS ||
+                if (CVarGetInteger(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 0) == 0 ||
+                    play->msgCtx.lastPlayedSong == OCARINA_SONG_TIME ||
+                    play->msgCtx.lastPlayedSong == OCARINA_SONG_STORMS ||
                     play->msgCtx.lastPlayedSong == OCARINA_SONG_SUNS) {
                     msgCtx->stateTimer = 20;
                 } else {
                     msgCtx->stateTimer = 1;
                 }
 
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_DISPLAY_SONG_PLAYED_TEXT:
                 msgCtx->stateTimer--;
                 if (msgCtx->stateTimer == 0) {
                     msgCtx->msgMode = MSGMODE_SONG_PLAYED_ACT_BEGIN;
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SONG_PLAYED_ACT_BEGIN:
                 Audio_OcaSetInstrument(0);
                 Message_ResetOcarinaNoteState();
                 msgCtx->msgMode = MSGMODE_SONG_PLAYED_ACT;
                 msgCtx->stateTimer = 2;
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SONG_PLAYED_ACT:
                 msgCtx->stateTimer--;
@@ -2680,7 +3836,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     }
                 }
             case MSGMODE_SONG_DEMONSTRATION_DONE:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SONG_PLAYBACK:
                 msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
@@ -2697,20 +3857,23 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
 
                     u8 songItemId = ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state];
 
-                    if (
-                        (songItemId == ITEM_SONG_MINUET && GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true)) ||
+                    if ((songItemId == ITEM_SONG_MINUET &&
+                         GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true)) ||
                         (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true)) ||
-                        (songItemId == ITEM_SONG_SERENADE && GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true)) ||
-                        (songItemId == ITEM_SONG_REQUIEM && GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) ||
-                        (songItemId == ITEM_SONG_NOCTURNE && GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) ||
-                        (songItemId == ITEM_SONG_PRELUDE && GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) ||
+                        (songItemId == ITEM_SONG_SERENADE &&
+                         GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true)) ||
+                        (songItemId == ITEM_SONG_REQUIEM &&
+                         GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) ||
+                        (songItemId == ITEM_SONG_NOCTURNE &&
+                         GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) ||
+                        (songItemId == ITEM_SONG_PRELUDE &&
+                         GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) ||
                         (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true)) ||
                         (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(VB_GIVE_ITEM_EPONAS_SONG, true)) ||
                         (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true)) ||
                         (songItemId == ITEM_SONG_SUN && GameInteractor_Should(VB_GIVE_ITEM_SUNS_SONG, true)) ||
                         (songItemId == ITEM_SONG_TIME && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_TIME, true)) ||
-                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true))
-                    ) {
+                        (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true))) {
                         Item_Give(play, songItemId);
                     }
 
@@ -2719,18 +3882,26 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     osSyncPrintf("z_message.c 取得メロディ＝%d\n", ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state);
                     osSyncPrintf(VT_RST);
                     msgCtx->stateTimer = 20;
-                    Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 } else if (msgCtx->ocarinaStaff->state == 0xFF) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->stateTimer = 10;
                     msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_FAIL;
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_OCARINA_AWAIT_INPUT:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 if (Message_ShouldAdvance(play)) {
                     func_8010BD58(play, msgCtx->ocarinaAction);
                 }
@@ -2745,7 +3916,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 sOcarinaNoteBufLen = 0;
                 Message_ResetOcarinaNoteState();
                 msgCtx->msgMode = MSGMODE_SCARECROW_LONG_RECORDING_ONGOING;
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SCARECROW_LONG_RECORDING_ONGOING:
                 msgCtx->ocarinaStaff = Audio_OcaGetRecordingStaff();
@@ -2774,8 +3949,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                                      msgCtx->ocarinaStaff->state);
                         gSaveContext.scarecrowLongSongSet = true;
                     }
-                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     osSyncPrintf("aaaaaaaaaaaaaa\n");
                     Audio_OcaSetRecordingState(0);
                     msgCtx->stateTimer = 10;
@@ -2786,14 +3961,18 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     osSyncPrintf(VT_FGCOL(YELLOW));
                     osSyncPrintf("\n====================================================================\n");
                     memcpy(gSaveContext.scarecrowLongSong, gScarecrowCustomSongPtr,
-                            sizeof(gSaveContext.scarecrowLongSong));
+                           sizeof(gSaveContext.scarecrowLongSong));
                     for (i = 0; i < ARRAY_COUNT(gSaveContext.scarecrowLongSong); i++) {
                         osSyncPrintf("%d, ", gSaveContext.scarecrowLongSong[i]);
                     }
                     osSyncPrintf(VT_RST);
                     osSyncPrintf("\n====================================================================\n");
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SCARECROW_LONG_PLAYBACK:
             case MSGMODE_SCARECROW_PLAYBACK:
@@ -2829,7 +4008,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 Audio_OcaSetRecordingState(2);
                 Audio_OcaSetInstrument(1);
                 msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_ONGOING;
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SCARECROW_RECORDING_ONGOING:
                 msgCtx->ocarinaStaff = Audio_OcaGetRecordingStaff();
@@ -2844,12 +4027,12 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     msgCtx->stateTimer = 20;
                     gSaveContext.scarecrowSpawnSongSet = true;
                     msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_DONE;
-                    Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     osSyncPrintf(VT_FGCOL(YELLOW));
                     osSyncPrintf("\n====================================================================\n");
                     memcpy(gSaveContext.scarecrowSpawnSong, gScarecrowSpawnSongPtr,
-                            sizeof(gSaveContext.scarecrowSpawnSong));
+                           sizeof(gSaveContext.scarecrowSpawnSong));
                     for (i = 0; i < ARRAY_COUNT(gSaveContext.scarecrowSpawnSong); i++) {
                         osSyncPrintf("%d, ", gSaveContext.scarecrowSpawnSong[i]);
                     }
@@ -2859,12 +4042,16 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     // "Played an existing song！！！"
                     osSyncPrintf("すでに存在する曲吹いた！！！ \n");
                     Audio_OcaSetRecordingState(0);
-                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     Message_CloseTextbox(play);
                     msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_FAILED;
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_SCARECROW_RECORDING_FAILED:
                 osSyncPrintf("cccccccccccc\n");
@@ -2885,8 +4072,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 break;
             case MSGMODE_MEMORY_GAME_LEFT_SKULLKID_PLAYING:
             case MSGMODE_MEMORY_GAME_RIGHT_SKULLKID_PLAYING:
-                Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gSfxDefaultPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 msgCtx->ocarinaStaff = Audio_OcaGetDisplayingStaff();
                 if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
                     sOcarinaNoteBuf[msgCtx->ocarinaStaff->pos - 1] = msgCtx->ocarinaStaff->noteIdx;
@@ -2896,10 +4083,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 if (msgCtx->stateTimer == 0) {
                     if (msgCtx->ocarinaStaff->state == 0) {
                         if (msgCtx->msgMode == MSGMODE_MEMORY_GAME_LEFT_SKULLKID_PLAYING) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_2, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_2, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
                         msgCtx->msgMode++;
@@ -2918,8 +4106,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 }
                 break;
             case MSGMODE_MEMORY_GAME_PLAYER_PLAYING:
-                Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gSfxDefaultPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
                 if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
                     sOcarinaNoteBuf[msgCtx->ocarinaStaff->pos - 1] = msgCtx->ocarinaStaff->noteIdx;
@@ -2930,18 +4118,23 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     // "Musical round failed！！！！！！！！！"
                     osSyncPrintf("輪唱失敗！！！！！！！！！\n");
                     Audio_OcaSetInstrument(0);
-                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->stateTimer = 10;
                     play->msgCtx.ocarinaMode = OCARINA_MODE_03;
                 } else if (msgCtx->ocarinaStaff->state == 0xD) {
                     // "Musical round succeeded！！！！！！！！！"
                     osSyncPrintf("輪唱成功！！！！！！！！！\n");
-                    Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS;
                     msgCtx->stateTimer = 30;
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_MEMORY_GAME_ROUND_SUCCESS:
                 msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
@@ -2953,8 +4146,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 msgCtx->stateTimer--;
                 if (msgCtx->stateTimer == 0) {
                     if (Audio_OcaMemoryGameGenNote() != 1) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
                         msgCtx->ocarinaStaff->pos = sOcarinaNoteBufPos = 0;
                         Message_ResetOcarinaNoteState();
@@ -2963,7 +4156,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                         play->msgCtx.ocarinaMode = OCARINA_MODE_0F;
                     }
                 }
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
                 break;
             case MSGMODE_MEMORY_GAME_START_NEXT_ROUND:
                 if (!Audio_IsSfxPlaying(NA_SE_SY_METRONOME)) {
@@ -2993,7 +4190,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
             case MSGMODE_FROGS_WAITING:
                 break;
             case MSGMODE_TEXT_DONE:
-                Message_DrawText(play, &gfx);
+                if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                    Message_DrawTextJPN(play, &gfx);
+                } else {
+                    Message_DrawText(play, &gfx);
+                }
 
                 switch (msgCtx->textboxEndType) {
                     case TEXTBOX_ENDTYPE_2_CHOICE:
@@ -3021,6 +4222,10 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                 }
                 break;
             case MSGMODE_TEXT_CLOSING:
+                if (sDisplayNextMessageAsEnglish) {
+                    sDisplayNextMessageAsEnglish = false;
+                }
+                /* fallthrough */
             case MSGMODE_PAUSED:
                 break;
             case MSGMODE_UNK_20:
@@ -3075,17 +4280,22 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
                     // consistent with the note played, rather than having AEnv be used for whatever note A happens to
                     // play at the moment and CEnv for everything else, even with custom controls enabled.
                     if (sOcarinaNoteBuf[i] == OCARINA_NOTE_D4) {
-                        gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteABtnPrim.r, sOcarinaNoteABtnPrim.g, sOcarinaNoteABtnPrim.b, sOcarinaNotesAlphaValues[i]);
+                        gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteABtnPrim.r, sOcarinaNoteABtnPrim.g,
+                                        sOcarinaNoteABtnPrim.b, sOcarinaNotesAlphaValues[i]);
                         gDPSetEnvColor(gfx++, sOcarinaNoteABtnEnv.r, sOcarinaNoteABtnEnv.g, sOcarinaNoteABtnEnv.b, 0);
                     } else {
                         if (sOcarinaNoteBuf[i] == OCARINA_NOTE_D5) {
-                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCUpBtnPrim.r, sOcarinaNoteCUpBtnPrim.g, sOcarinaNoteCUpBtnPrim.b, sOcarinaNotesAlphaValues[i]);
+                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCUpBtnPrim.r, sOcarinaNoteCUpBtnPrim.g,
+                                            sOcarinaNoteCUpBtnPrim.b, sOcarinaNotesAlphaValues[i]);
                         } else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_B4) {
-                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCLeftBtnPrim.r, sOcarinaNoteCLeftBtnPrim.g, sOcarinaNoteCLeftBtnPrim.b, sOcarinaNotesAlphaValues[i]);
+                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCLeftBtnPrim.r, sOcarinaNoteCLeftBtnPrim.g,
+                                            sOcarinaNoteCLeftBtnPrim.b, sOcarinaNotesAlphaValues[i]);
                         } else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A4) {
-                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCRightBtnPrim.r, sOcarinaNoteCRightBtnPrim.g, sOcarinaNoteCRightBtnPrim.b, sOcarinaNotesAlphaValues[i]);
+                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCRightBtnPrim.r, sOcarinaNoteCRightBtnPrim.g,
+                                            sOcarinaNoteCRightBtnPrim.b, sOcarinaNotesAlphaValues[i]);
                         } else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_F4) {
-                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCDownBtnPrim.r, sOcarinaNoteCDownBtnPrim.g, sOcarinaNoteCDownBtnPrim.b, sOcarinaNotesAlphaValues[i]);
+                            gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCDownBtnPrim.r, sOcarinaNoteCDownBtnPrim.g,
+                                            sOcarinaNoteCDownBtnPrim.b, sOcarinaNotesAlphaValues[i]);
                         }
                         gDPSetEnvColor(gfx++, sOcarinaNoteCBtnEnv.r, sOcarinaNoteCBtnEnv.g, sOcarinaNoteCBtnEnv.b, 0);
                     }
@@ -3110,7 +4320,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
  * the last value being saved in a static variable.
  */
 void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) {
-    if (!CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) { return; }
+    if (!CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) {
+        return;
+    }
 
     static s16 sVarLastValue = 0;
     static s16 sFillTimer = 0;
@@ -3248,11 +4460,12 @@ void Message_Update(PlayState* play) {
     if (msgCtx->msgLength == 0) {
         return;
     }
-    
+
     GameInteractor_ExecuteOnDialogMessage();
 
-    bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0 ? CHECK_BTN_ALL(input->cur.button, BTN_B) && !sTextboxSkipped
-                                                     : CHECK_BTN_ALL(input->press.button, BTN_B);
+    bool isB_Held = CVarGetInteger(CVAR_ENHANCEMENT("SkipText"), 0) != 0
+                        ? CHECK_BTN_ALL(input->cur.button, BTN_B) && !sTextboxSkipped
+                        : CHECK_BTN_ALL(input->press.button, BTN_B);
 
     switch (msgCtx->msgMode) {
         case MSGMODE_TEXT_START:
@@ -3271,8 +4484,7 @@ void Message_Update(PlayState* play) {
 
             if (var) {
                 if (msgCtx->talkActor != NULL) {
-                    Actor_GetScreenPos(play, &GET_PLAYER(play)->actor, &focusScreenPosX,
-                                       &playerFocusScreenPosY);
+                    Actor_GetScreenPos(play, &GET_PLAYER(play)->actor, &focusScreenPosX, &playerFocusScreenPosY);
                     Actor_GetScreenPos(play, msgCtx->talkActor, &focusScreenPosX, &actorFocusScreenPosY);
 
                     if (playerFocusScreenPosY >= actorFocusScreenPosY) {
@@ -3322,9 +4534,15 @@ void Message_Update(PlayState* play) {
 
                 R_TEXTBOX_X_TARGET = sTextboxXPositions[var];
                 R_TEXTBOX_END_YPOS = sTextboxEndIconYOffset[var] + R_TEXTBOX_Y_TARGET;
-                R_TEXT_CHOICE_YPOS(0) = R_TEXTBOX_Y_TARGET + 20;
-                R_TEXT_CHOICE_YPOS(1) = R_TEXTBOX_Y_TARGET + 32;
-                R_TEXT_CHOICE_YPOS(2) = R_TEXTBOX_Y_TARGET + 44;
+                if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                    R_TEXT_CHOICE_YPOS(0) = R_TEXTBOX_Y_TARGET + 7;
+                    R_TEXT_CHOICE_YPOS(1) = R_TEXTBOX_Y_TARGET + 25;
+                    R_TEXT_CHOICE_YPOS(2) = R_TEXTBOX_Y_TARGET + 43;
+                } else {
+                    R_TEXT_CHOICE_YPOS(0) = R_TEXTBOX_Y_TARGET + 20;
+                    R_TEXT_CHOICE_YPOS(1) = R_TEXTBOX_Y_TARGET + 32;
+                    R_TEXT_CHOICE_YPOS(2) = R_TEXTBOX_Y_TARGET + 44;
+                }
                 osSyncPrintf("message->msg_disp_type=%x\n", msgCtx->textBoxProperties & 0xF0);
                 if (msgCtx->textBoxType == TEXTBOX_TYPE_NONE_BOTTOM ||
                     msgCtx->textBoxType == TEXTBOX_TYPE_NONE_NO_SHADOW) {
@@ -3402,8 +4620,7 @@ void Message_Update(PlayState* play) {
                 }
             } else if (msgCtx->textboxEndType != TEXTBOX_ENDTYPE_PERSISTENT &&
                        msgCtx->textboxEndType != TEXTBOX_ENDTYPE_EVENT && YREG(31) == 0) {
-                if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_2_CHOICE &&
-                    play->msgCtx.ocarinaMode == OCARINA_MODE_01) {
+                if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_2_CHOICE && play->msgCtx.ocarinaMode == OCARINA_MODE_01) {
                     if (Message_ShouldAdvance(play)) {
                         osSyncPrintf("OCARINA_MODE=%d -> ", play->msgCtx.ocarinaMode);
                         play->msgCtx.ocarinaMode = (msgCtx->choiceIndex == 0) ? OCARINA_MODE_02 : OCARINA_MODE_04;
@@ -3415,11 +4632,16 @@ void Message_Update(PlayState* play) {
                 } else if (Message_ShouldAdvanceSilent(play)) {
                     osSyncPrintf("select=%d\n", msgCtx->textboxEndType);
                     if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_HAS_NEXT) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
-                        Message_ContinueTextbox(play, sNextTextId);
+                        Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        if (gSaveContext.language == LANGUAGE_JPN && !sTextIsCredits && !sDisplayNextMessageAsEnglish) {
+                            Message_ContinueTextbox(play, msgCtx->msgBufDecodedWide[msgCtx->textDrawPos]);
+                        } else {
+                            Message_ContinueTextbox(play, sNextTextId);
+                        }
                     } else {
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         Message_CloseTextbox(play);
                     }
                 }
@@ -3488,8 +4710,7 @@ void Message_Update(PlayState* play) {
                     player->naviActor->flags |= 0x10000;
                 }
                 if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY_DONE &&
-                    (play->msgCtx.ocarinaMode == OCARINA_MODE_01 ||
-                     play->msgCtx.ocarinaMode == OCARINA_MODE_0B)) {
+                    (play->msgCtx.ocarinaMode == OCARINA_MODE_01 || play->msgCtx.ocarinaMode == OCARINA_MODE_0B)) {
                     play->msgCtx.ocarinaMode = OCARINA_MODE_04;
                     if (msgCtx->unk_E3F2 == OCARINA_SONG_SUNS) {
                         play->msgCtx.ocarinaMode = OCARINA_MODE_01;
@@ -3512,10 +4733,10 @@ void Message_SetTables(void) {
     OTRMessage_Init();
 
     // OTRTODO
-    //sNesMessageEntryTablePtr = sNesMessageEntryTable;
-    //sGerMessageEntryTablePtr = sGerMessageEntryTable;
-    //sFraMessageEntryTablePtr = sFraMessageEntryTable;
-    //sStaffMessageEntryTablePtr = sStaffMessageEntryTable;
+    // sNesMessageEntryTablePtr = sNesMessageEntryTable;
+    // sGerMessageEntryTablePtr = sGerMessageEntryTable;
+    // sFraMessageEntryTablePtr = sFraMessageEntryTable;
+    // sStaffMessageEntryTablePtr = sStaffMessageEntryTable;
 }
 
 // Appears to be file padding
diff --git a/soh/src/code/z_moji.c b/soh/src/code/z_moji.c
index ff6c04800f..cc0430b574 100644
--- a/soh/src/code/z_moji.c
+++ b/soh/src/code/z_moji.c
@@ -5,15 +5,11 @@
 #include "global.h"
 
 // OTRTODO
-u64 gMojiFontTex[] =
-{
+u64 gMojiFontTex[] = {
     0,
 };
 
-u64 gMojiFontTLUTs[4][4] =
-{
-    0
-};
+u64 gMojiFontTLUTs[4][4] = { 0 };
 
 // how big to draw the characters on screen
 #define DISP_CHAR_WIDTH 8
diff --git a/soh/src/code/z_olib.c b/soh/src/code/z_olib.c
index da4959726f..28efd47ed0 100644
--- a/soh/src/code/z_olib.c
+++ b/soh/src/code/z_olib.c
@@ -91,7 +91,6 @@ Vec3f* OLib_VecSphToVec3f(Vec3f* dest, VecSph* sph) {
         sinPitch = Math_SinS(sph->pitch);
         sinYaw = Math_SinS(sph->yaw);
     }
-    
 
     v.x = sph->r * sinPitch * sinYaw;
     v.y = sph->r * cosPitch;
diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index 6440acbeea..c68f1b5220 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -70,13 +70,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
     PosRot sp8C;
     f32 tempRand;
     Unique9OnePointCs* csInfo = ONEPOINT_CS_INFO(csCam);
-    
-    // #region SOH [Enhancement]
-    //the default is 90, lower values necessary to prevent camera swing as animation speeds up
-    s16 camCrawlTemp = CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1);
-    s16 camCrawlTimer = D_8012042C / camCrawlTemp;
-    // #endregion
-    
+
     switch (csId) {
         case 1020:
             if (timer < 20) {
@@ -253,8 +247,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
                 D_801211D4[0].atTargetInit.y = actor->focus.pos.y - 5.0f;
                 D_801211D4[0].atTargetInit.z = actor->focus.pos.z;
                 spC0 = ((EnSw*)actor)->unk_364;
-                osSyncPrintf("%s(%d): xyz_t: %s (%f %f %f)\n", __FILE__, __LINE__, "&cp", spC0.x, spC0.y,
-                             spC0.z);
+                osSyncPrintf("%s(%d): xyz_t: %s (%f %f %f)\n", __FILE__, __LINE__, "&cp", spC0.x, spC0.y, spC0.z);
                 D_801211D4[0].eyeTargetInit.x = (actor->focus.pos.x + (120.0f * spC0.x)) - (Rand_ZeroOne() * 20.0f);
                 D_801211D4[0].eyeTargetInit.y = actor->focus.pos.y + (120.0f * spC0.y) + 20.0f;
                 D_801211D4[0].eyeTargetInit.z = (actor->focus.pos.z + (120.0f * spC0.z)) - (Rand_ZeroOne() * 20.0f);
@@ -337,26 +330,19 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
         case 9601:
             Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
             Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting);
-            if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, camCrawlTimer, D_80120308, D_80120398);
-            } else {
+            if (GameInteractor_Should(VB_CRAWL_SPEED_EXIT_CS, true, csCam, csId, D_80120430, D_8012042C, D_80120308,
+                                      D_80120398)) {
                 OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120398);
             }
             break;
         case 9602:
-            // #region SOH [Enhancement]
-            if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
-                Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting);
-                OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, camCrawlTimer, D_80120308, D_80120434);
-                break;
-            // #endregion
-            } else {
-                Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
-                Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting);
+            Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
+            Play_CameraChangeSetting(play, MAIN_CAM, mainCam->prevSetting);
+            if (GameInteractor_Should(VB_CRAWL_SPEED_EXIT_CS, true, csCam, csId, D_80120430, D_8012042C, D_80120308,
+                                      D_80120434)) {
                 OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120434);
-                break;
             }
+            break;
         case 4175:
             csInfo->keyFrames = D_8012147C;
             csInfo->keyFrameCnt = 4;
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index f424b9fcd7..0fc923070e 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -12,6 +12,7 @@
 #include "soh/Enhancements/custom-message/CustomMessageInterfaceAddon.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/enhancementTypes.h"
+#include "soh/ShipUtils.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -23,6 +24,13 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/gameplaystats.h"
+#include "soh/ObjectExtension/ActorMaximumHealth.h"
+
+#include "message_data_static.h"
+extern MessageTableEntry* sNesMessageEntryTablePtr;
+extern MessageTableEntry* sGerMessageEntryTablePtr;
+extern MessageTableEntry* sFraMessageEntryTablePtr;
+extern MessageTableEntry* sJpnMessageEntryTablePtr;
 
 #define DO_ACTION_TEX_WIDTH() 48
 #define DO_ACTION_TEX_HEIGHT() 16
@@ -157,8 +165,8 @@ static u16 sCUpTimer = 0;
 s16 gSpoilingItems[] = { ITEM_ODD_MUSHROOM, ITEM_FROG, ITEM_EYEDROPS };
 s16 gSpoilingItemReverts[] = { ITEM_COJIRO, ITEM_PRESCRIPTION, ITEM_PRESCRIPTION };
 
-static Color_RGB8 sMagicBorder = {255,255,255};
-static Color_RGB8 sMagicBorder_ori = {255,255,255};
+static Color_RGB8 sMagicBorder = { 255, 255, 255 };
+static Color_RGB8 sMagicBorder_ori = { 255, 255, 255 };
 
 static s16 sExtraItemBases[] = {
     ITEM_STICK, ITEM_STICK, ITEM_NUT,   ITEM_NUT,     ITEM_BOMB,    ITEM_BOMB,  ITEM_BOMB,  ITEM_BOMB, ITEM_BOW,
@@ -179,36 +187,14 @@ static Gfx sSetupDL_80125A60[] = {
     gsSPEndDisplayList(),
 };
 
-static const char* actionsTbl[] =
-{
-    gAttackDoActionENGTex,
-    gCheckDoActionENGTex,
-    gEnterDoActionENGTex,
-    gReturnDoActionENGTex,
-    gOpenDoActionENGTex,
-    gJumpDoActionENGTex,
-    gDecideDoActionENGTex,
-    gDiveDoActionENGTex,
-    gFasterDoActionENGTex,
-    gThrowDoActionENGTex,
-    gUnusedNaviDoActionENGTex,
-    gClimbDoActionENGTex,
-    gDropDoActionENGTex,
-    gDownDoActionENGTex,
-    gSaveDoActionENGTex,
-    gSpeakDoActionENGTex,
-    gNextDoActionENGTex,
-    gGrabDoActionENGTex,
-    gStopDoActionENGTex,
-    gPutAwayDoActionENGTex,
-    gReelDoActionENGTex,
-    gNum1DoActionENGTex,
-    gNum2DoActionENGTex,
-    gNum3DoActionENGTex,
-    gNum4DoActionENGTex,
-    gNum5DoActionENGTex,
-    gNum6DoActionENGTex,
-    gNum7DoActionENGTex,
+static const char* actionsTbl[] = {
+    gAttackDoActionENGTex, gCheckDoActionENGTex, gEnterDoActionENGTex,      gReturnDoActionENGTex,
+    gOpenDoActionENGTex,   gJumpDoActionENGTex,  gDecideDoActionENGTex,     gDiveDoActionENGTex,
+    gFasterDoActionENGTex, gThrowDoActionENGTex, gUnusedNaviDoActionENGTex, gClimbDoActionENGTex,
+    gDropDoActionENGTex,   gDownDoActionENGTex,  gSaveDoActionENGTex,       gSpeakDoActionENGTex,
+    gNextDoActionENGTex,   gGrabDoActionENGTex,  gStopDoActionENGTex,       gPutAwayDoActionENGTex,
+    gReelDoActionENGTex,   gNum1DoActionENGTex,  gNum2DoActionENGTex,       gNum3DoActionENGTex,
+    gNum4DoActionENGTex,   gNum5DoActionENGTex,  gNum6DoActionENGTex,       gNum7DoActionENGTex,
     gNum8DoActionENGTex,
 };
 
@@ -318,7 +304,7 @@ void func_80082644(PlayState* play, s16 alpha) {
 void func_8008277C(PlayState* play, s16 maxAlpha, s16 alpha) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
 
-    if (gSaveContext.unk_13E7 != 0) {
+    if (gSaveContext.forceRisingButtonAlphas != 0) {
         func_80082644(play, alpha);
         return;
     }
@@ -843,12 +829,12 @@ void func_80083108(PlayState* play) {
 
     if ((gSaveContext.cutsceneIndex < 0xFFF0) ||
         ((play->sceneNum == SCENE_LON_LON_RANCH) && (gSaveContext.cutsceneIndex == 0xFFF0))) {
-        gSaveContext.unk_13E7 = 0;
+        gSaveContext.forceRisingButtonAlphas = 0;
 
         if ((player->stateFlags1 & PLAYER_STATE1_ON_HORSE) || (play->shootingGalleryStatus > 1) ||
             ((play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) && Flags_GetSwitch(play, 0x38))) {
             if (gSaveContext.equips.buttonItems[0] != ITEM_NONE || randoCanTrackSwordless) {
-                gSaveContext.unk_13E7 = 1;
+                gSaveContext.forceRisingButtonAlphas = 1;
 
                 if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
                     gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
@@ -915,7 +901,7 @@ void func_80083108(PlayState* play) {
         } else if (play->sceneNum == SCENE_CHAMBER_OF_THE_SAGES && !IS_BOSS_RUSH) {
             Interface_ChangeAlpha(1);
         } else if (play->sceneNum == SCENE_FISHING_POND) {
-            gSaveContext.unk_13E7 = 2;
+            gSaveContext.forceRisingButtonAlphas = 2;
             if (play->interfaceCtx.unk_260 != 0) {
                 if (gSaveContext.equips.buttonItems[0] != ITEM_FISHING_POLE) {
                     gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
@@ -1010,7 +996,8 @@ void func_80083108(PlayState* play) {
                 }
 
                 Interface_ChangeAlpha(50);
-            } else if ((player->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER) || (player->stateFlags2 & PLAYER_STATE2_CRAWLING)) {
+            } else if ((player->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER) ||
+                       (player->stateFlags2 & PLAYER_STATE2_CRAWLING)) {
                 if (gSaveContext.buttonStatus[0] != BTN_DISABLED) {
                     gSaveContext.buttonStatus[0] = BTN_DISABLED;
                     gSaveContext.buttonStatus[1] = BTN_DISABLED;
@@ -1172,9 +1159,10 @@ void func_80083108(PlayState* play) {
 
                 if (interfaceCtx->restrictions.tradeItems != 0) {
                     for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
-                        if ((CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA)
-                            && (gSaveContext.equips.buttonItems[i] >= ITEM_MASK_KEATON)
-                            && (gSaveContext.equips.buttonItems[i] <= ITEM_MASK_TRUTH)) {
+                        if ((CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) !=
+                             BUNNY_HOOD_VANILLA) &&
+                            (gSaveContext.equips.buttonItems[i] >= ITEM_MASK_KEATON) &&
+                            (gSaveContext.equips.buttonItems[i] <= ITEM_MASK_TRUTH)) {
                             gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] = BTN_ENABLED;
                         } else if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                                    (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
@@ -1299,8 +1287,9 @@ void func_80083108(PlayState* play) {
                             (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) &&
                             !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
                               (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) &&
-                            !((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) &&  // Never disable equipment
-                              (gSaveContext.equips.buttonItems[i] <= ITEM_BOOTS_HOVER)) && // (tunics/boots) on C-buttons
+                            !((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) && // Never disable equipment
+                              (gSaveContext.equips.buttonItems[i] <=
+                               ITEM_BOOTS_HOVER)) && // (tunics/boots) on C-buttons
                             !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                               (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                             if ((play->sceneNum != SCENE_TREASURE_BOX_SHOP) ||
@@ -1445,15 +1434,13 @@ void Rando_Inventory_SwapAgeEquipment(void) {
     if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
             if (i != 0) {
-                gSaveContext.childEquips.buttonItems[i] =
-                    gSaveContext.equips.buttonItems[i];
+                gSaveContext.childEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
             } else {
                 gSaveContext.childEquips.buttonItems[i] = ITEM_SWORD_KOKIRI;
             }
 
             if (i != 0) {
-                gSaveContext.childEquips.cButtonSlots[i - 1] =
-                    gSaveContext.equips.cButtonSlots[i - 1];
+                gSaveContext.childEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
             }
         }
 
@@ -1464,17 +1451,18 @@ void Rando_Inventory_SwapAgeEquipment(void) {
         Flags_UnsetInfTable(INFTABLE_SWORDLESS);
 
         // This section sets up the equipment on the first time going adult.
-        // On master sword shuffle the check for the B button is insufficient, and so checking the equipment is completely zero-ed is needed
-        // (Could just always use `gSaveContext.adultEquips.equipment == 0` for rando?)
-        if (gSaveContext.adultEquips.buttonItems[0] == ITEM_NONE && ((IS_RANDO && !Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD)) || (gSaveContext.adultEquips.equipment == 0))) {
+        // On master sword shuffle the check for the B button is insufficient, and so checking the equipment is
+        // completely zero-ed is needed (Could just always use `gSaveContext.adultEquips.equipment == 0` for rando?)
+        if (gSaveContext.adultEquips.buttonItems[0] == ITEM_NONE &&
+            ((IS_RANDO && !Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD)) ||
+             (gSaveContext.adultEquips.equipment == 0))) {
             gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
 
             if (gSaveContext.inventory.items[SLOT_NUT] != ITEM_NONE) {
                 gSaveContext.equips.buttonItems[1] = ITEM_NUT;
                 gSaveContext.equips.cButtonSlots[0] = SLOT_NUT;
             } else {
-                gSaveContext.equips.buttonItems[1] = gSaveContext.equips.cButtonSlots[0] =
-                    ITEM_NONE;
+                gSaveContext.equips.buttonItems[1] = gSaveContext.equips.cButtonSlots[0] = ITEM_NONE;
             }
 
             gSaveContext.equips.buttonItems[2] = ITEM_BOMB;
@@ -1505,20 +1493,20 @@ void Rando_Inventory_SwapAgeEquipment(void) {
             gSaveContext.equips.cButtonSlots[6] = SLOT_NONE;
         } else {
             for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
-                gSaveContext.equips.buttonItems[i] =
-                    gSaveContext.adultEquips.buttonItems[i];
+                gSaveContext.equips.buttonItems[i] = gSaveContext.adultEquips.buttonItems[i];
 
                 if (i != 0) {
-                    gSaveContext.equips.cButtonSlots[i - 1] =
-                        gSaveContext.adultEquips.cButtonSlots[i - 1];
+                    gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.adultEquips.cButtonSlots[i - 1];
                 }
 
                 if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
                      (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) ||
                     ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                      (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
-                    gSaveContext.equips.buttonItems[i] =
-                        gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[i - 1]];
+                    if (GameInteractor_Should(VB_SET_BUTTON_ITEM_FROM_C_BUTTON_SLOT, true, i)) {
+                        gSaveContext.equips.buttonItems[i] =
+                            gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[i - 1]];
+                    }
                 }
             }
 
@@ -1536,8 +1524,7 @@ void Rando_Inventory_SwapAgeEquipment(void) {
             gSaveContext.adultEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
 
             if (i != 0) {
-                gSaveContext.adultEquips.cButtonSlots[i - 1] =
-                    gSaveContext.equips.cButtonSlots[i - 1];
+                gSaveContext.adultEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
             }
         }
 
@@ -1545,12 +1532,10 @@ void Rando_Inventory_SwapAgeEquipment(void) {
 
         if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE) {
             for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
-                gSaveContext.equips.buttonItems[i] =
-                    gSaveContext.childEquips.buttonItems[i];
+                gSaveContext.equips.buttonItems[i] = gSaveContext.childEquips.buttonItems[i];
 
                 if (i != 0) {
-                    gSaveContext.equips.cButtonSlots[i - 1] =
-                        gSaveContext.childEquips.cButtonSlots[i - 1];
+                    gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.childEquips.cButtonSlots[i - 1];
                 }
 
                 if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
@@ -1566,14 +1551,15 @@ void Rando_Inventory_SwapAgeEquipment(void) {
             gSaveContext.equips.equipment &= (u16) ~(0xF << (EQUIP_TYPE_SWORD * 4));
             gSaveContext.equips.equipment |= EQUIP_VALUE_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4);
         }
-        // In Rando we need an extra case to handle starting as adult. We can use the fact that the childEquips will be uninitialised (i.e. 0) at this point
+        // In Rando we need an extra case to handle starting as adult. We can use the fact that the childEquips will be
+        // uninitialised (i.e. 0) at this point
         else if (gSaveContext.childEquips.equipment == 0) {
 
-            //zero out items
+            // zero out items
             for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
                 gSaveContext.equips.buttonItems[i] = ITEM_NONE;
                 if (i != 0) {
-                    gSaveContext.equips.cButtonSlots[i-1] = ITEM_NONE;
+                    gSaveContext.equips.cButtonSlots[i - 1] = ITEM_NONE;
                 }
             }
             gSaveContext.equips.equipment = (EQUIP_VALUE_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4)) |
@@ -1617,15 +1603,13 @@ void Inventory_SwapAgeEquipment(void) {
     if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
             if (i != 0) {
-                gSaveContext.childEquips.buttonItems[i] =
-                    gSaveContext.equips.buttonItems[i];
+                gSaveContext.childEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
             } else {
                 gSaveContext.childEquips.buttonItems[i] = ITEM_SWORD_KOKIRI;
             }
 
             if (i != 0) {
-                gSaveContext.childEquips.cButtonSlots[i - 1] =
-                    gSaveContext.equips.cButtonSlots[i - 1];
+                gSaveContext.childEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
             }
         }
 
@@ -1638,8 +1622,7 @@ void Inventory_SwapAgeEquipment(void) {
                 gSaveContext.equips.buttonItems[1] = ITEM_NUT;
                 gSaveContext.equips.cButtonSlots[0] = SLOT_NUT;
             } else {
-                gSaveContext.equips.buttonItems[1] = gSaveContext.equips.cButtonSlots[0] =
-                    ITEM_NONE;
+                gSaveContext.equips.buttonItems[1] = gSaveContext.equips.cButtonSlots[0] = ITEM_NONE;
             }
 
             gSaveContext.equips.buttonItems[2] = ITEM_BOMB;
@@ -1661,12 +1644,10 @@ void Inventory_SwapAgeEquipment(void) {
             gSaveContext.equips.cButtonSlots[6] = SLOT_NONE;
         } else {
             for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
-                gSaveContext.equips.buttonItems[i] =
-                    gSaveContext.adultEquips.buttonItems[i];
+                gSaveContext.equips.buttonItems[i] = gSaveContext.adultEquips.buttonItems[i];
 
                 if (i != 0) {
-                    gSaveContext.equips.cButtonSlots[i - 1] =
-                        gSaveContext.adultEquips.cButtonSlots[i - 1];
+                    gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.adultEquips.cButtonSlots[i - 1];
                 }
 
                 if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
@@ -1674,8 +1655,10 @@ void Inventory_SwapAgeEquipment(void) {
                     ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                      (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                     osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]);
-                    gSaveContext.equips.buttonItems[i] =
-                        gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[i - 1]];
+                    if (GameInteractor_Should(VB_SET_BUTTON_ITEM_FROM_C_BUTTON_SLOT, true, i)) {
+                        gSaveContext.equips.buttonItems[i] =
+                            gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[i - 1]];
+                    }
                 }
             }
 
@@ -1686,8 +1669,7 @@ void Inventory_SwapAgeEquipment(void) {
             gSaveContext.adultEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
 
             if (i != 0) {
-                gSaveContext.adultEquips.cButtonSlots[i - 1] =
-                    gSaveContext.equips.cButtonSlots[i - 1];
+                gSaveContext.adultEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
             }
         }
 
@@ -1695,12 +1677,10 @@ void Inventory_SwapAgeEquipment(void) {
 
         if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE) {
             for (i = 0; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
-                gSaveContext.equips.buttonItems[i] =
-                    gSaveContext.childEquips.buttonItems[i];
+                gSaveContext.equips.buttonItems[i] = gSaveContext.childEquips.buttonItems[i];
 
                 if (i != 0) {
-                    gSaveContext.equips.cButtonSlots[i - 1] =
-                        gSaveContext.childEquips.cButtonSlots[i - 1];
+                    gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.childEquips.cButtonSlots[i - 1];
                 }
 
                 if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
@@ -1755,7 +1735,8 @@ void Interface_LoadItemIcon1(PlayState* play, u16 button) {
 
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->iconItemSegment + button * 0x1000,
-                        (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
+                        (uintptr_t)_icon_item_staticSegmentRomStart +
+                            (gSaveContext.equips.buttonItems[button] * 0x1000),
                         0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
@@ -1765,7 +1746,8 @@ void Interface_LoadItemIcon2(PlayState* play, u16 button) {
 
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, interfaceCtx->iconItemSegment + button * 0x1000,
-                        (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
+                        (uintptr_t)_icon_item_staticSegmentRomStart +
+                            (gSaveContext.equips.buttonItems[button] * 0x1000),
                         0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
@@ -1811,12 +1793,13 @@ void func_80084BF4(PlayState* play, u16 flag) {
 void GameplayStats_SetTimestamp(PlayState* play, u8 item) {
 
     // If we already have a timestamp for this item, do nothing
-    if (gSaveContext.ship.stats.itemTimestamp[item] != 0){
+    if (gSaveContext.ship.stats.itemTimestamp[item] != 0) {
         return;
     }
     // Use ITEM_KEY_BOSS only for Ganon's boss key - not any other boss keys
     if (play != NULL) {
-        if (item == ITEM_KEY_BOSS && play->sceneNum != SCENE_INSIDE_GANONS_CASTLE && play->sceneNum != SCENE_GANONS_TOWER) {
+        if (item == ITEM_KEY_BOSS && play->sceneNum != SCENE_INSIDE_GANONS_CASTLE &&
+            play->sceneNum != SCENE_GANONS_TOWER) {
             return;
         }
     }
@@ -1890,23 +1873,15 @@ u8 Return_Item(u8 itemID, ModIndex modId, ItemID returnItem) {
  * @return u8
  */
 u8 Item_Give(PlayState* play, u8 item) {
-    //prevents getting sticks without the bag in case something got missed
-    if (
-        IS_RANDO &&
-        (item == ITEM_STICK || item == ITEM_STICKS_5 || item == ITEM_STICKS_10) &&
-        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG) &&
-        CUR_UPG_VALUE(UPG_STICKS) == 0
-    ) {
+    // prevents getting sticks without the bag in case something got missed
+    if (IS_RANDO && (item == ITEM_STICK || item == ITEM_STICKS_5 || item == ITEM_STICKS_10) &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG) && CUR_UPG_VALUE(UPG_STICKS) == 0) {
         return item;
     }
 
-    //prevents getting nuts without the bag in case something got missed
-    if (
-        IS_RANDO &&
-        (item == ITEM_NUT || item == ITEM_NUTS_5 || item == ITEM_NUTS_10) &&
-        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG) &&
-        CUR_UPG_VALUE(UPG_NUTS) == 0
-    ) {
+    // prevents getting nuts without the bag in case something got missed
+    if (IS_RANDO && (item == ITEM_NUT || item == ITEM_NUTS_5 || item == ITEM_NUTS_10) &&
+        Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG) && CUR_UPG_VALUE(UPG_NUTS) == 0) {
         return item;
     }
 
@@ -1980,7 +1955,8 @@ u8 Item_Give(PlayState* play, u8 item) {
 
         return Return_Item(item, MOD_NONE, ITEM_NONE);
     } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) {
-        gSaveContext.inventory.equipment |= OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, item - ITEM_SWORD_KOKIRI + EQUIP_INV_SWORD_KOKIRI);
+        gSaveContext.inventory.equipment |=
+            OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, item - ITEM_SWORD_KOKIRI + EQUIP_INV_SWORD_KOKIRI);
 
         // Both Giant's Knife and Biggoron Sword have the same Item ID, so this part handles both of them
         if (item == ITEM_SWORD_BGS) {
@@ -1990,7 +1966,8 @@ u8 Item_Give(PlayState* play, u8 item) {
                 ((1 << EQUIP_INV_SWORD_KOKIRI) | (1 << EQUIP_INV_SWORD_MASTER) | (1 << EQUIP_INV_SWORD_BIGGORON) |
                  (1 << EQUIP_INV_SWORD_BROKENGIANTKNIFE))) {
 
-                gSaveContext.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
+                gSaveContext.inventory.equipment ^=
+                    OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
 
                 if (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) {
                     gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
@@ -2186,7 +2163,8 @@ u8 Item_Give(PlayState* play, u8 item) {
                 AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
             }
         }
-        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate ReceivedItemEntry hook
+        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate
+        // ReceivedItemEntry hook
         INV_CONTENT(ITEM_STICK) = ITEM_STICK;
         return Return_Item(item, MOD_NONE, returnItem);
     } else if (item == ITEM_NUT) {
@@ -2212,7 +2190,8 @@ u8 Item_Give(PlayState* play, u8 item) {
                 AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
             }
         }
-        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate ReceivedItemEntry hook
+        // [SOH] This results in the same behavior as the original code, but also allows us to get an accurate
+        // ReceivedItemEntry hook
         INV_CONTENT(ITEM_NUT) = ITEM_NUT;
         return Return_Item(item, MOD_NONE, returnItem);
     } else if (item == ITEM_BOMB) {
@@ -2416,7 +2395,8 @@ u8 Item_Give(PlayState* play, u8 item) {
                                  gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1],
                                  gSaveContext.equips.cButtonSlots[2], temp + i, item);
 
-                    for (int buttonIndex = 1; buttonIndex < ARRAY_COUNT(gSaveContext.equips.buttonItems); buttonIndex++) {
+                    for (int buttonIndex = 1; buttonIndex < ARRAY_COUNT(gSaveContext.equips.buttonItems);
+                         buttonIndex++) {
                         if ((temp + i) == gSaveContext.equips.cButtonSlots[buttonIndex - 1]) {
                             gSaveContext.equips.buttonItems[buttonIndex] = item;
                             if (play != NULL) {
@@ -2432,6 +2412,9 @@ u8 Item_Give(PlayState* play, u8 item) {
                 }
             }
         } else {
+            if (item == ITEM_LETTER_RUTO) {
+                Flags_SetRandomizerInf(RAND_INF_OBTAINED_RUTOS_LETTER);
+            }
             for (i = 0; i < 4; i++) {
                 if (gSaveContext.inventory.items[temp + i] == ITEM_NONE) {
                     gSaveContext.inventory.items[temp + i] = item;
@@ -2449,12 +2432,15 @@ u8 Item_Give(PlayState* play, u8 item) {
             if (item >= ITEM_POCKET_EGG) {
                 Flags_SetRandomizerInf(item - ITEM_POCKET_EGG + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG);
             } else if (item == ITEM_LETTER_ZELDA) {
-                //don't care about zelda's letter if it's already been shown to the guard
+                // don't care about zelda's letter if it's already been shown to the guard
                 if (!Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) {
                     Flags_SetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
                 }
             } else {
                 Flags_SetRandomizerInf(item - ITEM_WEIRD_EGG + RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG);
+                if (item == ITEM_WEIRD_EGG) {
+                    Flags_SetRandomizerInf(RAND_INF_WEIRD_EGG);
+                }
             }
         }
 
@@ -2679,12 +2665,8 @@ s32 Inventory_HasEmptyBottle(void) {
 bool Inventory_HasEmptyBottleSlot(void) {
     u8* items = gSaveContext.inventory.items;
 
-    return (
-        items[SLOT_BOTTLE_1] == ITEM_NONE ||
-        items[SLOT_BOTTLE_2] == ITEM_NONE ||
-        items[SLOT_BOTTLE_3] == ITEM_NONE ||
-        items[SLOT_BOTTLE_4] == ITEM_NONE
-    );
+    return (items[SLOT_BOTTLE_1] == ITEM_NONE || items[SLOT_BOTTLE_2] == ITEM_NONE ||
+            items[SLOT_BOTTLE_3] == ITEM_NONE || items[SLOT_BOTTLE_4] == ITEM_NONE);
 }
 
 s32 Inventory_HasSpecificBottle(u8 bottleItem) {
@@ -2703,13 +2685,6 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) {
     }
 }
 
-void byteSwapInventory() {
-    gSaveContext.inventory.equipment = BE16SWAP(gSaveContext.inventory.equipment);
-    gSaveContext.inventory.upgrades = BE32SWAP(gSaveContext.inventory.upgrades);
-    gSaveContext.inventory.questItems = BE32SWAP(gSaveContext.inventory.questItems);
-    gSaveContext.inventory.gsTokens = BE16SWAP(gSaveContext.inventory.gsTokens);
-}
-
 void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) {
     osSyncPrintf("item_no=%x,  c_no=%x,  Pt=%x  Item_Register=%x\n", item, button,
                  gSaveContext.equips.cButtonSlots[button - 1],
@@ -2721,11 +2696,7 @@ void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) {
         item = ITEM_MILK_HALF;
     }
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RestoreRBAValues"),0)) {
-        byteSwapInventory();
-        gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item;
-        byteSwapInventory();
-    } else {
+    if (GameInteractor_Should(VB_UPDATE_BOTTLE_ITEM, true, button, item)) {
         gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item;
     }
 
@@ -2803,6 +2774,10 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l
             newName[loadOffset][length - 6] = 'G';
             newName[loadOffset][length - 5] = 'E';
             newName[loadOffset][length - 4] = 'R';
+        } else if (gSaveContext.language == LANGUAGE_JPN) {
+            newName[loadOffset][length - 6] = 'J';
+            newName[loadOffset][length - 5] = 'P';
+            newName[loadOffset][length - 4] = 'N';
         }
         doAction = newName[loadOffset];
     }
@@ -2817,6 +2792,7 @@ void Interface_SetDoAction(PlayState* play, u16 action) {
     PauseContext* pauseCtx = &play->pauseCtx;
 
     if (interfaceCtx->unk_1F0 != action) {
+        GameInteractor_ExecuteOnSetDoAction(action);
         interfaceCtx->unk_1F0 = action;
         interfaceCtx->unk_1EC = 1;
         interfaceCtx->unk_1F4 = 0.0f;
@@ -2832,7 +2808,7 @@ void Interface_SetNaviCall(PlayState* play, u16 naviCallState) {
 
     if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
         (play->csCtx.state == CS_STATE_IDLE)) {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 0)) {
+        if (!CVarGetInteger(CVAR_AUDIO("DisableNaviCallAudio"), 0)) {
             // clang-format off
             if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &gSfxDefaultPos, 4,
                                                                 &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); }
@@ -2868,6 +2844,10 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) {
             newName[length - 6] = 'G';
             newName[length - 5] = 'E';
             newName[length - 4] = 'R';
+        } else if (gSaveContext.language == LANGUAGE_JPN) {
+            newName[length - 6] = 'J';
+            newName[length - 5] = 'P';
+            newName[length - 4] = 'N';
         }
         doAction = newName;
     }
@@ -3084,7 +3064,8 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
 
     if ((type != 5) && (gSaveContext.magic - amount) < 0) {
         if (gSaveContext.magicCapacity != 0) {
-            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         return false;
     }
@@ -3092,7 +3073,8 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
     switch (type) {
         case MAGIC_CONSUME_NOW:
         case MAGIC_CONSUME_NOW_ALT:
-            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
+            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
+                (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
                 if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
                     play->actorCtx.lensActive = false;
                 }
@@ -3100,11 +3082,13 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
                 gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP;
                 return 1;
             } else {
-                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 return false;
             }
         case MAGIC_CONSUME_WAIT_NO_PREVIEW:
-            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
+            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
+                (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
                 if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
                     play->actorCtx.lensActive = false;
                 }
@@ -3112,7 +3096,8 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
                 gSaveContext.magicState = MAGIC_STATE_METER_FLASH_3;
                 return true;
             } else {
-                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 return false;
             }
         case MAGIC_CONSUME_LENS:
@@ -3132,7 +3117,8 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
                 }
             }
         case MAGIC_CONSUME_WAIT_PREVIEW:
-            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
+            if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
+                (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
                 if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
                     play->actorCtx.lensActive = false;
                 }
@@ -3140,7 +3126,8 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
                 gSaveContext.magicState = MAGIC_STATE_METER_FLASH_2;
                 return true;
             } else {
-                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 return false;
             }
         case MAGIC_ADD:
@@ -3172,22 +3159,32 @@ void Interface_UpdateMagicBar(PlayState* play) {
     Color_RGB8 MagicBorder_2 = { 255, 255, 150 };
     Color_RGB8 MagicBorder_3 = { 255, 255, 50 };
 
-    if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorderActive.Changed"), 0)) { //This will make custom color based on users selected colors.
+    if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorderActive.Changed"),
+                       0)) { // This will make custom color based on users selected colors.
         sMagicBorderColors[0][0] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_0).r;
         sMagicBorderColors[0][1] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_0).g;
         sMagicBorderColors[0][2] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_0).b;
 
-        sMagicBorderColors[1][0] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).r/2;
-        sMagicBorderColors[1][1] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).g/2;
-        sMagicBorderColors[1][2] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).b/2;
+        sMagicBorderColors[1][0] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).r / 2;
+        sMagicBorderColors[1][1] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).g / 2;
+        sMagicBorderColors[1][2] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_1).b / 2;
 
-        sMagicBorderColors[2][0] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).r/2.5;
-        sMagicBorderColors[2][1] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).g/2.5;
-        sMagicBorderColors[2][2] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).b/2.5;
+        sMagicBorderColors[2][0] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).r / 2.5;
+        sMagicBorderColors[2][1] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).g / 2.5;
+        sMagicBorderColors[2][2] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_2).b / 2.5;
 
-        sMagicBorderColors[3][0] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).r/3;
-        sMagicBorderColors[3][1] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).g/3;
-        sMagicBorderColors[3][2] = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).b/3;
+        sMagicBorderColors[3][0] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).r / 3;
+        sMagicBorderColors[3][1] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).g / 3;
+        sMagicBorderColors[3][2] =
+            CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorderActive.Value"), MagicBorder_3).b / 3;
     }
 
     static s16 sMagicBorderIndexes[] = { 0, 1, 1, 0 };
@@ -3224,8 +3221,8 @@ void Interface_UpdateMagicBar(PlayState* play) {
             gSaveContext.magic += 4;
 
             if (gSaveContext.gameMode == GAMEMODE_NORMAL && gSaveContext.sceneSetupIndex < 4) {
-                Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
 
             // "Storage  MAGIC_NOW=%d (%d)"
@@ -3311,23 +3308,25 @@ void Interface_UpdateMagicBar(PlayState* play) {
             break;
 
         case MAGIC_STATE_CONSUME_LENS:
-            if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
-                (msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) &&
-                (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {
+            if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && (msgCtx->msgMode == MSGMODE_NONE) &&
+                (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
+                (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {
                 bool hasLens = false;
-                for (int buttonIndex = 1; buttonIndex < ((CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4);
+                for (int buttonIndex = 1; buttonIndex < ((CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0)
+                                                             ? ARRAY_COUNT(gSaveContext.equips.buttonItems)
+                                                             : 4);
                      buttonIndex++) {
                     if (gSaveContext.equips.buttonItems[buttonIndex] == ITEM_LENS) {
                         hasLens = true;
                         break;
                     }
                 }
-                if ((gSaveContext.magic == 0) || ((Player_GetEnvironmentalHazard(play) >= 2) && (Player_GetEnvironmentalHazard(play) < 5)) ||
-                    !hasLens ||
-                    !play->actorCtx.lensActive) {
+                if ((gSaveContext.magic == 0) ||
+                    ((Player_GetEnvironmentalHazard(play) >= 2) && (Player_GetEnvironmentalHazard(play) < 5)) ||
+                    !hasLens || !play->actorCtx.lensActive) {
                     play->actorCtx.lensActive = false;
-                    Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     gSaveContext.magicState = MAGIC_STATE_IDLE;
                     if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
                         sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
@@ -3382,7 +3381,8 @@ void Interface_UpdateMagicBar(PlayState* play) {
 
         case MAGIC_STATE_ADD:
             gSaveContext.magic += 4;
-            Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (gSaveContext.magic >= gSaveContext.magicTarget) {
                 gSaveContext.magic = gSaveContext.magicTarget;
                 gSaveContext.magicState = gSaveContext.prevMagicState;
@@ -3416,7 +3416,8 @@ void Interface_DrawLineupTick(PlayState* play) {
     s16 x = -8 + (SCREEN_WIDTH / 2);
     s16 y = -6;
 
-    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gEmptyCDownArrowTex, width, height, x, y, width, height, 2 << 10, 2 << 10);
+    OVERLAY_DISP =
+        Gfx_TextureIA8(OVERLAY_DISP, gEmptyCDownArrowTex, width, height, x, y, width, height, 2 << 10, 2 << 10);
 
     gDPPipeSync(OVERLAY_DISP++);
 
@@ -3425,11 +3426,12 @@ void Interface_DrawLineupTick(PlayState* play) {
 
 void Interface_DrawMagicBar(PlayState* play) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
-    s16 magicDrop = R_MAGIC_BAR_LARGE_Y-R_MAGIC_BAR_SMALL_Y+2;
+    s16 magicDrop = R_MAGIC_BAR_LARGE_Y - R_MAGIC_BAR_SMALL_Y + 2;
     s16 magicBarY;
-    Color_RGB8 magicbar_yellow = {250,250,0}; //Magic bar being used
-    Color_RGB8 magicbar_green = {R_MAGIC_FILL_COLOR(0),R_MAGIC_FILL_COLOR(1),R_MAGIC_FILL_COLOR(2)}; //Magic bar fill
-    Color_RGB8 magicbar_blue = {0,0,200};//Infinite magic bar
+    Color_RGB8 magicbar_yellow = { 250, 250, 0 }; // Magic bar being used
+    Color_RGB8 magicbar_green = { R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1),
+                                  R_MAGIC_FILL_COLOR(2) }; // Magic bar fill
+    Color_RGB8 magicbar_blue = { 0, 0, 200 };              // Infinite magic bar
 
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicActive.Changed"), 0)) {
         magicbar_yellow = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicActive.Value"), magicbar_yellow);
@@ -3448,7 +3450,7 @@ void Interface_DrawMagicBar(PlayState* play) {
         s16 Y_Margins;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.UseMargins"), 0) != 0) {
             X_Margins = Left_HUD_Margin;
-            Y_Margins = (Top_HUD_Margin*-1);
+            Y_Margins = (Top_HUD_Margin * -1);
         } else {
             X_Margins = 0;
             Y_Margins = 0;
@@ -3456,7 +3458,7 @@ void Interface_DrawMagicBar(PlayState* play) {
         const s16 magicBarY_original_l = R_MAGIC_BAR_LARGE_Y + Y_Margins;
         const s16 magicBarY_original_s = R_MAGIC_BAR_SMALL_Y + Y_Margins;
         const s16 PosX_Start_original = OTRGetRectDimensionFromLeftEdge(R_MAGIC_BAR_X + X_Margins);
-        const s16 PosX_MidEnd_original = OTRGetRectDimensionFromLeftEdge(R_MAGIC_BAR_X + X_Margins+8);
+        const s16 PosX_MidEnd_original = OTRGetRectDimensionFromLeftEdge(R_MAGIC_BAR_X + X_Margins + 8);
         const s16 rMagicBarX_original = OTRGetRectDimensionFromLeftEdge(R_MAGIC_BAR_X + X_Margins);
         const s16 rMagicFillX_original = OTRGetRectDimensionFromLeftEdge(R_MAGIC_FILL_X + X_Margins);
         s16 PosX_Start;
@@ -3466,43 +3468,59 @@ void Interface_DrawMagicBar(PlayState* play) {
         s16 rMagicFillX;
         s32 lineLength = CVarGetInteger(CVAR_COSMETIC("HUD.Hearts.LineLength"), 10);
         if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) != ORIGINAL_LOCATION) {
-            magicBarY = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosY"), 0)+Y_Margins;
+            magicBarY = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosY"), 0) + Y_Margins;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) == ANCHOR_LEFT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.UseMargins"), 0) != 0) {X_Margins = Left_HUD_Margin;};
-                PosX_Start = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins);
-                rMagicBarX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins);
-                PosX_MidEnd = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8);
-                rMagicFillX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8);
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.UseMargins"), 0) != 0) {
+                    X_Margins = Left_HUD_Margin;
+                };
+                PosX_Start =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins);
+                rMagicBarX =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins);
+                PosX_MidEnd =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8);
+                rMagicFillX =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) == ANCHOR_RIGHT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.UseMargins"), 0) != 0) {X_Margins = Right_HUD_Margin;};
-                PosX_Start = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins);
-                rMagicBarX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins);
-                PosX_MidEnd = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8);
-                rMagicFillX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8);
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.UseMargins"), 0) != 0) {
+                    X_Margins = Right_HUD_Margin;
+                };
+                PosX_Start =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins);
+                rMagicBarX =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins);
+                PosX_MidEnd =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8);
+                rMagicFillX =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) == ANCHOR_NONE) {
-                PosX_Start = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins;
-                rMagicBarX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins;
-                PosX_MidEnd = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8;
-                rMagicFillX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0)+X_Margins+8;
+                PosX_Start = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins;
+                rMagicBarX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins;
+                PosX_MidEnd = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8;
+                rMagicFillX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + X_Margins + 8;
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) == HIDDEN) {
                 PosX_Start = -9999;
                 rMagicBarX = -9999;
                 PosX_MidEnd = -9999;
                 rMagicFillX = -9999;
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosType"), 0) == ANCHOR_TO_LIFE_METER) {
-                magicBarY = R_MAGIC_BAR_SMALL_Y-2 +
-                    magicDrop*(lineLength == 0 ? 0 : (gSaveContext.healthCapacity-1)/(0x10*lineLength)) +
+                magicBarY =
+                    R_MAGIC_BAR_SMALL_Y - 2 +
+                    magicDrop * (lineLength == 0 ? 0 : (gSaveContext.healthCapacity - 1) / (0x10 * lineLength)) +
                     CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosY"), 0) + getHealthMeterYOffset();
-                s16 xPushover = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + getHealthMeterXOffset() + R_MAGIC_BAR_X-1;
+                s16 xPushover =
+                    CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + getHealthMeterXOffset() + R_MAGIC_BAR_X - 1;
                 PosX_Start = xPushover;
                 rMagicBarX = xPushover;
-                PosX_MidEnd = xPushover+8;
-                rMagicFillX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + getHealthMeterXOffset() + R_MAGIC_FILL_X-1;
+                PosX_MidEnd = xPushover + 8;
+                rMagicFillX = CVarGetInteger(CVAR_COSMETIC("HUD.MagicBar.PosX"), 0) + getHealthMeterXOffset() +
+                              R_MAGIC_FILL_X - 1;
             }
         } else {
-            if ((gSaveContext.healthCapacity-1)/0x10 >= lineLength && lineLength != 0) {
-                magicBarY = magicBarY_original_l +
-                            magicDrop*(lineLength == 0 ? 0 : ((gSaveContext.healthCapacity-1)/(0x10*lineLength) - 1));
+            if ((gSaveContext.healthCapacity - 1) / 0x10 >= lineLength && lineLength != 0) {
+                magicBarY =
+                    magicBarY_original_l +
+                    magicDrop * (lineLength == 0 ? 0 : ((gSaveContext.healthCapacity - 1) / (0x10 * lineLength) - 1));
             } else {
                 magicBarY = magicBarY_original_s;
             }
@@ -3517,16 +3535,18 @@ void Interface_DrawMagicBar(PlayState* play) {
         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMagicBorder.r, sMagicBorder.g, sMagicBorder.b, interfaceCtx->magicAlpha);
         gDPSetEnvColor(OVERLAY_DISP++, 100, 50, 50, 255);
 
-        OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10);
+        OVERLAY_DISP =
+            Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10);
 
-        OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, PosX_MidEnd, magicBarY, gSaveContext.magicCapacity, 16, 1 << 10, 1 << 10);
+        OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, PosX_MidEnd, magicBarY,
+                                      gSaveContext.magicCapacity, 16, 1 << 10, 1 << 10);
 
         gDPLoadTextureBlock(OVERLAY_DISP++, gMagicMeterEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 16, 0,
                             G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
         gSPWideTextureRectangle(OVERLAY_DISP++, ((rMagicBarX + gSaveContext.magicCapacity) + 8) << 2, magicBarY << 2,
-                            ((rMagicBarX + gSaveContext.magicCapacity) + 16) << 2, (magicBarY + 16) << 2, G_TX_RENDERTILE,
-                            256, 0, 1 << 10, 1 << 10);
+                                ((rMagicBarX + gSaveContext.magicCapacity) + 16) << 2, (magicBarY + 16) << 2,
+                                G_TX_RENDERTILE, 256, 0, 1 << 10, 1 << 10);
 
         gDPPipeSync(OVERLAY_DISP++);
         gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE,
@@ -3535,7 +3555,8 @@ void Interface_DrawMagicBar(PlayState* play) {
 
         if (gSaveContext.magicState == MAGIC_STATE_METER_FLASH_2) {
             // Yellow part of the bar indicating the amount of magic to be subtracted
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_yellow.r, magicbar_yellow.g, magicbar_yellow.b, interfaceCtx->magicAlpha);
+            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_yellow.r, magicbar_yellow.g, magicbar_yellow.b,
+                            interfaceCtx->magicAlpha);
 
             gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
                                  G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
@@ -3549,23 +3570,27 @@ void Interface_DrawMagicBar(PlayState* play) {
             gDPPipeSync(OVERLAY_DISP++);
             if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
                 // Blue magic
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b, interfaceCtx->magicAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b,
+                                interfaceCtx->magicAlpha);
             } else {
                 // Green magic (default)
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b,
+                                interfaceCtx->magicAlpha);
             }
 
             gSPWideTextureRectangle(OVERLAY_DISP++, rMagicFillX << 2, (magicBarY + 3) << 2,
-                                (rMagicFillX + gSaveContext.magicTarget) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE,
-                                0, 0, 1 << 10, 1 << 10);
+                                    (rMagicFillX + gSaveContext.magicTarget) << 2, (magicBarY + 10) << 2,
+                                    G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
         } else {
             // Fill the whole bar with the normal magic color
             if (Flags_GetRandomizerInf(RAND_INF_HAS_INFINITE_MAGIC_METER)) {
                 // Blue magic
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b, interfaceCtx->magicAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_blue.r, magicbar_blue.g, magicbar_blue.b,
+                                interfaceCtx->magicAlpha);
             } else {
                 // Green magic (default)
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b,
+                                interfaceCtx->magicAlpha);
             }
 
             gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
@@ -3584,31 +3609,6 @@ void Interface_DrawMagicBar(PlayState* play) {
 static Vtx sEnemyHealthVtx[16];
 static Mtx sEnemyHealthMtx[2];
 
-// Build vertex coordinates for a quad command
-// In order of top left, top right, bottom left, then bottom right
-// Supports flipping the texture horizontally
-void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH) {
-    vtxList[0].v.ob[0] = xStart;
-    vtxList[0].v.ob[1] = yStart;
-    vtxList[0].v.tc[0] = (flippedH ? width : 0) << 5;
-    vtxList[0].v.tc[1] = 0 << 5;
-
-    vtxList[1].v.ob[0] = xStart + width;
-    vtxList[1].v.ob[1] = yStart;
-    vtxList[1].v.tc[0] = (flippedH ? width * 2 : width) << 5;
-    vtxList[1].v.tc[1] = 0 << 5;
-
-    vtxList[2].v.ob[0] = xStart;
-    vtxList[2].v.ob[1] = yStart + height;
-    vtxList[2].v.tc[0] = (flippedH ? width : 0) << 5;
-    vtxList[2].v.tc[1] = height << 5;
-
-    vtxList[3].v.ob[0] = xStart + width;
-    vtxList[3].v.ob[1] = yStart + height;
-    vtxList[3].v.tc[0] = (flippedH ? width * 2 : width) << 5;
-    vtxList[3].v.tc[1] = height << 5;
-}
-
 // Draws an enemy health bar using the magic bar textures and positions it in a similar way to Z-Targeting
 void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
@@ -3644,7 +3644,7 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
         f32 scaleY = -0.75f;
         f32 scaledHeight = -texHeight * scaleY;
         f32 halfBarWidth = endTexWidth + ((f32)healthbar_fillWidth / 2);
-        s16 healthBarFill = ((f32)actor->colChkInfo.health / actor->maximumHealth) * healthbar_fillWidth;
+        s16 healthBarFill = ((f32)actor->colChkInfo.health / GetActorMaximumHealth(actor)) * healthbar_fillWidth;
 
         if (anchorType == ENEMYHEALTH_ANCHOR_ACTOR) {
             // Get actor projected position
@@ -3652,8 +3652,8 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
 
             projTargetCenter.x = (SCREEN_WIDTH / 2) * (projTargetCenter.x * projTargetCappedInvW);
             projTargetCenter.x = projTargetCenter.x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
-            projTargetCenter.x = CLAMP(projTargetCenter.x, (-SCREEN_WIDTH / 2) + halfBarWidth,
-                                       (SCREEN_WIDTH / 2) - halfBarWidth);
+            projTargetCenter.x =
+                CLAMP(projTargetCenter.x, (-SCREEN_WIDTH / 2) + halfBarWidth, (SCREEN_WIDTH / 2) - halfBarWidth);
 
             projTargetCenter.y = (SCREEN_HEIGHT / 2) * (projTargetCenter.y * projTargetCappedInvW);
             projTargetCenter.y = projTargetCenter.y - healthbar_offsetY + healthbar_actorOffset;
@@ -3668,18 +3668,20 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
         }
 
         // Health bar border end left
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[0], -floorf(halfBarWidth), -texHeight / 2, endTexWidth, texHeight, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[0], -floorf(halfBarWidth), -texHeight / 2, endTexWidth, texHeight,
+                                   0);
         // Health bar border middle
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[4], -floorf(halfBarWidth) + endTexWidth, -texHeight / 2,
-                                        healthbar_fillWidth, texHeight, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[4], -floorf(halfBarWidth) + endTexWidth, -texHeight / 2,
+                                   healthbar_fillWidth, texHeight, 0);
         // Health bar border end right
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[8], ceilf(halfBarWidth) - endTexWidth, -texHeight / 2, endTexWidth,
-                                        texHeight, 1);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[8], ceilf(halfBarWidth) - endTexWidth, -texHeight / 2, endTexWidth,
+                                   texHeight, 1);
         // Health bar fill
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3,
-                                        healthBarFill, 7, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3,
+                                   healthBarFill, 7, 0);
 
-        if (((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) && targetCtx->unk_44 < 500.0f) {
+        if (((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) &&
+            targetCtx->unk_44 < 500.0f) {
             f32 slideInOffsetY = 0;
 
             // Slide in the health bar from edge of the screen (mimic the Z-Target triangles fly in)
@@ -3757,21 +3759,21 @@ void func_80088AA0(s16 arg0) {
     gSaveContext.timerX[1] = 140;
     gSaveContext.timerY[1] = 80;
     D_80125A5C = 0;
-    gSaveContext.timer2Value = arg0;
+    gSaveContext.subTimerSeconds = arg0;
 
     if (arg0 != 0) {
-        gSaveContext.timer2State = 1;
+        gSaveContext.subTimerState = 1;
     } else {
-        gSaveContext.timer2State = 7;
+        gSaveContext.subTimerState = 7;
     }
 }
 
 void func_80088AF0(PlayState* play) {
-    if (gSaveContext.timer2State != 0) {
+    if (gSaveContext.subTimerState != 0) {
         if (gSaveContext.eventInf[1] & 1) {
-            gSaveContext.timer2Value = 239;
+            gSaveContext.subTimerSeconds = 239;
         } else {
-            gSaveContext.timer2Value = 1;
+            gSaveContext.subTimerSeconds = 1;
         }
     }
 }
@@ -3780,12 +3782,12 @@ void func_80088B34(s16 arg0) {
     gSaveContext.timerX[0] = 140;
     gSaveContext.timerY[0] = 80;
     D_80125A5C = 0;
-    gSaveContext.timer1Value = arg0;
+    gSaveContext.timerSeconds = arg0;
 
     if (arg0 != 0) {
-        gSaveContext.timer1State = 5;
+        gSaveContext.timerState = 5;
     } else {
-        gSaveContext.timer1State = 11;
+        gSaveContext.timerState = 11;
     }
 }
 
@@ -3802,8 +3804,8 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
 }
 
 void Interface_DrawItemButtons(PlayState* play) {
-    static void* cUpLabelTextures[] = { gNaviCUpENGTex, gNaviCUpENGTex, gNaviCUpENGTex };
-    static s16 startButtonLeftPos[] = { 132, 130, 130 };
+    static void* cUpLabelTextures[] = { gNaviCUpENGTex, gNaviCUpENGTex, gNaviCUpENGTex, gNaviCUpJPTex };
+    static s16 startButtonLeftPos[] = { 132, 130, 130, 132 };
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
     Player* player = GET_PLAYER(play);
     PauseContext* pauseCtx = &play->pauseCtx;
@@ -3847,7 +3849,7 @@ void Interface_DrawItemButtons(PlayState* play) {
         startButtonColor = (Color_RGB8){ 120, 120, 120 };
     }
 
-    //B Button
+    // B Button
     s16 X_Margins_BtnB;
     s16 Y_Margins_BtnB;
     s16 BBtn_Size = 32;
@@ -3857,24 +3859,32 @@ void Interface_DrawItemButtons(PlayState* play) {
     }
     int BBtn_factor = (1 << 10) * BBtn_Size / BBtnScaled;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_BtnB = Right_HUD_Margin;};
-        Y_Margins_BtnB = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_BtnB = Right_HUD_Margin;
+        };
+        Y_Margins_BtnB = (Top_HUD_Margin * -1);
     } else {
         X_Margins_BtnB = 0;
         Y_Margins_BtnB = 0;
     }
-    s16 PosX_BtnB_ori = OTRGetRectDimensionFromRightEdge(R_ITEM_BTN_X(0)+X_Margins_BtnB);
-    s16 PosY_BtnB_ori = R_ITEM_BTN_Y(0)+Y_Margins_BtnB;
+    s16 PosX_BtnB_ori = OTRGetRectDimensionFromRightEdge(R_ITEM_BTN_X(0) + X_Margins_BtnB);
+    s16 PosY_BtnB_ori = R_ITEM_BTN_Y(0) + Y_Margins_BtnB;
     s16 PosX_BtnB;
     s16 PosY_BtnB;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) != ORIGINAL_LOCATION) {
         PosY_BtnB = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosY"), 0) + Y_Margins_BtnB;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;};
-            PosX_BtnB = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Left_HUD_Margin;
+            };
+            PosX_BtnB =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;};
-            PosX_BtnB = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Right_HUD_Margin;
+            };
+            PosX_BtnB =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_NONE) {
             PosX_BtnB = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == HIDDEN) {
@@ -3884,14 +3894,14 @@ void Interface_DrawItemButtons(PlayState* play) {
         PosY_BtnB = PosY_BtnB_ori;
         PosX_BtnB = PosX_BtnB_ori;
     }
-    //Start Button
+    // Start Button
     s16 X_Margins_StartBtn;
     s16 Y_Margins_StartBtn;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.UseMargins"), 0) != 0) {
         if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) == ORIGINAL_LOCATION) {
             X_Margins_StartBtn = Right_HUD_Margin;
         };
-        Y_Margins_StartBtn = Top_HUD_Margin*-1;
+        Y_Margins_StartBtn = Top_HUD_Margin * -1;
     } else {
         X_Margins_StartBtn = 0;
         Y_Margins_StartBtn = 0;
@@ -3906,20 +3916,28 @@ void Interface_DrawItemButtons(PlayState* play) {
     int StartBTN_W_Scaled = StartBtn_Icon_W * Start_BTN_Scale;
     int StartBTN_W_factor = (1 << 10) * StartBtn_Icon_W / StartBTN_W_Scaled;
     int StartBTN_H_factor = (1 << 10) * StartBtn_Icon_H / StartBTN_H_Scaled;
-    const s16 PosX_StartBtn_ori = OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]+X_Margins_StartBtn);
-    const s16 PosY_StartBtn_ori = 16+Y_Margins_StartBtn;
+    const s16 PosX_StartBtn_ori =
+        OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language] + X_Margins_StartBtn);
+    const s16 PosY_StartBtn_ori = 16 + Y_Margins_StartBtn;
     s16 StartBTN_Label_W = DO_ACTION_TEX_WIDTH();
     s16 StartBTN_Label_H = DO_ACTION_TEX_HEIGHT();
     s16 PosX_StartBtn;
     s16 PosY_StartBtn;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        PosY_StartBtn = CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosY"), 0) - (Start_BTN_Scale*13)+Y_Margins_StartBtn;
+        PosY_StartBtn =
+            CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosY"), 0) - (Start_BTN_Scale * 13) + Y_Margins_StartBtn;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.UseMargins"), 0) != 0) {X_Margins_StartBtn = Left_HUD_Margin;};
-            PosX_StartBtn = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosX"), 0)-(Start_BTN_Scale * 13) + X_Margins_StartBtn);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.UseMargins"), 0) != 0) {
+                X_Margins_StartBtn = Left_HUD_Margin;
+            };
+            PosX_StartBtn = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosX"), 0) -
+                                                        (Start_BTN_Scale * 13) + X_Margins_StartBtn);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.UseMargins"), 0) != 0) {X_Margins_StartBtn = Right_HUD_Margin;};
-            PosX_StartBtn = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosX"), 0)-(Start_BTN_Scale * 13) + X_Margins_StartBtn);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.UseMargins"), 0) != 0) {
+                X_Margins_StartBtn = Right_HUD_Margin;
+            };
+            PosX_StartBtn = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosX"), 0) -
+                                                         (Start_BTN_Scale * 13) + X_Margins_StartBtn);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) == ANCHOR_NONE) {
             PosX_StartBtn = CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.StartButton.PosType"), 0) == HIDDEN) {
@@ -3933,7 +3951,7 @@ void Interface_DrawItemButtons(PlayState* play) {
         PosY_StartBtn = PosY_StartBtn_ori;
         PosX_StartBtn = PosX_StartBtn_ori;
     }
-    //C Buttons position
+    // C Buttons position
     s16 X_Margins_CL;
     s16 X_Margins_CR;
     s16 X_Margins_CU;
@@ -3943,44 +3961,52 @@ void Interface_DrawItemButtons(PlayState* play) {
     s16 Y_Margins_CU;
     s16 Y_Margins_CD;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CL = Right_HUD_Margin;};
-        Y_Margins_CL = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CL = Right_HUD_Margin;
+        };
+        Y_Margins_CL = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CL = 0;
         Y_Margins_CL = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CR = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CR = Right_HUD_Margin;
+        };
         Y_Margins_CR = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CR = 0;
         Y_Margins_CR = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CU = Right_HUD_Margin;};
-        Y_Margins_CU = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CU = Right_HUD_Margin;
+        };
+        Y_Margins_CU = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CU = 0;
         Y_Margins_CU = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CD = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CD = Right_HUD_Margin;
+        };
         Y_Margins_CD = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CD = 0;
         Y_Margins_CD = 0;
     }
-    const s16 C_Left_BTN_Pos_ori[]  = { C_LEFT_BUTTON_X+X_Margins_CL, C_LEFT_BUTTON_Y+Y_Margins_CL }; //(X,Y)
-    const s16 C_Right_BTN_Pos_ori[] = { C_RIGHT_BUTTON_X+X_Margins_CR, C_RIGHT_BUTTON_Y+Y_Margins_CR };
-    const s16 C_Up_BTN_Pos_ori[]    = { C_UP_BUTTON_X+X_Margins_CU, C_UP_BUTTON_Y+Y_Margins_CU };
-    const s16 C_Down_BTN_Pos_ori[]  = { C_DOWN_BUTTON_X+X_Margins_CD, C_DOWN_BUTTON_Y+Y_Margins_CD };
-    s16 LabelX_Navi=7 + !!CVarGetInteger(CVAR_ENHANCEMENT("NaviTextFix"), 0);
-    s16 LabelY_Navi=4;
+    const s16 C_Left_BTN_Pos_ori[] = { C_LEFT_BUTTON_X + X_Margins_CL, C_LEFT_BUTTON_Y + Y_Margins_CL }; //(X,Y)
+    const s16 C_Right_BTN_Pos_ori[] = { C_RIGHT_BUTTON_X + X_Margins_CR, C_RIGHT_BUTTON_Y + Y_Margins_CR };
+    const s16 C_Up_BTN_Pos_ori[] = { C_UP_BUTTON_X + X_Margins_CU, C_UP_BUTTON_Y + Y_Margins_CU };
+    const s16 C_Down_BTN_Pos_ori[] = { C_DOWN_BUTTON_X + X_Margins_CD, C_DOWN_BUTTON_Y + Y_Margins_CD };
+    s16 LabelX_Navi = 7 + !!CVarGetInteger(CVAR_ENHANCEMENT("NaviTextFix"), 0);
+    s16 LabelY_Navi = 4;
     s16 C_Left_BTN_Pos[2]; //(X,Y)
     s16 C_Right_BTN_Pos[2];
     s16 C_Up_BTN_Pos[2];
     s16 C_Down_BTN_Pos[2];
-    //C button Left
+    // C button Left
     s16 C_Left_BTN_Size = 32;
     float CLeftScale = CVarGetFloat(CVAR_COSMETIC("HUD.CLeftButton.Scale"), 0.87f);
     int CLeftScaled = C_Left_BTN_Size * 0.87f;
@@ -3991,11 +4017,17 @@ void Interface_DrawItemButtons(PlayState* play) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
         C_Left_BTN_Pos[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Left_HUD_Margin;};
-            C_Left_BTN_Pos[0] =OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Left_HUD_Margin;
+            };
+            C_Left_BTN_Pos[0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Right_HUD_Margin;};
-            C_Left_BTN_Pos[0] =OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Right_HUD_Margin;
+            };
+            C_Left_BTN_Pos[0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
             C_Left_BTN_Pos[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == HIDDEN) {
@@ -4005,7 +4037,7 @@ void Interface_DrawItemButtons(PlayState* play) {
         C_Left_BTN_Pos[1] = C_Left_BTN_Pos_ori[1];
         C_Left_BTN_Pos[0] = OTRGetRectDimensionFromRightEdge(C_Left_BTN_Pos_ori[0]);
     }
-    //C button Right
+    // C button Right
     s16 C_Right_BTN_Size = 32;
     float CRightScale = CVarGetFloat(CVAR_COSMETIC("HUD.CRightButton.Scale"), 0.87f);
     int CRightScaled = C_Right_BTN_Size * 0.87f;
@@ -4016,11 +4048,17 @@ void Interface_DrawItemButtons(PlayState* play) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
         C_Right_BTN_Pos[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Left_HUD_Margin;};
-            C_Right_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Left_HUD_Margin;
+            };
+            C_Right_BTN_Pos[0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Right_HUD_Margin;};
-            C_Right_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Right_HUD_Margin;
+            };
+            C_Right_BTN_Pos[0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
             C_Right_BTN_Pos[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == HIDDEN) {
@@ -4030,7 +4068,7 @@ void Interface_DrawItemButtons(PlayState* play) {
         C_Right_BTN_Pos[1] = C_Right_BTN_Pos_ori[1];
         C_Right_BTN_Pos[0] = OTRGetRectDimensionFromRightEdge(C_Right_BTN_Pos_ori[0]);
     }
-    //C Button Up
+    // C Button Up
     s16 C_Up_BTN_Size = 32;
     int CUpScaled = C_Up_BTN_Size * 0.5f;
     float CUpScale = CVarGetFloat(CVAR_COSMETIC("HUD.CUpButton.Scale"), 0.5f);
@@ -4041,11 +4079,17 @@ void Interface_DrawItemButtons(PlayState* play) {
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) != ORIGINAL_LOCATION) {
         C_Up_BTN_Pos[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosY"), 0) + Y_Margins_CU;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.UseMargins"), 0) != 0) {X_Margins_CU = Left_HUD_Margin;};
-            C_Up_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosX"), 0) + X_Margins_CU);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.UseMargins"), 0) != 0) {
+                X_Margins_CU = Left_HUD_Margin;
+            };
+            C_Up_BTN_Pos[0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosX"), 0) + X_Margins_CU);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.UseMargins"), 0) != 0) {X_Margins_CU = Right_HUD_Margin;};
-            C_Up_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosX"), 0) + X_Margins_CU);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.UseMargins"), 0) != 0) {
+                X_Margins_CU = Right_HUD_Margin;
+            };
+            C_Up_BTN_Pos[0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosX"), 0) + X_Margins_CU);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == ANCHOR_NONE) {
             C_Up_BTN_Pos[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CUpButton.PosType"), 0) == HIDDEN) {
@@ -4055,7 +4099,7 @@ void Interface_DrawItemButtons(PlayState* play) {
         C_Up_BTN_Pos[1] = C_Up_BTN_Pos_ori[1];
         C_Up_BTN_Pos[0] = OTRGetRectDimensionFromRightEdge(C_Up_BTN_Pos_ori[0]);
     }
-    //C Button down
+    // C Button down
     s16 C_Down_BTN_Size = 32;
     float CDownScale = CVarGetFloat(CVAR_COSMETIC("HUD.CDownButton.Scale"), 0.87f);
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
@@ -4063,15 +4107,21 @@ void Interface_DrawItemButtons(PlayState* play) {
     }
     int CDownScaled = C_Down_BTN_Size * CDownScale;
     int CDown_factor = (1 << 10) * C_Down_BTN_Size / CDownScaled;
-    int PositionAdjustment = CDownScaled/2;
+    int PositionAdjustment = CDownScaled / 2;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
         C_Down_BTN_Pos[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Left_HUD_Margin;};
-            C_Down_BTN_Pos[0] = (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Left_HUD_Margin;
+            };
+            C_Down_BTN_Pos[0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Right_HUD_Margin;};
-            C_Down_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Right_HUD_Margin;
+            };
+            C_Down_BTN_Pos[0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
             C_Down_BTN_Pos[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == HIDDEN) {
@@ -4088,39 +4138,44 @@ void Interface_DrawItemButtons(PlayState* play) {
     // Also loads the Item Button Texture reused by other buttons afterwards
     gDPPipeSync(OVERLAY_DISP++);
     gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
-    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, bButtonColor.r,bButtonColor.g,bButtonColor.b, interfaceCtx->bAlpha);
+    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, bButtonColor.r, bButtonColor.g, bButtonColor.b, interfaceCtx->bAlpha);
     gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255);
 
-    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gButtonBackgroundTex, BBtn_Size, BBtn_Size, PosX_BtnB, PosY_BtnB, BBtnScaled, BBtnScaled, BBtn_factor, BBtn_factor);
+    OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gButtonBackgroundTex, BBtn_Size, BBtn_Size, PosX_BtnB, PosY_BtnB,
+                                  BBtnScaled, BBtnScaled, BBtn_factor, BBtn_factor);
 
     // C-Left Button Color & Texture
     gDPPipeSync(OVERLAY_DISP++);
-    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, interfaceCtx->cLeftAlpha);
+    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b,
+                    interfaceCtx->cLeftAlpha);
     gSPWideTextureRectangle(OVERLAY_DISP++, C_Left_BTN_Pos[0] << 2, C_Left_BTN_Pos[1] << 2,
                             (C_Left_BTN_Pos[0] + R_ITEM_BTN_WIDTH(1)) << 2,
-                        (C_Left_BTN_Pos[1] + R_ITEM_BTN_WIDTH(1)) << 2,
-                        G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(1) << 1, R_ITEM_BTN_DD(1) << 1);
+                            (C_Left_BTN_Pos[1] + R_ITEM_BTN_WIDTH(1)) << 2, G_TX_RENDERTILE, 0, 0,
+                            R_ITEM_BTN_DD(1) << 1, R_ITEM_BTN_DD(1) << 1);
 
     // C-Down Button Color & Texture
-    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, interfaceCtx->cDownAlpha);
-    gSPWideTextureRectangle(OVERLAY_DISP++,  C_Down_BTN_Pos[0] << 2, C_Down_BTN_Pos[1] << 2,
+    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b,
+                    interfaceCtx->cDownAlpha);
+    gSPWideTextureRectangle(OVERLAY_DISP++, C_Down_BTN_Pos[0] << 2, C_Down_BTN_Pos[1] << 2,
                             (C_Down_BTN_Pos[0] + R_ITEM_BTN_WIDTH(2)) << 2,
-                        (C_Down_BTN_Pos[1] + R_ITEM_BTN_WIDTH(2)) << 2,
-                        G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(2) << 1, R_ITEM_BTN_DD(2) << 1);
+                            (C_Down_BTN_Pos[1] + R_ITEM_BTN_WIDTH(2)) << 2, G_TX_RENDERTILE, 0, 0,
+                            R_ITEM_BTN_DD(2) << 1, R_ITEM_BTN_DD(2) << 1);
 
     // C-Right Button Color & Texture
-    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, interfaceCtx->cRightAlpha);
+    gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b,
+                    interfaceCtx->cRightAlpha);
     gSPWideTextureRectangle(OVERLAY_DISP++, C_Right_BTN_Pos[0] << 2, C_Right_BTN_Pos[1] << 2,
                             (C_Right_BTN_Pos[0] + R_ITEM_BTN_WIDTH(3)) << 2,
-                        (C_Right_BTN_Pos[1] + R_ITEM_BTN_WIDTH(3)) << 2,
-                        G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(3) << 1, R_ITEM_BTN_DD(3) << 1);
+                            (C_Right_BTN_Pos[1] + R_ITEM_BTN_WIDTH(3)) << 2, G_TX_RENDERTILE, 0, 0,
+                            R_ITEM_BTN_DD(3) << 1, R_ITEM_BTN_DD(3) << 1);
 
     if ((pauseCtx->state < 8) || (pauseCtx->state >= 18)) {
         if ((play->pauseCtx.state != 0) || (play->pauseCtx.debugState != 0)) {
             // Start Button Texture, Color & Label
             gDPPipeSync(OVERLAY_DISP++);
 
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, startButtonColor.r, startButtonColor.g, startButtonColor.b, interfaceCtx->startAlpha);
+            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, startButtonColor.r, startButtonColor.g, startButtonColor.b,
+                            interfaceCtx->startAlpha);
             gSPWideTextureRectangle(OVERLAY_DISP++, PosX_StartBtn << 2, PosY_StartBtn << 2,
                                     (PosX_StartBtn + StartBTN_W_Scaled) << 2, (PosY_StartBtn + StartBTN_H_Scaled) << 2,
                                     G_TX_RENDERTILE, 0, 0, StartBTN_W_factor, StartBTN_H_factor);
@@ -4130,9 +4185,9 @@ void Interface_DrawItemButtons(PlayState* play) {
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
             Interface_LoadActionLabel(interfaceCtx, 3, 2);
-            gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment[2], G_IM_FMT_IA,
-                                   DO_ACTION_TEX_WIDTH(), DO_ACTION_TEX_HEIGHT(), 0, G_TX_NOMIRROR | G_TX_WRAP,
-                                   G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+            gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment[2], G_IM_FMT_IA, DO_ACTION_TEX_WIDTH(),
+                                   DO_ACTION_TEX_HEIGHT(), 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                   G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
             gDPPipeSync(OVERLAY_DISP++);
             gSPSetGeometryMode(OVERLAY_DISP++, G_CULL_BACK);
@@ -4140,10 +4195,12 @@ void Interface_DrawItemButtons(PlayState* play) {
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->startAlpha);
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
-            Matrix_Translate(PosX_StartBtn-160+((Start_BTN_Scale+Start_BTN_Scale/3)*11.5f), (PosY_StartBtn-120+((Start_BTN_Scale+Start_BTN_Scale/3)*11.5f)) * -1, 1.0f, MTXMODE_NEW);
-            Matrix_Scale(Start_BTN_Scale+(Start_BTN_Scale/3), Start_BTN_Scale+(Start_BTN_Scale/3), Start_BTN_Scale+(Start_BTN_Scale/3), MTXMODE_APPLY);
-            gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_MODELVIEW | G_MTX_LOAD);
+            Matrix_Translate(PosX_StartBtn - 160 + ((Start_BTN_Scale + Start_BTN_Scale / 3) * 11.5f),
+                             (PosY_StartBtn - 120 + ((Start_BTN_Scale + Start_BTN_Scale / 3) * 11.5f)) * -1, 1.0f,
+                             MTXMODE_NEW);
+            Matrix_Scale(Start_BTN_Scale + (Start_BTN_Scale / 3), Start_BTN_Scale + (Start_BTN_Scale / 3),
+                         Start_BTN_Scale + (Start_BTN_Scale / 3), MTXMODE_APPLY);
+            gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
             gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[4], 4, 0);
             Interface_DrawActionLabel(play->state.gfxCtx, interfaceCtx->doActionSegment[2]);
             gDPPipeSync(OVERLAY_DISP++);
@@ -4158,8 +4215,8 @@ void Interface_DrawItemButtons(PlayState* play) {
 
             if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) {
                 temp = 0;
-            } else if ((player->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER) || (Player_GetEnvironmentalHazard(play) == 4) ||
-                       (player->stateFlags2 & PLAYER_STATE2_CRAWLING)) {
+            } else if ((player->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER) ||
+                       (Player_GetEnvironmentalHazard(play) == 4) || (player->stateFlags2 & PLAYER_STATE2_CRAWLING)) {
                 temp = 70;
             } else {
                 temp = interfaceCtx->healthAlpha;
@@ -4167,8 +4224,9 @@ void Interface_DrawItemButtons(PlayState* play) {
 
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, temp);
             gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
-            gSPWideTextureRectangle(OVERLAY_DISP++, C_Up_BTN_Pos[0] << 2, C_Up_BTN_Pos[1] << 2, (C_Up_BTN_Pos[0] + 16) << 2,
-                                (C_Up_BTN_Pos[1] + 16) << 2, G_TX_RENDERTILE, 0, 0, 2 << 10, 2 << 10);
+            gSPWideTextureRectangle(OVERLAY_DISP++, C_Up_BTN_Pos[0] << 2, C_Up_BTN_Pos[1] << 2,
+                                    (C_Up_BTN_Pos[0] + 16) << 2, (C_Up_BTN_Pos[1] + 16) << 2, G_TX_RENDERTILE, 0, 0,
+                                    2 << 10, 2 << 10);
             gDPPipeSync(OVERLAY_DISP++);
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, temp);
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
@@ -4179,9 +4237,9 @@ void Interface_DrawItemButtons(PlayState* play) {
                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                    G_TX_NOLOD, G_TX_NOLOD);
 
-            gSPWideTextureRectangle(OVERLAY_DISP++, C_Up_BTN_Pos[0]-LabelX_Navi << 2, C_Up_BTN_Pos[1]+LabelY_Navi << 2, 
-                        (C_Up_BTN_Pos[0]-LabelX_Navi + 32) << 2, (C_Up_BTN_Pos[1]+LabelY_Navi + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
-
+            gSPWideTextureRectangle(OVERLAY_DISP++, C_Up_BTN_Pos[0] - LabelX_Navi << 2,
+                                    C_Up_BTN_Pos[1] + LabelY_Navi << 2, (C_Up_BTN_Pos[0] - LabelX_Navi + 32) << 2,
+                                    (C_Up_BTN_Pos[1] + LabelY_Navi + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
         }
 
         sCUpTimer--;
@@ -4203,21 +4261,27 @@ void Interface_DrawItemButtons(PlayState* play) {
             s16 Y_Margins_CR;
             s16 Y_Margins_CD;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CL = Right_HUD_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {
+                    X_Margins_CL = Right_HUD_Margin;
+                };
                 Y_Margins_CL = (Top_HUD_Margin * -1);
             } else {
                 X_Margins_CL = 0;
                 Y_Margins_CL = 0;
             }
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CR = Right_HUD_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {
+                    X_Margins_CR = Right_HUD_Margin;
+                };
                 Y_Margins_CR = (Top_HUD_Margin * -1);
             } else {
                 X_Margins_CR = 0;
                 Y_Margins_CR = 0;
             }
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CD = Right_HUD_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
+                    X_Margins_CD = Right_HUD_Margin;
+                };
                 Y_Margins_CD = (Top_HUD_Margin * -1);
             } else {
                 X_Margins_CD = 0;
@@ -4229,20 +4293,26 @@ void Interface_DrawItemButtons(PlayState* play) {
                 { CRightScaled, CRight_factor },
             };
             const s16 ItemIconPos_ori[3][2] = {
-                { R_ITEM_ICON_X(1)+X_Margins_CL, R_ITEM_ICON_Y(1)+Y_Margins_CL },
-                { R_ITEM_ICON_X(2)+X_Margins_CD, R_ITEM_ICON_Y(2)+Y_Margins_CD },
-                { R_ITEM_ICON_X(3)+X_Margins_CR, R_ITEM_ICON_Y(3)+Y_Margins_CR },
+                { R_ITEM_ICON_X(1) + X_Margins_CL, R_ITEM_ICON_Y(1) + Y_Margins_CL },
+                { R_ITEM_ICON_X(2) + X_Margins_CD, R_ITEM_ICON_Y(2) + Y_Margins_CD },
+                { R_ITEM_ICON_X(3) + X_Margins_CR, R_ITEM_ICON_Y(3) + Y_Margins_CR },
             };
             s16 ItemIconPos[3][2]; //(X,Y)
             // C button Left
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
                 ItemIconPos[0][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Left_HUD_Margin;};
-                    ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                        X_Margins_CL = Left_HUD_Margin;
+                    };
+                    ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Right_HUD_Margin;};
-                    ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                        X_Margins_CL = Right_HUD_Margin;
+                    };
+                    ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
                     ItemIconPos[0][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == HIDDEN) {
@@ -4252,15 +4322,21 @@ void Interface_DrawItemButtons(PlayState* play) {
                 ItemIconPos[0][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[0][0]);
                 ItemIconPos[0][1] = ItemIconPos_ori[0][1];
             }
-            //C Button down
+            // C Button down
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
                 ItemIconPos[1][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Left_HUD_Margin;};
-                    ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                        X_Margins_CD = Left_HUD_Margin;
+                    };
+                    ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Right_HUD_Margin;};
-                    ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                        X_Margins_CD = Right_HUD_Margin;
+                    };
+                    ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
                     ItemIconPos[1][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == HIDDEN) {
@@ -4270,15 +4346,21 @@ void Interface_DrawItemButtons(PlayState* play) {
                 ItemIconPos[1][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[1][0]);
                 ItemIconPos[1][1] = ItemIconPos_ori[1][1];
             }
-            //C button Right
+            // C button Right
             if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
                 ItemIconPos[2][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Left_HUD_Margin;};
-                    ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                        X_Margins_CR = Left_HUD_Margin;
+                    };
+                    ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Right_HUD_Margin;};
-                    ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                        X_Margins_CR = Right_HUD_Margin;
+                    };
+                    ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(
+                        CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
                     ItemIconPos[2][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == HIDDEN) {
@@ -4290,24 +4372,28 @@ void Interface_DrawItemButtons(PlayState* play) {
             }
 
             if (temp == 1) {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, interfaceCtx->cLeftAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b,
+                                interfaceCtx->cLeftAlpha);
             } else if (temp == 2) {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, interfaceCtx->cDownAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b,
+                                interfaceCtx->cDownAlpha);
             } else {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, interfaceCtx->cRightAlpha);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b,
+                                interfaceCtx->cRightAlpha);
             }
 
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, ((u8*)gButtonBackgroundTex), 32, 32, 
-                                          ItemIconPos[temp-1][0], ItemIconPos[temp-1][1], ItemIconWidthFactor[temp-1][0],
-                                          ItemIconWidthFactor[temp-1][0], ItemIconWidthFactor[temp-1][1], ItemIconWidthFactor[temp-1][1]);
+            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, ((u8*)gButtonBackgroundTex), 32, 32, ItemIconPos[temp - 1][0],
+                                          ItemIconPos[temp - 1][1], ItemIconWidthFactor[temp - 1][0],
+                                          ItemIconWidthFactor[temp - 1][0], ItemIconWidthFactor[temp - 1][1],
+                                          ItemIconWidthFactor[temp - 1][1]);
 
             const char* cButtonIcons[] = { gButtonBackgroundTex, gEquippedItemOutlineTex, gEmptyCLeftArrowTex,
-                                           gEmptyCDownArrowTex, gEmptyCRightArrowTex
-            };
+                                           gEmptyCDownArrowTex, gEmptyCRightArrowTex };
 
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, cButtonIcons[(temp + 1)], 32, 32,
-                                          ItemIconPos[temp-1][0], ItemIconPos[temp-1][1], ItemIconWidthFactor[temp-1][0],
-                                          ItemIconWidthFactor[temp-1][0], ItemIconWidthFactor[temp-1][1], ItemIconWidthFactor[temp-1][1]);
+            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, cButtonIcons[(temp + 1)], 32, 32, ItemIconPos[temp - 1][0],
+                                          ItemIconPos[temp - 1][1], ItemIconWidthFactor[temp - 1][0],
+                                          ItemIconWidthFactor[temp - 1][0], ItemIconWidthFactor[temp - 1][1],
+                                          ItemIconWidthFactor[temp - 1][1]);
         }
     }
 
@@ -4332,284 +4418,102 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) {
     s16 X_Margins_DPad_Items;
     s16 Y_Margins_DPad_Items;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_BtnB = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_BtnB = Right_HUD_Margin;
+        };
         Y_Margins_BtnB = (Top_HUD_Margin * -1);
     } else {
         X_Margins_BtnB = 0;
         Y_Margins_BtnB = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CL = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CL = Right_HUD_Margin;
+        };
         Y_Margins_CL = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CL = 0;
         Y_Margins_CL = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CR = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CR = Right_HUD_Margin;
+        };
         Y_Margins_CR = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CR = 0;
         Y_Margins_CR = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CD = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CD = Right_HUD_Margin;
+        };
         Y_Margins_CD = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CD = 0;
         Y_Margins_CD = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_DPad_Items = Right_HUD_Margin;};
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_DPad_Items = Right_HUD_Margin;
+        };
         Y_Margins_DPad_Items = (Top_HUD_Margin * -1);
     } else {
         X_Margins_DPad_Items = 0;
         Y_Margins_DPad_Items = 0;
     }
-    const s16 ItemIconPos_ori[8][2] = {
-        { B_BUTTON_X+X_Margins_BtnB, B_BUTTON_Y+Y_Margins_BtnB },
-        { C_LEFT_BUTTON_X+X_Margins_CL, C_LEFT_BUTTON_Y+Y_Margins_CL },
-        { C_DOWN_BUTTON_X+X_Margins_CD, C_DOWN_BUTTON_Y+Y_Margins_CD },
-        { C_RIGHT_BUTTON_X+X_Margins_CR, C_RIGHT_BUTTON_Y+Y_Margins_CR },
-        { DPAD_UP_X+X_Margins_DPad_Items, DPAD_UP_Y+Y_Margins_DPad_Items },
-        { DPAD_DOWN_X+X_Margins_DPad_Items, DPAD_DOWN_Y+Y_Margins_DPad_Items }, 
-        { DPAD_LEFT_X+X_Margins_DPad_Items, DPAD_LEFT_Y+Y_Margins_DPad_Items }, 
-        { DPAD_RIGHT_X+X_Margins_DPad_Items, DPAD_RIGHT_Y+Y_Margins_DPad_Items }
-    };
-    u16 ItemsSlotsAlpha[8] = {
-        interfaceCtx->bAlpha,
-        interfaceCtx->cLeftAlpha,
-        interfaceCtx->cRightAlpha,
-        interfaceCtx->cDownAlpha,
-        interfaceCtx->dpadUpAlpha,
-        interfaceCtx->dpadDownAlpha,
-        interfaceCtx->dpadLeftAlpha,
-        interfaceCtx->dpadRightAlpha
-    };
+    const s16 ItemIconPos_ori[8][2] = { { B_BUTTON_X + X_Margins_BtnB, B_BUTTON_Y + Y_Margins_BtnB },
+                                        { C_LEFT_BUTTON_X + X_Margins_CL, C_LEFT_BUTTON_Y + Y_Margins_CL },
+                                        { C_DOWN_BUTTON_X + X_Margins_CD, C_DOWN_BUTTON_Y + Y_Margins_CD },
+                                        { C_RIGHT_BUTTON_X + X_Margins_CR, C_RIGHT_BUTTON_Y + Y_Margins_CR },
+                                        { DPAD_UP_X + X_Margins_DPad_Items, DPAD_UP_Y + Y_Margins_DPad_Items },
+                                        { DPAD_DOWN_X + X_Margins_DPad_Items, DPAD_DOWN_Y + Y_Margins_DPad_Items },
+                                        { DPAD_LEFT_X + X_Margins_DPad_Items, DPAD_LEFT_Y + Y_Margins_DPad_Items },
+                                        { DPAD_RIGHT_X + X_Margins_DPad_Items, DPAD_RIGHT_Y + Y_Margins_DPad_Items } };
+    u16 ItemsSlotsAlpha[8] = { interfaceCtx->bAlpha,        interfaceCtx->cLeftAlpha,    interfaceCtx->cRightAlpha,
+                               interfaceCtx->cDownAlpha,    interfaceCtx->dpadUpAlpha,   interfaceCtx->dpadDownAlpha,
+                               interfaceCtx->dpadLeftAlpha, interfaceCtx->dpadRightAlpha };
     s16 DPad_ItemsOffset[4][2] = {
-        { 7,-8},//Up
-        { 7,24},//Down
-        {-9, 8},//Left
-        {23, 8},//Right
-    }; //(X,Y) Used with custom position to place it properly.
+        { 7, -8 },         // Up
+        { 7, 24 },         // Down
+        { -9, 8 },         // Left
+        { 23, 8 },         // Right
+    };                     //(X,Y) Used with custom position to place it properly.
     s16 ItemIconPos[8][2]; //(X,Y)
     // DPadItems
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[4][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[0][1]; // Up
-        ItemIconPos[5][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[1][1]; // Down
-        ItemIconPos[6][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[2][1]; // Left
-        ItemIconPos[7][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[3][1]; // Right
+        ItemIconPos[4][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[0][1]; // Up
+        ItemIconPos[5][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[1][1]; // Down
+        ItemIconPos[6][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[2][1]; // Left
+        ItemIconPos[7][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[3][1]; // Right
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;};
-            ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
-            ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
-            ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
-            ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Left_HUD_Margin;
+            };
+            ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;};
-            ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
-            ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
-            ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
-            ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_NONE) {
-            ItemIconPos[4][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[0][0];
-            ItemIconPos[5][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[1][0];
-            ItemIconPos[6][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[2][0];
-            ItemIconPos[7][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[3][0];
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == HIDDEN) {
-            ItemIconPos[4][0] = -9999;
-            ItemIconPos[5][0] = -9999;
-            ItemIconPos[6][0] = -9999;
-            ItemIconPos[7][0] = -9999;
-        }
-    } else {
-        ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[4][0]);
-        ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[5][0]);
-        ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[6][0]);
-        ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[7][0]);
-        ItemIconPos[4][1] = ItemIconPos_ori[4][1];
-        ItemIconPos[5][1] = ItemIconPos_ori[5][1];
-        ItemIconPos[6][1] = ItemIconPos_ori[6][1];
-        ItemIconPos[7][1] = ItemIconPos_ori[7][1];
-    }
-    // B Button
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[0][1] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosY"), 0) + Y_Margins_BtnB;
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;};
-            ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;};
-            ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_NONE) {
-            ItemIconPos[0][0] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == HIDDEN) {
-            ItemIconPos[0][0] = -9999;
-        }
-    } else {
-        ItemIconPos[0][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[0][0]);
-        ItemIconPos[0][1] = ItemIconPos_ori[0][1];
-    }
-    // C button Left
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[1][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL;
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Left_HUD_Margin;};
-            ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Right_HUD_Margin;};
-            ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
-            ItemIconPos[1][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == HIDDEN) {
-            ItemIconPos[1][0] = -9999;
-        }
-    } else {
-        ItemIconPos[1][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[1][0]);
-        ItemIconPos[1][1] = ItemIconPos_ori[1][1];
-    }
-    //C Button down
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[2][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD;
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Left_HUD_Margin;};
-            ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Right_HUD_Margin;};
-            ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
-            ItemIconPos[2][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == HIDDEN) {
-            ItemIconPos[2][0] = -9999;
-        }
-    } else {
-        ItemIconPos[2][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[2][0]);
-        ItemIconPos[2][1] = ItemIconPos_ori[2][1];
-    }
-    //C button Right
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[3][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR;
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Left_HUD_Margin;};
-            ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Right_HUD_Margin;};
-            ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
-            ItemIconPos[3][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == HIDDEN) {
-            ItemIconPos[3][0] = -9999;
-        }
-    } else {
-        ItemIconPos[3][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[3][0]);
-        ItemIconPos[3][1] = ItemIconPos_ori[3][1];
-    }
-
-    gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-
-    gSPWideTextureRectangle(OVERLAY_DISP++, ItemIconPos[button][0] << 2, ItemIconPos[button][1] << 2,
-                            (ItemIconPos[button][0] + gItemIconWidth[button]) << 2,
-                            (ItemIconPos[button][1] + gItemIconWidth[button]) << 2, G_TX_RENDERTILE, 0, 0,
-                            gItemIconDD[button] << 1, gItemIconDD[button] << 1);
-
-    CLOSE_DISPS(play->state.gfxCtx);
-}
-
-const char* _gAmmoDigit0Tex[] =
-{
-    gAmmoDigit0Tex, gAmmoDigit1Tex, gAmmoDigit2Tex, gAmmoDigit3Tex, gAmmoDigit4Tex,
-    gAmmoDigit5Tex, gAmmoDigit6Tex, gAmmoDigit7Tex, gAmmoDigit8Tex, gAmmoDigit9Tex,
-    gUnusedAmmoDigitHalfTex };
-
-static int16_t gItemAmmoX[] = { B_BUTTON_X + 2, C_LEFT_BUTTON_X + 1, C_DOWN_BUTTON_X + 1, C_RIGHT_BUTTON_X + 1,
-                                DPAD_UP_X,      DPAD_DOWN_X,         DPAD_LEFT_X,         DPAD_RIGHT_X };
-static int16_t gItemAmmoY[] = { B_BUTTON_Y + 18, C_LEFT_BUTTON_Y + 17, C_DOWN_BUTTON_Y + 17, C_RIGHT_BUTTON_Y + 17,
-                                DPAD_UP_Y + 11,  DPAD_DOWN_Y + 11,     DPAD_LEFT_Y + 11,     DPAD_RIGHT_Y + 11 };
-
-void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
-    s16 i;
-    s16 ammo;
-    s16 X_Margins_CL;
-    s16 X_Margins_CR;
-    s16 X_Margins_CD;
-    s16 Y_Margins_CL;
-    s16 Y_Margins_CR;
-    s16 Y_Margins_CD;
-    s16 X_Margins_BtnB;
-    s16 Y_Margins_BtnB;
-    s16 X_Margins_DPad_Items;
-    s16 Y_Margins_DPad_Items;
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_BtnB = Right_HUD_Margin;};
-        Y_Margins_BtnB = (Top_HUD_Margin * -1);
-    } else {
-        X_Margins_BtnB = 0;
-        Y_Margins_BtnB = 0;
-    }
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CL = Right_HUD_Margin;};
-        Y_Margins_CL = (Top_HUD_Margin * -1);
-    } else {
-        X_Margins_CL = 0;
-        Y_Margins_CL = 0;
-    }
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CR = Right_HUD_Margin;};
-        Y_Margins_CR = (Top_HUD_Margin * -1);
-    } else {
-        X_Margins_CR = 0;
-        Y_Margins_CR = 0;
-    }
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CD = Right_HUD_Margin;};
-        Y_Margins_CD = (Top_HUD_Margin * -1);
-    } else {
-        X_Margins_CD = 0;
-        Y_Margins_CD = 0;
-    }
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_DPad_Items = Right_HUD_Margin;};
-        Y_Margins_DPad_Items = (Top_HUD_Margin * -1);
-    } else {
-        X_Margins_DPad_Items = 0;
-        Y_Margins_DPad_Items = 0;
-    }
-    const s16 ItemIconPos_ori[8][2] = {
-        { R_ITEM_AMMO_X(0)+X_Margins_BtnB, R_ITEM_AMMO_Y(0)+Y_Margins_BtnB }, //Bow on Epona?
-        { R_ITEM_AMMO_X(1)+X_Margins_CL, R_ITEM_AMMO_Y(1)+Y_Margins_CL },
-        { R_ITEM_AMMO_X(2)+X_Margins_CD, R_ITEM_AMMO_Y(2)+Y_Margins_CD },
-        { R_ITEM_AMMO_X(3)+X_Margins_CR, R_ITEM_AMMO_Y(3)+Y_Margins_CR },
-        { DPAD_UP_X+X_Margins_DPad_Items, DPAD_UP_Y + 11 + Y_Margins_DPad_Items },
-        { DPAD_DOWN_X+X_Margins_DPad_Items, DPAD_DOWN_Y + 11 + Y_Margins_DPad_Items },
-        { DPAD_LEFT_X+X_Margins_DPad_Items, DPAD_LEFT_Y + 11 + Y_Margins_DPad_Items },
-        { DPAD_RIGHT_X+X_Margins_DPad_Items, DPAD_RIGHT_Y + 11 + Y_Margins_DPad_Items }
-    };
-    s16 ItemIconPos[8][2]; //(X,Y)
-    s16 DPad_ItemsOffset[4][2] = {
-        { 7, 3},//Up
-        { 7,35},//Down
-        {-9,19},//Left
-        {23,19},//Right
-    }; //(X,Y) Used with custom position to place it properly.
-    //DPadItems
-    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) != ORIGINAL_LOCATION) {
-        ItemIconPos[4][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up
-        ItemIconPos[5][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down
-        ItemIconPos[6][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left
-        ItemIconPos[7][1] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;};
-            ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
-            ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
-            ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
-            ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
-        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;};
-            ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
-            ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
-            ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
-            ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Right_HUD_Margin;
+            };
+            ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_NONE) {
             ItemIconPos[4][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[0][0];
             ItemIconPos[5][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[1][0];
@@ -4631,17 +4535,270 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         ItemIconPos[6][1] = ItemIconPos_ori[6][1];
         ItemIconPos[7][1] = ItemIconPos_ori[7][1];
     }
-    //B Button
+    // B Button
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) != ORIGINAL_LOCATION) {
+        ItemIconPos[0][1] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosY"), 0) + Y_Margins_BtnB;
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_LEFT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Left_HUD_Margin;
+            };
+            ItemIconPos[0][0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_RIGHT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Right_HUD_Margin;
+            };
+            ItemIconPos[0][0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + X_Margins_BtnB);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_NONE) {
+            ItemIconPos[0][0] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == HIDDEN) {
+            ItemIconPos[0][0] = -9999;
+        }
+    } else {
+        ItemIconPos[0][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[0][0]);
+        ItemIconPos[0][1] = ItemIconPos_ori[0][1];
+    }
+    // C button Left
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
+        ItemIconPos[1][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL;
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Left_HUD_Margin;
+            };
+            ItemIconPos[1][0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Right_HUD_Margin;
+            };
+            ItemIconPos[1][0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
+            ItemIconPos[1][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == HIDDEN) {
+            ItemIconPos[1][0] = -9999;
+        }
+    } else {
+        ItemIconPos[1][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[1][0]);
+        ItemIconPos[1][1] = ItemIconPos_ori[1][1];
+    }
+    // C Button down
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
+        ItemIconPos[2][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD;
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Left_HUD_Margin;
+            };
+            ItemIconPos[2][0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Right_HUD_Margin;
+            };
+            ItemIconPos[2][0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
+            ItemIconPos[2][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == HIDDEN) {
+            ItemIconPos[2][0] = -9999;
+        }
+    } else {
+        ItemIconPos[2][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[2][0]);
+        ItemIconPos[2][1] = ItemIconPos_ori[2][1];
+    }
+    // C button Right
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
+        ItemIconPos[3][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR;
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Left_HUD_Margin;
+            };
+            ItemIconPos[3][0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Right_HUD_Margin;
+            };
+            ItemIconPos[3][0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
+            ItemIconPos[3][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == HIDDEN) {
+            ItemIconPos[3][0] = -9999;
+        }
+    } else {
+        ItemIconPos[3][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[3][0]);
+        ItemIconPos[3][1] = ItemIconPos_ori[3][1];
+    }
+
+    gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+    gSPWideTextureRectangle(OVERLAY_DISP++, ItemIconPos[button][0] << 2, ItemIconPos[button][1] << 2,
+                            (ItemIconPos[button][0] + gItemIconWidth[button]) << 2,
+                            (ItemIconPos[button][1] + gItemIconWidth[button]) << 2, G_TX_RENDERTILE, 0, 0,
+                            gItemIconDD[button] << 1, gItemIconDD[button] << 1);
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
+const char* _gAmmoDigit0Tex[] = { gAmmoDigit0Tex, gAmmoDigit1Tex, gAmmoDigit2Tex,         gAmmoDigit3Tex,
+                                  gAmmoDigit4Tex, gAmmoDigit5Tex, gAmmoDigit6Tex,         gAmmoDigit7Tex,
+                                  gAmmoDigit8Tex, gAmmoDigit9Tex, gUnusedAmmoDigitHalfTex };
+
+static int16_t gItemAmmoX[] = { B_BUTTON_X + 2, C_LEFT_BUTTON_X + 1, C_DOWN_BUTTON_X + 1, C_RIGHT_BUTTON_X + 1,
+                                DPAD_UP_X,      DPAD_DOWN_X,         DPAD_LEFT_X,         DPAD_RIGHT_X };
+static int16_t gItemAmmoY[] = { B_BUTTON_Y + 18, C_LEFT_BUTTON_Y + 17, C_DOWN_BUTTON_Y + 17, C_RIGHT_BUTTON_Y + 17,
+                                DPAD_UP_Y + 11,  DPAD_DOWN_Y + 11,     DPAD_LEFT_Y + 11,     DPAD_RIGHT_Y + 11 };
+
+void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
+    s16 i;
+    s16 ammo;
+    s16 X_Margins_CL;
+    s16 X_Margins_CR;
+    s16 X_Margins_CD;
+    s16 Y_Margins_CL;
+    s16 Y_Margins_CR;
+    s16 Y_Margins_CD;
+    s16 X_Margins_BtnB;
+    s16 Y_Margins_BtnB;
+    s16 X_Margins_DPad_Items;
+    s16 Y_Margins_DPad_Items;
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_BtnB = Right_HUD_Margin;
+        };
+        Y_Margins_BtnB = (Top_HUD_Margin * -1);
+    } else {
+        X_Margins_BtnB = 0;
+        Y_Margins_BtnB = 0;
+    }
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CL = Right_HUD_Margin;
+        };
+        Y_Margins_CL = (Top_HUD_Margin * -1);
+    } else {
+        X_Margins_CL = 0;
+        Y_Margins_CL = 0;
+    }
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CR = Right_HUD_Margin;
+        };
+        Y_Margins_CR = (Top_HUD_Margin * -1);
+    } else {
+        X_Margins_CR = 0;
+        Y_Margins_CR = 0;
+    }
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CD = Right_HUD_Margin;
+        };
+        Y_Margins_CD = (Top_HUD_Margin * -1);
+    } else {
+        X_Margins_CD = 0;
+        Y_Margins_CD = 0;
+    }
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_DPad_Items = Right_HUD_Margin;
+        };
+        Y_Margins_DPad_Items = (Top_HUD_Margin * -1);
+    } else {
+        X_Margins_DPad_Items = 0;
+        Y_Margins_DPad_Items = 0;
+    }
+    const s16 ItemIconPos_ori[8][2] = {
+        { R_ITEM_AMMO_X(0) + X_Margins_BtnB, R_ITEM_AMMO_Y(0) + Y_Margins_BtnB }, // Bow on Epona?
+        { R_ITEM_AMMO_X(1) + X_Margins_CL, R_ITEM_AMMO_Y(1) + Y_Margins_CL },
+        { R_ITEM_AMMO_X(2) + X_Margins_CD, R_ITEM_AMMO_Y(2) + Y_Margins_CD },
+        { R_ITEM_AMMO_X(3) + X_Margins_CR, R_ITEM_AMMO_Y(3) + Y_Margins_CR },
+        { DPAD_UP_X + X_Margins_DPad_Items, DPAD_UP_Y + 11 + Y_Margins_DPad_Items },
+        { DPAD_DOWN_X + X_Margins_DPad_Items, DPAD_DOWN_Y + 11 + Y_Margins_DPad_Items },
+        { DPAD_LEFT_X + X_Margins_DPad_Items, DPAD_LEFT_Y + 11 + Y_Margins_DPad_Items },
+        { DPAD_RIGHT_X + X_Margins_DPad_Items, DPAD_RIGHT_Y + 11 + Y_Margins_DPad_Items }
+    };
+    s16 ItemIconPos[8][2]; //(X,Y)
+    s16 DPad_ItemsOffset[4][2] = {
+        { 7, 3 },   // Up
+        { 7, 35 },  // Down
+        { -9, 19 }, // Left
+        { 23, 19 }, // Right
+    };              //(X,Y) Used with custom position to place it properly.
+    // DPadItems
+    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) != ORIGINAL_LOCATION) {
+        ItemIconPos[4][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[0][1]; // Up
+        ItemIconPos[5][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[1][1]; // Down
+        ItemIconPos[6][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[2][1]; // Left
+        ItemIconPos[7][1] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[3][1]; // Right
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_LEFT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Left_HUD_Margin;
+            };
+            ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_RIGHT) {
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Right_HUD_Margin;
+            };
+            ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                             X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_NONE) {
+            ItemIconPos[4][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[0][0];
+            ItemIconPos[5][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[1][0];
+            ItemIconPos[6][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[2][0];
+            ItemIconPos[7][0] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[3][0];
+        } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == HIDDEN) {
+            ItemIconPos[4][0] = -9999;
+            ItemIconPos[5][0] = -9999;
+            ItemIconPos[6][0] = -9999;
+            ItemIconPos[7][0] = -9999;
+        }
+    } else {
+        ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[4][0]);
+        ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[5][0]);
+        ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[6][0]);
+        ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[7][0]);
+        ItemIconPos[4][1] = ItemIconPos_ori[4][1];
+        ItemIconPos[5][1] = ItemIconPos_ori[5][1];
+        ItemIconPos[6][1] = ItemIconPos_ori[6][1];
+        ItemIconPos[7][1] = ItemIconPos_ori[7][1];
+    }
+    // B Button
     s16 PosX_adjust = 1;
     s16 PosY_adjust = 17;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) != ORIGINAL_LOCATION) {
         ItemIconPos[0][1] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosY"), 0) + Y_Margins_BtnB + PosY_adjust;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;};
-            ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0)+X_Margins_BtnB + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Left_HUD_Margin;
+            };
+            ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) +
+                                                            X_Margins_BtnB + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;};
-            ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0)+X_Margins_BtnB + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                X_Margins_BtnB = Right_HUD_Margin;
+            };
+            ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) +
+                                                             X_Margins_BtnB + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_NONE) {
             ItemIconPos[0][0] = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + PosX_adjust;
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == HIDDEN) {
@@ -4651,15 +4808,21 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         ItemIconPos[0][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[0][0]);
         ItemIconPos[0][1] = ItemIconPos_ori[0][1];
     }
-    //C button Left
+    // C button Left
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
         ItemIconPos[1][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL + PosY_adjust;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Left_HUD_Margin;};
-            ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0)+X_Margins_CL + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Left_HUD_Margin;
+            };
+            ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) +
+                                                            X_Margins_CL + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Right_HUD_Margin;};
-            ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0)+X_Margins_CL + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Right_HUD_Margin;
+            };
+            ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) +
+                                                             X_Margins_CL + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
             ItemIconPos[1][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + PosX_adjust;
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == HIDDEN) {
@@ -4669,15 +4832,21 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         ItemIconPos[1][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[1][0]);
         ItemIconPos[1][1] = ItemIconPos_ori[1][1];
     }
-    //C Button down
+    // C Button down
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
         ItemIconPos[2][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD + PosY_adjust;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Left_HUD_Margin;};
-            ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0)+X_Margins_CD + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Left_HUD_Margin;
+            };
+            ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) +
+                                                            X_Margins_CD + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Right_HUD_Margin;};
-            ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0)+X_Margins_CD + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Right_HUD_Margin;
+            };
+            ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) +
+                                                             X_Margins_CD + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
             ItemIconPos[2][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + PosX_adjust;
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == HIDDEN) {
@@ -4687,15 +4856,21 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         ItemIconPos[2][0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[2][0]);
         ItemIconPos[2][1] = ItemIconPos_ori[2][1];
     }
-    //C button Right
+    // C button Right
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
         ItemIconPos[3][1] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR + PosY_adjust;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Left_HUD_Margin;};
-            ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) +X_Margins_CR + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Left_HUD_Margin;
+            };
+            ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) +
+                                                            X_Margins_CR + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Right_HUD_Margin;};
-            ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) +X_Margins_CR + PosX_adjust);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Right_HUD_Margin;
+            };
+            ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) +
+                                                             X_Margins_CR + PosX_adjust);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
             ItemIconPos[3][0] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + PosX_adjust;
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == HIDDEN) {
@@ -4710,25 +4885,11 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
 
     i = gSaveContext.equips.buttonItems[button];
 
-    if (
-        GameInteractor_Should(
-            VB_DRAW_AMMO_COUNT,
-            (
-                (i == ITEM_STICK) ||
-                (i == ITEM_NUT) ||
-                (i == ITEM_BOMB) ||
-                (i == ITEM_BOW) ||
-                (
-                    (i >= ITEM_BOW_ARROW_FIRE) &&
-                    (i <= ITEM_BOW_ARROW_LIGHT)
-                ) ||
-                (i == ITEM_SLINGSHOT) ||
-                (i == ITEM_BOMBCHU) ||
-                (i == ITEM_BEAN)
-            ),
-            &i
-        )
-    ) {
+    if (GameInteractor_Should(VB_DRAW_AMMO_COUNT,
+                              ((i == ITEM_STICK) || (i == ITEM_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
+                               ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) || (i == ITEM_SLINGSHOT) ||
+                               (i == ITEM_BOMBCHU) || (i == ITEM_BEAN)),
+                              &i)) {
         if ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) {
             i = ITEM_BOW;
         }
@@ -4764,13 +4925,12 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         }
 
         if (i != 0) {
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[i], 8, 8, 
-                                      ItemIconPos[button][0], ItemIconPos[button][1], 8, 8, 1 << 10, 1 << 10);
+            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[i], 8, 8, ItemIconPos[button][0],
+                                          ItemIconPos[button][1], 8, 8, 1 << 10, 1 << 10);
         }
 
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[ammo], 8, 8, 
-                                      ItemIconPos[button][0] + 6, ItemIconPos[button][1], 8, 8, 1 << 10, 1 << 10);
-
+        OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[ammo], 8, 8, ItemIconPos[button][0] + 6,
+                                      ItemIconPos[button][1], 8, 8, 1 << 10, 1 << 10);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -4785,8 +4945,7 @@ void Interface_DrawActionButton(PlayState* play, f32 x, f32 y) {
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
     Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY);
 
-    gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[0], 4, 0);
 
     gDPLoadTextureBlock(OVERLAY_DISP++, gButtonBackgroundTex, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -4911,13 +5070,11 @@ void func_8008A994(InterfaceContext* interfaceCtx) {
     func_800AB2C4(&interfaceCtx->view);
 }
 
-const char* digitTextures[] =
-{
-    gCounterDigit0Tex, gCounterDigit1Tex, gCounterDigit2Tex, gCounterDigit3Tex,
-    gCounterDigit4Tex, gCounterDigit5Tex, gCounterDigit6Tex, gCounterDigit7Tex, gCounterDigit8Tex,
-    gCounterDigit9Tex, gCounterColonTex, gCounterDigit1Tex, gCounterDigit2Tex, gCounterDigit3Tex,
-    gCounterDigit4Tex, gCounterDigit5Tex, gCounterDigit6Tex, gCounterDigit7Tex, gCounterDigit8Tex
-};
+const char* digitTextures[] = { gCounterDigit0Tex, gCounterDigit1Tex, gCounterDigit2Tex, gCounterDigit3Tex,
+                                gCounterDigit4Tex, gCounterDigit5Tex, gCounterDigit6Tex, gCounterDigit7Tex,
+                                gCounterDigit8Tex, gCounterDigit9Tex, gCounterColonTex,  gCounterDigit1Tex,
+                                gCounterDigit2Tex, gCounterDigit3Tex, gCounterDigit4Tex, gCounterDigit5Tex,
+                                gCounterDigit6Tex, gCounterDigit7Tex, gCounterDigit8Tex };
 
 void Interface_Draw(PlayState* play) {
     static s16 magicArrowEffectsR[] = { 255, 100, 255 };
@@ -4977,6 +5134,13 @@ void Interface_Draw(PlayState* play) {
     s16 svar5;
     s16 svar6;
     bool fullUi = !CVarGetInteger(CVAR_ENHANCEMENT("MinimalUI"), 0) || !R_MINIMAP_DISABLED || play->pauseCtx.state != 0;
+    // #region SOH [NTSC]
+    s32 languageOffset = gSaveContext.language;
+
+    if (languageOffset == LANGUAGE_JPN) {
+        languageOffset = LANGUAGE_ENG;
+    }
+    // #endregion
 
     if (GameInteractor_NoUIActive()) {
         return;
@@ -5007,28 +5171,32 @@ void Interface_Draw(PlayState* play) {
                     switch (CUR_UPG_VALUE(UPG_WALLET)) {
                         case 0:
                             if (CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0)) {
-                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
+                                rColor =
+                                    CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), rupeeWalletColors[0]);
                             } else {
                                 rColor = rupeeWalletColors[0];
                             }
                             break;
                         case 1:
                             if (CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0)) {
-                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), rupeeWalletColors[1]);
+                                rColor =
+                                    CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), rupeeWalletColors[1]);
                             } else {
                                 rColor = rupeeWalletColors[1];
                             }
                             break;
                         case 2:
                             if (CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0)) {
-                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), rupeeWalletColors[2]);
+                                rColor =
+                                    CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), rupeeWalletColors[2]);
                             } else {
                                 rColor = rupeeWalletColors[2];
                             }
                             break;
                         case 3:
                             if (CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0)) {
-                                rColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), rupeeWalletColors[3]);
+                                rColor =
+                                    CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), rupeeWalletColors[3]);
                             } else {
                                 rColor = rupeeWalletColors[3];
                             }
@@ -5042,26 +5210,34 @@ void Interface_Draw(PlayState* play) {
                     }
                 }
 
-                //Rupee icon & counter
+                // Rupee icon & counter
                 s16 X_Margins_RC;
                 s16 Y_Margins_RC;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_RC = Left_HUD_Margin;};
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == ORIGINAL_LOCATION) {
+                        X_Margins_RC = Left_HUD_Margin;
+                    };
                     Y_Margins_RC = Bottom_HUD_Margin;
                 } else {
                     X_Margins_RC = 0;
                     Y_Margins_RC = 0;
                 }
                 s16 PosX_RC_ori = OTRGetRectDimensionFromLeftEdge(26 + X_Margins_RC);
-                s16 PosY_RC_ori = 206+Y_Margins_RC;
+                s16 PosY_RC_ori = 206 + Y_Margins_RC;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) != ORIGINAL_LOCATION) {
                     PosY_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosY"), 0) + Y_Margins_RC;
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == ANCHOR_LEFT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Left_HUD_Margin;};
-                        PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {
+                            X_Margins_RC = Left_HUD_Margin;
+                        };
+                        PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0) +
+                                                              X_Margins_RC);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == ANCHOR_RIGHT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {X_Margins_RC = Right_HUD_Margin;};
-                        PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0)+X_Margins_RC);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.UseMargins"), 0) != 0) {
+                            X_Margins_RC = Right_HUD_Margin;
+                        };
+                        PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0) +
+                                                               X_Margins_RC);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == ANCHOR_NONE) {
                         PosX_RC = CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosX"), 0);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Rupees.PosType"), 0) == HIDDEN) {
@@ -5072,7 +5248,8 @@ void Interface_Draw(PlayState* play) {
                     PosX_RC = PosX_RC_ori;
                 }
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, rColor.r, rColor.g, rColor.b, interfaceCtx->magicAlpha);
-                OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16, 1 << 10, 1 << 10);
+                OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gRupeeCounterIconTex, 16, 16, PosX_RC, PosY_RC, 16, 16,
+                                              1 << 10, 1 << 10);
             }
 
             if (GameInteractor_Should(VB_RENDER_KEY_COUNTER, true)) {
@@ -5095,23 +5272,30 @@ void Interface_Draw(PlayState* play) {
                             s16 X_Margins_SKC;
                             s16 Y_Margins_SKC;
                             if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {
-                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_SKC = Left_HUD_Margin;};
+                                if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == ORIGINAL_LOCATION) {
+                                    X_Margins_SKC = Left_HUD_Margin;
+                                };
                                 Y_Margins_SKC = Bottom_HUD_Margin;
                             } else {
                                 X_Margins_SKC = 0;
                                 Y_Margins_SKC = 0;
                             }
-                            s16 PosX_SKC_ori = OTRGetRectDimensionFromLeftEdge(26+X_Margins_SKC);
-                            s16 PosY_SKC_ori = 190+Y_Margins_SKC;
+                            s16 PosX_SKC_ori = OTRGetRectDimensionFromLeftEdge(26 + X_Margins_SKC);
+                            s16 PosY_SKC_ori = 190 + Y_Margins_SKC;
                             s16 PosX_SKC;
                             s16 PosY_SKC;
                             if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) != ORIGINAL_LOCATION) {
                                 PosY_SKC = CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosY"), 0) + Y_Margins_SKC;
                                 if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == ANCHOR_LEFT) {
-                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Left_HUD_Margin;};
-                                    PosX_SKC = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0) + X_Margins_SKC);
+                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {
+                                        X_Margins_SKC = Left_HUD_Margin;
+                                    };
+                                    PosX_SKC = OTRGetDimensionFromLeftEdge(
+                                        CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0) + X_Margins_SKC);
                                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == ANCHOR_RIGHT) {
-                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {X_Margins_SKC = Right_HUD_Margin;};
+                                    if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.UseMargins"), 0) != 0) {
+                                        X_Margins_SKC = Right_HUD_Margin;
+                                    };
                                     PosX_SKC = OTRGetDimensionFromRightEdge(
                                         CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosX"), 0) + X_Margins_SKC);
                                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.SmallKey.PosType"), 0) == ANCHOR_NONE) {
@@ -5126,16 +5310,18 @@ void Interface_Draw(PlayState* play) {
                             // Small Key Icon
                             gDPPipeSync(OVERLAY_DISP++);
 
-                            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, keyCountColor.r,keyCountColor.g,keyCountColor.b, interfaceCtx->magicAlpha);
-                            gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 20, 255); //We reset this here so it match user color :)
-                            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gSmallKeyCounterIconTex, 16, 16, PosX_SKC, PosY_SKC, 16, 16,
-                                                          1 << 10, 1 << 10);
+                            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, keyCountColor.r, keyCountColor.g, keyCountColor.b,
+                                            interfaceCtx->magicAlpha);
+                            gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 20,
+                                           255); // We reset this here so it match user color :)
+                            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gSmallKeyCounterIconTex, 16, 16, PosX_SKC,
+                                                          PosY_SKC, 16, 16, 1 << 10, 1 << 10);
 
                             // Small Key Counter
                             gDPPipeSync(OVERLAY_DISP++);
                             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
-                            gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE,
-                                TEXEL0, 0, PRIMITIVE, 0);
+                            gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0,
+                                              PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0);
 
                             interfaceCtx->counterDigits[2] = 0;
                             interfaceCtx->counterDigits[3] = gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex];
@@ -5146,10 +5332,14 @@ void Interface_Draw(PlayState* play) {
                             }
 
                             if (interfaceCtx->counterDigits[2] != 0) {
-                                OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)((u8*)digitTextures[interfaceCtx->counterDigits[2]])), 8, 16, PosX_SKC+8, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
+                                OVERLAY_DISP = Gfx_TextureI8(
+                                    OVERLAY_DISP, ((u8*)((u8*)digitTextures[interfaceCtx->counterDigits[2]])), 8, 16,
+                                    PosX_SKC + 8, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
                             }
 
-                            OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[3]]), 8, 16, PosX_SKC+16, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
+                            OVERLAY_DISP =
+                                Gfx_TextureI8(OVERLAY_DISP, ((u8*)digitTextures[interfaceCtx->counterDigits[3]]), 8, 16,
+                                              PosX_SKC + 16, PosY_SKC, 8, 16, 1 << 10, 1 << 10);
                         }
                         break;
                     default:
@@ -5169,8 +5359,8 @@ void Interface_Draw(PlayState* play) {
                     gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha);
                 }
 
-                gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
-                                  PRIMITIVE, 0);
+                gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE,
+                                  TEXEL0, 0, PRIMITIVE, 0);
 
                 interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0;
                 interfaceCtx->counterDigits[2] = gSaveContext.rupees;
@@ -5215,11 +5405,13 @@ void Interface_Draw(PlayState* play) {
 
         if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) {
             if (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) {
-                gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionFlippedPtr, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
+                gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionFlippedPtr,
+                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
             }
             func_8002C124(&play->actorCtx.targetCtx, play); // Draw Z-Target
             if (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) {
-                gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionPtr, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
+                gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionPtr,
+                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
             }
 
             // Render enemy health bar after Z-target to leverage set variables
@@ -5240,8 +5432,7 @@ void Interface_Draw(PlayState* play) {
 
         if (!(interfaceCtx->unk_1FA)) {
             // B Button Icon & Ammo Count
-            if (gSaveContext.equips.buttonItems[0] != ITEM_NONE)
-            {
+            if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
                 if (fullUi) {
                     Interface_DrawItemIconTexture(play, gItemIcons[gSaveContext.equips.buttonItems[0]], 0);
                 }
@@ -5263,10 +5454,10 @@ void Interface_Draw(PlayState* play) {
             // B Button Do Action Label
             s16 PosX_adjust;
             s16 PosY_adjust;
-            if (gSaveContext.language == 2) {
+            if (gSaveContext.language == LANGUAGE_FRA) {
                 PosX_adjust = -12;
                 PosY_adjust = 5;
-            } else if (gSaveContext.language == 1) { //ger
+            } else if (gSaveContext.language == LANGUAGE_GER) {
                 PosY_adjust = 6;
                 PosX_adjust = -9;
             } else {
@@ -5279,7 +5470,9 @@ void Interface_Draw(PlayState* play) {
             s16 X_Margins_BtnB_label;
             s16 Y_Margins_BtnB_label;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_BtnB_label = Right_HUD_Margin;};
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {
+                    X_Margins_BtnB_label = Right_HUD_Margin;
+                };
                 Y_Margins_BtnB_label = (Top_HUD_Margin * -1);
             } else {
                 X_Margins_BtnB_label = 0;
@@ -5288,34 +5481,39 @@ void Interface_Draw(PlayState* play) {
             if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) != ORIGINAL_LOCATION) {
                 BbtnPosY = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosY"), 0) + Y_Margins_BtnB_label + PosY_adjust;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_LEFT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB_label = Left_HUD_Margin;};
-                    BbtnPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0)+X_Margins_BtnB_label + PosX_adjust);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                        X_Margins_BtnB_label = Left_HUD_Margin;
+                    };
+                    BbtnPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) +
+                                                           X_Margins_BtnB_label + PosX_adjust);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_RIGHT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {X_Margins_BtnB_label = Right_HUD_Margin;};
-                    BbtnPosX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) +X_Margins_BtnB_label + PosX_adjust);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
+                        X_Margins_BtnB_label = Right_HUD_Margin;
+                    };
+                    BbtnPosX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) +
+                                                            X_Margins_BtnB_label + PosX_adjust);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ANCHOR_NONE) {
                     BbtnPosX = CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosX"), 0) + PosX_adjust;
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == HIDDEN) {
                     BbtnPosX = -9999;
                 }
             } else {
-                BbtnPosX = OTRGetRectDimensionFromRightEdge(R_B_LABEL_X(gSaveContext.language)+X_Margins_BtnB_label);
-                BbtnPosY = R_B_LABEL_Y(gSaveContext.language)+Y_Margins_BtnB_label;
+                BbtnPosX = OTRGetRectDimensionFromRightEdge(R_B_LABEL_X(languageOffset) + X_Margins_BtnB_label);
+                BbtnPosY = R_B_LABEL_Y(languageOffset) + Y_Margins_BtnB_label;
             }
             gDPPipeSync(OVERLAY_DISP++);
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha);
 
-            gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment[1], G_IM_FMT_IA,
-                                   DO_ACTION_TEX_WIDTH(), DO_ACTION_TEX_HEIGHT(), 0, G_TX_NOMIRROR | G_TX_WRAP,
-                                   G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+            gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment[1], G_IM_FMT_IA, DO_ACTION_TEX_WIDTH(),
+                                   DO_ACTION_TEX_HEIGHT(), 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
+                                   G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
-            R_B_LABEL_DD = (1 << 10) / (WREG(37 + gSaveContext.language) / 100.0f);
+            R_B_LABEL_DD = (1 << 10) / (WREG(37 + languageOffset) / 100.0f);
             gSPWideTextureRectangle(OVERLAY_DISP++, BbtnPosX << 2, BbtnPosY << 2,
-                                (BbtnPosX + DO_ACTION_TEX_WIDTH()) << 2,
-                                (BbtnPosY + DO_ACTION_TEX_HEIGHT()) << 2, G_TX_RENDERTILE, 0, 0,
-                                R_B_LABEL_DD, R_B_LABEL_DD);
+                                    (BbtnPosX + DO_ACTION_TEX_WIDTH()) << 2, (BbtnPosY + DO_ACTION_TEX_HEIGHT()) << 2,
+                                    G_TX_RENDERTILE, 0, 0, R_B_LABEL_DD, R_B_LABEL_DD);
         }
 
         gDPPipeSync(OVERLAY_DISP++);
@@ -5369,8 +5567,10 @@ void Interface_Draw(PlayState* play) {
             s16 X_Margins_Dpad;
             s16 Y_Margins_Dpad;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Dpad = Right_HUD_Margin;};
-                Y_Margins_Dpad = (Top_HUD_Margin*-1);
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {
+                    X_Margins_Dpad = Right_HUD_Margin;
+                };
+                Y_Margins_Dpad = (Top_HUD_Margin * -1);
             } else {
                 Y_Margins_Dpad = 0;
                 X_Margins_Dpad = 0;
@@ -5378,31 +5578,36 @@ void Interface_Draw(PlayState* play) {
             if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) != ORIGINAL_LOCATION) {
                 DpadPosY = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_Dpad;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_LEFT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_Dpad = Left_HUD_Margin;};
-                    DpadPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_Dpad);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                        X_Margins_Dpad = Left_HUD_Margin;
+                    };
+                    DpadPosX =
+                        OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + X_Margins_Dpad);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_RIGHT) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_Dpad = Right_HUD_Margin;};
-                    DpadPosX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_Dpad);
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                        X_Margins_Dpad = Right_HUD_Margin;
+                    };
+                    DpadPosX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                            X_Margins_Dpad);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_NONE) {
                     DpadPosX = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0);
                 } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == HIDDEN) {
                     DpadPosX = -9999;
                 }
             } else {
-                DpadPosX = OTRGetRectDimensionFromRightEdge(DPAD_X+X_Margins_Dpad);
-                DpadPosY = DPAD_Y+Y_Margins_Dpad;
+                DpadPosX = OTRGetRectDimensionFromRightEdge(DPAD_X + X_Margins_Dpad);
+                DpadPosY = DPAD_Y + Y_Margins_Dpad;
             }
 
             gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
 
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, dPadColor.r, dPadColor.g, dPadColor.b, dpadAlpha);
             if (fullUi) {
-                gDPLoadTextureBlock(OVERLAY_DISP++, gDPadTex,
-                                    G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                gSPWideTextureRectangle(OVERLAY_DISP++, DpadPosX << 2, DpadPosY << 2,
-                                        (DpadPosX + 32) << 2, (DpadPosY + 32) << 2,
-                                        G_TX_RENDERTILE, 0, 0, (1 << 10), (1 << 10));
+                gDPLoadTextureBlock(OVERLAY_DISP++, gDPadTex, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0,
+                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                    G_TX_NOLOD, G_TX_NOLOD);
+                gSPWideTextureRectangle(OVERLAY_DISP++, DpadPosX << 2, DpadPosY << 2, (DpadPosX + 32) << 2,
+                                        (DpadPosY + 32) << 2, G_TX_RENDERTILE, 0, 0, (1 << 10), (1 << 10));
             }
 
             // DPad-Up Button Icon & Ammo Count
@@ -5456,30 +5661,38 @@ void Interface_Draw(PlayState* play) {
         s16 Y_Margins_BtnA;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.UseMargins"), 0) != 0) {
             X_Margins_BtnA = Right_HUD_Margin;
-            Y_Margins_BtnA = (Top_HUD_Margin*-1);
+            Y_Margins_BtnA = (Top_HUD_Margin * -1);
         } else {
             X_Margins_BtnA = 0;
             Y_Margins_BtnA = 0;
         }
-        s16 PosX_BtnA_ori = OTRGetDimensionFromRightEdge(R_A_BTN_X+X_Margins_BtnA);
-        s16 PosY_BtnA_ori = R_A_BTN_Y+Y_Margins_BtnA;
-        const f32 rAIconX_ori = OTRGetDimensionFromRightEdge(R_A_ICON_X+X_Margins_BtnA);
-        const f32 rAIconY_ori = 98.0f - (R_A_ICON_Y+Y_Margins_BtnA);
+        s16 PosX_BtnA_ori = OTRGetDimensionFromRightEdge(R_A_BTN_X + X_Margins_BtnA);
+        s16 PosY_BtnA_ori = R_A_BTN_Y + Y_Margins_BtnA;
+        const f32 rAIconX_ori = OTRGetDimensionFromRightEdge(R_A_ICON_X + X_Margins_BtnA);
+        const f32 rAIconY_ori = 98.0f - (R_A_ICON_Y + Y_Margins_BtnA);
         s16 PosX_BtnA;
         s16 PosY_BtnA;
         s16 rAIconX;
         s16 rAIconY;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosType"), 0) != ORIGINAL_LOCATION) {
-            PosY_BtnA = CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosY"), 0)+Y_Margins_BtnA;
+            PosY_BtnA = CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosY"), 0) + Y_Margins_BtnA;
             rAIconY = 98.0f - PosY_BtnA;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosType"), 0) == ANCHOR_LEFT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.UseMargins"), 0) != 0) {X_Margins_BtnA = Left_HUD_Margin;};
-                PosX_BtnA = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
-                rAIconX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.UseMargins"), 0) != 0) {
+                    X_Margins_BtnA = Left_HUD_Margin;
+                };
+                PosX_BtnA =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
+                rAIconX =
+                    OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosType"), 0) == ANCHOR_RIGHT) {
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.UseMargins"), 0) != 0) {X_Margins_BtnA = Right_HUD_Margin;};
-                PosX_BtnA = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
-                rAIconX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.UseMargins"), 0) != 0) {
+                    X_Margins_BtnA = Right_HUD_Margin;
+                };
+                PosX_BtnA =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
+                rAIconX =
+                    OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0) + X_Margins_BtnA);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosType"), 0) == ANCHOR_NONE) {
                 PosX_BtnA = CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0);
                 rAIconX = CVarGetInteger(CVAR_COSMETIC("HUD.AButton.PosX"), 0);
@@ -5505,11 +5718,10 @@ void Interface_Draw(PlayState* play) {
                           PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha);
         gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
-        Matrix_Translate(-138.0f + rAIconX, rAIconY, WREG(46 + gSaveContext.language) / 10.0f, MTXMODE_NEW);
+        Matrix_Translate(-138.0f + rAIconX, rAIconY, WREG(46 + languageOffset) / 10.0f, MTXMODE_NEW);
         Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
         Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY);
-        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[4], 4, 0);
 
         if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) {
@@ -5590,11 +5802,17 @@ void Interface_Draw(PlayState* play) {
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosType"), 0) != ORIGINAL_LOCATION) {
                         CarrotsPosY = CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosY"), 0);
                         if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosType"), 0) == ANCHOR_LEFT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.UseMargins"), 0) != 0) {CarrotsMargins_X = Left_HUD_Margin;};
-                            CarrotsPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosX"), 0) + CarrotsMargins_X);
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.UseMargins"), 0) != 0) {
+                                CarrotsMargins_X = Left_HUD_Margin;
+                            };
+                            CarrotsPosX = OTRGetDimensionFromLeftEdge(
+                                CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosX"), 0) + CarrotsMargins_X);
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosType"), 0) == ANCHOR_RIGHT) {
-                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.UseMargins"), 0) != 0) {CarrotsMargins_X = Right_HUD_Margin;};
-                            CarrotsPosX = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosX"), 0) + CarrotsMargins_X);
+                            if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.UseMargins"), 0) != 0) {
+                                CarrotsMargins_X = Right_HUD_Margin;
+                            };
+                            CarrotsPosX = OTRGetDimensionFromRightEdge(
+                                CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosX"), 0) + CarrotsMargins_X);
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosType"), 0) == ANCHOR_NONE) {
                             CarrotsPosX = CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosX"), 0);
                         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Carrots.PosType"), 0) == HIDDEN) {
@@ -5617,23 +5835,32 @@ void Interface_Draw(PlayState* play) {
                 // Score for the Horseback Archery
                 s32 X_Margins_Archery;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.UseMargins"), 0) != 0) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Archery = Right_HUD_Margin;};
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == ORIGINAL_LOCATION) {
+                        X_Margins_Archery = Right_HUD_Margin;
+                    };
                 } else {
                     X_Margins_Archery = 0;
                 }
                 s16 ArcheryPos_Y = ZREG(15);
-                s16 ArcheryPos_X = OTRGetRectDimensionFromRightEdge(WREG(32)+X_Margins_Archery);
+                s16 ArcheryPos_X = OTRGetRectDimensionFromRightEdge(WREG(32) + X_Margins_Archery);
 
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) != ORIGINAL_LOCATION) {
                     ArcheryPos_Y = CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosY"), 0);
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == ANCHOR_LEFT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.UseMargins"), 0) != 0) {X_Margins_Archery = Left_HUD_Margin;};
-                        ArcheryPos_X = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + X_Margins_Archery);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.UseMargins"), 0) != 0) {
+                            X_Margins_Archery = Left_HUD_Margin;
+                        };
+                        ArcheryPos_X = OTRGetRectDimensionFromLeftEdge(
+                            CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + X_Margins_Archery);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == ANCHOR_RIGHT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.UseMargins"), 0) != 0) {X_Margins_Archery = Right_HUD_Margin;};
-                        ArcheryPos_X = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + X_Margins_Archery);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.UseMargins"), 0) != 0) {
+                            X_Margins_Archery = Right_HUD_Margin;
+                        };
+                        ArcheryPos_X = OTRGetRectDimensionFromRightEdge(
+                            CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + X_Margins_Archery);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == ANCHOR_NONE) {
-                        ArcheryPos_X = CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + 204 + X_Margins_Archery;
+                        ArcheryPos_X =
+                            CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosX"), 0) + 204 + X_Margins_Archery;
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.ArcheryScore.PosType"), 0) == HIDDEN) {
                         ArcheryPos_X = -9999;
                     }
@@ -5646,8 +5873,9 @@ void Interface_Draw(PlayState* play) {
                                     G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                     G_TX_NOLOD, G_TX_NOLOD);
 
-                gSPWideTextureRectangle(OVERLAY_DISP++, (ArcheryPos_X + 28) << 2, ArcheryPos_Y << 2, (ArcheryPos_X + 52) << 2,
-                                    (ArcheryPos_Y + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+                gSPWideTextureRectangle(OVERLAY_DISP++, (ArcheryPos_X + 28) << 2, ArcheryPos_Y << 2,
+                                        (ArcheryPos_X + 52) << 2, (ArcheryPos_Y + 16) << 2, G_TX_RENDERTILE, 0, 0,
+                                        1 << 10, 1 << 10);
 
                 // Score Counter
                 gDPPipeSync(OVERLAY_DISP++);
@@ -5658,8 +5886,8 @@ void Interface_Draw(PlayState* play) {
 
                 for (svar1 = svar2 = 0; svar1 < 4; svar1++) {
                     if (sHBAScoreDigits[svar1] != 0 || (svar2 != 0) || (svar1 >= 3)) {
-                        OVERLAY_DISP = Gfx_TextureI8(
-                            OVERLAY_DISP, digitTextures[sHBAScoreDigits[svar1]], 8, 16, ArcheryPos_X,
+                        OVERLAY_DISP =
+                            Gfx_TextureI8(OVERLAY_DISP, digitTextures[sHBAScoreDigits[svar1]], 8, 16, ArcheryPos_X,
                                           (ArcheryPos_Y - 2), digitWidth[0], VREG(42), VREG(43) << 1, VREG(43) << 1);
                         ArcheryPos_X += 9;
                         svar2++;
@@ -5671,13 +5899,13 @@ void Interface_Draw(PlayState* play) {
             }
         }
 
-        if ((gSaveContext.timer2State == 5) && (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT)) {
+        if ((gSaveContext.subTimerState == 5) && (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT)) {
             // Trade quest timer reached 0
             D_8015FFE6 = 40;
             gSaveContext.cutsceneIndex = 0;
             play->transitionTrigger = TRANS_TRIGGER_START;
             play->transitionType = TRANS_TYPE_FADE_WHITE;
-            gSaveContext.timer2State = 0;
+            gSaveContext.subTimerState = 0;
 
             if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
                 (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
@@ -5713,33 +5941,33 @@ void Interface_Draw(PlayState* play) {
 
         if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
             (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (msgCtx->msgMode == MSGMODE_NONE) &&
-            !(player->stateFlags2 & PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
-            (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play) && (gSaveContext.minigameState != 1) &&
-            (play->shootingGalleryStatus <= 1) &&
+            !(player->stateFlags2 & PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR) &&
+            (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) &&
+            !Play_InCsMode(play) && (gSaveContext.minigameState != 1) && (play->shootingGalleryStatus <= 1) &&
             !((play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) && Flags_GetSwitch(play, 0x38))) {
             svar6 = 0;
-            switch (gSaveContext.timer1State) {
+            switch (gSaveContext.timerState) {
                 case 1:
                     D_8015FFE2 = 20;
                     D_8015FFE0 = 20;
-                    gSaveContext.timer1Value = gSaveContext.health >> 1;
-                    gSaveContext.timer1State = 2;
+                    gSaveContext.timerSeconds = gSaveContext.health >> 1;
+                    gSaveContext.timerState = 2;
                     break;
                 case 2:
                     D_8015FFE2--;
                     if (D_8015FFE2 == 0) {
                         D_8015FFE2 = 20;
-                        gSaveContext.timer1State = 3;
+                        gSaveContext.timerState = 3;
                     }
                     break;
                 case 5:
                 case 11:
                     D_8015FFE2 = 20;
                     D_8015FFE0 = 20;
-                    if (gSaveContext.timer1State == 5) {
-                        gSaveContext.timer1State = 6;
+                    if (gSaveContext.timerState == 5) {
+                        gSaveContext.timerState = 6;
                     } else {
-                        gSaveContext.timer1State = 12;
+                        gSaveContext.timerState = 12;
                     }
                     break;
                 case 6:
@@ -5747,10 +5975,10 @@ void Interface_Draw(PlayState* play) {
                     D_8015FFE2--;
                     if (D_8015FFE2 == 0) {
                         D_8015FFE2 = 20;
-                        if (gSaveContext.timer1State == 6) {
-                            gSaveContext.timer1State = 7;
+                        if (gSaveContext.timerState == 6) {
+                            gSaveContext.timerState = 7;
                         } else {
-                            gSaveContext.timer1State = 13;
+                            gSaveContext.timerState = 13;
                         }
                     }
                     break;
@@ -5777,15 +6005,15 @@ void Interface_Draw(PlayState* play) {
                             gSaveContext.timerY[0] = 46;
                         }
 
-                        if (gSaveContext.timer1State == 3) {
-                            gSaveContext.timer1State = 4;
+                        if (gSaveContext.timerState == 3) {
+                            gSaveContext.timerState = 4;
                         } else {
-                            gSaveContext.timer1State = 8;
+                            gSaveContext.timerState = 8;
                         }
                     }
                 case 4:
                 case 8:
-                    if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) {
+                    if ((gSaveContext.timerState == 4) || (gSaveContext.timerState == 8)) {
                         if (gSaveContext.healthCapacity > 0xA0) {
                             gSaveContext.timerY[0] = 54;
                         } else {
@@ -5793,35 +6021,38 @@ void Interface_Draw(PlayState* play) {
                         }
                     }
 
-                    if ((gSaveContext.timer1State >= 3) && (msgCtx->msgLength == 0)) {
+                    if ((gSaveContext.timerState >= 3) && (msgCtx->msgLength == 0)) {
                         D_8015FFE0--;
                         if (D_8015FFE0 == 0) {
-                            if (gSaveContext.timer1Value != 0) {
-                                gSaveContext.timer1Value--;
+                            if (gSaveContext.timerSeconds != 0) {
+                                gSaveContext.timerSeconds--;
                             }
 
                             D_8015FFE0 = 20;
 
-                            if (gSaveContext.timer1Value == 0) {
-                                gSaveContext.timer1State = 10;
+                            if (gSaveContext.timerSeconds == 0) {
+                                gSaveContext.timerState = 10;
                                 if (D_80125A5C != 0) {
                                     gSaveContext.health = 0;
                                     play->damagePlayer(play, -(gSaveContext.health + 2));
                                 }
                                 D_80125A5C = 0;
-                            } else if (gSaveContext.timer1Value > 60) {
+                            } else if (gSaveContext.timerSeconds > 60) {
                                 if (timerDigits[4] == 1) {
-                                    Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                    Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
                                 }
-                            } else if (gSaveContext.timer1Value >= 11) {
+                            } else if (gSaveContext.timerSeconds >= 11) {
                                 if (timerDigits[4] & 1) {
-                                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
                                 }
                             } else {
-                                Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
                             }
                         }
                     }
@@ -5847,10 +6078,10 @@ void Interface_Draw(PlayState* play) {
                             gSaveContext.timerY[0] = 46;
                         }
 
-                        gSaveContext.timer1State = 14;
+                        gSaveContext.timerState = 14;
                     }
                 case 14:
-                    if (gSaveContext.timer1State == 14) {
+                    if (gSaveContext.timerState == 14) {
                         if (gSaveContext.healthCapacity > 0xA0) {
                             gSaveContext.timerY[0] = 54;
                         } else {
@@ -5858,54 +6089,55 @@ void Interface_Draw(PlayState* play) {
                         }
                     }
 
-                    if (gSaveContext.timer1State >= 3) {
+                    if (gSaveContext.timerState >= 3) {
                         D_8015FFE0--;
                         if (D_8015FFE0 == 0) {
-                            gSaveContext.timer1Value++;
+                            gSaveContext.timerSeconds++;
                             D_8015FFE0 = 20;
 
-                            if (gSaveContext.timer1Value == 3599) {
+                            if (gSaveContext.timerSeconds == 3599) {
                                 D_8015FFE2 = 40;
-                                gSaveContext.timer1State = 15;
+                                gSaveContext.timerState = 15;
                             } else {
-                                Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
                             }
                         }
                     }
                     break;
                 case 10:
-                    if (gSaveContext.timer2State != 0) {
+                    if (gSaveContext.subTimerState != 0) {
                         D_8015FFE6 = 20;
                         D_8015FFE4 = 20;
                         gSaveContext.timerX[1] = 140;
                         gSaveContext.timerY[1] = 80;
 
-                        if (gSaveContext.timer2State < 7) {
-                            gSaveContext.timer2State = 2;
+                        if (gSaveContext.subTimerState < 7) {
+                            gSaveContext.subTimerState = 2;
                         } else {
-                            gSaveContext.timer2State = 8;
+                            gSaveContext.subTimerState = 8;
                         }
 
-                        gSaveContext.timer1State = 0;
+                        gSaveContext.timerState = 0;
                     } else {
-                        gSaveContext.timer1State = 0;
+                        gSaveContext.timerState = 0;
                     }
                 case 15:
                     break;
                 default:
                     svar6 = 1;
-                    switch (gSaveContext.timer2State) {
+                    switch (gSaveContext.subTimerState) {
                         case 1:
                         case 7:
                             D_8015FFE6 = 20;
                             D_8015FFE4 = 20;
                             gSaveContext.timerX[1] = 140;
                             gSaveContext.timerY[1] = 80;
-                            if (gSaveContext.timer2State == 1) {
-                                gSaveContext.timer2State = 2;
+                            if (gSaveContext.subTimerState == 1) {
+                                gSaveContext.subTimerState = 2;
                             } else {
-                                gSaveContext.timer2State = 8;
+                                gSaveContext.subTimerState = 8;
                             }
                             break;
                         case 2:
@@ -5913,10 +6145,10 @@ void Interface_Draw(PlayState* play) {
                             D_8015FFE6--;
                             if (D_8015FFE6 == 0) {
                                 D_8015FFE6 = 20;
-                                if (gSaveContext.timer2State == 2) {
-                                    gSaveContext.timer2State = 3;
+                                if (gSaveContext.subTimerState == 2) {
+                                    gSaveContext.subTimerState = 3;
                                 } else {
-                                    gSaveContext.timer2State = 9;
+                                    gSaveContext.subTimerState = 9;
                                 }
                             }
                             break;
@@ -5924,7 +6156,7 @@ void Interface_Draw(PlayState* play) {
                         case 9:
                             osSyncPrintf("event_xp[1]=%d,  event_yp[1]=%d  TOTAL_EVENT_TM=%d\n",
                                          svar5 = gSaveContext.timerX[1], svar2 = gSaveContext.timerY[1],
-                                         gSaveContext.timer2Value);
+                                         gSaveContext.subTimerSeconds);
                             svar1 = (gSaveContext.timerX[1] - 26) / D_8015FFE6;
                             gSaveContext.timerX[1] -= svar1;
                             if (gSaveContext.healthCapacity > 0xA0) {
@@ -5945,15 +6177,15 @@ void Interface_Draw(PlayState* play) {
                                     gSaveContext.timerY[1] = 46;
                                 }
 
-                                if (gSaveContext.timer2State == 3) {
-                                    gSaveContext.timer2State = 4;
+                                if (gSaveContext.subTimerState == 3) {
+                                    gSaveContext.subTimerState = 4;
                                 } else {
-                                    gSaveContext.timer2State = 10;
+                                    gSaveContext.subTimerState = 10;
                                 }
                             }
                         case 4:
                         case 10:
-                            if ((gSaveContext.timer2State == 4) || (gSaveContext.timer2State == 10)) {
+                            if ((gSaveContext.subTimerState == 4) || (gSaveContext.subTimerState == 10)) {
                                 if (gSaveContext.healthCapacity > 0xA0) {
                                     gSaveContext.timerY[1] = 54;
                                 } else {
@@ -5961,57 +6193,61 @@ void Interface_Draw(PlayState* play) {
                                 }
                             }
 
-                            if (gSaveContext.timer2State >= 3) {
+                            if (gSaveContext.subTimerState >= 3) {
                                 D_8015FFE4--;
                                 if (D_8015FFE4 == 0) {
                                     D_8015FFE4 = 20;
-                                    if (gSaveContext.timer2State == 4) {
-                                        gSaveContext.timer2Value--;
-                                        osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.timer2Value);
+                                    if (gSaveContext.subTimerState == 4) {
+                                        gSaveContext.subTimerSeconds--;
+                                        osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.subTimerSeconds);
 
-                                        if (gSaveContext.timer2Value <= 0) {
+                                        if (gSaveContext.subTimerSeconds <= 0) {
                                             if (!Flags_GetSwitch(play, 0x37) ||
                                                 ((play->sceneNum != SCENE_GANON_BOSS) &&
                                                  (play->sceneNum != SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) &&
                                                  (play->sceneNum != SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) &&
                                                  (play->sceneNum != SCENE_INSIDE_GANONS_CASTLE_COLLAPSE))) {
                                                 D_8015FFE6 = 40;
-                                                gSaveContext.timer2State = 5;
+                                                gSaveContext.subTimerState = 5;
                                                 gSaveContext.cutsceneIndex = 0;
                                                 Message_StartTextbox(play, 0x71B0, NULL);
                                                 Player_SetCsActionWithHaltedActors(play, NULL, 8);
                                             } else {
                                                 D_8015FFE6 = 40;
-                                                gSaveContext.timer2State = 6;
+                                                gSaveContext.subTimerState = 6;
                                             }
-                                        } else if (gSaveContext.timer2Value > 60) {
+                                        } else if (gSaveContext.subTimerSeconds > 60) {
                                             if (timerDigits[4] == 1) {
                                                 Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4,
-                                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                                                       &gSfxDefaultFreqAndVolScale,
+                                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                                             }
-                                        } else if (gSaveContext.timer2Value > 10) {
+                                        } else if (gSaveContext.subTimerSeconds > 10) {
                                             if ((timerDigits[4] & 1)) {
                                                 Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
-                                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                                                       &gSfxDefaultFreqAndVolScale,
+                                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                                             }
                                         } else {
                                             Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4,
-                                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                                                   &gSfxDefaultFreqAndVolScale,
+                                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                                         }
                                     } else {
-                                        gSaveContext.timer2Value++;
+                                        gSaveContext.subTimerSeconds++;
                                         if (gSaveContext.eventInf[1] & 1) {
-                                            if (gSaveContext.timer2Value == 240) {
+                                            if (gSaveContext.subTimerSeconds == 240) {
                                                 Message_StartTextbox(play, 0x6083, NULL);
                                                 gSaveContext.eventInf[1] &= ~1;
-                                                gSaveContext.timer2State = 0;
+                                                gSaveContext.subTimerState = 0;
                                             }
                                         }
                                     }
 
-                                    if ((gSaveContext.timer2Value % 60) == 0) {
-                                        Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
-                                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                    if ((gSaveContext.subTimerSeconds % 60) == 0) {
+                                        Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
+                                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                               &gSfxDefaultReverb);
                                     }
                                 }
                             }
@@ -6019,22 +6255,22 @@ void Interface_Draw(PlayState* play) {
                         case 6:
                             D_8015FFE6--;
                             if (D_8015FFE6 == 0) {
-                                gSaveContext.timer2State = 0;
+                                gSaveContext.subTimerState = 0;
                             }
                             break;
                     }
                     break;
             }
 
-            if (((gSaveContext.timer1State != 0) && (gSaveContext.timer1State != 10)) ||
-                (gSaveContext.timer2State != 0)) {
+            if (((gSaveContext.timerState != 0) && (gSaveContext.timerState != 10)) ||
+                (gSaveContext.subTimerState != 0)) {
                 timerDigits[0] = timerDigits[1] = svar2 = timerDigits[3] = 0;
                 timerDigits[2] = 10; // digit 10 is used as ':' (colon)
 
-                if (gSaveContext.timer1State != 0) {
-                    timerDigits[4] = gSaveContext.timer1Value;
+                if (gSaveContext.timerState != 0) {
+                    timerDigits[4] = gSaveContext.timerSeconds;
                 } else {
-                    timerDigits[4] = gSaveContext.timer2Value;
+                    timerDigits[4] = gSaveContext.subTimerSeconds;
                 }
 
                 while (timerDigits[4] >= 60) {
@@ -6057,22 +6293,30 @@ void Interface_Draw(PlayState* play) {
                 gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
                 s32 X_Margins_Timer;
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {
-                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_Timer = Left_HUD_Margin;};
+                    if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == ORIGINAL_LOCATION) {
+                        X_Margins_Timer = Left_HUD_Margin;
+                    };
                 } else {
                     X_Margins_Timer = 0;
                 }
-                svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6]+X_Margins_Timer);
+                svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6] + X_Margins_Timer);
                 svar2 = gSaveContext.timerY[svar6];
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) != ORIGINAL_LOCATION) {
                     svar2 = (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosY"), 0));
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == ANCHOR_LEFT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Left_HUD_Margin;};
-                        svar5 = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {
+                            X_Margins_Timer = Left_HUD_Margin;
+                        };
+                        svar5 = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0) +
+                                                                X_Margins_Timer);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == ANCHOR_RIGHT) {
-                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Right_HUD_Margin;};
-                        svar5 = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer);
+                        if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {
+                            X_Margins_Timer = Right_HUD_Margin;
+                        };
+                        svar5 = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0) +
+                                                                 X_Margins_Timer);
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == ANCHOR_NONE) {
-                        svar5 = CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+204+X_Margins_Timer;
+                        svar5 = CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0) + 204 + X_Margins_Timer;
                     } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == HIDDEN) {
                         svar5 = -9999;
                     }
@@ -6086,14 +6330,14 @@ void Interface_Draw(PlayState* play) {
                 gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE,
                                   TEXEL0, 0, PRIMITIVE, 0);
 
-                if (gSaveContext.timer1State != 0) {
-                    if ((gSaveContext.timer1Value < 10) && (gSaveContext.timer1State < 11)) {
+                if (gSaveContext.timerState != 0) {
+                    if ((gSaveContext.timerSeconds < 10) && (gSaveContext.timerState < 11)) {
                         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255);
                     } else {
                         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255);
                     }
                 } else {
-                    if ((gSaveContext.timer2Value < 10) && (gSaveContext.timer2State < 6)) {
+                    if ((gSaveContext.subTimerSeconds < 10) && (gSaveContext.subTimerState < 6)) {
                         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255);
                     } else {
                         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 0, 255);
@@ -6132,7 +6376,8 @@ void Interface_DrawTotalGameplayTimer(PlayState* play) {
     // Draw timer based on the Gameplay Stats total time.
 
     if ((IS_BOSS_RUSH && gSaveContext.ship.quest.data.bossRush.options[BR_OPTIONS_TIMER] == BR_CHOICE_TIMER_YES) ||
-        (CVarGetInteger(CVAR_ENHANCEMENT("GameplayStats.ShowIngameTimer"), 0) && gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2)) {
+        (CVarGetInteger(CVAR_GAMEPLAY_STATS("ShowIngameTimer"), 0) && gSaveContext.fileNum >= 0 &&
+         gSaveContext.fileNum <= 2)) {
 
         s32 X_Margins_Timer = 0;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.UseMargins"), 0) != 0) {
@@ -6148,12 +6393,14 @@ void Interface_DrawTotalGameplayTimer(PlayState* play) {
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.UseMargins"), 0) != 0) {
                     X_Margins_Timer = Left_HUD_Margin;
                 };
-                rectLeftOri = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosX"), 0) + X_Margins_Timer);
+                rectLeftOri =
+                    OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosX"), 0) + X_Margins_Timer);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosType"), 0) == ANCHOR_RIGHT) {
                 if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.UseMargins"), 0) != 0) {
                     X_Margins_Timer = Right_HUD_Margin;
                 };
-                rectLeftOri = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosX"), 0) + X_Margins_Timer);
+                rectLeftOri = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosX"), 0) +
+                                                               X_Margins_Timer);
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosType"), 0) == ANCHOR_NONE) {
                 rectLeftOri = CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosX"), 0) + 204 + X_Margins_Timer;
             } else if (CVarGetInteger(CVAR_COSMETIC("HUD.IGT.PosType"), 0) == HIDDEN) {
@@ -6213,7 +6460,8 @@ void Interface_DrawTotalGameplayTimer(PlayState* play) {
             // Draw regular text. Change color based on if the timer is paused, running or the game is completed.
             if (gSaveContext.ship.stats.gameComplete) {
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, 255);
-            } else if (IS_BOSS_RUSH && gSaveContext.ship.quest.data.bossRush.isPaused && !gSaveContext.ship.stats.rtaTiming) {
+            } else if (IS_BOSS_RUSH && gSaveContext.ship.quest.data.bossRush.isPaused &&
+                       !gSaveContext.ship.stats.rtaTiming) {
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 150, 150, 150, 255);
             } else {
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255);
@@ -6250,14 +6498,24 @@ void Interface_Update(PlayState* play) {
 
     GameInteractor_ExecuteOnInterfaceUpdate();
 
+    bool isPal = ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL;
+
     if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) {
         gSaveContext.language = LANGUAGE_ENG;
+        CVarSetInteger(CVAR_SETTING("Languages"), LANGUAGE_ENG);
         osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
-    } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) {
+    } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP) && sGerMessageEntryTablePtr != NULL) {
         gSaveContext.language = LANGUAGE_GER;
+        CVarSetInteger(CVAR_SETTING("Languages"), LANGUAGE_GER);
         osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
-    } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) {
+    } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT) && sFraMessageEntryTablePtr != NULL) {
         gSaveContext.language = LANGUAGE_FRA;
+        CVarSetInteger(CVAR_SETTING("Languages"), LANGUAGE_FRA);
+        osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
+    } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DDOWN) && sJpnMessageEntryTablePtr != NULL) {
+        // Add this in to have an equivalent ntsc language debugging feature
+        gSaveContext.language = LANGUAGE_JPN;
+        CVarSetInteger(CVAR_SETTING("Languages"), LANGUAGE_JPN);
         osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
     }
 
@@ -6376,7 +6634,8 @@ void Interface_Update(PlayState* play) {
         gSaveContext.health += 4;
 
         if ((gSaveContext.health & 0xF) < 4) {
-            Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         osSyncPrintf("now_life=%d  max_life=%d\n", gSaveContext.health, gSaveContext.healthCapacity);
@@ -6393,27 +6652,31 @@ void Interface_Update(PlayState* play) {
     D_80125A58 = Player_GetEnvironmentalHazard(play);
 
     if (D_80125A58 == 1) {
-        if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_GORON || CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) != 0) {
+        if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_GORON ||
+            CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) != 0) {
             D_80125A58 = 0;
         }
     } else if ((Player_GetEnvironmentalHazard(play) >= 2) && (Player_GetEnvironmentalHazard(play) < 5)) {
-        if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_ZORA || CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) != 0) {
+        if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_ZORA ||
+            CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) != 0) {
             D_80125A58 = 0;
         }
     }
 
     HealthMeter_Update(play);
 
-    if ((gSaveContext.timer1State >= 3) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
-        (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
-        (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {}
+    if ((gSaveContext.timerState >= 3) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
+        (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR) &&
+        (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) &&
+        !Play_InCsMode(play)) {}
 
     if (gSaveContext.rupeeAccumulator != 0) {
         if (gSaveContext.rupeeAccumulator > 0) {
             if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
                 gSaveContext.rupeeAccumulator--;
                 gSaveContext.rupees++;
-                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 // "Rupee Amount MAX = %d"
                 osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET));
@@ -6429,11 +6692,13 @@ void Interface_Update(PlayState* play) {
                     gSaveContext.rupees = 0;
                 }
 
-                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 gSaveContext.rupeeAccumulator++;
                 gSaveContext.rupees--;
-                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         } else {
             gSaveContext.rupeeAccumulator = 0;
@@ -6504,10 +6769,9 @@ void Interface_Update(PlayState* play) {
 
     WREG(7) = interfaceCtx->unk_1F4;
 
-    if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
-        (msgCtx->msgMode == MSGMODE_NONE) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
-        (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->transitionMode == TRANS_MODE_OFF) &&
-        ((play->csCtx.state == CS_STATE_IDLE) || !Player_InCsMode(play))) {
+    if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && (msgCtx->msgMode == MSGMODE_NONE) &&
+        (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) &&
+        (play->transitionMode == TRANS_MODE_OFF) && ((play->csCtx.state == CS_STATE_IDLE) || !Player_InCsMode(play))) {
         if ((gSaveContext.isMagicAcquired != 0) && (gSaveContext.magicLevel == 0)) {
             gSaveContext.magicLevel = gSaveContext.isDoubleMagicAcquired + 1;
             gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY;
@@ -6523,16 +6787,16 @@ void Interface_Update(PlayState* play) {
         Interface_UpdateMagicBar(play);
     }
 
-    if (gSaveContext.timer1State == 0) {
+    if (gSaveContext.timerState == 0) {
         if (((D_80125A58 == 1) || (D_80125A58 == 2) || (D_80125A58 == 4)) && ((gSaveContext.health >> 1) != 0)) {
-            gSaveContext.timer1State = 1;
+            gSaveContext.timerState = 1;
             gSaveContext.timerX[0] = 140;
             gSaveContext.timerY[0] = 80;
             D_80125A5C = 1;
         }
     } else {
-        if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timer1State < 5)) {
-            gSaveContext.timer1State = 0;
+        if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timerState < 5)) {
+            gSaveContext.timerState = 0;
         }
     }
 
@@ -6638,7 +6902,8 @@ void Interface_Update(PlayState* play) {
 }
 
 void Interface_DrawTextCharacter(GraphicsContext* gfx, int16_t x, int16_t y, void* texture, uint16_t colorR,
-                                    uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, uint8_t textShadow) {
+                                 uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale,
+                                 uint8_t textShadow) {
 
     int32_t scale = R_TEXT_CHAR_SCALE * textScale;
     int32_t sCharTexSize = (scale / 100.0f) * 16.0f;
@@ -6672,7 +6937,8 @@ void Interface_DrawTextCharacter(GraphicsContext* gfx, int16_t x, int16_t y, voi
 }
 
 uint16_t Interface_DrawTextLine(GraphicsContext* gfx, char text[], int16_t x, int16_t y, uint16_t colorR,
-                         uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, uint8_t textShadow) {
+                                uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale,
+                                uint8_t textShadow) {
 
     uint16_t textureIndex;
     uint16_t kerningOffset = 0;
@@ -6689,11 +6955,12 @@ uint16_t Interface_DrawTextLine(GraphicsContext* gfx, char text[], int16_t x, in
             textureIndex = processedText[i] - 32;
 
             if (textureIndex != 0) {
-                texture = Font_FetchCharTexture(textureIndex);
+                texture = Ship_GetCharFontTexture(processedText[i]);
                 Interface_DrawTextCharacter(gfx, x + kerningOffset, y + lineOffset, texture, colorR, colorG, colorB,
                                             colorA, textScale, textShadow);
             }
-            kerningOffset += (uint16_t)(Message_GetCharacterWidth(textureIndex) * textScale);
+            kerningOffset +=
+                (uint16_t)(Ship_GetCharFontWidth(processedText[i]) * (R_TEXT_CHAR_SCALE / 100.0f) * textScale);
         }
     }
 
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index e625f4b53f..dfc832fc7a 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -44,11 +44,11 @@ void Play_SpawnScene(PlayState* play, s32 sceneId, s32 spawn);
 // This macro prints the number "1" with a file and line number if R_ENABLE_PLAY_LOGS is enabled.
 // For example, it can be used to trace the play state execution at a high level.
 // SOHTODO: Revert log statements everywhere back to authentic, and deal with dynamic line/file names via macro
-#define PLAY_LOG(line)                            \
-    do {                                          \
-        if (1 & HREG(63)) {                 \
+#define PLAY_LOG(line)                                  \
+    do {                                                \
+        if (1 & HREG(63)) {                             \
             LOG_NUM("1", 1 /*, "../z_play.c", line */); \
-        }                                         \
+        }                                               \
     } while (0)
 
 void enableBetaQuest();
@@ -66,8 +66,8 @@ void Play_SetViewpoint(PlayState* play, s16 viewpoint) {
     play->unk_1242B = viewpoint;
 
     if ((YREG(15) != 0x10) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
-        Audio_PlaySoundGeneral((viewpoint == 1) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4,
-                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral((viewpoint == 1) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos,
+                               4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     Play_RequestViewpointBgCam(play);
@@ -487,8 +487,8 @@ void Play_Init(GameState* thisx) {
         } else {
             gSaveContext.sceneSetupIndex = 0;
         }
-    } else if ((gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_KOKIRI_FOREST) &&
-               LINK_IS_ADULT && !IS_CUTSCENE_LAYER) {
+    } else if ((gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_KOKIRI_FOREST) && LINK_IS_ADULT &&
+               !IS_CUTSCENE_LAYER) {
         gSaveContext.sceneSetupIndex = (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) ? 3 : 2;
     }
 
@@ -519,8 +519,7 @@ void Play_Init(GameState* thisx) {
             gSaveContext.bgsDayCount++;
             gSaveContext.dogIsLost = true;
 
-            if (Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) ||
-                Inventory_HatchPocketCucco(play)) {
+            if (Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) || Inventory_HatchPocketCucco(play)) {
                 GameInteractor_ExecuteOnCuccoOrChickenHatch();
                 Message_StartTextbox(play, 0x3066, NULL);
             }
@@ -645,10 +644,10 @@ void Play_Init(GameState* thisx) {
     if (gSaveContext.ship.stats.sceneNum != gPlayState->sceneNum) {
         u16 idx = gSaveContext.ship.stats.tsIdx;
         gSaveContext.ship.stats.sceneTimestamps[idx].sceneTime = gSaveContext.ship.stats.sceneTimer / 2;
-        gSaveContext.ship.stats.sceneTimestamps[idx].roomTime = gSaveContext.ship.stats.roomTimer / 2;    
+        gSaveContext.ship.stats.sceneTimestamps[idx].roomTime = gSaveContext.ship.stats.roomTimer / 2;
         gSaveContext.ship.stats.sceneTimestamps[idx].scene = gSaveContext.ship.stats.sceneNum;
         gSaveContext.ship.stats.sceneTimestamps[idx].room = gSaveContext.ship.stats.roomNum;
-        gSaveContext.ship.stats.sceneTimestamps[idx].isRoom = 
+        gSaveContext.ship.stats.sceneTimestamps[idx].isRoom =
             gPlayState->sceneNum == gSaveContext.ship.stats.sceneTimestamps[idx].scene &&
             gPlayState->roomCtx.curRoom.num != gSaveContext.ship.stats.sceneTimestamps[idx].room;
         gSaveContext.ship.stats.tsIdx++;
@@ -659,7 +658,7 @@ void Play_Init(GameState* thisx) {
         gSaveContext.ship.stats.sceneTimestamps[idx].roomTime = gSaveContext.ship.stats.roomTimer / 2;
         gSaveContext.ship.stats.sceneTimestamps[idx].scene = gSaveContext.ship.stats.sceneNum;
         gSaveContext.ship.stats.sceneTimestamps[idx].room = gSaveContext.ship.stats.roomNum;
-        gSaveContext.ship.stats.sceneTimestamps[idx].isRoom = 
+        gSaveContext.ship.stats.sceneTimestamps[idx].isRoom =
             gPlayState->sceneNum == gSaveContext.ship.stats.sceneTimestamps[idx].scene &&
             gPlayState->roomCtx.curRoom.num != gSaveContext.ship.stats.sceneTimestamps[idx].room;
         gSaveContext.ship.stats.tsIdx++;
@@ -738,26 +737,53 @@ void Play_Update(PlayState* play) {
 
         // #region SOH [Stats] Gameplay stats: Count button presses
         if (!gSaveContext.ship.stats.gameComplete) {
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_A))      {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_A]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_B))      {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_B]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP))    {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CUP]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_CRIGHT)) {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CRIGHT]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_CLEFT))  {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CLEFT]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_CDOWN))  {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CDOWN]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_DUP))    {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DUP]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_DRIGHT)) {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DRIGHT]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_DDOWN))  {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DDOWN]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_DLEFT))  {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DLEFT]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_L))      {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_L]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_R))      {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_R]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_Z))      {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_Z]++;}
-            if (CHECK_BTN_ALL(input[0].press.button, BTN_START))  {gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_START]++;}
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_A)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_A]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_B)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_B]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CUP]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_CRIGHT)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CRIGHT]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_CLEFT)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CLEFT]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_CDOWN)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_CDOWN]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_DUP)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DUP]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_DRIGHT)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DRIGHT]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_DDOWN)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DDOWN]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_DLEFT)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_DLEFT]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_L)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_L]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_R)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_R]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_Z)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_Z]++;
+            }
+            if (CHECK_BTN_ALL(input[0].press.button, BTN_START)) {
+                gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_START]++;
+            }
 
             // Start RTA timing on first non-c-up input after intro cutscene
-            if (
-                !gSaveContext.ship.stats.fileCreatedAt && !Player_InCsMode(play) && 
-                ((input[0].press.button && input[0].press.button != 0x8) || input[0].rel.stick_x != 0 || input[0].rel.stick_y != 0)
-            ) {
+            if (!gSaveContext.ship.stats.fileCreatedAt && !Player_InCsMode(play) &&
+                ((input[0].press.button && input[0].press.button != 0x8) || input[0].rel.stick_x != 0 ||
+                 input[0].rel.stick_y != 0)) {
                 gSaveContext.ship.stats.fileCreatedAt = GetUnixTimestamp();
             }
         }
@@ -856,22 +882,19 @@ void Play_Update(PlayState* play) {
                         play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(160, 160, 160, 255));
 
                         if (play->transitionCtx.setEnvColor != NULL) {
-                            play->transitionCtx.setEnvColor(&play->transitionCtx.data,
-                                                            RGBA8(160, 160, 160, 255));
+                            play->transitionCtx.setEnvColor(&play->transitionCtx.data, RGBA8(160, 160, 160, 255));
                         }
                     } else if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_GREEN) {
                         play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(140, 140, 100, 255));
 
                         if (play->transitionCtx.setEnvColor != NULL) {
-                            play->transitionCtx.setEnvColor(&play->transitionCtx.data,
-                                                            RGBA8(140, 140, 100, 255));
+                            play->transitionCtx.setEnvColor(&play->transitionCtx.data, RGBA8(140, 140, 100, 255));
                         }
                     } else if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_BLUE) {
                         play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(70, 100, 110, 255));
 
                         if (play->transitionCtx.setEnvColor != NULL) {
-                            play->transitionCtx.setEnvColor(&play->transitionCtx.data,
-                                                            RGBA8(70, 100, 110, 255));
+                            play->transitionCtx.setEnvColor(&play->transitionCtx.data, RGBA8(70, 100, 110, 255));
                         }
                     } else {
                         play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(0, 0, 0, 0));
@@ -1036,7 +1059,8 @@ void Play_Update(PlayState* play) {
 
                 case TRANS_MODE_SANDSTORM:
                     Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &gSfxDefaultPos, 4,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
 
                     if (play->transitionTrigger == TRANS_TRIGGER_END) {
                         if (play->envCtx.sandstormPrimA < 110) {
@@ -1074,7 +1098,8 @@ void Play_Update(PlayState* play) {
 
                 case TRANS_MODE_SANDSTORM_END:
                     Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &gSfxDefaultPos, 4,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
 
                     if (play->transitionTrigger == TRANS_TRIGGER_END) {
                         if (play->envCtx.sandstormPrimA <= 0) {
@@ -1144,13 +1169,14 @@ void Play_Update(PlayState* play) {
                 // Gameplay stat tracking
                 if (!gSaveContext.ship.stats.gameComplete &&
                     (!IS_BOSS_RUSH || !gSaveContext.ship.quest.data.bossRush.isPaused)) {
-                      gSaveContext.ship.stats.playTimer++;
-                      gSaveContext.ship.stats.sceneTimer++;
-                      gSaveContext.ship.stats.roomTimer++;
+                    gSaveContext.ship.stats.playTimer++;
+                    gSaveContext.ship.stats.sceneTimer++;
+                    gSaveContext.ship.stats.roomTimer++;
 
-                      if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && Player_GetMask(play) == PLAYER_MASK_BUNNY) {
-                          gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD]++;
-                      }
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA &&
+                        Player_GetMask(play) == PLAYER_MASK_BUNNY) {
+                        gSaveContext.ship.stats.count[COUNT_TIME_BUNNY_HOOD]++;
+                    }
                 }
 
                 if (play->actorCtx.freezeFlashTimer && (play->actorCtx.freezeFlashTimer-- < 5)) {
@@ -1392,8 +1418,8 @@ void Play_Draw(PlayState* play) {
             play->billboardMtxF.mf[3][0] = play->billboardMtxF.mf[3][1] = play->billboardMtxF.mf[3][2] = 0.0f;
         // This transpose is where the viewing matrix is properly converted into a billboard matrix
         Matrix_Transpose(&play->billboardMtxF);
-        play->billboardMtx = Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&play->billboardMtxF),
-                                              Graph_Alloc(gfxCtx, sizeof(Mtx)));
+        play->billboardMtx =
+            Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&play->billboardMtxF), Graph_Alloc(gfxCtx, sizeof(Mtx)));
 
         gSPSegment(POLY_OPA_DISP++, 0x01, play->billboardMtx);
 
@@ -1458,7 +1484,7 @@ void Play_Draw(PlayState* play) {
             Gfx* gfxP = POLY_OPA_DISP;
 
             // SOH [Port] Draw game framebuffer using our custom handling
-            //func_800C24BC(&play->pauseBgPreRender, &gfxP);
+            // func_800C24BC(&play->pauseBgPreRender, &gfxP);
             FB_DrawFromFramebuffer(&gfxP, gPauseFrameBuffer, 255);
             POLY_OPA_DISP = gfxP;
 
@@ -1515,8 +1541,7 @@ void Play_Draw(PlayState* play) {
         }
 
         if ((HREG(80) != 10) || (HREG(83) != 0)) {
-            if ((play->skyboxCtx.unk_140 != 0) &&
-                (GET_ACTIVE_CAM(play)->setting != CAM_SET_PREREND_FIXED)) {
+            if ((play->skyboxCtx.unk_140 != 0) && (GET_ACTIVE_CAM(play)->setting != CAM_SET_PREREND_FIXED)) {
                 Vec3f quakeOffset;
 
                 Camera_GetSkyboxOffset(&quakeOffset, GET_ACTIVE_CAM(play));
@@ -1713,9 +1738,7 @@ void Play_Main(GameState* thisx) {
         int newIngameTime = maxInGameDayTicks * percent;
 
         gSaveContext.dayTime = newIngameTime;
-
     }
-
 }
 
 u8 PlayerGrounded(Player* player) {
@@ -2192,8 +2215,7 @@ void Play_PerformSave(PlayState* play) {
         uint8_t prevStatus = gSaveContext.buttonStatus[0];
 
         // Replicate the B button restore from minigames/epona that kaleido does
-        if (gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT ||
-            gSaveContext.equips.buttonItems[0] == ITEM_BOW ||
+        if (gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT || gSaveContext.equips.buttonItems[0] == ITEM_BOW ||
             gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU ||
             gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE ||
             (gSaveContext.equips.buttonItems[0] == ITEM_NONE && !Flags_GetInfTable(INFTABLE_SWORDLESS))) {
diff --git a/soh/src/code/z_player_call.c b/soh/src/code/z_player_call.c
index 3b17c7acf0..15d81590a5 100644
--- a/soh/src/code/z_player_call.c
+++ b/soh/src/code/z_player_call.c
@@ -1,6 +1,8 @@
 #include "global.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
 void (*sPlayerCallInitFunc)(Actor* thisx, PlayState* play);
 void (*sPlayerCallDestroyFunc)(Actor* thisx, PlayState* play);
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index bf71896167..58829aee86 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -114,133 +114,53 @@ TextTriggerEntry sTextTriggers[] = {
 // Used to map model groups to model types for [animation, left hand, right hand, sheath, waist]
 u8 gPlayerModelTypes[PLAYER_MODELGROUP_MAX][PLAYER_MODELGROUPENTRY_MAX] = {
     /* PLAYER_MODELGROUP_0 */
-    {
-        PLAYER_ANIMTYPE_2,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_SHIELD,
-        PLAYER_MODELTYPE_SHEATH_16,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_2, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_SHIELD, PLAYER_MODELTYPE_SHEATH_16,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_CHILD_HYLIAN_SHIELD */
-    {
-        PLAYER_ANIMTYPE_1,
-        PLAYER_MODELTYPE_LH_SWORD,
-        PLAYER_MODELTYPE_RH_CLOSED,
-        PLAYER_MODELTYPE_SHEATH_19,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_1, PLAYER_MODELTYPE_LH_SWORD, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_19,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_SWORD_AND_SHIELD */
-    {
-        PLAYER_ANIMTYPE_1,
-        PLAYER_MODELTYPE_LH_SWORD,
-        PLAYER_MODELTYPE_RH_SHIELD,
-        PLAYER_MODELTYPE_SHEATH_17,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_1, PLAYER_MODELTYPE_LH_SWORD, PLAYER_MODELTYPE_RH_SHIELD, PLAYER_MODELTYPE_SHEATH_17,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_DEFAULT */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_4 */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_BGS */
-    {
-        PLAYER_ANIMTYPE_3,
-        PLAYER_MODELTYPE_LH_BGS,
-        PLAYER_MODELTYPE_RH_CLOSED,
-        PLAYER_MODELTYPE_SHEATH_19,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_3, PLAYER_MODELTYPE_LH_BGS, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_19,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_BOW_SLINGSHOT */
-    {
-        PLAYER_ANIMTYPE_4,
-        PLAYER_MODELTYPE_LH_CLOSED,
-        PLAYER_MODELTYPE_RH_BOW_SLINGSHOT,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_4, PLAYER_MODELTYPE_LH_CLOSED, PLAYER_MODELTYPE_RH_BOW_SLINGSHOT, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_EXPLOSIVES */
-    {
-        PLAYER_ANIMTYPE_5,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_5, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_BOOMERANG */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_BOOMERANG,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_BOOMERANG, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_HOOKSHOT */
-    {
-        PLAYER_ANIMTYPE_4,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_HOOKSHOT,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_4, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_HOOKSHOT, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_10 */
-    {
-        PLAYER_ANIMTYPE_3,
-        PLAYER_MODELTYPE_LH_CLOSED,
-        PLAYER_MODELTYPE_RH_CLOSED,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_3, PLAYER_MODELTYPE_LH_CLOSED, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_HAMMER */
-    {
-        PLAYER_ANIMTYPE_3,
-        PLAYER_MODELTYPE_LH_HAMMER,
-        PLAYER_MODELTYPE_RH_CLOSED,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_3, PLAYER_MODELTYPE_LH_HAMMER, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_OCARINA */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_OCARINA,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_OCARINA, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_OOT */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_OPEN,
-        PLAYER_MODELTYPE_RH_OOT,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_OOT, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_BOTTLE */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_BOTTLE,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_18,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_BOTTLE, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_18,
+      PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_SWORD */
-    {
-        PLAYER_ANIMTYPE_0,
-        PLAYER_MODELTYPE_LH_SWORD,
-        PLAYER_MODELTYPE_RH_OPEN,
-        PLAYER_MODELTYPE_SHEATH_19,
-        PLAYER_MODELTYPE_WAIST
-    },
+    { PLAYER_ANIMTYPE_0, PLAYER_MODELTYPE_LH_SWORD, PLAYER_MODELTYPE_RH_OPEN, PLAYER_MODELTYPE_SHEATH_19,
+      PLAYER_MODELTYPE_WAIST },
 };
 
 Gfx* sPlayerRightHandShieldDLs[PLAYER_SHIELD_MAX * 4] = {
@@ -268,23 +188,35 @@ Gfx* sPlayerRightHandShieldDLs[PLAYER_SHIELD_MAX * 4] = {
 
 Gfx* sSheathWithSwordDLs[(PLAYER_SHIELD_MAX + 2) * 4] = {
     // PLAYER_SHIELD_NONE
-    gLinkAdultMasterSwordAndSheathNearDL,       gLinkChildSwordAndSheathNearDL,
-    gLinkAdultMasterSwordAndSheathFarDL,        gLinkChildSwordAndSheathFarDL,
+    gLinkAdultMasterSwordAndSheathNearDL,
+    gLinkChildSwordAndSheathNearDL,
+    gLinkAdultMasterSwordAndSheathFarDL,
+    gLinkChildSwordAndSheathFarDL,
     // PLAYER_SHIELD_DEKU
-    gLinkAdultMasterSwordAndSheathNearDL,       gLinkChildDekuShieldSwordAndSheathNearDL,
-    gLinkAdultMasterSwordAndSheathFarDL,        gLinkChildDekuShieldSwordAndSheathFarDL,
+    gLinkAdultMasterSwordAndSheathNearDL,
+    gLinkChildDekuShieldSwordAndSheathNearDL,
+    gLinkAdultMasterSwordAndSheathFarDL,
+    gLinkChildDekuShieldSwordAndSheathFarDL,
     // PLAYER_SHIELD_HYLIAN
-    gLinkAdultHylianShieldSwordAndSheathNearDL, gLinkChildHylianShieldSwordAndSheathNearDL,
-    gLinkAdultHylianShieldSwordAndSheathFarDL,  gLinkChildHylianShieldSwordAndSheathFarDL,
+    gLinkAdultHylianShieldSwordAndSheathNearDL,
+    gLinkChildHylianShieldSwordAndSheathNearDL,
+    gLinkAdultHylianShieldSwordAndSheathFarDL,
+    gLinkChildHylianShieldSwordAndSheathFarDL,
     // PLAYER_SHIELD_MIRROR
-    gLinkAdultMirrorShieldSwordAndSheathNearDL, gLinkChildSwordAndSheathNearDL,
-    gLinkAdultMirrorShieldSwordAndSheathFarDL,  gLinkChildSwordAndSheathFarDL,
+    gLinkAdultMirrorShieldSwordAndSheathNearDL,
+    gLinkChildSwordAndSheathNearDL,
+    gLinkAdultMirrorShieldSwordAndSheathFarDL,
+    gLinkChildSwordAndSheathFarDL,
     // PLAYER_SHIELD_NONE (child, no sword)
-    NULL,                                       NULL,
-    NULL,                                       NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     // PLAYER_SHIELD_DEKU (child, no sword)
-    NULL,                                       gLinkChildDekuShieldWithMatrixDL,
-    NULL,                                       gLinkChildDekuShieldWithMatrixDL,
+    NULL,
+    gLinkChildDekuShieldWithMatrixDL,
+    NULL,
+    gLinkChildDekuShieldWithMatrixDL,
 };
 
 Gfx* sSheathWithoutSwordDLs[(PLAYER_SHIELD_MAX + 2) * 4] = {
@@ -322,11 +254,15 @@ Gfx* sSheathWithoutSwordDLs[(PLAYER_SHIELD_MAX + 2) * 4] = {
 
 Gfx* gPlayerLeftHandBgsDLs[] = {
     // Biggoron Sword
-    gLinkAdultLeftHandHoldingBgsNearDL,          gLinkChildLeftHandHoldingMasterSwordDL,
-    gLinkAdultLeftHandHoldingBgsFarDL,           gLinkChildLeftHandHoldingMasterSwordDL,
+    gLinkAdultLeftHandHoldingBgsNearDL,
+    gLinkChildLeftHandHoldingMasterSwordDL,
+    gLinkAdultLeftHandHoldingBgsFarDL,
+    gLinkChildLeftHandHoldingMasterSwordDL,
     // Broken Giant's Knife
-    gLinkAdultHandHoldingBrokenGiantsKnifeDL,    gLinkChildLeftHandHoldingMasterSwordDL,
-    gLinkAdultHandHoldingBrokenGiantsKnifeFarDL, gLinkChildLeftHandHoldingMasterSwordDL,
+    gLinkAdultHandHoldingBrokenGiantsKnifeDL,
+    gLinkChildLeftHandHoldingMasterSwordDL,
+    gLinkAdultHandHoldingBrokenGiantsKnifeFarDL,
+    gLinkChildLeftHandHoldingMasterSwordDL,
 };
 
 Gfx* gPlayerLeftHandOpenDLs[] = {
@@ -565,8 +501,9 @@ uint8_t Player_IsCustomLinkModel() {
 }
 
 s32 Player_InBlockingCsMode(PlayState* play, Player* this) {
-    return (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
-           (this->stateFlags1 & PLAYER_STATE1_LOADING) || (this->stateFlags3 & PLAYER_STATE3_FLYING_WITH_HOOKSHOT) ||
+    return (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->csAction != 0) ||
+           (play->transitionTrigger == TRANS_TRIGGER_START) || (this->stateFlags1 & PLAYER_STATE1_LOADING) ||
+           (this->stateFlags3 & PLAYER_STATE3_FLYING_WITH_HOOKSHOT) ||
            ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0));
 }
 
@@ -606,14 +543,17 @@ void Player_SetModelsForHoldingShield(Player* this) {
     if ((this->stateFlags1 & PLAYER_STATE1_SHIELDING) &&
         ((this->itemAction < 0) || (this->itemAction == this->heldItemAction))) {
         if ((CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) && (this->heldItemAction != PLAYER_IA_DEKU_STICK) ||
-            !Player_HoldsTwoHandedWeapon(this)) && !Player_IsChildWithHylianShield(this)) {
+             !Player_HoldsTwoHandedWeapon(this)) &&
+            !Player_IsChildWithHylianShield(this)) {
             this->rightHandType = PLAYER_MODELTYPE_RH_SHIELD;
-            if (LINK_IS_CHILD && (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && (this->currentShield == PLAYER_SHIELD_MIRROR)) {
+            if (LINK_IS_CHILD && (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) &&
+                (this->currentShield == PLAYER_SHIELD_MIRROR)) {
                 this->rightHandDLists = &sPlayerDListGroups[PLAYER_MODELTYPE_RH_SHIELD][0];
-                } else if (LINK_IS_ADULT && (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && (this->currentShield == PLAYER_SHIELD_DEKU)) {
-                    this->rightHandDLists = &sPlayerDListGroups[PLAYER_MODELTYPE_RH_SHIELD][1];
-                } else {
-                    this->rightHandDLists = &sPlayerDListGroups[PLAYER_MODELTYPE_RH_SHIELD][gSaveContext.linkAge];
+            } else if (LINK_IS_ADULT && (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) &&
+                       (this->currentShield == PLAYER_SHIELD_DEKU)) {
+                this->rightHandDLists = &sPlayerDListGroups[PLAYER_MODELTYPE_RH_SHIELD][1];
+            } else {
+                this->rightHandDLists = &sPlayerDListGroups[PLAYER_MODELTYPE_RH_SHIELD][gSaveContext.linkAge];
             }
             if (this->sheathType == PLAYER_MODELTYPE_SHEATH_18) {
                 this->sheathType = PLAYER_MODELTYPE_SHEATH_16;
@@ -623,10 +563,10 @@ void Player_SetModelsForHoldingShield(Player* this) {
             this->sheathDLists = &sPlayerDListGroups[this->sheathType][gSaveContext.linkAge];
             if ((CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && LINK_IS_CHILD &&
                 gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) {
-                this->sheathDLists = &sPlayerDListGroups[this->sheathType][0]; 
+                this->sheathDLists = &sPlayerDListGroups[this->sheathType][0];
             } else if ((CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && LINK_IS_ADULT &&
-                gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI) {
-                this->sheathDLists = &sPlayerDListGroups[this->sheathType][1]; 
+                       gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI) {
+                this->sheathDLists = &sPlayerDListGroups[this->sheathType][1];
             }
             this->modelAnimType = PLAYER_ANIMTYPE_2;
             this->itemAction = -1;
@@ -642,13 +582,14 @@ void Player_SetModels(Player* this, s32 modelGroup) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
         if (LINK_IS_CHILD &&
             (this->leftHandType == PLAYER_MODELTYPE_LH_HAMMER ||
-            ((this->leftHandType == PLAYER_MODELTYPE_LH_SWORD || this->leftHandType == PLAYER_MODELTYPE_LH_BGS) &&
-            (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)))) {
+             ((this->leftHandType == PLAYER_MODELTYPE_LH_SWORD || this->leftHandType == PLAYER_MODELTYPE_LH_BGS) &&
+              (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)))) {
             this->leftHandDLists = &sPlayerDListGroups[this->leftHandType][0];
         }
 
         if (LINK_IS_ADULT && (this->leftHandType == PLAYER_MODELTYPE_LH_BOOMERANG ||
-            (this->leftHandType == PLAYER_MODELTYPE_LH_SWORD && gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI))) {
+                              (this->leftHandType == PLAYER_MODELTYPE_LH_SWORD &&
+                               gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI))) {
             this->leftHandDLists = &sPlayerDListGroups[this->leftHandType][1];
         }
     }
@@ -663,7 +604,7 @@ void Player_SetModels(Player* this, s32 modelGroup) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
         if (LINK_IS_CHILD &&
             (this->rightHandType == PLAYER_MODELTYPE_RH_HOOKSHOT ||
-            (this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD && this->currentShield == PLAYER_SHIELD_MIRROR))) {
+             (this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD && this->currentShield == PLAYER_SHIELD_MIRROR))) {
             this->rightHandDLists = &sPlayerDListGroups[this->rightHandType][0];
         }
         if (LINK_IS_ADULT &&
@@ -671,7 +612,9 @@ void Player_SetModels(Player* this, s32 modelGroup) {
             this->rightHandDLists = &sPlayerDListGroups[this->rightHandType][1];
         }
     }
-    if ((CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && this->rightHandType == 11) { // If holding Bow/Slingshot
+    if ((CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+         CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) &&
+        this->rightHandType == 11) { // If holding Bow/Slingshot
         this->rightHandDLists = &sPlayerDListGroups[this->rightHandType][Player_HoldsSlingshot(this)];
     }
 
@@ -680,21 +623,28 @@ void Player_SetModels(Player* this, s32 modelGroup) {
     this->sheathDLists = &sPlayerDListGroups[this->sheathType][gSaveContext.linkAge];
 
     if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
-        if (LINK_IS_CHILD && (this->currentShield == PLAYER_SHIELD_HYLIAN && ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER) || 
-            (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS)) || (this->currentShield == PLAYER_SHIELD_MIRROR) && (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI))) {
+        if (LINK_IS_CHILD && (this->currentShield == PLAYER_SHIELD_HYLIAN &&
+                                  ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER) ||
+                                   (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS)) ||
+                              (this->currentShield == PLAYER_SHIELD_MIRROR) &&
+                                  (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI))) {
             this->sheathDLists = &sPlayerDListGroups[this->sheathType][0];
-        } else if (LINK_IS_CHILD && this->currentShield == PLAYER_SHIELD_MIRROR && gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI &&
-            this->sheathType == PLAYER_MODELTYPE_SHEATH_18) {
+        } else if (LINK_IS_CHILD && this->currentShield == PLAYER_SHIELD_MIRROR &&
+                   gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KOKIRI &&
+                   this->sheathType == PLAYER_MODELTYPE_SHEATH_18) {
             this->sheathDLists = &sPlayerDListGroups[this->sheathType][0];
-        } else if (LINK_IS_ADULT && (this->currentShield == PLAYER_SHIELD_DEKU && gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) ||
-        (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER && this->sheathType == PLAYER_MODELTYPE_SHEATH_18 && this->currentShield == PLAYER_SHIELD_DEKU)) {
+        } else if (LINK_IS_ADULT && (this->currentShield == PLAYER_SHIELD_DEKU &&
+                                     gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) ||
+                   (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER &&
+                    this->sheathType == PLAYER_MODELTYPE_SHEATH_18 && this->currentShield == PLAYER_SHIELD_DEKU)) {
             this->sheathDLists = &sPlayerDListGroups[this->sheathType][1];
-        } else if (LINK_IS_CHILD && this->sheathType == PLAYER_MODELTYPE_SHEATH_17 && 
-			((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER) || (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS))) {
-			this->sheathDLists = &sPlayerDListGroups[this->sheathType][0];
-		}
+        } else if (LINK_IS_CHILD && this->sheathType == PLAYER_MODELTYPE_SHEATH_17 &&
+                   ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_MASTER) ||
+                    (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS))) {
+            this->sheathDLists = &sPlayerDListGroups[this->sheathType][0];
+        }
     }
-    
+
     // Waist
     this->waistDLists = &sPlayerDListGroups[gPlayerModelTypes[modelGroup][4]][gSaveContext.linkAge];
 
@@ -756,10 +706,15 @@ void Player_ReleaseLockOn(Player* this) {
  * TODO: Learn more about this and give a name to PLAYER_STATE1_19
  */
 void Player_ClearZTargeting(Player* this) {
-    if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & (PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_WATER)) ||
-        (!(this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL)) && ((this->actor.world.pos.y - this->actor.floorHeight) < 100.0f))) {
-        this->stateFlags1 &= ~(PLAYER_STATE1_Z_TARGETING | PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS | PLAYER_STATE1_PARALLEL | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_LOCK_ON_FORCED_TO_RELEASE);
-    } else if (!(this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER))) {
+    if ((this->actor.bgCheckFlags & 1) ||
+        (this->stateFlags1 & (PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_WATER)) ||
+        (!(this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL)) &&
+         ((this->actor.world.pos.y - this->actor.floorHeight) < 100.0f))) {
+        this->stateFlags1 &=
+            ~(PLAYER_STATE1_Z_TARGETING | PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS | PLAYER_STATE1_PARALLEL |
+              PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_LOCK_ON_FORCED_TO_RELEASE);
+    } else if (!(this->stateFlags1 &
+                 (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER))) {
         this->stateFlags1 |= PLAYER_STATE1_FREEFALL;
     }
 
@@ -818,7 +773,8 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y
 s32 Player_GetStrength(void) {
     s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH);
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) &&
+        CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0)) {
         return PLAYER_STR_NONE;
     }
 
@@ -872,7 +828,7 @@ s32 Player_HoldsHookshot(Player* this) {
 }
 
 s32 Player_HoldsBow(Player* this) {
-    switch(this->heldItemAction){
+    switch (this->heldItemAction) {
         case PLAYER_IA_BOW:
         case PLAYER_IA_BOW_FIRE:
         case PLAYER_IA_BOW_ICE:
@@ -992,9 +948,12 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) {
         triggerEntry = &sTextTriggers[var];
 
         if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) &&
-            (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0 && CVarGetInteger(CVAR_ENHANCEMENT("DisableTunicWarningText"), 0) == 0)) ||
+            (((var == 0) &&
+              (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0 &&
+               CVarGetInteger(CVAR_ENHANCEMENT("DisableTunicWarningText"), 0) == 0)) ||
              (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) &&
-              (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0 && CVarGetInteger(CVAR_ENHANCEMENT("DisableTunicWarningText"), 0) == 0)))) {
+              (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0 &&
+               CVarGetInteger(CVAR_ENHANCEMENT("DisableTunicWarningText"), 0) == 0)))) {
             Message_StartTextbox(play, triggerEntry->textId, NULL);
             gSaveContext.textTriggerFlags |= triggerEntry->flag;
         }
@@ -1016,7 +975,7 @@ u8 sEyeMouthIndexes[][2] = {
  */
 
 #if defined(MODDING) || defined(_MSC_VER) || defined(__GNUC__)
-//TODO: Formatting
+// TODO: Formatting
 void* sEyeTextures[2][8] = {
     { gLinkAdultEyesOpenTex, gLinkAdultEyesHalfTex, gLinkAdultEyesClosedfTex, gLinkAdultEyesRollLeftTex,
       gLinkAdultEyesRollRightTex, gLinkAdultEyesShockTex, gLinkAdultEyesUnk1Tex, gLinkAdultEyesUnk2Tex },
@@ -1067,13 +1026,12 @@ Color_RGB8 sGauntletColors[] = {
 };
 
 Gfx* sBootDListGroups[][2] = {
-    { gLinkAdultLeftIronBootDL, gLinkAdultRightIronBootDL },    // PLAYER_BOOTS_IRON
-    { gLinkAdultLeftHoverBootDL, gLinkAdultRightHoverBootDL },  // PLAYER_BOOTS_HOVER
+    { gLinkAdultLeftIronBootDL, gLinkAdultRightIronBootDL },   // PLAYER_BOOTS_IRON
+    { gLinkAdultLeftHoverBootDL, gLinkAdultRightHoverBootDL }, // PLAYER_BOOTS_HOVER
 };
 
-void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic,
-                   s32 boots, s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw,
-                   void* data) {
+void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, s32 boots,
+                     s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* data) {
     Color_RGB8* color;
     s32 eyeIndex = (jointTable[22].x & 0xF) - 1;
     s32 mouthIndex = (jointTable[22].x >> 4) - 1;
@@ -1129,7 +1087,8 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL
 
     SkelAnime_DrawFlexLod(play, skeleton, jointTable, dListCount, overrideLimbDraw, postLimbDraw, data, lod);
 
-    if (((CVarGetInteger(CVAR_ENHANCEMENT("FirstPersonGauntlets"), 0) && LINK_IS_ADULT) || (overrideLimbDraw != Player_OverrideLimbDrawGameplayFirstPerson)) &&
+    if (((CVarGetInteger(CVAR_ENHANCEMENT("FirstPersonGauntlets"), 0) && LINK_IS_ADULT) ||
+         (overrideLimbDraw != Player_OverrideLimbDrawGameplayFirstPerson)) &&
         (overrideLimbDraw != Player_OverrideLimbDrawGameplayCrawling) &&
         (gSaveContext.gameMode != GAMEMODE_END_CREDITS)) {
         if (LINK_IS_ADULT) {
@@ -1139,21 +1098,27 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL
                 gDPPipeSync(POLY_OPA_DISP++);
 
                 color = &sGauntletColors[strengthUpgrade - 2];
-                if (strengthUpgrade == PLAYER_STR_SILVER_G && CVarGetInteger(CVAR_COSMETIC("Gloves.SilverGauntlets.Changed"), 0)) {
-                    sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.SilverGauntlets.Value"), sGauntletColors[PLAYER_STR_SILVER_G - 2]);
+                if (strengthUpgrade == PLAYER_STR_SILVER_G &&
+                    CVarGetInteger(CVAR_COSMETIC("Gloves.SilverGauntlets.Changed"), 0)) {
+                    sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.SilverGauntlets.Value"),
+                                           sGauntletColors[PLAYER_STR_SILVER_G - 2]);
                     color = &sTemp;
-                } else if (strengthUpgrade == PLAYER_STR_GOLD_G && CVarGetInteger(CVAR_COSMETIC("Gloves.GoldenGauntlets.Changed"), 0)) {
-                    sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.GoldenGauntlets.Value"), sGauntletColors[PLAYER_STR_GOLD_G - 2]);
+                } else if (strengthUpgrade == PLAYER_STR_GOLD_G &&
+                           CVarGetInteger(CVAR_COSMETIC("Gloves.GoldenGauntlets.Changed"), 0)) {
+                    sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.GoldenGauntlets.Value"),
+                                           sGauntletColors[PLAYER_STR_GOLD_G - 2]);
                     color = &sTemp;
                 }
                 gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);
 
                 gSPDisplayList(POLY_OPA_DISP++, gLinkAdultLeftGauntletPlate1DL);
                 gSPDisplayList(POLY_OPA_DISP++, gLinkAdultRightGauntletPlate1DL);
-                gSPDisplayList(POLY_OPA_DISP++,
-                               (sLeftHandType == PLAYER_MODELTYPE_LH_OPEN) ? gLinkAdultLeftGauntletPlate2DL : gLinkAdultLeftGauntletPlate3DL);
-                gSPDisplayList(POLY_OPA_DISP++,
-                               (sRightHandType == PLAYER_MODELTYPE_RH_OPEN) ? gLinkAdultRightGauntletPlate2DL : gLinkAdultRightGauntletPlate3DL);
+                gSPDisplayList(POLY_OPA_DISP++, (sLeftHandType == PLAYER_MODELTYPE_LH_OPEN)
+                                                    ? gLinkAdultLeftGauntletPlate2DL
+                                                    : gLinkAdultLeftGauntletPlate3DL);
+                gSPDisplayList(POLY_OPA_DISP++, (sRightHandType == PLAYER_MODELTYPE_RH_OPEN)
+                                                    ? gLinkAdultRightGauntletPlate2DL
+                                                    : gLinkAdultRightGauntletPlate3DL);
             }
 
             if (boots != 0) {
@@ -1186,8 +1151,8 @@ f32 D_80126068[] = { 5.0f, 3.0f };
 
 Vec3f D_80126070 = { 0.0f, -300.0f, 0.0f };
 
-void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot,
-                   s32 thighLimbIndex, s32 shinLimbIndex, s32 footLimbIndex) {
+void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, s32 thighLimbIndex,
+                   s32 shinLimbIndex, s32 footLimbIndex) {
     Vec3f spA4;
     Vec3f sp98;
     Vec3f footprintPos;
@@ -1279,18 +1244,21 @@ void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* p
     }
 }
 
-s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                          void* thisx) {
     Player* this = (Player*)thisx;
-    
-    if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"), 0) && LINK_IS_CHILD) {
+
+    if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) &&
+        CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"), 0) && LINK_IS_CHILD) {
         if (limbIndex == PLAYER_LIMB_L_HAND) {
-            if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI && sLeftHandType == PLAYER_MODELTYPE_LH_SWORD) ||
+            if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI &&
+                 sLeftHandType == PLAYER_MODELTYPE_LH_SWORD) ||
                 (sLeftHandType == PLAYER_MODELTYPE_LH_BGS) || (sLeftHandType == PLAYER_MODELTYPE_LH_HAMMER)) {
                 Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
             }
         }
         if (limbIndex == PLAYER_LIMB_R_HAND) {
-            if ((this->currentShield == PLAYER_SHIELD_MIRROR && sRightHandType == PLAYER_MODELTYPE_RH_SHIELD) || 
+            if ((this->currentShield == PLAYER_SHIELD_MIRROR && sRightHandType == PLAYER_MODELTYPE_RH_SHIELD) ||
                 sRightHandType == PLAYER_MODELTYPE_RH_HOOKSHOT ||
                 (sRightHandType == PLAYER_MODELTYPE_RH_BOW_SLINGSHOT && Player_HoldsBow(this))) {
                 Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
@@ -1307,10 +1275,8 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
                 Matrix_Translate(218, -100, 62, MTXMODE_APPLY);
                 Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
             }
-            if ((this->currentShield == PLAYER_SHIELD_DEKU &&
-                gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI && 
-                (this->sheathType == PLAYER_MODELTYPE_SHEATH_16 ||
-                 this->sheathType == PLAYER_MODELTYPE_SHEATH_17))) {
+            if ((this->currentShield == PLAYER_SHIELD_DEKU && gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI &&
+                 (this->sheathType == PLAYER_MODELTYPE_SHEATH_16 || this->sheathType == PLAYER_MODELTYPE_SHEATH_17))) {
                 Matrix_Translate(218, -100, 62, MTXMODE_APPLY);
                 Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
             }
@@ -1323,12 +1289,12 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
         D_80160000 = &this->meleeWeaponInfo[2].base;
 
         if (!LINK_IS_ADULT) {
-            if (!(this->skelAnime.moveFlags & 4) || (this->skelAnime.moveFlags & 1)) {
+            if (!(this->skelAnime.movementFlags & 4) || (this->skelAnime.movementFlags & 1)) {
                 pos->x *= 0.64f;
                 pos->z *= 0.64f;
             }
 
-            if (!(this->skelAnime.moveFlags & 4) || (this->skelAnime.moveFlags & 2)) {
+            if (!(this->skelAnime.movementFlags & 4) || (this->skelAnime.movementFlags & 2)) {
                 pos->y *= 0.64f;
             }
         }
@@ -1354,7 +1320,8 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
                 if (scale > 1.2f) {
                     Matrix_Translate(-((LINK_IS_ADULT ? 320.0f : 200.0f) * scale), 0.0f, 0.0f, MTXMODE_APPLY);
                 } else if (scale < 1.0f) {
-                    Matrix_Translate((LINK_IS_ADULT ? 3600.0f : 2900.0f) * ABS(scale - 1.0f), 0.0f, 0.0f, MTXMODE_APPLY);
+                    Matrix_Translate((LINK_IS_ADULT ? 3600.0f : 2900.0f) * ABS(scale - 1.0f), 0.0f, 0.0f,
+                                     MTXMODE_APPLY);
                 }
             }
             rot->x += this->headLimbRot.z;
@@ -1395,20 +1362,22 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
     return false;
 }
 
-s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                           void* thisx) {
     Player* this = (Player*)thisx;
 
-    if (!Player_OverrideLimbDrawGameplayCommon(play, limbIndex, dList, pos, rot, thisx)) 
-    {
+    if (!Player_OverrideLimbDrawGameplayCommon(play, limbIndex, dList, pos, rot, thisx)) {
         if (limbIndex == PLAYER_LIMB_L_HAND) {
             Gfx** dLists = this->leftHandDLists;
 
             if ((sLeftHandType == PLAYER_MODELTYPE_LH_BGS) && (gSaveContext.swordHealth <= 0.0f)) {
                 dLists += 4;
-            } else if ((sLeftHandType == PLAYER_MODELTYPE_LH_BOOMERANG) && (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN)) {
+            } else if ((sLeftHandType == PLAYER_MODELTYPE_LH_BOOMERANG) &&
+                       (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN)) {
                 dLists = &gPlayerLeftHandOpenDLs[gSaveContext.linkAge];
                 sLeftHandType = PLAYER_MODELTYPE_LH_OPEN;
-            } else if ((this->leftHandType == PLAYER_MODELTYPE_LH_OPEN) && (this->actor.speedXZ > 2.0f) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
+            } else if ((this->leftHandType == PLAYER_MODELTYPE_LH_OPEN) && (this->actor.speedXZ > 2.0f) &&
+                       !(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
                 dLists = &gPlayerLeftHandClosedDLs[gSaveContext.linkAge];
                 sLeftHandType = PLAYER_MODELTYPE_LH_CLOSED;
             }
@@ -1419,7 +1388,8 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx**
 
             if (sRightHandType == PLAYER_MODELTYPE_RH_SHIELD) {
                 dLists += this->currentShield * 4;
-            } else if ((this->rightHandType == PLAYER_MODELTYPE_RH_OPEN) && (this->actor.speedXZ > 2.0f) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
+            } else if ((this->rightHandType == PLAYER_MODELTYPE_RH_OPEN) && (this->actor.speedXZ > 2.0f) &&
+                       !(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
                 dLists = &sPlayerRightHandClosedDLs[gSaveContext.linkAge];
                 sRightHandType = PLAYER_MODELTYPE_RH_CLOSED;
             }
@@ -1434,9 +1404,14 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx**
                     (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)) {
                     dLists += PLAYER_SHIELD_MAX * 4;
                 }
-            } else if (!CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) || (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) && 
-                ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER && gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) && this->currentShield == PLAYER_SHIELD_DEKU))) {
-                if (!LINK_IS_ADULT && ((this->sheathType == PLAYER_MODELTYPE_SHEATH_16) || (this->sheathType == PLAYER_MODELTYPE_SHEATH_17)) &&
+            } else if (!CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) ||
+                       (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) &&
+                        ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER &&
+                          gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
+                         this->currentShield == PLAYER_SHIELD_DEKU))) {
+                if (!LINK_IS_ADULT &&
+                    ((this->sheathType == PLAYER_MODELTYPE_SHEATH_16) ||
+                     (this->sheathType == PLAYER_MODELTYPE_SHEATH_17)) &&
                     (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)) {
                     dLists = &sSheathWithSwordDLs[PLAYER_SHIELD_MAX * 4];
                 }
@@ -1448,9 +1423,8 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx**
                 *dList = NULL;
             }
 
-
         } else if (limbIndex == PLAYER_LIMB_WAIST) {
-            
+
             if (!Player_IsCustomLinkModel()) {
                 *dList = ResourceMgr_LoadGfxByName(
                     this->waistDLists[sDListsLodOffset]); // NOTE: This needs to be disabled when using custom
@@ -1467,7 +1441,8 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx**
     return false;
 }
 
-s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                               void* thisx) {
     Player* this = (Player*)thisx;
 
     if (!Player_OverrideLimbDrawGameplayCommon(play, limbIndex, dList, pos, rot, thisx)) {
@@ -1477,7 +1452,9 @@ s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, G
             *dList = sFirstPersonLeftForearmDLs[gSaveContext.linkAge];
         } else if (limbIndex == PLAYER_LIMB_L_HAND) {
             s32 handOutDlIndex = gSaveContext.linkAge;
-            if ((CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) && LINK_IS_ADULT && Player_HoldsSlingshot(this)) {
+            if ((CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+                 CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) &&
+                LINK_IS_ADULT && Player_HoldsSlingshot(this)) {
                 handOutDlIndex = 1;
             }
             *dList = sFirstPersonLeftHandDLs[handOutDlIndex];
@@ -1487,7 +1464,8 @@ s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, G
             *dList = sFirstPersonForearmDLs[gSaveContext.linkAge];
         } else if (limbIndex == PLAYER_LIMB_R_HAND) {
             s32 firstPersonWeaponIndex = gSaveContext.linkAge;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+                CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
                 if (Player_HoldsBow(this)) {
                     firstPersonWeaponIndex = 0;
                 } else if (Player_HoldsSlingshot(this)) {
@@ -1504,7 +1482,8 @@ s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, G
     return false;
 }
 
-s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                            void* thisx) {
     if (!Player_OverrideLimbDrawGameplayCommon(play, limbIndex, dList, pos, rot, thisx)) {
         *dList = NULL;
     }
@@ -1512,8 +1491,7 @@ s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx*
     return false;
 }
 
-u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip,
-                 Vec3f* newBase) {
+u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase) {
     if (weaponInfo->active == 0) {
         if (collider != NULL) {
             Collider_ResetQuadAT(play, &collider->base);
@@ -1588,7 +1566,8 @@ void func_800906D4(PlayState* play, Player* this, Vec3f* newTipPos) {
                               &this->meleeWeaponInfo[0].base);
     }
 
-    if ((this->meleeWeaponState > 0) && ((this->meleeWeaponAnimation < 0x18) || (this->stateFlags2 & PLAYER_STATE2_SPIN_ATTACKING))) {
+    if ((this->meleeWeaponState > 0) &&
+        ((this->meleeWeaponAnimation < 0x18) || (this->stateFlags2 & PLAYER_STATE2_SPIN_ATTACKING))) {
         func_80090480(play, &this->meleeWeaponQuads[0], &this->meleeWeaponInfo[1], &newTipPos[1], &newBasePos[1]);
         func_80090480(play, &this->meleeWeaponQuads[1], &this->meleeWeaponInfo[2], &newTipPos[2], &newBasePos[2]);
     }
@@ -1670,7 +1649,8 @@ void Player_DrawGetItemImpl(PlayState* play, Player* this, Vec3f* refPos, s32 dr
 }
 
 void Player_DrawGetItem(PlayState* play, Player* this) {
-    //if (!this->giObjectLoading || !osRecvMesg(&this->giObjectLoadQueue, NULL, OS_MESG_NOBLOCK)) // OTRTODO: Do something about osRecvMesg here...
+    // if (!this->giObjectLoading || !osRecvMesg(&this->giObjectLoadQueue, NULL, OS_MESG_NOBLOCK)) // OTRTODO: Do
+    // something about osRecvMesg here...
     {
         this->giObjectLoading = false;
         Player_DrawGetItemImpl(play, this, &sGetItemRefPos, ABS(this->unk_862));
@@ -1725,7 +1705,8 @@ void Player_DrawHookshotReticle(PlayState* play, Player* this, f32 hookshotRange
         gSPTexture(OVERLAY_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
         gDPLoadTextureBlock(OVERLAY_DISP++, gLinkAdultHookshotReticleTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
-        if (SurfaceType_IsHookshotSurface(&play->colCtx, colPoly, bgId) && CVarGetInteger(CVAR_ENHANCEMENT("HookshotableReticle"), false)) {
+        if (SurfaceType_IsHookshotSurface(&play->colCtx, colPoly, bgId) &&
+            CVarGetInteger(CVAR_ENHANCEMENT("HookshotableReticle"), false)) {
             const Color_RGBA8 defaultColor = { .r = 0, .g = 255, .b = 0, .a = 255 };
             const Color_RGBA8 color = CVarGetColor(CVAR_COSMETIC("HookshotReticle.Target.Value"), defaultColor);
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, color.r, color.g, color.b, color.a);
@@ -1748,7 +1729,8 @@ f32 sMeleeWeaponLengths[] = {
 };
 
 f32 sSwordTypes[] = {
-    TRAIL_TYPE_REST, TRAIL_TYPE_MASTER_SWORD, TRAIL_TYPE_KOKIRI_SWORD, TRAIL_TYPE_BIGGORON_SWORD, TRAIL_TYPE_REST, TRAIL_TYPE_HAMMER,
+    TRAIL_TYPE_REST,           TRAIL_TYPE_MASTER_SWORD, TRAIL_TYPE_KOKIRI_SWORD,
+    TRAIL_TYPE_BIGGORON_SWORD, TRAIL_TYPE_REST,         TRAIL_TYPE_HAMMER,
 };
 
 Gfx* sBottleDLists[] = { gLinkAdultBottleDL, gLinkChildBottleDL };
@@ -1762,7 +1744,7 @@ Color_RGB8 sBottleColors[] = {
 Vec3f sLeftHandArrowVec3 = { 398.0f, 1419.0f, 244.0f };
 
 BowStringData sBowStringData[] = {
-    { gLinkAdultBowStringDL, { 0.0f, -360.4f, 0.0f } },       // bow
+    { gLinkAdultBowStringDL, { 0.0f, -360.4f, 0.0f } },        // bow
     { gLinkChildSlingshotStringDL, { 606.0f, 236.0f, 0.0f } }, // slingshot
 };
 
@@ -1832,8 +1814,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
             Matrix_RotateZYX(-0x8000, 0, 0x4000, MTXMODE_APPLY);
             Matrix_Scale(1.0f, this->unk_85C, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gLinkChildLinkDekuStickDL);
 
             CLOSE_DISPS(play->state.gfxCtx);
@@ -1844,7 +1825,8 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                 D_80126080.x = 1500.0f;
             } else {
                 D_80126080.x = sMeleeWeaponLengths[Player_GetMeleeWeaponHeld(this)];
-                EffectBlure_ChangeType(Effect_GetByIndex(this->meleeWeaponEffectIndex), sSwordTypes[Player_GetMeleeWeaponHeld(this)]);
+                EffectBlure_ChangeType(Effect_GetByIndex(this->meleeWeaponEffectIndex),
+                                       sSwordTypes[Player_GetMeleeWeaponHeld(this)]);
             }
 
             func_80090A28(this, spE4);
@@ -1854,8 +1836,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
 
             OPEN_DISPS(play->state.gfxCtx);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0);
             gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[(gSaveContext.linkAge)]);
 
@@ -1892,9 +1873,11 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
 
         if (this->rightHandType == PLAYER_MODELTYPE_RH_FF) {
             Matrix_Get(&this->shieldMf);
-        } else if ((this->rightHandType == PLAYER_MODELTYPE_RH_BOW_SLINGSHOT) || (this->rightHandType == PLAYER_MODELTYPE_RH_BOW_SLINGSHOT_2)) {
+        } else if ((this->rightHandType == PLAYER_MODELTYPE_RH_BOW_SLINGSHOT) ||
+                   (this->rightHandType == PLAYER_MODELTYPE_RH_BOW_SLINGSHOT_2)) {
             s32 stringModelToUse = gSaveContext.linkAge;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+                CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
                 stringModelToUse = Player_HoldsSlingshot(this);
             }
             BowStringData* stringData = &sBowStringData[stringModelToUse];
@@ -1930,8 +1913,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                 Matrix_RotateZ(this->unk_858 * -0.2f, MTXMODE_APPLY);
             }
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, stringData->dList);
 
             Matrix_Pop();
@@ -1943,8 +1925,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
         }
 
         if (this->actor.scale.y >= 0.0f) {
-            if ((this->heldItemAction == PLAYER_IA_HOOKSHOT) ||
-                (this->heldItemAction == PLAYER_IA_LONGSHOT)) {
+            if ((this->heldItemAction == PLAYER_IA_HOOKSHOT) || (this->heldItemAction == PLAYER_IA_LONGSHOT)) {
                 Matrix_MultVec3f(&D_80126184, &this->unk_3C8);
 
                 if (heldActor != NULL) {
@@ -1960,16 +1941,16 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                     if (func_8002DD78(this) != 0) {
                         Matrix_Translate(500.0f, 300.0f, 0.0f, MTXMODE_APPLY);
                         Player_DrawHookshotReticle(
-                            play, this, ((this->heldItemAction == PLAYER_IA_HOOKSHOT) ? 38600.0f : 77600.0f) * CVarGetFloat(CVAR_CHEAT("HookshotReachMultiplier"), 1.0f));
+                            play, this,
+                            ((this->heldItemAction == PLAYER_IA_HOOKSHOT) ? 38600.0f : 77600.0f) *
+                                CVarGetFloat(CVAR_CHEAT("HookshotReachMultiplier"), 1.0f));
                     }
                 }
 
-            // #region SOH [Enhancement]            
-            } else if (CVarGetInteger(CVAR_ENHANCEMENT("BowReticle"), 0) && (
-                        (this->heldItemAction == PLAYER_IA_BOW_FIRE) ||
-                        (this->heldItemAction == PLAYER_IA_BOW_ICE) ||
-                        (this->heldItemAction == PLAYER_IA_BOW_LIGHT) ||
-                        (this->heldItemAction == PLAYER_IA_BOW) ||
+                // #region SOH [Enhancement]
+            } else if (CVarGetInteger(CVAR_ENHANCEMENT("BowReticle"), 0) &&
+                       ((this->heldItemAction == PLAYER_IA_BOW_FIRE) || (this->heldItemAction == PLAYER_IA_BOW_ICE) ||
+                        (this->heldItemAction == PLAYER_IA_BOW_LIGHT) || (this->heldItemAction == PLAYER_IA_BOW) ||
                         (this->heldItemAction == PLAYER_IA_SLINGSHOT))) {
                 if (heldActor != NULL) {
                     MtxF sp44;
@@ -1983,13 +1964,15 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                         Player_DrawHookshotReticle(play, this, RETICLE_MAX);
                     }
                 }
-            } else if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0) && (this->heldItemAction == PLAYER_IA_BOOMERANG)) {
+            } else if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0) &&
+                       (this->heldItemAction == PLAYER_IA_BOOMERANG)) {
                 if (Player_HoldsBoomerang(this)) {
                     if (LINK_IS_ADULT) {
                         Matrix_RotateZYX(BoomerangViewAdult.x, BoomerangViewAdult.y, BoomerangViewAdult.z,
                                          MTXMODE_APPLY);
                     } else {
-                        Matrix_RotateZYX(BoomerangViewChild.x, BoomerangViewChild.y, BoomerangViewChild.z, MTXMODE_APPLY);
+                        Matrix_RotateZYX(BoomerangViewChild.x, BoomerangViewChild.y, BoomerangViewChild.z,
+                                         MTXMODE_APPLY);
                     }
 
                     if (Player_AimsBoomerang(this)) {
@@ -1997,11 +1980,12 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                         Player_DrawHookshotReticle(play, this, RETICLE_MAX);
                     }
                 }
-            // #endregion
+                // #endregion
             }
 
             if ((this->unk_862 != 0) || ((func_8002DD6C(this) == 0) && (heldActor != NULL))) {
-                if (!(this->stateFlags1 & PLAYER_STATE1_GETTING_ITEM) && (this->unk_862 != 0) && (this->exchangeItemId != EXCH_ITEM_NONE)) {
+                if (!(this->stateFlags1 & PLAYER_STATE1_GETTING_ITEM) && (this->unk_862 != 0) &&
+                    (this->exchangeItemId != EXCH_ITEM_NONE)) {
                     Math_Vec3f_Copy(&sGetItemRefPos, &this->leftHandPos);
                 } else {
                     sGetItemRefPos.x = (this->bodyPartsPos[15].x + this->leftHandPos.x) * 0.5f;
@@ -2016,7 +2000,8 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
         }
     } else if (this->actor.scale.y >= 0.0f) {
         if (limbIndex == PLAYER_LIMB_SHEATH) {
-            if ((this->rightHandType != PLAYER_MODELTYPE_RH_SHIELD) && (this->rightHandType != PLAYER_MODELTYPE_RH_FF)) {
+            if ((this->rightHandType != PLAYER_MODELTYPE_RH_SHIELD) &&
+                (this->rightHandType != PLAYER_MODELTYPE_RH_FF)) {
                 if (Player_IsChildWithHylianShield(this)) {
                     Player_UpdateShieldCollider(play, this, &this->shieldQuad, sSheathLimbModelShieldQuadVertices);
                 }
@@ -2052,13 +2037,13 @@ u32 func_80091738(PlayState* play, u8* segment, SkelAnime* skelAnime) {
     gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
     gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800);
 
-    SkelAnime_InitLink(play, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_link_normal_wait, 9,
-                       ptr, ptr, PLAYER_LIMB_MAX);
+    SkelAnime_InitLink(play, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_link_normal_wait, 9, ptr,
+                       ptr, PLAYER_LIMB_MAX);
 
     return size + 0x8800 + 0x90;
 }
 
-u8 sPauseModelGroupBySword[] = { 
+u8 sPauseModelGroupBySword[] = {
     PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_SWORD_KOKIRI
     PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_SWORD_MASTER
     PLAYER_MODELGROUP_BGS,              // PLAYER_SWORD_BIGGORON
@@ -2068,13 +2053,15 @@ s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Ve
     u8* playerSwordAndShield = arg;
     // SOH: Ensure positive value from playerSwordAndShield[] to avoid OOB array access.
     //      This can occur in the case where playerSwordAndShield[0] is PLAYER_SWORD_NONE
-    u8 modelGroup = sPauseModelGroupBySword[playerSwordAndShield[0] > 0 ? playerSwordAndShield[0] - PLAYER_SWORD_KOKIRI : 0];
+    u8 modelGroup =
+        sPauseModelGroupBySword[playerSwordAndShield[0] > 0 ? playerSwordAndShield[0] - PLAYER_SWORD_KOKIRI : 0];
     s32 type;
     s32 dListOffset = 0;
     Gfx** dLists;
     size_t ptrSize = sizeof(uint32_t);
 
-    if ((modelGroup == PLAYER_MODELGROUP_SWORD_AND_SHIELD) && !LINK_IS_ADULT && (playerSwordAndShield[1] == PLAYER_SHIELD_HYLIAN)) {
+    if ((modelGroup == PLAYER_MODELGROUP_SWORD_AND_SHIELD) && !LINK_IS_ADULT &&
+        (playerSwordAndShield[1] == PLAYER_SHIELD_HYLIAN)) {
         modelGroup = PLAYER_MODELGROUP_CHILD_HYLIAN_SHIELD;
     }
 
@@ -2082,7 +2069,7 @@ s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Ve
         type = gPlayerModelTypes[modelGroup][PLAYER_MODELGROUPENTRY_LEFT_HAND];
         sLeftHandType = type;
 
-        // SOH: Handle unexpected swordless case. Previously OOB array access is avoided, but we want the 
+        // SOH: Handle unexpected swordless case. Previously OOB array access is avoided, but we want the
         //      hand model-type to be set to open (otherwise it is set to holding sword model-type)
         if (playerSwordAndShield[0] == PLAYER_SWORD_NONE) {
             type = PLAYER_MODELTYPE_LH_OPEN;
@@ -2104,7 +2091,7 @@ s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Ve
         }
     } else if (limbIndex == PLAYER_LIMB_WAIST) {
         type = gPlayerModelTypes[modelGroup][PLAYER_MODELGROUPENTRY_WAIST];
-        
+
         if (Player_IsCustomLinkModel()) {
             return 0;
         }
@@ -2224,8 +2211,11 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject,
     playerSwordAndShield[0] = sword;
     playerSwordAndShield[1] = shield;
 
-    Matrix_SetTranslateRotateYXZ(pos->x - ((CVarGetInteger(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"), 0) && LINK_AGE_IN_YEARS == YEARS_ADULT) ? 25 : 0),
-                                 pos->y - (CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0) ? 16 : 0), pos->z, rot);
+    Matrix_SetTranslateRotateYXZ(
+        pos->x - ((CVarGetInteger(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"), 0) && LINK_AGE_IN_YEARS == YEARS_ADULT)
+                      ? 25
+                      : 0),
+        pos->y - (CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0) ? 16 : 0), pos->z, rot);
     Matrix_Scale(scale * (mirrorWorldActive ? -1 : 1), scale, scale, MTXMODE_APPLY);
 
     gSPSegment(POLY_OPA_DISP++, 0x04, gameplayKeep);
@@ -2246,7 +2236,7 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject,
 
     if (CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0)) {
         Matrix_SetTranslateRotateYXZ(pos->x - (LINK_AGE_IN_YEARS == YEARS_ADULT ? 25 : 0),
-                                      pos->y + 280 + (LINK_AGE_IN_YEARS == YEARS_ADULT ? 48 : 0), pos->z, rot);
+                                     pos->y + 280 + (LINK_AGE_IN_YEARS == YEARS_ADULT ? 48 : 0), pos->z, rot);
         Matrix_Scale(scale * (mirrorWorldActive ? -1 : 1), scale * 1, scale * 1, MTXMODE_APPLY);
 
         Pause_DrawTriforceSpot(play, 1);
@@ -2266,8 +2256,8 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject,
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale,
-                   s32 sword, s32 tunic, s32 shield, s32 boots) {
+void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, s32 sword,
+                      s32 tunic, s32 shield, s32 boots) {
     Input* p1Input = &play->state.input[0];
     Vec3f eye = { 0.0f, 0.0f, -400.0f };
     Vec3f at = { 0.0f, 0.0f, 0.0f };
@@ -2279,12 +2269,14 @@ void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f*
     gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
     gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800);
 
-    uintptr_t* PauseMenuAnimSet[4] = {
-        // IDLE                       // Two Handed                       // No shield                       // Kid Hylian Shield
-        gPlayerAnim_link_normal_wait, gPlayerAnim_link_fighter_wait_long, gPlayerAnim_link_normal_wait_free, gPlayerAnim_link_normal_wait_free
+    uintptr_t* PauseMenuAnimSet[4] = { // IDLE                       // Two Handed                       // No shield //
+                                       // Kid Hylian Shield
+                                       gPlayerAnim_link_normal_wait, gPlayerAnim_link_fighter_wait_long,
+                                       gPlayerAnim_link_normal_wait_free, gPlayerAnim_link_normal_wait_free
     };
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"), 0) || CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"), 0) ||
+        CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0)) {
         uintptr_t anim = 0; // Initialise anim
 
         s16 EquipedStance;
diff --git a/soh/src/code/z_rcp.c b/soh/src/code/z_rcp.c
index 22e2fe2be3..8ccd74f827 100644
--- a/soh/src/code/z_rcp.c
+++ b/soh/src/code/z_rcp.c
@@ -1520,7 +1520,8 @@ void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
         gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL);
         gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2);
         gDPSetFillColor(POLY_OPA_DISP++, (GPACK_ZDZ(G_MAXFBZ, 0) << 16) | GPACK_ZDZ(G_MAXFBZ, 0));
-        gDPFillWideRectangle(POLY_OPA_DISP++, OTRGetRectDimensionFromLeftEdge(0), letterboxSize, OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - letterboxSize - 1);
+        gDPFillWideRectangle(POLY_OPA_DISP++, OTRGetRectDimensionFromLeftEdge(0), letterboxSize,
+                             OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - letterboxSize - 1);
         gDPPipeSync(POLY_OPA_DISP++);
 
         // Fill the whole screen with the base color
@@ -1529,7 +1530,8 @@ void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
         gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL);
         gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2);
         gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
-        gDPFillWideRectangle(POLY_OPA_DISP++, OTRGetRectDimensionFromLeftEdge(0), letterboxSize, OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - letterboxSize - 1);
+        gDPFillWideRectangle(POLY_OPA_DISP++, OTRGetRectDimensionFromLeftEdge(0), letterboxSize,
+                             OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - letterboxSize - 1);
         gDPPipeSync(POLY_OPA_DISP++);
 
         // Draw the letterbox if applicable (uses the same color as the screen base)
@@ -1538,8 +1540,10 @@ void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
             gDPSetCycleType(OVERLAY_DISP++, G_CYC_FILL);
             gDPSetRenderMode(OVERLAY_DISP++, G_RM_NOOP, G_RM_NOOP2);
             gDPSetFillColor(OVERLAY_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
-            gDPFillWideRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromLeftEdge(0), 0, OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), letterboxSize - 1);
-            gDPFillWideRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromLeftEdge(0), gScreenHeight - letterboxSize, OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - 1);
+            gDPFillWideRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromLeftEdge(0), 0,
+                                 OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), letterboxSize - 1);
+            gDPFillWideRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromLeftEdge(0), gScreenHeight - letterboxSize,
+                                 OTRGetRectDimensionFromRightEdge(gScreenWidth - 1), gScreenHeight - 1);
             gDPPipeSync(OVERLAY_DISP++);
         }
     }
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index fdd8f78f88..60fa3f0ffc 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -116,13 +116,13 @@ void func_80095D04(PlayState* play, Room* room, u32 flags) {
     OPEN_DISPS(play->state.gfxCtx);
     if (flags & 1) {
         func_800342EC(&D_801270A0, play);
-        //gSPSegment(POLY_OPA_DISP++, 0x03, room->segment);
+        // gSPSegment(POLY_OPA_DISP++, 0x03, room->segment);
         func_80093C80(play);
         gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD);
     }
     if (flags & 2) {
         func_8003435C(&D_801270A0, play);
-        //gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
+        // gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD);
     }
@@ -139,8 +139,7 @@ void func_80095D04(PlayState* play, Room* room, u32 flags) {
         sp90.y = polygonDlist->pos.y;
         sp90.z = polygonDlist->pos.z;
         SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sp90, &sp84, &sp80);
-        if (-(f32)polygonDlist->unk_06 < sp84.z)
-        {
+        if (-(f32)polygonDlist->unk_06 < sp84.z) {
             temp_f2 = sp84.z - polygonDlist->unk_06;
             if (temp_f2 < play->lightCtx.fogFar) {
                 phi_v0 = spB4;
@@ -184,8 +183,7 @@ void func_80095D04(PlayState* play, Room* room, u32 flags) {
         Gfx* temp2;
 
         polygonDlist = spB4->unk_00;
-        if (iREG(86) != 0)
-        {
+        if (iREG(86) != 0) {
             temp = sp78;
             for (phi_v1 = 0; phi_v1 < polygon2->num; phi_v1++, temp++) {
                 if (polygonDlist == temp) {
@@ -193,8 +191,7 @@ void func_80095D04(PlayState* play, Room* room, u32 flags) {
                 }
             }
 
-            if (((iREG(86) == 1) && (iREG(89) >= sp9C)) || ((iREG(86) == 2) && (iREG(89) == sp9C)))
-            {
+            if (((iREG(86) == 1) && (iREG(89) >= sp9C)) || ((iREG(86) == 2) && (iREG(89) == sp9C))) {
                 if (flags & 1) {
                     temp2 = polygonDlist->opa;
                     if (temp2 != NULL) {
@@ -238,7 +235,7 @@ s32 swapAndConvertJPEG(void* data) {
     if (BE32SWAP(*(u32*)data) == JPEG_MARKER) {
         size_t size = 320 * 240 * 2;
 
-        char *decodedJpeg = ResourceMgr_LoadJPEG(data, size);
+        char* decodedJpeg = ResourceMgr_LoadJPEG(data, size);
 
         osSyncPrintf("Expanding jpeg data\n");
         osSyncPrintf("Work buffer address (Z buffer) %08x\n", gZBuffer);
@@ -257,7 +254,6 @@ s32 swapAndConvertJPEG(void* data) {
     return 0;
 }
 
-
 void Room_DrawBackground2D(Gfx** gfxP, void* tex, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 tlutMode,
                            u16 tlutCount, f32 offsetX, f32 offsetY) {
     Gfx* gfx = *gfxP;
@@ -285,7 +281,7 @@ void Room_DrawBackground2D(Gfx** gfxP, void* tex, void* tlut, u16 width, u16 hei
     ResourceMgr_UnloadOriginalWhenAltExists((char*)tex);
 
     if (ResourceMgr_ResourceIsBackground((char*)tex)) {
-        char* blob = (char*)ResourceGetDataByName((char *)tex);
+        char* blob = (char*)ResourceGetDataByName((char*)tex);
         swapAndConvertJPEG(blob);
         bg->b.imagePtr = (uintptr_t)blob;
     }
@@ -318,10 +314,9 @@ void Room_DrawBackground2D(Gfx** gfxP, void* tex, void* tlut, u16 width, u16 hei
         gDPSetOtherMode(gfx++, tlutMode | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_COPY | G_PM_NPRIMITIVE,
                         G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2);
 
-        gDPLoadMultiTile(gfx++, bg->b.imagePtr, 0,
-            G_TX_RENDERTILE, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, 0, 0, 0 + 31,
-            0 + 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
-            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+        gDPLoadMultiTile(gfx++, bg->b.imagePtr, 0, G_TX_RENDERTILE, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, 0, 0, 0 + 31,
+                         0 + 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                         G_TX_NOMASK, G_TX_NOLOD);
 
         gSPBgRectCopy(gfx++, bg);
     } else {
@@ -384,9 +379,10 @@ void func_80096680(PlayState* play, Room* room, u32 flags) {
                 spA8 = POLY_OPA_DISP;
                 Camera_GetSkyboxOffset(&sp60, camera);
                 Room_DrawBackground2D(&spA8, polygon1->single.source, polygon1->single.tlut, polygon1->single.width,
-                              polygon1->single.height, polygon1->single.fmt, polygon1->single.siz,
-                              polygon1->single.mode0, polygon1->single.tlutCount,
-                              (sp60.x + sp60.z) * 1.2f + sp60.y * 0.6f, sp60.y * 2.4f + (sp60.x + sp60.z) * 0.3f);
+                                      polygon1->single.height, polygon1->single.fmt, polygon1->single.siz,
+                                      polygon1->single.mode0, polygon1->single.tlutCount,
+                                      (sp60.x + sp60.z) * 1.2f + sp60.y * 0.6f,
+                                      sp60.y * 2.4f + (sp60.x + sp60.z) * 0.3f);
                 POLY_OPA_DISP = spA8;
             }
 
@@ -414,9 +410,10 @@ BgImage* func_80096A74(PolygonType1* polygon1, PlayState* play) {
 
     camera = GET_ACTIVE_CAM(play);
     camId = camera->camDataIdx;
-    if (camId == -1 && (CVarGetInteger(CVAR_CHEAT("NoRestrictItems"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)))) {
+    if (camId == -1 && (CVarGetInteger(CVAR_CHEAT("NoRestrictItems"), 0) ||
+                        (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)))) {
         // This prevents a crash when using items that change the
-        // camera (such as din's fire), voiding out or dying on 
+        // camera (such as din's fire), voiding out or dying on
         // scenes with prerendered backgrounds.
         return NULL;
     }
@@ -484,9 +481,10 @@ void func_80096B6C(PlayState* play, Room* room, u32 flags) {
                 Vec3f sp5C;
                 spA8 = POLY_OPA_DISP;
                 Camera_GetSkyboxOffset(&sp5C, camera);
-                Room_DrawBackground2D(&spA8, bgImage->source, bgImage->tlut, bgImage->width, bgImage->height, bgImage->fmt,
-                              bgImage->siz, bgImage->mode0, bgImage->tlutCount,
-                              (sp5C.x + sp5C.z) * 1.2f + sp5C.y * 0.6f, sp5C.y * 2.4f + (sp5C.x + sp5C.z) * 0.3f);
+                Room_DrawBackground2D(&spA8, bgImage->source, bgImage->tlut, bgImage->width, bgImage->height,
+                                      bgImage->fmt, bgImage->siz, bgImage->mode0, bgImage->tlutCount,
+                                      (sp5C.x + sp5C.z) * 1.2f + sp5C.y * 0.6f,
+                                      sp5C.y * 2.4f + (sp5C.x + sp5C.z) * 0.3f);
                 POLY_OPA_DISP = spA8;
             }
 
@@ -598,7 +596,8 @@ s32 func_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomNum) {
         assert(roomNum < play->numRooms);
 
         size = play->roomList[roomNum].vromEnd - play->roomList[roomNum].vromStart;
-        roomCtx->unk_34 = (void*)ALIGN16((intptr_t)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7));
+        roomCtx->unk_34 =
+            (void*)ALIGN16((intptr_t)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7));
 
         osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1);
         DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, play->roomList[roomNum].vromStart, size, 0,
@@ -614,7 +613,6 @@ s32 func_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomNum) {
 s32 func_800973FC(PlayState* play, RoomContext* roomCtx) {
     return OTRfunc_800973FC(play, roomCtx);
 
-
     if (roomCtx->status == 1) {
         if (!osRecvMesg(&roomCtx->loadQueue, NULL, OS_MESG_NOBLOCK)) {
             roomCtx->status = 0;
@@ -635,8 +633,7 @@ s32 func_800973FC(PlayState* play, RoomContext* roomCtx) {
 }
 
 void Room_Draw(PlayState* play, Room* room, u32 flags) {
-    if (room->segment != NULL)
-    {
+    if (room->segment != NULL) {
         gSegments[3] = VIRTUAL_TO_PHYSICAL(room->segment);
         assert(room->meshHeader->base.type < ARRAY_COUNTU(sRoomDrawHandlers));
         sRoomDrawHandlers[room->meshHeader->base.type](play, room, flags);
@@ -646,7 +643,7 @@ void Room_Draw(PlayState* play, Room* room, u32 flags) {
 void func_80097534(PlayState* play, RoomContext* roomCtx) {
     roomCtx->prevRoom.num = -1;
     roomCtx->prevRoom.segment = NULL;
-    func_80031B14(play, &play->actorCtx); //kills all actors without room num set to -1
+    func_80031B14(play, &play->actorCtx); // kills all actors without room num set to -1
     Actor_SpawnTransitionActors(play, &play->actorCtx);
     Map_InitRoomData(play, roomCtx->curRoom.num);
     if (!((play->sceneNum >= SCENE_HYRULE_FIELD) && (play->sceneNum <= SCENE_LON_LON_RANCH))) {
@@ -657,7 +654,7 @@ void func_80097534(PlayState* play, RoomContext* roomCtx) {
     gSaveContext.ship.stats.sceneTimestamps[idx].scene = gSaveContext.ship.stats.sceneNum;
     gSaveContext.ship.stats.sceneTimestamps[idx].room = gSaveContext.ship.stats.roomNum;
     gSaveContext.ship.stats.sceneTimestamps[idx].roomTime = gSaveContext.ship.stats.roomTimer / 2;
-    gSaveContext.ship.stats.sceneTimestamps[idx].isRoom = 
+    gSaveContext.ship.stats.sceneTimestamps[idx].isRoom =
         gPlayState->sceneNum == gSaveContext.ship.stats.sceneTimestamps[idx].scene &&
         gPlayState->roomCtx.curRoom.num != gSaveContext.ship.stats.sceneTimestamps[idx].room;
     gSaveContext.ship.stats.tsIdx++;
diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c
index 2ce88cc046..c138bd4cf5 100644
--- a/soh/src/code/z_scene.c
+++ b/soh/src/code/z_scene.c
@@ -19,8 +19,8 @@ s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) {
     assert(((objectCtx->num < OBJECT_EXCHANGE_BANK_MAX) &&
             (((uintptr_t)objectCtx->status[objectCtx->num].segment + size) < (uintptr_t)objectCtx->spaceEnd)));
 
-    DmaMgr_SendRequest1(objectCtx->status[objectCtx->num].segment, gObjectTable[objectId].vromStart, size,
-                        __FILE__, __LINE__);
+    DmaMgr_SendRequest1(objectCtx->status[objectCtx->num].segment, gObjectTable[objectId].vromStart, size, __FILE__,
+                        __LINE__);
 
     if (objectCtx->num < OBJECT_EXCHANGE_BANK_MAX - 1) {
         objectCtx->status[objectCtx->num + 1].segment =
@@ -33,7 +33,6 @@ s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) {
     return objectCtx->num - 1;
 }
 
-
 // SOH [Port] Track when objects are first loaded for a scene
 static u8 sObjectFirstUpdateSkippedForScene = false;
 
@@ -73,8 +72,7 @@ void Object_InitBank(PlayState* play, ObjectContext* objectCtx) {
     osSyncPrintf("オブジェクト入れ替えバンク情報 %8.3fKB\n", spaceSize / 1024.0f);
     osSyncPrintf(VT_RST);
 
-    objectCtx->spaceStart = objectCtx->status[0].segment =
-        GAMESTATE_ALLOC_MC(&play->state, spaceSize);
+    objectCtx->spaceStart = objectCtx->status[0].segment = GAMESTATE_ALLOC_MC(&play->state, spaceSize);
     objectCtx->spaceEnd = (void*)((uintptr_t)objectCtx->spaceStart + spaceSize);
 
     objectCtx->mainKeepIndex = Object_Spawn(objectCtx, OBJECT_GAMEPLAY_KEEP);
@@ -110,17 +108,16 @@ void Object_UpdateBank(ObjectContext* objectCtx) {
                 status->id = -status->id;
             }
             */
-           status->id = -status->id;
+            status->id = -status->id;
         }
         status++;
     }
-
 }
 
 s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId) {
     s32 i;
 
-    //return 0;
+    // return 0;
 
     for (i = 0; i < objectCtx->num; i++) {
         if (ABS(objectCtx->status[i].id) == objectId) {
@@ -202,8 +199,8 @@ s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd) {
 }
 
 void Scene_CommandSpawnList(PlayState* play, SceneCmd* cmd) {
-    ActorEntry* linkEntry = play->linkActorEntry = (ActorEntry*)SEGMENTED_TO_VIRTUAL(cmd->spawnList.segment) +
-                                                        play->setupEntranceList[play->curSpawn].spawn;
+    ActorEntry* linkEntry = play->linkActorEntry =
+        (ActorEntry*)SEGMENTED_TO_VIRTUAL(cmd->spawnList.segment) + play->setupEntranceList[play->curSpawn].spawn;
     s16 linkObjectId;
 
     play->linkAgeOnLoad = ((void)0, gSaveContext.linkAge);
@@ -510,11 +507,13 @@ void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*) = {
     Scene_CommandMiscSettings,        // SCENE_CMD_ID_MISC_SETTINGS
 };
 
+// clang-format off
 RomFile sNaviMsgFiles[] = {
     ROM_FILE(text/elf_message_field/elf_message_field),
     ROM_FILE(text/elf_message_ydan/elf_message_ydan),
     ROM_FILE_UNSET,
 };
+// clang-format on
 
 s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
 
@@ -522,7 +521,7 @@ u32 gObjectTableSize = ARRAY_COUNT(gObjectTable);
 
 // Object linker symbol declarations (used in the table below)
 #define DEFINE_OBJECT(name, _1) DECLARE_ROM_SEGMENT(name)
-#define DEFINE_OBJECT_NULL(_0, _1) 
+#define DEFINE_OBJECT_NULL(_0, _1)
 #define DEFINE_OBJECT_UNSET(_0)
 
 //#include "tables/object_table.h"
diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c
index a85965a82c..7c28253fd8 100644
--- a/soh/src/code/z_scene_table.c
+++ b/soh/src/code/z_scene_table.c
@@ -59,13 +59,13 @@ EntranceInfo gEntranceTable[] = {
 //    { { 0, 0, #name }, (u32)0, 0, 0, unk_10, config, unk_12, 0 }
 
 #define DEFINE_SCENE(name, title, _2, config, unk_10, unk_12) \
-    { { 0, 0, #name }, {0, 0, #title}, unk_10, config, unk_12, 0 },
+    { { 0, 0, #name }, { 0, 0, #title }, unk_10, config, unk_12, 0 },
 
 // Handle `none` as a special case for scenes without a title card
 #define none ""
 
 SceneTableEntry gSceneTable[] = {
-    #include "tables/scene_table.h"
+#include "tables/scene_table.h"
 };
 
 #undef none
@@ -128,8 +128,8 @@ void func_800995DC(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
-                                32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
@@ -182,7 +182,8 @@ void func_80099878(PlayState* play) {
     gameplayFrames = play->gameplayFrames;
     if (ResourceMgr_IsGameMasterQuest()) {
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDCEntranceTextures_MQ[gSaveContext.nightFlag]));
-        gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sDCLavaFloorTextures_MQ[(s32)(gameplayFrames & 14) >> 1]));
+        gSPSegment(POLY_OPA_DISP++, 0x09,
+                   SEGMENTED_TO_VIRTUAL(sDCLavaFloorTextures_MQ[(s32)(gameplayFrames & 14) >> 1]));
     } else {
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDCEntranceTextures[gSaveContext.nightFlag]));
         gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sDCLavaFloorTextures[(s32)(gameplayFrames & 14) >> 1]));
@@ -286,11 +287,10 @@ void func_8009A45C(PlayState* play) {
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
-                                32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
-    gSPSegment(
-        POLY_OPA_DISP++, 0x0A,
-        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+    gSPSegment(POLY_OPA_DISP++, 0x0A,
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_OPA_DISP++, 0x0B, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0C,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0,
@@ -320,11 +320,11 @@ void func_8009A798(PlayState* play) {
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
 
     gSPSegment(POLY_OPA_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128,
-                                (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 256, 32,
+                                64, 1, 0, 0, 32, 128));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -343,11 +343,11 @@ void func_8009A9DC(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32,
-                                64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -384,8 +384,8 @@ void func_8009ACA8(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
 
     gDPPipeSync(POLY_OPA_DISP++);
@@ -470,54 +470,54 @@ void func_8009B0FC(PlayState* play) {
 
     if (spB0 == 1) {
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, spAC));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, spAC));
     } else if (spB0 < 1) {
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 255));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 255));
     } else {
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 160));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 160));
     }
 
     if (spB0 == 2) {
         gSPSegment(POLY_OPA_DISP++, 0x09,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, spAC));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, spAC));
     } else if (spB0 < 2) {
         gSPSegment(POLY_OPA_DISP++, 0x09,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 255));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 255));
     } else {
         gSPSegment(POLY_OPA_DISP++, 0x09,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 160));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 160));
     }
 
     if (spB0 != 0) {
         gSPSegment(POLY_OPA_DISP++, 0x0A,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 160));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 160));
         gSPSegment(POLY_OPA_DISP++, 0x0B,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 180));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 180));
     } else {
         gSPSegment(POLY_OPA_DISP++, 0x0A,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0,
-                                            32, 32, 0, 0, 0, 160 + (s32)((spAC / 200.0f) * 95.0f)));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32,
+                                            32, 0, 0, 0, 160 + (s32)((spAC / 200.0f) * 95.0f)));
         gSPSegment(POLY_OPA_DISP++, 0x0B,
-                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
-                                            0, 0, 0, 185 + (s32)((spAC / 200.0f) * 70.0f)));
+                   Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0,
+                                            0, 185 + (s32)((spAC / 200.0f) * 70.0f)));
     }
 
     gSPSegment(POLY_XLU_DISP++, 0x0C,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1,
-                                        0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 128));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0,
+                                        127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 128));
     gSPSegment(POLY_XLU_DISP++, 0x0D,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1,
-                                        gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 128));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, gameplayFrames * 4, 0,
+                                        32, 32, 0, 0, 0, 128));
 
     { s32 pad[2]; }
 
@@ -566,12 +566,11 @@ void func_8009BAA4(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
 
     if (play->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_DAY) {
-        gSPSegment(POLY_XLU_DISP++, 0x09,
-                   Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64));
+        gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64));
     }
 
     gDPPipeSync(POLY_OPA_DISP++);
@@ -595,17 +594,15 @@ void func_8009BC44(PlayState* play) {
     gameplayFrames = play->gameplayFrames;
 
     if (play->sceneNum == SCENE_OUTSIDE_GANONS_CASTLE) {
-        gSPSegment(POLY_XLU_DISP++, 0x09,
-                   Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64));
+        gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64));
         gSPSegment(POLY_XLU_DISP++, 0x08,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0,
                                     (gameplayFrames * 1) % 256, 64, 64));
     }
 
     gSPSegment(POLY_OPA_DISP++, 0x0B,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128,
-                                (gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128,
-                                (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32,
+                                32, 1, (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -673,7 +670,8 @@ void func_8009C0AC(PlayState* play) {
 
     if (Flags_GetSwitch(play, 0x37)) {
         if ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-            (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) {
+            (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+            (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) {
             func_8009BEEC(play);
         }
     }
@@ -697,11 +695,11 @@ void func_8009C3EC(PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sIceCavernEntranceTextures[gSaveContext.nightFlag]));
     }
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     { s32 pad[2]; }
 
@@ -751,10 +749,9 @@ void func_8009C8B8(PlayState* play) {
     gSPSegment(POLY_OPA_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
-    gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TexScroll(play->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+    gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -773,8 +770,8 @@ void func_8009CAC0(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -803,11 +800,11 @@ void func_8009CC00(PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGTGEntranceTextures[gSaveContext.nightFlag]));
     }
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     { s32 pad[2]; }
 
@@ -847,10 +844,9 @@ void func_8009CF84(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScrollPrimColor(play->state.gfxCtx, 0, 127 - gameplayFrames % 128,
-                                         (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128,
-                                         (gameplayFrames * 1) % 128, 32, 32, 255, 255, 255,
-                                         play->roomCtx.unk_74[0] + 127));
+               Gfx_TwoTexScrollPrimColor(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128,
+                                         32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 255, 255,
+                                         255, play->roomCtx.unk_74[0] + 127));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -868,14 +864,11 @@ void func_8009D0E8(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gameplayFrames = play->gameplayFrames;
-    gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TexScroll(play->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32));
+    gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(play->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32));
     gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16));
-    gSPSegment(POLY_OPA_DISP++, 0x0A,
-               Gfx_TexScroll(play->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16));
-    gSPSegment(
-        POLY_XLU_DISP++, 0x0B,
-        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32));
+    gSPSegment(POLY_OPA_DISP++, 0x0A, Gfx_TexScroll(play->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16));
+    gSPSegment(POLY_XLU_DISP++, 0x0B,
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -975,16 +968,17 @@ void func_8009D758(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures_MQ[gSaveContext.nightFlag]));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures_MQ[gSaveContext.nightFlag]));
     } else {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures[gSaveContext.nightFlag]));
     }
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_OPA_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     { s32 pad[2]; }
 
@@ -1009,7 +1003,8 @@ void func_8009D974(PlayState* play) {
     { s32 pad[2]; }
 
     if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures_MQ[gSaveContext.nightFlag]));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures_MQ[gSaveContext.nightFlag]));
     } else {
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures[gSaveContext.nightFlag]));
     }
@@ -1028,11 +1023,11 @@ void func_8009DA30(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1093,14 +1088,14 @@ void func_8009DE78(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1126,11 +1121,11 @@ void func_8009E0B8(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1142,7 +1137,8 @@ void func_8009E0B8(PlayState* play) {
         spA3 = 255 - (u8)play->roomCtx.unk_74[0];
     } else if (gSaveContext.sceneSetupIndex == 6) {
         spA0 = play->roomCtx.unk_74[0] + 500;
-    } else if (((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) && (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD))) {
+    } else if (((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) &&
+               (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD))) {
         spA0 = 2150;
     }
 
@@ -1158,8 +1154,8 @@ void func_8009E0B8(PlayState* play) {
     gSPEndDisplayList(displayListHead);
 
     gSPSegment(POLY_OPA_DISP++, 0x0C,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (s16)(-play->roomCtx.unk_74[0] * 0.02f), 32, 16, 1,
-                                0, (s16)(-play->roomCtx.unk_74[0] * 0.02f), 32, 16));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (s16)(-play->roomCtx.unk_74[0] * 0.02f), 32, 16, 1, 0,
+                                (s16)(-play->roomCtx.unk_74[0] * 0.02f), 32, 16));
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -1170,17 +1166,18 @@ void func_8009E54C(PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
 
-    if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER))) {
+    if ((gSaveContext.sceneSetupIndex > 3) ||
+        (LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER))) {
         play->roomCtx.unk_74[0] = 87;
     }
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32,
-                                        32, 0, 0, 0, play->roomCtx.unk_74[0] + 168));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32, 32,
+                                        0, 0, 0, play->roomCtx.unk_74[0] + 168));
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0,
-                                        16, 64, 0, 0, 0, play->roomCtx.unk_74[0] + 168));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, 16,
+                                        64, 0, 0, 0, play->roomCtx.unk_74[0] + 168));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 128);
@@ -1258,9 +1255,8 @@ void func_8009EAD8(PlayState* play) {
     gSPSegment(POLY_XLU_DISP++, 0x0A,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0,
                                 (gameplayFrames * 2) % 128, 32, 32));
-    gSPSegment(
-        POLY_OPA_DISP++, 0x0B,
-        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32));
+    gSPSegment(POLY_OPA_DISP++, 0x0B,
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x0C,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
                                 (gameplayFrames * 1) % 128, 32, 32));
@@ -1284,9 +1280,9 @@ void func_8009EE44(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gameplayFrames = play->gameplayFrames;
-    gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0,
-                                32, 16));
+    gSPSegment(
+        POLY_XLU_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0, 32, 16));
     gSPSegment(POLY_XLU_DISP++, 0x09,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, 1,
                                 gameplayFrames % 128, gameplayFrames % 128, 32, 32));
@@ -1297,7 +1293,7 @@ void func_8009EE44(PlayState* play) {
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
 
-	bool playerHasCojiro = INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO;
+    bool playerHasCojiro = INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO;
     if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE)) {
         playerHasCojiro = Flags_GetRandomizerInf(RAND_INF_ADULT_TRADES_HAS_COJIRO);
     }
@@ -1355,12 +1351,12 @@ void func_8009F270(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gameplayFrames = play->gameplayFrames;
-    gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
-                                32, 32));
-    gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
-                                32, 32));
+    gSPSegment(
+        POLY_OPA_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32));
+    gSPSegment(
+        POLY_XLU_DISP++, 0x09,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1379,11 +1375,11 @@ void func_8009F40C(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1441,9 +1437,9 @@ void func_8009F7D4(PlayState* play) {
     sp6F = (sp6F >> 1) + 192;
     sp6E = (sp6E >> 1) + 192;
 
-    gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
-                                32, 32));
+    gSPSegment(
+        POLY_OPA_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, sp6F, sp6E, 255, 128);
@@ -1467,8 +1463,8 @@ void func_8009F9D0(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
-                                gameplayFrames % 128, 0, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, gameplayFrames % 128,
+                                0, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1516,9 +1512,8 @@ void func_8009FC90(PlayState* play) {
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
                                 127 - gameplayFrames % 128, 0, 32, 32));
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (gameplayFrames * 3) % 128,
-                                127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128,
-                                127 - (gameplayFrames * 3) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 127 - (gameplayFrames * 6) % 128, 32,
+                                32, 1, (gameplayFrames * 6) % 128, 127 - (gameplayFrames * 3) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 64);
@@ -1542,15 +1537,15 @@ void func_8009FE58(PlayState* play) {
     gameplayFrames = play->gameplayFrames;
     if (play->sceneNum == SCENE_JABU_JABU) {
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32,
-                                    32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32, 1,
+                                    127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32));
         gSPSegment(POLY_OPA_DISP++, 0x0B,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0,
                                     255 - (gameplayFrames * 4) % 256, 32, 64));
     } else {
-        gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TexScroll(play->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128,
-                                 (gameplayFrames * 1) % 128, 32, 32));
+        gSPSegment(
+            POLY_OPA_DISP++, 0x08,
+            Gfx_TexScroll(play->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128, (gameplayFrames * 1) % 128, 32, 32));
     }
 
     gDPPipeSync(POLY_OPA_DISP++);
@@ -1568,9 +1563,9 @@ void func_8009FE58(PlayState* play) {
 
         if (play->pauseCtx.state == 0) {
             View_SetDistortionOrientation(&play->view,
-                                 ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_CosS(D_8012A39C),
-                                 ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A39C),
-                                 ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A3A0));
+                                          ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_CosS(D_8012A39C),
+                                          ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A39C),
+                                          ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A3A0));
             View_SetDistortionScale(&play->view, 1.f + (0.79999995f * temp * Math_SinS(D_8012A3A0)),
                                     1.f + (0.39999998f * temp * Math_CosS(D_8012A3A0)),
                                     1.f + (1 * temp * Math_CosS(D_8012A39C)));
@@ -1596,7 +1591,7 @@ void func_8009FE58(PlayState* play) {
                 }
                 break;
         }
-        
+
         if (play->pauseCtx.state == 0) {
             D_8012A398 += 0.15f + (play->roomCtx.unk_74[1] * 0.001f);
         }
@@ -1621,14 +1616,14 @@ void func_800A0334(PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32,
-                                128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPSegment(POLY_OPA_DISP++, 0x0A,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
-                                32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1656,8 +1651,7 @@ void func_800A059C(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gameplayFrames = play->gameplayFrames;
-    gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TexScroll(play->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64));
+    gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(play->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64));
     gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128));
 
     gDPPipeSync(POLY_OPA_DISP++);
diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c
index e91de847b3..a7e93e8c35 100644
--- a/soh/src/code/z_skelanime.c
+++ b/soh/src/code/z_skelanime.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
-#include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define ANIM_INTERP 1
 
@@ -72,8 +72,8 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3
  * Draw all limbs of type `LodLimb` in a given skeleton
  * Near or far display list is specified via `lod`
  */
-void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable,
-                       OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) {
+void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw,
+                       PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) {
     LodLimb* rootLimb;
     s32 pad;
     Gfx* dList;
@@ -115,8 +115,7 @@ void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable,
     }
 
     if (rootLimb->child != LIMB_DONE) {
-        SkelAnime_DrawLimbLod(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                              lod);
+        SkelAnime_DrawLimbLod(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
     }
 
     Matrix_Pop();
@@ -172,15 +171,15 @@ void SkelAnime_DrawFlexLimbLod(PlayState* play, s32 limbIndex, void** skeleton,
         postLimbDraw(play, limbIndex, &limbDList, &rot, arg);
     }
     if (limb->child != LIMB_DONE) {
-        SkelAnime_DrawFlexLimbLod(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                  lod, mtx);
+        SkelAnime_DrawFlexLimbLod(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod,
+                                  mtx);
     }
 
     Matrix_Pop();
 
     if (limb->sibling != LIMB_DONE) {
-        SkelAnime_DrawFlexLimbLod(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                  lod, mtx);
+        SkelAnime_DrawFlexLimbLod(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod,
+                                  mtx);
     }
 }
 
@@ -244,8 +243,8 @@ void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable,
         postLimbDraw(play, 1, &limbDList, &rot, arg);
     }
     if (rootLimb->child != LIMB_DONE) {
-        SkelAnime_DrawFlexLimbLod(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                  lod, &mtx);
+        SkelAnime_DrawFlexLimbLod(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod,
+                                  &mtx);
     }
 
     Matrix_Pop();
@@ -298,14 +297,13 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-// Checks the skeleton header to draw the appropriate skeleton type instead of harcoding the type in the actor's draw function...
+// Checks the skeleton header to draw the appropriate skeleton type instead of harcoding the type in the actor's draw
+// function...
 void SkelAnime_DrawSkeletonOpa(PlayState* play, SkelAnime* skelAnime, OverrideLimbDrawOpa overrideLimbDraw,
-                           PostLimbDrawOpa postLimbDraw, void* arg) {   
+                               PostLimbDrawOpa postLimbDraw, void* arg) {
     if (skelAnime->skeletonHeader->skeletonType == SKELANIME_TYPE_NORMAL) {
         SkelAnime_DrawOpa(play, skelAnime->skeleton, skelAnime->jointTable, overrideLimbDraw, postLimbDraw, arg);
-    } 
-    else if (skelAnime->skeletonHeader->skeletonType == SKELANIME_TYPE_FLEX) 
-    {
+    } else if (skelAnime->skeletonHeader->skeletonType == SKELANIME_TYPE_FLEX) {
         FlexSkeletonHeader* flexHeader = (FlexSkeletonHeader*)skelAnime->skeletonHeader;
         SkelAnime_DrawFlexOpa(play, skelAnime->skeleton, skelAnime->jointTable, flexHeader->dListCount,
                               overrideLimbDraw, postLimbDraw, arg);
@@ -313,14 +311,14 @@ void SkelAnime_DrawSkeletonOpa(PlayState* play, SkelAnime* skelAnime, OverrideLi
 }
 
 Gfx* SkelAnime_DrawSkeleton2(PlayState* play, SkelAnime* skelAnime, OverrideLimbDrawOpa overrideLimbDraw,
-                                PostLimbDrawOpa postLimbDraw, void* arg, Gfx* gfx) 
-{
+                             PostLimbDrawOpa postLimbDraw, void* arg, Gfx* gfx) {
     if (skelAnime->skeletonHeader->skeletonType == SKELANIME_TYPE_NORMAL) {
-        return SkelAnime_Draw(play, skelAnime->skeleton, skelAnime->jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
+        return SkelAnime_Draw(play, skelAnime->skeleton, skelAnime->jointTable, overrideLimbDraw, postLimbDraw, arg,
+                              gfx);
     } else if (skelAnime->skeletonHeader->skeletonType == SKELANIME_TYPE_FLEX) {
         FlexSkeletonHeader* flexHeader = (FlexSkeletonHeader*)skelAnime->skeletonHeader;
         return SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, flexHeader->dListCount,
-                              overrideLimbDraw, postLimbDraw, arg, gfx);
+                                  overrideLimbDraw, postLimbDraw, arg, gfx);
     }
 
     return gfx;
@@ -329,8 +327,8 @@ Gfx* SkelAnime_DrawSkeleton2(PlayState* play, SkelAnime* skelAnime, OverrideLimb
 /**
  * Draw all limbs of type `StandardLimb` in a given skeleton to the polyOpa buffer
  */
-void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable,
-                       OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg) {
+void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw,
+                       PostLimbDrawOpa postLimbDraw, void* arg) {
     StandardLimb* rootLimb;
     s32 pad;
     Gfx* dList;
@@ -587,15 +585,13 @@ Gfx* SkelAnime_DrawLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec3s*
     }
 
     if (limb->child != LIMB_DONE) {
-        gfx =
-            SkelAnime_DrawLimb(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
+        gfx = SkelAnime_DrawLimb(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
     }
 
     Matrix_Pop();
 
     if (limb->sibling != LIMB_DONE) {
-        gfx = SkelAnime_DrawLimb(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                 gfx);
+        gfx = SkelAnime_DrawLimb(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
     }
 
     return gfx;
@@ -645,8 +641,7 @@ Gfx* SkelAnime_Draw(PlayState* play, void** skeleton, Vec3s* jointTable, Overrid
     }
 
     if (rootLimb->child != LIMB_DONE) {
-        gfx = SkelAnime_DrawLimb(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                 gfx);
+        gfx = SkelAnime_DrawLimb(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
     }
 
     Matrix_Pop();
@@ -693,15 +688,15 @@ Gfx* SkelAnime_DrawFlexLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec
         postLimbDraw(play, limbIndex, &limbDList, &rot, arg, &gfx);
     }
     if (limb->child != LIMB_DONE) {
-        gfx = SkelAnime_DrawFlexLimb(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
-                                     mtx, gfx);
+        gfx = SkelAnime_DrawFlexLimb(play, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, mtx,
+                                     gfx);
     }
 
     Matrix_Pop();
 
     if (limb->sibling != LIMB_DONE) {
-        gfx = SkelAnime_DrawFlexLimb(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw,
-                                     arg, mtx, gfx);
+        gfx = SkelAnime_DrawFlexLimb(play, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
+                                     mtx, gfx);
     }
 
     return gfx;
@@ -758,8 +753,8 @@ Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32
         postLimbDraw(play, 1, &limbDList, &rot, arg, &gfx);
     }
     if (rootLimb->child != LIMB_DONE) {
-        gfx = SkelAnime_DrawFlexLimb(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw,
-                                     arg, &mtx, gfx);
+        gfx = SkelAnime_DrawFlexLimb(play, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
+                                     &mtx, gfx);
     }
 
     Matrix_Pop();
@@ -892,46 +887,22 @@ AnimationEntry* AnimationContext_AddEntry(AnimationContext* animationCtx, Animat
  */
 void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animation, s32 frame, s32 limbCount,
                                    Vec3s* frameTable) {
-    if (CVarGetInteger(CVAR_ENHANCEMENT("N64WeirdFrames"), 0) && frame < 0) {
-        Vec3s* src = (Vec3s*)getN64WeirdFrame((sizeof(Vec3s) * limbCount + 2) * frame);
-        memcpy(frameTable, src, sizeof(Vec3s) * limbCount + 2);
-        return;
-    }
-
     AnimationEntry* entry = AnimationContext_AddEntry(&play->animationCtx, ANIMENTRY_LOADFRAME);
 
-    if (entry != NULL)
-    {
+    if (GameInteractor_Should(VB_LOAD_PLAYER_ANIMATION_FRAME, entry != NULL, entry, animation, frame, limbCount,
+                              frameTable)) {
         if (ResourceMgr_OTRSigCheck(animation) != 0)
             animation = ResourceMgr_LoadAnimByName(animation);
 
-        LinkAnimationHeader* linkAnimHeader = SEGMENTED_TO_VIRTUAL(animation);
         Vec3s* ram = frameTable;
 
-        osCreateMesgQueue(&entry->data.load.msgQueue, &entry->data.load.msg, 1);
-
-        char animPath[2048];
-
-        snprintf(animPath, sizeof(animPath), "misc/link_animetion/gPlayerAnimData_%06X", (((uintptr_t)linkAnimHeader->segment - 0x07000000)));
-
-        //printf("Streaming %s, seg = %08X\n", animPath, linkAnimHeader->segment);
-
-        s16* animData = ResourceMgr_LoadPlayerAnimByName(animPath);
-
+        s16* animData = animation->segment;
+        // SOH [Port] sometimes a HESS can set a negative frame value from a negative playback speed. When converted to
+        // a signed value this will cause a crash due to copying way much data.
+        if (frame < 0) {
+            frame = 0;
+        }
         memcpy(ram, (uintptr_t)animData + (((sizeof(Vec3s) * limbCount + 2) * frame)), sizeof(Vec3s) * limbCount + 2);
-
-        /*u32* ramPtr = (u32*)ram;
-
-        for (int i = 0; i < 1024; i++)
-        {
-            ramPtr[i] = i * 7;
-        }*/
-
-
-        //DmaMgr_SendRequest2(&entry->data.load.req, ram,
-                            //LINK_ANIMATION_OFFSET(linkAnimHeader->segment, ((sizeof(Vec3s) * limbCount + 2) * frame)),
-                            //sizeof(Vec3s) * limbCount + 2, 0, &entry->data.load.msgQueue, NULL, __FILE__,
-                            //__LINE__);
     }
 }
 
@@ -1176,9 +1147,9 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade
  */
 void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime) {
     if (skelAnime->mode <= ANIMMODE_LOOP_INTERP) {
-        skelAnime->update = LinkAnimation_Loop;
+        skelAnime->update.link = LinkAnimation_Loop;
     } else {
-        skelAnime->update = LinkAnimation_Once;
+        skelAnime->update.link = LinkAnimation_Once;
     }
     skelAnime->morphWeight = 0.0f;
 }
@@ -1188,7 +1159,7 @@ void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime) {
  * finishes.
  */
 s32 LinkAnimation_Update(PlayState* play, SkelAnime* skelAnime) {
-    return skelAnime->update(play, skelAnime);
+    return skelAnime->update.link(play, skelAnime);
 }
 
 /**
@@ -1300,7 +1271,7 @@ void LinkAnimation_Change(PlayState* play, SkelAnime* skelAnime, LinkAnimationHe
             SkelAnime_CopyFrameTable(skelAnime, skelAnime->morphTable, skelAnime->jointTable);
             morphFrames = -morphFrames;
         } else {
-            skelAnime->update = LinkAnimation_Morph;
+            skelAnime->update.link = LinkAnimation_Morph;
             AnimationContext_SetLoadFrame(play, animation, (s32)startFrame, skelAnime->limbCount,
                                           skelAnime->morphTable);
         }
@@ -1308,8 +1279,7 @@ void LinkAnimation_Change(PlayState* play, SkelAnime* skelAnime, LinkAnimationHe
         skelAnime->morphRate = 1.0f / morphFrames;
     } else {
         LinkAnimation_SetUpdateFunction(skelAnime);
-        AnimationContext_SetLoadFrame(play, animation, (s32)startFrame, skelAnime->limbCount,
-                                      skelAnime->jointTable);
+        AnimationContext_SetLoadFrame(play, animation, (s32)startFrame, skelAnime->limbCount, skelAnime->jointTable);
         skelAnime->morphWeight = 0.0f;
     }
 
@@ -1335,8 +1305,8 @@ void LinkAnimation_PlayOnce(PlayState* play, SkelAnime* skelAnime, LinkAnimation
  */
 void LinkAnimation_PlayOnceSetSpeed(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation,
                                     f32 playSpeed) {
-    LinkAnimation_Change(play, skelAnime, animation, playSpeed, 0.0f, Animation_GetLastFrame(animation),
-                         ANIMMODE_ONCE, 0.0f);
+    LinkAnimation_Change(play, skelAnime, animation, playSpeed, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_ONCE,
+                         0.0f);
 }
 
 /**
@@ -1352,8 +1322,8 @@ void LinkAnimation_PlayLoop(PlayState* play, SkelAnime* skelAnime, LinkAnimation
  */
 void LinkAnimation_PlayLoopSetSpeed(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation,
                                     f32 playSpeed) {
-    LinkAnimation_Change(play, skelAnime, animation, playSpeed, 0.0f, Animation_GetLastFrame(animation),
-                         ANIMMODE_LOOP, 0.0f);
+    LinkAnimation_Change(play, skelAnime, animation, playSpeed, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_LOOP,
+                         0.0f);
 }
 
 /**
@@ -1374,16 +1344,14 @@ void LinkAnimation_CopyMorphToJoint(PlayState* play, SkelAnime* skelAnime) {
 /**
  * Requests loading frame data from the Link animation into morphTable
  */
-void LinkAnimation_LoadToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation,
-                               f32 frame) {
+void LinkAnimation_LoadToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 frame) {
     AnimationContext_SetLoadFrame(play, animation, (s32)frame, skelAnime->limbCount, skelAnime->morphTable);
 }
 
 /**
  * Requests loading frame data from the Link animation into jointTable
  */
-void LinkAnimation_LoadToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation,
-                               f32 frame) {
+void LinkAnimation_LoadToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 frame) {
     AnimationContext_SetLoadFrame(play, animation, (s32)frame, skelAnime->limbCount, skelAnime->jointTable);
 }
 
@@ -1397,9 +1365,8 @@ void LinkAnimation_InterpJointMorph(PlayState* play, SkelAnime* skelAnime, f32 w
 /**
  * Requests loading frame data from the Link animations and blending them, placing the result in jointTable
  */
-void LinkAnimation_BlendToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1,
-                                f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight,
-                                Vec3s* blendTable) {
+void LinkAnimation_BlendToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1,
+                                LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, Vec3s* blendTable) {
     Vec3s* alignedBlendTable;
 
     AnimationContext_SetLoadFrame(play, animation1, (s32)frame1, skelAnime->limbCount, skelAnime->jointTable);
@@ -1413,9 +1380,8 @@ void LinkAnimation_BlendToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnima
 /**
  * Requests loading frame data from the Link animations and blending them, placing the result in morphTable
  */
-void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1,
-                                f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight,
-                                Vec3s* blendTable) {
+void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1,
+                                LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, Vec3s* blendTable) {
     Vec3s* alignedBlendTable;
 
     AnimationContext_SetLoadFrame(play, animation1, (s32)frame1, skelAnime->limbCount, skelAnime->morphTable);
@@ -1473,8 +1439,8 @@ s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame) {
 /**
  * Initializes a normal skeleton to a looping animation, dynamically allocating the frame tables if not provided.
  */
-s32 SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg,
-                   AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) {
+s32 SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation,
+                   Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) {
     if (ResourceMgr_OTRSigCheck(skeletonHeaderSeg))
         skeletonHeaderSeg = ResourceMgr_LoadSkeletonByName(skeletonHeaderSeg, skelAnime);
 
@@ -1484,10 +1450,8 @@ s32 SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skelet
     skelAnime->limbCount = skeletonHeader->limbCount + 1;
     skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->segment);
     if (jointTable == NULL) {
-        skelAnime->jointTable =
-            ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
-        skelAnime->morphTable =
-            ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
+        skelAnime->jointTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
+        skelAnime->morphTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
     } else {
         assert(limbCount == skelAnime->limbCount);
         skelAnime->jointTable = jointTable;
@@ -1520,11 +1484,9 @@ s32 SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader
     skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->sh.segment);
 
     if (jointTable == NULL) {
-        skelAnime->jointTable =
-            ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
+        skelAnime->jointTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
 
-        skelAnime->morphTable =
-            ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
+        skelAnime->morphTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
     } else {
         assert(limbCount == skelAnime->limbCount);
         skelAnime->jointTable = jointTable;
@@ -1555,10 +1517,8 @@ s32 SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* sk
     skelAnime->skeletonHeader = skeletonHeader;
     skelAnime->limbCount = skeletonHeader->limbCount + 1;
     skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->segment);
-    skelAnime->jointTable =
-        ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
-    skelAnime->morphTable =
-        ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
+    skelAnime->jointTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable));
+    skelAnime->morphTable = ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable));
     if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) {
         osSyncPrintf(VT_FGCOL(RED));
         // "Memory allocation error"
@@ -1576,11 +1536,11 @@ s32 SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* sk
  */
 void SkelAnime_SetUpdate(SkelAnime* skelAnime) {
     if (skelAnime->mode <= ANIMMODE_LOOP_INTERP) {
-        skelAnime->update = SkelAnime_LoopFull;
+        skelAnime->update.normal = SkelAnime_LoopFull;
     } else if (skelAnime->mode <= ANIMMODE_ONCE_INTERP) {
-        skelAnime->update = SkelAnime_Once;
+        skelAnime->update.normal = SkelAnime_Once;
     } else {
-        skelAnime->update = SkelAnime_LoopPartial;
+        skelAnime->update.normal = SkelAnime_LoopPartial;
     }
 }
 
@@ -1589,7 +1549,7 @@ void SkelAnime_SetUpdate(SkelAnime* skelAnime) {
  * finishes.
  */
 s32 SkelAnime_Update(SkelAnime* skelAnime) {
-    return skelAnime->update(skelAnime);
+    return skelAnime->update.normal(skelAnime);
 }
 
 /**
@@ -1758,10 +1718,10 @@ void Animation_ChangeImpl(SkelAnime* skelAnime, AnimationHeader* animation, f32
             morphFrames = -morphFrames;
         } else {
             if (taper != ANIMTAPER_NONE) {
-                skelAnime->update = SkelAnime_MorphTaper;
+                skelAnime->update.normal = SkelAnime_MorphTaper;
                 skelAnime->taper = taper;
             } else {
-                skelAnime->update = SkelAnime_Morph;
+                skelAnime->update.normal = SkelAnime_Morph;
             }
             SkelAnime_GetFrameData(animation, startFrame, skelAnime->limbCount, skelAnime->morphTable);
         }
@@ -1912,7 +1872,7 @@ void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* diff, s16 angle) {
     f32 sin;
     f32 cos;
 
-    if (skelAnime->moveFlags & ANIM_FLAG_NOMOVE) {
+    if (skelAnime->movementFlags & ANIM_FLAG_NOMOVE) {
         diff->x = diff->z = 0.0f;
     } else {
         x = skelAnime->jointTable[0].x;
@@ -1934,8 +1894,8 @@ void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* diff, s16 angle) {
     skelAnime->jointTable[0].x = skelAnime->baseTransl.x;
     skelAnime->prevTransl.z = skelAnime->jointTable[0].z;
     skelAnime->jointTable[0].z = skelAnime->baseTransl.z;
-    if (skelAnime->moveFlags & ANIM_FLAG_UPDATEY) {
-        if (skelAnime->moveFlags & ANIM_FLAG_NOMOVE) {
+    if (skelAnime->movementFlags & ANIM_FLAG_UPDATEY) {
+        if (skelAnime->movementFlags & ANIM_FLAG_NOMOVE) {
             diff->y = 0.0f;
         } else {
             diff->y = skelAnime->jointTable[0].y - skelAnime->prevTransl.y;
@@ -1946,7 +1906,7 @@ void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* diff, s16 angle) {
         diff->y = 0.0f;
         skelAnime->prevTransl.y = skelAnime->jointTable[0].y;
     }
-    skelAnime->moveFlags &= ~ANIM_FLAG_NOMOVE;
+    skelAnime->movementFlags &= ~ANIM_FLAG_NOMOVE;
 }
 
 /**
diff --git a/soh/src/code/z_skin_awb.c b/soh/src/code/z_skin_awb.c
index 3627797b43..504b6376d4 100644
--- a/soh/src/code/z_skin_awb.c
+++ b/soh/src/code/z_skin_awb.c
@@ -71,12 +71,10 @@ void Skin_Init(PlayState* play, Skin* skin, SkeletonHeader* skeletonHeader, Anim
 
             vtxEntry->index = 0;
 
-            vtxEntry->buf[0] =
-                ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx));
+            vtxEntry->buf[0] = ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx));
             assert(vtxEntry->buf[0] != NULL);
 
-            vtxEntry->buf[1] =
-                ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx));
+            vtxEntry->buf[1] = ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx));
             assert(vtxEntry->buf[1] != NULL);
 
             Skin_InitAnimatedLimb(play, skin, i);
diff --git a/soh/src/code/z_sound_source.c b/soh/src/code/z_sound_source.c
index 055afec39f..6e89130d7d 100644
--- a/soh/src/code/z_sound_source.c
+++ b/soh/src/code/z_sound_source.c
@@ -58,5 +58,6 @@ void SoundSource_PlaySfxAtFixedWorldPos(PlayState* play, Vec3f* worldPos, s32 du
     source->countdown = duration;
 
     SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &source->worldPos, &source->projectedPos);
-    Audio_PlaySoundGeneral(sfxId, &source->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(sfxId, &source->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultReverb);
 }
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index d6141d78b3..8fc6d1dde0 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -7,6 +7,7 @@
 #include "soh/Enhancements/randomizer/savefile.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
+#include "soh/ResourceManagerHelpers.h"
 
 #define NUM_DUNGEONS 8
 #define NUM_COWS 10
@@ -43,19 +44,19 @@ void Sram_InitBossRushSave(void) {
 
 static s16 sDungeonEntrances[] = {
     ENTR_DEKU_TREE_ENTRANCE,               // SCENE_DEKU_TREE
-    ENTR_DODONGOS_CAVERN_ENTRANCE,                // SCENE_DODONGOS_CAVERN
-    ENTR_JABU_JABU_ENTRANCE,                      // SCENE_JABU_JABU
+    ENTR_DODONGOS_CAVERN_ENTRANCE,         // SCENE_DODONGOS_CAVERN
+    ENTR_JABU_JABU_ENTRANCE,               // SCENE_JABU_JABU
     ENTR_FOREST_TEMPLE_ENTRANCE,           // SCENE_FOREST_TEMPLE
-    ENTR_FIRE_TEMPLE_ENTRANCE,                    // SCENE_FIRE_TEMPLE
-    ENTR_WATER_TEMPLE_ENTRANCE,                   // SCENE_WATER_TEMPLE
-    ENTR_SPIRIT_TEMPLE_ENTRANCE,                  // SCENE_SPIRIT_TEMPLE
-    ENTR_SHADOW_TEMPLE_ENTRANCE,                  // SCENE_SHADOW_TEMPLE
+    ENTR_FIRE_TEMPLE_ENTRANCE,             // SCENE_FIRE_TEMPLE
+    ENTR_WATER_TEMPLE_ENTRANCE,            // SCENE_WATER_TEMPLE
+    ENTR_SPIRIT_TEMPLE_ENTRANCE,           // SCENE_SPIRIT_TEMPLE
+    ENTR_SHADOW_TEMPLE_ENTRANCE,           // SCENE_SHADOW_TEMPLE
     ENTR_BOTTOM_OF_THE_WELL_ENTRANCE,      // SCENE_BOTTOM_OF_THE_WELL
-    ENTR_ICE_CAVERN_ENTRANCE,                     // SCENE_ICE_CAVERN
+    ENTR_ICE_CAVERN_ENTRANCE,              // SCENE_ICE_CAVERN
     ENTR_GANONS_TOWER_0,                   // SCENE_GANONS_TOWER
-    ENTR_GERUDO_TRAINING_GROUND_ENTRANCE,         // SCENE_GERUDO_TRAINING_GROUND
+    ENTR_GERUDO_TRAINING_GROUND_ENTRANCE,  // SCENE_GERUDO_TRAINING_GROUND
     ENTR_THIEVES_HIDEOUT_0,                // SCENE_THIEVES_HIDEOUT
-    ENTR_INSIDE_GANONS_CASTLE_ENTRANCE,           // SCENE_INSIDE_GANONS_CASTLE
+    ENTR_INSIDE_GANONS_CASTLE_ENTRANCE,    // SCENE_INSIDE_GANONS_CASTLE
     ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0, // SCENE_GANONS_TOWER_COLLAPSE_INTERIOR
     ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0,  // SCENE_INSIDE_GANONS_CASTLE_COLLAPSE
 };
@@ -128,13 +129,14 @@ void Sram_OpenSave() {
 
         default:
             // Use the saved entrance value with remember save location, except when in grottos/fairy fountains
-            if (CVarGetInteger(CVAR_ENHANCEMENT("RememberSaveLocation"), 0) && gSaveContext.savedSceneNum != SCENE_FAIRYS_FOUNTAIN &&
-                gSaveContext.savedSceneNum != SCENE_GROTTOS) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("RememberSaveLocation"), 0) &&
+                gSaveContext.savedSceneNum != SCENE_FAIRYS_FOUNTAIN && gSaveContext.savedSceneNum != SCENE_GROTTOS) {
                 break;
             }
 
             if (gSaveContext.savedSceneNum != SCENE_LINKS_HOUSE) {
-                gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? ENTR_LINKS_HOUSE_CHILD_SPAWN : ENTR_TEMPLE_OF_TIME_WARP_PAD;
+                gSaveContext.entranceIndex =
+                    (LINK_AGE_IN_YEARS == YEARS_CHILD) ? ENTR_LINKS_HOUSE_CHILD_SPAWN : ENTR_TEMPLE_OF_TIME_WARP_PAD;
             } else {
                 gSaveContext.entranceIndex = ENTR_LINKS_HOUSE_CHILD_SPAWN;
             }
@@ -149,7 +151,8 @@ void Sram_OpenSave() {
     osSyncPrintf(VT_RST);
 
     if (gSaveContext.health < 0x30) {
-        gSaveContext.health = CVarGetInteger(CVAR_ENHANCEMENT("FullHealthSpawn"), 0) ? gSaveContext.healthCapacity : 0x30;
+        gSaveContext.health =
+            CVarGetInteger(CVAR_ENHANCEMENT("FullHealthSpawn"), 0) ? gSaveContext.healthCapacity : 0x30;
     }
 
     if (gSaveContext.scarecrowLongSongSet) {
@@ -183,7 +186,8 @@ void Sram_OpenSave() {
     }
 
     // if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter
-    if ((Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) && !IS_RANDO) {
+    if ((Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) &&
+        !IS_RANDO) {
         i = gSaveContext.eventChkInf[4] & ~1;
         gSaveContext.eventChkInf[4] = i;
 
@@ -238,6 +242,12 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
     gSaveContext.linkAge = 1;
     gSaveContext.dayTime = 0x6AAB;
     gSaveContext.cutsceneIndex = 0xFFF1;
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        gSaveContext.ship.filenameLanguage = NAME_LANGUAGE_PAL;
+    } else { // GAME_REGION_NTSC
+        gSaveContext.ship.filenameLanguage =
+            (gSaveContext.language == LANGUAGE_JPN) ? NAME_LANGUAGE_NTSC_JPN : NAME_LANGUAGE_NTSC_ENG;
+    }
 
     if ((fileChooseCtx->buttonIndex == 0 && CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0))) {
         gSaveContext.cutsceneIndex = 0;
diff --git a/soh/src/code/z_ss_sram.c b/soh/src/code/z_ss_sram.c
index 8cea4b5d43..7c792f2c36 100644
--- a/soh/src/code/z_ss_sram.c
+++ b/soh/src/code/z_ss_sram.c
@@ -59,8 +59,8 @@ void SsSram_Dma(void* dramAddr, size_t size, s32 direction) {
 
 void SsSram_ReadWrite(uintptr_t addr, void* dramAddr, size_t size, s32 direction) {
     osSyncPrintf("ssSRAMReadWrite:%08x %08x %08x %d\n", addr, (uintptr_t)dramAddr, size, direction);
-    
-    switch (direction) { 
+
+    switch (direction) {
         case OS_WRITE: {
             Ctx_WriteSaveFile(addr, dramAddr, size);
         } break;
@@ -68,6 +68,6 @@ void SsSram_ReadWrite(uintptr_t addr, void* dramAddr, size_t size, s32 direction
             Ctx_ReadSaveFile(addr, dramAddr, size);
         } break;
     }
-    //SsSram_Init(addr, DEVICE_TYPE_SRAM, PI_DOMAIN2, 5, 0xD, 2, 0xC, 0);
-    //SsSram_Dma(dramAddr, size, direction);
+    // SsSram_Init(addr, DEVICE_TYPE_SRAM, PI_DOMAIN2, 5, 0xD, 2, 0xC, 0);
+    // SsSram_Dma(dramAddr, size, direction);
 }
diff --git a/soh/src/code/z_view.c b/soh/src/code/z_view.c
index 5799c23a87..2dd05af725 100644
--- a/soh/src/code/z_view.c
+++ b/soh/src/code/z_view.c
@@ -76,10 +76,9 @@ void View_GetParams(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
     *eye = view->eye;
     *lookAt = view->lookAt;
     *up = view->up;
-    //view->flags |= 1;
+    // view->flags |= 1;
 }
 
-
 void func_800AA358(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
     if (eye->x == lookAt->x && eye->z == lookAt->z) {
         eye->x += 0.1f;
@@ -109,7 +108,7 @@ void View_GetScale(View* view, f32* scale) {
 void func_800AA460(View* view, f32 fovy, f32 near, f32 far) {
     view->fovy = fovy;
     view->zNear = near;
-    //view->zNear = -30;
+    // view->zNear = -30;
     view->zFar = far;
     view->flags |= 4;
 }
@@ -123,7 +122,7 @@ void func_800AA48C(View* view, f32* fovy, f32* near, f32* far) {
 void func_800AA4A8(View* view, f32 fovy, f32 near, f32 far) {
     view->fovy = fovy;
     view->zNear = near;
-    //view->zNear = -30;
+    // view->zNear = -30;
     view->zFar = far;
     view->flags |= 8;
     view->scale = 1.0f;
@@ -334,8 +333,8 @@ s32 func_800AAA9C(View* view) {
 
     func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
     MtxF viewingF;
-    guLookAtF(viewingF.mf, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x,
-             view->up.y, view->up.z);
+    guLookAtF(viewingF.mf, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+              view->up.x, view->up.y, view->up.z);
 
     // Some heuristics to identify instant camera movements and skip interpolation in that case
 
@@ -357,9 +356,12 @@ s32 func_800AAA9C(View* view) {
     odiry /= odir_dist;
     odirz /= odir_dist;
 
-    float eye_dist = sqrtf(sqr(view->eye.x - old_view.eye.x) + sqr(view->eye.y - old_view.eye.y) + sqr(view->eye.z - old_view.eye.z));
-    float look_dist = sqrtf(sqr(view->lookAt.x - old_view.lookAt.x) + sqr(view->lookAt.y - old_view.lookAt.y) + sqr(view->lookAt.z - old_view.lookAt.z));
-    float up_dist = sqrtf(sqr(view->up.x - old_view.up.x) + sqr(view->up.y - old_view.up.y) + sqr(view->up.z - old_view.up.z));
+    float eye_dist = sqrtf(sqr(view->eye.x - old_view.eye.x) + sqr(view->eye.y - old_view.eye.y) +
+                           sqr(view->eye.z - old_view.eye.z));
+    float look_dist = sqrtf(sqr(view->lookAt.x - old_view.lookAt.x) + sqr(view->lookAt.y - old_view.lookAt.y) +
+                            sqr(view->lookAt.z - old_view.lookAt.z));
+    float up_dist =
+        sqrtf(sqr(view->up.x - old_view.up.x) + sqr(view->up.y - old_view.up.y) + sqr(view->up.z - old_view.up.z));
     float d_dist = sqrtf(sqr(dirx - odirx) + sqr(diry - odiry) + sqr(dirz - odirz));
 
     bool dont_interpolate = false;
@@ -453,10 +455,10 @@ s32 func_800AAA9C(View* view) {
 
     view->viewing = *viewing;
 
-
     /*if (eye_dist > 1 || look_dist > 1 || abs(up_dist) > 0.1 || abs(d_dist) > 0.1)
-        printf("%d %f %f %f, %f %f %f, %f %f %f, %f %f %f %f %d\n", (int)view->fovy, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
-           view->up.x, view->up.y, view->up.z, eye_dist, look_dist, up_dist, d_dist, dont_interpolate);*/
+        printf("%d %f %f %f, %f %f %f, %f %f %f, %f %f %f %f %d\n", (int)view->fovy, view->eye.x, view->eye.y,
+       view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x, view->up.y, view->up.z, eye_dist,
+       look_dist, up_dist, d_dist, dont_interpolate);*/
 
     old_view = *view;
 
diff --git a/soh/src/code/z_vismono.c b/soh/src/code/z_vismono.c
index a4e77d70df..f15fb2ae05 100644
--- a/soh/src/code/z_vismono.c
+++ b/soh/src/code/z_vismono.c
@@ -16,7 +16,7 @@
 
 // Upstream TODO: Replace these ones they are served from other headers
 #define ASSERT(cond, msg, file, line) assert(cond)
-#define GPACK_IA16(i, a)    (((i) << 8) | (a))
+#define GPACK_IA16(i, a) (((i) << 8) | (a))
 
 // Height of the fragments the color frame buffer (CFB) is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into
diff --git a/soh/src/code/z_vr_box.c b/soh/src/code/z_vr_box.c
index ff26221874..c11db16059 100644
--- a/soh/src/code/z_vr_box.c
+++ b/soh/src/code/z_vr_box.c
@@ -71,7 +71,6 @@
 #include "assets/textures/skyboxes/vr_holy1_static.h"
 #include "assets/textures/skyboxes/vr_holy1_pal_static.h"
 
-
 u32 D_8012AC90[4] = {
     0x00000000,
     0x00010000,
@@ -246,13 +245,11 @@ s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3
         arg2 += i;
         gSPCullDisplayList(skyboxCtx->unk_138++, 0, 15);
 
-
         for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 4; phi_ra++, phi_a2_4 += 0x1F) {
             for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x3F, phi_t2_4 += 4) {
-                gDPLoadTextureTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8],
-                                   G_IM_FMT_CI, G_IM_SIZ_8b, 256, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x3F,
-                                   phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
-                                   G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadTextureTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], G_IM_FMT_CI, G_IM_SIZ_8b, 256, 0,
+                                   phi_a0_4, phi_a2_4, phi_a0_4 + 0x3F, phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                                   G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
 
                 gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AD40[phi_t2_4 + 1], D_8012AD40[phi_t2_4 + 2],
                                D_8012AD40[phi_t2_4 + 3], D_8012AD40[phi_t2_4 + 0], 3);
@@ -361,13 +358,13 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3
         phi_a2_4 = 0;
         for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 4; phi_ra++, phi_a2_4 += 0x1F) {
             for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0,
-                                 G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
-                                 phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
-                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1,
-                                 G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
-                                 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0, G_TX_RENDERTILE, G_IM_FMT_CI,
+                                 G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                                 G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1, G_IM_FMT_CI, G_IM_SIZ_8b,
+                                 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
                                  G_TX_NOMASK, G_TX_NOLOD);
 
                 gDPNoOpString(skyboxCtx->unk_138++, "TEST2", 0);
@@ -380,13 +377,13 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3
         phi_a2_4 = 0;
         for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 2; phi_ra++, phi_a2_4 += 0x1F) {
             for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0,
-                                 G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
-                                 phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
-                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1,
-                                 G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
-                                 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0, G_TX_RENDERTILE, G_IM_FMT_CI,
+                                 G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                                 G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1, G_IM_FMT_CI, G_IM_SIZ_8b,
+                                 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
                                  G_TX_NOMASK, G_TX_NOLOD);
                 gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AE3C[phi_t2_4 + 1], D_8012AE3C[phi_t2_4 + 2],
                                D_8012AE3C[phi_t2_4 + 3], D_8012AE3C[phi_t2_4 + 0], 3);
@@ -395,13 +392,13 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3
         phi_a2_4 -= 0x1F;
         for (phi_ra = 0; phi_ra < 2; phi_ra++, phi_a2_4 -= 0x1F) {
             for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0,
-                                 G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
-                                 phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
-                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1,
-                                 G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
-                                 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[0][arg8], 0, G_TX_RENDERTILE, G_IM_FMT_CI,
+                                 G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                                 G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadMultiTile(skyboxCtx->unk_138++, skyboxCtx->textures[1][arg8], 0x80, 1, G_IM_FMT_CI, G_IM_SIZ_8b,
+                                 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F, 0,
+                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
                                  G_TX_NOMASK, G_TX_NOLOD);
                 gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AE3C[phi_t2_4 + 1], D_8012AE3C[phi_t2_4 + 2],
                                D_8012AE3C[phi_t2_4 + 3], D_8012AE3C[phi_t2_4 + 0], 3);
@@ -450,143 +447,84 @@ void func_800AF178(SkyboxContext* skyboxCtx, s32 arg1) {
     }
 }
 
-void LoadSkyboxTex(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height, int offsetW, int offsetH)
-{
+void LoadSkyboxTex(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height,
+                   int offsetW, int offsetH) {
     skyboxCtx->textures[segmentIndex][imageIndex] = tex;
 }
 
-void LoadSkyboxTexAtOffset(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height, int offset)
-{
+void LoadSkyboxTexAtOffset(SkyboxContext* skyboxCtx, int segmentIndex, int imageIndex, char* tex, int width, int height,
+                           int offset) {
     skyboxCtx->textures[segmentIndex][imageIndex] = tex;
 }
 
-void LoadSkyboxPalette(SkyboxContext* skyboxCtx, int paletteIndex, char* palTex, int width,
-                       int height) {
+void LoadSkyboxPalette(SkyboxContext* skyboxCtx, int paletteIndex, char* palTex, int width, int height) {
     skyboxCtx->palettes[paletteIndex] = palTex;
     skyboxCtx->palette_size = width * height;
 }
 
-static const char* sSBVRFine0Tex[] =
-{
-    gSunriseSkybox1Tex, gSunriseSkybox2Tex, gSunriseSkybox3Tex, gSunriseSkybox4Tex, gSunriseSkybox5Tex
-};
+static const char* sSBVRFine0Tex[] = { gSunriseSkybox1Tex, gSunriseSkybox2Tex, gSunriseSkybox3Tex, gSunriseSkybox4Tex,
+                                       gSunriseSkybox5Tex };
 
-static const char* sSBVRFine0Pal[] =
-{
-    gSunriseSkyboxTLUT
-};
+static const char* sSBVRFine0Pal[] = { gSunriseSkyboxTLUT };
 
-static const char* sSBVRFine1Tex[] =
-{
-    gDaySkybox1Tex, gDaySkybox2Tex, gDaySkybox3Tex, gDaySkybox4Tex, gDaySkybox5Tex
-};
+static const char* sSBVRFine1Tex[] = { gDaySkybox1Tex, gDaySkybox2Tex, gDaySkybox3Tex, gDaySkybox4Tex, gDaySkybox5Tex };
 
-static const char* sSBVRFine1Pal[] =
-{
-    gDaySkyboxTLUT
-};
+static const char* sSBVRFine1Pal[] = { gDaySkyboxTLUT };
 
-static const char* sSBVRFine2Tex[] =
-{
-    gSunsetSkybox1Tex, gSunsetSkybox2Tex, gSunsetSkybox3Tex, gSunsetSkybox4Tex, gSunsetSkybox5Tex
-};
+static const char* sSBVRFine2Tex[] = { gSunsetSkybox1Tex, gSunsetSkybox2Tex, gSunsetSkybox3Tex, gSunsetSkybox4Tex,
+                                       gSunsetSkybox5Tex };
 
-static const char* sSBVRFine2Pal[] =
-{
-    gSunsetSkyboxTLUT
-};
+static const char* sSBVRFine2Pal[] = { gSunsetSkyboxTLUT };
 
-static const char* sSBVRFine3Tex[] =
-{
-    gNightSkybox1Tex, gNightSkybox2Tex, gNightSkybox3Tex, gNightSkybox4Tex, gNightSkybox5Tex
-};
+static const char* sSBVRFine3Tex[] = { gNightSkybox1Tex, gNightSkybox2Tex, gNightSkybox3Tex, gNightSkybox4Tex,
+                                       gNightSkybox5Tex };
 
-static const char* sSBVRFine3Pal[] =
-{
-    gNightSkyboxTLUT
-};
+static const char* sSBVRFine3Pal[] = { gNightSkyboxTLUT };
 
-static const char* sSBVRCloud0Tex[] =
-{
-    gSunriseOvercastSkybox1Tex, gSunriseOvercastSkybox2Tex, gSunriseOvercastSkybox3Tex, gSunriseOvercastSkybox4Tex, gSunriseOvercastSkybox5Tex
-};
+static const char* sSBVRCloud0Tex[] = { gSunriseOvercastSkybox1Tex, gSunriseOvercastSkybox2Tex,
+                                        gSunriseOvercastSkybox3Tex, gSunriseOvercastSkybox4Tex,
+                                        gSunriseOvercastSkybox5Tex };
 
-static const char* sSBVRCloud0Pal[] =
-{
-    gSunriseOvercastSkyboxTLUT
-};
+static const char* sSBVRCloud0Pal[] = { gSunriseOvercastSkyboxTLUT };
 
-static const char* sSBVRCloud1Tex[] =
-{
-    gDayOvercastSkybox1Tex, gDayOvercastSkybox2Tex, gDayOvercastSkybox3Tex, gDayOvercastSkybox4Tex, gDayOvercastSkybox5Tex
-};
+static const char* sSBVRCloud1Tex[] = { gDayOvercastSkybox1Tex, gDayOvercastSkybox2Tex, gDayOvercastSkybox3Tex,
+                                        gDayOvercastSkybox4Tex, gDayOvercastSkybox5Tex };
 
-static const char* sSBVRCloud1Pal[] =
-{
-    gDayOvercastSkyboxTLUT
-};
+static const char* sSBVRCloud1Pal[] = { gDayOvercastSkyboxTLUT };
 
-static const char* sSBVRCloud2Tex[] =
-{
-    gSunsetOvercastSkybox1Tex, gSunsetOvercastSkybox2Tex, gSunsetOvercastSkybox3Tex, gSunsetOvercastSkybox4Tex, gSunsetOvercastSkybox5Tex
-};
+static const char* sSBVRCloud2Tex[] = { gSunsetOvercastSkybox1Tex, gSunsetOvercastSkybox2Tex, gSunsetOvercastSkybox3Tex,
+                                        gSunsetOvercastSkybox4Tex, gSunsetOvercastSkybox5Tex };
 
-static const char* sSBVRCloud2Pal[] =
-{
-    gSunsetOvercastSkyboxTLUT
-};
+static const char* sSBVRCloud2Pal[] = { gSunsetOvercastSkyboxTLUT };
 
-static const char* sSBVRCloud3Tex[] =
-{
-    gNightOvercastSkybox1Tex, gNightOvercastSkybox2Tex, gNightOvercastSkybox3Tex, gNightOvercastSkybox4Tex, gNightOvercastSkybox5Tex
-};
+static const char* sSBVRCloud3Tex[] = { gNightOvercastSkybox1Tex, gNightOvercastSkybox2Tex, gNightOvercastSkybox3Tex,
+                                        gNightOvercastSkybox4Tex, gNightOvercastSkybox5Tex };
 
-static const char* sSBVRCloud3Pal[] =
-{
-    gNightOvercastSkyboxTLUT
-};
+static const char* sSBVRCloud3Pal[] = { gNightOvercastSkyboxTLUT };
 
-static const char* sSBVRHoly0Tex[] =
-{
-    gHoly0Skybox1Tex, gHoly0Skybox2Tex, gHoly0Skybox3Tex, gHoly0Skybox4Tex, gHoly0Skybox5Tex
-};
+static const char* sSBVRHoly0Tex[] = { gHoly0Skybox1Tex, gHoly0Skybox2Tex, gHoly0Skybox3Tex, gHoly0Skybox4Tex,
+                                       gHoly0Skybox5Tex };
 
-static const char* sSBVRHoly0Pal[] =
-{
-    gHoly0SkyboxTLUT
-};
+static const char* sSBVRHoly0Pal[] = { gHoly0SkyboxTLUT };
 
+SkyboxTableEntry sSkyboxTable[] = {
+    { sSBVRFine0Tex, sSBVRFine0Pal
 
-SkyboxTableEntry sSkyboxTable[] = 
-{
-    {
-        sSBVRFine0Tex,
-        sSBVRFine0Pal
-        
-    },
-    {
-        sSBVRFine1Tex,
-        sSBVRFine1Pal
-    },
-    {
-        sSBVRFine2Tex,
-        sSBVRFine2Pal
-    },
-    {
-        sSBVRFine3Tex,
-        sSBVRFine3Pal
     },
+    { sSBVRFine1Tex, sSBVRFine1Pal },
+    { sSBVRFine2Tex, sSBVRFine2Pal },
+    { sSBVRFine3Tex, sSBVRFine3Pal },
     {
         sSBVRCloud0Tex,
         sSBVRCloud0Pal,
     },
     {
-       sSBVRCloud1Tex,
-       sSBVRCloud1Pal,
+        sSBVRCloud1Tex,
+        sSBVRCloud1Pal,
     },
     {
         sSBVRCloud2Tex,
-       sSBVRCloud2Pal,
+        sSBVRCloud2Pal,
     },
     {
         sSBVRCloud3Tex,
@@ -606,346 +544,339 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
     uintptr_t start;
     s32 phi_v1;
 
-    switch (skyboxId)
-    {
-    case SKYBOX_NORMAL_SKY:
-        phi_v1 = 0;
-        if (gSaveContext.retainWeatherMode != 0 && gSaveContext.sceneSetupIndex < 4 && gWeatherMode > 0 &&
-            gWeatherMode < 6) {
-            phi_v1 = 1;
-        }
-
-        for (i = 0; i < 9; i++) {
-            if (gSaveContext.skyboxTime >= D_8011FC1C[phi_v1][i].startTime &&
-                (gSaveContext.skyboxTime < D_8011FC1C[phi_v1][i].endTime ||
-                    D_8011FC1C[phi_v1][i].endTime == 0xFFFF)) {
-                play->envCtx.skybox1Index = sp41 = D_8011FC1C[phi_v1][i].skybox1Index;
-                play->envCtx.skybox2Index = sp40 = D_8011FC1C[phi_v1][i].skybox2Index;
-                if (D_8011FC1C[phi_v1][i].blend != 0) {
-                    play->envCtx.skyboxBlend =
-                        Environment_LerpWeight(D_8011FC1C[phi_v1][i].endTime, D_8011FC1C[phi_v1][i].startTime,
-                            ((void)0, gSaveContext.skyboxTime)) *
-                        255.0f;
-                }
-                else {
-                    play->envCtx.skyboxBlend = 0;
-                }
-                break;
+    switch (skyboxId) {
+        case SKYBOX_NORMAL_SKY:
+            phi_v1 = 0;
+            if (gSaveContext.retainWeatherMode != 0 && gSaveContext.sceneSetupIndex < 4 && gWeatherMode > 0 &&
+                gWeatherMode < 6) {
+                phi_v1 = 1;
             }
-        }
 
+            for (i = 0; i < 9; i++) {
+                if (gSaveContext.skyboxTime >= D_8011FC1C[phi_v1][i].startTime &&
+                    (gSaveContext.skyboxTime < D_8011FC1C[phi_v1][i].endTime ||
+                     D_8011FC1C[phi_v1][i].endTime == 0xFFFF)) {
+                    play->envCtx.skybox1Index = sp41 = D_8011FC1C[phi_v1][i].skybox1Index;
+                    play->envCtx.skybox2Index = sp40 = D_8011FC1C[phi_v1][i].skybox2Index;
+                    if (D_8011FC1C[phi_v1][i].blend != 0) {
+                        play->envCtx.skyboxBlend =
+                            Environment_LerpWeight(D_8011FC1C[phi_v1][i].endTime, D_8011FC1C[phi_v1][i].startTime,
+                                                   ((void)0, gSaveContext.skyboxTime)) *
+                            255.0f;
+                    } else {
+                        play->envCtx.skyboxBlend = 0;
+                    }
+                    break;
+                }
+            }
 
-        SkyboxTableEntry entryA = sSkyboxTable[sp41];
+            SkyboxTableEntry entryA = sSkyboxTable[sp41];
 
-      for (int i = 0; i < 5; i++)
-            LoadSkyboxTex(skyboxCtx, 0, i, entryA.textures[i], 128, i == 4 ? 128 : 64, 128, 64);
+            for (int i = 0; i < 5; i++)
+                LoadSkyboxTex(skyboxCtx, 0, i, entryA.textures[i], 128, i == 4 ? 128 : 64, 128, 64);
 
-        SkyboxTableEntry entryB = sSkyboxTable[sp40];
+            SkyboxTableEntry entryB = sSkyboxTable[sp40];
 
-        for (int i = 0; i < 5; i++)
-            LoadSkyboxTex(skyboxCtx, 1, i, entryB.textures[i], 128, i == 4 ? 128 : 64, 128, 64);
-        
-        if ((sp41 & 1) ^ ((sp41 & 4) >> 2)) 
-        {
-            LoadSkyboxPalette(skyboxCtx, 0, entryA.palettes[0], 16, 8);
-            LoadSkyboxPalette(skyboxCtx, 1, entryB.palettes[0], 16, 8);
-        }
-        else 
-        {
-            LoadSkyboxPalette(skyboxCtx, 0, entryB.palettes[0], 16, 8);
-            LoadSkyboxPalette(skyboxCtx, 1, entryA.palettes[0], 16, 8);
-        }
-        break;
-    case SKYBOX_BAZAAR:
-        skyboxCtx->unk_140 = 1;
+            for (int i = 0; i < 5; i++)
+                LoadSkyboxTex(skyboxCtx, 1, i, entryB.textures[i], 128, i == 4 ? 128 : 64, 128, 64);
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gBazaarBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gBazaar2BgTex, 256, 256, 256, 256);
+            if ((sp41 & 1) ^ ((sp41 & 4) >> 2)) {
+                LoadSkyboxPalette(skyboxCtx, 0, entryA.palettes[0], 16, 8);
+                LoadSkyboxPalette(skyboxCtx, 1, entryB.palettes[0], 16, 8);
+            } else {
+                LoadSkyboxPalette(skyboxCtx, 0, entryB.palettes[0], 16, 8);
+                LoadSkyboxPalette(skyboxCtx, 1, entryA.palettes[0], 16, 8);
+            }
+            break;
+        case SKYBOX_BAZAAR:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2TLUT, 16, 16);
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_HOUSE_LINK:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxTex(skyboxCtx, 0, 0, gBazaarBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gBazaar2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gLinksHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gLinksHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gLinksHouse3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gLinksHouse4BgTex, 256, 256, 256, 256);
+            LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2TLUT, 16, 16);
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_HOUSE_LINK:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_OVERCAST_SUNSET:
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gSunsetOvercastSkybox1Tex, 128, 64, 0x0);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 1, gSunsetOvercastSkybox2Tex, 128, 64, 0x2000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 2, gSunsetOvercastSkybox3Tex, 128, 64, 0x4000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gSunsetOvercastSkybox4Tex, 128, 64, 0x6000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gSunsetOvercastSkybox5Tex, 128, 128, 0x8000);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gLinksHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gLinksHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gLinksHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gLinksHouse4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTLUT, 16, 8);
-        break;
-    case SKYBOX_MARKET_ADULT:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_OVERCAST_SUNSET:
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gSunsetOvercastSkybox1Tex, 128, 64, 0x0);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 1, gSunsetOvercastSkybox2Tex, 128, 64, 0x2000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 2, gSunsetOvercastSkybox3Tex, 128, 64, 0x4000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gSunsetOvercastSkybox4Tex, 128, 64, 0x6000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gSunsetOvercastSkybox5Tex, 128, 128, 0x8000);
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMarketRuinsBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMarketRuins2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gMarketRuins3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gMarketRuins4BgTex, 256, 256, 256, 256);
+            LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTLUT, 16, 8);
+            break;
+        case SKYBOX_MARKET_ADULT:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_CUTSCENE_MAP:
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gHoly0Skybox1Tex, 128, 64, 0x0);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 1, gHoly0Skybox2Tex, 128, 64, 0x2000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 2, gHoly0Skybox3Tex, 128, 64, 0x4000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gHoly0Skybox4Tex, 128, 64, 0x6000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gHoly0Skybox5Tex, 128, 128, 0x8000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 0, 5, gHoly0Skybox6Tex, 128, 128, 0xC000);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMarketRuinsBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMarketRuins2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gMarketRuins3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gMarketRuins4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTLUT, 16, 8);
+            LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_CUTSCENE_MAP:
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gHoly0Skybox1Tex, 128, 64, 0x0);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 1, gHoly0Skybox2Tex, 128, 64, 0x2000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 2, gHoly0Skybox3Tex, 128, 64, 0x4000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gHoly0Skybox4Tex, 128, 64, 0x6000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gHoly0Skybox5Tex, 128, 128, 0x8000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 0, 5, gHoly0Skybox6Tex, 128, 128, 0xC000);
 
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 0, gHoly1Skybox1Tex, 128, 64, 0x0);
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 1, gHoly1Skybox2Tex, 128, 64, 0x2000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 2, gHoly1Skybox3Tex, 128, 64, 0x4000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 3, gHoly1Skybox4Tex, 128, 64, 0x6000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 4, gHoly1Skybox5Tex, 128, 128, 0x8000);
-        LoadSkyboxTexAtOffset(skyboxCtx, 1, 5, gHoly1Skybox6Tex, 128, 128, 0xC000);
+            LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTLUT, 16, 8);
 
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 0, gHoly1Skybox1Tex, 128, 64, 0x0);
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 1, gHoly1Skybox2Tex, 128, 64, 0x2000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 2, gHoly1Skybox3Tex, 128, 64, 0x4000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 3, gHoly1Skybox4Tex, 128, 64, 0x6000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 4, gHoly1Skybox5Tex, 128, 128, 0x8000);
+            LoadSkyboxTexAtOffset(skyboxCtx, 1, 5, gHoly1Skybox6Tex, 128, 128, 0xC000);
 
-        LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTLUT, 16, 8);
-        break;
-    case SKYBOX_MARKET_CHILD_DAY:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTLUT, 16, 8);
+            break;
+        case SKYBOX_MARKET_CHILD_DAY:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMarketDayBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMarketDay2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gMarketDay3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gMarketDay4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMarketDayBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMarketDay2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gMarketDay3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gMarketDay4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_MARKET_CHILD_NIGHT:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_MARKET_CHILD_NIGHT:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMarketNightBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMarketNight2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gMarketNight3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gMarketNight4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMarketNightBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMarketNight2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gMarketNight3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gMarketNight4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_HAPPY_MASK_SHOP:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_HAPPY_MASK_SHOP:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMaskShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMaskShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMaskShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMaskShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gKnowItAllBrosHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gKnowItAllBrosHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gKnowItAllBrosHouse3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gKnowItAllBrosHouse4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gKnowItAllBrosHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gKnowItAllBrosHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gKnowItAllBrosHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gKnowItAllBrosHouse4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_OF_TWINS:
-        skyboxCtx->unk_140 = 2;
+            LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_OF_TWINS:
+            skyboxCtx->unk_140 = 2;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gHouseOfTwinsBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gHouseOfTwins2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gHouseOfTwins3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gHouseOfTwinsBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gHouseOfTwins2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gHouseOfTwins3BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3TLUT, 16, 16);
-        break;
-    case SKYBOX_STABLES:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3TLUT, 16, 16);
+            break;
+        case SKYBOX_STABLES:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gStableBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gStable2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gStable3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gStable4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gStableBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gStable2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gStable3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gStable4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gStableBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gStableBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gStableBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gStableBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_KAKARIKO:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gStableBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gStableBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gStableBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gStableBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_KAKARIKO:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gCarpentersHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersHouse3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gCarpentersHouse4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gCarpentersHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gCarpentersHouse4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_KOKIRI_SHOP:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_KOKIRI_SHOP:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gKokiriShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gKokiriShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gKokiriShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gKokiriShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_GORON_SHOP:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_GORON_SHOP:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gGoronShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gGoronShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gGoronShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gGoronShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_ZORA_SHOP:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_ZORA_SHOP:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gZoraShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gZoraShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gZoraShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gZoraShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_POTION_SHOP_KAKARIKO:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_POTION_SHOP_KAKARIKO:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gKakPotionShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gKakPotionShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gKakPotionShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gKakPotionShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_POTION_SHOP_MARKET:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_POTION_SHOP_MARKET:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMarketPotionShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMarketPotionShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMarketPotionShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMarketPotionShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_BOMBCHU_SHOP:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_BOMBCHU_SHOP:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gBombchuShopBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gBombchuShop2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gBombchuShopBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gBombchuShop2BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2TLUT, 16, 16);
 
-        skyboxCtx->rot.y = 0.8f;
-        break;
-    case SKYBOX_HOUSE_RICHARD:
-        skyboxCtx->unk_140 = 1;
+            skyboxCtx->rot.y = 0.8f;
+            break;
+        case SKYBOX_HOUSE_RICHARD:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gRichardsHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gRichardsHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gRichardsHouse3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gRichardsHouse4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gRichardsHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gRichardsHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gRichardsHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gRichardsHouse4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_IMPA:
-        skyboxCtx->unk_140 = 1;
+            LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_IMPA:
+            skyboxCtx->unk_140 = 1;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gCowHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gCowHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gCowHouse3BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 3, gCowHouse4BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gCowHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gCowHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gCowHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 3, gCowHouse4BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4TLUT, 16, 16);
-        break;
-    case SKYBOX_TENT:
-        skyboxCtx->unk_140 = 2;
+            LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4TLUT, 16, 16);
+            break;
+        case SKYBOX_TENT:
+            skyboxCtx->unk_140 = 2;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gCarpentersTentBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersTent2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersTent3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gCarpentersTentBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersTent2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersTent3BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_MIDO:
-        skyboxCtx->unk_140 = 2;
+            LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_MIDO:
+            skyboxCtx->unk_140 = 2;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gMidosHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gMidosHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gMidosHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gMidosHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gMidosHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gMidosHouse3BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_SARIA:
-        skyboxCtx->unk_140 = 2;
+            LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_SARIA:
+            skyboxCtx->unk_140 = 2;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gSariasHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gSariasHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gSariasHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gSariasHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gSariasHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gSariasHouse3BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3TLUT, 16, 16);
-        break;
-    case SKYBOX_HOUSE_ALLEY:
-        skyboxCtx->unk_140 = 2;
+            LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3TLUT, 16, 16);
+            break;
+        case SKYBOX_HOUSE_ALLEY:
+            skyboxCtx->unk_140 = 2;
 
-        LoadSkyboxTex(skyboxCtx, 0, 0, gBackAlleyHouseBgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 1, gBackAlleyHouse2BgTex, 256, 256, 256, 256);
-        LoadSkyboxTex(skyboxCtx, 0, 2, gBackAlleyHouse3BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 0, gBackAlleyHouseBgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 1, gBackAlleyHouse2BgTex, 256, 256, 256, 256);
+            LoadSkyboxTex(skyboxCtx, 0, 2, gBackAlleyHouse3BgTex, 256, 256, 256, 256);
 
-        LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2TLUT, 16, 16);
-        LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3TLUT, 16, 16);
-        break;
-    default:
-        break;
+            LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2TLUT, 16, 16);
+            LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3TLUT, 16, 16);
+            break;
+        default:
+            break;
     }
 }
 
diff --git a/soh/src/code/z_vr_box_draw.c b/soh/src/code/z_vr_box_draw.c
index 5b4867121b..9eb539f859 100644
--- a/soh/src/code/z_vr_box_draw.c
+++ b/soh/src/code/z_vr_box_draw.c
@@ -19,7 +19,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb
 
     Gfx_SetupDL_40Opa(gfxCtx);
 
-    //gsSPShaderTest(POLY_OPA_DISP++);
+    // gsSPShaderTest(POLY_OPA_DISP++);
 
     /*gSPSegment(POLY_OPA_DISP++, 0x7, skyboxCtx->staticSegments[0]);
     gSPSegment(POLY_OPA_DISP++, 0x8, skyboxCtx->staticSegments[1]);
@@ -92,7 +92,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb
     }
 
     gDPPipeSync(POLY_OPA_DISP++);
-    //gsSPShaderTest2(POLY_OPA_DISP++);
+    // gsSPShaderTest2(POLY_OPA_DISP++);
 
     FrameInterpolation_RecordCloseChild();
     CLOSE_DISPS(gfxCtx);
diff --git a/soh/src/libultra/gu/guLookAt.c b/soh/src/libultra/gu/guLookAt.c
index f94204bc4e..493f3dea15 100644
--- a/soh/src/libultra/gu/guLookAt.c
+++ b/soh/src/libultra/gu/guLookAt.c
@@ -16,7 +16,7 @@ void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32
     zLook = zAt - zEye;
     length = -1.0 / sqrtf(SQ(xLook) + SQ(yLook) + SQ(zLook));
     xLook *= length;
-    //xLook = 2.0f;
+    // xLook = 2.0f;
     yLook *= length;
     zLook *= length;
 
@@ -62,6 +62,6 @@ void guLookAt(Mtx* m, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f
 
     guLookAtF(mf, xEye, yEye, zEye, xAt, yAt, zAt, xUp, yUp, zUp);
 
-    //guMtxF2L((MtxF*)mf, m);
+    // guMtxF2L((MtxF*)mf, m);
     Matrix_MtxFToMtx((MtxF*)mf, m);
 }
diff --git a/soh/src/libultra/gu/guPerspectiveF.c b/soh/src/libultra/gu/guPerspectiveF.c
index dd020f5899..d967c8781a 100644
--- a/soh/src/libultra/gu/guPerspectiveF.c
+++ b/soh/src/libultra/gu/guPerspectiveF.c
@@ -37,6 +37,6 @@ void guPerspective(Mtx* m, u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 f
     f32 mf[4][4];
 
     guPerspectiveF(mf, perspNorm, fovy, aspect, near, far, scale);
-    //guMtxF2L((MtxF*)mf, m);
+    // guMtxF2L((MtxF*)mf, m);
     Matrix_MtxFToMtx((MtxF*)mf, m);
 }
diff --git a/soh/src/libultra/gu/ortho.c b/soh/src/libultra/gu/ortho.c
index 77d43ce218..719e087f83 100644
--- a/soh/src/libultra/gu/ortho.c
+++ b/soh/src/libultra/gu/ortho.c
@@ -27,7 +27,7 @@ void guOrtho(Mtx* mtx, f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 f
 
     guOrthoF(mf, left, right, bottom, top, near, far, scale);
 
-    //guMtxF2L((MtxF*)mf, mtx);
+    // guMtxF2L((MtxF*)mf, mtx);
     FrameInterpolation_RecordOpenChild("ortho", 0);
     Matrix_MtxFToMtx((MtxF*)mf, mtx);
     FrameInterpolation_RecordCloseChild();
diff --git a/soh/src/libultra/libc/sprintf.c b/soh/src/libultra/libc/sprintf.c
index 99c616cbcc..9b2844dfc0 100644
--- a/soh/src/libultra/libc/sprintf.c
+++ b/soh/src/libultra/libc/sprintf.c
@@ -1,10 +1,10 @@
 //#include "global.h"
 //
-//void* proutSprintf(void* dst, const char* fmt, u32 size) {
+// void* proutSprintf(void* dst, const char* fmt, u32 size) {
 //    return (void*)((u32)memcpy(dst, fmt, size) + size);
 //}
 //
-//s32 vsprintf(char* dst, const char* fmt, va_list args) {
+// s32 vsprintf(char* dst, const char* fmt, va_list args) {
 //    s32 ret = _Printf(proutSprintf, dst, fmt, args);
 //    if (ret > -1) {
 //        dst[ret] = 0;
@@ -12,7 +12,7 @@
 //    return ret;
 //}
 //
-//s32 sprintf(char* dst, const char* fmt, ...) {
+// s32 sprintf(char* dst, const char* fmt, ...) {
 //    s32 ret;
 //    va_list args;
 //    va_start(args, fmt);
diff --git a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
index d2103f9b55..6e2bf6e94f 100644
--- a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@@ -85,7 +85,8 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play) {
     if (this->actor.parent == NULL) {
         Player* player = GET_PLAYER(play);
         // get correct timer length for hookshot or longshot
-        s32 length = ((player->heldItemAction == PLAYER_IA_HOOKSHOT) ? 13 : 26) * CVarGetFloat(CVAR_CHEAT("HookshotReachMultiplier"), 1.0f);
+        s32 length = ((player->heldItemAction == PLAYER_IA_HOOKSHOT) ? 13 : 26) *
+                     CVarGetFloat(CVAR_CHEAT("HookshotReachMultiplier"), 1.0f);
 
         ArmsHook_SetupAction(this, ArmsHook_Shoot);
         Actor_SetProjectileSpeed(&this->actor, 20.0f);
@@ -172,7 +173,8 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
     if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) &&
         (this->collider.info.atHitInfo->elemType != ELEMTYPE_UNK4)) {
         touchedActor = this->collider.base.at;
-        if ((touchedActor->update != NULL) && (touchedActor->flags & (ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER))) {
+        if ((touchedActor->update != NULL) &&
+            (touchedActor->flags & (ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER))) {
             if (this->collider.info.atHitInfo->bumperFlags & BUMP_HOOKABLE) {
                 ArmsHook_AttachHookToActor(this, touchedActor);
                 if (CHECK_FLAG_ALL(touchedActor->flags, ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)) {
@@ -181,8 +183,8 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
             }
         }
         this->timer = 0;
-        Audio_PlaySoundGeneral(NA_SE_IT_ARROW_STICK_CRE, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_IT_ARROW_STICK_CRE, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (DECR(this->timer) == 0) {
         grabbed = this->grabbed;
         if (grabbed != NULL) {
@@ -278,12 +280,12 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
                     }
                 }
                 func_80865044(this);
-                Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_STICK_OBJ, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_STICK_OBJ, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 CollisionCheck_SpawnShieldParticlesMetal(play, &this->actor.world.pos);
-                Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         } else if (CHECK_BTN_ANY(play->state.input[0].press.button, (buttonsToCheck))) {
             this->timer = 0;
@@ -328,8 +330,7 @@ void ArmsHook_Draw(Actor* thisx, PlayState* play) {
             CVarGetInteger(CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"), 0) && LINK_IS_CHILD) {
             Matrix_Scale(0.8, 0.8, 0.8, MTXMODE_APPLY);
         }
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotTipDL);
         Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
         Math_Vec3f_Diff(&player->unk_3C8, &this->actor.world.pos, &sp78);
@@ -343,8 +344,7 @@ void ArmsHook_Draw(Actor* thisx, PlayState* play) {
         } else {
             Matrix_Scale(0.015f, 0.015f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY);
         }
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotChainDL);
 
         CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
index ae9aff6b3d..2607244c67 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@@ -180,8 +180,7 @@ void ArrowFire_Fly(ArrowFire* this, PlayState* play) {
 void ArrowFire_Update(Actor* thisx, PlayState* play) {
     ArrowFire* this = (ArrowFire*)thisx;
 
-    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
-        play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
+    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK || play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
         Actor_Kill(&this->actor);
     } else {
         this->actionFunc(this, play);
@@ -195,11 +194,11 @@ void ArrowFire_Draw(Actor* thisx, PlayState* play2) {
     EnArrow* arrow;
     Actor* tranform;
 
-    Color_RGB8 primaryColor = {255, 200, 0};
+    Color_RGB8 primaryColor = { 255, 200, 0 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.FirePrimary.Changed"), 0)) {
         primaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.FirePrimary.Value"), primaryColor);
     }
-    Color_RGB8 secondaryColor = {255, 0, 0};
+    Color_RGB8 secondaryColor = { 255, 0, 0 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.FireSecondary.Changed"), 0)) {
         secondaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.FireSecondary.Value"), secondaryColor);
     }
@@ -221,11 +220,9 @@ void ArrowFire_Draw(Actor* thisx, PlayState* play2) {
         // Draw red effect over the screen when arrow hits
         if (this->unk_15C > 0) {
             POLY_XLU_DISP = Gfx_SetupDL_57(POLY_XLU_DISP);
-            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 
-                (s32)((secondaryColor.r / 6) * this->unk_15C) & 0xFF,
-                (s32)((secondaryColor.g / 6) * this->unk_15C) & 0xFF, 
-                (s32)((secondaryColor.b / 6) * this->unk_15C) & 0xFF,
-                (s32)(150.0f * this->unk_15C) & 0xFF);
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (s32)((secondaryColor.r / 6) * this->unk_15C) & 0xFF,
+                            (s32)((secondaryColor.g / 6) * this->unk_15C) & 0xFF,
+                            (s32)((secondaryColor.b / 6) * this->unk_15C) & 0xFF, (s32)(150.0f * this->unk_15C) & 0xFF);
             gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE);
             gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
             gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
@@ -243,8 +240,7 @@ void ArrowFire_Draw(Actor* thisx, PlayState* play2) {
         }
         Matrix_Scale(this->radius * 0.2f, this->unk_158 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
         gSPDisplayList(POLY_XLU_DISP++,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1,
diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
index 38f49e40f7..7b985866ad 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@@ -181,8 +181,7 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play) {
 void ArrowIce_Update(Actor* thisx, PlayState* play) {
     ArrowIce* this = (ArrowIce*)thisx;
 
-    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
-        play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
+    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK || play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
         Actor_Kill(&this->actor);
     } else {
         this->actionFunc(this, play);
@@ -196,11 +195,11 @@ void ArrowIce_Draw(Actor* thisx, PlayState* play) {
     u32 stateFrames = play->state.frames;
     EnArrow* arrow = (EnArrow*)this->actor.parent;
 
-    Color_RGB8 primaryColor = {170, 255, 255};
+    Color_RGB8 primaryColor = { 170, 255, 255 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.IcePrimary.Changed"), 0)) {
         primaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.IcePrimary.Value"), primaryColor);
     }
-    Color_RGB8 secondaryColor = {0, 0, 255};
+    Color_RGB8 secondaryColor = { 0, 0, 255 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.IceSecondary.Changed"), 0)) {
         secondaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.IceSecondary.Value"), secondaryColor);
     }
@@ -219,11 +218,9 @@ void ArrowIce_Draw(Actor* thisx, PlayState* play) {
         // Draw blue effect over the screen when arrow hits
         if (this->unk_164 > 0) {
             POLY_XLU_DISP = Gfx_SetupDL_57(POLY_XLU_DISP);
-            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 
-                (s32)((secondaryColor.r / 6) * this->unk_164) & 0xFF,
-                (s32)((secondaryColor.g / 6) * this->unk_164) & 0xFF, 
-                (s32)((secondaryColor.b / 6) * this->unk_164) & 0xFF,
-                (s32)(150.0f * this->unk_164) & 0xFF);
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (s32)((secondaryColor.r / 6) * this->unk_164) & 0xFF,
+                            (s32)((secondaryColor.g / 6) * this->unk_164) & 0xFF,
+                            (s32)((secondaryColor.b / 6) * this->unk_164) & 0xFF, (s32)(150.0f * this->unk_164) & 0xFF);
             gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE);
             gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
             gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
@@ -241,8 +238,7 @@ void ArrowIce_Draw(Actor* thisx, PlayState* play) {
         }
         Matrix_Scale(this->radius * 0.2f, this->unk_160 * 3.0f, this->radius * 0.2f, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
         gSPDisplayList(POLY_XLU_DISP++,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1,
diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
index 6fa6a70028..4b4d7abce0 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@@ -179,8 +179,7 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play) {
 void ArrowLight_Update(Actor* thisx, PlayState* play) {
     ArrowLight* this = (ArrowLight*)thisx;
 
-    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
-        play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
+    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK || play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
         Actor_Kill(&this->actor);
     } else {
         this->actionFunc(this, play);
@@ -194,11 +193,11 @@ void ArrowLight_Draw(Actor* thisx, PlayState* play) {
     EnArrow* arrow = (EnArrow*)this->actor.parent;
     Actor* tranform;
 
-    Color_RGB8 primaryColor = {255, 255, 170};
+    Color_RGB8 primaryColor = { 255, 255, 170 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.LightPrimary.Changed"), 0)) {
         primaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.LightPrimary.Value"), primaryColor);
     }
-    Color_RGB8 secondaryColor = {255, 255, 0};
+    Color_RGB8 secondaryColor = { 255, 255, 0 };
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.LightSecondary.Changed"), 0)) {
         secondaryColor = CVarGetColor24(CVAR_COSMETIC("Arrows.LightSecondary.Value"), secondaryColor);
     }
@@ -217,11 +216,9 @@ void ArrowLight_Draw(Actor* thisx, PlayState* play) {
         // Draw yellow effect over the screen when arrow hits
         if (this->unk_164 > 0) {
             POLY_XLU_DISP = Gfx_SetupDL_57(POLY_XLU_DISP);
-            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 
-                (s32)((secondaryColor.r / 6) * this->unk_164) & 0xFF,
-                (s32)((secondaryColor.g / 6) * this->unk_164) & 0xFF, 
-                (s32)((secondaryColor.b / 6) * this->unk_164) & 0xFF,
-                (s32)(150.0f * this->unk_164) & 0xFF);
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (s32)((secondaryColor.r / 6) * this->unk_164) & 0xFF,
+                            (s32)((secondaryColor.g / 6) * this->unk_164) & 0xFF,
+                            (s32)((secondaryColor.b / 6) * this->unk_164) & 0xFF, (s32)(150.0f * this->unk_164) & 0xFF);
             gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_DISABLE);
             gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
             gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
@@ -239,8 +236,7 @@ void ArrowLight_Draw(Actor* thisx, PlayState* play) {
         }
         Matrix_Scale(this->radius * 0.2f, this->unk_160 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
         gSPDisplayList(POLY_XLU_DISP++,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1,
diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
index 7b8932432c..a30a1dcd32 100644
--- a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
@@ -130,9 +130,9 @@ void BgBdanObjects_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = func_8086C6EC;
         } else {
             if (BgBdanObjects_GetContactRu1(this, 4)) {
-                if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA,
-                                       thisx->home.pos.x, thisx->home.pos.y, thisx->home.pos.z, 0,
-                                       thisx->shape.rot.y + 0x8000, 0, 3) != NULL) {
+                if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, thisx->home.pos.x,
+                                       thisx->home.pos.y, thisx->home.pos.z, 0, thisx->shape.rot.y + 0x8000, 0,
+                                       3) != NULL) {
                     thisx->child->world.pos.z = thisx->child->home.pos.z + 263.0f;
                 }
                 thisx->world.rot.y = 0;
@@ -235,9 +235,9 @@ void func_8086C29C(BgBdanObjects* this, PlayState* play) {
     }
 
     if (BgBdanObjects_GetContactRu1(this, 3)) {
-        Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA,
-                           this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 140.0f,
-                           this->dyna.actor.world.pos.z, 0, this->dyna.actor.shape.rot.y + 0x8000, 0, 0);
+        Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, this->dyna.actor.world.pos.x,
+                           this->dyna.actor.world.pos.y + 140.0f, this->dyna.actor.world.pos.z, 0,
+                           this->dyna.actor.shape.rot.y + 0x8000, 0, 0);
         BgBdanObjects_SetContactRu1(this, 4);
         this->timer = 10;
         this->actionFunc = func_8086C55C;
diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
index d2b896c243..d2a5c3b701 100644
--- a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@@ -194,8 +194,7 @@ void BgBdanSwitch_Init(Actor* thisx, PlayState* play) {
             }
             break;
         default:
-            osSyncPrintf("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, __FILE__,
-                         __LINE__);
+            osSyncPrintf("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, __FILE__, __LINE__);
             Actor_Kill(&this->dyna.actor);
             return;
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
index 45e4a330a9..d07872de0f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
@@ -204,11 +204,9 @@ void BgBowlWall_Draw(Actor* thisx, PlayState* play2) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPSegment(POLY_OPA_DISP++, 0x8,
-               Gfx_TexScroll(play->state.gfxCtx, 0, -2 * (frames = play->state.frames), 16, 16));
+    gSPSegment(POLY_OPA_DISP++, 0x8, Gfx_TexScroll(play->state.gfxCtx, 0, -2 * (frames = play->state.frames), 16, 16));
     gDPPipeSync(POLY_OPA_DISP++);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->dyna.actor.params == 0) {
         gSPDisplayList(POLY_OPA_DISP++, gBowlingRound1WallDL);
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index 95d12046a2..3bb48ee519 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -109,7 +109,8 @@ void BgBreakwall_Init(Actor* thisx, PlayState* play) {
     s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF;
 
     // Initialize this with the mud wall, so it can't be affected by toggling while the actor is loaded
-    blueFireArrowsEnabledOnMudwallLoad = CVarGetInteger(CVAR_ENHANCEMENT("BlueFireArrows"), 0) || (IS_RANDO && Randomizer_GetSettingValue(RSK_BLUE_FIRE_ARROWS));
+    blueFireArrowsEnabledOnMudwallLoad = CVarGetInteger(CVAR_ENHANCEMENT("BlueFireArrows"), 0) ||
+                                         (IS_RANDO && Randomizer_GetSettingValue(RSK_BLUE_FIRE_ARROWS));
 
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
@@ -160,8 +161,8 @@ void BgBreakwall_Destroy(Actor* thisx, PlayState* play) {
  * Spawns fragments using ACTOR_EN_A_OBJ whenever the wall or floor is exploded.
  * Returns the last spawned actor
  */
-Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos, f32 velocity, f32 scaleY,
-                                  f32 scaleX, s32 count, f32 accel) {
+Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos, f32 velocity, f32 scaleY, f32 scaleX,
+                                  s32 count, f32 accel) {
     Actor* actor;
     Vec3f actorPos;
     s32 k;
@@ -208,10 +209,9 @@ Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos
         for (j = 3; j >= 0; j--) {
             for (k = 3; k >= 0; k--) {
                 Matrix_MultVec3f(&actorPosList[j][k], &actorPos);
-                actor =
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_A_OBJ, Rand_CenteredFloat(20.0f) + actorPos.x,
-                                Rand_CenteredFloat(20.0f) + actorPos.y, Rand_CenteredFloat(20.0f) + actorPos.z,
-                                actorRotList[k].x, actorRotList[k].y + angle1, actorRotList[k].z, 0x000B, true);
+                actor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_A_OBJ, Rand_CenteredFloat(20.0f) + actorPos.x,
+                                    Rand_CenteredFloat(20.0f) + actorPos.y, Rand_CenteredFloat(20.0f) + actorPos.z,
+                                    actorRotList[k].x, actorRotList[k].y + angle1, actorRotList[k].z, 0x000B, true);
 
                 if ((j & 1) == 0) {
                     func_80033480(play, &actorPos, velocity * 200.0f, 1, 650, 150, 1);
@@ -269,8 +269,7 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
         if (this->collider.base.acFlags & AC_HIT) {
             if ((this->collider.base.ac != NULL) && (this->collider.base.ac->id == ACTOR_EN_ARROW)) {
 
-                if (this->collider.base.ac->child != NULL &&
-                    this->collider.base.ac->child->id == ACTOR_ARROW_ICE) {
+                if (this->collider.base.ac->child != NULL && this->collider.base.ac->child->id == ACTOR_ARROW_ICE) {
                     blueFireArrowHit = true;
                 }
             }
@@ -308,11 +307,13 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
                 gSaveContext.cutsceneTrigger = 1;
                 Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
             }
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         if (this->dyna.actor.params < 0) {
-            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         Actor_Kill(&this->dyna.actor);
@@ -350,8 +351,7 @@ void BgBreakwall_Draw(Actor* thisx, PlayState* play) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, this->bombableWallDList);
 
         if (this->colType >= 0) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
index 2fbad32cbc..307df9df4e 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
@@ -173,8 +173,8 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, PlayState* play) {
             func_8003555C(play, &pos1, &sBgDdanKdVelocity, &sBgDdanKdAccel);
         }
         Camera_AddQuake(&play->mainCamera, 0, effectStrength * 0.6f, 3);
-        Audio_PlaySoundGeneral(NA_SE_EV_PILLAR_SINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_PILLAR_SINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
index 8bd9ec874d..ecd684ac63 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
@@ -78,7 +78,7 @@ s16 sBgDodoagoFirstExplosiveFlag = false;
 
 u8 sBgDodoagoDisableBombCatcher;
 
-//static u8 sUnused[90]; // unknown length
+// static u8 sUnused[90]; // unknown length
 
 s32 sBgDodoagoTimer;
 
@@ -160,16 +160,19 @@ void BgDodoago_WaitExplosives(BgDodoago* this, PlayState* play) {
             ((play->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT] == 255) && (this->state == BGDODOAGO_EYE_LEFT))) {
             Flags_SetSwitch(play, this->dyna.actor.params & 0x3F);
             this->state = 0;
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             BgDodoago_SetupAction(this, BgDodoago_OpenJaw);
             OnePointCutscene_Init(play, 3380, 160, &this->dyna.actor, MAIN_CAM);
         } else if (play->roomCtx.unk_74[this->state] == 0) {
             OnePointCutscene_Init(play, 3065, 40, &this->dyna.actor, MAIN_CAM);
             BgDodoago_SetupAction(this, BgDodoago_LightOneEye);
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             OnePointCutscene_Init(play, 3065, 20, &this->dyna.actor, MAIN_CAM);
-            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             sBgDodoagoTimer += 30;
             return;
         }
@@ -247,11 +250,11 @@ void BgDodoago_OpenJaw(BgDodoago* this, PlayState* play) {
 
     if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x1333, 110 - this->state, 0x3E8, 0x32) == 0) {
         BgDodoago_SetupAction(this, BgDodoago_DoNothing);
-        Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
-    } else {
-        Audio_PlaySoundGeneral(NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+        Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
                                &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    } else {
+        Audio_PlaySoundGeneral(NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG, &this->dyna.actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -313,8 +316,7 @@ void BgDodoago_Draw(Actor* thisx, PlayState* play) {
 
     if (Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN)) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDodongoLowerJawDL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index ce8cebd01f..2e3ad78884 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -462,9 +462,8 @@ void BgDyYoseizo_HealPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
 
             beamParams = ((play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) ? 0 : 1);
 
-            this->beam =
-                (EnDyExtra*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DY_EXTRA,
-                                               beamPos.x, beamPos.y, beamPos.z, 0, 0, 0, beamParams);
+            this->beam = (EnDyExtra*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DY_EXTRA,
+                                                        beamPos.x, beamPos.y, beamPos.z, 0, 0, 0, beamParams);
         }
     }
     if (this->refillTimer > 1) {
@@ -710,8 +709,8 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) {
 
         } else if (!this->lightBallSpawned) {
             demoEffectParams = ((s16)(sDemoEffectLightColors[actionIndex] << 0xC) | DEMO_EFFECT_LIGHT);
-            Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, (s32)demoEffectParams, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, 0, 0, (s32)demoEffectParams, true);
             this->lightBallSpawned = true;
         }
     } else {
@@ -761,9 +760,8 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) {
             itemPos.y = (LINK_IS_ADULT ? player->actor.world.pos.y + 73.0f : player->actor.world.pos.y + 53.0f);
             itemPos.z = player->actor.world.pos.z;
 
-            this->item =
-                (EnExItem*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM,
-                                              itemPos.x, itemPos.y, itemPos.z, 0, 0, 0, sExItemTypes[actionIndex]);
+            this->item = (EnExItem*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, itemPos.x,
+                                                       itemPos.y, itemPos.z, 0, 0, 0, sExItemTypes[actionIndex]);
 
             if (this->item != NULL) {
                 if (gSaveContext.isMagicAcquired == 0) {
@@ -806,8 +804,8 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) {
     if ((play->csCtx.npcActions[0]->action >= 19) && (play->csCtx.npcActions[0]->action < 22) &&
         !this->warpEffectSpawned) {
         actionIndex = play->csCtx.npcActions[0]->action - 11;
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, player->actor.world.pos.x,
-                    player->actor.world.pos.y, player->actor.world.pos.z, 0, 0, 0, actionIndex, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, player->actor.world.pos.x, player->actor.world.pos.y,
+                    player->actor.world.pos.z, 0, 0, 0, actionIndex, true);
         this->warpEffectSpawned = true;
     }
     BgDyYoseizo_Bob(this, play);
@@ -835,16 +833,16 @@ void BgDyYoseizo_Update(Actor* thisx, PlayState* play2) {
     if (play->csCtx.state != CS_STATE_IDLE) {
         phi_v1 = 0;
         if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
-            if ((play->csCtx.frames == 32) || (play->csCtx.frames == 291) ||
-                (play->csCtx.frames == 426) || (play->csCtx.frames == 851)) {
+            if ((play->csCtx.frames == 32) || (play->csCtx.frames == 291) || (play->csCtx.frames == 426) ||
+                (play->csCtx.frames == 851)) {
                 phi_v1 = 1;
             }
             if (play->csCtx.frames == 101) {
                 phi_v1 = 2;
             }
         } else {
-            if ((play->csCtx.frames == 35) || (play->csCtx.frames == 181) ||
-                (play->csCtx.frames == 462) || (play->csCtx.frames == 795)) {
+            if ((play->csCtx.frames == 35) || (play->csCtx.frames == 181) || (play->csCtx.frames == 462) ||
+                (play->csCtx.frames == 795)) {
                 phi_v1 = 1;
             }
             if (play->csCtx.frames == 90) {
@@ -878,8 +876,7 @@ void BgDyYoseizo_Update(Actor* thisx, PlayState* play2) {
     Actor_SetScale(&this->actor, this->scale);
 }
 
-s32 BgDyYoseizo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx) {
+s32 BgDyYoseizo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BgDyYoseizo* this = (BgDyYoseizo*)thisx;
 
     if (limbIndex == 8) { // Torso
@@ -1027,7 +1024,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, PlayState* play) {
 
     for (i = 0; i < 200; i++, particle++) {
         FrameInterpolation_RecordOpenChild(particle, particle->epoch);
-        
+
         if (particle->alive == 1) {
             if (phi_s3 == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleMaterialDL));
@@ -1045,11 +1042,10 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, PlayState* play) {
             Matrix_Scale(particle->scale, particle->scale, 1.0f, MTXMODE_APPLY);
             Matrix_RotateZ(particle->roll, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleModelDL));
         }
-        
+
         FrameInterpolation_RecordCloseChild();
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
index ae2067e647..2754e9bae8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
@@ -221,11 +221,11 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play) {
         }
     } else {
         if (this->dropTimer == 1) {
-            Audio_PlaySoundGeneral(NA_SE_EV_STONEDOOR_STOP, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_STONEDOOR_STOP, &this->dyna.actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         Math_ApproachF(&this->dyna.actor.world.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ);
         Math_ApproachF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 0.1f);
@@ -316,8 +316,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, PlayState* play) {
                         Matrix_Push();
                         Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
                         Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
-                        gSPMatrix(POLY_OPA_DISP++,
-                                  MATRIX_NEWMTX(play->state.gfxCtx),
+                        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                         gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDL);
                         Matrix_Pop();
@@ -354,8 +353,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, PlayState* play) {
                         Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
                         Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
                         Matrix_Scale(0.3f, platform->flashYScale * 0.3f, 0.3f, MTXMODE_APPLY);
-                        gSPMatrix(POLY_XLU_DISP++,
-                                  MATRIX_NEWMTX(play->state.gfxCtx),
+                        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                         gSPDisplayList(POLY_XLU_DISP++, sFlashDL);
                         Matrix_Pop();
diff --git a/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
index 2c4ef32ec6..b3c38827fd 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
@@ -131,8 +131,7 @@ void BgGateShutter_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gKakarikoGuardGateDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
index 59c72119f7..c03e08da7c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@@ -87,11 +87,9 @@ u8 CheckPlayerPosition(Player* player, PlayState* play) {
 void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    u8 vanillaBridgeCondition = 
-        CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) &&
-        CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
-        (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) &&
-        CheckPlayerPosition(player, play);
+    u8 vanillaBridgeCondition = CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
+                                (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) &&
+                                CheckPlayerPosition(player, play);
 
     if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_RAINBOW_BRIDGE, vanillaBridgeCondition)) {
         LaunchBridgeCutscene(this, play);
@@ -99,10 +97,8 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play) {
 }
 
 void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play) {
-    u8 vanillaBridgeCondition = 
-        (play->csCtx.state != CS_STATE_IDLE) && 
-        (play->csCtx.npcActions[2] != NULL) &&
-        (play->csCtx.npcActions[2]->action == 2);
+    u8 vanillaBridgeCondition = (play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[2] != NULL) &&
+                                (play->csCtx.npcActions[2]->action == 2);
 
     if (!GameInteractor_Should(VB_PLAY_RAINBOW_BRIDGE_CS, true) || vanillaBridgeCondition) {
         this->dyna.actor.draw = BgGjyoBridge_Draw;
@@ -125,15 +121,13 @@ void BgGjyoBridge_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 8,
-               Gfx_TexScroll(play->state.gfxCtx, play->gameplayFrames & 127,
-                             play->gameplayFrames * -3 & 127, 32, 32));
+               Gfx_TexScroll(play->state.gfxCtx, play->gameplayFrames & 127, play->gameplayFrames * -3 & 127, 32, 32));
 
     gSPSegment(POLY_XLU_DISP++, 9,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, -play->gameplayFrames & 127, 32, 32, 1, 0,
                                 play->gameplayFrames & 127, 32, 32));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, gRainbowBridgeDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
index c2ad6c164d..00f61c7fc3 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_gnd_darkmeiro.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
@@ -115,7 +116,9 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* this, PlayState* play) {
     if (Flags_GetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 1)) {
         if (this->actionFlags & 4) {
             if (this->timer1 > 0) {
-                this->timer1--;
+                if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer1)) {
+                    this->timer1--;
+                }
             } else {
                 Flags_UnsetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 1);
                 this->actionFlags &= ~4;
@@ -123,14 +126,17 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* this, PlayState* play) {
         } else {
             this->actionFlags |= 4;
             this->timer1 = 304;
-            Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
     if (Flags_GetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 2)) {
         if (this->actionFlags & 8) {
             if (this->timer2 > 0) {
-                this->timer2--;
+                if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer2)) {
+                    this->timer2--;
+                }
             } else {
                 Flags_UnsetSwitch(play, ((this->dyna.actor.params >> 8) & 0x3F) + 2);
                 this->actionFlags &= ~8;
@@ -138,7 +144,8 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* this, PlayState* play) {
         } else {
             this->actionFlags |= 8;
             this->timer2 = 304;
-            Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
index b136c995a4..c571b3548a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
@@ -114,7 +114,8 @@ void BgGndFiremeiro_Rise(BgGndFiremeiro* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     Actor* thisx = &this->dyna.actor;
 
-    if ((player->currentBoots != PLAYER_BOOTS_HOVER) && DynaPolyActor_IsPlayerOnTop(&this->dyna)) { // Player standing on it
+    if ((player->currentBoots != PLAYER_BOOTS_HOVER) &&
+        DynaPolyActor_IsPlayerOnTop(&this->dyna)) { // Player standing on it
         if (thisx->world.pos.y < this->initPos.y) {
             this->actionFunc = BgGndFiremeiro_Sink;
             this->timer = 20;
@@ -142,8 +143,7 @@ void BgGndFiremeiro_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_37Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFireTrialPlatformDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
index 54bea87429..f5a2b32486 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
@@ -73,8 +73,8 @@ void BgGndSoulmeiro_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = func_8087B284;
             if (Flags_GetSwitch(play, (this->actor.params >> 8) & 0x3F)) {
 
-                Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x,
-                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 9, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y,
+                            this->actor.world.pos.z, 0, 0, 0, 9, true);
                 this->actor.draw = NULL;
                 Actor_Kill(&this->actor);
                 return;
@@ -121,8 +121,8 @@ void func_8087AF38(BgGndSoulmeiro* this, PlayState* play) {
     if (!this->unk_198) {
         Flags_SetSwitch(play, (thisx->params >> 8) & 0x3F);
         Actor_Kill(&this->actor);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, thisx->world.pos.x, thisx->world.pos.y,
-                    thisx->world.pos.z, 0, 0, 0, 9, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, 0,
+                    0, 0, 9, true);
     } else if ((this->unk_198 % 6) == 0) {
         s32 i;
         s16 temp_2 = Rand_ZeroOne() * (10922.0f); // This should be: 0x10000 / 6.0f
@@ -150,8 +150,8 @@ void func_8087AF38(BgGndSoulmeiro* this, PlayState* play) {
             vecA.x = 4.0f * temp_3 * distXZ;
             vecA.y = 0.0f;
             vecA.z = 4.0f * temp_4 * distXZ;
-            EffectSsDeadDb_Spawn(play, &thisx->home.pos, &vecA, &zeroVec, 60, 6, 255, 255, 150, 170, 255, 0, 0, 1,
-                                 14, true);
+            EffectSsDeadDb_Spawn(play, &thisx->home.pos, &vecA, &zeroVec, 60, 6, 255, 255, 150, 170, 255, 0, 0, 1, 14,
+                                 true);
             temp_2 += 0x2AAA;
         }
     }
@@ -163,7 +163,8 @@ void func_8087B284(BgGndSoulmeiro* this, PlayState* play) {
     if (!Flags_GetSwitch(play, (this->actor.params >> 8) & 0x3F)) {
         this->actor.draw = BgGndSoulmeiro_Draw;
         if (this->collider.base.acFlags & AC_HIT) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->unk_198 = 40;
             this->actionFunc = func_8087AF38;
         } else {
@@ -201,8 +202,7 @@ void BgGndSoulmeiro_Draw(Actor* thisx, PlayState* play) {
         case 0:
             OPEN_DISPS(play->state.gfxCtx);
             Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, dLists[params]);
             CLOSE_DISPS(play->state.gfxCtx);
             break;
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
index badec15e1d..c7e72790bc 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
@@ -69,7 +69,8 @@ void func_8087B7E8(BgHaka* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (this->dyna.unk_150 != 0.0f) {
-        if (play->sceneNum == SCENE_GRAVEYARD && !LINK_IS_ADULT && IS_DAY && !CVarGetInteger(CVAR_ENHANCEMENT("DayGravePull"), 0)) {
+        if (play->sceneNum == SCENE_GRAVEYARD && !LINK_IS_ADULT && IS_DAY &&
+            !CVarGetInteger(CVAR_ENHANCEMENT("DayGravePull"), 0)) {
             this->dyna.unk_150 = 0.0f;
             player->stateFlags2 &= ~PLAYER_STATE2_MOVING_DYNAPOLY;
             if (!Play_InCsMode(play)) {
@@ -117,9 +118,8 @@ void func_8087B938(BgHaka* this, PlayState* play) {
         if (this->dyna.actor.params == 1) {
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
         } else if (!IS_DAY && play->sceneNum == SCENE_GRAVEYARD) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x,
-                        this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
-                        1, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y,
+                        this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0, 1, true);
         }
 
         // un tss un tss
@@ -184,8 +184,8 @@ void BgHaka_Draw(Actor* thisx, PlayState* play) {
     newColor.b = sin(frequency * ((graveHue + index) % 360) + 4) * 127 + 128;
 
     graveHue++;
-    if (graveHue >= 360) graveHue = 0;
-
+    if (graveHue >= 360)
+        graveHue = 0;
 
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -207,15 +207,13 @@ void BgHaka_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGravestoneStoneDL);
     if (((BgHaka*)thisx)->state == 2) {
         gSPGrayscale(POLY_OPA_DISP++, false);
     }
     Matrix_Translate(0.0f, 0.0f, thisx->minVelocityY * 10.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gGravestoneEarthDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index ed60cfe3d8..beea493809 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -319,8 +319,8 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, PlayState* play) {
 
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                    (this->vScrollTimer * -20) & 0x1FF, 0x20, 0x80));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->vScrollTimer * -20) & 0x1FF,
+                                    0x20, 0x80));
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
 
@@ -328,8 +328,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, PlayState* play) {
         Matrix_RotateY(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) * (M_PI / 0x8000), MTXMODE_APPLY);
         scale = this->vFlameScale * 0.00001f;
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         CLOSE_DISPS(play->state.gfxCtx);
     }
@@ -355,15 +354,13 @@ void BgHakaGate_Draw(Actor* thisx, PlayState* play) {
             Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
             Matrix_RotateX(this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY);
             Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010A10);
             Matrix_Put(&currentMtxF);
             Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY);
             Matrix_RotateX(-this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY);
             Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010C10);
             CLOSE_DISPS(play->state.gfxCtx);
         } else {
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
index 31adbca41a..dc77df64d0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
@@ -290,7 +290,9 @@ void BgHakaSgami_Update(Actor* thisx, PlayState* play) {
     BgHakaSgami* this = (BgHakaSgami*)thisx;
     Player* player = GET_PLAYER(play);
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == BgHakaSgami_SetupSpin)) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) ||
+        (this->actionFunc == BgHakaSgami_SetupSpin)) {
         this->actionFunc(this, play);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
index aef728cdb5..e595b8e627 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
@@ -7,6 +7,8 @@
 #include "z_bg_haka_ship.h"
 #include "objects/object_haka_objects/object_haka_objects.h"
 
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void BgHakaShip_Init(Actor* thisx, PlayState* play);
@@ -133,7 +135,7 @@ void BgHakaShip_Move(BgHakaShip* this, PlayState* play) {
         this->dyna.actor.speedXZ = 0.0f;
         Message_StartTextbox(play, 0x5071, NULL);
         this->actionFunc = BgHakaShip_SetupCrash;
-    } else {
+    } else if (GameInteractor_Should(VB_SHADOW_SHIP_SET_SPEED, true, this, play)) {
         Math_StepToF(&this->dyna.actor.speedXZ, 4.0f, 0.2f);
     }
     child = this->dyna.actor.child;
@@ -179,7 +181,8 @@ void BgHakaShip_CrashFall(BgHakaShip* this, PlayState* play) {
         }
     } else {
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCKSINK - SFX_FLAG);
-        if ((this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 500.0f) && DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
+        if ((this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 500.0f) &&
+            DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
             Play_TriggerVoidOut(play);
         }
     }
@@ -201,23 +204,19 @@ void BgHakaShip_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     if (this->dyna.actor.params == 0) {
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00D330);
         angleTemp = this->yOffset * (M_PI / 0x8000);
         Matrix_Translate(-3670.0f, 620.0f, 1150.0f, MTXMODE_APPLY);
         Matrix_RotateZ(angleTemp, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70);
         Matrix_Translate(0.0f, 0.0f, -2300.0f, MTXMODE_APPLY);
         Matrix_RotateZ(-(2.0f * angleTemp), MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70);
     } else {
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00E910);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
index d16c190495..2563a848a3 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
@@ -275,8 +275,7 @@ void func_808802D8(BgHakaTrap* this, PlayState* play) {
         vector.y = Rand_ZeroOne() * 10.0f + this->dyna.actor.world.pos.y + 30.0f;
         vector.z = Rand_CenteredFloat(320.0f) + this->dyna.actor.world.pos.z;
 
-        EffectSsDeadDb_Spawn(play, &vector, &zeroVec, &zeroVec, 130, 20, 255, 255, 150, 170, 255, 0, 0, 1, 9,
-                             false);
+        EffectSsDeadDb_Spawn(play, &vector, &zeroVec, &zeroVec, 130, 20, 255, 255, 150, 170, 255, 0, 0, 1, 9, false);
     }
 
     if (this->timer == 0) {
@@ -370,9 +369,9 @@ void func_808806BC(BgHakaTrap* this, PlayState* play) {
     tempf20 = this->dyna.actor.floorHeight;
 
     for (i = 0; i < 3; i++) {
-        temp = BgCheck_EntityRaycastFloor4(&play->colCtx, &this->dyna.actor.floorPoly, &sp64, &this->dyna.actor,
-                                           &vector) -
-               25.0f;
+        temp =
+            BgCheck_EntityRaycastFloor4(&play->colCtx, &this->dyna.actor.floorPoly, &sp64, &this->dyna.actor, &vector) -
+            25.0f;
         if (tempf20 < temp) {
             tempf20 = temp;
         }
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index e0316097bb..e1f4279e74 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
@@ -129,8 +129,7 @@ void BgHakaTubo_Idle(BgHakaTubo* this, PlayState* play) {
             pos.y = this->dyna.actor.world.pos.y + 80.0f;
             EffectSsBomb2_SpawnLayered(play, &pos, &sZeroVector, &sZeroVector, 100, 45);
             SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 50, NA_SE_EV_BOX_BREAK);
-            EffectSsHahen_SpawnBurst(play, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40,
-                                     gEffFragments2DL);
+            EffectSsHahen_SpawnBurst(play, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40, gEffFragments2DL);
             this->dropTimer = 5;
             this->dyna.actor.draw = NULL;
             Actor_SetScale(&this->dyna.actor, 0.0f);
@@ -183,7 +182,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
                 // Random rewards
                 if (CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
                     collectibleParams = -1;
-                } else if(rnd < 0.4f) {
+                } else if (rnd < 0.4f) {
                     collectibleParams = ITEM00_BOMBS_A;
                 } else if (rnd < 0.6f) {
                     collectibleParams = ITEM00_MAGIC_LARGE;
@@ -198,8 +197,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
             // If small key already collected, drop recovery heart instead
             if (CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) {
                 collectibleParams = -1;
-            }
-            else {
+            } else {
                 collectibleParams = ITEM00_HEART;
             }
             Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
@@ -241,8 +239,7 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, PlayState* play) {
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->fireScroll & 127, 0, 32, 64, 1, 0,
                                 (this->fireScroll * -15) & 0xFF, 32, 64));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
index 08a03bcdcd..224bc0eacf 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
@@ -123,12 +123,10 @@ void BgHakaWater_Draw(Actor* thisx, PlayState* play) {
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(0.765f * temp));
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128,
-                                play->gameplayFrames % 128, 32, 32, 1, 0, (0 - play->gameplayFrames) % 128,
-                                32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, play->gameplayFrames % 128, 32, 32,
+                                1, 0, (0 - play->gameplayFrames) % 128, 32, 32));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBotwWaterRingDL);
 
     Matrix_Translate(0.0f, 92.0f, -1680.0f, MTXMODE_NEW);
@@ -140,8 +138,7 @@ void BgHakaWater_Draw(Actor* thisx, PlayState* play) {
 
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(5.1f * temp));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBotwWaterFallDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/soh/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
index 577584ed06..ac7f506da6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
@@ -238,8 +238,8 @@ void func_80882CC4(BgHakaZou* this, PlayState* play) {
             actorSpawnPos.z = this->dyna.actor.world.pos.z + (j - 1) * cos;
             actorSpawnPos.y = this->dyna.actor.world.pos.y + (i - 1) * 55;
 
-            Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HAKA_ZOU, actorSpawnPos.x, actorSpawnPos.y,
-                        actorSpawnPos.z, 0, this->dyna.actor.shape.rot.y, 0, this->dyna.actor.params + 2, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HAKA_ZOU, actorSpawnPos.x, actorSpawnPos.y, actorSpawnPos.z, 0,
+                        this->dyna.actor.shape.rot.y, 0, this->dyna.actor.params + 2, true);
             func_800286CC(play, &actorSpawnPos, &sZeroVec, &sZeroVec, 1000, 50);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index e4c6157b63..9d950e24ff 100644
--- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -77,7 +77,8 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) {
 void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, PlayState* play) {
     s32 pad[2];
     CollisionHeader* colHeader = NULL;
-    this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE;
+    this->dyna.actor.flags |=
+        ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE;
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
     CollisionHeader_GetVirtual(&gHeavyBlockCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
@@ -305,10 +306,10 @@ void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, PlayState* play) {
         pos.y = this->dyna.actor.world.pos.y + (spA4[i].y * cosPitch) + (-spA4[i].z * sinPitch);
         pos.z = this->dyna.actor.world.pos.z + (spA4[i].x * -sinYaw) + (cosYaw * pos.z);
 
-        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z,
-                    this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, 0, 2, true);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z,
-                    this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, 0, 3, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z, this->dyna.actor.shape.rot.x,
+                    this->dyna.actor.shape.rot.y, 0, 2, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_HEAVY_BLOCK, pos.x, pos.y, pos.z, this->dyna.actor.shape.rot.x,
+                    this->dyna.actor.shape.rot.y, 0, 3, true);
 
         BgHeavyBlock_SpawnDust(play, pos.x, pos.y, pos.z, 0.0f, 0.0f, 0.0f, 0);
     }
@@ -412,8 +413,7 @@ void BgHeavyBlock_Fly(BgHeavyBlock* this, PlayState* play) {
                 Quake_SetQuakeValues(quakeIndex, 5, 0, 0, 0);
                 Quake_SetCountdown(quakeIndex, 999);
 
-                SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 30,
-                                                   NA_SE_EV_ELECTRIC_EXPLOSION);
+                SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 30, NA_SE_EV_ELECTRIC_EXPLOSION);
                 return;
             case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE:
                 Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
@@ -507,8 +507,7 @@ void BgHeavyBlock_Draw(Actor* thisx, PlayState* play) {
     Matrix_MultVec3f(&D_80884ED4, &thisx->home.pos);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gHeavyBlockEntirePillarDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
index 10e3c6a832..de1578b240 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_hidan_curtain.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -76,8 +77,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
     this->type = (thisx->params >> 0xC) & 0xF;
     if (this->type > 6) {
         // "Type is not set"
-        osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                     __LINE__, this->actor.params);
+        osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                     this->actor.params);
         Actor_Kill(&this->actor);
         return;
     }
@@ -89,8 +90,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
 
     if ((this->actor.params < 0) || (this->actor.params > 0x3F)) {
         // "Save bit is not set"
-        osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n",
-                     __FILE__, __LINE__, this->actor.params);
+        osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                     this->actor.params);
     }
     Actor_SetScale(&this->actor, hcParams->scale);
     Collider_InitCylinder(play, &this->collider);
@@ -191,7 +192,10 @@ void BgHidanCurtain_TurnOff(BgHidanCurtain* this, PlayState* play) {
 }
 
 void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, PlayState* play) {
-    DECR(this->timer);
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
+        DECR(this->timer);
+    }
+
     if (this->timer == 0) {
         this->actionFunc = BgHidanCurtain_TurnOn;
     }
@@ -253,8 +257,7 @@ void BgHidanCurtain_Draw(Actor* thisx, PlayState* play) {
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->texScroll & 0x7F, 0, 0x20, 0x40, 1, 0,
                                 (this->texScroll * -0xF) & 0xFF, 0x20, 0x40));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
index ff44c33b88..185bb3d2ac 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
@@ -209,8 +209,7 @@ void BgHidanFirewall_Draw(Actor* thisx, PlayState* play) {
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFireballTexs[this->unk_150]));
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gFireTempleFireballUpperHalfDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
index b250892152..40e6b5e63f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
@@ -48,9 +48,9 @@ void BgHidanFslift_Init(Actor* thisx, PlayState* play) {
     DynaPolyActor_Init(&this->dyna, DPM_PLAYER);
     CollisionHeader_GetVirtual(&gFireTempleHookshotElevatorCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
-    if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_OBJ_HSBLOCK,
-                           this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 40.0f,
-                           this->dyna.actor.world.pos.z + -28.0f, 0, 0, 0, 2) == NULL) {
+    if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_OBJ_HSBLOCK, this->dyna.actor.world.pos.x,
+                           this->dyna.actor.world.pos.y + 40.0f, this->dyna.actor.world.pos.z + -28.0f, 0, 0, 0,
+                           2) == NULL) {
         Actor_Kill(&this->dyna.actor);
         return;
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
index 11f3e9a605..3d46f41c54 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
@@ -8,6 +8,7 @@
 #include "z_bg_hidan_fwbig.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -165,9 +166,10 @@ void BgHidanFwbig_Lower(BgHidanFwbig* this, PlayState* play) {
 }
 
 void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, PlayState* play) {
-    if (this->timer != 0) {
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
         this->timer--;
     }
+
     if (this->timer == 0) {
         this->actionFunc = BgHidanFwbig_Rise;
     }
@@ -269,8 +271,7 @@ void BgHidanFwbig_Draw(Actor* thisx, PlayState* play) {
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 0x80, 0, 0x20, 0x40, 1, 0,
                                 (u8)(play->gameplayFrames * -15), 0x20, 0x40));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigFireWallDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
index 8185335716..a3e18a0799 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
@@ -115,9 +115,9 @@ s32 BgHidanHamstep_SpawnChildren(BgHidanHamstep* this, PlayState* play2) {
         params = (i + 1) & 0xFF;
         params |= (this->dyna.actor.params & 0xFF00);
 
-        step = (BgHidanHamstep*)Actor_SpawnAsChild(
-            &play->actorCtx, &step->dyna.actor, play, ACTOR_BG_HIDAN_HAMSTEP, pos.x, pos.y, pos.z,
-            this->dyna.actor.world.rot.x, this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z, params);
+        step = (BgHidanHamstep*)Actor_SpawnAsChild(&play->actorCtx, &step->dyna.actor, play, ACTOR_BG_HIDAN_HAMSTEP,
+                                                   pos.x, pos.y, pos.z, this->dyna.actor.world.rot.x,
+                                                   this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z, params);
 
         if (step == NULL) {
             return 0;
@@ -306,7 +306,6 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) {
         } else {
             this->dyna.actor.velocity.y *= -0.24f;
 
-
             if (this->unk_244 == 1) {
                 quakeIndex = Quake_Add(GET_ACTIVE_CAM(play), 3);
                 Quake_SetSpeed(quakeIndex, -15536);
@@ -364,7 +363,6 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) {
         } else {
             this->dyna.actor.velocity.y *= -0.24f;
 
-
             if (this->unk_244 == 1) {
                 quakeIndex = Quake_Add(GET_ACTIVE_CAM(play), 3);
                 Quake_SetSpeed(quakeIndex, -15536);
@@ -399,8 +397,7 @@ void BgHidanHamstep_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if ((thisx->params & 0xFF) == 0) {
         gSPDisplayList(POLY_OPA_DISP++, gFireTempleStoneStep1DL);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
index 39d642c39c..a1dbc1158c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
@@ -155,8 +155,7 @@ void BgHidanKousi_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, sMetalFencesDLs[thisx->params & 0xFF]);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
index c9cbb039f0..328d1f4c08 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
@@ -119,8 +119,8 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) {
     if (((this->dyna.actor.params & 0xFF) < CRACKED_STONE_FLOOR) ||
         ((this->dyna.actor.params & 0xFF) > LARGE_BOMBABLE_WALL)) {
         // "Error: Fire Temple Breakable Walls. arg_data I can't determine the (%s %d)(arg_data 0x%04x)"
-        osSyncPrintf("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
-                     __FILE__, __LINE__, this->dyna.actor.params);
+        osSyncPrintf("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", __FILE__,
+                     __LINE__, this->dyna.actor.params);
         Actor_Kill(&this->dyna.actor);
         return;
     }
@@ -328,8 +328,7 @@ void BgHidanKowarerukabe_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, sBreakableWallDLists[this->dyna.actor.params & 0xFF]);
 
     Collider_UpdateSpheres(0, &this->collider);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
index aaebd9f3ca..00793b6813 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
@@ -137,9 +137,10 @@ void func_8088B268(BgHidanRock* this, PlayState* play) {
                 }
             }
 
-            this->dyna.actor.speedXZ = this->dyna.actor.speedXZ + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.3) + 0.5f;
             this->dyna.actor.speedXZ =
-                CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.5));
+                this->dyna.actor.speedXZ + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.3) + 0.5f;
+            this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ,
+                                                 2.0f + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.5));
 
             if (D_8088BFC0 > 0.0f) {
                 temp_v1 = Math_StepToF(&D_8088BFC0, 20.0f, this->dyna.actor.speedXZ);
@@ -372,8 +373,7 @@ void func_8088BC40(PlayState* play, BgHidanRock* this) {
     Matrix_Scale(6.0f, this->unk_16C, 6.0f, MTXMODE_APPLY);
 
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sVerticalFlamesTexs[play->gameplayFrames & 7]));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigVerticalFlameDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
index c70d250ad8..9c7fd0857d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
@@ -214,9 +214,7 @@ Gfx* BgHidanRsekizou_DrawFireball(PlayState* play, BgHidanRsekizou* this, s16 fr
     mf->yw = (this->dyna.actor.world.pos.y + 30.0f) + ((7.0f / 10.0f) * fVar6);
     mf->zw = (tmpf7 * coss) + this->dyna.actor.world.pos.z;
 
-    gSPMatrix(displayList++,
-              Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(mf),
-                               Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
+    gSPMatrix(displayList++, Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(mf), Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(displayList++, gFireTempleFireballDL);
 
@@ -233,8 +231,7 @@ void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFireTempleSpinningFlamethrowerDL);
     Matrix_MtxFCopy(&mf, &gMtxFClear);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
index fc2cfc6a48..2f62debff9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
@@ -318,9 +318,7 @@ Gfx* func_8088D9F4(PlayState* play, BgHidanSekizou* this, s16 arg2, MtxF* arg3,
     arg3->xw = (temp_f2 * arg4) + this->dyna.actor.world.pos.x;
     arg3->yw = this->dyna.actor.world.pos.y + 30.0f + (.7f * phi_f12);
     arg3->zw = (temp_f2 * arg5) + this->dyna.actor.world.pos.z;
-    gSPMatrix(arg7++,
-              Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(arg3),
-                               Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
+    gSPMatrix(arg7++, Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(arg3), Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(arg7++, gFireTempleFireballDL);
@@ -397,8 +395,7 @@ void BgHidanSekizou_Draw(Actor* thisx, PlayState* play2) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     if (this->dyna.actor.params == 0) {
         gSPDisplayList(POLY_OPA_DISP++, gFireTempleStationaryFlamethrowerShortDL);
     } else {
@@ -408,15 +405,15 @@ void BgHidanSekizou_Draw(Actor* thisx, PlayState* play2) {
     if (this->dyna.actor.params == 0) {
         if (this->unk_168[0] > 0) {
             if ((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - this->dyna.actor.shape.rot.y) >= 0) {
-                POLY_XLU_DISP = func_8088DC50(play, this, this->dyna.actor.shape.rot.y + 0x2000, this->unk_168[0],
-                                              POLY_XLU_DISP);
-                POLY_XLU_DISP = func_8088DC50(play, this, this->dyna.actor.shape.rot.y - 0x2000, this->unk_168[0],
-                                              POLY_XLU_DISP);
+                POLY_XLU_DISP =
+                    func_8088DC50(play, this, this->dyna.actor.shape.rot.y + 0x2000, this->unk_168[0], POLY_XLU_DISP);
+                POLY_XLU_DISP =
+                    func_8088DC50(play, this, this->dyna.actor.shape.rot.y - 0x2000, this->unk_168[0], POLY_XLU_DISP);
             } else {
-                POLY_XLU_DISP = func_8088DC50(play, this, this->dyna.actor.shape.rot.y - 0x2000, this->unk_168[0],
-                                              POLY_XLU_DISP);
-                POLY_XLU_DISP = func_8088DC50(play, this, this->dyna.actor.shape.rot.y + 0x2000, this->unk_168[0],
-                                              POLY_XLU_DISP);
+                POLY_XLU_DISP =
+                    func_8088DC50(play, this, this->dyna.actor.shape.rot.y - 0x2000, this->unk_168[0], POLY_XLU_DISP);
+                POLY_XLU_DISP =
+                    func_8088DC50(play, this, this->dyna.actor.shape.rot.y + 0x2000, this->unk_168[0], POLY_XLU_DISP);
             }
         }
     } else {
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
index 2b9331ab8a..eea4a8a593 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
@@ -118,7 +118,8 @@ void func_8088E518(BgHidanSima* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 3.4f);
-    if (DynaPolyActor_IsPlayerOnTop(&this->dyna) && !(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
+    if (DynaPolyActor_IsPlayerOnTop(&this->dyna) &&
+        !(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
         this->timer = 20;
         this->dyna.actor.world.rot.y = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4000;
         if (this->dyna.actor.home.pos.y <= this->dyna.actor.world.pos.y) {
@@ -259,18 +260,14 @@ Gfx* func_8088EB54(PlayState* play, BgHidanSima* this, Gfx* gfx) {
         mtxF.zz += 0.4f;
 
         gSPSegment(gfx++, 0x09, SEGMENTED_TO_VIRTUAL(sFireballsTexs[(this->timer + s3) % 7]));
-        gSPMatrix(gfx++,
-                  Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&mtxF),
-                                   Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
+        gSPMatrix(gfx++, Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&mtxF), Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(gfx++, gFireTempleFireballDL);
     }
     mtxF.xw = this->dyna.actor.world.pos.x + (phi_s5 * 25 + 80) * sin;
     mtxF.zw = this->dyna.actor.world.pos.z + (phi_s5 * 25 + 80) * cos;
     gSPSegment(gfx++, 0x09, SEGMENTED_TO_VIRTUAL(sFireballsTexs[(this->timer + s3) % 7]));
-    gSPMatrix(gfx++,
-              Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&mtxF),
-                               Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
+    gSPMatrix(gfx++, Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&mtxF), Graph_Alloc(play->state.gfxCtx, sizeof(Mtx))),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(gfx++, gFireTempleFireballDL);
     return gfx;
@@ -281,8 +278,7 @@ void BgHidanSima_Draw(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     if (this->dyna.actor.params == 0) {
         gSPDisplayList(POLY_OPA_DISP++, gFireTempleStonePlatform1DL);
     } else {
diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
index 9810f27495..c4b1eb23fe 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
@@ -106,7 +106,8 @@ void func_80890740(BgIceShelter* this, PlayState* play) {
     s32 type = (this->dyna.actor.params >> 8) & 7;
 
     // Initialize this with the red ice, so it can't be affected by toggling while the actor is loaded
-    blueFireArrowsEnabledOnRedIceLoad = CVarGetInteger(CVAR_ENHANCEMENT("BlueFireArrows"), 0) || (IS_RANDO && Randomizer_GetSettingValue(RSK_BLUE_FIRE_ARROWS));
+    blueFireArrowsEnabledOnRedIceLoad = CVarGetInteger(CVAR_ENHANCEMENT("BlueFireArrows"), 0) ||
+                                        (IS_RANDO && Randomizer_GetSettingValue(RSK_BLUE_FIRE_ARROWS));
 
     Collider_InitCylinder(play, &this->cylinder1);
     // If "Blue Fire Arrows" is enabled, set up a collider on the red ice that responds to them
@@ -360,7 +361,8 @@ void func_8089107C(BgIceShelter* this, PlayState* play) {
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->cylinder1.base);
 }
 
-// For "Blue Fire Arrows" enhancement: If hit by an Ice Arrow, melt the red ice (copied from the default blue fire function above).
+// For "Blue Fire Arrows" enhancement: If hit by an Ice Arrow, melt the red ice (copied from the default blue fire
+// function above).
 void MeltOnIceArrowHit(BgIceShelter* this, ColliderCylinder cylinder, s16 type, PlayState* play) {
     if (cylinder.base.acFlags & AC_HIT) {
         cylinder.base.acFlags &= ~AC_HIT;
@@ -450,8 +452,7 @@ void BgIceShelter_Draw(Actor* thisx, PlayState* play2) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     switch ((this->dyna.actor.params >> 8) & 7) {
         case 0:
@@ -463,7 +464,7 @@ void BgIceShelter_Draw(Actor* thisx, PlayState* play2) {
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("World.RedIce.Changed"), 0)) {
-        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("World.RedIce.Value"), (Color_RGB8){ 255, 0, 0});
+        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("World.RedIce.Value"), (Color_RGB8){ 255, 0, 0 });
         gDPSetEnvColor(POLY_XLU_DISP++, color.r, color.g, color.b, this->alpha);
     } else {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, this->alpha);
@@ -475,21 +476,19 @@ void BgIceShelter_Draw(Actor* thisx, PlayState* play2) {
         case 4:
             gSPSegment(POLY_XLU_DISP++, 0x08,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, -play->gameplayFrames & 0x7F,
-                                        -play->gameplayFrames & 0x7F, 0x20, 0x20, 1,
-                                        -play->gameplayFrames & 0x7F, play->gameplayFrames & 0x7F, 0x20,
-                                        0x20));
+                                        -play->gameplayFrames & 0x7F, 0x20, 0x20, 1, -play->gameplayFrames & 0x7F,
+                                        play->gameplayFrames & 0x7F, 0x20, 0x20));
             gSPDisplayList(POLY_XLU_DISP++, gRedIceBlockDL);
             break;
 
         case 2:
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->gameplayFrames & 0xFF, 0x40, 0x40, 1,
-                                        0, -play->gameplayFrames & 0xFF, 0x40, 0x40));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->gameplayFrames & 0xFF, 0x40, 0x40, 1, 0,
+                                        -play->gameplayFrames & 0xFF, 0x40, 0x40));
             gSPSegment(POLY_XLU_DISP++, 0x09,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, -play->gameplayFrames & 0xFF,
-                                        play->gameplayFrames & 0xFF, 0x40, 0x40, 1,
-                                        play->gameplayFrames & 0xFF, play->gameplayFrames & 0xFF, 0x40,
-                                        0x40));
+                                        play->gameplayFrames & 0xFF, 0x40, 0x40, 1, play->gameplayFrames & 0xFF,
+                                        play->gameplayFrames & 0xFF, 0x40, 0x40));
             gSPDisplayList(POLY_XLU_DISP++, gRedIcePlatformDL);
             break;
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/soh/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
index 791efd6ca7..db45bca9a6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
@@ -108,8 +108,7 @@ void BgIceTurara_Break(BgIceTurara* this, PlayState* play, f32 arg2) {
             vel.z = Rand_CenteredFloat(7.0f);
             vel.y = (Rand_ZeroOne() * 4.0f) + 8.0f;
 
-            EffectSsEnIce_Spawn(play, &pos, (Rand_ZeroOne() * 0.2f) + 0.1f, &vel, &accel, &primColor, &envColor,
-                                30);
+            EffectSsEnIce_Spawn(play, &pos, (Rand_ZeroOne() * 0.2f) + 0.1f, &vel, &accel, &primColor, &envColor, 30);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
index ea452fd91e..551b1634c8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
@@ -108,8 +108,7 @@ void BgInGate_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
index 366dd841af..915c8b7295 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
@@ -43,8 +43,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
 };
 
-void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision,
-                                  s32 flag) {
+void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision, s32 flag) {
     s32 pad1;
     CollisionHeader* colHeader = NULL;
     s32 pad2;
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
index 34d87f2695..e247833724 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
@@ -81,8 +81,8 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) {
                 }
             } else {
                 curCobraInfo->cobra = (BgJyaCobra*)Actor_SpawnAsChild(
-                    &play->actorCtx, &this->actor, play, ACTOR_BG_JYA_COBRA, curSpawnData->pos.x,
-                    curSpawnData->pos.y, curSpawnData->pos.z, 0, curCobraInfo->rotY, 0, curSpawnData->params);
+                    &play->actorCtx, &this->actor, play, ACTOR_BG_JYA_COBRA, curSpawnData->pos.x, curSpawnData->pos.y,
+                    curSpawnData->pos.z, 0, curCobraInfo->rotY, 0, curSpawnData->params);
                 this->actor.child = NULL;
 
                 if (&curCobraInfo->cobra->dyna.actor == NULL) {
@@ -153,8 +153,9 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, PlayState* play) {
         for (i = 0; i < 3; i++) {
             if (lightBeamToggles[i]) {
                 if ((this->lightBeams[i] == NULL) && Object_IsLoaded(&play->objectCtx, objBankIndex)) {
-                    this->lightBeams[i] = Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, sMirRayPoss[i].x,
-                                                      sMirRayPoss[i].y, sMirRayPoss[i].z, 0, 0, 0, sMirRayParamss[i], true);
+                    this->lightBeams[i] =
+                        Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, sMirRayPoss[i].x, sMirRayPoss[i].y,
+                                    sMirRayPoss[i].z, 0, 0, 0, sMirRayParamss[i], true);
 
                     if (this->lightBeams[i] == NULL) {
                         // "Mir Ray generation failed"
@@ -221,15 +222,13 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, PlayState* play) {
     Matrix_SetTranslateRotateYXZ(this->actor.world.pos.x, this->actor.world.pos.y + 40.0f, this->actor.world.pos.z,
                                  &this->actor.shape.rot);
     Matrix_Scale(0.1f, (this->liftHeight * -(1.0f / 1280.0f)) + (1779.4f / 1280.0f), 0.1f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBigMirror1DL);
 
     if (lift != NULL) {
         Matrix_SetTranslateRotateYXZ(lift->world.pos.x, lift->world.pos.y, lift->world.pos.z, &D_80893F4C);
         Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gBigMirror2DL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
index 8489314561..8c2eb7989d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
@@ -69,8 +69,7 @@ void BgJyaBlock_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gPushBlockGrayTex));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(POLY_OPA_DISP++, 232, 210, 176, 255);
     gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
index faae8e1943..a154a12f6f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
@@ -183,8 +183,7 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play) {
     if (Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y,
                     this->actor.world.pos.z, 0, 0, 0, 0, true) == NULL) {
         // "Occurrence failure"
-        osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     this->actor.params);
+        osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params);
     }
 }
 
@@ -199,8 +198,7 @@ void BgJyaBombchuiwa_Update(Actor* thisx, PlayState* play) {
 void BgJyaBombchuiwa_DrawRock(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBombchuiwa2DL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -210,8 +208,7 @@ void BgJyaBombchuiwa_DrawLight(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 153.0f), 153));
     gSPDisplayList(POLY_XLU_DISP++, gBombchuiwaLight1DL);
     gDPPipeSync(POLY_XLU_DISP++);
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
index 32961f1b8b..dc4153ffae 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
@@ -532,8 +532,7 @@ void func_80896CB4(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCobra2DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -552,8 +551,7 @@ void func_80896D78(BgJyaCobra* this, PlayState* play) {
     Matrix_SetTranslateRotateYXZ(this->unk_180.x, this->unk_180.y, this->unk_180.z, &sp44);
 
     Matrix_Scale(0.1f, 0.1f, this->unk_190, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s32)(this->unk_18C * 140.0f));
     gSPDisplayList(POLY_XLU_DISP++, gCobra3DL);
 
@@ -596,8 +594,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, PlayState* play) {
     Matrix_Translate(0.0f, 0.0f, 40.0f, MTXMODE_APPLY);
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 120);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gDPLoadTextureBlock(POLY_XLU_DISP++, COBRA_SHADOW_TEX_PTR(this), G_IM_FMT_I, G_IM_SIZ_8b, COBRA_SHADOW_TEX_WIDTH,
                         COBRA_SHADOW_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK,
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
index 74e81c0e01..d19c37f025 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
@@ -201,7 +201,8 @@ void BgJyaGoroiwa_Update(Actor* thisx, PlayState* play) {
     s32 bgId;
     Vec3f pos;
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
         this->actionFunc(this, play);
         BgJyaGoroiwa_UpdateRotation(this);
         pos.x = this->actor.world.pos.x;
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/soh/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
index bab04bde5c..27dcf484f0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
@@ -147,8 +147,8 @@ void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, PlayState* play, EnIk
         vel.x = 2.0f * ((Rand_ZeroOne() * 6.0f) - 3.0f) + (Rand_ZeroOne() * sins * 8.0f * temp_f22);
         vel.y = (Rand_ZeroOne() * 8.0f) - 3.0f;
         vel.z = 2.0f * ((Rand_ZeroOne() * 6.0f) - 3.0f) + (Rand_ZeroOne() * coss * 8.0f * temp_f22);
-        EffectSsKakera_Spawn(play, &pos, &vel, &pos, -350, unkArg5, D_80899500[j & 7], 4, 0, D_808994E0[j & 7], 0,
-                             5, D_808994F0[j & 7], -1, OBJECT_JYA_IRON, gObjectJyaIronDL_000880);
+        EffectSsKakera_Spawn(play, &pos, &vel, &pos, -350, unkArg5, D_80899500[j & 7], 4, 0, D_808994E0[j & 7], 0, 5,
+                             D_808994F0[j & 7], -1, OBJECT_JYA_IRON, gObjectJyaIronDL_000880);
         if (Rand_ZeroOne() < 0.26f) {
             func_80033480(play, &pos, 200.0f, 1, D_808994E0[j & 7] * 4 + 60, D_808994E0[j & 7] * 4 + 80, 1);
         }
@@ -249,8 +249,7 @@ void func_808992E8(BgJyaIronobj* this, PlayState* play) {
         this->colCylinder.base.acFlags &= ~AC_HIT;
         if (actor != NULL && actor->id == ACTOR_EN_IK) {
             particleFunc[this->dyna.actor.params & 1](this, play, (EnIk*)actor);
-            SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 80,
-                                               NA_SE_EN_IRONNACK_BREAK_PILLAR);
+            SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 80, NA_SE_EN_IRONNACK_BREAK_PILLAR);
             dropPos.x = this->dyna.actor.world.pos.x;
             dropPos.y = this->dyna.actor.world.pos.y + 20.0f;
             dropPos.z = this->dyna.actor.world.pos.z;
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
index 9df861735b..7c24b922e0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
@@ -100,11 +100,10 @@ void BgJyaLift_DelayMove(BgJyaLift* this, PlayState* play) {
             // The cutscene of the platform lowering will show the central room in an unloaded state if
             // Link is not standing on the platform as it lowers. Therefore check for the Sunlight arrows
             // enhancement and if it's enabled, check that Link is on the platform. Otherwise skip it.
-            if (!(CVarGetInteger(CVAR_ENHANCEMENT("SunlightArrows"), 0) || Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS)) || 
-                                                      (GET_PLAYER(play)->actor.world.pos.x >   -19.0f &&
-                                                       GET_PLAYER(play)->actor.world.pos.x <   139.0f &&
-                                                       GET_PLAYER(play)->actor.world.pos.z > -1172.0f &&
-                                                       GET_PLAYER(play)->actor.world.pos.z < -1009.0f)) {
+            if (!(CVarGetInteger(CVAR_ENHANCEMENT("SunlightArrows"), 0) ||
+                  Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS)) ||
+                (GET_PLAYER(play)->actor.world.pos.x > -19.0f && GET_PLAYER(play)->actor.world.pos.x < 139.0f &&
+                 GET_PLAYER(play)->actor.world.pos.z > -1172.0f && GET_PLAYER(play)->actor.world.pos.z < -1009.0f)) {
                 OnePointCutscene_Init(play, 3430, -99, &this->dyna.actor, MAIN_CAM);
             }
             BgJyaLift_SetupMove(this);
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
index ecbcf5913b..cd30ddeb34 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
@@ -304,8 +304,7 @@ void BgJyaMegami_DrawFace(BgJyaMegami* this, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex]));
     gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sLeftSideCrumbles[this->crumbleIndex]));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gMegami1DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -339,10 +338,9 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, PlayState* play) {
         Matrix_Translate(sPiecesInit[i].unk_00.x * -10.0f, sPiecesInit[i].unk_00.y * -10.0f,
                          sPiecesInit[i].unk_00.z * -10.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, sDLists[i]);
-        
+
         FrameInterpolation_RecordCloseChild();
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
index b667dd92a8..8743585dd8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
@@ -60,8 +60,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
 };
 
-void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision,
-                                  s32 flag) {
+void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) {
     s32 pad;
     CollisionHeader* colHeader = NULL;
     s32 pad2;
diff --git a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
index 808a71fa44..20851b2006 100644
--- a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
+++ b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_menkuri_eye.h"
 #include "objects/object_menkuri_objects/object_menkuri_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED
 
@@ -90,7 +91,8 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) {
 
     if (!Flags_GetSwitch(play, this->actor.params)) {
         if (this->framesUntilDisable != -1) {
-            if (this->framesUntilDisable != 0) {
+            if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->framesUntilDisable != 0, this,
+                                      &this->framesUntilDisable)) {
                 this->framesUntilDisable -= 1;
             }
             if (this->framesUntilDisable == 0) {
@@ -135,8 +137,7 @@ void BgMenkuriEye_Draw(Actor* thisx, PlayState* play) {
     Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
     Matrix_RotateZYX(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, gGTGEyeStatueEyeDL);
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
index 977025f624..70ca2b6e46 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
@@ -191,8 +191,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
             } else {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitFloor, this->elements)) {
-                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                                 __LINE__, this->dyna.actor.params);
+                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                                 this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
                     f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@@ -225,10 +225,9 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 this->actionFunc = BgMizuBwall_DoNothing;
             } else {
                 Collider_InitTris(play, &this->collider);
-                if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall,
-                                      this->elements)) {
-                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                                 __LINE__, this->dyna.actor.params);
+                if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall, this->elements)) {
+                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                                 this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
                     f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@@ -261,10 +260,9 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 this->actionFunc = BgMizuBwall_DoNothing;
             } else {
                 Collider_InitTris(play, &this->collider);
-                if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall,
-                                      this->elements)) {
-                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                                 __LINE__, this->dyna.actor.params);
+                if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall, this->elements)) {
+                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                                 this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
                     f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@@ -301,8 +299,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
                                       this->elements)) {
-                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                                 __LINE__, this->dyna.actor.params);
+                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                                 this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
                     f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@@ -339,8 +337,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
                 Collider_InitTris(play, &this->collider);
                 if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
                                       this->elements)) {
-                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                                 __LINE__, this->dyna.actor.params);
+                    osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                                 this->dyna.actor.params);
                     Actor_Kill(&this->dyna.actor);
                 } else {
                     f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@@ -460,8 +458,7 @@ void BgMizuBwall_SpawnDebris(BgMizuBwall* this, PlayState* play) {
         rand1 = (s16)(Rand_ZeroOne() * 120.0f) + 20;
         rand2 = (s16)(Rand_ZeroOne() * 240.0f) + 20;
         func_80033480(play, &debrisPos, 50.0f, 2, rand1, rand2, 0);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_A_OBJ, debrisPos.x, debrisPos.y, debrisPos.z, 0, 0, 0,
-                    0xB, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_A_OBJ, debrisPos.x, debrisPos.y, debrisPos.z, 0, 0, 0, 0xB, true);
     }
 }
 
@@ -475,7 +472,8 @@ void BgMizuBwall_Idle(BgMizuBwall* this, PlayState* play) {
         this->dList = NULL;
         BgMizuBwall_SpawnDebris(this, play);
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_WALL_BROKEN);
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->actionFunc = BgMizuBwall_Break;
     } else if (this->dyna.actor.xzDistToPlayer < 600.0f) {
         CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
@@ -510,17 +508,17 @@ void BgMizuBwall_Draw(Actor* thisx, PlayState* play2) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0,
-                                        0, 0, this->scrollAlpha1));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0, 0, 0,
+                                        this->scrollAlpha1));
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0,
-                                        0, 0, this->scrollAlpha2));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0, 0, 0,
+                                        this->scrollAlpha2));
     gSPSegment(POLY_OPA_DISP++, 0x0A,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0,
-                                        0, 0, this->scrollAlpha3));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 1 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0, 0, 0,
+                                        this->scrollAlpha3));
     gSPSegment(POLY_OPA_DISP++, 0x0B,
-               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 3 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0,
-                                        0, 0, this->scrollAlpha4));
+               Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, 3 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0, 0, 0,
+                                        this->scrollAlpha4));
     gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), 2);
 
     if (this->dList != NULL) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
index fb6af1b01e..093e73eb42 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
@@ -158,10 +158,9 @@ void BgMizuMovebg_Init(Actor* thisx, PlayState* play) {
             Matrix_RotateY(thisx->world.rot.y * (M_PI / 32768), MTXMODE_NEW);
             Matrix_MultVec3f(&D_8089EBA0, &sp48);
 
-            if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_HSBLOCK,
-                                   thisx->world.pos.x + sp48.x, thisx->world.pos.y + sp48.y,
-                                   thisx->world.pos.z + sp48.z, thisx->world.rot.x, thisx->world.rot.y,
-                                   thisx->world.rot.z, 2) == NULL) {
+            if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_HSBLOCK, thisx->world.pos.x + sp48.x,
+                                   thisx->world.pos.y + sp48.y, thisx->world.pos.z + sp48.z, thisx->world.rot.x,
+                                   thisx->world.rot.y, thisx->world.rot.z, 2) == NULL) {
                 Actor_Kill(thisx);
             }
             break;
@@ -339,8 +338,7 @@ void func_8089E650(BgMizuMovebg* this, PlayState* play) {
         this->waypointId++;
         if (this->waypointId >= play->setupPathList[MOVEBG_PATH_ID(this->dyna.actor.params)].count) {
             this->waypointId = 0;
-            func_8089E108(play->setupPathList, &this->dyna.actor.world.pos,
-                          MOVEBG_PATH_ID(this->dyna.actor.params), 0);
+            func_8089E108(play->setupPathList, &this->dyna.actor.world.pos, MOVEBG_PATH_ID(this->dyna.actor.params), 0);
         }
     }
     if (!(D_8089EE40 & 1) && MOVEBG_SPEED(this->dyna.actor.params) != 0) {
@@ -384,8 +382,7 @@ void BgMizuMovebg_Draw(Actor* thisx, PlayState* play2) {
                Gfx_TwoTexScrollEnvColor(play->state.gfxCtx, 0, frames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0,
                                         this->scrollAlpha4));
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->dlist != NULL) {
         gSPDisplayList(POLY_OPA_DISP++, this->dlist);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
index bfd569fba2..19985b2ce9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
@@ -1,5 +1,6 @@
 #include "z_bg_mizu_shutter.h"
 #include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -137,7 +138,9 @@ void BgMizuShutter_Move(BgMizuShutter* this, PlayState* play) {
 
 void BgMizuShutter_WaitForTimer(BgMizuShutter* this, PlayState* play) {
     if (this->timerMax != 0x3F * 20) {
-        this->timer--;
+        if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
+            this->timer--;
+        }
         func_8002F994(&this->dyna.actor, this->timer);
         if (this->timer == 0) {
             Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_CLOSE);
@@ -160,8 +163,7 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->displayList != NULL) {
         gSPDisplayList(POLY_OPA_DISP++, this->displayList);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
index a06890d075..2fcf27301a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
@@ -335,8 +335,7 @@ void BgMizuWater_Draw(Actor* thisx, PlayState* play) {
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, -gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0,
                                 -gameplayFrames * 1, 32, 32));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
index 493c6d9508..89a5aaa029 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
@@ -123,8 +123,7 @@ void BgMjin_Draw(Actor* thisx, PlayState* play) {
     }
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, dlist);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
index 86403392f4..24b2fb30d0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
@@ -133,8 +133,8 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) {
 
     BgMoriBigst_SetupAction(this, BgMoriBigst_StalfosFight);
     Flags_UnsetClear(play, this->dyna.actor.room);
-    stalfos = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 209.0f, 827.0f,
-                                 -3320.0f, 0, 0, 0, 1);
+    stalfos = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 209.0f, 827.0f, -3320.0f, 0,
+                                 0, 0, 1);
     if (stalfos != NULL) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
@@ -198,8 +198,8 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) {
 
     BgMoriBigst_SetupAction(this, BgMoriBigst_StalfosPairFight);
     Flags_UnsetClear(play, this->dyna.actor.room);
-    stalfos1 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 70.0f, 827.0f,
-                                  -3383.0f, 0, 0, 0, 5);
+    stalfos1 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 70.0f, 827.0f, -3383.0f, 0,
+                                  0, 0, 5);
     if (stalfos1 != NULL) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
@@ -207,8 +207,8 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) {
         // "Warning: 3-1 Stalfos failure"
         osSyncPrintf("Warning : 第３-1スタルフォス発生失敗\n");
     }
-    stalfos2 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 170.0f, 827.0f,
-                                  -3260.0f, 0, 0, 0, 5);
+    stalfos2 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0,
+                                  0, 0, 5);
     if (stalfos2 != NULL) {
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
@@ -220,10 +220,13 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) {
 }
 
 void BgMoriBigst_StalfosPairFight(BgMoriBigst* this, PlayState* play) {
-    if ((this->dyna.actor.home.rot.z == 0 || 
-        // Check if all enemies are defeated instead of the regular stalfos when enemy randomizer or crowd control is on.
-        (Flags_GetTempClear(play, this->dyna.actor.room) && (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || 
-            ((CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)))))) && !Player_InCsMode(play)) {
+    if ((this->dyna.actor.home.rot.z == 0 ||
+         // Check if all enemies are defeated instead of the regular stalfos when enemy randomizer or crowd control is
+         // on.
+         (Flags_GetTempClear(play, this->dyna.actor.room) &&
+          (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+           ((CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)))))) &&
+        !Player_InCsMode(play)) {
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
         BgMoriBigst_SetupDone(this, play);
     }
@@ -258,8 +261,7 @@ void BgMoriBigst_Draw(Actor* thisx, PlayState* play) {
 
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gMoriBigstDL);
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
index e120916a62..e11f24b2f6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
@@ -257,8 +257,7 @@ void BgMoriElevator_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gMoriElevatorDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
index f53ece25a8..a63e013dc2 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
@@ -77,8 +77,7 @@ static InitChainEntry sInitChainLadder[] = {
     ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
 };
 
-void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionHeader* collision,
-                                s32 moveFlag) {
+void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) {
     s32 pad;
     CollisionHeader* colHeader;
     s32 pad2;
@@ -120,15 +119,14 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, PlayState* play) {
     pos.y = -210.0f + this->dyna.actor.world.pos.y;
     pos.z = 6.0f * cs + this->dyna.actor.world.pos.z;
 
-    ladder = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_BG_MORI_HASHIGO, pos.x, pos.y,
-                                pos.z, this->dyna.actor.world.rot.x, this->dyna.actor.world.rot.y,
-                                this->dyna.actor.world.rot.z, 0);
+    ladder =
+        Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_BG_MORI_HASHIGO, pos.x, pos.y, pos.z,
+                           this->dyna.actor.world.rot.x, this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z, 0);
     if (ladder != NULL) {
         return true;
     } else {
         // "Ladder failure"
-        osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     this->dyna.actor.params);
+        osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params);
         return false;
     }
 }
@@ -169,8 +167,7 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) {
     this->moriTexObjIndex = Object_GetIndex(&play->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         // "Bank danger!"
-        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
-                     __FILE__, __LINE__);
+        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, __FILE__, __LINE__);
         Actor_Kill(&this->dyna.actor);
     } else {
         BgMoriHashigo_SetupWaitForMoriTex(this);
@@ -286,8 +283,7 @@ void BgMoriHashigo_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     switch (this->dyna.actor.params) {
         case HASHIGO_CLASP:
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
index 4baac6b300..169ed2ba26 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
@@ -49,8 +49,7 @@ void BgMoriHashira4_SetupAction(BgMoriHashira4* this, BgMoriHashira4ActionFunc a
     this->actionFunc = actionFunc;
 }
 
-void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, CollisionHeader* collision,
-                                 s32 moveFlag) {
+void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) {
     s32 pad;
     CollisionHeader* colHeader;
     s32 pad2;
@@ -84,8 +83,7 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) {
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(&this->dyna.actor);
         // "Bank danger!"
-        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
-                     __FILE__, __LINE__);
+        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, __FILE__, __LINE__);
         return;
     }
     if ((this->dyna.actor.params != 0) && Flags_GetSwitch(play, this->switchFlag)) {
@@ -167,8 +165,7 @@ void BgMoriHashira4_Draw(Actor* thisx, PlayState* play) {
 
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[this->dyna.actor.params]);
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index 972dc1dd72..c5af8184d8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -92,9 +92,8 @@ void BgMoriHineri_Init(Actor* thisx, PlayState* play) {
         if (this->dyna.actor.params == 1) {
             moriHineriObjIdx = Object_GetIndex(&play->objectCtx, OBJECT_MORI_HINERI1A);
         } else {
-            moriHineriObjIdx = (this->dyna.actor.params == 2)
-                                   ? Object_GetIndex(&play->objectCtx, OBJECT_MORI_HINERI2)
-                                   : Object_GetIndex(&play->objectCtx, OBJECT_MORI_HINERI2A);
+            moriHineriObjIdx = (this->dyna.actor.params == 2) ? Object_GetIndex(&play->objectCtx, OBJECT_MORI_HINERI2)
+                                                              : Object_GetIndex(&play->objectCtx, OBJECT_MORI_HINERI2A);
         }
         this->moriHineriObjIdx = moriHineriObjIdx;
     }
@@ -142,8 +141,9 @@ void func_808A39FC(BgMoriHineri* this, PlayState* play) {
             colHeader = NULL;
             this->dyna.actor.draw = BgMoriHineri_DrawHallAndRoom;
             if (this->dyna.actor.params == 0) {
-                // In vanilla this actionFunc is set to func_808A3C8C, and the boss key chest is rendered from scratch in BgMoriHineri_DrawHallAndRoom
-                // In SOH we instead spawn the en_box actor, which allows the rendering to be handled consistently with the rest of the chests in the game
+                // In vanilla this actionFunc is set to func_808A3C8C, and the boss key chest is rendered from scratch
+                // in BgMoriHineri_DrawHallAndRoom In SOH we instead spawn the en_box actor, which allows the rendering
+                // to be handled consistently with the rest of the chests in the game
                 this->actionFunc = BgMoriHineri_SpawnBossKeyChest;
                 CollisionHeader_GetVirtual(&object_mori_hineri1_Col_0054B8, &colHeader);
             } else if (this->dyna.actor.params == 1) {
@@ -167,11 +167,12 @@ void BgMoriHineri_DoNothing(BgMoriHineri* this, PlayState* play) {
 void BgMoriHineri_SpawnBossKeyChest(BgMoriHineri* this, PlayState* play) {
     if (this->dyna.actor.params == 0) {
         Object_Spawn(&play->objectCtx, OBJECT_BOX);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOX, -1515.0f, 1440.0f,  -3475.0f, -0x4000, 0x4000, 0, 0x27EE, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOX, -1515.0f, 1440.0f, -3475.0f, -0x4000, 0x4000, 0, 0x27EE, true);
         this->actionFunc = func_808A3C8C;
     } else {
         Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOX, this->dyna.actor.world.pos.x + 147.0f,
-                    this->dyna.actor.world.pos.y + -245.0f, this->dyna.actor.world.pos.z + -453.0f, 0, 0x4000, 0, 0x27EE, true);
+                    this->dyna.actor.world.pos.y + -245.0f, this->dyna.actor.world.pos.z + -453.0f, 0, 0x4000, 0,
+                    0x27EE, true);
         this->actionFunc = BgMoriHineri_DoNothing;
     }
 }
@@ -191,10 +192,8 @@ void func_808A3C8C(BgMoriHineri* this, PlayState* play) {
 void func_808A3D58(BgMoriHineri* this, PlayState* play) {
     s16 mainCamChildIdx;
 
-    if ((Flags_GetSwitch(play, this->switchFlag) &&
-         (this->dyna.actor.params == 0 || this->dyna.actor.params == 2)) ||
-        (!Flags_GetSwitch(play, this->switchFlag) &&
-         (this->dyna.actor.params == 1 || this->dyna.actor.params == 3))) {
+    if ((Flags_GetSwitch(play, this->switchFlag) && (this->dyna.actor.params == 0 || this->dyna.actor.params == 2)) ||
+        (!Flags_GetSwitch(play, this->switchFlag) && (this->dyna.actor.params == 1 || this->dyna.actor.params == 3))) {
         this->dyna.actor.draw = BgMoriHineri_DrawHallAndRoom;
         this->actionFunc = func_808A3E54;
 
@@ -246,8 +245,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIdx].segment);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, sDLists[this->dyna.actor.params]);
     if (this->boxObjIdx > 0) {
         Matrix_Get(&mtx);
@@ -261,8 +259,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, PlayState* play) {
         }
         Matrix_RotateZYX(0, -0x8000, this->dyna.actor.shape.rot.z, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDungeonDoorDL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
index fc7fc0a6ab..8ebb9bc25d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
@@ -71,8 +71,7 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) {
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(&this->actor);
         // "Bank danger!"
-        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, __FILE__,
-                     __LINE__);
+        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, __FILE__, __LINE__);
         return;
     }
     BgMoriIdomizu_SetupWaitForMoriTex(this);
@@ -167,8 +166,7 @@ void BgMoriIdomizu_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPSegment(POLY_XLU_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
index a57d9439af..692497415e 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_mori_kaitenkabe.h"
 #include "objects/object_mori_objects/object_mori_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -94,9 +95,12 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, PlayState* play) {
 
     if (this->dyna.unk_150 > 0.001f) {
         this->timer++;
-        if ((this->timer > (28 - CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 4)) && !Player_InCsMode(play)) {
+        if ((this->timer > (28 - CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 4)) &&
+            !Player_InCsMode(play)) {
             BgMoriKaitenkabe_SetupRotate(this);
-            Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
+            if (GameInteractor_Should(VB_FREEZE_LINK_FOR_FOREST_PILLARS, true)) {
+                Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
+            }
             Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.world.pos);
             push.x = Math_SinS(this->dyna.unk_158);
             push.y = 0.0f;
@@ -130,7 +134,9 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) {
     Math_StepToF(&this->rotSpeed, 0.6f, 0.02f);
     if (Math_StepToF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) {
         BgMoriKaitenkabe_SetupWait(this);
-        Player_SetCsActionWithHaltedActors(play, thisx, 7);
+        if (GameInteractor_Should(VB_FREEZE_LINK_FOR_FOREST_PILLARS, true)) {
+            Player_SetCsActionWithHaltedActors(play, thisx, 7);
+        }
         if (this->rotDirection > 0.0f) {
             thisx->home.rot.y += 0x2000;
         } else {
@@ -147,7 +153,9 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) {
         this->dyna.unk_150 = 0.0f;
         player->stateFlags2 &= ~PLAYER_STATE2_MOVING_DYNAPOLY;
     }
-    Math_Vec3f_Copy(&player->actor.world.pos, &this->lockedPlayerPos);
+    if (GameInteractor_Should(VB_FREEZE_LINK_FOR_FOREST_PILLARS, true)) {
+        Math_Vec3f_Copy(&player->actor.world.pos, &this->lockedPlayerPos);
+    }
 }
 
 void BgMoriKaitenkabe_Update(Actor* thisx, PlayState* play) {
@@ -166,8 +174,7 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, PlayState* play) {
 
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gMoriKaitenkabeDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
index 860b12c6d7..524be20a02 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
@@ -227,8 +227,7 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, PlayState* play) {
 
     gSPSegment(POLY_OPA_DISP++, 0x08, play->objectCtx.status[this->moriTexObjIndex].segment);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gMoriRakkatenjoDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index 06f3c8aade..ae9c9ab219 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -6,6 +6,8 @@
 
 #include "z_bg_po_event.h"
 #include "objects/object_po_sisters/object_po_sisters.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -227,8 +229,8 @@ void BgPoEvent_Destroy(Actor* thisx, PlayState* play) {
         Collider_DestroyTris(play, &this->collider);
     } else {
         DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
-        if ((this->type == 1) && (gSaveContext.timer1Value > 0)) {
-            gSaveContext.timer1State = 0xA;
+        if ((this->type == 1) && (gSaveContext.timerSeconds > 0)) {
+            gSaveContext.timerState = 0xA;
         }
     }
 }
@@ -333,21 +335,20 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     Actor* amy;
 
-    if (sBgPoEventPuzzleState == 0xF) {
+    if (GameInteractor_Should(VB_AMY_SOLVE, sBgPoEventPuzzleState == 0xF)) {
         this->actionFunc = BgPoEvent_BlockSolved;
         if ((this->type == 0) && (this->index == 0)) {
-            amy =
-                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, this->dyna.actor.world.pos.x + 30.0f,
-                            this->dyna.actor.world.pos.y - 30.0f, this->dyna.actor.world.pos.z + 30.0f, 0,
-                            this->dyna.actor.shape.rot.y, 0, this->dyna.actor.params + 0x300, true);
+            amy = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, this->dyna.actor.world.pos.x + 30.0f,
+                              this->dyna.actor.world.pos.y - 30.0f, this->dyna.actor.world.pos.z + 30.0f, 0,
+                              this->dyna.actor.shape.rot.y, 0, this->dyna.actor.params + 0x300, true);
             if (amy != NULL) {
                 OnePointCutscene_Init(play, 3170, 30, amy, MAIN_CAM);
             }
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
-            gSaveContext.timer1State = 0xA;
+            gSaveContext.timerState = 0xA;
         }
     } else {
-        if ((gSaveContext.timer1Value == 0) && (sBgPoEventBlocksAtRest == 5)) {
+        if ((gSaveContext.timerSeconds == 0) && (sBgPoEventBlocksAtRest == 5)) {
             player->stateFlags2 &= ~PLAYER_STATE2_MOVING_DYNAPOLY;
             sBgPoEventPuzzleState = 0x10;
             sBgPoEventBlocksAtRest = 0;
@@ -387,8 +388,10 @@ void BgPoEvent_BlockPush(BgPoEvent* this, PlayState* play) {
     s32 blockStop;
     Player* player = GET_PLAYER(play);
 
-    this->dyna.actor.speedXZ = this->dyna.actor.speedXZ + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.3) + 0.5f;
-    this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.5));
+    this->dyna.actor.speedXZ =
+        this->dyna.actor.speedXZ + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.3) + 0.5f;
+    this->dyna.actor.speedXZ =
+        CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f + (CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 0.5));
     blockStop = Math_StepToF(&sBgPoEventblockPushDist, 20.0f, this->dyna.actor.speedXZ);
     displacement = this->direction * sBgPoEventblockPushDist;
     this->dyna.actor.world.pos.x = (Math_SinS(this->dyna.unk_158) * displacement) + this->dyna.actor.home.pos.x;
@@ -534,9 +537,8 @@ void BgPoEvent_PaintingPresent(BgPoEvent* this, PlayState* play) {
         this->actionFunc = BgPoEvent_PaintingVanish;
     } else if (this->collider.base.acFlags & AC_HIT) {
         if (!BgPoEvent_NextPainting(this)) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x,
-                        thisx->world.pos.y - 40.0f, thisx->world.pos.z, 0, thisx->shape.rot.y, 0,
-                        thisx->params + ((this->type - 1) << 8), true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x, thisx->world.pos.y - 40.0f,
+                        thisx->world.pos.z, 0, thisx->shape.rot.y, 0, thisx->params + ((this->type - 1) << 8), true);
             OnePointCutscene_Init(play, 3160, 80, thisx, MAIN_CAM);
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
 
@@ -566,8 +568,7 @@ void BgPoEvent_PaintingBurn(BgPoEvent* this, PlayState* play) {
     sp54.z = Rand_CenteredFloat(50.0f) + this->dyna.actor.world.pos.z;
     if (this->timer >= 0) {
         if (this->type == 2) {
-            EffectSsDeadDb_Spawn(play, &sp54, &sZeroVec, &sZeroVec, 100, 0, 255, 255, 150, 170, 255, 0, 0, 1, 9,
-                                 true);
+            EffectSsDeadDb_Spawn(play, &sp54, &sZeroVec, &sZeroVec, 100, 0, 255, 255, 150, 170, 255, 0, 0, 1, 9, true);
         } else {
             EffectSsDeadDb_Spawn(play, &sp54, &sZeroVec, &sZeroVec, 100, 0, 200, 255, 255, 170, 50, 100, 255, 1, 9,
                                  true);
@@ -616,8 +617,7 @@ void BgPoEvent_Draw(Actor* thisx, PlayState* play) {
         }
         gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, alpha);
     }
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, displayLists[this->type]);
     CLOSE_DISPS(play->state.gfxCtx);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
index 3a2f7eba43..3e5d1294ff 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
@@ -101,15 +101,13 @@ void BgPoSyokudai_Init(Actor* thisx, PlayState* play) {
         Flags_GetSwitch(play, POE_TORCH_FLAG + POE_FLAME_BLUE) &&
         Flags_GetSwitch(play, POE_TORCH_FLAG + POE_FLAME_RED) && !Flags_GetSwitch(play, thisx->params)) {
 
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, 119.0f, 225.0f, -1566.0f, 0, 0, 0,
-                    thisx->params, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, 119.0f, 225.0f, -1566.0f, 0, 0, 0, thisx->params, true);
         play->envCtx.unk_BF = 0x4;
 
     } else if (!Flags_GetSwitch(play, POE_TORCH_FLAG + POE_FLAME_PURPLE) && !Flags_GetSwitch(play, 0x1B)) {
 
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x,
-                    thisx->world.pos.y + 52.0f, thisx->world.pos.z, 0, 0, 0,
-                    (this->flameColor << 8) + thisx->params + 0x1000, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x, thisx->world.pos.y + 52.0f,
+                    thisx->world.pos.z, 0, 0, 0, (this->flameColor << 8) + thisx->params + 0x1000, true);
 
     } else if (!Flags_GetSwitch(play, thisx->params)) {
         if (play->envCtx.unk_BF == 0xFF) {
@@ -153,8 +151,7 @@ void BgPoSyokudai_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGoldenTorchDL);
 
     if (Flags_GetSwitch(play, this->actor.params)) {
@@ -171,8 +168,8 @@ void BgPoSyokudai_Draw(Actor* thisx, PlayState* play) {
 
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0,
-                                    (this->flameTextureScroll * -20) & 0x1FF, 32, 128));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->flameTextureScroll * -20) & 0x1FF,
+                                    32, 128));
 
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, primColor->r, primColor->g, primColor->b, 255);
         gDPSetEnvColor(POLY_XLU_DISP++, envColor->r, envColor->g, envColor->b, 255);
@@ -183,8 +180,7 @@ void BgPoSyokudai_Draw(Actor* thisx, PlayState* play) {
                        MTXMODE_APPLY);
         Matrix_Scale(0.0027f, 0.0027f, 0.0027f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
index 720dcf09fa..66ae52b168 100644
--- a/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
+++ b/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
@@ -81,8 +81,7 @@ void BgPushbox_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, gBlockSmallDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index 2b0802e00f..ce37bfd134 100644
--- a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_relay_objects.h"
 #include "objects/object_relay_objects/object_relay_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
@@ -133,7 +134,7 @@ void func_808A90F4(BgRelayObjects* this, PlayState* play) {
 
 void func_808A91AC(BgRelayObjects* this, PlayState* play) {
     if (this->unk_169 != 5) {
-        if (this->timer != 0) {
+        if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
             this->timer--;
         }
         func_8002F994(&this->dyna.actor, this->timer);
@@ -158,7 +159,7 @@ void func_808A9234(BgRelayObjects* this, PlayState* play) {
         Flags_UnsetSwitch(play, this->switchFlag);
         this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED;
         if (play->roomCtx.curRoom.num == 4) {
-            gSaveContext.timer1State = 0xF;
+            gSaveContext.timerState = 0xF;
         }
         this->actionFunc = BgRelayObjects_DoNothing;
     }
@@ -168,7 +169,7 @@ void BgRelayObjects_DoNothing(BgRelayObjects* this, PlayState* play) {
 }
 
 void func_808A932C(BgRelayObjects* this, PlayState* play) {
-    if (this->timer != 0) {
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
         this->timer--;
     }
     if (this->timer == 0) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index 37d038cb6d..a3a46ed36f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -82,7 +82,8 @@ void BgSpot00Hanebasi_Init(Actor* thisx, PlayState* play) {
         if (gSaveContext.sceneSetupIndex != 6) {
             // Don't close the bridge in rando to accomodate hyrule castle exit
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY) &&
-                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE) && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) && !(IS_RANDO)) {
+                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE) && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) &&
+                !(IS_RANDO)) {
                 this->dyna.actor.shape.rot.x = -0x4000;
             }
         }
@@ -214,7 +215,8 @@ void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) {
     if (this->dyna.actor.params == DT_DRAWBRIDGE) {
         if (play->sceneNum == SCENE_HYRULE_FIELD) {
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY) &&
-                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE) && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) && LINK_IS_CHILD) {
+                CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE) && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) &&
+                LINK_IS_CHILD) {
                 Player* player = GET_PLAYER(play);
 
                 if ((player->actor.world.pos.x > -450.0f) && (player->actor.world.pos.x < 450.0f) &&
@@ -287,8 +289,7 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, PlayState* play2) {
         Matrix_RotateY(angle, MTXMODE_APPLY);
         Matrix_Scale(sTorchFlameScale, sTorchFlameScale, sTorchFlameScale, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
         FrameInterpolation_RecordCloseChild();
@@ -305,8 +306,7 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (thisx->params == DT_DRAWBRIDGE) {
         gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeDL);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
index 7fd5974bba..f5515ad83a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
@@ -86,8 +86,7 @@ void BgSpot01Fusya_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gKakarikoWindmillSailsDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
index 13ab5563b1..c47d8874b2 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
@@ -206,8 +206,7 @@ s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) {
         thisPos = &this->dyna.actor.world.pos;
         thisPos->x = ((endX - initPos.x) * temp_f0) + initPos.x;
         thisPos->y =
-            func_808AB1DC(initPos.y, tempY, npcAction->endFrame, npcAction->startFrame, play->csCtx.frames) +
-            initPos.y;
+            func_808AB1DC(initPos.y, tempY, npcAction->endFrame, npcAction->startFrame, play->csCtx.frames) + initPos.y;
         thisPos->z = ((endZ - initPos.z) * temp_f0) + initPos.z;
 
         if (temp_f0 >= 1.0f) {
@@ -325,8 +324,7 @@ void func_808AB700(BgSpot01Idohashira* this, PlayState* play) {
 
     Gfx_SetupDL_25Opa(localGfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(localGfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(localGfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     func_808AAF34(this, play);
     gSPDisplayList(POLY_OPA_DISP++, gKakarikoWellArchDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
index 579edda227..c2f21e779a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
@@ -55,8 +55,8 @@ void BgSpot01Idomizu_UpdateWaterLevel(BgSpot01Idomizu* this, PlayState* play) {
     }
     play->colCtx.colHeader->waterBoxes[0].ySurface = this->actor.world.pos.y;
     if (this->waterHeight < this->actor.world.pos.y) {
-        Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     Math_ApproachF(&this->actor.world.pos.y, this->waterHeight, 1.0f, 2.0f);
 }
@@ -74,8 +74,7 @@ void BgSpot01Idomizu_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     frames = play->state.frames;
     gSPSegment(POLY_XLU_DISP++, 0x08,
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
index d4aa6b076e..8b3480d87a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
@@ -50,9 +50,9 @@ void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play) {
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
     // If dungeon entrance randomizer is on, remove the well stone as adult Link when
     // child Link has drained the water to the well
-    if (!LINK_IS_ADULT || (IS_RANDO &&
-        Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
-        Flags_GetEventChkInf(EVENTCHKINF_DRAINED_WELL_IN_KAKARIKO))) {
+    if (!LINK_IS_ADULT ||
+        (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF &&
+         Flags_GetEventChkInf(EVENTCHKINF_DRAINED_WELL_IN_KAKARIKO))) {
         Actor_Kill(&this->dyna.actor);
     } else {
         BgSpot01Idosoko_SetupAction(this, func_808ABF54);
@@ -79,8 +79,7 @@ void BgSpot01Idosoko_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gKakarikoBOTWStoneDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
index 0cced23893..c72be812eb 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
@@ -110,9 +110,9 @@ void func_808AC2BC(BgSpot01Objects2* this, PlayState* play) {
                 this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
                 if (IS_DAY) {
                     func_808AC22C(play->setupPathList, &position, ((s32)thisx->params >> 8) & 0xFF, 0);
-                    Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_DAIKU_KAKARIKO, position.x,
-                                       position.y, position.z, thisx->world.rot.x, thisx->world.rot.y,
-                                       thisx->world.rot.z, ((((s32)thisx->params >> 8) & 0xFF) << 8) + 1);
+                    Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_DAIKU_KAKARIKO, position.x, position.y,
+                                       position.z, thisx->world.rot.x, thisx->world.rot.y, thisx->world.rot.z,
+                                       ((((s32)thisx->params >> 8) & 0xFF) << 8) + 1);
                 }
                 break;
             case 0: // Potion Shop Poster
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
index 0cd3bc51d0..6fa8f7cf1c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
@@ -89,8 +89,8 @@ void BgSpot02Objects_Init(Actor* thisx, PlayState* play) {
 
             this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
 
-            if (((Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) && (play->sceneNum == SCENE_GRAVEYARD) &&
-                 (thisx->params == 2)) ||
+            if (((Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) &&
+                 (play->sceneNum == SCENE_GRAVEYARD) && (thisx->params == 2)) ||
                 (LINK_IS_ADULT && (thisx->params == 1))) {
                 Actor_Kill(thisx);
             }
@@ -130,15 +130,18 @@ void func_808AC908(BgSpot02Objects* this, PlayState* play) {
     static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
     Vec3f pos;
 
-    if (GameInteractor_Should(VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE, play->csCtx.state != 0 && play->csCtx.npcActions[3] != NULL && play->csCtx.npcActions[3]->action == 2, this)) {
-            Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GRAVE_EXPLOSION);
-            Flags_SetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
-            this->timer = 25;
-            pos.x = (Math_SinS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.x;
-            pos.y = this->dyna.actor.world.pos.y + 30.0f;
-            pos.z = (Math_CosS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.z;
-            EffectSsBomb2_SpawnLayered(play, &pos, &zeroVec, &zeroVec, 70, 30);
-            this->actionFunc = func_808ACA08;
+    if (GameInteractor_Should(VB_PLAY_ROYAL_FAMILY_TOMB_EXPLODE,
+                              play->csCtx.state != 0 && play->csCtx.npcActions[3] != NULL &&
+                                  play->csCtx.npcActions[3]->action == 2,
+                              this)) {
+        Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GRAVE_EXPLOSION);
+        Flags_SetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
+        this->timer = 25;
+        pos.x = (Math_SinS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.x;
+        pos.y = this->dyna.actor.world.pos.y + 30.0f;
+        pos.z = (Math_CosS(this->dyna.actor.shape.rot.y) * 50.0f) + this->dyna.actor.world.pos.z;
+        EffectSsBomb2_SpawnLayered(play, &pos, &zeroVec, &zeroVec, 70, 30);
+        this->actionFunc = func_808ACA08;
     }
 }
 
@@ -153,8 +156,8 @@ void func_808ACA08(BgSpot02Objects* this, PlayState* play) {
 
     if (this->timer == 20) {
         this->dyna.actor.draw = NULL;
-        EffectSsHahen_SpawnBurst(play, &this->dyna.actor.world.pos, 30.0f, 0, 25, 5, 40, OBJECT_SPOT02_OBJECTS,
-                                    20, object_spot02_objects_DL_012D30);
+        EffectSsHahen_SpawnBurst(play, &this->dyna.actor.world.pos, 30.0f, 0, 25, 5, 40, OBJECT_SPOT02_OBJECTS, 20,
+                                 object_spot02_objects_DL_012D30);
     } else if (this->timer == 0) {
         Actor_Kill(&this->dyna.actor);
     }
@@ -204,8 +207,7 @@ void BgSpot02Objects_Draw(Actor* thisx, PlayState* play) {
 }
 
 void func_808ACC34(BgSpot02Objects* this, PlayState* play) {
-    if (play->csCtx.state != 0 && play->csCtx.npcActions[0] != NULL &&
-        play->csCtx.npcActions[0]->action == 2) {
+    if (play->csCtx.state != 0 && play->csCtx.npcActions[0] != NULL && play->csCtx.npcActions[0]->action == 2) {
         this->unk_16A++;
 
         if (this->unk_16A >= 12) {
@@ -231,8 +233,7 @@ void func_808ACCB8(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
 
-    if (play->csCtx.state != 0 && play->csCtx.npcActions[0] != NULL &&
-        play->csCtx.npcActions[0]->action == 2) {
+    if (play->csCtx.state != 0 && play->csCtx.npcActions[0] != NULL && play->csCtx.npcActions[0]->action == 2) {
         if (this->unk_16A < 5) {
             rate = (this->unk_16A / 5.0f);
             redPrim = greenPrim = bluePrim = 255;
@@ -260,8 +261,7 @@ void func_808ACCB8(Actor* thisx, PlayState* play) {
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, redPrim, greenPrim, bluePrim, 255);
         gDPSetEnvColor(POLY_XLU_DISP++, redEnv, greenEnv, blueEnv, 255);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_808AD850[this->unk_16A]));
         gDPPipeSync(POLY_XLU_DISP++);
         gSPDisplayList(POLY_XLU_DISP++, object_spot02_objects_DL_0126F0);
@@ -272,8 +272,7 @@ void func_808ACCB8(Actor* thisx, PlayState* play) {
 }
 
 void func_808AD3D4(BgSpot02Objects* this, PlayState* play) {
-    if (play->csCtx.state != 0 && play->csCtx.npcActions[2] != NULL &&
-        play->csCtx.npcActions[2]->action == 2) {
+    if (play->csCtx.state != 0 && play->csCtx.npcActions[2] != NULL && play->csCtx.npcActions[2]->action == 2) {
         if (this->timer == 2) {
             Audio_PlayActorSound2(&this->dyna.actor, NA_SE_IT_EXPLOSION_ICE);
         }
@@ -306,8 +305,8 @@ void func_808AD450(Actor* thisx, PlayState* play) {
             }
         }
 
-        lerp = Environment_LerpWeight(play->csCtx.npcActions[2]->endFrame,
-                                      play->csCtx.npcActions[2]->startFrame, play->csCtx.frames);
+        lerp = Environment_LerpWeight(play->csCtx.npcActions[2]->endFrame, play->csCtx.npcActions[2]->startFrame,
+                                      play->csCtx.frames);
 
         // should be able to remove & 0xFFFF with some other change
         if ((play->csCtx.npcActions[2]->action & 0xFFFF) == 2) {
@@ -321,8 +320,7 @@ void func_808AD450(Actor* thisx, PlayState* play) {
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 128);
             gDPSetEnvColor(POLY_XLU_DISP++, 150, 120, 0, 128);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 2 * this->timer, -3 * this->timer, 32, 64, 1,
                                         4 * this->timer, -6 * this->timer, 32, 64));
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
index 499a0d11af..8312543aa6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
@@ -38,7 +38,7 @@ void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* this, s32 bufferIndex) {
     s32 i;
     Vtx* vtx = (bufferIndex == 0) ? SEGMENTED_TO_VIRTUAL(object_spot03_object_Vtx_000800)
                                   : SEGMENTED_TO_VIRTUAL(object_spot03_object_Vtx_000990);
-    
+
     vtx = ResourceMgr_LoadVtxByName(vtx);
 
     for (i = 0; i < 5; i++) {
@@ -126,8 +126,7 @@ void BgSpot03Taki_Draw(Actor* thisx, PlayState* play) {
 
     gameplayFrames = play->gameplayFrames;
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
index ce8ce0ea88..7aa40da13d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
@@ -193,9 +193,9 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) {
     }
 }
 
-static u8 actionCounter = 0; // Used to perform some actions on subsequent frames
-static s8 waterMovement = 0; // Used to control the water change direction
-static u8 switchPressed = 0; // Used to track when the water fill switch is pressed/depressed
+static u8 actionCounter = 0;   // Used to perform some actions on subsequent frames
+static s8 waterMovement = 0;   // Used to control the water change direction
+static u8 switchPressed = 0;   // Used to track when the water fill switch is pressed/depressed
 static u8 prevSwitchState = 0; // Used to track the previous state of the water fill switch
 static Actor* lakeControlFloorSwitch;
 
@@ -304,8 +304,7 @@ void BgSpot06Objects_LockSpawnWaterRipples(BgSpot06Objects* this, PlayState* pla
 
 void BgSpot06Objects_LockSpawnBubbles(BgSpot06Objects* this, PlayState* play, s32 flag) {
     if (!(play->gameplayFrames % 7) || flag) {
-        EffectSsBubble_Spawn(play, &this->dyna.actor.world.pos, 0.0f, 40.0f, 30.0f,
-                             (Rand_ZeroOne() * 0.05f) + 0.175f);
+        EffectSsBubble_Spawn(play, &this->dyna.actor.world.pos, 0.0f, 40.0f, 30.0f, (Rand_ZeroOne() * 0.05f) + 0.175f);
     }
 }
 
@@ -343,7 +342,8 @@ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) {
         EffectSsGSplash_Spawn(play, &this->dyna.actor.world.pos, NULL, NULL, 1, 700);
         this->collider.elements->dim.worldSphere.radius = 45;
         this->actionFunc = BgSpot06Objects_LockPullOutward;
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         Flags_SetSwitch(play, this->switchFlag);
         OnePointCutscene_Init(play, 4120, 170, &this->dyna.actor, MAIN_CAM);
     } else {
@@ -471,15 +471,16 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) {
         }
 
         // Spawn a floor switch
-        lakeControlFloorSwitch = Actor_Spawn(&play->actorCtx, play, ACTOR_OBJ_SWITCH, -896.0f, -1243.0f, 6953.0f, 0, 0, 0, switchParams, false);
+        lakeControlFloorSwitch = Actor_Spawn(&play->actorCtx, play, ACTOR_OBJ_SWITCH, -896.0f, -1243.0f, 6953.0f, 0, 0,
+                                             0, switchParams, false);
         // Spawn a sign
         Actor_Spawn(&play->actorCtx, play, ACTOR_EN_KANBAN, -970.0f, -1242.0f, 6954.0f, 0, 0, 0,
-            0x0000 | (TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN & 0xFF), false);
+                    0x0000 | (TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN & 0xFF), false);
 
         // Spawn a Navi check spot when Water Temple isn't cleared
         if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ELF_MSG2, -896.0f, -1243.0f, 6953.0f, 0, 0, 0,
-                0x3D00 | (TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI & 0xFF), false);
+                        0x3D00 | (TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI & 0xFF), false);
         }
 
         actionCounter++;
@@ -506,7 +507,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) {
         if (waterMovement >= 0) {
             waterMovement = -1;
             this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneLower;
-        // Raise water
+            // Raise water
         } else {
             waterMovement = 1;
             this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise;
@@ -527,8 +528,7 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, PlayState* play)
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gameplayFrames = play->state.frames;
 
@@ -536,8 +536,8 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, PlayState* play)
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, -gameplayFrames, gameplayFrames, 32, 32, 1, gameplayFrames,
                                 gameplayFrames, 32, 32));
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, -gameplayFrames, gameplayFrames * 6, 32, 32, 1,
-                                gameplayFrames, gameplayFrames * 6, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, -gameplayFrames, gameplayFrames * 6, 32, 32, 1, gameplayFrames,
+                                gameplayFrames * 6, 32, 32));
 
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
index 769bcfcc90..3e3d57a4ae 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
@@ -74,8 +74,7 @@ void BgSpot07Taki_Draw(Actor* thisx, PlayState* play) {
     frames = play->gameplayFrames;
     if (LINK_IS_ADULT) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (this->dyna.actor.params == 0) {
             gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_001CF0);
         } else {
@@ -84,8 +83,7 @@ void BgSpot07Taki_Draw(Actor* thisx, PlayState* play) {
     }
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, ((frames * -1) & 0x7F), ((frames * 1) & 0x7F), 32, 32, 1,
@@ -95,8 +93,8 @@ void BgSpot07Taki_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
         if (this->dyna.actor.params == 0) {
             gSPSegment(POLY_XLU_DISP++, 0x09,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, ((frames * -1) & 0x7F), ((frames * -3) & 0xFF), 64,
-                                        64, 1, ((frames * 1) & 0x7F), ((frames * -3) & 0xFF), 64, 64));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, ((frames * -1) & 0x7F), ((frames * -3) & 0xFF), 64, 64,
+                                        1, ((frames * 1) & 0x7F), ((frames * -3) & 0xFF), 64, 64));
             gSPSegment(POLY_XLU_DISP++, 0x0A,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, frames * 0, ((frames * 3) & 0x1FF), 32, 128, 1,
                                         frames * 0, ((frames * 3) & 0x1FF), 32, 128));
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/soh/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
index e40302b662..a2e27ca49e 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
@@ -145,8 +145,8 @@ void func_808B0324(BgSpot08Bakudankabe* this, PlayState* play) {
             rotationSpeed = 33;
         }
 
-        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E,
-                             4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
+        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4,
+                             0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
     }
 
     for (i = 0; i < ARRAY_COUNT(D_808B08AC); i++) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
index 2eb0bef7ef..a85ec4f515 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
@@ -39,8 +39,7 @@ void BgSpot08Iceblock_SetupAction(BgSpot08Iceblock* this, BgSpot08IceblockAction
     this->actionFunc = actionFunc;
 }
 
-void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, CollisionHeader* collision,
-                                   s32 flags) {
+void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, CollisionHeader* collision, s32 flags) {
     s32 pad;
     CollisionHeader* colHeader = NULL;
     s32 pad2;
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
index 28f98b4f14..1261eac59d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
@@ -142,8 +142,8 @@ void BgSpot09Obj_Init(Actor* thisx, PlayState* play) {
                  GET_EVENTCHKINF_CARPENTERS_FREE_ALL());
     this->dyna.actor.params &= 0xFF;
     if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) {
-        osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
-                     __FILE__, __LINE__, this->dyna.actor.params);
+        osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                     this->dyna.actor.params);
     }
 
     if (!func_808B1C70(this, play)) {
@@ -173,8 +173,7 @@ void BgSpot09Obj_Draw(Actor* thisx, PlayState* play) {
 
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL);
 
         CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/soh/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
index 635fff4e9f..be1e6edb4f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
@@ -97,8 +97,8 @@ void func_808B2218(BgSpot11Bakudankabe* this, PlayState* play) {
         } else {
             rotationSpeed = 33;
         }
-        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E,
-                             4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
+        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4,
+                             0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
     }
     Math_Vec3f_Sum(&thisx->world.pos, &D_808B272C, &burstDepthY);
     func_80033480(play, &burstDepthY, 70, 4, 110, 160, 1);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
index 0305fd652c..9e55a5ebae 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
@@ -108,8 +108,8 @@ void func_808B29E0(BgSpot11Oasis* this) {
 void func_808B29F0(BgSpot11Oasis* this, PlayState* play) {
     if (Math_StepToF(&this->actor.world.pos.y, 0.0f, 0.7f)) {
         func_808B2AA8(this);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x,
-                    this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_SPAWNER, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x, this->actor.world.pos.y + 40.0f,
+                    this->actor.world.pos.z, 0, 0, 0, FAIRY_SPAWNER, true);
         Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
     }
     func_808B27F0(play, this->actor.world.pos.y);
@@ -153,11 +153,10 @@ void BgSpot11Oasis_Draw(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
-                                32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32,
+                                1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
     gSPDisplayList(POLY_XLU_DISP++, gDesertColossusOasisDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
index 8a14f5046f..e082ed4ee9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
@@ -158,8 +158,8 @@ s32 func_808B3CA0(BgSpot15Rrbox* this, PlayState* play, s32 arg2) {
     actorPosition.y += this->dyna.actor.prevPos.y;
     actorPosition.z += this->dyna.actor.world.pos.z;
 
-    this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor6(&play->colCtx, &this->dyna.actor.floorPoly,
-                                                               &this->bgId, &this->dyna.actor, &actorPosition, chkDist);
+    this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor6(&play->colCtx, &this->dyna.actor.floorPoly, &this->bgId,
+                                                               &this->dyna.actor, &actorPosition, chkDist);
 
     if ((this->dyna.actor.floorHeight - this->dyna.actor.world.pos.y) >= -0.001f) {
         this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
@@ -323,8 +323,7 @@ void func_808B43D0(BgSpot15Rrbox* this, PlayState* play) {
 
     if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
         // "Lon Lon wooden crate fell too much"
-        osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     actor->params);
+        osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, actor->params);
 
         Actor_Kill(actor);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
index ab49767dfc..41b5a76eea 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
@@ -99,8 +99,7 @@ void BgSpot15Saku_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
index 503aa1d662..1d112492b6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
@@ -110,18 +110,16 @@ static s16 D_808B5EB0[][7] = {
     { 0x0014, 0x0050, 0x0032, 0x0000, 0x0096, 0x00C8, 0x0008 },
 };
 
-const ActorInit Bg_Spot16_Bombstone_InitVars = {
-    ACTOR_BG_SPOT16_BOMBSTONE,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_SPOT16_OBJ,
-    sizeof(BgSpot16Bombstone),
-    (ActorFunc)BgSpot16Bombstone_Init,
-    (ActorFunc)BgSpot16Bombstone_Destroy,
-    (ActorFunc)BgSpot16Bombstone_Update,
-    (ActorFunc)BgSpot16Bombstone_Draw,
-    (ActorResetFunc)BgSpot16Bombstone_Reset
-};
+const ActorInit Bg_Spot16_Bombstone_InitVars = { ACTOR_BG_SPOT16_BOMBSTONE,
+                                                 ACTORCAT_PROP,
+                                                 FLAGS,
+                                                 OBJECT_SPOT16_OBJ,
+                                                 sizeof(BgSpot16Bombstone),
+                                                 (ActorFunc)BgSpot16Bombstone_Init,
+                                                 (ActorFunc)BgSpot16Bombstone_Destroy,
+                                                 (ActorFunc)BgSpot16Bombstone_Update,
+                                                 (ActorFunc)BgSpot16Bombstone_Draw,
+                                                 (ActorResetFunc)BgSpot16Bombstone_Reset };
 
 static InitChainEntry sInitChainBoulder[] = {
     ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE),
@@ -223,8 +221,7 @@ s32 func_808B4E58(BgSpot16Bombstone* this, PlayState* play) {
     this->bombiwaBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_BOMBIWA);
 
     if (this->bombiwaBankIndex < 0) {
-        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, __FILE__,
-                     __LINE__);
+        osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, __FILE__, __LINE__);
         return false;
     }
 
@@ -324,8 +321,8 @@ void BgSpot16Bombstone_SpawnFragments(BgSpot16Bombstone* this, PlayState* play)
     s16 scale;
 
     if (this->actor.params == 0) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_BOMBSTONE, this->actor.world.pos.x,
-                    this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 5, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_BOMBSTONE, this->actor.world.pos.x, this->actor.world.pos.y,
+                    this->actor.world.pos.z, 0, 0, 0, 5, true);
         index = 3;
     } else {
         index = 0;
@@ -343,8 +340,8 @@ void BgSpot16Bombstone_SpawnFragments(BgSpot16Bombstone* this, PlayState* play)
 
             scale = D_808B6074[index] * this->actor.scale.x * 3;
 
-            EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, -420, 0x31, 0xF, 0xF, 0, scale, 2,
-                                 0x40, 160, KAKERA_COLOR_NONE, OBJECT_BOMBIWA, object_bombiwa_DL_0009E0);
+            EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, -420, 0x31, 0xF, 0xF, 0, scale, 2, 0x40,
+                                 160, KAKERA_COLOR_NONE, OBJECT_BOMBIWA, object_bombiwa_DL_0009E0);
             index += 1;
         } while (index != ARRAY_COUNT(D_808B6074));
     }
@@ -356,8 +353,8 @@ void func_808B561C(BgSpot16Bombstone* this, PlayState* play) {
 
     world = &this->actor.world;
     for (index = 0; index < ARRAY_COUNT(D_808B6088); index++) {
-        if (Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_BOMBSTONE, world->pos.x, world->pos.y,
-                        world->pos.z, 0, 0, 0, D_808B6088[index], true) == NULL) {
+        if (Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_BOMBSTONE, world->pos.x, world->pos.y, world->pos.z, 0,
+                        0, 0, D_808B6088[index], true) == NULL) {
             break;
         }
     }
@@ -384,8 +381,8 @@ void func_808B56BC(BgSpot16Bombstone* this, PlayState* play) {
                 player->actor.world.pos.x += sinValue * this->sinRotation;
                 player->actor.world.pos.z += sinValue * this->cosRotation;
             } else {
-                osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
-                             __FILE__, __LINE__, this->actor.params, adjustedYawDiff);
+                osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", __FILE__, __LINE__,
+                             this->actor.params, adjustedYawDiff);
             }
         }
     }
@@ -537,8 +534,7 @@ void BgSpot16Bombstone_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params == 0xFF) {
         // The boulder is intact
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
index 30db4ea798..6f722ad2f1 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
@@ -126,12 +126,10 @@ void BgSpot16Doughnut_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     if (this->fireFlag & 1) {
-        gSPSegment(
-            POLY_XLU_DISP++, 0x08,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32));
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, this->envColorAlpha);
         gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleFieryDL);
     } else {
@@ -151,8 +149,7 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
     gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
index 6537a16905..da7c908c22 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
@@ -80,8 +80,8 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) {
         } else {
             rotationSpeed = 33;
         }
-        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E,
-                             4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
+        EffectSsKakera_Spawn(play, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4,
+                             0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, gFieldKakeraDL);
     }
     Math_Vec3f_Copy(&burstDepthY, &this->dyna.actor.world.pos);
     func_80033480(play, &burstDepthY, 60.0f, 4, 110, 160, 1);
@@ -132,8 +132,7 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     r = (r >> 1) + 0xC0;
     g = (g >> 1) + 0xC0;
@@ -148,8 +147,7 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
index 5c6e55c7c4..3baa5d89b7 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
@@ -58,12 +58,10 @@ void func_808B7478(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - thisx->shape.rot.y + 0x8000) *
-                       9.58738019108e-05f,
+    Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - thisx->shape.rot.y + 0x8000) * 9.58738019108e-05f,
                    MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (0 - play->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0,
                                 (0 - play->gameplayFrames) & 0x7F, 0x20, 0x20));
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
index 994c18d445..07751f7ebe 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
@@ -152,10 +152,9 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) {
     }
 
     func_808B7AEC(this);
-    Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_BG_SPOT18_FUTA,
-                       this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
-                       this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y + 0x1555,
-                       this->dyna.actor.shape.rot.z, -1);
+    Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_BG_SPOT18_FUTA, this->dyna.actor.world.pos.x,
+                       this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, this->dyna.actor.shape.rot.x,
+                       this->dyna.actor.shape.rot.y + 0x1555, this->dyna.actor.shape.rot.z, -1);
 
     if (this->dyna.actor.child == NULL) {
         osSyncPrintf(VT_FGCOL(RED));
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
index 36855ce697..9094e26e44 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
@@ -97,8 +97,7 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) {
     } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         age = 0;
     } else {
-        osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     this->dyna.actor.params);
+        osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params);
         return 0;
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
index 6a8ed3e0d0..c771699fd0 100644
--- a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
+++ b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
@@ -82,7 +82,8 @@ void BgSstFloor_Update(BgSstFloor* thisx, PlayState* play) {
         this->dyna.actor.params = BONGOFLOOR_REST;
         this->drumPhase = 28;
 
-        if (DynaPolyActor_IsPlayerOnTop(&this->dyna) && !(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
+        if (DynaPolyActor_IsPlayerOnTop(&this->dyna) &&
+            !(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
             distFromRim = 600.0f - this->dyna.actor.xzDistToPlayer;
             if (distFromRim > 0.0f) {
                 if (distFromRim > 350.0f) {
@@ -128,8 +129,7 @@ void BgSstFloor_Draw(BgSstFloor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL);
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
index f08d10fd56..acb52db790 100644
--- a/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
+++ b/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
@@ -87,22 +87,18 @@ void func_808BA018(BgTokiHikari* this, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (LINK_IS_ADULT) {
         gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_008190);
     } else {
         gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007E20);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        gSPSegment(POLY_XLU_DISP++, 8,
-                   Gfx_TexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 64, 32));
+        gSPSegment(POLY_XLU_DISP++, 8, Gfx_TexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 64, 32));
 
-        gSPSegment(POLY_XLU_DISP++, 9,
-                   Gfx_TexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 64, 32));
+        gSPSegment(POLY_XLU_DISP++, 9, Gfx_TexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 64, 32));
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_007EE0);
     }
@@ -148,8 +144,7 @@ void func_808BA2CC(BgTokiHikari* this, PlayState* play) {
 
     gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 155.0f) + 100, (u8)(255.0f * this->unk_14C), 0, 128);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, -2 * (play->gameplayFrames & 0x7F), 0, 0x20, 0x40, 1,
@@ -164,8 +159,7 @@ void func_808BA2CC(BgTokiHikari* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
                    (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_0009C0);
     Matrix_Pop();
@@ -176,8 +170,7 @@ void func_808BA2CC(BgTokiHikari* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
                    (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     // SOH [Port] Index adjust 11 -> 14 (for LUS marker and gsSPVertex) to account for our extraction size changes
     gSPDisplayListOffset(POLY_XLU_DISP++, object_toki_objects_DL_0009C0, 10 + 2 + 1);
diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index b4158acede..a11180a7b5 100644
--- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -127,12 +127,18 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
     if (!LINK_IS_ADULT || (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && !IS_RANDO) || IS_RANDO) {
         if (Actor_HasParent(&this->actor, play)) {
             if (!LINK_IS_ADULT) {
-                 if (GameInteractor_Should(VB_GIVE_ITEM_MASTER_SWORD, true)) {
+                if (GameInteractor_Should(VB_GIVE_ITEM_MASTER_SWORD, true)) {
                     Item_Give(play, ITEM_SWORD_MASTER);
-                 }
+                }
                 play->csCtx.segment = D_808BB2F0;
+
+                // Discover adult spawn
+                Entrance_SetEntranceDiscovered(ENTR_HYRULE_FIELD_10, false);
             } else {
                 play->csCtx.segment = D_808BB7A0;
+
+                // Discover child spawn
+                Entrance_SetEntranceDiscovered(ENTR_LINKS_HOUSE_CHILD_SPAWN, false);
             }
             Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
             Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_MASTER_SWORD);
@@ -192,7 +198,8 @@ void BgTokiSwd_Draw(Actor* thisx, PlayState* play2) {
     s32 pad[3];
 
     // Do not draw the Master Sword in the pedestal if the player has not found it yet
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
+        !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
         return;
     }
 
@@ -202,10 +209,8 @@ void BgTokiSwd_Draw(Actor* thisx, PlayState* play2) {
 
     func_8002EBCC(&this->actor, play, 0);
 
-    gSPSegment(POLY_OPA_DISP++, 0x08,
-               Gfx_TexScroll(play->state.gfxCtx, 0, -(play->gameplayFrames % 0x80), 32, 32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(play->state.gfxCtx, 0, -(play->gameplayFrames % 0x80), 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_001BD0);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
index a86329cdc5..a12101f9ae 100644
--- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
+++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
@@ -101,7 +101,8 @@ void func_808BC65C(BgTreemouth* this, PlayState* play) {
             if (npcAction->action == 2) {
                 BgTreemouth_SetupAction(this, func_808BC80C);
             } else if (npcAction->action == 3) {
-                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 BgTreemouth_SetupAction(this, func_808BC6F8);
             }
         }
@@ -117,8 +118,7 @@ void func_808BC6F8(BgTreemouth* this, PlayState* play) {
         this->unk_168 = 1.0f;
     }
 
-    if ((gSaveContext.sceneSetupIndex == 6) && (play->csCtx.frames >= 0x2BD) &&
-        (play->state.frames % 8 == 0)) {
+    if ((gSaveContext.sceneSetupIndex == 6) && (play->csCtx.frames >= 0x2BD) && (play->state.frames % 8 == 0)) {
         sp34.x = (Rand_ZeroOne() * 1158.0f) + 3407.0f;
         sp34.y = 970.0f;
         sp34.z = (Rand_ZeroOne() * 2026.0f) + -2163.0f;
@@ -207,7 +207,8 @@ void func_808BCAF0(BgTreemouth* this, PlayState* play) {
             if (npcAction->action == 2) {
                 BgTreemouth_SetupAction(this, func_808BC80C);
             } else if (npcAction->action == 3) {
-                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 BgTreemouth_SetupAction(this, func_808BC6F8);
             }
         }
@@ -248,8 +249,7 @@ void BgTreemouth_Draw(Actor* thisx, PlayState* play) {
     }
 
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDekuTreeMouthDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
index bf2987c912..dc4ca8882f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
+++ b/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
@@ -84,8 +84,8 @@ void BgVbSima_Update(Actor* thisx, PlayState* play) {
             this->dyna.actor.world.pos.z += 2.0f * Math_CosS(this->shakeTimer * 0x8000);
             this->dyna.actor.shape.rot.x = (s16)Math_SinS(this->shakeTimer * 0x7000) * 0x37;
             this->dyna.actor.shape.rot.z = (s16)Math_SinS(this->shakeTimer * 0x5000) * 0x37;
-            Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else if (signal == VBSIMA_KILL) {
             Actor_Kill(&this->dyna.actor);
         }
@@ -152,8 +152,7 @@ void BgVbSima_Update(Actor* thisx, PlayState* play) {
 void BgVbSima_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gVolvagiaPlatformDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
index ddd05391b2..6715d140c6 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_ydan_hasi.h"
 #include "objects/object_ydan_objects/object_ydan_objects.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
@@ -126,9 +127,10 @@ void BgYdanHasi_MoveWater(BgYdanHasi* this, PlayState* play) {
 }
 
 void BgYdanHasi_DecWaterTimer(BgYdanHasi* this, PlayState* play) {
-    if (this->timer != 0) {
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
         this->timer--;
     }
+
     func_8002F994(&this->dyna.actor, this->timer);
     if (this->timer == 0) {
         this->actionFunc = BgYdanHasi_MoveWater;
@@ -145,9 +147,10 @@ void BgYdanHasi_SetupThreeBlocks(BgYdanHasi* this, PlayState* play) {
 }
 
 void BgYdanHasi_UpdateThreeBlocks(BgYdanHasi* this, PlayState* play) {
-    if (this->timer != 0) {
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) {
         this->timer--;
     }
+
     if (this->timer == 0) {
         if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 3.0f) != 0) {
             Flags_UnsetSwitch(play, this->type);
@@ -181,11 +184,9 @@ void BgYdanHasi_Draw(Actor* thisx, PlayState* play) {
 
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, -play->gameplayFrames % 128,
-                                    play->gameplayFrames % 128, 0x20, 0x20, 1, play->gameplayFrames % 128,
-                                    play->gameplayFrames % 128, 0x20, 0x20));
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, -play->gameplayFrames % 128, play->gameplayFrames % 128,
+                                    0x20, 0x20, 1, play->gameplayFrames % 128, play->gameplayFrames % 128, 0x20, 0x20));
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gDTWaterPlaneDL);
 
         CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
index 18d659dced..f8de7e6eb9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
@@ -20,7 +20,7 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, PlayState* play);
 void BgYdanSp_BurnWallWeb(BgYdanSp* this, PlayState* play);
 void BgYdanSp_WallWebIdle(BgYdanSp* this, PlayState* play);
 
-//extern CollisionHeader gDTWebWallCol;
+// extern CollisionHeader gDTWebWallCol;
 
 typedef enum {
     /* 0 */ WEB_FLOOR,
@@ -223,8 +223,8 @@ void BgYdanSp_BurnFloorWeb(BgYdanSp* this, PlayState* play) {
             velocity.x = (7.0f * sins) * distXZ;
             velocity.y = 0.0f;
             velocity.z = (7.0f * coss) * distXZ;
-            EffectSsDeadDb_Spawn(play, &this->dyna.actor.home.pos, &velocity, &accel, 60, 6, 255, 255, 150, 170,
-                                 255, 0, 0, 1, 0xE, 1);
+            EffectSsDeadDb_Spawn(play, &this->dyna.actor.home.pos, &velocity, &accel, 60, 6, 255, 255, 150, 170, 255, 0,
+                                 0, 1, 0xE, 1);
             rot2 += 0x2AAA;
         }
     }
@@ -388,8 +388,8 @@ void BgYdanSp_BurnWallWeb(BgYdanSp* this, PlayState* play) {
             velocity.x = 6.5f * coss2 * distXYZ;
             velocity.y = 6.5f * coss * distXYZ;
             velocity.z = -6.5f * sins * distXYZ;
-            EffectSsDeadDb_Spawn(play, &this->dyna.actor.home.pos, &velocity, &accel, 80, 6, 255, 255, 150, 170,
-                                 255, 0, 0, 1, 0xE, 1);
+            EffectSsDeadDb_Spawn(play, &this->dyna.actor.home.pos, &velocity, &accel, 80, 6, 255, 255, 150, 170, 255, 0,
+                                 0, 1, 0xE, 1);
             rot2 += 0x2AAA;
         }
     }
@@ -428,16 +428,14 @@ void BgYdanSp_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     if (thisx->params == WEB_WALL) {
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gDTWebWallDL);
     } else if (this->actionFunc == BgYdanSp_FloorWebBroken) {
         Matrix_Get(&mtxF);
         if (this->timer == 40) {
             Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY);
             Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL);
         }
         for (i = 0; i < 8; i++) {
@@ -445,15 +443,13 @@ void BgYdanSp_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateZYX(-0x5A0, i * 0x2000, 0, MTXMODE_APPLY);
             Matrix_Translate(0.0f, 700.0f, -900.0f, MTXMODE_APPLY);
             Matrix_Scale(3.5f, 5.0f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDTUnknownWebDL);
         }
     } else {
         Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY);
         Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
index 0f6355ed4b..a320471e4a 100644
--- a/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
+++ b/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
@@ -55,8 +55,8 @@ void BgZg_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_808C0C50(BgZg* this) {
-    Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 s32 func_808C0C98(BgZg* this, PlayState* play) {
@@ -126,8 +126,7 @@ void func_808C0EEC(BgZg* this, PlayState* play) {
     OPEN_DISPS(localGfxCtx);
 
     Gfx_SetupDL_25Opa(localGfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(localGfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(localGfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseBarsDL);
 
     CLOSE_DISPS(localGfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index 679f472b63..acba457abf 100644
--- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -11,7 +11,9 @@
 #include <stdlib.h> // malloc
 #include <string.h> // memcpy
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 #define LAVA_TEX_WIDTH 32
 #define LAVA_TEX_HEIGHT 64
@@ -214,13 +216,16 @@ void func_808C1554_Raw(void* arg0, void* floorTex, s32 arg2, f32 arg3) {
     u16 multiplier = width / LAVA_TEX_WIDTH;
 
     for (i = 0; i < size; i += width) {
-        temp = sinf((((i / width) + (s32)(((arg2 * multiplier) * 50.0f) / 100.0f)) & (width - 1)) * (M_PI / (16 * multiplier))) * (arg3 * sqrt(multiplier));
+        temp = sinf((((i / width) + (s32)(((arg2 * multiplier) * 50.0f) / 100.0f)) & (width - 1)) *
+                    (M_PI / (16 * multiplier))) *
+               (arg3 * sqrt(multiplier));
         for (i2 = 0; i2 < width; i2++) {
             sp54[i + ((temp + i2) & (width - 1))] = temp_s1[i + i2];
         }
     }
     for (i = 0; i < width; i++) {
-        temp = sinf(((i + (s32)(((arg2 * multiplier) * 80.0f) / 100.0f)) & (width - 1)) * (M_PI / (16 * multiplier))) * (arg3 * sqrt(multiplier));
+        temp = sinf(((i + (s32)(((arg2 * multiplier) * 80.0f) / 100.0f)) & (width - 1)) * (M_PI / (16 * multiplier))) *
+               (arg3 * sqrt(multiplier));
         temp *= width;
         for (i2 = 0; i2 < size; i2 += width) {
             temp2 = (temp + i2) & (size - 1);
@@ -319,8 +324,8 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) {
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 9200.0f, ActorShadow_DrawCircle, 250.0f);
     Actor_SetScale(&this->actor, 0.01f);
-    SkelAnime_Init(play, &this->skelAnime, &object_kingdodongo_Skel_01B310, &object_kingdodongo_Anim_00F0D8, NULL,
-                   NULL, 0);
+    SkelAnime_Init(play, &this->skelAnime, &object_kingdodongo_Skel_01B310, &object_kingdodongo_Anim_00F0D8, NULL, NULL,
+                   0);
     Animation_PlayLoop(&this->skelAnime, &object_kingdodongo_Anim_00F0D8);
     this->unk_1F8 = 1.0f;
     BossDodongo_SetupIntroCutscene(this, play);
@@ -339,8 +344,8 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) {
         // is now handled by BossDodongo_RegisterBlendedLavaTextureUpdate below
 
         Actor_Kill(&this->actor);
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f,
-                           -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0,
+                           WARP_DUNGEON_CHILD);
         Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000, true);
         if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -690.0f, -1523.76f, -3304.0f, 0, 0, 0, 0, true);
@@ -937,8 +942,7 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) {
             }
 
             if (!(this->unk_19E & 1)) {
-                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 40.0f, 3, 8.0f, 500, 10,
-                                         false);
+                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, 40.0f, 3, 8.0f, 500, 10, false);
             }
         }
     }
@@ -1274,8 +1278,7 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) {
     BossDodongo_UpdateEffects(play);
 }
 
-s32 BossDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx) {
+s32 BossDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     f32 mtxScaleY;
     f32 mtxScaleZ;
     BossDodongo* this = (BossDodongo*)thisx;
@@ -1318,8 +1321,7 @@ block_1:
         if (this->skelAnime.skeletonHeader->skeletonType == SKELANIME_TYPE_FLEX) {
             gSPMatrix(POLY_OPA_DISP++, *play->flexLimbOverrideMTX, G_MTX_LOAD);
         } else {
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         }
 
         gSPDisplayList(POLY_OPA_DISP++, *dList);
@@ -1582,8 +1584,8 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                 Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_003CF8, 1.0f, 0.0f,
                                  Animation_GetLastFrame(&object_kingdodongo_Anim_003CF8), ANIMMODE_ONCE, -1.0f);
                 this->csState = 6;
-                Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0,
-                            0x6000, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000,
+                            true);
             }
             break;
         case 6:
@@ -1757,8 +1759,8 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                         effectPos.x = Rand_CenteredFloat(120.0f) + this->actor.focus.pos.x;
                         effectPos.y = Rand_ZeroFloat(50.0f) + this->actor.world.pos.y;
                         effectPos.z = Rand_CenteredFloat(120.0f) + this->actor.focus.pos.z;
-                        func_8002836C(play, &effectPos, &dustVel, &dustAcell, &dustPrimColor, &dustEnvColor, 0x1F4,
-                                      0xA, 0xA);
+                        func_8002836C(play, &effectPos, &dustVel, &dustAcell, &dustPrimColor, &dustEnvColor, 0x1F4, 0xA,
+                                      0xA);
                         effectPos.x = Rand_CenteredFloat(120.0f) + this->actor.focus.pos.x;
                         effectPos.y = -1498.76f;
                         effectPos.z = Rand_CenteredFloat(120.0f) + this->actor.focus.pos.z;
@@ -1867,7 +1869,8 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                 func_80064534(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
                 if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f,
+                                       -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
                 }
                 this->skelAnime.playSpeed = 0.0f;
                 Flags_SetClear(play, play->roomCtx.curRoom.num);
@@ -1881,8 +1884,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
                 sp68.x = Rand_CenteredFloat(60.0f) + this->actor.focus.pos.x;
                 sp68.y = (Rand_ZeroOne() * 50.0f) + -1498.76f;
                 sp68.z = Rand_CenteredFloat(60.0f) + this->actor.focus.pos.z;
-                EffectSsGMagma2_Spawn(play, &sp68, &D_808CA568, &D_808CA56C, 5, 1,
-                                      (s16)(Rand_ZeroOne() * 50.0f) + 50);
+                EffectSsGMagma2_Spawn(play, &sp68, &D_808CA568, &D_808CA56C, 5, 1, (s16)(Rand_ZeroOne() * 50.0f) + 50);
             }
             break;
     }
@@ -1949,8 +1951,7 @@ void BossDodongo_DrawEffects(PlayState* play) {
             Matrix_Translate(eff->unk_00.x, eff->unk_00.y, eff->unk_00.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(unkMtx);
             Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009DD0);
         }
         FrameInterpolation_RecordCloseChild();
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index f350ac3089..249b3afe96 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -17,7 +17,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 typedef enum {
     /* 0 */ INTRO_FLY_EMERGE,
@@ -186,16 +188,13 @@ void BossFd_Init(Actor* thisx, PlayState* play) {
     s16 i;
 
     Flags_SetSwitch(play, 0x14);
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BG_VB_SIMA, 680.0f, -100.0f, 0.0f, 0, 0, 0,
-                       100);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BG_VB_SIMA, 680.0f, -100.0f, 0.0f, 0, 0, 0, 100);
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
     Actor_SetScale(&this->actor, 0.05f);
     SkelAnime_Init(play, &this->skelAnimeHead, &gVolvagiaHeadSkel, &gVolvagiaHeadEmergeAnim, NULL, NULL, 0);
-    SkelAnime_Init(play, &this->skelAnimeRightArm, &gVolvagiaRightArmSkel, &gVolvagiaRightArmEmergeAnim, NULL,
-                   NULL, 0);
-    SkelAnime_Init(play, &this->skelAnimeLeftArm, &gVolvagiaLeftArmSkel, &gVolvagiaLeftArmEmergeAnim, NULL, NULL,
-                   0);
+    SkelAnime_Init(play, &this->skelAnimeRightArm, &gVolvagiaRightArmSkel, &gVolvagiaRightArmEmergeAnim, NULL, NULL, 0);
+    SkelAnime_Init(play, &this->skelAnimeLeftArm, &gVolvagiaLeftArmSkel, &gVolvagiaLeftArmEmergeAnim, NULL, NULL, 0);
     this->introState = BFD_CS_WAIT;
     if (this->introState == BFD_CS_NONE) {
         Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_FIRE_BOSS);
@@ -397,8 +396,9 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                     this->fogMode = 1;
                 }
                 if (this->timers[0] < 50) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                     this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake;
                     Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
                 }
@@ -418,8 +418,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
             case BFD_CS_LOOK_GROUND:
                 this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake;
                 Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
-                Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (this->timers[0] == 0) {
                     this->introState = BFD_CS_COLLAPSE;
                     this->camData.nextEye.x = player2->actor.world.pos.x + 100.0f + 300.0f;
@@ -439,8 +439,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 this->camData.accel = 0.005f;
                 this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake;
                 Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
-                Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (this->timers[0] == 100) {
                     this->platformSignal = VBSIMA_COLLAPSE;
                 }
@@ -476,8 +476,9 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 osSyncPrintf("WAY_SPD Y = %f\n", this->camData.atVel.y);
                 osSyncPrintf("WAY_SPD Z = %f\n", this->camData.atVel.z);
                 if ((this->timers[3] > 190) && !Flags_GetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 }
                 if (this->timers[3] == 190) {
                     this->camData.atMaxVel.x = this->camData.atMaxVel.y = this->camData.atMaxVel.z = 0.05f;
@@ -683,7 +684,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 if (this->actor.bgCheckFlags & 0x10) {
                     this->fwork[BFD_CEILING_BOUNCE] = -18384.0f;
                     this->timers[1] = 10;
-                    Audio_PlaySoundGeneral(NA_SE_EV_EXPLOSION, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                    Audio_PlaySoundGeneral(NA_SE_EV_EXPLOSION, &this->actor.projectedPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                            &gSfxDefaultReverb);
                     func_80033E1C(play, 3, 0xA, 0x7530);
                     this->work[BFD_ROCK_TIMER] = 300;
@@ -783,8 +785,9 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
 
                 sp150 = 1;
                 if (this->work[BFD_MOVE_TIMER] & 0x1C) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_BURN - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_BURN - SFX_FLAG, &this->actor.projectedPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 }
                 for (i1 = 0; i1 < sp150; i1++) {
                     if (sp150) { // Needed for matching
@@ -856,8 +859,9 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                         this->work[BFD_CEILING_TARGET]++;
                         this->timers[1] = 60;
                         this->work[BFD_CAM_SHAKE_TIMER] = 20;
-                        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND2, &this->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                         Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
                         for (i1 = 0; i1 < 15; i1++) {
                             Vec3f sp144 = { 0.0f, 0.0f, 0.0f };
@@ -898,8 +902,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 Vec3f sp114 = { 0.0f, 0.0f, 0.0f };
                 Vec3f sp108 = { 0.0f, 0.03f, 0.0f };
 
-                Audio_PlaySoundGeneral(NA_SE_EN_GOMA_LAST - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_GOMA_LAST - SFX_FLAG, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 sp120.x = Rand_CenteredFloat(40.0f) + this->actor.world.pos.x;
                 sp120.y = (Rand_CenteredFloat(10.0f) + this->actor.world.pos.y) - 10.0f;
@@ -918,8 +922,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
                 this->actor.world.pos.y -= 1000.0f;
             }
             if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, this->timers[0] == 7)) {
-                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x,
-                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.world.pos.x, this->actor.world.pos.y,
+                            this->actor.world.pos.z, 0, 0, 0, 0, true);
             }
             break;
         case BOSSFD_WAIT_INTRO:
@@ -1106,8 +1110,7 @@ void BossFd_Effects(BossFd* this, PlayState* play) {
     } else if (this->fogMode == 10) {
         this->fogMode = 1;
         play->envCtx.unk_BF = 0;
-        Math_ApproachF(&play->envCtx.unk_D8, 0.21f + 0.07f * Math_SinS(this->work[BFD_VAR_TIMER] * 0xC00), 1.0f,
-                       0.05f);
+        Math_ApproachF(&play->envCtx.unk_D8, 0.21f + 0.07f * Math_SinS(this->work[BFD_VAR_TIMER] * 0xC00), 1.0f, 0.05f);
         play->envCtx.unk_DC = 2;
         play->envCtx.unk_BD = 3;
         play->envCtx.unk_BE = 0;
@@ -1139,8 +1142,8 @@ void BossFd_Effects(BossFd* this, PlayState* play) {
 
     if (this->work[BFD_ROAR_TIMER] != 0) {
         if (this->work[BFD_ROAR_TIMER] == 37) {
-            Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_ROAR, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_ROAR, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         jawAngle = 6000.0f;
         jawSpeed = 1300.0f;
@@ -1160,8 +1163,8 @@ void BossFd_Effects(BossFd* this, PlayState* play) {
         Vec3f spawnPos1;
         s32 pad;
 
-        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_APPEAR - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_APPEAR - SFX_FLAG, &this->actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         if (this->work[BFD_SPLASH_TIMER] != 0) {
             this->work[BFD_SPLASH_TIMER]--;
             if ((this->actor.colChkInfo.health == 0) ||
@@ -1238,8 +1241,8 @@ void BossFd_Effects(BossFd* this, PlayState* play) {
         this->fogMode = 2;
         spawnSpeed2.z = 30.0f;
 
-        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_FIRE - SFX_FLAG, &sFireAudioVec, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_FIRE - SFX_FLAG, &sFireAudioVec, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         spawnPos2 = this->headPos;
 
         spawnAngleY = (this->actor.world.rot.y / (f32)0x8000) * M_PI;
@@ -1301,8 +1304,8 @@ void BossFd_CollisionCheck(BossFd* this, PlayState* play) {
         }
         this->work[BFD_DAMAGE_FLASH_TIMER] = 10;
         this->work[BFD_INVINC_TIMER] = 20;
-        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_DAMAGE1, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_DAMAGE1, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -1542,8 +1545,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -1565,8 +1567,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) {
             Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -1589,8 +1590,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) {
             Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
             Matrix_ReplaceRotation(&play->billboardMtxF);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1614,8 +1614,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) {
             Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
             Matrix_ReplaceRotation(&play->billboardMtxF);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1638,8 +1637,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) {
             Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -1670,8 +1668,7 @@ void BossFd_Draw(Actor* thisx, PlayState* play) {
     osSyncPrintf("FD DRAW END2\n");
 }
 
-s32 BossFd_OverrideRightArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 BossFd_OverrideRightArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossFd* this = (BossFd*)thisx;
 
     switch (limbIndex) {
@@ -1693,8 +1690,7 @@ s32 BossFd_OverrideRightArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
     return false;
 }
 
-s32 BossFd_OverrideLeftArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 BossFd_OverrideLeftArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossFd* this = (BossFd*)thisx;
 
     switch (limbIndex) {
@@ -1776,8 +1772,7 @@ void BossFd_DrawMane(PlayState* play, BossFd* this, Vec3f* manePos, Vec3f* maneR
         Matrix_Scale(maneScale[maneIndex] * (0.01f - (i * 0.0008f)), maneScale[maneIndex] * (0.01f - (i * 0.0008f)),
                      0.01f, MTXMODE_APPLY);
         Matrix_RotateX(-M_PI / 2.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL);
     }
 
@@ -1861,8 +1856,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) {
     Matrix_RotateX(-this->bodySegsRot[segIndex].x, MTXMODE_APPLY);
     Matrix_Translate(-13.0f, -5.0f, 13.0f, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x * 0.1f, this->actor.scale.y * 0.1f, this->actor.scale.z * 0.1f, MTXMODE_APPLY);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeRightArm,
-                      BossFd_OverrideRightArmDraw, NULL, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeRightArm, BossFd_OverrideRightArmDraw, NULL, this);
     Matrix_Pop();
     osSyncPrintf("RH\n");
     Matrix_Push();
@@ -1873,8 +1867,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) {
     Matrix_RotateX(-this->bodySegsRot[segIndex].x, MTXMODE_APPLY);
     Matrix_Translate(13.0f, -5.0f, 13.0f, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x * 0.1f, this->actor.scale.y * 0.1f, this->actor.scale.z * 0.1f, MTXMODE_APPLY);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeLeftArm,
-                      BossFd_OverrideLeftArmDraw, NULL, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeLeftArm, BossFd_OverrideLeftArmDraw, NULL, this);
     Matrix_Pop();
     osSyncPrintf("BD\n");
     gSPSegment(POLY_OPA_DISP++, 0x0D, tempMat);
@@ -1932,9 +1925,8 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) {
                     Matrix_MultVec3f(&spF0, &spE4);
                     Matrix_Get(&spFC);
                     Matrix_MtxFToYXZRotS(&spFC, &spDC, 0);
-                    bones =
-                        (EnVbBall*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_VB_BALL,
-                                                      spE4.x, spE4.y, spE4.z, spDC.x, spDC.y, spDC.z, i + 200);
+                    bones = (EnVbBall*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_VB_BALL, spE4.x,
+                                                          spE4.y, spE4.z, spDC.x, spDC.y, spDC.z, i + 200);
 
                     bones->actor.scale.x = this->actor.scale.x * temp_float;
                     bones->actor.scale.y = this->actor.scale.y * spD4;
@@ -1970,8 +1962,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) {
     Matrix_Pop();
     osSyncPrintf("BHCE\n");
     Matrix_Scale(this->actor.scale.x * 0.1f, this->actor.scale.y * 0.1f, this->actor.scale.z * 0.1f, MTXMODE_APPLY);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeHead, BossFd_OverrideHeadDraw,
-                      BossFd_PostHeadDraw, &this->actor);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeHead, BossFd_OverrideHeadDraw, BossFd_PostHeadDraw, &this->actor);
     osSyncPrintf("SK\n");
     {
         Vec3f spB0 = { 0.0f, 1700.0f, 7000.0f };
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index ec25be1842..0299016b9c 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -12,7 +12,9 @@
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 typedef enum {
     /* 0 */ DEATH_START,
@@ -76,8 +78,8 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(targetArrowOffset, 0, ICHAIN_STOP),
 };
 
-void BossFd2_SpawnDebris(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity,
-                         Vec3f* acceleration, f32 scale) {
+void BossFd2_SpawnDebris(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
+                         f32 scale) {
     s16 i;
 
     for (i = 0; i < 180; i++, effect++) {
@@ -121,8 +123,8 @@ void BossFd2_SpawnFireBreath(PlayState* play, BossFdEffect* effect, Vec3f* posit
     }
 }
 
-void BossFd2_SpawnEmber(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity,
-                        Vec3f* acceleration, f32 scale) {
+void BossFd2_SpawnEmber(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
+                        f32 scale) {
     s16 i;
 
     for (i = 0; i < 180; i++, effect++) {
@@ -470,16 +472,16 @@ void BossFd2_BreatheFire(BossFd2* this, PlayState* play) {
         Matrix_MultVec3f(&spawnSpeed, &spawnVel);
 
         breathScale = 300.0f + 50.0f * Math_SinS(this->work[FD2_VAR_TIMER] * 0x2000);
-        BossFd2_SpawnFireBreath(play, bossFd->effects, &spawnPos, &spawnVel, &spawnAccel, breathScale,
-                                breathOpacity, this->actor.shape.rot.y + this->headRot.y);
+        BossFd2_SpawnFireBreath(play, bossFd->effects, &spawnPos, &spawnVel, &spawnAccel, breathScale, breathOpacity,
+                                this->actor.shape.rot.y + this->headRot.y);
 
         spawnPos.x += spawnVel.x * 0.5f;
         spawnPos.y += spawnVel.y * 0.5f;
         spawnPos.z += spawnVel.z * 0.5f;
 
         breathScale = 300.0f + 50.0f * Math_SinS(this->work[FD2_VAR_TIMER] * 0x2000);
-        BossFd2_SpawnFireBreath(play, bossFd->effects, &spawnPos, &spawnVel, &spawnAccel, breathScale,
-                                breathOpacity, this->actor.shape.rot.y + this->headRot.y);
+        BossFd2_SpawnFireBreath(play, bossFd->effects, &spawnPos, &spawnVel, &spawnAccel, breathScale, breathOpacity,
+                                this->actor.shape.rot.y + this->headRot.y);
 
         spawnSpeed.x = 0.0f;
         spawnSpeed.y = 17.0f;
@@ -1009,8 +1011,7 @@ void BossFd2_Update(Actor* thisx, PlayState* play2) {
     }
 }
 
-s32 BossFd2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 BossFd2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossFd2* this = (BossFd2*)thisx;
     BossFd* bossFd = (BossFd*)this->actor.parent;
 
@@ -1066,8 +1067,7 @@ void BossFd2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro
     Collider_UpdateSpheres(limbIndex, &this->collider);
 }
 
-void BossFd2_UpdateMane(BossFd2* this, PlayState* play, Vec3f* head, Vec3f* pos, Vec3f* rot, Vec3f* pull,
-                        f32* scale) {
+void BossFd2_UpdateMane(BossFd2* this, PlayState* play, Vec3f* head, Vec3f* pos, Vec3f* rot, Vec3f* pull, f32* scale) {
     f32 sp138[10] = { 0.0f, 100.0f, 50.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
     f32 sp110[10] = { 0.0f, 5.0f, -10.0f, 500.0f, 500.0f, 500.0f, 500.0f, 500.0f, 500.0f, 500.0f };
     f32 spE8[10] = { 0.4f, 0.6f, 0.8f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f };
@@ -1159,8 +1159,7 @@ void BossFd2_UpdateMane(BossFd2* this, PlayState* play, Vec3f* head, Vec3f* pos,
         xyScale = (0.01f - (i * 0.0009f)) * spE8[i] * scale[i];
         Matrix_Scale(xyScale, xyScale, 0.01f * spE8[i], MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL);
 
         FrameInterpolation_RecordCloseChild();
@@ -1194,8 +1193,8 @@ void BossFd2_DrawMane(BossFd2* this, PlayState* play) {
                        this->rightMane.pull, this->rightMane.scale);
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, bossFd->fwork[BFD_MANE_COLOR_LEFT], 0, 255);
-    BossFd2_UpdateMane(this, play, &this->leftMane.head, this->leftMane.pos, this->leftMane.rot,
-                       this->leftMane.pull, this->leftMane.scale);
+    BossFd2_UpdateMane(this, play, &this->leftMane.head, this->leftMane.pos, this->leftMane.rot, this->leftMane.pull,
+                       this->leftMane.scale);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index 4c6e0f841f..f845f323a2 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -16,7 +16,9 @@
 
 #include <string.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void BossGanon_Init(Actor* thisx, PlayState* play);
 void BossGanon_Destroy(Actor* thisx, PlayState* play);
@@ -30,7 +32,6 @@ void func_808E324C(Actor* thisx, PlayState* play); // draw
 void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play);
 void BossGanon_Reset(void);
 
-
 void BossGanon_SetupIntroCutscene(BossGanon* this, PlayState* play);
 void BossGanon_SetupTowerCutscene(BossGanon* this, PlayState* play);
 void BossGanon_IntroCutscene(BossGanon* this, PlayState* play);
@@ -122,7 +123,7 @@ EnZl3* sBossGanonZelda;
 
 GanondorfEffect sBossGanonEffectBuf[200];
 
-static u8 sWindowShatterTex[2048] = { {0} };
+static u8 sWindowShatterTex[2048] = { { 0 } };
 
 void BossGanonEff_SpawnWindowShard(PlayState* play, Vec3f* pos, Vec3f* velocity, f32 scale) {
     static Color_RGB8 shardColors[] = { { 255, 175, 85 }, { 155, 205, 155 }, { 155, 125, 55 } };
@@ -151,8 +152,7 @@ void BossGanonEff_SpawnWindowShard(PlayState* play, Vec3f* pos, Vec3f* velocity,
     }
 }
 
-void BossGanonEff_SpawnSparkle(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale,
-                               s16 arg6) {
+void BossGanonEff_SpawnSparkle(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 arg6) {
     s16 i;
     GanondorfEffect* eff = play->specialEffects;
 
@@ -172,8 +172,8 @@ void BossGanonEff_SpawnSparkle(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec
     }
 }
 
-void BossGanonEff_SpawnLightRay(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale,
-                                f32 arg5, s16 arg6) {
+void BossGanonEff_SpawnLightRay(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, f32 arg5,
+                                s16 arg6) {
     s16 i;
     GanondorfEffect* eff = play->specialEffects;
 
@@ -367,7 +367,8 @@ void BossGanon_Init(Actor* thisx, PlayState* play2) {
         } else {
             cond = Flags_GetSwitch(play, 0x37) &&
                    ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-                    (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
+                    (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+                    (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
 
             if (!cond) {
                 BossGanon_SetupTowerCutscene(this, play);
@@ -379,8 +380,8 @@ void BossGanon_Init(Actor* thisx, PlayState* play2) {
             BossGanon_SetupTowerCutscene(this, play);
         }
 
-        sBossGanonCape = (EnGanonMant*)Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_GANON_MANT, 0.0f,
-                                                 0.0f, 0.0f, 0, 0, 0, 1);
+        sBossGanonCape = (EnGanonMant*)Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_GANON_MANT, 0.0f, 0.0f,
+                                                          0.0f, 0, 0, 0, 1);
         Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_BOSS);
     } else {
         thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
@@ -591,11 +592,10 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
                 BossGanon_SetIntroCsCamera(this, 0);
                 this->csState = 1;
                 sBossGanonZelda = (EnZl3*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ZL3, 0.0f,
-                                                    220.0f, -150.0f, 0, 0, 0, 0x2000);
+                                                             220.0f, -150.0f, 0, 0, 0, 0x2000);
             }
 
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GANON_ORGAN, 0.0f, 0.0f, 0.0f, 0,
-                               0, 0, 1);
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GANON_ORGAN, 0.0f, 0.0f, 0.0f, 0, 0, 0, 1);
             sBossGanonCape->minY = 57.0f;
             // fallthrough
         case 1:
@@ -1241,7 +1241,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
     static Color_RGBA8 bloodPrimColor = { 0, 120, 0, 255 };
     static Color_RGBA8 bloodEnvColor = { 0, 120, 0, 255 };
 
-    if(CVarGetInteger(CVAR_ENHANCEMENT("RedGanonBlood"), 0)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("RedGanonBlood"), 0)) {
         bloodPrimColor.r = 120;
         bloodPrimColor.g = 0;
 
@@ -1555,7 +1555,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
             this->fwork[1] = Animation_GetLastFrame(&gGanondorfDefeatedStartAnim);
             this->skelAnime.playSpeed = 0.0f;
             sBossGanonZelda = (EnZl3*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ZL3, 0.0f,
-                                                6000.0f, 0.0f, 0, 0, 0, 0x2000);
+                                                         6000.0f, 0.0f, 0, 0, 0, 0x2000);
 
             if (!IS_RANDO && !IS_BOSS_RUSH) {
                 this->csState = 101;
@@ -1976,8 +1976,8 @@ void BossGanon_PoundFloor(BossGanon* this, PlayState* play) {
                     sp6C.x = Rand_CenteredFloat(25.0f);
                     sp6C.y = Rand_ZeroFloat(17.0f);
                     sp6C.z = Rand_CenteredFloat(25.0f);
-                    BossGanonEff_SpawnLightRay(play, &sp60, &sp6C, &sZeroVec, Rand_ZeroFloat(300.0f) + 500.0f,
-                                               13.0f, 0x1E);
+                    BossGanonEff_SpawnLightRay(play, &sp60, &sp6C, &sZeroVec, Rand_ZeroFloat(300.0f) + 500.0f, 13.0f,
+                                               0x1E);
                 }
             }
             break;
@@ -2564,8 +2564,8 @@ void BossGanon_SetupVulnerable(BossGanon* this, PlayState* play) {
         sBossGanonCape->minDist = 20.0f;
 
         for (i = 0; i < 10; i++) {
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_GANON, this->unk_1FC.x,
-                               this->unk_1FC.y, this->unk_1FC.z, Rand_CenteredFloat(0x8000),
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_GANON, this->unk_1FC.x, this->unk_1FC.y,
+                               this->unk_1FC.z, Rand_CenteredFloat(0x8000),
                                (s16)Rand_CenteredFloat(0x8000) + this->actor.yawTowardsPlayer, 0, 0xC8 + i);
         }
 
@@ -2709,8 +2709,8 @@ void BossGanon_Vulnerable(BossGanon* this, PlayState* play) {
                     sp40.x = Rand_CenteredFloat(25.0f);
                     sp40.y = Rand_CenteredFloat(25.0f);
                     sp40.z = Rand_CenteredFloat(25.0f);
-                    BossGanonEff_SpawnSparkle(play, &this->unk_1FC, &sp40, &sZeroVec,
-                                              Rand_ZeroFloat(200.0f) + 500.0f, 0x14);
+                    BossGanonEff_SpawnSparkle(play, &this->unk_1FC, &sp40, &sZeroVec, Rand_ZeroFloat(200.0f) + 500.0f,
+                                              0x14);
                 }
 
                 Audio_PlayActorSound2(&this->actor, NA_SE_PL_WALK_WATER2);
@@ -2777,8 +2777,8 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) {
                     sp50.x = Rand_CenteredFloat(20.0f);
                     sp50.y = Rand_CenteredFloat(20.0f);
                     sp50.z = Rand_CenteredFloat(20.0f);
-                    BossGanonEff_SpawnSparkle(play, &this->unk_1FC, &sp50, &sZeroVec,
-                                              Rand_ZeroFloat(200.0f) + 500.0f, 0x1E);
+                    BossGanonEff_SpawnSparkle(play, &this->unk_1FC, &sp50, &sZeroVec, Rand_ZeroFloat(200.0f) + 500.0f,
+                                              0x1E);
                 }
 
                 damage = flags = CollisionCheck_GetSwordDamage(acHitInfo->toucher.dmgFlags, play);
@@ -3192,13 +3192,11 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) {
 
     if (this->whiteFillAlpha != 0) {
         play->envCtx.screenFillColor[3] = (s8)(u8)this->whiteFillAlpha;
-        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] =
-            play->envCtx.screenFillColor[2] = 255;
+        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] = play->envCtx.screenFillColor[2] = 255;
         play->envCtx.fillScreen = true;
     } else if (this->screenFlashTimer != 0) {
         play->envCtx.fillScreen = true;
-        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] =
-            play->envCtx.screenFillColor[2] = 255;
+        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] = play->envCtx.screenFillColor[2] = 255;
 
         play->envCtx.screenFillColor[3] = ((this->screenFlashTimer % 2) != 0) ? 100 : 0;
 
@@ -3258,8 +3256,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) {
     }
 }
 
-s32 BossGanon_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 BossGanon_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossGanon* this = (BossGanon*)thisx;
 
     switch (limbIndex) {
@@ -3335,8 +3332,7 @@ void BossGanon_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         OPEN_DISPS(play->state.gfxCtx);
 
         Matrix_MultVec3f(&D_808E4DB8, &this->unk_208);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL));
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -3431,10 +3427,9 @@ void BossGanon_DrawShock(BossGanon* this, PlayState* play) {
                 Matrix_ReplaceRotation(&play->billboardMtxF);
                 Matrix_Scale(this->unk_49C[i], this->unk_49C[i], this->unk_49C[i], MTXMODE_APPLY);
                 Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
-                
+
                 FrameInterpolation_RecordCloseChild();
             }
         } else {
@@ -3449,13 +3444,12 @@ void BossGanon_DrawShock(BossGanon* this, PlayState* play) {
                     Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
                 }
 
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
                 if (this->shockGlow) {
-                    gSPSegment(POLY_XLU_DISP++, 0x08,
-                               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0,
-                                                (this->unk_1A2 + i) * -15, 32, 64));
+                    gSPSegment(
+                        POLY_XLU_DISP++, 0x08,
+                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->unk_1A2 + i) * -15, 32, 64));
                     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 255, 170, 255);
                     gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 128);
                     gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockGlowDL);
@@ -3494,8 +3488,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) {
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_Scale(this->handLightBallScale, this->handLightBallScale, this->handLightBallScale, MTXMODE_APPLY);
         Matrix_RotateZ(this->unk_258, 1);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
 
         alpha = ((this->unk_1A2 % 2) != 0) ? 100 : 80;
@@ -3503,8 +3496,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, alpha);
         Matrix_Translate(this->unk_260.x, 0.0f, this->unk_260.z, MTXMODE_NEW);
         Matrix_Scale(this->handLightBallScale * 0.75f, 1.0f, this->handLightBallScale * 0.75f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightCoreDL);
     }
 
@@ -3526,25 +3518,22 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, (s8)this->unk_290);
         gDPSetEnvColor(POLY_XLU_DISP++, 200, 255, 0, 128);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_1A2 * -2, 0, 0x40, 0x40, 1, 0,
-                                    this->unk_1A2 * 0xA, 0x40, 0x40));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_1A2 * -2, 0, 0x40, 0x40, 1, 0, this->unk_1A2 * 0xA,
+                                    0x40, 0x40));
         Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW);
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_Scale(this->unk_28C, this->unk_28C, this->unk_28C, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightFlecksDL);
 
         // background circle texture
         Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW);
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_Scale(this->unk_284, this->unk_284, this->unk_284, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 100, (s8)this->unk_288);
-        gSPSegment(
-            POLY_XLU_DISP++, 0x09,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0, this->unk_1A2 * -4, 0x20, 0x20));
+        gSPSegment(POLY_XLU_DISP++, 0x09,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0, this->unk_1A2 * -4, 0x20, 0x20));
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfBigMagicBGCircleDL);
 
         // yellow background dot
@@ -3564,8 +3553,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) {
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_Scale(this->unk_2D0, this->unk_2D0, this->unk_2D0, MTXMODE_APPLY);
         Matrix_RotateZ((this->unk_1A2 * 10.0f) / 1000.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
 
         BossGanon_InitRand(this->unk_1AA + 1, 0x71AC, 0x263A);
@@ -3587,8 +3575,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) {
             Matrix_RotateZ(xzRot, MTXMODE_APPLY);
             Matrix_Translate(0.0f, 0.0f, 50.0f, MTXMODE_APPLY);
             Matrix_Scale(4.0f, 4.0f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightRayTriDL);
 
             Matrix_Pop();
@@ -3642,8 +3629,7 @@ void BossGanon_DrawTriforce(BossGanon* this, PlayState* play) {
         }
 
         Matrix_Scale(this->fwork[GDF_TRIFORCE_SCALE], this->fwork[GDF_TRIFORCE_SCALE], 1.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfTriforceDL));
 
         Matrix_Pop();
@@ -3661,8 +3647,8 @@ void BossGanon_DrawDarkVortex(BossGanon* this, PlayState* play) {
         Matrix_Push();
         gDPPipeSync(POLY_XLU_DISP++);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_1A2 * -8, 0, 0x20, 0x40, 1,
-                                    this->unk_1A2 * -4, this->unk_1A2 * -8, 0x20, 0x20));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_1A2 * -8, 0, 0x20, 0x40, 1, this->unk_1A2 * -4,
+                                    this->unk_1A2 * -8, 0x20, 0x20));
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 0, 200, (s8)this->fwork[GDF_VORTEX_ALPHA]);
         gDPSetEnvColor(POLY_XLU_DISP++, 130, 0, 0, 128);
 
@@ -3677,8 +3663,7 @@ void BossGanon_DrawDarkVortex(BossGanon* this, PlayState* play) {
 
         Matrix_Scale(this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE],
                      MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfVortexDL));
 
         Matrix_Pop();
@@ -3851,8 +3836,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, PlayState* play) {
     }
 
     Matrix_Scale(0.95000005f, 1.0f, 0.95000005f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGanondorfShadowSetupDL);
     gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                         G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
@@ -4029,8 +4013,9 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
 
                     if ((hitWithBottle == false) && (acHitInfo->toucher.dmgFlags & 0x100000)) {
                         spBA = 2;
-                        Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                         func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96);
                     } else {
                         spBA = 1;
@@ -4039,8 +4024,9 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
                             Math_Atan2S(sqrtf(SQ(xDistFromGanondorf) + SQ(zDistFromGanondorf)), yDistFromGanondorf);
                         this->unk_1A4++;
                         this->timers[1] = 2;
-                        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                         func_800AA000(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64);
 
                         if (hitWithBottle == false) {
@@ -4114,8 +4100,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
                 if (sqrtf(SQ(xDistFromGanondorf) + SQ(yDistFromGanondorf) + SQ(zDistFromGanondorf)) < 30.0f) {
                     spBA = 3;
                     SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_GANON_DAMAGE1);
-                    SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40,
-                                                       NA_SE_EN_GANON_HIT_THUNDER);
+                    SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_GANON_HIT_THUNDER);
                 }
                 break;
 
@@ -4225,8 +4210,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play) {
     Matrix_Push();
     Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z, MTXMODE_NEW);
     Matrix_Scale(this->actor.scale.x * 0.75f, 1.0f, this->actor.scale.z * 0.75f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightCoreDL);
 
     Matrix_Pop();
@@ -4243,8 +4227,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play) {
             Matrix_Push();
             Matrix_RotateY(i * (M_PI / 8), MTXMODE_APPLY);
             Matrix_RotateZ(this->fwork[GDF_FWORK_0], MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
             Matrix_Pop();
@@ -4254,8 +4237,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play) {
     } else if (this->unk_1A8 == 0) {
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * 3.1416f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
     }
 
@@ -4333,8 +4315,8 @@ void func_808E1EB4(Actor* thisx, PlayState* play2) {
                     accel.y = vel.y * -0.03f;
                     accel.z = vel.z * -0.03f;
 
-                    BossGanonEff_SpawnLightRay(play, &dorf->unk_1FC, &vel, &accel,
-                                               Rand_ZeroFloat(500.0f) + 1000.0f, 15.0f, 0x14);
+                    BossGanonEff_SpawnLightRay(play, &dorf->unk_1FC, &vel, &accel, Rand_ZeroFloat(500.0f) + 1000.0f,
+                                               15.0f, 0x14);
                 }
 
                 for (i = 1; i < 15; i++) {
@@ -4378,8 +4360,7 @@ void func_808E229C(Actor* thisx, PlayState* play2) {
                      this->actor.scale.z * (1.0f - (i * 0.07000001f)), MTXMODE_APPLY);
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_RotateZ(((2.0f * (i * M_PI)) / 10.0f) + BINANG_TO_RAD(this->actor.shape.rot.z), MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
     }
 
@@ -4498,7 +4479,8 @@ void func_808E2544(Actor* thisx, PlayState* play) {
             this->actor.world.rot.x = (Math_CosS(this->unk_1A2 * 0x3400) * sp84 * 0.1f) + this->actor.shape.rot.x;
             this->actor.world.rot.y = (Math_SinS(this->unk_1A2 * 0x1A00) * sp84) + this->actor.shape.rot.y;
 
-            if ((player->meleeWeaponState != 0) && (player->meleeWeaponAnimation >= 0x18) && (this->actor.xzDistToPlayer < 80.0f)) {
+            if ((player->meleeWeaponState != 0) && (player->meleeWeaponAnimation >= 0x18) &&
+                (this->actor.xzDistToPlayer < 80.0f)) {
                 this->unk_1C2 = 0xC;
                 this->actor.speedXZ = -30.0f;
                 Actor_UpdateVelocityXYZ(&this->actor);
@@ -4550,8 +4532,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
 
                 if (dorf->timers[2] == 0) {
                     func_8002F6D4(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x50);
-                    SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40,
-                                                       NA_SE_EN_GANON_HIT_THUNDER);
+                    SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_GANON_HIT_THUNDER);
                     dorf->timers[2] = 20;
 
                     for (i = 0; i < ARRAY_COUNT(this->unk_4E4); i++) {
@@ -4626,8 +4607,8 @@ void func_808E2544(Actor* thisx, PlayState* play) {
             sp60.y = Rand_CenteredFloat(30.0f);
             sp60.z = Rand_CenteredFloat(30.0);
 
-            BossGanonEff_SpawnLightRay(play, &this->actor.world.pos, &sp60, &sZeroVec,
-                                       Rand_ZeroFloat(200.0f) + 500.0f, 15.0f, 0x1E);
+            BossGanonEff_SpawnLightRay(play, &this->actor.world.pos, &sp60, &sZeroVec, Rand_ZeroFloat(200.0f) + 500.0f,
+                                       15.0f, 0x1E);
         }
     }
 }
@@ -4670,8 +4651,7 @@ void func_808E324C(Actor* thisx, PlayState* play) {
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_Scale(10.0f, 10.0f, 10.0f, MTXMODE_APPLY);
     Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL);
 
     gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
@@ -4869,8 +4849,8 @@ void BossGanon_UpdateEffects(PlayState* play) {
 
                     if (((eff->scale * 150.0f) < distToPlayer) && (distToPlayer < (eff->scale * 300.0f))) {
                         eff->timer = 150;
-                        func_8002F6D4(play, &sBossGanonGanondorf->actor, 7.0f, sBossGanonGanondorf->actor.yawTowardsPlayer, 0.0f,
-                                      0x20);
+                        func_8002F6D4(play, &sBossGanonGanondorf->actor, 7.0f,
+                                      sBossGanonGanondorf->actor.yawTowardsPlayer, 0.0f, 0x20);
                     }
                 }
             }
@@ -4879,9 +4859,10 @@ void BossGanon_UpdateEffects(PlayState* play) {
 }
 
 static void* sLightningTextures[] = {
-    gGanondorfLightning1Tex,  gGanondorfLightning1Tex,  gGanondorfLightning2Tex,  gGanondorfLightning3Tex, gGanondorfLightning4Tex,
-    gGanondorfLightning5Tex,  gGanondorfLightning6Tex,  gGanondorfLightning7Tex,  gGanondorfLightning8Tex, gGanondorfLightning9Tex,
-    gGanondorfLightning10Tex, gGanondorfLightning11Tex, gGanondorfLightning12Tex,
+    gGanondorfLightning1Tex,  gGanondorfLightning1Tex, gGanondorfLightning2Tex,  gGanondorfLightning3Tex,
+    gGanondorfLightning4Tex,  gGanondorfLightning5Tex, gGanondorfLightning6Tex,  gGanondorfLightning7Tex,
+    gGanondorfLightning8Tex,  gGanondorfLightning9Tex, gGanondorfLightning10Tex, gGanondorfLightning11Tex,
+    gGanondorfLightning12Tex,
 };
 
 static u8 sLightningPrimColors[] = {
@@ -4923,8 +4904,7 @@ void BossGanon_DrawEffects(PlayState* play) {
             Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY);
             Matrix_RotateY(eff->unk_48, MTXMODE_APPLY);
             Matrix_RotateX(eff->unk_44, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gGanondorfWindowShardModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -4947,8 +4927,7 @@ void BossGanon_DrawEffects(PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
             Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -4973,8 +4952,7 @@ void BossGanon_DrawEffects(PlayState* play) {
             Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
             Matrix_Scale(eff->scale, eff->scale, eff->unk_38 * eff->scale, MTXMODE_APPLY);
             Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -5001,8 +4979,7 @@ void BossGanon_DrawEffects(PlayState* play) {
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
             Matrix_RotateX(eff->unk_3C * 1.3f, MTXMODE_APPLY);
             Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -5019,13 +4996,13 @@ void BossGanon_DrawEffects(PlayState* play) {
                             255);
             gDPSetEnvColor(POLY_XLU_DISP++, sLightningEnvColors[(eff->timer * 3) + 0],
                            sLightningEnvColors[(eff->timer * 3) + 1], sLightningEnvColors[(eff->timer * 3) + 2], 0);
-            Matrix_Translate(sBossGanonGanondorf->unk_260.x, sBossGanonGanondorf->unk_260.y, sBossGanonGanondorf->unk_260.z, MTXMODE_NEW);
+            Matrix_Translate(sBossGanonGanondorf->unk_260.x, sBossGanonGanondorf->unk_260.y,
+                             sBossGanonGanondorf->unk_260.z, MTXMODE_NEW);
             Matrix_RotateY(eff->unk_48, MTXMODE_APPLY);
             Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
             Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY);
             Matrix_RotateY(eff->unk_44, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer]));
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightningDL);
             FrameInterpolation_RecordCloseChild();
@@ -5045,8 +5022,7 @@ void BossGanon_DrawEffects(PlayState* play) {
                                         eff->timer * -20, 32, 32));
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfImpactDarkDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -5065,8 +5041,7 @@ void BossGanon_DrawEffects(PlayState* play) {
                                         eff->timer * -20, 32, 32));
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfImpactLightDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -5081,13 +5056,12 @@ void BossGanon_DrawEffects(PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 150, 255, 0, 128);
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, (eff->timer * 100), 0, 64, 32, 1,
-                                        (eff->timer * 100), 0, 64, 32));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, (eff->timer * 100), 0, 64, 32, 1, (eff->timer * 100), 0,
+                                        64, 32));
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_Scale((eff->scale * 200.0f) / 1500.0f, (eff->unk_40 * 200.0f) / 1500.0f,
                          (eff->scale * 200.0f) / 1500.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockwaveDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -5101,14 +5075,13 @@ void BossGanon_DrawEffects(PlayState* play) {
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 150, 170, 0, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
-            gSPSegment(POLY_XLU_DISP++, 0x0A,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, eff->timer * 2, eff->timer * -20,
-                                        64, 64));
+            gSPSegment(
+                POLY_XLU_DISP++, 0x0A,
+                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, eff->timer * 2, eff->timer * -20, 64, 64));
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanondorfDotDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 611b008c61..1799dafd0c 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -13,7 +13,9 @@
 
 #include <string.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void BossGanon2_Init(Actor* thisx, PlayState* play);
 void BossGanon2_Destroy(Actor* thisx, PlayState* play);
@@ -72,7 +74,6 @@ Vec3f D_80910608[4];
 
 s8 D_80910638;
 
-
 void BossGanon2_InitRand(s32 seedInit0, s32 seedInit1, s32 seedInit2) {
     sBossGanon2Seed1 = seedInit0;
     sBossGanon2Seed2 = seedInit1;
@@ -181,7 +182,8 @@ void BossGanon2_Init(Actor* thisx, PlayState* play) {
     this->actor.gravity = 0.0f;
 
     hasFoundMasterSword = 1;
-    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+    if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
+        !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
         hasFoundMasterSword = 0;
     }
 }
@@ -235,7 +237,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
                 Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
                 Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
                 sBossGanon2Zelda = (EnZl3*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ZL3, 970.0f,
-                                                    1086.0f, -200.0f, 0, 0, 0, 1);
+                                                              1086.0f, -200.0f, 0, 0, 0, 1);
                 sBossGanon2Zelda->unk_3C8 = 0;
                 sBossGanon2Zelda->actor.world.pos.x = 970.0f;
                 sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
@@ -718,9 +720,9 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             }
             if (this->csTimer == 80) {
                 BossGanon2_SetObjectSegment(this, play, OBJECT_GANON2, false);
-                TitleCard_InitBossName(play, &play->actorCtx.titleCtx,
-                                       SEGMENTED_TO_VIRTUAL(gGanonTitleCardENGTex), 160, 180, 128, 40, true);
-                                       //It has translation but they are all the same. they all say "GANON" only
+                TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gGanonTitleCardENGTex), 160,
+                                       180, 128, 40, true);
+                // It has translation but they are all the same. they all say "GANON" only
             }
             this->unk_3A4.x = ((this->actor.world.pos.x + 500.0f) - 350.0f) + 100.0f;
             this->unk_3A4.y = this->actor.world.pos.y;
@@ -769,8 +771,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
             }
             if (this->csTimer >= 229) {
                 play->envCtx.fillScreen = true;
-                play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] =
-                    play->envCtx.screenFillColor[2] = 255;
+                play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] = play->envCtx.screenFillColor[2] =
+                    255;
                 play->envCtx.screenFillColor[3] = 100;
                 if (this->csTimer == 234) {
                     Vec3f sp68;
@@ -1488,7 +1490,7 @@ void func_8090109C(BossGanon2* this, PlayState* play) {
     static Color_RGBA8 sPrimColor = { 0, 120, 0, 255 };
     static Color_RGBA8 sEnvColor = { 0, 120, 0, 255 };
 
-    if(CVarGetInteger(CVAR_ENHANCEMENT("RedGanonBlood"), 0)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("RedGanonBlood"), 0)) {
         sPrimColor.r = 120;
         sPrimColor.g = 0;
 
@@ -1510,8 +1512,7 @@ void func_8090109C(BossGanon2* this, PlayState* play) {
         pos.x = this->unk_1B8.x;
         pos.y = this->unk_1B8.y;
         pos.z = this->unk_1B8.z;
-        func_8002836C(play, &pos, &velocity, &accel, &sPrimColor, &sEnvColor, (s16)Rand_ZeroFloat(50.0f) + 50, 0,
-                      17);
+        func_8002836C(play, &pos, &velocity, &accel, &sPrimColor, &sEnvColor, (s16)Rand_ZeroFloat(50.0f) + 50, 0, 17);
     }
 }
 
@@ -2178,8 +2179,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
             play->envCtx.unk_BE = 6;
             play->envCtx.unk_BD = 7;
             Math_ApproachF(&this->unk_33C, 0.69f, 1.0f, 0.05f);
-            play->envCtx.unk_D8 =
-                (Math_SinS(play->gameplayFrames * 0x5000) * 0.15f) + (0.15f + this->unk_33C);
+            play->envCtx.unk_D8 = (Math_SinS(play->gameplayFrames * 0x5000) * 0.15f) + (0.15f + this->unk_33C);
             break;
         case 55:
             play->envCtx.unk_BE = 2;
@@ -2190,8 +2190,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
             play->envCtx.unk_BE = 2;
             play->envCtx.unk_BD = 8;
             Math_ApproachF(&this->unk_33C, 0.69f, 1.0f, 0.05f);
-            play->envCtx.unk_D8 =
-                (Math_SinS(play->gameplayFrames * 0x7000) * 0.15f) + (0.15f + this->unk_33C);
+            play->envCtx.unk_D8 = (Math_SinS(play->gameplayFrames * 0x7000) * 0.15f) + (0.15f + this->unk_33C);
             break;
         case 7:
             play->envCtx.unk_BE = 0;
@@ -2449,14 +2448,12 @@ void func_80903F38(BossGanon2* this, PlayState* play) {
     }
 
     if (D_80910638 >= 4) {
-        gSPSegment(
-            POLY_XLU_DISP++, 0x08,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, play->gameplayFrames * 18, 0, 32, 32));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, play->gameplayFrames * 18, 0, 32, 32));
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, D_80907080);
         Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGanonSwordTrailDL);
     }
 
@@ -2478,8 +2475,7 @@ void func_80904108(BossGanon2* this, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
         Matrix_Translate(-200.0f, 1086.0f, -200.0f, MTXMODE_NEW);
         Matrix_Scale(0.098000005f, 0.1f, 0.098000005f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonFireRingDL));
         Matrix_Pop();
 
@@ -2528,8 +2524,7 @@ void func_80904340(BossGanon2* this, PlayState* play) {
                 Matrix_RotateY(M_PI, MTXMODE_APPLY);
             }
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightningDL));
             FrameInterpolation_RecordCloseChild();
         }
@@ -2553,8 +2548,7 @@ void func_8090464C(BossGanon2* this, PlayState* play) {
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_RotateZ(-0.2f, MTXMODE_APPLY);
         Matrix_Scale(0.6f, 0.6f, 1.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonTriforceDL));
         Matrix_Pop();
 
@@ -2562,8 +2556,7 @@ void func_8090464C(BossGanon2* this, PlayState* play) {
     }
 }
 
-s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     s32 pad;
     BossGanon2* this = (BossGanon2*)thisx;
 
@@ -2631,15 +2624,13 @@ void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
     if ((limbIndex == 7) || (limbIndex == 13)) {
         Matrix_Push();
         Matrix_Scale(this->unk_224, this->unk_224, this->unk_224, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, *dList);
         Matrix_Pop();
     } else if ((limbIndex == 33) || (limbIndex == 34)) {
         Matrix_Push();
         Matrix_Scale(this->unk_228, this->unk_228, this->unk_228, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, *dList);
         Matrix_Pop();
     }
@@ -2685,10 +2676,9 @@ void func_80904D88(BossGanon2* this, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(this->unk_30C, this->unk_30C, this->unk_30C, MTXMODE_APPLY);
             Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbModelDL);
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -2706,17 +2696,15 @@ void func_80904FC8(BossGanon2* this, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 0);
         gSPDisplayList(POLY_XLU_DISP++, gGanonLightOrbMaterialDL);
-        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x, sBossGanon2Zelda->actor.world.pos.y + 80.0f, sBossGanon2Zelda->actor.world.pos.z,
-                         MTXMODE_NEW);
+        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x, sBossGanon2Zelda->actor.world.pos.y + 80.0f,
+                         sBossGanon2Zelda->actor.world.pos.z, MTXMODE_NEW);
         Matrix_ReplaceRotation(&play->billboardMtxF);
         Matrix_Scale(this->unk_384, this->unk_384, this->unk_384, MTXMODE_APPLY);
         Matrix_RotateZ(this->unk_388, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
         Matrix_RotateZ(this->unk_388 * -2.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
     }
 
@@ -2753,10 +2741,9 @@ void func_8090523C(BossGanon2* this, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(200.0f * phi_f20, 200.0f * phi_f20, 1.0f, MTXMODE_APPLY);
             Matrix_RotateZ(Rand_ZeroFloat(2.0f * M_PI), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonLightOrbModelDL));
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -2774,8 +2761,7 @@ void BossGanon2_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
     if (limbIndex == 11) {
         OPEN_DISPS(play->state.gfxCtx);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL));
 
         CLOSE_DISPS(play->state.gfxCtx);
@@ -2797,13 +2783,13 @@ void func_80905674(BossGanon2* this, PlayState* play) {
                                     this->unk_19C * -8, 32, 32));
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, (s16)this->unk_37C);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 128);
-        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x + 100.0f, sBossGanon2Zelda->actor.world.pos.y + 35.0f + 7.0f,
+        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x + 100.0f,
+                         sBossGanon2Zelda->actor.world.pos.y + 35.0f + 7.0f,
                          sBossGanon2Zelda->actor.world.pos.z - 100.0f, MTXMODE_NEW);
         Matrix_RotateY(-M_PI / 4.0f, MTXMODE_APPLY);
         Matrix_Scale(0.040000003f, 0.040000003f, this->unk_380, MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanonZeldaMagicDL));
         Matrix_Pop();
 
@@ -2841,9 +2827,9 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) {
             Matrix_Translate(0.0f, -4000.0f, 4000.0f, MTXMODE_APPLY);
             Matrix_RotateX(this->unk_394, MTXMODE_APPLY);
             Matrix_Translate(0.0f, 4000.0f, -4000.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossGanon2_OverrideLimbDraw, BossGanon2_PostLimbDraw, this);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossGanon2_OverrideLimbDraw, BossGanon2_PostLimbDraw,
+                                      this);
             POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP);
             BossGanon2_GenShadowTexture(shadowTexture, this, play);
             BossGanon2_DrawShadowTexture(shadowTexture, this, play);
@@ -2987,8 +2973,7 @@ void func_809060E8(PlayState* play) {
             Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
             Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY);
             Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_OPA_DISP++, 0x08,
                        Gfx_TexScroll(play->state.gfxCtx, 0, 0 - (play->gameplayFrames & 0x7F), 32, 32));
             gSPDisplayList(POLY_OPA_DISP++, gGanonMasterSwordDL);
@@ -3004,10 +2989,9 @@ void func_809060E8(PlayState* play) {
             Matrix_Translate(effect->position.x + temp_f0, 1086.0f, (effect->position.z - 1.0f) + temp_f0, MTXMODE_NEW);
             Matrix_RotateY(angle, MTXMODE_APPLY);
             Matrix_Scale(1.0f, 0.0f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGanonMasterSwordShadowDL);
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -3027,10 +3011,9 @@ void func_809060E8(PlayState* play) {
             Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY);
             Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY);
             Matrix_RotateZ(effect->unk_38.x, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gGanonRubbleDL);
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -3149,8 +3132,7 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, PlaySta
     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
     Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z - 20.0f, MTXMODE_NEW);
     Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGanonShadowMaterialDL);
     gDPLoadTextureBlock(POLY_OPA_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                         G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
index 635a20f686..833353049f 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
@@ -312,4 +312,4 @@ static u8 D_809071EC[] = { 3, 2, 2, 1, 3, 3, 1, 3, 3, 1, 0, 3, 1, 0, 3 };
 #include "overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h"
 
 // padding
-//static u32 D_809071FC[2] = { 0 };
+// static u32 D_809071FC[2] = { 0 };
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
index cf34863c06..8f74d05a85 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -14,7 +14,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 typedef enum {
     /* 0 */ THROW_NORMAL,
@@ -339,8 +341,8 @@ void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) {
 
         Animation_MorphToPlayOnce(&this->skelAnime, &gPhantomGanonRideSpearRaiseAnim, -7.0f);
         horseTemp = (EnfHG*)this->actor.child;
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x,
-                           this->spearTip.y, this->spearTip.z, 50, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x, this->spearTip.y,
+                           this->spearTip.z, 50, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
         this->actor.child = &horseTemp->actor;
     }
 
@@ -399,8 +401,8 @@ void BossGanondrof_Paintings(BossGanondrof* this, PlayState* play) {
         Animation_MorphToPlayOnce(&this->skelAnime, &gPhantomGanonRideSpearRaiseAnim, -2.0f);
         this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED;
         horseTemp = (EnfHG*)this->actor.child;
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x,
-                           this->spearTip.y, this->spearTip.z, 30, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x, this->spearTip.y,
+                           this->spearTip.z, 30, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
         this->actor.child = &horseTemp->actor;
     } else if (horse->bossGndSignal == FHG_LIGHTNING) {
         Animation_MorphToPlayOnce(&this->skelAnime, &gPhantomGanonRideSpearStrikeAnim, -2.0f);
@@ -593,8 +595,8 @@ void BossGanondrof_SetupThrow(BossGanondrof* this, PlayState* play) {
     }
 
     horseTemp = (EnfHG*)this->actor.child;
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x,
-                       this->spearTip.y, this->spearTip.z, lightTime, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x, this->spearTip.y,
+                       this->spearTip.z, lightTime, FHGFIRE_LIGHT_GREEN, 0, FHGFIRE_SPEAR_LIGHT);
     this->actor.child = &horseTemp->actor;
     this->work[GND_THROW_COUNT]++;
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_STICK);
@@ -627,8 +629,8 @@ void BossGanondrof_Throw(BossGanondrof* this, PlayState* play) {
     if (Animation_OnFrame(&this->skelAnime, this->work[GND_THROW_FRAME])) {
         EnfHG* horseTemp = (EnfHG*)this->actor.child;
 
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x,
-                           this->spearTip.y, this->spearTip.z, this->work[GND_ACTION_STATE], 0, 0, FHGFIRE_ENERGY_BALL);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->spearTip.x, this->spearTip.y,
+                           this->spearTip.z, this->work[GND_ACTION_STATE], 0, 0, FHGFIRE_ENERGY_BALL);
         this->actor.child = &horseTemp->actor;
     }
 
@@ -877,8 +879,8 @@ void BossGanondrof_Charge(BossGanondrof* this, PlayState* play) {
     if (!(this->work[GND_VARIANCE_TIMER] & 7)) {
         EnfHG* horse = (EnfHG*)thisx->child;
 
-        Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_FHG_FIRE, this->spearTip.x,
-                           this->spearTip.y, this->spearTip.z, 8, FHGFIRE_LIGHT_BLUE, 0, FHGFIRE_SPEAR_LIGHT);
+        Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_FHG_FIRE, this->spearTip.x, this->spearTip.y,
+                           this->spearTip.z, 8, FHGFIRE_LIGHT_BLUE, 0, FHGFIRE_SPEAR_LIGHT);
         thisx->child = &horse->actor;
     }
 }
@@ -952,7 +954,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                         if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME])) {
                             this->fwork[GND_END_FRAME] = Animation_GetLastFrame(&gPhantomGanonAirDamageAnim);
                             Animation_Change(&this->skelAnime, &gPhantomGanonAirDamageAnim, 0.5f, 0.0f,
-                                                this->fwork[GND_END_FRAME], ANIMMODE_ONCE_INTERP, 0.0f);
+                                             this->fwork[GND_END_FRAME], ANIMMODE_ONCE_INTERP, 0.0f);
                             this->work[GND_ACTION_STATE] = DEATH_LIMP;
                         }
                     }
@@ -992,9 +994,9 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
             if (this->timers[1] == 1) {
                 EnfHG* horseTemp = (EnfHG*)this->actor.child;
 
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                   GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y + 3.0f, GND_BOSSROOM_CENTER_Z, 0x4000,
-                                   0, 0, FHGFIRE_WARP_DEATH);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, GND_BOSSROOM_CENTER_X,
+                                   GND_BOSSROOM_CENTER_Y + 3.0f, GND_BOSSROOM_CENTER_Z, 0x4000, 0, 0,
+                                   FHGFIRE_WARP_DEATH);
                 this->actor.child = &horseTemp->actor;
                 Message_StartTextbox(play, 0x108E, NULL);
             }
@@ -1138,8 +1140,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
                     accelHahen.z = (GND_BOSSROOM_CENTER_Z - pos.z) * 0.001f;
                 }
 
-                EffectSsKFire_Spawn(play, &pos, &vel, &accelKFire, (s16)Rand_ZeroFloat(20.0f) + 15,
-                                    bodyDecayLevel);
+                EffectSsKFire_Spawn(play, &pos, &vel, &accelKFire, (s16)Rand_ZeroFloat(20.0f) + 15, bodyDecayLevel);
                 if ((Rand_ZeroOne() < 0.5f) || (bodyDecayLevel == 3)) {
                     EffectSsHahen_Spawn(play, &pos, &vel, &accelHahen, 0, (s16)Rand_ZeroFloat(4.0f) + 7,
                                         HAHEN_OBJECT_DEFAULT, 10, NULL);
@@ -1342,8 +1343,7 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 BossGanondrof_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                   void* thisx) {
+s32 BossGanondrof_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossGanondrof* this = (BossGanondrof*)thisx;
 
     switch (limbIndex) {
@@ -1487,9 +1487,7 @@ void BossGanondrof_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x08, BossGanondrof_GetNullDList(play->state.gfxCtx));
     }
 
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                              BossGanondrof_OverrideLimbDraw,
-                      BossGanondrof_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossGanondrof_OverrideLimbDraw, BossGanondrof_PostLimbDraw, this);
     osSyncPrintf("DRAW 22\n");
     POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP);
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
index e4ce76cdc8..503e414724 100644
--- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@@ -8,7 +8,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 // IRIS_FOLLOW: gohma looks towards the player (iris rotation)
 // BONUS_IFRAMES: gain invincibility frames when the player does something (throwing things?), or
@@ -342,8 +344,8 @@ void BossGoma_Init(Actor* thisx, PlayState* play) {
     if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
         Actor_Kill(&this->actor);
         if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -640.0f, 0.0f, 0, 0,
-                               0, WARP_DUNGEON_CHILD);
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -640.0f, 0.0f, 0, 0, 0,
+                               WARP_DUNGEON_CHILD);
         }
         if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 141.0f, -640.0f, -84.0f, 0, 0, 0, 0, true);
@@ -368,13 +370,13 @@ void BossGoma_Init(Actor* thisx, PlayState* play) {
 
 void BossGoma_PlayEffectsAndSfx(BossGoma* this, PlayState* play, s16 arg2, s16 amountMinus1) {
     if (arg2 == 0 || arg2 == 1 || arg2 == 3) {
-        Actor_SpawnFloorDustRing(play, &this->actor, &this->rightHandBackLimbWorldPos, 25.0f, amountMinus1, 8.0f,
-                                 500, 10, true);
+        Actor_SpawnFloorDustRing(play, &this->actor, &this->rightHandBackLimbWorldPos, 25.0f, amountMinus1, 8.0f, 500,
+                                 10, true);
     }
 
     if (arg2 == 0 || arg2 == 2 || arg2 == 3) {
-        Actor_SpawnFloorDustRing(play, &this->actor, &this->leftHandBackLimbWorldPos, 25.0f, amountMinus1, 8.0f,
-                                 500, 10, true);
+        Actor_SpawnFloorDustRing(play, &this->actor, &this->leftHandBackLimbWorldPos, 25.0f, amountMinus1, 8.0f, 500,
+                                 10, true);
     }
 
     if (arg2 == 0) {
@@ -688,8 +690,8 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                 fabsf(player->actor.world.pos.z - 350.0f) < 60.0f) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) {
                     BossGoma_SetupEncounterState4(this, play);
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, 164.72f,
-                                       -480.0f, 397.68002f, 0, -0x705C, 0, 0x180);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, 164.72f, -480.0f,
+                                       397.68002f, 0, -0x705C, 0, 0x180);
                 } else {
                     Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
                     this->actionState = 1;
@@ -784,8 +786,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                 this->lookedAtFrames++;
                 Math_ApproachZeroF(&this->actor.speedXZ, 0.5f, 2.0f);
                 Math_ApproachS(&this->actor.world.rot.y,
-                               Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) + 0x8000, 2,
-                               0xBB8);
+                               Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) + 0x8000, 2, 0xBB8);
                 this->eyeLidBottomRotX = this->eyeLidTopRotX = this->eyeIrisRotX = this->eyeIrisRotY = 0;
             } else {
                 this->lookedAtFrames = 0;
@@ -885,8 +886,8 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
             this->subCameraAt.z = this->actor.world.pos.z;
             SkelAnime_Update(&this->skelanime);
             Math_ApproachS(&this->actor.shape.rot.x, 0, 2, 0xBB8);
-            Math_ApproachS(&this->actor.world.rot.y,
-                           Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor), 2, 0x7D0);
+            Math_ApproachS(&this->actor.world.rot.y, Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor),
+                           2, 0x7D0);
 
             if (this->actor.bgCheckFlags & 1) {
                 this->actionState = 130;
@@ -908,8 +909,8 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
             Math_ApproachF(&this->subCameraEye.z, this->actor.world.pos.z + 45.0f + 40.0f, 0.1f,
                            this->subCameraFollowSpeed * 30.0f);
             Math_ApproachS(&this->actor.shape.rot.x, 0, 2, 0xBB8);
-            Math_ApproachS(&this->actor.world.rot.y,
-                           Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor), 2, 0x7D0);
+            Math_ApproachS(&this->actor.world.rot.y, Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor),
+                           2, 0x7D0);
             SkelAnime_Update(&this->skelanime);
             this->subCameraAt.x = this->actor.world.pos.x;
             this->subCameraAt.z = this->actor.world.pos.z;
@@ -926,8 +927,8 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
                 Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_CRY1);
 
                 if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GOHMA_BATTLE)) {
-                    TitleCard_InitBossName(play, &play->actorCtx.titleCtx,
-                                           SEGMENTED_TO_VIRTUAL(gGohmaTitleCardENGTex), 160, 180, 128, 40, true);
+                    TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gGohmaTitleCardENGTex),
+                                           160, 180, 128, 40, true);
                 }
 
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
@@ -1050,8 +1051,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
                 pos.x = Rand_CenteredFloat(20.0f) + this->defeatedLimbPositions[j].x;
                 pos.y = Rand_CenteredFloat(10.0f) + this->defeatedLimbPositions[j].y;
                 pos.z = Rand_CenteredFloat(20.0f) + this->defeatedLimbPositions[j].z;
-                EffectSsHahen_Spawn(play, &pos, &vel2, &accel2, 0, (s16)(Rand_ZeroOne() * 5.0f) + 10, -1, 10,
-                                    NULL);
+                EffectSsHahen_Spawn(play, &pos, &vel2, &accel2, 0, (s16)(Rand_ZeroOne() * 5.0f) + 10, -1, 10, NULL);
             }
         }
     }
@@ -1269,8 +1269,8 @@ void BossGoma_FloorAttackPosture(BossGoma* this, PlayState* play) {
     Math_ApproachZeroF(&this->actor.speedXZ, 0.5f, 2.0f);
 
     if (this->skelanime.curFrame >= (19.0f + 1.0f / 3.0f) && this->skelanime.curFrame <= 30.0f) {
-        Math_ApproachS(&this->actor.world.rot.y, Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor),
-                       3, 0xBB8);
+        Math_ApproachS(&this->actor.world.rot.y, Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor), 3,
+                       0xBB8);
     }
 
     if (Animation_OnFrame(&this->skelanime, Animation_GetLastFrame(&gGohmaPrepareAttackAnim))) {
@@ -1568,9 +1568,11 @@ void BossGoma_CeilingIdle(BossGoma* this, PlayState* play) {
         if (this->childrenGohmaState[0] == 0 && this->childrenGohmaState[1] == 0 && this->childrenGohmaState[2] == 0) {
             // if no child gohma has been spawned
             BossGoma_SetupCeilingPrepareSpawnGohmas(this);
-        } else if ((this->childrenGohmaState[0] < 0 && this->childrenGohmaState[1] < 0 && this->childrenGohmaState[2] < 0) ||
+        } else if ((this->childrenGohmaState[0] < 0 && this->childrenGohmaState[1] < 0 &&
+                    this->childrenGohmaState[2] < 0) ||
                    (nearbyEnTest == NULL && CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0))) {
-            // In authentic gameplay, check if all baby Ghomas are dead. In Enemy Randomizer, check if there's no enemies alive.
+            // In authentic gameplay, check if all baby Ghomas are dead. In Enemy Randomizer, check if there's no
+            // enemies alive.
             BossGoma_SetupFallJump(this);
         } else {
             for (i = 0; i < ARRAY_COUNT(this->childrenGohmaState); i++) {
@@ -1963,8 +1965,7 @@ void BossGoma_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 BossGoma_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                              void* thisx) {
+s32 BossGoma_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossGoma* this = (BossGoma*)thisx;
     s32 doNotDrawLimb = false;
 
@@ -2121,8 +2122,8 @@ void BossGoma_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r
         Matrix_Get(&mtx);
         Matrix_MtxFToYXZRotS(&mtx, &childRot, 0);
         // These are the pieces of Gohma as it falls apart. It appears to use the same actor as the baby gohmas.
-        babyGohma = (EnGoma*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GOMA,
-                                                childPos.x, childPos.y, childPos.z, childRot.x, childRot.y, childRot.z,
+        babyGohma = (EnGoma*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GOMA, childPos.x,
+                                                childPos.y, childPos.z, childRot.x, childRot.y, childRot.z,
                                                 sDeadLimbLifetime[limbIndex] + 100);
         if (babyGohma != NULL) {
             babyGohma->bossLimbDL = *dList;
@@ -2178,9 +2179,7 @@ void BossGoma_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x08, BossGoma_EmptyDlist(play->state.gfxCtx));
     }
 
-    SkelAnime_DrawSkeletonOpa(play, &this->skelanime,
-                                               BossGoma_OverrideLimbDraw,
-                      BossGoma_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelanime, BossGoma_OverrideLimbDraw, BossGoma_PostLimbDraw, this);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index 717922d607..b80c39f3b2 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -17,7 +17,9 @@
 
 #include <string.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 #define MO_WATER_LEVEL(play) play->colCtx.colHeader->waterBoxes[0].ySurface
 
@@ -372,8 +374,8 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
         if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
             Actor_Kill(&this->actor);
             if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -280.0f, 0.0f, 0,
-                                   0, 0, WARP_DUNGEON_ADULT);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, -280.0f, 0.0f, 0, 0, 0,
+                                   WARP_DUNGEON_ADULT);
             }
             if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -200.0f, -280.0f, 0.0f, 0, 0, 0, 0, true);
@@ -392,9 +394,9 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
             this->actor.world.pos.x = 1000.0f;
             this->timers[0] = 60;
         }
-        sMorphaTent1 = (BossMo*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_MO,
-                                                   this->actor.world.pos.x, this->actor.world.pos.y,
-                                                   this->actor.world.pos.z, 0, 0, 0, BOSSMO_TENTACLE);
+        sMorphaTent1 =
+            (BossMo*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_MO, this->actor.world.pos.x,
+                                        this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, BOSSMO_TENTACLE);
         this->actor.draw = BossMo_DrawCore;
         this->actor.update = BossMo_UpdateCore;
         Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_BOSS);
@@ -755,8 +757,9 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
                         player->actor.parent = &this->actor;
                         this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB;
                         Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CATCH);
-                        Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                     } else {
                         this->work[MO_TENT_ACTION_STATE] = MO_TENT_READY;
                         this->tentMaxAngle = .001f;
@@ -967,9 +970,9 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
                 }
             }
             if ((this == sMorphaTent1) && (sMorphaCore->hitCount >= 3) && (sMorphaTent2 == NULL)) {
-                sMorphaTent2 =
-                    (BossMo*)Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_MO, this->actor.world.pos.x,
-                                         this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, BOSSMO_TENTACLE, true);
+                sMorphaTent2 = (BossMo*)Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_MO, this->actor.world.pos.x,
+                                                    this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
+                                                    BOSSMO_TENTACLE, true);
 
                 sMorphaTent2->tentSpawnPos = this->tentSpawnPos;
                 if (sMorphaTent2->tentSpawnPos > 10) {
@@ -1449,8 +1452,8 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
             }
             if (this->timers[2] == 130) {
-                TitleCard_InitBossName(play, &play->actorCtx.titleCtx,
-                                       SEGMENTED_TO_VIRTUAL(gMorphaTitleCardENGTex), 160, 180, 128, 40, true);
+                TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gMorphaTitleCardENGTex),
+                                       160, 180, 128, 40, true);
                 Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
             }
             break;
@@ -1863,7 +1866,7 @@ void BossMo_Core(BossMo* this, PlayState* play) {
         0.1f, 0.15f, 0.2f, 0.3f, 0.4f, 0.43f, 0.4f, 0.3f, 0.2f, 0.15f, 0.1f,
     };
     u8 nearLand;
-    s16 i;                                  // not on stack
+    s16 i;                             // not on stack
     Player* player = GET_PLAYER(play); // not on stack
     f32 spDC;
     f32 spD8;
@@ -2078,8 +2081,8 @@ void BossMo_Core(BossMo* this, PlayState* play) {
                 effectPos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x;
                 effectPos.y = Rand_CenteredFloat(20.0f) + this->actor.world.pos.y;
                 effectPos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z;
-                BossMo_SpawnDroplet(MO_FX_DROPLET, (BossMoEffect*)play->specialEffects, &effectPos,
-                                    &effectVelocity, Rand_ZeroFloat(0.02f) + 0.05f);
+                BossMo_SpawnDroplet(MO_FX_DROPLET, (BossMoEffect*)play->specialEffects, &effectPos, &effectVelocity,
+                                    Rand_ZeroFloat(0.02f) + 0.05f);
             };
 
             if (nearLand) {
@@ -2263,8 +2266,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) {
     BossMo_Core(this, play);
     Collider_UpdateCylinder(&this->actor, &this->coreCollider);
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->coreCollider.base);
-    if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_STUNNED) ||
-        (this->actor.world.pos.y < MO_WATER_LEVEL(play))) {
+    if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_STUNNED) || (this->actor.world.pos.y < MO_WATER_LEVEL(play))) {
         CollisionCheck_SetAT(play, &play->colChkCtx, &this->coreCollider.base);
     } else {
         CollisionCheck_SetOC(play, &play->colChkCtx, &this->coreCollider.base);
@@ -2364,8 +2366,8 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) {
                 pos = this->tentPos[38];
             }
         }
-        BossMo_SpawnRipple(play->specialEffects, &pos, rippleScale, rippleScale * 3.0f, this->baseAlpha * 0.6666f,
-                           300, MO_FX_BIG_RIPPLE);
+        BossMo_SpawnRipple(play->specialEffects, &pos, rippleScale, rippleScale * 3.0f, this->baseAlpha * 0.6666f, 300,
+                           MO_FX_BIG_RIPPLE);
     }
     if (this->baseBubblesTimer != 0) {
         Vec3f sp88;
@@ -2549,8 +2551,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(phi_f22, phi_f22, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL);
 
@@ -2582,7 +2583,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) {
         if ((i < 38) && ((i & 1) == 1)) {
             BossMo_UpdateTentColliders(this, i / 2, &this->tentCollider, &this->tentPos[i]);
         }
-        
+
         FrameInterpolation_RecordCloseChild();
     }
 
@@ -2610,8 +2611,7 @@ void BossMo_DrawWater(BossMo* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 80);
 
     Matrix_Scale(0.5f, 1.0f, 0.5f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL);
 
@@ -2636,13 +2636,12 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) {
                                     sMorphaTent1->work[MO_TENT_VAR_TIMER] * -3,
                                     sMorphaTent1->work[MO_TENT_VAR_TIMER] * -3, 32, 32));
         gSPSegment(POLY_XLU_DISP++, 0x09,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, sMorphaTent1->work[MO_TENT_VAR_TIMER] * 5, 0, 32, 32, 1,
-                                    0, sMorphaTent1->work[MO_TENT_VAR_TIMER] * -10, 32, 32));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, sMorphaTent1->work[MO_TENT_VAR_TIMER] * 5, 0, 32, 32, 1, 0,
+                                    sMorphaTent1->work[MO_TENT_VAR_TIMER] * -10, 32, 32));
 
         Matrix_RotateX(this->work[MO_TENT_MOVE_TIMER] * 0.5f, MTXMODE_APPLY);
         Matrix_RotateZ(this->work[MO_TENT_MOVE_TIMER] * 0.8f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, (s8)this->baseAlpha);
 
@@ -2679,8 +2678,7 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) {
 
             Matrix_Translate(this->actor.world.pos.x, groundLevel, this->actor.world.pos.z, MTXMODE_NEW);
             Matrix_Scale(0.23f, 1.0f, 0.23f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL));
         }
@@ -2706,9 +2704,8 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, (s8)this->fwork[MO_CORE_INTRO_WATER_ALPHA]);
 
         gSPSegment(POLY_XLU_DISP++, 0x0D,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, (s16)sMorphaTent1->waterTex1x,
-                                    (s16)sMorphaTent1->waterTex1y, 32, 32, 1, (s16)sMorphaTent1->waterTex2x,
-                                    (s16)sMorphaTent1->waterTex2y, 32, 32));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, (s16)sMorphaTent1->waterTex1x, (s16)sMorphaTent1->waterTex1y,
+                                    32, 32, 1, (s16)sMorphaTent1->waterTex2x, (s16)sMorphaTent1->waterTex2y, 32, 32));
 
         sp8C = this->cameraAt.x - this->cameraEye.x;
         sp88 = this->cameraAt.y - this->cameraEye.y;
@@ -2737,8 +2734,7 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) {
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
         Matrix_Scale(0.05f, 1.0f, 0.05f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL);
     }
@@ -2759,9 +2755,8 @@ void BossMo_DrawTent(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->work[MO_TENT_BASE_TEX1_X],
-                                this->work[MO_TENT_BASE_TEX1_Y], 32, 32, 1, this->work[MO_TENT_BASE_TEX2_X],
-                                this->work[MO_TENT_BASE_TEX2_Y], 32, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->work[MO_TENT_BASE_TEX1_X], this->work[MO_TENT_BASE_TEX1_Y],
+                                32, 32, 1, this->work[MO_TENT_BASE_TEX2_X], this->work[MO_TENT_BASE_TEX2_Y], 32, 32));
     gDPSetPrimColor(POLY_XLU_DISP++, 0xFF, 0xFF, 200, 255, 255, (s8)((this->baseAlpha * 12.0f) / 10.0f));
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, (s8)this->baseAlpha);
     scroll = (s16)(Math_SinS(this->work[MO_TENT_VAR_TIMER] * 0xB00) * 30.0f) + 350;
@@ -2876,8 +2871,8 @@ void BossMo_UpdateEffects(BossMo* this, PlayState* play) {
                         if (effect->type == MO_FX_SPLASH) {
                             Vec3f velocity = { 0.0f, 0.0f, 0.0f };
 
-                            BossMo_SpawnDroplet(MO_FX_SPLASH_TRAIL, (BossMoEffect*)play->specialEffects,
-                                                &effect->pos, &velocity, effect->scale);
+                            BossMo_SpawnDroplet(MO_FX_SPLASH_TRAIL, (BossMoEffect*)play->specialEffects, &effect->pos,
+                                                &velocity, effect->scale);
                         }
                         if (effect->vel.y < -20.0f) {
                             effect->vel.y = -20.0f;
@@ -2951,8 +2946,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL);
             FrameInterpolation_RecordCloseChild();
@@ -2976,8 +2970,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
             FrameInterpolation_RecordCloseChild();
@@ -3007,8 +3000,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale / effect->fwork[MO_FX_STRETCH], effect->fwork[MO_FX_STRETCH] * effect->scale,
                          1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -3035,8 +3027,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -3061,8 +3052,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) {
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL);
             FrameInterpolation_RecordCloseChild();
diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index 3e3aadfcf1..6e1db9049a 100644
--- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -15,7 +15,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
 #define vParity actionVar
 #define vVanish actionVar
@@ -61,7 +63,6 @@ void BossSst_UpdateEffect(Actor* thisx, PlayState* play);
 void BossSst_DrawEffect(Actor* thisx, PlayState* play);
 void BossSst_Reset(void);
 
-
 void BossSst_HeadSfx(BossSst* this, u16 sfxId);
 
 void BossSst_HeadSetupLurk(BossSst* this);
@@ -281,8 +282,8 @@ void BossSst_Init(Actor* thisx, PlayState* play2) {
     CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
     Flags_SetSwitch(play, 0x14);
     if (this->actor.params == BONGO_HEAD) {
-        sFloor = (BgSstFloor*)Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SST_FLOOR, sRoomCenter.x,
-                                          sRoomCenter.y, sRoomCenter.z, 0, 0, 0, BONGOFLOOR_REST, true);
+        sFloor = (BgSstFloor*)Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SST_FLOOR, sRoomCenter.x, sRoomCenter.y,
+                                          sRoomCenter.z, 0, 0, 0, BONGOFLOOR_REST, true);
         SkelAnime_InitFlex(play, &this->skelAnime, &gBongoHeadSkel, &gBongoHeadEyeOpenIdleAnim, this->jointTable,
                            this->morphTable, 45);
         ActorShape_Init(&this->actor.shape, 70000.0f, ActorShadow_DrawCircle, 95.0f);
@@ -305,14 +306,12 @@ void BossSst_Init(Actor* thisx, PlayState* play2) {
             }
             Actor_Kill(&this->actor);
         } else {
-            sHands[LEFT] =
-                (BossSst*)Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_SST, this->actor.world.pos.x + 200.0f,
-                                      this->actor.world.pos.y, this->actor.world.pos.z + 400.0f, 0,
-                                      this->actor.shape.rot.y, 0, BONGO_LEFT_HAND, true);
-            sHands[RIGHT] = (BossSst*)Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_SST,
-                                                  this->actor.world.pos.x + (-200.0f), this->actor.world.pos.y,
-                                                  this->actor.world.pos.z + 400.0f, 0, this->actor.shape.rot.y, 0,
-                                                  BONGO_RIGHT_HAND, true);
+            sHands[LEFT] = (BossSst*)Actor_Spawn(
+                &play->actorCtx, play, ACTOR_BOSS_SST, this->actor.world.pos.x + 200.0f, this->actor.world.pos.y,
+                this->actor.world.pos.z + 400.0f, 0, this->actor.shape.rot.y, 0, BONGO_LEFT_HAND, true);
+            sHands[RIGHT] = (BossSst*)Actor_Spawn(
+                &play->actorCtx, play, ACTOR_BOSS_SST, this->actor.world.pos.x + (-200.0f), this->actor.world.pos.y,
+                this->actor.world.pos.z + 400.0f, 0, this->actor.shape.rot.y, 0, BONGO_RIGHT_HAND, true);
             sHands[LEFT]->actor.child = &sHands[RIGHT]->actor;
             sHands[RIGHT]->actor.child = &sHands[LEFT]->actor;
 
@@ -328,13 +327,13 @@ void BossSst_Init(Actor* thisx, PlayState* play2) {
         Collider_SetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInitHand, this->colliderItems);
         Collider_SetCylinder(play, &this->colliderCyl, &this->actor, &sCylinderInitHand);
         if (this->actor.params == BONGO_LEFT_HAND) {
-            SkelAnime_InitFlex(play, &this->skelAnime, &gBongoLeftHandSkel, &gBongoLeftHandIdleAnim,
-                               this->jointTable, this->morphTable, 27);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gBongoLeftHandSkel, &gBongoLeftHandIdleAnim, this->jointTable,
+                               this->morphTable, 27);
             this->vParity = -1;
             this->colliderJntSph.elements[0].dim.modelSphere.center.z *= -1;
         } else {
-            SkelAnime_InitFlex(play, &this->skelAnime, &gBongoRightHandSkel, &gBongoRightHandIdleAnim,
-                               this->jointTable, this->morphTable, 27);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gBongoRightHandSkel, &gBongoRightHandIdleAnim, this->jointTable,
+                               this->morphTable, 27);
             this->vParity = 1;
         }
 
@@ -376,7 +375,7 @@ void BossSst_HeadLurk(BossSst* this, PlayState* play) {
 }
 
 void BossSst_HeadSetupIntro(BossSst* this, PlayState* play) {
-    //Make sure to restore original behavior if the quick kill didn't happen
+    // Make sure to restore original behavior if the quick kill didn't happen
     if (CVarGetInteger(CVAR_ENHANCEMENT("QuickBongoKill"), 0)) {
         this->colliderCyl.base.acFlags &= ~AC_ON;
     }
@@ -673,7 +672,9 @@ void BossSst_HeadNeutral(BossSst* this, PlayState* play) {
     }
 
     if (this->timer == 0) {
-        if ((GET_PLAYER(play)->actor.world.pos.y > -50.0f) && !(GET_PLAYER(play)->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
+        if ((GET_PLAYER(play)->actor.world.pos.y > -50.0f) &&
+            !(GET_PLAYER(play)->stateFlags1 &
+              (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
             sHands[Rand_ZeroOne() <= 0.5f]->ready = true;
             BossSst_HeadSetupWait(this);
         } else {
@@ -1260,7 +1261,9 @@ void BossSst_HandWait(BossSst* this, PlayState* play) {
             this->timer--;
         }
 
-        if ((this->timer == 0) && (player->actor.world.pos.y > -50.0f) && !(player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
+        if ((this->timer == 0) && (player->actor.world.pos.y > -50.0f) &&
+            !(player->stateFlags1 &
+              (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
             BossSst_HandSelectAttack(this);
         }
     } else if (sHead->actionFunc == BossSst_HeadNeutral) {
@@ -2672,7 +2675,8 @@ void BossSst_UpdateHead(Actor* thisx, PlayState* play) {
         CollisionCheck_SetAT(play, &play->colChkCtx, &this->colliderJntSph.base);
     }
 
-    if ((this->actionFunc != BossSst_HeadLurk || CVarGetInteger(CVAR_ENHANCEMENT("QuickBongoKill"), 0)) && (this->actionFunc != BossSst_HeadIntro)) {
+    if ((this->actionFunc != BossSst_HeadLurk || CVarGetInteger(CVAR_ENHANCEMENT("QuickBongoKill"), 0)) &&
+        (this->actionFunc != BossSst_HeadIntro)) {
         if (this->colliderCyl.base.acFlags & AC_ON) {
             CollisionCheck_SetAC(play, &play->colChkCtx, &this->colliderCyl.base);
         }
@@ -2700,8 +2704,7 @@ void BossSst_UpdateHead(Actor* thisx, PlayState* play) {
     BossSst_UpdateEffect(&this->actor, play);
 }
 
-s32 BossSst_OverrideHandDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 BossSst_OverrideHandDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossSst* this = (BossSst*)thisx;
 
     if (limbIndex == 1) {
@@ -2717,8 +2720,8 @@ void BossSst_PostHandDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro
     Collider_UpdateSpheres(limbIndex, &this->colliderJntSph);
 }
 
-s32 BossSst_OverrideHandTrailDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* data, Gfx** gfx) {
+s32 BossSst_OverrideHandTrailDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data,
+                                  Gfx** gfx) {
     BossSstHandTrail* trail = (BossSstHandTrail*)data;
 
     if (limbIndex == 1) {
@@ -2775,7 +2778,7 @@ void BossSst_DrawHand(Actor* thisx, PlayState* play) {
                 POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
                                                    this->skelAnime.dListCount, BossSst_OverrideHandTrailDraw, NULL,
                                                    trail, POLY_XLU_DISP);
-                
+
                 FrameInterpolation_RecordCloseChild();
             }
             idx = (idx + 5) % 7;
@@ -2916,13 +2919,13 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) {
     }
 
     if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) {
-        POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, BossSst_OverrideHeadDraw, BossSst_PostHeadDraw,
-                                           this, POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               BossSst_OverrideHeadDraw, BossSst_PostHeadDraw, this, POLY_OPA_DISP);
     } else {
-        POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, BossSst_OverrideHeadDraw, BossSst_PostHeadDraw,
-                                           this, POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               BossSst_OverrideHeadDraw, BossSst_PostHeadDraw, this, POLY_XLU_DISP);
     }
 
     if ((this->actionFunc == BossSst_HeadIntro) && (113 >= this->timer) && (this->timer > 20)) {
@@ -2946,8 +2949,7 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) {
                          this->actor.world.pos.z + vanishMaskOffset.z, MTXMODE_NEW);
         Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList);
     }
 
@@ -3193,8 +3195,8 @@ void BossSst_DrawEffect(Actor* thisx, PlayState* play) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         if (this->effectMode == BONGO_ICE) {
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->gameplayFrames % 256, 0x20, 0x10, 1,
-                                        0, (play->gameplayFrames * 2) % 256, 0x40, 0x20));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->gameplayFrames % 256, 0x20, 0x10, 1, 0,
+                                        (play->gameplayFrames * 2) % 256, 0x40, 0x20));
             gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, this->effects[0].alpha);
             gSPDisplayList(POLY_XLU_DISP++, gBongoIceCrystalDL);
 
@@ -3227,8 +3229,8 @@ void BossSst_DrawEffect(Actor* thisx, PlayState* play) {
 
             gDPPipeSync(POLY_XLU_DISP++);
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 0, 0x20, 0x40, 1,
-                                        0, (play->gameplayFrames * -15) % 256, 0x20, 0x40));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 0, 0x20, 0x40, 1, 0,
+                                        (play->gameplayFrames * -15) % 256, 0x20, 0x40));
 
             for (i = 0; i < 3; i++, scaleY -= 0.001f) {
                 effect = &this->effects[i];
@@ -3262,7 +3264,7 @@ void BossSst_DrawEffect(Actor* thisx, PlayState* play) {
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, sShadowDList);
-                
+
                 FrameInterpolation_RecordCloseChild();
                 effect++;
             }
@@ -3280,7 +3282,7 @@ void BossSst_Reset(void) {
     sHandOffsets[0].x = 0.0f;
     sHandOffsets[0].y = 0.0f;
     sHandOffsets[0].z = 0.0f;
-    
+
     sHandOffsets[1].x = 0.0f;
     sHandOffsets[1].y = 0.0f;
     sHandOffsets[1].z = 0.0f;
@@ -3288,7 +3290,7 @@ void BossSst_Reset(void) {
     sHandYawOffsets[0] = 0;
     sHandYawOffsets[1] = 0;
 
-    sCutsceneCamera= 0;
+    sCutsceneCamera = 0;
     sBodyStatic = false;
     // Reset death colors
     sBodyColor.a = 255;
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index a70d972aed..1fee8de966 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -9,7 +9,9 @@
 
 #include <string.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 typedef enum {
     /* 0x00 */ TW_KOTAKE,
@@ -198,8 +200,8 @@ static s16 D_8094C87C;
 static u8 D_8094C87E;
 BossTwEffect sTwEffects[150];
 
-void BossTw_AddDotEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale,
-                         s16 args, s16 countLimit) {
+void BossTw_AddDotEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale, s16 args,
+                         s16 countLimit) {
     s16 i;
     BossTwEffect* eff;
 
@@ -218,8 +220,8 @@ void BossTw_AddDotEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed,
     }
 }
 
-void BossTw_AddDmgCloud(PlayState* play, s16 type, Vec3f* initialPos, Vec3f* initalSpeed, Vec3f* accel,
-                        f32 scale, s16 alpha, s16 args, s16 countLimit) {
+void BossTw_AddDmgCloud(PlayState* play, s16 type, Vec3f* initialPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale,
+                        s16 alpha, s16 args, s16 countLimit) {
     s16 i;
     BossTwEffect* eff;
 
@@ -238,8 +240,8 @@ void BossTw_AddDmgCloud(PlayState* play, s16 type, Vec3f* initialPos, Vec3f* ini
     }
 }
 
-void BossTw_AddRingEffect(PlayState* play, Vec3f* initalPos, f32 scale, f32 arg3, s16 alpha, s16 args,
-                          s16 arg6, s16 arg7) {
+void BossTw_AddRingEffect(PlayState* play, Vec3f* initalPos, f32 scale, f32 arg3, s16 alpha, s16 args, s16 arg6,
+                          s16 arg7) {
     s16 i;
     BossTwEffect* eff;
 
@@ -285,8 +287,7 @@ void BossTw_AddPlayerFreezeEffect(PlayState* play, Actor* target) {
     }
 }
 
-void BossTw_AddFlameEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale,
-                           s16 args) {
+void BossTw_AddFlameEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale, s16 args) {
     s16 i;
     BossTwEffect* eff;
 
@@ -328,8 +329,8 @@ void BossTw_AddMergeFlameEffect(PlayState* play, Vec3f* initialPos, f32 scale, f
     }
 }
 
-void BossTw_AddShieldBlastEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel,
-                                 f32 scale, f32 arg5, s16 alpha, s16 args) {
+void BossTw_AddShieldBlastEffect(PlayState* play, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale,
+                                 f32 arg5, s16 alpha, s16 args) {
     s16 i;
     BossTwEffect* eff;
 
@@ -537,20 +538,20 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
             // twinrova has been defeated.
             Actor_Kill(&this->actor);
             if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,
-                                   0, 0, WARP_DUNGEON_ADULT);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0, 0, 0,
+                                   WARP_DUNGEON_ADULT);
             }
 
             if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -600.0f, 230.0f, 0.0f, 0, 0, 0, 0, true);
             }
         } else {
-            sKotakePtr = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                                     this->actor.world.pos.x, this->actor.world.pos.y,
-                                                     this->actor.world.pos.z, 0, 0, 0, TW_KOTAKE);
-            sKoumePtr = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                                    this->actor.world.pos.x, this->actor.world.pos.y,
-                                                    this->actor.world.pos.z, 0, 0, 0, TW_KOUME);
+            sKotakePtr =
+                (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->actor.world.pos.x,
+                                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, TW_KOTAKE);
+            sKoumePtr =
+                (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->actor.world.pos.x,
+                                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, TW_KOUME);
             sKotakePtr->actor.parent = &sKoumePtr->actor;
             sKoumePtr->actor.parent = &sKotakePtr->actor;
         }
@@ -720,9 +721,9 @@ void BossTw_SpawnGroundBlast(BossTw* this, PlayState* play, s16 blastType) {
 
     if (blastType == 1) {
         sGroundBlastType = 1;
-        groundBlast = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                                  this->groundBlastPos.x, this->groundBlastPos.y,
-                                                  this->groundBlastPos.z, 0, 0, 0, TW_FIRE_BLAST_GROUND);
+        groundBlast =
+            (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->groundBlastPos.x,
+                                        this->groundBlastPos.y, this->groundBlastPos.z, 0, 0, 0, TW_FIRE_BLAST_GROUND);
         if (groundBlast != NULL) {
             if (sTwinrovaPtr->actionFunc == BossTw_Wait) {
                 groundBlast->timers[0] = 100;
@@ -737,9 +738,9 @@ void BossTw_SpawnGroundBlast(BossTw* this, PlayState* play, s16 blastType) {
         }
     } else {
         sGroundBlastType = 2;
-        groundBlast = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                                  this->groundBlastPos.x, this->groundBlastPos.y,
-                                                  this->groundBlastPos.z, 0, 0, 0, TW_ICE_BLAST_GROUND);
+        groundBlast =
+            (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->groundBlastPos.x,
+                                        this->groundBlastPos.y, this->groundBlastPos.z, 0, 0, 0, TW_ICE_BLAST_GROUND);
         if (groundBlast != NULL) {
             if (sTwinrovaPtr->actionFunc == BossTw_Wait) {
                 groundBlast->timers[0] = 100;
@@ -1101,15 +1102,17 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
                     }
                 }
 
-                SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->beamReflectionOrigin,
-                                             &this->unk_54C, &this->actor.projectedW);
+                SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->beamReflectionOrigin, &this->unk_54C,
+                                             &this->actor.projectedW);
 
                 if (this->actor.params == 1) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &this->unk_54C, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &this->unk_54C, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &this->unk_54C, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &this->unk_54C, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 }
                 break;
 
@@ -1123,8 +1126,8 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
                     Math_ApproachF(&this->targetPos.y, player->bodyPartsPos[15].y, 1.0f, 400.0f);
                     Math_ApproachF(&this->targetPos.z, player->bodyPartsPos[15].z, 1.0f, 400.0f);
                     if ((this->work[CS_TIMER_1] % 4) == 0) {
-                        BossTw_AddRingEffect(play, &player->bodyPartsPos[15], 0.5f, 3.0f, 0xFF, this->actor.params,
-                                             1, 150);
+                        BossTw_AddRingEffect(play, &player->bodyPartsPos[15], 0.5f, 3.0f, 0xFF, this->actor.params, 1,
+                                             150);
                     }
                 } else {
                     this->beamShootState = 0;
@@ -1135,15 +1138,19 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
                                              &this->actor.projectedW);
 
                 if (this->actor.params == 1) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &this->unk_558, 4U, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FIRE - SFX_FLAG, &this->unk_558, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &this->unk_558, 4U,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FIRE - SFX_FLAG, &this->unk_558, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &this->unk_558, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FREEZE - SFX_FLAG, &this->unk_558, 4, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &this->unk_558, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FREEZE - SFX_FLAG, &this->unk_558, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultReverb);
                 }
                 break;
         }
@@ -1278,8 +1285,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
                 accel.y = 0.0f;
                 accel.z = 0.0f;
 
-                BossTw_AddFlameEffect(play, &pos, &velocity, &accel, Rand_ZeroFloat(10.0f) + 25.0f,
-                                      this->actor.params);
+                BossTw_AddFlameEffect(play, &pos, &velocity, &accel, Rand_ZeroFloat(10.0f) + 25.0f, this->actor.params);
             }
 
             BossTw_SetupHitByBeam(otherTw, play);
@@ -1342,8 +1348,8 @@ void BossTw_HitByBeam(BossTw* this, PlayState* play) {
         accel.y = 0.1f;
         accel.z = 0.0f;
 
-        BossTw_AddDmgCloud(play, this->actor.params + 2, &pos, &velocity, &accel, Rand_ZeroFloat(10.0f) + 15.0f, 0,
-                           0, 150);
+        BossTw_AddDmgCloud(play, this->actor.params + 2, &pos, &velocity, &accel, Rand_ZeroFloat(10.0f) + 15.0f, 0, 0,
+                           150);
     }
 
     if (this->actor.params == 1) {
@@ -1939,8 +1945,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                         velocity.x = Rand_CenteredFloat(20.0f);
                         velocity.y = Rand_CenteredFloat(20.0f);
                         velocity.z = Rand_CenteredFloat(20.0f);
-                        BossTw_AddFlameEffect(play, &pos, &velocity, &sZeroVector, Rand_ZeroFloat(10.0f) + 25.0f,
-                                              1);
+                        BossTw_AddFlameEffect(play, &pos, &velocity, &sZeroVector, Rand_ZeroFloat(10.0f) + 25.0f, 1);
                     }
 
                     Audio_PlayActorSound2(&sKoumePtr->actor, NA_SE_EN_TWINROBA_TRANSFORM);
@@ -2101,8 +2106,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                         velocity.x = Rand_CenteredFloat(20.0f);
                         velocity.y = Rand_CenteredFloat(20.0f);
                         velocity.z = Rand_CenteredFloat(20.0f);
-                        BossTw_AddFlameEffect(play, &pos, &velocity, &sZeroVector, Rand_ZeroFloat(10.f) + 25.0f,
-                                              0);
+                        BossTw_AddFlameEffect(play, &pos, &velocity, &sZeroVector, Rand_ZeroFloat(10.f) + 25.0f, 0);
                     }
 
                     Audio_PlayActorSound2(&sKotakePtr->actor, NA_SE_EN_TWINROBA_TRANSFORM);
@@ -2189,7 +2193,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
                 play->envCtx.unk_BE = 1;
                 play->envCtx.unk_BD = 1;
                 play->envCtx.unk_D8 = 0.0f;
-                TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gTwinrovaTitleCardENGTex), 160, 180, 128, 40, true);
+                TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gTwinrovaTitleCardENGTex),
+                                       160, 180, 128, 40, true);
                 Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
             }
@@ -2378,7 +2383,7 @@ void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) {
     if (this->work[CS_TIMER_2] == 80) {
         koumeAnim = 1;
     }
-    
+
     if (this->work[CS_TIMER_2] == 80) {
         msgId2 = 0x604B;
         sp35 = 50;
@@ -2653,12 +2658,10 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
                     this->csState1 = 1;
                     this->visible = false;
                     this->actor.scale.x = 0.0f;
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                       this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0,
-                                       0, TW_DEATHBALL_KOUME);
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW,
-                                       this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0,
-                                       0, TW_DEATHBALL_KOTAKE);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->actor.world.pos.x,
+                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, TW_DEATHBALL_KOUME);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, this->actor.world.pos.x,
+                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, TW_DEATHBALL_KOTAKE);
                     this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
                 }
             }
@@ -2767,8 +2770,8 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
             } else {
                 play->envCtx.unk_BE = 1;
                 play->envCtx.unk_BD = 6;
-                Math_ApproachF(&play->envCtx.unk_D8, (Math_SinS(this->work[CS_TIMER_2] * 4096) / 4.0f) + 0.75f,
-                               1.0f, 0.1f);
+                Math_ApproachF(&play->envCtx.unk_D8, (Math_SinS(this->work[CS_TIMER_2] * 4096) / 4.0f) + 0.75f, 1.0f,
+                               0.1f);
             }
 
             Math_ApproachF(&this->subCamAt.y, sKoumePtr->actor.world.pos.y + 17.0f, 0.05f, 10.0f);
@@ -2949,8 +2952,8 @@ void BossTw_Update(Actor* thisx, PlayState* play) {
                 accel.y = 0.4f;
                 accel.x = Rand_CenteredFloat(0.5f);
                 accel.z = Rand_CenteredFloat(0.5f);
-                BossTw_AddDotEffect(play, &pos, &velocity, &accel, (s16)Rand_ZeroFloat(2.0f) + 8,
-                                    this->actor.params, 37);
+                BossTw_AddDotEffect(play, &pos, &velocity, &accel, (s16)Rand_ZeroFloat(2.0f) + 8, this->actor.params,
+                                    37);
             }
         }
     }
@@ -3137,8 +3140,8 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) {
             break;
         case 4:
             play->envCtx.unk_BD = 2;
-            Math_ApproachF(&play->envCtx.unk_D8, (Math_SinS(this->work[CS_TIMER_1] * 0x3E00) * 0.05f) + 0.95f,
-                           1.0f, 0.1f);
+            Math_ApproachF(&play->envCtx.unk_D8, (Math_SinS(this->work[CS_TIMER_1] * 0x3E00) * 0.05f) + 0.95f, 1.0f,
+                           0.1f);
             break;
         case 5:
             play->envCtx.unk_BD = 0;
@@ -3257,8 +3260,7 @@ void func_80941BC0(BossTw* this, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     Matrix_Translate(this->groundBlastPos2.x, this->groundBlastPos2.y, this->groundBlastPos2.z, MTXMODE_NEW);
     Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIcePoolDL));
@@ -3269,12 +3271,10 @@ void func_80941BC0(BossTw* this, PlayState* play) {
                                 (this->work[CS_TIMER_2] * 4) & 0x3F, 0x10, 0x10));
     Matrix_Push();
     Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIcePoolShineDL));
     Matrix_Pop();
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPSegment(POLY_XLU_DISP++, 0xD,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->work[CS_TIMER_2] & 0x7F,
                                 (this->work[CS_TIMER_2] * 8) & 0xFF, 0x20, 0x40, 1,
@@ -3305,16 +3305,14 @@ void func_80942180(BossTw* this, PlayState* play) {
     gSPSegment(POLY_XLU_DISP++, 8,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, (-this->work[CS_TIMER_1]) & 0x7F, 0, 0x20, 0x20, 1,
                                 (this->work[CS_TIMER_1] * 2) & 0x7F, 0, 0x20, 0x20));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]);
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, 128);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFirePoolDL));
 
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPSegment(POLY_XLU_DISP++, 8,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->work[CS_TIMER_1] & 0x7F,
                                 (-this->work[CS_TIMER_1] * 6) & 0xFF, 0x20, 0x40, 1,
@@ -3331,8 +3329,7 @@ void func_80942180(BossTw* this, PlayState* play) {
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 200, 235, 240, 128);
     Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBigFlameDL));
 
     Matrix_Pop();
@@ -3347,15 +3344,14 @@ void func_809426F0(BossTw* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 8,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0,
-                                0x40, 0x40));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0, 0x40,
+                                0x40));
     Matrix_Push();
     Matrix_Translate(0.0f, 0.0f, 5000.0f, MTXMODE_APPLY);
     Matrix_Scale(this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f,
                  MTXMODE_APPLY);
     Matrix_RotateZ(this->portalRotation, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
 
     if (this->actor.params == 0) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha);
@@ -3387,8 +3383,7 @@ void func_809426F0(BossTw* this, PlayState* play) {
                                     (u8)((-this->work[CS_TIMER_2] * 15) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
         Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY);
         Matrix_ReplaceRotation(&play->billboardMtxF);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
         Matrix_Pop();
 
@@ -3423,8 +3418,7 @@ void func_80942C70(Actor* thisx, PlayState* play) {
         Matrix_RotateX(this->beamPitch, MTXMODE_APPLY);
         Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY);
         Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBeamDL));
 
         if (this->beamReflectionDist > 10.0f) {
@@ -3435,8 +3429,7 @@ void func_80942C70(Actor* thisx, PlayState* play) {
             Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY);
             Matrix_Scale(this->beamScale, this->beamScale, (this->beamReflectionDist * 0.01f * 100.0f) / 20000.0f,
                          MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaBeamDL));
         }
 
@@ -3455,16 +3448,14 @@ void func_80943028(Actor* thisx, PlayState* play) {
     Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 57.0f, this->actor.world.pos.z, MTXMODE_NEW);
     Matrix_Scale(this->workf[UNK_F17], this->workf[UNK_F17], this->workf[UNK_F17], MTXMODE_APPLY);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaHaloDL));
     Gfx_SetupDL_44Xlu(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 200);
     Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW);
     Matrix_Scale((this->actor.scale.x * 4000.0f) / 100.0f, 1.0f, (this->actor.scale.x * 4000.0f) / 100.0f,
                  MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL));
     Matrix_Pop();
 
@@ -3563,8 +3554,7 @@ void* D_8094A9B0[] = {
     gTwinrovaEyeClosedTex,
 };
 
-s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                    void* thisx) {
+s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossTw* this = (BossTw*)thisx;
 
     OPEN_DISPS(play->state.gfxCtx);
@@ -3581,15 +3571,15 @@ s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList,
         case 41:
             *dList = NULL;
             gSPSegment(POLY_XLU_DISP++, 0xA,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0,
-                                        -this->work[CS_TIMER_1] * 0xF, 0x20, 0x40));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0, -this->work[CS_TIMER_1] * 0xF,
+                                        0x20, 0x40));
             break;
         case 18:
         case 42:
             *dList = NULL;
             gSPSegment(POLY_XLU_DISP++, 0xB,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0,
-                                        -this->work[CS_TIMER_1] * 0xA, 0x20, 0x40));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0, -this->work[CS_TIMER_1] * 0xA,
+                                        0x20, 0x40));
             break;
         case 16:
         case 32:
@@ -3601,8 +3591,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList,
         case 15:
         case 31:
             *dList = NULL;
-            gSPSegment(POLY_XLU_DISP++, 9,
-                       Gfx_TexScroll(play->state.gfxCtx, 0, this->work[CS_TIMER_1], 0x20, 0x40));
+            gSPSegment(POLY_XLU_DISP++, 9, Gfx_TexScroll(play->state.gfxCtx, 0, this->work[CS_TIMER_1], 0x20, 0x40));
             break;
         case 19:
             if (this->unk_5F8 != 0) {
@@ -3657,8 +3646,7 @@ void BossTw_TwinrovaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve
         case 42:
             Matrix_Push();
             Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
             Matrix_Pop();
             gSPDisplayList(POLY_XLU_DISP++, *dList);
             break;
@@ -3708,8 +3696,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
         if (temp_t0 != 0) {
             Matrix_Mult(&player->shieldMf, MTXMODE_NEW);
             Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
             temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f);
             if (sShieldFireCharge != 0) {
                 gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, temp_a0);
@@ -3723,8 +3710,8 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
                 gDPSetEnvColor(POLY_XLU_DISP++, 225, 255, 255, temp_a0);
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldIceChargeSidesDL));
                 gSPSegment(POLY_XLU_DISP++, 8,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (-this->work[CS_TIMER_1] * 5) * temp_t0,
-                                            0x20, 0x40, 1, (this->work[CS_TIMER_1] * 4) * temp_t0, 0, 0x20, 0x20));
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (-this->work[CS_TIMER_1] * 5) * temp_t0, 0x20,
+                                            0x40, 1, (this->work[CS_TIMER_1] * 4) * temp_t0, 0, 0x20, 0x20));
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 175, 205, 195, (s16)D_8094C854);
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaMirrorShieldIceChargeCenterDL));
             }
@@ -3748,8 +3735,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
         Matrix_Mult(&player->shieldMf, MTXMODE_NEW);
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
         if (sShieldFireCharge != 0) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 220, 20, (s16)D_8094C858);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 20, 110);
@@ -3759,8 +3745,8 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
         }
 
         gSPSegment(POLY_XLU_DISP++, 8,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x40, 1,
-                                    0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x20));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x40, 1, 0,
+                                    this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x20));
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaShieldAbsorbAndReflectEffectDL));
     }
 
@@ -3784,29 +3770,25 @@ void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) {
     Matrix_Translate(0.0f, 232.0f, -600.0f, MTXMODE_NEW);
     Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaSpawnPortalShadowDL));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha);
     Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
     Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKotakeMagicSigilDL));
 
     Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW);
     Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaSpawnPortalShadowDL));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha);
     Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
     Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaKoumeMagicSigilDL));
 
     Matrix_Pop();
@@ -3825,8 +3807,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
     Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY);
     Matrix_Push();
     Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightCircleDL));
 
     Matrix_Pop();
@@ -3834,8 +3815,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x20, 1,
                                 -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x40));
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightRaysDL));
 
     gSPSegment(POLY_XLU_DISP++, 8,
@@ -3848,8 +3828,7 @@ void func_80944C50(BossTw* this, PlayState* play) {
     scale = CLAMP_MAX(scale, 1.0f);
 
     Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaLightPillarDL));
     Matrix_Pop();
 
@@ -3872,7 +3851,8 @@ void BossTw_TwinrovaDraw(Actor* thisx, PlayState* play2) {
                                                                   (u32)this->fogB, 0, this->fogNear, this->fogFar);
 
         Matrix_Push();
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossTw_TwinrovaOverrideLimbDraw, BossTw_TwinrovaPostLimbDraw, thisx);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossTw_TwinrovaOverrideLimbDraw, BossTw_TwinrovaPostLimbDraw,
+                                  thisx);
         Matrix_Pop();
 
         Matrix_MultVec3f(&D_8094A9EC, &this->beamOrigin);
@@ -4016,8 +3996,7 @@ void BossTw_BlastFire(BossTw* this, PlayState* play) {
                             accel.y = 0.4f;
                             accel.x = Rand_CenteredFloat(0.5f);
                             accel.z = Rand_CenteredFloat(0.5f);
-                            BossTw_AddDotEffect(play, &pos, &velocity, &accel, (s16)Rand_ZeroFloat(2.0f) + 8, 1,
-                                                75);
+                            BossTw_AddDotEffect(play, &pos, &velocity, &accel, (s16)Rand_ZeroFloat(2.0f) + 8, 1, 75);
                         }
                     }
                     break;
@@ -4206,8 +4185,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) {
                             accel.y = 0.4f;
                             accel.x = Rand_CenteredFloat(0.5f);
                             accel.z = Rand_CenteredFloat(0.5f);
-                            BossTw_AddDotEffect(play, &pos, &velocity, &accel, ((s16)Rand_ZeroFloat(2.0f) + 8), 0,
-                                                75);
+                            BossTw_AddDotEffect(play, &pos, &velocity, &accel, ((s16)Rand_ZeroFloat(2.0f) + 8), 0, 75);
                         }
                     }
                     break;
@@ -4254,8 +4232,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) {
                     velocity.y = Rand_ZeroFloat(3.0f) + 3.0f;
                     pos.x = sKotakePtr->groundBlastPos2.x + (velocity.x * 0.5f);
                     pos.z = sKotakePtr->groundBlastPos2.z + (velocity.z * 0.5f);
-                    BossTw_AddDmgCloud(play, 3, &pos, &velocity, &accel, Rand_ZeroFloat(5.0f) + 15.0f, 255, 2,
-                                       130);
+                    BossTw_AddDmgCloud(play, 3, &pos, &velocity, &accel, Rand_ZeroFloat(5.0f) + 15.0f, 255, 2, 130);
                 }
 
                 Math_ApproachF(&sKotakePtr->workf[UNK_F9], 80.0f, 1.0f, 3.0f);
@@ -4288,8 +4265,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) {
                             accel.x = 0.0f;
                             accel.y = 0.13f;
                             accel.z = 0.0f;
-                            BossTw_AddDmgCloud(play, 3, &pos, &velocity, &accel, Rand_ZeroFloat(5.0f) + 20, 0, 0,
-                                               80);
+                            BossTw_AddDmgCloud(play, 3, &pos, &velocity, &accel, Rand_ZeroFloat(5.0f) + 20, 0, 0, 80);
                         }
                     }
                     sp80 = 3.0f;
@@ -4440,9 +4416,9 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
                 FrameInterpolation_RecordOpenChild("Twinrova Fire Blast", i);
 
                 gSPSegment(POLY_XLU_DISP++, 8,
-                           Gfx_TwoTexScroll(
-                               play->state.gfxCtx, 0, ((this->work[CS_TIMER_1] * 3) + (i * 10)) & 0x7F,
-                               ((-this->work[CS_TIMER_1] * 15) + (i * 50)) & 0xFF, 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, ((this->work[CS_TIMER_1] * 3) + (i * 10)) & 0x7F,
+                                            ((-this->work[CS_TIMER_1] * 15) + (i * 50)) & 0xFF, 0x20, 0x40, 1, 0, 0,
+                                            0x20, 0x20));
                 tailIdx = ((this->work[TAIL_IDX] - i) + 30) % 30;
                 Matrix_Translate(this->blastTailPos[tailIdx].x, this->blastTailPos[tailIdx].y,
                                  this->blastTailPos[tailIdx].z, MTXMODE_NEW);
@@ -4453,7 +4429,7 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
-                
+
                 FrameInterpolation_RecordCloseChild();
             }
             break;
@@ -4468,9 +4444,9 @@ void BossTw_BlastDraw(Actor* thisx, PlayState* play2) {
                 FrameInterpolation_RecordOpenChild("Twinrova Ice Blast", i);
 
                 gSPSegment(POLY_XLU_DISP++, 8,
-                           Gfx_TwoTexScroll(
-                               play->state.gfxCtx, 0, ((this->work[CS_TIMER_1] * 3) + (i * 0xA)) & 0x7F,
-                               (u8)((-this->work[CS_TIMER_1] * 0xF) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, ((this->work[CS_TIMER_1] * 3) + (i * 0xA)) & 0x7F,
+                                            (u8)((-this->work[CS_TIMER_1] * 0xF) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20,
+                                            0x20));
                 tailIdx = ((this->work[TAIL_IDX] - i) + 30) % 30;
                 Matrix_Translate(this->blastTailPos[tailIdx].x, this->blastTailPos[tailIdx].y,
                                  this->blastTailPos[tailIdx].z, MTXMODE_NEW);
@@ -4522,8 +4498,7 @@ void BossTw_DrawDeathBall(Actor* thisx, PlayState* play2) {
             Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
                          this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
 
             FrameInterpolation_RecordCloseChild();
@@ -4546,8 +4521,7 @@ void BossTw_DrawDeathBall(Actor* thisx, PlayState* play2) {
             Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
                          this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
 
             FrameInterpolation_RecordCloseChild();
@@ -4861,8 +4835,8 @@ void BossTw_UpdateEffects(PlayState* play) {
                         spA8.y = 0.1f;
                         spA8.z = 0.0f;
 
-                        BossTw_AddDmgCloud(play, 3, &spC0, &spB4, &spA8, phi_f22 + Rand_ZeroFloat(phi_f22 * 0.5f),
-                                           0, 0, 150);
+                        BossTw_AddDmgCloud(play, 3, &spC0, &spB4, &spA8, phi_f22 + Rand_ZeroFloat(phi_f22 * 0.5f), 0, 0,
+                                           150);
                     }
                 }
             }
@@ -4928,8 +4902,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gTwinrovaMagicParticleModelDL);
 
             FrameInterpolation_RecordCloseChild();
@@ -4956,10 +4929,9 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
-            
+
             FrameInterpolation_RecordCloseChild();
         }
         currentEffect++;
@@ -4985,10 +4957,9 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaFireDL));
-            
+
             FrameInterpolation_RecordCloseChild();
         }
 
@@ -5032,8 +5003,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_RotateZ(currentEffect->workf[EFF_ROLL], MTXMODE_APPLY);
             Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
             Matrix_Scale(currentEffect->workf[EFF_SCALE], 1.0f, currentEffect->workf[EFF_SCALE], MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
             gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaEffectHaloDL));
@@ -5083,8 +5053,7 @@ void BossTw_DrawEffects(PlayState* play) {
                              currentEffect->workf[EFF_SCALE], MTXMODE_APPLY);
                 Matrix_RotateY(BossTw_RandZeroOne() * M_PI, MTXMODE_APPLY);
                 Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY);
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
             }
 
@@ -5116,8 +5085,7 @@ void BossTw_DrawEffects(PlayState* play) {
             Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             if (currentEffect->work[EFF_ARGS] == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gTwinrovaIceModelDL));
@@ -5222,9 +5190,8 @@ void BossTw_TwinrovaShootBlast(BossTw* this, PlayState* play) {
             magicSpawnPos = &this->leftScepterPos;
         }
 
-        twMagic =
-            (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, magicSpawnPos->x,
-                                        magicSpawnPos->y, magicSpawnPos->z, 0, 0, 0, magicParams);
+        twMagic = (BossTw*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_TW, magicSpawnPos->x,
+                                              magicSpawnPos->y, magicSpawnPos->z, 0, 0, 0, magicParams);
 
         if (twMagic != NULL) {
             twMagic->blastType = magicParams == TW_ICE_BLAST ? 0 : 1;
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 045ee412c5..3e8f05776e 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -19,7 +19,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 #define GET_BODY(this) ((BossVa*)(this)->actor.parent)
 #define vaGorePulse offset.x
@@ -190,15 +192,13 @@ void BossVa_BariDeath(BossVa* this, PlayState* play);
 void BossVa_SpawnBloodSplatter(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 yaw, s16 scale);
 void BossVa_SpawnGore(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 yaw, s16 scale);
 void BossVa_SpawnSpark(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode);
-void BossVa_SpawnZapperCharge(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* pos, Vec3s* rot,
-                              s16 scale, u8 mode);
+void BossVa_SpawnZapperCharge(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* pos, Vec3s* rot, s16 scale,
+                              u8 mode);
 void BossVa_SpawnTumor(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode);
-void BossVa_SpawnSparkBall(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale,
-                           u8 mode);
-void BossVa_SpawnBloodDroplets(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 scale, s16 phase,
-                               s16 yaw);
-void BossVa_Tumor(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode,
-                  f32 range, u8 fixed);
+void BossVa_SpawnSparkBall(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode);
+void BossVa_SpawnBloodDroplets(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 scale, s16 phase, s16 yaw);
+void BossVa_Tumor(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode, f32 range,
+                  u8 fixed);
 
 const ActorInit Boss_Va_InitVars = {
     ACTOR_BOSS_VA,
@@ -480,8 +480,8 @@ void BossVa_Gore(PlayState* play, BossVaEffect* src, s16 yaw, s16 scale) {
     }
 }
 
-void BossVa_Spark(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode,
-                  f32 range, u8 fixed) {
+void BossVa_Spark(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode, f32 range,
+                  u8 fixed) {
     s32 i;
     s16 index;
     Vec3f offset;
@@ -499,8 +499,8 @@ void BossVa_Spark(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpr
     }
 }
 
-void BossVa_Tumor(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode,
-                  f32 range, u8 fixed) {
+void BossVa_Tumor(PlayState* play, BossVa* this, s32 count, s16 scale, f32 xzSpread, f32 ySpread, u8 mode, f32 range,
+                  u8 fixed) {
     s16 index;
     s32 i;
     Vec3f offset;
@@ -599,22 +599,21 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
 
     switch (this->actor.params) {
         case BOSSVA_BODY:
-            //sFightPhase = 0;
-            //sBodyState = 1;
+            // sFightPhase = 0;
+            // sBodyState = 1;
             SkelAnime_Init(play, &this->skelAnime, &gBarinadeBodySkel, &gBarinadeBodyAnim, NULL, NULL, 0);
             this->actor.flags |= ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT;
             break;
         case BOSSVA_SUPPORT_1:
         case BOSSVA_SUPPORT_2:
         case BOSSVA_SUPPORT_3:
-            SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeSupportSkel, &gBarinadeSupportAttachedAnim, NULL,
-                               NULL, 0);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeSupportSkel, &gBarinadeSupportAttachedAnim, NULL, NULL,
+                               0);
             break;
         case BOSSVA_ZAPPER_1:
         case BOSSVA_ZAPPER_2:
         case BOSSVA_ZAPPER_3:
-            SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeZapperSkel, &gBarinadeZapperIdleAnim, NULL, NULL,
-                               0);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeZapperSkel, &gBarinadeZapperIdleAnim, NULL, NULL, 0);
             break;
         case BOSSVA_STUMP_1:
         case BOSSVA_STUMP_2:
@@ -636,8 +635,8 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
 
     switch (this->actor.params) {
         case BOSSVA_BODY:
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_VA, 0.0f, 80.0f, 400.0f, 0, 0,
-                               0, BOSSVA_DOOR);
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_VA, 0.0f, 80.0f, 400.0f, 0, 0, 0,
+                               BOSSVA_DOOR);
             if (Flags_GetClear(play, play->roomCtx.curRoom.num)) {
                 warpId = ACTOR_EN_RU1;
                 if (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
@@ -645,8 +644,8 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                 }
                 if (GameInteractor_Should(VB_SPAWN_BLUE_WARP, true, this)) {
                     Actor_Spawn(&play->actorCtx, play, warpId, this->actor.world.pos.x, this->actor.world.pos.y,
-                                this->actor.world.pos.z, 0, 0, 0,
-                                0, true); //! params could be WARP_DUNGEON_CHILD however this can also spawn Ru1
+                                this->actor.world.pos.z, 0, 0, 0, 0,
+                                true); //! params could be WARP_DUNGEON_CHILD however this can also spawn Ru1
                 }
 
                 if (GameInteractor_Should(VB_SPAWN_HEART_CONTAINER, true)) {
@@ -659,39 +658,40 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
                 this->actor.colChkInfo.damageTable = sDamageTable;
                 sPhase2Timer = 0xFFFF;
                 if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
-                    if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_SOULS) && !Flags_GetRandomizerInf(RAND_INF_BARINADE_SOUL)) {
+                    if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_SOULS) &&
+                        !Flags_GetRandomizerInf(RAND_INF_BARINADE_SOUL)) {
                         sCsState = BOSSVA_BATTLE;
                     } else {
-                    sCsState = INTRO_CALL_BARI;
-                    sDoorState = 100;
-                    Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
-                    play->envCtx.screenFillColor[0] = 0xDC;
-                    play->envCtx.screenFillColor[1] = 0xDC;
-                    play->envCtx.screenFillColor[2] = 0xBE;
-                    play->envCtx.screenFillColor[3] = 0xD2;
-                    func_80064520(play, &play->csCtx);
-                    sCsCamera = Play_CreateSubCamera(play);
-                    Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-                    Play_ChangeCameraStatus(play, sCsCamera, CAM_STAT_ACTIVE);
-                    sCameraNextEye.x = sCameraEye.x = 140.0f;
-                    sCameraNextEye.y = sCameraEye.y = 205.0f;
-                    sCameraNextEye.z = sCameraEye.z = -20.0f;
-                    sCameraNextAt.x = sCameraAt.x = 10.0f;
-                    sCameraNextAt.y = sCameraAt.y = 50.0f;
-                    sCameraNextAt.z = sCameraAt.z = -220.0f;
-                    Play_CameraSetAtEye(play, sCsCamera, &sCameraAt, &sCameraEye);
-                    this->timer = 20;
+                        sCsState = INTRO_CALL_BARI;
+                        sDoorState = 100;
+                        Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
+                        play->envCtx.screenFillColor[0] = 0xDC;
+                        play->envCtx.screenFillColor[1] = 0xDC;
+                        play->envCtx.screenFillColor[2] = 0xBE;
+                        play->envCtx.screenFillColor[3] = 0xD2;
+                        func_80064520(play, &play->csCtx);
+                        sCsCamera = Play_CreateSubCamera(play);
+                        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
+                        Play_ChangeCameraStatus(play, sCsCamera, CAM_STAT_ACTIVE);
+                        sCameraNextEye.x = sCameraEye.x = 140.0f;
+                        sCameraNextEye.y = sCameraEye.y = 205.0f;
+                        sCameraNextEye.z = sCameraEye.z = -20.0f;
+                        sCameraNextAt.x = sCameraAt.x = 10.0f;
+                        sCameraNextAt.y = sCameraAt.y = 50.0f;
+                        sCameraNextAt.z = sCameraAt.z = -220.0f;
+                        Play_CameraSetAtEye(play, sCsCamera, &sCameraAt, &sCameraEye);
+                        this->timer = 20;
 
-                    for (i = BOSSVA_BARI_LOWER_5; i >= BOSSVA_BARI_UPPER_1; i--) {
-                        Actor_SpawnAsChild(
-                            &play->actorCtx, &this->actor, play, ACTOR_BOSS_VA,
-                            sInitPosOffsets[i].x + this->actor.world.pos.x,
-                            sInitPosOffsets[i].y + this->actor.world.pos.y,
-                            sInitPosOffsets[i].z + this->actor.world.pos.z, sInitRot[i].x + this->actor.world.rot.x,
-                            sInitRot[i].y + this->actor.world.rot.y, sInitRot[i].z + this->actor.world.rot.z, i);
-                    }
+                        for (i = BOSSVA_BARI_LOWER_5; i >= BOSSVA_BARI_UPPER_1; i--) {
+                            Actor_SpawnAsChild(
+                                &play->actorCtx, &this->actor, play, ACTOR_BOSS_VA,
+                                sInitPosOffsets[i].x + this->actor.world.pos.x,
+                                sInitPosOffsets[i].y + this->actor.world.pos.y,
+                                sInitPosOffsets[i].z + this->actor.world.pos.z, sInitRot[i].x + this->actor.world.rot.x,
+                                sInitRot[i].y + this->actor.world.rot.y, sInitRot[i].z + this->actor.world.rot.z, i);
+                        }
 
-                    sCameraAtMaxVel = sCameraEyeMaxVel = sZeroVec;
+                        sCameraAtMaxVel = sCameraEyeMaxVel = sZeroVec;
                     }
 
                 } else {
@@ -872,10 +872,10 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
 
             for (i = BOSSVA_BARI_LOWER_5; i >= BOSSVA_BARI_UPPER_1; i--) {
                 Actor_SpawnAsChild(
-                    &play->actorCtx, &this->actor, play, ACTOR_BOSS_VA,
-                    sInitPosOffsets[i].x + this->actor.world.pos.x, sInitPosOffsets[i].y + this->actor.world.pos.y,
-                    sInitPosOffsets[i].z + this->actor.world.pos.z, sInitRot[i].x + this->actor.world.rot.x,
-                    sInitRot[i].y + this->actor.world.rot.y, sInitRot[i].z + this->actor.world.rot.z, i);
+                    &play->actorCtx, &this->actor, play, ACTOR_BOSS_VA, sInitPosOffsets[i].x + this->actor.world.pos.x,
+                    sInitPosOffsets[i].y + this->actor.world.pos.y, sInitPosOffsets[i].z + this->actor.world.pos.z,
+                    sInitRot[i].x + this->actor.world.rot.x, sInitRot[i].y + this->actor.world.rot.y,
+                    sInitRot[i].z + this->actor.world.rot.z, i);
             }
 
             this->timer = 90;
@@ -1577,8 +1577,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
 
             this->unk_1AC = Math_Vec3f_Yaw(&sCameraEye, &sCameraNextAt) - 0x100;
             this->unk_1B0 = 15;
-            play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] =
-                play->envCtx.screenFillColor[2] = 0xFF;
+            play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] = play->envCtx.screenFillColor[2] = 0xFF;
             play->envCtx.screenFillColor[3] = 0;
             play->envCtx.fillScreen = true;
             sCsState++;
@@ -1615,8 +1614,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
                 this->isDead++;
                 this->timer = 30;
                 sCsState++;
-                EffectSsDeadSound_SpawnStationary(play, &this->actor.projectedPos, NA_SE_EN_BALINADE_DEAD, 1, 1,
-                                                  0x28);
+                EffectSsDeadSound_SpawnStationary(play, &this->actor.projectedPos, NA_SE_EN_BALINADE_DEAD, 1, 1, 0x28);
                 this->onCeiling = 2; // Not used by body
                 BossVa_SetDeathEnv(play);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
@@ -1786,8 +1784,8 @@ void BossVa_SetupSupportCut(BossVa* this, PlayState* play) {
 
     sBodyState++;
     sFightPhase++;
-    Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_VA, this->armTip.x, this->armTip.y + 20.0f, this->armTip.z,
-                0, this->actor.shape.rot.y, 0, stumpParams, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_VA, this->armTip.x, this->armTip.y + 20.0f, this->armTip.z, 0,
+                this->actor.shape.rot.y, 0, stumpParams, true);
     Camera_AddQuake(&play->mainCamera, 2, 11, 8);
     this->burst = false;
     this->timer2 = 0;
@@ -1805,8 +1803,7 @@ void BossVa_SupportCut(BossVa* this, PlayState* play) {
         this->onCeiling = false;
         this->timer = (s32)(Rand_ZeroOne() * 10.0f) + 5;
         SkelAnime_Free(&this->skelAnime, play);
-        SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeCutSupportSkel, &gBarinadeSupportCutAnim, NULL, NULL,
-                           0);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gBarinadeCutSupportSkel, &gBarinadeSupportCutAnim, NULL, NULL, 0);
         Animation_Change(&this->skelAnime, &gBarinadeSupportCutAnim, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, 0.0f);
         sBodyState = 0;
         GET_BODY(this)->actor.shape.yOffset -= 60.0f;
@@ -2294,7 +2291,8 @@ void BossVa_ZapperEnraged(BossVa* this, PlayState* play) {
     sp6C = Math_Vec3f_Yaw(&sp54, &this->armTip);
     tmp16 = sp6C - this->actor.shape.rot.y;
 
-    if ((ABS(tmp16) <= 0x4650 || this->burst) && !(sBodyState & 0x80) && !(player->stateFlags1 & PLAYER_STATE1_DAMAGED)) {
+    if ((ABS(tmp16) <= 0x4650 || this->burst) && !(sBodyState & 0x80) &&
+        !(player->stateFlags1 & PLAYER_STATE1_DAMAGED)) {
         if (!this->burst) {
 
             sp68 = sp6C - this->actor.shape.rot.y;
@@ -2891,8 +2889,7 @@ void BossVa_Update(Actor* thisx, PlayState* play2) {
     }
 }
 
-s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossVa* this = (BossVa*)thisx;
     s32 pad;
 
@@ -2900,9 +2897,9 @@ s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
 
     if (limbIndex == 20) {
         gDPPipeSync(POLY_OPA_DISP++);
-        gSPSegment(POLY_OPA_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 8, 16, 1, 0,
-                                    (play->gameplayFrames * -2) % 64, 16, 16));
+        gSPSegment(
+            POLY_OPA_DISP++, 0x08,
+            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 8, 16, 1, 0, (play->gameplayFrames * -2) % 64, 16, 16));
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->bodyGlow);
         Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY);
     } else if ((limbIndex >= 10) && (limbIndex < 20)) {
@@ -2936,12 +2933,10 @@ void BossVa_BodyPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         Matrix_MultVec3f(&sp78, &this->unk_1D8);
     } else if ((limbIndex >= 10) && (limbIndex < 20) && (sBodyBari[limbIndex - 10] != 0)) {
         if (((limbIndex >= 16) || (limbIndex == 10)) && (sFightPhase <= PHASE_3)) {
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8);
         } else if ((limbIndex >= 11) && (sFightPhase <= PHASE_2)) {
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8);
         }
 
@@ -2955,12 +2950,10 @@ void BossVa_BodyPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         gSPSegment(POLY_XLU_DISP++, 0x09,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (play->gameplayFrames * 10) % 128, 16, 32, 1, 0,
                                     (play->gameplayFrames * 5) % 128, 16, 32));
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008D70);
     } else if ((*dList != NULL) && (limbIndex >= 29) && (limbIndex < 56)) {
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, *dList);
     } else if ((limbIndex == 24) && (sCsState < DEATH_START)) {
         sp78.x = (this->actor.shape.yOffset + 450.0f) + -140.0f;
@@ -2991,8 +2984,7 @@ void BossVa_BodyPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 BossVa_SupportOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                   void* thisx) {
+s32 BossVa_SupportOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossVa* this = (BossVa*)thisx;
 
     if (!this->onCeiling && (limbIndex == 4)) {
@@ -3045,8 +3037,7 @@ void BossVa_SupportPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
     }
 }
 
-s32 BossVa_ZapperOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 BossVa_ZapperOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossVa* this = (BossVa*)thisx;
     MtxF zapperMtx;
 
@@ -3158,8 +3149,7 @@ void BossVa_ZapperPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3
     }
 }
 
-s32 BossVa_BariOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 BossVa_BariOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     BossVa* this = (BossVa*)thisx;
 
     switch (limbIndex) {
@@ -3185,12 +3175,10 @@ void BossVa_BariPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         gSPSegment(POLY_XLU_DISP++, 0x0A,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (play->gameplayFrames * 10) % 32, 16, 32, 1, 0,
                                     (play->gameplayFrames * -5) % 32, 16, 32));
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_000FA0);
     } else if ((limbIndex == 3) || (limbIndex == 4)) {
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, *dList);
     }
 
@@ -3233,13 +3221,13 @@ void BossVa_Draw(Actor* thisx, PlayState* play) {
 
             if (!this->isDead) {
                 gSPSegment(POLY_OPA_DISP++, 0x08,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 8, 16, 1, 0,
-                                            (play->gameplayFrames * -10) % 16, 16, 16));
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 8, 16, 1, 0, (play->gameplayFrames * -10) % 16,
+                                            16, 16));
                 gSPSegment(POLY_OPA_DISP++, 0x09,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (play->gameplayFrames * -10) % 32, 16,
-                                            0x20, 1, 0, (play->gameplayFrames * -5) % 32, 16, 32));
-                SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                                  BossVa_BodyOverrideLimbDraw, BossVa_BodyPostLimbDraw, this);
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (play->gameplayFrames * -10) % 32, 16, 0x20, 1, 0,
+                                            (play->gameplayFrames * -5) % 32, 16, 32));
+                SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossVa_BodyOverrideLimbDraw, BossVa_BodyPostLimbDraw,
+                                          this);
             }
             break;
         case BOSSVA_SUPPORT_1:
@@ -3247,7 +3235,7 @@ void BossVa_Draw(Actor* thisx, PlayState* play) {
         case BOSSVA_SUPPORT_3:
             if (!this->isDead) {
                 SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossVa_SupportOverrideLimbDraw,
-                                      BossVa_SupportPostLimbDraw, this);
+                                          BossVa_SupportPostLimbDraw, this);
             }
             break;
         case BOSSVA_ZAPPER_1:
@@ -3255,7 +3243,7 @@ void BossVa_Draw(Actor* thisx, PlayState* play) {
         case BOSSVA_ZAPPER_3:
             if (!this->isDead) {
                 SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossVa_ZapperOverrideLimbDraw,
-                                      BossVa_ZapperPostLimbDraw, this);
+                                          BossVa_ZapperPostLimbDraw, this);
             }
             break;
         case BOSSVA_STUMP_1:
@@ -3265,8 +3253,8 @@ void BossVa_Draw(Actor* thisx, PlayState* play) {
             break;
         default:
             if (!this->isDead) {
-                SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                                  BossVa_BariOverrideLimbDraw, BossVa_BariPostLimbDraw, this);
+                SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, BossVa_BariOverrideLimbDraw, BossVa_BariPostLimbDraw,
+                                          this);
                 Collider_UpdateSpheres(0, &this->colliderSph);
                 if (sCsState < BOSSVA_BATTLE) {
                     spBC = GET_BODY(this)->actor.world.pos;
@@ -3552,8 +3540,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
             Matrix_Scale(effect->scale * 0.0185f, effect->scale * 0.0185f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3573,8 +3560,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
             Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPPipeSync(POLY_XLU_DISP++);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSparkBallTex[effect->mode]));
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, effect->primColor[0], effect->primColor[1], effect->primColor[2],
@@ -3612,8 +3598,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
             gDPPipeSync(POLY_XLU_DISP++);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009468);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3637,8 +3622,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
                 Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
                 Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
 
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012948);
             }
             FrameInterpolation_RecordCloseChild();
@@ -3671,8 +3655,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_RotateY(-(effect->offset.x * 0.13f), MTXMODE_APPLY);
             Matrix_RotateX(-(effect->offset.x * 0.115f), MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012C50);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3696,8 +3679,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_RotateZYX(effect->rot.x, effect->rot.y, 0, MTXMODE_APPLY);
             Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_013638);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3720,8 +3702,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
             Matrix_Scale(effect->scale * 0.02f, effect->scale * 0.02f, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3744,8 +3725,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
             Matrix_RotateY((effect->rot.y / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008F70);
             FrameInterpolation_RecordCloseChild();
         }
@@ -3754,8 +3734,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, PlayState* play) {
     CLOSE_DISPS(gfxCtx);
 }
 
-void BossVa_SpawnSpark(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale,
-                       u8 mode) {
+void BossVa_SpawnSpark(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode) {
     Player* player = GET_PLAYER(play);
     s16 index;
     Vec3f pos = { 0.0f, -1000.0f, 0.0f };
@@ -3815,8 +3794,7 @@ void BossVa_SpawnSpark(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3
     }
 }
 
-void BossVa_SpawnSparkBall(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale,
-                           u8 mode) {
+void BossVa_SpawnSparkBall(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode) {
     Vec3f pos = { 0.0f, -1000.0f, 0.0f };
     s16 i;
 
@@ -3846,8 +3824,7 @@ void BossVa_SpawnSparkBall(PlayState* play, BossVaEffect* effect, BossVa* this,
     }
 }
 
-void BossVa_SpawnBloodDroplets(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 scale, s16 phase,
-                               s16 yaw) {
+void BossVa_SpawnBloodDroplets(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 scale, s16 phase, s16 yaw) {
     s32 i;
     Vec3f accel = { 0.0f, 0.0f, 0.0f };
     Vec3f velocity = { 0.0f, 0.0f, 0.0f };
@@ -3912,8 +3889,7 @@ void BossVa_SpawnBloodSplatter(PlayState* play, BossVaEffect* effect, Vec3f* pos
     }
 }
 
-void BossVa_SpawnTumor(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale,
-                       u8 mode) {
+void BossVa_SpawnTumor(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, u8 mode) {
     Vec3f pos = { 0.0f, -1000.0f, 0.0f };
     s16 i;
 
@@ -3938,7 +3914,8 @@ void BossVa_SpawnTumor(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3
             effect->scale = 0.0f;
 
             if (((i % 4) == 0) || (mode == 2)) {
-                Audio_PlaySoundGeneral(NA_SE_EN_BALINADE_BREAK, &effect->pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_BALINADE_BREAK, &effect->pos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             break;
         }
@@ -3988,8 +3965,8 @@ void BossVa_SpawnGore(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 yaw
     }
 }
 
-void BossVa_SpawnZapperCharge(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* pos, Vec3s* rot,
-                              s16 scale, u8 mode) {
+void BossVa_SpawnZapperCharge(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* pos, Vec3s* rot, s16 scale,
+                              u8 mode) {
     Vec3f unused = { 0.0f, -1000.0f, 0.0f };
     s16 i;
 
@@ -4045,8 +4022,7 @@ void BossVa_DrawDoor(PlayState* play, s16 scale) {
         Matrix_RotateZ(segAngle, MTXMODE_APPLY);
         Matrix_Translate(0.0f, doorPieceLength[i] * yScale, 0.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, doorPieceDispList[i]);
 
         FrameInterpolation_RecordCloseChild();
@@ -4068,7 +4044,7 @@ void BossVa_Reset(void) {
     sPhase3StopMoving = 0;
     sZapperRot.x = 0;
     sZapperRot.y = 0;
-    sZapperRot.z = 0;    
+    sZapperRot.z = 0;
     sPhase2Timer = 0;
     sPhase4HP = 0;
     for (u8 i = 0; i < ARRAY_SIZE(sBodyBari); i++) {
diff --git a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
index 51963f5d04..16ce65299a 100644
--- a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@@ -21,7 +21,6 @@ void Demo6K_Destroy(Actor* thisx, PlayState* play);
 void Demo6K_Update(Actor* thisx, PlayState* play);
 void Demo6K_Reset(void);
 
-
 void func_80966DB0(Demo6K* this, PlayState* play);
 void func_80966E04(Demo6K* this, PlayState* play);
 void func_80966E98(Demo6K* this, PlayState* play);
@@ -238,8 +237,8 @@ void func_80966E98(Demo6K* this, PlayState* play) {
 
     if (this->timer1 == 39) {
         Sfx_PlaySfxCentered2(NA_SE_EV_CONSENTRATION);
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_6K, this->actor.world.pos.x,
-                    this->actor.world.pos.y + 10.0f, this->actor.world.pos.z, 0, 0, 0, 2, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_6K, this->actor.world.pos.x, this->actor.world.pos.y + 10.0f,
+                    this->actor.world.pos.z, 0, 0, 0, 2, true);
     }
 
     if (this->timer1 == 64) {
@@ -587,10 +586,9 @@ void func_80967FFC(Actor* thisx, PlayState* play) {
 
         for (i = 0; i < 6; i++) {
             FrameInterpolation_RecordOpenChild("Demo6K 80967FFC", i);
-    
+
             Matrix_RotateZ(M_PI / 3, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, colors[i][0].r, colors[i][0].g, colors[i][0].b, 255);
             gDPSetEnvColor(POLY_XLU_DISP++, colors[i][1].r, colors[i][1].g, colors[i][1].b, 255);
@@ -637,17 +635,15 @@ void func_80968298(Actor* thisx, PlayState* play) {
     }
 
     Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 210, 210, 210, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, 100, 100, 100, 255);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 128,
-                                64, 1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 128, 64,
+                                1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32));
     gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0039D0);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255);
@@ -677,13 +673,11 @@ void func_8096865C(Actor* thisx, PlayState* play) {
         Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
         Matrix_Push();
         Matrix_RotateZ((f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, displayList);
         Matrix_Pop();
         Matrix_RotateZ(-(f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, displayList);
     }
 
@@ -716,8 +710,7 @@ void func_809688C4(Actor* thisx, PlayState* play2) {
                          this->unk_234[i] * D_8096931C[(frames + i) & 3],
                          this->unk_234[i] * D_8096931C[(frames + i) & 3], MTXMODE_APPLY);
             Matrix_ReplaceRotation(&play->billboardMtxF);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
             Matrix_Pop();
 
@@ -742,8 +735,7 @@ void func_80968B70(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
     Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0xFF - ((timer2 * 2) & 0xFF), 0, 32, 32, 1,
                                 0xFF - ((timer2 * 2) & 0xFF), (timer2 * 15) & 0x3FF, 16, 64));
@@ -791,8 +783,7 @@ void func_80968FB0(Actor* thisx, PlayState* play) {
     scaleFactor = ((s16)D_809693CC[(frames * 4) & 0xF] * 0.01f) + 1.0f;
     Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
                  this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08, displayList);
     gDPPipeSync(displayList++);
     gDPSetPrimColor(displayList++, 0, 0x80, 255, 255, 255, this->unk_293);
diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index 273c30df42..81552aca66 100644
--- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -16,7 +16,7 @@ void DemoDu_Update(Actor* thisx, PlayState* play);
 void DemoDu_Draw(Actor* thisx, PlayState* play);
 void DemoDu_Reset(void);
 
-//static s32 sUnused = 0;
+// static s32 sUnused = 0;
 
 #include "z_demo_du_cutscene_data.c" EARLY
 
@@ -172,8 +172,7 @@ void DemoDu_CsFireMedallion_SpawnDoorWarp(DemoDu* this, PlayState* play) {
     f32 posY = this->actor.world.pos.y;
     f32 posZ = this->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0,
-                       WARP_SAGES);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES);
 }
 
 // Gives the Fire Medallion to Link.
@@ -326,8 +325,8 @@ void DemoDu_CsPlaySfx_DaruniaHitsLink(PlayState* play) {
     s32 pad;
 
     Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK);
-    Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 // Cutscene: Darunia gives Link the Goron's Ruby.
@@ -341,8 +340,8 @@ void DemoDu_CsPlaySfx_LinkEscapeFromGorons(PlayState* play) {
     if (play->csCtx.frames == 1400) {
         Player* player = GET_PLAYER(play);
 
-        Audio_PlaySoundGeneral(NA_SE_VO_LI_FALL_L_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_VO_LI_FALL_L_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -352,8 +351,8 @@ void DemoDu_CsPlaySfx_LinkSurprised(PlayState* play) {
     if (play->csCtx.frames == 174) {
         Player* player = GET_PLAYER(play);
 
-        Audio_PlaySoundGeneral(NA_SE_VO_LI_SURPRISE_KID, &player->actor.projectedPos, 4U, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_VO_LI_SURPRISE_KID, &player->actor.projectedPos, 4U, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -431,8 +430,8 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play)
             envColor.g += colorDelta;
             envColor.b += colorDelta;
 
-            func_8002829C(play, &position, &velocity, &accel, &primColor, &envColor,
-                          Rand_ZeroOne() * 40.0f + 200.0f, 0);
+            func_8002829C(play, &position, &velocity, &accel, &primColor, &envColor, Rand_ZeroOne() * 40.0f + 200.0f,
+                          0);
         }
 
         DemoDu_CsPlaySfx_DaruniaHitsLink(play);
@@ -822,8 +821,8 @@ void DemoDu_Draw_02(Actor* thisx, PlayState* play2) {
 
     gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
 
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, 0,
-                                       0, 0, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, 0, 0, 0,
+                                       POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
index b2772a9ec2..29debf9d68 100644
--- a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+++ b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
@@ -175,19 +175,19 @@ void DemoEc_UpdateBgFlags(DemoEc* this, PlayState* play) {
 }
 
 void func_8096D594(DemoEc* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 3;
+    this->skelAnime.movementFlags |= 3;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void func_8096D5D4(DemoEc* this, PlayState* play) {
     this->skelAnime.baseTransl = this->skelAnime.jointTable[0];
     this->skelAnime.prevTransl = this->skelAnime.jointTable[0];
-    this->skelAnime.moveFlags |= 3;
+    this->skelAnime.movementFlags |= 3;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void func_8096D64C(DemoEc* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 3;
+    this->skelAnime.movementFlags |= 3;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
@@ -248,8 +248,8 @@ Gfx* DemoEc_AllocColorDList(GraphicsContext* gfxCtx, u8* color) {
     return dList;
 }
 
-void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* arg3,
-                         OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) {
+void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* arg3, OverrideLimbDraw overrideLimbDraw,
+                         PostLimbDraw postLimbDraw) {
     GraphicsContext* gfxCtx = play->state.gfxCtx;
     SkelAnime* skelAnime = &this->skelAnime;
     s32 pad;
@@ -274,8 +274,8 @@ void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void*
     CLOSE_DISPS(gfxCtx);
 }
 
-void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gfx* arg3, u8* color1,
-                                    u8* color2, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) {
+void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gfx* arg3, u8* color1, u8* color2,
+                                    OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) {
     s32 pad;
     GraphicsContext* gfxCtx = play->state.gfxCtx;
     SkelAnime* skelAnime = &this->skelAnime;
@@ -648,8 +648,8 @@ void DemoEc_UpdateCarpenter(DemoEc* this, PlayState* play) {
     DemoEc_UpdateBgFlags(this, play);
 }
 
-s32 DemoEc_CarpenterOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                     void* thisx, Gfx** gfx) {
+s32 DemoEc_CarpenterOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                                     Gfx** gfx) {
     DemoEc* this = (DemoEc*)thisx;
 
     if (limbIndex == 1) {
@@ -689,8 +689,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
     }
 }
 
-void DemoEc_CarpenterPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx,
-                                  Gfx** gfx) {
+void DemoEc_CarpenterPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
     DemoEc* this = (DemoEc*)thisx;
     Gfx* postLimbDList;
 
@@ -736,8 +735,7 @@ Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) {
     }
 }
 
-void DemoEc_GerudoPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx,
-                               Gfx** gfx) {
+void DemoEc_GerudoPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
     DemoEc* this = (DemoEc*)thisx;
     Gfx* postLimbDList;
 
@@ -1072,8 +1070,7 @@ void DemoEc_UpdateFishingOwner(DemoEc* this, PlayState* play) {
     DemoEc_UpdateBgFlags(this, play);
 }
 
-void DemoEc_FishingOwnerPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx,
-                                     Gfx** gfx) {
+void DemoEc_FishingOwnerPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
     DemoEc* this = (DemoEc*)thisx;
 
     if ((limbIndex == 8) && !(HIGH_SCORE(HS_FISHING) & 0x1000)) {
@@ -1270,8 +1267,7 @@ void DemoEc_InitCommon(DemoEc* this, PlayState* play) {
         return;
     }
 
-    if (Object_IsLoaded(&play->objectCtx, primaryBankIndex) &&
-        Object_IsLoaded(&play->objectCtx, secondaryBankIndex)) {
+    if (Object_IsLoaded(&play->objectCtx, primaryBankIndex) && Object_IsLoaded(&play->objectCtx, secondaryBankIndex)) {
 
         this->drawObjBankIndex = primaryBankIndex;
         this->animObjBankIndex = secondaryBankIndex;
diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index b64d2bcde4..ac5120d5b2 100644
--- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -130,9 +130,8 @@ void DemoEffect_SetupUpdate(DemoEffect* this, DemoEffectFunc updateFunc) {
  * Gives a number on the range of 0.0f - 1.0f representing current cutscene action completion percentage.
  */
 f32 DemoEffect_InterpolateCsFrames(PlayState* play, s32 csActionId) {
-    f32 interpolated =
-        Environment_LerpWeight(play->csCtx.npcActions[csActionId]->endFrame,
-                               play->csCtx.npcActions[csActionId]->startFrame, play->csCtx.frames);
+    f32 interpolated = Environment_LerpWeight(play->csCtx.npcActions[csActionId]->endFrame,
+                                              play->csCtx.npcActions[csActionId]->startFrame, play->csCtx.frames);
     if (interpolated > 1.0f) {
         interpolated = 1.0f;
     }
@@ -158,7 +157,9 @@ void DemoEffect_InitJewel(PlayState* play, DemoEffect* this) {
         Actor_SetScale(&this->actor, 0.10f);
     }
     this->csActionId = 1;
-    this->actor.shape.rot.x = (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) ? 0 : 16384;
+    this->actor.shape.rot.x =
+        (IS_RANDO && (play->sceneNum != SCENE_TEMPLE_OF_TIME || this->actor.params == DEMO_EFFECT_LIGHTARROW)) ? 0
+                                                                                                               : 16384;
     DemoEffect_InitJewelColor(this);
     this->jewel.alpha = 0;
     this->jewelCsRotation.x = this->jewelCsRotation.y = this->jewelCsRotation.z = 0;
@@ -410,9 +411,9 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) {
 
             Actor_SetScale(&this->actor, 0.020f);
 
-            crystalLight = (DemoEffect*)Actor_SpawnAsChild(
-                &play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
-                this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_CRYSTAL_LIGHT);
+            crystalLight = (DemoEffect*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT,
+                                                           this->actor.world.pos.x, this->actor.world.pos.y,
+                                                           this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_CRYSTAL_LIGHT);
 
             if (crystalLight != NULL) {
                 Actor_SetScale(&crystalLight->actor, 0.6f);
@@ -637,7 +638,8 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) {
 
         Actor_SetScale(thisx, 0.20f);
 
-        if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
+        if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE ||
+            (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
             switch (play->csCtx.npcActions[this->csActionId]->action) {
                 case 2:
                     DemoEffect_MedalSparkle(this, play, 0);
@@ -705,7 +707,8 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play) {
             Actor_SetScale(&this->actor, 84 * 0.001f);
         }
     } else if (gSaveContext.sceneSetupIndex == 5 || gSaveContext.sceneSetupIndex == 4 ||
-               (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4 && !((Flags_GetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT))))) {
+               (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4 &&
+                !((Flags_GetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT))))) {
         SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 59.0f, 0.0f);
         SkelCurve_Update(play, &this->skelCurve);
         this->updateFunc = DemoEffect_UpdateTimeWarpReturnFromChamberOfSages;
@@ -922,11 +925,10 @@ void DemoEffect_UpdateLightRingTriforce(DemoEffect* this, PlayState* play) {
     DemoEffect_UpdatePositionToParent(this, play);
 
     if (play->csCtx.state != CS_STATE_IDLE) {
-        if (play->csCtx.npcActions[this->csActionId] != NULL &&
-            play->csCtx.npcActions[this->csActionId]->action == 2) {
-            blueOrb = (DemoEffect*)Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT,
-                                               this->actor.world.pos.x, this->actor.world.pos.y,
-                                               this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_BLUE_ORB, true);
+        if (play->csCtx.npcActions[this->csActionId] != NULL && play->csCtx.npcActions[this->csActionId]->action == 2) {
+            blueOrb = (DemoEffect*)Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
+                                               this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
+                                               DEMO_EFFECT_BLUE_ORB, true);
 
             if (blueOrb != NULL) {
                 Actor_SetScale(&blueOrb->actor, 0.0f);
@@ -955,8 +957,9 @@ void DemoEffect_UpdateCreationFireball(DemoEffect* this, PlayState* play) {
         return;
     }
 
-    effect = (DemoEffect*)Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
-                                      this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_BLUE_ORB, true);
+    effect =
+        (DemoEffect*)Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
+                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_BLUE_ORB, true);
     if (effect != NULL) {
         Actor_SetScale(&effect->actor, 0.0f);
     }
@@ -1077,8 +1080,7 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, PlayState* play) {
                 break;
         }
 
-        if (play->sceneNum == SCENE_KOKIRI_FOREST && gSaveContext.sceneSetupIndex == 6 &&
-            play->csCtx.frames == 197) {
+        if (play->sceneNum == SCENE_KOKIRI_FOREST && gSaveContext.sceneSetupIndex == 6 && play->csCtx.frames == 197) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT);
         }
 
@@ -1107,7 +1109,8 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, PlayState* play) {
             }
         }
 
-        if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC || play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS) {
+        if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC ||
+            play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS) {
             if (play->csCtx.npcActions[this->csActionId]->action == 2) {
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG);
             }
@@ -1199,10 +1202,10 @@ void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, PlayState* play) {
                 this->godLgt.lightRingSpawnTimer--;
             } else {
                 this->godLgt.lightRingSpawnTimer = this->godLgt.lightRingSpawnDelay;
-                lightRing = (DemoEffect*)Actor_Spawn(
-                    &play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
-                    this->actor.world.pos.y, this->actor.world.pos.z, this->actor.world.rot.x + 0x4000,
-                    this->actor.world.rot.y, this->actor.world.rot.z, DEMO_EFFECT_LIGHTRING_EXPANDING, true);
+                lightRing = (DemoEffect*)Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
+                                                     this->actor.world.pos.y, this->actor.world.pos.z,
+                                                     this->actor.world.rot.x + 0x4000, this->actor.world.rot.y,
+                                                     this->actor.world.rot.z, DEMO_EFFECT_LIGHTRING_EXPANDING, true);
 
                 if (lightRing != NULL) {
                     Actor_SetScale(&lightRing->actor, 1.0f);
@@ -1256,9 +1259,9 @@ void DemoEffect_UpdateGodLgtFarore(DemoEffect* this, PlayState* play) {
         DemoEffect_MoveToCsEndpoint(this, play, this->csActionId, 1);
 
         if (play->csCtx.npcActions[this->csActionId]->action == 3) {
-            lgtShower = (DemoEffect*)Actor_SpawnAsChild(
-                &play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
-                this->actor.world.pos.y - 150.0f, this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_LGT_SHOWER);
+            lgtShower = (DemoEffect*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT,
+                                                        this->actor.world.pos.x, this->actor.world.pos.y - 150.0f,
+                                                        this->actor.world.pos.z, 0, 0, 0, DEMO_EFFECT_LGT_SHOWER);
 
             if (lgtShower != NULL) {
                 lgtShower->actor.scale.x = 0.23f;
@@ -1515,8 +1518,8 @@ void DemoEffect_JewelSparkle(DemoEffect* this, PlayState* play, s32 spawnerCount
         velocity.x = (Rand_ZeroOne() - 0.5f) * 1.5f;
         velocity.z = (Rand_ZeroOne() - 0.5f) * 1.5f;
 
-        EffectSsKiraKira_SpawnDispersed(play, &this->actor.world.pos, &velocity, &accel, &primColor, &envColor,
-                                        3000, 16);
+        EffectSsKiraKira_SpawnDispersed(play, &this->actor.world.pos, &velocity, &accel, &primColor, &envColor, 3000,
+                                        16);
     }
 }
 
@@ -1555,24 +1558,24 @@ void DemoEffect_UpdateJewelAdult(DemoEffect* this, PlayState* play) {
                 } else {
                     DemoEffect_SetJewelColor(this, 0.0f);
                 }
-            break;
+                break;
             case DEMO_EFFECT_JEWEL_GORON:
                 if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                     DemoEffect_SetJewelColor(this, 1.0f);
                 } else {
                     DemoEffect_SetJewelColor(this, 0.0f);
                 }
-            break;
+                break;
             case DEMO_EFFECT_JEWEL_ZORA:
                 if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
                     DemoEffect_SetJewelColor(this, 1.0f);
                 } else {
                     DemoEffect_SetJewelColor(this, 0.0f);
                 }
-            break;
+                break;
         }
     } else {
-    DemoEffect_SetJewelColor(this, 1.0f);
+        DemoEffect_SetJewelColor(this, 1.0f);
     }
 }
 
@@ -1624,7 +1627,8 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) {
         }
     }
 
-    if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
+    if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_ENTRANCE ||
+        (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_WARP_PAD)) {
         if (!Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)) {
             hasCmdAction = play->csCtx.state && play->csCtx.npcActions[this->csActionId];
             if (!hasCmdAction) {
@@ -1758,10 +1762,8 @@ void DemoEffect_DrawJewel(Actor* thisx, PlayState* play2) {
             if (!frames) {}
 
             gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(play->state.gfxCtx, (u8)frames, (u8)frames, 16, 16));
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             Gfx_SetupDL_25Xlu(play->state.gfxCtx);
             func_8002ED80(&this->actor, play, 0);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1],
@@ -1805,24 +1807,21 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, PlayState* play) {
     Matrix_RotateY(0.0f, MTXMODE_APPLY);
     Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
     Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
     Matrix_Pop();
     Matrix_Push();
     Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY);
     Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
     Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
     Matrix_Pop();
     Matrix_Push();
     Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY);
     Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
     Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
     Matrix_Pop();
     CLOSE_DISPS(play->state.gfxCtx);
@@ -1839,12 +1838,10 @@ void DemoEffect_DrawFireBall(Actor* thisx, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPMatrix(POLY_XLU_DISP++, play->billboardMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-    gSPSegment(
-        POLY_XLU_DISP++, 8,
-        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32));
+    gSPSegment(POLY_XLU_DISP++, 8,
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32));
     gSPDisplayList(POLY_XLU_DISP++, gCreationFireBallDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -1884,8 +1881,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         Matrix_Push();
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessAuraDL);
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         func_8002EBCC(&this->actor, play, 0);
@@ -1900,8 +1896,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) {
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY);
         Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gGoldenGoddessBodyDL);
     }
 
@@ -1934,14 +1929,12 @@ void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play) {
             Matrix_Push();
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
             gSPDisplayList(POLY_XLU_DISP++, disp);
             Matrix_Pop();
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, disp);
         }
     }
@@ -1962,8 +1955,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
     Matrix_RotateZ(this->blueOrb.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     this->blueOrb.rotation += 0x01F4;
     gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
     CLOSE_DISPS(play->state.gfxCtx);
@@ -1981,8 +1973,7 @@ void DemoEffect_DrawLgtShower(Actor* thisx, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 255, 160, this->lgtShower.alpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 50, 200, 0, 255);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 8,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, (frames * 5) % 1024, 0, 256, 64, 1, (frames * 10) % 128,
                                 512 - ((frames * 50) % 512), 32, 16));
@@ -2003,11 +1994,10 @@ void DemoEffect_DrawLightRing(Actor* thisx, PlayState* play2) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 8,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128,
-                                1, 0, 0, 8, 1024));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128, 1, 0,
+                                0, 8, 1024));
     gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessLightRingDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -2030,8 +2020,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_AURORA - SFX_FLAG);
             Matrix_Push();
             Matrix_Scale(1.0f, 2.4f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 9,
                        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 256 - ((frames * 4) % 256) - 1, 64, 64, 1, 0,
                                         256 - ((frames * 2) % 256) - 1, 64, 32));
@@ -2045,8 +2034,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) {
 
         if (this->triforceSpot.triforceSpotOpacity != 0) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE - SFX_FLAG);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             if (this->triforceSpot.triforceSpotOpacity < 250) {
                 func_8002ED80(&this->actor, play, 0);
@@ -2055,8 +2043,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) {
                 Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
                 gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPSegment(POLY_XLU_DISP++, 8,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
+                gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
                 gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 160, this->triforceSpot.triforceSpotOpacity);
                 gDPSetEnvColor(POLY_XLU_DISP++, 170, 140, 0, 255);
                 gSPDisplayList(POLY_XLU_DISP++, gTriforceDL);
@@ -2067,8 +2054,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) {
                 Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
                 gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPSegment(POLY_OPA_DISP++, 8,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
+                gSPSegment(POLY_OPA_DISP++, 8, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
                 gDPSetPrimColor(POLY_OPA_DISP++, 128, 128, 255, 255, 160, 255);
                 gDPSetEnvColor(POLY_OPA_DISP++, 170, 140, 0, 255);
                 gSPDisplayList(POLY_OPA_DISP++, gTriforceDL);
@@ -2138,7 +2124,8 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) {
             }
             getItemEntry = Randomizer_GetItemFromKnownCheck(rc, rg);
             if (getItemEntry.getItemId != GI_NONE) {
-                if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(rc)) {
+                if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) &&
+                    Randomizer_IsCheckShuffled(rc)) {
                     getItemEntry = GetItemMystery();
                 }
                 this->getItem.drawId = getItemEntry.gid;
@@ -2167,8 +2154,8 @@ s32 DemoEffect_DrawTimewarpLimbs(PlayState* play, SkelAnimeCurve* skelCuve, s32
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 170, 255, 255, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
     gSPSegment(POLY_XLU_DISP++, 8,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256,
-                                64, 1, (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256, 64, 1,
+                                (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32));
     CLOSE_DISPS(play->state.gfxCtx);
 
     if (limbIndex == 0) {
@@ -2190,7 +2177,8 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, PlayState* play) {
     u8 effectType = (this->actor.params & 0x00FF);
 
     if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL ||
-        Flags_GetEnv(play, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4) {
+        Flags_GetEnv(play, 1) || gSaveContext.sceneSetupIndex >= 4 ||
+        gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4) {
         OPEN_DISPS(gfxCtx);
         POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 25);
         Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
diff --git a/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
index 333e279a4b..063db6844e 100644
--- a/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
+++ b/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
@@ -45,8 +45,8 @@ void DemoExt_Init(Actor* thisx, PlayState* play) {
 
 void DemoExt_PlayVortexSFX(DemoExt* this) {
     if (this->alphaTimer <= (kREG(35) + 40.0f) - 15.0f) {
-        Audio_PlaySoundGeneral(NA_SE_EV_FANTOM_WARP_L - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_FANTOM_WARP_L - SFX_FLAG, &this->actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
index 5623e861b7..8d9c917e6f 100644
--- a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
+++ b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
@@ -77,8 +77,7 @@ void func_80977EA8(PlayState* play, Gfx* dlist) {
 
     Gfx_SetupDL_25Opa(gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, dlist);
     gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
index e07d8f0be3..e5c80015aa 100644
--- a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+++ b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
@@ -192,8 +192,9 @@ void DemoGj_Explode(DemoGj* this, PlayState* play, Vec3f* initialPos, Vec3f* dir
             phi_s0 = 0x21;
         }
 
-        // SoH [Port] Changed from &gGanonsCastleRubbleAroundArenaDL[28] to gGanonRubbleDL as it seems this was an error in the original rom/decomp
-        // Other calls to EffectSsKakera_Spawn with OBJECT_GEFF use gGanonRubbleDL, so this change is to match that
+        // SoH [Port] Changed from &gGanonsCastleRubbleAroundArenaDL[28] to gGanonRubbleDL as it seems this was an error
+        // in the original rom/decomp Other calls to EffectSsKakera_Spawn with OBJECT_GEFF use gGanonRubbleDL, so this
+        // change is to match that
         EffectSsKakera_Spawn(play, &explosionPos, &velocity, initialPos, -200, phi_s0, 10, 10, 0,
                              Rand_ZeroOne() * 20.0f + 20.0f, 20, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30, -1,
                              OBJECT_GEFF, gGanonRubbleDL);
@@ -253,8 +254,7 @@ void DemoGj_InitCommon(DemoGj* this, PlayState* play, CollisionHeader* header) {
 }
 
 // TODO: find a better name
-s32 DemoGj_InitSetIndexes(DemoGj* this, PlayState* play, s32 updateMode, s32 drawConfig,
-                          CollisionHeader* header) {
+s32 DemoGj_InitSetIndexes(DemoGj* this, PlayState* play, s32 updateMode, s32 drawConfig, CollisionHeader* header) {
     if (!DemoGj_IsSceneInvalid()) {
         this->updateMode = updateMode;
         this->drawConfig = drawConfig;
@@ -273,8 +273,7 @@ void DemoGj_DrawCommon(DemoGj* this, PlayState* play, Gfx* displayList) {
 
         Gfx_SetupDL_25Opa(gfxCtx);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_OPA_DISP++, displayList);
         gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
@@ -1402,8 +1401,7 @@ void DemoGj_Init(Actor* thisx, PlayState* play) {
 
         default:
             // "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!"
-            osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST, play,
-                         this);
+            osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST, play, this);
             Actor_Kill(&this->dyna.actor);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
index e7138958e8..bac92747f8 100644
--- a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+++ b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
@@ -35,8 +35,7 @@ void DemoGt_Rumble(PlayState* play) {
     func_800AA000(0.0f, 0x32, 0xA, 5);
 }
 
-void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 scaleStep,
-                      s16 life) {
+void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 scaleStep, s16 life) {
     static Color_RGBA8 brownPrim = { 100, 80, 100, 0 };
     static Color_RGBA8 redEnv = { 255, 110, 96, 0 };
 
@@ -73,8 +72,7 @@ void func_8097D7D8(PlayState* play, Vec3f* pos, Vec3f* velOffset, f32 scale, s32
 }
 
 Actor* DemoGt_SpawnCloudRing(PlayState* play, Vec3f* pos, s16 params) {
-    return Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_DOUGHNUT, pos->x, pos->y, pos->z, 0, 0, 0,
-                       params, true);
+    return Actor_Spawn(&play->actorCtx, play, ACTOR_BG_SPOT16_DOUGHNUT, pos->x, pos->y, pos->z, 0, 0, 0, params, true);
 }
 
 void DemoGt_SpawnExplosionWithSound(PlayState* play, Vec3f* pos, f32 scale) {
@@ -207,9 +205,9 @@ void func_8097DF70(DemoGt* this, PlayState* play, Vec3f* spawnerPos) {
             phi_s0 = 33;
         }
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0,
-                             Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30,
-                             KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0, Rand_ZeroOne() * 30.0f + 30.0f,
+                             2, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30, KAKERA_COLOR_NONE, OBJECT_GEFF,
+                             gGanonRubbleDL);
         angle += 0x1555;
     }
 }
@@ -256,8 +254,8 @@ void func_8097E1D4(PlayState* play, Vec3f* arg1, s16 arg2) {
     }
 }
 
-void func_8097E454(PlayState* play, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale,
-                   s32 arg6, s32 arg7, s16 life) {
+void func_8097E454(PlayState* play, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, s32 arg6,
+                   s32 arg7, s16 life) {
     s32 pad2[3];
     s16 increment;
     s32 frames;
@@ -859,8 +857,7 @@ void DemoGt_Draw2(DemoGt* this, PlayState* play) {
     gSPSegment(POLY_OPA_DISP++, 0x08,
                Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk178[0],
                                         unk178[1], unk178[2], 128));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureInnerDL);
     gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
 
@@ -1169,8 +1166,7 @@ void DemoGt_Draw3(DemoGt* this, PlayState* play) {
     OPEN_DISPS(gfxCtx);
 
     Gfx_SetupDL_25Opa(gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL);
     gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
index d5881b2208..e7ba4364ed 100644
--- a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+++ b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
@@ -55,12 +55,12 @@ s32 DemoIk_CheckCue(PlayState* play, u16 action, s32 index) {
 }
 
 void DemoIk_SetMove(DemoIk* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void DemoIk_EndMove(DemoIk* this) {
-    this->skelAnime.moveFlags &= ~1;
+    this->skelAnime.movementFlags &= ~1;
 }
 
 f32 DemoIk_GetCurFrame(DemoIk* this) {
@@ -94,20 +94,20 @@ void DemoIk_Type1PlaySound(DemoIk* this) {
     switch (this->actor.params) {
         case 0:
             if (Animation_OnFrame(&this->skelAnime, 5.0f)) {
-                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND1_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND1_DEMO, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             break;
         case 1:
             if (Animation_OnFrame(&this->skelAnime, 10.0f)) {
-                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND3_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND3_DEMO, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             break;
         case 2:
             if (Animation_OnFrame(&this->skelAnime, 9.0f)) {
-                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND2_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND2_DEMO, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             break;
     }
@@ -267,13 +267,11 @@ void DemoIk_Type1PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
     if (limbIndex == 1) {
         switch (this->actor.params) {
             case 0:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
                 break;
             case 2:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
                 break;
         }
@@ -328,8 +326,8 @@ void DemoIk_Type2Init(DemoIk* this, PlayState* play) {
 
 void DemoIk_Type2PlaySoundOnFrame(DemoIk* this, f32 frame) {
     if (Animation_OnFrame(&this->skelAnime, frame)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO, &this->actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -406,8 +404,7 @@ void DemoIk_Type2Action2(DemoIk* this, PlayState* play) {
     func_80984048(this, play);
 }
 
-s32 DemoIk_Type2OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx) {
+s32 DemoIk_Type2OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     DemoIk* this = (DemoIk*)thisx;
 
     if ((limbIndex == 1) && (DemoIk_GetCurFrame(this) < 30.0f)) {
@@ -425,23 +422,19 @@ void DemoIk_Type2PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
     if (limbIndex == 1 && (frame >= 30.0f)) {
         switch (this->actor.params) {
             case 3:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017028);
                 break;
             case 4:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017170);
                 break;
             case 5:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
                 break;
             default:
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
                 break;
         }
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 0b234a6304..0d156ec7c0 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -309,8 +309,7 @@ void func_80985358(DemoIm* this, PlayState* play) {
     f32 posY = this->actor.world.pos.y;
     f32 posZ = this->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0,
-                       WARP_SAGES);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES);
 }
 
 void func_809853B4(DemoIm* this, PlayState* play) {
@@ -319,8 +318,7 @@ void func_809853B4(DemoIm* this, PlayState* play) {
     f32 playerY = player->actor.world.pos.y + 80.0f;
     f32 playerZ = player->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0,
-                       0, 0, 0xD);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0, 0, 0, 0xD);
     if (GameInteractor_Should(VB_GIVE_ITEM_SHADOW_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_SHADOW);
     }
@@ -540,8 +538,8 @@ void DemoIm_DrawTranslucent(DemoIm* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
     gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
 
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
-                                       NULL, NULL, NULL, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL,
+                                       NULL, NULL, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -730,7 +728,8 @@ void func_80986570(DemoIm* this, PlayState* play) {
         u32 sfxId = SFX_FLAG;
 
         sfxId += SurfaceType_GetSfx(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
-        Audio_PlaySoundGeneral(sfxId, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(sfxId, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -944,7 +943,8 @@ void func_80986D40(DemoIm* this, PlayState* play) {
     if (gSaveContext.sceneSetupIndex == 6) {
         this->action = 19;
         this->drawConfig = 1;
-    } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) && !IS_RANDO) { // SoH [Randomizer] Not sure why we're not killing impa here.
+    } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) &&
+               !IS_RANDO) { // SoH [Randomizer] Not sure why we're not killing impa here.
         Actor_Kill(&this->actor);
     } else if (!Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY)) {
         this->action = 23;
diff --git a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 6dc694303e..f4b0177096 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -237,9 +237,8 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) {
             this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f;
             this->unk_150[0].unk_18 = 0.0f;
             if (!Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_TOKI,
-                                   this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
-                                   0x0000);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_TOKI, this->actor.world.pos.x,
+                                   this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x0000);
             } else {
                 play->roomCtx.unk_74[1] = 0xFF;
                 Actor_Kill(&this->actor);
@@ -258,7 +257,8 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) {
             this->sparkleCounter = 0;
             this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f;
             if (this->actor.params == DEMOKANKYO_WARP_OUT) {
-                Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             break;
         case DEMOKANKYO_SPARKLES:
@@ -624,8 +624,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
             }
 
             Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 0x14);
             gSPDisplayList(POLY_XLU_DISP++, object_efc_star_field_DL_000080);
 
@@ -649,8 +648,7 @@ void DemoKankyo_DrawRock(Actor* thisx, PlayState* play) {
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -673,8 +671,8 @@ void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) {
         dy = Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 5.0f + 1200.0f;
         dz = (Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f);
 
-        Matrix_Translate(play->view.eye.x + dx, play->view.eye.y + dy + ((i - 12.0f) * 300.0f),
-                         play->view.eye.z + dz, MTXMODE_NEW);
+        Matrix_Translate(play->view.eye.x + dx, play->view.eye.y + dy + ((i - 12.0f) * 300.0f), play->view.eye.z + dz,
+                         MTXMODE_NEW);
         Matrix_Scale(125.0f, 60.0f, 125.0f, MTXMODE_APPLY);
 
         gDPPipeSync(POLY_XLU_DISP++);
@@ -682,8 +680,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255);
         gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
         gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex));
 
         Gfx_SetupDL_61Xlu(play->state.gfxCtx);
@@ -705,12 +702,10 @@ void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007440);
     Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007578);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -725,10 +720,8 @@ void DemoKankyo_DrawLightPlane(Actor* thisx, PlayState* play) {
     if (play->csCtx.state == CS_STATE_IDLE || gSaveContext.sceneSetupIndex >= 4) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-        gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TexScroll(play->state.gfxCtx, 0, play->state.frames & 0x7F, 64, 32));
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(play->state.gfxCtx, 0, play->state.frames & 0x7F, 64, 32));
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_008390);
     }
 
@@ -819,7 +812,8 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
                         this->unk_150[i].unk_22++;
                     }
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                    Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &gSfxDefaultPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                            &gSfxDefaultReverb);
                     if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpInCameraPoints, &this->unk_150[i].unk_20,
                                       &this->unk_150[i].unk_1C) != 0) {
@@ -876,7 +870,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
         translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z;
 
         if (this->unk_150[i].unk_22 < 2) {
-            disp = (uintptr_t)gEffFlash1DL; //This is probably fake
+            disp = (uintptr_t)gEffFlash1DL; // This is probably fake
             if (linkAge != 0) {
                 Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW);
             } else {
@@ -899,8 +893,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
             Gfx_SetupDL_25Xlu(play->state.gfxCtx);
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, disp);
             this->unk_150[i].unk_24 += 0x190;
         }
@@ -1005,8 +998,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, PlayState* play) {
             Gfx_SetupDL_25Xlu(play->state.gfxCtx);
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
             this->unk_150[i].unk_24 += 0x190;
         }
diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index 411f294d43..3d50bf3303 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -7,6 +7,7 @@
 #include "z_demo_kekkai.h"
 #include "objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "scenes/dungeons/ganontika/ganontika_scene.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
@@ -67,12 +68,9 @@ static u8 sEnergyColors[] = {
 
 s32 DemoKekkai_CheckEventFlag(s32 params) {
     static s32 eventFlags[] = {
-        EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER,
-        EVENTCHKINF_COMPLETED_WATER_TRIAL,
-        EVENTCHKINF_COMPLETED_LIGHT_TRIAL,
-        EVENTCHKINF_COMPLETED_FIRE_TRIAL,
-        EVENTCHKINF_COMPLETED_SHADOW_TRIAL,
-        EVENTCHKINF_COMPLETED_SPIRIT_TRIAL,
+        EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER, EVENTCHKINF_COMPLETED_WATER_TRIAL,
+        EVENTCHKINF_COMPLETED_LIGHT_TRIAL,          EVENTCHKINF_COMPLETED_FIRE_TRIAL,
+        EVENTCHKINF_COMPLETED_SHADOW_TRIAL,         EVENTCHKINF_COMPLETED_SPIRIT_TRIAL,
         EVENTCHKINF_COMPLETED_FOREST_TRIAL,
     };
 
@@ -260,13 +258,15 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) {
     CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base);
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base);
     if (this->collider2.base.acFlags & AC_HIT) {
-        Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
-        // "I got it"
-        LOG_STRING("当ったよ");
-        this->actor.update = DemoKekkai_TrialBarrierDispel;
-        this->timer = 0;
-        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]);
-        gSaveContext.cutsceneTrigger = 1;
+        if (GameInteractor_Should(VB_PLAY_DISPEL_BARRIER_CS, true, this)) {
+            Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
+            // "I got it"
+            LOG_STRING("当ったよ");
+            this->actor.update = DemoKekkai_TrialBarrierDispel;
+            this->timer = 0;
+            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]);
+            gSaveContext.cutsceneTrigger = 1;
+        }
     }
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider2.base);
     func_8002F974(&this->actor, NA_SE_EV_TOWER_ENERGY - SFX_FLAG);
@@ -300,15 +300,13 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play2) {
         Matrix_Translate(0.0f, 1200.0f, 0.0f, MTXMODE_APPLY);
         Matrix_Scale(this->orbScale, this->orbScale, this->orbScale, MTXMODE_APPLY);
         Matrix_Translate(0.0f, -1200.0f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x09,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5,
                                     frames * -10, 0x20, 0x20));
         gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL);
         Matrix_Pop();
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 50, 0, 100, 255);
         gSPSegment(POLY_XLU_DISP++, 0x0A,
@@ -335,12 +333,11 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, PlayState* play) {
     scroll = (s32)this->barrierScroll & 0xFFFF;
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 255, 170, 255, 255);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 2, scroll * -4, 0x20, 0x40, 1, scroll * 2,
-                                scroll * -4, 0x20, 0x40));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 2, scroll * -4, 0x20, 0x40, 1, scroll * 2, scroll * -4,
+                                0x20, 0x40));
     gSPDisplayList(POLY_XLU_DISP++, gTowerBarrierDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
index 4e4a06c181..a8df145c2f 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
+++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h
@@ -6,7 +6,7 @@
 
 struct DemoKekkai;
 
-typedef void (*DemoKekkaiUpdateFunc)(struct DemoKekkai* this, PlayState* play);
+typedef void (*DemoKekkaiUpdateFunc)(struct DemoKekkai* thisx, PlayState* play);
 
 typedef struct DemoKekkai {
     /* 0x0000 */ Actor actor;
diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 5b24dd4160..1bc15698e6 100644
--- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -229,8 +229,7 @@ void func_8098E86C(DemoSa* this, PlayState* play) {
     f32 posY = world->y;
     f32 posZ = world->z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0,
-                       WARP_SAGES);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES);
 }
 
 void func_8098E8C8(DemoSa* this, PlayState* play) {
@@ -239,8 +238,7 @@ void func_8098E8C8(DemoSa* this, PlayState* play) {
     f32 posY = player->actor.world.pos.y + 80.0f;
     f32 posZ = player->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
-                       0xB);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0xB);
     if (GameInteractor_Should(VB_GIVE_ITEM_FOREST_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_FOREST);
     }
@@ -479,8 +477,8 @@ void DemoSa_DrawXlu(DemoSa* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
     gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280);
 
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
-                                       NULL, NULL, NULL, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL,
+                                       NULL, NULL, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -615,8 +613,8 @@ void func_8098F83C(DemoSa* this, PlayState* play) {
     Vec3f* thisPos = &this->actor.world.pos;
 
     SkelAnime_InitFlex(play, &this->skelAnime, &gSariaSkel, &gSariaWaitOnBridgeAnim, NULL, NULL, 0);
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z,
-                       0, 0, 0, FAIRY_KOKIRI);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, 0, 0, 0,
+                       FAIRY_KOKIRI);
     this->action = 16;
     this->drawConfig = 0;
     this->actor.shape.shadowAlpha = 0;
diff --git a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
index 41f6c1a0e5..b39ba07387 100644
--- a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+++ b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
@@ -106,17 +106,16 @@ void DemoShd_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, D_809932D0);
 
     if (this->unk_14C & 1) {
-        gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF),
-                                                         16, 256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32));
+        gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16,
+                                                         256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32));
         gSPDisplayList(POLY_XLU_DISP++, D_80993390);
     } else if (this->unk_14C & 2) {
-        gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF),
-                                                         16, 256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32));
+        gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16,
+                                                         256, 1, 0, 255 - ((unk_14E * 5) & 255), 32, 32));
         gSPDisplayList(POLY_XLU_DISP++, D_809934B8);
     }
 
diff --git a/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
index d4388e066d..07510e6d35 100644
--- a/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
@@ -119,8 +119,8 @@ void func_80993848(DemoTreLgt* this, PlayState* play) {
     }
     if ((currentFrame > 30.0f) && !(this->status & 1)) {
         this->status |= 1;
-        Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_FLASH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_FLASH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     if (SkelCurve_Update(play, &this->skelCurve)) {
         Actor_Kill(&this->actor);
diff --git a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
index 01ff92184d..7dde93e1cd 100644
--- a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+++ b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
@@ -120,7 +120,8 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) {
     if (openGrotto) {
         this->actor.params &= ~0x0300;
         DoorAna_SetupAction(this, DoorAna_WaitOpen);
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     func_8002F5F0(&this->actor, play);
 }
@@ -132,8 +133,8 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play) {
 
     player = GET_PLAYER(play);
     if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f)) {
-        if ((this->actor.targetMode != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (player->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED) &&
-            (player->av1.actionVar1 == 0)) {
+        if ((this->actor.targetMode != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
+            (player->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED) && (player->av1.actionVar1 == 0)) {
             destinationIdx = ((this->actor.params >> 0xC) & 7) - 1;
             Play_SetupRespawnPoint(play, RESPAWN_MODE_RETURN, 0x4FF);
             gSaveContext.respawn[RESPAWN_MODE_RETURN].pos.y = this->actor.world.pos.y;
@@ -189,8 +190,7 @@ void DoorAna_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gGrottoDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
index 99dd5e43f1..34796f980a 100644
--- a/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
+++ b/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
@@ -148,8 +148,7 @@ void DoorGerudo_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGerudoCellDoorDL);
 
     if (this->unk_166 != 0) {
diff --git a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
index e3ba837b22..15bf27f439 100644
--- a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@@ -214,15 +214,15 @@ void DoorKiller_SpawnRubble(Actor* thisx, PlayState* play) {
     Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x, thisx->world.pos.y + 9.0f,
                 thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y, thisx->shape.rot.z,
                 DOOR_KILLER_RUBBLE_PIECE_1, true);
-    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x + 7.88f,
-                thisx->world.pos.y + 39.8f, thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y,
-                thisx->shape.rot.z, DOOR_KILLER_RUBBLE_PIECE_2, true);
-    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x - 15.86f,
-                thisx->world.pos.y + 61.98f, thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y,
-                thisx->shape.rot.z, DOOR_KILLER_RUBBLE_PIECE_3, true);
-    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x + 3.72f,
-                thisx->world.pos.y + 85.1f, thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y,
-                thisx->shape.rot.z, DOOR_KILLER_RUBBLE_PIECE_4, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x + 7.88f, thisx->world.pos.y + 39.8f,
+                thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y, thisx->shape.rot.z,
+                DOOR_KILLER_RUBBLE_PIECE_2, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x - 15.86f, thisx->world.pos.y + 61.98f,
+                thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y, thisx->shape.rot.z,
+                DOOR_KILLER_RUBBLE_PIECE_3, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_KILLER, thisx->world.pos.x + 3.72f, thisx->world.pos.y + 85.1f,
+                thisx->world.pos.z, thisx->shape.rot.x, thisx->shape.rot.y, thisx->shape.rot.z,
+                DOOR_KILLER_RUBBLE_PIECE_4, true);
 }
 
 /**
diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 222b535c57..1a491064af 100644
--- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -136,12 +136,24 @@ typedef struct {
 } ShutterSceneInfo;
 
 static ShutterSceneInfo sSceneInfo[] = {
-    { SCENE_DEKU_TREE, 0x02 },            { SCENE_DODONGOS_CAVERN, 0x03 },    { SCENE_DODONGOS_CAVERN_BOSS, 0x03 },
-    { SCENE_JABU_JABU, 0x04 },            { SCENE_FOREST_TEMPLE, 0x05 },      { SCENE_FIRE_TEMPLE, 0x08 },
-    { SCENE_GANONS_TOWER, 0x09 },         { SCENE_GANONDORF_BOSS, 0x09 },     { SCENE_SPIRIT_TEMPLE, 0x0A },
-    { SCENE_SPIRIT_TEMPLE_BOSS, 0x0A },   { SCENE_WATER_TEMPLE, 0x0B },       { SCENE_SHADOW_TEMPLE, 0x0C },
-    { SCENE_BOTTOM_OF_THE_WELL, 0x0C },   { SCENE_ICE_CAVERN, 0x0D },         { SCENE_GERUDO_TRAINING_GROUND, 0x0E },
-    { SCENE_INSIDE_GANONS_CASTLE, 0x0F }, { SCENE_ROYAL_FAMILYS_TOMB, 0x10 }, { -1, 0x07 },
+    { SCENE_DEKU_TREE, 0x02 },
+    { SCENE_DODONGOS_CAVERN, 0x03 },
+    { SCENE_DODONGOS_CAVERN_BOSS, 0x03 },
+    { SCENE_JABU_JABU, 0x04 },
+    { SCENE_FOREST_TEMPLE, 0x05 },
+    { SCENE_FIRE_TEMPLE, 0x08 },
+    { SCENE_GANONS_TOWER, 0x09 },
+    { SCENE_GANONDORF_BOSS, 0x09 },
+    { SCENE_SPIRIT_TEMPLE, 0x0A },
+    { SCENE_SPIRIT_TEMPLE_BOSS, 0x0A },
+    { SCENE_WATER_TEMPLE, 0x0B },
+    { SCENE_SHADOW_TEMPLE, 0x0C },
+    { SCENE_BOTTOM_OF_THE_WELL, 0x0C },
+    { SCENE_ICE_CAVERN, 0x0D },
+    { SCENE_GERUDO_TRAINING_GROUND, 0x0E },
+    { SCENE_INSIDE_GANONS_CASTLE, 0x0F },
+    { SCENE_ROYAL_FAMILYS_TOMB, 0x10 },
+    { -1, 0x07 },
 };
 
 typedef struct {
@@ -166,7 +178,7 @@ static Gfx* sJabuDoorDLists[] = {
 };
 
 static void* D_809982D4[] = {
-    gBossDoorDefaultTex, gBossDoorFireTex, gBossDoorWaterTex, gBossDoorShadowTex,
+    gBossDoorDefaultTex,      gBossDoorFireTex,   gBossDoorWaterTex,  gBossDoorShadowTex,
     gBossDoorGanonsCastleTex, gBossDoorForestTex, gBossDoorSpiritTex,
 };
 
@@ -420,7 +432,8 @@ void func_80996C60(DoorShutter* this, PlayState* play) {
         DoorShutter_SetupAction(this, func_80997004);
         this->unk_16C = sp38;
         this->unk_170 = 0.0f;
-        Camera_ChangeDoorCam(play->cameraPtrs[MAIN_CAM], &this->dyna.actor, player->cv.slidingDoorBgCamIndex, 0.0f, 12, sp34, 10);
+        Camera_ChangeDoorCam(play->cameraPtrs[MAIN_CAM], &this->dyna.actor, player->cv.slidingDoorBgCamIndex, 0.0f, 12,
+                             sp34, 10);
     }
 }
 
@@ -573,8 +586,8 @@ void func_809973E8(DoorShutter* this, PlayState* play) {
     if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, this->dyna.actor.velocity.y)) {
         if (this->dyna.actor.velocity.y > 20.0f) {
             this->dyna.actor.floorHeight = this->dyna.actor.home.pos.y;
-            Actor_SpawnFloorDustRing(play, &this->dyna.actor, &this->dyna.actor.world.pos, 45.0f, 10, 8.0f, 500,
-                                     10, false);
+            Actor_SpawnFloorDustRing(play, &this->dyna.actor, &this->dyna.actor.world.pos, 45.0f, 10, 8.0f, 500, 10,
+                                     false);
         }
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
         quakeId = Quake_Add(Play_GetCamera(play, 0), 3);
@@ -610,8 +623,8 @@ void func_809975C0(DoorShutter* this, PlayState* play) {
             this->unk_164 = 10;
             Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
             func_8099803C(play, 2, 10, parent->subCameraId);
-            Actor_SpawnFloorDustRing(play, &this->dyna.actor, &this->dyna.actor.world.pos, 70.0f, 20, 8.0f, 500,
-                                     10, true);
+            Actor_SpawnFloorDustRing(play, &this->dyna.actor, &this->dyna.actor.world.pos, 70.0f, 20, 8.0f, 500, 10,
+                                     true);
         }
     }
 }
@@ -642,7 +655,9 @@ void DoorShutter_Update(Actor* thisx, PlayState* play) {
     DoorShutter* this = (DoorShutter*)thisx;
     Player* player = GET_PLAYER(play);
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_ITEM_CS)) || (this->actionFunc == DoorShutter_SetupType)) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_ITEM_CS)) ||
+        (this->actionFunc == DoorShutter_SetupType)) {
         this->actionFunc(this, play);
     }
 }
@@ -666,8 +681,7 @@ Gfx* func_80997838(PlayState* play, DoorShutter* this, Gfx* p) {
         if (this->unk_166 != 100) {
             Matrix_Scale(1.0f, yScale, 1.0f, MTXMODE_APPLY);
         }
-        gSPMatrix(p++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(p++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(p++, sJabuDoorDLists[i]);
         angle -= M_PI / 4;
         Matrix_Put(&mtx);
@@ -731,8 +745,7 @@ void DoorShutter_Draw(Actor* thisx, PlayState* play) {
             }
         } else {
             if (sp70->b != NULL) {
-                TransitionActorEntry* transitionEntry =
-                    &play->transiActorCtx.list[(u16)this->dyna.actor.params >> 0xA];
+                TransitionActorEntry* transitionEntry = &play->transiActorCtx.list[(u16)this->dyna.actor.params >> 0xA];
 
                 if (play->roomCtx.prevRoom.num >= 0 ||
                     transitionEntry->sides[0].room == transitionEntry->sides[1].room) {
@@ -747,8 +760,7 @@ void DoorShutter_Draw(Actor* thisx, PlayState* play) {
             } else if (this->doorType == SHUTTER_BOSS) {
                 gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809982D4[this->unk_168]));
             }
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, sp70->a);
             if (this->unk_170 != 0.0f && sp70->b != NULL) {
                 Matrix_Translate(0, sp70->c * (1.0f - this->unk_170), sp70->translateZ, MTXMODE_APPLY);
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index e767135e3d..a907647176 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -67,7 +67,6 @@ void DoorWarp1_Init(Actor* thisx, PlayState* play) {
     DoorWarp1* this = (DoorWarp1*)thisx;
     PlayState* play2 = play;
 
-
     this->unk_1B8 = 0;
     this->unk_1B4 = 0.0f;
     Actor_ProcessInitChain(&this->actor, sInitChain);
@@ -75,7 +74,7 @@ void DoorWarp1_Init(Actor* thisx, PlayState* play) {
 
     if (this->actor.params != WARP_SAGES && this->actor.params != WARP_BLUE_CRYSTAL &&
         this->actor.params != WARP_YELLOW && this->actor.params != WARP_DESTINATION) {
-        
+
         Lights_PointNoGlowSetInfo(&this->upperLightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
                                   this->actor.world.pos.z, 0, 0, 0, 0);
         this->upperLight = LightContext_InsertLight(play2, &play2->lightCtx, &this->upperLightInfo);
@@ -97,8 +96,7 @@ void DoorWarp1_Destroy(Actor* thisx, PlayState* play) {
     LightContext_RemoveLight(play, &play->lightCtx, this->lowerLight);
 
     for (i = 0; i < 3; i++) {
-        play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] =
-            0;
+        play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] = 0;
     }
 
     switch (this->actor.params) {
@@ -179,11 +177,13 @@ void DoorWarp1_SetupWarp(DoorWarp1* this, PlayState* play) {
             DoorWarp1_SetupAction(this, DoorWarp1_AwaitClearFlag);
             break;
         case WARP_DESTINATION:
-            if ((!(gSaveContext.entranceIndex == ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP ||  // sacred forest meadow
-                   gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP ||  // death mountain crater
-                   gSaveContext.entranceIndex == ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP ||  // lake hylia
-                   gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP ||  // desert colossus
-                   gSaveContext.entranceIndex == ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP) && // graveyard
+            if ((!(gSaveContext.entranceIndex ==
+                       ENTR_SACRED_FOREST_MEADOW_FOREST_TEMPLE_BLUE_WARP || // sacred forest meadow
+                   gSaveContext.entranceIndex ==
+                       ENTR_DEATH_MOUNTAIN_CRATER_FIRE_TEMPLE_BLUE_WARP ||                 // death mountain crater
+                   gSaveContext.entranceIndex == ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP || // lake hylia
+                   gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_SPIRIT_TEMPLE_BLUE_WARP || // desert colossus
+                   gSaveContext.entranceIndex == ENTR_GRAVEYARD_SHADOW_TEMPLE_BLUE_WARP) &&      // graveyard
                  gSaveContext.sceneSetupIndex < 4) ||
                 (GET_PLAYER(play)->actor.params & 0xF00) != 0x200) {
                 Actor_Kill(&this->actor);
@@ -250,8 +250,7 @@ void DoorWarp1_SetupBlueCrystal(DoorWarp1* this, PlayState* play) {
     this->actor.shape.yOffset = 800.0f;
 
     for (i = 0; i < 3; i++) {
-        play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] =
-            -255;
+        play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] = -255;
     }
 
     if (!IS_BOSS_RUSH) {
@@ -331,7 +330,7 @@ void func_80999214(DoorWarp1* this, PlayState* play) {
     } else {
         darkness = 0.0f;
     }
-    
+
     for (i = 0; i < 3; i++) {
         play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] =
             -255.0f * darkness;
@@ -497,8 +496,8 @@ void DoorWarp1_ChildWarpIdle(DoorWarp1* this, PlayState* play) {
     if (DoorWarp1_PlayerInRange(this, play)) {
         player = GET_PLAYER(play);
 
-        Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         OnePointCutscene_Init(play, 0x25E7, 999, &this->actor, MAIN_CAM);
         Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
 
@@ -526,10 +525,13 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
     this->warpTimer++;
 
     if (sWarpTimerTarget < this->warpTimer && gSaveContext.nextCutsceneIndex == 0xFFEF) {
-        osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START);
+        osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger,
+                     TRANS_TRIGGER_START);
 
         if (play->sceneNum == SCENE_DODONGOS_CAVERN_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP), EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS,
+                                      !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP),
+                                      EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_GORON_RUBY)) {
                     Item_Give(play, ITEM_GORON_RUBY);
@@ -541,7 +543,9 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_DEKU_TREE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD), EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS,
+                                      !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD),
+                                      EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD)) {
                 Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_KOKIRI_EMERALD_DEKU_TREE_DEAD);
                 Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_KOKIRI_EMERALD)) {
@@ -616,7 +620,8 @@ void func_80999EE0(DoorWarp1* this, PlayState* play) {
 
 void func_80999FE4(DoorWarp1* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
-        Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         OnePointCutscene_Init(play, 0x25E9, 999, &this->actor, MAIN_CAM);
         Play_CopyCamera(play, -1, sRutoWarpSubCamId);
         Play_ChangeCameraStatus(play, sRutoWarpSubCamId, CAM_STAT_WAIT);
@@ -712,7 +717,8 @@ void func_8099A508(DoorWarp1* this, PlayState* play) {
         this->unk_1B2--;
         return;
     }
-    Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     Animation_ChangeImpl(&this->skelAnime, &gWarpCrystalAnim, 1.0f, Animation_GetLastFrame(&gWarpCrystalAnim),
                          Animation_GetLastFrame(&gWarpCrystalAnim), ANIMMODE_ONCE, 40.0f, 1);
 
@@ -751,7 +757,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
 
     if (this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF) {
         if (play->sceneNum == SCENE_FOREST_TEMPLE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS,
+                                      !Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP),
+                                      EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FOREST)) {
                     Item_Give(play, ITEM_MEDALLION_FOREST);
@@ -768,7 +776,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_FIRE_TEMPLE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS,
+                                      !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP),
+                                      EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_FIRE)) {
                     Item_Give(play, ITEM_MEDALLION_FIRE);
@@ -784,7 +794,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_WATER_TEMPLE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP), EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS,
+                                      !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP),
+                                      EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) {
                 Flags_SetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_WATER)) {
                     Item_Give(play, ITEM_MEDALLION_WATER);
@@ -801,7 +813,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SPIRIT_TEMPLE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT), RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT),
+                                      RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SPIRIT)) {
                     Item_Give(play, ITEM_MEDALLION_SPIRIT);
@@ -818,7 +831,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneNum == SCENE_SHADOW_TEMPLE_BOSS) {
-            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW), RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)) {
+            if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, !CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW),
+                                      RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE)) {
                 Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE);
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_MEDALLION_SHADOW)) {
                     Item_Give(play, ITEM_MEDALLION_SHADOW);
@@ -878,8 +892,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
         s16 i;
 
         for (i = 0; i < 3; i++) {
-            play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] =
-                play->envCtx.adjLight1Color[i] = -255.0f * temp_f0_2;
+            play->envCtx.adjAmbientColor[i] = play->envCtx.adjFogColor[i] = play->envCtx.adjLight1Color[i] =
+                -255.0f * temp_f0_2;
         }
 
         play->envCtx.adjFogNear = -500.0f * temp_f0_2;
@@ -945,8 +959,7 @@ void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0xFF, 0xFF, 200, 255, 255, (u8)this->crystalAlpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, (u8)this->crystalAlpha);
 
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, NULL, NULL,
-                                   &this->actor, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, NULL, NULL, &this->actor, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 
@@ -969,8 +982,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)this->crystalAlpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 150, 0, 100, (u8)this->crystalAlpha);
 
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, NULL, NULL,
-                                   &this->actor, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, NULL, NULL, &this->actor, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 
@@ -1065,8 +1077,8 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, PlayState* play) {
         spEC *= 2;
 
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, spEC & 0xFF, -((s16)this->unk_19C & 511), 0x100, 0x100,
-                                    1, spEC & 0xFF, -((s16)this->unk_19C & 511), 0x100, 0x100));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, spEC & 0xFF, -((s16)this->unk_19C & 511), 0x100, 0x100, 1,
+                                    spEC & 0xFF, -((s16)this->unk_19C & 511), 0x100, 0x100));
 
         Matrix_Translate(0.0f, this->unk_198 * 60.0f, 0.0f, MTXMODE_APPLY);
 
diff --git a/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
index d72388e0f4..1f562f92cc 100644
--- a/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
+++ b/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
@@ -134,8 +134,7 @@ void EfcErupc_Draw(Actor* thisx, PlayState* play) {
 
     Matrix_Push();
     Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (play->csCtx.state != 0) {
         if ((play->csCtx.npcActions[1] != 0) && (play->csCtx.npcActions[1]->action == 2)) {
@@ -144,8 +143,7 @@ void EfcErupc_Draw(Actor* thisx, PlayState* play) {
     }
     Matrix_Pop();
     Matrix_Scale(3.4f, 3.4f, 3.4f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     if (play->csCtx.state != 0) {
         CsCmdActorCue* csActorAction = play->csCtx.npcActions[2];
         if (csActorAction != 0) {
@@ -180,8 +178,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, PlayState* play) {
             Matrix_Translate(particles->pos.x, particles->pos.y, particles->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(particles->scale, particles->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8);
         }
 
diff --git a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index 3b68964774..b092a57d76 100644
--- a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -296,8 +296,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, PlayState* play2) {
             Matrix_Scale(this->scalingFactor, this->scalingFactor, this->scalingFactor, MTXMODE_APPLY);
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL));
         }
 
@@ -359,8 +358,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, PlayState* play2) {
 
             Matrix_ReplaceRotation(&play->billboardMtxF);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL));
         }
 
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index 7c7a2325eb..86dc36a7f5 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -177,8 +177,7 @@ void ElfMsg_Update(Actor* thisx, PlayState* play) {
 #include "overlays/ovl_Elf_Msg/ovl_Elf_Msg.h"
 #endif
 
-void ElfMsg_Draw(Actor* thisx, PlayState* play) 
-{
+void ElfMsg_Draw(Actor* thisx, PlayState* play) {
 #ifdef ZELDA_DEBUG
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -193,8 +192,7 @@ void ElfMsg_Draw(Actor* thisx, PlayState* play)
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA);
     }
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, D_809AD278);
 
     if (thisx->params & 0x4000) {
@@ -204,5 +202,5 @@ void ElfMsg_Draw(Actor* thisx, PlayState* play)
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
-    #endif
+#endif
 }
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
index 9e3745622c..8446f3b95d 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
@@ -83,7 +83,8 @@ void ElfMsg2_Init(Actor* thisx, PlayState* play) {
             ElfMsg2_SetupAction(this, ElfMsg2_WaitUntilActivated);
         } else {
             ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextRead);
-            this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP; // Make actor targetable and Navi-checkable
+            this->actor.flags |=
+                ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP; // Make actor targetable and Navi-checkable
             this->actor.textId = ElfMsg2_GetMessageId(this);
         }
         this->actor.shape.rot.x = this->actor.shape.rot.y = this->actor.shape.rot.z = 0;
@@ -135,7 +136,8 @@ void ElfMsg2_WaitUntilActivated(ElfMsg2* this, PlayState* play) {
     if ((this->actor.world.rot.y >= 0x41) && (this->actor.world.rot.y <= 0x80) &&
         (Flags_GetSwitch(play, (this->actor.world.rot.y - 0x41)))) {
         ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextRead);
-        this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP; // Make actor targetable and Navi-checkable
+        this->actor.flags |=
+            ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP; // Make actor targetable and Navi-checkable
         this->actor.textId = ElfMsg2_GetMessageId(this);
     }
 }
@@ -162,11 +164,10 @@ void ElfMsg2_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, D_809ADC38);
     gSPDisplayList(POLY_XLU_DISP++, sCubeDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
-    #endif
+#endif
 }
diff --git a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c
index 8ac02d7abf..272d5df0cc 100644
--- a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c
+++ b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c
@@ -10,7 +10,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
 void EnAm_Init(Actor* thisx, PlayState* play);
 void EnAm_Destroy(Actor* thisx, PlayState* play);
@@ -213,8 +215,7 @@ void EnAm_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
     ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 48.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gArmosSkel, &gArmosRicochetAnim, this->jointTable, this->morphTable,
-                   14);
+    SkelAnime_Init(play, &this->skelAnime, &gArmosSkel, &gArmosRicochetAnim, this->jointTable, this->morphTable, 14);
     Actor_SetScale(&this->dyna.actor, 0.01f);
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
     Collider_InitCylinder(play, &this->hurtCollider);
@@ -690,23 +691,29 @@ void EnAm_Statue(EnAm* this, PlayState* play) {
         }
 
         if ((this->dyna.unk_150 == 0.0f) || (this->unk_258 == 0) || !(this->dyna.actor.bgCheckFlags & 1) ||
-            !func_800435D8(play, &this->dyna, 0x14,
-                           (Math_SinS(this->unk_258) * (this->dyna.unk_150 * 0.5f)) + 40.0f, 0xA) ||
+            !func_800435D8(play, &this->dyna, 0x14, (Math_SinS(this->unk_258) * (this->dyna.unk_150 * 0.5f)) + 40.0f,
+                           0xA) ||
             ((this->hurtCollider.base.ocFlags1 & OC1_HIT) && (ABS(moveDir) <= 0x2000))) {
 
             this->unk_258 = 0;
-            player->stateFlags2 &= ~(PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_MOVING_DYNAPOLY | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY);
+            player->stateFlags2 &= ~(PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_MOVING_DYNAPOLY |
+                                     PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY);
             player->actor.speedXZ = 0.0f;
             this->dyna.unk_150 = this->dyna.unk_154 = 0.0f;
         }
 
         this->dyna.actor.world.rot.y = this->dyna.unk_158;
-        this->dyna.actor.speedXZ = Math_SinS(this->unk_258 * 8 / (8 - blockSpeed)) * (this->dyna.unk_150 * 0.5f) +
-            (blockSpeed == 5 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.25681 : 
-                (blockSpeed == 4 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.18305 :
-                    (blockSpeed == 3 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.14222 :
-                        (blockSpeed == 2 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.11625 :
-                            (blockSpeed == 1 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.09828 : 0)))));
+        this->dyna.actor.speedXZ =
+            Math_SinS(this->unk_258 * 8 / (8 - blockSpeed)) * (this->dyna.unk_150 * 0.5f) +
+            (blockSpeed == 5
+                 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.25681
+                 : (blockSpeed == 4
+                        ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.18305
+                        : (blockSpeed == 3
+                               ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.14222
+                               : (blockSpeed == 2
+                                      ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.11625
+                                      : (blockSpeed == 1 ? blockSpeed * (this->dyna.unk_150 * 0.5f) * 0.09828 : 0)))));
     }
 
     if (this->dyna.actor.bgCheckFlags & 2) {
@@ -868,9 +875,9 @@ void EnAm_Update(Actor* thisx, PlayState* play) {
                 dustPosScale = play->gameplayFrames * 10;
 
                 EnAm_SpawnEffects(this, play);
-                bomb =
-                    (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->dyna.actor.world.pos.x,
-                                        this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, 0, 2, BOMB_BODY, true);
+                bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->dyna.actor.world.pos.x,
+                                           this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, 0, 2,
+                                           BOMB_BODY, true);
                 if (bomb != NULL) {
                     bomb->timer = 0;
                 }
@@ -886,7 +893,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) {
                     func_8002836C(play, &dustPos, &zeroVec, &zeroVec, &dustPrimColor, &dustEnvColor, 200, 45, 12);
                     dustPosScale += 60.0f;
                 }
-                
+
                 GameInteractor_ExecuteOnEnemyDefeat(thisx);
 
                 Actor_Kill(&this->dyna.actor);
@@ -962,8 +969,7 @@ void EnAm_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->textureBlend);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnAm_PostLimbDraw,
-                              this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnAm_PostLimbDraw, this);
 
     if (this->iceTimer != 0) {
         this->dyna.actor.colorFilterTimer++;
@@ -978,8 +984,7 @@ void EnAm_Draw(Actor* thisx, PlayState* play) {
             sp68.y = this->dyna.actor.world.pos.y + sIcePosOffsets[index].y;
             sp68.z = this->dyna.actor.world.pos.z + sIcePosOffsets[index].z;
 
-            EffectSsEnIce_SpawnFlyingVec3f(play, &this->dyna.actor, &sp68, 150, 150, 150, 250, 235, 245, 255,
-                                           1.4f);
+            EffectSsEnIce_SpawnFlyingVec3f(play, &this->dyna.actor, &sp68, 150, 150, 150, 250, 235, 245, 255, 1.4f);
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 28eb43edd8..7897ef7619 100644
--- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -77,8 +77,8 @@ void EnAni_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, -2800.0f, ActorShadow_DrawCircle, 36.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gRoofManSkel, &gRoofManIdleAnim, this->jointTable,
-                       this->morphTable, 0x10);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gRoofManSkel, &gRoofManIdleAnim, this->jointTable, this->morphTable,
+                       0x10);
     Animation_PlayOnce(&this->skelAnime, &gRoofManIdleAnim);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
diff --git a/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
index 0fbef201b4..c1948ee8d1 100644
--- a/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
+++ b/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
@@ -289,8 +289,8 @@ void EnAnubice_ShootFireball(EnAnubice* this, PlayState* play) {
     EnAnubice_SetFireballRot(this, play);
 
     if (curFrame == 12.0f) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ANUBICE_FIRE, this->fireballPos.x,
-                    this->fireballPos.y + 15.0f, this->fireballPos.z, this->fireballRot.x, this->fireballRot.y, 0, 0, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ANUBICE_FIRE, this->fireballPos.x, this->fireballPos.y + 15.0f,
+                    this->fireballPos.z, this->fireballRot.x, this->fireballRot.y, 0, 0, true);
     }
 
     if (this->animLastFrame <= curFrame) {
@@ -467,8 +467,7 @@ void EnAnubice_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnAnubice_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnAnubice_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnAnubice* this = (EnAnubice*)thisx;
 
     if (limbIndex == ANUBICE_LIMB_HEAD) {
@@ -485,8 +484,7 @@ void EnAnubice_PostLimbDraw(struct PlayState* play, s32 limbIndex, Gfx** dList,
     if (limbIndex == ANUBICE_LIMB_HEAD) {
         OPEN_DISPS(play->state.gfxCtx);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gAnubiceEyesDL);
         Matrix_MultVec3f(&pos, &this->fireballPos);
 
@@ -498,6 +496,5 @@ void EnAnubice_Draw(Actor* thisx, PlayState* play) {
     EnAnubice* this = (EnAnubice*)thisx;
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnAnubice_OverrideLimbDraw,
-                      EnAnubice_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnAnubice_OverrideLimbDraw, EnAnubice_PostLimbDraw, this);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
index 2c142362b3..92ecbd47e4 100644
--- a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
+++ b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
@@ -246,8 +246,7 @@ void EnAnubiceFire_Draw(Actor* thisx, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_RotateZ(this->actor.world.rot.z + i * 1000.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gAnubiceFireAttackDL);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/soh/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
index 5a838c579d..641aa21de3 100644
--- a/soh/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
+++ b/soh/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c
@@ -44,9 +44,9 @@ void EnArowTrap_Update(Actor* thisx, PlayState* play) {
         this->attackTimer--;
 
         if (this->attackTimer == 0) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, this->actor.shape.rot.x,
-                        this->actor.shape.rot.y, this->actor.shape.rot.z, ARROW_NORMAL_SILENT, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, this->actor.shape.rot.x, this->actor.shape.rot.y,
+                        this->actor.shape.rot.z, ARROW_NORMAL_SILENT, true);
             this->attackTimer = 80;
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index f6822ed49a..f3551a113b 100644
--- a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -64,19 +64,19 @@ void EnArrow_SetupAction(EnArrow* this, EnArrowActionFunc actionFunc) {
 void EnArrow_Init(Actor* thisx, PlayState* play) {
     static EffectBlureInit2 blureNormal = {
         0, 4, 0, { 0, 255, 200, 255 },   { 0, 255, 255, 255 }, { 0, 255, 200, 0 }, { 0, 255, 255, 0 }, 16,
-        0, 1, 0, { 255, 255, 170, 255 }, { 0, 150, 0, 0 }, TRAIL_TYPE_REST,
+        0, 1, 0, { 255, 255, 170, 255 }, { 0, 150, 0, 0 },     TRAIL_TYPE_REST,
     };
     static EffectBlureInit2 blureFire = {
         0, 4, 0, { 0, 255, 200, 255 }, { 0, 255, 255, 255 }, { 0, 255, 200, 0 }, { 0, 255, 255, 0 }, 16,
-        0, 1, 0, { 255, 200, 0, 255 }, { 255, 0, 0, 0 }, TRAIL_TYPE_REST,
+        0, 1, 0, { 255, 200, 0, 255 }, { 255, 0, 0, 0 },     TRAIL_TYPE_REST,
     };
     static EffectBlureInit2 blureIce = {
         0, 4, 0, { 0, 255, 200, 255 },   { 0, 255, 255, 255 }, { 0, 255, 200, 0 }, { 0, 255, 255, 0 }, 16,
-        0, 1, 0, { 170, 255, 255, 255 }, { 0, 100, 255, 0 }, TRAIL_TYPE_REST,
+        0, 1, 0, { 170, 255, 255, 255 }, { 0, 100, 255, 0 },   TRAIL_TYPE_REST,
     };
     static EffectBlureInit2 blureLight = {
         0, 4, 0, { 0, 255, 200, 255 },   { 0, 255, 255, 255 }, { 0, 255, 200, 0 }, { 0, 255, 255, 0 }, 16,
-        0, 1, 0, { 255, 255, 170, 255 }, { 255, 255, 0, 0 }, TRAIL_TYPE_REST,
+        0, 1, 0, { 255, 255, 170, 255 }, { 255, 255, 0, 0 },   TRAIL_TYPE_REST,
     };
     static u32 dmgFlags[] = {
         0x00000800, 0x00000020, 0x00000020, 0x00000800, 0x00001000,
@@ -85,23 +85,27 @@ void EnArrow_Init(Actor* thisx, PlayState* play) {
     EnArrow* this = (EnArrow*)thisx;
 
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.NormalPrimary.Changed"), 0)) {
-        blureNormal.altEnvColor = CVarGetColor(CVAR_COSMETIC("Arrows.NormalPrimary.Value"), (Color_RGBA8){ 0, 150, 0, 0 });
+        blureNormal.altEnvColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.NormalPrimary.Value"), (Color_RGBA8){ 0, 150, 0, 0 });
     } else {
         blureNormal.altEnvColor = (Color_RGBA8){ 0, 150, 0, 0 };
     }
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.NormalSecondary.Changed"), 0)) {
-        blureNormal.altPrimColor = CVarGetColor(CVAR_COSMETIC("Arrows.NormalSecondary.Value"), (Color_RGBA8){ 255, 255, 170, 255 });
+        blureNormal.altPrimColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.NormalSecondary.Value"), (Color_RGBA8){ 255, 255, 170, 255 });
     } else {
         blureNormal.altPrimColor = (Color_RGBA8){ 255, 255, 170, 255 };
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.FirePrimary.Changed"), 0)) {
-        blureFire.altEnvColor = CVarGetColor(CVAR_COSMETIC("Arrows.FirePrimary.Value"), (Color_RGBA8){ 255, 200, 0, 0 });
+        blureFire.altEnvColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.FirePrimary.Value"), (Color_RGBA8){ 255, 200, 0, 0 });
     } else {
         blureFire.altEnvColor = (Color_RGBA8){ 255, 200, 0, 0 };
     }
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.FireSecondary.Changed"), 0)) {
-        blureFire.altPrimColor = CVarGetColor(CVAR_COSMETIC("Arrows.FireSecondary.Value"), (Color_RGBA8){ 255, 0, 0, 255 });
+        blureFire.altPrimColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.FireSecondary.Value"), (Color_RGBA8){ 255, 0, 0, 255 });
     } else {
         blureFire.altPrimColor = (Color_RGBA8){ 255, 0, 0, 255 };
     }
@@ -112,18 +116,21 @@ void EnArrow_Init(Actor* thisx, PlayState* play) {
         blureIce.altEnvColor = (Color_RGBA8){ 0, 0, 255, 255 };
     }
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.IceSecondary.Changed"), 0)) {
-        blureIce.altPrimColor = CVarGetColor(CVAR_COSMETIC("Arrows.IceSecondary.Value"), (Color_RGBA8){ 170, 255, 255, 0 });
+        blureIce.altPrimColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.IceSecondary.Value"), (Color_RGBA8){ 170, 255, 255, 0 });
     } else {
         blureIce.altPrimColor = (Color_RGBA8){ 170, 255, 255, 0 };
     }
 
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.LightPrimary.Changed"), 0)) {
-        blureLight.altEnvColor = CVarGetColor(CVAR_COSMETIC("Arrows.LightPrimary.Value"), (Color_RGBA8){ 255, 255, 0, 255 });
+        blureLight.altEnvColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.LightPrimary.Value"), (Color_RGBA8){ 255, 255, 0, 255 });
     } else {
         blureLight.altEnvColor = (Color_RGBA8){ 255, 255, 0, 255 };
     }
     if (CVarGetInteger(CVAR_COSMETIC("Arrows.LightSecondary.Changed"), 0)) {
-        blureLight.altPrimColor = CVarGetColor(CVAR_COSMETIC("Arrows.LightSecondary.Value"), (Color_RGBA8){ 255, 255, 170, 0 });
+        blureLight.altPrimColor =
+            CVarGetColor(CVAR_COSMETIC("Arrows.LightSecondary.Value"), (Color_RGBA8){ 255, 255, 170, 0 });
     } else {
         blureLight.altPrimColor = (Color_RGBA8){ 255, 255, 170, 0 };
     }
@@ -271,8 +278,8 @@ void EnArrow_CarryActor(EnArrow* this, PlayState* play) {
             Math_Vec3f_Scale(&posDiffLastFrame, scale);
             Math_Vec3f_Sum(&this->hitActor->world.pos, &posDiffLastFrame, &actorNextPos);
 
-            if (BgCheck_EntityLineTest1(&play->colCtx, &this->hitActor->world.pos, &actorNextPos, &hitPos,
-                                        &hitPoly, true, true, true, true, &bgId)) {
+            if (BgCheck_EntityLineTest1(&play->colCtx, &this->hitActor->world.pos, &actorNextPos, &hitPos, &hitPoly,
+                                        true, true, true, true, &bgId)) {
                 this->hitActor->world.pos.x = hitPos.x + ((actorNextPos.x <= hitPos.x) ? 1.0f : -1.0f);
                 this->hitActor->world.pos.y = hitPos.y + ((actorNextPos.y <= hitPos.y) ? 1.0f : -1.0f);
                 this->hitActor->world.pos.z = hitPos.z + ((actorNextPos.z <= hitPos.z) ? 1.0f : -1.0f);
@@ -316,8 +323,8 @@ void EnArrow_Fly(EnArrow* this, PlayState* play) {
 
             if (this->actor.params == ARROW_NUT) {
                 iREG(50) = -1;
-                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_M_FIRE1, this->actor.world.pos.x,
-                            this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_M_FIRE1, this->actor.world.pos.x, this->actor.world.pos.y,
+                            this->actor.world.pos.z, 0, 0, 0, 0, true);
                 sfxId = NA_SE_IT_DEKU;
             } else {
                 sfxId = NA_SE_IT_SLING_REFLECT;
@@ -523,12 +530,10 @@ void EnArrow_Draw(Actor* thisx, PlayState* play) {
         Matrix_Push();
         Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
         // redundant check because this is contained in an if block for non-zero speed
-        Matrix_RotateZ(
-            (this->actor.speedXZ == 0.0f) ? 0.0f : ((play->gameplayFrames & 0xFF) * 4000) * (M_PI / 0x8000),
-            MTXMODE_APPLY);
+        Matrix_RotateZ((this->actor.speedXZ == 0.0f) ? 0.0f : ((play->gameplayFrames & 0xFF) * 4000) * (M_PI / 0x8000),
+                       MTXMODE_APPLY);
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL);
         Matrix_Pop();
         Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
diff --git a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c
index 6914adfc33..4f16a06083 100644
--- a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c
+++ b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c
@@ -390,8 +390,8 @@ void func_809B75A0(EnBa* this, PlayState* play2) {
     this->unk_14C = 0;
 
     for (i = 7; i < 14; i++) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BA, this->unk_158[i].x, this->unk_158[i].y,
-                    this->unk_158[i].z, 0, 0, 0, EN_BA_DEAD_BLOB, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BA, this->unk_158[i].x, this->unk_158[i].y, this->unk_158[i].z, 0,
+                    0, 0, EN_BA_DEAD_BLOB, true);
     }
     unk_temp = Math_Vec3f_Pitch(&this->actor.world.pos, &this->unk_158[0]) + 0x8000;
     Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, this->unk_31C, 0);
@@ -489,9 +489,9 @@ void EnBa_Draw(Actor* thisx, PlayState* play) {
         Matrix_Push();
         gSPSegment(POLY_OPA_DISP++, 0x0C, mtx);
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809B8118[this->actor.params]));
-        gSPSegment(POLY_OPA_DISP++, 0x09,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0,
-                                    (play->gameplayFrames * -10) % 128, 32, 32));
+        gSPSegment(
+            POLY_OPA_DISP++, 0x09,
+            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (play->gameplayFrames * -10) % 128, 32, 32));
         for (i = 0; i < 14; i++, mtx++) {
             FrameInterpolation_RecordOpenChild(this, this->epoch + i * 25);
 
@@ -514,18 +514,15 @@ void EnBa_Draw(Actor* thisx, PlayState* play) {
             FrameInterpolation_RecordCloseChild();
         }
         Matrix_Pop();
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_000890);
     } else {
         gSPSegment(POLY_OPA_DISP++, 0x08,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, (play->gameplayFrames * 2) % 128,
-                                    (play->gameplayFrames * 2) % 128, 32, 32, 1,
-                                    (play->gameplayFrames * -5) % 128, (play->gameplayFrames * -5) % 128, 32,
-                                    32));
+                                    (play->gameplayFrames * 2) % 128, 32, 32, 1, (play->gameplayFrames * -5) % 128,
+                                    (play->gameplayFrames * -5) % 128, 32, 32));
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index ead1e54be3..424f94a1c2 100644
--- a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -10,7 +10,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT)
 
 #define vBombHopPhase actionVar1
 #define vTrailIdx actionVar1
@@ -269,8 +271,8 @@ void EnBb_SpawnFlameTrail(PlayState* play, EnBb* this, s16 startAtZero) {
     s32 i;
 
     for (i = 0; i < 5; i++) {
-        next = (EnBb*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BB, this->actor.world.pos.x,
-                                  this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+        next = (EnBb*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BB, this->actor.world.pos.x, this->actor.world.pos.y,
+                                  this->actor.world.pos.z, 0, 0, 0, 0, true);
         if (next != NULL) {
             now->actor.child = &next->actor;
             next->actor.parent = &now->actor;
@@ -1293,8 +1295,7 @@ void EnBb_Draw(Actor* thisx, PlayState* play) {
     if (this->moveMode != BBMOVE_HIDDEN) {
         if (this->actor.params <= ENBB_BLUE) {
             Gfx_SetupDL_25Opa(play->state.gfxCtx);
-            SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnBb_PostLimbDraw,
-                              this);
+            SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnBb_PostLimbDraw, this);
 
             if (this->fireIceTimer != 0) {
                 this->actor.colorFilterTimer++;
@@ -1313,8 +1314,8 @@ void EnBb_Draw(Actor* thisx, PlayState* play) {
                     sp70.z = this->actor.world.pos.z + sFireIceOffsets[index].z;
 
                     if ((this->dmgEffect != 7) && (this->dmgEffect != 5)) {
-                        EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &sp70, 0x96, 0x96, 0x96, 0xFA, 0xEB,
-                                                       0xF5, 0xFF, 0.8f);
+                        EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &sp70, 0x96, 0x96, 0x96, 0xFA, 0xEB, 0xF5,
+                                                       0xFF, 0.8f);
                     } else {
                         sp70.y -= 17.0f;
                         EffectSsEnFire_SpawnVec3f(play, &this->actor, &sp70, 0x28, 1, 0, -1);
@@ -1339,8 +1340,7 @@ void EnBb_Draw(Actor* thisx, PlayState* play) {
                                (M_PI / 0x8000),
                            MTXMODE_APPLY);
             Matrix_Scale(this->flameScaleX * 0.01f, this->flameScaleY * 0.01f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         } else {
             Matrix_MultVec3f(&blureBase1, &blureVtx1);
diff --git a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
index 12255f5995..d06a234baa 100644
--- a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
+++ b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
@@ -132,8 +132,8 @@ void func_809BC598(EnBdfire* this, PlayState* play) {
     this->unk_158 = bossDodongo->unk_1A2;
     phi_v1_2 = 0;
     if (this->actor.params == 0) {
-        Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_FIRE - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_FIRE - SFX_FLAG, &this->actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     Math_SmoothStepToF(&this->actor.scale.x, this->unk_188, 0.3f, 0.5f, 0.0f);
     Actor_SetScale(&this->actor, this->actor.scale.x);
@@ -217,8 +217,7 @@ void EnBdfire_DrawFire(EnBdfire* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 0);
     gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(D_809BCB10[temp]));
     Matrix_Translate(0.0f, 11.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_01D950);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
index 27ba0e3f2d..368bf865b2 100644
--- a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+++ b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
@@ -3,7 +3,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnBigokuta_Init(Actor* thisx, PlayState* play);
 void EnBigokuta_Destroy(Actor* thisx, PlayState* play);
@@ -639,8 +641,8 @@ void func_809BE26C(EnBigokuta* this, PlayState* play) {
             effectPos.x = this->actor.world.pos.x;
             effectPos.y = this->actor.world.pos.y + 150.0f;
             effectPos.z = this->actor.world.pos.z;
-            func_8002829C(play, &effectPos, &sEffectPosAccel, &sEffectPosAccel, &sEffectPrimColor,
-                          &sEffectEnvColor, 1200, 20);
+            func_8002829C(play, &effectPos, &sEffectPosAccel, &sEffectPosAccel, &sEffectPrimColor, &sEffectEnvColor,
+                          1200, 20);
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_OCTAROCK_DEAD2);
         }
         if (this->unk_198 == 0 && Math_StepToF(&this->actor.scale.y, 0.0f, 0.001f)) {
@@ -813,8 +815,7 @@ void EnBigokuta_Update(Actor* thisx, PlayState* play2) {
     func_809BCEBC(this, play);
 }
 
-s32 EnBigokuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 EnBigokuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnBigokuta* this = (EnBigokuta*)thisx;
     u8 intensity;
     f32 temp_f0;
diff --git a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c
index 0f9090a9c0..d8ba387738 100644
--- a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c
+++ b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c
@@ -9,7 +9,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
+#define FLAGS \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
 
 void EnBili_Init(Actor* thisx, PlayState* play);
 void EnBili_Destroy(Actor* thisx, PlayState* play);
@@ -503,11 +504,11 @@ void EnBili_Die(EnBili* this, PlayState* play) {
             effectScale = Rand_S16Offset(40, 40);
 
             if (Rand_ZeroOne() < 0.7f) {
-                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale,
-                                                   25, 2, 1);
+                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale, 25, 2,
+                                                   1);
             } else {
-                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale,
-                                                   25, 0, 1);
+                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale, 25, 0,
+                                                   1);
             }
         }
     } else {
@@ -769,7 +770,6 @@ void EnBili_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x09, D_809C1700);
     }
 
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                   EnBili_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnBili_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
index f31e05a9f4..8a180e222a 100644
--- a/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
+++ b/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
@@ -90,9 +90,8 @@ void EnBlkobj_Wait(EnBlkobj* this, PlayState* play) {
 
 void EnBlkobj_SpawnDarkLink(EnBlkobj* this, PlayState* play) {
     if (!(this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TORCH2, this->dyna.actor.world.pos.x,
-                    this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, this->dyna.actor.yawTowardsPlayer, 0,
-                    0, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TORCH2, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
+                    this->dyna.actor.world.pos.z, 0, this->dyna.actor.yawTowardsPlayer, 0, 0, true);
         EnBlkobj_SetupAction(this, EnBlkobj_DarkLinkFight);
     }
 }
@@ -104,12 +103,12 @@ void EnBlkobj_DarkLinkFight(EnBlkobj* this, PlayState* play) {
         // Dark Link room completed.
         // Check for if Dark Link is defeated in authentic gameplay.
         // Check for if all enemies are defeated with enemy randomizer or crowd control on.
-        uint8_t roomCleared = 
-            (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && 
-                !(CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)) && 
-                Actor_Find(&play->actorCtx, ACTOR_EN_TORCH2, ACTORCAT_BOSS) == NULL) ||
-            ((CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) && 
-                Flags_GetTempClear(play, this->dyna.actor.room));
+        uint8_t roomCleared = (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) &&
+                               !(CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)) &&
+                               Actor_Find(&play->actorCtx, ACTOR_EN_TORCH2, ACTORCAT_BOSS) == NULL) ||
+                              ((CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+                                (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) &&
+                               Flags_GetTempClear(play, this->dyna.actor.room));
         if (roomCleared) {
             Flags_SetClear(play, this->dyna.actor.room);
             this->timer++;
@@ -170,8 +169,7 @@ void EnBlkobj_Draw(Actor* thisx, PlayState* play) {
 
     gSPSegment(POLY_XLU_DISP++, 0x0D,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->alpha != 0) {
         EnBlkobj_DrawAlpha(play, gIllusionRoomNormalDL, this->alpha);
diff --git a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
index 1efbdd5d7e..9fe450695e 100644
--- a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@@ -200,12 +200,11 @@ void EnBom_Explode(EnBom* this, PlayState* play) {
     }
 
     if (CVarGetInteger(CVAR_ENHANCEMENT("StaticExplosionRadius"), 0)) {
-        //72 is the maximum radius of an OoT bomb explosion
+        // 72 is the maximum radius of an OoT bomb explosion
         this->explosionCollider.elements[0].dim.worldSphere.radius = 72;
     } else {
         this->explosionCollider.elements[0].dim.worldSphere.radius += this->actor.shape.rot.z + 8;
     }
-        
 
     if (this->actor.params == BOMB_EXPLOSION) {
         CollisionCheck_SetAT(play, &play->colChkCtx, &this->explosionCollider.base);
@@ -267,7 +266,8 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
     }
 
     // With random bomb fuse timer or gBombTimerMultiplier, sound effect and scaling is already done on init.
-    if (this->timer == 67 && !GameInteractor_GetRandomBombFuseTimerActive() && CVarGetFloat(CVAR_CHEAT("BombTimerMultiplier"), 1.0f) == 1.0f) {
+    if (this->timer == 67 && !GameInteractor_GetRandomBombFuseTimerActive() &&
+        CVarGetFloat(CVAR_CHEAT("BombTimerMultiplier"), 1.0f) == 1.0f) {
         Audio_PlayActorSound2(thisx, NA_SE_PL_TAKE_OUT_SHIELD);
         Actor_SetScale(thisx, 0.01f);
     }
@@ -338,8 +338,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
                 effPos.y += 30.0f;
             }
 
-            EffectSsBomb2_SpawnLayered(play, &effPos, &effVelocity, &bomb2Accel, 100,
-                                       (thisx->shape.rot.z * 6) + 19);
+            EffectSsBomb2_SpawnLayered(play, &effPos, &effVelocity, &bomb2Accel, 100, (thisx->shape.rot.z * 6) + 19);
 
             effPos.y = thisx->floorHeight;
             if (thisx->floorHeight > BGCHECK_Y_MIN) {
@@ -348,11 +347,9 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
 
             Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION);
 
-            play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] =
-                play->envCtx.adjLight1Color[2] = 250;
+            play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = 250;
 
-            play->envCtx.adjAmbientColor[0] = play->envCtx.adjAmbientColor[1] =
-                play->envCtx.adjAmbientColor[2] = 250;
+            play->envCtx.adjAmbientColor[0] = play->envCtx.adjAmbientColor[1] = play->envCtx.adjAmbientColor[2] = 250;
 
             Camera_AddQuake(&play->mainCamera, 2, 0xB, 8);
             thisx->params = BOMB_EXPLOSION;
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index 9d9ed8a530..ace5202779 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -8,7 +8,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
 
 typedef enum {
     /* 0 */ CHU_GIRL_EYES_ASLEEP,
@@ -73,7 +75,10 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play2) {
     Actor_SetScale(&this->actor, 0.013f);
 
     for (i = 0; i < 2; i++) {
-        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) && CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco") : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"), 0)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0) &&
+            CVarGetInteger(i == 0 ? CVAR_ENHANCEMENT("BombchuBowlingNoSmallCucco")
+                                  : CVAR_ENHANCEMENT("BombchuBowlingNoBigCucco"),
+                           0)) {
             continue;
         }
 
@@ -145,7 +150,8 @@ void EnBomBowMan_BlinkAwake(EnBomBowlMan* this, PlayState* play) {
     if (frameCount == 30.0f) {
         this->dialogState = TEXT_STATE_EVENT;
 
-        if (GameInteractor_Should(VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING, (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2))) {
+        if (GameInteractor_Should(VB_BE_ABLE_TO_PLAY_BOMBCHU_BOWLING,
+                                  (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) || BREG(2))) {
             this->actor.textId = 0xBF;
         } else {
             this->actor.textId = 0x7058;
@@ -260,9 +266,8 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, PlayState* play) {
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" VT_RST);
         }
 
-        if ((play->bombchuBowlingStatus == -1) &&
-            (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length == 0) && (this->bowlPit->status == 0) &&
-            (this->wallStatus[0] != 1) && (this->wallStatus[1] != 1)) {
+        if ((play->bombchuBowlingStatus == -1) && (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length == 0) &&
+            (this->bowlPit->status == 0) && (this->wallStatus[0] != 1) && (this->wallStatus[1] != 1)) {
             this->gameResult = 2; // Lost
             // "Bombchu lost"
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" VT_RST);
@@ -316,10 +321,9 @@ void EnBomBowlMan_HandlePlayChoice(EnBomBowlMan* this, PlayState* play) {
                     Rupees_ChangeBy(-30);
                     this->minigamePlayStatus = 1;
                     this->wallStatus[0] = this->wallStatus[1] = 0;
-                    if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0)) {
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeBombchuBowling"), 0)) {
                         play->bombchuBowlingStatus = CVarGetInteger(CVAR_ENHANCEMENT("BombchuBowlingAmmo"), 10);
-                    }
-                    else {
+                    } else {
                         play->bombchuBowlingStatus = 10;
                     }
                     Flags_SetSwitch(play, 0x38);
@@ -453,11 +457,10 @@ void EnBomBowMan_ChooseShowPrize(EnBomBowlMan* this, PlayState* play) {
             this->prizeIndex = BREG(7) - 1;
         }
 
-        this->exItem = (EnExItem*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM,
-                                                     sPrizePosOffset[this->prizeIndex].x + 148.0f,
-                                                     sPrizePosOffset[this->prizeIndex].y + 40.0f,
-                                                     sPrizePosOffset[this->prizeIndex].z + 300.0f, 0,
-                                                     sPrizeRot[this->prizeIndex], 0, this->prizeIndex + EXITEM_COUNTER);
+        this->exItem = (EnExItem*)Actor_SpawnAsChild(
+            &play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, sPrizePosOffset[this->prizeIndex].x + 148.0f,
+            sPrizePosOffset[this->prizeIndex].y + 40.0f, sPrizePosOffset[this->prizeIndex].z + 300.0f, 0,
+            sPrizeRot[this->prizeIndex], 0, this->prizeIndex + EXITEM_COUNTER);
 
         if (!this->startedPlaying) {
             this->bowlPit = (EnBomBowlPit*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play,
@@ -546,8 +549,7 @@ void EnBomBowlMan_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-s32 EnBomBowlMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 EnBomBowlMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnBomBowlMan* this = (EnBomBowlMan*)thisx;
 
     if (limbIndex == 4) { // head
diff --git a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
index 12fbbbde9d..4098659073 100644
--- a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+++ b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
@@ -107,8 +107,8 @@ void EnBomChu_Explode(EnBomChu* this, PlayState* play) {
     EnBom* bomb;
     s32 i;
 
-    bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
-                               this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, BOMB_BODY, true);
+    bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, this->actor.world.pos.y,
+                               this->actor.world.pos.z, 0, 0, 0, BOMB_BODY, true);
     if (bomb != NULL) {
         bomb->timer = 0;
     }
@@ -178,7 +178,6 @@ void EnBomChu_UpdateFloorPoly(EnBomChu* this, CollisionPoly* floorPoly, PlayStat
 
             this->axisUp = normal;
 
-
             // mf = (axisLeft | axisUp | axisForwards)
 
             mf.xx = this->axisLeft.x;
@@ -456,8 +455,8 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) {
 
         waterY = this->actor.world.pos.y;
 
-        if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
-                                 &waterY, &waterBox)) {
+        if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterY,
+                                 &waterBox)) {
             this->actor.yDistToWater = waterY - this->actor.world.pos.y;
 
             if (this->actor.yDistToWater < 0.0f) {
@@ -482,7 +481,6 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) {
     }
 }
 
-
 const Color_RGB8 BombchuColorOriginal = { 209, 34, -35 };
 
 void EnBomChu_Draw(Actor* thisx, PlayState* play) {
@@ -516,17 +514,17 @@ void EnBomChu_Draw(Actor* thisx, PlayState* play) {
     colorIntensity = blinkTime / (f32)blinkHalfPeriod;
 
     if (CVarGetInteger(CVAR_COSMETIC("Equipment.ChuBody.Changed"), 0)) {
-        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("Equipment.ChuBody.Value"), (Color_RGB8){ 209.0f, 34.0f, -35.0f });
+        Color_RGB8 color =
+            CVarGetColor24(CVAR_COSMETIC("Equipment.ChuBody.Value"), (Color_RGB8){ 209.0f, 34.0f, -35.0f });
         gDPSetEnvColor(POLY_OPA_DISP++, (colorIntensity * color.r), (colorIntensity * color.g),
-                   (colorIntensity * color.b), 255);
+                       (colorIntensity * color.b), 255);
     } else {
         gDPSetEnvColor(POLY_OPA_DISP++, 9.0f + (colorIntensity * 209.0f), 9.0f + (colorIntensity * 34.0f),
-                   35.0f + (colorIntensity * -35.0f), 255);
+                       35.0f + (colorIntensity * -35.0f), 255);
     }
 
     Matrix_Translate(this->visualJitter * (1.0f / BOMBCHU_SCALE), 0.0f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gBombchuDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
index a002f0d1c9..0eaee1f3b1 100644
--- a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+++ b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
@@ -170,9 +170,8 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
             this->bombCollider.base.acFlags &= ~AC_HIT;
 
             if (this->bombCollider.base.ac->category != ACTORCAT_BOSS) {
-                bombFlower =
-                    (EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x,
-                                          this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                bombFlower = (EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x,
+                                                   this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 if (bombFlower != NULL) {
                     bombFlower->isFuseEnabled = 1;
                     bombFlower->timer = 0;
@@ -183,9 +182,8 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
             }
         } else {
             if (Player_IsBurningStickInRange(play, &this->actor.world.pos, 30.0f, 50.0f)) {
-                bombFlower =
-                    (EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x,
-                                          this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
+                bombFlower = (EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x,
+                                                   this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
                 if (bombFlower != NULL) {
                     bombFlower->timer = 100;
                     this->timer = 180;
@@ -423,10 +421,9 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
                 }
 
                 Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION);
-                play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] =
-                    play->envCtx.adjLight1Color[2] = 250;
-                play->envCtx.adjAmbientColor[0] = play->envCtx.adjAmbientColor[1] =
-                    play->envCtx.adjAmbientColor[2] = 250;
+                play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = 250;
+                play->envCtx.adjAmbientColor[0] = play->envCtx.adjAmbientColor[1] = play->envCtx.adjAmbientColor[2] =
+                    250;
                 Camera_AddQuake(&play->mainCamera, 2, 0xB, 8);
                 thisx->params = BOMBFLOWER_EXPLOSION;
                 this->timer = 10;
@@ -471,8 +468,7 @@ Gfx* EnBombf_NewMtxDList(GraphicsContext* gfxCtx, PlayState* play) {
     displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx));
     displayListHead = displayList;
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(displayListHead++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(displayListHead++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPEndDisplayList(displayListHead);
     return displayList;
 }
@@ -487,8 +483,7 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
         if (thisx->params != BOMBFLOWER_BODY) {
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL);
             gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL);
 
@@ -499,10 +494,8 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 200, 255, 200, 255);
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 20, 10, 0);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPSegment(POLY_OPA_DISP++, 0x08,
-                   SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(play->state.gfxCtx, play)));
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(play->state.gfxCtx, play)));
         gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBombAndSparkDL);
     } else {
         Collider_UpdateSpheres(0, &this->explosionCollider);
diff --git a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index 85eae391ed..2b41e176ae 100644
--- a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@@ -199,16 +199,15 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) {
             // Copy the position from the prevous frame to the boomerang to start the bounce back.
             Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.prevPos);
         } else {
-            collided = BgCheck_EntityLineTest1(&play->colCtx, &this->actor.prevPos, &this->actor.world.pos,
-                                               &hitPoint, &this->actor.wallPoly, true, true, true, true, &hitDynaID);
+            collided = BgCheck_EntityLineTest1(&play->colCtx, &this->actor.prevPos, &this->actor.world.pos, &hitPoint,
+                                               &this->actor.wallPoly, true, true, true, true, &hitDynaID);
 
             if (collided) {
                 // If the boomerang collides with something and it's is a Jabu Object actor with params equal to 0, then
                 // set collided to 0 so that the boomerang will go through the wall.
                 // Otherwise play a clank sound and keep collided set to bounce back.
                 if (func_8002F9EC(play, &this->actor, this->actor.wallPoly, hitDynaID, &hitPoint) != 0 ||
-                    (hitDynaID != BGCHECK_SCENE &&
-                     ((hitActor = DynaPoly_GetActor(&play->colCtx, hitDynaID)) != NULL) &&
+                    (hitDynaID != BGCHECK_SCENE && ((hitActor = DynaPoly_GetActor(&play->colCtx, hitDynaID)) != NULL) &&
                      hitActor->actor.id == ACTOR_BG_BDAN_OBJECTS && hitActor->actor.params == 0)) {
                     collided = false;
                 } else {
@@ -272,8 +271,7 @@ void EnBoom_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_RotateY((this->activeTimer * 12000) * (M_PI / 0x8000), MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index 6977f4ee46..9a3a8fb77e 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -79,16 +79,16 @@ static InitChainEntry sInitChain[] = {
 
 static UNK_TYPE sUnused;
 
-Gfx gSkullTreasureChestChestSideAndLidDL[116] = {0};
-Gfx gGoldTreasureChestChestSideAndLidDL[116] = {0};
-Gfx gKeyTreasureChestChestSideAndLidDL[116] = {0};
-Gfx gChristmasRedTreasureChestChestSideAndLidDL[116] = {0};
-Gfx gChristmasGreenTreasureChestChestSideAndLidDL[116] = {0};
-Gfx gSkullTreasureChestChestFrontDL[128] = {0};
-Gfx gGoldTreasureChestChestFrontDL[128] = {0};
-Gfx gKeyTreasureChestChestFrontDL[128] = {0};
-Gfx gChristmasRedTreasureChestChestFrontDL[128] = {0};
-Gfx gChristmasGreenTreasureChestChestFrontDL[128] = {0};
+Gfx gSkullTreasureChestChestSideAndLidDL[116] = { 0 };
+Gfx gGoldTreasureChestChestSideAndLidDL[116] = { 0 };
+Gfx gKeyTreasureChestChestSideAndLidDL[116] = { 0 };
+Gfx gChristmasRedTreasureChestChestSideAndLidDL[116] = { 0 };
+Gfx gChristmasGreenTreasureChestChestSideAndLidDL[116] = { 0 };
+Gfx gSkullTreasureChestChestFrontDL[128] = { 0 };
+Gfx gGoldTreasureChestChestFrontDL[128] = { 0 };
+Gfx gKeyTreasureChestChestFrontDL[128] = { 0 };
+Gfx gChristmasRedTreasureChestChestFrontDL[128] = { 0 };
+Gfx gChristmasGreenTreasureChestChestFrontDL[128] = { 0 };
 u8 hasCreatedRandoChestTextures = 0;
 u8 hasCustomChestDLs = 0;
 u8 hasChristmasChestTexturesAvailable = 0;
@@ -279,8 +279,8 @@ void EnBox_Fall(EnBox* this, PlayState* play) {
                 OnePointCutscene_EndCutscene(play, this->unk_1AC);
             }
         }
-        Audio_PlaySoundGeneral(NA_SE_EV_COFFIN_CAP_BOUND, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_COFFIN_CAP_BOUND, &this->dyna.actor.projectedPos, 4,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         EnBox_SpawnDust(this, play);
     }
     yDiff = this->dyna.actor.world.pos.y - this->dyna.actor.floorHeight;
@@ -387,10 +387,10 @@ void EnBox_AppearInit(EnBox* this, PlayState* play) {
     if (func_8005B198() == this->dyna.actor.category || this->unk_1A8 != 0) {
         EnBox_SetupAction(this, EnBox_AppearAnimation);
         this->unk_1A8 = 0;
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_KANKYO, this->dyna.actor.home.pos.x,
-                    this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, 0, 0, 0x0011, true);
-        Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_APPEAR, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_KANKYO, this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y,
+                    this->dyna.actor.home.pos.z, 0, 0, 0, 0x0011, true);
+        Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_APPEAR, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -452,7 +452,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) {
         Actor_WorldToActorCoords(&this->dyna.actor, &sp4C, &player->actor.world.pos);
         if (sp4C.z > -50.0f && sp4C.z < 0.0f && fabsf(sp4C.y) < 10.0f && fabsf(sp4C.x) < 20.0f &&
             Player_IsFacingActor(&this->dyna.actor, 0x3000, play)) {
-                Actor_OfferGetItemNearby(&this->dyna.actor, play, -(this->dyna.actor.params >> 5 & 0x7F));
+            Actor_OfferGetItemNearby(&this->dyna.actor, play, -(this->dyna.actor.params >> 5 & 0x7F));
         }
         if (Flags_GetTreasure(play, this->dyna.actor.params & 0x1F)) {
             EnBox_SetupAction(this, EnBox_Open);
@@ -493,7 +493,8 @@ void EnBox_Open(EnBox* this, PlayState* play) {
         }
 
         if (sfxId != 0) {
-            Audio_PlaySoundGeneral(sfxId, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(sfxId, &this->dyna.actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         if (this->skelanime.jointTable[3].z > 0) {
@@ -579,27 +580,26 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
     GetItemCategory getItemCategory;
 
     int isVanilla = csmc == CSMC_DISABLED || (requiresStoneAgony && !CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)) ||
-        (play->sceneNum == SCENE_TREASURE_BOX_SHOP && this->dyna.actor.room != 6); // Exclude treasure game chests except for the final room
+                    (play->sceneNum == SCENE_TREASURE_BOX_SHOP &&
+                     this->dyna.actor.room != 6); // Exclude treasure game chests except for the final room
 
     if (!isVanilla) {
         GetItemEntry test = this->getItemEntry;
         getItemCategory = this->getItemEntry.getItemCategory;
         // If they have bombchus, don't consider the bombchu item major
-        if (
-            INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU &&
-            ((this->getItemEntry.modIndex == MOD_RANDOMIZER && this->getItemEntry.getItemId == RG_PROGRESSIVE_BOMBCHUS) || 
-            (this->getItemEntry.modIndex == MOD_NONE && (
-                this->getItemEntry.getItemId == GI_BOMBCHUS_5 ||
-                this->getItemEntry.getItemId == GI_BOMBCHUS_10 ||
-                this->getItemEntry.getItemId == GI_BOMBCHUS_20
-            )))
-        ) {
+        if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU &&
+            ((this->getItemEntry.modIndex == MOD_RANDOMIZER &&
+              this->getItemEntry.getItemId == RG_PROGRESSIVE_BOMBCHUS) ||
+             (this->getItemEntry.modIndex == MOD_NONE &&
+              (this->getItemEntry.getItemId == GI_BOMBCHUS_5 || this->getItemEntry.getItemId == GI_BOMBCHUS_10 ||
+               this->getItemEntry.getItemId == GI_BOMBCHUS_20)))) {
             getItemCategory = ITEM_CATEGORY_JUNK;
-        // If it's a bottle and they already have one, consider the item lesser
-        } else if (
-            (this->getItemEntry.modIndex == MOD_RANDOMIZER && this->getItemEntry.getItemId >= RG_BOTTLE_WITH_RED_POTION && this->getItemEntry.getItemId <= RG_BOTTLE_WITH_POE) ||
-            (this->getItemEntry.modIndex == MOD_NONE && (this->getItemEntry.getItemId == GI_BOTTLE || this->getItemEntry.getItemId == GI_MILK_BOTTLE))
-        ) {
+            // If it's a bottle and they already have one, consider the item lesser
+        } else if ((this->getItemEntry.modIndex == MOD_RANDOMIZER &&
+                    this->getItemEntry.getItemId >= RG_BOTTLE_WITH_RED_POTION &&
+                    this->getItemEntry.getItemId <= RG_BOTTLE_WITH_POE) ||
+                   (this->getItemEntry.modIndex == MOD_NONE &&
+                    (this->getItemEntry.getItemId == GI_BOTTLE || this->getItemEntry.getItemId == GI_MILK_BOTTLE))) {
             if (gSaveContext.inventory.items[SLOT_BOTTLE_1] != ITEM_NONE) {
                 getItemCategory = ITEM_CATEGORY_LESSER;
             }
@@ -636,7 +636,8 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
     }
 
     // Change texture
-    if (!isVanilla && hasCreatedRandoChestTextures && !hasCustomChestDLs && (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) {
+    if (!isVanilla && hasCreatedRandoChestTextures && !hasCustomChestDLs &&
+        (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) {
         switch (getItemCategory) {
             case ITEM_CATEGORY_MAJOR:
                 this->boxBodyDL = gGoldTreasureChestChestFrontDL;
@@ -671,7 +672,8 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
         }
     }
 
-    if (CVarGetInteger(CVAR_GENERAL("LetItSnow"), 0) && hasChristmasChestTexturesAvailable && hasCreatedRandoChestTextures && !hasCustomChestDLs) {
+    if (CVarGetInteger(CVAR_GENERAL("LetItSnow"), 0) && hasChristmasChestTexturesAvailable &&
+        hasCreatedRandoChestTextures && !hasCustomChestDLs) {
         if (this->dyna.actor.scale.x == 0.01f) {
             this->boxBodyDL = gChristmasRedTreasureChestChestFrontDL;
             this->boxLidDL = gChristmasRedTreasureChestChestSideAndLidDL;
@@ -714,7 +716,8 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
 
 void EnBox_CreateExtraChestTextures() {
     // Don't patch textures for custom chest models, as they do not import textures the exact same way as vanilla chests
-    // OTRTODO: Make it so model packs can provide a unique DL per chest type, instead of us copying the brown chest and attempting to patch
+    // OTRTODO: Make it so model packs can provide a unique DL per chest type, instead of us copying the brown chest and
+    // attempting to patch
     if (ResourceMgr_FileIsCustomByName(gTreasureChestChestFrontDL) ||
         ResourceMgr_FileIsCustomByName(gTreasureChestChestSideAndLidDL)) {
         hasCustomChestDLs = 1;
@@ -723,7 +726,8 @@ void EnBox_CreateExtraChestTextures() {
 
     hasCustomChestDLs = 0;
 
-    if (hasCreatedRandoChestTextures) return;
+    if (hasCreatedRandoChestTextures)
+        return;
 
     Gfx gTreasureChestChestTextures[] = {
         gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSkullTreasureChestFrontTex),
@@ -848,12 +852,10 @@ void EnBox_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
     s32 pad;
 
     if (limbIndex == 1) {
-        gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList((*gfx)++, this->boxBodyDL);
     } else if (limbIndex == 3) {
-        gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList((*gfx)++, this->boxLidDL);
     }
 }
@@ -923,8 +925,7 @@ void EnBox_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
         gSPSegment(POLY_OPA_DISP++, 0x08, EnBox_EmptyDList(play->state.gfxCtx));
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime, NULL,
-                                       EnBox_PostLimbDraw, this, POLY_OPA_DISP);
+        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime, NULL, EnBox_PostLimbDraw, this, POLY_OPA_DISP);
     } else if (this->alpha != 0) {
         gDPPipeSync(POLY_XLU_DISP++);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
@@ -934,8 +935,7 @@ void EnBox_Draw(Actor* thisx, PlayState* play) {
         } else {
             gSPSegment(POLY_XLU_DISP++, 0x08, func_809CA4A0(play->state.gfxCtx));
         }
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime, NULL,
-                                       EnBox_PostLimbDraw, this, POLY_XLU_DISP);
+        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime, NULL, EnBox_PostLimbDraw, this, POLY_XLU_DISP);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c
index 11dad1a11d..281402e9e3 100644
--- a/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c
+++ b/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c
@@ -63,8 +63,8 @@ void EnBrob_Init(Actor* thisx, PlayState* play) {
     EnBrob* this = (EnBrob*)thisx;
     CollisionHeader* colHeader = NULL;
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_brob_Skel_0015D8, &object_brob_Anim_001750,
-                       this->jointTable, this->morphTable, 10);
+    SkelAnime_InitFlex(play, &this->skelAnime, &object_brob_Skel_0015D8, &object_brob_Anim_001750, this->jointTable,
+                       this->morphTable, 10);
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
     CollisionHeader_GetVirtual(&object_brob_Col_001A70, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
diff --git a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
index b29e9044c6..6717b9788f 100644
--- a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
+++ b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
@@ -424,8 +424,7 @@ void EnBubble_Draw(Actor* thisx, PlayState* play) {
         Matrix_Scale(this->graphicEccentricity + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
         Matrix_RotateZ((-(f32)play->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gBubbleDL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c
index 8a1f3ea2d4..b6a6bbb99e 100644
--- a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@@ -131,8 +131,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, PlayState* play) {
     Matrix_SetTranslateRotateYXZ(this->actor.focus.pos.x + sp5C.x, this->actor.focus.pos.y + sp5C.y,
                                  this->actor.focus.pos.z + sp5C.z, &camDir);
     Matrix_Scale(sTransformationEffectScale, sTransformationEffectScale, sTransformationEffectScale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffFlash1DL));
@@ -160,8 +159,7 @@ void EnButte_Init(Actor* thisx, PlayState* play) {
         this->actor.uncullZoneScale = 200.0f;
     }
 
-    SkelAnime_Init(play, &this->skelAnime, &gButterflySkel, &gButterflyAnim, this->jointTable, this->morphTable,
-                   8);
+    SkelAnime_Init(play, &this->skelAnime, &gButterflySkel, &gButterflyAnim, this->jointTable, this->morphTable, 8);
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sColliderInit, this->colliderItems);
     this->actor.colChkInfo.mass = 0;
diff --git a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index 4c1730ae25..38d3a9bf11 100644
--- a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -228,8 +228,8 @@ void func_809CEA24(EnBw* this, PlayState* play) {
         this->color1.g = sp60;
     }
     if ((((play->gameplayFrames % 4) == (u32)this->actor.params) && (this->actor.speedXZ != 0.0f) &&
-         (sp64 = BgCheck_AnyLineTest2(&play->colCtx, &this->actor.world.pos, &this->unk_264, &sp68, &sp74, 1, 0, 0,
-                                      1))) ||
+         (sp64 =
+              BgCheck_AnyLineTest2(&play->colCtx, &this->actor.world.pos, &this->unk_264, &sp68, &sp74, 1, 0, 0, 1))) ||
         (this->unk_222 == 0)) {
         if (sp74 != NULL) {
             sp74 = SEGMENTED_TO_VIRTUAL(sp74);
@@ -307,8 +307,8 @@ void func_809CEA24(EnBw* this, PlayState* play) {
                 }
             }
         } else if (this->unk_221 == 0) {
-            sp64 = BgCheck_AnyLineTest2(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &sp68,
-                                        &sp74, 1, 0, 0, 1);
+            sp64 = BgCheck_AnyLineTest2(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &sp68, &sp74,
+                                        1, 0, 0, 1);
             if (sp64 != 0) {
                 sp74 = SEGMENTED_TO_VIRTUAL(sp74);
                 sp60 = Math_FAtan2F(sp74->normal.x, sp74->normal.z) * ((f32)0x8000 / M_PI);
@@ -327,8 +327,7 @@ void func_809CEA24(EnBw* this, PlayState* play) {
     if (this->unk_224 != 0) {
         this->unk_224--;
     }
-    if ((this->unk_234 == 0) &&
-        !Actor_TestFloorInDirection(&this->actor, play, 50.0f, this->unk_236 + this->unk_238)) {
+    if ((this->unk_234 == 0) && !Actor_TestFloorInDirection(&this->actor, play, 50.0f, this->unk_236 + this->unk_238)) {
         if (this->unk_238 != 0x4000) {
             this->unk_238 = 0x4000;
         } else {
@@ -360,7 +359,8 @@ void func_809CEA24(EnBw* this, PlayState* play) {
                 Math_SmoothStepToS(&this->actor.world.rot.y, this->unk_236 + this->unk_238, 1,
                                    this->actor.speedXZ * 1000.0f, 0);
             }
-            if ((this->unk_224 == 0) || (ABS(this->actor.yDistToPlayer) > 60.0f) || (player2->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
+            if ((this->unk_224 == 0) || (ABS(this->actor.yDistToPlayer) > 60.0f) ||
+                (player2->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE))) {
                 this->unk_221 = 3;
                 this->unk_224 = 150;
                 this->unk_250 = 0.0f;
@@ -729,8 +729,7 @@ void func_809D0584(EnBw* this, PlayState* play) {
                 this->unk_248 = 0.0f;
             }
         }
-        if ((play->actorCtx.unk_02 != 0) && (this->actor.xzDistToPlayer <= 400.0f) &&
-            (this->actor.bgCheckFlags & 1)) {
+        if ((play->actorCtx.unk_02 != 0) && (this->actor.xzDistToPlayer <= 400.0f) && (this->actor.bgCheckFlags & 1)) {
             if (this->unk_220 == 5) {
                 this->unk_23C = 0;
                 func_809CFF10(this);
@@ -812,8 +811,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) {
     thisx->focus.pos.y += 5.0f;
 }
 
-s32 EnBw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnBw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnBw* this = (EnBw*)thisx;
 
     if (limbIndex == 1) {
@@ -829,8 +827,7 @@ s32 EnBw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po
             Matrix_RotateZ(-(this->unk_258 * 0.1f), MTXMODE_APPLY);
             Matrix_RotateY(-(this->unk_258 * 0.13f), MTXMODE_APPLY);
             Matrix_RotateX(-(this->unk_258 * 0.115f), MTXMODE_APPLY);
-            gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList((*gfx)++, *dList);
             Matrix_Pop();
             return 1;
@@ -857,16 +854,16 @@ void EnBw_Draw(Actor* thisx, PlayState* play2) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         gDPSetEnvColor(POLY_OPA_DISP++, this->color1.r, this->color1.g, this->color1.b, this->color1.a);
         gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]);
-        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnBw_OverrideLimbDraw, NULL, this, POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnBw_OverrideLimbDraw, NULL, this, POLY_OPA_DISP);
     } else {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 0, 0, 0, this->color1.a);
         gDPSetEnvColor(POLY_XLU_DISP++, this->color1.r, this->color1.g, this->color1.b, this->color1.a);
         gSPSegment(POLY_XLU_DISP++, 0x08, &D_80116280[0]);
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnBw_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnBw_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
     }
 
     if (((play->gameplayFrames + 1) % 4) == (u32)thisx->params) {
@@ -886,13 +883,12 @@ void EnBw_Draw(Actor* thisx, PlayState* play2) {
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
 
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                (play->gameplayFrames * -20) % 0x200, 0x20, 0x80));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (play->gameplayFrames * -20) % 0x200,
+                                0x20, 0x80));
     gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255);
     Matrix_Scale(this->unk_248 * 0.01f, this->unk_248 * 0.01f, this->unk_248 * 0.01f, MTXMODE_APPLY);
     Matrix_ReplaceRotation(&play->billboardMtxF);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     if (this->iceTimer != 0) {
diff --git a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c
index 26e02d52e8..34ef3565f6 100644
--- a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c
+++ b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c
@@ -215,10 +215,8 @@ void EnBx_Draw(Actor* thisx, PlayState* play) {
     gSPSegment(POLY_OPA_DISP++, 0x0C, mtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809D2560[this->actor.params & 0x7F]));
     gSPSegment(POLY_OPA_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (play->gameplayFrames * -10) % 128,
-                                32, 32));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (play->gameplayFrames * -10) % 128, 32, 32));
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params & 0x80) {
         func_809D1D0C(&this->actor, play);
diff --git a/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index 4c4695e77d..5803633a1f 100644
--- a/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/soh/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -102,8 +102,8 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
     if (play->roomCtx.curRoom.num >= 6) {
         rewardChestParams = ((Flags_GetItemGetInf(ITEMGETINF_1B)) ? (0x4EA0) : (0x4EC0));
         rewardChestParams = sTreasureFlags[5] | rewardChestParams;
-        this->finalChest = (EnBox*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_BOX,
-                                                      20.0f, 20.0f, -2500.0f, 0, 0x7FFF, 0, rewardChestParams);
+        this->finalChest = (EnBox*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_BOX, 20.0f, 20.0f,
+                                                      -2500.0f, 0, 0x7FFF, 0, rewardChestParams);
         if (this->finalChest != NULL) {
             if (this->roomChestsOpened) {
                 Flags_SetTreasure(play, rewardChestParams & 0x1F);
@@ -166,17 +166,16 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
         if (this->roomChestsOpened) {
             Flags_SetTreasure(play, this->leftChestNum & 0x1F);
         } else {
-            Actor_Spawn(
-                &play->actorCtx, play, ACTOR_ITEM_ETCETERA, sLeftChestPos[play->roomCtx.curRoom.num].x,
-                sLeftChestPos[play->roomCtx.curRoom.num].y, sLeftChestPos[play->roomCtx.curRoom.num].z, 0, 0,
-                0, ((this->leftChestNum & 0x1F) << 8) + (leftChestItem & 0xFF), true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, sLeftChestPos[play->roomCtx.curRoom.num].x,
+                        sLeftChestPos[play->roomCtx.curRoom.num].y, sLeftChestPos[play->roomCtx.curRoom.num].z, 0, 0, 0,
+                        ((this->leftChestNum & 0x1F) << 8) + (leftChestItem & 0xFF), true);
         }
     }
 
     this->rightChest = (EnBox*)Actor_SpawnAsChild(
         &play->actorCtx, &this->actor, play, ACTOR_EN_BOX, sRightChestPos[play->roomCtx.curRoom.num].x,
-        sRightChestPos[play->roomCtx.curRoom.num].y, sRightChestPos[play->roomCtx.curRoom.num].z, 0, 0x3FFF,
-        0, rightChestParams);
+        sRightChestPos[play->roomCtx.curRoom.num].y, sRightChestPos[play->roomCtx.curRoom.num].z, 0, 0x3FFF, 0,
+        rightChestParams);
 
     if (this->rightChest != NULL) {
         // "Right treasure generation (what does it contain?)"
@@ -195,9 +194,8 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
             return;
         }
 
-        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA,
-                    sRightChestPos[play->roomCtx.curRoom.num].x, sRightChestPos[play->roomCtx.curRoom.num].y,
-                    sRightChestPos[play->roomCtx.curRoom.num].z, 0, 0, 0,
+        Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, sRightChestPos[play->roomCtx.curRoom.num].x,
+                    sRightChestPos[play->roomCtx.curRoom.num].y, sRightChestPos[play->roomCtx.curRoom.num].z, 0, 0, 0,
                     ((this->rightChestNum & 0x1F) << 8) + (rightChestItem & 0xFF), true);
     }
 
@@ -247,8 +245,7 @@ void EnChanger_OpenChests(EnChanger* this, PlayState* play) {
                     temp_s0_2 = (s16)(this->rightChestGetItemId - GI_RUPEE_GREEN_LOSE) + EXITEM_CHEST;
                     // "Open right treasure (chest)"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2);
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0,
-                                temp_s0_2, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0, temp_s0_2, true);
                 }
                 break;
             case CHEST_RIGHT:
@@ -263,8 +260,7 @@ void EnChanger_OpenChests(EnChanger* this, PlayState* play) {
                     temp_s0_2 = (s16)(this->leftChestGetItemId - 0x72) + 0xA;
                     // "Open left treasure (chest)"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2);
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0,
-                                temp_s0_2, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0, temp_s0_2, true);
                 }
                 break;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index b7a6bd4a6e..0b4f3bf0a5 100644
--- a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -5,7 +5,9 @@
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnClearTag_Init(Actor* thisx, PlayState* play);
 void EnClearTag_Destroy(Actor* thisx, PlayState* play);
@@ -16,12 +18,11 @@ void EnClearTag_Reset(void);
 void EnClearTag_UpdateEffects(PlayState* play);
 void EnClearTag_DrawEffects(PlayState* play);
 
-void EnClearTag_CreateDebrisEffect(PlayState* play, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
-                                   f32 scale, f32 floorHeight);
+void EnClearTag_CreateDebrisEffect(PlayState* play, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
+                                   f32 floorHeight);
 void EnClearTag_CreateFireEffect(PlayState* play, Vec3f* pos, f32 scale);
 void EnClearTag_CreateSmokeEffect(PlayState* play, Vec3f* position, f32 scale);
-void EnClearTag_CreateFlashEffect(PlayState* play, Vec3f* position, f32 scale, f32 floorHeight,
-                                  Vec3f* floorTangent);
+void EnClearTag_CreateFlashEffect(PlayState* play, Vec3f* position, f32 scale, f32 floorHeight, Vec3f* floorTangent);
 
 void EnClearTag_CalculateFloorTangent(EnClearTag* this);
 
@@ -82,8 +83,8 @@ static ColliderCylinderInit sLaserCylinderInit = {
     { 15, 30, 10, { 0, 0, 0 } },
 };
 
-//static UNK_TYPE4 D_809D5C98 = 0; // unused
-//static UNK_TYPE4 D_809D5C9C = 0; // unused
+// static UNK_TYPE4 D_809D5C98 = 0; // unused
+// static UNK_TYPE4 D_809D5C9C = 0; // unused
 
 EnClearTagEffect sClearTagEffects[CLEAR_TAG_EFFECT_MAX_COUNT];
 
@@ -93,8 +94,8 @@ EnClearTagEffect sClearTagEffects[CLEAR_TAG_EFFECT_MAX_COUNT];
  * Creates a debris effect.
  * Debris effects are spawned when the Arwing dies. It spawns fire effects.
  */
-void EnClearTag_CreateDebrisEffect(PlayState* play, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
-                                   f32 scale, f32 floorHeight) {
+void EnClearTag_CreateDebrisEffect(PlayState* play, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
+                                   f32 floorHeight) {
     s16 i;
     EnClearTagEffect* effect = (EnClearTagEffect*)play->specialEffects;
 
@@ -191,8 +192,7 @@ void EnClearTag_CreateSmokeEffect(PlayState* play, Vec3f* position, f32 scale) {
  * Flash effects are spawned when the Arwing dies.
  * Flash effects two components: 1) a billboard flash, and 2) a light effect on the ground.
  */
-void EnClearTag_CreateFlashEffect(PlayState* play, Vec3f* position, f32 scale, f32 floorHeight,
-                                  Vec3f* floorTangent) {
+void EnClearTag_CreateFlashEffect(PlayState* play, Vec3f* position, f32 scale, f32 floorHeight, Vec3f* floorTangent) {
     s16 i;
     EnClearTagEffect* effect = (EnClearTagEffect*)play->specialEffects;
 
@@ -262,7 +262,8 @@ void EnClearTag_Init(Actor* thisx, PlayState* play) {
 
         // Change Arwing to regular enemy instead of boss with enemy randomizer and crowd control.
         // This way Arwings will be considered for "clear enemy" rooms properly.
-        if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+            (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
             Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_ENEMY);
         }
 
@@ -478,11 +479,12 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) {
 
                     // Introduce a range requirement in Enemy Rando so Arwings don't shoot the player from
                     // across the map. Especially noticeable in big maps like Lake Hylia and Hyrule Field.
-                    uint8_t enemyRandoShootLaser = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || this->actor.xzDistToPlayer < 1000.0f;
+                    uint8_t enemyRandoShootLaser = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+                                                   this->actor.xzDistToPlayer < 1000.0f;
 
                     // Check if the Arwing should fire its laser.
                     if ((this->frameCounter % 4) == 0 && (Rand_ZeroOne() < 0.75f) &&
-                            (this->state == CLEAR_TAG_STATE_TARGET_LOCKED) && enemyRandoShootLaser) {
+                        (this->state == CLEAR_TAG_STATE_TARGET_LOCKED) && enemyRandoShootLaser) {
                         this->shouldShootLaser = true;
                     }
                 } else {
@@ -630,8 +632,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) {
                     Math_ApproachF(&this->cutsceneCameraEye.x, cutsceneCameraEyeTarget.x, 0.2f, 500.0f);
                     Math_ApproachF(&this->cutsceneCameraEye.y, cutsceneCameraEyeTarget.y, 0.2f, 500.0f);
                     Math_ApproachF(&this->cutsceneCameraEye.z, cutsceneCameraEyeTarget.z, 0.2f, 500.0f);
-                    Play_CameraSetAtEye(play, this->cameraId, &this->cutsceneCameraEye,
-                                            &this->cutsceneCameraAt);
+                    Play_CameraSetAtEye(play, this->cameraId, &this->cutsceneCameraEye, &this->cutsceneCameraAt);
                 }
 
                 // Cutscene has finished.
@@ -657,8 +658,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) {
         crashEffectLocation.x = this->actor.world.pos.x;
         crashEffectLocation.y = (this->actor.world.pos.y + 40.0f) - 30.0f;
         crashEffectLocation.z = this->actor.world.pos.z;
-        EnClearTag_CreateFlashEffect(play, &crashEffectLocation, 6.0f, this->actor.floorHeight,
-                                     &this->floorTangent);
+        EnClearTag_CreateFlashEffect(play, &crashEffectLocation, 6.0f, this->actor.floorHeight, &this->floorTangent);
 
         // Spawn smoke effect.
         crashEffectLocation.y = (this->actor.world.pos.y + 30.0f) - 50.0f;
@@ -677,9 +677,8 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) {
             debrisEffectAcceleration.y = -1.0f;
             debrisEffectAcceleration.z = 0.0f;
 
-            EnClearTag_CreateDebrisEffect(play, &crashEffectLocation, &crashEffectVelocity,
-                                          &debrisEffectAcceleration, Rand_ZeroFloat(0.15f) + 0.075f,
-                                          this->actor.floorHeight);
+            EnClearTag_CreateDebrisEffect(play, &crashEffectLocation, &crashEffectVelocity, &debrisEffectAcceleration,
+                                          Rand_ZeroFloat(0.15f) + 0.075f, this->actor.floorHeight);
         }
     }
 
@@ -711,13 +710,11 @@ void EnClearTag_Draw(Actor* thisx, PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 255, 0, 255);
 
             Matrix_Translate(25.0f, 0.0f, 0.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL);
 
             Matrix_Translate(-50.0f, 0.0f, 0.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL);
         } else {
             // Draw the Arwing itself.
@@ -734,8 +731,7 @@ void EnClearTag_Draw(Actor* thisx, PlayState* play) {
                 Matrix_RotateY(yRotation, MTXMODE_APPLY);
             }
             Matrix_RotateZ(this->roll, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gArwingDL);
 
             // Draw the Arwing Backfire
@@ -748,8 +744,7 @@ void EnClearTag_Draw(Actor* thisx, PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, 155);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingBackfireDL);
 
             // Draw the Arwing shadow.
@@ -772,8 +767,7 @@ void EnClearTag_Draw(Actor* thisx, PlayState* play) {
                 Matrix_RotateY(yRotation, MTXMODE_APPLY);
             }
             Matrix_RotateZ(this->roll, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingShadowDL);
         }
     }
@@ -932,8 +926,7 @@ void EnClearTag_DrawEffects(PlayState* play) {
             Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
             Matrix_RotateY(effect->rotationY, MTXMODE_APPLY);
             Matrix_RotateX(effect->rotationX, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gArwingDebrisEffectDL);
         }
 
@@ -960,8 +953,7 @@ void EnClearTag_DrawEffects(PlayState* play) {
             Matrix_RotateX(effect->floorTangent.x, MTXMODE_APPLY);
             Matrix_RotateZ(effect->floorTangent.z, MTXMODE_APPLY);
             Matrix_Scale(effect->scale + effect->scale, 1.0f, effect->scale * 2.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectGroundDL);
 
             FrameInterpolation_RecordCloseChild();
@@ -993,10 +985,9 @@ void EnClearTag_DrawEffects(PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
             Matrix_Translate(0.0f, 20.0f, 0.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL);
-        
+
             FrameInterpolation_RecordCloseChild();
         }
     }
@@ -1017,14 +1008,13 @@ void EnClearTag_DrawEffects(PlayState* play) {
 
             // Draw the fire effect.
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 20, 0, (s8)effect->primColor.a);
-            gSPSegment(POLY_XLU_DISP++, 8,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (effect->random * -15) & 0xFF, 32, 64, 1, 0, 0,
-                                        32, 32));
+            gSPSegment(
+                POLY_XLU_DISP++, 8,
+                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (effect->random * -15) & 0xFF, 32, 64, 1, 0, 0, 32, 32));
             Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL);
 
             FrameInterpolation_RecordCloseChild();
@@ -1050,8 +1040,7 @@ void EnClearTag_DrawEffects(PlayState* play) {
             Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectDL);
 
             FrameInterpolation_RecordCloseChild();
diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index ec5d0f0938..16b1d7db24 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -120,15 +120,16 @@ void EnCow_Init(Actor* thisx, PlayState* play) {
             Collider_SetCylinder(play, &this->colliders[1], &this->actor, &sCylinderInit);
             func_809DEE9C(this);
             this->actionFunc = func_809DF96C;
-            if (GameInteractor_Should(VB_DESPAWN_HORSE_RACE_COW, (
-                play->sceneNum == SCENE_LINKS_HOUSE && (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))
-            ), this)) {
+            if (GameInteractor_Should(VB_DESPAWN_HORSE_RACE_COW,
+                                      (play->sceneNum == SCENE_LINKS_HOUSE &&
+                                       (!LINK_IS_ADULT || !Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE))),
+                                      this)) {
                 Actor_Kill(&this->actor);
                 return;
             }
 
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_COW, this->actor.world.pos.x,
-                                this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 1);
+                               this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 1);
             this->unk_278 = Rand_ZeroFloat(1000.0f) + 40.0f;
             this->unk_27A = 0;
             this->actor.targetMode = 6;
diff --git a/soh/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/soh/src/overlays/actors/ovl_En_Crow/z_en_crow.c
index 9bc35295c9..1d2e0d156e 100644
--- a/soh/src/overlays/actors/ovl_En_Crow/z_en_crow.c
+++ b/soh/src/overlays/actors/ovl_En_Crow/z_en_crow.c
@@ -3,7 +3,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
+#define FLAGS \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
 
 void EnCrow_Init(Actor* thisx, PlayState* play);
 void EnCrow_Destroy(Actor* thisx, PlayState* play);
@@ -282,9 +283,9 @@ void EnCrow_FlyIdle(EnCrow* this, PlayState* play) {
     if (this->timer != 0) {
         this->timer--;
     }
-    if ((this->timer == 0) && (this->actor.xzDistToPlayer < 300.0f) && !(player->stateFlags1 & PLAYER_STATE1_ON_HORSE) &&
-        (this->actor.yDistToWater < -40.0f) && (Player_GetMask(play) != PLAYER_MASK_SKULL) &&
-        !CVarGetInteger(CVAR_CHEAT("NoKeeseGuayTarget"), 0)) {
+    if ((this->timer == 0) && (this->actor.xzDistToPlayer < 300.0f) &&
+        !(player->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->actor.yDistToWater < -40.0f) &&
+        (Player_GetMask(play) != PLAYER_MASK_SKULL) && GameInteractor_Should(VB_GUAY_DO_DIVE_ATTACK, true, this)) {
         EnCrow_SetupDiveAttack(this);
     }
 }
@@ -319,10 +320,9 @@ void EnCrow_DiveAttack(EnCrow* this, PlayState* play) {
         Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 4, 0xC00);
     }
 
-    if ((this->timer == 0) || (Player_GetMask(play) == PLAYER_MASK_SKULL) ||
-        (this->collider.base.atFlags & AT_HIT) || (this->actor.bgCheckFlags & 9) ||
-        (player->stateFlags1 & PLAYER_STATE1_ON_HORSE) || (this->actor.yDistToWater > -40.0f) ||
-        CVarGetInteger(CVAR_CHEAT("NoKeeseGuayTarget"), 0)) {
+    if ((this->timer == 0) || (Player_GetMask(play) == PLAYER_MASK_SKULL) || (this->collider.base.atFlags & AT_HIT) ||
+        (this->actor.bgCheckFlags & 9) || (player->stateFlags1 & PLAYER_STATE1_ON_HORSE) ||
+        (this->actor.yDistToWater > -40.0f) || GameInteractor_Should(VB_GUAY_FORCE_FLY_AWAY, false, this)) {
         if (this->collider.base.atFlags & AT_HIT) {
             this->collider.base.atFlags &= ~AT_HIT;
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_KAICHO_ATTACK);
diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 15c1950aab..d04e2d47e6 100644
--- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@@ -175,8 +175,7 @@ void EnDaiku_Init(Actor* thisx, PlayState* play) {
     this->actor.shape.rot.z = 0;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable,
-                       17);
+    SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable, 17);
 
     if (!noKill) {
         Actor_Kill(&this->actor);
@@ -276,7 +275,8 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) {
                 if (this->stateFlags & ENDAIKU_STATEFLAG_GERUDODEFEATED) {
                     freedCount = 0;
                     for (carpenterType = 0; carpenterType < 4; carpenterType++) {
-                        if (gSaveContext.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & EVENTCHKINF_CARPENTERS_FREE_MASK(carpenterType)) {
+                        if (gSaveContext.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] &
+                            EVENTCHKINF_CARPENTERS_FREE_MASK(carpenterType)) {
                             freedCount++;
                         }
                     }
@@ -383,7 +383,8 @@ void EnDaiku_Jailed(EnDaiku* this, PlayState* play) {
 void EnDaiku_WaitFreedom(EnDaiku* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
 
-    if (Flags_GetSwitch(play, this->actor.params >> 8 & 0x3F) || (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY))) {
+    if (Flags_GetSwitch(play, this->actor.params >> 8 & 0x3F) ||
+        (IS_RANDO && Flags_GetRandomizerInf(RAND_INF_HAS_SKELETON_KEY))) {
         this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY;
         EnDaiku_UpdateText(this, play);
     }
@@ -404,8 +405,10 @@ void EnDaiku_InitEscape(EnDaiku* this, PlayState* play) {
     EnDaiku_ChangeAnim(this, ENDAIKU_ANIM_RUN, &this->currentAnimIndex);
     this->stateFlags &= ~(ENDAIKU_STATEFLAG_1 | ENDAIKU_STATEFLAG_2);
 
-    gSaveContext.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] |= EVENTCHKINF_CARPENTERS_FREE_MASK(this->actor.params & 3);
-    GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_CARPENTERS_FREE_INDEX << 4) + (this->actor.params & 3));
+    gSaveContext.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] |=
+        EVENTCHKINF_CARPENTERS_FREE_MASK(this->actor.params & 3);
+    GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF,
+                                    (EVENTCHKINF_CARPENTERS_FREE_INDEX << 4) + (this->actor.params & 3));
 
     this->actor.gravity = -1.0f;
     this->escapeSubCamTimer = sEscapeSubCamParams[this->actor.params & 3].maxFramesActive;
@@ -451,6 +454,10 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) {
     this->subCamActive = true;
     this->escapeSubCamTimer = sEscapeSubCamParams[this->actor.params & 3].maxFramesActive;
 
+    if (!GameInteractor_Should(VB_PLAY_CARPENTER_FREE_CS, true, this)) {
+        return;
+    }
+
     eyePosDeltaLocal.x = sEscapeSubCamParams[this->actor.params & 3].eyePosDeltaLocal.x;
     eyePosDeltaLocal.y = sEscapeSubCamParams[this->actor.params & 3].eyePosDeltaLocal.y;
     eyePosDeltaLocal.z = sEscapeSubCamParams[this->actor.params & 3].eyePosDeltaLocal.z;
@@ -477,6 +484,10 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) {
 void EnDaiku_UpdateSubCamera(EnDaiku* this, PlayState* play) {
     s32 pad;
 
+    if (!GameInteractor_Should(VB_PLAY_CARPENTER_FREE_CS, true, this)) {
+        return;
+    }
+
     this->subCamAtTarget.x = this->actor.world.pos.x;
     this->subCamAtTarget.y = this->actor.world.pos.y + 60.0f;
     this->subCamAtTarget.z = this->actor.world.pos.z;
@@ -493,8 +504,10 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) {
     Actor* gerudoGuard;
     Vec3f vec;
 
-    Play_ClearCamera(play, this->subCamId);
-    Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+    if (GameInteractor_Should(VB_PLAY_CARPENTER_FREE_CS, true, this)) {
+        Play_ClearCamera(play, this->subCamId);
+        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+    }
     this->subCamActive = false;
 
     if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
diff --git a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
index 3798f1adf9..9852620e0b 100644
--- a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
+++ b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
@@ -159,8 +159,7 @@ void EnDaikuKakariko_Init(Actor* thisx, PlayState* play) {
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable,
-                       17);
+    SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable, 17);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
 
@@ -496,8 +495,7 @@ void EnDaikuKakariko_Update(Actor* thisx, PlayState* play) {
     Math_SmoothStepToS(&this->neckAngle.x, this->neckAngleTarget.x, 1, 1820, 0);
 }
 
-s32 EnDaikuKakariko_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                     void* thisx) {
+s32 EnDaikuKakariko_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnDaikuKakariko* this = (EnDaikuKakariko*)thisx;
     Vec3s angle;
 
@@ -560,7 +558,8 @@ void EnDaikuKakariko_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_OPA_DISP++, 200, 0, 150, 255);
     }
 
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw, thisx);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw,
+                              thisx);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
index 21f2780777..b84103a4a0 100644
--- a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@@ -230,8 +230,8 @@ void EnDekubaba_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 22.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gDekuBabaSkel, &gDekuBabaFastChompAnim, this->jointTable,
-                   this->morphTable, 8);
+    SkelAnime_Init(play, &this->skelAnime, &gDekuBabaSkel, &gDekuBabaFastChompAnim, this->jointTable, this->morphTable,
+                   8);
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
 
@@ -543,8 +543,8 @@ void EnDekubaba_Grow(EnDekubaba* this, PlayState* play) {
     this->actor.world.pos.x = this->actor.home.pos.x + headShiftX;
     this->actor.world.pos.z = this->actor.home.pos.z + headShiftZ;
 
-    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f,
-                             this->size * 5.0f, 1, HAHEN_OBJECT_DEFAULT, 10, NULL);
+    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f, this->size * 5.0f,
+                             1, HAHEN_OBJECT_DEFAULT, 10, NULL);
 
     if (this->timer == 0) {
         if (Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) < 240.0f * this->size) {
@@ -604,8 +604,8 @@ void EnDekubaba_Retract(EnDekubaba* this, PlayState* play) {
     this->actor.world.pos.x = this->actor.home.pos.x + xShift;
     this->actor.world.pos.z = this->actor.home.pos.z + zShift;
 
-    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f,
-                             this->size * 5.0f, 1, HAHEN_OBJECT_DEFAULT, 0xA, NULL);
+    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f, this->size * 5.0f,
+                             1, HAHEN_OBJECT_DEFAULT, 0xA, NULL);
 
     if (this->timer == 0) {
         EnDekubaba_SetupWait(this);
@@ -1015,8 +1015,8 @@ void EnDekubaba_ShrinkDie(EnDekubaba* this, PlayState* play) {
 
     this->actor.scale.y = this->actor.scale.z = this->actor.scale.x;
     this->actor.shape.rot.z += 0x1C70;
-    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f,
-                             this->size * 5.0f, 1, HAHEN_OBJECT_DEFAULT, 10, NULL);
+    EffectSsHahen_SpawnBurst(play, &this->actor.home.pos, this->size * 3.0f, 0, this->size * 12.0f, this->size * 5.0f,
+                             1, HAHEN_OBJECT_DEFAULT, 10, NULL);
 }
 
 void EnDekubaba_DeadStickDrop(EnDekubaba* this, PlayState* play) {
@@ -1165,8 +1165,7 @@ void EnDekubaba_DrawStemRetracted(EnDekubaba* this, PlayState* play) {
                      MTXMODE_NEW);
     Matrix_RotateZYX(this->stemSectionAngle[0], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
     Matrix_Scale(horizontalScale, horizontalScale, horizontalScale, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemTopDL);
 
     Actor_SetFocus(&this->actor, 0.0f);
@@ -1210,8 +1209,7 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, PlayState* play) {
 
         Matrix_Put(&mtx);
         Matrix_RotateZYX(this->stemSectionAngle[i], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]);
 
@@ -1245,8 +1243,7 @@ void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Matrix_RotateZYX(this->stemSectionAngle[2], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL);
 
     Collider_UpdateSpheres(55, &this->collider);
@@ -1268,8 +1265,7 @@ void EnDekubaba_DrawBaseShadow(EnDekubaba* this, PlayState* play) {
 
     horizontalScale = this->size * 0.15f;
     Matrix_Scale(horizontalScale, 1.0f, horizontalScale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -1290,8 +1286,7 @@ void EnDekubaba_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
     if (this->actionFunc != EnDekubaba_DeadStickDrop) {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL,
-                          EnDekubaba_PostLimbDraw, this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnDekubaba_PostLimbDraw, this);
 
         if (this->actionFunc == EnDekubaba_Wait) {
             EnDekubaba_DrawStemRetracted(this, play);
@@ -1303,8 +1298,7 @@ void EnDekubaba_Draw(Actor* thisx, PlayState* play) {
         Matrix_Translate(this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, MTXMODE_NEW);
         Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL);
 
         if (this->actionFunc == EnDekubaba_PrunedSomersault) {
@@ -1318,16 +1312,14 @@ void EnDekubaba_Draw(Actor* thisx, PlayState* play) {
         // Display solid until 40 frames left, then blink until killed.
     } else if ((this->timer > 40) || ((this->timer % 2) != 0)) {
         Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-//OTRTODO fix this one
+// OTRTODO fix this one
 void EnDekuBaba_Reset(void) {
     // DMG_ENTRY(2, DEKUBABA_DMGEFF_SWORD)
-    
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/soh/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
index 4dca644a3e..ac2b5f7ee1 100644
--- a/soh/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+++ b/soh/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
@@ -117,8 +117,8 @@ void EnDekunuts_Init(Actor* thisx, PlayState* play) {
         thisx->flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE);
     } else {
         ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
-        SkelAnime_Init(play, &this->skelAnime, &gDekuNutsSkel, &gDekuNutsStandAnim, this->jointTable,
-                       this->morphTable, 25);
+        SkelAnime_Init(play, &this->skelAnime, &gDekuNutsSkel, &gDekuNutsStandAnim, this->jointTable, this->morphTable,
+                       25);
         Collider_InitCylinder(play, &this->collider);
         Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
         CollisionCheck_SetInfo(&thisx->colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -128,8 +128,8 @@ void EnDekunuts_Init(Actor* thisx, PlayState* play) {
             this->shotsPerRound = 1;
         }
         EnDekunuts_SetupWait(this);
-        Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_DEKUNUTS, thisx->world.pos.x,
-                           thisx->world.pos.y, thisx->world.pos.z, 0, thisx->world.rot.y, 0, DEKUNUTS_FLOWER);
+        Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_EN_DEKUNUTS, thisx->world.pos.x, thisx->world.pos.y,
+                           thisx->world.pos.z, 0, thisx->world.rot.y, 0, DEKUNUTS_FLOWER);
     }
 }
 
@@ -435,8 +435,8 @@ void EnDekunuts_Die(EnDekunuts* this, PlayState* play) {
         effectPos.x = this->actor.world.pos.x;
         effectPos.y = this->actor.world.pos.y + 18.0f;
         effectPos.z = this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAndAccel, &effectVelAndAccel, 200, 0, 255, 255, 255, 255,
-                             150, 150, 150, 1, 13, 1);
+        EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAndAccel, &effectVelAndAccel, 200, 0, 255, 255, 255, 255, 150,
+                             150, 150, 1, 13, 1);
         effectPos.y = this->actor.world.pos.y + 10.0f;
         EffectSsHahen_SpawnBurst(play, &effectPos, 3.0f, 0, 12, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL);
         Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0x30);
@@ -481,8 +481,7 @@ void EnDekunuts_Update(Actor* thisx, PlayState* play) {
         EnDekunuts_ColliderCheck(this, play);
         this->actionFunc(this, play);
         Actor_MoveXZGravity(&this->actor);
-        Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height,
-                                0x1D);
+        Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height, 0x1D);
         Collider_UpdateCylinder(&this->actor, &this->collider);
         if (this->collider.base.acFlags & AC_ON) {
             CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
@@ -499,8 +498,7 @@ void EnDekunuts_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnDekunuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 EnDekunuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnDekunuts* this = (EnDekunuts*)thisx;
     f32 x;
     f32 y;
@@ -536,7 +534,6 @@ void EnDekunuts_Draw(Actor* thisx, PlayState* play) {
     if (this->actor.params == DEKUNUTS_FLOWER) {
         Gfx_DrawDListOpa(play, gDekuNutsFlowerDL);
     } else {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDekunuts_OverrideLimbDraw,
-                          NULL, this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDekunuts_OverrideLimbDraw, NULL, this);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c
index 935384c594..5f09f29875 100644
--- a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+++ b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c
@@ -3,7 +3,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
 typedef enum {
     /* 0 */ DH_WAIT,
@@ -170,8 +172,7 @@ void EnDh_Destroy(Actor* thisx, PlayState* play) {
     ResourceMgr_UnregisterSkeleton(&this->skelAnime);
 }
 
-void EnDh_SpawnDebris(PlayState* play, EnDh* this, Vec3f* spawnPos, f32 spread, s32 arg4, f32 accelXZ,
-                      f32 scale) {
+void EnDh_SpawnDebris(PlayState* play, EnDh* this, Vec3f* spawnPos, f32 spread, s32 arg4, f32 accelXZ, f32 scale) {
     Vec3f pos;
     Vec3f vel = { 0.0f, 8.0f, 0.0f };
     Vec3f accel = { 0.0f, -1.5f, 0.0f };
@@ -558,8 +559,8 @@ void EnDh_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha);
         gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]);
         POLY_OPA_DISP =
-            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                               this->skelAnime.dListCount, NULL, EnDh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               NULL, EnDh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
     } else {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
@@ -572,15 +573,13 @@ void EnDh_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 85, 55, 0, 130);
         gSPSegment(POLY_XLU_DISP++, 0x08,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, (play->state.frames * -3) % 0x80, 0, 0x20, 0x40, 1,
-                                    (play->state.frames * -10) % 0x80, (play->state.frames * -20) % 0x100,
-                                    0x20, 0x40));
+                                    (play->state.frames * -10) % 0x80, (play->state.frames * -20) % 0x100, 0x20, 0x40));
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 0, 0, 0, this->dirtWaveAlpha);
 
         Matrix_Translate(0.0f, -this->actor.shape.yOffset, 0.0f, MTXMODE_APPLY);
         Matrix_Scale(this->dirtWaveSpread * 0.01f, this->dirtWaveHeight * 0.01f, this->dirtWaveSpread * 0.01f,
                      MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, object_dh_DL_007FC0);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
index ab109d6074..ab615bf546 100644
--- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
@@ -108,7 +108,7 @@ void EnDivingGame_Destroy(Actor* thisx, PlayState* play) {
 
     if (this->unk_31F == 0) {
         sHasSpawned = false;
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
     }
     Collider_DestroyCylinder(play, &this->collider);
 
@@ -132,9 +132,9 @@ void EnDivingGame_SpawnRuppy(EnDivingGame* this, PlayState* play) {
 }
 
 s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
-    if (gSaveContext.timer1State == 10 && !Play_InCsMode(play)) {
+    if (gSaveContext.timerState == 10 && !Play_InCsMode(play)) {
         // Failed.
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
         func_800F5B58();
         Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
         this->actor.textId = 0x71AD;
@@ -152,7 +152,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
         }
         if (this->grabbedRupeesCounter >= rupeesNeeded) {
             // Won.
-            gSaveContext.timer1State = 0;
+            gSaveContext.timerState = 0;
             this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
             if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SILVER_SCALE)) {
                 this->actor.textId = 0x4055;
@@ -255,7 +255,8 @@ void EnDivingGame_HandlePlayChoice(EnDivingGame* this, PlayState* play) {
                 this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
                 break;
         }
-        if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SILVER_SCALE) || this->actor.textId == 0x85 || this->actor.textId == 0x2D) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SILVER_SCALE) || this->actor.textId == 0x85 ||
+            this->actor.textId == 0x2D) {
             Message_ContinueTextbox(play, this->actor.textId);
             this->unk_292 = TEXT_STATE_EVENT;
             this->actionFunc = func_809EE048;
@@ -467,7 +468,8 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
 
 void func_809EEA90(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         this->actionFunc = func_809EEAF8;
     } else {
         if (GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
@@ -480,7 +482,7 @@ void func_809EEA90(EnDivingGame* this, PlayState* play) {
 void func_809EEAF8(EnDivingGame* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) ||
-         !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_DIVING_MINIGAME, true, &this->actor)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
@@ -508,7 +510,7 @@ void EnDivingGame_Update(Actor* thisx, PlayState* play2) {
         this->spawnRuppyTimer--;
     }
 
-    if (gSaveContext.timer1Value == 10) {
+    if (gSaveContext.timerSeconds == 10) {
         func_800F5918();
     }
     if (this->eyeTimer == 0) {
@@ -544,8 +546,7 @@ Gfx* EnDivingGame_EmptyDList(GraphicsContext* gfxCtx) {
     return displayList;
 }
 
-s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnDivingGame* this = (EnDivingGame*)thisx;
     s32 pad;
 
diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index 53308713dc..4ba3520b19 100644
--- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -91,18 +91,18 @@ static char* sItemDebugTxt[] = {
     "緑のくすり売り          ", "デクの棒持てる数を増やす", "デクの実持てる数を増やす",
 };
 
-static DnsItemEntry sItemNuts =        { 20,  5, GI_NUTS_5_2,     EnDns_CanBuyDekuNuts,   EnDns_PayForDekuNuts };
-static DnsItemEntry sItemSticks =      { 15,  1, GI_STICKS_1,     EnDns_CanBuyDekuSticks, EnDns_PayPrice };
-static DnsItemEntry sItemHeartPiece =  { 10,  1, GI_HEART_PIECE,  EnDns_CanBuyPrice,      EnDns_PayForHeartPiece };
-static DnsItemEntry sItemSeeds =       { 40, 30, GI_SEEDS_30,     EnDns_CanBuyDekuSeeds,  EnDns_PayPrice };
-static DnsItemEntry sItemDekuShield =  { 50,  1, GI_SHIELD_DEKU,  EnDns_CanBuyDekuShield, EnDns_PayPrice };
-static DnsItemEntry sItemBombs =       { 40,  5, GI_BOMBS_5,      EnDns_CanBuyBombs,      EnDns_PayForBombs };
-static DnsItemEntry sItemArrows =      { 70, 20, GI_ARROWS_LARGE, EnDns_CanBuyArrows,     EnDns_PayForArrows };
-static DnsItemEntry sItemRedPotion =   { 40,  1, GI_POTION_RED,   EnDns_CanBuyBottle,     EnDns_PayPrice };
-static DnsItemEntry sItemGreenPotion = { 40,  1, GI_POTION_GREEN, EnDns_CanBuyBottle,     EnDns_PayPrice };
+static DnsItemEntry sItemNuts = { 20, 5, GI_NUTS_5_2, EnDns_CanBuyDekuNuts, EnDns_PayForDekuNuts };
+static DnsItemEntry sItemSticks = { 15, 1, GI_STICKS_1, EnDns_CanBuyDekuSticks, EnDns_PayPrice };
+static DnsItemEntry sItemHeartPiece = { 10, 1, GI_HEART_PIECE, EnDns_CanBuyPrice, EnDns_PayForHeartPiece };
+static DnsItemEntry sItemSeeds = { 40, 30, GI_SEEDS_30, EnDns_CanBuyDekuSeeds, EnDns_PayPrice };
+static DnsItemEntry sItemDekuShield = { 50, 1, GI_SHIELD_DEKU, EnDns_CanBuyDekuShield, EnDns_PayPrice };
+static DnsItemEntry sItemBombs = { 40, 5, GI_BOMBS_5, EnDns_CanBuyBombs, EnDns_PayForBombs };
+static DnsItemEntry sItemArrows = { 70, 20, GI_ARROWS_LARGE, EnDns_CanBuyArrows, EnDns_PayForArrows };
+static DnsItemEntry sItemRedPotion = { 40, 1, GI_POTION_RED, EnDns_CanBuyBottle, EnDns_PayPrice };
+static DnsItemEntry sItemGreenPotion = { 40, 1, GI_POTION_GREEN, EnDns_CanBuyBottle, EnDns_PayPrice };
 
 static DnsItemEntry sItemStickUpgrade = { 40, 1, GI_STICK_UPGRADE_20, EnDns_CanBuyPrice, EnDns_PayForDekuStickUpgrade };
-static DnsItemEntry sItemNutUpgrade =   { 40, 1, GI_NUT_UPGRADE_30,   EnDns_CanBuyPrice, EnDns_PayForDekuNutUpgrade };
+static DnsItemEntry sItemNutUpgrade = { 40, 1, GI_NUT_UPGRADE_30, EnDns_CanBuyPrice, EnDns_PayForDekuNutUpgrade };
 
 static DnsItemEntry* sItemEntries[] = {
     &sItemNuts,   &sItemSticks,    &sItemHeartPiece,  &sItemSeeds,        &sItemDekuShield, &sItemBombs,
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
index 05cda9db49..ba5d8a92fd 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
@@ -82,9 +82,9 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) {
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST);
     for (i = 0; i < 9; i++) {
         this->scrubPos[i] = sScrubPos[i];
-        this->scrubs[i] = (EnDntNomal*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play,
-                                                          ACTOR_EN_DNT_NOMAL, this->scrubPos[i].x, this->scrubPos[i].y,
-                                                          this->scrubPos[i].z, 0, 0, 0, i + ENDNTNOMAL_STAGE);
+        this->scrubs[i] = (EnDntNomal*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DNT_NOMAL,
+                                                          this->scrubPos[i].x, this->scrubPos[i].y, this->scrubPos[i].z,
+                                                          0, 0, 0, i + ENDNTNOMAL_STAGE);
         if (this->scrubs[i] != NULL) {
             // "zako zako" [small fries]
             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]);
@@ -169,8 +169,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) {
                     if (GameInteractor_Should(VB_DEKU_SCRUBS_REACT_TO_MASK_OF_TRUTH,
                                               !Flags_GetItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE) &&
                                                   (Player_GetMask(play) != PLAYER_MASK_SKULL))) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         this->prize = DNT_PRIZE_NUTS;
                         this->leader->stageSignal = DNT_LEADER_SIGNAL_UP;
                         reaction = DNT_SIGNAL_LOOK;
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
index a459358ddf..832b33cbf8 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
@@ -77,8 +77,7 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) {
     EnDntJiji* this = (EnDntJiji*)thisx;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gDntJijiSkel, &gDntJijiBurrowAnim, this->jointTable, this->morphTable,
-                   13);
+    SkelAnime_Init(play, &this->skelAnime, &gDntJijiSkel, &gDntJijiBurrowAnim, this->jointTable, this->morphTable, 13);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     this->stage = (EnDntDemo*)this->actor.parent;
@@ -442,8 +441,7 @@ void EnDntJiji_Draw(Actor* thisx, PlayState* play) {
     Matrix_Pop();
     Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
     Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDntJijiFlowerDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index 06d44e17a2..9ef576c6e3 100644
--- a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -368,8 +368,8 @@ void EnDntNomal_TargetGivePrize(EnDntNomal* this, PlayState* play) {
         f32 itemY = this->mouthPos.y;
         f32 itemZ = this->mouthPos.z;
 
-        if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, itemX, itemY, itemZ, 0,
-                               0, 0, EXITEM_BULLET_BAG) == NULL) {
+        if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, itemX, itemY, itemZ, 0, 0, 0,
+                               EXITEM_BULLET_BAG) == NULL) {
             Player_SetCsActionWithHaltedActors(play, NULL, 7);
             Actor_Kill(&this->actor);
         }
@@ -705,8 +705,8 @@ void EnDntNomal_StageAttack(EnDntNomal* this, PlayState* play) {
         spawnY = this->mouthPos.y + spawnOffset.y;
         spawnZ = this->mouthPos.z + spawnOffset.z;
 
-        nut = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_NUTSBALL, spawnX, spawnY, spawnZ,
-                          this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 4, true);
+        nut = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_NUTSBALL, spawnX, spawnY, spawnZ, this->actor.shape.rot.x,
+                          this->actor.shape.rot.y, this->actor.shape.rot.z, 4, true);
         if (nut != NULL) {
             nut->velocity.y = spawnOffset.y * 0.5f;
         }
@@ -828,8 +828,7 @@ void EnDntNomal_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnDntNomal_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 EnDntNomal_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnDntNomal* this = (EnDntNomal*)thisx;
 
     if ((limbIndex == 1) || (limbIndex == 3) || (limbIndex == 4) || (limbIndex == 5) || (limbIndex == 6)) {
@@ -864,15 +863,13 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState]));
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDntNomal_OverrideLimbDraw,
-                      EnDntNomal_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDntNomal_OverrideLimbDraw, EnDntNomal_PostLimbDraw, this);
     Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
     Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r,
                    sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDntStageFlowerDL);
     CLOSE_DISPS(play->state.gfxCtx);
     if (this->actionFunc == EnDntNomal_StageCelebrate) {
@@ -885,12 +882,10 @@ void EnDntNomal_DrawTargetScrub(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnDntNomal_PostLimbDraw,
-                      this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnDntNomal_PostLimbDraw, this);
     Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
     Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/soh/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
index 6683ae0321..ce70b32438 100644
--- a/soh/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
+++ b/soh/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
@@ -72,8 +72,8 @@ void EnDodojr_Init(Actor* thisx, PlayState* play) {
     EnDodojr* this = (EnDodojr*)thisx;
 
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 18.0f);
-    SkelAnime_Init(play, &this->skelAnime, &object_dodojr_Skel_0020E0, &object_dodojr_Anim_0009D4,
-                   this->jointTable, this->morphTable, 15);
+    SkelAnime_Init(play, &this->skelAnime, &object_dodojr_Skel_0020E0, &object_dodojr_Anim_0009D4, this->jointTable,
+                   this->morphTable, 15);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(4), &sColChkInit);
@@ -299,9 +299,9 @@ void func_809F6E54(EnDodojr* this, PlayState* play) {
     }
 
     if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &pos) > 80.0f) {
-        angleIndex = (s16)(this->actor.home.pos.x + this->actor.home.pos.y + this->actor.home.pos.z +
-                           play->state.frames / 30) %
-                     12;
+        angleIndex =
+            (s16)(this->actor.home.pos.x + this->actor.home.pos.y + this->actor.home.pos.z + play->state.frames / 30) %
+            12;
         angleIndex = ABS(angleIndex);
         pos.x += 80.0f * sinf(angles[angleIndex]);
         pos.z += 80.0f * cosf(angles[angleIndex]);
@@ -649,8 +649,6 @@ void EnDodojr_Draw(Actor* thisx, PlayState* play) {
 
     if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, func_809F7D50,
-                                  func_809F7DFC,
-                          &this->actor);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, func_809F7D50, func_809F7DFC, &this->actor);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index 7e23338058..07a244cd3c 100644
--- a/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/soh/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -319,8 +319,7 @@ void EnDodongo_Init(Actor* thisx, PlayState* play) {
     this->bodyScale.x = this->bodyScale.y = this->bodyScale.z = 1.0f;
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 48.0f);
     Actor_SetScale(&this->actor, 0.01875f);
-    SkelAnime_Init(play, &this->skelAnime, &gDodongoSkel, &gDodongoWaitAnim, this->jointTable, this->morphTable,
-                   31);
+    SkelAnime_Init(play, &this->skelAnime, &gDodongoSkel, &gDodongoWaitAnim, this->jointTable, this->morphTable, 31);
     this->actor.colChkInfo.health = 4;
     this->actor.colChkInfo.mass = MASS_HEAVY;
     this->actor.colChkInfo.damageTable = &sDamageTable;
@@ -800,8 +799,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) {
     this->actor.focus.pos.z = this->actor.world.pos.z + Math_CosS(this->actor.shape.rot.y) * -30.0f;
 }
 
-s32 EnDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnDodongo* this = (EnDodongo*)thisx;
 
     if ((limbIndex == 15) || (limbIndex == 16)) {
@@ -924,16 +922,15 @@ void EnDodongo_Draw(Actor* thisx, PlayState* play2) {
     s32 index;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDodongo_OverrideLimbDraw,
-                      EnDodongo_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDodongo_OverrideLimbDraw, EnDodongo_PostLimbDraw, this);
 
     if (this->iceTimer != 0) {
         this->actor.colorFilterTimer++;
         this->iceTimer--;
         if ((this->iceTimer % 4) == 0) {
             index = this->iceTimer >> 2;
-            EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &this->icePos[index], 150, 150, 150, 250, 235, 245,
-                                           255, 1.8f);
+            EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &this->icePos[index], 150, 150, 150, 250, 235, 245, 255,
+                                           1.8f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c
index 27619c4927..c8cb4bd971 100644
--- a/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c
+++ b/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c
@@ -375,10 +375,12 @@ void EnDog_FollowPlayer(EnDog* this, PlayState* play) {
     }
 
     if (CVarGetInteger(CVAR_ENHANCEMENT("DogFollowsEverywhere"), 0)) {
-        // If the dog is too far away it's usually because they are stuck in a hole or on a different floor, this gives them a push
+        // If the dog is too far away it's usually because they are stuck in a hole or on a different floor, this gives
+        // them a push
         if (this->actor.xyzDistToPlayerSq > 250000.0f) {
             Player* player = GET_PLAYER(play);
-            if (PlayerGrounded(player)) this->actor.world.pos.y = player->actor.world.pos.y;
+            if (PlayerGrounded(player))
+                this->actor.world.pos.y = player->actor.world.pos.y;
         }
 
         // If doggo is in the water make sure it's floating
@@ -482,8 +484,7 @@ void EnDog_Update(Actor* thisx, PlayState* play) {
 
     EnDog_PlayAnimAndSFX(this);
     SkelAnime_Update(&this->skelAnime);
-    Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.radius, this->collider.dim.height * 0.5f, 0.0f,
-                            5);
+    Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.radius, this->collider.dim.height * 0.5f, 0.0f, 5);
     Actor_MoveXZGravity(&this->actor);
     this->actionFunc(this, play);
     Collider_UpdateCylinder(&this->actor, &this->collider);
diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c
index 8208881d2f..e714cb2116 100644
--- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -66,7 +66,8 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP),
 };
 
-static AnimationHeader* D_809FCECC[] = { &gDoorAdultOpeningLeftAnim, &gDoorChildOpeningLeftAnim, &gDoorAdultOpeningRightAnim, &gDoorChildOpeningRightAnim };
+static AnimationHeader* D_809FCECC[] = { &gDoorAdultOpeningLeftAnim, &gDoorChildOpeningLeftAnim,
+                                         &gDoorAdultOpeningRightAnim, &gDoorChildOpeningRightAnim };
 
 static u8 sDoorAnimOpenFrames[] = { 25, 25, 25, 25 };
 
@@ -91,7 +92,8 @@ void EnDoor_Init(Actor* thisx, PlayState* play2) {
 
     objectInfo = &sDoorInfo[0];
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    SkelAnime_Init(play, &this->skelAnime, &gDoorSkel, &gDoorAdultOpeningLeftAnim, this->jointTable, this->morphTable, 5);
+    SkelAnime_Init(play, &this->skelAnime, &gDoorSkel, &gDoorAdultOpeningLeftAnim, this->jointTable, this->morphTable,
+                   5);
     for (i = 0; i < ARRAY_COUNT(sDoorInfo) - 2; i++, objectInfo++) {
         if (play->sceneNum == objectInfo->sceneNum) {
             break;
@@ -217,7 +219,8 @@ void EnDoor_Idle(EnDoor* this, PlayState* play) {
             }
             if (ABS(phi_v0) < 0x3000) {
                 if (this->lockTimer != 0) {
-                    if (GameInteractor_Should(VB_NOT_HAVE_SMALL_KEY, gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] <= 0, this)) {
+                    if (GameInteractor_Should(VB_NOT_HAVE_SMALL_KEY,
+                                              gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] <= 0, this)) {
                         Player* player2 = GET_PLAYER(play);
 
                         player2->naviTextId = -0x203;
@@ -280,8 +283,8 @@ void EnDoor_Open(EnDoor* this, PlayState* play) {
             this->playerIsOpening = 0;
         } else if (Animation_OnFrame(&this->skelAnime, sDoorAnimOpenFrames[this->animStyle])) {
             Audio_PlayActorSound2(&this->actor,
-                                  (play->sceneNum == SCENE_SHADOW_TEMPLE || play->sceneNum == SCENE_BOTTOM_OF_THE_WELL ||
-                                   play->sceneNum == SCENE_FIRE_TEMPLE)
+                                  (play->sceneNum == SCENE_SHADOW_TEMPLE ||
+                                   play->sceneNum == SCENE_BOTTOM_OF_THE_WELL || play->sceneNum == SCENE_FIRE_TEMPLE)
                                       ? NA_SE_EV_IRON_DOOR_OPEN
                                       : NA_SE_OC_DOOR_OPEN);
             if (this->skelAnime.playSpeed < 1.5f) {
@@ -292,8 +295,8 @@ void EnDoor_Open(EnDoor* this, PlayState* play) {
             }
         } else if (Animation_OnFrame(&this->skelAnime, sDoorAnimCloseFrames[this->animStyle])) {
             Audio_PlayActorSound2(&this->actor,
-                                  (play->sceneNum == SCENE_SHADOW_TEMPLE || play->sceneNum == SCENE_BOTTOM_OF_THE_WELL ||
-                                   play->sceneNum == SCENE_FIRE_TEMPLE)
+                                  (play->sceneNum == SCENE_SHADOW_TEMPLE ||
+                                   play->sceneNum == SCENE_BOTTOM_OF_THE_WELL || play->sceneNum == SCENE_FIRE_TEMPLE)
                                       ? NA_SE_EV_IRON_DOOR_CLOSE
                                       : NA_SE_EV_DOOR_CLOSE);
         }
@@ -319,8 +322,7 @@ s32 EnDoor_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
         temp_a2 = D_809FCEE4[this->dListIndex];
         transitionEntry = &play->transiActorCtx.list[(u16)this->actor.params >> 0xA];
         rot->z += this->actor.world.rot.y;
-        if ((play->roomCtx.prevRoom.num >= 0) ||
-            (transitionEntry->sides[0].room == transitionEntry->sides[1].room)) {
+        if ((play->roomCtx.prevRoom.num >= 0) || (transitionEntry->sides[0].room == transitionEntry->sides[1].room)) {
             phi_v0_2 = ((this->actor.shape.rot.y + this->skelAnime.jointTable[3].z) + rot->z) -
                        Math_Vec3f_Yaw(&play->view.eye, &this->actor.world.pos);
             *dList = (ABS(phi_v0_2) < 0x4000) ? temp_a2[0] : temp_a2[1];
@@ -342,9 +344,7 @@ void EnDoor_Draw(Actor* thisx, PlayState* play) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                                                   EnDoor_OverrideLimbDraw,
-                          NULL, &this->actor);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnDoor_OverrideLimbDraw, NULL, &this->actor);
         if (this->actor.world.rot.y != 0) {
             if (this->actor.world.rot.y > 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gDoorRightDL);
diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
index 3a85be38b2..1c5566d54e 100644
--- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
+++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
@@ -95,7 +95,7 @@ void EnDs_GiveOddPotion(EnDs* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_TRADE_ODD_MUSHROOM, true, this)) {
         this->actor.parent = NULL;
         this->actionFunc = EnDs_DisplayOddPotionText;
-        gSaveContext.timer2State = 0;
+        gSaveContext.subTimerState = 0;
     } else {
         Actor_OfferGetItem(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
     }
@@ -197,7 +197,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                         this->actionFunc = EnDs_TalkNoEmptyBottle;
                         return;
                     case 2: // have 100 rupees and empty bottle
-                        if(GameInteractor_Should(VB_GRANNY_TAKE_MONEY, true, this)){
+                        if (GameInteractor_Should(VB_GRANNY_TAKE_MONEY, true, this)) {
                             Rupees_ChangeBy(-100);
                         }
                         this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
@@ -209,7 +209,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
                             gSaveContext.ship.pendingSaleMod = itemEntry.modIndex;
                             this->actionFunc = EnDs_GiveBluePotion;
                         }
-                        
+
                         return;
                 }
                 break;
@@ -226,10 +226,12 @@ void EnDs_Wait(EnDs* this, PlayState* play) {
 
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
         if (func_8002F368(play) == EXCH_ITEM_ODD_MUSHROOM) {
-            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             player->actor.textId = 0x504A;
             this->actionFunc = EnDs_OfferOddPotion;
-        } else if (GameInteractor_Should(VB_OFFER_BLUE_POTION, Flags_GetItemGetInf(ITEMGETINF_30), this)) { // Traded odd mushroom
+        } else if (GameInteractor_Should(VB_OFFER_BLUE_POTION, Flags_GetItemGetInf(ITEMGETINF_30),
+                                         this)) { // Traded odd mushroom
             player->actor.textId = 0x500C;
             this->actionFunc = EnDs_OfferBluePotion;
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
index e00124deea..299d708693 100644
--- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -107,9 +107,9 @@ static AnimationInfo sAnimationInfoFix[] = {
     { NULL },
     { NULL },
     { &gDaruniaDancingLoop1Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f }, //
-    { &gDaruniaDancingLoop1Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // hop
-    { &gDaruniaDancingLoop2Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from hop to spin
-    { &gDaruniaDancingLoop3Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // spin
+    { &gDaruniaDancingLoop1Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },   // hop
+    { &gDaruniaDancingLoop2Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },   // from hop to spin
+    { &gDaruniaDancingLoop3Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },   // spin
     { NULL },
     { NULL },
     { &gDaruniaDancingLoop4Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from spin to hop
@@ -179,7 +179,8 @@ s16 func_809FDCDC(PlayState* play, Actor* actor) {
 s32 func_809FDDB4(EnDu* this, PlayState* play) {
     if (play->sceneNum == SCENE_GORON_CITY && LINK_IS_CHILD) {
         return 1;
-    } else if (play->sceneNum == SCENE_FIRE_TEMPLE && !Flags_GetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE) && LINK_IS_ADULT) {
+    } else if (play->sceneNum == SCENE_FIRE_TEMPLE && !Flags_GetInfTable(INFTABLE_SPOKE_TO_DARUNIA_IN_FIRE_TEMPLE) &&
+               LINK_IS_ADULT) {
         return 1;
     }
     return 0;
@@ -280,7 +281,7 @@ void func_809FE040(EnDu* this) {
         // #region SOH[Enhancement]
         if (CVarGetInteger(CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"), 1)) {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, animationIndices[this->unk_1E6]);
-        // #endregion
+            // #endregion
         } else {
             Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]);
         }
@@ -302,7 +303,7 @@ void func_809FE104(EnDu* this) {
                 // #region SOH[Enhancement]
                 if (CVarGetInteger(CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"), 1) && this->unk_1E6 <= 1) {
                     Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, animationIndices[this->unk_1E6]);
-                // #endregion
+                    // #endregion
                 } else {
                     Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]);
                 }
@@ -386,7 +387,8 @@ void func_809FE4A4(EnDu* this, PlayState* play) {
         EnDu_SetupAction(this, func_809FE890);
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         if (GameInteractor_Should(VB_PLAY_DARUNIAS_JOY_CS, true)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
             gSaveContext.cutsceneTrigger = 1;
@@ -499,7 +501,7 @@ void func_809FE890(EnDu* this, PlayState* play) {
                 // #region SOH[Enhancement]
                 if (CVarGetInteger(CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"), 1)) {
                     Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, ENDU_ANIM_7);
-                // #endregion
+                    // #endregion
                 } else {
                     Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENDU_ANIM_7);
                 }
@@ -627,8 +629,7 @@ void EnDu_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-s32 EnDu_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnDu_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnDu* this = (EnDu*)thisx;
     Vec3s sp1C;
 
diff --git a/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
index f3cb621448..5b5e84584e 100644
--- a/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
+++ b/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
@@ -115,11 +115,10 @@ void EnDyExtra_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->state.frames * 2, 0, 0x20, 0x40, 1,
-                                play->state.frames, play->state.frames * -8, 0x10, 0x10));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->state.frames * 2, 0, 0x20, 0x40, 1, play->state.frames,
+                                play->state.frames * -8, 0x10, 0x10));
     gDPPipeSync(POLY_XLU_DISP++);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g,
                     primColors[this->type].b, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128);
diff --git a/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c
index 2aa4a3a20b..1e4292383a 100644
--- a/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c
+++ b/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c
@@ -50,7 +50,7 @@ void EnEg_Init(Actor* thisx, PlayState* play) {
 }
 
 void func_809FFDC8(EnEg* this, PlayState* play) {
-    if (!voided && (gSaveContext.timer2Value < 1) && Flags_GetSwitch(play, 0x36) && (kREG(0) == 0)) {
+    if (!voided && (gSaveContext.subTimerSeconds < 1) && Flags_GetSwitch(play, 0x36) && (kREG(0) == 0)) {
         // Void the player out
         Play_TriggerRespawn(play);
         gSaveContext.respawnFlag = -2;
diff --git a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
index a0213fb024..77f6c74c28 100644
--- a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
+++ b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
@@ -124,8 +124,7 @@ void EnEiyer_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 600.0f, ActorShadow_DrawCircle, 65.0f);
-    SkelAnime_Init(play, &this->skelanime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable,
-                   19);
+    SkelAnime_Init(play, &this->skelanime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable, 19);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sColCylInit);
     CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -709,15 +708,15 @@ void EnEiyer_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]);
         gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 255);
 
-        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime,
-                                       EnEiyer_OverrideLimbDraw, NULL, this, POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawSkeleton2(play, &this->skelanime, EnEiyer_OverrideLimbDraw, NULL, this, POLY_OPA_DISP);
     } else {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPSegment(POLY_XLU_DISP++, 0x08, D_80116280);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->actor.shape.shadowAlpha);
 
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelanime,
-                                       EnEiyer_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawSkeleton2(play, &this->skelanime, EnEiyer_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index bac3a0f5da..96a9297b96 100644
--- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -403,8 +403,8 @@ void EnElf_Init(Actor* thisx, PlayState* play) {
 
             if (GameInteractor_Should(VB_SPAWN_FOUNTAIN_FAIRIES, true, this)) {
                 for (i = 0; i < 8; i++) {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, thisx->world.pos.x,
-                                thisx->world.pos.y - 30.0f, thisx->world.pos.z, 0, 0, 0, FAIRY_HEAL, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, thisx->world.pos.x, thisx->world.pos.y - 30.0f,
+                                thisx->world.pos.z, 0, 0, 0, FAIRY_HEAL, true);
                 }
             }
             break;
@@ -1202,8 +1202,8 @@ void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife) {
     envColor.g = this->outerColor.g;
     envColor.b = this->outerColor.b;
 
-    EffectSsKiraKira_SpawnDispersed(play, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor,
-                                    1000, sparkleLife);
+    EffectSsKiraKira_SpawnDispersed(play, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, 1000,
+                                    sparkleLife);
 }
 
 void func_80A04D90(EnElf* this, PlayState* play) {
@@ -1224,7 +1224,8 @@ void func_80A04DE4(EnElf* this, PlayState* play) {
     if (this->fairyFlags & 0x10) {
         naviRefPos = play->actorCtx.targetCtx.naviRefPos;
 
-        if ((player->focusActor == NULL) || (&player->actor == player->focusActor) || (&this->actor == player->focusActor)) {
+        if ((player->focusActor == NULL) || (&player->actor == player->focusActor) ||
+            (&this->actor == player->focusActor)) {
             naviRefPos.x = player->bodyPartsPos[7].x + (Math_SinS(player->actor.shape.rot.y) * 20.0f);
             naviRefPos.y = player->bodyPartsPos[7].y + 5.0f;
             naviRefPos.z = player->bodyPartsPos[7].z + (Math_CosS(player->actor.shape.rot.y) * 20.0f);
@@ -1434,8 +1435,8 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
 
     if (this->unk_2A4 > 0.0f) {
         Math_StepToF(&this->unk_2A4, 0.0f, 0.05f);
-        Environment_AdjustLights(play, SQ(this->unk_2A4) * this->unk_2A4, player->actor.projectedPos.z + 780.0f,
-                                 0.2f, 0.5f);
+        Environment_AdjustLights(play, SQ(this->unk_2A4) * this->unk_2A4, player->actor.projectedPos.z + 780.0f, 0.2f,
+                                 0.5f);
     }
 
     // temp probably fake match
@@ -1532,8 +1533,8 @@ void EnElf_Draw(Actor* thisx, PlayState* play) {
             gSPEndDisplayList(dListHead++);
             gDPSetEnvColor(POLY_XLU_DISP++, (u8)this->outerColor.r, (u8)this->outerColor.g, (u8)this->outerColor.b,
                            (u8)(envAlpha * alphaScale));
-            POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                           EnElf_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+            POLY_XLU_DISP =
+                SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnElf_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
 
             CLOSE_DISPS(play->state.gfxCtx);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index da77ac7787..7f8e4c84ee 100644
--- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -4,7 +4,6 @@
 #include <libultraship/libultra.h>
 #include "global.h"
 #include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h"
-#include "soh/Enhancements/randomizer/ShuffleFairies.h"
 
 struct EnElf;
 
@@ -43,9 +42,6 @@ typedef struct EnElf {
     /* 0x02C7 */ u8 unk_2C7;
     /* 0x02C8 */ EnElfUnkFunc func_2C8;
     /* 0x02CC */ EnElfActionFunc actionFunc;
-    // #region SOH [Randomizer]
-    /*        */ FairyIdentity sohFairyIdentity;
-    // #endregion
 } EnElf; // size = 0x02D0
 
 typedef enum {
diff --git a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
index fb2d749691..651378aafe 100644
--- a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
+++ b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
@@ -138,10 +138,10 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, PlayState* play) {
                 }
                 spawnPos.y = floorY;
 
-                leever = (EnReeba*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_REEBA,
-                                                      spawnPos.x, spawnPos.y, spawnPos.z, 0, 0, 0, spawnParams);
+                leever = (EnReeba*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_REEBA, spawnPos.x,
+                                                      spawnPos.y, spawnPos.z, 0, 0, 0, spawnParams);
 
-                        if (leever != NULL) {
+                if (leever != NULL) {
                     this->curNumSpawn++;
                     leever->unk_280 = this->leeverIndex++;
                     if (this->leeverIndex >= 5) {
@@ -200,8 +200,8 @@ void EnEncount1_SpawnTektites(EnEncount1* this, PlayState* play) {
                     return;
                 }
                 spawnPos.y = floorY;
-                if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_TITE, spawnPos.x,
-                                       spawnPos.y, spawnPos.z, 0, 0, 0, TEKTITE_RED) != NULL) { // Red tektite
+                if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_TITE, spawnPos.x, spawnPos.y,
+                                       spawnPos.z, 0, 0, 0, TEKTITE_RED) != NULL) { // Red tektite
                     this->curNumSpawn++;
                     this->totalNumSpawn++;
                 } else {
@@ -247,10 +247,10 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
     // enemies because it's much more difficult tracking how many enemies specifically spawned by this spawner have
     // been spawned and/or killed.
     int8_t enemyCount = play->actorCtx.actorLists[ACTORCAT_ENEMY].length;
-    if ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) || 
-            (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && enemyCount < 15)) {
-        while ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) || 
-                (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && enemyCount < 15)) {
+    if ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) ||
+        (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && enemyCount < 15)) {
+        while ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) ||
+               (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && enemyCount < 15)) {
             if (play->sceneNum == SCENE_HYRULE_FIELD) {
                 if ((player->floorSfxOffset == 0) || (player->actor.floorBgId != BGCHECK_SCENE) ||
                     !(player->actor.bgCheckFlags & 1) || (player->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
@@ -282,7 +282,9 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
                     break;
                 }
                 if ((player->actor.yDistToWater != BGCHECK_Y_MIN) &&
-                    (floorY < (player->actor.world.pos.y + player->actor.yDistToWater*(CVarGetInteger(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 0) ? 1 : -1)))) {
+                    (floorY < (player->actor.world.pos.y +
+                               player->actor.yDistToWater *
+                                   (CVarGetInteger(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 0) ? 1 : -1)))) {
                     break;
                 }
                 spawnPos.y = floorY;
@@ -303,8 +305,8 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
                 }
                 this->killCount++;
             }
-            if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, spawnId, spawnPos.x, spawnPos.y,
-                                   spawnPos.z, 0, 0, 0, spawnParams) != NULL) {
+            if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, spawnId, spawnPos.x, spawnPos.y, spawnPos.z, 0,
+                                   0, 0, spawnParams) != NULL) {
                 this->curNumSpawn++;
                 if (this->curNumSpawn >= this->maxCurSpawns) {
                     this->fieldSpawnTimer = 100;
diff --git a/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
index 66f2af5bf0..1733877306 100644
--- a/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+++ b/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
@@ -48,7 +48,9 @@ void EnEncount2_Init(Actor* thisx, PlayState* play) {
         // "☆☆☆☆☆ Death Mountain Encount2 set ☆☆☆☆☆"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST,
                      this->actor.params);
-        if (LINK_IS_ADULT && (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP))) { // flag for having used fire temple blue warp
+        if (LINK_IS_ADULT &&
+            (Flags_GetEventChkInf(
+                EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP))) { // flag for having used fire temple blue warp
             Actor_Kill(thisx);
         }
     } else {
@@ -77,8 +79,8 @@ void EnEncount2_Wait(EnEncount2* this, PlayState* play) {
     } else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37))) {
         s16 scene = play->sceneNum;
 
-        if (((scene == SCENE_GANON_BOSS) || (scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) || (scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
-             (scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
+        if (((scene == SCENE_GANON_BOSS) || (scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
+             (scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
             (!this->collapseSpawnerInactive)) {
             spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
         }
@@ -157,8 +159,8 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) {
     } else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37) != 0)) {
         s16 scene = play->sceneNum;
 
-        if (((scene == SCENE_GANON_BOSS) || (scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) || (scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
-             (scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
+        if (((scene == SCENE_GANON_BOSS) || (scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
+             (scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) &&
             (!this->collapseSpawnerInactive)) {
             maxRocks = 1;
             spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
@@ -229,9 +231,8 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) {
                     tempVec2Z = Rand_CenteredFloat(70.0f) + player->actor.world.pos.z;
                 }
             }
-            spawnedRock =
-                (EnFireRock*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FIRE_ROCK,
-                                                tempVec2X, tempVec1Y, tempVec2Z, 0, 0, 0, spawnedRockType);
+            spawnedRock = (EnFireRock*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FIRE_ROCK,
+                                                          tempVec2X, tempVec1Y, tempVec2Z, 0, 0, 0, spawnedRockType);
             if (spawnedRock != NULL) {
                 spawnedRock->spawner = this;
                 this->numSpawnedRocks++;
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index b3b206f79f..cd5c59d35a 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -408,7 +408,8 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
 }
 
 void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor)) {
         this->actionFunc = EnExItem_TargetPrizeFinish;
     } else {
         s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
@@ -417,7 +418,8 @@ void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
 }
 
 void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) {
-    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
+    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_TARGET_IN_WOODS, true, &this->actor) ||
+        (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         Flags_SetItemGetInf(ITEMGETINF_1D);
@@ -510,8 +512,7 @@ void EnExItem_DrawKey(EnExItem* this, PlayState* play, s32 index) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_41Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(keySegments[index]));
     gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
 
diff --git a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
index 6e64136518..bbf8b5216d 100644
--- a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
+++ b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
@@ -336,8 +336,7 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, PlayState* play) {
             explosionScale = 20;
             explosionScaleStep = 6;
         }
-        EffectSsBomb2_SpawnLayered(play, &this->actor.world.pos, &velocity, &accel, explosionScale,
-                                   explosionScaleStep);
+        EffectSsBomb2_SpawnLayered(play, &this->actor.world.pos, &velocity, &accel, explosionScale, explosionScaleStep);
         func_8002F71C(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f);
         Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
         Actor_Kill(&this->actor);
@@ -401,23 +400,28 @@ void EnExRuppy_Draw(Actor* thisx, PlayState* play) {
             u8 shouldColor = 0;
             switch (this->colorIdx) {
                 case 0:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0);
                     break;
                 case 1:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0);
                     break;
                 case 2:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0);
                     break;
                 case 4: // orange rupee texture corresponds to the purple rupee (authentic bug)
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0);
                     break;
                 case 3: // pink rupee texture corresponds to the gold rupee (authentic bug)
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GoldRupee.Changed"), 0);
                     break;
             }
diff --git a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c
index 9f16a40d50..a59c736afe 100644
--- a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c
+++ b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c
@@ -11,7 +11,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
 
 #define FLG_COREDEAD (0x4000)
 #define FLG_COREDONE (0x8000)
@@ -270,8 +272,7 @@ s32 EnFd_CheckHammer(EnFd* this, PlayState* play) {
     if (this->actionFunc == EnFd_Reappear || this->actionFunc == EnFd_SpinAndGrow ||
         this->actionFunc == EnFd_JumpToGround || this->actionFunc == EnFd_WaitForCore) {
         return false;
-    } else if (play->actorCtx.unk_02 != 0 && this->actor.xzDistToPlayer < 300.0f &&
-               this->actor.yDistToPlayer < 60.0f) {
+    } else if (play->actorCtx.unk_02 != 0 && this->actor.xzDistToPlayer < 300.0f && this->actor.yDistToPlayer < 60.0f) {
         return true;
     } else {
         return false;
@@ -340,8 +341,8 @@ s32 EnFd_CanSeeActor(EnFd* this, Actor* actor, PlayState* play) {
     }
 
     // check to see if the line between `this` and `actor` does not intersect a collision poly
-    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &actor->world.pos, &colPoint, &colPoly,
-                                true, false, false, true, &bgId)) {
+    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &actor->world.pos, &colPoint, &colPoly, true,
+                                false, false, true, &bgId)) {
         return false;
     }
 
@@ -423,8 +424,8 @@ s32 EnFd_ShouldStopRunning(EnFd* this, PlayState* play, f32 radius, s16* runDir)
     pos.y = this->actor.world.pos.y;
     pos.z += this->actor.world.pos.z;
 
-    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &pos, &colPoint, &poly, true, false, false,
-                                true, &bgId)) {
+    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &pos, &colPoint, &poly, true, false, false, true,
+                                &bgId)) {
         *runDir = -*runDir;
         return true;
     }
@@ -785,15 +786,14 @@ void EnFd_Draw(Actor* thisx, PlayState* play) {
                         primColors[clampedHealth / 8].b, (u8)this->fadeAlpha);
         gDPSetEnvColor(POLY_XLU_DISP++, envColors[clampedHealth / 8].r, envColors[clampedHealth / 8].g,
                        envColors[clampedHealth / 8].b, (u8)this->fadeAlpha);
-        gSPSegment(
-            POLY_XLU_DISP++, 0x8,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, 0xFF - (u8)(frames * 6), 8, 0x40));
+        gSPSegment(POLY_XLU_DISP++, 0x8,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, 0xFF - (u8)(frames * 6), 8, 0x40));
         gDPPipeSync(POLY_XLU_DISP++);
         gSPSegment(POLY_XLU_DISP++, 0x9, D_80116280);
 
-        POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnFd_OverrideLimbDraw, EnFd_PostLimbDraw, this,
-                                           POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnFd_OverrideLimbDraw, EnFd_PostLimbDraw, this, POLY_XLU_DISP);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -906,8 +906,7 @@ void EnFd_DrawFlames(EnFd* this, PlayState* play) {
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             idx = eff->timer * (8.0f / eff->initialTimer);
             gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx]));
             gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL);
@@ -944,10 +943,9 @@ void EnFd_DrawDots(EnFd* this, PlayState* play) {
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gFlareDancerTriangleParticleDL);
-            
+
             FrameInterpolation_RecordCloseChild();
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
index 29a46375f9..be35ab8d87 100644
--- a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
+++ b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
@@ -263,12 +263,11 @@ void EnFdFire_Draw(Actor* thisx, PlayState* play) {
         sp84 = 0.1f;
     }
     Matrix_Scale(1.0f, sp84, 1.0f / sp84, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPSegment(POLY_XLU_DISP++, 0x8,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                play->state.frames * this->tile2Y, 0x20, 0x80));
+    gSPSegment(
+        POLY_XLU_DISP++, 0x8,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, play->state.frames * this->tile2Y, 0x20, 0x80));
     gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, primColors[((this->actor.params & 0x8000) >> 0xF)].r,
                     primColors[((this->actor.params & 0x8000) >> 0xF)].g,
                     primColors[((this->actor.params & 0x8000) >> 0xF)].b,
diff --git a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
index f64023d055..3bd05c3f64 100644
--- a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
+++ b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
@@ -197,8 +197,8 @@ void EnFhgFire_LightningStrike(EnFhgFire* this, PlayState* play) {
                 this->work[FHGFIRE_TIMER] = 37;
                 this->actor.world.pos.y -= 200.0f;
 
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                   this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 500, 0, 0,
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                                   this->actor.world.pos.y, this->actor.world.pos.z, 500, 0, 0,
                                    FHGFIRE_LIGHTNING_BURST);
                 {
                     Vec3f sp7C;
@@ -226,15 +226,15 @@ void EnFhgFire_LightningStrike(EnFhgFire* this, PlayState* play) {
                 s16 randY = (Rand_ZeroOne() < 0.5f) ? 0x1000 : 0;
 
                 for (i = 0; i < 8; i++) {
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                       this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0,
-                                       (i * 0x2000) + randY, 0x4000, FHGFIRE_LIGHTNING_TRAIL + i);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, (i * 0x2000) + randY,
+                                       0x4000, FHGFIRE_LIGHTNING_TRAIL + i);
                 }
 
                 for (i = 0; i < 8; i++) {
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                       this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0,
-                                       (i * 0x2000) + randY, 0, FHGFIRE_LIGHTNING_SHOCK);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, (i * 0x2000) + randY, 0,
+                                       FHGFIRE_LIGHTNING_SHOCK);
                 }
             }
 
@@ -323,8 +323,7 @@ void EnFhgFire_LightningBurst(EnFhgFire* this, PlayState* play) {
         play->envCtx.unk_D6 = 0x14;
     }
     if (this->work[FHGFIRE_FX_TIMER] >= 48) {
-        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] =
-            play->envCtx.screenFillColor[2] = 255;
+        play->envCtx.screenFillColor[0] = play->envCtx.screenFillColor[1] = play->envCtx.screenFillColor[2] = 255;
 
         if ((this->work[FHGFIRE_TIMER] % 2) != 0) {
             play->envCtx.screenFillColor[3] = 70;
@@ -402,8 +401,8 @@ void EnFhgFire_SpearLight(EnFhgFire* this, PlayState* play) {
             ballPos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z;
             ballAccel.y = -0.08f;
 
-            EffectSsFhgFlash_SpawnLightBall(play, &ballPos, &ballVel, &ballAccel,
-                                            (s16)(Rand_ZeroOne() * 80.0f) + 150, FHGFLASH_LIGHTBALL_GREEN);
+            EffectSsFhgFlash_SpawnLightBall(play, &ballPos, &ballVel, &ballAccel, (s16)(Rand_ZeroOne() * 80.0f) + 150,
+                                            FHGFLASH_LIGHTBALL_GREEN);
         }
     }
 
@@ -494,8 +493,9 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) {
                     canBottleReflect2 = canBottleReflect1;
                     if (!canBottleReflect2 && (hurtbox->toucher.dmgFlags & 0x00100000)) {
                         killMode = BALL_IMPACT;
-                        Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                         func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96);
                     } else {
                         if (bossGnd->flyMode == GND_FLY_NEUTRAL) {
@@ -523,8 +523,9 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) {
                             angleModX;
                         this->work[FHGFIRE_FIRE_MODE] = FHGFIRE_LIGHT_BLUE;
                         this->work[FHGFIRE_FX_TIMER] = 2;
-                        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                         func_800AA000(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64);
                     }
                 } else if (sqrtf(SQ(dxL) + SQ(dyL) + SQ(dzL)) <= 25.0f) {
@@ -556,9 +557,11 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) {
                         killMode = BALL_IMPACT;
                         bossGnd->returnCount = this->work[FHGFIRE_RETURN_COUNT] + 1;
                         Audio_PlaySoundGeneral(NA_SE_EN_FANTOM_HIT_THUNDER, &bossGnd->actor.projectedPos, 4,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                        Audio_PlaySoundGeneral(NA_SE_EN_FANTOM_DAMAGE, &bossGnd->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EN_FANTOM_DAMAGE, &bossGnd->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                     }
                 }
                 break;
@@ -607,9 +610,9 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) {
                                                     (s16)(Rand_ZeroOne() * 50.0f) + 100, lightBallColor2);
                 }
                 if (killMode == BALL_BURST) {
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                       this->actor.world.pos.x, player->actor.world.pos.y + 20.0f,
-                                       this->actor.world.pos.z, 0xC8, 0, 0, FHGFIRE_LIGHTNING_BURST);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                                       player->actor.world.pos.y + 20.0f, this->actor.world.pos.z, 0xC8, 0, 0,
+                                       FHGFIRE_LIGHTNING_BURST);
                 }
                 bossGnd->flyMode = GND_FLY_NEUTRAL;
                 this->work[FHGFIRE_KILL_TIMER] = 30;
@@ -707,8 +710,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]);
         gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0);
         gDPPipeSync(POLY_XLU_DISP++);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gPhantomLightningBlastDL));
     } else if ((this->actor.params == FHGFIRE_SPEAR_LIGHT) || (this->actor.params == FHGFIRE_ENERGY_BALL)) {
         osSyncPrintf("yari hikari draw 1\n");
@@ -723,8 +725,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) {
         }
         gDPPipeSync(POLY_XLU_DISP++);
         Matrix_RotateZ((this->actor.shape.rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gPhantomEnergyBallDL);
     } else if ((this->actor.params == FHGFIRE_WARP_EMERGE) || (this->actor.params == FHGFIRE_WARP_RETREAT) ||
                (this->actor.params == FHGFIRE_WARP_DEATH)) {
@@ -732,8 +733,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (u8)this->fwork[FHGFIRE_WARP_ALPHA]);
         gDPSetEnvColor(POLY_XLU_DISP++, 90, 50, 95, (s8)(this->fwork[FHGFIRE_WARP_ALPHA] * 0.5f));
         gDPPipeSync(POLY_XLU_DISP++);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x08,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, (s16)this->fwork[FHGFIRE_WARP_TEX_1_X],
                                     (s16)this->fwork[FHGFIRE_WARP_TEX_1_Y], 0x40, 0x40, 1,
@@ -747,8 +747,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 30, 0);
         gDPPipeSync(POLY_XLU_DISP++);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gPhantomLightningDL);
         osSyncPrintf("FF DRAW 2\n");
     }
diff --git a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
index 5be48769e9..81bd43f1ad 100644
--- a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
+++ b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
@@ -199,8 +199,8 @@ void EnFireRock_Fall(EnFireRock* this, PlayState* play) {
             case FIRE_ROCK_SPAWNED_FALLING2:
                 func_80033E88(&this->actor, play, 5, 2);
             case FIRE_ROCK_BROKEN_PIECE1:
-                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale,
-                                         1, 8.0f, 500, 10, false);
+                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
+                                         8.0f, 500, 10, false);
                 for (i = 0; i < 5; i++) {
                     flamePos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x;
                     flamePos.y = this->actor.floorHeight;
@@ -210,8 +210,8 @@ void EnFireRock_Fall(EnFireRock* this, PlayState* play) {
                 this->actionFunc = EnFireRock_SpawnMoreBrokenPieces;
                 break;
             default:
-                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale,
-                                         3, 8.0f, 200, 10, false);
+                Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 3,
+                                         8.0f, 200, 10, false);
                 SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EV_EXPLOSION);
                 Actor_Kill(&this->actor);
                 break;
@@ -392,8 +392,7 @@ void EnFireRock_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
index d8d42a6592..cda0fb18ad 100644
--- a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+++ b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
@@ -10,7 +10,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
+#define FLAGS \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
 
 void EnFirefly_Init(Actor* thisx, PlayState* play);
 void EnFirefly_Destroy(Actor* thisx, PlayState* play);
@@ -144,8 +145,7 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gKeeseSkeleton, &gKeeseFlyAnim, this->jointTable, this->morphTable,
-                   28);
+    SkelAnime_Init(play, &this->skelAnime, &gKeeseSkeleton, &gKeeseFlyAnim, this->jointTable, this->morphTable, 28);
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems);
     CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -415,9 +415,8 @@ void EnFirefly_FlyIdle(EnFirefly* this, PlayState* play) {
     if (this->actor.bgCheckFlags & 8) {
         Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.wallYaw, 2, 0xC00, 0x300);
     }
-    if ((this->timer == 0) && (this->actor.xzDistToPlayer < 200.0f) &&
-        (Player_GetMask(play) != PLAYER_MASK_SKULL) &&
-        !CVarGetInteger(CVAR_CHEAT("NoKeeseGuayTarget"), 0)) {
+    if ((this->timer == 0) && (this->actor.xzDistToPlayer < 200.0f) && (Player_GetMask(play) != PLAYER_MASK_SKULL) &&
+        GameInteractor_Should(VB_KEESE_DO_DIVE_ATTACK, true, this)) {
         EnFirefly_SetupDiveAttack(this);
     }
 }
@@ -496,7 +495,7 @@ void EnFirefly_DiveAttack(EnFirefly* this, PlayState* play) {
         Math_ScaledStepToS(&this->actor.shape.rot.x, this->targetPitch, 0x100);
     }
     if ((this->timer == 0) || (Player_GetMask(play) == PLAYER_MASK_SKULL) ||
-        CVarGetInteger(CVAR_CHEAT("NoKeeseGuayTarget"), 0)) {
+        GameInteractor_Should(VB_KEESE_FORCE_FLY_AWAY, false, this)) {
         EnFirefly_SetupFlyAway(this);
     }
 }
@@ -726,8 +725,8 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) {
         (10.0f * Math_SinS(this->actor.shape.rot.x) * Math_CosS(this->actor.shape.rot.y)) + this->actor.world.pos.z;
 }
 
-s32 EnFirefly_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx, Gfx** gfx) {
+s32 EnFirefly_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                               Gfx** gfx) {
     EnFirefly* this = (EnFirefly*)thisx;
 
     if ((this->actor.draw == EnFirefly_DrawInvisible) && !play->actorCtx.lensActive) {
@@ -842,7 +841,7 @@ void EnFirefly_Draw(Actor* thisx, PlayState* play) {
 
     POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnFirefly_OverrideLimbDraw, EnFirefly_PostLimbDraw,
                                             &this->actor, POLY_OPA_DISP);
-    
+
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
@@ -858,7 +857,7 @@ void EnFirefly_DrawInvisible(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 255);
     }
 
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                   EnFirefly_OverrideLimbDraw, EnFirefly_PostLimbDraw, this, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnFirefly_OverrideLimbDraw, EnFirefly_PostLimbDraw,
+                                            this, POLY_XLU_DISP);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 3a6b10e912..c8509aa518 100644
--- a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -134,8 +134,7 @@ void EnFish_Init(Actor* thisx, PlayState* play) {
     s16 params = this->actor.params;
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gFishSkel, &gFishInWaterAnim, this->jointTable, this->morphTable,
-                       7);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gFishSkel, &gFishInWaterAnim, this->jointTable, this->morphTable, 7);
     Collider_InitJntSph(play, &this->collider);
     Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems);
     this->actor.colChkInfo.mass = 50;
@@ -631,8 +630,8 @@ void EnFish_UpdateCutscene(EnFish* this, PlayState* play) {
 
     if (csAction == NULL) {
         // "Warning : DEMO ended without dousa (action) 3 termination being called"
-        osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", __FILE__,
-                     __LINE__, this->actor.params);
+        osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
+                     this->actor.params);
         EnFish_ClearCutsceneData(this);
         Actor_Kill(&this->actor);
         return;
@@ -673,8 +672,8 @@ void EnFish_UpdateCutscene(EnFish* this, PlayState* play) {
     this->actor.world.pos.y = (endPos.y - startPos.y) * progress + startPos.y + D_80A17014;
     this->actor.world.pos.z = (endPos.z - startPos.z) * progress + startPos.z;
 
-    this->actor.floorHeight = BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId,
-                                                          &this->actor, &this->actor.world.pos);
+    this->actor.floorHeight =
+        BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId, &this->actor, &this->actor.world.pos);
 }
 
 // Update functions and Draw
diff --git a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
index 2695dc05b7..b76f1fd9f0 100644
--- a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+++ b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
@@ -152,16 +152,16 @@ void EnFloormas_Init(Actor* thisx, PlayState* play2) {
     } else {
         // spawn first small floormaster
         this->actor.parent =
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FLOORMAS, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, invisble + SPAWN_SMALL, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FLOORMAS, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, 0, 0, invisble + SPAWN_SMALL, true);
         if (this->actor.parent == NULL) {
             Actor_Kill(&this->actor);
             return;
         }
         // spawn 2nd small floormaster
         this->actor.child =
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FLOORMAS, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, invisble + SPAWN_SMALL, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FLOORMAS, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, 0, 0, invisble + SPAWN_SMALL, true);
         if (this->actor.child == NULL) {
             Actor_Kill(this->actor.parent);
             Actor_Kill(&this->actor);
@@ -431,7 +431,7 @@ void EnFloormas_SetupFreeze(EnFloormas* this) {
 }
 
 void EnFloormas_Die(EnFloormas* this, PlayState* play) {
-    //Originally was doing > 0.004f, better fix thanks Gary :D
+    // Originally was doing > 0.004f, better fix thanks Gary :D
     if (this->actor.scale.x > (f32)0.004f) {
         // split
         this->actor.shape.rot.y = this->actor.yawTowardsPlayer + 0x8000;
@@ -1015,8 +1015,8 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) {
                     }
                 } else {
                     if (this->actor.colChkInfo.damageEffect == 2) {
-                        EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos,
-                                              this->actor.scale.x * 4000.0f, this->actor.scale.x * 4000.0f);
+                        EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, this->actor.scale.x * 4000.0f,
+                                              this->actor.scale.x * 4000.0f);
                     }
                     EnFloormas_SetupTakeDamage(this);
                 }
@@ -1086,8 +1086,8 @@ void EnFloormas_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnFloormas_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx, Gfx** gfx) {
+s32 EnFloormas_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                                Gfx** gfx) {
     EnFloormas* this = (EnFloormas*)thisx;
 
     if (limbIndex == 1) {
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 2ce7724847..b54a441ac7 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -7,7 +7,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnFr_Init(Actor* thisx, PlayState* play);
 void EnFr_Destroy(Actor* thisx, PlayState* play);
@@ -99,7 +101,6 @@ EnFrPointers sEnFrPointers = {
     },
 };
 
-
 // Flags for gSaveContext.eventChkInf[13]
 static u16 sSongIndex[] = {
     0x0002, 0x0004, 0x0010, 0x0008, 0x0020, 0x0040, 0x0001, 0x0000,
@@ -277,11 +278,11 @@ void EnFr_Update(Actor* thisx, PlayState* play) {
         sEnFrPointers.frogs[frogIndex] = this;
         Actor_ProcessInitChain(&this->actor, sInitChain);
         // frog
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_fr_Skel_00B498, &object_fr_Anim_001534,
-                           this->jointTable, this->morphTable, 24);
+        SkelAnime_InitFlex(play, &this->skelAnime, &object_fr_Skel_00B498, &object_fr_Anim_001534, this->jointTable,
+                           this->morphTable, 24);
         // butterfly
-        SkelAnime_Init(play, &this->skelAnimeButterfly, &gButterflySkel, &gButterflyAnim,
-                       this->jointTableButterfly, this->morphTableButterfly, 8);
+        SkelAnime_Init(play, &this->skelAnimeButterfly, &gButterflySkel, &gButterflyAnim, this->jointTableButterfly,
+                       this->morphTableButterfly, 8);
         // When playing the song for the HP, the frog with the next note and the butterfly turns on its lightsource
         this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
         Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.home.pos.x, this->actor.home.pos.y,
@@ -332,8 +333,8 @@ void EnFr_IsDivingIntoWater(EnFr* this, PlayState* play) {
     WaterBox* waterBox;
     f32 waterSurface;
 
-    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
-                                &waterSurface, &waterBox)) {
+    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface,
+                                &waterBox)) {
         this->isBelowWaterSurfacePrevious = this->isBelowWaterSurfaceCurrent;
         this->isBelowWaterSurfaceCurrent = this->actor.world.pos.y <= waterSurface ? true : false;
     }
@@ -639,11 +640,11 @@ void EnFr_Activate(EnFr* this, PlayState* play) {
 void EnFr_ActivateCheckFrogSong(EnFr* this, PlayState* play) {
     if (sEnFrPointers.flags == 11) {
         // Check if all 6 child songs have been played for the frogs
-        if ((Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_ZL))        // ZL
+        if ((Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_ZL))           // ZL
             && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_EPONA))     // Epona
-            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SARIA))    // Saria
-            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SUNS))     // Suns
-            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SOT))    // SoT
+            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SARIA))     // Saria
+            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SUNS))      // Suns
+            && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_SOT))       // SoT
             && (Flags_GetEventChkInf(EVENTCHKINF_SONGS_FOR_FROGS_STORMS))) { // SoS
             this->actionFunc = EnFr_TalkBeforeFrogSong;
             this->songIndex = FROG_CHOIR_SONG;
@@ -696,7 +697,7 @@ void EnFr_ListeningToOcarinaNotes(EnFr* this, PlayState* play) {
         case OCARINA_MODE_04:
             EnFr_OcarinaMistake(this, play);
             break;
-        case OCARINA_MODE_01:                           // Ocarina note played, but no song played
+        case OCARINA_MODE_01:                      // Ocarina note played, but no song played
             switch (play->msgCtx.lastOcaNoteIdx) { // Jumping frogs in open ocarina based on ocarina note played
                 case OCARINA_NOTE_D4:
                     EnFr_SetupJumpingUp(this, FROG_BLUE);
@@ -832,7 +833,7 @@ void EnFr_SetupFrogSong(EnFr* this, PlayState* play) {
                 EnFr_CheckOcarinaInputFrogSong(this->ocarinaNote);
                 this->actionFunc = EnFr_ContinueFrogSong;
             }
-        // #endregion
+            // #endregion
         } else {
             this->frogSongTimer = 40;
             this->ocarinaNoteIndex = 0;
@@ -865,7 +866,7 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, PlayState* play) {
         // #region SOH [Enhancement]
         if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0)) {
             this->frogSongTimer = sTimerFrogSong[index] * CVarGetInteger(CVAR_ENHANCEMENT("FrogsModifyFailTime"), 1);
-        // #endregion
+            // #endregion
         } else {
             this->frogSongTimer = sTimerFrogSong[index];
         }
@@ -892,9 +893,9 @@ void EnFr_ContinueFrogSong(EnFr* this, PlayState* play) {
         EnFr_OcarinaMistake(this, play);
     } else {
         // #region SOH [Enhancement] - Don't decrement timer
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0) || 
+        if (!CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFrogsOcarinaGame"), 0) ||
             !CVarGetInteger(CVAR_ENHANCEMENT("FrogsUnlimitedFailTime"), 0)) {
-        // #endregion
+            // #endregion
             this->frogSongTimer--;
         }
         if (play->msgCtx.msgMode == MSGMODE_FROGS_PLAYING) {
@@ -975,7 +976,8 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
     if ((songIndex >= FROG_ZL) && (songIndex <= FROG_SOT)) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
-            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
+            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF,
+                                            (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
             this->reward = GI_RUPEE_PURPLE;
         } else {
             this->reward = GI_RUPEE_BLUE;
@@ -983,7 +985,8 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
     } else if (songIndex == FROG_STORMS) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
-            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
+            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF,
+                                            (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
             this->reward = GI_HEART_PIECE;
         } else {
             this->reward = GI_RUPEE_BLUE;
@@ -991,7 +994,8 @@ void EnFr_SetReward(EnFr* this, PlayState* play) {
     } else if (songIndex == FROG_CHOIR_SONG) {
         if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) {
             gSaveContext.eventChkInf[13] |= sSongIndex[songIndex];
-            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
+            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF,
+                                            (EVENTCHKINF_SONGS_FOR_FROGS_INDEX << 4) + sSongIndexShift[songIndex]);
             this->reward = GI_HEART_PIECE;
         } else {
             this->reward = GI_RUPEE_PURPLE;
@@ -1087,8 +1091,7 @@ void EnFr_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
         OPEN_DISPS(play->state.gfxCtx);
         Matrix_Push();
         Matrix_ReplaceRotation(&play->billboardMtxF);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, *dList);
         Matrix_Pop();
         CLOSE_DISPS(play->state.gfxCtx);
@@ -1120,9 +1123,7 @@ void EnFr_Draw(Actor* thisx, PlayState* play) {
         Matrix_Translate(this->posButterfly.x, this->posButterfly.y, this->posButterfly.z, MTXMODE_NEW);
         Matrix_Scale(0.015f, 0.015f, 0.015f, MTXMODE_APPLY);
         Matrix_RotateZYX(this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, MTXMODE_APPLY);
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeButterfly, NULL,
-                                  NULL,
-                          NULL);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnimeButterfly, NULL, NULL, NULL);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 8b9a7ae82a..24c6ff5de0 100644
--- a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -10,7 +10,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 #define FU_RESET_LOOK_ANGLE (1 << 0)
 #define FU_WAIT (1 << 1)
@@ -152,17 +154,6 @@ void EnFu_WaitChild(EnFu* this, PlayState* play) {
     }
 }
 
-void GivePlayerRandoRewardSongOfStorms(EnFu* windmillGuy, PlayState* play, RandomizerCheck check) {
-    if (windmillGuy->actor.parent != NULL && windmillGuy->actor.parent->id == GET_PLAYER(play)->actor.id &&
-        !Flags_GetTreasure(play, 0x1F)) {
-        Flags_SetTreasure(play, 0x1F);
-        windmillGuy->actionFunc = func_80A1DBD4;
-    } else if (!Flags_GetTreasure(play, 0x1F)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_STORMS);
-        GiveItemEntryFromActor(&windmillGuy->actor, play, getItemEntry, 10000.0f, 100.0f);
-    }
-}
-
 void func_80A1DB60(EnFu* this, PlayState* play) {
     if (play->csCtx.state == CS_STATE_IDLE) {
         this->actionFunc = EnFu_WaitAdult;
diff --git a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c
index 22de733c15..1cbe3bed2e 100644
--- a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c
+++ b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c
@@ -11,7 +11,9 @@
 #include "soh/frame_interpolation.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
 
 void EnFw_Init(Actor* thisx, PlayState* play);
 void EnFw_Destroy(Actor* thisx, PlayState* play);
@@ -117,8 +119,8 @@ s32 EnFw_PlayerInRange(EnFw* this, PlayState* play) {
         return false;
     }
 
-    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &collisionPos,
-                                &poly, true, false, false, true, &bgId)) {
+    if (BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &collisionPos, &poly,
+                                true, false, false, true, &bgId)) {
         return false;
     }
 
@@ -193,8 +195,7 @@ s32 EnFw_SpawnDust(EnFw* this, u8 timer, f32 scale, f32 scaleStep, s32 dustCnt,
 void EnFw_Init(Actor* thisx, PlayState* play) {
     EnFw* this = (EnFw*)thisx;
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &gFlareDancerCoreSkel, NULL, this->jointTable, this->morphTable,
-                       11);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gFlareDancerCoreSkel, NULL, this->jointTable, this->morphTable, 11);
     Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENFW_ANIM_0);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
     Collider_InitJntSph(play, &this->collider);
@@ -377,8 +378,7 @@ void EnFw_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnFw_OverrideLimbDraw(PlayState* playState, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                          void* thisx) {
+s32 EnFw_OverrideLimbDraw(PlayState* playState, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     return false;
 }
 
@@ -484,8 +484,7 @@ void EnFw_DrawDust(EnFw* this, PlayState* play) {
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             idx = eff->timer * (8.0f / eff->initialTimer);
             gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx]));
             gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL);
diff --git a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c
index 8aaab16311..13afa66f6b 100644
--- a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c
+++ b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c
@@ -2,8 +2,11 @@
 #include "objects/object_fz/object_fz.h"
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ObjectExtension/ActorMaximumHealth.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
 void EnFz_Init(Actor* thisx, PlayState* play);
 void EnFz_Destroy(Actor* thisx, PlayState* play);
@@ -230,8 +233,8 @@ void EnFz_UpdateTargetPos(EnFz* this, PlayState* play) {
     vec1.z = 220.0f;
     Matrix_MultVec3f(&vec1, &this->wallHitPos);
 
-    if (BgCheck_EntityLineTest1(&play->colCtx, &pos, &this->wallHitPos, &hitPos, &hitPoly, true, false, false,
-                                true, &bgId)) {
+    if (BgCheck_EntityLineTest1(&play->colCtx, &pos, &this->wallHitPos, &hitPos, &hitPoly, true, false, false, true,
+                                &bgId)) {
         Math_Vec3f_Copy(&this->wallHitPos, &hitPos);
     }
 
@@ -324,9 +327,8 @@ void EnFz_SpawnIceSmokeActiveState(EnFz* this) {
 void EnFz_ApplyDamage(EnFz* this, PlayState* play) {
     Vec3f vec;
 
-    if (this->isMoving &&
-        ((this->actor.bgCheckFlags & 8) ||
-         (Actor_TestFloorInDirection(&this->actor, play, 60.0f, this->actor.world.rot.y) == 0))) {
+    if (this->isMoving && ((this->actor.bgCheckFlags & 8) ||
+                           (Actor_TestFloorInDirection(&this->actor, play, 60.0f, this->actor.world.rot.y) == 0))) {
         this->actor.bgCheckFlags &= ~8;
         this->isMoving = false;
         this->speedXZ = 0.0f;
@@ -720,6 +722,15 @@ void EnFz_Draw(Actor* thisx, PlayState* play) {
 
     index = (6 - this->actor.colChkInfo.health) >> 1;
 
+    // SOH [Enhancement] - With enemy health scaling, the Freezards health could cause an index out of bounds for the
+    // displayLists, so we need to recompute the index based on the scaled health (using the maximum health value) and
+    // clamp the final result for safety.
+    if (CVarGetInteger(CVAR_ENHANCEMENT("EnemySizeScalesHealth"), 0)) {
+        u8 scaledHealth = (u8)(((f32)this->actor.colChkInfo.health / GetActorMaximumHealth(this)) * 6);
+        index = (6 - scaledHealth) >> 1;
+        index = CLAMP(index, 0, 2);
+    }
+
     OPEN_DISPS(play->state.gfxCtx);
 
     if (this->actor.colChkInfo.health == 0) {
@@ -732,8 +743,7 @@ void EnFz_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x08,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->state.frames & 0x7F, 32, 32, 1, 0,
                                     (2 * play->state.frames) & 0x7F, 32, 32));
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0,
                           PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, ENVIRONMENT, 0);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 155, 255, 255, 255);
@@ -886,8 +896,7 @@ void EnFz_DrawIceSmoke(EnFz* this, PlayState* play) {
             Matrix_Translate(iceSmoke->pos.x, iceSmoke->pos.y, iceSmoke->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(iceSmoke->xyScale, iceSmoke->xyScale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFreezardSteamDL));
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
index 15a5ba19e6..5337a61bc7 100644
--- a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+++ b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
@@ -459,8 +459,7 @@ void EnGSwitch_DrawPot(Actor* thisx, PlayState* play) {
     if (!this->broken) {
         OPEN_DISPS(play->state.gfxCtx);
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_tsubo_DL_0017C0);
         CLOSE_DISPS(play->state.gfxCtx);
     }
@@ -491,18 +490,20 @@ void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) {
             if (this->type == ENGSWITCH_TARGET_RUPEE) {
                 GetItem_Draw(play, sRupeeTexturesNew[this->colorIdx]);
             } else {
-                Color_RGB8 silverRupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                Color_RGB8 silverRupeeColor =
+                    CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                 Gfx_SetupDL_25Opa(play->state.gfxCtx);
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                        G_MTX_MODELVIEW | G_MTX_LOAD);
-                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, silverRupeeColor.r, silverRupeeColor.g, silverRupeeColor.b, 255);
-                gDPSetEnvColor(POLY_OPA_DISP++, silverRupeeColor.r / 5, silverRupeeColor.g / 5, silverRupeeColor.b / 5, 255);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, silverRupeeColor.r, silverRupeeColor.g, silverRupeeColor.b,
+                                255);
+                gDPSetEnvColor(POLY_OPA_DISP++, silverRupeeColor.r / 5, silverRupeeColor.g / 5, silverRupeeColor.b / 5,
+                               255);
                 gSPDisplayList(POLY_OPA_DISP++, gGiRupeeInnerDL);
                 Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                        G_MTX_MODELVIEW | G_MTX_LOAD);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255);
-                gDPSetEnvColor(POLY_XLU_DISP++, silverRupeeColor.r * 0.75f, silverRupeeColor.g * 0.75f, silverRupeeColor.b * 0.75f, 255);
+                gDPSetEnvColor(POLY_XLU_DISP++, silverRupeeColor.r * 0.75f, silverRupeeColor.g * 0.75f,
+                               silverRupeeColor.b * 0.75f, 255);
                 gSPDisplayList(POLY_XLU_DISP++, gGiRupeeOuterDL);
             }
         } else {
@@ -510,27 +511,33 @@ void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) {
             u8 shouldColor = 0;
             switch (this->colorIdx) {
                 case 0:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0);
                     break;
                 case 1:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0);
                     break;
                 case 2:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0);
                     break;
                 case 4: // orange rupee texture corresponds to the purple rupee (authentic bug)
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0);
                     break;
                 case 3: // pink rupee texture corresponds to the gold rupee (authentic bug)
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GoldRupee.Changed"), 0);
                     break;
                 case 5:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.SilverRupee.Changed"), 0);
                     break;
             }
@@ -632,33 +639,38 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, PlayState* play) {
             Matrix_RotateX(effect->rot.x, MTXMODE_APPLY);
             Matrix_RotateY(effect->rot.y, MTXMODE_APPLY);
             Matrix_RotateZ(effect->rot.z, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             Color_RGB8 rupeeColor;
             u8 shouldColor = 0;
             switch (effect->colorIdx) {
                 case 0:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GreenRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GreenRupee.Changed"), 0);
                     break;
                 case 1:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.BlueRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.BlueRupee.Changed"), 0);
                     break;
                 case 2:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.RedRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.RedRupee.Changed"), 0);
                     break;
                 case 3:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.PurpleRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.PurpleRupee.Changed"), 0);
                     break;
                 case 4:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.GoldRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.GoldRupee.Changed"), 0);
                     break;
                 case 5:
-                    rupeeColor = CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
+                    rupeeColor =
+                        CVarGetColor24(CVAR_COSMETIC("Consumable.SilverRupee.Value"), (Color_RGB8){ 255, 255, 255 });
                     shouldColor = CVarGetInteger(CVAR_COSMETIC("Consumable.SilverRupee.Changed"), 0);
                     break;
             }
diff --git a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
index ec0138a5a3..9c1ad757e3 100644
--- a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
+++ b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
@@ -98,7 +98,7 @@ static u16 sVerticesMap[GANON_MANT_NUM_STRANDS * GANON_MANT_NUM_JOINTS] = {
 #define MANT_TEX_WIDTH 32
 #define MANT_TEX_HEIGHT 64
 
-static u8 sMaskTex[MANT_TEX_WIDTH * MANT_TEX_HEIGHT] = { {0} };
+static u8 sMaskTex[MANT_TEX_WIDTH * MANT_TEX_HEIGHT] = { { 0 } };
 
 #include "overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.h"
 
@@ -160,8 +160,8 @@ void EnGanonMant_Tear(EnGanonMant* this) {
 /**
  * Updates the dynamic strands that control the shape and motion of the cloak
  */
-void EnGanonMant_UpdateStrand(PlayState* play, EnGanonMant* this, Vec3f* root, Vec3f* pos, Vec3f* nextPos,
-                              Vec3f* rot, Vec3f* vel, s16 strandNum) {
+void EnGanonMant_UpdateStrand(PlayState* play, EnGanonMant* this, Vec3f* root, Vec3f* pos, Vec3f* nextPos, Vec3f* rot,
+                              Vec3f* vel, s16 strandNum) {
     f32 xDiff;
     f32 zDiff;
     f32 gravity;
@@ -376,8 +376,7 @@ void EnGanonMant_DrawCloak(PlayState* play, EnGanonMant* this) {
 
     Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     // set texture
     gSPDisplayList(POLY_OPA_DISP++, gMantMaterialDL);
diff --git a/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
index aebec1aa4e..41d1aff1cd 100644
--- a/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
+++ b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
@@ -27,7 +27,7 @@ const ActorInit En_Ganon_Organ_InitVars = {
     NULL,
 };
 
-//static u64 sForceAlignment = 0;
+// static u64 sForceAlignment = 0;
 
 #include "overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.h"
 
@@ -101,8 +101,7 @@ void EnGanonOrgan_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x09, EnGanonOrgan_EmptyDList(play->state.gfxCtx));
     }
     Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, sRoomOrganAndFloorDL);
     gSPDisplayList(POLY_OPA_DISP++, sRoomStatuesDL);
diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
index 15bac0bf0a..372962042a 100644
--- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
+++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
@@ -165,8 +165,8 @@ void EnGb_Init(Actor* thisx, PlayState* play) {
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
     CollisionHeader_GetVirtual(&gPoeSellerCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gPoeSellerSkel, &gPoeSellerIdleAnim, this->jointTable,
-                       this->morphTable, 12);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gPoeSellerSkel, &gPoeSellerIdleAnim, this->jointTable, this->morphTable,
+                       12);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinderType1(play, &this->collider, &this->dyna.actor, &sCylinderInit);
 
@@ -288,19 +288,21 @@ void func_80A2F83C(EnGb* this, PlayState* play) {
         }
     }
     if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) {
-        switch (func_8002F368(play)) {
-            case EXCH_ITEM_NONE:
-                func_80A2F180(this);
-                this->actionFunc = func_80A2F94C;
-                break;
-            case EXCH_ITEM_POE:
-                player->actor.textId = 0x70F6;
-                this->actionFunc = func_80A2F9C0;
-                break;
-            case EXCH_ITEM_BIG_POE:
-                player->actor.textId = 0x70F7;
-                this->actionFunc = func_80A2FA50;
-                break;
+        if (GameInteractor_Should(VB_SELL_POES_TO_POE_COLLECTOR, true, this)) {
+            switch (func_8002F368(play)) {
+                case EXCH_ITEM_NONE:
+                    func_80A2F180(this);
+                    this->actionFunc = func_80A2F94C;
+                    break;
+                case EXCH_ITEM_POE:
+                    player->actor.textId = 0x70F6;
+                    this->actionFunc = func_80A2F9C0;
+                    break;
+                case EXCH_ITEM_BIG_POE:
+                    player->actor.textId = 0x70F7;
+                    this->actionFunc = func_80A2FA50;
+                    break;
+            }
         }
         return;
     }
@@ -369,8 +371,7 @@ void func_80A2FBB0(EnGb* this, PlayState* play) {
     if (Actor_HasParent(&this->dyna.actor, play)) {
         this->dyna.actor.parent = NULL;
         this->actionFunc = func_80A2FC0C;
-    }
-    else {
+    } else {
         Actor_OfferGetItem(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
     }
 }
@@ -553,8 +554,7 @@ void EnGb_DrawCagedSouls(EnGb* this, PlayState* play) {
         }
         Matrix_Scale(0.007f, 0.007f, 1.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gPoeSellerCagedSoulDL);
 
         Matrix_Pop();
diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.h
index 6df73808e9..2ff4f64ff5 100644
--- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.h
+++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.h
@@ -47,6 +47,7 @@ typedef struct EnGb {
     /* 0x0388 */ EnGbCagedSoul cagedSouls[4];
 } EnGb; // size = 0x0438
 
-void func_80A2FC0C(EnGb* actor, PlayState* play);
+void func_80A2FB40(EnGb* actor, PlayState* play);
+void func_80A2F83C(EnGb* actor, PlayState* play);
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 1614bac81c..eadd847b59 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -97,20 +97,6 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
     s32 pad;
     EnGe1* this = (EnGe1*)thisx;
 
-    // When spawning the gate operator, also spawn an extra gate operator on the wasteland side
-    if (IS_RANDO && (Randomizer_GetSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) ||
-        Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) && (this->actor.params & 0xFF) == GE1_TYPE_GATE_OPERATOR) {
-        // Spawn the extra gaurd with params matching the custom type added (0x0300 + 0x02)
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_GE1, -1358.0f, 88.0f, -3018.0f, 0, 0x95B0, 0,
-                    0x0300 | GE1_TYPE_EXTRA_GATE_OPERATOR, true);
-    }
-
-    // Convert the "extra" gate operator into a normal one so it matches the same params
-    if ((this->actor.params & 0xFF) == GE1_TYPE_EXTRA_GATE_OPERATOR) {
-        this->actor.params &= ~0xFF;
-        this->actor.params |= GE1_TYPE_GATE_OPERATOR;
-    }
-
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     SkelAnime_InitFlex(play, &this->skelAnime, &gGerudoWhiteSkel, &gGerudoWhiteIdleAnim, this->jointTable,
                        this->morphTable, GE1_LIMB_MAX);
@@ -253,7 +239,8 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) {
 
         if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) {
             play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1;
-        } else if (Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { // Caught previously
+        } else if (Flags_GetEventChkInf(
+                       EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { // Caught previously
             play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_18;
         } else {
             play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_17;
@@ -521,7 +508,10 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
     GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
     s32 getItemId;
 
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+    if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
+        return;
+    }
+    if (Actor_HasParent(&this->actor, play)) {
         this->actionFunc = EnGe1_SetupWait_Archery;
 
         if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
@@ -543,10 +533,7 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
         } else {
             getItemId = GI_HEART_PIECE;
         }
-
-        if (GameInteractor_Should(VB_GIVE_ITEM_FROM_HORSEBACK_ARCHERY, true, this)) {
-            Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
-        }
+        Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
     }
 }
 
@@ -561,7 +548,10 @@ void EnGe1_BeginGiveItem_Archery(EnGe1* this, PlayState* play) {
 
     if (this->stateFlags & GE1_STATE_GIVE_QUIVER) {
         switch (CUR_UPG_VALUE(UPG_QUIVER)) {
-            //! @bug Asschest. See next function for details
+            //! @bug Asschest: the compiler inserts a default assigning *(sp+0x24) to getItemId, which is junk data left
+            //! over from the previous function run in EnGe1_Update, namely EnGe1_CueUpAnimation. The top stack variable
+            //! in that function is &this->skelAnime = thisx + 198, and depending on where this loads in memory, the
+            //! getItemId changes.
             case 1:
                 getItemId = GI_QUIVER_40;
                 break;
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index 2c0c6d4f9d..c85b20deb0 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -12,7 +12,6 @@ typedef void (*EnGe1ActionFunc)(struct EnGe1*, PlayState*);
 typedef enum {
     /* 0x00 */ GE1_TYPE_GATE_GUARD,
     /* 0x01 */ GE1_TYPE_GATE_OPERATOR,
-    /* 0x02 */ GE1_TYPE_EXTRA_GATE_OPERATOR, // Custom guard type for entrance randomizer to open the gate
     /* 0x04 */ GE1_TYPE_NORMAL = 4,
     /* 0x05 */ GE1_TYPE_VALLEY_FLOOR,
     /* 0x45 */ GE1_TYPE_HORSEBACK_ARCHERY = 0x45,
diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index ab1053805d..776a241b18 100644
--- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -439,20 +439,21 @@ void EnGe2_LookAtPlayer(EnGe2* this, PlayState* play) {
 
 void EnGe2_SetActionAfterTalk(EnGe2* this, PlayState* play) {
     if (Actor_TextboxIsClosing(&this->actor, play)) {
-
-        switch (this->actor.params & 0xFF) {
-            case GE2_TYPE_PATROLLING:
-                EnGe2_ChangeAction(this, GE2_ACTION_ABOUTTURN);
-                break;
-            case GE2_TYPE_STATIONARY:
-                EnGe2_ChangeAction(this, GE2_ACTION_STAND);
-                break;
-            case GE2_TYPE_GERUDO_CARD_GIVER:
-                this->actionFunc = EnGe2_WaitLookAtPlayer;
-                break;
+        if (GameInteractor_Should(VB_GERUDO_GUARD_SET_ACTION_AFTER_TALK, true, this)) {
+            switch (this->actor.params & 0xFF) {
+                case GE2_TYPE_PATROLLING:
+                    EnGe2_ChangeAction(this, GE2_ACTION_ABOUTTURN);
+                    break;
+                case GE2_TYPE_STATIONARY:
+                    EnGe2_ChangeAction(this, GE2_ACTION_STAND);
+                    break;
+                case GE2_TYPE_GERUDO_CARD_GIVER:
+                    this->actionFunc = EnGe2_WaitLookAtPlayer;
+                    break;
+            }
+            this->actor.update = EnGe2_UpdateFriendly;
+            this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
         }
-        this->actor.update = EnGe2_UpdateFriendly;
-        this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
     }
     EnGe2_TurnToFacePlayer(this, play);
 }
@@ -585,8 +586,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
     } else {
         this->actionFunc(this, play);
 
-        if (Ge2_DetectPlayerInUpdate(play, this, &this->actor.focus.pos, this->actor.shape.rot.y,
-                                     this->yDetectRange)) {
+        if (Ge2_DetectPlayerInUpdate(play, this, &this->actor.focus.pos, this->actor.shape.rot.y, this->yDetectRange)) {
             // "Discovered!"
             osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
             EnGe2_SetupCapturePlayer(this, play);
@@ -607,7 +607,8 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
     }
     EnGe2_MoveAndBlink(this, play);
 
-    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed()) && !(this->stateFlags & GE2_STATE_KO)) {
+    if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe2_CheckCarpentersFreed()) &&
+        !(this->stateFlags & GE2_STATE_KO)) {
         this->actor.update = EnGe2_UpdateFriendly;
         this->actor.targetMode = 6;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
index 24129fb2a4..e97cc9facd 100644
--- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
@@ -152,7 +152,8 @@ void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
 }
 
 void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
+    if (GameInteractor_Should(VB_END_GERUDO_MEMBERSHIP_TALK,
+                              (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play))) {
         Message_CloseTextbox(play);
         this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
         this->actionFunc = EnGe3_WaitTillCardGiven;
@@ -298,7 +299,7 @@ void EnGe3_Draw(Actor* thisx, PlayState* play2) {
     Gfx_SetupDL_37Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
     func_8002EBCC(&this->actor, play, 0);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,EnGe3_OverrideLimbDraw, EnGe3_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnGe3_OverrideLimbDraw, EnGe3_PostLimbDraw, this);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
index 841181701e..44bec7b31b 100644
--- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
+++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
@@ -213,7 +213,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32_DIV1000(gravity, -3000, ICHAIN_STOP),
 };
 
-//static Vec3f sUnusedOffset = { 1100.0f, -700.0f, 0.0f };
+// static Vec3f sUnusedOffset = { 1100.0f, -700.0f, 0.0f };
 
 void EnGeldB_SetupAction(EnGeldB* this, EnGeldBActionFunc actionFunc) {
     this->actionFunc = actionFunc;
@@ -359,8 +359,7 @@ void EnGeldB_SetupWait(EnGeldB* this) {
 }
 
 void EnGeldB_Wait(EnGeldB* this, PlayState* play) {
-    if ((this->invisible && !Flags_GetSwitch(play, this->actor.home.rot.z)) ||
-        this->actor.xzDistToPlayer > 300.0f) {
+    if ((this->invisible && !Flags_GetSwitch(play, this->actor.home.rot.z)) || this->actor.xzDistToPlayer > 300.0f) {
         this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer;
         this->actor.world.pos.y = this->actor.floorHeight + 120.0f;
     } else {
@@ -672,8 +671,8 @@ void EnGeldB_Circle(EnGeldB* this, PlayState* play) {
                 this->actor.speedXZ = 8.0f;
             }
         }
-        if ((this->actor.bgCheckFlags & 8) || !Actor_TestFloorInDirection(&this->actor, play, this->actor.speedXZ,
-                                                                          this->actor.shape.rot.y + 0x3E80)) {
+        if ((this->actor.bgCheckFlags & 8) ||
+            !Actor_TestFloorInDirection(&this->actor, play, this->actor.speedXZ, this->actor.shape.rot.y + 0x3E80)) {
             if (this->actor.bgCheckFlags & 8) {
                 if (this->actor.speedXZ >= 0.0f) {
                     phi_v1 = this->actor.shape.rot.y + 0x3E80;
@@ -1384,7 +1383,8 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) {
                         if (key != NULL) {
                             key->actor.world.rot.y = Math_Vec3f_Yaw(&key->actor.world.pos, &this->actor.home.pos);
                             key->actor.speedXZ = 6.0f;
-                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
                     }
@@ -1432,8 +1432,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnGeldB_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 EnGeldB_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnGeldB* this = (EnGeldB*)thisx;
 
     OPEN_DISPS(play->state.gfxCtx);
@@ -1609,8 +1608,8 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) {
             if ((this->iceTimer % 4) == 0) {
                 s32 iceIndex = this->iceTimer >> 2;
 
-                EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[iceIndex], 150, 150, 150, 250, 235,
-                                               245, 255, 1.5f);
+                EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[iceIndex], 150, 150, 150, 250, 235, 245,
+                                               255, 1.5f);
             }
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index f66201e55f..277677360b 100644
--- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -139,7 +139,7 @@ static char* sShopItemDescriptions[] = {
     "爆弾×5       ",  // "Bomb x5"
     "赤クスリ      ", // "Red medicine"
     "赤クスリ      ", // "Red medicine"
-    "Random Item  "  // "Random Item"
+    "Random Item  "   // "Random Item"
 };
 
 static s16 sMaskShopItems[8] = {
@@ -328,7 +328,7 @@ void EnGirlA_SetupAction(EnGirlA* this, EnGirlAActionFunc func) {
 
 // #region SOH [Enhancement] [Randomizer]
 s32 EnGirlA_TryChangeShopItemShip(EnGirlA* this, PlayState* play) {
-    if (!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0))){
+    if (!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0))) {
         switch (this->actor.params) {
             case SI_BOMBCHU_10_2:
                 if (Flags_GetItemGetInf(ITEMGETINF_06)) {
@@ -380,7 +380,7 @@ s32 EnGirlA_TryChangeShopItemShip(EnGirlA* this, PlayState* play) {
                 break;
         }
     }
-    if (this->actor.params == SI_MILK_BOTTLE){
+    if (this->actor.params == SI_MILK_BOTTLE) {
         if (Flags_GetItemGetInf(ITEMGETINF_TALON_BOTTLE)) {
             this->actor.params = SI_RECOVERY_HEART;
             return true;
@@ -389,7 +389,8 @@ s32 EnGirlA_TryChangeShopItemShip(EnGirlA* this, PlayState* play) {
         ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
         if (Flags_GetRandomizerInf(shopItemIdentity.randomizerInf)) {
             this->actor.params = SI_SOLD_OUT;
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+                shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
 
             // Undo the rotation for spiritual stones
             if (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE) {
@@ -473,7 +474,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
         osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params);
         osSyncPrintf(VT_RST);
         assert((params >= SI_MAX) && (params < 0));
-        //ASSERT(0, "0", "../z_en_girlA.c", 1421); zret assert, currently errors due to missing macro
+        // ASSERT(0, "0", "../z_en_girlA.c", 1421); zret assert, currently errors due to missing macro
         return;
     }
 
@@ -483,7 +484,8 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
 
         if (params == SI_RANDOMIZED_ITEM) {
             ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+            GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+                shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
 
             objectId = getItemEntry.objectId;
         }
@@ -505,7 +507,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
         osSyncPrintf(VT_COL(RED, WHITE));
         osSyncPrintf("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]);
         osSyncPrintf(VT_RST);
-        //ASSERT(0, "0", "../z_en_girlA.c", 1434); zret assert, currently errors due to missing macro
+        // ASSERT(0, "0", "../z_en_girlA.c", 1434); zret assert, currently errors due to missing macro
         return;
     }
 
@@ -515,7 +517,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
 
 void EnGirlA_Init(Actor* thisx, PlayState* play) {
     // #region [Randomizer] [Enhancment]
-    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)){
+    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) {
         EnGirlA* this = (EnGirlA*)thisx;
 
         EnGirlA_TryChangeShopItemShip(this, play);
@@ -688,7 +690,7 @@ s32 EnGirlA_CanBuy_DekuShield(PlayState* play, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuy_GoronTunic(PlayState* play, EnGirlA* this) {
-    if (LINK_AGE_IN_YEARS == YEARS_CHILD && 
+    if (LINK_AGE_IN_YEARS == YEARS_CHILD &&
         (!IS_RANDO || Randomizer_GetSettingValue(RSK_SHOPSANITY) == RO_SHOPSANITY_OFF)) {
         return CANBUY_RESULT_CANT_GET_NOW;
     }
@@ -852,22 +854,21 @@ s32 EnGirlA_CanBuy_Fairy(PlayState* play, EnGirlA* this) {
 
 s32 EnGirlA_CanBuy_Randomizer(PlayState* play, EnGirlA* this) {
     ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
-    ItemObtainability itemObtainability = Randomizer_GetItemObtainabilityFromRandomizerCheck(shopItemIdentity.randomizerCheck);
+    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+        shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+    ItemObtainability itemObtainability =
+        Randomizer_GetItemObtainabilityFromRandomizerCheck(shopItemIdentity.randomizerCheck);
 
     if (itemObtainability == CANT_OBTAIN_NEED_EMPTY_BOTTLE) {
         return CANBUY_RESULT_NEED_BOTTLE;
     }
-    
+
     if (itemObtainability == CANT_OBTAIN_NEED_UPGRADE) {
         return CANBUY_RESULT_CANT_GET_NOW_5;
     }
 
-    if (
-        Flags_GetRandomizerInf(shopItemIdentity.randomizerInf) || 
-        itemObtainability == CANT_OBTAIN_ALREADY_HAVE || 
-        itemObtainability == CANT_OBTAIN_MISC
-    ) {
+    if (Flags_GetRandomizerInf(shopItemIdentity.randomizerInf) || itemObtainability == CANT_OBTAIN_ALREADY_HAVE ||
+        itemObtainability == CANT_OBTAIN_MISC) {
         return CANBUY_RESULT_CANT_GET_NOW;
     }
 
@@ -1058,7 +1059,8 @@ void EnGirlA_ItemGive_BottledItem(PlayState* play, EnGirlA* this) {
 void EnGirlA_ItemGive_Randomizer(PlayState* play, EnGirlA* this) {
     Player* player = GET_PLAYER(play);
     ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+        shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
 
     Flags_SetRandomizerInf(shopItemIdentity.randomizerInf);
     Rupees_ChangeBy(-this->basePrice);
@@ -1097,7 +1099,7 @@ void EnGirlA_BuyEvent_ObtainBombchuPack(PlayState* play, EnGirlA* this) {
     gSaveContext.ship.pendingSaleMod = entry.modIndex;
     Rupees_ChangeBy(-this->basePrice);
 
-	// Normally, buying a bombchu pack sets a flag indicating the pack is now sold out
+    // Normally, buying a bombchu pack sets a flag indicating the pack is now sold out
     // If they're in logic for rando, skip setting that flag so they can be purchased repeatedly
     // #region [Enhancment]
     if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) {
@@ -1193,14 +1195,15 @@ void EnGirlA_SetItemDescription(PlayState* play, EnGirlA* this) {
 void EnGirlA_SetItemOutOfStock(PlayState* play, EnGirlA* this) {
     this->isInvisible = true;
     this->actor.draw = NULL;
-    if (((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_GERUDO_MASK)) || this->actor.params == SI_RANDOMIZED_ITEM) {
+    if (((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_GERUDO_MASK)) ||
+        this->actor.params == SI_RANDOMIZED_ITEM) {
         this->actor.textId = 0xBD;
     }
 }
 
 void EnGirlA_UpdateStockedItem(PlayState* play, EnGirlA* this) {
     // #region [Randomizer] [Enhancment]
-    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)){
+    if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) {
         ShopItemEntry* itemEntry;
         if (EnGirlA_TryChangeShopItemShip(this, play)) {
             EnGirlA_InitItem(this, play);
@@ -1316,7 +1319,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
             EnGirlA_SetItemDescription(play, this);
         }
         // #region [Enhancment] [Randomizer]
-        if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) { 
+        if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0)) {
             this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock;
             this->updateStockedItemFunc = EnGirlA_UpdateStockedItem;
             this->getItemId = itemEntry->getItemId;
@@ -1326,8 +1329,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
             // If Better Bombchu Shopping is on, make the 10 pack affordable without a wallet upgrade
             if (this->getItemId == GI_BOMBCHUS_10) {
                 this->basePrice = 99;
-            } 
-            else {
+            } else {
                 this->basePrice = itemEntry->price;
             }
             this->itemCount = itemEntry->count;
@@ -1349,15 +1351,19 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
 
             if (params == SI_RANDOMIZED_ITEM) {
                 ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+                GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+                    shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
                 this->actor.textId = 0x9100 + (shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1);
-                this->itemBuyPromptTextId = 0x9100 + ((shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS);
+                this->itemBuyPromptTextId =
+                    0x9100 + ((shopItemIdentity.randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS);
                 this->getItemId = getItemEntry.getItemId;
                 this->basePrice = shopItemIdentity.itemPrice;
                 this->giDrawId = getItemEntry.gid;
 
-                // Correct the rotation for spiritual stones, but only if mysterious shuffle isn't on, else it's obvious what's there in shops
-                if (!CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE)) {
+                // Correct the rotation for spiritual stones, but only if mysterious shuffle isn't on, else it's obvious
+                // what's there in shops
+                if (!CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) &&
+                    (getItemEntry.getItemId >= RG_KOKIRI_EMERALD && getItemEntry.getItemId <= RG_ZORA_SAPPHIRE)) {
                     this->actor.shape.rot.y = this->actor.shape.rot.y + 20000;
                 }
             }
@@ -1432,8 +1438,11 @@ void EnGirlA_Draw(Actor* thisx, PlayState* play) {
         func_80A3C498(&this->actor, play, 0);
 
         ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
-        GetItemEntry getItemEntry = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && this->actor.params == SI_RANDOMIZED_ITEM) ? GetItemMystery() : 
-                                    Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
+        GetItemEntry getItemEntry = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) &&
+                                     this->actor.params == SI_RANDOMIZED_ITEM)
+                                        ? GetItemMystery()
+                                        : Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(
+                                              shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
 
         EnItem00_CustomItemsParticles(&this->actor, play, getItemEntry);
         GetItemEntry_Draw(play, getItemEntry);
diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 06d7c89e92..35f1cb9675 100644
--- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -99,9 +99,10 @@ void EnGm_Destroy(Actor* thisx, PlayState* play) {
 s32 func_80A3D7C8(void) {
     if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
         return 0;
-    } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE, (
-        !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) // Don't have giant's knife
-    ))) {
+    } else if (GameInteractor_Should(
+                   VB_BE_ELIGIBLE_FOR_GIANTS_KNIFE_PURCHASE,
+                   (!CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON) // Don't have giant's knife
+                    ))) {
         return 1;
     } else if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) { // Have broken giant's knife
         return 2;
@@ -255,7 +256,6 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
                         Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
                         this->actionFunc = func_80A3DF00;
                     }
-                    
                 }
                 break;
             case 1: // no
diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
index bb43d4709e..3e306587e1 100644
--- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -5,7 +5,9 @@
 #include "soh/frame_interpolation.h"
 #include "soh/OTRGlobals.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnGo_Init(Actor* thisx, PlayState* play);
 void EnGo_Destroy(Actor* thisx, PlayState* play);
@@ -31,7 +33,6 @@ void func_80A40C78(EnGo* this, PlayState* play);
 void EnGo_Eyedrops(EnGo* this, PlayState* play);
 void func_80A40DCC(EnGo* this, PlayState* play);
 
-
 void EnGo_SpawnEffectDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale,
                           f32 scaleStep);
 void EnGo_UpdateEffects(EnGo* this);
@@ -121,7 +122,8 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
                 } else {
                     return 0x3041;
                 }
-            } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) || (Flags_GetInfTable(INFTABLE_10D))) {
+            } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) ||
+                       (Flags_GetInfTable(INFTABLE_10D))) {
                 if (Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK)) {
                     return 0x3038;
                 } else {
@@ -337,7 +339,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
 }
 
 s32 EnGo_UpdateTalking(PlayState* play, Actor* thisx, s16* talkState, f32 interactRange, NpcGetTextIdFunc getTextId,
-                  NpcUpdateTalkStateFunc updateTalkState) {
+                       NpcUpdateTalkStateFunc updateTalkState) {
     if (*talkState != NPC_TALK_STATE_IDLE) {
         *talkState = updateTalkState(play, thisx);
         return false;
@@ -589,11 +591,11 @@ void func_80A3F908(EnGo* this, PlayState* play) {
         }
 
         if ((this->actor.params & 0xF0) == 0x90) {
-            dialogStarted =
-                EnGo_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, interactRange, EnGo_GetTextID, EnGo_UpdateTalkState);
+            dialogStarted = EnGo_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, interactRange,
+                                               EnGo_GetTextID, EnGo_UpdateTalkState);
         } else {
             dialogStarted = Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, interactRange,
-                                               EnGo_GetTextID, EnGo_UpdateTalkState);
+                                              EnGo_GetTextID, EnGo_UpdateTalkState);
         }
 
         if (((this->actor.params & 0xF0) == 0x90) && (dialogStarted == true)) {
@@ -770,8 +772,8 @@ void EnGo_FireGenericActionFunc(EnGo* this, PlayState* play) {
 
 void EnGo_CurledUp(EnGo* this, PlayState* play) {
     if ((DECR(this->unk_210) == 0) && EnGo_IsCameraModified(this, play)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
         this->skelAnime.playSpeed = 0.1f;
         this->skelAnime.playSpeed *= (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f;
@@ -805,8 +807,8 @@ void EnGo_WakeUp(EnGo* this, PlayState* play) {
     }
 
     if (DECR(this->unk_212) == 0) {
-        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         EnGo_SetupAction(this, func_80A405CC);
     } else if (!EnGo_IsCameraModified(this, play)) {
         EnGo_ReverseAnimation(this);
@@ -824,8 +826,8 @@ void func_80A40494(EnGo* this, PlayState* play) {
     frame += this->skelAnime.playSpeed;
 
     if (!(frame >= 0.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         EnGo_SpawnDust(this, 10, 0.4f, 0.1f, 16, 26.0f, 2.0f);
         EnGo_ReverseAnimation(this);
         this->skelAnime.playSpeed = 0.0f;
@@ -869,7 +871,7 @@ void EnGo_BiggoronActionFunc(EnGo* this, PlayState* play) {
                 this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
                 EnGo_SetupAction(this, EnGo_Eyedrops);
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
-                gSaveContext.timer2State = 0;
+                gSaveContext.subTimerState = 0;
                 OnePointCutscene_Init(play, 4190, -99, &this->actor, MAIN_CAM);
             } else {
                 this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
@@ -916,8 +918,8 @@ void func_80A408D8(EnGo* this, PlayState* play) {
         EnGo_SetupAction(this, func_80A40494);
     } else if (EnGo_IsCameraModified(this, play)) {
         EnGo_ReverseAnimation(this);
-        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->skelAnime.playSpeed = 0.0f;
         EnGo_SetupAction(this, func_80A405CC);
     }
@@ -1054,8 +1056,7 @@ void EnGo_DrawCurledUp(EnGo* this, PlayState* play) {
     Matrix_Push();
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80);
 
@@ -1074,8 +1075,7 @@ void EnGo_DrawRolling(EnGo* this, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Matrix_RotateZYX((s16)(play->state.frames * ((s16)this->actor.speedXZ * 1400)), 0, this->actor.shape.rot.z,
                      MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140);
     Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos);
     Matrix_Pop();
@@ -1150,7 +1150,8 @@ void EnGo_Draw(Actor* thisx, PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void EnGo_SpawnEffectDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) {
+void EnGo_SpawnEffectDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale,
+                          f32 scaleStep) {
     EnGoEffect* dustEffect = this->effects;
     s16 i;
 
@@ -1222,8 +1223,7 @@ void EnGo_DrawEffects(EnGo* this, PlayState* play) {
             Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             index = dustEffect->timer * (8.0f / dustEffect->initialTimer);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index]));
diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 264daa595e..6b3d460273 100644
--- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -7,7 +7,9 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 /*
 FLAGS
@@ -24,10 +26,9 @@ Flags_GetInfTable(INFTABLE_EB) - Talked to DMT Goron at Bomb Flower with goron b
 Flags_GetInfTable(INFTABLE_F0) - Talked to Goron at GC Entrance (Before goron ruby is obtained)
 Flags_GetInfTable(INFTABLE_F4) - Talked to Goron at GC Island (Before goron ruby is obtained)
 Flags_GetInfTable(INFTABLE_F8) - (not on cloud modding) Talked to GC Goron outside Darunias door (after opening door,
-before getting goron bracelet) Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED) - Obtained Fire Tunic from Goron Link
-Flags_GetInfTable(INFTABLE_10A) - (not on cloud modding)
-Flags_GetInfTable(INFTABLE_10B) - Spoke to Goron Link About Volvagia
-Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING) - Stopped Goron Link's Rolling
+before getting goron bracelet) Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED) - Obtained Fire Tunic from Goron
+Link Flags_GetInfTable(INFTABLE_10A) - (not on cloud modding) Flags_GetInfTable(INFTABLE_10B) - Spoke to Goron Link
+About Volvagia Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING) - Stopped Goron Link's Rolling
 Flags_GetInfTable(INFTABLE_10D) - EnGo Exclusive
 Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) - Spoke to Goron Link
 Flags_GetInfTable(INFTABLE_10F) - (not on cloud modding)
@@ -248,8 +249,7 @@ void EnGo2_DrawDust(EnGo2* this, PlayState* play) {
             Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             index = dustEffect->timer * (8.0f / dustEffect->initialTimer);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index]));
             gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50);
@@ -287,7 +287,7 @@ void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
     this->getItemId = getItemId;
     if (GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true, this)) {
         Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
-                    fabsf(this->actor.yDistToPlayer) + 1.0f);
+                           fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
@@ -331,8 +331,9 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
 u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
     if (Flags_GetInfTable(INFTABLE_11E)) {
         return 0x3013;
-    } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 20, this)
-        && this->waypoint > 7 && this->waypoint < 12) {
+    } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD, CUR_CAPACITY(UPG_BOMB_BAG) >= 20,
+                                     this) &&
+               this->waypoint > 7 && this->waypoint < 12) {
         return 0x3012;
     } else {
         return 0x3011;
@@ -409,12 +410,15 @@ s16 EnGo2_UpdateTalkStateGoronDmtRollingSmall(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+        LINK_IS_ADULT) {
         return 0x3043;
     } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
-        return Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE) ? 0x3021 : Flags_GetInfTable(INFTABLE_E0) ? 0x302A : 0x3008;
+        return Flags_GetEventChkInf(EVENTCHKINF_BOMBED_DODONGOS_CAVERN_ENTRANCE) ? 0x3021
+               : Flags_GetInfTable(INFTABLE_E0)                                  ? 0x302A
+                                                                                 : 0x3008;
     }
 }
 
@@ -430,7 +434,8 @@ s16 EnGo2_UpdateTalkStateGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityEntrance(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+        LINK_IS_ADULT) {
         return 0x3043;
     } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
@@ -451,7 +456,8 @@ s16 EnGo2_UpdateTalkStateGoronCityEntrance(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityIsland(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+        LINK_IS_ADULT) {
         return 0x3043;
     } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
@@ -472,15 +478,16 @@ s16 EnGo2_UpdateTalkStateGoronCityIsland(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
-    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
+    if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+        LINK_IS_ADULT) {
         return 0x3043;
     } else if (GameInteractor_Should(VB_GORONS_CONSIDER_DODONGOS_CAVERN_FINISHED, CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) {
         return 0x3027;
     } else {
-        return CUR_UPG_VALUE(UPG_STRENGTH) != 0    ? 0x302C
-               : !Flags_GetSwitch(play, 0x1B) ? 0x3017
+        return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
+               : !Flags_GetSwitch(play, 0x1B)   ? 0x3017
                : Flags_GetInfTable(INFTABLE_F8) ? 0x3019
-                                                   : 0x3018;
+                                                : 0x3018;
     }
 }
 
@@ -504,7 +511,8 @@ u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
 
     if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE))) {
         return Flags_GetInfTable(INFTABLE_10F) ? 0x3042 : 0x3041;
-    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
+    } else if (GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED,
+                                     CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
         return Flags_GetInfTable(INFTABLE_SPOKE_TO_GORON_LINK) ? 0x3038 : 0x3037;
     } else if (Flags_GetInfTable(INFTABLE_STOPPED_GORON_LINKS_ROLLING)) {
         this->unk_20C = 0;
@@ -615,8 +623,8 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
                     }
                 case 0x3054:
                     if (dialogState == TEXT_STATE_NONE) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     }
             }
             return 1;
@@ -887,7 +895,8 @@ s32 func_80A44AB0(EnGo2* this, PlayState* play) {
             return false;
         } else {
             if (this->collider.base.acFlags & 2) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->actor.flags &= ~ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT;
                 this->collider.base.acFlags &= ~0x2;
                 EnGo2_StopRolling(this, play);
@@ -1032,10 +1041,8 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
             }
             player->actor.textId = this->actor.textId;
 
-        } else if (
-            !GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag) && 
-            (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)
-        ) {
+        } else if (!GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag) &&
+                   (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)) {
             if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) {
                 if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3)) {
                     textId = 0x305E;
@@ -1061,7 +1068,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
                 this->actor.textId = 0x3058;
             }
             if (this->actor.textId == 0x3059) {
-                gSaveContext.timer2State = 0;
+                gSaveContext.subTimerState = 0;
             }
             player->actor.textId = this->actor.textId;
 
@@ -1172,10 +1179,10 @@ s32 EnGo2_IsCameraModified(EnGo2* this, PlayState* play) {
         (this->actor.params & 0x1F) == GORON_CITY_STAIRWELL || (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ||
         (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) {
         return true;
-    } else if (
-        !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
-        GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
-    ) {
+    } else if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+                                      CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+               GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED,
+                                     CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
         return true;
     } else {
         return false;
@@ -1232,10 +1239,10 @@ void EnGo2_SelectGoronWakingUp(EnGo2* this) {
             EnGo2_BiggoronWakingUp(this);
             break;
         case GORON_CITY_LINK:
-            if (
-                !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
-                GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
-            ) {
+            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+                                       CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+                GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED,
+                                      CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
                 EnGo2_WakingUp(this);
                 break;
             }
@@ -1563,7 +1570,9 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
         case GORON_CITY_LOWEST_FLOOR:
         case GORON_CITY_STAIRWELL:
         case GORON_CITY_LOST_WOODS:
-            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) && LINK_IS_ADULT) {
+            if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+                                       CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+                LINK_IS_ADULT) {
                 Actor_Kill(&this->actor);
             }
             this->actionFunc = EnGo2_CurledUp;
@@ -1578,10 +1587,10 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
             if ((Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED))) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
-                if (
-                    !GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
-                    GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED, CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))
-                ) {
+                if (!GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED,
+                                           CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
+                    GameInteractor_Should(VB_GORONS_CONSIDER_TUNIC_COLLECTED,
+                                          CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON))) {
                     EnGo2_GetItemAnimation(this, play);
                 } else {
                     this->actionFunc = EnGo2_CurledUp;
@@ -1803,12 +1812,14 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnGo2_SetGetItem;
     } else {
-        Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
+        Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f,
+                           fabsf(this->actor.yDistToPlayer) + 1.0f);
     }
 }
 
 void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_GORON, true)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         switch (this->getItemId) {
             case GI_CLAIM_CHECK:
@@ -1841,7 +1852,9 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
             this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
             this->actor.shape.rot.y += 0x5B0;
             this->trackingMode = NPC_TRACKING_NONE;
-            this->animTimer = !GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true) ? 0 : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
+            this->animTimer = !GameInteractor_Should(VB_PLAY_EYEDROPS_CS, true)
+                                  ? 0
+                                  : (this->skelAnime.endFrame + 60.0f + 60.0f); // eyeDrops animation timer
             this->eyeMouthTexState = 2;
             this->unk_20C = 0;
             this->goronState++;
@@ -2017,8 +2030,7 @@ s32 EnGo2_DrawCurledUp(EnGo2* this, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80);
     CLOSE_DISPS(play->state.gfxCtx);
     Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos);
@@ -2035,8 +2047,7 @@ s32 EnGo2_DrawRolling(EnGo2* this, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     speedXZ = this->actionFunc == EnGo2_ReverseRolling ? 0.0f : this->actor.speedXZ;
     Matrix_RotateZYX((play->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140);
     CLOSE_DISPS(play->state.gfxCtx);
     Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos);
diff --git a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
index 4ad72ea01d..fa95087bf7 100644
--- a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
+++ b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
@@ -6,7 +6,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnGoma_Init(Actor* thisx, PlayState* play);
 void EnGoma_Destroy(Actor* thisx, PlayState* play);
@@ -200,8 +202,8 @@ void EnGoma_SetupFlee(EnGoma* this) {
 void EnGoma_Flee(EnGoma* this, PlayState* play) {
     SkelAnime_Update(&this->skelanime);
     Math_ApproachF(&this->actor.speedXZ, 20.0f / 3.0f, 0.5f, 2.0f);
-    Math_ApproachS(&this->actor.world.rot.y,
-                   Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) + 0x8000, 3, 2000);
+    Math_ApproachS(&this->actor.world.rot.y, Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) + 0x8000,
+                   3, 2000);
     Math_ApproachS(&this->actor.shape.rot.y, this->actor.world.rot.y, 2, 3000);
 
     if (this->actionTimer == 0) {
@@ -295,8 +297,8 @@ void EnGoma_Egg(EnGoma* this, PlayState* play) {
             pos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x;
             pos.y = Rand_ZeroFloat(30.0f) + this->actor.world.pos.y;
             pos.z = Rand_CenteredFloat(30.0f) + this->actor.world.pos.z;
-            EffectSsHahen_Spawn(play, &pos, &vel, &acc, 0, (s16)(Rand_ZeroOne() * 5.0f) + 10, HAHEN_OBJECT_DEFAULT,
-                                10, NULL);
+            EffectSsHahen_Spawn(play, &pos, &vel, &acc, 0, (s16)(Rand_ZeroOne() * 5.0f) + 10, HAHEN_OBJECT_DEFAULT, 10,
+                                NULL);
         }
     }
 }
@@ -425,7 +427,8 @@ void EnGoma_Dead(EnGoma* this, PlayState* play) {
 
             parent->childrenGohmaState[this->actor.params] = -1;
         }
-        Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         Actor_Kill(&this->actor);
         Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos, 0x30);
     }
@@ -796,8 +799,8 @@ void EnGoma_Draw(Actor* thisx, PlayState* play) {
         case ENGOMA_NORMAL:
             this->actor.naviEnemyId = 0x03;
             Matrix_Translate(this->actor.world.pos.x,
-                             this->actor.world.pos.y + ((this->actor.shape.yOffset * this->actor.scale.y) +
-                                                        play->mainCamera.skyboxOffset.y),
+                             this->actor.world.pos.y +
+                                 ((this->actor.shape.yOffset * this->actor.scale.y) + play->mainCamera.skyboxOffset.y),
                              this->actor.world.pos.z, MTXMODE_NEW);
             Matrix_RotateX(this->slopePitch / (f32)0x8000 * M_PI, MTXMODE_APPLY);
             Matrix_RotateZ(this->slopeRoll / (f32)0x8000 * M_PI, MTXMODE_APPLY);
@@ -805,9 +808,7 @@ void EnGoma_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateX(this->actor.shape.rot.x / (f32)0x8000 * M_PI, MTXMODE_APPLY);
             Matrix_RotateZ(this->actor.shape.rot.z / (f32)0x8000 * M_PI, MTXMODE_APPLY);
             Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-            SkelAnime_DrawSkeletonOpa(play, &this->skelanime,
-                                      EnGoma_OverrideLimbDraw,
-                              NULL, this);
+            SkelAnime_DrawSkeletonOpa(play, &this->skelanime, EnGoma_OverrideLimbDraw, NULL, this);
             break;
 
         case ENGOMA_EGG:
@@ -825,15 +826,13 @@ void EnGoma_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateY(-(this->eggSquishAngle * 0.15f), MTXMODE_APPLY);
             Matrix_Translate(0.0f, this->eggYOffset, 0.0f, MTXMODE_APPLY);
             Matrix_RotateX(this->eggPitch, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gObjectGolEggDL);
             Matrix_Pop();
             break;
 
         case ENGOMA_HATCH_DEBRIS:
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gBrownFragmentDL);
             break;
 
@@ -868,11 +867,10 @@ void EnGoma_SpawnHatchDebris(EnGoma* this, PlayState* play2) {
     }
 
     for (i = 0; i < 15; i++) {
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GOMA,
-                           Rand_CenteredFloat(10.0f) + this->actor.world.pos.x,
-                           Rand_CenteredFloat(10.0f) + this->actor.world.pos.y + 15.0f,
-                           Rand_CenteredFloat(10.0f) + this->actor.world.pos.z, 0, Rand_CenteredFloat(0x10000 - 0.01f),
-                           0, i + 10);
+        Actor_SpawnAsChild(
+            &play->actorCtx, &this->actor, play, ACTOR_EN_GOMA, Rand_CenteredFloat(10.0f) + this->actor.world.pos.x,
+            Rand_CenteredFloat(10.0f) + this->actor.world.pos.y + 15.0f,
+            Rand_CenteredFloat(10.0f) + this->actor.world.pos.z, 0, Rand_CenteredFloat(0x10000 - 0.01f), 0, i + 10);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index 4df1b60404..0eee785dd9 100644
--- a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -215,7 +215,7 @@ void EnGoroiwa_ReverseDirection(EnGoroiwa* this) {
 }
 
 void EnGoroiwa_InitPath(EnGoroiwa* this, PlayState* play) {
-    this->endWaypoint = play->setupPathList [this->actor.params & 0xFF].count - 1;
+    this->endWaypoint = play->setupPathList[this->actor.params & 0xFF].count - 1;
     this->currentWaypoint = 0;
     this->nextWaypoint = 1;
     this->pathDirection = 1;
@@ -389,8 +389,8 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) {
                 raycastFrom.x = this->actor.world.pos.x;
                 raycastFrom.y = this->actor.world.pos.y + 50.0f;
                 raycastFrom.z = this->actor.world.pos.z;
-                floorY = BgCheck_EntityRaycastFloor5(play, &play->colCtx, &floorPoly, &floorBgId,
-                                                     &this->actor, &raycastFrom);
+                floorY = BgCheck_EntityRaycastFloor5(play, &play->colCtx, &floorPoly, &floorBgId, &this->actor,
+                                                     &raycastFrom);
                 yDistToFloor = floorY - (this->actor.world.pos.y - 59.5f);
                 if (fabsf(yDistToFloor) < 15.0f) {
                     dustPos.x = this->actor.world.pos.x;
@@ -408,8 +408,8 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) {
         this->actor.world.pos.y = nextPointY - ((this->actor.world.pos.y - nextPointY) * 0.3f);
     }
     if (this->bounceCount == 0 &&
-        WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
-                                &ySurface, &waterBox) &&
+        WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &ySurface,
+                                &waterBox) &&
         this->actor.world.pos.y <= ySurface) {
         this->stateFlags |= ENGOROIWA_IN_WATER;
         if (ySurface < thisY) {
@@ -537,8 +537,7 @@ void EnGoroiwa_Init(Actor* thisx, PlayState* play) {
     pathIdx = this->actor.params & 0xFF;
     if (pathIdx == 0xFF) {
         // "Error: Invalid arg_data"
-        osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     this->actor.params);
+        osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params);
         Actor_Kill(&this->actor);
         return;
     }
@@ -725,7 +724,8 @@ void EnGoroiwa_Update(Actor* thisx, PlayState* play) {
     s32 pad;
     s32 sp30;
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
         if (this->collisionDisabledTimer > 0) {
             this->collisionDisabledTimer--;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 83db2aeb0b..67b10b3d68 100644
--- a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -152,17 +152,17 @@ void func_80A4E470(EnGs* this, PlayState* play) {
             }
         } else if (GameInteractor_Should(VB_SPAWN_GOSSIP_STONE_FAIRY, this->unk_19D & 1, this)) {
             if (play->msgCtx.ocarinaMode == OCARINA_MODE_04) {
-                if ((play->msgCtx.unk_E3F2 == OCARINA_SONG_SARIAS) ||
-                    (play->msgCtx.unk_E3F2 == OCARINA_SONG_EPONAS) ||
-                    (play->msgCtx.unk_E3F2 == OCARINA_SONG_LULLABY) ||
-                    (play->msgCtx.unk_E3F2 == OCARINA_SONG_SUNS) ||
+                if ((play->msgCtx.unk_E3F2 == OCARINA_SONG_SARIAS) || (play->msgCtx.unk_E3F2 == OCARINA_SONG_EPONAS) ||
+                    (play->msgCtx.unk_E3F2 == OCARINA_SONG_LULLABY) || (play->msgCtx.unk_E3F2 == OCARINA_SONG_SUNS) ||
                     (play->msgCtx.unk_E3F2 == OCARINA_SONG_TIME)) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x,
-                                this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_HEAL_TIMED, true);
+                                this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_HEAL_TIMED,
+                                true);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY);
                 } else if (play->msgCtx.unk_E3F2 == OCARINA_SONG_STORMS) {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x,
-                                this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_HEAL_BIG, true);
+                                this->actor.world.pos.y + 40.0f, this->actor.world.pos.z, 0, 0, 0, FAIRY_HEAL_BIG,
+                                true);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY);
                 }
                 this->unk_19D = 0;
@@ -204,8 +204,8 @@ void func_80A4E648(EnGs* this, PlayState* play) {
     }
 }
 
-f32 func_80A4E754(EnGs* this, PlayState* play, f32* arg2, f32* arg3, u16* arg4, f32 arg5, f32 arg6, f32 arg7,
-                  s32 arg8, s32 arg9) {
+f32 func_80A4E754(EnGs* this, PlayState* play, f32* arg2, f32* arg3, u16* arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8,
+                  s32 arg9) {
     f32 sp2C = Math_SmoothStepToF(arg2, *arg3, arg5, arg6, arg7);
 
     if (arg9 == 0) {
@@ -224,8 +224,8 @@ void func_80A4E910(EnGs* this, PlayState* play) {
         this->unk_19F = 1;
         this->unk_1E8 = 0.5f;
         this->unk_1EC = 0.0f;
-    } else if ((this->unk_19F == 1) && (func_80A4E754(this, play, &this->unk_1E8, &this->unk_1EC, &this->unk_200,
-                                                      0.8f, 0.007f, 0.001f, 7, 0) == 0.0f)) {
+    } else if ((this->unk_19F == 1) && (func_80A4E754(this, play, &this->unk_1E8, &this->unk_1EC, &this->unk_200, 0.8f,
+                                                      0.007f, 0.001f, 7, 0) == 0.0f)) {
         if (!Play_InCsMode(play)) {
             Message_StartTextbox(play, 0x71B1, NULL);
         }
@@ -244,8 +244,8 @@ void func_80A4EA08(EnGs* this, PlayState* play) {
     } else if (this->unk_19F == 1) {
         this->unk_1A0[0].z = (((this->unk_200 % 8) / 8.0f) * 360.0f) * (0x10000 / 360.0f);
         this->unk_1A0[1].z = -this->unk_1A0[0].z;
-        if (func_80A4E754(this, play, &this->unk_1E8, &this->unk_1EC, &this->unk_200, 0.8f, 0.005f, 0.001f, 7,
-                          0) == 0.0f) {
+        if (func_80A4E754(this, play, &this->unk_1E8, &this->unk_1EC, &this->unk_200, 0.8f, 0.005f, 0.001f, 7, 0) ==
+            0.0f) {
             this->unk_19C = 0;
             this->actionFunc = func_80A4F734;
         }
@@ -326,14 +326,14 @@ void func_80A4ED34(EnGs* this, PlayState* play) {
             if (this->unk_200 < 20) {
                 Color_RGBA8_Copy(&this->flashColor, &flashRed);
                 if ((this->unk_200 % 20) == 7) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
             } else {
                 Color_RGBA8_Copy(&this->flashColor, &flashBlue);
                 if ((this->unk_200 % 20) == 7) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
             }
         }
@@ -586,8 +586,7 @@ void EnGs_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateZ(this->unk_1A0[1].z * (M_PI / 0x8000), MTXMODE_APPLY);
         }
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gGossipStoneMaterialDL);
 
         if (this->unk_19E & 4) {
@@ -595,7 +594,8 @@ void EnGs_Draw(Actor* thisx, PlayState* play) {
                             this->flashColor.a);
         } else {
             if (CVarGetInteger(CVAR_COSMETIC("World.GossipStone.Changed"), 0)) {
-                Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("World.GossipStone.Value"), (Color_RGB8){255, 255, 255});
+                Color_RGB8 color =
+                    CVarGetColor24(CVAR_COSMETIC("World.GossipStone.Value"), (Color_RGB8){ 255, 255, 255 });
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color.r, color.g, color.b, 255);
             } else {
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
@@ -611,11 +611,9 @@ void EnGs_Draw(Actor* thisx, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(0.05f, -0.05f, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPSegment(
-                POLY_XLU_DISP++, 0x08,
-                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, -frames * 0x14, 0x20, 0x80));
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPSegment(POLY_XLU_DISP++, 0x08,
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, -frames * 0x14, 0x20, 0x80));
             gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 0, 255);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
             gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
diff --git a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c
index ede41e5836..f8372067cb 100644
--- a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c
+++ b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c
@@ -85,7 +85,8 @@ void EnGuest_Update(Actor* thisx, PlayState* play) {
         this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED;
         Actor_ProcessInitChain(&this->actor, sInitChain);
 
-        SkelAnime_InitFlex(play, &this->skelAnime, &object_boj_Skel_0000F0, NULL, this->jointTable, this->morphTable, 16);
+        SkelAnime_InitFlex(play, &this->skelAnime, &object_boj_Skel_0000F0, NULL, this->jointTable, this->morphTable,
+                           16);
         gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[this->osAnimeBankIndex].segment);
         Animation_Change(&this->skelAnime, &gObjOsAnim_42AC, 1.0f, 0.0f, Animation_GetLastFrame(&gObjOsAnim_42AC),
                          ANIMMODE_LOOP, 0.0f);
@@ -183,8 +184,7 @@ Gfx* func_80A50708(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) {
     return dlist;
 }
 
-s32 EnGuest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 EnGuest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnGuest* this = (EnGuest*)thisx;
     Vec3s sp3C;
 
diff --git a/soh/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/soh/src/overlays/actors/ovl_En_Hata/z_en_hata.c
index 6e36e20274..cec19bafe5 100644
--- a/soh/src/overlays/actors/ovl_En_Hata/z_en_hata.c
+++ b/soh/src/overlays/actors/ovl_En_Hata/z_en_hata.c
@@ -141,7 +141,5 @@ void EnHata_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_37Opa(play->state.gfxCtx);
     Matrix_Scale(1.0f, 1.1f, 1.0f, MTXMODE_APPLY);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                                               EnHata_OverrideLimbDraw,
-                      EnHata_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHata_OverrideLimbDraw, EnHata_PostLimbDraw, this);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
index 2b23442a33..3ca5830335 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
@@ -77,8 +77,7 @@ void EnHeishi1_Init(Actor* thisx, PlayState* play) {
     s32 i;
 
     Actor_SetScale(&this->actor, 0.01f);
-    SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable,
-                   17);
+    SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable, 17);
 
     this->type = (this->actor.params >> 8) & 0xFF;
     this->path = this->actor.params & 0xFF;
@@ -121,20 +120,19 @@ void EnHeishi1_Init(Actor* thisx, PlayState* play) {
     // eventChkInf[4] & 1 = Got Zelda's Letter
     // eventChkInf[5] & 0x200 = Got item from impa
     // eventChkInf[8] & 1 = Ocarina thrown in moat
-    bool metZelda = (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) && (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY));
+    bool metZelda = (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) &&
+                    (Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY));
 
     if (this->type != 5) {
         if ((gSaveContext.dayTime < 0xB888 || IS_DAY) &&
-            ((!IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ||
-             (IS_RANDO && !metZelda))) {
+            ((!IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) || (IS_RANDO && !metZelda))) {
             this->actionFunc = EnHeishi1_SetupWalk;
         } else {
             Actor_Kill(&this->actor);
         }
     } else {
         if ((gSaveContext.dayTime >= 0xB889) || !IS_DAY ||
-            (!IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) || 
-            (IS_RANDO && metZelda)) {
+            (!IS_RANDO && Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) || (IS_RANDO && metZelda)) {
             this->actionFunc = EnHeishi1_SetupWaitNight;
         } else {
             Actor_Kill(&this->actor);
@@ -489,8 +487,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnHeishi1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnHeishi1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnHeishi1* this = (EnHeishi1*)thisx;
 
     // turn the guards head to match the direction he is looking
@@ -507,9 +504,7 @@ void EnHeishi1_Draw(Actor* thisx, PlayState* play) {
     Vec3f matrixScale = { 0.3f, 0.3f, 0.3f };
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi1_OverrideLimbDraw,
-                              NULL,
-                      this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi1_OverrideLimbDraw, NULL, this);
     func_80033C30(&this->actor.world.pos, &matrixScale, 0xFF, play);
 
     if ((this->path == BREG(1)) && (BREG(0) != 0)) {
diff --git a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
index 0bb2b1e9d8..192d749d49 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@@ -122,8 +122,8 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) {
     } else {
         this->unk_2E0 = 60.0f;
         ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
-        SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable,
-                       this->morphTable, 17);
+        SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable,
+                       17);
         collider = &this->collider;
         Collider_InitCylinder(play, collider);
         Collider_SetCylinder(play, collider, &this->actor, &sCylinderInit);
@@ -194,7 +194,8 @@ void func_80A53278(EnHeishi2* this, PlayState* play) {
         this->unk_30B = 1;
         this->unk_300 = TEXT_STATE_DONE;
         this->actionFunc = func_80A5475C;
-    } else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) &&
+    } else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP)) &&
+               (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) &&
                (Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP))) {
         // "Get all spiritual stones!"
         osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST);
@@ -313,19 +314,21 @@ void func_80A5372C(EnHeishi2* this, PlayState* play) {
     f32 frameCount = Animation_GetLastFrame(&gEnHeishiIdleAnim);
 
     Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f);
-    this->unk_2F2[0] = 200;
-    this->cameraId = Play_CreateSubCamera(play);
-    Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-    Play_ChangeCameraStatus(play, this->cameraId, CAM_STAT_ACTIVE);
-    this->unk_280.x = 947.0f;
-    this->unk_280.y = 1195.0f;
-    this->unk_280.z = 2682.0f;
+    if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, false)) {
+        this->unk_2F2[0] = 200;
+        this->cameraId = Play_CreateSubCamera(play);
+        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
+        Play_ChangeCameraStatus(play, this->cameraId, CAM_STAT_ACTIVE);
+        this->unk_280.x = 947.0f;
+        this->unk_280.y = 1195.0f;
+        this->unk_280.z = 2682.0f;
 
-    this->unk_28C.x = 1164.0f;
-    this->unk_28C.y = 1145.0f;
-    this->unk_28C.z = 3014.0f;
+        this->unk_28C.x = 1164.0f;
+        this->unk_28C.y = 1145.0f;
+        this->unk_28C.z = 3014.0f;
 
-    Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+        Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    }
     this->actionFunc = func_80A53850;
 }
 
@@ -333,11 +336,15 @@ void func_80A53850(EnHeishi2* this, PlayState* play) {
     BgSpot15Saku* gate;
 
     SkelAnime_Update(&this->skelAnime);
-    Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, false)) {
+        Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    }
     gate = (BgSpot15Saku*)this->gate;
     if ((this->unk_2F2[0] == 0) || (gate->unk_168 == 0)) {
-        Play_ClearCamera(play, this->cameraId);
-        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+        if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, true)) {
+            Play_ClearCamera(play, this->cameraId);
+            Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+        }
         Message_CloseTextbox(play);
         this->unk_30C = 1;
         Player_SetCsActionWithHaltedActors(play, NULL, 7);
@@ -409,7 +416,8 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
     this->unk_300 = TEXT_STATE_DONE;
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
         exchangeItemId = func_8002F368(play);
-        if (GameInteractor_Should(VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER, exchangeItemId == EXCH_ITEM_LETTER_ZELDA, exchangeItemId)) {
+        if (GameInteractor_Should(VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER, exchangeItemId == EXCH_ITEM_LETTER_ZELDA,
+                                  exchangeItemId)) {
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
             player->actor.textId = 0x2010;
             this->unk_300 = TEXT_STATE_EVENT;
@@ -477,23 +485,25 @@ void func_80A53DF8(EnHeishi2* this, PlayState* play) {
     f32 frameCount = Animation_GetLastFrame(&gEnHeishiIdleAnim);
 
     Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f);
-    this->unk_2F2[0] = 200;
-    this->cameraId = Play_CreateSubCamera(play);
-    Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
-    Play_ChangeCameraStatus(play, this->cameraId, CAM_STAT_ACTIVE);
-    this->unk_2BC.x = -71.0f;
-    this->unk_280.x = -71.0f;
-    this->unk_2BC.y = 571.0f;
-    this->unk_280.y = 571.0f;
-    this->unk_2BC.z = -1487.0f;
-    this->unk_280.z = -1487.0f;
-    this->unk_298.x = 181.0f;
-    this->unk_28C.x = 181.0f;
-    this->unk_298.y = 417.0f;
-    this->unk_28C.y = 417.0f;
-    this->unk_298.z = -1079.0f;
-    this->unk_28C.z = -1079.0f;
-    Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, false)) {
+        this->unk_2F2[0] = 200;
+        this->cameraId = Play_CreateSubCamera(play);
+        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
+        Play_ChangeCameraStatus(play, this->cameraId, CAM_STAT_ACTIVE);
+        this->unk_2BC.x = -71.0f;
+        this->unk_280.x = -71.0f;
+        this->unk_2BC.y = 571.0f;
+        this->unk_280.y = 571.0f;
+        this->unk_2BC.z = -1487.0f;
+        this->unk_280.z = -1487.0f;
+        this->unk_298.x = 181.0f;
+        this->unk_28C.x = 181.0f;
+        this->unk_298.y = 417.0f;
+        this->unk_28C.y = 417.0f;
+        this->unk_298.z = -1079.0f;
+        this->unk_28C.z = -1079.0f;
+        Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    }
     this->actionFunc = func_80A53F30;
 }
 
@@ -501,11 +511,15 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) {
     BgGateShutter* gate;
 
     SkelAnime_Update(&this->skelAnime);
-    Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, false)) {
+        Play_CameraSetAtEye(play, this->cameraId, &this->unk_280, &this->unk_28C);
+    }
     gate = (BgGateShutter*)this->gate;
     if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) {
-        Play_ClearCamera(play, this->cameraId);
-        Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+        if (GameInteractor_Should(VB_PLAY_GATE_OPENING_OR_CLOSING_CS, true, this, true)) {
+            Play_ClearCamera(play, this->cameraId);
+            Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
+        }
         if ((this->unk_30A != 2)) {
             if (this->unk_30A == 0) {
                 this->actor.textId = 0x2015;
@@ -800,8 +814,7 @@ void EnHeishi2_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnHeishi2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnHeishi2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnHeishi2* this = (EnHeishi2*)thisx;
 
     switch (this->type) {
@@ -833,8 +846,7 @@ void EnHeishi2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
 void EnHeishi2_DrawKingGuard(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gHeishiKingGuardDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -849,8 +861,7 @@ void EnHeishi2_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi2_OverrideLimbDraw,
-                      EnHeishi2_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi2_OverrideLimbDraw, EnHeishi2_PostLimbDraw, this);
     if ((this->type == 5) && (Flags_GetInfTable(INFTABLE_GATE_GUARD_PUT_ON_KEATON_MASK))) {
         linkObjBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_LINK_CHILD);
         if (linkObjBankIndex >= 0) {
diff --git a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
index 3720758064..9245050315 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
@@ -73,8 +73,7 @@ void EnHeishi3_Init(Actor* thisx, PlayState* play) {
     }
     Actor_SetScale(&this->actor, 0.01f);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable,
-                   17);
+    SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable, 17);
     this->actor.colChkInfo.mass = MASS_IMMOVABLE;
     this->actor.targetMode = 6;
     Collider_InitCylinder(play, &this->collider);
@@ -232,8 +231,7 @@ void EnHeishi3_Update(Actor* thisx, PlayState* play) {
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
 }
 
-s32 EnHeishi3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnHeishi3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnHeishi3* this = (EnHeishi3*)thisx;
 
     if (limbIndex == 9) {
@@ -252,7 +250,5 @@ void EnHeishi3_Draw(Actor* thisx, PlayState* play) {
     EnHeishi3* this = (EnHeishi3*)thisx;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi3_OverrideLimbDraw,
-                              NULL,
-                      this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHeishi3_OverrideLimbDraw, NULL, this);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
index bd38ba9d95..0bc1730596 100644
--- a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
+++ b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
@@ -75,8 +75,8 @@ void EnHeishi4_Init(Actor* thisx, PlayState* play) {
     } else {
         this->height = 60.0f;
         ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
-        SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable,
-                       this->morphTable, 17);
+        SkelAnime_Init(play, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable,
+                       17);
     }
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, thisx, &sCylinderInit);
@@ -358,18 +358,20 @@ at night.
 void EnHeishi4_MarketSneak(EnHeishi4* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
-            case 0: //yes
-                if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) != RO_GENERIC_OFF){
-                    play->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN); // Market Entrance -> HF
+            case 0: // yes
+                if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) != RO_GENERIC_OFF) {
+                    play->nextEntranceIndex =
+                        Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN); // Market Entrance -> HF
                 } else {
-                    play->nextEntranceIndex = ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN; // HF Near bridge (OoT cutscene entrance) to not fall in the water
-                } 
+                    play->nextEntranceIndex = ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN; // HF Near bridge (OoT cutscene
+                                                                                   // entrance) to not fall in the water
+                }
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
                 gSaveContext.nextTransitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
                 this->actionFunc = func_80A56614;
                 break;
-            case 1: //no
+            case 1: // no
                 this->actionFunc = func_80A56614;
                 break;
         }
@@ -402,8 +404,7 @@ void EnHeishi4_Update(Actor* thisx, PlayState* play) {
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
 }
 
-s32 EnHeishi_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                              void* thisx) {
+s32 EnHeishi_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnHeishi4* this = (EnHeishi4*)thisx;
 
     if (limbIndex == 9) {
diff --git a/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
index f0a990f039..81d689ee84 100644
--- a/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
+++ b/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
@@ -81,8 +81,8 @@ void EnHintnuts_Init(Actor* thisx, PlayState* play) {
         this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE);
     } else {
         ActorShape_Init(&this->actor.shape, 0x0, ActorShadow_DrawCircle, 35.0f);
-        SkelAnime_Init(play, &this->skelAnime, &gHintNutsSkel, &gHintNutsStandAnim, this->jointTable,
-                       this->morphTable, 10);
+        SkelAnime_Init(play, &this->skelAnime, &gHintNutsSkel, &gHintNutsStandAnim, this->jointTable, this->morphTable,
+                       10);
         Collider_InitCylinder(play, &this->collider);
         Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
         CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
@@ -291,8 +291,8 @@ void EnHintnuts_ThrowNut(EnHintnuts* this, PlayState* play) {
         nutPos.x = this->actor.world.pos.x + (Math_SinS(this->actor.shape.rot.y) * 23.0f);
         nutPos.y = this->actor.world.pos.y + 12.0f;
         nutPos.z = this->actor.world.pos.z + (Math_CosS(this->actor.shape.rot.y) * 23.0f);
-        if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_NUTSBALL, nutPos.x, nutPos.y, nutPos.z,
-                        this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 1, true) != NULL) {
+        if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_NUTSBALL, nutPos.x, nutPos.y, nutPos.z, this->actor.shape.rot.x,
+                        this->actor.shape.rot.y, this->actor.shape.rot.z, 1, true) != NULL) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW);
         }
     }
@@ -382,7 +382,8 @@ void EnHintnuts_Run(EnHintnuts* this, PlayState* play) {
                fabsf(this->actor.world.pos.y - this->actor.home.pos.y) < 2.0f) {
         this->actor.speedXZ = 0.0f;
         if (this->actor.category == ACTORCAT_BG) {
-            this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
+            this->actor.flags &=
+                ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
             this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE;
             Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY);
         }
@@ -489,8 +490,8 @@ void EnHintnuts_Update(Actor* thisx, PlayState* play) {
         this->actionFunc(this, play);
         if (this->actionFunc != EnHintnuts_Freeze && this->actionFunc != EnHintnuts_BeginFreeze) {
             Actor_MoveXZGravity(&this->actor);
-            Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius,
-                                    this->collider.dim.height, 0x1D);
+            Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height,
+                                    0x1D);
         }
         Collider_UpdateCylinder(&this->actor, &this->collider);
         if (this->collider.base.acFlags & AC_ON) {
@@ -508,8 +509,7 @@ void EnHintnuts_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnHintnuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 EnHintnuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     Vec3f vec;
     f32 curFrame;
     EnHintnuts* this = (EnHintnuts*)thisx;
@@ -543,8 +543,6 @@ void EnHintnuts_Draw(Actor* thisx, PlayState* play) {
     if (this->actor.params == 0xA) {
         Gfx_DrawDListOpa(play, gHintNutsFlowerDL);
     } else {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime,
-                                  EnHintnuts_OverrideLimbDraw,
-                          NULL, this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnHintnuts_OverrideLimbDraw, NULL, this);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c
index 9fb434b7d6..86030a52a9 100644
--- a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c
+++ b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c
@@ -343,8 +343,7 @@ void EnHoll_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateY(M_PI, MTXMODE_APPLY);
         }
 
-        gSPMatrix(gfxP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(gfxP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetPrimColor(gfxP++, 0, 0, 0, 0, 0, (u8)this->planeAlpha);
         gSPDisplayList(gfxP++, sPlaneDL);
 
diff --git a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
index f65e39cee3..509bfefda2 100644
--- a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+++ b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
@@ -499,8 +499,7 @@ void EnHonotrap_DrawEye(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeState]));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gEyeSwitch2DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -522,8 +521,7 @@ void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) {
     Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - this->actor.shape.rot.y + 0x8000) *
                        (M_PI / 0x8000),
                    MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index e94f91200a..c4d46035d9 100644
--- a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -611,8 +611,8 @@ void EnHorse_PlayWalkingSound(EnHorse* this) {
             return;
         }
 
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         if (++this->soundTimer > 1) {
             this->soundTimer = 0;
         }
@@ -620,11 +620,13 @@ void EnHorse_PlayWalkingSound(EnHorse* this) {
 }
 
 void EnHorse_PlayTrottingSound(EnHorse* this) {
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void EnHorse_PlayGallopingSound(EnHorse* this) {
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 f32 EnHorse_SlopeSpeedMultiplier(EnHorse* this, PlayState* play) {
@@ -659,13 +661,13 @@ void EnHorse_IdleAnimSounds(EnHorse* this, PlayState* play) {
          (this->curFrame > 28.0f && this->type == HORSE_HNI)) &&
         !(this->stateFlags & ENHORSE_SANDDUST_SOUND)) {
         this->stateFlags |= ENHORSE_SANDDUST_SOUND;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == ENHORSE_ANIM_REARING && this->curFrame > 25.0f &&
                !(this->stateFlags & ENHORSE_LAND2_SOUND)) {
         this->stateFlags |= ENHORSE_LAND2_SOUND;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -682,7 +684,8 @@ s32 EnHorse_Spawn(EnHorse* this, PlayState* play) {
             player = GET_PLAYER(play);
             if (play->sceneNum != SCENE_LON_LON_RANCH ||
                 //! Same flag checked twice
-                (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && ((gSaveContext.eventInf[0] & 0xF) != 6 || Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) ||
+                (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) &&
+                 ((gSaveContext.eventInf[0] & 0xF) != 6 || Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) ||
                 // always load two spawns inside lon lon
                 ((sHorseSpawns[i].pos.x == 856 && sHorseSpawns[i].pos.y == 0 && sHorseSpawns[i].pos.z == -918) ||
                  (sHorseSpawns[i].pos.x == -1003 && sHorseSpawns[i].pos.y == 0 && sHorseSpawns[i].pos.z == -755))) {
@@ -724,9 +727,9 @@ void EnHorse_ResetRace(EnHorse* this, PlayState* play) {
 s32 EnHorse_PlayerCanMove(EnHorse* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if ((player->stateFlags1 & PLAYER_STATE1_LOADING) || func_8002DD78(GET_PLAYER(play)) == 1 || (player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) ||
-        ((this->stateFlags & ENHORSE_FLAG_19) && !this->inRace) || this->action == ENHORSE_ACT_HBA ||
-        player->actor.flags & ACTOR_FLAG_TALK || play->csCtx.state != 0) {
+    if ((player->stateFlags1 & PLAYER_STATE1_LOADING) || func_8002DD78(GET_PLAYER(play)) == 1 ||
+        (player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) || ((this->stateFlags & ENHORSE_FLAG_19) && !this->inRace) ||
+        this->action == ENHORSE_ACT_HBA || player->actor.flags & ACTOR_FLAG_TALK || play->csCtx.state != 0) {
         return false;
     }
     return true;
@@ -980,8 +983,8 @@ void EnHorse_Frozen(EnHorse* this, PlayState* play) {
 
 void EnHorse_StickDirection(Vec2f* curStick, f32* stickMag, s16* angle);
 
-void EnHorse_UpdateSpeed(EnHorse* this, PlayState* play, f32 brakeDecel, f32 brakeAngle, f32 minStickMag,
-                         f32 decel, f32 baseSpeed, s16 turnSpeed) {
+void EnHorse_UpdateSpeed(EnHorse* this, PlayState* play, f32 brakeDecel, f32 brakeAngle, f32 minStickMag, f32 decel,
+                         f32 baseSpeed, s16 turnSpeed) {
     s16* stickAnglePtr; // probably fake
     f32 stickMag;
     s16 stickAngle;
@@ -1022,10 +1025,9 @@ void EnHorse_UpdateSpeed(EnHorse* this, PlayState* play, f32 brakeDecel, f32 bra
 
     if (this->stateFlags & ENHORSE_BOOST) {
         if ((16 - this->boostTimer) > 0) {
-            this->actor.speedXZ =
-                (EnHorse_SlopeSpeedMultiplier(this, play) * this->boostSpeed - this->actor.speedXZ) /
-                    (16 - this->boostTimer) +
-                this->actor.speedXZ;
+            this->actor.speedXZ = (EnHorse_SlopeSpeedMultiplier(this, play) * this->boostSpeed - this->actor.speedXZ) /
+                                      (16 - this->boostTimer) +
+                                  this->actor.speedXZ;
         } else {
             this->actor.speedXZ = EnHorse_SlopeSpeedMultiplier(this, play) * this->boostSpeed;
         }
@@ -1076,8 +1078,8 @@ void EnHorse_StartMountedIdle(EnHorse* this) {
     if ((this->curFrame > 35.0f && this->type == HORSE_EPONA) || (this->curFrame > 28.0f && this->type == HORSE_HNI)) {
         if (!(this->stateFlags & ENHORSE_SANDDUST_SOUND)) {
             this->stateFlags |= ENHORSE_SANDDUST_SOUND;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     curFrame = this->skin.skelAnime.curFrame;
@@ -1129,7 +1131,8 @@ void EnHorse_MountedIdleWhinney(EnHorse* this) {
                      Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -1401,7 +1404,8 @@ void EnHorse_StartRearing(EnHorse* this) {
     this->stateFlags &= ~ENHORSE_LAND2_SOUND;
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     func_800AA000(0.0f, 180, 20, 100);
     Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f,
@@ -1416,8 +1420,8 @@ void EnHorse_MountedRearing(EnHorse* this, PlayState* play) {
     if (this->curFrame > 25.0f) {
         if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
             this->stateFlags |= ENHORSE_LAND2_SOUND;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             func_800AA000(0, 180, 20, 100);
         }
     }
@@ -1450,7 +1454,8 @@ void EnHorse_StartBraking(EnHorse* this, PlayState* play) {
     this->action = ENHORSE_ACT_STOPPING;
     this->animationIdx = ENHORSE_ANIM_STOPPING;
 
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SLIP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SLIP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, 0.0f,
                      Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
 
@@ -1471,7 +1476,8 @@ void EnHorse_Stopping(EnHorse* this, PlayState* play) {
         if (Rand_ZeroOne() > 0.5) {
             this->unk_21C = this->unk_228;
             if (this->stateFlags & ENHORSE_DRAW) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             func_800AA000(0.0f, 180, 20, 100);
             this->stateFlags &= ~ENHORSE_STOPPING_NEIGH_SOUND;
@@ -1602,7 +1608,8 @@ void EnHorse_StartLowJump(EnHorse* this, PlayState* play) {
     y = jointTable->y;
     this->riderPos.y -= y * 0.01f;
 
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     func_800AA000(0.0f, 170, 10, 10);
 }
 
@@ -1636,8 +1643,8 @@ void EnHorse_LowJump(EnHorse* this, PlayState* play) {
 
     if (SkelAnime_Update(&this->skin.skelAnime) ||
         (curFrame > 17.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 255, 10, 80);
         this->stateFlags &= ~ENHORSE_JUMPING;
         this->actor.gravity = -3.5f;
@@ -1676,7 +1683,8 @@ void EnHorse_StartHighJump(EnHorse* this, PlayState* play) {
     this->riderPos.y -= y * 0.01f;
 
     this->stateFlags |= ENHORSE_CALC_RIDER_POS;
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     func_800AA000(0.0f, 170, 10, 10);
 }
 
@@ -1711,8 +1719,8 @@ void EnHorse_HighJump(EnHorse* this, PlayState* play) {
 
     if (SkelAnime_Update(&this->skin.skelAnime) ||
         (curFrame > 23.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 255, 10, 80);
         this->stateFlags &= ~ENHORSE_JUMPING;
         this->actor.gravity = -3.5f;
@@ -1740,8 +1748,8 @@ void EnHorse_Inactive(EnHorse* this, PlayState* play2) {
     if (DREG(53) != 0 && this->type == HORSE_EPONA) {
         DREG(53) = 0;
         if (EnHorse_Spawn(this, play) != 0) {
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->stateFlags &= ~ENHORSE_INACTIVE;
             gSaveContext.horseData.scene = play->sceneNum;
 
@@ -1774,12 +1782,14 @@ void EnHorse_PlayIdleAnimation(EnHorse* this, s32 anim, f32 morphFrames, f32 sta
         } else if (this->animationIdx == ENHORSE_ANIM_WHINNEY) {
             this->unk_21C = this->unk_228;
             if (this->stateFlags & ENHORSE_DRAW) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         } else if (this->animationIdx == ENHORSE_ANIM_REARING) {
             this->unk_21C = this->unk_228;
             if (this->stateFlags & ENHORSE_DRAW) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             this->stateFlags &= ~ENHORSE_LAND2_SOUND;
         }
@@ -1814,8 +1824,8 @@ void EnHorse_Idle(EnHorse* this, PlayState* play) {
         DREG(53) = 0;
         if (!func_80A5BBBC(play, this, &this->actor.world.pos)) {
             if (EnHorse_Spawn(this, play)) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->followTimer = 0;
                 EnHorse_SetFollowAnimation(this, play);
                 Camera_SetParam(play->cameraPtrs[0], 8, this);
@@ -1823,8 +1833,8 @@ void EnHorse_Idle(EnHorse* this, PlayState* play) {
                 Camera_SetCameraData(play->cameraPtrs[0], 4, NULL, NULL, 0x51, 0, 0);
             }
         } else {
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->followTimer = 0;
             EnHorse_StartMovingAnimation(this, 6, -3.0f, 0.0f);
         }
@@ -1933,8 +1943,8 @@ void EnHorse_FollowPlayer(EnHorse* this, PlayState* play) {
         if (this->curFrame > 25.0f) {
             if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
                 this->stateFlags |= ENHORSE_LAND2_SOUND;
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
     } else {
@@ -1961,7 +1971,8 @@ void EnHorse_FollowPlayer(EnHorse* this, PlayState* play) {
         this->unk_21C = this->unk_228;
 
         if (this->stateFlags & ENHORSE_DRAW) {
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
@@ -1989,7 +2000,8 @@ void EnHorse_InitIngoHorse(EnHorse* this) {
     EnHorse_UpdateIngoHorseAnim(this);
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -2042,10 +2054,12 @@ void EnHorse_UpdateIngoHorseAnim(EnHorse* this) {
         animSpeed = this->actor.speedXZ * 0.5f;
     } else if (this->animationIdx == ENHORSE_ANIM_TROT) {
         animSpeed = this->actor.speedXZ * 0.25f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) {
         animSpeed = this->actor.speedXZ * 0.2f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else {
         animSpeed = 1.0f;
     }
@@ -2161,7 +2175,8 @@ void EnHorse_CsPlayHighJumpAnim(EnHorse* this, PlayState* play) {
     this->riderPos.y -= y * 0.01f;
 
     this->stateFlags |= ENHORSE_CALC_RIDER_POS;
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     func_800AA000(0.0f, 170, 10, 10);
 }
 
@@ -2205,8 +2220,8 @@ void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
         f32 y;
 
         this->cutsceneFlags |= 1;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 255, 10, 80);
         this->stateFlags &= ~ENHORSE_JUMPING;
         this->actor.gravity = -3.5f;
@@ -2230,7 +2245,8 @@ void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* action
     this->stateFlags &= ~ENHORSE_LAND2_SOUND;
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f,
                      Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
@@ -2241,8 +2257,8 @@ void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
     if (this->curFrame > 25.0f) {
         if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
             this->stateFlags |= ENHORSE_LAND2_SOUND;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     if (SkelAnime_Update(&this->skin.skelAnime)) {
@@ -2309,7 +2325,8 @@ void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* ac
     this->stateFlags &= ~ENHORSE_LAND2_SOUND;
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f,
                      Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
@@ -2320,8 +2337,8 @@ void EnHorse_CsWarpRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action
     if (this->curFrame > 25.0f) {
         if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
             this->stateFlags |= ENHORSE_LAND2_SOUND;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     if (SkelAnime_Update(&this->skin.skelAnime)) {
@@ -2372,7 +2389,7 @@ void EnHorse_CutsceneUpdate(EnHorse* this, PlayState* play) {
         return;
     }
     if (linkCsAction != 0 && (uint32_t)(uintptr_t)linkCsAction != 0xABABABAB) {
-        csFunctionIdx = EnHorse_GetCutsceneFunctionIndex(linkCsAction->action); 
+        csFunctionIdx = EnHorse_GetCutsceneFunctionIndex(linkCsAction->action);
         if (csFunctionIdx != 0) {
             if (this->cutsceneAction != csFunctionIdx) {
                 if (this->cutsceneAction == 0) {
@@ -2471,11 +2488,13 @@ void EnHorse_UpdateHbaAnim(EnHorse* this) {
         animSpeed = this->actor.speedXZ * 0.5f;
     } else if (this->animationIdx == ENHORSE_ANIM_TROT) {
         animSpeed = this->actor.speedXZ * 0.25f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 60, 8, 255);
     } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) {
         animSpeed = this->actor.speedXZ * 0.2f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 120, 8, 255);
     } else {
         animSpeed = 1.0f;
@@ -2577,8 +2596,8 @@ void EnHorse_FleePlayer(EnHorse* this, PlayState* play) {
 
     if (DREG(53) || this->type == HORSE_HNI) {
         EnHorse_StartIdleRidable(this);
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     distToHome = Math3D_Vec3f_DistXYZ(&this->actor.home.pos, &this->actor.world.pos);
@@ -2688,8 +2707,8 @@ void EnHorse_FleePlayer(EnHorse* this, PlayState* play) {
                     this->animationIdx = ENHORSE_ANIM_WHINNEY;
                     this->unk_21C = this->unk_228;
                     if (this->stateFlags & ENHORSE_DRAW) {
-                        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     }
                 }
                 Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f,
@@ -2745,9 +2764,11 @@ void EnHorse_BridgeJumpInit(EnHorse* this, PlayState* play) {
                      Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
     this->unk_21C = this->unk_228;
     if (this->stateFlags & ENHORSE_DRAW) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     func_800AA000(0.0f, 170, 10, 10);
     this->postDrawFunc = NULL;
 }
@@ -2796,8 +2817,8 @@ void EnHorse_CheckBridgeJumpLanding(EnHorse* this, PlayState* play) {
         this->actor.world.pos.y = sBridgeJumps[this->bridgeJumpIdx].pos.y;
         func_80028A54(play, 25.0f, &this->actor.world.pos);
         EnHorse_JumpLanding(this, play);
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_800AA000(0.0f, 255, 10, 80);
     }
 }
@@ -2817,8 +2838,7 @@ void EnHorse_Vec3fOffset(Vec3f* src, s16 yaw, f32 dist, f32 height, Vec3f* dst)
     dst->z = src->z + Math_CosS(yaw) * dist;
 }
 
-s32 EnHorse_CalcFloorHeight(EnHorse* this, PlayState* play, Vec3f* pos, CollisionPoly** floorPoly,
-                            f32* floorHeight) {
+s32 EnHorse_CalcFloorHeight(EnHorse* this, PlayState* play, Vec3f* pos, CollisionPoly** floorPoly, f32* floorHeight) {
     s32 bgId;
     f32 waterY;
     WaterBox* waterBox;
@@ -2899,8 +2919,8 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) {
     WaterBox* waterBox;
     s32 pad;
 
-    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
-                                &waterHeight, &waterBox) == 1 &&
+    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterHeight,
+                                &waterBox) == 1 &&
         this->actor.floorHeight < waterHeight) {
         EnHorse_ObstructMovement(this, play, 1, galloping);
         return;
@@ -3042,7 +3062,8 @@ void EnHorse_StickDirection(Vec2f* curStick, f32* stickMag, s16* angle) {
 
 void EnHorse_UpdateStick(EnHorse* this, PlayState* play) {
     this->lastStick = this->curStick;
-    this->curStick.x = play->state.input[0].rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
+    this->curStick.x =
+        play->state.input[0].rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1);
     this->curStick.y = play->state.input[0].rel.stick_y;
 }
 
@@ -3127,8 +3148,8 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) {
     if (this->actor.bgCheckFlags & 8 && Math_CosS(this->actor.wallYaw - ((void)0, this->actor.world).rot.y) < -0.3f) {
         if (this->actor.speedXZ > 4.0f) {
             this->actor.speedXZ -= 1.0f;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
@@ -3312,7 +3333,9 @@ void EnHorse_CheckBoost(EnHorse* thisx, PlayState* play2) {
                     this->stateFlags |= ENHORSE_BOOST;
                     this->stateFlags |= ENHORSE_FIRST_BOOST_REGEN;
                     this->stateFlags |= ENHORSE_FLAG_8;
-                    if (!CVarGetInteger(CVAR_CHEAT("InfiniteEponaBoost"), 0)) { this->numBoosts--; }
+                    if (!CVarGetInteger(CVAR_CHEAT("InfiniteEponaBoost"), 0)) {
+                        this->numBoosts--;
+                    }
                     this->boostTimer = 0;
                     if (this->numBoosts == 0) {
                         this->boostRegenTime = 140;
@@ -3333,8 +3356,8 @@ void EnHorse_CheckBoost(EnHorse* thisx, PlayState* play2) {
                 this->unk_21C = this->unk_228;
                 if (this->stateFlags & ENHORSE_DRAW) {
                     if (Rand_ZeroOne() < 0.1f) {
-                        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     }
                 }
             }
@@ -3351,7 +3374,8 @@ void EnHorse_RegenBoost(EnHorse* this, PlayState* play) {
             this->numBoosts = this->numBoosts + 1;
 
             if (!EN_HORSE_CHECK_4(this)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
 
             if (this->numBoosts < 6) {
@@ -3367,7 +3391,8 @@ void EnHorse_RegenBoost(EnHorse* this, PlayState* play) {
             this->numBoosts = 6;
 
             if (!EN_HORSE_CHECK_4(this)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
     }
@@ -3375,7 +3400,8 @@ void EnHorse_RegenBoost(EnHorse* this, PlayState* play) {
     if (this->boostTimer == 8 && Rand_ZeroOne() < 0.25f) {
         this->unk_21C = this->unk_228;
         if (this->stateFlags & ENHORSE_DRAW) {
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
     play->interfaceCtx.numHorseBoosts = this->numBoosts;
@@ -3516,7 +3542,8 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) {
         if (this->jntSph.base.acFlags & 2) {
             this->unk_21C = this->unk_228;
             if (this->stateFlags & ENHORSE_DRAW) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
         if (this->action != ENHORSE_ACT_INGO_RACE) {
diff --git a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
index e0c1ba7fc1..c109f1ce42 100644
--- a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
+++ b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
@@ -130,7 +130,7 @@ void EnHorseGameCheck_FinishIngoRace(EnHorseGameCheckIngoRace* this, PlayState*
     }
     DREG(25) = 0;
     play->transitionTrigger = TRANS_TRIGGER_START;
-    gSaveContext.timer1State = 0;
+    gSaveContext.timerState = 0;
 }
 
 s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play) {
@@ -152,7 +152,8 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play)
 
         ingoHorse->inRace = 1;
         this->startFlags |= INGORACE_INGO_MOVE;
-        Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     this->startTimer++;
@@ -184,7 +185,8 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play)
                 this->result = INGORACE_PLAYER_WIN;
                 this->finishTimer = 55;
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
-                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             for (i = 0; i < 3; i++) {
                 this->playerCheck[i] = 0;
@@ -199,7 +201,8 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play)
                 this->finishTimer = 70;
                 ingoHorse->stateFlags |= ENHORSE_INGO_WON;
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
-                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             for (i = 0; i < 3; i++) {
                 this->ingoCheck[i] = 0;
@@ -210,7 +213,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, PlayState* play)
             this->result = INGORACE_INGO_WIN;
             this->finishTimer = 20;
         }
-        if ((gSaveContext.timer1Value >= 180) && (this->startFlags & 2)) {
+        if ((gSaveContext.timerSeconds >= 180) && (this->startFlags & 2)) {
             Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
             this->result = INGORACE_TIME_UP;
             this->finishTimer = 20;
@@ -297,8 +300,8 @@ void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState
         play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
         play->transitionTrigger = TRANS_TRIGGER_START;
     } else if (this->result == MALONRACE_FAILURE) {
-        gSaveContext.timer1Value = 240;
-        gSaveContext.timer1State = 0xF;
+        gSaveContext.timerSeconds = 240;
+        gSaveContext.timerState = 0xF;
         gSaveContext.cutsceneIndex = 0;
         play->nextEntranceIndex = ENTR_LON_LON_RANCH_7;
         play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
@@ -335,7 +338,8 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, PlayState* play
         horse->inRace = 1;
     } else if ((this->startTimer > 81) && !(this->raceFlags & MALONRACE_START_SFX)) {
         this->raceFlags |= MALONRACE_START_SFX;
-        Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     this->startTimer++;
@@ -377,10 +381,11 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, PlayState* play
             } else if (this->fenceCheck[15] == 1) {
                 this->lapCount = 2;
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
-                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->result = MALONRACE_SUCCESS;
                 this->finishTimer = 70;
-                gSaveContext.timer1State = 0xF;
+                gSaveContext.timerState = 0xF;
             } else if ((this->fenceCheck[7] == 1) && !(this->raceFlags & MALONRACE_SECOND_LAP)) {
                 this->lapCount = 1;
                 this->raceFlags |= MALONRACE_SECOND_LAP;
@@ -397,11 +402,11 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, PlayState* play
                 this->finishTimer = 30;
             }
         }
-        if ((gSaveContext.timer1Value >= 180) && (this->raceFlags & MALONRACE_SET_TIMER)) {
-            gSaveContext.timer1Value = 240;
+        if ((gSaveContext.timerSeconds >= 180) && (this->raceFlags & MALONRACE_SET_TIMER)) {
+            gSaveContext.timerSeconds = 240;
             this->result = MALONRACE_TIME_UP;
             this->finishTimer = 30;
-            gSaveContext.timer1State = 0;
+            gSaveContext.timerState = 0;
         }
     } else {
         if (this->finishTimer > 0) {
diff --git a/soh/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/soh/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
index 98218c7a3b..10404fbfb4 100644
--- a/soh/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
+++ b/soh/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
@@ -155,8 +155,8 @@ void func_80A686A8(EnHorseGanon* this, PlayState* play) {
 void func_80A68870(EnHorseGanon* this) {
     if ((this->skin.skelAnime.curFrame > D_80A692B8[this->soundCount]) &&
         (this->soundCount != 0 || !(this->skin.skelAnime.curFrame > D_80A692B8[1]))) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
         this->soundCount++;
         if (this->soundCount >= 2) {
@@ -236,10 +236,12 @@ void func_80A68B20(EnHorseGanon* this) {
         sp30 = this->actor.speedXZ / 3.0f;
     } else if (this->currentAnimation == 3) {
         sp30 = this->actor.speedXZ / 5.0f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->currentAnimation == 4) {
         sp30 = this->actor.speedXZ / 7.0f;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else {
         sp30 = 1.0f;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
index 39b5aac2e6..630156e84d 100644
--- a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@@ -90,8 +90,8 @@ void func_80A693D0(EnHorseLinkChild* this) {
 
     if ((this->skin.skelAnime.curFrame > D_80A6AF5C[this->unk_1F0]) &&
         !((this->unk_1F0 == 0) && (this->skin.skelAnime.curFrame > D_80A6AF5C[1]))) {
-        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->unk_1F0++;
         if (this->unk_1F0 >= ARRAY_COUNT(D_80A6AF5C)) {
             this->unk_1F0 = 0;
@@ -104,15 +104,15 @@ void func_80A6948C(EnHorseLinkChild* this) {
         func_80A693D0(this);
     } else if (this->skin.skelAnime.curFrame == 0.0f) {
         if ((this->animationIdx == 3) || (this->animationIdx == 4)) {
-            Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else if (this->animationIdx == 1) {
             if (Rand_ZeroOne() > 0.5f) {
-                Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_GROAN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_GROAN, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
-                Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
     }
@@ -353,8 +353,8 @@ void func_80A6A068(EnHorseLinkChild* this, PlayState* play) {
     distFromLink = Actor_WorldDistXZToActor(&this->actor, &player->actor);
 
     if (gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_1) {
-        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_80A6A724(this);
         return;
     }
@@ -445,8 +445,8 @@ void func_80A6A5A4(EnHorseLinkChild* this, PlayState* play) {
 
     if (DREG(53) != 0) {
         DREG(53) = 0;
-        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_80A6A724(this);
     } else {
         this->actor.speedXZ = 0.0f;
@@ -621,6 +621,5 @@ void EnHorseLinkChild_Draw(Actor* thisx, PlayState* play) {
     EnHorseLinkChild* this = (EnHorseLinkChild*)thisx;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    func_800A6360(&this->actor, play, &this->skin, EnHorseLinkChild_PostDraw, EnHorseLinkChild_OverrideLimbDraw,
-                  true);
+    func_800A6360(&this->actor, play, &this->skin, EnHorseLinkChild_PostDraw, EnHorseLinkChild_OverrideLimbDraw, true);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
index 2173ca2acd..e7d1a017be 100644
--- a/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
+++ b/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
@@ -151,8 +151,8 @@ void func_80A6B250(EnHorseNormal* this) {
 
     if (D_80A6D4C0[this->unk_200] < this->skin.skelAnime.curFrame &&
         ((this->unk_200 != 0) || !(D_80A6D4C0[1] < this->skin.skelAnime.curFrame))) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->unk_200++;
         if (this->unk_200 >= ARRAY_COUNT(D_80A6D4C0)) {
             this->unk_200 = 0;
@@ -344,9 +344,11 @@ void func_80A6BC48(EnHorseNormal* this) {
 
 void func_80A6BCEC(EnHorseNormal* this) {
     if (this->animationIdx == 5) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == 6) {
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -355,12 +357,12 @@ void func_80A6BD7C(EnHorseNormal* this) {
 
     if (this->animationIdx == 0 && frame > 28.0f && !(this->unk_1E4 & 1)) {
         this->unk_1E4 |= 1;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == 3 && frame > 25.0f && !(this->unk_1E4 & 2)) {
         this->unk_1E4 |= 2;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -429,9 +431,11 @@ void EnHorseNormal_Wander(EnHorseNormal* this, PlayState* play) {
             this->unk_1E4 &= ~1;
             this->unk_1E4 &= ~2;
             if (phi_t0 == 1) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else if (phi_t0 == 3) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 func_80A6BCEC(this);
             }
@@ -458,9 +462,11 @@ void EnHorseNormal_Wander(EnHorseNormal* this, PlayState* play) {
             this->unk_1E4 &= ~1;
             this->unk_1E4 &= ~2;
             if (phi_t0 == 1) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else if (phi_t0 == 3) {
-                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 func_80A6BCEC(this);
             }
@@ -495,10 +501,12 @@ void EnHorseNormal_Wait(EnHorseNormal* this, PlayState* play) {
             this->animationIdx = 0;
         } else if (rand < 0.8f) {
             this->animationIdx = 1;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             this->animationIdx = 3;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
@@ -529,11 +537,13 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, PlayState* play) {
         } else if (rand < 0.8f) {
             this->animationIdx = 1;
             this->unk_1E4 |= 0x20;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             this->animationIdx = 3;
             this->unk_1E4 |= 0x20;
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_204, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f,
@@ -620,16 +630,20 @@ void func_80A6CC88(PlayState* play, EnHorseNormal* this, Vec3f* arg2) {
 
     if (this->animationIdx == 0 && curFrame > 28.0f && !(this->unk_1E4 & 8)) {
         this->unk_1E4 |= 8;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->unk_1E8, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->unk_1E8, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == 3 && curFrame > 25.0f && !(this->unk_1E4 & 0x10)) {
         this->unk_1E4 |= 0x10;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->unk_1E8, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->unk_1E8, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == 3 && this->unk_1E4 & 0x20) {
         this->unk_1E4 &= ~0x20;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_1F4, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_1F4, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (this->animationIdx == 1 && this->unk_1E4 & 0x20) {
         this->unk_1E4 &= ~0x20;
-        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_1F4, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_1F4, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/soh/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
index df317a8297..cddc0a8ee7 100644
--- a/soh/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
+++ b/soh/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
@@ -200,7 +200,8 @@ void func_80A6DD14(EnHorseZelda* this) {
     this->action = 1;
     this->animationIndex = 0;
     sp34 = this->actor.speedXZ / 6.0f;
-    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->animationIndex],
                      splaySpeeds[this->animationIndex] * sp34 * 1.5f, 0.0f,
                      Animation_GetLastFrame(sAnimationHeaders[this->animationIndex]), ANIMMODE_ONCE, 0.0f);
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
index 3a9c05640b..209137b0d2 100644
--- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -415,7 +415,7 @@ s32 EnHy_IsOsAnimeObjectLoaded(EnHy* this, PlayState* play) {
 void func_80A6F7CC(EnHy* this, PlayState* play, s32 getItemId) {
     this->unkGetItemId = getItemId;
     Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
-                  fabsf(this->actor.yDistToPlayer) + 1.0f);
+                       fabsf(this->actor.yDistToPlayer) + 1.0f);
 }
 
 u16 func_80A6F810(PlayState* play, Actor* thisx) {
@@ -441,7 +441,8 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
 
                 if (followingDog != 0) {
                     this->unk_215 = false;
-                    return ((followingDog == 1) || (CVarGetInteger(CVAR_ENHANCEMENT("AllDogsRichard"), 0))) ? 0x709F : 0x709E;
+                    return ((followingDog == 1) || (CVarGetInteger(CVAR_ENHANCEMENT("AllDogsRichard"), 0))) ? 0x709F
+                                                                                                            : 0x709E;
                 } else {
                     return 0x709D;
                 }
@@ -471,22 +472,29 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
                 return 0x701A;
             }
         case ENHY_TYPE_BOJ_3:
-            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? ((Flags_GetInfTable(INFTABLE_C4)) ? 0x7001 : 0x70EB) : 0x7001;
+            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                       ? ((Flags_GetInfTable(INFTABLE_C4)) ? 0x7001 : 0x70EB)
+                       : 0x7001;
         case ENHY_TYPE_AHG_4:
-            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x704B : ((Flags_GetInfTable(INFTABLE_C5)) ? 0x7024 : 0x7023);
+            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                       ? 0x704B
+                       : ((Flags_GetInfTable(INFTABLE_C5)) ? 0x7024 : 0x7023);
         case ENHY_TYPE_BOJ_5:
             player->exchangeItemId = EXCH_ITEM_BLUE_FIRE;
             return 0x700C;
         case ENHY_TYPE_BBA:
-            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x704A : ((Flags_GetInfTable(INFTABLE_C6)) ? 0x7022 : 0x7021);
+            return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                       ? 0x704A
+                       : ((Flags_GetInfTable(INFTABLE_C6)) ? 0x7022 : 0x7021);
         case ENHY_TYPE_BJI_7:
             if (play->sceneNum == SCENE_KAKARIKO_CENTER_GUEST_HOUSE) {
                 return 0x5088;
             } else if (play->sceneNum == SCENE_KAKARIKO_VILLAGE) {
                 return 0x5087;
             } else {
-                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x704D
-                                                         : ((Flags_GetInfTable(INFTABLE_C7)) ? 0x7028 : 0x7027);
+                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                           ? 0x704D
+                           : ((Flags_GetInfTable(INFTABLE_C7)) ? 0x7028 : 0x7027);
             }
         case ENHY_TYPE_CNE_8:
             if (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) {
@@ -500,8 +508,9 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
             } else if (play->sceneNum == SCENE_KAKARIKO_VILLAGE) {
                 return CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) ? 0x5080 : 0x507F;
             } else {
-                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x7049
-                                                         : ((Flags_GetInfTable(INFTABLE_CA)) ? 0x7020 : 0x701F);
+                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                           ? 0x7049
+                           : ((Flags_GetInfTable(INFTABLE_CA)) ? 0x7020 : 0x701F);
             }
         case ENHY_TYPE_BOJ_10:
             if (play->sceneNum == SCENE_IMPAS_HOUSE) {
@@ -509,12 +518,14 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
             } else if (play->sceneNum == SCENE_KAKARIKO_VILLAGE) {
                 return CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) ? 0x507C : 0x507B;
             } else {
-                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x7046
-                                                         : ((Flags_GetInfTable(INFTABLE_CD)) ? 0x7019 : 0x7018);
+                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                           ? 0x7046
+                           : ((Flags_GetInfTable(INFTABLE_CD)) ? 0x7019 : 0x7018);
             }
         case ENHY_TYPE_CNE_11:
-            return (Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) ? ((Flags_GetInfTable(INFTABLE_CC)) ? 0x7014 : 0x70A4)
-                                                      : 0x7014;
+            return (Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE))
+                       ? ((Flags_GetInfTable(INFTABLE_CC)) ? 0x7014 : 0x70A4)
+                       : 0x7014;
         case ENHY_TYPE_BOJ_12:
             if (play->sceneNum == SCENE_KAKARIKO_VILLAGE) {
                 return !IS_DAY ? 0x5084 : 0x5083;
@@ -543,7 +554,9 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
             }
         case ENHY_TYPE_BOB_18:
             if (!LINK_IS_ADULT) {
-                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) ? 0x505F : ((Flags_GetInfTable(INFTABLE_163)) ? 0x505E : 0x505D);
+                return (Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE))
+                           ? 0x505F
+                           : ((Flags_GetInfTable(INFTABLE_163)) ? 0x505E : 0x505D);
             } else {
                 return (this->unk_330 & 0x800) ? 0x5062 : ((Flags_GetInfTable(INFTABLE_164)) ? 0x5061 : 0x5060);
             }
@@ -576,7 +589,8 @@ s16 func_80A70058(PlayState* play, Actor* thisx) {
                 case 0x709F:
                     if (!this->unk_215) {
                         Audio_PlaySoundGeneral(this->actor.textId == 0x709F ? NA_SE_SY_CORRECT_CHIME : NA_SE_SY_ERROR,
-                                               &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                               &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         this->unk_215 = true;
                     }
                     break;
@@ -863,7 +877,8 @@ s32 EnHy_ShouldSpawn(EnHy* this, PlayState* play) {
                 return true;
             } else if (IS_NIGHT) {
                 return false;
-            } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) && !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
+            } else if ((Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE)) &&
+                       !Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) {
                 return false;
             } else {
                 return true;
@@ -1238,8 +1253,8 @@ void EnHy_Draw(Actor* thisx, PlayState* play) {
                         envColorSeg10.a = 0;
                     }
                     gSPSegment(POLY_OPA_DISP++, 0x0A,
-                               EnHy_SetEnvColor(play->state.gfxCtx, envColorSeg10.r, envColorSeg10.g,
-                                                envColorSeg10.b, envColorSeg10.a));
+                               EnHy_SetEnvColor(play->state.gfxCtx, envColorSeg10.r, envColorSeg10.g, envColorSeg10.b,
+                                                envColorSeg10.a));
                 }
                 break;
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index d9059ba0b6..f0e9cf64b7 100644
--- a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -241,9 +241,8 @@ void EnIceHono_DropFlame(EnIceHono* this, PlayState* play) {
     if (bgFlag != 0) {
         s32 i;
         for (i = 0; i < 8; i++) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ICE_HONO, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0,
-                        ((s32)(Rand_ZeroOne() * 1000.0f) + i * 0x2000) - 0x1F4, 0, 1, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ICE_HONO, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, ((s32)(Rand_ZeroOne() * 1000.0f) + i * 0x2000) - 0x1F4, 0, 1, true);
         }
         EnIceHono_SetupActionSpreadFlames(this);
     }
@@ -292,9 +291,8 @@ void EnIceHono_SpreadFlames(EnIceHono* this, PlayState* play) {
         s32 i;
         for (i = 0; i < 10; i++) {
             s32 rot = i * 0x1999;
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ICE_HONO, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0,
-                        ((s32)(Rand_ZeroOne() * 1000.0f) + rot) - 0x1F4, 0, 2, true);
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ICE_HONO, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, ((s32)(Rand_ZeroOne() * 1000.0f) + rot) - 0x1F4, 0, 2, true);
         }
     }
 
@@ -379,8 +377,7 @@ void EnIceHono_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (play->state.frames * -20) % 512,
-                                32, 128));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (play->state.frames * -20) % 512, 32, 128));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 170, 255, 255, this->alpha);
 
@@ -390,8 +387,7 @@ void EnIceHono_Draw(Actor* thisx, PlayState* play) {
                        (M_PI / 0x8000),
                    MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index e7b0905e9c..c4dbe3f3af 100644
--- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -239,8 +239,9 @@ void func_80A74398(Actor* thisx, PlayState* play) {
 
     if (this->switchFlags != 0xFF) {
         // In vanilla gameplay, Iron Knuckles are despawned based on specific flags in specific scenarios.
-        // In Enemy Randomizer and Crowd Control, this made the Iron Knuckles despawn when the same flag was set by other objects.
-        // Instead, rely on the "Clear enemy room" flag when in Enemy Randomizer for Iron Knuckles that aren't Nabooru.
+        // In Enemy Randomizer and Crowd Control, this made the Iron Knuckles despawn when the same flag was set by
+        // other objects. Instead, rely on the "Clear enemy room" flag when in Enemy Randomizer for Iron Knuckles that
+        // aren't Nabooru.
         if ((Flags_GetSwitch(play, this->switchFlags) && !enemyRandoCCActive) ||
             (thisx->params != 0 && Flags_GetClear(play, play->roomCtx.curRoom.num) && enemyRandoCCActive)) {
             Actor_Kill(thisx);
@@ -483,7 +484,8 @@ void func_80A7510C(EnIk* this, PlayState* play) {
         } else {
             frames = Animation_GetLastFrame(&gIronKnuckleRecoverFromVerticalAttackAnim);
             this->unk_2F8 = 8;
-            Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromVerticalAttackAnim, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+            Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromVerticalAttackAnim, 1.5f, 0.0f, frames,
+                             ANIMMODE_ONCE_INTERP, -4.0f);
         }
     }
 }
@@ -495,7 +497,8 @@ void func_80A751C8(EnIk* this) {
     this->unk_300 = 0;
     this->unk_2F8 = 6;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -6.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP,
+                     -6.0f);
     this->unk_2FC = 0;
     EnIk_SetupAction(this, func_80A75260);
 }
@@ -533,7 +536,8 @@ void func_80A753D0(EnIk* this) {
 
     this->unk_2FF = this->unk_2FE = 0;
     this->unk_2F8 = 8;
-    Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromHorizontalAttackAnim, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleRecoverFromHorizontalAttackAnim, 1.5f, 0.0f, frames,
+                     ANIMMODE_ONCE_INTERP, -4.0f);
     EnIk_SetupAction(this, func_80A7545C);
 }
 
@@ -550,7 +554,8 @@ void func_80A754A0(EnIk* this) {
     this->unk_2F8 = 1;
     this->unk_2FF = 3;
     this->actor.speedXZ = 0.0f;
-    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gIronKnuckleHorizontalAttackAnim, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP,
+                     -4.0f);
     EnIk_SetupAction(this, func_80A75530);
 }
 
@@ -814,7 +819,7 @@ Gfx* func_80A761B0(GraphicsContext* gfxCtx, u8 primR, u8 primG, u8 primB, u8 env
 
     gDPPipeSync(displayListHead++);
     if (CVarGetInteger(CVAR_COSMETIC("NPC.IronKnuckles.Changed"), 0)) {
-        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("NPC.IronKnuckles.Value"), (Color_RGB8){primR, primG, primB});
+        Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("NPC.IronKnuckles.Value"), (Color_RGB8){ primR, primG, primB });
         gDPSetPrimColor(displayListHead++, 0, 0, color.r, color.g, color.b, 255);
     } else {
         gDPSetPrimColor(displayListHead++, 0, 0, primR, primG, primB, 255);
@@ -881,8 +886,7 @@ void EnIk_PostLimbDraw3(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
         BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 26, 27, 28, dList, BODYBREAK_OBJECT_DEFAULT);
     }
     if (limbIndex == 12) {
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (this->actor.params != 0) {
             gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleHelmetMarkingDL);
         } else {
@@ -920,13 +924,11 @@ void EnIk_PostLimbDraw3(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
 
     switch (limbIndex) {
         case 22:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
             break;
         case 24:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
             break;
         case 26:
@@ -984,29 +986,29 @@ void EnIk_StartMusic(void) {
 
 void func_80A76C14(EnIk* this) {
     if (Animation_OnFrame(&this->skelAnime, 1.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAKEUP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAKEUP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (Animation_OnFrame(&this->skelAnime, 33.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WALK, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (Animation_OnFrame(&this->skelAnime, 68.0f) || Animation_OnFrame(&this->skelAnime, 80.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (Animation_OnFrame(&this->skelAnime, 107.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_FINGER_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_FINGER_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (Animation_OnFrame(&this->skelAnime, 156.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (Animation_OnFrame(&this->skelAnime, 188.0f)) {
-        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAVE_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAVE_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
 void func_80A76DDC(EnIk* this, PlayState* play, Vec3f* pos) {
-    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_TRANSFORM, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_TRANSFORM, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void func_80A76E2C(EnIk* this, PlayState* play, Vec3f* pos) {
@@ -1113,8 +1115,8 @@ void func_80A77264(EnIk* this, PlayState* play, s32 arg2) {
 }
 
 void func_80A772A4(EnIk* this) {
-    Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_STAGGER_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_STAGGER_DEMO, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void func_80A772EC(EnIk* this, PlayState* play) {
@@ -1123,15 +1125,15 @@ void func_80A772EC(EnIk* this, PlayState* play) {
     f32 wDest;
 
     SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->actor.world.pos, &D_80A78FA0, &wDest);
-    Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void func_80A7735C(EnIk* this, PlayState* play) {
     s32 pad[3];
     f32 frames = Animation_GetLastFrame(&gIronKnuckleNabooruDeathAnim);
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &gIronKnuckleDefeatSkel, NULL, this->jointTable, this->morphTable,
-                       30);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gIronKnuckleDefeatSkel, NULL, this->jointTable, this->morphTable, 30);
     Animation_Change(&this->skelAnime, &gIronKnuckleNabooruDeathAnim, 1.0f, 0.0f, frames, ANIMMODE_ONCE, 0.0f);
     this->action = 3;
     this->drawMode = 2;
@@ -1192,27 +1194,23 @@ void EnIk_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
             EnIk* this = (EnIk*)thisx;
 
             if (EnIk_curFrame(&this->actor) < 30.0f) {
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
             }
         } break;
         case 22:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
             break;
         case 24:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
             break;
         case 26: {
             EnIk* this = (EnIk*)thisx;
 
             if (EnIk_curFrame(&this->actor) < 30.0f) {
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
             }
         } break;
@@ -1220,8 +1218,7 @@ void EnIk_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
             EnIk* this = (EnIk*)thisx;
 
             if (EnIk_curFrame(&this->actor) < 30.0f) {
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
             }
         } break;
@@ -1350,28 +1347,23 @@ void EnIk_PostLimbDraw1(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
 
     switch (limbIndex) {
         case 12:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
             break;
         case 22:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
             break;
         case 24:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
             break;
         case 26:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gIronKnuckleArmorRivetAndSymbolDL);
             break;
         case 27:
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
             break;
     }
@@ -1469,8 +1461,9 @@ void EnIk_Init(Actor* thisx, PlayState* play) {
     }
 
     // Immediately trigger Iron Knuckle for Enemy Rando and Crowd Control
-    if ((CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0)))
-                        && (thisx->params == 2 || thisx->params == 3)) {
+    if ((CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+         (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) &&
+        (thisx->params == 2 || thisx->params == 3)) {
         this->skelAnime.playSpeed = 1.0f;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_In/z_en_in.c b/soh/src/overlays/actors/ovl_En_In/z_en_in.c
index 852f292508..18903bfbb7 100644
--- a/soh/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/soh/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -342,7 +342,7 @@ void func_80A795C8(EnIn* this, PlayState* play) {
 
 void func_80A79690(SkelAnime* skelAnime, EnIn* this, PlayState* play) {
     if (skelAnime->baseTransl.y < skelAnime->jointTable[0].y) {
-        skelAnime->moveFlags |= 3;
+        skelAnime->movementFlags |= 3;
         AnimationContext_SetMoveActor(play, &this->actor, skelAnime, 1.0f);
     }
 }
@@ -440,7 +440,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
     if (index == 0) {
         AREG(6) = 0;
     }
-    gSaveContext.timer1State = 0;
+    gSaveContext.timerState = 0;
 }
 
 void func_80A79C78(EnIn* this, PlayState* play) {
@@ -626,10 +626,11 @@ void func_80A7A304(EnIn* this, PlayState* play) {
         this->animationIdx %= 8;
         this->unk_1E8 = this->animationIdx;
         if (this->animationIdx == 3 || this->animationIdx == 4) {
-            Audio_PlaySoundGeneral(NA_SE_IT_LASH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_LASH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (Rand_ZeroOne() < 0.3f) {
-                Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
         Animation_Change(&this->skelAnime, D_80A7B918[this->animationIdx], 1.0f, 0.0f,
@@ -661,11 +662,12 @@ void func_80A7A568(EnIn* this, PlayState* play) {
     if (!Flags_GetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO) && (player->stateFlags1 & PLAYER_STATE1_ON_HORSE)) {
         Flags_SetInfTable(INFTABLE_AB);
     }
-    if (gSaveContext.timer1State == 10) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    if (gSaveContext.timerState == 10) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         func_80A79C78(this, play);
         this->actionFunc = func_80A7B024;
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
     } else if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
         if (play->msgCtx.choiceIndex == 0) {
             if (gSaveContext.rupees < 50) {
@@ -680,7 +682,8 @@ void func_80A7A568(EnIn* this, PlayState* play) {
             phi_a2 = 2;
             transitionType = TRANS_TYPE_FADE_BLACK;
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (!Flags_GetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO)) {
                 if (Flags_GetInfTable(INFTABLE_AB)) {
                     Flags_SetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO);
@@ -928,12 +931,13 @@ void EnIn_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
     if (this->actionFunc != func_80A7A304) {
         func_80A79AB4(this, play);
-        if (gSaveContext.timer2Value < 6 && gSaveContext.timer2State != 0 && this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
+        if (gSaveContext.subTimerSeconds < 6 && gSaveContext.subTimerState != 0 &&
+            this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
             if (Actor_ProcessTalkRequest(&this->actor, play)) {}
         } else {
             Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState,
-                          ((this->actor.targetMode == 6) ? 80.0f : 320.0f) + this->collider.dim.radius, func_80A79168,
-                          func_80A79500);
+                              ((this->actor.targetMode == 6) ? 80.0f : 320.0f) + this->collider.dim.radius,
+                              func_80A79168, func_80A79500);
             if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
                 this->unk_1FA = this->unk_1F8;
                 this->unk_1F8 = Message_GetState(&play->msgCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 03003fb032..164ecc5df0 100644
--- a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -204,9 +204,9 @@ void EnInsect_Init(Actor* thisx, PlayState* play2) {
             this->actor.shape.rot.z = this->actor.world.rot.z;
 
             for (count = 0; count < 2; count++) {
-                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x,
-                            this->actor.world.pos.y, this->actor.world.pos.z, this->actor.shape.rot.x,
-                            this->actor.shape.rot.y, this->actor.shape.rot.z, 3, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x, this->actor.world.pos.y,
+                            this->actor.world.pos.z, this->actor.shape.rot.x, this->actor.shape.rot.y,
+                            this->actor.shape.rot.z, 3, true);
             }
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index 641988bdae..37dc1fa9db 100644
--- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -211,8 +211,8 @@ void EnIshi_SpawnFragmentsLarge(EnIshi* this, PlayState* play) {
             phi_v0 = 69;
             phi_v1 = -320;
         }
-        EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, phi_v1, phi_v0, 30, 5, 0, scales[i], 5,
-                             2, 70, KAKERA_COLOR_WHITE, OBJECT_GAMEPLAY_FIELD_KEEP, gSilverRockFragmentsDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, phi_v1, phi_v0, 30, 5, 0, scales[i], 5, 2,
+                             70, KAKERA_COLOR_WHITE, OBJECT_GAMEPLAY_FIELD_KEEP, gSilverRockFragmentsDL);
     }
 }
 
@@ -281,8 +281,9 @@ void EnIshi_SpawnBugs(EnIshi* this, PlayState* play) {
     s32 i;
 
     for (i = 0; i < 3; i++) {
-        Actor* bug = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x,
-                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1, true);
+        Actor* bug =
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1, true);
 
         if (bug == NULL) {
             break;
@@ -493,8 +494,7 @@ void EnIshi_DrawLarge(EnIshi* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
     gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL);
 
diff --git a/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c
index d7f4be98f7..9c485f501d 100644
--- a/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c
+++ b/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c
@@ -200,8 +200,7 @@ void EnJj_WaitForFish(EnJj* this, PlayState* play) {
     static Vec3f feedingSpot = { -1589.0f, 53.0f, -43.0f };
     Player* player = GET_PLAYER(play);
 
-    if ((Math_Vec3f_DistXZ(&feedingSpot, &player->actor.world.pos) < 300.0f) &&
-        play->isPlayerDroppingFish(play)) {
+    if ((Math_Vec3f_DistXZ(&feedingSpot, &player->actor.world.pos) < 300.0f) && play->isPlayerDroppingFish(play)) {
         this->cutsceneCountdownTimer = 100;
         EnJj_SetupAction(this, EnJj_BeginCutscene);
     }
@@ -244,8 +243,8 @@ void EnJj_CutsceneUpdate(EnJj* this, PlayState* play) {
             this->unk_30A |= 1;
 
             if (!(this->unk_30A & 8)) {
-                this->dust = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EFF_DUST,
-                                                -1100.0f, 105.0f, -27.0f, 0, 0, 0, EFF_DUST_TYPE_0);
+                this->dust = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EFF_DUST, -1100.0f,
+                                                105.0f, -27.0f, 0, 0, 0, EFF_DUST_TYPE_0);
                 this->unk_30A |= 8;
             }
             break;
diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
index 33a7417ee4..8abb0b5d10 100644
--- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
+++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c
@@ -61,8 +61,8 @@ void EnJs_Init(Actor* thisx, PlayState* play) {
     s32 pad;
 
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gCarpetMerchantSkel, &gCarpetMerchantSlappingKneeAnim,
-                       this->jointTable, this->morphTable, 13);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gCarpetMerchantSkel, &gCarpetMerchantSlappingKneeAnim, this->jointTable,
+                       this->morphTable, 13);
     Animation_PlayOnce(&this->skelAnime, &gCarpetMerchantSlappingKneeAnim);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
@@ -150,10 +150,11 @@ void func_80A891C4(EnJs* this, PlayState* play) {
                     func_80A89008(this);
                 } else {
                     if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, false, this)) {
-                        if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) || Actor_HasParent(&this->actor, play)){
+                        if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) ||
+                            Actor_HasParent(&this->actor, play)) {
                             Rupees_ChangeBy(-200);
                             En_Js_SetupAction(this, func_80A89160);
-                        } else{
+                        } else {
                             Message_ContinueTextbox(play, 0x6073);
                             func_80A89008(this);
                         }
diff --git a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
index 3e91679a04..0592207a52 100644
--- a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
+++ b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
@@ -415,8 +415,7 @@ void EnJsjutan_Draw(Actor* thisx, PlayState* play2) {
     Matrix_Translate(thisx->world.pos.x, 3.0f, thisx->world.pos.z, MTXMODE_NEW);
     Matrix_Scale(thisx->scale.x, 1.0f, thisx->scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     // Draws the carpet's shadow texture.
     gSPSegmentLoadRes(POLY_OPA_DISP++, 0x0C, sShadowTex);
@@ -435,8 +434,7 @@ void EnJsjutan_Draw(Actor* thisx, PlayState* play2) {
     Matrix_Translate(thisx->world.pos.x, this->unk_168 + 3.0f, thisx->world.pos.z, MTXMODE_NEW);
     Matrix_Scale(thisx->scale.x, thisx->scale.y, thisx->scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     // Draws the carpet's texture.
     gSPDisplayList(POLY_OPA_DISP++, sCarpetMaterialDL);
 
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index e45178f682..9de169bfa2 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -11,7 +11,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                               \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED)
 
 static ColliderCylinderInit sCylinderInit = {
     {
@@ -120,8 +122,9 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
 
     this->unk_194++;
 
-    if ((BREG(1) != 0) || GameInteractor_Should(VB_SKIP_SCARECROWS_SONG, false) && (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
-        (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y)) {
+    if ((BREG(1) != 0) || GameInteractor_Should(VB_SKIP_SCARECROWS_SONG, false) &&
+                              (this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
+                              (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y)) {
         this->actor.draw = func_80A90948;
         Collider_InitCylinder(play, &this->collider);
         Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
@@ -150,8 +153,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
             this->actor.draw = func_80A90948;
             Collider_InitCylinder(play, &this->collider);
             Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
-            SkelAnime_InitFlex(play, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL,
-                               0);
+            SkelAnime_InitFlex(play, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0);
             OnePointCutscene_Attention(play, &this->actor);
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
 
diff --git a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
index 7dff69142e..eaf902fb6b 100644
--- a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
+++ b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
@@ -364,8 +364,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
         if (BREG(3) != 0) {
             osSyncPrintf("\n\n");
             // "With this, other guys are OK! That's it!"
-            osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST,
-                         play->msgCtx.ocarinaMode);
+            osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
         }
         this->unk_195 = true;
         Message_StartTextbox(play, 0x40A7, NULL);
diff --git a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index c29a7986e1..0d578f17ec 100644
--- a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -716,8 +716,8 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
                         (play->msgCtx.unk_E3F2 == OCARINA_SONG_LULLABY)) {
                         this->actionState = ENKANBAN_REPAIR;
                         this->bounceX = 1;
-                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     }
                     break;
             }
@@ -810,8 +810,7 @@ void EnKanban_Draw(Actor* thisx, PlayState* play) {
         Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY);
         Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY);
         Matrix_Translate(this->offset.x, this->offset.y, this->offset.z - 100.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         for (i = 0; i < ARRAY_COUNT(sPartFlags); i++) {
             if (sPartFlags[i] & this->partFlags) {
                 gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[i]);
@@ -819,8 +818,7 @@ void EnKanban_Draw(Actor* thisx, PlayState* play) {
         }
     } else {
         Matrix_Translate(0.0f, 0.0f, -100.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (this->partFlags == 0xFFFF) {
             gSPDisplayList(POLY_OPA_DISP++, gSignRectangularDL);
         } else {
@@ -839,8 +837,7 @@ void EnKanban_Draw(Actor* thisx, PlayState* play) {
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, 255, 255, 255, this->cutMarkAlpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 150, 0);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, object_kanban_DL_001630);
         }
     }
@@ -878,8 +875,7 @@ void EnKanban_Draw(Actor* thisx, PlayState* play) {
             Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY);
             Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY);
             Matrix_Translate(this->offset.x, this->offset.y, this->offset.z, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             for (i = 0; i < 0x400; i++) {
                 if (sShadowTexFlags[i] & this->partFlags) {
diff --git a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index 4066255b56..0b1e6de23e 100644
--- a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -97,8 +97,8 @@ void EnKarebaba_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 22.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gDekuBabaSkel, &gDekuBabaFastChompAnim, this->jointTable,
-                   this->morphTable, 8);
+    SkelAnime_Init(play, &this->skelAnime, &gDekuBabaSkel, &gDekuBabaFastChompAnim, this->jointTable, this->morphTable,
+                   8);
     Collider_InitCylinder(play, &this->bodyCollider);
     Collider_SetCylinder(play, &this->bodyCollider, &this->actor, &sBodyColliderInit);
     Collider_UpdateCylinder(&this->actor, &this->bodyCollider);
@@ -334,8 +334,7 @@ void EnKarebaba_Dying(EnKarebaba* this, PlayState* play) {
             this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 0.0f;
             this->actor.speedXZ = 0.0f;
             this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE);
-            EffectSsHahen_SpawnBurst(play, &this->actor.world.pos, 3.0f, 0, 12, 5, 15, HAHEN_OBJECT_DEFAULT, 10,
-                                     NULL);
+            EffectSsHahen_SpawnBurst(play, &this->actor.world.pos, 3.0f, 0, 12, 5, 15, HAHEN_OBJECT_DEFAULT, 10, NULL);
         }
 
         if (this->actor.bgCheckFlags & 2) {
@@ -455,8 +454,7 @@ void EnKarebaba_DrawBaseShadow(EnKarebaba* this, PlayState* play) {
     func_80038A28(this->boundFloor, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, &mf);
     Matrix_Mult(&mf, MTXMODE_NEW);
     Matrix_Scale(0.15f, 1.0f, 0.15f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -478,8 +476,7 @@ void EnKarebaba_Draw(Actor* thisx, PlayState* play) {
     if (this->actionFunc == EnKarebaba_DeadItemDrop) {
         if (this->actor.params > 40 || (this->actor.params & 1)) {
             Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL);
         }
     } else if (this->actionFunc != EnKarebaba_Dead) {
@@ -504,8 +501,7 @@ void EnKarebaba_Draw(Actor* thisx, PlayState* play) {
 
         for (i = 0; i < stemSections; i++) {
             Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]);
 
             if (i == 0 && this->actionFunc == EnKarebaba_Dying) {
@@ -525,14 +521,12 @@ void EnKarebaba_Draw(Actor* thisx, PlayState* play) {
 
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
     Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL);
 
     if (this->actionFunc == EnKarebaba_Dying) {
         Matrix_RotateZYX(-0x4000, (s16)(this->actor.shape.rot.y - this->actor.home.rot.y), 0, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 9e70ebce18..70ca84c0e2 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -69,8 +69,7 @@ static ColliderCylinderInit sCylinderInit = {
 static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
 
 static void* sFaEyes[] = { gFaEyeOpenTex, gFaEyeHalfTex, gFaEyeClosedTex, NULL };
-static void* sKw1Eyes[] = { gKw1EyeOpenTex , gKw1EyeHalfTex,
-                            gKw1EyeClosedTex, NULL };
+static void* sKw1Eyes[] = { gKw1EyeOpenTex, gKw1EyeHalfTex, gKw1EyeClosedTex, NULL };
 
 typedef struct {
     /* 0x0 */ s16 objectId;
@@ -79,7 +78,7 @@ typedef struct {
 } EnKoHead; // size = 0xC
 
 static EnKoHead sHead[] = {
-    { OBJECT_KM1, gKm1DL , NULL },
+    { OBJECT_KM1, gKm1DL, NULL },
     { OBJECT_KW1, object_kw1_DL_002C10, sKw1Eyes },
     { OBJECT_FA, gFaDL, sFaEyes },
 };
@@ -543,8 +542,8 @@ s16 func_80A97738(PlayState* play, Actor* thisx) {
                 case 0x10B7:
                 case 0x10B8:
                     if (this->unk_210 == 0) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         this->unk_210 = 1;
                     }
             }
@@ -952,7 +951,8 @@ void func_80A9877C(EnKo* this, PlayState* play) {
             return;
         }
     }
-    if (Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->lookDist, func_80A97610, func_80A97738) &&
+    if (Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->lookDist, func_80A97610,
+                          func_80A97738) &&
         ENKO_TYPE == ENKO_TYPE_CHILD_FADO && play->sceneNum == SCENE_LOST_WOODS) {
         this->actor.textId = INV_CONTENT(ITEM_TRADE_ADULT) > ITEM_ODD_POTION ? 0x10B9 : 0x10DF;
 
@@ -1029,9 +1029,8 @@ s32 EnKo_CanSpawn(EnKo* this, PlayState* play) {
             }
 
         case SCENE_LOST_WOODS:
-            return GameInteractor_Should(VB_SPAWN_LW_FADO, (
-                (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false
-            ), this);
+            return GameInteractor_Should(VB_SPAWN_LW_FADO,
+                                         ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false), this);
         default:
             return false;
     }
@@ -1094,7 +1093,7 @@ void func_80A98DB4(EnKo* this, PlayState* play) {
         this->appearDist = 180.0f;
         Math_SmoothStepToF(&this->modelAlpha, (this->appearDist < dist) ? 0.0f : 255.0f, 0.3f, 40.0f, 1.0f);
     }
-    
+
     if (this->modelAlpha < 10.0f) {
         this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
     } else {
@@ -1145,8 +1144,8 @@ void func_80A99048(EnKo* this, PlayState* play) {
         this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED;
         this->actor.objBankIndex = this->legsObjectBankIdx;
         gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[this->actor.objBankIndex].segment);
-        SkelAnime_InitFlex(play, &this->skelAnime, sSkeleton[sModelInfo[ENKO_TYPE].legsId].flexSkeletonHeader,
-                           NULL, this->jointTable, this->morphTable, 16);
+        SkelAnime_InitFlex(play, &this->skelAnime, sSkeleton[sModelInfo[ENKO_TYPE].legsId].flexSkeletonHeader, NULL,
+                           this->jointTable, this->morphTable, 16);
         ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
         gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[this->osAnimeBankIndex].segment);
         Collider_InitCylinder(play, &this->collider);
@@ -1289,8 +1288,7 @@ void EnKo_Update(Actor* thisx, PlayState* play) {
     CollisionCheck_SetOC(play, &play->colChkCtx, &collider->base);
 }
 
-s32 EnKo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnKo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnKo* this = (EnKo*)thisx;
     void* eyeTexture;
     Vec3s sp40;
@@ -1368,8 +1366,7 @@ void EnKo_Draw(Actor* thisx, PlayState* play) {
                    EnKo_SetEnvColor(play->state.gfxCtx, tunicColor.r, tunicColor.g, tunicColor.b, 255));
         gSPSegment(POLY_OPA_DISP++, 0x09,
                    EnKo_SetEnvColor(play->state.gfxCtx, bootsColor.r, bootsColor.g, bootsColor.b, 255));
-        func_80034BA0(play, &this->skelAnime, EnKo_OverrideLimbDraw, EnKo_PostLimbDraw, &this->actor,
-                      this->modelAlpha);
+        func_80034BA0(play, &this->skelAnime, EnKo_OverrideLimbDraw, EnKo_PostLimbDraw, &this->actor, this->modelAlpha);
     } else if ((s16)this->modelAlpha != 0) {
         tunicColor.a = this->modelAlpha;
         bootsColor.a = this->modelAlpha;
@@ -1377,8 +1374,7 @@ void EnKo_Draw(Actor* thisx, PlayState* play) {
                    EnKo_SetEnvColor(play->state.gfxCtx, tunicColor.r, tunicColor.g, tunicColor.b, tunicColor.a));
         gSPSegment(POLY_XLU_DISP++, 0x09,
                    EnKo_SetEnvColor(play->state.gfxCtx, bootsColor.r, bootsColor.g, bootsColor.b, bootsColor.a));
-        func_80034CC4(play, &this->skelAnime, EnKo_OverrideLimbDraw, EnKo_PostLimbDraw, &this->actor,
-                      this->modelAlpha);
+        func_80034CC4(play, &this->skelAnime, EnKo_OverrideLimbDraw, EnKo_PostLimbDraw, &this->actor, this->modelAlpha);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 49623c8500..23146f3762 100644
--- a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -10,6 +10,7 @@
 #include "objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "objects/object_kusa/object_kusa.h"
 #include "vt.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY)
 
@@ -126,6 +127,10 @@ s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) {
 void EnKusa_DropCollectible(EnKusa* this, PlayState* play) {
     s16 dropParams;
 
+    if (!GameInteractor_Should(VB_GRASS_DROP_ITEM, true, this)) {
+        return;
+    }
+
     switch (this->actor.params & 3) {
         case ENKUSA_TYPE_0:
         case ENKUSA_TYPE_2:
@@ -138,11 +143,9 @@ void EnKusa_DropCollectible(EnKusa* this, PlayState* play) {
             break;
         case ENKUSA_TYPE_1:
             if (CVarGetInteger(CVAR_ENHANCEMENT("NoRandomDrops"), 0)) {
-            }
-            else if (CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) {
+            } else if (CVarGetInteger(CVAR_ENHANCEMENT("NoHeartDrops"), 0)) {
                 Item_DropCollectible(play, &this->actor.world.pos, ITEM00_SEEDS);
-            }
-            else if (Rand_ZeroOne() < 0.5f) {
+            } else if (Rand_ZeroOne() < 0.5f) {
                 Item_DropCollectible(play, &this->actor.world.pos, ITEM00_SEEDS);
             } else {
                 Item_DropCollectible(play, &this->actor.world.pos, ITEM00_HEART);
@@ -193,8 +196,8 @@ void EnKusa_SpawnFragments(EnKusa* this, PlayState* play) {
 
         scaleIndex = (s32)(Rand_ZeroOne() * 111.1f) & 7;
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -100, 64, 40, 3, 0, sFragmentScales[scaleIndex], 0, 0,
-                             80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubStalkDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -100, 64, 40, 3, 0, sFragmentScales[scaleIndex], 0, 0, 80,
+                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubStalkDL);
 
         pos.x = this->actor.world.pos.x + (dir->x * this->actor.scale.x * 40.0f);
         pos.y = this->actor.world.pos.y + (dir->y * this->actor.scale.y * 40.0f) + 10.0f;
@@ -206,8 +209,8 @@ void EnKusa_SpawnFragments(EnKusa* this, PlayState* play) {
 
         scaleIndex = (s32)(Rand_ZeroOne() * 111.1f) % 7;
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -100, 64, 40, 3, 0, sFragmentScales[scaleIndex], 0, 0,
-                             80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubTipDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -100, 64, 40, 3, 0, sFragmentScales[scaleIndex], 0, 0, 80,
+                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubTipDL);
     }
 }
 
@@ -215,8 +218,9 @@ void EnKusa_SpawnBugs(EnKusa* this, PlayState* play) {
     s32 i;
 
     for (i = 0; i < 3; i++) {
-        Actor* bug = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x,
-                                 this->actor.world.pos.y, this->actor.world.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1, true);
+        Actor* bug =
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_INSECT, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1, true);
 
         if (bug == NULL) {
             break;
@@ -288,6 +292,10 @@ void EnKusa_WaitObject(EnKusa* this, PlayState* play) {
             EnKusa_SetupMain(this);
         }
 
+        if (!GameInteractor_Should(VB_GRASS_SETUP_DRAW, true, this)) {
+            return;
+        }
+
         this->actor.draw = EnKusa_Draw;
         this->actor.objBankIndex = this->objBankIndex;
         this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED;
diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 99695266b6..4bc506ff6a 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -75,9 +75,7 @@ static AnimationInfo sAnimationInfo[] = {
 u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
     Player* player = GET_PLAYER(play);
 
-    if (GameInteractor_Should(VB_KING_ZORA_THANK_CHILD, (
-        CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)
-    ), this)) {
+    if (GameInteractor_Should(VB_KING_ZORA_THANK_CHILD, (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)), this)) {
         return 0x402B;
     } else if (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
         return 0x401C;
@@ -125,23 +123,23 @@ u16 EnKz_GetText(PlayState* play, Actor* thisx) {
 
 s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
     EnKz* this = (EnKz*)thisx;
-    s16 ret = NPC_TALK_STATE_TALKING;
+    s16 talkState = NPC_TALK_STATE_TALKING;
 
     switch (Message_GetState(&play->msgCtx)) {
         case TEXT_STATE_DONE:
             if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
                 if (Message_ShouldAdvance(play)) {
-                    ret = NPC_TALK_STATE_ITEM_GIVEN;
+                    talkState = NPC_TALK_STATE_ITEM_GIVEN;
                 }
             } else {
-                ret = NPC_TALK_STATE_IDLE;
+                talkState = NPC_TALK_STATE_IDLE;
                 switch (this->actor.textId) {
                     case 0x4012:
                         Flags_SetInfTable(INFTABLE_139);
-                        ret = NPC_TALK_STATE_ACTION;
+                        talkState = NPC_TALK_STATE_ACTION;
                         break;
                     case 0x401B:
-                        ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
+                        talkState = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
                         break;
                     case 0x401F:
                         Flags_SetInfTable(INFTABLE_139);
@@ -151,14 +149,13 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
             break;
         case TEXT_STATE_CLOSING:
             if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
-                ret = NPC_TALK_STATE_IDLE;
+                talkState = NPC_TALK_STATE_IDLE;
                 switch (this->actor.textId) {
                     case 0x4012:
                         Flags_SetInfTable(INFTABLE_139);
-                        ret = NPC_TALK_STATE_ACTION;
-                        break;
+                        FALLTHROUGH;
                     case 0x401B:
-                        ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
+                        talkState = NPC_TALK_STATE_ACTION;
                         break;
                     case 0x401F:
                         Flags_SetInfTable(INFTABLE_139);
@@ -169,12 +166,13 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
         case TEXT_STATE_DONE_FADING:
             if (this->actor.textId != 0x4014) {
                 if (this->actor.textId == 0x401B && !this->sfxPlayed) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     this->sfxPlayed = true;
                 }
             } else if (!this->sfxPlayed) {
-                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->sfxPlayed = true;
             }
             break;
@@ -187,7 +185,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
                     if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
                         EnKz_SetupGetItem(this, play);
                     }
-                    ret = NPC_TALK_STATE_ACTION;
+                    talkState = NPC_TALK_STATE_ACTION;
                 } else {
                     this->actor.textId = 0x4016;
                     Message_ContinueTextbox(play, this->actor.textId);
@@ -196,7 +194,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
             break;
         case TEXT_STATE_EVENT:
             if (Message_ShouldAdvance(play)) {
-                ret = NPC_TALK_STATE_ACTION;
+                talkState = NPC_TALK_STATE_ACTION;
             }
             break;
         case TEXT_STATE_NONE:
@@ -206,7 +204,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
         case TEXT_STATE_9:
             break;
     }
-    return ret;
+    return talkState;
 }
 
 void EnKz_UpdateEyes(EnKz* this) {
@@ -289,8 +287,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
 
     if (func_80A9C95C(play, this, &this->interactInfo.talkState, 340.0f, EnKz_GetText, func_80A9C6C0)) {
         if (GameInteractor_Should(VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) &&
-            !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED))
-        {
+            !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) {
             if (func_8002F368(play) == EXCH_ITEM_LETTER_RUTO) {
                 this->actor.textId = 0x401B;
                 this->sfxPlayed = false;
@@ -391,17 +388,14 @@ void EnKz_Init(Actor* thisx, PlayState* play) {
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
     Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0);
 
-    if (GameInteractor_Should(VB_KING_ZORA_BE_MOVED, (
-        Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)
-    ), this)) {
+    if (GameInteractor_Should(VB_KING_ZORA_BE_MOVED, (Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)), this)) {
         EnKz_SetMovedPos(this, play);
     }
 
     if (LINK_IS_ADULT) {
         if (!Flags_GetInfTable(INFTABLE_138)) {
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BG_ICE_SHELTER,
-                               this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
-                               0x04FF);
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BG_ICE_SHELTER, this->actor.world.pos.x,
+                               this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x04FF);
         }
         this->actionFunc = EnKz_Wait;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c
index ca5cdaa0df..551f9516c3 100644
--- a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -163,9 +163,8 @@ void EnLight_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
     if (this->actor.params >= 0) {
-        gSPSegment(
-            POLY_XLU_DISP++, 0x08,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->timer * -20) & 511, 32, 128));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->timer * -20) & 511, 32, 128));
 
         dList = gEffFire1DL;
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, flameParams->primColor.r, flameParams->primColor.g,
@@ -190,8 +189,7 @@ void EnLight_Draw(Actor* thisx, PlayState* play) {
     }
 
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, dList);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/soh/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
index 67e33f54f7..10362a932c 100644
--- a/soh/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
+++ b/soh/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
@@ -80,8 +80,8 @@ void EnLightbox_Update(Actor* thisx, PlayState* play) {
             if (thisx->speedXZ) {
                 if (thisx->bgCheckFlags & 8) {
                     thisx->world.rot.y = (thisx->world.rot.y + thisx->wallYaw) - thisx->world.rot.y;
-                    Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     thisx->speedXZ *= 0.7f;
                     thisx->bgCheckFlags &= ~0x8;
                 }
@@ -92,8 +92,8 @@ void EnLightbox_Update(Actor* thisx, PlayState* play) {
             } else {
                 Math_StepToF(&thisx->speedXZ, 0, IREG(58) / 100.0f);
                 if ((thisx->bgCheckFlags & 2) && (thisx->velocity.y < IREG(59) / 100.0f)) {
-                    Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     thisx->velocity.y *= IREG(60) / 100.0f;
                     thisx->bgCheckFlags &= ~0x1;
                 } else {
diff --git a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index 0031ab7661..5ac6ef18cf 100644
--- a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -88,10 +88,10 @@ void EnMThunder_Init(Actor* thisx, PlayState* play2) {
         if (!gSaveContext.isMagicAcquired || (gSaveContext.magicState != MAGIC_STATE_IDLE) ||
             (((this->actor.params & 0xFF00) >> 8) &&
              !(Magic_RequestChange(play, (this->actor.params & 0xFF00) >> 8, MAGIC_CONSUME_NOW)))) {
-            Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             Actor_Kill(&this->actor);
             return;
         }
@@ -103,8 +103,8 @@ void EnMThunder_Init(Actor* thisx, PlayState* play2) {
         this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4);
         func_80A9EFE0(this, func_80A9F9B4);
         this->unk_1C4 = 8;
-        Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT_LV1, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT_LV1, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->unk_1AC = 1.0f;
     } else {
         func_80A9EFE0(this, func_80A9F408);
@@ -133,10 +133,10 @@ void func_80A9F350(EnMThunder* this, PlayState* play) {
 
     if (player->stateFlags2 & PLAYER_STATE2_SPIN_ATTACKING) {
         if (player->meleeWeaponAnimation >= 0x18) {
-            Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         Actor_Kill(&this->actor);
@@ -158,8 +158,9 @@ void func_80A9F408(EnMThunder* this, PlayState* play) {
 
     if (this->unk_1CA == 0) {
         if (player->unk_858 >= 0.1f) {
-            if ((gSaveContext.magicState != MAGIC_STATE_IDLE) || (((this->actor.params & 0xFF00) >> 8) &&
-                                            !(Magic_RequestChange(play, (this->actor.params & 0xFF00) >> 8, MAGIC_CONSUME_WAIT_PREVIEW)))) {
+            if ((gSaveContext.magicState != MAGIC_STATE_IDLE) ||
+                (((this->actor.params & 0xFF00) >> 8) &&
+                 !(Magic_RequestChange(play, (this->actor.params & 0xFF00) >> 8, MAGIC_CONSUME_WAIT_PREVIEW)))) {
                 func_80A9F350(this, play);
                 func_80A9EFE0(this, func_80A9F350);
                 this->unk_1C8 = 0;
@@ -183,10 +184,10 @@ void func_80A9F408(EnMThunder* this, PlayState* play) {
 
         if (player->unk_858 <= 0.15f) {
             if ((player->unk_858 >= 0.1f) && (player->meleeWeaponAnimation >= 0x18)) {
-                Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
             Actor_Kill(&this->actor);
             return;
@@ -207,8 +208,8 @@ void func_80A9F408(EnMThunder* this, PlayState* play) {
 
             func_80A9EFE0(this, func_80A9F9B4);
             this->unk_1C4 = 8;
-            Audio_PlaySoundGeneral(sSfxIds[this->unk_1C6], &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(sSfxIds[this->unk_1C6], &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->unk_1AC = 1.0f;
             return;
         }
@@ -326,22 +327,22 @@ void EnMThunder_Draw(Actor* thisx, PlayState* play2) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     switch (this->unk_1C6) {
         case 0:
         case 1:
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0xFF - ((u8)(s32)(this->unk_1B4 * 30) & 0xFF), 0,
-                                        0x40, 0x20, 1, 0xFF - ((u8)(s32)(this->unk_1B4 * 20) & 0xFF), 0, 8, 8));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0xFF - ((u8)(s32)(this->unk_1B4 * 30) & 0xFF), 0, 0x40,
+                                        0x20, 1, 0xFF - ((u8)(s32)(this->unk_1B4 * 20) & 0xFF), 0, 8, 8));
             break;
     }
 
     switch (this->unk_1C6) {
         case 0:
             if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level2Primary.Changed"), 0)) {
-                Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Primary.Value"), (Color_RGB8){255, 255, 170});
+                Color_RGB8 color =
+                    CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Primary.Value"), (Color_RGB8){ 255, 255, 170 });
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, color.r, color.g, color.b, (u8)(this->unk_1B0 * 255));
             } else {
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 170, (u8)(this->unk_1B0 * 255));
@@ -350,8 +351,9 @@ void EnMThunder_Draw(Actor* thisx, PlayState* play2) {
             gSPDisplayList(POLY_XLU_DISP++, gSpinAttack4DL);
             break;
         case 1:
-             if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level1Primary.Changed"), 0)) {
-                Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Primary.Value"), (Color_RGB8){170, 255, 255});
+            if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level1Primary.Changed"), 0)) {
+                Color_RGB8 color =
+                    CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Primary.Value"), (Color_RGB8){ 170, 255, 255 });
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, color.r, color.g, color.b, (u8)(this->unk_1B0 * 255));
             } else {
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, (u8)(this->unk_1B0 * 255));
@@ -384,13 +386,15 @@ void EnMThunder_Draw(Actor* thisx, PlayState* play2) {
     if (this->unk_1B8 >= 0.85f) {
         phi_f14 = (D_80AA046C[(play->gameplayFrames & 7)] * 6.0f) + 1.0f;
         if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level2Primary.Changed"), 0)) {
-            Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Primary.Value"), (Color_RGB8){255, 255, 170});
+            Color_RGB8 color =
+                CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Primary.Value"), (Color_RGB8){ 255, 255, 170 });
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, color.r, color.g, color.b, this->unk_1C8);
         } else {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 170, this->unk_1C8);
         }
         if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level2Secondary.Changed"), 0)) {
-            Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Secondary.Value"), (Color_RGB8){255, 100, 0});
+            Color_RGB8 color =
+                CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level2Secondary.Value"), (Color_RGB8){ 255, 100, 0 });
             gDPSetEnvColor(POLY_XLU_DISP++, color.r, color.g, color.b, 128);
         } else {
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128);
@@ -399,13 +403,15 @@ void EnMThunder_Draw(Actor* thisx, PlayState* play2) {
     } else {
         phi_f14 = (D_80AA046C[play->gameplayFrames & 7] * 2.0f) + 1.0f;
         if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level1Primary.Changed"), 0)) {
-            Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Primary.Value"), (Color_RGB8){170, 255, 255});
+            Color_RGB8 color =
+                CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Primary.Value"), (Color_RGB8){ 170, 255, 255 });
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, color.r, color.g, color.b, this->unk_1C8);
         } else {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, this->unk_1C8);
         }
         if (CVarGetInteger(CVAR_COSMETIC("SpinAttack.Level1Secondary.Changed"), 0)) {
-            Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Secondary.Value"), (Color_RGB8){0, 100, 255});
+            Color_RGB8 color =
+                CVarGetColor24(CVAR_COSMETIC("SpinAttack.Level1Secondary.Value"), (Color_RGB8){ 0, 100, 255 });
             gDPSetEnvColor(POLY_XLU_DISP++, color.r, color.g, color.b, 128);
         } else {
             gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 128);
@@ -413,13 +419,11 @@ void EnMThunder_Draw(Actor* thisx, PlayState* play2) {
         phi_t1 = 0x14;
     }
     Matrix_Scale(1.0f, phi_f14, phi_f14, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPSegment(POLY_XLU_DISP++, 0x09,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, (play->gameplayFrames * 5) & 0xFF, 0, 0x20, 0x20, 1,
-                                (play->gameplayFrames * 20) & 0xFF, (play->gameplayFrames * phi_t1) & 0xFF, 8,
-                                8));
+                                (play->gameplayFrames * 20) & 0xFF, (play->gameplayFrames * phi_t1) & 0xFF, 8, 8));
 
     gSPDisplayList(POLY_XLU_DISP++, gSpinAttackChargingDL);
 
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index 029c2548bb..b75aa749f6 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -9,7 +9,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnMa1_Init(Actor* thisx, PlayState* play);
 void EnMa1_Destroy(Actor* thisx, PlayState* play);
@@ -92,8 +94,10 @@ static void* sEyeTextures[] = {
 };
 
 u16 EnMa1_GetText(PlayState* play, Actor* thisx) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE,
+                                                         Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong =
+        GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
     u16 faceReaction = Text_GetFaceReaction(play, 0x17);
 
     if (faceReaction != 0) {
@@ -186,7 +190,8 @@ s16 func_80AA0778(PlayState* play, Actor* thisx) {
 }
 
 s32 func_80AA08C4(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE,
+                                                         Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
 
     if ((this->actor.shape.rot.z == 3) && (gSaveContext.sceneSetupIndex == 5)) {
         return 1;
@@ -195,8 +200,8 @@ s32 func_80AA08C4(EnMa1* this, PlayState* play) {
         return 0;
     }
     // Causes Malon to appear in the market if you haven't met her yet.
-    if (((play->sceneNum == SCENE_MARKET_NIGHT) || (play->sceneNum == SCENE_MARKET_DAY)) &&
-        !malonReturnedFromCastle && !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
+    if (((play->sceneNum == SCENE_MARKET_NIGHT) || (play->sceneNum == SCENE_MARKET_DAY)) && !malonReturnedFromCastle &&
+        !Flags_GetInfTable(INFTABLE_ENTERED_HYRULE_CASTLE)) {
         return 1;
     }
     if ((play->sceneNum == SCENE_HYRULE_CASTLE) && !malonReturnedFromCastle) {
@@ -270,8 +275,10 @@ void func_80AA0B74(EnMa1* this) {
 
 void EnMa1_Init(Actor* thisx, PlayState* play) {
     EnMa1* this = (EnMa1*)thisx;
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE,
+                                                         Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong =
+        GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
     s32 pad;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
@@ -307,8 +314,10 @@ void EnMa1_Destroy(Actor* thisx, PlayState* play) {
 }
 
 void func_80AA0D88(EnMa1* this, PlayState* play) {
-    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE, Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
-    bool malonTaughtEponasSong = GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
+    bool malonReturnedFromCastle = GameInteractor_Should(VB_MALON_RETURN_FROM_CASTLE,
+                                                         Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE));
+    bool malonTaughtEponasSong =
+        GameInteractor_Should(VB_MALON_ALREADY_TAUGHT_EPONAS_SONG, CHECK_QUEST_ITEM(QUEST_SONG_EPONA));
 
     if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         if (this->skelAnime.animation != &gMalonChildIdleAnim) {
@@ -341,7 +350,8 @@ void func_80AA0EA0(EnMa1* this, PlayState* play) {
 }
 
 void func_80AA0EFC(EnMa1* this, PlayState* play) {
-    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN || !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true)) {
+    if (this->interactInfo.talkState == NPC_TALK_STATE_ITEM_GIVEN ||
+        !GameInteractor_Should(VB_GIVE_ITEM_WEIRD_EGG, true)) {
         this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
         this->actionFunc = func_80AA0D88;
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_POCKET_EGG);
diff --git a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
index f1c71ac475..23707c6c96 100644
--- a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@@ -1,7 +1,9 @@
 #include "z_en_ma2.h"
 #include "objects/object_ma2/object_ma2.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnMa2_Init(Actor* thisx, PlayState* play);
 void EnMa2_Destroy(Actor* thisx, PlayState* play);
@@ -282,7 +284,8 @@ void func_80AA20E4(EnMa2* this, PlayState* play) {
         this->actionFunc = func_80AA204C;
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->unk_208 = 0x1E;
         Flags_SetInfTable(INFTABLE_8E);
         this->actionFunc = func_80AA21C8;
diff --git a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
index d95d2afcd4..152adf6ee1 100644
--- a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+++ b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
@@ -7,7 +7,9 @@
 #include "z_en_ma3.h"
 #include "objects/object_ma2/object_ma2.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnMa3_Init(Actor* thisx, PlayState* play);
 void EnMa3_Destroy(Actor* thisx, PlayState* play);
@@ -74,25 +76,25 @@ static AnimationFrameCountInfo sAnimationInfo[] = {
 
 u16 func_80AA2AA0(PlayState* play, Actor* thisx) {
     Player* player = GET_PLAYER(play);
-    s16* timer1ValuePtr; // weirdness with this necessary to match
+    s16* timerSecondsPtr; // weirdness with this necessary to match
 
     if (!Flags_GetInfTable(INFTABLE_B8)) {
         return 0x2000;
     }
-    timer1ValuePtr = &gSaveContext.timer1Value;
+    timerSecondsPtr = &gSaveContext.timerSeconds;
     if (gSaveContext.eventInf[0] & 0x400) {
-        gSaveContext.timer1Value = gSaveContext.timer1Value;
+        gSaveContext.timerSeconds = gSaveContext.timerSeconds;
         thisx->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
-        if (gSaveContext.timer1Value >= 0xD3) {
+        if (gSaveContext.timerSeconds >= 0xD3) {
             return 0x208E;
         }
         if ((HIGH_SCORE(HS_HORSE_RACE) == 0) || (HIGH_SCORE(HS_HORSE_RACE) >= 0xB4)) {
             HIGH_SCORE(HS_HORSE_RACE) = 0xB4;
-            gSaveContext.timer1Value = *timer1ValuePtr;
+            gSaveContext.timerSeconds = *timerSecondsPtr;
         }
-        if (!Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && (gSaveContext.timer1Value < 0x32)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE) && (gSaveContext.timerSeconds < 0x32)) {
             return 0x208F;
-        } else if (gSaveContext.timer1Value < HIGH_SCORE(HS_HORSE_RACE)) {
+        } else if (gSaveContext.timerSeconds < HIGH_SCORE(HS_HORSE_RACE)) {
             return 0x2012;
         } else {
             return 0x2004;
@@ -120,7 +122,7 @@ s16 func_80AA2BD4(PlayState* play, Actor* thisx) {
                 play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.eventInf[0] |= 0x400;
-                gSaveContext.timer1State = 0xF;
+                gSaveContext.timerState = 0xF;
             }
             break;
         case TEXT_STATE_CHOICE:
@@ -147,14 +149,14 @@ s16 func_80AA2BD4(PlayState* play, Actor* thisx) {
                     Flags_SetEventChkInf(EVENTCHKINF_WON_COW_IN_MALONS_RACE);
                 case 0x2004:
                 case 0x2012:
-                    if (HIGH_SCORE(HS_HORSE_RACE) > gSaveContext.timer1Value) {
-                        HIGH_SCORE(HS_HORSE_RACE) = gSaveContext.timer1Value;
+                    if (HIGH_SCORE(HS_HORSE_RACE) > gSaveContext.timerSeconds) {
+                        HIGH_SCORE(HS_HORSE_RACE) = gSaveContext.timerSeconds;
                     }
                 case 0x208E:
                     gSaveContext.eventInf[0] &= ~0x400;
                     thisx->flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
                     ret = NPC_TALK_STATE_IDLE;
-                    gSaveContext.timer1State = 0xA;
+                    gSaveContext.timerState = 0xA;
                     break;
                 case 0x2002:
                     Flags_SetInfTable(INFTABLE_B9);
diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
index 0ea4a2e251..6290d65bee 100644
--- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
+++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
@@ -8,20 +8,15 @@
 #include "objects/object_mag/object_mag.h"
 #include <soh/GameVersions.h>
 #include "soh/ResourceManagerHelpers.h"
+#include <string.h>
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnMag_Init(Actor* thisx, PlayState* play);
-void EnMag_InitMq(Actor* thisx, PlayState* play);
-void EnMag_InitVanilla(Actor* thisx, PlayState* play);
-
 void EnMag_Destroy(Actor* thisx, PlayState* play);
-void EnMag_UpdateMq(Actor* thisx, PlayState* play);
-void EnMag_UpdateVanilla(Actor* thisx, PlayState* play);
-
+void EnMag_Update(Actor* thisx, PlayState* play);
 void EnMag_Draw(Actor* thisx, PlayState* play);
-void EnMag_DrawInnerVanilla(Actor* thisx, PlayState* play, Gfx** gfxp);
-void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp);
+void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxp);
 
 typedef void (*EnMagDrawInnerFunc)(struct Actor*, PlayState*, Gfx**);
 
@@ -35,11 +30,17 @@ const ActorInit En_Mag_InitVars = {
     sizeof(EnMag),
     (ActorFunc)EnMag_Init,
     (ActorFunc)EnMag_Destroy,
-    (ActorFunc)NULL,
+    (ActorFunc)EnMag_Update,
     (ActorFunc)EnMag_Draw,
     NULL,
 };
 
+// #region SOH
+typedef enum {
+    FONT_TYPE_PAL,
+    FONT_TYPE_NTSC,
+} FontType;
+
 const char* noControllerMsg[] = {
     "NO CONTROLLER",
     "CONTROLLER FEHLT",
@@ -52,21 +53,15 @@ const char* pressStartMsg[] = {
     "APPUYEZ SUR START",
 };
 
-void EnMag_Init(Actor* thisx, PlayState* play) {
-    if (ResourceMgr_IsGameMasterQuest()) {
-        EnMag_InitMq(thisx, play);
-        drawInnerFunc = EnMag_DrawInnerMq;
-        thisx->update = EnMag_UpdateMq;
-    } else {
-        EnMag_InitVanilla(thisx, play);
-        thisx->update = EnMag_UpdateVanilla;
-        drawInnerFunc = EnMag_DrawInnerVanilla;
-    }
-}
+FontType sFontType;
+
+// #endregion
 
 static s16 sDelayTimer = 0;
-void EnMag_InitMq(Actor* thisx, PlayState* play) {
+
+void EnMag_Init(Actor* thisx, PlayState* play) {
     EnMag* this = (EnMag*)thisx;
+    bool isMQ = ResourceMgr_IsGameMasterQuest();
 
     YREG(1) = 63;
     YREG(3) = 80;
@@ -105,7 +100,7 @@ void EnMag_InitMq(Actor* thisx, PlayState* play) {
     this->effectFadeInState = this->effectPrimLodFrac = this->globalState = this->effectAlpha = this->mainAlpha =
         this->subAlpha = this->copyrightAlpha = 0.0f;
 
-    if (gSaveContext.unk_13E7 != 0) {
+    if (gSaveContext.forceRisingButtonAlphas) {
         this->mainAlpha = 210;
         this->subAlpha = 255;
         this->copyrightAlpha = 255;
@@ -113,92 +108,37 @@ void EnMag_InitMq(Actor* thisx, PlayState* play) {
         this->effectPrimLodFrac = 128.0f;
         this->effectAlpha = 255.0f;
 
-        this->effectPrimColor[0] = 170;
-        this->effectPrimColor[1] = 255.0f;
-        this->effectPrimColor[2] = 255.0f;
-        this->effectEnvColor[0] = 200.0f;
-        this->effectEnvColor[1] = 255.0f;
-        this->effectEnvColor[2] = 0;
+        if (!isMQ) {
+            this->effectPrimColor[0] = 255.0f;
+            this->effectPrimColor[1] = 255.0f;
+            this->effectPrimColor[2] = 170;
+            this->effectEnvColor[0] = 255.0f;
+            this->effectEnvColor[1] = 100;
+        } else {
+            this->effectPrimColor[0] = 170;
+            this->effectPrimColor[1] = 255.0f;
+            this->effectPrimColor[2] = 255.0f;
+            this->effectEnvColor[0] = 200.0f;
+            this->effectEnvColor[1] = 255.0f;
+            this->effectEnvColor[2] = 0;
+        }
 
-        gSaveContext.unk_13E7 = 0;
+        gSaveContext.forceRisingButtonAlphas = false;
         this->globalState = MAG_STATE_DISPLAY;
         sDelayTimer = 20;
         gSaveContext.transFadeDuration = 1;
         gSaveContext.transWipeSpeed = 255;
     }
 
-    Font_LoadOrderedFont(&this->font);
-
-    this->unk_E316 = 0;
-    this->unk_E318 = 0;
-    this->unk_E31C = 0;
-    this->unk_E320 = 0;
-}
-
-void EnMag_InitVanilla(Actor* thisx, PlayState* play) {
-    EnMag* this = (EnMag*)thisx;
-
-    YREG(1) = 63;
-    YREG(3) = 80;
-    YREG(4) = 255;
-    YREG(5) = 30;
-    YREG(6) = 30;
-    YREG(7) = 119;
-    YREG(8) = 7;
-    YREG(9) = 5;
-    YREG(10) = 3;
-
-    VREG(4) = 1;
-    VREG(5) = 6;
-    VREG(6) = 2;
-
-    this->copyrightAlphaStep = 6;
-    this->fadeOutAlphaStep = 10;
-
-    VREG(19) = 99;
-    VREG(21) = 9;
-    VREG(23) = 10;
-    VREG(24) = 8;
-
-    this->effectScroll = 0;
-    this->unk_E30C = 0;
-
-    this->effectPrimColor[0] = 0.0f;
-    this->effectPrimColor[1] = 100.0f;
-    this->effectPrimColor[2] = 170.0f;
-    this->effectEnvColor[0] = 0.0f;
-    this->effectEnvColor[1] = 100.0f;
-    this->effectEnvColor[2] = 0.0f;
-
-    this->effectFadeInTimer = 40;
-
-    this->effectFadeInState = this->effectPrimLodFrac = this->globalState = this->effectAlpha = this->mainAlpha =
-        this->subAlpha = this->copyrightAlpha = 0.0f;
-
-    if (gSaveContext.unk_13E7 != 0) {
-        this->mainAlpha = 210;
-        this->subAlpha = 255;
-        this->copyrightAlpha = 255;
-
-        this->effectPrimLodFrac = 128.0f;
-        this->effectAlpha = 255.0f;
-
-        this->effectPrimColor[0] = 255.0f;
-        this->effectPrimColor[1] = 255.0f;
-        this->effectPrimColor[2] = 170.0f;
-        this->effectEnvColor[0] = 255.0f;
-        this->effectEnvColor[1] = 100.0f;
-        this->effectEnvColor[2] = 0.0f;
-
-        gSaveContext.unk_13E7 = 0;
-        this->globalState = MAG_STATE_DISPLAY;
-        sDelayTimer = 20;
-        gSaveContext.transFadeDuration = 1;
-        gSaveContext.transWipeSpeed = 255;
+    // Default to PAL if it exists
+    if (ResourceMgr_IsPalLoaded()) {
+        Font_LoadOrderedFont(&this->font);
+        sFontType = FONT_TYPE_PAL;
+    } else {
+        Font_LoadOrderedFontNTSC(&this->font);
+        sFontType = FONT_TYPE_NTSC;
     }
 
-    Font_LoadOrderedFont(&this->font);
-
     this->unk_E316 = 0;
     this->unk_E318 = 0;
     this->unk_E31C = 0;
@@ -208,9 +148,10 @@ void EnMag_InitVanilla(Actor* thisx, PlayState* play) {
 void EnMag_Destroy(Actor* thisx, PlayState* play) {
 }
 
-void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
+void EnMag_Update(Actor* thisx, PlayState* play) {
     s32 pad[2];
     EnMag* this = (EnMag*)thisx;
+    bool isMQ = ResourceMgr_IsGameMasterQuest();
 
     if (gSaveContext.fileNum != 0xFEDC) {
         if (this->globalState < MAG_STATE_DISPLAY) {
@@ -218,7 +159,8 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
                 CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) ||
                 CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) {
 
-                Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 this->mainAlpha = 210;
                 this->subAlpha = 255;
@@ -227,12 +169,20 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
                 this->effectPrimLodFrac = 128.0f;
                 this->effectAlpha = 255.0f;
 
-                this->effectPrimColor[0] = 170;
-                this->effectPrimColor[1] = 255.0f;
-                this->effectPrimColor[2] = 255.0f;
-                this->effectEnvColor[0] = 200.0f;
-                this->effectEnvColor[1] = 255.0f;
-                this->effectEnvColor[2] = 0;
+                if (!isMQ) {
+                    this->effectPrimColor[0] = 255.0f;
+                    this->effectPrimColor[1] = 255.0f;
+                    this->effectPrimColor[2] = 170;
+                    this->effectEnvColor[0] = 255.0f;
+                    this->effectEnvColor[1] = 100;
+                } else {
+                    this->effectPrimColor[0] = 170;
+                    this->effectPrimColor[1] = 255.0f;
+                    this->effectPrimColor[2] = 255.0f;
+                    this->effectEnvColor[0] = 200.0f;
+                    this->effectEnvColor[1] = 255.0f;
+                    this->effectEnvColor[2] = 0;
+                }
 
                 this->globalState = MAG_STATE_DISPLAY;
                 sDelayTimer = 20;
@@ -248,8 +198,8 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
                     if (play->transitionTrigger != TRANS_TRIGGER_START) {
                         Audio_SetCutsceneFlag(0);
 
-                        Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                         gSaveContext.gameMode = GAMEMODE_FILE_SELECT;
                         play->transitionTrigger = TRANS_TRIGGER_START;
@@ -293,8 +243,13 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
                 this->effectFadeInState = 1;
             }
         } else if (this->effectFadeInState == 1) {
-            this->effectPrimColor[0] += -2.125f;
-            this->effectEnvColor[0] += -1.375f;
+            if (!isMQ) {
+                this->effectPrimColor[2] += -2.125f;
+                this->effectEnvColor[1] += -3.875f;
+            } else {
+                this->effectPrimColor[0] += -2.125f;
+                this->effectEnvColor[0] += -1.375f;
+            }
 
             this->effectPrimLodFrac += 2.4f;
 
@@ -303,8 +258,13 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
             if (this->effectFadeInTimer == 0) {
                 this->effectPrimLodFrac = 128.0f;
 
-                this->effectPrimColor[0] = 170.0f;
-                this->effectEnvColor[0] = 200.0f;
+                if (!isMQ) {
+                    this->effectPrimColor[2] = 170.0f;
+                    this->effectEnvColor[1] = 100.0f;
+                } else {
+                    this->effectPrimColor[0] = 170.0f;
+                    this->effectEnvColor[0] = 200.0f;
+                }
 
                 this->effectFadeInTimer = 32;
                 this->effectFadeInState = 2;
@@ -368,169 +328,9 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) {
     }
 }
 
-void EnMag_UpdateVanilla(Actor* thisx, PlayState* play) {
-    s32 pad[2];
-    EnMag* this = (EnMag*)thisx;
-
-    if (gSaveContext.fileNum != 0xFEDC) {
-        if (this->globalState < MAG_STATE_DISPLAY) {
-            if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_START) ||
-                CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) ||
-                CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) {
-
-                Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-
-                this->mainAlpha = 210;
-                this->subAlpha = 255;
-                this->copyrightAlpha = 255;
-
-                this->effectPrimLodFrac = 128.0f;
-                this->effectAlpha = 255.0f;
-
-                this->effectPrimColor[0] = 255.0f;
-                this->effectPrimColor[1] = 255.0f;
-                this->effectPrimColor[2] = 170.0f;
-                this->effectEnvColor[0] = 255.0f;
-                this->effectEnvColor[1] = 100.0f;
-                this->effectEnvColor[2] = 0.0f;
-
-                this->globalState = MAG_STATE_DISPLAY;
-                sDelayTimer = 20;
-                gSaveContext.transFadeDuration = 1;
-                gSaveContext.transWipeSpeed = 255;
-            }
-        } else if (this->globalState >= MAG_STATE_DISPLAY) {
-            if (sDelayTimer == 0) {
-                if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_START) ||
-                    CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) ||
-                    CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) {
-
-                    if (play->transitionTrigger != TRANS_TRIGGER_START) {
-                        Audio_SetCutsceneFlag(0);
-
-                        Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
-
-                        gSaveContext.gameMode = GAMEMODE_FILE_SELECT;
-                        play->transitionTrigger = TRANS_TRIGGER_START;
-                        play->transitionType = TRANS_TYPE_FADE_BLACK;
-                    }
-
-                    this->copyrightAlphaStep = 15;
-                    this->fadeOutAlphaStep = 25;
-                    this->globalState = MAG_STATE_FADE_OUT;
-                }
-            } else {
-                sDelayTimer--;
-            }
-        }
-    }
-
-    if (this->globalState == MAG_STATE_FADE_IN) {
-        if (this->effectFadeInState == 0) {
-            this->effectAlpha += 6.375f;
-            this->effectPrimLodFrac += 0.8f;
-
-            this->effectPrimColor[0] += 6.375f;
-            this->effectPrimColor[1] += 3.875f;
-            this->effectPrimColor[2] += 2.125f;
-            this->effectEnvColor[0] += 6.375f;
-            this->effectEnvColor[1] += 3.875f;
-
-            this->effectFadeInTimer--;
-
-            if (this->effectFadeInTimer == 0) {
-                this->effectPrimLodFrac = 32.0f;
-                this->effectAlpha = 255.0f;
-
-                this->effectPrimColor[0] = 255.0f;
-                this->effectPrimColor[1] = 255.0f;
-                this->effectPrimColor[2] = 255.0f;
-                this->effectEnvColor[0] = 255.0f;
-                this->effectEnvColor[1] = 255.0f;
-
-                this->effectFadeInTimer = 40;
-                this->effectFadeInState = 1;
-            }
-        } else if (this->effectFadeInState == 1) {
-            this->effectPrimColor[2] += -2.125f;
-            this->effectEnvColor[1] += -3.875f;
-
-            this->effectPrimLodFrac += 2.4f;
-
-            this->effectFadeInTimer--;
-
-            if (this->effectFadeInTimer == 0) {
-                this->effectPrimLodFrac = 128.0f;
-
-                this->effectPrimColor[2] = 170.0f;
-                this->effectEnvColor[1] = 100.0f;
-
-                this->effectFadeInTimer = 32;
-                this->effectFadeInState = 2;
-            }
-        }
-
-        if (this->effectAlpha > 160) {
-            this->mainAlpha += VREG(5);
-            if (this->mainAlpha >= 210.0f) {
-                this->mainAlpha = 210.0f;
-            }
-
-            if (this->mainAlpha >= 210) {
-                this->subAlpha += VREG(6);
-                if (this->subAlpha >= 255.0f) {
-                    this->subAlpha = 255.0f;
-                }
-
-                if (this->subAlpha >= 200) {
-                    this->copyrightAlpha += this->copyrightAlphaStep;
-                    if (this->copyrightAlpha >= 255.0f) {
-                        this->copyrightAlpha = 255.0f;
-                        this->globalState = MAG_STATE_DISPLAY;
-                        sDelayTimer = 20;
-                    }
-                }
-            }
-        }
-    } else if (this->globalState == MAG_STATE_FADE_OUT) {
-        this->effectAlpha -= this->fadeOutAlphaStep;
-        if (this->effectAlpha < 0.0f) {
-            this->effectAlpha = 0.0f;
-        }
-
-        this->mainAlpha -= this->fadeOutAlphaStep;
-        if (this->mainAlpha < 0.0f) {
-            this->mainAlpha = 0.0f;
-        }
-
-        this->subAlpha -= this->fadeOutAlphaStep;
-        if (this->subAlpha < 0.0f) {
-            this->subAlpha = 0.0f;
-        }
-
-        this->copyrightAlpha -= this->copyrightAlphaStep;
-        if (this->copyrightAlpha < 0.0f) {
-            this->copyrightAlpha = 0.0f;
-            this->globalState = MAG_STATE_POST_DISPLAY;
-        }
-    }
-
-    if (this->globalState == MAG_STATE_INITIAL) {
-        if (Flags_GetEnv(play, 3)) {
-            this->effectFadeInTimer = 40;
-            this->globalState = MAG_STATE_FADE_IN;
-        }
-    } else if (this->globalState == MAG_STATE_DISPLAY) {
-        if (Flags_GetEnv(play, 4)) {
-            this->globalState = MAG_STATE_FADE_OUT;
-        }
-    }
-}
-
-void EnMag_DrawTextureI8(Gfx** gfxp, const void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop,
+void EnMag_DrawTextureI8(Gfx** gfxP, void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop,
                          s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
-    Gfx* gfx = *gfxp;
+    Gfx* gfx = *gfxP;
 
     gDPLoadTextureBlock(gfx++, texture, G_IM_FMT_I, G_IM_SIZ_8b, texWidth, texHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -538,28 +338,29 @@ void EnMag_DrawTextureI8(Gfx** gfxp, const void* texture, s16 texWidth, s16 texH
     gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2,
                         G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
 
-    *gfxp = gfx;
+    *gfxP = gfx;
 }
 
-void EnMag_DrawEffectTextures(Gfx** gfxp, const void* maskTex, void* effectTex, s16 maskWidth, s16 maskHeight,
+void EnMag_DrawEffectTextures(Gfx** gfxP, void* maskTex, void* effectTex, s16 maskWidth, s16 maskHeight,
                               s16 effectWidth, s16 effectHeight, s16 rectLeft, s16 rectTop, s16 rectWidth,
                               s16 rectHeight, u16 dsdx, u16 dtdy, u16 shifts, u16 shiftt, u16 flag, EnMag* this) {
-    Gfx* gfx = *gfxp;
+    Gfx* gfx = *gfxP;
 
-    gDPLoadMultiBlock_4b(gfx++, maskTex, 0x0000, 0, G_IM_FMT_I, maskWidth, maskHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadMultiBlock_4b(gfx++, maskTex, 0x0000, G_TX_RENDERTILE, G_IM_FMT_I, maskWidth, maskHeight, 0,
+                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                         G_TX_NOLOD);
 
     if (!flag) {
         gDPLoadMultiBlock(gfx++, effectTex, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, effectWidth, effectHeight, 0,
                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, 5, shifts, shiftt);
 
-        gDPSetTileSize(gfx++, 1, 0, this->effectScroll & 0x7F, 0x7C, (this->effectScroll & 0x7F) + 0x7C);
+        gDPSetTileSize(gfx++, 1, 0, this->effectScroll & 0x7F, 31 << 2, (31 << 2) + (this->effectScroll & 0x7F));
     }
 
     gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2,
                         G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
 
-    *gfxp = gfx;
+    *gfxP = gfx;
 }
 
 void EnMag_DrawImageRGBA32(Gfx** gfxp, s16 centerX, s16 centerY, const char* source, u32 width, u32 height) {
@@ -593,8 +394,8 @@ void EnMag_DrawImageRGBA32(Gfx** gfxp, s16 centerX, s16 centerY, const char* sou
     *gfxp = gfx;
 }
 
-void EnMag_DrawCharTexture(Gfx** gfxp, u8* texture, s32 rectLeft, s32 rectTop) {
-    Gfx* gfx = *gfxp;
+void EnMag_DrawCharTexture(Gfx** gfxP, u8* texture, s32 rectLeft, s32 rectTop) {
+    Gfx* gfx = *gfxP;
 
     YREG(0) = 1024.0f / (YREG(1) / 100.0f);
     YREG(2) = 16.0f * (YREG(1) / 100.0f);
@@ -605,43 +406,110 @@ void EnMag_DrawCharTexture(Gfx** gfxp, u8* texture, s32 rectLeft, s32 rectTop) {
     gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + YREG(2)) << 2, (rectTop + YREG(2)) << 2,
                         G_TX_RENDERTILE, 0, 0, YREG(0), YREG(0));
 
-    *gfxp = gfx;
+    *gfxP = gfx;
 }
 
-s16 GetCharArraySize(const char* str) {
-    s16 length = 0;
-    char c = str[length];
+// #region SOH - Translate Title Screen
+bool EnMag_ShouldDrawNoController(Font* font, Gfx** gfxP, bool isActualText) {
+    if (!CVarGetInteger(CVAR_SETTING("TitleScreenTranslation"), 0) || !ResourceMgr_IsPalLoaded()) {
+        return true;
+    }
+    Gfx* gfx = *gfxP;
+    u8 language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
+    s32 length = strlen(noControllerMsg[language]);
+    u16 rectLeft = VREG(19) + ((length - 13) * -3);
+    u16 rectTop = YREG(10) + 171;
+    s32 i;
 
-    while (c != 0) {
-        length++;
-        c = str[length];
+    if (!isActualText) {
+        rectLeft++;
+        rectTop++;
     }
 
-    return length;
-}
-
-static void EnMag_SetCopyValues(const char** copy_tex, u16* copy_width, u16* copy_xl, u16* copy_xh) {
-    u32 platform = ResourceMgr_GetGamePlatform(0);
-    switch (platform) {
-        case GAME_PLATFORM_N64:
-            *copy_tex = gTitleCopyright1998Tex;
-            *copy_width = 128;
-            *copy_xl = 376;
-            *copy_xh = 888;
-            break;
-        default:
-            *copy_tex = gTitleCopyright19982003Tex;
-            *copy_width = 160;
-            *copy_xl = 312;
-            *copy_xh = 952;
-            break;
+    if (sFontType != FONT_TYPE_PAL) {
+        Font_LoadOrderedFont(font);
+        sFontType = FONT_TYPE_PAL;
     }
+
+    for (i = 0; i < length; i++) {
+        EnMag_DrawCharTexture(&gfx, font->fontBuf + (noControllerMsg[language][i] - '\x37') * FONT_CHAR_TEX_SIZE,
+                              rectLeft, rectTop);
+        if (noControllerMsg[language][i] == ' ') {
+            rectLeft += VREG(23);
+        } else {
+            rectLeft += VREG(21);
+        }
+    }
+
+    *gfxP = gfx;
+    return false;
 }
 
-void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
+bool EnMag_ShouldDrawPressStart(Font* font, Gfx** gfxP, bool isActualText) {
+    if (!CVarGetInteger(CVAR_SETTING("TitleScreenTranslation"), 0) || !ResourceMgr_IsPalLoaded()) {
+        return true;
+    }
+    Gfx* gfx = *gfxP;
+    u8 language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
+    s32 length = strlen(pressStartMsg[language]);
+    u16 rectLeft = YREG(7) + ((length - 11) * -3);
+    u16 rectTop = YREG(10) + 171;
+    s32 i;
+
+    if (!isActualText) {
+        rectLeft++;
+        rectTop++;
+    }
+
+    if (sFontType != FONT_TYPE_PAL) {
+        Font_LoadOrderedFont(font);
+        sFontType = FONT_TYPE_PAL;
+    }
+
+    for (i = 0; i < length; i++) {
+        EnMag_DrawCharTexture(&gfx, font->fontBuf + (pressStartMsg[language][i] - '\x37') * FONT_CHAR_TEX_SIZE,
+                              rectLeft, rectTop);
+        if (pressStartMsg[language][i] == ' ') {
+            rectLeft += YREG(9);
+        } else {
+            rectLeft += YREG(8);
+        }
+    }
+
+    *gfxP = gfx;
+    return false;
+}
+// #endregion
+
+// Title logo is shifted to the left in Master Quest
+#define LOGO_X_SHIFT (isMQ ? 0 : -8)
+#define LOGO_TEX (isMQ ? gTitleZeldaShieldLogoMQTex : gTitleZeldaShieldLogoTex)
+// Copyright texture is different depending on the version
+// JPN CE displays two slightly different 2004 copyrights when lang is jpn or not
+// Otherwise the other GC JPN versions either display 2002 for JPN or 2003 for others
+// Else fallback to 2003 for GC or 1998 for N64
+#define COPYRIGHT_TEX                                                                                              \
+    (isJpnGC_CE                                                                                                    \
+         ? (gSaveContext.language == LANGUAGE_JPN ? gTitleCopyright19982004JpnTex : gTitleCopyright19982004EngTex) \
+         : (isGC ? ((isJpnGC_notCE || gSaveContext.language == LANGUAGE_JPN) ? gTitleCopyright19982002Tex          \
+                                                                             : gTitleCopyright19982003Tex)         \
+                 : gTitleCopyright1998Tex))
+// Copyright texture is larger on GC
+#define COPYRIGHT_TEX_WIDTH (isGC ? 160 : 128)
+#define COPYRIGHT_TEX_LEFT (isGC ? 78 : 94)
+
+void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
     static s16 textAlpha = 0;
     static s16 textFadeDirection = 0;
     static s16 textFadeTimer = 0;
+    static u8 noControllerFontIndices[2][12] = {
+        { 0x17, 0x18, 0x0C, 0x18, 0x17, 0x1D, 0x1B, 0x18, 0x15, 0x15, 0x0E, 0x1B },
+        { 0xB8, 0xB9, 0xAD, 0xB9, 0xB8, 0xBE, 0xBC, 0xB9, 0xB6, 0xB6, 0xAF, 0xBC },
+    };
+    static u8 pressStartFontIndices[2][10] = {
+        { 0x19, 0x1B, 0x0E, 0x1C, 0x1C, 0x1C, 0x1D, 0x0A, 0x1B, 0x1D },
+        { 0xBA, 0xBC, 0xAF, 0xBD, 0xBD, 0xBD, 0xBE, 0xAB, 0xBC, 0xBE },
+    };
     static void* effectMaskTextures[] = {
         gTitleEffectMask00Tex, gTitleEffectMask01Tex, gTitleEffectMask02Tex,
         gTitleEffectMask10Tex, gTitleEffectMask11Tex, gTitleEffectMask12Tex,
@@ -650,21 +518,15 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
     EnMag* this = (EnMag*)thisx;
     Font* font = &this->font;
     s32 pad;
-    Gfx* gfx = *gfxp;
+    Gfx* gfx = *gfxP;
     u16 i, j, k;
     u16 rectLeft;
     u16 rectTop;
-    u16 length;
-    int lang = LANGUAGE_ENG;
-    if (CVarGetInteger(CVAR_SETTING("TitleScreenTranslation"), 0)) {
-        lang = gSaveContext.language;
-    }
-
-    const char* copy_tex = NULL;
-    u16 copy_width;
-    u16 copy_xl;
-    u16 copy_xh;
-    EnMag_SetCopyValues(&copy_tex, &copy_width, &copy_xl, &copy_xh);
+    bool isMQ = ResourceMgr_IsGameMasterQuest();
+    bool isGC = ResourceMgr_GetGamePlatform(0) == GAME_PLATFORM_GC;
+    bool isJpnGC_CE = isGC && ResourceMgr_GetGameVersion(0) == OOT_NTSC_JP_GC_CE;
+    bool isJpnGC_notCE =
+        isGC && (ResourceMgr_GetGameVersion(0) == OOT_NTSC_JP_GC || ResourceMgr_GetGameVersion(0) == OOT_NTSC_JP_MQ);
 
     gSPSegment(gfx++, 0x06, play->objectCtx.status[this->actor.objBankIndex].segment);
 
@@ -685,7 +547,7 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
 
     if ((s16)this->effectPrimLodFrac != 0) {
         for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) {
-            for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) {
+            for (j = 0, rectLeft = 64 + LOGO_X_SHIFT; j < 3; j++, k++, rectLeft += 64) {
                 EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft,
                                          rectTop, 64, 64, 1024, 1024, 1, 1, k, this);
             }
@@ -695,7 +557,7 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
     gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
 
     if ((s16)this->mainAlpha != 0) {
-        EnMag_DrawImageRGBA32(&gfx, 152, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
+        EnMag_DrawImageRGBA32(&gfx, 160 + LOGO_X_SHIFT, 100, (u8*)LOGO_TEX, 160, 160);
     }
 
     Gfx_SetupDL_39Ptr(&gfx);
@@ -712,22 +574,72 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
     }
 
     gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha);
-    gDPSetEnvColor(gfx++, 0, 0, 100, 255);
+
+    if (!isMQ) {
+        gDPSetEnvColor(gfx++, 100, 0, 100, 255);
+    } else {
+        gDPSetEnvColor(gfx++, 0, 0, 100, 255);
+    }
 
     if ((s16)this->mainAlpha != 0) {
-        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 146, 73, 72, 8, 1024, 1024);
-        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 144, 127, 96, 8, 1024, 1024);
+        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 154 + LOGO_X_SHIFT, 73, 72, 8, 1024, 1024);
+        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 152 + LOGO_X_SHIFT, 127, 96, 8, 1024, 1024);
 
         gDPPipeSync(gfx++);
-        gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha);
-        gDPSetEnvColor(gfx++, 20, 80, 160, 255);
 
-        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 145, 72, 72, 8, 1024, 1024);
-        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 143, 126, 96, 8, 1024, 1024);
+        if (!isMQ) {
+            gDPSetPrimColor(gfx++, 0, 0, 200, 200, 150, (s16)this->mainAlpha);
+            gDPSetEnvColor(gfx++, 100, 100, 50, 255);
+        } else {
+            gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha);
+            gDPSetEnvColor(gfx++, 20, 80, 160, 255);
+        }
 
+        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 153 + LOGO_X_SHIFT, 72, 72, 8, 1024, 1024);
+        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 151 + LOGO_X_SHIFT, 126, 96, 8, 1024, 1024);
+
+        if (isMQ) {
+            gDPPipeSync(gfx++);
+            gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha);
+
+            if (gSaveContext.language == LANGUAGE_JPN || ResourceMgr_GetGameVersion(0) == OOT_NTSC_JP_MQ) {
+                EnMag_DrawImageRGBA32(&gfx, 235, 149, (u8*)gTitleUraLogoTex, 40, 40);
+            } else {
+                EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32);
+            }
+        }
+    }
+
+    if (gSaveContext.language == LANGUAGE_JPN) {
+        this->unk_E30C++;
         gDPPipeSync(gfx++);
-        gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha);
-        EnMag_DrawImageRGBA32(&gfx, 174, 145, gTitleMasterQuestSubtitleTex, 128, 32);
+        gDPSetCycleType(gfx++, G_CYC_2CYCLE);
+        if ((s16)this->subAlpha < 100) {
+            gDPSetRenderMode(gfx++, G_RM_PASS, G_RM_CLD_SURF2);
+        } else {
+            gDPSetRenderMode(gfx++, G_RM_PASS, G_RM_XLU_SURF2);
+        }
+        gDPSetCombineLERP(gfx++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, ENVIRONMENT,
+                          COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
+
+        if (!isMQ) {
+            gDPSetPrimColor(gfx++, 0, 0x80, 255, 255, 170, (s16)this->subAlpha);
+            gDPSetEnvColor(gfx++, 255, 150, 0, 255);
+        } else {
+            gDPSetPrimColor(gfx++, 0, 0x80, 170, 255, 255, (s16)this->subAlpha);
+            gDPSetEnvColor(gfx++, ZREG(34), 100 + ZREG(35), 255 + ZREG(36), 255);
+        }
+        if ((s16)this->subAlpha != 0) {
+            gDPLoadTextureBlock(gfx++, gTitleTitleJPNTex, G_IM_FMT_I, G_IM_SIZ_8b, 128, 16, 0,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                                G_TX_NOMASK, G_TX_NOLOD);
+            gDPLoadMultiBlock(gfx++, gTitleFlameEffectTex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+                              G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 1);
+            gDPSetTileSize(gfx++, 1, this->unk_E30C & 0x7F, this->effectScroll & 0x7F,
+                           (this->unk_E30C & 0x7F) + ((32 - 1) << 2), (this->effectScroll & 0x7F) + ((32 - 1) << 2));
+            gSPTextureRectangle(gfx++, 106 << 2, 144 << 2, (106 + 128) << 2, (144 + 16) << 2, G_TX_RENDERTILE, 0, 0,
+                                1 << 10, 1 << 10);
+        }
     }
 
     Gfx_SetupDL_39Ptr(&gfx);
@@ -739,10 +651,12 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
                     (s16)this->copyrightAlpha);
 
     if ((s16)this->copyrightAlpha != 0) {
-        gDPLoadTextureBlock(gfx++, copy_tex, G_IM_FMT_IA, G_IM_SIZ_8b, copy_width, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                            G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(gfx++, COPYRIGHT_TEX, G_IM_FMT_IA, G_IM_SIZ_8b, COPYRIGHT_TEX_WIDTH, 16, 0,
+                            G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
+                            G_TX_NOLOD, G_TX_NOLOD);
 
-        gSPTextureRectangle(gfx++, copy_xl, 792, copy_xh, 856, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+        gSPTextureRectangle(gfx++, COPYRIGHT_TEX_LEFT << 2, 198 << 2, (COPYRIGHT_TEX_LEFT + COPYRIGHT_TEX_WIDTH) << 2,
+                            (198 + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
     }
 
     if (gSaveContext.fileNum == 0xFEDC) {
@@ -758,15 +672,15 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
                           0);
         gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha);
 
-        length = GetCharArraySize(noControllerMsg[lang]);
-        rectLeft = VREG(19) + 1 + ((length - 13) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (noControllerMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 172);
-            if (noControllerMsg[lang][i] == ' ') {
-                rectLeft += VREG(23);
-            } else {
+        if (EnMag_ShouldDrawNoController(font, &gfx, false)) {
+            rectLeft = VREG(19) + 1;
+            for (i = 0; i < ARRAY_COUNT(noControllerFontIndices[sFontType]); i++) {
+                EnMag_DrawCharTexture(&gfx, font->fontBuf + noControllerFontIndices[sFontType][i] * FONT_CHAR_TEX_SIZE,
+                                      rectLeft, YREG(10) + 172);
                 rectLeft += VREG(21);
+                if (i == 1) {
+                    rectLeft += VREG(23);
+                }
             }
         }
 
@@ -774,14 +688,15 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
         gDPPipeSync(gfx++);
         gDPSetPrimColor(gfx++, 0, 0, 100, 255, 255, textAlpha);
 
-        rectLeft = VREG(19) + ((length - 13) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (noControllerMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 171);
-            if (noControllerMsg[lang][i] == ' ') {
-                rectLeft += VREG(23);
-            } else {
+        if (EnMag_ShouldDrawNoController(font, &gfx, true)) {
+            rectLeft = VREG(19);
+            for (i = 0; i < ARRAY_COUNT(noControllerFontIndices[sFontType]); i++) {
+                EnMag_DrawCharTexture(&gfx, font->fontBuf + noControllerFontIndices[sFontType][i] * FONT_CHAR_TEX_SIZE,
+                                      rectLeft, YREG(10) + 171);
                 rectLeft += VREG(21);
+                if (i == 1) {
+                    rectLeft += VREG(23);
+                }
             }
         }
     } else if (this->copyrightAlpha >= 200.0f) {
@@ -797,15 +712,15 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
                           0);
         gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha);
 
-        length = GetCharArraySize(pressStartMsg[lang]);
-        rectLeft = YREG(7) + 1 + ((length - 11) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (pressStartMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 172);
-            if (pressStartMsg[lang][i] == ' ') {
-                rectLeft += YREG(9);
-            } else {
+        if (EnMag_ShouldDrawPressStart(font, &gfx, false)) {
+            rectLeft = YREG(7) + 1;
+            for (i = 0; i < ARRAY_COUNT(pressStartFontIndices[sFontType]); i++) {
+                EnMag_DrawCharTexture(&gfx, font->fontBuf + pressStartFontIndices[sFontType][i] * FONT_CHAR_TEX_SIZE,
+                                      rectLeft, YREG(10) + 172);
                 rectLeft += YREG(8);
+                if (i == 4) {
+                    rectLeft += YREG(9);
+                }
             }
         }
 
@@ -813,14 +728,15 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
         gDPPipeSync(gfx++);
         gDPSetPrimColor(gfx++, 0, 0, YREG(4), YREG(5), YREG(6), textAlpha);
 
-        rectLeft = YREG(7) + ((length - 11) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (pressStartMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 171);
-            if (pressStartMsg[lang][i] == ' ') {
-                rectLeft += YREG(9);
-            } else {
+        if (EnMag_ShouldDrawPressStart(font, &gfx, true)) {
+            rectLeft = YREG(7);
+            for (i = 0; i < ARRAY_COUNT(pressStartFontIndices[sFontType]); i++) {
+                EnMag_DrawCharTexture(&gfx, font->fontBuf + pressStartFontIndices[sFontType][i] * FONT_CHAR_TEX_SIZE,
+                                      rectLeft, YREG(10) + 171);
                 rectLeft += YREG(8);
+                if (i == 4) {
+                    rectLeft += YREG(9);
+                }
             }
         }
     }
@@ -835,216 +751,7 @@ void EnMag_DrawInnerMq(Actor* thisx, PlayState* play, Gfx** gfxp) {
         }
     }
 
-    *gfxp = gfx;
-}
-
-void EnMag_DrawInnerVanilla(Actor* thisx, PlayState* play, Gfx** gfxp) {
-    static s16 textAlpha = 0;
-    static s16 textFadeDirection = 0;
-    static s16 textFadeTimer = 0;
-    static const void* effectMaskTextures[] = {
-        gTitleEffectMask00Tex, gTitleEffectMask01Tex, gTitleEffectMask02Tex,
-        gTitleEffectMask10Tex, gTitleEffectMask11Tex, gTitleEffectMask12Tex,
-        gTitleEffectMask20Tex, gTitleEffectMask21Tex, gTitleEffectMask22Tex,
-    };
-    EnMag* this = (EnMag*)thisx;
-    Font* font = &this->font;
-    s32 pad;
-    Gfx* gfx = *gfxp;
-    u16 i, j, k;
-    u16 rectLeft;
-    u16 rectTop;
-    u16 length;
-    int lang = LANGUAGE_ENG;
-    if (CVarGetInteger(CVAR_SETTING("TitleScreenTranslation"), 0)) {
-        lang = gSaveContext.language;
-    }
-
-    const char* copy_tex = NULL;
-    u16 copy_width;
-    u16 copy_xl;
-    u16 copy_xh;
-    EnMag_SetCopyValues(&copy_tex, &copy_width, &copy_xl, &copy_xh);
-
-    gSPSegment(gfx++, 0x06, play->objectCtx.status[this->actor.objBankIndex].segment);
-
-    Gfx_SetupDL_39Ptr(&gfx);
-
-    this->effectScroll -= 2;
-
-    gDPSetCycleType(gfx++, G_CYC_2CYCLE);
-    gDPSetAlphaCompare(gfx++, G_AC_THRESHOLD);
-    gDPSetRenderMode(gfx++, G_RM_PASS, G_RM_CLD_SURF2);
-    gDPSetCombineLERP(gfx++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, 1, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE,
-                      ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
-
-    gDPSetPrimColor(gfx++, 0, (s16)this->effectPrimLodFrac, (s16)this->effectPrimColor[0],
-                    (s16)this->effectPrimColor[1], (s16)this->effectPrimColor[2], (s16)this->effectAlpha);
-    gDPSetEnvColor(gfx++, (s16)this->effectEnvColor[0], (s16)this->effectEnvColor[1], (s16)this->effectEnvColor[2],
-                   255);
-
-    if ((s16)this->effectPrimLodFrac != 0) {
-        for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) {
-            for (j = 0, rectLeft = 64; j < 3; j++, k++, rectLeft += 64) {
-                EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft,
-                                         rectTop, 64, 64, 1024, 1024, 1, 1, k, this);
-            }
-        }
-    }
-
-    gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
-
-    if ((s16)this->mainAlpha != 0) {
-        EnMag_DrawImageRGBA32(&gfx, 160, 100, (u8*)gTitleZeldaShieldLogoTex, 160, 160);
-    }
-
-    Gfx_SetupDL_39Ptr(&gfx);
-
-    gDPPipeSync(gfx++);
-    gDPSetAlphaCompare(gfx++, G_AC_NONE);
-    gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
-                      ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
-
-    if ((s16)this->mainAlpha < 100) {
-        gDPSetRenderMode(gfx++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
-    } else {
-        gDPSetRenderMode(gfx++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
-    }
-
-    gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha);
-    gDPSetEnvColor(gfx++, 100, 0, 100, 255);
-
-    if ((s16)this->mainAlpha != 0) {
-        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 154, 73, 72, 8, 1024, 1024);
-        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 152, 127, 96, 8, 1024, 1024);
-
-        gDPPipeSync(gfx++);
-        gDPSetPrimColor(gfx++, 0, 0, 200, 200, 150, (s16)this->mainAlpha);
-        gDPSetEnvColor(gfx++, 100, 100, 50, 255);
-
-        EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 153, 72, 72, 8, 1024, 1024);
-        EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 151, 126, 96, 8, 1024, 1024);
-    }
-
-    Gfx_SetupDL_39Ptr(&gfx);
-
-    gDPSetAlphaCompare(gfx++, G_AC_NONE);
-    gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
-
-    if (CVarGetInteger(CVAR_COSMETIC("Title.Copyright.Changed"), 0)) {
-        Color_RGBA8 copyrightColor = CVarGetColor(CVAR_COSMETIC("Title.Copyright.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
-        gDPSetPrimColor(
-            gfx++,
-            0,
-            0,
-            (s16)(((f32)copyrightColor.r / 255.0f) * this->copyrightAlpha),
-            (s16)(((f32)copyrightColor.g / 255.0f) * this->copyrightAlpha),
-            (s16)(((f32)copyrightColor.b / 255.0f) * this->copyrightAlpha),
-            (s16)(((f32)copyrightColor.a / 255.0f) * this->copyrightAlpha)
-        );
-    } else {
-        gDPSetPrimColor(gfx++, 0, 0, (s16)this->copyrightAlpha, (s16)this->copyrightAlpha, (s16)this->copyrightAlpha,
-                        (s16)this->copyrightAlpha);
-    }
-
-    if ((s16)this->copyrightAlpha != 0) {
-        gDPLoadTextureBlock(gfx++, copy_tex, G_IM_FMT_IA, G_IM_SIZ_8b, copy_width, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                            G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-
-        gSPTextureRectangle(gfx++, copy_xl, 792, copy_xh, 856, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
-    }
-
-    if (gSaveContext.fileNum == 0xFEDC) {
-        // Draw "NO CONTROLLER" Text
-        textAlpha = textFadeTimer * 10;
-        if (textAlpha >= 255) {
-            textAlpha = 255;
-        }
-
-        // Text Shadow
-        gDPPipeSync(gfx++);
-        gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
-                          0);
-        gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha);
-
-        length = GetCharArraySize(noControllerMsg[lang]);
-        rectLeft = VREG(19) + 1 + ((length - 13) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (noControllerMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 172);
-            if (noControllerMsg[lang][i] == ' ') {
-                rectLeft += VREG(23);
-            } else {
-                rectLeft += VREG(21);
-            }
-        }
-
-        // Actual Text
-        gDPPipeSync(gfx++);
-        gDPSetPrimColor(gfx++, 0, 0, 100, 255, 255, textAlpha);
-
-        rectLeft = VREG(19) + ((length - 13) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (noControllerMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 171);
-            if (noControllerMsg[lang][i] == ' ') {
-                rectLeft += VREG(23);
-            } else {
-                rectLeft += VREG(21);
-            }
-        }
-    } else if (this->copyrightAlpha >= 200.0f) {
-        // Draw "PRESS START" Text
-        textAlpha = textFadeTimer * 10;
-        if (textAlpha >= 255) {
-            textAlpha = 255;
-        }
-
-        // Text Shadow
-        gDPPipeSync(gfx++);
-        gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
-                          0);
-        gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha);
-
-        length = GetCharArraySize(pressStartMsg[lang]);
-        rectLeft = YREG(7) + 1 + ((length - 11) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (pressStartMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 172);
-            if (pressStartMsg[lang][i] == ' ') {
-                rectLeft += YREG(9);
-            } else {
-                rectLeft += YREG(8);
-            }
-        }
-
-        // Actual Text
-        gDPPipeSync(gfx++);
-        gDPSetPrimColor(gfx++, 0, 0, YREG(4), YREG(5), YREG(6), textAlpha);
-
-        rectLeft = YREG(7) + ((length - 11) * -3);
-        for (i = 0; i < length; i++) {
-            EnMag_DrawCharTexture(&gfx, font->fontBuf + (pressStartMsg[lang][i] - '\x37') * FONT_CHAR_TEX_SIZE,
-                                  rectLeft, YREG(10) + 171);
-            if (pressStartMsg[lang][i] == ' ') {
-                rectLeft += YREG(9);
-            } else {
-                rectLeft += YREG(8);
-            }
-        }
-    }
-
-    if (textFadeDirection != 0) {
-        if (--textFadeTimer == 0) {
-            textFadeDirection = 0;
-        }
-    } else {
-        if (++textFadeTimer >= 26) {
-            textFadeDirection = 1;
-        }
-    }
-
-    *gfxp = gfx;
+    *gfxP = gfx;
 }
 
 void EnMag_Draw(Actor* thisx, PlayState* play) {
@@ -1058,7 +765,7 @@ void EnMag_Draw(Actor* thisx, PlayState* play) {
     gfx = Graph_GfxPlusOne(gfxRef);
     gSPDisplayList(OVERLAY_DISP++, gfx);
 
-    drawInnerFunc(thisx, play, &gfx);
+    EnMag_DrawInner(thisx, play, &gfx);
 
     gSPEndDisplayList(gfx++);
     Graph_BranchDlist(gfxRef, gfx);
diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.h
index c3799502ea..c2abb256dc 100644
--- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.h
+++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.h
@@ -41,7 +41,4 @@ typedef enum {
     /* 0x04 */ MAG_STATE_POST_DISPLAY
 } EnMagGlobalState;
 
-#define dgTitleCopyright1998Tex "__OTR__objects/object_mag/gTitleCopyright1998Tex"
-static const ALIGN_ASSET(2) char gTitleCopyright1998Tex[] = dgTitleCopyright1998Tex;
-
 #endif
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c
index bdd9cb6e8b..78f75dabd5 100644
--- a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c
+++ b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c
@@ -277,8 +277,8 @@ void EnMb_Init(Actor* thisx, PlayState* play) {
 
     switch (this->actor.params) {
         case ENMB_TYPE_SPEAR_GUARD:
-            SkelAnime_InitFlex(play, &this->skelAnime, &gEnMbSpearSkel, &gEnMbSpearStandStillAnim,
-                               this->jointTable, this->morphTable, 28);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gEnMbSpearSkel, &gEnMbSpearStandStillAnim, this->jointTable,
+                               this->morphTable, 28);
             this->actor.colChkInfo.health = 2;
             this->actor.colChkInfo.mass = MASS_HEAVY;
             this->maxHomeDist = 1000.0f;
@@ -303,7 +303,7 @@ void EnMb_Init(Actor* thisx, PlayState* play) {
 
             relYawFromPlayer =
                 this->actor.world.rot.y - Math_Vec3f_Yaw(&this->actor.world.pos, &player->actor.world.pos);
-            if (ABS(relYawFromPlayer) > 0x4000) {
+            if (ABS(relYawFromPlayer) > 0x4000 && !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
                 this->actor.world.rot.y = thisx->world.rot.y + 0x8000;
                 this->actor.shape.rot.y = thisx->world.rot.y;
                 this->actor.world.pos.z = thisx->world.pos.z + 600.0f;
@@ -315,8 +315,8 @@ void EnMb_Init(Actor* thisx, PlayState* play) {
             EnMb_SetupClubWaitPlayerNear(this);
             break;
         default: /* Spear Patrol */
-            SkelAnime_InitFlex(play, &this->skelAnime, &gEnMbSpearSkel, &gEnMbSpearStandStillAnim,
-                               this->jointTable, this->morphTable, 28);
+            SkelAnime_InitFlex(play, &this->skelAnime, &gEnMbSpearSkel, &gEnMbSpearStandStillAnim, this->jointTable,
+                               this->morphTable, 28);
 
             Actor_SetScale(&this->actor, 0.014f);
             this->path = (thisx->params & 0xFF00) >> 8;
@@ -846,12 +846,13 @@ void EnMb_ClubAttack(EnMb* this, PlayState* play) {
     // Rotate Club Moblin towards player in Enemy Randomizer because they're
     // borderline useless otherwise in most scenarios.
     if (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
-        Math_SmoothStepToS(&this->actor.shape.rot.y, relYawTarget[this->attack - 1] + this->actor.world.rot.y, 1, 0x2EE, 0);
+        Math_SmoothStepToS(&this->actor.shape.rot.y, relYawTarget[this->attack - 1] + this->actor.world.rot.y, 1, 0x2EE,
+                           0);
     } else {
         Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 100.0f, 0);
         Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 3, 100.0f, 0);
     }
-    
+
     if (this->attackCollider.base.atFlags & AT_HIT) {
         this->attackCollider.base.atFlags &= ~AT_HIT;
         if (this->attackCollider.base.at == &player->actor) {
@@ -895,8 +896,8 @@ void EnMb_ClubAttack(EnMb* this, PlayState* play) {
             if (!CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
                 Camera_AddQuake(&play->mainCamera, 2, 0x19, 5);
             }
-            func_800358DC(&this->actor, &effSpawnPos, &this->actor.world.rot, flamesParams, 20, flamesUnused, play,
-                          -1, 0);
+            func_800358DC(&this->actor, &effSpawnPos, &this->actor.world.rot, flamesParams, 20, flamesUnused, play, -1,
+                          0);
             EnMb_SetupClubWaitAfterAttack(this);
         }
     } else {
@@ -1126,8 +1127,8 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) {
                 effPos.x = Rand_CenteredFloat(240.0f) + effPosBase.x;
                 effPos.y = Rand_CenteredFloat(15.0f) + (effPosBase.y + 20.0f);
                 effPos.z = Rand_CenteredFloat(240.0f) + effPosBase.z;
-                EffectSsDeadDb_Spawn(play, &effPos, &effZeroVec, &effZeroVec, 230, 7, 255, 255, 255, 255, 0, 255,
-                                     0, 1, 9, true);
+                EffectSsDeadDb_Spawn(play, &effPos, &effZeroVec, &effZeroVec, 230, 7, 255, 255, 255, 255, 0, 255, 0, 1,
+                                     9, true);
             }
         } else {
             Item_DropCollectibleRandom(play, &this->actor, &effPos, 0xC0);
@@ -1280,7 +1281,8 @@ void EnMb_ClubWaitPlayerNear(EnMb* this, PlayState* play) {
         // Without the height check, the Moblin will attack (and play the sound effect) a lot even though
         // the Moblin is very far away from the player in vertical rooms (like the first room in Deku Tree).
         s8 enemyRando = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
-        if (!enemyRando || (enemyRando && this->actor.yDistToPlayer <= 100.0f && this->actor.yDistToPlayer >= -100.0f)) {
+        if (!enemyRando ||
+            (enemyRando && this->actor.yDistToPlayer <= 100.0f && this->actor.yDistToPlayer >= -100.0f)) {
             EnMb_SetupClubAttack(this);
         }
     }
@@ -1361,8 +1363,8 @@ void EnMb_SpearDead(EnMb* this, PlayState* play) {
                 effPos.y = Rand_CenteredFloat(15.0f) + (this->actor.world.pos.y + 20.0f);
                 effPos.z = Rand_CenteredFloat(110.0f) + this->actor.world.pos.z;
 
-                EffectSsDeadDb_Spawn(play, &effPos, &zeroVec, &zeroVec, 100, 7, 255, 255, 255, 255, 0, 255, 0, 1,
-                                     9, true);
+                EffectSsDeadDb_Spawn(play, &effPos, &zeroVec, &zeroVec, 100, 7, 255, 255, 255, 255, 0, 255, 0, 1, 9,
+                                     true);
             }
         } else {
             Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0xE0);
@@ -1597,8 +1599,8 @@ void EnMb_Draw(Actor* thisx, PlayState* play) {
                 scale = 4.0f;
             }
             bodyPartIdx = this->iceEffectTimer >> 2;
-            EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[bodyPartIdx], 150, 150, 150, 250, 235,
-                                           245, 255, scale);
+            EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[bodyPartIdx], 150, 150, 150, 250, 235, 245,
+                                           255, scale);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
index ef03f1fb52..d9a15aae68 100644
--- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -10,7 +10,9 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnMd_Init(Actor* thisx, PlayState* play);
 void EnMd_Destroy(Actor* thisx, PlayState* play);
@@ -485,13 +487,15 @@ s16 func_80AAAF04(PlayState* play, Actor* thisx) {
 
 u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) {
     if (play->sceneNum == SCENE_KOKIRI_FOREST) {
-        if (!Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
+        if (!Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+            !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
             return 1;
         }
     }
 
     if (play->sceneNum == SCENE_MIDOS_HOUSE) {
-        if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) || Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
+        if (Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) ||
+            Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
             if (!LINK_IS_ADULT) {
                 return 1;
             }
@@ -619,16 +623,18 @@ void func_80AAB5A4(EnMd* this, PlayState* play) {
     if (play->sceneNum != SCENE_MIDOS_HOUSE) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), 0) != 0) {
             temp = (GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) &&
-                    !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && (play->sceneNum == SCENE_KOKIRI_FOREST))
+                    !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+                    (play->sceneNum == SCENE_KOKIRI_FOREST))
                        ? 100.0f
                        : 32767.0f;
         } else {
             temp = (GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) &&
-                    !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && (play->sceneNum == SCENE_KOKIRI_FOREST))
+                    !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+                    (play->sceneNum == SCENE_KOKIRI_FOREST))
                        ? 100.0f
                        : 400.0f;
         }
-        
+
         this->alpha = Actor_UpdateAlphaByDistance(&this->actor, play, this->alpha, temp);
         this->actor.shape.shadowAlpha = this->alpha;
     } else {
@@ -662,7 +668,8 @@ void EnMd_Init(Actor* thisx, PlayState* play) {
     if (((play->sceneNum == SCENE_KOKIRI_FOREST) && !Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD)) ||
         ((play->sceneNum == SCENE_KOKIRI_FOREST) && Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
          GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD))) ||
-        ((play->sceneNum == SCENE_LOST_WOODS) && !Flags_GetEventChkInf(EVENTCHKINF_PLAYED_SARIAS_SONG_FOR_MIDO_AS_ADULT))) {
+        ((play->sceneNum == SCENE_LOST_WOODS) &&
+         !Flags_GetEventChkInf(EVENTCHKINF_PLAYED_SARIAS_SONG_FOR_MIDO_AS_ADULT))) {
         this->actor.home.pos = this->actor.world.pos;
         this->actionFunc = func_80AAB948;
         return;
@@ -723,12 +730,13 @@ void func_80AAB948(EnMd* this, PlayState* play) {
         this->skelAnime.playSpeed = CLAMP(temp, 1.0f, 3.0f);
     }
 
-    if (
-        (GameInteractor_Should(VB_MOVE_MIDO_IN_KOKIRI_FOREST, this->interactInfo.talkState == NPC_TALK_STATE_ACTION, this) && play->sceneNum == SCENE_KOKIRI_FOREST) ||
-        this->interactInfo.talkState == NPC_TALK_STATE_ACTION
-    ) {
+    if ((GameInteractor_Should(VB_MOVE_MIDO_IN_KOKIRI_FOREST, this->interactInfo.talkState == NPC_TALK_STATE_ACTION,
+                               this) &&
+         play->sceneNum == SCENE_KOKIRI_FOREST) ||
+        this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
         if (GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) &&
-            !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && (play->sceneNum == SCENE_KOKIRI_FOREST)) {
+            !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+            (play->sceneNum == SCENE_KOKIRI_FOREST)) {
             play->msgCtx.msgMode = MSGMODE_PAUSED;
         }
 
@@ -774,7 +782,8 @@ void func_80AABC10(EnMd* this, PlayState* play) {
         this->actionFunc = func_80AAB948;
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->actor.textId = 0x1067;
         func_8002F2CC(&this->actor, play, this->collider.dim.radius + 30.0f);
 
@@ -794,10 +803,9 @@ void func_80AABD0C(EnMd* this, PlayState* play) {
         return;
     }
 
-    if (
-        GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) &&
-        !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) && (play->sceneNum == SCENE_KOKIRI_FOREST)
-    ) {
+    if (GameInteractor_Should(VB_MIDO_CONSIDER_DEKU_TREE_DEAD, CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) &&
+        !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH) &&
+        (play->sceneNum == SCENE_KOKIRI_FOREST)) {
         Message_CloseTextbox(play);
         Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH);
         Actor_Kill(&this->actor);
@@ -827,8 +835,7 @@ void EnMd_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-s32 EnMd_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnMd_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnMd* this = (EnMd*)thisx;
     Vec3s vec;
 
diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index 56f0e70b2b..9f3c61dc38 100644
--- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -234,9 +234,8 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
             player->actor.textId = this->actor.textId;
             this->actionFunc = func_80AACA40;
         } else {
-            if (GameInteractor_Should(VB_USE_EYEDROP_DIALOGUE, (
-                INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS
-            ), this)) {
+            if (GameInteractor_Should(VB_USE_EYEDROP_DIALOGUE, (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS),
+                                      this)) {
                 player->actor.textId = 0x4032;
                 this->actionFunc = func_80AACA40;
             } else {
@@ -267,7 +266,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
                         Animation_Change(&this->skelAnime, &object_mk_Anim_000368, 1.0f, 0.0f,
                                          Animation_GetLastFrame(&object_mk_Anim_000368), ANIMMODE_ONCE, -4.0f);
                         this->flags &= ~2;
-                        gSaveContext.timer2State = 0;
+                        gSaveContext.subTimerState = 0;
                         Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
                         break;
                     default:
diff --git a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
index 32cc9e3e0f..72b193ea3f 100644
--- a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
+++ b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
@@ -107,14 +107,14 @@ void func_80AAEF70(EnMm2* this, PlayState* play) {
     } else if (Flags_GetInfTable(INFTABLE_17F)) {
         if (gSaveContext.eventInf[1] & 1) {
             this->actor.textId = 0x6082;
-        } else if (gSaveContext.timer2State != 0) {
+        } else if (gSaveContext.subTimerState != 0) {
             this->actor.textId = 0x6076;
         } else if (HIGH_SCORE(HS_MARATHON) == 158) {
             this->actor.textId = 0x607E;
         } else {
             this->actor.textId = 0x6081;
         }
-    } else if (gSaveContext.timer2State) {
+    } else if (gSaveContext.subTimerState) {
         this->actor.textId = 0x6076;
     } else {
         this->actor.textId = 0x607D;
@@ -197,7 +197,7 @@ void func_80AAF330(EnMm2* this, PlayState* play) {
         if (!(this->unk_1F4 & 2)) {
             Message_CloseTextbox(play);
         }
-        gSaveContext.timer2State = 0;
+        gSaveContext.subTimerState = 0;
         gSaveContext.eventInf[1] &= ~1;
     }
 }
@@ -269,15 +269,15 @@ void func_80AAF668(EnMm2* this, PlayState* play) {
     this->actor.world.rot.y = -0x3E80;
     this->actor.shape.rot.y = this->actor.world.rot.y;
     SkelAnime_Update(&this->skelAnime);
-    if (((void)0, gSaveContext.timer2Value) < HIGH_SCORE(HS_MARATHON)) {
+    if (((void)0, gSaveContext.subTimerSeconds) < HIGH_SCORE(HS_MARATHON)) {
         this->actor.textId = 0x6085;
     } else {
         this->actor.textId = 0x6084;
     }
     if (func_80AAF224(this, play, func_80AAF5EC)) {
         this->unk_1F6 = 0;
-        if (((void)0, gSaveContext.timer2Value) < HIGH_SCORE(HS_MARATHON)) {
-            HIGH_SCORE(HS_MARATHON) = gSaveContext.timer2Value;
+        if (((void)0, gSaveContext.subTimerSeconds) < HIGH_SCORE(HS_MARATHON)) {
+            HIGH_SCORE(HS_MARATHON) = gSaveContext.subTimerSeconds;
         }
     } else {
         LOG_HEX("((z_common_data.event_inf[1]) & (0x0001))", gSaveContext.eventInf[1] & 1);
diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
index 0eb63c1a09..014671a745 100644
--- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@@ -130,11 +130,12 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
     } else if (Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
-                if (!GameInteractor_Should(VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE, (gSaveContext.rupees >= sPrices[BEANS_BOUGHT]), this)) {
+                if (!GameInteractor_Should(VB_BE_ELIGIBLE_FOR_MAGIC_BEANS_PURCHASE,
+                                           (gSaveContext.rupees >= sPrices[BEANS_BOUGHT]), this)) {
                     Message_ContinueTextbox(play, 0x4069); // not enough rupees text
                     return;
                 }
-    
+
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
                     Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
                     this->actionFunc = EnMs_Sell;
@@ -177,7 +178,8 @@ void EnMs_Update(Actor* thisx, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     this->actionFunc(this, play);
 
-    if (gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_ENTRANCE && gSaveContext.sceneSetupIndex == 8) { // ride carpet if in credits
+    if (gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_ENTRANCE &&
+        gSaveContext.sceneSetupIndex == 8) { // ride carpet if in credits
         Actor_MoveXZGravity(&this->actor);
         osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y);
         Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, 4);
diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 36e9fbd8b7..5acfe5a80b 100644
--- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -146,7 +146,7 @@ void EnNb_UpdateCollider(EnNb* this, PlayState* play) {
 
 void EnNb_Destroy(Actor* thisx, PlayState* play) {
     EnNb* this = (EnNb*)thisx;
-    
+
     D_80AB4318 = 0;
     Collider_DestroyCylinder(play, &this->collider);
 
@@ -316,8 +316,7 @@ void EnNb_SpawnBlueWarp(EnNb* this, PlayState* play) {
     f32 posY = this->actor.world.pos.y;
     f32 posZ = this->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0,
-                       WARP_SAGES);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES);
 }
 
 void EnNb_GiveMedallion(EnNb* this, PlayState* play) {
@@ -326,8 +325,7 @@ void EnNb_GiveMedallion(EnNb* this, PlayState* play) {
     f32 posY = player->actor.world.pos.y + 50.0f;
     f32 posZ = player->actor.world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0,
-                       0xC);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0xC);
     if (GameInteractor_Should(VB_GIVE_ITEM_SPIRIT_MEDALLION, true)) {
         Item_Give(play, ITEM_MEDALLION_SPIRIT);
     }
@@ -562,8 +560,8 @@ void EnNb_DrawTransparency(EnNb* this, PlayState* play) {
     gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTex));
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
     gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
-                                       NULL, NULL, NULL, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL,
+                                       NULL, NULL, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -596,8 +594,8 @@ void EnNb_SetPosInPortal(EnNb* this, PlayState* play) {
     Vec3f endPos;
 
     if (csCmdNPCAction != NULL) {
-        f0 = Environment_LerpWeightAccelDecel(csCmdNPCAction->endFrame, csCmdNPCAction->startFrame,
-                                              play->csCtx.frames, 4, 4);
+        f0 = Environment_LerpWeightAccelDecel(csCmdNPCAction->endFrame, csCmdNPCAction->startFrame, play->csCtx.frames,
+                                              4, 4);
         startPos.x = csCmdNPCAction->startPos.x;
         startPos.y = csCmdNPCAction->startPos.y;
         startPos.z = csCmdNPCAction->startPos.z;
@@ -745,7 +743,7 @@ void EnNb_InitDemo6KInConfrontation(EnNb* this, PlayState* play) {
 }
 
 void func_80AB2688(EnNb* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
@@ -1434,8 +1432,7 @@ void EnNb_Init(Actor* thisx, PlayState* play) {
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     EnNb_SetupCollider(thisx, play);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gNabooruSkel, NULL, this->jointTable, this->morphTable,
-                       NB_LIMB_MAX);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gNabooruSkel, NULL, this->jointTable, this->morphTable, NB_LIMB_MAX);
 
     switch (EnNb_GetType(this)) {
         case NB_TYPE_DEMO02:
diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
index 8b88abac51..c258182d5c 100644
--- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -359,8 +359,8 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) {
         attackCuccoPos.x = ((Rand_ZeroOne() - 0.5f) * viewX) + play->view.eye.x;
         attackCuccoPos.y = Rand_CenteredFloat(0.3f) + ((play->view.eye.y + 50.0f) + (viewY * 0.5f));
         attackCuccoPos.z = ((Rand_ZeroOne() - 0.5f) * viewZ) + play->view.eye.z;
-        attackCucco = Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ATTACK_NIW,
-                                         attackCuccoPos.x, attackCuccoPos.y, attackCuccoPos.z, 0, 0, 0, 0);
+        attackCucco = Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_ATTACK_NIW, attackCuccoPos.x,
+                                         attackCuccoPos.y, attackCuccoPos.z, 0, 0, 0, 0);
 
         if (attackCucco != NULL) {
             this->unk_296++;
@@ -1222,8 +1222,7 @@ void EnNiw_FeatherDraw(EnNiw* this, PlayState* play) {
             Matrix_Scale(feather->scale, feather->scale, 1.0f, MTXMODE_APPLY);
             Matrix_RotateZ(feather->unk_30, MTXMODE_APPLY);
             Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherModelDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
index a070813ca0..84da935d67 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
@@ -60,8 +60,7 @@ void EnNiwGirl_Init(Actor* thisx, PlayState* play) {
     Vec3f vec2;
     s32 pad2;
 
-    SkelAnime_InitFlex(play, &this->skelAnime, &gNiwGirlSkel, &gNiwGirlRunAnim, this->jointTable, this->morphTable,
-                       17);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gNiwGirlSkel, &gNiwGirlRunAnim, this->jointTable, this->morphTable, 17);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     this->actor.targetMode = 6;
@@ -233,8 +232,7 @@ void EnNiwGirl_Update(Actor* thisx, PlayState* play) {
     CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
 }
 
-s32 EnNiwGirlOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                              void* thisx) {
+s32 EnNiwGirlOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnNiwGirl* this = (EnNiwGirl*)thisx;
 
     if (limbIndex == 3) {
diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 59f2cafc6d..69cc15aeda 100644
--- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -233,8 +233,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
         this->cuccosInPen = BREG(7) - 1;
     }
     phi_s1 = this->cuccosInPen;
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) ||
-        (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
         this->unk_26E = 101;
     }
     if (this->cuccosInPen >= 7) {
@@ -325,7 +324,6 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
 
             this->actionFunc = func_80ABAC00;
             return;
-
         }
         if (this->unk_26C == 1) {
             this->getItemId = GI_RUPEE_PURPLE;
@@ -374,8 +372,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     s8 playerExchangeItemId;
 
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) ||
-        (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
         this->unk_26E = 11;
     }
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
@@ -499,8 +496,7 @@ void func_80ABAD7C(EnNiwLady* this, PlayState* play) {
     if (Text_GetFaceReaction(play, 8) != 0) {
         this->actor.textId = Text_GetFaceReaction(play, 8);
     }
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) ||
-        (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) || (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE)) {
         this->unk_26E = 8;
     }
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
@@ -570,8 +566,7 @@ Gfx* func_80ABB0A0(GraphicsContext* gfxCtx) {
     return dList;
 }
 
-s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnNiwLady* this = (EnNiwLady*)thisx;
     s32 pad;
 
diff --git a/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
index 4bdedbb7e1..cf70efe9f8 100644
--- a/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
+++ b/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
@@ -156,7 +156,9 @@ void EnNutsball_Update(Actor* thisx, PlayState* play) {
     Player* player = GET_PLAYER(play);
     s32 pad;
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == func_80ABBB34)) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) ||
+        (this->actionFunc == func_80ABBB34)) {
         this->actionFunc(this, play);
 
         Actor_MoveXZGravity(&this->actor);
@@ -179,21 +181,18 @@ void EnNutsball_Draw(Actor* thisx, PlayState* play) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0) != 0) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         gSPSegment(POLY_OPA_DISP++, 0x08,
-                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6),
-                                    1 * (play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 6),
-                                    1 * (play->state.frames * 6), 32, 32));
-        Matrix_Scale(25.0f,25.0f,25.0f,MTXMODE_APPLY);
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6), 1 * (play->state.frames * 6),
+                                    32, 32, 1, 1 * (play->state.frames * 6), 1 * (play->state.frames * 6), 32, 32));
+        Matrix_Scale(25.0f, 25.0f, 25.0f, MTXMODE_APPLY);
         Matrix_RotateX(thisx->home.rot.z * 9.58738e-05f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_OPA_DISP++, sDListsNew[thisx->params]);
     } else {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
-        
+
         Matrix_RotateZ(thisx->home.rot.z * 9.58738e-05f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                G_MTX_MODELVIEW | G_MTX_LOAD);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params]);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
index fb430cbbfd..bfc10a6d73 100644
--- a/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
+++ b/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
@@ -198,8 +198,7 @@ void EnNwc_DrawChicks(EnNwc* this, PlayState* play) {
             Matrix_Put(&floorMat);
             Matrix_RotateY(chick->rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
             Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gCuccoChickShadowDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c
index 0a1f281365..1684e63bd5 100644
--- a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c
+++ b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c
@@ -425,8 +425,8 @@ void EnNy_SetupDie(EnNy* this, PlayState* play) {
                 effectPos.y = Rand_CenteredFloat(30.0f) + this->actor.world.pos.y;
                 effectPos.z = Rand_CenteredFloat(30.0f) + this->actor.world.pos.z;
                 effectScale = Rand_S16Offset(0x50, 0x64);
-                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale,
-                                                   25, 0, 1);
+                EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale, 25, 0,
+                                                   1);
             }
             for (i = 0; i < 0x14; i++) {
                 effectPos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x;
@@ -532,8 +532,7 @@ void EnNy_Draw(Actor* thisx, PlayState* play) {
     Collider_UpdateSpheres(0, &this->collider);
     func_8002ED80(&this->actor, play, 1);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_1D8);
@@ -546,8 +545,7 @@ void EnNy_Draw(Actor* thisx, PlayState* play) {
         Matrix_Scale(this->unk_1E0, this->unk_1E0, this->unk_1E0, MTXMODE_APPLY);
         func_8002EBCC(&this->actor, play, 1);
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gEnNySpikeDL);
     }
     CLOSE_DISPS(play->state.gfxCtx);
@@ -586,8 +584,7 @@ void EnNy_DrawDeathEffect(Actor* thisx, PlayState* play) {
             Matrix_Translate(temp->x, temp->y, temp->z, MTXMODE_NEW);
             scale = this->actor.scale.x * 0.4f * (1.0f + (i * 0.04f));
             Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gEnNyRockBodyDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
index 5bde1af543..89ef1b7819 100644
--- a/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
+++ b/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
@@ -58,7 +58,7 @@ void EnOkarinaEffect_Init(Actor* thisx, PlayState* play) {
 }
 
 void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, PlayState* play) {
-    this->timer = 400;                   // 20 seconds
+    this->timer = 400;              // 20 seconds
     play->envCtx.unk_F2[0] = 20;    // rain intensity target
     play->envCtx.gloomySkyMode = 1; // start gloomy sky
     if ((gWeatherMode != 0) || play->envCtx.unk_17 != 0) {
@@ -81,7 +81,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) {
         osSyncPrintf("\nthis->timer=[%d]", this->timer);
         if (this->timer == 308) {
             osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans"
-            Flags_SetEnv(play, 5);                   // set storms env flag
+            Flags_SetEnv(play, 5);                        // set storms env flag
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index 10f6a52077..3dee59f276 100644
--- a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -154,7 +154,8 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) {
             if (play->sceneNum == SCENE_WATER_TEMPLE) {
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
             }
-            if ((play->sceneNum != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) && (play->sceneNum != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS)) {
+            if ((play->sceneNum != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) &&
+                (play->sceneNum != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS)) {
                 play->msgCtx.ocarinaMode = OCARINA_MODE_04;
             }
             Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
@@ -162,12 +163,9 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) {
             return;
         }
         if (this->unk_158 != 0) {
-            if ((play->msgCtx.ocarinaMode == OCARINA_MODE_05) ||
-                (play->msgCtx.ocarinaMode == OCARINA_MODE_06) ||
-                (play->msgCtx.ocarinaMode == OCARINA_MODE_07) ||
-                (play->msgCtx.ocarinaMode == OCARINA_MODE_08) ||
-                (play->msgCtx.ocarinaMode == OCARINA_MODE_09) ||
-                (play->msgCtx.ocarinaMode == OCARINA_MODE_0A) ||
+            if ((play->msgCtx.ocarinaMode == OCARINA_MODE_05) || (play->msgCtx.ocarinaMode == OCARINA_MODE_06) ||
+                (play->msgCtx.ocarinaMode == OCARINA_MODE_07) || (play->msgCtx.ocarinaMode == OCARINA_MODE_08) ||
+                (play->msgCtx.ocarinaMode == OCARINA_MODE_09) || (play->msgCtx.ocarinaMode == OCARINA_MODE_0A) ||
                 (play->msgCtx.ocarinaMode == OCARINA_MODE_0D)) {
                 if (this->switchFlag >= 0) {
                     Flags_SetSwitch(play, this->switchFlag);
@@ -194,7 +192,9 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) {
     if ((this->ocarinaSong != 6) || (gSaveContext.scarecrowSpawnSongSet)) {
         if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) {
             this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
-        } else if (((this->type != 4) || GameInteractor_Should(VB_BE_ELIGIBLE_TO_OPEN_DOT, !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME), this)) &&
+        } else if (((this->type != 4) ||
+                    GameInteractor_Should(VB_BE_ELIGIBLE_TO_OPEN_DOT,
+                                          !Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME), this)) &&
                    ((this->type != 6) || !Flags_GetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB)) &&
                    (this->actor.xzDistToPlayer < (90.0f + this->interactRange)) &&
                    (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) {
@@ -261,7 +261,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
             case 6: // Royal Family Tomb
                 if (GameInteractor_Should(VB_PLAY_ROYAL_FAMILY_TOMB_CS, true, this)) {
                     play->csCtx.segment = LINK_IS_ADULT ? SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_003C80)
-                                                             : SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_005020);
+                                                        : SEGMENTED_TO_VIRTUAL(&spot02_scene_Cs_005020);
                     gSaveContext.cutsceneTrigger = 1;
                 }
                 Flags_SetEventChkInf(EVENTCHKINF_DESTROYED_ROYAL_FAMILY_TOMB);
diff --git a/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
index a01ceb3500..279bc68343 100644
--- a/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+++ b/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
@@ -128,8 +128,8 @@ void EnOkuta_Init(Actor* thisx, PlayState* play) {
     this->numShots = (thisx->params >> 8) & 0xFF;
     thisx->params &= 0xFF;
     if (thisx->params == 0) {
-        SkelAnime_Init(play, &this->skelAnime, &gOctorokSkel, &gOctorokAppearAnim, this->jointTable,
-                       this->morphTable, 38);
+        SkelAnime_Init(play, &this->skelAnime, &gOctorokSkel, &gOctorokAppearAnim, this->jointTable, this->morphTable,
+                       38);
         Collider_InitCylinder(play, &this->collider);
         Collider_SetCylinder(play, &this->collider, thisx, &sOctorockColliderInit);
         CollisionCheck_SetInfo(&thisx->colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -545,7 +545,8 @@ void EnOkuta_ProjectileFly(EnOkuta* this, PlayState* play) {
                         gravity = -320;
                     }
                     EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, gravity, phi_v0, 30, 5, 0,
-                                        sEffectScales[i]/5, 3, 0, 70, 1, OBJECT_GAMEPLAY_FIELD_KEEP, gSilverRockFragmentsDL);
+                                         sEffectScales[i] / 5, 3, 0, 70, 1, OBJECT_GAMEPLAY_FIELD_KEEP,
+                                         gSilverRockFragmentsDL);
                 }
             } else {
                 EffectSsHahen_SpawnBurst(play, &pos, 6.0f, 0, 1, 2, 15, 7, 10, gOctorokProjectileDL);
@@ -630,11 +631,12 @@ void EnOkuta_Update(Actor* thisx, PlayState* play2) {
     Vec3f sp38;
     s32 sp34;
 
-    if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
+    if (!(player->stateFlags1 &
+          (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
         if (this->actor.params == 0) {
             EnOkuta_ColliderCheck(this, play);
-            if (!WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x,
-                                         this->actor.world.pos.z, &ySurface, &outWaterBox) ||
+            if (!WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
+                                         &ySurface, &outWaterBox) ||
                 (ySurface < this->actor.floorHeight)) {
                 if (this->actor.colChkInfo.health != 0) {
                     Actor_Kill(&this->actor);
@@ -728,8 +730,7 @@ s32 EnOkuta_GetSnoutScale(EnOkuta* this, f32 curFrame, Vec3f* scale) {
     return true;
 }
 
-s32 EnOkuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 EnOkuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnOkuta* this = (EnOkuta*)thisx;
     f32 curFrame = this->skelAnime.curFrame;
     Vec3f scale;
@@ -759,27 +760,24 @@ void EnOkuta_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
     if (this->actor.params == 0) {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnOkuta_OverrideLimbDraw,
-                          NULL, this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnOkuta_OverrideLimbDraw, NULL, this);
     } else {
         OPEN_DISPS(play->state.gfxCtx);
 
         if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0) != 0) {
             Gfx_SetupDL_25Opa(play->state.gfxCtx);
             gSPSegment(POLY_OPA_DISP++, 0x08,
-                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6),
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 1 * (play->state.frames * 6),
                                         1 * (play->state.frames * 6), 32, 32, 1, 1 * (play->state.frames * 6),
                                         1 * (play->state.frames * 6), 32, 32));
-            Matrix_Scale(7.0f,7.0f,7.0f,MTXMODE_APPLY);
+            Matrix_Scale(7.0f, 7.0f, 7.0f, MTXMODE_APPLY);
             Matrix_RotateX(thisx->home.rot.z * (M_PI / 0x8000), MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_MODELVIEW | G_MTX_LOAD);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
             gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL);
         } else {
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
             Matrix_RotateZ(this->actor.home.rot.z * (M_PI / 0x8000), MTXMODE_APPLY);
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                    G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gOctorokProjectileDL);
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index bcb3ed4498..d78daafe45 100644
--- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -474,11 +474,11 @@ void EnOssan_UpdateShopOfferings(EnOssan* this, PlayState* play) {
 
                 if (params >= 0) {
                     this->shelfSlots[i] = (EnGirlA*)Actor_Spawn(
-                        &play->actorCtx, play, ACTOR_EN_GIRLA,
-                        this->shelves->actor.world.pos.x + shopItem->xOffset,
+                        &play->actorCtx, play, ACTOR_EN_GIRLA, this->shelves->actor.world.pos.x + shopItem->xOffset,
                         this->shelves->actor.world.pos.y + shopItem->yOffset,
                         this->shelves->actor.world.pos.z + shopItem->zOffset, this->shelves->actor.shape.rot.x,
-                        this->shelves->actor.shape.rot.y + sItemShelfRot[i], this->shelves->actor.shape.rot.z, params, true);
+                        this->shelves->actor.shape.rot.y + sItemShelfRot[i], this->shelves->actor.shape.rot.z, params,
+                        true);
                 }
             }
         }
@@ -607,9 +607,10 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
     }
 
     // If you haven't given Zelda's Letter to the Kakariko Guard
-    // or are rando'd and haven't gotten gotten the letter from zelda yet 
-    if (this->actor.params == OSSAN_TYPE_MASK && (!Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD) || 
-        (IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)))) {
+    // or are rando'd and haven't gotten gotten the letter from zelda yet
+    if (this->actor.params == OSSAN_TYPE_MASK &&
+        (!Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD) ||
+         (IS_RANDO && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)))) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -621,7 +622,8 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
 
     // Don't kill bombchu shop actor in rando, making it so the shop is immediately open
     // Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) - Completed Dodongo's Cavern
-    if (this->actor.params == OSSAN_TYPE_BOMBCHUS && !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && !IS_RANDO) {
+    if (this->actor.params == OSSAN_TYPE_BOMBCHUS &&
+        !Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && !IS_RANDO) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -918,8 +920,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla
     u8 dialogState = Message_GetState(&play->msgCtx);
 
     if (this->actor.params == OSSAN_TYPE_MASK && dialogState == TEXT_STATE_CHOICE) {
-        if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0]) &&
-            Message_ShouldAdvance(play)) {
+        if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0]) && Message_ShouldAdvance(play)) {
             switch (play->msgCtx.choiceIndex) {
                 case 0:
                     EnOssan_StartShopping(play, this);
@@ -1007,7 +1008,8 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play
                 Interface_SetDoAction(play, DO_ACTION_DECIDE);
                 this->stickLeftPrompt.isEnabled = false;
                 Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
-                GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice);
+                GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex,
+                                                            this->shelfSlots[this->cursorIndex]->basePrice);
             }
         } else if ((this->stickAccumX > 0) || (dpad && CHECK_BTN_ALL(input->press.button, dRight))) {
             nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0);
@@ -1017,7 +1019,8 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play
                 Interface_SetDoAction(play, DO_ACTION_DECIDE);
                 this->stickRightPrompt.isEnabled = false;
                 Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
-                GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice);
+                GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex,
+                                                            this->shelfSlots[this->cursorIndex]->basePrice);
             }
         }
     }
@@ -1264,7 +1267,8 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe
                 }
             }
         } else {
-            if ((this->stickAccumX > 0 && this->stickAccumX > 500) || (dpad && CHECK_BTN_ALL(input->press.button, dRight))) {
+            if ((this->stickAccumX > 0 && this->stickAccumX > 500) ||
+                (dpad && CHECK_BTN_ALL(input->press.button, dRight))) {
                 c = EnOssan_CursorRight(this, this->cursorIndex, 4);
                 if (c != CURSOR_INVALID) {
                     this->cursorIndex = c;
@@ -1272,7 +1276,8 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe
                     EnOssan_SetLookToShopkeeperFromShelf(play, this);
                     return;
                 }
-            } else if ((this->stickAccumX < 0 && this->stickAccumX < -500) || (dpad && CHECK_BTN_ALL(input->press.button, dLeft))) {
+            } else if ((this->stickAccumX < 0 && this->stickAccumX < -500) ||
+                       (dpad && CHECK_BTN_ALL(input->press.button, dLeft))) {
                 d = EnOssan_CursorLeft(this, this->cursorIndex, 8);
                 if (d != CURSOR_INVALID) {
                     this->cursorIndex = d;
@@ -1281,7 +1286,8 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe
         }
         EnOssan_CursorUpDown(this, play);
         if (this->cursorIndex != prevIndex) {
-            GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice);
+            GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex,
+                                                        this->shelfSlots[this->cursorIndex]->basePrice);
             Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId);
             Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
         }
@@ -1334,7 +1340,8 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play
                 }
             }
         } else {
-            if ((this->stickAccumX < 0 && this->stickAccumX < -500) || (dpad && CHECK_BTN_ALL(input->press.button, dLeft))) {
+            if ((this->stickAccumX < 0 && this->stickAccumX < -500) ||
+                (dpad && CHECK_BTN_ALL(input->press.button, dLeft))) {
                 nextIndex = EnOssan_CursorRight(this, this->cursorIndex, 0);
                 if (nextIndex != CURSOR_INVALID) {
                     this->cursorIndex = nextIndex;
@@ -1342,7 +1349,8 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play
                     EnOssan_SetLookToShopkeeperFromShelf(play, this);
                     return;
                 }
-            } else if ((this->stickAccumX > 0 && this->stickAccumX > 500) || (dpad && CHECK_BTN_ALL(input->press.button, dRight))) {
+            } else if ((this->stickAccumX > 0 && this->stickAccumX > 500) ||
+                       (dpad && CHECK_BTN_ALL(input->press.button, dRight))) {
                 nextIndex = EnOssan_CursorLeft(this, this->cursorIndex, 4);
                 if (nextIndex != CURSOR_INVALID) {
                     this->cursorIndex = nextIndex;
@@ -1351,7 +1359,8 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play
         }
         EnOssan_CursorUpDown(this, play);
         if (this->cursorIndex != prevIndex) {
-            GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice);
+            GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex,
+                                                        this->shelfSlots[this->cursorIndex]->basePrice);
             Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId);
             Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
         }
@@ -1416,7 +1425,8 @@ void EnOssan_HandleCanBuyItem(PlayState* play, EnOssan* this) {
 
     switch (selectedItem->canBuyFunc(play, selectedItem)) {
         case CANBUY_RESULT_SUCCESS_FANFARE:
-            if (selectedItem->actor.params == SI_HYLIAN_SHIELD && Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) {
+            if (selectedItem->actor.params == SI_HYLIAN_SHIELD &&
+                Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) {
                 EnOssan_SetStateGiveDiscountDialog(play, this);
             } else {
                 EnOssan_GiveItemWithFanfare(play, this);
@@ -1660,8 +1670,7 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, PlayState* play, Player* player
             this->stateFlag = this->tempStateFlag;
             Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId);
         }
-    } else if (talkState == TEXT_STATE_CHOICE &&
-               !EnOssan_TestCancelOption(this, play, &play->state.input[0]) &&
+    } else if (talkState == TEXT_STATE_CHOICE && !EnOssan_TestCancelOption(this, play, &play->state.input[0]) &&
                Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case 0:
@@ -2310,8 +2319,8 @@ void EnOssan_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-s32 EnOssan_OverrideLimbDrawDefaultShopkeeper(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos,
-                                              Vec3s* rot, void* thisx) {
+s32 EnOssan_OverrideLimbDrawDefaultShopkeeper(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                              void* thisx) {
     EnOssan* this = (EnOssan*)thisx;
 
     if (limbIndex == 8) {
@@ -2343,8 +2352,8 @@ void EnOssan_DrawCursor(PlayState* play, EnOssan* this, f32 x, f32 y, f32 z, u8
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void EnOssan_DrawTextRec(PlayState* play, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t,
-                         f32 dx, f32 dy) {
+void EnOssan_DrawTextRec(PlayState* play, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t, f32 dx,
+                         f32 dy) {
     f32 unk;
     s32 ulx, uly, lrx, lry;
     f32 w, h;
@@ -2432,8 +2441,8 @@ void EnOssan_DrawBazaarShopkeeper(Actor* thisx, PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos,
-                                             Vec3s* rot, void* thisx) {
+s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                             void* thisx) {
     static void* sKokiriShopkeeperEyeTextures[] = {
         gKokiriShopkeeperEyeDefaultTex,
         gKokiriShopkeeperEyeHalfTex,
@@ -2490,7 +2499,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 EnGo2_OverrideLimbDrawGoronShopkeeper (PlayState* play, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+s32 EnGo2_OverrideLimbDrawGoronShopkeeper(PlayState* play, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnOssan* this = (EnOssan*)thisx;
 
     if (limb == 17) {
diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 7701f9a2cc..0d848e01f5 100644
--- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -118,10 +118,9 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawCircle, 36.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gOwlFlyingSkel, &gOwlFlyAnim, this->jointTable, this->morphTable,
-                       21);
-    SkelAnime_InitFlex(play, &this->skelAnime2, &gOwlPerchingSkel, &gOwlPerchAnim, this->jointTable2,
-                       this->morphTable2, 16);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gOwlFlyingSkel, &gOwlFlyAnim, this->jointTable, this->morphTable, 21);
+    SkelAnime_InitFlex(play, &this->skelAnime2, &gOwlPerchingSkel, &gOwlPerchAnim, this->jointTable2, this->morphTable2,
+                       16);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sOwlCylinderInit);
     this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -187,7 +186,8 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = EnOwl_WaitLakeHylia;
             break;
         case OWL_ZORA_RIVER:
-            if ((Flags_GetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN)) || !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
+            if ((Flags_GetEventChkInf(EVENTCHKINF_OPENED_ZORAS_DOMAIN)) ||
+                !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
                 // opened zora's domain or has zelda's letter
                 osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
@@ -374,9 +374,7 @@ void func_80ACA7E0(EnOwl* this, PlayState* play) {
 
 void EnOwl_ConfirmKokiriMessage(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x2065);
                 break;
@@ -404,8 +402,7 @@ void EnOwl_WaitOutsideKokiri(EnOwl* this, PlayState* play) {
 void func_80ACA998(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
         // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x2069);
                 this->actionFunc = func_80ACAA54;
@@ -449,9 +446,7 @@ void EnOwl_WaitHyruleCastle(EnOwl* this, PlayState* play) {
 
 void func_80ACAB88(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 // obtained zelda's letter
                 if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
@@ -492,9 +487,7 @@ void EnOwl_WaitKakariko(EnOwl* this, PlayState* play) {
 
 void func_80ACAD34(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x206F);
                 this->actionFunc = func_80ACADF0;
@@ -530,9 +523,7 @@ void EnOwl_WaitGerudo(EnOwl* this, PlayState* play) {
 
 void func_80ACAEB8(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x2071);
                 this->actionFunc = func_80ACAF74;
@@ -652,9 +643,7 @@ void EnOwl_WaitDeathMountainShortcut(EnOwl* this, PlayState* play) {
 
 void func_80ACB344(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x607A);
                 break;
@@ -677,9 +666,7 @@ void func_80ACB3E0(EnOwl* this, PlayState* play) {
 
 void func_80ACB440(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x10C1);
                 this->actionFunc = func_80ACB4FC;
@@ -714,9 +701,7 @@ void EnOwl_WaitLWPreSaria(EnOwl* this, PlayState* play) {
 
 void func_80ACB5C4(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
-        // swap the order of the responses if better owl is enabled
-        uint8_t index = CVarGetInteger(CVAR_ENHANCEMENT("BetterOwl"), 0) == 0 ? play->msgCtx.choiceIndex : (1 - play->msgCtx.choiceIndex);
-        switch (index) {
+        switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
                 Message_ContinueTextbox(play, 0x10C5);
                 this->actionFunc = func_80ACB680;
@@ -769,8 +754,7 @@ void func_80ACB748(EnOwl* this, PlayState* play) {
     switch (owlType) {
         case 7:
             func_800F436C(&D_80ACD62C, NA_SE_EV_FLYING_AIR - SFX_FLAG, weight * 2.0f);
-            if ((play->csCtx.frames > 324) ||
-                ((play->csCtx.frames >= 142 && (play->csCtx.frames <= 266)))) {
+            if ((play->csCtx.frames > 324) || ((play->csCtx.frames >= 142 && (play->csCtx.frames <= 266)))) {
                 func_800F4414(&D_80ACD62C, NA_SE_EN_OWL_FLUTTER, weight * 2.0f);
             }
             if (play->csCtx.frames == 85) {
@@ -780,8 +764,7 @@ void func_80ACB748(EnOwl* this, PlayState* play) {
         case 8:
         case 9:
             func_800F436C(&D_80ACD62C, NA_SE_EV_FLYING_AIR - SFX_FLAG, weight * 2.0f);
-            if ((play->csCtx.frames >= 420) ||
-                ((0xC1 < play->csCtx.frames && (play->csCtx.frames <= 280)))) {
+            if ((play->csCtx.frames >= 420) || ((0xC1 < play->csCtx.frames && (play->csCtx.frames <= 280)))) {
                 func_800F4414(&D_80ACD62C, NA_SE_EN_OWL_FLUTTER, weight * 2.0f);
             }
             if (play->csCtx.frames == 217) {
@@ -1391,8 +1374,8 @@ void func_80ACD130(EnOwl* this, PlayState* play, s32 idx) {
 }
 
 f32 func_80ACD1C4(PlayState* play, s32 idx) {
-    f32 ret = Environment_LerpWeight(play->csCtx.npcActions[idx]->endFrame,
-                                     play->csCtx.npcActions[idx]->startFrame, play->csCtx.frames);
+    f32 ret = Environment_LerpWeight(play->csCtx.npcActions[idx]->endFrame, play->csCtx.npcActions[idx]->startFrame,
+                                     play->csCtx.frames);
 
     ret = CLAMP_MAX(ret, 1.0f);
     return ret;
diff --git a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
index 0a91e0e882..599aa39c15 100644
--- a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
+++ b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
@@ -142,8 +142,8 @@ void func_80ACE13C(EnPart* this, PlayState* play) {
                             Rand_CenteredFloat(50.0f);
                     pos.z = this->actor.world.pos.z + Rand_CenteredFloat(60.0f);
                     velocity.y = Rand_ZeroOne() + 1.0f;
-                    EffectSsDtBubble_SpawnColorProfile(play, &pos, &velocity, &accel, Rand_S16Offset(80, 100), 25,
-                                                       0, true);
+                    EffectSsDtBubble_SpawnColorProfile(play, &pos, &velocity, &accel, Rand_S16Offset(80, 100), 25, 0,
+                                                       true);
                 }
                 break;
             case 5:
@@ -154,8 +154,8 @@ void func_80ACE13C(EnPart* this, PlayState* play) {
                     pos.x = this->actor.world.pos.x + Rand_CenteredFloat(25.0f);
                     pos.y = this->actor.world.pos.y + Rand_CenteredFloat(40.0f);
                     pos.z = this->actor.world.pos.z + Rand_CenteredFloat(25.0f);
-                    EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 0, 0, 255, 1,
-                                         9, true);
+                    EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 0, 0, 255, 1, 9,
+                                         true);
                 }
                 break;
         }
@@ -211,8 +211,8 @@ void func_80ACE7E8(EnPart* this, PlayState* play) {
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
 
     if ((this->actor.parent == NULL) || (this->actor.parent->update == NULL)) {
-        EffectSsDeadDb_Spawn(play, &this->actor.world.pos, &zeroVec, &zeroVec,
-                             (s16)(this->actor.scale.y * 100.0f) * 40, 7, 255, 255, 255, 255, 0, 255, 0, 1, 9, true);
+        EffectSsDeadDb_Spawn(play, &this->actor.world.pos, &zeroVec, &zeroVec, (s16)(this->actor.scale.y * 100.0f) * 40,
+                             7, 255, 255, 255, 255, 0, 255, 0, 1, 9, true);
         Actor_Kill(&this->actor);
         return;
     }
@@ -299,19 +299,24 @@ void EnPart_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x08, func_80ACEAC0(play->state.gfxCtx, 255, 255, 255, 180, 180, 180));
         gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(play->state.gfxCtx, 225, 205, 115, 25, 20, 0));
         gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(play->state.gfxCtx, 225, 205, 115, 25, 20, 0));
-    } else if ((thisx->params == 9) && (strcmp((const char*)this->displayList, object_tite_DL_002FF0) == 0)) {
+        // #region SOH [Port] DL references are stored as resource paths so we need to use string comparison to check
+        // for equality. Additionally, we added a fallback for checking the parent actor ID to account for mods the
+        // override the Tektite skelton
+    } else if ((thisx->params == 9) && ((strcmp((const char*)this->displayList, object_tite_DL_002FF0) == 0) ||
+                                        (thisx->parent != NULL && thisx->parent->id == ACTOR_EN_TITE))) {
         gSPSegment(POLY_OPA_DISP++, 0x08, object_tite_Tex_001300);
         gSPSegment(POLY_OPA_DISP++, 0x09, object_tite_Tex_001700);
         gSPSegment(POLY_OPA_DISP++, 0x0A, object_tite_Tex_001900);
-    } else if ((thisx->params == 10) && (strcmp((const char*)this->displayList, object_tite_DL_002FF0) == 0)) {
+    } else if ((thisx->params == 10) && ((strcmp((const char*)this->displayList, object_tite_DL_002FF0) == 0) ||
+                                         (thisx->parent != NULL && thisx->parent->id == ACTOR_EN_TITE))) {
+        // #endregion
         gSPSegment(POLY_OPA_DISP++, 0x08, object_tite_Tex_001B00);
         gSPSegment(POLY_OPA_DISP++, 0x09, object_tite_Tex_001F00);
         gSPSegment(POLY_OPA_DISP++, 0x0A, object_tite_Tex_002100);
     }
 
     if (this->displayList != NULL) {
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, this->displayList);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
index 11621e4ca3..ab8ca1a6f7 100644
--- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
+++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
@@ -14,7 +14,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER | ACTOR_FLAG_CAN_PRESS_SWITCHES)
+#define FLAGS                                                                                                   \
+    (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER | \
+     ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
 void EnPartner_Init(Actor* thisx, PlayState* play);
 void EnPartner_Destroy(Actor* thisx, PlayState* play);
@@ -106,7 +108,7 @@ void EnPartner_Init(Actor* thisx, PlayState* play) {
                               255, 200, 0);
     this->lightNodeNoGlow = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfoNoGlow);
 
-	thisx->room = -1;
+    thisx->room = -1;
 }
 
 void EnPartner_Destroy(Actor* thisx, PlayState* play) {
@@ -162,8 +164,8 @@ void EnPartner_SpawnSparkles(EnPartner* this, PlayState* play, s32 sparkleLife)
     envColor.g = this->outerColor.g;
     envColor.b = this->outerColor.b;
 
-    EffectSsKiraKira_SpawnDispersed(play, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor,
-                                    1500, sparkleLife);
+    EffectSsKiraKira_SpawnDispersed(play, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, 1500,
+                                    sparkleLife);
 }
 
 Vec3f Vec3fNormalize(Vec3f vec) {
@@ -299,8 +301,8 @@ void UseBombchus(Actor* thisx, PlayState* play, u8 started) {
         if (started == 1) {
             if (AMMO(ITEM_BOMBCHU) > 0) {
                 this->itemTimer = 10;
-                EnBom* bomb = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, this->actor.world.pos.y + 7,
-                            this->actor.world.pos.z, 0, 0, 0, 0, false);
+                EnBom* bomb = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
+                                          this->actor.world.pos.y + 7, this->actor.world.pos.z, 0, 0, 0, 0, false);
                 bomb->timer = 0;
                 Inventory_ChangeAmmo(ITEM_BOMBCHU, -1);
             } else {
@@ -467,7 +469,7 @@ void UseSpell(Actor* thisx, PlayState* play, u8 started, u8 spellType) {
                     GET_PLAYER(play)->ivanFloating = 0;
                     break;
             }
-            
+
             this->usedSpell = 0;
         }
 
@@ -477,13 +479,13 @@ void UseSpell(Actor* thisx, PlayState* play, u8 started, u8 spellType) {
                 Vec3f newBasePos[3];
 
                 switch (this->usedSpell) {
-                    case 1: //Din's
+                    case 1: // Din's
                         GET_PLAYER(play)->ivanDamageMultiplier = 2;
                         break;
-                    case 2: //Nayru's
+                    case 2: // Nayru's
                         GET_PLAYER(play)->invincibilityTimer = -10;
                         break;
-                    case 3: //Farore's
+                    case 3: // Farore's
                         GET_PLAYER(play)->hoverBootsTimer = 10;
                         GET_PLAYER(play)->ivanFloating = 1;
                         break;
@@ -689,7 +691,7 @@ void EnPartner_Update(Actor* thisx, PlayState* play) {
         uint8_t released = 0;
         uint8_t current = 0;
 
-        uint16_t partnerButtons[7] = { BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT};
+        uint16_t partnerButtons[7] = { BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
         uint8_t buttonMax = 3;
         if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) {
             buttonMax = ARRAY_COUNT(gSaveContext.equips.cButtonSlots);
@@ -698,7 +700,7 @@ void EnPartner_Update(Actor* thisx, PlayState* play) {
         if (this->usedItem == 0xFF && this->itemTimer <= 0) {
             for (uint8_t i = 0; i < buttonMax; i++) {
                 if (CHECK_BTN_ALL(sControlInput.press.button, partnerButtons[i])) {
-                    this->usedItem = gSaveContext.equips.buttonItems[i+1];
+                    this->usedItem = gSaveContext.equips.buttonItems[i + 1];
                     this->usedItemButton = i;
                     pressed = 1;
                 }
@@ -775,7 +777,7 @@ void EnPartner_Update(Actor* thisx, PlayState* play) {
 }
 
 s32 EnPartner_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                           Gfx** gfx) {
+                               Gfx** gfx) {
     static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
     s32 pad;
     f32 scale;
@@ -842,7 +844,6 @@ void DrawOrb(Actor* thisx, PlayState* play, u8 color) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-
 void EnPartner_Draw(Actor* thisx, PlayState* play) {
     s32 pad;
     f32 alphaScale;
@@ -882,8 +883,8 @@ void EnPartner_Draw(Actor* thisx, PlayState* play) {
     gSPEndDisplayList(dListHead++);
     gDPSetEnvColor(POLY_XLU_DISP++, (u8)this->outerColor.r, (u8)this->outerColor.g, (u8)this->outerColor.b,
                    (u8)(envAlpha * alphaScale));
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                   EnPartner_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+    POLY_XLU_DISP =
+        SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPartner_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 
diff --git a/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
index 30191cfed5..33133be7ba 100644
--- a/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+++ b/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
@@ -5,7 +5,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT)
 
 #define GROUND_HOVER_HEIGHT 75.0f
 #define MAX_LARVA 3
@@ -195,8 +197,7 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     Actor_SetScale(&this->actor, 36.0f * 0.001f);
-    SkelAnime_Init(play, &this->skelAnime, &gPeehatSkel, &gPeehatRisingAnim, this->jointTable, this->morphTable,
-                   24);
+    SkelAnime_Init(play, &this->skelAnime, &gPeehatSkel, &gPeehatRisingAnim, this->jointTable, this->morphTable, 24);
     ActorShape_Init(&this->actor.shape, 100.0f, ActorShadow_DrawCircle, 27.0f);
     this->actor.focus.pos = this->actor.world.pos;
     this->unk_2D4 = 0;
@@ -585,14 +586,12 @@ void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, PlayState* play) {
                 pos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x;
                 pos.y = Rand_CenteredFloat(10.0f) + this->actor.world.pos.y;
                 pos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z;
-                EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9,
-                                     1);
+                EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9, 1);
             }
         }
         if (&player->actor != this->colQuad.base.at || this->colCylinder.base.acFlags & AC_HIT) {
             if (!(this->actor.bgCheckFlags & 1)) {
-                EffectSsDeadSound_SpawnStationary(play, &this->actor.projectedPos, NA_SE_EN_PIHAT_SM_DEAD, 1, 1,
-                                                  40);
+                EffectSsDeadSound_SpawnStationary(play, &this->actor.projectedPos, NA_SE_EN_PIHAT_SM_DEAD, 1, 1, 40);
             }
             Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0x20);
             Actor_Kill(&this->actor);
@@ -762,8 +761,7 @@ void EnPeehat_StateAttackRecoil(EnPeehat* this, PlayState* play) {
                 pos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x;
                 pos.y = Rand_CenteredFloat(10.0f) + this->actor.world.pos.y;
                 pos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z;
-                EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9,
-                                     1);
+                EffectSsDeadDb_Spawn(play, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9, 1);
             }
             Actor_Kill(&this->actor);
             GameInteractor_ExecuteOnEnemyDefeat(&this->actor);
@@ -1012,8 +1010,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) {
     Math_SmoothStepToF(&this->scaleShift, 0.0f, 1.0f, 0.001f, 0.0f);
 }
 
-s32 EnPeehat_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                              void* thisx) {
+s32 EnPeehat_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnPeehat* this = (EnPeehat*)thisx;
 
     if (limbIndex == 4) {
@@ -1031,8 +1028,7 @@ s32 EnPeehat_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f
         Matrix_RotateZ(-(this->jiggleRot * 0.1f), MTXMODE_APPLY);
         Matrix_RotateY(-(this->jiggleRot * 0.13f), MTXMODE_APPLY);
         Matrix_RotateX(-(this->jiggleRot * 0.115f), MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, *dList);
         Matrix_Pop();
         CLOSE_DISPS(play->state.gfxCtx);
@@ -1065,8 +1061,7 @@ void EnPeehat_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r
         }
         Matrix_RotateY(3.2f + damageYRot, MTXMODE_APPLY);
         Matrix_Scale(0.3f, 0.2f, 0.2f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, *dList);
         Matrix_Pop();
         CLOSE_DISPS(play->state.gfxCtx);
@@ -1080,8 +1075,7 @@ void EnPeehat_Draw(Actor* thisx, PlayState* play) {
     EnPeehat* this = (EnPeehat*)thisx;
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnPeehat_OverrideLimbDraw,
-                      EnPeehat_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnPeehat_OverrideLimbDraw, EnPeehat_PostLimbDraw, this);
     if (this->actor.speedXZ != 0.0f || this->actor.velocity.y != 0.0f) {
         Matrix_MultVec3f(&D_80AD285C[0], &this->colQuad.dim.quad[1]);
         Matrix_MultVec3f(&D_80AD285C[1], &this->colQuad.dim.quad[0]);
diff --git a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
index 18222850dc..4f17c2358d 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c
@@ -64,8 +64,7 @@ void EnPoDesert_Init(Actor* thisx, PlayState* play) {
     EnPoDesert* this = (EnPoDesert*)thisx;
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    SkelAnime_Init(play, &this->skelAnime, &gPoeFieldSkel, &gPoeFieldFloatAnim, this->jointTable, this->morphTable,
-                   10);
+    SkelAnime_Init(play, &this->skelAnime, &gPoeFieldSkel, &gPoeFieldFloatAnim, this->jointTable, this->morphTable, 10);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sColliderInit);
     this->lightColor.r = 255;
@@ -210,8 +209,8 @@ void EnPoDesert_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnPoDesert_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx, Gfx** gfxP) {
+s32 EnPoDesert_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                                Gfx** gfxP) {
     EnPoDesert* this = (EnPoDesert*)thisx;
     f32 mtxScale;
 
@@ -225,8 +224,7 @@ s32 EnPoDesert_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
     return false;
 }
 
-void EnPoDesert_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx,
-                             Gfx** gfxP) {
+void EnPoDesert_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) {
     static Vec3f baseLightPos = { 0.0f, 1400.0f, 0.0f };
 
     EnPoDesert* this = (EnPoDesert*)thisx;
@@ -243,8 +241,7 @@ void EnPoDesert_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) {
             gDPPipeSync((*gfxP)++);
             gDPSetEnvColor((*gfxP)++, color.r, color.g, color.b, 255);
-            gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList((*gfxP)++, gPoeFieldLanternDL);
             gSPDisplayList((*gfxP)++, gPoeFieldLanternTopDL);
             gDPPipeSync((*gfxP)++);
@@ -268,7 +265,7 @@ void EnPoDesert_Draw(Actor* thisx, PlayState* play) {
     } else {
         gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280 + 2);
     }
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                   EnPoDesert_OverrideLimbDraw, EnPoDesert_PostLimbDraw, &this->actor, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoDesert_OverrideLimbDraw,
+                                            EnPoDesert_PostLimbDraw, &this->actor, POLY_XLU_DISP);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
index ef8517a094..ac13107cf7 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@@ -12,7 +12,9 @@
 
 #include <string.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
 
 void EnPoField_Init(Actor* thisx, PlayState* play);
 void EnPoField_Destroy(Actor* thisx, PlayState* play);
@@ -168,8 +170,7 @@ void EnPoField_Init(Actor* thisx, PlayState* play) {
         return;
     }
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    SkelAnime_Init(play, &this->skelAnime, &gPoeFieldSkel, &gPoeFieldFloatAnim, this->jointTable, this->morphTable,
-                   10);
+    SkelAnime_Init(play, &this->skelAnime, &gPoeFieldSkel, &gPoeFieldFloatAnim, this->jointTable, this->morphTable, 10);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &D_80AD7080);
     Collider_InitCylinder(play, &this->flameCollider);
@@ -387,7 +388,9 @@ void EnPoField_CorrectYPos(EnPoField* this, PlayState* play) {
 
 f32 EnPoField_SetFleeSpeed(EnPoField* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
-    f32 speed = ((player->stateFlags1 & PLAYER_STATE1_ON_HORSE) && player->rideActor != NULL) ? player->rideActor->speedXZ : 12.0f;
+    f32 speed = ((player->stateFlags1 & PLAYER_STATE1_ON_HORSE) && player->rideActor != NULL)
+                    ? player->rideActor->speedXZ
+                    : 12.0f;
 
     if (this->actor.xzDistToPlayer < 300.0f) {
         this->actor.speedXZ = speed * 1.5f + 2.0f;
@@ -558,27 +561,23 @@ void EnPoField_Death(EnPoField* this, PlayState* play) {
         if (this->actionTimer < 5) {
             sp6C.y = Math_SinS(this->actionTimer * 0x1000 - 0x4000) * 23.0f + (this->actor.world.pos.y + 40.0f);
             sp68 = Math_CosS(this->actionTimer * 0x1000 - 0x4000) * 23.0f;
-            sp6C.x =
-                Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * sp68 + this->actor.world.pos.x;
-            sp6C.z =
-                Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * sp68 + this->actor.world.pos.z;
+            sp6C.x = Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * sp68 + this->actor.world.pos.x;
+            sp6C.z = Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * sp68 + this->actor.world.pos.z;
         } else {
             sp6C.y = this->actor.world.pos.y + 40.0f + 15.0f * (this->actionTimer - 5);
-            sp6C.x =
-                Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.x;
-            sp6C.z =
-                Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.z;
+            sp6C.x = Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.x;
+            sp6C.z = Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.z;
         }
-        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, 1);
         sp6C.x = (this->actor.world.pos.x + this->actor.world.pos.x) - sp6C.x;
         sp6C.z = (this->actor.world.pos.z + this->actor.world.pos.z) - sp6C.z;
-        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, 1);
         sp6C.x = this->actor.world.pos.x;
         sp6C.z = this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, 1);
         if (this->actionTimer == 1) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT);
             GameInteractor_ExecuteOnEnemyDefeat(&this->actor);
@@ -713,7 +712,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) {
                     if (this->actor.params == 0) {
                         Item_Give(play, ITEM_POE);
                         this->actor.textId = 0x5008;
-                    } else {
+                    } else if (GameInteractor_Should(VB_BOTTLE_BIG_POE, true, this)) {
                         this->actor.textId = 0x508F;
                         Item_Give(play, ITEM_BIG_POE);
                         Flags_SetSwitch(play, sEnPoFieldSpawnSwitchFlags[this->spawnFlagIndex]);
@@ -790,9 +789,9 @@ void EnPoField_DrawFlame(EnPoField* this, PlayState* play) {
     if (this->flameTimer != 0) {
         OPEN_DISPS(play->state.gfxCtx);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0,
-                                    (play->gameplayFrames * -20) % 512, 32, 128));
+        gSPSegment(
+            POLY_XLU_DISP++, 0x08,
+            Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (play->gameplayFrames * -20) % 512, 32, 128));
         sp4C = this->flameScale * 85000.0f;
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, sp4C);
         Matrix_Translate(this->flamePosition.x, this->flamePosition.y, this->flamePosition.z, MTXMODE_NEW);
@@ -805,8 +804,7 @@ void EnPoField_DrawFlame(EnPoField* this, PlayState* play) {
             Matrix_Scale((this->flameScale * 0.7f) + 0.00090000004f, (0.003f - this->flameScale) + 0.003f, 0.003f,
                          MTXMODE_APPLY);
         }
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         CLOSE_DISPS(play->state.gfxCtx);
     }
@@ -882,8 +880,8 @@ void EnPoField_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnPoField_OverrideLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx, Gfx** gfxP) {
+s32 EnPoField_OverrideLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                                Gfx** gfxP) {
     EnPoField* this = (EnPoField*)thisx;
 
     if (this->lightColor.a == 0 || limbIndex == 7 || (this->actionFunc == EnPoField_Death && this->actionTimer >= 2)) {
@@ -907,8 +905,7 @@ void EnPoField_PostLimDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
     EnPoField* this = (EnPoField*)thisx;
 
     if (this->actionFunc == EnPoField_Death && this->actionTimer >= 2 && limbIndex == 8) {
-        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList((*gfxP)++, gPoeFieldBurnDL);
     }
     if (limbIndex == 7) {
@@ -944,22 +941,20 @@ void EnPoField_Draw(Actor* thisx, PlayState* play) {
                        Gfx_EnvColor(play->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b,
                                     this->lightColor.a));
             gSPSegment(POLY_OPA_DISP++, 0x0C, D_80116280 + 2);
-            POLY_OPA_DISP =
-                SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                               EnPoField_OverrideLimbDraw2, EnPoField_PostLimDraw2, &this->actor, POLY_OPA_DISP);
+            POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoField_OverrideLimbDraw2,
+                                                    EnPoField_PostLimDraw2, &this->actor, POLY_OPA_DISP);
         } else {
             gSPSegment(POLY_XLU_DISP++, 0x08,
                        Gfx_EnvColor(play->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b,
                                     this->lightColor.a));
             gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280);
-            POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                               EnPoField_OverrideLimbDraw2, EnPoField_PostLimDraw2, &this->actor, POLY_XLU_DISP);
+            POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoField_OverrideLimbDraw2,
+                                                    EnPoField_PostLimDraw2, &this->actor, POLY_XLU_DISP);
         }
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255);
         Matrix_Put(&sLimb7Mtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternDL);
         gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternTopDL);
         CLOSE_DISPS(play->state.gfxCtx);
@@ -990,8 +985,7 @@ void EnPoField_DrawSoul(Actor* thisx, PlayState* play) {
         Lights_PointGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
                                 this->actor.world.pos.z, this->soulColor.r, this->soulColor.g, this->soulColor.b, 200);
         gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternDL);
         gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternTopDL);
     } else {
@@ -1004,8 +998,7 @@ void EnPoField_DrawSoul(Actor* thisx, PlayState* play) {
                         this->lightColor.a);
         gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255);
         Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gPoeFieldSoulDL);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
index 0679600194..d850021a45 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c
@@ -8,8 +8,12 @@
 #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h"
 #include "objects/object_tk/object_tk.h"
 #include "soh/ResourceManagerHelpers.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)
 
 void EnPoRelay_Init(Actor* thisx, PlayState* play);
 void EnPoRelay_Destroy(Actor* thisx, PlayState* play);
@@ -92,8 +96,7 @@ void EnPoRelay_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 42.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gDampeSkel, &gDampeFloatAnim, this->jointTable, this->morphTable,
-                       18);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gDampeSkel, &gDampeFloatAnim, this->jointTable, this->morphTable, 18);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
@@ -144,8 +147,8 @@ void EnPoRelay_SetupRace(EnPoRelay* this) {
     EnPoRelay_Vec3sToVec3f(&vec, &D_80AD8C30[this->pathIndex]);
     this->actionTimer = ((s16)(this->actor.shape.rot.y - this->actor.world.rot.y - 0x8000) >> 0xB) % 32U;
     func_80088B34(0);
-    this->hookshotSlotFull = (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE && !IS_RANDO) ||
-                             (IS_RANDO && Flags_GetTreasure(gPlayState, 0x1E));
+    this->hookshotSlotFull =
+        (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE && !IS_RANDO) || (IS_RANDO && Flags_GetTreasure(gPlayState, 0x1E));
     this->unk_19A = Actor_WorldYawTowardPoint(&this->actor, &vec);
     this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED;
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH);
@@ -196,7 +199,7 @@ void EnPoRelay_Race(EnPoRelay* this, PlayState* play) {
     if (this->actionTimer != 0) {
         this->actionTimer--;
     }
-    if (this->actionTimer == 0 && Rand_ZeroOne() < 0.03f) {
+    if (GameInteractor_Should(VB_DAMPE_DROP_FLAME, this->actionTimer == 0 && Rand_ZeroOne() < 0.03f, this)) {
         this->actionTimer = 32;
         if (this->pathIndex < 23) {
             speed = Rand_ZeroOne() * 3.0f;
@@ -208,7 +211,7 @@ void EnPoRelay_Race(EnPoRelay* this, PlayState* play) {
                 multiplier = 0.0f;
             }
             speed = 30.0f * multiplier;
-            
+
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HONOTRAP,
                         Math_CosS(this->unk_19A) * speed + this->actor.world.pos.x, this->actor.world.pos.y,
                         Math_SinS(this->unk_19A) * speed + this->actor.world.pos.z, 0,
@@ -266,7 +269,7 @@ void EnPoRelay_EndRace(EnPoRelay* this, PlayState* play) {
         this->actionFunc = EnPoRelay_Talk2;
     } else if (play->roomCtx.curRoom.num == 5) {
         Actor_Kill(&this->actor);
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
     } else if (Actor_IsFacingAndNearPlayer(&this->actor, 150.0f, 0x3000)) {
         this->actor.textId = this->textId;
         func_8002F2CC(&this->actor, play, 250.0f);
@@ -287,7 +290,7 @@ void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) {
             Message_ContinueTextbox(play, this->actor.textId);
         }
     } else if (Actor_TextboxIsClosing(&this->actor, play)) {
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
         this->actionTimer = 0;
         this->actionFunc = EnPoRelay_DisappearAndReward;
     }
@@ -306,49 +309,47 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) {
         if (this->actionTimer < 5) {
             vec.y = Math_SinS((this->actionTimer * 0x1000) - 0x4000) * 23.0f + (this->actor.world.pos.y + 40.0f);
             multiplier = Math_CosS((this->actionTimer * 0x1000) - 0x4000) * 23.0f;
-            vec.x = (Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier) +
-                    this->actor.world.pos.x;
-            vec.z = (Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier) +
-                    this->actor.world.pos.z;
+            vec.x =
+                (Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier) + this->actor.world.pos.x;
+            vec.z =
+                (Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier) + this->actor.world.pos.z;
         } else {
             vec.y = this->actor.world.pos.y + 40.0f + 15.0f * (this->actionTimer - 5);
-            vec.x =
-                (Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f) + this->actor.world.pos.x;
-            vec.z =
-                (Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f) + this->actor.world.pos.z;
+            vec.x = (Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f) + this->actor.world.pos.x;
+            vec.z = (Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f) + this->actor.world.pos.z;
         }
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, true);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, true);
         vec.x = (this->actor.world.pos.x + this->actor.world.pos.x) - vec.x;
         vec.z = (this->actor.world.pos.z + this->actor.world.pos.z) - vec.z;
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, true);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, true);
         vec.x = this->actor.world.pos.x;
         vec.z = this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255,
-                             255, 0, 0, 255, 1, 9, true);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255,
+                             0, 0, 255, 1, 9, true);
         if (this->actionTimer == 1) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT);
         }
     }
     if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.001f) != 0) {
-        if(!IS_RANDO) {
+        if (!IS_RANDO) {
             if (this->hookshotSlotFull != 0) {
                 sp60.x = this->actor.world.pos.x;
                 sp60.y = this->actor.floorHeight;
                 sp60.z = this->actor.world.pos.z;
-                if (gSaveContext.timer1Value < HIGH_SCORE(HS_DAMPE_RACE)) {
-                    HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
+                if (gSaveContext.timerSeconds < HIGH_SCORE(HS_DAMPE_RACE)) {
+                    HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timerSeconds;
                 }
-                if (Flags_GetCollectible(play, this->actor.params) == 0 && gSaveContext.timer1Value <= 60) {
+                if (Flags_GetCollectible(play, this->actor.params) == 0 && gSaveContext.timerSeconds <= 60) {
                     Item_DropCollectible2(play, &sp60, (this->actor.params << 8) + (0x4000 | ITEM00_HEART_PIECE));
                 } else {
                     Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, sp60.x, sp60.y, sp60.z, 0, 0, 0, 2, true);
                 }
             } else {
                 Flags_SetTempClear(play, 4);
-                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
-            }            
+                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timerSeconds;
+            }
         } else {
             sp60.x = this->actor.world.pos.x;
             sp60.y = this->actor.floorHeight;
@@ -357,13 +358,13 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) {
             if (this->hookshotSlotFull == 0) {
                 Flags_SetTempClear(play, 4);
                 Flags_SetTreasure(gPlayState, 0x1E);
-                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
+                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timerSeconds;
             }
 
-            if (gSaveContext.timer1Value < HIGH_SCORE(HS_DAMPE_RACE)) {
-                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timer1Value;
+            if (gSaveContext.timerSeconds < HIGH_SCORE(HS_DAMPE_RACE)) {
+                HIGH_SCORE(HS_DAMPE_RACE) = gSaveContext.timerSeconds;
             }
-            if (Flags_GetCollectible(play, this->actor.params) == 0 && gSaveContext.timer1Value <= 60) {
+            if (Flags_GetCollectible(play, this->actor.params) == 0 && gSaveContext.timerSeconds <= 60) {
                 Item_DropCollectible2(play, &sp60, (this->actor.params << 8) + (0x4000 | ITEM00_HEART_PIECE));
             } else if (Flags_GetCollectible(play, this->actor.params) != 0) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, sp60.x, sp60.y, sp60.z, 0, 0, 0, 2, true);
@@ -421,8 +422,7 @@ void EnPoRelay_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
                                   this->lightColor.b, 200);
     } else if (limbIndex == 8) {
         OPEN_DISPS(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gDampeHaloDL);
         CLOSE_DISPS(play->state.gfxCtx);
     }
diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index 31006b8780..3db1613d1b 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -12,7 +12,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
 
 void EnPoSisters_Init(Actor* thisx, PlayState* play);
 void EnPoSisters_Destroy(Actor* thisx, PlayState* play);
@@ -187,8 +189,8 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gPoeSistersSkel, &gPoeSistersSwayAnim, this->jointTable,
-                   this->morphTable, 12);
+    SkelAnime_Init(play, &this->skelAnime, &gPoeSistersSkel, &gPoeSistersSwayAnim, this->jointTable, this->morphTable,
+                   12);
     this->unk_22E.r = 255;
     this->unk_22E.g = 255;
     this->unk_22E.b = 210;
@@ -444,8 +446,8 @@ void func_80AD9C24(EnPoSisters* this, PlayState* play) {
         vec.x = this->actor.world.pos.x;
         vec.y = this->actor.world.pos.y + 45.0f;
         vec.z = this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &vec, &sZeroVector, &sZeroVector, 150, 0, 255, 255, 255, 155, 150, 150, 150, 1,
-                             9, 0);
+        EffectSsDeadDb_Spawn(play, &vec, &sZeroVector, &sZeroVector, 150, 0, 255, 255, 255, 155, 150, 150, 150, 1, 9,
+                             0);
     }
     Lights_PointSetColorAndRadius(&this->lightInfo, 0, 0, 0, 0);
     this->actionFunc = func_80ADB338;
@@ -1184,7 +1186,7 @@ void EnPoSisters_Update(Actor* thisx, PlayState* play) {
     s32 pad;
     EnPoSisters* this = (EnPoSisters*)thisx;
     s16 temp;
-    
+
     if (this->collider.base.atFlags & AT_HIT) {
         this->collider.base.atFlags &= ~AT_HIT;
         func_80AD9568(this);
@@ -1276,8 +1278,8 @@ void func_80ADC55C(EnPoSisters* this) {
     }
 }
 
-s32 EnPoSisters_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx, Gfx** gfxP) {
+s32 EnPoSisters_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                                 Gfx** gfxP) {
     EnPoSisters* this = (EnPoSisters*)thisx;
     Color_RGBA8* color;
 
@@ -1304,15 +1306,13 @@ s32 EnPoSisters_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve
     return false;
 }
 
-void EnPoSisters_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx,
-                              Gfx** gfxP) {
+void EnPoSisters_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) {
     EnPoSisters* this = (EnPoSisters*)thisx;
     s32 i;
     s32 pad;
 
     if (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8 && limbIndex == 9) {
-        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList((*gfxP)++, gPoSistersBurnDL);
     }
     if (limbIndex == 8 && this->actionFunc != func_80ADB2B8) {
@@ -1369,18 +1369,17 @@ void EnPoSisters_Draw(Actor* thisx, PlayState* play) {
     } else {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->unk_22E.a);
         gSPSegment(POLY_XLU_DISP++, 0x09, D_80116280);
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                           EnPoSisters_OverrideLimbDraw, EnPoSisters_PostLimbDraw, &this->actor, POLY_XLU_DISP);
+        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoSisters_OverrideLimbDraw,
+                                                EnPoSisters_PostLimbDraw, &this->actor, POLY_XLU_DISP);
     }
     if (!(this->unk_199 & 0x80)) {
         Matrix_Put(&this->unk_2F8);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gPoSistersTorchDL);
     }
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                (play->gameplayFrames * -20) % 512, 0x20, 0x80));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (play->gameplayFrames * -20) % 512, 0x20,
+                                0x80));
     gDPSetEnvColor(POLY_XLU_DISP++, temp_s1->r, temp_s1->g, temp_s1->b, temp_s1->a);
     if (this->actionFunc == func_80ADB17C) {
         if (this->unk_19A < 32) {
@@ -1419,8 +1418,7 @@ void EnPoSisters_Draw(Actor* thisx, PlayState* play) {
             phi_f20 = CLAMP(phi_f20, 0.5f, 0.8f) * 0.007f;
         }
         Matrix_Scale(phi_f20, phi_f20, phi_f20, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         FrameInterpolation_RecordCloseChild();
     }
diff --git a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c
index 3dfba28fbf..7534d112db 100644
--- a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@@ -10,7 +10,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
+#define FLAGS \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
 
 void EnPoh_Init(Actor* thisx, PlayState* play);
 void EnPoh_Destroy(Actor* thisx, PlayState* play);
@@ -617,27 +618,25 @@ void func_80ADF15C(EnPoh* this, PlayState* play) {
         if (this->unk_198 < 5) {
             vec.y = Math_SinS((this->unk_198 * 0x1000) - 0x4000) * 23.0f + (this->actor.world.pos.y + 40.0f);
             multiplier = Math_CosS((this->unk_198 * 0x1000) - 0x4000) * 23.0f;
-            vec.x = Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier +
-                    this->actor.world.pos.x;
-            vec.z = Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier +
-                    this->actor.world.pos.z;
+            vec.x =
+                Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier + this->actor.world.pos.x;
+            vec.z =
+                Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * multiplier + this->actor.world.pos.z;
         } else {
             vec.y = (this->actor.world.pos.y + 40.0f) + (15.0f * (this->unk_198 - 5));
-            vec.x =
-                Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.x;
-            vec.z =
-                Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.z;
+            vec.x = Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.x;
+            vec.z = Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800) * 23.0f + this->actor.world.pos.z;
         }
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255,
-                             0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, 0, 0,
+                             255, 1, 9, 1);
         vec.x = (this->actor.world.pos.x + this->actor.world.pos.x) - vec.x;
         vec.z = (this->actor.world.pos.z + this->actor.world.pos.z) - vec.z;
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255,
-                             0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, 0, 0,
+                             255, 1, 9, 1);
         vec.x = this->actor.world.pos.x;
         vec.z = this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255,
-                             0, 0, 255, 1, 9, 1);
+        EffectSsDeadDb_Spawn(play, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, 0, 0,
+                             255, 1, 9, 1);
         if (this->unk_198 == 1) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT);
             GameInteractor_ExecuteOnEnemyDefeat(&this->actor);
@@ -919,8 +918,7 @@ void EnPoh_Update(Actor* thisx, PlayState* play) {
         this->actor.update = EnPoh_UpdateLiving;
         Actor_SetObjectDependency(play, &this->actor);
         if (this->infoIdx == EN_POH_INFO_NORMAL) {
-            SkelAnime_Init(play, &this->skelAnime, &gPoeSkel, &gPoeFloatAnim, this->jointTable, this->morphTable,
-                           21);
+            SkelAnime_Init(play, &this->skelAnime, &gPoeSkel, &gPoeFloatAnim, this->jointTable, this->morphTable, 21);
             this->actor.draw = EnPoh_DrawRegular;
         } else {
             SkelAnime_InitFlex(play, &this->skelAnime, &gPoeComposerSkel, &gPoeComposerFloatAnim, this->jointTable,
@@ -1054,8 +1052,7 @@ void EnPoh_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
 
     Collider_UpdateSpheres(limbIndex, &this->colliderSph);
     if (this->actionFunc == func_80ADF15C && this->unk_198 >= 2 && limbIndex == this->info->unk_7) {
-        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix((*gfxP)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList((*gfxP)++, this->info->burnDisplayList);
     }
     if (limbIndex == this->info->unk_6) {
@@ -1086,19 +1083,18 @@ void EnPoh_DrawRegular(Actor* thisx, PlayState* play) {
     if (this->lightColor.a == 255 || this->lightColor.a == 0) {
         gDPSetEnvColor(POLY_OPA_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, this->lightColor.a);
         gSPSegment(POLY_OPA_DISP++, 0x08, D_80116280 + 2);
-        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
+        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw,
+                                                &this->actor, POLY_OPA_DISP);
     } else {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->lightColor.a);
         gSPSegment(POLY_XLU_DISP++, 0x08, D_80116280);
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_XLU_DISP);
+        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw,
+                                                &this->actor, POLY_XLU_DISP);
     }
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255);
     Matrix_Put(&this->unk_368);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList);
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -1127,9 +1123,9 @@ void EnPoh_DrawComposer(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x0B,
                    Gfx_EnvColor(play->state.gfxCtx, phi_t0->r, phi_t0->g, phi_t0->b, this->lightColor.a));
         gSPSegment(POLY_OPA_DISP++, 0x0C, D_80116280 + 2);
-        POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw,
-                                           &this->actor, POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_OPA_DISP);
     } else {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
@@ -1141,15 +1137,14 @@ void EnPoh_DrawComposer(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_XLU_DISP++, 0x0B,
                    Gfx_EnvColor(play->state.gfxCtx, phi_t0->r, phi_t0->g, phi_t0->b, this->lightColor.a));
         gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280);
-        POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw,
-                                           &this->actor, POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_XLU_DISP);
     }
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255);
     Matrix_Put(&this->unk_368);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList);
     gSPDisplayList(POLY_OPA_DISP++, gPoeComposerLanternBottomDL);
     gDPPipeSync(POLY_OPA_DISP++);
@@ -1178,8 +1173,7 @@ void EnPoh_DrawSoul(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255);
         Lights_PointGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
                                 this->actor.world.pos.z, this->envColor.r, this->envColor.g, this->envColor.b, 200);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList);
         if (this->infoIdx == EN_POH_INFO_COMPOSER) {
             Color_RGBA8* envColor = (this->actor.params == EN_POH_SHARP) ? &D_80AE1B4C : &D_80AE1B50;
@@ -1199,8 +1193,7 @@ void EnPoh_DrawSoul(Actor* thisx, PlayState* play) {
                         this->info->primColor.b, this->lightColor.a);
         gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255);
         Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, this->info->soulDisplayList);
     }
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/soh/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
index de0f8d0f05..a27b3b5b13 100644
--- a/soh/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
+++ b/soh/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
@@ -74,8 +74,8 @@ void EnPubox_Update(Actor* thisx, PlayState* play) {
     thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : ((thisx->speedXZ > 2.5f) ? 2.5f : thisx->speedXZ);
     Math_SmoothStepToF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f);
     if (thisx->speedXZ != 0.0f) {
-        Audio_PlaySoundGeneral(NA_SE_EV_ROCK_SLIDE - SFX_FLAG, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_ROCK_SLIDE - SFX_FLAG, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
     this->dyna.unk_154 = 0.0f;
     this->dyna.unk_150 = 0.0f;
diff --git a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c
index b65a5dd8ea..062be3268d 100644
--- a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@@ -3,7 +3,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
 void EnRd_Init(Actor* thisx, PlayState* play);
 void EnRd_Destroy(Actor* thisx, PlayState* play);
@@ -145,12 +147,12 @@ void EnRd_Init(Actor* thisx, PlayState* play) {
     }
 
     if (thisx->params >= -1) {
-        SkelAnime_InitFlex(play, &this->skelAnime, &gRedeadSkel, &gGibdoRedeadIdleAnim,
-                           this->jointTable, this->morphTable, 26);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gRedeadSkel, &gGibdoRedeadIdleAnim, this->jointTable,
+                           this->morphTable, 26);
         thisx->naviEnemyId = 0x2A;
     } else {
-        SkelAnime_InitFlex(play, &this->skelAnime, &gGibdoSkel, &gGibdoRedeadIdleAnim,
-                           this->jointTable, this->morphTable, 26);
+        SkelAnime_InitFlex(play, &this->skelAnime, &gGibdoSkel, &gGibdoRedeadIdleAnim, this->jointTable,
+                           this->morphTable, 26);
         thisx->naviEnemyId = 0x2D;
     }
 
@@ -255,8 +257,10 @@ void func_80AE2744(EnRd* this, PlayState* play) {
             // Add a height check to redeads/gibdos freeze when Enemy Randomizer is on.
             // Without the height check, redeads/gibdos can freeze the player from insane distances in
             // vertical rooms (like the first room in Deku Tree), making these rooms nearly unplayable.
-            s8 enemyRandoCCActive = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0));
-            if (!enemyRandoCCActive || (enemyRandoCCActive && this->actor.yDistToPlayer <= 100.0f && this->actor.yDistToPlayer >= -100.0f)) {
+            s8 enemyRandoCCActive = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+                                    (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0));
+            if (!enemyRandoCCActive ||
+                (enemyRandoCCActive && this->actor.yDistToPlayer <= 100.0f && this->actor.yDistToPlayer >= -100.0f)) {
                 if ((this->actor.params != 2) && (this->unk_305 == 0)) {
                     func_80AE37BC(this);
                 } else {
@@ -307,8 +311,8 @@ void func_80AE2A10(EnRd* this, PlayState* play) {
 }
 
 void func_80AE2B90(EnRd* this, PlayState* play) {
-    Animation_Change(&this->skelAnime, &gGibdoRedeadWalkAnim, 1.0f, 4.0f,
-                     Animation_GetLastFrame(&gGibdoRedeadWalkAnim), ANIMMODE_LOOP_INTERP, -4.0f);
+    Animation_Change(&this->skelAnime, &gGibdoRedeadWalkAnim, 1.0f, 4.0f, Animation_GetLastFrame(&gGibdoRedeadWalkAnim),
+                     ANIMMODE_LOOP_INTERP, -4.0f);
     this->actor.speedXZ = 0.4f;
     this->unk_31B = 4;
     EnRd_SetupAction(this, func_80AE2C1C);
@@ -334,12 +338,13 @@ void func_80AE2C1C(EnRd* this, PlayState* play) {
     }
 
     if ((ABS(sp32) < 0x1554) && (Actor_WorldDistXYZToActor(&this->actor, &player->actor) <= 150.0f)) {
-        if (!(player->stateFlags1 & 
-            (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | 
-             PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER)) && 
-             !(player->stateFlags2 & PLAYER_STATE2_GRABBED_BY_ENEMY)) {
+        if (!(player->stateFlags1 &
+              (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
+               PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER)) &&
+            !(player->stateFlags2 & PLAYER_STATE2_GRABBED_BY_ENEMY)) {
             if (this->unk_306 == 0) {
-                if (!(this->unk_312 & PLAYER_STATE2_GRABBED_BY_ENEMY) && !CVarGetInteger(CVAR_CHEAT("NoRedeadFreeze"), 0)) {
+                if (!(this->unk_312 & PLAYER_STATE2_GRABBED_BY_ENEMY) &&
+                    GameInteractor_Should(VB_REDEAD_GIBDO_FREEZE_LINK, true, this)) {
                     player->actor.freezeTimer = 40;
                     Player_SetAutoLockOnActor(play, &this->actor);
                     GET_PLAYER(play)->autoLockOnActor = &this->actor;
@@ -409,10 +414,9 @@ void func_80AE2FD0(EnRd* this, PlayState* play) {
     this->actor.world.rot.y = this->actor.shape.rot.y;
     SkelAnime_Update(&this->skelAnime);
 
-    if (!(player->stateFlags1 & 
-        (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | 
-         PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER)) && 
-         !(player->stateFlags2 & PLAYER_STATE2_GRABBED_BY_ENEMY) &&
+    if (!(player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
+                                 PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER)) &&
+        !(player->stateFlags2 & PLAYER_STATE2_GRABBED_BY_ENEMY) &&
         (Actor_WorldDistXYZToPoint(&player->actor, &this->actor.home.pos) < 150.0f)) {
         this->actor.targetMode = 0;
         func_80AE2B90(this, play);
@@ -571,7 +575,7 @@ void func_80AE3834(EnRd* this, PlayState* play) {
     s16 temp_v0 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->unk_30E - this->unk_310;
 
     if (ABS(temp_v0) < 0x2008) {
-        if (!(this->unk_312 & 0x80) && !CVarGetInteger(CVAR_CHEAT("NoRedeadFreeze"), 0)) {
+        if (!(this->unk_312 & 0x80) && GameInteractor_Should(VB_REDEAD_GIBDO_FREEZE_LINK, true, this)) {
             player->actor.freezeTimer = 60;
             func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
             Player_SetAutoLockOnActor(play, &this->actor);
@@ -598,8 +602,8 @@ void func_80AE3978(EnRd* this, PlayState* play) {
 }
 
 void func_80AE39D4(EnRd* this) {
-    Animation_Change(&this->skelAnime, &gGibdoRedeadStandUpAnim, -1.0f, Animation_GetLastFrame(&gGibdoRedeadStandUpAnim),
-                     0.0f, ANIMMODE_ONCE, -4.0f);
+    Animation_Change(&this->skelAnime, &gGibdoRedeadStandUpAnim, -1.0f,
+                     Animation_GetLastFrame(&gGibdoRedeadStandUpAnim), 0.0f, ANIMMODE_ONCE, -4.0f);
     this->unk_31B = 6;
     EnRd_SetupAction(this, func_80AE3A54);
 }
@@ -669,7 +673,8 @@ void func_80AE3C98(EnRd* this, PlayState* play) {
 
     if (SkelAnime_Update(&this->skelAnime)) {
         if (this->unk_30C == 0) {
-            s8 enemyRandoCCActive = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0));
+            s8 enemyRandoCCActive = CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+                                    (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0));
             // Don't set this flag in Enemy Rando as it can overlap with other objects using the same flag.
             if (!Flags_GetSwitch(play, this->unk_312 & 0x7F) && !enemyRandoCCActive) {
                 Flags_SetSwitch(play, this->unk_312 & 0x7F);
@@ -848,8 +853,7 @@ void EnRd_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnRd_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnRd_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnRd* this = (EnRd*)thisx;
 
     if (limbIndex == 23) {
@@ -920,9 +924,9 @@ void EnRd_Draw(Actor* thisx, PlayState* play) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->unk_314);
         gSPSegment(POLY_OPA_DISP++, 8, &D_80116280[2]);
-        POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnRd_OverrideLimbDraw, EnRd_PostLimbDraw, this,
-                                           POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnRd_OverrideLimbDraw, EnRd_PostLimbDraw, this, POLY_OPA_DISP);
         func_80033C30(&thisPos, &D_80AE4958, 255, play);
         if (this->unk_31A != 0) {
             thisx->colorFilterTimer++;
@@ -937,8 +941,8 @@ void EnRd_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_314);
         gSPSegment(POLY_XLU_DISP++, 8, &D_80116280[0]);
         POLY_XLU_DISP =
-            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                               this->skelAnime.dListCount, EnRd_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnRd_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
 
         func_80033C30(&thisPos, &D_80AE4958, this->unk_314, play);
     }
diff --git a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
index be23bfb9dc..0a9f228b65 100644
--- a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
+++ b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
@@ -12,7 +12,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_LOCK_ON_DISABLED)
 
 void EnReeba_Init(Actor* thisx, PlayState* play);
 void EnReeba_Destroy(Actor* thisx, PlayState* play);
@@ -202,8 +204,8 @@ void func_80AE5054(EnReeba* this, PlayState* play) {
     SkelAnime_Update(&this->skelanime);
 
     if ((play->gameplayFrames % 4) == 0) {
-        Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
-                                 8.0f, 500, 10, true);
+        Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1, 8.0f,
+                                 500, 10, true);
     }
 
     if (this->unk_278 == 0) {
@@ -343,8 +345,8 @@ void func_80AE56E0(EnReeba* this, PlayState* play) {
 
     if ((this->unk_284 + 10.0f) <= this->actor.shape.yOffset) {
         if ((play->gameplayFrames % 4) == 0) {
-            Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
-                                     8.0f, 500, 10, true);
+            Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1, 8.0f,
+                                     500, 10, true);
         }
 
         Math_ApproachF(&this->actor.shape.yOffset, this->unk_284, 1.0f, this->unk_288);
diff --git a/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
index 640889c219..83107138e2 100644
--- a/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
+++ b/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
@@ -41,10 +41,8 @@ void EnRiverSound_Init(Actor* thisx, PlayState* play) {
         Actor_Kill(&this->actor);
     } else if (this->actor.params == RS_SARIAS_SONG) {
         // Always have leading music in rando
-        if (
-            CVarGetInteger(CVAR_AUDIO("LostWoodsConsistentVolume"), 0) ||
-            ((!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) || CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) && !IS_RANDO)
-        ) {
+        if (CVarGetInteger(CVAR_AUDIO("LostWoodsConsistentVolume"), 0) ||
+            ((!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) || CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) && !IS_RANDO)) {
             Actor_Kill(&this->actor);
         }
     }
@@ -179,8 +177,7 @@ void EnRiverSound_Update(Actor* thisx, PlayState* play) {
         pos = &thisx->world.pos;
 
         if (EnRiverSound_GetSoundPos(SEGMENTED_TO_VIRTUAL(path->points), path->count, &player->actor.world.pos, pos)) {
-            if (BgCheck_EntityRaycastFloor4(&play->colCtx, &thisx->floorPoly, &sp34, thisx, pos) !=
-                BGCHECK_Y_MIN) {
+            if (BgCheck_EntityRaycastFloor4(&play->colCtx, &thisx->floorPoly, &sp34, thisx, pos) != BGCHECK_Y_MIN) {
                 // Get the sound volume pitch based on the speed of the river current under the actor
                 this->soundPitchIndex = SurfaceType_GetConveyorSpeed(&play->colCtx, thisx->floorPoly, sp34);
             } else {
diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
index 73c2d32981..34b35797ac 100644
--- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
@@ -119,9 +119,9 @@ void func_80AE7590(EnRl* this, PlayState* play) {
     Vec3f pos;
     s16 sceneNum = play->sceneNum;
 
-    if (gSaveContext.sceneSetupIndex == 4 && sceneNum == SCENE_CHAMBER_OF_THE_SAGES && play->csCtx.state != CS_STATE_IDLE &&
-        play->csCtx.npcActions[6] != NULL && play->csCtx.npcActions[6]->action == 2 &&
-        !this->lightMedallionGiven) {
+    if (gSaveContext.sceneSetupIndex == 4 && sceneNum == SCENE_CHAMBER_OF_THE_SAGES &&
+        play->csCtx.state != CS_STATE_IDLE && play->csCtx.npcActions[6] != NULL &&
+        play->csCtx.npcActions[6]->action == 2 && !this->lightMedallionGiven) {
         player = GET_PLAYER(play);
         pos.x = player->actor.world.pos.x;
         pos.y = player->actor.world.pos.y + 80.0f;
@@ -313,8 +313,8 @@ void func_80AE7D94(EnRl* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
     gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280);
 
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
-                                       NULL, NULL, NULL, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL,
+                                       NULL, NULL, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c
index ba935364e5..831e11b8c3 100644
--- a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c
+++ b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c
@@ -10,7 +10,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include <assert.h>
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
 #define RR_MESSAGE_SHIELD (1 << 0)
 #define RR_MESSAGE_TUNIC (1 << 1)
@@ -505,7 +507,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
             this->collider2.base.ocFlags1 &= ~OC1_HIT;
             // "catch"
             osSyncPrintf(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount);
-            if (play->grabPlayer(play, player)) {
+            if (GameInteractor_Should(VB_LIKE_LIKE_GRAB_PLAYER, true, this) && play->grabPlayer(play, player)) {
                 player->actor.parent = &this->actor;
                 this->stopScroll = false;
                 EnRr_SetupGrabPlayer(this, player);
@@ -852,16 +854,14 @@ void EnRr_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x0C, segMtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (this->scrollTimer * 0) & 0x7F,
-                                (this->scrollTimer * 0) & 0x3F, 32, 16, 1, (this->scrollTimer * 0) & 0x3F,
-                                (this->scrollTimer * -6) & 0x7F, 32, 16));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, (this->scrollTimer * 0) & 0x7F, (this->scrollTimer * 0) & 0x3F,
+                                32, 16, 1, (this->scrollTimer * 0) & 0x3F, (this->scrollTimer * -6) & 0x7F, 32, 16));
     Matrix_Push();
 
     Matrix_Scale((1.0f + this->bodySegs[RR_BASE].scaleMod.x) * this->bodySegs[RR_BASE].scale.x,
                  (1.0f + this->bodySegs[RR_BASE].scaleMod.y) * this->bodySegs[RR_BASE].scale.y,
                  (1.0f + this->bodySegs[RR_BASE].scaleMod.z) * this->bodySegs[RR_BASE].scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Matrix_Pop();
     zeroVec.x = 0.0f;
     zeroVec.y = 0.0f;
@@ -899,8 +899,7 @@ void EnRr_Draw(Actor* thisx, PlayState* play) {
             if (this->actor.colorFilterParams & 0x4000) {
                 EffectSsEnFire_SpawnVec3f(play, &this->actor, &effectPos, 100, 0, 0, -1);
             } else {
-                EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &effectPos, 150, 150, 150, 250, 235, 245, 255,
-                                               3.0f);
+                EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &effectPos, 150, 150, 150, 250, 235, 245, 255, 3.0f);
             }
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index 2913f464d0..e03a8ed201 100644
--- a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -393,17 +393,17 @@ s32 EnRu1_UpdateSkelAnime(EnRu1* this) {
 }
 
 void func_80AEB364(EnRu1* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void func_80AEB3A4(EnRu1* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     func_80AEB364(this, play);
 }
 
 void func_80AEB3CC(EnRu1* this) {
-    this->skelAnime.moveFlags &= ~0x1;
+    this->skelAnime.movementFlags &= ~0x1;
 }
 
 void func_80AEB3DC(EnRu1* this, PlayState* play) {
@@ -464,7 +464,7 @@ void func_80AEB6E0(EnRu1* this, PlayState* play) {
     SkelAnime* skelAnime = &this->skelAnime;
 
     if (skelAnime->baseTransl.y < skelAnime->jointTable[0].y) {
-        skelAnime->moveFlags |= 3;
+        skelAnime->movementFlags |= 3;
         AnimationContext_SetMoveActor(play, &this->actor, skelAnime, 1.0f);
     }
 }
@@ -475,13 +475,13 @@ void func_80AEB738(EnRu1* this, PlayState* play) {
     skelAnime->baseTransl = skelAnime->jointTable[0];
     skelAnime->prevTransl = skelAnime->jointTable[0];
     if (skelAnime->baseTransl.y < skelAnime->jointTable[0].y) {
-        skelAnime->moveFlags |= 3;
+        skelAnime->movementFlags |= 3;
         AnimationContext_SetMoveActor(play, &this->actor, skelAnime, 1.0f);
     }
 }
 
 void func_80AEB7D0(EnRu1* this) {
-    this->skelAnime.moveFlags &= ~0x3;
+    this->skelAnime.movementFlags &= ~0x3;
 }
 
 f32 func_80AEB7E0(CsCmdActorCue* csCmdNPCAction, PlayState* play) {
@@ -596,8 +596,8 @@ void func_80AEBC30(PlayState* play) {
 
     if (play->csCtx.frames == 0xCD) {
         player = GET_PLAYER(play);
-        Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -771,10 +771,8 @@ void func_80AEC320(EnRu1* this, PlayState* play) {
         func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
         this->action = 7;
         EnRu1_SetMouthIndex(this, 1);
-    } else if (
-        Flags_GetInfTable(INFTABLE_147) && !Flags_GetInfTable(INFTABLE_140) &&
-        GameInteractor_Should(VB_RUTO_BE_CONSIDERED_NOT_KIDNAPPED, !Flags_GetInfTable(INFTABLE_145), this)
-    ) {
+    } else if (Flags_GetInfTable(INFTABLE_147) && !Flags_GetInfTable(INFTABLE_140) &&
+               GameInteractor_Should(VB_RUTO_BE_CONSIDERED_NOT_KIDNAPPED, !Flags_GetInfTable(INFTABLE_145), this)) {
         if (!func_80AEB020(this, play)) {
             func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
             actorRoom = this->actor.room;
@@ -863,9 +861,13 @@ void func_80AEC780(EnRu1* this, PlayState* play) {
     s32 pad;
     Player* player = GET_PLAYER(play);
 
-    if (GameInteractor_Should(VB_PLAY_CHILD_RUTO_INTRO, (func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) && 
-        (!(player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) &&
-        (player->actor.bgCheckFlags & 1), this)) {
+    if (GameInteractor_Should(
+            VB_PLAY_CHILD_RUTO_INTRO,
+            (func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) &&
+                (!(player->stateFlags1 &
+                   (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) &&
+                (player->actor.bgCheckFlags & 1),
+            this)) {
 
         play->csCtx.segment = &D_80AF0880;
         gSaveContext.cutsceneTrigger = 1;
@@ -1006,8 +1008,8 @@ void func_80AECCB0(EnRu1* this, PlayState* play) {
     spawnX = ((kREG(1) + 12.0f) * Math_SinS(yawTowardsPlayer)) + pos->x;
     spawnY = pos->y;
     spawnZ = ((kREG(1) + 12.0f) * Math_CosS(yawTowardsPlayer)) + pos->z;
-    this->blueWarp = (DoorWarp1*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1,
-                                                    spawnX, spawnY, spawnZ, 0, yawTowardsPlayer, 0, WARP_BLUE_RUTO);
+    this->blueWarp = (DoorWarp1*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, spawnX,
+                                                    spawnY, spawnZ, 0, yawTowardsPlayer, 0, WARP_BLUE_RUTO);
 }
 
 void func_80AECDA0(EnRu1* this, PlayState* play) {
@@ -1179,11 +1181,9 @@ void func_80AED414(EnRu1* this, PlayState* play) {
 void func_80AED44C(EnRu1* this, PlayState* play) {
     s8 actorRoom;
 
-    if (
-        Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO) &&
+    if (Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO) &&
         GameInteractor_Should(VB_RUTO_BE_CONSIDERED_NOT_KIDNAPPED, !Flags_GetInfTable(INFTABLE_145), this) &&
-        !Flags_GetInfTable(INFTABLE_140) && !Flags_GetInfTable(INFTABLE_147)
-    ) {
+        !Flags_GetInfTable(INFTABLE_140) && !Flags_GetInfTable(INFTABLE_147)) {
         if (!func_80AEB020(this, play)) {
             func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
             actorRoom = this->actor.room;
@@ -1207,8 +1207,8 @@ void func_80AED4FC(EnRu1* this) {
 void func_80AED520(EnRu1* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    Audio_PlaySoundGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LIFT);
 }
 
@@ -1549,8 +1549,11 @@ s32 func_80AEE394(EnRu1* this, PlayState* play) {
         colCtx = &play->colCtx;
         floorBgId = this->actor.floorBgId; // necessary match, can't move this out of this block unfortunately
         dynaPolyActor = DynaPoly_GetActor(colCtx, floorBgId);
-        if (GameInteractor_Should(VB_RUTO_RUN_TO_SAPPHIRE, dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS &&
-            dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) && play->msgCtx.msgLength == 0, this, dynaPolyActor)) {
+        if (GameInteractor_Should(VB_RUTO_RUN_TO_SAPPHIRE,
+                                  dynaPolyActor != NULL && dynaPolyActor->actor.id == ACTOR_BG_BDAN_OBJECTS &&
+                                      dynaPolyActor->actor.params == 0 && !Player_InCsMode(play) &&
+                                      play->msgCtx.msgLength == 0,
+                                  this, dynaPolyActor)) {
             func_80AEE02C(this);
             play->csCtx.segment = &D_80AF10A4;
             gSaveContext.cutsceneTrigger = 1;
@@ -1610,7 +1613,10 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) {
     s32 pad;
     s8 curRoomNum = play->roomCtx.curRoom.num;
 
-    if (GameInteractor_Should(VB_RUTO_WANT_TO_BE_TOSSED_TO_SAPPHIRE, !Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE) && (func_80AEB124(play) != 0), this)) {
+    if (GameInteractor_Should(VB_RUTO_WANT_TO_BE_TOSSED_TO_SAPPHIRE,
+                              !Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE) &&
+                                  (func_80AEB124(play) != 0),
+                              this)) {
         if (!Player_InCsMode(play)) {
             Animation_Change(&this->skelAnime, &gRutoChildSeesSapphireAnim, 1.0f, 0,
                              Animation_GetLastFrame(&gRutoChildSquirmAnim), ANIMMODE_LOOP, -8.0f);
@@ -2189,11 +2195,9 @@ void func_80AEFF40(EnRu1* this, PlayState* play) {
 void func_80AEFF94(EnRu1* this, PlayState* play) {
     s8 actorRoom;
 
-    if (
-        Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO) && Flags_GetInfTable(INFTABLE_140) &&
+    if (Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_MEET_RUTO) && Flags_GetInfTable(INFTABLE_140) &&
         GameInteractor_Should(VB_RUTO_BE_CONSIDERED_NOT_KIDNAPPED, !Flags_GetInfTable(INFTABLE_145), this) &&
-        (!(func_80AEB020(this, play)))
-    ) {
+        (!(func_80AEB020(this, play)))) {
         func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0);
         actorRoom = this->actor.room;
         this->action = 22;
diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index fabce50e83..f9761b2992 100644
--- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -316,8 +316,7 @@ void EnRu2_SpawnBlueWarp(EnRu2* this, PlayState* play) {
     f32 posY = thisx->world.pos.y;
     f32 posZ = thisx->world.pos.z;
 
-    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0,
-                       WARP_SAGES);
+    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, WARP_SAGES);
 }
 
 /**
@@ -590,8 +589,8 @@ void EnRu2_DrawXlu(EnRu2* this, PlayState* play) {
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
     gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
 
-    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
-                                       NULL, NULL, NULL, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawFlex(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL,
+                                       NULL, NULL, POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index 454046cc91..66e888fcbd 100644
--- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -7,7 +7,9 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnSa_Init(Actor* thisx, PlayState* play);
 void EnSa_Destroy(Actor* thisx, PlayState* play);
@@ -225,7 +227,8 @@ s16 func_80AF56F4(PlayState* play, Actor* thisx) {
 
 void func_80AF57D8(EnSa* this, PlayState* play) {
     if (play->sceneNum != SCENE_SACRED_FOREST_MEADOW ||
-        ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x1555 || this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
+        ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x1555 ||
+        this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
         Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f,
                           func_80AF55E0, func_80AF56F4);
     }
@@ -389,7 +392,8 @@ s32 func_80AF5DFC(EnSa* this, PlayState* play) {
         }
     }
     if (play->sceneNum == SCENE_SARIAS_HOUSE && !LINK_IS_ADULT &&
-        INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
+        INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY &&
+        !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) {
         return 1;
     }
     if (play->sceneNum == SCENE_SACRED_FOREST_MEADOW && (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER))) {
@@ -626,7 +630,8 @@ void func_80AF683C(EnSa* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (!(player->actor.world.pos.z >= -2220.0f) && !Play_InCsMode(play)) {
-        // SOH [General] This flag was previously unused, but was named accordingly so we will make use of it. (Normally we should opt for soh_inf)
+        // SOH [General] This flag was previously unused, but was named accordingly so we will make use of it. (Normally
+        // we should opt for soh_inf)
         Flags_SetEventChkInf(EVENTCHKINF_LEARNED_SARIAS_SONG);
         if (GameInteractor_Should(VB_PLAY_SARIAS_SONG_CS, true, this)) {
             play->csCtx.segment = SEGMENTED_TO_VIRTUAL(spot05_scene_Cs_005730);
@@ -672,7 +677,7 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
             EnSa_ChangeAnim(this, csAction->action);
             this->unk_210 = csAction->action;
         }
-        //if (phi_v0) {}
+        // if (phi_v0) {}
         if (csAction->action == 3) {
             if (this->unk_20C == 0) {
                 phi_v0 = 0;
@@ -681,8 +686,8 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
                 phi_v0 = this->unk_20C;
             }
             if (phi_v0 == 0) {
-                Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->unk_20C = 8;
             }
         }
@@ -743,8 +748,7 @@ void EnSa_Update(Actor* thisx, PlayState* play) {
     if (this->actionFunc != func_80AF68E4) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), 0) != 0) {
             this->alpha = Actor_UpdateAlphaByDistance(&this->actor, play, this->alpha, 32767);
-        }
-        else {
+        } else {
             this->alpha = Actor_UpdateAlphaByDistance(&this->actor, play, this->alpha, 400.0f);
         }
     } else {
@@ -771,8 +775,7 @@ void EnSa_Update(Actor* thisx, PlayState* play) {
     func_80AF5F34(this, play);
 }
 
-s32 EnSa_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnSa_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnSa* this = (EnSa*)thisx;
     s32 pad;
     Vec3s sp18;
diff --git a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c
index 89f9662f7e..496447d495 100644
--- a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c
+++ b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c
@@ -353,18 +353,17 @@ void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) {
             20.0f;
     Matrix_Translate(tempx, 0.0f, tempz, MTXMODE_APPLY);
     Matrix_Scale(((BREG(56) - 250) / 1000.0f) + 0.6f, 1.0f, ((BREG(59) - 250) / 1000.0f) + 0.6f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, D_80AFA3D8);
     gDPLoadTextureBlock(POLY_XLU_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 0x40, 0x40, 0,
                         G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
-    gSPInvalidateTexCache(POLY_XLU_DISP++, (uintptr_t)shadowTexture); // Don't remember this texture, it will only be used this frame.
+    gSPInvalidateTexCache(POLY_XLU_DISP++,
+                          (uintptr_t)shadowTexture); // Don't remember this texture, it will only be used this frame.
     gSPDisplayList(POLY_XLU_DISP++, D_80AFA3F8);
 
     for (phi_s1 = 0; phi_s1 < KREG(78); phi_s1++) {
         Matrix_Scale((KREG(79) / 100.0f) + 1.0f, 1.0f, (KREG(79) / 100.0f) + 1.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, D_80AFA3F8);
     }
     osSyncPrintf("SDA D 2\n");
diff --git a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
index 9b83cbfdfb..5ac3c7e8d8 100644
--- a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
+++ b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c
@@ -73,11 +73,14 @@ void EnShopnuts_Init(Actor* thisx, PlayState* play) {
     CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
     Collider_UpdateCylinder(&this->actor, &this->collider);
 
-    if (GameInteractor_Should(VB_BUSINESS_SCRUB_DESPAWN,
-        ((this->actor.params == DNS_TYPE_HEART_PIECE) && (Flags_GetItemGetInf(ITEMGETINF_DEKU_SCRUB_HEART_PIECE))) ||
-        ((this->actor.params == DNS_TYPE_DEKU_STICK_UPGRADE) && (Flags_GetInfTable(INFTABLE_BOUGHT_STICK_UPGRADE))) ||
-        ((this->actor.params == DNS_TYPE_DEKU_NUT_UPGRADE) && (Flags_GetInfTable(INFTABLE_BOUGHT_NUT_UPGRADE))),
-    this)) {
+    if (GameInteractor_Should(
+            VB_BUSINESS_SCRUB_DESPAWN,
+            ((this->actor.params == DNS_TYPE_HEART_PIECE) &&
+             (Flags_GetItemGetInf(ITEMGETINF_DEKU_SCRUB_HEART_PIECE))) ||
+                ((this->actor.params == DNS_TYPE_DEKU_STICK_UPGRADE) &&
+                 (Flags_GetInfTable(INFTABLE_BOUGHT_STICK_UPGRADE))) ||
+                ((this->actor.params == DNS_TYPE_DEKU_NUT_UPGRADE) && (Flags_GetInfTable(INFTABLE_BOUGHT_NUT_UPGRADE))),
+            this)) {
         Actor_Kill(&this->actor);
     } else {
         EnShopnuts_SetupWait(this);
@@ -264,8 +267,7 @@ void EnShopnuts_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnShopnuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 EnShopnuts_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnShopnuts* this = (EnShopnuts*)thisx;
 
     if ((limbIndex == 9) && (this->actionFunc == EnShopnuts_ThrowNut)) {
@@ -300,8 +302,7 @@ void EnShopnuts_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s*
         }
 
         Matrix_Scale(x, y, z, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gBusinessScrubNoseDL);
         CLOSE_DISPS(play->state.gfxCtx);
     }
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index 742042689c..bd92645450 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -137,7 +137,8 @@ void func_80AFB89C(EnSi* this, PlayState* play) {
 void func_80AFB950(EnSi* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING && GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true)) {
+    if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING &&
+        GameInteractor_Should(VB_FREEZE_ON_SKULL_TOKEN, true)) {
         player->actor.freezeTimer = 10;
     } else {
         SET_GS_FLAGS((this->actor.params & 0x1F00) >> 8, this->actor.params & 0xFF);
diff --git a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
index c32c69066d..7587b7a8bc 100644
--- a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
+++ b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c
@@ -6,6 +6,7 @@
 
 #include "z_en_siofuki.h"
 #include "objects/object_siofuki/object_siofuki.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
@@ -188,7 +189,10 @@ void func_80AFC218(EnSiofuki* this, PlayState* play) {
     func_80AFBE8C(this, play);
     func_80AFC1D0(this, play);
 
-    this->timer--;
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) {
+        this->timer--;
+    }
+
     if (this->timer < 0) {
         Flags_UnsetSwitch(play, ((u16)this->dyna.actor.params >> 6) & 0x3F);
         switch (((u16)this->dyna.actor.params >> 0xC) & 0xF) {
@@ -286,8 +290,7 @@ void EnSiofuki_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     Matrix_Translate(0.0f, this->unk_170, 0.0f, MTXMODE_APPLY);
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     x = gameplayFrames * 15;
     y = gameplayFrames * -15;
     gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(play->state.gfxCtx, 0, x, y, 64, 64, 1, x, y, 64, 64));
diff --git a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c
index f06af32199..b7612dd917 100644
--- a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@@ -290,8 +290,10 @@ void EnSkb_Advance(EnSkb* this, PlayState* play) {
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_WALK);
         }
     }
-    // Don't despawn stallchildren during daytime or when a stalchildren walks too far away from his "home" when enemy randomizer is enabled.
-    if ((Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) > 800.0f || IS_DAY) && !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
+    // Don't despawn stallchildren during daytime or when a stalchildren walks too far away from his "home" when enemy
+    // randomizer is enabled.
+    if ((Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) > 800.0f || IS_DAY) &&
+        !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
         func_80AFCF48(this);
     } else if (Actor_IsFacingPlayer(&this->actor, 0x11C7) &&
                (this->actor.xzDistToPlayer < (60.0f + (this->actor.params * 6.0f)))) {
@@ -557,6 +559,5 @@ void EnSkb_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
 void EnSkb_Draw(Actor* thisx, PlayState* play) {
     EnSkb* this = (EnSkb*)thisx;
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSkb_OverrideLimbDraw,
-                      EnSkb_PostLimbDraw, &this->actor);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSkb_OverrideLimbDraw, EnSkb_PostLimbDraw, &this->actor);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index d5954221cb..e5407bf672 100644
--- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -1,11 +1,14 @@
 #include "z_en_skj.h"
 #include "overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h"
 #include "objects/object_skj/object_skj.h"
+#include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void EnSkj_Init(Actor* thisx, PlayState* play);
 void EnSkj_Destroy(Actor* thisx, PlayState* play);
@@ -402,7 +405,9 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) {
         default:
             this->actor.params = type;
             if (((this->actor.params != 0) && (this->actor.params != 1)) && (this->actor.params != 2)) {
-                if (INV_CONTENT(ITEM_TRADE_ADULT) < ITEM_SAW) {
+                if (INV_CONTENT(ITEM_TRADE_ADULT) < ITEM_SAW &&
+                    CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), ENEMY_RANDOMIZER_OFF) ==
+                        ENEMY_RANDOMIZER_OFF) {
                     Actor_Kill(&this->actor);
                     return;
                 }
@@ -511,8 +516,9 @@ s32 EnSkj_ShootNeedle(EnSkj* this, PlayState* play) {
     pos2.z += this->actor.world.pos.z;
     pos2.y = this->actor.world.pos.y + 27.0f;
 
-    needle = (EnSkjneedle*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SKJNEEDLE, pos2.x, pos2.y, pos2.z,
-                                       this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 0, true);
+    needle =
+        (EnSkjneedle*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SKJNEEDLE, pos2.x, pos2.y, pos2.z,
+                                  this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 0, true);
     if (needle != NULL) {
         needle->killTimer = 100;
         needle->actor.speedXZ = 24.0f;
@@ -892,8 +898,7 @@ void EnSkj_SpawnDeathEffect(EnSkj* this, PlayState* play) {
     effectVel.y = 0.0f;
     effectVel.x = 0.0f;
 
-    EffectSsDeadDb_Spawn(play, &effectPos, &effectVel, &effectAccel, 100, 10, 255, 255, 255, 255, 0, 0, 255, 1, 9,
-                         1);
+    EffectSsDeadDb_Spawn(play, &effectPos, &effectVel, &effectAccel, 100, 10, 255, 255, 255, 255, 0, 0, 255, 1, 9, 1);
 }
 
 void EnSkj_SetupWaitInRange(EnSkj* this) {
@@ -958,8 +963,8 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     // Played a song thats not Saria's song
-    if (!Flags_GetItemGetInf(ITEMGETINF_16) && ((play->msgCtx.msgMode == MSGMODE_OCARINA_FAIL) ||
-                                                 (play->msgCtx.msgMode == MSGMODE_OCARINA_FAIL_NO_TEXT))) {
+    if (!Flags_GetItemGetInf(ITEMGETINF_16) &&
+        ((play->msgCtx.msgMode == MSGMODE_OCARINA_FAIL) || (play->msgCtx.msgMode == MSGMODE_OCARINA_FAIL_NO_TEXT))) {
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
         Message_CloseTextbox(play);
         player->unk_6A8 = &this->actor;
@@ -1042,7 +1047,8 @@ void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) {
         } else {
             func_80AFFE24(this);
             if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
-                Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
+                Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this),
+                                   EnSkj_GetItemYRange(this));
             }
         }
     }
@@ -1053,12 +1059,14 @@ void func_80AFFE24(EnSkj* this) {
 }
 
 void func_80AFFE44(EnSkj* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+    if (Actor_HasParent(&this->actor, play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         this->actor.parent = NULL;
         EnSkj_SetupPostSariasSong(this);
     } else {
         if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
-            Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
+            Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this),
+                               EnSkj_GetItemYRange(this));
         }
     }
 }
@@ -1068,7 +1076,8 @@ void EnSkj_SetupPostSariasSong(EnSkj* this) {
 }
 
 void EnSkj_ChangeModeAfterSong(EnSkj* this, PlayState* play) {
-    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
+    if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
         Flags_SetItemGetInf(ITEMGETINF_16);
         EnSkj_SetNaviId(this);
         EnSkj_SetupWaitInRange(this);
@@ -1409,11 +1418,12 @@ void EnSkj_StartOcarinaMinigame(EnSkj* this, PlayState* play) {
 
     if (dialogState == TEXT_STATE_CLOSING) {
         // #region SOH [Enhancement]
-        if (CVarGetInteger(CVAR_ENHANCEMENT("InstantOcarinaGameWin"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0)) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("InstantOcarinaGameWin"), 0) &&
+            CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0)) {
             play->msgCtx.ocarinaMode = OCARINA_MODE_0F;
             this->songFailTimer = 160;
             this->actionFunc = EnSkj_WaitForPlayback;
-        // #endregion
+            // #endregion
         } else {
             func_8010BD58(play, OCARINA_ACTION_MEMORY_GAME);
             if (sOcarinaMinigameSkullKids[SKULL_KID_LEFT].skullkid != NULL) {
@@ -1472,10 +1482,10 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) {
                 if (this->songFailTimer != 0) {
                     // #region SOH [Enhancement]
                     if (CVarGetInteger(CVAR_ENHANCEMENT("OcarinaUnlimitedFailTime"), 0) == 1 &&
-                        CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0) == 1) { 
+                        CVarGetInteger(CVAR_ENHANCEMENT("CustomizeOcarinaGame"), 0) == 1) {
                         // don't decrement timer
-                    // #endregion
-                    } else {                      
+                        // #endregion
+                    } else {
                         this->songFailTimer--;
                     }
                 } else { // took too long, game failed
@@ -1531,7 +1541,8 @@ void EnSkj_WaitForOfferResponse(EnSkj* this, PlayState* play) {
         switch (play->msgCtx.choiceIndex) {
             case 0: // yes
                 player = GET_PLAYER(play);
-                player->stateFlags3 |= PLAYER_STATE3_FORCE_PULL_OCARINA; // makes player take ocarina out right away after closing box
+                player->stateFlags3 |=
+                    PLAYER_STATE3_FORCE_PULL_OCARINA; // makes player take ocarina out right away after closing box
                 this->actionFunc = EnSkj_SetupWaitForOcarina;
                 break;
             case 1: // no
@@ -1553,8 +1564,7 @@ void EnSkj_WonOcarinaMiniGame(EnSkj* this, PlayState* play) {
 
 void EnSkj_WaitToGiveReward(EnSkj* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
-        Actor_OfferGetItem(&this->actor, play,
-                           sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
+        Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
         this->actionFunc = EnSkj_GiveOcarinaGameReward;
     }
 }
@@ -1564,8 +1574,7 @@ void EnSkj_GiveOcarinaGameReward(EnSkj* this, PlayState* play) {
         this->actor.parent = NULL;
         this->actionFunc = EnSkj_FinishOcarinaGameRound;
     } else {
-        Actor_OfferGetItem(&this->actor, play,
-                           sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
+        Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
     }
 }
 
@@ -1635,8 +1644,7 @@ void EnSkj_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         Matrix_Push();
         Matrix_RotateZYX(-0x4000, 0, 0, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gSkullKidSkullMaskDL);
         Matrix_Pop();
     }
diff --git a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
index fc744981dd..6dd2eb7d68 100644
--- a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
+++ b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
@@ -104,8 +104,7 @@ void EnSkjneedle_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gSkullKidNeedleDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
index 2b112e2bd1..37c9df3d30 100644
--- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@@ -3,7 +3,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 #define SSH_STATE_STUNNED (1 << 0)
 #define SSH_STATE_GROUND_START (1 << 2)
@@ -160,8 +162,8 @@ s32 EnSsh_CheckCeilingPos(EnSsh* this, PlayState* play) {
     posB.x = this->actor.world.pos.x;
     posB.y = this->actor.world.pos.y + 1000.0f;
     posB.z = this->actor.world.pos.z;
-    if (!BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &posB, &this->ceilingPos, &poly, false,
-                                 false, true, true, &bgId)) {
+    if (!BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &posB, &this->ceilingPos, &poly, false, false,
+                                 true, true, &bgId)) {
         return false;
     } else {
         return true;
@@ -701,10 +703,11 @@ void EnSsh_Idle(EnSsh* this, PlayState* play) {
                 this->actor.textId = Text_GetFaceReaction(play, 0xD);
                 if (this->actor.textId == 0) {
                     if (this->actor.params == ENSSH_FATHER) {
-                        // #region SOH [Randomizer] Skip the complexity of the father's text when he should just give a hint
-                        if (IS_RANDO && Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT)){
+                        // #region SOH [Randomizer] Skip the complexity of the father's text when he should just give a
+                        // hint
+                        if (IS_RANDO && Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT)) {
                             this->actor.textId = 0x27;
-                        // #endregion
+                            // #endregion
                         } else {
                             if (gSaveContext.inventory.gsTokens >= 50) {
                                 this->actor.textId = 0x29;
@@ -894,6 +897,5 @@ void EnSsh_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->blinkState]));
     CLOSE_DISPS(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSsh_OverrideLimbDraw,
-                      EnSsh_PostLimbDraw, &this->actor);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSsh_OverrideLimbDraw, EnSsh_PostLimbDraw, &this->actor);
 }
diff --git a/soh/src/overlays/actors/ovl_En_St/z_en_st.c b/soh/src/overlays/actors/ovl_En_St/z_en_st.c
index c7c8d08653..99f4617bb9 100644
--- a/soh/src/overlays/actors/ovl_En_St/z_en_st.c
+++ b/soh/src/overlays/actors/ovl_En_St/z_en_st.c
@@ -9,7 +9,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void EnSt_Init(Actor* thisx, PlayState* play);
 void EnSt_Destroy(Actor* thisx, PlayState* play);
@@ -1089,6 +1091,5 @@ void EnSt_Draw(Actor* thisx, PlayState* play) {
 
     EnSt_CheckBodyStickHit(this, play);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSt_OverrideLimbDraw,
-                      EnSt_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSt_OverrideLimbDraw, EnSt_PostLimbDraw, this);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 82a98a35b1..1cbc8c5efc 100644
--- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -66,12 +66,8 @@ static s16 sObjectIds[6] = {
 };
 
 static FlexSkeletonHeader* sSkeletons[6] = {
-    &object_ahg_Skel_0000F0,
-    &object_boj_Skel_0000F0,
-    &object_boj_Skel_0000F0,
-    &object_boj_Skel_0000F0,
-    &object_boj_Skel_0000F0,
-    &object_boj_Skel_0000F0,
+    &object_ahg_Skel_0000F0, &object_boj_Skel_0000F0, &object_boj_Skel_0000F0,
+    &object_boj_Skel_0000F0, &object_boj_Skel_0000F0, &object_boj_Skel_0000F0,
 };
 
 static AnimationHeader* sAnimations[6] = {
@@ -174,8 +170,8 @@ void EnSth_SetupAfterObjectLoaded(EnSth* this, PlayState* play) {
 
     EnSth_SetupShapeColliderUpdate2AndDraw(this, play);
     gSegments[6] = PHYSICAL_TO_VIRTUAL(play->objectCtx.status[this->objectBankIdx].segment);
-    SkelAnime_InitFlex(play, &this->skelAnime, sSkeletons[this->actor.params], NULL, this->jointTable,
-                       this->morphTable, 16);
+    SkelAnime_InitFlex(play, &this->skelAnime, sSkeletons[this->actor.params], NULL, this->jointTable, this->morphTable,
+                       16);
     Animation_PlayLoop(&this->skelAnime, sAnimations[this->actor.params]);
 
     this->eventFlag = sEventFlags[this->actor.params];
@@ -284,7 +280,8 @@ void EnSth_GiveReward(EnSth* this, PlayState* play) {
         EnSth_SetupAction(this, EnSth_RewardObtainedTalk);
         gSaveContext.eventChkInf[EVENTCHKINF_SKULLTULA_REWARD_INDEX] |= this->eventFlag;
         if (this->eventFlag != 0) {
-            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) + sEventFlagsShift[this->actor.params]);
+            GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) +
+                                                                      sEventFlagsShift[this->actor.params]);
         }
     } else if (GameInteractor_Should(VB_GIVE_ITEM_FROM_SKULLTULA_REWARD, true, this)) {
         EnSth_GivePlayerItem(this, play);
diff --git a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c
index d5d8c6d8bc..e6aa8df951 100644
--- a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c
+++ b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c
@@ -134,12 +134,11 @@ void EnStream_Draw(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     multipliedFrames = frames * 20;
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, frames * 30, -multipliedFrames, 0x40, 0x40, 1,
-                                multipliedFrames, -multipliedFrames, 0x40, 0x40));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, frames * 30, -multipliedFrames, 0x40, 0x40, 1, multipliedFrames,
+                                -multipliedFrames, 0x40, 0x40));
     gSPDisplayList(POLY_XLU_DISP++, object_stream_DL_000950);
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c
index 79adaaa960..c5c8e6167f 100644
--- a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c
+++ b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c
@@ -268,7 +268,8 @@ void EnSw_Init(Actor* thisx, PlayState* play) {
     }
 
     if (((thisx->params & 0xE000) >> 0xD) >= 3) {
-        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     switch ((thisx->params & 0xE000) >> 0xD) {
@@ -359,7 +360,7 @@ s32 func_80B0C9F0(EnSw* this, PlayState* play) {
                 this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
                 this->actionFunc = func_80B0DB00;
             }
-            
+
             GameInteractor_ExecuteOnEnemyDefeat(&this->actor);
 
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALWALL_DEAD);
@@ -554,7 +555,9 @@ void func_80B0D590(EnSw* this, PlayState* play) {
             this->collider.elements[0].info.ocElemFlags = 1;
         }
 
-        Math_ApproachF(&this->actor.scale.x, !IS_DAY || CVarGetInteger(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), 0) ? 0.02f : 0.0f, 0.2f, 0.01f);
+        Math_ApproachF(&this->actor.scale.x,
+                       !IS_DAY || CVarGetInteger(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), 0) ? 0.02f : 0.0f, 0.2f,
+                       0.01f);
         Actor_SetScale(&this->actor, this->actor.scale.x);
     }
 
@@ -618,13 +621,14 @@ void func_80B0D878(EnSw* this, PlayState* play) {
     this->actor.shape.rot = this->actor.world.rot;
 
     if ((this->unk_394 == 0) && (this->unk_392 == 0)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         x = (this->unk_364.x * 10.0f);
         y = (this->unk_364.y * 10.0f);
         z = (this->unk_364.z * 10.0f);
-        temp_v0 = Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SI,
-                                        this->actor.world.pos.x + x, this->actor.world.pos.y + y,
-                                        this->actor.world.pos.z + z, 0, 0, 0, this->actor.params);
+        temp_v0 =
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SI, this->actor.world.pos.x + x,
+                               this->actor.world.pos.y + y, this->actor.world.pos.z + z, 0, 0, 0, this->actor.params);
         if (temp_v0 != NULL) {
             temp_v0->parent = NULL;
         }
@@ -637,8 +641,7 @@ void func_80B0D878(EnSw* this, PlayState* play) {
         pos.y += 10.0f + ((Rand_ZeroOne() - 0.5f) * 6.0f);
         pos.x += (Rand_ZeroOne() - 0.5f) * 32.0f;
         pos.z += (Rand_ZeroOne() - 0.5f) * 32.0f;
-        EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9,
-                             true);
+        EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true);
     }
 }
 
@@ -676,8 +679,7 @@ void func_80B0DC7C(EnSw* this, PlayState* play) {
         pos.y = ((Rand_ZeroOne() - 0.5f) * 6.0f) + (this->actor.world.pos.y + 10.0f);
         pos.x = ((Rand_ZeroOne() - 0.5f) * 32.0f) + this->actor.world.pos.x;
         pos.z = ((Rand_ZeroOne() - 0.5f) * 32.0f) + this->actor.world.pos.z;
-        EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9,
-                             1);
+        EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, 1);
         this->actor.shape.rot.x += 0x1000;
         this->actor.shape.rot.z += 0x1000;
     } else {
@@ -709,8 +711,8 @@ s32 func_80B0DEA8(EnSw* this, PlayState* play, s32 arg2) {
         return false;
     } else if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &player->actor.world.pos) >= 130.0f) {
         return false;
-    } else if (!BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &sp48,
-                                        &sp58, true, false, false, true, &sp54)) {
+    } else if (!BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &player->actor.world.pos, &sp48, &sp58,
+                                        true, false, false, true, &sp54)) {
         return true;
     } else {
         return false;
@@ -732,16 +734,16 @@ s32 func_80B0DFFC(EnSw* this, PlayState* play) {
                                         false, false, true, &sp5C)) {
         sp4C = false;
     } else if (((play->state.frames % 4) == 1) &&
-               BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &this->unk_460, &sp50, &sp60, true,
-                                       false, false, true, &sp5C)) {
+               BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &this->unk_460, &sp50, &sp60, true, false,
+                                       false, true, &sp5C)) {
         sp4C = false;
     } else if (((play->state.frames % 4) == 2) &&
                !BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &this->subCamId, &sp50, &sp60, true,
                                         false, false, true, &sp5C)) {
         sp4C = false;
     } else if (((play->state.frames % 4) == 3) &&
-               BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &this->unk_478, &sp50, &sp60, true,
-                                       false, false, true, &sp5C)) {
+               BgCheck_EntityLineTest1(&play->colCtx, &this->actor.world.pos, &this->unk_478, &sp50, &sp60, true, false,
+                                       false, true, &sp5C)) {
         sp4C = false;
     }
 
@@ -1017,8 +1019,7 @@ void EnSw_Draw(Actor* thisx, PlayState* play) {
     }
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSw_OverrideLimbDraw,
-                      EnSw_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnSw_OverrideLimbDraw, EnSw_PostLimbDraw, this);
     if (this->actionFunc == func_80B0E728) {
         func_80B0EEA4(play);
     }
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index 06f679bbc9..2e8d0f04d0 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -73,8 +73,8 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) {
     EnSyatekiItm* this = (EnSyatekiItm*)thisx;
     s32 i;
 
-    this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SYATEKI_MAN,
-                                                  140.0f, 0.0f, 255.0f, 0, -0x4000, 0, 0);
+    this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SYATEKI_MAN, 140.0f,
+                                                  0.0f, 255.0f, 0, -0x4000, 0, 0);
     if (this->man == NULL) {
         // "Spawn error"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" VT_RST);
@@ -82,9 +82,8 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) {
         return;
     }
     for (i = 0; i < 10; i++) {
-        this->markers[i] =
-            (EnExRuppy*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_RUPPY,
-                                           sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4);
+        this->markers[i] = (EnExRuppy*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_RUPPY,
+                                                          sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4);
         if (this->markers[i] == NULL) {
             // "Second spawn error"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" VT_RST);
@@ -111,8 +110,10 @@ void EnSyatekiItm_Idle(EnSyatekiItm* this, PlayState* play) {
         player->actor.world.rot.x = player->actor.shape.rot.x = player->actor.world.rot.z = player->actor.shape.rot.z =
             0;
         s32 ammunition = 15;
-        if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+        if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
+            ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult")
+                                                      : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"),
+                                        15);
         }
         func_8008EF44(play, ammunition);
         this->roundNum = this->hitCount = 0;
@@ -132,7 +133,8 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (this->unkTimer == 0) {
-        if (LINK_IS_ADULT && !(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("ConstantAdultGallery"), 0))) {
+        if (LINK_IS_ADULT && !(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0) &&
+                               CVarGetInteger(CVAR_ENHANCEMENT("ConstantAdultGallery"), 0))) {
             for (i = 0, j = 0; i < SYATEKI_ROUND_MAX; i++) {
                 if (this->roundFlags[i]) {
                     j++;
@@ -238,8 +240,8 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, PlayState* play) {
 
         for (i = 0; i < this->numTargets; i++) {
             this->targets[i] = (EnGSwitch*)Actor_SpawnAsChild(
-                &play->actorCtx, &this->actor, play, ACTOR_EN_G_SWITCH, this->targetHome[i].x,
-                this->targetHome[i].y, this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F);
+                &play->actorCtx, &this->actor, play, ACTOR_EN_G_SWITCH, this->targetHome[i].x, this->targetHome[i].y,
+                this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F);
             if (this->targets[i] == NULL) {
                 // "Rupee spawn error"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" VT_RST);
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 63e3f8e6d5..01052b9bb6 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -8,7 +8,9 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_LOCK_ON_DISABLED)
 
 typedef enum {
     /* 0 */ SYATEKI_RESULT_NONE,
@@ -286,7 +288,8 @@ void EnSyatekiMan_StartGame(EnSyatekiMan* this, PlayState* play) {
         Message_CloseTextbox(play);
         gallery = ((EnSyatekiItm*)this->actor.parent);
         if (gallery->actor.update != NULL) {
-            if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("InstantShootingGalleryWin"), 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0) &&
+                CVarGetInteger(CVAR_ENHANCEMENT("InstantShootingGalleryWin"), 0)) {
                 gallery->hitCount = 10;
                 gallery->signal = ENSYATEKI_END;
             } else {
@@ -387,8 +390,10 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
                 case SYATEKI_RESULT_ALMOST:
                     this->timer = 20;
                     s32 ammunition = 15;
-                    if(CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
-                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult") : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"), 15);
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeShootingGallery"), 0)) {
+                        ammunition = CVarGetInteger(LINK_IS_ADULT ? CVAR_ENHANCEMENT("ShootingGalleryAmmoAdult")
+                                                                  : CVAR_ENHANCEMENT("ShootingGalleryAmmoChild"),
+                                                    15);
                     }
                     func_8008EF44(play, ammunition);
                     this->actionFunc = EnSyatekiMan_RestartGame;
@@ -407,25 +412,28 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
             }
         }
     }
-} 
+}
 
 void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
     if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         this->actionFunc = EnSyatekiMan_FinishPrize;
-    } else { 
+    } else {
         Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
     }
 }
 
 void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, PlayState* play) {
     SkelAnime_Update(&this->skelAnime);
-    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
+    if (((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
         // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (!LINK_IS_ADULT) {
             Flags_SetItemGetInf(ITEMGETINF_0D);
-        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD, (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50), this)) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_ADULT_SHOOTING_GAME_REWARD,
+                                         (this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50),
+                                         this)) {
             Flags_SetItemGetInf(ITEMGETINF_0E);
         }
         this->gameResult = SYATEKI_RESULT_NONE;
@@ -494,8 +502,7 @@ void EnSyatekiMan_Update(Actor* thisx, PlayState* play) {
     func_80038290(play, &this->actor, &this->headRot, &this->bodyRot, this->actor.focus.pos);
 }
 
-s32 EnSyatekiMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 EnSyatekiMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnSyatekiMan* this = (EnSyatekiMan*)thisx;
     s32 turnDirection;
 
diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
index 29fda2421f..6387e4b2b5 100644
--- a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
+++ b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
@@ -459,8 +459,8 @@ void func_80B12460(EnSyatekiNiw* this, PlayState* play) {
             }
 
             if ((this->unk_25A == 0) && ((player->actor.world.pos.z - 30.0f) < this->actor.world.pos.z)) {
-                Audio_PlaySoundGeneral(NA_SE_VO_LI_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_VO_LI_DOWN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->unk_25E = 0x14;
                 this->unk_29A = 6;
                 this->actor.speedXZ = 0.0f;
@@ -496,7 +496,7 @@ void func_80B12460(EnSyatekiNiw* this, PlayState* play) {
 
 void func_80B128D8(EnSyatekiNiw* this, PlayState* play) {
     if (this->unk_25E == 1) {
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
     }
 }
 
@@ -670,8 +670,7 @@ void EnSyatekiNiw_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 SyatekiNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                void* thisx) {
+s32 SyatekiNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnSyatekiNiw* this = (EnSyatekiNiw*)thisx;
     Vec3f sp0 = { 0.0f, 0.0f, 0.0f };
 
@@ -784,8 +783,7 @@ void func_80B13464(EnSyatekiNiw* this, PlayState* play) {
             Matrix_RotateZ(ptr->unk_30, MTXMODE_APPLY);
             Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherModelDL);
             FrameInterpolation_RecordCloseChild();
         }
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index 0498123036..a01d18f980 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -106,8 +106,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
     PlayState* play = play2;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &gTalonSkel, &gTalonStandAnim, this->jointTable, this->morphTable,
-                       17);
+    SkelAnime_InitFlex(play, &this->skelAnime, &gTalonSkel, &gTalonStandAnim, this->jointTable, this->morphTable, 17);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
 
@@ -240,7 +239,7 @@ void EnTa_Destroy(Actor* thisx, PlayState* play) {
     Collider_DestroyCylinder(play, &this->collider);
 
     if (this->actor.params != 1 && this->actor.params != 2 && play->sceneNum == SCENE_LON_LON_BUILDINGS) {
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
     }
 
     if (this->unk_2E0 & 0x200) {
@@ -708,7 +707,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
 
                     switch (EnTa_GetSuperCuccosCount(this, play)) {
                         case 1:
-                            gSaveContext.timer1State = 0;
+                            gSaveContext.timerState = 0;
                             Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
 
                             Message_StartTextbox(play, 0x2084, &this->actor);
@@ -742,15 +741,15 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
         }
     }
 
-    if (gSaveContext.timer1Value == 10) {
+    if (gSaveContext.timerSeconds == 10) {
         func_800F5918();
     }
 
-    if (gSaveContext.timer1Value == 0 && !Play_InCsMode(play)) {
+    if (gSaveContext.timerSeconds == 0 && !Play_InCsMode(play)) {
         Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
         this->unk_2E0 &= ~0x200;
         Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
-        gSaveContext.timer1State = 0;
+        gSaveContext.timerState = 0;
         Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
         Message_StartTextbox(play, 0x2081, &this->actor);
         this->actionFunc = func_80B15424;
@@ -871,7 +870,8 @@ void EnTa_TalkGeneralInLonLonHouse(EnTa* this, PlayState* play) {
 }
 
 void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
-    if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
+    if (Actor_HasParent(&this->actor, play) ||
+        !GameInteractor_Should(VB_GIVE_ITEM_FROM_TALONS_CHICKENS, true, &this->actor)) {
         this->actor.parent = NULL;
         this->actionFunc = EnTa_TalkGeneralInLonLonHouse;
         if (!(this->unk_2E0 & 0x2)) {
diff --git a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
index 7a450ae8ac..e1a0c3f907 100644
--- a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
+++ b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
@@ -10,7 +10,9 @@
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                  \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
 
 void EnTakaraMan_Init(Actor* thisx, PlayState* play);
 void EnTakaraMan_Reset(Actor* thisx, PlayState* play);
@@ -106,20 +108,20 @@ void func_80B1778C(EnTakaraMan* this, PlayState* play) {
     } else {
         yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
         if (play->roomCtx.curRoom.num == 6 && !this->unk_21A) {
-            this->actor.textId = 0x6E; //Real Gambler
+            this->actor.textId = 0x6E; // Real Gambler
             this->unk_21A = 1;
             this->dialogState = TEXT_STATE_DONE;
         }
 
         if (!this->unk_21A && this->unk_214) {
             if (Flags_GetSwitch(play, 0x32)) {
-                this->actor.textId = 0x84; //Thanks a lot! (Lost)
+                this->actor.textId = 0x84; // Thanks a lot! (Lost)
                 // with text state event, it is only possible to talk to the person running the game
                 // once. we want the player to be able to ask again if they accidentally blast through
                 // the greg hint box, so we check for greg hint here
                 this->dialogState = Randomizer_GetSettingValue(RSK_GREG_HINT) ? TEXT_STATE_DONE : TEXT_STATE_EVENT;
             } else {
-                this->actor.textId = 0x704C; //Proceed
+                this->actor.textId = 0x704C; // Proceed
                 this->dialogState = TEXT_STATE_DONE;
             }
         }
@@ -211,8 +213,7 @@ void EnTakaraMan_Update(Actor* thisx, PlayState* play) {
     this->actionFunc(this, play);
 }
 
-s32 EnTakaraMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx) {
+s32 EnTakaraMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnTakaraMan* this = (EnTakaraMan*)thisx;
 
     if (limbIndex == 1) {
diff --git a/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c
index 1b4ab41c4d..fe418c5ea0 100644
--- a/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c
+++ b/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c
@@ -76,8 +76,7 @@ void EnTana_DrawWoodenShelves(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -90,8 +89,7 @@ void EnTana_DrawStoneShelves(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sStoneTextures[thisx->params]));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c
index 9f1b675208..0bcf45a8b5 100644
--- a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c
+++ b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c
@@ -260,8 +260,8 @@ void EnTest_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
 
-    SkelAnime_Init(play, &this->skelAnime, &gStalfosSkel, &gStalfosMiddleGuardAnim, this->jointTable,
-                   this->morphTable, STALFOS_LIMB_MAX);
+    SkelAnime_Init(play, &this->skelAnime, &gStalfosSkel, &gStalfosMiddleGuardAnim, this->jointTable, this->morphTable,
+                   STALFOS_LIMB_MAX);
     SkelAnime_Init(play, &this->upperSkelanime, &gStalfosSkel, &gStalfosMiddleGuardAnim, this->upperJointTable,
                    this->upperMorphTable, STALFOS_LIMB_MAX);
 
@@ -1595,7 +1595,7 @@ void func_8086318C(EnTest* this, PlayState* play) {
 
 void EnTest_SetupRecoil(EnTest* this) {
     this->meleeWeaponState = 0;
-    this->skelAnime.moveFlags = 2;
+    this->skelAnime.movementFlags = 2;
     this->unk_7C8 = 0x13;
     this->skelAnime.playSpeed = -1.0f;
     this->skelAnime.startFrame = this->skelAnime.curFrame;
@@ -1834,13 +1834,13 @@ s32 EnTest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
         OPEN_DISPS(play->state.gfxCtx);
 
         gDPPipeSync(POLY_OPA_DISP++);
-        gDPSetEnvColor(POLY_OPA_DISP++, 80 + ABS((s16)(Math_SinS(play->gameplayFrames * 2000) * 175.0f)), 0, 0,
-                       255);
+        gDPSetEnvColor(POLY_OPA_DISP++, 80 + ABS((s16)(Math_SinS(play->gameplayFrames * 2000) * 175.0f)), 0, 0, 255);
 
         CLOSE_DISPS(play->state.gfxCtx);
     }
 
-    if ((this->actor.params == STALFOS_TYPE_INVISIBLE) && !CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) {
+    if ((this->actor.params == STALFOS_TYPE_INVISIBLE) &&
+        !CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) {
         *dList = NULL;
     }
 
@@ -1959,8 +1959,7 @@ void EnTest_Draw(Actor* thisx, PlayState* play) {
     func_8002EBCC(&this->actor, play, 1);
 
     if ((thisx->params <= STALFOS_TYPE_CEILING) || (thisx->child == NULL)) {
-        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnTest_OverrideLimbDraw,
-                          EnTest_PostLimbDraw, this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnTest_OverrideLimbDraw, EnTest_PostLimbDraw, this);
     }
 
     if (this->iceTimer != 0) {
@@ -1970,8 +1969,8 @@ void EnTest_Draw(Actor* thisx, PlayState* play) {
         if ((this->iceTimer % 4) == 0) {
             s32 iceIndex = this->iceTimer >> 2;
 
-            EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[iceIndex], 150, 150, 150, 250, 235,
-                                           245, 255, 1.5f);
+            EffectSsEnIce_SpawnFlyingVec3s(play, thisx, &this->bodyPartsPos[iceIndex], 150, 150, 150, 250, 235, 245,
+                                           255, 1.5f);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c
index 834ec5823b..a7574e1791 100644
--- a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@@ -879,8 +879,8 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) {
             }
         }
         // If hammer has recently hit the floor and player is close to tektite, flip over
-    } else if ((thisx->colChkInfo.health != 0) && (play->actorCtx.unk_02 != 0) &&
-               (thisx->xzDistToPlayer <= 400.0f) && (thisx->bgCheckFlags & 1)) {
+    } else if ((thisx->colChkInfo.health != 0) && (play->actorCtx.unk_02 != 0) && (thisx->xzDistToPlayer <= 400.0f) &&
+               (thisx->bgCheckFlags & 1)) {
         if (this->flipState == TEKTITE_FLIPPED) {
             EnTite_SetupFlipUpright(this);
         } else if ((this->action >= TEKTITE_IDLE) || (this->action >= TEKTITE_IDLE)) {
@@ -906,29 +906,29 @@ void EnTite_Update(Actor* thisx, PlayState* play) {
         if ((this->actor.params == TEKTITE_BLUE) && (thisx->bgCheckFlags & 0x20)) {
             floorPoly = thisx->floorPoly;
             if ((((play->gameplayFrames % 8) == 0) || (thisx->velocity.y < 0.0f)) &&
-                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->backRightFootPos.x,
-                                         this->backRightFootPos.z, &waterSurfaceY, &waterBox)) &&
+                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->backRightFootPos.x, this->backRightFootPos.z,
+                                         &waterSurfaceY, &waterBox)) &&
                 (this->backRightFootPos.y <= waterSurfaceY)) {
                 this->backRightFootPos.y = waterSurfaceY;
                 EffectSsGRipple_Spawn(play, &this->backRightFootPos, 0, 220, 0);
             }
             if (((((play->gameplayFrames + 2) % 8) == 0) || (thisx->velocity.y < 0.0f)) &&
-                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->backLeftFootPos.x,
-                                         this->backLeftFootPos.z, &waterSurfaceY, &waterBox)) &&
+                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->backLeftFootPos.x, this->backLeftFootPos.z,
+                                         &waterSurfaceY, &waterBox)) &&
                 (this->backLeftFootPos.y <= waterSurfaceY)) {
                 this->backLeftFootPos.y = waterSurfaceY;
                 EffectSsGRipple_Spawn(play, &this->backLeftFootPos, 0, 220, 0);
             }
             if (((((play->gameplayFrames + 4) % 8) == 0) || (thisx->velocity.y < 0.0f)) &&
-                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->frontLeftFootPos.x,
-                                         this->frontLeftFootPos.z, &waterSurfaceY, &waterBox)) &&
+                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->frontLeftFootPos.x, this->frontLeftFootPos.z,
+                                         &waterSurfaceY, &waterBox)) &&
                 (this->frontLeftFootPos.y <= waterSurfaceY)) {
                 this->frontLeftFootPos.y = waterSurfaceY;
                 EffectSsGRipple_Spawn(play, &this->frontLeftFootPos, 0, 220, 0);
             }
             if (((((play->gameplayFrames + 1) % 8) == 0) || (thisx->velocity.y < 0.0f)) &&
-                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->frontRightFootPos.x,
-                                         this->frontRightFootPos.z, &waterSurfaceY, &waterBox)) &&
+                (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->frontRightFootPos.x, this->frontRightFootPos.z,
+                                         &waterSurfaceY, &waterBox)) &&
                 (this->frontRightFootPos.y <= waterSurfaceY)) {
                 this->frontRightFootPos.y = waterSurfaceY;
                 EffectSsGRipple_Spawn(play, &this->frontRightFootPos, 0, 220, 0);
@@ -996,8 +996,7 @@ void EnTite_Draw(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001F00));
         gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_002100));
     }
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnTite_PostLimbDraw,
-                      thisx);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, NULL, EnTite_PostLimbDraw, thisx);
     CLOSE_DISPS(play->state.gfxCtx);
 
     if (this->spawnIceTimer != 0) {
diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index e9a89a550f..96ce945e48 100644
--- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -115,8 +115,7 @@ void EnTkEff_Draw(EnTk* this, PlayState* play) {
             Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(eff->size, eff->size, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(dustTextures) / eff->timeTotal);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTextures[imageIdx]));
@@ -496,7 +495,10 @@ void EnTk_Init(Actor* thisx, PlayState* play) {
 
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
 
-    if (GameInteractor_Should(VB_DAMPE_IN_GRAVEYARD_DESPAWN, gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT || play->sceneNum != SCENE_GRAVEYARD, this)) {
+    if (GameInteractor_Should(VB_DAMPE_IN_GRAVEYARD_DESPAWN,
+                              gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || LINK_IS_ADULT ||
+                                  play->sceneNum != SCENE_GRAVEYARD,
+                              this)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -588,8 +590,9 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
     Vec3f rewardPos;
     s32 rewardParams[] = {
         ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_PURPLE,
-        // #region SOH [General] Typically this heart piece would have no collectible flag set when it's picked up, but for both randomizer
-        // and gGravediggingTourFix we want to set one, and rely on it instead of the ItemGetInf flag that is set when the heart is spawned
+        // #region SOH [General] Typically this heart piece would have no collectible flag set when it's picked up, but
+        // for both randomizer and gGravediggingTourFix we want to set one, and rely on it instead of the ItemGetInf
+        // flag that is set when the heart is spawned
         ((COLLECTFLAG_GRAVEDIGGING_HEART_PIECE & 0x3F) << 8) | ITEM00_HEART_PIECE,
         // #endregion
     };
@@ -621,7 +624,8 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
                  * Upgrade the purple rupee reward to the heart piece if this
                  * is the first grand prize dig.
                  */
-                if (GameInteractor_Should(VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE, !Flags_GetItemGetInf(ITEMGETINF_1C), this)) {
+                if (GameInteractor_Should(VB_DAMPE_GRAVEDIGGING_GRAND_PRIZE_BE_HEART_PIECE,
+                                          !Flags_GetItemGetInf(ITEMGETINF_1C), this)) {
                     Flags_SetItemGetInf(ITEMGETINF_1C);
                     this->currentReward = 4;
                 }
@@ -638,7 +642,8 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
             Audio_PlayActorSound2(&this->actor, NA_SE_SY_ERROR);
         } else if (this->currentReward == 4) {
             /* Heart piece */
-            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             /* Rupee */
             Audio_PlayActorSound2(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
diff --git a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
index 378e93bb6f..ceca597df8 100644
--- a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+++ b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
@@ -8,7 +8,9 @@
 #include "objects/object_torch2/object_torch2.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
+#define FLAGS                                                                                 \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
+     ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 typedef enum {
     /* 0 */ ENTORCH2_WAIT,
@@ -128,7 +130,8 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) {
 
     // Change Dark Link to regular enemy instead of boss with enemy randomizer and crowd control.
     // This way Dark Link will be considered for "clear enemy" rooms properly.
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) || (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
+        (CVarGetInteger(CVAR_REMOTE_CROWD_CONTROL("Enabled"), 0))) {
         Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_ENEMY);
     }
 
@@ -202,8 +205,7 @@ s32 EnTorch2_SwingSword(PlayState* play, Input* input, Player* this) {
     if (sAlpha != 255) {
         noAttackChance += 2.0f;
     }
-    if ((((play->gameplayFrames & attackDelay) == 0) || (sSwordJumpState != 0)) &&
-        (noAttackChance <= Rand_ZeroOne())) {
+    if ((((play->gameplayFrames & attackDelay) == 0) || (sSwordJumpState != 0)) && (noAttackChance <= Rand_ZeroOne())) {
         if (sSwordJumpState == 0) {
             switch ((s32)(Rand_ZeroOne() * 7.0f)) {
                 case 1:
@@ -291,7 +293,8 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
 
             // Handles Dark Link's sword clanking on Link's sword
 
-            if ((this->meleeWeaponQuads[0].base.acFlags & AC_BOUNCED) || (this->meleeWeaponQuads[1].base.acFlags & AC_BOUNCED)) {
+            if ((this->meleeWeaponQuads[0].base.acFlags & AC_BOUNCED) ||
+                (this->meleeWeaponQuads[1].base.acFlags & AC_BOUNCED)) {
                 this->meleeWeaponQuads[0].base.acFlags &= ~AC_BOUNCED;
                 this->meleeWeaponQuads[1].base.acFlags &= ~AC_BOUNCED;
                 this->meleeWeaponQuads[0].base.atFlags |= AT_BOUNCED;
@@ -366,7 +369,8 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
                                            player->actor.world.pos.z,
                                        1.0f, 5.0f, 0.0f);
                     sSwordJumpTimer--;
-                    if (((u32)sSwordJumpTimer == 0) || ((player->invincibilityTimer > 0) && (this->meleeWeaponState == 0))) {
+                    if (((u32)sSwordJumpTimer == 0) ||
+                        ((player->invincibilityTimer > 0) && (this->meleeWeaponState == 0))) {
                         this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
                         input->cur.button = BTN_A;
                         player->stateFlags3 &= ~PLAYER_STATE3_PAUSE_ACTION_FUNC;
@@ -398,9 +402,9 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
                             // Handles the reaction to a one-handed stab. If the conditions are satisfied,
                             // Dark Link jumps on Link's sword. Otherwise he backflips away.
 
-                            if ((this->meleeWeaponState == 0) && (sCounterState == 0) && (player->invincibilityTimer == 0) &&
-                                (player->meleeWeaponAnimation == STAB_1H) && (this->actor.xzDistToPlayer <= 85.0f) &&
-                                Actor_IsTargeted(play, &this->actor)) {
+                            if ((this->meleeWeaponState == 0) && (sCounterState == 0) &&
+                                (player->invincibilityTimer == 0) && (player->meleeWeaponAnimation == STAB_1H) &&
+                                (this->actor.xzDistToPlayer <= 85.0f) && Actor_IsTargeted(play, &this->actor)) {
 
                                 sStickTilt = 0.0f;
                                 sSwordJumpState = 1;
@@ -452,10 +456,12 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
                         sStickAngle = thisx->yawTowardsPlayer;
                         sp50 = 0.0f;
                         if ((90.0f >= this->actor.xzDistToPlayer) && (this->actor.xzDistToPlayer > 70.0f) &&
-                            (ABS(sp5A) >= 0x7800) && (this->actor.isTargeted || !(player->stateFlags1 & PLAYER_STATE1_SHIELDING))) {
+                            (ABS(sp5A) >= 0x7800) &&
+                            (this->actor.isTargeted || !(player->stateFlags1 & PLAYER_STATE1_SHIELDING))) {
                             EnTorch2_SwingSword(play, input, this);
                         } else if (((this->actor.xzDistToPlayer <= 70.0f) ||
-                                    ((this->actor.xzDistToPlayer <= 80.0f + sp50) && (player->meleeWeaponState != 0))) &&
+                                    ((this->actor.xzDistToPlayer <= 80.0f + sp50) &&
+                                     (player->meleeWeaponState != 0))) &&
                                    (this->meleeWeaponState == 0)) {
                             if (!EnTorch2_SwingSword(play, input, this) && (this->meleeWeaponState == 0) &&
                                 (sCounterState == 0)) {
@@ -469,7 +475,8 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
                             }
                         } else if (this->actor.xzDistToPlayer > 100.0f + sp50) {
                             if ((player->meleeWeaponState == 0) || (player->meleeWeaponAnimation < SPIN_ATTACK_1H) ||
-                                (player->meleeWeaponAnimation > BIG_SPIN_2H) || (this->actor.xzDistToPlayer >= 280.0f)) {
+                                (player->meleeWeaponAnimation > BIG_SPIN_2H) ||
+                                (this->actor.xzDistToPlayer >= 280.0f)) {
                                 sStickTilt = 127.0f;
                                 sStickAngle = this->actor.yawTowardsPlayer;
                                 if (!this->actor.isTargeted) {
@@ -568,8 +575,9 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
 
     // Causes Dark Link to shield in place when Link is using magic attacks other than the spin attack
 
-    if ((gSaveContext.magicState == MAGIC_STATE_METER_FLASH_1) && (player->meleeWeaponState == 0 || (player->meleeWeaponAnimation < SPIN_ATTACK_1H) ||
-                                         (player->meleeWeaponAnimation > BIG_SPIN_2H))) {
+    if ((gSaveContext.magicState == MAGIC_STATE_METER_FLASH_1) &&
+        (player->meleeWeaponState == 0 || (player->meleeWeaponAnimation < SPIN_ATTACK_1H) ||
+         (player->meleeWeaponAnimation > BIG_SPIN_2H))) {
         sStickTilt = 0.0f;
         input->cur.stick_x = 0;
         input->cur.stick_y = 0;
@@ -698,7 +706,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
             sStaggerCount = 0;
         }
     }
-    if (player->linearVelocity == -18.0f) {
+    if (GameInteractor_Should(VB_TORCH2_HANDLE_CLANKING, player->linearVelocity == -18.0f, this)) {
         if (this->actor.xzDistToPlayer > 80.0f) {
             player->linearVelocity = 1.2f;
         } else if (this->actor.xzDistToPlayer < 70.0f) {
@@ -794,17 +802,17 @@ void EnTorch2_Draw(Actor* thisx, PlayState* play2) {
         gSPSegment(POLY_OPA_DISP++, 0x0C, D_80116280 + 2);
         func_8002EBCC(&this->actor, play, 0);
         func_8002ED80(&this->actor, play, 0);
-        POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnTorch2_OverrideLimbDraw, EnTorch2_PostLimbDraw,
-                                           this, POLY_OPA_DISP);
+        POLY_OPA_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnTorch2_OverrideLimbDraw, EnTorch2_PostLimbDraw, this, POLY_OPA_DISP);
     } else {
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, sAlpha);
         gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280);
         func_8002EBCC(&this->actor, play, 0);
         func_8002ED80(&this->actor, play, 0);
-        POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
-                                           this->skelAnime.dListCount, EnTorch2_OverrideLimbDraw, EnTorch2_PostLimbDraw,
-                                           this, POLY_XLU_DISP);
+        POLY_XLU_DISP =
+            SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                               EnTorch2_OverrideLimbDraw, EnTorch2_PostLimbDraw, this, POLY_XLU_DISP);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
index 15940afc29..e67277d22f 100644
--- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@@ -122,8 +122,7 @@ void EnToryo_Init(Actor* thisx, PlayState* play) {
     }
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 42.0f);
-    SkelAnime_InitFlex(play, &this->skelAnime, &object_toryo_Skel_007150, NULL, this->jointTable, this->morphTable,
-                       17);
+    SkelAnime_InitFlex(play, &this->skelAnime, &object_toryo_Skel_007150, NULL, this->jointTable, this->morphTable, 17);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -390,8 +389,7 @@ void EnToryo_Draw(Actor* thisx, PlayState* play) {
     SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnToryo_OverrideLimbDraw, EnToryo_PostLimbDraw, this);
 }
 
-s32 EnToryo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                             void* thisx) {
+s32 EnToryo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnToryo* this = (EnToryo*)thisx;
 
     if ((this->stateFlags & 8)) {
diff --git a/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c
index 20966eac46..7d9861dae6 100644
--- a/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c
+++ b/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c
@@ -171,7 +171,8 @@ void EnTp_Init(Actor* thisx, PlayState* play2) {
                 Actor_SetScale(&next->actor, 0.3f);
 
                 if (i == 2) {
-                    next->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED;
+                    next->actor.flags |=
+                        ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED;
                     next->unk_150 = 1; // Why?
                 }
 
@@ -243,8 +244,8 @@ void EnTp_Head_ApproachPlayer(EnTp* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     Math_SmoothStepToF(&this->actor.world.pos.y, player->actor.world.pos.y + 30.0f, 1.0f, 0.5f, 0.0f);
-    Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
     if (this->collider.base.atFlags & AT_HIT) {
         this->collider.base.atFlags &= ~AT_HIT;
@@ -310,20 +311,20 @@ void EnTp_Die(EnTp* this, PlayState* play) {
             effectPos.x = ((Rand_ZeroOne() - 0.5f) * 15.0f) + this->actor.world.pos.x;
             effectPos.z = ((Rand_ZeroOne() - 0.5f) * 15.0f) + this->actor.world.pos.z;
             effectPos.y = ((Rand_ZeroOne() - 0.5f) * 5.0f) + this->actor.world.pos.y;
-            EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAccel, &effectVelAccel, 100, 0, 255, 255, 255, 255, 0,
-                                 0, 255, 1, 9, 1);
+            EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAccel, &effectVelAccel, 100, 0, 255, 255, 255, 255, 0, 0,
+                                 255, 1, 9, 1);
 
             effectPos.x = ((Rand_ZeroOne() - 0.5f) * 15.0f) + this->actor.world.pos.x;
             effectPos.z = ((Rand_ZeroOne() - 0.5f) * 15.0f) + this->actor.world.pos.z;
             effectPos.y = ((Rand_ZeroOne() - 0.5f) * 5.0f) + this->actor.world.pos.y;
-            EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAccel, &effectVelAccel, 100, 0, 255, 255, 255, 255, 0,
-                                 0, 255, 1, 9, 1);
+            EffectSsDeadDb_Spawn(play, &effectPos, &effectVelAccel, &effectVelAccel, 100, 0, 255, 255, 255, 255, 0, 0,
+                                 255, 1, 9, 1);
             Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0x50);
         } else {
             for (i = 0; i < 1; i++) {
-                now =
-                    (EnTp*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TP, this->actor.world.pos.x,
-                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, TAILPASARAN_FRAGMENT, true);
+                now = (EnTp*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TP, this->actor.world.pos.x,
+                                         this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
+                                         TAILPASARAN_FRAGMENT, true);
 
                 if (now != NULL) {
                     Actor_SetScale(&now->actor, this->actor.scale.z * 0.5f);
@@ -381,8 +382,8 @@ void EnTp_Head_TakeOff(EnTp* this, PlayState* play) {
     Math_SmoothStepToF(&this->actor.speedXZ, 2.5f, 0.1f, 0.2f, 0.0f);
     Math_SmoothStepToF(&this->actor.world.pos.y, player->actor.world.pos.y + 85.0f + this->horizontalVariation, 1.0f,
                        this->actor.speedXZ * 0.25f, 0.0f);
-    Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                           &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
     if (this->collider.base.atFlags & AT_HIT) {
         this->collider.base.atFlags &= ~AT_HIT;
@@ -479,8 +480,8 @@ void EnTp_Head_Wait(EnTp* this, PlayState* play) {
     this->actor.shape.rot.y = this->actor.world.rot.y;
 
     if (this->actor.world.pos.y != this->actor.home.pos.y) {
-        Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                               &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -549,8 +550,8 @@ void EnTp_Head_BurrowReturnHome(EnTp* this, PlayState* play) {
         }
 
         if (this->actor.world.pos.y != this->actor.home.pos.y) {
-            Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         if (closeToFloor && ((play->gameplayFrames & 1) != 0)) {
@@ -657,7 +658,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) {
     Player* player = GET_PLAYER(play);
     s16 yawToWall;
 
-    if (player->stateFlags1 & PLAYER_STATE1_SHIELDING) { // Shielding
+    if (player->stateFlags1 & PLAYER_STATE1_DAMAGED) { // Damaged
         this->damageEffect = TAILPASARAN_DMGEFF_NONE;
     }
 
@@ -692,8 +693,8 @@ void EnTp_Update(Actor* thisx, PlayState* play) {
         this->actor.shape.rot.z += 0x800;
 
         if (this->actor.shape.rot.z == 0) {
-            Audio_PlaySoundGeneral(NA_SE_EN_TAIL_CRY, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_TAIL_CRY, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
 
         if (this->actionIndex >= TAILPASARAN_ACTION_TAIL_FOLLOWHEAD) {
@@ -738,8 +739,7 @@ void EnTp_Draw(Actor* thisx, PlayState* play) {
         if ((thisx->params <= TAILPASARAN_HEAD) || (thisx->params == TAILPASARAN_HEAD_DYING)) {
             Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gTailpasaranHeadDL);
 
             Matrix_Translate(0.0f, 0.0f, 8.0f, MTXMODE_APPLY);
@@ -755,8 +755,7 @@ void EnTp_Draw(Actor* thisx, PlayState* play) {
             gDPPipeSync(POLY_XLU_DISP++);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gTailpasaranTailSegmentTex));
             gDPPipeSync(POLY_XLU_DISP++);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gTailpasaranTailSegmentDL);
         }
     }
diff --git a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
index 3469435dbc..6e528b0c24 100644
--- a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
+++ b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c
@@ -131,8 +131,8 @@ void EnTr_CrySpellcast(EnTr* this, PlayState* play) {
     if (this->timer == 11) {
         // Both cry in the title screen cutscene, but only Kotake in the in-game cutscene
         if ((this->actor.params != TR_KOUME) || (gSaveContext.sceneSetupIndex == 6)) {
-            Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
@@ -165,9 +165,9 @@ void EnTr_ChooseAction2(EnTr* this, PlayState* play) {
                     EnTr_SetupAction(this, EnTr_CrySpellcast);
                     this->animation = D_80B24378[this->actor.params];
                     this->timer = 39;
-                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_6K,
-                                       this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0,
-                                       0, this->actor.params + 9);
+                    Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_6K, this->actor.world.pos.x,
+                                       this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0,
+                                       this->actor.params + 9);
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_MASIC1);
                     break;
 
@@ -386,7 +386,8 @@ void EnTr_Update(Actor* thisx, PlayState* play) {
 
     if (SkelAnime_Update(&this->skelAnime) != 0) {
         if (this->animation != NULL) {
-            if ((this->animation == &gKotakeKoumeLookingOverLeftShoulderAnim) || (this->animation == &gKotakeKoumeLookingOverRightShoulderAnim)) {
+            if ((this->animation == &gKotakeKoumeLookingOverLeftShoulderAnim) ||
+                (this->animation == &gKotakeKoumeLookingOverRightShoulderAnim)) {
                 if (this->actor.params != TR_KOUME) {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2);
                 } else {
diff --git a/soh/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/soh/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
index c88b2acf9f..c4aabb956b 100644
--- a/soh/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
+++ b/soh/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
@@ -116,9 +116,8 @@ void EnTuboTrap_SpawnEffectsOnLand(EnTuboTrap* this, PlayState* play) {
             arg5 = 32;
         }
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, actorPos, -240, arg5, 10, 10, 0,
-                             (Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, KAKERA_COLOR_NONE,
-                             OBJECT_GAMEPLAY_DANGEON_KEEP, gPotFragmentDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, actorPos, -240, arg5, 10, 10, 0, (Rand_ZeroOne() * 65.0f) + 15.0f,
+                             0, 32, 60, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, gPotFragmentDL);
     }
 
     func_80033480(play, actorPos, 30.0f, 4, 20, 50, 0);
@@ -162,9 +161,8 @@ void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, PlayState* play) {
             arg5 = 32;
         }
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, actorPos, -180, arg5, 30, 30, 0,
-                             (Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, KAKERA_COLOR_NONE,
-                             OBJECT_GAMEPLAY_DANGEON_KEEP, gPotFragmentDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, actorPos, -180, arg5, 30, 30, 0, (Rand_ZeroOne() * 65.0f) + 15.0f,
+                             0, 32, 70, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, gPotFragmentDL);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c
index 696c804cd7..1be09028b1 100644
--- a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c
+++ b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c
@@ -10,7 +10,8 @@
 #include <stdlib.h>
 #include "soh/ResourceManagerHelpers.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
+#define FLAGS \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE)
 
 void EnVali_Init(Actor* thisx, PlayState* play);
 void EnVali_Destroy(Actor* thisx, PlayState* play);
@@ -159,8 +160,8 @@ void EnVali_Init(Actor* thisx, PlayState* play) {
     EnVali_SetupLurk(this);
 
     this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
-    this->actor.floorHeight = BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId,
-                                                          &this->actor, &this->actor.world.pos);
+    this->actor.floorHeight =
+        BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId, &this->actor, &this->actor.world.pos);
     this->actor.params = BARI_TYPE_NORMAL;
 
     if (this->actor.floorHeight == BGCHECK_Y_MIN) {
@@ -743,8 +744,7 @@ void EnVali_DrawBody(EnVali* this, PlayState* play) {
     EnVali_PulseInsides(this, curFrame, &scale);
     Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBariInnerHoodDL);
 
     Matrix_Put(&mtx);
@@ -753,20 +753,17 @@ void EnVali_DrawBody(EnVali* this, PlayState* play) {
     cos = Math_CosS(this->actor.shape.rot.y);
     sin = Math_SinS(this->actor.shape.rot.y);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL);
 
     Matrix_Translate((506.0f * cos) + (372.0f * sin), 1114.0f, (372.0f * cos) - (506.0f * sin), MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL);
 
     Matrix_Translate((-964.0f * cos) - (804.0f * sin), -108.0f, (-804.0f * cos) + (964.0f * sin), MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL);
 
     Matrix_Put(&mtx);
@@ -776,8 +773,7 @@ void EnVali_DrawBody(EnVali* this, PlayState* play) {
     EnVali_PulseOutside(this, curFrame, &scale);
     Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gBariOuterHoodDL);
 
     Matrix_Put(&mtx);
@@ -815,8 +811,8 @@ void EnVali_Draw(Actor* thisx, PlayState* play) {
 
     EnVali_DrawBody(this, play);
 
-    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                   EnVali_OverrideLimbDraw, EnVali_PostLimbDraw, this, POLY_XLU_DISP);
+    POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnVali_OverrideLimbDraw, EnVali_PostLimbDraw, this,
+                                            POLY_XLU_DISP);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
diff --git a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
index dce1370528..4ee837cdef 100644
--- a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
+++ b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
@@ -85,8 +85,8 @@ void EnVbBall_Destroy(Actor* thisx, PlayState* play) {
     }
 }
 
-void EnVbBall_SpawnDebris(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity,
-                          Vec3f* acceleration, f32 scale) {
+void EnVbBall_SpawnDebris(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
+                          f32 scale) {
     s16 i;
 
     for (i = 0; i < 180; i++, effect++) {
@@ -103,8 +103,8 @@ void EnVbBall_SpawnDebris(PlayState* play, BossFdEffect* effect, Vec3f* position
     }
 }
 
-void EnVbBall_SpawnDust(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity,
-                        Vec3f* acceleration, f32 scale) {
+void EnVbBall_SpawnDust(PlayState* play, BossFdEffect* effect, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
+                        f32 scale) {
     s16 i;
 
     for (i = 0; i < 180; i++, effect++) {
@@ -136,8 +136,8 @@ void EnVbBall_UpdateBones(EnVbBall* this, PlayState* play) {
         this->actor.velocity.z = cosf(angle) * 10.0f;
         this->actor.velocity.y *= -0.5f;
         if (this->actor.params & 1) {
-            Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         for (i = 0; i < 10; i++) {
             Vec3f dustVel = { 0.0f, 0.0f, 0.0f };
@@ -154,8 +154,7 @@ void EnVbBall_UpdateBones(EnVbBall* this, PlayState* play) {
             dustPos.y = this->actor.floorHeight + 10.0f;
             dustPos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z;
 
-            EnVbBall_SpawnDust(play, bossFd->effects, &dustPos, &dustVel, &dustAcc,
-                               Rand_ZeroFloat(80.0f) + 200.0f);
+            EnVbBall_SpawnDust(play, bossFd->effects, &dustPos, &dustVel, &dustAcc, Rand_ZeroFloat(80.0f) + 200.0f);
         }
     }
     if (this->actor.world.pos.y < 50.0f) {
@@ -214,15 +213,15 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) {
                         spawnOffset.y = Rand_ZeroFloat(3.0f) + 4.0f;
                         spawnOffset.z = Rand_CenteredFloat(10.0f);
                     }
-                    newActor = (EnVbBall*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play,
-                                                             ACTOR_EN_VB_BALL, this->actor.world.pos.x + spawnOffset.x,
-                                                             this->actor.world.pos.y + spawnOffset.y,
-                                                             this->actor.world.pos.z + spawnOffset.z, 0, 0,
-                                                             this->actor.world.rot.z * 0.5f, this->actor.params + 1);
+                    newActor = (EnVbBall*)Actor_SpawnAsChild(
+                        &play->actorCtx, &this->actor, play, ACTOR_EN_VB_BALL, this->actor.world.pos.x + spawnOffset.x,
+                        this->actor.world.pos.y + spawnOffset.y, this->actor.world.pos.z + spawnOffset.z, 0, 0,
+                        this->actor.world.rot.z * 0.5f, this->actor.params + 1);
                     if (newActor != NULL) {
                         if ((i == 0) && (this->actor.params == 100)) {
                             Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_ROCK, &newActor->actor.projectedPos, 4,
-                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultReverb);
                         }
                         newActor->actor.parent = this->actor.parent;
                         newActor->actor.velocity = spawnOffset;
@@ -304,8 +303,7 @@ void EnVbBall_Draw(Actor* thisx, PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params >= 200) {
         gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gVolvagiaRibsDL));
@@ -316,8 +314,7 @@ void EnVbBall_Draw(Actor* thisx, PlayState* play) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s8)this->shadowOpacity);
         Matrix_Translate(this->actor.world.pos.x, 100.0f, this->actor.world.pos.z, MTXMODE_NEW);
         Matrix_Scale(this->shadowSize, 1.0f, this->shadowSize, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL));
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index 6e6e38787b..7bb5ad8e81 100644
--- a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -103,8 +103,8 @@ void EnViewer_Init(Actor* thisx, PlayState* play) {
     this->isVisible = false;
     if (type == ENVIEWER_TYPE_3_GANONDORF || type == ENVIEWER_TYPE_5_GANONDORF || type == ENVIEWER_TYPE_7_GANONDORF ||
         type == ENVIEWER_TYPE_8_GANONDORF || type == ENVIEWER_TYPE_9_GANONDORF) {
-        sGanondorfCape = (EnGanonMant*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play,
-                                                          ACTOR_EN_GANON_MANT, 0.0f, 0.0f, 0.0f, 0, 0, 0, 35);
+        sGanondorfCape = (EnGanonMant*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_GANON_MANT,
+                                                          0.0f, 0.0f, 0.0f, 0, 0, 0, 35);
     }
 }
 
@@ -228,7 +228,8 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
                 case 380:
                 case 409:
                 case 438:
-                    Audio_PlaySoundGeneral(NA_SE_SY_DEMO_CUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DEMO_CUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     break;
             }
         }
@@ -237,16 +238,16 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
                 Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_ST_LAUGH);
             }
             if (play->csCtx.frames == 1545) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_6K, 32.0f, 101.0f, 1226.0f,
-                                   0, 0, 0, 0xC);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DEMO_6K, 32.0f, 101.0f, 1226.0f, 0, 0, 0,
+                                   0xC);
             }
         }
         if (play->csCtx.frames == 1020) {
             Audio_QueueSeqCmd(SEQ_PLAYER_FANFARE << 24 | NA_BGM_OPENING_GANON);
         }
         if (play->csCtx.frames == 960) {
-            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                   &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if (type == ENVIEWER_TYPE_6_HORSE_GANONDORF) {
         if (gSaveContext.sceneSetupIndex == 5 || gSaveContext.sceneSetupIndex == 10) {
@@ -302,31 +303,36 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
                 switch (this->state) {
                     case 0:
                         if (play->csCtx.npcActions[1]->action == 4) {
-                            Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysStartAnim, -5.0f);
+                            Animation_MorphToPlayOnce(&this->skin.skelAnime,
+                                                      &gYoungGanondorfHorsebackLookSidewaysStartAnim, -5.0f);
                             this->state++;
                         }
                         break;
                     case 1:
                         if (animationEnded) {
-                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim, -5.0f);
+                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim,
+                                                  -5.0f);
                             this->state++;
                         }
                         break;
                     case 2:
                         if (play->csCtx.npcActions[1]->action == 5) {
-                            Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfHorsebackMagicChargeUpStartAnim, -5.0f);
+                            Animation_MorphToPlayOnce(&this->skin.skelAnime,
+                                                      &gYoungGanondorfHorsebackMagicChargeUpStartAnim, -5.0f);
                             this->state++;
                         }
                         break;
                     case 3:
                         if (animationEnded) {
-                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackMagicChargeUpLoopAnim, -5.0f);
+                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackMagicChargeUpLoopAnim,
+                                                  -5.0f);
                             this->state++;
                         }
                         break;
                     case 4:
                         if (play->csCtx.npcActions[1]->action == 11) {
-                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim, -20.0f);
+                            Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim,
+                                                  -20.0f);
                             this->state++;
                         }
                         break;
@@ -355,13 +361,13 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
     } else if (type == ENVIEWER_TYPE_1_IMPA) {
         if (gSaveContext.sceneSetupIndex == 5) {
             if (play->csCtx.frames == 845) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_ITEM_OCARINA, 4.0f, 81.0f,
-                                   2600.0f, 0, 0, 0, 0);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_ITEM_OCARINA, 4.0f, 81.0f, 2600.0f, 0, 0,
+                                   0, 0);
             }
         } else {
             if (play->csCtx.frames == 195) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_ITEM_OCARINA, 4.0f, 81.0f,
-                                   2035.0f, 0, 0, 0, 1);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_ITEM_OCARINA, 4.0f, 81.0f, 2035.0f, 0, 0,
+                                   0, 1);
             }
         }
         switch (this->state) {
@@ -432,7 +438,8 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) {
             case 0:
                 if (play->csCtx.state != CS_STATE_IDLE && play->csCtx.npcActions[1] != NULL &&
                     play->csCtx.npcActions[1]->action == 7) {
-                    Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfLaughStartAnim, -5.0f);
                     this->state++;
                 }
@@ -508,15 +515,13 @@ void EnViewer_Ganondorf9PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList
     if (limbIndex == 11) {
         OPEN_DISPS(play->state.gfxCtx);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL));
         CLOSE_DISPS(play->state.gfxCtx);
     }
 }
 
-void EnViewer_GanondorfPostLimbDrawUpdateCapeVec(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
-                                                 void* thisx) {
+void EnViewer_GanondorfPostLimbDrawUpdateCapeVec(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
     static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
 
     if (limbIndex == 15) {
@@ -560,18 +565,17 @@ void EnViewer_DrawGanondorf(EnViewer* this, PlayState* play) {
         SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, NULL, EnViewer_Ganondorf9PostLimbDraw, this);
     } else if (type == ENVIEWER_TYPE_3_GANONDORF) {
         SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, EnViewer_Ganondorf3OverrideLimbDraw,
-                              EnViewer_GanondorfPostLimbDrawUpdateCapeVec, this);
+                                  EnViewer_GanondorfPostLimbDrawUpdateCapeVec, this);
         EnViewer_UpdateGanondorfCape(play, this);
     } else if (type == ENVIEWER_TYPE_3_GANONDORF || type == ENVIEWER_TYPE_5_GANONDORF ||
                type == ENVIEWER_TYPE_7_GANONDORF || type == ENVIEWER_TYPE_8_GANONDORF) {
         if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[1] != NULL)) {
             SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, NULL, EnViewer_GanondorfPostLimbDrawUpdateCapeVec,
-                                  this);
+                                      this);
             EnViewer_UpdateGanondorfCape(play, this);
         }
     } else {
-        SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, NULL, NULL,
-                                  this);
+        SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, NULL, NULL, this);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -580,8 +584,7 @@ void EnViewer_DrawHorse(EnViewer* this, PlayState* play) {
     func_800A6330(&this->actor, play, &this->skin, NULL, true);
 }
 
-s32 EnViewer_ZeldaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                   void* thisx) {
+s32 EnViewer_ZeldaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     if (play->sceneNum == SCENE_HYRULE_FIELD) { // Hyrule Field
         if (limbIndex == 2) {
             *dList = gChildZeldaCutsceneDressDL;
@@ -660,12 +663,11 @@ void EnViewer_DrawZelda(EnViewer* this, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(gChildZeldaMouthWorriedTex));
     }
     SkelAnime_DrawSkeletonOpa(play, &this->skin.skelAnime, EnViewer_ZeldaOverrideLimbDraw, EnViewer_ZeldaPostLimbDraw,
-                          this);
+                              this);
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 EnViewer_ImpaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 EnViewer_ImpaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     if (limbIndex == 16) {
         *dList = gImpaHeadMaskedDL;
     }
@@ -723,7 +725,8 @@ void EnViewer_UpdatePosition(EnViewer* this, PlayState* play) {
             if (type == ENVIEWER_TYPE_0_HORSE_ZELDA) {
                 if (!sHorseSfxPlayed) {
                     sHorseSfxPlayed = true;
-                    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                    Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                            &gSfxDefaultReverb);
                 }
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_HORSE_RUN_LEVEL - SFX_FLAG);
@@ -773,7 +776,8 @@ void EnViewer_UpdatePosition(EnViewer* this, PlayState* play) {
             }
         }
         if (type == ENVIEWER_TYPE_5_GANONDORF) {
-            Audio_PlaySoundGeneral(NA_SE_EV_BURNING - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_EV_BURNING - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             EnViewer_DrawFireEffects(this, play);
         }
     }
@@ -849,12 +853,11 @@ void EnViewer_DrawFireEffects(EnViewer* this2, PlayState* play) {
                          MTXMODE_NEW);
         Matrix_Scale(this->fireEffects[i].scale, this->fireEffects[i].scale, this->fireEffects[i].scale, MTXMODE_APPLY);
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0,
-                                    (10 * i - 20 * play->state.frames) % 512, 32, 128));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (10 * i - 20 * play->state.frames) % 512,
+                                    32, 128));
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 170, 255);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 00, 255);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPMatrix(POLY_XLU_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         FrameInterpolation_RecordCloseChild();
diff --git a/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c
index 69bbf154d6..a26e3eab97 100644
--- a/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c
+++ b/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c
@@ -245,8 +245,8 @@ void EnVm_Wait(EnVm* this, PlayState* play) {
             this->skelAnime.playSpeed = 1.0f;
         } else {
             this->skelAnime.curFrame = 6.0f;
-            EffectSsDeadDd_Spawn(play, &this->beamPos2, &D_80B2EAEC, &D_80B2EAEC, 150, -25, 0, 0, 255, 0, 255, 255,
-                                 255, 16, 20);
+            EffectSsDeadDd_Spawn(play, &this->beamPos2, &D_80B2EAEC, &D_80B2EAEC, 150, -25, 0, 0, 255, 0, 255, 255, 255,
+                                 16, 20);
             EnVm_SetupAttack(this);
         }
     }
@@ -410,8 +410,9 @@ void EnVm_CheckHealth(EnVm* this, PlayState* play) {
         Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8);
         EnVm_SetupStun(this);
     } else {
-        bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
-                                   this->actor.world.pos.y + 20.0f, this->actor.world.pos.z, 0, 0, 0x601, BOMB_BODY, true);
+        bomb =
+            (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
+                                this->actor.world.pos.y + 20.0f, this->actor.world.pos.z, 0, 0, 0x601, BOMB_BODY, true);
 
         if (bomb != NULL) {
             bomb->timer = 0;
@@ -489,8 +490,8 @@ void EnVm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
             sp80.z = (this->beamScale.z + 500.0f) * (this->actor.scale.y * 10000.0f);
             Matrix_MultVec3f(&sp80, &this->beamPos3);
 
-            if (BgCheck_EntityLineTest1(&play->colCtx, &this->beamPos1, &this->beamPos3, &posResult, &poly, true,
-                                        true, false, true, &bgId) == true) {
+            if (BgCheck_EntityLineTest1(&play->colCtx, &this->beamPos1, &this->beamPos3, &posResult, &poly, true, true,
+                                        false, true, &bgId) == true) {
                 this->beamScale.z = Math_Vec3f_DistXYZ(&this->beamPos1, &posResult) - 5.0f;
                 this->unk_260 = 4;
                 this->beamPos3 = posResult;
@@ -529,24 +530,21 @@ void EnVm_Draw(Actor* thisx, PlayState* play2) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnVm_OverrideLimbDraw,
-                      EnVm_PostLimbDraw, this);
+    SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, EnVm_OverrideLimbDraw, EnVm_PostLimbDraw, this);
     actorPos = this->actor.world.pos;
     func_80033C30(&actorPos, &D_80B2EB7C, 255, play);
 
     if (this->unk_260 >= 3) {
         Matrix_Translate(this->beamPos3.x, this->beamPos3.y + 10.0f, this->beamPos3.z, MTXMODE_NEW);
         Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 168);
         Gfx_SetupDL_60NoCDXlu(play->state.gfxCtx);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, 0);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[play->gameplayFrames % 8]));
         gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL);
         Matrix_RotateY(32767.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[(play->gameplayFrames + 4) % 8]));
         gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL);
     }
@@ -554,8 +552,7 @@ void EnVm_Draw(Actor* thisx, PlayState* play2) {
     Matrix_Translate(this->beamPos1.x, this->beamPos1.y, this->beamPos1.z, MTXMODE_NEW);
     Matrix_RotateZYX(this->beamRot.x, this->beamRot.y, this->beamRot.z, MTXMODE_APPLY);
     Matrix_Scale(this->beamScale.x * 0.1f, this->beamScale.x * 0.1f, this->beamScale.z * 0.0015f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gBeamosLaserDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
index 5730114822..77cedb3263 100644
--- a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -141,7 +141,7 @@ void EnWallmas_Init(Actor* thisx, PlayState* play) {
             Actor_Kill(thisx);
             return;
         }
-        
+
         EnWallmas_ProximityOrSwitchInit(this);
     } else if (thisx->params == WMT_PROXIMITY) {
         EnWallmas_ProximityOrSwitchInit(this);
@@ -255,8 +255,8 @@ void EnWallmas_SetupDie(EnWallmas* this, PlayState* play) {
     this->actor.speedXZ = 0.0f;
     this->actor.velocity.y = 0.0f;
 
-    EffectSsDeadDb_Spawn(play, &this->actor.world.pos, &zeroVec, &zeroVec, 250, -10, 255, 255, 255, 255, 0, 0, 255,
-                         1, 9, true);
+    EffectSsDeadDb_Spawn(play, &this->actor.world.pos, &zeroVec, &zeroVec, 250, -10, 255, 255, 255, 255, 0, 0, 255, 1,
+                         9, true);
 
     Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0xC0);
     this->actionFunc = EnWallmas_Die;
@@ -314,15 +314,17 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) {
     }
 
     if (this->actor.params == WMT_SHADOWTAG) {
-        if ((player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) || (player->stateFlags1 & PLAYER_STATE1_IN_WATER) || !(player->actor.bgCheckFlags & 1)) {
+        if ((player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) || (player->stateFlags1 & PLAYER_STATE1_IN_WATER) ||
+            !(player->actor.bgCheckFlags & 1)) {
             Audio_StopSfxById(NA_SE_EN_FALL_AIM);
             this->timer = 0x82;
         }
-    } else if ((player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) || (player->stateFlags1 & PLAYER_STATE1_IN_WATER) || !(player->actor.bgCheckFlags & 1) ||
-        ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.home.pos, playerPos)))) {
+    } else if ((player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) || (player->stateFlags1 & PLAYER_STATE1_IN_WATER) ||
+               !(player->actor.bgCheckFlags & 1) ||
+               ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.home.pos, playerPos)))) {
         Audio_StopSfxById(NA_SE_EN_FALL_AIM);
         this->timer = 0x82;
-        }
+    }
 
     if (this->timer == 0x50) {
         Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_AIM);
@@ -340,9 +342,9 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) {
 void EnWallmas_Drop(EnWallmas* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (!Player_InCsMode(play) && !(player->stateFlags2 & PLAYER_STATE2_MOVING_DYNAPOLY) && (player->invincibilityTimer >= 0) &&
-        (this->actor.xzDistToPlayer < 30.0f) && (this->actor.yDistToPlayer < -5.0f) &&
-        (-(f32)(player->cylinder.dim.height + 10) < this->actor.yDistToPlayer)) {
+    if (!Player_InCsMode(play) && !(player->stateFlags2 & PLAYER_STATE2_MOVING_DYNAPOLY) &&
+        (player->invincibilityTimer >= 0) && (this->actor.xzDistToPlayer < 30.0f) &&
+        (this->actor.yDistToPlayer < -5.0f) && (-(f32)(player->cylinder.dim.height + 10) < this->actor.yDistToPlayer)) {
         EnWallmas_SetupTakePlayer(this, play);
     }
 }
@@ -408,7 +410,7 @@ void EnWallmas_ReturnToCeiling(EnWallmas* this, PlayState* play) {
     if (this->actor.params == WMT_SHADOWTAG) {
         if (!CVarGetInteger(CVAR_ENHANCEMENT("ShadowTag"), 0)) {
             Actor_Kill(&this->actor);
-        } 
+        }
     }
 }
 
@@ -639,8 +641,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-s32 EnWallMas_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                               void* thisx) {
+s32 EnWallMas_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnWallmas* this = (EnWallmas*)thisx;
 
     if (limbIndex == 1) {
diff --git a/soh/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/soh/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index 123384e638..084334a6b0 100644
--- a/soh/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -106,8 +106,10 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
             // "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST);
 
-            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) || !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) ||
-                !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
+            if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP) ||
+                !Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP) ||
+                !Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP) ||
+                CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
                 Actor_Kill(&this->actor);
             }
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyRainThunderKakariko);
@@ -168,8 +170,7 @@ u8 WeatherTag_CheckEnableWeatherEffect(EnWeatherTag* this, PlayState* play, u8 a
     return ret;
 }
 
-u8 WeatherTag_CheckRestoreWeather(EnWeatherTag* this, PlayState* play, u8 arg2, u8 arg3, u8 arg4, u8 arg5,
-                                  u16 arg6) {
+u8 WeatherTag_CheckRestoreWeather(EnWeatherTag* this, PlayState* play, u8 arg2, u8 arg3, u8 arg4, u8 arg5, u16 arg6) {
     s32 pad;
     u8 ret = false;
     Player* player = GET_PLAYER(play);
diff --git a/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
index daff8bc466..fe771b892a 100644
--- a/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
+++ b/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
@@ -108,8 +108,7 @@ void EnWeiyer_Init(Actor* thisx, PlayState* play) {
 
     Actor_ProcessInitChain(thisx, sInitChain);
     ActorShape_Init(&this->actor.shape, 1000.0f, ActorShadow_DrawCircle, 65.0f);
-    SkelAnime_Init(play, &this->skelAnime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable,
-                   19);
+    SkelAnime_Init(play, &this->skelAnime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable, 19);
     Collider_InitCylinder(play, &this->collider);
     Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -222,8 +221,8 @@ void func_80B32804(EnWeiyer* this, PlayState* play) {
     s32 bgId;
 
     this->actor.world.pos.y += 0.5f;
-    this->actor.floorHeight = BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId,
-                                                          &this->actor, &this->actor.world.pos);
+    this->actor.floorHeight =
+        BgCheck_EntityRaycastFloor4(&play->colCtx, &this->actor.floorPoly, &bgId, &this->actor, &this->actor.world.pos);
 
     if (!WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
                                  &this->actor.home.pos.y, &waterBox) ||
@@ -647,8 +646,8 @@ void EnWeiyer_Draw(Actor* thisx, PlayState* play) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
         gSPSegment(POLY_XLU_DISP++, 0x08, &D_80116280[0]);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->actor.shape.shadowAlpha);
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnWeiyer_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP);
+        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnWeiyer_OverrideLimbDraw, NULL, &this->actor,
+                                                POLY_XLU_DISP);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c
index 155bfa3573..48f17149e8 100644
--- a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c
+++ b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c
@@ -391,7 +391,8 @@ void EnWf_WaitToAppear(EnWf* this, PlayState* play) {
 
             // Disable miniboss music with Enemy Randomizer because the music would keep
             // playing if the enemy was never defeated, which is common with Enemy Randomizer.
-            if ((this->actor.params != WOLFOS_NORMAL) && (this->switchFlag != 0xFF) && !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
+            if ((this->actor.params != WOLFOS_NORMAL) && (this->switchFlag != 0xFF) &&
+                !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0)) {
                 func_800F5ACC(NA_BGM_MINI_BOSS);
             }
         }
@@ -1231,8 +1232,8 @@ void EnWf_Die(EnWf* this, PlayState* play) {
             pos.x = Rand_CenteredFloat(60.0f) + this->actor.world.pos.x;
             pos.z = Rand_CenteredFloat(60.0f) + this->actor.world.pos.z;
             pos.y = Rand_CenteredFloat(50.0f) + (this->actor.world.pos.y + 20.0f);
-            EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1,
-                                 9, true);
+            EffectSsDeadDb_Spawn(play, &pos, &velAndAccel, &velAndAccel, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9,
+                                 true);
         }
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/soh/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
index 8f140ae57a..b6d8641447 100644
--- a/soh/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
+++ b/soh/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
@@ -307,9 +307,8 @@ void EnWonderItem_MultitagOrdered(EnWonderItem* this, PlayState* play) {
 void EnWonderItem_BombSoldier(EnWonderItem* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         this->collider.base.acFlags &= ~AC_HIT;
-        if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HEISHI2, this->actor.world.pos.x,
-                        this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.yawTowardsPlayer, 0,
-                        9, true) != NULL) {
+        if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HEISHI2, this->actor.world.pos.x, this->actor.world.pos.y,
+                        this->actor.world.pos.z, 0, this->actor.yawTowardsPlayer, 0, 9, true) != NULL) {
             // "Careless soldier spawned"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" VT_RST);
         }
diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
index a72eb3930c..b1878937b9 100644
--- a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
+++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
@@ -142,7 +142,7 @@ void func_80B3943C(EnWonderTalk* this, PlayState* play) {
         if ((Actor_ProcessTalkRequest(&this->actor, play))) {
             if (this->unk_156 != TEXT_STATE_DONE) {
                 // not if we're rando'd in the temple of time talking to the altar
-                if(!(IS_RANDO && play->sceneNum == SCENE_TEMPLE_OF_TIME)) {
+                if (!(IS_RANDO && play->sceneNum == SCENE_TEMPLE_OF_TIME)) {
                     this->actionFunc = func_80B395F0;
                 }
             } else {
@@ -214,8 +214,8 @@ void func_80B395F0(EnWonderTalk* this, PlayState* play) {
             case 3:
                 Message_CloseTextbox(play);
                 if (this->unk_164 == 0) {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->actor.world.pos.x,
-                                this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 2, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->actor.world.pos.x, this->actor.world.pos.y,
+                                this->actor.world.pos.z, 0, 0, 0, 2, true);
                     this->unk_164 = 1;
                 }
 
@@ -224,8 +224,8 @@ void func_80B395F0(EnWonderTalk* this, PlayState* play) {
             case 5:
                 Message_CloseTextbox(play);
                 if (this->unk_164 == 0) {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->actor.world.pos.x,
-                                this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 3, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->actor.world.pos.x, this->actor.world.pos.y,
+                                this->actor.world.pos.z, 0, 0, 0, 3, true);
                     this->unk_164 = 1;
                 }
                 this->actionFunc = func_80B391CC;
diff --git a/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
index 6f753af03e..2fe2445a6f 100644
--- a/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+++ b/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
@@ -6,6 +6,7 @@
 
 #include "z_en_wood02.h"
 #include "objects/object_wood02/object_wood02.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -101,8 +102,7 @@ static f32 sSpawnSin;
 s32 EnWood02_SpawnZoneCheck(EnWood02* this, PlayState* play, Vec3f* pos) {
     f32 phi_f12;
 
-    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, pos, &this->actor.projectedPos,
-                                 &this->actor.projectedW);
+    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, pos, &this->actor.projectedPos, &this->actor.projectedW);
 
     // #region SOH [Enhancement] Use the extended culling calculation
     if (CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) > 1 ||
@@ -154,9 +154,9 @@ void EnWood02_SpawnOffspring(EnWood02* this, PlayState* play) {
                 } else {
                     childParams = (((this->drawType & 0xF0) << 4) | (this->actor.params + 1));
                 }
-                childWood = (EnWood02*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play,
-                                                          ACTOR_EN_WOOD02, childPos.x, childPos.y, childPos.z,
-                                                          this->actor.world.rot.x, *childSpawnAngle, 0, childParams);
+                childWood = (EnWood02*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_WOOD02,
+                                                          childPos.x, childPos.y, childPos.z, this->actor.world.rot.x,
+                                                          *childSpawnAngle, 0, childParams);
                 if (childWood != NULL) {
                     childWood->unk_14E[0] = i;
                     this->unk_14E[i] |= 1;
@@ -182,8 +182,8 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) {
     // The tree in Kakariko's day scene does not have the same params to spawn the GS
     // as the night scene, For the always spawn GS enhancement we apply the needed
     // params to have the GS drop when bonking
-    if ((this->actor.params & 0xFF) == WOOD_TREE_CONICAL_MEDIUM && IS_DAY &&
-        play->sceneNum == SCENE_KAKARIKO_VILLAGE && CVarGetInteger(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), 0)) {
+    if ((this->actor.params & 0xFF) == WOOD_TREE_CONICAL_MEDIUM && IS_DAY && play->sceneNum == SCENE_KAKARIKO_VILLAGE &&
+        CVarGetInteger(CVAR_ENHANCEMENT("NightGSAlwaysSpawn"), 0)) {
         this->actor.params = 0x2001;
         this->actor.home.rot.z = 0x71;
     }
@@ -328,7 +328,6 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
     Vec3f dropsSpawnPt;
     s32 i;
     s32 leavesParams;
-    s32 numDrops;
 
     // Despawn extra trees in a group if out of range
     if ((this->spawnType == WOOD_SPAWN_SPAWNED) && (this->actor.parent != NULL)) {
@@ -358,20 +357,15 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
             dropsSpawnPt = this->actor.world.pos;
             dropsSpawnPt.y += 200.0f;
 
-            if ((this->unk_14C >= 0) && (this->unk_14C < 0x64)) { 
-                if (CVarGetInteger(CVAR_ENHANCEMENT("TreesDropSticks"), 0) && INV_CONTENT(ITEM_STICK) != ITEM_NONE) {
-                    numDrops = Rand_ZeroOne() * 4;
-                    for (i = 0; i < numDrops; ++i) {
-                        Item_DropCollectible(play, &dropsSpawnPt, ITEM00_STICK);
-                    }
-                } else {
+            if ((this->unk_14C >= 0) && (this->unk_14C < 0x64)) {
+                if (GameInteractor_Should(VB_TREE_DROP_COLLECTIBLE, true, this)) {
                     Item_DropCollectibleRandom(play, &this->actor, &dropsSpawnPt, this->unk_14C << 4);
                 }
             } else if (this->actor.home.rot.z != 0) {
                 this->actor.home.rot.z &= 0x1FFF;
                 this->actor.home.rot.z |= 0xE000;
-                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, dropsSpawnPt.x, dropsSpawnPt.y,
-                            dropsSpawnPt.z, 0, this->actor.world.rot.y, 0, this->actor.home.rot.z, true);
+                Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, dropsSpawnPt.x, dropsSpawnPt.y, dropsSpawnPt.z, 0,
+                            this->actor.world.rot.y, 0, this->actor.home.rot.z, true);
                 this->actor.home.rot.z = 0;
             }
 
@@ -386,8 +380,8 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_TREE_SWING);
 
                 for (i = 3; i >= 0; i--) {
-                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WOOD02, dropsSpawnPt.x, dropsSpawnPt.y,
-                                dropsSpawnPt.z, 0, Rand_CenteredFloat(65535.0f), 0, leavesParams, true);
+                    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WOOD02, dropsSpawnPt.x, dropsSpawnPt.y, dropsSpawnPt.z,
+                                0, Rand_CenteredFloat(65535.0f), 0, leavesParams, true);
                 }
             }
             this->unk_14C = -0x15;
@@ -471,13 +465,11 @@ void EnWood02_Draw(Actor* thisx, PlayState* play) {
     } else if (D_80B3BF70[this->drawType & 0xF] != NULL) {
         Gfx_DrawDListOpa(play, D_80B3BF54[this->drawType & 0xF]);
         gDPSetEnvColor(POLY_XLU_DISP++, red, green, blue, 0);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, D_80B3BF70[this->drawType & 0xF]);
     } else {
         Gfx_SetupDL_25Xlu(gfxCtx);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, D_80B3BF54[this->drawType & 0xF]);
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 89d889a387..84500db212 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -112,8 +112,7 @@ void EnXc_SpawnNut(EnXc* this, PlayState* play) {
     f32 y = pos->y + 3.0f;
     f32 z = (Math_CosS(angle) * 30.0f) + pos->z;
 
-    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, x, y, z, 0xFA0, this->actor.shape.rot.y, 0,
-                ARROW_CS_NUT, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, x, y, z, 0xFA0, this->actor.shape.rot.y, 0, ARROW_CS_NUT, true);
 }
 
 void EnXc_BgCheck(EnXc* this, PlayState* play) {
@@ -177,8 +176,7 @@ void func_80B3C620(EnXc* this, PlayState* play, s32 npcActionIdx) {
     f32 unk;
 
     if (npcAction != NULL) {
-        unk =
-            Environment_LerpWeightAccelDecel(npcAction->endFrame, npcAction->startFrame, play->csCtx.frames, 0, 0);
+        unk = Environment_LerpWeightAccelDecel(npcAction->endFrame, npcAction->startFrame, play->csCtx.frames, 0, 0);
         startX = npcAction->startPos.x;
         startY = npcAction->startPos.y;
         startZ = npcAction->startPos.z;
@@ -251,25 +249,25 @@ void func_80B3C8CC(EnXc* this, PlayState* play) {
     SkelAnime* skelAnime = &this->skelAnime;
 
     if (skelAnime->jointTable[0].y >= skelAnime->baseTransl.y) {
-        skelAnime->moveFlags |= 3;
+        skelAnime->movementFlags |= 3;
         AnimationContext_SetMoveActor(play, &this->actor, skelAnime, 1.0f);
     }
 }
 
 void func_80B3C924(EnXc* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 3;
+    this->skelAnime.movementFlags |= 3;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void func_80B3C964(EnXc* this, PlayState* play) {
     this->skelAnime.baseTransl = this->skelAnime.jointTable[0];
     this->skelAnime.prevTransl = this->skelAnime.jointTable[0];
-    this->skelAnime.moveFlags |= 3;
+    this->skelAnime.movementFlags |= 3;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
 void func_80B3C9DC(EnXc* this) {
-    this->skelAnime.moveFlags &= ~0x3;
+    this->skelAnime.movementFlags &= ~0x3;
 }
 
 void func_80B3C9EC(EnXc* this) {
@@ -356,7 +354,10 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 
 void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
     // Player is adult and does not have iron boots and has not learned Serenade
-    if (GameInteractor_Should(VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER, (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) && LINK_IS_ADULT)) {
+    if (GameInteractor_Should(VB_SHIEK_PREPARE_TO_GIVE_SERENADE_OF_WATER,
+                              (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) &&
+                               !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) &&
+                                  LINK_IS_ADULT)) {
         this->action = SHEIK_ACTION_SERENADE;
         osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n");
     } else {
@@ -369,7 +370,9 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
     if (this->actor.params == SHEIK_TYPE_SERENADE) {
         Player* player = GET_PLAYER(play);
         s32 stateFlags = player->stateFlags1;
-        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER, CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) &&
+        if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_SERENADE_OF_WATER,
+                                  CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) &&
+                                      !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_SERENADE_OF_WATER)) &&
             !(stateFlags & PLAYER_STATE1_IN_CUTSCENE) && !Play_InCsMode(play)) {
             if (GameInteractor_Should(VB_PLAY_SERENADE_OF_WATER_CS, true)) {
                 Cutscene_SetSegment(play, &gIceCavernSerenadeCs);
@@ -394,7 +397,7 @@ void EnXc_DoNothing(EnXc* this, PlayState* play) {
 }
 
 void SoH_EnXc_RandoStand(EnXc* this, PlayState* play) {
-    //Replaces Ganondorf Light Arrow hint. also stands in ToT
+    // Replaces Ganondorf Light Arrow hint. also stands in ToT
     if (play->sceneNum == SCENE_TEMPLE_OF_TIME) {
         EnXc_ChangeAnimation(this, &gSheikArmsCrossedIdleAnim, ANIMMODE_LOOP, 0.0f, false);
     } else {
@@ -1100,8 +1103,7 @@ s32 EnXc_PullingOutHarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dL
     return 0;
 }
 
-s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                              void* thisx) {
+s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     EnXc* this = (EnXc*)thisx;
 
     if (limbIndex == 12) {
@@ -1437,8 +1439,8 @@ void func_80B3F534(PlayState* play) {
     u16 frameCount = csCtx->frames;
 
     if (frameCount == 310) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -1044.0f, -1243.0f, 7458.0f, 0, 0, 0,
-                    WARP_DESTINATION, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_DOOR_WARP1, -1044.0f, -1243.0f, 7458.0f, 0, 0, 0, WARP_DESTINATION,
+                    true);
     }
 }
 
@@ -1724,8 +1726,7 @@ void EnXc_ShowTriforceIdle(EnXc* this, PlayState* play) {
     func_80B400AC(this, play);
 }
 
-s32 EnXc_TriforceOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 EnXc_TriforceOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     if (limbIndex == 15) {
         *dList = gSheikDL_011620;
     }
@@ -2178,8 +2179,7 @@ void EnXc_DrawSquintingEyes(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex));
     gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex));
-    SkelAnime_DrawSkeletonOpa(play, skelAnime, NULL, NULL,
-                          NULL);
+    SkelAnime_DrawSkeletonOpa(play, skelAnime, NULL, NULL, NULL);
     CLOSE_DISPS(gfxCtx);
 }
 
@@ -2192,7 +2192,9 @@ void EnXc_InitTempleOfTime(EnXc* this, PlayState* play) {
                 gSaveContext.cutsceneTrigger = 1;
             }
             func_80B3EBF0(this, play);
-        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT, !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) && Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP))) {
+        } else if (GameInteractor_Should(VB_BE_ELIGIBLE_FOR_PRELUDE_OF_LIGHT,
+                                         !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
+                                             Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP))) {
             Flags_SetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT);
             if (GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) {
                 Item_Give(play, ITEM_SONG_PRELUDE);
@@ -2216,7 +2218,9 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) {
     if (Actor_ProcessTalkRequest(&this->actor, play)) {
         this->action = SHEIK_ACTION_IN_DIALOGUE;
     } else {
-         this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; //this arrangment is cute but I would rather handle all message selection in ship code
+        this->actor.flags |=
+            ACTOR_FLAG_ATTENTION_ENABLED |
+            ACTOR_FLAG_FRIENDLY; // this arrangment is cute but I would rather handle all message selection in ship code
         if (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE) {
             this->actor.textId = 0x7010; //"You have what you need"
         } else {
diff --git a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
index cccfe24148..34bab2f2f9 100644
--- a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
+++ b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
@@ -153,8 +153,7 @@ void EnYukabyun_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152]));
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFloorTileEnemyDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
index 97254cd468..99d9fba48a 100644
--- a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
+++ b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
@@ -324,13 +324,13 @@ void EnZf_Init(Actor* thisx, PlayState* play) {
     if (thisx->params == ENZF_TYPE_DINOLFOS) {
         thisx->colChkInfo.health = 12;
         thisx->naviEnemyId = 0x10;
-        SkelAnime_Init(play, &this->skelAnime, &gZfDinolfosSkel, &gZfCryingAnim, this->jointTable,
-                       this->morphTable, ENZF_LIMB_MAX);
+        SkelAnime_Init(play, &this->skelAnime, &gZfDinolfosSkel, &gZfCryingAnim, this->jointTable, this->morphTable,
+                       ENZF_LIMB_MAX);
     } else { // Lizalfos
         thisx->colChkInfo.health = 6;
         thisx->naviEnemyId = 0x0F;
-        SkelAnime_Init(play, &this->skelAnime, &gZfLizalfosSkel, &gZfCryingAnim, this->jointTable,
-                       this->morphTable, ENZF_LIMB_MAX);
+        SkelAnime_Init(play, &this->skelAnime, &gZfLizalfosSkel, &gZfCryingAnim, this->jointTable, this->morphTable,
+                       ENZF_LIMB_MAX);
     }
 
     if (thisx->params < ENZF_TYPE_LIZALFOS_MINIBOSS_A) { // Not minibosses
@@ -533,7 +533,8 @@ s32 EnZf_CanAttack(PlayState* play, EnZf* this) {
     Player* player = GET_PLAYER(play);
 
     if (this->actor.params >= ENZF_TYPE_LIZALFOS_MINIBOSS_A) { // miniboss
-        if (player->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE)) { // Hanging or climbing
+        if (player->stateFlags1 &
+            (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE)) { // Hanging or climbing
             return false;
         } else {
             return true;
@@ -759,8 +760,8 @@ void EnZf_SetupApproachPlayer(EnZf* this, PlayState* play) {
 
     if (this->actor.params >= ENZF_TYPE_LIZALFOS_MINIBOSS_A) { // miniboss
         this->curPlatform = EnZf_FindPlatform(&this->actor.world.pos, this->curPlatform);
-        this->nextPlatform = EnZf_FindNextPlatformTowardsPlayer(&this->actor.world.pos, this->curPlatform,
-                                                                this->homePlatform, play);
+        this->nextPlatform =
+            EnZf_FindNextPlatformTowardsPlayer(&this->actor.world.pos, this->curPlatform, this->homePlatform, play);
         this->hopAnimIndex = 0;
     }
     this->actor.speedXZ = 0.0f;
@@ -789,8 +790,8 @@ void EnZf_ApproachPlayer(EnZf* this, PlayState* play) {
 
     if (!EnZf_DodgeRangedEngaging(play, this)) {
         if (sp48 != this->curPlatform) {
-            this->nextPlatform = EnZf_FindNextPlatformTowardsPlayer(&this->actor.world.pos, this->curPlatform,
-                                                                    this->homePlatform, play);
+            this->nextPlatform =
+                EnZf_FindNextPlatformTowardsPlayer(&this->actor.world.pos, this->curPlatform, this->homePlatform, play);
 
             if ((sp48 < 0) && (this->nextPlatform == this->curPlatform)) {
                 sp48 = this->curPlatform;
@@ -1209,7 +1210,8 @@ void EnZf_Slash(EnZf* this, PlayState* play) {
                     if (yawDiff > 16000) {
                         this->actor.world.rot.y = this->actor.yawTowardsPlayer;
                         func_80B483E4(this, play);
-                    } else if (player->stateFlags1 & (PLAYER_STATE1_HOSTILE_LOCK_ON | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE)) {
+                    } else if (player->stateFlags1 & (PLAYER_STATE1_HOSTILE_LOCK_ON | PLAYER_STATE1_HANGING_OFF_LEDGE |
+                                                      PLAYER_STATE1_CLIMBING_LEDGE)) {
                         if (this->actor.isTargeted) {
                             EnZf_SetupSlash(this);
                         } else {
@@ -1774,8 +1776,7 @@ void EnZf_CircleAroundPlayer(EnZf* this, PlayState* play) {
             this->actor.speedXZ = -this->actor.speedXZ;
         }
     } else if ((this->actor.bgCheckFlags & 8) ||
-               !Actor_TestFloorInDirection(&this->actor, play, this->actor.speedXZ,
-                                           this->actor.shape.rot.y + 0x3FFF)) {
+               !Actor_TestFloorInDirection(&this->actor, play, this->actor.speedXZ, this->actor.shape.rot.y + 0x3FFF)) {
         if (this->actor.bgCheckFlags & 8) {
             if (this->actor.speedXZ >= 0.0f) {
                 phi_v0_4 = this->actor.shape.rot.y + 0x3FFF;
@@ -1870,8 +1871,7 @@ void EnZf_CircleAroundPlayer(EnZf* this, PlayState* play) {
                     EnZf_CanAttack(play, this)) {
                     EnZf_SetupSlash(this);
                 } else if ((this->actor.xzDistToPlayer < 280.0f) && (this->actor.xzDistToPlayer > 240.0f) &&
-                           !EnZf_PrimaryFloorCheck(this, play, 191.9956f) &&
-                           ((play->gameplayFrames % 2) == 0)) {
+                           !EnZf_PrimaryFloorCheck(this, play, 191.9956f) && ((play->gameplayFrames % 2) == 0)) {
                     EnZf_SetupJumpForward(this);
                 } else {
                     EnZf_SetupApproachPlayer(this, play);
@@ -1925,7 +1925,7 @@ void EnZf_SetupDie(EnZf* this) {
     D_80B4A1B0 = 0;
     Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DEAD);
     EnZf_SetupAction(this, EnZf_Die);
-    
+
     GameInteractor_ExecuteOnEnemyDefeat(&this->actor);
 }
 
@@ -2122,8 +2122,7 @@ void EnZf_Update(Actor* thisx, PlayState* play) {
     }
 }
 
-s32 EnZf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnZf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnZf* this = (EnZf*)thisx;
 
     switch (limbIndex) {
@@ -2253,8 +2252,8 @@ void EnZf_Draw(Actor* thisx, PlayState* play) {
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha);
         gSPSegment(POLY_OPA_DISP++, 0x09, &D_80116280[2]);
 
-        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnZf_OverrideLimbDraw, EnZf_PostLimbDraw, this, POLY_OPA_DISP);
+        POLY_OPA_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnZf_OverrideLimbDraw, EnZf_PostLimbDraw, this,
+                                                POLY_OPA_DISP);
 
         if (this->iceTimer != 0) {
             thisx->colorFilterTimer++;
@@ -2263,8 +2262,8 @@ void EnZf_Draw(Actor* thisx, PlayState* play) {
             if ((this->iceTimer % 4) == 0) {
                 s32 icePosIndex = this->iceTimer >> 2;
 
-                EffectSsEnIce_SpawnFlyingVec3f(play, thisx, &this->bodyPartsPos[icePosIndex], 150, 150, 150, 250,
-                                               235, 245, 255, 1.4f);
+                EffectSsEnIce_SpawnFlyingVec3f(play, thisx, &this->bodyPartsPos[icePosIndex], 150, 150, 150, 250, 235,
+                                               245, 255, 1.4f);
             }
         }
     } else { // fades out when dead
@@ -2272,8 +2271,8 @@ void EnZf_Draw(Actor* thisx, PlayState* play) {
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
         gSPSegment(POLY_XLU_DISP++, 0x09, &D_80116280[0]);
-        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime,
-                                       EnZf_OverrideLimbDraw, EnZf_PostLimbDraw, this, POLY_XLU_DISP);
+        POLY_XLU_DISP = SkelAnime_DrawSkeleton2(play, &this->skelAnime, EnZf_OverrideLimbDraw, EnZf_PostLimbDraw, this,
+                                                POLY_XLU_DISP);
     }
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -2320,8 +2319,7 @@ s32 EnZf_DodgeRangedEngaging(PlayState* play, EnZf* this) {
 
         this->actor.world.rot.y = this->actor.shape.rot.y;
 
-        if ((((this->actor.xzDistToPlayer < 90.0f) || (phi_t0 == 3)) &&
-             !EnZf_PrimaryFloorCheck(this, play, 135.0f)) ||
+        if ((((this->actor.xzDistToPlayer < 90.0f) || (phi_t0 == 3)) && !EnZf_PrimaryFloorCheck(this, play, 135.0f)) ||
             (projectileActor->id == ACTOR_ARMS_HOOK)) {
             EnZf_SetupJumpUp(this);
             return true;
diff --git a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index c334944ef7..c027449590 100644
--- a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -93,10 +93,14 @@ void EnZl1_Init(Actor* thisx, PlayState* play) {
         Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
         this->unk_1E6 = 0;
         this->actionFunc = func_80B4BC78;
-    } else if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
+    } else if (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+               Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP) &&
+               Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP)) {
         Actor_Kill(&this->actor);
-    } else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) ||
-               (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) && Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP))) {
+    } else if ((Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) ||
+               (Flags_GetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP) &&
+                Flags_GetEventChkInf(EVENTCHKINF_USED_JABU_JABUS_BELLY_BLUE_WARP))) {
         frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438);
         Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
         this->actor.textId = 0x703D;
@@ -344,7 +348,7 @@ void func_80B4B834(CsCmdActorCue* npcAction, Vec3f* pos) {
 }
 
 void func_80B4B874(EnZl1* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
diff --git a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index 6f2a816f62..656766d541 100644
--- a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -434,8 +434,7 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) {
     this->unk_20C[arg2] = arg1;
 }
 
-s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                  Gfx** gfx) {
+s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     s32 pad;
     EnZl2* this = (EnZl2*)thisx;
     Mtx* sp74;
@@ -551,8 +550,7 @@ void EnZl2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
                 Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY);
                 Matrix_RotateZYX(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY);
                 Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY);
-                gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix((*gfx)++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList((*gfx)++, gZelda2OcarinaDL);
             }
             Matrix_Pop();
@@ -666,8 +664,8 @@ void func_80B4FFF0(EnZl2* this, PlayState* play) {
         posY = this->actor.world.pos.y + (kREG(5) + -26.0f);
         posZ = this->actor.world.pos.z;
 
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000,
-                           0, WARP_PURPLE_CRYSTAL);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000, 0,
+                           WARP_PURPLE_CRYSTAL);
         this->unk_248 = 1;
     }
 }
@@ -719,8 +717,7 @@ void func_80B501E8(EnZl2* this, PlayState* play) {
 
     if (npcAction != NULL) {
         this->actor.shape.shadowAlpha = this->alpha =
-            (1.0f - Environment_LerpWeight(npcAction->endFrame, npcAction->startFrame, play->csCtx.frames)) *
-            255.0f;
+            (1.0f - Environment_LerpWeight(npcAction->endFrame, npcAction->startFrame, play->csCtx.frames)) * 255.0f;
         func_80B501C4(this, this->alpha);
     }
 }
@@ -1613,7 +1610,7 @@ void EnZl2_Init(Actor* thisx, PlayState* play) {
             Audio_SetSoundBanksMute(0x6F);
             break;
         case 4:
-            gSaveContext.timer2State = 0;
+            gSaveContext.subTimerState = 0;
             break;
     }
 }
diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
index d01fc77d4a..6a38b62642 100644
--- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@@ -598,8 +598,7 @@ void func_80B54360(EnZl3* this, s16 arg1, s32 arg2) {
     this->unk_2BC[arg2] = arg1;
 }
 
-s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                  Gfx** gfx) {
+s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     s32 pad[3];
     EnZl3* this = (EnZl3*)thisx;
     s16* unk_28C = this->unk_28C;
@@ -786,8 +785,8 @@ void func_80B54F18(EnZl3* this, PlayState* play) {
         f32 posY = this->actor.world.pos.y + (kREG(5) + -26.0f);
         f32 posZ = this->actor.world.pos.z;
 
-        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000,
-                           0, WARP_PURPLE_CRYSTAL);
+        Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000, 0,
+                           WARP_PURPLE_CRYSTAL);
         this->unk_2F8 = 1;
     }
 }
@@ -1812,8 +1811,8 @@ void func_80B5772C(EnZl3* this, PlayState* play) {
 
 void func_80B57754(EnZl3* this, PlayState* play) {
     if (gSaveContext.magicState == MAGIC_STATE_IDLE) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_OCEFF_WIPE4, this->actor.world.pos.x,
-                    this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 1, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_OCEFF_WIPE4, this->actor.world.pos.x, this->actor.world.pos.y,
+                    this->actor.world.pos.z, 0, 0, 0, 1, true);
         func_80B56DA4(this);
     }
 }
@@ -1862,7 +1861,8 @@ s32 func_80B57890(EnZl3* this, PlayState* play) {
     } else if (sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) {
         if ((result == 0x20) && (curSpawn == 0) && Flags_GetSwitch(play, 0x37)) {
             if ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) {
+                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+                (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE)) {
                 return 1;
             }
         }
@@ -2444,8 +2444,7 @@ void func_80B593D0(EnZl3* this, PlayState* play) {
     func_80B58C08(this, play);
 }
 
-s32 func_80B5944C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                  Gfx** gfx) {
+s32 func_80B5944C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     if (limbIndex == 14) {
         Mtx* mtx = Graph_Alloc(play->state.gfxCtx, sizeof(Mtx) * 7);
         EnZl3* this = (EnZl3*)thisx;
@@ -2486,13 +2485,14 @@ s32 func_80B5944C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
 s32 func_80B59698(EnZl3* this, PlayState* play) {
     s32 cond = Flags_GetSwitch(play, 0x37) &&
                ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
+                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+                (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
 
     if (cond) {
         u8 curSpawn = play->curSpawn;
 
         if ((func_80B54DB4(this) == 0x20) && (curSpawn == 0) &&
-            ((gSaveContext.timer2Value <= 0) || (gSaveContext.timer2State == 0))) {
+            ((gSaveContext.subTimerSeconds <= 0) || (gSaveContext.subTimerState == 0))) {
             return 1;
         }
     }
@@ -2502,12 +2502,13 @@ s32 func_80B59698(EnZl3* this, PlayState* play) {
 s32 func_80B59768(EnZl3* this, PlayState* play) {
     s32 cond = Flags_GetSwitch(play, 0x37) &&
                ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
+                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+                (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
 
     if (cond) {
         u8 curSpawn = play->curSpawn;
 
-        if ((func_80B54DB4(this) == 0x20) && (curSpawn == 0) && (gSaveContext.timer2Value <= 0)) {
+        if ((func_80B54DB4(this) == 0x20) && (curSpawn == 0) && (gSaveContext.subTimerSeconds <= 0)) {
             return 1;
         }
     }
@@ -2560,7 +2561,8 @@ void func_80B59828(EnZl3* this, PlayState* play) {
         func_80B54EA4(this, play);
         cond = Flags_GetSwitch(play, 0x37) &&
                ((play->sceneNum == SCENE_GANON_BOSS) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) ||
-                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
+                (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) ||
+                (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE));
         if (cond) {
             func_80B53614(this, play);
         }
@@ -2569,7 +2571,8 @@ void func_80B59828(EnZl3* this, PlayState* play) {
 
 void func_80B59A80(EnZl3* this, PlayState* play) {
     if (func_80B59768(this, play)) {
-        Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -2666,7 +2669,7 @@ void EnZl3_Init(Actor* thisx, PlayState* play) {
 
     switch (func_80B54DD4(this)) {
         case 1:
-            gSaveContext.timer2State = 0;
+            gSaveContext.subTimerState = 0;
             break;
         case 3:
             func_80B59A80(this, play);
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 01c119c891..aab3e9505a 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -305,7 +305,7 @@ void EnZl4_UpdateFace(EnZl4* this) {
 }
 
 void EnZl4_SetMove(EnZl4* this, PlayState* play) {
-    this->skelAnime.moveFlags |= 1;
+    this->skelAnime.movementFlags |= 1;
     AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime, 1.0f);
 }
 
@@ -1112,7 +1112,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 play->talkWithPlayer(play, &this->actor);
                 if (GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LETTER, true)) {
                     Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
-                                fabsf(this->actor.yDistToPlayer) + 1.0f);
+                                       fabsf(this->actor.yDistToPlayer) + 1.0f);
                 }
                 play->msgCtx.stateTimer = 4;
                 play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@@ -1124,7 +1124,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
                 this->talkState++;
             } else {
                 Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
-                              fabsf(this->actor.yDistToPlayer) + 1.0f);
+                                   fabsf(this->actor.yDistToPlayer) + 1.0f);
             }
             // no break here is required for matching
     }
diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
index 474830bbd7..372a69ffa0 100644
--- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@@ -195,8 +195,7 @@ void EnZo_DrawRipples(EnZo* this, PlayState* play) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, effect->color.a);
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -229,8 +228,7 @@ void EnZo_DrawBubbles(EnZo* this, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesModelDL);
             FrameInterpolation_RecordCloseChild();
         }
@@ -262,8 +260,7 @@ void EnZo_DrawSplashes(EnZo* this, PlayState* play) {
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -601,8 +598,7 @@ void EnZo_Init(Actor* thisx, PlayState* play) {
     this->trackingMode = NPC_TRACKING_NONE;
     this->canSpeak = false;
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
-    Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius, 0.0f,
-                            5);
+    Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius, 0.0f, 5);
 
     if (this->actor.yDistToWater < 54.0f || (this->actor.params & 0x3F) == 8) {
         this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
@@ -764,8 +760,7 @@ void EnZo_Update(Actor* thisx, PlayState* play) {
     EnZo_UpdateSplashes(this);
 }
 
-s32 EnZo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
-                          Gfx** gfx) {
+s32 EnZo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) {
     EnZo* this = (EnZo*)thisx;
     Vec3s vec;
 
diff --git a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
index 5c94617d49..3c83a1d51e 100644
--- a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
+++ b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
@@ -366,10 +366,9 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
             if ((fabsf(this->actor.world.pos.z - (GND_BOSSROOM_CENTER_Z + 400.0f - 0.5f)) < 300.0f) &&
                 !this->spawnedWarp) {
                 this->spawnedWarp = true;
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                   GND_BOSSROOM_CENTER_X + 0.0f, this->actor.world.pos.y + 50.0f,
-                                   GND_BOSSROOM_CENTER_Z + 400.0f - 0.5f, 0, this->actor.shape.rot.y, 0,
-                                   FHGFIRE_WARP_RETREAT);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, GND_BOSSROOM_CENTER_X + 0.0f,
+                                   this->actor.world.pos.y + 50.0f, GND_BOSSROOM_CENTER_Z + 400.0f - 0.5f, 0,
+                                   this->actor.shape.rot.y, 0, FHGFIRE_WARP_RETREAT);
                 this->fhgFireKillWarp = true;
             }
             Math_ApproachF(&this->cameraAt.x, this->actor.world.pos.x, 0.2f, 50.0f);
@@ -487,8 +486,8 @@ void EnfHG_Approach(EnfHG* this, PlayState* play) {
             this->actionFunc = EnfHG_Attack;
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_HORSE_NEIGH);
             this->timers[0] = 40;
-            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                               this->actor.world.pos.x, this->actor.world.pos.y + 50.0f, this->actor.world.pos.z, 0,
+            Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                               this->actor.world.pos.y + 50.0f, this->actor.world.pos.z, 0,
                                this->actor.shape.rot.y + 0x8000, 0, FHGFIRE_WARP_EMERGE);
             this->fhgFireKillWarp = false;
         }
@@ -521,9 +520,9 @@ void EnfHG_Attack(EnfHG* this, PlayState* play) {
         }
         if (this->hitTimer == 0) {
             if (this->timers[1] == 24) {
-                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE,
-                                   this->actor.world.pos.x, (this->actor.world.pos.y + 100.0f) + 25.0f,
-                                   this->actor.world.pos.z, 0, 0, 0, FHGFIRE_LIGHTNING_STRIKE);
+                Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_FHG_FIRE, this->actor.world.pos.x,
+                                   (this->actor.world.pos.y + 100.0f) + 25.0f, this->actor.world.pos.z, 0, 0, 0,
+                                   FHGFIRE_LIGHTNING_STRIKE);
             }
             if (this->timers[1] == 45) {
                 Animation_MorphToLoop(&this->skin.skelAnime, &gPhantomHorseAirAnim, 0.0f);
diff --git a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
index 5a8e06d437..b87e127ce2 100644
--- a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
+++ b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
@@ -97,14 +97,13 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
     gSPTextureRectangle(OVERLAY_DISP++, 120 << 2, 90 << 2, 200 << 2, 113 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
     gDPPipeSync(OVERLAY_DISP++);
     gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha);
-    gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120 - 1, 24 - 1, 0,
-                       G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
+    gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120 - 1, 24 - 1,
+                       0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 100 << 2, 160 << 2, 220 << 2, 183 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
                         1 << 10);
     gDPPipeSync(OVERLAY_DISP++);
     gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha);
-    gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0,
-                       0, 112 - 1, 16 - 1, 0,
+    gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112 - 1, 16 - 1, 0,
                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
                         1 << 10);
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index a98f985027..4d42de65f5 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -154,7 +154,7 @@ static f32 sStormSfxFreqScale = 0.0f;
 
 static u8 sSinkingLureLocation = 0;
 
-/// Weight of caught fish. 
+/// Weight of caught fish.
 static f32 sFishOnHandLength = 0.0f;
 
 static u8 sIsRodVisible = true;
@@ -434,7 +434,8 @@ static Vec3f sStreamSoundProjectedPos;
 static s16 sFishOnHandParams;
 
 u8 AllHyruleLoaches() {
-    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("AllHyruleLoaches"), 0);
+    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) &&
+           CVarGetInteger(CVAR_ENHANCEMENT("AllHyruleLoaches"), 0);
 }
 
 void Fishing_SetColliderElement(s32 index, ColliderJntSph* collider, Vec3f* pos, f32 scale) {
@@ -1231,8 +1232,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1257,8 +1257,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1280,15 +1279,14 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 40, 90, 80, effect->alpha);
 
             gSPSegment(POLY_OPA_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, effect->timer + (i * 3),
-                                        (effect->timer + (i * 3)) * 5, 32, 64, 1, 0, 0, 32, 32));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, effect->timer + (i * 3), (effect->timer + (i * 3)) * 5,
+                                        32, 64, 1, 0, 0, 32, 32));
 
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1312,8 +1310,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_ReplaceRotation(&play->billboardMtxF);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1339,8 +1336,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_RotateZ(effect->rot.z, MTXMODE_APPLY);
             Matrix_Scale(0.002f, 1.0f, 0.1f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1365,8 +1361,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
             Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1396,8 +1391,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
             Matrix_RotateY(rotY, MTXMODE_APPLY);
             Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashModelDL);
             FrameInterpolation_RecordCloseChild();
@@ -1415,8 +1409,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) {
         Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
         Matrix_Translate(-1250.0f, 0.0f, 0.0f, MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_OPA_DISP++, gFishingOwnerHatDL);
         FrameInterpolation_RecordCloseChild();
@@ -1433,16 +1426,15 @@ void Fishing_DrawStreamSplash(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     gSPSegment(POLY_XLU_DISP++, 0x09,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames * 1,
-                                play->gameplayFrames * 8, 32, 64, 1, -(play->gameplayFrames * 2), 0, 16, 16));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames * 1, play->gameplayFrames * 8, 32, 64, 1,
+                                -(play->gameplayFrames * 2), 0, 16, 16));
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, 50);
 
     Matrix_Translate(670.0f, -24.0f, -600.0f, MTXMODE_NEW);
     Matrix_Scale(0.02f, 1.0f, 0.02f, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFishingStreamSplashDL));
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -1669,14 +1661,12 @@ void Fishing_DrawLureHook(PlayState* play, Vec3f* pos, Vec3f* refPos, u8 hookInd
     Matrix_Scale(0.0039999997f, 0.0039999997f, 0.005f, MTXMODE_APPLY);
     Matrix_RotateY(M_PI, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFishingLureHookDL);
 
     Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, gFishingLureHookDL);
 
     if ((hookIndex == 1) && (sIsOwnersHatHooked)) {
@@ -1705,8 +1695,7 @@ void Fishing_DrawLureHook(PlayState* play, Vec3f* pos, Vec3f* refPos, u8 hookInd
         Matrix_Translate(-1250.0f, 0.0f, 0.0f, MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gFishingOwnerHatDL);
     }
 
@@ -1891,8 +1880,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
 
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gFishingLureFloatDL);
 
         posSrc.x = -850.0f;
@@ -1939,8 +1927,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
         Matrix_RotateX(rx, MTXMODE_APPLY);
         Matrix_Scale(sFishingLineScale, 1.0f, dist, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
     } else {
         for (i = spooled; i < LINE_SEG_COUNT - 1; i++) {
@@ -1978,8 +1965,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) {
             Matrix_RotateX((lineRot + i)->x, MTXMODE_APPLY);
             Matrix_Scale(sFishingLineScale, 1.0f, 0.005f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
         }
     }
@@ -2046,7 +2032,9 @@ void Fishing_DrawRod(PlayState* play) {
         lureXZLen = player->unk_85C - lureXZLen;
 
         spC4 = player->unk_858;
-        Math_SmoothStepToF(&player->unk_858, input->rel.stick_x * 0.02f * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1), 0.3f, 5.0f, 0.0f);
+        Math_SmoothStepToF(&player->unk_858,
+                           input->rel.stick_x * 0.02f * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1),
+                           0.3f, 5.0f, 0.0f);
         spC4 = player->unk_858 - spC4;
 
         if (player->unk_858 > 1.0f) {
@@ -2116,8 +2104,7 @@ void Fishing_DrawRod(PlayState* play) {
         Matrix_Push();
         Matrix_Scale(sRodScales[i], sRodScales[i], 0.52f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         if (i < 5) {
             gDPLoadTextureBlock(POLY_OPA_DISP++, gFishingRodSegmentBlackTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 8, 0,
@@ -2220,8 +2207,8 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
         D_80B7E148 = 520.0f;
         sRodLineSpooled = 195.0f;
 
-        sRodCastState = sLureEquipped = sLureTimer = D_80B7E0B0 = D_80B7E0B2 = sRodCastTimer = sWiggleAttraction = D_80B7E114 =
-            D_80B7E150 = 0;
+        sRodCastState = sLureEquipped = sLureTimer = D_80B7E0B0 = D_80B7E0B2 = sRodCastTimer = sWiggleAttraction =
+            D_80B7E114 = D_80B7E150 = 0;
         sLure1Rotate = sReelLinePosStep = sLurePosZOffset = 0.0f;
 
         sLureLineSegPosDelta = zeroVec;
@@ -2652,8 +2639,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) {
                 sFishingPlayerCinematicState = 3;
             }
 
-            if ((sLurePos.y <= (WATER_SURFACE_Y(play) + 4.0f)) &&
-                (sLurePos.y >= (WATER_SURFACE_Y(play) - 4.0f))) {
+            if ((sLurePos.y <= (WATER_SURFACE_Y(play) + 4.0f)) && (sLurePos.y >= (WATER_SURFACE_Y(play) - 4.0f))) {
 
                 timer = 63;
                 if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (sLureWigglePosY > 1.0f)) {
@@ -2807,7 +2793,8 @@ void func_80B70ED4(Fishing* this, Input* input) {
                 this->rotationStep = 28672.0f;
                 this->speedTarget = 5.0f;
             } else {
-                if ((CHECK_BTN_ALL(input->cur.button, BTN_A) || (sLureWigglePosY > 1.0f)) && (lineLengthSQ < SQ(120.0f))) {
+                if ((CHECK_BTN_ALL(input->cur.button, BTN_A) || (sLureWigglePosY > 1.0f)) &&
+                    (lineLengthSQ < SQ(120.0f))) {
                     this->fishState = 2;
                     this->unk_15E = 0;
                     this->timerArray[0] = 0;
@@ -2834,8 +2821,8 @@ void func_80B70ED4(Fishing* this, Input* input) {
         this->timerArray[1] = 50;
     }
 
-    if ((sLureEquipped != FS_LURE_SINKING) && (D_80B7E114 != 0) && (this->fishLength > 60.0f) && (lineLengthSQ < SQ(30.0f)) &&
-        (this->fishState >= 10)) {
+    if ((sLureEquipped != FS_LURE_SINKING) && (D_80B7E114 != 0) && (this->fishLength > 60.0f) &&
+        (lineLengthSQ < SQ(30.0f)) && (this->fishState >= 10)) {
         this->fishStateNext = 0;
         this->fishState = 1;
         this->unk_1A4 = 1000;
@@ -2922,34 +2909,43 @@ f32 Fishing_GetMinimumRequiredScore() {
     int32_t weight;
     // RANDOTODO: update the enhancement sliders to not allow
     // values above rando fish weight values when rando'd
-    if(sLinkAge == 1) {
-        weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 10) : 10;
+    if (sLinkAge == 1) {
+        weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0)
+                     ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 10)
+                     : 10;
     } else {
-        weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 13) : 13;     
+        weight = CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0)
+                     ? CVarGetInteger(CVAR_ENHANCEMENT("MinimumFishWeightAdult"), 13)
+                     : 13;
     }
 
     return sqrt(((f32)weight - 0.5f) / 0.0036f);
 }
 
 bool getInstantFish() {
-    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("InstantFishing"), 0);
+    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) &&
+           CVarGetInteger(CVAR_ENHANCEMENT("InstantFishing"), 0);
 }
 
 bool getGuaranteeBite() {
-    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("GuaranteeFishingBite"), 0);
+    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) &&
+           CVarGetInteger(CVAR_ENHANCEMENT("GuaranteeFishingBite"), 0);
 }
 
 bool getFishNeverEscape() {
-    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("FishNeverEscape"), 0);
+    return CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) &&
+           CVarGetInteger(CVAR_ENHANCEMENT("FishNeverEscape"), 0);
 }
 
 bool getShouldSpawnLoaches() {
-    return (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("LoachesAlwaysAppear"), 0))
-        || ((KREG(1) == 1) || ((sFishGameNumber & 3) == 3));
+    return (CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) &&
+            CVarGetInteger(CVAR_ENHANCEMENT("LoachesAlwaysAppear"), 0)) ||
+           ((KREG(1) == 1) || ((sFishGameNumber & 3) == 3));
 }
 
 bool getShouldConfirmKeep() {
-    return !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) || !CVarGetInteger(CVAR_ENHANCEMENT("SkipKeepConfirmation"), 0);
+    return !CVarGetInteger(CVAR_ENHANCEMENT("CustomizeFishing"), 0) ||
+           !CVarGetInteger(CVAR_ENHANCEMENT("SkipKeepConfirmation"), 0);
 }
 
 void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
@@ -3131,7 +3127,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 Fishing_SpawnBubble(NULL, play->specialEffects, &bubblePos, Rand_ZeroFloat(0.02f) + 0.03f, 1);
             }
 
-            Math_ApproachS(&this->fishLimbEFRotYDelta, (Math_SinS(this->stateAndTimer * 0x800) * 2500.0f) + 2500.0f, 2, 0x7D0);
+            Math_ApproachS(&this->fishLimbEFRotYDelta, (Math_SinS(this->stateAndTimer * 0x800) * 2500.0f) + 2500.0f, 2,
+                           0x7D0);
             Math_ApproachS(&this->fishLimb89RotYDelta, Math_SinS(this->stateAndTimer * 0xA00) * 1500.0f, 2, 0x7D0);
 
             this->unk_190 = 0.3f;
@@ -3318,8 +3315,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                 } else {
                     Math_ApproachZeroF(&this->actor.speedXZ, 1.0f, 0.01f);
 
-                    if ((this->actor.speedXZ == 0.0f) ||
-                        (this->actor.world.pos.y > (WATER_SURFACE_Y(play) - 5.0f))) {
+                    if ((this->actor.speedXZ == 0.0f) || (this->actor.world.pos.y > (WATER_SURFACE_Y(play) - 5.0f))) {
                         this->fishTargetPos.x = Rand_ZeroFloat(300.0f);
                         this->fishTargetPos.z = Rand_ZeroFloat(300.0f);
                         this->fishTargetPos.y = this->actor.floorHeight + 10.0f;
@@ -3328,10 +3324,10 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
                         spB8 = this->fishMouthPos;
                         spB8.y = WATER_SURFACE_Y(play);
-                        Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &spB8, 10.0f, 300.0f,
-                                            150, 90);
-                        Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &spB8, 30.0f, 400.0f,
-                                            150, 90);
+                        Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &spB8, 10.0f, 300.0f, 150,
+                                            90);
+                        Fishing_SpawnRipple(&this->actor.projectedPos, play->specialEffects, &spB8, 30.0f, 400.0f, 150,
+                                            90);
 
                         Audio_PlayActorSound2(&this->actor, NA_SE_PL_CATCH_BOOMERANG);
                         break;
@@ -3452,7 +3448,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             }
             if (getGuaranteeBite() == 1 ||
                 ((this->timerArray[0] == 1) || (Rand_ZeroOne() < chance)) &&
-                ((Rand_ZeroOne() < (this->perception * multiplier)) || ((this->isLoach + 1) == KREG(69)))) {
+                    ((Rand_ZeroOne() < (this->perception * multiplier)) || ((this->isLoach + 1) == KREG(69)))) {
                 if (this->isLoach == 0) {
                     this->fishState = 3;
                     this->unk_190 = 1.2f;
@@ -3654,11 +3650,12 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             if (sLineHooked == 0) {
                 if ((sSinkingLureSegmentIndex < 20) && ((sLureTimer & 3) == 0)) {
                     sSinkingLureSegmentIndex++;
-                        }
+                }
             }
 
             if ((sLureBitTimer != 0) && (sLineHooked == 0)) { // pull the line to hook it
-                if (((input->rel.stick_y < -50) && (sStickAdjYPrev > -40)) || CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                if (((input->rel.stick_y < -50) && (sStickAdjYPrev > -40)) ||
+                    CHECK_BTN_ALL(input->press.button, BTN_A)) {
                     if (input->rel.stick_y < -50) {
                         temp_f0 = 40.0f - ((this->fishLength - 30.0f) * 1.333333f);
                         if (temp_f0 > 0.0f) {
@@ -3864,7 +3861,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
 
             if ((sRodCastState < 3) || ((sReelLock != 0) && (sFishFightTime > 50)) || (sFishFightTime >= 6000) ||
                 ((sLureBitTimer == 0) && (sLineHooked == 0)) || (sRodPullback == 0) ||
-                (((sLureTimer & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (sLureEquipped != FS_LURE_SINKING) && (KREG(69) == 0) && (getFishNeverEscape() == 0))) {
+                (((sLureTimer & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (sLureEquipped != FS_LURE_SINKING) &&
+                 (KREG(69) == 0) && (getFishNeverEscape() == 0))) {
                 sFishingCaughtTextDelay = 20;
 
                 if ((sLureBitTimer == 0) && (sLineHooked == 0)) {
@@ -3997,7 +3995,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                                         sFishOnHandIsLoach = this->isLoach;
                                         sLureCaughtWith = sLureEquipped;
                                         Actor_Kill(&this->actor);
-                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0) && (sFishOnHandIsLoach == 0) &&
+                                    } else if (getShouldConfirmKeep() && (this->isLoach == 0) &&
+                                               (sFishOnHandIsLoach == 0) &&
                                                ((s16)this->fishLength < (s16)sFishOnHandLength)) {
                                         this->keepState = 1;
                                         this->timerArray[0] = 0x3C;
@@ -4053,8 +4052,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
                         SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, 0, 0, 0);
                         Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
                     } else {
-                        SkelAnime_InitFlex(play, &this->skelAnime, &gFishingLoachSkel, &gFishingLoachAnim, 0, 0,
-                                           0);
+                        SkelAnime_InitFlex(play, &this->skelAnime, &gFishingLoachSkel, &gFishingLoachAnim, 0, 0, 0);
                         Animation_MorphToLoop(&this->skelAnime, &gFishingLoachAnim, 0.0f);
                     }
                 }
@@ -4187,8 +4185,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
         this->actor.shape.rot.y = this->actor.world.rot.y;
 
         if ((this->fishState != -1) && (this->fishState != -2) && (this->fishState != -25)) {
-            if ((this->actor.world.pos.y > WATER_SURFACE_Y(play)) &&
-                (this->actor.prevPos.y <= WATER_SURFACE_Y(play))) {
+            if ((this->actor.world.pos.y > WATER_SURFACE_Y(play)) && (this->actor.prevPos.y <= WATER_SURFACE_Y(play))) {
                 Fishing_SplashBySize(this, play, true);
                 Fishing_FishLeapSfx(this, true);
                 this->unk_184 = this->actor.velocity.y;
@@ -4285,15 +4282,14 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {
             pos.x = Rand_CenteredFloat(range) + this->actor.world.pos.x;
             pos.y = Rand_CenteredFloat(range) + this->actor.world.pos.y;
             pos.z = Rand_CenteredFloat(range) + this->actor.world.pos.z;
-            Fishing_SpawnBubble(&this->actor.projectedPos, play->specialEffects, &pos,
-                                Rand_ZeroFloat(0.035f) + 0.04f, 0);
+            Fishing_SpawnBubble(&this->actor.projectedPos, play->specialEffects, &pos, Rand_ZeroFloat(0.035f) + 0.04f,
+                                0);
         }
     }
 }
 
-s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                 void* thisx) {
-    Fishing* this = (Fishing*)thisx; 
+s32 Fishing_FishOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+    Fishing* this = (Fishing*)thisx;
 
     if (limbIndex == 0xD) {
         rot->z -= this->fishLimbDRotZDelta - 11000;
@@ -4322,8 +4318,7 @@ void Fishing_FishPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s
     }
 }
 
-s32 Fishing_LoachOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 Fishing_LoachOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
     if (limbIndex == 3) {
@@ -4369,7 +4364,7 @@ void Fishing_DrawFish(Actor* thisx, PlayState* play) {
         Matrix_RotateY(-(M_PI / 2), MTXMODE_APPLY);
 
         SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, Fishing_LoachOverrideLimbDraw, Fishing_LoachPostLimbDraw,
-                              this);
+                                  this);
     }
 }
 
@@ -4874,7 +4869,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                         this->stateAndTimer = 3;
                         break;
                 }
-            // Fix for owner getting stuck when the pond is closed (Fishing Pole Shuffle)
+                // Fix for owner getting stuck when the pond is closed (Fishing Pole Shuffle)
             } else if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
                 Message_CloseTextbox(play);
                 this->stateAndTimer = 0;
@@ -4960,8 +4955,10 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                 this->stateAndTimer = 20;
                             } else if (sFishOnHandIsLoach == 0) {
                                 sFishLengthToWeigh = sFishOnHandLength;
-                                //if we set the record or get the reward
-                                if (GameInteractor_Should(VB_SHOULD_CHECK_FOR_FISHING_RECORD, (s16)sFishingRecordLength < (s16)sFishOnHandLength, &sFishOnHandLength)) {
+                                // if we set the record or get the reward
+                                if (GameInteractor_Should(VB_SHOULD_CHECK_FOR_FISHING_RECORD,
+                                                          (s16)sFishingRecordLength < (s16)sFishOnHandLength,
+                                                          &sFishOnHandLength)) {
                                     if (sLureCaughtWith == FS_LURE_SINKING) {
                                         this->actor.textId = 0x40B0;
                                     } else {
@@ -4989,7 +4986,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                     }
                                 }
 
-                                if ((sLureEquipped == FS_LURE_SINKING) && (sPondOwnerTextIds[sPondOwnerTextIdIndex] == 0x408D)) {
+                                if ((sLureEquipped == FS_LURE_SINKING) &&
+                                    (sPondOwnerTextIds[sPondOwnerTextIdIndex] == 0x408D)) {
                                     Message_ContinueTextbox(play, 0x40AF);
                                 } else {
                                     Message_ContinueTextbox(play, sPondOwnerTextIds[sPondOwnerTextIdIndex]);
@@ -5030,7 +5028,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 GetItemEntry getItemEntry = (GetItemEntry)GET_ITEM_NONE;
 
                 Message_CloseTextbox(play);
-                //Declare and fill a struct for use in hooks
+                // Declare and fill a struct for use in hooks
                 struct VBFishingData fishData;
                 fishData.actor = this;
                 fishData.sFishOnHandIsLoach = &sFishOnHandIsLoach;
@@ -5040,11 +5038,12 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                 fishData.sFishingRecordLength = sFishingRecordLength;
 
                 if (sFishOnHandIsLoach == 0) {
-                    //if we set the record. Needed because of the wider check at VB_SHOULD_CHECK_FOR_FISHING_RECORD
-                    //if not, reset sFishOnHandLength here as we carry it in the struct anyway
-                    if(GameInteractor_Should(VB_SHOULD_SET_FISHING_RECORD, true, &fishData)){
+                    // if we set the record. Needed because of the wider check at VB_SHOULD_CHECK_FOR_FISHING_RECORD
+                    // if not, reset sFishOnHandLength here as we carry it in the struct anyway
+                    if (GameInteractor_Should(VB_SHOULD_SET_FISHING_RECORD, true, &fishData)) {
                         sFishingRecordLength = sFishOnHandLength;
-                        sFishOnHandLength = 0.0f; //if skipped here, is set at the end of the function. needs to be kept for later checks
+                        sFishOnHandLength = 0.0f; // if skipped here, is set at the end of the function. needs to be
+                                                  // kept for later checks
 
                         if (sLinkAge == LINK_AGE_CHILD) {
                             f32 temp;
@@ -5077,7 +5076,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                                 break;
                             }
                         }
-                    }                     
+                    }
 
                     if (sFishingRecordLength >= 60.0f) { // 13 lbs
                         getItemId = GI_RUPEE_PURPLE;
@@ -5088,17 +5087,23 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
                     } else {
                         getItemId = GI_RUPEE_GREEN;
                     }
-                    
+
                     if (sLinkAge == LINK_AGE_CHILD) { // 9 lbs
-                        //if we should give the main prize AND it's not rando
-                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, (sFishingRecordLength >= 50.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD), &fishData)){
+                        // if we should give the main prize AND it's not rando
+                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE,
+                                                  (sFishingRecordLength >= 50.0f) &&
+                                                      !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_CHILD),
+                                                  &fishData)) {
                             HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_CHILD;
                             getItemId = GI_HEART_PIECE;
                             sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
                         }
                     } else { // 13 lbs
-                        //if we should give the main prize AND it's not rando
-                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE, (sFishingRecordLength >= 60.0f) && !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT), &fishData)){
+                        // if we should give the main prize AND it's not rando
+                        if (GameInteractor_Should(VB_SHOULD_GIVE_VANILLA_FISHING_PRIZE,
+                                                  (sFishingRecordLength >= 60.0f) &&
+                                                      !(HIGH_SCORE(HS_FISHING) & HS_FISH_PRIZE_ADULT),
+                                                  &fishData)) {
                             HIGH_SCORE(HS_FISHING) |= HS_FISH_PRIZE_ADULT;
                             getItemId = GI_SCALE_GOLDEN;
                             sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
@@ -5111,8 +5116,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
 
                 this->actor.parent = NULL;
 
-                //if we should give the check in rando
-                if (!GameInteractor_Should(VB_GIVE_RANDO_FISHING_PRIZE, false, &fishData)){
+                // if we should give the check in rando
+                if (!GameInteractor_Should(VB_GIVE_RANDO_FISHING_PRIZE, false, &fishData)) {
                     Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
                     this->stateAndTimer = 23;
                 }
@@ -5165,7 +5170,9 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
             if (Actor_HasParent(&this->actor, play)) {
                 this->stateAndTimer = 24;
             } else {
-                Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLDEN, 2000.0f, 1000.0f);
+                if (!GameInteractor_Should(VB_GIVE_RANDO_GLITCH_FISHING_PRIZE, false, this)) {
+                    Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLDEN, 2000.0f, 1000.0f);
+                }
             }
             break;
 
@@ -5208,7 +5215,7 @@ void Fishing_QuitAtDoor(Fishing* this, PlayState* play) {
                 }
 
                 if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE_FADING) {
-                    
+
                     if (sIsOwnersHatHooked != 0) {
                         sOwnerHair = 1;
                         sIsOwnersHatHooked = 0;
@@ -5534,7 +5541,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
         case 11:
             player->actor.world.pos.z = 1360.0f;
             player->actor.speedXZ = 0.0f;
-            
+
             // #region SOH [Enhancement]
             if (CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0)) {
                 Fishing_QuitAtDoor(this, play);
@@ -5827,8 +5834,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
         }
     }
 
-    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sStreamSoundPos, &sStreamSoundProjectedPos,
-                                 &sProjectedW);
+    SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sStreamSoundPos, &sStreamSoundProjectedPos, &sProjectedW);
 
     Sfx_PlaySfxAtPos(&sStreamSoundProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
 
@@ -5842,8 +5848,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
     osSyncPrintf("HI_SCORE = %x\n", HIGH_SCORE(HS_FISHING));
 }
 
-s32 Fishing_OwnerOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
-                                  void* thisx) {
+s32 Fishing_OwnerOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
     Fishing* this = (Fishing*)thisx;
 
     if (limbIndex == 8) { // Head
@@ -5889,7 +5894,7 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFishingOwnerEyeTexs[this->unk_160]));
 
         SkelAnime_DrawSkeletonOpa(play, &this->skelAnime, Fishing_OwnerOverrideLimbDraw, Fishing_OwnerPostLimbDraw,
-                              this);
+                                  this);
     }
 
     Fishing_DrawPondProps(play);
@@ -5930,10 +5935,8 @@ void Fishing_DrawOwner(Actor* thisx, PlayState* play) {
     Matrix_Translate(130.0f, 40.0f, 1300.0f, MTXMODE_NEW);
     Matrix_Scale(0.08f, 0.12f, 0.14f, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gFishingAquariumBottomDL);
     gSPDisplayList(POLY_XLU_DISP++, gFishingAquariumContainerDL);
diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index 9d3c9c240b..ce6bc0f39e 100644
--- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -97,14 +97,12 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play) {
 
     if (flag) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL);
         gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL);
     } else {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
         gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
     }
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index c724cf7d51..bd9385cc75 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -52,7 +52,7 @@ static s16 sDrawItemIndexes[] = {
 
 static s16 sGetItemIds[] = {
     GI_BOTTLE,     GI_LETTER_RUTO, GI_SHIELD_HYLIAN, GI_QUIVER_40, GI_SCALE_SILVER, GI_SCALE_GOLDEN, GI_KEY_SMALL,
-    GI_ARROW_FIRE, GI_NONE,        GI_NONE,          GI_NONE,      GI_NONE,         GI_NONE,       GI_NONE,
+    GI_ARROW_FIRE, GI_NONE,        GI_NONE,          GI_NONE,      GI_NONE,         GI_NONE,         GI_NONE,
 };
 
 void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionFunc) {
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index ba9d3851b6..7aad98f56b 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -60,7 +60,8 @@ void ItemOcarina_Init(Actor* thisx, PlayState* play) {
             break;
         case 3:
             ItemOcarina_SetupAction(this, ItemOcarina_WaitInWater);
-            if (!Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) || (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_OCARINA_OF_TIME))) {
+            if (!Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) ||
+                (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_OCARINA_OF_TIME))) {
                 Actor_Kill(thisx);
                 return;
             }
@@ -177,14 +178,9 @@ void ItemOcarina_StartSoTCutscene(ItemOcarina* this, PlayState* play) {
 }
 
 void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
-    if (
-        Actor_HasParent(&this->actor, play) || 
-        (
-            !GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true) &&
-            (this->actor.xzDistToPlayer < 20.0f) && (fabsf(this->actor.yDistToPlayer) < 10.0f) &&
-            GET_PLAYER(play)->stateFlags2 & PLAYER_STATE2_DIVING
-        )
-    ) {
+    if (Actor_HasParent(&this->actor, play) ||
+        (!GameInteractor_Should(VB_GIVE_ITEM_OCARINA_OF_TIME, true) && (this->actor.xzDistToPlayer < 20.0f) &&
+         (fabsf(this->actor.yDistToPlayer) < 10.0f) && GET_PLAYER(play)->stateFlags2 & PLAYER_STATE2_DIVING)) {
         Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_OCARINA_OF_TIME);
         Flags_SetSwitch(play, 3);
         this->actionFunc = ItemOcarina_StartSoTCutscene;
@@ -213,7 +209,10 @@ void ItemOcarina_Draw(Actor* thisx, PlayState* play) {
     func_8002ED80(thisx, play, 0);
 
     if (IS_RANDO) {
-        GetItemEntry randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && Randomizer_IsCheckShuffled(RC_HF_OCARINA_OF_TIME_ITEM)) ? GetItemMystery() : Randomizer_GetItemFromKnownCheck(RC_HF_OCARINA_OF_TIME_ITEM, GI_OCARINA_OOT);
+        GetItemEntry randoGetItem = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) &&
+                                     Randomizer_IsCheckShuffled(RC_HF_OCARINA_OF_TIME_ITEM))
+                                        ? GetItemMystery()
+                                        : Randomizer_GetItemFromKnownCheck(RC_HF_OCARINA_OF_TIME_ITEM, GI_OCARINA_OOT);
         EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem);
         GetItemEntry_Draw(play, randoGetItem);
         return;
diff --git a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
index 065c60c68a..2f17865bc1 100644
--- a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
+++ b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
@@ -157,8 +157,7 @@ void func_80B86CA8(ItemShield* this, PlayState* play) {
         D_80B871F4.x = this->unk_1A8[i].x;
         D_80B871F4.y = this->unk_1A8[i].y + (this->actor.shape.yOffset * 0.01f) + (D_80B87200[temp] * -10.0f * 0.2f);
         D_80B871F4.z = this->unk_1A8[i].z;
-        EffectSsFireTail_SpawnFlame(play, &this->actor, &D_80B871F4, D_80B87200[temp] * 0.2f, -1,
-                                    D_80B87240[temp]);
+        EffectSsFireTail_SpawnFlame(play, &this->actor, &D_80B871F4, D_80B87200[temp] * 0.2f, -1, D_80B87240[temp]);
         if (this->unk_19E[i] != 0) {
             this->unk_19E[i]--;
         } else if (this->timer > 16) {
@@ -222,8 +221,7 @@ void ItemShield_Draw(Actor* thisx, PlayState* play) {
     if (!(this->unk_19C & 2)) {
         OPEN_DISPS(play->state.gfxCtx);
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gLinkChildDekuShieldDL));
         CLOSE_DISPS(play->state.gfxCtx);
     }
diff --git a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
index 0e3ca8a2dd..4246da4796 100644
--- a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+++ b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
@@ -226,14 +226,13 @@ void MagicDark_DiamondDraw(Actor* thisx, PlayState* play) {
         Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
         Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
         Matrix_RotateY(this->actor.shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, Spell_col.r, Spell_col.g, Spell_col.b, (s32)(this->primAlpha * 0.6f) & 0xFF);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, Spell_col.r, Spell_col.g, Spell_col.b,
+                        (s32)(this->primAlpha * 0.6f) & 0xFF);
         gDPSetEnvColor(POLY_XLU_DISP++, Spell_env.r, Spell_env.g, Spell_env.b, 128);
         gSPDisplayList(POLY_XLU_DISP++, sDiamondMaterialDL);
-        gSPDisplayList(POLY_XLU_DISP++,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames * 2, gameplayFrames * -4, 32, 32, 1,
-                                        0, gameplayFrames * -16, 64, 32));
+        gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, gameplayFrames * 2, gameplayFrames * -4,
+                                                         32, 32, 1, 0, gameplayFrames * -16, 64, 32));
         gSPDisplayList(POLY_XLU_DISP++, sDiamondModelDL);
     }
 
@@ -286,14 +285,12 @@ void MagicDark_OrbDraw(Actor* thisx, PlayState* play) {
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
     Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
     Matrix_Push();
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY);
     gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
     Matrix_Pop();
     Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
index b6060af74b..487c7332fb 100644
--- a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
+++ b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
@@ -101,8 +101,7 @@ void MagicFire_UpdateBeforeCast(Actor* thisx, PlayState* play) {
     MagicFire* this = (MagicFire*)thisx;
     Player* player = GET_PLAYER(play);
 
-    if ((play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) ||
-        (play->msgCtx.msgMode == MSGMODE_SONG_PLAYED)) {
+    if ((play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) || (play->msgCtx.msgMode == MSGMODE_SONG_PLAYED)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -121,8 +120,7 @@ void MagicFire_Update(Actor* thisx, PlayState* play) {
     s32 pad;
 
     this->actor.world.pos = player->actor.world.pos;
-    if ((play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) ||
-        (play->msgCtx.msgMode == MSGMODE_SONG_PLAYED)) {
+    if ((play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) || (play->msgCtx.msgMode == MSGMODE_SONG_PLAYED)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -236,11 +234,11 @@ void MagicFire_Draw(Actor* thisx, PlayState* play) {
         gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
         gDPFillRectangle(POLY_XLU_DISP++, 0, 0, 319, 239);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, Spell_col.r, Spell_col.g, Spell_col.b, (u8)(this->alphaMultiplier * 255));
+        gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, Spell_col.r, Spell_col.g, Spell_col.b,
+                        (u8)(this->alphaMultiplier * 255));
         gDPSetEnvColor(POLY_XLU_DISP++, Spell_env.r, Spell_env.g, Spell_env.b, (u8)(this->alphaMultiplier * 255));
         Matrix_Scale(0.15f, 0.15f, 0.15f, MTXMODE_APPLY);
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPPipeSync(POLY_XLU_DISP++);
         gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
         gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
diff --git a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
index e4afe9e473..e0c3409933 100644
--- a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
+++ b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
@@ -135,8 +135,7 @@ void MagicWind_Shrink(MagicWind* this, PlayState* play) {
 
 void MagicWind_Update(Actor* thisx, PlayState* play) {
     MagicWind* this = (MagicWind*)thisx;
-    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
-        play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
+    if (play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK || play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
         Actor_Kill(thisx);
         return;
     }
@@ -153,15 +152,15 @@ s32 MagicWind_OverrideLimbDraw(PlayState* play, SkelAnimeCurve* skelCurve, s32 l
         gSPSegment(POLY_XLU_DISP++, 8,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, (play->state.frames * 9) & 0xFF,
                                     0xFF - ((play->state.frames * 0xF) & 0xFF), 0x40, 0x40, 1,
-                                    (play->state.frames * 0xF) & 0xFF,
-                                    0xFF - ((play->state.frames * 0x1E) & 0xFF), 0x40, 0x40));
+                                    (play->state.frames * 0xF) & 0xFF, 0xFF - ((play->state.frames * 0x1E) & 0xFF),
+                                    0x40, 0x40));
 
     } else if (limbIndex == 2) {
         gSPSegment(POLY_XLU_DISP++, 9,
                    Gfx_TwoTexScroll(play->state.gfxCtx, 0, (play->state.frames * 3) & 0xFF,
                                     0xFF - ((play->state.frames * 5) & 0xFF), 0x40, 0x40, 1,
-                                    (play->state.frames * 6) & 0xFF,
-                                    0xFF - ((play->state.frames * 0xA) & 0xFF), 0x40, 0x40));
+                                    (play->state.frames * 6) & 0xFF, 0xFF - ((play->state.frames * 0xA) & 0xFF), 0x40,
+                                    0x40));
     }
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
index 70abe25ec4..778c1c1889 100644
--- a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@@ -492,8 +492,7 @@ void MirRay_Draw(Actor* thisx, PlayState* play) {
 
             Gfx_SetupDL_25Xlu(play->state.gfxCtx);
             Matrix_Scale(1.0f, 1.0f, this->reflectIntensity * 5.0f, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s16)(temp = this->reflectIntensity * 100.0f));
             gSPDisplayList(POLY_XLU_DISP++, gShieldBeamGlowDL);
             MirRay_SetupReflectionPolys(this, play, reflection);
diff --git a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index 214487e8d7..923defcdc5 100644
--- a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -477,8 +477,7 @@ void ObjBean_Init(Actor* thisx, PlayState* play) {
             if (path == 0x1F) {
                 osSyncPrintf(VT_COL(RED, WHITE));
                 // "No path data?"
-                osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", __FILE__, __LINE__,
-                             this->dyna.actor.params);
+                osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", __FILE__, __LINE__, this->dyna.actor.params);
                 osSyncPrintf(VT_RST);
                 Actor_Kill(&this->dyna.actor);
                 return;
@@ -486,8 +485,7 @@ void ObjBean_Init(Actor* thisx, PlayState* play) {
             if (play->setupPathList[path].count < 3) {
                 osSyncPrintf(VT_COL(RED, WHITE));
                 // "Incorrect number of path data"
-                osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", __FILE__, __LINE__,
-                             this->dyna.actor.params);
+                osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", __FILE__, __LINE__, this->dyna.actor.params);
                 osSyncPrintf(VT_RST);
                 Actor_Kill(&this->dyna.actor);
                 return;
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index a804da12eb..3ed4f2c357 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -119,8 +119,8 @@ void ObjComb_Break(ObjComb* this, PlayState* play) {
             arg5 = 32;
         }
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, gravity, arg5, arg6, 4, 0, scale, 0, 0, 80,
-                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, dlist);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, gravity, arg5, arg6, 4, 0, scale, 0, 0, 80, KAKERA_COLOR_NONE,
+                             OBJECT_GAMEPLAY_FIELD_KEEP, dlist);
     }
 
     pos.x = this->actor.world.pos.x;
@@ -218,8 +218,7 @@ void ObjComb_Draw(Actor* thisx, PlayState* play) {
     Matrix_Translate(0, -(this->actor.scale.y * 118.0f), 0, MTXMODE_APPLY);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, gFieldBeehiveDL);
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index ded72dfc4c..ea4910300c 100644
--- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -15,7 +15,6 @@ typedef struct ObjComb {
     /* 0x0170 */ ColliderJntSphElement colliderItems[1];
     /* 0x01B0 */ s16 unk_1B0;
     /* 0x01B2 */ s16 unk_1B2;
-    /*        */ BeehiveIdentity beehiveIdentity;
 } ObjComb; // size = 0x01B4
 
 void ObjComb_Break(ObjComb* objComb, PlayState* play);
diff --git a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
index 0ae7ce195c..078d8fc7aa 100644
--- a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+++ b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
@@ -57,7 +57,8 @@ void ObjDekujr_Init(Actor* thisx, PlayState* play) {
         this->unk_19C = 0;
         this->unk_19B = 1;
     }
-    if (!GameInteractor_Should(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST), this)) {
+    if (!GameInteractor_Should(VB_DEKU_JR_CONSIDER_FOREST_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST),
+                               this)) {
         Actor_Kill(thisx);
     } else {
         ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
@@ -156,16 +157,13 @@ void ObjDekujr_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_dekujr_DL_0030D0);
 
     frameCount = play->state.frames;
-    gSPSegment(
-        POLY_XLU_DISP++, 0x08,
-        Gfx_TwoTexScroll(play->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32));
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPSegment(POLY_XLU_DISP++, 0x08,
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32));
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, object_dekujr_DL_0032D8);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
index f629560143..b2ca1527be 100644
--- a/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
+++ b/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
@@ -54,8 +54,8 @@ void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collisio
     CollisionHeader_GetVirtual(collision, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                     thisx->id, thisx->params);
+        osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, thisx->id,
+                     thisx->params);
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
index e17cf0d801..d4d952cc0b 100644
--- a/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
+++ b/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
@@ -127,8 +127,8 @@ void ObjHamishi_Break(ObjHamishi* this, PlayState* play) {
             gravity = -320;
         }
 
-        EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, gravity, phi_v0, 30, 5, 0,
-                             sEffectScales[i], 3, 0, 70, 1, OBJECT_GAMEPLAY_FIELD_KEEP, gSilverRockFragmentsDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &this->actor.world.pos, gravity, phi_v0, 30, 5, 0, sEffectScales[i],
+                             3, 0, 70, 1, OBJECT_GAMEPLAY_FIELD_KEEP, gSilverRockFragmentsDL);
     }
 
     func_80033480(play, &this->actor.world.pos, 140.0f, 6, 180, 90, 1);
@@ -199,8 +199,7 @@ void ObjHamishi_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 170, 130, 255);
     gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL);
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
index f22e7b5b49..34606904b5 100644
--- a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
+++ b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
@@ -53,12 +53,12 @@ void ObjHsblock_SetupAction(ObjHsblock* this, ObjHsblockActionFunc actionFunc) {
     this->actionFunc = actionFunc;
 }
 
-void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision, s32 moveFlags) {
+void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision, s32 movementFlags) {
     s32 pad;
     CollisionHeader* colHeader = NULL;
     s32 pad2[2];
 
-    DynaPolyActor_Init(&this->dyna, moveFlags);
+    DynaPolyActor_Init(&this->dyna, movementFlags);
     CollisionHeader_GetVirtual(collision, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
     if (this->dyna.bgId == BG_ACTOR_MAX) {
@@ -69,9 +69,9 @@ void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision
 
 void func_80B93BF0(ObjHsblock* this, PlayState* play) {
     if ((this->dyna.actor.params >> 5) & 1) {
-        Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_OBJ_ICE_POLY,
-                           this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
-                           this->dyna.actor.world.rot.x, this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z, 1);
+        Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_OBJ_ICE_POLY, this->dyna.actor.world.pos.x,
+                           this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, this->dyna.actor.world.rot.x,
+                           this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z, 1);
     }
 }
 
@@ -153,8 +153,7 @@ void ObjHsblock_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (play->sceneNum == SCENE_FIRE_TEMPLE) {
         color = &sFireTempleColor;
diff --git a/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
index 01ec2c393c..f7b0395811 100644
--- a/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
+++ b/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
@@ -198,8 +198,7 @@ void ObjIcePoly_Draw(Actor* thisx, PlayState* play) {
     func_8002ED80(&this->actor, play, 0);
     Matrix_RotateZYX(0x500, 0, -0x500, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, play->gameplayFrames % 0x100, 0x20, 0x10, 1, 0,
                                 (play->gameplayFrames * 2) % 0x100, 0x40, 0x20));
diff --git a/soh/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/soh/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
index 16e27e39ed..0a53b34e77 100644
--- a/soh/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
+++ b/soh/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
@@ -7,6 +7,7 @@
 #include "z_obj_kibako.h"
 #include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
@@ -68,9 +69,8 @@ void ObjKibako_SpawnCollectible(ObjKibako* this, PlayState* play) {
     s16 collectible;
 
     collectible = this->actor.params & 0x1F;
-    if ((collectible >= 0) && (collectible <= 0x19)) {
-        Item_DropCollectible(play, &this->actor.world.pos,
-                             collectible | (((this->actor.params >> 8) & 0x3F) << 8));
+    if (GameInteractor_Should(VB_SMALL_CRATE_DROP_ITEM, (collectible >= 0) && (collectible <= 0x19), this)) {
+        Item_DropCollectible(play, &this->actor.world.pos, collectible | (((this->actor.params >> 8) & 0x3F) << 8));
     }
 }
 
@@ -140,9 +140,8 @@ void ObjKibako_AirBreak(ObjKibako* this, PlayState* play) {
         } else {
             phi_s0 = 0x20;
         }
-        EffectSsKakera_Spawn(play, &pos, &velocity, breakPos, -200, phi_s0, 10, 10, 0,
-                             (Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 60, KAKERA_COLOR_NONE,
-                             OBJECT_GAMEPLAY_DANGEON_KEEP, gSmallWoodenBoxFragmentDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, breakPos, -200, phi_s0, 10, 10, 0, (Rand_ZeroOne() * 30.0f) + 10.0f,
+                             0, 32, 60, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, gSmallWoodenBoxFragmentDL);
     }
     func_80033480(play, &this->actor.world.pos, 40.0f, 3, 50, 140, 1);
 }
@@ -175,9 +174,8 @@ void ObjKibako_WaterBreak(ObjKibako* this, PlayState* play) {
         pos.z += breakPos->z;
         temp_rand = Rand_ZeroOne();
         phi_s0 = (temp_rand < 0.2f) ? 0x40 : 0x20;
-        EffectSsKakera_Spawn(play, &pos, &velocity, breakPos, -180, phi_s0, 30, 30, 0,
-                             (Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 70, KAKERA_COLOR_NONE,
-                             OBJECT_GAMEPLAY_DANGEON_KEEP, gSmallWoodenBoxFragmentDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, breakPos, -180, phi_s0, 30, 30, 0, (Rand_ZeroOne() * 30.0f) + 10.0f,
+                             0, 32, 70, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, gSmallWoodenBoxFragmentDL);
     }
 }
 
@@ -284,5 +282,9 @@ void ObjKibako_Draw(Actor* thisx, PlayState* play) {
     s32 pad;
     ObjKibako* this = (ObjKibako*)thisx;
 
+    if (!GameInteractor_Should(VB_SMALL_CRATE_SETUP_DRAW, true, thisx)) {
+        return;
+    }
+
     Gfx_DrawDListOpa(play, gSmallWoodenBoxDL);
 }
diff --git a/soh/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/soh/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
index d6452d2533..778d0de309 100644
--- a/soh/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
+++ b/soh/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
@@ -7,6 +7,7 @@
 #include "z_obj_kibako2.h"
 #include "objects/object_kibako2/object_kibako2.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS 0
 
@@ -98,8 +99,8 @@ void ObjKibako2_Break(ObjKibako2* this, PlayState* play) {
         } else {
             phi_s0 = 0x20;
         }
-        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -200, phi_s0, 28, 2, 0, (Rand_ZeroOne() * 30.0f) + 5.0f,
-                             0, 0, 70, KAKERA_COLOR_NONE, OBJECT_KIBAKO2, gLargeCrateFragmentDL);
+        EffectSsKakera_Spawn(play, &pos, &velocity, &pos, -200, phi_s0, 28, 2, 0, (Rand_ZeroOne() * 30.0f) + 5.0f, 0, 0,
+                             70, KAKERA_COLOR_NONE, OBJECT_KIBAKO2, gLargeCrateFragmentDL);
     }
     func_80033480(play, thisPos, 90.0f, 6, 100, 160, 1);
 }
@@ -110,7 +111,7 @@ void ObjKibako2_SpawnCollectible(ObjKibako2* this, PlayState* play) {
 
     collectibleFlagTemp = this->collectibleFlag;
     itemDropped = this->dyna.actor.home.rot.x;
-    if (itemDropped >= 0 && itemDropped < 0x1A) {
+    if (GameInteractor_Should(VB_CRATE_DROP_ITEM, itemDropped >= 0 && itemDropped < 0x1A, this)) {
         Item_DropCollectible(play, &this->dyna.actor.world.pos, itemDropped | (collectibleFlagTemp << 8));
     }
 }
@@ -161,9 +162,8 @@ void ObjKibako2_Kill(ObjKibako2* this, PlayState* play) {
     s16 params = this->dyna.actor.params;
 
     if ((params & 0x8000) == 0) {
-        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, this->dyna.actor.world.pos.x,
-                    this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
-                    params | 0x8000, true);
+        Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
+                    this->dyna.actor.world.pos.z, 0, this->dyna.actor.shape.rot.y, 0, params | 0x8000, true);
     }
     ObjKibako2_SpawnCollectible(this, play);
     Actor_Kill(&this->dyna.actor);
@@ -176,5 +176,9 @@ void ObjKibako2_Update(Actor* thisx, PlayState* play) {
 }
 
 void ObjKibako2_Draw(Actor* thisx, PlayState* play) {
+    if (!GameInteractor_Should(VB_CRATE_SETUP_DRAW, true, thisx)) {
+        return;
+    }
+
     Gfx_DrawDListOpa(play, gLargeCrateDL);
 }
diff --git a/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
index 87534982b5..18408617dd 100644
--- a/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+++ b/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
@@ -124,7 +124,8 @@ void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) {
     s32 pad;
 
     // Initialize this with the sun switch, so it can't be affected by toggling while the actor is loaded
-    sunLightArrowsEnabledOnSunSwitchLoad = CVarGetInteger(CVAR_ENHANCEMENT("SunlightArrows"), 0) || (IS_RANDO && Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS));
+    sunLightArrowsEnabledOnSunSwitchLoad = CVarGetInteger(CVAR_ENHANCEMENT("SunlightArrows"), 0) ||
+                                           (IS_RANDO && Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS));
 
     Collider_InitJntSph(play, &this->collider);
     // If "Sunlight Arrows" is enabled, set up the collider to allow Light Arrow hits
@@ -195,8 +196,7 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, PlayState* play)
         pos.x = this->actor.world.pos.x + ((z * s) + (x * c));
         pos.y = this->actor.world.pos.y + y + 10.0f;
         pos.z = this->actor.world.pos.z + ((z * c) - (x * s));
-        EffectSsDeadDb_Spawn(play, &pos, &D_80B97F74, &D_80B97F74, 100, 0, 255, 255, 160, 160, 255, 0, 0, 1, 9,
-                             true);
+        EffectSsDeadDb_Spawn(play, &pos, &D_80B97F74, &D_80B97F74, 100, 0, 255, 255, 160, 160, 255, 0, 0, 1, 9, true);
     }
 }
 
@@ -226,13 +226,12 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) {
         this->actor.world.rot.x = this->actor.home.rot.x = this->actor.shape.rot.x;
         this->actor.world.rot.z = this->actor.home.rot.z = this->actor.shape.rot.z;
         this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED;
-        if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI,
-                               this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0,
-                               this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) {
+        if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI, this->actor.home.pos.x,
+                               this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0,
+                               (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) {
             osSyncPrintf(VT_COL(RED, WHITE));
             // "Push-pull block occurrence failure"
-            osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                         this->actor.params);
+            osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params);
             osSyncPrintf(VT_RST);
             removeSelf = true;
         }
@@ -250,7 +249,7 @@ void ObjLightswitch_Destroy(Actor* thisx, PlayState* play2) {
     PlayState* play = play2;
     ObjLightswitch* this = (ObjLightswitch*)thisx;
 
-    // Unset the switch flag on room exit to prevent the rock in the wall from 
+    // Unset the switch flag on room exit to prevent the rock in the wall from
     // vanishing on its own after activating the sun switch by Light Arrow
     // Also prevents the cobra mirror from rotating to face the sun on its own
     // Makes sun switches temporary when activated by Light Arrows (will turn off on room exit)
@@ -505,8 +504,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, PlayState* play) {
         pos.z = this->actor.world.pos.z;
     }
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFaceTextures[this->faceTextureIndex]));
     gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000260);
 
@@ -515,15 +513,13 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, PlayState* play) {
     rot.z = this->actor.shape.rot.z + this->flameRingRot;
     Matrix_SetTranslateRotateYXZ(pos.x, pos.y, pos.z, &rot);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000398);
 
     rot.z = this->actor.shape.rot.z - this->flameRingRot;
     Matrix_SetTranslateRotateYXZ(pos.x, pos.y, pos.z, &rot);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000408);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -545,8 +541,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, PlayState* play) {
     sp68.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y);
     sp68.z = this->actor.world.pos.z;
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFaceTextures[this->faceTextureIndex]));
     gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000260);
 
@@ -556,15 +551,13 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, PlayState* play) {
 
     Matrix_SetTranslateRotateYXZ(sp68.x, sp68.y, sp68.z, &sp60);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000398);
 
     sp60.z = this->actor.shape.rot.z - this->flameRingRot;
     Matrix_SetTranslateRotateYXZ(sp68.x, sp68.y, sp68.z, &sp60);
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000408);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
index 1fb3effc1f..c193ede655 100644
--- a/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
+++ b/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
@@ -7,6 +7,8 @@
 #include "z_obj_makekinsuta.h"
 #include "vt.h"
 
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
 void ObjMakekinsuta_Init(Actor* thisx, PlayState* play);
@@ -47,7 +49,7 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play) {
 
 void func_80B98320(ObjMakekinsuta* this, PlayState* play) {
     if (this->unk_152 != 0) {
-        if (this->timer >= 60 && !func_8002DEEC(GET_PLAYER(play))) {
+        if (GameInteractor_Should(VB_SPAWN_BEAN_SKULLTULA, this->timer >= 60) && !func_8002DEEC(GET_PLAYER(play))) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, this->actor.world.pos.x, this->actor.world.pos.y,
                         this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, (this->actor.params | 0x8000), true);
             this->actionFunc = ObjMakekinsuta_DoNothing;
diff --git a/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
index 873d41e8a5..0a6ea4b449 100644
--- a/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
+++ b/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
@@ -63,9 +63,8 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) {
 
     spawnPos = &block->posVecs[typeIdx];
 
-    if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y,
-                           spawnPos->z, 0, block->rotY, 0,
-                           ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
+    if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0,
+                           block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
         // "Push-pull block failure"
         osSyncPrintf(VT_COL(RED, WHITE));
         osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", __FILE__, __LINE__);
diff --git a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
index 1bf6595b52..9240d1b044 100644
--- a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
+++ b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
@@ -142,8 +142,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) {
     for (i = 0; i < maxChildren; i++) {
         if (this->children[i] != NULL) {
             // "Error: I already have a child(%s %d)(arg_data 0x%04x)"
-            osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                         this->actor.params);
+            osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params);
         }
         switch (this->childrenStates[i]) {
             case OBJMURE_CHILD_STATE_1:
diff --git a/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
index 49d75d7352..e0a7a4fc99 100644
--- a/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
+++ b/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
@@ -114,8 +114,7 @@ void ObjMure2_SpawnActors(ObjMure2* this, PlayState* play) {
     for (i = 0; i < D_80B9A818[actorNum]; i++) {
         if (this->actorSpawnPtrList[i] != NULL) {
             // "Warning : I already have a child (%s %d)(arg_data 0x%04x)"
-            osSyncPrintf("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
-                         this->actor.params);
+            osSyncPrintf("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params);
             continue;
         }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
index df076327d7..16f592a7d6 100644
--- a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+++ b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
@@ -335,8 +335,8 @@ void ObjOshihiki_SetFloors(ObjOshihiki* this, PlayState* play) {
 
         floorPoly = &this->floorPolys[i];
         floorBgId = &this->floorBgIds[i];
-        this->floorHeights[i] = BgCheck_EntityRaycastFloor6(&play->colCtx, floorPoly, floorBgId, &this->dyna.actor,
-                                                            &colCheckPoint, 0.0f);
+        this->floorHeights[i] =
+            BgCheck_EntityRaycastFloor6(&play->colCtx, floorPoly, floorBgId, &this->dyna.actor, &colCheckPoint, 0.0f);
     }
 }
 
@@ -428,8 +428,8 @@ s32 ObjOshihiki_CheckWall(PlayState* play, s16 angle, f32 direction, ObjOshihiki
         faceVtxNext.x = faceVtx.x + maxDist * sn;
         faceVtxNext.y = faceVtx.y;
         faceVtxNext.z = faceVtx.z + maxDist * cs;
-        if (BgCheck_EntityLineTest3(&play->colCtx, &faceVtx, &faceVtxNext, &posResult, &outPoly, true, false,
-                                    false, true, &bgId, &this->dyna.actor, 0.0f)) {
+        if (BgCheck_EntityLineTest3(&play->colCtx, &faceVtx, &faceVtxNext, &posResult, &outPoly, true, false, false,
+                                    true, &bgId, &this->dyna.actor, 0.0f)) {
             return true;
         }
     }
@@ -622,10 +622,9 @@ void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play) {
             ObjOshihiki_SetupOnActor(this, play);
         }
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
-        Audio_PlayActorSound2(&this->dyna.actor,
-                              SurfaceType_GetSfx(&play->colCtx, this->floorPolys[this->highestFloor],
-                                                 this->floorBgIds[this->highestFloor]) +
-                                  SFX_FLAG);
+        Audio_PlayActorSound2(&this->dyna.actor, SurfaceType_GetSfx(&play->colCtx, this->floorPolys[this->highestFloor],
+                                                                    this->floorBgIds[this->highestFloor]) +
+                                                     SFX_FLAG);
     }
 }
 
@@ -664,8 +663,7 @@ void ObjOshihiki_Draw(Actor* thisx, PlayState* play) {
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(this->texture));
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     switch (play->sceneNum) {
         case SCENE_DEKU_TREE:
diff --git a/soh/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/soh/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
index 5bef60ef98..ca9a88e5f7 100644
--- a/soh/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
+++ b/soh/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
@@ -32,13 +32,7 @@ void ObjRoomtimer_Init(Actor* thisx, PlayState* play) {
     ObjRoomtimer* this = (ObjRoomtimer*)thisx;
     s16 params = this->actor.params;
 
-    // Shabom room in Jabu Jabu has a lengthened timer in Enemy Randomizer. Flag doesn't match what the game
-    // expects. Instead set it back to the same flag as what it would be in vanilla.
-    if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && play->sceneNum == SCENE_JABU_JABU && play->roomCtx.curRoom.num == 12) {
-        this->switchFlag = 30;
-    } else {
-        this->switchFlag = (params >> 10) & 0x3F;
-    }
+    this->switchFlag = (params >> 10) & 0x3F;
     this->actor.params = params & 0x3FF;
     params = this->actor.params;
 
@@ -56,8 +50,8 @@ void ObjRoomtimer_Init(Actor* thisx, PlayState* play) {
 void ObjRoomtimer_Destroy(Actor* thisx, PlayState* play) {
     ObjRoomtimer* this = (ObjRoomtimer*)thisx;
 
-    if ((this->actor.params != 0x3FF) && (gSaveContext.timer1Value > 0)) {
-        gSaveContext.timer1State = 10;
+    if ((this->actor.params != 0x3FF) && (gSaveContext.timerSeconds > 0)) {
+        gSaveContext.timerState = 10;
     }
 }
 
@@ -73,15 +67,16 @@ void func_80B9D054(ObjRoomtimer* this, PlayState* play) {
 void func_80B9D0B0(ObjRoomtimer* this, PlayState* play) {
     if (Flags_GetTempClear(play, this->actor.room)) {
         if (this->actor.params != 0x3FF) {
-            gSaveContext.timer1State = 10;
+            gSaveContext.timerState = 10;
         }
         Flags_SetClear(play, this->actor.room);
         Flags_SetSwitch(play, this->switchFlag);
         Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
         Actor_Kill(&this->actor);
     } else {
-        if ((this->actor.params != 0x3FF) && (gSaveContext.timer1Value == 0)) {
-            Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        if ((this->actor.params != 0x3FF) && (gSaveContext.timerSeconds == 0)) {
+            Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             Play_TriggerVoidOut(play);
             Actor_Kill(&this->actor);
         }
diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
index 82c9f2cc66..1b9edc917e 100644
--- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
@@ -235,9 +235,9 @@ void ObjSwitch_InitTrisCollider(ObjSwitch* this, PlayState* play, ColliderTrisIn
 Actor* ObjSwitch_SpawnIce(ObjSwitch* this, PlayState* play) {
     Actor* thisx = &this->dyna.actor;
 
-    return Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_ICE_POLY, thisx->world.pos.x,
-                              thisx->world.pos.y, thisx->world.pos.z, thisx->world.rot.x, thisx->world.rot.y,
-                              thisx->world.rot.z, (this->dyna.actor.params >> 8 & 0x3F) << 8);
+    return Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_ICE_POLY, thisx->world.pos.x, thisx->world.pos.y,
+                              thisx->world.pos.z, thisx->world.rot.x, thisx->world.rot.y, thisx->world.rot.z,
+                              (this->dyna.actor.params >> 8 & 0x3F) << 8);
 }
 
 void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) {
@@ -741,8 +741,7 @@ void ObjSwitch_DrawEye(ObjSwitch* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[subType][this->eyeTexIndex]));
     gSPDisplayList(POLY_OPA_DISP++, eyeDlists[subType]);
 
@@ -764,8 +763,7 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, xluDLists[subType]);
 
     CLOSE_DISPS(play->state.gfxCtx);
@@ -773,8 +771,7 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (subType == OBJSWITCH_SUBTYPE_CRYSTAL_1) {
         gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(this->crystalSubtype1texture));
diff --git a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index c1a4c72f94..ab81c8421e 100644
--- a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_syokudai/object_syokudai.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
 
@@ -141,8 +142,8 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
     if (torchCount == 10) {
         torchCount = 24;
     }
-    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
-                                &waterSurface, &dummy) &&
+    if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface,
+                                &dummy) &&
         ((waterSurface - this->actor.world.pos.y) > 52.0f)) {
         this->litTimer = 0;
         if (torchType == 1) {
@@ -188,8 +189,9 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
                 if (interactionType < 0) {
                     if (player->unk_860 == 0) {
                         player->unk_860 = 210;
-                        Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultReverb);
                     } else if (player->unk_860 < 200) {
                         player->unk_860 = 200;
                     }
@@ -225,8 +227,8 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
                         this->litTimer = (litTimeScale * 50) + 110;
                     }
                 }
-                Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                       &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
     }
@@ -238,7 +240,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
     Collider_UpdateCylinder(&this->actor, &this->colliderFlame);
     CollisionCheck_SetAC(play, &play->colChkCtx, &this->colliderFlame.base);
 
-    if (this->litTimer > 0) {
+    if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->litTimer > 0, this, &this->litTimer)) {
         this->litTimer--;
         if ((this->litTimer == 0) && (torchType != 0)) {
             sLitTorchCount--;
@@ -268,8 +270,7 @@ void ObjSyokudai_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_OPA_DISP++, displayLists[(u16)this->actor.params >> 0xC]);
 
@@ -286,8 +287,8 @@ void ObjSyokudai_Draw(Actor* thisx, PlayState* play) {
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
         gSPSegment(POLY_XLU_DISP++, 0x08,
-                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                    (this->flameTexScroll * -20) & 0x1FF, 0x20, 0x80));
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->flameTexScroll * -20) & 0x1FF,
+                                    0x20, 0x80));
 
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255);
 
@@ -299,8 +300,7 @@ void ObjSyokudai_Draw(Actor* thisx, PlayState* play) {
                        MTXMODE_APPLY);
         Matrix_Scale(flameScale, flameScale, flameScale, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
diff --git a/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
index 3191fa0367..2d045b7d65 100644
--- a/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
+++ b/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
@@ -7,7 +7,9 @@
 #include "z_obj_timeblock.h"
 #include "objects/object_timeblock/object_timeblock.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                               \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \
+     ACTOR_FLAG_LOCK_ON_DISABLED)
 
 void ObjTimeblock_Init(Actor* thisx, PlayState* play);
 void ObjTimeblock_Destroy(Actor* thisx, PlayState* play);
@@ -84,8 +86,8 @@ u32 ObjTimeblock_CalculateIsVisible(ObjTimeblock* this) {
 }
 
 void ObjTimeblock_SpawnDemoEffect(ObjTimeblock* this, PlayState* play) {
-    Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->dyna.actor.world.pos.x,
-                this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, 0, 0,
+    Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
+                this->dyna.actor.world.pos.z, 0, 0, 0,
                 sSizeOptions[(this->dyna.actor.params >> 8) & 1].demoEffectParams, true);
 }
 
@@ -338,8 +340,7 @@ void ObjTimeblock_Draw(Actor* thisx, PlayState* play) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (CVarGetInteger(CVAR_COSMETIC("World.BlockOfTime.Changed"), 0)) {
             Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("World.BlockOfTime.Value"), *primColor);
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color.r, color.g, color.b, 255);
diff --git a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index c4d8c65f4a..643b7bca3d 100644
--- a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -87,9 +87,9 @@ static InitChainEntry sInitChain[] = {
 void ObjTsubo_SpawnCollectible(ObjTsubo* this, PlayState* play) {
     s16 dropParams = this->actor.params & 0x1F;
 
-    if (GameInteractor_Should(VB_POT_DROP_ITEM, (dropParams >= ITEM00_RUPEE_GREEN) && (dropParams <= ITEM00_BOMBS_SPECIAL), this)) {
-        Item_DropCollectible(play, &this->actor.world.pos,
-                             (dropParams | (((this->actor.params >> 9) & 0x3F) << 8)));
+    if (GameInteractor_Should(VB_POT_DROP_ITEM,
+                              (dropParams >= ITEM00_RUPEE_GREEN) && (dropParams <= ITEM00_BOMBS_SPECIAL), this)) {
+        Item_DropCollectible(play, &this->actor.world.pos, (dropParams | (((this->actor.params >> 9) & 0x3F) << 8)));
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
index 74dbf6ebb5..a83d43a47a 100644
--- a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+++ b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
@@ -13,7 +13,6 @@ typedef struct ObjTsubo {
     /* 0x014C */ ObjTsuboActionFunc actionFunc;
     /* 0x0150 */ ColliderCylinder collider;
     /* 0x019C */ s8 objTsuboBankIndex;
-    /*        */ PotIdentity potIdentity;
 } ObjTsubo; // size = 0x01A0
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
index 52e916e4bb..d8d342ee3b 100644
--- a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
+++ b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
@@ -8,7 +8,9 @@
 #include "objects/object_timeblock/object_timeblock.h"
 #include "vt.h"
 
-#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED)
+#define FLAGS                                                                                               \
+    (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \
+     ACTOR_FLAG_LOCK_ON_DISABLED)
 
 void ObjWarp2block_Init(Actor* thisx, PlayState* play);
 void ObjWarp2block_Destroy(Actor* thisx, PlayState* play);
@@ -66,9 +68,8 @@ static Color_RGB8 sColors[] = {
 };
 
 void ObjWarp2block_Spawn(ObjWarp2block* this, PlayState* play) {
-    Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->dyna.actor.world.pos.x,
-                this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, 0, 0,
-                sSpawnData[(this->dyna.actor.params >> 8) & 1].params, true);
+    Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
+                this->dyna.actor.world.pos.z, 0, 0, 0, sSpawnData[(this->dyna.actor.params >> 8) & 1].params, true);
 
     Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->dyna.actor.child->world.pos.x,
                 this->dyna.actor.child->world.pos.y, this->dyna.actor.child->world.pos.z, 0, 0, 0,
@@ -311,8 +312,7 @@ void ObjWarp2block_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sp44->r, sp44->g, sp44->b, 255);
     gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL);
 
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 26815fb32f..2b8cfcb7a1 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -225,8 +225,8 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) {
         }
     }
 
-    if (play->envCtx.unk_EE[3] < 64 &&
-        (gSaveContext.entranceIndex != ENTR_KOKIRI_FOREST_0 || gSaveContext.sceneSetupIndex != 4 || play->envCtx.unk_EE[3])) {
+    if (play->envCtx.unk_EE[3] < 64 && (gSaveContext.entranceIndex != ENTR_KOKIRI_FOREST_0 ||
+                                        gSaveContext.sceneSetupIndex != 4 || play->envCtx.unk_EE[3])) {
         play->envCtx.unk_EE[3] += 16;
     }
 
@@ -698,8 +698,7 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, PlayState* play2) {
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 200, 200, 180);
             gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 180);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD);
 
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex));
 
@@ -812,8 +811,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, PlayState* play2) {
 
     OPEN_DISPS(play->state.gfxCtx);
     if (play->csCtx.state != 0) {
-        if (play->csCtx.npcActions[1] != NULL && play->csCtx.npcActions[1]->action == 2 &&
-            this->requiredObjectLoaded) {
+        if (play->csCtx.npcActions[1] != NULL && play->csCtx.npcActions[1]->action == 2 && this->requiredObjectLoaded) {
             // apparently, light waves with larger amplitudes look brighter, so the name 'amplitude' kind of works here
             if (this->effects[0].state == 0) {
                 this->effects[0].amplitude += 1.0f / 7.0f;
@@ -841,8 +839,8 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, PlayState* play2) {
             end.y = play->csCtx.npcActions[1]->endPos.y;
             end.z = play->csCtx.npcActions[1]->endPos.z;
 
-            weight = Environment_LerpWeight(play->csCtx.npcActions[1]->endFrame,
-                                            play->csCtx.npcActions[1]->startFrame, play->csCtx.frames);
+            weight = Environment_LerpWeight(play->csCtx.npcActions[1]->endFrame, play->csCtx.npcActions[1]->startFrame,
+                                            play->csCtx.frames);
             Matrix_Translate((end.x - start.x) * weight + start.x, (end.y - start.y) * weight + start.y,
                              (end.z - start.z) * weight + start.z, MTXMODE_NEW);
             Matrix_Scale(this->effects[0].size, this->effects[0].size, this->effects[0].size, MTXMODE_APPLY);
@@ -855,8 +853,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, PlayState* play2) {
                            this->effects[0].alpha);
 
             Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_LOAD);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD);
 
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80BA5900[this->effects[0].timer]));
             gDPPipeSync(POLY_XLU_DISP++);
@@ -935,12 +932,10 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, PlayState* play2) {
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, sBeamPrimColors[i].r, sBeamPrimColors[i].g,
                                 sBeamPrimColors[i].b, 128);
                 gDPSetEnvColor(POLY_XLU_DISP++, sBeamEnvColors[i].r, sBeamEnvColors[i].g, sBeamEnvColors[i].b, 128);
-                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                          G_MTX_LOAD);
+                gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_LOAD);
                 gSPSegment(POLY_XLU_DISP++, 0x08,
-                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->state.frames * 5,
-                                            play->state.frames * 10, 32, 64, 1, play->state.frames * 5,
-                                            play->state.frames * 10, 32, 64));
+                           Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->state.frames * 5, play->state.frames * 10, 32,
+                                            64, 1, play->state.frames * 5, play->state.frames * 10, 32, 64));
                 gSPDisplayList(POLY_XLU_DISP++, gDemoKekkaiDL_005FF0);
                 FrameInterpolation_RecordCloseChild();
             }
diff --git a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
index 72ece67690..4fd9226fd7 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@@ -154,11 +154,10 @@ void OceffSpot_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL);
-    gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1,
-                                                     0, scroll * (-8), 32, 32));
+    gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1, 0,
+                                                     scroll * (-8), 32, 32));
     gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
index fe3876df31..e465f0fa1a 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
@@ -164,12 +164,11 @@ void OceffStorm_Draw(Actor* thisx, PlayState* play) {
     vtxPtr[0].v.cn[3] = vtxPtr[6].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[25].v.cn[3] = this->vtxAlpha >> 1;
     vtxPtr[10].v.cn[3] = vtxPtr[22].v.cn[3] = this->vtxAlpha;
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL);
-    gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, 32,
-                                                     1, scroll * 8, (0 - scroll) * 12, 32, 32));
+    gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, 32, 1,
+                                                     scroll * 8, (0 - scroll) * 12, 32, 32));
     gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
index 14b60a8b4e..a249092ceb 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
@@ -111,8 +111,7 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) {
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params != OCEFF_WIPE_ZL) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, 255);
diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
index 0936b06050..909f564fb1 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
@@ -100,8 +100,7 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) {
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128);
diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
index 4b9f53d542..7435a584cc 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
@@ -101,8 +101,7 @@ void OceffWipe3_Draw(Actor* thisx, PlayState* play) {
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 128);
diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
index 37ccdb5313..7be82eda8a 100644
--- a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
+++ b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
@@ -68,7 +68,7 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) {
 
     eye = GET_ACTIVE_CAM(play)->eye;
     Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(play));
-    
+
     int fastOcarinaPlayback = (CVarGetInteger(CVAR_ENHANCEMENT("FastOcarinaPlayback"), 0) != 0);
     if (this->timer < 16) {
         z = Math_SinS(this->timer * 1024) * (fastOcarinaPlayback ? 1200.0f : 1330.0f);
@@ -96,8 +96,7 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) {
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params == OCEFF_WIPE4_UNUSED) {
         gSPDisplayList(POLY_XLU_DISP++, sUnusedMaterialDL);
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index ae01bba64c..2050795767 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -344,7 +344,7 @@ void Player_Action_80850C68(Player* this, PlayState* play);
 void Player_Action_80850E84(Player* this, PlayState* play);
 void Player_Action_CsAction(Player* this, PlayState* play);
 
-#pragma region [SoH]
+#pragma region[SoH]
 u8 gWalkSpeedToggle1;
 u8 gWalkSpeedToggle2;
 
@@ -356,9 +356,8 @@ s32 spawn_boomerang_ivan(EnPartner* this, PlayState* play) {
     f32 posX = (Math_SinS(this->actor.shape.rot.y) * 1.0f) + this->actor.world.pos.x;
     f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 1.0f) + this->actor.world.pos.z;
     s32 yaw = this->actor.shape.rot.y;
-    EnBoom* boomerang =
-        (EnBoom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOOM, posX, this->actor.world.pos.y + 7.0f, posZ,
-                             this->actor.focus.rot.x, yaw, 0, 0, true);
+    EnBoom* boomerang = (EnBoom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOOM, posX, this->actor.world.pos.y + 7.0f,
+                                             posZ, this->actor.focus.rot.x, yaw, 0, 0, true);
 
     this->boomerangActor = &boomerang->actor;
     if (boomerang != NULL) {
@@ -1692,7 +1691,8 @@ void func_80832440(PlayState* play, Player* this) {
     func_80832340(play, this);
     func_8005B1A4(Play_GetCamera(play, 0));
 
-    this->stateFlags1 &= ~(PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER);
+    this->stateFlags1 &= ~(PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_FIRST_PERSON |
+                           PLAYER_STATE1_CLIMBING_LADDER);
     this->stateFlags2 &= ~(PLAYER_STATE2_MOVING_DYNAPOLY | PLAYER_STATE2_GRABBED_BY_ENEMY | PLAYER_STATE2_CRAWLING);
 
     this->actor.shape.rot.x = 0;
@@ -1863,8 +1863,7 @@ void Player_ProcessAnimSfxList(Player* this, AnimSfxEntry* entry) {
             } else if (type == ANIMSFX_SHIFT_TYPE(ANIMSFX_TYPE_WALKING)) {
                 Player_PlaySteppingSfx(this, 0.0f);
             } else if (type == ANIMSFX_SHIFT_TYPE(ANIMSFX_TYPE_UNKNOWN)) {
-                func_800F4010(&this->actor.projectedPos,
-                              NA_SE_PL_WALK_LADDER + this->ageProperties->unk_94, 0.0f);
+                func_800F4010(&this->actor.projectedPos, NA_SE_PL_WALK_LADDER + this->ageProperties->unk_94, 0.0f);
             }
         }
 
@@ -1927,14 +1926,14 @@ void Player_ZeroRootLimbYaw(Player* this) {
  * it can also be called within action functions to change animations in the middle of an action.
  */
 void Player_FinishAnimMovement(Player* this) {
-    if (this->skelAnime.moveFlags != 0) {
+    if (this->skelAnime.movementFlags != 0) {
         Player_ApplyYawFromAnim(this);
 
         this->skelAnime.jointTable[0].x = this->skelAnime.baseTransl.x;
         this->skelAnime.jointTable[0].z = this->skelAnime.baseTransl.z;
 
-        if (this->skelAnime.moveFlags & 8) {
-            if (this->skelAnime.moveFlags & 2) {
+        if (this->skelAnime.movementFlags & 8) {
+            if (this->skelAnime.movementFlags & 2) {
                 this->skelAnime.jointTable[0].y = this->skelAnime.prevTransl.y;
             }
         } else {
@@ -1943,7 +1942,7 @@ void Player_FinishAnimMovement(Player* this) {
 
         Player_ResetAnimMovement(this);
 
-        this->skelAnime.moveFlags = 0;
+        this->skelAnime.movementFlags = 0;
     }
 }
 
@@ -1959,7 +1958,7 @@ void Player_FinishAnimMovement(Player* this) {
 void Player_ApplyAnimMovementScaledByAge(Player* this, s32 movementFlags) {
     Vec3f diff;
 
-    this->skelAnime.moveFlags = movementFlags;
+    this->skelAnime.movementFlags = movementFlags;
     this->skelAnime.prevTransl = this->skelAnime.baseTransl;
 
     SkelAnime_UpdateTranslation(&this->skelAnime, &diff, this->actor.shape.rot.y);
@@ -2006,7 +2005,7 @@ void Player_ApplyAnimMovementScaledByAge(Player* this, s32 movementFlags) {
 void Player_StartAnimMovement(PlayState* play, Player* this, s32 flags) {
     if (flags & PLAYER_ANIM_MOVEMENT_RESET_BY_AGE) {
         Player_ResetAnimMovementScaledByAge(this);
-    } else if ((flags & PLAYER_ANIM_MOVEMENT_RESET) || (this->skelAnime.moveFlags != 0)) {
+    } else if ((flags & PLAYER_ANIM_MOVEMENT_RESET) || (this->skelAnime.movementFlags != 0)) {
         // If AnimMovement is already in use when this function is called and
         // `PLAYER_ANIM_MOVEMENT_RESET_BY_AGE` is not set, then this case will be used.
         Player_ResetAnimMovement(this);
@@ -2018,7 +2017,7 @@ void Player_StartAnimMovement(PlayState* play, Player* this, s32 flags) {
     }
 
     // Remove Player specific flags by masking the lower byte before setting to `skelAnime.movementFlags`
-    this->skelAnime.moveFlags = flags /*&& 0xFF*/;
+    this->skelAnime.movementFlags = flags /*&& 0xFF*/;
 
     Player_ZeroSpeedXZ(this);
     AnimationContext_DisableQueue(play);
@@ -2082,6 +2081,8 @@ void Player_ProcessControlStick(PlayState* play, Player* this) {
         direction = (u16)((s16)(sControlStickWorldYaw - this->actor.shape.rot.y) + 0x2000) >> 14;
     }
 
+    GameInteractor_ExecuteOnPlayerProcessStick();
+
     this->controlStickSpinAngles[this->controlStickDataIndex] = spinAngle;
     this->controlStickDirections[this->controlStickDataIndex] = direction;
 }
@@ -2348,8 +2349,7 @@ void func_80833A20(Player* this, s32 newMeleeWeaponState) {
     u16 voiceSfx;
 
     if (this->meleeWeaponState == 0) {
-        if ((this->heldItemAction == PLAYER_IA_SWORD_BIGGORON) &&
-            (gSaveContext.swordHealth > 0.0f)) {
+        if ((this->heldItemAction == PLAYER_IA_SWORD_BIGGORON) && (gSaveContext.swordHealth > 0.0f)) {
             itemSfx = NA_SE_IT_HAMMER_SWING;
         } else {
             itemSfx = NA_SE_IT_SWORD_SWING;
@@ -2592,7 +2592,7 @@ void Player_StartChangingHeldItem(Player* this, PlayState* play) {
 
     nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM];
     itemChangeType = sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType];
-    
+
     if ((heldItemAction == PLAYER_IA_BOTTLE) || (heldItemAction == PLAYER_IA_BOOMERANG) ||
         ((heldItemAction == PLAYER_IA_NONE) &&
          ((this->heldItemAction == PLAYER_IA_BOTTLE) || (this->heldItemAction == PLAYER_IA_BOOMERANG)))) {
@@ -2628,11 +2628,13 @@ void Player_StartChangingHeldItem(Player* this, PlayState* play) {
 }
 
 void Player_UpdateItems(Player* this, PlayState* play) {
-    if ((this->actor.category == ACTORCAT_PLAYER) && (CVarGetInteger(CVAR_ENHANCEMENT("QuickPutaway"), 0) || !(this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM)) &&
+    if ((this->actor.category == ACTORCAT_PLAYER) &&
+        (CVarGetInteger(CVAR_ENHANCEMENT("QuickPutaway"), 0) ||
+         !(this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM)) &&
         ((this->heldItemAction == this->itemAction) || (this->stateFlags1 & PLAYER_STATE1_SHIELDING)) &&
         (gSaveContext.health != 0) && (play->csCtx.state == CS_STATE_IDLE) && (this->csAction == 0) &&
         (play->shootingGalleryStatus == 0) && (play->activeCamera == MAIN_CAM) &&
-        (play->transitionTrigger != TRANS_TRIGGER_START) && (gSaveContext.timer1State != 10)) {
+        (play->transitionTrigger != TRANS_TRIGGER_START) && (gSaveContext.timerState != 10)) {
         Player_ProcessItemButtons(this, play);
     }
 
@@ -2644,7 +2646,7 @@ void Player_UpdateItems(Player* this, PlayState* play) {
 // Determine projectile type for bow or slingshot
 s32 func_80834380(PlayState* play, Player* this, s32* itemPtr, s32* typePtr) {
     bool useBow = LINK_IS_ADULT;
-    if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0)){
+    if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0)) {
         useBow = this->heldItemAction != PLAYER_IA_SLINGSHOT;
     }
     if (useBow) {
@@ -2743,11 +2745,11 @@ LinkAnimationHeader* func_808346C4(PlayState* play, Player* this) {
     Player_DetachHeldActor(play, this);
 
     if (this->unk_870 < 0.5f) {
-        return D_808543A4[Player_HoldsTwoHandedWeapon(this) &&
-                          !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) && (this->heldItemAction != PLAYER_IA_DEKU_STICK))];
+        return D_808543A4[Player_HoldsTwoHandedWeapon(this) && !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) &&
+                                                                 (this->heldItemAction != PLAYER_IA_DEKU_STICK))];
     } else {
-        return D_808543AC[Player_HoldsTwoHandedWeapon(this) &&
-                          !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) && (this->heldItemAction != PLAYER_IA_DEKU_STICK))];
+        return D_808543AC[Player_HoldsTwoHandedWeapon(this) && !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) &&
+                                                                 (this->heldItemAction != PLAYER_IA_DEKU_STICK))];
     }
 }
 
@@ -2757,8 +2759,8 @@ s32 func_80834758(PlayState* play, Player* this) {
 
     if (!(this->stateFlags1 & (PLAYER_STATE1_SHIELDING | PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_CUTSCENE)) &&
         (play->shootingGalleryStatus == 0) && (this->heldItemAction == this->itemAction) &&
-        (this->currentShield != PLAYER_SHIELD_NONE) && !Player_IsChildWithHylianShield(this) && Player_IsZTargeting(this) &&
-        CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) {
+        (this->currentShield != PLAYER_SHIELD_NONE) && !Player_IsChildWithHylianShield(this) &&
+        Player_IsZTargeting(this) && CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) {
 
         anim = func_808346C4(play, this);
         frame = Animation_GetLastFrame(anim);
@@ -2934,14 +2936,12 @@ int func_80834E7C(PlayState* play) {
         buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
     }
     return (play->shootingGalleryStatus != 0) &&
-           ((play->shootingGalleryStatus < 0) ||
-            CHECK_BTN_ANY(sControlInput->cur.button, buttonsToCheck));
+           ((play->shootingGalleryStatus < 0) || CHECK_BTN_ANY(sControlInput->cur.button, buttonsToCheck));
 }
 
 s32 func_80834EB8(Player* this, PlayState* play) {
     if ((this->unk_6AD == 0) || (this->unk_6AD == 2)) {
-        if (Player_IsZTargeting(this) ||
-            (Camera_CheckValidMode(Play_GetCamera(play, 0), 7) == 0)) {
+        if (Player_IsZTargeting(this) || (Camera_CheckValidMode(Play_GetCamera(play, 0), 7) == 0)) {
             return 1;
         }
         this->unk_6AD = 2;
@@ -3138,8 +3138,8 @@ s32 func_80835588(Player* this, PlayState* play) {
 void Player_SetParallel(Player* this) {
     this->stateFlags1 |= PLAYER_STATE1_PARALLEL;
 
-    if (!(this->skelAnime.moveFlags & 0x80) &&
-        (this->actor.bgCheckFlags & 0x200) && (sShapeYawToTouchedWall < 0x2000)) {
+    if (!(this->skelAnime.movementFlags & 0x80) && (this->actor.bgCheckFlags & 0x200) &&
+        (sShapeYawToTouchedWall < 0x2000)) {
         // snap to the wall
         this->yaw = this->actor.shape.rot.y = this->actor.wallYaw + 0x8000;
     }
@@ -3235,7 +3235,7 @@ s32 func_808358F0(Player* this, PlayState* play) {
     } else {
         // #region SOH [Enhancement]
         if (!CVarGetInteger(CVAR_ENHANCEMENT("BoomerangReticle"), 0)) {
-        // #endregion
+            // #endregion
             LinkAnimation_Update(play, &this->upperSkelAnime);
         }
     }
@@ -3327,7 +3327,8 @@ s32 Player_SetupAction(PlayState* play, Player* this, PlayerActionFunc actionFun
 
     this->actionFunc = actionFunc;
 
-    if ((this->itemAction != this->heldItemAction) && (!(flags & 1) || !(this->stateFlags1 & PLAYER_STATE1_SHIELDING))) {
+    if ((this->itemAction != this->heldItemAction) &&
+        (!(flags & 1) || !(this->stateFlags1 & PLAYER_STATE1_SHIELDING))) {
         func_8008EC70(this);
     }
 
@@ -3338,10 +3339,11 @@ s32 Player_SetupAction(PlayState* play, Player* this, PlayerActionFunc actionFun
 
     Player_FinishAnimMovement(this);
 
-    this->stateFlags1 &= ~(PLAYER_STATE1_HOOKSHOT_FALLING | PLAYER_STATE1_TALKING | PLAYER_STATE1_DAMAGED | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE |
-                           PLAYER_STATE1_FLOOR_DISABLED);
+    this->stateFlags1 &= ~(PLAYER_STATE1_HOOKSHOT_FALLING | PLAYER_STATE1_TALKING | PLAYER_STATE1_DAMAGED |
+                           PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE | PLAYER_STATE1_FLOOR_DISABLED);
     this->stateFlags2 &= ~(PLAYER_STATE2_HOPPING | PLAYER_STATE2_OCARINA_PLAYING | PLAYER_STATE2_IDLE_FIDGET);
-    this->stateFlags3 &= ~(PLAYER_STATE3_MIDAIR | PLAYER_STATE3_FINISHED_ATTACKING | PLAYER_STATE3_FLYING_WITH_HOOKSHOT);
+    this->stateFlags3 &=
+        ~(PLAYER_STATE3_MIDAIR | PLAYER_STATE3_FINISHED_ATTACKING | PLAYER_STATE3_FLYING_WITH_HOOKSHOT);
 
     this->av1.actionVar1 = 0;
     this->av2.actionVar2 = 0;
@@ -3360,14 +3362,14 @@ s32 Player_SetupAction(PlayState* play, Player* this, PlayerActionFunc actionFun
 void Player_SetupActionPreserveAnimMovement(PlayState* play, Player* this, PlayerActionFunc actionFunc, s32 flags) {
     s32 savedMovementFlags;
 
-    savedMovementFlags = this->skelAnime.moveFlags;
+    savedMovementFlags = this->skelAnime.movementFlags;
 
     // Setting `skelAnime.movementFlags` to 0 will prevent `Player_FinishAnimMovement` from ending
     // AnimMovement when `Player_SetupAction` is called.
-    this->skelAnime.moveFlags = 0;
+    this->skelAnime.movementFlags = 0;
 
     Player_SetupAction(play, this, actionFunc, flags);
-    this->skelAnime.moveFlags = savedMovementFlags;
+    this->skelAnime.movementFlags = savedMovementFlags;
 }
 
 /**
@@ -3440,7 +3442,8 @@ void Player_UseItem(PlayState* play, Player* this, s32 item) {
                  ((itemAction == PLAYER_IA_MAGIC_BEAN) && (AMMO(ITEM_BEAN) == 0)) ||
                  (temp = Player_ActionToExplosive(this, itemAction),
                   ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) ||
-                                   (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3 && !CVarGetInteger(CVAR_ENHANCEMENT("RemoveExplosiveLimit"), 0))))))) {
+                                   (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3 &&
+                                    !CVarGetInteger(CVAR_ENHANCEMENT("RemoveExplosiveLimit"), 0))))))) {
                 // Prevent some items from being used if player is out of ammo.
                 // Also prevent explosives from being used if there are 3 or more active (outside of bombchu bowling)
                 Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
@@ -3485,7 +3488,7 @@ void Player_UseItem(PlayState* play, Player* this, s32 item) {
 
                 func_808328EC(this, NA_SE_PL_CHANGE_ARMS);
             } else if (((itemAction >= PLAYER_IA_OCARINA_FAIRY) && (itemAction <= PLAYER_IA_OCARINA_OF_TIME)) ||
-                (itemAction >= PLAYER_IA_BOTTLE_FISH)) {
+                       (itemAction >= PLAYER_IA_BOTTLE_FISH)) {
                 // Handle "cutscene items"
                 if (!Player_CheckHostileLockOn(this) ||
                     ((itemAction >= PLAYER_IA_BOTTLE_POTION_RED) && (itemAction <= PLAYER_IA_BOTTLE_FAIRY))) {
@@ -3494,7 +3497,7 @@ void Player_UseItem(PlayState* play, Player* this, s32 item) {
                     this->itemAction = itemAction;
                 }
             } else if ((itemAction != this->heldItemAction) ||
-                ((this->heldActor == NULL) && (Player_ActionToExplosive(this, itemAction) >= 0))) {
+                       ((this->heldActor == NULL) && (Player_ActionToExplosive(this, itemAction) >= 0))) {
                 // Handle using a new held item
                 this->nextModelGroup = Player_ActionToModelGroup(this, itemAction);
                 nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM];
@@ -3503,9 +3506,9 @@ void Player_UseItem(PlayState* play, Player* this, s32 item) {
                     (item != this->heldItemId) &&
                     (sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType] !=
                      PLAYER_ITEM_CHG_0) &&
-                    (!CVarGetInteger(CVAR_ENHANCEMENT("SeparateArrows"), 0) ||
-                     itemAction < PLAYER_IA_BOW || itemAction > PLAYER_IA_BOW_0E ||
-                     this->heldItemAction < PLAYER_IA_BOW || this->heldItemAction > PLAYER_IA_BOW_0E)) {
+                    (!CVarGetInteger(CVAR_ENHANCEMENT("SeparateArrows"), 0) || itemAction < PLAYER_IA_BOW ||
+                     itemAction > PLAYER_IA_BOW_0E || this->heldItemAction < PLAYER_IA_BOW ||
+                     this->heldItemAction > PLAYER_IA_BOW_0E)) {
                     // Start the held item change process
                     this->heldItemId = item;
                     this->stateFlags1 |= PLAYER_STATE1_START_CHANGING_HELD_ITEM;
@@ -3671,7 +3674,8 @@ void Player_UpdateShapeYaw(Player* this, PlayState* play) {
             Math_ScaledStepToS(&this->actor.shape.rot.y,
                                Math_Vec3f_Yaw(&this->actor.world.pos, &this->focusActor->focus.pos), 4000);
         } else if ((this->stateFlags1 & PLAYER_STATE1_PARALLEL) &&
-                   !(this->stateFlags2 & (PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS))) {
+                   !(this->stateFlags2 &
+                     (PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS))) {
             Math_ScaledStepToS(&this->actor.shape.rot.y, this->parallelYaw, 4000);
         }
     } else if (!(this->stateFlags2 & PLAYER_STATE2_DISABLE_ROTATION_ALWAYS)) {
@@ -4025,7 +4029,8 @@ s32 Player_GetMovementSpeedAndYaw(Player* this, f32* outSpeedTarget, s16* outYaw
         *outYawTarget = this->actor.shape.rot.y;
 
         if (this->focusActor != NULL) {
-            if ((play->actorCtx.targetCtx.unk_4B != 0) && !(this->stateFlags2 & PLAYER_STATE2_DISABLE_ROTATION_ALWAYS)) {
+            if ((play->actorCtx.targetCtx.unk_4B != 0) &&
+                !(this->stateFlags2 & PLAYER_STATE2_DISABLE_ROTATION_ALWAYS)) {
                 *outYawTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->focusActor->focus.pos);
                 return false;
             }
@@ -4281,6 +4286,10 @@ s32 Player_CanSpinAttack(Player* this) {
     iter = &this->controlStickSpinAngles[0];
     iter2 = &sp3C[0];
 
+    if (GameInteractor_Should(VB_SHOULD_QUICKSPIN, false, iter2, sp3C)) {
+        return true;
+    }
+
     for (i = 0; i < 4; i++, iter++, iter2++) {
         if ((*iter2 = *iter) < 0) {
             return false;
@@ -4441,8 +4450,7 @@ void func_80837948(PlayState* play, Player* this, s32 arg2) {
     if ((arg2 >= PLAYER_MWA_FLIPSLASH_START) && (arg2 <= PLAYER_MWA_JUMPSLASH_FINISH)) {
         if (CVarGetInteger(CVAR_GENERAL("RestoreQPA"), 1) && temp == -1) {
             dmgFlags = 0x16171617;
-        }
-        else {
+        } else {
             dmgFlags = D_80854488[temp][1];
         }
     } else {
@@ -4579,9 +4587,9 @@ void func_80837C0C(PlayState* play, Player* this, s32 damageResponseType, f32 sp
 
             Player_PlayVoiceSfx(this, NA_SE_VO_LI_DAMAGE_S);
         } else if ((damageResponseType == PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE) ||
-                   (damageResponseType == PLAYER_HIT_RESPONSE_KNOCKBACK_SMALL) ||
-                   !(this->actor.bgCheckFlags & 1) ||
-                   (this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) {
+                   (damageResponseType == PLAYER_HIT_RESPONSE_KNOCKBACK_SMALL) || !(this->actor.bgCheckFlags & 1) ||
+                   (this->stateFlags1 &
+                    (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) {
             Player_SetupAction(play, this, Player_Action_8084377C, 0);
 
             this->stateFlags3 |= PLAYER_STATE3_MIDAIR;
@@ -4722,13 +4730,15 @@ s32 func_808382DC(Player* this, PlayState* play) {
 
     if (this->unk_A86 != 0) {
         if (!Player_InBlockingCsMode(play, this)) {
-            Player_InflictDamageModified(play, -16 * (1 << CVarGetInteger(CVAR_ENHANCEMENT("VoidDamageMult"), 0)), false);
+            Player_InflictDamageModified(play, -16 * (1 << CVarGetInteger(CVAR_ENHANCEMENT("VoidDamageMult"), 0)),
+                                         false);
             this->unk_A86 = 0;
         }
     } else {
         sp68 = ((Player_GetHeight(this) - 8.0f) < (this->unk_6C4 * this->actor.scale.y));
 
-        if (sp68 || (this->actor.bgCheckFlags & 0x100) || (sFloorType == 9) || (this->stateFlags2 & PLAYER_STATE2_FORCED_VOID_OUT)) {
+        if (sp68 || (this->actor.bgCheckFlags & 0x100) || (sFloorType == 9) ||
+            (this->stateFlags2 & PLAYER_STATE2_FORCED_VOID_OUT)) {
             Player_PlayVoiceSfx(this, NA_SE_VO_LI_DAMAGE_S);
 
             if (sp68) {
@@ -4754,7 +4764,9 @@ s32 func_808382DC(Player* this, PlayState* play) {
                     gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw;
                 }
 
-                Play_TriggerVoidOut(play);
+                if (GameInteractor_Should(VB_TRIGGER_VOIDOUT, true, this)) {
+                    Play_TriggerVoidOut(play);
+                }
             }
 
             Player_PlayVoiceSfx(this, NA_SE_VO_LI_TAKEN_AWAY);
@@ -4813,13 +4825,14 @@ s32 func_808382DC(Player* this, PlayState* play) {
                             LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim);
                         } else {
                             Player_AnimPlayOnce(play, this,
-                                          D_808543C4[Player_HoldsTwoHandedWeapon(this) &&
-                                                     !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) &&
-                                                       (this->heldItemAction != PLAYER_IA_DEKU_STICK))]);
+                                                D_808543C4[Player_HoldsTwoHandedWeapon(this) &&
+                                                           !(CVarGetInteger(CVAR_CHEAT("ShieldTwoHanded"), 0) &&
+                                                             (this->heldItemAction != PLAYER_IA_DEKU_STICK))]);
                         }
                     }
 
-                    if (!(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) {
+                    if (!(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
+                                               PLAYER_STATE1_CLIMBING_LADDER))) {
                         this->linearVelocity = -18.0f;
                         this->yaw = this->actor.shape.rot.y;
                     }
@@ -4871,8 +4884,9 @@ s32 func_808382DC(Player* this, PlayState* play) {
                     ((sp48 >= 0) &&
                      SurfaceType_IsWallDamage(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) &&
                      (this->floorTypeTimer >= D_808544F4[sp48])) ||
-                    ((sp48 >= 0) && ((this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0) ||
-                                     (this->floorTypeTimer >= D_808544F4[sp48])))) {
+                    ((sp48 >= 0) &&
+                     ((this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger(CVAR_CHEAT("SuperTunic"), 0) == 0) ||
+                      (this->floorTypeTimer >= D_808544F4[sp48])))) {
                     this->floorTypeTimer = 0;
                     this->actor.colChkInfo.damage = 4;
                     func_80837C0C(play, this, PLAYER_HIT_RESPONSE_NONE, 4.0f, 5.0f, this->actor.shape.rot.y, 20);
@@ -4928,8 +4942,8 @@ s32 Player_ActionHandler_12(Player* this, PlayState* play) {
             } else if ((this->currentBoots != PLAYER_BOOTS_IRON) || (this->ledgeClimbType > 2)) {
                 return 0;
             }
-        } else if (!(this->actor.bgCheckFlags & 1) ||
-                   ((this->ageProperties->unk_14 <= this->yDistToLedge) && (this->stateFlags1 & PLAYER_STATE1_IN_WATER))) {
+        } else if (!(this->actor.bgCheckFlags & 1) || ((this->ageProperties->unk_14 <= this->yDistToLedge) &&
+                                                       (this->stateFlags1 & PLAYER_STATE1_IN_WATER))) {
             return 0;
         }
 
@@ -5061,7 +5075,7 @@ static s16 sReturnEntranceGroupData[] = {
 
     // ENTR_RETURN_2
     /*  3 */ ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_FRONT, // from Potion Shop in Kakariko
-    /*  4 */ ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,       // from Potion Shop in Market
+    /*  4 */ ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP,             // from Potion Shop in Market
 
     // ENTR_RETURN_BAZAAR
     /*  5 */ ENTR_KAKARIKO_VILLAGE_OUTSIDE_BAZAAR,
@@ -5069,16 +5083,16 @@ static s16 sReturnEntranceGroupData[] = {
 
     // ENTR_RETURN_4
     /*  7 */ ENTR_KAKARIKO_VILLAGE_OUTSIDE_SKULKLTULA_HOUSE, // from House of Skulltulas
-    /*  8 */ ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,    // from Bombchu Shop
+    /*  8 */ ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP,       // from Bombchu Shop
 
     // ENTR_RETURN_SHOOTING_GALLERY
     /*  9 */ ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOOTING_GALLERY,
     /* 10 */ ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY,
 
     // ENTR_RETURN_GREAT_FAIRYS_FOUNTAIN_SPELLS
-    /* 11 */ ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY,  // from Farores Wind Fairy Fountain
-    /* 12 */ ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT,   // from Dins Fire Fairy Fountain (as child)
-    /* 13 */ ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT, // from Nayrus Love Fairy Fountain
+    /* 11 */ ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY, // from Farores Wind Fairy Fountain
+    /* 12 */ ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT,    // from Dins Fire Fairy Fountain (as child)
+    /* 13 */ ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT,   // from Nayrus Love Fairy Fountain
 };
 
 /**
@@ -5103,9 +5117,10 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
     if (this->actor.category == ACTORCAT_PLAYER) {
         exitIndex = 0;
 
-        if (!(this->stateFlags1 & PLAYER_STATE1_DEAD) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (this->csAction == 0) &&
-            !(this->stateFlags1 & PLAYER_STATE1_LOADING) &&
-            (((poly != NULL) && (exitIndex = SurfaceType_GetSceneExitIndex(&play->colCtx, poly, bgId), exitIndex != 0)) ||
+        if (!(this->stateFlags1 & PLAYER_STATE1_DEAD) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
+            (this->csAction == 0) && !(this->stateFlags1 & PLAYER_STATE1_LOADING) &&
+            (((poly != NULL) &&
+              (exitIndex = SurfaceType_GetSceneExitIndex(&play->colCtx, poly, bgId), exitIndex != 0)) ||
              (func_8083816C(sFloorType) && (this->floorProperty == 12)))) {
 
             sp34 = this->unk_A84 - (s32)this->actor.world.pos.y;
@@ -5116,7 +5131,9 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
             }
 
             if (exitIndex == 0) {
-                Play_TriggerVoidOut(play);
+                if (GameInteractor_Should(VB_TRIGGER_VOIDOUT, true, this)) {
+                    Play_TriggerVoidOut(play);
+                }
                 Scene_SetTransitionForNextEntrance(play);
             } else {
                 play->nextEntranceIndex = play->setupExitList[exitIndex - 1];
@@ -5134,10 +5151,14 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
                 } else if (play->nextEntranceIndex >= ENTR_RETURN_YOUSEI_IZUMI_YOKO) {
                     // handle dynamic exits
                     if (IS_RANDO) {
-                        play->nextEntranceIndex = Entrance_OverrideDynamicExit(sReturnEntranceGroupIndices[play->nextEntranceIndex - ENTR_RETURN_YOUSEI_IZUMI_YOKO] + play->curSpawn);
+                        play->nextEntranceIndex = Entrance_OverrideDynamicExit(
+                            sReturnEntranceGroupIndices[play->nextEntranceIndex - ENTR_RETURN_YOUSEI_IZUMI_YOKO] +
+                            play->curSpawn);
                     } else {
                         play->nextEntranceIndex =
-                            sReturnEntranceGroupData[sReturnEntranceGroupIndices[play->nextEntranceIndex - ENTR_RETURN_YOUSEI_IZUMI_YOKO] + play->curSpawn];
+                            sReturnEntranceGroupData[sReturnEntranceGroupIndices[play->nextEntranceIndex -
+                                                                                 ENTR_RETURN_YOUSEI_IZUMI_YOKO] +
+                                                     play->curSpawn];
                     }
 
                     Scene_SetTransitionForNextEntrance(play);
@@ -5146,7 +5167,9 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
                                               SurfaceType_GetSlope(&play->colCtx, poly, bgId) == 2,
                                               play->setupExitList[exitIndex - 1])) {
                         gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = play->nextEntranceIndex;
-                        Play_TriggerVoidOut(play);
+                        if (GameInteractor_Should(VB_TRIGGER_VOIDOUT, true, this)) {
+                            Play_TriggerVoidOut(play);
+                        }
                         gSaveContext.respawnFlag = -2;
                     }
                     gSaveContext.retainWeatherMode = 1;
@@ -5209,7 +5232,7 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
                     if (this->actor.bgCheckFlags & 1) {
                         if (this->floorProperty == 5) {
                             Play_TriggerRespawn(play);
-                        } else {
+                        } else if (GameInteractor_Should(VB_TRIGGER_VOIDOUT, true, this)) {
                             Play_TriggerVoidOut(play);
                         }
                         play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
@@ -5307,7 +5330,8 @@ s32 Player_ActionHandler_1(Player* this, PlayState* play) {
     if ((this->doorType != PLAYER_DOORTYPE_NONE) &&
         (!(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) ||
          ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) {
-        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) && GameInteractor_Should(VB_BE_ABLE_TO_OPEN_DOORS, true)) {
+        if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (Player_Action_8084F9A0 == this->actionFunc)) &&
+            GameInteractor_Should(VB_BE_ABLE_TO_OPEN_DOORS, true)) {
             doorActor = this->doorActor;
 
             if (this->doorType <= PLAYER_DOORTYPE_AJAR) {
@@ -5356,9 +5380,10 @@ s32 Player_ActionHandler_1(Player* this, PlayState* play) {
                 }
 
                 if (doorShutter->dyna.actor.category == ACTORCAT_DOOR) {
-                    this->cv.slidingDoorBgCamIndex = play->transiActorCtx.list[(u16)doorShutter->dyna.actor.params >> 10]
-                                        .sides[(doorDirection > 0) ? 0 : 1]
-                                        .effects;
+                    this->cv.slidingDoorBgCamIndex =
+                        play->transiActorCtx.list[(u16)doorShutter->dyna.actor.params >> 10]
+                            .sides[(doorDirection > 0) ? 0 : 1]
+                            .effects;
 
                     Actor_DisableLens(play);
                 }
@@ -5415,7 +5440,8 @@ s32 Player_ActionHandler_1(Player* this, PlayState* play) {
                     this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
                     Actor_DisableLens(play);
 
-                    if (GameInteractor_Should(VB_DOOR_PLAY_SCENE_TRANSITION, ((doorActor->params >> 7) & 7) == 3, doorActor)) {
+                    if (GameInteractor_Should(VB_DOOR_PLAY_SCENE_TRANSITION, ((doorActor->params >> 7) & 7) == 3,
+                                              doorActor)) {
                         checkPos.x = doorActor->world.pos.x - (sp6C * sp74);
                         checkPos.y = doorActor->world.pos.y + 10.0f;
                         checkPos.z = doorActor->world.pos.z - (sp6C * sp78);
@@ -5432,15 +5458,15 @@ s32 Player_ActionHandler_1(Player* this, PlayState* play) {
                                              play->transiActorCtx.list[(u16)doorActor->params >> 10]
                                                  .sides[(doorDirection > 0) ? 0 : 1]
                                                  .effects,
-                                             0, 38.0f * sInvWaterSpeedFactor, 26.0f * sInvWaterSpeedFactor, 10.0f * sInvWaterSpeedFactor);
+                                             0, 38.0f * sInvWaterSpeedFactor, 26.0f * sInvWaterSpeedFactor,
+                                             10.0f * sInvWaterSpeedFactor);
                     }
                 }
             }
 
             if ((this->doorType != PLAYER_DOORTYPE_FAKE) && (doorActor->category == ACTORCAT_DOOR)) {
-                frontRoom = play->transiActorCtx.list[(u16)doorActor->params >> 10]
-                                .sides[(doorDirection > 0) ? 0 : 1]
-                                .room;
+                frontRoom =
+                    play->transiActorCtx.list[(u16)doorActor->params >> 10].sides[(doorDirection > 0) ? 0 : 1].room;
 
                 if ((frontRoom >= 0) && (frontRoom != play->roomCtx.curRoom.num)) {
                     func_8009728C(play, &play->roomCtx, frontRoom);
@@ -5534,7 +5560,8 @@ void func_8083A0F4(PlayState* play, Player* this) {
             this->interactRangeActor->parent = &this->actor;
             Player_SetupAction(play, this, Player_Action_8084F608, 0);
             this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
-            if (!CVarGetInteger(CVAR_ENHANCEMENT("PersistentMasks"), 0) || !CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0)) {
+            if (!CVarGetInteger(CVAR_ENHANCEMENT("PersistentMasks"), 0) ||
+                !CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0)) {
                 gSaveContext.ship.maskMemory = PLAYER_MASK_NONE;
             }
         } else {
@@ -5612,7 +5639,8 @@ void func_8083A434(PlayState* play, Player* this) {
 
     if (this->getItemId == GI_HEART_CONTAINER_2) {
         this->av2.actionVar2 = 20;
-    } else if (this->getItemId >= 0 || (this->getItemEntry.objectId != OBJECT_INVALID && this->getItemEntry.getItemId >= 0)) {
+    } else if (this->getItemId >= 0 ||
+               (this->getItemEntry.objectId != OBJECT_INVALID && this->getItemEntry.getItemId >= 0)) {
         this->av2.actionVar2 = 1;
     } else {
         this->getItemId = -this->getItemId;
@@ -5748,7 +5776,8 @@ void func_8083AA10(Player* this, PlayState* play) {
 
     this->fallDistance = this->fallStartHeight - (s32)this->actor.world.pos.y;
 
-    if (!(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)) && !(this->actor.bgCheckFlags & 1)) {
+    if (!(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)) &&
+        !(this->actor.bgCheckFlags & 1)) {
         if (!func_80838FB8(play, this)) {
             if (sPrevFloorProperty == 8) {
                 this->actor.world.pos.x = this->actor.prevPos.x;
@@ -5756,7 +5785,7 @@ void func_8083AA10(Player* this, PlayState* play) {
                 return;
             }
 
-            if (!(this->stateFlags3 & PLAYER_STATE3_MIDAIR) && !(this->skelAnime.moveFlags & 0x80) &&
+            if (!(this->stateFlags3 & PLAYER_STATE3_MIDAIR) && !(this->skelAnime.movementFlags & 0x80) &&
                 (Player_Action_8084411C != this->actionFunc) && (Player_Action_80844A44 != this->actionFunc)) {
 
                 if ((sPrevFloorProperty == 7) || (this->meleeWeaponState != 0)) {
@@ -5778,9 +5807,9 @@ void func_8083AA10(Player* this, PlayState* play) {
 
                 this->floorSfxOffset = this->prevFloorSfxOffset;
 
-                if ((this->actor.bgCheckFlags & 4) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (sPrevFloorProperty != 6) &&
-                    (sPrevFloorProperty != 9) && (sYDistToFloor > 20.0f) && (this->meleeWeaponState == 0) && (ABS(sp5C) < 0x2000) &&
-                    (this->linearVelocity > 3.0f)) {
+                if ((this->actor.bgCheckFlags & 4) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
+                    (sPrevFloorProperty != 6) && (sPrevFloorProperty != 9) && (sYDistToFloor > 20.0f) &&
+                    (this->meleeWeaponState == 0) && (ABS(sp5C) < 0x2000) && (this->linearVelocity > 3.0f)) {
 
                     if ((sPrevFloorProperty == 11) && !(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)) {
 
@@ -5818,7 +5847,8 @@ s32 func_8083AD4C(PlayState* play, Player* this) {
         if (func_8002DD6C(this)) {
             bool shouldUseBowCamera = LINK_IS_ADULT;
 
-            if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+                CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
                 shouldUseBowCamera = this->heldItemAction != PLAYER_IA_SLINGSHOT;
             }
 
@@ -5827,7 +5857,7 @@ s32 func_8083AD4C(PlayState* play, Player* this) {
             // #region SOH [Enhancement]
             if (CVarGetInteger(CVAR_ENHANCEMENT("BoomerangFirstPerson"), 0)) {
                 camMode = CAM_MODE_FIRSTPERSON;
-            // #endregion
+                // #endregion
             } else {
                 camMode = CAM_MODE_BOOMERANG;
             }
@@ -5911,8 +5941,8 @@ void func_8083AF44(PlayState* play, Player* this, s32 magicSpell) {
 }
 
 void func_8083B010(Player* this) {
-    this->actor.focus.rot.x = this->actor.focus.rot.z = this->headLimbRot.x = this->headLimbRot.y = this->headLimbRot.z = this->upperLimbRot.x =
-        this->upperLimbRot.y = this->upperLimbRot.z = 0;
+    this->actor.focus.rot.x = this->actor.focus.rot.z = this->headLimbRot.x = this->headLimbRot.y =
+        this->headLimbRot.z = this->upperLimbRot.x = this->upperLimbRot.y = this->upperLimbRot.z = 0;
 
     this->actor.focus.rot.y = this->actor.shape.rot.y;
 }
@@ -6002,7 +6032,8 @@ s32 Player_ActionHandler_13(Player* this, PlayState* play) {
                             func_8083AE40(this, giEntry.objectId);
                         }
 
-                        this->stateFlags1 |= PLAYER_STATE1_TALKING | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
+                        this->stateFlags1 |=
+                            PLAYER_STATE1_TALKING | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
 
                         if (sp2C >= 0) {
                             sp2C = sp2C + 1;
@@ -6042,7 +6073,8 @@ s32 Player_ActionHandler_13(Player* this, PlayState* play) {
                         this->exchangeItemId = sp2C;
 
                         if (this->av1.actionVar1 < 0) {
-                            Player_AnimChangeOnceMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_check, this->modelAnimType));
+                            Player_AnimChangeOnceMorph(play, this,
+                                                       GET_PLAYER_ANIM(PLAYER_ANIMGROUP_check, this->modelAnimType));
                         } else {
                             Player_AnimPlayOnce(play, this, D_80854548[this->av1.actionVar1]);
                         }
@@ -6113,7 +6145,7 @@ s32 Player_ActionHandler_Talk(Player* this, PlayState* play) {
     canTalkToLockOnWithCUp =
         (lockOnActor != NULL) &&
         (CHECK_FLAG_ALL(lockOnActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP) ||
-        (lockOnActor->naviEnemyId != 0xFF));
+         (lockOnActor->naviEnemyId != 0xFF));
 
     if (canTalkToLockOnWithCUp || (this->naviTextId != 0)) {
         // If `naviTextId` is negative and outside the 0x2XX range, talk to Navi instantly
@@ -6138,14 +6170,16 @@ s32 Player_ActionHandler_Talk(Player* this, PlayState* play) {
     if ((talkOfferActor != NULL) || (cUpTalkActor != NULL)) {
         if ((lockOnActor == NULL) || (lockOnActor == talkOfferActor) || (lockOnActor == cUpTalkActor)) {
             if (!(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) ||
-                ((this->heldActor != NULL) && (forceTalkToNavi || (talkOfferActor == this->heldActor) || (cUpTalkActor == this->heldActor) ||
-                                               ((talkOfferActor != NULL) && (talkOfferActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED))))) {
+                ((this->heldActor != NULL) &&
+                 (forceTalkToNavi || (talkOfferActor == this->heldActor) || (cUpTalkActor == this->heldActor) ||
+                  ((talkOfferActor != NULL) && (talkOfferActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED))))) {
                 if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_ON_HORSE) ||
                     (func_808332B8(this) && !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER))) {
 
                     if (talkOfferActor != NULL) {
                         this->stateFlags2 |= PLAYER_STATE2_CAN_ACCEPT_TALK_OFFER;
-                        if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (talkOfferActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
+                        if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) ||
+                            (talkOfferActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
                             cUpTalkActor = NULL;
                         } else if (cUpTalkActor == NULL) {
                             return 0;
@@ -6157,7 +6191,9 @@ s32 Player_ActionHandler_Talk(Player* this, PlayState* play) {
                             this->stateFlags2 |= PLAYER_STATE2_NAVI_ALERT;
                         }
 
-                        if (!CHECK_BTN_ALL(sControlInput->press.button, CVarGetInteger(CVAR_ENHANCEMENT("NaviOnL"), 0) ? BTN_L : BTN_CUP) && !forceTalkToNavi) {
+                        if (!CHECK_BTN_ALL(sControlInput->press.button,
+                                           CVarGetInteger(CVAR_ENHANCEMENT("NaviOnL"), 0) ? BTN_L : BTN_CUP) &&
+                            !forceTalkToNavi) {
                             return 0;
                         }
 
@@ -6176,10 +6212,11 @@ s32 Player_ActionHandler_Talk(Player* this, PlayState* play) {
                     // `sSavedCurrentMask` saves the current mask just before the current action runs on this frame.
                     // This saved mask value is then restored just before starting a conversation.
                     //
-                    // This handles an edge case where a conversation is started on the same frame that a mask was taken on or off.
-                    // Because Player updates early before most actors, the text ID being offered comes from the previous frame.
-                    // If a mask was taken on or off the same frame this function runs, the wrong text will be used.
-                    // This is especially important to prevent unwanted behavior with regards to mask trading.
+                    // This handles an edge case where a conversation is started on the same frame that a mask was taken
+                    // on or off. Because Player updates early before most actors, the text ID being offered comes from
+                    // the previous frame. If a mask was taken on or off the same frame this function runs, the wrong
+                    // text will be used. This is especially important to prevent unwanted behavior with regards to mask
+                    // trading.
                     this->currentMask = sSavedCurrentMask;
                     Player_StartTalking(play, talkOfferActor);
                     return true;
@@ -6210,12 +6247,13 @@ s32 Player_ActionHandler_0(Player* this, PlayState* play) {
         return 1;
     }
 
-    if ((this->focusActor != NULL) && (CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP) ||
-                                    (this->focusActor->naviEnemyId != 0xFF))) {
+    if ((this->focusActor != NULL) &&
+        (CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP) ||
+         (this->focusActor->naviEnemyId != 0xFF))) {
         this->stateFlags2 |= PLAYER_STATE2_NAVI_ALERT;
-    } else if ((this->naviTextId == 0 || CVarGetInteger(CVAR_ENHANCEMENT("NaviOnL"), 0)) && !Player_CheckHostileLockOn(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) &&
-               (YREG(15) != 0x10) &&
-               (YREG(15) != 0x20) && !func_8083B8F4(this, play)) {
+    } else if ((this->naviTextId == 0 || CVarGetInteger(CVAR_ENHANCEMENT("NaviOnL"), 0)) &&
+               !Player_CheckHostileLockOn(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) &&
+               (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, play)) {
         Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
     }
 
@@ -6278,7 +6316,8 @@ s32 Player_TryRoll(Player* this, PlayState* play) {
 }
 
 void func_8083BCD0(Player* this, PlayState* play, s32 controlStickDirection) {
-    func_80838940(this, D_80853D4C[controlStickDirection][0], !(controlStickDirection & 1) ? 5.8f : 3.5f, play, NA_SE_VO_LI_SWORD_N);
+    func_80838940(this, D_80853D4C[controlStickDirection][0], !(controlStickDirection & 1) ? 5.8f : 3.5f, play,
+                  NA_SE_VO_LI_SWORD_N);
 
     if (controlStickDirection) {}
 
@@ -6432,6 +6471,8 @@ s32 Player_ActionHandler_11(Player* this, PlayState* play) {
         Player_DetachHeldActor(play, this);
 
         if (Player_SetupAction(play, this, Player_Action_80843188, 0)) {
+            GameInteractor_ExecuteOnPlayerHoldUpShield();
+
             this->stateFlags1 |= PLAYER_STATE1_SHIELDING;
 
             if (!Player_IsChildWithHylianShield(this)) {
@@ -6490,8 +6531,8 @@ void func_8083C50C(Player* this) {
 
 s32 Player_ActionHandler_8(Player* this, PlayState* play) {
     if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) {
-        if (!(this->stateFlags1 & PLAYER_STATE1_SHIELDING) && (Player_GetMeleeWeaponHeld(this) != 0) && (this->unk_844 == 1) &&
-            (this->heldItemAction != PLAYER_IA_DEKU_STICK)) {
+        if (!(this->stateFlags1 & PLAYER_STATE1_SHIELDING) && (Player_GetMeleeWeaponHeld(this) != 0) &&
+            (this->unk_844 == 1) && (this->heldItemAction != PLAYER_IA_DEKU_STICK)) {
             if ((this->heldItemAction != PLAYER_IA_SWORD_BIGGORON) || (gSaveContext.swordHealth > 0.0f)) {
                 func_808377DC(play, this);
                 return 1;
@@ -6596,8 +6637,8 @@ s32 func_8083C910(PlayState* play, Player* this, f32 arg2) {
     f32 sp28;
 
     sp28 = this->actor.world.pos.y;
-    if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp28,
-                             &sp2C) != 0) {
+    if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp28, &sp2C) !=
+        0) {
         sp28 -= this->actor.world.pos.y;
         if (this->ageProperties->unk_24 <= sp28) {
             Player_SetupAction(play, this, Player_Action_8084D7C4, 0);
@@ -6683,8 +6724,8 @@ void Player_SetupTurnInPlace(PlayState* play, Player* this, s16 yaw) {
     this->turnRate = 1200;
     this->turnRate *= sWaterSpeedFactor; // slow turn rate by half when in water
 
-    LinkAnimation_Change(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_45_turn][this->modelAnimType], 1.0f,
-                         0.0f, 0.0f, ANIMMODE_LOOP, -6.0f);
+    LinkAnimation_Change(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_45_turn][this->modelAnimType], 1.0f, 0.0f,
+                         0.0f, ANIMMODE_LOOP, -6.0f);
 }
 
 void func_8083CE0C(Player* this, PlayState* play) {
@@ -6791,22 +6832,26 @@ s32 func_8083D12C(PlayState* play, Player* this, Input* arg2) {
                     Player_SetupAction(play, this, Player_Action_8084E1EC, 1);
 
                     if (this->stateFlags1 & PLAYER_STATE1_GETTING_ITEM) {
-                        this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
+                        this->stateFlags1 |=
+                            PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
                     }
 
                     this->av2.actionVar2 = 2;
                 }
 
                 func_80832340(play, this);
-                // Skip take breath animation on surface if Link didn't grab an item while underwater and the setting is enabled
-                if (CVarGetInteger(CVAR_ENHANCEMENT("SkipSwimDeepEndAnim"), 0) && !(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)) {
+                // Skip take breath animation on surface if Link didn't grab an item while underwater and the setting is
+                // enabled
+                if (CVarGetInteger(CVAR_ENHANCEMENT("SkipSwimDeepEndAnim"), 0) &&
+                    !(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)) {
                     int lastAnimFrame = Animation_GetLastFrame(&gPlayerAnim_link_swimer_swim_deep_end);
                     LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_swimer_swim_deep_end, 1.0f,
-                        lastAnimFrame, lastAnimFrame, ANIMMODE_ONCE, -6.0f);
+                                         lastAnimFrame, lastAnimFrame, ANIMMODE_ONCE, -6.0f);
                 } else {
                     Player_AnimChangeOnceMorph(play, this,
-                                (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) ? &gPlayerAnim_link_swimer_swim_get
-                                                                        : &gPlayerAnim_link_swimer_swim_deep_end);
+                                               (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)
+                                                   ? &gPlayerAnim_link_swimer_swim_get
+                                                   : &gPlayerAnim_link_swimer_swim_deep_end);
                 }
 
                 if (func_8083CFA8(play, this, this->actor.velocity.y, 500)) {
@@ -6841,8 +6886,8 @@ void func_8083D36C(PlayState* play, Player* this) {
         } else {
             Player_SetupAction(play, this, Player_Action_8084D610, 1);
             Player_AnimChangeOnceMorph(play, this,
-                          (this->actor.bgCheckFlags & 1) ? &gPlayerAnim_link_swimer_wait2swim_wait
-                                                         : &gPlayerAnim_link_swimer_land2swim_wait);
+                                       (this->actor.bgCheckFlags & 1) ? &gPlayerAnim_link_swimer_wait2swim_wait
+                                                                      : &gPlayerAnim_link_swimer_land2swim_wait);
         }
     }
 
@@ -6886,8 +6931,9 @@ void func_8083D53C(PlayState* play, Player* this) {
                 func_8083D36C(play, this);
                 return;
             }
-        } else if ((this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (this->actor.yDistToWater < this->ageProperties->unk_24)) {
-            if ((this->skelAnime.moveFlags == 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) {
+        } else if ((this->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
+                   (this->actor.yDistToWater < this->ageProperties->unk_24)) {
+            if ((this->skelAnime.movementFlags == 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) {
                 Player_SetupTurnInPlace(play, this, this->actor.shape.rot.y);
             }
             func_8083D0A8(play, this, this->actor.velocity.y);
@@ -7078,11 +7124,13 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) {
     if (this->meleeWeaponState == 0) {
         float maxSpeed = R_RUN_SPEED_LIMIT / 100.0f;
 
-        if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) == BUNNY_HOOD_FAST_AND_JUMP && this->currentMask == PLAYER_MASK_BUNNY) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) == BUNNY_HOOD_FAST_AND_JUMP &&
+            this->currentMask == PLAYER_MASK_BUNNY) {
             maxSpeed *= 1.5f;
-        } 
-        
-        if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0) && !CVarGetInteger(CVAR_SETTING("WalkModifier.DoesntChangeJump"), 0)) {
+        }
+
+        if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0) &&
+            !CVarGetInteger(CVAR_SETTING("WalkModifier.DoesntChangeJump"), 0)) {
             if (CVarGetInteger(CVAR_SETTING("WalkModifier.SpeedToggle"), 0)) {
                 if (gWalkSpeedToggle1) {
                     maxSpeed *= CVarGetFloat(CVAR_SETTING("WalkModifier.Mapping1"), 1.0f);
@@ -7229,14 +7277,15 @@ void func_8083E4C4(PlayState* play, Player* this, GetItemEntry* giEntry) {
 
     if (!(giEntry->field & 0x80)) {
         Item_DropCollectible(play, &this->actor.world.pos, dropType | 0x8000);
-        if ((dropType != 4) && (dropType != 8) && (dropType != 9) && (dropType != 0xA) && (dropType != 0) && (dropType != 1) && (dropType != 2) &&
-            (dropType != 0x14) && (dropType != 0x13)) {
+        if ((dropType != 4) && (dropType != 8) && (dropType != 9) && (dropType != 0xA) && (dropType != 0) &&
+            (dropType != 1) && (dropType != 2) && (dropType != 0x14) && (dropType != 0x13)) {
             Item_Give(play, giEntry->itemId);
         }
     } else {
         Item_Give(play, giEntry->itemId);
     }
-    Sfx_PlaySfxCentered((this->getItemId < 0 || this->getItemEntry.getItemId < 0) ? NA_SE_SY_GET_BOXITEM : NA_SE_SY_GET_ITEM);
+    Sfx_PlaySfxCentered((this->getItemId < 0 || this->getItemEntry.getItemId < 0) ? NA_SE_SY_GET_BOXITEM
+                                                                                  : NA_SE_SY_GET_ITEM);
 }
 
 s32 Player_ActionHandler_2(Player* this, PlayState* play) {
@@ -7248,8 +7297,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
         return 1;
     }
 
-    if (iREG(67) || (((interactedActor = this->interactRangeActor) != NULL) &&
-                     func_8002D53C(play, &play->actorCtx.titleCtx))) {
+    if (iREG(67) ||
+        (((interactedActor = this->interactRangeActor) != NULL) && func_8002D53C(play, &play->actorCtx.titleCtx))) {
         if (iREG(67) || (this->getItemId > GI_NONE)) {
             if (iREG(67)) {
                 this->getItemId = iREG(68);
@@ -7277,31 +7326,32 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
                     return 1;
                 }
 
-                // Show the cutscene for picking up an item. In vanilla, this happens in bombchu bowling alley (because getting bombchus need to show the cutscene)
-                // and whenever the player doesn't have the item yet. In rando, we're overruling this because we need to keep showing the cutscene
-                // because those items can be randomized and thus it's important to keep showing the cutscene.
-                uint8_t showItemCutscene = play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY || Item_CheckObtainability(giEntry.itemId) == ITEM_NONE || IS_RANDO;
+                // Show the cutscene for picking up an item. In vanilla, this happens in bombchu bowling alley (because
+                // getting bombchus need to show the cutscene) and whenever the player doesn't have the item yet. In
+                // rando, we're overruling this because we need to keep showing the cutscene because those items can be
+                // randomized and thus it's important to keep showing the cutscene.
+                uint8_t showItemCutscene = play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY ||
+                                           Item_CheckObtainability(giEntry.itemId) == ITEM_NONE || IS_RANDO;
 
                 // Only skip cutscenes for drops when they're items/consumables from bushes/rocks/enemies.
-                uint8_t isDropToSkip = 
-                                        (
-                                            interactedActor->id == ACTOR_EN_ITEM00 &&
-                                            interactedActor->params != ITEM00_HEART_PIECE &&
-                                            interactedActor->params != ITEM00_SMALL_KEY &&
-                                            interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY &&
-                                            interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY_GI
-                                        ) ||
-                                        interactedActor->id == ACTOR_EN_KAREBABA || 
-                                        interactedActor->id == ACTOR_EN_DEKUBABA;
+                uint8_t isDropToSkip =
+                    (interactedActor->id == ACTOR_EN_ITEM00 && interactedActor->params != ITEM00_HEART_PIECE &&
+                     interactedActor->params != ITEM00_SMALL_KEY &&
+                     interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY &&
+                     interactedActor->params != ITEM00_SOH_GIVE_ITEM_ENTRY_GI) ||
+                    interactedActor->id == ACTOR_EN_KAREBABA || interactedActor->id == ACTOR_EN_DEKUBABA;
 
-                // Skip cutscenes from picking up consumables with "Fast Pickup Text" enabled, even when the player never picked it up before.
-                // But only for bushes/rocks/enemies because otherwise it can lead to softlocks in deku mask theatre and potentially other places.
+                // Skip cutscenes from picking up consumables with "Fast Pickup Text" enabled, even when the player
+                // never picked it up before. But only for bushes/rocks/enemies because otherwise it can lead to
+                // softlocks in deku mask theatre and potentially other places.
                 uint8_t skipItemCutscene = CVarGetInteger(CVAR_ENHANCEMENT("FastDrops"), 0) && isDropToSkip;
 
-                // Same as above but for rando. Rando is different because we want to enable cutscenes for items that the player already has because
-                // those items could be a randomized item coming from scrubs, freestanding PoH's and keys. So we need to once again overrule
-                // this specifically for items coming from bushes/rocks/enemies when the player has already picked that item up.
-                uint8_t skipItemCutsceneRando = IS_RANDO && Item_CheckObtainability(giEntry.itemId) != ITEM_NONE && isDropToSkip;
+                // Same as above but for rando. Rando is different because we want to enable cutscenes for items that
+                // the player already has because those items could be a randomized item coming from scrubs,
+                // freestanding PoH's and keys. So we need to once again overrule this specifically for items coming
+                // from bushes/rocks/enemies when the player has already picked that item up.
+                uint8_t skipItemCutsceneRando =
+                    IS_RANDO && Item_CheckObtainability(giEntry.itemId) != ITEM_NONE && isDropToSkip;
 
                 // Show cutscene when picking up a item.
                 if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando) {
@@ -7315,7 +7365,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
                         func_80835EA4(play, 9);
                     }
 
-                    this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
+                    this->stateFlags1 |=
+                        PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
                     func_80832224(this);
                     return 1;
                 }
@@ -7325,7 +7376,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
                 this->getItemId = GI_NONE;
                 this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
             }
-        } else if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && !(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) &&
+        } else if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) &&
+                   !(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) &&
                    !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER)) {
             if (this->getItemId != GI_NONE) {
                 GetItemEntry giEntry;
@@ -7346,7 +7398,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
                 if (GameInteractor_Should(VB_GIVE_ITEM_FROM_CHEST, true, chest)) {
                     Player_SetupWaitForPutAway(play, this, func_8083A434);
                 }
-                this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
+                this->stateFlags1 |=
+                    PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE;
                 func_8083AE40(this, giEntry.objectId);
 
                 this->actor.world.pos.x =
@@ -7357,7 +7410,7 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
                 func_80832224(this);
 
                 bool vanillaPlaySlowChestCS = (giEntry.itemId != ITEM_NONE) && (giEntry.gi >= 0) &&
-                    (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE);
+                                              (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE);
 
                 if (GameInteractor_Should(VB_PLAY_SLOW_CHEST_CS, vanillaPlaySlowChestCS, chest)) {
                     Player_AnimPlayOnceAdjusted(play, this, this->ageProperties->unk_98);
@@ -7373,7 +7426,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
             }
 
             if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) {
-                if (GameInteractor_Should(VB_SHOW_MASTER_SWORD_TO_PLACE_IN_PEDESTAL, (interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT)) {
+                if (GameInteractor_Should(VB_SHOW_MASTER_SWORD_TO_PLACE_IN_PEDESTAL,
+                                          (interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT)) {
                     s32 sp24 = this->itemAction;
 
                     this->itemAction = PLAYER_IA_NONE;
@@ -7427,8 +7481,10 @@ s32 Player_ActionHandler_9(Player* this, PlayState* play) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) {
         buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
     }
-    if ((this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) &&
-        CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)) {
+    if (GameInteractor_Should(VB_THROW_OR_PUT_DOWN_HELD_ITEM,
+                              ((this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) &&
+                               CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)),
+                              sControlInput)) {
         if (!func_80835644(play, this, this->heldActor)) {
             if (!func_8083EAF0(this, this->heldActor)) {
                 Player_SetupAction(play, this, Player_Action_808464B0, 1);
@@ -7601,7 +7657,7 @@ s32 Player_TryEnteringCrawlspace(Player* this, PlayState* play, u32 interactWall
         // Perpendicular (sideways) XZ-Distance from player pos to crawlspace line
         // Uses y-component of crossproduct formula for the distance from a point to a line
         xVertex2 = ((this->actor.world.pos.x - xVertex1) * COLPOLY_GET_NORMAL(wallPoly->normal.z)) -
-               ((this->actor.world.pos.z - zVertex1) * COLPOLY_GET_NORMAL(wallPoly->normal.x));
+                   ((this->actor.world.pos.z - zVertex1) * COLPOLY_GET_NORMAL(wallPoly->normal.x));
 
         if (fabsf(xVertex2) < 8.0f) {
             // Give do-action prompt to "Enter on A" for the crawlspace
@@ -7620,19 +7676,10 @@ s32 Player_TryEnteringCrawlspace(Player* this, PlayState* play, u32 interactWall
                 this->actor.world.pos.z = zVertex1 + (distToInteractWall * wallPolyNormZ);
                 func_80832224(this);
                 this->actor.prevPos = this->actor.world.pos;
-                // #region SOH [Enhancement]
-                if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                    // increase animation speed when entering a tunnel
-                    LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_child_tunnel_start,
-                                         ((CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) + 1.0f) / 2.0f), 0.0f,
-                                         Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), ANIMMODE_ONCE,
-                                         0.0f);
-                    Player_StartAnimMovement(play, this, 0x9D);
-                // #endregion
-                } else {
+                if (GameInteractor_Should(VB_CRAWL_SPEED_ENTER, true)) {
                     Player_AnimPlayOnce(play, this, &gPlayerAnim_link_child_tunnel_start);
-                    Player_StartAnimMovement(play, this, 0x9D);
                 }
+                Player_StartAnimMovement(play, this, 0x9D);
                 return true;
             }
         }
@@ -7662,8 +7709,8 @@ s32 func_8083F360(PlayState* play, Player* this, f32 arg1, f32 arg2, f32 arg3, f
     sp60.z = this->actor.world.pos.z + (arg3 * yawCos);
     sp60.y = sp6C.y = this->actor.world.pos.y + arg1;
 
-    if (BgCheck_EntityLineTest1(&play->colCtx, &sp6C, &sp60, &sp54, &this->actor.wallPoly, true, false, false,
-                                true, &wallBgId)) {
+    if (BgCheck_EntityLineTest1(&play->colCtx, &sp6C, &sp60, &sp54, &this->actor.wallPoly, true, false, false, true,
+                                &wallBgId)) {
         wallPoly = this->actor.wallPoly;
 
         this->actor.bgCheckFlags |= 0x200;
@@ -7714,38 +7761,19 @@ s32 Player_TryLeavingCrawlspace(Player* this, PlayState* play) {
         if (ABS(yawToWall) > 0x4000) {
             Player_SetupAction(play, this, Player_Action_8084C81C, 0);
 
-            if (this->linearVelocity > 0.0f) {
-                // Leaving a crawlspace forwards
-                this->actor.shape.rot.y = this->actor.wallYaw + 0x8000;
-                // #region SOH [Enhancement]
-                if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                    LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_child_tunnel_end,
-                                         ((CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) + 1.0f) / 2.0f), 0.0f,
-                                         Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_end), ANIMMODE_ONCE,
-                                         0.0f);
-                    Player_StartAnimMovement(play, this, 0x9D);
-                    OnePointCutscene_Init(play, 9601, 999, NULL, MAIN_CAM);
-                // #endregion
-                } else {
+            if (GameInteractor_Should(VB_CRAWL_SPEED_EXIT, true)) {
+                if (this->linearVelocity > 0.0f) {
+                    // Leaving a crawlspace forwards
+                    this->actor.shape.rot.y = this->actor.wallYaw + 0x8000;
                     Player_AnimPlayOnce(play, this, &gPlayerAnim_link_child_tunnel_end);
                     Player_StartAnimMovement(play, this, 0x9D);
                     OnePointCutscene_Init(play, 9601, 999, NULL, MAIN_CAM);
-                }
-            } else {
-                // Leaving a crawlspace backwards
-                this->actor.shape.rot.y = this->actor.wallYaw;
-                // #region SOH [Enhancement]
-                if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                    LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_child_tunnel_start,
-                                         -1.0f * ((CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) + 1.0f) / 2.0f),
-                                         Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), 0.0f, ANIMMODE_ONCE, 0.0f);
-                    Player_StartAnimMovement(play, this, 0x9D);
-                    OnePointCutscene_Init(play, 9602, 999, NULL, MAIN_CAM);
-                // #endregion
-                }
-                else {
+                } else {
+                    // Leaving a crawlspace backwards
+                    this->actor.shape.rot.y = this->actor.wallYaw;
                     LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_child_tunnel_start, -1.0f,
-                                         Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), 0.0f, ANIMMODE_ONCE, 0.0f);
+                                         Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), 0.0f,
+                                         ANIMMODE_ONCE, 0.0f);
                     Player_StartAnimMovement(play, this, 0x9D);
                     OnePointCutscene_Init(play, 9602, 999, NULL, MAIN_CAM);
                 }
@@ -7775,14 +7803,16 @@ void func_8083F72C(Player* this, LinkAnimationHeader* anim, PlayState* play) {
 s32 Player_ActionHandler_5(Player* this, PlayState* play) {
     DynaPolyActor* wallPolyActor;
 
-    if (!(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->actor.bgCheckFlags & 0x200) && (sShapeYawToTouchedWall < 0x3000)) {
+    if (!(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->actor.bgCheckFlags & 0x200) &&
+        (sShapeYawToTouchedWall < 0x3000)) {
 
         if (((this->linearVelocity > 0.0f) && func_8083EC18(this, play, sTouchedWallFlags)) ||
             Player_TryEnteringCrawlspace(this, play, sTouchedWallFlags)) {
             return 1;
         }
 
-        if (!func_808332B8(this) && ((this->linearVelocity == 0.0f) || !(this->stateFlags2 & PLAYER_STATE2_DO_ACTION_CLIMB)) &&
+        if (!func_808332B8(this) &&
+            ((this->linearVelocity == 0.0f) || !(this->stateFlags2 & PLAYER_STATE2_DO_ACTION_CLIMB)) &&
             (sTouchedWallFlags & 0x40) && (this->actor.bgCheckFlags & 1) && (this->yDistToLedge >= 39.0f)) {
 
             this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB;
@@ -7910,8 +7940,9 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, PlayState* play) {
         }
 
         // #region SOH [Enhancement]
-        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) || !CVarGetInteger(CVAR_SETTING("Controls.InvertZAimingYAxis"), 1)) {
-            
+        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) ||
+            !CVarGetInteger(CVAR_SETTING("Controls.InvertZAimingYAxis"), 1)) {
+
             if (this->focusActor != NULL) {
                 func_8083DB98(this, 1);
             } else {
@@ -7932,11 +7963,13 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, PlayState* play) {
                     relStickY = sControlInput->rel.stick_y;
                 }
 
-                Math_SmoothStepToS(&this->actor.focus.rot.x,
-                                   relStickY * (CVarGetInteger(CVAR_SETTING("Controls.InvertZAimingYAxis"), 1) ? 1 : -1) * 240.0f, 14, 4000, 30);
+                Math_SmoothStepToS(
+                    &this->actor.focus.rot.x,
+                    relStickY * (CVarGetInteger(CVAR_SETTING("Controls.InvertZAimingYAxis"), 1) ? 1 : -1) * 240.0f, 14,
+                    4000, 30);
                 func_80836AB8(this, 1);
             }
-        // #endregion
+            // #endregion
         } else {
             if (this->focusActor != NULL) {
                 func_8083DB98(this, 1);
@@ -8044,7 +8077,8 @@ void func_8084029C(Player* this, f32 arg1) {
     if ((this->currentBoots == PLAYER_BOOTS_HOVER ||
          (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating)) &&
         !(this->actor.bgCheckFlags & 1) &&
-        (this->hoverBootsTimer != 0 || (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating))) {
+        (this->hoverBootsTimer != 0 ||
+         (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating))) {
         func_8002F8F0(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG);
     } else if (func_8084021C(this->unk_868, arg1, 29.0f, 10.0f) || func_8084021C(this->unk_868, arg1, 29.0f, 24.0f)) {
         Player_PlaySteppingSfx(this, this->linearVelocity);
@@ -8093,7 +8127,8 @@ void Player_Action_80840450(Player* this, PlayState* play) {
     Player_DecelerateToZero(this);
 
     if (!Player_TryActionHandlerList(play, this, sActionHandlerList1, true)) {
-        if (!Player_UpdateHostileLockOn(this) && (!Player_FriendlyLockOnOrParallel(this) || (func_80834B5C != this->upperActionFunc))) {
+        if (!Player_UpdateHostileLockOn(this) &&
+            (!Player_FriendlyLockOnOrParallel(this) || (func_80834B5C != this->upperActionFunc))) {
             func_8083CF10(this, play);
             return;
         }
@@ -8458,8 +8493,8 @@ void func_80841138(Player* this, PlayState* play) {
 
         temp1 = R_UPDATE_RATE * 0.5f;
         func_8084029C(this, REG(35) / 1000.0f);
-        LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType),
-                                  this->unk_868);
+        LinkAnimation_LoadToJoint(play, &this->skelAnime,
+                                  GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868);
         this->unk_864 += 1 * temp1;
         if (this->unk_864 >= 1.0f) {
             this->unk_864 = 1.0f;
@@ -8470,8 +8505,8 @@ void func_80841138(Player* this, PlayState* play) {
         if (temp2 < 0.0f) {
             temp1 = 1.0f;
             func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity));
-            LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType),
-                                      this->unk_868);
+            LinkAnimation_LoadToJoint(play, &this->skelAnime,
+                                      GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868);
         } else {
             temp1 = (REG(37) / 1000.0f) * temp2;
             if (temp1 < 1.0f) {
@@ -8480,8 +8515,8 @@ void func_80841138(Player* this, PlayState* play) {
                 temp1 = 1.0f;
                 func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2));
             }
-            LinkAnimation_LoadToMorph(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType),
-                                      this->unk_868);
+            LinkAnimation_LoadToMorph(play, &this->skelAnime,
+                                      GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868);
             LinkAnimation_LoadToJoint(play, &this->skelAnime, &gPlayerAnim_link_normal_back_run,
                                       this->unk_868 * (16.0f / 29.0f));
         }
@@ -8597,8 +8632,10 @@ void Player_Action_808417FC(Player* this, PlayState* play) {
 void func_80841860(PlayState* play, Player* this) {
     f32 frame;
     // fake match? see Player_InitItemActionWithAnim
-    LinkAnimationHeader* sp38 = D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkL * ARRAY_COUNT(D_80853914[0])];
-    LinkAnimationHeader* sp34 = D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkR * ARRAY_COUNT(D_80853914[0])];
+    LinkAnimationHeader* sp38 =
+        D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkL * ARRAY_COUNT(D_80853914[0])];
+    LinkAnimationHeader* sp34 =
+        D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkR * ARRAY_COUNT(D_80853914[0])];
 
     this->skelAnime.animation = sp38;
 
@@ -8729,11 +8766,11 @@ void func_80841CC4(Player* this, s32 arg1, PlayState* play) {
 
     if ((this->modelAnimType == PLAYER_ANIMTYPE_3) || ((this->unk_89C == 0) && (this->unk_6C4 <= 0.0f))) {
         if (arg1 == 0) {
-            LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType),
-                                      this->unk_868);
+            LinkAnimation_LoadToJoint(play, &this->skelAnime,
+                                      GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868);
         } else {
-            LinkAnimation_LoadToMorph(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType),
-                                      this->unk_868);
+            LinkAnimation_LoadToMorph(play, &this->skelAnime,
+                                      GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868);
         }
         return;
     }
@@ -8802,8 +8839,7 @@ void func_80841EE4(Player* this, PlayState* play) {
 
             func_80841CC4(this, 1, play);
 
-            LinkAnimation_LoadToJoint(play, &this->skelAnime, func_80833438(this),
-                                      this->unk_868 * (20.0f / 29.0f));
+            LinkAnimation_LoadToJoint(play, &this->skelAnime, func_80833438(this), this->unk_868 * (20.0f / 29.0f));
         }
     }
 
@@ -8829,10 +8865,11 @@ void Player_Action_80842180(Player* this, PlayState* play) {
 
         if (!func_8083C484(this, &sp2C, &sp2A)) {
 
-            if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && this->currentMask == PLAYER_MASK_BUNNY) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA &&
+                this->currentMask == PLAYER_MASK_BUNNY) {
                 sp2C *= 1.5f;
             }
-            
+
             if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0)) {
                 if (CVarGetInteger(CVAR_SETTING("WalkModifier.SpeedToggle"), 0)) {
                     if (gWalkSpeedToggle1) {
@@ -8875,7 +8912,8 @@ void Player_Action_8084227C(Player* this, PlayState* play) {
         Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, SPEED_MODE_LINEAR, play);
 
         if (!func_8083C484(this, &sp2C, &sp2A)) {
-            if ((Player_FriendlyLockOnOrParallel(this) && (sp2C != 0.0f) && (func_8083FD78(this, &sp2C, &sp2A, play) <= 0)) ||
+            if ((Player_FriendlyLockOnOrParallel(this) && (sp2C != 0.0f) &&
+                 (func_8083FD78(this, &sp2C, &sp2A, play) <= 0)) ||
                 (!Player_FriendlyLockOnOrParallel(this) && (func_8083FC68(this, sp2C, sp2A) <= 0))) {
                 func_80839F90(this, play);
                 return;
@@ -9029,7 +9067,8 @@ s32 func_808428D8(Player* this, PlayState* play) {
 }
 
 s32 func_80842964(Player* this, PlayState* play) {
-    return Player_ActionHandler_13(this, play) || Player_ActionHandler_Talk(this, play) || Player_ActionHandler_2(this, play);
+    return Player_ActionHandler_13(this, play) || Player_ActionHandler_Talk(this, play) ||
+           Player_ActionHandler_2(this, play);
 }
 
 void Player_RequestQuake(PlayState* play, s32 speed, s32 y, s32 countdown) {
@@ -9056,8 +9095,7 @@ s32 func_80842AC4(PlayState* play, Player* this) {
     if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) {
 
         if (GameInteractor_Should(VB_DEKU_STICK_BREAK, AMMO(ITEM_STICK) != 0)) {
-            EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND],
-                                this->actor.shape.rot.y + 0x8000);
+            EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND], this->actor.shape.rot.y + 0x8000);
             this->unk_85C = 0.5f;
             func_80842A88(play, this);
             Player_PlaySfx(this, NA_SE_IT_WOODSTICK_BROKEN);
@@ -9132,10 +9170,12 @@ s32 func_80842DF4(PlayState* play, Player* this) {
 
     if (this->meleeWeaponState > 0) {
         if (this->meleeWeaponAnimation < PLAYER_MWA_SPIN_ATTACK_1H) {
-            if (!(this->meleeWeaponQuads[0].base.atFlags & AT_BOUNCED) && !(this->meleeWeaponQuads[1].base.atFlags & AT_BOUNCED)) {
+            if (!(this->meleeWeaponQuads[0].base.atFlags & AT_BOUNCED) &&
+                !(this->meleeWeaponQuads[1].base.atFlags & AT_BOUNCED)) {
                 if (this->skelAnime.curFrame >= 2.0f) {
 
-                    phi_f2 = Math_Vec3f_DistXYZAndStoreDiff(&this->meleeWeaponInfo[0].tip, &this->meleeWeaponInfo[0].base, &sp50);
+                    phi_f2 = Math_Vec3f_DistXYZAndStoreDiff(&this->meleeWeaponInfo[0].tip,
+                                                            &this->meleeWeaponInfo[0].base, &sp50);
                     if (phi_f2 != 0.0f) {
                         phi_f2 = (phi_f2 + 10.0f) / phi_f2;
                     }
@@ -9238,9 +9278,12 @@ void Player_Action_80843188(Player* this, PlayState* play) {
         s16 sp46;
         f32 sp40;
 
-        sp54 = sControlInput->rel.stick_y * 100 * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 1) ? 1 : -1);
-        sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingXAxis"), 0) ? -1 : 1);
+        sp54 = sControlInput->rel.stick_y * 100 *
+               (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 1) ? 1 : -1);
+        sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) *
+               (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingXAxis"), 0) ? -1 : 1);
         sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
+        GameInteractor_ExecuteOnPlayerShieldControl(&sp50, &sp54);
 
         sp40 = Math_CosS(sp4E);
         sp4C = (Math_SinS(sp4E) * sp50) + (sp54 * sp40);
@@ -9317,7 +9360,8 @@ void Player_Action_808435C4(Player* this, PlayState* play) {
 
     if (this->av1.actionVar1 == 0) {
         sUpperBodyIsBusy = Player_UpdateUpperBody(this, play);
-        if ((func_80834B5C == this->upperActionFunc) || (Player_TryActionInterrupt(play, this, &this->upperSkelAnime, 4.0f) > 0)) {
+        if ((func_80834B5C == this->upperActionFunc) ||
+            (Player_TryActionInterrupt(play, this, &this->upperSkelAnime, 4.0f) > 0)) {
             Player_SetupAction(play, this, Player_Action_80840450, 1);
         }
     } else {
@@ -9382,8 +9426,8 @@ void Player_Action_8084377C(Player* this, PlayState* play) {
             }
 
             Player_AnimPlayOnce(play, this,
-                          (this->yaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_downB
-                                                                        : &gPlayerAnim_link_normal_back_downB);
+                                (this->yaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_downB
+                                                                       : &gPlayerAnim_link_normal_back_downB);
             Player_PlayVoiceSfx(this, NA_SE_VO_LI_FREEZE);
         }
     }
@@ -9408,8 +9452,8 @@ void Player_Action_80843954(Player* this, PlayState* play) {
         }
 
         Player_AnimPlayOnceAdjusted(play, this,
-                      (this->yaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_down_wake
-                                                                    : &gPlayerAnim_link_normal_back_down_wake);
+                                    (this->yaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_down_wake
+                                                                           : &gPlayerAnim_link_normal_back_down_wake);
         this->yaw = this->actor.shape.rot.y;
     }
 }
@@ -9529,6 +9573,10 @@ static FallImpactInfo D_80854600[] = {
 s32 func_80843E64(PlayState* play, Player* this) {
     s32 sp34;
 
+    if (!GameInteractor_Should(VB_RECIEVE_FALL_DAMAGE, true, this)) {
+        return 0;
+    }
+
     if ((sFloorType == 6) || (sFloorType == 9)) {
         sp34 = 0;
     } else {
@@ -9551,14 +9599,15 @@ s32 func_80843E64(PlayState* play, Player* this) {
 
         impactInfo = &D_80854600[impactIndex];
 
-        if (Player_InflictDamageModified(play, impactInfo->damage * (1 << CVarGetInteger(CVAR_ENHANCEMENT("FallDamageMult"), 0)),
-                                         false)) {
+        if (Player_InflictDamageModified(
+                play, impactInfo->damage * (1 << CVarGetInteger(CVAR_ENHANCEMENT("FallDamageMult"), 0)), false)) {
             return -1;
         }
 
         Player_SetIntangibility(this, 40);
         Player_RequestQuake(play, 32967, 2, 30);
-        Player_RequestRumble(this, impactInfo->rumbleStrength, impactInfo->rumbleDuration, impactInfo->rumbleDecreaseRate, 0);
+        Player_RequestRumble(this, impactInfo->rumbleStrength, impactInfo->rumbleDuration,
+                             impactInfo->rumbleDecreaseRate, 0);
         Player_PlaySfx(this, NA_SE_PL_BODY_HIT);
         Player_PlayVoiceSfx(this, impactInfo->sfxId);
 
@@ -9631,7 +9680,8 @@ void Player_Action_8084411C(Player* this, PlayState* play) {
 
         Player_UpdateUpperBody(this, play);
 
-        if (((this->stateFlags2 & PLAYER_STATE2_HOPPING) && (this->av1.actionVar1 == 2)) || !func_8083BBA0(this, play)) {
+        if (((this->stateFlags2 & PLAYER_STATE2_HOPPING) && (this->av1.actionVar1 == 2)) ||
+            !func_8083BBA0(this, play)) {
             if (this->actor.velocity.y < 0.0f) {
                 if (this->av2.actionVar2 >= 0) {
                     if ((this->actor.bgCheckFlags & 8) || (this->av2.actionVar2 == 0) || (this->fallDistance > 0)) {
@@ -9640,8 +9690,8 @@ void Player_Action_8084411C(Player* this, PlayState* play) {
                             this->stateFlags1 &= ~PLAYER_STATE1_HOOKSHOT_FALLING;
                         }
 
-                        LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_normal_landing, 1.0f, 0.0f,
-                                             0.0f, ANIMMODE_ONCE, 8.0f);
+                        LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_normal_landing, 1.0f, 0.0f, 0.0f,
+                                             ANIMMODE_ONCE, 8.0f);
                         this->av2.actionVar2 = -1;
                     }
                 } else {
@@ -9652,8 +9702,10 @@ void Player_Action_8084411C(Player* this, PlayState* play) {
 
                     if (!GameInteractor_GetDisableLedgeGrabsActive() && (this->actor.bgCheckFlags & 0x200) &&
                         !(this->stateFlags2 & PLAYER_STATE2_HOPPING) &&
-                        !(this->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_WATER)) && (this->linearVelocity > 0.0f)) {
-                        if ((this->yDistToLedge >= 150.0f) && (this->controlStickDirections[this->controlStickDataIndex] == 0)) {
+                        !(this->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_WATER)) &&
+                        (this->linearVelocity > 0.0f)) {
+                        if ((this->yDistToLedge >= 150.0f) &&
+                            (this->controlStickDirections[this->controlStickDataIndex] == 0)) {
                             func_8083EC18(this, play, sTouchedWallFlags);
                         } else if ((this->ledgeClimbType >= 2) && (this->yDistToLedge < 150.0f) &&
                                    (((this->actor.world.pos.y - this->actor.floorHeight) + this->yDistToLedge) >
@@ -10184,7 +10236,8 @@ void Player_Action_WaitForPutAway(Player* this, PlayState* play) {
     // The other conditions listed will force the put away delay function to run instantly if carrying an actor.
     // This is necessary because the UpperAction for carrying actors will always return true while holding
     // the actor, so `!Player_UpdateUpperBody` could never pass.
-    if (((this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) && (this->getItemId == GI_NONE)) ||
+    if (((this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) &&
+         (this->getItemId == GI_NONE)) ||
         !Player_UpdateUpperBody(this, play)) {
         this->afterPutAwayFunc(play, this);
     }
@@ -10512,7 +10565,8 @@ void Player_Action_80846578(Player* this, PlayState* play) {
     Player_DecelerateToZero(this);
 
     if (LinkAnimation_Update(play, &this->skelAnime) ||
-        ((this->skelAnime.curFrame >= 8.0f) && Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, SPEED_MODE_CURVED, play))) {
+        ((this->skelAnime.curFrame >= 8.0f) &&
+         Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, SPEED_MODE_CURVED, play))) {
         func_80839F90(this, play);
         return;
     }
@@ -10628,8 +10682,8 @@ void Player_StartMode_TimeTravel(PlayState* play, Player* this) {
     this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
     Math_Vec3f_Copy(&this->actor.world.pos, &D_808546F4);
     this->yaw = this->actor.shape.rot.y = -0x8000;
-    LinkAnimation_Change(play, &this->skelAnime, this->ageProperties->unk_A0, 2.0f / 3.0f, 0.0f, 0.0f,
-                         ANIMMODE_ONCE, 0.0f);
+    LinkAnimation_Change(play, &this->skelAnime, this->ageProperties->unk_A0, 2.0f / 3.0f, 0.0f, 0.0f, ANIMMODE_ONCE,
+                         0.0f);
     Player_StartAnimMovement(play, this, 0x28F);
     if (LINK_IS_ADULT) {
         func_80846720(play, this, 0);
@@ -10692,8 +10746,8 @@ void Player_InitCommon(Player* this, PlayState* play, FlexSkeletonHeader* skelHe
     this->yaw = this->actor.world.rot.y;
     func_80834644(play, this);
 
-    SkelAnime_InitLink(play, &this->skelAnime, skelHeader, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType), 9,
-                       this->jointTable, this->morphTable, PLAYER_LIMB_MAX);
+    SkelAnime_InitLink(play, &this->skelAnime, skelHeader, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType),
+                       9, this->jointTable, this->morphTable, PLAYER_LIMB_MAX);
     this->skelAnime.baseTransl = sSkeletonBaseTransl;
     SkelAnime_InitLink(play, &this->upperSkelAnime, skelHeader, Player_GetIdleAnim(this), 9, this->upperJointTable,
                        this->upperMorphTable, PLAYER_LIMB_MAX);
@@ -10764,7 +10818,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
     Player_UseItem(play, this, ITEM_NONE);
     Player_SetEquipmentData(play, this);
     this->prevBoots = this->currentBoots;
-    //keep masks thru loading zones
+    // keep masks thru loading zones
     if (CVarGetInteger(CVAR_ENHANCEMENT("PersistentMasks"), 0)) {
         if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) {
             gSaveContext.ship.maskMemory = PLAYER_MASK_NONE;
@@ -10810,10 +10864,11 @@ void Player_Init(Actor* thisx, PlayState* play2) {
             if ((gSaveContext.sceneSetupIndex < 4) &&
                 (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field &
                  ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG) &&
-                ((play->sceneNum != SCENE_DODONGOS_CAVERN) || (Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN))) &&
-                ((play->sceneNum != SCENE_BOMBCHU_SHOP) || (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)))) {
-                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144,
-                                        24, 20);
+                ((play->sceneNum != SCENE_DODONGOS_CAVERN) ||
+                 (Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN))) &&
+                ((play->sceneNum != SCENE_BOMBCHU_SHOP) ||
+                 (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)))) {
+                TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, 24, 20);
             }
         }
         gSaveContext.showTitleCard = true;
@@ -10965,7 +11020,8 @@ void Player_UpdateInterface(PlayState* play, Player* this) {
                 } else if ((this->stateFlags2 & PLAYER_STATE2_DO_ACTION_CLIMB) ||
                            (!(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->rideActor != NULL))) {
                     doAction = DO_ACTION_CLIMB;
-                } else if ((this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) &&
+                } else if ((this->stateFlags1 & PLAYER_STATE1_ON_HORSE) &&
+                           !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) &&
                            (Player_Action_8084D3E4 != this->actionFunc)) {
                     if ((this->stateFlags2 & PLAYER_STATE2_CAN_ACCEPT_TALK_OFFER) && (this->talkActor != NULL)) {
                         if (this->talkActor->category == ACTORCAT_NPC) {
@@ -10983,7 +11039,8 @@ void Player_UpdateInterface(PlayState* play, Player* this) {
                         doAction = DO_ACTION_CHECK;
                     }
                 } else if ((this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) ||
-                           ((this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->stateFlags2 & PLAYER_STATE2_DO_ACTION_DOWN))) {
+                           ((this->stateFlags1 & PLAYER_STATE1_ON_HORSE) &&
+                            (this->stateFlags2 & PLAYER_STATE2_DO_ACTION_DOWN))) {
                     doAction = DO_ACTION_DOWN;
                 } else if (this->stateFlags2 & PLAYER_STATE2_DO_ACTION_ENTER) {
                     doAction = DO_ACTION_ENTER;
@@ -11080,7 +11137,8 @@ s32 Player_UpdateHoverBoots(Player* this) {
     }
 
     canHoverOnGround =
-        (this->currentBoots == PLAYER_BOOTS_HOVER || (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating)) &&
+        (this->currentBoots == PLAYER_BOOTS_HOVER ||
+         (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating)) &&
         ((this->actor.yDistToWater >= 0.0f) || (func_80838144(sFloorType) >= 0) || func_8083816C(sFloorType));
 
     if (canHoverOnGround && (this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) {
@@ -11143,7 +11201,8 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
         if (this->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED) {
             this->actor.bgCheckFlags &= ~1;
             flags = 0x38;
-        } else if ((this->stateFlags1 & PLAYER_STATE1_LOADING) && ((this->unk_A84 - (s32)this->actor.world.pos.y) >= 100)) {
+        } else if ((this->stateFlags1 & PLAYER_STATE1_LOADING) &&
+                   ((this->unk_A84 - (s32)this->actor.world.pos.y) >= 100)) {
             flags = 0x39;
         } else if (!(this->stateFlags1 & PLAYER_STATE1_LOADING) &&
                    ((Player_Action_80845EF8 == this->actionFunc) || (Player_Action_80845CA4 == this->actionFunc))) {
@@ -11197,8 +11256,7 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
             Audio_SetCodeReverb(SurfaceType_GetEcho(&play->colCtx, floorPoly, this->actor.floorBgId));
 
             if (this->actor.floorBgId == BGCHECK_SCENE) {
-                func_80074CE8(play,
-                              SurfaceType_GetLightSettingIndex(&play->colCtx, floorPoly, this->actor.floorBgId));
+                func_80074CE8(play, SurfaceType_GetLightSettingIndex(&play->colCtx, floorPoly, this->actor.floorBgId));
             } else {
                 DynaPoly_SetPlayerAbove(&play->colCtx, this->actor.floorBgId);
             }
@@ -11231,7 +11289,8 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
         sInteractWallCheckOffset.z = this->ageProperties->wallCheckRadius + 10.0f;
 
         if (!(this->stateFlags2 & PLAYER_STATE2_CRAWLING) &&
-            Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &wallPoly, &wallBgId, &sInteractWallCheckResult)) {
+            Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &wallPoly, &wallBgId,
+                                     &sInteractWallCheckResult)) {
             this->actor.bgCheckFlags |= 0x200;
             if (this->actor.wallPoly != wallPoly) {
                 this->actor.wallPoly = wallPoly;
@@ -11244,14 +11303,15 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
 
         sTouchedWallFlags = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId);
 
-        // conflicts arise from these two being enabled at once, and with ClimbEverything on, FixVineFall is redundant anyway
+        // conflicts arise from these two being enabled at once, and with ClimbEverything on, FixVineFall is redundant
+        // anyway
         if (CVarGetInteger(CVAR_ENHANCEMENT("FixVineFall"), 0) && !CVarGetInteger(CVAR_CHEAT("ClimbEverything"), 0)) {
             /* This fixes the "started climbing a wall and then immediately fell off" bug.
-            * The main idea is if a climbing wall is detected, double-check that it will
-            * still be valid once climbing begins by doing a second raycast with a small
-            * margin to make sure it still hits a climbable poly. Then update the flags
-            * in sTouchedWallFlags again and proceed as normal.
-            */
+             * The main idea is if a climbing wall is detected, double-check that it will
+             * still be valid once climbing begins by doing a second raycast with a small
+             * margin to make sure it still hits a climbable poly. Then update the flags
+             * in sTouchedWallFlags again and proceed as normal.
+             */
             if (sTouchedWallFlags & 8) {
                 Vec3f checkPosA;
                 Vec3f checkPosB;
@@ -11260,18 +11320,18 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
                 s32 hitWall;
 
                 /* Angle the raycast slightly out towards the side based on the angle of
-                * attack the player takes coming at the climb wall. This is necessary because
-                * the player's XZ position actually wobbles very slightly while climbing
-                * due to small rounding errors in the sin/cos lookup tables. This wobble
-                * can cause wall checks while climbing to be slightly left or right of
-                * the wall check to start the climb. By adding this buffer it accounts for
-                * any possible wobble. The end result is the player has to be further than
-                * some epsilon distance from the edge of the climbing poly to actually
-                * start the climb. I divide it by 2 to make that epsilon slightly smaller,
-                * mainly for visuals. Using the full yawDiff leaves a noticeable gap on
-                * the edges that can't be climbed. But with the half distance it looks like
-                * the player is climbing right on the edge, and still works.
-                */
+                 * attack the player takes coming at the climb wall. This is necessary because
+                 * the player's XZ position actually wobbles very slightly while climbing
+                 * due to small rounding errors in the sin/cos lookup tables. This wobble
+                 * can cause wall checks while climbing to be slightly left or right of
+                 * the wall check to start the climb. By adding this buffer it accounts for
+                 * any possible wobble. The end result is the player has to be further than
+                 * some epsilon distance from the edge of the climbing poly to actually
+                 * start the climb. I divide it by 2 to make that epsilon slightly smaller,
+                 * mainly for visuals. Using the full yawDiff leaves a noticeable gap on
+                 * the edges that can't be climbed. But with the half distance it looks like
+                 * the player is climbing right on the edge, and still works.
+                 */
                 yawCos = Math_CosS(this->actor.wallYaw - (yawDiff / 2) + 0x8000);
                 yawSin = Math_SinS(this->actor.wallYaw - (yawDiff / 2) + 0x8000);
                 checkPosA.x = this->actor.world.pos.x + (-20.0f * yawSin);
@@ -11280,8 +11340,8 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
                 checkPosB.z = this->actor.world.pos.z + (50.0f * yawCos);
                 checkPosB.y = checkPosA.y = this->actor.world.pos.y + 26.0f;
 
-                hitWall = BgCheck_EntityLineTest1(&play->colCtx, &checkPosA, &checkPosB,
-                    &sInteractWallCheckResult, &wallPoly, true, false, false, true, &wallBgId);
+                hitWall = BgCheck_EntityLineTest1(&play->colCtx, &checkPosA, &checkPosB, &sInteractWallCheckResult,
+                                                  &wallPoly, true, false, false, true, &wallBgId);
 
                 if (hitWall) {
                     this->actor.wallPoly = wallPoly;
@@ -11331,7 +11391,8 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
                 f32 ceillingPosY;
                 s32 wallYawDiff;
 
-                this->distToInteractWall = Math3D_UDistPlaneToPos(wallPolyNormalX, wallPolyNormalY, wallPolyNormalZ, wallPoly->dist, &this->actor.world.pos);
+                this->distToInteractWall = Math3D_UDistPlaneToPos(wallPolyNormalX, wallPolyNormalY, wallPolyNormalZ,
+                                                                  wallPoly->dist, &this->actor.world.pos);
 
 #define vLedgeCheckOffsetXZ float0
 
@@ -11346,12 +11407,14 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
 
                 if ((this->yDistToLedge < 18.0f) ||
                     BgCheck_EntityCheckCeiling(&play->colCtx, &ceillingPosY, &this->actor.world.pos,
-                                               (ledgePosY - this->actor.world.pos.y) + 20.0f, &poly, &bgId, &this->actor)) {
+                                               (ledgePosY - this->actor.world.pos.y) + 20.0f, &poly, &bgId,
+                                               &this->actor)) {
                     this->yDistToLedge = 399.96002f;
                 } else {
                     sInteractWallCheckOffset.y = (ledgePosY + 5.0f) - this->actor.world.pos.y;
 
-                    if (Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &poly, &bgId, &sInteractWallCheckResult) &&
+                    if (Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &poly, &bgId,
+                                                 &sInteractWallCheckResult) &&
                         (wallYawDiff = this->actor.wallYaw - Math_Atan2S(poly->normal.z, poly->normal.x),
                          ABS(wallYawDiff) < 0x4000) &&
                         !func_80041E18(&play->colCtx, poly, bgId)) {
@@ -11420,7 +11483,8 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
             sin = Math_SinS(this->actor.shape.rot.y);
             cos = Math_CosS(this->actor.shape.rot.y);
 
-            sFloorShapePitch = Math_Atan2S(1.0f, (-(floorPolyNormalX * sin) - (floorPolyNormalZ * cos)) * invFloorPolyNormalY);
+            sFloorShapePitch =
+                Math_Atan2S(1.0f, (-(floorPolyNormalX * sin) - (floorPolyNormalZ * cos)) * invFloorPolyNormalY);
 
             Player_HandleSlopes(play, this, floorPoly);
         }
@@ -11480,7 +11544,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
                     } else {
                         camMode = CAM_MODE_FOLLOWBOOMERANG;
                     }
-                // #endregion
+                    // #endregion
                 } else {
                     camMode = CAM_MODE_FOLLOWBOOMERANG;
                 }
@@ -11500,7 +11564,8 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
                     camMode = CAM_MODE_TARGET;
                 }
             } else if (this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_CLIMBING_LADDER)) {
-                if ((Player_Action_80845668 == this->actionFunc) || (this->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER)) {
+                if ((Player_Action_80845668 == this->actionFunc) ||
+                    (this->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER)) {
                     camMode = CAM_MODE_CLIMB;
                 } else {
                     camMode = CAM_MODE_JUMP;
@@ -11698,19 +11763,21 @@ void Player_DetectRumbleSecrets(Player* this) {
             s16 PosY_VSOA;
             if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) != 0) {
                 PosY_VSOA = CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosY"), 0) + Y_Margins_VSOA;
-                if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_LEFT) { 
+                if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_LEFT) {
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.UseMargins"), 0) != 0) {
                         X_Margins_VSOA = Left_Margins;
                     };
-                    PosX_VSOA = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosX"), 0) + X_Margins_VSOA);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_RIGHT) { 
+                    PosX_VSOA = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosX"), 0) +
+                                                            X_Margins_VSOA);
+                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_RIGHT) {
                     if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.UseMargins"), 0) != 0) {
                         X_Margins_VSOA = Right_Margins;
                     };
-                    PosX_VSOA = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosX"), 0) + X_Margins_VSOA);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_NONE) { 
+                    PosX_VSOA = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosX"), 0) +
+                                                             X_Margins_VSOA);
+                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == ANCHOR_NONE) {
                     PosX_VSOA = CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosX"), 0);
-                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == HIDDEN) { 
+                } else if (CVarGetInteger(CVAR_COSMETIC("HUD.VisualSoA.PosType"), 0) == HIDDEN) {
                     PosX_VSOA = -9999;
                 }
             } else {
@@ -11727,20 +11794,24 @@ void Player_DetectRumbleSecrets(Player* this) {
             OPEN_DISPS(gPlayState->state.gfxCtx);
             gDPPipeSync(OVERLAY_DISP++);
 
-            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b, DefaultIconA);
+            gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b,
+                            DefaultIconA);
 
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
             if (this->unk_6A0 > 4000000.0f) {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b, 255);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b,
+                                255);
             } else {
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b, DefaultIconA);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b,
+                                DefaultIconA);
             }
             if (temp == 0 || temp <= 0.1f) {
                 /*Fail check, it is used to draw off the icon when
                 link is standing out range but do not refresh unk_6A0.
                 Also used to make a default value in my case.*/
-                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b, DefaultIconA);
+                gDPSetPrimColor(OVERLAY_DISP++, 0, 0, stoneOfAgonyColor.r, stoneOfAgonyColor.g, stoneOfAgonyColor.b,
+                                DefaultIconA);
             }
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255);
             gDPSetOtherMode(OVERLAY_DISP++,
@@ -11761,9 +11832,11 @@ void Player_DetectRumbleSecrets(Player* this) {
 
         if (this->unk_6A0 > 4000000.0f) {
             this->unk_6A0 = 0.0f;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("VisualAgony"), 0) && !this->stateFlags1 && !GameInteractor_NoUIActive()) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("VisualAgony"), 0) && !this->stateFlags1 &&
+                !GameInteractor_NoUIActive()) {
                 // This audio is placed here and not in previous CVar check to prevent ears ra.. :)
-                Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale);
+                Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale);
             }
             Player_RequestRumble(this, 120, 20, 10, 0);
         }
@@ -11911,7 +11984,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
         Player_UpdateBodyBurn(play, this);
     }
 
-    if ((this->stateFlags3 & PLAYER_STATE3_RESTORE_NAYRUS_LOVE) && (gSaveContext.nayrusLoveTimer != 0) && (gSaveContext.magicState == MAGIC_STATE_IDLE)) {
+    if ((this->stateFlags3 & PLAYER_STATE3_RESTORE_NAYRUS_LOVE) && (gSaveContext.nayrusLoveTimer != 0) &&
+        (gSaveContext.magicState == MAGIC_STATE_IDLE)) {
         gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
         Player_SpawnMagicSpell(play, this, 1);
         this->stateFlags3 &= ~PLAYER_STATE3_RESTORE_NAYRUS_LOVE;
@@ -11978,7 +12052,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
             func_8084FF7C(this);
         }
 
-        if (!(this->skelAnime.moveFlags & 0x80)) {
+        if (!(this->skelAnime.movementFlags & 0x80)) {
             if (((this->actor.bgCheckFlags & 1) && (sFloorType == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) ||
                 ((this->currentBoots == PLAYER_BOOTS_HOVER || GameInteractor_GetSlipperyFloorActive()) &&
                  !(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)))) {
@@ -12016,7 +12090,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
             Actor_UpdateVelocityXZGravity(&this->actor);
 
             if ((this->pushedSpeed != 0.0f) && !Player_InCsMode(play) &&
-                !(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) &&
+                !(this->stateFlags1 &
+                  (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) &&
                 (Player_Action_80845668 != this->actionFunc) && (Player_Action_808507F4 != this->actionFunc)) {
                 this->actor.velocity.x += this->pushedSpeed * Math_SinS(this->pushedYaw);
                 this->actor.velocity.z += this->pushedSpeed * Math_CosS(this->pushedYaw);
@@ -12081,18 +12156,19 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
             func_8083D53C(play, this);
 
             if ((this->actor.category == ACTORCAT_PLAYER) && (gSaveContext.health == 0)) {
-                if (this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) {
+                if (this->stateFlags1 &
+                    (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) {
                     func_80832440(play, this);
                     func_80837B9C(this, play);
                 } else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
                     func_80836448(play, this,
-                                  func_808332B8(this)       ? &gPlayerAnim_link_swimer_swim_down
+                                  func_808332B8(this)           ? &gPlayerAnim_link_swimer_swim_down
                                   : (this->bodyShockTimer != 0) ? &gPlayerAnim_link_normal_electric_shock_end
-                                                            : &gPlayerAnim_link_derth_rebirth);
+                                                                : &gPlayerAnim_link_derth_rebirth);
                 }
             } else {
-                if ((this->actor.parent == NULL) &&
-                    ((play->transitionTrigger == TRANS_TRIGGER_START) || (this->unk_A87 != 0) || !func_808382DC(this, play))) {
+                if ((this->actor.parent == NULL) && ((play->transitionTrigger == TRANS_TRIGGER_START) ||
+                                                     (this->unk_A87 != 0) || !func_808382DC(this, play))) {
                     func_8083AA10(this, play);
                 } else {
                     this->fallStartHeight = this->actor.world.pos.y;
@@ -12118,7 +12194,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
 
         if (this->csAction != 0) {
             if ((this->csAction != 7) ||
-                !(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_DAMAGED))) {
+                !(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
+                                       PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_DAMAGED))) {
                 this->unk_6AD = 3;
             } else if (Player_Action_CsAction != this->actionFunc) {
                 func_80852944(play, this, NULL);
@@ -12133,10 +12210,13 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
             this->stateFlags2 &= ~(PLAYER_STATE2_CAN_ACCEPT_TALK_OFFER | PLAYER_STATE2_NAVI_ALERT);
         }
 
-        this->stateFlags1 &= ~(PLAYER_STATE1_SWINGING_BOTTLE | PLAYER_STATE1_READY_TO_FIRE | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_SHIELDING);
-        this->stateFlags2 &= ~(PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DO_ACTION_CLIMB | PLAYER_STATE2_FOOTSTEP | PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS |
-                               PLAYER_STATE2_GRABBING_DYNAPOLY | PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND | PLAYER_STATE2_STATIONARY_LADDER | PLAYER_STATE2_FROZEN |
-                               PLAYER_STATE2_DO_ACTION_ENTER | PLAYER_STATE2_DO_ACTION_DOWN | PLAYER_STATE2_REFLECTION);
+        this->stateFlags1 &= ~(PLAYER_STATE1_SWINGING_BOTTLE | PLAYER_STATE1_READY_TO_FIRE |
+                               PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_SHIELDING);
+        this->stateFlags2 &= ~(PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DO_ACTION_CLIMB | PLAYER_STATE2_FOOTSTEP |
+                               PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS |
+                               PLAYER_STATE2_GRABBING_DYNAPOLY | PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND |
+                               PLAYER_STATE2_STATIONARY_LADDER | PLAYER_STATE2_FROZEN | PLAYER_STATE2_DO_ACTION_ENTER |
+                               PLAYER_STATE2_DO_ACTION_DOWN | PLAYER_STATE2_REFLECTION);
         this->stateFlags3 &= ~PLAYER_STATE3_CHECK_FLOOR_WATER_COLLISION;
 
         func_80847298(this);
@@ -12152,15 +12232,16 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
         sUseHeldItem = sHeldItemButtonIsHeldDown = 0;
         sSavedCurrentMask = this->currentMask;
 
-        if (GameInteractor_Should(VB_EXECUTE_PLAYER_ACTION_FUNC, !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC), this, input)) {
+        if (GameInteractor_Should(VB_EXECUTE_PLAYER_ACTION_FUNC, !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC),
+                                  this, input)) {
             this->actionFunc(this, play);
         }
 
         Player_UpdateCamAndSeqModes(play, this);
 
-        if (this->skelAnime.moveFlags & 8) {
+        if (this->skelAnime.movementFlags & 8) {
             AnimationContext_SetMoveActor(play, &this->actor, &this->skelAnime,
-                                          (this->skelAnime.moveFlags & 4) ? 1.0f : this->ageProperties->unk_08);
+                                          (this->skelAnime.movementFlags & 4) ? 1.0f : this->ageProperties->unk_08);
         }
 
         Player_UpdateShapeYaw(this, play);
@@ -12218,11 +12299,13 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
         Collider_UpdateCylinder(&this->actor, &this->cylinder);
 
         if (!(this->stateFlags2 & PLAYER_STATE2_FROZEN)) {
-            if (!(this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_ON_HORSE))) {
+            if (!(this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_HANGING_OFF_LEDGE |
+                                       PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_ON_HORSE))) {
                 CollisionCheck_SetOC(play, &play->colChkCtx, &this->cylinder.base);
             }
 
-            if (!(this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_DAMAGED)) && (this->invincibilityTimer <= 0)) {
+            if (!(this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_DAMAGED)) &&
+                (this->invincibilityTimer <= 0)) {
                 CollisionCheck_SetAC(play, &play->colChkCtx, &this->cylinder.base);
 
                 if (this->invincibilityTimer < 0) {
@@ -12269,15 +12352,16 @@ void Player_Update(Actor* thisx, PlayState* play) {
     if (Player_UpdateNoclip(this, play)) {
         if (gSaveContext.dogParams < 0) {
             // Disable object dependency to prevent losing dog in scenes other than market
-            if (Object_GetIndex(&play->objectCtx, OBJECT_DOG) < 0 && !CVarGetInteger(CVAR_ENHANCEMENT("DogFollowsEverywhere"), 0)) {
+            if (Object_GetIndex(&play->objectCtx, OBJECT_DOG) < 0 &&
+                !CVarGetInteger(CVAR_ENHANCEMENT("DogFollowsEverywhere"), 0)) {
                 gSaveContext.dogParams = 0;
             } else {
                 gSaveContext.dogParams &= 0x7FFF;
                 Player_GetRelativePosition(this, &this->actor.world.pos, &D_80854838, &sDogSpawnPos);
                 dogParams = gSaveContext.dogParams;
 
-                dog = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_DOG, sDogSpawnPos.x, sDogSpawnPos.y,
-                                  sDogSpawnPos.z, 0, this->actor.shape.rot.y, 0, dogParams | 0x8000, true);
+                dog = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_DOG, sDogSpawnPos.x, sDogSpawnPos.y, sDogSpawnPos.z,
+                                  0, this->actor.shape.rot.y, 0, dogParams | 0x8000, true);
                 if (dog != NULL) {
                     // Room -1 allows actor to cross between rooms, similar to Navi
                     dog->room = CVarGetInteger(CVAR_ENHANCEMENT("DogFollowsEverywhere"), 0) ? -1 : 0;
@@ -12303,7 +12387,8 @@ void Player_Update(Actor* thisx, PlayState* play) {
             }
         }
 
-        if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0) && CVarGetInteger(CVAR_SETTING("WalkModifier.SpeedToggle"), 0)) {
+        if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0) &&
+            CVarGetInteger(CVAR_SETTING("WalkModifier.SpeedToggle"), 0)) {
             if (CHECK_BTN_ALL(sControlInput->press.button, BTN_CUSTOM_MODIFIER1)) {
                 gWalkSpeedToggle1 = !gWalkSpeedToggle1;
             }
@@ -12380,9 +12465,9 @@ void Player_Update(Actor* thisx, PlayState* play) {
         Player* player = GET_PLAYER(play);
         player->pushedSpeed = 3.0f;
         // Play fan sound (too annoying)
-        //func_8002F974(&player->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG);
+        // func_8002F974(&player->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG);
     }
-    
+
     GameInteractor_ExecuteOnPlayerUpdate();
 }
 
@@ -12409,12 +12494,13 @@ void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList,
     gSPSegment(POLY_XLU_DISP++, 0x0C, cullDList);
 
     Player_DrawImpl(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, lod,
-                  this->currentTunic, this->currentBoots, this->actor.shape.face, overrideLimbDraw, Player_PostLimbDrawGameplay,
-                  this);
+                    this->currentTunic, this->currentBoots, this->actor.shape.face, overrideLimbDraw,
+                    Player_PostLimbDrawGameplay, this);
 
     if ((overrideLimbDraw == Player_OverrideLimbDrawGameplayDefault) && (this->currentMask != PLAYER_MASK_NONE)) {
         // Fixes a bug in vanilla where ice traps are rendered extremely large while wearing a bunny hood
-        if (CVarGetInteger(CVAR_GENERAL("FixIceTrapWithBunnyHood"), 1)) Matrix_Push();
+        if (CVarGetInteger(CVAR_GENERAL("FixIceTrapWithBunnyHood"), 1))
+            Matrix_Push();
         Mtx* bunnyEarMtx = Graph_Alloc(play->state.gfxCtx, 2 * sizeof(Mtx));
 
         if (this->currentMask == PLAYER_MASK_BUNNY) {
@@ -12427,29 +12513,31 @@ void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList,
             earRot.x = sBunnyEarKinematics.rot.y + 0x3E2;
             earRot.y = sBunnyEarKinematics.rot.z + 0xDBE;
             earRot.z = sBunnyEarKinematics.rot.x - 0x348A;
-            Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarLength"), 0.0f), -240.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarSpread"), 0.0f), &earRot);
+            Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarLength"), 0.0f),
+                                         -240.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarSpread"), 0.0f), &earRot);
             MATRIX_TOMTX(bunnyEarMtx++);
 
             // Left ear
             earRot.x = sBunnyEarKinematics.rot.y - 0x3E2;
             earRot.y = -0xDBE - sBunnyEarKinematics.rot.z;
             earRot.z = sBunnyEarKinematics.rot.x - 0x348A;
-            Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarLength"), 0.0f), 240.0f + CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarSpread"), 0.0f), &earRot);
+            Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarLength"), 0.0f),
+                                         240.0f + CVarGetFloat(CVAR_COSMETIC("BunnyHood.EarSpread"), 0.0f), &earRot);
             MATRIX_TOMTX(bunnyEarMtx);
         }
 
-       
         if (this->currentMask != PLAYER_MASK_BUNNY || !CVarGetInteger(CVAR_ENHANCEMENT("HideBunnyHood"), 0)) {
             gSPDisplayList(POLY_OPA_DISP++, sMaskDlists[this->currentMask - 1]);
         }
 
-        if (CVarGetInteger(CVAR_GENERAL("FixIceTrapWithBunnyHood"), 1)) Matrix_Pop();
+        if (CVarGetInteger(CVAR_GENERAL("FixIceTrapWithBunnyHood"), 1))
+            Matrix_Pop();
     }
 
     if ((this->currentBoots == PLAYER_BOOTS_HOVER ||
          (CVarGetInteger(CVAR_ENHANCEMENT("IvanCoopModeEnabled"), 0) && this->ivanFloating)) &&
-        !(this->actor.bgCheckFlags & 1) &&
-        !(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->hoverBootsTimer != 0)) {
+        !(this->actor.bgCheckFlags & 1) && !(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) &&
+        (this->hoverBootsTimer != 0)) {
         s32 sp5C;
         s32 hoverBootsTimer = this->hoverBootsTimer;
 
@@ -12474,11 +12562,10 @@ void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList,
                                          this->actor.world.pos.z, &D_80854864);
             Matrix_Scale(4.0f, 4.0f, 4.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0,
-                                        (play->gameplayFrames * -15) % 128, 16, 32));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0, (play->gameplayFrames * -15) % 128,
+                                        16, 32));
             gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, D_8085486C);
             gDPSetEnvColor(POLY_XLU_DISP++, 120, 90, 30, 128);
             gSPDisplayList(POLY_XLU_DISP++, gHoverBootsCircleDL);
@@ -12538,8 +12625,8 @@ void Player_Draw(Actor* thisx, PlayState* play2) {
 
         if (this->invincibilityTimer > 0) {
             this->damageFlickerAnimCounter += CLAMP(50 - this->invincibilityTimer, 8, 40);
-            POLY_OPA_DISP =
-                Gfx_SetFog2(POLY_OPA_DISP, 255, 0, 0, 0, 0, 4000 - (s32)(Math_CosS(this->damageFlickerAnimCounter * 256) * 2000.0f));
+            POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP, 255, 0, 0, 0, 0,
+                                        4000 - (s32)(Math_CosS(this->damageFlickerAnimCounter * 256) * 2000.0f));
         }
 
         func_8002EBCC(&this->actor, play, 0);
@@ -12593,12 +12680,11 @@ void Player_Draw(Actor* thisx, PlayState* play2) {
             f32 scale = (this->av1.actionVar1 >> 1) * 22.0f;
 
             gSPSegment(POLY_XLU_DISP++, 0x08,
-                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (0 - play->gameplayFrames) % 128, 32, 32, 1,
-                                        0, (play->gameplayFrames * -2) % 128, 32, 32));
+                       Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, (0 - play->gameplayFrames) % 128, 32, 32, 1, 0,
+                                        (play->gameplayFrames * -2) % 128, 32, 32));
 
             Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, 255);
             gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL);
         }
@@ -12629,23 +12715,30 @@ void Player_Destroy(Actor* thisx, PlayState* play) {
     ResourceMgr_UnregisterSkeleton(&this->upperSkelAnime);
 }
 
-//first person manipulate player actor
+// first person manipulate player actor
 s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
     s32 temp1 = 0;
     s16 temp2 = 0;
     s16 temp3 = 0;
-    s8 invertXAxisMulti = ((CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) && !CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) || (!CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0))) ? -1 : 1;
+    s8 invertXAxisMulti = ((CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) &&
+                            !CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) ||
+                           (!CVarGetInteger(CVAR_SETTING("Controls.InvertAimingXAxis"), 0) &&
+                            CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)))
+                              ? -1
+                              : 1;
     s8 invertYAxisMulti = CVarGetInteger(CVAR_SETTING("Controls.InvertAimingYAxis"), 1) ? 1 : -1;
     f32 xAxisMulti = CVarGetFloat(CVAR_SETTING("FirstPersonCameraSensitivity.X"), 1.0f);
     f32 yAxisMulti = CVarGetFloat(CVAR_SETTING("FirstPersonCameraSensitivity.Y"), 1.0f);
 
+    GameInteractor_ExecuteOnPlayerFirstPersonControl(this);
+
     if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { // First person without weapon
         // Y Axis
         if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
             temp2 += sControlInput->rel.stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
         }
-        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && fabsf(sControlInput->cur.right_stick_y) > 15.0f) {
-            temp2 += sControlInput->cur.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
+        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
+            temp2 += sControlInput->rel.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
         }
         if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
             temp2 += (-sControlInput->cur.gyro_x) * 750.0f;
@@ -12662,8 +12755,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
         if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
             temp2 += sControlInput->rel.stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
         }
-        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && fabsf(sControlInput->cur.right_stick_x) > 15.0f) {
-            temp2 += sControlInput->cur.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
+        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
+            temp2 += sControlInput->rel.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
         }
         if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {
             temp2 += (sControlInput->cur.gyro_y) * 750.0f * invertXAxisMulti;
@@ -12673,14 +12766,16 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
     } else { // First person with weapon
         // Y Axis
         temp1 = (this->stateFlags1 & PLAYER_STATE1_ON_HORSE) ? 3500 : 14000;
-        
+
         if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
             temp3 += ((sControlInput->rel.stick_y >= 0) ? 1 : -1) *
-                    (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f) * invertYAxisMulti * yAxisMulti;
+                     (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f) * invertYAxisMulti *
+                     yAxisMulti;
         }
-        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && fabsf(sControlInput->cur.right_stick_y) > 15.0f) {
-            temp3 += ((sControlInput->cur.right_stick_y >= 0) ? 1 : -1) *
-                    (s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti * yAxisMulti;
+        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
+            temp3 += ((sControlInput->rel.right_stick_y >= 0) ? 1 : -1) *
+                     (s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti *
+                     yAxisMulti;
         }
         if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
             temp3 += (-sControlInput->cur.gyro_x) * 750.0f;
@@ -12694,11 +12789,13 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
         temp3 = 0;
         if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
             temp3 = ((sControlInput->rel.stick_x >= 0) ? 1 : -1) *
-                    (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f) * invertXAxisMulti * xAxisMulti;
+                    (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f) * invertXAxisMulti *
+                    xAxisMulti;
         }
-        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && fabsf(sControlInput->cur.right_stick_x) > 15.0f) {
-            temp3 += ((sControlInput->cur.right_stick_x >= 0) ? 1 : -1) *
-                    (s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti * xAxisMulti;
+        if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
+            temp3 += ((sControlInput->rel.right_stick_x >= 0) ? 1 : -1) *
+                     (s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti *
+                     xAxisMulti;
         }
         if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {
             temp3 += (sControlInput->cur.gyro_y) * 750.0f * invertXAxisMulti;
@@ -12709,7 +12806,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
 
     if (CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
         f32 movementSpeed = LINK_IS_ADULT ? 9.0f : 8.25f;
-        if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && this->currentMask == PLAYER_MASK_BUNNY) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("MMBunnyHood"), BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA &&
+            this->currentMask == PLAYER_MASK_BUNNY) {
             movementSpeed *= 1.5f;
         }
 
@@ -12742,7 +12840,7 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
 void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) {
     f32 temp1;
     f32 temp2;
-    
+
     // #region SOH [Enhancement]
     f32 swimMod = 1.0f;
 
@@ -12753,7 +12851,8 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) {
             } else if (gWalkSpeedToggle2) {
                 swimMod *= CVarGetFloat(CVAR_SETTING("WalkModifier.SwimMapping2"), 1.0f);
             }
-        // sControlInput is NULL to prevent inputs while surfacing after obtaining an underwater item so we want to ignore it for that case
+            // sControlInput is NULL to prevent inputs while surfacing after obtaining an underwater item so we want to
+            // ignore it for that case
         } else if (sControlInput != NULL) {
             if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_CUSTOM_MODIFIER1)) {
                 swimMod *= CVarGetFloat(CVAR_SETTING("WalkModifier.SwimMapping1"), 1.0f);
@@ -12767,7 +12866,7 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) {
         if (*arg1 > temp2) {
             *arg1 = temp2;
         }
-    
+
         if ((0.0f < temp1) && (temp1 < 10.0f)) {
             temp1 *= 6.0f;
         } else {
@@ -12777,7 +12876,7 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) {
 
         Math_AsymStepToF(arg1, arg2 * 0.8f * swimMod, temp1, (fabsf(*arg1) * 0.02f) + 0.05f);
         Math_ScaledStepToS(&this->yaw, arg3, 1600);
-    // #endregion
+        // #endregion
     } else {
 
         temp1 = this->skelAnime.curFrame - 10.0f;
@@ -12800,8 +12899,8 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) {
 }
 
 // #region SOH [Enhancement]
-//Diving uses function func_8084AEEC to calculate changes both xz and y velocity (via func_8084DBC4)
-//Provide original calculation for y velocity when swim speed mod is active
+// Diving uses function func_8084AEEC to calculate changes both xz and y velocity (via func_8084DBC4)
+// Provide original calculation for y velocity when swim speed mod is active
 void SurfaceWithoutSwimMod(Player* this, f32* arg1, f32 arg2, s16 arg3) {
     f32 temp1;
     f32 temp2;
@@ -12911,8 +13010,9 @@ void Player_Action_8084B1D8(Player* this, PlayState* play) {
     }
     if ((this->csAction != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || Player_UpdateHostileLockOn(this) ||
         (this->focusActor != NULL) || !func_8083AD4C(play, this) ||
-        (((this->unk_6AD == 2) && (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) ||
-                                   Player_FriendlyLockOnOrParallel(this) || (!func_8002DD78(this) && !func_808334B4(this)))) ||
+        (((this->unk_6AD == 2) &&
+          (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) || Player_FriendlyLockOnOrParallel(this) ||
+           (!func_8002DD78(this) && !func_808334B4(this)))) ||
          ((this->unk_6AD == 1) && CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)))) {
         func_8083C148(this, play);
         Sfx_PlaySfxCentered(NA_SE_SY_CAMERA_ZOOM_UP);
@@ -12934,7 +13034,8 @@ s32 func_8084B3CC(PlayState* play, Player* this) {
 
         if (!func_8002DD6C(this) || Player_HoldsHookshot(this)) {
             s32 projectileItemToUse = ITEM_BOW;
-            if(CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) || CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("BowSlingshotAmmoFix"), 0) ||
+                CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0)) {
                 projectileItemToUse = LINK_IS_ADULT ? ITEM_BOW : ITEM_SLINGSHOT;
             }
 
@@ -13005,7 +13106,7 @@ void Player_Action_Talk(Player* this, PlayState* play) {
     } else if (func_808332B8(this)) {
         Player_Action_8084D610(this, play);
     } else if (!Player_CheckHostileLockOn(this) && LinkAnimation_Update(play, &this->skelAnime)) {
-        if (this->skelAnime.moveFlags != 0) {
+        if (this->skelAnime.movementFlags != 0) {
             Player_FinishAnimMovement(this);
 
             if ((this->talkActor->category == ACTORCAT_NPC) && (this->heldItemAction != PLAYER_IA_FISHING_POLE)) {
@@ -13028,7 +13129,8 @@ void Player_Action_8084B78C(Player* this, PlayState* play) {
     s16 sp32;
     s32 temp;
 
-    this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
+    this->stateFlags2 |=
+        PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
     func_8083F524(play, this);
 
     if (LinkAnimation_Update(play, &this->skelAnime)) {
@@ -13064,7 +13166,8 @@ void Player_Action_8084B898(Player* this, PlayState* play) {
     s16 sp32;
     s32 temp;
 
-    this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
+    this->stateFlags2 |=
+        PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
 
     if (func_80832CB0(play, this, &gPlayerAnim_link_normal_pushing)) {
         this->av2.actionVar2 = 1;
@@ -13115,7 +13218,8 @@ void Player_Action_8084B9E4(Player* this, PlayState* play) {
     Vec3f sp38;
 
     anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_pulling, this->modelAnimType);
-    this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
+    this->stateFlags2 |=
+        PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY;
 
     if (func_80832CB0(play, this, anim)) {
         this->av2.actionVar2 = 1;
@@ -13149,8 +13253,7 @@ void Player_Action_8084B9E4(Player* this, PlayState* play) {
             sp44.x = this->actor.world.pos.x;
             sp44.z = this->actor.world.pos.z;
             sp44.y = sp5C.y;
-            if (!BgCheck_EntityLineTest1(&play->colCtx, &sp44, &sp5C, &sp38, &sp54, true, false, false, true,
-                                         &sp50)) {
+            if (!BgCheck_EntityLineTest1(&play->colCtx, &sp44, &sp5C, &sp38, &sp54, true, false, false, true, &sp50)) {
                 func_8084B840(play, this, -2.0f);
                 return;
             }
@@ -13337,8 +13440,8 @@ void Player_Action_8084BF1C(Player* this, PlayState* play) {
                         sp68 ^= 1;
                         this->skelAnime.prevTransl = this->ageProperties->unk_62[sp68];
                         anim1 = this->ageProperties->unk_AC[sp68];
-                        LinkAnimation_Change(play, &this->skelAnime, anim1, -1.0f, Animation_GetLastFrame(anim1),
-                                             0.0f, ANIMMODE_ONCE, 0.0f);
+                        LinkAnimation_Change(play, &this->skelAnime, anim1, -1.0f, Animation_GetLastFrame(anim1), 0.0f,
+                                             ANIMMODE_ONCE, 0.0f);
                     }
                 }
                 this->av2.actionVar2 ^= 1;
@@ -13351,8 +13454,8 @@ void Player_Action_8084BF1C(Player* this, PlayState* play) {
                         Player_AnimPlayOnce(play, this, anim2);
                     } else {
                         this->skelAnime.prevTransl = this->ageProperties->unk_86[this->av2.actionVar2];
-                        LinkAnimation_Change(play, &this->skelAnime, anim2, -1.0f, Animation_GetLastFrame(anim2),
-                                             0.0f, ANIMMODE_ONCE, 0.0f);
+                        LinkAnimation_Change(play, &this->skelAnime, anim2, -1.0f, Animation_GetLastFrame(anim2), 0.0f,
+                                             ANIMMODE_ONCE, 0.0f);
                     }
                 } else {
                     this->stateFlags2 |= PLAYER_STATE2_STATIONARY_LADDER;
@@ -13441,18 +13544,14 @@ void Player_Action_8084C760(Player* this, PlayState* play) {
 
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         if (!(this->stateFlags1 & PLAYER_STATE1_LOADING)) {
-            if (this->skelAnime.moveFlags != 0) {
-                this->skelAnime.moveFlags = 0;
+            if (this->skelAnime.movementFlags != 0) {
+                this->skelAnime.movementFlags = 0;
                 return;
             }
 
             // player speed in a tunnel
             if (!Player_TryLeavingCrawlspace(this, play)) {
-                // #region SOH [Enhancement]
-                if (CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1) > 1) {
-                    this->linearVelocity = sControlInput->rel.stick_y * 0.03f * CVarGetInteger(CVAR_ENHANCEMENT("CrawlSpeed"), 1);
-                // #endregion
-                } else {
+                if (GameInteractor_Should(VB_CRAWL_SPEED_INCREASE, true)) {
                     this->linearVelocity = sControlInput->rel.stick_y * 0.03f;
                 }
             }
@@ -13545,8 +13644,8 @@ s32 func_8084C9BC(Player* this, PlayState* play) {
                 Player_SetupActionPreserveAnimMovement(play, this, Player_Action_8084D3E4, 0);
                 this->unk_878 = sp34 - rideActor->actor.world.pos.y;
                 Player_AnimPlayOnce(play, this,
-                              (this->mountSide < 0) ? &gPlayerAnim_link_uma_left_down
-                                                    : &gPlayerAnim_link_uma_right_down);
+                                    (this->mountSide < 0) ? &gPlayerAnim_link_uma_left_down
+                                                          : &gPlayerAnim_link_uma_right_down);
                 return 1;
             }
         }
@@ -14000,11 +14099,11 @@ void func_8084DBC4(PlayState* play, Player* this, f32 arg2) {
 
     Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, SPEED_MODE_LINEAR, play);
     func_8084AEEC(this, &this->linearVelocity, sp2C * 0.5f, sp2A);
-    // Original implementation of func_8084AEEC (SurfaceWithoutSwimMod) to prevent velocity increases via swim mod which push Link into the air
-    // #region SOH [Enhancement]
+    // Original implementation of func_8084AEEC (SurfaceWithoutSwimMod) to prevent velocity increases via swim mod which
+    // push Link into the air #region SOH [Enhancement]
     if (CVarGetInteger(CVAR_SETTING("WalkModifier.Enabled"), 0)) {
         SurfaceWithoutSwimMod(this, &this->actor.velocity.y, arg2, this->yaw);
-    // #endregion
+        // #endregion
     } else {
         func_8084AEEC(this, &this->actor.velocity.y, arg2, this->yaw);
     }
@@ -14109,8 +14208,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
         this->av1.actionVar1 = 1;
         equipItem = giEntry.itemId;
         equipNow = CVarGetInteger(CVAR_ENHANCEMENT("AskToEquip"), 0) && giEntry.modIndex == MOD_NONE &&
-                    equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA &&
-                    CHECK_AGE_REQ_ITEM(equipItem);
+                   equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA && CHECK_AGE_REQ_ITEM(equipItem);
 
         Message_StartTextbox(play, giEntry.textId, &this->actor);
         // RANDOTODO: Macro this boolean check.
@@ -14133,13 +14231,14 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
             if (IS_RANDO) {
                 Audio_PlayFanfare_Rando(giEntry);
             } else if (((giEntry.itemId >= ITEM_RUPEE_GREEN) && (giEntry.itemId <= ITEM_RUPEE_RED)) ||
-                        ((giEntry.itemId >= ITEM_RUPEE_PURPLE) && (giEntry.itemId <= ITEM_RUPEE_GOLD)) ||
-                        (giEntry.itemId == ITEM_HEART)) {
-                Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                       ((giEntry.itemId >= ITEM_RUPEE_PURPLE) && (giEntry.itemId <= ITEM_RUPEE_GOLD)) ||
+                       (giEntry.itemId == ITEM_HEART)) {
+                Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 if ((giEntry.itemId == ITEM_HEART_CONTAINER) ||
                     ((giEntry.itemId == ITEM_HEART_PIECE_2) &&
-                        ((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) {
+                     ((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) {
                     temp1 = NA_BGM_HEART_GET | 0x900;
                 } else {
                     temp1 = temp2 =
@@ -14151,7 +14250,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
             if (IS_RANDO) {
                 Audio_PlayFanfare_Rando(giEntry);
             } else if (giEntry.itemId == RG_DOUBLE_DEFENSE || giEntry.itemId == RG_MAGIC_SINGLE ||
-                        giEntry.itemId == RG_MAGIC_DOUBLE) {
+                       giEntry.itemId == RG_MAGIC_DOUBLE) {
                 Audio_PlayFanfare(NA_BGM_HEART_GET | 0x900);
             } else {
                 // Just in case something weird happens with MOD_INDEX
@@ -14161,9 +14260,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
             // Just in case something weird happens with modIndex.
             Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
         }
-    }
-    else if (equipNow && Message_ShouldAdvanceSilent(play) &&
-             Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) {
+    } else if (equipNow && Message_ShouldAdvanceSilent(play) && Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) {
         if (play->msgCtx.choiceIndex == 0) { // Equip now? Yes
 
             if (equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_SWORD_BGS) {
@@ -14197,8 +14294,8 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
             }
 
             // Set unk_862 to 0 early to not have the game draw non-custom colored models for a split second.
-            // This unk is what the game normally uses to decide what item to draw when holding up an item above Link's head.
-            // Only do this when the item actually has a custom draw function.
+            // This unk is what the game normally uses to decide what item to draw when holding up an item above Link's
+            // head. Only do this when the item actually has a custom draw function.
             if (this->getItemEntry.drawFunc != NULL) {
                 this->unk_862 = 0;
             }
@@ -14300,7 +14397,8 @@ void Player_Action_8084E3C4(Player* this, PlayState* play) {
             func_8083A098(this, &gPlayerAnim_link_normal_okarina_end, play);
         }
 
-        this->stateFlags2 &= ~(PLAYER_STATE2_NEAR_OCARINA_ACTOR | PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR | PLAYER_STATE2_PLAY_FOR_ACTOR);
+        this->stateFlags2 &=
+            ~(PLAYER_STATE2_NEAR_OCARINA_ACTOR | PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR | PLAYER_STATE2_PLAY_FOR_ACTOR);
         this->unk_6A8 = NULL;
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_02) {
         gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = sWarpSongEntrances[play->msgCtx.lastPlayedSong];
@@ -14585,7 +14683,8 @@ void Player_Action_SwingBottle(Player* this, PlayState* play) {
                     }
                 }
 
-                if (GameInteractor_Should(VB_BOTTLE_ACTOR, i < ARRAY_COUNT(sBottleCatchInfo), this->interactRangeActor)) {
+                if (GameInteractor_Should(VB_BOTTLE_ACTOR, i < ARRAY_COUNT(sBottleCatchInfo),
+                                          this->interactRangeActor)) {
                     // 1 is added because `sBottleCatchInfo` does not have an entry for `BOTTLE_CATCH_NONE`
                     this->av1.bottleCatchType = i + 1;
 
@@ -14646,6 +14745,8 @@ static AnimSfxEntry D_80854A34[] = {
 void Player_Action_8084EFC0(Player* this, PlayState* play) {
     Player_DecelerateToZero(this);
 
+    GameInteractor_Should(VB_EMPTYING_BOTTLE, true, this);
+
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         func_8083C0E8(this, play);
         func_8005B1A4(Play_GetCamera(play, 0));
@@ -14788,7 +14889,8 @@ void Player_Action_SlideOnSlope(Player* this, PlayState* play) {
             xzSpeedIncrStep = 1.0f;
         }
 
-        if (Math_AsymStepToF(&this->linearVelocity, xzSpeedTarget, xzSpeedIncrStep, xzSpeedDecrStep) && (xzSpeedTarget == 0)) {
+        if (Math_AsymStepToF(&this->linearVelocity, xzSpeedTarget, xzSpeedIncrStep, xzSpeedDecrStep) &&
+            (xzSpeedTarget == 0)) {
             LinkAnimationHeader* slideAnimation;
 
             if (!this->av1.facingUpSlope) {
@@ -14864,11 +14966,11 @@ void Player_Action_8084F88C(Player* this, PlayState* play) {
                 play->nextEntranceIndex = ENTR_ICE_CAVERN_ENTRANCE;
             } else if (this->av1.actionVar1 < 0) {
                 Play_TriggerRespawn(play);
-                // In ER, handle DMT and other special void outs to respawn from last entrance from grotto 
+                // In ER, handle DMT and other special void outs to respawn from last entrance from grotto
                 if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
                     Grotto_ForceRegularVoidOut();
                 }
-            } else {
+            } else if (GameInteractor_Should(VB_TRIGGER_VOIDOUT, true, this)) {
                 Play_TriggerVoidOut(play);
             }
 
@@ -15152,7 +15254,7 @@ void Player_Action_808502D0(Player* this, PlayState* play) {
 
         if (LinkAnimation_Update(play, &this->skelAnime)) {
             if (!Player_ActionHandler_7(this, play)) {
-                u8 sp43 = this->skelAnime.moveFlags;
+                u8 sp43 = this->skelAnime.movementFlags;
                 LinkAnimationHeader* sp3C;
 
                 if (Player_CheckHostileLockOn(this)) {
@@ -15162,7 +15264,7 @@ void Player_Action_808502D0(Player* this, PlayState* play) {
                 }
 
                 func_80832318(this);
-                this->skelAnime.moveFlags = 0;
+                this->skelAnime.movementFlags = 0;
 
                 if ((sp3C == &gPlayerAnim_link_fighter_Lpower_jump_kiru_end) &&
                     (this->modelAnimType != PLAYER_ANIMTYPE_3)) {
@@ -15171,7 +15273,7 @@ void Player_Action_808502D0(Player* this, PlayState* play) {
 
                 func_8083A098(this, sp3C, play);
 
-                this->skelAnime.moveFlags = sp43;
+                this->skelAnime.movementFlags = sp43;
                 this->stateFlags3 |= PLAYER_STATE3_FINISHED_ATTACKING;
             }
         } else if (this->heldItemAction == PLAYER_IA_HAMMER) {
@@ -15187,8 +15289,10 @@ void Player_Action_808502D0(Player* this, PlayState* play) {
                 Math_ScaledStepToS(&this->actor.focus.rot.x, Math_Atan2S(45.0f, sp2C), 800);
                 func_80836AB8(this, true);
 
-                if ((((this->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD) && LinkAnimation_OnFrame(&this->skelAnime, 7.0f)) ||
-                     ((this->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_FINISH) && LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) &&
+                if ((((this->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD) &&
+                      LinkAnimation_OnFrame(&this->skelAnime, 7.0f)) ||
+                     ((this->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_FINISH) &&
+                      LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) &&
                     (sp2C > -40.0f) && (sp2C < 40.0f)) {
                     func_80842A28(play, this);
                     EffectSsBlast_SpawnWhiteShockwave(play, &shockwavePos, &zeroVec, &zeroVec);
@@ -15222,7 +15326,7 @@ void Player_Action_8085063C(Player* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         s32 respawnData = gSaveContext.respawn[RESPAWN_MODE_TOP].data;
 
-        if (play->msgCtx.choiceIndex == 0) { //Returns to FW
+        if (play->msgCtx.choiceIndex == 0) { // Returns to FW
             gSaveContext.respawnFlag = 3;
             play->transitionTrigger = TRANS_TRIGGER_START;
             play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex;
@@ -15231,7 +15335,7 @@ void Player_Action_8085063C(Player* this, PlayState* play) {
             return;
         }
 
-        if (play->msgCtx.choiceIndex == 1) { //Unsets FW
+        if (play->msgCtx.choiceIndex == 1) { // Unsets FW
             gSaveContext.respawn[RESPAWN_MODE_TOP].data = -respawnData;
             gSaveContext.fw.set = 0;
             Sfx_PlaySfxAtPos(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_VANISH);
@@ -15303,13 +15407,15 @@ void Player_Action_808507F4(Player* this, PlayState* play) {
     u8 isFastFarores = CVarGetInteger(CVAR_ENHANCEMENT("FastFarores"), 0) && this->itemAction == PLAYER_IA_FARORES_WIND;
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         if (this->av1.actionVar1 < 0) {
-            if ((this->itemAction == PLAYER_IA_NAYRUS_LOVE) || isFastFarores || (gSaveContext.magicState == MAGIC_STATE_IDLE)) {
+            if ((this->itemAction == PLAYER_IA_NAYRUS_LOVE) || isFastFarores ||
+                (gSaveContext.magicState == MAGIC_STATE_IDLE)) {
                 func_80839FFC(this, play);
                 func_8005B1A4(Play_GetCamera(play, 0));
             }
         } else {
             if (this->av2.actionVar2 == 0) {
-                LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, D_80854A58[this->av1.actionVar1], 0.83f * (isFastFarores ? 2 : 1));
+                LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, D_80854A58[this->av1.actionVar1],
+                                               0.83f * (isFastFarores ? 2 : 1));
 
                 if (Player_SpawnMagicSpell(play, this, this->av1.actionVar1) != NULL) {
                     this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE;
@@ -15320,7 +15426,8 @@ void Player_Action_808507F4(Player* this, PlayState* play) {
                     Magic_Reset(play);
                 }
             } else {
-                LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, D_80854A64[this->av1.actionVar1], 0.83f * (isFastFarores ? 2 : 1));
+                LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, D_80854A64[this->av1.actionVar1],
+                                               0.83f * (isFastFarores ? 2 : 1));
 
                 if (this->av1.actionVar1 == 0) {
                     this->av2.actionVar2 = -10;
@@ -15357,7 +15464,8 @@ void Player_Action_808507F4(Player* this, PlayState* play) {
                     this->stateFlags1 &= ~(PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE);
                 }
             } else if ((isFastFarores ? 10 : D_80854A7C[this->av1.actionVar1]) < this->av2.actionVar2++) {
-                LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, D_80854A70[this->av1.actionVar1], 0.83f * (isFastFarores ? 2 : 1));
+                LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, D_80854A70[this->av1.actionVar1],
+                                               0.83f * (isFastFarores ? 2 : 1));
                 this->yaw = this->actor.shape.rot.y;
                 this->av1.actionVar1 = -1;
             }
@@ -15420,14 +15528,14 @@ void Player_Action_80850C68(Player* this, PlayState* play) {
             this->skelAnime.curFrame -= this->skelAnime.animLength;
         }
 
-        LinkAnimation_BlendToJoint(
-            play, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame,
-            (this->unk_858 < 0.0f) ? &gPlayerAnim_link_fishing_reel_left : &gPlayerAnim_link_fishing_reel_right, 5.0f,
-            fabsf(this->unk_858), this->blendTable);
-        LinkAnimation_BlendToMorph(
-            play, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame,
-            (this->unk_85C < 0.0f) ? &gPlayerAnim_link_fishing_reel_up : &gPlayerAnim_link_fishing_reel_down, 5.0f,
-            fabsf(this->unk_85C), (Vec3s*)D_80858AD8);
+        LinkAnimation_BlendToJoint(play, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame,
+                                   (this->unk_858 < 0.0f) ? &gPlayerAnim_link_fishing_reel_left
+                                                          : &gPlayerAnim_link_fishing_reel_right,
+                                   5.0f, fabsf(this->unk_858), this->blendTable);
+        LinkAnimation_BlendToMorph(play, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame,
+                                   (this->unk_85C < 0.0f) ? &gPlayerAnim_link_fishing_reel_up
+                                                          : &gPlayerAnim_link_fishing_reel_down,
+                                   5.0f, fabsf(this->unk_85C), (Vec3s*)D_80858AD8);
         LinkAnimation_InterpJointMorph(play, &this->skelAnime, 0.5f);
     } else if (LinkAnimation_Update(play, &this->skelAnime)) {
         this->unk_860 = 2;
@@ -15641,51 +15749,51 @@ static struct_80854B18 D_80854E50[PLAYER_CSACTION_MAX] = {
     { 11, NULL },                                         // PLAYER_CSACTION_55
     { 11, NULL },                                         // PLAYER_CSACTION_56
     { 12, &gPlayerAnim_clink_demo_mimawasi_wait },        // PLAYER_CSACTION_57
-    { -1, func_80852358 },                         // PLAYER_CSACTION_58
-    { 11, NULL },                                  // PLAYER_CSACTION_59
-    { 18, D_80854B14 },                            // PLAYER_CSACTION_60
-    { 11, NULL },                                  // PLAYER_CSACTION_61
-    { 11, NULL },                                  // PLAYER_CSACTION_62
-    { 11, NULL },                                  // PLAYER_CSACTION_63
-    { 11, NULL },                                  // PLAYER_CSACTION_64
-    { -1, func_80852388 },                         // PLAYER_CSACTION_65
-    { 17, &gPlayerAnim_demo_link_nwait },          // PLAYER_CSACTION_66
-    { 12, &gPlayerAnim_d_link_orowait },           // PLAYER_CSACTION_67
-    { 12, &gPlayerAnim_demo_link_nwait },          // PLAYER_CSACTION_68
-    { 11, NULL },                                  // PLAYER_CSACTION_69
-    { -1, func_808526EC },                         // PLAYER_CSACTION_70
-    { 17, &gPlayerAnim_sude_nwait },               // PLAYER_CSACTION_71
-    { -1, func_808526EC },                         // PLAYER_CSACTION_72
-    { 17, &gPlayerAnim_sude_nwait },               // PLAYER_CSACTION_73
-    { 12, &gPlayerAnim_link_demo_gurad_wait },     // PLAYER_CSACTION_74
-    { 12, &gPlayerAnim_link_demo_look_hand_wait }, // PLAYER_CSACTION_75
-    { 11, NULL },                                  // PLAYER_CSACTION_76
-    { 12, &gPlayerAnim_link_demo_ue_wait },        // PLAYER_CSACTION_77
-    { 12, &gPlayerAnim_Link_m_wait },              // PLAYER_CSACTION_78
-    { 13, &gPlayerAnim_Link_ue_wait },             // PLAYER_CSACTION_79
-    { 12, &gPlayerAnim_Link_otituku_w },           // PLAYER_CSACTION_80
-    { 12, &gPlayerAnim_L_kw },                     // PLAYER_CSACTION_81
-    { 11, NULL },                                  // PLAYER_CSACTION_82
-    { 11, NULL },                                  // PLAYER_CSACTION_83
-    { 11, NULL },                                  // PLAYER_CSACTION_84
-    { 11, NULL },                                  // PLAYER_CSACTION_85
-    { -1, func_80852648 },                         // PLAYER_CSACTION_86
-    { 11, NULL },                                  // PLAYER_CSACTION_87
-    { 12, &gPlayerAnim_L_kennasi_w },              // PLAYER_CSACTION_88
-    { -1, func_808524D0 },                         // PLAYER_CSACTION_89
-    { -1, func_80852514 },                         // PLAYER_CSACTION_90
-    { -1, func_80852554 },                         // PLAYER_CSACTION_91
-    { -1, func_808525C0 },                         // PLAYER_CSACTION_92
-    { 11, NULL },                                  // PLAYER_CSACTION_93
-    { 11, NULL },                                  // PLAYER_CSACTION_94
-    { 11, NULL },                                  // PLAYER_CSACTION_95
-    { -1, func_8085283C },                         // PLAYER_CSACTION_96
-    { -1, func_808528C8 },                         // PLAYER_CSACTION_97
-    { -1, func_808528C8 },                         // PLAYER_CSACTION_98
-    { 12, &gPlayerAnim_link_demo_zeldamiru_wait }, // PLAYER_CSACTION_99
-    { 12, &gPlayerAnim_link_demo_kenmiru1_wait },  // PLAYER_CSACTION_100
-    { 12, &gPlayerAnim_link_demo_kenmiru2_wait },  // PLAYER_CSACTION_101
-    { 12, &gPlayerAnim_demo_link_nwait },          // PLAYER_CSACTION_102
+    { -1, func_80852358 },                                // PLAYER_CSACTION_58
+    { 11, NULL },                                         // PLAYER_CSACTION_59
+    { 18, D_80854B14 },                                   // PLAYER_CSACTION_60
+    { 11, NULL },                                         // PLAYER_CSACTION_61
+    { 11, NULL },                                         // PLAYER_CSACTION_62
+    { 11, NULL },                                         // PLAYER_CSACTION_63
+    { 11, NULL },                                         // PLAYER_CSACTION_64
+    { -1, func_80852388 },                                // PLAYER_CSACTION_65
+    { 17, &gPlayerAnim_demo_link_nwait },                 // PLAYER_CSACTION_66
+    { 12, &gPlayerAnim_d_link_orowait },                  // PLAYER_CSACTION_67
+    { 12, &gPlayerAnim_demo_link_nwait },                 // PLAYER_CSACTION_68
+    { 11, NULL },                                         // PLAYER_CSACTION_69
+    { -1, func_808526EC },                                // PLAYER_CSACTION_70
+    { 17, &gPlayerAnim_sude_nwait },                      // PLAYER_CSACTION_71
+    { -1, func_808526EC },                                // PLAYER_CSACTION_72
+    { 17, &gPlayerAnim_sude_nwait },                      // PLAYER_CSACTION_73
+    { 12, &gPlayerAnim_link_demo_gurad_wait },            // PLAYER_CSACTION_74
+    { 12, &gPlayerAnim_link_demo_look_hand_wait },        // PLAYER_CSACTION_75
+    { 11, NULL },                                         // PLAYER_CSACTION_76
+    { 12, &gPlayerAnim_link_demo_ue_wait },               // PLAYER_CSACTION_77
+    { 12, &gPlayerAnim_Link_m_wait },                     // PLAYER_CSACTION_78
+    { 13, &gPlayerAnim_Link_ue_wait },                    // PLAYER_CSACTION_79
+    { 12, &gPlayerAnim_Link_otituku_w },                  // PLAYER_CSACTION_80
+    { 12, &gPlayerAnim_L_kw },                            // PLAYER_CSACTION_81
+    { 11, NULL },                                         // PLAYER_CSACTION_82
+    { 11, NULL },                                         // PLAYER_CSACTION_83
+    { 11, NULL },                                         // PLAYER_CSACTION_84
+    { 11, NULL },                                         // PLAYER_CSACTION_85
+    { -1, func_80852648 },                                // PLAYER_CSACTION_86
+    { 11, NULL },                                         // PLAYER_CSACTION_87
+    { 12, &gPlayerAnim_L_kennasi_w },                     // PLAYER_CSACTION_88
+    { -1, func_808524D0 },                                // PLAYER_CSACTION_89
+    { -1, func_80852514 },                                // PLAYER_CSACTION_90
+    { -1, func_80852554 },                                // PLAYER_CSACTION_91
+    { -1, func_808525C0 },                                // PLAYER_CSACTION_92
+    { 11, NULL },                                         // PLAYER_CSACTION_93
+    { 11, NULL },                                         // PLAYER_CSACTION_94
+    { 11, NULL },                                         // PLAYER_CSACTION_95
+    { -1, func_8085283C },                                // PLAYER_CSACTION_96
+    { -1, func_808528C8 },                                // PLAYER_CSACTION_97
+    { -1, func_808528C8 },                                // PLAYER_CSACTION_98
+    { 12, &gPlayerAnim_link_demo_zeldamiru_wait },        // PLAYER_CSACTION_99
+    { 12, &gPlayerAnim_link_demo_kenmiru1_wait },         // PLAYER_CSACTION_100
+    { 12, &gPlayerAnim_link_demo_kenmiru2_wait },         // PLAYER_CSACTION_101
+    { 12, &gPlayerAnim_demo_link_nwait },                 // PLAYER_CSACTION_102
 };
 
 void Player_AnimChangeOnceMorphZeroRootYawSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim) {
@@ -16326,16 +16434,17 @@ void func_80852648(PlayState* play, Player* this, CsCmdActorCue* cue) {
         this->heldItemId = ITEM_NONE;
         this->modelGroup = this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_IA_NONE);
         this->leftHandDLists = gPlayerLeftHandOpenDLs;
-        
+
         // If MS sword is shuffled and not in the players inventory, then we need to unequip the current sword
         // and set swordless flag to mimic Link having his weapon knocked out of his hand in the Ganon fight
-        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+        if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
+            !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
             Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_NONE);
             gSaveContext.equips.buttonItems[0] = ITEM_NONE;
             Flags_SetInfTable(INFTABLE_SWORDLESS);
             return;
         }
-        
+
         Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
         gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
         Inventory_DeleteEquipment(play, EQUIP_TYPE_SWORD);
@@ -16382,7 +16491,7 @@ void func_808526EC(PlayState* play, Player* this, CsCmdActorCue* cue) {
 void func_8085283C(PlayState* play, Player* this, CsCmdActorCue* cue) {
     if (LinkAnimation_Update(play, &this->skelAnime)) {
         func_80852944(play, this, cue);
-    // This is when link picks up the sword in the Ganon fight
+        // This is when link picks up the sword in the Ganon fight
     } else if (this->av2.actionVar2 == 0) {
         Item_Give(play, ITEM_SWORD_MASTER);
         func_80846720(play, this, 0);
@@ -16437,7 +16546,7 @@ void func_80852A54(PlayState* play, Player* this, CsCmdActorCue* cue) {
         func_808529D0(play, this, cue);
     }
 
-    this->skelAnime.moveFlags = 0;
+    this->skelAnime.movementFlags = 0;
     Player_ZeroRootLimbYaw(this);
 }
 
@@ -16448,7 +16557,7 @@ void func_80852B4C(PlayState* play, Player* this, CsCmdActorCue* cue, struct_808
         arg3->func(play, this, cue);
     }
 
-    if ((D_80858AA0 & 4) && !(this->skelAnime.moveFlags & 4)) {
+    if ((D_80858AA0 & 4) && !(this->skelAnime.movementFlags & 4)) {
         this->skelAnime.morphTable[0].y /= this->ageProperties->unk_08;
         D_80858AA0 = 0;
     }
@@ -16487,7 +16596,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorCue* cue) {
             }
         }
 
-        D_80858AA0 = this->skelAnime.moveFlags;
+        D_80858AA0 = this->skelAnime.movementFlags;
 
         Player_FinishAnimMovement(this);
         osSyncPrintf("TOOL MODE=%d\n", sp24);
@@ -16502,14 +16611,15 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorCue* cue) {
     sp24 = sCueToCsActionMap[this->cueId];
     func_80852B4C(play, this, linkCsAction, &D_80854E50[ABS(sp24)]);
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("FixEyesOpenWhileSleeping"), 0) && (play->csCtx.linkAction->action == 28 || play->csCtx.linkAction->action == 29)) {
+    if (CVarGetInteger(CVAR_ENHANCEMENT("FixEyesOpenWhileSleeping"), 0) &&
+        (play->csCtx.linkAction->action == 28 || play->csCtx.linkAction->action == 29)) {
         this->skelAnime.jointTable[22].x = 8;
     }
 }
 
 void Player_Action_CsAction(Player* this, PlayState* play) {
     if (this->csAction != this->prevCsAction) {
-        D_80858AA0 = this->skelAnime.moveFlags;
+        D_80858AA0 = this->skelAnime.movementFlags;
 
         Player_FinishAnimMovement(this);
         this->prevCsAction = this->csAction;
@@ -16650,8 +16760,8 @@ void Player_StartTalking(PlayState* play, Actor* actor) {
             } else {
                 Player_SetupWaitForPutAway(play, this, Player_SetupTalk);
                 Player_AnimPlayOnceAdjusted(play, this,
-                              (actor->xzDistToPlayer < 40.0f) ? &gPlayerAnim_link_normal_backspace
-                                                              : &gPlayerAnim_link_normal_talk_free);
+                                            (actor->xzDistToPlayer < 40.0f) ? &gPlayerAnim_link_normal_backspace
+                                                                            : &gPlayerAnim_link_normal_talk_free);
             }
 
             if (this->skelAnime.animation == &gPlayerAnim_link_normal_backspace) {
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
index 1135ca0a28..6778a7cd1d 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
@@ -71,8 +71,7 @@ void EffectSsBlast_Draw(PlayState* play, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
     Matrix_Put(&mf);
     Matrix_Scale(radius, radius, radius, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, this->gfx);
 
     CLOSE_DISPS(gfxCtx);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
index 006487496b..183e290504 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
@@ -45,8 +45,7 @@ void EffectSsBubble_Draw(PlayState* play, u32 index, EffectSs* this) {
 
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(gfxCtx);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
index 78502b25c3..6b5972ec09 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
@@ -132,6 +132,7 @@ void EffectSsDeadDb_Update(PlayState* play, u32 index, EffectSs* this) {
 
     if (this->rPlaySound && (this->rTextIdx == 1)) {
         SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->pos, &this->vec, &w);
-        Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->vec, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->vec, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
index 1ba9289bf1..6466f96069 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
@@ -99,8 +99,7 @@ void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_RotateZYX(this->rRoll, this->rPitch, this->rYaw, MTXMODE_APPLY);
     Matrix_RotateX(1.57f, MTXMODE_APPLY);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
                       PRIMITIVE, 0);
     gSPDisplayList(POLY_XLU_DISP++, gLensFlareCircleDL);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
index 96b3466938..9dca9b51b0 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
@@ -45,5 +45,6 @@ void EffectSsDeadSound_Update(PlayState* play, u32 index, EffectSs* this) {
             return;
     }
 
-    Audio_PlaySoundGeneral(this->rSfxId, &this->pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(this->rSfxId, &this->pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultReverb);
 }
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
index def1ee6c1a..c21e397605 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
@@ -81,8 +81,7 @@ void EffectSsDtBubble_Draw(PlayState* play, u32 index, EffectSs* this) {
     scale = this->rScale * 0.004f;
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu2(gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB,
                     (this->rPrimColorA * this->life) / this->rLifespan);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
index b779f32797..a0284c01f0 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@@ -78,8 +78,7 @@ void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this) {
 
     scale = Math_SinS(this->life * 0x333) * (this->rScale * 0.00005f);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     redGreen = this->life - 5;
 
@@ -90,9 +89,9 @@ void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this) {
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gDPSetEnvColor(POLY_XLU_DISP++, redGreen * 12.7f, 0, 0, 0);
     gDPSetPrimColor(POLY_XLU_DISP++, 0x0, 0x80, redGreen * 12.7f, redGreen * 12.7f, 0, 255);
-    gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->rScroll * -0x14) & 0x1FF,
-                                0x20, 0x80));
+    gSPSegment(
+        POLY_XLU_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->rScroll * -0x14) & 0x1FF, 0x20, 0x80));
 
     if (((this->rFlags & 0x7FFF) != 0) || (this->life < 18)) {
         gSPDisplayList(POLY_XLU_DISP++, gEffFire2DL);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
index ef4da7dc97..3ba96fa69f 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
@@ -113,8 +113,7 @@ void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
     Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
     Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     hiliteLightDir.x = 89.8f;
     hiliteLightDir.y = 0.0f;
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
index 014541ee08..a7727566bf 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
@@ -79,8 +79,7 @@ void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this) {
         Matrix_Scale(-1, 1, 1, MTXMODE_APPLY);
     }
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx]));
     gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_yabusame_point_DL_000DC0));
 
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
index 26e6173b81..e260656ab6 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
@@ -58,8 +58,7 @@ void EffectSsFcircle_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
     Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(play->state.gfxCtx, 0, play->gameplayFrames % 128, 0, 32, 64, 1, 0,
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
index 3bd4349dc9..edfa4492e6 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
@@ -105,8 +105,7 @@ void EffectSsFhgFlash_DrawLightBall(PlayState* play, u32 index, EffectSs* this)
     gDPPipeSync(POLY_XLU_DISP++);
     Matrix_ReplaceRotation(&play->billboardMtxF);
     Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, this->gfx);
 
     CLOSE_DISPS(gfxCtx);
@@ -138,8 +137,7 @@ void EffectSsFhgFlash_DrawShock(PlayState* play, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->rAlpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 155, 0);
     Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, this->gfx);
 
     CLOSE_DISPS(gfxCtx);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
index 4d0edb6daf..8d130145e2 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
@@ -119,14 +119,13 @@ void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this) {
 
     Matrix_Scale(1.0f, temp1, 1.0f / temp1, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255);
     gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0);
-    gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0,
-                                (play->state.frames * -0x14) & 0x1FF, 32, 128));
+    gSPSegment(
+        POLY_XLU_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (play->state.frames * -0x14) & 0x1FF, 32, 128));
 
     if (this->rType != 0) {
         gSPDisplayList(POLY_XLU_DISP++, gEffFire2DL);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
index 386a595331..5dc598fed0 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
@@ -86,8 +86,7 @@ void EffectSsGMagma2_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
     gSegments[6] = VIRTUAL_TO_PHYSICAL(object);
     gSPSegment(POLY_XLU_DISP++, 0x06, object);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->rDrawMode == 0) {
         POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 0x3D);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index 76a8b6c1e2..457d0352cd 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
@@ -81,8 +81,7 @@ void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY);
     Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPDisplayList(POLY_OPA_DISP++, this->gfx);
 
@@ -105,8 +104,7 @@ void EffectSsHahen_DrawGray(PlayState* play, u32 index, EffectSs* this) {
     Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY);
     Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gDPSetCombineLERP(POLY_OPA_DISP++, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0,
                       PRIMITIVE, 0);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
index 68bef6864f..6a3454d384 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
@@ -65,8 +65,7 @@ void EffectSsIcePiece_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
     Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
     Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, (s32)alpha & 0xFF);
     func_8003435C(&this->pos, play);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
index ec56ef130e..a03e2e882a 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
@@ -71,9 +71,8 @@ void EffectSsIceSmoke_Draw(PlayState* play, u32 index, EffectSs* this) {
         gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFreezardSteamStartDL));
         gDPPipeSync(POLY_XLU_DISP++);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 235, 235, this->rAlpha);
-        gSPSegment(
-            POLY_XLU_DISP++, 0x08,
-            Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->life * 3, this->life * 15, 32, 64, 1, 0, 0, 32, 32));
+        gSPSegment(POLY_XLU_DISP++, 0x08,
+                   Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->life * 3, this->life * 15, 32, 64, 1, 0, 0, 32, 32));
         Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
         Matrix_ReplaceRotation(&play->billboardMtxF);
         scale = this->rScale * 0.0001f;
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
index 1ddaebcdd4..8f1e49b515 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
@@ -55,8 +55,8 @@ void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
     Gfx_SetupDL_25Xlu(play->state.gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08,
-               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
-                                play->state.frames * this->rScroll, 0x20, 0x80));
+               Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, play->state.frames * this->rScroll, 0x20,
+                                0x80));
 
     if (this->rType >= 100) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, this->rAlpha);
@@ -73,8 +73,7 @@ void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) {
         Matrix_RotateY(M_PI, MTXMODE_APPLY);
     }
 
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(gfxCtx);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
index 1a0222e9f9..eca73e011f 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
@@ -112,8 +112,7 @@ void EffectSsKakera_Draw(PlayState* play, u32 index, EffectSs* this) {
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
 
     if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) {
-        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Gfx_SetupDL_25Xlu(play->state.gfxCtx);
 
         if (colorIdx >= 0) {
@@ -122,8 +121,7 @@ void EffectSsKakera_Draw(PlayState* play, u32 index, EffectSs* this) {
 
         gSPDisplayList(POLY_XLU_DISP++, this->gfx);
     } else {
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
 
         if (colorIdx >= 0) {
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
index 690320fede..2e016e6a13 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
@@ -67,8 +67,7 @@ void EffectSsSibuki_Draw(PlayState* play, u32 index, EffectSs* this) {
 
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(gfxCtx);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
     gDPSetEnvColor(POLY_OPA_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
index d3e127c13a..5c6401470e 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
@@ -63,8 +63,7 @@ void EffectSsSibuki2_Draw(PlayState* play, u32 index, EffectSs* this) {
 
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(gfxCtx);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
     gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
index 85c5854621..631fa9ab93 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
@@ -225,7 +225,7 @@ void EffectSsSolderSrchBall_Draw(PlayState* play, u32 index, EffectSs* this) {
     if (CVarGetInteger(CVAR_ENHANCEMENT("GuardVision"), 0) == 0) {
         return;
     }
-    
+
     GraphicsContext* gfxCtx = play->state.gfxCtx;
     u32 rm;
     u32 blc1;
@@ -242,8 +242,8 @@ void EffectSsSolderSrchBall_Draw(PlayState* play, u32 index, EffectSs* this) {
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetCycleType(POLY_XLU_DISP++, G_CYC_1CYCLE);
     gDPSetRenderMode(POLY_XLU_DISP++, rm | blc1, rm | blc2);
-    gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, PRIMITIVE, 0, SHADE, 0, 0, 0,
-                      0, ENVIRONMENT);
+    gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, PRIMITIVE, 0, SHADE, 0, 0, 0, 0,
+                      ENVIRONMENT);
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
     if (*seenLink) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
index bcd9a57307..c82d49a55c 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
@@ -64,8 +64,7 @@ void EffectSsStick_Draw(PlayState* play, u32 index, EffectSs* this) {
         Matrix_RotateZYX(0, this->rYaw, play->state.frames * 10000, MTXMODE_APPLY);
     }
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_25Opa(gfxCtx);
     gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.status[this->rObjBankIdx].segment);
     gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList);
diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index 199a45dc32..570a0fb526 100644
--- a/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -62,8 +62,7 @@ void EffectSsStone1_Draw(PlayState* play, u32 index, EffectSs* this) {
     scale = (mfW < 1500.0f) ? 3.0f : (mfW / 1500.0f) * 3.0f;
     Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
     Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
-    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Gfx_SetupDL_61Xlu(gfxCtx);
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(drawParams->texture));
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, drawParams->primColor.r, drawParams->primColor.g, drawParams->primColor.b,
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
index 3e3106ef49..5f6e3f202e 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
+++ b/soh/src/overlays/gamestates/ovl_file_choose/file_choose.h
@@ -178,6 +178,11 @@ typedef enum {
     /* 99 */ FS_KBD_BTN_NONE = 99
 } KeyboardButton;
 
+typedef enum {
+    /* 0 */ FS_TITLE_CUR,
+    /* 1 */ FS_TITLE_NEXT
+} TitleIndex;
+
 void FileChoose_SetupCopySource(GameState* thisx); 
 void FileChoose_SelectCopySource(GameState* thisx); 
 void FileChoose_SetupCopyDest1(GameState* thisx); 
@@ -230,4 +235,32 @@ Vec2f HandleMouseCursorSplit(FileChooseContext* thisx, Input* input, int minx, i
 
 extern s16 D_808123F0[];
 
+// #region SOH [NTSC]
+
+void FileChoose_UpdateKeyboardCursorNES(GameState* thisx);
+void FileChoose_StartNameEntryNES(GameState* thisx);
+void FileChoose_UpdateOptionsMenuNES(GameState* thisx);
+void FileChoose_StartOptionsNES(GameState* thisx);
+
+void FileChoose_DrawOptionsNES(GameState* thisx);
+
+void FileChoose_DrawNameEntryNES(GameState* thisx);
+void FileChoose_DrawCharacterNES(GraphicsContext* gfxCtx, void* texture, s16 vtx);
+
+extern s16 gKeyboardCharactersHiragana[];
+extern s16 gKeyboardCharactersKatakana[];
+extern s16 gKeyboardCharactersAlphanumeric[];
+
+extern s16 D_808127DC_ne0[];
+
+extern s16 D_808125EC[];
+extern s16 D_80812604[];
+
+// Port Data:
+extern s16 sLastCharIndex;
+extern s16 sLastKbdX;
+extern s8 sLastOptionButtonIndex;
+
+// #endregion
+
 #endif
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 664a9dcfc9..8fa504748e 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -26,6 +26,7 @@
 #include "soh/SaveManager.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
+#include "soh/ShipUtils.h"
 
 typedef struct {
     s16 left;
@@ -45,12 +46,28 @@ typedef struct {
     IconSize size;
 } ItemData;
 
-#define CREATE_SPRITE_24(iconTex, spriteId) { iconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, spriteId }, {0xFF, 0xFF, 0xFF, 0xFF}
-#define CREATE_SPRITE_32(iconTex, spriteId) { iconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, spriteId }, {0xFF, 0xFF, 0xFF, 0xFF}
-#define CREATE_SPRITE_SONG(colorR, colorG, colorB) { dgSongNoteTex, 16, 24, G_IM_FMT_IA, G_IM_SIZ_8b, 100 }, {colorR, colorG, colorB, 0xFF}
-#define CREATE_SPRITE_RUPEE(colorR, colorG, colorB) { dgRupeeCounterIconTex, 16, 16, G_IM_FMT_IA, G_IM_SIZ_8b, 102 }, {colorR, colorG, colorB, 0xFF}
-#define CREATE_SPRITE_SKULL { dgDungeonMapSkullTex, 16, 16, G_IM_FMT_RGBA, G_IM_SIZ_16b, 104 }, {0xFF, 0xFF, 0xFF, 0xFF}
-#define CREATE_SPRITE_COUNTER_DIGIT(i) { dgAmmoDigit##i##Tex, 8, 8, G_IM_FMT_IA, G_IM_SIZ_8b, 105+i }
+#define CREATE_SPRITE_24(iconTex, spriteId)                       \
+    { iconTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, spriteId }, { \
+        0xFF, 0xFF, 0xFF, 0xFF                                    \
+    }
+#define CREATE_SPRITE_32(iconTex, spriteId)                       \
+    { iconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, spriteId }, { \
+        0xFF, 0xFF, 0xFF, 0xFF                                    \
+    }
+#define CREATE_SPRITE_SONG(colorR, colorG, colorB)              \
+    { dgSongNoteTex, 16, 24, G_IM_FMT_IA, G_IM_SIZ_8b, 100 }, { \
+        colorR, colorG, colorB, 0xFF                            \
+    }
+#define CREATE_SPRITE_RUPEE(colorR, colorG, colorB)                     \
+    { dgRupeeCounterIconTex, 16, 16, G_IM_FMT_IA, G_IM_SIZ_8b, 102 }, { \
+        colorR, colorG, colorB, 0xFF                                    \
+    }
+#define CREATE_SPRITE_SKULL                                               \
+    { dgDungeonMapSkullTex, 16, 16, G_IM_FMT_RGBA, G_IM_SIZ_16b, 104 }, { \
+        0xFF, 0xFF, 0xFF, 0xFF                                            \
+    }
+#define CREATE_SPRITE_COUNTER_DIGIT(i) \
+    { dgAmmoDigit##i##Tex, 8, 8, G_IM_FMT_IA, G_IM_SIZ_8b, 105 + i }
 
 #define ICON_SIZE 12
 #define COUNTER_SIZE 16
@@ -58,121 +75,129 @@ typedef struct {
 #define SONG_HEIGHT 12
 
 #define LEFT_OFFSET (int)0x37
-#define TOP_OFFSET  (int)0x5C
+#define TOP_OFFSET (int)0x5C
 
 #define COUNTER_DIGITS_LEFT_OFFSET COUNTER_SIZE / 2 - 3
 #define COUNTER_DIGITS_TOP_OFFSET COUNTER_SIZE - 3
 
-#define SIZE_NORMAL {ICON_SIZE, ICON_SIZE}
-#define SIZE_COUNTER {COUNTER_SIZE, COUNTER_SIZE}
-#define SIZE_SONG {SONG_WIDTH, SONG_HEIGHT}
+#define SIZE_NORMAL \
+    { ICON_SIZE, ICON_SIZE }
+#define SIZE_COUNTER \
+    { COUNTER_SIZE, COUNTER_SIZE }
+#define SIZE_SONG \
+    { SONG_WIDTH, SONG_HEIGHT }
 
-#define INV_IC_POS(x, y) {0x4E + ICON_SIZE * x, 0x00 + ICON_SIZE * y}
-#define EQP_IC_POS(x, y) {0x7E + ICON_SIZE * x, 0x2A + ICON_SIZE * y}
-#define SNG_IC_POS(x, y) {0x49 + SONG_WIDTH * x, 0x45 + SONG_HEIGHT * y}
-#define UPG_IC_POS(x, y) {0x5A + ICON_SIZE * x, 0x2A + ICON_SIZE * y}
-#define STN_IC_POS(i) {0x29 + ICON_SIZE * i, 0x31}
+#define INV_IC_POS(x, y) \
+    { 0x4E + ICON_SIZE *x, 0x00 + ICON_SIZE *y }
+#define EQP_IC_POS(x, y) \
+    { 0x7E + ICON_SIZE *x, 0x2A + ICON_SIZE *y }
+#define SNG_IC_POS(x, y) \
+    { 0x49 + SONG_WIDTH *x, 0x45 + SONG_HEIGHT *y }
+#define UPG_IC_POS(x, y) \
+    { 0x5A + ICON_SIZE *x, 0x2A + ICON_SIZE *y }
+#define STN_IC_POS(i) \
+    { 0x29 + ICON_SIZE *i, 0x31 }
 
 static ItemData itemData[88] = {
-    {CREATE_SPRITE_32(dgItemIconDekuStickTex, 1),          ITEM_STICK,            INV_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconDekuNutTex, 0),            ITEM_NUT,              INV_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBombTex, 2),               ITEM_BOMB,             INV_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBowTex, 3),                ITEM_BOW,              INV_IC_POS(3, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconArrowFireTex, 4),          ITEM_ARROW_FIRE,       INV_IC_POS(4, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconDinsFireTex, 5),           ITEM_DINS_FIRE,        INV_IC_POS(5, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBottleEmptyTex, 20),       ITEM_BOTTLE,           INV_IC_POS(6, 0), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconDekuStickTex, 1), ITEM_STICK, INV_IC_POS(0, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconDekuNutTex, 0), ITEM_NUT, INV_IC_POS(1, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBombTex, 2), ITEM_BOMB, INV_IC_POS(2, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBowTex, 3), ITEM_BOW, INV_IC_POS(3, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconArrowFireTex, 4), ITEM_ARROW_FIRE, INV_IC_POS(4, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconDinsFireTex, 5), ITEM_DINS_FIRE, INV_IC_POS(5, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBottleEmptyTex, 20), ITEM_BOTTLE, INV_IC_POS(6, 0), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconSlingshotTex, 6),          ITEM_SLINGSHOT,        INV_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconOcarinaFairyTex, 7),       ITEM_OCARINA_FAIRY,    INV_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconOcarinaOfTimeTex, 7),      ITEM_OCARINA_TIME,     INV_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBombchuTex, 9),            ITEM_BOMBCHU,          INV_IC_POS(2, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconHookshotTex, 10),          ITEM_HOOKSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconLongshotTex, 10),          ITEM_LONGSHOT,         INV_IC_POS(3, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconArrowIceTex, 12),          ITEM_ARROW_ICE,        INV_IC_POS(4, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconFaroresWindTex, 13),       ITEM_FARORES_WIND,     INV_IC_POS(5, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconWeirdEggTex, 37),          ITEM_WEIRD_EGG,        INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconChickenTex, 37),           ITEM_CHICKEN,          INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconZeldasLetterTex, 37),      ITEM_LETTER_ZELDA,     INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskKeatonTex, 37),        ITEM_MASK_KEATON,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskSkullTex, 37),         ITEM_MASK_SKULL,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskSpookyTex, 37),        ITEM_MASK_SPOOKY,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskBunnyHoodTex, 37),     ITEM_MASK_BUNNY,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskGoronTex, 37),         ITEM_MASK_GORON,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskZoraTex, 37),          ITEM_MASK_ZORA,        INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskGerudoTex, 37),        ITEM_MASK_GERUDO,      INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMaskTruthTex, 37),         ITEM_MASK_TRUTH,       INV_IC_POS(6, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconSoldOutTex, 37),           ITEM_SOLD_OUT,         INV_IC_POS(6, 1), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconSlingshotTex, 6), ITEM_SLINGSHOT, INV_IC_POS(0, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconOcarinaFairyTex, 7), ITEM_OCARINA_FAIRY, INV_IC_POS(1, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconOcarinaOfTimeTex, 7), ITEM_OCARINA_TIME, INV_IC_POS(1, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBombchuTex, 9), ITEM_BOMBCHU, INV_IC_POS(2, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconHookshotTex, 10), ITEM_HOOKSHOT, INV_IC_POS(3, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconLongshotTex, 10), ITEM_LONGSHOT, INV_IC_POS(3, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconArrowIceTex, 12), ITEM_ARROW_ICE, INV_IC_POS(4, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconFaroresWindTex, 13), ITEM_FARORES_WIND, INV_IC_POS(5, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconWeirdEggTex, 37), ITEM_WEIRD_EGG, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconChickenTex, 37), ITEM_CHICKEN, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconZeldasLetterTex, 37), ITEM_LETTER_ZELDA, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskKeatonTex, 37), ITEM_MASK_KEATON, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskSkullTex, 37), ITEM_MASK_SKULL, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskSpookyTex, 37), ITEM_MASK_SPOOKY, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskBunnyHoodTex, 37), ITEM_MASK_BUNNY, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskGoronTex, 37), ITEM_MASK_GORON, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskZoraTex, 37), ITEM_MASK_ZORA, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskGerudoTex, 37), ITEM_MASK_GERUDO, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMaskTruthTex, 37), ITEM_MASK_TRUTH, INV_IC_POS(6, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconSoldOutTex, 37), ITEM_SOLD_OUT, INV_IC_POS(6, 1), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconBoomerangTex, 14),         ITEM_BOOMERANG,        INV_IC_POS(0, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconLensOfTruthTex, 15),       ITEM_LENS,             INV_IC_POS(1, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconMagicBeanTex, 16),         ITEM_BEAN,             INV_IC_POS(2, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconHammerTex, 17),            ITEM_HAMMER,           INV_IC_POS(3, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconArrowLightTex, 18),        ITEM_ARROW_LIGHT,      INV_IC_POS(4, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconNayrusLoveTex, 19),        ITEM_NAYRUS_LOVE,      INV_IC_POS(5, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconPocketEggTex, 53),         ITEM_POCKET_EGG,       INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconPocketCuccoTex, 53),       ITEM_POCKET_CUCCO,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconCojiroTex, 53),            ITEM_COJIRO,           INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconOddMushroomTex, 53),       ITEM_ODD_MUSHROOM,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconOddPotionTex, 53),         ITEM_ODD_POTION,       INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconPoachersSawTex, 53),       ITEM_SAW,              INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBrokenGoronsSwordTex, 53), ITEM_SWORD_BROKEN,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconPrescriptionTex, 53),      ITEM_PRESCRIPTION,     INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconEyeballFrogTex, 53),       ITEM_FROG,             INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconEyeDropsTex, 53),          ITEM_EYEDROPS,         INV_IC_POS(6, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconClaimCheckTex, 53),        ITEM_CLAIM_CHECK,      INV_IC_POS(6, 2), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconBoomerangTex, 14), ITEM_BOOMERANG, INV_IC_POS(0, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconLensOfTruthTex, 15), ITEM_LENS, INV_IC_POS(1, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconMagicBeanTex, 16), ITEM_BEAN, INV_IC_POS(2, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconHammerTex, 17), ITEM_HAMMER, INV_IC_POS(3, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconArrowLightTex, 18), ITEM_ARROW_LIGHT, INV_IC_POS(4, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconNayrusLoveTex, 19), ITEM_NAYRUS_LOVE, INV_IC_POS(5, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconPocketEggTex, 53), ITEM_POCKET_EGG, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconPocketCuccoTex, 53), ITEM_POCKET_CUCCO, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconCojiroTex, 53), ITEM_COJIRO, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconOddMushroomTex, 53), ITEM_ODD_MUSHROOM, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconOddPotionTex, 53), ITEM_ODD_POTION, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconPoachersSawTex, 53), ITEM_SAW, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBrokenGoronsSwordTex, 53), ITEM_SWORD_BROKEN, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconPrescriptionTex, 53), ITEM_PRESCRIPTION, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconEyeballFrogTex, 53), ITEM_FROG, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconEyeDropsTex, 53), ITEM_EYEDROPS, INV_IC_POS(6, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconClaimCheckTex, 53), ITEM_CLAIM_CHECK, INV_IC_POS(6, 2), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconSwordKokiriTex, 54),       ITEM_SWORD_KOKIRI,     EQP_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconSwordMasterTex, 55),       ITEM_SWORD_MASTER,     EQP_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconSwordBiggoronTex, 56),     ITEM_SWORD_BGS,        EQP_IC_POS(2, 0), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconSwordKokiriTex, 54), ITEM_SWORD_KOKIRI, EQP_IC_POS(0, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconSwordMasterTex, 55), ITEM_SWORD_MASTER, EQP_IC_POS(1, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconSwordBiggoronTex, 56), ITEM_SWORD_BGS, EQP_IC_POS(2, 0), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconShieldDekuTex, 57),        ITEM_SHIELD_DEKU,      EQP_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconShieldHylianTex, 58),      ITEM_SHIELD_HYLIAN,    EQP_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconShieldMirrorTex, 59),      ITEM_SHIELD_MIRROR,    EQP_IC_POS(2, 1), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconShieldDekuTex, 57), ITEM_SHIELD_DEKU, EQP_IC_POS(0, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconShieldHylianTex, 58), ITEM_SHIELD_HYLIAN, EQP_IC_POS(1, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconShieldMirrorTex, 59), ITEM_SHIELD_MIRROR, EQP_IC_POS(2, 1), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconTunicKokiriTex, 60),       ITEM_TUNIC_KOKIRI,     EQP_IC_POS(0, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconTunicGoronTex, 61),        ITEM_TUNIC_GORON,      EQP_IC_POS(1, 2), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconTunicZoraTex, 62),         ITEM_TUNIC_ZORA,       EQP_IC_POS(2, 2), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconTunicKokiriTex, 60), ITEM_TUNIC_KOKIRI, EQP_IC_POS(0, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconTunicGoronTex, 61), ITEM_TUNIC_GORON, EQP_IC_POS(1, 2), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconTunicZoraTex, 62), ITEM_TUNIC_ZORA, EQP_IC_POS(2, 2), SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconBootsKokiriTex, 63),       ITEM_BOOTS_KOKIRI,     EQP_IC_POS(0, 3), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBootsIronTex, 64),         ITEM_BOOTS_IRON,       EQP_IC_POS(1, 3), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconBootsHoverTex, 65),        ITEM_BOOTS_HOVER,      EQP_IC_POS(2, 3), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconBootsKokiriTex, 63), ITEM_BOOTS_KOKIRI, EQP_IC_POS(0, 3), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBootsIronTex, 64), ITEM_BOOTS_IRON, EQP_IC_POS(1, 3), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconBootsHoverTex, 65), ITEM_BOOTS_HOVER, EQP_IC_POS(2, 3), SIZE_NORMAL },
 
-    {CREATE_SPRITE_24(dgQuestIconKokiriEmeraldTex, 87),    ITEM_KOKIRI_EMERALD,   STN_IC_POS(-1),   SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconGoronRubyTex, 88),        ITEM_GORON_RUBY,       STN_IC_POS(0),    SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconZoraSapphireTex, 89),     ITEM_ZORA_SAPPHIRE,    STN_IC_POS(1),    SIZE_NORMAL},
+    { CREATE_SPRITE_24(dgQuestIconKokiriEmeraldTex, 87), ITEM_KOKIRI_EMERALD, STN_IC_POS(-1), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconGoronRubyTex, 88), ITEM_GORON_RUBY, STN_IC_POS(0), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconZoraSapphireTex, 89), ITEM_ZORA_SAPPHIRE, STN_IC_POS(1), SIZE_NORMAL },
 
-    {CREATE_SPRITE_24(dgQuestIconMedallionForestTex, 81),  ITEM_MEDALLION_FOREST, {0x37, 0x0A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMedallionFireTex, 82),    ITEM_MEDALLION_FIRE,   {0x37, 0x1A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMedallionWaterTex, 83),   ITEM_MEDALLION_WATER,  {0x29, 0x22},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMedallionSpiritTex, 84),  ITEM_MEDALLION_SPIRIT, {0x1B, 0x1A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMedallionShadowTex, 85),  ITEM_MEDALLION_SHADOW, {0x1B, 0x0A},     SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMedallionLightTex, 86),   ITEM_MEDALLION_LIGHT,  {0x29, 0x02},     SIZE_NORMAL},
+    { CREATE_SPRITE_24(dgQuestIconMedallionForestTex, 81), ITEM_MEDALLION_FOREST, { 0x37, 0x0A }, SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMedallionFireTex, 82), ITEM_MEDALLION_FIRE, { 0x37, 0x1A }, SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMedallionWaterTex, 83), ITEM_MEDALLION_WATER, { 0x29, 0x22 }, SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMedallionSpiritTex, 84), ITEM_MEDALLION_SPIRIT, { 0x1B, 0x1A }, SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMedallionShadowTex, 85), ITEM_MEDALLION_SHADOW, { 0x1B, 0x0A }, SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMedallionLightTex, 86), ITEM_MEDALLION_LIGHT, { 0x29, 0x02 }, SIZE_NORMAL },
 
-    {CREATE_SPRITE_32(dgItemIconGoronsBraceletTex, 71),    ITEM_BRACELET,         UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconSilverGauntletsTex, 71),   ITEM_GAUNTLETS_SILVER, UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconGoldenGauntletsTex, 71),   ITEM_GAUNTLETS_GOLD,   UPG_IC_POS(0, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconScaleSilverTex, 74),       ITEM_SCALE_SILVER,     UPG_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_32(dgItemIconScaleGoldenTex, 74),       ITEM_SCALE_GOLDEN,     UPG_IC_POS(1, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMagicJarSmallTex, 97),    ITEM_SINGLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconMagicJarBigTex, 97),      ITEM_DOUBLE_MAGIC,     UPG_IC_POS(2, 0), SIZE_NORMAL},
-    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),                ITEM_RUPEE_GREEN,      UPG_IC_POS(0, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconGerudosCardTex, 91),      ITEM_GERUDO_CARD,      UPG_IC_POS(1, 1), SIZE_NORMAL},
-    {CREATE_SPRITE_24(dgQuestIconStoneOfAgonyTex, 90),     ITEM_STONE_OF_AGONY,   UPG_IC_POS(2, 1), SIZE_NORMAL},
+    { CREATE_SPRITE_32(dgItemIconGoronsBraceletTex, 71), ITEM_BRACELET, UPG_IC_POS(0, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconSilverGauntletsTex, 71), ITEM_GAUNTLETS_SILVER, UPG_IC_POS(0, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconGoldenGauntletsTex, 71), ITEM_GAUNTLETS_GOLD, UPG_IC_POS(0, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconScaleSilverTex, 74), ITEM_SCALE_SILVER, UPG_IC_POS(1, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_32(dgItemIconScaleGoldenTex, 74), ITEM_SCALE_GOLDEN, UPG_IC_POS(1, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMagicJarSmallTex, 97), ITEM_SINGLE_MAGIC, UPG_IC_POS(2, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconMagicJarBigTex, 97), ITEM_DOUBLE_MAGIC, UPG_IC_POS(2, 0), SIZE_NORMAL },
+    { CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64), ITEM_RUPEE_GREEN, UPG_IC_POS(0, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconGerudosCardTex, 91), ITEM_GERUDO_CARD, UPG_IC_POS(1, 1), SIZE_NORMAL },
+    { CREATE_SPRITE_24(dgQuestIconStoneOfAgonyTex, 90), ITEM_STONE_OF_AGONY, UPG_IC_POS(2, 1), SIZE_NORMAL },
 
-    {CREATE_SPRITE_SONG(224, 107, 255),                    ITEM_SONG_LULLABY,     SNG_IC_POS(0, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 195, 60),                     ITEM_SONG_EPONA,       SNG_IC_POS(1, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(127, 255, 137),                    ITEM_SONG_SARIA,       SNG_IC_POS(2, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 255, 60),                     ITEM_SONG_SUN,         SNG_IC_POS(3, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(119, 236, 255),                    ITEM_SONG_TIME,        SNG_IC_POS(4, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(165, 165, 165),                    ITEM_SONG_STORMS,      SNG_IC_POS(5, 0), SIZE_SONG},
-    {CREATE_SPRITE_SONG(150, 255, 100),                    ITEM_SONG_MINUET,      SNG_IC_POS(0, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 80,  40),                     ITEM_SONG_BOLERO,      SNG_IC_POS(1, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(100, 150, 255),                    ITEM_SONG_SERENADE,    SNG_IC_POS(2, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 160, 0),                      ITEM_SONG_REQUIEM,     SNG_IC_POS(3, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 100, 255),                    ITEM_SONG_NOCTURNE,    SNG_IC_POS(4, 1), SIZE_SONG},
-    {CREATE_SPRITE_SONG(255, 240, 100),                    ITEM_SONG_PRELUDE,     SNG_IC_POS(5, 1), SIZE_SONG},
+    { CREATE_SPRITE_SONG(224, 107, 255), ITEM_SONG_LULLABY, SNG_IC_POS(0, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 195, 60), ITEM_SONG_EPONA, SNG_IC_POS(1, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(127, 255, 137), ITEM_SONG_SARIA, SNG_IC_POS(2, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 255, 60), ITEM_SONG_SUN, SNG_IC_POS(3, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(119, 236, 255), ITEM_SONG_TIME, SNG_IC_POS(4, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(165, 165, 165), ITEM_SONG_STORMS, SNG_IC_POS(5, 0), SIZE_SONG },
+    { CREATE_SPRITE_SONG(150, 255, 100), ITEM_SONG_MINUET, SNG_IC_POS(0, 1), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 80, 40), ITEM_SONG_BOLERO, SNG_IC_POS(1, 1), SIZE_SONG },
+    { CREATE_SPRITE_SONG(100, 150, 255), ITEM_SONG_SERENADE, SNG_IC_POS(2, 1), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 160, 0), ITEM_SONG_REQUIEM, SNG_IC_POS(3, 1), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 100, 255), ITEM_SONG_NOCTURNE, SNG_IC_POS(4, 1), SIZE_SONG },
+    { CREATE_SPRITE_SONG(255, 240, 100), ITEM_SONG_PRELUDE, SNG_IC_POS(5, 1), SIZE_SONG },
 
-    {CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101),  ITEM_DOUBLE_DEFENSE,   {0x05, -0x04},    SIZE_COUNTER},
+    { CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101), ITEM_DOUBLE_DEFENSE, { 0x05, -0x04 }, SIZE_COUNTER },
 };
 
 static u8 color_product(u8 c1, u8 c2) {
@@ -181,7 +206,7 @@ static u8 color_product(u8 c1, u8 c2) {
     return (u8)div255;
 }
 
-static const Color_RGBA8 DIM = {0x40, 0x40, 0x40, 0x90};
+static const Color_RGBA8 DIM = { 0x40, 0x40, 0x40, 0x90 };
 
 void SpriteLoad(FileChooseContext* this, Sprite* sprite);
 void SpriteDraw(FileChooseContext* this, Sprite* sprite, int left, int top, int width, int height);
@@ -231,30 +256,35 @@ u8 HasItem(s16 fileIndex, u8 item) {
     }
 
     if (item == ITEM_BRACELET) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >> gUpgradeShifts[UPG_STRENGTH]) == 1;
+        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >>
+                gUpgradeShifts[UPG_STRENGTH]) == 1;
     }
 
     if (item == ITEM_GAUNTLETS_SILVER) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >> gUpgradeShifts[UPG_STRENGTH]) == 2;
+        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >>
+                gUpgradeShifts[UPG_STRENGTH]) == 2;
     }
 
     if (item == ITEM_GAUNTLETS_GOLD) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >> gUpgradeShifts[UPG_STRENGTH]) == 3;
+        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_STRENGTH]) >>
+                gUpgradeShifts[UPG_STRENGTH]) == 3;
     }
 
     if (item == ITEM_SCALE_SILVER) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_SCALE]) >> gUpgradeShifts[UPG_SCALE]) == 1;
+        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_SCALE]) >> gUpgradeShifts[UPG_SCALE]) ==
+               1;
     }
 
     if (item == ITEM_SCALE_GOLDEN) {
-        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_SCALE]) >> gUpgradeShifts[UPG_SCALE]) == 2;
+        return ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_SCALE]) >> gUpgradeShifts[UPG_SCALE]) ==
+               2;
     }
 
     if (item == ITEM_DOUBLE_DEFENSE) {
         return Save_GetSaveMetaInfo(fileIndex)->isDoubleDefenseAcquired;
     }
 
-    //greg
+    // greg
     if (item == ITEM_RUPEE_GREEN) {
         return Save_GetSaveMetaInfo(fileIndex)->gregFound;
     }
@@ -263,8 +293,9 @@ u8 HasItem(s16 fileIndex, u8 item) {
 }
 
 u8 ShouldRenderItem(s16 fileIndex, u8 item) {
-    //strength
-    if (item == ITEM_BRACELET && (HasItem(fileIndex, ITEM_GAUNTLETS_SILVER) || HasItem(fileIndex, ITEM_GAUNTLETS_GOLD))) {
+    // strength
+    if (item == ITEM_BRACELET &&
+        (HasItem(fileIndex, ITEM_GAUNTLETS_SILVER) || HasItem(fileIndex, ITEM_GAUNTLETS_GOLD))) {
         return 0;
     }
 
@@ -276,7 +307,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //magic
+    // magic
     if (item == ITEM_SINGLE_MAGIC && HasItem(fileIndex, ITEM_DOUBLE_MAGIC)) {
         return 0;
     }
@@ -285,7 +316,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //scales
+    // scales
     if (item == ITEM_SCALE_SILVER && HasItem(fileIndex, ITEM_SCALE_GOLDEN)) {
         return 0;
     }
@@ -294,7 +325,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //hookshot/longshot
+    // hookshot/longshot
     if (item == ITEM_HOOKSHOT && HasItem(fileIndex, ITEM_LONGSHOT)) {
         return 0;
     }
@@ -303,7 +334,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //ocarinas
+    // ocarinas
     if (item == ITEM_OCARINA_FAIRY && HasItem(fileIndex, ITEM_OCARINA_TIME)) {
         return 0;
     }
@@ -312,7 +343,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //trade child
+    // trade child
     if (item == ITEM_WEIRD_EGG && !HasItem(fileIndex, ITEM_WEIRD_EGG)) {
         return 0;
     }
@@ -325,22 +356,12 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    if (
-        item == ITEM_MASK_KEATON &&
-        (
-            HasItem(fileIndex, ITEM_WEIRD_EGG) ||
-            HasItem(fileIndex, ITEM_CHICKEN) ||
-            HasItem(fileIndex, ITEM_LETTER_ZELDA) ||
-            HasItem(fileIndex, ITEM_MASK_SKULL) ||
-            HasItem(fileIndex, ITEM_MASK_SPOOKY) ||
-            HasItem(fileIndex, ITEM_MASK_BUNNY) ||
-            HasItem(fileIndex, ITEM_MASK_GORON) ||
-            HasItem(fileIndex, ITEM_MASK_ZORA) ||
-            HasItem(fileIndex, ITEM_MASK_GERUDO) ||
-            HasItem(fileIndex, ITEM_MASK_TRUTH) ||
-            HasItem(fileIndex, ITEM_SOLD_OUT)
-        )
-    ) {
+    if (item == ITEM_MASK_KEATON && (HasItem(fileIndex, ITEM_WEIRD_EGG) || HasItem(fileIndex, ITEM_CHICKEN) ||
+                                     HasItem(fileIndex, ITEM_LETTER_ZELDA) || HasItem(fileIndex, ITEM_MASK_SKULL) ||
+                                     HasItem(fileIndex, ITEM_MASK_SPOOKY) || HasItem(fileIndex, ITEM_MASK_BUNNY) ||
+                                     HasItem(fileIndex, ITEM_MASK_GORON) || HasItem(fileIndex, ITEM_MASK_ZORA) ||
+                                     HasItem(fileIndex, ITEM_MASK_GERUDO) || HasItem(fileIndex, ITEM_MASK_TRUTH) ||
+                                     HasItem(fileIndex, ITEM_SOLD_OUT))) {
         return 0;
     }
 
@@ -376,22 +397,12 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //trade adult
-    if (
-        item == ITEM_POCKET_EGG &&
-        (
-            HasItem(fileIndex, ITEM_POCKET_CUCCO) ||
-            HasItem(fileIndex, ITEM_COJIRO) ||
-            HasItem(fileIndex, ITEM_ODD_MUSHROOM) ||
-            HasItem(fileIndex, ITEM_ODD_POTION) ||
-            HasItem(fileIndex, ITEM_SAW) ||
-            HasItem(fileIndex, ITEM_SWORD_BROKEN) ||
-            HasItem(fileIndex, ITEM_PRESCRIPTION) ||
-            HasItem(fileIndex, ITEM_FROG) ||
-            HasItem(fileIndex, ITEM_EYEDROPS) ||
-            HasItem(fileIndex, ITEM_CLAIM_CHECK)
-        )
-    ) {
+    // trade adult
+    if (item == ITEM_POCKET_EGG &&
+        (HasItem(fileIndex, ITEM_POCKET_CUCCO) || HasItem(fileIndex, ITEM_COJIRO) ||
+         HasItem(fileIndex, ITEM_ODD_MUSHROOM) || HasItem(fileIndex, ITEM_ODD_POTION) || HasItem(fileIndex, ITEM_SAW) ||
+         HasItem(fileIndex, ITEM_SWORD_BROKEN) || HasItem(fileIndex, ITEM_PRESCRIPTION) ||
+         HasItem(fileIndex, ITEM_FROG) || HasItem(fileIndex, ITEM_EYEDROPS) || HasItem(fileIndex, ITEM_CLAIM_CHECK))) {
         return 0;
     }
 
@@ -439,7 +450,7 @@ u8 ShouldRenderItem(s16 fileIndex, u8 item) {
         return 0;
     }
 
-    //greg
+    // greg
     if (item == ITEM_RUPEE_GREEN) {
         return Save_GetSaveMetaInfo(fileIndex)->randoSave;
     }
@@ -457,13 +468,17 @@ static void DrawItems(FileChooseContext* this, s16 fileIndex, u8 alpha) {
 
         if (ShouldRenderItem(fileIndex, data->item)) {
             if (HasItem(fileIndex, data->item)) {
-                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, data->color.r, data->color.g, data->color.b, color_product(data->color.a, alpha));
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, data->color.r, data->color.g, data->color.b,
+                                color_product(data->color.a, alpha));
             } else {
-                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color_product(data->color.r, DIM.r), color_product(data->color.g, DIM.g), color_product(data->color.b, DIM.b), color_product(color_product(data->color.a, DIM.a), alpha));
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color_product(data->color.r, DIM.r),
+                                color_product(data->color.g, DIM.g), color_product(data->color.b, DIM.b),
+                                color_product(color_product(data->color.a, DIM.a), alpha));
             }
 
             SpriteLoad(this, &(data->sprite));
-            SpriteDraw(this, &(data->sprite), LEFT_OFFSET + data->pos.left, TOP_OFFSET + data->pos.top, data->size.width, data->size.height);
+            SpriteDraw(this, &(data->sprite), LEFT_OFFSET + data->pos.left, TOP_OFFSET + data->pos.top,
+                       data->size.width, data->size.height);
         }
     }
 
@@ -491,26 +506,20 @@ typedef struct {
 } CounterData;
 
 static CounterData counterData[8] = {
-    {CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101), COUNTER_HEALTH,        {0x05, 0x00}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0x32, 0x40, 0x19),               COUNTER_WALLET_NONE,   {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64),               COUNTER_WALLET_CHILD,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0x82, 0x82, 0xFF),               COUNTER_WALLET_ADULT,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xFF, 0x64, 0x64),               COUNTER_WALLET_GIANT,  {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_RUPEE(0xFF, 0x5A, 0xFF),               COUNTER_WALLET_TYCOON, {0x05, 0x15}, SIZE_COUNTER},
-    {CREATE_SPRITE_24(dgQuestIconGoldSkulltulaTex, 103),  COUNTER_SKULLTULLAS,   {0x05, 0x2A}, SIZE_COUNTER},
-    {CREATE_SPRITE_SKULL,                                 COUNTER_DEATHS,        {0x48, 0x2A}, SIZE_COUNTER},
+    { CREATE_SPRITE_24(dgQuestIconHeartContainerTex, 101), COUNTER_HEALTH, { 0x05, 0x00 }, SIZE_COUNTER },
+    { CREATE_SPRITE_RUPEE(0x32, 0x40, 0x19), COUNTER_WALLET_NONE, { 0x05, 0x15 }, SIZE_COUNTER },
+    { CREATE_SPRITE_RUPEE(0xC8, 0xFF, 0x64), COUNTER_WALLET_CHILD, { 0x05, 0x15 }, SIZE_COUNTER },
+    { CREATE_SPRITE_RUPEE(0x82, 0x82, 0xFF), COUNTER_WALLET_ADULT, { 0x05, 0x15 }, SIZE_COUNTER },
+    { CREATE_SPRITE_RUPEE(0xFF, 0x64, 0x64), COUNTER_WALLET_GIANT, { 0x05, 0x15 }, SIZE_COUNTER },
+    { CREATE_SPRITE_RUPEE(0xFF, 0x5A, 0xFF), COUNTER_WALLET_TYCOON, { 0x05, 0x15 }, SIZE_COUNTER },
+    { CREATE_SPRITE_24(dgQuestIconGoldSkulltulaTex, 103), COUNTER_SKULLTULLAS, { 0x05, 0x2A }, SIZE_COUNTER },
+    { CREATE_SPRITE_SKULL, COUNTER_DEATHS, { 0x48, 0x2A }, SIZE_COUNTER },
 };
 
 static Sprite counterDigitSprites[10] = {
-    CREATE_SPRITE_COUNTER_DIGIT(0),
-    CREATE_SPRITE_COUNTER_DIGIT(1),
-    CREATE_SPRITE_COUNTER_DIGIT(2),
-    CREATE_SPRITE_COUNTER_DIGIT(3),
-    CREATE_SPRITE_COUNTER_DIGIT(4),
-    CREATE_SPRITE_COUNTER_DIGIT(5),
-    CREATE_SPRITE_COUNTER_DIGIT(6),
-    CREATE_SPRITE_COUNTER_DIGIT(7),
-    CREATE_SPRITE_COUNTER_DIGIT(8),
+    CREATE_SPRITE_COUNTER_DIGIT(0), CREATE_SPRITE_COUNTER_DIGIT(1), CREATE_SPRITE_COUNTER_DIGIT(2),
+    CREATE_SPRITE_COUNTER_DIGIT(3), CREATE_SPRITE_COUNTER_DIGIT(4), CREATE_SPRITE_COUNTER_DIGIT(5),
+    CREATE_SPRITE_COUNTER_DIGIT(6), CREATE_SPRITE_COUNTER_DIGIT(7), CREATE_SPRITE_COUNTER_DIGIT(8),
     CREATE_SPRITE_COUNTER_DIGIT(9),
 };
 
@@ -520,26 +529,34 @@ u8 ShouldRenderCounter(s16 fileIndex, u8 counterId) {
     }
 
     if (counterId == COUNTER_WALLET_CHILD) {
-        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 0;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet &&
+               ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >>
+                gUpgradeShifts[UPG_WALLET]) == 0;
     }
 
     if (counterId == COUNTER_WALLET_ADULT) {
-        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 1;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet &&
+               ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >>
+                gUpgradeShifts[UPG_WALLET]) == 1;
     }
 
     if (counterId == COUNTER_WALLET_GIANT) {
-        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 2;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet &&
+               ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >>
+                gUpgradeShifts[UPG_WALLET]) == 2;
     }
 
     if (counterId == COUNTER_WALLET_TYCOON) {
-        return Save_GetSaveMetaInfo(fileIndex)->hasWallet && ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >> gUpgradeShifts[UPG_WALLET]) == 3;
+        return Save_GetSaveMetaInfo(fileIndex)->hasWallet &&
+               ((Save_GetSaveMetaInfo(fileIndex)->upgrades & gUpgradeMasks[UPG_WALLET]) >>
+                gUpgradeShifts[UPG_WALLET]) == 3;
     }
 
     return 1;
 }
 
 u16 GetCurrentCounterValue(s16 fileIndex, u8 counter) {
-    //one heart is 16 healthCapacity
+    // one heart is 16 healthCapacity
     if (counter == COUNTER_HEALTH) {
         return Save_GetSaveMetaInfo(fileIndex)->healthCapacity / 16;
     }
@@ -600,7 +617,7 @@ void DrawCounterValue(FileChooseContext* this, s16 fileIndex, u8 alpha, CounterD
     currentValue = GetCurrentCounterValue(fileIndex, data->id);
     maxValue = GetMaxCounterValue(fileIndex, data->id);
 
-    //to prevent crashes if you use the save editor
+    // to prevent crashes if you use the save editor
     if (currentValue > 999) {
         currentValue = 999;
     }
@@ -627,22 +644,30 @@ void DrawCounterValue(FileChooseContext* this, s16 fileIndex, u8 alpha, CounterD
 
     if (hundreds != 0) {
         SpriteLoad(this, &counterDigitSprites[hundreds]);
-        SpriteDraw(this, &counterDigitSprites[hundreds], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET - 6 + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[hundreds], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET - 6 + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
 
         SpriteLoad(this, &counterDigitSprites[tens]);
-        SpriteDraw(this, &counterDigitSprites[tens], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[tens], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
 
         SpriteLoad(this, &counterDigitSprites[currentValue]);
-        SpriteDraw(this, &counterDigitSprites[currentValue], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + 6 + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[currentValue],
+                   LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + 6 + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
     } else if (tens != 0) {
         SpriteLoad(this, &counterDigitSprites[tens]);
-        SpriteDraw(this, &counterDigitSprites[tens], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET - 3 + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[tens], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET - 3 + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
 
         SpriteLoad(this, &counterDigitSprites[currentValue]);
-        SpriteDraw(this, &counterDigitSprites[currentValue], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + 3 + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[currentValue],
+                   LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + 3 + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
     } else {
         SpriteLoad(this, &counterDigitSprites[currentValue]);
-        SpriteDraw(this, &counterDigitSprites[currentValue], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + data->pos.left, TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
+        SpriteDraw(this, &counterDigitSprites[currentValue], LEFT_OFFSET + COUNTER_DIGITS_LEFT_OFFSET + data->pos.left,
+                   TOP_OFFSET + COUNTER_DIGITS_TOP_OFFSET + data->pos.top, 8, 8);
     }
 
     gDPPipeSync(POLY_OPA_DISP++);
@@ -658,10 +683,12 @@ static void DrawCounters(FileChooseContext* this, s16 fileIndex, u8 alpha) {
         CounterData* data = &counterData[i];
 
         if (ShouldRenderCounter(fileIndex, data->id)) {
-            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, data->color.r, data->color.g, data->color.b, color_product(data->color.a, alpha));
-        
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, data->color.r, data->color.g, data->color.b,
+                            color_product(data->color.a, alpha));
+
             SpriteLoad(this, &(data->sprite));
-            SpriteDraw(this, &(data->sprite), LEFT_OFFSET + data->pos.left, TOP_OFFSET + data->pos.top, data->size.width, data->size.height);
+            SpriteDraw(this, &(data->sprite), LEFT_OFFSET + data->pos.left, TOP_OFFSET + data->pos.top,
+                       data->size.width, data->size.height);
 
             DrawCounterValue(this, fileIndex, alpha, data);
         }
@@ -682,19 +709,21 @@ static void DrawMoreInfo(FileChooseContext* this, s16 fileIndex, u8 alpha) {
 void Sram_InitDebugSave(void);
 void Sram_InitBossRushSave();
 
-void FileChoose_DrawTextureI8(GraphicsContext* gfxCtx, const void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop,
-                         s16 rectWidth, s16 rectHeight, s16 dsdx, s16 dtdy) {
+void FileChoose_DrawTextureI8(GraphicsContext* gfxCtx, const void* texture, s16 texWidth, s16 texHeight, s16 rectLeft,
+                              s16 rectTop, s16 rectWidth, s16 rectHeight, s16 dsdx, s16 dtdy) {
     OPEN_DISPS(gfxCtx);
-    gDPLoadTextureBlock(POLY_OPA_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, texWidth, texHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTextureBlock(POLY_OPA_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, texWidth, texHeight, 0,
+                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                        G_TX_NOLOD);
 
-    gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2,
-                        G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
+    gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2,
+                        (rectTop + rectHeight) << 2, G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
 
     CLOSE_DISPS(gfxCtx);
 }
 
-void FileChoose_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 centerY, const char* source, u32 width, u32 height) {
+void FileChoose_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 centerY, const char* source, u32 width,
+                                u32 height) {
     u8* curTexture;
     s32 textureCount;
     u32 rectLeft;
@@ -709,22 +738,22 @@ void FileChoose_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 center
 
     rectLeft = centerX - (width / 2);
     rectTop = centerY - (height / 2);
-    
+
     gDPSetTileCustom(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-    
+
     gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, source);
-    
+
     gDPLoadSync(POLY_OPA_DISP++);
     gDPLoadTile(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, (width - 1) << 2, (height - 1) << 2);
-    
+
     gSPTextureRectangle(POLY_OPA_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + (s32)width) << 2,
                         (rectTop + height) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
     CLOSE_DISPS(gfxCtx);
 }
 
 void FileChoose_DrawTextRec(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t,
-                         f32 dx, f32 dy) {
+                            f32 dx, f32 dy) {
     f32 unk;
     s32 ulx, uly, lrx, lry;
     f32 w, h;
@@ -799,8 +828,7 @@ void FileChoose_SetView(FileChooseContext* this, f32 eyeX, f32 eyeY, f32 eyeZ) {
     func_800AAA50(&this->view, 0x7F);
 }
 
-Gfx* FileChoose_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, s16 point)
-{
+Gfx* FileChoose_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, s16 point) {
     gDPLoadTextureBlock(gfx++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
@@ -924,20 +952,17 @@ void SpriteLoad(FileChooseContext* this, Sprite* sprite) {
      */
 
     if (sprite->im_siz == G_IM_SIZ_8b) {
-        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt,
-                            G_IM_SIZ_8b,
-                            sprite->width, sprite->height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                            G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt, G_IM_SIZ_8b, sprite->width, sprite->height, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
     } else if (sprite->im_siz == G_IM_SIZ_16b) {
-        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt,
-                            G_IM_SIZ_16b,
-                            sprite->width, sprite->height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                            G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt, G_IM_SIZ_16b, sprite->width, sprite->height,
+                            0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                            G_TX_NOLOD, G_TX_NOLOD);
     } else {
-        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt,
-                            G_IM_SIZ_32b,
-                            sprite->width, sprite->height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                            G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sprite->tex, sprite->im_fmt, G_IM_SIZ_32b, sprite->width, sprite->height,
+                            0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                            G_TX_NOLOD, G_TX_NOLOD);
     }
 
     CLOSE_DISPS(this->state.gfxCtx);
@@ -955,17 +980,18 @@ void SpriteDraw(FileChooseContext* this, Sprite* sprite, int left, int top, int
     CLOSE_DISPS(this->state.gfxCtx);
 }
 
-
 void DrawSeedHashSprites(FileChooseContext* this) {
     OPEN_DISPS(this->state.gfxCtx);
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
 
-    // Draw icons on the main menu, when a rando file is selected, and on name entry when quest selection is set to rando
+    // Draw icons on the main menu, when a rando file is selected, and on name entry when quest selection is set to
+    // rando
     if (this->configMode == CM_MAIN_MENU &&
-         (this->selectMode != SM_CONFIRM_FILE || Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1)) {
+        (this->selectMode != SM_CONFIRM_FILE || Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave == 1)) {
 
-        if (this->fileInfoAlpha[this->selectedFileIndex] > 0 && Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave) {
+        if (this->fileInfoAlpha[this->selectedFileIndex] > 0 &&
+            Save_GetSaveMetaInfo(this->selectedFileIndex)->randoSave) {
             // Use file info alpha to match fading
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, this->fileInfoAlpha[this->selectedFileIndex]);
 
@@ -974,7 +1000,7 @@ void DrawSeedHashSprites(FileChooseContext* this) {
             for (unsigned int i = 0; i < 5; i++) {
                 SpriteLoad(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]));
                 SpriteDraw(this, GetSeedTexture(Save_GetSaveMetaInfo(this->selectedFileIndex)->seedHash[i]),
-                            xStart + (40 * i), 10, 24, 24);
+                           xStart + (40 * i), 10, 24, 24);
             }
         }
     }
@@ -1008,42 +1034,52 @@ bool fileSelectSpoilerFileLoaded = false;
 
 void FileChoose_UpdateRandomizer() {
     if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) != 0 && generating == 0) {
-            generating = 1;
-            func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1);
-            return;
+        generating = 1;
+        func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1);
+        return;
     } else if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) == 0 && generating) {
-            if (Randomizer_IsSeedGenerated()) {
-                Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
-                retries = 0;
-            } else {
-                Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
-            }
-            func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
-            generating = 0;
-            return;
+        if (Randomizer_IsSeedGenerated()) {
+            Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
+            retries = 0;
+        } else {
+            Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
+        }
+        func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
+        generating = 0;
+        return;
     } else if (generating) {
-            return;
+        return;
     }
 
-    if (!SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && !CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
-            CVarSetString(CVAR_GENERAL("SpoilerLog"), "");
+    if (!SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) &&
+        !CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
+        CVarSetString(CVAR_GENERAL("SpoilerLog"), "");
+        Randomizer_SetSpoilerLoaded(false);
     }
 
-    if (CVarGetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0) != 0 || !(Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) &&
-        SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && !fileSelectSpoilerFileLoaded) {
-            if (CVarGetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0) != 0) {
+    if (CVarGetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0) != 0 ||
+        !(Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) &&
+            SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && !fileSelectSpoilerFileLoaded) {
+        if (CVarGetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0) != 0) {
+            if (SpoilerFileExists(CVarGetString(CVAR_GENERAL("RandomizerDroppedFile"), ""))) {
                 CVarSetString(CVAR_GENERAL("SpoilerLog"), CVarGetString(CVAR_GENERAL("RandomizerDroppedFile"), ""));
-                Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
+                Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
+            } else {
+                Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
             }
-            const char* fileLoc = CVarGetString(CVAR_GENERAL("SpoilerLog"), "");
-            CVarSetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0);
-            CVarSetString(CVAR_GENERAL("RandomizerDroppedFile"), "");
+        }
+        const char* fileLoc = CVarGetString(CVAR_GENERAL("SpoilerLog"), "");
+        CVarSetInteger(CVAR_GENERAL("RandomizerNewFileDropped"), 0);
+        CVarSetString(CVAR_GENERAL("RandomizerDroppedFile"), "");
+        if (!Ship_IsCStringEmpty(fileLoc)) {
             Randomizer_ParseSpoiler(fileLoc);
             fileSelectSpoilerFileLoaded = true;
+        }
 
-            if (SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) && CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
-                remove(fileLoc);
-            }
+        if (SpoilerFileExists(CVarGetString(CVAR_GENERAL("SpoilerLog"), "")) &&
+            CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0)) {
+            remove(fileLoc);
+        }
     }
 }
 
@@ -1058,8 +1094,6 @@ static s16 sLastFileChooseButtonIndex;
  * Update function for `CM_MAIN_MENU`
  */
 void FileChoose_UpdateMainMenu(GameState* thisx) {
-    static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
-    static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
     FileChooseContext* this = (FileChooseContext*)thisx;
     Input* input = &this->state.input[0];
     bool dpad = CVarGetInteger(CVAR_SETTING("DpadInText"), 0);
@@ -1069,25 +1103,30 @@ void FileChoose_UpdateMainMenu(GameState* thisx) {
     if (CHECK_BTN_ALL(input->press.button, BTN_START) || CHECK_BTN_ALL(input->press.button, BTN_A)) {
         if (this->buttonIndex <= FS_BTN_MAIN_FILE_3) {
             if (!Save_GetSaveMetaInfo(this->buttonIndex)->valid) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->prevConfigMode = this->configMode;
                 this->configMode = CM_ROTATE_TO_QUEST_MENU;
                 this->logoAlpha = 0;
-            } else if(!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(this->buttonIndex))) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(this->buttonIndex))) {
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else if (this->n64ddFlags[this->buttonIndex] == this->n64ddFlag) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->actionTimer = 8;
                 this->selectMode = SM_FADE_MAIN_TO_SELECT;
                 this->selectedFileIndex = this->buttonIndex;
                 this->menuMode = FS_MENU_MODE_SELECT;
                 this->nextTitleLabel = FS_TITLE_OPEN_FILE;
             } else if (!this->n64ddFlags[this->buttonIndex]) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         } else {
             if (this->warningLabel == FS_WARNING_NONE) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->prevConfigMode = this->configMode;
 
                 if (this->buttonIndex == FS_BTN_MAIN_COPY) {
@@ -1110,12 +1149,14 @@ void FileChoose_UpdateMainMenu(GameState* thisx) {
 
                 this->actionTimer = 8;
             } else {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
     } else {
         if ((ABS(this->stickRelY) > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
             if ((this->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
                 this->buttonIndex--;
@@ -1260,12 +1301,16 @@ void FileChoose_StartRandomizerMenu(GameState* thisx) {
 
 void FileChoose_UpdateQuestMenu(GameState* thisx) {
     static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
+    static u8 emptyNameNES[] = { 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
     static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
+    static u8 linkNameNES[] = { 0xB6, 0xB3, 0xB8, 0xB5, 0xDF, 0xDF, 0xDF, 0xDF };
+    static u8 linkNameJP[] = { 0x81, 0x87, 0x61, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
     FileChoose_UpdateStickDirectionPromptAnim(thisx);
     FileChooseContext* this = (FileChooseContext*)thisx;
     Input* input = &this->state.input[0];
     s8 i = 0;
     bool dpad = CVarGetInteger(CVAR_SETTING("DpadInText"), 0);
+    void* defaultName;
 
     FileChoose_UpdateRandomizer();
 
@@ -1291,7 +1336,8 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
             this->questType[this->buttonIndex] = MAX_QUEST;
         }
 
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
         GameInteractor_ExecuteOnUpdateFileQuestSelection(this->questType[this->buttonIndex]);
     }
@@ -1300,16 +1346,19 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
         gSaveContext.ship.quest.id = this->questType[this->buttonIndex];
 
         if (this->questType[this->buttonIndex] == QUEST_BOSSRUSH) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->prevConfigMode = this->configMode;
             this->configMode = CM_ROTATE_TO_BOSS_RUSH_MENU;
             return;
         } else if (this->questType[this->buttonIndex] == QUEST_RANDOMIZER) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->prevConfigMode = this->configMode;
             this->configMode = CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU;
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             osSyncPrintf("Selected Dungeon Quest: %d\n", IS_MASTER_QUEST);
             this->prevConfigMode = this->configMode;
             this->configMode = CM_ROTATE_TO_NAME_ENTRY;
@@ -1323,7 +1372,21 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
             this->newFileNameCharCount = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? 4 : 0;
             this->nameEntryBoxPosX = 120;
             this->nameEntryBoxAlpha = 0;
-            memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkName : &emptyName, 8);
+            if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+                defaultName = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkName : &emptyName;
+            } else if (gSaveContext.language == LANGUAGE_JPN) { // Japanese
+                if (CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) != 0) {
+                    // Set player name to "リンク" ("Link" in Katakana, 3 characters long) when playing in Japanese.
+                    defaultName = &linkNameJP;
+                    this->newFileNameCharCount = 3;
+                } else {
+                    defaultName = &emptyNameNES;
+                }
+                this->charPage = FS_CHAR_PAGE_HIRA; // Default to Hiragana Keyboard
+            } else {                                // GAME_REGION_NTSC
+                defaultName = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkNameNES : &emptyNameNES;
+            }
+            memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, defaultName, 8);
             return;
         }
     }
@@ -1355,7 +1418,7 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
     if (this->bossRushArrowOffset >= 30) {
         this->bossRushArrowOffset = 0;
     }
-    
+
     // Move menu selection up or down.
     if (ABS(this->stickRelY) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
         // Move down
@@ -1372,7 +1435,8 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
                 }
             }
         } else if (this->stickRelY > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DUP))) {
-            // When selecting past the first option, cycle back to the last option and offset the list to view it properly.
+            // When selecting past the first option, cycle back to the last option and offset the list to view it
+            // properly.
             if ((this->bossRushIndex - 1) < 0) {
                 this->bossRushIndex = BR_OPTIONS_MAX - 1;
                 this->bossRushOffset = this->bossRushIndex - BOSSRUSH_MAX_OPTIONS_ON_SCREEN + 1;
@@ -1385,14 +1449,16 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
             }
         }
 
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     // Cycle through choices for currently selected option.
     if (ABS(this->stickRelX) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) {
         if (this->stickRelX > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT))) {
             // If exceeding the amount of choices for the selected option, cycle back to the first.
-            if ((gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] + 1) == BossRush_GetSettingOptionsAmount(this->bossRushIndex)) {
+            if ((gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] + 1) ==
+                BossRush_GetSettingOptionsAmount(this->bossRushIndex)) {
                 gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] = 0;
             } else {
                 gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex]++;
@@ -1400,18 +1466,21 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
         } else if (this->stickRelX < -30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT))) {
             // If cycling back when already at the first choice for the selected option, cycle back to the last choice.
             if ((gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] - 1) < 0) {
-                gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] = BossRush_GetSettingOptionsAmount(this->bossRushIndex) - 1;
+                gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex] =
+                    BossRush_GetSettingOptionsAmount(this->bossRushIndex) - 1;
             } else {
                 gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex]--;
             }
         }
 
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     if (sLastBossRushOptionIndex != this->bossRushIndex ||
         sLastBossRushOptionValue != gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex]) {
-        GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(this->bossRushIndex, gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex]);
+        GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(
+            this->bossRushIndex, gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex]);
         sLastBossRushOptionIndex = this->bossRushIndex;
         sLastBossRushOptionValue = gSaveContext.ship.quest.data.bossRush.options[this->bossRushIndex];
     }
@@ -1423,7 +1492,8 @@ void FileChoose_UpdateBossRushMenu(GameState* thisx) {
 
     // Load into the game.
     if (CHECK_BTN_ALL(input->press.button, BTN_START) || CHECK_BTN_ALL(input->press.button, BTN_A)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->buttonIndex = 0xFE;
         this->menuMode = FS_MENU_MODE_SELECT;
         this->selectMode = SM_FADE_OUT;
@@ -1449,7 +1519,7 @@ void FileChoose_UpdateRandomizerMenu(GameState* thisx) {
     if (this->randomizerUIAlpha > 255) {
         this->randomizerUIAlpha = 255;
     }
-    
+
     // Move menu selection up or down.
     if (ABS(this->stickRelY) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
         // Move down
@@ -1461,7 +1531,8 @@ void FileChoose_UpdateRandomizerMenu(GameState* thisx) {
                 this->randomizerIndex++;
             }
         } else if (this->stickRelY > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DUP))) {
-            // When selecting past the first option, cycle back to the last option and offset the list to view it properly.
+            // When selecting past the first option, cycle back to the last option and offset the list to view it
+            // properly.
             if ((this->randomizerIndex - 1) < RSM_START_RANDOMIZER) {
                 this->randomizerIndex = RSM_OPEN_RANDOMIZER_SETTINGS;
             } else {
@@ -1469,7 +1540,10 @@ void FileChoose_UpdateRandomizerMenu(GameState* thisx) {
             }
         }
 
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        GameInteractor_ExecuteOnUpdateFileRandomizerOptionSelection(this->randomizerIndex);
+
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
@@ -1480,9 +1554,15 @@ void FileChoose_UpdateRandomizerMenu(GameState* thisx) {
     if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
         if (this->randomizerIndex == RSM_START_RANDOMIZER) {
             if (Randomizer_IsSeedGenerated() || Randomizer_IsSpoilerLoaded()) {
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
+                static u8 emptyNameNES[] = { 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
                 static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
+                static u8 linkNameNES[] = { 0xB6, 0xB3, 0xB8, 0xB5, 0xDF, 0xDF, 0xDF, 0xDF };
+                static u8 linkNameJP[] = { 0x81, 0x87, 0x61, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF };
+                u8* defaultName;
+
                 this->prevConfigMode = this->configMode;
                 this->configMode = CM_ROTATE_TO_NAME_ENTRY;
                 this->logoAlpha = 0;
@@ -1496,15 +1576,29 @@ void FileChoose_UpdateRandomizerMenu(GameState* thisx) {
                 this->newFileNameCharCount = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? 4 : 0;
                 this->nameEntryBoxPosX = 120;
                 this->nameEntryBoxAlpha = 0;
-                memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
-                       CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkName : &emptyName, 8);
+                if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+                    defaultName = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkName : &emptyName;
+                } else if (gSaveContext.language == LANGUAGE_JPN) { // Japanese
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) != 0) {
+                        // Set player name to "リンク" ("Link" in Katakana, 3 characters long) when playing in Japanese.
+                        defaultName = &linkNameJP;
+                        this->newFileNameCharCount = 3;
+                    } else {
+                        defaultName = &emptyNameNES;
+                    }
+                    this->charPage = FS_CHAR_PAGE_HIRA; // Default to Hiragana Keyboard
+                } else {                                // GAME_REGION_NTSC
+                    defaultName = CVarGetInteger(CVAR_ENHANCEMENT("LinkDefaultName"), 0) ? &linkNameNES : &emptyNameNES;
+                }
+                memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, defaultName, 8);
             } else {
                 Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
             }
         } else if (this->randomizerIndex == RSM_GENERATE_RANDOMIZER) {
             Randomizer_GenerateRandomizer();
         } else if (this->randomizerIndex == RSM_OPEN_RANDOMIZER_SETTINGS) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             Randomizer_ShowRandomizerMenu();
         }
     }
@@ -1648,34 +1742,65 @@ void FileChoose_RotateToRandomizer(GameState* thisx) {
 }
 
 static void (*gConfigModeUpdateFuncs[])(GameState*) = {
-    FileChoose_StartFadeIn,        FileChoose_FinishFadeIn,
-    FileChoose_UpdateMainMenu,     FileChoose_SetupCopySource,
-    FileChoose_SelectCopySource,   FileChoose_SetupCopyDest1,
-    FileChoose_SetupCopyDest2,     FileChoose_SelectCopyDest,
-    FileChoose_ExitToCopySource1,  FileChoose_ExitToCopySource2,
-    FileChoose_SetupCopyConfirm1,  FileChoose_SetupCopyConfirm2,
-    FileChoose_CopyConfirm,        FileChoose_ReturnToCopyDest,
-    FileChoose_CopyAnim1,          FileChoose_CopyAnim2,
-    FileChoose_CopyAnim3,          FileChoose_CopyAnim4,
-    FileChoose_CopyAnim5,          FileChoose_ExitCopyToMain,
-    FileChoose_SetupEraseSelect,   FileChoose_EraseSelect,
-    FileChoose_SetupEraseConfirm1, FileChoose_SetupEraseConfirm2,
-    FileChoose_EraseConfirm,       FileChoose_ExitToEraseSelect1,
-    FileChoose_ExitToEraseSelect2, FileChoose_EraseAnim1,
-    FileChoose_EraseAnim2,         FileChoose_EraseAnim3,
-    FileChoose_ExitEraseToMain,    FileChoose_UnusedCM31,
-    FileChoose_RotateToNameEntry,  FileChoose_UpdateKeyboardCursor,
-    FileChoose_StartNameEntry,     FileChoose_RotateToMain,
-    FileChoose_RotateToOptions,    FileChoose_UpdateOptionsMenu,
-    FileChoose_StartOptions,       FileChoose_RotateToMain,
-    FileChoose_UnusedCMDelay,      FileChoose_RotateToQuest,
-    FileChoose_UpdateQuestMenu,    FileChoose_StartQuestMenu,
-    FileChoose_RotateToMain,       FileChoose_RotateToQuest,
-    FileChoose_RotateToBossRush,   FileChoose_UpdateBossRushMenu,
-    FileChoose_StartBossRushMenu,  FileChoose_RotateToQuest,
-    FileChoose_RotateToRandomizer, FileChoose_UpdateRandomizerMenu,
-    FileChoose_StartRandomizerMenu,FileChoose_RotateToQuest,
-    FileChoose_RotateToRandomizer
+    FileChoose_StartFadeIn,         FileChoose_FinishFadeIn,
+    FileChoose_UpdateMainMenu,      FileChoose_SetupCopySource,
+    FileChoose_SelectCopySource,    FileChoose_SetupCopyDest1,
+    FileChoose_SetupCopyDest2,      FileChoose_SelectCopyDest,
+    FileChoose_ExitToCopySource1,   FileChoose_ExitToCopySource2,
+    FileChoose_SetupCopyConfirm1,   FileChoose_SetupCopyConfirm2,
+    FileChoose_CopyConfirm,         FileChoose_ReturnToCopyDest,
+    FileChoose_CopyAnim1,           FileChoose_CopyAnim2,
+    FileChoose_CopyAnim3,           FileChoose_CopyAnim4,
+    FileChoose_CopyAnim5,           FileChoose_ExitCopyToMain,
+    FileChoose_SetupEraseSelect,    FileChoose_EraseSelect,
+    FileChoose_SetupEraseConfirm1,  FileChoose_SetupEraseConfirm2,
+    FileChoose_EraseConfirm,        FileChoose_ExitToEraseSelect1,
+    FileChoose_ExitToEraseSelect2,  FileChoose_EraseAnim1,
+    FileChoose_EraseAnim2,          FileChoose_EraseAnim3,
+    FileChoose_ExitEraseToMain,     FileChoose_UnusedCM31,
+    FileChoose_RotateToNameEntry,   FileChoose_UpdateKeyboardCursor,
+    FileChoose_StartNameEntry,      FileChoose_RotateToMain,
+    FileChoose_RotateToOptions,     FileChoose_UpdateOptionsMenu,
+    FileChoose_StartOptions,        FileChoose_RotateToMain,
+    FileChoose_UnusedCMDelay,       FileChoose_RotateToQuest,
+    FileChoose_UpdateQuestMenu,     FileChoose_StartQuestMenu,
+    FileChoose_RotateToMain,        FileChoose_RotateToQuest,
+    FileChoose_RotateToBossRush,    FileChoose_UpdateBossRushMenu,
+    FileChoose_StartBossRushMenu,   FileChoose_RotateToQuest,
+    FileChoose_RotateToRandomizer,  FileChoose_UpdateRandomizerMenu,
+    FileChoose_StartRandomizerMenu, FileChoose_RotateToQuest,
+    FileChoose_RotateToRandomizer,
+};
+
+static void (*gConfigModeUpdateFuncsNES[])(GameState*) = {
+    FileChoose_StartFadeIn,         FileChoose_FinishFadeIn,
+    FileChoose_UpdateMainMenu,      FileChoose_SetupCopySource,
+    FileChoose_SelectCopySource,    FileChoose_SetupCopyDest1,
+    FileChoose_SetupCopyDest2,      FileChoose_SelectCopyDest,
+    FileChoose_ExitToCopySource1,   FileChoose_ExitToCopySource2,
+    FileChoose_SetupCopyConfirm1,   FileChoose_SetupCopyConfirm2,
+    FileChoose_CopyConfirm,         FileChoose_ReturnToCopyDest,
+    FileChoose_CopyAnim1,           FileChoose_CopyAnim2,
+    FileChoose_CopyAnim3,           FileChoose_CopyAnim4,
+    FileChoose_CopyAnim5,           FileChoose_ExitCopyToMain,
+    FileChoose_SetupEraseSelect,    FileChoose_EraseSelect,
+    FileChoose_SetupEraseConfirm1,  FileChoose_SetupEraseConfirm2,
+    FileChoose_EraseConfirm,        FileChoose_ExitToEraseSelect1,
+    FileChoose_ExitToEraseSelect2,  FileChoose_EraseAnim1,
+    FileChoose_EraseAnim2,          FileChoose_EraseAnim3,
+    FileChoose_ExitEraseToMain,     FileChoose_UnusedCM31,
+    FileChoose_RotateToNameEntry,   FileChoose_UpdateKeyboardCursorNES,
+    FileChoose_StartNameEntryNES,   FileChoose_RotateToMain,
+    FileChoose_RotateToOptions,     FileChoose_UpdateOptionsMenuNES,
+    FileChoose_StartOptionsNES,     FileChoose_RotateToMain,
+    FileChoose_UnusedCMDelay,       FileChoose_RotateToQuest,
+    FileChoose_UpdateQuestMenu,     FileChoose_StartQuestMenu,
+    FileChoose_RotateToMain,        FileChoose_RotateToQuest,
+    FileChoose_RotateToBossRush,    FileChoose_UpdateBossRushMenu,
+    FileChoose_StartBossRushMenu,   FileChoose_RotateToQuest,
+    FileChoose_RotateToRandomizer,  FileChoose_UpdateRandomizerMenu,
+    FileChoose_StartRandomizerMenu, FileChoose_RotateToQuest,
+    FileChoose_RotateToRandomizer,
 };
 
 /**
@@ -1707,7 +1832,23 @@ void FileChoose_PulsateCursor(GameState* thisx) {
 void FileChoose_ConfigModeUpdate(GameState* thisx) {
     FileChooseContext* this = (FileChooseContext*)thisx;
 
-    gConfigModeUpdateFuncs[this->configMode](&this->state);
+    // #region SOH [NTSC] Reload Fonts If Language Has Changed
+    static s32 previousLanguage = LANGUAGE_ENG;
+    if (previousLanguage != gSaveContext.language) {
+        if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+            Font_LoadOrderedFont(&this->font);
+        } else { // GAME_REGION_NTSC
+            Font_LoadOrderedFontNTSC(&this->font);
+        }
+        previousLanguage = gSaveContext.language;
+    }
+    // #endregion
+
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        gConfigModeUpdateFuncs[this->configMode](&this->state);
+    } else { // GAME_REGION_NTSC
+        gConfigModeUpdateFuncsNES[this->configMode](&this->state);
+    }
 }
 
 void FileChoose_SetWindowVtx(GameState* thisx) {
@@ -2069,19 +2210,19 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
     s16 j;
     s16 deathCountSplit[3];
 
-    Color_RGB8 heartColor = {HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B};
+    Color_RGB8 heartColor = { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
         heartColor = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), heartColor);
     }
-    Color_RGB8 heartBorder = {HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B};
+    Color_RGB8 heartBorder = { HEARTS_ENV_R, HEARTS_ENV_G, HEARTS_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.HeartBorder.Changed"), 0)) {
         heartBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.HeartBorder.Value"), heartBorder);
     }
-    Color_RGB8 ddColor = {HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B};
+    Color_RGB8 ddColor = { HEARTS_DD_ENV_R, HEARTS_DD_ENV_G, HEARTS_DD_ENV_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHearts.Changed"), 0)) {
         ddColor = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHearts.Value"), ddColor);
     }
-    Color_RGB8 ddBorder = {HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B};
+    Color_RGB8 ddBorder = { HEARTS_DD_PRIM_R, HEARTS_DD_PRIM_G, HEARTS_DD_PRIM_B };
     if (CVarGetInteger(CVAR_COSMETIC("Consumable.DDHeartBorder.Changed"), 0)) {
         ddBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.DDHeartBorder.Value"), ddBorder);
     }
@@ -2098,10 +2239,42 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, sNamePrimColors[isActive][0], sNamePrimColors[isActive][1],
                         sNamePrimColors[isActive][2], this->nameAlpha[fileIndex]);
 
+        // #region SOH [NTSC] - Convert playerName to display appropriately
+        u8 filenameLanguage = Save_GetSaveMetaInfo(fileIndex)->filenameLanguage;
         for (i = 0, vtxOffset = 0; vtxOffset < 0x20; i++, vtxOffset += 4) {
-            FileChoose_DrawCharacter(
-                this->state.gfxCtx, sp54->fontBuf + Save_GetSaveMetaInfo(fileIndex)->playerName[i] * FONT_CHAR_TEX_SIZE,
-                vtxOffset);
+            u8 curChar = Save_GetSaveMetaInfo(fileIndex)->playerName[i];
+            if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+                if (filenameLanguage != NAME_LANGUAGE_PAL) {
+                    // Remove JPN Characters from the pool (set them to ' ')
+                    if (curChar >= 0x0A && curChar < 0xAB) {
+                        curChar = 0xDF;
+                    } else if (curChar == 0xE7 || curChar == 0xE8) {
+                        curChar = 0xDF;
+                    }
+
+                    // Convert NTSC char to PAL
+                    if (curChar >= 0xAB && curChar <= 0xDF) {
+                        curChar -= 0xA1;
+                    } else if (curChar == 0xE4) {
+                        curChar -= 0xA5;
+                    } else if (curChar == 0xEA) {
+                        curChar -= 0xAA;
+                    }
+                }
+            } else { // GAME_REGION_NTSC
+                if (filenameLanguage == NAME_LANGUAGE_PAL) {
+                    // Convert PAL char to NTSC
+                    if (curChar >= 0xA && curChar <= 0x3E) {
+                        curChar += 0xA1;
+                    } else if (curChar == 0x3F) {
+                        curChar += 0xA5;
+                    } else if (curChar == 0x40) {
+                        curChar += 0xAA;
+                    }
+                }
+            }
+            // #endregion
+            FileChoose_DrawCharacter(this->state.gfxCtx, sp54->fontBuf + curChar * FONT_CHAR_TEX_SIZE, vtxOffset);
         }
     }
 
@@ -2131,10 +2304,12 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
         gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                           PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
         if (heartType) {
-            gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, ddColor.r, ddColor.g, ddColor.b, this->fileInfoAlpha[fileIndex]);
+            gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, ddColor.r, ddColor.g, ddColor.b,
+                            this->fileInfoAlpha[fileIndex]);
             gDPSetEnvColor(POLY_OPA_DISP++, ddBorder.r, ddBorder.g, ddBorder.b, 255);
         } else {
-            gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, heartColor.r, heartColor.g, heartColor.b, this->fileInfoAlpha[fileIndex]);
+            gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, heartColor.r, heartColor.g, heartColor.b,
+                            this->fileInfoAlpha[fileIndex]);
             gDPSetEnvColor(POLY_OPA_DISP++, heartBorder.r, heartBorder.g, heartBorder.b, 255);
         }
 
@@ -2165,14 +2340,14 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
                 if (Save_GetSaveMetaInfo(fileIndex)->questItems & gBitFlags[sQuestItemFlags[j]]) {
                     gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[D_8081284C[fileIndex] + vtxOffset] + 0x80, 4, 0);
                     gDPPipeSync(POLY_OPA_DISP++);
-                    gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, sQuestItemRed[j], sQuestItemGreen[j], sQuestItemBlue[j],
-                                    this->fileInfoAlpha[fileIndex]);
+                    gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, sQuestItemRed[j], sQuestItemGreen[j],
+                                    sQuestItemBlue[j], this->fileInfoAlpha[fileIndex]);
                     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
 
                     if (j < 3) {
-                        gDPLoadTextureBlock(POLY_OPA_DISP++, sQuestItemTextures[j], G_IM_FMT_RGBA, G_IM_SIZ_32b, 16, 16, 0,
-                                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
-                                            G_TX_NOMASK, G_TX_NOLOD);
+                        gDPLoadTextureBlock(POLY_OPA_DISP++, sQuestItemTextures[j], G_IM_FMT_RGBA, G_IM_SIZ_32b, 16, 16,
+                                            0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
                         gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
                     } else {
@@ -2191,7 +2366,7 @@ static void* sFileInfoBoxTextures[] = {
     gFileSelFileInfoBox4Tex, gFileSelFileInfoBox5Tex,
 };
 
-static void* sTitleLabels[3][9] = {
+static void* sTitleLabels[4][9] = {
     { gFileSelPleaseSelectAFileENGTex, gFileSelOpenThisFileENGTex, gFileSelCopyWhichFileENGTex,
       gFileSelCopyToWhichFileENGTex, gFileSelAreYouSureENGTex, gFileSelFileCopiedENGTex, gFileSelEraseWhichFileENGTex,
       gFileSelAreYouSure2ENGTex, gFileSelFileErasedENGTex },
@@ -2200,34 +2375,42 @@ static void* sTitleLabels[3][9] = {
       gFileSelAreYouSure2GERTex, gFileSelFileErasedGERTex },
     { gFileSelPleaseSelectAFileFRATex, gFileSelOpenThisFileFRATex, gFileSelCopyWhichFileFRATex,
       gFileSelCopyToWhichFileFRATex, gFileSelAreYouSureFRATex, gFileSelFileCopiedFRATex, gFileSelEraseWhichFileFRATex,
-      gFileSelAreYouSure2FRATex, gFileSelFileErasedFRATex }
+      gFileSelAreYouSure2FRATex, gFileSelFileErasedFRATex },
+    { gFileSelPleaseSelectAFileJPNTex, gFileSelOpenThisFileJPNTex, gFileSelWhichFile1JPNTex,
+      gFileSelCopyToWhichFileJPNTex, gFileSelAreYouSureJPNTex, gFileSelFileCopiedJPNTex, gFileSelEraseWhichFileJPNTex,
+      gFileSelAreYouSure2JPNTex, gFileSelFileErasedJPNTex },
 };
 
-static void* sWarningLabels[3][5] = {
+static void* sWarningLabels[4][5] = {
     { gFileSelNoFileToCopyENGTex, gFileSelNoFileToEraseENGTex, gFileSelNoEmptyFileENGTex, gFileSelFileEmptyENGTex,
       gFileSelFileInUseENGTex },
     { gFileSelNoFileToCopyGERTex, gFileSelNoFileToEraseGERTex, gFileSelNoEmptyFileGERTex, gFileSelFileEmptyGERTex,
       gFileSelFileInUseGERTex },
     { gFileSelNoFileToCopyFRATex, gFileSelNoFileToEraseFRATex, gFileSelNoEmptyFileFRATex, gFileSelFileEmptyFRATex,
       gFileSelFileInUseFRATex },
+    { gFileSelNoFileToCopyJPNTex, gFileSelNoFileToEraseJPNTex, gFileSelNoEmptyFileJPNTex, gFileSelFileEmptyJPNTex,
+      gFileSelFileInUseJPNTex },
 };
 
-static void* sFileButtonTextures[3][3] = {
+static void* sFileButtonTextures[4][3] = {
     { gFileSelFile1ButtonENGTex, gFileSelFile2ButtonENGTex, gFileSelFile3ButtonENGTex },
     { gFileSelFile1ButtonGERTex, gFileSelFile2ButtonGERTex, gFileSelFile3ButtonGERTex },
     { gFileSelFile1ButtonFRATex, gFileSelFile2ButtonFRATex, gFileSelFile3ButtonFRATex },
+    { gFileSelFile1ButtonJPNTex, gFileSelFile2ButtonJPNTex, gFileSelFile3ButtonJPNTex },
 };
 
-static void* sActionButtonTextures[3][4] = {
+static void* sActionButtonTextures[4][4] = {
     { gFileSelCopyButtonENGTex, gFileSelEraseButtonENGTex, gFileSelYesButtonENGTex, gFileSelQuitButtonENGTex },
     { gFileSelCopyButtonGERTex, gFileSelEraseButtonGERTex, gFileSelYesButtonGERTex, gFileSelQuitButtonGERTex },
     { gFileSelCopyButtonFRATex, gFileSelEraseButtonFRATex, gFileSelYesButtonFRATex, gFileSelQuitButtonFRATex },
+    { gFileSelCopyButtonJPNTex, gFileSelEraseButtonJPNTex, gFileSelYesButtonJPNTex, gFileSelQuitButtonJPNTex },
 };
 
 static void* sOptionsButtonTextures[] = {
     gFileSelOptionsButtonENGTex,
     gFileSelOptionsButtonGERTex,
     gFileSelOptionsButtonENGTex,
+    gFileSelOptionsButtonJPNTex,
 };
 
 const char* FileChoose_GetQuestChooseTitleTexName(Language lang) {
@@ -2239,6 +2422,8 @@ const char* FileChoose_GetQuestChooseTitleTexName(Language lang) {
             return gFileSelPleaseChooseAQuestFRATex;
         case LANGUAGE_GER:
             return gFileSelPleaseChooseAQuestGERTex;
+        case LANGUAGE_JPN:
+            return gFileSelPleaseChooseAQuestJPNTex;
     }
 }
 
@@ -2251,6 +2436,8 @@ const char* FileChoose_GetSohOptionsTitleTexName(Language lang) {
             return gFileSelBossRushSettingsFRAText;
         case LANGUAGE_GER:
             return gFileSelBossRushSettingsGERText;
+        case LANGUAGE_JPN:
+            return gFileSelBossRushSettingsJPNText;
     }
 }
 
@@ -2302,74 +2489,108 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]);
     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
     gSPVertex(POLY_OPA_DISP++, this->windowContentVtx, 4, 0);
-    gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_IA,
-                        G_IM_SIZ_8b, 128, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                        G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_IA, G_IM_SIZ_8b, 128, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
     // draw next title label
-    if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_START_QUEST_MENU) || 
-        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU || this->configMode == CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
+    if ((this->configMode == CM_QUEST_MENU) || (this->configMode == CM_START_QUEST_MENU) ||
+        this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU ||
+        this->configMode == CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
         // draw control stick prompts.
         Gfx_SetupDL_39Opa(this->state.gfxCtx);
         gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
         gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR,
-                                this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB,
-                                this->stickLeftPrompt.arrowColorA, this->stickLeftPrompt.arrowTexX,
-                                this->stickLeftPrompt.arrowTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
+        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR, this->stickLeftPrompt.arrowColorG,
+                               this->stickLeftPrompt.arrowColorB, this->stickLeftPrompt.arrowColorA,
+                               this->stickLeftPrompt.arrowTexX, this->stickLeftPrompt.arrowTexY,
+                               this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
         FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR,
-                                this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB,
-                                this->stickRightPrompt.arrowColorA, this->stickRightPrompt.arrowTexX,
-                                this->stickRightPrompt.arrowTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
+                               this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB,
+                               this->stickRightPrompt.arrowColorA, this->stickRightPrompt.arrowTexX,
+                               this->stickRightPrompt.arrowTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
         gDPLoadTextureBlock(POLY_OPA_DISP++, gControlStickTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.stickColorR,
-                                this->stickLeftPrompt.stickColorG, this->stickLeftPrompt.stickColorB,
-                                this->stickLeftPrompt.stickColorA, this->stickLeftPrompt.stickTexX,
-                                this->stickLeftPrompt.stickTexY, this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
+        FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.stickColorR, this->stickLeftPrompt.stickColorG,
+                               this->stickLeftPrompt.stickColorB, this->stickLeftPrompt.stickColorA,
+                               this->stickLeftPrompt.stickTexX, this->stickLeftPrompt.stickTexY,
+                               this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f);
         FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.stickColorR,
-                                this->stickRightPrompt.stickColorG, this->stickRightPrompt.stickColorB,
-                                this->stickRightPrompt.stickColorA, this->stickRightPrompt.stickTexX,
-                                this->stickRightPrompt.stickTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
+                               this->stickRightPrompt.stickColorG, this->stickRightPrompt.stickColorB,
+                               this->stickRightPrompt.stickColorA, this->stickRightPrompt.stickTexX,
+                               this->stickRightPrompt.stickTexY, this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f);
         switch (this->questType[this->buttonIndex]) {
             case QUEST_NORMAL:
             default:
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024,
+                                         1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024,
+                                         1024);
                 FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, gTitleZeldaShieldLogoTex, 160, 160);
                 break;
 
             case QUEST_MASTER:
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024,
+                                         1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024,
+                                         1024);
                 FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, gTitleZeldaShieldLogoMQTex, 160, 160);
-                FileChoose_DrawImageRGBA32(this->state.gfxCtx, 182, 180, gTitleMasterQuestSubtitleTex, 128, 32);
+                if (gSaveContext.language == LANGUAGE_JPN || ResourceMgr_GetGameVersion(0) == OOT_NTSC_JP_MQ) {
+                    FileChoose_DrawImageRGBA32(this->state.gfxCtx, 243, 184, gTitleUraLogoTex, 40, 40);
+                    gDPPipeSync(POLY_OPA_DISP++);
+                    gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
+                    gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_XLU_SURF2);
+                    gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, 0, 0, 0, TEXEL0,
+                                      PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
+
+                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 170, 255, 255, 255);
+                    gDPSetEnvColor(POLY_OPA_DISP++, ZREG(34), 100 + ZREG(35), 255 + ZREG(36), 255);
+
+                    gDPLoadTextureBlock(POLY_OPA_DISP++, gTitleTitleJPNTex, G_IM_FMT_I, G_IM_SIZ_8b, 128, 16, 0,
+                                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
+                                        G_TX_NOMASK, G_TX_NOLOD);
+                    gDPLoadMultiBlock(POLY_OPA_DISP++, gTitleFlameEffectTex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32,
+                                      0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 1);
+                    gDPSetTileSize(POLY_OPA_DISP++, 1, 0 & 0x7F, 0 & 0x7F, (0 & 0x7F) + ((32 - 1) << 2),
+                                   (0 & 0x7F) + ((32 - 1) << 2));
+                    gSPTextureRectangle(POLY_OPA_DISP++, 114 << 2, 179 << 2, (114 + 128) << 2, (179 + 16) << 2,
+                                        G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
+                } else {
+                    FileChoose_DrawImageRGBA32(this->state.gfxCtx, 182, 180, gTitleMasterQuestSubtitleTex, 128, 32);
+                }
                 break;
-            
+
             case QUEST_RANDOMIZER:
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024);
-                FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, ResourceMgr_GameHasOriginal() ? gTitleZeldaShieldLogoTex : gTitleZeldaShieldLogoMQTex, 160, 160);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024,
+                                         1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024,
+                                         1024);
+                FileChoose_DrawImageRGBA32(
+                    this->state.gfxCtx, 160, 135,
+                    ResourceMgr_GameHasOriginal() ? gTitleZeldaShieldLogoTex : gTitleZeldaShieldLogoMQTex, 160, 160);
                 FileChoose_DrawImageRGBA32(this->state.gfxCtx, 182, 180, gTitleRandomizerSubtitleTex, 128, 32);
                 break;
 
             case QUEST_BOSSRUSH:
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->logoAlpha);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024, 1024);
-                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024, 1024);
-                FileChoose_DrawImageRGBA32(this->state.gfxCtx, 160, 135, ResourceMgr_GameHasOriginal() ? gTitleZeldaShieldLogoTex : gTitleZeldaShieldLogoMQTex, 160, 160);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleTheLegendOfTextTex, 72, 8, 156, 108, 72, 8, 1024,
+                                         1024);
+                FileChoose_DrawTextureI8(this->state.gfxCtx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 154, 163, 96, 8, 1024,
+                                         1024);
+                FileChoose_DrawImageRGBA32(
+                    this->state.gfxCtx, 160, 135,
+                    ResourceMgr_GameHasOriginal() ? gTitleZeldaShieldLogoTex : gTitleZeldaShieldLogoMQTex, 160, 160);
                 FileChoose_DrawImageRGBA32(this->state.gfxCtx, 182, 180, gTitleBossRushSubtitleTex, 128, 32);
                 break;
         }
     } else if (this->configMode == CM_BOSS_RUSH_MENU) {
-
+        uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
         uint8_t listOffset = this->bossRushOffset;
         uint8_t textAlpha = this->bossRushUIAlpha;
 
@@ -2378,9 +2599,9 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
         if (listOffset > 0) {
             uint16_t arrowUpX = 140;
             uint16_t arrowUpY = 76 - (this->bossRushArrowOffset / 10);
-            gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowUpTex, G_IM_FMT_IA,
-                                G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                                G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+            gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowUpTex, G_IM_FMT_IA, G_IM_SIZ_16b, 16, 16, 0,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                G_TX_NOLOD, G_TX_NOLOD);
             gSPWideTextureRectangle(POLY_OPA_DISP++, arrowUpX << 2, arrowUpY << 2, (arrowUpX + 8) << 2,
                                     (arrowUpY + 8) << 2, G_TX_RENDERTILE, 0, 0, (1 << 11), (1 << 11));
         }
@@ -2388,8 +2609,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
         if (BR_OPTIONS_MAX - listOffset > BOSSRUSH_MAX_OPTIONS_ON_SCREEN) {
             uint16_t arrowDownX = 140;
             uint16_t arrowDownY = 181 + (this->bossRushArrowOffset / 10);
-            gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowDownTex, G_IM_FMT_IA,
-                                G_IM_SIZ_16b, 16, 16, 0,
+            gDPLoadTextureBlock(POLY_OPA_DISP++, gArrowDownTex, G_IM_FMT_IA, G_IM_SIZ_16b, 16, 16, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
             gSPWideTextureRectangle(POLY_OPA_DISP++, arrowDownX << 2, arrowDownY << 2, (arrowDownX + 8) << 2,
@@ -2403,12 +2623,14 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
             uint16_t textYOffset = (i - listOffset) * 16;
 
             // Option name.
-            Interface_DrawTextLine(this->state.gfxCtx, BossRush_GetSettingName(i, gSaveContext.language), 
-                65, (87 + textYOffset), 255, 255, 80, textAlpha, 0.8f, true);
+            Interface_DrawTextLine(this->state.gfxCtx, BossRush_GetSettingName(i, language), 65, (87 + textYOffset),
+                                   255, 255, 80, textAlpha, 0.8f, true);
 
             // Selected choice for option.
-            uint16_t finalKerning = Interface_DrawTextLine(this->state.gfxCtx, BossRush_GetSettingChoiceName(i, gSaveContext.ship.quest.data.bossRush.options[i], gSaveContext.language), 
-                165, (87 + textYOffset), 255, 255, 255, textAlpha, 0.8f, true);
+            uint16_t finalKerning = Interface_DrawTextLine(
+                this->state.gfxCtx,
+                BossRush_GetSettingChoiceName(i, gSaveContext.ship.quest.data.bossRush.options[i], language), 165,
+                (87 + textYOffset), 255, 255, 255, textAlpha, 0.8f, true);
 
             // Draw arrows around selected option.
             if (this->bossRushIndex == i) {
@@ -2418,16 +2640,15 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                                     G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
                                     G_TX_NOLOD);
                 FileChoose_DrawTextRec(this->state.gfxCtx, this->stickLeftPrompt.arrowColorR,
-                                       this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB,
-                                       textAlpha, 160, (92 + textYOffset), 0.42f, 0, 0, -1.0f,
-                                       1.0f);
+                                       this->stickLeftPrompt.arrowColorG, this->stickLeftPrompt.arrowColorB, textAlpha,
+                                       160, (92 + textYOffset), 0.42f, 0, 0, -1.0f, 1.0f);
                 FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR,
                                        this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB,
-                                       textAlpha, (171 + finalKerning),
-                                       (92 + textYOffset), 0.42f, 0, 0, 1.0f, 1.0f);
+                                       textAlpha, (171 + finalKerning), (92 + textYOffset), 0.42f, 0, 0, 1.0f, 1.0f);
             }
         }
     } else if (this->configMode == CM_RANDOMIZER_SETTINGS_MENU) {
+        uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language;
         uint8_t textAlpha = this->randomizerUIAlpha;
 
         for (uint8_t index = 0; index <= RSM_OPEN_RANDOMIZER_SETTINGS; index++) {
@@ -2440,27 +2661,29 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                 textColorB = 80;
             }
 
-            // If no randomizer is loaded and text is "start randomizer" or when a seed is generating, make all options gray.
-            if ((index == RSM_START_RANDOMIZER && !Randomizer_IsSeedGenerated() && !Randomizer_IsSpoilerLoaded()) || generating) {
+            // If no randomizer is loaded and text is "start randomizer" or when a seed is generating, make all options
+            // gray.
+            if ((index == RSM_START_RANDOMIZER && !Randomizer_IsSeedGenerated() && !Randomizer_IsSpoilerLoaded()) ||
+                generating) {
                 textColorR = textColorG = textColorB = 100;
             }
 
-            Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetSettingText(index, gSaveContext.language), 70,
+            Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetSettingText(index, language), 70,
                                    (80 + (index * 16)), textColorR, textColorG, textColorB, textAlpha, 0.8f, true);
         }
 
         // Show text to indicate randomizer is being generated.
         if (generating) {
-            Interface_DrawTextLine(this->state.gfxCtx,
-                                   SohFileSelect_GetSettingText(RSM_GENERATING, gSaveContext.language), 70,
+            Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetSettingText(RSM_GENERATING, language), 70,
                                    (80 + 64), 255, 255, 255, textAlpha, 0.8f, true);
         }
 
-        // If no randomizer is generated and "start randomizer" is selected, show text to explain why user can't start the randomizer.
-        if (!Randomizer_IsSeedGenerated() && !Randomizer_IsSpoilerLoaded() && this->randomizerIndex == RSM_START_RANDOMIZER) {
+        // If no randomizer is generated and "start randomizer" is selected, show text to explain why user can't start
+        // the randomizer.
+        if (!Randomizer_IsSeedGenerated() && !Randomizer_IsSpoilerLoaded() &&
+            this->randomizerIndex == RSM_START_RANDOMIZER) {
             Interface_DrawTextLine(this->state.gfxCtx,
-                                   SohFileSelect_GetSettingText(RSM_NO_RANDOMIZER_GENERATED, gSaveContext.language), 70,
-                                   (80 + 64),
+                                   SohFileSelect_GetSettingText(RSM_NO_RANDOMIZER_GENERATED, language), 70, (80 + 64),
                                    240, 80, 80, textAlpha, 0.8f, true);
         }
 
@@ -2471,13 +2694,15 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
         FileChoose_DrawTextRec(this->state.gfxCtx, this->stickRightPrompt.arrowColorR,
-                                this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB, textAlpha,
-                                62, (85 + textOffset), 0.42f, 0, 0, 1.0f, 1.0f);
+                               this->stickRightPrompt.arrowColorG, this->stickRightPrompt.arrowColorB, textAlpha, 62,
+                               (85 + textOffset), 0.42f, 0, 0, 1.0f, 1.0f);
 
     } else if (this->configMode != CM_ROTATE_TO_NAME_ENTRY && this->configMode != CM_START_BOSS_RUSH_MENU &&
                this->configMode != CM_ROTATE_TO_BOSS_RUSH_MENU && this->configMode != CM_BOSS_RUSH_TO_QUEST &&
-               this->configMode != CM_START_RANDOMIZER_SETTINGS_MENU && this->configMode != CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU &&
-               this->configMode != CM_RANDOMIZER_SETTINGS_MENU_TO_QUEST && this->configMode != CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
+               this->configMode != CM_START_RANDOMIZER_SETTINGS_MENU &&
+               this->configMode != CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU &&
+               this->configMode != CM_RANDOMIZER_SETTINGS_MENU_TO_QUEST &&
+               this->configMode != CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[1]);
         gDPLoadTextureBlock(POLY_OPA_DISP++, sTitleLabels[gSaveContext.language][this->nextTitleLabel], G_IM_FMT_IA,
@@ -2496,13 +2721,14 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                             this->fileInfoAlpha[fileIndex]);
 
             // Draw the small file name box instead when more meta info is enabled
-            if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) != 0 && this->menuMode == FS_MENU_MODE_SELECT) {
+            if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) != 0 &&
+                this->menuMode == FS_MENU_MODE_SELECT) {
                 // Location of file 1 small name box vertices
                 gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[68], 4, 0);
 
                 gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelNameBoxTex, G_IM_FMT_IA, G_IM_SIZ_16b, 108, 16, 0,
-                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                                G_TX_NOLOD, G_TX_NOLOD);
+                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                    G_TX_NOLOD, G_TX_NOLOD);
                 gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
             } else {
                 gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[temp], 20, 0);
@@ -2511,7 +2737,8 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                     gDPLoadTextureBlock(POLY_OPA_DISP++, sFileInfoBoxTextures[i], G_IM_FMT_IA, G_IM_SIZ_16b,
                                         sFileInfoBoxPartWidths[i], 56, 0, G_TX_NOMIRROR | G_TX_WRAP,
                                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                    gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1, 0);
+                    gSP1Quadrangle(POLY_OPA_DISP++, quadVtxIndex, quadVtxIndex + 2, quadVtxIndex + 3, quadVtxIndex + 1,
+                                   0);
                 }
             }
         }
@@ -2553,8 +2780,9 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
 
             // draw disk label for 64DD
             if (this->n64ddFlags[i]) {
-                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0], sWindowContentColors[isActive][1],
-                                sWindowContentColors[isActive][2], this->nameBoxAlpha[i]);
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sWindowContentColors[isActive][0],
+                                sWindowContentColors[isActive][1], sWindowContentColors[isActive][2],
+                                this->nameBoxAlpha[i]);
                 gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelDISKButtonTex, G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0,
                                     G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                     G_TX_NOLOD, G_TX_NOLOD);
@@ -2571,10 +2799,9 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                                     sWindowContentColors[isActive][1], sWindowContentColors[isActive][2],
                                     this->nameAlpha[i]);
                 }
-                gDPLoadTextureBlock(POLY_OPA_DISP++,
-                                    gFileSelRANDButtonTex,
-                                    G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelRANDButtonTex, G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0,
+                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                    G_TX_NOLOD, G_TX_NOLOD);
                 gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0);
             }
             // Draw MQ label
@@ -2588,10 +2815,9 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                                     sWindowContentColors[isActive][1], sWindowContentColors[isActive][2],
                                     this->nameAlpha[i]);
                 }
-                gDPLoadTextureBlock(POLY_OPA_DISP++,
-                                    gFileSelMQButtonTex,
-                                    G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelMQButtonTex, G_IM_FMT_IA, G_IM_SIZ_16b, 44, 16, 0,
+                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                    G_TX_NOLOD, G_TX_NOLOD);
                 gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0);
             }
 
@@ -2609,14 +2835,16 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
                                 G_TX_NOLOD, G_TX_NOLOD);
             gSP1Quadrangle(POLY_OPA_DISP++, 12, 14, 15, 13, 0);
 
-            if (this->n64ddFlags[i] || Save_GetSaveMetaInfo(i)->randoSave || Save_GetSaveMetaInfo(i)->requiresMasterQuest) {
+            if (this->n64ddFlags[i] || Save_GetSaveMetaInfo(i)->randoSave ||
+                Save_GetSaveMetaInfo(i)->requiresMasterQuest) {
                 gSP1Quadrangle(POLY_OPA_DISP++, 16, 18, 19, 17, 0);
             }
         }
 
         // draw file info
         for (fileIndex = 0; fileIndex < 3; fileIndex++) {
-            isActive = ((this->n64ddFlag == this->n64ddFlags[fileIndex]) || (this->nameBoxAlpha[fileIndex] == 0)) ? 0 : 1;
+            isActive =
+                ((this->n64ddFlag == this->n64ddFlags[fileIndex]) || (this->nameBoxAlpha[fileIndex] == 0)) ? 0 : 1;
             FileChoose_DrawFileInfo(&this->state, fileIndex, isActive);
         }
 
@@ -2725,7 +2953,8 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
 
     if (this->configMode != CM_NAME_ENTRY && this->configMode != CM_START_NAME_ENTRY &&
         this->configMode != CM_QUEST_MENU && this->configMode != CM_NAME_ENTRY_TO_QUEST_MENU &&
-        this->configMode != CM_RANDOMIZER_SETTINGS_MENU && this->configMode != CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
+        this->configMode != CM_RANDOMIZER_SETTINGS_MENU &&
+        this->configMode != CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2],
@@ -2744,8 +2973,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
             }
         }
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
         gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL);
@@ -2778,8 +3006,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
         } else {
             Matrix_RotateX((this->windowRot - 628.0f) / 100.0f, MTXMODE_APPLY);
         }
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
         gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL);
@@ -2792,7 +3019,11 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
 
         gDPPipeSync(POLY_OPA_DISP++);
 
-        FileChoose_DrawNameEntry(&this->state);
+        if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+            FileChoose_DrawNameEntry(&this->state);
+        } else { // GAME_REGION_NTSC
+            FileChoose_DrawNameEntryNES(&this->state);
+        }
     }
 
     // draw options menu
@@ -2807,8 +3038,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
         Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
         Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
         gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL);
@@ -2821,14 +3051,19 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
 
         gDPPipeSync(POLY_OPA_DISP++);
 
-        FileChoose_DrawOptions(&this->state);
+        if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+            FileChoose_DrawOptions(&this->state);
+        } else { // GAME_REGION_NTSC
+            FileChoose_DrawOptionsNES(&this->state);
+        }
     }
 
     // draw quest menu
-    if (this->configMode == CM_QUEST_MENU || (this->configMode == CM_ROTATE_TO_QUEST_MENU) || 
+    if (this->configMode == CM_QUEST_MENU || (this->configMode == CM_ROTATE_TO_QUEST_MENU) ||
         this->configMode == CM_ROTATE_TO_NAME_ENTRY || this->configMode == CM_QUEST_TO_MAIN ||
         this->configMode == CM_NAME_ENTRY_TO_QUEST_MENU || this->configMode == CM_ROTATE_TO_BOSS_RUSH_MENU ||
-        this->configMode == CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU || this->configMode == CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
+        this->configMode == CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU ||
+        this->configMode == CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU) {
         // window
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@@ -2840,8 +3075,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
         Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
         Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY);
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
         gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL);
@@ -2861,7 +3095,8 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
     if (this->configMode == CM_BOSS_RUSH_MENU || this->configMode == CM_ROTATE_TO_BOSS_RUSH_MENU ||
         this->configMode == CM_START_BOSS_RUSH_MENU || this->configMode == CM_BOSS_RUSH_TO_QUEST ||
         this->configMode == CM_RANDOMIZER_SETTINGS_MENU || this->configMode == CM_ROTATE_TO_RANDOMIZER_SETTINGS_MENU ||
-        this->configMode == CM_START_RANDOMIZER_SETTINGS_MENU || this->configMode == CM_RANDOMIZER_SETTINGS_MENU_TO_QUEST) {
+        this->configMode == CM_START_RANDOMIZER_SETTINGS_MENU ||
+        this->configMode == CM_RANDOMIZER_SETTINGS_MENU_TO_QUEST) {
         // window
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@@ -2990,18 +3225,22 @@ void FileChoose_ConfirmFile(GameState* thisx) {
     if (CHECK_BTN_ALL(input->press.button, BTN_START) || (CHECK_BTN_ALL(input->press.button, BTN_A))) {
         if (this->confirmButtonIndex == FS_BTN_CONFIRM_YES) {
             func_800AA000(300.0f, 180, 20, 100);
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->selectMode = SM_FADE_OUT;
             func_800F6964(0xF);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->selectMode++;
         }
     } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->selectMode++;
     } else if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->confirmButtonIndex ^= 1;
     }
 
@@ -3110,11 +3349,13 @@ void FileChoose_LoadGame(GameState* thisx) {
     u16 swordEquipValue;
     s32 pad;
 
-    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     gSaveContext.fileNum = this->buttonIndex;
     gSaveContext.gameMode = GAMEMODE_NORMAL;
 
-    if ((this->buttonIndex == FS_BTN_SELECT_FILE_1 && CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) || this->buttonIndex == 0xFF) {
+    if ((this->buttonIndex == FS_BTN_SELECT_FILE_1 && CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0)) ||
+        this->buttonIndex == 0xFF) {
         if (this->buttonIndex == 0xFF) {
             Sram_InitDebugSave();
         } else {
@@ -3143,8 +3384,8 @@ void FileChoose_LoadGame(GameState* thisx) {
     if (!CVarGetInteger(CVAR_ENHANCEMENT("DogFollowsEverywhere"), 0)) {
         gSaveContext.dogParams = 0;
     }
-    gSaveContext.timer1State = 0;
-    gSaveContext.timer2State = 0;
+    gSaveContext.timerState = 0;
+    gSaveContext.subTimerState = 0;
     gSaveContext.eventInf[0] = 0;
     gSaveContext.eventInf[1] = 0;
     gSaveContext.eventInf[2] = 0;
@@ -3167,7 +3408,7 @@ void FileChoose_LoadGame(GameState* thisx) {
         gSaveContext.buttonStatus[buttonIndex] = BTN_ENABLED;
     }
 
-    gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC =
+    gSaveContext.forceRisingButtonAlphas = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC =
         gSaveContext.magicCapacity = 0;
 
     gSaveContext.magicFillTarget = gSaveContext.magic;
@@ -3227,8 +3468,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) {
     Matrix_Translate(0.0f, 0.0f, -93.6f, MTXMODE_NEW);
     Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
     Matrix_RotateX(this->windowRot / 100.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
     gSPDisplayList(POLY_OPA_DISP++, gFileSelWindow1DL);
@@ -3264,7 +3504,10 @@ static const char* randoVersionWarningText[] = {
     // German
     "Dieser Spielstand wurde auf einer anderen Version\nvon SoH erstellt.\nEs könnten Fehler auftreten.",
     // French
-    "Cette sauvegarde a été créée sur une version\ndifférente de SoH.\nCertaines fonctionnalités peuvent être corrompues."
+    "Cette sauvegarde a été créée sur une version\ndifférente de SoH.\nCertaines fonctionnalités peuvent être "
+    "corrompues.",
+    // Japanese NTSC TODO:
+    "This save was created on a different version of SoH.\nThings may be broken. Play at your own risk.",
 };
 
 void FileChoose_DrawRandoSaveVersionWarning(GameState* thisx) {
@@ -3274,10 +3517,9 @@ void FileChoose_DrawRandoSaveVersionWarning(GameState* thisx) {
 
     // Draw rando seed warning when build version doesn't match for Major or Minor number
     for (int fileIndex = 0; fileIndex < 3; fileIndex++) {
-        if (Save_GetSaveMetaInfo(fileIndex)->randoSave == 1 &&
-            this->menuMode == FS_MENU_MODE_SELECT &&
+        if (Save_GetSaveMetaInfo(fileIndex)->randoSave == 1 && this->menuMode == FS_MENU_MODE_SELECT &&
             (gBuildVersionMajor != Save_GetSaveMetaInfo(fileIndex)->buildVersionMajor ||
-            gBuildVersionMinor != Save_GetSaveMetaInfo(fileIndex)->buildVersionMinor)) {
+             gBuildVersionMinor != Save_GetSaveMetaInfo(fileIndex)->buildVersionMinor)) {
 
             // Use file info alpha to match fading
             u8 textAlpha = this->fileInfoAlpha[fileIndex];
@@ -3286,7 +3528,9 @@ void FileChoose_DrawRandoSaveVersionWarning(GameState* thisx) {
             }
 
             // Compute the height for a "squished" textbox texture
-            s16 height = gSaveContext.language == LANGUAGE_ENG ? 32 : 40; // English is only 2 lines
+            s16 height = ((gSaveContext.language == LANGUAGE_ENG) || (gSaveContext.language == LANGUAGE_JPN))
+                             ? 32
+                             : 40; // English is only 2 lines
             // float math to get a S5.10 number that will squish the texture
             f32 texCoordinateHeightF = 512 / ((f32)height / 64);
             s16 texCoordinateHeightScale = texCoordinateHeightF + 0.5f;
@@ -3317,13 +3561,18 @@ void FileChoose_Main(GameState* thisx) {
         gFileSelControlsENGTex,
         gFileSelControlsGERTex,
         gFileSelControlsFRATex,
+        gFileSelControlsJPNTex,
     };
     FileChooseContext* this = (FileChooseContext*)thisx;
     Input* input = &this->state.input[0];
 
     Color_RGB8 helpTextColor = { 100, 255, 255 };
+
+    GameInteractor_ExecuteOnFileChooseMain(thisx);
+
     if (CVarGetInteger(CVAR_COSMETIC("Title.FileChoose.Changed"), 0)) {
-        Color_RGB8 backgroundColor = CVarGetColor24(CVAR_COSMETIC("Title.FileChoose.Value"), (Color_RGB8){ 100, 150, 255 });
+        Color_RGB8 backgroundColor =
+            CVarGetColor24(CVAR_COSMETIC("Title.FileChoose.Value"), (Color_RGB8){ 100, 150, 255 });
         this->windowColor[0] = backgroundColor.r;
         this->windowColor[1] = backgroundColor.g;
         this->windowColor[2] = backgroundColor.b;
@@ -3348,10 +3597,6 @@ void FileChoose_Main(GameState* thisx) {
         sWindowContentColors[0][2] = 255;
     }
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("TimeFlowFileSelect"), 0) != 0) {
-        gSaveContext.skyboxTime += 0x10;
-    }
-
     OPEN_DISPS(this->state.gfxCtx);
 
     this->n64ddFlag = 0;
@@ -3723,8 +3968,7 @@ void FileChoose_Init(GameState* thisx) {
     size = (u32)_parameter_staticSegmentRomEnd - (u32)_parameter_staticSegmentRomStart;
     this->parameterSegment = GAMESTATE_ALLOC_MC(&this->state, size);
     assert(this->parameterSegment != NULL);
-    DmaMgr_SendRequest1(this->parameterSegment, (u32)_parameter_staticSegmentRomStart, size, __FILE__,
-                        __LINE__);
+    DmaMgr_SendRequest1(this->parameterSegment, (u32)_parameter_staticSegmentRomStart, size, __FILE__, __LINE__);
 
     // Load some registers used by the dialog system
     Regs_InitData(NULL); // Passing in NULL as we dont have a playstate, and it isn't used in the func
@@ -3734,7 +3978,11 @@ void FileChoose_Init(GameState* thisx) {
     this->state.main = FileChoose_Main;
     this->state.destroy = FileChoose_Destroy;
     FileChoose_InitContext(&this->state);
-    Font_LoadOrderedFont(&this->font);
+    if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) {
+        Font_LoadOrderedFont(&this->font);
+    } else { // GAME_REGION_NTSC
+        Font_LoadOrderedFontNTSC(&this->font);
+    }
     Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA);
     func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
 }
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
index 89092e77cf..fe8c33fa1e 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
@@ -74,20 +74,24 @@ void FileChoose_SelectCopySource(GameState* thisx) {
         this->nextTitleLabel = FS_TITLE_SELECT_FILE;
         this->configMode = CM_COPY_RETURN_MAIN;
         this->warningLabel = FS_WARNING_NONE;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
         if (Save_GetSaveMetaInfo(this->buttonIndex)->valid) {
             this->actionTimer = 8;
             this->selectedFileIndex = this->buttonIndex;
             this->configMode = CM_SETUP_COPY_DEST_1;
             this->nextTitleLabel = FS_TITLE_COPY_TO;
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else {
         if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
             if ((this->stickRelY >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
                 this->buttonIndex--;
@@ -190,21 +194,25 @@ void FileChoose_SelectCopyDest(GameState* thisx) {
         this->nextTitleLabel = FS_TITLE_COPY_FROM;
         this->actionTimer = 8;
         this->configMode = CM_EXIT_TO_COPY_SOURCE_1;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
         if (!Save_GetSaveMetaInfo(this->buttonIndex)->valid) {
             this->copyDestFileIndex = this->buttonIndex;
             this->nextTitleLabel = FS_TITLE_COPY_CONFIRM;
             this->actionTimer = 8;
             this->configMode = CM_SETUP_COPY_CONFIRM_1;
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else {
 
         if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
             if ((this->stickRelY >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
                 this->buttonIndex--;
@@ -378,7 +386,8 @@ void FileChoose_CopyConfirm(GameState* thisx) {
         this->actionTimer = 8;
         this->nextTitleLabel = FS_TITLE_COPY_TO;
         this->configMode = CM_RETURN_TO_COPY_DEST;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
         dayTime = gSaveContext.dayTime;
         Save_CopyFile(this->selectedFileIndex, this->copyDestFileIndex);
@@ -388,9 +397,11 @@ void FileChoose_CopyConfirm(GameState* thisx) {
         this->actionTimer = 8;
         this->configMode = CM_COPY_ANIM_1;
         func_800AA000(300.0f, 0xB4, 0x14, 0x64);
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->buttonIndex ^= 1;
     }
 
@@ -505,7 +516,8 @@ void FileChoose_CopyAnim3(GameState* thisx) {
 
     if (this->actionTimer == 75) {
         this->connectorAlpha[this->copyDestFileIndex] = 255;
-        Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 
     this->actionTimer--;
@@ -515,7 +527,8 @@ void FileChoose_CopyAnim3(GameState* thisx) {
             this->actionTimer = 8;
             this->nextTitleLabel = FS_TITLE_SELECT_FILE;
             this->configMode++;
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 }
@@ -705,20 +718,24 @@ void FileChoose_EraseSelect(GameState* thisx) {
         this->nextTitleLabel = FS_TITLE_SELECT_FILE;
         this->configMode = CM_EXIT_ERASE_TO_MAIN;
         this->warningLabel = FS_WARNING_NONE;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
         if (Save_GetSaveMetaInfo(this->buttonIndex)->valid) {
             this->actionTimer = 8;
             this->selectedFileIndex = this->buttonIndex;
             this->configMode = CM_SETUP_ERASE_CONFIRM_1;
             this->nextTitleLabel = FS_TITLE_ERASE_CONFIRM;
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else {
         if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
             if ((this->stickRelY >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
                 this->buttonIndex--;
@@ -846,17 +863,20 @@ void FileChoose_EraseConfirm(GameState* thisx) {
         this->nextTitleLabel = FS_TITLE_ERASE_FILE;
         this->configMode = CM_EXIT_TO_ERASE_SELECT_1;
         this->actionTimer = 8;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     } else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
         this->connectorAlpha[this->selectedFileIndex] = 0;
-        Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->actionTimer = 8;
         this->configMode = CM_ERASE_ANIM_1;
         this->nextTitleLabel = FS_TITLE_ERASE_COMPLETE;
         func_800AA000(200.0f, 0xFF, 0x14, 0x96);
         sEraseDelayTimer = 15;
     } else if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->buttonIndex ^= 1;
     }
 
@@ -972,7 +992,8 @@ void FileChoose_EraseAnim1(GameState* thisx) {
         sEraseDelayTimer--;
 
         if (sEraseDelayTimer == 0) {
-            Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 }
@@ -990,7 +1011,8 @@ void FileChoose_EraseAnim2(GameState* thisx) {
         this->actionTimer = 8;
         this->nextTitleLabel = FS_TITLE_SELECT_FILE;
         this->configMode++;
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c
new file mode 100644
index 0000000000..6d1e1d5756
--- /dev/null
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c
@@ -0,0 +1,1307 @@
+#include "file_choose.h"
+#include "textures/title_static/title_static.h"
+#include "assets/overlays/ovl_File_Choose/ovl_file_choose.h"
+#include "assets/soh_assets.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/SaveManager.h"
+#include "soh/ResourceManagerHelpers.h"
+
+// File based on matching decomp for z_file_nameset_NES on N64 1.0 https://decomp.me/scratch/1tru6
+// Edited to follow port's stage of documentation and implemented enhancements found in z_file_nameset_PAL.c
+
+// Language Enums were changed between NTSC and PAL, so using (gSaveContext.language == LANGUAGE_ENG)
+// as a substitute for indexing arrays with just gSaveContext.language
+
+#define NTSC_LANGUAGE_INDEX (gSaveContext.language == LANGUAGE_ENG)
+
+// DATA
+
+static void* sNameLabelTexturesNES[] = {
+    gFileSelNameJPNTex,
+    gFileSelNameENGTex,
+};
+
+static void* sBackspaceEndTexturesNES[] = {
+    gFileSelHiraganaButtonTex,  gFileSelKatakanaButtonTex, gFileSelKanjiButtonTex,
+    gFileSelBackspaceButtonTex, gFileSelENDButtonENGTex,
+};
+
+static s16 sBackspaceEndWidthsNES[] = { 44, 44, 28, 28, 44 };
+
+typedef struct {
+    void* texture[2];
+    u16 width;
+    u16 height;
+} OptionsMenuTextureInfoNES; // size = 0x8
+
+static OptionsMenuTextureInfoNES sOptionsMenuHeaders[] = {
+    { { gFileSelOptionsJPNTex, gFileSelOptionsENGTex }, 128, 16 },
+    { { gFileSelSOUNDENGTex, gFileSelSOUNDENGTex }, 64, 16 },
+    { { gFileSelLTargetingJPNTex, gFileSelLTargetingENGTex }, 64, 16 },
+    { { gFileSelCheckBrightnessJPNTex, gFileSelCheckBrightnessENGNTSCTex }, 96, 16 },
+};
+
+static OptionsMenuTextureInfoNES sOptionsMenuSettings[] = {
+    { { gFileSelStereoJPNTex, gFileSelStereoENGTex }, 48, 16 },
+    { { gFileSelMonoJPNTex, gFileSelMonoENGTex }, 48, 16 },
+    { { gFileSelHeadsetJPNTex, gFileSelHeadsetENGTex }, 48, 16 },
+    { { gFileSelSurroundJPNTex, gFileSelSurroundENGTex }, 48, 16 },
+    { { gFileSelSwitchJPNTex, gFileSelSwitchENGTex }, 48, 16 },
+    { { gFileSelHoldJPNTex, gFileSelHoldENGTex }, 48, 16 },
+};
+
+// CODE
+
+void FileChoose_DrawCharacterNES(GraphicsContext* gfxCtx, void* texture, s16 vtx) {
+    OPEN_DISPS(gfxCtx);
+
+    gDPLoadTextureBlock_4b(POLY_OPA_DISP++, texture, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP,
+                           G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+
+    CLOSE_DISPS(gfxCtx);
+}
+
+void FileChoose_DrawMultiTexQuadI4NES(GraphicsContext* gfxCtx, void* texture1, void* texture2, s16 vtx) {
+    OPEN_DISPS(gfxCtx);
+
+    gDPLoadTextureBlock_4b(POLY_OPA_DISP++, texture1, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadMultiBlock_4b(POLY_OPA_DISP++, texture2, 0x0080, 1, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+    gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+
+    CLOSE_DISPS(gfxCtx);
+}
+
+void FileChoose_SetKeyboardVtxNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    s16 val;
+    s16 phi_t2;
+    s16 phi_t0;
+    s16 phi_t3;
+    s16 phi_s1;
+    s16 phi_t1;
+    s16 phi_s2;
+
+    this->keyboardVtx = Graph_Alloc(this->state.gfxCtx, sizeof(Vtx) * 4 * 5 * 13);
+    phi_s1 = 0x26;
+
+    for (phi_s2 = 0, phi_t3 = 0; phi_s2 < 5; phi_s2++) {
+        for (phi_t0 = -0x60, phi_t1 = 0; phi_t1 < 13; phi_t1++, phi_t3 += 4) {
+            this->keyboardVtx[phi_t3 + 2].v.ob[0] = phi_t0;
+
+            this->keyboardVtx[phi_t3].v.ob[0] = this->keyboardVtx[phi_t3 + 2].v.ob[0];
+
+            this->keyboardVtx[phi_t3 + 1].v.ob[0] = this->keyboardVtx[phi_t3 + 3].v.ob[0] = phi_t0 + 0xC;
+
+            this->keyboardVtx[phi_t3 + 1].v.ob[1] = phi_s1;
+
+            this->keyboardVtx[phi_t3].v.ob[1] = this->keyboardVtx[phi_t3 + 1].v.ob[1];
+
+            this->keyboardVtx[phi_t3 + 2].v.ob[1] = this->keyboardVtx[phi_t3 + 3].v.ob[1] = phi_s1 - 0xC;
+
+            this->keyboardVtx[phi_t3].v.ob[2] = this->keyboardVtx[phi_t3 + 1].v.ob[2] =
+                this->keyboardVtx[phi_t3 + 2].v.ob[2] = this->keyboardVtx[phi_t3 + 3].v.ob[2] = 0;
+
+            this->keyboardVtx[phi_t3].v.flag = this->keyboardVtx[phi_t3 + 1].v.flag =
+                this->keyboardVtx[phi_t3 + 2].v.flag = this->keyboardVtx[phi_t3 + 3].v.flag = 0;
+
+            this->keyboardVtx[phi_t3].v.tc[0] = this->keyboardVtx[phi_t3].v.tc[1] =
+                this->keyboardVtx[phi_t3 + 1].v.tc[1] = this->keyboardVtx[phi_t3 + 2].v.tc[0] = 0;
+
+            this->keyboardVtx[phi_t3 + 1].v.tc[0] = this->keyboardVtx[phi_t3 + 2].v.tc[1] =
+                this->keyboardVtx[phi_t3 + 3].v.tc[0] = this->keyboardVtx[phi_t3 + 3].v.tc[1] = 16 << 5;
+
+            this->keyboardVtx[phi_t3].v.cn[0] = this->keyboardVtx[phi_t3 + 1].v.cn[0] =
+                this->keyboardVtx[phi_t3 + 2].v.cn[0] = this->keyboardVtx[phi_t3 + 3].v.cn[0] =
+                    this->keyboardVtx[phi_t3].v.cn[1] = this->keyboardVtx[phi_t3 + 1].v.cn[1] =
+                        this->keyboardVtx[phi_t3 + 2].v.cn[1] = this->keyboardVtx[phi_t3 + 3].v.cn[1] =
+                            this->keyboardVtx[phi_t3].v.cn[2] = this->keyboardVtx[phi_t3 + 1].v.cn[2] =
+                                this->keyboardVtx[phi_t3 + 2].v.cn[2] = this->keyboardVtx[phi_t3 + 3].v.cn[2] =
+                                    this->keyboardVtx[phi_t3].v.cn[3] = this->keyboardVtx[phi_t3 + 1].v.cn[3] =
+                                        this->keyboardVtx[phi_t3 + 2].v.cn[3] = this->keyboardVtx[phi_t3 + 3].v.cn[3] =
+                                            255;
+            phi_t0 += 0x10;
+        }
+        phi_s1 -= 0x10;
+    }
+}
+
+void FileChoose_SetNameEntryVtxNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    Font* font = &this->font;
+    s16 var_s0;
+    s16 var_t2;
+    s16 var_v0;
+    u8* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName;
+
+    OPEN_DISPS(this->state.gfxCtx);
+
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
+                      ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
+
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[FS_TITLE_CUR]);
+
+    gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
+
+    gSPVertex(POLY_OPA_DISP++, D_80811BB0_NTSC, 24, 0);
+
+    gDPLoadTextureBlock(POLY_OPA_DISP++, sNameLabelTexturesNES[NTSC_LANGUAGE_INDEX], G_IM_FMT_IA, G_IM_SIZ_8b, 56, 16,
+                        0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                        G_TX_NOLOD);
+
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+    gDPPipeSync(POLY_OPA_DISP++);
+
+    for (var_t2 = 0, var_s0 = 4; var_t2 < 5; var_t2++, var_s0 += 4) {
+        if (gSaveContext.language == LANGUAGE_JPN) {
+            gDPPipeSync(POLY_OPA_DISP++);
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2],
+                            255);
+            gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
+
+            gDPLoadTextureBlock(POLY_OPA_DISP++, sBackspaceEndTexturesNES[var_t2], G_IM_FMT_IA, G_IM_SIZ_16b,
+                                sBackspaceEndWidthsNES[var_t2], 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+            gSP1Quadrangle(POLY_OPA_DISP++, var_s0, var_s0 + 2, var_s0 + 3, var_s0 + 1, 0);
+        } else if (var_t2 >= 3) {
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2],
+                            255);
+            gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
+
+            gDPLoadTextureBlock(POLY_OPA_DISP++, sBackspaceEndTexturesNES[var_t2], G_IM_FMT_IA, G_IM_SIZ_16b,
+                                sBackspaceEndWidthsNES[var_t2], 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+            gSP1Quadrangle(POLY_OPA_DISP++, var_s0, var_s0 + 2, var_s0 + 3, var_s0 + 1, 0);
+        }
+    }
+
+    this->nameEntryVtx = Graph_Alloc(this->state.gfxCtx, 44 * sizeof(Vtx));
+
+    for (var_s0 = 0, var_t2 = 0; var_t2 < 44; var_t2 += 4, var_s0++) {
+        this->nameEntryVtx[var_t2].v.ob[0] = this->nameEntryVtx[var_t2 + 2].v.ob[0] =
+            D_808125EC[var_s0] + this->nameEntryBoxPosX;
+
+        this->nameEntryVtx[var_t2 + 1].v.ob[0] = this->nameEntryVtx[var_t2 + 3].v.ob[0] =
+            this->nameEntryVtx[var_t2].v.ob[0] + 0xA;
+
+        this->nameEntryVtx[var_t2].v.ob[1] = this->nameEntryVtx[var_t2 + 1].v.ob[1] = D_80812604[var_s0];
+
+        this->nameEntryVtx[var_t2 + 2].v.ob[1] = this->nameEntryVtx[var_t2 + 3].v.ob[1] =
+            this->nameEntryVtx[var_t2].v.ob[1] - 0xA;
+
+        this->nameEntryVtx[var_t2].v.ob[2] = this->nameEntryVtx[var_t2 + 1].v.ob[2] =
+            this->nameEntryVtx[var_t2 + 2].v.ob[2] = this->nameEntryVtx[var_t2 + 3].v.ob[2] = 0;
+
+        this->nameEntryVtx[var_t2].v.flag = this->nameEntryVtx[var_t2 + 1].v.flag =
+            this->nameEntryVtx[var_t2 + 2].v.flag = this->nameEntryVtx[var_t2 + 3].v.flag = 0;
+
+        this->nameEntryVtx[var_t2].v.tc[0] = this->nameEntryVtx[var_t2].v.tc[1] =
+            this->nameEntryVtx[var_t2 + 1].v.tc[1] = this->nameEntryVtx[var_t2 + 2].v.tc[0] = 0;
+
+        this->nameEntryVtx[var_t2 + 1].v.tc[0] = this->nameEntryVtx[var_t2 + 2].v.tc[1] =
+            this->nameEntryVtx[var_t2 + 3].v.tc[0] = this->nameEntryVtx[var_t2 + 3].v.tc[1] = 0x200;
+
+        this->nameEntryVtx[var_t2].v.cn[0] = this->nameEntryVtx[var_t2 + 1].v.cn[0] =
+            this->nameEntryVtx[var_t2 + 2].v.cn[0] = this->nameEntryVtx[var_t2 + 3].v.cn[0] =
+                this->nameEntryVtx[var_t2].v.cn[1] = this->nameEntryVtx[var_t2 + 1].v.cn[1] =
+                    this->nameEntryVtx[var_t2 + 2].v.cn[1] = this->nameEntryVtx[var_t2 + 3].v.cn[1] =
+                        this->nameEntryVtx[var_t2].v.cn[2] = this->nameEntryVtx[var_t2 + 1].v.cn[2] =
+                            this->nameEntryVtx[var_t2 + 2].v.cn[2] = this->nameEntryVtx[var_t2 + 3].v.cn[2] =
+                                this->nameEntryVtx[var_t2].v.cn[3] = this->nameEntryVtx[var_t2 + 1].v.cn[3] =
+                                    this->nameEntryVtx[var_t2 + 2].v.cn[3] = this->nameEntryVtx[var_t2 + 3].v.cn[3] =
+                                        0xFF;
+    }
+
+    this->nameEntryVtx[1].v.ob[0] = this->nameEntryVtx[3].v.ob[0] = this->nameEntryVtx[0].v.ob[0] + 0x6C;
+    this->nameEntryVtx[2].v.ob[1] = this->nameEntryVtx[3].v.ob[1] = this->nameEntryVtx[0].v.ob[1] - 0x10;
+    this->nameEntryVtx[1].v.tc[0] = this->nameEntryVtx[3].v.tc[0] = 108 << 5;
+
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
+                      ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2],
+                    this->nameEntryBoxAlpha);
+    gSPVertex(POLY_OPA_DISP++, this->nameEntryVtx, 4, 0);
+    gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelNameBoxTex, G_IM_FMT_IA, G_IM_SIZ_16b, 108, 16, 0,
+                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                        G_TX_NOLOD);
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
+                      PRIMITIVE, 0);
+    gSPVertex(POLY_OPA_DISP++, this->nameEntryVtx + 4, 32, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->nameEntryBoxAlpha);
+
+    for (var_s0 = 0, var_v0 = 0; var_s0 < 0x20; var_s0 += 4, var_v0++) {
+        FileChoose_DrawCharacterNES(this->state.gfxCtx, font->fontBuf + filename[var_v0] * FONT_CHAR_TEX_SIZE, var_s0);
+    }
+
+    this->nameEntryVtx[37].v.tc[0] = this->nameEntryVtx[38].v.tc[1] = this->nameEntryVtx[39].v.tc[0] =
+        this->nameEntryVtx[39].v.tc[1] = this->nameEntryVtx[41].v.tc[0] = this->nameEntryVtx[42].v.tc[1] =
+            this->nameEntryVtx[43].v.tc[0] = this->nameEntryVtx[43].v.tc[1] = 24 << 5;
+
+    if ((this->kbdButton == FS_KBD_BTN_HIRA) || (this->kbdButton == FS_KBD_BTN_KATA) ||
+        (this->kbdButton == FS_KBD_BTN_END)) {
+        this->nameEntryVtx[41].v.tc[0] = this->nameEntryVtx[43].v.tc[0] = 56 << 5;
+    } else if ((this->kbdButton == FS_KBD_BTN_ENG) || (this->kbdButton == FS_KBD_BTN_BACKSPACE)) {
+        this->nameEntryVtx[41].v.tc[0] = this->nameEntryVtx[43].v.tc[0] = 40 << 5;
+    }
+
+    CLOSE_DISPS(this->state.gfxCtx);
+}
+
+void FileChoose_DrawKeyboardNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    Font* font = &this->font;
+    s16 i;
+    s16 vtx;
+    s16 var_s1;
+
+    vtx = 0;
+    i = 0;
+
+    OPEN_DISPS(this->state.gfxCtx);
+
+    Gfx_SetupDL_42Opa(this->state.gfxCtx);
+
+    gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
+    gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_XLU_SURF2);
+    gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, 0, 0, 0, COMBINED, 0,
+                      0, 0, COMBINED);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, this->charBgAlpha, 255, 255, 255, 255);
+
+    if ((this->charPage == 0) || (this->charPage == 3) || (this->charPage == 5)) {
+        if (this->charPage != 5) {
+            for (; vtx < 0x100; vtx += 0x20) {
+                gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+                for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                    FileChoose_DrawMultiTexQuadI4NES(
+                        this->state.gfxCtx, font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE,
+                        font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE, var_s1);
+                }
+            }
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+            FileChoose_DrawMultiTexQuadI4NES(this->state.gfxCtx,
+                                             font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE,
+                                             font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE, 0);
+        } else {
+            for (; vtx < 0x100; vtx += 0x20) {
+                gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+                for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                    FileChoose_DrawMultiTexQuadI4NES(
+                        this->state.gfxCtx, font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE,
+                        font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE, var_s1);
+                }
+            }
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+            FileChoose_DrawMultiTexQuadI4NES(
+                this->state.gfxCtx, font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE,
+                font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE, 0);
+        }
+    } else if ((this->charPage == 1) || (this->charPage == 4) || (this->charPage == 7)) {
+        if (this->charPage != 7) {
+            for (; vtx < 0x100; vtx += 0x20) {
+                gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+                for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                    FileChoose_DrawMultiTexQuadI4NES(
+                        this->state.gfxCtx, font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE,
+                        font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE, var_s1);
+                }
+            }
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+            FileChoose_DrawMultiTexQuadI4NES(this->state.gfxCtx,
+                                             font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE,
+                                             font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE, 0);
+        } else {
+            for (; vtx < 0x100; vtx += 0x20) {
+                gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+                for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                    FileChoose_DrawMultiTexQuadI4NES(
+                        this->state.gfxCtx, font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE,
+                        font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE, var_s1);
+                }
+            }
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+            FileChoose_DrawMultiTexQuadI4NES(
+                this->state.gfxCtx, font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE,
+                font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE, 0);
+        }
+    } else if (this->charPage != 8) {
+        for (; vtx < 0x100; vtx += 0x20) {
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+            for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                FileChoose_DrawMultiTexQuadI4NES(
+                    this->state.gfxCtx, font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE,
+                    font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE, var_s1);
+            }
+        }
+        gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+        FileChoose_DrawMultiTexQuadI4NES(this->state.gfxCtx,
+                                         font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE,
+                                         font->fontBuf + gKeyboardCharactersHiragana[i] * FONT_CHAR_TEX_SIZE, 0);
+    } else {
+        for (; vtx < 0x100; vtx += 0x20) {
+            gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[vtx], 32, 0);
+
+            for (var_s1 = 0; var_s1 < 0x20; i++, var_s1 += 4) {
+                FileChoose_DrawMultiTexQuadI4NES(
+                    this->state.gfxCtx, font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE,
+                    font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE, var_s1);
+            }
+        }
+        gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
+        FileChoose_DrawMultiTexQuadI4NES(this->state.gfxCtx,
+                                         font->fontBuf + gKeyboardCharactersAlphanumeric[i] * FONT_CHAR_TEX_SIZE,
+                                         font->fontBuf + gKeyboardCharactersKatakana[i] * FONT_CHAR_TEX_SIZE, 0);
+    }
+
+    CLOSE_DISPS(this->state.gfxCtx);
+}
+
+s16 D_80812C48_ne0[] = { 15, 35, 65, 80, 85, 95, 115, 145, 160, 165, 92, 170 };
+
+s16 D_80812C60_ne0[] = { 30 - 1, 40 - 1, 80 - 1, 85 - 1, 90 - 1, 110 - 1, 120 - 1, 160 - 1, 165 - 1, 170 - 1, 92, 170 };
+
+s16 D_80812C78_ne0[] = { 50, 45, -50, 5, -50, 50, 45, -50, 5, -50, 78, -78 };
+
+s16 D_80812C90_ne0[] = { 15, 35, 85, 95, 115, 165, 92, 170 };
+
+s16 D_80812CA0_ne0[] = { 30 - 1, 40 - 1, 90 - 1, 110 - 1, 120 - 1, 170 - 1, 92, 170 };
+
+s16 D_80812CB0_ne0[] = { 50, 45, -5, 50, 45, -5, 78, -78 };
+
+s16 D_80812CC0_ne0[] = { 35, 80, 115, 160 };
+
+s16 D_80812CC8_ne0[] = { 40 - 1, 85 - 1, 120 - 1, 165 - 1 };
+
+s16 D_80812CD0_ne0[] = { 50, 5, 50, 5 };
+
+s32 func_80808480_ne0(GameState* thisx, s16 arg1, s16 arg2) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    s16 var_v1;
+    s32 temp_a1;
+    u8* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName;
+
+    if (arg1 == 0xDF) {
+        for (var_v1 = 0; var_v1 < 12U; var_v1++) {
+            if (filename[arg2] >= D_80812C48_ne0[var_v1] && D_80812C60_ne0[var_v1] >= filename[arg2]) {
+                filename[arg2] = D_80812C78_ne0[var_v1] + filename[arg2];
+                return true;
+            }
+        }
+    } else if (arg1 == 0xE7) {
+        for (var_v1 = 0; var_v1 < 8U; var_v1++) {
+            if (filename[arg2] >= D_80812C90_ne0[var_v1] && D_80812CA0_ne0[var_v1] >= filename[arg2]) {
+                filename[arg2] = D_80812CB0_ne0[var_v1] + filename[arg2];
+                return true;
+            }
+        }
+    } else if (arg1 == 0xE8) {
+        for (var_v1 = 0; var_v1 < 4U; var_v1++) {
+            if ((filename[arg2] >= D_80812CC0_ne0[var_v1]) && (D_80812CC8_ne0[var_v1] >= filename[arg2])) {
+                filename[arg2] = D_80812CD0_ne0[var_v1] + filename[arg2];
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+s32 func_80808688_ne0(GameState* thisx, s16 arg1) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    s32 pad;
+
+    if (!func_80808480_ne0(&this->state, arg1, this->newFileNameCharCount)) {
+        if (this->newFileNameCharCount != 0) {
+            if (!func_80808480_ne0(&this->state, arg1, this->newFileNameCharCount - 1)) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    return true;
+}
+
+void FileChoose_DrawNameEntryNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    Font* font = &this->font;
+    Input* input = &this->state.input[0];
+    s16 i;
+    s16 tmp;
+    u16 dayTime;
+    s16 validName;
+    u8* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName;
+    OPEN_DISPS(this->state.gfxCtx);
+
+    FileChoose_SetKeyboardVtxNES(&this->state);
+    FileChoose_SetNameEntryVtxNES(&this->state);
+    FileChoose_PulsateCursor(&this->state);
+
+    Vtx* vertices = ResourceMgr_LoadVtxByName(D_80811BB0_NTSC);
+
+    tmp = (this->newFileNameCharCount * 4) + 4;
+
+    this->nameEntryVtx[0x24].v.ob[0] = this->nameEntryVtx[0x26].v.ob[0] = this->nameEntryVtx[tmp].v.ob[0] - 6;
+
+    this->nameEntryVtx[0x25].v.ob[0] = this->nameEntryVtx[0x27].v.ob[0] = this->nameEntryVtx[0x24].v.ob[0] + 24;
+
+    this->nameEntryVtx[0x24].v.ob[1] = this->nameEntryVtx[0x25].v.ob[1] = this->nameEntryVtx[tmp].v.ob[1] + 7;
+
+    this->nameEntryVtx[0x26].v.ob[1] = this->nameEntryVtx[0x27].v.ob[1] = this->nameEntryVtx[0x24].v.ob[1] - 24;
+
+    if ((this->kbdButton == 0) || (this->kbdButton == 1) || (this->kbdButton == 4)) {
+        if (this->kbdX != this->kbdButton) {
+            osSyncPrintf("014 xpos=%d  contents=%d\n", this->kbdX, this->kbdButton);
+        }
+        this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = vertices[(this->kbdX + 1) * 4].v.ob[0] - 4;
+
+        this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 52;
+
+        this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = vertices[(this->kbdX + 1) * 4].v.ob[1] + 4;
+    } else if ((this->kbdButton == 2) || (this->kbdButton == 3)) {
+        if (this->kbdX != this->kbdButton) {
+            osSyncPrintf("23 xpos=%d  contents=%d\n", this->kbdX, this->kbdButton);
+        }
+        this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = vertices[(this->kbdX + 1) * 4].v.ob[0] - 4;
+
+        this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 40;
+
+        this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = vertices[(this->kbdX + 1) * 4].v.ob[1] + 4;
+    } else {
+        if (this->charIndex >= 65) {
+            osSyncPrintf("mjp=%d  xpos=%d  ypos=%d  name_contents=%d\n", this->charIndex, this->kbdX, this->kbdY,
+                         this->kbdButton);
+        }
+        this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] =
+            this->keyboardVtx[this->charIndex * 4].v.ob[0] - 6;
+
+        this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 0x18;
+
+        this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] =
+            this->keyboardVtx[this->charIndex * 4].v.ob[1] + 6;
+    }
+
+    this->nameEntryVtx[42].v.ob[1] = this->nameEntryVtx[43].v.ob[1] = this->nameEntryVtx[40].v.ob[1] - 24;
+
+    gSPVertex(POLY_OPA_DISP++, &this->nameEntryVtx[36], 8, 0);
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0,
+                      PRIMITIVE, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->highlightColor[0], this->highlightColor[1], this->highlightColor[2],
+                    this->highlightColor[3]);
+    gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelCharHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 24, 24, 0,
+                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                        G_TX_NOLOD);
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+
+    if ((this->kbdButton == 0) || (this->kbdButton == 1) || (this->kbdButton == 4)) {
+        gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelMediumButtonHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 56, 24, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
+    } else if ((this->kbdButton == 2) || (this->kbdButton == 3)) {
+        gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelSmallButtonHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 40, 24, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
+    }
+
+    gSP1Quadrangle(POLY_OPA_DISP++, 4, 6, 7, 5, 0);
+
+    FileChoose_DrawKeyboardNES(&this->state);
+
+    gDPPipeSync(POLY_OPA_DISP++);
+
+    Gfx_SetupDL_42Opa(this->state.gfxCtx);
+
+    gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
+                      PRIMITIVE, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
+
+    if (this->configMode == CM_NAME_ENTRY) {
+        if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            this->kbdY = 5;
+            this->kbdX = 4;
+        } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
+            if ((this->newFileNameCharCount == 7) && (filename[7] != 0xDF)) {
+                for (i = this->newFileNameCharCount; i < 7; i++) {
+                    filename[i] = filename[i + 1];
+                }
+                filename[i] = 0xDF;
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            } else {
+                this->newFileNameCharCount--;
+                if (this->newFileNameCharCount < 0) {
+                    this->newFileNameCharCount = 0;
+                    if (this->prevConfigMode == CM_QUEST_MENU) {
+                        this->configMode = CM_NAME_ENTRY_TO_QUEST_MENU;
+                    } else if (this->prevConfigMode == CM_RANDOMIZER_SETTINGS_MENU) {
+                        this->configMode = CM_NAME_ENTRY_TO_RANDOMIZER_SETTINGS_MENU;
+                    } else {
+                        this->configMode = CM_NAME_ENTRY_TO_MAIN;
+                    }
+                    this->prevConfigMode = CM_NAME_ENTRY;
+                    sLastCharIndex = -1;
+                    CVarSetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0);
+                } else {
+                    for (i = this->newFileNameCharCount; i < 7; i++) {
+                        filename[i] = filename[i + 1];
+                    }
+                    filename[i] = 0xDF;
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+            }
+        } else {
+            if (this->charPage < 3) {
+                if (this->kbdY != 5) {
+                    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 255);
+
+                    if (this->charPage == 0) {
+                        gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[(this->charIndex * 4)], 4, 0);
+                        FileChoose_DrawCharacterNES(
+                            this->state.gfxCtx,
+                            font->fontBuf + gKeyboardCharactersHiragana[this->charIndex] * FONT_CHAR_TEX_SIZE, 0);
+                        if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                            if ((gKeyboardCharactersHiragana[this->charIndex] == 0xE7) ||
+                                (gKeyboardCharactersHiragana[this->charIndex] == 0xE8)) {
+                                if (func_80808688_ne0(&this->state, gKeyboardCharactersHiragana[this->charIndex]) ==
+                                    0) {
+                                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
+                                } else {
+                                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
+                                }
+                            } else {
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                                filename[this->newFileNameCharCount] = gKeyboardCharactersHiragana[this->charIndex];
+                                this->newFileNameCharCount++;
+                                if (this->newFileNameCharCount >= 8) {
+                                    this->newFileNameCharCount = 7;
+                                }
+                            }
+                        }
+                    } else if (this->charPage == 1) {
+                        gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[(this->charIndex * 4)], 4, 0);
+                        FileChoose_DrawCharacterNES(
+                            this->state.gfxCtx,
+                            font->fontBuf + gKeyboardCharactersKatakana[this->charIndex] * FONT_CHAR_TEX_SIZE, 0);
+                        if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                            if ((gKeyboardCharactersHiragana[this->charIndex] == 0xE7) ||
+                                (gKeyboardCharactersHiragana[this->charIndex] == 0xE8)) {
+                                if (func_80808688_ne0(&this->state, gKeyboardCharactersHiragana[this->charIndex]) ==
+                                    0) {
+                                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
+                                } else {
+                                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                           &gSfxDefaultReverb);
+                                }
+                            } else {
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                                filename[this->newFileNameCharCount] = gKeyboardCharactersKatakana[this->charIndex];
+                                this->newFileNameCharCount++;
+                                if (this->newFileNameCharCount >= 8) {
+                                    this->newFileNameCharCount = 7;
+                                }
+                            }
+                        }
+                    } else {
+                        gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[(this->charIndex * 4)], 4, 0);
+                        FileChoose_DrawCharacterNES(
+                            this->state.gfxCtx,
+                            font->fontBuf + gKeyboardCharactersAlphanumeric[this->charIndex] * FONT_CHAR_TEX_SIZE, 0);
+                        if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultReverb);
+                            filename[this->newFileNameCharCount] = gKeyboardCharactersAlphanumeric[this->charIndex];
+                            this->newFileNameCharCount++;
+                            if (this->newFileNameCharCount >= 8) {
+                                this->newFileNameCharCount = 7;
+                            }
+                        }
+                    }
+                } else if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                    if (this->charPage != this->kbdButton) {
+                        if (this->kbdButton == 0) {
+                            if (this->charPage == 1) {
+                                this->charPage = 4;
+                            } else {
+                                this->charPage = 6;
+                            }
+                            Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        } else if (this->kbdButton == 1) {
+                            if (this->charPage == 0) {
+                                this->charPage = 3;
+                            } else {
+                                this->charPage = 8;
+                            }
+                            Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        } else if (this->kbdButton == 2) {
+                            if (this->charPage == 0) {
+                                this->charPage = 5;
+                            } else {
+                                this->charPage = 7;
+                            }
+                            Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        } else if (this->kbdButton == 3) {
+                            if (this->newFileNameCharCount == 7 && filename[7] != 0xDF) {
+                                for (i = this->newFileNameCharCount; i < 7; i++) {
+                                    filename[i] = filename[i + 1];
+                                }
+                                filename[i] = 0xDF;
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                            } else {
+                                this->newFileNameCharCount--;
+                                if (this->newFileNameCharCount < 0) {
+                                    this->newFileNameCharCount = 0;
+                                }
+                                for (i = this->newFileNameCharCount; i < 7; i++) {
+                                    filename[i] = filename[i + 1];
+                                }
+                                filename[i] = 0xDF;
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                            }
+                        } else if (this->kbdButton == 4) {
+                            validName = false;
+                            for (i = 0; i < 8; i++) {
+                                if (filename[i] != 0xDF) {
+                                    validName = true;
+                                    break;
+                                }
+                            }
+
+                            if (validName) {
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                                gSaveContext.fileNum = this->buttonIndex;
+                                dayTime = ((void)0, gSaveContext.dayTime);
+                                Sram_InitSave(this);
+                                gSaveContext.dayTime = dayTime;
+                                this->prevConfigMode = CM_MAIN_MENU;
+                                this->configMode = CM_NAME_ENTRY_TO_MAIN;
+                                CVarSetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0);
+                                this->nameBoxAlpha[this->buttonIndex] = this->nameAlpha[this->buttonIndex] = 200;
+                                this->connectorAlpha[this->buttonIndex] = 255;
+                                func_800AA000(300.0f, 180, 20, 100);
+                            } else {
+                                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4,
+                                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                                                       &gSfxDefaultReverb);
+                            }
+                        }
+                    }
+                }
+                if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->newFileNameCharCount++;
+                    if (this->newFileNameCharCount >= 8) {
+                        this->newFileNameCharCount = 7;
+                    }
+                } else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->newFileNameCharCount--;
+                    if (this->newFileNameCharCount < 0) {
+                        this->newFileNameCharCount = 0;
+                    }
+                } else if (CHECK_BTN_ALL(input->press.button, BTN_Z)) {
+                    if (func_80808688_ne0(&this->state, 0xDF) != 0) {
+                        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    }
+                }
+            }
+        }
+    }
+
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
+
+    CLOSE_DISPS(this->state.gfxCtx);
+}
+
+void FileChoose_StartNameEntryNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+
+    this->nameEntryBoxAlpha += 25;
+
+    if (this->nameEntryBoxAlpha >= 255) {
+        this->nameEntryBoxAlpha = 255;
+    }
+
+    this->nameEntryBoxPosX -= 30;
+
+    if (this->nameEntryBoxPosX <= 0) {
+        this->nameEntryBoxPosX = 0;
+        this->nameEntryBoxAlpha = 255;
+        this->kbdX = 0;
+        this->kbdY = 0;
+        this->kbdButton = 99;
+        this->configMode = CM_NAME_ENTRY;
+    }
+}
+
+void FileChoose_UpdateKeyboardCursorNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    Input* input = &this->state.input[0];
+    s16 prevKbdX;
+    s32 pad;
+    bool dpad = CVarGetInteger(CVAR_SETTING("DpadInText"), 0);
+
+    if (this->charPage < 3) {
+        if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
+            if (gSaveContext.language == LANGUAGE_JPN) {
+                if (this->charPage == 0) {
+                    this->charPage = 3;
+                    Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                } else if (this->charPage == 1) {
+                    this->charPage = 7;
+                    Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                } else if (this->charPage == 2) {
+                    this->charPage = 6;
+                    Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                }
+            }
+        } else {
+            this->kbdButton = 99;
+            if (this->kbdY != 5) {
+                if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->charIndex--;
+                    this->kbdX--;
+                    if (this->kbdX < 0) {
+                        this->kbdX = 12;
+                        this->charIndex = this->kbdY * 13 + this->kbdX;
+                    }
+                } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->charIndex++;
+                    this->kbdX++;
+                    if (this->kbdX >= 13) {
+                        this->kbdX = 0;
+                        this->charIndex = this->kbdY * 13 + this->kbdX;
+                    }
+                }
+            } else if (gSaveContext.language == LANGUAGE_JPN) {
+                if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->kbdX--;
+                    if (this->kbdX < 0) {
+                        this->kbdX = 4;
+                    }
+                } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->kbdX++;
+                    if (this->kbdX >= 5) {
+                        this->kbdX = 0;
+                    }
+                }
+            } else {
+                if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->kbdX--;
+                    if (this->kbdX < 3) {
+                        this->kbdX = 4;
+                    }
+                } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    this->kbdX++;
+                    if (this->kbdX >= 5) {
+                        this->kbdX = 3;
+                    }
+                }
+            }
+
+            if ((this->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                this->kbdY--;
+                if (this->kbdY < 0) {
+                    if (gSaveContext.language == LANGUAGE_JPN) {
+                        this->kbdY = 5;
+                        this->charIndex += 52;
+                        prevKbdX = this->kbdX;
+                        if (this->kbdX < 3) {
+                            this->kbdX = 0;
+                        } else if (this->kbdX < 6) {
+                            this->kbdX = 1;
+                        } else if (this->kbdX < 8) {
+                            this->kbdX = 2;
+                        } else if (this->kbdX < 10) {
+                            this->kbdX = 3;
+                        } else if (this->kbdX < 13) {
+                            this->kbdX = 4;
+                        }
+
+                        this->unk_1CAD6[this->kbdX] = prevKbdX;
+                    } else if (this->kbdX < 8) {
+                        this->kbdY = 4;
+                        this->charIndex = this->kbdX + 52;
+                    } else {
+                        this->kbdY = 5;
+                        this->charIndex += 52;
+                        prevKbdX = this->kbdX;
+                        if (this->kbdX < 10) {
+                            this->kbdX = 3;
+                        } else if (this->kbdX < 13) {
+                            this->kbdX = 4;
+                        }
+
+                        this->unk_1CAD6[this->kbdX] = prevKbdX;
+                    }
+                } else {
+                    this->charIndex -= 13;
+                    if (this->kbdY == 4) {
+                        this->charIndex = 52;
+                        this->kbdX = this->unk_1CAD6[this->kbdX];
+                        this->charIndex += this->kbdX;
+                    }
+                }
+            } else if ((this->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                this->kbdY++;
+                if (this->kbdY >= 6) {
+                    this->kbdY = 0;
+                    this->kbdX = this->unk_1CAD6[this->kbdX];
+                    this->charIndex = this->kbdX;
+                } else {
+                    this->charIndex += 13;
+                    if (this->kbdY == 5) {
+                        if (gSaveContext.language != LANGUAGE_JPN) {
+                            if (this->kbdX < 8) {
+                                this->kbdY = 0;
+                                this->charIndex = this->kbdX;
+                            } else {
+                                prevKbdX = this->kbdX;
+                                if (this->kbdX < 3) {
+                                    this->kbdX = 0;
+                                } else if (this->kbdX < 6) {
+                                    this->kbdX = 1;
+                                } else if (this->kbdX < 8) {
+                                    this->kbdX = 2;
+                                } else if (this->kbdX < 10) {
+                                    this->kbdX = 3;
+                                } else if (this->kbdX < 13) {
+                                    this->kbdX = 4;
+                                }
+
+                                this->unk_1CAD6[this->kbdX] = prevKbdX;
+                            }
+                        } else {
+                            prevKbdX = this->kbdX;
+                            if (this->kbdX < 3) {
+                                this->kbdX = 0;
+                            } else if (this->kbdX < 6) {
+                                this->kbdX = 1;
+                            } else if (this->kbdX < 8) {
+                                this->kbdX = 2;
+                            } else if (this->kbdX < 10) {
+                                this->kbdX = 3;
+                            } else if (this->kbdX < 13) {
+                                this->kbdX = 4;
+                            }
+                            this->unk_1CAD6[this->kbdX] = prevKbdX;
+                        }
+                    }
+                }
+            }
+            if (this->kbdY == 5) {
+                this->kbdButton = this->kbdX;
+
+                if (sLastKbdX != this->kbdX) {
+                    // NTSC TODO: Figure out japanese TTS
+                    // GameInteractor_ExecuteOnUpdateFileNameSelection(0xF0 + this->kbdX);
+                    sLastKbdX = this->kbdX;
+                    sLastCharIndex = -1;
+                }
+            } else if (sLastCharIndex != this->charIndex && this->charIndex < 65) {
+                // NTSC TODO: Figure out japanese TTS
+                // GameInteractor_ExecuteOnUpdateFileNameSelection(D_808123F0[this->charIndex]);
+                sLastCharIndex = this->charIndex;
+                sLastKbdX = -1;
+            }
+        }
+    } else {
+        this->charBgAlpha += ZREG(9);
+        if (this->charBgAlpha >= 255) {
+            this->charBgAlpha = 0;
+            this->charPage = D_808127DC_ne0[this->charPage];
+        }
+    }
+}
+
+void FileChoose_StartOptionsNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+
+    this->nameEntryBoxAlpha += 25;
+
+    if (this->nameEntryBoxAlpha >= 255) {
+        this->nameEntryBoxAlpha = 255;
+    }
+
+    this->nameEntryBoxPosX -= 30;
+
+    if (this->nameEntryBoxPosX <= 0) {
+        this->nameEntryBoxPosX = 0;
+        this->nameEntryBoxAlpha = 255;
+        this->configMode = CM_OPTIONS_MENU;
+    }
+}
+
+static u8 sSelectedSetting;
+
+void FileChoose_UpdateOptionsMenuNES(GameState* thisx) {
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    // SramContext* sramCtx = &this->sramCtx;
+    Input* input = &this->state.input[0];
+    bool dpad = CVarGetInteger(CVAR_SETTING("DpadInText"), 0);
+
+    if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        this->prevConfigMode = this->configMode;
+        this->configMode = CM_OPTIONS_TO_MAIN;
+        sLastOptionButtonIndex = -1;
+        // sramCtx->readBuff[0] = gSaveContext.audioSetting;
+        // sramCtx->readBuff[1] = gSaveContext.zTargetSetting;
+        // osSyncPrintf("ＳＡＶＥ");
+        // Sram_WriteSramHeader(sramCtx);
+        Save_SaveGlobal();
+        CVarSave();
+        // osSyncPrintf(VT_FGCOL(YELLOW));
+        // osSyncPrintf("sram->read_buff[2] = J_N = %x\n", sramCtx->readBuff[2]);
+        // osSyncPrintf("sram->read_buff[2] = J_N = %x\n", &sramCtx->readBuff[2]);
+        // osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
+        // osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
+        // osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
+        // osSyncPrintf(VT_RST);
+        func_800F6700(gSaveContext.audioSetting);
+        // osSyncPrintf("終了\n");
+        return;
+    }
+
+    if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+
+        if (sSelectedSetting == FS_SETTING_AUDIO) {
+            gSaveContext.audioSetting--;
+
+            // because audio setting is unsigned, can't check for < 0
+            if (gSaveContext.audioSetting > 0xF0) {
+                gSaveContext.audioSetting = FS_AUDIO_SURROUND;
+            }
+        } else {
+            gSaveContext.zTargetSetting ^= 1;
+        }
+    } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+
+        if (sSelectedSetting == FS_SETTING_AUDIO) {
+            gSaveContext.audioSetting++;
+
+            if (gSaveContext.audioSetting > FS_AUDIO_SURROUND) {
+                gSaveContext.audioSetting = FS_AUDIO_STEREO;
+            }
+        } else {
+            gSaveContext.zTargetSetting ^= 1;
+        }
+    }
+
+    if ((this->stickRelY < -30) || (this->stickRelY > 30) ||
+        (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        sSelectedSetting ^= 1;
+    } else if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        sSelectedSetting ^= 1;
+    }
+
+    if (sSelectedSetting == FS_SETTING_AUDIO) {
+        if (sLastOptionButtonIndex != gSaveContext.audioSetting) {
+            GameInteractor_ExecuteOnUpdateFileAudioSelection(gSaveContext.audioSetting);
+            sLastOptionButtonIndex = gSaveContext.audioSetting;
+        }
+    } else if (sSelectedSetting == FS_SETTING_TARGET) {
+        // offset to detect switching between modes
+        u8 optionOffset = gSaveContext.zTargetSetting + FS_AUDIO_SURROUND + FS_SETTING_TARGET;
+        if (sLastOptionButtonIndex != optionOffset) {
+            GameInteractor_ExecuteOnUpdateFileTargetSelection(gSaveContext.zTargetSetting);
+            sLastOptionButtonIndex = optionOffset;
+        }
+    }
+}
+
+void FileChoose_DrawOptionsImplNES(GameState* thisx) {
+    static s16 cursorPrimRed = 255;
+    static s16 cursorPrimGreen = 255;
+    static s16 cursorPrimBlue = 255;
+    static s16 cursorEnvRed = 0;
+    static s16 cursorEnvGreen = 0;
+    static s16 cursorEnvBlue = 0;
+    static s16 cursorPulseDir = 1;
+    static s16 cursorFlashTimer = 20;
+    static s16 cursorPrimColors[][3] = {
+        { 255, 255, 255 },
+        { 0, 255, 255 },
+    };
+    static s16 cursorEnvColors[][3] = {
+        { 0, 0, 0 },
+        { 0, 150, 150 },
+    };
+    if (CVarGetInteger(CVAR_COSMETIC("Title.FileChoose.Changed"), 0)) {
+        Color_RGB8 backgroundColor =
+            CVarGetColor24(CVAR_COSMETIC("Title.FileChoose.Value"), (Color_RGB8){ 100, 150, 255 });
+        cursorPrimColors[1][0] = MIN(backgroundColor.r + 100, 255);
+        cursorPrimColors[1][1] = MIN(backgroundColor.g + 100, 255);
+        cursorPrimColors[1][2] = MIN(backgroundColor.b + 100, 255);
+        cursorEnvColors[1][0] = MIN(backgroundColor.r + 50, 255);
+        cursorEnvColors[1][1] = MIN(backgroundColor.g + 50, 255);
+        cursorEnvColors[1][2] = MIN(backgroundColor.b + 50, 255);
+    }
+
+    FileChooseContext* this = (FileChooseContext*)thisx;
+    s16 cursorRed;
+    s16 cursorGreen;
+    s16 cursorBlue;
+    s16 i;
+    s16 j;
+    s16 vtx;
+
+    OPEN_DISPS(this->state.gfxCtx);
+
+    cursorRed = ABS(cursorPrimRed - cursorPrimColors[cursorPulseDir][0]) / cursorFlashTimer;
+    cursorGreen = ABS(cursorPrimGreen - cursorPrimColors[cursorPulseDir][1]) / cursorFlashTimer;
+    cursorBlue = ABS(cursorPrimBlue - cursorPrimColors[cursorPulseDir][2]) / cursorFlashTimer;
+
+    if (cursorPrimRed >= cursorPrimColors[cursorPulseDir][0]) {
+        cursorPrimRed -= cursorRed;
+    } else {
+        cursorPrimRed += cursorRed;
+    }
+
+    if (cursorPrimGreen >= cursorPrimColors[cursorPulseDir][1]) {
+        cursorPrimGreen -= cursorGreen;
+    } else {
+        cursorPrimGreen += cursorGreen;
+    }
+
+    if (cursorPrimBlue >= cursorPrimColors[cursorPulseDir][2]) {
+        cursorPrimBlue -= cursorBlue;
+    } else {
+        cursorPrimBlue += cursorBlue;
+    }
+
+    cursorRed = ABS(cursorEnvRed - cursorEnvColors[cursorPulseDir][0]) / cursorFlashTimer;
+    cursorGreen = ABS(cursorEnvGreen - cursorEnvColors[cursorPulseDir][1]) / cursorFlashTimer;
+    cursorBlue = ABS(cursorEnvBlue - cursorEnvColors[cursorPulseDir][2]) / cursorFlashTimer;
+
+    if (cursorEnvRed >= cursorEnvColors[cursorPulseDir][0]) {
+        cursorEnvRed -= cursorRed;
+    } else {
+        cursorEnvRed += cursorRed;
+    }
+
+    if (cursorEnvGreen >= cursorEnvColors[cursorPulseDir][1]) {
+        cursorEnvGreen -= cursorGreen;
+    } else {
+        cursorEnvGreen += cursorGreen;
+    }
+
+    if (cursorEnvBlue >= cursorEnvColors[cursorPulseDir][2]) {
+        cursorEnvBlue -= cursorBlue;
+    } else {
+        cursorEnvBlue += cursorBlue;
+    }
+
+    if (--cursorFlashTimer == 0) {
+        cursorPrimRed = cursorPrimColors[cursorPulseDir][0];
+        cursorPrimGreen = cursorPrimColors[cursorPulseDir][1];
+        cursorPrimBlue = cursorPrimColors[cursorPulseDir][2];
+
+        cursorEnvRed = cursorEnvColors[cursorPulseDir][0];
+        cursorEnvGreen = cursorEnvColors[cursorPulseDir][1];
+        cursorEnvBlue = cursorEnvColors[cursorPulseDir][2];
+
+        cursorFlashTimer = 20;
+
+        if (++cursorPulseDir > 1) {
+            cursorPulseDir = 0;
+        }
+    }
+
+    gSPVertex(POLY_OPA_DISP++, D_80811D30_NTSC, 32, 0);
+
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
+                      ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]);
+    gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+
+    for (i = 0, vtx = 0; i < 4; i++, vtx += 4) {
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sOptionsMenuHeaders[i].texture[NTSC_LANGUAGE_INDEX], G_IM_FMT_IA,
+                            G_IM_SIZ_8b, sOptionsMenuHeaders[i].width, sOptionsMenuHeaders[i].height, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
+        gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+    }
+
+    gSPVertex(POLY_OPA_DISP++, D_80811F30_NTSC, 32, 0);
+
+    for (i = 0, vtx = 0; i < 4; i++, vtx += 4) {
+        gDPPipeSync(POLY_OPA_DISP++);
+        if (i == gSaveContext.audioSetting) {
+            if (sSelectedSetting == FS_SETTING_AUDIO) {
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cursorPrimRed, cursorPrimGreen, cursorPrimBlue,
+                                this->titleAlpha[0]);
+                gDPSetEnvColor(POLY_OPA_DISP++, cursorEnvRed, cursorEnvGreen, cursorEnvBlue, 255);
+            } else {
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]);
+                gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+            }
+        } else {
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 120, 120, 120, this->titleAlpha[0]);
+            gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+        }
+
+        //! @bug Mistakenly using sOptionsMenuHeaders instead of sOptionsMenuSettings for the height.
+        //! This works out anyway because all heights are 16.
+        // #region SOH [Port] Just use sOptionsMenuSettings height instead
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sOptionsMenuSettings[i].texture[NTSC_LANGUAGE_INDEX], G_IM_FMT_IA,
+                            G_IM_SIZ_8b, sOptionsMenuSettings[i].width, sOptionsMenuSettings[i].height, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
+        // #endregion
+        gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+    }
+
+    for (; i < 6; i++, vtx += 4) {
+        gDPPipeSync(POLY_OPA_DISP++);
+
+        if (i == (gSaveContext.zTargetSetting + 4)) {
+            if (sSelectedSetting != FS_SETTING_AUDIO) {
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cursorPrimRed, cursorPrimGreen, cursorPrimBlue,
+                                this->titleAlpha[0]);
+                gDPSetEnvColor(POLY_OPA_DISP++, cursorEnvRed, cursorEnvGreen, cursorEnvBlue, 0xFF);
+            } else {
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]);
+                gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+            }
+        } else {
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 120, 120, 120, this->titleAlpha[0]);
+            gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+        }
+
+        //! @bug Mistakenly using sOptionsMenuHeaders instead of sOptionsMenuSettings for the height.
+        //! This is also an OOB read that happens to access the height of the first two elements in
+        //! sOptionsMenuSettings, and since all heights are 16, it works out anyway.
+        // #region SOH [Port] Avoid UB and use sOptionsMenuSettings height instead
+        gDPLoadTextureBlock(POLY_OPA_DISP++, sOptionsMenuSettings[i].texture[NTSC_LANGUAGE_INDEX], G_IM_FMT_IA,
+                            G_IM_SIZ_8b, sOptionsMenuSettings[i].width, sOptionsMenuSettings[i].height, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                            G_TX_NOLOD);
+        // #endregion
+        gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+    }
+
+    gDPPipeSync(POLY_OPA_DISP++);
+
+    // check brightness bars
+    gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gFileSelBrightnessCheckTex, G_IM_FMT_IA, 96, 16, 0,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                           G_TX_NOLOD);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 55, 55, 55, this->titleAlpha[0]);
+    gDPSetEnvColor(POLY_OPA_DISP++, 40, 40, 40, 255);
+    gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+
+    vtx += 4;
+
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 30, 30, 30, this->titleAlpha[0]);
+    gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+    gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
+
+    vtx += 4;
+
+    // blue divider lines
+    gDPPipeSync(POLY_OPA_DISP++);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 255, 255, this->titleAlpha[0]);
+    gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
+
+    gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gFileSelOptionsDividerTex, G_IM_FMT_IA, 256, 2, 0,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
+                           G_TX_NOLOD);
+
+    Matrix_Push();
+    Matrix_Translate(0.0f, 0.1f, 0.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPVertex(POLY_OPA_DISP++, gOptionsDividerTopVtx, 4, 0);
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+    Matrix_Pop();
+
+    Matrix_Push();
+    Matrix_Translate(0.0f, 0.2f, 0.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+    gSPVertex(POLY_OPA_DISP++, gOptionsDividerMiddleVtx, 4, 0);
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+    Matrix_Pop();
+
+    Matrix_Push();
+    Matrix_Translate(0.0f, 0.4f, 0.0f, MTXMODE_APPLY);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPVertex(POLY_OPA_DISP++, gOptionsDividerBottomVtx, 4, 0);
+    gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
+    Matrix_Pop();
+
+    CLOSE_DISPS(this->state.gfxCtx);
+}
+
+void FileChoose_DrawOptionsNES(GameState* thisx) {
+    FileChoose_DrawOptionsImplNES(thisx);
+}
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
index 8f10e98379..d82ec38448 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
@@ -7,7 +7,6 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SaveManager.h"
 
-
 static s16 D_808124C0[] = {
     0x0002, 0x0003, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, 0x0000, 0x0001,
     0x0001, 0x0002, 0x0001, 0x0001, 0x0004, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0000, 0x0002, 0x0000, 0x0001,
@@ -100,16 +99,16 @@ static void* sBackspaceEndTextures[][2] = {
 
 static u16 sBackspaceEndWidths[] = { 28, 44 };
 
-static s16 D_808125EC[] = {
+s16 D_808125EC[] = {
     0xFFE2, 0xFFF0, 0xFFFA, 0x0004, 0x000E, 0x0018, 0x0022, 0x002C, 0x0036, 0xFFF0, 0xFFF0,
 };
 
-static s16 D_80812604[] = {
+s16 D_80812604[] = {
     0x0048, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045,
 };
 
-static s16 sLastCharIndex = -1;
-static s16 sLastKbdX = -1;
+s16 sLastCharIndex = -1;
+s16 sLastKbdX = -1;
 
 /**
  * Set vertices used by all elements of the name entry screen that are NOT the keyboard.
@@ -141,8 +140,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) {
 
     phi_s0 = 0x10;
     for (phi_t1 = 0; phi_t1 < 2; phi_t1++, phi_s0 += 4) {
-        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2],
-                        255);
+        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->windowColor[0], this->windowColor[1], this->windowColor[2], 255);
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
         gDPLoadTextureBlock(POLY_OPA_DISP++, sBackspaceEndTextures[gSaveContext.language][phi_t1], G_IM_FMT_IA,
                             G_IM_SIZ_16b, sBackspaceEndWidths[phi_t1], 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -218,8 +216,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) {
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->nameEntryBoxAlpha);
 
     for (phi_v0 = 0, phi_s0 = 0; phi_s0 < 0x20; phi_s0 += 4, phi_v0++) {
-        FileChoose_DrawCharacter(this->state.gfxCtx, font->fontBuf + filename[phi_v0] * FONT_CHAR_TEX_SIZE,
-                                 phi_s0);
+        FileChoose_DrawCharacter(this->state.gfxCtx, font->fontBuf + filename[phi_v0] * FONT_CHAR_TEX_SIZE, phi_s0);
     }
 
     this->nameEntryVtx[0x25].v.tc[0] = this->nameEntryVtx[0x26].v.tc[1] = this->nameEntryVtx[0x27].v.tc[0] =
@@ -328,8 +325,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0,
                       PRIMITIVE, 0);
-    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->highlightColor[0], this->highlightColor[1],
-                    this->highlightColor[2], this->highlightColor[3]);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->highlightColor[0], this->highlightColor[1], this->highlightColor[2],
+                    this->highlightColor[3]);
     gDPLoadTextureBlock(POLY_OPA_DISP++, gFileSelCharHighlightTex, G_IM_FMT_I, G_IM_SIZ_8b, 24, 24, 0,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
@@ -359,7 +356,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
 
     if (this->configMode == CM_NAME_ENTRY) {
         if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             // place cursor on END button
             this->kbdY = 5;
             this->kbdX = 4;
@@ -370,7 +368,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                 }
 
                 filename[i] = 0x3E;
-                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 this->newFileNameCharCount--;
 
@@ -392,8 +391,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                     }
 
                     filename[i] = 0x3E;
-                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
             }
         } else {
@@ -407,8 +406,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                                              font->fontBuf + D_808123F0[this->charIndex] * FONT_CHAR_TEX_SIZE, 0);
 
                     if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         filename[this->newFileNameCharCount] = D_808123F0[this->charIndex];
                         this->newFileNameCharCount++;
 
@@ -424,7 +423,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             }
 
                             filename[i] = 0x3E;
-                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         } else {
                             this->newFileNameCharCount--;
@@ -438,7 +438,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             }
 
                             filename[i] = 0x3E;
-                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                         }
                     } else if (this->kbdButton == FS_KBD_BTN_END) {
@@ -452,7 +453,8 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                         }
 
                         if (validName) {
-                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                             gSaveContext.fileNum = this->buttonIndex;
                             dayTime = ((void)0, gSaveContext.dayTime);
@@ -465,21 +467,23 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             this->connectorAlpha[this->buttonIndex] = 255;
                             func_800AA000(300.0f, 0xB4, 0x14, 0x64);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         }
                     }
                 }
 
                 if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     this->newFileNameCharCount++;
 
                     if (this->newFileNameCharCount > 7) {
                         this->newFileNameCharCount = 7;
                     }
                 } else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     this->newFileNameCharCount--;
 
                     if (this->newFileNameCharCount < 0) {
@@ -538,7 +542,8 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
 
     if (this->kbdY != 5) {
         if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->charIndex--;
             this->kbdX--;
             if (this->kbdX < 0) {
@@ -546,7 +551,8 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
                 this->charIndex = (this->kbdY * 13) + this->kbdX;
             }
         } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->charIndex++;
             this->kbdX++;
             if (this->kbdX > 12) {
@@ -556,13 +562,15 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
         }
     } else {
         if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->kbdX--;
             if (this->kbdX < 3) {
                 this->kbdX = 4;
             }
         } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->kbdX++;
             if (this->kbdX > 4) {
                 this->kbdX = 3;
@@ -571,7 +579,8 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
     }
 
     if ((this->stickRelY > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->kbdY--;
 
         if (this->kbdY < 0) {
@@ -602,7 +611,8 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
             }
         }
     } else if ((this->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->kbdY++;
 
         if (this->kbdY > 5) {
@@ -677,7 +687,7 @@ void FileChoose_StartOptions(GameState* thisx) {
 }
 
 static u8 sSelectedSetting;
-static s8 sLastOptionButtonIndex = -1;
+s8 sLastOptionButtonIndex = -1;
 
 /**
  * Update the cursor and appropriate settings for the options menu.
@@ -691,7 +701,8 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
     bool dpad = CVarGetInteger(CVAR_SETTING("DpadInText"), 0);
 
     if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->prevConfigMode = this->configMode;
         this->configMode = CM_OPTIONS_TO_MAIN;
         sLastOptionButtonIndex = -1;
@@ -714,7 +725,8 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
                        ResourceMgr_GetGamePlatform(versionIndex) == GAME_PLATFORM_N64;
 
     if ((this->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
         if (sSelectedSetting == FS_SETTING_AUDIO) {
             gSaveContext.audioSetting--;
@@ -735,7 +747,8 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
             gSaveContext.zTargetSetting ^= 1;
         }
     } else if ((this->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
         if (sSelectedSetting == FS_SETTING_AUDIO) {
             gSaveContext.audioSetting++;
@@ -764,25 +777,30 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
 
     // NTSC and GC only has two rows and can just flip the setting bit
     // Otherwise for PAL 64, handle the additional change language setting
-    if (!isPalN64 && ((ABS(this->stickRelY) > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP)))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    if (!isPalN64 &&
+        ((ABS(this->stickRelY) > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP)))) {
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         sSelectedSetting ^= 1;
     } else if (isPalN64 && ((this->stickRelY > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DUP)))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         sSelectedSetting--;
 
         if (sSelectedSetting > 0xF0) {
             sSelectedSetting = FS_SETTING_LANGUAGE;
         }
     } else if (isPalN64 && ((this->stickRelY < -30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN)))) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         sSelectedSetting++;
 
         if (sSelectedSetting > FS_SETTING_LANGUAGE) {
             sSelectedSetting = FS_SETTING_AUDIO;
         }
     } else if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
-        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         if (isPalN64) {
             sSelectedSetting++;
 
@@ -823,79 +841,25 @@ typedef struct {
 } OptionsMenuTextureInfo; // size = 0x14
 
 static OptionsMenuTextureInfo gOptionsMenuHeaders[] = {
-    {
-        { gFileSelOptionsENGTex, gFileSelOptionsGERTex, gFileSelOptionsENGTex },
-        { 128, 128, 128 },
-        16,
-    },
-    {
-        { gFileSelSOUNDENGTex, gFileSelSOUNDENGTex, gFileSelSOUNDFRATex },
-        { 64, 64, 64 },
-        16,
-    },
-    {
-        { gFileSelLTargetingENGTex, gFileSelLTargetingGERTex, gFileSelLTargetingFRATex },
-        { 64, 144, 64 },
-        16,
-    },
-    {
-        { gFileSelCheckBrightnessENGTex, gFileSelCheckBrightnessGERTex, gFileSelCheckBrightnessFRATex },
-        { 128, 128, 128 },
-        16,
-    },
-    {
-        { gFileSelLanguageENGTex, gFileSelLanguageGERTex, gFileSelLanguageFRATex },
-        { 64, 64, 64 },
-        16,
-    },
+    { { gFileSelOptionsENGTex, gFileSelOptionsGERTex, gFileSelOptionsENGTex }, { 128, 128, 128 }, 16 },
+    { { gFileSelSOUNDENGTex, gFileSelSOUNDENGTex, gFileSelSOUNDFRATex }, { 64, 64, 64 }, 16 },
+    { { gFileSelLTargetingENGTex, gFileSelLTargetingGERTex, gFileSelLTargetingFRATex }, { 64, 144, 64 }, 16 },
+    { { gFileSelCheckBrightnessENGTex, gFileSelCheckBrightnessGERTex, gFileSelCheckBrightnessFRATex },
+      { 128, 128, 128 },
+      16 },
+    { { gFileSelLanguageENGTex, gFileSelLanguageGERTex, gFileSelLanguageFRATex }, { 64, 64, 64 }, 16 },
 };
 
 static OptionsMenuTextureInfo gOptionsMenuSettings[] = {
-    {
-        { gFileSelStereoENGTex, gFileSelStereoENGTex, gFileSelStereoFRATex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelMonoENGTex, gFileSelMonoENGTex, gFileSelMonoENGTex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelHeadsetENGTex, gFileSelHeadsetGERTex, gFileSelHeadsetFRATex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelSurroundENGTex, gFileSelSurroundENGTex, gFileSelSurroundENGTex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelSwitchENGTex, gFileSelSwitchGERTex, gFileSelSwitchFRATex },
-        { 48, 80, 48 },
-        16,
-    },
-    {
-        { gFileSelHoldENGTex, gFileSelHoldGERTex, gFileSelHoldFRATex },
-        { 48, 80, 48 },
-        16,
-    },
-    {
-        { gFileSelLangEnglishENGTex, gFileSelLangEnglishENGTex, gFileSelLangEnglishENGTex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelLangDeutschGERTex, gFileSelLangDeutschGERTex, gFileSelLangDeutschGERTex },
-        { 48, 48, 48 },
-        16,
-    },
-    {
-        { gFileSelLangFrancaisFRATex, gFileSelLangFrancaisFRATex, gFileSelLangFrancaisFRATex },
-        { 48, 48, 48 },
-        16,
-    },
+    { { gFileSelStereoENGTex, gFileSelStereoENGTex, gFileSelStereoFRATex }, { 48, 48, 48 }, 16 },
+    { { gFileSelMonoENGTex, gFileSelMonoENGTex, gFileSelMonoENGTex }, { 48, 48, 48 }, 16 },
+    { { gFileSelHeadsetENGTex, gFileSelHeadsetGERTex, gFileSelHeadsetFRATex }, { 48, 48, 48 }, 16 },
+    { { gFileSelSurroundENGTex, gFileSelSurroundENGTex, gFileSelSurroundENGTex }, { 48, 48, 48 }, 16 },
+    { { gFileSelSwitchENGTex, gFileSelSwitchGERTex, gFileSelSwitchFRATex }, { 48, 80, 48 }, 16 },
+    { { gFileSelHoldENGTex, gFileSelHoldGERTex, gFileSelHoldFRATex }, { 48, 80, 48 }, 16 },
+    { { gFileSelLangEnglishENGTex, gFileSelLangEnglishENGTex, gFileSelLangEnglishENGTex }, { 48, 48, 48 }, 16 },
+    { { gFileSelLangDeutschGERTex, gFileSelLangDeutschGERTex, gFileSelLangDeutschGERTex }, { 48, 48, 48 }, 16 },
+    { { gFileSelLangFrancaisFRATex, gFileSelLangFrancaisFRATex, gFileSelLangFrancaisFRATex }, { 48, 48, 48 }, 16 },
 };
 
 void FileChoose_DrawOptionsImpl(GameState* thisx) {
@@ -917,7 +881,8 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
     };
 
     if (CVarGetInteger(CVAR_COSMETIC("Title.FileChoose.Changed"), 0)) {
-        Color_RGB8 backgroundColor = CVarGetColor24(CVAR_COSMETIC("Title.FileChoose.Value"), (Color_RGB8){ 100, 150, 255 });
+        Color_RGB8 backgroundColor =
+            CVarGetColor24(CVAR_COSMETIC("Title.FileChoose.Value"), (Color_RGB8){ 100, 150, 255 });
         cursorPrimColors[1][0] = MIN(backgroundColor.r + 100, 255);
         cursorPrimColors[1][1] = MIN(backgroundColor.g + 100, 255);
         cursorPrimColors[1][2] = MIN(backgroundColor.b + 100, 255);
@@ -1163,16 +1128,14 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
 
     Matrix_Push();
     Matrix_Translate(0.0f, 0.1f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPVertex(POLY_OPA_DISP++, gOptionsDividerTopVtx, 4, 0);
     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
     Matrix_Pop();
 
     Matrix_Push();
     Matrix_Translate(0.0f, 0.2f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     gSPVertex(POLY_OPA_DISP++, gOptionsDividerMiddleVtx, 4, 0);
     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
@@ -1180,8 +1143,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
 
     Matrix_Push();
     Matrix_Translate(0.0f, 0.4f, 0.0f, MTXMODE_APPLY);
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPVertex(POLY_OPA_DISP++, gOptionsDividerBottomVtx, 4, 0);
     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
     Matrix_Pop();
@@ -1190,8 +1152,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
     if (isPalN64) {
         Matrix_Push();
         Matrix_Translate(0.0f, 0.3f, 0.0f, MTXMODE_APPLY);
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx),
-                G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(this->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPVertex(POLY_OPA_DISP++, gOptionsDividerChangeLangVtx, 4, 0);
         gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
         Matrix_Pop();
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
index cb4c95d7fd..9340693d07 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
@@ -9,3 +9,49 @@ s16 D_808123F0[] = {
     0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D,
     0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 0x0040, 0x003F, 0x003E,
 };
+
+// #region SOH [NTSC]
+// clang-format off
+s16 gKeyboardCharactersHiragana[] = {
+    //            'あ'  'か'  'さ'  'た'  'な'   'は'  'ま'  'や'  'ら'  'わ'   'ぁ'  'ゃ'  'っ'
+    /* Row 0 */ 0x0A, 0x0F, 0x14, 0x19, 0x1E, 0x23, 0x28, 0x2D, 0x30, 0x35, 0x38, 0x3E, 0x3D,
+    //            'い'  'き'  'し'  'ち'  'に'   'ひ'  'み'  '  '  'り'  ' '   'ぃ'  '  '  '  ' 
+    /* Row 1 */ 0x0B, 0x10, 0x15, 0x1A, 0x1F, 0x24, 0x29, 0xDF, 0x31, 0xDF, 0x39, 0xDF, 0xDF,
+    //            'う'  'く'  'す'  'つ'  'ぬ'   'ふ'  'む'  'ゆ'  'る'  'を'   'ぅ'  'ゅ'  'ー' 
+    /* Row 2 */ 0x0C, 0x11, 0x16, 0x1B, 0x20, 0x25, 0x2A, 0x2E, 0x32, 0x36, 0x3A, 0x3F, 0xE4,
+    //            'え'  'け'  'せ'  'て'  'ね'   'へ'  'め'  '  '  'れ'  ' '   'ぇ'  '  '  '゛' 
+    /* Row 3 */ 0x0D, 0x12, 0x17, 0x1C, 0x21, 0x26, 0x2B, 0xDF, 0x33, 0xDF, 0x3B, 0xDF, 0xE7,
+    //            'お'  'こ'  'そ'  'と'  'の'   'ほ'  'も'  'よ'  'ろ'  'ん'   'ぉ'  'ょ'  '゜' 
+    /* Row 4 */ 0x0E, 0x13, 0x18, 0x1D, 0x22, 0x27, 0x2C, 0x2F, 0x34, 0x37, 0x3C, 0x40, 0xE8, 
+};
+
+s16 gKeyboardCharactersKatakana[] = {
+    //            'ア'  'カ'  'サ'  'タ'  'ナ'   'ハ'   'マ'  'ヤ'  'ラ'  'ワ'   'ァ'  'ャ'  'ッ'
+    /* Row 0 */ 0x5A, 0x5F, 0x64, 0x69, 0x6E, 0x73, 0x78, 0x7D, 0x80, 0x85, 0x88, 0x8E, 0x8D,
+    //            'イ'  'キ'  'シ'  'チ'  'ニ'   'ヒ'   'ミ'  '  '  'リ'  ' '   'ィ'  '  '  '  ' 
+    /* Row 1 */ 0x5B, 0x60, 0x65, 0x6A, 0x6F, 0x74, 0x79, 0xDF, 0x81, 0xDF, 0x89, 0xDF, 0xDF,
+    //            'ウ'  'ク'  'ス'  'ツ'  'ヌ'   'フ'   'ム'  'ユ'  'ル'  'ヲ'   'ゥ'  'ュ'  'ー' 
+    /* Row 2 */ 0x5C, 0x61, 0x66, 0x6B, 0x70, 0x75, 0x7A, 0x7E, 0x82, 0x86, 0x8A, 0x8F, 0xE4,
+    //            'エ'  'ケ'  'セ'  'テ'  'ネ'   'ヘ'   'メ'  '  '  'レ'  ' '   'ェ'  '  '  '゛' 
+    /* Row 3 */ 0x5D, 0x62, 0x67, 0x6C, 0x71, 0x76, 0x7B, 0xDF, 0x83, 0xDF, 0x8B, 0xDF, 0xE7,
+    //            'オ'  'コ'  'ソ'  'ト'  'ノ'   'ホ'   'モ'  'ヨ'  'ロ'  'ン'   'ォ'  'ョ'  '゜' 
+    /* Row 4 */ 0x5E, 0x63, 0x68, 0x6D, 0x72, 0x77, 0x7C, 0x7F, 0x84, 0x87, 0x8C, 0x90, 0xE8, 
+};
+
+s16 gKeyboardCharactersAlphanumeric[] = {
+    //            'A'   'B'   'C'   'D'   'E'   'F'   'G'   'H'   'I'   'J'   'K'   'L'   'M'
+    /* Row 0 */ 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 
+    //            'N'   'O'   'P'   'Q'   'R'   'S'   'T'   'U'   'V'   'W'   'X'   'Y'   'Z'
+    /* Row 1 */ 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 
+    //            'a'   'b'   'c'   'd'   'e'   'f'   'g'   'h'   'i'   'j'   'k'   'l'   'm'
+    /* Row 2 */ 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 
+    //            'n'   'o'   'p'   'q'   'r'   's'   't'   'u'   'v'   'w'   'x'   'y'   'z'
+    /* Row 3 */ 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 
+    //            '1'   '2'   '3'   '4'   '5'   '6'   '7'   '8'   '9'   '0'   '.'   '-'   ' '
+    /* Row 4 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0xEA, 0xE4, 0xDF, 
+};
+// clang-format on
+
+s16 D_808127DC_ne0[] = { 0, 1, 2, 1, 0, 2, 0, 2, 1, 0 };
+
+// #endregion
diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c
index f1899d27c9..a057ebbd55 100644
--- a/soh/src/overlays/gamestates/ovl_select/z_select.c
+++ b/soh/src/overlays/gamestates/ovl_select/z_select.c
@@ -36,11 +36,11 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) {
     for (int buttonIndex = 0; buttonIndex < ARRAY_COUNT(gSaveContext.buttonStatus); buttonIndex++) {
         gSaveContext.buttonStatus[buttonIndex] = BTN_ENABLED;
     }
-    gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
+    gSaveContext.forceRisingButtonAlphas = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
     gSaveContext.entranceIndex = entranceIndex;
 
-    // Check the entrance to see if the exit should be overriden to a grotto return point for entrance rando
+    // Check the entrance to see if the exit should be overridden to a grotto return point for entrance rando
     if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
         // Ignore return value as we want to load into the entrance specified by the debug menu
         Grotto_OverrideSpecialEntrance(Entrance_GetOverride(entranceIndex));
@@ -53,7 +53,8 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) {
         CVarSave();
 
         if (ResourceMgr_GameHasMasterQuest() && ResourceMgr_GameHasOriginal()) {
-            BetterSceneSelectEntrancePair entrancePair = this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
+            BetterSceneSelectEntrancePair entrancePair =
+                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
             // Check to see if the scene/entrance we just picked can be MQ'd
             if (entrancePair.canBeMQ) {
                 s16 scene = gEntranceTable[entrancePair.entranceIndex].scene;
@@ -93,7 +94,7 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) {
     for (int buttonIndex = 0; buttonIndex < ARRAY_COUNT(gSaveContext.buttonStatus); buttonIndex++) {
         gSaveContext.buttonStatus[buttonIndex] = BTN_ENABLED;
     }
-    gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
+    gSaveContext.forceRisingButtonAlphas = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
     Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
     // Entrance index and grotto content data to load the correct grotto and actors
     gSaveContext.entranceIndex = this->betterGrottos[grottoIndex].entranceIndex;
@@ -104,10 +105,11 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) {
     gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x4ff;
     gSaveContext.respawn[RESPAWN_MODE_RETURN].pos = this->betterGrottos[grottoIndex].pos;
 
-    // Check the entrance to see if the exit should be overriden to a grotto return point for entrance rando
+    // Check the entrance to see if the exit should be overridden to a grotto return point for entrance rando
     if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
         // Use grotto content and parent scene num to identify the right grotto
-        s16 grottoEntrance = Grotto_GetRenamedGrottoIndexFromOriginal(this->betterGrottos[grottoIndex].data, this->betterGrottos[grottoIndex].exitScene);
+        s16 grottoEntrance = Grotto_GetRenamedGrottoIndexFromOriginal(this->betterGrottos[grottoIndex].data,
+                                                                      this->betterGrottos[grottoIndex].exitScene);
         // Ignore return value as we want to load into the entrance specified by the debug menu
         Grotto_OverrideSpecialEntrance(Entrance_GetOverride(grottoEntrance));
     }
@@ -130,567 +132,729 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) {
 }
 
 static SceneSelectEntry sScenes[] = {
-    { " 1:SPOT00", " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN },
-    { " 2:SPOT01", " 2:Kakariko Village", " 2:Kakariko", " 2:Village Cocorico", Select_LoadGame, ENTR_KAKARIKO_VILLAGE_FRONT_GATE },
+    { " 1:SPOT00", " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame,
+      ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN },
+    { " 2:SPOT01", " 2:Kakariko Village", " 2:Kakariko", " 2:Village Cocorico", Select_LoadGame,
+      ENTR_KAKARIKO_VILLAGE_FRONT_GATE },
     { " 3:SPOT02", " 3:Graveyard", " 3:Friedhof", " 3:Cimetiere", Select_LoadGame, ENTR_GRAVEYARD_ENTRANCE },
     { " 4:SPOT03", " 4:Zora's River", " 4:Zora-Fluss", " 4:Riviere Zora", Select_LoadGame, ENTR_ZORAS_RIVER_WEST_EXIT },
     { " 5:SPOT04", " 5:Kokiri Forest", " 5:Kokiri-Wald", " 5:Foret Kokiri", Select_LoadGame, ENTR_KOKIRI_FOREST_0 },
-    { " 6:SPOT05", " 6:Sacred Forest Meadow", " 6:Heilige Lichtung", " 6:Bosquet Sacre", Select_LoadGame, ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT },
+    { " 6:SPOT05", " 6:Sacred Forest Meadow", " 6:Heilige Lichtung", " 6:Bosquet Sacre", Select_LoadGame,
+      ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT },
     { " 7:SPOT06", " 7:Lake Hylia", " 7:Hylia-See", " 7:Lac Hylia", Select_LoadGame, ENTR_LAKE_HYLIA_NORTH_EXIT },
-    { " 8:SPOT07", " 8:Zora's Domain", " 8:Zoras Reich", " 8:Domaine Zora", Select_LoadGame, ENTR_ZORAS_DOMAIN_ENTRANCE },
-    { " 9:SPOT08", " 9:Zora's Fountain", " 9:Zoras Quelle", " 9:Fontaine Zora", Select_LoadGame, ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP },
-    { "10:SPOT09", "10:Gerudo Valley", "10:Gerudotal", "10:Vallee Gerudo", Select_LoadGame, ENTR_GERUDO_VALLEY_EAST_EXIT },
-    { "11:SPOT10", "11:Lost Woods", "11:Verlorene Waelder", "11:Bois Perdus", Select_LoadGame, ENTR_LOST_WOODS_SOUTH_EXIT },
-    { "12:SPOT11", "12:Desert Colossus", "12:Wuestenkoloss", "12:Colosse du Desert", Select_LoadGame, ENTR_DESERT_COLOSSUS_EAST_EXIT },
-    { "13:SPOT12", "13:Gerudo's Fortress", "13:Gerudo-Festung", "13:Forteresse Gerudo", Select_LoadGame, ENTR_GERUDOS_FORTRESS_EAST_EXIT },
-    { "14:SPOT13", "14:Haunted Wasteland", "14:Gespensterwueste", "14:Desert Hante", Select_LoadGame, ENTR_HAUNTED_WASTELAND_EAST_EXIT },
-    { "15:SPOT15", "15:Hyrule Castle", "15:Schloss Hyrule", "15:Chateau d'Hyrule", Select_LoadGame, ENTR_CASTLE_GROUNDS_SOUTH_EXIT },
-    { "16:SPOT16", "16:Death Mountain Trail", "16:Pfad zum Todesberg", "16:Chemin du Peril", Select_LoadGame, ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT },
-    { "17:SPOT17", "17:Death Mountain Crater", "17:Todeskrater", "17:Cratere du Peril", Select_LoadGame, ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT },
+    { " 8:SPOT07", " 8:Zora's Domain", " 8:Zoras Reich", " 8:Domaine Zora", Select_LoadGame,
+      ENTR_ZORAS_DOMAIN_ENTRANCE },
+    { " 9:SPOT08", " 9:Zora's Fountain", " 9:Zoras Quelle", " 9:Fontaine Zora", Select_LoadGame,
+      ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP },
+    { "10:SPOT09", "10:Gerudo Valley", "10:Gerudotal", "10:Vallee Gerudo", Select_LoadGame,
+      ENTR_GERUDO_VALLEY_EAST_EXIT },
+    { "11:SPOT10", "11:Lost Woods", "11:Verlorene Waelder", "11:Bois Perdus", Select_LoadGame,
+      ENTR_LOST_WOODS_SOUTH_EXIT },
+    { "12:SPOT11", "12:Desert Colossus", "12:Wuestenkoloss", "12:Colosse du Desert", Select_LoadGame,
+      ENTR_DESERT_COLOSSUS_EAST_EXIT },
+    { "13:SPOT12", "13:Gerudo's Fortress", "13:Gerudo-Festung", "13:Forteresse Gerudo", Select_LoadGame,
+      ENTR_GERUDOS_FORTRESS_EAST_EXIT },
+    { "14:SPOT13", "14:Haunted Wasteland", "14:Gespensterwueste", "14:Desert Hante", Select_LoadGame,
+      ENTR_HAUNTED_WASTELAND_EAST_EXIT },
+    { "15:SPOT15", "15:Hyrule Castle", "15:Schloss Hyrule", "15:Chateau d'Hyrule", Select_LoadGame,
+      ENTR_CASTLE_GROUNDS_SOUTH_EXIT },
+    { "16:SPOT16", "16:Death Mountain Trail", "16:Pfad zum Todesberg", "16:Chemin du Peril", Select_LoadGame,
+      ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT },
+    { "17:SPOT17", "17:Death Mountain Crater", "17:Todeskrater", "17:Cratere du Peril", Select_LoadGame,
+      ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT },
     { "18:SPOT18", "18:Goron City", "18:Goronia", "18:Village Goron", Select_LoadGame, ENTR_GORON_CITY_UPPER_EXIT },
-    { "19:SPOT20", "19:Lon Lon Ranch", "19:Lon Lon-Farm", "19:Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_RANCH_ENTRANCE },
-    { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", "20:Temple Of Time", "20:Zitadelle der Zeit", "20:Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_ENTRANCE },
-    { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", "21:Chamber of Sages", "21:Halle der Weisen", "21:Sanctuaire des Sages", Select_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 },
-    { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude", "22:Jeu d'adresse", Select_LoadGame, ENTR_SHOOTING_GALLERY_0 },
-    { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", "23:Castle Courtyard Game", "23:Burghof - Wachen", "23:Cour du Chateau (Infilration)", Select_LoadGame, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 },
-    { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", "24:Grave 1", "24:Grab 1", "24:Tombe 1", Select_LoadGame, ENTR_REDEAD_GRAVE_0 },
-    { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", "25:Grave 2", "25:Grab 2", "25:Tombe 2", Select_LoadGame, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
-    { "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", "26:Royal Family's Tomb", "26:Koenigsgrab", "26:Tombe Royale", Select_LoadGame, ENTR_ROYAL_FAMILYS_TOMB_0 },
-    { "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", "27:Great Fairy's Fountain (Upgrades)", "27:Feen-Quelle (Upgrades)", "27:Fontaine Royale des Fees (Amel.)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT },
-    { "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", "28:Fairy's Fountain (Grotto)", "28:Feen-Brunnen (Grotte)", "28:Fontaines des Fees (Grotte)", Select_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 },
-    { "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", "29:Great Fairy's Fountain (Magic)", "29:Feen-Quelle (Magie)", "29:Fontaine Royale des Fees (Magie)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF },
-    { "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", "30:Ganon's Tower - Collapsing", "30:Ganons Turm - Einsturz", "30:Tour de Ganon - Effondrement", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 },
-    { "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", "31:Castle Courtyard", "31:Burghof - Zelda", "31:Cour du Chateau", Select_LoadGame, ENTR_CASTLE_COURTYARD_ZELDA_0 },
-    { "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", "32:Fishing Pond", "32:Fischweiher", "32:Etang", Select_LoadGame, ENTR_FISHING_POND_0 },
-    { "33:" GFXP_KATAKANA "ﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", "33:Bombchu Bowling Alley", "33:Minenbowlingbahn", "33:Bowling Teigneux", Select_LoadGame, ENTR_BOMBCHU_BOWLING_ALLEY_0 },
-    { "34:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 1", "34:Lon Lon Ranch House", "34:Lon Lon-Farm Haus", "34:Maison du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_TALONS_HOUSE },
-    { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", "35:Lon Lon Ranch Silo", "35:Lon Lon-Farm Silo", "35:Silo du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_TOWER },
-    { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", "36:Guard House", "36:Wachposten", "36:Maison de Garde", Select_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 },
-    { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", "37:Potion Shop", "37:Magie-Laden", "37:Apothicaire", Select_LoadGame, ENTR_POTION_SHOP_GRANNY_0 },
-    { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Truhenlotterie", "38:Chasse aux Tresors", Select_LoadGame, ENTR_TREASURE_BOX_SHOP_0 },
-    { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", "39:House Of Skulltula", "39:Skulltulas Haus", "39:Maison des Skulltulas", Select_LoadGame, ENTR_HOUSE_OF_SKULLTULA_0 },
-    { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", "40:Entrance to Market", "40:Eingang zum Marktplatz", "40:Entree de la Place du Marche", Select_LoadGame, ENTR_MARKET_ENTRANCE_NORTH_EXIT },
-    { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", "41:Market", "41:Marktplatz", "41:Place du Marche", Select_LoadGame, ENTR_MARKET_SOUTH_EXIT },
-    { "42:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ", "42:Back Alley", "42:Seitenstrasse", "42:Ruelle", Select_LoadGame, ENTR_BACK_ALLEY_DAY_0 },
-    { "43:" GFXP_HIRAGANA "ﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", "43:Temple of Time Exterior", "43:Vor der Zitadelle der Zeit", "43:Exterieur du Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT },
-    { "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", "44:Link's House", "44:Links Haus", "44:Cabane de Link", Select_LoadGame, ENTR_LINKS_HOUSE_CHILD_SPAWN },
-    { "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", "45:Kakariko House 1", "45:Kakariko Haus 1", "45:Maison du Village Cocorico 1", Select_LoadGame, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 },
-    { "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", "46:Back Alley House 1", "46:Seitenstrasse Haus 1", "46:Maison de la Ruelle 1", Select_LoadGame, ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE },
-    { "47:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", "47:House of the Know-it-All Brothers", "47:Haus der Allwissenden Brueder", "47:Cabane des Freres Je-Sais-Tout", Select_LoadGame, ENTR_KNOW_IT_ALL_BROS_HOUSE_0 },
-    { "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", "48:House of Twins", "48:Haus der Zwillinge", "48:Cabane des Jumeaux", Select_LoadGame, ENTR_TWINS_HOUSE_0 },
-    { "49:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ﾐﾄﾞ" GFXP_HIRAGANA "ﾉｲｴ", "49:Mido's House", "49:Midos Haus", "49:Cabane du Grand Mido", Select_LoadGame, ENTR_MIDOS_HOUSE_0 },
-    { "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", "50:Saria's House", "50:Salias Haus", "50:Cabane de Saria", Select_LoadGame, ENTR_SARIAS_HOUSE_0 },
+    { "19:SPOT20", "19:Lon Lon Ranch", "19:Lon Lon-Farm", "19:Ranch Lon Lon", Select_LoadGame,
+      ENTR_LON_LON_RANCH_ENTRANCE },
+    { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", "20:Temple Of Time", "20:Zitadelle der Zeit", "20:Temple du Temps", Select_LoadGame,
+      ENTR_TEMPLE_OF_TIME_ENTRANCE },
+    { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", "21:Chamber of Sages", "21:Halle der Weisen", "21:Sanctuaire des Sages",
+      Select_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 },
+    { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude", "22:Jeu d'adresse", Select_LoadGame,
+      ENTR_SHOOTING_GALLERY_0 },
+    { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", "23:Castle Courtyard Game",
+      "23:Burghof - Wachen", "23:Cour du Chateau (Infilration)", Select_LoadGame, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 },
+    { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", "24:Grave 1", "24:Grab 1", "24:Tombe 1", Select_LoadGame,
+      ENTR_REDEAD_GRAVE_0 },
+    { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", "25:Grave 2", "25:Grab 2", "25:Tombe 2", Select_LoadGame,
+      ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
+    { "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", "26:Royal Family's Tomb", "26:Koenigsgrab", "26:Tombe Royale", Select_LoadGame,
+      ENTR_ROYAL_FAMILYS_TOMB_0 },
+    { "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", "27:Great Fairy's Fountain (Upgrades)", "27:Feen-Quelle (Upgrades)",
+      "27:Fontaine Royale des Fees (Amel.)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT },
+    { "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", "28:Fairy's Fountain (Grotto)", "28:Feen-Brunnen (Grotte)",
+      "28:Fontaines des Fees (Grotte)", Select_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 },
+    { "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", "29:Great Fairy's Fountain (Magic)", "29:Feen-Quelle (Magie)",
+      "29:Fontaine Royale des Fees (Magie)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF },
+    { "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", "30:Ganon's Tower - Collapsing", "30:Ganons Turm - Einsturz",
+      "30:Tour de Ganon - Effondrement", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 },
+    { "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", "31:Castle Courtyard", "31:Burghof - Zelda",
+      "31:Cour du Chateau", Select_LoadGame, ENTR_CASTLE_COURTYARD_ZELDA_0 },
+    { "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", "32:Fishing Pond", "32:Fischweiher", "32:Etang", Select_LoadGame,
+      ENTR_FISHING_POND_0 },
+    { "33:" GFXP_KATAKANA "ﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", "33:Bombchu Bowling Alley", "33:Minenbowlingbahn", "33:Bowling Teigneux",
+      Select_LoadGame, ENTR_BOMBCHU_BOWLING_ALLEY_0 },
+    { "34:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 1", "34:Lon Lon Ranch House", "34:Lon Lon-Farm Haus",
+      "34:Maison du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_TALONS_HOUSE },
+    { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", "35:Lon Lon Ranch Silo", "35:Lon Lon-Farm Silo",
+      "35:Silo du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_TOWER },
+    { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", "36:Guard House", "36:Wachposten", "36:Maison de Garde", Select_LoadGame,
+      ENTR_MARKET_GUARD_HOUSE_0 },
+    { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", "37:Potion Shop", "37:Magie-Laden", "37:Apothicaire", Select_LoadGame,
+      ENTR_POTION_SHOP_GRANNY_0 },
+    { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Truhenlotterie", "38:Chasse aux Tresors",
+      Select_LoadGame, ENTR_TREASURE_BOX_SHOP_0 },
+    { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", "39:House Of Skulltula", "39:Skulltulas Haus",
+      "39:Maison des Skulltulas", Select_LoadGame, ENTR_HOUSE_OF_SKULLTULA_0 },
+    { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", "40:Entrance to Market", "40:Eingang zum Marktplatz",
+      "40:Entree de la Place du Marche", Select_LoadGame, ENTR_MARKET_ENTRANCE_NORTH_EXIT },
+    { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", "41:Market", "41:Marktplatz", "41:Place du Marche", Select_LoadGame,
+      ENTR_MARKET_SOUTH_EXIT },
+    { "42:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ", "42:Back Alley", "42:Seitenstrasse", "42:Ruelle", Select_LoadGame,
+      ENTR_BACK_ALLEY_DAY_0 },
+    { "43:" GFXP_HIRAGANA "ﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", "43:Temple of Time Exterior", "43:Vor der Zitadelle der Zeit",
+      "43:Exterieur du Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT },
+    { "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", "44:Link's House", "44:Links Haus", "44:Cabane de Link", Select_LoadGame,
+      ENTR_LINKS_HOUSE_CHILD_SPAWN },
+    { "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", "45:Kakariko House 1", "45:Kakariko Haus 1",
+      "45:Maison du Village Cocorico 1", Select_LoadGame, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 },
+    { "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", "46:Back Alley House 1", "46:Seitenstrasse Haus 1", "46:Maison de la Ruelle 1",
+      Select_LoadGame, ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE },
+    { "47:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", "47:House of the Know-it-All Brothers",
+      "47:Haus der Allwissenden Brueder", "47:Cabane des Freres Je-Sais-Tout", Select_LoadGame,
+      ENTR_KNOW_IT_ALL_BROS_HOUSE_0 },
+    { "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", "48:House of Twins", "48:Haus der Zwillinge", "48:Cabane des Jumeaux",
+      Select_LoadGame, ENTR_TWINS_HOUSE_0 },
+    { "49:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ﾐﾄﾞ" GFXP_HIRAGANA "ﾉｲｴ", "49:Mido's House", "49:Midos Haus",
+      "49:Cabane du Grand Mido", Select_LoadGame, ENTR_MIDOS_HOUSE_0 },
+    { "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", "50:Saria's House", "50:Salias Haus",
+      "50:Cabane de Saria", Select_LoadGame, ENTR_SARIAS_HOUSE_0 },
     { "51:" GFXP_HIRAGANA "ｳﾏｺﾞﾔ", "51:Stable", "51:Stall", "51:Etable", Select_LoadGame, ENTR_STABLE_0 },
-    { "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", "52:Grave Keeper's Hut", "52:Huette des Totengraebers", "52:Cabane du Fossoyeur", Select_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 },
-    { "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", "53:Dog Lady's House", "53:Haus der Hunde-Dame", "53:Maison de la Dame du Chien", Select_LoadGame, ENTR_DOG_LADY_HOUSE_0 },
-    { "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", "54:Impa's House", "54:Impas Haus", "54:Maison d'Impa", Select_LoadGame, ENTR_IMPAS_HOUSE_FRONT },
-    { "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", "55:Lakeside Laboratory", "55:Hylia-See Laboratorium", "55:Laboratoire du Lac", Select_LoadGame, ENTR_LAKESIDE_LABORATORY_0 },
-    { "56:" GFXP_KATAKANA "ﾃﾝﾄ", "56:Running Man's Tent", "56:Zelt des Rennlaeufers", "56:Tente du Marathonien", Select_LoadGame, ENTR_CARPENTERS_TENT_0 },
+    { "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", "52:Grave Keeper's Hut", "52:Huette des Totengraebers", "52:Cabane du Fossoyeur",
+      Select_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 },
+    { "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", "53:Dog Lady's House", "53:Haus der Hunde-Dame",
+      "53:Maison de la Dame du Chien", Select_LoadGame, ENTR_DOG_LADY_HOUSE_0 },
+    { "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", "54:Impa's House", "54:Impas Haus",
+      "54:Maison d'Impa", Select_LoadGame, ENTR_IMPAS_HOUSE_FRONT },
+    { "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", "55:Lakeside Laboratory", "55:Hylia-See Laboratorium",
+      "55:Laboratoire du Lac", Select_LoadGame, ENTR_LAKESIDE_LABORATORY_0 },
+    { "56:" GFXP_KATAKANA "ﾃﾝﾄ", "56:Running Man's Tent", "56:Zelt des Rennlaeufers", "56:Tente du Marathonien",
+      Select_LoadGame, ENTR_CARPENTERS_TENT_0 },
     { "57:" GFXP_HIRAGANA "ﾀﾃﾉﾐｾ", "57:Bazaar", "57:Basar", "57:Bazar", Select_LoadGame, ENTR_BAZAAR_0 },
-    { "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", "58:Kokiri Shop", "58:Kokiri-Laden", "58:Boutique Kokiri", Select_LoadGame, ENTR_KOKIRI_SHOP_0 },
-    { "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", "59:Goron Shop", "59:Goronen-Laden", "59:Boutique Goron", Select_LoadGame, ENTR_GORON_SHOP_0 },
-    { "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", "60:Zora Shop", "60:Zora-Laden", "60:Boutique Zora", Select_LoadGame, ENTR_ZORA_SHOP_0 },
-    { "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ  ｸｽﾘﾔ", "61:Closed Shop", "61:Geschlossener Laden", "61:Boutique Fermee", Select_LoadGame, ENTR_POTION_SHOP_KAKARIKO_FRONT },
-    { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", "62:Potion Shop", "62:Magie-Laden", "62:Apothicaire (Boutique)", Select_LoadGame, ENTR_POTION_SHOP_MARKET_0 },
-    { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", "63:Bombchu Shop", "63:Krabbelminen-Laden", "63:Boutique de Missiles Teigneux", Select_LoadGame, ENTR_BOMBCHU_SHOP_0 },
-    { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", "64:Happy Mask Shop", "64:Maskenhaendler", "64:Foire aux Masques", Select_LoadGame, ENTR_HAPPY_MASK_SHOP_0 },
-    { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Trainingsarena", "65:Gymnase Gerudo", Select_LoadGame, ENTR_GERUDO_TRAINING_GROUND_ENTRANCE },
-    { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "66:Inside the Deku Tree", "66:Im Deku-Baum", "66:Arbre Mojo", Select_LoadGame, ENTR_DEKU_TREE_ENTRANCE },
-    { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "67:Gohma's Lair", "67:Gohmas Verlies", "67:Repaire de Gohma", Select_LoadGame, ENTR_DEKU_TREE_BOSS_ENTRANCE },
-    { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", "68:Dodongo's Cavern", "68:Dodongos Hoehle", "68:Caverne Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_ENTRANCE },
-    { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:Koenig Dodongos Verlies", "69:Repaire du Roi Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE },
-    { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "70:Inside Jabu-Jabu's Belly", "70:Jabu-Jabus Bauch", "70:Ventre de Jabu-Jabu", Select_LoadGame, ENTR_JABU_JABU_ENTRANCE },
-    { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "71:Barinade's Lair", "71:Barinades Verlies", "71:Repaire de Barinade", Select_LoadGame, ENTR_JABU_JABU_BOSS_ENTRANCE },
-    { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", "72:Forest Temple", "72:Waldtempel", "72:Temple de la Foret", Select_LoadGame, ENTR_FOREST_TEMPLE_ENTRANCE },
-    { "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "73:Phantom Ganon's Lair", "73:Phantom-Ganons Verlies", "73:Repaire de Ganon Spectral", Select_LoadGame, ENTR_FOREST_TEMPLE_BOSS_ENTRANCE },
-    { "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "74:Bottom of the Well", "74:Grund des Brunnens", "74:Puits", Select_LoadGame, ENTR_BOTTOM_OF_THE_WELL_ENTRANCE },
-    { "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "75:Shadow Temple", "75:Schattentempel", "75:Temple de l'Ombre", Select_LoadGame, ENTR_SHADOW_TEMPLE_ENTRANCE },
-    { "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "76:Bongo Bongo's Lair", "76:Bongo Bongos Verlies", "76:Repaire de Bongo Bongo", Select_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE },
-    { "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", "77:Fire Temple", "77:Feuertempel", "77:Temple du Feu", Select_LoadGame, ENTR_FIRE_TEMPLE_ENTRANCE },
-    { "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "78:Volvagia's Lair", "78:Volvagias Verlies", "78:Repaire de Volcania", Select_LoadGame, ENTR_FIRE_TEMPLE_BOSS_ENTRANCE },
-    { "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", "79:Water Temple", "79:Wassertempel", "79:Temple de l'Eau", Select_LoadGame, ENTR_WATER_TEMPLE_ENTRANCE },
-    { "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "80:Morpha's Lair", "80:Morphas Verlies", "80:Repaire de Morpha", Select_LoadGame, ENTR_WATER_TEMPLE_BOSS_ENTRANCE },
-    { "81:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "81:Spirit Temple", "81:Geistertempel", "81:Temple de l'Esprit", Select_LoadGame, ENTR_SPIRIT_TEMPLE_ENTRANCE },
-    { "82:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", "82:Iron Knuckle's Lair", "82:Eisenprinz' Verlies", "82:Repaire du Hache Viande", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE },
-    { "83:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "83:Twinrova's Lair", "83:Killa Ohmaz' Verlies", "83:Repaire du Duo Malefique", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_2 },
-    { "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", "84:Stairs to Ganondorf's Lair", "84:Treppen zu Ganondorfs Verlies", "84:Repaire de Ganondorf (Escaliers)", Select_LoadGame, ENTR_GANONS_TOWER_0 },
-    { "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", "85:Ganondorf's Lair", "85:Ganondorfs Verlies", "85:Repaire de Ganondorf", Select_LoadGame, ENTR_GANONDORF_BOSS_0 },
-    { "86:" GFXP_HIRAGANA "ｺｵﾘﾉﾄﾞｳｸﾂ", "86:Ice Cavern", "86:Eishoehle", "86:Caverne Polaire", Select_LoadGame, ENTR_ICE_CAVERN_ENTRANCE },
-    { "87:" GFXP_HIRAGANA "ﾊｶｼﾀ" GFXP_KATAKANA "ﾘﾚｰ", "87:Dampe Grave Relay Game", "87:Boris' Grab Staffellauf", "87:Tombe d'Igor", Select_LoadGame, ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE },
-    { "88:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "88:Inside Ganon's Castle", "88:In Ganons Schloss", "88:Tour de Ganon", Select_LoadGame, ENTR_INSIDE_GANONS_CASTLE_ENTRANCE },
-    { "89:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ " GFXP_KATAKANA "ﾃﾞﾓ & ﾊﾞﾄﾙ", "89:Ganon's Lair", "89:Ganons Verlies", "89:Repaire de Ganon", Select_LoadGame, ENTR_GANON_BOSS_0 },
-    { "90:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 1", "90:Escaping Ganon's Castle 1", "90:Flucht aus Ganons Schloss 1", "90:Fuite du Chateau de Ganon 1", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0 },
-    { "91:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 2", "91:Escaping Ganon's Castle 2", "91:Flucht aus Ganons Schloss 2", "91:Fuite du Chateau de Ganon 2", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2 },
-    { "92:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 3", "92:Escaping Ganon's Castle 3", "92:Flucht aus Ganons Schloss 3", "92:Fuite du Chateau de Ganon 3", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4 },
-    { "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", "93:Escaping Ganon's Castle 4", "93:Flucht aus Ganons Schloss 4", "93:Fuite du Chateau de Ganon 4", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6 },
-    { "94:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ ｿﾉｺﾞ", "94:Escaping Ganon's Castle 5", "94:Flucht aus Ganons Schloss 5", "94:Fuite du Chateau de Ganon 5", Select_LoadGame, ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0 },
-    { "95:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 1-2", "95:Thieves' Hideout 1-2", "95:Diebesversteck 1-2", "95:Repaire des Voleurs 1-2", Select_LoadGame, ENTR_THIEVES_HIDEOUT_0 },
-    { "96:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 3-4 9-10", "96:Thieves' Hideout 3-4 9-10", "96:Diebesversteck 3-4 9-10", "96:Repaire des Voleurs 3-4 9-10", Select_LoadGame, ENTR_THIEVES_HIDEOUT_2 },
-    { "97:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 5-6", "97:Thieves' Hideout 5-6", "97:Diebesversteck 5-6", "97:Repaire des Voleurs 5-6", Select_LoadGame, ENTR_THIEVES_HIDEOUT_4 },
-    { "98:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 7-8", "98:Thieves' Hideout 7-8", "98:Diebesversteck 7-8", "98:Repaire des Voleurs 7-8", Select_LoadGame, ENTR_THIEVES_HIDEOUT_6 },
-    { "99:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 11-12", "99:Thieves' Hideout 11-12", "99:Diebesversteck 11-12", "99:Repaire des Voleurs 11-12", Select_LoadGame, ENTR_THIEVES_HIDEOUT_10 },
-    { "100:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 13", "100:Thieves' Hideout 13", "100:Diebesversteck 13", "100:Repaire des Voleurs 13", Select_LoadGame, ENTR_THIEVES_HIDEOUT_12 },
-    { "101:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 0", "101:Grotto 0", "101:Grotte 0", "101:Grotte 0", Select_LoadGame, ENTR_GROTTOS_0 },
-    { "102:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 1", "102:Grotto 1", "102:Grotte 1", "102:Grotte 1", Select_LoadGame, ENTR_GROTTOS_1 },
-    { "103:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 2", "103:Grotto 2", "103:Grotte 2", "103:Grotte 2", Select_LoadGame, ENTR_GROTTOS_2 },
-    { "104:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 3", "104:Grotto 3", "104:Grotte 3", "104:Grotte 3", Select_LoadGame, ENTR_GROTTOS_3 },
-    { "105:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 4", "105:Grotto 4", "105:Grotte 4", "105:Grotte 4", Select_LoadGame, ENTR_GROTTOS_4 },
-    { "106:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 5", "106:Grotto 5", "106:Grotte 5", "106:Grotte 5", Select_LoadGame, ENTR_GROTTOS_5 },
-    { "107:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 6", "107:Grotto 6", "107:Grotte 6", "107:Grotte 6", Select_LoadGame, ENTR_GROTTOS_6 },
-    { "108:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 7", "108:Grotto 7", "108:Grotte 7", "108:Grotte 7", Select_LoadGame, ENTR_GROTTOS_7 },
-    { "109:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 8", "109:Grotto 8", "109:Grotte 8", "109:Grotte 8", Select_LoadGame, ENTR_GROTTOS_8 },
-    { "110:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 9", "110:Grotto 9", "110:Grotte 9", "110:Grotte 9", Select_LoadGame, ENTR_GROTTOS_9 },
-    { "111:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 10", "111:Grotto 10", "111:Grotte 10", "111:Grotte 10", Select_LoadGame, ENTR_GROTTOS_10 },
-    { "112:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 11", "112:Grotto 11", "112:Grotte 11", "112:Grotte 11", Select_LoadGame, ENTR_GROTTOS_11 },
-    { "113:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 12", "113:Grotto 12", "113:Grotte 12", "113:Grotte 12", Select_LoadGame, ENTR_GROTTOS_12 },
-    { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", "114:Grotto 13", "114:Grotte 13", "114:Grotte 13", Select_LoadGame, ENTR_GROTTOS_13 },
-    { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", "115:Goddess Cutscene Environment", "115:Goettinnen Cutscene Umgebung", "115:Carte de la scene des Deesses", Select_LoadGame, ENTR_CUTSCENE_MAP_0 },
-    { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", "116:Test Room", "116:Test Raum", "116:Salle de Test", Select_LoadGame, ENTR_BESITU_0 },
-    { "117:" GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", "117:SRD Map", "117:SRD Karte", "117:Carte SRD", Select_LoadGame, ENTR_SASATEST_0 },
-    { "118:" GFXP_KATAKANA "ﾃｽﾄﾏｯﾌﾟ", "118:Test Map", "118:Test Karte", "118:Carte de Test", Select_LoadGame, ENTR_TEST01_0 },
-    { "119:" GFXP_KATAKANA "ﾃｽﾄﾙｰﾑ", "119:Treasure Chest Warp", "119:Schatzkisten Teleport", "119:Coffres debug", Select_LoadGame, ENTR_TESTROOM_0 },
-    { "120:" GFXP_HIRAGANA "ﾁｭｳ" GFXP_KATAKANA "ｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "120:Stalfos Miniboss Room", "120:Stalfos-Ritter Miniboss Raum", "120:Salle de Miniboss Stalfos", Select_LoadGame, ENTR_SYOTES_0 },
-    { "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "121:Stalfos Boss Room", "121:Stalfos-Ritter Boss Raum", "121:Salle de Boss Stalfos", Select_LoadGame, ENTR_SYOTES2_0 },
-    { "122:Sutaru", "122:Dark Link Room", "122:Schwarzer Link Raum", "122:Salle de Dark Link", Select_LoadGame, ENTR_SUTARU_0 },
-    { "123:jikkenjyou", "123:Shooting Gallery Duplicate", "123:Schiessbude (Duplikat)", "123:Jeu d'adresse (Duplicata)", Select_LoadGame, ENTR_TEST_SHOOTING_GALLERY_0 },
-    { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", "124:depth test", "124:Tiefen Test", "124:Test de Profondeur", Select_LoadGame, ENTR_DEPTH_TEST_0 },
-    { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", "125:Hyrule Garden Game (Broken)", "125:Burghof - Wachen-Minispiel (Kaputt)", "125:Cour du Chateau (Non fonctionnel)", Select_LoadGame, ENTR_HAIRAL_NIWA2_0 },
+    { "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", "58:Kokiri Shop", "58:Kokiri-Laden", "58:Boutique Kokiri", Select_LoadGame,
+      ENTR_KOKIRI_SHOP_0 },
+    { "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", "59:Goron Shop", "59:Goronen-Laden", "59:Boutique Goron",
+      Select_LoadGame, ENTR_GORON_SHOP_0 },
+    { "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", "60:Zora Shop", "60:Zora-Laden", "60:Boutique Zora",
+      Select_LoadGame, ENTR_ZORA_SHOP_0 },
+    { "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ  ｸｽﾘﾔ", "61:Closed Shop", "61:Geschlossener Laden",
+      "61:Boutique Fermee", Select_LoadGame, ENTR_POTION_SHOP_KAKARIKO_FRONT },
+    { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", "62:Potion Shop", "62:Magie-Laden", "62:Apothicaire (Boutique)",
+      Select_LoadGame, ENTR_POTION_SHOP_MARKET_0 },
+    { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", "63:Bombchu Shop", "63:Krabbelminen-Laden", "63:Boutique de Missiles Teigneux",
+      Select_LoadGame, ENTR_BOMBCHU_SHOP_0 },
+    { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", "64:Happy Mask Shop", "64:Maskenhaendler", "64:Foire aux Masques", Select_LoadGame,
+      ENTR_HAPPY_MASK_SHOP_0 },
+    { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Trainingsarena",
+      "65:Gymnase Gerudo", Select_LoadGame, ENTR_GERUDO_TRAINING_GROUND_ENTRANCE },
+    { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "66:Inside the Deku Tree", "66:Im Deku-Baum",
+      "66:Arbre Mojo", Select_LoadGame, ENTR_DEKU_TREE_ENTRANCE },
+    { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "67:Gohma's Lair", "67:Gohmas Verlies",
+      "67:Repaire de Gohma", Select_LoadGame, ENTR_DEKU_TREE_BOSS_ENTRANCE },
+    { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", "68:Dodongo's Cavern", "68:Dodongos Hoehle", "68:Caverne Dodongo",
+      Select_LoadGame, ENTR_DODONGOS_CAVERN_ENTRANCE },
+    { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:Koenig Dodongos Verlies",
+      "69:Repaire du Roi Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE },
+    { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "70:Inside Jabu-Jabu's Belly", "70:Jabu-Jabus Bauch",
+      "70:Ventre de Jabu-Jabu", Select_LoadGame, ENTR_JABU_JABU_ENTRANCE },
+    { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "71:Barinade's Lair", "71:Barinades Verlies",
+      "71:Repaire de Barinade", Select_LoadGame, ENTR_JABU_JABU_BOSS_ENTRANCE },
+    { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", "72:Forest Temple", "72:Waldtempel", "72:Temple de la Foret", Select_LoadGame,
+      ENTR_FOREST_TEMPLE_ENTRANCE },
+    { "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "73:Phantom Ganon's Lair", "73:Phantom-Ganons Verlies",
+      "73:Repaire de Ganon Spectral", Select_LoadGame, ENTR_FOREST_TEMPLE_BOSS_ENTRANCE },
+    { "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "74:Bottom of the Well", "74:Grund des Brunnens",
+      "74:Puits", Select_LoadGame, ENTR_BOTTOM_OF_THE_WELL_ENTRANCE },
+    { "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "75:Shadow Temple", "75:Schattentempel",
+      "75:Temple de l'Ombre", Select_LoadGame, ENTR_SHADOW_TEMPLE_ENTRANCE },
+    { "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "76:Bongo Bongo's Lair", "76:Bongo Bongos Verlies",
+      "76:Repaire de Bongo Bongo", Select_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE },
+    { "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", "77:Fire Temple", "77:Feuertempel", "77:Temple du Feu", Select_LoadGame,
+      ENTR_FIRE_TEMPLE_ENTRANCE },
+    { "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "78:Volvagia's Lair", "78:Volvagias Verlies",
+      "78:Repaire de Volcania", Select_LoadGame, ENTR_FIRE_TEMPLE_BOSS_ENTRANCE },
+    { "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", "79:Water Temple", "79:Wassertempel", "79:Temple de l'Eau", Select_LoadGame,
+      ENTR_WATER_TEMPLE_ENTRANCE },
+    { "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "80:Morpha's Lair", "80:Morphas Verlies",
+      "80:Repaire de Morpha", Select_LoadGame, ENTR_WATER_TEMPLE_BOSS_ENTRANCE },
+    { "81:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "81:Spirit Temple", "81:Geistertempel",
+      "81:Temple de l'Esprit", Select_LoadGame, ENTR_SPIRIT_TEMPLE_ENTRANCE },
+    { "82:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", "82:Iron Knuckle's Lair",
+      "82:Eisenprinz' Verlies", "82:Repaire du Hache Viande", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE },
+    { "83:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "83:Twinrova's Lair", "83:Killa Ohmaz' Verlies",
+      "83:Repaire du Duo Malefique", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_2 },
+    { "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", "84:Stairs to Ganondorf's Lair",
+      "84:Treppen zu Ganondorfs Verlies", "84:Repaire de Ganondorf (Escaliers)", Select_LoadGame, ENTR_GANONS_TOWER_0 },
+    { "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", "85:Ganondorf's Lair",
+      "85:Ganondorfs Verlies", "85:Repaire de Ganondorf", Select_LoadGame, ENTR_GANONDORF_BOSS_0 },
+    { "86:" GFXP_HIRAGANA "ｺｵﾘﾉﾄﾞｳｸﾂ", "86:Ice Cavern", "86:Eishoehle", "86:Caverne Polaire", Select_LoadGame,
+      ENTR_ICE_CAVERN_ENTRANCE },
+    { "87:" GFXP_HIRAGANA "ﾊｶｼﾀ" GFXP_KATAKANA "ﾘﾚｰ", "87:Dampe Grave Relay Game", "87:Boris' Grab Staffellauf",
+      "87:Tombe d'Igor", Select_LoadGame, ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE },
+    { "88:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "88:Inside Ganon's Castle",
+      "88:In Ganons Schloss", "88:Tour de Ganon", Select_LoadGame, ENTR_INSIDE_GANONS_CASTLE_ENTRANCE },
+    { "89:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ " GFXP_KATAKANA "ﾃﾞﾓ & ﾊﾞﾄﾙ", "89:Ganon's Lair",
+      "89:Ganons Verlies", "89:Repaire de Ganon", Select_LoadGame, ENTR_GANON_BOSS_0 },
+    { "90:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 1", "90:Escaping Ganon's Castle 1",
+      "90:Flucht aus Ganons Schloss 1", "90:Fuite du Chateau de Ganon 1", Select_LoadGame,
+      ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0 },
+    { "91:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 2", "91:Escaping Ganon's Castle 2",
+      "91:Flucht aus Ganons Schloss 2", "91:Fuite du Chateau de Ganon 2", Select_LoadGame,
+      ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2 },
+    { "92:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 3", "92:Escaping Ganon's Castle 3",
+      "92:Flucht aus Ganons Schloss 3", "92:Fuite du Chateau de Ganon 3", Select_LoadGame,
+      ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4 },
+    { "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", "93:Escaping Ganon's Castle 4",
+      "93:Flucht aus Ganons Schloss 4", "93:Fuite du Chateau de Ganon 4", Select_LoadGame,
+      ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6 },
+    { "94:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ ｿﾉｺﾞ", "94:Escaping Ganon's Castle 5",
+      "94:Flucht aus Ganons Schloss 5", "94:Fuite du Chateau de Ganon 5", Select_LoadGame,
+      ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0 },
+    { "95:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 1-2", "95:Thieves' Hideout 1-2", "95:Diebesversteck 1-2",
+      "95:Repaire des Voleurs 1-2", Select_LoadGame, ENTR_THIEVES_HIDEOUT_0 },
+    { "96:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 3-4 9-10", "96:Thieves' Hideout 3-4 9-10",
+      "96:Diebesversteck 3-4 9-10", "96:Repaire des Voleurs 3-4 9-10", Select_LoadGame, ENTR_THIEVES_HIDEOUT_2 },
+    { "97:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 5-6", "97:Thieves' Hideout 5-6", "97:Diebesversteck 5-6",
+      "97:Repaire des Voleurs 5-6", Select_LoadGame, ENTR_THIEVES_HIDEOUT_4 },
+    { "98:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 7-8", "98:Thieves' Hideout 7-8", "98:Diebesversteck 7-8",
+      "98:Repaire des Voleurs 7-8", Select_LoadGame, ENTR_THIEVES_HIDEOUT_6 },
+    { "99:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 11-12", "99:Thieves' Hideout 11-12", "99:Diebesversteck 11-12",
+      "99:Repaire des Voleurs 11-12", Select_LoadGame, ENTR_THIEVES_HIDEOUT_10 },
+    { "100:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 13", "100:Thieves' Hideout 13", "100:Diebesversteck 13",
+      "100:Repaire des Voleurs 13", Select_LoadGame, ENTR_THIEVES_HIDEOUT_12 },
+    { "101:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 0", "101:Grotto 0", "101:Grotte 0", "101:Grotte 0", Select_LoadGame,
+      ENTR_GROTTOS_0 },
+    { "102:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 1", "102:Grotto 1", "102:Grotte 1", "102:Grotte 1", Select_LoadGame,
+      ENTR_GROTTOS_1 },
+    { "103:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 2", "103:Grotto 2", "103:Grotte 2", "103:Grotte 2", Select_LoadGame,
+      ENTR_GROTTOS_2 },
+    { "104:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 3", "104:Grotto 3", "104:Grotte 3", "104:Grotte 3", Select_LoadGame,
+      ENTR_GROTTOS_3 },
+    { "105:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 4", "105:Grotto 4", "105:Grotte 4", "105:Grotte 4", Select_LoadGame,
+      ENTR_GROTTOS_4 },
+    { "106:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 5", "106:Grotto 5", "106:Grotte 5", "106:Grotte 5", Select_LoadGame,
+      ENTR_GROTTOS_5 },
+    { "107:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 6", "107:Grotto 6", "107:Grotte 6", "107:Grotte 6", Select_LoadGame,
+      ENTR_GROTTOS_6 },
+    { "108:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 7", "108:Grotto 7", "108:Grotte 7", "108:Grotte 7", Select_LoadGame,
+      ENTR_GROTTOS_7 },
+    { "109:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 8", "109:Grotto 8", "109:Grotte 8", "109:Grotte 8", Select_LoadGame,
+      ENTR_GROTTOS_8 },
+    { "110:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 9", "110:Grotto 9", "110:Grotte 9", "110:Grotte 9", Select_LoadGame,
+      ENTR_GROTTOS_9 },
+    { "111:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 10", "111:Grotto 10", "111:Grotte 10", "111:Grotte 10", Select_LoadGame,
+      ENTR_GROTTOS_10 },
+    { "112:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 11", "112:Grotto 11", "112:Grotte 11", "112:Grotte 11", Select_LoadGame,
+      ENTR_GROTTOS_11 },
+    { "113:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 12", "113:Grotto 12", "113:Grotte 12", "113:Grotte 12", Select_LoadGame,
+      ENTR_GROTTOS_12 },
+    { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", "114:Grotto 13", "114:Grotte 13", "114:Grotte 13", Select_LoadGame,
+      ENTR_GROTTOS_13 },
+    { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", "115:Goddess Cutscene Environment", "115:Goettinnen Cutscene Umgebung",
+      "115:Carte de la scene des Deesses", Select_LoadGame, ENTR_CUTSCENE_MAP_0 },
+    { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", "116:Test Room", "116:Test Raum", "116:Salle de Test",
+      Select_LoadGame, ENTR_BESITU_0 },
+    { "117:" GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", "117:SRD Map", "117:SRD Karte", "117:Carte SRD", Select_LoadGame,
+      ENTR_SASATEST_0 },
+    { "118:" GFXP_KATAKANA "ﾃｽﾄﾏｯﾌﾟ", "118:Test Map", "118:Test Karte", "118:Carte de Test", Select_LoadGame,
+      ENTR_TEST01_0 },
+    { "119:" GFXP_KATAKANA "ﾃｽﾄﾙｰﾑ", "119:Treasure Chest Warp", "119:Schatzkisten Teleport", "119:Coffres debug",
+      Select_LoadGame, ENTR_TESTROOM_0 },
+    { "120:" GFXP_HIRAGANA "ﾁｭｳ" GFXP_KATAKANA "ｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "120:Stalfos Miniboss Room",
+      "120:Stalfos-Ritter Miniboss Raum", "120:Salle de Miniboss Stalfos", Select_LoadGame, ENTR_SYOTES_0 },
+    { "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "121:Stalfos Boss Room", "121:Stalfos-Ritter Boss Raum",
+      "121:Salle de Boss Stalfos", Select_LoadGame, ENTR_SYOTES2_0 },
+    { "122:Sutaru", "122:Dark Link Room", "122:Schwarzer Link Raum", "122:Salle de Dark Link", Select_LoadGame,
+      ENTR_SUTARU_0 },
+    { "123:jikkenjyou", "123:Shooting Gallery Duplicate", "123:Schiessbude (Duplikat)", "123:Jeu d'adresse (Duplicata)",
+      Select_LoadGame, ENTR_TEST_SHOOTING_GALLERY_0 },
+    { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", "124:depth test", "124:Tiefen Test", "124:Test de Profondeur", Select_LoadGame,
+      ENTR_DEPTH_TEST_0 },
+    { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", "125:Hyrule Garden Game (Broken)",
+      "125:Burghof - Wachen-Minispiel (Kaputt)", "125:Cour du Chateau (Non fonctionnel)", Select_LoadGame,
+      ENTR_HAIRAL_NIWA2_0 },
     { "title", "title", "Titelbildschirm", "Ecran-titre", Select_LoadTitle, 0 },
 };
 
-
+// Note about Japanese scene names:
+// * SoH originally lacked the ability to render Hiragana characters using GFXP_HIRAGANA macro.
+//   This is not the case anymore, but Hiragana characters are still written directly here
+//   for the sake of readability and editability.
+// * Dakuten (濁点) characters must be explicitly written using '゛' or '゜'.
+//   Combined characters (such as 'が', 'げ', 'ば', etc) won't render.
 static BetterSceneSelectEntry sBetterScenes[] = {
-    { " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, 8, { 
-        { "Near Drawbridge", "Nahe der Zugbruecke", "Pres du Pont-levis", ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN, 0 },
-        { "From Drawbridge", "Von der Zugbruecke", "Depuis le Pont-levis", ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN, 0 },
-        { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_HYRULE_FIELD_STAIRS_EXIT, 0 },
-        { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_HYRULE_FIELD_RIVER_EXIT, 0 },
-        { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_HYRULE_FIELD_WOODED_EXIT, 0 },
-        { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_HYRULE_FIELD_FENCE_EXIT, 0 },
-        { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_HYRULE_FIELD_ROCKY_PATH, 0 },
-        { "From Lon Lon Ranch", "Von der Lon Lon-Farm", "Depuis le Ranch Lon Lon", ENTR_HYRULE_FIELD_CENTER_EXIT, 0 },
+    // clang-format off
+    { "1:ハイラルへいけ゛ん", " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, 8, {
+        { "はねは゛しのちかく", "Near Drawbridge", "Nahe der Zugbruecke", "Pres du Pont-levis", ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN, 0 },
+        { "はねは゛し　から", "From Drawbridge", "Von der Zugbruecke", "Depuis le Pont-levis", ENTR_HYRULE_FIELD_ON_BRIDGE_SPAWN, 0 },
+        { "カカリコむら　から", "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_HYRULE_FIELD_STAIRS_EXIT, 0 },
+        { "ソ゛ーラかわ　から", "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_HYRULE_FIELD_RIVER_EXIT, 0 },
+        { "まよいのもり　から", "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_HYRULE_FIELD_WOODED_EXIT, 0 },
+        { "ハイリアこはん　から", "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_HYRULE_FIELD_FENCE_EXIT, 0 },
+        { "ケ゛ルト゛のたに　から", "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_HYRULE_FIELD_ROCKY_PATH, 0 },
+        { "ロンロンほ゛くし゛ょう　から", "From Lon Lon Ranch", "Von der Lon Lon-Farm", "Depuis le Ranch Lon Lon", ENTR_HYRULE_FIELD_CENTER_EXIT, 0 },
     }},
-    { " 2:Kokiri Forest", " 2:Kokiri-Wald", " 2:Foret Kokiri", Select_LoadGame, 9, {
-        { "From Links House", "Von Links Haus", "Depuis la Cabane de Link", ENTR_KOKIRI_FOREST_OUTSIDE_LINKS_HOUSE, 0 },
-        { "From Bridge", "Von der Bruecke", "Depuis le Pont", ENTR_KOKIRI_FOREST_LOWER_EXIT, 0 },
-        { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_KOKIRI_FOREST_UPPER_EXIT, 0 },
-        { "From Deku Tree", "Vom Deku-Baum", "Depuis l'Arbre Mojo", ENTR_KOKIRI_FOREST_OUTSIDE_DEKU_TREE, 0 },
-        { "From Kokiri Shop", "Vom Kokiri-Laden", "Depuis la Boutique Kokiri", ENTR_KOKIRI_FOREST_OUTSIDE_SHOP, 0 },
-        { "From Know-It-All Brothers House", "Vom Haus der Allwissenden Brueder", "Depuis la Cabane des Freres Je-Sais-Tout", ENTR_KOKIRI_FOREST_OUTSIDE_KNOW_IT_ALL_HOUSE, 0 },
-        { "From Twins House", "Vom Haus der Zwillinge", "Depuis la Cabane des Jumeaux", ENTR_KOKIRI_FOREST_OUTSIDE_TWINS_HOUSE, 0 },
-        { "From Midos House", "Von Midos Haus", "Depuis la Cabane du Grand Mido", ENTR_KOKIRI_FOREST_OUTSIDE_MIDOS_HOUSE, 0 },
-        { "From Sarias House", "Von Salias Haus", "Depuis la Cabane de Saria", ENTR_KOKIRI_FOREST_OUTSIDE_SARIAS_HOUSE, 0 },
+    { "2:コキリのもり", " 2:Kokiri Forest", " 2:Kokiri-Wald", " 2:Foret Kokiri", Select_LoadGame, 9, {
+        { "リンクのおうち　から", "From Links House", "Von Links Haus", "Depuis la Cabane de Link", ENTR_KOKIRI_FOREST_OUTSIDE_LINKS_HOUSE, 0 },
+        { "はし　から", "From Bridge", "Von der Bruecke", "Depuis le Pont", ENTR_KOKIRI_FOREST_LOWER_EXIT, 0 },
+        { "まよいのもり　から", "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_KOKIRI_FOREST_UPPER_EXIT, 0 },
+        { "テ゛クのきサマ　から", "From Deku Tree", "Vom Deku-Baum", "Depuis l'Arbre Mojo", ENTR_KOKIRI_FOREST_OUTSIDE_DEKU_TREE, 0 },
+        { "コキリのおみせ　から", "From Kokiri Shop", "Vom Kokiri-Laden", "Depuis la Boutique Kokiri", ENTR_KOKIRI_FOREST_OUTSIDE_SHOP, 0 },
+        { "ものしりきょうた゛いのおうち　から", "From Know-It-All Brothers House", "Vom Haus der Allwissenden Brueder", "Depuis la Cabane des Freres Je-Sais-Tout", ENTR_KOKIRI_FOREST_OUTSIDE_KNOW_IT_ALL_HOUSE, 0 },
+        { "ふたこ゛のおうち　から", "From Twins House", "Vom Haus der Zwillinge", "Depuis la Cabane des Jumeaux", ENTR_KOKIRI_FOREST_OUTSIDE_TWINS_HOUSE, 0 },
+        { "ミト゛さまのおやしき　から", "From Midos House", "Von Midos Haus", "Depuis la Cabane du Grand Mido", ENTR_KOKIRI_FOREST_OUTSIDE_MIDOS_HOUSE, 0 },
+        { "サリアのおうち　から", "From Sarias House", "Von Salias Haus", "Depuis la Cabane de Saria", ENTR_KOKIRI_FOREST_OUTSIDE_SARIAS_HOUSE, 0 },
     }},
-    { " 3:Kokiri Buildings", " 3:Kokiri Gebaeude", " 3:Cabanes des Kokiris", Select_LoadGame, 6, {
-        { "Links Bed", "Links Bett", "Lit de Link", ENTR_LINKS_HOUSE_CHILD_SPAWN, 0 },
-        { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0, 0 },
-        { "Twins House", "Haus der Zwillinge", "Cabane des Jumeaux", ENTR_TWINS_HOUSE_0, 0 },
-        { "Know-It-All Brothers House", "Haus der Allwissenden Brueder", "Cabane des Freres Je-Sais-Tout", ENTR_KNOW_IT_ALL_BROS_HOUSE_0, 0 },
-        { "Midos House", "Midos Haus", "Cabane du Grand Mido", ENTR_MIDOS_HOUSE_0, 0 },
-        { "Sarias House", "Salias Haus", "Cabane de Sara", ENTR_SARIAS_HOUSE_0, 0 },
+    { "3:コキリのたてもの", " 3:Kokiri Buildings", " 3:Kokiri Gebaeude", " 3:Cabanes des Kokiris", Select_LoadGame, 6, {
+        { "リンクのおうち", "Links Bed", "Links Bett", "Lit de Link", ENTR_LINKS_HOUSE_CHILD_SPAWN, 0 },
+        { "コキリのおみせ", "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0, 0 },
+        { "ふたこ゛のおうち", "Twins House", "Haus der Zwillinge", "Cabane des Jumeaux", ENTR_TWINS_HOUSE_0, 0 },
+        { "ものしりきょうた゛いのおうち", "Know-It-All Brothers House", "Haus der Allwissenden Brueder", "Cabane des Freres Je-Sais-Tout", ENTR_KNOW_IT_ALL_BROS_HOUSE_0, 0 },
+        { "ミト゛さまのおやしき", "Midos House", "Midos Haus", "Cabane du Grand Mido", ENTR_MIDOS_HOUSE_0, 0 },
+        { "サリアのおうち", "Sarias House", "Salias Haus", "Cabane de Sara", ENTR_SARIAS_HOUSE_0, 0 },
     }},
-    { " 4:Lost Woods", " 4:Verlorene Waelder", " 4:Bois Perdus", Select_LoadGame, 5, { 
-        { "From Kokiri Forest", "Vom Kokiri-Wald", "Depuis la Foret Kokiri", ENTR_LOST_WOODS_SOUTH_EXIT, 0 },
-        { "From Sacred Meadow", "Von der Waldlichtung", "Depuis le Bosquet Sacre", ENTR_LOST_WOODS_NORTH_EXIT, 0 },
-        { "From Goron City", "Vom Goronia", "Depuis le Village Goron", ENTR_LOST_WOODS_TUNNEL_SHORTCUT, 0 },
-        { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_LOST_WOODS_UNDERWATER_SHORTCUT, 0 },
-        { "Bridge", "Bruecke", "Pont", ENTR_LOST_WOODS_BRIDGE_EAST_EXIT, 0 },
+    { "4:まよいのもり", " 4:Lost Woods", " 4:Verlorene Waelder", " 4:Bois Perdus", Select_LoadGame, 5, {
+        { "コキリのもり　から", "From Kokiri Forest", "Vom Kokiri-Wald", "Depuis la Foret Kokiri", ENTR_LOST_WOODS_SOUTH_EXIT, 0 },
+        { "もりのせいいき　から", "From Sacred Meadow", "Von der Waldlichtung", "Depuis le Bosquet Sacre", ENTR_LOST_WOODS_NORTH_EXIT, 0 },
+        { "コ゛ロンシティ　から", "From Goron City", "Vom Goronia", "Depuis le Village Goron", ENTR_LOST_WOODS_TUNNEL_SHORTCUT, 0 },
+        { "ソ゛ーラかわ　から", "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_LOST_WOODS_UNDERWATER_SHORTCUT, 0 },
+        { "はし", "Bridge", "Bruecke", "Pont", ENTR_LOST_WOODS_BRIDGE_EAST_EXIT, 0 },
     }},
-    { " 5:Sacred Forest Meadow", " 5:Waldlichtung", " 5:Bosquet Sacre", Select_LoadGame, 3, { 
-        { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT, 0 },
-        { "From Forest Temple", "Vom Waldtempel", "Depuis le Temple de la Foret", ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE, 0 },
-        { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_WARP_PAD, 0 },
+    { "5:もりのせいいき", " 5:Sacred Forest Meadow", " 5:Waldlichtung", " 5:Bosquet Sacre", Select_LoadGame, 3, {
+        { "まよいのもり　から", "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT, 0 },
+        { "もりのしんて゛ん　から", "From Forest Temple", "Vom Waldtempel", "Depuis le Temple de la Foret", ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE, 0 },
+        { "もりのメヌエット　ワーフ゜", "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_WARP_PAD, 0 },
     }},
-    { " 6:Castle Town Entrance", " 6:Eingang zum Marktplatz", " 6:Entree du Bourg d'Hyrule", Select_LoadGame, 3, {
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT, 0 },
-        { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_MARKET_ENTRANCE_NORTH_EXIT, 0 },
-        { "From Pot House", "Vom Wachposten", "Depuis la Maison des Jarres", ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE, 0 },
+    { "6:し゛ょうかまち　いりく゛ち", " 6:Castle Town Entrance", " 6:Eingang zum Marktplatz", " 6:Entree du Bourg d'Hyrule", Select_LoadGame, 3, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_MARKET_ENTRANCE_NEAR_GUARD_EXIT, 0 },
+        { "し゛ょうかまち　から", "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_MARKET_ENTRANCE_NORTH_EXIT, 0 },
+        { "つほ゛のこや　から", "From Pot House", "Vom Wachposten", "Depuis la Maison des Jarres", ENTR_MARKET_ENTRANCE_OUTSIDE_GUARD_HOUSE, 0 },
     }},
-    { " 7:Market", " 7:Marktplatz", " 7:Place du Marche", Select_LoadGame, 11, {
-        { "From Castle Town Entrance", "Vom Eingang zum Marktplatz", "Depuis l'Entree du Bourg d'Hyrule", ENTR_MARKET_SOUTH_EXIT, 0 },
-        { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY, 0 },
-        { "From Happy Mask Shop", "Vom Maskenhaendler", "Depuis la Foire aux Masques", ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP, 0 },
-        { "From Treasure Box Minigame", "Von der Truhenlotterie", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP, 0 },
-        { "From Castle", "Vom Schloss", "Depuis le Chateau d'Hyrule", ENTR_MARKET_DAY_CASTLE_EXIT, 0 },
-        { "From Temple of Time", "Von der Zitadelle der Zeit", "Depuis le Temple du Temps", ENTR_MARKET_DAY_TEMPLE_EXIT, 0 },
-        { "From Back Alley (Right)", "Von der Seitenstrasse (Rechts)", "Depuis la Ruelle (Droite)", ENTR_MARKET_DAY_3, 0 },
-        { "From Back Alley (Left)", "Von der Seitenstrasse (Links)", "Depuis la Ruelle (Gauche)", ENTR_MARKET_DAY_4, 0 },
-        { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP, 0 },
-        { "From Bazaar Shop", "Vom Basar", "Depuis le Bazar", ENTR_MARKET_DAY_OUTSIDE_BAZAAR, 0 },
-        { "From Bomchu Bowling Minigame", "Von der Minenbowlingbahn", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING, 0 },
+    { "7:し゛ょうかまち", " 7:Market", " 7:Marktplatz", " 7:Place du Marche", Select_LoadGame, 11, {
+        { "し゛ょうかまち　いりく゛ち　から", "From Castle Town Entrance", "Vom Eingang zum Marktplatz", "Depuis l'Entree du Bourg d'Hyrule", ENTR_MARKET_SOUTH_EXIT, 0 },
+        { "まとあてや　から", "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_MARKET_DAY_OUTSIDE_SHOOTING_GALLERY, 0 },
+        { "おめんや　から", "From Happy Mask Shop", "Vom Maskenhaendler", "Depuis la Foire aux Masques", ENTR_MARKET_DAY_OUTSIDE_HAPPY_MASK_SHOP, 0 },
+        { "たからは゛こや　から", "From Treasure Box Minigame", "Von der Truhenlotterie", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_OUTSIDE_TREASURE_BOX_SHOP, 0 },
+        { "おしろ　から", "From Castle", "Vom Schloss", "Depuis le Chateau d'Hyrule", ENTR_MARKET_DAY_CASTLE_EXIT, 0 },
+        { "ときのしんて゛ん　から", "From Temple of Time", "Von der Zitadelle der Zeit", "Depuis le Temple du Temps", ENTR_MARKET_DAY_TEMPLE_EXIT, 0 },
+        { "ろし゛うら　から　(みき゛)", "From Back Alley (Right)", "Von der Seitenstrasse (Rechts)", "Depuis la Ruelle (Droite)", ENTR_MARKET_DAY_3, 0 },
+        { "ろし゛うら　から　(ひた゛り)", "From Back Alley (Left)", "Von der Seitenstrasse (Links)", "Depuis la Ruelle (Gauche)", ENTR_MARKET_DAY_4, 0 },
+        { "くすりや　から", "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_MARKET_DAY_OUTSIDE_POTION_SHOP, 0 },
+        { "なンて゛もや　から", "From Bazaar Shop", "Vom Basar", "Depuis le Bazar", ENTR_MARKET_DAY_OUTSIDE_BAZAAR, 0 },
+        { "ホ゛ムチュウホ゛ウリンク゛から", "From Bomchu Bowling Minigame", "Von der Minenbowlingbahn", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_OUTSIDE_BOMBCHU_BOWLING, 0 },
     }},
-    { " 8:Castle Town Alley", " 8:Seitenstrasse", " 8:Ruelle du Bourg d'Hyrule", Select_LoadGame, 5, { 
-        { "From Market (Right)", "Vom Marktplatz (Rechts)", "Depuis la Place du Marche (Droite)", ENTR_BACK_ALLEY_DAY_0, 0 },
-        { "From Market (Left)", "Vom Marktplatz (Links)", "Depuis la Place du Marche (Gauche)", ENTR_BACK_ALLEY_DAY_1, 0 }, 
-        { "From Alley House", "Vom Seitenstrassenhaus", "Depuis la Maison de la Ruelle", ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE, 0 },
-        { "From Dog House", "Vom Haus der Hunde-Dame", "Depuis la Maison du Chien", ENTR_BACK_ALLEY_DAY_4, 0 }, 
-        { "From Bombchu Shop", "Vom Krabbelminen-Laden", "Depuis le Magasin de Missiles", ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP, 0 },
+    { "8:し゛ょうかまち　ろし゛うら", " 8:Castle Town Alley", " 8:Seitenstrasse", " 8:Ruelle du Bourg d'Hyrule", Select_LoadGame, 5, {
+        { "し゛ょうかまち　から　(みき゛)", "From Market (Right)", "Vom Marktplatz (Rechts)", "Depuis la Place du Marche (Droite)", ENTR_BACK_ALLEY_DAY_0, 0 },
+        { "し゛ょうかまち　から　(ひた゛り)", "From Market (Left)", "Vom Marktplatz (Links)", "Depuis la Place du Marche (Gauche)", ENTR_BACK_ALLEY_DAY_1, 0 },
+        { "ろし゛うらのいえ　から", "From Alley House", "Vom Seitenstrassenhaus", "Depuis la Maison de la Ruelle", ENTR_BACK_ALLEY_DAY_OUTSIDE_MAN_IN_GREEN_HOUSE, 0 },
+        { "いぬのいえ　から", "From Dog House", "Vom Haus der Hunde-Dame", "Depuis la Maison du Chien", ENTR_BACK_ALLEY_DAY_4, 0 },
+        { "ホ゛ムチュウや　から", "From Bombchu Shop", "Vom Krabbelminen-Laden", "Depuis le Magasin de Missiles", ENTR_BACK_ALLEY_DAY_OUTSIDE_BOMBCHU_SHOP, 0 },
     }},
-    { " 9:Castle Town Buildings", " 9:Marktplatz Gebaeude", " 9:Batiments du Bourg d'Hyrule", Select_LoadGame, 10, { 
-        { "Pot House", "Wachposten", "Maison des Jarres", ENTR_MARKET_GUARD_HOUSE_0, 0 },
-        { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_1, 0 },
-        { "Treasure Box Minigame", "Truhenlotterie", "Chasse aux Tresors", ENTR_TREASURE_BOX_SHOP_0, 0 },
-        { "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_MARKET_0, 0 },
-        { "Bombchu Bowling Minigame", "Minenbowlingbahn", "Bowling Teigneux", ENTR_BOMBCHU_BOWLING_ALLEY_0, 0 },
-        { "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_1, 0 },
-        { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 },
-        { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 },
-        { "Dog House", "Haus der Hunde-Dame", "Maison du Chien", ENTR_DOG_LADY_HOUSE_0, 0 },
-        { "Alley House", "Seitenstrassenhaus", "Maison de la Ruelle", ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE, 0 },
+    { "9:し゛ょうかまちのたてもの", " 9:Castle Town Buildings", " 9:Marktplatz Gebaeude", " 9:Batiments du Bourg d'Hyrule", Select_LoadGame, 10, {
+        { "つほ゛のこや", "Pot House", "Wachposten", "Maison des Jarres", ENTR_MARKET_GUARD_HOUSE_0, 0 },
+        { "まとあてや", "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_1, 0 },
+        { "たからは゛こや", "Treasure Box Minigame", "Truhenlotterie", "Chasse aux Tresors", ENTR_TREASURE_BOX_SHOP_0, 0 },
+        { "くすりや", "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_MARKET_0, 0 },
+        { "ホ゛ムチュウホ゛ウリンク゛", "Bombchu Bowling Minigame", "Minenbowlingbahn", "Bowling Teigneux", ENTR_BOMBCHU_BOWLING_ALLEY_0, 0 },
+        { "なンて゛もや", "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_1, 0 },
+        { "おめんや", "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 },
+        { "ホ゛ムチュウや", "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 },
+        { "いぬのいえ", "Dog House", "Haus der Hunde-Dame", "Maison du Chien", ENTR_DOG_LADY_HOUSE_0, 0 },
+        { "ろし゛うらのいえ", "Alley House", "Seitenstrassenhaus", "Maison de la Ruelle", ENTR_BACK_ALLEY_MAN_IN_GREEN_HOUSE, 0 },
     }},
-    { "10:Temple of Time", "10:Zitadelle der Zeit", "10:Temple du Temps", Select_LoadGame, 5, { 
-        { "From Outside", "Von draussen", "Depuis l'Entree", ENTR_TEMPLE_OF_TIME_ENTRANCE, 0 },
-        { "From Master Sword Pedestal", "Vom Podest des Master-Schwerts", "Depuis le Piedestal de l'Epee de Legende", ENTR_TEMPLE_OF_TIME_2, 0 },
-        { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_WARP_PAD, 0 },
-        { "Outside Temple of Time - From Market", "Vor der Zitadelle der Zeit - Vom Marktplatz", "Exterieur du Temple - Depuis la Place du Marche", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, 0 },
-        { "Outside Temple of Time - From Temple of Time", "Vor der Zitadelle der Zeit - Von der Zitadelle der Zeit", "Exterieur du Temple - Depuis le Temple", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE, 0 },
+    { "10:ときのしんて゛ん", "10:Temple of Time", "10:Zitadelle der Zeit", "10:Temple du Temps", Select_LoadGame, 5, {
+        { "そと　から", "From Outside", "Von draussen", "Depuis l'Entree", ENTR_TEMPLE_OF_TIME_ENTRANCE, 0 },
+        { "マスターソート゛のた゛いさ゛　から", "From Master Sword Pedestal", "Vom Podest des Master-Schwerts", "Depuis le Piedestal de l'Epee de Legende", ENTR_TEMPLE_OF_TIME_2, 0 },
+        { "ひかりのフ゜レリュート゛　ワーフ゜", "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_WARP_PAD, 0 },
+        { "ときのしんて゛んまえ - し゛ょうかまち　から", "Outside Temple of Time - From Market", "Vor der Zitadelle der Zeit - Vom Marktplatz", "Exterieur du Temple - Depuis la Place du Marche", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_GOSSIP_STONE_EXIT, 0 },
+        { "ときのしんて゛んまえ - ときのしんて゛ん　から", "Outside Temple of Time - From Temple of Time", "Vor der Zitadelle der Zeit - Von der Zitadelle der Zeit", "Exterieur du Temple - Depuis le Temple", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_OUTSIDE_TEMPLE, 0 },
     }},
-    { "11:Hyrule Castle", "11:Schloss Hyrule", "11:Chateau d'Hyrule", Select_LoadGame, 5, {
-        { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_CASTLE_GROUNDS_SOUTH_EXIT, 0 },
-        { "From Castle Courtyard", "Vom Burghof", "Depuis la Cour du Chateau", ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT, 0 },
-        { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT, 0 },
-        { "From Courtyard Guard Capture", "Von der Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", ENTR_HYRULE_CASTLE_3, 0 },
-        { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC, 0 },
+    { "11:ハイラルし゛ょう", "11:Hyrule Castle", "11:Schloss Hyrule", "11:Chateau d'Hyrule", Select_LoadGame, 5, {
+        { "し゛ょうかまち　から", "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_CASTLE_GROUNDS_SOUTH_EXIT, 0 },
+        { "なかにわ　から", "From Castle Courtyard", "Vom Burghof", "Depuis la Cour du Chateau", ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT, 0 },
+        { "た゛いようせい　から", "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_CASTLE_GROUNDS_GREAT_FAIRY_EXIT, 0 },
+        { "つかまったとき", "From Courtyard Guard Capture", "Von der Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", ENTR_HYRULE_CASTLE_3, 0 },
+        { "た゛いようせい", "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC, 0 },
     }},
-    { "12:Hyrule Castle Courtyard", "12:Burghof", "12:Cour du Chateau", Select_LoadGame, 3, {
-        { "From Crawlspace", "Vom Kriechtunnel", "Depuis l'Entree", ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, 0 },
-        { "From Zelda", "Von Zelda", "Depuis Zelda", ENTR_CASTLE_COURTYARD_GUARDS_DAY_1, 0 },
-        { "Zeldas Courtyard", "Zeldas Burghof", "Depuis la Cour de Zelda", ENTR_CASTLE_COURTYARD_ZELDA_0, 0 },
+    { "12:ハイラルし゛ょう　なかにわ", "12:Hyrule Castle Courtyard", "12:Burghof", "12:Cour du Chateau", Select_LoadGame, 3, {
+        { "ちいさなあな　から", "From Crawlspace", "Vom Kriechtunnel", "Depuis l'Entree", ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, 0 },
+        { "セ゛ルタ゛ひめの　なかにわ　から", "From Zelda", "Von Zelda", "Depuis Zelda", ENTR_CASTLE_COURTYARD_GUARDS_DAY_1, 0 },
+        { "セ゛ルタ゛ひめの　なかにわ", "Zeldas Courtyard", "Zeldas Burghof", "Depuis la Cour de Zelda", ENTR_CASTLE_COURTYARD_ZELDA_0, 0 },
     }},
-    { "13:Lon Lon Ranch", "13:Lon Lon-Farm", "13:Ranch Lon Lon", Select_LoadGame, 5, { 
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LON_LON_RANCH_ENTRANCE, 0 },
-        { "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE, 0 },
-        { "From Stables", "Vom Stall", "Depuis l'Etable", ENTR_LON_LON_RANCH_OUTSIDE_STABLES, 0 },
-        { "From Back Tower", "Vom Silo", "Depuis Silo du Ranch", ENTR_LON_LON_RANCH_OUTSIDE_TOWER, 0 },
-        { "Epona Song Cutscene", "Eponas Song Sequenz", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 },
+    { "13:ロンロンほ゛くし゛ょう", "13:Lon Lon Ranch", "13:Lon Lon-Farm", "13:Ranch Lon Lon", Select_LoadGame, 5, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LON_LON_RANCH_ENTRANCE, 0 },
+        { "タロンのいえ　から", "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", ENTR_LON_LON_RANCH_OUTSIDE_TALONS_HOUSE, 0 },
+        { "うまこ゛や　から", "From Stables", "Vom Stall", "Depuis l'Etable", ENTR_LON_LON_RANCH_OUTSIDE_STABLES, 0 },
+        { "なや　から", "From Back Tower", "Vom Silo", "Depuis Silo du Ranch", ENTR_LON_LON_RANCH_OUTSIDE_TOWER, 0 },
+        { "エホ゜ナのうた　カットシーン", "Epona Song Cutscene", "Eponas Song Sequenz", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 },
     }},
-    { "14:Lon Lon Ranch Buildings", "14:Lon Lon-Farm Gebaeude", "14:Batiments du Ranch Lon Lon", Select_LoadGame, 3, {
-        { "Ranch House", "Farmhaus", "Maison du Ranch", ENTR_LON_LON_BUILDINGS_TALONS_HOUSE, 0 },
-        { "Stables", "Stall", "Etable du Ranch", ENTR_STABLE_0, 0 },
-        { "Back Tower", "Silo", "Silo du Ranch", ENTR_LON_LON_BUILDINGS_TOWER, 0 },
+    { "14:ロンロンほ゛くし゛ょうのたてもの", "14:Lon Lon Ranch Buildings", "14:Lon Lon-Farm Gebaeude", "14:Batiments du Ranch Lon Lon", Select_LoadGame, 3, {
+        { "タロンのいえ", "Ranch House", "Farmhaus", "Maison du Ranch", ENTR_LON_LON_BUILDINGS_TALONS_HOUSE, 0 },
+        { "うまこ゛や", "Stables", "Stall", "Etable du Ranch", ENTR_STABLE_0, 0 },
+        { "なや", "Back Tower", "Silo", "Silo du Ranch", ENTR_LON_LON_BUILDINGS_TOWER, 0 },
     }},
-    { "15:Kakariko Village", "15:Kakariko", "15:Village Cocorico", Select_LoadGame, 15, {
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_KAKARIKO_VILLAGE_FRONT_GATE, 0 },
-        { "From Death Mountain", "Vom Todesberg", "Depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_GUARD_GATE, 0 },
-        { "From Graveyard", "Vom Friedhof", "Depuis le Cimetiere", ENTR_KAKARIKO_VILLAGE_SOUTHEAST_EXIT, 0 },
-        { "From Bazaar", "Vom Basar", "Depuis le Bazar", ENTR_KAKARIKO_VILLAGE_OUTSIDE_BAZAAR, 0 },
-        { "From Bottom of Well", "Vom Grund des Brunnens", "Depuis le Puits", ENTR_KAKARIKO_VILLAGE_OUTSIDE_BOTTOM_OF_THE_WELL, 0 },
-        { "From Boss House", "Vom Haus des Bosses", "Depuis la Maison du Boss", ENTR_KAKARIKO_VILLAGE_OUTSIDE_CENTER_GUEST_HOUSE, 0 },
-        { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_FRONT, 0 },
-        { "From Potion Shop (Back Entrance)", "Vom Magie-Laden (Hintereingang)", "Depuis l'Apothicaire (Entree Arriere)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_BACK, 0 },
-        { "From Grannys Potion Shop", "Von Omas Magie-Laden", "Depuis l'Apothicaire (Vieille Femme)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY, 0 },
-        { "From Impas House", "Von Impas Haus", "Depuis la Maison d'Impa", ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_FRONT, 0 },
-        { "From Impas House (Cow)", "Von Impas Haus (Kuh)", "Depuis la Maison d'Impa (Vache)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_BACK, 0 },
-        { "From Windmill", "Von der Windmuehle", "Depuis le Moulin", ENTR_KAKARIKO_VILLAGE_OUTSIDE_WINDMILL, 0 },
-        { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOOTING_GALLERY, 0 },
-        { "From Skulltula House", "Vom Haus der Skulltulas", "Depuis la Maison des Skulltulas", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SKULKLTULA_HOUSE, 0 },
-        { "Owl Drop Spot from Death Mountain", "Eulen-Absetzpunkt vom Todesberg", "Point de chute du Hibou depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_OWL_DROP, 0 },
+    { "15:カカリコむら", "15:Kakariko Village", "15:Kakariko", "15:Village Cocorico", Select_LoadGame, 15, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_KAKARIKO_VILLAGE_FRONT_GATE, 0 },
+        { "テ゛スマウンテン　から", "From Death Mountain", "Vom Todesberg", "Depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_GUARD_GATE, 0 },
+        { "ほ゛ち　から", "From Graveyard", "Vom Friedhof", "Depuis le Cimetiere", ENTR_KAKARIKO_VILLAGE_SOUTHEAST_EXIT, 0 },
+        { "なンて゛もや　から", "From Bazaar", "Vom Basar", "Depuis le Bazar", ENTR_KAKARIKO_VILLAGE_OUTSIDE_BAZAAR, 0 },
+        { "いと゛のそこ　から", "From Bottom of Well", "Vom Grund des Brunnens", "Depuis le Puits", ENTR_KAKARIKO_VILLAGE_OUTSIDE_BOTTOM_OF_THE_WELL, 0 },
+        { "なか゛や　から", "From Boss House", "Vom Haus des Bosses", "Depuis la Maison du Boss", ENTR_KAKARIKO_VILLAGE_OUTSIDE_CENTER_GUEST_HOUSE, 0 },
+        { "くすりや　から", "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_FRONT, 0 },
+        { "くすりや　から(うらく゛ち)", "From Potion Shop (Back Entrance)", "Vom Magie-Laden (Hintereingang)", "Depuis l'Apothicaire (Entree Arriere)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_POTION_SHOP_BACK, 0 },
+        { "オハ゛ハ゛のくすりや　から", "From Grannys Potion Shop", "Von Omas Magie-Laden", "Depuis l'Apothicaire (Vieille Femme)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY, 0 },
+        { "インハ゜のおやしき　から", "From Impas House", "Von Impas Haus", "Depuis la Maison d'Impa", ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_FRONT, 0 },
+        { "インハ゜のおやしき(ウシ)　から", "From Impas House (Cow)", "Von Impas Haus (Kuh)", "Depuis la Maison d'Impa (Vache)", ENTR_KAKARIKO_VILLAGE_OUTSIDE_IMPAS_HOUSE_BACK, 0 },
+        { "ふうしゃ　から", "From Windmill", "Von der Windmuehle", "Depuis le Moulin", ENTR_KAKARIKO_VILLAGE_OUTSIDE_WINDMILL, 0 },
+        { "まとあてや　から", "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOOTING_GALLERY, 0 },
+        { "スタルチュラハウス　から", "From Skulltula House", "Vom Haus der Skulltulas", "Depuis la Maison des Skulltulas", ENTR_KAKARIKO_VILLAGE_OUTSIDE_SKULKLTULA_HOUSE, 0 },
+        { "テ゛スマウンテンから　フクロウて゛　とんて゛くるは゛しょ", "Owl Drop Spot from Death Mountain", "Eulen-Absetzpunkt vom Todesberg", "Point de chute du Hibou depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_OWL_DROP, 0 },
     }},
-    { "16:Kakariko Buildings", "16:Kakariko Gebaeude", "16:Batiments du Village Cocorico", Select_LoadGame, 9, {
-        { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_0, 0 },
-        { "Grannys Potion Shop", "Omas Magie-Laden", "Apothicaire (Vieille Femme)", ENTR_POTION_SHOP_GRANNY_0, 0 },
-        { "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_0, 0 },
-        { "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_KAKARIKO_FRONT, 0 },
-        { "Impas House", "Impas Haus", "Maison d'Impa", ENTR_IMPAS_HOUSE_FRONT, 0 },
-        { "Impas House (Near Cow)", "Impas Haus (Kuh)", "Maison d'Impa (Vache)", ENTR_IMPAS_HOUSE_BACK, 0 },
-        { "Boss House", "Haus des Bosses", "Maison du Boss", ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, 0 },
-        { "Windmill", "Windmuehle", "Moulin", ENTR_WINDMILL_AND_DAMPES_GRAVE_WINDMILL, 0 },
-        { "Skulltula House", "Haus der Skulltulas", "Maison des Skulltulas", ENTR_HOUSE_OF_SKULLTULA_0, 0 },
+    { "16:カカリコむらのたてもの", "16:Kakariko Buildings", "16:Kakariko Gebaeude", "16:Batiments du Village Cocorico", Select_LoadGame, 9, {
+        { "まとあてや", "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_0, 0 },
+        { "オハ゛ハ゛のくすりや", "Grannys Potion Shop", "Omas Magie-Laden", "Apothicaire (Vieille Femme)", ENTR_POTION_SHOP_GRANNY_0, 0 },
+        { "なンて゛もや", "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_0, 0 },
+        { "くすりや", "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_KAKARIKO_FRONT, 0 },
+        { "インハ゜のおやしき", "Impas House", "Impas Haus", "Maison d'Impa", ENTR_IMPAS_HOUSE_FRONT, 0 },
+        { "インハ゜のおやしき(ウシのちかく)", "Impas House (Near Cow)", "Impas Haus (Kuh)", "Maison d'Impa (Vache)", ENTR_IMPAS_HOUSE_BACK, 0 },
+        { "なか゛や", "Boss House", "Haus des Bosses", "Maison du Boss", ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, 0 },
+        { "ふうしゃ", "Windmill", "Windmuehle", "Moulin", ENTR_WINDMILL_AND_DAMPES_GRAVE_WINDMILL, 0 },
+        { "スタルチュラハウス", "Skulltula House", "Haus der Skulltulas", "Maison des Skulltulas", ENTR_HOUSE_OF_SKULLTULA_0, 0 },
     }}, 
-    { "17:Graveyard", "17:Friedhof", "17:Cimetiere", Select_LoadGame, 9, {
-        { "From Kakariko", "Von Kakariko", "Depuis l'Apothicaire", ENTR_GRAVEYARD_ENTRANCE, 0 },
-        { "From Shadow Temple", "Vom Schattentempel", "Depuis le Temple de l'Ombre", ENTR_GRAVEYARD_OUTSIDE_TEMPLE, 0 },
-        { "From Gravekeepers Hut", "Von der Huette des Totengraebers", "Depuis la Cabane du Fossoyeur", ENTR_GRAVEYARD_OUTSIDE_DAMPES_HUT, 0 },
-        { "From Dampes Grave", "Von Boris' Grab", "Depuis la Tombe d'Igor", ENTR_GRAVEYARD_DAMPES_GRAVE_EXIT, 0 },
-        { "From Shield Grave", "Vom Schild-Grab", "Depuis la Tombe au Bouclier", ENTR_GRAVEYARD_SHIELD_GRAVE_EXIT, 0 },
-        { "From Redead Grave", "Vom Zombie-Grab", "Depuis la Tombe au Effrois", ENTR_GRAVEYARD_HEART_PIECE_GRAVE_EXIT, 0 },
-        { "From Royal Familys Tomb", "Vom Koenigsgrab", "Depuis la Tombe Royale", ENTR_GRAVEYARD_ROYAL_TOMB_EXIT, 0 },
-        { "Inside Dampe's Hut", "Huette des Totengraebers", "A l'interieur de la Cabane du Fossoyeur", ENTR_GRAVEKEEPERS_HUT_0, 0 },
-        { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_WARP_PAD, 0 },
+    { "17:ほ゛ち", "17:Graveyard", "17:Friedhof", "17:Cimetiere", Select_LoadGame, 9, {
+        { "カカリコむら　から", "From Kakariko", "Von Kakariko", "Depuis l'Apothicaire", ENTR_GRAVEYARD_ENTRANCE, 0 },
+        { "やみのしんて゛ん　から", "From Shadow Temple", "Vom Schattentempel", "Depuis le Temple de l'Ombre", ENTR_GRAVEYARD_OUTSIDE_TEMPLE, 0 },
+        { "はかもりのこや　から", "From Gravekeepers Hut", "Von der Huette des Totengraebers", "Depuis la Cabane du Fossoyeur", ENTR_GRAVEYARD_OUTSIDE_DAMPES_HUT, 0 },
+        { "タ゛ンヘ゜イのはか　から", "From Dampes Grave", "Von Boris' Grab", "Depuis la Tombe d'Igor", ENTR_GRAVEYARD_DAMPES_GRAVE_EXIT, 0 },
+        { "たてのはか　から", "From Shield Grave", "Vom Schild-Grab", "Depuis la Tombe au Bouclier", ENTR_GRAVEYARD_SHIELD_GRAVE_EXIT, 0 },
+        { "リーテ゛ットのはか　から", "From Redead Grave", "Vom Zombie-Grab", "Depuis la Tombe au Effrois", ENTR_GRAVEYARD_HEART_PIECE_GRAVE_EXIT, 0 },
+        { "おうけのはかあな　から", "From Royal Familys Tomb", "Vom Koenigsgrab", "Depuis la Tombe Royale", ENTR_GRAVEYARD_ROYAL_TOMB_EXIT, 0 },
+        { "はかもりのこや", "Inside Dampe's Hut", "Huette des Totengraebers", "A l'interieur de la Cabane du Fossoyeur", ENTR_GRAVEKEEPERS_HUT_0, 0 },
+        { "やみのノクターン　ワーフ゜", "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_WARP_PAD, 0 },
     }},
-    { "18:Graves", "18:Graeber", "18:Tombes", Select_LoadGame, 5, {
-        { "Dampes Grave Minigame", "Boris' Grab-Minispiel", "Tour du Cimetiere d'Igor", ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE, 0 },
-        { "Royal Familys Tomb", "Koenigsgrab", "Tombe Royale", ENTR_ROYAL_FAMILYS_TOMB_0, 0 },
-        { "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Sequenz", "Tombe Royale, Cinematique du Chant du Soleil", ENTR_ROYAL_FAMILYS_TOMB_1, 0 },
-        { "Treasure Chest Grave", "Schatzkisten Grab", "Tombe au Coffre", ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, 0 },
-        { "ReDead Grave", "Zombie Grab", "Tombe au Effrois", ENTR_REDEAD_GRAVE_0, 0 },
+    { "18:はかあな", "18:Graves", "18:Graeber", "18:Tombes", Select_LoadGame, 5, {
+        { "タ゛ンヘ゜イのはか", "Dampes Grave Minigame", "Boris' Grab-Minispiel", "Tour du Cimetiere d'Igor", ENTR_WINDMILL_AND_DAMPES_GRAVE_GRAVE, 0 },
+        { "おうけのはかあな", "Royal Familys Tomb", "Koenigsgrab", "Tombe Royale", ENTR_ROYAL_FAMILYS_TOMB_0, 0 },
+        { "おうけのはかあな　たいようのうたカットシーン", "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Sequenz", "Tombe Royale, Cinematique du Chant du Soleil", ENTR_ROYAL_FAMILYS_TOMB_1, 0 },
+        { "たからは゛このはかあな", "Treasure Chest Grave", "Schatzkisten Grab", "Tombe au Coffre", ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, 0 },
+        { "リーテ゛ットのはか", "ReDead Grave", "Zombie Grab", "Tombe au Effrois", ENTR_REDEAD_GRAVE_0, 0 },
     }},
-    { "19:Death Mountain Trail", "19:Gebirgspfad", "19:Mont du Peril", Select_LoadGame, 6, {
-        { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT, 0 },
-        { "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT, 0 },
-        { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_DEATH_MOUNTAIN_TRAIL_SUMMIT_EXIT, 0 },
-        { "From Dodongos Cavern", "Von Dodongos Hoehle", "Depuis la Caverne Dodongo", ENTR_DEATH_MOUNTAIN_TRAIL_OUTSIDE_DODONGOS_CAVERN, 0 },
-        { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_DEATH_MOUNTAIN_TRAIL_GREAT_FAIRY_EXIT, 0 },
-        { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT, 0 },
+    { "19:テ゛スマウンテンとさ゛んと゛う", "19:Death Mountain Trail", "19:Gebirgspfad", "19:Mont du Peril", Select_LoadGame, 6, {
+        { "カカリコむら　から", "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_DEATH_MOUNTAIN_TRAIL_BOTTOM_EXIT, 0 },
+        { "コ゛ロンシティ　から", "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT, 0 },
+        { "テ゛スマウンテンかこう　から", "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_DEATH_MOUNTAIN_TRAIL_SUMMIT_EXIT, 0 },
+        { "ト゛ト゛ンコ゛のと゛うくつ　から", "From Dodongos Cavern", "Von Dodongos Hoehle", "Depuis la Caverne Dodongo", ENTR_DEATH_MOUNTAIN_TRAIL_OUTSIDE_DODONGOS_CAVERN, 0 },
+        { "た゛いようせい　から", "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_DEATH_MOUNTAIN_TRAIL_GREAT_FAIRY_EXIT, 0 },
+        { "た゛いようせい", "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT, 0 },
     }},
-    { "20:Goron City", "20:Goronia", "20:Village Goron", Select_LoadGame, 5, {
-        { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_GORON_CITY_UPPER_EXIT, 0 },
-        { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_GORON_CITY_DARUNIA_ROOM_EXIT, 0 },
-        { "From Goron City Shop", "Vom Goronen-Laden", "Depuis la Boutique Goron", ENTR_GORON_CITY_OUTSIDE_SHOP, 0 },
-        { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_GORON_CITY_TUNNEL_SHORTCUT, 0 },
-        { "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 },
+    { "20:コ゛ロンシティ", "20:Goron City", "20:Goronia", "20:Village Goron", Select_LoadGame, 5, {
+        { "テ゛スマウンテンとさ゛んと゛う　から", "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_GORON_CITY_UPPER_EXIT, 0 },
+        { "テ゛スマウンテンかこう　から", "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_GORON_CITY_DARUNIA_ROOM_EXIT, 0 },
+        { "コ゛ロンのおみせ　から", "From Goron City Shop", "Vom Goronen-Laden", "Depuis la Boutique Goron", ENTR_GORON_CITY_OUTSIDE_SHOP, 0 },
+        { "まよいのもり　から", "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_GORON_CITY_TUNNEL_SHORTCUT, 0 },
+        { "コ゛ロンのおみせ", "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 },
     }},
-    { "21:Death Mountain Crater", "21:Todeskrater", "21:Cratere du Peril", Select_LoadGame, 6, {
-        { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT, 0 },
-        { "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT, 0 },
-        { "From Fire Temple", "Vom Feuertempel", "Depuis le Temple du Feu", ENTR_DEATH_MOUNTAIN_CRATER_OUTSIDE_TEMPLE, 0 },
-        { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DEATH_MOUNTAIN_CRATER_GREAT_FAIRY_EXIT, 0 },
-        { "Great Fairy", "Feen-Quelle", "Depuis la Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC, 0 },
-        { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, 0 },
+    { "21:テ゛スマウンテンかこう", "21:Death Mountain Crater", "21:Todeskrater", "21:Cratere du Peril", Select_LoadGame, 6, {
+        { "テ゛スマウンテンとさ゛んと゛う　から", "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT, 0 },
+        { "コ゛ロンシティ　から", "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT, 0 },
+        { "ほのおのしんて゛ん　から", "From Fire Temple", "Vom Feuertempel", "Depuis le Temple du Feu", ENTR_DEATH_MOUNTAIN_CRATER_OUTSIDE_TEMPLE, 0 },
+        { "た゛いようせい　から", "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DEATH_MOUNTAIN_CRATER_GREAT_FAIRY_EXIT, 0 },
+        { "た゛いようせい", "Great Fairy", "Feen-Quelle", "Depuis la Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC, 0 },
+        { "ほのおのホ゛レロ　ワーフ゜", "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, 0 },
     }},
-    { "22:Zora River", "22:Zora-Fluss", "22:Riviere Zora", Select_LoadGame, 3, {
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_ZORAS_RIVER_WEST_EXIT, 0 },
-        { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_RIVER_WATERFALL_EXIT, 0 },
-        { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT, 0 },
+    { "22:ソ゛ーラかわ", "22:Zora River", "22:Zora-Fluss", "22:Riviere Zora", Select_LoadGame, 3, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_ZORAS_RIVER_WEST_EXIT, 0 },
+        { "ソ゛ーラのさと　から", "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_RIVER_WATERFALL_EXIT, 0 },
+        { "まよいのもり　から", "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_ZORAS_RIVER_UNDERWATER_SHORTCUT, 0 },
     }},
-    { "23:Zoras Domain", "23:Zoras Reich", "23:Domaine Zora", Select_LoadGame, 5, {
-        { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_ZORAS_DOMAIN_ENTRANCE, 0 },
-        { "From Zoras Fountain", "Von Zoras Quelle", "Depuis la Fontaine Zora", ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT, 0 },
-        { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT, 0 },
-        { "From Zora Shop", "Vom Zora-Laden", "Depuis la Boutique Zora", ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP, 0 },
-        { "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 },
+    { "23:ソ゛ーラのさと", "23:Zoras Domain", "23:Zoras Reich", "23:Domaine Zora", Select_LoadGame, 5, {
+        { "ソ゛ーラかわ　から", "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_ZORAS_DOMAIN_ENTRANCE, 0 },
+        { "ソ゛ーラのいす゛み　から", "From Zoras Fountain", "Von Zoras Quelle", "Depuis la Fontaine Zora", ENTR_ZORAS_DOMAIN_KING_ZORA_EXIT, 0 },
+        { "ハイリアこはん　から", "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_ZORAS_DOMAIN_UNDERWATER_SHORTCUT, 0 },
+        { "ソ゛ーラのおみせ　から", "From Zora Shop", "Vom Zora-Laden", "Depuis la Boutique Zora", ENTR_ZORAS_DOMAIN_OUTSIDE_SHOP, 0 },
+        { "ソ゛ーラのおみせ", "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 },
     }},
-    { "24:Zoras Fountain", "24:Zoras Quelle", "24:Fontaine Zora", Select_LoadGame, 5, {
-        { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT, 0 },
-        { "From Jabu Jabu", "Von Jabu-Jabu", "Depuis Jabu-Jabu", ENTR_ZORAS_FOUNTAIN_OUTSIDE_JABU_JABU, 0 },
-        { "From Ice Cavern", "Von der Eishoehle", "Depuis la Caverne Polaire", ENTR_ZORAS_FOUNTAIN_OUTSIDE_ICE_CAVERN, 0 },
-        { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY, 0 },
-        { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF, 0 },
+    { "24:ソ゛ーラのいす゛み", "24:Zoras Fountain", "24:Zoras Quelle", "24:Fontaine Zora", Select_LoadGame, 5, {
+        { "ソ゛ーラのさと　から", "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_FOUNTAIN_TUNNEL_EXIT, 0 },
+        { "シ゛ャフ゛シ゛ャフ゛さま　から", "From Jabu Jabu", "Von Jabu-Jabu", "Depuis Jabu-Jabu", ENTR_ZORAS_FOUNTAIN_OUTSIDE_JABU_JABU, 0 },
+        { "こおりのと゛うくつ　から", "From Ice Cavern", "Von der Eishoehle", "Depuis la Caverne Polaire", ENTR_ZORAS_FOUNTAIN_OUTSIDE_ICE_CAVERN, 0 },
+        { "た゛いようせい　から", "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_ZORAS_FOUNTAIN_OUTSIDE_GREAT_FAIRY, 0 },
+        { "た゛いようせい", "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF, 0 },
     }},
-    { "25:Lake Hylia", "25:Hylia-See", "25:Lac Hylia", Select_LoadGame, 7, {
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LAKE_HYLIA_NORTH_EXIT, 0 },
-        { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_LAKE_HYLIA_RIVER_EXIT, 0 },
-        { "From Water Temple", "Vom Wassertempel", "Depuis le Temple de l'Eau", ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE, 0 },
-        { "From Fishing Pond", "Vom Fischweiher", "Depuis l'Etang", ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND, 0 },
-        { "From Laboratory", "Vom Laboratorium", "Depuis le Laboratoire du Lac", ENTR_LAKE_HYLIA_OUTSIDE_LAB, 0 },
-        { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT, 0 },
-        { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_WARP_PAD, 0 },
+    { "25:ハイリアこはん", "25:Lake Hylia", "25:Hylia-See", "25:Lac Hylia", Select_LoadGame, 7, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LAKE_HYLIA_NORTH_EXIT, 0 },
+        { "ケ゛ルト゛のたに　から", "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_LAKE_HYLIA_RIVER_EXIT, 0 },
+        { "みす゛のしんて゛ん　から", "From Water Temple", "Vom Wassertempel", "Depuis le Temple de l'Eau", ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE, 0 },
+        { "つりほ゛り　から", "From Fishing Pond", "Vom Fischweiher", "Depuis l'Etang", ENTR_LAKE_HYLIA_OUTSIDE_FISHING_POND, 0 },
+        { "みす゛うみけんきゅうし゛ょ　から", "From Laboratory", "Vom Laboratorium", "Depuis le Laboratoire du Lac", ENTR_LAKE_HYLIA_OUTSIDE_LAB, 0 },
+        { "ソ゛ーラのさと　から", "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_LAKE_HYLIA_UNDERWATER_SHORTCUT, 0 },
+        { "みす゛のセレナーテ゛　ワーフ゜", "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_WARP_PAD, 0 },
     }},
-    { "26:Lake Hylia Buildings", "26:Hylia-See Gebaeude", "26:Batiments du Lac Hylia", Select_LoadGame, 2, { 
-        { "Laboratory", "Laboratorium", "Laboratoire du Lac", ENTR_LAKESIDE_LABORATORY_0, 0 }, 
-        { "Fishing Pond Minigame", "Fischweiher", "Etang", ENTR_FISHING_POND_0, 0 },
+    { "26:ハイリアこはんのたてもの", "26:Lake Hylia Buildings", "26:Hylia-See Gebaeude", "26:Batiments du Lac Hylia", Select_LoadGame, 2, {
+        { "みす゛うみけんきゅうし゛ょ", "Laboratory", "Laboratorium", "Laboratoire du Lac", ENTR_LAKESIDE_LABORATORY_0, 0 },
+        { "つりほ゛り", "Fishing Pond Minigame", "Fischweiher", "Etang", ENTR_FISHING_POND_0, 0 },
     }},
-    { "27:Gerudo Valley", "27:Gerudotal", "27:Vallee Gerudo", Select_LoadGame, 5, {
-        { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_GERUDO_VALLEY_EAST_EXIT, 0 },
-        { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_GERUDO_VALLEY_WEST_EXIT, 0 },
-        { "From Carpenter's Tent", "Vom Zelt der Zimmerleute", "Depuis la Tente du Charpentier", ENTR_GERUDO_VALLEY_OUTSIDE_TENT, 0 },
-        { "Carpenter's Tent/ Running Man Minigame", "Zelt der Zimmerleute/ Rennlaeufer Minispiel", "Tente du Charpentier/ Marathonien", ENTR_CARPENTERS_TENT_0, 0 },
-        { "Thrown out of Fortress", "Aus der Festung geworfen", "Expulse de la Forteresse", ENTR_GERUDO_VALLEY_1, 0 },
+    { "27:ケ゛ルト゛のたに", "27:Gerudo Valley", "27:Gerudotal", "27:Vallee Gerudo", Select_LoadGame, 5, {
+        { "ハイラルへいけ゛ん　から", "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_GERUDO_VALLEY_EAST_EXIT, 0 },
+        { "ケ゛ルト゛のとりて゛　から", "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_GERUDO_VALLEY_WEST_EXIT, 0 },
+        { "た゛いくのテント　から", "From Carpenter's Tent", "Vom Zelt der Zimmerleute", "Depuis la Tente du Charpentier", ENTR_GERUDO_VALLEY_OUTSIDE_TENT, 0 },
+        { "た゛いくのテント/マラソンマンミニケ゛ーム", "Carpenter's Tent/ Running Man Minigame", "Zelt der Zimmerleute/ Rennlaeufer Minispiel", "Tente du Charpentier/ Marathonien", ENTR_CARPENTERS_TENT_0, 0 },
+        { "とりて゛からほうりた゛されたとき", "Thrown out of Fortress", "Aus der Festung geworfen", "Expulse de la Forteresse", ENTR_GERUDO_VALLEY_1, 0 },
     }},
-    { "28:Gerudo Fortress", "28:Gerudo-Festung", "28:Forteresse Gerudo", Select_LoadGame, 18, {
-        { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_GERUDOS_FORTRESS_EAST_EXIT, 0 },
-        { "From Gerudo Training Ground", "Von der Gerudo-Trainingsarena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, 0 },
-        { "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", ENTR_GERUDOS_FORTRESS_GATE_EXIT, 0 },
-        { "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", ENTR_GERUDOS_FORTRESS_16, 0 },
-        { "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", ENTR_GERUDOS_FORTRESS_17, 0 },
-        { "From Thieves Hideout (1)", "Vom Diebesversteck (1)", "Depuis le Repaire des Voleurs (1)", ENTR_GERUDOS_FORTRESS_1, 0 },
-        { "From Thieves Hideout (2)", "Vom Diebesversteck (2)", "Depuis le Repaire des Voleurs (2)", ENTR_GERUDOS_FORTRESS_2, 0 },
-        { "From Thieves Hideout (3)", "Vom Diebesversteck (3)", "Depuis le Repaire des Voleurs (3)", ENTR_GERUDOS_FORTRESS_3, 0 },
-        { "From Thieves Hideout (4)", "Vom Diebesversteck (4)", "Depuis le Repaire des Voleurs (4)", ENTR_GERUDOS_FORTRESS_4, 0 },
-        { "From Thieves Hideout (5)", "Vom Diebesversteck (5)", "Depuis le Repaire des Voleurs (5)", ENTR_GERUDOS_FORTRESS_5, 0 },
-        { "From Thieves Hideout (6)", "Vom Diebesversteck (6)", "Depuis le Repaire des Voleurs (6)", ENTR_GERUDOS_FORTRESS_6, 0 },
-        { "From Thieves Hideout (7)", "Vom Diebesversteck (7)", "Depuis le Repaire des Voleurs (7)", ENTR_GERUDOS_FORTRESS_7, 0 },
-        { "From Thieves Hideout (8)", "Vom Diebesversteck (8)", "Depuis le Repaire des Voleurs (8)", ENTR_GERUDOS_FORTRESS_8, 0 },
-        { "From Thieves Hideout (9)", "Vom Diebesversteck (9)", "Depuis le Repaire des Voleurs (9)", ENTR_GERUDOS_FORTRESS_9, 0 },
-        { "From Thieves Hideout (10)", "Vom Diebesversteck (10)", "Depuis le Repaire des Voleurs (10)", ENTR_GERUDOS_FORTRESS_10, 0 },
-        { "From Thieves Hideout (11)", "Vom Diebesversteck (11)", "Depuis le Repaire des Voleurs (11)", ENTR_GERUDOS_FORTRESS_11, 0 },
-        { "From Thieves Hideout (12)", "Vom Diebesversteck (12)", "Depuis le Repaire des Voleurs (12)", ENTR_GERUDOS_FORTRESS_12, 0 },
-        { "From Thieves Hideout (13)", "Vom Diebesversteck (13)", "Depuis le Repaire des Voleurs (13)", ENTR_GERUDOS_FORTRESS_13, 0 },
+    { "28:ケ゛ルト゛のとりて゛", "28:Gerudo Fortress", "28:Gerudo-Festung", "28:Forteresse Gerudo", Select_LoadGame, 18, {
+        { "ケ゛ルト゛のたに　から", "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_GERUDOS_FORTRESS_EAST_EXIT, 0 },
+        { "ケ゛ルト゛のしゅうれんし゛ょう　から", "From Gerudo Training Ground", "Von der Gerudo-Trainingsarena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, 0 },
+        { "け゛んえいのさは゛く　から", "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", ENTR_GERUDOS_FORTRESS_GATE_EXIT, 0 },
+        { "やふ゛さめ", "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", ENTR_GERUDOS_FORTRESS_16, 0 },
+        { "ろうや", "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", ENTR_GERUDOS_FORTRESS_17, 0 },
+        { "アシ゛ト　から(1)", "From Thieves Hideout (1)", "Vom Diebesversteck (1)", "Depuis le Repaire des Voleurs (1)", ENTR_GERUDOS_FORTRESS_1, 0 },
+        { "アシ゛ト　から(2)", "From Thieves Hideout (2)", "Vom Diebesversteck (2)", "Depuis le Repaire des Voleurs (2)", ENTR_GERUDOS_FORTRESS_2, 0 },
+        { "アシ゛ト　から(3)", "From Thieves Hideout (3)", "Vom Diebesversteck (3)", "Depuis le Repaire des Voleurs (3)", ENTR_GERUDOS_FORTRESS_3, 0 },
+        { "アシ゛ト　から(4)", "From Thieves Hideout (4)", "Vom Diebesversteck (4)", "Depuis le Repaire des Voleurs (4)", ENTR_GERUDOS_FORTRESS_4, 0 },
+        { "アシ゛ト　から(5)", "From Thieves Hideout (5)", "Vom Diebesversteck (5)", "Depuis le Repaire des Voleurs (5)", ENTR_GERUDOS_FORTRESS_5, 0 },
+        { "アシ゛ト　から(6)", "From Thieves Hideout (6)", "Vom Diebesversteck (6)", "Depuis le Repaire des Voleurs (6)", ENTR_GERUDOS_FORTRESS_6, 0 },
+        { "アシ゛ト　から(7)", "From Thieves Hideout (7)", "Vom Diebesversteck (7)", "Depuis le Repaire des Voleurs (7)", ENTR_GERUDOS_FORTRESS_7, 0 },
+        { "アシ゛ト　から(8)", "From Thieves Hideout (8)", "Vom Diebesversteck (8)", "Depuis le Repaire des Voleurs (8)", ENTR_GERUDOS_FORTRESS_8, 0 },
+        { "アシ゛ト　から(9)", "From Thieves Hideout (9)", "Vom Diebesversteck (9)", "Depuis le Repaire des Voleurs (9)", ENTR_GERUDOS_FORTRESS_9, 0 },
+        { "アシ゛ト　から(10)", "From Thieves Hideout (10)", "Vom Diebesversteck (10)", "Depuis le Repaire des Voleurs (10)", ENTR_GERUDOS_FORTRESS_10, 0 },
+        { "アシ゛ト　から(11)", "From Thieves Hideout (11)", "Vom Diebesversteck (11)", "Depuis le Repaire des Voleurs (11)", ENTR_GERUDOS_FORTRESS_11, 0 },
+        { "アシ゛ト　から(12)", "From Thieves Hideout (12)", "Vom Diebesversteck (12)", "Depuis le Repaire des Voleurs (12)", ENTR_GERUDOS_FORTRESS_12, 0 },
+        { "アシ゛ト　から(13)", "From Thieves Hideout (13)", "Vom Diebesversteck (13)", "Depuis le Repaire des Voleurs (13)", ENTR_GERUDOS_FORTRESS_13, 0 },
     }},
-    { "29:Thieves Hideout", "29:Diebesversteck", "29:Repaire des Voleurs", Select_LoadGame, 13, {
-        { "From Gerudo Fortress (1)", "Von der Gerudo-Festung (1)", "Depuis la Forteresse Gerudo (1)", ENTR_THIEVES_HIDEOUT_0, 0 },
-        { "From Gerudo Fortress (2)", "Von der Gerudo-Festung (2)", "Depuis la Forteresse Gerudo (2)", ENTR_THIEVES_HIDEOUT_1, 0 },
-        { "From Gerudo Fortress (3)", "Von der Gerudo-Festung (3)", "Depuis la Forteresse Gerudo (3)", ENTR_THIEVES_HIDEOUT_2, 0 },
-        { "From Gerudo Fortress (4)", "Von der Gerudo-Festung (4)", "Depuis la Forteresse Gerudo (4)", ENTR_THIEVES_HIDEOUT_3, 0 },
-        { "From Gerudo Fortress (5)", "Von der Gerudo-Festung (5)", "Depuis la Forteresse Gerudo (5)", ENTR_THIEVES_HIDEOUT_4, 0 },
-        { "From Gerudo Fortress (6)", "Von der Gerudo-Festung (6)", "Depuis la Forteresse Gerudo (6)", ENTR_THIEVES_HIDEOUT_5, 0 },
-        { "From Gerudo Fortress (7)", "Von der Gerudo-Festung (7)", "Depuis la Forteresse Gerudo (7)", ENTR_THIEVES_HIDEOUT_6, 0 },
-        { "From Gerudo Fortress (8)", "Von der Gerudo-Festung (8)", "Depuis la Forteresse Gerudo (8)", ENTR_THIEVES_HIDEOUT_7, 0 },
-        { "From Gerudo Fortress (9)", "Von der Gerudo-Festung (9)", "Depuis la Forteresse Gerudo (9)", ENTR_THIEVES_HIDEOUT_8, 0 },
-        { "From Gerudo Fortress (10)", "Von der Gerudo-Festung (10)", "Depuis la Forteresse Gerudo (10)", ENTR_THIEVES_HIDEOUT_9, 0 },
-        { "From Gerudo Fortress (11)", "Von der Gerudo-Festung (11)", "Depuis la Forteresse Gerudo (11)", ENTR_THIEVES_HIDEOUT_10, 0 },
-        { "From Gerudo Fortress (12)", "Von der Gerudo-Festung (12)", "Depuis la Forteresse Gerudo (12)", ENTR_THIEVES_HIDEOUT_11, 0 },
-        { "From Gerudo Fortress (13)", "Von der Gerudo-Festung (13)", "Depuis la Forteresse Gerudo (13)", ENTR_THIEVES_HIDEOUT_12, 0 },
+    { "29:とうそ゛くた゛んのアシ゛ト", "29:Thieves Hideout", "29:Diebesversteck", "29:Repaire des Voleurs", Select_LoadGame, 13, {
+        { "ケ゛ルト゛のとりて゛　から(1)", "From Gerudo Fortress (1)", "Von der Gerudo-Festung (1)", "Depuis la Forteresse Gerudo (1)", ENTR_THIEVES_HIDEOUT_0, 0 },
+        { "ケ゛ルト゛のとりて゛　から(2)", "From Gerudo Fortress (2)", "Von der Gerudo-Festung (2)", "Depuis la Forteresse Gerudo (2)", ENTR_THIEVES_HIDEOUT_1, 0 },
+        { "ケ゛ルト゛のとりて゛　から(3)", "From Gerudo Fortress (3)", "Von der Gerudo-Festung (3)", "Depuis la Forteresse Gerudo (3)", ENTR_THIEVES_HIDEOUT_2, 0 },
+        { "ケ゛ルト゛のとりて゛　から(4)", "From Gerudo Fortress (4)", "Von der Gerudo-Festung (4)", "Depuis la Forteresse Gerudo (4)", ENTR_THIEVES_HIDEOUT_3, 0 },
+        { "ケ゛ルト゛のとりて゛　から(5)", "From Gerudo Fortress (5)", "Von der Gerudo-Festung (5)", "Depuis la Forteresse Gerudo (5)", ENTR_THIEVES_HIDEOUT_4, 0 },
+        { "ケ゛ルト゛のとりて゛　から(6)", "From Gerudo Fortress (6)", "Von der Gerudo-Festung (6)", "Depuis la Forteresse Gerudo (6)", ENTR_THIEVES_HIDEOUT_5, 0 },
+        { "ケ゛ルト゛のとりて゛　から(7)", "From Gerudo Fortress (7)", "Von der Gerudo-Festung (7)", "Depuis la Forteresse Gerudo (7)", ENTR_THIEVES_HIDEOUT_6, 0 },
+        { "ケ゛ルト゛のとりて゛　から(8)", "From Gerudo Fortress (8)", "Von der Gerudo-Festung (8)", "Depuis la Forteresse Gerudo (8)", ENTR_THIEVES_HIDEOUT_7, 0 },
+        { "ケ゛ルト゛のとりて゛　から(9)", "From Gerudo Fortress (9)", "Von der Gerudo-Festung (9)", "Depuis la Forteresse Gerudo (9)", ENTR_THIEVES_HIDEOUT_8, 0 },
+        { "ケ゛ルト゛のとりて゛　から(10)", "From Gerudo Fortress (10)", "Von der Gerudo-Festung (10)", "Depuis la Forteresse Gerudo (10)", ENTR_THIEVES_HIDEOUT_9, 0 },
+        { "ケ゛ルト゛のとりて゛　から(11)", "From Gerudo Fortress (11)", "Von der Gerudo-Festung (11)", "Depuis la Forteresse Gerudo (11)", ENTR_THIEVES_HIDEOUT_10, 0 },
+        { "ケ゛ルト゛のとりて゛　から(12)", "From Gerudo Fortress (12)", "Von der Gerudo-Festung (12)", "Depuis la Forteresse Gerudo (12)", ENTR_THIEVES_HIDEOUT_11, 0 },
+        { "ケ゛ルト゛のとりて゛　から(13)", "From Gerudo Fortress (13)", "Von der Gerudo-Festung (13)", "Depuis la Forteresse Gerudo (13)", ENTR_THIEVES_HIDEOUT_12, 0 },
     }},
-    { "30:Haunted Wasteland", "30:Geisterwueste", "30:Desert Hante", Select_LoadGame, 2, {
-        { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_HAUNTED_WASTELAND_EAST_EXIT, 0 },
-        { "From Desert Colossus", "Vom Wuestenkoloss", "Depuis le Colosse du Desert", ENTR_HAUNTED_WASTELAND_WEST_EXIT, 0 },
+    { "30:け゛んえいのさは゛く", "30:Haunted Wasteland", "30:Geisterwueste", "30:Desert Hante", Select_LoadGame, 2, {
+        { "ケ゛ルト゛のとりて゛　から", "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_HAUNTED_WASTELAND_EAST_EXIT, 0 },
+        { "きょた゛いし゛ゃしんそ゛う　から", "From Desert Colossus", "Vom Wuestenkoloss", "Depuis le Colosse du Desert", ENTR_HAUNTED_WASTELAND_WEST_EXIT, 0 },
     }},
-    { "31:Desert Colossus", "31:Wuestenkoloss", "31:Colosse du Desert", Select_LoadGame, 7, {
-        { "From Haunted Wasteland", "Von der Geisterwueste", "Depuis le Desert Hante", ENTR_DESERT_COLOSSUS_EAST_EXIT, 0 },
-        { "From Spirit Temple", "Vom Geistertempel", "Depuis le Temple de l'Esprit", ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE, 0 },
-        { "From Spirit Temple (Left Hand)", "Vom Geistertempel (Linke Hand)", "Depuis le Temple de l'Esprit (Main Gauche)", ENTR_DESERT_COLOSSUS_2, 0 },
-        { "From Spirit Temple (Right Hand)", "Vom Geistertempel (Rechte Hand)", "Depuis le Temple de l'Esprit (Main Droite)", ENTR_DESERT_COLOSSUS_3, 0 },
-        { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT, 0 },
-        { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, 0 },
-        { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_WARP_PAD, 0 },
+    { "31:きょた゛いし゛ゃしんそ゛う", "31:Desert Colossus", "31:Wuestenkoloss", "31:Colosse du Desert", Select_LoadGame, 7, {
+        { "け゛んえいのさは゛く　から", "From Haunted Wasteland", "Von der Geisterwueste", "Depuis le Desert Hante", ENTR_DESERT_COLOSSUS_EAST_EXIT, 0 },
+        { "たましいのしんて゛ん　から", "From Spirit Temple", "Vom Geistertempel", "Depuis le Temple de l'Esprit", ENTR_DESERT_COLOSSUS_OUTSIDE_TEMPLE, 0 },
+        { "たましいのしんて゛ん　から(ひた゛りて)", "From Spirit Temple (Left Hand)", "Vom Geistertempel (Linke Hand)", "Depuis le Temple de l'Esprit (Main Gauche)", ENTR_DESERT_COLOSSUS_2, 0 },
+        { "たましいのしんて゛ん　から(みき゛て)", "From Spirit Temple (Right Hand)", "Vom Geistertempel (Rechte Hand)", "Depuis le Temple de l'Esprit (Main Droite)", ENTR_DESERT_COLOSSUS_3, 0 },
+        { "た゛いようせい　から", "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DESERT_COLOSSUS_GREAT_FAIRY_EXIT, 0 },
+        { "た゛いようせい", "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, 0 },
+        { "たましいのレクイエム　ワーフ゜", "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_WARP_PAD, 0 },
     }},
-    { "32:Deku Tree", "32:Deku-Baum", "32:Arbre Mojo", Select_LoadGame, 3, {
-        { "Entrance", "Eingang", "Entree", ENTR_DEKU_TREE_ENTRANCE, 1 },
-        { "From Gohma's Lair", "Von Gohmas Kampf", "Depuis le Repaire de Gohma", ENTR_DEKU_TREE_BOSS_DOOR, 1 },
-        { "Gohma's Lair", "Gohmas Kampf", "Repaire de Gohma", ENTR_DEKU_TREE_BOSS_ENTRANCE, 0 },
+    { "32:テ゛クのきサマのなか", "32:Deku Tree", "32:Deku-Baum", "32:Arbre Mojo", Select_LoadGame, 3, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_DEKU_TREE_ENTRANCE, 1 },
+        { "コ゛ーマのへや　から", "From Gohma's Lair", "Von Gohmas Kampf", "Depuis le Repaire de Gohma", ENTR_DEKU_TREE_BOSS_DOOR, 1 },
+        { "コ゛ーマのへや", "Gohma's Lair", "Gohmas Kampf", "Repaire de Gohma", ENTR_DEKU_TREE_BOSS_ENTRANCE, 0 },
     }},
-    { "33:Dodongos Cavern", "33:Dodongos Hoehle", "33:Caverne Dodongo", Select_LoadGame, 3, {
-        { "Entrance", "Eingang", "Entree", ENTR_DODONGOS_CAVERN_ENTRANCE, 1 },
-        { "From King Dodongo", "Von Koenig Dodongo", "Depuis le Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_DOOR, 1 },
-        { "King Dodongo's Lair", "Koenig Dodongos Kampf", "Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE, 0 },
+    { "33:ト゛ト゛ンコ゛のと゛うくつ", "33:Dodongos Cavern", "33:Dodongos Hoehle", "33:Caverne Dodongo", Select_LoadGame, 3, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_DODONGOS_CAVERN_ENTRANCE, 1 },
+        { "キンク゛ト゛ト゛ンコ゛のへや　から", "From King Dodongo", "Von Koenig Dodongo", "Depuis le Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_DOOR, 1 },
+        { "キンク゛ト゛ト゛ンコ゛のへや", "King Dodongo's Lair", "Koenig Dodongos Kampf", "Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_ENTRANCE, 0 },
     }},
-    { "34:Jabu Jabu", "34:Jabu-Jabu", "34:Jabu-Jabu", Select_LoadGame, 2, {
-        { "Entrance", "Eingang", "Entree", ENTR_JABU_JABU_ENTRANCE, 1 },
-        { "Barinade's Lair", "Barinades Kampf", "Repaire de Barinade", ENTR_JABU_JABU_BOSS_ENTRANCE, 0 },
+    { "34:シ゛ャフ゛シ゛ャフ゛さまのおなか", "34:Jabu Jabu", "34:Jabu-Jabu", "34:Jabu-Jabu", Select_LoadGame, 2, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_JABU_JABU_ENTRANCE, 1 },
+        { "ハ゛リネート゛のへや", "Barinade's Lair", "Barinades Kampf", "Repaire de Barinade", ENTR_JABU_JABU_BOSS_ENTRANCE, 0 },
     }},
-    { "35:Forest Temple", "35:Waldtempel", "35:Temple de la Foret", Select_LoadGame, 4, {
-        { "Entrance", "Eingang", "Entree", ENTR_FOREST_TEMPLE_ENTRANCE, 1 },
-        { "Crushing Room", "Der Fallende Decke Raum", "Salle de Broyage", ENTR_FOREST_TEMPLE_2, 1 },
-        { "Before Phantom Ganon", "Vor Phantom-Ganon", "Avant Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_DOOR, 1 },
-        { "Phantom Ganon's Lair", "Phantom-Ganons Kampf", "Repaire de Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_ENTRANCE, 0 },
+    { "35:もりのしんて゛ん", "35:Forest Temple", "35:Waldtempel", "35:Temple de la Foret", Select_LoadGame, 4, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_FOREST_TEMPLE_ENTRANCE, 1 },
+        { "てんし゛ょうか゛おちてくるへや", "Crushing Room", "Der Fallende Decke Raum", "Salle de Broyage", ENTR_FOREST_TEMPLE_2, 1 },
+        { "ファントムカ゛ノンまえ", "Before Phantom Ganon", "Vor Phantom-Ganon", "Avant Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_DOOR, 1 },
+        { "ファントムカ゛ノンのへや", "Phantom Ganon's Lair", "Phantom-Ganons Kampf", "Repaire de Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_ENTRANCE, 0 },
     }},
-    { "36:Fire Temple", "36:Feuertempel", "36:Temple du Feu", Select_LoadGame, 3, {
-        { "Entrance", "Eingang", "Entrance", ENTR_FIRE_TEMPLE_ENTRANCE, 1 },
-        { "Before Volvagia", "Vor Volvagia", "Avant Volvagia", ENTR_FIRE_TEMPLE_BOSS_DOOR, 1 },
-        { "Volvagia's Lair", "Volvagias Kampf", "Repaire de Volcania", ENTR_FIRE_TEMPLE_BOSS_ENTRANCE, 0 },
+    { "36:ほのおのしんて゛ん", "36:Fire Temple", "36:Feuertempel", "36:Temple du Feu", Select_LoadGame, 3, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entrance", ENTR_FIRE_TEMPLE_ENTRANCE, 1 },
+        { "ウ゛ァルハ゛シ゛アまえ", "Before Volvagia", "Vor Volvagia", "Avant Volvagia", ENTR_FIRE_TEMPLE_BOSS_DOOR, 1 },
+        { "ウ゛ァルハ゛シ゛アのへや", "Volvagia's Lair", "Volvagias Kampf", "Repaire de Volcania", ENTR_FIRE_TEMPLE_BOSS_ENTRANCE, 0 },
     }},
-    { "37:Water Temple", "37:Wassertempel", "37:Temple de l'Eau", Select_LoadGame, 2, { 
-        { "Entrance", "Eingang", "Entree", ENTR_WATER_TEMPLE_ENTRANCE, 1 },
-        { "Morpha's Lair", "Morphas Kampf", "Repaire de Morpha", ENTR_WATER_TEMPLE_BOSS_ENTRANCE, 0 },
+    { "37:みす゛のしんて゛ん", "37:Water Temple", "37:Wassertempel", "37:Temple de l'Eau", Select_LoadGame, 2, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_WATER_TEMPLE_ENTRANCE, 1 },
+        { "モーファのへや", "Morpha's Lair", "Morphas Kampf", "Repaire de Morpha", ENTR_WATER_TEMPLE_BOSS_ENTRANCE, 0 },
     }},
-    { "38:Shadow Temple", "38:Schattentempel", "38:Temple de l'Ombre", Select_LoadGame, 3, {
-        { "Entrance", "Eingang", "Entree", ENTR_SHADOW_TEMPLE_ENTRANCE, 1 },
-        { "Outside Bongo Bongo", "Vor Bongo Bongo", "Avant Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_DOOR, 1 },
-        { "Bongo Bongo's Lair", "Bongo Bongos Kampf", "Repaire de Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE, 1 },
+    { "38:やみのしんて゛ん", "38:Shadow Temple", "38:Schattentempel", "38:Temple de l'Ombre", Select_LoadGame, 3, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_SHADOW_TEMPLE_ENTRANCE, 1 },
+        { "ホ゛ンコ゛ホ゛ンコ゛まえ", "Outside Bongo Bongo", "Vor Bongo Bongo", "Avant Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_DOOR, 1 },
+        { "ホ゛ンコ゛ホ゛ンコ゛のへや", "Bongo Bongo's Lair", "Bongo Bongos Kampf", "Repaire de Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_ENTRANCE, 1 },
     }},
-    { "39:Spirit Temple", "39:Geistertempel", "39:Temple de l'Esprit", Select_LoadGame, 6, {
-        { "Entrance", "Eingang", "Entree", ENTR_SPIRIT_TEMPLE_ENTRANCE, 1 },
-        { "From Left Hand", "Von der linken Hand", "Depuis la Main Gauche", ENTR_SPIRIT_TEMPLE_2, 1 },
-        { "From Right Hand", "Von der rechten Hand", "Depuis la Main Droite", ENTR_SPIRIT_TEMPLE_3, 1 },
-        { "Before Twinrova", "Vor den Killa Ohmaz", "Avant le Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_DOOR, 1 },
-        { "Nabooru Fight", "Naborus Kampf", "Combat contre Nabooru", ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE, 0 },
-        { "Twinrova's Lair", "Killa Ohmaz' Kampf", "Repaire du Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_2, 0 },
+    { "39:たましいのしんて゛ん", "39:Spirit Temple", "39:Geistertempel", "39:Temple de l'Esprit", Select_LoadGame, 6, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_SPIRIT_TEMPLE_ENTRANCE, 1 },
+        { "ひた゛りて　から", "From Left Hand", "Von der linken Hand", "Depuis la Main Gauche", ENTR_SPIRIT_TEMPLE_2, 1 },
+        { "みき゛て　から", "From Right Hand", "Von der rechten Hand", "Depuis la Main Droite", ENTR_SPIRIT_TEMPLE_3, 1 },
+        { "ツインローハ゛まえ", "Before Twinrova", "Vor den Killa Ohmaz", "Avant le Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_DOOR, 1 },
+        { "ナホ゛ールせん", "Nabooru Fight", "Naborus Kampf", "Combat contre Nabooru", ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE, 0 },
+        { "ツインローハ゛のへや", "Twinrova's Lair", "Killa Ohmaz' Kampf", "Repaire du Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_2, 0 },
     }},
-    { "40:Ganons Castle", "40:Ganons Schloss", "40:Chateau de Ganon", Select_LoadGame, 9, {
-        { "Entrance", "Eingang", "Entree", ENTR_INSIDE_GANONS_CASTLE_ENTRANCE, 1 },
-        { "From Tower", "Vom Tower", "Depuis la Tour", ENTR_INSIDE_GANONS_CASTLE_1, 1 },
-        { "Stairs to Lair - From Castle", "Stufen zum Verlies - Vom Schloss", "Escaliers vers Repaire - Depuis le Chateau", ENTR_GANONS_TOWER_0, 0 },
-        { "Stairs to Lair - From Ganondorf's Lair", "Stufen zum Verlies - Von Ganondorfs Verlies", "Escaliers vers Repaire - Depuis le Repaire de Ganondorf", ENTR_GANONS_TOWER_1, 0 },
-        { "Ganondorf's Lair", "Ganondorfs Verlies", "Repaire de Ganondorf", ENTR_GANONDORF_BOSS_0, 0 },
-        { "Ganondorf Defeated", "Ganondorf Besiegt", "Ganondorf Vaincu", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5, 0 },
-        { "Ganondorf Defeated (2)", "Ganondorf Besiegt (2)", "Ganondorf Vaincu (2)", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1, 0 },
-        { "Ganon's Lair", "Ganons Kampf", "Repaire de Ganon", ENTR_GANON_BOSS_0, 0 },
-        { "Ganon Death Cutscene", "Ganons Todessequenz", "Cinematique de la Mort de Ganon", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, 0 },
+    { "40:カ゛ノンし゛ょう", "40:Ganons Castle", "40:Ganons Schloss", "40:Chateau de Ganon", Select_LoadGame, 9, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_INSIDE_GANONS_CASTLE_ENTRANCE, 1 },
+        { "カ゛ノンのとう　から", "From Tower", "Vom Tower", "Depuis la Tour", ENTR_INSIDE_GANONS_CASTLE_1, 1 },
+        { "カ゛ノンへのかいた゛ん - しろから", "Stairs to Lair - From Castle", "Stufen zum Verlies - Vom Schloss", "Escaliers vers Repaire - Depuis le Chateau", ENTR_GANONS_TOWER_0, 0 },
+        { "カ゛ノンへのかいた゛ん - カ゛ノント゛ロフのへやから", "Stairs to Lair - From Ganondorf's Lair", "Stufen zum Verlies - Von Ganondorfs Verlies", "Escaliers vers Repaire - Depuis le Repaire de Ganondorf", ENTR_GANONS_TOWER_1, 0 },
+        { "カ゛ノント゛ロフのへや", "Ganondorf's Lair", "Ganondorfs Verlies", "Repaire de Ganondorf", ENTR_GANONDORF_BOSS_0, 0 },
+        { "カ゛ノント゛ロフをたおしたあと", "Ganondorf Defeated", "Ganondorf Besiegt", "Ganondorf Vaincu", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5, 0 },
+        { "カ゛ノント゛ロフをたおしたあと(2)", "Ganondorf Defeated (2)", "Ganondorf Besiegt (2)", "Ganondorf Vaincu (2)", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1, 0 },
+        { "カ゛ノンのへや", "Ganon's Lair", "Ganons Kampf", "Repaire de Ganon", ENTR_GANON_BOSS_0, 0 },
+        { "カ゛ノンのさいこ゛カットシーン", "Ganon Death Cutscene", "Ganons Todessequenz", "Cinematique de la Mort de Ganon", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, 0 },
     }},
-    { "41:Bottom of the Well", "41:Grund des Brunnens", "41:Puits", Select_LoadGame, 1, {
-        { "Entrance", "Eingang", "Entree", ENTR_BOTTOM_OF_THE_WELL_ENTRANCE, 1 },
+    { "41:いと゛のそこ", "41:Bottom of the Well", "41:Grund des Brunnens", "41:Puits", Select_LoadGame, 1, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_BOTTOM_OF_THE_WELL_ENTRANCE, 1 },
     }},
-    { "42:Ice Cavern", "42:Eishoehle", "42:Caverne Polaire", Select_LoadGame, 1, {
-        { "Entrance", "Eingang", "Entree", ENTR_ICE_CAVERN_ENTRANCE, 1 },
+    { "42:こおりのと゛うくつ", "42:Ice Cavern", "42:Eishoehle", "42:Caverne Polaire", Select_LoadGame, 1, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_ICE_CAVERN_ENTRANCE, 1 },
     }},
-    { "43:Gerudo Training Ground", "43:Gerudo-Trainingsarena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
-        { "Entrance", "Eingang", "Entree", ENTR_GERUDO_TRAINING_GROUND_ENTRANCE, 1 },
+    { "43:ケ゛ルト゛のしゅうれんし゛ょう", "43:Gerudo Training Ground", "43:Gerudo-Trainingsarena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
+        { "いりく゛ち", "Entrance", "Eingang", "Entree", ENTR_GERUDO_TRAINING_GROUND_ENTRANCE, 1 },
     }},
-    { "44:Warps", "44:Teleportpunkte", "44:Teleporteurs", Select_LoadGame, 6, {
-        { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_WARP_PAD, 0 },
-        { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_WARP_PAD, 0 },
-        { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, 0 },
-        { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_WARP_PAD, 0 },
-        { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_WARP_PAD, 0 },
-        { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_WARP_PAD, 0 },
+    { "44:ワーフ゜", "44:Warps", "44:Teleportpunkte", "44:Teleporteurs", Select_LoadGame, 6, {
+        { "ひかりのフ゜レリュート゛　ワーフ゜", "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_WARP_PAD, 0 },
+        { "もりのメヌエット　ワーフ゜", "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_WARP_PAD, 0 },
+        { "ほのおのホ゛レロ　ワーフ゜", "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_WARP_PAD, 0 },
+        { "みす゛のセレナーテ゛　ワーフ゜", "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_WARP_PAD, 0 },
+        { "やみのノクターン　ワーフ゜", "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_WARP_PAD, 0 },
+        { "たましいのレクイエム　ワーフ゜", "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_WARP_PAD, 0 },
     }},
-    { "45:Shops", "45:Laeden", "45:Boutiques", Select_LoadGame, 9, {
-        { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0 },
-        { "Potion Shop (Market)", "Magie-Laden (Marktplatz)", "Apothicaire (Place du Marche)", ENTR_POTION_SHOP_MARKET_0, 0 },
-        { "Bazaar Shop (Market)", "Basar (Marktplatz)", "Bazar (Place du Marche)", ENTR_BAZAAR_1, 0 },
-        { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 },
-        { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 },
-        { "Bazaar Shop (Kakariko)", "Basar (Kakariko)", "Bazar (Village Cocorico)", ENTR_BAZAAR_0, 0 },
-        { "Potion Shop (Kakariko)", "Magie-Laden (Kakariko)", "Apothicaire (Village Cocorico)", ENTR_POTION_SHOP_KAKARIKO_FRONT, 0 },
-        { "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 },
-        { "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 },
+    { "45:おみせ", "45:Shops", "45:Laeden", "45:Boutiques", Select_LoadGame, 9, {
+        { "コキリのおみせ", "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0 },
+        { "くすりや(し゛ょうかまち)", "Potion Shop (Market)", "Magie-Laden (Marktplatz)", "Apothicaire (Place du Marche)", ENTR_POTION_SHOP_MARKET_0, 0 },
+        { "なンて゛もや(し゛ょうかまち)", "Bazaar Shop (Market)", "Basar (Marktplatz)", "Bazar (Place du Marche)", ENTR_BAZAAR_1, 0 },
+        { "おめんや", "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 },
+        { "ホ゛ムチュウや", "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 },
+        { "なンて゛もや(カカリコむら)", "Bazaar Shop (Kakariko)", "Basar (Kakariko)", "Bazar (Village Cocorico)", ENTR_BAZAAR_0, 0 },
+        { "くすりや(カカリコむら)", "Potion Shop (Kakariko)", "Magie-Laden (Kakariko)", "Apothicaire (Village Cocorico)", ENTR_POTION_SHOP_KAKARIKO_FRONT, 0 },
+        { "コ゛ロンのおみせ", "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 },
+        { "ソ゛ーラのおみせ", "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 },
     }},
-    { "46:Great Fairies", "46:Feen-Quellen", "46:Grandes Fees", Select_LoadGame, 6, {
-        { "Hyrule Castle (Child)", "Schloss Hyrule (Kind)", "Chateau d'Hyrule (Enfant)", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC, 0 },
-        { "Hyrule Castle (Adult)", "Schloss Hyrule (Erwachsener)", "Chateau d'Hyrule (Adult)", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_OGC_DD, 0 },
-        { "Death Mountain Trail", "Gebirgspfad", "Mont du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT, 0 },
-        { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC, 0 },
-        { "Zoras Fountain", "Zoras Quelle", "Fontaine Zora", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF, 0 },
-        { "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, 0 },
+    { "46:た゛いようせい", "46:Great Fairies", "46:Feen-Quellen", "46:Grandes Fees", Select_LoadGame, 6, {
+        { "ハイラルし゛ょう(こと゛も)", "Hyrule Castle (Child)", "Schloss Hyrule (Kind)", "Chateau d'Hyrule (Enfant)", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_DINS_HC, 0 },
+        { "ハイラルし゛ょう(おとな)", "Hyrule Castle (Adult)", "Schloss Hyrule (Erwachsener)", "Chateau d'Hyrule (Adult)", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_OGC_DD, 0 },
+        { "テ゛スマウンテンとさ゛んと゛う", "Death Mountain Trail", "Gebirgspfad", "Mont du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMT, 0 },
+        { "テ゛スマウンテンかこう", "Death Mountain Crater", "Todeskrater", "Cratere du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_DMC, 0 },
+        { "ソ゛ーラのいす゛み", "Zoras Fountain", "Zoras Quelle", "Fontaine Zora", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_FARORES_ZF, 0 },
+        { "きょた゛いし゛ゃしんそ゛う", "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_NAYRUS_COLOSSUS, 0 },
     }},
-    { "47:Chest Grottos", "47:Truhengrotten", "47:Grottes a Coffres", Select_Grotto_LoadGame, 11, {
-        { "Kokiri Forest (Song of Storms)", "Kokiri-Wald (Hymne des Sturms)", "Foret Kokiri (Chant des Tempetes)", 0x00, 0 },
-        { "Lost Woods", "Verlorene Waelder", "Bois Perdus", 0x01, 0 },
-        { "Sacred Forest Meadow", "Waldlichtung", "Bosquet Sacre", 0x02, 0 },
-        { "Hyrule Field (Near Market)", "Hylianische Steppe (Nahe Marktplatz)", "Plaine d'Hyrule (Pres de la Place du Marche)", 0x03, 0 },
-        { "Hyrule Field (Open Near Lake)", "Hylianische Steppe (Offen, beim Hylia-See)", "Plaine d'Hyrule (Deja ouverte pres du Lac)", 0x04, 0 },
-        { "Hyrule Field (SE Boulder)", "Hylianische Steppe (Felsen, S-O)", "Plaine d'Hyrule (Rocher a Gantelets)", 0x05, 0 },
-        { "Kakariko (Open)", "Kakariko (Offen)", "Village Cocorico (Deja Ouverte)", 0x06, 0 },
-        { "Kakariko (Redead)", "Kakariko (Zombies)", "Village Cocorico (Effrois)", 0x07, 0 },
-        { "Death Mountain Trail (Song of Storms)", "Gebirgspfad (Hymne des Sturms)", "Mont du Peril (Chant des Tempetes)", 0x08, 0 },
-        { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x09, 0 },
-        { "Zora River (Open)", "Zora-Fluss (Offen)", "Riviere Zora (Deja Ouverte)", 0x0A, 0 },
+    { "47:たからは゛この　あな", "47:Chest Grottos", "47:Truhengrotten", "47:Grottes a Coffres", Select_Grotto_LoadGame, 11, {
+        { "コキリのもり(あらしのうた)", "Kokiri Forest (Song of Storms)", "Kokiri-Wald (Hymne des Sturms)", "Foret Kokiri (Chant des Tempetes)", 0x00, 0 },
+        { "まよいのもり", "Lost Woods", "Verlorene Waelder", "Bois Perdus", 0x01, 0 },
+        { "もりのせいいき", "Sacred Forest Meadow", "Waldlichtung", "Bosquet Sacre", 0x02, 0 },
+        { "ハイラルへいけ゛ん(し゛ょうかまちのちかく)", "Hyrule Field (Near Market)", "Hylianische Steppe (Nahe Marktplatz)", "Plaine d'Hyrule (Pres de la Place du Marche)", 0x03, 0 },
+        { "ハイラルへいけ゛ん(オーフ゜ン いけちかく)", "Hyrule Field (Open Near Lake)", "Hylianische Steppe (Offen, beim Hylia-See)", "Plaine d'Hyrule (Deja ouverte pres du Lac)", 0x04, 0 },
+        { "ハイラルへいけ゛ん(なんとうのいわ)", "Hyrule Field (SE Boulder)", "Hylianische Steppe (Felsen, S-O)", "Plaine d'Hyrule (Rocher a Gantelets)", 0x05, 0 },
+        { "カカリコむら(オーフ゜ン)", "Kakariko (Open)", "Kakariko (Offen)", "Village Cocorico (Deja Ouverte)", 0x06, 0 },
+        { "カカリコむら(リーテ゛ット)", "Kakariko (Redead)", "Kakariko (Zombies)", "Village Cocorico (Effrois)", 0x07, 0 },
+        { "テ゛スマウンテンとさ゛んと゛う(あらしのうた)", "Death Mountain Trail (Song of Storms)", "Gebirgspfad (Hymne des Sturms)", "Mont du Peril (Chant des Tempetes)", 0x08, 0 },
+        { "テ゛スマウンテンかこう", "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x09, 0 },
+        { "ソ゛ーラかわ(オーフ゜ン)", "Zora River (Open)", "Zora-Fluss (Offen)", "Riviere Zora (Deja Ouverte)", 0x0A, 0 },
     }},
-    { "48:Scrub Grottos", "48:Laubkerlgrotten", "48:Grottes des Pestes Marchandes", Select_Grotto_LoadGame, 10, {
-        { "Hyrule Field (Near Lake)", "Hylianische Steppe (beim Hylia-See)", "Plaine d'Hyrule (Pres du Lac)", 0x0B, 0 },
-        { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x0C, 0 },
-        { "Goron City", "Goronia", "Village Goron", 0x0D, 0 },
-        { "Lon Lon Ranch", "Lon Lon-Farm", "Ranch Lon Lon", 0x0E, 0 },
-        { "Lake Hylia", "Hylia-See", "Lac Hylia", 0x0F, 0 },
-        { "Lost Woods", "Verlorene Waelder", "Bois Perdus", 0x10, 0 },
-        { "Zora River (Song of Storms)", "Zora-Fluss (Hymne des Sturms)", "Rivere Zora (Chant des Tempetes)", 0x11, 0 },
-        { "Sacred Forest Meadow (Song of Storms)", "Waldlichtung (Hymne des Sturms)", "Bosquet Scare (Chant des Tempetes)", 0x12, 0 },
-        { "Gerudo Valley (Song of Storms)", "Gerudotal (Hymne des Sturms)", "Vallee Gerudo (Chant des Tempetes)", 0x13, 0 },
-        { "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", 0x14, 0 },
+    { "48:アキント゛ナッツの　あな", "48:Scrub Grottos", "48:Laubkerlgrotten", "48:Grottes des Pestes Marchandes", Select_Grotto_LoadGame, 10, {
+        { "ハイラルへいけ゛ん(いけちかく)", "Hyrule Field (Near Lake)", "Hylianische Steppe (beim Hylia-See)", "Plaine d'Hyrule (Pres du Lac)", 0x0B, 0 },
+        { "テ゛スマウンテンかこう", "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x0C, 0 },
+        { "コ゛ロンシティ", "Goron City", "Goronia", "Village Goron", 0x0D, 0 },
+        { "ロンロンほ゛くし゛ょう", "Lon Lon Ranch", "Lon Lon-Farm", "Ranch Lon Lon", 0x0E, 0 },
+        { "ハイリアこはん", "Lake Hylia", "Hylia-See", "Lac Hylia", 0x0F, 0 },
+        { "まよいのもり", "Lost Woods", "Verlorene Waelder", "Bois Perdus", 0x10, 0 },
+        { "ソ゛ーラかわ(あらしのうた)", "Zora River (Song of Storms)", "Zora-Fluss (Hymne des Sturms)", "Rivere Zora (Chant des Tempetes)", 0x11, 0 },
+        { "もりのせいいき(あらしのうた)", "Sacred Forest Meadow (Song of Storms)", "Waldlichtung (Hymne des Sturms)", "Bosquet Scare (Chant des Tempetes)", 0x12, 0 },
+        { "ケ゛ルト゛のたに(あらしのうた)", "Gerudo Valley (Song of Storms)", "Gerudotal (Hymne des Sturms)", "Vallee Gerudo (Chant des Tempetes)", 0x13, 0 },
+        { "きょた゛いし゛ゃしんそ゛う", "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", 0x14, 0 },
     }},
-    { "49:Other Grottos", "49:Andere Grotten", "49:Autres Grottes", Select_Grotto_LoadGame, 7, {
-        { "Scrub Theatre", "Waldbuehne", "Theatre Mojo", 0x15, 0 },
-        { "Spider Grotto (Hyrule Field)", "Spinnen-Grotte (Hylianische Steppe)", "Spider Araignee (Plaine d'Hyrule)", 0x16, 0 },
-        { "Spider Grotto (Hyrule Castle)", "Spinnen-Grotte (Schloss Hyrule)", "Grotte Araignee (Chateau d'Hyrule)", 0x17, 0 },
-        { "Cow Grotto (Hyrule Field)", "Kuh-Grotte (Hylianische Steppe)", "Grotte a Vache (Plaine d'Hyrule)", 0x18, 0 },
-        { "Cow Grotto (Death Mountain Trail)", "Kuh-Grotte (Gebirgspfad)", "Grotte a Vache (Chemin du Peril)", 0x19, 0 },
-        { "Flooded Grotto (Gerudo Valley)", "Geflutete Grotte (Gerudotal)", "Grotte Inondee (Vallee Gerudo)", 0x1A, 0 },
-        { "Flooded Grotto (Hyrule Field)", "Geflutete Grotte (Hylianische Steppe)", "Grotte Inondee (Plaine d'Hyrule)", 0x1B, 0 },
+    { "49:そのたの　あな", "49:Other Grottos", "49:Andere Grotten", "49:Autres Grottes", Select_Grotto_LoadGame, 7, {
+        { "もりのステーシ゛", "Scrub Theatre", "Waldbuehne", "Theatre Mojo", 0x15, 0 },
+        { "クモのあな(ハイラルへいけ゛ん)", "Spider Grotto (Hyrule Field)", "Spinnen-Grotte (Hylianische Steppe)", "Spider Araignee (Plaine d'Hyrule)", 0x16, 0 },
+        { "クモのあな(ハイラルし゛ょう)", "Spider Grotto (Hyrule Castle)", "Spinnen-Grotte (Schloss Hyrule)", "Grotte Araignee (Chateau d'Hyrule)", 0x17, 0 },
+        { "ウシのあな(ハイラルへいけ゛ん)", "Cow Grotto (Hyrule Field)", "Kuh-Grotte (Hylianische Steppe)", "Grotte a Vache (Plaine d'Hyrule)", 0x18, 0 },
+        { "ウシのあな(テ゛スマウンテンとさ゛んと゛う)", "Cow Grotto (Death Mountain Trail)", "Kuh-Grotte (Gebirgspfad)", "Grotte a Vache (Chemin du Peril)", 0x19, 0 },
+        { "みす゛のあな(ケ゛ルト゛のたに)", "Flooded Grotto (Gerudo Valley)", "Geflutete Grotte (Gerudotal)", "Grotte Inondee (Vallee Gerudo)", 0x1A, 0 },
+        { "みす゛のあな(ハイラルへいけ゛ん)", "Flooded Grotto (Hyrule Field)", "Geflutete Grotte (Hylianische Steppe)", "Grotte Inondee (Plaine d'Hyrule)", 0x1B, 0 },
     }},
-    { "50:Debug (Use with caution)", "50:Debug (Mit Vorsicht benutzen)", "50:Debug (A utiliser avec prudence)", Select_LoadGame, 10, {
-        { "Test Room", "Test Raum", "Salle de Test", ENTR_BESITU_0, 0 },
-        { "SRD Map", "SRD Karte", "Carte SRD", ENTR_SASATEST_0, 0 },
-        { "Test Map", "Test Karte", "Carte de Test", ENTR_TEST01_0, 0 },
-        { "Treasure Chest Warp", "Schatzkisten Teleport", "Salle de Test - Objets", ENTR_TESTROOM_0, 0 },
-        { "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss-Raum", "Salle du Minoboss Stalfos", ENTR_SYOTES_0, 0 },
-        { "Stalfos Boss Room", "Stalfos-Ritter Boss-Raum", "Salle de Boss Stalfos", ENTR_SYOTES2_0, 0 },
-        { "Dark Link Room", "Schwarzer Link Raum", "Salle de Dark Link", ENTR_SUTARU_0, 0 },
-        { "Shooting Gallery Duplicate", "Schiessbude (Duplikat)", "Jeu d'Adresse (Duplicata)", ENTR_TEST_SHOOTING_GALLERY_0, 0 },
-        { "Depth Test", "Tiefen Test", "Test de Profondeur", ENTR_DEPTH_TEST_0, 0 },
-        { "Hyrule Garden Game (Broken)", "Burghof - Wachen-Minispiel (Kaputt)", "Cour du chateau (Non Fonctionnel)", ENTR_HAIRAL_NIWA2_0, 0 },
+    { "50:テ゛ハ゛ック゛(しようちゅうい)", "50:Debug (Use with caution)", "50:Debug (Mit Vorsicht benutzen)", "50:Debug (A utiliser avec prudence)", Select_LoadGame, 10, {
+        { "テストルーム", "Test Room", "Test Raum", "Salle de Test", ENTR_BESITU_0, 0 },
+        { "SRDマッフ゜(ささテスト)", "SRD Map", "SRD Karte", "Carte SRD", ENTR_SASATEST_0, 0 },
+        { "テストマッフ゜", "Test Map", "Test Karte", "Carte de Test", ENTR_TEST01_0, 0 },
+        { "たからは゛こワーフ゜", "Treasure Chest Warp", "Schatzkisten Teleport", "Salle de Test - Objets", ENTR_TESTROOM_0, 0 },
+        { "ちゅうスタルフォスへ゛や", "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss-Raum", "Salle du Minoboss Stalfos", ENTR_SYOTES_0, 0 },
+        { "ホ゛ススタルフォスへ゛や", "Stalfos Boss Room", "Stalfos-Ritter Boss-Raum", "Salle de Boss Stalfos", ENTR_SYOTES2_0, 0 },
+        { "タ゛ークリンクへ゛や(Sutaru)", "Dark Link Room", "Schwarzer Link Raum", "Salle de Dark Link", ENTR_SUTARU_0, 0 },
+        { "まとあてやのコヒ゜ー(jikkenjyou)", "Shooting Gallery Duplicate", "Schiessbude (Duplikat)", "Jeu d'Adresse (Duplicata)", ENTR_TEST_SHOOTING_GALLERY_0, 0 },
+        { "depthテスト", "Depth Test", "Tiefen Test", "Test de Profondeur", ENTR_DEPTH_TEST_0, 0 },
+        { "ハイラルにわケ゛ーム2(こわれてます)", "Hyrule Garden Game (Broken)", "Burghof - Wachen-Minispiel (Kaputt)", "Cour du chateau (Non Fonctionnel)", ENTR_HAIRAL_NIWA2_0, 0 },
     }},
+    // clang-format on
 };
 
 static BetterSceneSelectGrottoData sBetterGrottos[] = {
-    { ENTR_GROTTOS_0,  ENTR_KOKIRI_FOREST_0,         0, 0x2C, SCENE_KOKIRI_FOREST,         {  -504.0,   380.0, -1224.0 }}, // Kokiri Forest -> KF Storms Grotto
-    { ENTR_GROTTOS_0,  ENTR_LOST_WOODS_TUNNEL_SHORTCUT,            2, 0x14, SCENE_LOST_WOODS,            {   922.0,     0.0,  -933.0 }}, // Lost Woods -> LW Near Shortcuts Grotto
-    { ENTR_GROTTOS_8,  ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT,  0, 0xED, SCENE_SACRED_FOREST_MEADOW,  {  -201.0,     0.0,  1906.0 }}, // SFM Entryway -> SFM Wolfos Grotto
-    { ENTR_GROTTOS_0,  ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN,          0, 0x00, SCENE_HYRULE_FIELD,          { -1428.0,     0.0,   790.0 }}, // Hyrule Field -> HF Near Market Grotto
-    { ENTR_GROTTOS_0,  ENTR_HYRULE_FIELD_FENCE_EXIT,          0, 0x03, SCENE_HYRULE_FIELD,          { -4026.0,  -700.0, 13858.0 }}, // Hyrule Field -> HF Open Grotto
-    { ENTR_GROTTOS_0,  ENTR_HYRULE_FIELD_FENCE_EXIT,          0, 0x22, SCENE_HYRULE_FIELD,          {  -259.0,  -500.0, 12356.0 }}, // Hyrule Field -> HF Southeast Grotto
-    { ENTR_GROTTOS_0,  ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY,      0, 0x28, SCENE_KAKARIKO_VILLAGE,      {   861.0,    80.0,  -253.0 }}, // Kak Backyard -> Kak Open Grotto
-    { ENTR_GROTTOS_3,  ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY,      0, 0xE7, SCENE_KAKARIKO_VILLAGE,      {  -400.0,     0.0,   408.0 }}, // Kakariko Village -> Kak Redead Grotto
-    { ENTR_GROTTOS_0,  ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT,  0, 0x57, SCENE_DEATH_MOUNTAIN_TRAIL,  {  -389.0,  1386.0, -1202.0 }}, // Death Mountain -> DMT Storms Grotto
-    { ENTR_GROTTOS_0,  ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT, 1, 0x7A, SCENE_DEATH_MOUNTAIN_CRATER, {    50.0,  1233.0,  1776.0 }}, // DMC Upper Nearby -> DMC Upper Grotto
-    { ENTR_GROTTOS_0,  ENTR_ZORAS_RIVER_WATERFALL_EXIT,           0, 0x29, SCENE_ZORAS_RIVER,           {   369.0,   570.0,   128.0 }}, // Zora River -> ZR Open Grotto
-    { ENTR_GROTTOS_2,  ENTR_HYRULE_FIELD_FENCE_EXIT,          0, 0xE6, SCENE_HYRULE_FIELD,          { -5002.0,  -700.0, 13823.0 }}, // Hyrule Field -> HF Inside Fence Grotto
-    { ENTR_GROTTOS_4,  ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT, 1, 0xF9, SCENE_DEATH_MOUNTAIN_CRATER, { -1703.0,   722.0,  -481.0 }}, // DMC Lower Nearby -> DMC Hammer Grotto
-    { ENTR_GROTTOS_4,  ENTR_GORON_CITY_UPPER_EXIT,            3, 0xFB, SCENE_GORON_CITY,            {  1091.0,   580.0, -1192.0 }}, // GC Grotto Platform -> GC Grotto
-    { ENTR_GROTTOS_4,  ENTR_LON_LON_RANCH_OUTSIDE_TOWER,        0, 0xFC, SCENE_LON_LON_RANCH,         {  1798.0,     0.0,  1498.0 }}, // Lon Lon Ranch -> LLR Grotto
-    { ENTR_GROTTOS_4,  ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE,            0, 0xEF, SCENE_LAKE_HYLIA,            { -3044.0, -1033.0,  6070.0 }}, // Lake Hylia -> LH Grotto
-    { ENTR_GROTTOS_7,  ENTR_LOST_WOODS_NORTH_EXIT,            8, 0xF5, SCENE_LOST_WOODS,            {   677.0,     0.0, -2515.0 }}, // LW Beyond Mido -> LW Scrubs Grotto
-    { ENTR_GROTTOS_10, ENTR_ZORAS_RIVER_WEST_EXIT,           0, 0xEB, SCENE_ZORAS_RIVER,           { -1632.0,   100.0,  -123.0 }}, // Zora River -> ZR Storms Grotto
-    { ENTR_GROTTOS_10, ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE,  0, 0xEE, SCENE_SACRED_FOREST_MEADOW,  {   317.0,   480.0, -2303.0 }}, // Sacred Forest Meadow -> SFM Storms Grotto
-    { ENTR_GROTTOS_10, ENTR_GERUDO_VALLEY_OUTSIDE_TENT,         0, 0xF0, SCENE_GERUDO_VALLEY,         { -1321.0,    15.0,  -968.0 }}, // GV Fortress Side -> GV Storms Grotto
-    { ENTR_GROTTOS_10, ENTR_DESERT_COLOSSUS_WARP_PAD,       0, 0xFD, SCENE_DESERT_COLOSSUS,       {    71.0,   -32.0, -1303.0 }}, // Desert Colossus -> Colossus Grotto
-    { ENTR_GROTTOS_12, ENTR_LOST_WOODS_TUNNEL_SHORTCUT,            6, 0xF3, SCENE_LOST_WOODS,            {    75.0,   -20.0, -1596.0 }}, // LW Beyond Mido -> Deku Theater
-    { ENTR_GROTTOS_1,  ENTR_HYRULE_FIELD_STAIRS_EXIT,          0, 0xE5, SCENE_HYRULE_FIELD,          {  2059.0,    20.0,  -174.0 }}, // Hyrule Field -> HF Near Kak Grotto
-    { ENTR_GROTTOS_9,  ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT,         0, 0xF6, SCENE_HYRULE_CASTLE,         {   986.0,  1571.0,   837.0 }}, // Hyrule Castle Grounds -> HC Storms Grotto
-    { ENTR_GROTTOS_5,  ENTR_HYRULE_FIELD_ROCKY_PATH,          0, 0xE4, SCENE_HYRULE_FIELD,          { -7873.0,  -300.0,  6916.0 }}, // Hyrule Field -> HF Cow Grotto
-    { ENTR_GROTTOS_13, ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT,  0, 0xF8, SCENE_DEATH_MOUNTAIN_TRAIL,  {  -678.0,  1946.0,  -284.0 }}, // Death Mountain Summit -> DMT Cow Grotto
-    { ENTR_GROTTOS_6,  ENTR_GERUDO_VALLEY_EAST_EXIT,         0, 0xF2, SCENE_GERUDO_VALLEY,         {   271.0,  -555.0,  1465.0 }}, // GV Grotto Ledge -> GV Octorok Grotto
-    { ENTR_GROTTOS_11, ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN,          0, 0xE1, SCENE_HYRULE_FIELD,          { -4945.0,  -300.0,  2841.0 }}, // Hyrule Field -> HF Tektite Grotto
+    // clang-format off
+    // Kokiri Forest -> KF Storms Grotto
+    { ENTR_GROTTOS_0, ENTR_KOKIRI_FOREST_0, 0, 0x2C, SCENE_KOKIRI_FOREST, { -504.0, 380.0, -1224.0 } },
+    // Lost Woods -> LW Near Shortcuts Grotto
+    { ENTR_GROTTOS_0, ENTR_LOST_WOODS_TUNNEL_SHORTCUT, 2, 0x14, SCENE_LOST_WOODS, { 922.0, 0.0, -933.0 } },
+    // SFM Entryway -> SFM Wolfos Grotto
+    { ENTR_GROTTOS_8, ENTR_SACRED_FOREST_MEADOW_SOUTH_EXIT, 0, 0xED, SCENE_SACRED_FOREST_MEADOW, { -201.0, 0.0, 1906.0 } },
+    // Hyrule Field -> HF Near Market Grotto
+    { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN, 0, 0x00, SCENE_HYRULE_FIELD, { -1428.0, 0.0, 790.0 } },
+    // Hyrule Field -> HF Open Grotto
+    { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_FENCE_EXIT, 0, 0x03, SCENE_HYRULE_FIELD, { -4026.0, -700.0, 13858.0 } },
+    // Hyrule Field -> HF Southeast Grotto
+    { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_FENCE_EXIT, 0, 0x22, SCENE_HYRULE_FIELD, { -259.0, -500.0, 12356.0 } },
+    // Kak Backyard -> Kak Open Grotto
+    { ENTR_GROTTOS_0, ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY, 0, 0x28, SCENE_KAKARIKO_VILLAGE, { 861.0, 80.0, -253.0 } },
+    // Kakariko Village -> Kak Redead Grotto
+    { ENTR_GROTTOS_3, ENTR_KAKARIKO_VILLAGE_OUTSIDE_SHOP_GRANNY, 0, 0xE7, SCENE_KAKARIKO_VILLAGE, { -400.0, 0.0, 408.0 } },
+    // Death Mountain -> DMT Storms Grotto
+    { ENTR_GROTTOS_0, ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT, 0, 0x57, SCENE_DEATH_MOUNTAIN_TRAIL, { -389.0, 1386.0, -1202.0 } },
+    // DMC Upper Nearby -> DMC Upper Grotto
+    { ENTR_GROTTOS_0, ENTR_DEATH_MOUNTAIN_CRATER_UPPER_EXIT, 1, 0x7A, SCENE_DEATH_MOUNTAIN_CRATER, { 50.0, 1233.0, 1776.0 } },
+    // Zora River -> ZR Open Grotto
+    { ENTR_GROTTOS_0, ENTR_ZORAS_RIVER_WATERFALL_EXIT, 0, 0x29, SCENE_ZORAS_RIVER, { 369.0, 570.0, 128.0 } },
+    // Hyrule Field -> HF Inside Fence Grotto
+    { ENTR_GROTTOS_2, ENTR_HYRULE_FIELD_FENCE_EXIT, 0, 0xE6, SCENE_HYRULE_FIELD, { -5002.0, -700.0, 13823.0 } },
+    // DMC Lower Nearby -> DMC Hammer Grotto
+    { ENTR_GROTTOS_4, ENTR_DEATH_MOUNTAIN_CRATER_GC_EXIT, 1, 0xF9, SCENE_DEATH_MOUNTAIN_CRATER, { -1703.0, 722.0, -481.0 } },
+    // GC Grotto Platform -> GC Grotto
+    { ENTR_GROTTOS_4, ENTR_GORON_CITY_UPPER_EXIT, 3, 0xFB, SCENE_GORON_CITY, { 1091.0, 580.0, -1192.0 } },
+    // Lon Lon Ranch -> LLR Grotto
+    { ENTR_GROTTOS_4, ENTR_LON_LON_RANCH_OUTSIDE_TOWER, 0, 0xFC, SCENE_LON_LON_RANCH, { 1798.0, 0.0, 1498.0 } },
+    // Lake Hylia -> LH Grotto
+    { ENTR_GROTTOS_4, ENTR_LAKE_HYLIA_OUTSIDE_TEMPLE, 0, 0xEF, SCENE_LAKE_HYLIA, { -3044.0, -1033.0, 6070.0 } },
+    // LW Beyond Mido -> LW Scrubs Grotto
+    { ENTR_GROTTOS_7, ENTR_LOST_WOODS_NORTH_EXIT, 8, 0xF5, SCENE_LOST_WOODS, { 677.0, 0.0, -2515.0 } },
+    // Zora River -> ZR Storms Grotto
+    { ENTR_GROTTOS_10, ENTR_ZORAS_RIVER_WEST_EXIT, 0, 0xEB, SCENE_ZORAS_RIVER, { -1632.0, 100.0, -123.0 } },
+    // Sacred Forest Meadow -> SFM Storms Grotto
+    { ENTR_GROTTOS_10, ENTR_SACRED_FOREST_MEADOW_OUTSIDE_TEMPLE, 0, 0xEE, SCENE_SACRED_FOREST_MEADOW, { 317.0, 480.0, -2303.0 } },
+    // GV Fortress Side -> GV Storms Grotto
+    { ENTR_GROTTOS_10, ENTR_GERUDO_VALLEY_OUTSIDE_TENT, 0, 0xF0, SCENE_GERUDO_VALLEY, { -1321.0, 15.0, -968.0 } },
+    // Desert Colossus -> Colossus Grotto
+    { ENTR_GROTTOS_10, ENTR_DESERT_COLOSSUS_WARP_PAD, 0, 0xFD, SCENE_DESERT_COLOSSUS, { 71.0, -32.0, -1303.0 } },
+    // LW Beyond Mido -> Deku Theater
+    { ENTR_GROTTOS_12, ENTR_LOST_WOODS_TUNNEL_SHORTCUT, 6, 0xF3, SCENE_LOST_WOODS, { 75.0, -20.0, -1596.0 } },
+    // Hyrule Field -> HF Near Kak Grotto
+    { ENTR_GROTTOS_1, ENTR_HYRULE_FIELD_STAIRS_EXIT, 0, 0xE5, SCENE_HYRULE_FIELD, { 2059.0, 20.0, -174.0 } },
+    // Hyrule Castle Grounds -> HC Storms Grotto
+    { ENTR_GROTTOS_9, ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT, 0, 0xF6, SCENE_HYRULE_CASTLE, { 986.0, 1571.0, 837.0 } },
+    // Hyrule Field -> HF Cow Grotto
+    { ENTR_GROTTOS_5, ENTR_HYRULE_FIELD_ROCKY_PATH, 0, 0xE4, SCENE_HYRULE_FIELD, { -7873.0, -300.0, 6916.0 } },
+    // Death Mountain Summit -> DMT Cow Grotto
+    { ENTR_GROTTOS_13, ENTR_DEATH_MOUNTAIN_TRAIL_GC_EXIT, 0, 0xF8, SCENE_DEATH_MOUNTAIN_TRAIL, { -678.0, 1946.0, -284.0 } },
+    // GV Grotto Ledge -> GV Octorok Grotto
+    { ENTR_GROTTOS_6, ENTR_GERUDO_VALLEY_EAST_EXIT, 0, 0xF2, SCENE_GERUDO_VALLEY, { 271.0, -555.0, 1465.0 } },
+    // Hyrule Field -> HF Tektite Grotto
+    { ENTR_GROTTOS_11, ENTR_HYRULE_FIELD_PAST_BRIDGE_SPAWN, 0, 0xE1, SCENE_HYRULE_FIELD, { -4945.0, -300.0, 2841.0 } },
+    // clang-format on
 };
 
 void Select_UpdateMenu(SelectContext* this) {
@@ -792,13 +956,15 @@ void Select_UpdateMenu(SelectContext* this) {
             if (this->timerUp == 0) {
                 this->timerUp = 20;
                 this->lockUp = true;
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->verticalInput = R_UPDATE_RATE;
             }
         }
 
         if (CHECK_BTN_ALL(input->cur.button, BTN_DUP) && this->timerUp == 0) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = R_UPDATE_RATE * 3;
         }
 
@@ -809,23 +975,27 @@ void Select_UpdateMenu(SelectContext* this) {
             if (this->timerDown == 0) {
                 this->timerDown = 20;
                 this->lockDown = true;
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->verticalInput = -R_UPDATE_RATE;
             }
         }
 
         if (CHECK_BTN_ALL(input->cur.button, BTN_DDOWN) && (this->timerDown == 0)) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = -R_UPDATE_RATE * 3;
         }
 
         if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT) || CHECK_BTN_ALL(input->cur.button, BTN_DLEFT)) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = R_UPDATE_RATE;
         }
 
         if (CHECK_BTN_ALL(input->press.button, BTN_DRIGHT) || CHECK_BTN_ALL(input->cur.button, BTN_DRIGHT)) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = -R_UPDATE_RATE;
         }
     }
@@ -911,10 +1081,12 @@ void Better_Select_UpdateMenu(SelectContext* this) {
         if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
             if (LINK_AGE_IN_YEARS == YEARS_ADULT) {
                 gSaveContext.linkAge = 1;
-                Audio_PlaySoundGeneral(NA_SE_VO_LI_SWORD_N_KID, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_VO_LI_SWORD_N_KID, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 gSaveContext.linkAge = 0;
-                Audio_PlaySoundGeneral(NA_SE_VO_LI_SWORD_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_VO_LI_SWORD_N, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
 
@@ -922,11 +1094,13 @@ void Better_Select_UpdateMenu(SelectContext* this) {
             if (gSaveContext.dayTime > 0xC000 || gSaveContext.dayTime < 0x4555) {
                 gSaveContext.nightFlag = 0;
                 gSaveContext.dayTime = 0x8000;
-                Audio_PlaySoundGeneral(NA_SE_EV_CHICKEN_CRY_M, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_CHICKEN_CRY_M, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             } else {
                 gSaveContext.nightFlag = 1;
                 gSaveContext.dayTime = 0x0000;
-                Audio_PlaySoundGeneral(NA_SE_EV_DOG_CRY_EVENING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_EV_DOG_CRY_EVENING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
 
@@ -936,23 +1110,27 @@ void Better_Select_UpdateMenu(SelectContext* this) {
                 this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].canBeMQ) {
                 this->opt = this->opt ? 0 : 1;
                 if (this->opt) {
-                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PICKOUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PICKOUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
             }
         }
 
         if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT) || CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) {
             this->pageDownIndex--;
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (this->pageDownIndex < 0) {
                 this->pageDownIndex = this->betterScenes[this->currentScene].entranceCount - 1;
             }
         }
         if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT) || CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)) {
             this->pageDownIndex++;
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (this->pageDownIndex > this->betterScenes[this->currentScene].entranceCount - 1) {
                 this->pageDownIndex = 0;
             }
@@ -965,13 +1143,16 @@ void Better_Select_UpdateMenu(SelectContext* this) {
             if (this->timerUp == 0) {
                 this->timerUp = 20;
                 this->lockUp = true;
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->verticalInput = R_UPDATE_RATE;
             }
         }
 
-        if ((CHECK_BTN_ALL(input->cur.button, BTN_DUP) || CHECK_BTN_ALL(input->cur.button, BTN_CUP)) && this->timerUp == 0) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        if ((CHECK_BTN_ALL(input->cur.button, BTN_DUP) || CHECK_BTN_ALL(input->cur.button, BTN_CUP)) &&
+            this->timerUp == 0) {
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = R_UPDATE_RATE * 3;
         }
 
@@ -982,13 +1163,16 @@ void Better_Select_UpdateMenu(SelectContext* this) {
             if (this->timerDown == 0) {
                 this->timerDown = 20;
                 this->lockDown = true;
-                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 this->verticalInput = -R_UPDATE_RATE;
             }
         }
 
-        if ((CHECK_BTN_ALL(input->cur.button, BTN_DDOWN) || CHECK_BTN_ALL(input->cur.button, BTN_CDOWN)) && (this->timerDown == 0)) {
-            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        if ((CHECK_BTN_ALL(input->cur.button, BTN_DDOWN) || CHECK_BTN_ALL(input->cur.button, BTN_CDOWN)) &&
+            (this->timerDown == 0)) {
+            Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             this->verticalInput = -R_UPDATE_RATE * 3;
         }
     }
@@ -1031,7 +1215,8 @@ void Better_Select_UpdateMenu(SelectContext* this) {
     }
 
     if (sceneChanged) {
-        BetterSceneSelectEntrancePair entrancePair = this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
+        BetterSceneSelectEntrancePair entrancePair =
+            this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
         // Update the MQ status to match the new scene
         if (entrancePair.canBeMQ && ResourceMgr_IsSceneMasterQuest(gEntranceTable[entrancePair.entranceIndex].scene)) {
             this->opt = 1;
@@ -1092,11 +1277,14 @@ void Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
                 case LANGUAGE_FRA:
                     name = this->scenes[scene].frenchName;
                     break;
+                case LANGUAGE_JPN:
+                    name = this->scenes[scene].japaneseName;
+                    break;
             }
         } else {
             name = this->scenes[scene].japaneseName;
         }
-        //name = this->scenes[scene].name;
+        // name = this->scenes[scene].name;
         if (name == NULL) {
             name = "**Null**";
         }
@@ -1107,12 +1295,13 @@ void Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
     GfxPrint_SetColor(printer, 155, 55, 150, 255);
 
     // Small position hack of the OPT=X text since german Link's Age overlap if translated
-    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1) && gSaveContext.language == LANGUAGE_GER) {
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1) &&
+        gSaveContext.language == LANGUAGE_GER) {
         GfxPrint_SetPos(printer, 26, 26);
     } else {
         GfxPrint_SetPos(printer, 20, 26);
     }
-    
+
     GfxPrint_Printf(printer, "OPT=%d", this->opt);
 }
 
@@ -1123,7 +1312,25 @@ void Better_Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
 
     GfxPrint_SetColor(printer, 255, 255, 255, 255);
     GfxPrint_SetPos(printer, 12, 2);
-    GfxPrint_Printf(printer, "Scene Selection");
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1)) {
+        switch (gSaveContext.language) {
+            case LANGUAGE_ENG:
+            default:
+                GfxPrint_Printf(printer, "Scene Selection");
+                break;
+            case LANGUAGE_GER:
+                GfxPrint_Printf(printer, "Szenenauswahl");
+                break;
+            case LANGUAGE_FRA:
+                GfxPrint_Printf(printer, "Selection de Scene");
+                break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "シーンセレクト");
+                break;
+        }
+    } else {
+        GfxPrint_Printf(printer, "Scene Selection");
+    }
     GfxPrint_SetColor(printer, 255, 255, 255, 255);
 
     for (i = 0; i < 20; i++) {
@@ -1135,7 +1342,7 @@ void Better_Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
         } else {
             GfxPrint_SetColor(printer, 175, 175, 175, 255);
         }
-        
+
         if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1)) {
             switch (gSaveContext.language) {
                 case LANGUAGE_ENG:
@@ -1148,6 +1355,9 @@ void Better_Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
                 case LANGUAGE_FRA:
                     name = this->betterScenes[scene].frenchName;
                     break;
+                case LANGUAGE_JPN:
+                    name = this->betterScenes[scene].japaneseName;
+                    break;
             }
         } else {
             name = this->betterScenes[scene].englishName;
@@ -1166,23 +1376,34 @@ void Better_Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
         switch (gSaveContext.language) {
             case LANGUAGE_ENG:
             default:
-                GfxPrint_Printf(printer, "%s", this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].englishName);
+                GfxPrint_Printf(printer, "%s",
+                                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].englishName);
                 break;
             case LANGUAGE_GER:
-                GfxPrint_Printf(printer, "%s", this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].germanName);
+                GfxPrint_Printf(printer, "%s",
+                                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].germanName);
                 break;
             case LANGUAGE_FRA:
-                GfxPrint_Printf(printer, "%s", this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].frenchName);
+                GfxPrint_Printf(printer, "%s",
+                                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].frenchName);
+                break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "%s",
+                                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].japaneseName);
                 break;
         }
     } else {
-        GfxPrint_Printf(printer, "%s", this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].englishName);
+        GfxPrint_Printf(printer, "%s",
+                        this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex].englishName);
     }
 }
 
 static SceneSelectLoadingMessages sLoadingMessages[] = {
-    { GFXP_HIRAGANA "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", "Please wait a minute", "Bitte warte eine Minute", "Veuillez patienter une minute" },
-    { GFXP_HIRAGANA "ﾁｮｯﾄ ﾏｯﾃﾈ", "Hold on a sec", "Warte mal 'ne Sekunde" "Une seconde, ca arrive" },
+    { GFXP_HIRAGANA "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", "Please wait a minute", "Bitte warte eine Minute",
+      "Veuillez patienter une minute" },
+    { GFXP_HIRAGANA "ﾁｮｯﾄ ﾏｯﾃﾈ", "Hold on a sec",
+      "Warte mal 'ne Sekunde"
+      "Une seconde, ca arrive" },
     { GFXP_KATAKANA "ｳｪｲﾄ ｱ ﾓｰﾒﾝﾄ", "Wait a moment", "Warte einen Moment", "Patientez un instant" },
     { GFXP_KATAKANA "ﾛｰﾄﾞ" GFXP_HIRAGANA "ﾁｭｳ", "Loading", "Ladevorgang", "Chargement" },
     { GFXP_HIRAGANA "ﾅｳ ﾜｰｷﾝｸﾞ", "Now working", "Verarbeite", "Au travail" },
@@ -1190,10 +1411,14 @@ static SceneSelectLoadingMessages sLoadingMessages[] = {
     { GFXP_HIRAGANA "ｺｼｮｳｼﾞｬﾅｲﾖ", "It's not broken", "Es ist nicht kaputt", "C'est pas casse!" },
     { GFXP_KATAKANA "ｺｰﾋｰ ﾌﾞﾚｲｸ", "Coffee Break", "Kaffee-Pause", "Pause Cafe" },
     { GFXP_KATAKANA "Bﾒﾝｦｾｯﾄｼﾃｸﾀﾞｻｲ", "Please set B side", "Please set B side", "Please set B side" },
-    { GFXP_HIRAGANA "ｼﾞｯﾄ" GFXP_KATAKANA "ｶﾞﾏﾝ" GFXP_HIRAGANA "ﾉ" GFXP_KATAKANA "ｺ" GFXP_HIRAGANA "ﾃﾞｱｯﾀ", "Be patient, now", "Ube dich in Geduld", "Veuillez patientez" },
-    { GFXP_HIRAGANA "ｲﾏｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", "Please wait just a minute", "Bitte warte noch eine Minute", "Patientez un peu" },
-    { GFXP_HIRAGANA "ｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", "Don't panic, don't panic. Take a break, take a break.", "Keine Panik! Nimm dir eine Auszeit", "Pas de panique. Prenez une pause." },
-    { "Enough! My ship sails in the morning!", "Enough! My ship sails in the morning!", "Enough! My ship sails in the morning!", "Enough! My ship sails in the morning!" },
+    { GFXP_HIRAGANA "ｼﾞｯﾄ" GFXP_KATAKANA "ｶﾞﾏﾝ" GFXP_HIRAGANA "ﾉ" GFXP_KATAKANA "ｺ" GFXP_HIRAGANA "ﾃﾞｱｯﾀ",
+      "Be patient, now", "Ube dich in Geduld", "Veuillez patientez" },
+    { GFXP_HIRAGANA "ｲﾏｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", "Please wait just a minute", "Bitte warte noch eine Minute",
+      "Patientez un peu" },
+    { GFXP_HIRAGANA "ｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", "Don't panic, don't panic. Take a break, take a break.",
+      "Keine Panik! Nimm dir eine Auszeit", "Pas de panique. Prenez une pause." },
+    { "Enough! My ship sails in the morning!", "Enough! My ship sails in the morning!",
+      "Enough! My ship sails in the morning!", "Enough! My ship sails in the morning!" },
 };
 
 void Select_PrintLoadingMessage(SelectContext* this, GfxPrint* printer) {
@@ -1214,6 +1439,9 @@ void Select_PrintLoadingMessage(SelectContext* this, GfxPrint* printer) {
             case LANGUAGE_FRA:
                 GfxPrint_Printf(printer, "%s", sLoadingMessages[randomMsg].frenchMessage);
                 break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "%s", sLoadingMessages[randomMsg].japaneseMessage);
+                break;
         }
     } else {
         GfxPrint_Printf(printer, "%s", sLoadingMessages[randomMsg].japaneseMessage);
@@ -1226,8 +1454,8 @@ static SceneSelectAgeLabels sAgeLabels[] = {
 };
 
 static BetterSceneSelectAgeLabels sBetterAgeLabels[] = {
-    { "Adult", "Erwachsener", "Adulte" }, 
-    { "Child", "Kind", "Enfant" },
+    { "おとな", "Adult", "Erwachsener", "Adulte" },
+    { "こと゛も", "Child", "Kind", "Enfant" },
 };
 
 void Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 age) {
@@ -1245,6 +1473,9 @@ void Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 age) {
             case LANGUAGE_FRA:
                 GfxPrint_Printf(printer, "Age:%s", sAgeLabels[age].frenchAge);
                 break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "Age:%s", sAgeLabels[age].japaneseAge);
+                break;
         }
     } else {
         GfxPrint_Printf(printer, "Age:%s", sAgeLabels[age].japaneseAge);
@@ -1252,7 +1483,11 @@ void Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 age) {
 }
 
 void Better_Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 age) {
-    GfxPrint_SetPos(printer, 25, 25);
+    if (gSaveContext.language == LANGUAGE_JPN) {
+        GfxPrint_SetPos(printer, 22, 25); // For better alignment for Japanese menu
+    } else {
+        GfxPrint_SetPos(printer, 25, 25);
+    }
     GfxPrint_SetColor(printer, 100, 100, 100, 255);
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1)) {
         switch (gSaveContext.language) {
@@ -1264,11 +1499,14 @@ void Better_Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 a
             case LANGUAGE_GER:
                 GfxPrint_Printf(printer, "(B)Alter:");
                 break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "(B)し゛た゛い:");
+                break;
         }
     } else {
         GfxPrint_Printf(printer, "(B)Age:");
     }
-    
+
     GfxPrint_SetColor(printer, 55, 200, 50, 255);
     if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1)) {
         switch (gSaveContext.language) {
@@ -1282,6 +1520,9 @@ void Better_Select_PrintAgeSetting(SelectContext* this, GfxPrint* printer, s32 a
             case LANGUAGE_FRA:
                 GfxPrint_Printf(printer, "%s", sBetterAgeLabels[age].frenchAge);
                 break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "%s", sBetterAgeLabels[age].japaneseAge);
+                break;
         }
     } else {
         GfxPrint_Printf(printer, "%s", sBetterAgeLabels[age].englishAge);
@@ -1304,9 +1545,10 @@ void Select_PrintCutsceneSetting(SelectContext* this, GfxPrint* printer, u16 csI
         { "ﾃﾞﾓ09", "Demo09", "Demo09", "Demo09" },
         { "ﾃﾞﾓ0A", "Demo0A", "Demo0A", "Demo0A" },
     };
-    
+
     char* label;
-    int lang = CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1) ? gSaveContext.language + 1 : 0;
+    int lang =
+        CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1) ? (gSaveContext.language + 1) % 4 : 0;
 
     GfxPrint_SetPos(printer, 4, 25);
     GfxPrint_SetColor(printer, 255, 255, 55, 255);
@@ -1381,6 +1623,9 @@ void Better_Select_PrintTimeSetting(SelectContext* this, GfxPrint* printer) {
                 case LANGUAGE_FRA:
                     label = "Nuit";
                     break;
+                case LANGUAGE_JPN:
+                    label = "よる";
+                    break;
             }
         } else {
             label = "Night";
@@ -1398,6 +1643,9 @@ void Better_Select_PrintTimeSetting(SelectContext* this, GfxPrint* printer) {
                 case LANGUAGE_FRA:
                     label = "Jour";
                     break;
+                case LANGUAGE_JPN:
+                    label = "ひる";
+                    break;
             }
         } else {
             label = "Day";
@@ -1415,6 +1663,9 @@ void Better_Select_PrintTimeSetting(SelectContext* this, GfxPrint* printer) {
             case LANGUAGE_FRA:
                 GfxPrint_Printf(printer, "(Z/R)Temps:");
                 break;
+            case LANGUAGE_JPN:
+                GfxPrint_Printf(printer, "(Z/R)し゛かん:");
+                break;
         }
     } else {
         GfxPrint_Printf(printer, "(Z/R)Time:");
@@ -1441,6 +1692,7 @@ void Better_Select_PrintMQSetting(SelectContext* this, GfxPrint* printer) {
         if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"), 1)) {
             switch (gSaveContext.language) {
                 case LANGUAGE_ENG:
+                case LANGUAGE_JPN:
                 default:
                     label = this->opt ? "ON" : "OFF";
                     break;
@@ -1472,7 +1724,7 @@ void Select_DrawMenu(SelectContext* this) {
     func_800AAA50(&this->view, 0xF);
     Gfx_SetupDL_28Opa(gfxCtx);
 
-    //printer = alloca(sizeof(GfxPrint));
+    // printer = alloca(sizeof(GfxPrint));
     GfxPrint_Init(&printer);
     GfxPrint_Open(&printer, POLY_OPA_DISP);
     if (this->isBetterWarp) {
@@ -1503,7 +1755,7 @@ void Select_DrawLoadingScreen(SelectContext* this) {
     func_800AAA50(&this->view, 0xF);
     Gfx_SetupDL_28Opa(gfxCtx);
 
-    //printer = alloca(sizeof(GfxPrint));
+    // printer = alloca(sizeof(GfxPrint));
     GfxPrint_Init(&printer);
     GfxPrint_Open(&printer, POLY_OPA_DISP);
     Select_PrintLoadingMessage(this, &printer);
@@ -1535,7 +1787,7 @@ void Select_Draw(SelectContext* this) {
 void Select_Main(GameState* thisx) {
     SelectContext* this = (SelectContext*)thisx;
 
-    if (this->isBetterWarp != CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"), 0)) {
+    if (this->isBetterWarp != CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"), 1)) {
         Select_SwitchBetterWarpMode(this, !this->isBetterWarp);
     }
 
@@ -1574,8 +1826,10 @@ void Select_SwitchBetterWarpMode(SelectContext* this, u8 isBetterWarpMode) {
             this->topDisplayedScene = CVarGetInteger(CVAR_GENERAL("BetterDebugWarpScreenTopDisplayedScene"), 0);
             this->pageDownIndex = CVarGetInteger(CVAR_GENERAL("BetterDebugWarpScreenPageDownIndex"), 0);
 
-            BetterSceneSelectEntrancePair entrancePair = this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
-            if (entrancePair.canBeMQ && ResourceMgr_IsSceneMasterQuest(gEntranceTable[entrancePair.entranceIndex].scene)) {
+            BetterSceneSelectEntrancePair entrancePair =
+                this->betterScenes[this->currentScene].entrancePairs[this->pageDownIndex];
+            if (entrancePair.canBeMQ &&
+                ResourceMgr_IsSceneMasterQuest(gEntranceTable[entrancePair.entranceIndex].scene)) {
                 this->opt = 1;
             }
         }
@@ -1641,5 +1895,5 @@ void Select_Init(GameState* thisx) {
 
     CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQMode"));
     CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQModeScene"));
-    Select_SwitchBetterWarpMode(this, CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"), 0));
+    Select_SwitchBetterWarpMode(this, CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterDebugWarpScreen"), 1));
 }
diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c
index 239ee9d3db..c701d117ce 100644
--- a/soh/src/overlays/gamestates/ovl_title/z_title.c
+++ b/soh/src/overlays/gamestates/ovl_title/z_title.c
@@ -97,20 +97,19 @@ void Title_Draw(TitleContext* this) {
     gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
     gDPSetRenderMode(POLY_OPA_DISP++, G_RM_XLU_SURF2, G_RM_OPA_CI | CVG_DST_WRAP);
     gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, ENVIRONMENT,
-        COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
+                      COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128);
 
     gDPLoadMultiBlock(POLY_OPA_DISP++, nintendo_rogo_static_Tex_001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
-        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11);
+                      G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11);
 
     for (idx = 0, y = 94; idx < 16; idx++, y += 2) {
-        gDPLoadMultiTile(POLY_OPA_DISP++, nintendo_rogo_static_Tex_000000, 0, G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b, 192, 32,
-                         0, idx * 2, 192 - 1, (idx + 1) * 2 - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                         G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-        
-        gDPSetTileSize(POLY_OPA_DISP++, 0, 0, 0, (192 - 1) << G_TEXTURE_IMAGE_FRAC,
-                       (2 - 1) << G_TEXTURE_IMAGE_FRAC);
+        gDPLoadMultiTile(POLY_OPA_DISP++, nintendo_rogo_static_Tex_000000, 0, G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b,
+                         192, 32, 0, idx * 2, 192 - 1, (idx + 1) * 2 - 1, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+
+        gDPSetTileSize(POLY_OPA_DISP++, 0, 0, 0, (192 - 1) << G_TEXTURE_IMAGE_FRAC, (2 - 1) << G_TEXTURE_IMAGE_FRAC);
 
         gDPSetTileSize(POLY_OPA_DISP++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0);
         gSPTextureRectangle(POLY_OPA_DISP++, 388, y << 2, 1156, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index e7b04ed223..17f1aa89ed 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -18,7 +18,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
         aButtonColor = (Color_RGB8){ 191, 191, 191 };
     }
 
-    Color_RGB8 cButtonsColor = {255, 255, 50};
+    Color_RGB8 cButtonsColor = { 255, 255, 50 };
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
         cButtonsColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
     }
@@ -81,7 +81,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     };
     static void* D_8082A130[] = {
-        gOcarinaBtnIconATex, gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex, gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
+        gOcarinaBtnIconATex,     gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex,
+        gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex,
     };
     static u16 D_8082A144[] = {
         0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC,
@@ -187,7 +188,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
 
                 if (phi_s3 != pauseCtx->cursorPoint[PAUSE_QUEST]) {
                     pauseCtx->unk_1E4 = 0;
-                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
 
                 if (pauseCtx->cursorPoint[PAUSE_QUEST] != 0x18) {
@@ -201,12 +203,12 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
                         } else {
                             phi_s0_2 = pauseCtx->cursorPoint[PAUSE_QUEST] + 0x5A;
                             osSyncPrintf("222 ccc=%d (%d, %d, %d)\n", phi_s0_2, pauseCtx->cursorPoint[PAUSE_QUEST],
-                                            0x12, 0x6C);
+                                         0x12, 0x6C);
                         }
                     } else {
                         phi_s0_2 = PAUSE_ITEM_NONE;
                         osSyncPrintf("999 ccc=%d (%d,  %d)\n", PAUSE_ITEM_NONE, pauseCtx->cursorPoint[PAUSE_QUEST],
-                                        0x18);
+                                     0x18);
                     }
                 } else {
                     if ((gSaveContext.inventory.questItems & 0xF0000000) != 0) {
@@ -215,7 +217,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
                         phi_s0_2 = PAUSE_ITEM_NONE;
                     }
                     osSyncPrintf("888 ccc=%d (%d,  %d,  %x)\n", phi_s0_2, pauseCtx->cursorPoint[PAUSE_QUEST], 0x72,
-                                    gSaveContext.inventory.questItems & 0xF0000000);
+                                 gSaveContext.inventory.questItems & 0xF0000000);
                 }
 
                 sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
@@ -271,7 +273,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
                 pauseCtx->cursorSpecialPos = 0;
                 sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
                 KaleidoScope_SetCursorVtx(pauseCtx, sp216 * 4, pauseCtx->questVtx);
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) {
                     phi_s0_2 = pauseCtx->cursorPoint[PAUSE_QUEST] + 0x5A;
                 } else {
@@ -288,7 +291,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
                 pauseCtx->cursorSpecialPos = 0;
                 sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
                 KaleidoScope_SetCursorVtx(pauseCtx, sp216 * 4, pauseCtx->questVtx);
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) {
                     if (pauseCtx->cursorPoint[PAUSE_QUEST] < 6) {
                         phi_s0_2 = pauseCtx->cursorPoint[PAUSE_QUEST] + 0x66;
@@ -548,18 +552,24 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
 
                     s16 Notes_alpha = D_8082A150[sp218];
                     if (D_8082A124[sp218] == 0) {
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, Notes_alpha);
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b,
+                                        Notes_alpha);
                     } else {
                         if (D_8082A124[sp218] == OCARINA_NOTE_D5) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b,
+                                            Notes_alpha);
                         } else if (D_8082A124[sp218] == OCARINA_NOTE_B4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g,
+                                            cLeftButtonColor.b, Notes_alpha);
                         } else if (D_8082A124[sp218] == OCARINA_NOTE_A4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g,
+                                            cRightButtonColor.b, Notes_alpha);
                         } else if (D_8082A124[sp218] == OCARINA_NOTE_F4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g,
+                                            cDownButtonColor.b, Notes_alpha);
                         } else {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b,
+                                            Notes_alpha);
                         }
                     }
 
@@ -589,18 +599,24 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
                 if (pauseCtx->unk_1E4 == 8) {
                     s16 Notes_alpha = 200;
                     if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == 0) {
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, Notes_alpha);
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b,
+                                        Notes_alpha);
                     } else {
                         if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_D5) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b,
+                                            Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_B4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g,
+                                            cLeftButtonColor.b, Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_A4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g,
+                                            cRightButtonColor.b, Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_F4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g,
+                                            cDownButtonColor.b, Notes_alpha);
                         } else {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b,
+                                            Notes_alpha);
                         }
                     }
                 } else {
@@ -655,18 +671,24 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
 
                     s16 Notes_alpha = D_8082A150[phi_s3];
                     if (D_8082A124[phi_s3] == 0) {
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, Notes_alpha);
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b,
+                                        Notes_alpha);
                     } else {
                         if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_D5) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cUpButtonColor.r, cUpButtonColor.g, cUpButtonColor.b,
+                                            Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_B4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g,
+                                            cLeftButtonColor.b, Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_A4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g,
+                                            cRightButtonColor.b, Notes_alpha);
                         } else if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == OCARINA_NOTE_F4) {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g,
+                                            cDownButtonColor.b, Notes_alpha);
                         } else {
-                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b, Notes_alpha);
+                            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b,
+                                            Notes_alpha);
                         }
                     }
 
@@ -732,9 +754,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
             phi_s0 = 0;
             for (sp21A = 0; sp21A < 3; sp21A++, sp218 += 4) {
                 if ((sp21A >= 2) || (sp208[sp21A] != 0) || (phi_s0 != 0)) {
-                    gDPLoadTextureBlock(POLY_OPA_DISP++, digitTextures[sp208[sp21A]], G_IM_FMT_I,
-                                        G_IM_SIZ_8b, 8, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
-                                        G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+                    gDPLoadTextureBlock(POLY_OPA_DISP++, digitTextures[sp208[sp21A]], G_IM_FMT_I, G_IM_SIZ_8b, 8, 16, 0,
+                                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                        G_TX_NOLOD, G_TX_NOLOD);
 
                     gSP1Quadrangle(POLY_OPA_DISP++, sp218, sp218 + 2, sp218 + 3, sp218 + 1, 0);
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
index d715c22118..2eb5e15bbd 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
@@ -304,8 +304,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
     KaleidoScope_DrawDigit(play, spD8[3], 165, 185);
 
     // Heart Pieces (X / 4)
-    KaleidoScope_DrawDigit(play, ((gSaveContext.inventory.questItems & 0xF0000000) & 0xF0000000) >> 0x1C, 210,
-                           185);
+    KaleidoScope_DrawDigit(play, ((gSaveContext.inventory.questItems & 0xF0000000) & 0xF0000000) >> 0x1C, 210, 185);
 
     // Handles navigating the menu to different sections with the D-Pad
     // When the same direction is held, registers the input periodically based on a timer
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
index 9fa91cbdfc..aa18912eab 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
@@ -19,10 +19,10 @@ static u8 sEquipmentItemOffsets[] = {
 // Vertices for A button indicator (coordinates 0.75x the texture size)
 // pt (-97, -36)
 static Vtx sStrengthAButtonVtx[] = {
-    VTX(-9,  6, 0, 0 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
-    VTX( 9,  6, 0, 24 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
+    VTX(-9, 6, 0, 0 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
+    VTX(9, 6, 0, 24 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
     VTX(-9, -6, 0, 0 << 5, 16 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
-    VTX( 9, -6, 0, 24 << 5, 16 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
+    VTX(9, -6, 0, 24 << 5, 16 << 5, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 
 static s16 sEquipTimer = 0;
@@ -136,7 +136,8 @@ void KaleidoScope_DrawPlayerWork(PlayState* play) {
         pos.y = -130.0f;
         pos.z = -150.0f;
         scale = 0.046f;
-    } else if (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) != EQUIP_VALUE_SWORD_MASTER && !CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0)) {
+    } else if (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) != EQUIP_VALUE_SWORD_MASTER &&
+               !CVarGetInteger(CVAR_GENERAL("PauseMenuAnimatedLinkTriforce"), 0)) {
         pos.x = 25.0f;
         pos.y = -228.0f;
         pos.z = 60.0f;
@@ -183,8 +184,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
     s16 cursorY;
     s16 oldCursorPoint;
     bool dpad = (CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP));
-    bool pauseAnyCursor = (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
-                          (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON);
+    bool pauseAnyCursor =
+        (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
+        (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON);
 
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -234,7 +236,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                                     cursorMoveResult = 1;
                                 }
                             }
-                        } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] & gSaveContext.inventory.equipment) || pauseAnyCursor) {
+                        } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] &
+                                    gSaveContext.inventory.equipment) ||
+                                   pauseAnyCursor) {
                             cursorMoveResult = 2;
                         }
                     } else {
@@ -268,8 +272,10 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                             if (CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) != 0) {
                                 cursorMoveResult = 1;
                             }
-                        } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] & gSaveContext.inventory.equipment) || pauseAnyCursor) {
-                                cursorMoveResult = 2;
+                        } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] &
+                                    gSaveContext.inventory.equipment) ||
+                                   pauseAnyCursor) {
+                            cursorMoveResult = 2;
                         }
                     } else {
                         pauseCtx->cursorX[PAUSE_EQUIP] = cursorX;
@@ -319,7 +325,8 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                                 cursorMoveResult = 1;
                             }
                         } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] &
-                                   gSaveContext.inventory.equipment) || pauseAnyCursor) {
+                                    gSaveContext.inventory.equipment) ||
+                                   pauseAnyCursor) {
                             cursorMoveResult = 2;
                         }
                     } else {
@@ -337,7 +344,8 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                                 cursorMoveResult = 1;
                             }
                         } else if ((gBitFlags[pauseCtx->cursorPoint[PAUSE_EQUIP] - 1] &
-                                   gSaveContext.inventory.equipment) || pauseAnyCursor) {
+                                    gSaveContext.inventory.equipment) ||
+                                   pauseAnyCursor) {
                             cursorMoveResult = 2;
                         }
                     } else {
@@ -354,7 +362,8 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                 pauseCtx->nameDisplayTimer = 0;
                 pauseCtx->cursorSpecialPos = 0;
 
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 cursorPoint = cursorX = cursorY = 0;
                 while (true) {
@@ -400,7 +409,8 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
             if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
                 pauseCtx->nameDisplayTimer = 0;
                 pauseCtx->cursorSpecialPos = 0;
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 cursorPoint = cursorX = 3;
                 cursorY = 0;
@@ -509,19 +519,22 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
         KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx);
 
         // Allow Toggling of Strength when Pressing A on Strength Upgrade Slot
-        if ((pauseCtx->cursorSpecialPos == 0) && (pauseCtx->state == 6) &&
-            (pauseCtx->unk_1E4 == 0) && CHECK_BTN_ALL(input->press.button, BTN_A) &&
-            (pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)) {
-            CVarSetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), !CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0));
+        if ((pauseCtx->cursorSpecialPos == 0) && (pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) &&
+            CHECK_BTN_ALL(input->press.button, BTN_A) && (pauseCtx->cursorX[PAUSE_EQUIP] == 0) &&
+            (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)) {
+            CVarSetInteger(CVAR_ENHANCEMENT("StrengthDisabled"),
+                           !CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0));
             // Equip success sound
-            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             // Wait 10 frames before accepting input again
             pauseCtx->unk_1E4 = 7;
             sEquipTimer = 10;
         }
 
         u16 buttonsToCheck = BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT;
-        if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) && (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
+        if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) &&
+            (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
             buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
         }
 
@@ -540,42 +553,59 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                     // If we have the feature toggled on
                     if (CVarGetInteger(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 0)) {
 
-                        if (CVarGetInteger(CVAR_ENHANCEMENT("SwordToggle"), SWORD_TOGGLE_NONE) == SWORD_TOGGLE_BOTH_AGES ||
-                            (CVarGetInteger(CVAR_ENHANCEMENT("SwordToggle"), SWORD_TOGGLE_NONE) == SWORD_TOGGLE_CHILD) && LINK_IS_CHILD) {
-                            // If we're on the "swords" section of the equipment screen AND we're on a currently-equipped sword  
-                            if (pauseCtx->cursorY[PAUSE_EQUIP] == 0 && pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD)) {
+                        if (CVarGetInteger(CVAR_ENHANCEMENT("SwordToggle"), SWORD_TOGGLE_NONE) ==
+                                SWORD_TOGGLE_BOTH_AGES ||
+                            (CVarGetInteger(CVAR_ENHANCEMENT("SwordToggle"), SWORD_TOGGLE_NONE) ==
+                             SWORD_TOGGLE_CHILD) &&
+                                LINK_IS_CHILD) {
+                            // If we're on the "swords" section of the equipment screen AND we're on a
+                            // currently-equipped sword
+                            if (pauseCtx->cursorY[PAUSE_EQUIP] == 0 &&
+                                pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD)) {
                                 Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_NONE);
                                 gSaveContext.equips.buttonItems[0] = ITEM_NONE;
                                 Flags_SetInfTable(INFTABLE_SWORDLESS);
-                                goto RESUME_EQUIPMENT_SWORD;               // Skip to here so we don't re-equip it
+                                goto RESUME_EQUIPMENT_SWORD; // Skip to here so we don't re-equip it
                             }
                         } else {
-                            // If we're on the "swords" section of the equipment screen AND we're on a currently-equipped BGS/Giant's Knife
-                            if (pauseCtx->cursorY[PAUSE_EQUIP] == 0 && pauseCtx->cursorX[PAUSE_EQUIP] == 3 
-                                && CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_BIGGORON && CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)){ // And we have the Master Sword
-                                Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER); // "Unequip" it by equipping Master Sword
+                            // If we're on the "swords" section of the equipment screen AND we're on a
+                            // currently-equipped BGS/Giant's Knife
+                            if (pauseCtx->cursorY[PAUSE_EQUIP] == 0 && pauseCtx->cursorX[PAUSE_EQUIP] == 3 &&
+                                CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_BIGGORON &&
+                                CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD,
+                                                  EQUIP_INV_SWORD_MASTER)) { // And we have the Master Sword
+                                Inventory_ChangeEquipment(
+                                    EQUIP_TYPE_SWORD,
+                                    EQUIP_VALUE_SWORD_MASTER); // "Unequip" it by equipping Master Sword
                                 gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
                                 Flags_UnsetInfTable(INFTABLE_SWORDLESS);
-                                goto RESUME_EQUIPMENT_SWORD;               // Skip to here so we don't re-equip it
+                                goto RESUME_EQUIPMENT_SWORD; // Skip to here so we don't re-equip it
                             }
                         }
 
-                        // If we're on the "shields" section of the equipment screen AND we're on a currently-equipped shield
-                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 1 && pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD)) {
+                        // If we're on the "shields" section of the equipment screen AND we're on a currently-equipped
+                        // shield
+                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 1 &&
+                            pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD)) {
                             Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE); // Unequip it
-                            goto RESUME_EQUIPMENT;                      // Skip to here so we don't re-equip it
+                            goto RESUME_EQUIPMENT; // Skip to here so we don't re-equip it
                         }
 
-                        // If we're on the "tunics" section of the equipment screen AND we're on a currently-equipped tunic
-                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 2 && pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)) {
-                            Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI); // "Unequip" it (by equipping Kokiri Tunic)
-                            goto RESUME_EQUIPMENT;                     // Skip to here so we don't re-equip it
+                        // If we're on the "tunics" section of the equipment screen AND we're on a currently-equipped
+                        // tunic
+                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 2 &&
+                            pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)) {
+                            Inventory_ChangeEquipment(
+                                EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI); // "Unequip" it (by equipping Kokiri Tunic)
+                            goto RESUME_EQUIPMENT;                           // Skip to here so we don't re-equip it
                         }
 
                         // If we're on the "boots" section of the equipment screen AND we're on currently-equipped boots
-                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 3 && pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS)) {
-                            Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI); // "Unequip" it (by equipping Kokiri Boots)
-                            goto RESUME_EQUIPMENT;                     // Skip to here so we don't re-equip it
+                        if (pauseCtx->cursorY[PAUSE_EQUIP] == 3 &&
+                            pauseCtx->cursorX[PAUSE_EQUIP] == CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS)) {
+                            Inventory_ChangeEquipment(
+                                EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI); // "Unequip" it (by equipping Kokiri Boots)
+                            goto RESUME_EQUIPMENT;                           // Skip to here so we don't re-equip it
                         }
                     }
 
@@ -585,7 +615,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                         goto EQUIP_FAIL;
                     }
 
-                    RESUME_EQUIPMENT:
+                RESUME_EQUIPMENT:
                     if (pauseCtx->cursorY[PAUSE_EQUIP] == 0) {
                         gSaveContext.infTable[29] = 0;
                         gSaveContext.equips.buttonItems[0] = cursorItem;
@@ -602,11 +632,12 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                                 gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
                             }
                         }
-                        RESUME_EQUIPMENT_SWORD:
+                    RESUME_EQUIPMENT_SWORD:
                         Interface_LoadItemIcon1(play, 0);
                     }
 
-                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     pauseCtx->unk_1E4 = 7;
                     sEquipTimer = 10;
                 } else if (CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) {
@@ -640,23 +671,27 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                                                         pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10,
                                                         pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         }
                     }
                 }
             } else {
-                EQUIP_FAIL:
+            EQUIP_FAIL:
                 if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-                } else if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) && (pauseCtx->cursorY[PAUSE_EQUIP] > 1)) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                } else if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) &&
+                           (pauseCtx->cursorY[PAUSE_EQUIP] > 1)) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
             }
         }
 
         if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_EQUIP]) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if ((pauseCtx->unk_1E4 == 7) && (pauseCtx->pageIndex == PAUSE_EQUIP)) {
         KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_EQUIP] * 4, pauseCtx->equipVtx);
@@ -668,10 +703,10 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
         }
     }
 
-
     // Grey Out Strength Upgrade Name when Disabled
     // Do not Grey Out Strength Upgrade Name when Enabled
-    // This needs to be outside the previous block since otherwise the nameColorSet is cleared to 0 by other menu pages when toggling
+    // This needs to be outside the previous block since otherwise the nameColorSet is cleared to 0 by other menu pages
+    // when toggling
     if ((pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] == 0) &&
         (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0)) {
@@ -732,34 +767,43 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
                 // Grey Out the Gauntlets as Child
                 // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on
                 if ((drawGreyItems &&
-                    ((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER || 
-                    (sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) ||
-                    (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0) && sChildUpgrades[i] == UPG_STRENGTH)) {
+                     ((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER ||
+                      (sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) ||
+                    (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) &&
+                     CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0) && sChildUpgrades[i] == UPG_STRENGTH)) {
                     gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255);
                     gSPGrayscale(POLY_OPA_DISP++, true);
                 }
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + point - 1], 32, 32, 0);
+                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx,
+                                                   gItemIcons[sChildUpgradeItemBases[i] + point - 1], 32, 32, 0);
                 gSPGrayscale(POLY_OPA_DISP++, false);
             }
         } else {
-            if ((i == 0) && (CUR_UPG_VALUE(sAdultUpgrades[i]) == 0)) { // If the player doesn't have the bow, load the current slingshot ammo upgrade instead.
+            if ((i == 0) &&
+                (CUR_UPG_VALUE(sAdultUpgrades[i]) ==
+                 0)) { // If the player doesn't have the bow, load the current slingshot ammo upgrade instead.
                 if (drawGreyItems) {
                     gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255); // Grey Out Slingshot Bullet Bags
                     gSPGrayscale(POLY_OPA_DISP++, true);
                 }
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1], 32, 32, 0);
+                KaleidoScope_DrawQuadTextureRGBA32(
+                    play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1],
+                    32, 32, 0);
                 gSPGrayscale(POLY_OPA_DISP++, false);
             } else if (CUR_UPG_VALUE(sAdultUpgrades[i]) != 0) {
                 // Grey Out the Goron Bracelet when Not Randomized and Toggle Strength Option is off
                 // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on
                 if ((drawGreyItems &&
-                    (((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET &&
-                        !(IS_RANDO) && !CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)))) || 
-                     (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0) && sAdultUpgrades[i] == UPG_STRENGTH)) {
+                     (((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET &&
+                       !(IS_RANDO) && !CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0)))) ||
+                    (CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) &&
+                     CVarGetInteger(CVAR_ENHANCEMENT("StrengthDisabled"), 0) && sAdultUpgrades[i] == UPG_STRENGTH)) {
                     gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255);
                     gSPGrayscale(POLY_OPA_DISP++, true);
                 }
-                KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1], 32, 32, 0);
+                KaleidoScope_DrawQuadTextureRGBA32(
+                    play->state.gfxCtx, gItemIcons[sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1],
+                    32, 32, 0);
                 gSPGrayscale(POLY_OPA_DISP++, false);
             }
         }
@@ -785,13 +829,14 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
 
     // Render A button indicator when hovered over strength
     if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) &&
-        CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) && pauseCtx->cursorSpecialPos == 0
-        && pauseCtx->unk_1E4 == 0 && pauseCtx->state == 6) {
+        CVarGetInteger(CVAR_ENHANCEMENT("ToggleStrength"), 0) && pauseCtx->cursorSpecialPos == 0 &&
+        pauseCtx->unk_1E4 == 0 && pauseCtx->state == 6) {
         u8 row = 2;
         u8 column = 0;
         u8 equipVtxIndex = 16 * row + 4 * column;
         // Get Bottom Bisector of the Quad
-        s16 translateX = (pauseCtx->equipVtx[equipVtxIndex].v.ob[0] + pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[0]) / 2;
+        s16 translateX =
+            (pauseCtx->equipVtx[equipVtxIndex].v.ob[0] + pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[0]) / 2;
         // Add 4 since the icon will be zoomed in on
         s16 translateY = pauseCtx->equipVtx[equipVtxIndex + 2].v.ob[1] + 4;
         KaleidoScope_DrawAButton(play, sStrengthAButtonVtx, translateX, translateY);
@@ -799,26 +844,26 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
 
     KaleidoScope_DrawPlayerWork(play);
 
-    //if ((pauseCtx->unk_1E4 == 7) && (sEquipTimer == 10)) {
-        //KaleidoScope_SetupPlayerPreRender(play);
+    // if ((pauseCtx->unk_1E4 == 7) && (sEquipTimer == 10)) {
+    // KaleidoScope_SetupPlayerPreRender(play);
     //}
 
     if ((pauseCtx->unk_1E4 == 7) && (sEquipTimer == 9)) {
         //! @bug: This function shouldn't take any arguments
-        //KaleidoScope_ProcessPlayerPreRender(play);
+        // KaleidoScope_ProcessPlayerPreRender(play);
     }
 
     // gSPInvalidateTexCache(POLY_OPA_DISP++, 0);
     gSPInvalidateTexCache(POLY_OPA_DISP++, pauseCtx->iconItemSegment);
-    //gSPInvalidateTexCache(POLY_OPA_DISP++, pauseCtx->iconItem24Segment);
+    // gSPInvalidateTexCache(POLY_OPA_DISP++, pauseCtx->iconItem24Segment);
     gSPInvalidateTexCache(POLY_OPA_DISP++, pauseCtx->nameSegment);
 
-    //gSPSegment(POLY_OPA_DISP++, 0x07, pauseCtx->playerSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x07, pauseCtx->playerSegment);
     gSPSegment(POLY_OPA_DISP++, 0x08, pauseCtx->iconItemSegment);
     gSPSegment(POLY_OPA_DISP++, 0x09, pauseCtx->iconItem24Segment);
     gSPSegment(POLY_OPA_DISP++, 0x0A, pauseCtx->nameSegment);
     gSPSegment(POLY_OPA_DISP++, 0x0B, play->interfaceCtx.mapSegment);
-    //gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment);
 
     Gfx_SetupDL_42Opa(play->state.gfxCtx);
     KaleidoScope_DrawEquipmentImage(play, pauseCtx->playerSegment, PAUSE_EQUIP_PLAYER_WIDTH, PAUSE_EQUIP_PLAYER_HEIGHT);
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index 9096271c1c..beef301c41 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
@@ -24,20 +24,15 @@ static s16 sAmmoVtxOffset[] = {
 };
 
 static s16 sAllAmmoVtxOffset[] = {
-    0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46
+    0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46,
 };
 
 extern const char* _gAmmoDigit0Tex[];
 
 s8 ItemInSlotUsesAmmo(s16 slot) {
     s16 item = gSaveContext.inventory.items[slot];
-    return item == ITEM_STICK ||
-           item == ITEM_NUT ||
-           item == ITEM_BOMB ||
-           item == ITEM_BOW ||
-           item == ITEM_SLINGSHOT ||
-           item == ITEM_BOMBCHU ||
-           item == ITEM_BEAN;
+    return item == ITEM_STICK || item == ITEM_NUT || item == ITEM_BOMB || item == ITEM_BOW || item == ITEM_SLINGSHOT ||
+           item == ITEM_BOMBCHU || item == ITEM_BEAN;
 }
 
 void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, s16 item, int slot) {
@@ -78,7 +73,13 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
     gDPPipeSync(POLY_OPA_DISP++);
 
     if (i != 0) {
-        gSPVertex(POLY_OPA_DISP++, &pauseCtx->itemVtx[((CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? sAllAmmoVtxOffset[slot] : sAmmoVtxOffset[slot]) + 31) * 4], 4, 0);
+        gSPVertex(
+            POLY_OPA_DISP++,
+            &pauseCtx->itemVtx[((CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? sAllAmmoVtxOffset[slot]
+                                                                                            : sAmmoVtxOffset[slot]) +
+                                31) *
+                               4],
+            4, 0);
 
         gDPLoadTextureBlock(POLY_OPA_DISP++, ((u8*)_gAmmoDigit0Tex[i]), G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
@@ -87,7 +88,12 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
         gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
     }
 
-    gSPVertex(POLY_OPA_DISP++, &pauseCtx->itemVtx[((CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? sAllAmmoVtxOffset[slot] : sAmmoVtxOffset[slot]) + 32) * 4], 4, 0);
+    gSPVertex(POLY_OPA_DISP++,
+              &pauseCtx->itemVtx[((CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? sAllAmmoVtxOffset[slot]
+                                                                                              : sAmmoVtxOffset[slot]) +
+                                  32) *
+                                 4],
+              4, 0);
 
     gDPLoadTextureBlock(POLY_OPA_DISP++, ((u8*)_gAmmoDigit0Tex[ammo]), G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 0,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
@@ -257,7 +263,8 @@ void KaleidoScope_DrawItemCycleExtras(PlayState* play, u8 slot, u8 canCycle, u8
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle, u8 leftItem, u8 rightItem, bool replaceCButtons) {
+void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle, u8 leftItem, u8 rightItem,
+                                        bool replaceCButtons) {
     Input* input = &play->state.input[0];
     PauseContext* pauseCtx = &play->pauseCtx;
     bool dpad = (CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP));
@@ -265,20 +272,18 @@ void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle,
     u8 hasLeftItem = leftItem != ITEM_NONE && slotItem != leftItem;
     u8 hasRightItem = rightItem != ITEM_NONE && slotItem != rightItem && leftItem != rightItem;
 
-    if (
-        canCycle &&
-        pauseCtx->cursorSlot[PAUSE_ITEM] == slot &&
-        CHECK_BTN_ALL(input->press.button, BTN_A) &&
-        (hasLeftItem || hasRightItem)
-    ) {
-        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    if (canCycle && pauseCtx->cursorSlot[PAUSE_ITEM] == slot && CHECK_BTN_ALL(input->press.button, BTN_A) &&
+        (hasLeftItem || hasRightItem)) {
+        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         gCurrentItemCyclingSlot = gCurrentItemCyclingSlot == slot ? -1 : slot;
     }
     if (gCurrentItemCyclingSlot == slot) {
         pauseCtx->cursorColorSet = 8;
         if ((pauseCtx->stickRelX > 30 || pauseCtx->stickRelY > 30) ||
-             dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT | BTN_DUP)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT | BTN_DUP)) {
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (replaceCButtons) {
                 for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
                     if (gSaveContext.equips.buttonItems[i] == gSaveContext.inventory.items[slot]) {
@@ -294,8 +299,9 @@ void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle,
             }
             gSaveContext.inventory.items[slot] = rightItem;
         } else if ((pauseCtx->stickRelX < -30 || pauseCtx->stickRelY < -30) ||
-            dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DDOWN)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                   dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DDOWN)) {
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             if (replaceCButtons) {
                 for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
                     if (gSaveContext.equips.buttonItems[i] == gSaveContext.inventory.items[slot]) {
@@ -317,7 +323,9 @@ void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle,
 
 bool CanMaskSelect() {
     if (IS_RANDO) {
-        return CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */;
+        return CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) &&
+               Flags_GetRandomizerInf(
+                   RAND_INF_ZELDAS_LETTER); /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */
     }
 
     // only allow mask select when:
@@ -332,89 +340,59 @@ bool CanMaskSelect() {
 }
 
 void KaleidoScope_HandleItemCycles(PlayState* play) {
-    //handle the mask select
+    // handle the mask select
     KaleidoScope_HandleItemCycleExtras(
-        play,
-        SLOT_TRADE_CHILD,
-        CanMaskSelect(),
-        IS_RANDO ?
-            Randomizer_GetPrevChildTradeItem() :
-            (
-                INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_KEATON || INV_CONTENT(ITEM_TRADE_CHILD) > ITEM_MASK_TRUTH ?
-                    ITEM_MASK_TRUTH :
-                    INV_CONTENT(ITEM_TRADE_CHILD) - 1
-            ),
-        IS_RANDO ?
-            Randomizer_GetNextChildTradeItem() :
-            (
-                INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_TRUTH || INV_CONTENT(ITEM_TRADE_CHILD) < ITEM_MASK_KEATON ?
-                    ITEM_MASK_KEATON :
-                    INV_CONTENT(ITEM_TRADE_CHILD) + 1
-            ),
-        true
-    );
+        play, SLOT_TRADE_CHILD, CanMaskSelect(),
+        IS_RANDO ? Randomizer_GetPrevChildTradeItem()
+                 : (INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_KEATON || INV_CONTENT(ITEM_TRADE_CHILD) > ITEM_MASK_TRUTH
+                        ? ITEM_MASK_TRUTH
+                        : INV_CONTENT(ITEM_TRADE_CHILD) - 1),
+        IS_RANDO ? Randomizer_GetNextChildTradeItem()
+                 : (INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_TRUTH || INV_CONTENT(ITEM_TRADE_CHILD) < ITEM_MASK_KEATON
+                        ? ITEM_MASK_KEATON
+                        : INV_CONTENT(ITEM_TRADE_CHILD) + 1),
+        true);
 
-    //the slot age requirement for the child trade slot has to be updated
-    //in case it currently holds a mask
-    //to allow adult link to wear it if the setting is enabled
+    // the slot age requirement for the child trade slot has to be updated
+    // in case it currently holds a mask
+    // to allow adult link to wear it if the setting is enabled
     gSlotAgeReqs[SLOT_TRADE_CHILD] =
-        (
-            CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0) ||
-            CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)
-        ) &&
-        INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_KEATON &&
-        INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_TRUTH
+        (CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0) || CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)) &&
+                INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_KEATON && INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_TRUTH
             ? AGE_REQ_NONE
             : AGE_REQ_CHILD;
 
-    //also update the age requirements for the masks itself
+    // also update the age requirements for the masks itself
     for (int i = ITEM_MASK_KEATON; i <= ITEM_MASK_TRUTH; i += 1) {
-        gItemAgeReqs[i] = CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0) || CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)
+        gItemAgeReqs[i] =
+            CVarGetInteger(CVAR_ENHANCEMENT("AdultMasks"), 0) || CVarGetInteger(CVAR_CHEAT("TimelessEquipment"), 0)
                 ? AGE_REQ_NONE
                 : AGE_REQ_CHILD;
     }
 
-    //handle the adult trade select
-    KaleidoScope_HandleItemCycleExtras(
-        play,
-        SLOT_TRADE_ADULT,
-        IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE),
-        Randomizer_GetPrevAdultTradeItem(),
-        Randomizer_GetNextAdultTradeItem(),
-        true
-    );
+    // handle the adult trade select
+    KaleidoScope_HandleItemCycleExtras(play, SLOT_TRADE_ADULT,
+                                       IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE),
+                                       Randomizer_GetPrevAdultTradeItem(), Randomizer_GetNextAdultTradeItem(), true);
 }
 
 void KaleidoScope_DrawItemCycles(PlayState* play) {
-    //draw the mask select
+    // draw the mask select
     KaleidoScope_DrawItemCycleExtras(
-        play,
-        SLOT_TRADE_CHILD,
-        CanMaskSelect(),
-        IS_RANDO ?
-            Randomizer_GetPrevChildTradeItem() :
-            (
-                INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_KEATON || INV_CONTENT(ITEM_TRADE_CHILD) > ITEM_MASK_TRUTH ?
-                    ITEM_MASK_TRUTH :
-                    INV_CONTENT(ITEM_TRADE_CHILD) - 1
-            ),
-        IS_RANDO ?
-            Randomizer_GetNextChildTradeItem() :
-            (
-                INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_TRUTH || INV_CONTENT(ITEM_TRADE_CHILD) < ITEM_MASK_KEATON ?
-                    ITEM_MASK_KEATON :
-                    INV_CONTENT(ITEM_TRADE_CHILD) + 1
-            )
-    );
+        play, SLOT_TRADE_CHILD, CanMaskSelect(),
+        IS_RANDO ? Randomizer_GetPrevChildTradeItem()
+                 : (INV_CONTENT(ITEM_TRADE_CHILD) <= ITEM_MASK_KEATON || INV_CONTENT(ITEM_TRADE_CHILD) > ITEM_MASK_TRUTH
+                        ? ITEM_MASK_TRUTH
+                        : INV_CONTENT(ITEM_TRADE_CHILD) - 1),
+        IS_RANDO ? Randomizer_GetNextChildTradeItem()
+                 : (INV_CONTENT(ITEM_TRADE_CHILD) >= ITEM_MASK_TRUTH || INV_CONTENT(ITEM_TRADE_CHILD) < ITEM_MASK_KEATON
+                        ? ITEM_MASK_KEATON
+                        : INV_CONTENT(ITEM_TRADE_CHILD) + 1));
 
-    //draw the adult trade select
-    KaleidoScope_DrawItemCycleExtras(
-        play,
-        SLOT_TRADE_ADULT,
-        IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE),
-        Randomizer_GetPrevAdultTradeItem(),
-        Randomizer_GetNextAdultTradeItem()
-    );
+    // draw the adult trade select
+    KaleidoScope_DrawItemCycleExtras(play, SLOT_TRADE_ADULT,
+                                     IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE),
+                                     Randomizer_GetPrevAdultTradeItem(), Randomizer_GetNextAdultTradeItem());
 }
 
 bool IsItemCycling() {
@@ -444,8 +422,10 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
     s16 oldCursorPoint;
     s16 moveCursorResult;
     bool dpad = (CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) && !CHECK_BTN_ALL(input->cur.button, BTN_CUP));
-    bool pauseAnyCursor = pauseCtx->cursorSpecialPos == 0 && ((CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
-                          (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON));
+    bool pauseAnyCursor =
+        pauseCtx->cursorSpecialPos == 0 &&
+        ((CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
+         (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON));
 
     OPEN_DISPS(play->state.gfxCtx);
 
@@ -470,7 +450,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                 pauseCtx->stickRelX = 40;
             }
 
-            if ((ABS(pauseCtx->stickRelX) > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) {
+            if ((ABS(pauseCtx->stickRelX) > 30) ||
+                (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) {
                 cursorPoint = pauseCtx->cursorPoint[PAUSE_ITEM];
                 cursorX = pauseCtx->cursorX[PAUSE_ITEM];
                 cursorY = pauseCtx->cursorY[PAUSE_ITEM];
@@ -562,7 +543,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                 pauseCtx->nameDisplayTimer = 0;
                 pauseCtx->cursorSpecialPos = 0;
 
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 cursorPoint = cursorX = cursorY = 0;
                 while (true) {
@@ -596,7 +578,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                 pauseCtx->nameDisplayTimer = 0;
                 pauseCtx->cursorSpecialPos = 0;
 
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 
                 cursorPoint = cursorX = 5;
                 cursorY = 0;
@@ -630,7 +613,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
 
         if (pauseCtx->cursorSpecialPos == 0) {
             if (cursorItem != PAUSE_ITEM_NONE) {
-                if ((ABS(pauseCtx->stickRelY) > 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
+                if ((ABS(pauseCtx->stickRelY) > 30) ||
+                    (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) {
                     moveCursorResult = 0 || IsItemCycling();
 
                     cursorPoint = pauseCtx->cursorPoint[PAUSE_ITEM];
@@ -650,7 +634,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
 
                                 moveCursorResult = 2;
                             }
-                        } else if ((pauseCtx->stickRelY < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
+                        } else if ((pauseCtx->stickRelY < -30) ||
+                                   (dpad && CHECK_BTN_ALL(input->press.button, BTN_DDOWN))) {
                             if (pauseCtx->cursorY[PAUSE_ITEM] < 3) {
                                 pauseCtx->cursorY[PAUSE_ITEM] += 1;
                                 pauseCtx->cursorPoint[PAUSE_ITEM] += 6;
@@ -698,18 +683,20 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                 if ((pauseCtx->debugState == 0) && (pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0)) {
                     KaleidoScope_HandleItemCycles(play);
                     u16 buttonsToCheck = BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT;
-                    if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) && (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
+                    if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) &&
+                        (!CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0) ||
+                         CHECK_BTN_ALL(input->cur.button, BTN_CUP))) {
                         buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT;
                     }
                     if (CHECK_BTN_ANY(input->press.button, buttonsToCheck)) {
-                        if (CHECK_AGE_REQ_SLOT(cursorSlot) &&
-                            (cursorItem != ITEM_SOLD_OUT) && (cursorItem != ITEM_NONE)) {
+                        if (CHECK_AGE_REQ_SLOT(cursorSlot) && (cursorItem != ITEM_SOLD_OUT) &&
+                            (cursorItem != ITEM_NONE)) {
                             KaleidoScope_SetupItemEquip(play, cursorItem, cursorSlot,
                                                         pauseCtx->itemVtx[index].v.ob[0] * 10,
                                                         pauseCtx->itemVtx[index].v.ob[1] * 10);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                                   &gSfxDefaultReverb);
+                            Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         }
                     }
                 }
@@ -725,7 +712,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
         }
 
         if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_ITEM]) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     } else if ((pauseCtx->unk_1E4 == 3) && (pauseCtx->pageIndex == PAUSE_ITEM)) {
         KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->itemVtx);
@@ -794,8 +782,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                 gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255);
                 gSPGrayscale(POLY_OPA_DISP++, true);
             }
-            KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32,
-                                               32, 0);
+            KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32, 32, 0);
             gSPGrayscale(POLY_OPA_DISP++, false);
         }
     }
@@ -811,7 +798,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
     u8 gBetterAmmoRendering = CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0);
 
     for (i = 0; i < (gBetterAmmoRendering ? 24 : 15); i++) {
-        if ((gBetterAmmoRendering ? ItemInSlotUsesAmmo(i) : gAmmoItems[i] != ITEM_NONE) && (gSaveContext.inventory.items[i] != ITEM_NONE)) {
+        if ((gBetterAmmoRendering ? ItemInSlotUsesAmmo(i) : gAmmoItems[i] != ITEM_NONE) &&
+            (gSaveContext.inventory.items[i] != ITEM_NONE)) {
             KaleidoScope_DrawAmmoCount(pauseCtx, play->state.gfxCtx, gSaveContext.inventory.items[i], i);
         }
     }
@@ -856,7 +844,8 @@ void KaleidoScope_SetupItemEquip(PlayState* play, u16 item, u16 slot, s16 animX,
     if ((pauseCtx->equipTargetItem == ITEM_ARROW_FIRE) || (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) ||
         (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT)) {
         if (CVarGetInteger(CVAR_ENHANCEMENT("SkipArrowAnimation"), 0)) {
-            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         } else {
             u16 index = 0;
             if (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) {
@@ -865,14 +854,16 @@ void KaleidoScope_SetupItemEquip(PlayState* play, u16 item, u16 slot, s16 animX,
             if (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT) {
                 index = 2;
             }
-            Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             pauseCtx->equipTargetItem = 0xBF + index;
             sEquipState = 0;
             pauseCtx->equipAnimAlpha = 0;
             sEquipMoveTimer = 6;
         }
     } else {
-        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
     }
 }
 
@@ -903,79 +894,103 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
     s16 X_Margins_DPad_Items;
     s16 Y_Margins_DPad_Items;
     if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_BtnB = Right_HUD_Margin;};
-        Y_Margins_BtnB = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.BButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_BtnB = Right_HUD_Margin;
+        };
+        Y_Margins_BtnB = (Top_HUD_Margin * -1);
     } else {
         X_Margins_BtnB = 0;
         Y_Margins_BtnB = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CL = Right_HUD_Margin;};
-        Y_Margins_CL = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CL = Right_HUD_Margin;
+        };
+        Y_Margins_CL = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CL = 0;
         Y_Margins_CL = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CR = Right_HUD_Margin;};
-        Y_Margins_CR = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CR = Right_HUD_Margin;
+        };
+        Y_Margins_CR = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CR = 0;
         Y_Margins_CR = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_CD = Right_HUD_Margin;};
-        Y_Margins_CD = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_CD = Right_HUD_Margin;
+        };
+        Y_Margins_CD = (Top_HUD_Margin * -1);
     } else {
         X_Margins_CD = 0;
         Y_Margins_CD = 0;
     }
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
-        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {X_Margins_DPad_Items = Right_HUD_Margin;};
-        Y_Margins_DPad_Items = (Top_HUD_Margin*-1);
+        if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ORIGINAL_LOCATION) {
+            X_Margins_DPad_Items = Right_HUD_Margin;
+        };
+        Y_Margins_DPad_Items = (Top_HUD_Margin * -1);
     } else {
         X_Margins_DPad_Items = 0;
         Y_Margins_DPad_Items = 0;
     }
-    const s16 ItemIconPos_ori[7][2] = {
-        { C_LEFT_BUTTON_X+X_Margins_CL, C_LEFT_BUTTON_Y+Y_Margins_CL },
-        { C_DOWN_BUTTON_X+X_Margins_CD, C_DOWN_BUTTON_Y+Y_Margins_CD },
-        { C_RIGHT_BUTTON_X+X_Margins_CR, C_RIGHT_BUTTON_Y+Y_Margins_CR },
-        { DPAD_UP_X+X_Margins_DPad_Items, DPAD_UP_Y+Y_Margins_DPad_Items },
-        { DPAD_DOWN_X+X_Margins_DPad_Items, DPAD_DOWN_Y+Y_Margins_DPad_Items }, 
-        { DPAD_LEFT_X+X_Margins_DPad_Items, DPAD_LEFT_Y+Y_Margins_DPad_Items }, 
-        { DPAD_RIGHT_X+X_Margins_DPad_Items, DPAD_RIGHT_Y+Y_Margins_DPad_Items }
-    };
+    const s16 ItemIconPos_ori[7][2] = { { C_LEFT_BUTTON_X + X_Margins_CL, C_LEFT_BUTTON_Y + Y_Margins_CL },
+                                        { C_DOWN_BUTTON_X + X_Margins_CD, C_DOWN_BUTTON_Y + Y_Margins_CD },
+                                        { C_RIGHT_BUTTON_X + X_Margins_CR, C_RIGHT_BUTTON_Y + Y_Margins_CR },
+                                        { DPAD_UP_X + X_Margins_DPad_Items, DPAD_UP_Y + Y_Margins_DPad_Items },
+                                        { DPAD_DOWN_X + X_Margins_DPad_Items, DPAD_DOWN_Y + Y_Margins_DPad_Items },
+                                        { DPAD_LEFT_X + X_Margins_DPad_Items, DPAD_LEFT_Y + Y_Margins_DPad_Items },
+                                        { DPAD_RIGHT_X + X_Margins_DPad_Items, DPAD_RIGHT_Y + Y_Margins_DPad_Items } };
     s16 DPad_ItemsOffset[4][2] = {
-        { 7,-8},//Up
-        { 7,24},//Down
-        {-9, 8},//Left
-        {23, 8},//Right
-    }; //(X,Y) Used with custom position to place it properly.
+        { 7, -8 }, // Up
+        { 7, 24 }, // Down
+        { -9, 8 }, // Left
+        { 23, 8 }, // Right
+    };             //(X,Y) Used with custom position to place it properly.
 
-    //DPadItems
+    // DPadItems
     if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) != ORIGINAL_LOCATION) {
-        sCButtonPosY[3] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up
-        sCButtonPosY[4] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down
-        sCButtonPosY[5] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left
-        sCButtonPosY[6] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right
+        sCButtonPosY[3] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[0][1]; // Up
+        sCButtonPosY[4] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[1][1]; // Down
+        sCButtonPosY[5] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[2][1]; // Left
+        sCButtonPosY[6] =
+            CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosY"), 0) + Y_Margins_DPad_Items + DPad_ItemsOffset[3][1]; // Right
         if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;};
-            sCButtonPosX[3] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]);
-            sCButtonPosX[4] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]);
-            sCButtonPosX[5] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]);
-            sCButtonPosX[6] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Left_HUD_Margin;
+            };
+            sCButtonPosX[3] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                          X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            sCButtonPosX[4] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                          X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            sCButtonPosX[5] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                          X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            sCButtonPosX[6] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                          X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;};
-            sCButtonPosX[3] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]);
-            sCButtonPosX[4] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]);
-            sCButtonPosX[5] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]);
-            sCButtonPosX[6] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.UseMargins"), 0) != 0) {
+                X_Margins_DPad_Items = Right_HUD_Margin;
+            };
+            sCButtonPosX[3] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                           X_Margins_DPad_Items + DPad_ItemsOffset[0][0]);
+            sCButtonPosX[4] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                           X_Margins_DPad_Items + DPad_ItemsOffset[1][0]);
+            sCButtonPosX[5] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                           X_Margins_DPad_Items + DPad_ItemsOffset[2][0]);
+            sCButtonPosX[6] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) +
+                                                           X_Margins_DPad_Items + DPad_ItemsOffset[3][0]);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosType"), 0) == ANCHOR_NONE) {
-            sCButtonPosX[3] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[0][0];
-            sCButtonPosX[4] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[1][0];
-            sCButtonPosX[5] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[2][0];
-            sCButtonPosX[6] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0)+DPad_ItemsOffset[3][0];
+            sCButtonPosX[3] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[0][0];
+            sCButtonPosX[4] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[1][0];
+            sCButtonPosX[5] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[2][0];
+            sCButtonPosX[6] = CVarGetInteger(CVAR_COSMETIC("HUD.Dpad.PosX"), 0) + DPad_ItemsOffset[3][0];
         }
     } else {
         sCButtonPosX[3] = OTRGetDimensionFromRightEdge(ItemIconPos_ori[3][0]);
@@ -987,15 +1002,21 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
         sCButtonPosY[5] = ItemIconPos_ori[5][1];
         sCButtonPosY[6] = ItemIconPos_ori[6][1];
     }
-    //C button Left
+    // C button Left
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        sCButtonPosY[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0)+Y_Margins_CL;
+        sCButtonPosY[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosY"), 0) + Y_Margins_CL;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Left_HUD_Margin;};
-            sCButtonPosX[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0)+X_Margins_CL);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Left_HUD_Margin;
+            };
+            sCButtonPosX[0] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {X_Margins_CL = Right_HUD_Margin;};
-            sCButtonPosX[0] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0)+X_Margins_CL);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.UseMargins"), 0) != 0) {
+                X_Margins_CL = Right_HUD_Margin;
+            };
+            sCButtonPosX[0] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0) + X_Margins_CL);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosType"), 0) == ANCHOR_NONE) {
             sCButtonPosX[0] = CVarGetInteger(CVAR_COSMETIC("HUD.CLeftButton.PosX"), 0);
         }
@@ -1003,15 +1024,21 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
         sCButtonPosX[0] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[0][0]);
         sCButtonPosY[0] = ItemIconPos_ori[0][1];
     }
-    //C Button down
+    // C Button down
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        sCButtonPosY[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0)+Y_Margins_CD;
+        sCButtonPosY[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosY"), 0) + Y_Margins_CD;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Left_HUD_Margin;};
-            sCButtonPosX[1] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0)+X_Margins_CD);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Left_HUD_Margin;
+            };
+            sCButtonPosX[1] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {X_Margins_CD = Right_HUD_Margin;};
-            sCButtonPosX[1] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0)+X_Margins_CD);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.UseMargins"), 0) != 0) {
+                X_Margins_CD = Right_HUD_Margin;
+            };
+            sCButtonPosX[1] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0) + X_Margins_CD);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosType"), 0) == ANCHOR_NONE) {
             sCButtonPosX[1] = CVarGetInteger(CVAR_COSMETIC("HUD.CDownButton.PosX"), 0);
         }
@@ -1019,15 +1046,21 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
         sCButtonPosX[1] = OTRGetRectDimensionFromRightEdge(ItemIconPos_ori[1][0]);
         sCButtonPosY[1] = ItemIconPos_ori[1][1];
     }
-    //C button Right
+    // C button Right
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) != ORIGINAL_LOCATION) {
-        sCButtonPosY[2] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0)+Y_Margins_CR;
+        sCButtonPosY[2] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosY"), 0) + Y_Margins_CR;
         if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_LEFT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Left_HUD_Margin;};
-            sCButtonPosX[2] = OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0)+X_Margins_CR);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Left_HUD_Margin;
+            };
+            sCButtonPosX[2] =
+                OTRGetDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_RIGHT) {
-            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {X_Margins_CR = Right_HUD_Margin;};
-            sCButtonPosX[2] = OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0)+X_Margins_CR);
+            if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.UseMargins"), 0) != 0) {
+                X_Margins_CR = Right_HUD_Margin;
+            };
+            sCButtonPosX[2] =
+                OTRGetDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0) + X_Margins_CR);
         } else if (CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosType"), 0) == ANCHOR_NONE) {
             sCButtonPosX[2] = CVarGetInteger(CVAR_COSMETIC("HUD.CRightButton.PosX"), 0);
         }
@@ -1073,7 +1106,8 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
             WREG(90) = 320;
             WREG(87) = WREG(91);
             sEquipState++;
-            Audio_PlaySoundGeneral(NA_SE_SY_SYNTH_MAGIC_ARROW, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_SYNTH_MAGIC_ARROW, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
         return;
     }
@@ -1137,7 +1171,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
 
             osSyncPrintf("\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n");
 
-			// Skipping the arrow animation: need to change the item's type and
+            // Skipping the arrow animation: need to change the item's type and
             // slot when it hits the button since it didn't get set earlier
             if (pauseCtx->equipTargetItem == ITEM_ARROW_FIRE || pauseCtx->equipTargetItem == ITEM_ARROW_ICE ||
                 pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT) {
@@ -1156,7 +1190,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
                     pauseCtx->equipTargetSlot = SLOT_BOW;
                 }
             }
-            
+
             // If the item is on another button already, swap the two
             uint16_t targetButtonIndex = pauseCtx->equipTargetCBtn + 1;
             for (uint16_t otherSlotIndex = 0; otherSlotIndex < ARRAY_COUNT(gSaveContext.equips.cButtonSlots);
@@ -1178,18 +1212,20 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
                         gSaveContext.equips.buttonItems[otherButtonIndex] = ITEM_NONE;
                         gSaveContext.equips.cButtonSlots[otherSlotIndex] = SLOT_NONE;
                     }
-                    //break; // 'Assume there is only one possible pre-existing equip'
+                    // break; // 'Assume there is only one possible pre-existing equip'
                 }
 
-                //Fix for Equip Dupe
+                // Fix for Equip Dupe
                 if (pauseCtx->equipTargetItem == ITEM_BOW) {
                     if (gSaveContext.equips.buttonItems[otherButtonIndex] >= ITEM_BOW_ARROW_FIRE &&
                         gSaveContext.equips.buttonItems[otherButtonIndex] <= ITEM_BOW_ARROW_LIGHT &&
                         !CVarGetInteger(CVAR_ENHANCEMENT("SeparateArrows"), 0)) {
-                            gSaveContext.equips.buttonItems[otherButtonIndex] = gSaveContext.equips.buttonItems[targetButtonIndex];
-                            gSaveContext.equips.cButtonSlots[otherSlotIndex] = gSaveContext.equips.cButtonSlots[pauseCtx->equipTargetCBtn];
-                            Interface_LoadItemIcon2(play, otherButtonIndex);
-                        }
+                        gSaveContext.equips.buttonItems[otherButtonIndex] =
+                            gSaveContext.equips.buttonItems[targetButtonIndex];
+                        gSaveContext.equips.cButtonSlots[otherSlotIndex] =
+                            gSaveContext.equips.cButtonSlots[pauseCtx->equipTargetCBtn];
+                        Interface_LoadItemIcon2(play, otherButtonIndex);
+                    }
                 }
             }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
index 3c37b565f7..3ff61d7833 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
@@ -3,6 +3,7 @@
 #include "textures/icon_item_nes_static/icon_item_nes_static.h"
 #include "textures/icon_item_ger_static/icon_item_ger_static.h"
 #include "textures/icon_item_fra_static/icon_item_fra_static.h"
+#include "textures/icon_item_jpn_static/icon_item_jpn_static.h"
 #include "textures/icon_item_field_static/icon_item_field_static.h"
 #include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
 #include "textures/icon_item_nes_static/icon_item_nes_static.h"
@@ -27,6 +28,10 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
         gPauseDekuTitleFRATex, gPauseDodongoTitleFRATex,   gPauseJabuTitleFRATex,   gPauseForestTitleFRATex,
         gPauseFireTitleFRATex, gPauseWaterTitleFRATex,     gPauseSpiritTitleFRATex, gPauseShadowTitleFRATex,
         gPauseBotWTitleFRATex, gPauseIceCavernTitleFRATex,
+
+        gPauseDekuTitleJPNTex, gPauseDodongoTitleJPNTex,   gPauseJabuTitleJPNTex,   gPauseForestTitleJPNTex,
+        gPauseFireTitleJPNTex, gPauseWaterTitleJPNTex,     gPauseSpiritTitleJPNTex, gPauseShadowTitleJPNTex,
+        gPauseBotWTitleJPNTex, gPauseIceCavernTitleJPNTex,
     };
     static void* floorIconTexs[] = {
         gDungeonMapBlankFloorButtonTex, gDungeonMap8FButtonTex, gDungeonMap7FButtonTex, gDungeonMap6FButtonTex,
@@ -157,7 +162,8 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
                 pauseCtx->cursorX[PAUSE_MAP] = 0;
                 j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4);
                 KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx);
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         } else {
             if ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))) {
@@ -187,12 +193,14 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
                 osSyncPrintf("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
                 j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4);
                 KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx);
-                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                       &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             }
         }
 
         if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_MAP]) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
@@ -226,9 +234,9 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
 
     gSPVertex(POLY_OPA_DISP++, &pauseCtx->mapPageVtx[68], 16, 0);
 
-    gDPLoadTextureBlock(POLY_OPA_DISP++, dungeonTitleTexs[gSaveContext.mapIndex+(10*gSaveContext.language)], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0,
-                        G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
-                        G_TX_NOLOD);
+    gDPLoadTextureBlock(POLY_OPA_DISP++, dungeonTitleTexs[gSaveContext.mapIndex + (10 * gSaveContext.language)],
+                        G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR,
+                        G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
@@ -431,6 +439,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
         gPauseCurrentPositionENGTex,
         gPauseCurrentPositionGERTex,
         gPauseCurrentPositionFRATex,
+        gPauseCurrentPositionJPNTex,
     };
     static u16 D_8082A6D4 = 0;
     PauseContext* pauseCtx = &play->pauseCtx;
@@ -454,27 +463,33 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
         oldCursorPoint = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
 
         if (pauseCtx->cursorSpecialPos == 0) {
-            if ((!mirroredWorld && ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)))) ||
-                (mirroredWorld && ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))))) {
+            if ((!mirroredWorld &&
+                 ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)))) ||
+                (mirroredWorld &&
+                 ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT))))) {
                 D_8082A6D4 = 0;
 
                 do {
                     pauseCtx->cursorPoint[PAUSE_WORLD_MAP]++;
                     if (pauseCtx->cursorPoint[PAUSE_WORLD_MAP] > 11) {
                         pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = 11;
-                        KaleidoScope_MoveCursorToSpecialPos(play, !mirroredWorld ? PAUSE_CURSOR_PAGE_RIGHT : PAUSE_CURSOR_PAGE_LEFT);
+                        KaleidoScope_MoveCursorToSpecialPos(play, !mirroredWorld ? PAUSE_CURSOR_PAGE_RIGHT
+                                                                                 : PAUSE_CURSOR_PAGE_LEFT);
                         break;
                     }
                 } while (pauseCtx->worldMapPoints[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]] == 0);
-            } else if ((!mirroredWorld && ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT)))) ||
-                       (mirroredWorld && ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))))) {
+            } else if ((!mirroredWorld &&
+                        ((pauseCtx->stickRelX < -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT)))) ||
+                       (mirroredWorld &&
+                        ((pauseCtx->stickRelX > 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT))))) {
                 D_8082A6D4 = 0;
 
                 do {
                     pauseCtx->cursorPoint[PAUSE_WORLD_MAP]--;
                     if (pauseCtx->cursorPoint[PAUSE_WORLD_MAP] < 0) {
                         pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = 0;
-                        KaleidoScope_MoveCursorToSpecialPos(play, !mirroredWorld ? PAUSE_CURSOR_PAGE_LEFT : PAUSE_CURSOR_PAGE_RIGHT);
+                        KaleidoScope_MoveCursorToSpecialPos(play, !mirroredWorld ? PAUSE_CURSOR_PAGE_LEFT
+                                                                                 : PAUSE_CURSOR_PAGE_RIGHT);
                         break;
                     }
                 } while (pauseCtx->worldMapPoints[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]] == 0);
@@ -506,7 +521,8 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
                     pauseCtx->cursorItem[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
                     pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP] + 0x1F;
                     KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_MAP] * 4, pauseCtx->mapPageVtx);
-                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     D_8082A6D4 = 0;
                 }
             } else {
@@ -528,7 +544,8 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
                     pauseCtx->cursorItem[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
                     pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP] + 0x1F;
                     KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_MAP] * 4, pauseCtx->mapPageVtx);
-                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     D_8082A6D4 = 0;
                 }
             }
@@ -539,7 +556,8 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
         }
 
         if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_WORLD_MAP]) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         }
     }
 
@@ -565,18 +583,18 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
         gSPVertex(POLY_OPA_DISP++, &pauseCtx->mapPageVtx[188], 32, 0);
 
         for (j = t = i = 0; i < 8; i++, t++, j += 4) {
-            gDPLoadMultiTile(POLY_OPA_DISP++, gWorldMapImageTex, 0, G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 216, 128, 0, t * 9, 216 - 1,
-                             (t + 1) * 9 - 1, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOMASK,
-                             G_TX_NOLOD, G_TX_NOLOD);
-            gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, (216 - 1) << G_TEXTURE_IMAGE_FRAC, (9 - 1) << G_TEXTURE_IMAGE_FRAC);
+            gDPLoadMultiTile(POLY_OPA_DISP++, gWorldMapImageTex, 0, G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 216, 128,
+                             0, t * 9, 216 - 1, (t + 1) * 9 - 1, 0, G_TX_WRAP | G_TX_NOMIRROR,
+                             G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+            gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, (216 - 1) << G_TEXTURE_IMAGE_FRAC,
+                           (9 - 1) << G_TEXTURE_IMAGE_FRAC);
 
             gSP1Quadrangle(POLY_OPA_DISP++, j, j + 2, j + 3, j + 1, 0);
         }
 
         gSPVertex(POLY_OPA_DISP++, &pauseCtx->mapPageVtx[220], 28, 0);
 
-        for (j = i = 0; i < 6; i++, t++, j += 4) 
-        {
+        for (j = i = 0; i < 6; i++, t++, j += 4) {
             gDPLoadMultiTile(POLY_OPA_DISP++, gWorldMapImageTex, 0, G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 216, 128,
                              0, t * 9, 216 - 1, (t + 1) * 9 - 1, 0, G_TX_WRAP | G_TX_NOMIRROR,
                              G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -789,7 +807,6 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 150, 255, 255, pauseCtx->alpha);
         gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
 
-
         POLY_OPA_DISP = KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, pauseCtx->nameSegment + 0x400, 80, 32, 4);
     }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
index 9025196677..86ba8db960 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
@@ -10,11 +10,15 @@ void KaleidoScope_UpdatePrompt(PlayState* play) {
     bool dpad = CVarGetInteger(CVAR_SETTING("DPadOnPause"), 0);
 
     if (((pauseCtx->state == 7) && (pauseCtx->unk_1EC == 1)) || (pauseCtx->state == 0xE) || (pauseCtx->state == 0x10)) {
-        if ((pauseCtx->promptChoice == 0) && ((relStickX >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        if ((pauseCtx->promptChoice == 0) &&
+            ((relStickX >= 30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)))) {
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             pauseCtx->promptChoice = 4;
-        } else if ((pauseCtx->promptChoice != 0) && ((relStickX <= -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT)))) {
-            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        } else if ((pauseCtx->promptChoice != 0) &&
+                   ((relStickX <= -30) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DLEFT)))) {
+            Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             pauseCtx->promptChoice = 0;
         }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index f6dab70036..14f749d43d 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -8,7 +8,7 @@
 #include "textures/icon_item_nes_static/icon_item_nes_static.h"
 #include "textures/icon_item_ger_static/icon_item_ger_static.h"
 #include "textures/icon_item_fra_static/icon_item_fra_static.h"
-#include "textures/icon_item_gameover_static/icon_item_gameover_static.h"
+#include "textures/icon_item_jpn_static/icon_item_jpn_static.h"
 #include "textures/icon_item_gameover_static/icon_item_gameover_static.h"
 #include "textures/map_name_static/map_name_static.h"
 #include "textures/map_48x85_static/map_48x85_static.h"
@@ -23,7 +23,6 @@
 #include "soh/SaveManager.h"
 #include "soh/Enhancements/kaleido.h"
 
-
 static void* sEquipmentFRATexs[] = {
     gPauseEquipment00FRATex, gPauseEquipment01Tex, gPauseEquipment02Tex, gPauseEquipment03Tex, gPauseEquipment04Tex,
     gPauseEquipment10FRATex, gPauseEquipment11Tex, gPauseEquipment12Tex, gPauseEquipment13Tex, gPauseEquipment14Tex,
@@ -108,6 +107,34 @@ static void* sSaveENGTexs[] = {
     gPauseSave20Tex,    gPauseSave21Tex, gPauseSave22Tex, gPauseSave23Tex, gPauseSave24Tex,
 };
 
+static void* sEquipmentJPNTexs[] = {
+    gPauseEquipment00Tex,    gPauseEquipment01Tex, gPauseEquipment02Tex, gPauseEquipment03Tex, gPauseEquipment04Tex,
+    gPauseEquipment10JPNTex, gPauseEquipment11Tex, gPauseEquipment12Tex, gPauseEquipment13Tex, gPauseEquipment14Tex,
+    gPauseEquipment20Tex,    gPauseEquipment21Tex, gPauseEquipment22Tex, gPauseEquipment23Tex, gPauseEquipment24Tex,
+};
+static void* sSelectItemJPNTexs[] = {
+    gPauseSelectItem00JPNTex, gPauseSelectItem01Tex,    gPauseSelectItem02Tex,    gPauseSelectItem03Tex,
+    gPauseSelectItem04Tex,    gPauseSelectItem10JPNTex, gPauseSelectItem11Tex,    gPauseSelectItem12Tex,
+    gPauseSelectItem13Tex,    gPauseSelectItem14Tex,    gPauseSelectItem20JPNTex, gPauseSelectItem21Tex,
+    gPauseSelectItem22Tex,    gPauseSelectItem23Tex,    gPauseSelectItem24Tex,
+};
+static void* sMapJPNTexs[] = {
+    gPauseMap00Tex,    gPauseMap01Tex, gPauseMap02Tex, gPauseMap03Tex, gPauseMap04Tex,
+    gPauseMap10JPNTex, gPauseMap11Tex, gPauseMap12Tex, gPauseMap13Tex, gPauseMap14Tex,
+    gPauseMap20Tex,    gPauseMap21Tex, gPauseMap22Tex, gPauseMap23Tex, gPauseMap24Tex,
+};
+static void* sQuestStatusJPNTexs[] = {
+    gPauseQuestStatus00JPNTex, gPauseQuestStatus01Tex,    gPauseQuestStatus02Tex,    gPauseQuestStatus03Tex,
+    gPauseQuestStatus04Tex,    gPauseQuestStatus10JPNTex, gPauseQuestStatus11Tex,    gPauseQuestStatus12Tex,
+    gPauseQuestStatus13Tex,    gPauseQuestStatus14Tex,    gPauseQuestStatus20JPNTex, gPauseQuestStatus21Tex,
+    gPauseQuestStatus22Tex,    gPauseQuestStatus23Tex,    gPauseQuestStatus24Tex,
+};
+static void* sSaveJPNTexs[] = {
+    gPauseSave00Tex,    gPauseSave01Tex, gPauseSave02Tex, gPauseSave03Tex, gPauseSave04Tex,
+    gPauseSave10JPNTex, gPauseSave11Tex, gPauseSave12Tex, gPauseSave13Tex, gPauseSave14Tex,
+    gPauseSave20Tex,    gPauseSave21Tex, gPauseSave22Tex, gPauseSave23Tex, gPauseSave24Tex,
+};
+
 static void* sGameOverTexs[] = {
     gPauseSave00Tex,     gPauseSave01Tex, gPauseSave02Tex, gPauseSave03Tex, gPauseSave04Tex,
     gPauseGameOver10Tex, gPauseSave11Tex, gPauseSave12Tex, gPauseSave13Tex, gPauseSave14Tex,
@@ -189,34 +216,39 @@ static void* sEquipmentTexs[] = {
     sEquipmentENGTexs,
     sEquipmentGERTexs,
     sEquipmentFRATexs,
+    sEquipmentJPNTexs,
 };
 
 static void* sSelectItemTexs[] = {
     sSelectItemENGTexs,
     sSelectItemGERTexs,
     sSelectItemFRATexs,
+    sSelectItemJPNTexs,
 };
 
 static void* sMapTexs[] = {
     sMapENGTexs,
     sMapGERTexs,
     sMapFRATexs,
+    sMapJPNTexs,
 };
 
 static void* sQuestStatusTexs[] = {
     sQuestStatusENGTexs,
     sQuestStatusGERTexs,
     sQuestStatusFRATexs,
+    sQuestStatusJPNTexs,
 };
 
 static void* sSaveTexs[] = {
     sSaveENGTexs,
     sSaveGERTexs,
     sSaveFRATexs,
+    sSaveJPNTexs,
 };
 
-static void* iconNameTextures[] =
-{
+static void* iconNameTextures[] = {
+    // LANGUAGE_ENG
     gDekuStickItemNameENGTex,
     gDekuNutItemNameENGTex,
     gBombItemNameENGTex,
@@ -340,6 +372,7 @@ static void* iconNameTextures[] =
     gUnusedBossKeyItemName6JPNTex,
     gUnusedBossKeyItemName7JPNTex,
     gBiggoronsSwordItemNameENGTex,
+    // LANGUAGE_GER
     gDekuStickItemNameGERTex,
     gDekuNutItemNameGERTex,
     gBombItemNameItemNameGERTex,
@@ -463,6 +496,7 @@ static void* iconNameTextures[] =
     gUnusedBossKeyItemName13JPNTex,
     gUnusedBossKeyItemName14JPNTex,
     gBiggoronsSwordItemNameGERTex,
+    // LANGUAGE_FRA
     gDekuStickItemNameFRATex,
     gDekuNutItemNameFRATex,
     gBombItemNameFRATex,
@@ -586,113 +620,278 @@ static void* iconNameTextures[] =
     gUnusedBossKeyItemName20JPNTex,
     gUnusedBossKeyItemName21JPNTex,
     gBiggoronsSwordItemNameFRATex,
-    gBiggoronsSwordItemNameFRATex,
+    // LANGUAGE_JPN
+    gDekuStickItemNameJPNTex,
+    gDekuNutItemNameJPNTex,
+    gBombItemNameJPNTex,
+    gFairyBowItemNameJPNTex,
+    gFireArrowItemNameJPNTex,
+    gDinsFireItemNameJPNTex,
+    gFairySlingshotItemNameJPNTex,
+    gFairyOcarinaItemNameJPNTex,
+    gOcarinaOfTimeItemNameJPNTex,
+    gBombchuItemNameJPNTex,
+    gHookshotItemNameJPNTex,
+    gLongshotItemNameJPNTex,
+    gIceArrowItemNameJPNTex,
+    gFaroresWindItemNameJPNTex,
+    gBoomerangItemNameJPNTex,
+    gLensItemNameJPNTex,
+    gMagicBeansItemNameJPNTex,
+    gMegatonHammerItemNameJPNTex,
+    gLightArrowItemNameJPNTex,
+    gNayrusLoveItemNameJPNTex,
+    gEmptyBottleItemNameJPNTex,
+    gRedPotionItemNameJPNTex,
+    gGreenPotionItemNameJPNTex,
+    gBluePotionItemNameJPNTex,
+    gBottledFairyItemNameJPNTex,
+    gFishItemNameJPNTex,
+    gFullMilkItemNameJPNTex,
+    gRutosLetterItemNameJPNTex,
+    gBlueFireItemNameJPNTex,
+    gBugItemNameJPNTex,
+    gBigPoeItemNameJPNTex,
+    gHalfMilkItemNameJPNTex,
+    gPoeItemNameJPNTex,
+    gWeirdEggItemNameJPNTex,
+    gCuccoItemNameJPNTex,
+    gZeldasLetterItemNameJPNTex,
+    gKeatonMaskItemNameJPNTex,
+    gSkullMaskItemNameJPNTex,
+    gSpookyMaskItemNameJPNTex,
+    gBunnyHoodItemNameJPNTex,
+    gGoronMaskItemNameJPNTex,
+    gZoraMaskItemNameJPNTex,
+    gGerudoMaskItemNameJPNTex,
+    gMaskofTruthItemNameJPNTex,
+    gSOLDOUTItemNameJPNTex,
+    gPocketEggItemNameJPNTex,
+    gPocketCuccoItemNameJPNTex,
+    gCojiroItemNameJPNTex,
+    gOddMushroomItemNameJPNTex,
+    gOddPotionItemNameJPNTex,
+    gPoachersSawItemNameJPNTex,
+    gBrokenGoronsSwordItemNameJPNTex,
+    gPrescriptionItemNameJPNTex,
+    gEyeBallFrogItemNameJPNTex,
+    gEyeDropsItemNameJPNTex,
+    gClaimCheckItemNameJPNTex,
+    gUnusedWindMedallionItemName1JPNTex,
+    gUnusedFireMedallionItemName1JPNTex,
+    gUnusedIceMedallionItemName1JPNTex,
+    gKokiriSwordItemNameJPNTex,
+    gMasterSwordItemNameJPNTex,
+    gGiantsKnifeItemNameJPNTex,
+    gDekuShieldItemNameJPNTex,
+    gHylianShieldItemNameJPNTex,
+    gMirrorShieldItemNameJPNTex,
+    gKokiriTunicItemNameJPNTex,
+    gGoronTunicItemNameJPNTex,
+    gZoraTunicItemNameJPNTex,
+    gKokiriBootsItemNameJPNTex,
+    gIronBootsItemNameJPNTex,
+    gHoverBootsItemNameJPNTex,
+    gBulletBag30ItemNameJPNTex,
+    gBulletBag40ItemNameJPNTex,
+    gBulletBag50ItemNameJPNTex,
+    gQuiver30ItemNameJPNTex,
+    gQuiver40ItemNameJPNTex,
+    gQuiver50ItemNameJPNTex,
+    gBombBag20ItemNameJPNTex,
+    gBombBag30ItemNameJPNTex,
+    gBombBag40ItemNameJPNTex,
+    gGoronsBraceletItemNameJPNTex,
+    gSilverGauntletsItemNameJPNTex,
+    gGoldenGauntletsItemNameJPNTex,
+    gSilverScaleItemNameJPNTex,
+    gGoldenScaleItemNameJPNTex,
+    gBrokenGiantsKnifeItemNameJPNTex,
+    gUnusedBossKeyItemName1JPNTex,
+    gUnusedBossKeyItemName2JPNTex,
+    gUnusedBossKeyItemName3JPNTex,
+    gUnusedBossKeyItemName4JPNTex,
+    gMinuetOfForestItemNameJPNTex,
+    gBoleroOfFireItemNameJPNTex,
+    gSerenadeOfWaterItemNameJPNTex,
+    gRequiemOfSpiritItemNameJPNTex,
+    gNocturneOfShadowItemNameJPNTex,
+    gPreludeOfLightItemNameJPNTex,
+    gZeldasLullabyItemNameJPNTex,
+    gEponasSongItemNameJPNTex,
+    gSariasSongItemNameJPNTex,
+    gSunsSongItemNameJPNTex,
+    gSongOfTimeItemNameJPNTex,
+    gSongOfStormsItemNameJPNTex,
+    gForestMedallionItemNameJPNTex,
+    gFireMedallionItemNameJPNTex,
+    gWaterMedallionItemNameJPNTex,
+    gSpiritMedallionItemNameJPNTex,
+    gShadowMedallionItemNameJPNTex,
+    gLightMedallionItemNameJPNTex,
+    gKokiriEmeraldItemNameJPNTex,
+    gGoronsRubyItemNameJPNTex,
+    gZorasSapphireItemNameJPNTex,
+    gStoneofAgonyItemNameJPNTex,
+    gGerudosCardItemNameJPNTex,
+    gGoldSkulltulaItemNameJPNTex,
+    gPieceOfHeartItemNameJPNTex,
+    gUnusedPieceOfHeartItemName1JPNTex,
+    gUnusedBigKeyItemNameJPNTex,
+    gCompassItemNameJPNTex,
+    gDungeonMapItemNameJPNTex,
+    gUnusedBossKeyItemName5JPNTex,
+    gUnusedBossKeyItemName6JPNTex,
+    gUnusedBossKeyItemName7JPNTex,
+    gBiggoronsSwordItemNameJPNTex,
 };
 
-static void* mapNameTextures[] =
-{
-    gHauntedWastelandPointNameENGTex,
-    gGerudosFortressPointNameENGTex,
-    gGerudoValleyPointNameENGTex,
-    gHyliaLakesidePointNameENGTex,
-    gLonLonRanchPointNameENGTex,
-    gMarketPointNameENGTex,
-    gHyruleFieldPointNameENGTex,
-    gDeathMountainPointNameENGTex,
-    gKakarikoVillagePointNameENGTex,
-    gLostWoodsPointNameENGTex,
-    gKokiriForestPointNameENGTex,
-    gZorasDomainPointNameENGTex,
-    gHauntedWastelandPointNameGERTex,
-    gGerudosFortressPointNameGERTex,
-    gGerudoValleyPointNameGERTex,
-    gHyliaLakesidePointNameGERTex,
-    gLonLonRanchPointNameGERTex,
-    gMarketPointNameGERTex,
-    gHyruleFieldPointNameGERTex,
-    gDeathMountainPointNameGERTex,
-    gKakarikoVillagePointNameGERTex,
-    gLostWoodsPointNameGERTex,
-    gKokiriForestPointNameGERTex,
-    gZorasDomainPointNameGERTex,
-    gHauntedWastelandPointNameFRATex,
-    gGerudosFortressPointNameFRATex,
-    gGerudoValleyPointNameFRATex,
-    gHyliaLakesidePointNameFRATex,
-    gLonLonRanchPointNameFRATex,
-    gMarketPointNameFRATex,
-    gHyruleFieldPointNameFRATex,
-    gDeathMountainPointNameFRATex,
-    gKakarikoVillagePointNameFRATex,
-    gLostWoodsPointNameFRATex,
-    gKokiriForestPointNameFRATex,
-    gZorasDomainPointNameFRATex,
-    gHyruleFieldPositionNameENGTex,
-    gKakarikoVillagePositionNameENGTex,
-    gGraveyardPositionNameENGTex,
-    gZorasRiverPositionNameENGTex,
-    gKokiriForestPositionNameENGTex,
-    gSacredForestMeadowPositionNameENGTex,
-    gLakeHyliaPositionNameENGTex,
-    gZorasDomainPositionNameENGTex,
-    gZorasFountainPositionNameENGTex,
-    gGerudoValleyPositionNameENGTex,
-    gLostWoodsPositionNameENGTex,
-    gDesertColossusPositionNameENGTex,
-    gGerudosFortressPositionNameENGTex,
-    gHauntedWastelandPositionNameENGTex,
-    gMarketPositionNameENGTex,
-    gHyruleCastlePositionNameENGTex,
-    gDeathMountainTrailPositionNameENGTex,
-    gDeathMountainCraterPositionNameENGTex,
-    gGoronCityPositionNameENGTex,
-    gLonLonRanchPositionNameENGTex,
-    gQuestionMarkPositionNameENGTex,
-    gGanonsCastlePositionNameENGTex,
-    gHyruleFieldPositionNameGERTex,
-    gKakarikoVillagePositionNameGERTex,
-    gGraveyardPositionNameGERTex,
-    gZorasRiverPositionNameGERTex,
-    gKokiriForestPositionNameGERTex,
-    gSacredForestMeadowPositionNameGERTex,
-    gLakeHyliaPositionNameGERTex,
-    gZorasDomainPositionNameGERTex,
-    gZorasFountainPositionNameGERTex,
-    gGerudoValleyPositionNameGERTex,
-    gLostWoodsPositionNameGERTex,
-    gDesertColossusPositionNameGERTex,
-    gGerudosFortressPositionNameGERTex,
-    gHauntedWastelandPositionNameGERTex,
-    gMarketPositionNameGERTex,
-    gHyruleCastlePositionNameGERTex,
-    gDeathMountainTrailPositionNameGERTex,
-    gDeathMountainCraterPositionNameGERTex,
-    gGoronCityPositionNameGERTex,
-    gLonLonRanchPositionNameGERTex,
-    gQuestionMarkPositionNameGERTex,
-    gGanonsCastlePositionNameGERTex,
-    gHyruleFieldPositionNameFRATex,
-    gKakarikoVillagePositionNameFRATex,
-    gGraveyardPositionNameFRATex,
-    gZorasRiverPositionNameFRATex,
-    gKokiriForestPositionNameFRATex,
-    gSacredForestMeadowPositionNameFRATex,
-    gLakeHyliaPositionNameFRATex,
-    gZorasDomainPositionNameFRATex,
-    gZorasFountainPositionNameFRATex,
-    gGerudoValleyPositionNameFRATex,
-    gLostWoodsPositionNameFRATex,
-    gDesertColossusPositionNameFRATex,
-    gGerudosFortressPositionNameFRATex,
-    gHauntedWastelandPositionNameFRATex,
-    gMarketPositionNameFRATex,
-    gHyruleCastlePositionNameFRATex,
-    gDeathMountainTrailPositionNameFRATex,
-    gDeathMountainCraterPositionNameFRATex,
-    gGoronCityPositionNameFRATex,
-    gLonLonRanchPositionNameFRATex,
-    gQuestionMarkPositionNameFRATex,
-    gGanonsCastlePositionNameFRATex,
+// SOH [NTSC] - Fit in JPN textures, resulting in changes to offsets when indexed
+static void* mapNameTextures[] = {
+    // LANGUAGE_ENG
+    /*  0 */ gHauntedWastelandPointNameENGTex,
+    /*  1 */ gGerudosFortressPointNameENGTex,
+    /*  2 */ gGerudoValleyPointNameENGTex,
+    /*  3 */ gHyliaLakesidePointNameENGTex,
+    /*  4 */ gLonLonRanchPointNameENGTex,
+    /*  5 */ gMarketPointNameENGTex,
+    /*  6 */ gHyruleFieldPointNameENGTex,
+    /*  7 */ gDeathMountainPointNameENGTex,
+    /*  8 */ gKakarikoVillagePointNameENGTex,
+    /*  9 */ gLostWoodsPointNameENGTex,
+    /* 10 */ gKokiriForestPointNameENGTex,
+    /* 11 */ gZorasDomainPointNameENGTex,
+    // LANGUAGE_GER
+    /*  0 */ gHauntedWastelandPointNameGERTex,
+    /*  1 */ gGerudosFortressPointNameGERTex,
+    /*  2 */ gGerudoValleyPointNameGERTex,
+    /*  3 */ gHyliaLakesidePointNameGERTex,
+    /*  4 */ gLonLonRanchPointNameGERTex,
+    /*  5 */ gMarketPointNameGERTex,
+    /*  6 */ gHyruleFieldPointNameGERTex,
+    /*  7 */ gDeathMountainPointNameGERTex,
+    /*  8 */ gKakarikoVillagePointNameGERTex,
+    /*  9 */ gLostWoodsPointNameGERTex,
+    /* 10 */ gKokiriForestPointNameGERTex,
+    /* 11 */ gZorasDomainPointNameGERTex,
+    // LANGUAGE_FRA
+    /*  0 */ gHauntedWastelandPointNameFRATex,
+    /*  1 */ gGerudosFortressPointNameFRATex,
+    /*  2 */ gGerudoValleyPointNameFRATex,
+    /*  3 */ gHyliaLakesidePointNameFRATex,
+    /*  4 */ gLonLonRanchPointNameFRATex,
+    /*  5 */ gMarketPointNameFRATex,
+    /*  6 */ gHyruleFieldPointNameFRATex,
+    /*  7 */ gDeathMountainPointNameFRATex,
+    /*  8 */ gKakarikoVillagePointNameFRATex,
+    /*  9 */ gLostWoodsPointNameFRATex,
+    /* 10 */ gKokiriForestPointNameFRATex,
+    /* 11 */ gZorasDomainPointNameFRATex,
+    // LANGUAGE_JPN
+    /*  0 */ gHauntedWastelandPointNameJPNTex,
+    /*  1 */ gGerudosFortressPointNameJPNTex,
+    /*  2 */ gGerudoValleyPointNameJPNTex,
+    /*  3 */ gHyliaLakesidePointNameJPNTex,
+    /*  4 */ gLonLonRanchPointNameJPNTex,
+    /*  5 */ gMarketPointNameJPNTex,
+    /*  6 */ gHyruleFieldPointNameJPNTex,
+    /*  7 */ gDeathMountainPointNameJPNTex,
+    /*  8 */ gKakarikoVillagePointNameJPNTex,
+    /*  9 */ gLostWoodsPointNameJPNTex,
+    /* 10 */ gKokiriForestPointNameJPNTex,
+    /* 11 */ gZorasDomainPointNameJPNTex,
+    // LANGUAGE_ENG
+    /*  0 */ gHyruleFieldPositionNameENGTex,
+    /*  1 */ gKakarikoVillagePositionNameENGTex,
+    /*  2 */ gGraveyardPositionNameENGTex,
+    /*  3 */ gZorasRiverPositionNameENGTex,
+    /*  4 */ gKokiriForestPositionNameENGTex,
+    /*  5 */ gSacredForestMeadowPositionNameENGTex,
+    /*  6 */ gLakeHyliaPositionNameENGTex,
+    /*  7 */ gZorasDomainPositionNameENGTex,
+    /*  8 */ gZorasFountainPositionNameENGTex,
+    /*  9 */ gGerudoValleyPositionNameENGTex,
+    /* 10 */ gLostWoodsPositionNameENGTex,
+    /* 11 */ gDesertColossusPositionNameENGTex,
+    /* 12 */ gGerudosFortressPositionNameENGTex,
+    /* 13 */ gHauntedWastelandPositionNameENGTex,
+    /* 14 */ gMarketPositionNameENGTex,
+    /* 15 */ gHyruleCastlePositionNameENGTex,
+    /* 16 */ gDeathMountainTrailPositionNameENGTex,
+    /* 17 */ gDeathMountainCraterPositionNameENGTex,
+    /* 18 */ gGoronCityPositionNameENGTex,
+    /* 19 */ gLonLonRanchPositionNameENGTex,
+    /* 20 */ gQuestionMarkPositionNameENGTex,
+    /* 21 */ gGanonsCastlePositionNameENGTex,
+    // LANGUAGE_GER
+    /*  0 */ gHyruleFieldPositionNameGERTex,
+    /*  1 */ gKakarikoVillagePositionNameGERTex,
+    /*  2 */ gGraveyardPositionNameGERTex,
+    /*  3 */ gZorasRiverPositionNameGERTex,
+    /*  4 */ gKokiriForestPositionNameGERTex,
+    /*  5 */ gSacredForestMeadowPositionNameGERTex,
+    /*  6 */ gLakeHyliaPositionNameGERTex,
+    /*  7 */ gZorasDomainPositionNameGERTex,
+    /*  8 */ gZorasFountainPositionNameGERTex,
+    /*  9 */ gGerudoValleyPositionNameGERTex,
+    /* 10 */ gLostWoodsPositionNameGERTex,
+    /* 11 */ gDesertColossusPositionNameGERTex,
+    /* 12 */ gGerudosFortressPositionNameGERTex,
+    /* 13 */ gHauntedWastelandPositionNameGERTex,
+    /* 14 */ gMarketPositionNameGERTex,
+    /* 15 */ gHyruleCastlePositionNameGERTex,
+    /* 16 */ gDeathMountainTrailPositionNameGERTex,
+    /* 17 */ gDeathMountainCraterPositionNameGERTex,
+    /* 18 */ gGoronCityPositionNameGERTex,
+    /* 19 */ gLonLonRanchPositionNameGERTex,
+    /* 20 */ gQuestionMarkPositionNameGERTex,
+    /* 21 */ gGanonsCastlePositionNameGERTex,
+    // LANGUAGE_FRA
+    /*  0 */ gHyruleFieldPositionNameFRATex,
+    /*  1 */ gKakarikoVillagePositionNameFRATex,
+    /*  2 */ gGraveyardPositionNameFRATex,
+    /*  3 */ gZorasRiverPositionNameFRATex,
+    /*  4 */ gKokiriForestPositionNameFRATex,
+    /*  5 */ gSacredForestMeadowPositionNameFRATex,
+    /*  6 */ gLakeHyliaPositionNameFRATex,
+    /*  7 */ gZorasDomainPositionNameFRATex,
+    /*  8 */ gZorasFountainPositionNameFRATex,
+    /*  9 */ gGerudoValleyPositionNameFRATex,
+    /* 10 */ gLostWoodsPositionNameFRATex,
+    /* 11 */ gDesertColossusPositionNameFRATex,
+    /* 12 */ gGerudosFortressPositionNameFRATex,
+    /* 13 */ gHauntedWastelandPositionNameFRATex,
+    /* 14 */ gMarketPositionNameFRATex,
+    /* 15 */ gHyruleCastlePositionNameFRATex,
+    /* 16 */ gDeathMountainTrailPositionNameFRATex,
+    /* 17 */ gDeathMountainCraterPositionNameFRATex,
+    /* 18 */ gGoronCityPositionNameFRATex,
+    /* 19 */ gLonLonRanchPositionNameFRATex,
+    /* 20 */ gQuestionMarkPositionNameFRATex,
+    /* 21 */ gGanonsCastlePositionNameFRATex,
+    // LANGUAGE_JPN
+    /*  0 */ gHyruleFieldPositionNameJPNTex,
+    /*  1 */ gKakarikoVillagePositionNameJPNTex,
+    /*  2 */ gGraveyardPositionNameJPNTex,
+    /*  3 */ gZorasRiverPositionNameJPNTex,
+    /*  4 */ gKokiriForestPositionNameJPNTex,
+    /*  5 */ gSacredForestMeadowPositionNameJPNTex,
+    /*  6 */ gLakeHyliaPositionNameJPNTex,
+    /*  7 */ gZorasDomainPositionNameJPNTex,
+    /*  8 */ gZorasFountainPositionNameJPNTex,
+    /*  9 */ gGerudoValleyPositionNameJPNTex,
+    /* 10 */ gLostWoodsPositionNameJPNTex,
+    /* 11 */ gDesertColossusPositionNameJPNTex,
+    /* 12 */ gGerudosFortressPositionNameJPNTex,
+    /* 13 */ gHauntedWastelandPositionNameJPNTex,
+    /* 14 */ gMarketPositionNameJPNTex,
+    /* 15 */ gHyruleCastlePositionNameJPNTex,
+    /* 16 */ gDeathMountainTrailPositionNameJPNTex,
+    /* 17 */ gDeathMountainCraterPositionNameJPNTex,
+    /* 18 */ gGoronCityPositionNameJPNTex,
+    /* 19 */ gLonLonRanchPositionNameJPNTex,
+    /* 20 */ gQuestionMarkPositionNameJPNTex,
+    /* 21 */ gGanonsCastlePositionNameJPNTex,
 };
 
 s16 D_8082AAEC[] = {
@@ -704,12 +903,18 @@ s16 D_8082AB2C[] = {
 };
 
 static u8 D_8082AB6C[][ARRAY_COUNT(gSaveContext.buttonStatus)] = {
-    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED },
-    { BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_DISABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED },
-    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED },
-    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED },
-    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED },
-    { BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_DISABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED },
+    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED,
+      BTN_DISABLED },
+    { BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_DISABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED,
+      BTN_ENABLED },
+    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED,
+      BTN_DISABLED },
+    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED,
+      BTN_DISABLED },
+    { BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED, BTN_ENABLED, BTN_DISABLED, BTN_DISABLED, BTN_DISABLED,
+      BTN_DISABLED },
+    { BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED, BTN_DISABLED, BTN_ENABLED, BTN_ENABLED, BTN_ENABLED,
+      BTN_ENABLED },
 };
 
 static s16 D_8082AB8C = 0;
@@ -736,147 +941,147 @@ static u16 D_8082ABEC[] = {
 };
 
 u8 gSlotAgeReqs[] = {
-    AGE_REQ_CHILD,  // SLOT_DEKU_STICK
-    AGE_REQ_NONE,   // SLOT_DEKU_NUT
-    AGE_REQ_NONE,   // SLOT_BOMB
-    AGE_REQ_ADULT,  // SLOT_BOW
-    AGE_REQ_ADULT,  // SLOT_ARROW_FIRE
-    AGE_REQ_NONE,   // SLOT_DINS_FIRE
-    AGE_REQ_CHILD,  // SLOT_SLINGSHOT
-    AGE_REQ_NONE,   // SLOT_OCARINA
-    AGE_REQ_NONE,   // SLOT_BOMBCHU
-    AGE_REQ_ADULT,  // SLOT_HOOKSHOT
-    AGE_REQ_ADULT,  // SLOT_ARROW_ICE
-    AGE_REQ_NONE,   // SLOT_FARORES_WIND
-    AGE_REQ_CHILD,  // SLOT_BOOMERANG
-    AGE_REQ_NONE,   // SLOT_LENS_OF_TRUTH
-    AGE_REQ_CHILD,  // SLOT_MAGIC_BEAN
-    AGE_REQ_ADULT,  // SLOT_HAMMER
-    AGE_REQ_ADULT,  // SLOT_ARROW_LIGHT
-    AGE_REQ_NONE,   // SLOT_NAYRUS_LOVE
-    AGE_REQ_NONE,   // SLOT_BOTTLE_1
-    AGE_REQ_NONE,   // SLOT_BOTTLE_2
-    AGE_REQ_NONE,   // SLOT_BOTTLE_3
-    AGE_REQ_NONE,   // SLOT_BOTTLE_4
-    AGE_REQ_ADULT,  // SLOT_TRADE_ADULT
-    AGE_REQ_CHILD,  // SLOT_TRADE_CHILD
+    AGE_REQ_CHILD, // SLOT_DEKU_STICK
+    AGE_REQ_NONE,  // SLOT_DEKU_NUT
+    AGE_REQ_NONE,  // SLOT_BOMB
+    AGE_REQ_ADULT, // SLOT_BOW
+    AGE_REQ_ADULT, // SLOT_ARROW_FIRE
+    AGE_REQ_NONE,  // SLOT_DINS_FIRE
+    AGE_REQ_CHILD, // SLOT_SLINGSHOT
+    AGE_REQ_NONE,  // SLOT_OCARINA
+    AGE_REQ_NONE,  // SLOT_BOMBCHU
+    AGE_REQ_ADULT, // SLOT_HOOKSHOT
+    AGE_REQ_ADULT, // SLOT_ARROW_ICE
+    AGE_REQ_NONE,  // SLOT_FARORES_WIND
+    AGE_REQ_CHILD, // SLOT_BOOMERANG
+    AGE_REQ_NONE,  // SLOT_LENS_OF_TRUTH
+    AGE_REQ_CHILD, // SLOT_MAGIC_BEAN
+    AGE_REQ_ADULT, // SLOT_HAMMER
+    AGE_REQ_ADULT, // SLOT_ARROW_LIGHT
+    AGE_REQ_NONE,  // SLOT_NAYRUS_LOVE
+    AGE_REQ_NONE,  // SLOT_BOTTLE_1
+    AGE_REQ_NONE,  // SLOT_BOTTLE_2
+    AGE_REQ_NONE,  // SLOT_BOTTLE_3
+    AGE_REQ_NONE,  // SLOT_BOTTLE_4
+    AGE_REQ_ADULT, // SLOT_TRADE_ADULT
+    AGE_REQ_CHILD, // SLOT_TRADE_CHILD
 };
 
 u8 gEquipAgeReqs[][4] = {
     {
-        AGE_REQ_ADULT,  // 0 UPG_QUIVER
-        AGE_REQ_CHILD,  // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_KOKIRI
-        AGE_REQ_ADULT,  // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_MASTER
-        AGE_REQ_ADULT   // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_BIGGORON
+        AGE_REQ_ADULT, // 0 UPG_QUIVER
+        AGE_REQ_CHILD, // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_KOKIRI
+        AGE_REQ_ADULT, // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_MASTER
+        AGE_REQ_ADULT  // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_BIGGORON
     },
     {
-        AGE_REQ_NONE,   // 0 UPG_BOMB_BAG
-        AGE_REQ_CHILD,  // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_DEKU
-        AGE_REQ_NONE,   // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_HYLIAN
-        AGE_REQ_ADULT   // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_MIRROR
+        AGE_REQ_NONE,  // 0 UPG_BOMB_BAG
+        AGE_REQ_CHILD, // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_DEKU
+        AGE_REQ_NONE,  // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_HYLIAN
+        AGE_REQ_ADULT  // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_MIRROR
     },
     {
-        AGE_REQ_ADULT,  // 0 UPG_STRENGTH
-        AGE_REQ_NONE,   // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_KOKIRI
-        AGE_REQ_ADULT,  // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_GORON
-        AGE_REQ_ADULT   // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_ZORA
+        AGE_REQ_ADULT, // 0 UPG_STRENGTH
+        AGE_REQ_NONE,  // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_KOKIRI
+        AGE_REQ_ADULT, // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_GORON
+        AGE_REQ_ADULT  // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_ZORA
     },
     {
-        AGE_REQ_NONE,   // 0 UPG_SCALE
-        AGE_REQ_NONE,   // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_KOKIRI
-        AGE_REQ_ADULT,  // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_IRON
-        AGE_REQ_ADULT   // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_HOVER
+        AGE_REQ_NONE,  // 0 UPG_SCALE
+        AGE_REQ_NONE,  // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_KOKIRI
+        AGE_REQ_ADULT, // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_IRON
+        AGE_REQ_ADULT  // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_HOVER
     },
 
 };
 
 u8 gItemAgeReqs[] = {
-    AGE_REQ_CHILD,  // ITEM_DEKU_STICK
-    AGE_REQ_NONE,   // ITEM_DEKU_NUT
-    AGE_REQ_NONE,   // ITEM_BOMB
-    AGE_REQ_ADULT,  // ITEM_BOW
-    AGE_REQ_ADULT,  // ITEM_ARROW_FIRE
-    AGE_REQ_NONE,   // ITEM_DINS_FIRE
-    AGE_REQ_CHILD,  // ITEM_SLINGSHOT
-    AGE_REQ_NONE,   // ITEM_OCARINA_FAIRY
-    AGE_REQ_NONE,   // ITEM_OCARINA_OF_TIME
-    AGE_REQ_NONE,   // ITEM_BOMBCHU
-    AGE_REQ_ADULT,  // ITEM_HOOKSHOT
-    AGE_REQ_ADULT,  // ITEM_LONGSHOT
-    AGE_REQ_ADULT,  // ITEM_ARROW_ICE
-    AGE_REQ_NONE,   // ITEM_FARORES_WIND
-    AGE_REQ_CHILD,  // ITEM_BOOMERANG
-    AGE_REQ_NONE,   // ITEM_LENS_OF_TRUTH
-    AGE_REQ_CHILD,  // ITEM_MAGIC_BEAN
-    AGE_REQ_ADULT,  // ITEM_HAMMER
-    AGE_REQ_ADULT,  // ITEM_ARROW_LIGHT
-    AGE_REQ_NONE,   // ITEM_NAYRUS_LOVE
-    AGE_REQ_NONE,   // ITEM_BOTTLE_EMPTY
-    AGE_REQ_NONE,   // ITEM_BOTTLE_POTION_RED
-    AGE_REQ_NONE,   // ITEM_BOTTLE_POTION_GREEN
-    AGE_REQ_NONE,   // ITEM_BOTTLE_POTION_BLUE
-    AGE_REQ_NONE,   // ITEM_BOTTLE_FAIRY
-    AGE_REQ_NONE,   // ITEM_BOTTLE_FISH
-    AGE_REQ_NONE,   // ITEM_BOTTLE_MILK_FULL
-    AGE_REQ_NONE,   // ITEM_BOTTLE_RUTOS_LETTER
-    AGE_REQ_NONE,   // ITEM_BOTTLE_BLUE_FIRE
-    AGE_REQ_NONE,   // ITEM_BOTTLE_BUG
-    AGE_REQ_NONE,   // ITEM_BOTTLE_BIG_POE
-    AGE_REQ_NONE,   // ITEM_BOTTLE_MILK_HALF
-    AGE_REQ_NONE,   // ITEM_BOTTLE_POE
-    AGE_REQ_CHILD,  // ITEM_WEIRD_EGG
-    AGE_REQ_CHILD,  // ITEM_CHICKEN
-    AGE_REQ_CHILD,  // ITEM_ZELDAS_LETTER
-    AGE_REQ_CHILD,  // ITEM_MASK_KEATON
-    AGE_REQ_CHILD,  // ITEM_MASK_SKULL
-    AGE_REQ_CHILD,  // ITEM_MASK_SPOOKY
-    AGE_REQ_CHILD,  // ITEM_MASK_BUNNY_HOOD
-    AGE_REQ_CHILD,  // ITEM_MASK_GORON
-    AGE_REQ_CHILD,  // ITEM_MASK_ZORA
-    AGE_REQ_CHILD,  // ITEM_MASK_GERUDO
-    AGE_REQ_CHILD,  // ITEM_MASK_TRUTH
-    AGE_REQ_CHILD,  // ITEM_SOLD_OUT
-    AGE_REQ_ADULT,  // ITEM_POCKET_EGG
-    AGE_REQ_ADULT,  // ITEM_POCKET_CUCCO
-    AGE_REQ_ADULT,  // ITEM_COJIRO
-    AGE_REQ_ADULT,  // ITEM_ODD_MUSHROOM
-    AGE_REQ_ADULT,  // ITEM_ODD_POTION
-    AGE_REQ_ADULT,  // ITEM_POACHERS_SAW
-    AGE_REQ_ADULT,  // ITEM_BROKEN_GORONS_SWORD
-    AGE_REQ_ADULT,  // ITEM_PRESCRIPTION
-    AGE_REQ_ADULT,  // ITEM_EYEBALL_FROG
-    AGE_REQ_ADULT,  // ITEM_EYE_DROPS
-    AGE_REQ_ADULT,  // ITEM_CLAIM_CHECK
-    AGE_REQ_ADULT,  // ITEM_BOW_FIRE
-    AGE_REQ_ADULT,  // ITEM_BOW_ICE
-    AGE_REQ_ADULT,  // ITEM_BOW_LIGHT
-    AGE_REQ_CHILD,  // ITEM_SWORD_KOKIRI
-    AGE_REQ_ADULT,  // ITEM_SWORD_MASTER
-    AGE_REQ_ADULT,  // ITEM_SWORD_BIGGORON
-    AGE_REQ_CHILD,  // ITEM_SHIELD_DEKU
-    AGE_REQ_NONE,   // ITEM_SHIELD_HYLIAN
-    AGE_REQ_ADULT,  // ITEM_SHIELD_MIRROR
-    AGE_REQ_NONE,   // ITEM_TUNIC_KOKIRI
-    AGE_REQ_ADULT,  // ITEM_TUNIC_GORON
-    AGE_REQ_ADULT,  // ITEM_TUNIC_ZORA
-    AGE_REQ_NONE,   // ITEM_BOOTS_KOKIRI
-    AGE_REQ_ADULT,  // ITEM_BOOTS_IRON
-    AGE_REQ_ADULT,  // ITEM_BOOTS_HOVER
-    AGE_REQ_CHILD,  // ITEM_BULLET_BAG_30
-    AGE_REQ_CHILD,  // ITEM_BULLET_BAG_40
-    AGE_REQ_CHILD,  // ITEM_BULLET_BAG_50
-    AGE_REQ_ADULT,  // ITEM_QUIVER_30
-    AGE_REQ_ADULT,  // ITEM_QUIVER_40
-    AGE_REQ_ADULT,  // ITEM_QUIVER_50
-    AGE_REQ_NONE,   // ITEM_BOMB_BAG_20
-    AGE_REQ_NONE,   // ITEM_BOMB_BAG_30
-    AGE_REQ_NONE,   // ITEM_BOMB_BAG_40
-    AGE_REQ_CHILD,  // ITEM_STRENGTH_GORONS_BRACELET
-    AGE_REQ_ADULT,  // ITEM_STRENGTH_SILVER_GAUNTLETS
-    AGE_REQ_ADULT,  // ITEM_STRENGTH_GOLD_GAUNTLETS
-    AGE_REQ_NONE,   // ITEM_SCALE_SILVER
-    AGE_REQ_NONE,   // ITEM_SCALE_GOLDEN
-    AGE_REQ_ADULT,  // ITEM_GIANTS_KNIFE
+    AGE_REQ_CHILD, // ITEM_DEKU_STICK
+    AGE_REQ_NONE,  // ITEM_DEKU_NUT
+    AGE_REQ_NONE,  // ITEM_BOMB
+    AGE_REQ_ADULT, // ITEM_BOW
+    AGE_REQ_ADULT, // ITEM_ARROW_FIRE
+    AGE_REQ_NONE,  // ITEM_DINS_FIRE
+    AGE_REQ_CHILD, // ITEM_SLINGSHOT
+    AGE_REQ_NONE,  // ITEM_OCARINA_FAIRY
+    AGE_REQ_NONE,  // ITEM_OCARINA_OF_TIME
+    AGE_REQ_NONE,  // ITEM_BOMBCHU
+    AGE_REQ_ADULT, // ITEM_HOOKSHOT
+    AGE_REQ_ADULT, // ITEM_LONGSHOT
+    AGE_REQ_ADULT, // ITEM_ARROW_ICE
+    AGE_REQ_NONE,  // ITEM_FARORES_WIND
+    AGE_REQ_CHILD, // ITEM_BOOMERANG
+    AGE_REQ_NONE,  // ITEM_LENS_OF_TRUTH
+    AGE_REQ_CHILD, // ITEM_MAGIC_BEAN
+    AGE_REQ_ADULT, // ITEM_HAMMER
+    AGE_REQ_ADULT, // ITEM_ARROW_LIGHT
+    AGE_REQ_NONE,  // ITEM_NAYRUS_LOVE
+    AGE_REQ_NONE,  // ITEM_BOTTLE_EMPTY
+    AGE_REQ_NONE,  // ITEM_BOTTLE_POTION_RED
+    AGE_REQ_NONE,  // ITEM_BOTTLE_POTION_GREEN
+    AGE_REQ_NONE,  // ITEM_BOTTLE_POTION_BLUE
+    AGE_REQ_NONE,  // ITEM_BOTTLE_FAIRY
+    AGE_REQ_NONE,  // ITEM_BOTTLE_FISH
+    AGE_REQ_NONE,  // ITEM_BOTTLE_MILK_FULL
+    AGE_REQ_NONE,  // ITEM_BOTTLE_RUTOS_LETTER
+    AGE_REQ_NONE,  // ITEM_BOTTLE_BLUE_FIRE
+    AGE_REQ_NONE,  // ITEM_BOTTLE_BUG
+    AGE_REQ_NONE,  // ITEM_BOTTLE_BIG_POE
+    AGE_REQ_NONE,  // ITEM_BOTTLE_MILK_HALF
+    AGE_REQ_NONE,  // ITEM_BOTTLE_POE
+    AGE_REQ_CHILD, // ITEM_WEIRD_EGG
+    AGE_REQ_CHILD, // ITEM_CHICKEN
+    AGE_REQ_CHILD, // ITEM_ZELDAS_LETTER
+    AGE_REQ_CHILD, // ITEM_MASK_KEATON
+    AGE_REQ_CHILD, // ITEM_MASK_SKULL
+    AGE_REQ_CHILD, // ITEM_MASK_SPOOKY
+    AGE_REQ_CHILD, // ITEM_MASK_BUNNY_HOOD
+    AGE_REQ_CHILD, // ITEM_MASK_GORON
+    AGE_REQ_CHILD, // ITEM_MASK_ZORA
+    AGE_REQ_CHILD, // ITEM_MASK_GERUDO
+    AGE_REQ_CHILD, // ITEM_MASK_TRUTH
+    AGE_REQ_CHILD, // ITEM_SOLD_OUT
+    AGE_REQ_ADULT, // ITEM_POCKET_EGG
+    AGE_REQ_ADULT, // ITEM_POCKET_CUCCO
+    AGE_REQ_ADULT, // ITEM_COJIRO
+    AGE_REQ_ADULT, // ITEM_ODD_MUSHROOM
+    AGE_REQ_ADULT, // ITEM_ODD_POTION
+    AGE_REQ_ADULT, // ITEM_POACHERS_SAW
+    AGE_REQ_ADULT, // ITEM_BROKEN_GORONS_SWORD
+    AGE_REQ_ADULT, // ITEM_PRESCRIPTION
+    AGE_REQ_ADULT, // ITEM_EYEBALL_FROG
+    AGE_REQ_ADULT, // ITEM_EYE_DROPS
+    AGE_REQ_ADULT, // ITEM_CLAIM_CHECK
+    AGE_REQ_ADULT, // ITEM_BOW_FIRE
+    AGE_REQ_ADULT, // ITEM_BOW_ICE
+    AGE_REQ_ADULT, // ITEM_BOW_LIGHT
+    AGE_REQ_CHILD, // ITEM_SWORD_KOKIRI
+    AGE_REQ_ADULT, // ITEM_SWORD_MASTER
+    AGE_REQ_ADULT, // ITEM_SWORD_BIGGORON
+    AGE_REQ_CHILD, // ITEM_SHIELD_DEKU
+    AGE_REQ_NONE,  // ITEM_SHIELD_HYLIAN
+    AGE_REQ_ADULT, // ITEM_SHIELD_MIRROR
+    AGE_REQ_NONE,  // ITEM_TUNIC_KOKIRI
+    AGE_REQ_ADULT, // ITEM_TUNIC_GORON
+    AGE_REQ_ADULT, // ITEM_TUNIC_ZORA
+    AGE_REQ_NONE,  // ITEM_BOOTS_KOKIRI
+    AGE_REQ_ADULT, // ITEM_BOOTS_IRON
+    AGE_REQ_ADULT, // ITEM_BOOTS_HOVER
+    AGE_REQ_CHILD, // ITEM_BULLET_BAG_30
+    AGE_REQ_CHILD, // ITEM_BULLET_BAG_40
+    AGE_REQ_CHILD, // ITEM_BULLET_BAG_50
+    AGE_REQ_ADULT, // ITEM_QUIVER_30
+    AGE_REQ_ADULT, // ITEM_QUIVER_40
+    AGE_REQ_ADULT, // ITEM_QUIVER_50
+    AGE_REQ_NONE,  // ITEM_BOMB_BAG_20
+    AGE_REQ_NONE,  // ITEM_BOMB_BAG_30
+    AGE_REQ_NONE,  // ITEM_BOMB_BAG_40
+    AGE_REQ_CHILD, // ITEM_STRENGTH_GORONS_BRACELET
+    AGE_REQ_ADULT, // ITEM_STRENGTH_SILVER_GAUNTLETS
+    AGE_REQ_ADULT, // ITEM_STRENGTH_GOLD_GAUNTLETS
+    AGE_REQ_NONE,  // ITEM_SCALE_SILVER
+    AGE_REQ_NONE,  // ITEM_SCALE_GOLDEN
+    AGE_REQ_ADULT, // ITEM_GIANTS_KNIFE
 };
 
 u8 gAreaGsFlags[] = {
@@ -897,10 +1102,10 @@ static Color_RGB8 sCursorColors[3] = {
     { 0, 50, 255 },
 };
 
-const Color_RGB8 Cursor_ABTN_ori = {0, 255, 50};
-const Color_RGB8 Cursor_ABTNN64_ori = {0, 50, 255};
-const Color_RGB8 Cursor_CBTN_ori = {255, 255, 0};
-const Color_RGB8 Cursor_StartBTN_ori = {255, 255, 255};
+const Color_RGB8 Cursor_ABTN_ori = { 0, 255, 50 };
+const Color_RGB8 Cursor_ABTNN64_ori = { 0, 50, 255 };
+const Color_RGB8 Cursor_CBTN_ori = { 255, 255, 0 };
+const Color_RGB8 Cursor_StartBTN_ori = { 255, 255, 255 };
 Color_RGB8 Cursor_ABTN;
 Color_RGB8 Cursor_CBTN;
 
@@ -908,24 +1113,28 @@ static void* sSavePromptTexs[] = {
     gPauseSavePromptENGTex,
     gPauseSavePromptGERTex,
     gPauseSavePromptFRATex,
+    gPauseSavePromptJPNTex,
 };
 
 static void* sSaveConfirmationTexs[] = {
     gPauseSaveConfirmationENGTex,
     gPauseSaveConfirmationGERTex,
     gPauseSaveConfirmationFRATex,
+    gPauseSaveConfirmationJPNTex,
 };
 
 static void* sContinuePromptTexs[] = {
     gContinuePlayingENGTex,
     gContinuePlayingGERTex,
     gContinuePlayingFRATex,
+    gContinuePlayingJPNTex,
 };
 
 static void* sPromptChoiceTexs[][2] = {
     { gPauseYesENGTex, gPauseNoENGTex },
     { gPauseYesGERTex, gPauseNoGERTex },
     { gPauseYesFRATex, gPauseNoFRATex },
+    { gPauseYesJPNTex, gPauseNoJPNTex },
 };
 
 static u8 sButtonStatusSave[ARRAY_COUNT(gSaveContext.buttonStatus)];
@@ -991,7 +1200,8 @@ void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos) {
     pauseCtx->cursorSpecialPos = specialPos;
     pauseCtx->pageSwitchTimer = 0;
 
-    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
 }
 
 void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point) {
@@ -1046,11 +1256,13 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
 
     if (!pt) {
         pauseCtx->mode = pauseCtx->pageIndex * 2 + 1;
-        Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_LEFT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_LEFT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_RIGHT;
     } else {
         pauseCtx->mode = pauseCtx->pageIndex * 2;
-        Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_RIGHT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+        Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_RIGHT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_LEFT;
     }
 
@@ -1058,7 +1270,8 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
         gSaveContext.buttonStatus[buttonIndex] = D_8082AB6C[pauseCtx->pageIndex + pt][buttonIndex];
     }
 
-    if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) && (D_8082ABEC[pauseCtx->mode] == PAUSE_EQUIP)) {
+    if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) &&
+        (D_8082ABEC[pauseCtx->mode] == PAUSE_EQUIP)) {
         gSaveContext.buttonStatus[1] = BTN_ENABLED;
         gSaveContext.buttonStatus[2] = BTN_ENABLED;
         gSaveContext.buttonStatus[3] = BTN_ENABLED;
@@ -1085,7 +1298,8 @@ void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) {
         PageLeft_BTN = BTN_L;
     }
 
-    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) && (pauseCtx->debugState == 0) && CHECK_BTN_ALL(input->press.button, Debug_BTN)) {
+    if (CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) && (pauseCtx->debugState == 0) &&
+        CHECK_BTN_ALL(input->press.button, Debug_BTN)) {
         pauseCtx->debugState = 1;
         return;
     }
@@ -1381,8 +1595,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
             Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->itemPageVtx,
                                                           sSelectItemTexs[gSaveContext.language]);
@@ -1399,8 +1612,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY);
             Matrix_RotateY(1.57f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->equipPageVtx,
                                                           sEquipmentTexs[gSaveContext.language]);
@@ -1418,12 +1630,11 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY);
             Matrix_RotateY(3.14f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             if (pauseCtx->randoQuestMode) {
-                POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->saveVtx,
-                                                              sSaveTexs[gSaveContext.language]);
+                POLY_OPA_DISP =
+                    KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->saveVtx, sSaveTexs[gSaveContext.language]);
                 RandoKaleido_DrawMiscCollectibles(play);
             } else {
                 POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->questPageVtx,
@@ -1442,8 +1653,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY);
             Matrix_RotateY(-1.57f, MTXMODE_APPLY);
 
-            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             POLY_OPA_DISP =
                 KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->mapPageVtx, sMapTexs[gSaveContext.language]);
@@ -1471,8 +1681,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
                 Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY);
 
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
                 POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->itemPageVtx,
                                                               sSelectItemTexs[gSaveContext.language]);
@@ -1486,8 +1695,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY);
                 Matrix_RotateY(-1.57f, MTXMODE_APPLY);
 
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
                 POLY_OPA_DISP =
                     KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->mapPageVtx, sMapTexs[gSaveContext.language]);
@@ -1518,8 +1726,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY);
                 Matrix_RotateY(3.14f, MTXMODE_APPLY);
 
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
                 if (pauseCtx->randoQuestMode) {
                     POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->saveVtx,
@@ -1542,8 +1749,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
                 Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY);
                 Matrix_RotateY(1.57f, MTXMODE_APPLY);
 
-                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                          G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+                gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
                 POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->equipPageVtx,
                                                               sEquipmentTexs[gSaveContext.language]);
@@ -1593,8 +1799,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
             Matrix_RotateY(1.57f, MTXMODE_APPLY);
         }
 
-        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx),
-                  G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         if ((pauseCtx->state >= 8) && (pauseCtx->state <= 0x11)) {
             POLY_OPA_DISP = KaleidoScope_DrawPageSections(POLY_OPA_DISP, pauseCtx->saveVtx, sGameOverTexs);
@@ -1611,7 +1816,8 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
 
             gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0,
                               0, PRIMITIVE, 0);
-            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, VREG(61)); //Save prompt cursor colour
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b,
+                            VREG(61)); // Save prompt cursor colour
 
             if (pauseCtx->promptChoice == 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gPromptCursorLeftDL);
@@ -1639,7 +1845,8 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
 
                 gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0,
                                   TEXEL0, 0, PRIMITIVE, 0);
-                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, VREG(61)); //Continue prompt cursor colour
+                gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b,
+                                VREG(61)); // Continue prompt cursor colour
 
                 if (pauseCtx->promptChoice == 0) {
                     gSPDisplayList(POLY_OPA_DISP++, gPromptCursorLeftDL);
@@ -1683,7 +1890,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
         aButtonColor = (Color_RGB8){ 0, 255, 100 };
     }
 
-    Color_RGB8 cButtonsColor = {255, 160, 0};
+    Color_RGB8 cButtonsColor = { 255, 160, 0 };
     if (CVarGetInteger(CVAR_COSMETIC("HUD.CButtons.Changed"), 0)) {
         cButtonsColor = CVarGetColor24(CVAR_COSMETIC("HUD.CButtons.Value"), cButtonsColor);
     }
@@ -1704,36 +1911,39 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
         cRightButtonColor = CVarGetColor24(CVAR_COSMETIC("HUD.CRightButton.Value"), cRightButtonColor);
     }
 
-    static const void* sToEquipTextures[3] = {
+    static const void* sToEquipTextures[4] = {
         gPauseToEquipENGTex,
         gPauseToEquipGERTex,
         gPauseToEquipFRATex,
+        gPauseToEquipJPNTex,
     };
-    static const void* sToDecideTextures[3] = {
+    static const void* sToDecideTextures[4] = {
         gPauseToDecideENGTex,
         gPauseToDecideGERTex,
         gPauseToDecideFRATex,
+        gPauseToDecideJPNTex,
     };
-    static const void* sPlayMelodyTextures[3] = {
+    static const void* sPlayMelodyTextures[4] = {
         gPauseToPlayMelodyENGTex,
         gPauseToPlayMelodyGERTex,
         gPauseToPlayMelodyFRATex,
+        gPauseToPlayMelodyJPNTex,
     };
-    static const void* D_8082AD78[][3] = {
-        { gPauseToEquipmentENGTex, gPauseToEquipmentGERTex, gPauseToEquipmentFRATex },
-        { gPauseToSelectItemENGTex, gPauseToSelectItemGERTex, gPauseToSelectItemFRATex },
-        { gPauseToMapENGTex, gPauseToMapGERTex, gPauseToMapFRATex },
-        { gPauseToQuestStatusENGTex, gPauseToQuestStatusGERTex, gPauseToQuestStatusFRATex },
+    static const void* D_8082AD78[][4] = {
+        { gPauseToEquipmentENGTex, gPauseToEquipmentGERTex, gPauseToEquipmentFRATex, gPauseToEquipmentJPNTex },
+        { gPauseToSelectItemENGTex, gPauseToSelectItemGERTex, gPauseToSelectItemFRATex, gPauseToSelectItemJPNTex },
+        { gPauseToMapENGTex, gPauseToMapGERTex, gPauseToMapFRATex, gPauseToMapJPNTex },
+        { gPauseToQuestStatusENGTex, gPauseToQuestStatusGERTex, gPauseToQuestStatusFRATex, gPauseToQuestStatusJPNTex },
     };
-    static void* D_8082ADA8[][3] = {
-        { gPauseToMapENGTex, gPauseToMapGERTex, gPauseToMapFRATex },
-        { gPauseToQuestStatusENGTex, gPauseToQuestStatusGERTex, gPauseToQuestStatusFRATex },
-        { gPauseToEquipmentENGTex, gPauseToEquipmentGERTex, gPauseToEquipmentFRATex },
-        { gPauseToSelectItemENGTex, gPauseToSelectItemGERTex, gPauseToSelectItemFRATex },
+    static void* D_8082ADA8[][4] = {
+        { gPauseToMapENGTex, gPauseToMapGERTex, gPauseToMapFRATex, gPauseToMapJPNTex },
+        { gPauseToQuestStatusENGTex, gPauseToQuestStatusGERTex, gPauseToQuestStatusFRATex, gPauseToQuestStatusJPNTex },
+        { gPauseToEquipmentENGTex, gPauseToEquipmentGERTex, gPauseToEquipmentFRATex, gPauseToEquipmentJPNTex },
+        { gPauseToSelectItemENGTex, gPauseToSelectItemGERTex, gPauseToSelectItemFRATex, gPauseToSelectItemJPNTex },
     };
-    static u16 D_8082ADD8[3] = { 56, 88, 80 };
-    static u16 D_8082ADE0[3] = { 64, 88, 72 };
-    static u16 D_8082ADE8[3] = { 80, 104, 112 };
+    static u16 D_8082ADD8[4] = { 56, 88, 80, 56 };
+    static u16 D_8082ADE0[4] = { 64, 88, 72, 48 };
+    static u16 D_8082ADE8[4] = { 80, 104, 112, 80 };
     static s16 D_8082ADF0[][4] = {
         { 180, 210, 255, 220 },
         { 100, 100, 150, 220 },
@@ -1759,6 +1969,13 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
     s16 i;
     s16 j;
 
+    // #region SOH [NTSC] - register access assumes 3 languages, make jpn use same as eng
+    s32 languageOffset = gSaveContext.language;
+    if (languageOffset == LANGUAGE_JPN) {
+        languageOffset = LANGUAGE_ENG;
+    }
+    // #endregion
+
     OPEN_DISPS(play->state.gfxCtx);
 
     stepR = ABS(D_808321A0 - D_8082ADF0[D_8082AE04][0]) / D_8082AE00;
@@ -1887,11 +2104,11 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
     Matrix_Translate(0.0f, 0.0f, -144.0f, MTXMODE_NEW);
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
 
-    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
-              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+    const Color_RGBA8 namePanelColor =
+        CVarGetColor(CVAR_COSMETIC("Kaleido.NamePanel.Value"), (Color_RGBA8){ 90, 100, 130, 255 });
 
-    const Color_RGBA8 namePanelColor = CVarGetColor(CVAR_COSMETIC("Kaleido.NamePanel.Value"), (Color_RGBA8){90,100,130,255});
-    
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, namePanelColor.r, namePanelColor.g, namePanelColor.b, namePanelColor.a);
     gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[0], 16, 0);
 
@@ -1904,24 +2121,23 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
     if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->unk_1E4 == 0)) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
     } else {
-      if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) != 0) {
-        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
-      }
+        if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) != 0) {
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
+        }
     }
-    
 
     gSPDisplayList(POLY_OPA_DISP++, gLButtonIconDL);
 
-    if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) == 0) { //Restore the misplace gDPSetPrimColor
-      gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
+    if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) == 0) { // Restore the misplace gDPSetPrimColor
+        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
     }
 
     if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->unk_1E4 == 0)) {
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
     } else {
-      if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) != 0) {
-        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
-      }
+        if (CVarGetInteger(CVAR_ENHANCEMENT("FixMenuLR"), 0) != 0) {
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 255);
+        }
     }
 
     gSPDisplayList(POLY_OPA_DISP++, gRButtonIconDL);
@@ -1978,7 +2194,8 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                 osSyncPrintf(VT_RST);
 
                 YREG(7) = 0;
-                SET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]], gAreaGsFlags[D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]]);
+                SET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]],
+                             gAreaGsFlags[D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]]);
             }
         }
 
@@ -2021,13 +2238,13 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
         gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[16], 8, 0);
 
         if (pauseCtx->state == 7) {
-            pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = WREG(61 + gSaveContext.language);
+            pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = WREG(61 + languageOffset);
 
             pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
                 pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
 
             pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
-                pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + gSaveContext.language);
+                pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + languageOffset);
 
             pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
                 pauseCtx->infoPanelVtx[20].v.ob[0] + D_8082ADE0[gSaveContext.language];
@@ -2037,8 +2254,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
             pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language]
                                                                                       << 5;
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255);
-            //gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);//This is changed to load the texture only so we can prim color it.
-            gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+            // gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);//This is changed to load the texture only so we can prim
+            // color it.
+            gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0,
+                                G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
             gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
             gDPPipeSync(POLY_OPA_DISP++);
@@ -2070,15 +2289,16 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
             bool pauseAnyCursor =
                 (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
                 (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON);
-            if (!pauseCtx->pageIndex && (!pauseAnyCursor || (gSaveContext.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]] != ITEM_NONE))) { // pageIndex == PAUSE_ITEM
-                pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
-                    WREG(49 + gSaveContext.language);
+            if (!pauseCtx->pageIndex &&
+                (!pauseAnyCursor || (gSaveContext.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]] !=
+                                     ITEM_NONE))) { // pageIndex == PAUSE_ITEM
+                pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = WREG(49 + languageOffset);
 
                 pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
                     pauseCtx->infoPanelVtx[16].v.ob[0] + 48;
 
                 pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
-                    pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(58 + gSaveContext.language);
+                    pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(58 + languageOffset);
 
                 pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
                     pauseCtx->infoPanelVtx[20].v.ob[0] + D_8082ADD8[gSaveContext.language];
@@ -2089,38 +2309,45 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                     D_8082ADD8[gSaveContext.language] << 5;
 
                 s16 PosX; // General Pos of C button icon
-                if (gSaveContext.language == LANGUAGE_ENG) {
+                if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_JPN) {
                     PosX = 112;
                 } else if (gSaveContext.language == LANGUAGE_GER) {
                     PosX = 175;
                 } else { // French
                     PosX = 98;
                 }
-                s16 PosY = 200 - pauseCtx->infoPanelOffsetY; //General Pos of C button icon
-                s16 icon_w = 46; // Original texture size
+                s16 PosY = 200 - pauseCtx->infoPanelOffsetY; // General Pos of C button icon
+                s16 icon_w = 46;                             // Original texture size
                 s16 icon_h = 16;
                 s32 icon_x_offset;
-                s16 icon_w_crop = 17.0f; //Left
-                int height = icon_h * 1.0f; //Adjust Height with scale
-                int width = icon_w * 1.0f; //Adjust Width with scale
-                int width_crop = icon_w_crop * 1.0f; //Adjust Width with scale
+                s16 icon_w_crop = 17.0f;             // Left
+                int height = icon_h * 1.0f;          // Adjust Height with scale
+                int width = icon_w * 1.0f;           // Adjust Width with scale
+                int width_crop = icon_w_crop * 1.0f; // Adjust Width with scale
                 int height_factor = (1 << 10) * icon_h / height;
                 int width_factor = (1 << 10) * icon_w / width;
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cButtonsColor.r, cButtonsColor.g, cButtonsColor.b, 255);
-                for (s16 i=0; i < 3; i++) {
+                for (s16 i = 0; i < 3; i++) {
                     if (i == 0) {
-                        icon_x_offset = width_crop*3-3;
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g, cRightButtonColor.b, 255);
+                        icon_x_offset = width_crop * 3 - 3;
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cRightButtonColor.r, cRightButtonColor.g,
+                                        cRightButtonColor.b, 255);
                     } else if (i == 1) {
-                        icon_x_offset = width_crop*2-3;
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g, cDownButtonColor.b, 255);
+                        icon_x_offset = width_crop * 2 - 3;
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cDownButtonColor.r, cDownButtonColor.g,
+                                        cDownButtonColor.b, 255);
                     } else if (i == 2) {
                         icon_x_offset = width_crop;
-                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g, cLeftButtonColor.b, 255);
+                        gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, cLeftButtonColor.r, cLeftButtonColor.g,
+                                        cLeftButtonColor.b, 255);
                     }
-                    gDPLoadTextureBlock(POLY_OPA_DISP++, gCBtnSymbolsTex, G_IM_FMT_IA, G_IM_SIZ_8b, icon_w, icon_h, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
-                    //gSPScisTextureRectangle(POLY_OPA_DISP++,PosX << 2, PosY << 2, (PosX + icon_x_offset) << 2, (PosY + height) << 2, G_TX_RENDERTILE, 0, 0, width_factor, height_factor);
-                    gSPWideTextureRectangle(POLY_OPA_DISP++, PosX << 2, PosY << 2, (PosX + icon_x_offset) << 2, (PosY + height) << 2, G_TX_WRAP, 0, 0, width_factor, height_factor);
+                    gDPLoadTextureBlock(POLY_OPA_DISP++, gCBtnSymbolsTex, G_IM_FMT_IA, G_IM_SIZ_8b, icon_w, icon_h, 0,
+                                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
+                                        G_TX_NOLOD, G_TX_NOLOD);
+                    // gSPScisTextureRectangle(POLY_OPA_DISP++,PosX << 2, PosY << 2, (PosX + icon_x_offset) << 2, (PosY
+                    // + height) << 2, G_TX_RENDERTILE, 0, 0, width_factor, height_factor);
+                    gSPWideTextureRectangle(POLY_OPA_DISP++, PosX << 2, PosY << 2, (PosX + icon_x_offset) << 2,
+                                            (PosY + height) << 2, G_TX_WRAP, 0, 0, width_factor, height_factor);
                 }
                 gDPPipeSync(POLY_OPA_DISP++);
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
@@ -2131,14 +2358,13 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
             } else if ((pauseCtx->pageIndex == PAUSE_QUEST) && (pauseCtx->cursorSlot[PAUSE_QUEST] >= 6) &&
                        (pauseCtx->cursorSlot[PAUSE_QUEST] <= 0x11)) {
                 if (pauseCtx->namedItem != PAUSE_ITEM_NONE) {
-                    pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
-                        WREG(55 + gSaveContext.language);
+                    pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = WREG(55 + languageOffset);
 
                     pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
                         pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
 
                     pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
-                        pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + gSaveContext.language);
+                        pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + languageOffset);
 
                     if (gSaveContext.language == LANGUAGE_GER) {
                         pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
@@ -2154,25 +2380,27 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                         D_8082ADE8[gSaveContext.language] << 5;
 
                     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255);
-                    //gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
-                    gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+                    // gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
+                    gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0,
+                                        G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD,
+                                        G_TX_NOLOD);
                     gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
                     gDPPipeSync(POLY_OPA_DISP++);
                     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
 
-                    POLY_OPA_DISP = KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, sPlayMelodyTextures[gSaveContext.language],
-                                                                D_8082ADE8[gSaveContext.language], 16, 4);
+                    POLY_OPA_DISP =
+                        KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, sPlayMelodyTextures[gSaveContext.language],
+                                                    D_8082ADE8[gSaveContext.language], 16, 4);
                 }
             } else if (pauseCtx->pageIndex == PAUSE_EQUIP) {
-                pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
-                    WREG(64 + gSaveContext.language);
+                pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = WREG(64 + languageOffset);
 
                 pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
                     pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
 
                 pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
-                    pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + gSaveContext.language);
+                    pauseCtx->infoPanelVtx[16].v.ob[0] + WREG(52 + languageOffset);
 
                 pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
                     pauseCtx->infoPanelVtx[20].v.ob[0] + D_8082ADD8[gSaveContext.language];
@@ -2182,13 +2410,16 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
                 pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
                     D_8082ADD8[gSaveContext.language] << 5;
 
-                 if (!(CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) && (pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) {
+                if (!(CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) &&
+                    (pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) {
                     return;
-                 }
+                }
 
-                //gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
+                // gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255);
-                gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+                gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0,
+                                    G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD,
+                                    G_TX_NOLOD);
                 gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
 
                 gDPPipeSync(POLY_OPA_DISP++);
@@ -2206,8 +2437,9 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
 void KaleidoScope_UpdateNamePanel(PlayState* play) {
     PauseContext* pauseCtx = &play->pauseCtx;
     u16 sp2A;
-    bool pauseAnyCursor = (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
-                          (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON);
+    bool pauseAnyCursor =
+        (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_RANDO_ONLY && IS_RANDO) ||
+        (CVarGetInteger(CVAR_ENHANCEMENT("PauseAnyCursor"), 0) == PAUSE_ANY_CURSOR_ALWAYS_ON);
 
     if ((pauseCtx->namedItem != pauseCtx->cursorItem[pauseCtx->pageIndex]) ||
         ((pauseCtx->pageIndex == PAUSE_MAP) && (pauseCtx->cursorSpecialPos != 0))) {
@@ -2218,29 +2450,45 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) {
         osCreateMesgQueue(&pauseCtx->loadQueue, &pauseCtx->loadMsg, 1);
 
         if (pauseAnyCursor &&
-        ((pauseCtx->pageIndex == PAUSE_EQUIP && pauseCtx->cursorX[PAUSE_EQUIP] != 0 && !CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) ||
-        (pauseCtx->pageIndex == PAUSE_ITEM && gSaveContext.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]] == ITEM_NONE))) {
+            ((pauseCtx->pageIndex == PAUSE_EQUIP && pauseCtx->cursorX[PAUSE_EQUIP] != 0 &&
+              !CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) ||
+             (pauseCtx->pageIndex == PAUSE_ITEM &&
+              gSaveContext.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]] == ITEM_NONE))) {
             pauseCtx->namedItem = PAUSE_ITEM_NONE;
         }
 
         if (pauseCtx->namedItem != PAUSE_ITEM_NONE) {
             if ((pauseCtx->pageIndex == PAUSE_MAP) && !sInDungeonScene) {
-                if (gSaveContext.language) {
+                // #region SOH [NTSC] - There's a lot of OOB/Incorrect accesses that can occur so make sure sp2A selects
+                // something valid
+                sp2A %= 12;
+                // #endregion
+                if (gSaveContext.language >= LANGUAGE_GER) {
                     sp2A += 12;
                 }
-                if (gSaveContext.language == LANGUAGE_FRA) {
+                if (gSaveContext.language >= LANGUAGE_FRA) {
+                    sp2A += 12;
+                }
+                if (gSaveContext.language >= LANGUAGE_JPN) {
                     sp2A += 12;
                 }
 
                 const char* textureName = mapNameTextures[sp2A];
                 memcpy(pauseCtx->nameSegment, textureName, strlen(textureName) + 1);
             } else {
+                // #region SOH [NTSC] - There's a lot of OOB/Incorrect accesses that can occur so make sure sp2A selects
+                // something valid
+                sp2A %= 123;
+                // #endregion
                 osSyncPrintf("zoom_name=%d\n", pauseCtx->namedItem);
 
-                if (gSaveContext.language) {
+                if (gSaveContext.language >= LANGUAGE_GER) {
                     sp2A += 123;
                 }
-                if (gSaveContext.language == LANGUAGE_FRA) {
+                if (gSaveContext.language >= LANGUAGE_FRA) {
+                    sp2A += 123;
+                }
+                if (gSaveContext.language >= LANGUAGE_JPN) {
                     sp2A += 123;
                 }
 
@@ -2512,28 +2760,28 @@ s16 func_80823A0C(PlayState* play, Vtx* vtx, s16 pageIndex, s16 arg3) {
             { 10, 50, 40, 255 },
         },
         {
-            { 80,40,30, 255},
-            { 140,60,60,255 },
-            { 140,60,60,255 },
+            { 80, 40, 30, 255 },
+            { 140, 60, 60, 255 },
+            { 140, 60, 60, 255 },
             { 80, 40, 30, 255 },
         },
         {
-            { 80,80,50,255 },
-            { 120,120,70,255 },
-            { 120,120,70,255 },
+            { 80, 80, 50, 255 },
+            { 120, 120, 70, 255 },
+            { 120, 120, 70, 255 },
             { 80, 80, 50, 255 },
         },
         {
             { 80, 40, 30, 255 },
-            { 140,60,60,255 },
-            { 140,60,60,255 },
+            { 140, 60, 60, 255 },
+            { 140, 60, 60, 255 },
             { 80, 40, 30, 255 },
         },
         {
-            { 50,50,50,255 },
-            { 110,110,110,255 },
-            { 110,110,110,255 },
-            { 50,50,50,255 },
+            { 50, 50, 50, 255 },
+            { 110, 110, 110, 255 },
+            { 110, 110, 110, 255 },
+            { 50, 50, 50, 255 },
         },
     };
     PauseContext* pauseCtx = &play->pauseCtx;
@@ -2562,38 +2810,48 @@ s16 func_80823A0C(PlayState* play, Vtx* vtx, s16 pageIndex, s16 arg3) {
 
             vtx[vtxIndex + 2].v.ob[1] = vtx[vtxIndex + 3].v.ob[1] = vtx[vtxIndex + 0].v.ob[1] - 32;
 
-            vtx[vtxIndex + 0].v.ob[2] = vtx[vtxIndex + 1].v.ob[2] = vtx[vtxIndex + 2].v.ob[2] = vtx[vtxIndex + 3].v.ob[2] = 0;
+            vtx[vtxIndex + 0].v.ob[2] = vtx[vtxIndex + 1].v.ob[2] = vtx[vtxIndex + 2].v.ob[2] =
+                vtx[vtxIndex + 3].v.ob[2] = 0;
 
             vtx[vtxIndex + 0].v.flag = 0;
             vtx[vtxIndex + 1].v.flag = 0;
             vtx[vtxIndex + 2].v.flag = 0;
             vtx[vtxIndex + 3].v.flag = 0;
 
-            vtx[vtxIndex + 0].v.tc[0] = vtx[vtxIndex + 0].v.tc[1] = vtx[vtxIndex + 1].v.tc[1] = vtx[vtxIndex + 2].v.tc[0] = 0;
+            vtx[vtxIndex + 0].v.tc[0] = vtx[vtxIndex + 0].v.tc[1] = vtx[vtxIndex + 1].v.tc[1] =
+                vtx[vtxIndex + 2].v.tc[0] = 0;
 
             vtx[vtxIndex + 1].v.tc[0] = vtx[vtxIndex + 3].v.tc[0] = 0xA00;
 
             vtx[vtxIndex + 2].v.tc[1] = vtx[vtxIndex + 3].v.tc[1] = 0x400;
 
-            //Color in the pages. Pages are drawn in groups. Each group is faded to the next. There are 4 total colors, 1/4 and 2/3 are the same creating a mirrored color set.
-            // TODO, go from 0,1,2,3 to 0,1,1,0 to only use two colors instead of 4.
-            Color_RGBA8 color = CVarGetColor(gPageVtxColorCvars[pageIndex][colorIndex], pageColors[pageIndex][colorIndex]);
+            // Color in the pages. Pages are drawn in groups. Each group is faded to the next. There are 4 total colors,
+            // 1/4 and 2/3 are the same creating a mirrored color set.
+            //  TODO, go from 0,1,2,3 to 0,1,1,0 to only use two colors instead of 4.
+            Color_RGBA8 color =
+                CVarGetColor(gPageVtxColorCvars[pageIndex][colorIndex], pageColors[pageIndex][colorIndex]);
             Color_RGBA8 colorb =
-                CVarGetColor(gPageVtxColorCvars[pageIndex][colorIndex + 1], pageColors[pageIndex][colorIndex+1]);
-            vtx[vtxIndex + 0].v.cn[0] = vtx[vtxIndex + 2].v.cn[0] = color.r; // sPageVtxColorR[pageIndex][colorIndex + 0];
+                CVarGetColor(gPageVtxColorCvars[pageIndex][colorIndex + 1], pageColors[pageIndex][colorIndex + 1]);
+            vtx[vtxIndex + 0].v.cn[0] = vtx[vtxIndex + 2].v.cn[0] =
+                color.r; // sPageVtxColorR[pageIndex][colorIndex + 0];
 
-            vtx[vtxIndex + 0].v.cn[1] = vtx[vtxIndex + 2].v.cn[1] = color.g;// sPageVtxColorG[pageIndex][colorIndex + 0];
+            vtx[vtxIndex + 0].v.cn[1] = vtx[vtxIndex + 2].v.cn[1] =
+                color.g; // sPageVtxColorG[pageIndex][colorIndex + 0];
 
-            vtx[vtxIndex + 0].v.cn[2] = vtx[vtxIndex + 2].v.cn[2] = color.b; // sPageVtxColorB[pageIndex][colorIndex + 0];
+            vtx[vtxIndex + 0].v.cn[2] = vtx[vtxIndex + 2].v.cn[2] =
+                color.b; // sPageVtxColorB[pageIndex][colorIndex + 0];
 
-            vtx[vtxIndex + 1].v.cn[0] = vtx[vtxIndex + 3].v.cn[0] = colorb.r;//sPageVtxColorR[pageIndex][colorIndex + 1];
+            vtx[vtxIndex + 1].v.cn[0] = vtx[vtxIndex + 3].v.cn[0] =
+                colorb.r; // sPageVtxColorR[pageIndex][colorIndex + 1];
 
-            vtx[vtxIndex + 1].v.cn[1] = vtx[vtxIndex + 3].v.cn[1] = colorb.g; // sPageVtxColorG[pageIndex][colorIndex + 1];
+            vtx[vtxIndex + 1].v.cn[1] = vtx[vtxIndex + 3].v.cn[1] =
+                colorb.g; // sPageVtxColorG[pageIndex][colorIndex + 1];
 
-            vtx[vtxIndex + 1].v.cn[2] = vtx[vtxIndex + 3].v.cn[2] = colorb.b; // sPageVtxColorB[pageIndex][colorIndex + 1];
+            vtx[vtxIndex + 1].v.cn[2] = vtx[vtxIndex + 3].v.cn[2] =
+                colorb.b; // sPageVtxColorB[pageIndex][colorIndex + 1];
 
-            vtx[vtxIndex + 0].v.cn[3] = vtx[vtxIndex + 2].v.cn[3] = vtx[vtxIndex + 1].v.cn[3] = vtx[vtxIndex + 3].v.cn[3] =
-                pauseCtx->alpha;
+            vtx[vtxIndex + 0].v.cn[3] = vtx[vtxIndex + 2].v.cn[3] = vtx[vtxIndex + 1].v.cn[3] =
+                vtx[vtxIndex + 3].v.cn[3] = pauseCtx->alpha;
         }
     }
 
@@ -2618,23 +2876,26 @@ s16 func_80823A0C(PlayState* play, Vtx* vtx, s16 pageIndex, s16 arg3) {
 
             vtx[vtxIndex + 2].v.ob[1] = vtx[vtxIndex + 3].v.ob[1] = vtx[vtxIndex + 0].v.ob[1] - ptr4[colorIndex];
 
-            vtx[vtxIndex + 0].v.ob[2] = vtx[vtxIndex + 1].v.ob[2] = vtx[vtxIndex + 2].v.ob[2] = vtx[vtxIndex + 3].v.ob[2] = 0;
+            vtx[vtxIndex + 0].v.ob[2] = vtx[vtxIndex + 1].v.ob[2] = vtx[vtxIndex + 2].v.ob[2] =
+                vtx[vtxIndex + 3].v.ob[2] = 0;
 
-            vtx[vtxIndex + 0].v.flag = vtx[vtxIndex + 1].v.flag = vtx[vtxIndex + 2].v.flag = vtx[vtxIndex + 3].v.flag = 0;
+            vtx[vtxIndex + 0].v.flag = vtx[vtxIndex + 1].v.flag = vtx[vtxIndex + 2].v.flag = vtx[vtxIndex + 3].v.flag =
+                0;
 
-            vtx[vtxIndex + 0].v.tc[0] = vtx[vtxIndex + 0].v.tc[1] = vtx[vtxIndex + 1].v.tc[1] = vtx[vtxIndex + 2].v.tc[0] = 0;
+            vtx[vtxIndex + 0].v.tc[0] = vtx[vtxIndex + 0].v.tc[1] = vtx[vtxIndex + 1].v.tc[1] =
+                vtx[vtxIndex + 2].v.tc[0] = 0;
 
             vtx[vtxIndex + 1].v.tc[0] = vtx[vtxIndex + 3].v.tc[0] = ptr2[colorIndex] << 5;
 
             vtx[vtxIndex + 2].v.tc[1] = vtx[vtxIndex + 3].v.tc[1] = ptr4[colorIndex] << 5;
 
-            vtx[vtxIndex + 0].v.cn[0] = vtx[vtxIndex + 2].v.cn[0] = vtx[vtxIndex + 0].v.cn[1] = vtx[vtxIndex + 2].v.cn[1] =
-                vtx[vtxIndex + 0].v.cn[2] = vtx[vtxIndex + 2].v.cn[2] = vtx[vtxIndex + 1].v.cn[0] = vtx[vtxIndex + 3].v.cn[0] =
-                    vtx[vtxIndex + 1].v.cn[1] = vtx[vtxIndex + 3].v.cn[1] = vtx[vtxIndex + 1].v.cn[2] =
-                        vtx[vtxIndex + 3].v.cn[2] = 255;
+            vtx[vtxIndex + 0].v.cn[0] = vtx[vtxIndex + 2].v.cn[0] = vtx[vtxIndex + 0].v.cn[1] =
+                vtx[vtxIndex + 2].v.cn[1] = vtx[vtxIndex + 0].v.cn[2] = vtx[vtxIndex + 2].v.cn[2] =
+                    vtx[vtxIndex + 1].v.cn[0] = vtx[vtxIndex + 3].v.cn[0] = vtx[vtxIndex + 1].v.cn[1] =
+                        vtx[vtxIndex + 3].v.cn[1] = vtx[vtxIndex + 1].v.cn[2] = vtx[vtxIndex + 3].v.cn[2] = 255;
 
-            vtx[vtxIndex + 0].v.cn[3] = vtx[vtxIndex + 2].v.cn[3] = vtx[vtxIndex + 1].v.cn[3] = vtx[vtxIndex + 3].v.cn[3] =
-                pauseCtx->alpha;
+            vtx[vtxIndex + 0].v.cn[3] = vtx[vtxIndex + 2].v.cn[3] = vtx[vtxIndex + 1].v.cn[3] =
+                vtx[vtxIndex + 3].v.cn[3] = pauseCtx->alpha;
         }
 
         if (pageIndex == 4) {
@@ -2710,7 +2971,8 @@ s16 func_80823A0C(PlayState* play, Vtx* vtx, s16 pageIndex, s16 arg3) {
 
 static s16 D_8082B11C[] = { 0, 4, 8, 12, 24, 32, 56 };
 
-static s16 D_8082B11C_all[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 68, 72, 76, 80, 84, 88, 96 };
+static s16 D_8082B11C_all[] = { 0,  4,  8,  12, 16, 20, 24, 28, 32, 36, 40, 44,
+                                48, 52, 56, 60, 64, 68, 72, 76, 80, 84, 88, 96 };
 
 static s16 D_8082B12C[] = { -114, 12, 44, 76 };
 
@@ -2834,7 +3096,11 @@ void KaleidoScope_InitVertices(PlayState* play, GraphicsContext* gfxCtx) {
         pauseCtx->cursorVtx[19].v.tc[1] = 0x400;
 
     // 24 items, 7 "item selected" backgrounds, 14 ammo digits (2 each for 7 items) -- then 4 vertices for each
-    pauseCtx->itemVtx = Graph_Alloc(gfxCtx, (24 + 7 + 2 * (CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? ARRAY_COUNT(D_8082B11C_all) : ARRAY_COUNT(D_8082B11C))) * 4 * sizeof(Vtx));
+    pauseCtx->itemVtx = Graph_Alloc(
+        gfxCtx, (24 + 7 +
+                 2 * (CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0) ? ARRAY_COUNT(D_8082B11C_all)
+                                                                                 : ARRAY_COUNT(D_8082B11C))) *
+                    4 * sizeof(Vtx));
 
     for (phi_t4 = 0, phi_t2 = 0, phi_t5 = 58; phi_t4 < 4; phi_t4++, phi_t5 -= 32) {
         for (phi_t1 = -96, phi_t3 = 0; phi_t3 < 6; phi_t3++, phi_t2 += 4, phi_t1 += 32) {
@@ -2926,7 +3192,8 @@ void KaleidoScope_InitVertices(PlayState* play, GraphicsContext* gfxCtx) {
 
     u8 gBetterAmmoRendering = CVarGetInteger(CVAR_ENHANCEMENT("BetterAmmoRendering"), 0);
 
-    for (phi_t3 = 0; phi_t3 < (gBetterAmmoRendering ? ARRAY_COUNT(D_8082B11C_all) : ARRAY_COUNT(D_8082B11C)); phi_t3++) {
+    for (phi_t3 = 0; phi_t3 < (gBetterAmmoRendering ? ARRAY_COUNT(D_8082B11C_all) : ARRAY_COUNT(D_8082B11C));
+         phi_t3++) {
         phi_t4 = gBetterAmmoRendering ? D_8082B11C_all[phi_t3] : D_8082B11C[phi_t3];
 
         pauseCtx->itemVtx[phi_t2 + 0].v.ob[0] = pauseCtx->itemVtx[phi_t2 + 2].v.ob[0] =
@@ -3236,16 +3503,15 @@ void KaleidoScope_Draw(PlayState* play) {
     pauseCtx->stickRelX = input->rel.stick_x;
     pauseCtx->stickRelY = input->rel.stick_y;
 
-    //gSPSegment(POLY_OPA_DISP++, 0x02, interfaceCtx->parameterSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x02, interfaceCtx->parameterSegment);
     gSPSegment(POLY_OPA_DISP++, 0x07, pauseCtx->playerSegment);
-    //gSPSegment(POLY_OPA_DISP++, 0x08, pauseCtx->iconItemSegment);
-    //gSPSegment(POLY_OPA_DISP++, 0x09, pauseCtx->iconItem24Segment);
+    // gSPSegment(POLY_OPA_DISP++, 0x08, pauseCtx->iconItemSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x09, pauseCtx->iconItem24Segment);
     gSPSegment(POLY_OPA_DISP++, 0x0A, pauseCtx->nameSegment);
-    //gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment);
-    //gSPSegment(POLY_OPA_DISP++, 0x0D, pauseCtx->iconItemLangSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment);
+    // gSPSegment(POLY_OPA_DISP++, 0x0D, pauseCtx->iconItemLangSegment);
 
-    if (pauseCtx->debugState == 0)
-    {
+    if (pauseCtx->debugState == 0) {
         KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z);
 
         Gfx_SetupDL_42Opa(play->state.gfxCtx);
@@ -3276,12 +3542,8 @@ void KaleidoScope_Draw(PlayState* play) {
     CLOSE_DISPS(play->state.gfxCtx);
 }
 
-uint32_t _bswap32(uint32_t a)
-{
-    a = ((a & 0x000000FF) << 24) |
-        ((a & 0x0000FF00) << 8) |
-        ((a & 0x00FF0000) >> 8) |
-        ((a & 0xFF000000) >> 24);
+uint32_t _bswap32(uint32_t a) {
+    a = ((a & 0x000000FF) << 24) | ((a & 0x0000FF00) << 8) | ((a & 0x00FF0000) >> 8) | ((a & 0xFF000000) >> 24);
     return a;
 }
 
@@ -3301,7 +3563,8 @@ void func_808265BC(PlayState* play) {
 
         pauseCtx->pageIndex = D_8082ABEC[pauseCtx->mode];
 
-        if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) && (pauseCtx->pageIndex == PAUSE_EQUIP)) {
+        if ((CVarGetInteger(CVAR_ENHANCEMENT("AssignableTunicsAndBoots"), 0) != 0) &&
+            (pauseCtx->pageIndex == PAUSE_EQUIP)) {
             gSaveContext.buttonStatus[1] = BTN_ENABLED;
             gSaveContext.buttonStatus[2] = BTN_ENABLED;
             gSaveContext.buttonStatus[3] = BTN_ENABLED;
@@ -3511,7 +3774,8 @@ void KaleidoScope_RegisterUpdatedDungeonMapTexture() {
     KaleidoScope_UpdateDungeonMap(gPlayState);
 
     // KaleidoScope_UpdateDungeonMap will update the palette index for the current floor if the cursor is on the floor
-    // If the player toggles alt assets while the cursor is not in the floor level, then we handle the palette index here
+    // If the player toggles alt assets while the cursor is not in the floor level, then we handle the palette index
+    // here
     if (gPlayState->sceneNum >= SCENE_DEKU_TREE && gPlayState->sceneNum <= SCENE_TREASURE_BOX_SHOP &&
         (VREG(30) + 3) == pauseCtx->dungeonMapSlot && (VREG(30) + 3) != pauseCtx->cursorPoint[PAUSE_MAP]) {
 
@@ -3562,8 +3826,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) {
     }
 }
 
-void KaleidoScope_Update(PlayState* play)
-{
+void KaleidoScope_Update(PlayState* play) {
     static s16 D_8082B258 = 0;
     static s16 D_8082B25C = 10;
     static s16 D_8082B260 = 0;
@@ -3624,20 +3887,20 @@ void KaleidoScope_Update(PlayState* play)
 
             size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
             osSyncPrintf("icon_item size0=%x\n", size0);
-            DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
-                                __FILE__, __LINE__);
+            DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, __FILE__,
+                                __LINE__);
 
             gSegments[8] = VIRTUAL_TO_PHYSICAL(pauseCtx->iconItemSegment);
 
             pauseCtx->iconItem24Segment = (void*)(((uintptr_t)pauseCtx->iconItemSegment + size0 + 0xF) & ~0xF);
 
 #if 1
-            //size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
-            //osSyncPrintf("icon_item24 size=%x\n", size);
-            //DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
-                                //__FILE__, __LINE__);
+            // size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
+            // osSyncPrintf("icon_item24 size=%x\n", size);
+            // DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
+            //__FILE__, __LINE__);
 
-            //pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
+            // pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
 #endif
 
             switch (play->sceneNum) {
@@ -3661,10 +3924,10 @@ void KaleidoScope_Update(PlayState* play)
                 case SCENE_SHADOW_TEMPLE_BOSS:
 #if 1
                     sInDungeonScene = true;
-                    //size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd - (uintptr_t)_icon_item_dungeon_staticSegmentRomStart;
-                    //osSyncPrintf("icon_item_dungeon dungeon-size2=%x\n", size2);
-                    //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_dungeon_staticSegmentRomStart,
-                                        //size2, __FILE__, __LINE__);
+                    // size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd -
+                    // (uintptr_t)_icon_item_dungeon_staticSegmentRomStart; osSyncPrintf("icon_item_dungeon
+                    // dungeon-size2=%x\n", size2); DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment,
+                    // (uintptr_t)_icon_item_dungeon_staticSegmentRomStart, size2, __FILE__, __LINE__);
 #endif
 
                     interfaceCtx->mapPalette[28] = 6;
@@ -3675,37 +3938,39 @@ void KaleidoScope_Update(PlayState* play)
                 default:
 #if 1
                     sInDungeonScene = false;
-                    //size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd - (uintptr_t)_icon_item_field_staticSegmentRomStart;
-                    //osSyncPrintf("icon_item_field field-size2=%x\n", size2);
-                    //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_field_staticSegmentRomStart,
-                                        //size2, __FILE__, __LINE__);
+                    // size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd -
+                    // (uintptr_t)_icon_item_field_staticSegmentRomStart; osSyncPrintf("icon_item_field
+                    // field-size2=%x\n", size2); DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment,
+                    // (uintptr_t)_icon_item_field_staticSegmentRomStart, size2, __FILE__, __LINE__);
 #endif
                     break;
             }
 
-            // OTRTODO: LANGUAGE SUPPORT
+                // OTRTODO: LANGUAGE SUPPORT
 #if 1
-            //pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF);
+            // pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF);
 
             if (gSaveContext.language == LANGUAGE_ENG) {
-                //size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
-                //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, _icon_item_nes_staticSegmentRomStart, size,
-                                    //__FILE__, __LINE__);
+                // size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd -
+                // (uintptr_t)_icon_item_nes_staticSegmentRomStart; osSyncPrintf("icon_item_dungeon dungeon-size=%x\n",
+                // size); DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, _icon_item_nes_staticSegmentRomStart, size,
+                //__FILE__, __LINE__);
             } else if (gSaveContext.language == LANGUAGE_GER) {
-                //size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
-                //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
-                                    //__FILE__, __LINE__);
+                // size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd -
+                // (uintptr_t)_icon_item_ger_staticSegmentRomStart; osSyncPrintf("icon_item_dungeon dungeon-size=%x\n",
+                // size); DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment,
+                // (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
+                //__FILE__, __LINE__);
             } else {
-                //size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
-                //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
-                                    //__FILE__, __LINE__);
+                // size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd -
+                // (uintptr_t)_icon_item_fra_staticSegmentRomStart; osSyncPrintf("icon_item_dungeon dungeon-size=%x\n",
+                // size); DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment,
+                // (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
+                //__FILE__, __LINE__);
             }
 #endif
 
-            //pauseCtx->nameSegment = (void*)(((uintptr_t)pauseCtx->iconItemLangSegment + size + 0xF) & ~0xF);
+            // pauseCtx->nameSegment = (void*)(((uintptr_t)pauseCtx->iconItemLangSegment + size + 0xF) & ~0xF);
             pauseCtx->nameSegment = malloc(0x400 + 0xA00); // OTRTODO: GET RID OF THIS
 
             osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size);
@@ -3714,12 +3979,13 @@ void KaleidoScope_Update(PlayState* play)
             osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800);
 
             if (((void)0, gSaveContext.worldMapArea) < 22) {
-                const uint8_t offsets[] = { 36, 58, 80 };
+                // SOH [NTSC] - change offsets to fit jpn textures
+                const uint8_t offsets[] = { 48, 70, 92, 114 };
                 const char* textureName = mapNameTextures[offsets[gSaveContext.language] + gSaveContext.worldMapArea];
                 memcpy(pauseCtx->nameSegment + 0x400, textureName, strlen(textureName) + 1);
             }
-            // OTRTODO - player on pause
-            #if 1
+// OTRTODO - player on pause
+#if 1
             // HDTODO: Remove sPreRenderCvg stuff?
             sPreRenderCvg = (void*)(((uintptr_t)pauseCtx->nameSegment + 0x400 + 0xA00 + 0xF) & ~0xF);
 
@@ -3728,8 +3994,8 @@ void KaleidoScope_Update(PlayState* play)
                                     pauseCtx->playerSegment, NULL, sPreRenderCvg);
 
             KaleidoScope_DrawPlayerWork(play);
-            //KaleidoScope_SetupPlayerPreRender(play);
-            #endif
+// KaleidoScope_SetupPlayerPreRender(play);
+#endif
             for (i = 0; i < ARRAY_COUNT(pauseCtx->worldMapPoints); i++) {
                 pauseCtx->worldMapPoints[i] = 0;
             }
@@ -3959,8 +4225,8 @@ void KaleidoScope_Update(PlayState* play)
         case 4:
             if (pauseCtx->unk_1F4 == 160.0f) {
                 KaleidoScope_SetDefaultCursor(play);
-                //OTRTODO - Player on pause
-                //KaleidoScope_ProcessPlayerPreRender();
+                // OTRTODO - Player on pause
+                // KaleidoScope_ProcessPlayerPreRender();
             }
 
             pauseCtx->unk_1F4 = pauseCtx->unk_1F8 = pauseCtx->unk_1FC = pauseCtx->unk_200 -= 160.0f / WREG(6);
@@ -3999,7 +4265,8 @@ void KaleidoScope_Update(PlayState* play)
                     } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
                         pauseCtx->mode = 0;
                         pauseCtx->promptChoice = 0;
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
                             gSaveContext.buttonStatus[3] = BTN_DISABLED;
                         gSaveContext.buttonStatus[4] = BTN_ENABLED;
@@ -4010,7 +4277,8 @@ void KaleidoScope_Update(PlayState* play)
                         pauseCtx->unk_1EC = 0;
                         pauseCtx->state = 7;
                     } else if (CHECK_BTN_ALL(input->press.button, BTN_CUP) && pauseCtx->pageIndex == PAUSE_QUEST) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         pauseCtx->randoQuestMode ^= 1;
                     }
                     break;
@@ -4050,7 +4318,8 @@ void KaleidoScope_Update(PlayState* play)
                         pauseCtx->unk_1E4 = 0;
                         pauseCtx->mode = 0;
                         pauseCtx->promptChoice = 0;
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
                             gSaveContext.buttonStatus[3] = BTN_DISABLED;
                         gSaveContext.buttonStatus[4] = BTN_ENABLED;
@@ -4061,14 +4330,14 @@ void KaleidoScope_Update(PlayState* play)
                         pauseCtx->unk_1EC = 0;
                         pauseCtx->state = 7;
                     } else if (pauseCtx->ocarinaStaff->state == pauseCtx->ocarinaSongIdx) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         D_8082B258 = 0;
                         D_8082B25C = 30;
                         pauseCtx->unk_1E4 = 6;
                     } else if (pauseCtx->ocarinaStaff->state == 0xFF) {
-                        Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                               &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         D_8082B258 = 4;
                         D_8082B25C = 20;
                         pauseCtx->unk_1E4 = 6;
@@ -4101,7 +4370,8 @@ void KaleidoScope_Update(PlayState* play)
                         pauseCtx->unk_1E4 = 0;
                         pauseCtx->mode = 0;
                         pauseCtx->promptChoice = 0;
-                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                               &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                         gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
                             gSaveContext.buttonStatus[3] = BTN_DISABLED;
                         gSaveContext.buttonStatus[4] = BTN_ENABLED;
@@ -4150,11 +4420,13 @@ void KaleidoScope_Update(PlayState* play)
                             YREG(8) = pauseCtx->unk_204;
                             func_800F64E0(0);
                         } else {
-                            Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
+                            Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4,
+                                                   &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
                                                    &gSfxDefaultReverb);
                             Play_PerformSave(play);
                             pauseCtx->unk_1EC = 4;
-                            D_8082B25C = CVarGetInteger(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 0) ? 3 /* 0.1 sec */ : 90 /* 3 secs */;
+                            D_8082B25C = CVarGetInteger(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 0) ? 3 /* 0.1 sec */
+                                                                                                     : 90 /* 3 secs */;
                         }
                     } else if (CHECK_BTN_ALL(input->press.button, BTN_START) ||
                                CHECK_BTN_ALL(input->press.button, BTN_B)) {
@@ -4240,20 +4512,21 @@ void KaleidoScope_Update(PlayState* play)
             pauseCtx->iconItemSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
             size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
             osSyncPrintf("icon_item size0=%x\n", size0);
-            DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
-                                __FILE__, __LINE__);
+            DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, __FILE__,
+                                __LINE__);
 
             pauseCtx->iconItem24Segment = (void*)(((uintptr_t)pauseCtx->iconItemSegment + size0 + 0xF) & ~0xF);
-            //size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
+            // size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
             osSyncPrintf("icon_item24 size=%x\n", size);
-            //DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
-                                //__FILE__, __LINE__);
+            // DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
+            //__FILE__, __LINE__);
 
             pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
-            //size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd - (uintptr_t)_icon_item_gameover_staticSegmentRomStart;
-            //osSyncPrintf("icon_item_dungeon gameover-size2=%x\n", size2);
-            //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2,
-                                //__FILE__, __LINE__);
+            // size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd -
+            // (uintptr_t)_icon_item_gameover_staticSegmentRomStart; osSyncPrintf("icon_item_dungeon
+            // gameover-size2=%x\n", size2); DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment,
+            // (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2,
+            //__FILE__, __LINE__);
 
             pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF);
 
@@ -4261,17 +4534,20 @@ void KaleidoScope_Update(PlayState* play)
             if (gSaveContext.language == LANGUAGE_ENG) {
                 size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
                 osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size,
+                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart,
+            size,
                                     __FILE__, __LINE__);
             } else if (gSaveContext.language == LANGUAGE_GER) {
                 size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
                 osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
+                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart,
+            size,
                                     __FILE__, __LINE__);
             } else {
                 size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
                 osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
-                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
+                DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart,
+            size,
                                     __FILE__, __LINE__);
             }
             */
@@ -4389,18 +4665,20 @@ void KaleidoScope_Update(PlayState* play)
             if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
                 if (pauseCtx->promptChoice != 0) {
                     pauseCtx->promptChoice = 0;
-                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     pauseCtx->state = 0x10;
                     gameOverCtx->state++;
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     pauseCtx->promptChoice = 0;
                     Play_SaveSceneFlags(play);
                     gSaveContext.savedSceneNum = play->sceneNum;
                     Save_SaveFile();
                     pauseCtx->state = 0xF;
-                    D_8082B25C = CVarGetInteger(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 0) ? 3 /* 0.1 sec */ : 90 /* 3 secs */;
+                    D_8082B25C =
+                        CVarGetInteger(CVAR_ENHANCEMENT("SkipSaveConfirmation"), 0) ? 3 /* 0.1 sec */ : 90 /* 3 secs */;
                 }
             }
             break;
@@ -4421,8 +4699,8 @@ void KaleidoScope_Update(PlayState* play)
         case 0x10:
             if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) {
                 if (pauseCtx->promptChoice == 0 && GameInteractor_Should(VB_BE_ABLE_TO_SAVE, true)) {
-                    Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
-                                           &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                     Play_SaveSceneFlags(play);
 
                     switch (gSaveContext.entranceIndex) {
@@ -4471,7 +4749,8 @@ void KaleidoScope_Update(PlayState* play)
                             break;
                     }
                 } else {
-                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
+                                           &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
                 }
 
                 pauseCtx->state = 0x11;
@@ -4494,7 +4773,8 @@ void KaleidoScope_Update(PlayState* play)
                         // Reset frame counter to prevent autosave on respawn
                         play->gameplayFrames = 0;
                         gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
-                        gSaveContext.health = CVarGetInteger(CVAR_ENHANCEMENT("FullHealthSpawn"), 0) ? gSaveContext.healthCapacity : 0x30;
+                        gSaveContext.health =
+                            CVarGetInteger(CVAR_ENHANCEMENT("FullHealthSpawn"), 0) ? gSaveContext.healthCapacity : 0x30;
                         Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA);
                         gSaveContext.healthAccumulator = 0;
                         gSaveContext.magicState = MAGIC_STATE_IDLE;
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
index 15df2d77ed..3209a6c5ce 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
@@ -37,7 +37,7 @@ extern PauseMapMarksData gPauseMapMarkDataTable[];
 extern PauseMapMarksData gPauseMapMarkDataTableMasterQuest[];
 
 void PauseMapMark_Init(PlayState* play) {
-    if(ResourceMgr_IsGameMasterQuest()) {
+    if (ResourceMgr_IsGameMasterQuest()) {
         gLoadedPauseMarkDataTable = gPauseMapMarkDataTableMasterQuest;
     } else {
         gLoadedPauseMarkDataTable = gPauseMapMarkDataTable;
@@ -131,7 +131,9 @@ void PauseMapMark_DrawForDungeon(PlayState* play) {
                                     G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
                 // Compute the offset to mirror icons over the map center (48) as an axis line
-                s16 mirrorOffset = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? mirrorOffset = (48 - markPoint->x) * 2 + 1 : 0;
+                s16 mirrorOffset = CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)
+                                       ? mirrorOffset = (48 - markPoint->x) * 2 + 1
+                                       : 0;
 
                 Matrix_Push();
                 Matrix_Translate(GREG(92) + markPoint->x + mirrorOffset, GREG(93) + markPoint->y, 0.0f, MTXMODE_APPLY);
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
index 64275108ba..2d4fdcdba6 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
@@ -18,13 +18,14 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
     // Deku Tree map 3F
     {
         { PAUSE_MAP_MARK_CHEST,
-          23, //unk
+          23, // unk
           sMarkChestVtx,
-          4, //unk
-          2, //Number of icons to show.
-          { //ID,    X,      Y
-            { 2, 40.0f, -33.0f },
-            { 6, 49.0f, -42.0f },
+          4, // unk
+          2, // Number of icons to show.
+          {
+              // ID,    X,      Y
+              { 2, 40.0f, -33.0f },
+              { 6, 49.0f, -42.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -36,8 +37,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 1, 48.0f, -63.0f },
-            { 5, 52.0f, -68.0f },
+              { 1, 48.0f, -63.0f },
+              { 5, 52.0f, -68.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -49,7 +50,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 3, 84.0f, -39.0f },
+              { 3, 84.0f, -39.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -61,7 +62,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 4, 77.0f, -26.0f },
+              { 4, 77.0f, -26.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -73,7 +74,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-             { -1, 55.0f, 0.0f },
+              { -1, 55.0f, 0.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -99,8 +100,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 5, 13.0f, -60.0f },
-            { 8, 20.0f, -49.0f },
+              { 5, 13.0f, -60.0f },
+              { 8, 20.0f, -49.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -120,9 +121,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           3,
           {
-            { 1, 67.0f, -13.0f },
-            { 2, 28.0f, -13.0f },
-            { 4, 38.0f, 0.0f },
+              { 1, 67.0f, -13.0f },
+              { 2, 28.0f, -13.0f },
+              { 4, 38.0f, 0.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -146,10 +147,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           4,
           {
-            { 0, 49.0f, -3.0f },
-            { 2, 12.0f, -26.0f },
-            { 5, 74.0f, -13.0f },
-            { 7, 82.0f, -22.0f },
+              { 0, 49.0f, -3.0f },
+              { 2, 12.0f, -26.0f },
+              { 5, 74.0f, -13.0f },
+              { 7, 82.0f, -22.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -161,10 +162,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           4,
           {
-            { 0, 49.0f, -3.0f },
-            { 2, 12.0f, -26.0f },
-            { 5, 74.0f, -13.0f },
-            { 7, 82.0f, -22.0f },
+              { 0, 49.0f, -3.0f },
+              { 2, 12.0f, -26.0f },
+              { 5, 74.0f, -13.0f },
+              { 7, 82.0f, -22.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -176,7 +177,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 9, 31.0f, -29.0f },
+              { 9, 31.0f, -29.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -188,7 +189,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 11, 40.0f, -41.0f },
+              { 11, 40.0f, -41.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -208,8 +209,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 5, 22.0f, -41.0f },
-            { 13, 74.0f, -29.0f },
+              { 5, 22.0f, -41.0f },
+              { 13, 74.0f, -29.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -225,12 +226,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           3,
           {
-            { 3, 76.0f, -48.0f },
-            { 6, 72.0f, -50.0f },
-            { 7, 44.0f, -17.0f },
-            { 8, 63.0f, -12.0f },
-            { 9, 30.0f, -34.0f },
-            { 10, 61.0f, -31.0f },
+              { 3, 76.0f, -48.0f },
+              { 6, 72.0f, -50.0f },
+              { 7, 44.0f, -17.0f },
+              { 8, 63.0f, -12.0f },
+              { 9, 30.0f, -34.0f },
+              { 10, 61.0f, -31.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -242,7 +243,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 11, 78.0f, -34.0f },
+              { 11, 78.0f, -34.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -254,11 +255,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           5,
           {
-            { 0, 48.0f, -17.0f },
-            { 1, 35.0f, -45.0f },
-            { 2, 67.0f, -58.0f },
-            { 4, 74.0f, -15.0f },
-            { 12, 47.0f, -27.0f },
+              { 0, 48.0f, -17.0f },
+              { 1, 35.0f, -45.0f },
+              { 2, 67.0f, -58.0f },
+              { 4, 74.0f, -15.0f },
+              { 12, 47.0f, -27.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -278,9 +279,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           3,
           {
-            { 2, 88.0f, -60.0f },
-            { 7, 23.0f, -2.0f },
-            { 9, 84.0f, -45.0f },
+              { 2, 88.0f, -60.0f },
+              { 7, 23.0f, -2.0f },
+              { 9, 84.0f, -45.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -300,8 +301,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 0, 86.0f, -60.0f },
-            { 8, 76.0f, -72.0f },
+              { 0, 86.0f, -60.0f },
+              { 8, 76.0f, -72.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -313,10 +314,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           4,
           {
-            { 1, 88.0f, -60.0f },
-            { 3, 42.0f, -21.0f },
-            { 5, 47.0f, -15.0f },
-            { 10, 33.0f, -31.0f },
+              { 1, 88.0f, -60.0f },
+              { 3, 42.0f, -21.0f },
+              { 5, 47.0f, -15.0f },
+              { 10, 33.0f, -31.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -328,7 +329,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 6, 77.0f, -66.0f },
+              { 6, 77.0f, -66.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -340,8 +341,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 10, 59.0f, -9.0f },
-            { 18, 32.0f, -20.0f },
+              { 10, 59.0f, -9.0f },
+              { 18, 32.0f, -20.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -353,11 +354,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           5,
           {
-            { 1, 20.0f, -43.0f },
-            { 5, 83.0f, -26.0f },
-            { 15, 57.0f, -14.0f },
-            { 20, 81.0f, -55.0f },
-            { 21, 87.0f, -55.0f },
+              { 1, 20.0f, -43.0f },
+              { 5, 83.0f, -26.0f },
+              { 15, 57.0f, -14.0f },
+              { 20, 81.0f, -55.0f },
+              { 21, 87.0f, -55.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -377,12 +378,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           6,
           {
-            { 2, 41.0f, -16.0f },
-            { 3, 47.0f, -17.0f },
-            { 6, 27.0f, -16.0f },
-            { 12, 29.0f, -20.0f },
-            { 13, 70.0f, -22.0f },
-            { 14, 70.0f, -25.0f },
+              { 2, 41.0f, -16.0f },
+              { 3, 47.0f, -17.0f },
+              { 6, 27.0f, -16.0f },
+              { 12, 29.0f, -20.0f },
+              { 13, 70.0f, -22.0f },
+              { 14, 70.0f, -25.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -394,10 +395,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           4,
           {
-            { 0, 38.0f, -17.0f },
-            { 4, 55.0f, -14.0f },
-            { 8, 15.0f, -14.0f },
-            { 7, 78.0f, -3.0f },
+              { 0, 38.0f, -17.0f },
+              { 4, 55.0f, -14.0f },
+              { 8, 15.0f, -14.0f },
+              { 7, 78.0f, -3.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -409,8 +410,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 1, 41.0f, -17.0f },
-            { 7, 27.0f, -24.0f },
+              { 1, 41.0f, -17.0f },
+              { 7, 27.0f, -24.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -422,8 +423,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 2, 81.0f, -20.0f },
-            { 3, 74.0f, -37.0f },
+              { 2, 81.0f, -20.0f },
+              { 3, 74.0f, -37.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -435,8 +436,8 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           2,
           {
-            { 12, 96.0f, -51.0f },
-            { 22, 96.0f, -55.0f },
+              { 12, 96.0f, -51.0f },
+              { 22, 96.0f, -55.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -448,16 +449,16 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           10,
           {
-            { 4, 43.0f, -66.0f },
-            { 5, 37.0f, -66.0f },
-            { 6, 33.0f, -72.0f },
-            { 8, 85.0f, -18.0f },
-            { 9, 61.0f, -42.0f },
-            { 10, 15.0f, -4.0f },
-            { 11, 25.0f, -4.0f },
-            { 13, 19.0f, -29.0f },
-            { 21, 92.0f, -29.0f },
-            { 20, 87.0f, -20.0f },
+              { 4, 43.0f, -66.0f },
+              { 5, 37.0f, -66.0f },
+              { 6, 33.0f, -72.0f },
+              { 8, 85.0f, -18.0f },
+              { 9, 61.0f, -42.0f },
+              { 10, 15.0f, -4.0f },
+              { 11, 25.0f, -4.0f },
+              { 13, 19.0f, -29.0f },
+              { 21, 92.0f, -29.0f },
+              { 20, 87.0f, -20.0f },
           } },
         { PAUSE_MAP_MARK_BOSS,
           23,
@@ -477,15 +478,15 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           9,
           {
-            { 1, 51.0f, -24.0f },
-            { 3, 84.0f, -38.0f },
-            { 4, 31.0f, -2.0f },
-            { 5, 67.0f, -27.0f },
-            { 8, 46.0f, -27.0f },
-            { 10, 82.0f, -12.0f },
-            { 12, 80.0f, -16.0f },
-            { 14, 62.0f, -24.0f },
-            { 20, 89.0f, -38.0f },
+              { 1, 51.0f, -24.0f },
+              { 3, 84.0f, -38.0f },
+              { 4, 31.0f, -2.0f },
+              { 5, 67.0f, -27.0f },
+              { 8, 46.0f, -27.0f },
+              { 10, 82.0f, -12.0f },
+              { 12, 80.0f, -16.0f },
+              { 14, 62.0f, -24.0f },
+              { 20, 89.0f, -38.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -497,9 +498,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           3,
           {
-            { 2, 54.0f, -27.0f },
-            { 9, 28.0f, -17.0f },
-            { 16, 56.0f, -38.0f },
+              { 2, 54.0f, -27.0f },
+              { 9, 28.0f, -17.0f },
+              { 16, 56.0f, -38.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -511,7 +512,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           1,
           {
-            { 7, 71.0f, -33.0f },
+              { 7, 71.0f, -33.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
@@ -523,9 +524,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
           4,
           3,
           {
-            { 0, 66.0f, -2.0f },
-            { 1, 77.0f, -46.0f },
-            { 2, 27.0f, -45.0f },
+              { 0, 66.0f, -2.0f },
+              { 1, 77.0f, -46.0f },
+              { 2, 27.0f, -45.0f },
           } },
         { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
     },
diff --git a/soh/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c b/soh/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
index fec1d80336..fa49b9d05e 100644
--- a/soh/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
+++ b/soh/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
@@ -1452,8 +1452,9 @@ static MapMarkData sMapMarkIceCavernVanilla[] = {
 };
 
 MapMarkData* gMapMarkDataTableVanilla[] = {
-    sMapMarkDekuTreeVanilla,    sMapMarkDodongosCavernVanilla, sMapMarkJabuJabuBellyVanilla, sMapMarkForestTempleVanilla, sMapMarkFireTempleVanilla,
-    sMapMarkWaterTempleVanilla, sMapMarkSpiritTempleVanilla,   sMapMarkShadowTempleVanilla,  sMapMarkBottomWellVanilla,   sMapMarkIceCavernVanilla,
+    sMapMarkDekuTreeVanilla,   sMapMarkDodongosCavernVanilla, sMapMarkJabuJabuBellyVanilla, sMapMarkForestTempleVanilla,
+    sMapMarkFireTempleVanilla, sMapMarkWaterTempleVanilla,    sMapMarkSpiritTempleVanilla,  sMapMarkShadowTempleVanilla,
+    sMapMarkBottomWellVanilla, sMapMarkIceCavernVanilla,
 };
 
 static MapMarkData sMapMarkDekuTreeMq[] = {
@@ -2902,6 +2903,7 @@ static MapMarkData sMapMarkIceCavernMq[] = {
 };
 
 MapMarkData* gMapMarkDataTableMq[] = {
-    sMapMarkDekuTreeMq,    sMapMarkDodongosCavernMq, sMapMarkJabuJabuBellyMq, sMapMarkForestTempleMq, sMapMarkFireTempleMq,
-    sMapMarkWaterTempleMq, sMapMarkSpiritTempleMq,   sMapMarkShadowTempleMq,  sMapMarkBottomWellMq,   sMapMarkIceCavernMq,
+    sMapMarkDekuTreeMq,   sMapMarkDodongosCavernMq, sMapMarkJabuJabuBellyMq, sMapMarkForestTempleMq,
+    sMapMarkFireTempleMq, sMapMarkWaterTempleMq,    sMapMarkSpiritTempleMq,  sMapMarkShadowTempleMq,
+    sMapMarkBottomWellMq, sMapMarkIceCavernMq,
 };